---

yaml --- r: 361477 b: refs/heads/master c: 3d84fa9 h: refs/heads/master i: 361475: 5d204ce v: v3
git-mirror · Mar 17, 2013 · 8753756 · 8753756
1 parent 56bddbe
commit 8753756
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 722c6f585088a2c392b4c5d01b87a584bb8fb73f
+refs/heads/master: 3d84fa98aca7f05f7010022bc45acb1b50326332
diff --git a/trunk/net/bridge/br_netlink.c b/trunk/net/bridge/br_netlink.c
@@ -330,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_PROTECT, BR_ROOT_BLOCK);
 
 	if (tb[IFLA_BRPORT_COST]) {
 		err = br_stp_set_path_cost(p, nla_get_u32(tb[IFLA_BRPORT_COST]));