diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2018-04-16 00:00:49 +0300 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2018-04-16 00:22:57 +0300 |
| commit | ec1d7b94616c392c28b8a51f1aa0c481cc6d92c8 (patch) | |
| tree | f25b8ee10186d5d2677d9ad48108ae3768e3914f /target/linux/generic/pending-4.14/642-net-8021q-support-hardware-flow-table-offload.patch | |
| parent | 03774d28e1c12f24857cdb44a110df593cec42a6 (diff) | |
| download | upstream-ec1d7b94616c392c28b8a51f1aa0c481cc6d92c8.tar.gz upstream-ec1d7b94616c392c28b8a51f1aa0c481cc6d92c8.tar.bz2 upstream-ec1d7b94616c392c28b8a51f1aa0c481cc6d92c8.zip | |
kernel: bump 4.14 to 4.14.34
Refresh patches.
Update patches that no longer apply:
- backport/313-netfilter-remove-defensive-check-on-malformed-packet.patch
- pending/642-net-8021q-support-hardware-flow-table-offload.patch
Compile-tested: x86/64.
Runtime-tested: x86/64.
Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/generic/pending-4.14/642-net-8021q-support-hardware-flow-table-offload.patch')
| -rw-r--r-- | target/linux/generic/pending-4.14/642-net-8021q-support-hardware-flow-table-offload.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/generic/pending-4.14/642-net-8021q-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.14/642-net-8021q-support-hardware-flow-table-offload.patch index cda2e0ffd4..ca340fc8e5 100644 --- a/target/linux/generic/pending-4.14/642-net-8021q-support-hardware-flow-table-offload.patch +++ b/target/linux/generic/pending-4.14/642-net-8021q-support-hardware-flow-table-offload.patch @@ -9,18 +9,19 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c -@@ -29,8 +29,10 @@ +@@ -29,9 +29,11 @@ #include <linux/net_tstamp.h> #include <linux/etherdevice.h> #include <linux/ethtool.h> +#include <linux/netfilter.h> + #include <linux/phy.h> #include <net/arp.h> #include <net/switchdev.h> +#include <net/netfilter/nf_flow_table.h> #include "vlan.h" #include "vlanproc.h" -@@ -762,6 +764,25 @@ static int vlan_dev_get_iflink(const str +@@ -766,6 +768,25 @@ static int vlan_dev_get_iflink(const str return real_dev->ifindex; } @@ -46,7 +47,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, -@@ -799,6 +820,7 @@ static const struct net_device_ops vlan_ +@@ -803,6 +824,7 @@ static const struct net_device_ops vlan_ .ndo_fix_features = vlan_dev_fix_features, .ndo_get_lock_subclass = vlan_dev_get_lock_subclass, .ndo_get_iflink = vlan_dev_get_iflink, |