diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-02-14 10:11:59 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-29 16:34:06 -0800 |
| commit | 9f8a28dca634c4aa13127ed2ea5de94c1e47dbb7 (patch) | |
| tree | 3897f10686673c82383ae12a8927bfb26990ceb6 /net/core | |
| parent | 1831cd9e1fb43c2e700e795827cb9531e679b0ef (diff) | |
| download | kernel_samsung_smdk4412-9f8a28dca634c4aa13127ed2ea5de94c1e47dbb7.zip kernel_samsung_smdk4412-9f8a28dca634c4aa13127ed2ea5de94c1e47dbb7.tar.gz kernel_samsung_smdk4412-9f8a28dca634c4aa13127ed2ea5de94c1e47dbb7.tar.bz2 | |
netpoll: netpoll_poll_dev() should access dev->flags
[ Upstream commit 58e05f357a039a94aa36475f8c110256f693a239 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/core')
| -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 18d9cbd..05db410 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -193,7 +193,7 @@ 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; |