Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f868f4e1 authored by John W. Linville's avatar John W. Linville
Browse files

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: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6ba81c2c

drivers/net/wireless/ath5k/debug.c

+4 −2
Original line number Diff line number Diff line
@@ -200,7 +200,8 @@ static ssize_t read_file_tsf(struct file *file, char __user *user_buf, 
{

	struct ath5k_softc *sc = file->private_data;

	char buf[100];

	snprintf(buf, sizeof(buf), "0x%016llx\n", ath5k_hw_get_tsf64(sc->ah));

	snprintf(buf, sizeof(buf), "0x%016llx\n",

		 (unsigned long long)ath5k_hw_get_tsf64(sc->ah));

	return simple_read_from_buffer(user_buf, count, ppos, buf, 19);

}
@@ -271,7 +272,8 @@ static ssize_t read_file_beacon(struct file *file, char __user *user_buf, 


	tsf = ath5k_hw_get_tsf64(sc->ah);

	len += snprintf(buf+len, sizeof(buf)-len,

		"TSF\t\t0x%016llx\tTU: %08x\n", tsf, TSF_TO_TU(tsf));

		"TSF\t\t0x%016llx\tTU: %08x\n",

		(unsigned long long)tsf, TSF_TO_TU(tsf));



	return simple_read_from_buffer(user_buf, count, ppos, buf, len);

}

drivers/net/wireless/iwlwifi/iwl-4965.c

+3 −3
Original line number Diff line number Diff line
@@ -4117,7 +4117,7 @@ static int iwl4965_tx_status_reply_compressed_ba(struct iwl4965_priv *priv, 
	iwl4965_hwrate_to_tx_control(priv, agg->rate_n_flags,

				     &tx_status->control);



	IWL_DEBUG_TX_REPLY("Bitmap %llx\n", bitmap);

	IWL_DEBUG_TX_REPLY("Bitmap %llx\n", (unsigned long long)bitmap);



	return 0;

}
@@ -4262,12 +4262,12 @@ static void iwl4965_rx_reply_compressed_ba(struct iwl4965_priv *priv, 
			   "%d, scd_ssn = %d\n",

			   ba_resp->tid,

			   ba_resp->seq_ctl,

			   ba_resp->bitmap,

			   (unsigned long long)ba_resp->bitmap,

			   ba_resp->scd_flow,

			   ba_resp->scd_ssn);

	IWL_DEBUG_TX_REPLY("DAT start_idx = %d, bitmap = 0x%llx \n",

			   agg->start_idx,

			   agg->bitmap);

			   (unsigned long long)agg->bitmap);



	/* Update driver's record of ACK vs. not for each frame in window */

	iwl4965_tx_status_reply_compressed_ba(priv, agg, ba_resp);