diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-01-05 11:05:51 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-01-05 11:05:51 -0700 |
| commit | fda87903f4e9caf87e02d52768c2611e417b7efb (patch) | |
| tree | bd2f84361699651cce5661bcfe60e3fe5ee91517 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | 1a0703ede4493bd74f9c6b53f782b749e175a88e (diff) | |
| parent | 2de0dbc5f6830e7659083d1929f57cb88b16a3b6 (diff) | |
| download | linux-next-fda87903f4e9caf87e02d52768c2611e417b7efb.tar.gz | |
Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into gpio/next
Conflicts:
drivers/gpio/gpio-pl061.c
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 bacc06c95e7a..e0e9a3dfbc00 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); |