ar71xx: refresh 2.6.30 patches

SVN-Revision: 18623

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 aca39a431640e91f036af9b8ada46f97c3e45ca8..e7d2c1dadf14fedb48592014a80e5bb9a4e1dca3 100644 (file)
--- 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
-@@ -575,7 +575,7 @@ static void ag71xx_oom_timer_handler(uns
+@@ -587,7 +587,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)
-@@ -731,7 +731,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -743,7 +743,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);
-@@ -750,7 +750,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -762,7 +762,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;
  }
  
-@@ -780,7 +780,7 @@ static irqreturn_t ag71xx_interrupt(int 
+@@ -792,7 +792,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 65a02bc12024a3d5bf21051cbed731693a0036be..9ab621f1decc105c3951d3967cb71d44f033d8b0 100644 (file)
--- 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
-@@ -575,7 +575,7 @@ static void ag71xx_oom_timer_handler(uns
+@@ -587,7 +587,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)
-@@ -731,7 +731,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -743,7 +743,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);
-@@ -750,7 +750,7 @@ static int ag71xx_poll(struct napi_struc
+@@ -762,7 +762,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;
  }
  
-@@ -780,7 +780,7 @@ static irqreturn_t ag71xx_interrupt(int 
+@@ -792,7 +792,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 6f291711ee442536deb842eac149e6b3e89c02d0..b587b5175b24bdbea14284ea80d012389457ea01 100644 (file)
--- 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
-@@ -791,6 +791,18 @@ static void ag71xx_set_multicast_list(st
+@@ -803,6 +803,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;
-@@ -861,14 +873,9 @@ static int __init ag71xx_probe(struct pl
+@@ -873,14 +885,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 245c9f35cd45db4eb666c15cc5b18a30d1e9e4d1..b78c5d41a4cae9772f98f4da7b2cfd4948d7125f 100644 (file)
--- 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
-@@ -780,6 +780,8 @@ static struct platform_device ar71xx_dsa
+@@ -822,6 +822,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;
-@@ -793,7 +795,10 @@ void __init ar71xx_add_device_dsa(unsign
+@@ -835,7 +837,10 @@ void __init ar71xx_add_device_dsa(unsign
                        id);
                return;
        }