From 5926b9ae320eadc22e33466b560f6ce1890f1780 Mon Sep 17 00:00:00 2001 From: Andres More Date: Mon, 12 Jul 2010 13:55:43 -0300 Subject: [PATCH 357/524] staging: vt6656: removed Adhoc_STA definition Removed an always defined macro, perhaps used to patch the driver Signed-off-by: Andres More Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/ttype.h | 5 ----- drivers/staging/vt6656/wcmd.c | 4 +--- drivers/staging/vt6656/wmgr.c | 3 --- drivers/staging/vt6656/wmgr.h | 3 --- 4 files changed, 1 insertions(+), 14 deletions(-) diff --git a/drivers/staging/vt6656/ttype.h b/drivers/staging/vt6656/ttype.h index a9f4a16..3819174 100644 --- a/drivers/staging/vt6656/ttype.h +++ b/drivers/staging/vt6656/ttype.h @@ -31,11 +31,6 @@ /******* Common definitions and typedefs ***********************************/ -//2008-0131-02by MikeLiu -#ifndef Adhoc_STA -#define Adhoc_STA -#endif - typedef int BOOL; #if !defined(TRUE) diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index 4f34880..6610721 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -565,11 +565,9 @@ void vRunCommand(void *hDeviceContext) return; } -//20080131-03, 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); diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index e2c98bd..e4eca9b 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c @@ -2467,11 +2467,8 @@ void vMgrCreateOwnIBSS(void *hDeviceContext, pDevice->uCurrRSSI = 0; pDevice->byCurrSQ = 0; -//20080131-04, 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, diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h index 28f8ad4..683840c 100644 --- a/drivers/staging/vt6656/wmgr.h +++ b/drivers/staging/vt6656/wmgr.h @@ -291,10 +291,7 @@ typedef struct tagSMgmtObject BYTE abyDesireBSSID[WLAN_BSSID_LEN]; //restore BSS info for Ad-Hoc mode -//20080131-05, by Mike Liu -#ifdef Adhoc_STA BYTE abyAdHocSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; -#endif // Adhoc or AP configuration vars WORD wIBSSBeaconPeriod; -- 1.7.1