diff options
author | Roel Kluin <12o3l@tiscali.nl> | 2008-04-23 16:10:29 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-04-23 21:25:36 -0400 |
commit | 4d381ffb02701c3fc976091473aead7c03523133 (patch) | |
tree | 1f7aab7c8696ee82be7d05acf0df19e0a3238b7d /drivers/net | |
parent | 8ba82e969f71d088f718f93d64985d5fcdd9c171 (diff) |
wireless: rndis_wlan: modparam_workaround_interval is never below 0.
priv->param_workaround_interval is unsigned, modparam_workaround_interval not.
the former is never < 0.
Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index 977751f372ff..d0b1fb15c709 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
@@ -2402,7 +2402,6 @@ static int bcm4320_early_init(struct usbnet *dev) | |||
2402 | priv->param_power_output = modparam_power_output; | 2402 | priv->param_power_output = modparam_power_output; |
2403 | priv->param_roamtrigger = modparam_roamtrigger; | 2403 | priv->param_roamtrigger = modparam_roamtrigger; |
2404 | priv->param_roamdelta = modparam_roamdelta; | 2404 | priv->param_roamdelta = modparam_roamdelta; |
2405 | priv->param_workaround_interval = modparam_workaround_interval; | ||
2406 | 2405 | ||
2407 | priv->param_country[0] = toupper(priv->param_country[0]); | 2406 | priv->param_country[0] = toupper(priv->param_country[0]); |
2408 | priv->param_country[1] = toupper(priv->param_country[1]); | 2407 | priv->param_country[1] = toupper(priv->param_country[1]); |
@@ -2425,8 +2424,10 @@ static int bcm4320_early_init(struct usbnet *dev) | |||
2425 | else if (priv->param_roamdelta > 2) | 2424 | else if (priv->param_roamdelta > 2) |
2426 | priv->param_roamdelta = 2; | 2425 | priv->param_roamdelta = 2; |
2427 | 2426 | ||
2428 | if (priv->param_workaround_interval < 0) | 2427 | if (modparam_workaround_interval < 0) |
2429 | priv->param_workaround_interval = 500; | 2428 | priv->param_workaround_interval = 500; |
2429 | else | ||
2430 | priv->param_workaround_interval = modparam_workaround_interval; | ||
2430 | 2431 | ||
2431 | rndis_set_config_parameter_str(dev, "Country", priv->param_country); | 2432 | rndis_set_config_parameter_str(dev, "Country", priv->param_country); |
2432 | rndis_set_config_parameter_str(dev, "FrameBursting", | 2433 | rndis_set_config_parameter_str(dev, "FrameBursting", |