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

[librecmc/librecmc.git] / target / linux / bcm53xx / patches-3.10 / 203-bgmac-register-phy.patch

diff --git a/target/linux/bcm53xx/patches-3.10/203-bgmac-register-phy.patch b/target/linux/bcm53xx/patches-3.10/203-bgmac-register-phy.patch
index 6a00cdf0fb4bc41b7f41b018e95692223910d9ca..7bf66dfaf470ff2edca8d743c5d02fe48a89ac2a 100644 (file)
--- a/target/linux/bcm53xx/patches-3.10/203-bgmac-register-phy.patch
+++ b/target/linux/bcm53xx/patches-3.10/203-bgmac-register-phy.patch
@@ -1,16 +1,6 @@
---- a/drivers/net/ethernet/broadcom/Kconfig
-+++ b/drivers/net/ethernet/broadcom/Kconfig
-@@ -133,6 +133,7 @@ config BNX2X_SRIOV
- config BGMAC
-       tristate "BCMA bus GBit core support"
-       depends on BCMA_HOST_SOC && HAS_DMA
-+      select PHYLIB
-       ---help---
-         This driver supports GBit MAC and BCM4706 GBit MAC cores on BCMA bus.
-         They can be found on BCM47xx SoCs and provide gigabit ethernet.
 --- a/drivers/net/ethernet/broadcom/bgmac.c
 +++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1205,27 +1205,14 @@ static int bgmac_set_mac_address(struct
+@@ -1233,27 +1233,14 @@ static int bgmac_set_mac_address(struct
  static int bgmac_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)
  {
        struct bgmac *bgmac = netdev_priv(net_dev);
@@ -45,7 +35,7 @@
  }
  
  static const struct net_device_ops bgmac_netdev_ops = {
-@@ -1247,61 +1234,16 @@ static int bgmac_get_settings(struct net
+@@ -1275,61 +1262,16 @@ static int bgmac_get_settings(struct net
  {
        struct bgmac *bgmac = netdev_priv(net_dev);
  
@@ -109,7 +99,7 @@
  
  static void bgmac_get_drvinfo(struct net_device *net_dev,
                              struct ethtool_drvinfo *info)
-@@ -1312,6 +1254,7 @@ static void bgmac_get_drvinfo(struct net
+@@ -1340,6 +1282,7 @@ static void bgmac_get_drvinfo(struct net
  
  static const struct ethtool_ops bgmac_ethtool_ops = {
        .get_settings           = bgmac_get_settings,
@@ -117,7 +107,7 @@
        .get_drvinfo            = bgmac_get_drvinfo,
  };
  
-@@ -1330,10 +1273,36 @@ static int bgmac_mii_write(struct mii_bu
+@@ -1358,10 +1301,36 @@ static int bgmac_mii_write(struct mii_bu
        return bgmac_phy_write(bus->priv, mii_id, regnum, value);
  }
  
@@ -154,7 +144,7 @@
  
        mii_bus = mdiobus_alloc();
        if (!mii_bus)
-@@ -1364,7 +1333,28 @@ static int bgmac_mii_register(struct bgm
+@@ -1392,7 +1361,28 @@ static int bgmac_mii_register(struct bgm
  
        bgmac->mii_bus = mii_bus;
  
@@ -186,7 +176,7 @@
        kfree(mii_bus->irq);
 --- a/drivers/net/ethernet/broadcom/bgmac.h
 +++ b/drivers/net/ethernet/broadcom/bgmac.h
-@@ -399,7 +399,10 @@ struct bgmac {
+@@ -401,7 +401,10 @@ struct bgmac {
        struct bcma_device *cmn; /* Reference to CMN core for BCM4706 */
        struct net_device *net_dev;
        struct napi_struct napi;