kernel: bgmac: move bgmac patches already applied in mainline kernel to generic

[openwrt/staging/dedeckeh.git] / target / linux / bcm53xx / patches-3.10 / 205-bgmac-add-srab-switch.patch

diff --git a/target/linux/bcm53xx/patches-3.10/205-bgmac-add-srab-switch.patch b/target/linux/bcm53xx/patches-3.10/205-bgmac-add-srab-switch.patch
index 195336b716a3af2b1591a996340d0fdd71277343..cb498154a4e48c2c8e815a7b970dfa68c4f3c7e1 100644 (file)
--- a/target/linux/bcm53xx/patches-3.10/205-bgmac-add-srab-switch.patch
+++ b/target/linux/bcm53xx/patches-3.10/205-bgmac-add-srab-switch.patch
@@ -8,7 +8,7 @@
  #ifdef CONFIG_BCM47XX
  #include <bcm47xx_nvram.h>
  #else
-@@ -1396,6 +1397,17 @@ static void bgmac_mii_unregister(struct
+@@ -1424,6 +1425,17 @@ static void bgmac_mii_unregister(struct
        mdiobus_free(mii_bus);
  }
  
@@ -26,7 +26,7 @@
  /**************************************************
   * BCMA bus ops
   **************************************************/
-@@ -1495,6 +1507,16 @@ static int bgmac_probe(struct bcma_devic
+@@ -1523,6 +1535,16 @@ static int bgmac_probe(struct bcma_devic
                goto err_dma_free;
        }
  
@@ -43,7 +43,7 @@
        err = register_netdev(bgmac->net_dev);
        if (err) {
                bgmac_err(bgmac, "Cannot register net device\n");
-@@ -1524,6 +1546,10 @@ static void bgmac_remove(struct bcma_dev
+@@ -1552,6 +1574,10 @@ static void bgmac_remove(struct bcma_dev
  {
        struct bgmac *bgmac = bcma_get_drvdata(core);
  
@@ -56,7 +56,7 @@
        bgmac_mii_unregister(bgmac);
 --- a/drivers/net/ethernet/broadcom/bgmac.h
 +++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -428,6 +428,9 @@ struct bgmac {
+@@ -430,6 +430,9 @@ struct bgmac {
        bool has_robosw;
  
        bool loopback;