aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.12/771-bgmac-phylib.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-11-03 19:24:39 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-11-03 19:24:39 +0000
commit24d73fbd338ac8cedc6ec92f8db1738fff1b483b (patch)
treeeea21c5f6e34ab2a66b865640552288dafbfd9d9 /target/linux/generic/patches-3.12/771-bgmac-phylib.patch
parent45d26941b425db0e3f40479522566f33969702a4 (diff)
downloadupstream-24d73fbd338ac8cedc6ec92f8db1738fff1b483b.tar.gz
upstream-24d73fbd338ac8cedc6ec92f8db1738fff1b483b.tar.bz2
upstream-24d73fbd338ac8cedc6ec92f8db1738fff1b483b.zip
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
Diffstat (limited to 'target/linux/generic/patches-3.12/771-bgmac-phylib.patch')
-rw-r--r--target/linux/generic/patches-3.12/771-bgmac-phylib.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.12/771-bgmac-phylib.patch b/target/linux/generic/patches-3.12/771-bgmac-phylib.patch
index 2d1db3f9e9..9f2584ec53 100644
--- a/target/linux/generic/patches-3.12/771-bgmac-phylib.patch
+++ b/target/linux/generic/patches-3.12/771-bgmac-phylib.patch
@@ -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
-@@ -1219,27 +1219,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 = {
-@@ -1261,61 +1248,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)
-@@ -1326,6 +1268,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,
};
-@@ -1344,10 +1287,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)
-@@ -1378,7 +1347,28 @@ static int bgmac_mii_register(struct bgm
+@@ -1411,7 +1380,28 @@ static int bgmac_mii_register(struct bgm
bgmac->mii_bus = mii_bus;