From 875375625d384e2204e5919ee29f3928f28b06a2 Mon Sep 17 00:00:00 2001 From: Vlad Yasevich Date: Fri, 15 Mar 2013 06:39:12 +0000 Subject: [PATCH] --- yaml --- r: 361477 b: refs/heads/master c: 3d84fa98aca7f05f7010022bc45acb1b50326332 h: refs/heads/master i: 361475: 5d204ce4ce5bdb33cb06c9e4a848a7fd3e2d8c5c v: v3 --- [refs] | 2 +- trunk/net/bridge/br_netlink.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b91d2cf0143f..76b6232f2408 100644 --- 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 index db12a0fcfe50..299fc5f40a26 100644 --- 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]));