[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20100822.210304.200379828.davem@davemloft.net>
Date: Sun, 22 Aug 2010 21:03:04 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: xiaosuo@...il.com
Cc: kaber@...sh.net, netdev@...r.kernel.org,
herbert@...dor.apana.org.au
Subject: Re: [PATCH] net: 802.1q: make vlan_hwaccel_do_receive() return void
From: Changli Gao <xiaosuo@...il.com>
Date: Mon, 23 Aug 2010 07:31:58 +0800
> @@ -2841,8 +2841,8 @@ static int __netif_receive_skb(struct sk_buff *skb)
> if (!netdev_tstamp_prequeue)
> net_timestamp_check(skb);
>
> - if (vlan_tx_tag_present(skb) && vlan_hwaccel_do_receive(skb))
> - return NET_RX_SUCCESS;
> + if (vlan_tx_tag_present(skb))
> + vlan_hwaccel_do_receive(skb);
>
Ok, I see how this happened. The code here first came from
Patrick:
commit 9b22ea560957de1484e6b3e8538f7eef202e3596
...
net: fix packet socket delivery in rx irq handler
And back then vlan_hwaccel_do_receive() returned "-1" and freed the
packet if cb->dev was NULL.
Herbert then added the GRO containers in:
commit e1c096e251e52773afeffbbcb74d0a072be47ea3
...
vlan: Add GRO interfaces
where skb->dev now stores what cb->dev used to, and the "-1"
return and cb->dev check were thus removed.
Anyways, with how things stand now this patch looks fine and
I'll apply it to net-next-2.6, thanks!
--
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