diff options
| author | John Audia <graysky@archlinux.us> | 2021-06-03 14:46:59 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-06-06 00:25:25 +0200 |
| commit | 752cd29904c9304125005b34354b75b968bfc449 (patch) | |
| tree | d3ae84605ec5662eb77b49e7886971c61c0dfb48 /target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch | |
| parent | da77b9c2f185db72a2917aa2e18f0c8bb164d3c4 (diff) | |
| download | upstream-752cd29904c9304125005b34354b75b968bfc449.tar.gz upstream-752cd29904c9304125005b34354b75b968bfc449.tar.bz2 upstream-752cd29904c9304125005b34354b75b968bfc449.zip | |
kernel: bump 5.4 to 5.4.124
Manually rebased:
generic/hack-5.4/662-remove_pfifo_fast.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
[manual changes to ramips/patches-5.10/835-asoc-add-mt7620-support.patch]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch')
| -rw-r--r-- | target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch index 392a37b345..85c606c455 100644 --- a/target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch +++ b/target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch @@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #include "dsa_priv.h" -@@ -1221,6 +1225,27 @@ static struct devlink_port *dsa_slave_ge +@@ -1223,6 +1227,27 @@ static struct devlink_port *dsa_slave_ge return dp->ds->devlink ? &dp->devlink_port : NULL; } @@ -66,7 +66,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static const struct net_device_ops dsa_slave_netdev_ops = { .ndo_open = dsa_slave_open, .ndo_stop = dsa_slave_close, -@@ -1245,6 +1270,9 @@ static const struct net_device_ops dsa_s +@@ -1247,6 +1272,9 @@ static const struct net_device_ops dsa_s .ndo_vlan_rx_add_vid = dsa_slave_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = dsa_slave_vlan_rx_kill_vid, .ndo_get_devlink_port = dsa_slave_get_devlink_port, |