aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@citymesh.com>2021-03-29 11:43:31 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2021-04-09 15:43:38 +0200
commitc43c434b5851f585adf154e6278620870e12c861 (patch)
tree716d74f7b62ff2ccc4c2dd3736f8d178ca2f6018 /target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch
parent81266d900104d657275aa5df3fb7629f7892c57a (diff)
downloadupstream-c43c434b5851f585adf154e6278620870e12c861.tar.gz
upstream-c43c434b5851f585adf154e6278620870e12c861.tar.bz2
upstream-c43c434b5851f585adf154e6278620870e12c861.zip
kernel: bump 4.14 to 4.14.227
Refreshed all patches. Altered patches: - 809-flexcan-support-layerscape.patch Compile-tested on: ar71xx, cns3xxx, imx6, layerscape, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@citymesh.com>
Diffstat (limited to 'target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch')
-rw-r--r--target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch b/target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch
index bbf02a9e91..9e505740d3 100644
--- a/target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch
+++ b/target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch
@@ -23,7 +23,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -826,6 +826,13 @@ struct xfrmdev_ops {
+@@ -827,6 +827,13 @@ struct xfrmdev_ops {
};
#endif
@@ -37,7 +37,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
/*
* This structure defines the management hooks for network devices.
* The following hooks can be defined; unless noted otherwise, they are
-@@ -1057,6 +1064,10 @@ struct xfrmdev_ops {
+@@ -1058,6 +1065,10 @@ struct xfrmdev_ops {
* int (*ndo_bridge_dellink)(struct net_device *dev, struct nlmsghdr *nlh,
* u16 flags);
*
@@ -48,7 +48,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier);
* Called to change device carrier. Soft-devices (like dummy, team, etc)
* which do not represent real hardware may define this to allow their
-@@ -1281,6 +1292,8 @@ struct net_device_ops {
+@@ -1282,6 +1293,8 @@ struct net_device_ops {
int (*ndo_bridge_dellink)(struct net_device *dev,
struct nlmsghdr *nlh,
u16 flags);