diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:56:44 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:56:44 +0100 |
| commit | 4045407fd7740642b18bc802e8bab064e79a61e5 (patch) | |
| tree | 9412a38886bfad562bc5897c6e4c23bb88703204 /drivers/net/wireless/iwlwifi/iwl-agn-tx.c | |
| parent | Merge branch 'restart-cleanup' into restart (diff) | |
| parent | Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD (diff) | |
| download | linux-4045407fd7740642b18bc802e8bab064e79a61e5.tar.xz linux-4045407fd7740642b18bc802e8bab064e79a61e5.zip | |
Merge branch 'restart-cleanup' into restart
Conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-tx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c index 35a6b71f358c..df1540ca6102 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c @@ -91,7 +91,10 @@ static void iwlagn_tx_cmd_build_basic(struct iwl_priv *priv, tx_cmd->tid_tspec = qc[0] & 0xf; tx_flags &= ~TX_CMD_FLG_SEQ_CTL_MSK; } else { - tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK; + if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) + tx_flags |= TX_CMD_FLG_SEQ_CTL_MSK; + else + tx_flags &= ~TX_CMD_FLG_SEQ_CTL_MSK; } iwlagn_tx_cmd_protection(priv, info, fc, &tx_flags); |