diff options
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_ethtool.c')
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_ethtool.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c index 1c7d2381af8c..1df02378de69 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c | |||
@@ -1386,7 +1386,7 @@ static int igb_intr_test(struct igb_adapter *adapter, u64 *data) | |||
1386 | *data = 0; | 1386 | *data = 0; |
1387 | 1387 | ||
1388 | /* Hook up test interrupt handler just for this test */ | 1388 | /* Hook up test interrupt handler just for this test */ |
1389 | if (adapter->msix_entries) { | 1389 | if (adapter->flags & IGB_FLAG_HAS_MSIX) { |
1390 | if (request_irq(adapter->msix_entries[0].vector, | 1390 | if (request_irq(adapter->msix_entries[0].vector, |
1391 | igb_test_intr, 0, netdev->name, adapter)) { | 1391 | igb_test_intr, 0, netdev->name, adapter)) { |
1392 | *data = 1; | 1392 | *data = 1; |
@@ -1519,7 +1519,7 @@ static int igb_intr_test(struct igb_adapter *adapter, u64 *data) | |||
1519 | msleep(10); | 1519 | msleep(10); |
1520 | 1520 | ||
1521 | /* Unhook test interrupt handler */ | 1521 | /* Unhook test interrupt handler */ |
1522 | if (adapter->msix_entries) | 1522 | if (adapter->flags & IGB_FLAG_HAS_MSIX) |
1523 | free_irq(adapter->msix_entries[0].vector, adapter); | 1523 | free_irq(adapter->msix_entries[0].vector, adapter); |
1524 | else | 1524 | else |
1525 | free_irq(irq, adapter); | 1525 | free_irq(irq, adapter); |
@@ -2933,7 +2933,7 @@ static void igb_get_channels(struct net_device *netdev, | |||
2933 | ch->max_combined = igb_max_channels(adapter); | 2933 | ch->max_combined = igb_max_channels(adapter); |
2934 | 2934 | ||
2935 | /* Report info for other vector */ | 2935 | /* Report info for other vector */ |
2936 | if (adapter->msix_entries) { | 2936 | if (adapter->flags & IGB_FLAG_HAS_MSIX) { |
2937 | ch->max_other = NON_Q_VECTORS; | 2937 | ch->max_other = NON_Q_VECTORS; |
2938 | ch->other_count = NON_Q_VECTORS; | 2938 | ch->other_count = NON_Q_VECTORS; |
2939 | } | 2939 | } |