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

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

wireless: fix various printk warnings on ia64 (and others) 



drivers/net/wireless/ath5k/base.c: In function `ath5k_check_ibss_tsf':
drivers/net/wireless/ath5k/base.c:1740: warning: long long unsigned int format, u64 arg (arg 5)
drivers/net/wireless/ath5k/base.c:1740: warning: long long unsigned int format, u64 arg (arg 6)
drivers/net/wireless/ath5k/base.c:1740: warning: long long int format, u64 arg (arg 7)
drivers/net/wireless/ath5k/base.c:1740: warning: long long unsigned int format, u64 arg (arg 8)
drivers/net/wireless/ath5k/base.c:1757: warning: long long unsigned int format, u64 arg (arg 5)
drivers/net/wireless/ath5k/base.c:1757: warning: long long unsigned int format, u64 arg (arg 6)
drivers/net/wireless/iwlwifi/iwl4965-base.c: In function `iwl4965_tx_status_reply_tx':
drivers/net/wireless/iwlwifi/iwl4965-base.c:3105: warning: long long unsigned int format, u64 arg (arg 6)
drivers/net/wireless/iwlwifi/iwl-4965.c: In function `iwl4965_rx_reply_rx':
drivers/net/wireless/iwlwifi/iwl-4965.c:3978: warning: long long unsigned int format, u64 arg (arg 7)

Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6c4711b4

drivers/net/wireless/ath5k/base.c

+6 −3
Original line number Diff line number Diff line
@@ -1739,8 +1739,10 @@ ath5k_check_ibss_tsf(struct ath5k_softc *sc, struct sk_buff *skb, 


		ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON,

			"beacon %llx mactime %llx (diff %lld) tsf now %llx\n",

			bc_tstamp, rxs->mactime,

			(rxs->mactime - bc_tstamp), tsf);

			(unsigned long long)bc_tstamp,

			(unsigned long long)rxs->mactime,

			(unsigned long long)(rxs->mactime - bc_tstamp),

			(unsigned long long)tsf);



		/*

		 * Sometimes the HW will give us a wrong tstamp in the rx
@@ -1756,7 +1758,8 @@ ath5k_check_ibss_tsf(struct ath5k_softc *sc, struct sk_buff *skb, 
		if (bc_tstamp > rxs->mactime) {

			ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON,

				"fixing mactime from %llx to %llx\n",

				rxs->mactime, tsf);

				(unsigned long long)rxs->mactime,

				(unsigned long long)tsf);

			rxs->mactime = tsf;

		}

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

+1 −1
Original line number Diff line number Diff line
@@ -3971,7 +3971,7 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv, 


	IWL_DEBUG_STATS_LIMIT("Rssi %d, noise %d, qual %d, TSF %llu\n",

			      rx_status.ssi, rx_status.noise, rx_status.signal,

			      rx_status.mactime);

			      (unsigned long long)rx_status.mactime);



	network_packet = iwl4965_is_network_packet(priv, header);

	if (network_packet) {

drivers/net/wireless/iwlwifi/iwl4965-base.c

+1 −1
Original line number Diff line number Diff line
@@ -3119,7 +3119,7 @@ static int iwl4965_tx_status_reply_tx(struct iwl_priv *priv, 
		agg->rate_n_flags = le32_to_cpu(tx_resp->rate_n_flags);

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

				   agg->frame_count, agg->start_idx,

				   agg->bitmap);

				   (unsigned long long)agg->bitmap);



		if (bitmap)

			agg->wait_for_ba = 1;