From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 18B831D043E; Wed, 2 Oct 2024 13:57:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727877436; cv=none; b=uxBXLbf4Wcwu9wZqCCwQz6uAfFZm162QQSOYn2x0oY2aG0aEpCLKIz9FHBG6Nr/ngp+vMDukGHQmUe1NhrspohTDzRs1EsqhBzyJhxsJ72j/JIhIOpVFlHo4ZlU92Nh/KiaSVh+lLm5OMZ4X36vE3EzC9Cqfz4P2wpbzlKnAo78= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727877436; c=relaxed/simple; bh=zTHochUoKGAxUx2TfTrPJI56pJ8JYpowpa4TdF7shc4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d3553JZEDJw4cnFW/8kDx4CoDc294dsPmSlhwo72FqlU9MPDLF5pXajZyr8n/cEQg0DrTT3ZtimJda7iWJWXn8J7ICgR4c2TrpRbbVF7J4S2QZ15sveSnzLGScMd/RdSNfSyGSBYu9soQDElB6wSe43xNRdOPmahigTLvxkgE2I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xp/++obO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xp/++obO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90353C4CEC2; Wed, 2 Oct 2024 13:57:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727877436; bh=zTHochUoKGAxUx2TfTrPJI56pJ8JYpowpa4TdF7shc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xp/++obOuvk+jXepyccWUCOXDLPC9RdgHAsKUJxwjA+990vh894nqANhjxNNQRJbg t1KbloTKfOGvv2Fw9WEkC4W6f/0SP1wN0k7tw2OfW8zeNvRfQ3vlT9v5m3bdyuMQMq OFMwPfXyqauJP/XGq0PFzenwiVHZEcCZiOrv/Wd4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Felix Fietkau , Sasha Levin Subject: [PATCH 6.10 078/634] wifi: mt76: mt7603: fix mixed declarations and code Date: Wed, 2 Oct 2024 14:52:58 +0200 Message-ID: <20241002125814.188120907@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125811.070689334@linuxfoundation.org> References: <20241002125811.070689334@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Felix Fietkau [ Upstream commit 9b8d932053b8b45d650360b36f701cf0f9b6470e ] Move the qid variable declaration further up Fixes: b473c0e47f04 ("wifi: mt76: mt7603: fix tx queue of loopback packets") Link: https://patch.msgid.link/20240827093011.18621-1-nbd@nbd.name Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c index 14304b0637158..e238161dfaa97 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c +++ b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c @@ -29,7 +29,7 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb) struct ieee80211_sta *sta; struct mt7603_sta *msta; struct mt76_wcid *wcid; - u8 tid = 0, hwq = 0; + u8 qid, tid = 0, hwq = 0; void *priv; int idx; u32 val; @@ -57,7 +57,7 @@ mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb) if (ieee80211_is_data_qos(hdr->frame_control)) { tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TAG1D_MASK; - u8 qid = tid_to_ac[tid]; + qid = tid_to_ac[tid]; hwq = wmm_queue_map[qid]; skb_set_queue_mapping(skb, qid); } else if (ieee80211_is_data(hdr->frame_control)) { -- 2.43.0