diff options
author | Jiri Pirko <jpirko@redhat.com> | 2011-04-29 21:21:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-05-05 13:57:45 -0400 |
commit | 1c5cae815d19ffe02bdfda1260949ef2b1806171 (patch) | |
tree | d47a73c05afacd21985abb8df9862136385c58f0 /drivers/net/wireless/mwifiex | |
parent | e8920674979705392abc4db4ebbe78feb68a4da1 (diff) |
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/mwifiex')
-rw-r--r-- | drivers/net/wireless/mwifiex/main.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index c5971880e7b..d16cea770fa 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c | |||
@@ -706,10 +706,6 @@ static struct mwifiex_private *mwifiex_add_interface( | |||
706 | dev_err(adapter->dev, "no memory available for netdevice\n"); | 706 | dev_err(adapter->dev, "no memory available for netdevice\n"); |
707 | goto error; | 707 | goto error; |
708 | } | 708 | } |
709 | if (dev_alloc_name(dev, dev->name)) { | ||
710 | dev_err(adapter->dev, "unable to alloc name for netdevice\n"); | ||
711 | goto error; | ||
712 | } | ||
713 | 709 | ||
714 | if (mwifiex_register_cfg80211(dev, adapter->priv[bss_index]->curr_addr, | 710 | if (mwifiex_register_cfg80211(dev, adapter->priv[bss_index]->curr_addr, |
715 | adapter->priv[bss_index]) != 0) { | 711 | adapter->priv[bss_index]) != 0) { |