Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed627be3 authored by Dan Carpenter's avatar Dan Carpenter Committed by John W. Linville
Browse files

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: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 651b5225

drivers/net/wireless/airo.c

+0 −11
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ static const char *statsLabels[] = { 
   (no spaces) list of rates (up to 8). */



static int rates[8];

static int basic_rate;

static char *ssids[3];



static int io[4];
@@ -250,7 +249,6 @@ MODULE_LICENSE("Dual BSD/GPL"); 
MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340/350");

module_param_array(io, int, NULL, 0);

module_param_array(irq, int, NULL, 0);

module_param(basic_rate, int, 0);

module_param_array(rates, int, NULL, 0);

module_param_array(ssids, charp, NULL, 0);

module_param(auto_wep, int, 0);
@@ -3884,15 +3882,6 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock) 
				ai->config.rates[i] = rates[i];

			}

		}

		if ( basic_rate > 0 ) {

			for( i = 0; i < 8; i++ ) {

				if ( ai->config.rates[i] == basic_rate ||

				     !ai->config.rates ) {

					ai->config.rates[i] = basic_rate | 0x80;

					break;

				}

			}

		}

		set_bit (FLAG_COMMIT, &ai->flags);

	}