projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump to 4.4.35
[openwrt/openwrt.git]
/
target
/
linux
/
generic
/
patches-4.4
/
073-0001-net-ethernet-bgmac-use-phydev-from-struct-net_device.patch
diff --git
a/target/linux/generic/patches-4.4/073-0001-net-ethernet-bgmac-use-phydev-from-struct-net_device.patch
b/target/linux/generic/patches-4.4/073-0001-net-ethernet-bgmac-use-phydev-from-struct-net_device.patch
index 17fbea034fe4111fc6d6cb29b8134a2d8de4ffed..8c97b09970515c9c04ce17b54500485f2cf9ad7a 100644
(file)
--- a/
target/linux/generic/patches-4.4/073-0001-net-ethernet-bgmac-use-phydev-from-struct-net_device.patch
+++ b/
target/linux/generic/patches-4.4/073-0001-net-ethernet-bgmac-use-phydev-from-struct-net_device.patch
@@
-17,7
+17,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -132
0,7 +1320
,7 @@ static int bgmac_open(struct net_device
+@@ -132
3,7 +1323
,7 @@ static int bgmac_open(struct net_device
}
napi_enable(&bgmac->napi);
}
napi_enable(&bgmac->napi);
@@
-26,7
+26,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
netif_carrier_on(net_dev);
return 0;
netif_carrier_on(net_dev);
return 0;
-@@ -133
2,7 +1332
,7 @@ static int bgmac_stop(struct net_device
+@@ -133
5,7 +1335
,7 @@ static int bgmac_stop(struct net_device
netif_carrier_off(net_dev);
netif_carrier_off(net_dev);
@@
-35,7
+35,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
napi_disable(&bgmac->napi);
bgmac_chip_intrs_off(bgmac);
napi_disable(&bgmac->napi);
bgmac_chip_intrs_off(bgmac);
-@@ -137
0,12 +1370
,10 @@ static int bgmac_set_mac_address(struct
+@@ -137
3,12 +1373
,10 @@ static int bgmac_set_mac_address(struct
static int bgmac_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)
{
static int bgmac_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd)
{
@@
-49,7
+49,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
}
static const struct net_device_ops bgmac_netdev_ops = {
}
static const struct net_device_ops bgmac_netdev_ops = {
-@@ -15
18,7 +1516
,7 @@ static int bgmac_get_settings(struct net
+@@ -15
21,7 +1519
,7 @@ static int bgmac_get_settings(struct net
{
struct bgmac *bgmac = netdev_priv(net_dev);
{
struct bgmac *bgmac = netdev_priv(net_dev);
@@
-58,7
+58,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
}
static int bgmac_set_settings(struct net_device *net_dev,
}
static int bgmac_set_settings(struct net_device *net_dev,
-@@ -152
6,7 +1524
,7 @@ static int bgmac_set_settings(struct net
+@@ -152
9,7 +1527
,7 @@ static int bgmac_set_settings(struct net
{
struct bgmac *bgmac = netdev_priv(net_dev);
{
struct bgmac *bgmac = netdev_priv(net_dev);
@@
-67,7
+67,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
}
static void bgmac_get_drvinfo(struct net_device *net_dev,
}
static void bgmac_get_drvinfo(struct net_device *net_dev,
-@@ -156
3,7 +1561
,7 @@ static int bgmac_mii_write(struct mii_bu
+@@ -156
6,7 +1564
,7 @@ static int bgmac_mii_write(struct mii_bu
static void bgmac_adjust_link(struct net_device *net_dev)
{
struct bgmac *bgmac = netdev_priv(net_dev);
static void bgmac_adjust_link(struct net_device *net_dev)
{
struct bgmac *bgmac = netdev_priv(net_dev);
@@
-76,7
+76,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
bool update = false;
if (phy_dev->link) {
bool update = false;
if (phy_dev->link) {
-@@ -16
07,8 +1605
,6 @@ static int bgmac_fixed_phy_register(stru
+@@ -16
10,8 +1608
,6 @@ static int bgmac_fixed_phy_register(stru
return err;
}
return err;
}
@@
-85,7
+85,7
@@
Signed-off-by: David S. Miller <davem@davemloft.net>
return err;
}
return err;
}
-@@ -166
1,7 +1657
,6 @@ static int bgmac_mii_register(struct bgm
+@@ -166
4,7 +1660
,6 @@ static int bgmac_mii_register(struct bgm
err = PTR_ERR(phy_dev);
goto err_unregister_bus;
}
err = PTR_ERR(phy_dev);
goto err_unregister_bus;
}