diff options
| author | David S. Miller <davem@davemloft.net> | 2013-03-15 09:00:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-15 09:00:39 -0400 |
| commit | 296b60109e0a2dfae4d22b393744634ca6322822 (patch) | |
| tree | 88bd4277e8fc4d9b9fa35c6414c9a7e05ccb45a2 /net/openvswitch/actions.c | |
| parent | 3f104c38259dcb3e5443c246f0805bc04d887cc3 (diff) | |
| parent | d176ca2a48ff2b5d7becfacdcbd1d72c73bd22d1 (diff) | |
| download | op-kernel-dev-296b60109e0a2dfae4d22b393744634ca6322822.zip op-kernel-dev-296b60109e0a2dfae4d22b393744634ca6322822.tar.gz | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Jesse Gross says:
====================
A few different bug fixes, including several for issues with userspace
communication that have gone unnoticed up until now. These are intended
for net/3.9.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/actions.c')
| -rw-r--r-- | net/openvswitch/actions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c index ac2defe..d4d5363 100644 --- a/net/openvswitch/actions.c +++ b/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); |
