Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: bridge: clarify bridge/netfilter message

When using bridge without bridge netfilter enabled the message
displayed is rather confusing and leads to belive that a deprecated
feature is in use. Use IS_MODULE to be explicit that the message only
affects users which use bridge netfilter as module and reword the
message.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Stefan Agner and committed by
David S. Miller
d4ef9f72 b50afd20

+4 -2
+4 -2
net/bridge/br.c
··· 227 227 br_fdb_test_addr_hook = br_fdb_test_addr; 228 228 #endif 229 229 230 - pr_info("bridge: automatic filtering via arp/ip/ip6tables has been " 231 - "deprecated. Update your scripts to load br_netfilter if you " 230 + #if IS_MODULE(CONFIG_BRIDGE_NETFILTER) 231 + pr_info("bridge: filtering via arp/ip/ip6tables is no longer available " 232 + "by default. Update your scripts to load br_netfilter if you " 232 233 "need this.\n"); 234 + #endif 233 235 234 236 return 0; 235 237