diff options
| author | Cong Wang <amwang@redhat.com> | 2013-02-22 19:22:41 -0800 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2013-02-22 19:29:03 -0800 |
| commit | 38ed79333f2a2554912210a10df6aeddd67046ec (patch) | |
| tree | f3b09cb4317ace39e28dec40f5f1a43b5e800a71 | |
| parent | e50c92b362c38f2741fd0d05902d4715da2391f2 (diff) | |
| download | openvswitch-38ed79333f2a2554912210a10df6aeddd67046ec.tar.gz | |
datapath: 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>
| -rw-r--r-- | datapath/actions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/datapath/actions.c b/datapath/actions.c index 57e6bcb01..808a3b65d 100644 --- a/datapath/actions.c +++ b/datapath/actions.c @@ -59,7 +59,7 @@ static int __pop_vlan_tci(struct sk_buff *skb, __be16 *current_tci) if (get_ip_summed(skb) == OVS_CSUM_COMPLETE) skb->csum = csum_sub(skb->csum, csum_partial(skb->data - + ETH_HLEN, VLAN_HLEN, 0)); + + (2 * ETH_ALEN), VLAN_HLEN, 0)); vhdr = (struct vlan_hdr *)(skb->data + ETH_HLEN); *current_tci = vhdr->h_vlan_TCI; @@ -116,7 +116,7 @@ static int push_vlan(struct sk_buff *skb, const struct ovs_action_push_vlan *vla if (get_ip_summed(skb) == OVS_CSUM_COMPLETE) skb->csum = csum_add(skb->csum, csum_partial(skb->data - + ETH_HLEN, VLAN_HLEN, 0)); + + (2 * ETH_ALEN), VLAN_HLEN, 0)); } __vlan_hwaccel_put_tag(skb, ntohs(vlan->vlan_tci) & ~VLAN_TAG_PRESENT); |