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

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

net/mac80211/debugfs_key.c

+1 −3
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ void ieee80211_debugfs_key_add(struct ieee80211_key *key) 
  {

	static int keycount;

	char buf[50];

	DECLARE_MAC_BUF(mac);

	struct sta_info *sta;



	if (!key->local->debugfs.keys)
@@ -206,8 +205,7 @@ void ieee80211_debugfs_key_add(struct ieee80211_key *key) 
	rcu_read_lock();

	sta = rcu_dereference(key->sta);

	if (sta)

		sprintf(buf, "../../stations/%s",

			print_mac(mac, sta->sta.addr));

		sprintf(buf, "../../stations/%pM", sta->sta.addr);

	rcu_read_unlock();



	/* using sta as a boolean is fine outside RCU lock */

net/mac80211/debugfs_netdev.c

+1 −2
Original line number Diff line number Diff line
@@ -104,8 +104,7 @@ static ssize_t ieee80211_if_fmt_##name( \ 
	const struct ieee80211_sub_if_data *sdata, char *buf,		\

	int buflen)							\

{									\

	DECLARE_MAC_BUF(mac);						\

	return scnprintf(buf, buflen, "%s\n", print_mac(mac, sdata->field));\

	return scnprintf(buf, buflen, "%pM\n", sdata->field);		\

}



#define __IEEE80211_IF_FILE(name)					\

net/mac80211/debugfs_sta.c

+2 −3
Original line number Diff line number Diff line
@@ -246,15 +246,14 @@ STA_OPS_WR(agg_status); 
void ieee80211_sta_debugfs_add(struct sta_info *sta)

{

	struct dentry *stations_dir = sta->local->debugfs.stations;

	DECLARE_MAC_BUF(mbuf);

	u8 *mac;

	u8 mac[3*ETH_ALEN];



	sta->debugfs.add_has_run = true;



	if (!stations_dir)

		return;



	mac = print_mac(mbuf, sta->sta.addr);

	snprintf(mac, sizeof(mac), "%pM", sta->sta.addr);



	/*

	 * This might fail due to a race condition:

net/mac80211/event.c

+2 −3
Original line number Diff line number Diff line
@@ -21,14 +21,13 @@ void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int ke 
{

	union iwreq_data wrqu;

	char *buf = kmalloc(128, GFP_ATOMIC);

	DECLARE_MAC_BUF(mac);



	if (buf) {

		/* TODO: needed parameters: count, key type, TSC */

		sprintf(buf, "MLME-MICHAELMICFAILURE.indication("

			"keyid=%d %scast addr=%s)",

			"keyid=%d %scast addr=%pM)",

			keyidx, hdr->addr1[0] & 0x01 ? "broad" : "uni",

			print_mac(mac, hdr->addr2));

			hdr->addr2);

		memset(&wrqu, 0, sizeof(wrqu));

		wrqu.data.length = strlen(buf);

		wireless_send_event(sdata->dev, IWEVCUSTOM, &wrqu, buf);

net/mac80211/ht.c

+16 −26
Original line number Diff line number Diff line
@@ -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 sta_info *sta;

	int ret, i;

	DECLARE_MAC_BUF(mac);



	rcu_read_lock();
@@ -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);



#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "Rx BA session stop requested for %s tid %u\n",

				print_mac(mac, ra), tid);

	printk(KERN_DEBUG "Rx BA session stop requested for %pM tid %u\n",

	       ra, tid);

#endif /* CONFIG_MAC80211_HT_DEBUG */



	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) 
	u16 start_seq_num;

	u8 *state;

	int ret;

	DECLARE_MAC_BUF(mac);



	if (tid >= STA_TID_NUM)

		return -EINVAL;



#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "Open BA session requested for %s tid %u\n",

				print_mac(mac, ra), tid);

	printk(KERN_DEBUG "Open BA session requested for %pM tid %u\n",

	       ra, tid);

#endif /* CONFIG_MAC80211_HT_DEBUG */



	rcu_read_lock();
@@ -524,7 +522,6 @@ int ieee80211_stop_tx_ba_session(struct ieee80211_hw *hw, 
	struct sta_info *sta;

	u8 *state;

	int ret = 0;

	DECLARE_MAC_BUF(mac);



	if (tid >= STA_TID_NUM)

		return -EINVAL;
@@ -546,8 +543,8 @@ int ieee80211_stop_tx_ba_session(struct ieee80211_hw *hw, 
	}



#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "Tx BA session stop requested for %s tid %u\n",

				print_mac(mac, ra), tid);

	printk(KERN_DEBUG "Tx BA session stop requested for %pM tid %u\n",

	       ra, tid);

