diff options
author | David S. Miller <davem@davemloft.net> | 2011-06-06 13:25:36 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-06-06 13:25:36 -0700 |
commit | 2b22b1b1e169c6591aa125525223f70e40ed4acf (patch) | |
tree | 2a112e848cc227e722f7650fff4ca5c610acacae /net | |
parent | Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6 (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem (diff) | |
download | linux-dev-2b22b1b1e169c6591aa125525223f70e40ed4acf.tar.xz linux-dev-2b22b1b1e169c6591aa125525223f70e40ed4acf.zip |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/iface.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 49d4f869e0bc..dee30aea9ab3 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1145,6 +1145,10 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, + IEEE80211_ENCRYPT_HEADROOM; ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM; + ret = dev_alloc_name(ndev, ndev->name); + if (ret < 0) + goto fail; + ieee80211_assign_perm_addr(local, ndev, type); memcpy(ndev->dev_addr, ndev->perm_addr, ETH_ALEN); SET_NETDEV_DEV(ndev, wiphy_dev(local->hw.wiphy)); |