diff options
| author | Daniel Drake <dsd@gentoo.org> | 2006-07-18 21:30:34 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 16:17:27 -0400 |
| commit | d8e2be90d301a0381e9b2528fe2835cf2992bca3 (patch) | |
| tree | 6595307b63a93c37a4287d3aec89fcf6ab01b385 | |
| parent | eab411f1e850af5acbd6ef278f4e669250f71915 (diff) | |
| download | kernel_samsung_espresso10-d8e2be90d301a0381e9b2528fe2835cf2992bca3.zip kernel_samsung_espresso10-d8e2be90d301a0381e9b2528fe2835cf2992bca3.tar.gz kernel_samsung_espresso10-d8e2be90d301a0381e9b2528fe2835cf2992bca3.tar.bz2 | |
[PATCH] ieee80211: small ERP handling additions
This adds a flag to the ieee80211_network structure which indicates whether
the stored erp_value is valid (a check against 0 is not enough, since an ERP
of 0 is valid and very meaningful).
I also added the ERP IE bit-definitions to ieee80211.h.
This is needed by some upcoming softmac patches.
Signed-off-by: Daniel Drake <dsd@gentoo.org>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | include/net/ieee80211.h | 7 | ||||
| -rw-r--r-- | net/ieee80211/ieee80211_rx.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index ecc4286..aa007f4 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -240,6 +240,11 @@ struct ieee80211_snap_hdr { #define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10) #define WLAN_CAPABILITY_DSSS_OFDM (1<<13) +/* 802.11g ERP information element */ +#define WLAN_ERP_NON_ERP_PRESENT (1<<0) +#define WLAN_ERP_USE_PROTECTION (1<<1) +#define WLAN_ERP_BARKER_PREAMBLE (1<<2) + /* Status codes */ enum ieee80211_statuscode { WLAN_STATUS_SUCCESS = 0, @@ -747,6 +752,8 @@ struct ieee80211_txb { #define NETWORK_HAS_IBSS_DFS (1<<8) #define NETWORK_HAS_TPC_REPORT (1<<9) +#define NETWORK_HAS_ERP_VALUE (1<<10) + #define QOS_QUEUE_NUM 4 #define QOS_OUI_LEN 3 #define QOS_OUI_TYPE 2 diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index 72d4d4e..f73fc16 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c @@ -1166,6 +1166,7 @@ static int ieee80211_parse_info_param(struct ieee80211_info_element case MFIE_TYPE_ERP_INFO: network->erp_value = info_element->data[0]; + network->flags |= NETWORK_HAS_ERP_VALUE; IEEE80211_DEBUG_MGMT("MFIE_TYPE_ERP_SET: %d\n", network->erp_value); break; |