diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-10 17:31:39 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-10 17:31:39 +0400 |
| commit | 6fe5468f452c0c40348ebd4e737758a842286ca8 (patch) | |
| tree | befe5ab33c457a9e695b65be72600f383266e611 /drivers/net/wireless/iwlwifi/dvm/tx.c | |
| parent | deb09280cd72ceb8b0679490f076d0e9f30dd456 (diff) | |
| parent | 69a2bac8984c4e6dba78b330ed183fd580c65e99 (diff) | |
| download | linux-6fe5468f452c0c40348ebd4e737758a842286ca8.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/rt2x00/rt2x00pci.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/tx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c index cc1e0c1a6f48..70b7f68c4958 100644 --- a/drivers/net/wireless/iwlwifi/dvm/tx.c +++ b/drivers/net/wireless/iwlwifi/dvm/tx.c @@ -1193,7 +1193,7 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb, memset(&info->status, 0, sizeof(info->status)); if (status == TX_STATUS_FAIL_PASSIVE_NO_RX && - iwl_is_associated_ctx(ctx) && ctx->vif && + ctx->vif && ctx->vif->type == NL80211_IFTYPE_STATION) { /* block and stop all queues */ priv->passive_no_rx = true; |