Merge branch 'master' into staging-next

[karo-tx-linux.git] / net / bridge / br_netlink.c

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index f75d92e4f96b33cec6fd46fc37151224f86ed018..e74b6d530cb6a3ab3dc650ee1900df06d3b3441a 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -195,8 +195,7 @@ void br_ifinfo_notify(int event, struct net_bridge_port *port)
        rtnl_notify(skb, net, 0, RTNLGRP_LINK, NULL, GFP_ATOMIC);
        return;
 errout:
-       if (err < 0)
-               rtnl_set_sk_err(net, RTNLGRP_LINK, err);
+       rtnl_set_sk_err(net, RTNLGRP_LINK, err);
 }
 
 
@@ -373,7 +372,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh)
 
        p = br_port_get_rtnl(dev);
        /* 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
+        * is set to see if someone is setting vlan info on the bridge
         */
        if (!p && !afspec)
                return -EINVAL;
@@ -389,7 +388,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh)
                        err = br_setport(p, tb);
                        spin_unlock_bh(&p->br->lock);
                } else {
-                       /* Binary compatability with old RSTP */
+                       /* Binary compatibility with old RSTP */
                        if (nla_len(protinfo) < sizeof(u8))
                                return -EINVAL;
 
@@ -482,9 +481,7 @@ int __init br_netlink_init(void)
        int err;
 
        br_mdb_init();
-       err = rtnl_af_register(&br_af_ops);
-       if (err)
-               goto out;
+       rtnl_af_register(&br_af_ops);
 
        err = rtnl_link_register(&br_link_ops);
        if (err)
@@ -494,7 +491,6 @@ int __init br_netlink_init(void)
 
 out_af:
        rtnl_af_unregister(&br_af_ops);
-out:
        br_mdb_uninit();
        return err;
 }