---

yaml
---
r: 247295
b: refs/heads/master
c: ebf8dc8
h: refs/heads/master
i:
  247293: 9d5cddd
  247291: 392d896
  247287: ca973ab
  247279: 75b3b59
  247263: 59e70fc
  247231: c228e3f
  247167: cd7fa91
  247039: 26842f2
  246783: 817505d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c914ac26caf462567078f9615ffcedf1962087f2
+refs/heads/master: ebf8dc8060e4b10e8e13abbf98544f5c6cc8b25e

trunk/drivers/net/wireless/iwlwifi/iwl-core.c

@@ -1765,6 +1765,7 @@ int iwl_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 {
 	struct iwl_priv *priv = hw->priv;
 	struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);
+	struct iwl_rxon_context *bss_ctx = &priv->contexts[IWL_RXON_CTX_BSS];
 	struct iwl_rxon_context *tmp;
 	u32 interface_modes;
 	int err;
@@ -1789,6 +1790,19 @@ int iwl_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 		goto out;
 	}
 
+	/*
+	 * Refuse a change that should be done by moving from the PAN
+	 * context to the BSS context instead, if the BSS context is
+	 * available and can support the new interface type.
+	 */
+	if (ctx->ctxid == IWL_RXON_CTX_PAN && !bss_ctx->vif &&
+	    (bss_ctx->interface_modes & BIT(newtype) ||
+	     bss_ctx->exclusive_interface_modes & BIT(newtype))) {
+		BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);
+		err = -EBUSY;
+		goto out;
+	}
+
 	if (ctx->exclusive_interface_modes & BIT(newtype)) {
 		for_each_context(priv, tmp) {
 			if (ctx == tmp)