aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-4.9/405-net-phy-allow-EEE-with-SGMII-interface-modes.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2017-09-20 23:18:24 +0300
committerStijn Tintel <stijn@linux-ipv6.be>2017-09-20 23:50:55 +0300
commit6e48eb22b8d9039b27579283cbe46737a2f4ad80 (patch)
treed0143e45d4a3513d6596f509d5b31a6304e05abb /target/linux/mvebu/patches-4.9/405-net-phy-allow-EEE-with-SGMII-interface-modes.patch
parent6c32e052188e471fe13d4934df24275b74ad3a60 (diff)
downloadupstream-6e48eb22b8d9039b27579283cbe46737a2f4ad80.tar.gz
upstream-6e48eb22b8d9039b27579283cbe46737a2f4ad80.tar.bz2
upstream-6e48eb22b8d9039b27579283cbe46737a2f4ad80.zip
kernel: update 4.9 to 4.9.51
Refresh patches. Compile-tested on octeon and x86/64. Runtime-tested on octeon and x86/64. Fixes the following CVEs: - CVE-2017-14106 - CVE-2017-14497 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/mvebu/patches-4.9/405-net-phy-allow-EEE-with-SGMII-interface-modes.patch')
-rw-r--r--target/linux/mvebu/patches-4.9/405-net-phy-allow-EEE-with-SGMII-interface-modes.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/mvebu/patches-4.9/405-net-phy-allow-EEE-with-SGMII-interface-modes.patch b/target/linux/mvebu/patches-4.9/405-net-phy-allow-EEE-with-SGMII-interface-modes.patch
index 108d529a2c..e5f6da4be8 100644
--- a/target/linux/mvebu/patches-4.9/405-net-phy-allow-EEE-with-SGMII-interface-modes.patch
+++ b/target/linux/mvebu/patches-4.9/405-net-phy-allow-EEE-with-SGMII-interface-modes.patch
@@ -11,7 +11,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
-@@ -1239,6 +1239,7 @@ int phy_init_eee(struct phy_device *phyd
+@@ -1236,6 +1236,7 @@ int phy_init_eee(struct phy_device *phyd
if ((phydev->duplex == DUPLEX_FULL) &&
((phydev->interface == PHY_INTERFACE_MODE_MII) ||
(phydev->interface == PHY_INTERFACE_MODE_GMII) ||