diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-03-01 18:16:57 +0100 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-03-01 18:16:57 +0100 |
| commit | 949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73 (patch) | |
| tree | 9a268cbb25992fdd7147e8af72f68d315ef4caeb /net/core/netpoll.c | |
| parent | 74374e40791f1f7b58252df275dd5227ead88b89 (diff) | |
| parent | bf6a68d2a214e07f7c0d6538e00e17b826714160 (diff) | |
| download | kernel_samsung_crespo-949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73.zip kernel_samsung_crespo-949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73.tar.gz kernel_samsung_crespo-949ad8c06ec4093f51fcefe6fcde1d95f6f6eb73.tar.bz2 | |
Merge branch 'linux-3.0.y' into cm.ics
Diffstat (limited to 'net/core/netpoll.c')
| -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; |