diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-02-21 15:09:00 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-02-24 14:19:16 +0100 |
| commit | b6c9d2bab09068776b146962e23f1ce7f5f75f07 (patch) | |
| tree | 9d981bdf6d64bc9ca509b5ab262ef93b23d762c1 /target/linux/mvebu/patches-4.19/531-net-mvneta-Add-support-for-2500Mbps-SGMII.patch | |
| parent | f4bea1b6a378fef02001cb86eebe2e51fe1c5427 (diff) | |
| download | upstream-b6c9d2bab09068776b146962e23f1ce7f5f75f07.tar.gz upstream-b6c9d2bab09068776b146962e23f1ce7f5f75f07.tar.bz2 upstream-b6c9d2bab09068776b146962e23f1ce7f5f75f07.zip | |
kernel: bump 4.19 to 4.19.105
Refreshed all patches.
Fixes:
- CVE-2013-1798
- CVE-2019-3016
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mvebu/patches-4.19/531-net-mvneta-Add-support-for-2500Mbps-SGMII.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.19/531-net-mvneta-Add-support-for-2500Mbps-SGMII.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/mvebu/patches-4.19/531-net-mvneta-Add-support-for-2500Mbps-SGMII.patch b/target/linux/mvebu/patches-4.19/531-net-mvneta-Add-support-for-2500Mbps-SGMII.patch index 0368ba9509..a5553a3e96 100644 --- a/target/linux/mvebu/patches-4.19/531-net-mvneta-Add-support-for-2500Mbps-SGMII.patch +++ b/target/linux/mvebu/patches-4.19/531-net-mvneta-Add-support-for-2500Mbps-SGMII.patch @@ -32,7 +32,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> #define MVNETA_MIB_COUNTERS_BASE 0x3000 #define MVNETA_MIB_LATE_COLLISION 0x7c #define MVNETA_DA_FILT_SPEC_MCAST 0x3400 -@@ -3344,6 +3346,7 @@ static void mvneta_validate(struct net_d +@@ -3359,6 +3361,7 @@ static void mvneta_validate(struct net_d if (state->interface != PHY_INTERFACE_MODE_NA && state->interface != PHY_INTERFACE_MODE_QSGMII && state->interface != PHY_INTERFACE_MODE_SGMII && @@ -40,7 +40,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> !phy_interface_mode_is_8023z(state->interface) && !phy_interface_mode_is_rgmii(state->interface)) { bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS); -@@ -3356,9 +3359,15 @@ static void mvneta_validate(struct net_d +@@ -3371,9 +3374,15 @@ static void mvneta_validate(struct net_d /* Asymmetric pause is unsupported */ phylink_set(mask, Pause); @@ -59,7 +59,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> if (!phy_interface_mode_is_8023z(state->interface)) { /* 10M and 100M are only supported in non-802.3z mode */ -@@ -3419,12 +3428,14 @@ static void mvneta_mac_config(struct net +@@ -3434,12 +3443,14 @@ static void mvneta_mac_config(struct net struct mvneta_port *pp = netdev_priv(ndev); u32 new_ctrl0, gmac_ctrl0 = mvreg_read(pp, MVNETA_GMAC_CTRL_0); u32 new_ctrl2, gmac_ctrl2 = mvreg_read(pp, MVNETA_GMAC_CTRL_2); @@ -74,7 +74,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> new_clk = gmac_clk & ~MVNETA_GMAC_1MS_CLOCK_ENABLE; new_an = gmac_an & ~(MVNETA_GMAC_INBAND_AN_ENABLE | MVNETA_GMAC_INBAND_RESTART_AN | -@@ -3457,7 +3468,7 @@ static void mvneta_mac_config(struct net +@@ -3472,7 +3483,7 @@ static void mvneta_mac_config(struct net if (state->duplex) new_an |= MVNETA_GMAC_CONFIG_FULL_DUPLEX; @@ -83,7 +83,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> new_an |= MVNETA_GMAC_CONFIG_GMII_SPEED; else if (state->speed == SPEED_100) new_an |= MVNETA_GMAC_CONFIG_MII_SPEED; -@@ -3496,10 +3507,18 @@ static void mvneta_mac_config(struct net +@@ -3511,10 +3522,18 @@ static void mvneta_mac_config(struct net MVNETA_GMAC_FORCE_LINK_DOWN); } |