diff options
author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2009-11-22 13:16:47 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-23 17:05:40 -0500 |
commit | 77593ae28c4c134eaf28ef34ecac3cd4464ecd6e (patch) | |
tree | b69654804b566f0922cff18ce34063e85c56a2b2 /drivers | |
parent | c1f8ca1d837148bf061d6ffa2038366e3cf0e4d7 (diff) |
rndis_wlan: disable stall workaround
Stall workaround doesn't work with bcm4320a devices like with bcm4320b.
This workaround actually causes more stalls/device freeze on bcm4320a.
Therefore disable stall workaround by default.
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index 8b09b043bc4e..2ecbedb26e15 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
@@ -83,11 +83,11 @@ MODULE_PARM_DESC(roamdelta, | |||
83 | "set roaming tendency: 0=aggressive, 1=moderate, " | 83 | "set roaming tendency: 0=aggressive, 1=moderate, " |
84 | "2=conservative (default: moderate)"); | 84 | "2=conservative (default: moderate)"); |
85 | 85 | ||
86 | static int modparam_workaround_interval = 500; | 86 | static int modparam_workaround_interval; |
87 | module_param_named(workaround_interval, modparam_workaround_interval, | 87 | module_param_named(workaround_interval, modparam_workaround_interval, |
88 | int, 0444); | 88 | int, 0444); |
89 | MODULE_PARM_DESC(workaround_interval, | 89 | MODULE_PARM_DESC(workaround_interval, |
90 | "set stall workaround interval in msecs (default: 500)"); | 90 | "set stall workaround interval in msecs (0=disabled) (default: 0)"); |
91 | 91 | ||
92 | 92 | ||
93 | /* various RNDIS OID defs */ | 93 | /* various RNDIS OID defs */ |
@@ -2550,7 +2550,7 @@ static void rndis_device_poller(struct work_struct *work) | |||
2550 | /* Workaround transfer stalls on poor quality links. | 2550 | /* Workaround transfer stalls on poor quality links. |
2551 | * TODO: find right way to fix these stalls (as stalls do not happen | 2551 | * TODO: find right way to fix these stalls (as stalls do not happen |
2552 | * with ndiswrapper/windows driver). */ | 2552 | * with ndiswrapper/windows driver). */ |
2553 | if (priv->last_qual <= 25) { | 2553 | if (priv->param_workaround_interval > 0 && priv->last_qual <= 25) { |
2554 | /* Decrease stats worker interval to catch stalls. | 2554 | /* Decrease stats worker interval to catch stalls. |
2555 | * faster. Faster than 400-500ms causes packet loss, | 2555 | * faster. Faster than 400-500ms causes packet loss, |
2556 | * Slower doesn't catch stalls fast enough. | 2556 | * Slower doesn't catch stalls fast enough. |