diff options
| author | Tom Herbert <therbert@google.com> | 2014-06-14 23:24:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-15 01:00:50 -0700 |
| commit | f79b064c15068176e3f6f67715aafd7fe183120c (patch) | |
| tree | e1b1b85a1b30f00acf147818537b7e7bd7b3b86c | |
| parent | e5eb4e30a51236079fb22bb9f75fcd31915b03c6 (diff) | |
| download | linux-f79b064c15068176e3f6f67715aafd7fe183120c.tar.gz linux-f79b064c15068176e3f6f67715aafd7fe183120c.tar.bz2 linux-f79b064c15068176e3f6f67715aafd7fe183120c.zip | |
vxlan: Checksum fixes
Call skb_pop_rcv_encapsulation and postpull_rcsum for the Ethernet
header to work properly with checksum complete.
Signed-off-by: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/vxlan.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index e0995ffd046d..ade33ef82823 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1156,15 +1156,7 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb) if (!vs) goto drop; - /* If the NIC driver gave us an encapsulated packet - * with the encapsulation mark, the device checksummed it - * for us. Otherwise force the upper layers to verify it. - */ - if ((skb->ip_summed != CHECKSUM_UNNECESSARY && skb->ip_summed != CHECKSUM_PARTIAL) || - !skb->encapsulation) - skb->ip_summed = CHECKSUM_NONE; - - skb->encapsulation = 0; + skb_pop_rcv_encapsulation(skb); vs->rcv(vs, skb, vxh->vx_vni); return 0; @@ -1201,6 +1193,7 @@ static void vxlan_rcv(struct vxlan_sock *vs, skb_reset_mac_header(skb); skb_scrub_packet(skb, !net_eq(vxlan->net, dev_net(vxlan->dev))); skb->protocol = eth_type_trans(skb, vxlan->dev); + skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN); /* Ignore packet loops (and multicast echo) */ if (ether_addr_equal(eth_hdr(skb)->h_source, vxlan->dev->dev_addr)) |