From b8df079b242d6513eeb4bca129a276360eea524d Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 9 Dec 2008 00:10:30 +0100
Subject: [PATCH] --- yaml --- r: 122657 b: refs/heads/master c:
 8dffff216fcac4f79078478085e86d68db64922e h: refs/heads/master i:   122655:
 f76f47c14f4b732599e470ad9892e65c12d972e1 v: v3

---
 [refs]                    |  2 +-
 trunk/net/mac80211/main.c | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 29d5fae02b80..9104c02b444e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f202aa2e1e1db1d20da9bcc3f5ad43c5a22d2d5
+refs/heads/master: 8dffff216fcac4f79078478085e86d68db64922e
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index df7e9a810b88..6d8710327d14 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/net/mac80211/main.c
@@ -886,12 +886,14 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
 
 	local->mdev->select_queue = ieee80211_select_queue;
 
-	/* add one default STA interface */
-	result = ieee80211_if_add(local, "wlan%d", NULL,
-				  NL80211_IFTYPE_STATION, NULL);
-	if (result)
-		printk(KERN_WARNING "%s: Failed to add default virtual iface\n",
-		       wiphy_name(local->hw.wiphy));
+	/* add one default STA interface if supported */
+	if (local->hw.wiphy->interface_modes & BIT(NL80211_IFTYPE_STATION)) {
+		result = ieee80211_if_add(local, "wlan%d", NULL,
+					  NL80211_IFTYPE_STATION, NULL);
+		if (result)
+			printk(KERN_WARNING "%s: Failed to add default virtual iface\n",
+			       wiphy_name(local->hw.wiphy));
+	}
 
 	rtnl_unlock();