diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-03 17:38:09 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 17:53:30 -0400 |
commit | 88adc104476cccb4b5cfaa48da7019cf9184481b (patch) | |
tree | d22f8713ac2101882fe077c5add567cf9d33725d /drivers/staging/rtl8187se/ieee80211/dot11d.h | |
parent | 9c515551f17493248cd287997d46d6d7e3203b1d (diff) |
Staging: rtl8187se: fix \r\n line ends
Andrew pointed out that I forgot to convert some files to unix format
when adding them originally. This patch runs dos2unix on the rtl8187se
files that needed them.
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8187se/ieee80211/dot11d.h')
-rw-r--r-- | drivers/staging/rtl8187se/ieee80211/dot11d.h | 204 |
1 files changed, 102 insertions, 102 deletions
diff --git a/drivers/staging/rtl8187se/ieee80211/dot11d.h b/drivers/staging/rtl8187se/ieee80211/dot11d.h index 64bcf15bd21..82576b519cc 100644 --- a/drivers/staging/rtl8187se/ieee80211/dot11d.h +++ b/drivers/staging/rtl8187se/ieee80211/dot11d.h | |||
@@ -1,102 +1,102 @@ | |||
1 | #ifndef __INC_DOT11D_H | 1 | #ifndef __INC_DOT11D_H |
2 | #define __INC_DOT11D_H | 2 | #define __INC_DOT11D_H |
3 | 3 | ||
4 | #include "ieee80211.h" | 4 | #include "ieee80211.h" |
5 | 5 | ||
6 | //#define ENABLE_DOT11D | 6 | //#define ENABLE_DOT11D |
7 | 7 | ||
8 | //#define DOT11D_MAX_CHNL_NUM 83 | 8 | //#define DOT11D_MAX_CHNL_NUM 83 |
9 | 9 | ||
10 | typedef struct _CHNL_TXPOWER_TRIPLE { | 10 | typedef struct _CHNL_TXPOWER_TRIPLE { |
11 | u8 FirstChnl; | 11 | u8 FirstChnl; |
12 | u8 NumChnls; | 12 | u8 NumChnls; |
13 | u8 MaxTxPowerInDbm; | 13 | u8 MaxTxPowerInDbm; |
14 | }CHNL_TXPOWER_TRIPLE, *PCHNL_TXPOWER_TRIPLE; | 14 | }CHNL_TXPOWER_TRIPLE, *PCHNL_TXPOWER_TRIPLE; |
15 | 15 | ||
16 | typedef enum _DOT11D_STATE { | 16 | typedef enum _DOT11D_STATE { |
17 | DOT11D_STATE_NONE = 0, | 17 | DOT11D_STATE_NONE = 0, |
18 | DOT11D_STATE_LEARNED, | 18 | DOT11D_STATE_LEARNED, |
19 | DOT11D_STATE_DONE, | 19 | DOT11D_STATE_DONE, |
20 | }DOT11D_STATE; | 20 | }DOT11D_STATE; |
21 | 21 | ||
22 | typedef struct _RT_DOT11D_INFO { | 22 | typedef struct _RT_DOT11D_INFO { |
23 | //DECLARE_RT_OBJECT(RT_DOT11D_INFO); | 23 | //DECLARE_RT_OBJECT(RT_DOT11D_INFO); |
24 | 24 | ||
25 | bool bEnabled; // dot11MultiDomainCapabilityEnabled | 25 | bool bEnabled; // dot11MultiDomainCapabilityEnabled |
26 | 26 | ||
27 | u16 CountryIeLen; // > 0 if CountryIeBuf[] contains valid country information element. | 27 | u16 CountryIeLen; // > 0 if CountryIeBuf[] contains valid country information element. |
28 | u8 CountryIeBuf[MAX_IE_LEN]; | 28 | u8 CountryIeBuf[MAX_IE_LEN]; |
29 | u8 CountryIeSrcAddr[6]; // Source AP of the country IE. | 29 | u8 CountryIeSrcAddr[6]; // Source AP of the country IE. |
30 | u8 CountryIeWatchdog; | 30 | u8 CountryIeWatchdog; |
31 | 31 | ||
32 | u8 channel_map[MAX_CHANNEL_NUMBER+1]; //!!!Value 0: Invalid, 1: Valid (active scan), 2: Valid (passive scan) | 32 | u8 channel_map[MAX_CHANNEL_NUMBER+1]; //!!!Value 0: Invalid, 1: Valid (active scan), 2: Valid (passive scan) |
33 | //u8 ChnlListLen; // #Bytes valid in ChnlList[]. | 33 | //u8 ChnlListLen; // #Bytes valid in ChnlList[]. |
34 | //u8 ChnlList[DOT11D_MAX_CHNL_NUM]; | 34 | //u8 ChnlList[DOT11D_MAX_CHNL_NUM]; |
35 | u8 MaxTxPwrDbmList[MAX_CHANNEL_NUMBER+1]; | 35 | u8 MaxTxPwrDbmList[MAX_CHANNEL_NUMBER+1]; |
36 | 36 | ||
37 | DOT11D_STATE State; | 37 | DOT11D_STATE State; |
38 | }RT_DOT11D_INFO, *PRT_DOT11D_INFO; | 38 | }RT_DOT11D_INFO, *PRT_DOT11D_INFO; |
39 | #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 ) | 39 | #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 ) |
40 | #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]) | 40 | #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]) |
41 | #define GET_DOT11D_INFO(__pIeeeDev) ((PRT_DOT11D_INFO)((__pIeeeDev)->pDot11dInfo)) | 41 | #define GET_DOT11D_INFO(__pIeeeDev) ((PRT_DOT11D_INFO)((__pIeeeDev)->pDot11dInfo)) |
42 | 42 | ||
43 | #define IS_DOT11D_ENABLE(__pIeeeDev) GET_DOT11D_INFO(__pIeeeDev)->bEnabled | 43 | #define IS_DOT11D_ENABLE(__pIeeeDev) GET_DOT11D_INFO(__pIeeeDev)->bEnabled |
44 | #define IS_COUNTRY_IE_VALID(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen > 0) | 44 | #define IS_COUNTRY_IE_VALID(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen > 0) |
45 | 45 | ||
46 | #define IS_EQUAL_CIE_SRC(__pIeeeDev, __pTa) eqMacAddr(GET_DOT11D_INFO(__pIeeeDev)->CountryIeSrcAddr, __pTa) | 46 | #define IS_EQUAL_CIE_SRC(__pIeeeDev, __pTa) eqMacAddr(GET_DOT11D_INFO(__pIeeeDev)->CountryIeSrcAddr, __pTa) |
47 | #define UPDATE_CIE_SRC(__pIeeeDev, __pTa) cpMacAddr(GET_DOT11D_INFO(__pIeeeDev)->CountryIeSrcAddr, __pTa) | 47 | #define UPDATE_CIE_SRC(__pIeeeDev, __pTa) cpMacAddr(GET_DOT11D_INFO(__pIeeeDev)->CountryIeSrcAddr, __pTa) |
48 | 48 | ||
49 | #define IS_COUNTRY_IE_CHANGED(__pIeeeDev, __Ie) \ | 49 | #define IS_COUNTRY_IE_CHANGED(__pIeeeDev, __Ie) \ |
50 | (((__Ie).Length == 0 || (__Ie).Length != GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen) ? \ | 50 | (((__Ie).Length == 0 || (__Ie).Length != GET_DOT11D_INFO(__pIeeeDev)->CountryIeLen) ? \ |
51 | FALSE : \ | 51 | FALSE : \ |
52 | (!memcmp(GET_DOT11D_INFO(__pIeeeDev)->CountryIeBuf, (__Ie).Octet, (__Ie).Length))) | 52 | (!memcmp(GET_DOT11D_INFO(__pIeeeDev)->CountryIeBuf, (__Ie).Octet, (__Ie).Length))) |
53 | 53 | ||
54 | #define CIE_WATCHDOG_TH 1 | 54 | #define CIE_WATCHDOG_TH 1 |
55 | #define GET_CIE_WATCHDOG(__pIeeeDev) GET_DOT11D_INFO(__pIeeeDev)->CountryIeWatchdog | 55 | #define GET_CIE_WATCHDOG(__pIeeeDev) GET_DOT11D_INFO(__pIeeeDev)->CountryIeWatchdog |
56 | #define RESET_CIE_WATCHDOG(__pIeeeDev) GET_CIE_WATCHDOG(__pIeeeDev) = 0 | 56 | #define RESET_CIE_WATCHDOG(__pIeeeDev) GET_CIE_WATCHDOG(__pIeeeDev) = 0 |
57 | #define UPDATE_CIE_WATCHDOG(__pIeeeDev) ++GET_CIE_WATCHDOG(__pIeeeDev) | 57 | #define UPDATE_CIE_WATCHDOG(__pIeeeDev) ++GET_CIE_WATCHDOG(__pIeeeDev) |
58 | 58 | ||
59 | #define IS_DOT11D_STATE_DONE(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->State == DOT11D_STATE_DONE) | 59 | #define IS_DOT11D_STATE_DONE(__pIeeeDev) (GET_DOT11D_INFO(__pIeeeDev)->State == DOT11D_STATE_DONE) |
60 | 60 | ||
61 | 61 | ||
62 | void | 62 | void |
63 | Dot11d_Init( | 63 | Dot11d_Init( |
64 | struct ieee80211_device *dev | 64 | struct ieee80211_device *dev |
65 | ); | 65 | ); |
66 | 66 | ||
67 | void | 67 | void |
68 | Dot11d_Reset( | 68 | Dot11d_Reset( |
69 | struct ieee80211_device *dev | 69 | struct ieee80211_device *dev |
70 | ); | 70 | ); |
71 | 71 | ||
72 | void | 72 | void |
73 | Dot11d_UpdateCountryIe( | 73 | Dot11d_UpdateCountryIe( |
74 | struct ieee80211_device *dev, | 74 | struct ieee80211_device *dev, |
75 | u8 * pTaddr, | 75 | u8 * pTaddr, |
76 | u16 CoutryIeLen, | 76 | u16 CoutryIeLen, |
77 | u8 * pCoutryIe | 77 | u8 * pCoutryIe |
78 | ); | 78 | ); |
79 | 79 | ||
80 | u8 | 80 | u8 |
81 | DOT11D_GetMaxTxPwrInDbm( | 81 | DOT11D_GetMaxTxPwrInDbm( |
82 | struct ieee80211_device *dev, | 82 | struct ieee80211_device *dev, |
83 | u8 Channel | 83 | u8 Channel |
84 | ); | 84 | ); |
85 | 85 | ||
86 | void | 86 | void |
87 | DOT11D_ScanComplete( | 87 | DOT11D_ScanComplete( |
88 | struct ieee80211_device * dev | 88 | struct ieee80211_device * dev |
89 | ); | 89 | ); |
90 | 90 | ||
91 | int IsLegalChannel( | 91 | int IsLegalChannel( |
92 | struct ieee80211_device * dev, | 92 | struct ieee80211_device * dev, |
93 | u8 channel | 93 | u8 channel |
94 | ); | 94 | ); |
95 | 95 | ||
96 | int ToLegalChannel( | 96 | int ToLegalChannel( |
97 | struct ieee80211_device * dev, | 97 | struct ieee80211_device * dev, |
98 | u8 channel | 98 | u8 channel |
99 | ); | 99 | ); |
100 | 100 | ||
101 | void dump_chnl_map(u8 * channel_map); | 101 | void dump_chnl_map(u8 * channel_map); |
102 | #endif // #ifndef __INC_DOT11D_H | 102 | #endif // #ifndef __INC_DOT11D_H |