From 68bc777498da6a7ae92bd4ca0be06809d4468086 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 14 Feb 2012 10:11:59 +0000
Subject: [PATCH] --- yaml --- r: 287696 b: refs/heads/master c:
 58e05f357a039a94aa36475f8c110256f693a239 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/core/netpoll.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;