From patchwork Thu Feb 27 07:19:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3730511 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 80ABF9F35F for ; Thu, 27 Feb 2014 07:25:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5FED92020F for ; Thu, 27 Feb 2014 07:25:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4764E20204 for ; Thu, 27 Feb 2014 07:25:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751030AbaB0HZG (ORCPT ); Thu, 27 Feb 2014 02:25:06 -0500 Received: from mail-ea0-f177.google.com ([209.85.215.177]:34455 "EHLO mail-ea0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751026AbaB0HZD (ORCPT ); Thu, 27 Feb 2014 02:25:03 -0500 Received: by mail-ea0-f177.google.com with SMTP id h10so1529762eak.36 for ; Wed, 26 Feb 2014 23:25:00 -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=VHlVNrjVj6+91vV7FUtjZtzbMuNNqrR6U4+2H+iMc9Q=; b=r+A5HF7g8GJHLW2qsZOSyxjjAMEQoyPHE+JY0Gl0KiDoeBHzfuWIUsXQWXxevbJP3R 3OtqYUkC/R0InSIIFpCjE75KLCAnAY8IND5OF4DPGRxmKulSnVONnVie2tLSfWoQcZrX s7Q97XZnkP3/Y9huIYodr8axGsfAZkD2pkjW0= 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=VHlVNrjVj6+91vV7FUtjZtzbMuNNqrR6U4+2H+iMc9Q=; b=Gp8Js9t7m3HAcvZB7r8aFDafXjJ4r/TTAuABXNeNTMkCj7UcizuUY2b3qQ+4seJGLR EXyv1ALTCm0fFJ58uRh95gRz9Azei2SjnUOqC6AKQR4/l/q+MCZ0Vb36hbXGwCi1B1m7 Odr5FqkHEfWGutemMWz+hjICX9Qt95aCb2nigSSTzMXwDQuYErOXD3EjNEOABcMfgIBK S+gAra69F8Nfrmcl/h0Ou4z8s3K1mSkET7KTvuX6sV0ZsThBspNk1TUZHjQSgUPt0cmx FPMk353UzCyXpP+0W+WQXDtMJUzrwRHBL9MZ5c0wAd5bsckY/r8z6xoBgmtUZ2VQO6sS JHyw== X-Gm-Message-State: ALoCoQmvqac3pkTpDpxp27eOYQSEAmPq9dfcl/M+zpqcPGYdMQc/Uuhfa9sLVUid9y9G9v5YywZp4jJ6NXhfhhR/MGNtu8QA/xYBYnfcQ7F8ArhFA9UTf8c= X-Received: by 10.15.93.202 with SMTP id w50mr8051693eez.87.1393485900619; Wed, 26 Feb 2014 23:25:00 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id 43sm13384357eeh.13.2014.02.26.23.24.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Feb 2014 23:25:00 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH v3 2/8] ath10k: remove is_aborted from skb_cb Date: Thu, 27 Feb 2014 08:19:41 +0100 Message-Id: <1393485587-16879-3-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1393485587-16879-1-git-send-email-michal.kazior@tieto.com> References: <1392629563-31046-1-git-send-email-michal.kazior@tieto.com> <1393485587-16879-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=-6.8 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 flag wasn't used anymore. No need to keep it. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/core.h | 1 - drivers/net/wireless/ath/ath10k/pci.c | 20 -------------------- 2 files changed, 21 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h index 082fa77..7cf022d 100644 --- a/drivers/net/wireless/ath/ath10k/core.h +++ b/drivers/net/wireless/ath/ath10k/core.h @@ -62,7 +62,6 @@ struct ath10k; struct ath10k_skb_cb { dma_addr_t paddr; - bool is_aborted; u8 vdev_id; struct { diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 34f0910..d973975 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -63,7 +63,6 @@ static int ath10k_pci_post_rx(struct ath10k *ar); static int ath10k_pci_post_rx_pipe(struct ath10k_pci_pipe *pipe_info, int num); static void ath10k_pci_rx_pipe_cleanup(struct ath10k_pci_pipe *pipe_info); -static void ath10k_pci_stop_ce(struct ath10k *ar); static int ath10k_pci_cold_reset(struct ath10k *ar); static int ath10k_pci_warm_reset(struct ath10k *ar); static int ath10k_pci_wait_for_target_init(struct ath10k *ar); @@ -993,22 +992,6 @@ static void ath10k_pci_kill_tasklet(struct ath10k *ar) tasklet_kill(&ar_pci->pipe_info[i].intr); } -static void ath10k_pci_stop_ce(struct ath10k *ar) -{ - struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); - struct ath10k_pci_compl *compl; - struct sk_buff *skb; - - /* Mark pending completions as aborted, so that upper layers free up - * their associated resources */ - spin_lock_bh(&ar_pci->compl_lock); - list_for_each_entry(compl, &ar_pci->compl_process, list) { - skb = compl->skb; - ATH10K_SKB_CB(skb)->is_aborted = true; - } - spin_unlock_bh(&ar_pci->compl_lock); -} - static void ath10k_pci_cleanup_ce(struct ath10k *ar) { struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); @@ -1339,7 +1322,6 @@ err_stop: ath10k_ce_disable_interrupts(ar); ath10k_pci_free_irq(ar); ath10k_pci_kill_tasklet(ar); - ath10k_pci_stop_ce(ar); ath10k_pci_process_ce(ar); err_free_compl: ath10k_pci_cleanup_ce(ar); @@ -1424,7 +1406,6 @@ static void ath10k_pci_tx_pipe_cleanup(struct ath10k_pci_pipe *pipe_info) continue; } - ATH10K_SKB_CB(netbuf)->is_aborted = true; ar_pci->msg_callbacks_current.tx_completion(ar, netbuf, id); @@ -1482,7 +1463,6 @@ static void ath10k_pci_hif_stop(struct ath10k *ar) ath10k_pci_free_irq(ar); ath10k_pci_kill_tasklet(ar); - ath10k_pci_stop_ce(ar); ret = ath10k_pci_request_early_irq(ar); if (ret)