* [PATCH] netfilter: bridge: clarify bridge/netfilter message
@ 2016-09-28 22:05 Stefan Agner
2016-09-29 2:25 ` Florian Westphal
2016-10-03 2:44 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Stefan Agner @ 2016-09-28 22:05 UTC (permalink / raw)
To: stephen, davem; +Cc: bridge, netdev, linux-kernel, pablo, Stefan Agner
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(-)
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;
--
2.10.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] netfilter: bridge: clarify bridge/netfilter message
2016-09-28 22:05 [PATCH] netfilter: bridge: clarify bridge/netfilter message Stefan Agner
@ 2016-09-29 2:25 ` Florian Westphal
2016-10-03 2:44 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Florian Westphal @ 2016-09-29 2:25 UTC (permalink / raw)
To: Stefan Agner; +Cc: stephen, davem, bridge, netdev, linux-kernel, pablo
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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] netfilter: bridge: clarify bridge/netfilter message
2016-09-28 22:05 [PATCH] netfilter: bridge: clarify bridge/netfilter message Stefan Agner
2016-09-29 2:25 ` Florian Westphal
@ 2016-10-03 2:44 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2016-10-03 2:44 UTC (permalink / raw)
To: stefan; +Cc: stephen, bridge, netdev, linux-kernel, pablo
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-10-03 2:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-28 22:05 [PATCH] netfilter: bridge: clarify bridge/netfilter message Stefan Agner
2016-09-29 2:25 ` Florian Westphal
2016-10-03 2:44 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).