From patchwork Thu Jan 30 18:37:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 232309 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 9E8A4C2D0DB for ; Thu, 30 Jan 2020 18:53:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7282A2082E for ; Thu, 30 Jan 2020 18:53:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580410390; bh=raZIuq08Y4veqZwuoIeXYqAmRzvHguhjRbatfveDZFI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WW23UU05535XQJCwAcRVXLxd7E/VWqnoQpQftlzkl9+Nqe/Pc/k9gQib9dRC53GN0 FA6Nfa8Rq8c7oDh6OlEHK5tWgy0L46pEFSc9cw0drnyVBxQjA19r//qY46DGJu9pEn 1w7dX8ZutsC7PmXSHI2D9E3k5GGhTm7JCZoXcjH4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728033AbgA3SmY (ORCPT ); Thu, 30 Jan 2020 13:42:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:50650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730373AbgA3SmY (ORCPT ); Thu, 30 Jan 2020 13:42:24 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 BF7C8214DB; Thu, 30 Jan 2020 18:42:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580409743; bh=raZIuq08Y4veqZwuoIeXYqAmRzvHguhjRbatfveDZFI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N74lMZQNxcXLevl3TWP1YpYSngFdos6cOjgjcTvUXaiYqkAdOsRvkP4UUJUKEdBKb Q3b85SeOgoaKS/sgcdFb5JlAXDtEuEVepZ7w+P5aBQBXtXQ9EZSO+PI2pcScC7l1/i V6DCuFLqCX2NKUo63kHclypq4Uf2iUkuH7NaSCEk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Malcolm Priestley Subject: [PATCH 5.4 016/110] staging: vt6656: Fix false Tx excessive retries reporting. Date: Thu, 30 Jan 2020 19:37:52 +0100 Message-Id: <20200130183616.605839419@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200130183613.810054545@linuxfoundation.org> References: <20200130183613.810054545@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Malcolm Priestley commit 9dd631fa99dc0a0dfbd191173bf355ba30ea786a upstream. 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(-) --- a/drivers/staging/vt6656/int.c +++ b/drivers/staging/vt6656/int.c @@ -99,9 +99,11 @@ static int vnt_int_report_rate(struct vn 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);