[BUG] ath9k_htc: new devices get name wlan%d if not in rules

Commit Message

Ignacy Gawedzki May 18, 2011, 10:11 a.m. UTC

On Tue, May 17, 2011 at 03:33:34PM -0400, thus spake George Nychis:
> I haven't narrowed it down to the exact build date where this breaks,
> but I know that it works in compat-wireless-2011-05-01, and not in
> compat-wireless-2011-05-11+ (including last night's build).  I had
> trouble building compat-wireless-2011-05-04/05 so it was hard for me
> to narrow it down.

The parsing of the format of interface name has been reworked in some recent
commit in the kernel.  Consequently, several calls to dev_alloc_name (which
does the actual parsing of the format string and allocation of a number) have
been removed from several kernel components and the parsing and number
allocation is done in some unique common place down the road.  The problem is,
compat-wireless doesn't add this bit of "common place" code, but still removes
the original calls to dev_alloc_name.

This is something that should be added to compat/, but in the meantime, you
can apply the attached patch.

Ignacy

Patch

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 8531915..27264de 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1173,6 +1173,10 @@  int ieee80211_if_add(struct ieee80211_local *local, const char *name,
 	ndev->needed_tailroom = IEEE80211_ENCRYPT_TAILROOM;
 #endif
 
+	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));