From 5c7ee7f0397deddf7245a560590edadb60019ed2 Mon Sep 17 00:00:00 2001
From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 8 Dec 2009 10:29:30 +0000
Subject: [PATCH] ar71xx: refresh patches

SVN-Revision: 18693
---
 .../800-ag71xx-remove-netdev-arg-from-napi-calls.patch    | 8 ++++----
 .../801-ag71xx-remove-redundant-napi-functions.patch      | 8 ++++----
 .../ar71xx/patches-2.6.30/802-ag71xx-use-netdev-ops.patch | 4 ++--
 .../803-ar71xx-update-dsa-switch-support.patch            | 4 ++--
 .../800-ag71xx-remove-netdev-arg-from-napi-calls.patch    | 8 ++++----
 .../801-ag71xx-remove-redundant-napi-functions.patch      | 8 ++++----
 .../ar71xx/patches-2.6.31/802-ag71xx-use-netdev-ops.patch | 4 ++--
 .../803-ar71xx-update-dsa-switch-support.patch            | 4 ++--
 .../800-ag71xx-remove-netdev-arg-from-napi-calls.patch    | 8 ++++----
 .../801-ag71xx-remove-redundant-napi-functions.patch      | 8 ++++----
 .../ar71xx/patches-2.6.32/802-ag71xx-use-netdev-ops.patch | 4 ++--
 11 files changed, 34 insertions(+), 34 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 e7d2c1dadf1..bd2294302a3 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
-@@ -587,7 +587,7 @@ static void ag71xx_oom_timer_handler(uns
+@@ -595,7 +595,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)
-@@ -743,7 +743,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -751,7 +751,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);
-@@ -762,7 +762,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -770,7 +770,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;
  }
  
-@@ -792,7 +792,7 @@ static irqreturn_t ag71xx_interrupt(int 
+@@ -800,7 +800,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 9ab621f1dec..b5e779bcf67 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
-@@ -587,7 +587,7 @@ static void ag71xx_oom_timer_handler(uns
+@@ -595,7 +595,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)
-@@ -743,7 +743,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -751,7 +751,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);
-@@ -762,7 +762,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -770,7 +770,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;
  }
  
