[V4,2/3] brcmfmac: detect firmware support for radiotap monitor frames

Commit Message

Rafał Miłecki June 24, 2018, 7:44 p.m. UTC

From: Rafał Miłecki <[e-mail]>

Depending on used build-time options some firmwares may already include
radiotap header in passed monitor frames. Add a new feature flag to
store info about it. It's needed for proper handling of received frames
before passing them up.

Signed-off-by: Rafał Miłecki <[e-mail]>
Signed-off-by: Arend van Spriel <[e-mail]>
---
V4: Patch extracted out of:
    [PATCH V3 2/2] brcmfmac: handle monitor mode marked msgbuf packets
    Added mapping for the "rtap" string as reported by Arend
    Updated new feature flag description as preferred by Arend
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c | 1 +
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

Comments

Kalle Valo June 29, 2018, 7:03 a.m. UTC | #1

Rafał Miłecki <[e-mail]> writes:

> From: Rafał Miłecki <[e-mail]>
>
> Depending on used build-time options some firmwares may already include
> radiotap header in passed monitor frames. Add a new feature flag to
> store info about it. It's needed for proper handling of received frames
> before passing them up.
>
> Signed-off-by: Rafał Miłecki <[e-mail]>
> Signed-off-by: Arend van Spriel <[e-mail]>

BTW, we now have Co-Developed-by:

https://www.kernel.org/doc/html/latest/process/submitting-patches.html#when-to-use-acked-by-cc-and-co-developed-by

But no need to change this patch, just a tip for the future. I assume
this patchset is good to go and will apply it soon.

Rafał Miłecki June 29, 2018, 7:06 a.m. UTC | #2

On 2018-06-29 09:03, Kalle Valo wrote:
> Rafał Miłecki <[e-mail]> writes:
> 
>> From: Rafał Miłecki <[e-mail]>
>> 
>> Depending on used build-time options some firmwares may already 
>> include
>> radiotap header in passed monitor frames. Add a new feature flag to
>> store info about it. It's needed for proper handling of received 
>> frames
>> before passing them up.
>> 
>> Signed-off-by: Rafał Miłecki <[e-mail]>
>> Signed-off-by: Arend van Spriel <[e-mail]>
> 
> BTW, we now have Co-Developed-by:
> 
> https://www.kernel.org/doc/html/latest/process/submitting-patches.html#when-to-use-acked-by-cc-and-co-developed-by
> 
> But no need to change this patch, just a tip for the future. I assume
> this patchset is good to go and will apply it soon.

Nice to know, thanks!

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
index a78b9bae44e0..4db4d444407a 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
@@ -49,6 +49,7 @@  static const struct brcmf_feat_fwcap brcmf_fwcap_map[] = {
 	{ BRCMF_FEAT_MCHAN, "mchan" },
 	{ BRCMF_FEAT_P2P, "p2p" },
 	{ BRCMF_FEAT_MONITOR, "monitor" },
+	{ BRCMF_FEAT_MONITOR_FMT_RADIOTAP, "rtap" },
 };
 
 #ifdef DEBUG
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
index 3415d5d4d6b5..0b4974df353a 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
@@ -34,6 +34,7 @@ 
  * GSCAN: enhanced scan offload feature.
  * FWSUP: Firmware supplicant.
  * MONITOR: firmware can pass monitor packets to host.
+ * MONITOR_FMT_RADIOTAP: firmware provides monitor packets with radiotap header
  */
 #define BRCMF_FEAT_LIST \
 	BRCMF_FEAT_DEF(MBSS) \
@@ -50,7 +51,8 @@ 
 	BRCMF_FEAT_DEF(MFP) \
 	BRCMF_FEAT_DEF(GSCAN) \
 	BRCMF_FEAT_DEF(FWSUP) \
-	BRCMF_FEAT_DEF(MONITOR)
+	BRCMF_FEAT_DEF(MONITOR) \
+	BRCMF_FEAT_DEF(MONITOR_FMT_RADIOTAP)
 
 /*
  * Quirks: