Commit 58de00a4 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka

iwlegacy: rename IL_DEBUG_ to D_

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
parent 2d27c5db
...@@ -167,7 +167,7 @@ static int il3945_rate_scale_flush_windows(struct il3945_rs_sta *rs_sta) ...@@ -167,7 +167,7 @@ static int il3945_rate_scale_flush_windows(struct il3945_rs_sta *rs_sta)
spin_lock_irqsave(&rs_sta->lock, flags); spin_lock_irqsave(&rs_sta->lock, flags);
if (time_after(jiffies, rs_sta->win[i].stamp + if (time_after(jiffies, rs_sta->win[i].stamp +
IL_RATE_WIN_FLUSH)) { IL_RATE_WIN_FLUSH)) {
IL_DEBUG_RATE(il, "flushing %d samples of rate " D_RATE("flushing %d samples of rate "
"index %d\n", "index %d\n",
rs_sta->win[i].counter, i); rs_sta->win[i].counter, i);
il3945_clear_window(&rs_sta->win[i]); il3945_clear_window(&rs_sta->win[i]);
...@@ -191,7 +191,7 @@ static void il3945_bg_rate_scale_flush(unsigned long data) ...@@ -191,7 +191,7 @@ static void il3945_bg_rate_scale_flush(unsigned long data)
unsigned long flags; unsigned long flags;
u32 packet_count, duration, pps; u32 packet_count, duration, pps;
IL_DEBUG_RATE(il, "enter\n"); D_RATE("enter\n");
unflushed = il3945_rate_scale_flush_windows(rs_sta); unflushed = il3945_rate_scale_flush_windows(rs_sta);
...@@ -206,7 +206,7 @@ static void il3945_bg_rate_scale_flush(unsigned long data) ...@@ -206,7 +206,7 @@ static void il3945_bg_rate_scale_flush(unsigned long data)
duration = duration =
jiffies_to_msecs(jiffies - rs_sta->last_partial_flush); jiffies_to_msecs(jiffies - rs_sta->last_partial_flush);
IL_DEBUG_RATE(il, "Tx'd %d packets in %dms\n", D_RATE("Tx'd %d packets in %dms\n",
packet_count, duration); packet_count, duration);
/* Determine packets per second */ /* Determine packets per second */
...@@ -226,7 +226,7 @@ static void il3945_bg_rate_scale_flush(unsigned long data) ...@@ -226,7 +226,7 @@ static void il3945_bg_rate_scale_flush(unsigned long data)
rs_sta->flush_time = msecs_to_jiffies(duration); rs_sta->flush_time = msecs_to_jiffies(duration);
IL_DEBUG_RATE(il, "new flush period: %d msec ave %d\n", D_RATE("new flush period: %d msec ave %d\n",
duration, packet_count); duration, packet_count);
mod_timer(&rs_sta->rate_scale_flush, jiffies + mod_timer(&rs_sta->rate_scale_flush, jiffies +
...@@ -244,7 +244,7 @@ static void il3945_bg_rate_scale_flush(unsigned long data) ...@@ -244,7 +244,7 @@ static void il3945_bg_rate_scale_flush(unsigned long data)
spin_unlock_irqrestore(&rs_sta->lock, flags); spin_unlock_irqrestore(&rs_sta->lock, flags);
IL_DEBUG_RATE(il, "leave\n"); D_RATE("leave\n");
} }
/** /**
...@@ -263,7 +263,7 @@ static void il3945_collect_tx_data(struct il3945_rs_sta *rs_sta, ...@@ -263,7 +263,7 @@ static void il3945_collect_tx_data(struct il3945_rs_sta *rs_sta,
struct il_priv *il __maybe_unused = rs_sta->il; struct il_priv *il __maybe_unused = rs_sta->il;
if (!retries) { if (!retries) {
IL_DEBUG_RATE(il, "leave: retries == 0 -- should be at least 1\n"); D_RATE("leave: retries == 0 -- should be at least 1\n");
return; return;
} }
...@@ -341,7 +341,7 @@ void il3945_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta, u8 sta_i ...@@ -341,7 +341,7 @@ void il3945_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta, u8 sta_i
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
int i; int i;
IL_DEBUG_INFO(il, "enter\n"); D_INFO("enter\n");
if (sta_id == il->contexts[IL_RXON_CTX_BSS].bcast_sta_id) if (sta_id == il->contexts[IL_RXON_CTX_BSS].bcast_sta_id)
goto out; goto out;
...@@ -390,7 +390,7 @@ void il3945_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta, u8 sta_i ...@@ -390,7 +390,7 @@ void il3945_rs_rate_init(struct il_priv *il, struct ieee80211_sta *sta, u8 sta_i
out: out:
il->stations[sta_id].used &= ~IL_STA_UCODE_INPROGRESS; il->stations[sta_id].used &= ~IL_STA_UCODE_INPROGRESS;
IL_DEBUG_INFO(il, "leave\n"); D_INFO("leave\n");
} }
static void *il3945_rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir) static void *il3945_rs_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)
...@@ -410,14 +410,14 @@ static void *il3945_rs_alloc_sta(void *il_priv, struct ieee80211_sta *sta, gfp_t ...@@ -410,14 +410,14 @@ static void *il3945_rs_alloc_sta(void *il_priv, struct ieee80211_sta *sta, gfp_t
struct il3945_sta_priv *psta = (void *) sta->drv_priv; struct il3945_sta_priv *psta = (void *) sta->drv_priv;
struct il_priv *il __maybe_unused = il_priv; struct il_priv *il __maybe_unused = il_priv;
IL_DEBUG_RATE(il, "enter\n"); D_RATE("enter\n");
rs_sta = &psta->rs_sta; rs_sta = &psta->rs_sta;
spin_lock_init(&rs_sta->lock); spin_lock_init(&rs_sta->lock);
init_timer(&rs_sta->rate_scale_flush); init_timer(&rs_sta->rate_scale_flush);
IL_DEBUG_RATE(il, "leave\n"); D_RATE("leave\n");
return rs_sta; return rs_sta;
} }
...@@ -453,7 +453,7 @@ static void il3945_rs_tx_status(void *il_rate, struct ieee80211_supported_band * ...@@ -453,7 +453,7 @@ static void il3945_rs_tx_status(void *il_rate, struct ieee80211_supported_band *
struct il3945_rs_sta *rs_sta = il_sta; struct il3945_rs_sta *rs_sta = il_sta;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
IL_DEBUG_RATE(il, "enter\n"); D_RATE("enter\n");
retries = info->status.rates[0].count; retries = info->status.rates[0].count;
/* Sanity Check for retries */ /* Sanity Check for retries */
...@@ -462,18 +462,18 @@ static void il3945_rs_tx_status(void *il_rate, struct ieee80211_supported_band * ...@@ -462,18 +462,18 @@ static void il3945_rs_tx_status(void *il_rate, struct ieee80211_supported_band *
first_index = sband->bitrates[info->status.rates[0].idx].hw_value; first_index = sband->bitrates[info->status.rates[0].idx].hw_value;
if ((first_index < 0) || (first_index >= IL_RATE_COUNT_3945)) { if ((first_index < 0) || (first_index >= IL_RATE_COUNT_3945)) {
IL_DEBUG_RATE(il, "leave: Rate out of bounds: %d\n", first_index); D_RATE("leave: Rate out of bounds: %d\n", first_index);
return; return;
} }
if (!il_sta) { if (!il_sta) {
IL_DEBUG_RATE(il, "leave: No STA il data to update!\n"); D_RATE("leave: No STA il data to update!\n");
return; return;
} }
/* Treat uninitialized rate scaling data same as non-existing. */ /* Treat uninitialized rate scaling data same as non-existing. */
if (!rs_sta->il) { if (!rs_sta->il) {
IL_DEBUG_RATE(il, "leave: STA il data uninitialized!\n"); D_RATE("leave: STA il data uninitialized!\n");
return; return;
} }
...@@ -508,7 +508,7 @@ static void il3945_rs_tx_status(void *il_rate, struct ieee80211_supported_band * ...@@ -508,7 +508,7 @@ static void il3945_rs_tx_status(void *il_rate, struct ieee80211_supported_band *
il3945_collect_tx_data(rs_sta, il3945_collect_tx_data(rs_sta,
&rs_sta->win[scale_rate_index], &rs_sta->win[scale_rate_index],
0, current_count, scale_rate_index); 0, current_count, scale_rate_index);
IL_DEBUG_RATE(il, "Update rate %d for %d retries.\n", D_RATE("Update rate %d for %d retries.\n",
scale_rate_index, current_count); scale_rate_index, current_count);
retries -= current_count; retries -= current_count;
...@@ -518,7 +518,7 @@ static void il3945_rs_tx_status(void *il_rate, struct ieee80211_supported_band * ...@@ -518,7 +518,7 @@ static void il3945_rs_tx_status(void *il_rate, struct ieee80211_supported_band *
/* Update the last index window with success/failure based on ACK */ /* Update the last index window with success/failure based on ACK */
IL_DEBUG_RATE(il, "Update rate %d with %s.\n", D_RATE("Update rate %d with %s.\n",
last_index, last_index,
(info->flags & IEEE80211_TX_STAT_ACK) ? (info->flags & IEEE80211_TX_STAT_ACK) ?
"success" : "failure"); "success" : "failure");
...@@ -543,7 +543,7 @@ static void il3945_rs_tx_status(void *il_rate, struct ieee80211_supported_band * ...@@ -543,7 +543,7 @@ static void il3945_rs_tx_status(void *il_rate, struct ieee80211_supported_band *
spin_unlock_irqrestore(&rs_sta->lock, flags); spin_unlock_irqrestore(&rs_sta->lock, flags);
IL_DEBUG_RATE(il, "leave\n"); D_RATE("leave\n");
} }
static u16 il3945_get_adjacent_rate(struct il3945_rs_sta *rs_sta, static u16 il3945_get_adjacent_rate(struct il3945_rs_sta *rs_sta,
...@@ -591,7 +591,7 @@ static u16 il3945_get_adjacent_rate(struct il3945_rs_sta *rs_sta, ...@@ -591,7 +591,7 @@ static u16 il3945_get_adjacent_rate(struct il3945_rs_sta *rs_sta,
break; break;
if (rate_mask & (1 << low)) if (rate_mask & (1 << low))
break; break;
IL_DEBUG_RATE(il, "Skipping masked lower rate: %d\n", low); D_RATE("Skipping masked lower rate: %d\n", low);
} }
high = index; high = index;
...@@ -604,7 +604,7 @@ static u16 il3945_get_adjacent_rate(struct il3945_rs_sta *rs_sta, ...@@ -604,7 +604,7 @@ static u16 il3945_get_adjacent_rate(struct il3945_rs_sta *rs_sta,
break; break;
if (rate_mask & (1 << high)) if (rate_mask & (1 << high))
break; break;
IL_DEBUG_RATE(il, "Skipping masked higher rate: %d\n", high); D_RATE("Skipping masked higher rate: %d\n", high);
} }
return (high << 8) | low; return (high << 8) | low;
...@@ -648,11 +648,11 @@ static void il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta, ...@@ -648,11 +648,11 @@ static void il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta,
struct il_priv *il __maybe_unused = (struct il_priv *)il_r; struct il_priv *il __maybe_unused = (struct il_priv *)il_r;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
IL_DEBUG_RATE(il, "enter\n"); D_RATE("enter\n");
/* Treat uninitialized rate scaling data same as non-existing. */ /* Treat uninitialized rate scaling data same as non-existing. */
if (rs_sta && !rs_sta->il) { if (rs_sta && !rs_sta->il) {
IL_DEBUG_RATE(il, "Rate scaling information not initialized yet.\n"); D_RATE("Rate scaling information not initialized yet.\n");
il_sta = NULL; il_sta = NULL;
} }
...@@ -699,7 +699,7 @@ static void il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta, ...@@ -699,7 +699,7 @@ static void il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta,
(window->success_counter < IL_RATE_MIN_SUCCESS_TH))) { (window->success_counter < IL_RATE_MIN_SUCCESS_TH))) {
spin_unlock_irqrestore(&rs_sta->lock, flags); spin_unlock_irqrestore(&rs_sta->lock, flags);
IL_DEBUG_RATE(il, "Invalid average_tpt on rate %d: " D_RATE("Invalid average_tpt on rate %d: "
"counter: %d, success_counter: %d, " "counter: %d, success_counter: %d, "
"expected_tpt is %sNULL\n", "expected_tpt is %sNULL\n",
index, index,
...@@ -737,7 +737,7 @@ static void il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta, ...@@ -737,7 +737,7 @@ static void il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta,
/* Low success ratio , need to drop the rate */ /* Low success ratio , need to drop the rate */
if ((window->success_ratio < IL_RATE_DECREASE_TH) || !current_tpt) { if ((window->success_ratio < IL_RATE_DECREASE_TH) || !current_tpt) {
IL_DEBUG_RATE(il, "decrease rate because of low success_ratio\n"); D_RATE("decrease rate because of low success_ratio\n");
scale_action = -1; scale_action = -1;
/* No throughput measured yet for adjacent rates, /* No throughput measured yet for adjacent rates,
* try increase */ * try increase */
...@@ -756,7 +756,7 @@ static void il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta, ...@@ -756,7 +756,7 @@ static void il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta,
(high_tpt != IL_INVALID_VALUE) && (high_tpt != IL_INVALID_VALUE) &&
(low_tpt < current_tpt) && (high_tpt < current_tpt)) { (low_tpt < current_tpt) && (high_tpt < current_tpt)) {
IL_DEBUG_RATE(il, "No action -- low [%d] & high [%d] < " D_RATE("No action -- low [%d] & high [%d] < "
"current_tpt [%d]\n", "current_tpt [%d]\n",
low_tpt, high_tpt, current_tpt); low_tpt, high_tpt, current_tpt);
scale_action = 0; scale_action = 0;
...@@ -771,13 +771,13 @@ static void il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta, ...@@ -771,13 +771,13 @@ static void il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta,
window->success_ratio >= IL_RATE_INCREASE_TH) window->success_ratio >= IL_RATE_INCREASE_TH)
scale_action = 1; scale_action = 1;
else { else {
IL_DEBUG_RATE(il, D_RATE(
"decrease rate because of high tpt\n"); "decrease rate because of high tpt\n");
scale_action = 0; scale_action = 0;
} }
} else if (low_tpt != IL_INVALID_VALUE) { } else if (low_tpt != IL_INVALID_VALUE) {
if (low_tpt > current_tpt) { if (low_tpt > current_tpt) {
IL_DEBUG_RATE(il, D_RATE(
"decrease rate because of low tpt\n"); "decrease rate because of low tpt\n");
scale_action = -1; scale_action = -1;
} else if (window->success_ratio >= IL_RATE_INCREASE_TH) { } else if (window->success_ratio >= IL_RATE_INCREASE_TH) {
...@@ -816,7 +816,7 @@ static void il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta, ...@@ -816,7 +816,7 @@ static void il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta,
break; break;
} }
IL_DEBUG_RATE(il, "Selected %d (action %d) - low %d high %d\n", D_RATE("Selected %d (action %d) - low %d high %d\n",
index, scale_action, low, high); index, scale_action, low, high);
out: out:
...@@ -831,7 +831,7 @@ static void il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta, ...@@ -831,7 +831,7 @@ static void il3945_rs_get_rate(void *il_r, struct ieee80211_sta *sta,
info->control.rates[0].idx = rs_sta->last_txrate_idx; info->control.rates[0].idx = rs_sta->last_txrate_idx;
} }
IL_DEBUG_RATE(il, "leave: %d\n", index); D_RATE("leave: %d\n", index);
} }
#ifdef CONFIG_MAC80211_DEBUGFS #ifdef CONFIG_MAC80211_DEBUGFS
...@@ -932,14 +932,14 @@ void il3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id) ...@@ -932,14 +932,14 @@ void il3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
struct ieee80211_sta *sta; struct ieee80211_sta *sta;
struct il3945_sta_priv *psta; struct il3945_sta_priv *psta;
IL_DEBUG_RATE(il, "enter\n"); D_RATE("enter\n");
rcu_read_lock(); rcu_read_lock();
sta = ieee80211_find_sta(il->contexts[IL_RXON_CTX_BSS].vif, sta = ieee80211_find_sta(il->contexts[IL_RXON_CTX_BSS].vif,
il->stations[sta_id].sta.sta.addr); il->stations[sta_id].sta.sta.addr);
if (!sta) { if (!sta) {
IL_DEBUG_RATE(il, "Unable to find station to initialize rate scaling.\n"); D_RATE("Unable to find station to initialize rate scaling.\n");
rcu_read_unlock(); rcu_read_unlock();
return; return;
} }
...@@ -975,11 +975,11 @@ void il3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id) ...@@ -975,11 +975,11 @@ void il3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
if (rssi == 0) if (rssi == 0)
rssi = IL_MIN_RSSI_VAL; rssi = IL_MIN_RSSI_VAL;
IL_DEBUG_RATE(il, "Network RSSI: %d\n", rssi); D_RATE("Network RSSI: %d\n", rssi);
rs_sta->start_rate = il3945_get_rate_index_by_rssi(rssi, il->band); rs_sta->start_rate = il3945_get_rate_index_by_rssi(rssi, il->band);
IL_DEBUG_RATE(il, "leave: rssi %d assign rate index: " D_RATE("leave: rssi %d assign rate index: "
"%d (plcp 0x%x)\n", rssi, rs_sta->start_rate, "%d (plcp 0x%x)\n", rssi, rs_sta->start_rate,
il3945_rates[rs_sta->start_rate].plcp); il3945_rates[rs_sta->start_rate].plcp);
rcu_read_unlock(); rcu_read_unlock();
......
This diff is collapsed.
...@@ -303,7 +303,7 @@ static void il4965_rx_allocate(struct il_priv *il, gfp_t priority) ...@@ -303,7 +303,7 @@ static void il4965_rx_allocate(struct il_priv *il, gfp_t priority)
page = alloc_pages(gfp_mask, il->hw_params.rx_page_order); page = alloc_pages(gfp_mask, il->hw_params.rx_page_order);
if (!page) { if (!page) {
if (net_ratelimit()) if (net_ratelimit())
IL_DEBUG_INFO(il, "alloc_pages failed, " D_INFO("alloc_pages failed, "
"order: %d\n", "order: %d\n",
il->hw_params.rx_page_order); il->hw_params.rx_page_order);
...@@ -456,7 +456,7 @@ static int il4965_calc_rssi(struct il_priv *il, ...@@ -456,7 +456,7 @@ static int il4965_calc_rssi(struct il_priv *il,
if (valid_antennae & (1 << i)) if (valid_antennae & (1 << i))
max_rssi = max(ncphy->rssi_info[i << 1], max_rssi); max_rssi = max(ncphy->rssi_info[i << 1], max_rssi);
IL_DEBUG_STATS(il, "Rssi In A %d B %d C %d Max %d AGC dB %d\n", D_STATS("Rssi In A %d B %d C %d Max %d AGC dB %d\n",
ncphy->rssi_info[0], ncphy->rssi_info[2], ncphy->rssi_info[4], ncphy->rssi_info[0], ncphy->rssi_info[2], ncphy->rssi_info[4],
max_rssi, agc); max_rssi, agc);
...@@ -519,7 +519,7 @@ static u32 il4965_translate_rx_status(struct il_priv *il, u32 decrypt_in) ...@@ -519,7 +519,7 @@ static u32 il4965_translate_rx_status(struct il_priv *il, u32 decrypt_in)
break; break;
} }
IL_DEBUG_RX(il, "decrypt_in:0x%x decrypt_out = 0x%x\n", D_RX("decrypt_in:0x%x decrypt_out = 0x%x\n",
decrypt_in, decrypt_out); decrypt_in, decrypt_out);
return decrypt_out; return decrypt_out;
...@@ -537,7 +537,7 @@ static void il4965_pass_packet_to_mac80211(struct il_priv *il, ...@@ -537,7 +537,7 @@ static void il4965_pass_packet_to_mac80211(struct il_priv *il,
/* We only process data packets if the interface is open */ /* We only process data packets if the interface is open */
if (unlikely(!il->is_open)) { if (unlikely(!il->is_open)) {
IL_DEBUG_DROP(il, D_DROP(
"Dropping packet while interface is not open.\n"); "Dropping packet while interface is not open.\n");
return; return;
} }
...@@ -611,14 +611,14 @@ void il4965_rx_reply_rx(struct il_priv *il, ...@@ -611,14 +611,14 @@ void il4965_rx_reply_rx(struct il_priv *il,
} }
if ((unlikely(phy_res->cfg_phy_cnt > 20))) { if ((unlikely(phy_res->cfg_phy_cnt > 20))) {
IL_DEBUG_DROP(il, "dsp size out of range [0,20]: %d/n", D_DROP("dsp size out of range [0,20]: %d/n",
phy_res->cfg_phy_cnt); phy_res->cfg_phy_cnt);
return; return;
} }
if (!(rx_pkt_status & RX_RES_STATUS_NO_CRC32_ERROR) || if (!(rx_pkt_status & RX_RES_STATUS_NO_CRC32_ERROR) ||
!(rx_pkt_status & RX_RES_STATUS_NO_RXE_OVERFLOW)) { !(rx_pkt_status & RX_RES_STATUS_NO_RXE_OVERFLOW)) {
IL_DEBUG_RX(il, "Bad CRC or FIFO: 0x%08X.\n", D_RX("Bad CRC or FIFO: 0x%08X.\n",
le32_to_cpu(rx_pkt_status)); le32_to_cpu(rx_pkt_status));
return; return;
} }
...@@ -647,7 +647,7 @@ void il4965_rx_reply_rx(struct il_priv *il, ...@@ -647,7 +647,7 @@ void il4965_rx_reply_rx(struct il_priv *il,
rx_status.signal = il4965_calc_rssi(il, phy_res); rx_status.signal = il4965_calc_rssi(il, phy_res);
il_dbg_log_rx_data_frame(il, len, header); il_dbg_log_rx_data_frame(il, len, header);
IL_DEBUG_STATS(il, "Rssi %d, TSF %llu\n", D_STATS("Rssi %d, TSF %llu\n",
rx_status.signal, (unsigned long long)rx_status.mactime); rx_status.signal, (unsigned long long)rx_status.mactime);
/* /*
...@@ -729,7 +729,7 @@ static int il4965_get_channels_for_scan(struct il_priv *il, ...@@ -729,7 +729,7 @@ static int il4965_get_channels_for_scan(struct il_priv *il,
ch_info = il_get_channel_info(il, band, channel); ch_info = il_get_channel_info(il, band, channel);
if (!il_is_channel_valid(ch_info)) { if (!il_is_channel_valid(ch_info)) {
IL_DEBUG_SCAN(il, D_SCAN(
"Channel %d is INVALID for this band.\n", "Channel %d is INVALID for this band.\n",
channel); channel);
continue; continue;
...@@ -759,7 +759,7 @@ static int il4965_get_channels_for_scan(struct il_priv *il, ...@@ -759,7 +759,7 @@ static int il4965_get_channels_for_scan(struct il_priv *il,
else else
scan_ch->tx_gain = ((1 << 5) | (5 << 3)); scan_ch->tx_gain = ((1 << 5) | (5 << 3));
IL_DEBUG_SCAN(il, "Scanning ch=%d prob=0x%X [%s %d]\n", D_SCAN("Scanning ch=%d prob=0x%X [%s %d]\n",
channel, le32_to_cpu(scan_ch->type), channel, le32_to_cpu(scan_ch->type),
(scan_ch->type & SCAN_CHANNEL_TYPE_ACTIVE) ? (scan_ch->type & SCAN_CHANNEL_TYPE_ACTIVE) ?
"ACTIVE" : "PASSIVE", "ACTIVE" : "PASSIVE",
...@@ -770,7 +770,7 @@ static int il4965_get_channels_for_scan(struct il_priv *il, ...@@ -770,7 +770,7 @@ static int il4965_get_channels_for_scan(struct il_priv *il,
added++; added++;
} }
IL_DEBUG_SCAN(il, "total channels to scan %d\n", added); D_SCAN("total channels to scan %d\n", added);
return added; return added;
} }
...@@ -805,7 +805,7 @@ int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif) ...@@ -805,7 +805,7 @@ int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif)
il->scan_cmd = kmalloc(sizeof(struct il_scan_cmd) + il->scan_cmd = kmalloc(sizeof(struct il_scan_cmd) +
IL_MAX_SCAN_SIZE, GFP_KERNEL); IL_MAX_SCAN_SIZE, GFP_KERNEL);
if (!il->scan_cmd) { if (!il->scan_cmd) {
IL_DEBUG_SCAN(il, D_SCAN(
"fail to allocate memory for scan\n"); "fail to allocate memory for scan\n");
return -ENOMEM; return -ENOMEM;
} }
...@@ -822,7 +822,7 @@ int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif) ...@@ -822,7 +822,7 @@ int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif)
u32 suspend_time = 100; u32 suspend_time = 100;
u32 scan_suspend_time = 100; u32 scan_suspend_time = 100;
IL_DEBUG_INFO(il, "Scanning while associated...\n"); D_INFO("Scanning while associated...\n");
interval = vif->bss_conf.beacon_int; interval = vif->bss_conf.beacon_int;
scan->suspend_time = 0; scan->suspend_time = 0;
...@@ -834,13 +834,13 @@ int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif) ...@@ -834,13 +834,13 @@ int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif)
scan_suspend_time = (extra | scan_suspend_time = (extra |
((suspend_time % interval) * 1024)); ((suspend_time % interval) * 1024));
scan->suspend_time = cpu_to_le32(scan_suspend_time); scan->suspend_time = cpu_to_le32(scan_suspend_time);
IL_DEBUG_SCAN(il, "suspend_time 0x%X beacon interval %d\n", D_SCAN("suspend_time 0x%X beacon interval %d\n",
scan_suspend_time, interval); scan_suspend_time, interval);
} }
if (il->scan_request->n_ssids) { if (il->scan_request->n_ssids) {
int i, p = 0; int i, p = 0;
IL_DEBUG_SCAN(il, "Kicking off active scan\n"); D_SCAN("Kicking off active scan\n");
for (i = 0; i < il->scan_request->n_ssids; i++) { for (i = 0; i < il->scan_request->n_ssids; i++) {
/* always does wildcard anyway */ /* always does wildcard anyway */
if (!il->scan_request->ssids[i].ssid_len) if (!il->scan_request->ssids[i].ssid_len)
...@@ -856,7 +856,7 @@ int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif) ...@@ -856,7 +856,7 @@ int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif)
} }
is_active = true; is_active = true;
} else } else
IL_DEBUG_SCAN(il, "Start passive scan.\n"); D_SCAN("Start passive scan.\n");
scan->tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK; scan->tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK;
scan->tx_cmd.sta_id = ctx->bcast_sta_id; scan->tx_cmd.sta_id = ctx->bcast_sta_id;
...@@ -923,7 +923,7 @@ int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif) ...@@ -923,7 +923,7 @@ int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif)
if (!active_chains) if (!active_chains)
active_chains = rx_ant; active_chains = rx_ant;
IL_DEBUG_SCAN(il, "chain_noise_data.active_chains: %u\n", D_SCAN("chain_noise_data.active_chains: %u\n",
il->chain_noise_data.active_chains); il->chain_noise_data.active_chains);
rx_ant = il4965_first_antenna(active_chains); rx_ant = il4965_first_antenna(active_chains);
...@@ -951,7 +951,7 @@ int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif) ...@@ -951,7 +951,7 @@ int il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif)
is_active, n_probes, is_active, n_probes,
(void *)&scan->data[cmd_len]); (void *)&scan->data[cmd_len]);
if (scan->channel_count == 0) { if (scan->channel_count == 0) {
IL_DEBUG_SCAN(il, "channel count %d\n", scan->channel_count); D_SCAN("channel count %d\n", scan->channel_count);
return -EIO; return -EIO;
} }
...@@ -990,7 +990,7 @@ void il4965_free_tfds_in_queue(struct il_priv *il, ...@@ -990,7 +990,7 @@ void il4965_free_tfds_in_queue(struct il_priv *il,
if (il->stations[sta_id].tid[tid].tfds_in_queue >= freed) if (il->stations[sta_id].tid[tid].tfds_in_queue >= freed)
il->stations[sta_id].tid[tid].tfds_in_queue -= freed; il->stations[sta_id].tid[tid].tfds_in_queue -= freed;
else { else {
IL_DEBUG_TX(il, "free more than tfds_in_queue (%u:%d)\n", D_TX("free more than tfds_in_queue (%u:%d)\n",
il->stations[sta_id].tid[tid].tfds_in_queue, il->stations[sta_id].tid[tid].tfds_in_queue,
freed); freed);
il->stations[sta_id].tid[tid].tfds_in_queue = 0; il->stations[sta_id].tid[tid].tfds_in_queue = 0;
...@@ -1111,7 +1111,7 @@ void il4965_set_rxon_chain(struct il_priv *il, struct il_rxon_context *ctx) ...@@ -1111,7 +1111,7 @@ void il4965_set_rxon_chain(struct il_priv *il, struct il_rxon_context *ctx)
else else
ctx->staging.rx_chain &= ~RXON_RX_CHAIN_MIMO_FORCE_MSK; ctx->staging.rx_chain &= ~RXON_RX_CHAIN_MIMO_FORCE_MSK;
IL_DEBUG_ASSOC(il, "rx_chain=0x%X active=%d idle=%d\n", D_ASSOC("rx_chain=0x%X active=%d idle=%d\n",
ctx->staging.rx_chain, ctx->staging.rx_chain,
active_rx_cnt, idle_rx_cnt); active_rx_cnt, idle_rx_cnt);
......
This diff is collapsed.
...@@ -51,7 +51,7 @@ void il4965_rx_missed_beacon_notif(struct il_priv *il, ...@@ -51,7 +51,7 @@ void il4965_rx_missed_beacon_notif(struct il_priv *il,
missed_beacon = &pkt->u.missed_beacon; missed_beacon = &pkt->u.missed_beacon;
if (le32_to_cpu(missed_beacon->consecutive_missed_beacons) > if (le32_to_cpu(missed_beacon->consecutive_missed_beacons) >
il->missed_beacon_threshold) { il->missed_beacon_threshold) {
IL_DEBUG_CALIB(il, D_CALIB(
"missed bcn cnsq %d totl %d rcd %d expctd %d\n", "missed bcn cnsq %d totl %d rcd %d expctd %d\n",
le32_to_cpu(missed_beacon->consecutive_missed_beacons), le32_to_cpu(missed_beacon->consecutive_missed_beacons),
le32_to_cpu(missed_beacon->total_missed_becons), le32_to_cpu(missed_beacon->total_missed_becons),
...@@ -100,7 +100,7 @@ static void il4965_rx_calc_noise(struct il_priv *il) ...@@ -100,7 +100,7 @@ static void il4965_rx_calc_noise(struct il_priv *il)
else else
last_rx_noise = IL_NOISE_MEAS_NOT_AVAILABLE; last_rx_noise = IL_NOISE_MEAS_NOT_AVAILABLE;
IL_DEBUG_CALIB(il, "inband silence a %u, b %u, c %u, dBm %d\n", D_CALIB("inband silence a %u, b %u, c %u, dBm %d\n",
bcn_silence_a, bcn_silence_b, bcn_silence_c, bcn_silence_a, bcn_silence_b, bcn_silence_c,
last_rx_noise); last_rx_noise);
} }
...@@ -157,7 +157,7 @@ void il4965_rx_statistics(struct il_priv *il, ...@@ -157,7 +157,7 @@ void il4965_rx_statistics(struct il_priv *il,
int change; int change;
struct il_rx_packet *pkt = rxb_addr(rxb); struct il_rx_packet *pkt = rxb_addr(rxb);
IL_DEBUG_RX(il, D_RX(
"Statistics notification received (%d vs %d).\n", "Statistics notification received (%d vs %d).\n",
(int)sizeof(struct il_notif_statistics), (int)sizeof(struct il_notif_statistics),
le32_to_cpu(pkt->len_n_flags) & le32_to_cpu(pkt->len_n_flags) &
...@@ -209,7 +209,7 @@ void il4965_reply_statistics(struct il_priv *il, ...@@ -209,7 +209,7 @@ void il4965_reply_statistics(struct il_priv *il,
memset(&il->_4965.max_delta, 0, memset(&il->_4965.max_delta, 0,
sizeof(struct il_notif_statistics)); sizeof(struct il_notif_statistics));
#endif #endif
IL_DEBUG_RX(il, "Statistics have been cleared\n"); D_RX("Statistics have been cleared\n");
} }
il4965_rx_statistics(il, rxb); il4965_rx_statistics(il, rxb);
} }
...@@ -199,18 +199,18 @@ int il4965_remove_default_wep_key(struct il_priv *il, ...@@ -199,18 +199,18 @@ int il4965_remove_default_wep_key(struct il_priv *il,
lockdep_assert_held(&il->mutex); lockdep_assert_held(&il->mutex);
IL_DEBUG_WEP(il, "Removing default WEP key: idx=%d\n", D_WEP("Removing default WEP key: idx=%d\n",
keyconf->keyidx); keyconf->keyidx);
memset(&ctx->wep_keys[keyconf->keyidx], 0, sizeof(ctx->wep_keys[0])); memset(&ctx->wep_keys[keyconf->keyidx], 0, sizeof(ctx->wep_keys[0]));
if (il_is_rfkill(il)) { if (il_is_rfkill(il)) {
IL_DEBUG_WEP(il, D_WEP(
"Not sending REPLY_WEPKEY command due to RFKILL.\n"); "Not sending REPLY_WEPKEY command due to RFKILL.\n");
/* but keys in device are clear anyway so return success */ /* but keys in device are clear anyway so return success */
return 0; return 0;
} }
ret = il4965_static_wepkey_cmd(il, ctx, 1); ret = il4965_static_wepkey_cmd(il, ctx, 1);
IL_DEBUG_WEP(il, "Remove default WEP key: idx=%d ret=%d\n", D_WEP("Remove default WEP key: idx=%d ret=%d\n",
keyconf->keyidx, ret); keyconf->keyidx, ret);
return ret; return ret;
...@@ -226,7 +226,7 @@ int il4965_set_default_wep_key(struct il_priv *il, ...@@ -226,7 +226,7 @@ int il4965_set_default_wep_key(struct il_priv *il,
if (keyconf->keylen != WEP_KEY_LEN_128 && if (keyconf->keylen != WEP_KEY_LEN_128 &&
keyconf->keylen != WEP_KEY_LEN_64) { keyconf->keylen != WEP_KEY_LEN_64) {
IL_DEBUG_WEP(il, "Bad WEP key length %d\n", keyconf->keylen); D_WEP("Bad WEP key length %d\n", keyconf->keylen);
return -EINVAL; return -EINVAL;
} }
...@@ -239,7 +239,7 @@ int il4965_set_default_wep_key(struct il_priv *il, ...@@ -239,7 +239,7 @@ int il4965_set_default_wep_key(struct il_priv *il,
keyconf->keylen); keyconf->keylen);
ret = il4965_static_wepkey_cmd(il, ctx, false); ret = il4965_static_wepkey_cmd(il, ctx, false);
IL_DEBUG_WEP(il, "Set default WEP key: len=%d idx=%d ret=%d\n", D_WEP("Set default WEP key: len=%d idx=%d ret=%d\n",
keyconf->keylen, keyconf->keyidx, ret); keyconf->keylen, keyconf->keyidx, ret);
return ret; return ret;
...@@ -453,7 +453,7 @@ int il4965_remove_dynamic_key(struct il_priv *il, ...@@ -453,7 +453,7 @@ int il4965_remove_dynamic_key(struct il_priv *il,
key_flags = le16_to_cpu(il->stations[sta_id].sta.key.key_flags); key_flags = le16_to_cpu(il->stations[sta_id].sta.key.key_flags);
keyidx = (key_flags >> STA_KEY_FLG_KEYID_POS) & 0x3; keyidx = (key_flags >> STA_KEY_FLG_KEYID_POS) & 0x3;
IL_DEBUG_WEP(il, "Remove dynamic key: idx=%d sta=%d\n", D_WEP("Remove dynamic key: idx=%d sta=%d\n",
keyconf->keyidx, sta_id); keyconf->keyidx, sta_id);
if (keyconf->keyidx != keyidx) { if (keyconf->keyidx != keyidx) {
...@@ -488,7 +488,7 @@ int il4965_remove_dynamic_key(struct il_priv *il, ...@@ -488,7 +488,7 @@ int il4965_remove_dynamic_key(struct il_priv *il,
il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK; il->stations[sta_id].sta.mode = STA_CONTROL_MODIFY_MSK;
if (il_is_rfkill(il)) { if (il_is_rfkill(il)) {
IL_DEBUG_WEP(il, D_WEP(
"Not sending REPLY_ADD_STA command because RFKILL enabled.\n"); "Not sending REPLY_ADD_STA command because RFKILL enabled.\n");
spin_unlock_irqrestore(&il->sta_lock, flags); spin_unlock_irqrestore(&il->sta_lock, flags);
return 0; return 0;
...@@ -531,7 +531,7 @@ int il4965_set_dynamic_key(struct il_priv *il, struct il_rxon_context *ctx, ...@@ -531,7 +531,7 @@ int il4965_set_dynamic_key(struct il_priv *il, struct il_rxon_context *ctx,
ret = -EINVAL; ret = -EINVAL;
} }
IL_DEBUG_WEP(il, D_WEP(
"Set dynamic key: cipher=%x len=%d idx=%d sta=%d ret=%d\n", "Set dynamic key: cipher=%x len=%d idx=%d sta=%d ret=%d\n",
keyconf->cipher, keyconf->keylen, keyconf->keyidx, keyconf->cipher, keyconf->keylen, keyconf->keyidx,
sta_id, ret); sta_id, ret);
...@@ -605,7 +605,7 @@ static int il4965_update_bcast_station(struct il_priv *il, ...@@ -605,7 +605,7 @@ static int il4965_update_bcast_station(struct il_priv *il,
if (il->stations[sta_id].lq) if (il->stations[sta_id].lq)
kfree(il->stations[sta_id].lq); kfree(il->stations[sta_id].lq);
else else
IL_DEBUG_INFO(il, D_INFO(
"Bcast station rate scaling has not been initialized yet.\n"); "Bcast station rate scaling has not been initialized yet.\n");
il->stations[sta_id].lq = link_cmd; il->stations[sta_id].lq = link_cmd;
spin_unlock_irqrestore(&il->sta_lock, flags); spin_unlock_irqrestore(&il->sta_lock, flags);
......
...@@ -235,13 +235,13 @@ static void il4965_tx_cmd_build_hwcrypto(struct il_priv *il, ...@@ -235,13 +235,13 @@ static void il4965_tx_cmd_build_hwcrypto(struct il_priv *il,
memcpy(tx_cmd->key, keyconf->key, keyconf->keylen); memcpy(tx_cmd->key, keyconf->key, keyconf->keylen);
if (info->flags & IEEE80211_TX_CTL_AMPDU) if (info->flags & IEEE80211_TX_CTL_AMPDU)
tx_cmd->tx_flags |= TX_CMD_FLG_AGG_CCMP_MSK; tx_cmd->tx_flags |= TX_CMD_FLG_AGG_CCMP_MSK;
IL_DEBUG_TX(il, "tx_cmd with AES hwcrypto\n"); D_TX("tx_cmd with AES hwcrypto\n");
break; break;
case WLAN_CIPHER_SUITE_TKIP: case WLAN_CIPHER_SUITE_TKIP:
tx_cmd->sec_ctl = TX_CMD_SEC_TKIP; tx_cmd->sec_ctl = TX_CMD_SEC_TKIP;
ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd->key); ieee80211_get_tkip_p2k(keyconf, skb_frag, tx_cmd->key);
IL_DEBUG_TX(il, "tx_cmd with tkip hwcrypto\n"); D_TX("tx_cmd with tkip hwcrypto\n");
break; break;
case WLAN_CIPHER_SUITE_WEP104: case WLAN_CIPHER_SUITE_WEP104:
...@@ -253,7 +253,7 @@ static void il4965_tx_cmd_build_hwcrypto(struct il_priv *il, ...@@ -253,7 +253,7 @@ static void il4965_tx_cmd_build_hwcrypto(struct il_priv *il,
memcpy(&tx_cmd->key[3], keyconf->key, keyconf->keylen); memcpy(&tx_cmd->key[3], keyconf->key, keyconf->keylen);
IL_DEBUG_TX(il, "Configuring packet for WEP encryption " D_TX("Configuring packet for WEP encryption "
"with key %d\n", keyconf->keyidx); "with key %d\n", keyconf->keyidx);
break; break;
...@@ -298,7 +298,7 @@ int il4965_tx_skb(struct il_priv *il, struct sk_buff *skb) ...@@ -298,7 +298,7 @@ int il4965_tx_skb(struct il_priv *il, struct sk_buff *skb)
spin_lock_irqsave(&il->lock, flags); spin_lock_irqsave(&il->lock, flags);
if (il_is_rfkill(il)) { if (il_is_rfkill(il)) {
IL_DEBUG_DROP(il, "Dropping - RF KILL\n"); D_DROP("Dropping - RF KILL\n");
goto drop_unlock; goto drop_unlock;
} }
...@@ -306,11 +306,11 @@ int il4965_tx_skb(struct il_priv *il, struct sk_buff *skb) ...@@ -306,11 +306,11 @@ int il4965_tx_skb(struct il_priv *il, struct sk_buff *skb)
#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG #ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
if (ieee80211_is_auth(fc)) if (ieee80211_is_auth(fc))
IL_DEBUG_TX(il, "Sending AUTH frame\n"); D_TX("Sending AUTH frame\n");
else if (ieee80211_is_assoc_req(fc)) else if (ieee80211_is_assoc_req(fc))
IL_DEBUG_TX(il, "Sending ASSOC frame\n"); D_TX("Sending ASSOC frame\n");
else if (ieee80211_is_reassoc_req(fc)) else if (ieee80211_is_reassoc_req(fc))
IL_DEBUG_TX(il, "Sending REASSOC frame\n"); D_TX("Sending REASSOC frame\n");
#endif #endif
hdr_len = ieee80211_hdrlen(fc); hdr_len = ieee80211_hdrlen(fc);
...@@ -323,13 +323,13 @@ int il4965_tx_skb(struct il_priv *il, struct sk_buff *skb) ...@@ -323,13 +323,13 @@ int il4965_tx_skb(struct il_priv *il, struct sk_buff *skb)
sta_id = il_sta_id_or_broadcast(il, ctx, info->control.sta); sta_id = il_sta_id_or_broadcast(il, ctx, info->control.sta);
if (sta_id == IL_INVALID_STATION) { if (sta_id == IL_INVALID_STATION) {
IL_DEBUG_DROP(il, "Dropping - INVALID STATION: %pM\n", D_DROP("Dropping - INVALID STATION: %pM\n",
hdr->addr1); hdr->addr1);
goto drop_unlock; goto drop_unlock;
} }
} }
IL_DEBUG_TX(il, "station Id %d\n", sta_id); D_TX("station Id %d\n", sta_id);
if (sta) if (sta)
sta_priv = (void *)sta->drv_priv; sta_priv = (void *)sta->drv_priv;
...@@ -499,9 +499,9 @@ int il4965_tx_skb(struct il_priv *il, struct sk_buff *skb) ...@@ -499,9 +499,9 @@ int il4965_tx_skb(struct il_priv *il, struct sk_buff *skb)
tx_cmd->dram_lsb_ptr = cpu_to_le32(scratch_phys); tx_cmd->dram_lsb_ptr = cpu_to_le32(scratch_phys);
tx_cmd->dram_msb_ptr = il_get_dma_hi_addr(scratch_phys); tx_cmd->dram_msb_ptr = il_get_dma_hi_addr(scratch_phys);
IL_DEBUG_TX(il, "sequence nr = 0X%x\n", D_TX("sequence nr = 0X%x\n",
le16_to_cpu(out_cmd->hdr.sequence)); le16_to_cpu(out_cmd->hdr.sequence));
IL_DEBUG_TX(il, "tx_flags = 0X%x\n", le32_to_cpu(tx_cmd->tx_flags)); D_TX("tx_flags = 0X%x\n", le32_to_cpu(tx_cmd->tx_flags));
il_print_hex_dump(il, IL_DL_TX, (u8 *)tx_cmd, sizeof(*tx_cmd)); il_print_hex_dump(il, IL_DL_TX, (u8 *)tx_cmd, sizeof(*tx_cmd));
il_print_hex_dump(il, IL_DL_TX, (u8 *)tx_cmd->hdr, hdr_len); il_print_hex_dump(il, IL_DL_TX, (u8 *)tx_cmd->hdr, hdr_len);
...@@ -909,11 +909,11 @@ int il4965_tx_agg_start(struct il_priv *il, struct ieee80211_vif *vif, ...@@ -909,11 +909,11 @@ int il4965_tx_agg_start(struct il_priv *il, struct ieee80211_vif *vif,
spin_lock_irqsave(&il->sta_lock, flags); spin_lock_irqsave(&il->sta_lock, flags);
tid_data = &il->stations[sta_id].tid[tid]; tid_data = &il->stations[sta_id].tid[tid];
if (tid_data->tfds_in_queue == 0) { if (tid_data->tfds_in_queue == 0) {
IL_DEBUG_HT(il, "HW queue is empty\n"); D_HT("HW queue is empty\n");
tid_data->agg.state = IL_AGG_ON; tid_data->agg.state = IL_AGG_ON;
ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid); ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
} else { } else {
IL_DEBUG_HT(il, D_HT(
"HW queue is NOT empty: %d packets in HW queue\n", "HW queue is NOT empty: %d packets in HW queue\n",
tid_data->tfds_in_queue); tid_data->tfds_in_queue);
tid_data->agg.state = IL_EMPTYING_HW_QUEUE_ADDBA; tid_data->agg.state = IL_EMPTYING_HW_QUEUE_ADDBA;
...@@ -991,7 +991,7 @@ int il4965_tx_agg_stop(struct il_priv *il, struct ieee80211_vif *vif, ...@@ -991,7 +991,7 @@ int il4965_tx_agg_stop(struct il_priv *il, struct ieee80211_vif *vif,
* queue we selected previously, i.e. before the * queue we selected previously, i.e. before the
* session was really started completely. * session was really started completely.
*/ */
IL_DEBUG_HT(il, "AGG stop before setup done\n"); D_HT("AGG stop before setup done\n");
goto turn_off; goto turn_off;
case IL_AGG_ON: case IL_AGG_ON:
break; break;
...@@ -1004,14 +1004,14 @@ int il4965_tx_agg_stop(struct il_priv *il, struct ieee80211_vif *vif, ...@@ -1004,14 +1004,14 @@ int il4965_tx_agg_stop(struct il_priv *il, struct ieee80211_vif *vif,
/* The queue is not empty */ /* The queue is not empty */
if (write_ptr != read_ptr) { if (write_ptr != read_ptr) {
IL_DEBUG_HT(il, "Stopping a non empty AGG HW QUEUE\n"); D_HT("Stopping a non empty AGG HW QUEUE\n");
il->stations[sta_id].tid[tid].agg.state = il->stations[sta_id].tid[tid].agg.state =
IL_EMPTYING_HW_QUEUE_DELBA; IL_EMPTYING_HW_QUEUE_DELBA;
spin_unlock_irqrestore(&il->sta_lock, flags); spin_unlock_irqrestore(&il->sta_lock, flags);
return 0; return 0;
} }
IL_DEBUG_HT(il, "HW queue is empty\n"); D_HT("HW queue is empty\n");
turn_off: turn_off:
il->stations[sta_id].tid[tid].agg.state = IL_AGG_OFF; il->stations[sta_id].tid[tid].agg.state = IL_AGG_OFF;
...@@ -1054,7 +1054,7 @@ int il4965_txq_check_empty(struct il_priv *il, ...@@ -1054,7 +1054,7 @@ int il4965_txq_check_empty(struct il_priv *il,
(q->read_ptr == q->write_ptr)) { (q->read_ptr == q->write_ptr)) {
u16 ssn = SEQ_TO_SN(tid_data->seq_number); u16 ssn = SEQ_TO_SN(tid_data->seq_number);
int tx_fifo = il4965_get_fifo_from_tid(ctx, tid); int tx_fifo = il4965_get_fifo_from_tid(ctx, tid);
IL_DEBUG_HT(il, D_HT(
"HW queue empty: continue DELBA flow\n"); "HW queue empty: continue DELBA flow\n");
il4965_txq_agg_disable(il, txq_id, ssn, tx_fifo); il4965_txq_agg_disable(il, txq_id, ssn, tx_fifo);
tid_data->agg.state = IL_AGG_OFF; tid_data->agg.state = IL_AGG_OFF;
...@@ -1064,7 +1064,7 @@ int il4965_txq_check_empty(struct il_priv *il, ...@@ -1064,7 +1064,7 @@ int il4965_txq_check_empty(struct il_priv *il,
case IL_EMPTYING_HW_QUEUE_ADDBA: case IL_EMPTYING_HW_QUEUE_ADDBA:
/* We are reclaiming the last packet of the queue */ /* We are reclaiming the last packet of the queue */
if (tid_data->tfds_in_queue == 0) { if (tid_data->tfds_in_queue == 0) {
IL_DEBUG_HT(il, D_HT(
"HW queue empty: continue ADDBA flow\n"); "HW queue empty: continue ADDBA flow\n");
tid_data->agg.state = IL_AGG_ON; tid_data->agg.state = IL_AGG_ON;
ieee80211_start_tx_ba_cb_irqsafe(ctx->vif, addr, tid); ieee80211_start_tx_ba_cb_irqsafe(ctx->vif, addr, tid);
...@@ -1169,7 +1169,7 @@ static int il4965_tx_status_reply_compressed_ba(struct il_priv *il, ...@@ -1169,7 +1169,7 @@ static int il4965_tx_status_reply_compressed_ba(struct il_priv *il,
/* Mark that the expected block-ack response arrived */ /* Mark that the expected block-ack response arrived */
agg->wait_for_ba = 0; agg->wait_for_ba = 0;
IL_DEBUG_TX_REPLY(il, "BA %d %d\n", agg->start_idx, D_TX_REPLY("BA %d %d\n", agg->start_idx,
ba_resp->seq_ctl); ba_resp->seq_ctl);
/* Calculate shift to align block-ack bits with our Tx window bits */ /* Calculate shift to align block-ack bits with our Tx window bits */
...@@ -1178,7 +1178,7 @@ static int il4965_tx_status_reply_compressed_ba(struct il_priv *il, ...@@ -1178,7 +1178,7 @@ static int il4965_tx_status_reply_compressed_ba(struct il_priv *il,
sh += 0x100; sh += 0x100;
if (agg->frame_count > (64 - sh)) { if (agg->frame_count > (64 - sh)) {
IL_DEBUG_TX_REPLY(il, "more frames than bitmap size"); D_TX_REPLY("more frames than bitmap size");
return -1; return -1;
} }
...@@ -1195,7 +1195,7 @@ static int il4965_tx_status_reply_compressed_ba(struct il_priv *il, ...@@ -1195,7 +1195,7 @@ static int il4965_tx_status_reply_compressed_ba(struct il_priv *il,
while (sent_bitmap) { while (sent_bitmap) {
ack = sent_bitmap & 1ULL; ack = sent_bitmap & 1ULL;
successes += ack; successes += ack;
IL_DEBUG_TX_REPLY(il, "%s ON i=%d idx=%d raw=%d\n", D_TX_REPLY("%s ON i=%d idx=%d raw=%d\n",
ack ? "ACK" : "NACK", i, ack ? "ACK" : "NACK", i,
(agg->start_idx + i) & 0xff, (agg->start_idx + i) & 0xff,
agg->start_idx + i); agg->start_idx + i);
...@@ -1203,7 +1203,7 @@ static int il4965_tx_status_reply_compressed_ba(struct il_priv *il, ...@@ -1203,7 +1203,7 @@ static int il4965_tx_status_reply_compressed_ba(struct il_priv *il,
++i; ++i;
} }
IL_DEBUG_TX_REPLY(il, "Bitmap %llx\n", D_TX_REPLY("Bitmap %llx\n",
(unsigned long long)bitmap); (unsigned long long)bitmap);
info = IEEE80211_SKB_CB(il->txq[scd_flow].txb[agg->start_idx].skb); info = IEEE80211_SKB_CB(il->txq[scd_flow].txb[agg->start_idx].skb);
...@@ -1282,7 +1282,7 @@ void il4965_rx_reply_compressed_ba(struct il_priv *il, ...@@ -1282,7 +1282,7 @@ void il4965_rx_reply_compressed_ba(struct il_priv *il,
* since it is possible happen very often and in order * since it is possible happen very often and in order
* not to fill the syslog, don't enable the logging by default * not to fill the syslog, don't enable the logging by default
*/ */
IL_DEBUG_TX_REPLY(il, D_TX_REPLY(
"BA scd_flow %d does not match txq_id %d\n", "BA scd_flow %d does not match txq_id %d\n",
scd_flow, agg->txq_id); scd_flow, agg->txq_id);
return; return;
...@@ -1293,12 +1293,12 @@ void il4965_rx_reply_compressed_ba(struct il_priv *il, ...@@ -1293,12 +1293,12 @@ void il4965_rx_reply_compressed_ba(struct il_priv *il,
spin_lock_irqsave(&il->sta_lock, flags); spin_lock_irqsave(&il->sta_lock, flags);
IL_DEBUG_TX_REPLY(il, "REPLY_COMPRESSED_BA [%d] Received from %pM, " D_TX_REPLY("REPLY_COMPRESSED_BA [%d] Received from %pM, "
"sta_id = %d\n", "sta_id = %d\n",
agg->wait_for_ba, agg->wait_for_ba,
(u8 *) &ba_resp->sta_addr_lo32, (u8 *) &ba_resp->sta_addr_lo32,
ba_resp->sta_id); ba_resp->sta_id);
IL_DEBUG_TX_REPLY(il, "TID = %d, SeqCtl = %d, bitmap = 0x%llx," D_TX_REPLY("TID = %d, SeqCtl = %d, bitmap = 0x%llx,"
"scd_flow = " "scd_flow = "
"%d, scd_ssn = %d\n", "%d, scd_ssn = %d\n",
ba_resp->tid, ba_resp->tid,
...@@ -1306,7 +1306,7 @@ void il4965_rx_reply_compressed_ba(struct il_priv *il, ...@@ -1306,7 +1306,7 @@ void il4965_rx_reply_compressed_ba(struct il_priv *il,
(unsigned long long)le64_to_cpu(ba_resp->bitmap), (unsigned long long)le64_to_cpu(ba_resp->bitmap),
ba_resp->scd_flow, ba_resp->scd_flow,
ba_resp->scd_ssn); ba_resp->scd_ssn);
IL_DEBUG_TX_REPLY(il, "DAT start_idx = %d, bitmap = 0x%llx\n", D_TX_REPLY("DAT start_idx = %d, bitmap = 0x%llx\n",
agg->start_idx, agg->start_idx,
(unsigned long long)agg->bitmap); (unsigned long long)agg->bitmap);
......
...@@ -55,7 +55,7 @@ il4965_verify_inst_sparse(struct il_priv *il, __le32 *image, u32 len) ...@@ -55,7 +55,7 @@ il4965_verify_inst_sparse(struct il_priv *il, __le32 *image, u32 len)
u32 errcnt = 0; u32 errcnt = 0;
u32 i; u32 i;
IL_DEBUG_INFO(il, "ucode inst image size is %u\n", len); D_INFO("ucode inst image size is %u\n", len);
for (i = 0; i < len; i += 100, image += 100/sizeof(u32)) { for (i = 0; i < len; i += 100, image += 100/sizeof(u32)) {
/* read data comes through single port, auto-incr addr */ /* read data comes through single port, auto-incr addr */
...@@ -87,7 +87,7 @@ static int il4965_verify_inst_full(struct il_priv *il, __le32 *image, ...@@ -87,7 +87,7 @@ static int il4965_verify_inst_full(struct il_priv *il, __le32 *image,
int ret = 0; int ret = 0;
u32 errcnt; u32 errcnt;
IL_DEBUG_INFO(il, "ucode inst image size is %u\n", len); D_INFO("ucode inst image size is %u\n", len);
il_write_direct32(il, HBUS_TARG_MEM_RADDR, il_write_direct32(il, HBUS_TARG_MEM_RADDR,
IWL4965_RTC_INST_LOWER_BOUND); IWL4965_RTC_INST_LOWER_BOUND);
...@@ -110,7 +110,7 @@ static int il4965_verify_inst_full(struct il_priv *il, __le32 *image, ...@@ -110,7 +110,7 @@ static int il4965_verify_inst_full(struct il_priv *il, __le32 *image,
} }
if (!errcnt) if (!errcnt)
IL_DEBUG_INFO(il, D_INFO(
"ucode image in INSTRUCTION memory is good\n"); "ucode image in INSTRUCTION memory is good\n");
return ret; return ret;
...@@ -131,7 +131,7 @@ int il4965_verify_ucode(struct il_priv *il) ...@@ -131,7 +131,7 @@ int il4965_verify_ucode(struct il_priv *il)
len = il->ucode_boot.len; len = il->ucode_boot.len;
ret = il4965_verify_inst_sparse(il, image, len); ret = il4965_verify_inst_sparse(il, image, len);
if (!ret) { if (!ret) {
IL_DEBUG_INFO(il, "Bootstrap uCode is good in inst SRAM\n"); D_INFO("Bootstrap uCode is good in inst SRAM\n");
return 0; return 0;
} }
...@@ -140,7 +140,7 @@ int il4965_verify_ucode(struct il_priv *il) ...@@ -140,7 +140,7 @@ int il4965_verify_ucode(struct il_priv *il)
len = il->ucode_init.len; len = il->ucode_init.len;
ret = il4965_verify_inst_sparse(il, image, len); ret = il4965_verify_inst_sparse(il, image, len);
if (!ret) { if (!ret) {
IL_DEBUG_INFO(il, "Initialize uCode is good in inst SRAM\n"); D_INFO("Initialize uCode is good in inst SRAM\n");
return 0; return 0;
} }
...@@ -149,7 +149,7 @@ int il4965_verify_ucode(struct il_priv *il) ...@@ -149,7 +149,7 @@ int il4965_verify_ucode(struct il_priv *il)
len = il->ucode_code.len; len = il->ucode_code.len;
ret = il4965_verify_inst_sparse(il, image, len); ret = il4965_verify_inst_sparse(il, image, len);
if (!ret) { if (!ret) {
IL_DEBUG_INFO(il, "Runtime uCode is good in inst SRAM\n"); D_INFO("Runtime uCode is good in inst SRAM\n");
return 0; return 0;
} }
......
This diff is collapsed.
This diff is collapsed.
...@@ -44,10 +44,10 @@ do { \ ...@@ -44,10 +44,10 @@ do { \
} while (0) } while (0)
#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG #ifdef CONFIG_IWLWIFI_LEGACY_DEBUG
#define IL_DEBUG(__priv, level, fmt, args...) \ #define IL_DBG(level, fmt, args...) \
do { \ do { \
if (il_get_debug_level(__priv) & (level)) \ if (il_get_debug_level(il) & level) \
dev_printk(KERN_ERR, &(__priv->hw->wiphy->dev), \ dev_printk(KERN_ERR, &il->hw->wiphy->dev, \
"%c %s " fmt, in_interrupt() ? 'I' : 'U', \ "%c %s " fmt, in_interrupt() ? 'I' : 'U', \
__func__ , ## args); \ __func__ , ## args); \
} while (0) } while (0)
...@@ -60,7 +60,7 @@ do { \ ...@@ -60,7 +60,7 @@ do { \
} while (0) } while (0)
#else #else
#define IL_DEBUG(__priv, level, fmt, args...) #define IL_DBG(level, fmt, args...)
static inline void il_print_hex_dump(struct il_priv *il, int level, static inline void il_print_hex_dump(struct il_priv *il, int level,
const void *p, u32 len) const void *p, u32 len)
{} {}
...@@ -91,12 +91,12 @@ static inline void il_dbgfs_unregister(struct il_priv *il) ...@@ -91,12 +91,12 @@ static inline void il_dbgfs_unregister(struct il_priv *il)
* where xxxx should be the name of the classification (for example, WEP). * where xxxx should be the name of the classification (for example, WEP).
* *
* You then need to either add a IL_xxxx_DEBUG() macro definition for your * You then need to either add a IL_xxxx_DEBUG() macro definition for your
* classification, or use IL_DEBUG(IL_DL_xxxx, ...) whenever you want * classification, or use IL_DBG(IL_DL_xxxx, ...) whenever you want
* to send output to that classification. * to send output to that classification.
* *
* The active debug levels can be accessed via files * The active debug levels can be accessed via files
* *
* /sys/module/iwl4965/parameters/debug{50} * /sys/module/iwl4965/parameters/debug
* /sys/module/iwl3945/parameters/debug * /sys/module/iwl3945/parameters/debug
* /sys/class/net/wlan0/device/debug_level * /sys/class/net/wlan0/device/debug_level
* *
...@@ -143,34 +143,34 @@ static inline void il_dbgfs_unregister(struct il_priv *il) ...@@ -143,34 +143,34 @@ static inline void il_dbgfs_unregister(struct il_priv *il)
#define IL_DL_TX_REPLY (1 << 30) #define IL_DL_TX_REPLY (1 << 30)
#define IL_DL_QOS (1 << 31) #define IL_DL_QOS (1 << 31)
#define IL_DEBUG_INFO(p, f, a...) IL_DEBUG(p, IL_DL_INFO, f, ## a) #define D_INFO(f, a...) IL_DBG(IL_DL_INFO, f, ## a)
#define IL_DEBUG_MAC80211(p, f, a...) IL_DEBUG(p, IL_DL_MAC80211, f, ## a) #define D_MAC80211(f, a...) IL_DBG(IL_DL_MAC80211, f, ## a)
#define IL_DEBUG_MACDUMP(p, f, a...) IL_DEBUG(p, IL_DL_MACDUMP, f, ## a) #define D_MACDUMP(f, a...) IL_DBG(IL_DL_MACDUMP, f, ## a)
#define IL_DEBUG_TEMP(p, f, a...) IL_DEBUG(p, IL_DL_TEMP, f, ## a) #define D_TEMP(f, a...) IL_DBG(IL_DL_TEMP, f, ## a)
#define IL_DEBUG_SCAN(p, f, a...) IL_DEBUG(p, IL_DL_SCAN, f, ## a) #define D_SCAN(f, a...) IL_DBG(IL_DL_SCAN, f, ## a)
#define IL_DEBUG_RX(p, f, a...) IL_DEBUG(p, IL_DL_RX, f, ## a) #define D_RX(f, a...) IL_DBG(IL_DL_RX, f, ## a)
#define IL_DEBUG_TX(p, f, a...) IL_DEBUG(p, IL_DL_TX, f, ## a) #define D_TX(f, a...) IL_DBG(IL_DL_TX, f, ## a)
#define IL_DEBUG_ISR(p, f, a...) IL_DEBUG(p, IL_DL_ISR, f, ## a) #define D_ISR(f, a...) IL_DBG(IL_DL_ISR, f, ## a)
#define IL_DEBUG_LED(p, f, a...) IL_DEBUG(p, IL_DL_LED, f, ## a) #define D_LED(f, a...) IL_DBG(IL_DL_LED, f, ## a)
#define IL_DEBUG_WEP(p, f, a...) IL_DEBUG(p, IL_DL_WEP, f, ## a) #define D_WEP(f, a...) IL_DBG(IL_DL_WEP, f, ## a)
#define IL_DEBUG_HC(p, f, a...) IL_DEBUG(p, IL_DL_HCMD, f, ## a) #define D_HC(f, a...) IL_DBG(IL_DL_HCMD, f, ## a)
#define IL_DEBUG_HC_DUMP(p, f, a...) IL_DEBUG(p, IL_DL_HCMD_DUMP, f, ## a) #define D_HC_DUMP(f, a...) IL_DBG(IL_DL_HCMD_DUMP, f, ## a)
#define IL_DEBUG_EEPROM(p, f, a...) IL_DEBUG(p, IL_DL_EEPROM, f, ## a) #define D_EEPROM(f, a...) IL_DBG(IL_DL_EEPROM, f, ## a)
#define IL_DEBUG_CALIB(p, f, a...) IL_DEBUG(p, IL_DL_CALIB, f, ## a) #define D_CALIB(f, a...) IL_DBG(IL_DL_CALIB, f, ## a)
#define IL_DEBUG_FW(p, f, a...) IL_DEBUG(p, IL_DL_FW, f, ## a) #define D_FW(f, a...) IL_DBG(IL_DL_FW, f, ## a)
#define IL_DEBUG_RF_KILL(p, f, a...) IL_DEBUG(p, IL_DL_RF_KILL, f, ## a) #define D_RF_KILL(f, a...) IL_DBG(IL_DL_RF_KILL, f, ## a)
#define IL_DEBUG_DROP(p, f, a...) IL_DEBUG(p, IL_DL_DROP, f, ## a) #define D_DROP(f, a...) IL_DBG(IL_DL_DROP, f, ## a)
#define IL_DEBUG_AP(p, f, a...) IL_DEBUG(p, IL_DL_AP, f, ## a) #define D_AP(f, a...) IL_DBG(IL_DL_AP, f, ## a)
#define IL_DEBUG_TXPOWER(p, f, a...) IL_DEBUG(p, IL_DL_TXPOWER, f, ## a) #define D_TXPOWER(f, a...) IL_DBG(IL_DL_TXPOWER, f, ## a)
#define IL_DEBUG_RATE(p, f, a...) IL_DEBUG(p, IL_DL_RATE, f, ## a) #define D_RATE(f, a...) IL_DBG(IL_DL_RATE, f, ## a)
#define IL_DEBUG_NOTIF(p, f, a...) IL_DEBUG(p, IL_DL_NOTIF, f, ## a) #define D_NOTIF(f, a...) IL_DBG(IL_DL_NOTIF, f, ## a)
#define IL_DEBUG_ASSOC(p, f, a...) IL_DEBUG(p, IL_DL_ASSOC, f, ## a) #define D_ASSOC(f, a...) IL_DBG(IL_DL_ASSOC, f, ## a)
#define IL_DEBUG_HT(p, f, a...) IL_DEBUG(p, IL_DL_HT, f, ## a) #define D_HT(f, a...) IL_DBG(IL_DL_HT, f, ## a)
#define IL_DEBUG_STATS(p, f, a...) IL_DEBUG(p, IL_DL_STATS, f, ## a) #define D_STATS(f, a...) IL_DBG(IL_DL_STATS, f, ## a)
#define IL_DEBUG_TX_REPLY(p, f, a...) IL_DEBUG(p, IL_DL_TX_REPLY, f, ## a) #define D_TX_REPLY(f, a...) IL_DBG(IL_DL_TX_REPLY, f, ## a)
#define IL_DEBUG_QOS(p, f, a...) IL_DEBUG(p, IL_DL_QOS, f, ## a) #define D_QOS(f, a...) IL_DBG(IL_DL_QOS, f, ## a)
#define IL_DEBUG_RADIO(p, f, a...) IL_DEBUG(p, IL_DL_RADIO, f, ## a) #define D_RADIO(f, a...) IL_DBG(IL_DL_RADIO, f, ## a)
#define IL_DEBUG_POWER(p, f, a...) IL_DEBUG(p, IL_DL_POWER, f, ## a) #define D_POWER(f, a...) IL_DBG(IL_DL_POWER, f, ## a)
#define IL_DEBUG_11H(p, f, a...) IL_DEBUG(p, IL_DL_11H, f, ## a) #define D_11H(f, a...) IL_DBG(IL_DL_11H, f, ## a)
#endif #endif
...@@ -147,7 +147,7 @@ static int il_eeprom_verify_signature(struct il_priv *il) ...@@ -147,7 +147,7 @@ static int il_eeprom_verify_signature(struct il_priv *il)
u32 gp = il_read32(il, CSR_EEPROM_GP) & CSR_EEPROM_GP_VALID_MSK; u32 gp = il_read32(il, CSR_EEPROM_GP) & CSR_EEPROM_GP_VALID_MSK;
int ret = 0; int ret = 0;
IL_DEBUG_EEPROM(il, "EEPROM signature=0x%08x\n", gp); D_EEPROM("EEPROM signature=0x%08x\n", gp);
switch (gp) { switch (gp) {
case CSR_EEPROM_GP_GOOD_SIG_EEP_LESS_THAN_4K: case CSR_EEPROM_GP_GOOD_SIG_EEP_LESS_THAN_4K:
case CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K: case CSR_EEPROM_GP_GOOD_SIG_EEP_MORE_THAN_4K:
...@@ -194,7 +194,7 @@ int il_eeprom_init(struct il_priv *il) ...@@ -194,7 +194,7 @@ int il_eeprom_init(struct il_priv *il)
/* allocate eeprom */ /* allocate eeprom */
sz = il->cfg->base_params->eeprom_size; sz = il->cfg->base_params->eeprom_size;
IL_DEBUG_EEPROM(il, "NVM size = %d\n", sz); D_EEPROM("NVM size = %d\n", sz);
il->eeprom = kzalloc(sz, GFP_KERNEL); il->eeprom = kzalloc(sz, GFP_KERNEL);
if (!il->eeprom) { if (!il->eeprom) {
ret = -ENOMEM; ret = -ENOMEM;
...@@ -239,7 +239,7 @@ int il_eeprom_init(struct il_priv *il) ...@@ -239,7 +239,7 @@ int il_eeprom_init(struct il_priv *il)
e[addr / 2] = cpu_to_le16(r >> 16); e[addr / 2] = cpu_to_le16(r >> 16);
} }
IL_DEBUG_EEPROM(il, "NVM Type: %s, version: 0x%x\n", D_EEPROM("NVM Type: %s, version: 0x%x\n",
"EEPROM", "EEPROM",
il_eeprom_query16(il, EEPROM_VERSION)); il_eeprom_query16(il, EEPROM_VERSION));
...@@ -339,7 +339,7 @@ static int il_mod_ht40_chan_info(struct il_priv *il, ...@@ -339,7 +339,7 @@ static int il_mod_ht40_chan_info(struct il_priv *il,
if (!il_is_channel_valid(ch_info)) if (!il_is_channel_valid(ch_info))
return -1; return -1;
IL_DEBUG_EEPROM(il, "HT40 Ch. %d [%sGHz] %s%s%s%s%s(0x%02x %ddBm):" D_EEPROM("HT40 Ch. %d [%sGHz] %s%s%s%s%s(0x%02x %ddBm):"
" Ad-Hoc %ssupported\n", " Ad-Hoc %ssupported\n",
ch_info->channel, ch_info->channel,
il_is_channel_a_band(ch_info) ? il_is_channel_a_band(ch_info) ?
...@@ -380,11 +380,11 @@ int il_init_channel_map(struct il_priv *il) ...@@ -380,11 +380,11 @@ int il_init_channel_map(struct il_priv *il)
struct il_channel_info *ch_info; struct il_channel_info *ch_info;
if (il->channel_count) { if (il->channel_count) {
IL_DEBUG_EEPROM(il, "Channel map already initialized.\n"); D_EEPROM("Channel map already initialized.\n");
return 0; return 0;
} }
IL_DEBUG_EEPROM(il, "Initializing regulatory info from EEPROM\n"); D_EEPROM("Initializing regulatory info from EEPROM\n");
il->channel_count = il->channel_count =
ARRAY_SIZE(il_eeprom_band_1) + ARRAY_SIZE(il_eeprom_band_1) +
...@@ -393,7 +393,7 @@ int il_init_channel_map(struct il_priv *il) ...@@ -393,7 +393,7 @@ int il_init_channel_map(struct il_priv *il)
ARRAY_SIZE(il_eeprom_band_4) + ARRAY_SIZE(il_eeprom_band_4) +
ARRAY_SIZE(il_eeprom_band_5); ARRAY_SIZE(il_eeprom_band_5);
IL_DEBUG_EEPROM(il, "Parsing data for %d channels.\n", D_EEPROM("Parsing data for %d channels.\n",
il->channel_count); il->channel_count);
il->channel_info = kzalloc(sizeof(struct il_channel_info) * il->channel_info = kzalloc(sizeof(struct il_channel_info) *
...@@ -433,7 +433,7 @@ int il_init_channel_map(struct il_priv *il) ...@@ -433,7 +433,7 @@ int il_init_channel_map(struct il_priv *il)
IEEE80211_CHAN_NO_HT40; IEEE80211_CHAN_NO_HT40;
if (!(il_is_channel_valid(ch_info))) { if (!(il_is_channel_valid(ch_info))) {
IL_DEBUG_EEPROM(il, D_EEPROM(
"Ch. %d Flags %x [%sGHz] - " "Ch. %d Flags %x [%sGHz] - "
"No traffic\n", "No traffic\n",
ch_info->channel, ch_info->channel,
...@@ -450,7 +450,7 @@ int il_init_channel_map(struct il_priv *il) ...@@ -450,7 +450,7 @@ int il_init_channel_map(struct il_priv *il)
ch_info->scan_power = eeprom_ch_info[ch].max_power_avg; ch_info->scan_power = eeprom_ch_info[ch].max_power_avg;
ch_info->min_power = 0; ch_info->min_power = 0;
IL_DEBUG_EEPROM(il, "Ch. %d [%sGHz] " D_EEPROM("Ch. %d [%sGHz] "
"%s%s%s%s%s%s(0x%02x %ddBm):" "%s%s%s%s%s%s(0x%02x %ddBm):"
" Ad-Hoc %ssupported\n", " Ad-Hoc %ssupported\n",
ch_info->channel, ch_info->channel,
......
...@@ -104,11 +104,11 @@ static void il_generic_cmd_callback(struct il_priv *il, ...@@ -104,11 +104,11 @@ static void il_generic_cmd_callback(struct il_priv *il,
switch (cmd->hdr.cmd) { switch (cmd->hdr.cmd) {
case REPLY_TX_LINK_QUALITY_CMD: case REPLY_TX_LINK_QUALITY_CMD:
case SENSITIVITY_CMD: case SENSITIVITY_CMD:
IL_DEBUG_HC_DUMP(il, "back from %s (0x%08X)\n", D_HC_DUMP("back from %s (0x%08X)\n",
il_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags); il_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
break; break;
default: default:
IL_DEBUG_HC(il, "back from %s (0x%08X)\n", D_HC("back from %s (0x%08X)\n",
il_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags); il_get_cmd_string(cmd->hdr.cmd), pkt->hdr.flags);
} }
#endif #endif
...@@ -152,11 +152,11 @@ int il_send_cmd_sync(struct il_priv *il, struct il_host_cmd *cmd) ...@@ -152,11 +152,11 @@ int il_send_cmd_sync(struct il_priv *il, struct il_host_cmd *cmd)
/* A synchronous command can not have a callback set. */ /* A synchronous command can not have a callback set. */
BUG_ON(cmd->callback); BUG_ON(cmd->callback);
IL_DEBUG_INFO(il, "Attempting to send sync command %s\n", D_INFO("Attempting to send sync command %s\n",
il_get_cmd_string(cmd->id)); il_get_cmd_string(cmd->id));
set_bit(STATUS_HCMD_ACTIVE, &il->status); set_bit(STATUS_HCMD_ACTIVE, &il->status);
IL_DEBUG_INFO(il, "Setting HCMD_ACTIVE for command %s\n", D_INFO("Setting HCMD_ACTIVE for command %s\n",
il_get_cmd_string(cmd->id)); il_get_cmd_string(cmd->id));
cmd_idx = il_enqueue_hcmd(il, cmd); cmd_idx = il_enqueue_hcmd(il, cmd);
...@@ -178,7 +178,7 @@ int il_send_cmd_sync(struct il_priv *il, struct il_host_cmd *cmd) ...@@ -178,7 +178,7 @@ int il_send_cmd_sync(struct il_priv *il, struct il_host_cmd *cmd)
jiffies_to_msecs(HOST_COMPLETE_TIMEOUT)); jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
clear_bit(STATUS_HCMD_ACTIVE, &il->status); clear_bit(STATUS_HCMD_ACTIVE, &il->status);
IL_DEBUG_INFO(il, D_INFO(
"Clearing HCMD_ACTIVE for command %s\n", "Clearing HCMD_ACTIVE for command %s\n",
il_get_cmd_string(cmd->id)); il_get_cmd_string(cmd->id));
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
......
...@@ -155,18 +155,18 @@ static inline void il_disable_interrupts(struct il_priv *il) ...@@ -155,18 +155,18 @@ static inline void il_disable_interrupts(struct il_priv *il)
* from uCode or flow handler (Rx/Tx DMA) */ * from uCode or flow handler (Rx/Tx DMA) */
il_write32(il, CSR_INT, 0xffffffff); il_write32(il, CSR_INT, 0xffffffff);
il_write32(il, CSR_FH_INT_STATUS, 0xffffffff); il_write32(il, CSR_FH_INT_STATUS, 0xffffffff);
IL_DEBUG_ISR(il, "Disabled interrupts\n"); D_ISR("Disabled interrupts\n");
} }
static inline void il_enable_rfkill_int(struct il_priv *il) static inline void il_enable_rfkill_int(struct il_priv *il)
{ {
IL_DEBUG_ISR(il, "Enabling rfkill interrupt\n"); D_ISR("Enabling rfkill interrupt\n");
il_write32(il, CSR_INT_MASK, CSR_INT_BIT_RF_KILL); il_write32(il, CSR_INT_MASK, CSR_INT_BIT_RF_KILL);
} }
static inline void il_enable_interrupts(struct il_priv *il) static inline void il_enable_interrupts(struct il_priv *il)
{ {
IL_DEBUG_ISR(il, "Enabling interrupts\n"); D_ISR("Enabling interrupts\n");
set_bit(STATUS_INT_ENABLED, &il->status); set_bit(STATUS_INT_ENABLED, &il->status);
il_write32(il, CSR_INT_MASK, il->inta_mask); il_write32(il, CSR_INT_MASK, il->inta_mask);
} }
......
...@@ -118,7 +118,7 @@ static int il_led_cmd(struct il_priv *il, ...@@ -118,7 +118,7 @@ static int il_led_cmd(struct il_priv *il,
on = IL_LED_SOLID; on = IL_LED_SOLID;
} }
IL_DEBUG_LED(il, "Led blink time compensation=%u\n", D_LED("Led blink time compensation=%u\n",
il->cfg->base_params->led_compensation); il->cfg->base_params->led_compensation);
led_cmd.on = il_blink_compensation(il, on, led_cmd.on = il_blink_compensation(il, on,
il->cfg->base_params->led_compensation); il->cfg->base_params->led_compensation);
......
...@@ -68,19 +68,19 @@ static void il_power_sleep_cam_cmd(struct il_priv *il, ...@@ -68,19 +68,19 @@ static void il_power_sleep_cam_cmd(struct il_priv *il,
if (il->power_data.pci_pm) if (il->power_data.pci_pm)
cmd->flags |= IL_POWER_PCI_PM_MSK; cmd->flags |= IL_POWER_PCI_PM_MSK;
IL_DEBUG_POWER(il, "Sleep command for CAM\n"); D_POWER("Sleep command for CAM\n");
} }
static int static int
il_set_power(struct il_priv *il, struct il_powertable_cmd *cmd) il_set_power(struct il_priv *il, struct il_powertable_cmd *cmd)
{ {
IL_DEBUG_POWER(il, "Sending power/sleep command\n"); D_POWER("Sending power/sleep command\n");
IL_DEBUG_POWER(il, "Flags value = 0x%08X\n", cmd->flags); D_POWER("Flags value = 0x%08X\n", cmd->flags);
IL_DEBUG_POWER(il, "Tx timeout = %u\n", D_POWER("Tx timeout = %u\n",
le32_to_cpu(cmd->tx_data_timeout)); le32_to_cpu(cmd->tx_data_timeout));
IL_DEBUG_POWER(il, "Rx timeout = %u\n", D_POWER("Rx timeout = %u\n",
le32_to_cpu(cmd->rx_data_timeout)); le32_to_cpu(cmd->rx_data_timeout));
IL_DEBUG_POWER(il, D_POWER(
"Sleep interval vector = { %d , %d , %d , %d , %d }\n", "Sleep interval vector = { %d , %d , %d , %d , %d }\n",
le32_to_cpu(cmd->sleep_interval[0]), le32_to_cpu(cmd->sleep_interval[0]),
le32_to_cpu(cmd->sleep_interval[1]), le32_to_cpu(cmd->sleep_interval[1]),
...@@ -114,7 +114,7 @@ il_power_set_mode(struct il_priv *il, struct il_powertable_cmd *cmd, ...@@ -114,7 +114,7 @@ il_power_set_mode(struct il_priv *il, struct il_powertable_cmd *cmd,
/* scan complete use sleep_power_next, need to be updated */ /* scan complete use sleep_power_next, need to be updated */
memcpy(&il->power_data.sleep_cmd_next, cmd, sizeof(*cmd)); memcpy(&il->power_data.sleep_cmd_next, cmd, sizeof(*cmd));
if (test_bit(STATUS_SCANNING, &il->status) && !force) { if (test_bit(STATUS_SCANNING, &il->status) && !force) {
IL_DEBUG_INFO(il, "Defer power set mode while scanning\n"); D_INFO("Defer power set mode while scanning\n");
return 0; return 0;
} }
...@@ -129,7 +129,7 @@ il_power_set_mode(struct il_priv *il, struct il_powertable_cmd *cmd, ...@@ -129,7 +129,7 @@ il_power_set_mode(struct il_priv *il, struct il_powertable_cmd *cmd,
if (il->cfg->ops->lib->update_chain_flags && update_chains) if (il->cfg->ops->lib->update_chain_flags && update_chains)
il->cfg->ops->lib->update_chain_flags(il); il->cfg->ops->lib->update_chain_flags(il);
else if (il->cfg->ops->lib->update_chain_flags) else if (il->cfg->ops->lib->update_chain_flags)
IL_DEBUG_POWER(il, D_POWER(
"Cannot update the power, chain noise " "Cannot update the power, chain noise "
"calibration running: %d\n", "calibration running: %d\n",
il->chain_noise_data.state); il->chain_noise_data.state);
......
...@@ -141,7 +141,7 @@ il_rx_queue_update_write_ptr(struct il_priv *il, ...@@ -141,7 +141,7 @@ il_rx_queue_update_write_ptr(struct il_priv *il,
reg = il_read32(il, CSR_UCODE_DRV_GP1); reg = il_read32(il, CSR_UCODE_DRV_GP1);
if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) { if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {
IL_DEBUG_INFO(il, D_INFO(
"Rx queue requesting wakeup," "Rx queue requesting wakeup,"
" GP1 = 0x%x\n", reg); " GP1 = 0x%x\n", reg);
il_set_bit(il, CSR_GP_CNTRL, il_set_bit(il, CSR_GP_CNTRL,
...@@ -217,7 +217,7 @@ void il_rx_spectrum_measure_notif(struct il_priv *il, ...@@ -217,7 +217,7 @@ void il_rx_spectrum_measure_notif(struct il_priv *il,
struct il_spectrum_notification *report = &(pkt->u.spectrum_notif); struct il_spectrum_notification *report = &(pkt->u.spectrum_notif);
if (!report->state) { if (!report->state) {
IL_DEBUG_11H(il, D_11H(
"Spectrum Measure Notification: Start\n"); "Spectrum Measure Notification: Start\n");
return; return;
} }
...@@ -248,7 +248,7 @@ int il_set_decrypted_flag(struct il_priv *il, ...@@ -248,7 +248,7 @@ int il_set_decrypted_flag(struct il_priv *il,
if (!(fc & IEEE80211_FCTL_PROTECTED)) if (!(fc & IEEE80211_FCTL_PROTECTED))
return 0; return 0;
IL_DEBUG_RX(il, "decrypt_res:0x%x\n", decrypt_res); D_RX("decrypt_res:0x%x\n", decrypt_res);
switch (decrypt_res & RX_RES_STATUS_SEC_TYPE_MSK) { switch (decrypt_res & RX_RES_STATUS_SEC_TYPE_MSK) {
case RX_RES_STATUS_SEC_TYPE_TKIP: case RX_RES_STATUS_SEC_TYPE_TKIP:
/* The uCode has got a bad phase 1 Key, pushes the packet. /* The uCode has got a bad phase 1 Key, pushes the packet.
...@@ -262,13 +262,13 @@ int il_set_decrypted_flag(struct il_priv *il, ...@@ -262,13 +262,13 @@ int il_set_decrypted_flag(struct il_priv *il,
RX_RES_STATUS_BAD_ICV_MIC) { RX_RES_STATUS_BAD_ICV_MIC) {
/* bad ICV, the packet is destroyed since the /* bad ICV, the packet is destroyed since the
* decryption is inplace, drop it */ * decryption is inplace, drop it */
IL_DEBUG_RX(il, "Packet destroyed\n"); D_RX("Packet destroyed\n");
return -1; return -1;
} }
case RX_RES_STATUS_SEC_TYPE_CCMP: case RX_RES_STATUS_SEC_TYPE_CCMP:
if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) == if ((decrypt_res & RX_RES_STATUS_DECRYPT_TYPE_MSK) ==
RX_RES_STATUS_DECRYPT_OK) { RX_RES_STATUS_DECRYPT_OK) {
IL_DEBUG_RX(il, "hw decrypt successfully!!!\n"); D_RX("hw decrypt successfully!!!\n");
stats->flag |= RX_FLAG_DECRYPTED; stats->flag |= RX_FLAG_DECRYPTED;
} }
break; break;
......
...@@ -85,7 +85,7 @@ static int il_send_scan_abort(struct il_priv *il) ...@@ -85,7 +85,7 @@ static int il_send_scan_abort(struct il_priv *il)
* can occur if we send the scan abort before we * can occur if we send the scan abort before we
* the microcode has notified us that a scan is * the microcode has notified us that a scan is
* completed. */ * completed. */
IL_DEBUG_SCAN(il, "SCAN_ABORT ret %d.\n", pkt->u.status); D_SCAN("SCAN_ABORT ret %d.\n", pkt->u.status);
ret = -EIO; ret = -EIO;
} }
...@@ -97,7 +97,7 @@ static void il_complete_scan(struct il_priv *il, bool aborted) ...@@ -97,7 +97,7 @@ static void il_complete_scan(struct il_priv *il, bool aborted)
{ {
/* check if scan was requested from mac80211 */ /* check if scan was requested from mac80211 */
if (il->scan_request) { if (il->scan_request) {
IL_DEBUG_SCAN(il, "Complete scan in mac80211\n"); D_SCAN("Complete scan in mac80211\n");
ieee80211_scan_completed(il->hw, aborted); ieee80211_scan_completed(il->hw, aborted);
} }
...@@ -110,11 +110,11 @@ void il_force_scan_end(struct il_priv *il) ...@@ -110,11 +110,11 @@ void il_force_scan_end(struct il_priv *il)
lockdep_assert_held(&il->mutex); lockdep_assert_held(&il->mutex);
if (!test_bit(STATUS_SCANNING, &il->status)) { if (!test_bit(STATUS_SCANNING, &il->status)) {
IL_DEBUG_SCAN(il, "Forcing scan end while not scanning\n"); D_SCAN("Forcing scan end while not scanning\n");
return; return;
} }
IL_DEBUG_SCAN(il, "Forcing scan end\n"); D_SCAN("Forcing scan end\n");
clear_bit(STATUS_SCANNING, &il->status); clear_bit(STATUS_SCANNING, &il->status);
clear_bit(STATUS_SCAN_HW, &il->status); clear_bit(STATUS_SCAN_HW, &il->status);
clear_bit(STATUS_SCAN_ABORTING, &il->status); clear_bit(STATUS_SCAN_ABORTING, &il->status);
...@@ -128,21 +128,21 @@ static void il_do_scan_abort(struct il_priv *il) ...@@ -128,21 +128,21 @@ static void il_do_scan_abort(struct il_priv *il)
lockdep_assert_held(&il->mutex); lockdep_assert_held(&il->mutex);
if (!test_bit(STATUS_SCANNING, &il->status)) { if (!test_bit(STATUS_SCANNING, &il->status)) {
IL_DEBUG_SCAN(il, "Not performing scan to abort\n"); D_SCAN("Not performing scan to abort\n");
return; return;
} }
if (test_and_set_bit(STATUS_SCAN_ABORTING, &il->status)) { if (test_and_set_bit(STATUS_SCAN_ABORTING, &il->status)) {
IL_DEBUG_SCAN(il, "Scan abort in progress\n"); D_SCAN("Scan abort in progress\n");
return; return;
} }
ret = il_send_scan_abort(il); ret = il_send_scan_abort(il);
if (ret) { if (ret) {
IL_DEBUG_SCAN(il, "Send scan abort failed %d\n", ret); D_SCAN("Send scan abort failed %d\n", ret);
il_force_scan_end(il); il_force_scan_end(il);
} else } else
IL_DEBUG_SCAN(il, "Successfully send scan abort\n"); D_SCAN("Successfully send scan abort\n");
} }
/** /**
...@@ -150,7 +150,7 @@ static void il_do_scan_abort(struct il_priv *il) ...@@ -150,7 +150,7 @@ static void il_do_scan_abort(struct il_priv *il)
*/ */
int il_scan_cancel(struct il_priv *il) int il_scan_cancel(struct il_priv *il)
{ {
IL_DEBUG_SCAN(il, "Queuing abort scan\n"); D_SCAN("Queuing abort scan\n");
queue_work(il->workqueue, &il->abort_scan); queue_work(il->workqueue, &il->abort_scan);
return 0; return 0;
} }
...@@ -167,7 +167,7 @@ int il_scan_cancel_timeout(struct il_priv *il, unsigned long ms) ...@@ -167,7 +167,7 @@ int il_scan_cancel_timeout(struct il_priv *il, unsigned long ms)
lockdep_assert_held(&il->mutex); lockdep_assert_held(&il->mutex);
IL_DEBUG_SCAN(il, "Scan cancel timeout\n"); D_SCAN("Scan cancel timeout\n");
il_do_scan_abort(il); il_do_scan_abort(il);
...@@ -190,7 +190,7 @@ static void il_rx_reply_scan(struct il_priv *il, ...@@ -190,7 +190,7 @@ static void il_rx_reply_scan(struct il_priv *il,
struct il_scanreq_notification *notif = struct il_scanreq_notification *notif =
(struct il_scanreq_notification *)pkt->u.raw; (struct il_scanreq_notification *)pkt->u.raw;
IL_DEBUG_SCAN(il, "Scan request status = 0x%x\n", notif->status); D_SCAN("Scan request status = 0x%x\n", notif->status);
#endif #endif
} }
...@@ -202,7 +202,7 @@ static void il_rx_scan_start_notif(struct il_priv *il, ...@@ -202,7 +202,7 @@ static void il_rx_scan_start_notif(struct il_priv *il,
struct il_scanstart_notification *notif = struct il_scanstart_notification *notif =
(struct il_scanstart_notification *)pkt->u.raw; (struct il_scanstart_notification *)pkt->u.raw;
il->scan_start_tsf = le32_to_cpu(notif->tsf_low); il->scan_start_tsf = le32_to_cpu(notif->tsf_low);
IL_DEBUG_SCAN(il, "Scan start: " D_SCAN("Scan start: "
"%d [802.11%s] " "%d [802.11%s] "
"(TSF: 0x%08X:%08X) - %d (beacon timer %u)\n", "(TSF: 0x%08X:%08X) - %d (beacon timer %u)\n",
notif->channel, notif->channel,
...@@ -221,7 +221,7 @@ static void il_rx_scan_results_notif(struct il_priv *il, ...@@ -221,7 +221,7 @@ static void il_rx_scan_results_notif(struct il_priv *il,
struct il_scanresults_notification *notif = struct il_scanresults_notification *notif =
(struct il_scanresults_notification *)pkt->u.raw; (struct il_scanresults_notification *)pkt->u.raw;
IL_DEBUG_SCAN(il, "Scan ch.res: " D_SCAN("Scan ch.res: "
"%d [802.11%s] " "%d [802.11%s] "
"(TSF: 0x%08X:%08X) - %d " "(TSF: 0x%08X:%08X) - %d "
"elapsed=%lu usec\n", "elapsed=%lu usec\n",
...@@ -244,7 +244,7 @@ static void il_rx_scan_complete_notif(struct il_priv *il, ...@@ -244,7 +244,7 @@ static void il_rx_scan_complete_notif(struct il_priv *il,
struct il_scancomplete_notification *scan_notif = (void *)pkt->u.raw; struct il_scancomplete_notification *scan_notif = (void *)pkt->u.raw;
#endif #endif
IL_DEBUG_SCAN(il, D_SCAN(
"Scan complete: %d channels (TSF 0x%08X:%08X) - %d\n", "Scan complete: %d channels (TSF 0x%08X:%08X) - %d\n",
scan_notif->scanned_channels, scan_notif->scanned_channels,
scan_notif->tsf_low, scan_notif->tsf_low,
...@@ -253,7 +253,7 @@ static void il_rx_scan_complete_notif(struct il_priv *il, ...@@ -253,7 +253,7 @@ static void il_rx_scan_complete_notif(struct il_priv *il,
/* The HW is no longer scanning */ /* The HW is no longer scanning */
clear_bit(STATUS_SCAN_HW, &il->status); clear_bit(STATUS_SCAN_HW, &il->status);
IL_DEBUG_SCAN(il, "Scan on %sGHz took %dms\n", D_SCAN("Scan on %sGHz took %dms\n",
(il->scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2", (il->scan_band == IEEE80211_BAND_2GHZ) ? "2.4" : "5.2",
jiffies_to_msecs(jiffies - il->scan_start)); jiffies_to_msecs(jiffies - il->scan_start));
...@@ -346,17 +346,17 @@ static int il_scan_initiate(struct il_priv *il, ...@@ -346,17 +346,17 @@ static int il_scan_initiate(struct il_priv *il,
} }
if (test_bit(STATUS_SCAN_HW, &il->status)) { if (test_bit(STATUS_SCAN_HW, &il->status)) {
IL_DEBUG_SCAN(il, D_SCAN(
"Multiple concurrent scan requests in parallel.\n"); "Multiple concurrent scan requests in parallel.\n");
return -EBUSY; return -EBUSY;
} }
if (test_bit(STATUS_SCAN_ABORTING, &il->status)) { if (test_bit(STATUS_SCAN_ABORTING, &il->status)) {
IL_DEBUG_SCAN(il, "Scan request while abort pending.\n"); D_SCAN("Scan request while abort pending.\n");
return -EBUSY; return -EBUSY;
} }
IL_DEBUG_SCAN(il, "Starting scan...\n"); D_SCAN("Starting scan...\n");
set_bit(STATUS_SCANNING, &il->status); set_bit(STATUS_SCANNING, &il->status);
il->scan_start = jiffies; il->scan_start = jiffies;
...@@ -380,7 +380,7 @@ int il_mac_hw_scan(struct ieee80211_hw *hw, ...@@ -380,7 +380,7 @@ int il_mac_hw_scan(struct ieee80211_hw *hw,
struct il_priv *il = hw->priv; struct il_priv *il = hw->priv;
int ret; int ret;
IL_DEBUG_MAC80211(il, "enter\n"); D_MAC80211("enter\n");
if (req->n_channels == 0) if (req->n_channels == 0)
return -EINVAL; return -EINVAL;
...@@ -388,7 +388,7 @@ int il_mac_hw_scan(struct ieee80211_hw *hw, ...@@ -388,7 +388,7 @@ int il_mac_hw_scan(struct ieee80211_hw *hw,
mutex_lock(&il->mutex); mutex_lock(&il->mutex);
if (test_bit(STATUS_SCANNING, &il->status)) { if (test_bit(STATUS_SCANNING, &il->status)) {
IL_DEBUG_SCAN(il, "Scan already in progress.\n"); D_SCAN("Scan already in progress.\n");
ret = -EAGAIN; ret = -EAGAIN;
goto out_unlock; goto out_unlock;
} }
...@@ -400,7 +400,7 @@ int il_mac_hw_scan(struct ieee80211_hw *hw, ...@@ -400,7 +400,7 @@ int il_mac_hw_scan(struct ieee80211_hw *hw,
ret = il_scan_initiate(il, vif); ret = il_scan_initiate(il, vif);
IL_DEBUG_MAC80211(il, "leave\n"); D_MAC80211("leave\n");
out_unlock: out_unlock:
mutex_unlock(&il->mutex); mutex_unlock(&il->mutex);
...@@ -414,7 +414,7 @@ static void il_bg_scan_check(struct work_struct *data) ...@@ -414,7 +414,7 @@ static void il_bg_scan_check(struct work_struct *data)
struct il_priv *il = struct il_priv *il =
container_of(data, struct il_priv, scan_check.work); container_of(data, struct il_priv, scan_check.work);
IL_DEBUG_SCAN(il, "Scan check work\n"); D_SCAN("Scan check work\n");
/* Since we are here firmware does not finish scan and /* Since we are here firmware does not finish scan and
* most likely is in bad shape, so we don't bother to * most likely is in bad shape, so we don't bother to
...@@ -477,7 +477,7 @@ static void il_bg_abort_scan(struct work_struct *work) ...@@ -477,7 +477,7 @@ static void il_bg_abort_scan(struct work_struct *work)
{ {
struct il_priv *il = container_of(work, struct il_priv, abort_scan); struct il_priv *il = container_of(work, struct il_priv, abort_scan);
IL_DEBUG_SCAN(il, "Abort scan work\n"); D_SCAN("Abort scan work\n");
/* We keep scan_check work queued in case when firmware will not /* We keep scan_check work queued in case when firmware will not
* report back scan completed notification */ * report back scan completed notification */
...@@ -492,7 +492,7 @@ static void il_bg_scan_completed(struct work_struct *work) ...@@ -492,7 +492,7 @@ static void il_bg_scan_completed(struct work_struct *work)
container_of(work, struct il_priv, scan_completed); container_of(work, struct il_priv, scan_completed);
bool aborted; bool aborted;
IL_DEBUG_SCAN(il, "Completed scan.\n"); D_SCAN("Completed scan.\n");
cancel_delayed_work(&il->scan_check); cancel_delayed_work(&il->scan_check);
...@@ -500,10 +500,10 @@ static void il_bg_scan_completed(struct work_struct *work) ...@@ -500,10 +500,10 @@ static void il_bg_scan_completed(struct work_struct *work)
aborted = test_and_clear_bit(STATUS_SCAN_ABORTING, &il->status); aborted = test_and_clear_bit(STATUS_SCAN_ABORTING, &il->status);
if (aborted) if (aborted)
IL_DEBUG_SCAN(il, "Aborted scan completed.\n"); D_SCAN("Aborted scan completed.\n");
if (!test_and_clear_bit(STATUS_SCANNING, &il->status)) { if (!test_and_clear_bit(STATUS_SCANNING, &il->status)) {
IL_DEBUG_SCAN(il, "Scan already completed.\n"); D_SCAN("Scan already completed.\n");
goto out_settings; goto out_settings;
} }
......
...@@ -46,13 +46,13 @@ static void il_sta_ucode_activate(struct il_priv *il, u8 sta_id) ...@@ -46,13 +46,13 @@ static void il_sta_ucode_activate(struct il_priv *il, u8 sta_id)
sta_id, il->stations[sta_id].sta.sta.addr); sta_id, il->stations[sta_id].sta.sta.addr);
if (il->stations[sta_id].used & IL_STA_UCODE_ACTIVE) { if (il->stations[sta_id].used & IL_STA_UCODE_ACTIVE) {
IL_DEBUG_ASSOC(il, D_ASSOC(
"STA id %u addr %pM already present" "STA id %u addr %pM already present"
" in uCode (according to driver)\n", " in uCode (according to driver)\n",
sta_id, il->stations[sta_id].sta.sta.addr); sta_id, il->stations[sta_id].sta.sta.addr);
} else { } else {
il->stations[sta_id].used |= IL_STA_UCODE_ACTIVE; il->stations[sta_id].used |= IL_STA_UCODE_ACTIVE;
IL_DEBUG_ASSOC(il, "Added STA id %u addr %pM to uCode\n", D_ASSOC("Added STA id %u addr %pM to uCode\n",
sta_id, il->stations[sta_id].sta.sta.addr); sta_id, il->stations[sta_id].sta.sta.addr);
} }
} }
...@@ -72,14 +72,14 @@ static int il_process_add_sta_resp(struct il_priv *il, ...@@ -72,14 +72,14 @@ static int il_process_add_sta_resp(struct il_priv *il,
return ret; return ret;
} }
IL_DEBUG_INFO(il, "Processing response for adding station %u\n", D_INFO("Processing response for adding station %u\n",
sta_id); sta_id);
spin_lock_irqsave(&il->sta_lock, flags); spin_lock_irqsave(&il->sta_lock, flags);
switch (pkt->u.add_sta.status) { switch (pkt->u.add_sta.status) {
case ADD_STA_SUCCESS_MSK: case ADD_STA_SUCCESS_MSK:
IL_DEBUG_INFO(il, "REPLY_ADD_STA PASSED\n"); D_INFO("REPLY_ADD_STA PASSED\n");
il_sta_ucode_activate(il, sta_id); il_sta_ucode_activate(il, sta_id);
ret = 0; ret = 0;
break; break;
...@@ -97,12 +97,12 @@ static int il_process_add_sta_resp(struct il_priv *il, ...@@ -97,12 +97,12 @@ static int il_process_add_sta_resp(struct il_priv *il,
sta_id); sta_id);
break; break;
default: default:
IL_DEBUG_ASSOC(il, "Received REPLY_ADD_STA:(0x%08X)\n", D_ASSOC("Received REPLY_ADD_STA:(0x%08X)\n",
pkt->u.add_sta.status); pkt->u.add_sta.status);
break; break;
} }
IL_DEBUG_INFO(il, "%s station id %u addr %pM\n", D_INFO("%s station id %u addr %pM\n",
il->stations[sta_id].sta.mode == il->stations[sta_id].sta.mode ==
STA_CONTROL_MODIFY_MSK ? "Modified" : "Added", STA_CONTROL_MODIFY_MSK ? "Modified" : "Added",
sta_id, il->stations[sta_id].sta.sta.addr); sta_id, il->stations[sta_id].sta.sta.addr);
...@@ -115,7 +115,7 @@ static int il_process_add_sta_resp(struct il_priv *il, ...@@ -115,7 +115,7 @@ static int il_process_add_sta_resp(struct il_priv *il,
* issue has not yet been resolved and this debugging is left to * issue has not yet been resolved and this debugging is left to
* observe the problem. * observe the problem.
*/ */
IL_DEBUG_INFO(il, "%s station according to cmd buffer %pM\n", D_INFO("%s station according to cmd buffer %pM\n",
il->stations[sta_id].sta.mode == il->stations[sta_id].sta.mode ==
STA_CONTROL_MODIFY_MSK ? "Modified" : "Added", STA_CONTROL_MODIFY_MSK ? "Modified" : "Added",
addsta->sta.addr); addsta->sta.addr);
...@@ -148,7 +148,7 @@ int il_send_add_sta(struct il_priv *il, ...@@ -148,7 +148,7 @@ int il_send_add_sta(struct il_priv *il,
}; };
u8 sta_id __maybe_unused = sta->sta.sta_id; u8 sta_id __maybe_unused = sta->sta.sta_id;
IL_DEBUG_INFO(il, "Adding sta %u (%pM) %ssynchronously\n", D_INFO("Adding sta %u (%pM) %ssynchronously\n",
sta_id, sta->sta.addr, flags & CMD_ASYNC ? "a" : ""); sta_id, sta->sta.addr, flags & CMD_ASYNC ? "a" : "");
if (flags & CMD_ASYNC) if (flags & CMD_ASYNC)
...@@ -186,7 +186,7 @@ static void il_set_ht_add_station(struct il_priv *il, u8 index, ...@@ -186,7 +186,7 @@ static void il_set_ht_add_station(struct il_priv *il, u8 index,
goto done; goto done;
mimo_ps_mode = (sta_ht_inf->cap & IEEE80211_HT_CAP_SM_PS) >> 2; mimo_ps_mode = (sta_ht_inf->cap & IEEE80211_HT_CAP_SM_PS) >> 2;
IL_DEBUG_ASSOC(il, "spatial multiplexing power save mode: %s\n", D_ASSOC("spatial multiplexing power save mode: %s\n",
(mimo_ps_mode == WLAN_HT_CAP_SM_PS_STATIC) ? (mimo_ps_mode == WLAN_HT_CAP_SM_PS_STATIC) ?
"static" : "static" :
(mimo_ps_mode == WLAN_HT_CAP_SM_PS_DYNAMIC) ? (mimo_ps_mode == WLAN_HT_CAP_SM_PS_DYNAMIC) ?
...@@ -269,7 +269,7 @@ u8 il_prep_station(struct il_priv *il, struct il_rxon_context *ctx, ...@@ -269,7 +269,7 @@ u8 il_prep_station(struct il_priv *il, struct il_rxon_context *ctx,
* another. * another.
*/ */
if (il->stations[sta_id].used & IL_STA_UCODE_INPROGRESS) { if (il->stations[sta_id].used & IL_STA_UCODE_INPROGRESS) {
IL_DEBUG_INFO(il, D_INFO(
"STA %d already in process of being added.\n", "STA %d already in process of being added.\n",
sta_id); sta_id);
return sta_id; return sta_id;
...@@ -278,7 +278,7 @@ u8 il_prep_station(struct il_priv *il, struct il_rxon_context *ctx, ...@@ -278,7 +278,7 @@ u8 il_prep_station(struct il_priv *il, struct il_rxon_context *ctx,
if ((il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE) && if ((il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE) &&
(il->stations[sta_id].used & IL_STA_UCODE_ACTIVE) && (il->stations[sta_id].used & IL_STA_UCODE_ACTIVE) &&
!compare_ether_addr(il->stations[sta_id].sta.sta.addr, addr)) { !compare_ether_addr(il->stations[sta_id].sta.sta.addr, addr)) {
IL_DEBUG_ASSOC(il, D_ASSOC(
"STA %d (%pM) already added, not adding again.\n", "STA %d (%pM) already added, not adding again.\n",
sta_id, addr); sta_id, addr);
return sta_id; return sta_id;
...@@ -286,7 +286,7 @@ u8 il_prep_station(struct il_priv *il, struct il_rxon_context *ctx, ...@@ -286,7 +286,7 @@ u8 il_prep_station(struct il_priv *il, struct il_rxon_context *ctx,
station = &il->stations[sta_id]; station = &il->stations[sta_id];
station->used = IL_STA_DRIVER_ACTIVE; station->used = IL_STA_DRIVER_ACTIVE;
IL_DEBUG_ASSOC(il, "Add STA to driver ID %d: %pM\n", D_ASSOC("Add STA to driver ID %d: %pM\n",
sta_id, addr); sta_id, addr);
il->num_stations++; il->num_stations++;
...@@ -355,7 +355,7 @@ il_add_station_common(struct il_priv *il, ...@@ -355,7 +355,7 @@ il_add_station_common(struct il_priv *il,
* another. * another.
*/ */
if (il->stations[sta_id].used & IL_STA_UCODE_INPROGRESS) { if (il->stations[sta_id].used & IL_STA_UCODE_INPROGRESS) {
IL_DEBUG_INFO(il, D_INFO(
"STA %d already in process of being added.\n", "STA %d already in process of being added.\n",
sta_id); sta_id);
spin_unlock_irqrestore(&il->sta_lock, flags_spin); spin_unlock_irqrestore(&il->sta_lock, flags_spin);
...@@ -364,7 +364,7 @@ il_add_station_common(struct il_priv *il, ...@@ -364,7 +364,7 @@ il_add_station_common(struct il_priv *il,
if ((il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE) && if ((il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE) &&
(il->stations[sta_id].used & IL_STA_UCODE_ACTIVE)) { (il->stations[sta_id].used & IL_STA_UCODE_ACTIVE)) {
IL_DEBUG_ASSOC(il, D_ASSOC(
"STA %d (%pM) already added, not adding again.\n", "STA %d (%pM) already added, not adding again.\n",
sta_id, addr); sta_id, addr);
spin_unlock_irqrestore(&il->sta_lock, flags_spin); spin_unlock_irqrestore(&il->sta_lock, flags_spin);
...@@ -407,7 +407,7 @@ static void il_sta_ucode_deactivate(struct il_priv *il, u8 sta_id) ...@@ -407,7 +407,7 @@ static void il_sta_ucode_deactivate(struct il_priv *il, u8 sta_id)
il->stations[sta_id].used &= ~IL_STA_UCODE_ACTIVE; il->stations[sta_id].used &= ~IL_STA_UCODE_ACTIVE;
memset(&il->stations[sta_id], 0, sizeof(struct il_station_entry)); memset(&il->stations[sta_id], 0, sizeof(struct il_station_entry));
IL_DEBUG_ASSOC(il, "Removed STA %u\n", sta_id); D_ASSOC("Removed STA %u\n", sta_id);
} }
static int il_send_remove_station(struct il_priv *il, static int il_send_remove_station(struct il_priv *il,
...@@ -454,7 +454,7 @@ static int il_send_remove_station(struct il_priv *il, ...@@ -454,7 +454,7 @@ static int il_send_remove_station(struct il_priv *il,
spin_unlock_irqrestore(&il->sta_lock, spin_unlock_irqrestore(&il->sta_lock,
flags_spin); flags_spin);
} }
IL_DEBUG_ASSOC(il, "REPLY_REMOVE_STA PASSED\n"); D_ASSOC("REPLY_REMOVE_STA PASSED\n");
break; break;
default: default:
ret = -EIO; ret = -EIO;
...@@ -476,7 +476,7 @@ int il_remove_station(struct il_priv *il, const u8 sta_id, ...@@ -476,7 +476,7 @@ int il_remove_station(struct il_priv *il, const u8 sta_id,
unsigned long flags; unsigned long flags;
if (!il_is_ready(il)) { if (!il_is_ready(il)) {
IL_DEBUG_INFO(il, D_INFO(
"Unable to remove station %pM, device not ready.\n", "Unable to remove station %pM, device not ready.\n",
addr); addr);
/* /*
...@@ -487,7 +487,7 @@ int il_remove_station(struct il_priv *il, const u8 sta_id, ...@@ -487,7 +487,7 @@ int il_remove_station(struct il_priv *il, const u8 sta_id,
return 0; return 0;
} }
IL_DEBUG_ASSOC(il, "Removing STA from driver:%d %pM\n", D_ASSOC("Removing STA from driver:%d %pM\n",
sta_id, addr); sta_id, addr);
if (WARN_ON(sta_id == IL_INVALID_STATION)) if (WARN_ON(sta_id == IL_INVALID_STATION))
...@@ -496,13 +496,13 @@ int il_remove_station(struct il_priv *il, const u8 sta_id, ...@@ -496,13 +496,13 @@ int il_remove_station(struct il_priv *il, const u8 sta_id,
spin_lock_irqsave(&il->sta_lock, flags); spin_lock_irqsave(&il->sta_lock, flags);
if (!(il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE)) { if (!(il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE)) {
IL_DEBUG_INFO(il, "Removing %pM but non DRIVER active\n", D_INFO("Removing %pM but non DRIVER active\n",
addr); addr);
goto out_err; goto out_err;
} }
if (!(il->stations[sta_id].used & IL_STA_UCODE_ACTIVE)) { if (!(il->stations[sta_id].used & IL_STA_UCODE_ACTIVE)) {
IL_DEBUG_INFO(il, "Removing %pM but non UCODE active\n", D_INFO("Removing %pM but non UCODE active\n",
addr); addr);
goto out_err; goto out_err;
} }
...@@ -542,7 +542,7 @@ void il_clear_ucode_stations(struct il_priv *il, ...@@ -542,7 +542,7 @@ void il_clear_ucode_stations(struct il_priv *il,
unsigned long flags_spin; unsigned long flags_spin;
bool cleared = false; bool cleared = false;
IL_DEBUG_INFO(il, "Clearing ucode stations in driver\n"); D_INFO("Clearing ucode stations in driver\n");
spin_lock_irqsave(&il->sta_lock, flags_spin); spin_lock_irqsave(&il->sta_lock, flags_spin);
for (i = 0; i < il->hw_params.max_stations; i++) { for (i = 0; i < il->hw_params.max_stations; i++) {
...@@ -550,7 +550,7 @@ void il_clear_ucode_stations(struct il_priv *il, ...@@ -550,7 +550,7 @@ void il_clear_ucode_stations(struct il_priv *il,
continue; continue;
if (il->stations[i].used & IL_STA_UCODE_ACTIVE) { if (il->stations[i].used & IL_STA_UCODE_ACTIVE) {
IL_DEBUG_INFO(il, D_INFO(
"Clearing ucode active for station %d\n", i); "Clearing ucode active for station %d\n", i);
il->stations[i].used &= ~IL_STA_UCODE_ACTIVE; il->stations[i].used &= ~IL_STA_UCODE_ACTIVE;
cleared = true; cleared = true;
...@@ -559,7 +559,7 @@ void il_clear_ucode_stations(struct il_priv *il, ...@@ -559,7 +559,7 @@ void il_clear_ucode_stations(struct il_priv *il,
spin_unlock_irqrestore(&il->sta_lock, flags_spin); spin_unlock_irqrestore(&il->sta_lock, flags_spin);
if (!cleared) if (!cleared)
IL_DEBUG_INFO(il, D_INFO(
"No active stations found to be cleared\n"); "No active stations found to be cleared\n");
} }
EXPORT_SYMBOL(il_clear_ucode_stations); EXPORT_SYMBOL(il_clear_ucode_stations);
...@@ -584,19 +584,19 @@ il_restore_stations(struct il_priv *il, struct il_rxon_context *ctx) ...@@ -584,19 +584,19 @@ il_restore_stations(struct il_priv *il, struct il_rxon_context *ctx)
bool send_lq; bool send_lq;
if (!il_is_ready(il)) { if (!il_is_ready(il)) {
IL_DEBUG_INFO(il, D_INFO(
"Not ready yet, not restoring any stations.\n"); "Not ready yet, not restoring any stations.\n");
return; return;
} }
IL_DEBUG_ASSOC(il, "Restoring all known stations ... start.\n"); D_ASSOC("Restoring all known stations ... start.\n");
spin_lock_irqsave(&il->sta_lock, flags_spin); spin_lock_irqsave(&il->sta_lock, flags_spin);
for (i = 0; i < il->hw_params.max_stations; i++) { for (i = 0; i < il->hw_params.max_stations; i++) {
if (ctx->ctxid != il->stations[i].ctxid) if (ctx->ctxid != il->stations[i].ctxid)
continue; continue;
if ((il->stations[i].used & IL_STA_DRIVER_ACTIVE) && if ((il->stations[i].used & IL_STA_DRIVER_ACTIVE) &&
!(il->stations[i].used & IL_STA_UCODE_ACTIVE)) { !(il->stations[i].used & IL_STA_UCODE_ACTIVE)) {
IL_DEBUG_ASSOC(il, "Restoring sta %pM\n", D_ASSOC("Restoring sta %pM\n",
il->stations[i].sta.sta.addr); il->stations[i].sta.sta.addr);
il->stations[i].sta.mode = 0; il->stations[i].sta.mode = 0;
il->stations[i].used |= IL_STA_UCODE_INPROGRESS; il->stations[i].used |= IL_STA_UCODE_INPROGRESS;
...@@ -641,10 +641,10 @@ il_restore_stations(struct il_priv *il, struct il_rxon_context *ctx) ...@@ -641,10 +641,10 @@ il_restore_stations(struct il_priv *il, struct il_rxon_context *ctx)
spin_unlock_irqrestore(&il->sta_lock, flags_spin); spin_unlock_irqrestore(&il->sta_lock, flags_spin);
if (!found) if (!found)
IL_DEBUG_INFO(il, "Restoring all known stations" D_INFO("Restoring all known stations"
" .... no stations to be restored.\n"); " .... no stations to be restored.\n");
else else
IL_DEBUG_INFO(il, "Restoring all known stations" D_INFO("Restoring all known stations"
" .... complete.\n"); " .... complete.\n");
} }
EXPORT_SYMBOL(il_restore_stations); EXPORT_SYMBOL(il_restore_stations);
...@@ -686,13 +686,13 @@ static void il_dump_lq_cmd(struct il_priv *il, ...@@ -686,13 +686,13 @@ static void il_dump_lq_cmd(struct il_priv *il,
struct il_link_quality_cmd *lq) struct il_link_quality_cmd *lq)
{ {
int i; int i;
IL_DEBUG_RATE(il, "lq station id 0x%x\n", lq->sta_id); D_RATE("lq station id 0x%x\n", lq->sta_id);
IL_DEBUG_RATE(il, "lq ant 0x%X 0x%X\n", D_RATE("lq ant 0x%X 0x%X\n",
lq->general_params.single_stream_ant_msk, lq->general_params.single_stream_ant_msk,
lq->general_params.dual_stream_ant_msk); lq->general_params.dual_stream_ant_msk);
for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++) for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)
IL_DEBUG_RATE(il, "lq index %d 0x%X\n", D_RATE("lq index %d 0x%X\n",
i, lq->rs_table[i].rate_n_flags); i, lq->rs_table[i].rate_n_flags);
} }
#else #else
...@@ -722,12 +722,12 @@ static bool il_is_lq_table_valid(struct il_priv *il, ...@@ -722,12 +722,12 @@ static bool il_is_lq_table_valid(struct il_priv *il,
if (ctx->ht.enabled) if (ctx->ht.enabled)
return true; return true;
IL_DEBUG_INFO(il, "Channel %u is not an HT channel\n", D_INFO("Channel %u is not an HT channel\n",
ctx->active.channel); ctx->active.channel);
for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++) { for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++) {
if (le32_to_cpu(lq->rs_table[i].rate_n_flags) & if (le32_to_cpu(lq->rs_table[i].rate_n_flags) &
RATE_MCS_HT_MSK) { RATE_MCS_HT_MSK) {
IL_DEBUG_INFO(il, D_INFO(
"index %d of LQ expects HT channel\n", "index %d of LQ expects HT channel\n",
i); i);
return false; return false;
...@@ -782,7 +782,7 @@ int il_send_lq_cmd(struct il_priv *il, struct il_rxon_context *ctx, ...@@ -782,7 +782,7 @@ int il_send_lq_cmd(struct il_priv *il, struct il_rxon_context *ctx,
return ret; return ret;
if (init) { if (init) {
IL_DEBUG_INFO(il, "init LQ command complete," D_INFO("init LQ command complete,"
" clearing sta addition status for sta %d\n", " clearing sta addition status for sta %d\n",
lq->sta_id); lq->sta_id);
spin_lock_irqsave(&il->sta_lock, flags_spin); spin_lock_irqsave(&il->sta_lock, flags_spin);
...@@ -801,10 +801,10 @@ int il_mac_sta_remove(struct ieee80211_hw *hw, ...@@ -801,10 +801,10 @@ int il_mac_sta_remove(struct ieee80211_hw *hw,
struct il_station_priv_common *sta_common = (void *)sta->drv_priv; struct il_station_priv_common *sta_common = (void *)sta->drv_priv;
int ret; int ret;
IL_DEBUG_INFO(il, "received request to remove station %pM\n", D_INFO("received request to remove station %pM\n",
sta->addr); sta->addr);
mutex_lock(&il->mutex); mutex_lock(&il->mutex);
IL_DEBUG_INFO(il, "proceeding to remove station %pM\n", D_INFO("proceeding to remove station %pM\n",
sta->addr); sta->addr);
ret = il_remove_station(il, sta_common->sta_id, sta->addr); ret = il_remove_station(il, sta_common->sta_id, sta->addr);
if (ret) if (ret)
......
...@@ -58,7 +58,7 @@ il_txq_update_write_ptr(struct il_priv *il, struct il_tx_queue *txq) ...@@ -58,7 +58,7 @@ il_txq_update_write_ptr(struct il_priv *il, struct il_tx_queue *txq)
reg = il_read32(il, CSR_UCODE_DRV_GP1); reg = il_read32(il, CSR_UCODE_DRV_GP1);
if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) { if (reg & CSR_UCODE_DRV_GP1_BIT_MAC_SLEEP) {
IL_DEBUG_INFO(il, D_INFO(
"Tx queue %d requesting wakeup," "Tx queue %d requesting wakeup,"
" GP1 = 0x%x\n", txq_id, reg); " GP1 = 0x%x\n", txq_id, reg);
il_set_bit(il, CSR_GP_CNTRL, il_set_bit(il, CSR_GP_CNTRL,
...@@ -511,7 +511,7 @@ int il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd) ...@@ -511,7 +511,7 @@ int il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd)
switch (out_cmd->hdr.cmd) { switch (out_cmd->hdr.cmd) {
case REPLY_TX_LINK_QUALITY_CMD: case REPLY_TX_LINK_QUALITY_CMD:
case SENSITIVITY_CMD: case SENSITIVITY_CMD:
IL_DEBUG_HC_DUMP(il, D_HC_DUMP(
"Sending command %s (#%x), seq: 0x%04X, " "Sending command %s (#%x), seq: 0x%04X, "
"%d bytes at %d[%d]:%d\n", "%d bytes at %d[%d]:%d\n",
il_get_cmd_string(out_cmd->hdr.cmd), il_get_cmd_string(out_cmd->hdr.cmd),
...@@ -520,7 +520,7 @@ int il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd) ...@@ -520,7 +520,7 @@ int il_enqueue_hcmd(struct il_priv *il, struct il_host_cmd *cmd)
q->write_ptr, idx, il->cmd_queue); q->write_ptr, idx, il->cmd_queue);
break; break;
default: default:
IL_DEBUG_HC(il, "Sending command %s (#%x), seq: 0x%04X, " D_HC("Sending command %s (#%x), seq: 0x%04X, "
"%d bytes at %d[%d]:%d\n", "%d bytes at %d[%d]:%d\n",
il_get_cmd_string(out_cmd->hdr.cmd), il_get_cmd_string(out_cmd->hdr.cmd),
out_cmd->hdr.cmd, out_cmd->hdr.cmd,
...@@ -642,7 +642,7 @@ il_tx_cmd_complete(struct il_priv *il, struct il_rx_mem_buffer *rxb) ...@@ -642,7 +642,7 @@ il_tx_cmd_complete(struct il_priv *il, struct il_rx_mem_buffer *rxb)
if (!(meta->flags & CMD_ASYNC)) { if (!(meta->flags & CMD_ASYNC)) {
clear_bit(STATUS_HCMD_ACTIVE, &il->status); clear_bit(STATUS_HCMD_ACTIVE, &il->status);
IL_DEBUG_INFO(il, "Clearing HCMD_ACTIVE for command %s\n", D_INFO("Clearing HCMD_ACTIVE for command %s\n",
il_get_cmd_string(cmd->hdr.cmd)); il_get_cmd_string(cmd->hdr.cmd));
wake_up(&il->wait_command_queue); wake_up(&il->wait_command_queue);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment