kernel: bump 4.14 to 4.14.34

[openwrt/openwrt.git] / target / linux / generic / pending-4.14 / 642-net-8021q-support-hardware-flow-table-offload.patch

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 cda2e0ffd44809ef2885b731134fa66240b4da3e..ca340fc8e5f654c1a8087deff1d929f746fea293 100644 (file)
--- 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,