diff options
| author | John W. Linville <linville@tuxdriver.com> | 2008-09-30 21:43:03 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:50 -0400 |
| commit | 72118015271e6d3852cb9f647efe0987d131adaa (patch) | |
| tree | 6cf548edeb3eb1d6c561fc78951096775de86b22 /drivers/net/wireless/hostap | |
| parent | 9387b7caf3049168fc97a8a9111af8fe2143af18 (diff) | |
wireless: avoid some net/ieee80211.h vs. linux/ieee80211.h conflicts
There is quite a lot of overlap in definitions between these headers...
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/hostap')
| -rw-r--r-- | drivers/net/wireless/hostap/hostap_common.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/net/wireless/hostap/hostap_common.h b/drivers/net/wireless/hostap/hostap_common.h index b470c743c2d1..90b64b092007 100644 --- a/drivers/net/wireless/hostap/hostap_common.h +++ b/drivers/net/wireless/hostap/hostap_common.h | |||
| @@ -6,19 +6,6 @@ | |||
| 6 | 6 | ||
| 7 | /* IEEE 802.11 defines */ | 7 | /* IEEE 802.11 defines */ |
| 8 | 8 | ||
| 9 | /* Information Element IDs */ | ||
| 10 | #define WLAN_EID_SSID 0 | ||
| 11 | #define WLAN_EID_SUPP_RATES 1 | ||
| 12 | #define WLAN_EID_FH_PARAMS 2 | ||
| 13 | #define WLAN_EID_DS_PARAMS 3 | ||
| 14 | #define WLAN_EID_CF_PARAMS 4 | ||
| 15 | #define WLAN_EID_TIM 5 | ||
| 16 | #define WLAN_EID_IBSS_PARAMS 6 | ||
| 17 | #define WLAN_EID_CHALLENGE 16 | ||
| 18 | #define WLAN_EID_RSN 48 | ||
| 19 | #define WLAN_EID_GENERIC 221 | ||
| 20 | |||
| 21 | |||
| 22 | /* HFA384X Configuration RIDs */ | 9 | /* HFA384X Configuration RIDs */ |
| 23 | #define HFA384X_RID_CNFPORTTYPE 0xFC00 | 10 | #define HFA384X_RID_CNFPORTTYPE 0xFC00 |
| 24 | #define HFA384X_RID_CNFOWNMACADDR 0xFC01 | 11 | #define HFA384X_RID_CNFOWNMACADDR 0xFC01 |