aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-5000.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2008-07-18 01:53:09 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-08-04 15:09:09 -0400
commit4aa41f12aa4f08a10b0b07ed334faa3638ba8e9c (patch)
tree06ae60c3944a0520ab5994b4ba5dfa8d4f5a4200 /drivers/net/wireless/iwlwifi/iwl-5000.c
parentc785d1d5018b93878a9280b0c04df96682cc6eff (diff)
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.c6
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,
1228 bitmap = bitmap << sh; 1228 bitmap = bitmap << sh;
1229 sh = 0; 1229 sh = 0;
1230 } 1230 }
1231 bitmap |= (1 << sh); 1231 bitmap |= 1ULL << sh;
1232 IWL_DEBUG_TX_REPLY("start=%d bitmap=0x%x\n", 1232 IWL_DEBUG_TX_REPLY("start=%d bitmap=0x%llx\n",
1233 start, (u32)(bitmap & 0xFFFFFFFF)); 1233 start, (unsigned long long)bitmap);
1234 } 1234 }
1235 1235
1236 agg->bitmap = bitmap; 1236 agg->bitmap = bitmap;