diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-04-10 14:10:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-04-10 14:10:24 -0400 |
| commit | d72c728210fa803a21203360c0f40b32972d795a (patch) | |
| tree | 95189c1a9181e3317dea2a139f390f5013e921a2 /drivers/net/wireless/iwlwifi/iwl-trans.h | |
| parent | 655d8e2328a6ef6b6b514609a4c1e33508d3a1da (diff) | |
| parent | 2d055afdcada4bd8b510e9d2a8566fbded3c9696 (diff) | |
| download | blackbird-op-linux-d72c728210fa803a21203360c0f40b32972d795a.tar.gz blackbird-op-linux-d72c728210fa803a21203360c0f40b32972d795a.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h index 7f9c254292a8..7a13790b5bfe 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans.h +++ b/drivers/net/wireless/iwlwifi/iwl-trans.h @@ -305,7 +305,6 @@ static inline void iwl_free_rxb(struct iwl_rx_cmd_buffer *r) * currently supports */ #define IWL_MAX_HW_QUEUES 32 -#define IWL_INVALID_STATION 255 #define IWL_MAX_TID_COUNT 8 #define IWL_FRAME_LIMIT 64 @@ -682,7 +681,7 @@ static inline void iwl_trans_txq_enable(struct iwl_trans *trans, int queue, static inline void iwl_trans_ac_txq_enable(struct iwl_trans *trans, int queue, int fifo) { - iwl_trans_txq_enable(trans, queue, fifo, IWL_INVALID_STATION, + iwl_trans_txq_enable(trans, queue, fifo, -1, IWL_MAX_TID_COUNT, IWL_FRAME_LIMIT, 0); } |
