aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-5.15/704-net-next-ethernet-marvell-mvnetaMQPrioQueue.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-09-08 09:03:12 -0400
committerDaniel Golle <daniel@makrotopia.org>2022-09-09 21:08:37 +0100
commitfbe2f7db8644d831e7afe9e0b5b154a8d7294815 (patch)
treecffc9dcf9388d057a94b55ed6e5ebbf69d5991ab /target/linux/mvebu/patches-5.15/704-net-next-ethernet-marvell-mvnetaMQPrioQueue.patch
parentc0f74a01b539a3406b61ed6a22f8d5d183be3df9 (diff)
downloadupstream-fbe2f7db8644d831e7afe9e0b5b154a8d7294815.tar.gz
upstream-fbe2f7db8644d831e7afe9e0b5b154a8d7294815.tar.bz2
upstream-fbe2f7db8644d831e7afe9e0b5b154a8d7294815.zip
kernel: bump 5.15 to 5.15.67
All patches automatically rebased Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/mvebu/patches-5.15/704-net-next-ethernet-marvell-mvnetaMQPrioQueue.patch')
-rw-r--r--target/linux/mvebu/patches-5.15/704-net-next-ethernet-marvell-mvnetaMQPrioQueue.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mvebu/patches-5.15/704-net-next-ethernet-marvell-mvnetaMQPrioQueue.patch b/target/linux/mvebu/patches-5.15/704-net-next-ethernet-marvell-mvnetaMQPrioQueue.patch
index 73563a57a0..196b986541 100644
--- a/target/linux/mvebu/patches-5.15/704-net-next-ethernet-marvell-mvnetaMQPrioQueue.patch
+++ b/target/linux/mvebu/patches-5.15/704-net-next-ethernet-marvell-mvnetaMQPrioQueue.patch
@@ -30,7 +30,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
phy_interface_t phy_interface;
struct device_node *dn;
-@@ -4936,13 +4935,12 @@ static void mvneta_clear_rx_prio_map(str
+@@ -4892,13 +4891,12 @@ static void mvneta_clear_rx_prio_map(str
mvreg_write(pp, MVNETA_VLAN_PRIO_TO_RXQ, 0);
}
@@ -48,7 +48,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvreg_write(pp, MVNETA_VLAN_PRIO_TO_RXQ, val);
}
-@@ -4951,8 +4949,8 @@ static int mvneta_setup_mqprio(struct ne
+@@ -4907,8 +4905,8 @@ static int mvneta_setup_mqprio(struct ne
struct tc_mqprio_qopt_offload *mqprio)
{
struct mvneta_port *pp = netdev_priv(dev);
@@ -58,7 +58,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (mqprio->qopt.hw != TC_MQPRIO_HW_OFFLOAD_TCS)
return 0;
-@@ -4962,21 +4960,28 @@ static int mvneta_setup_mqprio(struct ne
+@@ -4918,21 +4916,28 @@ static int mvneta_setup_mqprio(struct ne
if (num_tc > rxq_number)
return -EINVAL;