Return-path: Received: from mail-bw0-f21.google.com ([209.85.218.21]:61458 "EHLO mail-bw0-f21.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750892AbYLRQ1U (ORCPT ); Thu, 18 Dec 2008 11:27:20 -0500 Received: by bwz14 with SMTP id 14so1906548bwz.13 for ; Thu, 18 Dec 2008 08:27:18 -0800 (PST) Message-ID: <1ba2fa240812180827nf1c27d1jb20ee8b0b1f04b62@mail.gmail.com> (sfid-20081218_172725_363773_6D4AF583) Date: Thu, 18 Dec 2008 18:27:17 +0200 From: "Tomas Winkler" To: "Rami Rosen" Subject: Re: [PATCH] [v4] iwlwifi: iwl-tx.c cleanup (remove unused parameter and unused local variable). Cc: "John W. Linville" , linux-wireless@vger.kernel.org, reinette.chatre@intel.com In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 References: Sender: linux-wireless-owner@vger.kernel.org List-ID: On Thu, Dec 18, 2008 at 6:04 PM, Rami Rosen wrote: > This patch removes unused parameter and unused local variable in > methods in iwl-tx.c: > > - Remove a parameter (is_unicast) from iwl_tx_cmd_build_basic(). > > - Remove an unused variable name unicast from iwl_tx_skb(). > > (wireless-testing). > > Signed-off-by: Rami Rosen Ack Tomas > > diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c > b/drivers/net/wireless/iwlwifi/iwl-tx.c > index 3cb4363..43dcfe3 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-tx.c > +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c > @@ -645,7 +645,7 @@ static void iwl_tx_cmd_build_basic(struct iwl_priv *priv, > struct iwl_tx_cmd *tx_cmd, > struct ieee80211_tx_info *info, > struct ieee80211_hdr *hdr, > - int is_unicast, u8 std_id) > + u8 std_id) > { > __le16 fc = hdr->frame_control; > __le32 tx_flags = tx_cmd->tx_flags; > @@ -834,7 +834,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) > u16 len, len_org; > u16 seq_number = 0; > __le16 fc; > - u8 hdr_len, unicast; > + u8 hdr_len; > u8 sta_id; > u8 wait_write_ptr = 0; > u8 tid = 0; > @@ -854,8 +854,6 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) > goto drop_unlock; > } > > - unicast = !is_multicast_ether_addr(hdr->addr1); > - > fc = hdr->frame_control; > > #ifdef CONFIG_IWLWIFI_DEBUG > @@ -996,7 +994,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) > len = (u16)skb->len; > tx_cmd->len = cpu_to_le16(len); > /* TODO need this for burst mode later on */ > - iwl_tx_cmd_build_basic(priv, tx_cmd, info, hdr, unicast, sta_id); > + iwl_tx_cmd_build_basic(priv, tx_cmd, info, hdr, sta_id); > > /* set is_hcca to 0; it probably will never be implemented */ > iwl_tx_cmd_build_rate(priv, tx_cmd, info, fc, sta_id, 0); > > > On Thu, Dec 18, 2008 at 5:31 PM, John W. Linville > wrote: >> On Thu, Dec 18, 2008 at 12:42:37AM +0200, Tomas Winkler wrote: >>> On Wed, Dec 17, 2008 at 11:51 PM, Rami Rosen wrote: >>> > This patch removes unused parameters in methods in iwl-tx.c: >>> > remove a parameter (is_unicast) from iwl_tx_cmd_build_basic() >>> > remove a parameter (sta_id) from iwl_tx_cmd_build_rate() >>> > remove a parameter (sta_id ) from iwl_tx_cmd_build_hwcrypto() >>> >>> Unicast can go sta_id has to stay, we need it for merging 3945 back >> >> OK, I'll drop this patch and wait for a new submission. >> >> John >> -- >> John W. Linville Linux should be at the core >> linville@tuxdriver.com of your literate lifestyle. >> >