diff options
author | Dan Carpenter <error27@gmail.com> | 2010-09-11 19:48:33 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-09-24 15:54:29 -0400 |
commit | ed627be38a1a07c6986a9f17c299f6afc86ac6b7 (patch) | |
tree | a6e49bcc9b00fb0aa38fb94ef39903bddc56ce9d /drivers | |
parent | 651b52254fc061f02d965524e71de4333a009a5a (diff) |
airo: remove "basic_rate" module option
The "basic_rate" module option is not implemented correctly. If the
rate was set to zero it was supposed to set it to "basic_rate | 0x80".
Unfortunately the check to see if what zero was wrong and it checked
"!ai->config.rates" (which is always false) instead of
"!ai->config.rates[i]".
This option was just used for development and it wasn't documented
anywhere. Instead of fixing it, we can just remove it.
Reported-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/airo.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index c7528e5794d1..fdebbe7eebb6 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -217,7 +217,6 @@ static const char *statsLabels[] = { | |||
217 | (no spaces) list of rates (up to 8). */ | 217 | (no spaces) list of rates (up to 8). */ |
218 | 218 | ||
219 | static int rates[8]; | 219 | static int rates[8]; |
220 | static int basic_rate; | ||
221 | static char *ssids[3]; | 220 | static char *ssids[3]; |
222 | 221 | ||
223 | static int io[4]; | 222 | static int io[4]; |
@@ -250,7 +249,6 @@ MODULE_LICENSE("Dual BSD/GPL"); | |||
250 | MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350"); | 249 | MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350"); |
251 | module_param_array(io, int, NULL, 0); | 250 | module_param_array(io, int, NULL, 0); |
252 | module_param_array(irq, int, NULL, 0); | 251 | module_param_array(irq, int, NULL, 0); |
253 | module_param(basic_rate, int, 0); | ||
254 | module_param_array(rates, int, NULL, 0); | 252 | module_param_array(rates, int, NULL, 0); |
255 | module_param_array(ssids, charp, NULL, 0); | 253 | module_param_array(ssids, charp, NULL, 0); |
256 | module_param(auto_wep, int, 0); | 254 | module_param(auto_wep, int, 0); |
@@ -3884,15 +3882,6 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock) | |||
3884 | ai->config.rates[i] = rates[i]; | 3882 | ai->config.rates[i] = rates[i]; |
3885 | } | 3883 | } |
3886 | } | 3884 | } |
3887 | if ( basic_rate > 0 ) { | ||
3888 | for( i = 0; i < 8; i++ ) { | ||
3889 | if ( ai->config.rates[i] == basic_rate || | ||
3890 | !ai->config.rates ) { | ||
3891 | ai->config.rates[i] = basic_rate | 0x80; | ||
3892 | break; | ||
3893 | } | ||
3894 | } | ||
3895 | } | ||
3896 | set_bit (FLAG_COMMIT, &ai->flags); | 3885 | set_bit (FLAG_COMMIT, &ai->flags); |
3897 | } | 3886 | } |
3898 | 3887 | ||