From 37052594e2e7a167d3b73e3b9ea99bc83ccf4160 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Mon, 11 May 2009 00:36:35 +0000 Subject: [PATCH] --- yaml --- r: 145128 b: refs/heads/master c: 5e392739d6ab72f7c35040aa07f4097904bce6e7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/netpoll.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4dab3846ba29..57e4f30260be 100644 --- 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 index b5873bdff612..64f51eec6576 100644 --- 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 */