Commit 019ee792 authored May 29, 2014 by wangweidong Committed by David S. Miller Jun 01, 2014

bridge: fix the unbalanced promiscuous count when add_if failed



As commit 2796d0c6 ("bridge: Automatically manage port
promiscuous mode."), make the add_if use dev_set_allmulti
instead of dev_set_promiscuous, so when add_if failed, we
should do dev_set_allmulti(dev, -1).

Signed-off-by: Wang Weidong <wangweidong1@huawei.com>
Reviewed-by: Amos Kong <akong@redhat.com>
Acked-by: Vlad Yasevich <vyasevic@redhat.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent ee39facb

net/bridge/br_if.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -528,7 +528,7 @@ int br_add_if(struct net_bridge br, struct net_device dev)
		kobject_put(&p->kobj);
		p = NULL; /* kobject_put frees */
		err1:
		dev_set_promiscuity(dev, -1);
		dev_set_allmulti(dev, -1);
		put_back:
		dev_put(dev);
		kfree(p);