]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
wireless: rndis_wlan: modparam_workaround_interval is never below 0.
authorRoel Kluin <12o3l@tiscali.nl>
Wed, 23 Apr 2008 20:10:29 +0000 (22:10 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 24 Apr 2008 01:25:36 +0000 (21:25 -0400)
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>
drivers/net/wireless/rndis_wlan.c

index 977751f372ffc9d8578b5692feed51cc455d5037..d0b1fb15c7091f8b3334c94f240fe6fa445e6c17 100644 (file)
@@ -2402,7 +2402,6 @@ static int bcm4320_early_init(struct usbnet *dev)
        priv->param_power_output = modparam_power_output;
        priv->param_roamtrigger  = modparam_roamtrigger;
        priv->param_roamdelta    = modparam_roamdelta;
-       priv->param_workaround_interval = modparam_workaround_interval;
 
        priv->param_country[0] = toupper(priv->param_country[0]);
        priv->param_country[1] = toupper(priv->param_country[1]);
@@ -2425,8 +2424,10 @@ static int bcm4320_early_init(struct usbnet *dev)
        else if (priv->param_roamdelta > 2)
                priv->param_roamdelta = 2;
 
-       if (priv->param_workaround_interval < 0)
+       if (modparam_workaround_interval < 0)
                priv->param_workaround_interval = 500;
+       else
+               priv->param_workaround_interval = modparam_workaround_interval;
 
        rndis_set_config_parameter_str(dev, "Country", priv->param_country);
        rndis_set_config_parameter_str(dev, "FrameBursting",