diff options
| author | Eric Dumazet <[email protected]> | 2012-02-14 10:11:59 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2012-02-14 20:24:26 +0000 |
| commit | 58e05f357a039a94aa36475f8c110256f693a239 (patch) | |
| tree | c9f03ac6514a6e4de646880be1f2e6d7764b8fea | |
| parent | RxRPC: Fix kcalloc parameters swapped (diff) | |
| download | kernel-58e05f357a039a94aa36475f8c110256f693a239.tar.gz kernel-58e05f357a039a94aa36475f8c110256f693a239.zip | |
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 <[email protected]>
Cc: WANG Cong <[email protected]>
Acked-by: Neil Horman <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
| -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 556b08298669..ddefc513b44a 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; |