commit dfd56b8b38fff3586f36232db58e1e9f7885a605
author Eric Dumazet <eric.dumazet@gmail.com> Sat Dec 10 09:48:31 2011 +0000
committer David S. Miller <davem@davemloft.net> Sun Dec 11 18:25:16 2011 -0500
tree 64c7142ebf4625939f68bd3603f1d37bacb20a73
parent 1ded132d4c3442aa3a619c94c245d7b5e0eb9731

net: use IS_ENABLED(CONFIG_IPV6)

Instead of testing defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/bridge/br_private.h

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 8996908..57dcd14 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -56,7 +56,7 @@
 {
 	union {
 		__be32	ip4;
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+#if IS_ENABLED(CONFIG_IPV6)
 		struct in6_addr ip6;
 #endif
 	} u;