Skip to content

L
linux
Commit f0d23208 authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files
Options

net: mac80211: Convert printk(KERN_DEBUG to pr_debug 

Standardize the debugging to be able to use dynamic_debug.

Coalesce formats, align arguments.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6efb71b0
Show whitespace changes
Inline Side-by-side
Showing with 181 additions and 227 deletions
net/mac80211/agg-rx.c
View file @ f0d23208
...@@ -75,8 +75,7 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid, ...@@ -75,8 +75,7 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
RCU_INIT_POINTER(sta->ampdu_mlme.tid_rx[tid], NULL); RCU_INIT_POINTER(sta->ampdu_mlme.tid_rx[tid], NULL);
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG pr_debug("Rx BA session stop requested for %pM tid %u %s reason: %d\n",
"Rx BA session stop requested for %pM tid %u %s reason: %d\n",
sta->sta.addr, tid, sta->sta.addr, tid,
initiator == WLAN_BACK_RECIPIENT ? "recipient" : "inititator", initiator == WLAN_BACK_RECIPIENT ? "recipient" : "inititator",
(int)reason); (int)reason);
...@@ -84,8 +83,8 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid, ...@@ -84,8 +83,8 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
if (drv_ampdu_action(local, sta->sdata, IEEE80211_AMPDU_RX_STOP, if (drv_ampdu_action(local, sta->sdata, IEEE80211_AMPDU_RX_STOP,
&sta->sta, tid, NULL, 0)) &sta->sta, tid, NULL, 0))
printk(KERN_DEBUG "HW problem - can not stop rx " pr_debug("HW problem - can not stop rx aggregation for tid %d\n",
"aggregation for tid %d\n", tid); tid);
/* check if this is a self generated aggregation halt */ /* check if this is a self generated aggregation halt */
if (initiator == WLAN_BACK_RECIPIENT && tx) if (initiator == WLAN_BACK_RECIPIENT && tx)
...@@ -156,7 +155,7 @@ static void sta_rx_agg_session_timer_expired(unsigned long data) ...@@ -156,7 +155,7 @@ static void sta_rx_agg_session_timer_expired(unsigned long data)
} }
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "rx session timer expired on tid %d\n", (u16)*ptid); pr_debug("rx session timer expired on tid %d\n", (u16)*ptid);
#endif #endif
set_bit(*ptid, sta->ampdu_mlme.tid_rx_timer_expired); set_bit(*ptid, sta->ampdu_mlme.tid_rx_timer_expired);
ieee80211_queue_work(&sta->local->hw, &sta->ampdu_mlme.work); ieee80211_queue_work(&sta->local->hw, &sta->ampdu_mlme.work);
...@@ -245,8 +244,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, ...@@ -245,8 +244,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) { if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Suspend in progress. " pr_debug("Suspend in progress - Denying ADDBA request\n");
"Denying ADDBA request\n");
#endif #endif
goto end_no_lock; goto end_no_lock;
} }
...@@ -320,7 +318,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, ...@@ -320,7 +318,7 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
ret = drv_ampdu_action(local, sta->sdata, IEEE80211_AMPDU_RX_START, ret = drv_ampdu_action(local, sta->sdata, IEEE80211_AMPDU_RX_START,
&sta->sta, tid, &start_seq_num, 0); &sta->sta, tid, &start_seq_num, 0);
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Rx A-MPDU request on tid %d result %d\n", tid, ret); pr_debug("Rx A-MPDU request on tid %d result %d\n", tid, ret);
#endif /* CONFIG_MAC80211_HT_DEBUG */ #endif /* CONFIG_MAC80211_HT_DEBUG */
if (ret) { if (ret) {
......
net/mac80211/agg-tx.c
View file @ f0d23208
...@@ -185,7 +185,7 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, ...@@ -185,7 +185,7 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid,
spin_unlock_bh(&sta->lock); spin_unlock_bh(&sta->lock);
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Tx BA session stop requested for %pM tid %u\n", pr_debug("Tx BA session stop requested for %pM tid %u\n",
sta->sta.addr, tid); sta->sta.addr, tid);
#endif /* CONFIG_MAC80211_HT_DEBUG */ #endif /* CONFIG_MAC80211_HT_DEBUG */
...@@ -254,15 +254,14 @@ static void sta_addba_resp_timer_expired(unsigned long data) ...@@ -254,15 +254,14 @@ static void sta_addba_resp_timer_expired(unsigned long data)
test_bit(HT_AGG_STATE_RESPONSE_RECEIVED, &tid_tx->state)) { test_bit(HT_AGG_STATE_RESPONSE_RECEIVED, &tid_tx->state)) {
rcu_read_unlock(); rcu_read_unlock();
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "timer expired on tid %d but we are not " pr_debug("timer expired on tid %d but we are not (or no longer) expecting addBA response there\n",
"(or no longer) expecting addBA response there\n",
tid); tid);
#endif #endif
return; return;
} }
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "addBA response timer expired on tid %d\n", tid); pr_debug("addBA response timer expired on tid %d\n", tid);
#endif #endif
ieee80211_stop_tx_ba_session(&sta->sta, tid); ieee80211_stop_tx_ba_session(&sta->sta, tid);
...@@ -373,8 +372,8 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid) ...@@ -373,8 +372,8 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
&sta->sta, tid, &start_seq_num, 0); &sta->sta, tid, &start_seq_num, 0);
if (ret) { if (ret) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "BA request denied - HW unavailable for" pr_debug("BA request denied - HW unavailable for tid %d\n",
" tid %d\n", tid); tid);
#endif #endif
spin_lock_bh(&sta->lock); spin_lock_bh(&sta->lock);
ieee80211_agg_splice_packets(sdata, tid_tx, tid); ieee80211_agg_splice_packets(sdata, tid_tx, tid);
...@@ -389,7 +388,7 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid) ...@@ -389,7 +388,7 @@ void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid)
/* activate the timer for the recipient's addBA response */ /* activate the timer for the recipient's addBA response */
mod_timer(&tid_tx->addba_resp_timer, jiffies + ADDBA_RESP_INTERVAL); mod_timer(&tid_tx->addba_resp_timer, jiffies + ADDBA_RESP_INTERVAL);
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "activated addBA response timer on tid %d\n", tid); pr_debug("activated addBA response timer on tid %d\n", tid);
#endif #endif
spin_lock_bh(&sta->lock); spin_lock_bh(&sta->lock);
...@@ -438,7 +437,7 @@ static void sta_tx_agg_session_timer_expired(unsigned long data) ...@@ -438,7 +437,7 @@ static void sta_tx_agg_session_timer_expired(unsigned long data)
rcu_read_unlock(); rcu_read_unlock();
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "tx session timer expired on tid %d\n", (u16)*ptid); pr_debug("tx session timer expired on tid %d\n", (u16)*ptid);
#endif #endif
ieee80211_stop_tx_ba_session(&sta->sta, *ptid); ieee80211_stop_tx_ba_session(&sta->sta, *ptid);
...@@ -464,7 +463,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, ...@@ -464,7 +463,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
return -EINVAL; return -EINVAL;
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Open BA session requested for %pM tid %u\n", pr_debug("Open BA session requested for %pM tid %u\n",
pubsta->addr, tid); pubsta->addr, tid);
#endif /* CONFIG_MAC80211_HT_DEBUG */ #endif /* CONFIG_MAC80211_HT_DEBUG */
...@@ -477,8 +476,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, ...@@ -477,8 +476,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) { if (test_sta_flag(sta, WLAN_STA_BLOCK_BA)) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "BA sessions blocked. " pr_debug("BA sessions blocked - Denying BA session request\n");
"Denying BA session request\n");
#endif #endif
return -EINVAL; return -EINVAL;
} }
...@@ -498,8 +496,8 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, ...@@ -498,8 +496,8 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
if (sta->sdata->vif.type == NL80211_IFTYPE_ADHOC && if (sta->sdata->vif.type == NL80211_IFTYPE_ADHOC &&
!sta->sta.ht_cap.ht_supported) { !sta->sta.ht_cap.ht_supported) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "BA request denied - IBSS STA %pM" pr_debug("BA request denied - IBSS STA %pM does not advertise HT support\n",
"does not advertise HT support\n", pubsta->addr); pubsta->addr);
#endif /* CONFIG_MAC80211_HT_DEBUG */ #endif /* CONFIG_MAC80211_HT_DEBUG */
return -EINVAL; return -EINVAL;
} }
...@@ -521,9 +519,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, ...@@ -521,9 +519,7 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
time_before(jiffies, sta->ampdu_mlme.last_addba_req_time[tid] + time_before(jiffies, sta->ampdu_mlme.last_addba_req_time[tid] +
HT_AGG_RETRIES_PERIOD)) { HT_AGG_RETRIES_PERIOD)) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "BA request denied - " pr_debug("BA request denied - waiting a grace period after %d failed requests on tid %u\n",
"waiting a grace period after %d failed requests "
"on tid %u\n",
sta->ampdu_mlme.addba_req_num[tid], tid); sta->ampdu_mlme.addba_req_num[tid], tid);
#endif /* CONFIG_MAC80211_HT_DEBUG */ #endif /* CONFIG_MAC80211_HT_DEBUG */
ret = -EBUSY; ret = -EBUSY;
...@@ -534,8 +530,8 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid, ...@@ -534,8 +530,8 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
/* check if the TID is not in aggregation flow already */ /* check if the TID is not in aggregation flow already */
if (tid_tx || sta->ampdu_mlme.tid_start_tx[tid]) { if (tid_tx || sta->ampdu_mlme.tid_start_tx[tid]) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "BA request denied - session is not " pr_debug("BA request denied - session is not idle on tid %u\n",
"idle on tid %u\n", tid); tid);
#endif /* CONFIG_MAC80211_HT_DEBUG */ #endif /* CONFIG_MAC80211_HT_DEBUG */
ret = -EAGAIN; ret = -EAGAIN;
goto err_unlock_sta; goto err_unlock_sta;
...@@ -592,7 +588,7 @@ static void ieee80211_agg_tx_operational(struct ieee80211_local *local, ...@@ -592,7 +588,7 @@ static void ieee80211_agg_tx_operational(struct ieee80211_local *local,
tid_tx = rcu_dereference_protected_tid_tx(sta, tid); tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Aggregation is on for tid %d\n", tid); pr_debug("Aggregation is on for tid %d\n", tid);
#endif #endif
drv_ampdu_action(local, sta->sdata, drv_ampdu_action(local, sta->sdata,
...@@ -628,8 +624,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid) ...@@ -628,8 +624,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid)
if (tid >= STA_TID_NUM) { if (tid >= STA_TID_NUM) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Bad TID value: tid = %d (>= %d)\n", pr_debug("Bad TID value: tid = %d (>= %d)\n", tid, STA_TID_NUM);
tid, STA_TID_NUM);
#endif #endif
return; return;
} }
...@@ -639,7 +634,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid) ...@@ -639,7 +634,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid)
if (!sta) { if (!sta) {
mutex_unlock(&local->sta_mtx); mutex_unlock(&local->sta_mtx);
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Could not find station: %pM\n", ra); pr_debug("Could not find station: %pM\n", ra);
#endif #endif
return; return;
} }
...@@ -649,7 +644,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid) ...@@ -649,7 +644,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u16 tid)
if (WARN_ON(!tid_tx)) { if (WARN_ON(!tid_tx)) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "addBA was not requested!\n"); pr_debug("addBA was not requested!\n");
#endif #endif
goto unlock; goto unlock;
} }
...@@ -751,15 +746,13 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid) ...@@ -751,15 +746,13 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid)
if (tid >= STA_TID_NUM) { if (tid >= STA_TID_NUM) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Bad TID value: tid = %d (>= %d)\n", pr_debug("Bad TID value: tid = %d (>= %d)\n", tid, STA_TID_NUM);
tid, STA_TID_NUM);
#endif #endif
return; return;
} }
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Stopping Tx BA session for %pM tid %d\n", pr_debug("Stopping Tx BA session for %pM tid %d\n", ra, tid);
ra, tid);
#endif /* CONFIG_MAC80211_HT_DEBUG */ #endif /* CONFIG_MAC80211_HT_DEBUG */
mutex_lock(&local->sta_mtx); mutex_lock(&local->sta_mtx);
...@@ -767,7 +760,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid) ...@@ -767,7 +760,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid)
sta = sta_info_get_bss(sdata, ra); sta = sta_info_get_bss(sdata, ra);
if (!sta) { if (!sta) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Could not find station: %pM\n", ra); pr_debug("Could not find station: %pM\n", ra);
#endif #endif
goto unlock; goto unlock;
} }
...@@ -778,7 +771,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid) ...@@ -778,7 +771,7 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_vif *vif, u8 *ra, u8 tid)
if (!tid_tx || !test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) { if (!tid_tx || !test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "unexpected callback to A-MPDU stop\n"); pr_debug("unexpected callback to A-MPDU stop\n");
#endif #endif
goto unlock_sta; goto unlock_sta;
} }
...@@ -856,7 +849,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local, ...@@ -856,7 +849,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,
if (mgmt->u.action.u.addba_resp.dialog_token != tid_tx->dialog_token) { if (mgmt->u.action.u.addba_resp.dialog_token != tid_tx->dialog_token) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "wrong addBA response token, tid %d\n", tid); pr_debug("wrong addBA response token, tid %d\n", tid);
#endif #endif
goto out; goto out;
} }
...@@ -864,7 +857,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local, ...@@ -864,7 +857,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,
del_timer_sync(&tid_tx->addba_resp_timer); del_timer_sync(&tid_tx->addba_resp_timer);
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "switched off addBA timer for tid %d\n", tid); pr_debug("switched off addBA timer for tid %d\n", tid);
#endif #endif
/* /*
...@@ -875,8 +868,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local, ...@@ -875,8 +868,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,
if (test_bit(HT_AGG_STATE_WANT_STOP, &tid_tx->state) || if (test_bit(HT_AGG_STATE_WANT_STOP, &tid_tx->state) ||
test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) { test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state)) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG pr_debug("got addBA resp for tid %d but we already gave up\n",
"got addBA resp for tid %d but we already gave up\n",
tid); tid);
#endif #endif
goto out; goto out;
......
net/mac80211/cfg.c
View file @ f0d23208
...@@ -2679,7 +2679,7 @@ static int ieee80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev, ...@@ -2679,7 +2679,7 @@ static int ieee80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
return -EINVAL; return -EINVAL;
#ifdef CONFIG_MAC80211_VERBOSE_TDLS_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_TDLS_DEBUG
printk(KERN_DEBUG "TDLS mgmt action %d peer %pM\n", action_code, peer); pr_debug("TDLS mgmt action %d peer %pM\n", action_code, peer);
#endif #endif
skb = dev_alloc_skb(local->hw.extra_tx_headroom + skb = dev_alloc_skb(local->hw.extra_tx_headroom +
...@@ -2790,7 +2790,7 @@ static int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev, ...@@ -2790,7 +2790,7 @@ static int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,
return -EINVAL; return -EINVAL;
#ifdef CONFIG_MAC80211_VERBOSE_TDLS_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_TDLS_DEBUG
printk(KERN_DEBUG "TDLS oper %d peer %pM\n", oper, peer); pr_debug("TDLS oper %d peer %pM\n", oper, peer);
#endif #endif
switch (oper) { switch (oper) {
......
net/mac80211/debugfs_netdev.c
View file @ f0d23208
...@@ -685,6 +685,6 @@ void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata) ...@@ -685,6 +685,6 @@ void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata)
sprintf(buf, "netdev:%s", sdata->name); sprintf(buf, "netdev:%s", sdata->name);
if (!debugfs_rename(dir->d_parent, dir, dir->d_parent, buf)) if (!debugfs_rename(dir->d_parent, dir, dir->d_parent, buf))
printk(KERN_ERR "mac80211: debugfs: failed to rename debugfs " pr_err("mac80211: debugfs: failed to rename debugfs "
"dir to %s\n", buf); "dir to %s\n", buf);
} }
net/mac80211/ibss.c
View file @ f0d23208
...@@ -282,9 +282,8 @@ static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta, ...@@ -282,9 +282,8 @@ static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta,
return sta_info_get(sdata, addr); return sta_info_get(sdata, addr);
if (auth) { if (auth) {
#ifdef CONFIG_MAC80211_IBSS_DEBUG #ifdef CONFIG_MAC80211_IBSS_DEBUG
printk(KERN_DEBUG "TX Auth SA=%pM DA=%pM BSSID=%pM" pr_debug("TX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=1)\n",
"(auth_transaction=1)\n", sdata->vif.addr, sdata->vif.addr, sdata->u.ibss.bssid, addr);
sdata->u.ibss.bssid, addr);
#endif #endif
ieee80211_send_auth(sdata, 1, WLAN_AUTH_OPEN, NULL, 0, ieee80211_send_auth(sdata, 1, WLAN_AUTH_OPEN, NULL, 0,
addr, sdata->u.ibss.bssid, NULL, 0, 0); addr, sdata->u.ibss.bssid, NULL, 0, 0);
...@@ -356,9 +355,9 @@ static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata, ...@@ -356,9 +355,9 @@ static void ieee80211_rx_mgmt_auth_ibss(struct ieee80211_sub_if_data *sdata,
if (auth_alg != WLAN_AUTH_OPEN || auth_transaction != 1) if (auth_alg != WLAN_AUTH_OPEN || auth_transaction != 1)
return; return;
#ifdef CONFIG_MAC80211_IBSS_DEBUG #ifdef CONFIG_MAC80211_IBSS_DEBUG
printk(KERN_DEBUG "%s: RX Auth SA=%pM DA=%pM BSSID=%pM." pr_debug("%s: RX Auth SA=%pM DA=%pM BSSID=%pM (auth_transaction=%d)\n",
"(auth_transaction=%d)\n", sdata->name, mgmt->sa, mgmt->da, mgmt->bssid,
sdata->name, mgmt->sa, mgmt->da, mgmt->bssid, auth_transaction); auth_transaction);
#endif #endif
sta_info_destroy_addr(sdata, mgmt->sa); sta_info_destroy_addr(sdata, mgmt->sa);
ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, 0, false); ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, 0, false);
...@@ -423,10 +422,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, ...@@ -423,10 +422,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
if (sta->sta.supp_rates[band] != prev_rates) { if (sta->sta.supp_rates[band] != prev_rates) {
#ifdef CONFIG_MAC80211_IBSS_DEBUG #ifdef CONFIG_MAC80211_IBSS_DEBUG
printk(KERN_DEBUG pr_debug("%s: updated supp_rates set for %pM based on beacon/probe_resp (0x%x -> 0x%x)\n",
"%s: updated supp_rates set "
"for %pM based on beacon"
"/probe_resp (0x%x -> 0x%x)\n",
sdata->name, sta->sta.addr, sdata->name, sta->sta.addr,
prev_rates, prev_rates,
sta->sta.supp_rates[band]); sta->sta.supp_rates[band]);
...@@ -546,8 +542,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, ...@@ -546,8 +542,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
} }
#ifdef CONFIG_MAC80211_IBSS_DEBUG #ifdef CONFIG_MAC80211_IBSS_DEBUG
printk(KERN_DEBUG "RX beacon SA=%pM BSSID=" pr_debug("RX beacon SA=%pM BSSID=%pM TSF=0x%llx BCN=0x%llx diff=%lld @%lu\n",
"%pM TSF=0x%llx BCN=0x%llx diff=%lld @%lu\n",
mgmt->sa, mgmt->bssid, mgmt->sa, mgmt->bssid,
(unsigned long long)rx_timestamp, (unsigned long long)rx_timestamp,
(unsigned long long)beacon_timestamp, (unsigned long long)beacon_timestamp,
...@@ -557,8 +552,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, ...@@ -557,8 +552,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
if (beacon_timestamp > rx_timestamp) { if (beacon_timestamp > rx_timestamp) {
#ifdef CONFIG_MAC80211_IBSS_DEBUG #ifdef CONFIG_MAC80211_IBSS_DEBUG
printk(KERN_DEBUG "%s: beacon TSF higher than " pr_debug("%s: beacon TSF higher than local TSF - IBSS merge with BSSID %pM\n",
"local TSF - IBSS merge with BSSID %pM\n",
sdata->name, mgmt->bssid); sdata->name, mgmt->bssid);
#endif #endif
ieee80211_sta_join_ibss(sdata, bss); ieee80211_sta_join_ibss(sdata, bss);
...@@ -662,8 +656,8 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata) ...@@ -662,8 +656,8 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata)
if (ifibss->fixed_channel) if (ifibss->fixed_channel)
return; return;
printk(KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other " pr_debug("%s: No active IBSS STAs - trying to scan for other IBSS networks with same SSID (merge)\n",
"IBSS networks with same SSID (merge)\n", sdata->name); sdata->name);
ieee80211_request_internal_scan(sdata, ieee80211_request_internal_scan(sdata,
ifibss->ssid, ifibss->ssid_len, NULL); ifibss->ssid, ifibss->ssid_len, NULL);
...@@ -691,7 +685,7 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata) ...@@ -691,7 +685,7 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)
bssid[0] |= 0x02; bssid[0] |= 0x02;
} }
printk(KERN_DEBUG "%s: Creating new IBSS network, BSSID %pM\n", pr_debug("%s: Creating new IBSS network, BSSID %pM\n",
sdata->name, bssid); sdata->name, bssid);
capability = WLAN_CAPABILITY_IBSS; capability = WLAN_CAPABILITY_IBSS;
...@@ -724,7 +718,7 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata) ...@@ -724,7 +718,7 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
active_ibss = ieee80211_sta_active_ibss(sdata); active_ibss = ieee80211_sta_active_ibss(sdata);
#ifdef CONFIG_MAC80211_IBSS_DEBUG #ifdef CONFIG_MAC80211_IBSS_DEBUG
printk(KERN_DEBUG "%s: sta_find_ibss (active_ibss=%d)\n", pr_debug("%s: sta_find_ibss (active_ibss=%d)\n",
sdata->name, active_ibss); sdata->name, active_ibss);
#endif /* CONFIG_MAC80211_IBSS_DEBUG */ #endif /* CONFIG_MAC80211_IBSS_DEBUG */
...@@ -750,12 +744,11 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata) ...@@ -750,12 +744,11 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
bss = (void *)cbss->priv; bss = (void *)cbss->priv;
#ifdef CONFIG_MAC80211_IBSS_DEBUG #ifdef CONFIG_MAC80211_IBSS_DEBUG
printk(KERN_DEBUG " sta_find_ibss: selected %pM current " pr_debug(" sta_find_ibss: selected %pM current %pM\n",
"%pM\n", cbss->bssid, ifibss->bssid); cbss->bssid, ifibss->bssid);
#endif /* CONFIG_MAC80211_IBSS_DEBUG */ #endif /* CONFIG_MAC80211_IBSS_DEBUG */
printk(KERN_DEBUG "%s: Selected IBSS BSSID %pM" pr_debug("%s: Selected IBSS BSSID %pM based on configured SSID\n",
" based on configured SSID\n",
sdata->name, cbss->bssid); sdata->name, cbss->bssid);
ieee80211_sta_join_ibss(sdata, bss); ieee80211_sta_join_ibss(sdata, bss);
...@@ -764,14 +757,14 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata) ...@@ -764,14 +757,14 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
} }
#ifdef CONFIG_MAC80211_IBSS_DEBUG #ifdef CONFIG_MAC80211_IBSS_DEBUG
printk(KERN_DEBUG " did not try to join ibss\n"); pr_debug(" did not try to join ibss\n");
#endif /* CONFIG_MAC80211_IBSS_DEBUG */ #endif /* CONFIG_MAC80211_IBSS_DEBUG */
/* Selected IBSS not found in current scan results - try to scan */ /* Selected IBSS not found in current scan results - try to scan */
if (time_after(jiffies, ifibss->last_scan_completed + if (time_after(jiffies, ifibss->last_scan_completed +
IEEE80211_SCAN_INTERVAL)) { IEEE80211_SCAN_INTERVAL)) {
printk(KERN_DEBUG "%s: Trigger new scan to find an IBSS to " pr_debug("%s: Trigger new scan to find an IBSS to join\n",
"join\n", sdata->name); sdata->name);
ieee80211_request_internal_scan(sdata, ieee80211_request_internal_scan(sdata,
ifibss->ssid, ifibss->ssid_len, ifibss->ssid, ifibss->ssid_len,
...@@ -785,8 +778,8 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata) ...@@ -785,8 +778,8 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
ieee80211_sta_create_ibss(sdata); ieee80211_sta_create_ibss(sdata);
return; return;
} }
printk(KERN_DEBUG "%s: IBSS not allowed on" pr_debug("%s: IBSS not allowed on %d MHz\n",
" %d MHz\n", sdata->name, sdata->name,
local->hw.conf.channel->center_freq); local->hw.conf.channel->center_freq);
/* No IBSS found - decrease scan interval and continue /* No IBSS found - decrease scan interval and continue
...@@ -823,8 +816,7 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata, ...@@ -823,8 +816,7 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
tx_last_beacon = drv_tx_last_beacon(local); tx_last_beacon = drv_tx_last_beacon(local);
#ifdef CONFIG_MAC80211_IBSS_DEBUG #ifdef CONFIG_MAC80211_IBSS_DEBUG
printk(KERN_DEBUG "%s: RX ProbeReq SA=%pM DA=%pM BSSID=%pM" pr_debug("%s: RX ProbeReq SA=%pM DA=%pM BSSID=%pM (tx_last_beacon=%d)\n",
" (tx_last_beacon=%d)\n",
sdata->name, mgmt->sa, mgmt->da, sdata->name, mgmt->sa, mgmt->da,
mgmt->bssid, tx_last_beacon); mgmt->bssid, tx_last_beacon);
#endif /* CONFIG_MAC80211_IBSS_DEBUG */ #endif /* CONFIG_MAC80211_IBSS_DEBUG */
...@@ -841,8 +833,7 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata, ...@@ -841,8 +833,7 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
if (pos[0] != WLAN_EID_SSID || if (pos[0] != WLAN_EID_SSID ||
pos + 2 + pos[1] > end) { pos + 2 + pos[1] > end) {
#ifdef CONFIG_MAC80211_IBSS_DEBUG #ifdef CONFIG_MAC80211_IBSS_DEBUG
printk(KERN_DEBUG "%s: Invalid SSID IE in ProbeReq " pr_debug("%s: Invalid SSID IE in ProbeReq from %pM\n",
"from %pM\n",
sdata->name, mgmt->sa); sdata->name, mgmt->sa);
#endif #endif
return; return;
...@@ -862,8 +853,7 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata, ...@@ -862,8 +853,7 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata,
resp = (struct ieee80211_mgmt *) skb->data; resp = (struct ieee80211_mgmt *) skb->data;
memcpy(resp->da, mgmt->sa, ETH_ALEN); memcpy(resp->da, mgmt->sa, ETH_ALEN);
#ifdef CONFIG_MAC80211_IBSS_DEBUG #ifdef CONFIG_MAC80211_IBSS_DEBUG
printk(KERN_DEBUG "%s: Sending ProbeResp to %pM\n", pr_debug("%s: Sending ProbeResp to %pM\n", sdata->name, resp->da);
sdata->name, resp->da);
#endif /* CONFIG_MAC80211_IBSS_DEBUG */ #endif /* CONFIG_MAC80211_IBSS_DEBUG */
IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT; IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
ieee80211_tx_skb(sdata, skb); ieee80211_tx_skb(sdata, skb);
......
net/mac80211/iface.c
View file @ f0d23208
...@@ -58,7 +58,7 @@ static int ieee80211_change_mtu(struct net_device *dev, int new_mtu) ...@@ -58,7 +58,7 @@ static int ieee80211_change_mtu(struct net_device *dev, int new_mtu)
} }
#ifdef CONFIG_MAC80211_VERBOSE_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
printk(KERN_DEBUG "%s: setting MTU %d\n", dev->name, new_mtu); pr_debug("%s: setting MTU %d\n", dev->name, new_mtu);
#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
dev->mtu = new_mtu; dev->mtu = new_mtu;
return 0; return 0;
...@@ -1226,7 +1226,7 @@ static void ieee80211_assign_perm_addr(struct ieee80211_local *local, ...@@ -1226,7 +1226,7 @@ static void ieee80211_assign_perm_addr(struct ieee80211_local *local,
if (__ffs64(mask) + hweight64(mask) != fls64(mask)) { if (__ffs64(mask) + hweight64(mask) != fls64(mask)) {
/* not a contiguous mask ... not handled now! */ /* not a contiguous mask ... not handled now! */
printk(KERN_DEBUG "not contiguous\n"); pr_debug("not contiguous\n");
break; break;
} }
......
net/mac80211/mesh.c
View file @ f0d23208
...@@ -524,8 +524,7 @@ static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata, ...@@ -524,8 +524,7 @@ static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata,
bool free_plinks; bool free_plinks;
#ifdef CONFIG_MAC80211_VERBOSE_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
printk(KERN_DEBUG "%s: running mesh housekeeping\n", pr_debug("%s: running mesh housekeeping\n", sdata->name);
sdata->name);
#endif #endif
ieee80211_sta_expire(sdata, IEEE80211_MESH_PEER_INACTIVITY_LIMIT); ieee80211_sta_expire(sdata, IEEE80211_MESH_PEER_INACTIVITY_LIMIT);
......
net/mac80211/mesh_hwmp.c
View file @ f0d23208
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#ifdef CONFIG_MAC80211_VERBOSE_MHWMP_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_MHWMP_DEBUG
#define mhwmp_dbg(fmt, args...) \ #define mhwmp_dbg(fmt, args...) \
printk(KERN_DEBUG "Mesh HWMP (%s): " fmt "\n", sdata->name, ##args) pr_debug("Mesh HWMP (%s): " fmt "\n", sdata->name, ##args)
#else #else
#define mhwmp_dbg(fmt, args...) do { (void)(0); } while (0) #define mhwmp_dbg(fmt, args...) do { (void)(0); } while (0)
#endif #endif
......
net/mac80211/mesh_pathtbl.c
View file @ f0d23208
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "mesh.h" #include "mesh.h"
#ifdef CONFIG_MAC80211_VERBOSE_MPATH_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_MPATH_DEBUG
#define mpath_dbg(fmt, args...) printk(KERN_DEBUG fmt, ##args) #define mpath_dbg(fmt, args...) pr_debug(fmt, ##args)
#else #else
#define mpath_dbg(fmt, args...) do { (void)(0); } while (0) #define mpath_dbg(fmt, args...) do { (void)(0); } while (0)
#endif #endif
......
net/mac80211/mesh_plink.c
View file @ f0d23208
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "mesh.h" #include "mesh.h"
#ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG
#define mpl_dbg(fmt, args...) printk(KERN_DEBUG fmt, ##args) #define mpl_dbg(fmt, args...) pr_debug(fmt, ##args)
#else #else
#define mpl_dbg(fmt, args...) do { (void)(0); } while (0) #define mpl_dbg(fmt, args...) do { (void)(0); } while (0)
#endif #endif
......
net/mac80211/mesh_sync.c
View file @ f0d23208
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#ifdef CONFIG_MAC80211_VERBOSE_MESH_SYNC_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_MESH_SYNC_DEBUG
#define msync_dbg(fmt, args...) \ #define msync_dbg(fmt, args...) \
printk(KERN_DEBUG "Mesh sync (%s): " fmt "\n", sdata->name, ##args) pr_debug("Mesh sync (%s): " fmt "\n", sdata->name, ##args)
#else #else
#define msync_dbg(fmt, args...) do { (void)(0); } while (0) #define msync_dbg(fmt, args...) do { (void)(0); } while (0)
#endif #endif
......
net/mac80211/mlme.c
View file @ f0d23208
...@@ -1656,8 +1656,7 @@ static void __ieee80211_connection_loss(struct ieee80211_sub_if_data *sdata) ...@@ -1656,8 +1656,7 @@ static void __ieee80211_connection_loss(struct ieee80211_sub_if_data *sdata)
memcpy(bssid, ifmgd->associated->bssid, ETH_ALEN); memcpy(bssid, ifmgd->associated->bssid, ETH_ALEN);
printk(KERN_DEBUG "%s: Connection to AP %pM lost.\n", pr_debug("%s: Connection to AP %pM lost\n", sdata->name, bssid);
sdata->name, bssid);
ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH,
WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY, WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY,
...@@ -1791,7 +1790,7 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, ...@@ -1791,7 +1790,7 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
return RX_MGMT_NONE; return RX_MGMT_NONE;
if (status_code != WLAN_STATUS_SUCCESS) { if (status_code != WLAN_STATUS_SUCCESS) {
printk(KERN_DEBUG "%s: %pM denied authentication (status %d)\n", pr_debug("%s: %pM denied authentication (status %d)\n",
sdata->name, mgmt->sa, status_code); sdata->name, mgmt->sa, status_code);
ieee80211_destroy_auth_data(sdata, false); ieee80211_destroy_auth_data(sdata, false);
return RX_MGMT_CFG80211_RX_AUTH; return RX_MGMT_CFG80211_RX_AUTH;
...@@ -1815,7 +1814,7 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, ...@@ -1815,7 +1814,7 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
return RX_MGMT_NONE; return RX_MGMT_NONE;
} }
printk(KERN_DEBUG "%s: authenticated\n", sdata->name); pr_debug("%s: authenticated\n", sdata->name);
ifmgd->auth_data->done = true; ifmgd->auth_data->done = true;
ifmgd->auth_data->timeout = jiffies + IEEE80211_AUTH_WAIT_ASSOC; ifmgd->auth_data->timeout = jiffies + IEEE80211_AUTH_WAIT_ASSOC;
run_again(ifmgd, ifmgd->auth_data->timeout); run_again(ifmgd, ifmgd->auth_data->timeout);
...@@ -1828,8 +1827,7 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, ...@@ -1828,8 +1827,7 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
goto out_err; goto out_err;
} }
if (sta_info_move_state(sta, IEEE80211_STA_AUTH)) { if (sta_info_move_state(sta, IEEE80211_STA_AUTH)) {
printk(KERN_DEBUG "%s: failed moving %pM to auth\n", pr_debug("%s: failed moving %pM to auth\n", sdata->name, bssid);
sdata->name, bssid);
goto out_err; goto out_err;
} }
mutex_unlock(&sdata->local->sta_mtx); mutex_unlock(&sdata->local->sta_mtx);
...@@ -1863,7 +1861,7 @@ ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata, ...@@ -1863,7 +1861,7 @@ ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
reason_code = le16_to_cpu(mgmt->u.deauth.reason_code); reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
printk(KERN_DEBUG "%s: deauthenticated from %pM (Reason: %u)\n", pr_debug("%s: deauthenticated from %pM (Reason: %u)\n",
sdata->name, bssid, reason_code); sdata->name, bssid, reason_code);
ieee80211_set_disassoc(sdata, 0, 0, false, NULL); ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
...@@ -1894,7 +1892,7 @@ ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata, ...@@ -1894,7 +1892,7 @@ ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code); reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
printk(KERN_DEBUG "%s: disassociated from %pM (Reason: %u)\n", pr_debug("%s: disassociated from %pM (Reason: %u)\n",
sdata->name, mgmt->sa, reason_code); sdata->name, mgmt->sa, reason_code);
ieee80211_set_disassoc(sdata, 0, 0, false, NULL); ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
...@@ -1987,16 +1985,14 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, ...@@ -1987,16 +1985,14 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
capab_info = le16_to_cpu(mgmt->u.assoc_resp.capab_info); capab_info = le16_to_cpu(mgmt->u.assoc_resp.capab_info);
if ((aid & (BIT(15) | BIT(14))) != (BIT(15) | BIT(14))) if ((aid & (BIT(15) | BIT(14))) != (BIT(15) | BIT(14)))
printk(KERN_DEBUG pr_debug("%s: invalid AID value 0x%x; bits 15:14 not set\n",
"%s: invalid AID value 0x%x; bits 15:14 not set\n",
sdata->name, aid); sdata->name, aid);
aid &= ~(BIT(15) | BIT(14)); aid &= ~(BIT(15) | BIT(14));
ifmgd->broken_ap = false; ifmgd->broken_ap = false;
if (aid == 0 || aid > IEEE80211_MAX_AID) { if (aid == 0 || aid > IEEE80211_MAX_AID) {
printk(KERN_DEBUG pr_debug("%s: invalid AID value %d (out of range), turn off PS\n",
"%s: invalid AID value %d (out of range), turn off PS\n",
sdata->name, aid); sdata->name, aid);
aid = 0; aid = 0;
ifmgd->broken_ap = true; ifmgd->broken_ap = true;
...@@ -2006,7 +2002,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, ...@@ -2006,7 +2002,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems); ieee802_11_parse_elems(pos, len - (pos - (u8 *) mgmt), &elems);
if (!elems.supp_rates) { if (!elems.supp_rates) {
printk(KERN_DEBUG "%s: no SuppRates element in AssocResp\n", pr_debug("%s: no SuppRates element in AssocResp\n",
sdata->name); sdata->name);
return false; return false;
} }
...@@ -2047,8 +2043,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata, ...@@ -2047,8 +2043,7 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
if (!err && !(ifmgd->flags & IEEE80211_STA_CONTROL_PORT)) if (!err && !(ifmgd->flags & IEEE80211_STA_CONTROL_PORT))
err = sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED); err = sta_info_move_state(sta, IEEE80211_STA_AUTHORIZED);
if (err) { if (err) {
printk(KERN_DEBUG pr_debug("%s: failed to move station %pM to desired state\n",
"%s: failed to move station %pM to desired state\n",
sdata->name, sta->sta.addr); sdata->name, sta->sta.addr);
WARN_ON(__sta_info_destroy(sta)); WARN_ON(__sta_info_destroy(sta));
mutex_unlock(&sdata->local->sta_mtx); mutex_unlock(&sdata->local->sta_mtx);
...@@ -2132,8 +2127,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, ...@@ -2132,8 +2127,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
status_code = le16_to_cpu(mgmt->u.assoc_resp.status_code); status_code = le16_to_cpu(mgmt->u.assoc_resp.status_code);
aid = le16_to_cpu(mgmt->u.assoc_resp.aid); aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
printk(KERN_DEBUG "%s: RX %sssocResp from %pM (capab=0x%x " pr_debug("%s: RX %sssocResp from %pM (capab=0x%x status=%d aid=%d)\n",
"status=%d aid=%d)\n",
sdata->name, reassoc ? "Rea" : "A", mgmt->sa, sdata->name, reassoc ? "Rea" : "A", mgmt->sa,
capab_info, status_code, (u16)(aid & ~(BIT(15) | BIT(14)))); capab_info, status_code, (u16)(aid & ~(BIT(15) | BIT(14))));
...@@ -2146,8 +2140,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, ...@@ -2146,8 +2140,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
u32 tu, ms; u32 tu, ms;
tu = get_unaligned_le32(elems.timeout_int + 1); tu = get_unaligned_le32(elems.timeout_int + 1);
ms = tu * 1024 / 1000; ms = tu * 1024 / 1000;
printk(KERN_DEBUG "%s: %pM rejected association temporarily; " pr_debug("%s: %pM rejected association temporarily; comeback duration %u TU (%u ms)\n",
"comeback duration %u TU (%u ms)\n",
sdata->name, mgmt->sa, tu, ms); sdata->name, mgmt->sa, tu, ms);
assoc_data->timeout = jiffies + msecs_to_jiffies(ms); assoc_data->timeout = jiffies + msecs_to_jiffies(ms);
if (ms > IEEE80211_ASSOC_TIMEOUT) if (ms > IEEE80211_ASSOC_TIMEOUT)
...@@ -2158,11 +2151,11 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, ...@@ -2158,11 +2151,11 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
*bss = assoc_data->bss; *bss = assoc_data->bss;
if (status_code != WLAN_STATUS_SUCCESS) { if (status_code != WLAN_STATUS_SUCCESS) {
printk(KERN_DEBUG "%s: %pM denied association (code=%d)\n", pr_debug("%s: %pM denied association (code=%d)\n",
sdata->name, mgmt->sa, status_code); sdata->name, mgmt->sa, status_code);
ieee80211_destroy_assoc_data(sdata, false); ieee80211_destroy_assoc_data(sdata, false);
} else { } else {
printk(KERN_DEBUG "%s: associated\n", sdata->name); pr_debug("%s: associated\n", sdata->name);
if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) { if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) {
/* oops -- internal error -- send timeout for now */ /* oops -- internal error -- send timeout for now */
...@@ -2270,7 +2263,7 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata, ...@@ -2270,7 +2263,7 @@ static void ieee80211_rx_mgmt_probe_resp(struct ieee80211_sub_if_data *sdata,
if (ifmgd->auth_data && !ifmgd->auth_data->bss->proberesp_ies && if (ifmgd->auth_data && !ifmgd->auth_data->bss->proberesp_ies &&
ether_addr_equal(mgmt->bssid, ifmgd->auth_data->bss->bssid)) { ether_addr_equal(mgmt->bssid, ifmgd->auth_data->bss->bssid)) {
/* got probe response, continue with auth */ /* got probe response, continue with auth */
printk(KERN_DEBUG "%s: direct probe responded\n", sdata->name); pr_debug("%s: direct probe responded\n", sdata->name);
ifmgd->auth_data->tries = 0; ifmgd->auth_data->tries = 0;
ifmgd->auth_data->timeout = jiffies; ifmgd->auth_data->timeout = jiffies;
run_again(ifmgd, ifmgd->auth_data->timeout); run_again(ifmgd, ifmgd->auth_data->timeout);
...@@ -2631,7 +2624,7 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata) ...@@ -2631,7 +2624,7 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
auth_data->tries++; auth_data->tries++;
if (auth_data->tries > IEEE80211_AUTH_MAX_TRIES) { if (auth_data->tries > IEEE80211_AUTH_MAX_TRIES) {
printk(KERN_DEBUG "%s: authentication with %pM timed out\n", pr_debug("%s: authentication with %pM timed out\n",
sdata->name, auth_data->bss->bssid); sdata->name, auth_data->bss->bssid);
/* /*
...@@ -2644,7 +2637,7 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata) ...@@ -2644,7 +2637,7 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
} }
if (auth_data->bss->proberesp_ies) { if (auth_data->bss->proberesp_ies) {
printk(KERN_DEBUG "%s: send auth to %pM (try %d/%d)\n", pr_debug("%s: send auth to %pM (try %d/%d)\n",
sdata->name, auth_data->bss->bssid, auth_data->tries, sdata->name, auth_data->bss->bssid, auth_data->tries,
IEEE80211_AUTH_MAX_TRIES); IEEE80211_AUTH_MAX_TRIES);
...@@ -2656,7 +2649,7 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata) ...@@ -2656,7 +2649,7 @@ static int ieee80211_probe_auth(struct ieee80211_sub_if_data *sdata)
} else { } else {
const u8 *ssidie; const u8 *ssidie;
printk(KERN_DEBUG "%s: direct probe to %pM (try %d/%i)\n", pr_debug("%s: direct probe to %pM (try %d/%i)\n",
sdata->name, auth_data->bss->bssid, auth_data->tries, sdata->name, auth_data->bss->bssid, auth_data->tries,
IEEE80211_AUTH_MAX_TRIES); IEEE80211_AUTH_MAX_TRIES);
...@@ -2686,7 +2679,7 @@ static int ieee80211_do_assoc(struct ieee80211_sub_if_data *sdata) ...@@ -2686,7 +2679,7 @@ static int ieee80211_do_assoc(struct ieee80211_sub_if_data *sdata)
assoc_data->tries++; assoc_data->tries++;
if (assoc_data->tries > IEEE80211_ASSOC_MAX_TRIES) { if (assoc_data->tries > IEEE80211_ASSOC_MAX_TRIES) {
printk(KERN_DEBUG "%s: association with %pM timed out\n", pr_debug("%s: association with %pM timed out\n",
sdata->name, assoc_data->bss->bssid); sdata->name, assoc_data->bss->bssid);
/* /*
...@@ -2698,7 +2691,7 @@ static int ieee80211_do_assoc(struct ieee80211_sub_if_data *sdata) ...@@ -2698,7 +2691,7 @@ static int ieee80211_do_assoc(struct ieee80211_sub_if_data *sdata)
return -ETIMEDOUT; return -ETIMEDOUT;
} }
printk(KERN_DEBUG "%s: associate with %pM (try %d/%d)\n", pr_debug("%s: associate with %pM (try %d/%d)\n",
sdata->name, assoc_data->bss->bssid, assoc_data->tries, sdata->name, assoc_data->bss->bssid, assoc_data->tries,
IEEE80211_ASSOC_MAX_TRIES); IEEE80211_ASSOC_MAX_TRIES);
ieee80211_send_assoc(sdata); ieee80211_send_assoc(sdata);
...@@ -3069,10 +3062,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata, ...@@ -3069,10 +3062,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
* since we look at probe response/beacon data here * since we look at probe response/beacon data here
* it should be OK. * it should be OK.
*/ */
printk(KERN_DEBUG pr_debug("%s: Wrong control channel: center-freq: %d ht-cfreq: %d ht->primary_chan: %d band: %d - Disabling HT\n",
"%s: Wrong control channel: center-freq: %d"
" ht-cfreq: %d ht->primary_chan: %d"
" band: %d. Disabling HT.\n",
sdata->name, cbss->channel->center_freq, sdata->name, cbss->channel->center_freq,
ht_cfreq, ht_oper->primary_chan, ht_cfreq, ht_oper->primary_chan,
cbss->channel->band); cbss->channel->band);
...@@ -3099,8 +3089,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata, ...@@ -3099,8 +3089,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
if (!ieee80211_set_channel_type(local, sdata, channel_type)) { if (!ieee80211_set_channel_type(local, sdata, channel_type)) {
/* can only fail due to HT40+/- mismatch */ /* can only fail due to HT40+/- mismatch */
channel_type = NL80211_CHAN_HT20; channel_type = NL80211_CHAN_HT20;
printk(KERN_DEBUG pr_debug("%s: disabling 40 MHz due to multi-vif mismatch\n",
"%s: disabling 40 MHz due to multi-vif mismatch\n",
sdata->name); sdata->name);
ifmgd->flags |= IEEE80211_STA_DISABLE_40MHZ; ifmgd->flags |= IEEE80211_STA_DISABLE_40MHZ;
WARN_ON(!ieee80211_set_channel_type(local, sdata, WARN_ON(!ieee80211_set_channel_type(local, sdata,
...@@ -3130,8 +3119,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata, ...@@ -3130,8 +3119,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
* we can connect -- with a warning. * we can connect -- with a warning.
*/ */
if (!basic_rates && min_rate_index >= 0) { if (!basic_rates && min_rate_index >= 0) {
printk(KERN_DEBUG pr_debug("%s: No basic rates, using min rate instead\n",
"%s: No basic rates, using min rate instead.\n",
sdata->name); sdata->name);
basic_rates = BIT(min_rate_index); basic_rates = BIT(min_rate_index);
} }
...@@ -3158,8 +3146,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata, ...@@ -3158,8 +3146,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
err = sta_info_insert(sta); err = sta_info_insert(sta);
sta = NULL; sta = NULL;
if (err) { if (err) {
printk(KERN_DEBUG pr_debug("%s: failed to insert STA entry for the AP (error %d)\n",
"%s: failed to insert STA entry for the AP (error %d)\n",
sdata->name, err); sdata->name, err);
return err; return err;
} }
...@@ -3238,8 +3225,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, ...@@ -3238,8 +3225,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
if (ifmgd->associated) if (ifmgd->associated)
ieee80211_set_disassoc(sdata, 0, 0, false, NULL); ieee80211_set_disassoc(sdata, 0, 0, false, NULL);
printk(KERN_DEBUG "%s: authenticate with %pM\n", pr_debug("%s: authenticate with %pM\n", sdata->name, req->bss->bssid);
sdata->name, req->bss->bssid);
err = ieee80211_prep_connection(sdata, req->bss, false); err = ieee80211_prep_connection(sdata, req->bss, false);
if (err) if (err)
...@@ -3409,7 +3395,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, ...@@ -3409,7 +3395,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
* Wait up to one beacon interval ... * Wait up to one beacon interval ...
* should this be more if we miss one? * should this be more if we miss one?
*/ */
printk(KERN_DEBUG "%s: waiting for beacon from %pM\n", pr_debug("%s: waiting for beacon from %pM\n",
sdata->name, ifmgd->bssid); sdata->name, ifmgd->bssid);
assoc_data->timeout = TU_TO_EXP_TIME(req->bss->beacon_interval); assoc_data->timeout = TU_TO_EXP_TIME(req->bss->beacon_interval);
} else { } else {
...@@ -3429,7 +3415,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, ...@@ -3429,7 +3415,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
corrupt_type = "beacon"; corrupt_type = "beacon";
} else if (bss->corrupt_data & IEEE80211_BSS_CORRUPT_PROBE_RESP) } else if (bss->corrupt_data & IEEE80211_BSS_CORRUPT_PROBE_RESP)
corrupt_type = "probe response"; corrupt_type = "probe response";
printk(KERN_DEBUG "%s: associating with AP with corrupt %s\n", pr_debug("%s: associating with AP with corrupt %s\n",
sdata->name, corrupt_type); sdata->name, corrupt_type);
} }
...@@ -3459,8 +3445,7 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata, ...@@ -3459,8 +3445,7 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
return 0; return 0;
} }
printk(KERN_DEBUG pr_debug("%s: deauthenticating from %pM by local choice (reason=%d)\n",
"%s: deauthenticating from %pM by local choice (reason=%d)\n",
sdata->name, req->bssid, req->reason_code); sdata->name, req->bssid, req->reason_code);
if (ifmgd->associated && if (ifmgd->associated &&
...@@ -3503,7 +3488,7 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata, ...@@ -3503,7 +3488,7 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata,
return -ENOLINK; return -ENOLINK;
} }
printk(KERN_DEBUG "%s: disassociating from %pM by local choice (reason=%d)\n", pr_debug("%s: disassociating from %pM by local choice (reason=%d)\n",
sdata->name, req->bss->bssid, req->reason_code); sdata->name, req->bss->bssid, req->reason_code);
memcpy(bssid, req->bss->bssid, ETH_ALEN); memcpy(bssid, req->bss->bssid, ETH_ALEN);
......
net/mac80211/rx.c
View file @ f0d23208
...@@ -1137,7 +1137,7 @@ static void ap_sta_ps_start(struct sta_info *sta) ...@@ -1137,7 +1137,7 @@ static void ap_sta_ps_start(struct sta_info *sta)
if (!(local->hw.flags & IEEE80211_HW_AP_LINK_PS)) if (!(local->hw.flags & IEEE80211_HW_AP_LINK_PS))
drv_sta_notify(local, sdata, STA_NOTIFY_SLEEP, &sta->sta); drv_sta_notify(local, sdata, STA_NOTIFY_SLEEP, &sta->sta);
#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
printk(KERN_DEBUG "%s: STA %pM aid %d enters power save mode\n", pr_debug("%s: STA %pM aid %d enters power save mode\n",
sdata->name, sta->sta.addr, sta->sta.aid); sdata->name, sta->sta.addr, sta->sta.aid);
#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
} }
...@@ -1145,13 +1145,13 @@ static void ap_sta_ps_start(struct sta_info *sta) ...@@ -1145,13 +1145,13 @@ static void ap_sta_ps_start(struct sta_info *sta)
static void ap_sta_ps_end(struct sta_info *sta) static void ap_sta_ps_end(struct sta_info *sta)
{ {
#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
printk(KERN_DEBUG "%s: STA %pM aid %d exits power save mode\n", pr_debug("%s: STA %pM aid %d exits power save mode\n",
sta->sdata->name, sta->sta.addr, sta->sta.aid); sta->sdata->name, sta->sta.addr, sta->sta.aid);
#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
if (test_sta_flag(sta, WLAN_STA_PS_DRIVER)) { if (test_sta_flag(sta, WLAN_STA_PS_DRIVER)) {
#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
printk(KERN_DEBUG "%s: STA %pM aid %d driver-ps-blocked\n", pr_debug("%s: STA %pM aid %d driver-ps-blocked\n",
sta->sdata->name, sta->sta.addr, sta->sta.aid); sta->sdata->name, sta->sta.addr, sta->sta.aid);
#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
return; return;
...@@ -1387,9 +1387,7 @@ ieee80211_reassemble_add(struct ieee80211_sub_if_data *sdata, ...@@ -1387,9 +1387,7 @@ ieee80211_reassemble_add(struct ieee80211_sub_if_data *sdata,
#ifdef CONFIG_MAC80211_VERBOSE_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
struct ieee80211_hdr *hdr = struct ieee80211_hdr *hdr =
(struct ieee80211_hdr *) entry->skb_list.next->data; (struct ieee80211_hdr *) entry->skb_list.next->data;
printk(KERN_DEBUG "%s: RX reassembly removed oldest " pr_debug("%s: RX reassembly removed oldest fragment entry (idx=%d age=%lu seq=%d last_frag=%d addr1=%pM addr2=%pM\n",
"fragment entry (idx=%d age=%lu seq=%d last_frag=%d "
"addr1=%pM addr2=%pM\n",
sdata->name, idx, sdata->name, idx,
jiffies - entry->first_frag_time, entry->seq, jiffies - entry->first_frag_time, entry->seq,
entry->last_frag, hdr->addr1, hdr->addr2); entry->last_frag, hdr->addr1, hdr->addr2);
......
net/mac80211/sta_info.c
View file @ f0d23208
...@@ -333,8 +333,7 @@ static int sta_info_insert_drv_state(struct ieee80211_local *local, ...@@ -333,8 +333,7 @@ static int sta_info_insert_drv_state(struct ieee80211_local *local,
} }
if (sdata->vif.type == NL80211_IFTYPE_ADHOC) { if (sdata->vif.type == NL80211_IFTYPE_ADHOC) {
printk(KERN_DEBUG pr_debug("%s: failed to move IBSS STA %pM to state %d (%d) - keeping it anyway\n",
"%s: failed to move IBSS STA %pM to state %d (%d) - keeping it anyway.\n",
sdata->name, sta->sta.addr, state + 1, err); sdata->name, sta->sta.addr, state + 1, err);
err = 0; err = 0;
} }
...@@ -619,8 +618,7 @@ static bool sta_info_cleanup_expire_buffered_ac(struct ieee80211_local *local, ...@@ -619,8 +618,7 @@ static bool sta_info_cleanup_expire_buffered_ac(struct ieee80211_local *local,
local->total_ps_buffered--; local->total_ps_buffered--;
#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
printk(KERN_DEBUG "Buffered frame expired (STA %pM)\n", pr_debug("Buffered frame expired (STA %pM)\n", sta->sta.addr);
sta->sta.addr);
#endif #endif
dev_kfree_skb(skb); dev_kfree_skb(skb);
} }
...@@ -890,7 +888,7 @@ void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata, ...@@ -890,7 +888,7 @@ void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata,
if (time_after(jiffies, sta->last_rx + exp_time)) { if (time_after(jiffies, sta->last_rx + exp_time)) {
#ifdef CONFIG_MAC80211_IBSS_DEBUG #ifdef CONFIG_MAC80211_IBSS_DEBUG
printk(KERN_DEBUG "%s: expiring inactive STA %pM\n", pr_debug("%s: expiring inactive STA %pM\n",
sdata->name, sta->sta.addr); sdata->name, sta->sta.addr);
#endif #endif
WARN_ON(__sta_info_destroy(sta)); WARN_ON(__sta_info_destroy(sta));
...@@ -991,9 +989,8 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta) ...@@ -991,9 +989,8 @@ void ieee80211_sta_ps_deliver_wakeup(struct sta_info *sta)
sta_info_recalc_tim(sta); sta_info_recalc_tim(sta);
#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
printk(KERN_DEBUG "%s: STA %pM aid %d sending %d filtered/%d PS frames " pr_debug("%s: STA %pM aid %d sending %d filtered/%d PS frames since STA not sleeping anymore\n",
"since STA not sleeping anymore\n", sdata->name, sdata->name, sta->sta.addr, sta->sta.aid, filtered, buffered);
sta->sta.addr, sta->sta.aid, filtered, buffered);
#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
} }
...@@ -1385,7 +1382,7 @@ int sta_info_move_state(struct sta_info *sta, ...@@ -1385,7 +1382,7 @@ int sta_info_move_state(struct sta_info *sta,
} }
#ifdef CONFIG_MAC80211_VERBOSE_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
printk(KERN_DEBUG "%s: moving STA %pM to state %d\n", pr_debug("%s: moving STA %pM to state %d\n",
sta->sdata->name, sta->sta.addr, new_state); sta->sdata->name, sta->sta.addr, new_state);
#endif #endif
......
net/mac80211/status.c
View file @ f0d23208
...@@ -589,7 +589,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) ...@@ -589,7 +589,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
/* send frame to monitor interfaces now */ /* send frame to monitor interfaces now */
rtap_len = ieee80211_tx_radiotap_len(info); rtap_len = ieee80211_tx_radiotap_len(info);
if (WARN_ON_ONCE(skb_headroom(skb) < rtap_len)) { if (WARN_ON_ONCE(skb_headroom(skb) < rtap_len)) {
printk(KERN_ERR "ieee80211_tx_status: headroom too small\n"); pr_err("ieee80211_tx_status: headroom too small\n");
dev_kfree_skb(skb); dev_kfree_skb(skb);
return; return;
} }
......
net/mac80211/tkip.c
View file @ f0d23208
...@@ -263,12 +263,11 @@ int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm, ...@@ -263,12 +263,11 @@ int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
#ifdef CONFIG_MAC80211_TKIP_DEBUG #ifdef CONFIG_MAC80211_TKIP_DEBUG
{ {
int i; int i;
printk(KERN_DEBUG "TKIP decrypt: data(len=%zd)", payload_len); pr_debug("TKIP decrypt: data(len=%zd)", payload_len);
for (i = 0; i < payload_len; i++) for (i = 0; i < payload_len; i++)
printk(" %02x", payload[i]); printk(" %02x", payload[i]);
printk("\n"); printk("\n");
printk(KERN_DEBUG "TKIP decrypt: iv16=%04x iv32=%08x\n", pr_debug("TKIP decrypt: iv16=%04x iv32=%08x\n", iv16, iv32);
iv16, iv32);
} }
#endif #endif
...@@ -283,10 +282,9 @@ int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm, ...@@ -283,10 +282,9 @@ int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
(iv32 == key->u.tkip.rx[queue].iv32 && (iv32 == key->u.tkip.rx[queue].iv32 &&
iv16 <= key->u.tkip.rx[queue].iv16))) { iv16 <= key->u.tkip.rx[queue].iv16))) {
#ifdef CONFIG_MAC80211_TKIP_DEBUG #ifdef CONFIG_MAC80211_TKIP_DEBUG
printk(KERN_DEBUG "TKIP replay detected for RX frame from " pr_debug("TKIP replay detected for RX frame from %pM (RX IV (%04x,%02x) <= prev. IV (%04x,%02x)\n",
"%pM (RX IV (%04x,%02x) <= prev. IV (%04x,%02x)\n", ta, iv32, iv16,
ta, key->u.tkip.rx[queue].iv32,
iv32, iv16, key->u.tkip.rx[queue].iv32,
key->u.tkip.rx[queue].iv16); key->u.tkip.rx[queue].iv16);
#endif #endif
return TKIP_DECRYPT_REPLAY; return TKIP_DECRYPT_REPLAY;
...@@ -306,13 +304,12 @@ int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm, ...@@ -306,13 +304,12 @@ int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
{ {
int i; int i;
u8 key_offset = NL80211_TKIP_DATA_OFFSET_ENCR_KEY; u8 key_offset = NL80211_TKIP_DATA_OFFSET_ENCR_KEY;
printk(KERN_DEBUG "TKIP decrypt: Phase1 TA=%pM" pr_debug("TKIP decrypt: Phase1 TA=%pM TK=", ta);
" TK=", ta);
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
printk("%02x ", printk("%02x ",
key->conf.key[key_offset + i]); key->conf.key[key_offset + i]);
printk("\n"); printk("\n");
printk(KERN_DEBUG "TKIP decrypt: P1K="); pr_debug("TKIP decrypt: P1K=");
for (i = 0; i < 5; i++) for (i = 0; i < 5; i++)
printk("%04x ", key->u.tkip.rx[queue].p1k[i]); printk("%04x ", key->u.tkip.rx[queue].p1k[i]);
printk("\n"); printk("\n");
...@@ -336,7 +333,7 @@ int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm, ...@@ -336,7 +333,7 @@ int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
#ifdef CONFIG_MAC80211_TKIP_DEBUG #ifdef CONFIG_MAC80211_TKIP_DEBUG
{ {
int i; int i;
printk(KERN_DEBUG "TKIP decrypt: Phase2 rc4key="); pr_debug("TKIP decrypt: Phase2 rc4key=");
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
printk("%02x ", rc4key[i]); printk("%02x ", rc4key[i]);
printk("\n"); printk("\n");
......
net/mac80211/tx.c
View file @ f0d23208
...@@ -297,8 +297,7 @@ ieee80211_tx_h_check_assoc(struct ieee80211_tx_data *tx) ...@@ -297,8 +297,7 @@ ieee80211_tx_h_check_assoc(struct ieee80211_tx_data *tx)
if (unlikely(!assoc && if (unlikely(!assoc &&
ieee80211_is_data(hdr->frame_control))) { ieee80211_is_data(hdr->frame_control))) {
#ifdef CONFIG_MAC80211_VERBOSE_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
printk(KERN_DEBUG "%s: dropped data frame to not " pr_debug("%s: dropped data frame to not associated station %pM\n",
"associated station %pM\n",
tx->sdata->name, hdr->addr1); tx->sdata->name, hdr->addr1);
#endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
I802_DEBUG_INC(tx->local->tx_handlers_drop_not_assoc); I802_DEBUG_INC(tx->local->tx_handlers_drop_not_assoc);
...@@ -467,7 +466,7 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) ...@@ -467,7 +466,7 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)
} }
#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
printk(KERN_DEBUG "STA %pM aid %d: PS buffer for AC %d\n", pr_debug("STA %pM aid %d: PS buffer for AC %d\n",
sta->sta.addr, sta->sta.aid, ac); sta->sta.addr, sta->sta.aid, ac);
#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER) if (tx->local->total_ps_buffered >= TOTAL_MAX_TX_BUFFER)
...@@ -502,8 +501,7 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx) ...@@ -502,8 +501,7 @@ ieee80211_tx_h_unicast_ps_buf(struct ieee80211_tx_data *tx)
} }
#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
else if (unlikely(test_sta_flag(sta, WLAN_STA_PS_STA))) { else if (unlikely(test_sta_flag(sta, WLAN_STA_PS_STA))) {
printk(KERN_DEBUG pr_debug("%s: STA %pM in PS mode, but polling/in SP -> send frame\n",
"%s: STA %pM in PS mode, but polling/in SP -> send frame\n",
tx->sdata->name, sta->sta.addr); tx->sdata->name, sta->sta.addr);
} }
#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7