Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3993c4e1 authored by Linus Lüssing's avatar Linus Lüssing Committed by David S. Miller
Browse files

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 2cd41431
("bridge: memorize and export selected IGMP/MLD querier port")

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarLinus Lüssing <linus.luessing@web.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6c03ee8b

net/bridge/br_multicast.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

	}