aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-4.4/040-net-mvneta-Modify-the-queue-related-fields-from-each.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/mvebu/patches-4.4/040-net-mvneta-Modify-the-queue-related-fields-from-each.patch')
-rw-r--r--target/linux/mvebu/patches-4.4/040-net-mvneta-Modify-the-queue-related-fields-from-each.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/mvebu/patches-4.4/040-net-mvneta-Modify-the-queue-related-fields-from-each.patch b/target/linux/mvebu/patches-4.4/040-net-mvneta-Modify-the-queue-related-fields-from-each.patch
index acb6c94bb2..c589413107 100644
--- a/target/linux/mvebu/patches-4.4/040-net-mvneta-Modify-the-queue-related-fields-from-each.patch
+++ b/target/linux/mvebu/patches-4.4/040-net-mvneta-Modify-the-queue-related-fields-from-each.patch
@@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -1040,6 +1040,43 @@ static void mvneta_set_autoneg(struct mv
+@@ -1041,6 +1041,43 @@ static void mvneta_set_autoneg(struct mv
}
}
@@ -61,7 +61,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* This method sets defaults to the NETA port:
* Clears interrupt Cause and Mask registers.
* Clears all MAC tables.
-@@ -1057,14 +1094,10 @@ static void mvneta_defaults_set(struct m
+@@ -1058,14 +1095,10 @@ static void mvneta_defaults_set(struct m
int max_cpu = num_present_cpus();
/* Clear all Cause registers */
@@ -78,7 +78,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvreg_write(pp, MVNETA_INTR_ENABLE, 0);
/* Enable MBUS Retry bit16 */
-@@ -2530,31 +2563,6 @@ static int mvneta_setup_txqs(struct mvne
+@@ -2531,31 +2564,6 @@ static int mvneta_setup_txqs(struct mvne
return 0;
}
@@ -110,7 +110,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void mvneta_start_dev(struct mvneta_port *pp)
{
int cpu;
-@@ -2605,13 +2613,10 @@ static void mvneta_stop_dev(struct mvnet
+@@ -2606,13 +2614,10 @@ static void mvneta_stop_dev(struct mvnet
mvneta_port_disable(pp);
/* Clear all ethernet port interrupts */
@@ -126,7 +126,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvneta_tx_reset(pp);
mvneta_rx_reset(pp);
-@@ -2923,9 +2928,7 @@ static int mvneta_percpu_notifier(struct
+@@ -2924,9 +2929,7 @@ static int mvneta_percpu_notifier(struct
}
/* Mask all ethernet port interrupts */
@@ -137,7 +137,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
napi_enable(&port->napi);
-@@ -2940,14 +2943,8 @@ static int mvneta_percpu_notifier(struct
+@@ -2941,14 +2944,8 @@ static int mvneta_percpu_notifier(struct
*/
mvneta_percpu_elect(pp);
@@ -154,7 +154,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvreg_write(pp, MVNETA_INTR_MISC_MASK,
MVNETA_CAUSE_PHY_STATUS_CHANGE |
MVNETA_CAUSE_LINK_CHANGE |
-@@ -2958,9 +2955,7 @@ static int mvneta_percpu_notifier(struct
+@@ -2959,9 +2956,7 @@ static int mvneta_percpu_notifier(struct
case CPU_DOWN_PREPARE_FROZEN:
netif_tx_stop_all_queues(pp->dev);
/* Mask all ethernet port interrupts */
@@ -165,7 +165,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
napi_synchronize(&port->napi);
napi_disable(&port->napi);
-@@ -2976,10 +2971,7 @@ static int mvneta_percpu_notifier(struct
+@@ -2977,10 +2972,7 @@ static int mvneta_percpu_notifier(struct
/* Check if a new CPU must be elected now this on is down */
mvneta_percpu_elect(pp);
/* Unmask all ethernet port interrupts */