brcmfmac: support monitor frames with hardware/ucode header
PATCH 1/1 brcmfmac: support monitor frames with hardware/ucode header
From: Rafał Miłecki <[email protected]>
The new FullMAC firmwares for 4366b1/4366c0 were supposed to provide monitor frames with radiotap header but it doesn't seem to be the case. Testing the latest release resulted in discovering a new format being used. It seems (almost?) identical to the one known from ucode used in SoftMAC devices which is most likely the same codebase anyway.
While radiotap support was meant to be announced with the "rtap" fw capability string it seems no alternative was added for the hw/ucode format. It means each firmware requires a feature mapping quirk.
As for now only an empty radiotap is being created. Adding support for extracting some info (band, channel, signal, etc.) is planned for the future.
--- .../broadcom/brcm80211/brcmfmac/core.c | 55 +++++++++++++++++++ .../broadcom/brcm80211/brcmfmac/feature.c | 4 ++ .../broadcom/brcm80211/brcmfmac/feature.h | 4 +- 3 files changed, 62 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +55 -0
@@ -43,6 +43,36 @@#define BRCMF_BSSIDX_INVALID -1 +#define RXS_PBPRES BIT(2) + +#define D11_PHY_HDR_LEN 6 + +struct d11rxhdr_le { +__le16 RxFrameSize; +u16 PAD; +__le16 PhyRxStatus_0; +__le16 PhyRxStatus_1; +__le16 PhyRxStatus_2; +__le16 PhyRxStatus_3; +__le16 PhyRxStatus_4; +__le16 PhyRxStatus_5; +__le16 RxStatus1; +__le16 RxStatus2; +__le16 RxTSFTime; +__le16 RxChan; +u8 unknown[12 ]; +} __packed; + +struct wlc_d11rxhdr { +struct d11rxhdr_le rxhdr; +__le32 tsf_l; +s8 rssi; +s8 rxpwr0; +s8 rxpwr1; +s8 do_rssi_ma; +s8 rxpwr[4 ]; +} __packed; +char *brcmf_ifname (struct brcmf_if *ifp) {if (!ifp)
@@ -409,6 +439,31 @@ void brcmf_netif_mon_rx(struct brcmf_if *ifp, struct sk_buff *skb) {if (brcmf_feat_is_enabled (ifp,BRCMF_FEAT_MONITOR_FMT_RADIOTAP )) {/* Do nothing */ + }else if (brcmf_feat_is_enabled (ifp,BRCMF_FEAT_MONITOR_FMT_HW_RX_HDR )) { +struct wlc_d11rxhdr *wlc_rxhdr = (struct wlc_d11rxhdr *)skb->data; +struct ieee80211_radiotap_header *radiotap; +unsigned int offset; +u16 RxStatus1; + + RxStatus1 =le16_to_cpu (wlc_rxhdr->rxhdr.RxStatus1); + + offset =sizeof (struct wlc_d11rxhdr ); +/* MAC inserts 2 pad bytes for a4 headers or QoS or A-MSDU +* subframes +*/ +if (RxStatus1 &RXS_PBPRES ) + offset +=2 ; + offset +=D11_PHY_HDR_LEN ; + +skb_pull (skb, offset); + +/* TODO: use RX header to fill some radiotap data */ + radiotap =skb_push (skb,sizeof (*radiotap)); +memset (radiotap,0 ,sizeof (*radiotap)); + radiotap->it_len =cpu_to_le16 (sizeof (*radiotap)); + +/* TODO: 4 bytes with receive status? */ + skb->len -=4 ; }else {struct ieee80211_radiotap_header *radiotap;
drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c +4 -0
@@ -103,6 +103,10 @@ static const struct brcmf_feat_fwfeat brcmf_feat_fwfeat_map[] = { { "01-6cb8e269", BIT(BRCMF_FEAT_MONITOR) },/* brcmfmac4366b-pcie.bin from linux-firmware.git commit 52442afee990 */ { "01-c47a91a4", BIT(BRCMF_FEAT_MONITOR) }, +/* brcmfmac4366b-pcie.bin from linux-firmware.git commit 211de1679a68 */ + { "01-801fb449", BIT(BRCMF_FEAT_MONITOR_FMT_HW_RX_HDR) }, +/* brcmfmac4366c-pcie.bin from linux-firmware.git commit 211de1679a68 */ + { "01-d2cbb8fd", BIT(BRCMF_FEAT_MONITOR_FMT_HW_RX_HDR) }, };static void brcmf_feat_firmware_overrides (struct brcmf_pub *drv)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h +3 -1
@@ -35,6 +35,7 @@* FWSUP: Firmware supplicant. * MONITOR: firmware can pass monitor packets to host. * MONITOR_FMT_RADIOTAP: firmware provides monitor packets with radiotap header +* MONITOR_FMT_HW_RX_HDR: firmware provides monitor packets with hw/ucode header */ #define BRCMF_FEAT_LIST \ BRCMF_FEAT_DEF(MBSS) \
@@ -52,7 +53,8 @@ BRCMF_FEAT_DEF(GSCAN) \ BRCMF_FEAT_DEF(FWSUP) \ BRCMF_FEAT_DEF(MONITOR) \ - BRCMF_FEAT_DEF(MONITOR_FMT_RADIOTAP) + BRCMF_FEAT_DEF(MONITOR_FMT_RADIOTAP) \ + BRCMF_FEAT_DEF(MONITOR_FMT_HW_RX_HDR)/* * Quirks:
Signature · 1 line
2.20.1
Arend Van Spriel
maintainerQuoted 4 lines · Rafał Miłecki
From: Rafał Miłecki <[email protected]>
The new FullMAC firmwares for 4366b1/4366c0 were supposed to provide monitor frames with radiotap header but it doesn't seem to be the case.
I was not aware that this was supposed to. I did not build a radiotap variant to keep it feature-wise similar to 4366b0 firmware.
Quoted 3 lines
Testing the latest release resulted in discovering a new format being used. It seems (almost?) identical to the one known from ucode used in SoftMAC devices which is most likely the same codebase anyway.
I am a bit confused. How many formats are there? It is either ucode format or radiotap, right?
Quoted 3 lines
While radiotap support was meant to be announced with the "rtap" fw capability string it seems no alternative was added for the hw/ucode format. It means each firmware requires a feature mapping quirk.
I thought we only needed a quirk for the firmware that provide radiotap but do not announce it. For the others we can assume ucode format if monitor mode is supported. Probably missing something.
Regards,
Arend
Quoted 8 lines · Arend Van Spriel
Quoted 4 lines · Rafał Miłecki
From: Rafał Miłecki <[email protected]>
The new FullMAC firmwares for 4366b1/4366c0 were supposed to provide monitor frames with radiotap header but it doesn't seem to be the case.
I was not aware that this was supposed to. I did not build a radiotap variant to keep it feature-wise similar to 4366b0 firmware.
Well, then apparently I got confused :( When you wrote:
Quoted 5 lines · Arend van Spriel
Looking into our firmware repo it there are two flags, ie.
WL_MONITORandWL_RADIOTAP. It seems both are set for firmware containing -stamon- feature. Your list below confirms that. I still plan to add indication forWL_RADIOTAPin the "cap" iovar, but a stamon feature check could be used for older firmwares.
I assumed you'll add "rtap" cap value (to the internal wl code repository?) because you mean to release a firmware using it.
Maybe you just meant it to be for your customers compiling firmwares on their own?
Quoted 6 lines
Quoted 3 lines
Testing the latest release resulted in discovering a new format being used. It seems (almost?) identical to the one known from ucode used in SoftMAC devices which is most likely the same codebase anyway.
I am a bit confused. How many formats are there? It is either ucode format or radiotap, right?
So far we got two formats:
1) 802.11 frames (with frame (sub)type & all addresses)
2) 802.11 frames with the radiotap header
and now we also have:
3) 802.11 frames with the ucode header
For more info please check my original post:
Research + questions on brcmfmac and support for monitor mode
https://www.spinics.net/lists/linux-wireless/msg173573.html
Quoted 7 lines
Quoted 3 lines
While radiotap support was meant to be announced with the "rtap" fw capability string it seems no alternative was added for the hw/ucode format. It means each firmware requires a feature mapping quirk.
I thought we only needed a quirk for the firmware that provide radiotap but do not announce it. For the others we can assume ucode format if monitor mode is supported. Probably missing something.
802.11 frames with ucode header is something entirely new, I didn't see any Asus/Linksys/Netgear/TP-LINK firmware using it.
As the old firmwares were providing frames without any header (also making it impossible to e.g. read signal strength) we need this new flag to distinguish firmwares with ucode header from them.
Arend Van Spriel
maintainerQuoted 19 lines · Rafał Miłecki
Quoted 8 lines · Arend Van Spriel
Quoted 4 lines · Rafał Miłecki
From: Rafał Miłecki <[email protected]>
The new FullMAC firmwares for 4366b1/4366c0 were supposed to provide monitor frames with radiotap header but it doesn't seem to be the case.
I was not aware that this was supposed to. I did not build a radiotap variant to keep it feature-wise similar to 4366b0 firmware.
Well, then apparently I got confused :( When you wrote:
Quoted 5 lines · Arend van Spriel
Looking into our firmware repo it there are two flags, ie.
WL_MONITORandWL_RADIOTAP. It seems both are set for firmware containing -stamon- feature. Your list below confirms that. I still plan to add indication forWL_RADIOTAPin the "cap" iovar, but a stamon feature check could be used for older firmwares.
Quoted 5 lines
I assumed you'll add "rtap" cap value (to the internal wl code repository?) because you mean to release a firmware using it.
Maybe you just meant it to be for your customers compiling firmwares on their own?
and for customer for whom we compile firmwares based on their feature requirements. Anyway, I could build a new firmware for 4366b1/4366c0 including radiotap. However, end-users may get to use firmware that is not supporting it.
Quoted 13 lines
Quoted 6 lines
Quoted 3 lines
Testing the latest release resulted in discovering a new format being used. It seems (almost?) identical to the one known from ucode used in SoftMAC devices which is most likely the same codebase anyway.
I am a bit confused. How many formats are there? It is either ucode format or radiotap, right?
So far we got two formats:
1) 802.11 frames (with frame (sub)type & all addresses)
2) 802.11 frames with the radiotap header
and now we also have:
3) 802.11 frames with the ucode header
Quoted 3 lines
For more info please check my original post:
Research + questions on brcmfmac and support for monitor mode
https://www.spinics.net/lists/linux-wireless/msg173573.html
I did read that before, but apparently did miss some details.
Quoted 8 lines
Quoted 7 lines
Quoted 3 lines
While radiotap support was meant to be announced with the "rtap" fw capability string it seems no alternative was added for the hw/ucode format. It means each firmware requires a feature mapping quirk.
I thought we only needed a quirk for the firmware that provide radiotap but do not announce it. For the others we can assume ucode format if monitor mode is supported. Probably missing something.
Quoted 6 lines
802.11 frames with ucode header is something entirely new, I didn't see any Asus/Linksys/Netgear/TP-LINK firmware using it.
As the old firmwares were providing frames without any header (also making it impossible to e.g. read signal strength) we need this new flag to distinguish firmwares with ucode header from them.
Right. Thanks for explaining (again).
Regards,
Arend
Quoted 12 lines · Rafał Miłecki
From: Rafał Miłecki <[email protected]>
The new FullMAC firmwares for 4366b1/4366c0 were supposed to provide monitor frames with radiotap header but it doesn't seem to be the case. Testing the latest release resulted in discovering a new format being used. It seems (almost?) identical to the one known from ucode used in SoftMAC devices which is most likely the same codebase anyway.
While radiotap support was meant to be announced with the "rtap" fw capability string it seems no alternative was added for the hw/ucode format. It means each firmware requires a feature mapping quirk.
Quoted 5 lines
As for now only an empty radiotap is being created. Adding support for extracting some info (band, channel, signal, etc.) is planned for the future.
Signed-off-by Rafał Miłecki <[email protected]>
It's unclear what I should do with this patch, take it?
Signature · 3 lines
https://patchwork.kernel.org/patch/10775371/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 14 lines · Kalle Valo
Quoted 12 lines · Rafał Miłecki
From: Rafał Miłecki <[email protected]>
The new FullMAC firmwares for 4366b1/4366c0 were supposed to provide monitor frames with radiotap header but it doesn't seem to be the case. Testing the latest release resulted in discovering a new format being used. It seems (almost?) identical to the one known from ucode used in SoftMAC devices which is most likely the same codebase anyway.
While radiotap support was meant to be announced with the "rtap" fw capability string it seems no alternative was added for the hw/ucode format. It means each firmware requires a feature mapping quirk.
Quoted 7 lines
Quoted 5 lines
As for now only an empty radiotap is being created. Adding support for extracting some info (band, channel, signal, etc.) is planned for the future.
Signed-off-by Rafał Miłecki <[email protected]>It's unclear what I should do with this patch, take it?
It seems to me there are no objections regarding the code. It was only my commit message that was a bit confusing. I'll send V2 with updated commit message.
Signature · 1 line
Rafał
PATCH v2 1/1 brcmfmac: support monitor frames with the hardware/ucode header
In reply to Rafał MiłeckiFrom: Rafał Miłecki <[email protected]>
So far there were two monitor frame formats:
1) 802.11 frames (with frame (sub)type & all addresses)
2) 802.11 frames with the radiotap header
Testing the latest FullMAC firmwares for 4366b1/4366c0 resulted in discovering a new format being used. It seems (almost?) identical to the one known from ucode used in SoftMAC devices which is most likely the same codebase anyway.
While new firmwares will /announce/ radiotap header support using the "rtap" fw capability string it seems no string was added for the new ucode header format.
All above means that:
1) We need new format support when dealing with a received frame
2) A new feature bit & mapping quirks have to be added manually
As for now only an empty radiotap is being created. Adding support for extracting some info (band, channel, signal, etc.) is planned for the future.
---
V2: Update commit message (only):
1) Don't say the new firmwares were expected to provide radiotap frames. That was my misinterpretation of adding "rtap" string.
2) List all monitor frame formats as it apparently got a bit confusing at this point (there are 3 different ones!).
--- .../broadcom/brcm80211/brcmfmac/core.c | 55 +++++++++++++++++++ .../broadcom/brcm80211/brcmfmac/feature.c | 4 ++ .../broadcom/brcm80211/brcmfmac/feature.h | 4 +- 3 files changed, 62 insertions(+), 1 deletion(-)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +55 -0
@@ -43,6 +43,36 @@#define BRCMF_BSSIDX_INVALID -1 +#define RXS_PBPRES BIT(2) + +#define D11_PHY_HDR_LEN 6 + +struct d11rxhdr_le { +__le16 RxFrameSize; +u16 PAD; +__le16 PhyRxStatus_0; +__le16 PhyRxStatus_1; +__le16 PhyRxStatus_2; +__le16 PhyRxStatus_3; +__le16 PhyRxStatus_4; +__le16 PhyRxStatus_5; +__le16 RxStatus1; +__le16 RxStatus2; +__le16 RxTSFTime; +__le16 RxChan; +u8 unknown[12 ]; +} __packed; + +struct wlc_d11rxhdr { +struct d11rxhdr_le rxhdr; +__le32 tsf_l; +s8 rssi; +s8 rxpwr0; +s8 rxpwr1; +s8 do_rssi_ma; +s8 rxpwr[4 ]; +} __packed; +char *brcmf_ifname (struct brcmf_if *ifp) {if (!ifp)
@@ -409,6 +439,31 @@ void brcmf_netif_mon_rx(struct brcmf_if *ifp, struct sk_buff *skb) {if (brcmf_feat_is_enabled (ifp,BRCMF_FEAT_MONITOR_FMT_RADIOTAP )) {/* Do nothing */ + }else if (brcmf_feat_is_enabled (ifp,BRCMF_FEAT_MONITOR_FMT_HW_RX_HDR )) { +struct wlc_d11rxhdr *wlc_rxhdr = (struct wlc_d11rxhdr *)skb->data; +struct ieee80211_radiotap_header *radiotap; +unsigned int offset; +u16 RxStatus1; + + RxStatus1 =le16_to_cpu (wlc_rxhdr->rxhdr.RxStatus1); + + offset =sizeof (struct wlc_d11rxhdr ); +/* MAC inserts 2 pad bytes for a4 headers or QoS or A-MSDU +* subframes +*/ +if (RxStatus1 &RXS_PBPRES ) + offset +=2 ; + offset +=D11_PHY_HDR_LEN ; + +skb_pull (skb, offset); + +/* TODO: use RX header to fill some radiotap data */ + radiotap =skb_push (skb,sizeof (*radiotap)); +memset (radiotap,0 ,sizeof (*radiotap)); + radiotap->it_len =cpu_to_le16 (sizeof (*radiotap)); + +/* TODO: 4 bytes with receive status? */ + skb->len -=4 ; }else {struct ieee80211_radiotap_header *radiotap;
drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c +4 -0
@@ -103,6 +103,10 @@ static const struct brcmf_feat_fwfeat brcmf_feat_fwfeat_map[] = { { "01-6cb8e269", BIT(BRCMF_FEAT_MONITOR) },/* brcmfmac4366b-pcie.bin from linux-firmware.git commit 52442afee990 */ { "01-c47a91a4", BIT(BRCMF_FEAT_MONITOR) }, +/* brcmfmac4366b-pcie.bin from linux-firmware.git commit 211de1679a68 */ + { "01-801fb449", BIT(BRCMF_FEAT_MONITOR_FMT_HW_RX_HDR) }, +/* brcmfmac4366c-pcie.bin from linux-firmware.git commit 211de1679a68 */ + { "01-d2cbb8fd", BIT(BRCMF_FEAT_MONITOR_FMT_HW_RX_HDR) }, };static void brcmf_feat_firmware_overrides (struct brcmf_pub *drv)
drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h +3 -1
@@ -35,6 +35,7 @@* FWSUP: Firmware supplicant. * MONITOR: firmware can pass monitor packets to host. * MONITOR_FMT_RADIOTAP: firmware provides monitor packets with radiotap header +* MONITOR_FMT_HW_RX_HDR: firmware provides monitor packets with hw/ucode header */ #define BRCMF_FEAT_LIST \ BRCMF_FEAT_DEF(MBSS) \
@@ -52,7 +53,8 @@ BRCMF_FEAT_DEF(GSCAN) \ BRCMF_FEAT_DEF(FWSUP) \ BRCMF_FEAT_DEF(MONITOR) \ - BRCMF_FEAT_DEF(MONITOR_FMT_RADIOTAP) + BRCMF_FEAT_DEF(MONITOR_FMT_RADIOTAP) \ + BRCMF_FEAT_DEF(MONITOR_FMT_HW_RX_HDR)/* * Quirks:
Signature · 1 line
2.20.1
Re: [PATCH V2] brcmfmac: support monitor frames with the hardware/ucode header
Quoted 15 lines · Rafał Miłecki
From: Rafał Miłecki <[email protected]>
So far there were two monitor frame formats:
1) 802.11 frames (with frame (sub)type & all addresses)
2) 802.11 frames with the radiotap headerTesting the latest FullMAC firmwares for 4366b1/4366c0 resulted in discovering a new format being used. It seems (almost?) identical to the one known from ucode used in SoftMAC devices which is most likely the same codebase anyway.
While new firmwares will /announce/ radiotap header support using the "rtap" fw capability string it seems no string was added for the new ucode header format.
Quoted 7 lines
All above means that:
1) We need new format support when dealing with a received frame
2) A new feature bit & mapping quirks have to be added manuallyAs for now only an empty radiotap is being created. Adding support for extracting some info (band, channel, signal, etc.) is planned for the future.
Probably V1 was missing an ACK hence the confusion so to be sure...
Quoted 124 lines
Signed-off-by Rafał Miłecki <[email protected]>---
V2: Update commit message (only):
1) Don't say the new firmwares were expected to provide radiotap frames. That was my misinterpretation of adding "rtap" string.
2) List all monitor frame formats as it apparently got a bit confusing at this point (there are 3 different ones!).--- .../broadcom/brcm80211/brcmfmac/core.c | 55 +++++++++++++++++++ .../broadcom/brcm80211/brcmfmac/feature.c | 4 ++ .../broadcom/brcm80211/brcmfmac/feature.h | 4 +- 3 files changed, 62 insertions(+), 1 deletion(-)drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +55
-0@@ -43,6 +43,36 @@#define BRCMF_BSSIDX_INVALID -1 +#define RXS_PBPRES BIT(2) + +#define D11_PHY_HDR_LEN 6 + +struct d11rxhdr_le { +__le16 RxFrameSize; +u16 PAD; +__le16 PhyRxStatus_0; +__le16 PhyRxStatus_1; +__le16 PhyRxStatus_2; +__le16 PhyRxStatus_3; +__le16 PhyRxStatus_4; +__le16 PhyRxStatus_5; +__le16 RxStatus1; +__le16 RxStatus2; +__le16 RxTSFTime; +__le16 RxChan; +u8 unknown[12 ]; +} __packed; + +struct wlc_d11rxhdr { +struct d11rxhdr_le rxhdr; +__le32 tsf_l; +s8 rssi; +s8 rxpwr0; +s8 rxpwr1; +s8 do_rssi_ma; +s8 rxpwr[4 ]; +} __packed; +char *brcmf_ifname (struct brcmf_if *ifp) {if (!ifp)@@ -409,6 +439,31 @@ void brcmf_netif_mon_rx(struct brcmf_if *ifp, struct sk_buff *skb) {if (brcmf_feat_is_enabled (ifp,BRCMF_FEAT_MONITOR_FMT_RADIOTAP )) {/* Do nothing */ + }else if (brcmf_feat_is_enabled (ifp,BRCMF_FEAT_MONITOR_FMT_HW_RX_HDR )) { +struct wlc_d11rxhdr *wlc_rxhdr = (struct wlc_d11rxhdr *)skb->data; +struct ieee80211_radiotap_header *radiotap; +unsigned int offset; +u16 RxStatus1; + + RxStatus1 =le16_to_cpu (wlc_rxhdr->rxhdr.RxStatus1); + + offset =sizeof (struct wlc_d11rxhdr ); +/* MAC inserts 2 pad bytes for a4 headers or QoS or A-MSDU +* subframes +*/ +if (RxStatus1 &RXS_PBPRES ) + offset +=2 ; + offset +=D11_PHY_HDR_LEN ; + +skb_pull (skb, offset); + +/* TODO: use RX header to fill some radiotap data */ + radiotap =skb_push (skb,sizeof (*radiotap)); +memset (radiotap,0 ,sizeof (*radiotap)); + radiotap->it_len =cpu_to_le16 (sizeof (*radiotap)); + +/* TODO: 4 bytes with receive status? */ + skb->len -=4 ; }else {struct ieee80211_radiotap_header *radiotap;drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c +4
-0@@ -103,6 +103,10 @@ static const struct brcmf_feat_fwfeat brcmf_feat_fwfeat_map[] = { { "01-6cb8e269", BIT(BRCMF_FEAT_MONITOR) },/* brcmfmac4366b-pcie.bin from linux-firmware.git commit 52442afee990 */ { "01-c47a91a4", BIT(BRCMF_FEAT_MONITOR) }, +/* brcmfmac4366b-pcie.bin from linux-firmware.git commit 211de1679a68 */ + { "01-801fb449", BIT(BRCMF_FEAT_MONITOR_FMT_HW_RX_HDR) }, +/* brcmfmac4366c-pcie.bin from linux-firmware.git commit 211de1679a68 */ + { "01-d2cbb8fd", BIT(BRCMF_FEAT_MONITOR_FMT_HW_RX_HDR) }, };static void brcmf_feat_firmware_overrides (struct brcmf_pub *drv)drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h +3
-1@@ -35,6 +35,7 @@* FWSUP: Firmware supplicant. * MONITOR: firmware can pass monitor packets to host. * MONITOR_FMT_RADIOTAP: firmware provides monitor packets with radiotap header +* MONITOR_FMT_HW_RX_HDR: firmware provides monitor packets with hw/ucode header */ #define BRCMF_FEAT_LIST \ BRCMF_FEAT_DEF(MBSS) \@@ -52,7 +53,8 @@ BRCMF_FEAT_DEF(GSCAN) \ BRCMF_FEAT_DEF(FWSUP) \ BRCMF_FEAT_DEF(MONITOR) \ - BRCMF_FEAT_DEF(MONITOR_FMT_RADIOTAP) + BRCMF_FEAT_DEF(MONITOR_FMT_RADIOTAP) \ + BRCMF_FEAT_DEF(MONITOR_FMT_HW_RX_HDR)/* * Quirks:
Re: [PATCH V2] brcmfmac: support monitor frames with the hardware/ucode header
In reply to Rafał MiłeckiQuoted 19 lines · Rafał Miłecki
From: Rafał Miłecki <[email protected]>
So far there were two monitor frame formats:
1) 802.11 frames (with frame (sub)type & all addresses)
2) 802.11 frames with the radiotap headerTesting the latest FullMAC firmwares for 4366b1/4366c0 resulted in discovering a new format being used. It seems (almost?) identical to the one known from ucode used in SoftMAC devices which is most likely the same codebase anyway.
While new firmwares will /announce/ radiotap header support using the "rtap" fw capability string it seems no string was added for the new ucode header format.
All above means that:
1) We need new format support when dealing with a received frame
2) A new feature bit & mapping quirks have to be added manually
Quoted 6 lines
As for now only an empty radiotap is being created. Adding support for extracting some info (band, channel, signal, etc.) is planned for the future.
Signed-off-by Rafał Miłecki <[email protected]>Acked-by Arend van Spriel <[email protected]>
Patch applied to wireless-drivers-next.git, thanks.
e665988be29c brcmfmac: support monitor frames with the hardware/ucode header
Signature · 3 lines
https://patchwork.kernel.org/patch/10802433/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches