diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2010-01-08 12:28:34 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-01-12 14:02:08 -0500 |
commit | 62abd3cfb2f1a0ab1963ac4c4087c477da6b1f2a (patch) | |
tree | 88f4593323d35a604175922257c6b893da1d6198 /drivers/net/wireless/mwl8k.c | |
parent | b569e924a9ea7c6f03dcf9b8a98d78d341925b87 (diff) |
mwl8k: bump the transmit wait timeout to 5 seconds
While it is reasonable to expect that at least one transmit ring entry
will be processed per second while we are waiting for the transmit
rings to drain, the firmware can end up doing batching of transmit ring
status writeback, which means that the transmit rings can appear stuck
for more than a second at a time.
Bump the TX drain wait timeout up from 1 to 5 seconds to account for
this.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 3f5fdb69a2be..8f5f7c9f75f7 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
@@ -1173,7 +1173,7 @@ static void mwl8k_dump_tx_rings(struct ieee80211_hw *hw) | |||
1173 | /* | 1173 | /* |
1174 | * Must be called with priv->fw_mutex held and tx queues stopped. | 1174 | * Must be called with priv->fw_mutex held and tx queues stopped. |
1175 | */ | 1175 | */ |
1176 | #define MWL8K_TX_WAIT_TIMEOUT_MS 1000 | 1176 | #define MWL8K_TX_WAIT_TIMEOUT_MS 5000 |
1177 | 1177 | ||
1178 | static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw) | 1178 | static int mwl8k_tx_wait_empty(struct ieee80211_hw *hw) |
1179 | { | 1179 | { |