Willem de Bruijn fd3a886258 net: in virtio_net_hdr only add VLAN_HLEN to csum_start if payload holds vlan ... Tun, tap, virtio, packet and uml vector all use struct virtio_net_hdr to communicate packet metadata to userspace. For skbuffs with vlan, the first two return the packet as it may have existed on the wire, inserting the VLAN tag in the user buffer. Then virtio_net_hdr.csum_start needs to be adjusted by VLAN_HLEN bytes. Commit f09e2249c4 ("macvtap: restore vlan header on user read") added this feature to macvtap. Commit 3ce9b20f19 ("macvtap: Fix csum_start when VLAN tags are present") then fixed up csum_start. Virtio, packet and uml do not insert the vlan header in the user buffer. When introducing virtio_net_hdr_from_skb to deduplicate filling in the virtio_net_hdr, the variant from macvtap which adds VLAN_HLEN was applied uniformly, breaking csum offset for packets with vlan on virtio and packet. Make insertion of VLAN_HLEN optional. Convert the callers to pass it when needed. Fixes: e858fae2b0 ("virtio_net: use common code for virtio_net_hdr and skb GSO conversion") Fixes: 1276f24eee ("packet: use common code for virtio_net_hdr and skb GSO conversion") Signed-off-by: Willem de Bruijn <willemb@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2018-06-07 16:15:38 -04:00
..
acpi	* Stratix10 SDRAM support to altera_edac (Thor Thayer)	2018-06-06 15:36:13 -07:00
asm-generic	Kbuild updates for v4.18	2018-06-06 11:00:15 -07:00
clocksource	…
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2018-06-05 15:51:21 -07:00
drm	drm for v4.18-rc1	2018-06-06 08:16:33 -07:00
dt-bindings	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2018-06-06 18:39:49 -07:00
keys	…
kvm	KVM: arm/arm64: vgic: Fix source vcpu issues for GICv2 SGI	2018-04-27 12:39:09 +01:00
linux	net: in virtio_net_hdr only add VLAN_HLEN to csum_start if payload holds vlan	2018-06-07 16:15:38 -04:00
math-emu	…
media	media: v4l2-core: push taking ioctl mutex down to ioctl handler	2018-05-28 16:31:44 -04:00
memory	…
misc	ocxl: Expose the thread_id needed for wait on POWER9	2018-06-03 20:40:32 +10:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2018-06-06 18:39:49 -07:00
pcmcia	…
ras	…
rdma	IB/uverbs: Fix uverbs_attr_get_obj	2018-05-23 15:25:53 -06:00
scsi	block: rename BLK_EH_NOT_HANDLED to BLK_EH_DONE	2018-05-29 08:59:21 -06:00
soc	soc: bcm2835: Make !RASPBERRYPI_FIRMWARE dummies return failure	2018-04-16 15:15:23 -07:00
sound	sound updates for 4.18	2018-06-06 09:08:38 -07:00
target	…
trace	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2018-06-06 18:39:49 -07:00
uapi	netfilter: nf_tables: add NFT_LOGLEVEL_* enumeration and use it	2018-06-07 16:14:00 -04:00
video	media: include/video/omapfb_dss.h: use IS_ENABLED()	2018-05-05 11:45:51 -04:00
xen	xen/sndif: Sync up with the canonical definition in Xen	2018-04-17 08:26:33 -04:00