diff options
| author |   Don Dugger <donald.d.dugger@intel.com> | 2015-10-29 22:15:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-10-29 22:15:25 +0000 |
| commit | afc76d554ed517e38d46b6b182a7016406a1323f (patch) | |
| tree | 06133cb33a43488837ea67667458e1582f2f40ce /kernel/drivers/net/ethernet/intel/igb/igb_ethtool.c | |
| parent | 41f827bfbb10e03c4d228fbcc801dd51fb9983b0 (diff) | |
| parent | ec0a2ed6d8a5e555edef907895c041e285fdb495 (diff) | |
Merge "These changes are a raw update to a vanilla kernel 4.1.10, with the recently announced rt patch patch-4.1.10-rt10.patch. No further changes needed."
Diffstat (limited to 'kernel/drivers/net/ethernet/intel/igb/igb_ethtool.c')
| -rw-r--r-- | kernel/drivers/net/ethernet/intel/igb/igb_ethtool.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/drivers/net/ethernet/intel/igb/igb_ethtool.c b/kernel/drivers/net/ethernet/intel/igb/igb_ethtool.c index d5673eb90..0afc0913e 100644 --- a/kernel/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/kernel/drivers/net/ethernet/intel/igb/igb_ethtool.c @@ -2991,6 +2991,7 @@ static int igb_set_channels(struct net_device *netdev, { struct igb_adapter *adapter = netdev_priv(netdev); unsigned int count = ch->combined_count; + unsigned int max_combined = 0; /* Verify they are not requesting separate vectors */ if (!count || ch->rx_count || ch->tx_count) @@ -3001,11 +3002,13 @@ static int igb_set_channels(struct net_device *netdev, return -EINVAL; /* Verify the number of channels doesn't exceed hw limits */ - if (count > igb_max_channels(adapter)) + max_combined = igb_max_channels(adapter); + if (count > max_combined) return -EINVAL; if (count != adapter->rss_queues) { adapter->rss_queues = count; + igb_set_flag_queue_pairs(adapter, max_combined); /* Hardware has to reinitialize queues and interrupts to * match the new configuration. |