Message ID | 1329250319.2555.4.camel@edumazet-laptop |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;