diff options
author | Jim Lieb <lieb@canonical.com> | 2009-07-30 17:30:32 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 19:02:07 (GMT) |
commit | 77f58b133ea1da92faed89ec384b5e4279f6574f (patch) | |
tree | 881335ca124eaa5890c8858688dc8591b8fab7db /drivers/staging | |
parent | 7e809a9b10ab5ee985e23dea537e0236f026d1ca (diff) | |
download | linux-fsl-qoriq-77f58b133ea1da92faed89ec384b5e4279f6574f.tar.xz |
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/vt6656/80211mgr.c | 10 | ||||
-rw-r--r-- | drivers/staging/vt6656/baseband.c | 8 | ||||
-rw-r--r-- | drivers/staging/vt6656/hostap.c | 2 |
3 files changed, 6 insertions, 14 deletions
diff --git a/drivers/staging/vt6656/80211mgr.c b/drivers/staging/vt6656/80211mgr.c index fda7224..8b1ffe9f 100644 --- a/drivers/staging/vt6656/80211mgr.c +++ b/drivers/staging/vt6656/80211mgr.c @@ -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 * @@ -746,7 +746,6 @@ vMgrDecodeProbeResponse( ) { PWLAN_IE pItem; - // BYTE byCheckEID = 0; pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf; @@ -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) diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c index 7b43cea..7057d3e 100644 --- a/drivers/staging/vt6656/baseband.c +++ b/drivers/staging/vt6656/baseband.c @@ -743,7 +743,7 @@ BBuGetFrameTime ( } else { uPreamble = 192; } - uFrameTime = (cbFrameLength * 80) / uRate; + uFrameTime = (cbFrameLength * 80) / uRate; //????? uTmp = (uFrameTime * uRate) / 80; if (cbFrameLength != uTmp) { uFrameTime ++; @@ -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); //?????? } } diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c index 887e93f..02743a6 100644 --- a/drivers/staging/vt6656/hostap.c +++ b/drivers/staging/vt6656/hostap.c @@ -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)); |