-@@ -792,7 +792,7 @@ static irqreturn_t ag71xx_interrupt(int 
+@@ -800,7 +800,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 b587b5175b2..f619611c64b 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
-@@ -803,6 +803,18 @@ static void ag71xx_set_multicast_list(st
+@@ -811,6 +811,18 @@ static void ag71xx_set_multicast_list(st
  	/* TODO */
  }
  
@@ -19,7 +19,7 @@
  static int __init ag71xx_probe(struct platform_device *pdev)
  {
  	struct net_device *dev;
-@@ -873,14 +885,9 @@ static int __init ag71xx_probe(struct pl
+@@ -886,14 +898,9 @@ 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 b78c5d41a4c..ac2c7d92514 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
-@@ -822,6 +822,8 @@ static struct platform_device ar71xx_dsa
+@@ -825,6 +825,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;
-@@ -835,7 +837,10 @@ void __init ar71xx_add_device_dsa(unsign
+@@ -838,7 +840,10 @@ void __init ar71xx_add_device_dsa(unsign
  			id);
  		return;
  	}
diff --git a/target/linux/ar71xx/patches-2.6.31/800-ag71xx-remove-netdev-arg-from-napi-calls.patch b/target/linux/ar71xx/patches-2.6.31/800-ag71xx-remove-netdev-arg-from-napi-calls.patch
index 982e68d8be3..bd2294302a3 100644
--- a/target/linux/ar71xx/patches-2.6.31/800-ag71xx-remove-netdev-arg-from-napi-calls.patch
+++ b/target/linux/ar71xx/patches-2.6.31/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
-@@ -589,7 +589,7 @@ static void ag71xx_oom_timer_handler(uns
+@@ -595,7 +595,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)
-@@ -745,7 +745,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -751,7 +751,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);
-@@ -764,7 +764,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -770,7 +770,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;
  }
  
-@@ -794,7 +794,7 @@ static irqreturn_t ag71xx_interrupt(int 
+@@ -800,7 +800,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.31/801-ag71xx-remove-redundant-napi-functions.patch b/target/linux/ar71xx/patches-2.6.31/801-ag71xx-remove-redundant-napi-functions.patch
index 7c6996e1b94..b5e779bcf67 100644
--- a/target/linux/ar71xx/patches-2.6.31/801-ag71xx-remove-redundant-napi-functions.patch
+++ b/target/linux/ar71xx/patches-2.6.31/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
-@@ -589,7 +589,7 @@ static void ag71xx_oom_timer_handler(uns
+@@ -595,7 +595,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)
-@@ -745,7 +745,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -751,7 +751,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);
-@@ -764,7 +764,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -770,7 +770,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;
  }
  
-@@ -794,7 +794,7 @@ static irqreturn_t ag71xx_interrupt(int 
+@@ -800,7 +800,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.31/802-ag71xx-use-netdev-ops.patch b/target/linux/ar71xx/patches-2.6.31/802-ag71xx-use-netdev-ops.patch
index 3067b49a49b..f619611c64b 100644
--- a/target/linux/ar71xx/patches-2.6.31/802-ag71xx-use-netdev-ops.patch
+++ b/target/linux/ar71xx/patches-2.6.31/802-ag71xx-use-netdev-ops.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ag71xx/ag71xx_main.c
 +++ b/drivers/net/ag71xx/ag71xx_main.c
-@@ -805,6 +805,18 @@ static void ag71xx_set_multicast_list(st
+@@ -811,6 +811,18 @@ static void ag71xx_set_multicast_list(st
  	/* TODO */
  }
  
@@ -19,7 +19,7 @@
  static int __init ag71xx_probe(struct platform_device *pdev)
  {
  	struct net_device *dev;
-@@ -875,14 +887,9 @@ static int __init ag71xx_probe(struct pl
+@@ -886,14 +898,9 @@ static int __init ag71xx_probe(struct pl
  	}
  
  	dev->base_addr = (unsigned long)ag->mac_base;
diff --git a/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch b/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch
index b78c5d41a4c..ac2c7d92514 100644
--- a/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch
+++ b/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/ar71xx/devices.c
 +++ b/arch/mips/ar71xx/devices.c
-@@ -822,6 +822,8 @@ static struct platform_device ar71xx_dsa
+@@ -825,6 +825,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;
-@@ -835,7 +837,10 @@ void __init ar71xx_add_device_dsa(unsign
+@@ -838,7 +840,10 @@ void __init ar71xx_add_device_dsa(unsign
  			id);
  		return;
  	}
diff --git a/target/linux/ar71xx/patches-2.6.32/800-ag71xx-remove-netdev-arg-from-napi-calls.patch b/target/linux/ar71xx/patches-2.6.32/800-ag71xx-remove-netdev-arg-from-napi-calls.patch
index 3da7f8a4e18..bd2294302a3 100644
--- a/target/linux/ar71xx/patches-2.6.32/800-ag71xx-remove-netdev-arg-from-napi-calls.patch
+++ b/target/linux/ar71xx/patches-2.6.32/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
-@@ -593,7 +593,7 @@ static void ag71xx_oom_timer_handler(uns
+@@ -595,7 +595,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)
-@@ -749,7 +749,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -751,7 +751,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);
-@@ -768,7 +768,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -770,7 +770,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;
  }
  
-@@ -798,7 +798,7 @@ static irqreturn_t ag71xx_interrupt(int 
+@@ -800,7 +800,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.32/801-ag71xx-remove-redundant-napi-functions.patch b/target/linux/ar71xx/patches-2.6.32/801-ag71xx-remove-redundant-napi-functions.patch
index 8687db705fc..b5e779bcf67 100644
--- a/target/linux/ar71xx/patches-2.6.32/801-ag71xx-remove-redundant-napi-functions.patch
+++ b/target/linux/ar71xx/patches-2.6.32/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
-@@ -593,7 +593,7 @@ static void ag71xx_oom_timer_handler(uns
+@@ -595,7 +595,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)
-@@ -749,7 +749,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -751,7 +751,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);
-@@ -768,7 +768,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -770,7 +770,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;
  }
  
-@@ -798,7 +798,7 @@ static irqreturn_t ag71xx_interrupt(int 
+@@ -800,7 +800,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.32/802-ag71xx-use-netdev-ops.patch b/target/linux/ar71xx/patches-2.6.32/802-ag71xx-use-netdev-ops.patch
index 3824d55a657..f619611c64b 100644
--- a/target/linux/ar71xx/patches-2.6.32/802-ag71xx-use-netdev-ops.patch
+++ b/target/linux/ar71xx/patches-2.6.32/802-ag71xx-use-netdev-ops.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/ag71xx/ag71xx_main.c
 +++ b/drivers/net/ag71xx/ag71xx_main.c
-@@ -809,6 +809,18 @@ static void ag71xx_set_multicast_list(st
+@@ -811,6 +811,18 @@ static void ag71xx_set_multicast_list(st
  	/* TODO */
  }
  
@@ -19,7 +19,7 @@
  static int __init ag71xx_probe(struct platform_device *pdev)
  {
  	struct net_device *dev;
-@@ -884,14 +896,9 @@ static int __init ag71xx_probe(struct pl
+@@ -886,14 +898,9 @@ static int __init ag71xx_probe(struct pl
  	}
  
  	dev->base_addr = (unsigned long)ag->mac_base;