| Message ID | 20160928220528.17478-1-stefan@agner.ch |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Stefan Agner <stefan@agner.ch> wrote: > 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. Acked-by: Florian Westphal <fw@strlen.de>
From: Stefan Agner <stefan@agner.ch> Date: Wed, 28 Sep 2016 15:05:28 -0700 > 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> Applied to net-next, thanks.
diff --git a/net/bridge/br.c b/net/bridge/br.c index 3addc05..889e564 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;
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> --- net/bridge/br.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)