Message ID | 1267473184.31728.7.camel@w-sridhar.beaverton.ibm.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
On 03/01/10 11:53, Sridhar Samudrala wrote: > 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> > > diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h > index 9191198..1cf2cef 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, > 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 > > > -- Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Thanks.
On Mon, Mar 01, 2010 at 11:53:04AM -0800, Sridhar Samudrala wrote: > 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> Thanks for the fix. Acked-by: Herbert Xu <herbert@gondor.apana.org.au> I'd originally left the struct data outside ifdefs and then added the ifdefs without testing. Cheers,
From: Herbert Xu <herbert@gondor.apana.org.au> Date: Tue, 2 Mar 2010 08:46:26 +0800 > On Mon, Mar 01, 2010 at 11:53:04AM -0800, Sridhar Samudrala wrote: >> 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> > > Thanks for the fix. > > Acked-by: Herbert Xu <herbert@gondor.apana.org.au> > > I'd originally left the struct data outside ifdefs and then added > the ifdefs without testing. Thanks everyone, I'll apply this. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 9191198..1cf2cef 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, 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
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> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html