From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jarek Poplawski Subject: Re: [PATCH v2] Re: problem with IPoA (CLIP), NAT, and VLANS Date: Tue, 17 Feb 2009 11:53:57 +0000 Message-ID: <20090217115357.GA6130@ff.dom.local> References: <20090216232016.GA4803@ami.dom.local> <499A7D7D.1090607@trash.net> <20090217093908.GB5341@ff.dom.local> <499A99F4.60405@hiramoto.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Patrick McHardy , netdev@vger.kernel.org, netfilter@vger.kernel.org, LKML , David Miller To: Karl Hiramoto Return-path: Received: from fg-out-1718.google.com ([72.14.220.154]:2307 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751253AbZBQLyF (ORCPT ); Tue, 17 Feb 2009 06:54:05 -0500 Content-Disposition: inline In-Reply-To: <499A99F4.60405@hiramoto.org> Sender: netdev-owner@vger.kernel.org List-ID: On Tue, Feb 17, 2009 at 12:05:24PM +0100, Karl Hiramoto wrote: > > > Jarek Poplawski wrote: > > 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. > > > This works on IPoE. I notice no change with or w/o this patch on IPoE > only routing. However has no effect on the original problem i > reported with IPoA --> NAT --> VLAN > > Tested-by: Karl Hiramoto Yes, since it didn't affect the working case with your patch, I didn't expect it would matter here, but it looks like needed so good to know it seems not to make anything wrong at least. Thanks for testing, Jarek P. > > > Reported-by: Karl Hiramoto > > Signed-off-by: Jarek Poplawski > > --- > > > > 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); > > > > -- > > To unsubscribe from this list: send the line "unsubscribe netdev" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > > > >