Driver core: accept all valid action-strings in uevent-trigger

[linux-2.6-omap-h63xx.git] / net / mac80211 / ieee80211_i.h

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index b222a9afd4e9fb38e681212eb9cf0109e6d27b47..055a2a9121859f5d83be69a64544b98b789669c3 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -99,6 +99,12 @@ struct ieee80211_sta_bss {
        int probe_resp;
        unsigned long last_update;
 
+       /* during assocation, we save an ERP value from a probe response so
+        * that we can feed ERP info to the driver when handling the
+        * association completes. these fields probably won't be up-to-date
+        * otherwise, you probably don't want to use them. */
+       int has_erp_value;
+       u8 erp_value;
 };
 
 
@@ -235,7 +241,6 @@ struct ieee80211_if_sta {
        unsigned int authenticated:1;
        unsigned int associated:1;
        unsigned int probereq_poll:1;
-       unsigned int use_protection:1;
        unsigned int create_ibss:1;
        unsigned int mixed_cell:1;
        unsigned int wmm_enabled:1;
@@ -278,6 +283,7 @@ struct ieee80211_sub_if_data {
        int mc_count;
        unsigned int allmulti:1;
        unsigned int promisc:1;
+       unsigned int use_protection:1; /* CTS protect ERP frames */
 
        struct net_device_stats stats;
        int drop_unencrypted;
@@ -438,7 +444,6 @@ struct ieee80211_local {
        int *basic_rates[NUM_IEEE80211_MODES];
 
        int rts_threshold;
-       int cts_protect_erp_frames;
        int fragmentation_threshold;
        int short_retry_limit; /* dot11ShortRetryLimit */
        int long_retry_limit; /* dot11LongRetryLimit */