]> git.baikalelectronics.ru Git - kernel.git/commit
udptunnels: Call handle_offloads after inserting vlan tag.
authorJesse Gross <jesse@nicira.com>
Thu, 9 Apr 2015 18:19:14 +0000 (11:19 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 Apr 2015 18:56:32 +0000 (14:56 -0400)
commit32d2c1b8cfd2b6b5b51539c781ec91a5adf5bd1e
tree3a08ef493465c9d8d9c73c0763c651a399ee9160
parentd3f54548653f599513b72c12982404511570a970
udptunnels: Call handle_offloads after inserting vlan tag.

handle_offloads() calls skb_reset_inner_headers() to store
the layer pointers to the encapsulated packet. However, we
currently push the vlag tag (if there is one) onto the packet
afterwards. This changes the MAC header for the encapsulated
packet but it is not reflected in skb->inner_mac_header, which
breaks GSO and drivers which attempt to use this for encapsulation
offloads.

Fixes: 66c52074 ("vxlan: Add tx-vlan offload support.")
Signed-off-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/vxlan.c
net/ipv4/geneve.c