* [RFC] netpoll: netpoll_poll_dev() should access dev->flags
@ 2012-02-14 11:10 Eric Dumazet
2012-02-14 13:27 ` Neil Horman
2012-02-14 19:42 ` David Miller
0 siblings, 2 replies; 5+ messages in thread
From: Eric Dumazet @ 2012-02-14 11:10 UTC (permalink / raw)
To: Amerigo Wang; +Cc: netdev, Neil Horman
commit 5a698af53f (bond: service netpoll arp queue on master device)
use a dubious test : if (dev->priv_flags & IFF_SLAVE)
It seems to me IFF_SLAVE is present on dev->flags only ?
What am I missing ?
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 4ce473e..3d84fb9 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -205,7 +205,7 @@ static void netpoll_poll_dev(struct net_device *dev)
poll_napi(dev);
- if (dev->priv_flags & IFF_SLAVE) {
+ if (dev->flags & IFF_SLAVE) {
if (dev->npinfo) {
struct net_device *bond_dev = dev->master;
struct sk_buff *skb;
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [RFC] netpoll: netpoll_poll_dev() should access dev->flags
2012-02-14 11:10 [RFC] netpoll: netpoll_poll_dev() should access dev->flags Eric Dumazet
@ 2012-02-14 13:27 ` Neil Horman
2012-02-14 19:42 ` David Miller
1 sibling, 0 replies; 5+ messages in thread
From: Neil Horman @ 2012-02-14 13:27 UTC (permalink / raw)
To: Eric Dumazet; +Cc: Amerigo Wang, netdev
On Tue, Feb 14, 2012 at 12:10:21PM +0100, Eric Dumazet wrote:
> commit 5a698af53f (bond: service netpoll arp queue on master device)
> use a dubious test : if (dev->priv_flags & IFF_SLAVE)
>
> It seems to me IFF_SLAVE is present on dev->flags only ?
>
> What am I missing ?
>
I want to say there was a reason for checking priv_flags, but if there was, it
escapes me now. Either way, ->flags is definately what we want now.
Acked-by: Neil Horman <nhorman@tuxdriver.com>
> diff --git a/net/core/netpoll.c b/net/core/netpoll.c
> index 4ce473e..3d84fb9 100644
> --- a/net/core/netpoll.c
> +++ b/net/core/netpoll.c
> @@ -205,7 +205,7 @@ static void netpoll_poll_dev(struct net_device *dev)
>
> poll_napi(dev);
>
> - if (dev->priv_flags & IFF_SLAVE) {
> + if (dev->flags & IFF_SLAVE) {
> if (dev->npinfo) {
> struct net_device *bond_dev = dev->master;
> struct sk_buff *skb;
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [RFC] netpoll: netpoll_poll_dev() should access dev->flags
2012-02-14 11:10 [RFC] netpoll: netpoll_poll_dev() should access dev->flags Eric Dumazet
2012-02-14 13:27 ` Neil Horman
@ 2012-02-14 19:42 ` David Miller
2012-02-14 20:11 ` [PATCH] " Eric Dumazet
1 sibling, 1 reply; 5+ messages in thread
From: David Miller @ 2012-02-14 19:42 UTC (permalink / raw)
To: eric.dumazet; +Cc: amwang, netdev, nhorman
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 14 Feb 2012 12:10:21 +0100
> commit 5a698af53f (bond: service netpoll arp queue on master device)
> use a dubious test : if (dev->priv_flags & IFF_SLAVE)
>
> It seems to me IFF_SLAVE is present on dev->flags only ?
>
> What am I missing ?
Like Neil, this looks correct to me, please submit this formally.
Thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] netpoll: netpoll_poll_dev() should access dev->flags
2012-02-14 19:42 ` David Miller
@ 2012-02-14 20:11 ` Eric Dumazet
2012-02-14 20:25 ` David Miller
0 siblings, 1 reply; 5+ messages in thread
From: Eric Dumazet @ 2012-02-14 20:11 UTC (permalink / raw)
To: David Miller; +Cc: amwang, netdev, nhorman
commit 5a698af53f (bond: service netpoll arp queue on master device)
tested IFF_SLAVE flag against dev->priv_flags instead of dev->flags
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: WANG Cong <amwang@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
---
net/core/netpoll.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 556b082..ddefc51 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -194,7 +194,7 @@ static void netpoll_poll_dev(struct net_device *dev)
poll_napi(dev);
- if (dev->priv_flags & IFF_SLAVE) {
+ if (dev->flags & IFF_SLAVE) {
if (dev->npinfo) {
struct net_device *bond_dev = dev->master;
struct sk_buff *skb;
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] netpoll: netpoll_poll_dev() should access dev->flags
2012-02-14 20:11 ` [PATCH] " Eric Dumazet
@ 2012-02-14 20:25 ` David Miller
0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2012-02-14 20:25 UTC (permalink / raw)
To: eric.dumazet; +Cc: amwang, netdev, nhorman
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 14 Feb 2012 21:11:59 +0100
> commit 5a698af53f (bond: service netpoll arp queue on master device)
> tested IFF_SLAVE flag against dev->priv_flags instead of dev->flags
>
> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
> Cc: WANG Cong <amwang@redhat.com>
> Acked-by: Neil Horman <nhorman@tuxdriver.com>
Applied and queued up for -stable, thanks Eric.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-02-14 20:26 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-14 11:10 [RFC] netpoll: netpoll_poll_dev() should access dev->flags Eric Dumazet
2012-02-14 13:27 ` Neil Horman
2012-02-14 19:42 ` David Miller
2012-02-14 20:11 ` [PATCH] " Eric Dumazet
2012-02-14 20:25 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox