[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4D72B69A.3020103@gmail.com>
Date: Sat, 05 Mar 2011 23:18:02 +0100
From: Nicolas de Pesloüan
<nicolas.2p.debian@...il.com>
To: Jiri Pirko <jpirko@...hat.com>
CC: netdev@...r.kernel.org, davem@...emloft.net,
shemminger@...ux-foundation.org, kaber@...sh.net, fubar@...ibm.com,
eric.dumazet@...il.com, andy@...yhouse.net
Subject: Re: [patch net-next-2.6 8/8 v2] net: get rid of orig_dev parameter
of packet handlers
Le 05/03/2011 23:07, Jiri Pirko a écrit :
> Sat, Mar 05, 2011 at 05:56:24PM CET, nicolas.2p.debian@...il.com wrote:
>> Le 05/03/2011 16:32, Jiri Pirko a écrit :
>>> Since orig_dev was used in af_packet (where it was replaced) and by
>>> bonding ptype handlers (which are no longer with us) only, orig_dev
>>> parameter is no longer needed -> toss it out
>>>
>>> Signed-off-by: Jiri Pirko<jpirko@...hat.com>
>>> Reviewed-by: Nicolas de Pesloüan<nicolas.2p.debian@...e.fr>
>>>
>> [snip]
>>
>>> diff --git a/net/core/dev.c b/net/core/dev.c
>>> index 58daddb..c71bd18 100644
>>> --- a/net/core/dev.c
>>> +++ b/net/core/dev.c
>> [snip]
>>> @@ -3216,13 +3214,13 @@ ncls:
>>> (ptype->dev == null_or_dev || ptype->dev == skb->dev ||
>>> ptype->dev == orig_dev)) {
>>> if (pt_prev)
>>> - ret = deliver_skb(skb, pt_prev, orig_dev);
>>> + ret = deliver_skb(skb, pt_prev);
>>> pt_prev = ptype;
>>> }
>>> }
>>>
>>> if (pt_prev) {
>>> - ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
>>> + ret = pt_prev->func(skb, skb->dev, pt_prev);
>>> } else {
>>> atomic_long_inc(&skb->dev->rx_dropped);
>>> kfree_skb(skb);
>>
>> This part does not properly apply on top of current net-next-2.6.
>>
>> Line 3216 is currently
>>
>> (ptype->dev == null_or_dev || ptype->dev == skb->dev)) {
>>
>> Nicolas.
>
>
> depends on "net: allow handlers to be processed for orig_dev" which is a
> regression fixer
>
You are right. I reviewed this patch. :-)
--
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