diff options
Diffstat (limited to 'target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch')
-rw-r--r-- | target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch index 766ec8d409..3d3949bb9d 100644 --- a/target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch +++ b/target/linux/atheros/patches-3.14/220-enet_micrel_workaround.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/ar231x/ar231x.c +++ b/drivers/net/ethernet/atheros/ar231x/ar231x.c -@@ -148,6 +148,7 @@ static int ar231x_mdiobus_write(struct m +@@ -135,6 +135,7 @@ static int ar231x_mdiobus_write(struct m static int ar231x_mdiobus_reset(struct mii_bus *bus); static int ar231x_mdiobus_probe(struct net_device *dev); static void ar231x_adjust_link(struct net_device *dev); @@ -8,7 +8,7 @@ #ifndef ERR #define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args) -@@ -180,6 +181,32 @@ static const struct net_device_ops ar231 +@@ -167,6 +168,32 @@ static const struct net_device_ops ar231 #endif }; @@ -41,7 +41,7 @@ static int ar231x_probe(struct platform_device *pdev) { struct net_device *dev; -@@ -286,6 +313,24 @@ static int ar231x_probe(struct platform_ +@@ -273,6 +300,24 @@ static int ar231x_probe(struct platform_ mdiobus_register(sp->mii_bus); @@ -66,7 +66,7 @@ if (ar231x_mdiobus_probe(dev) != 0) { printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name); rx_tasklet_cleanup(dev); -@@ -343,8 +388,10 @@ static int ar231x_remove(struct platform +@@ -330,8 +375,10 @@ static int ar231x_remove(struct platform rx_tasklet_cleanup(dev); ar231x_init_cleanup(dev); unregister_netdev(dev); @@ -79,7 +79,7 @@ kfree(dev); return 0; } -@@ -1103,6 +1150,9 @@ static int ar231x_ioctl(struct net_devic +@@ -1090,6 +1137,9 @@ static int ar231x_ioctl(struct net_devic { struct ar231x_private *sp = netdev_priv(dev); |