aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-4.4/038-net-mvneta-Fix-the-CPU-choice-in-mvneta_percpu_elect.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-01-06 02:08:42 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-01-07 13:37:04 +0100
commit7f5a040359cf227bc54d2ef553d469f85ed413e2 (patch)
treec0d693d96a58dd0c7b41f829f72f27a30de5d3d1 /target/linux/mvebu/patches-4.4/038-net-mvneta-Fix-the-CPU-choice-in-mvneta_percpu_elect.patch
parentddedcb19e52909b9de851bcdad500656069046b5 (diff)
downloadupstream-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/038-net-mvneta-Fix-the-CPU-choice-in-mvneta_percpu_elect.patch')
-rw-r--r--target/linux/mvebu/patches-4.4/038-net-mvneta-Fix-the-CPU-choice-in-mvneta_percpu_elect.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mvebu/patches-4.4/038-net-mvneta-Fix-the-CPU-choice-in-mvneta_percpu_elect.patch b/target/linux/mvebu/patches-4.4/038-net-mvneta-Fix-the-CPU-choice-in-mvneta_percpu_elect.patch
index 4fc9ccc76a..3423307c1c 100644
--- a/target/linux/mvebu/patches-4.4/038-net-mvneta-Fix-the-CPU-choice-in-mvneta_percpu_elect.patch
+++ b/target/linux/mvebu/patches-4.4/038-net-mvneta-Fix-the-CPU-choice-in-mvneta_percpu_elect.patch
@@ -20,7 +20,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -2847,9 +2847,14 @@ static void mvneta_percpu_disable(void *
+@@ -2851,9 +2851,14 @@ static void mvneta_percpu_disable(void *
static void mvneta_percpu_elect(struct mvneta_port *pp)
{
@@ -37,7 +37,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
max_cpu = num_present_cpus();
for_each_online_cpu(cpu) {
-@@ -2860,7 +2865,7 @@ static void mvneta_percpu_elect(struct m
+@@ -2864,7 +2869,7 @@ static void mvneta_percpu_elect(struct m
if ((rxq % max_cpu) == cpu)
rxq_map |= MVNETA_CPU_RXQ_ACCESS(rxq);
@@ -46,7 +46,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Map the default receive queue queue to the
* elected CPU
*/
-@@ -2871,7 +2876,7 @@ static void mvneta_percpu_elect(struct m
+@@ -2875,7 +2880,7 @@ static void mvneta_percpu_elect(struct m
* the CPU bound to the default RX queue
*/
if (txq_number == 1)