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 | 80f26b889a82deb4559f478de17392ea145d153a (patch) | |
tree | e6c551e267b368b6e6561ea11c55120e85ef4da9 /target/linux/atheros/patches-2.6.37/240-ar231x_netpoll.patch | |
parent | 1b6ea1dadba8a00f8aafbc50ec7620651f0c10af (diff) | |
download | master-187ad058-80f26b889a82deb4559f478de17392ea145d153a.tar.gz master-187ad058-80f26b889a82deb4559f478de17392ea145d153a.tar.bz2 master-187ad058-80f26b889a82deb4559f478de17392ea145d153a.zip |
atheros: merge a few patches into the right place
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26556 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-2.6.37/240-ar231x_netpoll.patch')
-rw-r--r-- | target/linux/atheros/patches-2.6.37/240-ar231x_netpoll.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/target/linux/atheros/patches-2.6.37/240-ar231x_netpoll.patch b/target/linux/atheros/patches-2.6.37/240-ar231x_netpoll.patch deleted file mode 100644 index c2f3d26a92..0000000000 --- a/target/linux/atheros/patches-2.6.37/240-ar231x_netpoll.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/drivers/net/ar231x.c -+++ b/drivers/net/ar231x.c -@@ -155,6 +155,18 @@ - #define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args) - #endif - -+#ifdef CONFIG_NET_POLL_CONTROLLER -+static void -+ar231x_netpoll(struct net_device *dev) -+{ -+ unsigned long flags; -+ -+ local_irq_save(flags); -+ ar231x_interrupt(dev->irq, dev); -+ local_irq_restore(flags); -+} -+#endif -+ - static const struct net_device_ops ar231x_ops = { - .ndo_open = ar231x_open, - .ndo_stop = ar231x_close, -@@ -165,6 +177,9 @@ - .ndo_validate_addr = eth_validate_addr, - .ndo_set_mac_address = eth_mac_addr, - .ndo_tx_timeout = ar231x_tx_timeout, -+#ifdef CONFIG_NET_POLL_CONTROLLER -+ .ndo_poll_controller = ar231x_netpoll, -+#endif - }; - - int __init ar231x_probe(struct platform_device *pdev) |