]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
netpoll: netpoll_poll_dev() should access dev->flags
authorEric Dumazet <eric.dumazet@gmail.com>
Tue, 14 Feb 2012 10:11:59 +0000 (10:11 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Feb 2012 20:24:26 +0000 (15:24 -0500)
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>
net/core/netpoll.c

index 556b082986696d8b80b09c4f687cff23bc540a45..ddefc513b44a6faf99a7878f6fe651147feaa0cc 100644 (file)
@@ -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;