Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324488
b: refs/heads/master
c: 9318469
h: refs/heads/master
v: v3
  • Loading branch information
Masanari Iida authored and Greg Kroah-Hartman committed Aug 14, 2012
1 parent 679c2c1 commit 7fb11e8
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a13aa83c6ba1f2ec9586ed851a7b66764674197e
refs/heads/master: 931846901c08a53b43590dd99bbf53026c4f0890
4 changes: 2 additions & 2 deletions trunk/drivers/staging/vt6656/rf.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* Date: Feb. 19, 2004
*
* Functions:
* IFRFbWriteEmbeded - Embeded write RF register via MAC
* IFRFbWriteEmbeded - Embedded write RF register via MAC
*
* Revision History:
*
Expand Down Expand Up @@ -711,7 +711,7 @@ const BYTE RFaby11aChannelIndex[200] = {
/*--------------------- Export Functions --------------------------*/

/*
* Description: Write to IF/RF, by embeded programming
* Description: Write to IF/RF, by embedded programming
*
* Parameters:
* In:
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/vt6656/rxtx.c
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@ s_vFillRTSHead (
uRTSFrameLen -= 4;
}

// Note: So far RTSHead dosen't appear in ATIM & Beacom DMA, so we don't need to take them into account.
// Note: So far RTSHead doesn't appear in ATIM & Beacom DMA, so we don't need to take them into account.
// Otherwise, we need to modified codes for them.
if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) {
if (byFBOption == AUTO_FB_NONE) {
Expand Down Expand Up @@ -2770,7 +2770,7 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb)
pMgmt->abyPSTxMap[0] |= byMask[0];
return 0;
}
// muticast/broadcast data rate
// multicast/broadcast data rate

if (pDevice->byBBType != BB_TYPE_11A)
pDevice->wCurrentRate = RATE_2M;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/vt6656/wcmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ void vRunCommand(void *hDeviceContext)
pDevice->nTxDataTimeCout = 0;
}
else {
// printk("mike:-->First time triger TimerTxData InSleep\n");
// printk("mike:-->First time trigger TimerTxData InSleep\n");
}
pDevice->IsTxDataTrigger = TRUE;
add_timer(&pDevice->sTimerTxData);
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/vt6656/wmgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
* bMgrPrepareBeaconToSend - Prepare Beacon frame
* s_vMgrLogStatus - Log 802.11 Status
* vMgrRxManagePacket - Rcv management frame dispatch function
* s_vMgrFormatTIM- Assember TIM field of beacon
* s_vMgrFormatTIM- Assembler TIM field of beacon
* vMgrTimerInit- Initial 1-sec and command call back funtions
*
* Revision History:
Expand Down Expand Up @@ -2032,7 +2032,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
}

//
// Preamble may change dynamiclly
// Preamble may change dynamically
//
byOldPreambleType = pDevice->byPreambleType;
if (WLAN_GET_CAP_INFO_SHORTPREAMBLE(pBSSList->wCapInfo)) {
Expand All @@ -2044,7 +2044,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
if (pDevice->byPreambleType != byOldPreambleType)
CARDvSetRSPINF(pDevice, (BYTE)pDevice->byBBType);
//
// Basic Rate Set may change dynamiclly
// Basic Rate Set may change dynamically
//
if (pBSSList->eNetworkTypeInUse == PHY_TYPE_11B) {
uRateLen = WLAN_RATES_MAXLEN_11B;
Expand Down

0 comments on commit 7fb11e8

Please sign in to comment.