diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h index 1fff285b6435..90ef0dc5f275 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans.h +++ b/drivers/net/wireless/iwlwifi/iwl-trans.h | |||
@@ -355,7 +355,7 @@ struct iwl_trans; | |||
355 | * Must be atomic | 355 | * Must be atomic |
356 | * @reclaim: free packet until ssn. Returns a list of freed packets. | 356 | * @reclaim: free packet until ssn. Returns a list of freed packets. |
357 | * Must be atomic | 357 | * Must be atomic |
358 | * @tx_agg_setup: setup a tx queue for AMPDU - will be called once the HW is | 358 | * @txq_enable: setup a tx queue for AMPDU - will be called once the HW is |
359 | * ready and a successful ADDBA response has been received. | 359 | * ready and a successful ADDBA response has been received. |
360 | * May sleep | 360 | * May sleep |
361 | * @txq_disable: de-configure a Tx queue to send AMPDUs | 361 | * @txq_disable: de-configure a Tx queue to send AMPDUs |
@@ -391,8 +391,8 @@ struct iwl_trans_ops { | |||
391 | void (*reclaim)(struct iwl_trans *trans, int queue, int ssn, | 391 | void (*reclaim)(struct iwl_trans *trans, int queue, int ssn, |
392 | struct sk_buff_head *skbs); | 392 | struct sk_buff_head *skbs); |
393 | 393 | ||
394 | void (*tx_agg_setup)(struct iwl_trans *trans, int queue, int fifo, | 394 | void (*txq_enable)(struct iwl_trans *trans, int queue, int fifo, |
395 | int sta_id, int tid, int frame_limit, u16 ssn); | 395 | int sta_id, int tid, int frame_limit, u16 ssn); |
396 | void (*txq_disable)(struct iwl_trans *trans, int queue); | 396 | void (*txq_disable)(struct iwl_trans *trans, int queue); |
397 | 397 | ||
398 | int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir); | 398 | int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir); |
@@ -551,16 +551,16 @@ static inline void iwl_trans_txq_disable(struct iwl_trans *trans, int queue) | |||
551 | trans->ops->txq_disable(trans, queue); | 551 | trans->ops->txq_disable(trans, queue); |
552 | } | 552 | } |
553 | 553 | ||
554 | static inline void iwl_trans_tx_agg_setup(struct iwl_trans *trans, int queue, | 554 | static inline void iwl_trans_txq_enable(struct iwl_trans *trans, int queue, |
555 | int fifo, int sta_id, int tid, | 555 | int fifo, int sta_id, int tid, |
556 | int frame_limit, u16 ssn) | 556 | int frame_limit, u16 ssn) |
557 | { | 557 | { |
558 | might_sleep(); | 558 | might_sleep(); |
559 | 559 | ||
560 | WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE, | 560 | WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE, |
561 | "%s bad state = %d", __func__, trans->state); | 561 | "%s bad state = %d", __func__, trans->state); |
562 | 562 | ||
563 | trans->ops->tx_agg_setup(trans, queue, fifo, sta_id, tid, | 563 | trans->ops->txq_enable(trans, queue, fifo, sta_id, tid, |
564 | frame_limit, ssn); | 564 | frame_limit, ssn); |
565 | } | 565 | } |
566 | 566 | ||