brcm47xx: update bcma and ssb to master-2011-07-21

[openwrt.git] / target / linux / rdc / patches-2.6.32 / 014-r6040_phylib_support.patch

diff --git a/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch b/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch
index 1dc5c4b..bb25302 100644 (file)
--- a/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch
+++ b/target/linux/rdc/patches-2.6.32/014-r6040_phylib_support.patch
@@ -234,7 +234,7 @@
        return 0;
  }
  
        return 0;
  }
  

-@@ -1020,40 +924,22 @@ static void netdev_get_drvinfo(struct ne
+@@ -1018,40 +922,22 @@ static void netdev_get_drvinfo(struct ne

  static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
  {
        struct r6040_private *rp = netdev_priv(dev);
  static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
  {
        struct r6040_private *rp = netdev_priv(dev);


@@ -278,7 +278,7 @@
  };
  
  static const struct net_device_ops r6040_netdev_ops = {
  };
  
  static const struct net_device_ops r6040_netdev_ops = {

-@@ -1072,6 +958,86 @@ static const struct net_device_ops r6040
+@@ -1070,6 +956,86 @@ static const struct net_device_ops r6040

  #endif
  };
  
  #endif
  };
  


@@ -365,7 +365,7 @@
  static int __devinit r6040_init_one(struct pci_dev *pdev,
                                         const struct pci_device_id *ent)
  {
  static int __devinit r6040_init_one(struct pci_dev *pdev,
                                         const struct pci_device_id *ent)
  {

-@@ -1082,6 +1048,7 @@ static int __devinit r6040_init_one(stru
+@@ -1080,6 +1046,7 @@ static int __devinit r6040_init_one(stru

        static int card_idx = -1;
        int bar = 0;
        u16 *adrp;
        static int card_idx = -1;
        int bar = 0;
        u16 *adrp;


@@ -373,7 +373,7 @@
  
        printk("%s\n", version);
  
  
        printk("%s\n", version);
  

-@@ -1169,7 +1136,6 @@ static int __devinit r6040_init_one(stru
+@@ -1167,7 +1134,6 @@ static int __devinit r6040_init_one(stru

        /* Init RDC private data */
        lp->mcr0 = 0x1002;
        lp->phy_addr = phy_table[card_idx];
        /* Init RDC private data */
        lp->mcr0 = 0x1002;
        lp->phy_addr = phy_table[card_idx];


@@ -381,7 +381,7 @@
  
        /* The RDC-specific entries in the device structure. */
        dev->netdev_ops = &r6040_netdev_ops;
  
        /* The RDC-specific entries in the device structure. */
        dev->netdev_ops = &r6040_netdev_ops;

-@@ -1177,28 +1143,61 @@ static int __devinit r6040_init_one(stru
+@@ -1175,28 +1141,61 @@ static int __devinit r6040_init_one(stru

        dev->watchdog_timeo = TX_TIMEOUT;
  
        netif_napi_add(dev, &lp->napi, r6040_poll, 64);
        dev->watchdog_timeo = TX_TIMEOUT;
  
        netif_napi_add(dev, &lp->napi, r6040_poll, 64);


@@ -451,7 +451,7 @@
  err_out_unmap:
        pci_iounmap(pdev, ioaddr);
  err_out_free_res:
  err_out_unmap:
        pci_iounmap(pdev, ioaddr);
  err_out_free_res:

-@@ -1212,8 +1211,12 @@ err_out:
+@@ -1210,8 +1209,12 @@ err_out:

  static void __devexit r6040_remove_one(struct pci_dev *pdev)
  {
        struct net_device *dev = pci_get_drvdata(pdev);
  static void __devexit r6040_remove_one(struct pci_dev *pdev)
  {
        struct net_device *dev = pci_get_drvdata(pdev);