diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-19 02:26:39 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-19 02:26:39 -0500 |
| commit | d1388dacbbb1d1b2bc208a4ba18de9316dc49ce9 (patch) | |
| tree | 81dce4f9269bf8948bb2c6faae3635cc28753190 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | ed4a51842a9d9e618d4f4c31349b15b974dba5df (diff) | |
| parent | 42a3b63bb2ca4996a3d1210a004eae2333f1119e (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index bacc06c95e7..e0e9a3dfbc0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -2850,6 +2850,9 @@ static int iwlagn_mac_tx_sync(struct ieee80211_hw *hw, int ret; u8 sta_id; + if (ctx->ctxid != IWL_RXON_CTX_PAN) + return 0; + IWL_DEBUG_MAC80211(priv, "enter\n"); mutex_lock(&priv->shrd->mutex); @@ -2898,6 +2901,9 @@ static void iwlagn_mac_finish_tx_sync(struct ieee80211_hw *hw, struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv; struct iwl_rxon_context *ctx = vif_priv->ctx; + if (ctx->ctxid != IWL_RXON_CTX_PAN) + return; + IWL_DEBUG_MAC80211(priv, "enter\n"); mutex_lock(&priv->shrd->mutex); |