From d19f2dc6c84f171645968336fbe03c58f27a89cc Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@gentoo.org>
Date: Tue, 18 Jul 2006 21:30:34 +0100
Subject: [PATCH] --- yaml --- r: 35099 b: refs/heads/master c:
 d8e2be90d301a0381e9b2528fe2835cf2992bca3 h: refs/heads/master i:   35097:
 f20b80ae1e6e32edbf6a32acb3e1b25d984e9b9a   35095:
 cd16bc94c86bf784a3f0f3b9a82ece6675750f2f v: v3

---
 [refs]                             | 2 +-
 trunk/include/net/ieee80211.h      | 7 +++++++
 trunk/net/ieee80211/ieee80211_rx.c | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2c31513e475a..09b5e146bd23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eab411f1e850af5acbd6ef278f4e669250f71915
+refs/heads/master: d8e2be90d301a0381e9b2528fe2835cf2992bca3
diff --git a/trunk/include/net/ieee80211.h b/trunk/include/net/ieee80211.h
index ecc42864b001..aa007f49bf29 100644
--- a/trunk/include/net/ieee80211.h
+++ b/trunk/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/trunk/net/ieee80211/ieee80211_rx.c b/trunk/net/ieee80211/ieee80211_rx.c
index 72d4d4e04d42..f73fc164b9ef 100644
--- a/trunk/net/ieee80211/ieee80211_rx.c
+++ b/trunk/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;