---

yaml --- r: 287696 b: refs/heads/master c: 58e05f3 h: refs/heads/master v: v3
git-mirror · Feb 14, 2012 · 68bc777 · 68bc777
1 parent 0b8dfb9
commit 68bc777
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;