diff --git a/[refs] b/[refs] index 0a293b8f8232..38ffa2542176 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f65bd5ec47a4461bc575d5d34902fd18b6ec5542 +refs/heads/master: 58e05f357a039a94aa36475f8c110256f693a239 diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c index 556b08298669..ddefc513b44a 100644 --- a/trunk/net/core/netpoll.c +++ b/trunk/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;