From: Johannes Berg <johannes@sipsolutions.net>
To: Markus Theil <markus.theil@tu-ilmenau.de>
Cc: linux-wireless@vger.kernel.org, j@w1.fi,
kernel test robot <lkp@intel.com>
Subject: Re: [PATCH v4] mac80211: fix control port tx status check
Date: Thu, 25 Jun 2020 10:49:26 +0200 [thread overview]
Message-ID: <caca45b225b3b5cc17c494d9c5d67a18c593c3ce.camel@sipsolutions.net> (raw)
In-Reply-To: <20200625084831.5094-1-markus.theil@tu-ilmenau.de>
On Thu, 2020-06-25 at 10:48 +0200, Markus Theil wrote:
> The initial control port tx status patch assumed, that
> we have IEEE 802.11 frames, but actually ethernet frames
> are stored in the ack skb. Fix this by checking for the
> correct ethertype and skb protocol 802.3.
>
> Also allow tx status reports for ETH_P_PREAUTH, as preauth
> frames can also be send over the nl80211 control port.
>
> Fixes: a7528198add8 ("mac80211: support control port TX status reporting")
> Reported-by: kernel test robot <lkp@intel.com>
> Reported-by: Jouni Malinen <j@w1.fi>
> Signed-off-by: Markus Theil <markus.theil@tu-ilmenau.de>
> ---
> v4: add cast, reported by Intel kernel test robot
> v3: also check for ETH_P_PREAUTH
> v2: use __be16, as suggested by Johannes Berg
> net/mac80211/status.c | 22 +++++++++++++++-------
> 1 file changed, 15 insertions(+), 7 deletions(-)
>
> diff --git a/net/mac80211/status.c b/net/mac80211/status.c
> index 7b1bacac39c6..d6edd3acda0a 100644
> --- a/net/mac80211/status.c
> +++ b/net/mac80211/status.c
> @@ -639,11 +639,23 @@ 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;
> + __be16 ethertype = (__be16)0xffff;
If anything, that should've been "cpu_to_be16(0xffff)" but I was just
applying this and changing it to 0 instead (which sparse knows about).
johannes
next prev parent reply other threads:[~2020-06-25 8:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-25 8:48 [PATCH v4] mac80211: fix control port tx status check Markus Theil
2020-06-25 8:49 ` Johannes Berg [this message]
2020-06-25 8:50 ` Markus Theil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=caca45b225b3b5cc17c494d9c5d67a18c593c3ce.camel@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=j@w1.fi \
--cc=linux-wireless@vger.kernel.org \
--cc=lkp@intel.com \
--cc=markus.theil@tu-ilmenau.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox