From: Jarek Poplawski <jarkao2@gmail.com>
To: Patrick McHardy <kaber@trash.net>
Cc: Karl Hiramoto <karl@hiramoto.org>,
netdev@vger.kernel.org, netfilter@vger.kernel.org,
LKML <linux-kernel@vger.kernel.org>,
David Miller <davem@davemloft.net>
Subject: [PATCH v2] Re: problem with IPoA (CLIP), NAT, and VLANS
Date: Tue, 17 Feb 2009 09:39:08 +0000 [thread overview]
Message-ID: <20090217093908.GB5341@ff.dom.local> (raw)
In-Reply-To: <499A7D7D.1090607@trash.net>
Sorry:
-----------------> take 2: changelog fix only
vlan: Update skb->mac_header in __vlan_put_tag().
After moving mac addresses in __vlan_put_tag() skb->mac_header needs
to be updated.
Reported-by: Karl Hiramoto <karl@hiramoto.org>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
---
include/linux/if_vlan.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index f8ff918..e1ff5b1 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -210,6 +210,7 @@ static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, u16 vlan_tci)
/* Move the mac addresses to the beginning of the new header. */
memmove(skb->data, skb->data + VLAN_HLEN, 2 * VLAN_ETH_ALEN);
+ skb->mac_header -= VLAN_HLEN;
/* first, the ethernet type */
veth->h_vlan_proto = htons(ETH_P_8021Q);
next prev parent reply other threads:[~2009-02-17 9:39 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-12 13:28 problem with IPoA (CLIP), NAT, and VLANS Karl Hiramoto
2009-02-16 15:02 ` Karl Hiramoto
2009-02-16 23:20 ` Jarek Poplawski
2009-02-17 9:03 ` Patrick McHardy
2009-02-17 9:32 ` [PATCH] " Jarek Poplawski
2009-02-17 9:39 ` Jarek Poplawski [this message]
2009-02-17 11:05 ` [PATCH v2] " Karl Hiramoto
2009-02-17 11:53 ` Jarek Poplawski
2009-02-19 7:31 ` David Miller
2009-02-17 9:52 ` Jarek Poplawski
2009-02-17 11:49 ` Karl Hiramoto
2009-02-17 12:20 ` Jarek Poplawski
2009-02-17 12:53 ` Karl Hiramoto
2009-02-17 13:37 ` Jarek Poplawski
2009-02-17 23:12 ` Jarek Poplawski
2009-02-18 17:47 ` Karl Hiramoto
2009-02-18 21:05 ` Jarek Poplawski
2009-02-19 7:30 ` Jarek Poplawski
2009-02-17 12:28 ` Patrick McHardy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090217093908.GB5341@ff.dom.local \
--to=jarkao2@gmail.com \
--cc=davem@davemloft.net \
--cc=kaber@trash.net \
--cc=karl@hiramoto.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).