Skip to content

L
linux
Commit d6a32aa1 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files
Options

staging: vt6656: use %pM for printing MACs 

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 30d6a2b8
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 72 deletions
drivers/staging/vt6656/dpc.c
View file @ d6a32aa1
...@@ -1109,30 +1109,12 @@ static BOOL s_bAPModeRxCtl ( ...@@ -1109,30 +1109,12 @@ static BOOL s_bAPModeRxCtl (
&Status &Status
); );
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: send vMgrDeAuthenBeginSta 3\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: send vMgrDeAuthenBeginSta 3\n");
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BSSID:%02x-%02x-%02x=%02x-%02x-%02x \n", DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "BSSID:%pM\n",
p802_11Header->abyAddr3[0], p802_11Header->abyAddr3);
p802_11Header->abyAddr3[1], DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ADDR2:%pM\n",
p802_11Header->abyAddr3[2], p802_11Header->abyAddr2);
p802_11Header->abyAddr3[3], DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ADDR1:%pM\n",
p802_11Header->abyAddr3[4], p802_11Header->abyAddr1);
p802_11Header->abyAddr3[5]
);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ADDR2:%02x-%02x-%02x=%02x-%02x-%02x \n",
p802_11Header->abyAddr2[0],
p802_11Header->abyAddr2[1],
p802_11Header->abyAddr2[2],
p802_11Header->abyAddr2[3],
p802_11Header->abyAddr2[4],
p802_11Header->abyAddr2[5]
);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ADDR1:%02x-%02x-%02x=%02x-%02x-%02x \n",
p802_11Header->abyAddr1[0],
p802_11Header->abyAddr1[1],
p802_11Header->abyAddr1[2],
p802_11Header->abyAddr1[3],
p802_11Header->abyAddr1[4],
p802_11Header->abyAddr1[5]
);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: wFrameCtl= %x\n", p802_11Header->wFrameCtl ); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: wFrameCtl= %x\n", p802_11Header->wFrameCtl );
return TRUE; return TRUE;
} }
......
drivers/staging/vt6656/main_usb.c
View file @ d6a32aa1
...@@ -611,17 +611,10 @@ static BOOL device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType) ...@@ -611,17 +611,10 @@ static BOOL device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)
// if exist SW network address, use SW network address. // if exist SW network address, use SW network address.
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Network address = %02x-%02x-%02x=%02x-%02x-%02x\n", DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Network address = %pM\n",
pDevice->abyCurrentNetAddr[0], pDevice->abyCurrentNetAddr);
pDevice->abyCurrentNetAddr[1],
pDevice->abyCurrentNetAddr[2],
pDevice->abyCurrentNetAddr[3],
pDevice->abyCurrentNetAddr[4],
pDevice->abyCurrentNetAddr[5]);
} }
// Set BB and packet type at the same time. // Set BB and packet type at the same time.
// Set Short Slot Time, xIFS, and RSPINF. // Set Short Slot Time, xIFS, and RSPINF.
if (pDevice->byBBType == BB_TYPE_11A) { if (pDevice->byBBType == BB_TYPE_11A) {
......
drivers/staging/vt6656/wmgr.c
View file @ d6a32aa1
...@@ -2477,14 +2477,8 @@ void vMgrCreateOwnIBSS(void *hDeviceContext, ...@@ -2477,14 +2477,8 @@ void vMgrCreateOwnIBSS(void *hDeviceContext,
if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) { if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
// AP mode BSSID = MAC addr // AP mode BSSID = MAC addr
memcpy(pMgmt->abyCurrBSSID, pMgmt->abyMACAddr, WLAN_ADDR_LEN); memcpy(pMgmt->abyCurrBSSID, pMgmt->abyMACAddr, WLAN_ADDR_LEN);
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO"AP beacon created BSSID:%02x-%02x-%02x-%02x-%02x-%02x \n", DBG_PRT(MSG_LEVEL_INFO, KERN_INFO"AP beacon created BSSID:"
pMgmt->abyCurrBSSID[0], "%pM\n", pMgmt->abyCurrBSSID);
pMgmt->abyCurrBSSID[1],
pMgmt->abyCurrBSSID[2],
pMgmt->abyCurrBSSID[3],
pMgmt->abyCurrBSSID[4],
pMgmt->abyCurrBSSID[5]
);
} }
if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) { if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
...@@ -2506,14 +2500,8 @@ void vMgrCreateOwnIBSS(void *hDeviceContext, ...@@ -2506,14 +2500,8 @@ void vMgrCreateOwnIBSS(void *hDeviceContext,
pMgmt->abyCurrBSSID[0] |= IEEE_ADDR_UNIVERSAL; pMgmt->abyCurrBSSID[0] |= IEEE_ADDR_UNIVERSAL;
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO"Adhoc beacon created bssid:%02x-%02x-%02x-%02x-%02x-%02x \n", DBG_PRT(MSG_LEVEL_INFO, KERN_INFO"Adhoc beacon created bssid:"
pMgmt->abyCurrBSSID[0], "%pM\n", pMgmt->abyCurrBSSID);
pMgmt->abyCurrBSSID[1],
pMgmt->abyCurrBSSID[2],
pMgmt->abyCurrBSSID[3],
pMgmt->abyCurrBSSID[4],
pMgmt->abyCurrBSSID[5]
);
} }
// set BSSID filter // set BSSID filter
...@@ -2878,14 +2866,8 @@ void vMgrJoinBSSBegin(void *hDeviceContext, PCMD_STATUS pStatus) ...@@ -2878,14 +2866,8 @@ void vMgrJoinBSSBegin(void *hDeviceContext, PCMD_STATUS pStatus)
ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_PAPEDELAY,LEDSTS_STS,LEDSTS_INTER); ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_PAPEDELAY,LEDSTS_STS,LEDSTS_INTER);
memcpy(pDevice->abyBSSID, pCurr->abyBSSID, WLAN_BSSID_LEN); memcpy(pDevice->abyBSSID, pCurr->abyBSSID, WLAN_BSSID_LEN);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Join IBSS ok:%02x-%02x-%02x-%02x-%02x-%02x \n", DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Join IBSS ok:%pM\n",
pMgmt->abyCurrBSSID[0], pMgmt->abyCurrBSSID);
pMgmt->abyCurrBSSID[1],
pMgmt->abyCurrBSSID[2],
pMgmt->abyCurrBSSID[3],
pMgmt->abyCurrBSSID[4],
pMgmt->abyCurrBSSID[5]
);
// Preamble type auto-switch: if AP can receive short-preamble cap, // Preamble type auto-switch: if AP can receive short-preamble cap,
// and if registry setting is short preamble we can turn on too. // and if registry setting is short preamble we can turn on too.
...@@ -2983,13 +2965,8 @@ s_vMgrSynchBSS ( ...@@ -2983,13 +2965,8 @@ s_vMgrSynchBSS (
memcpy(pMgmt->abyCurrBSSID, pCurr->abyBSSID, 6); memcpy(pMgmt->abyCurrBSSID, pCurr->abyBSSID, 6);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Sync:set CurrBSSID address = %02x-%02x-%02x=%02x-%02x-%02x\n", DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Sync:set CurrBSSID address = "
pMgmt->abyCurrBSSID[0], "%pM\n", pMgmt->abyCurrBSSID);
pMgmt->abyCurrBSSID[1],
pMgmt->abyCurrBSSID[2],
pMgmt->abyCurrBSSID[3],
pMgmt->abyCurrBSSID[4],
pMgmt->abyCurrBSSID[5]);
if (pCurr->eNetworkTypeInUse == PHY_TYPE_11A) { if (pCurr->eNetworkTypeInUse == PHY_TYPE_11A) {
if ((pDevice->eConfigPHYMode == PHY_TYPE_11A) || if ((pDevice->eConfigPHYMode == PHY_TYPE_11A) ||
...@@ -4334,14 +4311,8 @@ s_vMgrRxProbeRequest( ...@@ -4334,14 +4311,8 @@ s_vMgrRxProbeRequest(
sFrame.pBuf = (PBYTE)pRxPacket->p80211Header; sFrame.pBuf = (PBYTE)pRxPacket->p80211Header;
vMgrDecodeProbeRequest(&sFrame); vMgrDecodeProbeRequest(&sFrame);
/* /*
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request rx:MAC addr:%02x-%02x-%02x=%02x-%02x-%02x \n", DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request rx:MAC addr:%pM\n",
sFrame.pHdr->sA3.abyAddr2[0], sFrame.pHdr->sA3.abyAddr2);
sFrame.pHdr->sA3.abyAddr2[1],
sFrame.pHdr->sA3.abyAddr2[2],
sFrame.pHdr->sA3.abyAddr2[3],
sFrame.pHdr->sA3.abyAddr2[4],
sFrame.pHdr->sA3.abyAddr2[5]
);
*/ */
if (sFrame.pSSID->len != 0) { if (sFrame.pSSID->len != 0) {
if (sFrame.pSSID->len != ((PWLAN_IE_SSID)pMgmt->abyCurrSSID)->len) if (sFrame.pSSID->len != ((PWLAN_IE_SSID)pMgmt->abyCurrSSID)->len)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7