diff options
| author |   Don Skidmore <donald.c.skidmore@intel.com> | 2010-12-01 20:54:53 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-12-06 13:16:29 -0800 |
| commit | b8eb3a1046f68a5b8f284830d971c62688cd606b (patch) | |
| tree | 354925d7a60fb63866a588b2c6c55567953602b2 | |
| parent | filter: fix sk_filter rcu handling (diff) | |
| download | linux-dev-b8eb3a1046f68a5b8f284830d971c62688cd606b.tar.xz linux-dev-b8eb3a1046f68a5b8f284830d971c62688cd606b.zip | |
ixgbe: fix possible NULL pointer deference in shutdown path
After freeing the rings we were not zeroing out the ring count values.
This patch now clears these counts correctly.
Reported-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Stephen Ko <stephen.s.ko@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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index fbad4d819608..eee0b298bd36 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -4771,6 +4771,9 @@ void ixgbe_clear_interrupt_scheme(struct ixgbe_adapter *adapter) adapter->rx_ring[i] = NULL; } + adapter->num_tx_queues = 0; + adapter->num_rx_queues = 0; + ixgbe_free_q_vectors(adapter); ixgbe_reset_interrupt_capability(adapter); } |