From 4c3ae373e53bfa03471d1a3e7b656bcac0ef67d7 Mon Sep 17 00:00:00 2001 From: Cong Wang Date: Fri, 22 Feb 2013 17:32:26 +0800 Subject: [PATCH] --- yaml --- r: 361451 b: refs/heads/master c: 7b024082b2b279af58e24ebd46e81777723d58da h: refs/heads/master i: 361449: 4d22ba7abbea17fd5980c7225a151da115397336 361447: 5cf3f390db3156994082348c1c89b17a8296b03a v: v3 --- [refs] | 2 +- trunk/net/openvswitch/actions.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 990a0004e7cf..077ccc3cb6d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17b682a04841233f827073b327c6533e478dfcd4 +refs/heads/master: 7b024082b2b279af58e24ebd46e81777723d58da diff --git a/trunk/net/openvswitch/actions.c b/trunk/net/openvswitch/actions.c index ac2defeeba83..d4d5363c7ba7 100644 --- a/trunk/net/openvswitch/actions.c +++ b/trunk/net/openvswitch/actions.c @@ -58,7 +58,7 @@ static int __pop_vlan_tci(struct sk_buff *skb, __be16 *current_tci) if (skb->ip_summed == CHECKSUM_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; @@ -115,7 +115,7 @@ static int push_vlan(struct sk_buff *skb, const struct ovs_action_push_vlan *vla if (skb->ip_summed == CHECKSUM_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);