diff options
author | John W. Linville <linville@tuxdriver.com> | 2008-03-07 16:38:43 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-03-07 17:09:52 -0500 |
commit | f868f4e196177ee96f77304ab707a0ad5ddd6fe4 (patch) | |
tree | 7ed2fc1c5b958ffa68dfae4a173267d7daa41964 /drivers | |
parent | 6ba81c2c989291c5893014f84805ce9d196778b0 (diff) |
wireless: correct warnings from using '%llx' for type 'u64'
drivers/net/wireless/ath5k/debug.c: In function 'read_file_tsf': drivers/net/wireless/ath5k/debug.c:203: warning: format '%016llx'
expects type 'long long unsigned int', but argument 4 has type 'u64' drivers/net/wireless/ath5k/debug.c:203: warning: format '%016llx'
expects type 'long long unsigned int', but argument 4 has type 'u64' drivers/net/wireless/ath5k/debug.c: In function 'read_file_beacon':
drivers/net/wireless/ath5k/debug.c:274: warning: format '%016llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
drivers/net/wireless/ath5k/debug.c:274: warning: format '%016llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
drivers/net/wireless/iwlwifi/iwl-4965.c: In function 'iwl4965_tx_status_reply_compressed_ba':
drivers/net/wireless/iwlwifi/iwl-4965.c:3907: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
drivers/net/wireless/iwlwifi/iwl-4965.c: In function 'iwl4965_rx_reply_compressed_ba':
drivers/net/wireless/iwlwifi/iwl-4965.c:4039: warning: format '%llx' expects type 'long long unsigned int', but argument 6 has type '__le64'
drivers/net/wireless/iwlwifi/iwl-4965.c:4046: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'u64'
drivers/net/wireless/iwlwifi/iwl4965-base.c: In function 'iwl4965_tx_status_reply_tx':
drivers/net/wireless/iwlwifi/iwl4965-base.c:3661: warning: format '%llx' expects type 'long long unsigned int', but argument 6 has type 'u64'
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath5k/debug.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath5k/debug.c b/drivers/net/wireless/ath5k/debug.c index d3eb9e88c84d..41d5fa34b544 100644 --- a/drivers/net/wireless/ath5k/debug.c +++ b/drivers/net/wireless/ath5k/debug.c | |||
@@ -200,7 +200,8 @@ static ssize_t read_file_tsf(struct file *file, char __user *user_buf, | |||
200 | { | 200 | { |
201 | struct ath5k_softc *sc = file->private_data; | 201 | struct ath5k_softc *sc = file->private_data; |
202 | char buf[100]; | 202 | char buf[100]; |
203 | snprintf(buf, sizeof(buf), "0x%016llx\n", ath5k_hw_get_tsf64(sc->ah)); | 203 | snprintf(buf, sizeof(buf), "0x%016llx\n", |
204 | (unsigned long long)ath5k_hw_get_tsf64(sc->ah)); | ||
204 | return simple_read_from_buffer(user_buf, count, ppos, buf, 19); | 205 | return simple_read_from_buffer(user_buf, count, ppos, buf, 19); |
205 | } | 206 | } |
206 | 207 | ||
@@ -271,7 +272,8 @@ static ssize_t read_file_beacon(struct file *file, char __user *user_buf, | |||
271 | 272 | ||
272 | tsf = ath5k_hw_get_tsf64(sc->ah); | 273 | tsf = ath5k_hw_get_tsf64(sc->ah); |
273 | len += snprintf(buf+len, sizeof(buf)-len, | 274 | len += snprintf(buf+len, sizeof(buf)-len, |
274 | "TSF\t\t0x%016llx\tTU: %08x\n", tsf, TSF_TO_TU(tsf)); | 275 | "TSF\t\t0x%016llx\tTU: %08x\n", |
276 | (unsigned long long)tsf, TSF_TO_TU(tsf)); | ||
275 | 277 | ||
276 | return simple_read_from_buffer(user_buf, count, ppos, buf, len); | 278 | return simple_read_from_buffer(user_buf, count, ppos, buf, len); |
277 | } | 279 | } |
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 4a7167dbc217..2f01a490c9ee 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -4117,7 +4117,7 @@ static int iwl4965_tx_status_reply_compressed_ba(struct iwl4965_priv *priv, | |||
4117 | iwl4965_hwrate_to_tx_control(priv, agg->rate_n_flags, | 4117 | iwl4965_hwrate_to_tx_control(priv, agg->rate_n_flags, |
4118 | &tx_status->control); | 4118 | &tx_status->control); |
4119 | 4119 | ||
4120 | IWL_DEBUG_TX_REPLY("Bitmap %llx\n", bitmap); | 4120 | IWL_DEBUG_TX_REPLY("Bitmap %llx\n", (unsigned long long)bitmap); |
4121 | 4121 | ||
4122 | return 0; | 4122 | return 0; |
4123 | } | 4123 | } |
@@ -4262,12 +4262,12 @@ static void iwl4965_rx_reply_compressed_ba(struct iwl4965_priv *priv, | |||
4262 | "%d, scd_ssn = %d\n", | 4262 | "%d, scd_ssn = %d\n", |
4263 | ba_resp->tid, | 4263 | ba_resp->tid, |
4264 | ba_resp->seq_ctl, | 4264 | ba_resp->seq_ctl, |
4265 | ba_resp->bitmap, | 4265 | (unsigned long long)ba_resp->bitmap, |
4266 | ba_resp->scd_flow, | 4266 | ba_resp->scd_flow, |
4267 | ba_resp->scd_ssn); | 4267 | ba_resp->scd_ssn); |
4268 | IWL_DEBUG_TX_REPLY("DAT start_idx = %d, bitmap = 0x%llx \n", | 4268 | IWL_DEBUG_TX_REPLY("DAT start_idx = %d, bitmap = 0x%llx \n", |
4269 | agg->start_idx, | 4269 | agg->start_idx, |
4270 | agg->bitmap); | 4270 | (unsigned long long)agg->bitmap); |
4271 | 4271 | ||
4272 | /* Update driver's record of ACK vs. not for each frame in window */ | 4272 | /* Update driver's record of ACK vs. not for each frame in window */ |
4273 | iwl4965_tx_status_reply_compressed_ba(priv, agg, ba_resp); | 4273 | iwl4965_tx_status_reply_compressed_ba(priv, agg, ba_resp); |