summaryrefslogtreecommitdiff
path: root/target/linux/atheros/patches-2.6.32
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-07-30 09:59:13 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-07-30 09:59:13 +0000
commit42738aa9ad5e342f043c5d557b070770cad5fd65 (patch)
treed4ba82e26401565ca17e052c28d312b53157eb05 /target/linux/atheros/patches-2.6.32
parent02549b044817d7baae4981991b82e91e2794c860 (diff)
downloadmtk-20170518-42738aa9ad5e342f043c5d557b070770cad5fd65.zip
mtk-20170518-42738aa9ad5e342f043c5d557b070770cad5fd65.tar.gz
mtk-20170518-42738aa9ad5e342f043c5d557b070770cad5fd65.tar.bz2
add missing bits & bytes from r22412
SVN-Revision: 22416
Diffstat (limited to 'target/linux/atheros/patches-2.6.32')
-rw-r--r--target/linux/atheros/patches-2.6.32/110-ar2313_ethernet.patch14
1 files changed, 13 insertions, 1 deletions
diff --git a/target/linux/atheros/patches-2.6.32/110-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.32/110-ar2313_ethernet.patch
index 7e6bc91..22fadd0 100644
--- a/target/linux/atheros/patches-2.6.32/110-ar2313_ethernet.patch
+++ b/target/linux/atheros/patches-2.6.32/110-ar2313_ethernet.patch
@@ -25,7 +25,7 @@
obj-$(CONFIG_DECLANCE) += declance.o
--- /dev/null
+++ b/drivers/net/ar231x.c
-@@ -0,0 +1,1266 @@
+@@ -0,0 +1,1278 @@
+/*
+ * ar231x.c: Linux driver for the Atheros AR231x Ethernet device.
+ *
@@ -170,6 +170,7 @@
+static void rx_tasklet_func(unsigned long data);
+static void rx_tasklet_cleanup(struct net_device *dev);
+static void ar231x_multicast_list(struct net_device *dev);
++static void ar231x_tx_timeout(struct net_device *dev);
+
+static int ar231x_mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum);
+static int ar231x_mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum, u16 value);
@@ -190,6 +191,7 @@
+ .ndo_change_mtu = eth_change_mtu,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_set_mac_address = eth_mac_addr,
++ .ndo_tx_timeout = ar231x_tx_timeout,
+};
+
+int __init ar231x_probe(struct platform_device *pdev)
@@ -1039,6 +1041,16 @@
+ return 0;
+}
+
++static void ar231x_tx_timeout(struct net_device *dev)
++{
++ struct ar231x_private *sp = netdev_priv(dev);
++ unsigned long flags;
++
++ spin_lock_irqsave(&sp->lock, flags);
++ ar231x_restart(dev);
++ spin_unlock_irqrestore(&sp->lock, flags);
++}
++
+static void ar231x_halt(struct net_device *dev)
+{
+ struct ar231x_private *sp = netdev_priv(dev);