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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 181ADC4742C for ; Tue, 3 Nov 2020 20:42:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0E16223BD for ; Tue, 3 Nov 2020 20:42:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436135; bh=K31AiKM4lf3y9OsFSSXO+OA8/ms9ozvs7DuGf0wx9dg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pgBhggOV3ob0dZCmFIpfW6uyP7Qsdl0NYHxni5V7nu6zDWK8zeCYYmN0UmNYEw5uJ owr5Lxcy483YH11Ql7VMG2TEDUnoHjxUGTrJi+bx9BB65qTcRQvHYbB+H7+VPU7t5i ssXMOmXo+y67k9WYi4SKzYSRYdi56O1FiFgAcMqM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730479AbgKCUmO (ORCPT ); Tue, 3 Nov 2020 15:42:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:54330 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730474AbgKCUmN (ORCPT ); Tue, 3 Nov 2020 15:42:13 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 E83C5223AB; Tue, 3 Nov 2020 20:42:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436133; bh=K31AiKM4lf3y9OsFSSXO+OA8/ms9ozvs7DuGf0wx9dg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ivgJMqaVcFlKItVIUG5UXd+zQCqR4NLk9mgVXgm8b/nmZr4BUlz8SnaEN+i9+KsqN uyhXoZ+l548/VsCAEjRzPjV1vkszfUgk7a4PB9Cdj9/CmapFv7LQKlJXIB6ULmFGMs ubRdGGxKXZ0sZ0dq8Dg7O1ugk98F3KFFxQ0sV2S8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Felix Fietkau , Johannes Berg , Sasha Levin Subject: [PATCH 5.9 117/391] mac80211: add missing queue/hash initialization to 802.3 xmit Date: Tue, 3 Nov 2020 21:32:48 +0100 Message-Id: <20201103203354.717436177@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@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: stable@vger.kernel.org From: Felix Fietkau [ Upstream commit 5f8d69eaab1915df97f4f2aca89ea16abdd092d5 ] Fixes AQL for encap-offloaded tx Signed-off-by: Felix Fietkau Link: https://lore.kernel.org/r/20200908123702.88454-2-nbd@nbd.name Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- net/mac80211/tx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index dca01d7e6e3e0..282b0bc201eeb 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -4209,6 +4209,12 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, if (is_zero_ether_addr(ra)) goto out_free; + if (local->ops->wake_tx_queue) { + u16 queue = __ieee80211_select_queue(sdata, sta, skb); + skb_set_queue_mapping(skb, queue); + skb_get_hash(skb); + } + multicast = is_multicast_ether_addr(ra); if (sta) -- 2.27.0