aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorCarolyn Wyborny <carolyn.wyborny@intel.com>2011-12-01 19:03:15 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-01-02 20:42:02 -0500
commitf83396ad8318db0d5e55756a496af61a217bbfda (patch)
treef45a43af18c8e30c4f75f367a9943750b4ad834d /drivers/net/ethernet
parentf131a6c07ec0eb9d00f99af18be52a6da0458e82 (diff)
igb: Add flow control advertising to ethtool setting.
Added pause flag for bi-directional flow control advertising to ethtool settings. 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>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/intel/igb/igb_ethtool.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index e9335efac386..f1206be4e71d 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -148,7 +148,8 @@ static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
148 SUPPORTED_1000baseT_Full| 148 SUPPORTED_1000baseT_Full|
149 SUPPORTED_Autoneg | 149 SUPPORTED_Autoneg |
150 SUPPORTED_TP); 150 SUPPORTED_TP);
151 ecmd->advertising = ADVERTISED_TP; 151 ecmd->advertising = (ADVERTISED_TP |
152 ADVERTISED_Pause);
152 153
153 if (hw->mac.autoneg == 1) { 154 if (hw->mac.autoneg == 1) {
154 ecmd->advertising |= ADVERTISED_Autoneg; 155 ecmd->advertising |= ADVERTISED_Autoneg;
@@ -165,7 +166,8 @@ static int igb_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
165 166
166 ecmd->advertising = (ADVERTISED_1000baseT_Full | 167 ecmd->advertising = (ADVERTISED_1000baseT_Full |
167 ADVERTISED_FIBRE | 168 ADVERTISED_FIBRE |
168 ADVERTISED_Autoneg); 169 ADVERTISED_Autoneg |
170 ADVERTISED_Pause);
169 171
170 ecmd->port = PORT_FIBRE; 172 ecmd->port = PORT_FIBRE;
171 } 173 }