From patchwork Sat Feb 26 01:56:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 591991 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 p1Q1vjFF010363 for ; Sat, 26 Feb 2011 01:57:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751200Ab1BZB5i (ORCPT ); Fri, 25 Feb 2011 20:57:38 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:50070 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750965Ab1BZB5h (ORCPT ); Fri, 25 Feb 2011 20:57:37 -0500 Received: by bwz15 with SMTP id 15so2434069bwz.19 for ; Fri, 25 Feb 2011 17:57:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:cc:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=K/ivwll1JctDDMNDHvY4OKUQ29PeKPNrzVhs47uz1qc=; b=HI+9H3HrXO8UHvRox69j+rMhIrEZiCgPlVwvkPyDAFRZk7we6Pen1CpNrtgOfIdf6Q gJB7UjAsc4im7VjM/EAwTY87uOiDK/nLIbGQuvX2GiWr69YjXyMBimtNgx3LiyQW+jU8 8+eO5Ak30o4WBW4cGZFUhPuwvq0bOyvn/ALQQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=GvJWw2BgC9h0Lik/35yEYEgTHZbubONxS/6qDcitZUL4MqbQza5unMRdg3U0McINkp gS6rmZvncK5IaOB510iXiLWLF10E3WNqL6+uNCp+E1H08B0FvncuYIqKhg3eIW2rB0wS dUL2wupiLldecX05Uz8fibPry3PixD9KelRp0= Received: by 10.205.24.76 with SMTP id rd12mr2664130bkb.166.1298685455608; Fri, 25 Feb 2011 17:57:35 -0800 (PST) Received: from bicker ([212.49.88.34]) by mx.google.com with ESMTPS id q18sm843133bka.3.2011.02.25.17.57.27 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 Feb 2011 17:57:35 -0800 (PST) Date: Sat, 26 Feb 2011 04:56:53 +0300 From: Dan Carpenter To: "John W. Linville" Cc: Wey-Yi Guy , Meenakshi Venkataraman , Johannes Berg , linux-wireless@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch] iwlwifi: remove duplicate initialization Message-ID: <20110226015653.GC18043@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) 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.6 (demeter1.kernel.org [140.211.167.41]); Sat, 26 Feb 2011 01:57:47 +0000 (UTC) diff --git a/drivers/net/wireless/iwlegacy/iwl-3945-rs.c b/drivers/net/wireless/iwlegacy/iwl-3945-rs.c index 4fabc54..977bd24 100644 --- a/drivers/net/wireless/iwlegacy/iwl-3945-rs.c +++ b/drivers/net/wireless/iwlegacy/iwl-3945-rs.c @@ -644,7 +644,7 @@ static void iwl3945_rs_get_rate(void *priv_r, struct ieee80211_sta *sta, u32 fail_count; s8 scale_action = 0; unsigned long flags; - u16 rate_mask = sta ? sta->supp_rates[sband->band] : 0; + u16 rate_mask; s8 max_rate_idx = -1; struct iwl_priv *priv __maybe_unused = (struct iwl_priv *)priv_r; struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);