All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 0c68ae26 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller

mac80211: convert to %pM away from print_mac

Also remove a few stray DECLARE_MAC_BUF that were no longer
used at all.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dd45c9cf
...@@ -188,7 +188,6 @@ void ieee80211_debugfs_key_add(struct ieee80211_key *key) ...@@ -188,7 +188,6 @@ void ieee80211_debugfs_key_add(struct ieee80211_key *key)
{ {
static int keycount; static int keycount;
char buf[50]; char buf[50];
DECLARE_MAC_BUF(mac);
struct sta_info *sta; struct sta_info *sta;
if (!key->local->debugfs.keys) if (!key->local->debugfs.keys)
...@@ -206,8 +205,7 @@ void ieee80211_debugfs_key_add(struct ieee80211_key *key) ...@@ -206,8 +205,7 @@ void ieee80211_debugfs_key_add(struct ieee80211_key *key)
rcu_read_lock(); rcu_read_lock();
sta = rcu_dereference(key->sta); sta = rcu_dereference(key->sta);
if (sta) if (sta)
sprintf(buf, "../../stations/%s", sprintf(buf, "../../stations/%pM", sta->sta.addr);
print_mac(mac, sta->sta.addr));
rcu_read_unlock(); rcu_read_unlock();
/* using sta as a boolean is fine outside RCU lock */ /* using sta as a boolean is fine outside RCU lock */
......
...@@ -104,8 +104,7 @@ static ssize_t ieee80211_if_fmt_##name( \ ...@@ -104,8 +104,7 @@ static ssize_t ieee80211_if_fmt_##name( \
const struct ieee80211_sub_if_data *sdata, char *buf, \ const struct ieee80211_sub_if_data *sdata, char *buf, \
int buflen) \ int buflen) \
{ \ { \
DECLARE_MAC_BUF(mac); \ return scnprintf(buf, buflen, "%pM\n", sdata->field); \
return scnprintf(buf, buflen, "%s\n", print_mac(mac, sdata->field));\
} }
#define __IEEE80211_IF_FILE(name) \ #define __IEEE80211_IF_FILE(name) \
......
...@@ -246,15 +246,14 @@ STA_OPS_WR(agg_status); ...@@ -246,15 +246,14 @@ STA_OPS_WR(agg_status);
void ieee80211_sta_debugfs_add(struct sta_info *sta) void ieee80211_sta_debugfs_add(struct sta_info *sta)
{ {
struct dentry *stations_dir = sta->local->debugfs.stations; struct dentry *stations_dir = sta->local->debugfs.stations;
DECLARE_MAC_BUF(mbuf); u8 mac[3*ETH_ALEN];
u8 *mac;
sta->debugfs.add_has_run = true; sta->debugfs.add_has_run = true;
if (!stations_dir) if (!stations_dir)
return; return;
mac = print_mac(mbuf, sta->sta.addr); snprintf(mac, sizeof(mac), "%pM", sta->sta.addr);
/* /*
* This might fail due to a race condition: * This might fail due to a race condition:
......
...@@ -21,14 +21,13 @@ void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int ke ...@@ -21,14 +21,13 @@ void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int ke
{ {
union iwreq_data wrqu; union iwreq_data wrqu;
char *buf = kmalloc(128, GFP_ATOMIC); char *buf = kmalloc(128, GFP_ATOMIC);
DECLARE_MAC_BUF(mac);
if (buf) { if (buf) {
/* TODO: needed parameters: count, key type, TSC */ /* TODO: needed parameters: count, key type, TSC */
sprintf(buf, "MLME-MICHAELMICFAILURE.indication(" sprintf(buf, "MLME-MICHAELMICFAILURE.indication("
"keyid=%d %scast addr=%s)", "keyid=%d %scast addr=%pM)",
keyidx, hdr->addr1[0] & 0x01 ? "broad" : "uni", keyidx, hdr->addr1[0] & 0x01 ? "broad" : "uni",
print_mac(mac, hdr->addr2)); hdr->addr2);
memset(&wrqu, 0, sizeof(wrqu)); memset(&wrqu, 0, sizeof(wrqu));
wrqu.data.length = strlen(buf); wrqu.data.length = strlen(buf);
wireless_send_event(sdata->dev, IWEVCUSTOM, &wrqu, buf); wireless_send_event(sdata->dev, IWEVCUSTOM, &wrqu, buf);
......
...@@ -241,7 +241,6 @@ void ieee80211_sta_stop_rx_ba_session(struct ieee80211_sub_if_data *sdata, u8 *r ...@@ -241,7 +241,6 @@ void ieee80211_sta_stop_rx_ba_session(struct ieee80211_sub_if_data *sdata, u8 *r
struct ieee80211_hw *hw = &local->hw; struct ieee80211_hw *hw = &local->hw;
struct sta_info *sta; struct sta_info *sta;
int ret, i; int ret, i;
DECLARE_MAC_BUF(mac);
rcu_read_lock(); rcu_read_lock();
...@@ -269,8 +268,8 @@ void ieee80211_sta_stop_rx_ba_session(struct ieee80211_sub_if_data *sdata, u8 *r ...@@ -269,8 +268,8 @@ void ieee80211_sta_stop_rx_ba_session(struct ieee80211_sub_if_data *sdata, u8 *r
BUG_ON(!local->ops->ampdu_action); BUG_ON(!local->ops->ampdu_action);
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Rx BA session stop requested for %s tid %u\n", printk(KERN_DEBUG "Rx BA session stop requested for %pM tid %u\n",
print_mac(mac, ra), tid); ra, tid);
#endif /* CONFIG_MAC80211_HT_DEBUG */ #endif /* CONFIG_MAC80211_HT_DEBUG */
ret = local->ops->ampdu_action(hw, IEEE80211_AMPDU_RX_STOP, ret = local->ops->ampdu_action(hw, IEEE80211_AMPDU_RX_STOP,
...@@ -383,14 +382,13 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid) ...@@ -383,14 +382,13 @@ int ieee80211_start_tx_ba_session(struct ieee80211_hw *hw, u8 *ra, u16 tid)
u16 start_seq_num; u16 start_seq_num;
u8 *state; u8 *state;
int ret; int ret;
DECLARE_MAC_BUF(mac);
if (tid >= STA_TID_NUM) if (tid >= STA_TID_NUM)
return -EINVAL; return -EINVAL;
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Open BA session requested for %s tid %u\n", printk(KERN_DEBUG "Open BA session requested for %pM tid %u\n",
print_mac(mac, ra), tid); ra, tid);
#endif /* CONFIG_MAC80211_HT_DEBUG */ #endif /* CONFIG_MAC80211_HT_DEBUG */
rcu_read_lock(); rcu_read_lock();
...@@ -524,7 +522,6 @@ int ieee80211_stop_tx_ba_session(struct ieee80211_hw *hw, ...@@ -524,7 +522,6 @@ int ieee80211_stop_tx_ba_session(struct ieee80211_hw *hw,
struct sta_info *sta; struct sta_info *sta;
u8 *state; u8 *state;
int ret = 0; int ret = 0;
DECLARE_MAC_BUF(mac);
if (tid >= STA_TID_NUM) if (tid >= STA_TID_NUM)
return -EINVAL; return -EINVAL;
...@@ -546,8 +543,8 @@ int ieee80211_stop_tx_ba_session(struct ieee80211_hw *hw, ...@@ -546,8 +543,8 @@ int ieee80211_stop_tx_ba_session(struct ieee80211_hw *hw,
} }
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Tx BA session stop requested for %s tid %u\n", printk(KERN_DEBUG "Tx BA session stop requested for %pM tid %u\n",
print_mac(mac, ra), tid); ra, tid);
#endif /* CONFIG_MAC80211_HT_DEBUG */ #endif /* CONFIG_MAC80211_HT_DEBUG */
ieee80211_stop_queue(hw, sta->tid_to_tx_q[tid]); ieee80211_stop_queue(hw, sta->tid_to_tx_q[tid]);
...@@ -579,7 +576,6 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u16 tid) ...@@ -579,7 +576,6 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u16 tid)
struct ieee80211_local *local = hw_to_local(hw); struct ieee80211_local *local = hw_to_local(hw);
struct sta_info *sta; struct sta_info *sta;
u8 *state; u8 *state;
DECLARE_MAC_BUF(mac);
if (tid >= STA_TID_NUM) { if (tid >= STA_TID_NUM) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
...@@ -594,8 +590,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u16 tid) ...@@ -594,8 +590,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u16 tid)
if (!sta) { if (!sta) {
rcu_read_unlock(); rcu_read_unlock();
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Could not find station: %s\n", printk(KERN_DEBUG "Could not find station: %pM\n", ra);
print_mac(mac, ra));
#endif #endif
return; return;
} }
...@@ -634,7 +629,6 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u8 tid) ...@@ -634,7 +629,6 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u8 tid)
struct sta_info *sta; struct sta_info *sta;
u8 *state; u8 *state;
int agg_queue; int agg_queue;
DECLARE_MAC_BUF(mac);
if (tid >= STA_TID_NUM) { if (tid >= STA_TID_NUM) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
...@@ -645,16 +639,15 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u8 tid) ...@@ -645,16 +639,15 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u8 tid)
} }
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Stopping Tx BA session for %s tid %d\n", printk(KERN_DEBUG "Stopping Tx BA session for %pM tid %d\n",
print_mac(mac, ra), tid); ra, tid);
#endif /* CONFIG_MAC80211_HT_DEBUG */ #endif /* CONFIG_MAC80211_HT_DEBUG */
rcu_read_lock(); rcu_read_lock();
sta = sta_info_get(local, ra); sta = sta_info_get(local, ra);
if (!sta) { if (!sta) {
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
printk(KERN_DEBUG "Could not find station: %s\n", printk(KERN_DEBUG "Could not find station: %pM\n", ra);
print_mac(mac, ra));
#endif #endif
rcu_read_unlock(); rcu_read_unlock();
return; return;
...@@ -783,7 +776,6 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, ...@@ -783,7 +776,6 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
u16 capab, tid, timeout, ba_policy, buf_size, start_seq_num, status; u16 capab, tid, timeout, ba_policy, buf_size, start_seq_num, status;
u8 dialog_token; u8 dialog_token;
int ret = -EOPNOTSUPP; int ret = -EOPNOTSUPP;
DECLARE_MAC_BUF(mac);
/* extract session parameters from addba request frame */ /* extract session parameters from addba request frame */
dialog_token = mgmt->u.action.u.addba_req.dialog_token; dialog_token = mgmt->u.action.u.addba_req.dialog_token;
...@@ -808,8 +800,8 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, ...@@ -808,8 +800,8 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
if (net_ratelimit()) if (net_ratelimit())
printk(KERN_DEBUG "AddBA Req with bad params from " printk(KERN_DEBUG "AddBA Req with bad params from "
"%s on tid %u. policy %d, buffer size %d\n", "%pM on tid %u. policy %d, buffer size %d\n",
print_mac(mac, mgmt->sa), tid, ba_policy, mgmt->sa, tid, ba_policy,
buf_size); buf_size);
#endif /* CONFIG_MAC80211_HT_DEBUG */ #endif /* CONFIG_MAC80211_HT_DEBUG */
goto end_no_lock; goto end_no_lock;
...@@ -831,8 +823,8 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, ...@@ -831,8 +823,8 @@ void ieee80211_process_addba_request(struct ieee80211_local *local,
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
if (net_ratelimit()) if (net_ratelimit())
printk(KERN_DEBUG "unexpected AddBA Req from " printk(KERN_DEBUG "unexpected AddBA Req from "
"%s on tid %u\n", "%pM on tid %u\n",
print_mac(mac, mgmt->sa), tid); mgmt->sa, tid);
#endif /* CONFIG_MAC80211_HT_DEBUG */ #endif /* CONFIG_MAC80211_HT_DEBUG */
goto end; goto end;
} }
...@@ -964,7 +956,6 @@ void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata, ...@@ -964,7 +956,6 @@ void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
u16 tid, params; u16 tid, params;
u16 initiator; u16 initiator;
DECLARE_MAC_BUF(mac);
params = le16_to_cpu(mgmt->u.action.u.delba.params); params = le16_to_cpu(mgmt->u.action.u.delba.params);
tid = (params & IEEE80211_DELBA_PARAM_TID_MASK) >> 12; tid = (params & IEEE80211_DELBA_PARAM_TID_MASK) >> 12;
...@@ -972,9 +963,8 @@ void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata, ...@@ -972,9 +963,8 @@ void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata,
#ifdef CONFIG_MAC80211_HT_DEBUG #ifdef CONFIG_MAC80211_HT_DEBUG
if (net_ratelimit()) if (net_ratelimit())
printk(KERN_DEBUG "delba from %s (%s) tid %d reason code %d\n", printk(KERN_DEBUG "delba from %pM (%s) tid %d reason code %d\n",
print_mac(mac, mgmt->sa), mgmt->sa, initiator ? "initiator" : "recipient", tid,
initiator ? "initiator" : "recipient", tid,
mgmt->u.action.u.delba.reason_code); mgmt->u.action.u.delba.reason_code);
#endif /* CONFIG_MAC80211_HT_DEBUG */ #endif /* CONFIG_MAC80211_HT_DEBUG */
......
...@@ -132,7 +132,6 @@ static void ieee80211_key_enable_hw_accel(struct ieee80211_key *key) ...@@ -132,7 +132,6 @@ static void ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
{ {
const u8 *addr; const u8 *addr;
int ret; int ret;
DECLARE_MAC_BUF(mac);
assert_key_lock(); assert_key_lock();
might_sleep(); might_sleep();
...@@ -154,16 +153,15 @@ static void ieee80211_key_enable_hw_accel(struct ieee80211_key *key) ...@@ -154,16 +153,15 @@ static void ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
if (ret && ret != -ENOSPC && ret != -EOPNOTSUPP) if (ret && ret != -ENOSPC && ret != -EOPNOTSUPP)
printk(KERN_ERR "mac80211-%s: failed to set key " printk(KERN_ERR "mac80211-%s: failed to set key "
"(%d, %s) to hardware (%d)\n", "(%d, %pM) to hardware (%d)\n",
wiphy_name(key->local->hw.wiphy), wiphy_name(key->local->hw.wiphy),
key->conf.keyidx, print_mac(mac, addr), ret); key->conf.keyidx, addr, ret);
} }
static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key) static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
{ {
const u8 *addr; const u8 *addr;
int ret; int ret;
DECLARE_MAC_BUF(mac);
assert_key_lock(); assert_key_lock();
might_sleep(); might_sleep();
...@@ -186,9 +184,9 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key) ...@@ -186,9 +184,9 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
if (ret) if (ret)
printk(KERN_ERR "mac80211-%s: failed to remove key " printk(KERN_ERR "mac80211-%s: failed to remove key "
"(%d, %s) from hardware (%d)\n", "(%d, %pM) from hardware (%d)\n",
wiphy_name(key->local->hw.wiphy), wiphy_name(key->local->hw.wiphy),
key->conf.keyidx, print_mac(mac, addr), ret); key->conf.keyidx, addr, ret);
spin_lock(&todo_lock); spin_lock(&todo_lock);
key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE; key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE;
......
...@@ -257,9 +257,6 @@ static void mesh_plink_timer(unsigned long data) ...@@ -257,9 +257,6 @@ static void mesh_plink_timer(unsigned long data)
struct sta_info *sta; struct sta_info *sta;
__le16 llid, plid, reason; __le16 llid, plid, reason;
struct ieee80211_sub_if_data *sdata; struct ieee80211_sub_if_data *sdata;
#ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG
DECLARE_MAC_BUF(mac);
#endif
/* /*
* This STA is valid because sta_info_destroy() will * This STA is valid because sta_info_destroy() will
...@@ -274,8 +271,8 @@ static void mesh_plink_timer(unsigned long data) ...@@ -274,8 +271,8 @@ static void mesh_plink_timer(unsigned long data)
spin_unlock_bh(&sta->lock); spin_unlock_bh(&sta->lock);
return; return;
} }
mpl_dbg("Mesh plink timer for %s fired on state %d\n", mpl_dbg("Mesh plink timer for %pM fired on state %d\n",
print_mac(mac, sta->sta.addr), sta->plink_state); sta->sta.addr, sta->plink_state);
reason = 0; reason = 0;
llid = sta->llid; llid = sta->llid;
plid = sta->plid; plid = sta->plid;
...@@ -287,9 +284,9 @@ static void mesh_plink_timer(unsigned long data) ...@@ -287,9 +284,9 @@ static void mesh_plink_timer(unsigned long data)
/* retry timer */ /* retry timer */
if (sta->plink_retries < dot11MeshMaxRetries(sdata)) { if (sta->plink_retries < dot11MeshMaxRetries(sdata)) {
u32 rand; u32 rand;
mpl_dbg("Mesh plink for %s (retry, timeout): %d %d\n", mpl_dbg("Mesh plink for %pM (retry, timeout): %d %d\n",
print_mac(mac, sta->sta.addr), sta->sta.addr, sta->plink_retries,
sta->plink_retries, sta->plink_timeout); sta->plink_timeout);
get_random_bytes(&rand, sizeof(u32)); get_random_bytes(&rand, sizeof(u32));
sta->plink_timeout = sta->plink_timeout + sta->plink_timeout = sta->plink_timeout +
rand % sta->plink_timeout; rand % sta->plink_timeout;
...@@ -337,9 +334,6 @@ int mesh_plink_open(struct sta_info *sta) ...@@ -337,9 +334,6 @@ int mesh_plink_open(struct sta_info *sta)
{ {
__le16 llid; __le16 llid;
struct ieee80211_sub_if_data *sdata = sta->sdata; struct ieee80211_sub_if_data *sdata = sta->sdata;
#ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG
DECLARE_MAC_BUF(mac);
#endif
spin_lock_bh(&sta->lock); spin_lock_bh(&sta->lock);
get_random_bytes(&llid, 2); get_random_bytes(&llid, 2);
...@@ -351,8 +345,8 @@ int mesh_plink_open(struct sta_info *sta) ...@@ -351,8 +345,8 @@ int mesh_plink_open(struct sta_info *sta)
sta->plink_state = PLINK_OPN_SNT; sta->plink_state = PLINK_OPN_SNT;
mesh_plink_timer_set(sta, dot11MeshRetryTimeout(sdata)); mesh_plink_timer_set(sta, dot11MeshRetryTimeout(sdata));
spin_unlock_bh(&sta->lock); spin_unlock_bh(&sta->lock);
mpl_dbg("Mesh plink: starting establishment with %s\n", mpl_dbg("Mesh plink: starting establishment with %pM\n",
print_mac(mac, sta->sta.addr)); sta->sta.addr);
return mesh_plink_frame_tx(sdata, PLINK_OPEN, return mesh_plink_frame_tx(sdata, PLINK_OPEN,
sta->sta.addr, llid, 0, 0); sta->sta.addr, llid, 0, 0);
...@@ -360,10 +354,6 @@ int mesh_plink_open(struct sta_info *sta) ...@@ -360,10 +354,6 @@ int mesh_plink_open(struct sta_info *sta)
void mesh_plink_block(struct sta_info *sta) void mesh_plink_block(struct sta_info *sta)
{ {
#ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG
DECLARE_MAC_BUF(mac);
#endif
spin_lock_bh(&sta->lock); spin_lock_bh(&sta->lock);
__mesh_plink_deactivate(sta); __mesh_plink_deactivate(sta);
sta->plink_state = PLINK_BLOCKED; sta->plink_state = PLINK_BLOCKED;
...@@ -374,12 +364,8 @@ int mesh_plink_close(struct sta_info *sta) ...@@ -374,12 +364,8 @@ int mesh_plink_close(struct sta_info *sta)
{ {
struct ieee80211_sub_if_data *sdata = sta->sdata; struct ieee80211_sub_if_data *sdata = sta->sdata;
__le16 llid, plid, reason; __le16 llid, plid, reason;
#ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG
DECLARE_MAC_BUF(mac);
#endif
mpl_dbg("Mesh plink: closing link with %s\n", mpl_dbg("Mesh plink: closing link with %pM\n", sta->sta.addr);
print_mac(mac, sta->sta.addr));
spin_lock_bh(&sta->lock); spin_lock_bh(&sta->lock);
sta->reason = cpu_to_le16(MESH_LINK_CANCELLED); sta->reason = cpu_to_le16(MESH_LINK_CANCELLED);
reason = sta->reason; reason = sta->reason;
...@@ -417,9 +403,6 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m ...@@ -417,9 +403,6 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
u8 ie_len; u8 ie_len;
u8 *baseaddr; u8 *baseaddr;
__le16 plid, llid, reason; __le16 plid, llid, reason;
#ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG
DECLARE_MAC_BUF(mac);
#endif
/* need action_code, aux */ /* need action_code, aux */
if (len < IEEE80211_MIN_ACTION_SIZE + 3) if (len < IEEE80211_MIN_ACTION_SIZE + 3)
...@@ -557,10 +540,10 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m ...@@ -557,10 +540,10 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
} }
} }
mpl_dbg("Mesh plink (peer, state, llid, plid, event): %s %d %d %d %d\n", mpl_dbg("Mesh plink (peer, state, llid, plid, event): %pM %d %d %d %d\n",
print_mac(mac, mgmt->sa), sta->plink_state, mgmt->sa, sta->plink_state,
le16_to_cpu(sta->llid), le16_to_cpu(sta->plid), le16_to_cpu(sta->llid), le16_to_cpu(sta->plid),
event); event);
reason = 0; reason = 0;
switch (sta->plink_state) { switch (sta->plink_state) {
/* spin_unlock as soon as state is updated at each case */ /* spin_unlock as soon as state is updated at each case */
...@@ -660,8 +643,8 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m ...@@ -660,8 +643,8 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
sta->plink_state = PLINK_ESTAB; sta->plink_state = PLINK_ESTAB;
mesh_plink_inc_estab_count(sdata); mesh_plink_inc_estab_count(sdata);
spin_unlock_bh(&sta->lock); spin_unlock_bh(&sta->lock);
mpl_dbg("Mesh plink with %s ESTABLISHED\n", mpl_dbg("Mesh plink with %pM ESTABLISHED\n",
print_mac(mac, sta->sta.addr)); sta->sta.addr);
break; break;
default: default:
spin_unlock_bh(&sta->lock); spin_unlock_bh(&sta->lock);
...@@ -693,8 +676,8 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m ...@@ -693,8 +676,8 @@ void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_m
sta->plink_state = PLINK_ESTAB; sta->plink_state = PLINK_ESTAB;
mesh_plink_inc_estab_count(sdata); mesh_plink_inc_estab_count(sdata);
spin_unlock_bh(&sta->lock); spin_unlock_bh(&sta->lock);
mpl_dbg("Mesh plink with %s ESTABLISHED\n", mpl_dbg("Mesh plink with %pM ESTABLISHED\n",
print_mac(mac, sta->sta.addr)); sta->sta.addr);
mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->sta.addr, llid, mesh_plink_frame_tx(sdata, PLINK_CONFIRM, sta->sta.addr, llid,
plid, 0); plid, 0);
break; break;
......
This diff is collapsed.
...@@ -653,13 +653,12 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx) ...@@ -653,13 +653,12 @@ ieee80211_rx_h_decrypt(struct ieee80211_rx_data *rx)
static void ap_sta_ps_start(struct sta_info *sta) static void ap_sta_ps_start(struct sta_info *sta)
{ {
struct ieee80211_sub_if_data *sdata = sta->sdata; struct ieee80211_sub_if_data *sdata = sta->sdata;
DECLARE_MAC_BUF(mac);
atomic_inc(&sdata->bss->num_sta_ps); atomic_inc(&sdata->bss->num_sta_ps);
set_and_clear_sta_flags(sta, WLAN_STA_PS, WLAN_STA_PSPOLL); set_and_clear_sta_flags(sta, WLAN_STA_PS, WLAN_STA_PSPOLL);
#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
printk(KERN_DEBUG "%s: STA %s aid %d enters power save mode\n", printk(KERN_DEBUG "%s: STA %pM aid %d enters power save mode\n",
sdata->dev->name, print_mac(mac, sta->sta.addr), sta->sta.aid); sdata->dev->name, sta->sta.addr, sta->sta.aid);
#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
} }
...@@ -670,7 +669,6 @@ static int ap_sta_ps_end(struct sta_info *sta) ...@@ -670,7 +669,6 @@ static int ap_sta_ps_end(struct sta_info *sta)
struct sk_buff *skb; struct sk_buff *skb;
int sent = 0; int sent = 0;
struct ieee80211_tx_info *info; struct ieee80211_tx_info *info;
DECLARE_MAC_BUF(mac);
atomic_dec(&sdata->bss->num_sta_ps); atomic_dec(&sdata->bss->num_sta_ps);
...@@ -680,8 +678,8 @@ static int ap_sta_ps_end(struct sta_info *sta) ...@@ -680,8 +678,8 @@ static int ap_sta_ps_end(struct sta_info *sta)
sta_info_clear_tim_bit(sta); sta_info_clear_tim_bit(sta);
#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
printk(KERN_DEBUG "%s: STA %s aid %d exits power save mode\n", printk(KERN_DEBUG "%s: STA %pM aid %d exits power save mode\n",
sdata->dev->name, print_mac(mac, sta->sta.addr), sta->sta.aid); sdata->dev->name, sta->sta.addr, sta->sta.aid);
#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
/* Send all buffered frames to the station */ /* Send all buffered frames to the station */
...@@ -696,9 +694,9 @@ static int ap_sta_ps_end(struct sta_info *sta) ...@@ -696,9 +694,9 @@ static int ap_sta_ps_end(struct sta_info *sta)
local->total_ps_buffered--; local->total_ps_buffered--;
sent++; sent++;
#ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
printk(KERN_DEBUG "%s: STA %s aid %d send PS frame " printk(KERN_DEBUG "%s: STA %pM aid %d send PS frame "
"since STA not sleeping anymore\n", sdata->dev->name, "since STA not sleeping anymore\n", sdata->dev->name,
print_mac(mac, sta->sta.addr), sta->sta.aid); sta->sta.addr, sta->sta.aid);
#endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */ #endif /* CONFIG_MAC80211_VERBOSE_PS_DEBUG */
info->flags |= IEEE80211_TX_CTL_REQUEUE; info->flags |= IEEE80211_TX_CTL_REQUEUE;
dev_queue_xmit(skb); dev_queue_xmit(skb);
...@@ -789,15 +787,12 @@ ieee80211_reassemble_add(struct ieee80211_sub_if_data *sdata, ...@@ -789,15 +787,12 @@ 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;
DECLARE_MAC_BUF(mac);
DECLARE_MAC_BUF(mac2);
printk(KERN_DEBUG "%s: RX reassembly removed oldest " printk(KERN_DEBUG "%s: RX reassembly removed oldest "
"fragment entry (idx=%d age=%lu seq=%d last_frag=%d " "fragment entry (idx=%d age=%lu seq=%d last_frag=%d "
"addr1=%s addr2=%s\n", "addr1=%pM addr2=%pM\n",
sdata->dev->name, idx, sdata->dev->name, idx,
jiffies - entry->first_frag_time, entry->seq, jiffies - entry->first_frag_time, entry->seq,
entry->last_frag, print_mac(mac, hdr->addr1), entry->last_frag, hdr->addr1, hdr->addr2);
print_mac(mac2, hdr->addr2));
#endif