aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2012-02-14 05:11:59 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-29 19:34:06 -0500
commit9f8a28dca634c4aa13127ed2ea5de94c1e47dbb7 (patch)
tree3897f10686673c82383ae12a8927bfb26990ceb6 /net/core
parent1831cd9e1fb43c2e700e795827cb9531e679b0ef (diff)
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 18d9cbda3a3..05db410fd13 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -193,7 +193,7 @@ void netpoll_poll_dev(struct net_device *dev)
193 193
194 poll_napi(dev); 194 poll_napi(dev);
195 195
196 if (dev->priv_flags & IFF_SLAVE) { 196 if (dev->flags & IFF_SLAVE) {
197 if (dev->npinfo) { 197 if (dev->npinfo) {
198 struct net_device *bond_dev = dev->master; 198 struct net_device *bond_dev = dev->master;
199 struct sk_buff *skb; 199 struct sk_buff *skb;