Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [BRIDGE]: fix locking and memory leak in br_add_bridge
  [IRDA]: Missing allocation result check in irlap_change_speed().
  [PPPOE]: Missing result check in __pppoe_xmit().
  [NET]: Eliminate unused /proc/sys/net/ethernet
  [NETCONSOLE]: Clean up initcall warning.
  [TCP]: Avoid skb_pull if possible when trimming head

1 files changed, 7 insertions, 12 deletions

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index ad1c7af65ec8..f5d47bf4f967 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -300,25 +300,20 @@ int br_add_bridge(const char *name)
         rtnl_lock();
         if (strchr(dev->name, '%')) {
                 ret = dev_alloc_name(dev, dev->name);
-                if (ret < 0)
-                        goto err1;
+                if (ret < 0) {
+                        free_netdev(dev);
+                        goto out;
+                }
         }
 
         ret = register_netdevice(dev);
         if (ret)
-                goto err2;
+                goto out;
 
         ret = br_sysfs_addbr(dev);
         if (ret)
-                goto err3;
-        rtnl_unlock();
-        return 0;
-
- err3:
-        unregister_netdev(dev);
- err2:
-        free_netdev(dev);
- err1:
+                unregister_netdevice(dev);
+ out:
         rtnl_unlock();
         return ret;
 }