aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3/cxgb3_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_main.c')
-rw-r--r--drivers/net/cxgb3/cxgb3_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index e1746eeb34a4..b6b2a46b7d0e 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -1336,8 +1336,10 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
1336 u32 fw_vers = 0; 1336 u32 fw_vers = 0;
1337 u32 tp_vers = 0; 1337 u32 tp_vers = 0;
1338 1338
1339 spin_lock(&adapter->stats_lock);
1339 t3_get_fw_version(adapter, &fw_vers); 1340 t3_get_fw_version(adapter, &fw_vers);
1340 t3_get_tp_version(adapter, &tp_vers); 1341 t3_get_tp_version(adapter, &tp_vers);
1342 spin_unlock(&adapter->stats_lock);
1341 1343
1342 strcpy(info->driver, DRV_NAME); 1344 strcpy(info->driver, DRV_NAME);
1343 strcpy(info->version, DRV_VERSION); 1345 strcpy(info->version, DRV_VERSION);
@@ -2744,7 +2746,7 @@ static void set_nqsets(struct adapter *adap)
2744 int hwports = adap->params.nports; 2746 int hwports = adap->params.nports;
2745 int nqsets = SGE_QSETS; 2747 int nqsets = SGE_QSETS;
2746 2748
2747 if (adap->params.rev > 0) { 2749 if (adap->params.rev > 0 && adap->flags & USING_MSIX) {
2748 if (hwports == 2 && 2750 if (hwports == 2 &&
2749 (hwports * nqsets > SGE_QSETS || 2751 (hwports * nqsets > SGE_QSETS ||
2750 num_cpus >= nqsets / hwports)) 2752 num_cpus >= nqsets / hwports))