* [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf()
@ 2010-09-13 8:40 Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 02/10] staging: ath6kl: use '%pM' format to print MAC address Andy Shevchenko
` (9 more replies)
0 siblings, 10 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-13 8:40 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
There are many locations where MAC or BSSID is printed. The plain format
is used in such places. *printf() in kernel recognizes
%pM, %pMF and %pm format parameters to print out 6-byte array as MAC
address. This patch changes plain format to custom %pM which is widely
used in kernel.
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/rt2860/common/ba_action.c | 4 ++--
drivers/staging/rt2860/common/cmm_mac_usb.c | 5 +----
drivers/staging/rt2860/common/cmm_wpa.c | 4 ++--
drivers/staging/rt2860/common/mlme.c | 6 ++----
drivers/staging/rt2860/common/rtmp_init.c | 12 +++---------
drivers/staging/rt2860/rt_linux.c | 4 +---
drivers/staging/rt2860/rt_linux.h | 3 ---
drivers/staging/rt2860/sta/assoc.c | 7 ++-----
drivers/staging/rt2860/sta/connect.c | 24 ++++++------------------
drivers/staging/rt2860/sta/rtmp_data.c | 4 ++--
drivers/staging/rt2860/sta/sync.c | 12 +++++-------
drivers/staging/rt2860/sta_ioctl.c | 11 +++--------
12 files changed, 29 insertions(+), 67 deletions(-)
diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c
index 174f2a7..1befe99 100644
--- a/drivers/staging/rt2860/common/ba_action.c
+++ b/drivers/staging/rt2860/common/ba_action.c
@@ -654,8 +654,8 @@ BOOLEAN BARecSessionAdd(struct rt_rtmp_adapter *pAd,
} else {
Status = FALSE;
DBGPRINT(RT_DEBUG_TRACE,
- ("Can't Accept ADDBA for %02x:%02x:%02x:%02x:%02x:%02x TID = %d\n",
- PRINT_MAC(pEntry->Addr), TID));
+ ("Can't Accept ADDBA for %pM TID = %d\n",
+ pEntry->Addr, TID));
}
return (Status);
}
diff --git a/drivers/staging/rt2860/common/cmm_mac_usb.c b/drivers/staging/rt2860/common/cmm_mac_usb.c
index 8aec70f..72731cb 100644
--- a/drivers/staging/rt2860/common/cmm_mac_usb.c
+++ b/drivers/staging/rt2860/common/cmm_mac_usb.c
@@ -663,10 +663,7 @@ int RTUSBWriteHWMACAddress(struct rt_rtmp_adapter *pAd)
StaMacReg1.field.Byte5 = pAd->CurrentAddress[5];
StaMacReg1.field.U2MeMask = 0xff;
DBGPRINT_RAW(RT_DEBUG_TRACE,
- ("Local MAC = %02x:%02x:%02x:%02x:%02x:%02x\n",
- pAd->CurrentAddress[0], pAd->CurrentAddress[1],
- pAd->CurrentAddress[2], pAd->CurrentAddress[3],
- pAd->CurrentAddress[4], pAd->CurrentAddress[5]));
+ ("Local MAC = %pM\n", pAd->CurrentAddress));
RTUSBWriteMACRegister(pAd, MAC_ADDR_DW0, StaMacReg0.word);
RTUSBWriteMACRegister(pAd, MAC_ADDR_DW1, StaMacReg1.word);
diff --git a/drivers/staging/rt2860/common/cmm_wpa.c b/drivers/staging/rt2860/common/cmm_wpa.c
index 9414aa3..e37b64b 100644
--- a/drivers/staging/rt2860/common/cmm_wpa.c
+++ b/drivers/staging/rt2860/common/cmm_wpa.c
@@ -221,8 +221,8 @@ void WpaEAPOLKeyAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E
break;
DBGPRINT(RT_DEBUG_TRACE,
- ("Receive EAPoL-Key frame from STA %02X-%02X-%02X-%02X-%02X-%02X\n",
- PRINT_MAC(pEntry->Addr)));
+ ("Receive EAPoL-Key frame from STA %pMF\n",
+ pEntry->Addr));
if (((pEapol_packet->ProVer != EAPOL_VER)
&& (pEapol_packet->ProVer != EAPOL_VER2))
diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c
index 9fc34a8..3558f65 100644
--- a/drivers/staging/rt2860/common/mlme.c
+++ b/drivers/staging/rt2860/common/mlme.c
@@ -1536,10 +1536,8 @@ void MlmeAutoReconnectLastSSID(struct rt_rtmp_adapter *pAd)
{
if (pAd->StaCfg.bAutoConnectByBssid) {
DBGPRINT(RT_DEBUG_TRACE,
- ("Driver auto reconnect to last OID_802_11_BSSID setting - %02X:%02X:%02X:%02X:%02X:%02X\n",
- pAd->MlmeAux.Bssid[0], pAd->MlmeAux.Bssid[1],
- pAd->MlmeAux.Bssid[2], pAd->MlmeAux.Bssid[3],
- pAd->MlmeAux.Bssid[4], pAd->MlmeAux.Bssid[5]));
+ ("Driver auto reconnect to last OID_802_11_BSSID "
+ "setting - %pM\n", pAd->MlmeAux.Bssid));
pAd->MlmeAux.Channel = pAd->CommonCfg.Channel;
MlmeEnqueue(pAd,
diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c
index ff9f87c..3628e85 100644
--- a/drivers/staging/rt2860/common/rtmp_init.c
+++ b/drivers/staging/rt2860/common/rtmp_init.c
@@ -749,13 +749,7 @@ void NICReadEEPROMParameters(struct rt_rtmp_adapter *pAd, u8 *mac_addr)
/* pAd->PermanentAddress[5] = RandomByte(pAd)&0xf8; */
DBGPRINT_RAW(RT_DEBUG_TRACE,
- ("E2PROM MAC: =%02x:%02x:%02x:%02x:%02x:%02x\n",
- pAd->PermanentAddress[0],
- pAd->PermanentAddress[1],
- pAd->PermanentAddress[2],
- pAd->PermanentAddress[3],
- pAd->PermanentAddress[4],
- pAd->PermanentAddress[5]));
+ ("E2PROM MAC: =%pM\n", pAd->PermanentAddress));
if (pAd->bLocalAdminMAC == FALSE) {
MAC_DW0_STRUC csr2;
MAC_DW1_STRUC csr3;
@@ -772,8 +766,8 @@ void NICReadEEPROMParameters(struct rt_rtmp_adapter *pAd, u8 *mac_addr)
csr3.field.U2MeMask = 0xff;
RTMP_IO_WRITE32(pAd, MAC_ADDR_DW1, csr3.word);
DBGPRINT_RAW(RT_DEBUG_TRACE,
- ("E2PROM MAC: =%02x:%02x:%02x:%02x:%02x:%02x\n",
- PRINT_MAC(pAd->PermanentAddress)));
+ ("E2PROM MAC: =%pM\n",
+ pAd->PermanentAddress));
}
}
diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c
index 5b79f65..abfeea1 100644
--- a/drivers/staging/rt2860/rt_linux.c
+++ b/drivers/staging/rt2860/rt_linux.c
@@ -682,9 +682,7 @@ void RTMPSendWirelessEvent(struct rt_rtmp_adapter *pAd,
if (pAddr)
pBufPtr +=
- sprintf(pBufPtr,
- "(RT2860) STA(%02x:%02x:%02x:%02x:%02x:%02x) ",
- PRINT_MAC(pAddr));
+ sprintf(pBufPtr, "(RT2860) STA(%pM) ", pAddr);
else if (BssIdx < MAX_MBSSID_NUM)
pBufPtr +=
sprintf(pBufPtr, "(RT2860) BSS(wlan%d) ", BssIdx);
diff --git a/drivers/staging/rt2860/rt_linux.h b/drivers/staging/rt2860/rt_linux.h
index b370fb2..5acedf1 100644
--- a/drivers/staging/rt2860/rt_linux.h
+++ b/drivers/staging/rt2860/rt_linux.h
@@ -409,9 +409,6 @@ struct os_cookie {
/***********************************************************************************
* OS debugging and printing related definitions and data structure
***********************************************************************************/
-#define PRINT_MAC(addr) \
- addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]
-
#ifdef DBG
extern unsigned long RTDebugLevel;
diff --git a/drivers/staging/rt2860/sta/assoc.c b/drivers/staging/rt2860/sta/assoc.c
index 6e85d5e..b7efb0b 100644
--- a/drivers/staging/rt2860/sta/assoc.c
+++ b/drivers/staging/rt2860/sta/assoc.c
@@ -794,11 +794,8 @@ void MlmeDisassocReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_ele
RTMPCancelTimer(&pAd->MlmeAux.DisassocTimer, &TimerCancelled);
DBGPRINT(RT_DEBUG_TRACE,
- ("ASSOC - Send DISASSOC request[BSSID::%02x:%02x:%02x:%02x:%02x:%02x (Reason=%d)\n",
- pDisassocReq->Addr[0], pDisassocReq->Addr[1],
- pDisassocReq->Addr[2], pDisassocReq->Addr[3],
- pDisassocReq->Addr[4], pDisassocReq->Addr[5],
- pDisassocReq->Reason));
+ ("ASSOC - Send DISASSOC request[BSSID::%pM (Reason=%d)\n",
+ pDisassocReq->Addr, pDisassocReq->Reason));
MgtMacHeaderInit(pAd, &DisassocHdr, SUBTYPE_DISASSOC, 0, pDisassocReq->Addr, pDisassocReq->Addr); /* patch peap ttls switching issue */
MakeOutgoingFrame(pOutBuffer, &FrameLen,
sizeof(struct rt_header_802_11), &DisassocHdr,
diff --git a/drivers/staging/rt2860/sta/connect.c b/drivers/staging/rt2860/sta/connect.c
index 55732b1..c380551 100644
--- a/drivers/staging/rt2860/sta/connect.c
+++ b/drivers/staging/rt2860/sta/connect.c
@@ -653,10 +653,8 @@ void CntlOidRTBssidProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *
RTMPMakeRSNIE(pAd, pAd->StaCfg.AuthMode, pAd->StaCfg.WepStatus, 0);
} */
/* No active association, join the BSS immediately */
- DBGPRINT(RT_DEBUG_TRACE,
- ("CNTL - joining %02x:%02x:%02x:%02x:%02x:%02x ...\n",
- pOidBssid[0], pOidBssid[1], pOidBssid[2],
- pOidBssid[3], pOidBssid[4], pOidBssid[5]));
+ DBGPRINT(RT_DEBUG_TRACE, ("CNTL - joining %pM ...\n",
+ pOidBssid));
JoinParmFill(pAd, &JoinReq, pAd->MlmeAux.BssIdx);
MlmeEnqueue(pAd, SYNC_STATE_MACHINE, MT2_MLME_JOIN_REQ,
@@ -778,13 +776,8 @@ void CntlWaitJoinProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *El
LinkUp(pAd, BSS_ADHOC);
pAd->Mlme.CntlMachine.CurrState = CNTL_IDLE;
DBGPRINT(RT_DEBUG_TRACE,
- ("CNTL - join the IBSS = %02x:%02x:%02x:%02x:%02x:%02x ...\n",
- pAd->CommonCfg.Bssid[0],
- pAd->CommonCfg.Bssid[1],
- pAd->CommonCfg.Bssid[2],
- pAd->CommonCfg.Bssid[3],
- pAd->CommonCfg.Bssid[4],
- pAd->CommonCfg.Bssid[5]));
+ ("CNTL - join the IBSS = %pM ...\n",
+ pAd->CommonCfg.Bssid));
pAd->IndicateMediaState =
NdisMediaStateConnected;
@@ -902,13 +895,8 @@ void CntlWaitStartProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E
}
DBGPRINT(RT_DEBUG_TRACE,
- ("CNTL - start a new IBSS = %02x:%02x:%02x:%02x:%02x:%02x ...\n",
- pAd->CommonCfg.Bssid[0],
- pAd->CommonCfg.Bssid[1],
- pAd->CommonCfg.Bssid[2],
- pAd->CommonCfg.Bssid[3],
- pAd->CommonCfg.Bssid[4],
- pAd->CommonCfg.Bssid[5]));
+ ("CNTL - start a new IBSS = %pM ...\n",
+ pAd->CommonCfg.Bssid));
} else {
DBGPRINT(RT_DEBUG_TRACE,
("CNTL - Start IBSS fail. BUG!\n"));
diff --git a/drivers/staging/rt2860/sta/rtmp_data.c b/drivers/staging/rt2860/sta/rtmp_data.c
index 5d348e9..fbe903c 100644
--- a/drivers/staging/rt2860/sta/rtmp_data.c
+++ b/drivers/staging/rt2860/sta/rtmp_data.c
@@ -976,8 +976,8 @@ int STASendPacket(struct rt_rtmp_adapter *pAd, void *pPacket)
if (!pEntry) {
DBGPRINT(RT_DEBUG_ERROR,
- ("STASendPacket->Cannot find pEntry(%2x:%2x:%2x:%2x:%2x:%2x) in MacTab!\n",
- PRINT_MAC(pSrcBufVA)));
+ ("STASendPacket->Cannot find pEntry(%pM) in MacTab!\n",
+ pSrcBufVA));
/* Resourece is low, system did not allocate virtual address */
/* return NDIS_STATUS_FAILURE directly to upper layer */
RELEASE_NDIS_PACKET(pAd, pPacket, NDIS_STATUS_FAILURE);
diff --git a/drivers/staging/rt2860/sta/sync.c b/drivers/staging/rt2860/sta/sync.c
index cbe90a6..747d3c6 100644
--- a/drivers/staging/rt2860/sta/sync.c
+++ b/drivers/staging/rt2860/sta/sync.c
@@ -424,9 +424,8 @@ void MlmeJoinReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E
} while (FALSE);
DBGPRINT(RT_DEBUG_TRACE,
- ("SYNC - Switch to ch %d, Wait BEACON from %02x:%02x:%02x:%02x:%02x:%02x\n",
- pBss->Channel, pBss->Bssid[0], pBss->Bssid[1], pBss->Bssid[2],
- pBss->Bssid[3], pBss->Bssid[4], pBss->Bssid[5]));
+ ("SYNC - Switch to ch %d, Wait BEACON from %pM\n",
+ pBss->Channel, pBss->Bssid));
pAd->Mlme.SyncMachine.CurrState = JOIN_WAIT_BEACON;
}
@@ -1225,10 +1224,9 @@ void PeerBeacon(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem)
for (i = 0; i < 6; i++) {
if (Bssid[i] > pAd->CommonCfg.Bssid[i]) {
DBGPRINT(RT_DEBUG_TRACE,
- ("SYNC - merge to the IBSS with bigger BSSID=%02x:%02x:%02x:%02x:%02x:%02x\n",
- Bssid[0], Bssid[1], Bssid[2],
- Bssid[3], Bssid[4],
- Bssid[5]));
+ ("SYNC - merge to the IBSS "
+ "with bigger BSSID="
+ "%pM\n", Bssid));
AsicDisableSync(pAd);
COPY_MAC_ADDR(pAd->CommonCfg.Bssid,
Bssid);
diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index 6b8268d..e095a44 100644
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -614,9 +614,7 @@ int rt_ioctl_siwap(struct net_device *dev,
OID_802_11_BSSID,
sizeof(NDIS_802_11_MAC_ADDRESS), (void *) & Bssid);
- DBGPRINT(RT_DEBUG_TRACE,
- ("IOCTL::SIOCSIWAP %02x:%02x:%02x:%02x:%02x:%02x\n", Bssid[0],
- Bssid[1], Bssid[2], Bssid[3], Bssid[4], Bssid[5]));
+ DBGPRINT(RT_DEBUG_TRACE, ("IOCTL::SIOCSIWAP %pM\n", Bssid));
return 0;
}
@@ -1513,11 +1511,8 @@ void getBaInfo(struct rt_rtmp_adapter *pAd, char *pOutBuf)
if (((pEntry->ValidAsCLI || pEntry->ValidAsApCli)
&& (pEntry->Sst == SST_ASSOC))
|| (pEntry->ValidAsWDS) || (pEntry->ValidAsMesh)) {
- sprintf(pOutBuf + strlen(pOutBuf),
- "\n%02X:%02X:%02X:%02X:%02X:%02X (Aid = %d) (AP) -\n",
- pEntry->Addr[0], pEntry->Addr[1],
- pEntry->Addr[2], pEntry->Addr[3],
- pEntry->Addr[4], pEntry->Addr[5], pEntry->Aid);
+ sprintf(pOutBuf + strlen(pOutBuf), "\n%pM (Aid = %d) "
+ "(AP) -\n", pEntry->Addr, pEntry->Aid);
sprintf(pOutBuf, "%s[Recipient]\n", pOutBuf);
for (j = 0; j < NUM_OF_TID; j++) {
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCHv2 02/10] staging: ath6kl: use '%pM' format to print MAC address
2010-09-13 8:40 [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf() Andy Shevchenko
@ 2010-09-13 8:40 ` Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 03/10] staging: brcm80211: " Andy Shevchenko
` (8 subsequent siblings)
9 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-13 8:40 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/ath6kl/os/linux/ar6000_drv.c | 10 +++-------
drivers/staging/ath6kl/os/linux/cfg80211.c | 20 +++++++-------------
drivers/staging/ath6kl/wmi/wmi.c | 8 +++-----
3 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index ff7976e..64ba958 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -956,12 +956,10 @@ ar6000_softmac_update(AR_SOFTC_T *ar, A_UCHAR *eeprom_data, size_t size)
ptr_mac = (A_UINT8 *)((A_UCHAR *)eeprom_data + AR6003_MAC_ADDRESS_OFFSET);
break;
default:
- AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Invalid Target Type \n"));
+ AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Target Type\n"));
return;
}
- printk("MAC from EEPROM %02X:%02X:%02X:%02X:%02X:%02X\n",
- ptr_mac[0], ptr_mac[1], ptr_mac[2],
- ptr_mac[3], ptr_mac[4], ptr_mac[5]);
+ printk(KERN_DEBUG "MAC from EEPROM %pM\n", ptr_mac);
/* create a random MAC in case we cannot read file from system */
ptr_mac[0] = 0;
@@ -990,9 +988,7 @@ ar6000_softmac_update(AR_SOFTC_T *ar, A_UCHAR *eeprom_data, size_t size)
}
A_RELEASE_FIRMWARE(softmac_entry);
}
- printk("MAC from %s %02X:%02X:%02X:%02X:%02X:%02X\n", source,
- ptr_mac[0], ptr_mac[1], ptr_mac[2],
- ptr_mac[3], ptr_mac[4], ptr_mac[5]);
+ printk(KERN_DEBUG "MAC from %s %pM\n", source, ptr_mac);
calculate_crc(ar->arTargetType, eeprom_data);
}
#endif /* SOFTMAC_FILE_USED */
diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c
index 7a3784d..a8b9241 100644
--- a/drivers/staging/ath6kl/os/linux/cfg80211.c
+++ b/drivers/staging/ath6kl/os/linux/cfg80211.c
@@ -544,13 +544,10 @@ ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel,
ibss_channel = ieee80211_get_channel(ar->wdev->wiphy, (int)channel);
- AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
- ("%s: inform bss with bssid %02x:%02x:%02x:%02x:%02x:%02x "\
- "channel %d beaconInterval %d capability 0x%x\n",
- __func__,
- mgmt->bssid[0], mgmt->bssid[1], mgmt->bssid[2],
- mgmt->bssid[3], mgmt->bssid[4], mgmt->bssid[5],
- ibss_channel->hw_value, beaconInterval, capability));
+ AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
+ ("%s: inform bss with bssid %pM channel %d beaconInterval %d "
+ "capability 0x%x\n", __func__, mgmt->bssid,
+ ibss_channel->hw_value, beaconInterval, capability));
bss = cfg80211_inform_bss_frame(ar->wdev->wiphy,
ibss_channel, mgmt,
@@ -715,12 +712,9 @@ ar6k_cfg80211_scan_node(void *arg, bss_t *ni)
channel = ieee80211_get_channel(wiphy, freq);
signal = ni->ni_snr * 100;
- AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
- ("%s: bssid %02x:%02x:%02x:%02x:%02x:%02x channel %d freq %d size %d\n",
- __func__,
- mgmt->bssid[0], mgmt->bssid[1], mgmt->bssid[2],
- mgmt->bssid[3], mgmt->bssid[4], mgmt->bssid[5],
- channel->hw_value, freq, size));
+ AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
+ ("%s: bssid %pM channel %d freq %d size %d\n", __func__,
+ mgmt->bssid, channel->hw_value, freq, size));
cfg80211_inform_bss_frame(wiphy, channel, mgmt,
le16_to_cpu(size),
signal, GFP_KERNEL);
diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c
index d14bad2..7800778 100644
--- a/drivers/staging/ath6kl/wmi/wmi.c
+++ b/drivers/staging/ath6kl/wmi/wmi.c
@@ -1456,11 +1456,9 @@ wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
buf = datap + sizeof(WMI_BSS_INFO_HDR);
len -= sizeof(WMI_BSS_INFO_HDR);
- A_DPRINTF(DBG_WMI2, (DBGFMT "bssInfo event - ch %u, rssi %02x, "
- "bssid \"%02x:%02x:%02x:%02x:%02x:%02x\"\n", DBGARG,
- bih->channel, (unsigned char) bih->rssi, bih->bssid[0],
- bih->bssid[1], bih->bssid[2], bih->bssid[3], bih->bssid[4],
- bih->bssid[5]));
+ A_DPRINTF(DBG_WMI2, (DBGFMT "bssInfo event - ch %u, rssi %02x, "
+ "bssid \"%pM\"\n", DBGARG, bih->channel,
+ (unsigned char) bih->rssi, bih->bssid));
if(wps_enable && (bih->frameType == PROBERESP_FTYPE) ) {
wmi_node_return(wmip, bss);
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCHv2 03/10] staging: brcm80211: use '%pM' format to print MAC address
2010-09-13 8:40 [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf() Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 02/10] staging: ath6kl: use '%pM' format to print MAC address Andy Shevchenko
@ 2010-09-13 8:40 ` Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 04/10] staging: cxt1e1: use '%pMF' " Andy Shevchenko
` (7 subsequent siblings)
9 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-13 8:40 UTC (permalink / raw)
To: devel, linux-kernel
Cc: Greg Kroah-Hartman, Andy Shevchenko, Nohee Ko, linux-wireless
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Nohee Ko <noheek@broadcom.com>
Cc: linux-wireless@vger.kernel.org
---
drivers/staging/brcm80211/util/bcmutils.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c
index 364f837..c6c63a8 100644
--- a/drivers/staging/brcm80211/util/bcmutils.c
+++ b/drivers/staging/brcm80211/util/bcmutils.c
@@ -792,10 +792,7 @@ int BCMROMFN(bcm_ether_atoe) (char *p, struct ether_addr * ea) {
char *bcm_ether_ntoa(const struct ether_addr *ea, char *buf)
{
- static const char template[] = "%02x:%02x:%02x:%02x:%02x:%02x";
- snprintf(buf, 18, template,
- ea->octet[0] & 0xff, ea->octet[1] & 0xff, ea->octet[2] & 0xff,
- ea->octet[3] & 0xff, ea->octet[4] & 0xff, ea->octet[5] & 0xff);
+ snprintf(buf, 18, "%pM", ea->octet);
return (buf);
}
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCHv2 04/10] staging: cxt1e1: use '%pMF' format to print MAC address
2010-09-13 8:40 [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf() Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 02/10] staging: ath6kl: use '%pM' format to print MAC address Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 03/10] staging: brcm80211: " Andy Shevchenko
@ 2010-09-13 8:40 ` Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 05/10] staging: octeon: use '%pM' " Andy Shevchenko
` (6 subsequent siblings)
9 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-13 8:40 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/cxt1e1/sbeproc.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/cxt1e1/sbeproc.c b/drivers/staging/cxt1e1/sbeproc.c
index 4f4dcd3..c3eed4b 100644
--- a/drivers/staging/cxt1e1/sbeproc.c
+++ b/drivers/staging/cxt1e1/sbeproc.c
@@ -142,9 +142,8 @@ sbecom_proc_get_sbe_info (char *buffer, char **start, off_t offset,
len += sprintf (buffer + len, "Board Number: %d\n", bip->brdno);
len += sprintf (buffer + len, "Hardware ID: 0x%02X\n", ci->hdw_bid);
len += sprintf (buffer + len, "Board SN: %06X\n", bip->brd_sn);
- len += sprintf (buffer + len, "Board MAC: %02X-%02X-%02X-%02X-%02X-%02X\n",
- bip->brd_mac_addr[0], bip->brd_mac_addr[1], bip->brd_mac_addr[2],
- bip->brd_mac_addr[3], bip->brd_mac_addr[4], bip->brd_mac_addr[5]);
+ len += sprintf(buffer + len, "Board MAC: %pMF\n",
+ bip->brd_mac_addr);
len += sprintf (buffer + len, "Ports: %d\n", ci->max_port);
len += sprintf (buffer + len, "Channels: %d\n", bip->brd_chan_cnt);
#if 1
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCHv2 05/10] staging: octeon: use '%pM' format to print MAC address
2010-09-13 8:40 [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf() Andy Shevchenko
` (2 preceding siblings ...)
2010-09-13 8:40 ` [PATCHv2 04/10] staging: cxt1e1: use '%pMF' " Andy Shevchenko
@ 2010-09-13 8:40 ` Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 06/10] staging: otus: " Andy Shevchenko
` (5 subsequent siblings)
9 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-13 8:40 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/octeon/ethernet.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index e50a17d..fb568a9 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -465,10 +465,7 @@ int cvm_oct_common_init(struct net_device *dev)
if (cvm_oct_mac_addr_offset >= octeon_bootinfo->mac_addr_count)
printk(KERN_DEBUG "%s: Using MAC outside of the assigned range:"
- " %02x:%02x:%02x:%02x:%02x:%02x\n", dev->name,
- sa.sa_data[0] & 0xff, sa.sa_data[1] & 0xff,
- sa.sa_data[2] & 0xff, sa.sa_data[3] & 0xff,
- sa.sa_data[4] & 0xff, sa.sa_data[5] & 0xff);
+ " %pM\n", dev->name, sa.sa_data);
cvm_oct_mac_addr_offset++;
/*
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCHv2 06/10] staging: otus: use '%pM' format to print MAC address
2010-09-13 8:40 [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf() Andy Shevchenko
` (3 preceding siblings ...)
2010-09-13 8:40 ` [PATCHv2 05/10] staging: octeon: use '%pM' " Andy Shevchenko
@ 2010-09-13 8:40 ` Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 07/10] staging: rt2870: " Andy Shevchenko
` (4 subsequent siblings)
9 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-13 8:40 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/otus/ioctl.c | 5 +----
drivers/staging/otus/wrap_ev.c | 15 ++++-----------
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/otus/ioctl.c b/drivers/staging/otus/ioctl.c
index dc3066d..a403d9c 100644
--- a/drivers/staging/otus/ioctl.c
+++ b/drivers/staging/otus/ioctl.c
@@ -2188,10 +2188,7 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
printk(KERN_ERR "usbdrv_wpa_ioctl: ZD_CMD_SET_MLME\n");
/* Translate STA's address */
- sprintf(mac_addr, "%02x:%02x:%02x:%02x:%02x:%02x",
- zdparm->sta_addr[0], zdparm->sta_addr[1],
- zdparm->sta_addr[2], zdparm->sta_addr[3],
- zdparm->sta_addr[4], zdparm->sta_addr[5]);
+ sprintf(mac_addr, "%pM", zdparm->sta_addr);
switch (zdparm->u.mlme.cmd) {
case MLME_STA_DEAUTH:
diff --git a/drivers/staging/otus/wrap_ev.c b/drivers/staging/otus/wrap_ev.c
index 29f5603..1c312ad 100644
--- a/drivers/staging/otus/wrap_ev.c
+++ b/drivers/staging/otus/wrap_ev.c
@@ -49,8 +49,7 @@ u16_t zfLnxAsocNotify(zdev_t *dev, u16_t *macAddr, u8_t *body, u16_t bodySize,
memset(&wreq, 0, sizeof(wreq));
memcpy(wreq.addr.sa_data, macAddr, ETH_ALEN);
wreq.addr.sa_family = ARPHRD_ETHER;
- printk(KERN_DEBUG "join_event of MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
- addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+ printk(KERN_DEBUG "join_event of MAC: %pM\n", addr);
for (i = 0; i < ZM_OAL_MAX_STA_SUPPORT; i++) {
for (j = 0; j < IEEE80211_ADDR_LEN; j++) {
@@ -114,9 +113,7 @@ u16_t zfLnxDisAsocNotify(zdev_t *dev, u8_t *macAddr, u16_t port)
memset(&wreq, 0, sizeof(wreq));
memcpy(wreq.addr.sa_data, macAddr, ETH_ALEN);
wreq.addr.sa_family = ARPHRD_ETHER;
- printk(KERN_DEBUG "zfwDisAsocNotify(), MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
- addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
-
+ printk(KERN_DEBUG "zfwDisAsocNotify(), MAC: %pM\n", addr);
return 0;
}
@@ -131,9 +128,7 @@ u16_t zfLnxApConnectNotify(zdev_t *dev, u8_t *macAddr, u16_t port)
memset(&wreq, 0, sizeof(wreq));
memcpy(wreq.addr.sa_data, macAddr, ETH_ALEN);
wreq.addr.sa_family = ARPHRD_ETHER;
- printk(KERN_DEBUG "zfwApConnectNotify(), MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
- addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
-
+ printk(KERN_DEBUG "zfwApConnectNotify(), MAC: %pM\n", addr);
return 0;
}
@@ -254,9 +249,7 @@ void zfLnxApMicFailureNotify(zdev_t *dev, u8_t *addr, zbuf_t *buf)
memset(&wreq, 0, sizeof(wreq));
memcpy(wreq.addr.sa_data, addr, ETH_ALEN);
wreq.addr.sa_family = ARPHRD_ETHER;
- printk(KERN_DEBUG "zfwApMicFailureNotify(), "
- "MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
- addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
+ printk(KERN_DEBUG "zfwApMicFailureNotify(), MAC: %pM\n", addr);
return;
}
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCHv2 07/10] staging: rt2870: use '%pM' format to print MAC address
2010-09-13 8:40 [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf() Andy Shevchenko
` (4 preceding siblings ...)
2010-09-13 8:40 ` [PATCHv2 06/10] staging: otus: " Andy Shevchenko
@ 2010-09-13 8:40 ` Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 08/10] staging: rtl8712: " Andy Shevchenko
` (3 subsequent siblings)
9 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-13 8:40 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/rt2870/common/rtusb_io.c | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/rt2870/common/rtusb_io.c b/drivers/staging/rt2870/common/rtusb_io.c
index 6b9ca24..7d2f7e0 100644
--- a/drivers/staging/rt2870/common/rtusb_io.c
+++ b/drivers/staging/rt2870/common/rtusb_io.c
@@ -1879,13 +1879,10 @@ void CMDHandler(struct rt_rtmp_adapter *pAd)
AsicUpdateRxWCIDTable(pAd, pEntry->Aid,
pEntry->Addr);
DBGPRINT(RT_DEBUG_TRACE,
- ("UpdateRxWCIDTable(): Aid=%d, Addr=%02x:%02x:%02x:%02x:%02x:%02x!\n",
- pEntry->Aid, pEntry->Addr[0],
- pEntry->Addr[1],
- pEntry->Addr[2],
- pEntry->Addr[3],
- pEntry->Addr[4],
- pEntry->Addr[5]));
+ ("UpdateRxWCIDTable(): Aid=%d, "
+ "Addr=%pM!\n",
+ pEntry->Aid,
+ pEntry->Addr));
}
break;
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCHv2 08/10] staging: rtl8712: use '%pM' format to print MAC address
2010-09-13 8:40 [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf() Andy Shevchenko
` (5 preceding siblings ...)
2010-09-13 8:40 ` [PATCHv2 07/10] staging: rt2870: " Andy Shevchenko
@ 2010-09-13 8:40 ` Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 09/10] staging: vt6655: " Andy Shevchenko
` (2 subsequent siblings)
9 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-13 8:40 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/rtl8712/osdep_service.h | 3 ---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 3 +--
2 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h
index 73509da..7fca42c 100644
--- a/drivers/staging/rtl8712/osdep_service.h
+++ b/drivers/staging/rtl8712/osdep_service.h
@@ -251,9 +251,6 @@ static inline u32 _RND512(u32 sz)
return val;
}
-#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
-#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
-
#define STRUCT_PACKED __attribute__ ((packed))
#endif
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index eac049b..685a7b1 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -1917,8 +1917,7 @@ static int r871x_get_ap_info(struct net_device *dev,
irqL);
return -EINVAL;
}
- printk(KERN_INFO "r8712u: BSSID:" MACSTR "\n",
- MAC2STR(bssid));
+ printk(KERN_INFO "r8712u: BSSID:%pM\n", bssid);
if (!memcmp(bssid, pnetwork->network.MacAddress, ETH_ALEN)) {
/* BSSID match, then check if supporting wpa/wpa2 */
pbuf = r8712_get_wpa_ie(&pnetwork->network.IEs[12],
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCHv2 09/10] staging: vt6655: use '%pM' format to print MAC address
2010-09-13 8:40 [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf() Andy Shevchenko
` (6 preceding siblings ...)
2010-09-13 8:40 ` [PATCHv2 08/10] staging: rtl8712: " Andy Shevchenko
@ 2010-09-13 8:40 ` Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 10/10] staging: wlags49_h2: " Andy Shevchenko
2010-09-16 19:32 ` [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf() Greg KH
9 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-13 8:40 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/vt6655/iwctl.c | 4 +---
drivers/staging/vt6655/vntwifi.c | 6 ++----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c
index 4009c0b..92e3399 100644
--- a/drivers/staging/vt6655/iwctl.c
+++ b/drivers/staging/vt6655/iwctl.c
@@ -2018,9 +2018,7 @@ param->u.wpa_key.seq_len = seq_len;
#if 0
printk("param->u.wpa_key.alg_name =%d\n",param->u.wpa_key.alg_name);
-printk("param->addr=%02x:%02x:%02x:%02x:%02x:%02x\n",
- param->addr[0],param->addr[1],param->addr[2],
- param->addr[3],param->addr[4],param->addr[5]);
+printk(KERN_DEBUG "param->addr=%pM\n", param->addr);
printk("param->u.wpa_key.set_tx =%d\n",param->u.wpa_key.set_tx);
printk("param->u.wpa_key.key_index =%d\n",param->u.wpa_key.key_index);
printk("param->u.wpa_key.key_len =%d\n",param->u.wpa_key.key_len);
diff --git a/drivers/staging/vt6655/vntwifi.c b/drivers/staging/vt6655/vntwifi.c
index fcf26ab..0491d0b 100644
--- a/drivers/staging/vt6655/vntwifi.c
+++ b/drivers/staging/vt6655/vntwifi.c
@@ -565,10 +565,8 @@ VNTWIFIvGetTxRate(
wTxDataRate = (pMgmt->sNodeDBTable[0].wTxDataRate);
#ifdef PLICE_DEBUG
- printk("GetTxRate:AP MAC is %02x:%02x:%02x:%02x:%02x:%02x,TxRate is %d\n",
- pMgmt->sNodeDBTable[0].abyMACAddr[0],pMgmt->sNodeDBTable[0].abyMACAddr[1],
- pMgmt->sNodeDBTable[0].abyMACAddr[2],pMgmt->sNodeDBTable[0].abyMACAddr[3],
- pMgmt->sNodeDBTable[0].abyMACAddr[4],pMgmt->sNodeDBTable[0].abyMACAddr[5],wTxDataRate);
+ printk(KERN_DEBUG "GetTxRate:AP MAC is %pM,TxRate is %d\n",
+ pMgmt->sNodeDBTable[0].abyMACAddr, wTxDataRate);
#endif
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCHv2 10/10] staging: wlags49_h2: use '%pM' format to print MAC address
2010-09-13 8:40 [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf() Andy Shevchenko
` (7 preceding siblings ...)
2010-09-13 8:40 ` [PATCHv2 09/10] staging: vt6655: " Andy Shevchenko
@ 2010-09-13 8:40 ` Andy Shevchenko
2010-09-16 19:32 ` [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf() Greg KH
9 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-13 8:40 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/wlags49_h2/wl_util.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wlags49_h2/wl_util.c b/drivers/staging/wlags49_h2/wl_util.c
index ce8ed41..4521c9f 100644
--- a/drivers/staging/wlags49_h2/wl_util.c
+++ b/drivers/staging/wlags49_h2/wl_util.c
@@ -338,9 +338,7 @@ const char *DbgHwAddr(unsigned char *hwAddr)
static char buffer[18];
/*------------------------------------------------------------------------*/
-
- sprintf( buffer, "%02X:%02X:%02X:%02X:%02X:%02X",
- hwAddr[0], hwAddr[1], hwAddr[2], hwAddr[3], hwAddr[4], hwAddr[5] );
+ sprintf(buffer, "%pM", hwAddr);
return buffer;
} // DbgHwAddr
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf()
2010-09-13 8:40 [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf() Andy Shevchenko
` (8 preceding siblings ...)
2010-09-13 8:40 ` [PATCHv2 10/10] staging: wlags49_h2: " Andy Shevchenko
@ 2010-09-16 19:32 ` Greg KH
2010-09-16 22:26 ` Andy Shevchenko
2010-09-16 22:45 ` Andy Shevchenko
9 siblings, 2 replies; 23+ messages in thread
From: Greg KH @ 2010-09-16 19:32 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: devel, linux-kernel, Greg Kroah-Hartman
On Mon, Sep 13, 2010 at 11:40:25AM +0300, Andy Shevchenko wrote:
> There are many locations where MAC or BSSID is printed. The plain format
> is used in such places. *printf() in kernel recognizes
> %pM, %pMF and %pm format parameters to print out 6-byte array as MAC
> address. This patch changes plain format to custom %pM which is widely
> used in kernel.
>
> Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
<snip>
Oops, I just took your first version of this series. Was there any
differences? If so, care to send me the remaining pieces and I'll apply
them?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf()
2010-09-16 19:32 ` [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf() Greg KH
@ 2010-09-16 22:26 ` Andy Shevchenko
2010-09-16 22:45 ` Andy Shevchenko
1 sibling, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-16 22:26 UTC (permalink / raw)
To: Greg KH; +Cc: devel, linux-kernel, Greg Kroah-Hartman
On Thu, Sep 16, 2010 at 10:32 PM, Greg KH <greg@kroah.com> wrote:
> Oops, I just took your first version of this series. Was there any
> differences? If so, care to send me the remaining pieces and I'll apply
> them?
Yep, there is common change from '&pointer[0]' notation to just
'pointer' as suggested by Joe Perches.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf()
2010-09-16 19:32 ` [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf() Greg KH
2010-09-16 22:26 ` Andy Shevchenko
@ 2010-09-16 22:45 ` Andy Shevchenko
2010-09-16 22:53 ` Greg KH
1 sibling, 1 reply; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-16 22:45 UTC (permalink / raw)
To: Greg KH; +Cc: devel, linux-kernel, Greg Kroah-Hartman
On Thu, Sep 16, 2010 at 10:32 PM, Greg KH <greg@kroah.com> wrote:
> If so, care to send me the remaining pieces and I'll apply
> them?
Do I understand correctly I need to prepare correction series with
changes between v1 and v2?
P.S. In one patch in v1 series there was a typo as well.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf()
2010-09-16 22:45 ` Andy Shevchenko
@ 2010-09-16 22:53 ` Greg KH
2010-09-17 8:24 ` [PATCH 1/9] staging: rt2860: '&pointer[0]' to 'pointer' fix Andy Shevchenko
0 siblings, 1 reply; 23+ messages in thread
From: Greg KH @ 2010-09-16 22:53 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: devel, linux-kernel, Greg Kroah-Hartman
On Fri, Sep 17, 2010 at 01:45:48AM +0300, Andy Shevchenko wrote:
> On Thu, Sep 16, 2010 at 10:32 PM, Greg KH <greg@kroah.com> wrote:
> > If so, care to send me the remaining pieces and I'll apply
> > them?
> Do I understand correctly I need to prepare correction series with
> changes between v1 and v2?
Yes.
> P.S. In one patch in v1 series there was a typo as well.
Ick, yeah, sorry about that, the differences between the two is what I
need to apply to fix up the issues.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 1/9] staging: rt2860: '&pointer[0]' to 'pointer' fix
2010-09-16 22:53 ` Greg KH
@ 2010-09-17 8:24 ` Andy Shevchenko
2010-09-17 8:24 ` [PATCH 2/9] staging: ath6kl: " Andy Shevchenko
` (7 more replies)
0 siblings, 8 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-17 8:24 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/rt2860/common/ba_action.c | 2 +-
drivers/staging/rt2860/common/cmm_mac_usb.c | 2 +-
drivers/staging/rt2860/common/cmm_wpa.c | 2 +-
drivers/staging/rt2860/common/mlme.c | 3 +--
drivers/staging/rt2860/common/rtmp_init.c | 4 ++--
drivers/staging/rt2860/sta/assoc.c | 2 +-
drivers/staging/rt2860/sta/connect.c | 6 +++---
drivers/staging/rt2860/sta/sync.c | 4 ++--
drivers/staging/rt2860/sta_ioctl.c | 4 ++--
9 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/rt2860/common/ba_action.c b/drivers/staging/rt2860/common/ba_action.c
index 3f71c50..1befe99 100644
--- a/drivers/staging/rt2860/common/ba_action.c
+++ b/drivers/staging/rt2860/common/ba_action.c
@@ -655,7 +655,7 @@ BOOLEAN BARecSessionAdd(struct rt_rtmp_adapter *pAd,
Status = FALSE;
DBGPRINT(RT_DEBUG_TRACE,
("Can't Accept ADDBA for %pM TID = %d\n",
- &pEntry->Addr[0], TID));
+ pEntry->Addr, TID));
}
return (Status);
}
diff --git a/drivers/staging/rt2860/common/cmm_mac_usb.c b/drivers/staging/rt2860/common/cmm_mac_usb.c
index d08abf7..72731cb 100644
--- a/drivers/staging/rt2860/common/cmm_mac_usb.c
+++ b/drivers/staging/rt2860/common/cmm_mac_usb.c
@@ -663,7 +663,7 @@ int RTUSBWriteHWMACAddress(struct rt_rtmp_adapter *pAd)
StaMacReg1.field.Byte5 = pAd->CurrentAddress[5];
StaMacReg1.field.U2MeMask = 0xff;
DBGPRINT_RAW(RT_DEBUG_TRACE,
- ("Local MAC = %pM\n", &pAd->CurrentAddress[0]));
+ ("Local MAC = %pM\n", pAd->CurrentAddress));
RTUSBWriteMACRegister(pAd, MAC_ADDR_DW0, StaMacReg0.word);
RTUSBWriteMACRegister(pAd, MAC_ADDR_DW1, StaMacReg1.word);
diff --git a/drivers/staging/rt2860/common/cmm_wpa.c b/drivers/staging/rt2860/common/cmm_wpa.c
index 78ca4ed..e37b64b 100644
--- a/drivers/staging/rt2860/common/cmm_wpa.c
+++ b/drivers/staging/rt2860/common/cmm_wpa.c
@@ -222,7 +222,7 @@ void WpaEAPOLKeyAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E
DBGPRINT(RT_DEBUG_TRACE,
("Receive EAPoL-Key frame from STA %pMF\n",
- &pEntry->Addr[0]));
+ pEntry->Addr));
if (((pEapol_packet->ProVer != EAPOL_VER)
&& (pEapol_packet->ProVer != EAPOL_VER2))
diff --git a/drivers/staging/rt2860/common/mlme.c b/drivers/staging/rt2860/common/mlme.c
index e514033..3558f65 100644
--- a/drivers/staging/rt2860/common/mlme.c
+++ b/drivers/staging/rt2860/common/mlme.c
@@ -1537,8 +1537,7 @@ void MlmeAutoReconnectLastSSID(struct rt_rtmp_adapter *pAd)
if (pAd->StaCfg.bAutoConnectByBssid) {
DBGPRINT(RT_DEBUG_TRACE,
("Driver auto reconnect to last OID_802_11_BSSID "
- "setting - %pM\n",
- &pAd->MlmeAux.Bssid[0]));
+ "setting - %pM\n", pAd->MlmeAux.Bssid));
pAd->MlmeAux.Channel = pAd->CommonCfg.Channel;
MlmeEnqueue(pAd,
diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c
index afeb528..3628e85 100644
--- a/drivers/staging/rt2860/common/rtmp_init.c
+++ b/drivers/staging/rt2860/common/rtmp_init.c
@@ -749,7 +749,7 @@ void NICReadEEPROMParameters(struct rt_rtmp_adapter *pAd, u8 *mac_addr)
/* pAd->PermanentAddress[5] = RandomByte(pAd)&0xf8; */
DBGPRINT_RAW(RT_DEBUG_TRACE,
- ("E2PROM MAC: =%pM\n", &pAd->PermanentAddress[0]));
+ ("E2PROM MAC: =%pM\n", pAd->PermanentAddress));
if (pAd->bLocalAdminMAC == FALSE) {
MAC_DW0_STRUC csr2;
MAC_DW1_STRUC csr3;
@@ -767,7 +767,7 @@ void NICReadEEPROMParameters(struct rt_rtmp_adapter *pAd, u8 *mac_addr)
RTMP_IO_WRITE32(pAd, MAC_ADDR_DW1, csr3.word);
DBGPRINT_RAW(RT_DEBUG_TRACE,
("E2PROM MAC: =%pM\n",
- &pAd->PermanentAddress[0]));
+ pAd->PermanentAddress));
}
}
diff --git a/drivers/staging/rt2860/sta/assoc.c b/drivers/staging/rt2860/sta/assoc.c
index 1efd75b..b7efb0b 100644
--- a/drivers/staging/rt2860/sta/assoc.c
+++ b/drivers/staging/rt2860/sta/assoc.c
@@ -795,7 +795,7 @@ void MlmeDisassocReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_ele
DBGPRINT(RT_DEBUG_TRACE,
("ASSOC - Send DISASSOC request[BSSID::%pM (Reason=%d)\n",
- &pDisassocReq->Addr[0], pDisassocReq->Reason));
+ pDisassocReq->Addr, pDisassocReq->Reason));
MgtMacHeaderInit(pAd, &DisassocHdr, SUBTYPE_DISASSOC, 0, pDisassocReq->Addr, pDisassocReq->Addr); /* patch peap ttls switching issue */
MakeOutgoingFrame(pOutBuffer, &FrameLen,
sizeof(struct rt_header_802_11), &DisassocHdr,
diff --git a/drivers/staging/rt2860/sta/connect.c b/drivers/staging/rt2860/sta/connect.c
index 05b4af6..c380551 100644
--- a/drivers/staging/rt2860/sta/connect.c
+++ b/drivers/staging/rt2860/sta/connect.c
@@ -654,7 +654,7 @@ void CntlOidRTBssidProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *
} */
/* No active association, join the BSS immediately */
DBGPRINT(RT_DEBUG_TRACE, ("CNTL - joining %pM ...\n",
- &pOidBssid[0]));
+ pOidBssid));
JoinParmFill(pAd, &JoinReq, pAd->MlmeAux.BssIdx);
MlmeEnqueue(pAd, SYNC_STATE_MACHINE, MT2_MLME_JOIN_REQ,
@@ -777,7 +777,7 @@ void CntlWaitJoinProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *El
pAd->Mlme.CntlMachine.CurrState = CNTL_IDLE;
DBGPRINT(RT_DEBUG_TRACE,
("CNTL - join the IBSS = %pM ...\n",
- &pAd->CommonCfg.Bssid[0]));
+ pAd->CommonCfg.Bssid));
pAd->IndicateMediaState =
NdisMediaStateConnected;
@@ -896,7 +896,7 @@ void CntlWaitStartProc(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E
DBGPRINT(RT_DEBUG_TRACE,
("CNTL - start a new IBSS = %pM ...\n",
- &pAd->CommonCfg.Bssid[0]));
+ pAd->CommonCfg.Bssid));
} else {
DBGPRINT(RT_DEBUG_TRACE,
("CNTL - Start IBSS fail. BUG!\n"));
diff --git a/drivers/staging/rt2860/sta/sync.c b/drivers/staging/rt2860/sta/sync.c
index 3abc362..747d3c6 100644
--- a/drivers/staging/rt2860/sta/sync.c
+++ b/drivers/staging/rt2860/sta/sync.c
@@ -425,7 +425,7 @@ void MlmeJoinReqAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *E
DBGPRINT(RT_DEBUG_TRACE,
("SYNC - Switch to ch %d, Wait BEACON from %pM\n",
- pBss->Channel, &pBss->Bssid[0]));
+ pBss->Channel, pBss->Bssid));
pAd->Mlme.SyncMachine.CurrState = JOIN_WAIT_BEACON;
}
@@ -1226,7 +1226,7 @@ void PeerBeacon(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_elem *Elem)
DBGPRINT(RT_DEBUG_TRACE,
("SYNC - merge to the IBSS "
"with bigger BSSID="
- "%pM\n", &Bssid[0]));
+ "%pM\n", Bssid));
AsicDisableSync(pAd);
COPY_MAC_ADDR(pAd->CommonCfg.Bssid,
Bssid);
diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index bff7b0b..e095a44 100644
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -614,7 +614,7 @@ int rt_ioctl_siwap(struct net_device *dev,
OID_802_11_BSSID,
sizeof(NDIS_802_11_MAC_ADDRESS), (void *) & Bssid);
- DBGPRINT(RT_DEBUG_TRACE, ("IOCTL::SIOCSIWAP %pM\n", &Bssid[0]));
+ DBGPRINT(RT_DEBUG_TRACE, ("IOCTL::SIOCSIWAP %pM\n", Bssid));
return 0;
}
@@ -1512,7 +1512,7 @@ void getBaInfo(struct rt_rtmp_adapter *pAd, char *pOutBuf)
&& (pEntry->Sst == SST_ASSOC))
|| (pEntry->ValidAsWDS) || (pEntry->ValidAsMesh)) {
sprintf(pOutBuf + strlen(pOutBuf), "\n%pM (Aid = %d) "
- "(AP) -\n", &pEntry->Addr[0], pEntry->Aid);
+ "(AP) -\n", pEntry->Addr, pEntry->Aid);
sprintf(pOutBuf, "%s[Recipient]\n", pOutBuf);
for (j = 0; j < NUM_OF_TID; j++) {
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 2/9] staging: ath6kl: '&pointer[0]' to 'pointer' fix
2010-09-17 8:24 ` [PATCH 1/9] staging: rt2860: '&pointer[0]' to 'pointer' fix Andy Shevchenko
@ 2010-09-17 8:24 ` Andy Shevchenko
2010-09-17 8:24 ` [PATCH 3/9] staging: cxt1e1: " Andy Shevchenko
` (6 subsequent siblings)
7 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-17 8:24 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/ath6kl/os/linux/ar6000_drv.c | 4 ++--
drivers/staging/ath6kl/os/linux/cfg80211.c | 4 ++--
drivers/staging/ath6kl/wmi/wmi.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index c2947bc..c7922c9 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -959,7 +959,7 @@ ar6000_softmac_update(AR_SOFTC_T *ar, A_UCHAR *eeprom_data, size_t size)
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Target Type\n"));
return;
}
- printk(KERN_DEBUG "MAC from EEPROM %pM\n", &ptr_mac[0]);
+ printk(KERN_DEBUG "MAC from EEPROM %pM\n", ptr_mac);
/* create a random MAC in case we cannot read file from system */
ptr_mac[0] = 0;
@@ -988,7 +988,7 @@ ar6000_softmac_update(AR_SOFTC_T *ar, A_UCHAR *eeprom_data, size_t size)
}
A_RELEASE_FIRMWARE(softmac_entry);
}
- printk(KERN_DEBUG "MAC from %s %pM\n", source, &ptr_mac[0]);
+ printk(KERN_DEBUG "MAC from %s %pM\n", source, ptr_mac);
calculate_crc(ar->arTargetType, eeprom_data);
}
#endif /* SOFTMAC_FILE_USED */
diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c
index d5890d4..a8b9241 100644
--- a/drivers/staging/ath6kl/os/linux/cfg80211.c
+++ b/drivers/staging/ath6kl/os/linux/cfg80211.c
@@ -546,7 +546,7 @@ ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel,
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
("%s: inform bss with bssid %pM channel %d beaconInterval %d "
- "capability 0x%x\n", __func__, &mgmt->bssid[0],
+ "capability 0x%x\n", __func__, mgmt->bssid,
ibss_channel->hw_value, beaconInterval, capability));
bss = cfg80211_inform_bss_frame(ar->wdev->wiphy,
@@ -714,7 +714,7 @@ ar6k_cfg80211_scan_node(void *arg, bss_t *ni)
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
("%s: bssid %pM channel %d freq %d size %d\n", __func__,
- &mgmt->bssid[0], channel->hw_value, freq, size));
+ mgmt->bssid, channel->hw_value, freq, size));
cfg80211_inform_bss_frame(wiphy, channel, mgmt,
le16_to_cpu(size),
signal, GFP_KERNEL);
diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c
index 9811ce7..7800778 100644
--- a/drivers/staging/ath6kl/wmi/wmi.c
+++ b/drivers/staging/ath6kl/wmi/wmi.c
@@ -1458,7 +1458,7 @@ wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
A_DPRINTF(DBG_WMI2, (DBGFMT "bssInfo event - ch %u, rssi %02x, "
"bssid \"%pM\"\n", DBGARG, bih->channel,
- (unsigned char) bih->rssi, i&bih->bssid[0]));
+ (unsigned char) bih->rssi, bih->bssid));
if(wps_enable && (bih->frameType == PROBERESP_FTYPE) ) {
wmi_node_return(wmip, bss);
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 3/9] staging: cxt1e1: '&pointer[0]' to 'pointer' fix
2010-09-17 8:24 ` [PATCH 1/9] staging: rt2860: '&pointer[0]' to 'pointer' fix Andy Shevchenko
2010-09-17 8:24 ` [PATCH 2/9] staging: ath6kl: " Andy Shevchenko
@ 2010-09-17 8:24 ` Andy Shevchenko
2010-09-17 8:24 ` [PATCH 4/9] staging: octeon: " Andy Shevchenko
` (5 subsequent siblings)
7 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-17 8:24 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/cxt1e1/sbeproc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/cxt1e1/sbeproc.c b/drivers/staging/cxt1e1/sbeproc.c
index af8fce4..c3eed4b 100644
--- a/drivers/staging/cxt1e1/sbeproc.c
+++ b/drivers/staging/cxt1e1/sbeproc.c
@@ -143,7 +143,7 @@ sbecom_proc_get_sbe_info (char *buffer, char **start, off_t offset,
len += sprintf (buffer + len, "Hardware ID: 0x%02X\n", ci->hdw_bid);
len += sprintf (buffer + len, "Board SN: %06X\n", bip->brd_sn);
len += sprintf(buffer + len, "Board MAC: %pMF\n",
- &bip->brd_mac_addr[0]);
+ bip->brd_mac_addr);
len += sprintf (buffer + len, "Ports: %d\n", ci->max_port);
len += sprintf (buffer + len, "Channels: %d\n", bip->brd_chan_cnt);
#if 1
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 4/9] staging: octeon: '&pointer[0]' to 'pointer' fix
2010-09-17 8:24 ` [PATCH 1/9] staging: rt2860: '&pointer[0]' to 'pointer' fix Andy Shevchenko
2010-09-17 8:24 ` [PATCH 2/9] staging: ath6kl: " Andy Shevchenko
2010-09-17 8:24 ` [PATCH 3/9] staging: cxt1e1: " Andy Shevchenko
@ 2010-09-17 8:24 ` Andy Shevchenko
2010-09-17 8:24 ` [PATCH 5/9] staging: otus: " Andy Shevchenko
` (4 subsequent siblings)
7 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-17 8:24 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/octeon/ethernet.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
index 9537ea4..fb568a9 100644
--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
@@ -465,7 +465,7 @@ int cvm_oct_common_init(struct net_device *dev)
if (cvm_oct_mac_addr_offset >= octeon_bootinfo->mac_addr_count)
printk(KERN_DEBUG "%s: Using MAC outside of the assigned range:"
- " %pM\n", dev->name, &sa.sa_data[0]);
+ " %pM\n", dev->name, sa.sa_data);
cvm_oct_mac_addr_offset++;
/*
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 5/9] staging: otus: '&pointer[0]' to 'pointer' fix
2010-09-17 8:24 ` [PATCH 1/9] staging: rt2860: '&pointer[0]' to 'pointer' fix Andy Shevchenko
` (2 preceding siblings ...)
2010-09-17 8:24 ` [PATCH 4/9] staging: octeon: " Andy Shevchenko
@ 2010-09-17 8:24 ` Andy Shevchenko
2010-09-17 8:24 ` [PATCH 6/9] staging: rt2870: " Andy Shevchenko
` (3 subsequent siblings)
7 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-17 8:24 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/otus/ioctl.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/otus/ioctl.c b/drivers/staging/otus/ioctl.c
index 405bd29..a403d9c 100644
--- a/drivers/staging/otus/ioctl.c
+++ b/drivers/staging/otus/ioctl.c
@@ -2188,7 +2188,7 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
printk(KERN_ERR "usbdrv_wpa_ioctl: ZD_CMD_SET_MLME\n");
/* Translate STA's address */
- sprintf(mac_addr, "%pM", &zdparm->sta_addr[0]);
+ sprintf(mac_addr, "%pM", zdparm->sta_addr);
switch (zdparm->u.mlme.cmd) {
case MLME_STA_DEAUTH:
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 6/9] staging: rt2870: '&pointer[0]' to 'pointer' fix
2010-09-17 8:24 ` [PATCH 1/9] staging: rt2860: '&pointer[0]' to 'pointer' fix Andy Shevchenko
` (3 preceding siblings ...)
2010-09-17 8:24 ` [PATCH 5/9] staging: otus: " Andy Shevchenko
@ 2010-09-17 8:24 ` Andy Shevchenko
2010-09-17 8:24 ` [PATCH 7/9] staging: rtl8712: " Andy Shevchenko
` (2 subsequent siblings)
7 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-17 8:24 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/rt2870/common/rtusb_io.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/rt2870/common/rtusb_io.c b/drivers/staging/rt2870/common/rtusb_io.c
index eb01c8a..7d2f7e0 100644
--- a/drivers/staging/rt2870/common/rtusb_io.c
+++ b/drivers/staging/rt2870/common/rtusb_io.c
@@ -1882,7 +1882,7 @@ void CMDHandler(struct rt_rtmp_adapter *pAd)
("UpdateRxWCIDTable(): Aid=%d, "
"Addr=%pM!\n",
pEntry->Aid,
- &pEntry->Addr[0]));
+ pEntry->Addr));
}
break;
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 7/9] staging: rtl8712: '&pointer[0]' to 'pointer' fix
2010-09-17 8:24 ` [PATCH 1/9] staging: rt2860: '&pointer[0]' to 'pointer' fix Andy Shevchenko
` (4 preceding siblings ...)
2010-09-17 8:24 ` [PATCH 6/9] staging: rt2870: " Andy Shevchenko
@ 2010-09-17 8:24 ` Andy Shevchenko
2010-09-17 8:24 ` [PATCH 8/9] staging: vt6655: " Andy Shevchenko
2010-09-17 8:24 ` [PATCH 9/9] staging: wlags49_h2: " Andy Shevchenko
7 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-17 8:24 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index a54e25d..685a7b1 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -1917,7 +1917,7 @@ static int r871x_get_ap_info(struct net_device *dev,
irqL);
return -EINVAL;
}
- printk(KERN_INFO "r8712u: BSSID:%pM\n", &bssid[0]);
+ printk(KERN_INFO "r8712u: BSSID:%pM\n", bssid);
if (!memcmp(bssid, pnetwork->network.MacAddress, ETH_ALEN)) {
/* BSSID match, then check if supporting wpa/wpa2 */
pbuf = r8712_get_wpa_ie(&pnetwork->network.IEs[12],
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 8/9] staging: vt6655: '&pointer[0]' to 'pointer' fix
2010-09-17 8:24 ` [PATCH 1/9] staging: rt2860: '&pointer[0]' to 'pointer' fix Andy Shevchenko
` (5 preceding siblings ...)
2010-09-17 8:24 ` [PATCH 7/9] staging: rtl8712: " Andy Shevchenko
@ 2010-09-17 8:24 ` Andy Shevchenko
2010-09-17 8:24 ` [PATCH 9/9] staging: wlags49_h2: " Andy Shevchenko
7 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-17 8:24 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/vt6655/iwctl.c | 2 +-
drivers/staging/vt6655/vntwifi.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/vt6655/iwctl.c b/drivers/staging/vt6655/iwctl.c
index d74b744..92e3399 100644
--- a/drivers/staging/vt6655/iwctl.c
+++ b/drivers/staging/vt6655/iwctl.c
@@ -2018,7 +2018,7 @@ param->u.wpa_key.seq_len = seq_len;
#if 0
printk("param->u.wpa_key.alg_name =%d\n",param->u.wpa_key.alg_name);
-printk(KERN_DEBUG "param->addr=%pM\n", ¶m->addr[0]);
+printk(KERN_DEBUG "param->addr=%pM\n", param->addr);
printk("param->u.wpa_key.set_tx =%d\n",param->u.wpa_key.set_tx);
printk("param->u.wpa_key.key_index =%d\n",param->u.wpa_key.key_index);
printk("param->u.wpa_key.key_len =%d\n",param->u.wpa_key.key_len);
diff --git a/drivers/staging/vt6655/vntwifi.c b/drivers/staging/vt6655/vntwifi.c
index db9cbe9..0491d0b 100644
--- a/drivers/staging/vt6655/vntwifi.c
+++ b/drivers/staging/vt6655/vntwifi.c
@@ -566,8 +566,7 @@ VNTWIFIvGetTxRate(
wTxDataRate = (pMgmt->sNodeDBTable[0].wTxDataRate);
#ifdef PLICE_DEBUG
printk(KERN_DEBUG "GetTxRate:AP MAC is %pM,TxRate is %d\n",
- &pMgmt->sNodeDBTable[0].abyMACAddr[0],
- wTxDataRate);
+ pMgmt->sNodeDBTable[0].abyMACAddr, wTxDataRate);
#endif
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 9/9] staging: wlags49_h2: '&pointer[0]' to 'pointer' fix
2010-09-17 8:24 ` [PATCH 1/9] staging: rt2860: '&pointer[0]' to 'pointer' fix Andy Shevchenko
` (6 preceding siblings ...)
2010-09-17 8:24 ` [PATCH 8/9] staging: vt6655: " Andy Shevchenko
@ 2010-09-17 8:24 ` Andy Shevchenko
7 siblings, 0 replies; 23+ messages in thread
From: Andy Shevchenko @ 2010-09-17 8:24 UTC (permalink / raw)
To: devel, linux-kernel; +Cc: Greg Kroah-Hartman, Andy Shevchenko
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/staging/wlags49_h2/wl_util.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/wlags49_h2/wl_util.c b/drivers/staging/wlags49_h2/wl_util.c
index e510dcb..4521c9f 100644
--- a/drivers/staging/wlags49_h2/wl_util.c
+++ b/drivers/staging/wlags49_h2/wl_util.c
@@ -338,7 +338,7 @@ const char *DbgHwAddr(unsigned char *hwAddr)
static char buffer[18];
/*------------------------------------------------------------------------*/
- sprintf(buffer, "%pM", &hwAddr[0]);
+ sprintf(buffer, "%pM", hwAddr);
return buffer;
} // DbgHwAddr
--
1.7.2.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
end of thread, other threads:[~2010-09-17 8:27 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-13 8:40 [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf() Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 02/10] staging: ath6kl: use '%pM' format to print MAC address Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 03/10] staging: brcm80211: " Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 04/10] staging: cxt1e1: use '%pMF' " Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 05/10] staging: octeon: use '%pM' " Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 06/10] staging: otus: " Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 07/10] staging: rt2870: " Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 08/10] staging: rtl8712: " Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 09/10] staging: vt6655: " Andy Shevchenko
2010-09-13 8:40 ` [PATCHv2 10/10] staging: wlags49_h2: " Andy Shevchenko
2010-09-16 19:32 ` [PATCHv2 01/10] staging: rt2860: change plain format of mac address to %pM in *printf() Greg KH
2010-09-16 22:26 ` Andy Shevchenko
2010-09-16 22:45 ` Andy Shevchenko
2010-09-16 22:53 ` Greg KH
2010-09-17 8:24 ` [PATCH 1/9] staging: rt2860: '&pointer[0]' to 'pointer' fix Andy Shevchenko
2010-09-17 8:24 ` [PATCH 2/9] staging: ath6kl: " Andy Shevchenko
2010-09-17 8:24 ` [PATCH 3/9] staging: cxt1e1: " Andy Shevchenko
2010-09-17 8:24 ` [PATCH 4/9] staging: octeon: " Andy Shevchenko
2010-09-17 8:24 ` [PATCH 5/9] staging: otus: " Andy Shevchenko
2010-09-17 8:24 ` [PATCH 6/9] staging: rt2870: " Andy Shevchenko
2010-09-17 8:24 ` [PATCH 7/9] staging: rtl8712: " Andy Shevchenko
2010-09-17 8:24 ` [PATCH 8/9] staging: vt6655: " Andy Shevchenko
2010-09-17 8:24 ` [PATCH 9/9] staging: wlags49_h2: " Andy Shevchenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.