---

yaml --- r: 352809 b: refs/heads/master c: ec8b688 h: refs/heads/master i: 352807: b40400e v: v3
git-mirror · Feb 18, 2013 · 3eb6fe0 · 3eb6fe0
1 parent b5808ae
commit 3eb6fe0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e849c93ee5bd07b2ce84d1c3cbcd5d06cb9d2a5
+refs/heads/master: ec8b6885b543ceeb47fdb0c0e6981bb7420ab59e
diff --git a/trunk/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c b/trunk/drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
@@ -245,6 +245,10 @@ static int iwl_mvm_mac_ctxt_allocate_resources(struct iwl_mvm *mvm,
 	 * that we should share it with another interface.
 	 */
 
+	/* Currently, MAC ID 0 should be used only for the managed vif */
+	if (vif->type != NL80211_IFTYPE_STATION || vif->p2p)
+		__clear_bit(0, data.available_mac_ids);
+
 	ieee80211_iterate_active_interfaces_atomic(
 		mvm->hw, IEEE80211_IFACE_ITER_RESUME_ALL,
 		iwl_mvm_mac_iface_iterator, &data);