Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / net / wireless / mac80211_hwsim.c

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index f4f4257..9d4a40e 100644 (file)
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -1515,19 +1515,10 @@ static int __init init_mac80211_hwsim(void)
        if (hwsim_mon == NULL)
                goto failed;
 
-       rtnl_lock();
-
-       err = dev_alloc_name(hwsim_mon, hwsim_mon->name);
+       err = register_netdev(hwsim_mon);
        if (err < 0)
                goto failed_mon;
 
-
-       err = register_netdevice(hwsim_mon);
-       if (err < 0)
-               goto failed_mon;
-
-       rtnl_unlock();
-
        return 0;
 
 failed_mon: