fix: detect modularized CONFIG_BRIDGE_NETFILTER

aabc · Sep 5, 2023 · 4b24536 · 4b24536
1 parent 0eb2092
commit 4b24536
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/compat.h b/compat.h
@@ -692,7 +692,7 @@ static inline int is_vlan_dev(struct net_device *dev)
 }
 #endif
 
-#ifdef CONFIG_BRIDGE_NETFILTER
+#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
 # ifndef HAVE_NF_BRIDGE_INFO_GET
 static inline struct nf_bridge_info *
 nf_bridge_info_get(const struct sk_buff *skb)

diff --git a/gen_compat_def b/gen_compat_def
@@ -116,7 +116,7 @@ kbuild_test_struct timeval linux/ktime.h
 kbuild_test_struct proc_ops linux/proc_fs.h
 # No since v5.1, but present in CentOS-8's 4.18.0-227
 kbuild_test_symbol synchronize_sched linux/rcupdate.h
-# Fails on 3.10.0-957.10.1.el7.x86_64
+# No since 5, but present in include/net/netfilter/br_netfilter.h >= linux v4.2 and < 5 (non-backports)
 kbuild_test_symbol nf_bridge_info_get linux/netfilter_bridge.h
 # Stumbled on 5.9
 kbuild_test_struct vlan_dev_priv linux/if_vlan.h