From: Linus Lüssing <linus.luessing@web.de>
Date: Wed, 11 Jun 2014 23:41:24 +0000 (+0200)
Subject: bridge: fix compile error when compiling without IPv6 support
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3993c4e159eba0e10c0628737736d6fcf97ab9ef;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

bridge: fix compile error when compiling without IPv6 support

Some fields in "struct net_bridge" aren't available when compiling the
kernel without IPv6 support. Therefore adding a check/macro to skip the
complaining code sections in that case.

Introduced by 2cd4143192e8c60f66cb32c3a30c76d0470a372d
("bridge: memorize and export selected IGMP/MLD querier port")

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Linus Lüssing <linus.luessing@web.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 876e5fb2a786..abfa0b65a111 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -2246,11 +2246,13 @@ bool br_multicast_has_querier_adjacent(struct net_device *dev, int proto)
 		    rcu_dereference(br->ip4_querier.port) == port)
 			goto unlock;
 		break;
+#if IS_ENABLED(CONFIG_IPV6)
 	case ETH_P_IPV6:
 		if (!timer_pending(&br->ip6_other_query.timer) ||
 		    rcu_dereference(br->ip6_querier.port) == port)
 			goto unlock;
 		break;
+#endif
 	default:
 		goto unlock;
 	}