From d91f614601739dd40eb1b9e3715e20d8027e160b Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Thu, 8 Dec 2011 14:40:17 +0000 Subject: [PATCH] --- yaml --- r: 278516 b: refs/heads/master c: 4a2db503c57f7223d851dc7ab8cefca614e0d98a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/tg3.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a864c3d4fada..596b69eac529 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 859edb2631c31813e63cbff7a81ced4f853b63ed +refs/heads/master: 4a2db503c57f7223d851dc7ab8cefca614e0d98a diff --git a/trunk/drivers/net/ethernet/broadcom/tg3.c b/trunk/drivers/net/ethernet/broadcom/tg3.c index 924dce5afa24..28a959da0514 100644 --- a/trunk/drivers/net/ethernet/broadcom/tg3.c +++ b/trunk/drivers/net/ethernet/broadcom/tg3.c @@ -10596,12 +10596,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;