#endif /* CONFIG_MAC80211_HT_DEBUG */



	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) 
	struct ieee80211_local *local = hw_to_local(hw);

	struct sta_info *sta;

	u8 *state;

	DECLARE_MAC_BUF(mac);



	if (tid >= STA_TID_NUM) {

#ifdef CONFIG_MAC80211_HT_DEBUG
@@ -594,8 +590,7 @@ void ieee80211_start_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u16 tid) 
	if (!sta) {

		rcu_read_unlock();

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "Could not find station: %s\n",

				print_mac(mac, ra));

		printk(KERN_DEBUG "Could not find station: %pM\n", ra);

#endif

		return;

	}
@@ -634,7 +629,6 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u8 tid) 
	struct sta_info *sta;

	u8 *state;

	int agg_queue;

	DECLARE_MAC_BUF(mac);



	if (tid >= STA_TID_NUM) {

#ifdef CONFIG_MAC80211_HT_DEBUG
@@ -645,16 +639,15 @@ void ieee80211_stop_tx_ba_cb(struct ieee80211_hw *hw, u8 *ra, u8 tid) 
	}



#ifdef CONFIG_MAC80211_HT_DEBUG

	printk(KERN_DEBUG "Stopping Tx BA session for %s tid %d\n",

				print_mac(mac, ra), tid);

	printk(KERN_DEBUG "Stopping Tx BA session for %pM tid %d\n",

	       ra, tid);

#endif /* CONFIG_MAC80211_HT_DEBUG */



	rcu_read_lock();

	sta = sta_info_get(local, ra);

	if (!sta) {

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "Could not find station: %s\n",

				print_mac(mac, ra));

		printk(KERN_DEBUG "Could not find station: %pM\n", ra);

#endif

		rcu_read_unlock();

		return;
@@ -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;

	u8 dialog_token;

	int ret = -EOPNOTSUPP;

	DECLARE_MAC_BUF(mac);



	/* extract session parameters from addba request frame */

	dialog_token = mgmt->u.action.u.addba_req.dialog_token;
@@ -808,8 +800,8 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, 
#ifdef CONFIG_MAC80211_HT_DEBUG

		if (net_ratelimit())

			printk(KERN_DEBUG "AddBA Req with bad params from "

				"%s on tid %u. policy %d, buffer size %d\n",

				print_mac(mac, mgmt->sa), tid, ba_policy,

				"%pM on tid %u. policy %d, buffer size %d\n",

				mgmt->sa, tid, ba_policy,

				buf_size);

#endif /* CONFIG_MAC80211_HT_DEBUG */

		goto end_no_lock;
@@ -831,8 +823,8 @@ void ieee80211_process_addba_request(struct ieee80211_local *local, 
#ifdef CONFIG_MAC80211_HT_DEBUG

		if (net_ratelimit())

			printk(KERN_DEBUG "unexpected AddBA Req from "

				"%s on tid %u\n",

				print_mac(mac, mgmt->sa), tid);

				"%pM on tid %u\n",

				mgmt->sa, tid);

#endif /* CONFIG_MAC80211_HT_DEBUG */

		goto end;

	}
@@ -964,7 +956,6 @@ void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata, 
	struct ieee80211_local *local = sdata->local;

	u16 tid, params;

	u16 initiator;

	DECLARE_MAC_BUF(mac);



	params = le16_to_cpu(mgmt->u.action.u.delba.params);

	tid = (params & IEEE80211_DELBA_PARAM_TID_MASK) >> 12;
@@ -972,9 +963,8 @@ void ieee80211_process_delba(struct ieee80211_sub_if_data *sdata, 


#ifdef CONFIG_MAC80211_HT_DEBUG

	if (net_ratelimit())

		printk(KERN_DEBUG "delba from %s (%s) tid %d reason code %d\n",

			print_mac(mac, mgmt->sa),

			initiator ? "initiator" : "recipient", tid,

		printk(KERN_DEBUG "delba from %pM (%s) tid %d reason code %d\n",

			mgmt->sa, initiator ? "initiator" : "recipient", tid,

			mgmt->u.action.u.delba.reason_code);

#endif /* CONFIG_MAC80211_HT_DEBUG */