On 11/01/2022 17.50, Arend van Spriel wrote: > On 1/4/2022 8:26 AM, Hector Martin wrote: >> This new API version is required for at least the BCM4387 firmware. Add >> support for it, with a fallback to the v1 API. > > Reviewed-by: Arend van Spriel <arend.vanspriel@xxxxxxxxxxxx> >> Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxx> >> Signed-off-by: Hector Martin <marcan@xxxxxxxxx> >> --- >> .../broadcom/brcm80211/brcmfmac/cfg80211.c | 113 ++++++++++++++---- >> .../broadcom/brcm80211/brcmfmac/feature.c | 1 + >> .../broadcom/brcm80211/brcmfmac/feature.h | 4 +- >> .../broadcom/brcm80211/brcmfmac/fwil_types.h | 49 +++++++- >> 4 files changed, 145 insertions(+), 22 deletions(-) >> >> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c >> index fb727778312c..71e932a8302c 100644 >> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c >> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c >> @@ -769,12 +769,50 @@ void brcmf_set_mpc(struct brcmf_if *ifp, int mpc) >> } >> } >> >> +static void brcmf_escan_prep(struct brcmf_cfg80211_info *cfg, >> + struct brcmf_scan_params_v2_le *params_le, >> + struct cfg80211_scan_request *request); > > I am not a fan of function prototypes so if it can be avoided by simply > moving the function that would be preferred over this. Moved the function for v3 :) >> + if (!brcmf_feat_is_enabled(ifp, BRCMF_FEAT_SCAN_V2)) { > > Okay. So it is not really a fallback. Phew! I meant fallback in case the feature is not present, not fallback from trying to use it without checking. Thankfully we can use a feature test for this :-) -- Hector Martin (marcan@xxxxxxxxx) Public Key: https://mrcn.st/pub