aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe
diff options
context:
space:
mode:
authorPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>2009-02-07 02:16:59 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-07 02:16:59 -0800
commit3e450669cc7060d56d886f53e31182f5fef103c7 (patch)
treee5c254dc8b3f0049c8f2cb1b0fc636bc7ef66987 /drivers/net/ixgbe
parent2813ddd1bfd681a2fcc1d95530b399a92da89556 (diff)
downloadkernel_samsung_smdk4412-3e450669cc7060d56d886f53e31182f5fef103c7.zip
kernel_samsung_smdk4412-3e450669cc7060d56d886f53e31182f5fef103c7.tar.gz
kernel_samsung_smdk4412-3e450669cc7060d56d886f53e31182f5fef103c7.tar.bz2
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>
Diffstat (limited to 'drivers/net/ixgbe')
-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 8e270b6..a3572d1 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)
adapter->ring_feature[RING_F_DCB].indices;
ret = true;
} else {
- adapter->ring_feature[RING_F_DCB].mask = 0;
- adapter->ring_feature[RING_F_DCB].indices = 0;
ret = false;
}
@@ -2371,8 +2369,6 @@ static inline bool ixgbe_set_rss_queues(struct ixgbe_adapter *adapter)
adapter->ring_feature[RING_F_RSS].indices;
ret = true;
} else {
- adapter->ring_feature[RING_F_RSS].mask = 0;
- adapter->ring_feature[RING_F_RSS].indices = 0;
ret = false;
}