Commit 59e7e707 authored Jun 02, 2011 by Thadeu Lima de Souza Cascardo Committed by John W. Linville Jun 03, 2011

mac80211: call dev_alloc_name before copying name to sdata



This partially reverts 1c5cae81, because
the netdev name is copied into sdata->name, which is used for debugging
messages, for example. Otherwise, we get messages like this:

wlan%d: authenticated

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Cc: Jiri Pirko <jpirko@redhat.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: "John W. Linville" <linville@tuxdriver.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 6f213ff1

net/mac80211/iface.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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));

Admin message