Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 267583
b: refs/heads/master
c: d6a32aa
h: refs/heads/master
i:
  267581: ec2efee
  267579: c6bdc5e
  267575: 4ed2a62
  267567: d5d78d2
  267551: 110141f
  267519: 4c9747a
v: v3
  • Loading branch information
Andy Shevchenko authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent 3598d90 commit 9885642
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 73 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 30d6a2b870a2419e1e887bd3a46f33d98c61c778
refs/heads/master: d6a32aa1b192ac9be8c1b8e8fa8beebf9415107d
30 changes: 6 additions & 24 deletions trunk/drivers/staging/vt6656/dpc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1109,30 +1109,12 @@ static BOOL s_bAPModeRxCtl (
&Status
);
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",
p802_11Header->abyAddr3[0],
p802_11Header->abyAddr3[1],
p802_11Header->abyAddr3[2],
p802_11Header->abyAddr3[3],
p802_11Header->abyAddr3[4],
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 "BSSID:%pM\n",
p802_11Header->abyAddr3);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ADDR2:%pM\n",
p802_11Header->abyAddr2);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "ADDR1:%pM\n",
p802_11Header->abyAddr1);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "dpc: wFrameCtl= %x\n", p802_11Header->wFrameCtl );
return TRUE;
}
Expand Down
11 changes: 2 additions & 9 deletions trunk/drivers/staging/vt6656/main_usb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -611,17 +611,10 @@ static BOOL device_init_registers(PSDevice pDevice, DEVICE_INIT_TYPE InitType)

// 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",
pDevice->abyCurrentNetAddr[0],
pDevice->abyCurrentNetAddr[1],
pDevice->abyCurrentNetAddr[2],
pDevice->abyCurrentNetAddr[3],
pDevice->abyCurrentNetAddr[4],
pDevice->abyCurrentNetAddr[5]);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Network address = %pM\n",
pDevice->abyCurrentNetAddr);
}



// Set BB and packet type at the same time.
// Set Short Slot Time, xIFS, and RSPINF.
if (pDevice->byBBType == BB_TYPE_11A) {
Expand Down
49 changes: 10 additions & 39 deletions trunk/drivers/staging/vt6656/wmgr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2477,14 +2477,8 @@ void vMgrCreateOwnIBSS(void *hDeviceContext,
if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
// AP mode BSSID = MAC addr
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",
pMgmt->abyCurrBSSID[0],
pMgmt->abyCurrBSSID[1],
pMgmt->abyCurrBSSID[2],
pMgmt->abyCurrBSSID[3],
pMgmt->abyCurrBSSID[4],
pMgmt->abyCurrBSSID[5]
);
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO"AP beacon created BSSID:"
"%pM\n", pMgmt->abyCurrBSSID);
}

if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
Expand All @@ -2506,14 +2500,8 @@ void vMgrCreateOwnIBSS(void *hDeviceContext,
pMgmt->abyCurrBSSID[0] |= IEEE_ADDR_UNIVERSAL;


DBG_PRT(MSG_LEVEL_INFO, KERN_INFO"Adhoc beacon created bssid:%02x-%02x-%02x-%02x-%02x-%02x \n",
pMgmt->abyCurrBSSID[0],
pMgmt->abyCurrBSSID[1],
pMgmt->abyCurrBSSID[2],
pMgmt->abyCurrBSSID[3],
pMgmt->abyCurrBSSID[4],
pMgmt->abyCurrBSSID[5]
);
DBG_PRT(MSG_LEVEL_INFO, KERN_INFO"Adhoc beacon created bssid:"
"%pM\n", pMgmt->abyCurrBSSID);
}

// set BSSID filter
Expand Down Expand Up @@ -2878,14 +2866,8 @@ void vMgrJoinBSSBegin(void *hDeviceContext, PCMD_STATUS pStatus)
ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_PAPEDELAY,LEDSTS_STS,LEDSTS_INTER);
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",
pMgmt->abyCurrBSSID[0],
pMgmt->abyCurrBSSID[1],
pMgmt->abyCurrBSSID[2],
pMgmt->abyCurrBSSID[3],
pMgmt->abyCurrBSSID[4],
pMgmt->abyCurrBSSID[5]
);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Join IBSS ok:%pM\n",
pMgmt->abyCurrBSSID);
// Preamble type auto-switch: if AP can receive short-preamble cap,
// and if registry setting is short preamble we can turn on too.

Expand Down Expand Up @@ -2983,13 +2965,8 @@ s_vMgrSynchBSS (

memcpy(pMgmt->abyCurrBSSID, pCurr->abyBSSID, 6);

DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Sync:set CurrBSSID address = %02x-%02x-%02x=%02x-%02x-%02x\n",
pMgmt->abyCurrBSSID[0],
pMgmt->abyCurrBSSID[1],
pMgmt->abyCurrBSSID[2],
pMgmt->abyCurrBSSID[3],
pMgmt->abyCurrBSSID[4],
pMgmt->abyCurrBSSID[5]);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Sync:set CurrBSSID address = "
"%pM\n", pMgmt->abyCurrBSSID);

if (pCurr->eNetworkTypeInUse == PHY_TYPE_11A) {
if ((pDevice->eConfigPHYMode == PHY_TYPE_11A) ||
Expand Down Expand Up @@ -4334,14 +4311,8 @@ s_vMgrRxProbeRequest(
sFrame.pBuf = (PBYTE)pRxPacket->p80211Header;
vMgrDecodeProbeRequest(&sFrame);
/*
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request rx:MAC addr:%02x-%02x-%02x=%02x-%02x-%02x \n",
sFrame.pHdr->sA3.abyAddr2[0],
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]
);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request rx:MAC addr:%pM\n",
sFrame.pHdr->sA3.abyAddr2);
*/
if (sFrame.pSSID->len != 0) {
if (sFrame.pSSID->len != ((PWLAN_IE_SSID)pMgmt->abyCurrSSID)->len)
Expand Down

0 comments on commit 9885642

Please sign in to comment.