Subject: [PATCH 9/10] d80211: rename master interface

From: Jiri Benc <[email-masked]>
Date: Fri, 21 Apr 2006 22:53:29 +0200 (CEST)

Rename master interface to wmasterX to better reflect its purpose.

Signed-off-by: Jiri Benc <[email-masked]>

---

 net/d80211/ieee80211.c   |    2 +-
 net/d80211/ieee80211_i.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

784f203467e4421aa0ecac34cb1647f4bdfe51be
diff --git a/net/d80211/ieee80211.c b/net/d80211/ieee80211.c
index 31f979c..1fd13dd 100644
--- a/net/d80211/ieee80211.c
+++ b/net/d80211/ieee80211.c
@@ -4144,7 +4144,7 @@ struct net_device *ieee80211_alloc_hw(si
 		((char *) local + ((sizeof(struct ieee80211_local) + 3) & ~3));
 
 	ether_setup(mdev);
-	memcpy(mdev->name, "wlan%d", 7);
+	memcpy(mdev->name, "wmaster%d", 10);
 
 	local->dev_index = -1;
 	local->mdev = mdev;
diff --git a/net/d80211/ieee80211_i.h b/net/d80211/ieee80211_i.h
index ea1d9ab..3580d1e 100644
--- a/net/d80211/ieee80211_i.h
+++ b/net/d80211/ieee80211_i.h
@@ -318,7 +318,7 @@ #define IEEE80211_SUB_IF_TO_DEV(sub_if) 
 struct ieee80211_local {
 	struct ieee80211_hw *hw;
 	void *hw_priv;
-	struct net_device *mdev; /* wlan# - "master" 802.11 device */
+	struct net_device *mdev; /* wmaster# - "master" 802.11 device */
 	int open_count;
 	int monitors;
 	struct ieee80211_conf conf;
-- 
1.3.0