netdev - Re: [PATCH net-2.6] net: bug fix for vlan + gro issue

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20100216114015.GB31642@gondor.apana.org.au>
Date:	Tue, 16 Feb 2010 19:40:15 +0800
From:	Herbert Xu <herbert@...dor.apana.org.au>
To:	Ajit Khaparde <ajitk@...verengines.com>
Cc:	davem@...emloft.net, kaber@...sh.net,
	netdev <netdev@...r.kernel.org>
Subject: Re: [PATCH net-2.6] net: bug fix for vlan + gro issue

On Fri, Feb 12, 2010 at 11:04:53AM +0530, Ajit Khaparde wrote:
>
> diff --git a/net/core/dev.c b/net/core/dev.c
> index be9924f..16aac06 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -2761,7 +2761,10 @@ gro_result_t napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb,
>  	switch (ret) {
>  	case GRO_NORMAL:
>  	case GRO_HELD:
> -		skb->protocol = eth_type_trans(skb, napi->dev);
> +		if (skb->vlan_tci)
> +			skb->protocol = eth_type_trans(skb, skb->dev);
> +		else
> +			skb->protocol = eth_type_trans(skb, napi->dev);

We should be able to just use skb->dev here.

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