KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

brcm47xx: b44: some fixes in combination with the switch

Browse source 
Let the switch start the carrier and set the duplex mode independently
if this nic is up of not.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 39733
This commit is contained in:
Hauke Mehrtens 2014-02-23 18:51:56 +00:00
parent a90ec7a0ef
commit 5b388e5716
1 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
target/linux/brcm47xx/patches-3.10/211-b44-start_phy.patch
View file

@ -1,6 +1,14 @@
--- a/drivers/net/ethernet/broadcom/b44.c --- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c
@@ -1511,6 +1511,10 @@ static int b44_open(struct net_device *d @@ -576,7 +576,6 @@ static void b44_check_phy(struct b44 *bp
else
val &= ~TX_CTRL_DUPLEX;
bw32(bp, B44_TX_CTRL, val);
- netif_carrier_on(bp->dev);
b44_link_report(bp);
}
return;
@@ -1511,6 +1510,10 @@ static int b44_open(struct net_device *d
add_timer(&bp->timer); add_timer(&bp->timer);
b44_enable_ints(bp); b44_enable_ints(bp);
@ -11,7 +19,7 @@
netif_start_queue(dev); netif_start_queue(dev);
out: out:
return err; return err;
@@ -1673,6 +1677,9 @@ static int b44_close(struct net_device * @@ -1673,6 +1676,9 @@ static int b44_close(struct net_device *
netif_stop_queue(dev); netif_stop_queue(dev);
@ -21,3 +29,19 @@
napi_disable(&bp->napi); napi_disable(&bp->napi);
del_timer_sync(&bp->timer); del_timer_sync(&bp->timer);
@@ -2251,8 +2257,13 @@ static void b44_adjust_link(struct net_d
}
if (status_changed) {
- b44_check_phy(bp);
- phy_print_status(phydev);
+ u32 val = br32(bp, B44_TX_CTRL);
+ if (bp->flags & B44_FLAG_FULL_DUPLEX)
+ val |= TX_CTRL_DUPLEX;
+ else
+ val &= ~TX_CTRL_DUPLEX;
+ bw32(bp, B44_TX_CTRL, val);
+ b44_link_report(bp);
}
}