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/139-net-mvneta-add-flow-control-support-via-phylink.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/139-net-mvneta-add-flow-control-support-via-phylink.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch b/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch index 75cd46e3da..328dd0e18d 100644 --- a/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch +++ b/target/linux/mvebu/patches-4.4/139-net-mvneta-add-flow-control-support-via-phylink.patch @@ -14,7 +14,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c -@@ -3208,6 +3208,8 @@ static void mvneta_mac_config(struct net +@@ -3212,6 +3212,8 @@ static void mvneta_mac_config(struct net if (state->advertising & ADVERTISED_Pause) new_an |= MVNETA_GMAC_ADVERT_SYM_FLOW_CTRL; @@ -23,7 +23,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> switch (mode) { case MLO_AN_SGMII: -@@ -3232,7 +3234,7 @@ static void mvneta_mac_config(struct net +@@ -3236,7 +3238,7 @@ static void mvneta_mac_config(struct net /* The MAC only supports FD mode */ MVNETA_GMAC_CONFIG_FULL_DUPLEX; @@ -32,7 +32,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> new_an |= MVNETA_GMAC_AN_FLOW_CTRL_EN; break; -@@ -3685,6 +3687,22 @@ static int mvneta_ethtool_set_ringparam( +@@ -3689,6 +3691,22 @@ static int mvneta_ethtool_set_ringparam( return 0; } @@ -55,7 +55,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> static void mvneta_ethtool_get_strings(struct net_device *netdev, u32 sset, u8 *data) { -@@ -3866,6 +3884,8 @@ const struct ethtool_ops mvneta_eth_tool +@@ -3870,6 +3888,8 @@ const struct ethtool_ops mvneta_eth_tool .get_drvinfo = mvneta_ethtool_get_drvinfo, .get_ringparam = mvneta_ethtool_get_ringparam, .set_ringparam = mvneta_ethtool_set_ringparam, |