aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/tg3.c
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2011-12-08 09:40:17 -0500
committerDavid S. Miller <davem@davemloft.net>2011-12-08 19:43:48 -0500
commit4a2db503c57f7223d851dc7ab8cefca614e0d98a (patch)
tree59ab0e259394d3e67fc68aa11fa3807d43272e5c /drivers/net/ethernet/broadcom/tg3.c
parent859edb2631c31813e63cbff7a81ced4f853b63ed (diff)
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. 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>
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
-rw-r--r--drivers/net/ethernet/broadcom/tg3.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 924dce5afa24..28a959da0514 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -10596,12 +10596,12 @@ static void tg3_get_pauseparam(struct net_device *dev, struct ethtool_pauseparam
10596 10596
10597 epause->autoneg = !!tg3_flag(tp, PAUSE_AUTONEG); 10597 epause->autoneg = !!tg3_flag(tp, PAUSE_AUTONEG);
10598 10598
10599 if (tp->link_config.active_flowctrl & FLOW_CTRL_RX) 10599 if (tp->link_config.flowctrl & FLOW_CTRL_RX)
10600 epause->rx_pause = 1; 10600 epause->rx_pause = 1;
10601 else 10601 else
10602 epause->rx_pause = 0; 10602 epause->rx_pause = 0;
10603 10603
10604 if (tp->link_config.active_flowctrl & FLOW_CTRL_TX) 10604 if (tp->link_config.flowctrl & FLOW_CTRL_TX)
10605 epause->tx_pause = 1; 10605 epause->tx_pause = 1;
10606 else 10606 else
10607 epause->tx_pause = 0; 10607 epause->tx_pause = 0;