From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 330C5C33C9E for ; Sat, 11 Jan 2020 11:54:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F1B5C2082E for ; Sat, 11 Jan 2020 11:54:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578743674; bh=U3rOzAFzRt03xiHINIhot0aDYP3lsxYKUoZOHKoXa8c=; h=Subject:To:From:Date:List-ID:From; b=S9fvUNp4BcLkEov+qxSxsBGnP7Qt0yVqk1KEigfUx+Rn9YRIrPG+tKxeC//+NK4Gu pME1aptzh1wfTgfH6gWinad+SCXjFJweCfVeOP81rDu5WopvB27nEv3P8xg/8qROZu WFGAjM3kZmE92VfCXd+FAGrX2BWI2mGkZZnsYI6A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729226AbgAKLyd (ORCPT ); Sat, 11 Jan 2020 06:54:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:44472 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726498AbgAKLyd (ORCPT ); Sat, 11 Jan 2020 06:54:33 -0500 Received: from localhost (unknown [89.205.135.211]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5FF4C2082E; Sat, 11 Jan 2020 11:54:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578743673; bh=U3rOzAFzRt03xiHINIhot0aDYP3lsxYKUoZOHKoXa8c=; h=Subject:To:From:Date:From; b=YUSlKcte/7hNTlbD51n+EJgbhfiaNc2B9E/NL4EA8LOHZLbsd0bprhL+trtJBuWY/ O/nDeXW/7LXR50n6le5x1EAMMYQGTvx2PPylpAbHdmEcEA2k4oLz0Bo/DfwR1Kq9gp Vw8dVPoh/9gv6k7e5rDB7/CiTzPB2VI00dzPpcPA= Subject: patch "staging: vt6656: Fix false Tx excessive retries reporting." added to staging-next To: tvboxspy@gmail.com, gregkh@linuxfoundation.org, stable@vger.kernel.org From: Date: Sat, 11 Jan 2020 11:55:20 +0100 Message-ID: <157874012020224@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is a note to let you know that I've just added the patch titled staging: vt6656: Fix false Tx excessive retries reporting. to my staging git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git in the staging-next branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From 9dd631fa99dc0a0dfbd191173bf355ba30ea786a Mon Sep 17 00:00:00 2001 From: Malcolm Priestley Date: Wed, 8 Jan 2020 21:41:36 +0000 Subject: staging: vt6656: Fix false Tx excessive retries reporting. The driver reporting IEEE80211_TX_STAT_ACK is not being handled correctly. The driver should only report on TSR_TMO flag is not set indicating no transmission errors and when not IEEE80211_TX_CTL_NO_ACK is being requested. Cc: stable Signed-off-by: Malcolm Priestley Link: https://lore.kernel.org/r/340f1f7f-c310-dca5-476f-abc059b9cd97@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/int.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c index f40947955675..af215860be4c 100644 --- a/drivers/staging/vt6656/int.c +++ b/drivers/staging/vt6656/int.c @@ -99,9 +99,11 @@ static int vnt_int_report_rate(struct vnt_private *priv, u8 pkt_no, u8 tsr) info->status.rates[0].count = tx_retry; - if (!(tsr & (TSR_TMO | TSR_RETRYTMO))) { + if (!(tsr & TSR_TMO)) { info->status.rates[0].idx = idx; - info->flags |= IEEE80211_TX_STAT_ACK; + + if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) + info->flags |= IEEE80211_TX_STAT_ACK; } ieee80211_tx_status_irqsafe(priv->hw, context->skb); -- 2.24.1