diff options
author | Sridhar Samudrala <sri@us.ibm.com> | 2010-03-01 04:53:04 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-02 06:05:04 -0500 |
commit | 85b3526932645269f67fee3583fa2aa500ab4f34 (patch) | |
tree | edbc5ec3d1a59c178bc36adb12fea56df164b652 /net/bridge/br_private.h | |
parent | 47871889c601d8199c51a4086f77eebd77c29b0b (diff) |
bridge: Fix build error when IGMP_SNOOPING is not enabled
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>
Diffstat (limited to 'net/bridge/br_private.h')
-rw-r--r-- | net/bridge/br_private.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 9191198c4f1b..1cf2cef78584 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h | |||
@@ -302,6 +302,13 @@ extern int br_multicast_set_port_router(struct net_bridge_port *p, | |||
302 | unsigned long val); | 302 | unsigned long val); |
303 | extern int br_multicast_toggle(struct net_bridge *br, unsigned long val); | 303 | extern int br_multicast_toggle(struct net_bridge *br, unsigned long val); |
304 | extern int br_multicast_set_hash_max(struct net_bridge *br, unsigned long val); | 304 | extern int br_multicast_set_hash_max(struct net_bridge *br, unsigned long val); |
305 | |||
306 | static inline bool br_multicast_is_router(struct net_bridge *br) | ||
307 | { | ||
308 | return br->multicast_router == 2 || | ||
309 | (br->multicast_router == 1 && | ||
310 | timer_pending(&br->multicast_router_timer)); | ||
311 | } | ||
305 | #else | 312 | #else |
306 | static inline int br_multicast_rcv(struct net_bridge *br, | 313 | static inline int br_multicast_rcv(struct net_bridge *br, |
307 | struct net_bridge_port *port, | 314 | struct net_bridge_port *port, |
@@ -354,14 +361,11 @@ static inline void br_multicast_forward(struct net_bridge_mdb_entry *mdst, | |||
354 | struct sk_buff *skb2) | 361 | struct sk_buff *skb2) |
355 | { | 362 | { |
356 | } | 363 | } |
357 | #endif | ||
358 | |||
359 | static inline bool br_multicast_is_router(struct net_bridge *br) | 364 | static inline bool br_multicast_is_router(struct net_bridge *br) |
360 | { | 365 | { |
361 | return br->multicast_router == 2 || | 366 | return 0; |
362 | (br->multicast_router == 1 && | ||
363 | timer_pending(&br->multicast_router_timer)); | ||
364 | } | 367 | } |
368 | #endif | ||
365 | 369 | ||
366 | /* br_netfilter.c */ | 370 | /* br_netfilter.c */ |
367 | #ifdef CONFIG_BRIDGE_NETFILTER | 371 | #ifdef CONFIG_BRIDGE_NETFILTER |