diff options
-rw-r--r-- | drivers/net/wireless/ath5k/base.c | 9 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c index b5c0a0d7a81c..8862d245c82b 100644 --- a/drivers/net/wireless/ath5k/base.c +++ b/drivers/net/wireless/ath5k/base.c | |||
@@ -1739,8 +1739,10 @@ ath5k_check_ibss_tsf(struct ath5k_softc *sc, struct sk_buff *skb, | |||
1739 | 1739 | ||
1740 | ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON, | 1740 | ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON, |
1741 | "beacon %llx mactime %llx (diff %lld) tsf now %llx\n", | 1741 | "beacon %llx mactime %llx (diff %lld) tsf now %llx\n", |
1742 | bc_tstamp, rxs->mactime, | 1742 | (unsigned long long)bc_tstamp, |
1743 | (rxs->mactime - bc_tstamp), tsf); | 1743 | (unsigned long long)rxs->mactime, |
1744 | (unsigned long long)(rxs->mactime - bc_tstamp), | ||
1745 | (unsigned long long)tsf); | ||
1744 | 1746 | ||
1745 | /* | 1747 | /* |
1746 | * Sometimes the HW will give us a wrong tstamp in the rx | 1748 | * 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, | |||
1756 | if (bc_tstamp > rxs->mactime) { | 1758 | if (bc_tstamp > rxs->mactime) { |
1757 | ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON, | 1759 | ATH5K_DBG_UNLIMIT(sc, ATH5K_DEBUG_BEACON, |
1758 | "fixing mactime from %llx to %llx\n", | 1760 | "fixing mactime from %llx to %llx\n", |
1759 | rxs->mactime, tsf); | 1761 | (unsigned long long)rxs->mactime, |
1762 | (unsigned long long)tsf); | ||
1760 | rxs->mactime = tsf; | 1763 | rxs->mactime = tsf; |
1761 | } | 1764 | } |
1762 | 1765 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index 51a144914cfa..89d600cfb846 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -3971,7 +3971,7 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv, | |||
3971 | 3971 | ||
3972 | IWL_DEBUG_STATS_LIMIT("Rssi %d, noise %d, qual %d, TSF %llu\n", | 3972 | IWL_DEBUG_STATS_LIMIT("Rssi %d, noise %d, qual %d, TSF %llu\n", |
3973 | rx_status.ssi, rx_status.noise, rx_status.signal, | 3973 | rx_status.ssi, rx_status.noise, rx_status.signal, |
3974 | rx_status.mactime); | 3974 | (unsigned long long)rx_status.mactime); |
3975 | 3975 | ||
3976 | network_packet = iwl4965_is_network_packet(priv, header); | 3976 | network_packet = iwl4965_is_network_packet(priv, header); |
3977 | if (network_packet) { | 3977 | if (network_packet) { |
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index e98695f7f14c..8d49ff4bd4db 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -3119,7 +3119,7 @@ static int iwl4965_tx_status_reply_tx(struct iwl_priv *priv, | |||
3119 | agg->rate_n_flags = le32_to_cpu(tx_resp->rate_n_flags); | 3119 | agg->rate_n_flags = le32_to_cpu(tx_resp->rate_n_flags); |
3120 | IWL_DEBUG_TX_REPLY("Frames %d start_idx=%d bitmap=0x%llx\n", | 3120 | IWL_DEBUG_TX_REPLY("Frames %d start_idx=%d bitmap=0x%llx\n", |
3121 | agg->frame_count, agg->start_idx, | 3121 | agg->frame_count, agg->start_idx, |
3122 | agg->bitmap); | 3122 | (unsigned long long)agg->bitmap); |
3123 | 3123 | ||
3124 | if (bitmap) | 3124 | if (bitmap) |
3125 | agg->wait_for_ba = 1; | 3125 | agg->wait_for_ba = 1; |