summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-06-06 13:25:36 -0700
committerDavid S. Miller <davem@davemloft.net>2011-06-06 13:25:36 -0700
commit2b22b1b1e169c6591aa125525223f70e40ed4acf (patch)
tree2a112e848cc227e722f7650fff4ca5c610acacae /net
parent85fadea9ce4b278b959886748b2798a383667c10 (diff)
parentc11114717a66455de9fbc3ea69ae00d1aace3c14 (diff)
downloadblackbird-op-linux-2b22b1b1e169c6591aa125525223f70e40ed4acf.tar.gz
blackbird-op-linux-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.c4
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));
OpenPOWER on IntegriCloud