Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7b024082b2b279af58e24ebd46e81777723d58da

Authored by Cong Wang
Committed by Jesse Gross
1 parent 17b682a048
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

openvswitch: fix the calculation of checksum for vlan header 

In vlan_insert_tag(), we insert a 4-byte VLAN header _after_
mac header:

        memmove(skb->data, skb->data + VLAN_HLEN, 2 * ETH_ALEN);
        ...
        veth->h_vlan_proto = htons(ETH_P_8021Q);
        ...
        veth->h_vlan_TCI = htons(vlan_tci);

so after it, we should recompute the checksum to include these 4 bytes.
skb->data still points to the mac header, therefore VLAN header is at
(2 * ETH_ALEN = 12) bytes after it, not (ETH_HLEN = 14) bytes.

This can also be observed via tcpdump:

         0x0000:  ffff ffff ffff 5254 005d 6f6e 8100 000a
         0x0010:  0806 0001 0800 0604 0001 5254 005d 6f6e
         0x0020:  c0a8 026e 0000 0000 0000 c0a8 0282

Similar for __pop_vlan_tci(), the vlan header we remove is the one
overwritten in:

	memmove(skb->data + VLAN_HLEN, skb->data, 2 * ETH_ALEN);

Therefore the VLAN_HLEN = 4 bytes after 2 * ETH_ALEN is the part
we want to sub from checksum.

Cc: David S. Miller <davem@davemloft.net>
Cc: Jesse Gross <jesse@nicira.com>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

net/openvswitch/actions.c
Diff comments   View file @ 7b02408
... ... @@ -58,7 +58,7 @@
58 58  
59 59 if (skb->ip_summed == CHECKSUM_COMPLETE)
60 60 skb->csum = csum_sub(skb->csum, csum_partial(skb->data
61   - + ETH_HLEN, VLAN_HLEN, 0));
  61 + + (2 * ETH_ALEN), VLAN_HLEN, 0));
62 62  
63 63 vhdr = (struct vlan_hdr *)(skb->data + ETH_HLEN);
64 64 *current_tci = vhdr->h_vlan_TCI;
... ... @@ -115,7 +115,7 @@
115 115  
116 116 if (skb->ip_summed == CHECKSUM_COMPLETE)
117 117 skb->csum = csum_add(skb->csum, csum_partial(skb->data
118   - + ETH_HLEN, VLAN_HLEN, 0));
  118 + + (2 * ETH_ALEN), VLAN_HLEN, 0));
119 119  
120 120 }
121 121 __vlan_hwaccel_put_tag(skb, ntohs(vlan->vlan_tci) & ~VLAN_TAG_PRESENT);