| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455 |
- From bd99a3013bdc00f8fc7534c657b39616792b4467 Mon Sep 17 00:00:00 2001
- From: Arend Van Spriel <[email protected]>
- Date: Wed, 8 Nov 2017 14:36:37 +0100
- Subject: [PATCH] brcmfmac: move configuration of probe request IEs
- The configuration of the IEs for probe requests was done in a P2P
- related function, which is not very obvious. Moving it to
- .scan callback function, ie. brcmf_cfg80211_scan().
- Reviewed-by: Hante Meuleman <[email protected]>
- Reviewed-by: Pieter-Paul Giesberts <[email protected]>
- Reviewed-by: Franky Lin <[email protected]>
- Signed-off-by: Arend van Spriel <[email protected]>
- Signed-off-by: Kalle Valo <[email protected]>
- ---
- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 5 +++++
- drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 6 ++----
- 2 files changed, 7 insertions(+), 4 deletions(-)
- --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
- +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
- @@ -1108,6 +1108,11 @@ brcmf_cfg80211_scan(struct wiphy *wiphy,
- if (err)
- goto scan_out;
-
- + err = brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_PRBREQ_FLAG,
- + request->ie, request->ie_len);
- + if (err)
- + goto scan_out;
- +
- err = brcmf_do_escan(vif->ifp, request);
- if (err)
- goto scan_out;
- --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
- +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
- @@ -881,7 +881,7 @@ int brcmf_p2p_scan_prep(struct wiphy *wi
- {
- struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
- struct brcmf_p2p_info *p2p = &cfg->p2p;
- - int err = 0;
- + int err;
-
- if (brcmf_p2p_scan_is_p2p_request(request)) {
- /* find my listen channel */
- @@ -904,9 +904,7 @@ int brcmf_p2p_scan_prep(struct wiphy *wi
- /* override .run_escan() callback. */
- cfg->escan_info.run = brcmf_p2p_run_escan;
- }
- - err = brcmf_vif_set_mgmt_ie(vif, BRCMF_VNDR_IE_PRBREQ_FLAG,
- - request->ie, request->ie_len);
- - return err;
- + return 0;
- }
-
-
|
