diff options
Diffstat (limited to 'drivers/net/wireless/mwifiex/fw.h')
-rw-r--r-- | drivers/net/wireless/mwifiex/fw.h | 41 |
1 files changed, 7 insertions, 34 deletions
diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h index b4e4991e58e..d981265eb94 100644 --- a/drivers/net/wireless/mwifiex/fw.h +++ b/drivers/net/wireless/mwifiex/fw.h | |||
@@ -127,11 +127,14 @@ enum MWIFIEX_802_11_WEP_STATUS { | |||
127 | #define TLV_TYPE_WMMQSTATUS (PROPRIETARY_TLV_BASE_ID + 16) | 127 | #define TLV_TYPE_WMMQSTATUS (PROPRIETARY_TLV_BASE_ID + 16) |
128 | #define TLV_TYPE_WILDCARDSSID (PROPRIETARY_TLV_BASE_ID + 18) | 128 | #define TLV_TYPE_WILDCARDSSID (PROPRIETARY_TLV_BASE_ID + 18) |
129 | #define TLV_TYPE_TSFTIMESTAMP (PROPRIETARY_TLV_BASE_ID + 19) | 129 | #define TLV_TYPE_TSFTIMESTAMP (PROPRIETARY_TLV_BASE_ID + 19) |
130 | |||
131 | #define TLV_TYPE_AUTH_TYPE (PROPRIETARY_TLV_BASE_ID + 31) | 130 | #define TLV_TYPE_AUTH_TYPE (PROPRIETARY_TLV_BASE_ID + 31) |
132 | |||
133 | #define TLV_TYPE_CHANNELBANDLIST (PROPRIETARY_TLV_BASE_ID + 42) | 131 | #define TLV_TYPE_CHANNELBANDLIST (PROPRIETARY_TLV_BASE_ID + 42) |
132 | #define TLV_TYPE_RATE_DROP_CONTROL (PROPRIETARY_TLV_BASE_ID + 82) | ||
133 | #define TLV_TYPE_RATE_SCOPE (PROPRIETARY_TLV_BASE_ID + 83) | ||
134 | #define TLV_TYPE_POWER_GROUP (PROPRIETARY_TLV_BASE_ID + 84) | ||
134 | #define TLV_TYPE_WAPI_IE (PROPRIETARY_TLV_BASE_ID + 94) | 135 | #define TLV_TYPE_WAPI_IE (PROPRIETARY_TLV_BASE_ID + 94) |
136 | #define TLV_TYPE_AUTO_DS_PARAM (PROPRIETARY_TLV_BASE_ID + 113) | ||
137 | #define TLV_TYPE_PS_PARAM (PROPRIETARY_TLV_BASE_ID + 114) | ||
135 | 138 | ||
136 | #define MWIFIEX_TX_DATA_BUF_SIZE_2K 2048 | 139 | #define MWIFIEX_TX_DATA_BUF_SIZE_2K 2048 |
137 | 140 | ||
@@ -184,11 +187,6 @@ enum MWIFIEX_802_11_WEP_STATUS { | |||
184 | 187 | ||
185 | #define LLC_SNAP_LEN 8 | 188 | #define LLC_SNAP_LEN 8 |
186 | 189 | ||
187 | #define TLV_TYPE_RATE_DROP_CONTROL (PROPRIETARY_TLV_BASE_ID + 82) | ||
188 | #define TLV_TYPE_RATE_SCOPE (PROPRIETARY_TLV_BASE_ID + 83) | ||
189 | |||
190 | #define TLV_TYPE_POWER_GROUP (PROPRIETARY_TLV_BASE_ID + 84) | ||
191 | |||
192 | #define MOD_CLASS_HR_DSSS 0x03 | 190 | #define MOD_CLASS_HR_DSSS 0x03 |
193 | #define MOD_CLASS_OFDM 0x07 | 191 | #define MOD_CLASS_OFDM 0x07 |
194 | #define MOD_CLASS_HT 0x08 | 192 | #define MOD_CLASS_HT 0x08 |
@@ -553,34 +551,12 @@ struct mwifiex_ps_param { | |||
553 | __le16 delay_to_ps; | 551 | __le16 delay_to_ps; |
554 | }; | 552 | }; |
555 | 553 | ||
556 | struct mwifiex_auto_ds_param { | ||
557 | __le16 deep_sleep_timeout; | ||
558 | }; | ||
559 | |||
560 | struct sleep_confirm_param { | ||
561 | __le16 resp_ctrl; | ||
562 | }; | ||
563 | |||
564 | #define BITMAP_AUTO_DS 0x01 | 554 | #define BITMAP_AUTO_DS 0x01 |
565 | #define BITMAP_STA_PS 0x10 | 555 | #define BITMAP_STA_PS 0x10 |
566 | #define BITMAP_UAP_INACT_PS 0x100 | ||
567 | #define BITMAP_UAP_DTIM_PS 0x200 | ||
568 | struct auto_ps_param { | ||
569 | __le16 ps_bitmap; | ||
570 | /* auto deep sleep parameter, | ||
571 | * sta power save parameter | ||
572 | * uap inactivity parameter | ||
573 | * uap DTIM parameter */ | ||
574 | }; | ||
575 | |||
576 | #define AUTO_PS_FIX_SIZE 4 | ||
577 | |||
578 | #define TLV_TYPE_AUTO_DS_PARAM (PROPRIETARY_TLV_BASE_ID + 113) | ||
579 | #define TLV_TYPE_PS_PARAM (PROPRIETARY_TLV_BASE_ID + 114) | ||
580 | 556 | ||
581 | struct mwifiex_ie_types_auto_ds_param { | 557 | struct mwifiex_ie_types_auto_ds_param { |
582 | struct mwifiex_ie_types_header header; | 558 | struct mwifiex_ie_types_header header; |
583 | struct mwifiex_auto_ds_param param; | 559 | __le16 deep_sleep_timeout; |
584 | } __packed; | 560 | } __packed; |
585 | 561 | ||
586 | struct mwifiex_ie_types_ps_param { | 562 | struct mwifiex_ie_types_ps_param { |
@@ -593,10 +569,7 @@ struct host_cmd_ds_802_11_ps_mode_enh { | |||
593 | 569 | ||
594 | union { | 570 | union { |
595 | struct mwifiex_ps_param opt_ps; | 571 | struct mwifiex_ps_param opt_ps; |
596 | struct mwifiex_auto_ds_param auto_ds; | ||
597 | struct sleep_confirm_param sleep_cfm; | ||
598 | __le16 ps_bitmap; | 572 | __le16 ps_bitmap; |
599 | struct auto_ps_param auto_ps; | ||
600 | } params; | 573 | } params; |
601 | } __packed; | 574 | } __packed; |
602 | 575 | ||
@@ -1260,7 +1233,7 @@ struct mwifiex_opt_sleep_confirm { | |||
1260 | __le16 seq_num; | 1233 | __le16 seq_num; |
1261 | __le16 result; | 1234 | __le16 result; |
1262 | __le16 action; | 1235 | __le16 action; |
1263 | struct sleep_confirm_param sleep_cfm; | 1236 | __le16 resp_ctrl; |
1264 | } __packed; | 1237 | } __packed; |
1265 | 1238 | ||
1266 | struct mwifiex_opt_sleep_confirm_buffer { | 1239 | struct mwifiex_opt_sleep_confirm_buffer { |