3 files changed, 22 insertions, 5 deletions

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index 91f871b6b3ba..da7e580f517a 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -1955,12 +1955,21 @@ static int ixgbe_wol_exclusion(struct ixgbe_adapter *adapter,
         /* WOL not supported except for the following */
         switch(hw->device_id) {
         case IXGBE_DEV_ID_82599_SFP:
-                /* Only this subdevice supports WOL */
-                if (hw->subsystem_device_id != IXGBE_SUBDEV_ID_82599_SFP) {
+                /* Only these subdevices could supports WOL */
+                switch (hw->subsystem_device_id) {
+                case IXGBE_SUBDEV_ID_82599_560FLR:
+                        /* only support first port */
+                        if (hw->bus.func != 0) {
+                                wol->supported = 0;
+                                break;
+                        }
+                case IXGBE_SUBDEV_ID_82599_SFP:
+                        retval = 0;
+                        break;
+                default:
                         wol->supported = 0;
                         break;
                 }
-                retval = 0;
                 break;
         case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:
                 /* All except this subdevice support WOL */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index e27e4d10411e..74669a8c060e 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7605,9 +7605,16 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         adapter->wol = 0;
         switch (pdev->device) {
         case IXGBE_DEV_ID_82599_SFP:
-                /* Only this subdevice supports WOL */
-                if (pdev->subsystem_device == IXGBE_SUBDEV_ID_82599_SFP)
+                /* Only these subdevice supports WOL */
+                switch (pdev->subsystem_device) {
+                case IXGBE_SUBDEV_ID_82599_560FLR:
+                        /* only support first port */
+                        if (hw->bus.func != 0)
+                                break;
+                case IXGBE_SUBDEV_ID_82599_SFP:
                         adapter->wol = IXGBE_WUFC_MAG;
+                        break;
+                }
                 break;
         case IXGBE_DEV_ID_82599_COMBO_BACKPLANE:
                 /* All except this subdevice support WOL */
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
index 7c5817f8a951..802bfa0f62cc 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
@@ -57,6 +57,7 @@
 #define IXGBE_DEV_ID_82599_BACKPLANE_FCOE       0x152a
 #define IXGBE_DEV_ID_82599_SFP_FCOE      0x1529
 #define IXGBE_SUBDEV_ID_82599_SFP        0x11A9
+#define IXGBE_SUBDEV_ID_82599_560FLR     0x17D0
 #define IXGBE_DEV_ID_82599_SFP_EM        0x1507
 #define IXGBE_DEV_ID_82599_SFP_SF2       0x154D
 #define IXGBE_DEV_ID_82599EN_SFP         0x1557