diff options
| author | John Audia <graysky@archlinux.us> | 2021-12-08 06:14:30 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-12-17 15:10:22 +0100 |
| commit | 187c8f9153bee5deb8a1163ba2abcbc7bc9e229c (patch) | |
| tree | edf5aaed5e7cba74070591797ef5a7ce764eb957 /target/linux/mvebu/patches-5.10/702-net-next-ethernet-marvell-mvnetaMQPrioOffload.patch | |
| parent | d4b25007ea14a9772545e70191aa41e25f75ce19 (diff) | |
| download | upstream-187c8f9153bee5deb8a1163ba2abcbc7bc9e229c.tar.gz upstream-187c8f9153bee5deb8a1163ba2abcbc7bc9e229c.tar.bz2 upstream-187c8f9153bee5deb8a1163ba2abcbc7bc9e229c.zip | |
kernel: bump 5.10 to 5.10.84
All patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B
Run-tested: bcm2711/RPi4B
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/mvebu/patches-5.10/702-net-next-ethernet-marvell-mvnetaMQPrioOffload.patch')
| -rw-r--r-- | target/linux/mvebu/patches-5.10/702-net-next-ethernet-marvell-mvnetaMQPrioOffload.patch | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/mvebu/patches-5.10/702-net-next-ethernet-marvell-mvnetaMQPrioOffload.patch b/target/linux/mvebu/patches-5.10/702-net-next-ethernet-marvell-mvnetaMQPrioOffload.patch index 8a5f3f3cf4..41f8c1fbfd 100644 --- a/target/linux/mvebu/patches-5.10/702-net-next-ethernet-marvell-mvnetaMQPrioOffload.patch +++ b/target/linux/mvebu/patches-5.10/702-net-next-ethernet-marvell-mvnetaMQPrioOffload.patch @@ -16,8 +16,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net> (limited to 'drivers/net/ethernet/marvell/mvneta.c') -diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c -index 80e4b500695e6..46b7604805f76 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -38,6 +38,7 @@ @@ -28,7 +26,7 @@ index 80e4b500695e6..46b7604805f76 100644 #include <linux/bpf_trace.h> /* Registers */ -@@ -4908,14 +4909,14 @@ static void mvneta_setup_rx_prio_map(struct mvneta_port *pp) +@@ -4933,14 +4934,14 @@ static void mvneta_setup_rx_prio_map(str } static int mvneta_setup_mqprio(struct net_device *dev, @@ -46,7 +44,7 @@ index 80e4b500695e6..46b7604805f76 100644 if (num_tc > rxq_number) return -EINVAL; -@@ -4926,13 +4927,15 @@ static int mvneta_setup_mqprio(struct net_device *dev, +@@ -4951,13 +4952,15 @@ static int mvneta_setup_mqprio(struct ne return 0; } @@ -66,6 +64,3 @@ index 80e4b500695e6..46b7604805f76 100644 return 0; } --- -cgit 1.2.3-1.el7 - |