diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2016-10-12 00:25:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 00:25:31 +0200 |
| commit | 7f0cba3eb9b5ab3a575875593777f269363c4d42 (patch) | |
| tree | 429c4f8fe8958660a2018be53612522c4dfe5bb5 /target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c | |
| parent | 9d73574fd9eb9829e5d8a03813001843a210a551 (diff) | |
| parent | 9c840109de4494b3ecc29917090deb13518338ad (diff) | |
| download | master-187ad058-7f0cba3eb9b5ab3a575875593777f269363c4d42.tar.gz master-187ad058-7f0cba3eb9b5ab3a575875593777f269363c4d42.tar.bz2 master-187ad058-7f0cba3eb9b5ab3a575875593777f269363c4d42.zip | |
Merge pull request #126 from wigyori/master
ar71xx: backport flow-control related patches
Diffstat (limited to 'target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c')
| -rw-r--r-- | target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c index d5253609cd..0ae6acf119 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c @@ -453,16 +453,11 @@ static void ag71xx_hw_stop(struct ag71xx *ag) static void ag71xx_hw_setup(struct ag71xx *ag) { struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag); - struct ag71xx_mdio_platform_data *mpdata; u32 init = MAC_CFG1_INIT; - if (pdata->mii_bus_dev && ag->pdev->id == 0) { - mpdata = pdata->mii_bus_dev->platform_data; - if (mpdata && mpdata->builtin_switch) - init |= MAC_CFG1_TFC | MAC_CFG1_RFC; - } - /* setup MAC configuration registers */ + if (pdata->use_flow_control) + init |= MAC_CFG1_TFC | MAC_CFG1_RFC; ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, init); ag71xx_sb(ag, AG71XX_REG_MAC_CFG2, |