Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp4707988pxj; Wed, 12 May 2021 11:21:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwp0YMrDWdrTGMELEu3hRpIulM3UmMTXNjpbDpJNol7EeQd+AFoyPBHp91VajP/y2S/E1hv X-Received: by 2002:a05:6830:1184:: with SMTP id u4mr5370924otq.324.1620843713727; Wed, 12 May 2021 11:21:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620843713; cv=none; d=google.com; s=arc-20160816; b=aNvPGY1u1nYIdjV+bdKmeNR+MyRfZn2zlRHWgNfMHH37XrHGHrt9QTqqALit0Ti1dv eD3GYR7VNburvgCyy0xE/BGt2dl1YrNQVIptH4dEwh+beW5W2L+PORHu0g7dHrBljyuZ oC3Hj1ikTPHAtV+cZcKzdDUuoO2sySqglC98sg+3Zl3Rb2DL0Q/PQbJu0idaw1dSnSGa /rMfsgKhlNqyb1Vscs+BGMjIuhW7IKPW5+mKR0Mkp6B4Eq+JA1r9XzSu6SF8d7muX3LJ WzxIA1wkrysH+FkaTUTm6h6UpGsFQRRZXGZdSS5C8XVL7MOLySmvgWZCOeD6FEeDXbeF vwjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NPNBUPnhGB4FamG0hZYqrSZ4xBmyJlDU8bfYll2l2es=; b=MItVGidA0/LiYfAHDW9hj+5obq5uDgHjqO9IxoqwzBQV5lhN790LtHaiQ2mT9m4feE kOJDl2ctZDUouVO+Hd9FZiDEndF+m4G9toYkF//f8I24eB+zS//M3HPbd45JU8WJl5PV QrSEEtVJAvr+wiJC1ZM4fxWB2QS/DjEMgOap/6Tq2+2C4O7Ki39sGenM7WSLilY3DODR 3O1Q8X5mDKFm4SYv/Ho0TkGT+p3pZhtDTVqAq4WTV1tL4EpYk76CJ05E2pZBCDNBNXSM GYzObLpYntGSTCN1fSP4f06gMXB28CCaI9WOw27CMMUgG4YaMYv9VdC3sKII2kRJ5Ie+ xZmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FZspNWbF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id x22si645250oif.184.2021.05.12.11.21.39; Wed, 12 May 2021 11:21:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FZspNWbF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354254AbhELSRG (ORCPT + 99 others); Wed, 12 May 2021 14:17:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:41044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241408AbhELQ1I (ORCPT ); Wed, 12 May 2021 12:27:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D372361DCA; Wed, 12 May 2021 15:52:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620834741; bh=bfeLjlWoxmQI6aTRXkDr8xhztIFcvI7IfAXJUrogBXM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FZspNWbF21ibVsTZfsRejERopav0Uu//yL8qdJJqcz+7pH8LOOXCQSHaSjorJGJ6G ovMReJwmaIeG790BcUe1Lr5TztUvWoRhQCG+dicltepxc2yqfwgIzkD3ubhyGBSEtc oA0tFkX+W0QszjHPRbCr8xiU5uDy7UuAwUB/QTPo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ryder Lee , Felix Fietkau Subject: [PATCH 5.12 064/677] mt76: mt7615: use ieee80211_free_txskb() in mt7615_tx_token_put() Date: Wed, 12 May 2021 16:41:50 +0200 Message-Id: <20210512144839.350869764@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ryder Lee commit 06991d1f73a9bdbc5f234ee96737b9102705b89c upstream. We should use ieee80211_free_txskb() to report skb status avoid wrong aql accounting after reset. Cc: stable@vger.kernel.org Signed-off-by: Ryder Lee Signed-off-by: Felix Fietkau Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c @@ -2000,8 +2000,12 @@ void mt7615_tx_token_put(struct mt7615_d spin_lock_bh(&dev->token_lock); idr_for_each_entry(&dev->token, txwi, id) { mt7615_txp_skb_unmap(&dev->mt76, txwi); - if (txwi->skb) - dev_kfree_skb_any(txwi->skb); + if (txwi->skb) { + struct ieee80211_hw *hw; + + hw = mt76_tx_status_get_hw(&dev->mt76, txwi->skb); + ieee80211_free_txskb(hw, txwi->skb); + } mt76_put_txwi(&dev->mt76, txwi); } spin_unlock_bh(&dev->token_lock);