diff mbox

[V2,2/5] brcmfmac: provide a value for struct wowlan_support::max_nd_match_sets

Message ID 1485520068-5807-3-git-send-email-arend.vanspriel@broadcom.com (mailing list archive)
State Accepted
Commit 2ef0359031b9ed891ca381b2687186fb52b277f8
Delegated to: Kalle Valo
Headers show

Commit Message

Arend van Spriel Jan. 27, 2017, 12:27 p.m. UTC 
The driver advertises support for WOWLAN_NETDETECT but did not specify
maximum amount of netdetect match sets. This was no issue due to a bug
in nl80211. As that has been fixed, brcmfmac also needs fixing.

Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: Franky Lin <franky.lin@broadcom.com>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Johannes Berg Jan. 27, 2017, 12:43 p.m. UTC | #1 
And to make it show up in patchwork at the right place:

Kalle, you can ignore patch 1, I'm handling it, but you need to apply
these before I can, the patch series order was wrong.

johannes
Kalle Valo Jan. 27, 2017, 12:51 p.m. UTC | #2 
Johannes Berg <johannes@sipsolutions.net> writes:

> And to make it show up in patchwork at the right place:
>
> Kalle, you can ignore patch 1, I'm handling it, but you need to apply
> these before I can, the patch series order was wrong.

Haha :) Thank you, this is the best way to remind me about something.
Kalle Valo Jan. 31, 2017, 7:25 a.m. UTC | #3 
Arend Van Spriel <arend.vanspriel@broadcom.com> wrote:
> The driver advertises support for WOWLAN_NETDETECT but did not specify
> maximum amount of netdetect match sets. This was no issue due to a bug
> in nl80211. As that has been fixed, brcmfmac also needs fixing.
> 
> Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
> Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
> Reviewed-by: Franky Lin <franky.lin@broadcom.com>
> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>

4 patches applied to wireless-drivers-next.git, thanks.

2ef0359031b9 brcmfmac: provide a value for struct wowlan_support::max_nd_match_sets
d29afe91af59 brcmfmac: fix handling firmware results for wowl netdetect
0b57010fc18e brcmfmac: allow wowlan support to be per device
2a2a5d1835b6 brcmfmac: add .update_connect_params() callback
diff mbox

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index ec1171c..302a78d 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -6358,6 +6358,8 @@  static void brcmf_wiphy_wowl_params(struct wiphy *wiphy, struct brcmf_if *ifp)
 	if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_PNO)) {
 		if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_WOWL_ND)) {
 			brcmf_wowlan_support.flags |= WIPHY_WOWLAN_NET_DETECT;
+			brcmf_wowlan_support.max_nd_match_sets =
+				BRCMF_PNO_MAX_PFN_COUNT;
 			init_waitqueue_head(&cfg->wowl.nd_data_wait);
 		}
 	}