Commit 612822f5 authored by Jim Lieb's avatar Jim Lieb Committed by Greg Kroah-Hartman
Browse files

Staging: vt665x: Text janitor in prep for driver merge, part 2 



Text only changes to remove textual differences between the vt6655
and vt6656 trees in prep for driver merge.

Signed-off-by: default avatarJim Lieb <lieb@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 77f58b13

drivers/staging/vt6655/80211hdr.h

+3 −2
Original line number Diff line number Diff line
@@ -16,10 +16,11 @@ 
 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 *

 *

 * File: 80211hdr.h

 *

 * Purpose: Defines the macros, types, and functions for dealing

 *          with 802.11 MAC headers.

 * Purpose: 802.11 MAC headers related pre-defines and macros.

 *

 *

 * Author: Lyndon Chen

 *

drivers/staging/vt6655/80211mgr.c

+0 −8
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 *

 *

 * File: 80211mgr.c

 *

 * Purpose: Handles the 802.11 management support functions
@@ -747,7 +746,6 @@ vMgrDecodeProbeResponse( 
    )

{

    PWLAN_IE    pItem;

//    BYTE        byCheckEID = 0;





    pFrame->pHdr = (PUWLAN_80211HDR)pFrame->pBuf;
@@ -765,12 +763,6 @@ vMgrDecodeProbeResponse( 
                       + WLAN_PROBERESP_OFF_SSID);



    while( ((PBYTE)pItem) < (pFrame->pBuf + pFrame->len) ) {

		/*

        if (pItem->byElementID < byCheckEID)

            break;

        else

            byCheckEID = pItem->byElementID;

*/

        switch (pItem->byElementID) {

            case WLAN_EID_SSID:

                if (pFrame->pSSID == NULL)

drivers/staging/vt6655/80211mgr.h

+3 −3
Original line number Diff line number Diff line
@@ -16,10 +16,11 @@ 
 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 *

 *

 * File: 80211mgr.h

 *

 * Purpose: Defines the macros, types, and functions for dealing

 *          with 802.11 management frames.

 * Purpose: 802.11 managment frames pre-defines.

 *

 *

 * Author: Lyndon Chen

 *
@@ -273,7 +274,6 @@ typedef struct _WLAN_IE_FH_PARMS { 
    BYTE    byHopIndex;

} WLAN_IE_FH_PARMS,  *PWLAN_IE_FH_PARMS;





// DS Parameter Set

#pragma pack(1)

typedef struct tagWLAN_IE_DS_PARMS {

drivers/staging/vt6655/baseband.c

+7 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 *

 *

 * File: baseband.c

 *

 * Purpose: Implement functions to access baseband
@@ -44,8 +45,11 @@ 
 *                                Add the comments.

 *      09-01-2003 Bryan YC Fan:  RF & BB tables updated.

 *                                Modified BBvLoopbackOn & BBvLoopbackOff().

 *

 *

 */





#if !defined(__TMACRO_H__)

#include "tmacro.h"

#endif
@@ -80,6 +84,7 @@ static int msglevel =MSG_LEVEL_INFO; 
/*---------------------  Static Classes  ----------------------------*/



/*---------------------  Static Variables  --------------------------*/



/*---------------------  Static Functions  --------------------------*/



/*---------------------  Export Variables  --------------------------*/
@@ -1806,6 +1811,7 @@ BBuGetFrameTime ( 




    if (uRateIdx > RATE_54M) {

	    ASSERT(0);

        return 0;

    }
@@ -2897,8 +2903,6 @@ TimerSQ3CallBack ( 
    PSDevice        pDevice = (PSDevice)hDeviceContext;



    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"TimerSQ3CallBack...");





    spin_lock_irq(&pDevice->lock);



    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"3.[%08x][%08x], %d\n",(int)pDevice->ulRatio_State0, (int)pDevice->ulRatio_State1, (int)pDevice->uDiversityCnt);
@@ -2915,8 +2919,8 @@ TimerSQ3CallBack ( 
    add_timer(&pDevice->TimerSQ3Tmax3);

    add_timer(&pDevice->TimerSQ3Tmax2);



    spin_unlock_irq(&pDevice->lock);



    spin_unlock_irq(&pDevice->lock);

    return;

}

drivers/staging/vt6655/baseband.h

+8 −11
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 * with this program; if not, write to the Free Software Foundation, Inc.,

 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

 *

 *

 * File: baseband.h

 *

 * Purpose: Implement functions to access baseband
@@ -26,11 +27,9 @@ 
 *

 */





#ifndef __BASEBAND_H__

#define __BASEBAND_H__





#if !defined(__TTYPE_H__)

#include "ttype.h"

#endif
@@ -106,12 +105,11 @@ 
#define TOP_RATE_2M         0x00200000

#define TOP_RATE_1M         0x00100000





/*---------------------  Export Types  ------------------------------*/



/*---------------------  Export Macros ------------------------------*/







#define BBvClearFOE(dwIoBase)                               \

{                                                           \

    BBbWriteEmbeded(dwIoBase, 0xB1, 0);                     \
@@ -173,10 +171,12 @@ VOID BBvSetDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID); 
VOID BBvExitDeepSleep(DWORD_PTR dwIoBase, BYTE byLocalID);



// timer for antenna diversity



VOID

TimerSQ3CallBack (

    IN  HANDLE      hDeviceContext

    );



VOID

TimerState1CallBack(

    IN  HANDLE      hDeviceContext
@@ -193,6 +193,3 @@ BBvClearAntDivSQ3Value (PSDevice pDevice); 




#endif // __BASEBAND_H__