aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2009-11-13 14:56:36 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-11-18 17:09:07 -0500
commit9bb487b406692e172b15eba58de7d69358ac2005 (patch)
tree5eb25516212f26b0e9f067c387e4fd014f68e64a
parentc397bf15a6067ecf39f8a771907f4721a64fd61f (diff)
iwlwifi: add sleep_tx_count ucode station API
This field was marked as reserved before since we didn't use it, but is present in all released firmwares afaict. We're going to need it soon, so add it now. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-4965.c1
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-commands.h18
2 files changed, 17 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index 0efde87b4597..1e58c49dd768 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -1817,6 +1817,7 @@ static u16 iwl4965_build_addsta_hcmd(const struct iwl_addsta_cmd *cmd, u8 *data)
1817 addsta->add_immediate_ba_tid = cmd->add_immediate_ba_tid; 1817 addsta->add_immediate_ba_tid = cmd->add_immediate_ba_tid;
1818 addsta->remove_immediate_ba_tid = cmd->remove_immediate_ba_tid; 1818 addsta->remove_immediate_ba_tid = cmd->remove_immediate_ba_tid;
1819 addsta->add_immediate_ba_ssn = cmd->add_immediate_ba_ssn; 1819 addsta->add_immediate_ba_ssn = cmd->add_immediate_ba_ssn;
1820 addsta->sleep_tx_count = cmd->sleep_tx_count;
1820 addsta->reserved1 = cpu_to_le16(0); 1821 addsta->reserved1 = cpu_to_le16(0);
1821 addsta->reserved2 = cpu_to_le32(0); 1822 addsta->reserved2 = cpu_to_le32(0);
1822 1823
diff --git a/drivers/net/wireless/iwlwifi/iwl-commands.h b/drivers/net/wireless/iwlwifi/iwl-commands.h
index 87a7f2832c53..aa4e38cbf071 100644
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@ -1107,7 +1107,14 @@ struct iwl4965_addsta_cmd {
1107 * Set modify_mask bit STA_MODIFY_ADDBA_TID_MSK to use this field. */ 1107 * Set modify_mask bit STA_MODIFY_ADDBA_TID_MSK to use this field. */
1108 __le16 add_immediate_ba_ssn; 1108 __le16 add_immediate_ba_ssn;
1109 1109
1110 __le32 reserved2; 1110 /*
1111 * Number of packets OK to transmit to station even though
1112 * it is asleep -- used to synchronise PS-poll and u-APSD
1113 * responses while ucode keeps track of STA sleep state.
1114 */
1115 __le16 sleep_tx_count;
1116
1117 __le16 reserved2;
1111} __attribute__ ((packed)); 1118} __attribute__ ((packed));
1112 1119
1113/* 5000 */ 1120/* 5000 */
@@ -1138,7 +1145,14 @@ struct iwl_addsta_cmd {
1138 * Set modify_mask bit STA_MODIFY_ADDBA_TID_MSK to use this field. */ 1145 * Set modify_mask bit STA_MODIFY_ADDBA_TID_MSK to use this field. */
1139 __le16 add_immediate_ba_ssn; 1146 __le16 add_immediate_ba_ssn;
1140 1147
1141 __le32 reserved2; 1148 /*
1149 * Number of packets OK to transmit to station even though
1150 * it is asleep -- used to synchronise PS-poll and u-APSD
1151 * responses while ucode keeps track of STA sleep state.
1152 */
1153 __le16 sleep_tx_count;
1154
1155 __le16 reserved2;
1142} __attribute__ ((packed)); 1156} __attribute__ ((packed));
1143 1157
1144 1158