ramips: clean up and refresh kernel patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48070
This commit is contained in:
@@ -9,11 +9,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
include/linux/phy.h | 1 +
|
||||
2 files changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
|
||||
index adb48ab..7eb83bd 100644
|
||||
--- a/drivers/net/phy/phy.c
|
||||
+++ b/drivers/net/phy/phy.c
|
||||
@@ -843,7 +843,8 @@ void phy_state_machine(struct work_struct *work)
|
||||
@@ -887,7 +887,8 @@ void phy_state_machine(struct work_struc
|
||||
/* If the link is down, give up on negotiation for now */
|
||||
if (!phydev->link) {
|
||||
phydev->state = PHY_NOLINK;
|
||||
@@ -23,7 +21,7 @@ index adb48ab..7eb83bd 100644
|
||||
phydev->adjust_link(phydev->attached_dev);
|
||||
break;
|
||||
}
|
||||
@@ -923,7 +924,8 @@ void phy_state_machine(struct work_struct *work)
|
||||
@@ -967,7 +968,8 @@ void phy_state_machine(struct work_struc
|
||||
netif_carrier_on(phydev->attached_dev);
|
||||
} else {
|
||||
phydev->state = PHY_NOLINK;
|
||||
@@ -33,7 +31,7 @@ index adb48ab..7eb83bd 100644
|
||||
}
|
||||
|
||||
phydev->adjust_link(phydev->attached_dev);
|
||||
@@ -935,7 +937,8 @@ void phy_state_machine(struct work_struct *work)
|
||||
@@ -979,7 +981,8 @@ void phy_state_machine(struct work_struc
|
||||
case PHY_HALTED:
|
||||
if (phydev->link) {
|
||||
phydev->link = 0;
|
||||
@@ -43,8 +41,6 @@ index adb48ab..7eb83bd 100644
|
||||
phydev->adjust_link(phydev->attached_dev);
|
||||
do_suspend = true;
|
||||
}
|
||||
diff --git a/include/linux/phy.h b/include/linux/phy.h
|
||||
index 4a4e3a0..a260bdc 100644
|
||||
--- a/include/linux/phy.h
|
||||
+++ b/include/linux/phy.h
|
||||
@@ -375,6 +375,7 @@ struct phy_device {
|
||||
@@ -55,6 +51,3 @@ index 4a4e3a0..a260bdc 100644
|
||||
|
||||
enum phy_state state;
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
|
||||
Reference in New Issue
Block a user