Staging: vt665x: Text janitor in prep for driver merge
These changes in vt6656 match changes in vt6655 to minimize text differences prior to merging the two trees into a single driver source. Signed-off-by: Jim Lieb <lieb@canonical.com> Cc: Forest Bond <forest@alittletooquiet.net> Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
7e809a9b10
commit
77f58b133e
|
@ -18,7 +18,7 @@
|
||||||
*
|
*
|
||||||
* File: 80211mgr.c
|
* File: 80211mgr.c
|
||||||
*
|
*
|
||||||
* Purpose: Handles the managment frame parsing functions
|
* Purpose: Handles the 802.11 managment support functions
|
||||||
*
|
*
|
||||||
* Author: Lyndon Chen
|
* Author: Lyndon Chen
|
||||||
*
|
*
|
||||||
|
@ -746,7 +746,6 @@ vMgrDecodeProbeResponse(
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
PWLAN_IE pItem;
|
PWLAN_IE pItem;
|
||||||
// BYTE byCheckEID = 0;
|
|
||||||
|
|
||||||
|
|
||||||
pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
|
pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
|
||||||
|
@ -764,13 +763,6 @@ vMgrDecodeProbeResponse(
|
||||||
+ WLAN_PROBERESP_OFF_SSID);
|
+ WLAN_PROBERESP_OFF_SSID);
|
||||||
|
|
||||||
while( ((PBYTE)pItem) < (pFrame->pBuf + pFrame->len) ) {
|
while( ((PBYTE)pItem) < (pFrame->pBuf + pFrame->len) ) {
|
||||||
|
|
||||||
//20080701-01,<Remark> by Mike Liu
|
|
||||||
// if (pItem->byElementID < byCheckEID)
|
|
||||||
// break;
|
|
||||||
//else
|
|
||||||
//byCheckEID = pItem->byElementID;
|
|
||||||
|
|
||||||
switch (pItem->byElementID) {
|
switch (pItem->byElementID) {
|
||||||
case WLAN_EID_SSID:
|
case WLAN_EID_SSID:
|
||||||
if (pFrame->pSSID == NULL)
|
if (pFrame->pSSID == NULL)
|
||||||
|
|
|
@ -743,7 +743,7 @@ BBuGetFrameTime (
|
||||||
} else {
|
} else {
|
||||||
uPreamble = 192;
|
uPreamble = 192;
|
||||||
}
|
}
|
||||||
uFrameTime = (cbFrameLength * 80) / uRate;
|
uFrameTime = (cbFrameLength * 80) / uRate; //?????
|
||||||
uTmp = (uFrameTime * uRate) / 80;
|
uTmp = (uFrameTime * uRate) / 80;
|
||||||
if (cbFrameLength != uTmp) {
|
if (cbFrameLength != uTmp) {
|
||||||
uFrameTime ++;
|
uFrameTime ++;
|
||||||
|
@ -752,16 +752,16 @@ BBuGetFrameTime (
|
||||||
return (uPreamble + uFrameTime);
|
return (uPreamble + uFrameTime);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
uFrameTime = (cbFrameLength * 8 + 22) / uRate;
|
uFrameTime = (cbFrameLength * 8 + 22) / uRate; //????????
|
||||||
uTmp = ((uFrameTime * uRate) - 22) / 8;
|
uTmp = ((uFrameTime * uRate) - 22) / 8;
|
||||||
if(cbFrameLength != uTmp) {
|
if(cbFrameLength != uTmp) {
|
||||||
uFrameTime ++;
|
uFrameTime ++;
|
||||||
}
|
}
|
||||||
uFrameTime = uFrameTime * 4;
|
uFrameTime = uFrameTime * 4; //???????
|
||||||
if(byPktType != PK_TYPE_11A) {
|
if(byPktType != PK_TYPE_11A) {
|
||||||
uFrameTime += 6;
|
uFrameTime += 6;
|
||||||
}
|
}
|
||||||
return (20 + uFrameTime);
|
return (20 + uFrameTime); //??????
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -113,7 +113,7 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
|
||||||
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
|
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
|
||||||
|
|
||||||
pDevice->apdev = (struct net_device *)kmalloc(sizeof(struct net_device), GFP_KERNEL);
|
pDevice->apdev = (struct net_device *)kmalloc(sizeof(struct net_device), GFP_KERNEL);
|
||||||
if (pDevice->apdev == NULL)
|
if (pDevice->apdev == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
memset(pDevice->apdev, 0, sizeof(struct net_device));
|
memset(pDevice->apdev, 0, sizeof(struct net_device));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue