]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
igb: Add flow control advertising to ethtool setting.
authorCarolyn Wyborny <carolyn.wyborny@intel.com>
Fri, 2 Dec 2011 00:03:15 +0000 (00:03 +0000)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 13:05:57 +0000 (21:05 +0800)
Added pause flag for bi-directional flow control advertising to ethtool
settings.

(cherry picked from commit f83396ad8318db0d5e55756a496af61a217bbfda)
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/igb/igb_ethtool.c

index 43873eba2f63eaa157980b078e14c6d56f6d2885..ec3357b160feebf8d3c3c90e1ce21b105922d63c 100644 (file)
@@ -148,7 +148,8 @@ static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
                                   SUPPORTED_1000baseT_Full|
                                   SUPPORTED_Autoneg |
                                   SUPPORTED_TP);
-               ecmd->advertising = ADVERTISED_TP;
+               ecmd->advertising = (ADVERTISED_TP |
+                                    ADVERTISED_Pause);
 
                if (hw->mac.autoneg == 1) {
                        ecmd->advertising |= ADVERTISED_Autoneg;
@@ -165,7 +166,8 @@ static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 
                ecmd->advertising = (ADVERTISED_1000baseT_Full |
                                     ADVERTISED_FIBRE |
-                                    ADVERTISED_Autoneg);
+                                    ADVERTISED_Autoneg |
+                                    ADVERTISED_Pause);
 
                ecmd->port = PORT_FIBRE;
        }