brcmfmac: add initial (old-school) P2P support
cover brcmfmac: add initial (old-school) P2P support
This series adds P2P functionality to the brcmfmac driver. It has been verified with wpa_supplicant performing successful FIND, LISTEN and GO Negotiation. It can setup a peer-to-peer connection while associated with an AP.
Now for the term "old-school". While working on this feature the nl80211 interface type P2P_DEVICE was introduced. However, wpa_supplicant has not support for it so the feature was developed and tested using a dummy net device for P2P management. We have had contact with David Spinadel, who is doing the wpa_supplicant work. Our next step will be to rework brcmfmac supporting the P2P_DEVICE type and test it against wpa_supplicant with David's changes.
Using the patches in this series, people can have a look at P2P feature when it is built with CONFIG_BRCMDBG and the module is loaded with the parameter p2pon=1.
This series is intended for v3.9 and depends on the patch series identified by:
Arend van Spriel (6):
brcmfmac: add peer-to-peer group discovery support
brcmfmac: add support for creating P2P client/GO interface
brcmfmac: fix compiler warning on printf format
brcmfmac: fix generation of the p2p related mac addresses
brcmfmac: implement support for deleting virtual interfaces
brcmfmac: change function signatures
Hante Meuleman (21):
brcmfmac: add support for P2P listen mode.
brcmfmac: update escan for multiple bss and simplify.
brcmfmac: update p2p add and delete vif routines.
brcmfmac: add p2p change vif routines.
brcmfmac: Fix bug mgmt_rx_register
brcmfmac: Update connect setup/handling routines for multiple bss.
brcmfmac: Update AP mode for GO creation.
brcmfmac: Add handling of receiving P2P action frames.
brcmfmac: P2P action frame tx.
brcmfmac: Use real cookie value for p2p remain on channel.
brcmfmac: Create p2p0 netdev via module variable.
brcmfmac: Use role from wdev on AP commands and fix stop_ap.
brcmfmac: Put printing action frames code under debug flag.
brcmfmac: Ignore E_ADD_IF for ifidx 0.
brcmfmac: Reject change vif for p2p if.
brcmfmac: Update netdev configuration in wiphy for p2p.
brcmfmac: Remove sleep on del_station.
brcmfmac: Fix rtnl_lock lockup when registering netdev.
brcmfmac: Cleanup of unused defines.
brcmfmac: Create netdev before returning from add_virtual_intf.
brcmfmac: Add tx p2p off-channel support.
drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 +- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 39 +- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 124 +- drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 6 +- .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 66 + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2277 ++++++++++++++++++++ drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 183 ++ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 1262 ++++++++--- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 113 +- 10 files changed, 3731 insertions(+), 344 deletions(-) create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/p2p.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/p2p.h
Signature · 1 line
1.7.10.4
PATCH 1/27 brcmfmac: add peer-to-peer group discovery support
First part for P2P support. It is a variation on the existing scanning functionality and is used to discover peer-to-peer group owners and/or peer-to-peer devices in listen state.
Tested with wpa_cli/wpa_supplicant v2.0-devel.
--- drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 +- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 1 + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 734 ++++++++++++++++++++ drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 114 +++ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 199 ++++-- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 78 ++- 6 files changed, 1078 insertions(+), 51 deletions(-) create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/p2p.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/p2p.h
drivers/net/wireless/brcm80211/brcmfmac/Makefile +2 -1
@@ -26,6 +26,7 @@ brcmfmac-objs += \ wl_cfg80211.o \ fwil.o \ fweh.o \ + p2p.o \ dhd_cdc.o \ dhd_common.o \ dhd_linux.o
@@ -37,4 +38,4 @@ brcmfmac-$(CONFIG_BRCMFMAC_SDIO) += \ brcmfmac-$(CONFIG_BRCMFMAC_USB) += \ usb.o brcmfmac-$(CONFIG_BRCMDBG) += \ - dhd_dbg.o + dhd_dbg.o
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +1 -0
@@ -26,6 +26,7 @@#include "dhd_bus.h" #include "dhd_proto.h" #include "dhd_dbg.h" +#include "p2p.h" #include "wl_cfg80211.h" #include "fwil.h"
drivers/net/wireless/brcm80211/brcmfmac/p2p.c new file +734 -0
734 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/p2p.h new file +114 -0
114 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +151 -48
386 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +76 -2
135 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 2/27 brcmfmac: add support for creating P2P client/GO interface
In reply to Arend van SprielThis patch allow the creation of P2P client and group owner virtual interfaces in the driver.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 1 + .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 42 +++++++ drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 112 +++++++++++++++++- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 123 ++++++++++++++++++-- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 26 ++++- 5 files changed, 289 insertions(+), 15 deletions(-) create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h
drivers/net/wireless/brcm80211/brcmfmac/dhd.h +1 -0
@@ -72,6 +72,7 @@#define BRCMF_C_SET_WSEC 134#define BRCMF_C_GET_PHY_NOISE 135#define BRCMF_C_GET_BSS_INFO 136 +#define BRCMF_C_SET_SCB_TIMEOUT 158#define BRCMF_C_GET_PHYLIST 180#define BRCMF_C_SET_SCAN_CHANNEL_TIME 185#define BRCMF_C_SET_SCAN_UNASSOC_TIME 187
drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h new file +42 -0
42 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +107 -5
157 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +114 -9
171 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +25 -1
@@ -320,6 +320,23 @@ struct brcmf_pno_scanresults_le { };/** +* struct brcmf_cfg80211_vif_event - virtual interface event information. +* +* @vif_wq: waitqueue awaiting interface event from firmware. +* @vif_event_lock: protects other members in this structure. +* @vif_complete: completion for net attach. +* @action: either add, change, or delete. +* @vif: virtual interface object related to the event. +*/ +struct brcmf_cfg80211_vif_event { +wait_queue_head_t vif_wq; +struct mutex vif_event_lock; +struct completion vif_complete; +u8 action; +struct brcmf_cfg80211_vif *vif; +}; + +/** * struct brcmf_cfg80211_info - dongle private data of cfg80211 interface * * @wiphy: wiphy object for cfg80211 interface.
@@ -352,6 +369,7 @@ struct brcmf_pno_scanresults_le {* @escan_ioctl_buf: dongle command buffer for escan commands. * @vif_list: linked list of vif instances. * @vif_cnt: number of vif instances. +* @vif_event: vif event signalling. */ struct brcmf_cfg80211_info {struct wiphy *wiphy;
@@ -384,6 +402,7 @@ struct brcmf_cfg80211_info {u8 *escan_ioctl_buf;struct list_head vif_list;u8 vif_cnt; +struct brcmf_cfg80211_vif_event vif_event; };/**
@@ -452,7 +471,6 @@ s32 brcmf_cfg80211_up(struct net_device *ndev);s32 brcmf_cfg80211_down (struct net_device *ndev);struct brcmf_cfg80211_vif *brcmf_alloc_vif (struct brcmf_cfg80211_info *cfg, -struct net_device *netdev,enum nl80211_iftype type,bool pm_block);void brcmf_free_vif (struct brcmf_cfg80211_vif *vif);
@@ -462,5 +480,11 @@ s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag,struct brcmf_tlv *brcmf_parse_tlvs (void *buf,int buflen,uint key);u16 channel_to_chanspec (struct ieee80211_channel *ch);u32 wl_get_vif_state_all (struct brcmf_cfg80211_info *cfg,unsigned long state); +void brcmf_cfg80211_arm_vif_event (struct brcmf_cfg80211_info *cfg, +struct brcmf_cfg80211_vif *vif); +bool brcmf_cfg80211_vif_event_armed (struct brcmf_cfg80211_info *cfg); +int brcmf_cfg80211_wait_vif_event_timeout (struct brcmf_cfg80211_info *cfg, +u8 action,ulong timeout); +void brcmf_cfg80211_vif_complete (struct brcmf_cfg80211_info *info);#endif /* _wl_cfg80211_h_ */
Signature · 1 line
1.7.10.4
PATCH 3/27 brcmfmac: add support for P2P listen mode.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
With this patch a device can be put in p2p listen mode and becomes visible for other p2p devices (via p2p_find).
--- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 13 ++ drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 6 +- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 150 +++++++++++++--- drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 15 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 189 +++++++++++++++++++- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 2 + 6 files changed, 341 insertions(+), 34 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd.h +13 -0
@@ -452,6 +452,19 @@ struct brcmf_sta_info_le {__le32 rx_decrypt_failures;/* # of packet decrypted failed */ }; +/* +* WLC_E_PROBRESP_MSG +* WLC_E_P2P_PROBREQ_MSG +* WLC_E_ACTION_FRAME_RX +*/ +struct brcmf_rx_mgmt_data { +__be16 version; +__be16 chanspec; +__be32 rssi; +__be32 mactime; +__be32 rate; +}; +/* Bus independent dongle command */ struct brcmf_dcmd {uint cmd;/* common dongle cmd definition */
drivers/net/wireless/brcm80211/brcmfmac/fweh.h +5 -1
@@ -83,6 +83,7 @@ struct brcmf_event; BRCMF_ENUM_DEF(MULTICAST_DECODE_ERROR, 51) \ BRCMF_ENUM_DEF(TRACE, 52) \ BRCMF_ENUM_DEF(IF, 54) \ + BRCMF_ENUM_DEF(P2P_DISC_LISTEN_COMPLETE, 55) \ BRCMF_ENUM_DEF(RSSI, 56) \ BRCMF_ENUM_DEF(PFN_SCAN_COMPLETE, 57) \BRCMF_ENUM_DEF (EXTLOG_MSG ,58 ) \
@@ -96,8 +97,11 @@ struct brcmf_event; BRCMF_ENUM_DEF(DFS_AP_RESUME, 66) \ BRCMF_ENUM_DEF(ESCAN_RESULT, 69) \ BRCMF_ENUM_DEF(ACTION_FRAME_OFF_CHAN_COMPLETE, 70) \ + BRCMF_ENUM_DEF(PROBERESP_MSG, 71) \ + BRCMF_ENUM_DEF(P2P_PROBEREQ_MSG, 72) \ BRCMF_ENUM_DEF(DCS_REQUEST, 73) \ - BRCMF_ENUM_DEF(FIFO_CREDIT_MAP, 74) + BRCMF_ENUM_DEF(FIFO_CREDIT_MAP, 74) \ + BRCMF_ENUM_DEF(ACTION_FRAME_RX, 75)#define BRCMF_ENUM_DEF (id, val) \ BRCMF_E_##id = (val),
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +124 -26
202 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/p2p.h +12 -3
@@ -60,10 +60,10 @@ struct p2p_bss {* @BRCMF_P2P_STATUS_IF_DELETING: peer-to-peer vif delete sent to dongle. * @BRCMF_P2P_STATUS_IF_CHANGING: peer-to-peer vif change sent to dongle. * @BRCMF_P2P_STATUS_IF_CHANGED: peer-to-peer vif change completed on dongle. -* @BRCMF_P2P_STATUS_LISTEN_EXPIRED: listen duration expired. * @BRCMF_P2P_STATUS_ACTION_TX_COMPLETED: action frame tx completed. * @BRCMF_P2P_STATUS_ACTION_TX_NOACK: action frame tx not acked. * @BRCMF_P2P_STATUS_GO_NEG_PHASE: P2P GO negotiation ongoing. +* @BRCMF_P2P_STATUS_REMAIN_ON_CHANNEL: P2P listen, remaining on channel. */ enum brcmf_p2p_status {BRCMF_P2P_STATUS_IF_ADD =0 ,
@@ -71,10 +71,10 @@ enum brcmf_p2p_status {BRCMF_P2P_STATUS_IF_DELETING ,BRCMF_P2P_STATUS_IF_CHANGING ,BRCMF_P2P_STATUS_IF_CHANGED , -BRCMF_P2P_STATUS_LISTEN_EXPIRED ,BRCMF_P2P_STATUS_ACTION_TX_COMPLETED ,BRCMF_P2P_STATUS_ACTION_TX_NOACK , - BRCMF_P2P_STATUS_GO_NEG_PHASE +BRCMF_P2P_STATUS_GO_NEG_PHASE , + BRCMF_P2P_STATUS_REMAIN_ON_CHANNEL };/**
@@ -88,6 +88,7 @@ enum brcmf_p2p_status {* @listen_timer: timer for @WL_P2P_DISC_ST_LISTEN discover state. * @ssid: ssid for P2P GO. * @listen_channel: channel for @WL_P2P_DISC_ST_LISTEN discover state. +* @remain_on_channel: contains copy of struct used by cfg80211. */ struct brcmf_p2p_info {struct brcmf_cfg80211_info *cfg;
@@ -98,6 +99,7 @@ struct brcmf_p2p_info {struct timer_list listen_timer;struct brcmf_ssid ssid;u8 listen_channel; +struct ieee80211_channel remain_on_channel; };void brcmf_p2p_attach (struct brcmf_cfg80211_info *cfg);
@@ -110,5 +112,12 @@ int brcmf_p2p_start_device(struct wiphy *wiphy, struct wireless_dev *wdev);void brcmf_p2p_stop_device (struct wiphy *wiphy,struct wireless_dev *wdev);int brcmf_p2p_scan_prep (struct wiphy *wiphy,struct cfg80211_scan_request *request); +int brcmf_p2p_remain_on_channel (struct wiphy *wiphy,struct wireless_dev *wdev, +struct ieee80211_channel *channel, +unsigned int duration,u64 *cookie); +int brcmf_p2p_notify_listen_complete (struct brcmf_if *ifp, +const struct brcmf_event_msg *e, +void *data); +void brcmf_p2p_cancel_remain_on_channel (struct brcmf_if *ifp);#endif /* WL_CFGP2P_H_ */
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +185 -4
225 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +2 -0
@@ -189,6 +189,7 @@ struct vif_saved_ie {* @sme_state: SME state using enum brcmf_vif_status bits. * @pm_block: power-management blocked. * @list: linked list. +* @mgmt_rx_reg: registered rx mgmt frame types. */ struct brcmf_cfg80211_vif {struct brcmf_if *ifp;
@@ -200,6 +201,7 @@ struct brcmf_cfg80211_vif {bool pm_block;struct vif_saved_ie saved_ie;struct list_head list; +u16 mgmt_rx_reg; };/* association inform */
Signature · 1 line
1.7.10.4
PATCH 4/27 brcmfmac: fix compiler warning on printf format
In reply to Arend van SprielOn 64-bit target a warning was given when using %d to print sizeof() value:
CC [M] drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.obrcm80211/brcmfmac/wl_cfg80211.c: In function 'brcmf_alloc_vif':brcm80211/brcmfmac/wl_cfg80211.c:3884:2: error: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Werror=format]
Fixed using %zu instead.
--- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +1 -1
@@ -3997,7 +3997,7 @@ struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,if (cfg->vif_cnt ==BRCMF_IFACE_MAX_CNT )return ERR_PTR (-ENOSPC ); -brcmf_dbg (TRACE ,"allocating virtual interface (size=%d)\n" , +brcmf_dbg (TRACE ,"allocating virtual interface (size=%zu)\n" ,sizeof (*vif)); vif =kzalloc (sizeof (*vif),GFP_KERNEL );if (!vif)
Signature · 1 line
1.7.10.4
PATCH 5/27 brcmfmac: fix generation of the p2p related mac addresses
In reply to Arend van SprielThe driver determines the P2P interface address and device address from the primary mac address. However, the function used an invalid input. This caused a mac address mismatch between firmware and driver. This was hidden because the brcmf_if_add() function corrected the error upon receiving the IF_ADD event from firmware.
--- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +1 -3
@@ -132,12 +132,10 @@ static int brcmf_p2p_set_firmware(struct brcmf_p2p_info *p2p)*/ static void brcmf_p2p_generate_bss_mac (struct brcmf_p2p_info *p2p) { -struct net_device *ndev =cfg_to_ndev (p2p->cfg); -/* Generate the P2P Device Address. This consists of the device's * primary MAC address with the locally administered bit set. */ -memcpy (p2p->dev_addr, ndev->dev_addr,ETH_ALEN ); +memcpy (p2p->dev_addr, p2p->cfg->pub->mac,ETH_ALEN ); p2p->dev_addr[0 ] |=0x02 ;/* Generate the P2P Interface Address. If the discovery and connection
Signature · 1 line
1.7.10.4
PATCH 6/27 brcmfmac: implement support for deleting virtual interfaces
In reply to Arend van SprielDeletion of the virtual interface was not fully supported so adding it now. Tested using p2p_connect command in wpa_supplicant.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 1 + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 64 +++++-- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 199 ++++++++++++-------- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 4 + 4 files changed, 176 insertions(+), 92 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd.h +1 -0
@@ -150,6 +150,7 @@#define BRCMF_E_REASON_MINTXRATE 9#define BRCMF_E_REASON_TXFAIL 10 +#define BRCMF_E_REASON_LINK_BSSCFG_DIS 4#define BRCMF_E_REASON_FAST_ROAM_FAILED 5#define BRCMF_E_REASON_DIRECTED_ROAM 6#define BRCMF_E_REASON_TSPEC_REJECTED 7
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +52 -12
81 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +119 -80
250 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +4 -0
@@ -148,6 +148,7 @@ struct brcmf_cfg80211_profile {* @BRCMF_VIF_STATUS_READY: ready for operation. * @BRCMF_VIF_STATUS_CONNECTING: connect/join in progress. * @BRCMF_VIF_STATUS_CONNECTED: connected/joined succesfully. +* @BRCMF_VIF_STATUS_DISCONNECTING: disconnect/disable in progress. * @BRCMF_VIF_STATUS_AP_CREATING: interface configured for AP operation. * @BRCMF_VIF_STATUS_AP_CREATED: AP operation started. */
@@ -155,6 +156,7 @@ enum brcmf_vif_status {BRCMF_VIF_STATUS_READY ,BRCMF_VIF_STATUS_CONNECTING ,BRCMF_VIF_STATUS_CONNECTED , +BRCMF_VIF_STATUS_DISCONNECTING ,BRCMF_VIF_STATUS_AP_CREATING , BRCMF_VIF_STATUS_AP_CREATED };
@@ -405,6 +407,7 @@ struct brcmf_cfg80211_info {struct list_head vif_list;u8 vif_cnt;struct brcmf_cfg80211_vif_event vif_event; +struct completion vif_disabled; };/**
@@ -479,6 +482,7 @@ void brcmf_free_vif(struct brcmf_cfg80211_vif *vif);s32 brcmf_vif_set_mgmt_ie (struct brcmf_cfg80211_vif *vif,s32 pktflag,const u8 *vndr_ie_buf,u32 vndr_ie_len); +s32 brcmf_vif_clear_mgmt_ies (struct brcmf_cfg80211_vif *vif);struct brcmf_tlv *brcmf_parse_tlvs (void *buf,int buflen,uint key);u16 channel_to_chanspec (struct ieee80211_channel *ch);u32 wl_get_vif_state_all (struct brcmf_cfg80211_info *cfg,unsigned long state);
Signature · 1 line
1.7.10.4
PATCH 7/27 brcmfmac: update escan for multiple bss and simplify.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Add support for scanning on non primary netdev (p2p) and simplify the p2p scanning preparation.
--- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 92 +++----------------- drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 3 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 8 +- 3 files changed, 19 insertions(+), 84 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +10 -82
@@ -91,11 +91,6 @@ struct brcmf_p2p_scan_le { }; }; -static struct brcmf_cfg80211_vif *p2p_discover_vif (struct brcmf_p2p_info *p2p) -{ -return p2p->bss_idx[P2PAPI_BSSCFG_DEVICE ].vif; -} -/** * brcmf_p2p_set_firmware() - prepare firmware for peer-to-peer operation. *
@@ -195,34 +190,6 @@ static s32 brcmf_p2p_set_discover_state(struct brcmf_if *ifp, u8 state, }/** -* brcmf_p2p_discover_disable_search() - reset discover state. -* -* @p2p: P2P specific data. -* -* Reset the discover state to @WL_P2P_DISC_ST_SCAN. Returns 0 on success. -*/ -static s32 brcmf_p2p_discover_disable_search (struct brcmf_p2p_info *p2p) -{ -struct brcmf_cfg80211_vif *vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE ].vif; -struct brcmf_p2p_disc_st_le discovery_mode; -int ret; - -/* -* vif presence indicates discovery is initialized. -*/ -if (!vif) -return -ENODEV ; - - ret =brcmf_fil_bsscfg_data_get (vif->ifp,"p2p_state" , - &discovery_mode, -sizeof (discovery_mode)); -if (!ret && discovery_mode.state !=WL_P2P_DISC_ST_SCAN ) - ret =brcmf_p2p_set_discover_state (vif->ifp, -WL_P2P_DISC_ST_SCAN ,0 ,0 ); -return ret; -} - -/** * brcmf_p2p_init_discovery() - enable discovery in the firmware. * * @p2p: P2P specific data.
@@ -376,32 +343,6 @@ exit: }/** -* brcmf_p2p_configure_probereq() - Configure probe request data. -* -* @p2p: P2P specific data. -* @ie: buffer containing information elements. -* @ie_len: length of @ie buffer. -* -*/ -static int brcmf_p2p_configure_probereq (struct brcmf_p2p_info *p2p, -const u8 *ie,u32 ie_len) -{ -struct brcmf_cfg80211_vif *vif; -s32 err =0 ; - -brcmf_dbg (TRACE ,"enter\n" ); - vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE ].vif; - - err =brcmf_vif_set_mgmt_ie (vif,BRCMF_VNDR_IE_PRBREQ_FLAG , - ie, ie_len); - -if (err <0 ) -brcmf_err ("set probreq ie occurs error %d\n" , err); - -return err; -} - -/* * brcmf_p2p_escan() - initiate a P2P scan. * * @p2p: P2P specific data.
@@ -621,12 +562,14 @@ exit:* * @wiphy: wiphy device. * @request: scan request from cfg80211. +* @vif: vif on which scan request is to be executed. * * Prepare the scan appropriately for type of scan requested. Overrides the * escan .run() callback for peer-to-peer scanning. */ int brcmf_p2p_scan_prep (struct wiphy *wiphy, -struct cfg80211_scan_request *request) +struct cfg80211_scan_request *request, +struct brcmf_cfg80211_vif *vif) {struct brcmf_cfg80211_info *cfg =wiphy_to_cfg (wiphy);struct brcmf_p2p_info *p2p = &cfg->p2p;
@@ -644,31 +587,16 @@ int brcmf_p2p_scan_prep(struct wiphy *wiphy,brcmf_dbg (INFO ,"P2P: GO_NEG_PHASE status cleared\n" ); err =brcmf_p2p_enable_discovery (p2p); -if (err ==0 ) - err =brcmf_p2p_configure_probereq (p2p, request->ie, - request->ie_len); +if (err) +return err; -/* -* override .run_escan() callback. -*/ - cfg->escan_info.run = brcmf_p2p_run_escan; - }else { -/* -* legacy scan trigger -* So, we have to disable p2p discovery if p2p discovery is on -*/ - (void )brcmf_p2p_discover_disable_search (p2p); + vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE ].vif; -/* -* clear p2p vendor ies for probe request set by -* previous p2p related scan(s). -*/ -if (p2p_discover_vif (p2p)) - err =brcmf_vif_set_mgmt_ie (p2p_discover_vif (p2p), -BRCMF_VNDR_IE_PRBREQ_FLAG , - request->ie, - request->ie_len); +/* 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; }
drivers/net/wireless/brcm80211/brcmfmac/p2p.h +2 -1
@@ -111,7 +111,8 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev);int brcmf_p2p_start_device (struct wiphy *wiphy,struct wireless_dev *wdev);void brcmf_p2p_stop_device (struct wiphy *wiphy,struct wireless_dev *wdev);int brcmf_p2p_scan_prep (struct wiphy *wiphy, -struct cfg80211_scan_request *request); +struct cfg80211_scan_request *request, +struct brcmf_cfg80211_vif *vif);int brcmf_p2p_remain_on_channel (struct wiphy *wiphy,struct wireless_dev *wdev,struct ieee80211_channel *channel,unsigned int duration,u64 *cookie);
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +7 -1
@@ -805,6 +805,12 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct net_device *ndev,return -EAGAIN ; } +/* If scan req comes for p2p0, send it over primary I/F */ +if (ifp->vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE ].vif) { + ifp = cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY ].vif->ifp; + ndev = ifp->ndev; + } +/* Arm scan timeout timer */ mod_timer (&cfg->escan_timeout, jiffies +WL_ESCAN_TIMER_INTERVAL_MS *HZ /1000 );
@@ -824,7 +830,7 @@ brcmf_cfg80211_escan(struct wiphy *wiphy, struct net_device *ndev,set_bit (BRCMF_SCAN_STATUS_BUSY , &cfg->scan_status);if (escan_req) { cfg->escan_info.run = brcmf_run_escan; - err =brcmf_p2p_scan_prep (wiphy, request); + err =brcmf_p2p_scan_prep (wiphy, request, ifp->vif);if (err) goto scan_out;
Signature · 1 line
1.7.10.4
PATCH 8/27 brcmfmac: update p2p add and delete vif routines.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Improve exception handling. Store and removed created vif in cfg.p2p.bss array. Fix big endian bug. Fix msec jiffies bug.
--- .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 2 +- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 33 ++++++++++++++------ 2 files changed, 25 insertions(+), 10 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h +1 -1
@@ -29,7 +29,7 @@ enum brcmf_fil_p2p_if_types {struct brcmf_fil_p2p_if_le {u8 addr[ETH_ALEN ]; -enum brcmf_fil_p2p_if_types type; +__le16 type;__le16 chspec; };
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +24 -9
@@ -739,7 +739,7 @@ static int brcmf_p2p_request_p2p_if(struct brcmf_if *ifp, u8 ea[ETH_ALEN],/* fill the firmware request */ memcpy (if_request.addr, ea,ETH_ALEN ); - if_request.type = iftype; + if_request.type =cpu_to_le16 ((u16 )iftype); if_request.chspec =cpu_to_le16 (chanspec); err = brcmf_fil_iovar_data_set(ifp, "p2p_ifadd", &if_request,
@@ -747,11 +747,6 @@ static int brcmf_p2p_request_p2p_if(struct brcmf_if *ifp, u8 ea[ETH_ALEN],if (err)return err; -if (iftype ==BRCMF_FIL_P2P_IF_GO ) { -/* set station timeout for p2p */ - err =brcmf_fil_cmd_int_set (ifp,BRCMF_C_SET_SCB_TIMEOUT , -BRCMF_SCB_TIMEOUT_VALUE ); - }return err; }
@@ -814,11 +809,15 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name, } vif =brcmf_alloc_vif (cfg, type, false); +if (IS_ERR (vif)) +return (struct wireless_dev *)vif;brcmf_cfg80211_arm_vif_event (cfg, vif); err =brcmf_p2p_request_p2p_if (ifp, cfg->p2p.int_addr, iftype); -if (err) +if (err) { +brcmf_cfg80211_arm_vif_event (cfg,NULL ); goto fail; + }/* wait for firmware event */ err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_ADD,
@@ -835,10 +834,19 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name,if (!ifp) {brcmf_err ("no if pointer provided\n" ); err = -ENOENT ; + goto fail; }strncpy (ifp->ndev->name, name,sizeof (ifp->ndev->name) -1 );brcmf_cfg80211_vif_complete (cfg); + cfg->p2p.bss_idx[P2PAPI_BSSCFG_CONNECTION ].vif = vif; +/* Disable firmware roaming for P2P interface */ +brcmf_fil_iovar_int_set (ifp,"roam_off" ,1 ); +if (iftype ==BRCMF_FIL_P2P_IF_GO ) { +/* set station timeout for p2p */ +brcmf_fil_cmd_int_set (ifp,BRCMF_C_SET_SCB_TIMEOUT , +BRCMF_SCB_TIMEOUT_VALUE ); + }return &ifp->vif->wdev; fail:
@@ -883,18 +891,25 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev) }if (wait_for_disable) -wait_for_completion_timeout (&cfg->vif_disabled,500 ); +wait_for_completion_timeout (&cfg->vif_disabled, +msecs_to_jiffies (500 ));brcmf_vif_clear_mgmt_ies (vif);brcmf_cfg80211_arm_vif_event (cfg, vif); err =brcmf_p2p_release_p2p_if (vif); -if (!err) +if (!err) {/* wait for firmware event */ err =brcmf_cfg80211_wait_vif_event_timeout (cfg,BRCMF_E_IF_DEL , jiffie_timeout); +if (!err) + err = -EIO ; +else + err =0 ; + }brcmf_cfg80211_arm_vif_event (cfg,NULL );brcmf_free_vif (vif); + cfg->p2p.bss_idx[P2PAPI_BSSCFG_CONNECTION ].vif =NULL ;return err; }
Signature · 1 line
1.7.10.4
PATCH 9/27 brcmfmac: add p2p change vif routines.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Add support for changing existing interface into p2p go interface.
--- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 1 + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 106 +++++++++++++++++--- drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 2 + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 23 ++++- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 4 + 5 files changed, 119 insertions(+), 17 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +1 -0
@@ -26,6 +26,7 @@#include "dhd_bus.h" #include "dhd_proto.h" #include "dhd_dbg.h" +#include "fwil_types.h" #include "p2p.h" #include "wl_cfg80211.h" #include "fwil.h"
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +94 -12
125 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/p2p.h +2 -0
@@ -108,6 +108,8 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name, enum nl80211_iftype type, u32 *flags, struct vif_params *params);int brcmf_p2p_del_vif (struct wiphy *wiphy,struct wireless_dev *wdev); +int brcmf_p2p_ifchange (struct brcmf_cfg80211_info *cfg, +enum brcmf_fil_p2p_if_types if_type);int brcmf_p2p_start_device (struct wiphy *wiphy,struct wireless_dev *wdev);void brcmf_p2p_stop_device (struct wiphy *wiphy,struct wireless_dev *wdev); int brcmf_p2p_scan_prep(struct wiphy *wiphy,
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +18 -5
@@ -26,6 +26,7 @@#include <brcmu_wifi.h> #include "dhd.h" #include "dhd_dbg.h" +#include "fwil_types.h" #include "p2p.h" #include "wl_cfg80211.h" #include "fwil.h"
@@ -445,7 +446,7 @@ static struct wireless_dev *brcmf_cfg80211_add_iface(struct wiphy *wiphy, } } -static void brcmf_set_mpc (struct net_device *ndev,int mpc) +void brcmf_set_mpc (struct net_device *ndev,int mpc) {struct brcmf_if *ifp =netdev_priv (ndev);s32 err =0 ;
@@ -460,7 +461,7 @@ static void brcmf_set_mpc(struct net_device *ndev, int mpc) } } -static s32 +s32 brcmf_notify_escan_complete (struct brcmf_cfg80211_info *cfg,struct net_device *ndev,bool aborted,bool fw_abort)
@@ -567,6 +568,7 @@ brcmf_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, enum nl80211_iftype type, u32 *flags, struct vif_params *params) { + struct brcmf_cfg80211_info *cfg = wiphy_priv(wiphy);struct brcmf_if *ifp =netdev_priv (ndev);struct brcmf_cfg80211_vif *vif = ifp->vif;s32 infra =0 ;
@@ -590,6 +592,7 @@ brcmf_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, infra =1 ;break ;case NL80211_IFTYPE_AP : +case NL80211_IFTYPE_P2P_GO : vif->mode =WL_MODE_AP ; ap =1 ;break ;
@@ -599,8 +602,14 @@ brcmf_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, }if (ap) { -set_bit (BRCMF_VIF_STATUS_AP_CREATING , &vif->sme_state); -brcmf_dbg (INFO ,"IF Type = AP\n" ); +if (type ==NL80211_IFTYPE_P2P_GO ) { +brcmf_dbg (INFO ,"IF Type = P2P GO\n" ); + err =brcmf_p2p_ifchange (cfg,BRCMF_FIL_P2P_IF_GO ); + } +if (!err) { +set_bit (BRCMF_VIF_STATUS_AP_CREATING , &vif->sme_state); +brcmf_dbg (INFO ,"IF Type = AP\n" ); + } }else { err =brcmf_fil_cmd_int_set (ifp,BRCMF_C_SET_INFRA , infra);if (err) {
@@ -4422,7 +4431,6 @@ static s32 brcmf_notify_vif_event(struct brcmf_if *ifp, ifevent->action, ifevent->flags, ifevent->ifidx, ifevent->bssidx); -mutex_lock (&event->vif_event_lock); event->action = ifevent->action; vif = event->vif;
@@ -4453,6 +4461,11 @@ static s32 brcmf_notify_vif_event(struct brcmf_if *ifp,wake_up (&event->vif_wq);return 0 ; +case BRCMF_E_IF_CHANGE : +mutex_unlock (&event->vif_event_lock); +wake_up (&event->vif_wq); +return 0 ; +default :mutex_unlock (&event->vif_event_lock);break ;
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +4 -0
@@ -492,5 +492,9 @@ bool brcmf_cfg80211_vif_event_armed(struct brcmf_cfg80211_info *cfg);int brcmf_cfg80211_wait_vif_event_timeout (struct brcmf_cfg80211_info *cfg,u8 action,ulong timeout);void brcmf_cfg80211_vif_complete (struct brcmf_cfg80211_info *info); +s32 brcmf_notify_escan_complete (struct brcmf_cfg80211_info *cfg, +struct net_device *ndev, +bool aborted,bool fw_abort); +void brcmf_set_mpc (struct net_device *ndev,int mpc);#endif /* _wl_cfg80211_h_ */
Signature · 1 line
1.7.10.4
PATCH 10/27 brcmfmac: Fix bug mgmt_rx_register
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Mask is OR-ed with value in case of deregister. Should be AND-ed.
--- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +1 -1
@@ -3742,7 +3742,7 @@ brcmf_cfg80211_mgmt_frame_register(struct wiphy *wiphy,if (reg) vif->mgmt_rx_reg |=BIT (mgmt_type);else - vif->mgmt_rx_reg |= ~BIT (mgmt_type); + vif->mgmt_rx_reg &= ~BIT (mgmt_type); }
Signature · 1 line
1.7.10.4
PATCH 11/27 brcmfmac: Update connect setup/handling routines for multiple bss.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
In preparation of p2p connections update the sta connect setup and handling routines. Use join iovar and bsscfg commands where applicable. Handle assoc ind per bsscfg (vif) and generalize vndr ie setup to support assoc IEs and support all setup types, e.g. sta, ap and p2p.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 22 ++ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 366 +++++++++++++------- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 2 + 3 files changed, 258 insertions(+), 132 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd.h +22 -0
@@ -377,6 +377,28 @@ struct brcmf_join_params {struct brcmf_assoc_params_le params_le; }; +/* scan params for extended join */ +struct brcmf_join_scan_params_le { +u8 scan_type;/* 0 use default, active or passive scan */ +__le32 nprobes;/* -1 use default, nr of probes per channel */ +__le32 active_time;/* -1 use default, dwell time per channel for +* active scanning +*/ +__le32 passive_time;/* -1 use default, dwell time per channel +* for passive scanning +*/ +__le32 home_time;/* -1 use default, dwell time for the home +* channel between channel scans +*/ +}; + +/* extended join params */ +struct brcmf_ext_join_params_le { +struct brcmf_ssid_le ssid_le;/* {0, ""}: wildcard scan */ +struct brcmf_join_scan_params_le scan_le; +struct brcmf_assoc_params_le assoc_le; +}; +struct brcmf_wsec_key {u32 index;/* key index */ u32 len;/* key length */
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +234 -132
490 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +2 -0
@@ -175,9 +175,11 @@ struct vif_saved_ie {u8 probe_req_ie[VNDR_IES_BUF_LEN ];u8 probe_res_ie[IE_MAX_LEN ];u8 beacon_ie[IE_MAX_LEN ]; +u8 assoc_req_ie[IE_MAX_LEN ];u32 probe_req_ie_len;u32 probe_res_ie_len;u32 beacon_ie_len; +u32 assoc_req_ie_len; };/**
Signature · 1 line
1.7.10.4
PATCH 12/27 brcmfmac: Update AP mode for GO creation.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
With this update it is possible to create an P2P go. Handle the p2p go role in creation and the update beacon from cfg80211. Also store primary bss in global struct. Needed to map cfg device back to primary device.
--- .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 5 + drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 6 +- drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 3 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 255 +++++++++++++------- 4 files changed, 183 insertions(+), 86 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h +5 -0
@@ -39,4 +39,9 @@ struct brcmf_fil_chan_info_le { __le32 scan_channel; }; +struct brcmf_fil_bss_enable_le { +__le32 bsscfg_idx; +__le32 enable; +}; +#endif /* FWIL_TYPES_H_ */
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +4 -2
@@ -691,15 +691,17 @@ void brcmf_p2p_cancel_remain_on_channel(struct brcmf_if *ifp)* * @cfg: driver private data for cfg80211 interface. */ -void brcmf_p2p_attach (struct brcmf_cfg80211_info *cfg) +void brcmf_p2p_attach (struct brcmf_cfg80211_info *cfg, +struct brcmf_cfg80211_vif *vif) {struct brcmf_p2p_info *p2p; p2p = &cfg->p2p; p2p->cfg = cfg; -brcmf_p2p_set_firmware (p2p); + p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY ].vif = vif;brcmf_p2p_generate_bss_mac (p2p); +brcmf_p2p_set_firmware (p2p); }/**
drivers/net/wireless/brcm80211/brcmfmac/p2p.h +2 -1
@@ -102,7 +102,8 @@ struct brcmf_p2p_info {struct ieee80211_channel remain_on_channel; }; -void brcmf_p2p_attach (struct brcmf_cfg80211_info *cfg); +void brcmf_p2p_attach (struct brcmf_cfg80211_info *cfg, +struct brcmf_cfg80211_vif *vif);void brcmf_p2p_detach (struct brcmf_p2p_info *p2p); struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name, enum nl80211_iftype type, u32 *flags,
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +172 -83
356 lines not on this page · raw message
Signature · 1 line
1.7.10.4
PATCH 13/27 brcmfmac: Add handling of receiving P2P action frames.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Once wpa_supplicant has registered for P2P action frames all received action frames for the device are passed up to cfg80211.
--- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 345 ++++++++++++++++++++ drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 3 + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 + 3 files changed, 350 insertions(+)
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +345 -0
@@ -48,6 +48,38 @@#define BRCMF_SCB_TIMEOUT_VALUE 20 +#define P2P_VER 9/* P2P version: 9=WiFi P2P v1.0 */ +#define P2P_PUB_AF_CATEGORY 0x04 +#define P2P_PUB_AF_ACTION 0x09 +#define P2P_AF_CATEGORY 0x7f +#define P2P_OUI "\x50\x6F\x9A"/* P2P OUI */ +#define P2P_OUI_LEN 3/* P2P OUI length */ + +/* WiFi P2P Public Action Frame OUI Subtypes */ +#define P2P_PAF_GON_REQ 0/* Group Owner Negotiation Req */ +#define P2P_PAF_GON_RSP 1/* Group Owner Negotiation Rsp */ +#define P2P_PAF_GON_CONF 2/* Group Owner Negotiation Confirm */ +#define P2P_PAF_INVITE_REQ 3/* P2P Invitation Request */ +#define P2P_PAF_INVITE_RSP 4/* P2P Invitation Response */ +#define P2P_PAF_DEVDIS_REQ 5/* Device Discoverability Request */ +#define P2P_PAF_DEVDIS_RSP 6/* Device Discoverability Response */ +#define P2P_PAF_PROVDIS_REQ 7/* Provision Discovery Request */ +#define P2P_PAF_PROVDIS_RSP 8/* Provision Discovery Response */ +#define P2P_PAF_SUBTYPE_INVALID 255/* Invalid Subtype */ + +/* WiFi P2P Action Frame OUI Subtypes */ +#define P2P_AF_NOTICE_OF_ABSENCE 0/* Notice of Absence */ +#define P2P_AF_PRESENCE_REQ 1/* P2P Presence Request */ +#define P2P_AF_PRESENCE_RSP 2/* P2P Presence Response */ +#define P2P_AF_GO_DISC_REQ 3/* GO Discoverability Request */ + +/* P2P Service Discovery related */ +#define P2PSD_ACTION_CATEGORY 0x04/* Public action frame */ +#define P2PSD_ACTION_ID_GAS_IREQ 0x0a/* GAS Initial Request AF */ +#define P2PSD_ACTION_ID_GAS_IRESP 0x0b/* GAS Initial Response AF */ +#define P2PSD_ACTION_ID_GAS_CREQ 0x0c/* GAS Comback Request AF */ +#define P2PSD_ACTION_ID_GAS_CRESP 0x0d/* GAS Comback Response AF */ +/** * struct brcmf_p2p_disc_st_le - set discovery state in firmware. *
@@ -92,6 +124,261 @@ struct brcmf_p2p_scan_le { };/** +* struct brcmf_p2p_pub_act_frame - WiFi P2P Public Action Frame +* +* @category: P2P_PUB_AF_CATEGORY +* @action: P2P_PUB_AF_ACTION +* @oui[3]: P2P_OUI +* @oui_type: OUI type - P2P_VER +* @subtype: OUI subtype - P2P_TYPE_* +* @dialog_token: nonzero, identifies req/rsp transaction +* @elts[1]: Variable length information elements. +*/ +struct brcmf_p2p_pub_act_frame { +u8 category; +u8 action; +u8 oui[3 ]; +u8 oui_type; +u8 subtype; +u8 dialog_token; +u8 elts[1 ]; +}; + +/** +* struct brcmf_p2p_action_frame - WiFi P2P Action Frame +* +* @category: P2P_AF_CATEGORY +* @OUI[3]: OUI - P2P_OUI +* @type: OUI Type - P2P_VER +* @subtype: OUI Subtype - P2P_AF_* +* @dialog_token: nonzero, identifies req/resp tranaction +* @elts[1]: Variable length information elements. +*/ +struct brcmf_p2p_action_frame { +u8 category; +u8 oui[3 ]; +u8 type; +u8 subtype; +u8 dialog_token; +u8 elts[1 ]; +}; + +/** +* struct brcmf_p2psd_gas_pub_act_frame - Wi-Fi GAS Public Action Frame +* +* @category: 0x04 Public Action Frame +* @action: 0x6c Advertisement Protocol +* @dialog_token: nonzero, identifies req/rsp transaction +* @query_data[1]: Query Data. SD gas ireq SD gas iresp +*/ +struct brcmf_p2psd_gas_pub_act_frame { +u8 category; +u8 action; +u8 dialog_token; +u8 query_data[1 ]; +}; + + +/** +* brcmf_p2p_is_pub_action() - true if p2p public type frame. +* +* @frame: action frame data. +* @frame_len: length of action frame data. +* +* Determine if action frame is p2p public action type +*/ +static bool brcmf_p2p_is_pub_action (void *frame,u32 frame_len) +{ +struct brcmf_p2p_pub_act_frame *pact_frm; + +if (frame ==NULL ) +return false; + + pact_frm = (struct brcmf_p2p_pub_act_frame *)frame; +if (frame_len <sizeof (struct brcmf_p2p_pub_act_frame ) -1 ) +return false; + +if (pact_frm->category ==P2P_PUB_AF_CATEGORY && + pact_frm->action ==P2P_PUB_AF_ACTION && + pact_frm->oui_type ==P2P_VER && +memcmp (pact_frm->oui,P2P_OUI ,P2P_OUI_LEN ) ==0 ) +return true; + +return false; +} + +/** +* brcmf_p2p_is_p2p_action() - true if p2p action type frame. +* +* @frame: action frame data. +* @frame_len: length of action frame data. +* +* Determine if action frame is p2p action type +*/ +static bool brcmf_p2p_is_p2p_action (void *frame,u32 frame_len) +{ +struct brcmf_p2p_action_frame *act_frm; + +if (frame ==NULL ) +return false; + + act_frm = (struct brcmf_p2p_action_frame *)frame; +if (frame_len <sizeof (struct brcmf_p2p_action_frame ) -1 ) +return false; + +if (act_frm->category ==P2P_AF_CATEGORY && + act_frm->type ==P2P_VER && +memcmp (act_frm->oui,P2P_OUI ,P2P_OUI_LEN ) ==0 ) +return true; + +return false; +} + +/** +* brcmf_p2p_is_gas_action() - true if p2p gas action type frame. +* +* @frame: action frame data. +* @frame_len: length of action frame data. +* +* Determine if action frame is p2p gas action type +*/ +static bool brcmf_p2p_is_gas_action (void *frame,u32 frame_len) +{ +struct brcmf_p2psd_gas_pub_act_frame *sd_act_frm; + +if (frame ==NULL ) +return false; + + sd_act_frm = (struct brcmf_p2psd_gas_pub_act_frame *)frame; +if (frame_len <sizeof (struct brcmf_p2psd_gas_pub_act_frame ) -1 ) +return false; + +if (sd_act_frm->category !=P2PSD_ACTION_CATEGORY ) +return false; + +if (sd_act_frm->action ==P2PSD_ACTION_ID_GAS_IREQ || + sd_act_frm->action ==P2PSD_ACTION_ID_GAS_IRESP || + sd_act_frm->action ==P2PSD_ACTION_ID_GAS_CREQ || + sd_act_frm->action ==P2PSD_ACTION_ID_GAS_CRESP ) +return true; + +return false; +} + +/** +* brcmf_p2p_print_actframe() - debug print routine. +* +* @tx: Received or to be transmitted +* @frame: action frame data. +* @frame_len: length of action frame data. +* +* Print information about the p2p action frame +*/ +static void brcmf_p2p_print_actframe (bool tx,void *frame,u32 frame_len) +{ +struct brcmf_p2p_pub_act_frame *pact_frm; +struct brcmf_p2p_action_frame *act_frm; +struct brcmf_p2psd_gas_pub_act_frame *sd_act_frm; + +if (!frame || frame_len <=2 ) +return ; + +if (brcmf_p2p_is_pub_action (frame, frame_len)) { + pact_frm = (struct brcmf_p2p_pub_act_frame *)frame; +switch (pact_frm->subtype) { +case P2P_PAF_GON_REQ : +brcmf_dbg (TRACE ,"%s P2P Group Owner Negotiation Req Frame\n" , + (tx) ?"TX" :"RX" ); +break ; +case P2P_PAF_GON_RSP : +brcmf_dbg (TRACE ,"%s P2P Group Owner Negotiation Rsp Frame\n" , + (tx) ?"TX" :"RX" ); +break ; +case P2P_PAF_GON_CONF : +brcmf_dbg (TRACE ,"%s P2P Group Owner Negotiation Confirm Frame\n" , + (tx) ?"TX" :"RX" ); +break ; +case P2P_PAF_INVITE_REQ : +brcmf_dbg (TRACE ,"%s P2P Invitation Request Frame\n" , + (tx) ?"TX" :"RX" ); +break ; +case P2P_PAF_INVITE_RSP : +brcmf_dbg (TRACE ,"%s P2P Invitation Response Frame\n" , + (tx) ?"TX" :"RX" ); +break ; +case P2P_PAF_DEVDIS_REQ : +brcmf_dbg (TRACE ,"%s P2P Device Discoverability Request Frame\n" , + (tx) ?"TX" :"RX" ); +break ; +case P2P_PAF_DEVDIS_RSP : +brcmf_dbg (TRACE ,"%s P2P Device Discoverability Response Frame\n" , + (tx) ?"TX" :"RX" ); +break ; +case P2P_PAF_PROVDIS_REQ : +brcmf_dbg (TRACE ,"%s P2P Provision Discovery Request Frame\n" , + (tx) ?"TX" :"RX" ); +break ; +case P2P_PAF_PROVDIS_RSP : +brcmf_dbg (TRACE ,"%s P2P Provision Discovery Response Frame\n" , + (tx) ?"TX" :"RX" ); +break ; +default : +brcmf_dbg (TRACE ,"%s Unknown P2P Public Action Frame\n" , + (tx) ?"TX" :"RX" ); +break ; + } + }else if (brcmf_p2p_is_p2p_action (frame, frame_len)) { + act_frm = (struct brcmf_p2p_action_frame *)frame; +switch (act_frm->subtype) { +case P2P_AF_NOTICE_OF_ABSENCE : +brcmf_dbg (TRACE ,"%s P2P Notice of Absence Frame\n" , + (tx) ?"TX" :"RX" ); +break ; +case P2P_AF_PRESENCE_REQ : +brcmf_dbg (TRACE ,"%s P2P Presence Request Frame\n" , + (tx) ?"TX" :"RX" ); +break ; +case P2P_AF_PRESENCE_RSP : +brcmf_dbg (TRACE ,"%s P2P Presence Response Frame\n" , + (tx) ?"TX" :"RX" ); +break ; +case P2P_AF_GO_DISC_REQ : +brcmf_dbg (TRACE ,"%s P2P Discoverability Request Frame\n" , + (tx) ?"TX" :"RX" ); +break ; +default : +brcmf_dbg (TRACE ,"%s Unknown P2P Action Frame\n" , + (tx) ?"TX" :"RX" ); + } + + }else if (brcmf_p2p_is_gas_action (frame, frame_len)) { + sd_act_frm = (struct brcmf_p2psd_gas_pub_act_frame *)frame; +switch (sd_act_frm->action) { +case P2PSD_ACTION_ID_GAS_IREQ : +brcmf_dbg (TRACE ,"%s P2P GAS Initial Request\n" , + (tx) ?"TX" :"RX" ); +break ; +case P2PSD_ACTION_ID_GAS_IRESP : +brcmf_dbg (TRACE ,"%s P2P GAS Initial Response\n" , + (tx) ?"TX" :"RX" ); +break ; +case P2PSD_ACTION_ID_GAS_CREQ : +brcmf_dbg (TRACE ,"%s P2P GAS Comback Request\n" , + (tx) ?"TX" :"RX" ); +break ; +case P2PSD_ACTION_ID_GAS_CRESP : +brcmf_dbg (TRACE ,"%s P2P GAS Comback Response\n" , + (tx) ?"TX" :"RX" ); +break ; +default : +brcmf_dbg (TRACE ,"%s Unknown P2P GAS Frame\n" , + (tx) ?"TX" :"RX" ); +break ; + } + } +} + +/** * brcmf_p2p_set_firmware() - prepare firmware for peer-to-peer operation. * * @p2p: P2P specific data.
@@ -687,6 +974,64 @@ void brcmf_p2p_cancel_remain_on_channel(struct brcmf_if *ifp)/** +* brcmf_p2p_notify_action_frame_rx() - received action frame. +* +* @ifp: interfac control. +* @e: event message. Not used, to make it usable for fweh event dispatcher. +* @data: payload of message, containing action frame data. +* +*/ +int brcmf_p2p_notify_action_frame_rx (struct brcmf_if *ifp, +const struct brcmf_event_msg *e, +void *data) +{ +struct wireless_dev *wdev; +u32 mgmt_frame_len = e->datalen -sizeof (struct brcmf_rx_mgmt_data ); +struct brcmf_rx_mgmt_data *rxframe = (struct brcmf_rx_mgmt_data *)data; +u16 chanspec =be16_to_cpu (rxframe->chanspec); +struct ieee80211_mgmt *mgmt_frame; +s32 err; +s32 freq; +u16 mgmt_type; + +/* Check if wpa_supplicant has registered for this frame */ +brcmf_dbg (INFO ,"ifp->vif->mgmt_rx_reg %04x\n" , ifp->vif->mgmt_rx_reg); + mgmt_type = (IEEE80211_STYPE_ACTION &IEEE80211_FCTL_STYPE ) >>4 ; +if ((ifp->vif->mgmt_rx_reg &BIT (mgmt_type)) ==0 ) +return 0 ; + +brcmf_p2p_print_actframe (false, (u8 *)(rxframe +1 ), mgmt_frame_len); + + mgmt_frame =kzalloc (offsetof(struct ieee80211_mgmt , u) + + mgmt_frame_len,GFP_KERNEL ); +if (!mgmt_frame) { +brcmf_err ("No memory available for action frame\n" ); +return -ENOMEM ; + } +memcpy (mgmt_frame->da, ifp->mac_addr,ETH_ALEN ); + err =brcmf_fil_cmd_data_get (ifp,BRCMF_C_GET_BSSID , mgmt_frame->bssid, +ETH_ALEN ); +if (err <0 ) +brcmf_err ("BRCMF_C_GET_BSSID error %d\n" , err); +memcpy (mgmt_frame->sa, e->addr,ETH_ALEN ); + mgmt_frame->frame_control =cpu_to_le16 (IEEE80211_STYPE_ACTION ); +memcpy (&mgmt_frame->u, (u8 *)(rxframe +1 ), mgmt_frame_len); + mgmt_frame_len += offsetof(struct ieee80211_mgmt , u); + + freq =ieee80211_channel_to_frequency (CHSPEC_CHANNEL (chanspec), +CHSPEC_IS2G (chanspec) ? +IEEE80211_BAND_2GHZ : +IEEE80211_BAND_5GHZ ); + wdev = ifp->ndev->ieee80211_ptr; +cfg80211_rx_mgmt (wdev, freq,0 , (u8 *)mgmt_frame, mgmt_frame_len, +GFP_ATOMIC ); + +kfree (mgmt_frame); +return 0 ; +} + + +/** * brcmf_p2p_attach() - attach for P2P. * * @cfg: driver private data for cfg80211 interface.
drivers/net/wireless/brcm80211/brcmfmac/p2p.h +3 -0
@@ -123,5 +123,8 @@ int brcmf_p2p_notify_listen_complete(struct brcmf_if *ifp,const struct brcmf_event_msg *e, void *data);void brcmf_p2p_cancel_remain_on_channel (struct brcmf_if *ifp); +int brcmf_p2p_notify_action_frame_rx (struct brcmf_if *ifp, +const struct brcmf_event_msg *e, +void *data);#endif /* WL_CFGP2P_H_ */
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +2 -0
@@ -4701,6 +4701,8 @@ static void brcmf_register_event_handlers(struct brcmf_cfg80211_info *cfg) brcmf_notify_rx_mgmt_p2p_probereq);brcmf_fweh_register (cfg->pub,BRCMF_E_P2P_DISC_LISTEN_COMPLETE , brcmf_p2p_notify_listen_complete); +brcmf_fweh_register (cfg->pub,BRCMF_E_ACTION_FRAME_RX , + brcmf_p2p_notify_action_frame_rx); }static void brcmf_deinit_priv_mem (struct brcmf_cfg80211_info *cfg)
Signature · 1 line
1.7.10.4
PATCH 14/27 brcmfmac: P2P action frame tx.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
With this patch it is possible to send action frames.
--- .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 19 ++ drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 294 +++++++++++++++++++- drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 10 + .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 41 ++- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 1 + 5 files changed, 361 insertions(+), 4 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/fwil_types.h +19 -0
@@ -20,6 +20,10 @@#include <linux/if_ether.h> + +#define BRCMF_FIL_ACTION_FRAME_SIZE 1800 + +enum brcmf_fil_p2p_if_types {BRCMF_FIL_P2P_IF_CLIENT ,BRCMF_FIL_P2P_IF_GO ,
@@ -39,6 +43,21 @@ struct brcmf_fil_chan_info_le {__le32 scan_channel; }; +struct brcmf_fil_action_frame_le { +u8 da[ETH_ALEN ]; +__le16 len; +__le32 packet_id; +u8 data[BRCMF_FIL_ACTION_FRAME_SIZE ]; +}; + +struct brcmf_fil_af_params_le { +__le32 channel; +__le32 dwell_time; +u8 bssid[ETH_ALEN ]; +u8 pad[2 ]; +struct brcmf_fil_action_frame_le action_frame; +}; +struct brcmf_fil_bss_enable_le {__le32 bsscfg_idx;__le32 enable;
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +291 -3
330 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/p2p.h +10 -0
@@ -89,6 +89,8 @@ enum brcmf_p2p_status {* @ssid: ssid for P2P GO. * @listen_channel: channel for @WL_P2P_DISC_ST_LISTEN discover state. * @remain_on_channel: contains copy of struct used by cfg80211. +* @next_af_subtype: expected action frame subtype. +* @send_af_done: indication that action frame tx is complete. */ struct brcmf_p2p_info {struct brcmf_cfg80211_info *cfg;
@@ -100,6 +102,8 @@ struct brcmf_p2p_info {struct brcmf_ssid ssid;u8 listen_channel;struct ieee80211_channel remain_on_channel; +u8 next_af_subtype; +struct completion send_af_done; }; void brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg,
@@ -126,5 +130,11 @@ void brcmf_p2p_cancel_remain_on_channel(struct brcmf_if *ifp);int brcmf_p2p_notify_action_frame_rx (struct brcmf_if *ifp,const struct brcmf_event_msg *e,void *data); +int brcmf_p2p_notify_action_tx_complete (struct brcmf_if *ifp, +const struct brcmf_event_msg *e, +void *data); +bool brcmf_p2p_send_action_frame (struct brcmf_cfg80211_info *cfg, +struct net_device *ndev, +struct brcmf_fil_af_params_le *af_params);#endif /* WL_CFGP2P_H_ */
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +40 -1
70 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +1 -0
@@ -498,5 +498,6 @@ s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,struct net_device *ndev, bool aborted, bool fw_abort);void brcmf_set_mpc (struct net_device *ndev,int mpc); +void brcmf_abort_scanning (struct brcmf_cfg80211_info *cfg);#endif /* _wl_cfg80211_h_ */
Signature · 1 line
1.7.10.4
PATCH 15/27 brcmfmac: Use real cookie value for p2p remain on channel.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
In some rare situations the wpa_supplicant can lock up on a remain on channel command. Use actual cookies for the remain on channel related commands and allow for additional remain on channel while still having one set.
--- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 61 +++++++++++++++++++------ drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 6 ++- 2 files changed, 51 insertions(+), 16 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +47 -14
@@ -913,6 +913,47 @@ int brcmf_p2p_scan_prep(struct wiphy *wiphy,/** +* brcmf_p2p_discover_listen() - set firmware to discover listen state. +* +* @p2p: p2p device. +* @freq: center frequency for discover listen. +* #@duration: time in ms to stay on channel. +* +*/ +static s32 +brcmf_p2p_discover_listen (struct brcmf_p2p_info *p2p, +struct ieee80211_channel *channel,u32 duration) +{ +struct brcmf_cfg80211_vif *vif; +s32 err =0 ; +u16 chanspec; + + vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE ].vif; +if (!vif) { +brcmf_err ("Discovery is not set, so we have nothing to do\n" ); + err = -EPERM ; + goto exit; + } + +if (test_bit (BRCMF_P2P_STATUS_DISCOVER_LISTEN , &p2p->status)) { +brcmf_err ("Previous LISTEN is not completed yet\n" ); +/* WAR: prevent cookie mismatch in wpa_supplicant return OK */ + goto exit; + } + + chanspec =channel_to_chanspec (channel); + err =brcmf_p2p_set_discover_state (vif->ifp,WL_P2P_DISC_ST_LISTEN , + chanspec, (u16 )duration); +if (!err) { +set_bit (BRCMF_P2P_STATUS_DISCOVER_LISTEN , &p2p->status); + p2p->remain_on_channel_cookie++; + } +exit: +return err; +} + + +/** * brcmf_p2p_remain_on_channel() - put device on channel and stay there. * * @wiphy: wiphy device.
@@ -926,30 +967,21 @@ int brcmf_p2p_remain_on_channel(struct wiphy *wiphy, struct wireless_dev *wdev, {struct brcmf_cfg80211_info *cfg =wiphy_to_cfg (wiphy);struct brcmf_p2p_info *p2p = &cfg->p2p; -struct brcmf_cfg80211_vif *vif;s32 err; -u16 chanspec;brcmf_dbg (TRACE ,"Enter, channel: %d, duration ms (%d)\n" ,ieee80211_frequency_to_channel (channel->center_freq), duration); - *cookie =0 ; err =brcmf_p2p_enable_discovery (p2p);if (err) goto exit; - - chanspec =channel_to_chanspec (channel); - vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE ].vif; - err =brcmf_p2p_set_discover_state (vif->ifp,WL_P2P_DISC_ST_LISTEN , - chanspec, (u16 )duration); + err =brcmf_p2p_discover_listen (p2p, channel, duration);if (err) goto exit; -memcpy (&p2p->remain_on_channel, channel, -sizeof (p2p->remain_on_channel)); - -set_bit (BRCMF_P2P_STATUS_REMAIN_ON_CHANNEL , &p2p->status); +memcpy (&p2p->remain_on_channel, channel,sizeof (*channel)); + *cookie = p2p->remain_on_channel_cookie; exit:cfg80211_ready_on_channel (wdev, *cookie, channel, duration,GFP_KERNEL );
@@ -973,9 +1005,10 @@ int brcmf_p2p_notify_listen_complete(struct brcmf_if *ifp,struct brcmf_p2p_info *p2p = &cfg->p2p;brcmf_dbg (TRACE ,"Enter\n" ); -if (test_and_clear_bit (BRCMF_P2P_STATUS_REMAIN_ON_CHANNEL , +if (test_and_clear_bit (BRCMF_P2P_STATUS_DISCOVER_LISTEN , &p2p->status)) -cfg80211_remain_on_channel_expired (&ifp->vif->wdev,0 , +cfg80211_remain_on_channel_expired (&ifp->vif->wdev, + p2p->remain_on_channel_cookie, &p2p->remain_on_channel,GFP_KERNEL );return 0 ;
drivers/net/wireless/brcm80211/brcmfmac/p2p.h +4 -2
@@ -63,7 +63,7 @@ struct p2p_bss {* @BRCMF_P2P_STATUS_ACTION_TX_COMPLETED: action frame tx completed. * @BRCMF_P2P_STATUS_ACTION_TX_NOACK: action frame tx not acked. * @BRCMF_P2P_STATUS_GO_NEG_PHASE: P2P GO negotiation ongoing. -* @BRCMF_P2P_STATUS_REMAIN_ON_CHANNEL: P2P listen, remaining on channel. +* @BRCMF_P2P_STATUS_DISCOVER_LISTEN: P2P listen, remaining on channel. */ enum brcmf_p2p_status {BRCMF_P2P_STATUS_IF_ADD =0 ,
@@ -74,7 +74,7 @@ enum brcmf_p2p_status {BRCMF_P2P_STATUS_ACTION_TX_COMPLETED ,BRCMF_P2P_STATUS_ACTION_TX_NOACK ,BRCMF_P2P_STATUS_GO_NEG_PHASE , - BRCMF_P2P_STATUS_REMAIN_ON_CHANNEL + BRCMF_P2P_STATUS_DISCOVER_LISTEN };/**
@@ -89,6 +89,7 @@ enum brcmf_p2p_status {* @ssid: ssid for P2P GO. * @listen_channel: channel for @WL_P2P_DISC_ST_LISTEN discover state. * @remain_on_channel: contains copy of struct used by cfg80211. +* @remain_on_channel_cookie: cookie counter for remain on channel cmd * @next_af_subtype: expected action frame subtype. * @send_af_done: indication that action frame tx is complete. */
@@ -102,6 +103,7 @@ struct brcmf_p2p_info {struct brcmf_ssid ssid;u8 listen_channel;struct ieee80211_channel remain_on_channel; +u32 remain_on_channel_cookie;u8 next_af_subtype;struct completion send_af_done; };
Signature · 1 line
1.7.10.4
PATCH 16/27 brcmfmac: change function signatures
In reply to Arend van Sprielcfg80211 api change needs to be applied. this change will be squashed with introducing commit:
commit 68751daec95b07a74b18aa22b2f9c196991dbe81
Author: Hante Meuleman <[email protected]> Date: Mon Nov 26 12:21:27 2012 +0100
brcmfmac: add support for P2P listen mode.
--- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +1 -1
@@ -982,9 +982,9 @@ int brcmf_p2p_remain_on_channel(struct wiphy *wiphy, struct wireless_dev *wdev,memcpy (&p2p->remain_on_channel, channel,sizeof (*channel)); *cookie = p2p->remain_on_channel_cookie; +cfg80211_ready_on_channel (wdev, *cookie, channel, duration,GFP_KERNEL ); exit: -cfg80211_ready_on_channel (wdev, *cookie, channel, duration,GFP_KERNEL );return err; }
Signature · 1 line
1.7.10.4
PATCH 17/27 brcmfmac: Create p2p0 netdev via module variable.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Add module variable with which a p2p0 netdev can be created. This netdev can be used by wpa-supplicant to configure and set up the p2p client/GO.
--- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 109 ++++++++-- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 226 ++++++++++---------- drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 6 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 12 +- 4 files changed, 213 insertions(+), 140 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +91 -18
@@ -42,6 +42,12 @@ MODULE_LICENSE("Dual BSD/GPL");int brcmf_msg_level;module_param (brcmf_msg_level, int,0 ); +/* P2P0 enable */ +static int brcmf_p2p_enable; +#ifdef CONFIG_BRCMDBG +module_param_named (p2pon, brcmf_p2p_enable, int,0 ); +MODULE_PARM_DESC (p2pon,"enable p2p management functionality" ); +#endif char *brcmf_ifname (struct brcmf_pub *drvr,int ifidx) {
@@ -593,16 +599,6 @@ static const struct net_device_ops brcmf_netdev_ops_pri = { .ndo_set_rx_mode = brcmf_netdev_set_multicast_list }; -static const struct net_device_ops brcmf_netdev_ops_virt = { - .ndo_open = brcmf_cfg80211_up, - .ndo_stop = brcmf_cfg80211_down, - .ndo_get_stats = brcmf_netdev_get_stats, - .ndo_do_ioctl = brcmf_netdev_ioctl_entry, - .ndo_start_xmit = brcmf_netdev_start_xmit, - .ndo_set_mac_address = brcmf_netdev_set_mac_address, - .ndo_set_rx_mode = brcmf_netdev_set_multicast_list -}; -int brcmf_net_attach (struct brcmf_if *ifp) {struct brcmf_pub *drvr = ifp->drvr;
@@ -613,10 +609,7 @@ int brcmf_net_attach(struct brcmf_if *ifp) ndev = ifp->ndev;/* set appropriate operations */ -if (!ifp->bssidx) - ndev->netdev_ops = &brcmf_netdev_ops_pri; -else - ndev->netdev_ops = &brcmf_netdev_ops_virt; + ndev->netdev_ops = &brcmf_netdev_ops_pri; ndev->hard_header_len =ETH_HLEN + drvr->hdrlen; ndev->ethtool_ops = &brcmf_ethtool_ops;
@@ -627,6 +620,9 @@ int brcmf_net_attach(struct brcmf_if *ifp)/* set the mac address */ memcpy (ndev->dev_addr, ifp->mac_addr,ETH_ALEN ); +INIT_WORK (&ifp->setmacaddr_work, _brcmf_set_mac_address); +INIT_WORK (&ifp->multicast_work, _brcmf_set_multicast_list); +if (register_netdev (ndev) !=0 ) {brcmf_err ("couldn't register the net device\n" ); goto fail;
@@ -641,6 +637,69 @@ fail:return -EBADE ; } +static int brcmf_net_p2p_open (struct net_device *ndev) +{ +brcmf_dbg (TRACE ,"Enter\n" ); + +return brcmf_cfg80211_up (ndev); +} + +static int brcmf_net_p2p_stop (struct net_device *ndev) +{ +brcmf_dbg (TRACE ,"Enter\n" ); + +return brcmf_cfg80211_down (ndev); +} + +static int brcmf_net_p2p_do_ioctl (struct net_device *ndev, +struct ifreq *ifr,int cmd) +{ +brcmf_dbg (TRACE ,"Enter\n" ); +return 0 ; +} + +static netdev_tx_t brcmf_net_p2p_start_xmit (struct sk_buff *skb, +struct net_device *ndev) +{ +if (skb) +dev_kfree_skb_any (skb); + +return NETDEV_TX_OK ; +} + +static const struct net_device_ops brcmf_netdev_ops_p2p = { + .ndo_open = brcmf_net_p2p_open, + .ndo_stop = brcmf_net_p2p_stop, + .ndo_do_ioctl = brcmf_net_p2p_do_ioctl, + .ndo_start_xmit = brcmf_net_p2p_start_xmit +}; + +static int brcmf_net_p2p_attach (struct brcmf_if *ifp) +{ +struct net_device *ndev; + +brcmf_dbg (TRACE ,"Enter, idx=%d mac=%pM\n" , ifp->bssidx, + ifp->mac_addr); + ndev = ifp->ndev; + + ndev->netdev_ops = &brcmf_netdev_ops_p2p; + +/* set the mac address */ +memcpy (ndev->dev_addr, ifp->mac_addr,ETH_ALEN ); + +if (register_netdev (ndev) !=0 ) { +brcmf_err ("couldn't register the p2p net device\n" ); + goto fail; + } + +brcmf_dbg (INFO ,"%s: Broadcom Dongle Host Driver\n" , ndev->name); + +return 0 ; + +fail: +return -EBADE ; +} +struct brcmf_if *brcmf_add_if (struct brcmf_pub *drvr,s32 bssidx,s32 ifidx,char *name,u8 *mac_addr) {
@@ -682,8 +741,6 @@ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bssidx, s32 ifidx, ifp->ifidx = ifidx; ifp->bssidx = bssidx; -INIT_WORK (&ifp->setmacaddr_work, _brcmf_set_mac_address); -INIT_WORK (&ifp->multicast_work, _brcmf_set_multicast_list);init_waitqueue_head (&ifp->pend_8021x_wait);
@@ -717,8 +774,10 @@ void brcmf_del_if(struct brcmf_pub *drvr, s32 bssidx)netif_stop_queue (ifp->ndev); } -cancel_work_sync (&ifp->setmacaddr_work); -cancel_work_sync (&ifp->multicast_work); +if (ifp->ndev->netdev_ops == &brcmf_netdev_ops_pri) { +cancel_work_sync (&ifp->setmacaddr_work); +cancel_work_sync (&ifp->multicast_work); + }unregister_netdev (ifp->ndev); drvr->iflist[bssidx] =NULL ;
@@ -776,6 +835,7 @@ int brcmf_bus_start(struct device *dev)struct brcmf_bus *bus_if =dev_get_drvdata (dev);struct brcmf_pub *drvr = bus_if->drvr;struct brcmf_if *ifp; +struct brcmf_if *p2p_ifp;brcmf_dbg (TRACE ,"\n" );
@@ -791,6 +851,13 @@ int brcmf_bus_start(struct device *dev)if (IS_ERR (ifp))return PTR_ERR (ifp); +if (brcmf_p2p_enable) + p2p_ifp =brcmf_add_if (drvr,1 ,0 ,"p2p%d" ,NULL ); +else + p2p_ifp =NULL ; +if (IS_ERR (p2p_ifp)) + p2p_ifp =NULL ; +/* signal bus ready */ bus_if->state =BRCMF_BUS_DATA ;
@@ -817,8 +884,14 @@ fail:brcmf_cfg80211_detach (drvr->config);free_netdev (ifp->ndev); drvr->iflist[0 ] =NULL ; +if (p2p_ifp) { +free_netdev (p2p_ifp->ndev); + drvr->iflist[1 ] =NULL ; + }return ret; } +if ((brcmf_p2p_enable) && (p2p_ifp)) +brcmf_net_p2p_attach (p2p_ifp);return 0 ; }
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +109 -117
310 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/p2p.h +3 -3
@@ -66,7 +66,8 @@ struct p2p_bss {* @BRCMF_P2P_STATUS_DISCOVER_LISTEN: P2P listen, remaining on channel. */ enum brcmf_p2p_status { -BRCMF_P2P_STATUS_IF_ADD =0 , +BRCMF_P2P_STATUS_ENABLED , +BRCMF_P2P_STATUS_IF_ADD ,BRCMF_P2P_STATUS_IF_DEL ,BRCMF_P2P_STATUS_IF_DELETING ,BRCMF_P2P_STATUS_IF_CHANGING ,
@@ -108,8 +109,7 @@ struct brcmf_p2p_info {struct completion send_af_done; }; -void brcmf_p2p_attach (struct brcmf_cfg80211_info *cfg, -struct brcmf_cfg80211_vif *vif); +s32 brcmf_p2p_attach (struct brcmf_cfg80211_info *cfg);void brcmf_p2p_detach (struct brcmf_p2p_info *p2p); struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name, enum nl80211_iftype type, u32 *flags,
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +10 -2
@@ -4857,11 +4857,19 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,brcmf_err ("Failed to init iwm_priv (%d)\n" , err); goto cfg80211_attach_out; } -brcmf_p2p_attach (cfg, vif); - ifp->vif = vif; + + err =brcmf_p2p_attach (cfg); +if (err) { +brcmf_err ("P2P initilisation failed (%d)\n" , err); + goto cfg80211_p2p_attach_out; + } +return cfg; +cfg80211_p2p_attach_out: +wl_deinit_priv (cfg); + cfg80211_attach_out:brcmf_free_vif (vif);wiphy_free (wiphy);
Signature · 1 line
1.7.10.4
PATCH 18/27 brcmfmac: Use role from wdev on AP commands and fix stop_ap.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Use the stored role in wdev struct to determine AP/GO role. This simplifies code. Fix stop_ap for GO role.
--- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 51 ++++++-------------- 1 file changed, 14 insertions(+), 37 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +14 -37
@@ -3655,7 +3655,6 @@ static s32 brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_ap_settings *settings) { - struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy); s32 ie_offset;struct brcmf_if *ifp =netdev_priv (ndev);struct brcmf_tlv *ssid_ie;
@@ -3675,22 +3674,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev, settings->ssid, settings->ssid_len, settings->auth_type, settings->inactivity_timeout); -if (ifp->vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY ].vif) { -brcmf_dbg (TRACE ,"Role = AP\n" ); - dev_role =NL80211_IFTYPE_AP ; -if (!test_bit (BRCMF_VIF_STATUS_AP_CREATING , - &ifp->vif->sme_state)) { -brcmf_err ("Not in AP creation mode\n" ); -return -EPERM ; - } - }else { -brcmf_dbg (TRACE ,"Role = P2P GO\n" ); - dev_role =NL80211_IFTYPE_P2P_GO ; -if (ifp->vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE ].vif) { - ifp = cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY ].vif->ifp; - ndev = ifp->ndev; - } - } + dev_role = ifp->vif->wdev.iftype;memset (&ssid_le,0 ,sizeof (ssid_le));if (settings->ssid ==NULL || settings->ssid_len ==0 ) {
@@ -3826,10 +3810,11 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev) {struct brcmf_if *ifp =netdev_priv (ndev);s32 err = -EPERM ; +struct brcmf_fil_bss_enable_le bss_enable;brcmf_dbg (TRACE ,"Enter\n" ); -if (ifp->vif->mode ==WL_MODE_AP ) { +if (ifp->vif->wdev.iftype ==NL80211_IFTYPE_AP ) {/* Due to most likely deauths outstanding we sleep */ /* first to make sure they get processed by fw. */ msleep (400 );
@@ -3843,10 +3828,18 @@ static int brcmf_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *ndev)brcmf_err ("BRCMF_C_UP error %d\n" , err); goto exit; } -brcmf_set_mpc (ndev,1 ); -clear_bit (BRCMF_VIF_STATUS_AP_CREATING , &ifp->vif->sme_state); -clear_bit (BRCMF_VIF_STATUS_AP_CREATED , &ifp->vif->sme_state); + }else { + bss_enable.bsscfg_idx =cpu_to_le32 (ifp->bssidx); + bss_enable.enable =cpu_to_le32 (0 ); + err =brcmf_fil_iovar_data_set (ifp,"bss" , &bss_enable, +sizeof (bss_enable)); +if (err <0 ) +brcmf_err ("bss_enable config failed %d\n" , err); } +brcmf_set_mpc (ndev,1 ); +set_bit (BRCMF_VIF_STATUS_AP_CREATING , &ifp->vif->sme_state); +clear_bit (BRCMF_VIF_STATUS_AP_CREATED , &ifp->vif->sme_state); + exit:return err; }
@@ -3855,27 +3848,11 @@ static s32 brcmf_cfg80211_change_beacon(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_beacon_data *info) { - struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy); struct brcmf_if *ifp = netdev_priv(ndev);s32 err;brcmf_dbg (TRACE ,"Enter\n" ); -if (ifp->vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY ].vif) { -brcmf_dbg (TRACE ,"Role = AP\n" ); -if (!test_bit (BRCMF_VIF_STATUS_AP_CREATED , - &ifp->vif->sme_state)) { -brcmf_err ("AP was not yet created\n" ); -return -EPERM ; - } - }else { -brcmf_dbg (TRACE ,"Role = P2P GO\n" ); -if (ifp->vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE ].vif) { - ifp = cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY ].vif->ifp; - ndev = ifp->ndev; - } - } - err =brcmf_config_ap_mgmt_ie (ifp->vif, info);return err;
Signature · 1 line
1.7.10.4
PATCH 19/27 brcmfmac: Put printing action frames code under debug flag.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
--- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +11 -0
@@ -300,6 +300,9 @@ static bool brcmf_p2p_is_gas_action(void *frame, u32 frame_len)* * Print information about the p2p action frame */ + +#ifdef DEBUG +static void brcmf_p2p_print_actframe (bool tx,void *frame,u32 frame_len) {struct brcmf_p2p_pub_act_frame *pact_frm;
@@ -404,6 +407,14 @@ static void brcmf_p2p_print_actframe(bool tx, void *frame, u32 frame_len) } } +#else + +static void brcmf_p2p_print_actframe (bool tx,void *frame,u32 frame_len) +{ +} + +#endif +/** * brcmf_p2p_set_firmware() - prepare firmware for peer-to-peer operation. *
Signature · 1 line
1.7.10.4
PATCH 20/27 brcmfmac: Ignore E_ADD_IF for ifidx 0.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
All interfaces for ifidx is 0 are created ahead and therefor double registrations for not only bssidx 0, but ifidx 0 should be ignored in brcfm_add_if.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +1 -1
@@ -716,7 +716,7 @@ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bssidx, s32 ifidx,if (ifp) {brcmf_err ("ERROR: netdev:%s already exists\n" , ifp->ndev->name); -if (bssidx) { +if (ifidx) {netif_stop_queue (ifp->ndev);unregister_netdev (ifp->ndev);free_netdev (ifp->ndev);
Signature · 1 line
1.7.10.4
PATCH 21/27 brcmfmac: Reject change vif for p2p if.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
--- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +12 -0
@@ -673,6 +673,18 @@ brcmf_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, infra =0 ;break ;case NL80211_IFTYPE_STATION : +/* Ignore change for p2p IF. Unclear why supplicant does this */ +if ((vif->wdev.iftype ==NL80211_IFTYPE_P2P_CLIENT ) || + (vif->wdev.iftype ==NL80211_IFTYPE_P2P_GO )) { +brcmf_dbg (TRACE ,"Ignoring cmd for p2p if\n" ); +/* WAR: It is unexpected to get a change of VIF for P2P +* IF, but it happens. The request can not be handled +* but returning EPERM causes a crash. Returning 0 +* without setting ieee80211_ptr->iftype causes trace +* (WARN_ON) but it works with wpa_supplicant +*/ +return 0 ; + } vif->mode =WL_MODE_BSS ; infra =1 ;break ;
Signature · 1 line
1.7.10.4
PATCH 22/27 brcmfmac: Update netdev configuration in wiphy for p2p.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Wiphy object holds information about possible netdev combinations which can be supported. This needs updating for p2p device. Also p2p device netdev has wrong 80211 iftype. Limit the change interface support to match the netdev configuration/combination possibilities.
--- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +1 -1
@@ -1320,7 +1320,7 @@ s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg) p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY ].vif = pri_ifp->vif;if (p2p_ifp) { - p2p_vif =brcmf_alloc_vif (cfg,NL80211_IFTYPE_STATION , + p2p_vif =brcmf_alloc_vif (cfg,NL80211_IFTYPE_P2P_DEVICE , false);if (IS_ERR (p2p_vif)) {brcmf_err ("could not create discovery vif\n" );
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +8 -3
@@ -4163,20 +4163,24 @@ static void brcmf_wiphy_pno_params(struct wiphy *wiphy)static const struct ieee80211_iface_limit brcmf_iface_limits[] = { { - .max =1 , + .max =2 , .types =BIT (NL80211_IFTYPE_STATION ) |BIT (NL80211_IFTYPE_ADHOC ) |BIT (NL80211_IFTYPE_AP ) }, { .max =1 , + .types =BIT (NL80211_IFTYPE_P2P_DEVICE ) + }, + { + .max =1 , .types =BIT (NL80211_IFTYPE_P2P_CLIENT ) |BIT (NL80211_IFTYPE_P2P_GO ) }, };static const struct ieee80211_iface_combination brcmf_iface_combos[] = { { - .max_interfaces =BRCMF_IFACE_MAX_CNT -1 , + .max_interfaces =BRCMF_IFACE_MAX_CNT , .num_different_channels =1 ,/* no multi-channel for now */ .n_limits =ARRAY_SIZE (brcmf_iface_limits), .limits = brcmf_iface_limits
@@ -4225,7 +4229,8 @@ static struct wiphy *brcmf_setup_wiphy(struct device *phydev)BIT (NL80211_IFTYPE_ADHOC ) |BIT (NL80211_IFTYPE_AP ) |BIT (NL80211_IFTYPE_P2P_CLIENT ) | -BIT (NL80211_IFTYPE_P2P_GO ); +BIT (NL80211_IFTYPE_P2P_GO ) | +BIT (NL80211_IFTYPE_P2P_DEVICE ); wiphy->iface_combinations = brcmf_iface_combos; wiphy->n_iface_combinations =ARRAY_SIZE (brcmf_iface_combos); wiphy->bands[IEEE80211_BAND_2GHZ ] = &__wl_band_2ghz;
Signature · 1 line
1.7.10.4
PATCH 23/27 brcmfmac: Remove sleep on del_station.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Currently there is a sleep after disconnect on del_station. This timeout is not needed (anymore) and is causing problems with p2p setup, because remote side disconnects then supplicant will do del_station and while it waits the 400ms remote side will already reconnect and that is something supplicant cant handle.
--- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +1 -6
@@ -3895,12 +3895,7 @@ brcmf_cfg80211_del_station(struct wiphy *wiphy, struct net_device *ndev, &scbval, sizeof(scbval));if (err)brcmf_err ("SCB_DEAUTHENTICATE_FOR_REASON failed %d\n" , err); -/* -* Wait for the deauth event to come, supplicant will do the -* delete iface immediately and we will have problem in sending -* deauth frame if we delete the bss in firmware -*/ -brcmf_delay (400 ); +brcmf_dbg (TRACE ,"Exit\n" );return err; }
Signature · 1 line
1.7.10.4
PATCH 24/27 brcmfmac: Fix rtnl_lock lockup when registering netdev.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
When adding a virtual interface cfg80211 already has taken the rtnl_lock. So when the netdevice is being registered the register_netdevice should be used instead of register_netdev.
--- drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 2 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 11 ++++++++--- drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/dhd.h +1 -1
@@ -585,7 +585,7 @@ extern int brcmf_proto_cdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd,extern int brcmf_proto_hdrpull (struct brcmf_pub *drvr,u8 *ifidx,struct sk_buff *rxp); -extern int brcmf_net_attach (struct brcmf_if *ifp); +extern int brcmf_net_attach (struct brcmf_if *ifp,bool rtnl_locked);extern struct brcmf_if *brcmf_add_if (struct brcmf_pub *drvr,s32 bssidx,s32 ifidx,char *name,u8 *mac_addr);extern void brcmf_del_if (struct brcmf_pub *drvr,s32 bssidx);
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +8 -3
@@ -599,10 +599,11 @@ static const struct net_device_ops brcmf_netdev_ops_pri = { .ndo_set_rx_mode = brcmf_netdev_set_multicast_list }; -int brcmf_net_attach (struct brcmf_if *ifp) +int brcmf_net_attach (struct brcmf_if *ifp,bool rtnl_locked) {struct brcmf_pub *drvr = ifp->drvr;struct net_device *ndev; +s32 err;brcmf_dbg (TRACE ,"Enter, idx=%d mac=%pM\n" , ifp->bssidx, ifp->mac_addr);
@@ -623,7 +624,11 @@ int brcmf_net_attach(struct brcmf_if *ifp)INIT_WORK (&ifp->setmacaddr_work, _brcmf_set_mac_address);INIT_WORK (&ifp->multicast_work, _brcmf_set_multicast_list); -if (register_netdev (ndev) !=0 ) { +if (rtnl_locked) + err =register_netdevice (ndev); +else + err =register_netdev (ndev); +if (err !=0 ) {brcmf_err ("couldn't register the net device\n" ); goto fail; }
@@ -876,7 +881,7 @@ int brcmf_bus_start(struct device *dev)if (ret <0 ) goto fail; - ret =brcmf_net_attach (ifp); + ret =brcmf_net_attach (ifp, false); fail:if (ret <0 ) {brcmf_err ("failed: %d\n" , ret);
drivers/net/wireless/brcm80211/brcmfmac/fweh.c +1 -1
@@ -200,7 +200,7 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr,return ;if (!drvr->fweh.evt_handler[BRCMF_E_IF ]) - err =brcmf_net_attach (ifp); + err =brcmf_net_attach (ifp, false); } err =brcmf_fweh_call_event_handler (ifp, emsg->event_code, emsg, data);
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +1 -1
@@ -4668,7 +4668,7 @@ static s32 brcmf_notify_vif_event(struct brcmf_if *ifp,/* waiting process need to set the netdev name */ wait_for_completion (&event->vif_complete); -return brcmf_net_attach (ifp); +return brcmf_net_attach (ifp, true);case BRCMF_E_IF_DEL : ifp->vif =NULL ;
Signature · 1 line
1.7.10.4
PATCH 25/27 brcmfmac: Cleanup of unused defines.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Remove some unused defines and comments. Also use same define for IE length.
--- drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 6 ------ drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/p2p.h +0 -6
@@ -20,12 +20,6 @@struct brcmf_cfg80211_info ; -/* vendor ies max buffer length for probe response or beacon */ -#define VNDR_IES_MAX_BUF_LEN 1400 -/* normal vendor ies buffer length */ -#define VNDR_IES_BUF_LEN 512 - -/* Structure to hold all saved P2P and WPS IEs for a BSSCFG */ /** * enum p2p_bss_type - different type of BSS configurations. *
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +1 -1
@@ -172,7 +172,7 @@ enum brcmf_vif_status {* @beacon_ie_len: IE info length for beacon frame. */ struct vif_saved_ie { -u8 probe_req_ie[VNDR_IES_BUF_LEN ]; +u8 probe_req_ie[IE_MAX_LEN ];u8 probe_res_ie[IE_MAX_LEN ];u8 beacon_ie[IE_MAX_LEN ];u8 assoc_req_ie[IE_MAX_LEN ];
Signature · 1 line
1.7.10.4
PATCH 26/27 brcmfmac: Create netdev before returning from add_virtual_intf.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
Currently netdev gets created possibly after returning from add_virtual_intf. This is because add_if is handled asynch. This is wrong and netdev should be up before returning.
--- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 6 +++++- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 10 +--------- drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 2 -- 3 files changed, 6 insertions(+), 12 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +5 -1
@@ -1591,7 +1591,11 @@ struct wireless_dev *brcmf_p2p_add_vif(struct wiphy *wiphy, const char *name, }strncpy (ifp->ndev->name, name,sizeof (ifp->ndev->name) -1 ); -brcmf_cfg80211_vif_complete (cfg); + err =brcmf_net_attach (ifp, true); +if (err) { +brcmf_err ("Registering netdevice failed\n" ); + goto fail; + } cfg->p2p.bss_idx[P2PAPI_BSSCFG_CONNECTION ].vif = vif;/* Disable firmware roaming for P2P interface */ brcmf_fil_iovar_int_set (ifp,"roam_off" ,1 );
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +1 -9
@@ -4665,10 +4665,7 @@ static s32 brcmf_notify_vif_event(struct brcmf_if *ifp,SET_NETDEV_DEV (ifp->ndev,wiphy_dev (cfg->wiphy));mutex_unlock (&event->vif_event_lock);wake_up (&event->vif_wq); - -/* waiting process need to set the netdev name */ -wait_for_completion (&event->vif_complete); -return brcmf_net_attach (ifp, true); +return 0 ;case BRCMF_E_IF_DEL : ifp->vif =NULL ;
@@ -4800,7 +4797,6 @@ static void wl_deinit_priv(struct brcmf_cfg80211_info *cfg)static void init_vif_event (struct brcmf_cfg80211_vif_event *event) {init_waitqueue_head (&event->vif_wq); -init_completion (&event->vif_complete);mutex_init (&event->vif_event_lock); }
@@ -5154,7 +5150,3 @@ int brcmf_cfg80211_wait_vif_event_timeout(struct brcmf_cfg80211_info *cfg, vif_event_equals(event, action), timeout); } -void brcmf_cfg80211_vif_complete (struct brcmf_cfg80211_info *cfg) -{ -complete (&cfg->vif_event.vif_complete); -}
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +0 -2
@@ -337,7 +337,6 @@ struct brcmf_pno_scanresults_le {struct brcmf_cfg80211_vif_event {wait_queue_head_t vif_wq;struct mutex vif_event_lock; -struct completion vif_complete;u8 action;struct brcmf_cfg80211_vif *vif; };
@@ -493,7 +492,6 @@ void brcmf_cfg80211_arm_vif_event(struct brcmf_cfg80211_info *cfg,bool brcmf_cfg80211_vif_event_armed (struct brcmf_cfg80211_info *cfg);int brcmf_cfg80211_wait_vif_event_timeout (struct brcmf_cfg80211_info *cfg,u8 action,ulong timeout); -void brcmf_cfg80211_vif_complete (struct brcmf_cfg80211_info *info);s32 brcmf_notify_escan_complete (struct brcmf_cfg80211_info *cfg,struct net_device *ndev,bool aborted,bool fw_abort);
Signature · 1 line
1.7.10.4
PATCH 27/27 brcmfmac: Add tx p2p off-channel support.
In reply to Arend van SprielFrom: Hante Meuleman <[email protected]>
With this patch off-channel action frames can be transmitted. This is needed for p2p when two devices need to find each other while using different social channels.
--- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 673 +++++++++++++++++++- drivers/net/wireless/brcm80211/brcmfmac/p2p.h | 51 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 76 +-- 3 files changed, 707 insertions(+), 93 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/p2p.c +639 -34
@@ -43,6 +43,9 @@#define SOCIAL_CHAN_1 1#define SOCIAL_CHAN_2 6#define SOCIAL_CHAN_3 11 +#define IS_P2P_SOCIAL_CHANNEL (channel) ((channel == SOCIAL_CHAN_1) || \ + (channel == SOCIAL_CHAN_2) || \ + (channel == SOCIAL_CHAN_3))#define SOCIAL_CHAN_CNT 3#define AF_PEER_SEARCH_CNT 2
@@ -64,11 +67,12 @@#define P2P_AF_MIN_DWELL_TIME 100#define P2P_AF_MED_DWELL_TIME 400#define P2P_AF_LONG_DWELL_TIME 1000 -#define P2P_AF_TX_MAX_RETRY 5 +#define P2P_AF_TX_MAX_RETRY 1#define P2P_AF_MAX_WAIT_TIME 2000#define P2P_INVALID_CHANNEL -1#define P2P_CHANNEL_SYNC_RETRY 5#define P2P_AF_FRM_SCAN_MAX_WAIT 1500 +#define P2P_DEFAULT_SLEEP_TIME_VSDB 200/* WiFi P2P Public Action Frame OUI Subtypes */ #define P2P_PAF_GON_REQ 0/* Group Owner Negotiation Req */
@@ -196,13 +200,15 @@ struct brcmf_p2psd_gas_pub_act_frame {/** * struct brcmf_config_af_params - Action Frame Parameters for tx. * -* @max_tx_retry: max tx retry count if tx no ack. * @mpc_onoff: To make sure to send successfully action frame, we have to * turn off mpc 0: off, 1: on, (-1): do nothing +* @search_channel: 1: search peer's channel to send af +* extra_listen: keep the dwell time to get af response frame. */ struct brcmf_config_af_params { -s32 max_tx_retry;s32 mpc_onoff; +bool search_channel; +bool extra_listen; };/**
@@ -415,6 +421,30 @@ static void brcmf_p2p_print_actframe(bool tx, void *frame, u32 frame_len)#endif + +/** +* brcmf_p2p_chnr_to_chspec() - convert channel number to chanspec. +* +* @channel: channel number +*/ +static u16 brcmf_p2p_chnr_to_chspec (u16 channel) +{ +u16 chanspec; + + chanspec = channel &WL_CHANSPEC_CHAN_MASK ; + +if (channel <=CH_MAX_2G_CHANNEL ) + chanspec |=WL_CHANSPEC_BAND_2G ; +else + chanspec |=WL_CHANSPEC_BAND_5G ; + + chanspec |=WL_CHANSPEC_BW_20 ; + chanspec |=WL_CHANSPEC_CTL_SB_NONE ; + +return chanspec; +} + +/** * brcmf_p2p_set_firmware() - prepare firmware for peer-to-peer operation. *
@@ -811,6 +841,43 @@ exit:return err; } + +/** +* brcmf_p2p_find_listen_channel() - find listen channel in ie string. +* +* @ie: string of information elements. +* @ie_len: length of string. +* +* Scan ie for p2p ie and look for attribute 6 channel. If available determine +* channel and return it. +*/ +static s32 brcmf_p2p_find_listen_channel (const u8 *ie,u32 ie_len) +{ +u8 channel_ie[5 ]; +s32 listen_channel; +s32 err; + + err =cfg80211_get_p2p_attr (ie, ie_len, +IEEE80211_P2P_ATTR_LISTEN_CHANNEL , + channel_ie,sizeof (channel_ie)); +if (err <0 ) +return err; + +/* listen channel subel length format: */ +/* 3(country) + 1(op. class) + 1(chan num) */ + listen_channel = (s32 )channel_ie[3 +1 ]; + +if (listen_channel ==SOCIAL_CHAN_1 || + listen_channel ==SOCIAL_CHAN_2 || + listen_channel ==SOCIAL_CHAN_3 ) { +brcmf_dbg (INFO ,"Found my Listen Channel %d\n" , listen_channel); +return listen_channel; + } + +return -EPERM ; +} + +/** * brcmf_p2p_scan_prep() - prepare scan based on request. *
@@ -831,12 +898,13 @@ int brcmf_p2p_scan_prep(struct wiphy *wiphy,if (brcmf_p2p_scan_is_p2p_request (request)) {/* find my listen channel */ - err =cfg80211_get_p2p_attr (request->ie, request->ie_len, -IEEE80211_P2P_ATTR_LISTEN_CHANNEL , - &p2p->listen_channel,1 ); + err =brcmf_p2p_find_listen_channel (request->ie, + request->ie_len);if (err <0 )return err; + p2p->afx_hdl.my_listen_chan = err; +clear_bit (BRCMF_P2P_STATUS_GO_NEG_PHASE , &p2p->status);brcmf_dbg (INFO ,"P2P: GO_NEG_PHASE status cleared\n" );
@@ -859,13 +927,12 @@ int brcmf_p2p_scan_prep(struct wiphy *wiphy,* brcmf_p2p_discover_listen() - set firmware to discover listen state. * * @p2p: p2p device. -* @freq: center frequency for discover listen. -* #@duration: time in ms to stay on channel. +* @channel: channel nr for discover listen. +* @duration: time in ms to stay on channel. * */ static s32 -brcmf_p2p_discover_listen (struct brcmf_p2p_info *p2p, -struct ieee80211_channel *channel,u32 duration) +brcmf_p2p_discover_listen (struct brcmf_p2p_info *p2p,u16 channel,u32 duration) {struct brcmf_cfg80211_vif *vif;s32 err =0 ;
@@ -884,7 +951,7 @@ brcmf_p2p_discover_listen(struct brcmf_p2p_info *p2p, goto exit; } - chanspec =channel_to_chanspec (channel); + chanspec =brcmf_p2p_chnr_to_chspec (channel); err =brcmf_p2p_set_discover_state (vif->ifp,WL_P2P_DISC_ST_LISTEN , chanspec, (u16 )duration);if (!err) {
@@ -911,15 +978,16 @@ int brcmf_p2p_remain_on_channel(struct wiphy *wiphy, struct wireless_dev *wdev,struct brcmf_cfg80211_info *cfg =wiphy_to_cfg (wiphy);struct brcmf_p2p_info *p2p = &cfg->p2p;s32 err; +u16 channel_nr; -brcmf_dbg (TRACE ,"Enter, channel: %d, duration ms (%d)\n" , -ieee80211_frequency_to_channel (channel->center_freq), + channel_nr =ieee80211_frequency_to_channel (channel->center_freq); +brcmf_dbg (TRACE ,"Enter, channel: %d, duration ms (%d)\n" , channel_nr, duration); err =brcmf_p2p_enable_discovery (p2p);if (err) goto exit; - err =brcmf_p2p_discover_listen (p2p, channel, duration); + err =brcmf_p2p_discover_listen (p2p, channel_nr, duration);if (err) goto exit;
@@ -949,11 +1017,20 @@ int brcmf_p2p_notify_listen_complete(struct brcmf_if *ifp,brcmf_dbg (TRACE ,"Enter\n" );if (test_and_clear_bit (BRCMF_P2P_STATUS_DISCOVER_LISTEN , - &p2p->status)) + &p2p->status)) { +if (test_and_clear_bit (BRCMF_P2P_STATUS_WAITING_NEXT_AF_LISTEN , + &p2p->status)) { +clear_bit (BRCMF_P2P_STATUS_WAITING_NEXT_ACT_FRAME , + &p2p->status); +brcmf_dbg (INFO ,"Listen DONE, wake up wait_next_af\n" ); +complete (&p2p->wait_next_af); + } +cfg80211_remain_on_channel_expired (&ifp->vif->wdev, p2p->remain_on_channel_cookie, &p2p->remain_on_channel,GFP_KERNEL ); + }return 0 ; }
@@ -974,6 +1051,285 @@ void brcmf_p2p_cancel_remain_on_channel(struct brcmf_if *ifp)/** +* brcmf_p2p_act_frm_search() - search function for action frame. +* +* @p2p: p2p device. +* channel: channel on which action frame is to be trasmitted. +* +* search function to reach at common channel to send action frame. When +* channel is 0 then all social channels will be used to send af +*/ +static s32 brcmf_p2p_act_frm_search (struct brcmf_p2p_info *p2p,u16 channel) +{ +s32 err; +u32 channel_cnt; +u16 *default_chan_list; +u32 i; + +brcmf_dbg (TRACE ,"Enter\n" ); + +if (channel) + channel_cnt =AF_PEER_SEARCH_CNT ; +else + channel_cnt =SOCIAL_CHAN_CNT ; + default_chan_list =kzalloc (channel_cnt *sizeof (*default_chan_list), +GFP_KERNEL ); +if (default_chan_list ==NULL ) { +brcmf_err ("channel list allocation failed\n" ); + err = -ENOMEM ; + goto exit; + } +if (channel) { +/* insert same channel to the chan_list */ +for (i =0 ; i < channel_cnt; i++) + default_chan_list[i] = +brcmf_p2p_chnr_to_chspec (channel); + }else { + default_chan_list[0 ] =brcmf_p2p_chnr_to_chspec (SOCIAL_CHAN_1 ); + default_chan_list[1 ] =brcmf_p2p_chnr_to_chspec (SOCIAL_CHAN_2 ); + default_chan_list[2 ] =brcmf_p2p_chnr_to_chspec (SOCIAL_CHAN_3 ); + } + err =brcmf_p2p_escan (p2p, channel_cnt, default_chan_list, +WL_P2P_DISC_ST_SEARCH ,WL_ESCAN_ACTION_START , +P2PAPI_BSSCFG_DEVICE ); +kfree (default_chan_list); +exit: +return err; +} + + +/** +* brcmf_p2p_afx_handler() - afx worker thread. +* +* @work: +* +*/ +static void brcmf_p2p_afx_handler (struct work_struct *work) +{ + struct afx_hdl *afx_hdl = container_of(work, struct afx_hdl, afx_work); +struct brcmf_p2p_info *p2p =container_of (afx_hdl, + struct brcmf_p2p_info, + afx_hdl); +s32 err; + +if (!afx_hdl->is_active) +return ; + +if (afx_hdl->is_listen && afx_hdl->my_listen_chan) +/* 100ms ~ 300ms */ + err =brcmf_p2p_discover_listen (p2p, afx_hdl->my_listen_chan, +100 * (1 + (random32 () %3 ))); +else + err =brcmf_p2p_act_frm_search (p2p, afx_hdl->peer_listen_chan); + +if (err) { +brcmf_err ("ERROR occurred! value is (%d)\n" , err); +if (test_bit (BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL , + &p2p->status)) +complete (&afx_hdl->act_frm_scan); + } +} + + +/** +* brcmf_p2p_af_searching_channel() - search channel. +* +* @p2p: p2p device info struct. +* +*/ +static s32 brcmf_p2p_af_searching_channel (struct brcmf_p2p_info *p2p) +{ +struct afx_hdl *afx_hdl = &p2p->afx_hdl; +struct brcmf_cfg80211_vif *pri_vif; +unsigned long duration; +s32 retry; + +brcmf_dbg (TRACE ,"Enter\n" ); + + pri_vif = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY ].vif; + +INIT_COMPLETION (afx_hdl->act_frm_scan); +set_bit (BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL , &p2p->status); + afx_hdl->is_active = true; + afx_hdl->peer_chan =P2P_INVALID_CHANNEL ; + +/* Loop to wait until we find a peer's channel or the +* pending action frame tx is cancelled. +*/ + retry =0 ; + duration =msecs_to_jiffies (P2P_AF_FRM_SCAN_MAX_WAIT ); +while ((retry <P2P_CHANNEL_SYNC_RETRY ) && + (afx_hdl->peer_chan ==P2P_INVALID_CHANNEL )) { + afx_hdl->is_listen = false; +brcmf_dbg (TRACE ,"Scheduling action frame for sending.. (%d)\n" , + retry); +/* search peer on peer's listen channel */ +schedule_work (&afx_hdl->afx_work); +wait_for_completion_timeout (&afx_hdl->act_frm_scan, duration); +if ((afx_hdl->peer_chan !=P2P_INVALID_CHANNEL ) || + (!test_bit (BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL , + &p2p->status))) +break ; + +if (afx_hdl->my_listen_chan) { +brcmf_dbg (TRACE ,"Scheduling listen peer, channel=%d\n" , + afx_hdl->my_listen_chan); +/* listen on my listen channel */ + afx_hdl->is_listen = true; +schedule_work (&afx_hdl->afx_work); +wait_for_completion_timeout (&afx_hdl->act_frm_scan, + duration); + } +if ((afx_hdl->peer_chan !=P2P_INVALID_CHANNEL ) || + (!test_bit (BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL , + &p2p->status))) +break ; + retry++; + +/* if sta is connected or connecting, sleep for a while before +* retry af tx or finding a peer +*/ +if (test_bit (BRCMF_VIF_STATUS_CONNECTED , &pri_vif->sme_state) || +test_bit (BRCMF_VIF_STATUS_CONNECTING , &pri_vif->sme_state)) +msleep (P2P_DEFAULT_SLEEP_TIME_VSDB ); + } + +brcmf_dbg (TRACE ,"Completed search/listen peer_chan=%d\n" , + afx_hdl->peer_chan); + afx_hdl->is_active = false; + +clear_bit (BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL , &p2p->status); + +return afx_hdl->peer_chan; +} + + +/** +* brcmf_p2p_scan_finding_common_channel() - was escan used for finding channel +* +* @cfg: common configuration struct. +* @bi: bss info struct, result from scan. +* +*/ +bool brcmf_p2p_scan_finding_common_channel (struct brcmf_cfg80211_info *cfg, +struct brcmf_bss_info_le *bi) + +{ +struct brcmf_p2p_info *p2p = &cfg->p2p; +struct afx_hdl *afx_hdl = &p2p->afx_hdl; +u8 *ie; +s32 err; +u8 p2p_dev_addr[ETH_ALEN ]; + +if (!test_bit (BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL , &p2p->status)) +return false; + +if (bi ==NULL ) { +brcmf_dbg (TRACE ,"ACTION FRAME SCAN Done\n" ); +if (afx_hdl->peer_chan ==P2P_INVALID_CHANNEL ) +complete (&afx_hdl->act_frm_scan); +return true; + } + + ie = ((u8 *)bi) +le16_to_cpu (bi->ie_offset); +memset (p2p_dev_addr,0 ,sizeof (p2p_dev_addr)); + err =cfg80211_get_p2p_attr (ie,le32_to_cpu (bi->ie_length), +IEEE80211_P2P_ATTR_DEVICE_INFO , + p2p_dev_addr,sizeof (p2p_dev_addr)); +if (err <0 ) + err =cfg80211_get_p2p_attr (ie,le32_to_cpu (bi->ie_length), +IEEE80211_P2P_ATTR_DEVICE_ID , + p2p_dev_addr,sizeof (p2p_dev_addr)); +if ((err >=0 ) && + (!memcmp (p2p_dev_addr, afx_hdl->tx_dst_addr,ETH_ALEN ))) { + afx_hdl->peer_chan = bi->ctl_ch ? bi->ctl_ch : +CHSPEC_CHANNEL (le16_to_cpu (bi->chanspec)); +brcmf_dbg (TRACE ,"ACTION FRAME SCAN : Peer %pM found, channel : %d\n" , + afx_hdl->tx_dst_addr, afx_hdl->peer_chan); +complete (&afx_hdl->act_frm_scan); + } +return true; +} + +/** +* brcmf_p2p_stop_wait_next_action_frame() - finish scan if af tx complete. +* +* @cfg: common configuration struct. +* +*/ +static void +brcmf_p2p_stop_wait_next_action_frame (struct brcmf_cfg80211_info *cfg) +{ +struct brcmf_p2p_info *p2p = &cfg->p2p; +struct net_device *ndev = cfg->escan_info.ndev; + +if (test_bit (BRCMF_P2P_STATUS_SENDING_ACT_FRAME , &p2p->status) && + (test_bit (BRCMF_P2P_STATUS_ACTION_TX_COMPLETED , &p2p->status) || +test_bit (BRCMF_P2P_STATUS_ACTION_TX_NOACK , &p2p->status))) { +brcmf_dbg (TRACE ,"*** Wake UP ** abort actframe iovar\n" ); +/* if channel is not zero, "actfame" uses off channel scan. +* So abort scan for off channel completion. +*/ +if (p2p->af_sent_channel) +brcmf_notify_escan_complete (cfg, ndev, true, true); + }else if (test_bit (BRCMF_P2P_STATUS_WAITING_NEXT_AF_LISTEN , + &p2p->status)) { +brcmf_dbg (TRACE ,"*** Wake UP ** abort listen for next af frame\n" ); +/* So abort scan to cancel listen */ +brcmf_notify_escan_complete (cfg, ndev, true, true); + } +} + + +/** +* brcmf_p2p_gon_req_collision() - Check if go negotiaton collission +* +* @p2p: p2p device info struct. +* +* return true if recevied action frame is to be dropped. +*/ +static bool +brcmf_p2p_gon_req_collision (struct brcmf_p2p_info *p2p,u8 *mac) +{ +struct brcmf_cfg80211_info *cfg = p2p->cfg; +struct brcmf_if *ifp; + +brcmf_dbg (TRACE ,"Enter\n" ); + +if (!test_bit (BRCMF_P2P_STATUS_WAITING_NEXT_ACT_FRAME , &p2p->status) || + !p2p->gon_req_action) +return false; + +brcmf_dbg (TRACE ,"GO Negotiation Request COLLISION !!!\n" ); +/* if sa(peer) addr is less than da(my) addr, then this device +* process peer's gon request and block to send gon req. +* if not (sa addr > da addr), +* this device will process gon request and drop gon req of peer. +*/ + ifp = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE ].vif->ifp; +if (memcmp (mac, ifp->mac_addr,ETH_ALEN ) <0 ) { +brcmf_dbg (INFO ,"Block transmit gon req !!!\n" ); + p2p->block_gon_req_tx = true; +/* if we are finding a common channel for sending af, +* do not scan more to block to send current gon req +*/ +if (test_and_clear_bit (BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL , + &p2p->status)) +complete (&p2p->afx_hdl.act_frm_scan); +if (test_and_clear_bit (BRCMF_P2P_STATUS_WAITING_NEXT_ACT_FRAME , + &p2p->status)) +brcmf_p2p_stop_wait_next_action_frame (cfg); +return false; + } + +/* drop gon request of peer to process gon request by this device. */ +brcmf_dbg (INFO ,"Drop received gon req !!!\n" ); + +return true; +} + + +/** * brcmf_p2p_notify_action_frame_rx() - received action frame. * * @ifp: interfac control.
@@ -985,14 +1341,20 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,const struct brcmf_event_msg *e, void *data) { + struct brcmf_cfg80211_info *cfg = ifp->drvr->config; +struct brcmf_p2p_info *p2p = &cfg->p2p; +struct afx_hdl *afx_hdl = &p2p->afx_hdl;struct wireless_dev *wdev;u32 mgmt_frame_len = e->datalen -sizeof (struct brcmf_rx_mgmt_data );struct brcmf_rx_mgmt_data *rxframe = (struct brcmf_rx_mgmt_data *)data; +u8 *frame = (u8 *)(rxframe +1 ); +struct brcmf_p2p_pub_act_frame *act_frm; +struct brcmf_p2psd_gas_pub_act_frame *sd_act_frm;u16 chanspec =be16_to_cpu (rxframe->chanspec);struct ieee80211_mgmt *mgmt_frame; -s32 err;s32 freq;u16 mgmt_type; +u8 action;/* Check if wpa_supplicant has registered for this frame */ brcmf_dbg (INFO ,"ifp->vif->mgmt_rx_reg %04x\n" , ifp->vif->mgmt_rx_reg);
@@ -1000,7 +1362,46 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,if ((ifp->vif->mgmt_rx_reg &BIT (mgmt_type)) ==0 )return 0 ; -brcmf_p2p_print_actframe (false, (u8 *)(rxframe +1 ), mgmt_frame_len); +brcmf_p2p_print_actframe (false, frame, mgmt_frame_len); + + action =P2P_PAF_SUBTYPE_INVALID ; +if (brcmf_p2p_is_pub_action (frame, mgmt_frame_len)) { + act_frm = (struct brcmf_p2p_pub_act_frame *)frame; + action = act_frm->subtype; +if ((action ==P2P_PAF_GON_REQ ) && + (brcmf_p2p_gon_req_collision (p2p, (u8 *)e->addr))) { +if (test_bit (BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL , + &p2p->status) && + (memcmp (afx_hdl->tx_dst_addr, e->addr, +ETH_ALEN ) ==0 )) { + afx_hdl->peer_chan =CHSPEC_CHANNEL (chanspec); +brcmf_dbg (INFO ,"GON request: Peer found, channel=%d\n" , + afx_hdl->peer_chan); +complete (&afx_hdl->act_frm_scan); + } +return 0 ; + } +/* After complete GO Negotiation, roll back to mpc mode */ +if ((action ==P2P_PAF_GON_CONF ) || + (action ==P2P_PAF_PROVDIS_RSP )) +brcmf_set_mpc (ifp->ndev,1 ); +if (action ==P2P_PAF_GON_CONF ) { +brcmf_dbg (TRACE ,"P2P: GO_NEG_PHASE status cleared\n" ); +clear_bit (BRCMF_P2P_STATUS_GO_NEG_PHASE , &p2p->status); + } + }else if (brcmf_p2p_is_gas_action (frame, mgmt_frame_len)) { + sd_act_frm = (struct brcmf_p2psd_gas_pub_act_frame *)frame; + action = sd_act_frm->action; + } + +if (test_bit (BRCMF_P2P_STATUS_WAITING_NEXT_ACT_FRAME , &p2p->status) && + (p2p->next_af_subtype == action)) { +brcmf_dbg (TRACE ,"We got a right next frame! (%d)\n" , action); +clear_bit (BRCMF_P2P_STATUS_WAITING_NEXT_ACT_FRAME , + &p2p->status); +/* Stop waiting for next AF. */ +brcmf_p2p_stop_wait_next_action_frame (cfg); + } mgmt_frame =kzalloc (offsetof(struct ieee80211_mgmt , u) + mgmt_frame_len,GFP_KERNEL );
@@ -1009,13 +1410,11 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp,return -ENOMEM ; }memcpy (mgmt_frame->da, ifp->mac_addr,ETH_ALEN ); - err =brcmf_fil_cmd_data_get (ifp,BRCMF_C_GET_BSSID , mgmt_frame->bssid, -ETH_ALEN ); -if (err <0 ) -brcmf_err ("BRCMF_C_GET_BSSID error %d\n" , err); +brcmf_fil_cmd_data_get (ifp,BRCMF_C_GET_BSSID , mgmt_frame->bssid, +ETH_ALEN );memcpy (mgmt_frame->sa, e->addr,ETH_ALEN ); mgmt_frame->frame_control =cpu_to_le16 (IEEE80211_STYPE_ACTION ); -memcpy (&mgmt_frame->u, (u8 *)(rxframe +1 ), mgmt_frame_len); +memcpy (&mgmt_frame->u, frame, mgmt_frame_len); mgmt_frame_len += offsetof(struct ieee80211_mgmt , u); freq = ieee80211_channel_to_frequency(CHSPEC_CHANNEL(chanspec),
@@ -1046,15 +1445,29 @@ int brcmf_p2p_notify_action_tx_complete(struct brcmf_if *ifp,struct brcmf_cfg80211_info *cfg = ifp->drvr->config;struct brcmf_p2p_info *p2p = &cfg->p2p; -brcmf_dbg (INFO ,"Enter: status %d\n" , e->status); +brcmf_dbg (INFO ,"Enter: event %s, status=%d\n" , + e->event_code ==BRCMF_E_ACTION_FRAME_OFF_CHAN_COMPLETE ? +"ACTION_FRAME_OFF_CHAN_COMPLETE" :"ACTION_FRAME_COMPLETE" , + e->status); -if (e->status ==BRCMF_E_STATUS_SUCCESS ) -set_bit (BRCMF_P2P_STATUS_ACTION_TX_COMPLETED , &p2p->status); -else -set_bit (BRCMF_P2P_STATUS_ACTION_TX_NOACK , &p2p->status); -/* for now complete the receiver process here !! */ -complete (&p2p->send_af_done); +if (!test_bit (BRCMF_P2P_STATUS_SENDING_ACT_FRAME , &p2p->status)) +return 0 ; + +if (e->event_code ==BRCMF_E_ACTION_FRAME_COMPLETE ) { +if (e->status ==BRCMF_E_STATUS_SUCCESS ) +set_bit (BRCMF_P2P_STATUS_ACTION_TX_COMPLETED , + &p2p->status); +else { +set_bit (BRCMF_P2P_STATUS_ACTION_TX_NOACK , &p2p->status); +/* If there is no ack, we don't need to wait for +* WLC_E_ACTION_FRAME_OFFCHAN_COMPLETE event +*/ +brcmf_p2p_stop_wait_next_action_frame (cfg); + } + }else { +complete (&p2p->send_af_done); + }return 0 ; }
@@ -1080,6 +1493,7 @@ static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p,brcmf_dbg (TRACE ,"Enter\n" ); +INIT_COMPLETION (p2p->send_af_done);clear_bit (BRCMF_P2P_STATUS_ACTION_TX_COMPLETED , &p2p->status);clear_bit (BRCMF_P2P_STATUS_ACTION_TX_NOACK , &p2p->status);
@@ -1091,6 +1505,9 @@ static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p, goto exit; } + p2p->af_sent_channel =le32_to_cpu (af_params->channel); + p2p->af_tx_sent_jiffies = jiffies; + timeout =wait_for_completion_timeout (&p2p->send_af_done,msecs_to_jiffies (P2P_AF_MAX_WAIT_TIME ));
@@ -1126,16 +1543,21 @@ static s32 brcmf_p2p_pub_af_tx(struct brcmf_cfg80211_info *cfg,struct brcmf_fil_action_frame_le *action_frame;struct brcmf_p2p_pub_act_frame *act_frm;s32 err =0 ; +u16 ie_len; action_frame = &af_params->action_frame; act_frm = (struct brcmf_p2p_pub_act_frame *)(action_frame->data); + config_af_params->extra_listen = true; +switch (act_frm->subtype) {case P2P_PAF_GON_REQ :brcmf_dbg (TRACE ,"P2P: GO_NEG_PHASE status set\n" );set_bit (BRCMF_P2P_STATUS_GO_NEG_PHASE , &p2p->status); config_af_params->mpc_onoff =0 ; + config_af_params->search_channel = true; p2p->next_af_subtype = act_frm->subtype +1 ; + p2p->gon_req_action = true;/* increase dwell time to wait for RESP frame */ af_params->dwell_time =cpu_to_le32 (P2P_AF_MED_DWELL_TIME );break ;
@@ -1152,8 +1574,10 @@ static s32 brcmf_p2p_pub_af_tx(struct brcmf_cfg80211_info *cfg, config_af_params->mpc_onoff =1 ;/* minimize dwell time */ af_params->dwell_time =cpu_to_le32 (P2P_AF_MIN_DWELL_TIME ); + config_af_params->extra_listen = false;break ;case P2P_PAF_INVITE_REQ : + config_af_params->search_channel = true; p2p->next_af_subtype = act_frm->subtype +1 ;/* increase dwell time */ af_params->dwell_time =cpu_to_le32 (P2P_AF_MED_DWELL_TIME );
@@ -1161,8 +1585,10 @@ static s32 brcmf_p2p_pub_af_tx(struct brcmf_cfg80211_info *cfg,case P2P_PAF_INVITE_RSP :/* minimize dwell time */ af_params->dwell_time =cpu_to_le32 (P2P_AF_MIN_DWELL_TIME ); + config_af_params->extra_listen = false;break ;case P2P_PAF_DEVDIS_REQ : + config_af_params->search_channel = true; p2p->next_af_subtype = act_frm->subtype +1 ;/* maximize dwell time to wait for RESP frame */ af_params->dwell_time =cpu_to_le32 (P2P_AF_LONG_DWELL_TIME );
@@ -1170,8 +1596,15 @@ static s32 brcmf_p2p_pub_af_tx(struct brcmf_cfg80211_info *cfg,case P2P_PAF_DEVDIS_RSP :/* minimize dwell time */ af_params->dwell_time =cpu_to_le32 (P2P_AF_MIN_DWELL_TIME ); + config_af_params->extra_listen = false;break ;case P2P_PAF_PROVDIS_REQ : + ie_len =le16_to_cpu (action_frame->len) - + offsetof(struct brcmf_p2p_pub_act_frame , elts); +if (cfg80211_get_p2p_attr (&act_frm->elts[0 ], ie_len, +IEEE80211_P2P_ATTR_GROUP_ID , +NULL ,0 ) <0 ) + config_af_params->search_channel = true; config_af_params->mpc_onoff =0 ; p2p->next_af_subtype = act_frm->subtype +1 ;/* increase dwell time to wait for RESP frame */
@@ -1182,6 +1615,7 @@ static s32 brcmf_p2p_pub_af_tx(struct brcmf_cfg80211_info *cfg, p2p->next_af_subtype =P2P_PAF_GON_REQ ;/* increase dwell time to MED level */ af_params->dwell_time =cpu_to_le32 (P2P_AF_MED_DWELL_TIME ); + config_af_params->extra_listen = false;break ;default : brcmf_err("Unknown p2p pub act frame subtype: %d\n",
@@ -1205,11 +1639,14 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,struct brcmf_p2p_info *p2p = &cfg->p2p;struct brcmf_fil_action_frame_le *action_frame;struct brcmf_config_af_params config_af_params; +struct afx_hdl *afx_hdl = &p2p->afx_hdl;u16 action_frame_len;bool ack = false;u8 category;u8 action;s32 tx_retry; +s32 extra_listen_time; +uint delta_ms; action_frame = &af_params->action_frame; action_frame_len =le16_to_cpu (action_frame->len);
@@ -1226,10 +1663,12 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,/* initialize variables */ p2p->next_af_subtype =P2P_PAF_SUBTYPE_INVALID ; + p2p->gon_req_action = false;/* config parameters */ - config_af_params.max_tx_retry =P2P_AF_TX_MAX_RETRY ; config_af_params.mpc_onoff =-1 ; + config_af_params.search_channel = false; + config_af_params.extra_listen = false;if (brcmf_p2p_is_pub_action (action_frame->data, action_frame_len)) {/* p2p public action frame process */
@@ -1243,6 +1682,9 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,/* service discovery process */ if (action ==P2PSD_ACTION_ID_GAS_IREQ || action ==P2PSD_ACTION_ID_GAS_CREQ ) { +/* configure service discovery query frame */ + config_af_params.search_channel = true; +/* save next af suptype to cancel */ /* remaining dwell time */ p2p->next_af_subtype = action +1 ;
@@ -1268,24 +1710,114 @@ bool brcmf_p2p_send_action_frame(struct brcmf_cfg80211_info *cfg,return false; } +/* if connecting on primary iface, sleep for a while before sending +* af tx for VSDB +*/ +if (test_bit (BRCMF_VIF_STATUS_CONNECTING , + &p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY ].vif->sme_state)) +msleep (50 ); +/* if scan is ongoing, abort current scan. */ if (test_bit (BRCMF_SCAN_STATUS_BUSY , &cfg->scan_status))brcmf_abort_scanning (cfg); +memcpy (afx_hdl->tx_dst_addr, action_frame->da,ETH_ALEN ); +/* To make sure to send successfully action frame, turn off mpc */ if (config_af_params.mpc_onoff ==0 )brcmf_set_mpc (ndev,0 ); -/* if failed, retry it. tx_retry_max value is configure by .... */ +/* set status and destination address before sending af */ +if (p2p->next_af_subtype !=P2P_PAF_SUBTYPE_INVALID ) { +/* set status to cancel the remained dwell time in rx process */ +set_bit (BRCMF_P2P_STATUS_WAITING_NEXT_ACT_FRAME , &p2p->status); + } + + p2p->af_sent_channel =0 ; +set_bit (BRCMF_P2P_STATUS_SENDING_ACT_FRAME , &p2p->status); +/* validate channel and p2p ies */ +if (config_af_params.search_channel && +IS_P2P_SOCIAL_CHANNEL (le32_to_cpu (af_params->channel)) && + p2p->bss_idx[P2PAPI_BSSCFG_DEVICE ].vif->saved_ie.probe_req_ie_len) { + afx_hdl = &p2p->afx_hdl; + afx_hdl->peer_listen_chan =le32_to_cpu (af_params->channel); + +if (brcmf_p2p_af_searching_channel (p2p) == +P2P_INVALID_CHANNEL ) { +brcmf_err ("Couldn't find peer's channel.\n" ); + goto exit; + } + +/* Abort scan even for VSDB scenarios. Scan gets aborted in +* firmware but after the check of piggyback algorithm. To take +* care of current piggback algo, lets abort the scan here +* itself. +*/ +brcmf_notify_escan_complete (cfg, ndev, true, true); + +/* update channel */ + af_params->channel =cpu_to_le32 (afx_hdl->peer_chan); + } + tx_retry =0 ; -while ((ack == false) && (tx_retry < config_af_params.max_tx_retry)) { +while (!p2p->block_gon_req_tx && + (ack == false) && (tx_retry <P2P_AF_TX_MAX_RETRY )) { ack = !brcmf_p2p_tx_action_frame (p2p, af_params); tx_retry++; } -if (ack == false) +if (ack == false) {brcmf_err ("Failed to send Action Frame(retry %d)\n" , tx_retry); +clear_bit (BRCMF_P2P_STATUS_GO_NEG_PHASE , &p2p->status); + } exit: +clear_bit (BRCMF_P2P_STATUS_SENDING_ACT_FRAME , &p2p->status); + +/* WAR: sometimes dongle does not keep the dwell time of 'actframe'. +* if we coundn't get the next action response frame and dongle does +* not keep the dwell time, go to listen state again to get next action +* response frame. +*/ +if (ack && config_af_params.extra_listen && !p2p->block_gon_req_tx && +test_bit (BRCMF_P2P_STATUS_WAITING_NEXT_ACT_FRAME , &p2p->status) && + p2p->af_sent_channel == afx_hdl->my_listen_chan) { + delta_ms =jiffies_to_msecs (jiffies - p2p->af_tx_sent_jiffies); +if (le32_to_cpu (af_params->dwell_time) > delta_ms) + extra_listen_time =le32_to_cpu (af_params->dwell_time) - + delta_ms; +else + extra_listen_time =0 ; +if (extra_listen_time >50 ) { +set_bit (BRCMF_P2P_STATUS_WAITING_NEXT_AF_LISTEN , + &p2p->status); +brcmf_dbg (INFO ,"Wait more time! actual af time:%d, calculated extra listen:%d\n" , +le32_to_cpu (af_params->dwell_time), + extra_listen_time); + extra_listen_time +=100 ; +if (!brcmf_p2p_discover_listen (p2p, + p2p->af_sent_channel, + extra_listen_time)) { +unsigned long duration; + + extra_listen_time +=100 ; + duration =msecs_to_jiffies (extra_listen_time); +wait_for_completion_timeout (&p2p->wait_next_af, + duration); + } +clear_bit (BRCMF_P2P_STATUS_WAITING_NEXT_AF_LISTEN , + &p2p->status); + } + } + +if (p2p->block_gon_req_tx) { +/* if ack is true, supplicant will wait more time(100ms). +* so we will return it as a success to get more time . +*/ + p2p->block_gon_req_tx = false; + ack = true; + } + +clear_bit (BRCMF_P2P_STATUS_WAITING_NEXT_ACT_FRAME , &p2p->status);/* if all done, turn mpc on again */ if (config_af_params.mpc_onoff ==1 )brcmf_set_mpc (ndev,1 );
@@ -1293,6 +1825,72 @@ exit:return ack; } +/** +* brcmf_p2p_notify_rx_mgmt_p2p_probereq() - Event handler for p2p probe req. +* +* @ifp: interface pointer for which event was received. +* @e: even message. +* @data: payload of event message (probe request). +*/ +s32 brcmf_p2p_notify_rx_mgmt_p2p_probereq (struct brcmf_if *ifp, +const struct brcmf_event_msg *e, +void *data) +{ +struct brcmf_cfg80211_info *cfg = ifp->drvr->config; +struct brcmf_p2p_info *p2p = &cfg->p2p; +struct afx_hdl *afx_hdl = &p2p->afx_hdl; +struct wireless_dev *wdev; +struct brcmf_cfg80211_vif *vif = ifp->vif; +struct brcmf_rx_mgmt_data *rxframe = (struct brcmf_rx_mgmt_data *)data; +u16 chanspec =be16_to_cpu (rxframe->chanspec); +u8 *mgmt_frame; +u32 mgmt_frame_len; +s32 freq; +u16 mgmt_type; + +brcmf_dbg (INFO ,"Enter: event %d reason %d\n" , e->event_code, + e->reason); + +if (test_bit (BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL , &p2p->status) && + (memcmp (afx_hdl->tx_dst_addr, e->addr,ETH_ALEN ) ==0 )) { + afx_hdl->peer_chan =CHSPEC_CHANNEL (chanspec); +brcmf_dbg (INFO ,"PROBE REQUEST: Peer found, channel=%d\n" , + afx_hdl->peer_chan); +complete (&afx_hdl->act_frm_scan); + } + +/* Firmware sends us two proberesponses for each idx one. At the */ +/* moment anything but bsscfgidx 0 is passed up to supplicant */ +if (e->bsscfgidx ==0 ) +return 0 ; + +/* Filter any P2P probe reqs arriving during the GO-NEG Phase */ +if (test_bit (BRCMF_P2P_STATUS_GO_NEG_PHASE , &p2p->status)) { +brcmf_dbg (INFO ,"Filtering P2P probe_req in GO-NEG phase\n" ); +return 0 ; + } + +/* Check if wpa_supplicant has registered for this frame */ +brcmf_dbg (INFO ,"vif->mgmt_rx_reg %04x\n" , vif->mgmt_rx_reg); + mgmt_type = (IEEE80211_STYPE_PROBE_REQ &IEEE80211_FCTL_STYPE ) >>4 ; +if ((vif->mgmt_rx_reg &BIT (mgmt_type)) ==0 ) +return 0 ; + + mgmt_frame = (u8 *)(rxframe +1 ); + mgmt_frame_len = e->datalen -sizeof (*rxframe); + freq =ieee80211_channel_to_frequency (CHSPEC_CHANNEL (chanspec), +CHSPEC_IS2G (chanspec) ? +IEEE80211_BAND_2GHZ : +IEEE80211_BAND_5GHZ ); + wdev = ifp->ndev->ieee80211_ptr; +cfg80211_rx_mgmt (wdev, freq,0 , mgmt_frame, mgmt_frame_len,GFP_ATOMIC ); + +brcmf_dbg (INFO ,"mgmt_frame_len (%d) , e->datalen (%d), chanspec (%04x), freq (%d)\n" , + mgmt_frame_len, e->datalen, chanspec, freq); + +return 0 ; +} +/** * brcmf_p2p_attach() - attach for P2P.
@@ -1362,6 +1960,9 @@ s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg) }init_completion (&p2p->send_af_done); +INIT_WORK (&p2p->afx_hdl.afx_work, brcmf_p2p_afx_handler); +init_completion (&p2p->afx_hdl.act_frm_scan); +init_completion (&p2p->wait_next_af); } exit:return err;
@@ -1622,6 +2223,7 @@ fail:int brcmf_p2p_del_vif (struct wiphy *wiphy,struct wireless_dev *wdev) {struct brcmf_cfg80211_info *cfg =wiphy_priv (wiphy); +struct brcmf_p2p_info *p2p = &cfg->p2p;struct brcmf_cfg80211_vif *vif;unsigned long jiffie_timeout =msecs_to_jiffies (1500 );bool wait_for_disable = false;
@@ -1647,6 +2249,9 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev)break ; } +clear_bit (BRCMF_P2P_STATUS_GO_NEG_PHASE , &p2p->status); +brcmf_dbg (INFO ,"P2P: GO_NEG_PHASE status cleared\n" ); +if (wait_for_disable)wait_for_completion_timeout (&cfg->vif_disabled,msecs_to_jiffies (500 ));
@@ -1666,7 +2271,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev) }brcmf_cfg80211_arm_vif_event (cfg,NULL );brcmf_free_vif (vif); - cfg->p2p.bss_idx[P2PAPI_BSSCFG_CONNECTION ].vif =NULL ; + p2p->bss_idx[P2PAPI_BSSCFG_CONNECTION ].vif =NULL ;return err; }
drivers/net/wireless/brcm80211/brcmfmac/p2p.h +49 -2
79 lines not on this page · raw message
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +19 -57
136 lines not on this page · raw message
Signature · 1 line
1.7.10.4