diff --git a/[refs] b/[refs] index 7c9bb425b42e..cdb651db9917 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f213ff1919fab6f8244ceae55631b5d6ef750a7 +refs/heads/master: 59e7e7078d6c2c6294caf454c6e3695f9d3e46a2 diff --git a/trunk/net/mac80211/iface.c b/trunk/net/mac80211/iface.c index 49d4f869e0bc..dee30aea9ab3 100644 --- a/trunk/net/mac80211/iface.c +++ b/trunk/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));