aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwmc3200wifi/iwm.h
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2009-11-23 22:33:31 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-11-28 15:04:44 -0500
commita7af530d45969a63e20708417b70c547596ce3a9 (patch)
treec643269ad98d2689e1a011e13e2568615f01b0df /drivers/net/wireless/iwmc3200wifi/iwm.h
parent2351178c52fedf1846c84b35418f4102487ec00e (diff)
iwmc3200wifi: 802.11n Tx aggregation support
To support 802.11n Tx aggregation support with iwmc3200 wifi, we have to handle the UMAC_CMD_OPCODE_STOP_RESUME_STA_TX notification from the UMAC. Before sending an AddBA, the UMAC synchronizes with the host in order to know what is the last Tx frame it's supposed to receive before it will be able to start the actual aggregation session. We thus have to keep track of the last sequence number that is scheduled for transmission on a particular RAxTID, send an answer to the UMAC with this sequence number. The UMAC then does the BA negociation and once it's done with it sends a new UMAC_CMD_OPCODE_STOP_RESUME_STA_TX notification to let us know that we can resume the Tx flow on the specified RAxTID. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> Reviewed-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/iwm.h')
-rw-r--r--drivers/net/wireless/iwmc3200wifi/iwm.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/iwm.h b/drivers/net/wireless/iwmc3200wifi/iwm.h
index a9bf6bc97bea..8d091f918f33 100644
--- a/drivers/net/wireless/iwmc3200wifi/iwm.h
+++ b/drivers/net/wireless/iwmc3200wifi/iwm.h
@@ -131,11 +131,18 @@ struct iwm_notif {
131 unsigned long buf_size; 131 unsigned long buf_size;
132}; 132};
133 133
134struct iwm_tid_info {
135 __le16 last_seq_num;
136 bool stopped;
137 struct mutex mutex;
138};
139
134struct iwm_sta_info { 140struct iwm_sta_info {
135 u8 addr[ETH_ALEN]; 141 u8 addr[ETH_ALEN];
136 bool valid; 142 bool valid;
137 bool qos; 143 bool qos;
138 u8 color; 144 u8 color;
145 struct iwm_tid_info tid_info[IWM_UMAC_TID_NR];
139}; 146};
140 147
141struct iwm_tx_info { 148struct iwm_tx_info {
@@ -185,6 +192,8 @@ struct iwm_key {
185struct iwm_tx_queue { 192struct iwm_tx_queue {
186 int id; 193 int id;
187 struct sk_buff_head queue; 194 struct sk_buff_head queue;
195 struct sk_buff_head stopped_queue;
196 spinlock_t lock;
188 struct workqueue_struct *wq; 197 struct workqueue_struct *wq;
189 struct work_struct worker; 198 struct work_struct worker;
190 u8 concat_buf[IWM_HAL_CONCATENATE_BUF_SIZE]; 199 u8 concat_buf[IWM_HAL_CONCATENATE_BUF_SIZE];
@@ -341,6 +350,7 @@ int iwm_up(struct iwm_priv *iwm);
341int iwm_down(struct iwm_priv *iwm); 350int iwm_down(struct iwm_priv *iwm);
342 351
343/* TX API */ 352/* TX API */
353u16 iwm_tid_to_queue(u16 tid);
344void iwm_tx_credit_inc(struct iwm_priv *iwm, int id, int total_freed_pages); 354void iwm_tx_credit_inc(struct iwm_priv *iwm, int id, int total_freed_pages);
345void iwm_tx_worker(struct work_struct *work); 355void iwm_tx_worker(struct work_struct *work);
346int iwm_xmit_frame(struct sk_buff *skb, struct net_device *netdev); 356int iwm_xmit_frame(struct sk_buff *skb, struct net_device *netdev);