aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00.h')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00.h18
1 files changed, 13 insertions, 5 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 8718ad3dcc00..a324ff3ed7e7 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -384,7 +384,7 @@ struct rt2x00_intf {
384 */ 384 */
385 unsigned int delayed_flags; 385 unsigned int delayed_flags;
386#define DELAYED_UPDATE_BEACON 0x00000001 386#define DELAYED_UPDATE_BEACON 0x00000001
387#define DELAYED_CONFIG_PREAMBLE 0x00000002 387#define DELAYED_CONFIG_ERP 0x00000002
388}; 388};
389 389
390static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif) 390static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
@@ -451,6 +451,16 @@ struct rt2x00lib_conf {
451}; 451};
452 452
453/* 453/*
454 * Configuration structure for erp settings.
455 */
456struct rt2x00lib_erp {
457 int short_preamble;
458
459 int ack_timeout;
460 int ack_consume_time;
461};
462
463/*
454 * Configuration structure wrapper around the 464 * Configuration structure wrapper around the
455 * rt2x00 interface configuration handler. 465 * rt2x00 interface configuration handler.
456 */ 466 */
@@ -558,10 +568,8 @@ struct rt2x00lib_ops {
558#define CONFIG_UPDATE_MAC ( 1 << 2 ) 568#define CONFIG_UPDATE_MAC ( 1 << 2 )
559#define CONFIG_UPDATE_BSSID ( 1 << 3 ) 569#define CONFIG_UPDATE_BSSID ( 1 << 3 )
560 570
561 int (*config_preamble) (struct rt2x00_dev *rt2x00dev, 571 int (*config_erp) (struct rt2x00_dev *rt2x00dev,
562 const int short_preamble, 572 struct rt2x00lib_erp *erp);
563 const int ack_timeout,
564 const int ack_consume_time);
565 void (*config) (struct rt2x00_dev *rt2x00dev, 573 void (*config) (struct rt2x00_dev *rt2x00dev,
566 struct rt2x00lib_conf *libconf, 574 struct rt2x00lib_conf *libconf,
567 const unsigned int flags); 575 const unsigned int flags);