[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAJFZqHz98BgYENLrHvUCw2fr40hhV7EoAirnXsaahjau+QzN9Q@mail.gmail.com>
Date: Tue, 18 Mar 2014 08:04:38 +0800
From: Li RongQing <roy.qing.li@...il.com>
To: Sergei Shtylyov <sergei.shtylyov@...entembedded.com>
Cc: netdev@...r.kernel.org, Cong Wang <amwang@...hat.com>,
nhorman@...driver.com
Subject: Re: [PATCH] netpoll: send arp reply on master device immediately
this patch can be dropped since other patch has been merged into
net-next[netpoll: Remove dead packet receive code
(CONFIG_NETPOLL_TRAP)]
On Mon, Mar 17, 2014 at 8:41 PM, Sergei Shtylyov
<sergei.shtylyov@...entembedded.com> wrote:
> Hello.
>
>
> On 17-03-2014 11:41, roy.qing.li@...il.com wrote:
>
>> From: Li RongQing <roy.qing.li@...il.com>
>
>
>> 1. the arp queue has been moved from slave device to master, so the
>> master device netpoll_info should be as input of service_arp_queue()
>> 2. not need to check if ni is NULL or not, since it has been used before.
>
>
>> Signed-off-by: Li RongQing <roy.qing.li@...il.com>
>> Cc: WANG Cong <amwang@...hat.com>
>> Cc: Neil Horman <nhorman@...driver.com>
>> ---
>> net/core/netpoll.c | 26 ++++++++++++--------------
>> 1 file changed, 12 insertions(+), 14 deletions(-)
>
>
>> diff --git a/net/core/netpoll.c b/net/core/netpoll.c
>> index a664f78..dd0a796 100644
>> --- a/net/core/netpoll.c
>> +++ b/net/core/netpoll.c
>> @@ -229,21 +229,19 @@ static void netpoll_poll_dev(struct net_device *dev)
>> up(&ni->dev_lock);
>>
>> if (dev->flags & IFF_SLAVE) {
>
> [...]
>
>> + struct net_device *bond_dev;
>> + struct sk_buff *skb;
>> + struct netpoll_info *bond_ni;
>>
>> - service_neigh_queue(ni);
>> + bond_dev = netdev_master_upper_dev_get_rcu(dev);
>> + bond_ni = rcu_dereference_bh(bond_dev->npinfo);
>> + while ((skb = skb_dequeue(&ni->neigh_tx))) {
>> + skb->dev = bond_dev;
>> + skb_queue_tail(&bond_ni->neigh_tx, skb);
>> + }
>> + service_neigh_queue(bond_ni);
>> + } else
>> + service_neigh_queue(ni);
>
>
> The *else* branch should also have {}, according to
> Documentation/CodingStyle.
>
> WBR, Sergei
>
--
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