From: Gabor Juhos <juhosg@openwrt.org>
Date: Sat, 25 Jul 2009 09:14:47 +0000 (+0000)
Subject: [ar71xx] refresh 2.6.30 patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5742174b9c5c671310c0435e735e2c1b0df3813b;p=openwrt%2Fsvn-archive%2Farchive.git

[ar71xx] refresh 2.6.30 patches

SVN-Revision: 16973
---

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);
diff --git a/target/linux/ar71xx/patches-2.6.30/801-ag71xx-remove-redundant-napi-functions.patch b/target/linux/ar71xx/patches-2.6.30/801-ag71xx-remove-redundant-napi-functions.patch
index 281992117e..65a02bc120 100644
--- a/target/linux/ar71xx/patches-2.6.30/801-ag71xx-remove-redundant-napi-functions.patch
+++ b/target/linux/ar71xx/patches-2.6.30/801-ag71xx-remove-redundant-napi-functions.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);
diff --git a/target/linux/ar71xx/patches-2.6.30/802-ag71xx-use-netdev-ops.patch b/target/linux/ar71xx/patches-2.6.30/802-ag71xx-use-netdev-ops.patch
index 9bfb2e08d3..2fc7f84bf0 100644
--- a/target/linux/ar71xx/patches-2.6.30/802-ag71xx-use-netdev-ops.patch
+++ b/target/linux/ar71xx/patches-2.6.30/802-ag71xx-use-netdev-ops.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ag71xx/ag71xx_main.c
 +++ b/drivers/net/ag71xx/ag71xx_main.c
-@@ -777,6 +777,17 @@ static void ag71xx_set_multicast_list(st
+@@ -791,6 +791,17 @@ static void ag71xx_set_multicast_list(st
  	/* TODO */
  }
  
@@ -18,7 +18,7 @@
  static int __init ag71xx_probe(struct platform_device *pdev)
  {
  	struct net_device *dev;
-@@ -861,11 +872,7 @@ static int __init ag71xx_probe(struct pl
+@@ -875,11 +886,7 @@ static int __init ag71xx_probe(struct pl
  	}
  
  	dev->base_addr = (unsigned long)ag->mac_base;
diff --git a/target/linux/ar71xx/patches-2.6.30/803-ar71xx-update-dsa-switch-support.patch b/target/linux/ar71xx/patches-2.6.30/803-ar71xx-update-dsa-switch-support.patch
index a69d4c7fb3..d96a874ba1 100644
--- a/target/linux/ar71xx/patches-2.6.30/803-ar71xx-update-dsa-switch-support.patch
+++ b/target/linux/ar71xx/patches-2.6.30/803-ar71xx-update-dsa-switch-support.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/ar71xx/devices.c
 +++ b/arch/mips/ar71xx/devices.c
-@@ -753,6 +753,8 @@ static struct platform_device ar71xx_dsa
+@@ -792,6 +792,8 @@ static struct platform_device ar71xx_dsa
  void __init ar71xx_add_device_dsa(unsigned int id,
  				  struct dsa_platform_data *d)
  {
@@ -9,7 +9,7 @@
  	switch (id) {
  	case 0:
  		d->netdev = &ar71xx_eth0_device.dev;
-@@ -766,7 +768,10 @@ void __init ar71xx_add_device_dsa(unsign
+@@ -805,7 +807,10 @@ void __init ar71xx_add_device_dsa(unsign
  			id);
  		return;
  	}