bridge: Fix build error when IGMP_SNOOPING is not enabled (85b35269) · Commits · 戴 / test

Fix the following build error when IGMP_SNOOPING is not enabled. In file included from net/bridge/br.c:24: net/bridge/br_private.h: In function 'br_multicast_is_router': net/bridge/br_private.h:361: error: 'struct net_bridge' has no member named 'multicast_router' net/bridge/br_private.h:362: error: 'struct net_bridge' has no member named 'multicast_router' net/bridge/br_private.h:363: error: 'struct net_bridge' has no member named 'multicast_router_timer' Signed-off-by:

Sridhar Samudrala <sri@us.ibm.com> Acked-by:

Randy Dunlap <randy.dunlap@oracle.com> Acked-by:

Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/bridge/br_private.h

+9 −5

Original line number	Diff line number	Diff line
		@@ -302,6 +302,13 @@ extern int br_multicast_set_port_router(struct net_bridge_port *p,
		unsigned long val);
		extern int br_multicast_toggle(struct net_bridge *br, unsigned long val);
		extern int br_multicast_set_hash_max(struct net_bridge *br, unsigned long val);

		static inline bool br_multicast_is_router(struct net_bridge *br)
		{
		return br->multicast_router == 2 \|\|
		(br->multicast_router == 1 &&
		timer_pending(&br->multicast_router_timer));
		}
		#else
		static inline int br_multicast_rcv(struct net_bridge *br,
		struct net_bridge_port *port,
		@@ -354,14 +361,11 @@ static inline void br_multicast_forward(struct net_bridge_mdb_entry *mdst,
		struct sk_buff *skb2)
		{
		}
		#endif

		static inline bool br_multicast_is_router(struct net_bridge *br)
		{
		return br->multicast_router == 2 \|\|
		(br->multicast_router == 1 &&
		timer_pending(&br->multicast_router_timer));
		return 0;
		}
		#endif

		/* br_netfilter.c */
		#ifdef CONFIG_BRIDGE_NETFILTER

Admin message