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/536-net-marvell-neta-disable-comphy-when-setting-mode.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/536-net-marvell-neta-disable-comphy-when-setting-mode.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.19/536-net-marvell-neta-disable-comphy-when-setting-mode.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-4.19/536-net-marvell-neta-disable-comphy-when-setting-mode.patch b/target/linux/mvebu/patches-4.19/536-net-marvell-neta-disable-comphy-when-setting-mode.patch index 9abb00c50d..bac9a55cf0 100644 --- a/target/linux/mvebu/patches-4.19/536-net-marvell-neta-disable-comphy-when-setting-mode.patch +++ b/target/linux/mvebu/patches-4.19/536-net-marvell-neta-disable-comphy-when-setting-mode.patch @@ -28,7 +28,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c -@@ -3151,11 +3151,26 @@ static int mvneta_setup_txqs(struct mvne +@@ -3166,11 +3166,26 @@ static int mvneta_setup_txqs(struct mvne return 0; } @@ -56,7 +56,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mvneta_max_rx_size_set(pp, pp->pkt_size); mvneta_txq_max_tx_size_set(pp, pp->pkt_size); -@@ -3527,12 +3542,15 @@ static void mvneta_mac_config(struct net +@@ -3542,12 +3557,15 @@ static void mvneta_mac_config(struct net if (state->speed == SPEED_2500) new_ctrl4 |= MVNETA_GMAC4_SHORT_PREAMBLE_ENABLE; |