diff options
| author | David S. Miller <davem@davemloft.net> | 2018-05-23 21:48:44 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-05-23 21:48:44 +0300 |
| commit | 75a839c34bb772f0c2f70e30601b4ce894a5d361 (patch) | |
| tree | 2d8e6cc7152b058c03b71eec0673bc97d7f3a46e /include/linux | |
| parent | e89e59c08d1bc736c8f593d7bad0706b20e73f30 (diff) | |
| parent | 8eea1ca82be90a7e7a4624ab9cb323574a5f71df (diff) | |
| download | linux-75a839c34bb772f0c2f70e30601b4ce894a5d361.tar.xz | |
Merge branch 'udp-gso-fixes'
Willem de Bruijn says:
====================
udp gso fixes
A few small fixes:
- disallow segmentation with XFRM
- do not leak gso packets into the ingress path
Changes
v1 -> v2
- fix build failure in team.c
- drop scatter-gather fix:
this is now fixed by commit 113f99c33585 ("net: test tailroom
before appending to linear skb"). After this patch gso skbs are
built non-linear regardless of NETIF_F_SG and skb_segment builds
linear segs.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdev_features.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h index c87c3a3453c1..623bb8ced060 100644 --- a/include/linux/netdev_features.h +++ b/include/linux/netdev_features.h @@ -220,7 +220,6 @@ enum { NETIF_F_GSO_GRE_CSUM | \ NETIF_F_GSO_IPXIP4 | \ NETIF_F_GSO_IPXIP6 | \ - NETIF_F_GSO_UDP_L4 | \ NETIF_F_GSO_UDP_TUNNEL | \ NETIF_F_GSO_UDP_TUNNEL_CSUM) |