aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.6
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-01-07 22:51:39 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-01-07 22:51:39 +0000
commit7b0af8193b7c301f48bd00c4ecbcf22014023077 (patch)
tree90f32183b7c6881733ad160d213d246919a2253e /target/linux/brcm47xx/patches-3.6
parent3b27974c7a2801df1eb726f7565d7c3f14bbc42b (diff)
downloadupstream-7b0af8193b7c301f48bd00c4ecbcf22014023077.tar.gz
upstream-7b0af8193b7c301f48bd00c4ecbcf22014023077.tar.bz2
upstream-7b0af8193b7c301f48bd00c4ecbcf22014023077.zip
brcm47xx: BGMAC Driver corrections
1) Fix what appears to be a logic error in bgmac_phy_advertise. 2) Fix bgmac_ioctl to use passed phy_id; needed for switch-robo interface w/ the driver to work correctly. I still have the issue with the interface always being HD when the speed/duplex is set manually (e.g., echo "100FD" > /proc/switch/eth0/port/N/media). Signed-off-by: Nathan Hintz <nlhintz@hotmail.com> SVN-Revision: 35052
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6')
-rw-r--r--target/linux/brcm47xx/patches-3.6/750-bgmac.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/750-bgmac.patch b/target/linux/brcm47xx/patches-3.6/750-bgmac.patch
index 13698dbf74..7668ad38b7 100644
--- a/target/linux/brcm47xx/patches-3.6/750-bgmac.patch
+++ b/target/linux/brcm47xx/patches-3.6/750-bgmac.patch
@@ -608,7 +608,7 @@
+ if (bgmac->phyaddr == BGMAC_PHY_NOREGS)
+ return;
+
-+ if (bgmac->autoneg)
++ if (!bgmac->autoneg)
+ return;
+
+ /* Adv selected 10/100 speeds */
@@ -1097,13 +1097,13 @@
+ case SIOCGMIIREG:
+ if (!netif_running(net_dev))
+ return -EAGAIN;
-+ data->val_out = bgmac_phy_read(bgmac, bgmac->phyaddr,
++ data->val_out = bgmac_phy_read(bgmac, data->phy_id,
+ data->reg_num & 0x1f);
+ return 0;
+ case SIOCSMIIREG:
+ if (!netif_running(net_dev))
+ return -EAGAIN;
-+ bgmac_phy_write(bgmac, bgmac->phyaddr, data->reg_num & 0x1f,
++ bgmac_phy_write(bgmac, data->phy_id, data->reg_num & 0x1f,
+ data->val_in);
+ return 0;
+ default: