diff options
| author | Linus Lüssing <linus.luessing@web.de> | 2014-06-12 01:41:24 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-12 11:00:24 -0700 |
| commit | 3993c4e159eba0e10c0628737736d6fcf97ab9ef (patch) | |
| tree | 0c09f78241f8e9fd73d35fc015bf15639d4854c9 /net | |
| parent | 6c03ee8bdaa10401f60dee25a719753d2fbbcc36 (diff) | |
| download | linux-stable-3993c4e159eba0e10c0628737736d6fcf97ab9ef.tar.gz linux-stable-3993c4e159eba0e10c0628737736d6fcf97ab9ef.tar.bz2 linux-stable-3993c4e159eba0e10c0628737736d6fcf97ab9ef.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bridge/br_multicast.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |