diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-08-16 09:36:33 -0400 |
---|---|---|
committer | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-11-15 05:17:10 -0500 |
commit | 2d27c5dbd696e7e3a162bba7b948486a9856abca (patch) | |
tree | 591ccfc08922cb5d5e111475c1825e13146bb8f8 /drivers/net | |
parent | 46f16c492e5ca905c2170c11177fb90a58074eab (diff) |
iwlegacy: remove DEBUG_LIMIT
Even if messages are generating fast we want to see all of them
when debugging.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-3945.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-4965-lib.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-4965.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-debug.h | 22 |
5 files changed, 8 insertions, 28 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-3945.c b/drivers/net/wireless/iwlegacy/iwl-3945.c index c9b5dcf446b4..628adf59ce7b 100644 --- a/drivers/net/wireless/iwlegacy/iwl-3945.c +++ b/drivers/net/wireless/iwlegacy/iwl-3945.c | |||
@@ -477,7 +477,7 @@ static void il3945_pass_packet_to_mac80211(struct il_priv *il, | |||
477 | 477 | ||
478 | /* We only process data packets if the interface is open */ | 478 | /* We only process data packets if the interface is open */ |
479 | if (unlikely(!il->is_open)) { | 479 | if (unlikely(!il->is_open)) { |
480 | IL_DEBUG_DROP_LIMIT(il, | 480 | IL_DEBUG_DROP(il, |
481 | "Dropping packet while interface is not open.\n"); | 481 | "Dropping packet while interface is not open.\n"); |
482 | return; | 482 | return; |
483 | } | 483 | } |
@@ -563,7 +563,7 @@ static void il3945_rx_reply_rx(struct il_priv *il, | |||
563 | 563 | ||
564 | network_packet = il3945_is_network_packet(il, header); | 564 | network_packet = il3945_is_network_packet(il, header); |
565 | 565 | ||
566 | IL_DEBUG_STATS_LIMIT(il, "[%c] %d RSSI:%d Signal:%u, Rate:%u\n", | 566 | IL_DEBUG_STATS(il, "[%c] %d RSSI:%d Signal:%u, Rate:%u\n", |
567 | network_packet ? '*' : ' ', | 567 | network_packet ? '*' : ' ', |
568 | le16_to_cpu(rx_hdr->channel), | 568 | le16_to_cpu(rx_hdr->channel), |
569 | rx_status.signal, rx_status.signal, | 569 | rx_status.signal, rx_status.signal, |
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c b/drivers/net/wireless/iwlegacy/iwl-4965-lib.c index 647399ed0a0c..156462973e6b 100644 --- a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c +++ b/drivers/net/wireless/iwlegacy/iwl-4965-lib.c | |||
@@ -537,7 +537,7 @@ static void il4965_pass_packet_to_mac80211(struct il_priv *il, | |||
537 | 537 | ||
538 | /* We only process data packets if the interface is open */ | 538 | /* We only process data packets if the interface is open */ |
539 | if (unlikely(!il->is_open)) { | 539 | if (unlikely(!il->is_open)) { |
540 | IL_DEBUG_DROP_LIMIT(il, | 540 | IL_DEBUG_DROP(il, |
541 | "Dropping packet while interface is not open.\n"); | 541 | "Dropping packet while interface is not open.\n"); |
542 | return; | 542 | return; |
543 | } | 543 | } |
@@ -647,7 +647,7 @@ void il4965_rx_reply_rx(struct il_priv *il, | |||
647 | rx_status.signal = il4965_calc_rssi(il, phy_res); | 647 | rx_status.signal = il4965_calc_rssi(il, phy_res); |
648 | 648 | ||
649 | il_dbg_log_rx_data_frame(il, len, header); | 649 | il_dbg_log_rx_data_frame(il, len, header); |
650 | IL_DEBUG_STATS_LIMIT(il, "Rssi %d, TSF %llu\n", | 650 | IL_DEBUG_STATS(il, "Rssi %d, TSF %llu\n", |
651 | rx_status.signal, (unsigned long long)rx_status.mactime); | 651 | rx_status.signal, (unsigned long long)rx_status.mactime); |
652 | 652 | ||
653 | /* | 653 | /* |
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c b/drivers/net/wireless/iwlegacy/iwl-4965-rs.c index 60ff0cdff9c0..782ec77715f5 100644 --- a/drivers/net/wireless/iwlegacy/iwl-4965-rs.c +++ b/drivers/net/wireless/iwlegacy/iwl-4965-rs.c | |||
@@ -817,7 +817,7 @@ il4965_rs_tx_status(void *il_r, struct ieee80211_supported_band *sband, | |||
817 | struct il_station_priv *sta_priv = (void *)sta->drv_priv; | 817 | struct il_station_priv *sta_priv = (void *)sta->drv_priv; |
818 | struct il_rxon_context *ctx = sta_priv->common.ctx; | 818 | struct il_rxon_context *ctx = sta_priv->common.ctx; |
819 | 819 | ||
820 | IL_DEBUG_RATE_LIMIT(il, | 820 | IL_DEBUG_RATE(il, |
821 | "get frame ack response, update rate scale window\n"); | 821 | "get frame ack response, update rate scale window\n"); |
822 | 822 | ||
823 | /* Treat uninitialized rate scaling data same as non-existing. */ | 823 | /* Treat uninitialized rate scaling data same as non-existing. */ |
@@ -2251,7 +2251,7 @@ il4965_rs_get_rate(void *il_r, struct ieee80211_sta *sta, void *il_sta, | |||
2251 | struct il_lq_sta *lq_sta = il_sta; | 2251 | struct il_lq_sta *lq_sta = il_sta; |
2252 | int rate_idx; | 2252 | int rate_idx; |
2253 | 2253 | ||
2254 | IL_DEBUG_RATE_LIMIT(il, "rate scale calculate new rate for skb\n"); | 2254 | IL_DEBUG_RATE(il, "rate scale calculate new rate for skb\n"); |
2255 | 2255 | ||
2256 | /* Get max rate if user set max rate */ | 2256 | /* Get max rate if user set max rate */ |
2257 | if (lq_sta) { | 2257 | if (lq_sta) { |
diff --git a/drivers/net/wireless/iwlegacy/iwl-4965.c b/drivers/net/wireless/iwlegacy/iwl-4965.c index d3c818354ca5..01fa6c8d0304 100644 --- a/drivers/net/wireless/iwlegacy/iwl-4965.c +++ b/drivers/net/wireless/iwlegacy/iwl-4965.c | |||
@@ -1737,7 +1737,7 @@ static u8 il4965_find_station(struct il_priv *il, const u8 *addr) | |||
1737 | goto out; | 1737 | goto out; |
1738 | } | 1738 | } |
1739 | 1739 | ||
1740 | IL_DEBUG_ASSOC_LIMIT(il, "can not find STA %pM total %d\n", | 1740 | IL_DEBUG_ASSOC(il, "can not find STA %pM total %d\n", |
1741 | addr, il->num_stations); | 1741 | addr, il->num_stations); |
1742 | 1742 | ||
1743 | out: | 1743 | out: |
diff --git a/drivers/net/wireless/iwlegacy/iwl-debug.h b/drivers/net/wireless/iwlegacy/iwl-debug.h index a825051d5f2d..c6dcbf3a2ffc 100644 --- a/drivers/net/wireless/iwlegacy/iwl-debug.h +++ b/drivers/net/wireless/iwlegacy/iwl-debug.h | |||
@@ -52,14 +52,6 @@ do { \ | |||
52 | __func__ , ## args); \ | 52 | __func__ , ## args); \ |
53 | } while (0) | 53 | } while (0) |
54 | 54 | ||
55 | #define IL_DEBUG_LIMIT(__priv, level, fmt, args...) \ | ||
56 | do { \ | ||
57 | if ((il_get_debug_level(__priv) & (level)) && net_ratelimit()) \ | ||
58 | dev_printk(KERN_ERR, &(__priv->hw->wiphy->dev), \ | ||
59 | "%c %s " fmt, in_interrupt() ? 'I' : 'U', \ | ||
60 | __func__ , ## args); \ | ||
61 | } while (0) | ||
62 | |||
63 | #define il_print_hex_dump(il, level, p, len) \ | 55 | #define il_print_hex_dump(il, level, p, len) \ |
64 | do { \ | 56 | do { \ |
65 | if (il_get_debug_level(il) & level) \ | 57 | if (il_get_debug_level(il) & level) \ |
@@ -69,7 +61,6 @@ do { \ | |||
69 | 61 | ||
70 | #else | 62 | #else |
71 | #define IL_DEBUG(__priv, level, fmt, args...) | 63 | #define IL_DEBUG(__priv, level, fmt, args...) |
72 | #define IL_DEBUG_LIMIT(__priv, level, fmt, args...) | ||
73 | static inline void il_print_hex_dump(struct il_priv *il, int level, | 64 | static inline void il_print_hex_dump(struct il_priv *il, int level, |
74 | const void *p, u32 len) | 65 | const void *p, u32 len) |
75 | {} | 66 | {} |
@@ -169,25 +160,14 @@ static inline void il_dbgfs_unregister(struct il_priv *il) | |||
169 | #define IL_DEBUG_FW(p, f, a...) IL_DEBUG(p, IL_DL_FW, f, ## a) | 160 | #define IL_DEBUG_FW(p, f, a...) IL_DEBUG(p, IL_DL_FW, f, ## a) |
170 | #define IL_DEBUG_RF_KILL(p, f, a...) IL_DEBUG(p, IL_DL_RF_KILL, f, ## a) | 161 | #define IL_DEBUG_RF_KILL(p, f, a...) IL_DEBUG(p, IL_DL_RF_KILL, f, ## a) |
171 | #define IL_DEBUG_DROP(p, f, a...) IL_DEBUG(p, IL_DL_DROP, f, ## a) | 162 | #define IL_DEBUG_DROP(p, f, a...) IL_DEBUG(p, IL_DL_DROP, f, ## a) |
172 | #define IL_DEBUG_DROP_LIMIT(p, f, a...) \ | ||
173 | IL_DEBUG_LIMIT(p, IL_DL_DROP, f, ## a) | ||
174 | #define IL_DEBUG_AP(p, f, a...) IL_DEBUG(p, IL_DL_AP, f, ## a) | 163 | #define IL_DEBUG_AP(p, f, a...) IL_DEBUG(p, IL_DL_AP, f, ## a) |
175 | #define IL_DEBUG_TXPOWER(p, f, a...) IL_DEBUG(p, IL_DL_TXPOWER, f, ## a) | 164 | #define IL_DEBUG_TXPOWER(p, f, a...) IL_DEBUG(p, IL_DL_TXPOWER, f, ## a) |
176 | #define IL_DEBUG_RATE(p, f, a...) IL_DEBUG(p, IL_DL_RATE, f, ## a) | 165 | #define IL_DEBUG_RATE(p, f, a...) IL_DEBUG(p, IL_DL_RATE, f, ## a) |
177 | #define IL_DEBUG_RATE_LIMIT(p, f, a...) \ | ||
178 | IL_DEBUG_LIMIT(p, IL_DL_RATE, f, ## a) | ||
179 | #define IL_DEBUG_NOTIF(p, f, a...) IL_DEBUG(p, IL_DL_NOTIF, f, ## a) | 166 | #define IL_DEBUG_NOTIF(p, f, a...) IL_DEBUG(p, IL_DL_NOTIF, f, ## a) |
180 | #define IL_DEBUG_ASSOC(p, f, a...) \ | 167 | #define IL_DEBUG_ASSOC(p, f, a...) IL_DEBUG(p, IL_DL_ASSOC, f, ## a) |
181 | IL_DEBUG(p, IL_DL_ASSOC | IL_DL_INFO, f, ## a) | ||
182 | #define IL_DEBUG_ASSOC_LIMIT(p, f, a...) \ | ||
183 | IL_DEBUG_LIMIT(p, IL_DL_ASSOC | IL_DL_INFO, f, ## a) | ||
184 | #define IL_DEBUG_HT(p, f, a...) IL_DEBUG(p, IL_DL_HT, f, ## a) | 168 | #define IL_DEBUG_HT(p, f, a...) IL_DEBUG(p, IL_DL_HT, f, ## a) |
185 | #define IL_DEBUG_STATS(p, f, a...) IL_DEBUG(p, IL_DL_STATS, f, ## a) | 169 | #define IL_DEBUG_STATS(p, f, a...) IL_DEBUG(p, IL_DL_STATS, f, ## a) |
186 | #define IL_DEBUG_STATS_LIMIT(p, f, a...) \ | ||
187 | IL_DEBUG_LIMIT(p, IL_DL_STATS, f, ## a) | ||
188 | #define IL_DEBUG_TX_REPLY(p, f, a...) IL_DEBUG(p, IL_DL_TX_REPLY, f, ## a) | 170 | #define IL_DEBUG_TX_REPLY(p, f, a...) IL_DEBUG(p, IL_DL_TX_REPLY, f, ## a) |
189 | #define IL_DEBUG_TX_REPLY_LIMIT(p, f, a...) \ | ||
190 | IL_DEBUG_LIMIT(p, IL_DL_TX_REPLY, f, ## a) | ||
191 | #define IL_DEBUG_QOS(p, f, a...) IL_DEBUG(p, IL_DL_QOS, f, ## a) | 171 | #define IL_DEBUG_QOS(p, f, a...) IL_DEBUG(p, IL_DL_QOS, f, ## a) |
192 | #define IL_DEBUG_RADIO(p, f, a...) IL_DEBUG(p, IL_DL_RADIO, f, ## a) | 172 | #define IL_DEBUG_RADIO(p, f, a...) IL_DEBUG(p, IL_DL_RADIO, f, ## a) |
193 | #define IL_DEBUG_POWER(p, f, a...) IL_DEBUG(p, IL_DL_POWER, f, ## a) | 173 | #define IL_DEBUG_POWER(p, f, a...) IL_DEBUG(p, IL_DL_POWER, f, ## a) |