aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorBen Greear <greearb@candelatech.com>2014-10-22 15:23:03 -0400
committerJohannes Berg <johannes.berg@intel.com>2014-10-27 03:48:32 -0400
commite27513fbd030d8558cfa9250bd62b2baf19dc114 (patch)
tree5f114b276c6223e2c2245c9ee6dab00bb76bae30 /net
parent5cd8926bbf47ee0eb51a266bd9614dd3f93c004f (diff)
mac80211: support creating wiphy w/out creating wlanX
This will be helpful when using the mac80211_hwsim wiphys and automated testing. Let user create the vifs as needed, and named as expected. Signed-off-by: Ben Greear <greearb@candelatech.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index b189122d4b20..7d40e3f0a77b 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -1023,7 +1023,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
1023 } 1023 }
1024 1024
1025 /* add one default STA interface if supported */ 1025 /* add one default STA interface if supported */
1026 if (local->hw.wiphy->interface_modes & BIT(NL80211_IFTYPE_STATION)) { 1026 if (local->hw.wiphy->interface_modes & BIT(NL80211_IFTYPE_STATION) &&
1027 !(hw->flags & IEEE80211_HW_NO_AUTO_VIF)) {
1027 result = ieee80211_if_add(local, "wlan%d", NULL, 1028 result = ieee80211_if_add(local, "wlan%d", NULL,
1028 NL80211_IFTYPE_STATION, NULL); 1029 NL80211_IFTYPE_STATION, NULL);
1029 if (result) 1030 if (result)