From: David Miller <davem@davemloft.net>
To: xiaosuo@gmail.com
Cc: kaber@trash.net, netdev@vger.kernel.org, herbert@gondor.apana.org.au
Subject: Re: [PATCH] net: 802.1q: make vlan_hwaccel_do_receive() return void
Date: Sun, 22 Aug 2010 21:03:04 -0700 (PDT) [thread overview]
Message-ID: <20100822.210304.200379828.davem@davemloft.net> (raw)
In-Reply-To: <1282519918-10874-1-git-send-email-xiaosuo@gmail.com>
From: Changli Gao <xiaosuo@gmail.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!
prev parent reply other threads:[~2010-08-23 4:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-22 23:31 [PATCH] net: 802.1q: make vlan_hwaccel_do_receive() return void Changli Gao
2010-08-23 4:03 ` David Miller [this message]
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=20100822.210304.200379828.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=kaber@trash.net \
--cc=netdev@vger.kernel.org \
--cc=xiaosuo@gmail.com \
/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).