On 05/28/2014 10:15 PM, Wang Weidong wrote: > As commit 2796d0c648c94("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@xxxxxxxxxx> Acked-by: Vlad Yasevich <vyasevic@xxxxxxxxxx> Thanks -vlad > --- > net/bridge/br_if.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c > index 104a811..a08d2b8 100644 > --- a/net/bridge/br_if.c > +++ b/net/bridge/br_if.c > @@ -528,7 +528,7 @@ err2: > 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); >