From 4f2a6c6bb10b206ddf3d45db150b0d398ad8298f Mon Sep 17 00:00:00 2001 From: Hong zhi guo Date: Sun, 24 Mar 2013 03:26:47 +0000 Subject: [PATCH] --- yaml --- r: 368627 b: refs/heads/master c: 7b99a99390ca328f4678ac04358c94744ab0f8b4 h: refs/heads/master i: 368625: 5f072b96d7b5f26a61751b5035a3e35ebcbbff61 368623: 0f8c66472d62e96af59439d64686a41a7992d61c v: v3 --- [refs] | 2 +- trunk/net/bridge/br_netlink.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 91b9386302a5..770cf0ea62d5 100644 --- 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 index 84c3b7d6d1b1..b96e02e31bad 100644 --- 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) {