change bridge structure to add corresponding RBridge reference
change bridge port structure to identify disable /P2P/ ACCESS / TRUNK port/
Signed-off-by: Ahmed Amamou <ah...@gandi.net>
Signed-off-by: Kamel Haddadou <ka...@gandi.net>
Signed-off-by: François Cachereul <f.cacher...@alphalink.fr>
Signed-off-by: William Dauchy <will...@gandi.net>
---
net/bridge/br_private.h | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 8b21146..ff757da 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -20,6 +20,9 @@
#include <net/route.h>
#include <net/ip6_fib.h>
#include <linux/if_vlan.h>
+#ifdef CONFIG_TRILL
+#include "rbr_private.h"
+#endif
#define BR_HASH_BITS 8
#define BR_HASH_SIZE (1 << BR_HASH_BITS)
@@ -32,6 +35,19 @@
#define BR_VERSION "2.3"
+#ifdef CONFIG_TRILL
+ /* TRILL flagged ports are ports where we expect
+ * receiving native layer 2 frames
+ */
+#define TRILL_FLAG_DISABLE 0x1
+#define TRILL_FLAG_P2P 0x2
+#define TRILL_FLAG_ACCESS 0x4
+#define TRILL_FLAG_TRUNK 0x8 /* DROP ALL native L2 frame */
+/* Bridge TRILL state */
+#define BR_NO_TRILL 0 /* no trill */
+#define BR_TRILL 1 /* trill enabled */
+#endif
+
/* Control of forwarding link local multicast */
#define BR_GROUPFWD_DEFAULT 0
/* Don't allow forwarding of control protocols like STP, MAC PAUSE and LACP */
@@ -165,6 +181,11 @@ struct net_bridge_port
struct rcu_head rcu;
unsigned long flags;
+ /* Trill */
+#ifdef CONFIG_TRILL
+ u8 trill_flag;
+#endif /* CONFIG_TRILL */
+
#ifdef CONFIG_BRIDGE_IGMP_SNOOPING
struct bridge_mcast_own_query ip4_own_query;
@@ -248,6 +269,11 @@ struct net_bridge
BR_USER_STP, /* new RSTP in userspace */
} stp_enabled;
+#ifdef CONFIG_TRILL
+ bool trill_enabled;
+ struct rbr *rbr;
+#endif
+
unsigned char topology_change;
unsigned char topology_change_detected;
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
