mac80211: fix RTS threshold not being set for mac80211 devices

[openwrt.git] / target / linux / ixp4xx / patches-2.6.31 / 205-npe_driver_separate_phy_functions.patch

diff --git a/target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch b/target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch
index c1fc76d..b9835a0 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch
+++ b/target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c

-@@ -396,6 +396,53 @@ static void ixp4xx_adjust_link(struct ne
+@@ -396,6 +396,50 @@ static void ixp4xx_adjust_link(struct ne

               dev->name, port->speed, port->duplex ? "full" : "half");
  }
  
               dev->name, port->speed, port->duplex ? "full" : "half");
  }
  


@@ -24,9 +24,6 @@
 +
 +      port->phydev->irq = PHY_POLL;
 +
 +
 +      port->phydev->irq = PHY_POLL;
 +

-+      printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy,
-+             npe_name(port->npe));
-+

 +      return 0;
 +}
 +
 +      return 0;
 +}
 +


@@ -54,7 +51,7 @@
  
  static inline void debug_pkt(struct net_device *dev, const char *func,
                             u8 *data, int len)
  
  static inline void debug_pkt(struct net_device *dev, const char *func,
                             u8 *data, int len)

-@@ -1005,8 +1052,7 @@ static int eth_open(struct net_device *d
+@@ -1005,8 +1049,7 @@ static int eth_open(struct net_device *d

                return err;
        }
  
                return err;
        }
  


@@ -64,7 +61,7 @@
  
        for (i = 0; i < ETH_ALEN; i++)
                __raw_writel(dev->dev_addr[i], &port->regs->hw_addr[i]);
  
        for (i = 0; i < ETH_ALEN; i++)
                __raw_writel(dev->dev_addr[i], &port->regs->hw_addr[i]);

-@@ -1127,7 +1173,7 @@ static int eth_close(struct net_device *
+@@ -1127,7 +1170,7 @@ static int eth_close(struct net_device *

                printk(KERN_CRIT "%s: unable to disable loopback\n",
                       dev->name);
  
                printk(KERN_CRIT "%s: unable to disable loopback\n",
                       dev->name);
  


@@ -73,7 +70,7 @@
  
        if (!ports_open)
                qmgr_disable_irq(TXDONE_QUEUE);
  
        if (!ports_open)
                qmgr_disable_irq(TXDONE_QUEUE);

-@@ -1153,7 +1199,6 @@ static int __devinit eth_init_one(struct
+@@ -1153,7 +1196,6 @@ static int __devinit eth_init_one(struct

        struct net_device *dev;
        struct eth_plat_info *plat = pdev->dev.platform_data;
        u32 regs_phys;
        struct net_device *dev;
        struct eth_plat_info *plat = pdev->dev.platform_data;
        u32 regs_phys;


@@ -81,7 +78,7 @@
        int err;
  
        if (!(dev = alloc_etherdev(sizeof(struct port))))
        int err;
  
        if (!(dev = alloc_etherdev(sizeof(struct port))))

-@@ -1211,18 +1256,10 @@ static int __devinit eth_init_one(struct
+@@ -1211,18 +1253,10 @@ static int __devinit eth_init_one(struct

        __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
        udelay(50);
  
        __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
        udelay(50);
  


@@ -102,12 +99,21 @@
        if ((err = register_netdev(dev)))
                goto err_phy_dis;
  
        if ((err = register_netdev(dev)))
                goto err_phy_dis;
  

-@@ -1249,7 +1286,7 @@ static int __devexit eth_remove_one(stru
-       struct net_device *dev = platform_get_drvdata(pdev);
+@@ -1232,7 +1266,7 @@ static int __devinit eth_init_one(struct
+       return 0;
+ 
+ err_phy_dis:
+-      phy_disconnect(port->phydev);
++      ixp4xx_phy_disconnect(port->phydev);
+ err_free_mem:
+       npe_port_tab[NPE_ID(port->id)] = NULL;
+       platform_set_drvdata(pdev, NULL);
+@@ -1250,7 +1284,7 @@ static int __devexit eth_remove_one(stru

        struct port *port = netdev_priv(dev);
  
        struct port *port = netdev_priv(dev);
  

+       unregister_netdev(dev);

 -      phy_disconnect(port->phydev);
 +      ixp4xx_phy_disconnect(dev);
 -      phy_disconnect(port->phydev);
 +      ixp4xx_phy_disconnect(dev);

-       unregister_netdev(dev);
-       phy_disconnect(port->phydev);

        npe_port_tab[NPE_ID(port->id)] = NULL;
        npe_port_tab[NPE_ID(port->id)] = NULL;

+       platform_set_drvdata(pdev, NULL);
+       npe_release(port->npe);