aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2018-05-17 07:53:57 +0200
committerFelix Fietkau <nbd@nbd.name>2018-05-17 08:21:54 +0200
commite9cb1b720dc890f40598b3ccf1b42110eee5081a (patch)
tree485bd4b324480d51710cfc75aed1c4f06aae5e46 /target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch
parent75ed56a08a4ce978323259a59a8f45ceed511584 (diff)
downloadupstream-e9cb1b720dc890f40598b3ccf1b42110eee5081a.tar.gz
upstream-e9cb1b720dc890f40598b3ccf1b42110eee5081a.tar.bz2
upstream-e9cb1b720dc890f40598b3ccf1b42110eee5081a.zip
netfilter: fix hardware offload regression (FS#1551)
The relevant code needs to be enabled even if flow table support is only compiled as module Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch')
-rw-r--r--target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch
index 409f6bec2c..a070fe1636 100644
--- a/target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch
+++ b/target/linux/generic/pending-4.14/643-net-bridge-support-hardware-flow-table-offload.patch
@@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include <linux/ethtool.h>
#include <linux/list.h>
#include <linux/netfilter_bridge.h>
-+#ifdef CONFIG_NF_FLOW_TABLE
++#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
+#include <linux/netfilter.h>
+#include <net/netfilter/nf_flow_table.h>
+#endif
@@ -24,7 +24,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
.get_link = ethtool_op_get_link,
};
-+#ifdef CONFIG_NF_FLOW_TABLE
++#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
+static int br_flow_offload_check(struct flow_offload_hw_path *path)
+{
+ struct net_device *dev = path->dev;
@@ -53,7 +53,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
.ndo_bridge_setlink = br_setlink,
.ndo_bridge_dellink = br_dellink,
.ndo_features_check = passthru_features_check,
-+#ifdef CONFIG_NF_FLOW_TABLE
++#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
+ .ndo_flow_offload_check = br_flow_offload_check,
+#endif
};