Commit 5926b9ae authored by Andres More's avatar Andres More Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: removed Adhoc_STA definition 



Removed an always defined macro, perhaps used to patch the driver

Signed-off-by: default avatarAndres More <more.andres@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 68746744

drivers/staging/vt6656/ttype.h

+0 −5
Original line number Diff line number Diff line
@@ -31,11 +31,6 @@ 


/******* Common definitions and typedefs ***********************************/



//2008-0131-02<Add>by MikeLiu

#ifndef Adhoc_STA

#define Adhoc_STA

#endif



typedef int             BOOL;



#if !defined(TRUE)

drivers/staging/vt6656/wcmd.c

+1 −3
Original line number Diff line number Diff line
@@ -565,11 +565,9 @@ void vRunCommand(void *hDeviceContext) 
                return;

            }



//20080131-03,<Add> by Mike Liu

	#ifdef Adhoc_STA

            memcpy(pMgmt->abyAdHocSSID,pMgmt->abyDesireSSID,

                              ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len + WLAN_IEHDR_LEN);

	#endif



            pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;

            pItemSSIDCurr = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;

            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" cmd: desire ssid = %s\n", pItemSSID->abySSID);

drivers/staging/vt6656/wmgr.c

+0 −3
Original line number Diff line number Diff line
@@ -2467,11 +2467,8 @@ void vMgrCreateOwnIBSS(void *hDeviceContext, 
    pDevice->uCurrRSSI = 0;

    pDevice->byCurrSQ = 0;



//20080131-04,<Add> by Mike Liu

#ifdef Adhoc_STA

    memcpy(pMgmt->abyDesireSSID,pMgmt->abyAdHocSSID,

                      ((PWLAN_IE_SSID)pMgmt->abyAdHocSSID)->len + WLAN_IEHDR_LEN);

#endif



    memset(pMgmt->abyCurrSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);

    memcpy(pMgmt->abyCurrSSID,

drivers/staging/vt6656/wmgr.h

+0 −3
Original line number Diff line number Diff line
@@ -291,10 +291,7 @@ typedef struct tagSMgmtObject 
    BYTE                    abyDesireBSSID[WLAN_BSSID_LEN];



//restore BSS info for Ad-Hoc mode

//20080131-05,<Add> by Mike Liu

#ifdef Adhoc_STA

     BYTE                    abyAdHocSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];

#endif



    // Adhoc or AP configuration vars

    WORD                    wIBSSBeaconPeriod;