1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index 24a11b8f73b..266490d8a39 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@ -539,7 +539,14 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         unsigned long flags;
         bool is_agg = false;
 
-        if (info->control.vif)
+        /*
+         * If the frame needs to go out off-channel, then
+         * we'll have put the PAN context to that channel,
+         * so make the frame go out there.
+         */
+        if (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN)
+                ctx = &priv->contexts[IWL_RXON_CTX_PAN];
+        else if (info->control.vif)
                 ctx = iwl_rxon_ctx_from_vif(info->control.vif);
 
         spin_lock_irqsave(&priv->lock, flags);