From 00b8569a5bd692e22f8f598aed754fdc2a2b2017 Mon Sep 17 00:00:00 2001 From: Amerigo Wang Date: Thu, 19 May 2011 21:39:11 +0000 Subject: [PATCH] --- yaml --- r: 247965 b: refs/heads/master c: bb8ed6302b0613339c1a5f0a2cb0b3807c0af611 h: refs/heads/master i: 247963: 0774a4600f179964fd406a22b225f534427af57b v: v3 --- [refs] | 2 +- trunk/net/bridge/br_if.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a207565cfcf4..75b05a6c9bbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d8fc29d02a33e4bd5f4fa47823c1fd386346093 +refs/heads/master: bb8ed6302b0613339c1a5f0a2cb0b3807c0af611 diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c index 5dbdfdfc3a34..d5147ddd70bf 100644 --- a/trunk/net/bridge/br_if.c +++ b/trunk/net/bridge/br_if.c @@ -338,6 +338,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) if (IS_ERR(p)) return PTR_ERR(p); + call_netdevice_notifiers(NETDEV_JOIN, dev); + err = dev_set_promiscuity(dev, 1); if (err) goto put_back;