hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
openwrt-owl/target/linux/brcm47xx/patches-3.10/211-b44-start_phy.patch

48 lines
1.1 KiB
Diff
Raw Normal View History

brcm47xx: b44: start the phy We did not start the PHY when an external phy was in use. Without this patch the driver uses half duplex mode and the switch uses full duplex mode, which causes problems. Thank you fback for spotting this problem. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 39719
2014-02-23 16:58:12 +00:00
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
brcm47xx: b44: some fixes in combination with the switch 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
2014-02-23 18:51:56 +00:00
@@ -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
brcm47xx: b44: start the phy We did not start the PHY when an external phy was in use. Without this patch the driver uses half duplex mode and the switch uses full duplex mode, which causes problems. Thank you fback for spotting this problem. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 39719
2014-02-23 16:58:12 +00:00
add_timer(&bp->timer);
b44_enable_ints(bp);
+
+ if (bp->flags & B44_FLAG_EXTERNAL_PHY)
+ phy_start(bp->phydev);
+
netif_start_queue(dev);
out:
return err;
brcm47xx: b44: some fixes in combination with the switch 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
2014-02-23 18:51:56 +00:00
@@ -1673,6 +1676,9 @@ static int b44_close(struct net_device *
brcm47xx: b44: start the phy We did not start the PHY when an external phy was in use. Without this patch the driver uses half duplex mode and the switch uses full duplex mode, which causes problems. Thank you fback for spotting this problem. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 39719
2014-02-23 16:58:12 +00:00
netif_stop_queue(dev);
+ if (bp->flags & B44_FLAG_EXTERNAL_PHY)
+ phy_stop(bp->phydev);
+
napi_disable(&bp->napi);
del_timer_sync(&bp->timer);
brcm47xx: b44: some fixes in combination with the switch 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
2014-02-23 18:51:56 +00:00
@@ -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);
}
}