aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>2018-01-07 14:12:52 +0000
committerStijn Tintel <stijn@linux-ipv6.be>2018-01-10 00:11:39 +0200
commitefb375b5795dd26fed078fff8463ae5b49a73551 (patch)
tree0aac089e40804674f475674256debf320fe50589 /target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch
parent1d2590f83826bb9cdf658001761593519186ce0e (diff)
downloadupstream-efb375b5795dd26fed078fff8463ae5b49a73551.tar.gz
upstream-efb375b5795dd26fed078fff8463ae5b49a73551.tar.bz2
upstream-efb375b5795dd26fed078fff8463ae5b49a73551.zip
kernel: bump 4.4 to 4.4.110
Refresh patches Fixes: CVE-2017-5754 aka Meltdown Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> [fix typo in commit msg, conflict after 4.14 bump] Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch')
-rw-r--r--target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch b/target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch
index c398a47341..fbee3d2887 100644
--- a/target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch
+++ b/target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch
@@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -1067,15 +1067,28 @@ static void mvneta_defaults_set(struct m
+@@ -1071,15 +1071,28 @@ static void mvneta_defaults_set(struct m
MVNETA_GMAC_AN_SPEED_EN |
MVNETA_GMAC_AN_DUPLEX_EN;
mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val);
@@ -43,7 +43,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
mvneta_set_ucast_table(pp, -1);
-@@ -3228,9 +3241,6 @@ static int mvneta_port_power_up(struct m
+@@ -3232,9 +3245,6 @@ static int mvneta_port_power_up(struct m
return -EINVAL;
}