diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-06 13:58:21 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-06 13:58:21 -0400 |
| commit | c11114717a66455de9fbc3ea69ae00d1aace3c14 (patch) | |
| tree | 4fd39d5776a9c7ee48db216db11ce3e98c1ded31 /net | |
| parent | 5fb9fb132c5a83010cd8d4bf6d0ee34fb3b9d488 (diff) | |
| parent | d2ac49fe3c7c4730323c1042fb53a2e008643b6a (diff) | |
| download | linux-3.10-c11114717a66455de9fbc3ea69ae00d1aace3c14.tar.gz linux-3.10-c11114717a66455de9fbc3ea69ae00d1aace3c14.tar.bz2 linux-3.10-c11114717a66455de9fbc3ea69ae00d1aace3c14.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem
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 49d4f869e0b..dee30aea9ab 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)); |