Re: [PATCH net-next 2/4] bridge: Allow an ability to designate an uplink port

Vlad Yasevich <vyasevic@xxxxxxxxxx> · Wed, 13 Mar 2013 19:43:57 -0400

On 03/13/2013 04:33 PM, Michael S. Tsirkin wrote:
On Tue, Mar 12, 2013 at 09:45:24PM -0400, Vlad Yasevich wrote:
Allow a ports to be designated as uplink.  Multiple ports
may be designated as uplinks and they will be kept in a
list.

Signed-off-by: Vlad Yasevich <vyasevic@xxxxxxxxxx>

It looks like if you make two links uplink, bridging
between them won't work at all?

only if they are non-promisc, but yes it does look like that...

hm... I need to think about this...

-vlad


---
  include/uapi/linux/if_link.h |    1 +
  net/bridge/br_netlink.c      |    2 ++
  net/bridge/br_private.h      |    1 +
  net/bridge/br_sysfs_if.c     |    2 ++
  4 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index c4edfe1..b9444e9 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -220,6 +220,7 @@ enum {
  	IFLA_BRPORT_GUARD,	/* bpdu guard              */
  	IFLA_BRPORT_PROTECT,	/* root port protection    */
  	IFLA_BRPORT_FAST_LEAVE,	/* multicast fast leave    */
+	IFLA_BRPORT_UPLINK,	/* uplink port */
  	__IFLA_BRPORT_MAX
  };
  #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 27aa3ee..e08a50e 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -283,6 +283,7 @@ static const struct nla_policy ifla_brport_policy[IFLA_BRPORT_MAX + 1] = {
  	[IFLA_BRPORT_MODE]	= { .type = NLA_U8 },
  	[IFLA_BRPORT_GUARD]	= { .type = NLA_U8 },
  	[IFLA_BRPORT_PROTECT]	= { .type = NLA_U8 },
+	[IFLA_BRPORT_UPLINK]	= { .type = NLA_U8 },
  };

  /* Change the state of the port and notify spanning tree */
@@ -329,6 +330,7 @@ static int br_setport(struct net_bridge_port *p, struct nlattr *tb[])
  	br_set_port_flag(p, tb, IFLA_BRPORT_MODE, BR_HAIRPIN_MODE);
  	br_set_port_flag(p, tb, IFLA_BRPORT_GUARD, BR_BPDU_GUARD);
  	br_set_port_flag(p, tb, IFLA_BRPORT_FAST_LEAVE, BR_MULTICAST_FAST_LEAVE);
+	br_set_port_flag(p, tb, IFLA_BRPORT_UPLINK, BR_UPLINK);

  	if (tb[IFLA_BRPORT_COST]) {
  		err = br_stp_set_path_cost(p, nla_get_u32(tb[IFLA_BRPORT_COST]));
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 4a0fa29..44ae584 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -156,6 +156,7 @@ struct net_bridge_port
  #define BR_BPDU_GUARD           0x00000002
  #define BR_ROOT_BLOCK		0x00000004
  #define BR_MULTICAST_FAST_LEAVE	0x00000008
+#define BR_UPLINK		0x00000010

  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  	u32				multicast_startup_queries_sent;
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
index a1ef1b6..1f28cd4 100644
--- a/net/bridge/br_sysfs_if.c
+++ b/net/bridge/br_sysfs_if.c
@@ -158,6 +158,7 @@ static BRPORT_ATTR(flush, S_IWUSR, NULL, store_flush);
  BRPORT_ATTR_FLAG(hairpin_mode, BR_HAIRPIN_MODE);
  BRPORT_ATTR_FLAG(bpdu_guard, BR_BPDU_GUARD);
  BRPORT_ATTR_FLAG(root_block, BR_ROOT_BLOCK);
+BRPORT_ATTR_FLAG(uplink, BR_UPLINK);

  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  static ssize_t show_multicast_router(struct net_bridge_port *p, char *buf)
@@ -195,6 +196,7 @@ static const struct brport_attribute *brport_attrs[] = {
  	&brport_attr_hairpin_mode,
  	&brport_attr_bpdu_guard,
  	&brport_attr_root_block,
+	&brport_attr_uplink,
  #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
  	&brport_attr_multicast_router,
  	&brport_attr_multicast_fast_leave,
--
1.7.7.6

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html






