diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-09 17:15:40 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-10 18:43:23 +0200 |
| commit | 21a229317f63e89be9184f614a3270b0c9ec7100 (patch) | |
| tree | ea693b34e77874b960db6e81fc895ab49faa9ef3 /target/linux/ar71xx/patches-4.9/903-at803x-add-sgmii-aneg-override-pdata.patch | |
| parent | 1961948585e008ad0095d7074784893229b00d06 (diff) | |
| download | upstream-21a229317f63e89be9184f614a3270b0c9ec7100.tar.gz upstream-21a229317f63e89be9184f614a3270b0c9ec7100.tar.bz2 upstream-21a229317f63e89be9184f614a3270b0c9ec7100.zip | |
kernel: bump 4.9 to 4.9.119
Refreshed all patches.
Delete upstreamed patch:
- 100-tcp-add-tcp_ooo_try_coalesce-helper.patch
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/ar71xx/patches-4.9/903-at803x-add-sgmii-aneg-override-pdata.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-4.9/903-at803x-add-sgmii-aneg-override-pdata.patch | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/target/linux/ar71xx/patches-4.9/903-at803x-add-sgmii-aneg-override-pdata.patch b/target/linux/ar71xx/patches-4.9/903-at803x-add-sgmii-aneg-override-pdata.patch index 9c922d155d..fc640af17d 100644 --- a/target/linux/ar71xx/patches-4.9/903-at803x-add-sgmii-aneg-override-pdata.patch +++ b/target/linux/ar71xx/patches-4.9/903-at803x-add-sgmii-aneg-override-pdata.patch @@ -1,8 +1,6 @@ -Index: linux-4.9.111/drivers/net/phy/at803x.c -=================================================================== ---- linux-4.9.111.orig/drivers/net/phy/at803x.c -+++ linux-4.9.111/drivers/net/phy/at803x.c -@@ -461,12 +461,15 @@ static void at803x_link_change_notify(st +--- a/drivers/net/phy/at803x.c ++++ b/drivers/net/phy/at803x.c +@@ -460,12 +460,15 @@ static void at803x_link_change_notify(st static int at803x_aneg_done(struct phy_device *phydev) { @@ -18,7 +16,7 @@ Index: linux-4.9.111/drivers/net/phy/at803x.c /* * in SGMII mode, if copper side autoneg is successful, * also check SGMII side autoneg result -@@ -481,7 +484,8 @@ static int at803x_aneg_done(struct phy_d +@@ -480,7 +483,8 @@ static int at803x_aneg_done(struct phy_d /* check if the SGMII link is OK. */ if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) { pr_warn("803x_aneg_done: SGMII link is not ok\n"); @@ -28,10 +26,8 @@ Index: linux-4.9.111/drivers/net/phy/at803x.c } /* switch back to copper page */ phy_write(phydev, AT803X_REG_CHIP_CONFIG, ccr | AT803X_BT_BX_REG_SEL); -Index: linux-4.9.111/include/linux/platform_data/phy-at803x.h -=================================================================== ---- linux-4.9.111.orig/include/linux/platform_data/phy-at803x.h -+++ linux-4.9.111/include/linux/platform_data/phy-at803x.h +--- a/include/linux/platform_data/phy-at803x.h ++++ b/include/linux/platform_data/phy-at803x.h @@ -7,6 +7,7 @@ struct at803x_platform_data { int enable_rgmii_rx_delay:1; int fixup_rgmii_tx_delay:1; |