diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-04-09 18:26:03 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-04-09 18:26:03 +0000 |
| commit | 7486cf730ac50b1577276f70a470d19115bec32f (patch) | |
| tree | bb9d76ba9f8ec4365acdbdb30b2436645380581f /target/linux/atheros/patches-2.6.37/220-enet_micrel_workaround.patch | |
| parent | 63c08f0f0b41e1ab3f453ab811a8b51ae54542c6 (diff) | |
| download | mtk-20170518-7486cf730ac50b1577276f70a470d19115bec32f.zip mtk-20170518-7486cf730ac50b1577276f70a470d19115bec32f.tar.gz mtk-20170518-7486cf730ac50b1577276f70a470d19115bec32f.tar.bz2 | |
atheros: merge a few patches into the right place
SVN-Revision: 26556
Diffstat (limited to 'target/linux/atheros/patches-2.6.37/220-enet_micrel_workaround.patch')
| -rw-r--r-- | target/linux/atheros/patches-2.6.37/220-enet_micrel_workaround.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/atheros/patches-2.6.37/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-2.6.37/220-enet_micrel_workaround.patch index 6d0bf47..374b292 100644 --- a/target/linux/atheros/patches-2.6.37/220-enet_micrel_workaround.patch +++ b/target/linux/atheros/patches-2.6.37/220-enet_micrel_workaround.patch @@ -8,7 +8,7 @@ #ifndef ERR #define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args) -@@ -283,6 +284,21 @@ int __init ar231x_probe(struct platform_ +@@ -298,6 +299,21 @@ int __init ar231x_probe(struct platform_ mdiobus_register(sp->mii_bus); @@ -30,7 +30,7 @@ if (ar231x_mdiobus_probe(dev) != 0) { printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name); rx_tasklet_cleanup(dev); -@@ -339,8 +355,10 @@ static int __devexit ar231x_remove(struc +@@ -354,8 +370,10 @@ static int __devexit ar231x_remove(struc rx_tasklet_cleanup(dev); ar231x_init_cleanup(dev); unregister_netdev(dev); @@ -43,7 +43,7 @@ kfree(dev); return 0; } -@@ -841,7 +859,12 @@ static int ar231x_rx_int(struct net_devi +@@ -856,7 +874,12 @@ static int ar231x_rx_int(struct net_devi dev->stats.rx_bytes += skb->len; /* pass the packet to upper layers */ @@ -57,7 +57,7 @@ skb_new->dev = dev; /* 16 bit align */ -@@ -1138,6 +1161,9 @@ static int ar231x_ioctl(struct net_devic +@@ -1153,6 +1176,9 @@ static int ar231x_ioctl(struct net_devic struct ar231x_private *sp = netdev_priv(dev); int ret; |