[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20081009103956.GA18751@gondor.apana.org.au>
Date: Thu, 9 Oct 2008 18:39:56 +0800
From: Herbert Xu <herbert@...dor.apana.org.au>
To: Philip Craig <philipc@...pgear.com>
Cc: "David S. Miller" <davem@...emloft.net>, netdev@...r.kernel.org,
Patrick McHardy <kaber@...sh.net>
Subject: Re: [PATCH 4/4] gre: Add Transparent Ethernet Bridging
On Thu, Oct 09, 2008 at 06:43:21PM +1000, Philip Craig wrote:
>
> Herbert Xu wrote:
> > @@ -530,7 +572,13 @@ static int ipgre_rcv(struct sk_buff *skb)
> > dst_release(skb->dst);
> > skb->dst = NULL;
> > nf_reset(skb);
> > +
> > + if (tunnel->dev->type == ARPHRD_ETHER)
> > + skb->protocol = eth_type_trans(skb, skb->dev);
>
> Do you need to check pskb_may_pull(skb, ETH_HLEN)?
Good point, I'll fix this up.
> +/*
> + * We've finished passing through netfilter, so we can remove the fake dst.
> + * This is required by some lower layers, eg ip_gre
> + */
> +static int br_nf_dev_queue_xmit_finish(struct sk_buff *skb)
> +{
> + if (skb->dst == (struct dst_entry *)&__fake_rtable) {
> + dst_release(skb->dst);
> + skb->dst = NULL;
> + }
> +
> + return br_dev_queue_push_xmit(skb);
> +}
Alternatively we could give fake_rtable an ops structure.
Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@...dor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists