diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2014-12-07 15:34:28 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-12-07 15:34:28 +0000 |
| commit | 5b0c81ab74b76a53f58a53a6048747fb63a6abcb (patch) | |
| tree | a5ad6e9d20b3cfdd6903deb101c31cf3f2624751 /target/linux/brcm47xx/patches-3.10/211-b44-start_phy.patch | |
| parent | 159bc0e7e99b91e473a028cddd73ff1a2468eae7 (diff) | |
| download | master-187ad058-5b0c81ab74b76a53f58a53a6048747fb63a6abcb.tar.gz master-187ad058-5b0c81ab74b76a53f58a53a6048747fb63a6abcb.tar.bz2 master-187ad058-5b0c81ab74b76a53f58a53a6048747fb63a6abcb.zip | |
brcm47xx: remove kernel 3.10
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43535 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.10/211-b44-start_phy.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.10/211-b44-start_phy.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/211-b44-start_phy.patch b/target/linux/brcm47xx/patches-3.10/211-b44-start_phy.patch deleted file mode 100644 index c5429662ab..0000000000 --- a/target/linux/brcm47xx/patches-3.10/211-b44-start_phy.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/drivers/net/ethernet/broadcom/b44.c -+++ b/drivers/net/ethernet/broadcom/b44.c -@@ -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); - - b44_enable_ints(bp); -+ -+ if (bp->flags & B44_FLAG_EXTERNAL_PHY) -+ phy_start(bp->phydev); -+ - netif_start_queue(dev); - out: - return err; -@@ -1673,6 +1676,9 @@ static int b44_close(struct net_device * - - netif_stop_queue(dev); - -+ if (bp->flags & B44_FLAG_EXTERNAL_PHY) -+ phy_stop(bp->phydev); -+ - napi_disable(&bp->napi); - - 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); - } - } - |