From: Matt Carlson <mcarlson@broadcom.com>
Date: Thu, 8 Dec 2011 14:40:17 +0000 (+0000)
Subject: tg3: Return flowctrl config through ethtool
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~652
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=84f0e1568a3001a2bc1f593a1c33517dbb57a238;p=users%2Fjedix%2Flinux-maple.git

tg3: Return flowctrl config through ethtool

This patch changes the driver to return the flow control configuration
rather than the flow control status through the ETHTOOL_GPAUSEPARAM
ioctl.

(cherry picked from commit 4a2db503c57f7223d851dc7ab8cefca614e0d98a)
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Reviewed-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index d7892488665e3..73780912867ec 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -10610,12 +10610,12 @@ static void tg3_get_pauseparam(struct net_device *dev, struct ethtool_pauseparam
 
 	epause->autoneg = !!tg3_flag(tp, PAUSE_AUTONEG);
 
-	if (tp->link_config.active_flowctrl & FLOW_CTRL_RX)
+	if (tp->link_config.flowctrl & FLOW_CTRL_RX)
 		epause->rx_pause = 1;
 	else
 		epause->rx_pause = 0;
 
-	if (tp->link_config.active_flowctrl & FLOW_CTRL_TX)
+	if (tp->link_config.flowctrl & FLOW_CTRL_TX)
 		epause->tx_pause = 1;
 	else
 		epause->tx_pause = 0;