diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-04-30 01:21:32 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-05 10:57:45 -0700 |
| commit | 1c5cae815d19ffe02bdfda1260949ef2b1806171 (patch) | |
| tree | d47a73c05afacd21985abb8df9862136385c58f0 /drivers/net/wireless/mac80211_hwsim.c | |
| parent | e8920674979705392abc4db4ebbe78feb68a4da1 (diff) | |
| download | linux-1c5cae815d19ffe02bdfda1260949ef2b1806171.tar.gz | |
net: call dev_alloc_name from register_netdevice
Force dev_alloc_name() to be called from register_netdevice() by
dev_get_valid_name(). That allows to remove multiple explicit
dev_alloc_name() calls.
The possibility to call dev_alloc_name in advance remains.
This also fixes veth creation regresion caused by
84c49d8c3e4abefb0a41a77b25aa37ebe8d6b743
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/mac80211_hwsim.c')
| -rw-r--r-- | drivers/net/wireless/mac80211_hwsim.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index f4f4257a9d67..9d4a40ee16c4 100644 --- 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: |