aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/ieee80211_i.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r--net/mac80211/ieee80211_i.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 99ff7c5e9204..055a2a912185 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -241,7 +241,6 @@ struct ieee80211_if_sta {
241 unsigned int authenticated:1; 241 unsigned int authenticated:1;
242 unsigned int associated:1; 242 unsigned int associated:1;
243 unsigned int probereq_poll:1; 243 unsigned int probereq_poll:1;
244 unsigned int use_protection:1;
245 unsigned int create_ibss:1; 244 unsigned int create_ibss:1;
246 unsigned int mixed_cell:1; 245 unsigned int mixed_cell:1;
247 unsigned int wmm_enabled:1; 246 unsigned int wmm_enabled:1;
@@ -284,6 +283,7 @@ struct ieee80211_sub_if_data {
284 int mc_count; 283 int mc_count;
285 unsigned int allmulti:1; 284 unsigned int allmulti:1;
286 unsigned int promisc:1; 285 unsigned int promisc:1;
286 unsigned int use_protection:1; /* CTS protect ERP frames */
287 287
288 struct net_device_stats stats; 288 struct net_device_stats stats;
289 int drop_unencrypted; 289 int drop_unencrypted;
@@ -444,7 +444,6 @@ struct ieee80211_local {
444 int *basic_rates[NUM_IEEE80211_MODES]; 444 int *basic_rates[NUM_IEEE80211_MODES];
445 445
446 int rts_threshold; 446 int rts_threshold;
447 int cts_protect_erp_frames;
448 int fragmentation_threshold; 447 int fragmentation_threshold;
449 int short_retry_limit; /* dot11ShortRetryLimit */ 448 int short_retry_limit; /* dot11ShortRetryLimit */
450 int long_retry_limit; /* dot11LongRetryLimit */ 449 int long_retry_limit; /* dot11LongRetryLimit */