From patchwork Thu Mar 17 09:51:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 8608941 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0327EC0553 for ; Thu, 17 Mar 2016 09:49:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3278B20306 for ; Thu, 17 Mar 2016 09:49:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4DD3C202FE for ; Thu, 17 Mar 2016 09:49:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935440AbcCQJtE (ORCPT ); Thu, 17 Mar 2016 05:49:04 -0400 Received: from mail-lf0-f41.google.com ([209.85.215.41]:32977 "EHLO mail-lf0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932261AbcCQJtB (ORCPT ); Thu, 17 Mar 2016 05:49:01 -0400 Received: by mail-lf0-f41.google.com with SMTP id h198so38194592lfh.0 for ; Thu, 17 Mar 2016 02:49:00 -0700 (PDT) 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=urpKmWU7d6+td1t5yKMfuVDDEVnEEk26MAFSZxV0944=; b=ohFscvP43Ja+sGvucFiGqNEdZ5eLBdJ0w8HjSrzJtWvHhJkZdHJpKpSbTQ8ChCTuPX NKgn1728OQw9brDg/wS1f/ZTwoAPWDSA5z6Zb0LEqrccBGpQ98RS4vipW1SpMZbhl9gJ +9eyAc2NkW/UfV/95OKwi0jbFLdQA6/LNbQR0= 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=urpKmWU7d6+td1t5yKMfuVDDEVnEEk26MAFSZxV0944=; b=U/Mv3dSF2THZkJKE6gAkT8bwg4UNOntV5C+rFEE9cNsF10Q0BBt4mozXPVjCG5OF6G QO/7tehVZz6jo23fAXrYBuu+KeF+dynuHvrWbtL7NZUO0TjTmsRIoixqmttcgrSw3EQH 1oiablre6TX2lQ3+ShMEU04fow/PsHdJqstO0F0RUHJM1X+03foRsRj9/4I34FfDS4g/ iXIVq9nfb7OUxEedUubCMbBhyydmjtbIgJqO0NQ64aDI1rH7mQZTTVlSwh5OaTtsHe1l DhVE22DB9dpgQesd20FOayZSjp72P8Fq67e1hj2u4j8WXOVz8kks6gdVtM1gWzIhapo/ Ohzg== X-Gm-Message-State: AD7BkJKHZopg22RwobwH8U7dfdGNwy3e8gIhY0c2iRxcRQwreYfLkDdKIPs6LF+1TXoNTeRAmnnEhtAEFC1Mt6hCpR2xC2PLZ84k/ApFIJJ5RnUelInqF9lvEEL3T40hnT192Je0A9+IKA== X-Received: by 10.25.85.145 with SMTP id j139mr3243847lfb.131.1458208139560; Thu, 17 Mar 2016 02:48:59 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.10]) by smtp.gmail.com with ESMTPSA id m64sm1213020lfd.36.2016.03.17.02.48.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Mar 2016 02:48:58 -0700 (PDT) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH 1/2] ath10k: fix tx hang Date: Thu, 17 Mar 2016 10:51:04 +0100 Message-Id: <1458208265-16715-2-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458208265-16715-1-git-send-email-michal.kazior@tieto.com> References: <1458208265-16715-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 wake_tx_queue/push_pending logic had a bug which could stop queues indefinitely effectivelly breaking traffic. Fixes: 299468782d94 ("ath10k: implement wake_tx_queue") Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index ebff9c0a0784..74dd010a9188 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -3779,13 +3779,13 @@ void ath10k_mac_tx_push_pending(struct ath10k *ar) } list_del_init(&artxq->list); + if (ret != -ENOENT) + list_add_tail(&artxq->list, &ar->txqs); + ath10k_htt_tx_txq_update(hw, txq); - if (artxq == last || (ret < 0 && ret != -ENOENT)) { - if (ret != -ENOENT) - list_add_tail(&artxq->list, &ar->txqs); + if (artxq == last || (ret < 0 && ret != -ENOENT)) break; - } } rcu_read_unlock();