diff options
| author |   Nithin Sujir <nsujir@broadcom.com> | 2013-04-09 08:48:01 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-04-09 15:14:14 -0400 |
| commit | f0fcd7a967d3904021caa1574c962ab1b6426e14 (patch) | |
| tree | ecb9648a3045c23c0318af8cf5d1485472b4ff75 /drivers/net/ethernet/broadcom/tg3.c | |
| parent | net: sctp: introduce uapi header for sctp (diff) | |
| download | linux-dev-f0fcd7a967d3904021caa1574c962ab1b6426e14.tar.xz linux-dev-f0fcd7a967d3904021caa1574c962ab1b6426e14.zip | |
tg3: Fix flow control settings not propagated to hardware
In tg3_setup_copper_phy(), if autonegotiation is disabled, we need to
relink only if the speed or duplex does not match the configured
setting. If flow control does not match, a relink is not necessary as
flow control is not a PHY setting. Later on, we'll call
tg3_setup_flow_ctrl() to set up the MAC to the desired flow control
settings if we're in full duplex mode.
Signed-off-by: Nithin Nayak Sujir <nsujir@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.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.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index a4416b09f209..d044adf2718b 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -4587,9 +4587,7 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset) } else { if (!(bmcr & BMCR_ANENABLE) && tp->link_config.speed == current_speed && - tp->link_config.duplex == current_duplex && - tp->link_config.flowctrl == - tp->link_config.active_flowctrl) { + tp->link_config.duplex == current_duplex) { current_link_up = 1; } } |