aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4/642-net-8021q-support-hardware-flow-table-offload.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-12-15 06:20:33 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2021-12-17 15:10:22 +0100
commita696e325f7a0ee386cd0c433f4bf2e30e9fc4b01 (patch)
tree2db37701195be5e689e0480a6de94fb0fd528d8e /target/linux/generic/pending-5.4/642-net-8021q-support-hardware-flow-table-offload.patch
parent87def9efd8cee66da3bd3961671e580282427c2e (diff)
downloadupstream-a696e325f7a0ee386cd0c433f4bf2e30e9fc4b01.tar.gz
upstream-a696e325f7a0ee386cd0c433f4bf2e30e9fc4b01.tar.bz2
upstream-a696e325f7a0ee386cd0c433f4bf2e30e9fc4b01.zip
kernel: bump 5.4 to 5.4.165
All patches automatically rebased. Build system: x86_64 Build-tested: ramips/mt7621* *FS#4149 affects me so I had to revert 7f1edbd41295dff9f2127b169fbc086c0fb2c14e in order to downgrade to 2.35.1 Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/pending-5.4/642-net-8021q-support-hardware-flow-table-offload.patch')
-rw-r--r--target/linux/generic/pending-5.4/642-net-8021q-support-hardware-flow-table-offload.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.4/642-net-8021q-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-5.4/642-net-8021q-support-hardware-flow-table-offload.patch
index d67cad7159..cfcc28af3e 100644
--- a/target/linux/generic/pending-5.4/642-net-8021q-support-hardware-flow-table-offload.patch
+++ b/target/linux/generic/pending-5.4/642-net-8021q-support-hardware-flow-table-offload.patch
@@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include "vlan.h"
#include "vlanproc.h"
#include <linux/if_vlan.h>
-@@ -744,6 +749,27 @@ static int vlan_dev_get_iflink(const str
+@@ -747,6 +752,27 @@ static int vlan_dev_get_iflink(const str
return real_dev->ifindex;
}
@@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static const struct ethtool_ops vlan_ethtool_ops = {
.get_link_ksettings = vlan_ethtool_get_link_ksettings,
.get_drvinfo = vlan_ethtool_get_drvinfo,
-@@ -782,6 +808,9 @@ static const struct net_device_ops vlan_
+@@ -785,6 +811,9 @@ static const struct net_device_ops vlan_
#endif
.ndo_fix_features = vlan_dev_fix_features,
.ndo_get_iflink = vlan_dev_get_iflink,