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

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
...@@ -31,11 +31,6 @@ ...@@ -31,11 +31,6 @@
/******* Common definitions and typedefs ***********************************/ /******* Common definitions and typedefs ***********************************/
//2008-0131-02<Add>by MikeLiu
#ifndef Adhoc_STA
#define Adhoc_STA
#endif
typedef int BOOL; typedef int BOOL;
#if !defined(TRUE) #if !defined(TRUE)
......
...@@ -565,11 +565,9 @@ void vRunCommand(void *hDeviceContext) ...@@ -565,11 +565,9 @@ void vRunCommand(void *hDeviceContext)
return; return;
} }
//20080131-03,<Add> by Mike Liu
#ifdef Adhoc_STA
memcpy(pMgmt->abyAdHocSSID,pMgmt->abyDesireSSID, memcpy(pMgmt->abyAdHocSSID,pMgmt->abyDesireSSID,
((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len + WLAN_IEHDR_LEN); ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len + WLAN_IEHDR_LEN);
#endif
pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID; pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;
pItemSSIDCurr = (PWLAN_IE_SSID)pMgmt->abyCurrSSID; pItemSSIDCurr = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" cmd: desire ssid = %s\n", pItemSSID->abySSID); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" cmd: desire ssid = %s\n", pItemSSID->abySSID);
......
...@@ -2467,11 +2467,8 @@ void vMgrCreateOwnIBSS(void *hDeviceContext, ...@@ -2467,11 +2467,8 @@ void vMgrCreateOwnIBSS(void *hDeviceContext,
pDevice->uCurrRSSI = 0; pDevice->uCurrRSSI = 0;
pDevice->byCurrSQ = 0; pDevice->byCurrSQ = 0;
//20080131-04,<Add> by Mike Liu
#ifdef Adhoc_STA
memcpy(pMgmt->abyDesireSSID,pMgmt->abyAdHocSSID, memcpy(pMgmt->abyDesireSSID,pMgmt->abyAdHocSSID,
((PWLAN_IE_SSID)pMgmt->abyAdHocSSID)->len + WLAN_IEHDR_LEN); ((PWLAN_IE_SSID)pMgmt->abyAdHocSSID)->len + WLAN_IEHDR_LEN);
#endif
memset(pMgmt->abyCurrSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); memset(pMgmt->abyCurrSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
memcpy(pMgmt->abyCurrSSID, memcpy(pMgmt->abyCurrSSID,
......
...@@ -291,10 +291,7 @@ typedef struct tagSMgmtObject ...@@ -291,10 +291,7 @@ typedef struct tagSMgmtObject
BYTE abyDesireBSSID[WLAN_BSSID_LEN]; BYTE abyDesireBSSID[WLAN_BSSID_LEN];
//restore BSS info for Ad-Hoc mode //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]; BYTE abyAdHocSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
#endif
// Adhoc or AP configuration vars // Adhoc or AP configuration vars
WORD wIBSSBeaconPeriod; WORD wIBSSBeaconPeriod;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment