igb: Add support for quad port WOL and feature flags

Change igb from using a series of boolean operators to using a single flags
value that contains a number of different bit flags for all the different
features of the adapter.

This patch also adds WOL support for quad port adapters.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c
index e27d5a533b4f..ef209b5cd390 100644
--- a/drivers/net/igb/igb_ethtool.c
+++ b/drivers/net/igb/igb_ethtool.c
@@ -1097,7 +1097,7 @@ static int igb_intr_test(struct igb_adapter *adapter, u64 *data)
         if (adapter->msix_entries) {
                 /* NOTE: we don't test MSI-X interrupts here, yet */
                 return 0;
-        } else if (adapter->msi_enabled) {
+        } else if (adapter->flags & IGB_FLAG_HAS_MSI) {
                 shared_int = false;
                 if (request_irq(irq, &igb_test_intr, 0, netdev->name, netdev)) {
                         *data = 1;
@@ -1727,7 +1727,6 @@ static int igb_wol_exclusion(struct igb_adapter *adapter,
 
         switch (hw->device_id) {
         case E1000_DEV_ID_82575GB_QUAD_COPPER:
-        case E1000_DEV_ID_82576_QUAD_COPPER:
                 /* WoL not supported */
                 wol->supported = 0;
                 break;
@@ -1742,6 +1741,15 @@ static int igb_wol_exclusion(struct igb_adapter *adapter,
                 /* return success for non excluded adapter ports */
                 retval = 0;
                 break;
+        case E1000_DEV_ID_82576_QUAD_COPPER:
+                /* quad port adapters only support WoL on port A */
+                if (!(adapter->flags & IGB_FLAG_QUAD_PORT_A)) {
+                        wol->supported = 0;
+                        break;
+                }
+                /* return success for non excluded adapter ports */
+                retval = 0;
+                break;
         default:
                 /* dual port cards only support WoL on port A from now on
                  * unless it was enabled in the eeprom for port B