From 241a2e5bd8d2159d1a9475928c0e455c1b6b4225 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Wed, 26 Dec 2012 01:23:29 +0900 Subject: [PATCH] --- yaml --- r: 353879 b: refs/heads/master c: 8d915d8c9b8c49ab4725e3d9a6d7b5a8b50751e7 h: refs/heads/master i: 353877: 5e5cbd2d97464d914c1c90d3b75c89e123410a54 353875: 23bcf95aa723aaafd27972316d69c7e307861e1d 353871: 3b1ffb7efa8995f947e0010e1fbd297dac0b6cb4 v: v3 --- [refs] | 2 +- trunk/drivers/staging/vt6655/rxtx.c | 6 +++--- trunk/drivers/staging/vt6655/wcmd.c | 2 +- trunk/drivers/staging/vt6655/wmgr.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ffc00ab5ff1f..336d0b189931 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4d8bcd945c92c7da4b05f93c060e38b559065f0 +refs/heads/master: 8d915d8c9b8c49ab4725e3d9a6d7b5a8b50751e7 diff --git a/trunk/drivers/staging/vt6655/rxtx.c b/trunk/drivers/staging/vt6655/rxtx.c index 875ee4442386..d66854f5b304 100644 --- a/trunk/drivers/staging/vt6655/rxtx.c +++ b/trunk/drivers/staging/vt6655/rxtx.c @@ -2421,7 +2421,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { pTxBufHead->wFragCtl |= cpu_to_le16((unsigned short)(cbMacHdLen << 10)); // Notes: - // Although spec says MMPDU can be fragmented; In most case, + // Although spec says MMPDU can be fragmented; In most cases, // no one will send a MMPDU under fragmentation. With RTS may occur. pDevice->bAES = false; //Set FRAGCTL_WEPTYP @@ -2510,7 +2510,7 @@ CMD_STATUS csMgmt_xmit(PSDevice pDevice, PSTxMgmtPacket pPacket) { pbyPayloadHead = (unsigned char *)(pbyTxBufferAddr + cbHeaderSize + cbMacHdLen + uPadding + cbIVlen); //Fill TXKEY - //Kyle: Need fix: TKIP and AES did't encryt Mnt Packet. + //Kyle: Need fix: TKIP and AES did't encrypt Mnt Packet. //s_vFillTxKey(pDevice, (unsigned char *)pTxBufHead->adwTxKey, NULL); //Fill IV(ExtIV,RSNHDR) @@ -2957,7 +2957,7 @@ vDMA0_tx_80211(PSDevice pDevice, struct sk_buff *skb, unsigned char *pbMPDU, un pTxBufHead->wFragCtl |= cpu_to_le16((unsigned short)cbMacHdLen << 10); // Notes: - // Although spec says MMPDU can be fragmented; In most casses, + // Although spec says MMPDU can be fragmented; In most cases, // no one will send a MMPDU under fragmentation. With RTS may occur. pDevice->bAES = false; //Set FRAGCTL_WEPTYP diff --git a/trunk/drivers/staging/vt6655/wcmd.c b/trunk/drivers/staging/vt6655/wcmd.c index 6d0b87a14267..101c7359f414 100644 --- a/trunk/drivers/staging/vt6655/wcmd.c +++ b/trunk/drivers/staging/vt6655/wcmd.c @@ -720,7 +720,7 @@ printk("chester-abyDesireSSID=%s\n",((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->abySS 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); diff --git a/trunk/drivers/staging/vt6655/wmgr.c b/trunk/drivers/staging/vt6655/wmgr.c index b6f99ecbbeb5..b08a611a184a 100644 --- a/trunk/drivers/staging/vt6655/wmgr.c +++ b/trunk/drivers/staging/vt6655/wmgr.c @@ -2068,7 +2068,7 @@ if(ChannelExceedZoneType(pDevice,byCurrChannel)==true) if (pBSSList != NULL) { - // Compare PHY paramater setting + // Compare PHY parameter setting if (pMgmt->wCurrCapInfo != pBSSList->wCapInfo) { bUpdatePhyParameter = true; pMgmt->wCurrCapInfo = pBSSList->wCapInfo;