Patchwork bridge: add empty br_mdb_init() and br_mdb_uninit() definitions.

login
register
mail settings
Submitter Rami Rosen
Date Jan. 3, 2013, 11:30 a.m.
Message ID <1357212643-1324-1-git-send-email-ramirose@gmail.com>
Download mbox | patch
Permalink /patch/209225/
State Accepted
Delegated to: David Miller
Headers show

Comments

Rami Rosen - Jan. 3, 2013, 11:30 a.m.
This patch adds empty br_mdb_init() and br_mdb_uninit() definitions in
br_private.h to avoid build failure when CONFIG_BRIDGE_IGMP_SNOOPING is not set.
These methods were moved from br_multicast.c to br_netlink.c by 
commit 3ec8e9f085bcaef0de1077f555c2c5102c223390

Signed-off-by: Rami Rosen <ramirose@gmail.com>
---
 net/bridge/br_private.h | 6 ++++++
 1 file changed, 6 insertions(+)
David Miller - Jan. 3, 2013, 11:35 a.m.
From: Rami Rosen <ramirose@gmail.com>
Date: Thu,  3 Jan 2013 13:30:43 +0200

> This patch adds empty br_mdb_init() and br_mdb_uninit() definitions in
> br_private.h to avoid build failure when CONFIG_BRIDGE_IGMP_SNOOPING is not set.
> These methods were moved from br_multicast.c to br_netlink.c by 
> commit 3ec8e9f085bcaef0de1077f555c2c5102c223390
> 
> Signed-off-by: Rami Rosen <ramirose@gmail.com>

Applied, thanks Rami.
--
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

Patch

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 8d83be5..711094a 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -526,6 +526,12 @@  static inline bool br_multicast_is_router(struct net_bridge *br)
 {
 	return 0;
 }
+static inline void br_mdb_init(void)
+{
+}
+static inline void br_mdb_uninit(void)
+{
+}
 #endif
 
 /* br_netfilter.c */