From patchwork Mon Feb 17 09:32:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3661511 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 48FA59F38B for ; Mon, 17 Feb 2014 09:38:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5DC2820131 for ; Mon, 17 Feb 2014 09:38:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 77DFE20160 for ; Mon, 17 Feb 2014 09:38:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752534AbaBQJiA (ORCPT ); Mon, 17 Feb 2014 04:38:00 -0500 Received: from mail-ee0-f54.google.com ([74.125.83.54]:37985 "EHLO mail-ee0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752478AbaBQJhz (ORCPT ); Mon, 17 Feb 2014 04:37:55 -0500 Received: by mail-ee0-f54.google.com with SMTP id e53so6883910eek.41 for ; Mon, 17 Feb 2014 01:37:53 -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=jtdz5T+e4l840UdKeLrJWDes8DN1lunw6V/o1XW/uXPYy7W3XFLM4xJa+hTDWeECzP BdC9otVDskFpagGXJm/SikMiUCi5tbOLEzmvXSThmDnuGXDXX4pv+S0ioo3YFTyfS+4g wNSeTHvLk9cmQhajYUWL9vDvm9/qHu1LnoZgs= 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=mx+IKHlmQDSPRqc8uwA/5pgXVT0bphfR8AscM0NeUWovUP60SuPgbNYUh8CD+YBzc6 YpyLyEqwzyBu+Ub6ZWjExIQm9hToYcWclEjz++An0cacbo3ufKotxyBUWFjuNj/h9l1s Z5I6AheYGLoYGzVzldm1PLE6OBxQgzNl/l4fEhJRUMxAVdmmH60CVaEK1ROsSZB2gA5i MRsSNhxHuBn5Y4hz2e25rCQ4b6xenljExapaPL2XH6/6GcW2y2J0vTAIo9ZwAyWCX9BO XzO5D2kWBi738w3OubCk/dNEeaDRuRecKxAIBKTgA2eXsn4i/hqrCsxh3UjEaQFf8B4K y4Zg== X-Gm-Message-State: ALoCoQlYVr4RP/qn4qDjAY48rdg66wmm9pFfJTw1tkE5bMoSKUxZQLJg/749Cp5eLeVs8UyNT9Wgj26toeUrPiBVQEoDx9W+IOs0rh1b+JsMQPRfA8fLJOA= X-Received: by 10.14.8.7 with SMTP id 7mr1631195eeq.56.1392629873877; Mon, 17 Feb 2014 01:37:53 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id k6sm55287465eep.17.2014.02.17.01.37.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Feb 2014 01:37:53 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [RFC/RFT 2/7] ath10k: remove is_aborted from skb_cb Date: Mon, 17 Feb 2014 10:32:38 +0100 Message-Id: <1392629563-31046-3-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392629563-31046-1-git-send-email-michal.kazior@tieto.com> References: <1392629563-31046-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.3 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)