kernel: bgmac: update backport patch
This adds some more bgmac patches from mainline kernel. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 38637
This commit is contained in:
@@ -5,7 +5,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
|
||||
--- a/drivers/net/ethernet/broadcom/bgmac.c
|
||||
+++ b/drivers/net/ethernet/broadcom/bgmac.c
|
||||
@@ -1229,27 +1229,14 @@ static int bgmac_set_mac_address(struct
|
||||
@@ -1252,27 +1252,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);
|
||||
@@ -40,7 +40,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
}
|
||||
|
||||
static const struct net_device_ops bgmac_netdev_ops = {
|
||||
@@ -1271,61 +1258,16 @@ static int bgmac_get_settings(struct net
|
||||
@@ -1294,61 +1281,16 @@ static int bgmac_get_settings(struct net
|
||||
{
|
||||
struct bgmac *bgmac = netdev_priv(net_dev);
|
||||
|
||||
@@ -104,7 +104,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
|
||||
static void bgmac_get_drvinfo(struct net_device *net_dev,
|
||||
struct ethtool_drvinfo *info)
|
||||
@@ -1336,6 +1278,7 @@ static void bgmac_get_drvinfo(struct net
|
||||
@@ -1359,6 +1301,7 @@ static void bgmac_get_drvinfo(struct net
|
||||
|
||||
static const struct ethtool_ops bgmac_ethtool_ops = {
|
||||
.get_settings = bgmac_get_settings,
|
||||
@@ -112,7 +112,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
.get_drvinfo = bgmac_get_drvinfo,
|
||||
};
|
||||
|
||||
@@ -1354,10 +1297,36 @@ static int bgmac_mii_write(struct mii_bu
|
||||
@@ -1377,10 +1320,36 @@ static int bgmac_mii_write(struct mii_bu
|
||||
return bgmac_phy_write(bus->priv, mii_id, regnum, value);
|
||||
}
|
||||
|
||||
@@ -149,7 +149,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
|
||||
mii_bus = mdiobus_alloc();
|
||||
if (!mii_bus)
|
||||
@@ -1388,7 +1357,28 @@ static int bgmac_mii_register(struct bgm
|
||||
@@ -1411,7 +1380,28 @@ static int bgmac_mii_register(struct bgm
|
||||
|
||||
bgmac->mii_bus = mii_bus;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user