From patchwork Sat Sep 11 23:48:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 172672 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8BNmnp9031713 for ; Sat, 11 Sep 2010 23:48:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752975Ab0IKXsr (ORCPT ); Sat, 11 Sep 2010 19:48:47 -0400 Received: from mail-ww0-f44.google.com ([74.125.82.44]:47919 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752399Ab0IKXsq (ORCPT ); Sat, 11 Sep 2010 19:48:46 -0400 Received: by wwb13 with SMTP id 13so1912614wwb.1 for ; Sat, 11 Sep 2010 16:48:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=TfHVMZUbp9GkUsPBl3JTVPe5RytmlJKHSIfDaMaT8gw=; b=g3vqHptyVhJLK58yhVkxC2IjyicbT8eYtxi2MWnO33vSeYa8kmrIUnd4ajt71PnlW8 l9cqMgRMiVA/xYEub1bTeOtMyZnVrN1Xed8vhLPp4FWbANrRcfI/7os3QROezSHdcrXT 9fnAIbuWaZANzkdrgkpUR4fM9Q1LkNtoe2zWw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=JdKl9XA8cu2uTd/sbbzFkspoRjOIJ+FGZhWUrwWBq34qKl93LPyi6b28HgWND2A1JJ kEcGbgF26wXb4N+vQ6lIDJ9gUoexXQJSEW/DhMbff5jbhEOOS20XiT4eJKYYq/VMFwGV bS1rN8OoXaK18xYXzQMtz1oR03u//N/+aABwM= Received: by 10.216.15.10 with SMTP id e10mr961449wee.21.1284248925242; Sat, 11 Sep 2010 16:48:45 -0700 (PDT) Received: from bicker ([41.205.146.22]) by mx.google.com with ESMTPS id w29sm2787478weq.18.2010.09.11.16.48.39 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 11 Sep 2010 16:48:44 -0700 (PDT) Date: Sun, 12 Sep 2010 01:48:33 +0200 From: Dan Carpenter To: Stanislaw Gruszka Cc: "John W. Linville" , Matthieu CASTET , linux-wireless@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch v2] airo: remove "basic_rate" module option Message-ID: <20100911234833.GD25351@bicker> References: <20100910115714.GE5959@bicker> <20100910133401.GF2398@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100910133401.GF2398@redhat.com> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sat, 11 Sep 2010 23:48:50 +0000 (UTC) diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 1d05445..c20cad7 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c @@ -217,7 +217,6 @@ static 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); }