Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / net / bridge / br_netlink.c

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 99a48a3..8b29608 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -215,6 +215,11 @@ static int br_dev_newlink(struct net *src_net, struct net_device *dev,
                          struct nlattr *tb[], struct nlattr *data[])
 {
        struct net_bridge *br = netdev_priv(dev);
+       int err;
+
+       err = register_netdevice(dev);
+       if (err)
+               return err;
 
        if (tb[IFLA_ADDRESS]) {
                spin_lock_bh(&br->lock);
@@ -222,7 +227,7 @@ static int br_dev_newlink(struct net *src_net, struct net_device *dev,
                spin_unlock_bh(&br->lock);
        }
 
-       return register_netdevice(dev);
+       return 0;
 }
 
 struct rtnl_link_ops br_link_ops __read_mostly = {