diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2013-11-03 19:24:39 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2013-11-03 19:24:39 +0000 |
commit | 63fcb55d979d3a8f5910ce696d746b959ecc3b75 (patch) | |
tree | e458b766ac65a830a81025d9ddfadefe720e4f73 /target/linux/generic/patches-3.10/771-bgmac-phylib.patch | |
parent | ea7515ccf3cdf0b78e804cfc3f1643ea1ea09c8a (diff) | |
download | master-187ad058-63fcb55d979d3a8f5910ce696d746b959ecc3b75.tar.gz master-187ad058-63fcb55d979d3a8f5910ce696d746b959ecc3b75.tar.bz2 master-187ad058-63fcb55d979d3a8f5910ce696d746b959ecc3b75.zip |
kernel: bgmac: update backport patch
This adds some more bgmac patches from mainline kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38637 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/771-bgmac-phylib.patch')
-rw-r--r-- | target/linux/generic/patches-3.10/771-bgmac-phylib.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.10/771-bgmac-phylib.patch b/target/linux/generic/patches-3.10/771-bgmac-phylib.patch index 6f8f4d251f..9f2584ec53 100644 --- a/target/linux/generic/patches-3.10/771-bgmac-phylib.patch +++ b/target/linux/generic/patches-3.10/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 -@@ -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; |