aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>2009-02-07 05:16:59 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-07 05:16:59 -0500
commit3e450669cc7060d56d886f53e31182f5fef103c7 (patch)
treee5c254dc8b3f0049c8f2cb1b0fc636bc7ef66987
parent2813ddd1bfd681a2fcc1d95530b399a92da89556 (diff)
ixgbe: Fix a set_num_queues() bug that can result in num_(r|t)x_queues = 0
Now that our set_num_queues() routines for each feature are re-entrant, and can be called at any point, they shouldn't zero out the feature's indices or mask bits. Subsequent calls into those routines for those features can result in zero Rx and Tx queues being assigned, causing a panic later in driver reinitialization. Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@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.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 8e270b63e806..a3572d1e0a9a 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2350,8 +2350,6 @@ static inline bool ixgbe_set_dcb_queues(struct ixgbe_adapter *adapter)
2350 adapter->ring_feature[RING_F_DCB].indices; 2350 adapter->ring_feature[RING_F_DCB].indices;
2351 ret = true; 2351 ret = true;
2352 } else { 2352 } else {
2353 adapter->ring_feature[RING_F_DCB].mask = 0;
2354 adapter->ring_feature[RING_F_DCB].indices = 0;
2355 ret = false; 2353 ret = false;
2356 } 2354 }
2357 2355
@@ -2371,8 +2369,6 @@ static inline bool ixgbe_set_rss_queues(struct ixgbe_adapter *adapter)
2371 adapter->ring_feature[RING_F_RSS].indices; 2369 adapter->ring_feature[RING_F_RSS].indices;
2372 ret = true; 2370 ret = true;
2373 } else { 2371 } else {
2374 adapter->ring_feature[RING_F_RSS].mask = 0;
2375 adapter->ring_feature[RING_F_RSS].indices = 0;
2376 ret = false; 2372 ret = false;
2377 } 2373 }
2378 2374