]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'udp-gso-fixes'
authorDavid S. Miller <davem@davemloft.net>
Wed, 23 May 2018 18:48:44 +0000 (14:48 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 23 May 2018 18:48:44 +0000 (14:48 -0400)
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>

Trivial merge