diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-01-06 02:08:42 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-01-07 13:37:04 +0100 |
| commit | 7f5a040359cf227bc54d2ef553d469f85ed413e2 (patch) | |
| tree | c0d693d96a58dd0c7b41f829f72f27a30de5d3d1 /target/linux/mvebu/patches-4.4/143-net-mvneta-add-EEE-support.patch | |
| parent | ddedcb19e52909b9de851bcdad500656069046b5 (diff) | |
| download | upstream-7f5a040359cf227bc54d2ef553d469f85ed413e2.tar.gz upstream-7f5a040359cf227bc54d2ef553d469f85ed413e2.tar.bz2 upstream-7f5a040359cf227bc54d2ef553d469f85ed413e2.zip | |
kernel: update kernel 4.4 to version 4.4.110
This fixes: CVE-2017-5754
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mvebu/patches-4.4/143-net-mvneta-add-EEE-support.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.4/143-net-mvneta-add-EEE-support.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/mvebu/patches-4.4/143-net-mvneta-add-EEE-support.patch b/target/linux/mvebu/patches-4.4/143-net-mvneta-add-EEE-support.patch index b9043561d0..47763ba92e 100644 --- a/target/linux/mvebu/patches-4.4/143-net-mvneta-add-EEE-support.patch +++ b/target/linux/mvebu/patches-4.4/143-net-mvneta-add-EEE-support.patch @@ -68,7 +68,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> u64 ethtool_stats[ARRAY_SIZE(mvneta_statistics)]; u32 indir[MVNETA_RSS_LU_TABLE_SIZE]; -@@ -3276,6 +3293,18 @@ static void mvneta_mac_config(struct net +@@ -3280,6 +3297,18 @@ static void mvneta_mac_config(struct net mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, new_an); } @@ -87,7 +87,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> static void mvneta_mac_link_down(struct net_device *ndev, unsigned int mode) { struct mvneta_port *pp = netdev_priv(ndev); -@@ -3289,6 +3318,9 @@ static void mvneta_mac_link_down(struct +@@ -3293,6 +3322,9 @@ static void mvneta_mac_link_down(struct val |= MVNETA_GMAC_FORCE_LINK_DOWN; mvreg_write(pp, MVNETA_GMAC_AUTONEG_CONFIG, val); } @@ -97,7 +97,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> } static void mvneta_mac_link_up(struct net_device *ndev, unsigned int mode, -@@ -3305,6 +3337,11 @@ static void mvneta_mac_link_up(struct ne +@@ -3309,6 +3341,11 @@ static void mvneta_mac_link_up(struct ne } mvneta_port_up(pp); @@ -109,7 +109,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> } static const struct phylink_mac_ops mvneta_phylink_ops = { -@@ -3744,6 +3781,13 @@ static void mvneta_ethtool_update_stats( +@@ -3748,6 +3785,13 @@ static void mvneta_ethtool_update_stats( val64 = (u64)high << 32 | low; pp->ethtool_stats[i] += val64; break; @@ -123,7 +123,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> } } } -@@ -3867,6 +3911,47 @@ static int mvneta_ethtool_get_rxfh(struc +@@ -3871,6 +3915,47 @@ static int mvneta_ethtool_get_rxfh(struc return 0; } @@ -171,7 +171,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> static const struct net_device_ops mvneta_netdev_ops = { .ndo_open = mvneta_open, .ndo_stop = mvneta_stop, -@@ -3898,6 +3983,8 @@ const struct ethtool_ops mvneta_eth_tool +@@ -3902,6 +3987,8 @@ const struct ethtool_ops mvneta_eth_tool .get_rxnfc = mvneta_ethtool_get_rxnfc, .get_rxfh = mvneta_ethtool_get_rxfh, .set_rxfh = mvneta_ethtool_set_rxfh, |