diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-08-25 23:11:22 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-08-29 15:30:31 -0400 |
| commit | ba562f71198a2cb03bb8d20640ffdf996275c3f0 (patch) | |
| tree | 290875852ea56b90190e92db0a77017b01ca4d6a /drivers/net/wireless/iwlwifi/iwl-trans.h | |
| parent | 2c452297ff3eaafad41d24fa03d54a169ced8de1 (diff) | |
| download | linux-rt-ba562f71198a2cb03bb8d20640ffdf996275c3f0.tar.gz | |
iwlagn: set tx_fifo for ampdu in transport layer
the mapping tx_queue -> fifo is really transport related. The upper
layer should be involved in such things.
Note that upon agg_disable, the queue is always mapped to fifo 0, but
this doesn't matter since when the queue will be setup again for a
new BA session, it will be configured to the good fifo anyway.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h index 2385de267bb7..011c82444566 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans.h +++ b/drivers/net/wireless/iwlwifi/iwl-trans.h @@ -123,10 +123,10 @@ struct iwl_trans_ops { void (*reclaim)(struct iwl_trans *trans, int txq_id, int ssn, u32 status, struct sk_buff_head *skbs); - int (*txq_agg_disable)(struct iwl_priv *priv, u16 txq_id, - u16 ssn_idx, u8 tx_fifo); - void (*txq_agg_setup)(struct iwl_priv *priv, int sta_id, int tid, - int frame_limit); + int (*txq_agg_disable)(struct iwl_priv *priv, u16 txq_id); + void (*txq_agg_setup)(struct iwl_priv *priv, + enum iwl_rxon_context_id ctx, int sta_id, + int tid, int frame_limit); void (*kick_nic)(struct iwl_trans *trans); @@ -209,17 +209,17 @@ static inline void iwl_trans_reclaim(struct iwl_trans *trans, int txq_id, trans->ops->reclaim(trans, txq_id, ssn, status, skbs); } -static inline int iwl_trans_txq_agg_disable(struct iwl_trans *trans, u16 txq_id, - u16 ssn_idx, u8 tx_fifo) +static inline int iwl_trans_txq_agg_disable(struct iwl_trans *trans, u16 txq_id) { - return trans->ops->txq_agg_disable(priv(trans), txq_id, - ssn_idx, tx_fifo); + return trans->ops->txq_agg_disable(priv(trans), txq_id); } -static inline void iwl_trans_txq_agg_setup(struct iwl_trans *trans, int sta_id, - int tid, int frame_limit) +static inline void iwl_trans_txq_agg_setup(struct iwl_trans *trans, + enum iwl_rxon_context_id ctx, + int sta_id, int tid, + int frame_limit) { - trans->ops->txq_agg_setup(priv(trans), sta_id, tid, frame_limit); + trans->ops->txq_agg_setup(priv(trans), ctx, sta_id, tid, frame_limit); } static inline void iwl_trans_kick_nic(struct iwl_trans *trans) |