Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Message-ID: <537bd31e3dcef148fcc934969c782e0f0c40d711.camel@sipsolutions.net>
Subject: Re: [PATCH] mac80211: fix control port tx status check
From:   Johannes Berg <johannes@sipsolutions.net>
To:     Markus Theil <markus.theil@tu-ilmenau.de>
Cc:     linux-wireless@vger.kernel.org, j@w1.fi
Date:   Mon, 22 Jun 2020 10:33:40 +0200
In-Reply-To: <20200622083054.102643-1-markus.theil@tu-ilmenau.de>
References: <20200622083054.102643-1-markus.theil@tu-ilmenau.de>
Content-Type: text/plain; charset="UTF-8"
User-Agent: Evolution 3.36.3 (3.36.3-1.fc32) 
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk

On Mon, 2020-06-22 at 10:30 +0200, Markus Theil wrote:
> Signed-off-by: Markus Theil <markus.theil@tu-ilmenau.de>
> ---
>  net/mac80211/status.c | 21 ++++++++++++++-------
>  1 file changed, 14 insertions(+), 7 deletions(-)
> 
> diff --git a/net/mac80211/status.c b/net/mac80211/status.c
> index 7b1bacac39c6..88c826645903 100644
> --- a/net/mac80211/status.c
> +++ b/net/mac80211/status.c
> @@ -639,11 +639,22 @@ static void ieee80211_report_ack_skb(struct ieee80211_local *local,
>  		u64 cookie = IEEE80211_SKB_CB(skb)->ack.cookie;
>  		struct ieee80211_sub_if_data *sdata;
>  		struct ieee80211_hdr *hdr = (void *)skb->data;
> +		u16 ethertype = 0xffff;
> +
> +		if (skb->protocol == cpu_to_be16(ETH_P_802_3) && skb->len >= 14)
> +			ethertype = (skb->data[12] << 8) | skb->data[13];

Might be nicer to extract that as __be16 immediately?

johannes