---

yaml --- r: 368627 b: refs/heads/master c: 7b99a99 h: refs/heads/master i: 368625: 5f072b9 368623: 0f8c664 v: v3
git-mirror · Mar 24, 2013 · 4f2a6c6 · 4f2a6c6
1 parent e730f70
commit 4f2a6c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e95329b701c4edf6c4d72487ec0369fa148c0bd
+refs/heads/master: 7b99a99390ca328f4678ac04358c94744ab0f8b4
diff --git a/trunk/net/bridge/br_netlink.c b/trunk/net/bridge/br_netlink.c
@@ -357,7 +357,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh)
 	struct nlattr *afspec;
 	struct net_bridge_port *p;
 	struct nlattr *tb[IFLA_BRPORT_MAX + 1];
-	int err;
+	int err = 0;
 
 	ifm = nlmsg_data(nlh);
 
@@ -370,7 +370,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh)
 	/* We want to accept dev as bridge itself if the AF_SPEC
 	 * is set to see if someone is setting vlan info on the brigde
 	 */
-	if (!p && ((dev->priv_flags & IFF_EBRIDGE) && !afspec))
+	if (!p && !afspec)
 		return -EINVAL;
 
 	if (p && protinfo) {