From e1d355cd2d31a8cc35a5f070c9e5abd328ad5ed1 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Wed, 13 Jan 2010 01:49:13 +0000 Subject: [PATCH] --- yaml --- r: 179255 b: refs/heads/master c: 1a647bd213d85c88507967104aea79b2649e6a6e h: refs/heads/master i: 179253: 5ebe577a8ade4c905d53573bb05a83a091a446c3 179251: a3909b2e8691d2cc15b5eb2451d9d6520be95106 179247: 8c3773b650da3e75e3d251c35cad68c6a7d8b4c8 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_main.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 729920f1a700..93d638400ecd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff30b3642c1f56a5ae6522b78e82be867086c637 +refs/heads/master: 1a647bd213d85c88507967104aea79b2649e6a6e diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c index 2ad754c864cf..385976709e76 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_main.c +++ b/trunk/drivers/net/ixgbe/ixgbe_main.c @@ -5576,6 +5576,10 @@ static void ixgbe_netpoll(struct net_device *netdev) struct ixgbe_adapter *adapter = netdev_priv(netdev); int i; + /* if interface is down do nothing */ + if (test_bit(__IXGBE_DOWN, &adapter->state)) + return; + adapter->flags |= IXGBE_FLAG_IN_NETPOLL; if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) { int num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;