diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2009-07-25 09:14:47 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2009-07-25 09:14:47 +0000 |
commit | c2084d8b1db19f2fc6973fb56c06cedaa36ef556 (patch) | |
tree | e75e61b36d9b4aa0727616a8d400712c572b55e1 /target/linux/ar71xx/patches-2.6.30/800-ag71xx-remove-netdev-arg-from-napi-calls.patch | |
parent | 755aae526a8e39aa36b6fa07186688653743a12e (diff) | |
download | upstream-c2084d8b1db19f2fc6973fb56c06cedaa36ef556.tar.gz upstream-c2084d8b1db19f2fc6973fb56c06cedaa36ef556.tar.bz2 upstream-c2084d8b1db19f2fc6973fb56c06cedaa36ef556.zip |
refresh 2.6.30 patches
SVN-Revision: 16973
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.30/800-ag71xx-remove-netdev-arg-from-napi-calls.patch')
-rw-r--r-- | target/linux/ar71xx/patches-2.6.30/800-ag71xx-remove-netdev-arg-from-napi-calls.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ar71xx/patches-2.6.30/800-ag71xx-remove-netdev-arg-from-napi-calls.patch b/target/linux/ar71xx/patches-2.6.30/800-ag71xx-remove-netdev-arg-from-napi-calls.patch index d139c5330d..aca39a4316 100644 --- a/target/linux/ar71xx/patches-2.6.30/800-ag71xx-remove-netdev-arg-from-napi-calls.patch +++ b/target/linux/ar71xx/patches-2.6.30/800-ag71xx-remove-netdev-arg-from-napi-calls.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ag71xx/ag71xx_main.c +++ b/drivers/net/ag71xx/ag71xx_main.c -@@ -561,7 +561,7 @@ static void ag71xx_oom_timer_handler(uns +@@ -575,7 +575,7 @@ static void ag71xx_oom_timer_handler(uns struct net_device *dev = (struct net_device *) data; struct ag71xx *ag = netdev_priv(dev); @@ -9,7 +9,7 @@ } static void ag71xx_tx_timeout(struct net_device *dev) -@@ -717,7 +717,7 @@ static int ag71xx_poll(struct napi_struc +@@ -731,7 +731,7 @@ static int ag71xx_poll(struct napi_struc DBG("%s: disable polling mode, done=%d, limit=%d\n", dev->name, done, limit); @@ -18,7 +18,7 @@ /* enable interrupts */ spin_lock_irqsave(&ag->lock, flags); -@@ -736,7 +736,7 @@ static int ag71xx_poll(struct napi_struc +@@ -750,7 +750,7 @@ static int ag71xx_poll(struct napi_struc printk(KERN_DEBUG "%s: out of memory\n", dev->name); mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL); @@ -27,7 +27,7 @@ return 0; } -@@ -766,7 +766,7 @@ static irqreturn_t ag71xx_interrupt(int +@@ -780,7 +780,7 @@ static irqreturn_t ag71xx_interrupt(int if (likely(status & AG71XX_INT_POLL)) { ag71xx_int_disable(ag, AG71XX_INT_POLL); DBG("%s: enable polling mode\n", dev->name); |