projects
/
openwrt
/
staging
/
wigyori.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.14 to 4.14.104
[openwrt/staging/wigyori.git]
/
target
/
linux
/
mvebu
/
patches-4.14
/
450-reprobe_sfp_phy.patch
diff --git
a/target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch
b/target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch
index e9a3d695dad3d636549be29a9ece3ac2adbeaa7d..e05d5ad47cebb957829b1c685fc49d1aed4c32d0 100644
(file)
--- a/
target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch
+++ b/
target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch
@@
-13,7
+13,7
@@
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
-@@ -48
8,7 +488
,7 @@ static void sfp_sm_phy_detach(struct sfp
+@@ -48
9,7 +489
,7 @@ static void sfp_sm_phy_detach(struct sfp
sfp->mod_phy = NULL;
}
sfp->mod_phy = NULL;
}
@@
-22,7
+22,7
@@
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
{
struct phy_device *phy;
int err;
{
struct phy_device *phy;
int err;
-@@ -49
8,11 +498
,11 @@ static void sfp_sm_probe_phy(struct sfp
+@@ -49
9,11 +499
,11 @@ static void sfp_sm_probe_phy(struct sfp
phy = mdiobus_scan(sfp->i2c_mii, SFP_PHY_ADDR);
if (phy == ERR_PTR(-ENODEV)) {
dev_info(sfp->dev, "no PHY detected\n");
phy = mdiobus_scan(sfp->i2c_mii, SFP_PHY_ADDR);
if (phy == ERR_PTR(-ENODEV)) {
dev_info(sfp->dev, "no PHY detected\n");
@@
-36,7
+36,7
@@
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
}
err = sfp_add_phy(sfp->sfp_bus, phy);
}
err = sfp_add_phy(sfp->sfp_bus, phy);
-@@ -51
0,11 +510
,13 @@ static void sfp_sm_probe_phy(struct sfp
+@@ -51
1,11 +511
,13 @@ static void sfp_sm_probe_phy(struct sfp
phy_device_remove(phy);
phy_device_free(phy);
dev_err(sfp->dev, "sfp_add_phy failed: %d\n", err);
phy_device_remove(phy);
phy_device_free(phy);
dev_err(sfp->dev, "sfp_add_phy failed: %d\n", err);
@@
-51,7
+51,7
@@
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
}
static void sfp_sm_link_up(struct sfp *sfp)
}
static void sfp_sm_link_up(struct sfp *sfp)
-@@ -56
0,14 +562
,9 @@ static void sfp_sm_fault(struct sfp *sfp
+@@ -56
1,14 +563
,9 @@ static void sfp_sm_fault(struct sfp *sfp
static void sfp_sm_mod_init(struct sfp *sfp)
{
static void sfp_sm_mod_init(struct sfp *sfp)
{
@@
-68,7
+68,7
@@
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
/* Setting the serdes link mode is guesswork: there's no
* field in the EEPROM which indicates what mode should
/* Setting the serdes link mode is guesswork: there's no
* field in the EEPROM which indicates what mode should
-@@ -58
1,7 +578
,22 @@ static void sfp_sm_mod_init(struct sfp *
+@@ -58
2,7 +579
,22 @@ static void sfp_sm_mod_init(struct sfp *
if (sfp->id.base.e1000_base_t ||
sfp->id.base.e100_base_lx ||
sfp->id.base.e100_base_fx)
if (sfp->id.base.e1000_base_t ||
sfp->id.base.e100_base_lx ||
sfp->id.base.e100_base_fx)