diff options
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_main.c')
| -rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 4 | 
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 1ace41a13ac..2c341f83d32 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c @@ -1307,8 +1307,10 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)  	u32 fw_vers = 0;  	u32 tp_vers = 0; +	spin_lock(&adapter->stats_lock);  	t3_get_fw_version(adapter, &fw_vers);  	t3_get_tp_version(adapter, &tp_vers); +	spin_unlock(&adapter->stats_lock);  	strcpy(info->driver, DRV_NAME);  	strcpy(info->version, DRV_VERSION); @@ -2699,7 +2701,7 @@ static void set_nqsets(struct adapter *adap)  	int hwports = adap->params.nports;  	int nqsets = SGE_QSETS; -	if (adap->params.rev > 0) { +	if (adap->params.rev > 0 && adap->flags & USING_MSIX) {  		if (hwports == 2 &&  		    (hwports * nqsets > SGE_QSETS ||  		     num_cpus >= nqsets / hwports))  |