From patchwork Tue Nov 4 14:22:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 5228061 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DC3559F3EE for ; Tue, 4 Nov 2014 14:34:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0F31C20166 for ; Tue, 4 Nov 2014 14:34:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B460200F0 for ; Tue, 4 Nov 2014 14:34:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753829AbaKDOeb (ORCPT ); Tue, 4 Nov 2014 09:34:31 -0500 Received: from mail-la0-f48.google.com ([209.85.215.48]:61874 "EHLO mail-la0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752557AbaKDOe2 (ORCPT ); Tue, 4 Nov 2014 09:34:28 -0500 Received: by mail-la0-f48.google.com with SMTP id gq15so959005lab.21 for ; Tue, 04 Nov 2014 06:34:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HbpVacM9TE0ibPTxq+N6Ywyc/+XOJx525ejs+BvIJx0=; b=lxPB3Vlj6I+XQsQ65W6TMv8DQ0ti2Dqp0LY9RxfGMi2TQTmK/N8X1N9u2+pLxoin+Q LWVJzarW/uDx1n167E67JYvXuyaRlx3KYtNW1ulpzyICuQcal9c2OKEzSjkYhv60i9L9 T7kl6MY+Xth//B1p2cF+eJsqtgA2DYfrj6hgs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HbpVacM9TE0ibPTxq+N6Ywyc/+XOJx525ejs+BvIJx0=; b=Bax5m5sfccl98/rL8vVipK733ZDngVatC0DaygOUQslp93j/ItUELVl5lIHCsNid6W 83bY9vzi973cdDRkpys4aUpvnCa8Gpwbk3LpHKOUe1tNjvfMDuuEUqIxWTSTEufTtW9Q /d05BNAwKKIBUIuRZjme5APNORKV39wfi31MDWK4PBV2oRP4Pwvcp7mgI69gnJ1AYrjL RoUVWljXyUgCZsckE+FYkTbUCklBiGRHDzKz2ENmd/GXr9FWGj08PSHQ9Q4pt+mpVCAX 7SQ9+TV1VecCe0sn1decMvROiTNAfFf5Idgliup9zzaza3hUW1jd+qEaxcl3zp8CEuFa q6XA== X-Gm-Message-State: ALoCoQnkriQ78xwnoA7mSblcQarfboopTm64Us1AaMzua++AcVgCaA7v3OWlsmv6p2Lmv4f+SyeYSGl+lDKMi8FHbM85DfhrYVhbQk6pEV0RNDuQsAN4ymPfAC+W4/fPpT0sPbfcbHMZ X-Received: by 10.112.144.228 with SMTP id sp4mr58755561lbb.58.1415111667148; Tue, 04 Nov 2014 06:34:27 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id h9sm217674lae.44.2014.11.04.06.34.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Nov 2014 06:34:26 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH 5/7] ath10k: remove unused function argument Date: Tue, 4 Nov 2014 15:22:09 +0100 Message-Id: <1415110931-10945-6-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1415110931-10945-1-git-send-email-michal.kazior@tieto.com> References: <1415110931-10945-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The original fix has been moved into a different place in the code. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/htt_rx.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c index 6abfea7..55e4568 100644 --- a/drivers/net/wireless/ath/ath10k/htt_rx.c +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c @@ -306,8 +306,7 @@ static inline struct sk_buff *ath10k_htt_rx_netbuf_pop(struct ath10k_htt *htt) /* return: < 0 fatal error, 0 - non chained msdu, 1 chained msdu */ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt, u8 **fw_desc, int *fw_desc_len, - struct sk_buff_head *amsdu, - u32 *attention) + struct sk_buff_head *amsdu) { struct ath10k *ar = htt->ar; int msdu_len, msdu_chaining = 0; @@ -348,11 +347,6 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt, return -EIO; } - *attention |= __le32_to_cpu(rx_desc->attention.flags) & - (RX_ATTENTION_FLAGS_TKIP_MIC_ERR | - RX_ATTENTION_FLAGS_DECRYPT_ERR | - RX_ATTENTION_FLAGS_FCS_ERR | - RX_ATTENTION_FLAGS_MGMT_TYPE); /* * Copy the FW rx descriptor for this MSDU from the rx * indication message into the MSDU's netbuf. HL uses the @@ -1362,7 +1356,6 @@ static void ath10k_htt_rx_handler(struct ath10k_htt *htt, struct htt_rx_indication_mpdu_range *mpdu_ranges; struct sk_buff_head amsdu; int num_mpdu_ranges; - u32 attention; int fw_desc_len; u8 *fw_desc; bool channel_set; @@ -1412,11 +1405,9 @@ static void ath10k_htt_rx_handler(struct ath10k_htt *htt, mpdu_count += mpdu_ranges[i].mpdu_count; while (mpdu_count--) { - attention = 0; __skb_queue_head_init(&amsdu); ret = ath10k_htt_rx_amsdu_pop(htt, &fw_desc, - &fw_desc_len, &amsdu, - &attention); + &fw_desc_len, &amsdu); if (ret < 0) { ath10k_warn(ar, "rx ring became corrupted: %d\n", ret); __skb_queue_purge(&amsdu); @@ -1445,7 +1436,6 @@ static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt, int ret; u8 *fw_desc; int fw_desc_len; - u32 attention = 0; fw_desc_len = __le16_to_cpu(frag->fw_rx_desc_bytes); fw_desc = (u8 *)frag->fw_msdu_rx_desc; @@ -1454,7 +1444,7 @@ static void ath10k_htt_rx_frag_handler(struct ath10k_htt *htt, spin_lock_bh(&htt->rx_ring.lock); ret = ath10k_htt_rx_amsdu_pop(htt, &fw_desc, &fw_desc_len, - &amsdu, &attention); + &amsdu); spin_unlock_bh(&htt->rx_ring.lock); tasklet_schedule(&htt->rx_replenish_task);