Skip to content

Commit

Permalink
Staging: vt665x: Text janitor in prep for driver merge
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jim Lieb authored and Greg Kroah-Hartman committed Sep 15, 2009
1 parent 7e809a9 commit 77f58b1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 14 deletions.
10 changes: 1 addition & 9 deletions drivers/staging/vt6656/80211mgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*
* File: 80211mgr.c
*
* Purpose: Handles the managment frame parsing functions
* Purpose: Handles the 802.11 managment support functions
*
* Author: Lyndon Chen
*
Expand Down Expand Up @@ -746,7 +746,6 @@ vMgrDecodeProbeResponse(
)
{
PWLAN_IE pItem;
// BYTE byCheckEID = 0;


pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
Expand All @@ -764,13 +763,6 @@ vMgrDecodeProbeResponse(
+ WLAN_PROBERESP_OFF_SSID);

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) {
case WLAN_EID_SSID:
if (pFrame->pSSID == NULL)
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/vt6656/baseband.c
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ BBuGetFrameTime (
} else {
uPreamble = 192;
}
uFrameTime = (cbFrameLength * 80) / uRate;
uFrameTime = (cbFrameLength * 80) / uRate; //?????
uTmp = (uFrameTime * uRate) / 80;
if (cbFrameLength != uTmp) {
uFrameTime ++;
Expand All @@ -752,16 +752,16 @@ BBuGetFrameTime (
return (uPreamble + uFrameTime);
}
else {
uFrameTime = (cbFrameLength * 8 + 22) / uRate;
uFrameTime = (cbFrameLength * 8 + 22) / uRate; //????????
uTmp = ((uFrameTime * uRate) - 22) / 8;
if(cbFrameLength != uTmp) {
uFrameTime ++;
}
uFrameTime = uFrameTime * 4;
uFrameTime = uFrameTime * 4; //???????
if(byPktType != PK_TYPE_11A) {
uFrameTime += 6;
}
return (20 + uFrameTime);
return (20 + uFrameTime); //??????
}
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/vt6656/hostap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

pDevice->apdev = (struct net_device *)kmalloc(sizeof(struct net_device), GFP_KERNEL);
if (pDevice->apdev == NULL)
if (pDevice->apdev == NULL)
return -ENOMEM;
memset(pDevice->apdev, 0, sizeof(struct net_device));

Expand Down

0 comments on commit 77f58b1

Please sign in to comment.