diff options
author | Jacob Keller <jacob.e.keller@intel.com> | 2014-08-21 02:16:55 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-09-04 04:38:33 -0400 |
commit | eec66731de41643c9752cccb54b9b1830039a5e9 (patch) | |
tree | 830995e4822a54d6fecd9db8ec3eceac45e2f958 /drivers/net | |
parent | b8a2ca19bc1479745952967ec998fd92de92ec85 (diff) |
ixgbe: add comment noting recalculation of queues
Since we previously called ixgbe_set_num_queues just prior to attempting
to set our interrupt scheme, it may be non obvious why we have to call
it again inside the function. Add a comment which helps make it more
obvious that we are resetting features based on the fact that we do not
have MSI-X enabled, and cannot use the previous settings.
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c index 2d9451e39686..ae36fd61a3aa 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | |||
@@ -1086,6 +1086,11 @@ static void ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter) | |||
1086 | return; | 1086 | return; |
1087 | } | 1087 | } |
1088 | 1088 | ||
1089 | /* At this point, we do not have MSI-X capabilities. We need to | ||
1090 | * reconfigure or disable various features which require MSI-X | ||
1091 | * capability. | ||
1092 | */ | ||
1093 | |||
1089 | /* disable DCB if number of TCs exceeds 1 */ | 1094 | /* disable DCB if number of TCs exceeds 1 */ |
1090 | if (netdev_get_num_tc(adapter->netdev) > 1) { | 1095 | if (netdev_get_num_tc(adapter->netdev) > 1) { |
1091 | e_err(probe, "num TCs exceeds number of queues - disabling DCB\n"); | 1096 | e_err(probe, "num TCs exceeds number of queues - disabling DCB\n"); |
@@ -1107,6 +1112,9 @@ static void ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter) | |||
1107 | /* disable RSS */ | 1112 | /* disable RSS */ |
1108 | adapter->ring_feature[RING_F_RSS].limit = 1; | 1113 | adapter->ring_feature[RING_F_RSS].limit = 1; |
1109 | 1114 | ||
1115 | /* recalculate number of queues now that many features have been | ||
1116 | * changed or disabled. | ||
1117 | */ | ||
1110 | ixgbe_set_num_queues(adapter); | 1118 | ixgbe_set_num_queues(adapter); |
1111 | adapter->num_q_vectors = 1; | 1119 | adapter->num_q_vectors = 1; |
1112 | 1120 | ||