net: convert print_mac to %pM
This converts pretty much everything to print_mac. There were a few things that had conflicts which I have just dropped for now, no harm done. I've built an allyesconfig with this and looked at the files that weren't built very carefully, but it's a huge patch. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: David S. Miller <davem@davemloft.net>
这个提交包含在:
@@ -830,10 +830,8 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
|
||||
/* Find (or create) index into station table for destination station */
|
||||
sta_id = iwl_get_sta_id(priv, hdr);
|
||||
if (sta_id == IWL_INVALID_STATION) {
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
IWL_DEBUG_DROP("Dropping - INVALID STATION: %s\n",
|
||||
print_mac(mac, hdr->addr1));
|
||||
IWL_DEBUG_DROP("Dropping - INVALID STATION: %pM\n",
|
||||
hdr->addr1);
|
||||
goto drop;
|
||||
}
|
||||
|
||||
@@ -1248,15 +1246,14 @@ int iwl_tx_agg_start(struct iwl_priv *priv, const u8 *ra, u16 tid, u16 *ssn)
|
||||
int ret;
|
||||
unsigned long flags;
|
||||
struct iwl_tid_data *tid_data;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
if (likely(tid < ARRAY_SIZE(default_tid_to_tx_fifo)))
|
||||
tx_fifo = default_tid_to_tx_fifo[tid];
|
||||
else
|
||||
return -EINVAL;
|
||||
|
||||
IWL_WARNING("%s on ra = %s tid = %d\n",
|
||||
__func__, print_mac(mac, ra), tid);
|
||||
IWL_WARNING("%s on ra = %pM tid = %d\n",
|
||||
__func__, ra, tid);
|
||||
|
||||
sta_id = iwl_find_station(priv, ra);
|
||||
if (sta_id == IWL_INVALID_STATION)
|
||||
@@ -1301,7 +1298,6 @@ int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid)
|
||||
struct iwl_tid_data *tid_data;
|
||||
int ret, write_ptr, read_ptr;
|
||||
unsigned long flags;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
if (!ra) {
|
||||
IWL_ERROR("ra = NULL\n");
|
||||
@@ -1467,7 +1463,6 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv,
|
||||
int index;
|
||||
struct iwl_tx_queue *txq = NULL;
|
||||
struct iwl_ht_agg *agg;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
/* "flow" corresponds to Tx queue */
|
||||
u16 scd_flow = le16_to_cpu(ba_resp->scd_flow);
|
||||
@@ -1489,10 +1484,10 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv,
|
||||
|
||||
/* TODO: Need to get this copy more safely - now good for debug */
|
||||
|
||||
IWL_DEBUG_TX_REPLY("REPLY_COMPRESSED_BA [%d]Received from %s, "
|
||||
IWL_DEBUG_TX_REPLY("REPLY_COMPRESSED_BA [%d]Received from %pM, "
|
||||
"sta_id = %d\n",
|
||||
agg->wait_for_ba,
|
||||
print_mac(mac, (u8 *) &ba_resp->sta_addr_lo32),
|
||||
(u8 *) &ba_resp->sta_addr_lo32,
|
||||
ba_resp->sta_id);
|
||||
IWL_DEBUG_TX_REPLY("TID = %d, SeqCtl = %d, bitmap = 0x%llx, scd_flow = "
|
||||
"%d, scd_ssn = %d\n",
|
||||
|
在新工单中引用
屏蔽一个用户