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

atheros[ar231x-eth]: merge patch

Browse source 
Merge 3_10-updates.patch into the ar2313_ethernet.patch since it contains
only one ethernet driver fix.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

SVN-Revision: 41316
This commit is contained in:
John Crispin 2014-06-24 18:13:09 +00:00
parent c2d95d4106
commit f8893629ec
2 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/atheros/patches-3.10/110-ar2313_ethernet.patch
View file

@ -1258,7 +1258,7 @@
+ BUG_ON(phydev->attached_dev); + BUG_ON(phydev->attached_dev);
+ +
+ phydev = phy_connect(dev, dev_name(&phydev->dev), &ar231x_adjust_link, + phydev = phy_connect(dev, dev_name(&phydev->dev), &ar231x_adjust_link,
+ 0, PHY_INTERFACE_MODE_MII); + PHY_INTERFACE_MODE_MII);
+ +
+ if (IS_ERR(phydev)) { + if (IS_ERR(phydev)) {
+ printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name); + printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);

11
target/linux/atheros/patches-3.10/230-3_10-updates.patch
View file

@ -1,11 +0,0 @@
--- a/drivers/net/ethernet/ar231x/ar231x.c
+++ b/drivers/net/ethernet/ar231x/ar231x.c
@@ -1272,7 +1272,7 @@ static int ar231x_mdiobus_probe(struct n
BUG_ON(phydev->attached_dev);
phydev = phy_connect(dev, dev_name(&phydev->dev), &ar231x_adjust_link,
- 0, PHY_INTERFACE_MODE_MII);
+ PHY_INTERFACE_MODE_MII);
if (IS_ERR(phydev)) {
printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);