diff options
| author | Stefan Agner <stefan@agner.ch> | 2016-09-29 00:05:28 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-03 04:44:03 +0200 |
| commit | d4ef9f72128d414ad83b27b49312faa971d77382 (patch) | |
| tree | bc45ab894fb7449113b096c5919defe371e9890c /net/bridge | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-d4ef9f72128d414ad83b27b49312faa971d77382.tar.xz linux-d4ef9f72128d414ad83b27b49312faa971d77382.zip | |
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>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bridge/br.c b/net/bridge/br.c index 3addc05b9a16..889e5640455f 100644 --- a/net/bridge/br.c +++ b/net/bridge/br.c @@ -227,9 +227,11 @@ static int __init br_init(void) br_fdb_test_addr_hook = br_fdb_test_addr; #endif - pr_info("bridge: automatic filtering via arp/ip/ip6tables has been " - "deprecated. Update your scripts to load br_netfilter if you " +#if IS_MODULE(CONFIG_BRIDGE_NETFILTER) + pr_info("bridge: filtering via arp/ip/ip6tables is no longer available " + "by default. Update your scripts to load br_netfilter if you " "need this.\n"); +#endif return 0; |