---

yaml --- r: 145128 b: refs/heads/master c: 5e39273 h: refs/heads/master v: v3
git-mirror · May 18, 2009 · 3705259 · 3705259
1 parent bb9fbd6
commit 3705259
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74392592bbf7e93ef383588e21aea0c1450d6f12
+refs/heads/master: 5e392739d6ab72f7c35040aa07f4097904bce6e7
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
@@ -175,9 +175,13 @@ static void service_arp_queue(struct netpoll_info *npi)
 void netpoll_poll(struct netpoll *np)
 {
 	struct net_device *dev = np->dev;
-	const struct net_device_ops *ops = dev->netdev_ops;
+	const struct net_device_ops *ops;
+
+	if (!dev || !netif_running(dev))
+		return;
 
-	if (!dev || !netif_running(dev) || !ops->ndo_poll_controller)
+	ops = dev->netdev_ops;
+	if (!ops->ndo_poll_controller)
 		return;
 
 	/* Process pending work on NIC */