| Message ID | 1433974343-16982-2-git-send-email-arend@broadcom.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Kalle Valo |
| Headers | show |
> From: Pontus Fuchs <pontusf@broadcom.com> > > Add a feature flag to reflect the firmware's p2p capability. > > Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> > Reviewed-by: Hante Meuleman <meuleman@broadcom.com> > Reviewed-by: Arend Van Spriel <arend@broadcom.com> > Signed-off-by: Pontus Fuchs <pontusf@broadcom.com> > Signed-off-by: Arend van Spriel <arend@broadcom.com> Thanks, 7 patches applied to wireless-drivers-next.git: 2b560d7148eb brcmfmac: Check if firmware supports p2p 2e5f66fe9593 brcmfmac: Build wiphy mode and interface combinations dynamically 1f0dc59a6de9 brcmfmac: rework .get_station() callback 5768f31e4e75 brcmfmac: have sdio return -EIO when device communication is not possible f37d69a4babc brcmfmac: free ifp for non-netdev interface in p2p module 55479df8840d brcmfmac: move p2p attach/detach functions f7a40873d2fa brcmfmac: assure p2pdev is unregistered upon driver unload Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 06/15/15 12:10, Kalle Valo wrote: > >> From: Pontus Fuchs<pontusf@broadcom.com> >> >> Add a feature flag to reflect the firmware's p2p capability. >> >> Reviewed-by: Pieter-Paul Giesberts<pieterpg@broadcom.com> >> Reviewed-by: Hante Meuleman<meuleman@broadcom.com> >> Reviewed-by: Arend Van Spriel<arend@broadcom.com> >> Signed-off-by: Pontus Fuchs<pontusf@broadcom.com> >> Signed-off-by: Arend van Spriel<arend@broadcom.com> > > Thanks, 7 patches applied to wireless-drivers-next.git: > > 2b560d7148eb brcmfmac: Check if firmware supports p2p > 2e5f66fe9593 brcmfmac: Build wiphy mode and interface combinations dynamically > 1f0dc59a6de9 brcmfmac: rework .get_station() callback > 5768f31e4e75 brcmfmac: have sdio return -EIO when device communication is not possible > f37d69a4babc brcmfmac: free ifp for non-netdev interface in p2p module > 55479df8840d brcmfmac: move p2p attach/detach functions > f7a40873d2fa brcmfmac: assure p2pdev is unregistered upon driver unload Hi Kalle, As it turns out two patches in this series introduced a new issue (I had one of those days :-( ). I have fixes for them. Should I send them now or can it wait until 4.2-rc1 has landed. Regards, Arend > Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Arend van Spriel <arend@broadcom.com> writes: >> Thanks, 7 patches applied to wireless-drivers-next.git: >> >> 2b560d7148eb brcmfmac: Check if firmware supports p2p >> 2e5f66fe9593 brcmfmac: Build wiphy mode and interface combinations dynamically >> 1f0dc59a6de9 brcmfmac: rework .get_station() callback >> 5768f31e4e75 brcmfmac: have sdio return -EIO when device communication is not possible >> f37d69a4babc brcmfmac: free ifp for non-netdev interface in p2p module >> 55479df8840d brcmfmac: move p2p attach/detach functions >> f7a40873d2fa brcmfmac: assure p2pdev is unregistered upon driver unload > > As it turns out two patches in this series introduced a new issue (I > had one of those days :-( ). I have fixes for them. Should I send them > now or can it wait until 4.2-rc1 has landed. Please send them now and I'll try to apply them as soon as possible.
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/brcm80211/brcmfmac/feature.c index 2c5fad3..1e94e94 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/feature.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/feature.c @@ -129,6 +129,7 @@ void brcmf_feat_attach(struct brcmf_pub *drvr) brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_WOWL, "wowl"); if (drvr->bus_if->chip != BRCM_CC_43362_CHIP_ID) brcmf_feat_iovar_int_set(ifp, BRCMF_FEAT_MBSS, "mbss", 0); + brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_P2P, "p2p"); /* set chip related quirks */ switch (drvr->bus_if->chip) { diff --git a/drivers/net/wireless/brcm80211/brcmfmac/feature.h b/drivers/net/wireless/brcm80211/brcmfmac/feature.h index 5469625..6b381f7 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/feature.h +++ b/drivers/net/wireless/brcm80211/brcmfmac/feature.h @@ -23,12 +23,14 @@ * MCHAN: multi-channel for concurrent P2P. * PNO: preferred network offload. * WOWL: Wake-On-WLAN. + * P2P: peer-to-peer */ #define BRCMF_FEAT_LIST \ BRCMF_FEAT_DEF(MBSS) \ BRCMF_FEAT_DEF(MCHAN) \ BRCMF_FEAT_DEF(PNO) \ - BRCMF_FEAT_DEF(WOWL) + BRCMF_FEAT_DEF(WOWL) \ + BRCMF_FEAT_DEF(P2P) /* * Quirks: *