[PATCH 2/6] staging: csr: print MAC addresses via %pM
Signed-off-by: Andy Shevchenko
Cc: Lauri Hintsala
---
drivers/staging/csr/sme_mgt.c | 10 ++
drivers/staging/csr/sme_sys.c | 29
drivers/staging/csr/sme_wext.c | 27 ++
drivers/staging/csr/unifi_pdu_processing.c |8 ++--
drivers/staging/csr/unifi_priv.h | 13 -
drivers/staging/csr/unifi_sme.c|3 ++-
6 files changed, 28 insertions(+), 62 deletions(-)
diff --git a/drivers/staging/csr/sme_mgt.c b/drivers/staging/csr/sme_mgt.c
index ab70216..c27c0a7 100644
--- a/drivers/staging/csr/sme_mgt.c
+++ b/drivers/staging/csr/sme_mgt.c
@@ -838,14 +838,8 @@ void CsrWifiSmeMediaStatusIndHandler(void* drvpriv,
CsrWifiFsmEvent* msg)
(unsigned char
*)ind->connectionInfo.assocScanInfoElements,
ind->connectionInfo.assocScanInfoElementsLength);
-unifi_trace(priv, UDBG2,
-"CsrWifiSmeMediaStatusIndSend:
IBSS=%02X:%02X:%02X:%02X:%02X:%02X\n",
-ind->connectionInfo.bssid.a[0],
-ind->connectionInfo.bssid.a[1],
-ind->connectionInfo.bssid.a[2],
-ind->connectionInfo.bssid.a[3],
-ind->connectionInfo.bssid.a[4],
-ind->connectionInfo.bssid.a[5]);
+ unifi_trace(priv, UDBG2, "CsrWifiSmeMediaStatusIndSend: IBSS=%pM\n",
+ind->connectionInfo.bssid.a);
sme_mgt_packet_filter_set(priv);
diff --git a/drivers/staging/csr/sme_sys.c b/drivers/staging/csr/sme_sys.c
index 283e302..9c3aa74 100644
--- a/drivers/staging/csr/sme_sys.c
+++ b/drivers/staging/csr/sme_sys.c
@@ -527,11 +527,9 @@ configure_data_port(unifi_priv_t *priv,
controlled_string = "uncontrolled";
}
-unifi_trace(priv, UDBG2, "port config request
%02x:%02x:%02x:%02x:%02x:%02x %s with port_action %d.\n",
-macAddress->a[0], macAddress->a[1], macAddress->a[2],
-macAddress->a[3], macAddress->a[4], macAddress->a[5],
-controlled_string, port_action);
-
+ unifi_trace(priv, UDBG2,
+ "port config request %pM %s with port_action %d.\n",
+ macAddress->a, controlled_string, port_action);
/* If the new configuration has the broadcast MAC address or if we are in
infrastructure mode then clear the list first and set port overide mode */
if ((CSR_WIFI_ROUTER_CTRL_MODE_STA == interfacePriv->interfaceMode ||
@@ -653,10 +651,9 @@ configure_data_port(unifi_priv_t *priv,
uf_free_pending_rx_packets(priv, queue, *macAddress,interfaceTag);
}
-unifi_trace(priv, UDBG2, "port config %02x:%02x:%02x:%02x:%02x:%02x
with port_action %d.\n",
-*(macAddress->a+0), *(macAddress->a+1), *(macAddress->a+2),
-*(macAddress->a+3), *(macAddress->a+4), *(macAddress->a+5),
-port_action);
+ unifi_trace(priv, UDBG2,
+ "port config %pM with port_action %d.\n",
+ macAddress->a, port_action);
}
return 0;
} /* configure_data_port() */
@@ -2649,11 +2646,9 @@ CsrBool blockack_session_stop(unifi_priv_t *priv,
return FALSE;
}
-unifi_warning(priv, "%s: stopping ba_session for peer =
%02x:%02x:%02x:%02x:%02x:%02x role = %d tID = %d\n", __FUNCTION__,
- macAddress.a[0], macAddress.a[1], macAddress.a[2],
- macAddress.a[3], macAddress.a[4], macAddress.a[5],
- role,
- tID);
+ unifi_warning(priv,
+ "%s: stopping ba_session for peer = %pM role = %d tID = %d\n",
+ __func__, macAddress.a, role, tID);
/* find out the appropriate ba session (/station /tid /role) for which
stop is requested */
if (role == CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_RECIPIENT){
@@ -2781,9 +2776,9 @@ CsrBool blockack_session_start(unifi_priv_t *priv,
return FALSE;
}
-unifi_warning(priv, "%s: ba session with peer=
(%02x:%02x:%02x:%02x:%02x:%02x)\n", __FUNCTION__,
- macAddress.a[0], macAddress.a[1], macAddress.a[2],
- macAddress.a[3], macAddress.a[4], macAddress.a[5]);
+ unifi_warning(priv,
+ "%s: ba session with peer= (%pM)\n", __func__,
+ macAddress.a);
unifi_warning(priv, "%s: ba session for tID=%d timeout=%d role=%d
wind_size=%d start_sn=%d\n", __FUNCTION__,
tID,
diff --git a/drivers/staging/csr/sme_wext.c b/drivers/staging/csr/sme_wext.c
index 3ba7b4c..cdc72db 100644
--- a/drivers/staging/csr/sme_wext.c
+++ b/drivers/staging/csr/sme_wext.c
@@ -1210,13 +1210,8 @@ unifi_siwap(struct net_device *dev, struct
iw_request_info *info,
return -EINVAL;
}
-unifi_trace(priv, UDBG1, "unifi_siwap: asked for
%02X:%02X:%02X:%02X:%02X:%02X\n",
-
[PATCH 2/6] staging: csr: print MAC addresses via %pM
Signed-off-by: Andy Shevchenko andriy.shevche...@linux.intel.com
Cc: Lauri Hintsala lauri.hints...@bluegiga.com
---
drivers/staging/csr/sme_mgt.c | 10 ++
drivers/staging/csr/sme_sys.c | 29
drivers/staging/csr/sme_wext.c | 27 ++
drivers/staging/csr/unifi_pdu_processing.c |8 ++--
drivers/staging/csr/unifi_priv.h | 13 -
drivers/staging/csr/unifi_sme.c|3 ++-
6 files changed, 28 insertions(+), 62 deletions(-)
diff --git a/drivers/staging/csr/sme_mgt.c b/drivers/staging/csr/sme_mgt.c
index ab70216..c27c0a7 100644
--- a/drivers/staging/csr/sme_mgt.c
+++ b/drivers/staging/csr/sme_mgt.c
@@ -838,14 +838,8 @@ void CsrWifiSmeMediaStatusIndHandler(void* drvpriv,
CsrWifiFsmEvent* msg)
(unsigned char
*)ind-connectionInfo.assocScanInfoElements,
ind-connectionInfo.assocScanInfoElementsLength);
-unifi_trace(priv, UDBG2,
-CsrWifiSmeMediaStatusIndSend:
IBSS=%02X:%02X:%02X:%02X:%02X:%02X\n,
-ind-connectionInfo.bssid.a[0],
-ind-connectionInfo.bssid.a[1],
-ind-connectionInfo.bssid.a[2],
-ind-connectionInfo.bssid.a[3],
-ind-connectionInfo.bssid.a[4],
-ind-connectionInfo.bssid.a[5]);
+ unifi_trace(priv, UDBG2, CsrWifiSmeMediaStatusIndSend: IBSS=%pM\n,
+ind-connectionInfo.bssid.a);
sme_mgt_packet_filter_set(priv);
diff --git a/drivers/staging/csr/sme_sys.c b/drivers/staging/csr/sme_sys.c
index 283e302..9c3aa74 100644
--- a/drivers/staging/csr/sme_sys.c
+++ b/drivers/staging/csr/sme_sys.c
@@ -527,11 +527,9 @@ configure_data_port(unifi_priv_t *priv,
controlled_string = uncontrolled;
}
-unifi_trace(priv, UDBG2, port config request
%02x:%02x:%02x:%02x:%02x:%02x %s with port_action %d.\n,
-macAddress-a[0], macAddress-a[1], macAddress-a[2],
-macAddress-a[3], macAddress-a[4], macAddress-a[5],
-controlled_string, port_action);
-
+ unifi_trace(priv, UDBG2,
+ port config request %pM %s with port_action %d.\n,
+ macAddress-a, controlled_string, port_action);
/* If the new configuration has the broadcast MAC address or if we are in
infrastructure mode then clear the list first and set port overide mode */
if ((CSR_WIFI_ROUTER_CTRL_MODE_STA == interfacePriv-interfaceMode ||
@@ -653,10 +651,9 @@ configure_data_port(unifi_priv_t *priv,
uf_free_pending_rx_packets(priv, queue, *macAddress,interfaceTag);
}
-unifi_trace(priv, UDBG2, port config %02x:%02x:%02x:%02x:%02x:%02x
with port_action %d.\n,
-*(macAddress-a+0), *(macAddress-a+1), *(macAddress-a+2),
-*(macAddress-a+3), *(macAddress-a+4), *(macAddress-a+5),
-port_action);
+ unifi_trace(priv, UDBG2,
+ port config %pM with port_action %d.\n,
+ macAddress-a, port_action);
}
return 0;
} /* configure_data_port() */
@@ -2649,11 +2646,9 @@ CsrBool blockack_session_stop(unifi_priv_t *priv,
return FALSE;
}
-unifi_warning(priv, %s: stopping ba_session for peer =
%02x:%02x:%02x:%02x:%02x:%02x role = %d tID = %d\n, __FUNCTION__,
- macAddress.a[0], macAddress.a[1], macAddress.a[2],
- macAddress.a[3], macAddress.a[4], macAddress.a[5],
- role,
- tID);
+ unifi_warning(priv,
+ %s: stopping ba_session for peer = %pM role = %d tID = %d\n,
+ __func__, macAddress.a, role, tID);
/* find out the appropriate ba session (/station /tid /role) for which
stop is requested */
if (role == CSR_WIFI_ROUTER_CTRL_BLOCK_ACK_RECIPIENT){
@@ -2781,9 +2776,9 @@ CsrBool blockack_session_start(unifi_priv_t *priv,
return FALSE;
}
-unifi_warning(priv, %s: ba session with peer=
(%02x:%02x:%02x:%02x:%02x:%02x)\n, __FUNCTION__,
- macAddress.a[0], macAddress.a[1], macAddress.a[2],
- macAddress.a[3], macAddress.a[4], macAddress.a[5]);
+ unifi_warning(priv,
+ %s: ba session with peer= (%pM)\n, __func__,
+ macAddress.a);
unifi_warning(priv, %s: ba session for tID=%d timeout=%d role=%d
wind_size=%d start_sn=%d\n, __FUNCTION__,
tID,
diff --git a/drivers/staging/csr/sme_wext.c b/drivers/staging/csr/sme_wext.c
index 3ba7b4c..cdc72db 100644
--- a/drivers/staging/csr/sme_wext.c
+++ b/drivers/staging/csr/sme_wext.c
@@ -1210,13 +1210,8 @@ unifi_siwap(struct net_device *dev, struct
iw_request_info *info,
return -EINVAL;
}
-unifi_trace(priv, UDBG1, unifi_siwap: asked for
%02X:%02X:%02X:%02X:%02X:%02X\n,
-
