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 /net/mac80211/iface.c | |
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 'net/mac80211/iface.c')
-rw-r--r-- | net/mac80211/iface.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 4054399be907..80c29d626aa4 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
@@ -1144,10 +1144,6 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, | |||
1144 | + IEEE80211_ENCRYPT_HEADROOM; | 1144 | + IEEE80211_ENCRYPT_HEADROOM; |
1145 | ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; | 1145 | ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; |
1146 | 1146 | ||
1147 | ret = dev_alloc_name(ndev, ndev->name); | ||
1148 | if (ret < 0) | ||
1149 | goto fail; | ||
1150 | |||
1151 | ieee80211_assign_perm_addr(local, ndev, type); | 1147 | ieee80211_assign_perm_addr(local, ndev, type); |
1152 | memcpy(ndev->dev_addr, ndev->perm_addr, ETH_ALEN); | 1148 | memcpy(ndev->dev_addr, ndev->perm_addr, ETH_ALEN); |
1153 | SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy)); | 1149 | SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy)); |