diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2008-07-18 07:53:09 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-08-04 21:09:09 +0200 |
commit | 4aa41f12aa4f08a10b0b07ed334faa3638ba8e9c (patch) | |
tree | 06ae60c3944a0520ab5994b4ba5dfa8d4f5a4200 /drivers/net/wireless/iwlwifi/iwl-5000.c | |
parent | iwlwifi: set led register in disassociation (diff) | |
download | linux-4aa41f12aa4f08a10b0b07ed334faa3638ba8e9c.tar.xz linux-4aa41f12aa4f08a10b0b07ed334faa3638ba8e9c.zip |
iwlwifi: bug fix in AGG flow - cast const to ULL
This patch fixes a bug in AGG flow:
u64 bitmap = 0;
bitmap |= 1 << 32 results to be 0xffffffff80000000.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-5000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-5000.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c index f91c54b5ff53..076d3560302b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c @@ -1228,9 +1228,9 @@ static int iwl5000_tx_status_reply_tx(struct iwl_priv *priv, bitmap = bitmap << sh; sh = 0; } - bitmap |= (1 << sh); - IWL_DEBUG_TX_REPLY("start=%d bitmap=0x%x\n", - start, (u32)(bitmap & 0xFFFFFFFF)); + bitmap |= 1ULL << sh; + IWL_DEBUG_TX_REPLY("start=%d bitmap=0x%llx\n", + start, (unsigned long long)bitmap); } agg->bitmap = bitmap; |