* [PATCH 1/6] staging: bcm: use %pM to print MAC addresses
@ 2012-07-06 15:28 Andy Shevchenko
2012-07-06 15:28 ` [PATCH 2/6] staging: csr: print MAC addresses via %pM Andy Shevchenko
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Andy Shevchenko @ 2012-07-06 15:28 UTC (permalink / raw)
To: Greg Kroah-Hartman, devel, linux-kernel; +Cc: Andy Shevchenko, Kevin McKinney
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Kevin McKinney <klmckinney1@gmail.com>
---
drivers/staging/bcm/CmHost.c | 44 +++++++++++++++---------------------------
1 file changed, 16 insertions(+), 28 deletions(-)
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 189d243..9c8c9b1 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -967,24 +967,18 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8EthernetDestMacAddressLength: 0x%02X ",
psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddressLength);
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8EthernetDestMacAddress[6]: 0x %02X %02X %02X %02X %02X %02X",
- psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[0],
- psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[1],
- psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[2],
- psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[3],
- psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[4],
- psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[5]);
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+ DBG_LVL_ALL, "u8EthernetDestMacAddress[6]: %pM",
+ psfCSType->cCPacketClassificationRule.
+ u8EthernetDestMacAddress);
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8EthernetSourceMACAddressLength: 0x%02X ",
psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddressLength);
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8EthernetSourceMACAddress[6]: 0x %02X %02X %02X %02X %02X %02X",
- psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[0],
- psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[1],
- psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[2],
- psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[3],
- psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[4],
- psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[5]);
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+ DBG_LVL_ALL, "u8EthernetSourceMACAddress[6]: "
+ "%pM", psfCSType->cCPacketClassificationRule.
+ u8EthernetSourceMACAddress);
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8EthertypeLength: 0x%02X ",
psfCSType->cCPacketClassificationRule.u8EthertypeLength);
@@ -1123,24 +1117,18 @@ static VOID DumpCmControlPacket(PVOID pvBuffer)
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8EthernetDestMacAddressLength: 0x%02X ",
psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddressLength);
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8EthernetDestMacAddress[6]: 0x %02X %02X %02X %02X %02X %02X",
- psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[0],
- psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[1],
- psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[2],
- psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[3],
- psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[4],
- psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddress[5]);
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+ DBG_LVL_ALL, "u8EthernetDestMacAddress[6]: %pM",
+ psfCSType->cCPacketClassificationRule.
+ u8EthernetDestMacAddress);
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8EthernetSourceMACAddressLength: 0x%02X ",
psfCSType->cCPacketClassificationRule.u8EthernetDestMacAddressLength);
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8EthernetSourceMACAddress[6]: 0x %02X %02X %02X %02X %02X %02X",
- psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[0],
- psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[1],
- psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[2],
- psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[3],
- psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[4],
- psfCSType->cCPacketClassificationRule.u8EthernetSourceMACAddress[5]);
+ BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL,
+ DBG_LVL_ALL, "u8EthernetSourceMACAddress[6]: "
+ "%pM", psfCSType->cCPacketClassificationRule.
+ u8EthernetSourceMACAddress);
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8EthertypeLength: 0x%02X ", psfCSType->cCPacketClassificationRule.u8EthertypeLength);
BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, DUMP_CONTROL, DBG_LVL_ALL, "u8Ethertype[3]: 0x%02X %02X %02X",
--
1.7.10.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/6] staging: csr: print MAC addresses via %pM 2012-07-06 15:28 [PATCH 1/6] staging: bcm: use %pM to print MAC addresses Andy Shevchenko @ 2012-07-06 15:28 ` Andy Shevchenko 2012-07-06 15:28 ` [PATCH 3/6] staging: gdm72xx: use %pM for MAC Andy Shevchenko ` (3 subsequent siblings) 4 siblings, 0 replies; 10+ messages in thread From: Andy Shevchenko @ 2012-07-06 15:28 UTC (permalink / raw) To: Greg Kroah-Hartman, devel, linux-kernel; +Cc: Andy Shevchenko, Lauri Hintsala Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Lauri Hintsala <lauri.hintsala@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", - (u8)wrqu->ap_addr.sa_data[0], - (u8)wrqu->ap_addr.sa_data[1], - (u8)wrqu->ap_addr.sa_data[2], - (u8)wrqu->ap_addr.sa_data[3], - (u8)wrqu->ap_addr.sa_data[4], - (u8)wrqu->ap_addr.sa_data[5]); + unifi_trace(priv, UDBG1, "unifi_siwap: asked for %pM\n", + wrqu->ap_addr.sa_data); if (!memcmp(wrqu->ap_addr.sa_data, zero_bssid, ETH_ALEN)) { priv->ignore_bssid_join = FALSE; @@ -1281,10 +1276,7 @@ unifi_giwap(struct net_device *dev, struct iw_request_info *info, if (r == 0) { bssid = connectionInfo.bssid.a; wrqu->ap_addr.sa_family = ARPHRD_ETHER; - unifi_trace(priv, UDBG4, - "unifi_giwap: BSSID = %02X:%02X:%02X:%02X:%02X:%02X\n", - bssid[0], bssid[1], bssid[2], - bssid[3], bssid[4], bssid[5]); + unifi_trace(priv, UDBG4, "unifi_giwap: BSSID = %pM\n", bssid); memcpy(wrqu->ap_addr.sa_data, bssid, ETH_ALEN); } else { @@ -2936,8 +2928,7 @@ _unifi_siwencodeext(struct net_device *dev, struct iw_request_info *info, unifi_trace(priv, UDBG1, "siwencodeext: flags=0x%X, alg=%d, ext_flags=0x%X, len=%d, index=%d,\n", wrqu->encoding.flags, ext->alg, ext->ext_flags, ext->key_len, (wrqu->encoding.flags & IW_ENCODE_INDEX)); - unifi_trace(priv, UDBG3, " addr=%02X:%02X:%02X:%02X:%02X:%02X\n", - a[0], a[1], a[2], a[3], a[4], a[5]); + unifi_trace(priv, UDBG3, " addr=%pM\n", a); if ((ext->key_len == 0) && (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)) { /* This means use a different key (given by key_idx) for Tx. */ @@ -3140,14 +3131,8 @@ unifi_siwpmksa(struct net_device *dev, struct iw_request_info *info, } - unifi_trace(priv, UDBG1, "SIWPMKSA: cmd %d, %02x:%02x:%02x:%02x:%02x:%02x\n", - pmksa->cmd, - pmksa->bssid.sa_data[0], - pmksa->bssid.sa_data[1], - pmksa->bssid.sa_data[2], - pmksa->bssid.sa_data[3], - pmksa->bssid.sa_data[4], - pmksa->bssid.sa_data[5]); + unifi_trace(priv, UDBG1, "SIWPMKSA: cmd %d, %pM\n", pmksa->cmd, + pmksa->bssid.sa_data); pmkid_list.pmkids = NULL; switch (pmksa->cmd) { diff --git a/drivers/staging/csr/unifi_pdu_processing.c b/drivers/staging/csr/unifi_pdu_processing.c index e35747c..45c69a9 100644 --- a/drivers/staging/csr/unifi_pdu_processing.c +++ b/drivers/staging/csr/unifi_pdu_processing.c @@ -68,7 +68,9 @@ unifi_frame_ma_packet_req(unifi_priv_t *priv, CSR_PRIORITY priority, interfacePriv = priv->interfacePriv[interfaceTag]; - UF_TRACE_MAC(priv, UDBG5, "In unifi_frame_ma_packet_req, Frame for Peer:", peerMacAddress); + unifi_trace(priv, UDBG5, + "In unifi_frame_ma_packet_req, Frame for Peer: %pMF\n", + peerMacAddress); signal->SignalPrimitiveHeader.SignalId = CSR_MA_PACKET_REQUEST_ID; signal->SignalPrimitiveHeader.ReceiverProcessId = 0; signal->SignalPrimitiveHeader.SenderProcessId = leSenderProcessId; @@ -1668,7 +1670,9 @@ CsrResult uf_process_ma_packet_req(unifi_priv_t *priv, CsrUint32 handle = 0xFFFFFFFF; unsigned long lock_flags; - UF_TRACE_MAC(priv, UDBG5, "entering uf_process_ma_packet_req, peer: ", peerMacAddress); + unifi_trace(priv, UDBG5, + "entering uf_process_ma_packet_req, peer: %pMF\n", + peerMacAddress); if (interfaceTag >= CSR_WIFI_NUM_INTERFACES) { unifi_error(priv, "interfaceTag >= CSR_WIFI_NUM_INTERFACES, interfacetag = %d\n", interfaceTag); diff --git a/drivers/staging/csr/unifi_priv.h b/drivers/staging/csr/unifi_priv.h index b23c844..7e940ef 100644 --- a/drivers/staging/csr/unifi_priv.h +++ b/drivers/staging/csr/unifi_priv.h @@ -1174,17 +1174,4 @@ int unifi_putest_gp_write16(unifi_priv_t *priv, unsigned char *arg); int unifi_putest_dl_fw(unifi_priv_t *priv, unsigned char *arg); int unifi_putest_dl_fw_buff(unifi_priv_t *priv, unsigned char *arg); - -/* Macro for formatting a MAC address with a prefix string */ -#define UF_TRACE_MAC(priv, lvl, msg, addr) \ - unifi_trace(priv, lvl, \ - "%s %02x-%02x-%02x-%02x-%02x-%02x\n", \ - msg, \ - *(((CsrUint8 *)addr)+0), \ - *(((CsrUint8 *)addr)+1), \ - *(((CsrUint8 *)addr)+2), \ - *(((CsrUint8 *)addr)+3), \ - *(((CsrUint8 *)addr)+4), \ - *(((CsrUint8 *)addr)+5)) - #endif /* __LINUX_UNIFI_PRIV_H__ */ diff --git a/drivers/staging/csr/unifi_sme.c b/drivers/staging/csr/unifi_sme.c index 54414ed..6e7cbbf 100644 --- a/drivers/staging/csr/unifi_sme.c +++ b/drivers/staging/csr/unifi_sme.c @@ -1174,7 +1174,8 @@ uf_send_m4_ready_wq(struct work_struct *work) /* Send a signal to SME */ CsrWifiRouterCtrlM4ReadyToSendIndSend(priv->CSR_WIFI_SME_IFACEQUEUE, 0, iface, peer); - UF_TRACE_MAC(priv, UDBG1, "M4ReadyToSendInd sent for peer", peer.a); + unifi_trace(priv, UDBG1, "M4ReadyToSendInd sent for peer %pMF\n", + peer.a); func_exit(); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/6] staging: gdm72xx: use %pM for MAC 2012-07-06 15:28 [PATCH 1/6] staging: bcm: use %pM to print MAC addresses Andy Shevchenko 2012-07-06 15:28 ` [PATCH 2/6] staging: csr: print MAC addresses via %pM Andy Shevchenko @ 2012-07-06 15:28 ` Andy Shevchenko 2012-07-06 15:28 ` [PATCH 4/6] staging: vt6655: use %pM for BSSID Andy Shevchenko ` (2 subsequent siblings) 4 siblings, 0 replies; 10+ messages in thread From: Andy Shevchenko @ 2012-07-06 15:28 UTC (permalink / raw) To: Greg Kroah-Hartman, devel, linux-kernel; +Cc: Andy Shevchenko, Ben Chan Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Ben Chan <benchan@chromium.org> --- drivers/staging/gdm72xx/gdm_wimax.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/staging/gdm72xx/gdm_wimax.c b/drivers/staging/gdm72xx/gdm_wimax.c index 110bdbc..e616de1 100644 --- a/drivers/staging/gdm72xx/gdm_wimax.c +++ b/drivers/staging/gdm72xx/gdm_wimax.c @@ -744,13 +744,8 @@ static int gdm_wimax_get_prepared_info(struct net_device *dev, char *buf, "[%x/%d]\n", __func__, T, L); return -1; } - printk(KERN_INFO - "MAC change [%02x:%02x:%02x:%02x:%02x:%02x]" - "->[%02x:%02x:%02x:%02x:%02x:%02x]\n", - dev->dev_addr[0], dev->dev_addr[1], - dev->dev_addr[2], dev->dev_addr[3], - dev->dev_addr[4], dev->dev_addr[5], - V[0], V[1], V[2], V[3], V[4], V[5]); + printk(KERN_INFO "MAC change [%pM]->[%pM]\n", + dev->dev_addr, V); memcpy(dev->dev_addr, V, dev->addr_len); return 1; } -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/6] staging: vt6655: use %pM for BSSID 2012-07-06 15:28 [PATCH 1/6] staging: bcm: use %pM to print MAC addresses Andy Shevchenko 2012-07-06 15:28 ` [PATCH 2/6] staging: csr: print MAC addresses via %pM Andy Shevchenko 2012-07-06 15:28 ` [PATCH 3/6] staging: gdm72xx: use %pM for MAC Andy Shevchenko @ 2012-07-06 15:28 ` Andy Shevchenko 2012-07-06 15:28 ` [PATCH 5/6] staging: vt6656: use %pM for the BSSID Andy Shevchenko 2012-07-06 15:28 ` [PATCH 6/6] staging: ccg: print MAC addresses via %pM Andy Shevchenko 4 siblings, 0 replies; 10+ messages in thread From: Andy Shevchenko @ 2012-07-06 15:28 UTC (permalink / raw) To: Greg Kroah-Hartman, devel, linux-kernel Cc: Andy Shevchenko, Forest Bond, Masanari Iida Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Forest Bond <forest@alittletooquiet.net> Cc: Masanari Iida <standby24x7@gmail.com> --- drivers/staging/vt6655/bssdb.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c index 1368e8c..f4f108f 100644 --- a/drivers/staging/vt6655/bssdb.c +++ b/drivers/staging/vt6655/bssdb.c @@ -142,9 +142,8 @@ BSSpSearchBSSList( unsigned int ii = 0; if (pbyDesireBSSID != NULL) { - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n", - *pbyDesireBSSID,*(pbyDesireBSSID+1),*(pbyDesireBSSID+2), - *(pbyDesireBSSID+3),*(pbyDesireBSSID+4),*(pbyDesireBSSID+5)); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO + "BSSpSearchBSSList BSSID[%pM]\n", pbyDesireBSSID); if ((!is_broadcast_ether_addr(pbyDesireBSSID)) && (memcmp(pbyDesireBSSID, ZeroBSSID, 6)!= 0)){ pbyBSSID = pbyDesireBSSID; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 5/6] staging: vt6656: use %pM for the BSSID 2012-07-06 15:28 [PATCH 1/6] staging: bcm: use %pM to print MAC addresses Andy Shevchenko ` (2 preceding siblings ...) 2012-07-06 15:28 ` [PATCH 4/6] staging: vt6655: use %pM for BSSID Andy Shevchenko @ 2012-07-06 15:28 ` Andy Shevchenko 2012-07-06 15:28 ` [PATCH 6/6] staging: ccg: print MAC addresses via %pM Andy Shevchenko 4 siblings, 0 replies; 10+ messages in thread From: Andy Shevchenko @ 2012-07-06 15:28 UTC (permalink / raw) To: Greg Kroah-Hartman, devel, linux-kernel Cc: Andy Shevchenko, Marcos Paulo de Souza Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Marcos Paulo de Souza <marcos.mage@gmail.com> --- drivers/staging/vt6656/bssdb.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c index 619c257..0999367 100644 --- a/drivers/staging/vt6656/bssdb.c +++ b/drivers/staging/vt6656/bssdb.c @@ -129,9 +129,8 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext, unsigned int ii = 0; unsigned int jj = 0; if (pbyDesireBSSID != NULL) { - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList BSSID[%02X %02X %02X-%02X %02X %02X]\n", - *pbyDesireBSSID,*(pbyDesireBSSID+1),*(pbyDesireBSSID+2), - *(pbyDesireBSSID+3),*(pbyDesireBSSID+4),*(pbyDesireBSSID+5)); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO + "BSSpSearchBSSList BSSID[%pM]\n", pbyDesireBSSID); if ((!is_broadcast_ether_addr(pbyDesireBSSID)) && (memcmp(pbyDesireBSSID, ZeroBSSID, 6)!= 0)){ pbyBSSID = pbyDesireBSSID; @@ -218,7 +217,9 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext, } pMgmt->pSameBSS[jj].uChannel = pCurrBSS->uChannel; - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList pSelect1[%02X %02X %02X-%02X %02X %02X]\n",*pCurrBSS->abyBSSID,*(pCurrBSS->abyBSSID+1),*(pCurrBSS->abyBSSID+2),*(pCurrBSS->abyBSSID+3),*(pCurrBSS->abyBSSID+4),*(pCurrBSS->abyBSSID+5)); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO + "BSSpSearchBSSList pSelect1[%pM]\n", + pCurrBSS->abyBSSID); jj++; -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 6/6] staging: ccg: print MAC addresses via %pM 2012-07-06 15:28 [PATCH 1/6] staging: bcm: use %pM to print MAC addresses Andy Shevchenko ` (3 preceding siblings ...) 2012-07-06 15:28 ` [PATCH 5/6] staging: vt6656: use %pM for the BSSID Andy Shevchenko @ 2012-07-06 15:28 ` Andy Shevchenko 2012-07-06 15:32 ` Kyungmin Park 4 siblings, 1 reply; 10+ messages in thread From: Andy Shevchenko @ 2012-07-06 15:28 UTC (permalink / raw) To: Greg Kroah-Hartman, devel, linux-kernel; +Cc: Andy Shevchenko, Kyungmin Park Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> --- drivers/staging/ccg/ccg.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/ccg/ccg.c b/drivers/staging/ccg/ccg.c index a5b36a9..62f5d92 100644 --- a/drivers/staging/ccg/ccg.c +++ b/drivers/staging/ccg/ccg.c @@ -564,9 +564,7 @@ static int rndis_function_bind_config(struct ccg_usb_function *f, return -1; } - pr_info("%s MAC: %02X:%02X:%02X:%02X:%02X:%02X\n", __func__, - rndis->ethaddr[0], rndis->ethaddr[1], rndis->ethaddr[2], - rndis->ethaddr[3], rndis->ethaddr[4], rndis->ethaddr[5]); + pr_info("%s MAC: pM\n", __func__, rndis->ethaddr); ret = gether_setup_name(c->cdev->gadget, rndis->ethaddr, "rndis"); if (ret) { @@ -654,9 +652,7 @@ static ssize_t rndis_ethaddr_show(struct device *dev, { struct ccg_usb_function *f = dev_get_drvdata(dev); struct rndis_function_config *rndis = f->config; - return sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x\n", - rndis->ethaddr[0], rndis->ethaddr[1], rndis->ethaddr[2], - rndis->ethaddr[3], rndis->ethaddr[4], rndis->ethaddr[5]); + return sprintf(buf, "%pM\n", rndis->ethaddr); } static ssize_t rndis_ethaddr_store(struct device *dev, -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 6/6] staging: ccg: print MAC addresses via %pM 2012-07-06 15:28 ` [PATCH 6/6] staging: ccg: print MAC addresses via %pM Andy Shevchenko @ 2012-07-06 15:32 ` Kyungmin Park 2012-07-06 15:39 ` [Patch v2] " Andy Shevchenko 2012-07-06 15:54 ` [PATCH 6/6] " Daniel Hazelton 0 siblings, 2 replies; 10+ messages in thread From: Kyungmin Park @ 2012-07-06 15:32 UTC (permalink / raw) To: Andy Shevchenko, Andrzej Pietrasiewicz Cc: Greg Kroah-Hartman, devel, linux-kernel Acked-by: Kyungmin Park <kyungmin.park@samsung.com> On Sat, Jul 7, 2012 at 12:28 AM, Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: Kyungmin Park <kyungmin.park@samsung.com> > --- > drivers/staging/ccg/ccg.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/staging/ccg/ccg.c b/drivers/staging/ccg/ccg.c > index a5b36a9..62f5d92 100644 > --- a/drivers/staging/ccg/ccg.c > +++ b/drivers/staging/ccg/ccg.c > @@ -564,9 +564,7 @@ static int rndis_function_bind_config(struct ccg_usb_function *f, > return -1; > } > > - pr_info("%s MAC: %02X:%02X:%02X:%02X:%02X:%02X\n", __func__, > - rndis->ethaddr[0], rndis->ethaddr[1], rndis->ethaddr[2], > - rndis->ethaddr[3], rndis->ethaddr[4], rndis->ethaddr[5]); > + pr_info("%s MAC: pM\n", __func__, rndis->ethaddr); > > ret = gether_setup_name(c->cdev->gadget, rndis->ethaddr, "rndis"); > if (ret) { > @@ -654,9 +652,7 @@ static ssize_t rndis_ethaddr_show(struct device *dev, > { > struct ccg_usb_function *f = dev_get_drvdata(dev); > struct rndis_function_config *rndis = f->config; > - return sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x\n", > - rndis->ethaddr[0], rndis->ethaddr[1], rndis->ethaddr[2], > - rndis->ethaddr[3], rndis->ethaddr[4], rndis->ethaddr[5]); > + return sprintf(buf, "%pM\n", rndis->ethaddr); > } > > static ssize_t rndis_ethaddr_store(struct device *dev, > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ ^ permalink raw reply [flat|nested] 10+ messages in thread
* [Patch v2] staging: ccg: print MAC addresses via %pM 2012-07-06 15:32 ` Kyungmin Park @ 2012-07-06 15:39 ` Andy Shevchenko 2012-07-06 15:54 ` [PATCH 6/6] " Daniel Hazelton 1 sibling, 0 replies; 10+ messages in thread From: Andy Shevchenko @ 2012-07-06 15:39 UTC (permalink / raw) To: Greg Kroah-Hartman, devel, linux-kernel Cc: Andy Shevchenko, Andrzej Pietrasiewicz Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Cc: Andrzej Pietrasiewicz <andrzej.p@samsung.com> --- drivers/staging/ccg/ccg.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/ccg/ccg.c b/drivers/staging/ccg/ccg.c index a5b36a9..c77c465 100644 --- a/drivers/staging/ccg/ccg.c +++ b/drivers/staging/ccg/ccg.c @@ -564,9 +564,7 @@ static int rndis_function_bind_config(struct ccg_usb_function *f, return -1; } - pr_info("%s MAC: %02X:%02X:%02X:%02X:%02X:%02X\n", __func__, - rndis->ethaddr[0], rndis->ethaddr[1], rndis->ethaddr[2], - rndis->ethaddr[3], rndis->ethaddr[4], rndis->ethaddr[5]); + pr_info("%s MAC: %pM\n", __func__, rndis->ethaddr); ret = gether_setup_name(c->cdev->gadget, rndis->ethaddr, "rndis"); if (ret) { @@ -654,9 +652,7 @@ static ssize_t rndis_ethaddr_show(struct device *dev, { struct ccg_usb_function *f = dev_get_drvdata(dev); struct rndis_function_config *rndis = f->config; - return sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x\n", - rndis->ethaddr[0], rndis->ethaddr[1], rndis->ethaddr[2], - rndis->ethaddr[3], rndis->ethaddr[4], rndis->ethaddr[5]); + return sprintf(buf, "%pM\n", rndis->ethaddr); } static ssize_t rndis_ethaddr_store(struct device *dev, -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 6/6] staging: ccg: print MAC addresses via %pM 2012-07-06 15:32 ` Kyungmin Park 2012-07-06 15:39 ` [Patch v2] " Andy Shevchenko @ 2012-07-06 15:54 ` Daniel Hazelton 2012-07-06 15:57 ` Andy Shevchenko 1 sibling, 1 reply; 10+ messages in thread From: Daniel Hazelton @ 2012-07-06 15:54 UTC (permalink / raw) To: Kyungmin Park Cc: Andy Shevchenko, Andrzej Pietrasiewicz, Greg Kroah-Hartman, devel, linux-kernel On 07/06/2012 11:32 AM, Kyungmin Park wrote: > Acked-by: Kyungmin Park <kyungmin.park@samsung.com> > > On Sat, Jul 7, 2012 at 12:28 AM, Andy Shevchenko > <andriy.shevchenko@linux.intel.com> wrote: >> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> >> Cc: Kyungmin Park <kyungmin.park@samsung.com> >> --- >> drivers/staging/ccg/ccg.c | 8 ++------ >> 1 file changed, 2 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/staging/ccg/ccg.c b/drivers/staging/ccg/ccg.c >> index a5b36a9..62f5d92 100644 >> --- a/drivers/staging/ccg/ccg.c >> +++ b/drivers/staging/ccg/ccg.c >> @@ -564,9 +564,7 @@ static int rndis_function_bind_config(struct ccg_usb_function *f, >> return -1; >> } >> >> - pr_info("%s MAC: %02X:%02X:%02X:%02X:%02X:%02X\n", __func__, >> - rndis->ethaddr[0], rndis->ethaddr[1], rndis->ethaddr[2], >> - rndis->ethaddr[3], rndis->ethaddr[4], rndis->ethaddr[5]); >> + pr_info("%s MAC: pM\n", __func__, rndis->ethaddr); You lost a % there - it should be "%s MAC: %pM\n", no ? DRH >> >> ret = gether_setup_name(c->cdev->gadget, rndis->ethaddr, "rndis"); >> if (ret) { >> @@ -654,9 +652,7 @@ static ssize_t rndis_ethaddr_show(struct device *dev, >> { >> struct ccg_usb_function *f = dev_get_drvdata(dev); >> struct rndis_function_config *rndis = f->config; >> - return sprintf(buf, "%02x:%02x:%02x:%02x:%02x:%02x\n", >> - rndis->ethaddr[0], rndis->ethaddr[1], rndis->ethaddr[2], >> - rndis->ethaddr[3], rndis->ethaddr[4], rndis->ethaddr[5]); >> + return sprintf(buf, "%pM\n", rndis->ethaddr); >> } >> >> static ssize_t rndis_ethaddr_store(struct device *dev, >> -- >> 1.7.10.4 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> Please read the FAQ at http://www.tux.org/lkml/ > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 6/6] staging: ccg: print MAC addresses via %pM 2012-07-06 15:54 ` [PATCH 6/6] " Daniel Hazelton @ 2012-07-06 15:57 ` Andy Shevchenko 0 siblings, 0 replies; 10+ messages in thread From: Andy Shevchenko @ 2012-07-06 15:57 UTC (permalink / raw) To: Daniel Hazelton Cc: Kyungmin Park, Andy Shevchenko, Andrzej Pietrasiewicz, Greg Kroah-Hartman, devel, linux-kernel On Fri, Jul 6, 2012 at 6:54 PM, Daniel Hazelton <dshadowwolf@gmail.com> wrote: >>> --- a/drivers/staging/ccg/ccg.c >>> +++ b/drivers/staging/ccg/ccg.c >>> @@ -564,9 +564,7 @@ static int rndis_function_bind_config(struct ccg_usb_function *f, >>> return -1; >>> } >>> >>> - pr_info("%s MAC: %02X:%02X:%02X:%02X:%02X:%02X\n", __func__, >>> - rndis->ethaddr[0], rndis->ethaddr[1], rndis->ethaddr[2], >>> - rndis->ethaddr[3], rndis->ethaddr[4], rndis->ethaddr[5]); >>> + pr_info("%s MAC: pM\n", __func__, rndis->ethaddr); > You lost a % there - it should be "%s MAC: %pM\n", no ? Thanks, I noticed this already. Patch v2 was sent recently. -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2012-07-06 15:57 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-07-06 15:28 [PATCH 1/6] staging: bcm: use %pM to print MAC addresses Andy Shevchenko 2012-07-06 15:28 ` [PATCH 2/6] staging: csr: print MAC addresses via %pM Andy Shevchenko 2012-07-06 15:28 ` [PATCH 3/6] staging: gdm72xx: use %pM for MAC Andy Shevchenko 2012-07-06 15:28 ` [PATCH 4/6] staging: vt6655: use %pM for BSSID Andy Shevchenko 2012-07-06 15:28 ` [PATCH 5/6] staging: vt6656: use %pM for the BSSID Andy Shevchenko 2012-07-06 15:28 ` [PATCH 6/6] staging: ccg: print MAC addresses via %pM Andy Shevchenko 2012-07-06 15:32 ` Kyungmin Park 2012-07-06 15:39 ` [Patch v2] " Andy Shevchenko 2012-07-06 15:54 ` [PATCH 6/6] " Daniel Hazelton 2012-07-06 15:57 ` Andy Shevchenko
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox