diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2010-01-08 12:28:14 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-01-12 14:02:08 -0500 |
commit | b569e924a9ea7c6f03dcf9b8a98d78d341925b87 (patch) | |
tree | c015ecc00922e1d51202d173c15121e3028b3bb9 /drivers/net/wireless/mwl8k.c | |
parent | c2c2b12a8b6cd23d4abbc086642647c656bf406c (diff) |
mwl8k: undo transmit queue 0/1 swapping in mwl8k_cmd_set_edca_params()
The comment and code in mwl8k_cmd_set_edca_params() suggest that the
mapping between SET_EDCA_PARAMS queue numbers and transmit rings isn't
actually 1:1, while tests show that the mapping is in fact 1:1. So,
get rid of the transmit queue 0/1 swapping.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwl8k.c')
-rw-r--r-- | drivers/net/wireless/mwl8k.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index cc160418e6c5..3f5fdb69a2be 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
@@ -2397,12 +2397,6 @@ mwl8k_cmd_set_edca_params(struct ieee80211_hw *hw, __u8 qnum, | |||
2397 | if (cmd == NULL) | 2397 | if (cmd == NULL) |
2398 | return -ENOMEM; | 2398 | return -ENOMEM; |
2399 | 2399 | ||
2400 | /* | ||
2401 | * Queues 0 (BE) and 1 (BK) are swapped in hardware for | ||
2402 | * this call. | ||
2403 | */ | ||
2404 | qnum ^= !(qnum >> 1); | ||
2405 | |||
2406 | cmd->header.code = cpu_to_le16(MWL8K_CMD_SET_EDCA_PARAMS); | 2400 | cmd->header.code = cpu_to_le16(MWL8K_CMD_SET_EDCA_PARAMS); |
2407 | cmd->header.length = cpu_to_le16(sizeof(*cmd)); | 2401 | cmd->header.length = cpu_to_le16(sizeof(*cmd)); |
2408 | cmd->action = cpu_to_le16(MWL8K_SET_EDCA_ALL); | 2402 | cmd->action = cpu_to_le16(MWL8K_SET_EDCA_ALL); |