diff options
author | Marc Yang <yangyang@marvell.com> | 2011-05-16 22:17:53 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-19 13:53:57 -0400 |
commit | 62a5b7dcee00c8e64e61ed98541c95fd38583116 (patch) | |
tree | f283462eb58ab6ddb9dd891f2a9f235421a0f3c4 /drivers | |
parent | 17e8cec87586c26b953c6541c8a045e906ea046c (diff) |
mwifiex: adjust high/low water marks for tx_pending queue
This is to fix an issue that the throughput of the higher priority
stream gets dropped when a lower priority stream is present.
Signed-off-by: Marc Yang <yangyang@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/mwifiex/main.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/mwifiex/txrx.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h index 3154b0a31ea6..8316b3cd92cd 100644 --- a/drivers/net/wireless/mwifiex/main.h +++ b/drivers/net/wireless/mwifiex/main.h | |||
@@ -69,7 +69,8 @@ struct mwifiex_drv_mode { | |||
69 | #define MWIFIEX_TIMER_10S 10000 | 69 | #define MWIFIEX_TIMER_10S 10000 |
70 | #define MWIFIEX_TIMER_1S 1000 | 70 | #define MWIFIEX_TIMER_1S 1000 |
71 | 71 | ||
72 | #define MAX_TX_PENDING 60 | 72 | #define MAX_TX_PENDING 100 |
73 | #define LOW_TX_PENDING 80 | ||
73 | 74 | ||
74 | #define MWIFIEX_UPLD_SIZE (2312) | 75 | #define MWIFIEX_UPLD_SIZE (2312) |
75 | 76 | ||
diff --git a/drivers/net/wireless/mwifiex/txrx.c b/drivers/net/wireless/mwifiex/txrx.c index 210120889dfe..aaa50c074196 100644 --- a/drivers/net/wireless/mwifiex/txrx.c +++ b/drivers/net/wireless/mwifiex/txrx.c | |||
@@ -140,7 +140,9 @@ int mwifiex_write_data_complete(struct mwifiex_adapter *adapter, | |||
140 | } else { | 140 | } else { |
141 | priv->stats.tx_errors++; | 141 | priv->stats.tx_errors++; |
142 | } | 142 | } |
143 | atomic_dec(&adapter->tx_pending); | 143 | |
144 | if (atomic_dec_return(&adapter->tx_pending) >= LOW_TX_PENDING) | ||
145 | goto done; | ||
144 | 146 | ||
145 | for (i = 0; i < adapter->priv_num; i++) { | 147 | for (i = 0; i < adapter->priv_num; i++) { |
146 | 148 | ||