Staging: rtl8192su: remove duplicate dot11d.h and ieee80211.h includes
Always use includes from ieee80211/ subdirectory. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
fd9b8d6e29
commit
2a7d71ad57
10 changed files with 6 additions and 3012 deletions
|
@ -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
|
|
File diff suppressed because it is too large
Load diff
|
@ -11,7 +11,6 @@
|
||||||
* NDIS_STATUS_FAILURE - the following initialization process should be terminated
|
* NDIS_STATUS_FAILURE - the following initialization process should be terminated
|
||||||
* NDIS_STATUS_SUCCESS - if firmware initialization process success
|
* NDIS_STATUS_SUCCESS - if firmware initialization process success
|
||||||
**************************************************************************************************/
|
**************************************************************************************************/
|
||||||
//#include "ieee80211.h"
|
|
||||||
#if defined(RTL8192SE)||defined(RTL8192SU)
|
#if defined(RTL8192SE)||defined(RTL8192SU)
|
||||||
#include "r8192U.h"
|
#include "r8192U.h"
|
||||||
#include "r8192S_firmware.h"
|
#include "r8192S_firmware.h"
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef ENABLE_DOT11D
|
#ifdef ENABLE_DOT11D
|
||||||
#include "dot11d.h"
|
#include "ieee80211/dot11d.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*---------------------------Define Local Constant---------------------------*/
|
/*---------------------------Define Local Constant---------------------------*/
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
|
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
|
||||||
#include <asm/semaphore.h>
|
#include <asm/semaphore.h>
|
||||||
#endif
|
#endif
|
||||||
#include "ieee80211.h"
|
#include "ieee80211/ieee80211.h"
|
||||||
|
|
||||||
#ifdef RTL8192SU
|
#ifdef RTL8192SU
|
||||||
#include "r8192S_firmware.h"
|
#include "r8192S_firmware.h"
|
||||||
|
|
|
@ -85,7 +85,7 @@ double __extendsfdf2(float a) {return a;}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef ENABLE_DOT11D
|
#ifdef ENABLE_DOT11D
|
||||||
#include "dot11d.h"
|
#include "ieee80211/dot11d.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
@ -112,7 +112,7 @@ double __extendsfdf2(float a) {return a;}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef ENABLE_DOT11D
|
#ifdef ENABLE_DOT11D
|
||||||
#include "dot11d.h"
|
#include "ieee80211/dot11d.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef ENABLE_DOT11D
|
#ifdef ENABLE_DOT11D
|
||||||
#include "dot11d.h"
|
#include "ieee80211/dot11d.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define RATE_COUNT 12
|
#define RATE_COUNT 12
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
#ifndef R8180_WX_H
|
#ifndef R8180_WX_H
|
||||||
#define R8180_WX_H
|
#define R8180_WX_H
|
||||||
//#include <linux/wireless.h>
|
//#include <linux/wireless.h>
|
||||||
//#include "ieee80211.h"
|
|
||||||
extern struct iw_handler_def r8192_wx_handlers_def;
|
extern struct iw_handler_def r8192_wx_handlers_def;
|
||||||
/* Enable the rtl819x_core.c to share this function, david 2008.9.22 */
|
/* Enable the rtl819x_core.c to share this function, david 2008.9.22 */
|
||||||
extern struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev);
|
extern struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev);
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
* NDIS_STATUS_FAILURE - the following initialization process should be terminated
|
* NDIS_STATUS_FAILURE - the following initialization process should be terminated
|
||||||
* NDIS_STATUS_SUCCESS - if firmware initialization process success
|
* NDIS_STATUS_SUCCESS - if firmware initialization process success
|
||||||
**************************************************************************************************/
|
**************************************************************************************************/
|
||||||
//#include "ieee80211.h"
|
|
||||||
#include "r8192U.h"
|
#include "r8192U.h"
|
||||||
#include "r8192U_hw.h"
|
#include "r8192U_hw.h"
|
||||||
#include "r819xU_firmware_img.h"
|
#include "r819xU_firmware_img.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#include "r819xU_firmware_img.h"
|
#include "r819xU_firmware_img.h"
|
||||||
|
|
||||||
#ifdef ENABLE_DOT11D
|
#ifdef ENABLE_DOT11D
|
||||||
#include "dot11d.h"
|
#include "ieee80211/dot11d.h"
|
||||||
#endif
|
#endif
|
||||||
static u32 RF_CHANNEL_TABLE_ZEBRA[] = {
|
static u32 RF_CHANNEL_TABLE_ZEBRA[] = {
|
||||||
0,
|
0,
|
||||||
|
|
Reference in a new issue