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/035-net-mvneta-Configure-XPS-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/035-net-mvneta-Configure-XPS-support.patch')
-rw-r--r-- | target/linux/mvebu/patches-4.4/035-net-mvneta-Configure-XPS-support.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/mvebu/patches-4.4/035-net-mvneta-Configure-XPS-support.patch b/target/linux/mvebu/patches-4.4/035-net-mvneta-Configure-XPS-support.patch index 5b35b6442b..7389466b6d 100644 --- a/target/linux/mvebu/patches-4.4/035-net-mvneta-Configure-XPS-support.patch +++ b/target/linux/mvebu/patches-4.4/035-net-mvneta-Configure-XPS-support.patch @@ -32,7 +32,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }; struct mvneta_rx_queue { -@@ -1062,20 +1066,30 @@ static void mvneta_defaults_set(struct m +@@ -1066,20 +1070,30 @@ static void mvneta_defaults_set(struct m /* Enable MBUS Retry bit16 */ mvreg_write(pp, MVNETA_MBUS_RETRY, 0x20); @@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mvreg_write(pp, MVNETA_CPU_MAP(cpu), rxq_map | txq_map); } -@@ -2362,6 +2376,8 @@ static void mvneta_rxq_deinit(struct mvn +@@ -2366,6 +2380,8 @@ static void mvneta_rxq_deinit(struct mvn static int mvneta_txq_init(struct mvneta_port *pp, struct mvneta_tx_queue *txq) { @@ -78,7 +78,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> txq->size = pp->tx_ring_size; /* A queue must always have room for at least one skb. -@@ -2414,6 +2430,14 @@ static int mvneta_txq_init(struct mvneta +@@ -2418,6 +2434,14 @@ static int mvneta_txq_init(struct mvneta } mvneta_tx_done_pkts_coal_set(pp, txq, txq->done_pkts_coal); @@ -93,7 +93,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> return 0; } -@@ -2836,13 +2860,23 @@ static void mvneta_percpu_elect(struct m +@@ -2840,13 +2864,23 @@ static void mvneta_percpu_elect(struct m if ((rxq % max_cpu) == cpu) rxq_map |= MVNETA_CPU_RXQ_ACCESS(rxq); |