From e9cb1b720dc890f40598b3ccf1b42110eee5081a Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 17 May 2018 07:53:57 +0200 Subject: 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 --- .../642-net-8021q-support-hardware-flow-table-offload.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '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 c5b3bf3..0d6eab1 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 @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau #include #include #include -+#ifdef CONFIG_NF_FLOW_TABLE ++#if IS_ENABLED(CONFIG_NF_FLOW_TABLE) +#include +#include +#endif @@ -24,7 +24,7 @@ Signed-off-by: Felix Fietkau return real_dev->ifindex; } -+#ifdef CONFIG_NF_FLOW_TABLE ++#if IS_ENABLED(CONFIG_NF_FLOW_TABLE) +static int vlan_dev_flow_offload_check(struct flow_offload_hw_path *path) +{ + struct net_device *dev = path->dev; @@ -52,7 +52,7 @@ Signed-off-by: Felix Fietkau .ndo_fix_features = vlan_dev_fix_features, .ndo_get_lock_subclass = vlan_dev_get_lock_subclass, .ndo_get_iflink = vlan_dev_get_iflink, -+#ifdef CONFIG_NF_FLOW_TABLE ++#if IS_ENABLED(CONFIG_NF_FLOW_TABLE) + .ndo_flow_offload_check = vlan_dev_flow_offload_check, +#endif }; -- cgit v1.1