Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6] / net / mac80211 / ieee80211_i.h

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 99ff7c5e920482761b95e0419e65bbf1ed61047c..055a2a9121859f5d83be69a64544b98b789669c3 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -241,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;
@@ -284,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;
@@ -444,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 */