diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2010-01-12 20:49:13 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-13 20:12:45 -0500 |
| commit | 1a647bd213d85c88507967104aea79b2649e6a6e (patch) | |
| tree | 67fd2d5d2a5f02b0000ef11650e04a946eb9d2a0 | |
| parent | ff30b3642c1f56a5ae6522b78e82be867086c637 (diff) | |
ixgbe: Do not attempt to perform interrupts in netpoll when down
This patch resolves issues seen when running netconsole and rebooting via
reboot -f. The issue was due to the fact that we were attempting to
perform interrupt actions when the q_vectors and rings had already been
freed via the ixgbe_shutdown routines.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Acked-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 2ad754c864cf..385976709e76 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
| @@ -5576,6 +5576,10 @@ static void ixgbe_netpoll(struct net_device *netdev) | |||
| 5576 | struct ixgbe_adapter *adapter = netdev_priv(netdev); | 5576 | struct ixgbe_adapter *adapter = netdev_priv(netdev); |
| 5577 | int i; | 5577 | int i; |
| 5578 | 5578 | ||
| 5579 | /* if interface is down do nothing */ | ||
| 5580 | if (test_bit(__IXGBE_DOWN, &adapter->state)) | ||
| 5581 | return; | ||
| 5582 | |||
| 5579 | adapter->flags |= IXGBE_FLAG_IN_NETPOLL; | 5583 | adapter->flags |= IXGBE_FLAG_IN_NETPOLL; |
| 5580 | if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) { | 5584 | if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) { |
| 5581 | int num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS; | 5585 | int num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS; |
