diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-02-14 10:11:59 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-14 15:24:26 -0500 |
commit | 58e05f357a039a94aa36475f8c110256f693a239 (patch) | |
tree | c9f03ac6514a6e4de646880be1f2e6d7764b8fea /net | |
parent | f65bd5ec47a4461bc575d5d34902fd18b6ec5542 (diff) | |
download | op-kernel-dev-58e05f357a039a94aa36475f8c110256f693a239.zip op-kernel-dev-58e05f357a039a94aa36475f8c110256f693a239.tar.gz |
netpoll: netpoll_poll_dev() should access dev->flags
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/netpoll.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |