Skip to contentSkip to conversation

Staging: rtl8192su: remove duplicate dot11d.h and ieee80211.h includes

PATCH New Bartlomiej Zolnierkiewicz 1 participant 1 message Jun 12, 2009 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: rtl8192su: remove duplicate dot11d.h and ieee80211.h includes

Always use includes from ieee80211/ subdirectory.

---
 drivers/staging/rtl8192su/dot11d.h          |  102 
 drivers/staging/rtl8192su/ieee80211.h       | 2901 ----------------------------
 drivers/staging/rtl8192su/r8192S_firmware.c |    1 
 drivers/staging/rtl8192su/r8192S_phy.c      |    2 
 drivers/staging/rtl8192su/r8192U.h          |    2 
 drivers/staging/rtl8192su/r8192U_core.c     |    4 
 drivers/staging/rtl8192su/r8192U_wx.c       |    2 
 drivers/staging/rtl8192su/r8192U_wx.h       |    1 
 drivers/staging/rtl8192su/r819xU_firmware.c |    1 
 drivers/staging/rtl8192su/r819xU_phy.c      |    2 
 10 files changed, 6 insertions(+), 3012 deletions(-)
drivers/staging/rtl8192su/dot11d.h deleted +0 -102
Index: b/drivers/staging/rtl8192su/dot11d.h
===================================================================
@@ -1,102 +0,0 @@
-#ifndef __INC_DOT11D_H
-#define __INC_DOT11D_H
-
-#ifdef ENABLE_DOT11D
-#include "ieee80211.h"
-
-//#define ENABLE_DOT11D
-
-//#define DOT11D_MAX_CHNL_NUM 83
-
-typedef struct _CHNL_TXPOWER_TRIPLE {
-	u8 FirstChnl;
-	u8  NumChnls;
-	u8  MaxTxPowerInDbm;
-}CHNL_TXPOWER_TRIPLE, *PCHNL_TXPOWER_TRIPLE;
-
-typedef enum _DOT11D_STATE {
-	DOT11D_STATE_NONE = 0,
-	DOT11D_STATE_LEARNED,
-	DOT11D_STATE_DONE,
-}DOT11D_STATE;
-
-typedef struct _RT_DOT11D_INFO {
-	//DECLARE_RT_OBJECT(RT_DOT11D_INFO);
-
-	bool bEnabled; // dot11MultiDomainCapabilityEnabled
-
-	u16 CountryIeLen; // > 0 if CountryIeBuf[] contains valid country information element.
-	u8  CountryIeBuf[MAX_IE_LEN];
-	u8  CountryIeSrcAddr[6]; // Source AP of the country IE.
-	u8  CountryIeWatchdog;
-
-	u8  channel_map[MAX_CHANNEL_NUMBER+1];  //!!!Value 0: Invalid, 1: Valid (active scan), 2: Valid (passive scan)
-	//u8  ChnlListLen; // #Bytes valid in ChnlList[].
-	//u8  ChnlList[DOT11D_MAX_CHNL_NUM];
-	u8  MaxTxPwrDbmList[MAX_CHANNEL_NUMBER+1];
-
-	DOT11D_STATE State;
-}RT_DOT11D_INFO, *PRT_DOT11D_INFO;
-#define eqMacAddr(a,b)		( ((a)[0]==(b)[0] && (a)[1]==(b)[1] && (a)[2]==(b)[2] && (a)[3]==(b)[3] && (a)[4]==(b)[4] && (a)[5]==(b)[5]) ? 1:0 )
-#define cpMacAddr(des,src)	      ((des)[0]=(src)[0],(des)[1]=(src)[1],(des)[2]=(src)[2],(des)[3]=(src)[3],(des)[4]=(src)[4],(des)[5]=(src)[5])
-#define GET_DOT11D_INFO(__pIeeeDev) ((PRT_DOT11D_INFO)((__pIeeeDev)->pDot11dInfo))
-
-#define IS_DOT11D_ENABLE(__pIeeeDev) GET_DOT11D_INFO(__pIeeeDev)->bEnabled
-#define IS_COUNTRY_IE_VALID(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen > 0)
-
-#define IS_EQUAL_CIE_SRC(__pIeeeDev, __pTa) eqMacAddr(GET_DOT11D_INFO(__pIeeeDev)->CountryIeSrcAddr, __pTa)
-#define UPDATE_CIE_SRC(__pIeeeDev, __pTa) cpMacAddr(GET_DOT11D_INFO(__pIeeeDev)->CountryIeSrcAddr, __pTa)
-
-#define IS_COUNTRY_IE_CHANGED(__pIeeeDev, __Ie) \
-	(((__Ie).Length == 0 || (__Ie).Length != GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen) ? \
-	FALSE : \
-	(!memcmp(GET_DOT11D_INFO(__pIeeeDev)->CountryIeBuf, (__Ie).Octet, (__Ie).Length)))
-
-#define CIE_WATCHDOG_TH 1
-#define GET_CIE_WATCHDOG(__pIeeeDev) GET_DOT11D_INFO(__pIeeeDev)->CountryIeWatchdog
-#define RESET_CIE_WATCHDOG(__pIeeeDev) GET_CIE_WATCHDOG(__pIeeeDev) = 0
-#define UPDATE_CIE_WATCHDOG(__pIeeeDev) ++GET_CIE_WATCHDOG(__pIeeeDev)
-
-#define IS_DOT11D_STATE_DONE(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->State == DOT11D_STATE_DONE)
-
-
-void
-Dot11d_Init(
-	struct ieee80211_device *dev
-	);
-
-void
-Dot11d_Reset(
-	struct ieee80211_device *dev
-	);
-
-void
-Dot11d_UpdateCountryIe(
-	struct ieee80211_device *dev,
-	u8 *		pTaddr,
-	u16	CoutryIeLen,
-	u8 * pCoutryIe
-	);
-
-u8
-DOT11D_GetMaxTxPwrInDbm(
-	struct ieee80211_device *dev,
-	u8 Channel
-	);
-
-void
-DOT11D_ScanComplete(
-	struct ieee80211_device * dev
-	);
-
-int IsLegalChannel(
-	struct ieee80211_device * dev,
-	u8 channel
-);
-
-int ToLegalChannel(
-	struct ieee80211_device * dev,
-	u8 channel
-);
-#endif //ENABLE_DOT11D
-#endif // #ifndef __INC_DOT11D_H
drivers/staging/rtl8192su/ieee80211.h deleted +0 -2901

2,898 lines not on this page · raw message

drivers/staging/rtl8192su/r8192S_firmware.c +0 -1
Index: b/drivers/staging/rtl8192su/r8192S_firmware.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8192su/r8192S_phy.c +1 -1
Index: b/drivers/staging/rtl8192su/r8192S_phy.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8192su/r8192U.h +1 -1
Index: b/drivers/staging/rtl8192su/r8192U.h
===================================================================

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8192su/r8192U_core.c +2 -2
Index: b/drivers/staging/rtl8192su/r8192U_core.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8192su/r8192U_wx.c +1 -1
Index: b/drivers/staging/rtl8192su/r8192U_wx.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8192su/r8192U_wx.h +0 -1
Index: b/drivers/staging/rtl8192su/r8192U_wx.h
===================================================================

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8192su/r819xU_firmware.c +0 -1
Index: b/drivers/staging/rtl8192su/r819xU_firmware.c
===================================================================

Lines of this file are not shown. View the raw message.

drivers/staging/rtl8192su/r819xU_phy.c +1 -1
Index: b/drivers/staging/rtl8192su/r819xU_phy.c
===================================================================

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.