diff options
Diffstat (limited to 'drivers/net/wireless/bcmdhd/wl_cfg80211.c')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/wl_cfg80211.c | 7158 |
1 files changed, 4357 insertions, 2801 deletions
diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index c205695..e9dfcd0 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -1,7 +1,7 @@ /* * Linux cfg80211 driver * - * Copyright (C) 1999-2012, Broadcom Corporation + * Copyright (C) 1999-2014, Broadcom Corporation * * Unless you and Broadcom execute a separate written software license * agreement governing use of this software, this software is licensed to you @@ -21,7 +21,7 @@ * software in any way with any other Broadcom software provided under a license * other than the GPL, without Broadcom's express prior written consent. * - * $Id: wl_cfg80211.c 394719 2013-04-03 13:22:12Z $ + * $Id: wl_cfg80211.c 464537 2014-03-25 06:28:32Z $ */ /* */ #include <typedefs.h> @@ -39,9 +39,13 @@ #include <dngl_stats.h> #include <dhd.h> +#include <dhd_linux.h> #include <dhdioctl.h> #include <wlioctl.h> #include <dhd_cfg80211.h> +#ifdef PNO_SUPPORT +#include <dhd_pno.h> +#endif /* PNO_SUPPORT */ #include <proto/ethernet.h> #include <linux/kernel.h> @@ -65,10 +69,14 @@ #include <dhd_wlfc.h> #endif +#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) || defined(WL_VENDOR_EXT_SUPPORT) +#include <wl_cfgvendor.h> +#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) || defined(WL_VENDOR_EXT_SUPPORT) */ #ifdef WL11U -#ifndef WL_ENABLE_P2P_IF -#error "You should enable WL_ENABLE_P2P_IF and Only supported in JB" -#endif +#if !defined(WL_ENABLE_P2P_IF) && !defined(WL_CFG80211_P2P_DEV_IF) +#error You should enable 'WL_ENABLE_P2P_IF' or 'WL_CFG80211_P2P_DEV_IF' \ + according to Kernel version and is supported only in Android-JB +#endif /* !WL_ENABLE_P2P_IF && !WL_CFG80211_P2P_DEV_IF */ #endif /* WL11U */ #ifdef BCMWAPI_WPI @@ -105,7 +113,8 @@ #endif /* BCMWAPI_WPI */ static struct device *cfg80211_parent_dev = NULL; -struct wl_priv *wlcfg_drv_priv = NULL; +/* g_bcm_cfg should be static. Do not change */ +static struct bcm_cfg80211 *g_bcm_cfg = NULL; #ifdef CUSTOMER_HW4 u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_P2P_ACTION; #else @@ -116,34 +125,32 @@ u32 wl_dbg_level = WL_DBG_ERR; #ifdef VSDB /* sleep time to keep STA's connecting or connection for continuous af tx or finding a peer */ -#define DEFAULT_SLEEP_TIME_VSDB 120 +#define DEFAULT_SLEEP_TIME_VSDB 120 #define OFF_CHAN_TIME_THRESHOLD_MS 200 +#define AF_RETRY_DELAY_TIME 40 /* if sta is connected or connecting, sleep for a while before retry af tx or finding a peer */ -#define WL_AF_TX_KEEP_PRI_CONNECTION_VSDB(wl) \ +#define WL_AF_TX_KEEP_PRI_CONNECTION_VSDB(cfg) \ do { \ - if (wl_get_drv_status(wl, CONNECTED, wl_to_prmry_ndev(wl)) || \ - wl_get_drv_status(wl, CONNECTING, wl_to_prmry_ndev(wl))) { \ - msleep(DEFAULT_SLEEP_TIME_VSDB); \ + if (wl_get_drv_status(cfg, CONNECTED, bcmcfg_to_prmry_ndev(cfg)) || \ + wl_get_drv_status(cfg, CONNECTING, bcmcfg_to_prmry_ndev(cfg))) { \ + OSL_SLEEP(DEFAULT_SLEEP_TIME_VSDB); \ } \ } while (0) #else /* VSDB */ /* if not VSDB, do nothing */ -#define WL_AF_TX_KEEP_PRI_CONNECTION_VSDB(wl) +#define WL_AF_TX_KEEP_PRI_CONNECTION_VSDB(cfg) #endif /* VSDB */ #ifdef WL_CFG80211_SYNC_GON -#define WL_DRV_STATUS_SENDING_AF_FRM_EXT(wl) \ - (wl_get_drv_status_all(wl, SENDING_ACT_FRM) || \ - wl_get_drv_status_all(wl, WAITING_NEXT_ACT_FRM_LISTEN)) +#define WL_DRV_STATUS_SENDING_AF_FRM_EXT(cfg) \ + (wl_get_drv_status_all(cfg, SENDING_ACT_FRM) || \ + wl_get_drv_status_all(cfg, WAITING_NEXT_ACT_FRM_LISTEN)) #else -#define WL_DRV_STATUS_SENDING_AF_FRM_EXT(wl) wl_get_drv_status_all(wl, SENDING_ACT_FRM) +#define WL_DRV_STATUS_SENDING_AF_FRM_EXT(cfg) wl_get_drv_status_all(cfg, SENDING_ACT_FRM) #endif /* WL_CFG80211_SYNC_GON */ -#define WL_CHANSPEC_CTL_SB_NONE WL_CHANSPEC_CTL_SB_LLL - - -#define DNGL_FUNC(func, parameters) func parameters; +#define DNGL_FUNC(func, parameters) func parameters #define COEX_DHCP #define WLAN_EID_SSID 0 @@ -173,6 +180,67 @@ static const struct ieee80211_regdomain brcm_regdom = { REG_RULE(5470-10, 5850+10, 40, 6, 20, 0), } }; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) && \ + (defined(WL_IFACE_COMB_NUM_CHANNELS) || defined(WL_CFG80211_P2P_DEV_IF)) +/* + * Possible interface combinations supported by driver + * + * ADHOC Mode - #ADHOC <= 1 on channels = 1 + * SoftAP Mode - #AP <= 1 on channels = 1 + * STA + P2P Mode - #STA <= 2, #{P2P-GO, P2P-client} <= 1, #P2P-device <= 1 + * on channels = 2 + */ +static const struct ieee80211_iface_limit common_if_limits[] = { + { + .max = 1, + .types = BIT(NL80211_IFTYPE_AP), + }, + { + /* + * During P2P-GO removal, P2P-GO is first changed to STA and later only + * removed. So setting maximum possible number of STA interfaces according + * to kernel version. + * + * less than linux-3.8 - max:3 (wlan0 + p2p0 + group removal of p2p-p2p0-x) + * linux-3.8 and above - max:2 (wlan0 + group removal of p2p-wlan0-x) + */ +#ifdef WL_ENABLE_P2P_IF + .max = 3, +#else + .max = 2, +#endif /* WL_ENABLE_P2P_IF */ + .types = BIT(NL80211_IFTYPE_STATION), + }, + { + .max = 2, + .types = BIT(NL80211_IFTYPE_P2P_GO) | BIT(NL80211_IFTYPE_P2P_CLIENT), + }, +#if defined(WL_CFG80211_P2P_DEV_IF) + { + .max = 1, + .types = BIT(NL80211_IFTYPE_P2P_DEVICE), + }, +#endif /* WL_CFG80211_P2P_DEV_IF */ + { + .max = 1, + .types = BIT(NL80211_IFTYPE_ADHOC), + }, +}; +#ifdef BCM4330_CHIP +#define NUM_DIFF_CHANNELS 1 +#else +#define NUM_DIFF_CHANNELS 2 +#endif +static const struct ieee80211_iface_combination +common_iface_combinations[] = { + { + .num_different_channels = NUM_DIFF_CHANNELS, + .max_interfaces = 4, + .limits = common_if_limits, + .n_limits = ARRAY_SIZE(common_if_limits), + }, +}; +#endif /* LINUX_VER >= 3.0 && (WL_IFACE_COMB_NUM_CHANNELS || WL_CFG80211_P2P_DEV_IF) */ /* Data Element Definitions */ #define WPS_ID_CONFIG_METHODS 0x1008 @@ -217,8 +285,17 @@ static const struct ieee80211_regdomain brcm_regdom = { #define DOT11_LEAP_AUTH 0x80 /* LEAP auth frame paylod constants */ #endif /* BCMCCX */ -#ifndef RSSI_OFFSET -#define RSSI_OFFSET 0 +#ifdef MFP +#define WL_AKM_SUITE_MFP_1X 0x000FAC05 +#define WL_AKM_SUITE_MFP_PSK 0x000FAC06 +#endif /* MFP */ + +#ifndef IBSS_COALESCE_ALLOWED +#define IBSS_COALESCE_ALLOWED 0 +#endif + +#ifndef IBSS_INITIAL_SCAN_ALLOWED +#define IBSS_INITIAL_SCAN_ALLOWED 0 #endif /* * cfg80211_ops api/callback list @@ -229,8 +306,14 @@ static s32 wl_frame_get_mgmt(u16 fc, const struct ether_addr *da, static s32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid); -static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, +#if defined(WL_CFG80211_P2P_DEV_IF) +static s32 +wl_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request); +#else +static s32 +wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_scan_request *request); +#endif /* WL_CFG80211_P2P_DEV_IF */ static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed); static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_ibss_params *params); @@ -246,10 +329,21 @@ static int wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_connect_params *sme); static s32 wl_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_code); -static s32 wl_cfg80211_set_tx_power(struct wiphy *wiphy, - enum nl80211_tx_power_setting type, - s32 dbm); +#if defined(WL_CFG80211_P2P_DEV_IF) +static s32 +wl_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, + enum nl80211_tx_power_setting type, s32 mbm); +#else +static s32 +wl_cfg80211_set_tx_power(struct wiphy *wiphy, + enum nl80211_tx_power_setting type, s32 dbm); +#endif /* WL_CFG80211_P2P_DEV_IF */ +#if defined(WL_CFG80211_P2P_DEV_IF) +static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, + struct wireless_dev *wdev, s32 *dbm); +#else static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm); +#endif /* WL_CFG80211_P2P_DEV_IF */ static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *dev, u8 key_idx, bool unicast, bool multicast); @@ -265,14 +359,16 @@ static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, static s32 wl_cfg80211_config_default_mgmt_key(struct wiphy *wiphy, struct net_device *dev, u8 key_idx); static s32 wl_cfg80211_resume(struct wiphy *wiphy); -#if 1 //defined(WL_SUPPORT_BACKPORTED_KPATCHES) || (LINUX_VERSION_CODE >= KERNEL_VERSION(3, \ +#if defined(WL_SUPPORT_BACKPORTED_KPATCHES) || (LINUX_VERSION_CODE >= KERNEL_VERSION(3, \ 2, 0)) static s32 wl_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy, - struct net_device *dev, u64 cookie); + bcm_struct_cfgdev *cfgdev, u64 cookie); static s32 wl_cfg80211_del_station(struct wiphy *wiphy, struct net_device *ndev, u8* mac_addr); -#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)) */ -#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) +static s32 wl_cfg80211_change_station(struct wiphy *wiphy, + struct net_device *dev, u8 *mac, struct station_parameters *params); +#endif /* WL_SUPPORT_BACKPORTED_KPATCHES || KERNEL_VER >= KERNEL_VERSION(3, 2, 0)) */ +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)) || defined(WL_COMPAT_WIRELESS) static s32 wl_cfg80211_suspend(struct wiphy *wiphy, struct cfg80211_wowlan *wow); #else static s32 wl_cfg80211_suspend(struct wiphy *wiphy); @@ -283,60 +379,64 @@ static s32 wl_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_pmksa *pmksa); static s32 wl_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_device *dev); -static void wl_cfg80211_scan_abort(struct wl_priv *wl); -static s32 wl_notify_escan_complete(struct wl_priv *wl, +static void wl_cfg80211_scan_abort(struct bcm_cfg80211 *cfg); +static s32 wl_notify_escan_complete(struct bcm_cfg80211 *cfg, struct net_device *ndev, bool aborted, bool fw_abort); -#if 1 //LINUX_VERSION_CODE > KERNEL_VERSION(3, 2, 0) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 2, 0)) || defined(WL_COMPAT_WIRELESS) static s32 wl_cfg80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev, u8 *peer, enum nl80211_tdls_operation oper); -#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(3, 2, 0) */ +#endif /* LINUX_VERSION > KERNEL_VERSION(3,2,0) || WL_COMPAT_WIRELESS */ +#ifdef WL_SCHED_SCAN +static int wl_cfg80211_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev); +#endif /* * event & event Q handlers for cfg80211 interfaces */ -static s32 wl_create_event_handler(struct wl_priv *wl); -static void wl_destroy_event_handler(struct wl_priv *wl); +static s32 wl_create_event_handler(struct bcm_cfg80211 *cfg); +static void wl_destroy_event_handler(struct bcm_cfg80211 *cfg); static s32 wl_event_handler(void *data); -static void wl_init_eq(struct wl_priv *wl); -static void wl_flush_eq(struct wl_priv *wl); -static unsigned long wl_lock_eq(struct wl_priv *wl); -static void wl_unlock_eq(struct wl_priv *wl, unsigned long flags); -static void wl_init_eq_lock(struct wl_priv *wl); -static void wl_init_event_handler(struct wl_priv *wl); -static struct wl_event_q *wl_deq_event(struct wl_priv *wl); -static s32 wl_enq_event(struct wl_priv *wl, struct net_device *ndev, u32 type, +static void wl_init_eq(struct bcm_cfg80211 *cfg); +static void wl_flush_eq(struct bcm_cfg80211 *cfg); +static unsigned long wl_lock_eq(struct bcm_cfg80211 *cfg); +static void wl_unlock_eq(struct bcm_cfg80211 *cfg, unsigned long flags); +static void wl_init_eq_lock(struct bcm_cfg80211 *cfg); +static void wl_init_event_handler(struct bcm_cfg80211 *cfg); +static struct wl_event_q *wl_deq_event(struct bcm_cfg80211 *cfg); +static s32 wl_enq_event(struct bcm_cfg80211 *cfg, struct net_device *ndev, u32 type, const wl_event_msg_t *msg, void *data); static void wl_put_event(struct wl_event_q *e); -static void wl_wakeup_event(struct wl_priv *wl); -static s32 wl_notify_connect_status_ap(struct wl_priv *wl, struct net_device *ndev, - const wl_event_msg_t *e, void *data); -static s32 wl_notify_connect_status(struct wl_priv *wl, - struct net_device *ndev, +static void wl_wakeup_event(struct bcm_cfg80211 *cfg); +static s32 wl_notify_connect_status_ap(struct bcm_cfg80211 *cfg, struct net_device *ndev, const wl_event_msg_t *e, void *data); -static s32 wl_notify_roaming_status(struct wl_priv *wl, - struct net_device *ndev, - const wl_event_msg_t *e, void *data); -static s32 wl_notify_scan_status(struct wl_priv *wl, struct net_device *ndev, +static s32 wl_notify_connect_status(struct bcm_cfg80211 *cfg, + bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data); +static s32 wl_notify_roaming_status(struct bcm_cfg80211 *cfg, + bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data); +static s32 wl_notify_scan_status(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data); -static s32 wl_bss_connect_done(struct wl_priv *wl, struct net_device *ndev, +static s32 wl_bss_connect_done(struct bcm_cfg80211 *cfg, struct net_device *ndev, const wl_event_msg_t *e, void *data, bool completed); -static s32 wl_bss_roaming_done(struct wl_priv *wl, struct net_device *ndev, +static s32 wl_bss_roaming_done(struct bcm_cfg80211 *cfg, struct net_device *ndev, const wl_event_msg_t *e, void *data); -static s32 wl_notify_mic_status(struct wl_priv *wl, struct net_device *ndev, +static s32 wl_notify_mic_status(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data); #ifdef WL_SCHED_SCAN static s32 -wl_notify_sched_scan_results(struct wl_priv *wl, struct net_device *ndev, +wl_notify_sched_scan_results(struct bcm_cfg80211 *cfg, struct net_device *ndev, const wl_event_msg_t *e, void *data); #endif /* WL_SCHED_SCAN */ #ifdef PNO_SUPPORT -static s32 wl_notify_pfn_status(struct wl_priv *wl, struct net_device *ndev, +static s32 wl_notify_pfn_status(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data); #endif /* PNO_SUPPORT */ -static s32 wl_notifier_change_state(struct wl_priv *wl, struct net_info *_net_info, +static s32 wl_notifier_change_state(struct bcm_cfg80211 *cfg, struct net_info *_net_info, enum wl_status state, bool set); -static s32 wl_tdls_event_handler(struct wl_priv *wl, struct net_device *ndev, + +#ifdef WLTDLS +static s32 wl_tdls_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data); +#endif /* WLTDLS */ /* * register/deregister parent device */ @@ -354,12 +454,12 @@ static s32 wl_set_rts(struct net_device *dev, u32 frag_threshold); static s32 wl_set_retry(struct net_device *dev, u32 retry, bool l); /* - * wl profile utilities + * cfg profile utilities */ -static s32 wl_update_prof(struct wl_priv *wl, struct net_device *ndev, +static s32 wl_update_prof(struct bcm_cfg80211 *cfg, struct net_device *ndev, const wl_event_msg_t *e, void *data, s32 item); -static void *wl_read_prof(struct wl_priv *wl, struct net_device *ndev, s32 item); -static void wl_init_prof(struct wl_priv *wl, struct net_device *ndev); +static void *wl_read_prof(struct bcm_cfg80211 *cfg, struct net_device *ndev, s32 item); +static void wl_init_prof(struct bcm_cfg80211 *cfg, struct net_device *ndev); /* * cfg80211 connect utilites @@ -378,36 +478,42 @@ static s32 wl_set_set_sharedkey(struct net_device *dev, static s32 wl_set_set_wapi_ie(struct net_device *dev, struct cfg80211_connect_params *sme); #endif -static s32 wl_get_assoc_ies(struct wl_priv *wl, struct net_device *ndev); +static s32 wl_get_assoc_ies(struct bcm_cfg80211 *cfg, struct net_device *ndev); static void wl_ch_to_chanspec(int ch, struct wl_join_params *join_params, size_t *join_params_size); /* * information element utilities */ -static void wl_rst_ie(struct wl_priv *wl); -static __used s32 wl_add_ie(struct wl_priv *wl, u8 t, u8 l, u8 *v); -static s32 wl_mrg_ie(struct wl_priv *wl, u8 *ie_stream, u16 ie_size); -static s32 wl_cp_ie(struct wl_priv *wl, u8 *dst, u16 dst_size); -static u32 wl_get_ielen(struct wl_priv *wl); +static void wl_rst_ie(struct bcm_cfg80211 *cfg); +static __used s32 wl_add_ie(struct bcm_cfg80211 *cfg, u8 t, u8 l, u8 *v); +static void wl_update_hidden_ap_ie(struct wl_bss_info *bi, u8 *ie_stream, u32 *ie_size); +static s32 wl_mrg_ie(struct bcm_cfg80211 *cfg, u8 *ie_stream, u16 ie_size); +static s32 wl_cp_ie(struct bcm_cfg80211 *cfg, u8 *dst, u16 dst_size); +static u32 wl_get_ielen(struct bcm_cfg80211 *cfg); +#ifdef MFP +static int wl_cfg80211_get_rsn_capa(bcm_tlv_t *wpa2ie, u8* capa); +#endif #ifdef WL11U bcm_tlv_t * wl_cfg80211_find_interworking_ie(u8 *parse, u32 len); static s32 -wl_cfg80211_add_iw_ie(struct wl_priv *wl, struct net_device *ndev, s32 bssidx, s32 pktflag, +wl_cfg80211_add_iw_ie(struct bcm_cfg80211 *cfg, struct net_device *ndev, s32 bssidx, s32 pktflag, uint8 ie_id, uint8 *data, uint8 data_len); #endif /* WL11U */ -static s32 wl_setup_wiphy(struct wireless_dev *wdev, struct device *dev); -static void wl_free_wdev(struct wl_priv *wl); +static s32 wl_setup_wiphy(struct wireless_dev *wdev, struct device *dev, void *data); +static void wl_free_wdev(struct bcm_cfg80211 *cfg); -static s32 wl_inform_bss(struct wl_priv *wl); -static s32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi, u8 is_roam_done); -static s32 wl_update_bss_info(struct wl_priv *wl, struct net_device *ndev, u8 is_roam_done); +static s32 wl_inform_bss(struct bcm_cfg80211 *cfg); +static s32 wl_inform_single_bss(struct bcm_cfg80211 *cfg, struct wl_bss_info *bi); +static s32 wl_update_bss_info(struct bcm_cfg80211 *cfg, struct net_device *ndev); static chanspec_t wl_cfg80211_get_shared_freq(struct wiphy *wiphy); s32 wl_cfg80211_channel_to_freq(u32 channel); + +static void wl_cfg80211_work_handler(struct work_struct *work); static s32 wl_add_keyext(struct wiphy *wiphy, struct net_device *dev, u8 key_idx, const u8 *mac_addr, struct key_params *params); @@ -418,52 +524,36 @@ static void swap_key_from_BE(struct wl_wsec_key *key); static void swap_key_to_BE(struct wl_wsec_key *key); /* - * wl_priv memory init/deinit utilities + * bcm_cfg80211 memory init/deinit utilities */ -static s32 wl_init_priv_mem(struct wl_priv *wl); -static void wl_deinit_priv_mem(struct wl_priv *wl); +static s32 wl_init_priv_mem(struct bcm_cfg80211 *cfg); +static void wl_deinit_priv_mem(struct bcm_cfg80211 *cfg); static void wl_delay(u32 ms); /* * ibss mode utilities */ -static bool wl_is_ibssmode(struct wl_priv *wl, struct net_device *ndev); -static __used bool wl_is_ibssstarter(struct wl_priv *wl); +static bool wl_is_ibssmode(struct bcm_cfg80211 *cfg, struct net_device *ndev); +static __used bool wl_is_ibssstarter(struct bcm_cfg80211 *cfg); /* * link up/down , default configuration utilities */ -static s32 __wl_cfg80211_up(struct wl_priv *wl); -static s32 __wl_cfg80211_down(struct wl_priv *wl); -static bool wl_is_linkdown(struct wl_priv *wl, const wl_event_msg_t *e); -static bool wl_is_linkup(struct wl_priv *wl, const wl_event_msg_t *e, struct net_device *ndev); -static bool wl_is_nonetwork(struct wl_priv *wl, const wl_event_msg_t *e); -static void wl_link_up(struct wl_priv *wl); -static void wl_link_down(struct wl_priv *wl); -static s32 wl_config_ifmode(struct wl_priv *wl, struct net_device *ndev, s32 iftype); +static s32 __wl_cfg80211_up(struct bcm_cfg80211 *cfg); +static s32 __wl_cfg80211_down(struct bcm_cfg80211 *cfg); +static bool wl_is_linkdown(struct bcm_cfg80211 *cfg, const wl_event_msg_t *e); +static bool wl_is_linkup(struct bcm_cfg80211 *cfg, const wl_event_msg_t *e, + struct net_device *ndev); +static bool wl_is_nonetwork(struct bcm_cfg80211 *cfg, const wl_event_msg_t *e); +static void wl_link_up(struct bcm_cfg80211 *cfg); +static void wl_link_down(struct bcm_cfg80211 *cfg); +static s32 wl_config_ifmode(struct bcm_cfg80211 *cfg, struct net_device *ndev, s32 iftype); static void wl_init_conf(struct wl_conf *conf); +static s32 wl_cfg80211_handle_ifdel(struct bcm_cfg80211 *cfg, wl_if_event_info *if_event_info, + struct net_device* ndev); -/* - * iscan handler - */ -static void wl_iscan_timer(unsigned long data); -static void wl_term_iscan(struct wl_priv *wl); -static s32 wl_init_scan(struct wl_priv *wl); -static s32 wl_iscan_thread(void *data); -static s32 wl_run_iscan(struct wl_iscan_ctrl *iscan, struct cfg80211_scan_request *request, - u16 action); -static s32 wl_do_iscan(struct wl_priv *wl, struct cfg80211_scan_request *request); -static s32 wl_wakeup_iscan(struct wl_iscan_ctrl *iscan); -static s32 wl_invoke_iscan(struct wl_priv *wl); -static s32 wl_get_iscan_results(struct wl_iscan_ctrl *iscan, u32 *status, - struct wl_scan_results **bss_list); -static void wl_notify_iscan_complete(struct wl_iscan_ctrl *iscan, bool aborted); -static void wl_init_iscan_handler(struct wl_iscan_ctrl *iscan); -static s32 wl_iscan_done(struct wl_priv *wl); -static s32 wl_iscan_pending(struct wl_priv *wl); -static s32 wl_iscan_inprogress(struct wl_priv *wl); -static s32 wl_iscan_aborted(struct wl_priv *wl); +int wl_cfg80211_get_ioctl_version(void); /* * find most significant bit set @@ -473,16 +563,16 @@ static __used u32 wl_find_msb(u16 bit16); /* * rfkill support */ -static int wl_setup_rfkill(struct wl_priv *wl, bool setup); +static int wl_setup_rfkill(struct bcm_cfg80211 *cfg, bool setup); static int wl_rfkill_set(void *data, bool blocked); #ifdef DEBUGFS_CFG80211 -static s32 wl_setup_debugfs(struct wl_priv *wl); -static s32 wl_free_debugfs(struct wl_priv *wl); +static s32 wl_setup_debugfs(struct bcm_cfg80211 *cfg); +static s32 wl_free_debugfs(struct bcm_cfg80211 *cfg); #endif static wl_scan_params_t *wl_cfg80211_scan_alloc_params(int channel, int nprobes, int *out_params_size); -static void get_primary_mac(struct wl_priv *wl, struct ether_addr *mac); +static bool check_dev_role_integrity(struct bcm_cfg80211 *cfg, u32 dev_role); /* * Some external functions, TODO: move them to dhd_linux.h @@ -494,25 +584,40 @@ int dhd_monitor_uninit(void); int dhd_start_xmit(struct sk_buff *skb, struct net_device *net); #if defined(CUSTOMER_HW4) && defined(ROAM_CHANNEL_CACHE) +void init_roam(int ioctl_ver); void reset_roam_cache(void); void add_roam_cache(wl_bss_info_t *bi); int get_roam_channel_list(int target_chan, chanspec_t *channels, const wlc_ssid_t *ssid, int ioctl_ver); void print_roam_cache(void); void set_roam_band(int band); -void update_roam_cache(struct wl_priv *wl, int ioctl_ver); +void update_roam_cache(struct bcm_cfg80211 *cfg, int ioctl_ver); #endif /* CUSTOMER_HW4 && ROAM_CHANNEL_CACHE */ +static int wl_cfg80211_delayed_roam(struct bcm_cfg80211 *cfg, struct net_device *ndev, + const struct ether_addr *bssid); + #define RETURN_EIO_IF_NOT_UP(wlpriv) \ do { \ - struct net_device *checkSysUpNDev = wl_to_prmry_ndev(wlpriv); \ + struct net_device *checkSysUpNDev = bcmcfg_to_prmry_ndev(wlpriv); \ if (unlikely(!wl_get_drv_status(wlpriv, READY, checkSysUpNDev))) { \ WL_INFO(("device is not ready\n")); \ return -EIO; \ } \ } while (0) +#ifdef RSSI_OFFSET +static s32 wl_rssi_offset(s32 rssi) +{ + rssi += RSSI_OFFSET; + if (rssi > 0) + rssi = 0; + return rssi; +} +#else +#define wl_rssi_offset(x) x +#endif #define IS_WPA_AKM(akm) ((akm) == RSN_AKM_NONE || \ (akm) == RSN_AKM_UNSPECIFIED || \ @@ -522,15 +627,8 @@ do { \ extern int dhd_wait_pend8021x(struct net_device *dev); #ifdef PROP_TXSTATUS_VSDB extern int disable_proptx; -extern int dhd_wlfc_init(dhd_pub_t *dhd); -extern void dhd_wlfc_deinit(dhd_pub_t *dhd); #endif /* PROP_TXSTATUS_VSDB */ -#if defined(CUSTOMER_HW4) && defined(USE_DYNAMIC_F2_BLKSIZE) -extern int -dhdsdio_func_blocksize(dhd_pub_t *dhd, int function_num, int block_size); -#endif /* CUSTOMER_HW4 && USE_DYNAMIC_F2_BLKSIZE */ - #if (WL_DBG_LEVEL > 0) #define WL_DBG_ESTR_MAX 50 static s8 wl_dbg_estr[][WL_DBG_ESTR_MAX] = { @@ -674,6 +772,10 @@ static const u32 __wl_cipher_suites[] = { #define BLOCK_GON_REQ_MAX_NUM 5 #endif /* WL_CFG80211_GON_COLLISION */ +#if defined(USE_DYNAMIC_MAXPKT_RXGLOM) +static int maxrxpktglom = 0; +#endif + /* IOCtl version read from targeted driver */ static int ioctl_version; #ifdef DEBUGFS_CFG80211 @@ -691,6 +793,70 @@ static const struct { }; #endif +#if defined(CUSTOMER_HW4) && defined(DHD_DEBUG) +uint prev_dhd_console_ms = 0; +u32 prev_wl_dbg_level = 0; +bool wl_scan_timeout_dbg_enabled = 0; +static void wl_scan_timeout_dbg_set(void); +static void wl_scan_timeout_dbg_clear(void); + +static void wl_scan_timeout_dbg_set(void) +{ + WL_ERR(("Enter \n")); + prev_dhd_console_ms = dhd_console_ms; + prev_wl_dbg_level = wl_dbg_level; + + dhd_console_ms = 1; + wl_dbg_level |= (WL_DBG_ERR | WL_DBG_P2P_ACTION | WL_DBG_SCAN); + + wl_scan_timeout_dbg_enabled = 1; +} +static void wl_scan_timeout_dbg_clear(void) +{ + WL_ERR(("Enter \n")); + dhd_console_ms = prev_dhd_console_ms; + wl_dbg_level = prev_wl_dbg_level; + + wl_scan_timeout_dbg_enabled = 0; +} +#endif /* CUSTOMER_HW4 && DHD_DEBUG */ + +static void wl_add_remove_pm_enable_work(struct bcm_cfg80211 *cfg, bool add_remove, + enum wl_handler_del_type type) +{ + if (cfg == NULL) + return; + + if (cfg->pm_enable_work_on) { + if (add_remove) { +#ifdef CUSTOMER_HW4 + DHD_OS_WAKE_LOCK(cfg->pub); +#endif /* CUSTOMER_HW4 */ + schedule_delayed_work(&cfg->pm_enable_work, + msecs_to_jiffies(WL_PM_ENABLE_TIMEOUT)); + } else { + cancel_delayed_work_sync(&cfg->pm_enable_work); + switch (type) { + case WL_HANDLER_MAINTAIN: + schedule_delayed_work(&cfg->pm_enable_work, + msecs_to_jiffies(WL_PM_ENABLE_TIMEOUT)); + break; + case WL_HANDLER_PEND: + schedule_delayed_work(&cfg->pm_enable_work, + msecs_to_jiffies(WL_PM_ENABLE_TIMEOUT*2)); + break; + case WL_HANDLER_DEL: + default: + cfg->pm_enable_work_on = false; +#ifdef CUSTOMER_HW4 + DHD_OS_WAKE_UNLOCK(cfg->pub); +#endif /* CUSTOMER_HW4 */ + break; + } + } + } +} + /* Return a new chanspec given a legacy chanspec * Returns INVCHANSPEC on error */ @@ -881,7 +1047,14 @@ wl_cfg80211_default_mgmt_stypes[NUM_NL80211_IFTYPES] = { BIT(IEEE80211_STYPE_AUTH >> 4) | BIT(IEEE80211_STYPE_DEAUTH >> 4) | BIT(IEEE80211_STYPE_ACTION >> 4) - } + }, +#if defined(WL_CFG80211_P2P_DEV_IF) + [NL80211_IFTYPE_P2P_DEVICE] = { + .tx = 0xffff, + .rx = BIT(IEEE80211_STYPE_ACTION >> 4) | + BIT(IEEE80211_STYPE_PROBE_REQ >> 4) + }, +#endif /* WL_CFG80211_P2P_DEV_IF */ }; static void swap_key_from_BE(struct wl_wsec_key *key) @@ -906,7 +1079,7 @@ static void swap_key_to_BE(struct wl_wsec_key *key) key->iv_initialized = dtoh32(key->iv_initialized); } -#if 0 //LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)) && !defined(WL_COMPAT_WIRELESS) /* For debug: Dump the contents of the encoded wps ie buffe */ static void wl_validate_wps_ie(char *wps_ie, s32 wps_ie_len, bool *pbc) @@ -990,14 +1163,87 @@ wl_validate_wps_ie(char *wps_ie, s32 wps_ie_len, bool *pbc) subel += subelt_len; } } -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) */ +#endif /* LINUX_VERSION < VERSION(3, 4, 0) && !WL_COMPAT_WIRELESS */ + +s32 wl_set_tx_power(struct net_device *dev, + enum nl80211_tx_power_setting type, s32 dbm) +{ + s32 err = 0; + s32 disable = 0; + s32 txpwrqdbm; +#ifdef TEST_TX_POWER_CONTROL + char *tmppwr_str = NULL; +#endif /* TEST_TX_POWER_CONTROL */ + + /* Make sure radio is off or on as far as software is concerned */ + disable = WL_RADIO_SW_DISABLE << 16; + disable = htod32(disable); + err = wldev_ioctl(dev, WLC_SET_RADIO, &disable, sizeof(disable), true); + if (unlikely(err)) { + WL_ERR(("WLC_SET_RADIO error (%d)\n", err)); + return err; + } + + if (dbm > 0xffff) + dbm = 0xffff; + txpwrqdbm = dbm * 4; +#ifdef SUPPORT_WL_TXPOWER + if (type == NL80211_TX_POWER_AUTOMATIC) { + txpwrqdbm = 127; +#ifdef TEST_TX_POWER_CONTROL + err = wldev_iovar_setint(dev, "qtxpower", txpwrqdbm); + if (unlikely(err)) + WL_ERR(("qtxpower error (%d)\n", err)); + else + WL_ERR(("mW=%d, txpwrqdbm=0x%x\n", dbm, txpwrqdbm)); + + tmppwr_str = kzalloc(0x71a, GFP_KERNEL); + if (!tmppwr_str) { + WL_ERR(("tmppwr memory alloc failed\n")); + } else { + err = wldev_iovar_getbuf(dev, "curpower", NULL, 0, tmppwr_str, 0x71a, NULL); + if (unlikely(err)) { + WL_ERR(("curpower error (%d)\n", err)); + } + kfree(tmppwr_str); + } +#endif /* TEST_TX_POWER_CONTROL */ + } else { + txpwrqdbm |= WL_TXPWR_OVERRIDE; + } +#endif /* SUPPORT_WL_TXPOWER */ + + err = wldev_iovar_setint(dev, "qtxpower", txpwrqdbm); + if (unlikely(err)) + WL_ERR(("qtxpower error (%d)\n", err)); + else + WL_ERR(("dBm=%d, txpwrqdbm=0x%x\n", dbm, txpwrqdbm)); + + return err; +} + +s32 wl_get_tx_power(struct net_device *dev, s32 *dbm) +{ + s32 err = 0; + s32 txpwrdbm; + + err = wldev_iovar_getint(dev, "qtxpower", &txpwrdbm); + if (unlikely(err)) { + WL_ERR(("error (%d)\n", err)); + return err; + } + + *dbm = (txpwrdbm & ~WL_TXPWR_OVERRIDE) / 4; + + return err; +} static chanspec_t wl_cfg80211_get_shared_freq(struct wiphy *wiphy) { chanspec_t chspec; int err = 0; - struct wl_priv *wl = wiphy_priv(wiphy); - struct net_device *dev = wl_to_prmry_ndev(wl); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); + struct net_device *dev = bcmcfg_to_prmry_ndev(cfg); struct ether_addr bssid; struct wl_bss_info *bss = NULL; @@ -1011,23 +1257,25 @@ static chanspec_t wl_cfg80211_get_shared_freq(struct wiphy *wiphy) } - *(u32 *) wl->extra_buf = htod32(WL_EXTRA_BUF_MAX); - if ((err = wldev_ioctl(dev, WLC_GET_BSS_INFO, wl->extra_buf, + *(u32 *) cfg->extra_buf = htod32(WL_EXTRA_BUF_MAX); + if ((err = wldev_ioctl(dev, WLC_GET_BSS_INFO, cfg->extra_buf, WL_EXTRA_BUF_MAX, false))) { WL_ERR(("Failed to get associated bss info, use temp channel \n")); chspec = wl_ch_host_to_driver(WL_P2P_TEMP_CHAN); } else { - bss = (struct wl_bss_info *) (wl->extra_buf + 4); + bss = (struct wl_bss_info *) (cfg->extra_buf + 4); chspec = bss->chanspec; - WL_DBG(("Valid BSS Found. chanspec:%d \n", bss->chanspec)); + + WL_DBG(("Valid BSS Found. chanspec:%d \n", chspec)); } return chspec; } -static struct net_device* wl_cfg80211_add_monitor_if(char *name) +static bcm_struct_cfgdev * +wl_cfg80211_add_monitor_if(char *name) { -#if defined(WLP2P) && defined(WL_ENABLE_P2P_IF) +#if defined(WL_ENABLE_P2P_IF) || defined(WL_CFG80211_P2P_DEV_IF) WL_INFO(("wl_cfg80211_add_monitor_if: No more support monitor interface\n")); return ERR_PTR(-EOPNOTSUPP); #else @@ -1035,12 +1283,17 @@ static struct net_device* wl_cfg80211_add_monitor_if(char *name) dhd_add_monitor(name, &ndev); WL_INFO(("wl_cfg80211_add_monitor_if net device returned: 0x%p\n", ndev)); - return ndev; -#endif /* defined(WLP2P) && defined(WL_ENABLE_P2P_IF) */ + return ndev_to_cfgdev(ndev); +#endif /* WL_ENABLE_P2P_IF || WL_CFG80211_P2P_DEV_IF */ } -static struct net_device * -wl_cfg80211_add_virtual_iface(struct wiphy *wiphy, char *name, +static bcm_struct_cfgdev * +wl_cfg80211_add_virtual_iface(struct wiphy *wiphy, +#if defined(WL_CFG80211_P2P_DEV_IF) + const char *name, +#else + char *name, +#endif /* WL_CFG80211_P2P_DEV_IF */ enum nl80211_iftype type, u32 *flags, struct vif_params *params) { @@ -1051,26 +1304,31 @@ wl_cfg80211_add_virtual_iface(struct wiphy *wiphy, char *name, s32 val = 0; s32 dhd_mode = 0; chanspec_t chspec; - struct wl_priv *wl = wiphy_priv(wiphy); - struct net_device *_ndev; + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); + struct net_device *primary_ndev; + struct net_device *new_ndev; struct ether_addr primary_mac; - int (*net_attach)(void *dhdp, int ifidx); - bool rollback_lock = false; #ifdef PROP_TXSTATUS_VSDB s32 up = 1; dhd_pub_t *dhd; + bool enabled; #endif /* PROP_TXSTATUS_VSDB */ - if (!wl) + if (!cfg) return ERR_PTR(-EINVAL); #ifdef PROP_TXSTATUS_VSDB - dhd = (dhd_pub_t *)(wl->pub); + dhd = (dhd_pub_t *)(cfg->pub); #endif /* PROP_TXSTATUS_VSDB */ /* Use primary I/F for sending cmds down to firmware */ - _ndev = wl_to_prmry_ndev(wl); + primary_ndev = bcmcfg_to_prmry_ndev(cfg); + + if (unlikely(!wl_get_drv_status(cfg, READY, primary_ndev))) { + WL_ERR(("device is not ready\n")); + return ERR_PTR(-ENODEV); + } WL_DBG(("if name: %s, type: %d\n", name, type)); switch (type) { @@ -1082,7 +1340,11 @@ wl_cfg80211_add_virtual_iface(struct wiphy *wiphy, char *name, mode = WL_MODE_IBSS; return NULL; case NL80211_IFTYPE_MONITOR: - return wl_cfg80211_add_monitor_if(name); + return wl_cfg80211_add_monitor_if((char *)name); +#if defined(WL_CFG80211_P2P_DEV_IF) + case NL80211_IFTYPE_P2P_DEVICE: + return wl_cfgp2p_add_p2p_disc_if(cfg); +#endif /* WL_CFG80211_P2P_DEV_IF */ case NL80211_IFTYPE_P2P_CLIENT: case NL80211_IFTYPE_STATION: wlif_type = WL_P2P_IF_CLIENT; @@ -1103,69 +1365,40 @@ wl_cfg80211_add_virtual_iface(struct wiphy *wiphy, char *name, WL_ERR(("name is NULL\n")); return NULL; } - if (wl->p2p_supported && (wlif_type != -1)) { - ASSERT(wl->p2p); /* ensure expectation of p2p initialization */ - if (wl_get_p2p_status(wl, IF_DELETING)) { - /* wait till IF_DEL is complete - * release the lock for the unregister to proceed - */ - if (rtnl_is_locked()) { - rtnl_unlock(); - rollback_lock = true; - } - WL_INFO(("Released the lock and wait till IF_DEL is complete\n")); - timeout = wait_event_interruptible_timeout(wl->netif_change_event, - (wl_get_p2p_status(wl, IF_DELETING) == false), - msecs_to_jiffies(MAX_WAIT_TIME)); - - /* put back the rtnl_lock again */ - if (rollback_lock) { - rtnl_lock(); - rollback_lock = false; - } - if (timeout > 0) { - WL_ERR(("IF DEL is Success\n")); - - } else { - WL_ERR(("timeount < 0, return -EAGAIN\n")); - return ERR_PTR(-EAGAIN); - } - /* It should be now be safe to put this check here since we are sure - * by now netdev_notifier (unregister) would have been called - */ - if (wl->iface_cnt == IFACE_MAX_CNT) - return ERR_PTR(-ENOMEM); - } + if (cfg->p2p_supported && (wlif_type != -1)) { + ASSERT(cfg->p2p); /* ensure expectation of p2p initialization */ #ifdef PROP_TXSTATUS_VSDB if (!dhd) return ERR_PTR(-ENODEV); #endif /* PROP_TXSTATUS_VSDB */ - if (!wl->p2p) + if (!cfg->p2p) return ERR_PTR(-ENODEV); - if (wl->p2p && !wl->p2p->on && strstr(name, WL_P2P_INTERFACE_PREFIX)) { - p2p_on(wl) = true; - wl_cfgp2p_set_firm_p2p(wl); - wl_cfgp2p_init_discovery(wl); - get_primary_mac(wl, &primary_mac); + if (cfg->p2p && !cfg->p2p->on && strstr(name, WL_P2P_INTERFACE_PREFIX)) { + p2p_on(cfg) = true; + wl_cfgp2p_set_firm_p2p(cfg); + wl_cfgp2p_init_discovery(cfg); + get_primary_mac(cfg, &primary_mac); wl_cfgp2p_generate_bss_mac(&primary_mac, - &wl->p2p->dev_addr, &wl->p2p->int_addr); + &cfg->p2p->dev_addr, &cfg->p2p->int_addr); } - memset(wl->p2p->vir_ifname, 0, IFNAMSIZ); - strncpy(wl->p2p->vir_ifname, name, IFNAMSIZ - 1); - + memset(cfg->p2p->vir_ifname, 0, IFNAMSIZ); + strncpy(cfg->p2p->vir_ifname, name, IFNAMSIZ - 1); - wl_cfg80211_scan_abort(wl); + wl_cfg80211_scan_abort(cfg); #ifdef PROP_TXSTATUS_VSDB - if (!wl->wlfc_on && !disable_proptx) { - dhd->wlfc_enabled = true; - dhd_wlfc_init(dhd); - err = wldev_ioctl(_ndev, WLC_UP, &up, sizeof(s32), true); - if (err < 0) - WL_ERR(("WLC_UP return err:%d\n", err)); - wl->wlfc_on = true; + if (!cfg->wlfc_on && !disable_proptx) { + dhd_wlfc_get_enable(dhd, &enabled); + if (!enabled && dhd->op_mode != DHD_FLAG_HOSTAP_MODE && + dhd->op_mode != DHD_FLAG_IBSS_MODE) { + dhd_wlfc_init(dhd); + err = wldev_ioctl(primary_ndev, WLC_UP, &up, sizeof(s32), true); + if (err < 0) + WL_ERR(("WLC_UP return err:%d\n", err)); + } + cfg->wlfc_on = true; } #endif /* PROP_TXSTATUS_VSDB */ @@ -1176,191 +1409,210 @@ wl_cfg80211_add_virtual_iface(struct wiphy *wiphy, char *name, chspec = wl_cfg80211_get_shared_freq(wiphy); /* For P2P mode, use P2P-specific driver features to create the - * bss: "wl p2p_ifadd" + * bss: "cfg p2p_ifadd" */ - wl_set_p2p_status(wl, IF_ADD); + wl_set_p2p_status(cfg, IF_ADDING); + memset(&cfg->if_event_info, 0, sizeof(cfg->if_event_info)); if (wlif_type == WL_P2P_IF_GO) - wldev_iovar_setint(_ndev, "mpc", 0); - err = wl_cfgp2p_ifadd(wl, &wl->p2p->int_addr, htod32(wlif_type), chspec); - + wldev_iovar_setint(primary_ndev, "mpc", 0); + err = wl_cfgp2p_ifadd(cfg, &cfg->p2p->int_addr, htod32(wlif_type), chspec); if (unlikely(err)) { + wl_clr_p2p_status(cfg, IF_ADDING); WL_ERR((" virtual iface add failed (%d) \n", err)); return ERR_PTR(-ENOMEM); } - timeout = wait_event_interruptible_timeout(wl->netif_change_event, - (wl_get_p2p_status(wl, IF_ADD) == false), + timeout = wait_event_interruptible_timeout(cfg->netif_change_event, + (wl_get_p2p_status(cfg, IF_ADDING) == false), msecs_to_jiffies(MAX_WAIT_TIME)); - if (timeout > 0 && (!wl_get_p2p_status(wl, IF_ADD))) { + if (timeout > 0 && !wl_get_p2p_status(cfg, IF_ADDING) && cfg->if_event_info.valid) { struct wireless_dev *vwdev; + int pm_mode = PM_ENABLE; + wl_if_event_info *event = &cfg->if_event_info; + + /* IF_ADD event has come back, we can proceed to to register + * the new interface now, use the interface name provided by caller (thus + * ignore the one from wlc) + */ + strncpy(cfg->if_event_info.name, name, IFNAMSIZ - 1); + new_ndev = wl_cfg80211_allocate_if(cfg, event->ifidx, cfg->p2p->vir_ifname, + event->mac, event->bssidx); + if (new_ndev == NULL) + goto fail; + + wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_CONNECTION) = new_ndev; + wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_CONNECTION) = event->bssidx; vwdev = kzalloc(sizeof(*vwdev), GFP_KERNEL); if (unlikely(!vwdev)) { WL_ERR(("Could not allocate wireless device\n")); - return ERR_PTR(-ENOMEM); + goto fail; } - vwdev->wiphy = wl->wdev->wiphy; - WL_INFO((" virtual interface(%s) is created memalloc done \n", - wl->p2p->vir_ifname)); + vwdev->wiphy = cfg->wdev->wiphy; + WL_INFO(("virtual interface(%s) is created\n", cfg->p2p->vir_ifname)); vwdev->iftype = type; - _ndev = wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_CONNECTION); - _ndev->ieee80211_ptr = vwdev; - SET_NETDEV_DEV(_ndev, wiphy_dev(vwdev->wiphy)); - vwdev->netdev = _ndev; - wl_set_drv_status(wl, READY, _ndev); - wl->p2p->vif_created = true; - wl_set_mode_by_netdev(wl, _ndev, mode); - net_attach = wl_to_p2p_bss_private(wl, P2PAPI_BSSCFG_CONNECTION); - if (rtnl_is_locked()) { - rtnl_unlock(); - rollback_lock = true; - } - if (net_attach && !net_attach(wl->pub, _ndev->ifindex)) { -#ifdef CUSTOMER_HW4 - wl_alloc_netinfo(wl, _ndev, vwdev, mode, PM_BLOCK); -#else - wl_alloc_netinfo(wl, _ndev, vwdev, mode, PM_ENABLE); -#endif /* CUSTOMER_HW4 */ - val = 1; - /* Disable firmware roaming for P2P interface */ - wldev_iovar_setint(_ndev, "roam_off", val); - - if (mode != WL_MODE_AP) - wldev_iovar_setint(_ndev, "buf_key_b4_m4", 1); - - WL_ERR((" virtual interface(%s) is " - "created net attach done\n", wl->p2p->vir_ifname)); - if (mode == WL_MODE_AP) - wl_set_drv_status(wl, CONNECTED, _ndev); - if (type == NL80211_IFTYPE_P2P_CLIENT) - dhd_mode = DHD_FLAG_P2P_GC_MODE; - else if (type == NL80211_IFTYPE_P2P_GO) - dhd_mode = DHD_FLAG_P2P_GO_MODE; - DNGL_FUNC(dhd_cfg80211_set_p2p_info, (wl, dhd_mode)); - /* reinitialize completion to clear previous count */ - INIT_COMPLETION(wl->iface_disable); - } else { - /* put back the rtnl_lock again */ - if (rollback_lock) - rtnl_lock(); + vwdev->netdev = new_ndev; + new_ndev->ieee80211_ptr = vwdev; + SET_NETDEV_DEV(new_ndev, wiphy_dev(vwdev->wiphy)); + wl_set_drv_status(cfg, READY, new_ndev); + cfg->p2p->vif_created = true; + wl_set_mode_by_netdev(cfg, new_ndev, mode); + + if (wl_cfg80211_register_if(cfg, event->ifidx, new_ndev) != BCME_OK) { + wl_cfg80211_remove_if(cfg, event->ifidx, new_ndev); goto fail; } - /* put back the rtnl_lock again */ - if (rollback_lock) - rtnl_lock(); - return _ndev; + wl_alloc_netinfo(cfg, new_ndev, vwdev, mode, pm_mode); + val = 1; + /* Disable firmware roaming for P2P interface */ + wldev_iovar_setint(new_ndev, "roam_off", val); + if (mode != WL_MODE_AP) + wldev_iovar_setint(new_ndev, "buf_key_b4_m4", 1); + + WL_ERR((" virtual interface(%s) is " + "created net attach done\n", cfg->p2p->vir_ifname)); + if (mode == WL_MODE_AP) + wl_set_drv_status(cfg, CONNECTED, new_ndev); + if (type == NL80211_IFTYPE_P2P_CLIENT) + dhd_mode = DHD_FLAG_P2P_GC_MODE; + else if (type == NL80211_IFTYPE_P2P_GO) + dhd_mode = DHD_FLAG_P2P_GO_MODE; + DNGL_FUNC(dhd_cfg80211_set_p2p_info, (cfg, dhd_mode)); + /* reinitialize completion to clear previous count */ + INIT_COMPLETION(cfg->iface_disable); + + return ndev_to_cfgdev(new_ndev); } else { - wl_clr_p2p_status(wl, IF_ADD); - WL_ERR((" virtual interface(%s) is not created \n", wl->p2p->vir_ifname)); - memset(wl->p2p->vir_ifname, '\0', IFNAMSIZ); - wl->p2p->vif_created = false; + wl_clr_p2p_status(cfg, IF_ADDING); + WL_ERR((" virtual interface(%s) is not created \n", cfg->p2p->vir_ifname)); + memset(cfg->p2p->vir_ifname, '\0', IFNAMSIZ); + cfg->p2p->vif_created = false; #ifdef PROP_TXSTATUS_VSDB - if (dhd->wlfc_enabled && wl->wlfc_on) { - dhd->wlfc_enabled = false; + dhd_wlfc_get_enable(dhd, &enabled); + if (enabled && cfg->wlfc_on && dhd->op_mode != DHD_FLAG_HOSTAP_MODE && + dhd->op_mode != DHD_FLAG_IBSS_MODE) { dhd_wlfc_deinit(dhd); - wl->wlfc_on = false; + cfg->wlfc_on = false; } #endif /* PROP_TXSTATUS_VSDB */ } } + fail: if (wlif_type == WL_P2P_IF_GO) - wldev_iovar_setint(_ndev, "mpc", 1); + wldev_iovar_setint(primary_ndev, "mpc", 1); return ERR_PTR(-ENODEV); } static s32 -wl_cfg80211_del_virtual_iface(struct wiphy *wiphy, struct net_device *dev) +wl_cfg80211_del_virtual_iface(struct wiphy *wiphy, bcm_struct_cfgdev *cfgdev) { + struct net_device *dev = NULL; struct ether_addr p2p_mac; - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); s32 timeout = -1; s32 ret = 0; s32 index = -1; +#ifdef CUSTOM_SET_CPUCORE + dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub); +#endif /* CUSTOM_SET_CPUCORE */ WL_DBG(("Enter\n")); - if (wl->p2p_net == dev) { - /* Since there is no ifidx corresponding to p2p0, cmds to - * firmware should be routed through primary I/F - */ - dev = wl_to_prmry_ndev(wl); +#ifdef CUSTOM_SET_CPUCORE + dhd->chan_isvht80 &= ~DHD_FLAG_P2P_MODE; + if (!(dhd->chan_isvht80)) + dhd_set_cpucore(dhd, FALSE); +#endif /* CUSTOM_SET_CPUCORE */ +#if defined(WL_CFG80211_P2P_DEV_IF) + if (cfgdev->iftype == NL80211_IFTYPE_P2P_DEVICE) { + return wl_cfgp2p_del_p2p_disc_if(cfgdev, cfg); } - if (wl_cfgp2p_find_idx(wl, dev, &index) != BCME_OK) { +#endif /* WL_CFG80211_P2P_DEV_IF */ + dev = cfgdev_to_wlc_ndev(cfgdev, cfg); + + if (wl_cfgp2p_find_idx(cfg, dev, &index) != BCME_OK) { WL_ERR(("Find p2p index from ndev(%p) failed\n", dev)); return BCME_ERROR; } - if (wl->p2p_supported) { - memcpy(p2p_mac.octet, wl->p2p->int_addr.octet, ETHER_ADDR_LEN); + if (cfg->p2p_supported) { + memcpy(p2p_mac.octet, cfg->p2p->int_addr.octet, ETHER_ADDR_LEN); /* Clear GO_NEG_PHASE bit to take care of GO-NEG-FAIL cases */ WL_DBG(("P2P: GO_NEG_PHASE status cleared ")); - wl_clr_p2p_status(wl, GO_NEG_PHASE); - if (wl->p2p->vif_created) { - if (wl_get_drv_status(wl, SCANNING, dev)) { - wl_notify_escan_complete(wl, dev, true, true); + wl_clr_p2p_status(cfg, GO_NEG_PHASE); + if (cfg->p2p->vif_created) { + if (wl_get_drv_status(cfg, SCANNING, dev)) { + wl_notify_escan_complete(cfg, dev, true, true); } wldev_iovar_setint(dev, "mpc", 1); + /* Delete pm_enable_work */ + wl_add_remove_pm_enable_work(cfg, FALSE, WL_HANDLER_DEL); /* for GC */ - if (wl_get_drv_status(wl, DISCONNECTING, dev) && - (wl_get_mode_by_netdev(wl, dev) != WL_MODE_AP)) { + if (wl_get_drv_status(cfg, DISCONNECTING, dev) && + (wl_get_mode_by_netdev(cfg, dev) != WL_MODE_AP)) { WL_ERR(("Wait for Link Down event for GC !\n")); wait_for_completion_timeout - (&wl->iface_disable, msecs_to_jiffies(500)); + (&cfg->iface_disable, msecs_to_jiffies(500)); } - wl_set_p2p_status(wl, IF_DELETING); - DNGL_FUNC(dhd_cfg80211_clean_p2p_info, (wl)); + + memset(&cfg->if_event_info, 0, sizeof(cfg->if_event_info)); + wl_set_p2p_status(cfg, IF_DELETING); + DNGL_FUNC(dhd_cfg80211_clean_p2p_info, (cfg)); /* for GO */ - if (wl_get_mode_by_netdev(wl, dev) == WL_MODE_AP) { + if (wl_get_mode_by_netdev(cfg, dev) == WL_MODE_AP) { wl_add_remove_eventmsg(dev, WLC_E_PROBREQ_MSG, false); /* disable interface before bsscfg free */ - ret = wl_cfgp2p_ifdisable(wl, &p2p_mac); + ret = wl_cfgp2p_ifdisable(cfg, &p2p_mac); /* if fw doesn't support "ifdis", do not wait for link down of ap mode */ if (ret == 0) { WL_ERR(("Wait for Link Down event for GO !!!\n")); - wait_for_completion_timeout(&wl->iface_disable, + wait_for_completion_timeout(&cfg->iface_disable, msecs_to_jiffies(500)); -#ifndef CUSTOMER_HW4 } else if (ret != BCME_UNSUPPORTED) { msleep(300); -#endif /* !CUSTOMER_HW4 */ } } - wl_cfgp2p_clear_management_ie(wl, index); + wl_cfgp2p_clear_management_ie(cfg, index); - if (wl_get_mode_by_netdev(wl, dev) != WL_MODE_AP) + if (wl_get_mode_by_netdev(cfg, dev) != WL_MODE_AP) wldev_iovar_setint(dev, "buf_key_b4_m4", 0); /* delete interface after link down */ - ret = wl_cfgp2p_ifdel(wl, &p2p_mac); - /* Firmware could not delete the interface so we will not get WLC_E_IF - * event for cleaning the dhd virtual nw interace - * So lets do it here. Failures from fw will ensure the application to do - * ifconfig <inter> down and up sequnce, which will reload the fw - * however we should cleanup the linux network virtual interfaces - */ - /* Request framework to RESET and clean up */ - if (ret) { - struct net_device *ndev = wl_to_prmry_ndev(wl); - WL_ERR(("Firmware returned an error (%d) from p2p_ifdel" - "HANG Notification sent to %s\n", ret, ndev->name)); + ret = wl_cfgp2p_ifdel(cfg, &p2p_mac); + + if (ret != BCME_OK) { + struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg); + + WL_ERR(("p2p_ifdel failed, error %d, sent HANG event to %s\n", + ret, ndev->name)); + #if defined(BCMDONGLEHOST) && defined(OEM_ANDROID) net_os_send_hang_message(ndev); - } - /* Wait for IF_DEL operation to be finished in firmware */ - timeout = wait_event_interruptible_timeout(wl->netif_change_event, - (wl->p2p->vif_created == false), - msecs_to_jiffies(MAX_WAIT_TIME)); - if (timeout > 0 && (wl->p2p->vif_created == false)) { - WL_DBG(("IFDEL operation done\n")); + #endif } else { - WL_ERR(("IFDEL didn't complete properly\n")); + /* Wait for IF_DEL operation to be finished */ + timeout = wait_event_interruptible_timeout(cfg->netif_change_event, + (wl_get_p2p_status(cfg, IF_DELETING) == false), + msecs_to_jiffies(MAX_WAIT_TIME)); + if (timeout > 0 && !wl_get_p2p_status(cfg, IF_DELETING) && + cfg->if_event_info.valid) { + + WL_DBG(("IFDEL operation done\n")); + wl_cfg80211_handle_ifdel(cfg, &cfg->if_event_info, dev); + } else { + WL_ERR(("IFDEL didn't complete properly\n")); + } } + ret = dhd_del_monitor(dev); + if (wl_get_mode_by_netdev(cfg, dev) == WL_MODE_AP) { + DHD_OS_WAKE_LOCK_CTRL_TIMEOUT_CANCEL((dhd_pub_t *)(cfg->pub)); + } } } return ret; @@ -1373,12 +1625,13 @@ wl_cfg80211_change_virtual_iface(struct wiphy *wiphy, struct net_device *ndev, { s32 ap = 0; s32 infra = 0; - s32 err = BCME_OK; + s32 ibss = 0; s32 wlif_type; s32 mode = 0; + s32 err = BCME_OK; chanspec_t chspec; - struct wl_priv *wl = wiphy_priv(wiphy); - dhd_pub_t *dhd = (dhd_pub_t *)(wl->pub); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); + dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub); WL_DBG(("Enter type %d\n", type)); switch (type) { case NL80211_IFTYPE_MONITOR: @@ -1390,6 +1643,7 @@ wl_cfg80211_change_virtual_iface(struct wiphy *wiphy, struct net_device *ndev, break; case NL80211_IFTYPE_ADHOC: mode = WL_MODE_IBSS; + ibss = 1; break; case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_P2P_CLIENT: @@ -1408,12 +1662,12 @@ wl_cfg80211_change_virtual_iface(struct wiphy *wiphy, struct net_device *ndev, if (!dhd) return -EINVAL; if (ap) { - wl_set_mode_by_netdev(wl, ndev, mode); - if (wl->p2p_supported && wl->p2p->vif_created) { - WL_DBG(("p2p_vif_created (%d) p2p_on (%d)\n", wl->p2p->vif_created, - p2p_on(wl))); + wl_set_mode_by_netdev(cfg, ndev, mode); + if (cfg->p2p_supported && cfg->p2p->vif_created) { + WL_DBG(("p2p_vif_created (%d) p2p_on (%d)\n", cfg->p2p->vif_created, + p2p_on(cfg))); wldev_iovar_setint(ndev, "mpc", 0); - wl_notify_escan_complete(wl, ndev, true, true); + wl_notify_escan_complete(cfg, ndev, true, true); /* In concurrency case, STA may be already associated in a particular * channel. so retrieve the current channel of primary interface and @@ -1424,30 +1678,27 @@ wl_cfg80211_change_virtual_iface(struct wiphy *wiphy, struct net_device *ndev, wlif_type = WL_P2P_IF_GO; WL_ERR(("%s : ap (%d), infra (%d), iftype: (%d)\n", ndev->name, ap, infra, type)); - wl_set_p2p_status(wl, IF_CHANGING); - wl_clr_p2p_status(wl, IF_CHANGED); - err = wl_cfgp2p_ifchange(wl, &wl->p2p->int_addr, htod32(wlif_type), chspec); - wait_event_interruptible_timeout(wl->netif_change_event, - (wl_get_p2p_status(wl, IF_CHANGED) == true), + wl_set_p2p_status(cfg, IF_CHANGING); + wl_clr_p2p_status(cfg, IF_CHANGED); + wl_cfgp2p_ifchange(cfg, &cfg->p2p->int_addr, htod32(wlif_type), chspec); + wait_event_interruptible_timeout(cfg->netif_change_event, + (wl_get_p2p_status(cfg, IF_CHANGED) == true), msecs_to_jiffies(MAX_WAIT_TIME)); - wl_set_mode_by_netdev(wl, ndev, mode); + wl_set_mode_by_netdev(cfg, ndev, mode); dhd->op_mode &= ~DHD_FLAG_P2P_GC_MODE; dhd->op_mode |= DHD_FLAG_P2P_GO_MODE; - wl_clr_p2p_status(wl, IF_CHANGING); - wl_clr_p2p_status(wl, IF_CHANGED); + wl_clr_p2p_status(cfg, IF_CHANGING); + wl_clr_p2p_status(cfg, IF_CHANGED); if (mode == WL_MODE_AP) - wl_set_drv_status(wl, CONNECTED, ndev); - } else if (ndev == wl_to_prmry_ndev(wl) && - !wl_get_drv_status(wl, AP_CREATED, ndev)) { - wl_set_drv_status(wl, AP_CREATING, ndev); - if (!wl->ap_info && - !(wl->ap_info = kzalloc(sizeof(struct ap_info), GFP_KERNEL))) { + wl_set_drv_status(cfg, CONNECTED, ndev); + } else if (ndev == bcmcfg_to_prmry_ndev(cfg) && + !wl_get_drv_status(cfg, AP_CREATED, ndev)) { + wl_set_drv_status(cfg, AP_CREATING, ndev); + if (!cfg->ap_info && + !(cfg->ap_info = kzalloc(sizeof(struct ap_info), GFP_KERNEL))) { WL_ERR(("struct ap_saved_ie allocation failed\n")); return -ENOMEM; } -#if defined(CUSTOMER_HW4) && defined(USE_DYNAMIC_F2_BLKSIZE) - dhdsdio_func_blocksize(dhd, 2, DYNAMIC_F2_BLKSIZE_FOR_NONLEGACY); -#endif /* CUSTOMER_HW4 && USE_DYNAMIC_F2_BLKSIZE */ } else { WL_ERR(("Cannot change the interface for GO or SOFTAP\n")); return -EINVAL; @@ -1456,147 +1707,136 @@ wl_cfg80211_change_virtual_iface(struct wiphy *wiphy, struct net_device *ndev, WL_DBG(("Change_virtual_iface for transition from GO/AP to client/STA")); } + if (ibss) { + infra = 0; + wl_set_mode_by_netdev(cfg, ndev, mode); + err = wldev_ioctl(ndev, WLC_SET_INFRA, &infra, sizeof(s32), true); + if (err < 0) { + WL_ERR(("SET Adhoc error %d\n", err)); + return -EINVAL; + } + } + ndev->ieee80211_ptr->iftype = type; return 0; } s32 -wl_cfg80211_notify_ifadd(struct net_device *ndev, s32 idx, s32 bssidx, - void* _net_attach) +wl_cfg80211_notify_ifadd(int ifidx, char *name, uint8 *mac, uint8 bssidx) { - struct wl_priv *wl = wlcfg_drv_priv; - s32 ret = BCME_OK; - WL_DBG(("Enter")); - if (!ndev) { - WL_ERR(("net is NULL\n")); - return 0; - } - if (wl->p2p_supported && wl_get_p2p_status(wl, IF_ADD)) { - WL_DBG(("IF_ADD event called from dongle, old interface name: %s," - "new name: %s\n", ndev->name, wl->p2p->vir_ifname)); - /* Assign the net device to CONNECT BSSCFG */ - strncpy(ndev->name, wl->p2p->vir_ifname, IFNAMSIZ - 1); - wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_CONNECTION) = ndev; - wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_CONNECTION) = bssidx; - wl_to_p2p_bss_private(wl, P2PAPI_BSSCFG_CONNECTION) = _net_attach; - ndev->ifindex = idx; - wl_clr_p2p_status(wl, IF_ADD); - - wake_up_interruptible(&wl->netif_change_event); - } else { - ret = BCME_NOTREADY; + struct bcm_cfg80211 *cfg = g_bcm_cfg; + + /* P2P may send WLC_E_IF_ADD and/or WLC_E_IF_CHANGE during IF updating ("p2p_ifupd") + * redirect the IF_ADD event to ifchange as it is not a real "new" interface + */ + if (wl_get_p2p_status(cfg, IF_CHANGING)) + return wl_cfg80211_notify_ifchange(ifidx, name, mac, bssidx); + + /* Okay, we are expecting IF_ADD (as IF_ADDING is true) */ + if (wl_get_p2p_status(cfg, IF_ADDING)) { + wl_if_event_info *if_event_info = &cfg->if_event_info; + + if_event_info->valid = TRUE; + if_event_info->ifidx = ifidx; + if_event_info->bssidx = bssidx; + strncpy(if_event_info->name, name, IFNAMSIZ); + if_event_info->name[IFNAMSIZ] = '\0'; + if (mac) + memcpy(if_event_info->mac, mac, ETHER_ADDR_LEN); + + wl_clr_p2p_status(cfg, IF_ADDING); + wake_up_interruptible(&cfg->netif_change_event); + return BCME_OK; } - return ret; + + return BCME_ERROR; } s32 -wl_cfg80211_notify_ifdel(void) +wl_cfg80211_notify_ifdel(int ifidx, char *name, uint8 *mac, uint8 bssidx) { - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; + wl_if_event_info *if_event_info = &cfg->if_event_info; - WL_DBG(("Enter \n")); - wl_clr_p2p_status(wl, IF_DELETING); - wake_up_interruptible(&wl->netif_change_event); - return 0; + if (wl_get_p2p_status(cfg, IF_DELETING)) { + if_event_info->valid = TRUE; + if_event_info->ifidx = ifidx; + if_event_info->bssidx = bssidx; + wl_clr_p2p_status(cfg, IF_DELETING); + wake_up_interruptible(&cfg->netif_change_event); + return BCME_OK; + } + + return BCME_ERROR; } s32 -wl_cfg80211_ifdel_ops(struct net_device *ndev) +wl_cfg80211_notify_ifchange(int ifidx, char *name, uint8 *mac, uint8 bssidx) +{ + struct bcm_cfg80211 *cfg = g_bcm_cfg; + + if (wl_get_p2p_status(cfg, IF_CHANGING)) { + wl_set_p2p_status(cfg, IF_CHANGED); + wake_up_interruptible(&cfg->netif_change_event); + return BCME_OK; + } + + return BCME_ERROR; +} + +static s32 wl_cfg80211_handle_ifdel(struct bcm_cfg80211 *cfg, wl_if_event_info *if_event_info, + struct net_device* ndev) { - struct wl_priv *wl = wlcfg_drv_priv; - bool rollback_lock = false; s32 type = -1; s32 bssidx = -1; - #ifdef PROP_TXSTATUS_VSDB - dhd_pub_t *dhd = (dhd_pub_t *)(wl->pub); + dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub); + bool enabled; #endif /* PROP_TXSTATUS_VSDB */ - if (!ndev || (strlen(ndev->name) == 0)) { - WL_ERR(("net is NULL\n")); - return 0; + + bssidx = if_event_info->bssidx; + if (bssidx != wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_CONNECTION)) { + WL_ERR(("got IF_DEL for if %d, not owned by cfg driver\n", bssidx)); + return BCME_ERROR; } - if (p2p_is_on(wl) && wl->p2p->vif_created && - wl_get_p2p_status(wl, IF_DELETING)) { - if (wl->scan_request && - (wl->escan_info.ndev == ndev)) { + if (p2p_is_on(cfg) && cfg->p2p->vif_created) { + + if (cfg->scan_request && (cfg->escan_info.ndev == ndev)) { /* Abort any pending scan requests */ - wl->escan_info.escan_state = WL_ESCAN_STATE_IDLE; - if (!rtnl_is_locked()) { - rtnl_lock(); - rollback_lock = true; - } + cfg->escan_info.escan_state = WL_ESCAN_STATE_IDLE; WL_DBG(("ESCAN COMPLETED\n")); - wl_notify_escan_complete(wl, ndev, true, false); - if (rollback_lock) - rtnl_unlock(); + wl_notify_escan_complete(cfg, cfg->escan_info.ndev, true, false); } - WL_ERR(("IF_DEL event called from dongle, net %p, vif name: %s\n", - ndev, wl->p2p->vir_ifname)); - memset(wl->p2p->vir_ifname, '\0', IFNAMSIZ); - if (wl_cfgp2p_find_idx(wl, ndev, &bssidx) != BCME_OK) { - WL_ERR(("Find p2p bssidx from ndev(%p) failed\n", ndev)); - return BCME_ERROR; - } - if (wl_cfgp2p_find_type(wl, bssidx, &type) != BCME_OK) { + memset(cfg->p2p->vir_ifname, '\0', IFNAMSIZ); + if (wl_cfgp2p_find_type(cfg, bssidx, &type) != BCME_OK) { WL_ERR(("Find p2p type from bssidx(%d) failed\n", bssidx)); return BCME_ERROR; } - wl_to_p2p_bss_ndev(wl, type) = NULL; - wl_to_p2p_bss_bssidx(wl, type) = WL_INVALID; - wl->p2p->vif_created = false; + wl_clr_drv_status(cfg, CONNECTED, wl_to_p2p_bss_ndev(cfg, type)); + wl_to_p2p_bss_ndev(cfg, type) = NULL; + wl_to_p2p_bss_bssidx(cfg, type) = WL_INVALID; + cfg->p2p->vif_created = false; - WL_DBG(("type : %d\n", type)); #ifdef PROP_TXSTATUS_VSDB - if (dhd->wlfc_enabled && wl->wlfc_on) { - dhd->wlfc_enabled = false; + dhd_wlfc_get_enable(dhd, &enabled); + if (enabled && cfg->wlfc_on && dhd->op_mode != DHD_FLAG_HOSTAP_MODE && + dhd->op_mode != DHD_FLAG_IBSS_MODE) { dhd_wlfc_deinit(dhd); - wl->wlfc_on = false; + cfg->wlfc_on = false; } #endif /* PROP_TXSTATUS_VSDB */ - wl_clr_drv_status(wl, CONNECTED, ndev); } - /* Wake up any waiting thread */ - wake_up_interruptible(&wl->netif_change_event); - return 0; -} - -s32 -wl_cfg80211_is_progress_ifadd(void) -{ - s32 is_progress = 0; - struct wl_priv *wl = wlcfg_drv_priv; - if (wl_get_p2p_status(wl, IF_ADD)) - is_progress = 1; - return is_progress; -} - -s32 -wl_cfg80211_is_progress_ifchange(void) -{ - s32 is_progress = 0; - struct wl_priv *wl = wlcfg_drv_priv; - if (wl_get_p2p_status(wl, IF_CHANGING)) - is_progress = 1; - return is_progress; -} - - -s32 -wl_cfg80211_notify_ifchange(void) -{ - struct wl_priv *wl = wlcfg_drv_priv; - if (wl_get_p2p_status(wl, IF_CHANGING)) { - wl_set_p2p_status(wl, IF_CHANGED); - wake_up_interruptible(&wl->netif_change_event); - } - return 0; +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)) + wl_cfg80211_remove_if(cfg, if_event_info->ifidx, ndev); +#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)) */ + return BCME_OK; } /* Find listen channel */ -static s32 wl_find_listen_channel(struct wl_priv *wl, +static s32 wl_find_listen_channel(struct bcm_cfg80211 *cfg, const u8 *ie, u32 ie_len) { wifi_p2p_ie_t *p2p_ie; @@ -1660,7 +1900,7 @@ static void wl_scan_prep(struct wl_scan_params *params, struct cfg80211_scan_req s32 i = 0, j = 0, offset; char *ptr; wlc_ssid_t ssid; - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; memcpy(¶ms->bssid, ðer_bcast, ETHER_ADDR_LEN); params->bss_type = DOT11_BSSTYPE_ANY; @@ -1698,14 +1938,14 @@ static void wl_scan_prep(struct wl_scan_params *params, struct cfg80211_scan_req chanspec = 0; channel = ieee80211_frequency_to_channel(request->channels[i]->center_freq); /* SKIP DFS channels for Secondary interface */ - if ((wl->escan_info.ndev != wl_to_prmry_ndev(wl)) && + if ((cfg->escan_info.ndev != bcmcfg_to_prmry_ndev(cfg)) && (request->channels[i]->flags & (IEEE80211_CHAN_RADAR | IEEE80211_CHAN_PASSIVE_SCAN))) continue; if (request->channels[i]->band == IEEE80211_BAND_2GHZ) { #ifdef WL_HOST_BAND_MGMT - if (wl->curr_band == WLC_BAND_5G) { + if (cfg->curr_band == WLC_BAND_5G) { WL_DBG(("In 5G only mode, omit 2G channel:%d\n", channel)); continue; } @@ -1713,7 +1953,7 @@ static void wl_scan_prep(struct wl_scan_params *params, struct cfg80211_scan_req chanspec |= WL_CHANSPEC_BAND_2G; } else { #ifdef WL_HOST_BAND_MGMT - if (wl->curr_band == WLC_BAND_2G) { + if (cfg->curr_band == WLC_BAND_2G) { WL_DBG(("In 2G only mode, omit 5G channel:%d\n", channel)); continue; } @@ -1769,86 +2009,6 @@ static void wl_scan_prep(struct wl_scan_params *params, struct cfg80211_scan_req } static s32 -wl_run_iscan(struct wl_iscan_ctrl *iscan, struct cfg80211_scan_request *request, u16 action) -{ - u32 n_channels; - u32 n_ssids; - s32 params_size = - (WL_SCAN_PARAMS_FIXED_SIZE + offsetof(wl_iscan_params_t, params)); - struct wl_iscan_params *params = NULL; - s32 err = 0; - - if (request == NULL) { - err = -EINVAL; - goto done; - } - n_channels = request->n_channels; - n_ssids = request->n_ssids; - /* Allocate space for populating ssids in wl_iscan_params struct */ - if (n_channels % 2) - /* If n_channels is odd, add a padd of u16 */ - params_size += sizeof(u16) * (n_channels + 1); - else - params_size += sizeof(u16) * n_channels; - - /* Allocate space for populating ssids in wl_iscan_params struct */ - params_size += sizeof(struct wlc_ssid) * n_ssids; - params = (struct wl_iscan_params *)kzalloc(params_size, GFP_KERNEL); - if (!params) { - err = -ENOMEM; - goto done; - } - wl_scan_prep(¶ms->params, request); - - params->version = htod32(ISCAN_REQ_VERSION); - params->action = htod16(action); - params->scan_duration = htod16(0); - - if (params_size + sizeof("iscan") >= WLC_IOCTL_MEDLEN) { - WL_ERR(("ioctl buffer length is not sufficient\n")); - err = -ENOMEM; - goto done; - } - err = wldev_iovar_setbuf(iscan->dev, "iscan", params, params_size, - iscan->ioctl_buf, WLC_IOCTL_MEDLEN, NULL); - if (unlikely(err)) { - if (err == -EBUSY) { - WL_ERR(("system busy : iscan canceled\n")); - } else { - WL_ERR(("error (%d)\n", err)); - } - } - -done: - if (params) - kfree(params); - return err; -} - -static s32 wl_do_iscan(struct wl_priv *wl, struct cfg80211_scan_request *request) -{ - struct wl_iscan_ctrl *iscan = wl_to_iscan(wl); - struct net_device *ndev = wl_to_prmry_ndev(wl); - s32 passive_scan; - s32 err = 0; - - iscan->state = WL_ISCAN_STATE_SCANING; - - passive_scan = wl->active_scan ? 0 : 1; - err = wldev_ioctl(ndev, WLC_SET_PASSIVE_SCAN, - &passive_scan, sizeof(passive_scan), true); - if (unlikely(err)) { - WL_DBG(("error (%d)\n", err)); - return err; - } - wl->iscan_kickstart = true; - wl_run_iscan(iscan, request, WL_SCAN_ACTION_START); - mod_timer(&iscan->timer, jiffies + msecs_to_jiffies(iscan->timer_ms)); - iscan->timer_on = 1; - - return err; -} -static s32 wl_get_valid_channels(struct net_device *ndev, u8 *valid_chan_list, s32 size) { wl_uint32_list_t *list; @@ -1867,13 +2027,13 @@ wl_get_valid_channels(struct net_device *ndev, u8 *valid_chan_list, s32 size) return err; } -#ifdef USE_INITIAL_2G_SCAN +#if defined(USE_INITIAL_2G_SCAN) || defined(USE_INITIAL_SHORT_DWELL_TIME) #define FIRST_SCAN_ACTIVE_DWELL_TIME_MS 40 -static bool g_first_broadcast_scan = TRUE; -#endif /* USE_INITIAL_2G_SCAN */ +bool g_first_broadcast_scan = TRUE; +#endif /* USE_INITIAL_2G_SCAN || USE_INITIAL_SHORT_DWELL_TIME */ static s32 -wl_run_escan(struct wl_priv *wl, struct net_device *ndev, +wl_run_escan(struct bcm_cfg80211 *cfg, struct net_device *ndev, struct cfg80211_scan_request *request, uint16 action) { s32 err = BCME_OK; @@ -1890,60 +2050,89 @@ wl_run_escan(struct wl_priv *wl, struct net_device *ndev, u16 *default_chan_list = NULL; wl_uint32_list_t *list; struct net_device *dev = NULL; -#ifdef USE_INITIAL_2G_SCAN +#if defined(USE_INITIAL_2G_SCAN) || defined(USE_INITIAL_SHORT_DWELL_TIME) bool is_first_init_2g_scan = false; -#endif /* USE_INITIAL_2G_SCAN */ +#endif /* USE_INITIAL_2G_SCAN || USE_INITIAL_SHORT_DWELL_TIME */ + p2p_scan_purpose_t p2p_scan_purpose = P2P_SCAN_PURPOSE_MIN; WL_DBG(("Enter \n")); - if (!request || !wl) { + /* scan request can come with empty request : perform all default scan */ + if (!cfg) { err = -EINVAL; goto exit; } - if (!wl->p2p_supported || !p2p_scan(wl)) { + if (!cfg->p2p_supported || !p2p_scan(cfg)) { /* LEGACY SCAN TRIGGER */ WL_SCAN((" LEGACY E-SCAN START\n")); +#if defined(USE_INITIAL_2G_SCAN) || defined(USE_INITIAL_SHORT_DWELL_TIME) + if (!request) { + err = -EINVAL; + goto exit; + } + if (ndev == bcmcfg_to_prmry_ndev(cfg) && g_first_broadcast_scan == true) { #ifdef USE_INITIAL_2G_SCAN - if (ndev == wl_to_prmry_ndev(wl) && g_first_broadcast_scan == true) { + struct ieee80211_channel tmp_channel_list[CH_MAX_2G_CHANNEL]; + /* allow one 5G channel to add previous connected channel in 5G */ + bool allow_one_5g_channel = TRUE; j = 0; - if (!wl_get_valid_channels(ndev, chan_buf, sizeof(chan_buf))) { - list = (wl_uint32_list_t *) chan_buf; - n_valid_chan = dtoh32(list->count); - for (i = 0; i < n_valid_chan && request->n_channels > j; - i++) { + for (i = 0; i < request->n_channels; i++) { + int tmp_chan = ieee80211_frequency_to_channel + (request->channels[i]->center_freq); + if (tmp_chan > CH_MAX_2G_CHANNEL) { + if (allow_one_5g_channel) + allow_one_5g_channel = FALSE; + else + continue; + } + if (j > CH_MAX_2G_CHANNEL) { + WL_ERR(("Index %d exceeds max 2.4GHz channels %d" + " and previous 5G connected channel\n", + j, CH_MAX_2G_CHANNEL)); + break; + } #if defined(BCM4334_CHIP) - request->channels[i]->flags |= - IEEE80211_CHAN_NO_HT40; + request->channels[i]->flags |= + IEEE80211_CHAN_NO_HT40; #endif + bcopy(request->channels[i], &tmp_channel_list[j], + sizeof(struct ieee80211_channel)); + WL_SCAN(("channel of request->channels[%d]=%d\n", i, tmp_chan)); + j++; + } + if ((j > 0) && (j <= CH_MAX_2G_CHANNEL)) { + for (i = 0; i < j; i++) + bcopy(&tmp_channel_list[i], request->channels[i], + sizeof(struct ieee80211_channel)); - WL_SCAN(("list->element[%d]=%d\n", - i, list->element[i])); - if (list->element[i] > CH_MAX_2G_CHANNEL) - break; - j++; - } request->n_channels = j; - - WL_SCAN(("request->n_channels=%d\n", request->n_channels)); - g_first_broadcast_scan = false; is_first_init_2g_scan = true; } - } + else + WL_ERR(("Invalid number of 2.4GHz channels %d\n", j)); + WL_SCAN(("request->n_channels=%d\n", request->n_channels)); +#else /* USE_INITIAL_SHORT_DWELL_TIME */ + is_first_init_2g_scan = true; #endif /* USE_INITIAL_2G_SCAN */ + g_first_broadcast_scan = false; + } +#endif /* USE_INITIAL_2G_SCAN || USE_INITIAL_SHORT_DWELL_TIME */ - n_channels = request->n_channels; - n_ssids = request->n_ssids; - /* Allocate space for populating ssids in wl_iscan_params struct */ - if (n_channels % 2) - /* If n_channels is odd, add a padd of u16 */ - params_size += sizeof(u16) * (n_channels + 1); - else - params_size += sizeof(u16) * n_channels; + /* if scan request is not empty parse scan request paramters */ + if (request != NULL) { + n_channels = request->n_channels; + n_ssids = request->n_ssids; + if (n_channels % 2) + /* If n_channels is odd, add a padd of u16 */ + params_size += sizeof(u16) * (n_channels + 1); + else + params_size += sizeof(u16) * n_channels; - /* Allocate space for populating ssids in wl_iscan_params struct */ - params_size += sizeof(struct wlc_ssid) * n_ssids; + /* Allocate space for populating ssids in wl_escan_params_t struct */ + params_size += sizeof(struct wlc_ssid) * n_ssids; + } params = (wl_escan_params_t *) kzalloc(params_size, GFP_KERNEL); if (params == NULL) { err = -ENOMEM; @@ -1951,19 +2140,16 @@ wl_run_escan(struct wl_priv *wl, struct net_device *ndev, } wl_scan_prep(¶ms->params, request); -#ifdef USE_INITIAL_2G_SCAN +#if defined(USE_INITIAL_2G_SCAN) || defined(USE_INITIAL_SHORT_DWELL_TIME) /* Override active_time to reduce scan time if it's first bradcast scan. */ if (is_first_init_2g_scan) params->params.active_time = FIRST_SCAN_ACTIVE_DWELL_TIME_MS; -#endif /* USE_INITIAL_2G_SCAN */ +#endif /* USE_INITIAL_2G_SCAN || USE_INITIAL_SHORT_DWELL_TIME */ params->version = htod32(ESCAN_REQ_VERSION); params->action = htod16(action); -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - params->sync_id = wl->escan_info.cur_sync_id; -#else - params->sync_id = htod16(0x1234); -#endif + wl_escan_set_sync_id(params->sync_id, cfg); + wl_escan_set_type(cfg, WL_SCANTYPE_LEGACY); if (params_size + sizeof("escan") >= WLC_IOCTL_MEDLEN) { WL_ERR(("ioctl buffer length not sufficient\n")); kfree(params); @@ -1971,12 +2157,17 @@ wl_run_escan(struct wl_priv *wl, struct net_device *ndev, goto exit; } err = wldev_iovar_setbuf(ndev, "escan", params, params_size, - wl->escan_ioctl_buf, WLC_IOCTL_MEDLEN, NULL); - if (unlikely(err)) - WL_ERR((" Escan set error (%d)\n", err)); + cfg->escan_ioctl_buf, WLC_IOCTL_MEDLEN, NULL); + if (unlikely(err)) { + if (err == BCME_EPERM) + /* Scan Not permitted at this point of time */ + WL_DBG((" Escan not permitted at this time (%d)\n", err)); + else + WL_ERR((" Escan set error (%d)\n", err)); + } kfree(params); } - else if (p2p_is_on(wl) && p2p_scan(wl)) { + else if (p2p_is_on(cfg) && p2p_scan(cfg)) { /* P2P SCAN TRIGGER */ s32 _freq = 0; n_nodfs = 0; @@ -1992,7 +2183,7 @@ wl_run_escan(struct wl_priv *wl, struct net_device *ndev, } if (!wl_get_valid_channels(ndev, chan_buf, sizeof(chan_buf))) { #ifdef CUSTOMER_HW4 - int SS_WAR_Printed = false; + int is_printed = false; #endif list = (wl_uint32_list_t *) chan_buf; n_valid_chan = dtoh32(list->count); @@ -2006,8 +2197,8 @@ wl_run_escan(struct wl_priv *wl, struct net_device *ndev, #ifdef WL_HOST_BAND_MGMT channel_band = (channel > CH_MAX_2G_CHANNEL) ? WLC_BAND_5G : WLC_BAND_2G; - if ((wl->curr_band != WLC_BAND_AUTO) && - (wl->curr_band != channel_band) && + if ((cfg->curr_band != WLC_BAND_AUTO) && + (cfg->curr_band != channel_band) && !IS_P2P_SOCIAL_CHANNEL(channel)) continue; #endif /* WL_HOST_BAND_MGMT */ @@ -2018,11 +2209,10 @@ wl_run_escan(struct wl_priv *wl, struct net_device *ndev, | IEEE80211_CHAN_PASSIVE_SCAN)) continue; #ifdef CUSTOMER_HW4 - /* CUSTOMER want to skip these channels explicitly */ if (channel >= 52 && channel <= 140) { - if (SS_WAR_Printed == false) { + if (is_printed == false) { WL_ERR(("SKIP DFS CHANs(52~140)\n")); - SS_WAR_Printed = true; + is_printed = true; } continue; } @@ -2039,65 +2229,79 @@ wl_run_escan(struct wl_priv *wl, struct net_device *ndev, } } - if (num_chans == 3 && ( + if (num_chans == SOCIAL_CHAN_CNT && ( (default_chan_list[0] == SOCIAL_CHAN_1) && (default_chan_list[1] == SOCIAL_CHAN_2) && (default_chan_list[2] == SOCIAL_CHAN_3))) { /* SOCIAL CHANNELS 1, 6, 11 */ search_state = WL_P2P_DISC_ST_SEARCH; + p2p_scan_purpose = P2P_SCAN_SOCIAL_CHANNEL; WL_INFO(("P2P SEARCH PHASE START \n")); - } else if ((dev = wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_CONNECTION)) && - (wl_get_mode_by_netdev(wl, dev) == WL_MODE_AP)) { + } else if ((dev = wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_CONNECTION)) && + (wl_get_mode_by_netdev(cfg, dev) == WL_MODE_AP)) { /* If you are already a GO, then do SEARCH only */ WL_INFO(("Already a GO. Do SEARCH Only")); search_state = WL_P2P_DISC_ST_SEARCH; num_chans = n_nodfs; + p2p_scan_purpose = P2P_SCAN_NORMAL; + } else if (num_chans == 1) { + p2p_scan_purpose = P2P_SCAN_CONNECT_TRY; + } else if (num_chans == SOCIAL_CHAN_CNT + 1) { + /* SOCIAL_CHAN_CNT + 1 takes care of the Progressive scan supported by + * the supplicant + */ + p2p_scan_purpose = P2P_SCAN_SOCIAL_CHANNEL; } else { WL_INFO(("P2P SCAN STATE START \n")); num_chans = n_nodfs; + p2p_scan_purpose = P2P_SCAN_NORMAL; } - + } else { + err = -EINVAL; + goto exit; } - err = wl_cfgp2p_escan(wl, ndev, wl->active_scan, num_chans, default_chan_list, + err = wl_cfgp2p_escan(cfg, ndev, cfg->active_scan, num_chans, default_chan_list, search_state, action, - wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE), NULL); + wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_DEVICE), NULL, + p2p_scan_purpose); if (!err) - wl->p2p->search_state = search_state; + cfg->p2p->search_state = search_state; kfree(default_chan_list); } exit: if (unlikely(err)) { - WL_ERR(("error (%d)\n", err)); + /* Don't print Error incase of Scan suppress */ + if ((err == BCME_EPERM) && cfg->scan_suppressed) + WL_DBG(("Escan failed: Scan Suppressed \n")); + else + WL_ERR(("error (%d)\n", err)); } return err; } static s32 -wl_do_escan(struct wl_priv *wl, struct wiphy *wiphy, struct net_device *ndev, +wl_do_escan(struct bcm_cfg80211 *cfg, struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_scan_request *request) { s32 err = BCME_OK; s32 passive_scan; wl_scan_results_t *results; WL_SCAN(("Enter \n")); - mutex_lock(&wl->usr_sync); -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - results = (wl_scan_results_t *) wl->escan_info.escan_buf[wl->escan_info.cur_sync_id % 2]; -#else - results = (wl_scan_results_t *) wl->escan_info.escan_buf; -#endif + mutex_lock(&cfg->usr_sync); + + results = wl_escan_get_buf(cfg, FALSE); results->version = 0; results->count = 0; results->buflen = WL_SCAN_RESULTS_FIXED_SIZE; - wl->escan_info.ndev = ndev; - wl->escan_info.wiphy = wiphy; - wl->escan_info.escan_state = WL_ESCAN_STATE_SCANING; - passive_scan = wl->active_scan ? 0 : 1; + cfg->escan_info.ndev = ndev; + cfg->escan_info.wiphy = wiphy; + cfg->escan_info.escan_state = WL_ESCAN_STATE_SCANING; + passive_scan = cfg->active_scan ? 0 : 1; err = wldev_ioctl(ndev, WLC_SET_PASSIVE_SCAN, &passive_scan, sizeof(passive_scan), true); if (unlikely(err)) { @@ -2105,9 +2309,9 @@ wl_do_escan(struct wl_priv *wl, struct wiphy *wiphy, struct net_device *ndev, goto exit; } - err = wl_run_escan(wl, ndev, request, WL_SCAN_ACTION_START); + err = wl_run_escan(cfg, ndev, request, WL_SCAN_ACTION_START); exit: - mutex_unlock(&wl->usr_sync); + mutex_unlock(&cfg->usr_sync); return err; } @@ -2116,13 +2320,9 @@ __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid) { - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); struct cfg80211_ssid *ssids; - struct wl_scan_req *sr = wl_to_sr(wl); struct ether_addr primary_mac; - s32 passive_scan; - bool iscan_req; - bool escan_req = false; bool p2p_ssid; #ifdef WL11U bcm_tlv_t *interworking_ie; @@ -2133,38 +2333,36 @@ __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, unsigned long flags; static s32 busy_count = 0; +#ifdef WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST + struct net_device *remain_on_channel_ndev = NULL; +#endif dhd_pub_t *dhd; - dhd = (dhd_pub_t *)(wl->pub); + dhd = (dhd_pub_t *)(cfg->pub); if (dhd->op_mode & DHD_FLAG_HOSTAP_MODE) { WL_ERR(("Invalid Scan Command at SoftAP mode\n")); return -EINVAL; } - /* If scan req comes for p2p0, send it over primary I/F - * Scan results will be delivered corresponding to cfg80211_scan_request - */ - if (ndev == wl->p2p_net) { - ndev = wl_to_prmry_ndev(wl); - } + ndev = ndev_to_wlc_ndev(ndev, cfg); - if (WL_DRV_STATUS_SENDING_AF_FRM_EXT(wl)) { + if (WL_DRV_STATUS_SENDING_AF_FRM_EXT(cfg)) { WL_ERR(("Sending Action Frames. Try it again.\n")); return -EAGAIN; } WL_DBG(("Enter wiphy (%p)\n", wiphy)); - if (wl_get_drv_status_all(wl, SCANNING)) { - if (wl->scan_request == NULL) { - wl_clr_drv_status_all(wl, SCANNING); + if (wl_get_drv_status_all(cfg, SCANNING)) { + if (cfg->scan_request == NULL) { + wl_clr_drv_status_all(cfg, SCANNING); WL_DBG(("<<<<<<<<<<<Force Clear Scanning Status>>>>>>>>>>>\n")); } else { WL_ERR(("Scanning already\n")); return -EAGAIN; } } - if (wl_get_drv_status(wl, SCAN_ABORTING, ndev)) { + if (wl_get_drv_status(cfg, SCAN_ABORTING, ndev)) { WL_ERR(("Scanning being aborted\n")); return -EAGAIN; } @@ -2173,177 +2371,134 @@ __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, return -EOPNOTSUPP; } #ifdef WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST - if (wl_get_drv_status_all(wl, REMAINING_ON_CHANNEL)) { + remain_on_channel_ndev = wl_cfg80211_get_remain_on_channel_ndev(cfg); + if (remain_on_channel_ndev) { WL_DBG(("Remain_on_channel bit is set, somehow it didn't get cleared\n")); - wl_notify_escan_complete(wl, ndev, true, true); + wl_notify_escan_complete(cfg, remain_on_channel_ndev, true, true); } #endif /* WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST */ /* Arm scan timeout timer */ - mod_timer(&wl->scan_timeout, jiffies + msecs_to_jiffies(WL_SCAN_TIMER_INTERVAL_MS)); - iscan_req = false; + mod_timer(&cfg->scan_timeout, jiffies + msecs_to_jiffies(WL_SCAN_TIMER_INTERVAL_MS)); if (request) { /* scan bss */ ssids = request->ssids; - if (wl->iscan_on && (!ssids || !ssids->ssid_len || request->n_ssids != 1)) { - iscan_req = true; - } else if (wl->escan_on) { - escan_req = true; - p2p_ssid = false; - for (i = 0; i < request->n_ssids; i++) { - if (ssids[i].ssid_len && - IS_P2P_SSID(ssids[i].ssid, ssids[i].ssid_len)) { - p2p_ssid = true; - break; - } + p2p_ssid = false; + for (i = 0; i < request->n_ssids; i++) { + if (ssids[i].ssid_len && + IS_P2P_SSID(ssids[i].ssid, ssids[i].ssid_len)) { + p2p_ssid = true; + break; } - if (p2p_ssid) { - if (wl->p2p_supported) { - /* p2p scan trigger */ - if (p2p_on(wl) == false) { - /* p2p on at the first time */ - p2p_on(wl) = true; - wl_cfgp2p_set_firm_p2p(wl); - get_primary_mac(wl, &primary_mac); - wl_cfgp2p_generate_bss_mac(&primary_mac, - &wl->p2p->dev_addr, &wl->p2p->int_addr); - } - wl_clr_p2p_status(wl, GO_NEG_PHASE); - WL_DBG(("P2P: GO_NEG_PHASE status cleared \n")); - p2p_scan(wl) = true; + } + if (p2p_ssid) { + if (cfg->p2p_supported) { + /* p2p scan trigger */ + if (p2p_on(cfg) == false) { + /* p2p on at the first time */ + p2p_on(cfg) = true; + wl_cfgp2p_set_firm_p2p(cfg); + get_primary_mac(cfg, &primary_mac); + wl_cfgp2p_generate_bss_mac(&primary_mac, + &cfg->p2p->dev_addr, &cfg->p2p->int_addr); } - } else { - /* legacy scan trigger - * So, we have to disable p2p discovery if p2p discovery is on - */ - if (wl->p2p_supported) { - p2p_scan(wl) = false; - /* If Netdevice is not equals to primary and p2p is on - * , we will do p2p scan using P2PAPI_BSSCFG_DEVICE. - */ - - if (p2p_scan(wl) == false) { - if (wl_get_p2p_status(wl, DISCOVERY_ON)) { - err = wl_cfgp2p_discover_enable_search(wl, - false); - if (unlikely(err)) { - goto scan_out; - } - + wl_clr_p2p_status(cfg, GO_NEG_PHASE); + WL_DBG(("P2P: GO_NEG_PHASE status cleared \n")); + p2p_scan(cfg) = true; + } + } else { + /* legacy scan trigger + * So, we have to disable p2p discovery if p2p discovery is on + */ + if (cfg->p2p_supported) { + p2p_scan(cfg) = false; + /* If Netdevice is not equals to primary and p2p is on + * , we will do p2p scan using P2PAPI_BSSCFG_DEVICE. + */ + + if (p2p_scan(cfg) == false) { + if (wl_get_p2p_status(cfg, DISCOVERY_ON)) { + err = wl_cfgp2p_discover_enable_search(cfg, + false); + if (unlikely(err)) { + goto scan_out; } + } } - if (!wl->p2p_supported || !p2p_scan(wl)) { + } + if (!cfg->p2p_supported || !p2p_scan(cfg)) { - if (wl_cfgp2p_find_idx(wl, ndev, &bssidx) != BCME_OK) { - WL_ERR(("Find p2p index from ndev(%p) failed\n", - ndev)); - err = BCME_ERROR; - goto scan_out; - } + if (wl_cfgp2p_find_idx(cfg, ndev, &bssidx) != BCME_OK) { + WL_ERR(("Find p2p index from ndev(%p) failed\n", + ndev)); + err = BCME_ERROR; + goto scan_out; + } #ifdef WL11U - if ((interworking_ie = wl_cfg80211_find_interworking_ie( - (u8 *)request->ie, request->ie_len)) != NULL) { - err = wl_cfg80211_add_iw_ie(wl, ndev, bssidx, - VNDR_IE_CUSTOM_FLAG, interworking_ie->id, - interworking_ie->data, interworking_ie->len); - - if (unlikely(err)) { - goto scan_out; - } - } else if (wl->iw_ie_len != 0) { - /* we have to clear IW IE and disable gratuitous APR */ - wl_cfg80211_add_iw_ie(wl, ndev, bssidx, - VNDR_IE_CUSTOM_FLAG, - DOT11_MNG_INTERWORKING_ID, - 0, 0); - - wldev_iovar_setint_bsscfg(ndev, "grat_arp", 0, - bssidx); - wl->wl11u = FALSE; - /* we don't care about error */ - } -#endif /* WL11U */ - err = wl_cfgp2p_set_management_ie(wl, ndev, bssidx, - VNDR_IE_PRBREQ_FLAG, (u8 *)request->ie, - request->ie_len); + if ((interworking_ie = wl_cfg80211_find_interworking_ie( + (u8 *)request->ie, request->ie_len)) != NULL) { + err = wl_cfg80211_add_iw_ie(cfg, ndev, bssidx, + VNDR_IE_CUSTOM_FLAG, interworking_ie->id, + interworking_ie->data, interworking_ie->len); if (unlikely(err)) { goto scan_out; } + } else if (cfg->iw_ie_len != 0) { + /* we have to clear IW IE and disable gratuitous APR */ + wl_cfg80211_add_iw_ie(cfg, ndev, bssidx, + VNDR_IE_CUSTOM_FLAG, + DOT11_MNG_INTERWORKING_ID, + 0, 0); + + wldev_iovar_setint_bsscfg(ndev, "grat_arp", 0, + bssidx); + cfg->wl11u = FALSE; + /* we don't care about error */ + } +#endif /* WL11U */ + err = wl_cfgp2p_set_management_ie(cfg, ndev, bssidx, + VNDR_IE_PRBREQ_FLAG, (u8 *)request->ie, + request->ie_len); + if (unlikely(err)) { + goto scan_out; } + } } } else { /* scan in ibss */ - /* we don't do iscan in ibss */ ssids = this_ssid; } - if (request && !p2p_scan(wl)) + + if (request && !p2p_scan(cfg)) { WL_TRACE_HW4(("START SCAN\n")); - wl->scan_request = request; - wl_set_drv_status(wl, SCANNING, ndev); - if (iscan_req) { - err = wl_do_iscan(wl, request); - if (likely(!err)) - goto scan_success; - else - goto scan_out; - } else if (escan_req) { - if (wl->p2p_supported) { - if (p2p_on(wl) && p2p_scan(wl)) { - - /* find my listen channel */ - wl->afx_hdl->my_listen_chan = - wl_find_listen_channel(wl, request->ie, - request->ie_len); - err = wl_cfgp2p_enable_discovery(wl, ndev, - request->ie, request->ie_len); + } - if (unlikely(err)) { - goto scan_out; - } - } - } - err = wl_do_escan(wl, wiphy, ndev, request); - if (likely(!err)) - goto scan_success; - else - goto scan_out; + cfg->scan_request = request; + wl_set_drv_status(cfg, SCANNING, ndev); + if (cfg->p2p_supported) { + if (p2p_on(cfg) && p2p_scan(cfg)) { - } else { - memset(&sr->ssid, 0, sizeof(sr->ssid)); - sr->ssid.SSID_len = - min_t(u8, sizeof(sr->ssid.SSID), ssids->ssid_len); - if (sr->ssid.SSID_len) { - memcpy(sr->ssid.SSID, ssids->ssid, sr->ssid.SSID_len); - sr->ssid.SSID_len = htod32(sr->ssid.SSID_len); - WL_SCAN(("Specific scan ssid=\"%s\" len=%d\n", - sr->ssid.SSID, sr->ssid.SSID_len)); - } else { - WL_SCAN(("Broadcast scan\n")); - } - WL_SCAN(("sr->ssid.SSID_len (%d)\n", sr->ssid.SSID_len)); - passive_scan = wl->active_scan ? 0 : 1; - err = wldev_ioctl(ndev, WLC_SET_PASSIVE_SCAN, - &passive_scan, sizeof(passive_scan), true); - if (unlikely(err)) { - WL_SCAN(("WLC_SET_PASSIVE_SCAN error (%d)\n", err)); - goto scan_out; - } - err = wldev_ioctl(ndev, WLC_SCAN, &sr->ssid, - sizeof(sr->ssid), false); - if (err) { - if (err == -EBUSY) { - WL_ERR(("system busy : scan for \"%s\" " - "canceled\n", sr->ssid.SSID)); - } else { - WL_ERR(("WLC_SCAN error (%d)\n", err)); + /* find my listen channel */ + cfg->afx_hdl->my_listen_chan = + wl_find_listen_channel(cfg, request->ie, + request->ie_len); + err = wl_cfgp2p_enable_discovery(cfg, ndev, + request->ie, request->ie_len); + + if (unlikely(err)) { + goto scan_out; } - goto scan_out; } } + err = wl_do_escan(cfg, wiphy, ndev, request); + if (likely(!err)) + goto scan_success; + else + goto scan_out; scan_success: busy_count = 0; @@ -2363,15 +2518,15 @@ scan_out: s32 ret = 0; busy_count = 0; WL_ERR(("Unusual continuous EBUSY error, %d %d %d %d %d %d %d %d %d\n", - wl_get_drv_status(wl, SCANNING, ndev), - wl_get_drv_status(wl, SCAN_ABORTING, ndev), - wl_get_drv_status(wl, CONNECTING, ndev), - wl_get_drv_status(wl, CONNECTED, ndev), - wl_get_drv_status(wl, DISCONNECTING, ndev), - wl_get_drv_status(wl, AP_CREATING, ndev), - wl_get_drv_status(wl, AP_CREATED, ndev), - wl_get_drv_status(wl, SENDING_ACT_FRM, ndev), - wl_get_drv_status(wl, SENDING_ACT_FRM, ndev))); + wl_get_drv_status(cfg, SCANNING, ndev), + wl_get_drv_status(cfg, SCAN_ABORTING, ndev), + wl_get_drv_status(cfg, CONNECTING, ndev), + wl_get_drv_status(cfg, CONNECTED, ndev), + wl_get_drv_status(cfg, DISCONNECTING, ndev), + wl_get_drv_status(cfg, AP_CREATING, ndev), + wl_get_drv_status(cfg, AP_CREATED, ndev), + wl_get_drv_status(cfg, SENDING_ACT_FRM, ndev), + wl_get_drv_status(cfg, SENDING_ACT_FRM, ndev))); bzero(&bssid, sizeof(bssid)); if ((ret = wldev_ioctl(ndev, WLC_GET_BSSID, @@ -2380,35 +2535,48 @@ scan_out: MAC2STRDBG(bssid.octet))); else WL_ERR(("GET BSSID failed with %d\n", ret)); - wl_notify_escan_complete(wl, ndev, true, true); + + wl_cfg80211_scan_abort(cfg); + } } else { busy_count = 0; } - wl_clr_drv_status(wl, SCANNING, ndev); - if (timer_pending(&wl->scan_timeout)) - del_timer_sync(&wl->scan_timeout); - spin_lock_irqsave(&wl->cfgdrv_lock, flags); - wl->scan_request = NULL; - spin_unlock_irqrestore(&wl->cfgdrv_lock, flags); + wl_clr_drv_status(cfg, SCANNING, ndev); + if (timer_pending(&cfg->scan_timeout)) + del_timer_sync(&cfg->scan_timeout); + spin_lock_irqsave(&cfg->cfgdrv_lock, flags); + cfg->scan_request = NULL; + spin_unlock_irqrestore(&cfg->cfgdrv_lock, flags); return err; } +#if defined(WL_CFG80211_P2P_DEV_IF) +static s32 +wl_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request) +#else static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, struct cfg80211_scan_request *request) +#endif /* WL_CFG80211_P2P_DEV_IF */ { s32 err = 0; - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); +#if defined(WL_CFG80211_P2P_DEV_IF) + struct net_device *ndev = wdev_to_wlc_ndev(request->wdev, cfg); +#endif /* WL_CFG80211_P2P_DEV_IF */ WL_DBG(("Enter \n")); - RETURN_EIO_IF_NOT_UP(wl); + RETURN_EIO_IF_NOT_UP(cfg); err = __wl_cfg80211_scan(wiphy, ndev, request, NULL); if (unlikely(err)) { - WL_ERR(("scan error (%d)\n", err)); + if ((err == BCME_EPERM) && cfg->scan_suppressed) + WL_DBG(("scan not permitted at this time (%d)\n", err)); + else + WL_ERR(("scan error (%d)\n", err)); return err; } @@ -2455,37 +2623,37 @@ static s32 wl_set_retry(struct net_device *dev, u32 retry, bool l) static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed) { - struct wl_priv *wl = (struct wl_priv *)wiphy_priv(wiphy); - struct net_device *ndev = wl_to_prmry_ndev(wl); + struct bcm_cfg80211 *cfg = (struct bcm_cfg80211 *)wiphy_priv(wiphy); + struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg); s32 err = 0; - RETURN_EIO_IF_NOT_UP(wl); + RETURN_EIO_IF_NOT_UP(cfg); WL_DBG(("Enter\n")); if (changed & WIPHY_PARAM_RTS_THRESHOLD && - (wl->conf->rts_threshold != wiphy->rts_threshold)) { - wl->conf->rts_threshold = wiphy->rts_threshold; - err = wl_set_rts(ndev, wl->conf->rts_threshold); + (cfg->conf->rts_threshold != wiphy->rts_threshold)) { + cfg->conf->rts_threshold = wiphy->rts_threshold; + err = wl_set_rts(ndev, cfg->conf->rts_threshold); if (!err) return err; } if (changed & WIPHY_PARAM_FRAG_THRESHOLD && - (wl->conf->frag_threshold != wiphy->frag_threshold)) { - wl->conf->frag_threshold = wiphy->frag_threshold; - err = wl_set_frag(ndev, wl->conf->frag_threshold); + (cfg->conf->frag_threshold != wiphy->frag_threshold)) { + cfg->conf->frag_threshold = wiphy->frag_threshold; + err = wl_set_frag(ndev, cfg->conf->frag_threshold); if (!err) return err; } if (changed & WIPHY_PARAM_RETRY_LONG && - (wl->conf->retry_long != wiphy->retry_long)) { - wl->conf->retry_long = wiphy->retry_long; - err = wl_set_retry(ndev, wl->conf->retry_long, true); + (cfg->conf->retry_long != wiphy->retry_long)) { + cfg->conf->retry_long = wiphy->retry_long; + err = wl_set_retry(ndev, cfg->conf->retry_long, true); if (!err) return err; } if (changed & WIPHY_PARAM_RETRY_SHORT && - (wl->conf->retry_short != wiphy->retry_short)) { - wl->conf->retry_short = wiphy->retry_short; - err = wl_set_retry(ndev, wl->conf->retry_short, false); + (cfg->conf->retry_short != wiphy->retry_short)) { + cfg->conf->retry_short = wiphy->retry_short; + err = wl_set_retry(ndev, cfg->conf->retry_short, false); if (!err) { return err; } @@ -2493,61 +2661,251 @@ static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed) return err; } +static chanspec_t +channel_to_chanspec(struct wiphy *wiphy, struct net_device *dev, u32 channel, u32 bw_cap) +{ + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); + u8 *buf = NULL; + wl_uint32_list_t *list; + int err = BCME_OK; + chanspec_t c = 0, ret_c = 0; + int bw = 0, tmp_bw = 0; + int i; + u32 tmp_c, sb; + u16 kflags = in_atomic() ? GFP_ATOMIC : GFP_KERNEL; +#define LOCAL_BUF_SIZE 1024 + buf = (u8 *) kzalloc(LOCAL_BUF_SIZE, kflags); + if (!buf) { + WL_ERR(("buf memory alloc failed\n")); + goto exit; + } + list = (wl_uint32_list_t *)(void *)buf; + list->count = htod32(WL_NUMCHANSPECS); + err = wldev_iovar_getbuf_bsscfg(dev, "chanspecs", NULL, + 0, buf, LOCAL_BUF_SIZE, 0, &cfg->ioctl_buf_sync); + if (err != BCME_OK) { + WL_ERR(("get chanspecs failed with %d\n", err)); + goto exit; + } + for (i = 0; i < dtoh32(list->count); i++) { + c = dtoh32(list->element[i]); + if (channel <= CH_MAX_2G_CHANNEL) { + if (!CHSPEC_IS20(c)) + continue; + if (channel == CHSPEC_CHANNEL(c)) { + ret_c = c; + bw = 20; + goto exit; + } + } + if (CHSPEC_IS20(c)) { + tmp_c = CHSPEC_CHANNEL(c); + tmp_bw = WLC_BW_CAP_20MHZ; + } + else if (CHSPEC_IS40(c)) { + tmp_c = CHSPEC_CHANNEL(c); + if (CHSPEC_SB_UPPER(c)) { + tmp_c += CH_10MHZ_APART; + } else { + tmp_c -= CH_10MHZ_APART; + } + tmp_bw = WLC_BW_CAP_40MHZ; + } + else { + tmp_c = CHSPEC_CHANNEL(c); + sb = c & WL_CHANSPEC_CTL_SB_MASK; + if (sb == WL_CHANSPEC_CTL_SB_LL) { + tmp_c -= (CH_10MHZ_APART + CH_20MHZ_APART); + } else if (sb == WL_CHANSPEC_CTL_SB_LU) { + tmp_c -= CH_10MHZ_APART; + } else if (sb == WL_CHANSPEC_CTL_SB_UL) { + tmp_c += CH_10MHZ_APART; + } else { + /* WL_CHANSPEC_CTL_SB_UU */ + tmp_c += (CH_10MHZ_APART + CH_20MHZ_APART); + } + tmp_bw = WLC_BW_CAP_80MHZ; + } + if (tmp_c != channel) + continue; + + if ((tmp_bw > bw) && (tmp_bw <= bw_cap)) { + bw = tmp_bw; + ret_c = c; + if (bw == bw_cap) + goto exit; + } + } +exit: + if (buf) + kfree(buf); +#undef LOCAL_BUF_SIZE + WL_INFO(("return chanspec %x %d\n", ret_c, bw)); + return ret_c; +} + +void +wl_cfg80211_ibss_vsie_set_buffer(vndr_ie_setbuf_t *ibss_vsie, int ibss_vsie_len) +{ + struct bcm_cfg80211 *cfg = g_bcm_cfg; + + if (cfg != NULL && ibss_vsie != NULL) { + if (cfg->ibss_vsie != NULL) { + kfree(cfg->ibss_vsie); + } + cfg->ibss_vsie = ibss_vsie; + cfg->ibss_vsie_len = ibss_vsie_len; + } +} + +static void +wl_cfg80211_ibss_vsie_free(struct bcm_cfg80211 *cfg) +{ + /* free & initiralize VSIE (Vendor Specific IE) */ + if (cfg->ibss_vsie != NULL) { + kfree(cfg->ibss_vsie); + cfg->ibss_vsie = NULL; + cfg->ibss_vsie_len = 0; + } +} + +s32 +wl_cfg80211_ibss_vsie_delete(struct net_device *dev) +{ + struct bcm_cfg80211 *cfg = g_bcm_cfg; + char *ioctl_buf = NULL; + s32 ret = BCME_OK; + + if (cfg != NULL && cfg->ibss_vsie != NULL) { + ioctl_buf = kmalloc(WLC_IOCTL_MEDLEN, GFP_KERNEL); + if (!ioctl_buf) { + WL_ERR(("ioctl memory alloc failed\n")); + return -ENOMEM; + } + + /* change the command from "add" to "del" */ + strncpy(cfg->ibss_vsie->cmd, "del", VNDR_IE_CMD_LEN - 1); + cfg->ibss_vsie->cmd[VNDR_IE_CMD_LEN - 1] = '\0'; + + ret = wldev_iovar_setbuf(dev, "ie", + cfg->ibss_vsie, cfg->ibss_vsie_len, + ioctl_buf, WLC_IOCTL_MEDLEN, NULL); + WL_ERR(("ret=%d\n", ret)); + + if (ret == BCME_OK) { + /* free & initiralize VSIE */ + kfree(cfg->ibss_vsie); + cfg->ibss_vsie = NULL; + cfg->ibss_vsie_len = 0; + } + + if (ioctl_buf) { + kfree(ioctl_buf); + } + } + + return ret; +} static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_ibss_params *params) { - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); struct cfg80211_bss *bss; struct ieee80211_channel *chan; struct wl_join_params join_params; + int scan_suppress; struct cfg80211_ssid ssid; s32 scan_retry = 0; s32 err = 0; - bool rollback_lock = false; + size_t join_params_size; + chanspec_t chanspec = 0; + u32 param[2] = {0, 0}; + u32 bw_cap = 0; +#ifdef WLAIBSS + aibss_bcn_force_config_t bcn_config; +#endif /* WLAIBSS */ WL_TRACE(("In\n")); - RETURN_EIO_IF_NOT_UP(wl); - if (params->bssid) { - WL_ERR(("Invalid bssid\n")); - return -EOPNOTSUPP; + RETURN_EIO_IF_NOT_UP(cfg); + WL_INFO(("JOIN BSSID:" MACDBG "\n", MAC2STRDBG(params->bssid))); + if (!params->ssid || params->ssid_len <= 0) { + WL_ERR(("Invalid parameter\n")); + return -EINVAL; } +#if defined(WL_CFG80211_P2P_DEV_IF) + chan = params->chandef.chan; +#else + chan = params->channel; +#endif /* WL_CFG80211_P2P_DEV_IF */ + if (chan) + cfg->channel = ieee80211_frequency_to_channel(chan->center_freq); + if (wl_get_drv_status(cfg, CONNECTED, dev)) { + struct wlc_ssid *ssid = (struct wlc_ssid *)wl_read_prof(cfg, dev, WL_PROF_SSID); + u8 *bssid = (u8 *)wl_read_prof(cfg, dev, WL_PROF_BSSID); + u32 *channel = (u32 *)wl_read_prof(cfg, dev, WL_PROF_CHAN); + if (!params->bssid || ((memcmp(params->bssid, bssid, ETHER_ADDR_LEN) == 0) && + (memcmp(params->ssid, ssid->SSID, ssid->SSID_len) == 0) && + (*channel == cfg->channel))) { + WL_ERR(("Connection already existed to " MACDBG "\n", + MAC2STRDBG((u8 *)wl_read_prof(cfg, dev, WL_PROF_BSSID)))); + return -EISCONN; + } + WL_ERR(("Ignore Previous connecton to %s (" MACDBG ")\n", + ssid->SSID, MAC2STRDBG(bssid))); + } + + /* remove the VSIE */ + wl_cfg80211_ibss_vsie_delete(dev); + bss = cfg80211_get_ibss(wiphy, NULL, params->ssid, params->ssid_len); if (!bss) { - memcpy(ssid.ssid, params->ssid, params->ssid_len); - ssid.ssid_len = params->ssid_len; - do { - if (unlikely - (__wl_cfg80211_scan(wiphy, dev, NULL, &ssid) == - -EBUSY)) { - wl_delay(150); - } else { - break; - } - } while (++scan_retry < WL_SCAN_RETRY_MAX); - /* to allow scan_inform to propagate to cfg80211 plane */ - if (rtnl_is_locked()) { - rtnl_unlock(); - rollback_lock = true; - } + if (IBSS_INITIAL_SCAN_ALLOWED == TRUE) { + memcpy(ssid.ssid, params->ssid, params->ssid_len); + ssid.ssid_len = params->ssid_len; + do { + if (unlikely + (__wl_cfg80211_scan(wiphy, dev, NULL, &ssid) == + -EBUSY)) { + wl_delay(150); + } else { + break; + } + } while (++scan_retry < WL_SCAN_RETRY_MAX); - /* wait 4 secons till scan done.... */ - schedule_timeout_interruptible(msecs_to_jiffies(4000)); - if (rollback_lock) - rtnl_lock(); - bss = cfg80211_get_ibss(wiphy, NULL, - params->ssid, params->ssid_len); + /* rtnl lock code is removed here. don't see why rtnl lock + * needs to be released. + */ + + /* wait 4 secons till scan done.... */ + schedule_timeout_interruptible(msecs_to_jiffies(4000)); + + bss = cfg80211_get_ibss(wiphy, NULL, + params->ssid, params->ssid_len); + } } - if (bss) { - wl->ibss_starter = false; + if (bss && ((IBSS_COALESCE_ALLOWED == TRUE) || + ((IBSS_COALESCE_ALLOWED == FALSE) && params->bssid && + !memcmp(bss->bssid, params->bssid, ETHER_ADDR_LEN)))) { + cfg->ibss_starter = false; WL_DBG(("Found IBSS\n")); } else { - wl->ibss_starter = true; + cfg->ibss_starter = true; + } + if (chan) { + if (chan->band == IEEE80211_BAND_5GHZ) + param[0] = WLC_BAND_5G; + else if (chan->band == IEEE80211_BAND_2GHZ) + param[0] = WLC_BAND_2G; + err = wldev_iovar_getint(dev, "bw_cap", param); + if (unlikely(err)) { + WL_ERR(("Get bw_cap Failed (%d)\n", err)); + return err; + } + bw_cap = param[0]; + chanspec = channel_to_chanspec(wiphy, dev, cfg->channel, bw_cap); } - chan = params->channel; - if (chan) - wl->channel = ieee80211_frequency_to_channel(chan->center_freq); /* * Join with specific BSSID and cached SSID * If SSID is zero join based on BSSID only @@ -2556,41 +2914,165 @@ wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, memcpy((void *)join_params.ssid.SSID, (void *)params->ssid, params->ssid_len); join_params.ssid.SSID_len = htod32(params->ssid_len); - if (params->bssid) - memcpy(&join_params.params.bssid, params->bssid, - ETHER_ADDR_LEN); - else + if (params->bssid) { + memcpy(&join_params.params.bssid, params->bssid, ETHER_ADDR_LEN); + err = wldev_ioctl(dev, WLC_SET_DESIRED_BSSID, &join_params.params.bssid, + ETHER_ADDR_LEN, true); + if (unlikely(err)) { + WL_ERR(("Error (%d)\n", err)); + return err; + } + } else memset(&join_params.params.bssid, 0, ETHER_ADDR_LEN); + wldev_iovar_setint(dev, "ibss_coalesce_allowed", IBSS_COALESCE_ALLOWED); + + if (IBSS_INITIAL_SCAN_ALLOWED == FALSE) { + scan_suppress = TRUE; + /* Set the SCAN SUPPRESS Flag in the firmware to skip join scan */ + err = wldev_ioctl(dev, WLC_SET_SCANSUPPRESS, + &scan_suppress, sizeof(int), true); + if (unlikely(err)) { + WL_ERR(("Scan Suppress Setting Failed (%d)\n", err)); + return err; + } + } + + join_params.params.chanspec_list[0] = chanspec; + join_params.params.chanspec_num = 1; + wldev_iovar_setint(dev, "chanspec", chanspec); + join_params_size = sizeof(join_params); + + /* Disable Authentication, IBSS will add key if it required */ + wldev_iovar_setint(dev, "wpa_auth", WPA_AUTH_DISABLED); + wldev_iovar_setint(dev, "wsec", 0); + +#ifdef WLAIBSS + /* Enable custom ibss features */ + err = wldev_iovar_setint(dev, "aibss", TRUE); + + if (unlikely(err)) { + WL_ERR(("Enable custom IBSS mode failed (%d)\n", err)); + return err; + } + + /* Configure custom IBSS beacon transmission */ + memset(&bcn_config, 0, sizeof(bcn_config)); + bcn_config.initial_min_bcn_dur = AIBSS_INITIAL_MIN_BCN_DUR; + bcn_config.min_bcn_dur = AIBSS_MIN_BCN_DUR; + bcn_config.bcn_flood_dur = AIBSS_BCN_FLOOD_DUR; + bcn_config.version = AIBSS_BCN_FORCE_CONFIG_VER_0; + bcn_config.len = sizeof(bcn_config); + + err = wldev_iovar_setbuf(dev, "aibss_bcn_force_config", &bcn_config, + sizeof(bcn_config), cfg->ioctl_buf, WLC_IOCTL_MAXLEN, NULL); + + if (unlikely(err)) { + WL_ERR(("Setting IBSS beacon configuration failed (%d)\n", err)); + return err; + } +#endif /* WLAIBSS */ err = wldev_ioctl(dev, WLC_SET_SSID, &join_params, - sizeof(join_params), true); + join_params_size, true); if (unlikely(err)) { WL_ERR(("Error (%d)\n", err)); return err; } + + if (IBSS_INITIAL_SCAN_ALLOWED == FALSE) { + scan_suppress = FALSE; + /* Reset the SCAN SUPPRESS Flag */ + err = wldev_ioctl(dev, WLC_SET_SCANSUPPRESS, + &scan_suppress, sizeof(int), true); + if (unlikely(err)) { + WL_ERR(("Reset Scan Suppress Flag Failed (%d)\n", err)); + return err; + } + } + wl_update_prof(cfg, dev, NULL, &join_params.ssid, WL_PROF_SSID); + wl_update_prof(cfg, dev, NULL, &cfg->channel, WL_PROF_CHAN); +#ifdef WLAIBSS + cfg->aibss_txfail_seq = 0; /* initialize the sequence */ +#endif /* WLAIBSS */ return err; } static s32 wl_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev) { - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); s32 err = 0; + scb_val_t scbval; + u8 *curbssid; + + RETURN_EIO_IF_NOT_UP(cfg); + wl_link_down(cfg); + + WL_ERR(("Leave IBSS\n")); + curbssid = wl_read_prof(cfg, dev, WL_PROF_BSSID); + wl_set_drv_status(cfg, DISCONNECTING, dev); + scbval.val = 0; + memcpy(&scbval.ea, curbssid, ETHER_ADDR_LEN); + err = wldev_ioctl(dev, WLC_DISASSOC, &scbval, + sizeof(scb_val_t), true); + if (unlikely(err)) { + wl_clr_drv_status(cfg, DISCONNECTING, dev); + WL_ERR(("error(%d)\n", err)); + return err; + } - RETURN_EIO_IF_NOT_UP(wl); - wl_link_down(wl); + /* remove the VSIE */ + wl_cfg80211_ibss_vsie_delete(dev); return err; } +#ifdef MFP +static int wl_cfg80211_get_rsn_capa(bcm_tlv_t *wpa2ie, u8* capa) +{ + u16 suite_count; + wpa_suite_mcast_t *mcast; + wpa_suite_ucast_t *ucast; + u16 len; + wpa_suite_auth_key_mgmt_t *mgmt; + + if (!wpa2ie) + return -1; + + len = wpa2ie->len; + mcast = (wpa_suite_mcast_t *)&wpa2ie->data[WPA2_VERSION_LEN]; + if ((len -= WPA_SUITE_LEN) <= 0) + return BCME_BADLEN; + ucast = (wpa_suite_ucast_t *)&mcast[1]; + suite_count = ltoh16_ua(&ucast->count); + if ((suite_count > NL80211_MAX_NR_CIPHER_SUITES) || + (len -= (WPA_IE_SUITE_COUNT_LEN + + (WPA_SUITE_LEN * suite_count))) <= 0) + return BCME_BADLEN; + + mgmt = (wpa_suite_auth_key_mgmt_t *)&ucast->list[suite_count]; + suite_count = ltoh16_ua(&mgmt->count); + + if ((suite_count > NL80211_MAX_NR_CIPHER_SUITES) || + (len -= (WPA_IE_SUITE_COUNT_LEN + + (WPA_SUITE_LEN * suite_count))) >= RSN_CAP_LEN) { + capa[0] = *(u8 *)&mgmt->list[suite_count]; + capa[1] = *((u8 *)&mgmt->list[suite_count] + 1); + } else + return BCME_BADLEN; + + return 0; +} +#endif /* MFP */ + static s32 wl_set_wpa_version(struct net_device *dev, struct cfg80211_connect_params *sme) { - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; struct wl_security *sec; s32 val = 0; s32 err = 0; s32 bssidx; - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } @@ -2626,7 +3108,7 @@ wl_set_wpa_version(struct net_device *dev, struct cfg80211_connect_params *sme) WL_ERR(("set wpa_auth failed (%d)\n", err)); return err; } - sec = wl_read_prof(wl, dev, WL_PROF_SEC); + sec = wl_read_prof(cfg, dev, WL_PROF_SEC); sec->wpa_versions = sme->crypto.wpa_versions; return err; } @@ -2635,19 +3117,19 @@ wl_set_wpa_version(struct net_device *dev, struct cfg80211_connect_params *sme) static s32 wl_set_set_wapi_ie(struct net_device *dev, struct cfg80211_connect_params *sme) { - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; s32 err = 0; s32 bssidx; - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } - WL_DBG(("Enter\n")); + WL_DBG((" %s \n", __FUNCTION__)); if (sme->crypto.wpa_versions & NL80211_WAPI_VERSION_1) { - err = wldev_iovar_setbuf_bsscfg(dev, "wapiie", sme->ie, - sme->ie_len, wl->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &wl->ioctl_buf_sync); + err = wldev_iovar_setbuf_bsscfg(dev, "wapiie", sme->ie, sme->ie_len, + cfg->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &cfg->ioctl_buf_sync); if (unlikely(err)) { WL_ERR(("===> set_wapi_ie Error (%d)\n", err)); @@ -2662,12 +3144,12 @@ wl_set_set_wapi_ie(struct net_device *dev, struct cfg80211_connect_params *sme) static s32 wl_set_auth_type(struct net_device *dev, struct cfg80211_connect_params *sme) { - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; struct wl_security *sec; s32 val = 0; s32 err = 0; s32 bssidx; - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } @@ -2688,7 +3170,7 @@ wl_set_auth_type(struct net_device *dev, struct cfg80211_connect_params *sme) #ifdef BCMCCX case NL80211_AUTHTYPE_NETWORK_EAP: WL_DBG(("network eap\n")); - val = WL_AUTH_OPEN_SYSTEM; + val = DOT11_LEAP_AUTH; break; #endif default: @@ -2702,7 +3184,7 @@ wl_set_auth_type(struct net_device *dev, struct cfg80211_connect_params *sme) WL_ERR(("set auth failed (%d)\n", err)); return err; } - sec = wl_read_prof(wl, dev, WL_PROF_SEC); + sec = wl_read_prof(cfg, dev, WL_PROF_SEC); sec->auth_type = sme->auth_type; return err; } @@ -2710,16 +3192,23 @@ wl_set_auth_type(struct net_device *dev, struct cfg80211_connect_params *sme) static s32 wl_set_set_cipher(struct net_device *dev, struct cfg80211_connect_params *sme) { - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; struct wl_security *sec; s32 pval = 0; s32 gval = 0; s32 err = 0; + s32 wsec_val = 0; +#ifdef MFP + s32 mfp = 0; + bcm_tlv_t *wpa2_ie; + u8 rsn_cap[2]; +#endif /* MFP */ + #ifdef BCMWAPI_WPI s32 val = 0; #endif s32 bssidx; - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } @@ -2755,7 +3244,7 @@ wl_set_set_cipher(struct net_device *dev, struct cfg80211_connect_params *sme) * Note that the FW feature flag only exists on kernels that support the * FT-EAP AKM suite. */ - if (wl->wdev->wiphy->features & NL80211_FEATURE_FW_4WAY_HANDSHAKE) { + if (cfg->wdev->wiphy->features & NL80211_FEATURE_FW_4WAY_HANDSHAKE) { if (pval == AES_ENABLED) err = wldev_iovar_setint_bsscfg(dev, "sup_wpa", 1, bssidx); else @@ -2811,8 +3300,46 @@ wl_set_set_cipher(struct net_device *dev, struct cfg80211_connect_params *sme) } else { #endif WL_DBG((" NO, is_wps_conn, Set pval | gval to WSEC")); + wsec_val = pval | gval; + +#ifdef MFP + if (pval == AES_ENABLED) { + if (((wpa2_ie = bcm_parse_tlvs((u8 *)sme->ie, sme->ie_len, + DOT11_MNG_RSN_ID)) != NULL) && + (wl_cfg80211_get_rsn_capa(wpa2_ie, rsn_cap) == 0)) { + + if (rsn_cap[0] & RSN_CAP_MFPC) { + /* MFP Capability advertised by supplicant. Check + * whether MFP is supported in the firmware + */ + if ((err = wldev_iovar_getint_bsscfg(dev, + "mfp", &mfp, bssidx)) < 0) { + WL_ERR(("Get MFP failed! " + "Check MFP support in FW \n")); + return -1; + } + + if ((sme->crypto.n_akm_suites == 1) && + ((sme->crypto.akm_suites[0] == + WL_AKM_SUITE_MFP_PSK) || + (sme->crypto.akm_suites[0] == + WL_AKM_SUITE_MFP_1X))) { + wsec_val |= MFP_SHA256; + } else if (sme->crypto.n_akm_suites > 1) { + WL_ERR(("Multiple AKM Specified \n")); + return -EINVAL; + } + + wsec_val |= MFP_CAPABLE; + if (rsn_cap[0] & RSN_CAP_MFPR) + wsec_val |= MFP_REQUIRED; + } + } + } +#endif /* MFP */ + WL_DBG((" Set WSEC to fW 0x%x \n", wsec_val)); err = wldev_iovar_setint_bsscfg(dev, "wsec", - pval | gval, bssidx); + wsec_val, bssidx); #ifdef BCMWAPI_WPI } #endif @@ -2822,7 +3349,7 @@ wl_set_set_cipher(struct net_device *dev, struct cfg80211_connect_params *sme) return err; } - sec = wl_read_prof(wl, dev, WL_PROF_SEC); + sec = wl_read_prof(cfg, dev, WL_PROF_SEC); sec->cipher_pairwise = sme->crypto.ciphers_pairwise[0]; sec->cipher_group = sme->crypto.cipher_group; @@ -2832,12 +3359,12 @@ wl_set_set_cipher(struct net_device *dev, struct cfg80211_connect_params *sme) static s32 wl_set_key_mgmt(struct net_device *dev, struct cfg80211_connect_params *sme) { - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; struct wl_security *sec; s32 val = 0; s32 err = 0; s32 bssidx; - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } @@ -2879,6 +3406,14 @@ wl_set_key_mgmt(struct net_device *dev, struct cfg80211_connect_params *sme) case WLAN_AKM_SUITE_8021X: val = WPA2_AUTH_UNSPECIFIED; break; +#ifdef MFP + case WL_AKM_SUITE_MFP_1X: + val = WPA2_AUTH_UNSPECIFIED; + break; + case WL_AKM_SUITE_MFP_PSK: + val = WPA2_AUTH_PSK; + break; +#endif case WLAN_AKM_SUITE_PSK: val = WPA2_AUTH_PSK; break; @@ -2921,32 +3456,13 @@ wl_set_key_mgmt(struct net_device *dev, struct cfg80211_connect_params *sme) #endif WL_DBG(("setting wpa_auth to %d\n", val)); -#ifdef BCMCCX - if (val & (WPA_AUTH_CCKM|WPA2_AUTH_CCKM)) { - WL_DBG(("SET CCX enable\n")); - wldev_iovar_setint_bsscfg(dev, "okc_enable", 0, bssidx); - err = wldev_iovar_setint_bsscfg(dev, "ccx_enable", 1, bssidx); - - if (unlikely(err)) { - WL_ERR(("could not set ccx_enable (%d)\n", err)); - return err; - } - } else { - err = wldev_iovar_setint_bsscfg(dev, "ccx_enable", 0, bssidx); - - if (unlikely(err)) { - WL_ERR(("could not set ccx_disable (%d)\n", err)); - } - } -#endif /* BCMCCX */ - err = wldev_iovar_setint_bsscfg(dev, "wpa_auth", val, bssidx); if (unlikely(err)) { WL_ERR(("could not set wpa_auth (%d)\n", err)); return err; } } - sec = wl_read_prof(wl, dev, WL_PROF_SEC); + sec = wl_read_prof(cfg, dev, WL_PROF_SEC); sec->wpa_auth = sme->crypto.akm_suites[0]; return err; @@ -2956,20 +3472,20 @@ static s32 wl_set_set_sharedkey(struct net_device *dev, struct cfg80211_connect_params *sme) { - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; struct wl_security *sec; struct wl_wsec_key key; s32 val; s32 err = 0; s32 bssidx; - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } WL_DBG(("key len (%d)\n", sme->key_len)); if (sme->key_len) { - sec = wl_read_prof(wl, dev, WL_PROF_SEC); + sec = wl_read_prof(cfg, dev, WL_PROF_SEC); WL_DBG(("wpa_versions 0x%x cipher_pairwise 0x%x\n", sec->wpa_versions, sec->cipher_pairwise)); if (!(sec->wpa_versions & (NL80211_WPA_VERSION_1 | @@ -3017,7 +3533,7 @@ wl_set_set_sharedkey(struct net_device *dev, WL_DBG(("key \"%s\"\n", key.data)); swap_key_from_BE(&key); err = wldev_iovar_setbuf_bsscfg(dev, "wsec_key", &key, sizeof(key), - wl->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &wl->ioctl_buf_sync); + cfg->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &cfg->ioctl_buf_sync); if (unlikely(err)) { WL_ERR(("WLC_SET_KEY error (%d)\n", err)); return err; @@ -3046,17 +3562,34 @@ static u8 broad_bssid[6]; #define MAX_ROAM_CACHE_NUM 100 #endif /* CUSTOMER_HW4 && ROAM_CHANNEL_CACHE */ +#if defined(CUSTOM_SET_CPUCORE) || defined(CONFIG_TCPACK_FASTTX) +static bool wl_get_chan_isvht80(struct net_device *net, dhd_pub_t *dhd) +{ + u32 chanspec = 0; + bool isvht80 = 0; + + if (wldev_iovar_getint(net, "chanspec", (s32 *)&chanspec) == BCME_OK) + chanspec = wl_chspec_driver_to_host(chanspec); + + isvht80 = chanspec & WL_CHANSPEC_BW_80; + WL_INFO(("%s: chanspec(%x:%d)\n", __FUNCTION__, chanspec, isvht80)); + + return isvht80; +} +#endif /* CUSTOM_SET_CPUCORE || CONFIG_TCPACK_FASTTX */ + static s32 wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_connect_params *sme) { - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); struct ieee80211_channel *chan = sme->channel; wl_extjoin_params_t *ext_join_params; struct wl_join_params join_params; size_t join_params_size; #if defined(ROAM_ENABLE) && defined(ROAM_AP_ENV_DETECTION) - dhd_pub_t *dhd = (dhd_pub_t *)(wl->pub); + dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub); + s32 roam_trigger[2] = {0, 0}; #endif /* ROAM_AP_ENV_DETECTION */ s32 err = 0; wpa_ie_fixed_t *wpa_ie; @@ -3080,25 +3613,30 @@ wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, } if (unlikely(sme->ssid_len > DOT11_MAX_SSID_LEN)) { - WL_ERR(("Invalid SSID info: SSID=%s, length=%d\n", + WL_ERR(("Invalid SSID info: SSID=%s, length=%zd\n", sme->ssid, sme->ssid_len)); return -EINVAL; } - RETURN_EIO_IF_NOT_UP(wl); + RETURN_EIO_IF_NOT_UP(cfg); /* * Cancel ongoing scan to sync up with sme state machine of cfg80211. */ #if (defined(BCM4334_CHIP) || !defined(ESCAN_RESULT_PATCH)) - if (wl->scan_request) { - wl_notify_escan_complete(wl, dev, true, true); + if (cfg->scan_request) { + wl_notify_escan_complete(cfg, dev, true, true); + } +#endif +#ifdef WL_SCHED_SCAN + if (cfg->sched_scan_req) { + wl_cfg80211_sched_scan_stop(wiphy, bcmcfg_to_prmry_ndev(cfg)); } #endif #ifdef WL_CFG80211_GON_COLLISION /* init block gon req count */ - wl->block_gon_req_tx_count = 0; - wl->block_gon_req_rx_count = 0; + cfg->block_gon_req_tx_count = 0; + cfg->block_gon_req_rx_count = 0; #endif /* WL_CFG80211_GON_COLLISION */ #if defined(ESCAN_RESULT_PATCH) if (sme->bssid) @@ -3107,13 +3645,15 @@ wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, bzero(connect_req_bssid, ETHER_ADDR_LEN); bzero(broad_bssid, ETHER_ADDR_LEN); #endif - +#if defined(USE_DYNAMIC_MAXPKT_RXGLOM) + maxrxpktglom = 0; +#endif bzero(&bssid, sizeof(bssid)); - if (!wl_get_drv_status(wl, CONNECTED, dev)&& + if (!wl_get_drv_status(cfg, CONNECTED, dev)&& (ret = wldev_ioctl(dev, WLC_GET_BSSID, &bssid, ETHER_ADDR_LEN, false)) == 0) { if (!ETHER_ISNULLADDR(&bssid)) { scb_val_t scbval; - wl_set_drv_status(wl, DISCONNECTING, dev); + wl_set_drv_status(cfg, DISCONNECTING, dev); scbval.val = DOT11_RC_DISASSOC_LEAVING; memcpy(&scbval.ea, &bssid, ETHER_ADDR_LEN); scbval.val = htod32(scbval.val); @@ -3123,43 +3663,43 @@ wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, err = wldev_ioctl(dev, WLC_DISASSOC, &scbval, sizeof(scb_val_t), true); if (unlikely(err)) { - wl_clr_drv_status(wl, DISCONNECTING, dev); + wl_clr_drv_status(cfg, DISCONNECTING, dev); WL_ERR(("error (%d)\n", err)); return err; } wait_cnt = 500/10; - while (wl_get_drv_status(wl, DISCONNECTING, dev) && wait_cnt) { + while (wl_get_drv_status(cfg, DISCONNECTING, dev) && wait_cnt) { WL_DBG(("Waiting for disconnection terminated, wait_cnt: %d\n", wait_cnt)); wait_cnt--; - msleep(10); + OSL_SLEEP(10); } } else WL_DBG(("Currently not associated!\n")); } else { /* if status is DISCONNECTING, wait for disconnection terminated max 500 ms */ wait_cnt = 500/10; - while (wl_get_drv_status(wl, DISCONNECTING, dev) && wait_cnt) { + while (wl_get_drv_status(cfg, DISCONNECTING, dev) && wait_cnt) { WL_DBG(("Waiting for disconnection terminated, wait_cnt: %d\n", wait_cnt)); wait_cnt--; - msleep(10); + OSL_SLEEP(10); } } /* Clean BSSID */ bzero(&bssid, sizeof(bssid)); - if (!wl_get_drv_status(wl, DISCONNECTING, dev)) - wl_update_prof(wl, dev, NULL, (void *)&bssid, WL_PROF_BSSID); + if (!wl_get_drv_status(cfg, DISCONNECTING, dev)) + wl_update_prof(cfg, dev, NULL, (void *)&bssid, WL_PROF_BSSID); - if (p2p_is_on(wl) && (dev != wl_to_prmry_ndev(wl))) { + if (p2p_is_on(cfg) && (dev != bcmcfg_to_prmry_ndev(cfg))) { /* we only allow to connect using virtual interface in case of P2P */ - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } - wl_cfgp2p_set_management_ie(wl, dev, bssidx, + wl_cfgp2p_set_management_ie(cfg, dev, bssidx, VNDR_IE_ASSOCREQ_FLAG, sme->ie, sme->ie_len); - } else if (dev == wl_to_prmry_ndev(wl)) { + } else if (dev == bcmcfg_to_prmry_ndev(cfg)) { /* find the RSN_IE */ if ((wpa2_ie = bcm_parse_tlvs((u8 *)sme->ie, sme->ie_len, DOT11_MNG_RSN_ID)) != NULL) { @@ -3175,33 +3715,46 @@ wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, wpaie_len = (wpa_ie != NULL) ? wpa_ie->length : wpa2_ie->len; wpaie_len += WPA_RSN_IE_TAG_FIXED_LEN; wldev_iovar_setbuf(dev, "wpaie", wpaie, wpaie_len, - wl->ioctl_buf, WLC_IOCTL_MAXLEN, &wl->ioctl_buf_sync); + cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync); } else { wldev_iovar_setbuf(dev, "wpaie", NULL, 0, - wl->ioctl_buf, WLC_IOCTL_MAXLEN, &wl->ioctl_buf_sync); + cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync); } - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } - err = wl_cfgp2p_set_management_ie(wl, dev, bssidx, + err = wl_cfgp2p_set_management_ie(cfg, dev, bssidx, VNDR_IE_ASSOCREQ_FLAG, (u8 *)sme->ie, sme->ie_len); if (unlikely(err)) { return err; } } #if defined(ROAM_ENABLE) && defined(ROAM_AP_ENV_DETECTION) - if (dhd->roam_env_detection && (wldev_iovar_setint(dev, "roam_env_detection", - AP_ENV_DETECT_NOT_USED) == BCME_OK)) { - s32 roam_trigger[2] = {WL_AUTO_ROAM_TRIGGER, WLC_BAND_ALL}; + if (dhd->roam_env_detection) { + bool is_roamtrig_reset = TRUE; + bool is_roam_env_ok = (wldev_iovar_setint(dev, "roam_env_detection", + AP_ENV_DETECT_NOT_USED) == BCME_OK); +#ifdef CUSTOMER_HW4 + roam_trigger[1] = WLC_BAND_2G; + is_roamtrig_reset = + (wldev_ioctl(dev, WLC_GET_ROAM_TRIGGER, roam_trigger, + sizeof(roam_trigger), 0) == BCME_OK) && + (roam_trigger[0] == WL_AUTO_ROAM_TRIGGER-10); +#endif /* CUSTOMER_HW4 */ + if (is_roamtrig_reset && is_roam_env_ok) { + roam_trigger[0] = WL_AUTO_ROAM_TRIGGER; + roam_trigger[1] = WLC_BAND_ALL; err = wldev_ioctl(dev, WLC_SET_ROAM_TRIGGER, roam_trigger, sizeof(roam_trigger), true); if (unlikely(err)) { - WL_ERR((" failed to restore roam_trigger for auto env detection\n")); + WL_ERR((" failed to restore roam_trigger for auto env" + " detection\n")); } } -#endif /* ROAM_AP_ENV_DETECTION */ + } +#endif /* ROAM_ENABLE && ROAM_AP_ENV_DETECTION */ if (chan) { #if defined(CUSTOMER_HW4) && defined(ROAM_CHANNEL_CACHE) wlc_ssid_t ssid; @@ -3212,18 +3765,18 @@ wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, set_roam_band(band); } - wl->channel = ieee80211_frequency_to_channel(chan->center_freq); + cfg->channel = ieee80211_frequency_to_channel(chan->center_freq); memcpy(ssid.SSID, sme->ssid, sme->ssid_len); ssid.SSID_len = sme->ssid_len; - chan_cnt = get_roam_channel_list(wl->channel, chanspec_list, &ssid, ioctl_version); + chan_cnt = get_roam_channel_list(cfg->channel, chanspec_list, &ssid, ioctl_version); #else - wl->channel = ieee80211_frequency_to_channel(chan->center_freq); + cfg->channel = ieee80211_frequency_to_channel(chan->center_freq); chan_cnt = 1; #endif /* CUSTOMER_HW4 && ROAM_CHANNEL_CACHE */ - WL_DBG(("channel (%d), center_req (%d), %d channels\n", wl->channel, + WL_DBG(("channel (%d), center_req (%d), %d channels\n", cfg->channel, chan->center_freq, chan_cnt)); } else - wl->channel = 0; + cfg->channel = 0; #ifdef BCMWAPI_WPI WL_DBG(("1. enable wapi auth\n")); if (sme->crypto.wpa_versions & NL80211_WAPI_VERSION_1) { @@ -3283,22 +3836,22 @@ wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, ext_join_params = (wl_extjoin_params_t*)kzalloc(join_params_size, GFP_KERNEL); if (ext_join_params == NULL) { err = -ENOMEM; - wl_clr_drv_status(wl, CONNECTING, dev); + wl_clr_drv_status(cfg, CONNECTING, dev); goto exit; } ext_join_params->ssid.SSID_len = min(sizeof(ext_join_params->ssid.SSID), sme->ssid_len); memcpy(&ext_join_params->ssid.SSID, sme->ssid, ext_join_params->ssid.SSID_len); - wl_update_prof(wl, dev, NULL, &ext_join_params->ssid, WL_PROF_SSID); + wl_update_prof(cfg, dev, NULL, &ext_join_params->ssid, WL_PROF_SSID); ext_join_params->ssid.SSID_len = htod32(ext_join_params->ssid.SSID_len); /* increate dwell time to receive probe response or detect Beacon * from target AP at a noisy air only during connect command */ - ext_join_params->scan.active_time = WL_SCAN_JOIN_ACTIVE_DWELL_TIME_MS; - ext_join_params->scan.passive_time = WL_SCAN_JOIN_PASSIVE_DWELL_TIME_MS; + ext_join_params->scan.active_time = chan_cnt ? WL_SCAN_JOIN_ACTIVE_DWELL_TIME_MS : -1; + ext_join_params->scan.passive_time = chan_cnt ? WL_SCAN_JOIN_PASSIVE_DWELL_TIME_MS : -1; /* Set up join scan parameters */ ext_join_params->scan.scan_type = -1; - ext_join_params->scan.nprobes - = (ext_join_params->scan.active_time/WL_SCAN_JOIN_PROBE_INTERVAL_MS); + ext_join_params->scan.nprobes = chan_cnt ? + (ext_join_params->scan.active_time/WL_SCAN_JOIN_PROBE_INTERVAL_MS) : -1; ext_join_params->scan.home_time = -1; if (sme->bssid) @@ -3313,7 +3866,7 @@ wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, #else u16 channel, band, bw, ctl_sb; chanspec_t chspec; - channel = wl->channel; + channel = cfg->channel; band = (channel <= CH_MAX_2G_CHANNEL) ? WL_CHANSPEC_BAND_2G : WL_CHANSPEC_BAND_5G; bw = WL_CHANSPEC_BW_20; @@ -3330,22 +3883,29 @@ wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, WL_INFO(("ssid \"%s\", len (%d)\n", ext_join_params->ssid.SSID, ext_join_params->ssid.SSID_len)); } - wl_set_drv_status(wl, CONNECTING, dev); + wl_set_drv_status(cfg, CONNECTING, dev); - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } err = wldev_iovar_setbuf_bsscfg(dev, "join", ext_join_params, join_params_size, - wl->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &wl->ioctl_buf_sync); + cfg->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &cfg->ioctl_buf_sync); + + WL_ERR(("Connectting with" MACDBG " channel (%d) ssid \"%s\", len (%d)\n\n", + MAC2STRDBG((u8*)(&ext_join_params->assoc.bssid)), cfg->channel, + ext_join_params->ssid.SSID, ext_join_params->ssid.SSID_len)); + kfree(ext_join_params); if (err) { - wl_clr_drv_status(wl, CONNECTING, dev); + wl_clr_drv_status(cfg, CONNECTING, dev); if (err == BCME_UNSUPPORTED) { WL_DBG(("join iovar is not supported\n")); goto set_ssid; - } else + } else { WL_ERR(("error (%d)\n", err)); + goto exit; + } } else goto exit; @@ -3356,24 +3916,24 @@ set_ssid: join_params.ssid.SSID_len = min(sizeof(join_params.ssid.SSID), sme->ssid_len); memcpy(&join_params.ssid.SSID, sme->ssid, join_params.ssid.SSID_len); join_params.ssid.SSID_len = htod32(join_params.ssid.SSID_len); - wl_update_prof(wl, dev, NULL, &join_params.ssid, WL_PROF_SSID); + wl_update_prof(cfg, dev, NULL, &join_params.ssid, WL_PROF_SSID); if (sme->bssid) memcpy(&join_params.params.bssid, sme->bssid, ETH_ALEN); else memcpy(&join_params.params.bssid, ðer_bcast, ETH_ALEN); - wl_ch_to_chanspec(wl->channel, &join_params, &join_params_size); + wl_ch_to_chanspec(cfg->channel, &join_params, &join_params_size); WL_DBG(("join_param_size %zu\n", join_params_size)); if (join_params.ssid.SSID_len < IEEE80211_MAX_SSID_LEN) { WL_INFO(("ssid \"%s\", len (%d)\n", join_params.ssid.SSID, join_params.ssid.SSID_len)); } - wl_set_drv_status(wl, CONNECTING, dev); + wl_set_drv_status(cfg, CONNECTING, dev); err = wldev_ioctl(dev, WLC_SET_SSID, &join_params, join_params_size, true); if (err) { WL_ERR(("error (%d)\n", err)); - wl_clr_drv_status(wl, CONNECTING, dev); + wl_clr_drv_status(cfg, CONNECTING, dev); } exit: return err; @@ -3383,53 +3943,74 @@ static s32 wl_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_code) { - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); scb_val_t scbval; bool act = false; s32 err = 0; u8 *curbssid; +#ifdef CUSTOM_SET_CPUCORE + dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub); +#endif /* CUSTOM_SET_CPUCORE */ WL_ERR(("Reason %d\n", reason_code)); - RETURN_EIO_IF_NOT_UP(wl); - act = *(bool *) wl_read_prof(wl, dev, WL_PROF_ACT); - curbssid = wl_read_prof(wl, dev, WL_PROF_BSSID); + RETURN_EIO_IF_NOT_UP(cfg); + act = *(bool *) wl_read_prof(cfg, dev, WL_PROF_ACT); + curbssid = wl_read_prof(cfg, dev, WL_PROF_BSSID); if (act) { /* * Cancel ongoing scan to sync up with sme state machine of cfg80211. */ #if (defined(BCM4334_CHIP) || !defined(ESCAN_RESULT_PATCH)) /* Let scan aborted by F/W */ - if (wl->scan_request) { - wl_notify_escan_complete(wl, dev, true, true); + if (cfg->scan_request) { + wl_notify_escan_complete(cfg, dev, true, true); } #endif /* ESCAN_RESULT_PATCH */ - wl_set_drv_status(wl, DISCONNECTING, dev); + wl_set_drv_status(cfg, DISCONNECTING, dev); scbval.val = reason_code; memcpy(&scbval.ea, curbssid, ETHER_ADDR_LEN); scbval.val = htod32(scbval.val); err = wldev_ioctl(dev, WLC_DISASSOC, &scbval, sizeof(scb_val_t), true); if (unlikely(err)) { - wl_clr_drv_status(wl, DISCONNECTING, dev); + wl_clr_drv_status(cfg, DISCONNECTING, dev); WL_ERR(("error (%d)\n", err)); return err; } } +#ifdef CUSTOM_SET_CPUCORE + /* set default cpucore */ + if (dev == bcmcfg_to_prmry_ndev(cfg)) { + dhd->chan_isvht80 &= ~DHD_FLAG_STA_MODE; + if (!(dhd->chan_isvht80)) + dhd_set_cpucore(dhd, FALSE); + } +#endif /* CUSTOM_SET_CPUCORE */ return err; } +#if defined(WL_CFG80211_P2P_DEV_IF) +static s32 +wl_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, + enum nl80211_tx_power_setting type, s32 mbm) +#else static s32 wl_cfg80211_set_tx_power(struct wiphy *wiphy, enum nl80211_tx_power_setting type, s32 dbm) +#endif /* WL_CFG80211_P2P_DEV_IF */ { - struct wl_priv *wl = wiphy_priv(wiphy); - struct net_device *ndev = wl_to_prmry_ndev(wl); - u16 txpwrmw; + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); + struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg); s32 err = 0; - s32 disable = 0; - - RETURN_EIO_IF_NOT_UP(wl); +#if defined(WL_CFG80211_P2P_DEV_IF) + s32 dbm = MBM_TO_DBM(mbm); +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)) || \ + defined(WL_COMPAT_WIRELESS) || defined(WL_SUPPORT_BACKPORTED_KPATCHES) + dbm = MBM_TO_DBM(dbm); +#endif /* WL_CFG80211_P2P_DEV_IF */ + + RETURN_EIO_IF_NOT_UP(cfg); switch (type) { case NL80211_TX_POWER_AUTOMATIC: break; @@ -3446,46 +4027,33 @@ wl_cfg80211_set_tx_power(struct wiphy *wiphy, } break; } - /* Make sure radio is off or on as far as software is concerned */ - disable = WL_RADIO_SW_DISABLE << 16; - disable = htod32(disable); - err = wldev_ioctl(ndev, WLC_SET_RADIO, &disable, sizeof(disable), true); - if (unlikely(err)) { - WL_ERR(("WLC_SET_RADIO error (%d)\n", err)); - return err; - } - if (dbm > 0xffff) - txpwrmw = 0xffff; - else - txpwrmw = (u16) dbm; - err = wldev_iovar_setint(ndev, "qtxpower", - (s32) (bcm_mw_to_qdbm(txpwrmw))); + err = wl_set_tx_power(ndev, type, dbm); if (unlikely(err)) { - WL_ERR(("qtxpower error (%d)\n", err)); + WL_ERR(("error (%d)\n", err)); return err; } - wl->conf->tx_power = dbm; + + cfg->conf->tx_power = dbm; return err; } +#if defined(WL_CFG80211_P2P_DEV_IF) +static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, + struct wireless_dev *wdev, s32 *dbm) +#else static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm) +#endif /* WL_CFG80211_P2P_DEV_IF */ { - struct wl_priv *wl = wiphy_priv(wiphy); - struct net_device *ndev = wl_to_prmry_ndev(wl); - s32 txpwrdbm; - u8 result; + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); + struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg); s32 err = 0; - RETURN_EIO_IF_NOT_UP(wl); - err = wldev_iovar_getint(ndev, "qtxpower", &txpwrdbm); - if (unlikely(err)) { + RETURN_EIO_IF_NOT_UP(cfg); + err = wl_get_tx_power(ndev, dbm); + if (unlikely(err)) WL_ERR(("error (%d)\n", err)); - return err; - } - result = (u8) (txpwrdbm & ~WL_TXPWR_OVERRIDE); - *dbm = (s32) bcm_qdbm_to_mw(result); return err; } @@ -3494,24 +4062,23 @@ static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *dev, u8 key_idx, bool unicast, bool multicast) { - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); u32 index; s32 wsec; s32 err = 0; s32 bssidx; - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } WL_DBG(("key index (%d)\n", key_idx)); - RETURN_EIO_IF_NOT_UP(wl); + RETURN_EIO_IF_NOT_UP(cfg); err = wldev_iovar_getint_bsscfg(dev, "wsec", &wsec, bssidx); if (unlikely(err)) { WL_ERR(("WLC_GET_WSEC error (%d)\n", err)); return err; } - /* fix IOT issue with Apple Airport */ if (wsec == WEP_ENABLED) { /* Just select a new current key */ index = (u32) key_idx; @@ -3529,12 +4096,12 @@ static s32 wl_add_keyext(struct wiphy *wiphy, struct net_device *dev, u8 key_idx, const u8 *mac_addr, struct key_params *params) { - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); struct wl_wsec_key key; s32 err = 0; s32 bssidx; - s32 mode = wl_get_mode_by_netdev(wl, dev); - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { + s32 mode = wl_get_mode_by_netdev(cfg, dev); + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } @@ -3550,7 +4117,7 @@ wl_add_keyext(struct wiphy *wiphy, struct net_device *dev, /* key delete */ swap_key_from_BE(&key); err = wldev_iovar_setbuf_bsscfg(dev, "wsec_key", &key, sizeof(key), - wl->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &wl->ioctl_buf_sync); + cfg->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &cfg->ioctl_buf_sync); if (unlikely(err)) { WL_ERR(("key delete error (%d)\n", err)); return err; @@ -3617,7 +4184,7 @@ wl_add_keyext(struct wiphy *wiphy, struct net_device *dev, /* need to guarantee EAPOL 4/4 send out before set key */ dhd_wait_pend8021x(dev); err = wldev_iovar_setbuf_bsscfg(dev, "wsec_key", &key, sizeof(key), - wl->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &wl->ioctl_buf_sync); + cfg->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &cfg->ioctl_buf_sync); if (unlikely(err)) { WL_ERR(("WLC_SET_KEY error (%d)\n", err)); return err; @@ -3626,6 +4193,34 @@ wl_add_keyext(struct wiphy *wiphy, struct net_device *dev, return err; } +int +wl_cfg80211_enable_roam_offload(struct net_device *dev, bool enable) +{ + int err; + wl_eventmsg_buf_t ev_buf; + + if (dev != bcmcfg_to_prmry_ndev(g_bcm_cfg)) { + /* roam offload is only for the primary device */ + return -1; + } + err = wldev_iovar_setint(dev, "roam_offload", (int)enable); + if (err) + return err; + + bzero(&ev_buf, sizeof(wl_eventmsg_buf_t)); + wl_cfg80211_add_to_eventbuffer(&ev_buf, WLC_E_PSK_SUP, !enable); + wl_cfg80211_add_to_eventbuffer(&ev_buf, WLC_E_ASSOC_REQ_IE, !enable); + wl_cfg80211_add_to_eventbuffer(&ev_buf, WLC_E_ASSOC_RESP_IE, !enable); + wl_cfg80211_add_to_eventbuffer(&ev_buf, WLC_E_REASSOC, !enable); + wl_cfg80211_add_to_eventbuffer(&ev_buf, WLC_E_JOIN, !enable); + wl_cfg80211_add_to_eventbuffer(&ev_buf, WLC_E_ROAM, !enable); + err = wl_cfg80211_apply_eventbuffer(dev, g_bcm_cfg, &ev_buf); + if (!err) { + g_bcm_cfg->roam_offload = enable; + } + return err; +} + static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, u8 key_idx, bool pairwise, const u8 *mac_addr, @@ -3637,12 +4232,12 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, s32 err = 0; u8 keybuf[8]; s32 bssidx = 0; - struct wl_priv *wl = wiphy_priv(wiphy); - s32 mode = wl_get_mode_by_netdev(wl, dev); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); + s32 mode = wl_get_mode_by_netdev(cfg, dev); WL_DBG(("key index (%d)\n", key_idx)); - RETURN_EIO_IF_NOT_UP(wl); + RETURN_EIO_IF_NOT_UP(cfg); - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } @@ -3711,7 +4306,17 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, char keystring[WSEC_MAX_PSK_LEN + 1]; char* charptr = keystring; uint len; - + struct wl_security *sec; + + sec = wl_read_prof(cfg, dev, WL_PROF_SEC); + if (sec->wpa_auth == WLAN_AKM_SUITE_8021X) { + err = wldev_iovar_setbuf(dev, "okc_info_pmk", params->key, + WSEC_MAX_PSK_LEN / 2, keystring, sizeof(keystring), NULL); + if (err) { + /* could fail in case that 'okc' is not supported */ + WL_INFO(("Setting 'okc_info_pmk' failed, err=%d\n", err)); + } + } /* copy the raw hex key to the appropriate format */ for (j = 0; j < (WSEC_MAX_PSK_LEN / 2); j++) { sprintf(charptr, "%02x", params->key[j]); @@ -3733,9 +4338,13 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, } /* Set the new key/index */ + if ((mode == WL_MODE_IBSS) && (val & (TKIP_ENABLED | AES_ENABLED))) { + WL_ERR(("IBSS KEY setted\n")); + wldev_iovar_setint(dev, "wpa_auth", WPA_AUTH_NONE); + } swap_key_from_BE(&key); - err = wldev_iovar_setbuf_bsscfg(dev, "wsec_key", &key, sizeof(key), wl->ioctl_buf, - WLC_IOCTL_MAXLEN, bssidx, &wl->ioctl_buf_sync); + err = wldev_iovar_setbuf_bsscfg(dev, "wsec_key", &key, sizeof(key), cfg->ioctl_buf, + WLC_IOCTL_MAXLEN, bssidx, &cfg->ioctl_buf_sync); if (unlikely(err)) { WL_ERR(("WLC_SET_KEY error (%d)\n", err)); return err; @@ -3763,10 +4372,10 @@ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, u8 key_idx, bool pairwise, const u8 *mac_addr) { struct wl_wsec_key key; - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); s32 err = 0; s32 bssidx; - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } @@ -3777,7 +4386,7 @@ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, return -EINVAL; #endif - RETURN_EIO_IF_NOT_UP(wl); + RETURN_EIO_IF_NOT_UP(cfg); memset(&key, 0, sizeof(key)); key.flags = WL_PRIMARY_KEY; @@ -3787,8 +4396,8 @@ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, WL_DBG(("key index (%d)\n", key_idx)); /* Set the new key/index */ swap_key_from_BE(&key); - err = wldev_iovar_setbuf_bsscfg(dev, "wsec_key", &key, sizeof(key), wl->ioctl_buf, - WLC_IOCTL_MAXLEN, bssidx, &wl->ioctl_buf_sync); + err = wldev_iovar_setbuf_bsscfg(dev, "wsec_key", &key, sizeof(key), cfg->ioctl_buf, + WLC_IOCTL_MAXLEN, bssidx, &cfg->ioctl_buf_sync); if (unlikely(err)) { if (err == -EINVAL) { if (key.index >= DOT11_MAX_DEFAULT_KEYS) { @@ -3810,17 +4419,17 @@ wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, { struct key_params params; struct wl_wsec_key key; - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); struct wl_security *sec; s32 wsec; s32 err = 0; s32 bssidx; - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } WL_DBG(("key index (%d)\n", key_idx)); - RETURN_EIO_IF_NOT_UP(wl); + RETURN_EIO_IF_NOT_UP(cfg); memset(&key, 0, sizeof(key)); key.index = key_idx; swap_key_to_BE(&key); @@ -3835,7 +4444,7 @@ wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, } switch (wsec & ~SES_OW_ENABLED) { case WEP_ENABLED: - sec = wl_read_prof(wl, dev, WL_PROF_SEC); + sec = wl_read_prof(cfg, dev, WL_PROF_SEC); if (sec->cipher_pairwise & WLAN_CIPHER_SUITE_WEP40) { params.cipher = WLAN_CIPHER_SUITE_WEP40; WL_DBG(("WLAN_CIPHER_SUITE_WEP40\n")); @@ -3879,33 +4488,33 @@ static s32 wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, u8 *mac, struct station_info *sinfo) { - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); scb_val_t scb_val; s32 rssi; s32 rate; s32 err = 0; sta_info_t *sta; -#if 1 //LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) || defined(WL_COMPAT_WIRELESS) s8 eabuf[ETHER_ADDR_STR_LEN]; #endif - dhd_pub_t *dhd = (dhd_pub_t *)(wl->pub); - RETURN_EIO_IF_NOT_UP(wl); - if (wl_get_mode_by_netdev(wl, dev) == WL_MODE_AP) { + dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub); + RETURN_EIO_IF_NOT_UP(cfg); + if (wl_get_mode_by_netdev(cfg, dev) == WL_MODE_AP) { err = wldev_iovar_getbuf(dev, "sta_info", (struct ether_addr *)mac, - ETHER_ADDR_LEN, wl->ioctl_buf, WLC_IOCTL_SMLEN, &wl->ioctl_buf_sync); + ETHER_ADDR_LEN, cfg->ioctl_buf, WLC_IOCTL_SMLEN, &cfg->ioctl_buf_sync); if (err < 0) { WL_ERR(("GET STA INFO failed, %d\n", err)); return err; } sinfo->filled = STATION_INFO_INACTIVE_TIME; - sta = (sta_info_t *)wl->ioctl_buf; + sta = (sta_info_t *)cfg->ioctl_buf; sta->len = dtoh16(sta->len); sta->cap = dtoh16(sta->cap); sta->flags = dtoh32(sta->flags); sta->idle = dtoh32(sta->idle); sta->in = dtoh32(sta->in); sinfo->inactive_time = sta->idle * 1000; -#if 1 //LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) || defined(WL_COMPAT_WIRELESS) if (sta->flags & WL_STA_ASSOC) { sinfo->filled |= STATION_INFO_CONNECTED_TIME; sinfo->connected_time = sta->in; @@ -3914,10 +4523,28 @@ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, bcm_ether_ntoa((const struct ether_addr *)mac, eabuf), sinfo->inactive_time, sta->idle * 1000)); #endif - } else if (wl_get_mode_by_netdev(wl, dev) == WL_MODE_BSS) { + } else if (wl_get_mode_by_netdev(cfg, dev) == WL_MODE_BSS || + wl_get_mode_by_netdev(cfg, dev) == WL_MODE_IBSS) { get_pktcnt_t pktcnt; - u8 *curmacp = wl_read_prof(wl, dev, WL_PROF_BSSID); - if (!wl_get_drv_status(wl, CONNECTED, dev) || + u8 *curmacp; + + if (cfg->roam_offload) { + struct ether_addr bssid; + err = wldev_ioctl(dev, WLC_GET_BSSID, &bssid, ETHER_ADDR_LEN, false); + if (err) { + WL_ERR(("Failed to get current BSSID\n")); + } else { + if (memcmp(mac, &bssid.octet, ETHER_ADDR_LEN) != 0) { + /* roaming is detected */ + err = wl_cfg80211_delayed_roam(cfg, dev, &bssid); + if (err) + WL_ERR(("Failed to handle the delayed roam, " + "err=%d", err)); + mac = (u8 *)bssid.octet; + } + } + } + if (!wl_get_drv_status(cfg, CONNECTED, dev) || (dhd_is_associated(dhd, NULL, &err) == FALSE)) { WL_ERR(("NOT assoc\n")); if (err == -ERESTARTSYS) @@ -3925,6 +4552,7 @@ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, err = -ENODEV; return err; } + curmacp = wl_read_prof(cfg, dev, WL_PROF_BSSID); if (memcmp(mac, curmacp, ETHER_ADDR_LEN)) { WL_ERR(("Wrong Mac address: "MACDBG" != "MACDBG"\n", MAC2STRDBG(mac), MAC2STRDBG(curmacp))); @@ -3935,10 +4563,28 @@ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, if (err) { WL_ERR(("Could not get rate (%d)\n", err)); } else { +#if defined(USE_DYNAMIC_MAXPKT_RXGLOM) + int rxpktglom; +#endif rate = dtoh32(rate); sinfo->filled |= STATION_INFO_TX_BITRATE; sinfo->txrate.legacy = rate * 5; WL_DBG(("Rate %d Mbps\n", (rate / 2))); +#if defined(USE_DYNAMIC_MAXPKT_RXGLOM) + rxpktglom = ((rate/2) > 150) ? 20 : 10; + + if (maxrxpktglom != rxpktglom) { + maxrxpktglom = rxpktglom; + WL_DBG(("Rate %d Mbps, update bus:maxtxpktglom=%d\n", (rate/2), + maxrxpktglom)); + err = wldev_iovar_setbuf(dev, "bus:maxtxpktglom", + (char*)&maxrxpktglom, 4, cfg->ioctl_buf, + WLC_IOCTL_MAXLEN, NULL); + if (err < 0) { + WL_ERR(("set bus:maxtxpktglom failed, %d\n", err)); + } + } +#endif } memset(&scb_val, 0, sizeof(scb_val)); @@ -3949,7 +4595,7 @@ wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, WL_ERR(("Could not get rssi (%d)\n", err)); goto get_station_err; } - rssi = dtoh32(scb_val.val) + RSSI_OFFSET; + rssi = wl_rssi_offset(dtoh32(scb_val.val)); sinfo->filled |= STATION_INFO_SIGNAL; sinfo->signal = rssi; WL_DBG(("RSSI %d dBm\n", rssi)); @@ -3969,11 +4615,14 @@ get_station_err: if (err && (err != -ERESTARTSYS)) { /* Disconnect due to zero BSSID or error to get RSSI */ WL_ERR(("force cfg80211_disconnected: %d\n", err)); - wl_clr_drv_status(wl, CONNECTED, dev); + wl_clr_drv_status(cfg, CONNECTED, dev); cfg80211_disconnected(dev, 0, NULL, 0, GFP_KERNEL); - wl_link_down(wl); + wl_link_down(cfg); } } + else { + WL_ERR(("Invalid device mode %d\n", wl_get_mode_by_netdev(cfg, dev))); + } return err; } @@ -3984,22 +4633,23 @@ wl_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev, { s32 pm; s32 err = 0; - struct wl_priv *wl = wiphy_priv(wiphy); - struct net_info *_net_info = wl_get_netinfo_by_netdev(wl, dev); - - RETURN_EIO_IF_NOT_UP(wl); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); + struct net_info *_net_info = wl_get_netinfo_by_netdev(cfg, dev); - if (wl->p2p_net == dev || _net_info == NULL || wl->vsdb_mode) { + RETURN_EIO_IF_NOT_UP(cfg); + WL_DBG(("Enter\n")); + if (cfg->p2p_net == dev || _net_info == NULL || cfg->vsdb_mode || + !wl_get_drv_status(cfg, CONNECTED, dev)) { return err; } + /* Delete pm_enable_work */ + wl_add_remove_pm_enable_work(cfg, FALSE, WL_HANDLER_PEND); pm = enabled ? PM_FAST : PM_OFF; - /* Do not enable the power save after assoc if it is p2p interface */ if (_net_info->pm_block) { - /* Do not enable the power save if it is p2p interface or vsdb mode is set */ - WL_DBG(("%s:Do not enable the power save for pm_block %d or vsdb_mode %d\n", - dev->name, _net_info->pm_block, wl->vsdb_mode)); + WL_ERR(("%s:Do not enable the power save for pm_block %d\n", + dev->name, _net_info->pm_block)); pm = PM_OFF; } pm = htod32(pm); @@ -4012,9 +4662,21 @@ wl_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev, WL_ERR(("error (%d)\n", err)); return err; } + wl_cfg80211_update_power_mode(dev); return err; } +void wl_cfg80211_update_power_mode(struct net_device *dev) +{ + int err, pm = -1; + + err = wldev_ioctl(dev, WLC_GET_PM, &pm, sizeof(pm), true); + if (err) + WL_ERR(("%s:error (%d)\n", __FUNCTION__, err)); + else if (pm != -1 && dev->ieee80211_ptr) + dev->ieee80211_ptr->ps = (pm == PM_OFF) ? false : true; +} + static __used u32 wl_find_msb(u16 bit16) { u32 ret = 0; @@ -4044,52 +4706,49 @@ static __used u32 wl_find_msb(u16 bit16) static s32 wl_cfg80211_resume(struct wiphy *wiphy) { - struct wl_priv *wl = wiphy_priv(wiphy); - struct net_device *ndev = wl_to_prmry_ndev(wl); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); + struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg); s32 err = 0; - if (unlikely(!wl_get_drv_status(wl, READY, ndev))) { + if (unlikely(!wl_get_drv_status(cfg, READY, ndev))) { WL_INFO(("device is not ready\n")); return 0; } - wl_invoke_iscan(wl); - return err; } -#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)) || defined(WL_COMPAT_WIRELESS) static s32 wl_cfg80211_suspend(struct wiphy *wiphy, struct cfg80211_wowlan *wow) #else static s32 wl_cfg80211_suspend(struct wiphy *wiphy) #endif { #ifdef DHD_CLEAR_ON_SUSPEND - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); struct net_info *iter, *next; - struct net_device *ndev = wl_to_prmry_ndev(wl); + struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg); unsigned long flags; - if (unlikely(!wl_get_drv_status(wl, READY, ndev))) { + if (unlikely(!wl_get_drv_status(cfg, READY, ndev))) { WL_INFO(("device is not ready : status (%d)\n", - (int)wl->status)); + (int)cfg->status)); return 0; } - for_each_ndev(wl, iter, next) - wl_set_drv_status(wl, SCAN_ABORTING, iter->ndev); - wl_term_iscan(wl); - spin_lock_irqsave(&wl->cfgdrv_lock, flags); - if (wl->scan_request) { - cfg80211_scan_done(wl->scan_request, true); - wl->scan_request = NULL; + for_each_ndev(cfg, iter, next) + wl_set_drv_status(cfg, SCAN_ABORTING, iter->ndev); + spin_lock_irqsave(&cfg->cfgdrv_lock, flags); + if (cfg->scan_request) { + cfg80211_scan_done(cfg->scan_request, true); + cfg->scan_request = NULL; } - for_each_ndev(wl, iter, next) { - wl_clr_drv_status(wl, SCANNING, iter->ndev); - wl_clr_drv_status(wl, SCAN_ABORTING, iter->ndev); + for_each_ndev(cfg, iter, next) { + wl_clr_drv_status(cfg, SCANNING, iter->ndev); + wl_clr_drv_status(cfg, SCAN_ABORTING, iter->ndev); } - spin_unlock_irqrestore(&wl->cfgdrv_lock, flags); - for_each_ndev(wl, iter, next) { - if (wl_get_drv_status(wl, CONNECTING, iter->ndev)) { - wl_bss_connect_done(wl, iter->ndev, NULL, NULL, false); + spin_unlock_irqrestore(&cfg->cfgdrv_lock, flags); + for_each_ndev(cfg, iter, next) { + if (wl_get_drv_status(cfg, CONNECTING, iter->ndev)) { + wl_bss_connect_done(cfg, iter->ndev, NULL, NULL, false); } } #endif /* DHD_CLEAR_ON_SUSPEND */ @@ -4101,8 +4760,8 @@ wl_update_pmklist(struct net_device *dev, struct wl_pmk_list *pmk_list, s32 err) { int i, j; - struct wl_priv *wl = wlcfg_drv_priv; - struct net_device *primary_dev = wl_to_prmry_ndev(wl); + struct bcm_cfg80211 *cfg = g_bcm_cfg; + struct net_device *primary_dev = bcmcfg_to_prmry_ndev(cfg); if (!pmk_list) { printk("pmk_list is NULL\n"); @@ -4127,7 +4786,7 @@ wl_update_pmklist(struct net_device *dev, struct wl_pmk_list *pmk_list, } if (likely(!err)) { err = wldev_iovar_setbuf(dev, "pmkid_info", (char *)pmk_list, - sizeof(*pmk_list), wl->ioctl_buf, WLC_IOCTL_MAXLEN, NULL); + sizeof(*pmk_list), cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync); } return err; @@ -4137,34 +4796,34 @@ static s32 wl_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_pmksa *pmksa) { - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); s32 err = 0; int i; - RETURN_EIO_IF_NOT_UP(wl); - for (i = 0; i < wl->pmk_list->pmkids.npmkid; i++) - if (!memcmp(pmksa->bssid, &wl->pmk_list->pmkids.pmkid[i].BSSID, + RETURN_EIO_IF_NOT_UP(cfg); + for (i = 0; i < cfg->pmk_list->pmkids.npmkid; i++) + if (!memcmp(pmksa->bssid, &cfg->pmk_list->pmkids.pmkid[i].BSSID, ETHER_ADDR_LEN)) break; if (i < WL_NUM_PMKIDS_MAX) { - memcpy(&wl->pmk_list->pmkids.pmkid[i].BSSID, pmksa->bssid, + memcpy(&cfg->pmk_list->pmkids.pmkid[i].BSSID, pmksa->bssid, ETHER_ADDR_LEN); - memcpy(&wl->pmk_list->pmkids.pmkid[i].PMKID, pmksa->pmkid, + memcpy(&cfg->pmk_list->pmkids.pmkid[i].PMKID, pmksa->pmkid, WPA2_PMKID_LEN); - if (i == wl->pmk_list->pmkids.npmkid) - wl->pmk_list->pmkids.npmkid++; + if (i == cfg->pmk_list->pmkids.npmkid) + cfg->pmk_list->pmkids.npmkid++; } else { err = -EINVAL; } WL_DBG(("set_pmksa,IW_PMKSA_ADD - PMKID: %pM =\n", - &wl->pmk_list->pmkids.pmkid[wl->pmk_list->pmkids.npmkid - 1].BSSID)); + &cfg->pmk_list->pmkids.pmkid[cfg->pmk_list->pmkids.npmkid - 1].BSSID)); for (i = 0; i < WPA2_PMKID_LEN; i++) { WL_DBG(("%02x\n", - wl->pmk_list->pmkids.pmkid[wl->pmk_list->pmkids.npmkid - 1]. + cfg->pmk_list->pmkids.pmkid[cfg->pmk_list->pmkids.npmkid - 1]. PMKID[i])); } - err = wl_update_pmklist(dev, wl->pmk_list, err); + err = wl_update_pmklist(dev, cfg->pmk_list, err); return err; } @@ -4173,12 +4832,12 @@ static s32 wl_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_pmksa *pmksa) { - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); struct _pmkid_list pmkid = {0}; s32 err = 0; int i; - RETURN_EIO_IF_NOT_UP(wl); + RETURN_EIO_IF_NOT_UP(cfg); memcpy(&pmkid.pmkid[0].BSSID, pmksa->bssid, ETHER_ADDR_LEN); memcpy(pmkid.pmkid[0].PMKID, pmksa->pmkid, WPA2_PMKID_LEN); @@ -4188,29 +4847,29 @@ wl_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev, WL_DBG(("%02x\n", pmkid.pmkid[0].PMKID[i])); } - for (i = 0; i < wl->pmk_list->pmkids.npmkid; i++) + for (i = 0; i < cfg->pmk_list->pmkids.npmkid; i++) if (!memcmp - (pmksa->bssid, &wl->pmk_list->pmkids.pmkid[i].BSSID, + (pmksa->bssid, &cfg->pmk_list->pmkids.pmkid[i].BSSID, ETHER_ADDR_LEN)) break; - if ((wl->pmk_list->pmkids.npmkid > 0) && - (i < wl->pmk_list->pmkids.npmkid)) { - memset(&wl->pmk_list->pmkids.pmkid[i], 0, sizeof(pmkid_t)); - for (; i < (wl->pmk_list->pmkids.npmkid - 1); i++) { - memcpy(&wl->pmk_list->pmkids.pmkid[i].BSSID, - &wl->pmk_list->pmkids.pmkid[i + 1].BSSID, + if ((cfg->pmk_list->pmkids.npmkid > 0) && + (i < cfg->pmk_list->pmkids.npmkid)) { + memset(&cfg->pmk_list->pmkids.pmkid[i], 0, sizeof(pmkid_t)); + for (; i < (cfg->pmk_list->pmkids.npmkid - 1); i++) { + memcpy(&cfg->pmk_list->pmkids.pmkid[i].BSSID, + &cfg->pmk_list->pmkids.pmkid[i + 1].BSSID, ETHER_ADDR_LEN); - memcpy(&wl->pmk_list->pmkids.pmkid[i].PMKID, - &wl->pmk_list->pmkids.pmkid[i + 1].PMKID, + memcpy(&cfg->pmk_list->pmkids.pmkid[i].PMKID, + &cfg->pmk_list->pmkids.pmkid[i + 1].PMKID, WPA2_PMKID_LEN); } - wl->pmk_list->pmkids.npmkid--; + cfg->pmk_list->pmkids.npmkid--; } else { err = -EINVAL; } - err = wl_update_pmklist(dev, wl->pmk_list, err); + err = wl_update_pmklist(dev, cfg->pmk_list, err); return err; @@ -4219,11 +4878,11 @@ wl_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev, static s32 wl_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_device *dev) { - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); s32 err = 0; - RETURN_EIO_IF_NOT_UP(wl); - memset(wl->pmk_list, 0, sizeof(*wl->pmk_list)); - err = wl_update_pmklist(dev, wl->pmk_list, err); + RETURN_EIO_IF_NOT_UP(cfg); + memset(cfg->pmk_list, 0, sizeof(*cfg->pmk_list)); + err = wl_update_pmklist(dev, cfg->pmk_list, err); return err; } @@ -4269,64 +4928,67 @@ wl_cfg80211_scan_alloc_params(int channel, int nprobes, int *out_params_size) return params; } +#if defined(WL_CFG80211_P2P_DEV_IF) +static s32 +wl_cfg80211_remain_on_channel(struct wiphy *wiphy, bcm_struct_cfgdev *cfgdev, + struct ieee80211_channel *channel, unsigned int duration, u64 *cookie) +#else static s32 -wl_cfg80211_remain_on_channel(struct wiphy *wiphy, struct net_device *dev, +wl_cfg80211_remain_on_channel(struct wiphy *wiphy, bcm_struct_cfgdev *cfgdev, struct ieee80211_channel * channel, enum nl80211_channel_type channel_type, unsigned int duration, u64 *cookie) +#endif /* WL_CFG80211_P2P_DEV_IF */ { s32 target_channel; u32 id; + s32 err = BCME_OK; struct ether_addr primary_mac; struct net_device *ndev = NULL; + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); - s32 err = BCME_OK; - struct wl_priv *wl = wiphy_priv(wiphy); - - WL_DBG(("Enter, ifindex: %d, channel: %d, duration ms (%d) SCANNING ?? %s \n", - dev->ifindex, ieee80211_frequency_to_channel(channel->center_freq), - duration, (wl_get_drv_status(wl, SCANNING, ndev)) ? "YES":"NO")); + ndev = cfgdev_to_wlc_ndev(cfgdev, cfg); - if (wl->p2p_net == dev) { - ndev = wl_to_prmry_ndev(wl); - } else { - ndev = dev; - } + WL_DBG(("Enter, channel: %d, duration ms (%d) SCANNING ?? %s \n", + ieee80211_frequency_to_channel(channel->center_freq), + duration, (wl_get_drv_status(cfg, SCANNING, ndev)) ? "YES":"NO")); - if (!wl->p2p) { - WL_ERR(("wl->p2p is not initialized\n")); + if (!cfg->p2p) { + WL_ERR(("cfg->p2p is not initialized\n")); err = BCME_ERROR; goto exit; } #ifndef WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST - if (wl_get_drv_status_all(wl, SCANNING)) { - wl_notify_escan_complete(wl, wl->escan_info.ndev, true, true); + if (wl_get_drv_status_all(cfg, SCANNING)) { + wl_notify_escan_complete(cfg, cfg->escan_info.ndev, true, true); } #endif /* not WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST */ target_channel = ieee80211_frequency_to_channel(channel->center_freq); - memcpy(&wl->remain_on_chan, channel, sizeof(struct ieee80211_channel)); - wl->remain_on_chan_type = channel_type; - id = ++wl->last_roc_id; + memcpy(&cfg->remain_on_chan, channel, sizeof(struct ieee80211_channel)); +#if defined(WL_ENABLE_P2P_IF) + cfg->remain_on_chan_type = channel_type; +#endif /* WL_ENABLE_P2P_IF */ + id = ++cfg->last_roc_id; if (id == 0) - id = ++wl->last_roc_id; + id = ++cfg->last_roc_id; *cookie = id; #ifdef WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST - if (wl_get_drv_status(wl, SCANNING, ndev)) { + if (wl_get_drv_status(cfg, SCANNING, ndev)) { struct timer_list *_timer; WL_DBG(("scan is running. go to fake listen state\n")); - wl_set_drv_status(wl, FAKE_REMAINING_ON_CHANNEL, ndev); + wl_set_drv_status(cfg, FAKE_REMAINING_ON_CHANNEL, ndev); - if (timer_pending(&wl->p2p->listen_timer)) { + if (timer_pending(&cfg->p2p->listen_timer)) { WL_DBG(("cancel current listen timer \n")); - del_timer_sync(&wl->p2p->listen_timer); + del_timer_sync(&cfg->p2p->listen_timer); } - _timer = &wl->p2p->listen_timer; - wl_clr_p2p_status(wl, LISTEN_EXPIRED); + _timer = &cfg->p2p->listen_timer; + wl_clr_p2p_status(cfg, LISTEN_EXPIRED); INIT_TIMER(_timer, wl_cfgp2p_listen_expired, duration, 0); @@ -4336,45 +4998,45 @@ wl_cfg80211_remain_on_channel(struct wiphy *wiphy, struct net_device *dev, #endif /* WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST */ #ifdef WL_CFG80211_SYNC_GON - if (wl_get_drv_status_all(wl, WAITING_NEXT_ACT_FRM_LISTEN)) { + if (wl_get_drv_status_all(cfg, WAITING_NEXT_ACT_FRM_LISTEN)) { /* do not enter listen mode again if we are in listen mode already for next af. * remain on channel completion will be returned by waiting next af completion. */ #ifdef WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST - wl_set_drv_status(wl, FAKE_REMAINING_ON_CHANNEL, ndev); + wl_set_drv_status(cfg, FAKE_REMAINING_ON_CHANNEL, ndev); #else - wl_set_drv_status(wl, REMAINING_ON_CHANNEL, ndev); + wl_set_drv_status(cfg, REMAINING_ON_CHANNEL, ndev); #endif /* WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST */ goto exit; } #endif /* WL_CFG80211_SYNC_GON */ - if (wl->p2p && !wl->p2p->on) { + if (cfg->p2p && !cfg->p2p->on) { /* In case of p2p_listen command, supplicant send remain_on_channel * without turning on P2P */ - get_primary_mac(wl, &primary_mac); - wl_cfgp2p_generate_bss_mac(&primary_mac, &wl->p2p->dev_addr, &wl->p2p->int_addr); - p2p_on(wl) = true; + get_primary_mac(cfg, &primary_mac); + wl_cfgp2p_generate_bss_mac(&primary_mac, &cfg->p2p->dev_addr, &cfg->p2p->int_addr); + p2p_on(cfg) = true; } - if (p2p_is_on(wl)) { - err = wl_cfgp2p_enable_discovery(wl, ndev, NULL, 0); + if (p2p_is_on(cfg)) { + err = wl_cfgp2p_enable_discovery(cfg, ndev, NULL, 0); if (unlikely(err)) { goto exit; } #ifndef WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST - wl_set_drv_status(wl, REMAINING_ON_CHANNEL, ndev); + wl_set_drv_status(cfg, REMAINING_ON_CHANNEL, ndev); #endif /* not WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST */ - err = wl_cfgp2p_discover_listen(wl, target_channel, duration); + err = wl_cfgp2p_discover_listen(cfg, target_channel, duration); #ifdef WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST if (err == BCME_OK) { - wl_set_drv_status(wl, REMAINING_ON_CHANNEL, ndev); + wl_set_drv_status(cfg, REMAINING_ON_CHANNEL, ndev); } else { /* if failed, firmware may be internal scanning state. * so other scan request shall not abort it */ - wl_set_drv_status(wl, FAKE_REMAINING_ON_CHANNEL, ndev); + wl_set_drv_status(cfg, FAKE_REMAINING_ON_CHANNEL, ndev); } #endif /* WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST */ /* WAR: set err = ok to prevent cookie mismatch in wpa_supplicant @@ -4386,8 +5048,13 @@ wl_cfg80211_remain_on_channel(struct wiphy *wiphy, struct net_device *dev, exit: if (err == BCME_OK) { WL_INFO(("Success\n")); - cfg80211_ready_on_channel(dev, *cookie, channel, +#if defined(WL_CFG80211_P2P_DEV_IF) + cfg80211_ready_on_channel(cfgdev, *cookie, channel, + duration, GFP_KERNEL); +#else + cfg80211_ready_on_channel(cfgdev, *cookie, channel, channel_type, duration, GFP_KERNEL); +#endif /* WL_CFG80211_P2P_DEV_IF */ } else { WL_ERR(("Fail to Set (err=%d cookie:%llu)\n", err, *cookie)); } @@ -4395,11 +5062,18 @@ exit: } static s32 -wl_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, struct net_device *dev, - u64 cookie) +wl_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, + bcm_struct_cfgdev *cfgdev, u64 cookie) { s32 err = 0; - WL_DBG((" enter ) netdev_ifidx: %d \n", dev->ifindex)); + +#if defined(WL_CFG80211_P2P_DEV_IF) + if (cfgdev->iftype == NL80211_IFTYPE_P2P_DEVICE) { + WL_DBG((" enter ) on P2P dedicated discover interface\n")); + } +#else + WL_DBG((" enter ) netdev_ifidx: %d \n", cfgdev->ifindex)); +#endif /* WL_CFG80211_P2P_DEV_IF */ return err; } @@ -4407,82 +5081,97 @@ static void wl_cfg80211_afx_handler(struct work_struct *work) { struct afx_hdl *afx_instance; - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; s32 ret = BCME_OK; afx_instance = container_of(work, struct afx_hdl, work); - if (afx_instance != NULL && wl->afx_hdl->is_active) { - if (wl->afx_hdl->is_listen && wl->afx_hdl->my_listen_chan) { - ret = wl_cfgp2p_discover_listen(wl, wl->afx_hdl->my_listen_chan, - (100 * (1 + (random32() % 3)))); /* 100ms ~ 300ms */ + if (afx_instance != NULL && cfg->afx_hdl->is_active) { + if (cfg->afx_hdl->is_listen && cfg->afx_hdl->my_listen_chan) { + ret = wl_cfgp2p_discover_listen(cfg, cfg->afx_hdl->my_listen_chan, + (100 * (1 + (RANDOM32() % 3)))); /* 100ms ~ 300ms */ } else { - ret = wl_cfgp2p_act_frm_search(wl, wl->afx_hdl->dev, - wl->afx_hdl->bssidx, wl->afx_hdl->peer_listen_chan, + ret = wl_cfgp2p_act_frm_search(cfg, cfg->afx_hdl->dev, + cfg->afx_hdl->bssidx, cfg->afx_hdl->peer_listen_chan, NULL); } if (unlikely(ret != BCME_OK)) { WL_ERR(("ERROR occurred! returned value is (%d)\n", ret)); - if (wl_get_drv_status_all(wl, FINDING_COMMON_CHANNEL)) - complete(&wl->act_frm_scan); + if (wl_get_drv_status_all(cfg, FINDING_COMMON_CHANNEL)) + complete(&cfg->act_frm_scan); } } } static s32 -wl_cfg80211_af_searching_channel(struct wl_priv *wl, struct net_device *dev) +wl_cfg80211_af_searching_channel(struct bcm_cfg80211 *cfg, struct net_device *dev) { u32 max_retry = WL_CHANNEL_SYNC_RETRY; +#ifdef CUSTOMER_HW4 + bool is_p2p_gas = false; +#endif /* CUSTOMER_HW4 */ if (dev == NULL) return -1; WL_DBG((" enter ) \n")); - wl_set_drv_status(wl, FINDING_COMMON_CHANNEL, dev); - wl->afx_hdl->is_active = TRUE; + wl_set_drv_status(cfg, FINDING_COMMON_CHANNEL, dev); + cfg->afx_hdl->is_active = TRUE; +#ifdef CUSTOMER_HW4 + if (cfg->afx_hdl->pending_tx_act_frm) { + wl_action_frame_t *action_frame; + action_frame = &(cfg->afx_hdl->pending_tx_act_frm->action_frame); + if (wl_cfgp2p_is_p2p_gas_action(action_frame->data, action_frame->len)) + is_p2p_gas = true; + } +#endif /* CUSTOMER_HW4 */ /* Loop to wait until we find a peer's channel or the * pending action frame tx is cancelled. */ - while ((wl->afx_hdl->retry < max_retry) && - (wl->afx_hdl->peer_chan == WL_INVALID)) { - wl->afx_hdl->is_listen = FALSE; - wl_set_drv_status(wl, SCANNING, dev); + while ((cfg->afx_hdl->retry < max_retry) && + (cfg->afx_hdl->peer_chan == WL_INVALID)) { + cfg->afx_hdl->is_listen = FALSE; + wl_set_drv_status(cfg, SCANNING, dev); WL_DBG(("Scheduling the action frame for sending.. retry %d\n", - wl->afx_hdl->retry)); + cfg->afx_hdl->retry)); /* search peer on peer's listen channel */ - schedule_work(&wl->afx_hdl->work); - wait_for_completion_timeout(&wl->act_frm_scan, + schedule_work(&cfg->afx_hdl->work); + wait_for_completion_timeout(&cfg->act_frm_scan, msecs_to_jiffies(WL_AF_SEARCH_TIME_MAX)); - if ((wl->afx_hdl->peer_chan != WL_INVALID) || - !(wl_get_drv_status(wl, FINDING_COMMON_CHANNEL, dev))) + if ((cfg->afx_hdl->peer_chan != WL_INVALID) || + !(wl_get_drv_status(cfg, FINDING_COMMON_CHANNEL, dev))) + break; +#ifdef CUSTOMER_HW4 + if (is_p2p_gas) break; +#endif /* CUSTOMER_HW4 */ - if (wl->afx_hdl->my_listen_chan) { + if (cfg->afx_hdl->my_listen_chan) { WL_DBG(("Scheduling Listen peer in my listen channel = %d\n", - wl->afx_hdl->my_listen_chan)); + cfg->afx_hdl->my_listen_chan)); /* listen on my listen channel */ - wl->afx_hdl->is_listen = TRUE; - schedule_work(&wl->afx_hdl->work); - wait_for_completion_timeout(&wl->act_frm_scan, + cfg->afx_hdl->is_listen = TRUE; + schedule_work(&cfg->afx_hdl->work); + wait_for_completion_timeout(&cfg->act_frm_scan, msecs_to_jiffies(WL_AF_SEARCH_TIME_MAX)); } - if ((wl->afx_hdl->peer_chan != WL_INVALID) || - !wl_get_drv_status(wl, FINDING_COMMON_CHANNEL, dev)) + if ((cfg->afx_hdl->peer_chan != WL_INVALID) || + !(wl_get_drv_status(cfg, FINDING_COMMON_CHANNEL, dev))) break; - wl->afx_hdl->retry++; + cfg->afx_hdl->retry++; - WL_AF_TX_KEEP_PRI_CONNECTION_VSDB(wl); + WL_AF_TX_KEEP_PRI_CONNECTION_VSDB(cfg); } - wl->afx_hdl->is_active = FALSE; + cfg->afx_hdl->is_active = FALSE; - wl_clr_drv_status(wl, SCANNING, dev); - wl_clr_drv_status(wl, FINDING_COMMON_CHANNEL, dev); + wl_clr_drv_status(cfg, SCANNING, dev); + wl_clr_drv_status(cfg, FINDING_COMMON_CHANNEL, dev); - return (wl->afx_hdl->peer_chan); + return (cfg->afx_hdl->peer_chan); } struct p2p_config_af_params { @@ -4507,7 +5196,7 @@ wl_cfg80211_config_p2p_pub_af_tx(struct wiphy *wiphy, struct p2p_config_af_params *config_af_params) { s32 err = BCME_OK; - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); wifi_p2p_pub_act_frame_t *act_frm = (wifi_p2p_pub_act_frame_t *) (action_frame->data); @@ -4521,15 +5210,16 @@ wl_cfg80211_config_p2p_pub_af_tx(struct wiphy *wiphy, config_af_params->search_channel = false; config_af_params->max_tx_retry = WL_AF_TX_MAX_RETRY; config_af_params->mpc_onoff = -1; + cfg->next_af_subtype = P2P_PAF_SUBTYPE_INVALID; switch (act_frm->subtype) { case P2P_PAF_GON_REQ: { WL_DBG(("P2P: GO_NEG_PHASE status set \n")); - wl_set_p2p_status(wl, GO_NEG_PHASE); + wl_set_p2p_status(cfg, GO_NEG_PHASE); config_af_params->mpc_onoff = 0; config_af_params->search_channel = true; - wl->next_af_subtype = act_frm->subtype + 1; + cfg->next_af_subtype = act_frm->subtype + 1; /* increase dwell time to wait for RESP frame */ af_params->dwell_time = WL_MED_DWELL_TIME; @@ -4540,16 +5230,15 @@ wl_cfg80211_config_p2p_pub_af_tx(struct wiphy *wiphy, break; } case P2P_PAF_GON_RSP: { - wl->next_af_subtype = act_frm->subtype + 1; + cfg->next_af_subtype = act_frm->subtype + 1; /* increase dwell time to wait for CONF frame */ af_params->dwell_time = WL_MED_DWELL_TIME + 100; - break; } case P2P_PAF_GON_CONF: { /* If we reached till GO Neg confirmation reset the filter */ WL_DBG(("P2P: GO_NEG_PHASE status cleared \n")); - wl_clr_p2p_status(wl, GO_NEG_PHASE); + wl_clr_p2p_status(cfg, GO_NEG_PHASE); /* turn on mpc again if go nego is done */ config_af_params->mpc_onoff = 1; @@ -4559,8 +5248,8 @@ wl_cfg80211_config_p2p_pub_af_tx(struct wiphy *wiphy, #ifdef WL_CFG80211_GON_COLLISION /* if go nego formation done, clear it */ - wl->block_gon_req_tx_count = 0; - wl->block_gon_req_rx_count = 0; + cfg->block_gon_req_tx_count = 0; + cfg->block_gon_req_rx_count = 0; #endif /* WL_CFG80211_GON_COLLISION */ #ifdef WL_CFG80211_SYNC_GON config_af_params->extra_listen = false; @@ -4569,7 +5258,7 @@ wl_cfg80211_config_p2p_pub_af_tx(struct wiphy *wiphy, } case P2P_PAF_INVITE_REQ: { config_af_params->search_channel = true; - wl->next_af_subtype = act_frm->subtype + 1; + cfg->next_af_subtype = act_frm->subtype + 1; /* increase dwell time */ af_params->dwell_time = WL_MED_DWELL_TIME; @@ -4583,9 +5272,12 @@ wl_cfg80211_config_p2p_pub_af_tx(struct wiphy *wiphy, #endif /* WL_CFG80211_SYNC_GON */ break; case P2P_PAF_DEVDIS_REQ: { - config_af_params->search_channel = true; + if (IS_ACTPUB_WITHOUT_GROUP_ID(&act_frm->elts[0], + action_frame->len)) { + config_af_params->search_channel = true; + } - wl->next_af_subtype = act_frm->subtype + 1; + cfg->next_af_subtype = act_frm->subtype + 1; /* maximize dwell time to wait for RESP frame */ af_params->dwell_time = WL_LONG_DWELL_TIME; break; @@ -4598,20 +5290,19 @@ wl_cfg80211_config_p2p_pub_af_tx(struct wiphy *wiphy, #endif /* WL_CFG80211_SYNC_GON */ break; case P2P_PAF_PROVDIS_REQ: { - if (IS_PROV_DISC_WITHOUT_GROUP_ID(&act_frm->elts[0], + if (IS_ACTPUB_WITHOUT_GROUP_ID(&act_frm->elts[0], action_frame->len)) { config_af_params->search_channel = true; } config_af_params->mpc_onoff = 0; - wl->next_af_subtype = act_frm->subtype + 1; + cfg->next_af_subtype = act_frm->subtype + 1; /* increase dwell time to wait for RESP frame */ af_params->dwell_time = WL_MED_DWELL_TIME; break; } case P2P_PAF_PROVDIS_RSP: { - wl->next_af_subtype = P2P_PAF_GON_REQ; - /* increase dwell time to MED level */ + cfg->next_af_subtype = P2P_PAF_GON_REQ; af_params->dwell_time = WL_MIN_DWELL_TIME; #ifdef WL_CFG80211_SYNC_GON config_af_params->extra_listen = false; @@ -4626,13 +5317,56 @@ wl_cfg80211_config_p2p_pub_af_tx(struct wiphy *wiphy, return err; } +#ifdef WL11U +static bool +wl_cfg80211_check_DFS_channel(struct bcm_cfg80211 *cfg, wl_af_params_t *af_params, + void *frame, u16 frame_len) +{ + struct wl_scan_results *bss_list; + struct wl_bss_info *bi = NULL; + bool result = false; + s32 i; + chanspec_t chanspec; + + /* If DFS channel is 52~148, check to block it or not */ + WL_DBG(("af_params->channel=%d\n", af_params->channel)); + if (af_params && + (af_params->channel >= 52 && af_params->channel <= 148)) { + if (!wl_cfgp2p_is_p2p_action(frame, frame_len)) { + WL_DBG(("non p2p action frame\n")); + bss_list = cfg->bss_list; + bi = next_bss(bss_list, bi); + for_each_bss(bss_list, bi, i) { + chanspec = wl_chspec_driver_to_host(bi->chanspec); + WL_DBG(("bi->chanspec=%d, chanspec=%d\n", bi->chanspec, chanspec)); + if (CHSPEC_IS5G(chanspec) && + ((bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(chanspec)) + == af_params->channel)) { + result = true; /* do not block the action frame */ + break; + } + } + } + } + else { + result = true; + } + + WL_DBG(("result=%s", result?"true":"false")); + return result; +} +#endif /* WL11U */ + static bool wl_cfg80211_send_action_frame(struct wiphy *wiphy, struct net_device *dev, - struct net_device *ndev, wl_af_params_t *af_params, + bcm_struct_cfgdev *cfgdev, wl_af_params_t *af_params, wl_action_frame_t *action_frame, u16 action_frame_len, s32 bssidx) { - struct wl_priv *wl = wiphy_priv(wiphy); +#ifdef WL11U + struct net_device *ndev = NULL; +#endif /* WL11U */ + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); bool ack = false; u8 category, action; s32 tx_retry; @@ -4640,15 +5374,21 @@ wl_cfg80211_send_action_frame(struct wiphy *wiphy, struct net_device *dev, #ifdef VSDB ulong off_chan_started_jiffies = 0; #endif - dhd_pub_t *dhd = (dhd_pub_t *)(wl->pub); - + dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub); +#ifdef WL11U +#if defined(WL_CFG80211_P2P_DEV_IF) + ndev = dev; +#else + ndev = ndev_to_cfgdev(cfgdev); +#endif /* WL_CFG80211_P2P_DEV_IF */ +#endif /* WL11U */ category = action_frame->data[DOT11_ACTION_CAT_OFF]; action = action_frame->data[DOT11_ACTION_ACT_OFF]; /* initialize variables */ tx_retry = 0; - wl->next_af_subtype = P2P_PAF_SUBTYPE_INVALID; + cfg->next_af_subtype = P2P_PAF_SUBTYPE_INVALID; config_af_params.max_tx_retry = WL_AF_TX_MAX_RETRY; config_af_params.mpc_onoff = -1; config_af_params.search_channel = false; @@ -4672,10 +5412,10 @@ wl_cfg80211_send_action_frame(struct wiphy *wiphy, struct net_device *dev, #ifdef WL_CFG80211_GON_COLLISION if (config_af_params.drop_tx_req) { - if (wl->block_gon_req_tx_count) { + if (cfg->block_gon_req_tx_count) { /* drop gon req tx action frame */ WL_DBG(("Drop gon req tx action frame: count %d\n", - wl->block_gon_req_tx_count)); + cfg->block_gon_req_tx_count)); goto exit; } } @@ -4689,7 +5429,7 @@ wl_cfg80211_send_action_frame(struct wiphy *wiphy, struct net_device *dev, config_af_params.search_channel = true; /* save next af suptype to cancel remained dwell time */ - wl->next_af_subtype = action + 1; + cfg->next_af_subtype = action + 1; af_params->dwell_time = WL_MED_DWELL_TIME; } else if (action == P2PSD_ACTION_ID_GAS_IRESP || @@ -4709,7 +5449,7 @@ wl_cfg80211_send_action_frame(struct wiphy *wiphy, struct net_device *dev, WL_DBG(("Unknown Frame: category 0x%x, action 0x%x\n", category, action)); if (dhd->op_mode & DHD_FLAG_HOSTAP_MODE) { - wl_clr_drv_status(wl, SENDING_ACT_FRM, dev); + wl_clr_drv_status(cfg, SENDING_ACT_FRM, dev); return false; } } @@ -4721,71 +5461,80 @@ wl_cfg80211_send_action_frame(struct wiphy *wiphy, struct net_device *dev, /* validate channel and p2p ies */ if (config_af_params.search_channel && IS_P2P_SOCIAL(af_params->channel) && - wl_to_p2p_bss_saved_ie(wl, P2PAPI_BSSCFG_DEVICE).p2p_probe_req_ie_len) { + wl_to_p2p_bss_saved_ie(cfg, P2PAPI_BSSCFG_DEVICE).p2p_probe_req_ie_len) { config_af_params.search_channel = true; } else { config_af_params.search_channel = false; } #ifdef WL11U - if (ndev == wl_to_prmry_ndev(wl)) + if (ndev == bcmcfg_to_prmry_ndev(cfg)) config_af_params.search_channel = false; #endif /* WL11U */ #ifdef VSDB /* if connecting on primary iface, sleep for a while before sending af tx for VSDB */ - if (wl_get_drv_status(wl, CONNECTING, wl_to_prmry_ndev(wl))) { - msleep(50); + if (wl_get_drv_status(cfg, CONNECTING, bcmcfg_to_prmry_ndev(cfg))) { + OSL_SLEEP(50); } #endif /* if scan is ongoing, abort current scan. */ - if (wl_get_drv_status_all(wl, SCANNING)) { - wl_notify_escan_complete(wl, wl->escan_info.ndev, true, true); + if (wl_get_drv_status_all(cfg, SCANNING)) { + wl_notify_escan_complete(cfg, cfg->escan_info.ndev, true, true); } +#ifdef WL11U + /* handling DFS channel exceptions */ + if (!wl_cfg80211_check_DFS_channel(cfg, af_params, action_frame->data, action_frame->len)) { + return false; /* the action frame was blocked */ + } +#endif /* WL11U */ + /* set status and destination address before sending af */ - if (wl->next_af_subtype != P2P_PAF_SUBTYPE_INVALID) { + if (cfg->next_af_subtype != P2P_PAF_SUBTYPE_INVALID) { /* set this status to cancel the remained dwell time in rx process */ - wl_set_drv_status(wl, WAITING_NEXT_ACT_FRM, dev); + wl_set_drv_status(cfg, WAITING_NEXT_ACT_FRM, dev); } - wl_set_drv_status(wl, SENDING_ACT_FRM, dev); - memcpy(wl->afx_hdl->tx_dst_addr.octet, + wl_set_drv_status(cfg, SENDING_ACT_FRM, dev); + memcpy(cfg->afx_hdl->tx_dst_addr.octet, af_params->action_frame.da.octet, - sizeof(wl->afx_hdl->tx_dst_addr.octet)); + sizeof(cfg->afx_hdl->tx_dst_addr.octet)); /* save af_params for rx process */ - wl->afx_hdl->pending_tx_act_frm = af_params; + cfg->afx_hdl->pending_tx_act_frm = af_params; /* search peer's channel */ if (config_af_params.search_channel) { /* initialize afx_hdl */ - if (wl_cfgp2p_find_idx(wl, dev, &wl->afx_hdl->bssidx) != BCME_OK) { + if (wl_cfgp2p_find_idx(cfg, dev, &cfg->afx_hdl->bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); goto exit; } - wl->afx_hdl->dev = dev; - wl->afx_hdl->retry = 0; - wl->afx_hdl->peer_chan = WL_INVALID; + cfg->afx_hdl->dev = dev; + cfg->afx_hdl->retry = 0; + cfg->afx_hdl->peer_chan = WL_INVALID; - if (wl_cfg80211_af_searching_channel(wl, dev) == WL_INVALID) { + if (wl_cfg80211_af_searching_channel(cfg, dev) == WL_INVALID) { WL_ERR(("couldn't find peer's channel.\n")); wl_cfgp2p_print_actframe(true, action_frame->data, action_frame->len, af_params->channel); goto exit; } + wl_clr_drv_status(cfg, SCANNING, cfg->afx_hdl->dev); + /* + * 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. + */ + wl_notify_escan_complete(cfg, dev, true, true); /* Suspend P2P discovery's search-listen to prevent it from * starting a scan or changing the channel. */ - wl_clr_drv_status(wl, SCANNING, wl->afx_hdl->dev); -/* Do not abort scan for VSDB. Scan will be aborted in firmware if necessary */ -#ifndef WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST - wl_notify_escan_complete(wl, dev, true, true); -#endif /* not WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST */ - wl_cfgp2p_discover_enable_search(wl, false); + wl_cfgp2p_discover_enable_search(cfg, false); /* update channel */ - af_params->channel = wl->afx_hdl->peer_chan; + af_params->channel = cfg->afx_hdl->peer_chan; } #ifdef VSDB @@ -4795,7 +5544,7 @@ wl_cfg80211_send_action_frame(struct wiphy *wiphy, struct net_device *dev, wl_cfgp2p_print_actframe(true, action_frame->data, action_frame->len, af_params->channel); /* Now send a tx action frame */ - ack = wl_cfgp2p_tx_action_frame(wl, dev, af_params, bssidx) ? false : true; + ack = wl_cfgp2p_tx_action_frame(cfg, dev, af_params, bssidx) ? false : true; /* if failed, retry it. tx_retry_max value is configure by .... */ while ((ack == false) && (tx_retry++ < config_af_params.max_tx_retry)) { @@ -4803,22 +5552,23 @@ wl_cfg80211_send_action_frame(struct wiphy *wiphy, struct net_device *dev, if (af_params->channel) { if (jiffies_to_msecs(jiffies - off_chan_started_jiffies) > OFF_CHAN_TIME_THRESHOLD_MS) { - WL_AF_TX_KEEP_PRI_CONNECTION_VSDB(wl); + WL_AF_TX_KEEP_PRI_CONNECTION_VSDB(cfg); off_chan_started_jiffies = jiffies; - } - else - msleep(40); + } else + OSL_SLEEP(AF_RETRY_DELAY_TIME); } #endif /* VSDB */ - ack = wl_cfgp2p_tx_action_frame(wl, dev, af_params, bssidx) ? + ack = wl_cfgp2p_tx_action_frame(cfg, dev, af_params, bssidx) ? false : true; } + if (ack == false) { WL_ERR(("Failed to send Action Frame(retry %d)\n", tx_retry)); } + WL_DBG(("Complete to send action frame\n")); exit: /* Clear SENDING_ACT_FRM after all sending af is done */ - wl_clr_drv_status(wl, SENDING_ACT_FRM, dev); + wl_clr_drv_status(cfg, SENDING_ACT_FRM, dev); #ifdef WL_CFG80211_SYNC_GON /* WAR: sometimes dongle does not keep the dwell time of 'actframe'. @@ -4827,40 +5577,40 @@ exit: */ if (ack && config_af_params.extra_listen && #ifdef WL_CFG80211_GON_COLLISION - !wl->block_gon_req_tx_count && + !cfg->block_gon_req_tx_count && #endif /* WL_CFG80211_GON_COLLISION */ - wl_get_drv_status_all(wl, WAITING_NEXT_ACT_FRM) && - wl->af_sent_channel == wl->afx_hdl->my_listen_chan) { + wl_get_drv_status_all(cfg, WAITING_NEXT_ACT_FRM) && + cfg->af_sent_channel == cfg->afx_hdl->my_listen_chan) { s32 extar_listen_time; extar_listen_time = af_params->dwell_time - - jiffies_to_msecs(jiffies - wl->af_tx_sent_jiffies); + jiffies_to_msecs(jiffies - cfg->af_tx_sent_jiffies); if (extar_listen_time > 50) { - wl_set_drv_status(wl, WAITING_NEXT_ACT_FRM_LISTEN, dev); + wl_set_drv_status(cfg, WAITING_NEXT_ACT_FRM_LISTEN, dev); WL_DBG(("Wait more time! actual af time:%d," "calculated extar listen:%d\n", af_params->dwell_time, extar_listen_time)); - if (wl_cfgp2p_discover_listen(wl, wl->af_sent_channel, + if (wl_cfgp2p_discover_listen(cfg, cfg->af_sent_channel, extar_listen_time + 100) == BCME_OK) { - wait_for_completion_timeout(&wl->wait_next_af, + wait_for_completion_timeout(&cfg->wait_next_af, msecs_to_jiffies(extar_listen_time + 100 + 300)); } - wl_clr_drv_status(wl, WAITING_NEXT_ACT_FRM_LISTEN, dev); + wl_clr_drv_status(cfg, WAITING_NEXT_ACT_FRM_LISTEN, dev); } } #endif /* WL_CFG80211_SYNC_GON */ - wl_clr_drv_status(wl, WAITING_NEXT_ACT_FRM, dev); + wl_clr_drv_status(cfg, WAITING_NEXT_ACT_FRM, dev); - if (wl->afx_hdl->pending_tx_act_frm) - wl->afx_hdl->pending_tx_act_frm = NULL; + if (cfg->afx_hdl->pending_tx_act_frm) + cfg->afx_hdl->pending_tx_act_frm = NULL; WL_INFO(("-- sending Action Frame is %s, listen chan: %d\n", - (ack) ? "Succeeded!!":"Failed!!", wl->afx_hdl->my_listen_chan)); + (ack) ? "Succeeded!!":"Failed!!", cfg->afx_hdl->my_listen_chan)); #ifdef WL_CFG80211_GON_COLLISION - if (wl->block_gon_req_tx_count) { - wl->block_gon_req_tx_count--; + if (cfg->block_gon_req_tx_count) { + cfg->block_gon_req_tx_count--; /* if ack is ture, supplicant will wait more time(100ms). * so we will return it as a success to get more time . */ @@ -4877,25 +5627,33 @@ exit: } #define MAX_NUM_OF_ASSOCIATED_DEV 64 +#if defined(WL_CFG80211_P2P_DEV_IF) +static s32 +wl_cfg80211_mgmt_tx(struct wiphy *wiphy, bcm_struct_cfgdev *cfgdev, + struct ieee80211_channel *channel, bool offchan, + unsigned int wait, const u8* buf, size_t len, bool no_cck, + bool dont_wait_for_ack, u64 *cookie) +#else static s32 -wl_cfg80211_mgmt_tx(struct wiphy *wiphy, struct net_device *ndev, +wl_cfg80211_mgmt_tx(struct wiphy *wiphy, bcm_struct_cfgdev *cfgdev, struct ieee80211_channel *channel, bool offchan, enum nl80211_channel_type channel_type, bool channel_type_valid, unsigned int wait, const u8* buf, size_t len, -#if 1 //LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0)) || defined(WL_COMPAT_WIRELESS) bool no_cck, #endif -#if 1 //LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)) || defined(WL_COMPAT_WIRELESS) bool dont_wait_for_ack, #endif u64 *cookie) +#endif /* WL_CFG80211_P2P_DEV_IF */ { wl_action_frame_t *action_frame; wl_af_params_t *af_params; scb_val_t scb_val; const struct ieee80211_mgmt *mgmt; - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); struct net_device *dev = NULL; s32 err = BCME_OK; s32 bssidx = 0; @@ -4905,46 +5663,48 @@ wl_cfg80211_mgmt_tx(struct wiphy *wiphy, struct net_device *ndev, WL_DBG(("Enter \n")); - if (ndev == wl->p2p_net) { - dev = wl_to_prmry_ndev(wl); - } else { - /* If TX req is for any valid ifidx. Use as is */ - dev = ndev; - } + dev = cfgdev_to_wlc_ndev(cfgdev, cfg); - /* find bssidx based on ndev */ - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { - WL_ERR(("Find p2p index from ndev(%p) failed\n", dev)); - return BCME_ERROR; + /* set bsscfg idx for iovar (wlan0: P2PAPI_BSSCFG_PRIMARY, p2p: P2PAPI_BSSCFG_DEVICE) */ + if (discover_cfgdev(cfgdev, cfg)) { + bssidx = wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_DEVICE); + } + else { + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { + WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); + return BCME_ERROR; + } } - if (p2p_is_on(wl)) { + + WL_DBG(("TX target bssidx=%d\n", bssidx)); + + if (p2p_is_on(cfg)) { /* Suspend P2P discovery search-listen to prevent it from changing the * channel. */ - if ((err = wl_cfgp2p_discover_enable_search(wl, false)) < 0) { + if ((err = wl_cfgp2p_discover_enable_search(cfg, false)) < 0) { WL_ERR(("Can not disable discovery mode\n")); return -EFAULT; } } *cookie = 0; - id = wl->send_action_id++; + id = cfg->send_action_id++; if (id == 0) - id = wl->send_action_id++; + id = cfg->send_action_id++; *cookie = id; mgmt = (const struct ieee80211_mgmt *)buf; if (ieee80211_is_mgmt(mgmt->frame_control)) { if (ieee80211_is_probe_resp(mgmt->frame_control)) { s32 ie_offset = DOT11_MGMT_HDR_LEN + DOT11_BCN_PRB_FIXED_LEN; s32 ie_len = len - ie_offset; - if (dev == wl_to_prmry_ndev(wl)) - bssidx = wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE); - wl_cfgp2p_set_management_ie(wl, dev, bssidx, + if (dev == bcmcfg_to_prmry_ndev(cfg)) + bssidx = wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_DEVICE); + wl_cfgp2p_set_management_ie(cfg, dev, bssidx, VNDR_IE_PRBRSP_FLAG, (u8 *)(buf + ie_offset), ie_len); - cfg80211_mgmt_tx_status(ndev, *cookie, buf, len, true, GFP_KERNEL); + cfg80211_mgmt_tx_status(cfgdev, *cookie, buf, len, true, GFP_KERNEL); goto exit; } else if (ieee80211_is_disassoc(mgmt->frame_control) || ieee80211_is_deauth(mgmt->frame_control)) { -#ifndef CUSTOMER_HW4 char mac_buf[MAX_NUM_OF_ASSOCIATED_DEV * sizeof(struct ether_addr) + sizeof(uint)] = {0}; int num_associated = 0; @@ -4952,14 +5712,13 @@ wl_cfg80211_mgmt_tx(struct wiphy *wiphy, struct net_device *ndev, if (!bcmp((const uint8 *)BSSID_BROADCAST, (const struct ether_addr *)mgmt->da, ETHER_ADDR_LEN)) { assoc_maclist->count = MAX_NUM_OF_ASSOCIATED_DEV; - err = wldev_ioctl(ndev, WLC_GET_ASSOCLIST, + err = wldev_ioctl(dev, WLC_GET_ASSOCLIST, assoc_maclist, sizeof(mac_buf), false); if (err < 0) WL_ERR(("WLC_GET_ASSOCLIST error %d\n", err)); else num_associated = assoc_maclist->count; } -#endif /* CUSTOMER_HW4 */ memcpy(scb_val.ea.octet, mgmt->da, ETH_ALEN); scb_val.val = mgmt->u.disassoc.reason_code; err = wldev_ioctl(dev, WLC_SCB_DEAUTHENTICATE_FOR_REASON, &scb_val, @@ -4969,12 +5728,11 @@ wl_cfg80211_mgmt_tx(struct wiphy *wiphy, struct net_device *ndev, WL_ERR(("Disconnect STA : %s scb_val.val %d\n", bcm_ether_ntoa((const struct ether_addr *)mgmt->da, eabuf), scb_val.val)); -#ifndef CUSTOMER_HW4 - if (num_associated) { + + if (num_associated > 0 && ETHER_ISBCAST(mgmt->da)) wl_delay(400); - } -#endif /* CUSTOMER_HW4 */ - cfg80211_mgmt_tx_status(ndev, *cookie, buf, len, true, GFP_KERNEL); + + cfg80211_mgmt_tx_status(cfgdev, *cookie, buf, len, true, GFP_KERNEL); goto exit; } else if (ieee80211_is_action(mgmt->frame_control)) { @@ -4989,7 +5747,7 @@ wl_cfg80211_mgmt_tx(struct wiphy *wiphy, struct net_device *ndev, * And previous off-channel action frame must be ended before new af tx. */ #ifndef WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST - wl_notify_escan_complete(wl, dev, true, true); + wl_notify_escan_complete(cfg, dev, true, true); #endif /* not WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST */ } @@ -5024,8 +5782,8 @@ wl_cfg80211_mgmt_tx(struct wiphy *wiphy, struct net_device *ndev, ieee80211_frequency_to_channel(channel->center_freq); /* Save listen_chan for searching common channel */ - wl->afx_hdl->peer_listen_chan = af_params->channel; - WL_DBG(("channel from upper layer %d\n", wl->afx_hdl->peer_listen_chan)); + cfg->afx_hdl->peer_listen_chan = af_params->channel; + WL_DBG(("channel from upper layer %d\n", cfg->afx_hdl->peer_listen_chan)); /* Add the default dwell time * Dwell time to stay off-channel to wait for a response action frame @@ -5035,10 +5793,9 @@ wl_cfg80211_mgmt_tx(struct wiphy *wiphy, struct net_device *ndev, memcpy(action_frame->data, &buf[DOT11_MGMT_HDR_LEN], action_frame->len); - ack = wl_cfg80211_send_action_frame(wiphy, dev, ndev, af_params, + ack = wl_cfg80211_send_action_frame(wiphy, dev, cfgdev, af_params, action_frame, action_frame->len, bssidx); - - cfg80211_mgmt_tx_status(ndev, *cookie, buf, len, ack, GFP_KERNEL); + cfg80211_mgmt_tx_status(cfgdev, *cookie, buf, len, ack, GFP_KERNEL); kfree(af_params); exit: @@ -5047,7 +5804,7 @@ exit: static void -wl_cfg80211_mgmt_frame_register(struct wiphy *wiphy, struct net_device *dev, +wl_cfg80211_mgmt_frame_register(struct wiphy *wiphy, bcm_struct_cfgdev *cfgdev, u16 frame_type, bool reg) { @@ -5065,6 +5822,9 @@ wl_cfg80211_change_bss(struct wiphy *wiphy, struct net_device *dev, struct bss_parameters *params) { + s32 err = 0; + s32 ap_isolate = 0; + if (params->use_cts_prot >= 0) { } @@ -5078,11 +5838,18 @@ wl_cfg80211_change_bss(struct wiphy *wiphy, } if (params->ap_isolate >= 0) { + ap_isolate = params->ap_isolate; + err = wldev_iovar_setint(dev, "ap_isolate", ap_isolate); + if (unlikely(err)) + { + WL_ERR(("set ap_isolate Error (%d)\n", err)); + } } if (params->ht_opmode >= 0) { } + return 0; } @@ -5102,11 +5869,12 @@ wl_cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev, u32 band; u32 bw_cap; } param = {0, 0}; - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); +#ifdef CUSTOM_SET_CPUCORE + dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub); +#endif /* CUSTOM_SET_CPUCORE */ - if (wl->p2p_net == dev) { - dev = wl_to_prmry_ndev(wl); - } + dev = ndev_to_wlc_ndev(dev, cfg); _chan = ieee80211_frequency_to_channel(chan->center_freq); WL_ERR(("netdev_ifidx(%d), chan_type(%d) target channel(%d) \n", dev->ifindex, channel_type, _chan)); @@ -5130,7 +5898,7 @@ wl_cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev, if (chan->band == IEEE80211_BAND_5GHZ) { param.band = WLC_BAND_5G; err = wldev_iovar_getbuf(dev, "bw_cap", ¶m, sizeof(param), - wl->ioctl_buf, WLC_IOCTL_SMLEN, &wl->ioctl_buf_sync); + cfg->ioctl_buf, WLC_IOCTL_SMLEN, &cfg->ioctl_buf_sync); if (err) { if (err != BCME_UNSUPPORTED) { WL_ERR(("bw_cap failed, %d\n", err)); @@ -5144,9 +5912,9 @@ wl_cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev, bw = WL_CHANSPEC_BW_40; } } else { - if (WL_BW_CAP_80MHZ(wl->ioctl_buf[0])) + if (WL_BW_CAP_80MHZ(cfg->ioctl_buf[0])) bw = WL_CHANSPEC_BW_80; - else if (WL_BW_CAP_40MHZ(wl->ioctl_buf[0])) + else if (WL_BW_CAP_40MHZ(cfg->ioctl_buf[0])) bw = WL_CHANSPEC_BW_40; else bw = WL_CHANSPEC_BW_20; @@ -5190,9 +5958,33 @@ change_bw: WL_ERR(("Invalid chanspec 0x%x\n", chspec)); err = BCME_ERROR; } +#ifdef CUSTOM_SET_CPUCORE + if (dhd->op_mode == DHD_FLAG_HOSTAP_MODE) { + WL_DBG(("SoftAP mode do not need to set cpucore\n")); + } else if ((dev == wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_CONNECTION)) && + (chspec & WL_CHANSPEC_BW_80)) { + /* If GO is vht80 */ + dhd->chan_isvht80 |= DHD_FLAG_P2P_MODE; + dhd_set_cpucore(dhd, TRUE); + } +#endif return err; } +#ifdef WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST +struct net_device * +wl_cfg80211_get_remain_on_channel_ndev(struct bcm_cfg80211 *cfg) +{ + struct net_info *_net_info, *next; + list_for_each_entry_safe(_net_info, next, &cfg->net_list, list) { + if (_net_info->ndev && + test_bit(WL_STATUS_REMAINING_ON_CHANNEL, &_net_info->sme_state)) + return _net_info->ndev; + } + return NULL; +} +#endif /* WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST */ + static s32 wl_validate_opensecurity(struct net_device *dev, s32 bssidx) { @@ -5210,6 +6002,7 @@ wl_validate_opensecurity(struct net_device *dev, s32 bssidx) WL_ERR(("wsec error %d\n", err)); return BCME_ERROR; } + /* set upper-layer auth */ err = wldev_iovar_setint_bsscfg(dev, "wpa_auth", WPA_AUTH_NONE, bssidx); if (err < 0) { @@ -5506,6 +6299,7 @@ exit: return 0; } + static s32 wl_cfg80211_bcn_validate_sec( struct net_device *dev, @@ -5513,7 +6307,7 @@ wl_cfg80211_bcn_validate_sec( u32 dev_role, s32 bssidx) { - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; if (dev_role == NL80211_IFTYPE_P2P_GO && (ies->wpa2_ie)) { /* For P2P GO, the sec type is WPA2-PSK */ @@ -5525,47 +6319,48 @@ wl_cfg80211_bcn_validate_sec( WL_DBG(("SoftAP: validating security")); /* If wpa2_ie or wpa_ie is present validate it */ + if ((ies->wpa2_ie || ies->wpa_ie) && ((wl_validate_wpa2ie(dev, ies->wpa2_ie, bssidx) < 0 || wl_validate_wpaie(dev, ies->wpa_ie, bssidx) < 0))) { - wl->ap_info->security_mode = false; + cfg->ap_info->security_mode = false; return BCME_ERROR; } - wl->ap_info->security_mode = true; - if (wl->ap_info->rsn_ie) { - kfree(wl->ap_info->rsn_ie); - wl->ap_info->rsn_ie = NULL; + cfg->ap_info->security_mode = true; + if (cfg->ap_info->rsn_ie) { + kfree(cfg->ap_info->rsn_ie); + cfg->ap_info->rsn_ie = NULL; } - if (wl->ap_info->wpa_ie) { - kfree(wl->ap_info->wpa_ie); - wl->ap_info->wpa_ie = NULL; + if (cfg->ap_info->wpa_ie) { + kfree(cfg->ap_info->wpa_ie); + cfg->ap_info->wpa_ie = NULL; } - if (wl->ap_info->wps_ie) { - kfree(wl->ap_info->wps_ie); - wl->ap_info->wps_ie = NULL; + if (cfg->ap_info->wps_ie) { + kfree(cfg->ap_info->wps_ie); + cfg->ap_info->wps_ie = NULL; } if (ies->wpa_ie != NULL) { /* WPAIE */ - wl->ap_info->rsn_ie = NULL; - wl->ap_info->wpa_ie = kmemdup(ies->wpa_ie, + cfg->ap_info->rsn_ie = NULL; + cfg->ap_info->wpa_ie = kmemdup(ies->wpa_ie, ies->wpa_ie->length + WPA_RSN_IE_TAG_FIXED_LEN, GFP_KERNEL); } else if (ies->wpa2_ie != NULL) { /* RSNIE */ - wl->ap_info->wpa_ie = NULL; - wl->ap_info->rsn_ie = kmemdup(ies->wpa2_ie, + cfg->ap_info->wpa_ie = NULL; + cfg->ap_info->rsn_ie = kmemdup(ies->wpa2_ie, ies->wpa2_ie->len + WPA_RSN_IE_TAG_FIXED_LEN, GFP_KERNEL); } if (!ies->wpa2_ie && !ies->wpa_ie) { wl_validate_opensecurity(dev, bssidx); - wl->ap_info->security_mode = false; + cfg->ap_info->security_mode = false; } if (ies->wps_ie) { - wl->ap_info->wps_ie = kmemdup(ies->wps_ie, ies->wps_ie_len, GFP_KERNEL); + cfg->ap_info->wps_ie = kmemdup(ies->wps_ie, ies->wps_ie_len, GFP_KERNEL); } } @@ -5573,13 +6368,13 @@ wl_cfg80211_bcn_validate_sec( } -#if 1 //LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) || defined(WL_COMPAT_WIRELESS) static s32 wl_cfg80211_bcn_set_params( struct cfg80211_ap_settings *info, struct net_device *dev, u32 dev_role, s32 bssidx) { - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; s32 err = BCME_OK; WL_DBG(("interval (%d) \ndtim_period (%d) \n", @@ -5603,17 +6398,17 @@ static s32 wl_cfg80211_bcn_set_params( if ((info->ssid) && (info->ssid_len > 0) && (info->ssid_len <= 32)) { - WL_DBG(("SSID (%s) len:%d \n", info->ssid, info->ssid_len)); + WL_DBG(("SSID (%s) len:%zd \n", info->ssid, info->ssid_len)); if (dev_role == NL80211_IFTYPE_AP) { /* Store the hostapd SSID */ - memset(wl->hostapd_ssid.SSID, 0x00, 32); - memcpy(wl->hostapd_ssid.SSID, info->ssid, info->ssid_len); - wl->hostapd_ssid.SSID_len = info->ssid_len; + memset(cfg->hostapd_ssid.SSID, 0x00, 32); + memcpy(cfg->hostapd_ssid.SSID, info->ssid, info->ssid_len); + cfg->hostapd_ssid.SSID_len = info->ssid_len; } else { /* P2P GO */ - memset(wl->p2p->ssid.SSID, 0x00, 32); - memcpy(wl->p2p->ssid.SSID, info->ssid, info->ssid_len); - wl->p2p->ssid.SSID_len = info->ssid_len; + memset(cfg->p2p->ssid.SSID, 0x00, 32); + memcpy(cfg->p2p->ssid.SSID, info->ssid, info->ssid_len); + cfg->p2p->ssid.SSID_len = info->ssid_len; } } @@ -5625,7 +6420,7 @@ static s32 wl_cfg80211_bcn_set_params( return err; } -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) */ +#endif /* LINUX_VERSION >= VERSION(3,4,0) || WL_COMPAT_WIRELESS */ static s32 wl_cfg80211_parse_ies(u8 *ptr, u32 len, struct parsed_ies *ies) @@ -5665,12 +6460,15 @@ wl_cfg80211_bcn_bringup_ap( struct parsed_ies *ies, u32 dev_role, s32 bssidx) { - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; struct wl_join_params join_params; bool is_bssup = false; s32 infra = 1; s32 join_params_size = 0; s32 ap = 1; +#ifdef DISABLE_11H_SOFTAP + s32 spect = 0; +#endif /* DISABLE_11H_SOFTAP */ s32 err = BCME_OK; WL_DBG(("Enter dev_role: %d\n", dev_role)); @@ -5688,25 +6486,25 @@ wl_cfg80211_bcn_bringup_ap( goto exit; } - err = wldev_iovar_setbuf_bsscfg(dev, "ssid", &wl->p2p->ssid, - sizeof(wl->p2p->ssid), wl->ioctl_buf, WLC_IOCTL_MAXLEN, - bssidx, &wl->ioctl_buf_sync); + err = wldev_iovar_setbuf_bsscfg(dev, "ssid", &cfg->p2p->ssid, + sizeof(cfg->p2p->ssid), cfg->ioctl_buf, WLC_IOCTL_MAXLEN, + bssidx, &cfg->ioctl_buf_sync); if (err < 0) { WL_ERR(("GO SSID setting error %d\n", err)); goto exit; } /* Do abort scan before creating GO */ - wl_cfg80211_scan_abort(wl); + wl_cfg80211_scan_abort(cfg); - if ((err = wl_cfgp2p_bss(wl, dev, bssidx, 1)) < 0) { + if ((err = wl_cfgp2p_bss(cfg, dev, bssidx, 1)) < 0) { WL_ERR(("GO Bring up error %d\n", err)); goto exit; } } else WL_DBG(("Bss is already up\n")); } else if ((dev_role == NL80211_IFTYPE_AP) && - (wl_get_drv_status(wl, AP_CREATING, dev))) { + (wl_get_drv_status(cfg, AP_CREATING, dev))) { /* Device role SoftAP */ err = wldev_ioctl(dev, WLC_DOWN, &ap, sizeof(s32), true); if (err < 0) { @@ -5722,6 +6520,14 @@ wl_cfg80211_bcn_bringup_ap( WL_ERR(("setting AP mode failed %d \n", err)); goto exit; } +#ifdef DISABLE_11H_SOFTAP + err = wldev_ioctl(dev, WLC_SET_SPECT_MANAGMENT, + &spect, sizeof(s32), true); + if (err < 0) { + WL_ERR(("SET SPECT_MANAGMENT error %d\n", err)); + goto exit; + } +#endif /* DISABLE_11H_SOFTAP */ err = wldev_ioctl(dev, WLC_UP, &ap, sizeof(s32), true); if (unlikely(err)) { @@ -5732,16 +6538,16 @@ wl_cfg80211_bcn_bringup_ap( memset(&join_params, 0, sizeof(join_params)); /* join parameters starts with ssid */ join_params_size = sizeof(join_params.ssid); - memcpy(join_params.ssid.SSID, wl->hostapd_ssid.SSID, - wl->hostapd_ssid.SSID_len); - join_params.ssid.SSID_len = htod32(wl->hostapd_ssid.SSID_len); + memcpy(join_params.ssid.SSID, cfg->hostapd_ssid.SSID, + cfg->hostapd_ssid.SSID_len); + join_params.ssid.SSID_len = htod32(cfg->hostapd_ssid.SSID_len); /* create softap */ if ((err = wldev_ioctl(dev, WLC_SET_SSID, &join_params, join_params_size, true)) == 0) { WL_DBG(("SoftAP set SSID (%s) success\n", join_params.ssid.SSID)); - wl_clr_drv_status(wl, AP_CREATING, dev); - wl_set_drv_status(wl, AP_CREATED, dev); + wl_clr_drv_status(cfg, AP_CREATING, dev); + wl_set_drv_status(cfg, AP_CREATED, dev); } } @@ -5750,7 +6556,7 @@ exit: return err; } -#if 1 //LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) || defined(WL_COMPAT_WIRELESS) s32 wl_cfg80211_parse_ap_ies( struct net_device *dev, @@ -5758,10 +6564,10 @@ wl_cfg80211_parse_ap_ies( struct parsed_ies *ies) { struct parsed_ies prb_ies; - struct wl_priv *wl = wlcfg_drv_priv; - dhd_pub_t *dhd = (dhd_pub_t *)(wl->pub); - u8 *vndr; - u32 vndr_ie_len; + struct bcm_cfg80211 *cfg = g_bcm_cfg; + dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub); + u8 *vndr = NULL; + u32 vndr_ie_len = 0; s32 err = BCME_OK; /* Parse Beacon IEs */ @@ -5772,17 +6578,18 @@ wl_cfg80211_parse_ap_ies( goto fail; } + vndr = (u8 *)info->proberesp_ies; + vndr_ie_len = info->proberesp_ies_len; + if (dhd->op_mode & DHD_FLAG_HOSTAP_MODE) { /* SoftAP mode */ struct ieee80211_mgmt *mgmt; mgmt = (struct ieee80211_mgmt *)info->probe_resp; - vndr = (u8 *)&mgmt->u.probe_resp.variable; - vndr_ie_len = info->probe_resp_len - - offsetof(struct ieee80211_mgmt, u.probe_resp.variable); - } else { - /* Other mode */ - vndr = (u8 *)info->proberesp_ies; - vndr_ie_len = info->proberesp_ies_len; + if (mgmt != NULL) { + vndr = (u8 *)&mgmt->u.probe_resp.variable; + vndr_ie_len = info->probe_resp_len - + offsetof(struct ieee80211_mgmt, u.probe_resp.variable); + } } /* Parse Probe Response IEs */ @@ -5802,14 +6609,14 @@ wl_cfg80211_set_ies( struct cfg80211_beacon_data *info, s32 bssidx) { - struct wl_priv *wl = wlcfg_drv_priv; - dhd_pub_t *dhd = (dhd_pub_t *)(wl->pub); - u8 *vndr; - u32 vndr_ie_len; + struct bcm_cfg80211 *cfg = g_bcm_cfg; + dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub); + u8 *vndr = NULL; + u32 vndr_ie_len = 0; s32 err = BCME_OK; /* Set Beacon IEs to FW */ - if ((err = wl_cfgp2p_set_management_ie(wl, dev, bssidx, + if ((err = wl_cfgp2p_set_management_ie(cfg, dev, bssidx, VNDR_IE_BEACON_FLAG, (u8 *)info->tail, info->tail_len)) < 0) { WL_ERR(("Set Beacon IE Failed \n")); @@ -5817,21 +6624,22 @@ wl_cfg80211_set_ies( WL_DBG(("Applied Vndr IEs for Beacon \n")); } + vndr = (u8 *)info->proberesp_ies; + vndr_ie_len = info->proberesp_ies_len; + if (dhd->op_mode & DHD_FLAG_HOSTAP_MODE) { /* SoftAP mode */ struct ieee80211_mgmt *mgmt; mgmt = (struct ieee80211_mgmt *)info->probe_resp; - vndr = (u8 *)&mgmt->u.probe_resp.variable; - vndr_ie_len = info->probe_resp_len - - offsetof(struct ieee80211_mgmt, u.probe_resp.variable); - } else { - /* Other mode */ - vndr = (u8 *)info->proberesp_ies; - vndr_ie_len = info->proberesp_ies_len; + if (mgmt != NULL) { + vndr = (u8 *)&mgmt->u.probe_resp.variable; + vndr_ie_len = info->probe_resp_len - + offsetof(struct ieee80211_mgmt, u.probe_resp.variable); + } } /* Set Probe Response IEs to FW */ - if ((err = wl_cfgp2p_set_management_ie(wl, dev, bssidx, + if ((err = wl_cfgp2p_set_management_ie(cfg, dev, bssidx, VNDR_IE_PRBRSP_FLAG, vndr, vndr_ie_len)) < 0) { WL_ERR(("Set Probe Resp IE Failed \n")); } else { @@ -5840,7 +6648,7 @@ wl_cfg80211_set_ies( return err; } -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) */ +#endif /* LINUX_VERSION >= VERSION(3,4,0) || WL_COMPAT_WIRELESS */ static s32 wl_cfg80211_hostapd_sec( struct net_device *dev, @@ -5848,60 +6656,61 @@ static s32 wl_cfg80211_hostapd_sec( s32 bssidx) { bool update_bss = 0; - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; if (ies->wps_ie) { - if (wl->ap_info->wps_ie && - memcmp(wl->ap_info->wps_ie, ies->wps_ie, ies->wps_ie_len)) { + if (cfg->ap_info->wps_ie && + memcmp(cfg->ap_info->wps_ie, ies->wps_ie, ies->wps_ie_len)) { WL_DBG((" WPS IE is changed\n")); - kfree(wl->ap_info->wps_ie); - wl->ap_info->wps_ie = kmemdup(ies->wps_ie, ies->wps_ie_len, GFP_KERNEL); - } else if (wl->ap_info->wps_ie == NULL) { + kfree(cfg->ap_info->wps_ie); + cfg->ap_info->wps_ie = kmemdup(ies->wps_ie, ies->wps_ie_len, GFP_KERNEL); + } else if (cfg->ap_info->wps_ie == NULL) { WL_DBG((" WPS IE is added\n")); - wl->ap_info->wps_ie = kmemdup(ies->wps_ie, ies->wps_ie_len, GFP_KERNEL); + cfg->ap_info->wps_ie = kmemdup(ies->wps_ie, ies->wps_ie_len, GFP_KERNEL); } + if ((ies->wpa_ie != NULL || ies->wpa2_ie != NULL)) { - if (!wl->ap_info->security_mode) { + if (!cfg->ap_info->security_mode) { /* change from open mode to security mode */ update_bss = true; if (ies->wpa_ie != NULL) { - wl->ap_info->wpa_ie = kmemdup(ies->wpa_ie, + cfg->ap_info->wpa_ie = kmemdup(ies->wpa_ie, ies->wpa_ie->length + WPA_RSN_IE_TAG_FIXED_LEN, GFP_KERNEL); } else { - wl->ap_info->rsn_ie = kmemdup(ies->wpa2_ie, + cfg->ap_info->rsn_ie = kmemdup(ies->wpa2_ie, ies->wpa2_ie->len + WPA_RSN_IE_TAG_FIXED_LEN, GFP_KERNEL); } - } else if (wl->ap_info->wpa_ie) { + } else if (cfg->ap_info->wpa_ie) { /* change from WPA2 mode to WPA mode */ if (ies->wpa_ie != NULL) { update_bss = true; - kfree(wl->ap_info->rsn_ie); - wl->ap_info->rsn_ie = NULL; - wl->ap_info->wpa_ie = kmemdup(ies->wpa_ie, + kfree(cfg->ap_info->rsn_ie); + cfg->ap_info->rsn_ie = NULL; + cfg->ap_info->wpa_ie = kmemdup(ies->wpa_ie, ies->wpa_ie->length + WPA_RSN_IE_TAG_FIXED_LEN, GFP_KERNEL); - } else if (memcmp(wl->ap_info->rsn_ie, + } else if (memcmp(cfg->ap_info->rsn_ie, ies->wpa2_ie, ies->wpa2_ie->len + WPA_RSN_IE_TAG_FIXED_LEN)) { update_bss = true; - kfree(wl->ap_info->rsn_ie); - wl->ap_info->rsn_ie = kmemdup(ies->wpa2_ie, + kfree(cfg->ap_info->rsn_ie); + cfg->ap_info->rsn_ie = kmemdup(ies->wpa2_ie, ies->wpa2_ie->len + WPA_RSN_IE_TAG_FIXED_LEN, GFP_KERNEL); - wl->ap_info->wpa_ie = NULL; + cfg->ap_info->wpa_ie = NULL; } } if (update_bss) { - wl->ap_info->security_mode = true; - wl_cfgp2p_bss(wl, dev, bssidx, 0); + cfg->ap_info->security_mode = true; + wl_cfgp2p_bss(cfg, dev, bssidx, 0); if (wl_validate_wpa2ie(dev, ies->wpa2_ie, bssidx) < 0 || wl_validate_wpaie(dev, ies->wpa_ie, bssidx) < 0) { return BCME_ERROR; } - wl_cfgp2p_bss(wl, dev, bssidx, 1); + wl_cfgp2p_bss(cfg, dev, bssidx, 1); } } } else { @@ -5910,7 +6719,7 @@ static s32 wl_cfg80211_hostapd_sec( return 0; } -#if 1 //defined(WL_SUPPORT_BACKPORTED_KPATCHES) || (LINUX_VERSION_CODE >= KERNEL_VERSION(3, \ +#if defined(WL_SUPPORT_BACKPORTED_KPATCHES) || (LINUX_VERSION_CODE >= KERNEL_VERSION(3, \ 2, 0)) static s32 wl_cfg80211_del_station( @@ -5919,16 +6728,14 @@ wl_cfg80211_del_station( u8* mac_addr) { struct net_device *dev; - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); scb_val_t scb_val; s8 eabuf[ETHER_ADDR_STR_LEN]; int err; -#ifndef CUSTOMER_HW4 char mac_buf[MAX_NUM_OF_ASSOCIATED_DEV * sizeof(struct ether_addr) + sizeof(uint)] = {0}; struct maclist *assoc_maclist = (struct maclist *)mac_buf; int num_associated = 0; -#endif /* CUSTOMER_HW4 */ WL_DBG(("Entry\n")); if (mac_addr == NULL) { @@ -5936,23 +6743,18 @@ wl_cfg80211_del_station( return 0; } - if (ndev == wl->p2p_net) { - dev = wl_to_prmry_ndev(wl); - } else { - dev = ndev; - } + dev = ndev_to_wlc_ndev(ndev, cfg); - if (p2p_is_on(wl)) { + if (p2p_is_on(cfg)) { /* Suspend P2P discovery search-listen to prevent it from changing the * channel. */ - if ((wl_cfgp2p_discover_enable_search(wl, false)) < 0) { + if ((wl_cfgp2p_discover_enable_search(cfg, false)) < 0) { WL_ERR(("Can not disable discovery mode\n")); return -EFAULT; } } -#ifndef CUSTOMER_HW4 assoc_maclist->count = MAX_NUM_OF_ASSOCIATED_DEV; err = wldev_ioctl(ndev, WLC_GET_ASSOCLIST, assoc_maclist, sizeof(mac_buf), false); @@ -5960,7 +6762,6 @@ wl_cfg80211_del_station( WL_ERR(("WLC_GET_ASSOCLIST error %d\n", err)); else num_associated = assoc_maclist->count; -#endif /* CUSTOMER_HW4 */ memcpy(scb_val.ea.octet, mac_addr, ETHER_ADDR_LEN); scb_val.val = DOT11_RC_DEAUTH_LEAVING; @@ -5971,48 +6772,91 @@ wl_cfg80211_del_station( WL_ERR(("Disconnect STA : %s scb_val.val %d\n", bcm_ether_ntoa((const struct ether_addr *)mac_addr, eabuf), scb_val.val)); -#ifndef CUSTOMER_HW4 - if (num_associated) + + if (num_associated > 0 && ETHER_ISBCAST(mac_addr)) wl_delay(400); -#endif /* CUSTOMER_HW4 */ + return 0; } + +static s32 +wl_cfg80211_change_station( + struct wiphy *wiphy, + struct net_device *dev, + u8 *mac, + struct station_parameters *params) +{ + int err; + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); + struct net_device *primary_ndev = bcmcfg_to_prmry_ndev(cfg); + + /* Processing only authorize/de-authorize flag for now */ + if (!(params->sta_flags_mask & BIT(NL80211_STA_FLAG_AUTHORIZED))) + return -ENOTSUPP; + + if (!(params->sta_flags_set & BIT(NL80211_STA_FLAG_AUTHORIZED))) { + err = wldev_ioctl(primary_ndev, WLC_SCB_DEAUTHORIZE, mac, ETH_ALEN, true); + if (err) + WL_ERR(("WLC_SCB_DEAUTHORIZE error (%d)\n", err)); + return err; + } + + err = wldev_ioctl(primary_ndev, WLC_SCB_AUTHORIZE, mac, ETH_ALEN, true); + if (err) + WL_ERR(("WLC_SCB_AUTHORIZE error (%d)\n", err)); + return err; +} #endif /* WL_SUPPORT_BACKPORTED_KPATCHES || KERNEL_VER >= KERNEL_VERSION(3, 2, 0)) */ -#if 1 //LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) || defined(WL_COMPAT_WIRELESS) static s32 wl_cfg80211_start_ap( struct wiphy *wiphy, struct net_device *dev, struct cfg80211_ap_settings *info) { - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); s32 err = BCME_OK; struct parsed_ies ies; s32 bssidx = 0; u32 dev_role = 0; WL_DBG(("Enter \n")); - if (dev == wl_to_prmry_ndev(wl)) { + if (dev == bcmcfg_to_prmry_ndev(cfg)) { WL_DBG(("Start AP req on primary iface: Softap\n")); dev_role = NL80211_IFTYPE_AP; - } else if (dev == wl->p2p_net) { + } +#if defined(WL_ENABLE_P2P_IF) + else if (dev == cfg->p2p_net) { /* Group Add request on p2p0 */ WL_DBG(("Start AP req on P2P iface: GO\n")); - dev = wl_to_prmry_ndev(wl); + dev = bcmcfg_to_prmry_ndev(cfg); dev_role = NL80211_IFTYPE_P2P_GO; } - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { +#endif /* WL_ENABLE_P2P_IF */ + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } - if (p2p_is_on(wl) && - (bssidx == wl_to_p2p_bss_bssidx(wl, + if (p2p_is_on(cfg) && + (bssidx == wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_CONNECTION))) { dev_role = NL80211_IFTYPE_P2P_GO; WL_DBG(("Start AP req on P2P connection iface\n")); } + if (!check_dev_role_integrity(cfg, dev_role)) + goto fail; + +#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) && !defined(WL_COMPAT_WIRELESS)) + if ((err = wl_cfg80211_set_channel(wiphy, dev, + dev->ieee80211_ptr->preset_chandef.chan, + NL80211_CHAN_HT20) < 0)) { + WL_ERR(("Set channel failed \n")); + goto fail; + } +#endif /* ((LINUX_VERSION >= VERSION(3, 6, 0) && !WL_COMPAT_WIRELESS) */ + if ((err = wl_cfg80211_bcn_set_params(info, dev, dev_role, bssidx)) < 0) { WL_ERR(("Beacon params set failed \n")); @@ -6020,8 +6864,8 @@ wl_cfg80211_start_ap( } /* Parse IEs */ - if ((err = wl_cfg80211_parse_ap_ies(dev, &info->beacon, &ies) < 0)) { - WL_ERR(("Parse IEs failed \n")); + if ((err = wl_cfg80211_parse_ap_ies(dev, &info->beacon, &ies)) < 0) { + WL_ERR(("Set IEs failed \n")); goto fail; } @@ -6041,7 +6885,7 @@ wl_cfg80211_start_ap( WL_DBG(("** AP/GO Created **\n")); /* Set IEs to FW */ - if ((err = wl_cfg80211_set_ies(dev, &info->beacon, bssidx) < 0)) + if ((err = wl_cfg80211_set_ies(dev, &info->beacon, bssidx)) < 0) WL_ERR(("Set IEs failed \n")); fail: @@ -6063,38 +6907,44 @@ wl_cfg80211_stop_ap( int infra = 0; int ap = 0; s32 bssidx = 0; - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); WL_DBG(("Enter \n")); - if (dev == wl_to_prmry_ndev(wl)) { + if (dev == bcmcfg_to_prmry_ndev(cfg)) { dev_role = NL80211_IFTYPE_AP; - } else if (dev == wl->p2p_net) { + } +#if defined(WL_ENABLE_P2P_IF) + else if (dev == cfg->p2p_net) { /* Group Add request on p2p0 */ - dev = wl_to_prmry_ndev(wl); + dev = bcmcfg_to_prmry_ndev(cfg); dev_role = NL80211_IFTYPE_P2P_GO; } - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { +#endif /* WL_ENABLE_P2P_IF */ + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } - if (p2p_is_on(wl) && - (bssidx == wl_to_p2p_bss_bssidx(wl, + if (p2p_is_on(cfg) && + (bssidx == wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_CONNECTION))) { dev_role = NL80211_IFTYPE_P2P_GO; } + if (!check_dev_role_integrity(cfg, dev_role)) + goto exit; + if (dev_role == NL80211_IFTYPE_AP) { /* SoftAp on primary Interface. * Shut down AP and turn on MPC */ - err = wldev_ioctl(dev, WLC_SET_INFRA, &infra, sizeof(s32), true); - if (err < 0) { - WL_ERR(("SET INFRA error %d\n", err)); + if ((err = wldev_ioctl(dev, WLC_SET_AP, &ap, sizeof(s32), true)) < 0) { + WL_ERR(("setting AP mode failed %d \n", err)); err = -ENOTSUPP; goto exit; } - if ((err = wldev_ioctl(dev, WLC_SET_AP, &ap, sizeof(s32), true)) < 0) { - WL_ERR(("setting AP mode failed %d \n", err)); + err = wldev_ioctl(dev, WLC_SET_INFRA, &infra, sizeof(s32), true); + if (err < 0) { + WL_ERR(("SET INFRA error %d\n", err)); err = -ENOTSUPP; goto exit; } @@ -6106,11 +6956,21 @@ wl_cfg80211_stop_ap( goto exit; } - wl_clr_drv_status(wl, AP_CREATED, dev); + wl_clr_drv_status(cfg, AP_CREATED, dev); /* Turn on the MPC */ wldev_iovar_setint(dev, "mpc", 1); + if (cfg->ap_info) { + kfree(cfg->ap_info->wpa_ie); + kfree(cfg->ap_info->rsn_ie); + kfree(cfg->ap_info->wps_ie); + kfree(cfg->ap_info); + cfg->ap_info = NULL; + } } else { WL_DBG(("Stopping P2P GO \n")); + DHD_OS_WAKE_LOCK_CTRL_TIMEOUT_ENABLE((dhd_pub_t *)(cfg->pub), + DHD_EVENT_TIMEOUT_MS*3); + DHD_OS_WAKE_LOCK_TIMEOUT((dhd_pub_t *)(cfg->pub)); } exit: @@ -6124,38 +6984,44 @@ wl_cfg80211_change_beacon( struct cfg80211_beacon_data *info) { s32 err = BCME_OK; - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); struct parsed_ies ies; u32 dev_role = 0; s32 bssidx = 0; WL_DBG(("Enter \n")); - if (dev == wl_to_prmry_ndev(wl)) { + if (dev == bcmcfg_to_prmry_ndev(cfg)) { dev_role = NL80211_IFTYPE_AP; - } else if (dev == wl->p2p_net) { + } +#if defined(WL_ENABLE_P2P_IF) + else if (dev == cfg->p2p_net) { /* Group Add request on p2p0 */ - dev = wl_to_prmry_ndev(wl); + dev = bcmcfg_to_prmry_ndev(cfg); dev_role = NL80211_IFTYPE_P2P_GO; } - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { +#endif /* WL_ENABLE_P2P_IF */ + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } - if (p2p_is_on(wl) && - (bssidx == wl_to_p2p_bss_bssidx(wl, + if (p2p_is_on(cfg) && + (bssidx == wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_CONNECTION))) { dev_role = NL80211_IFTYPE_P2P_GO; } + if (!check_dev_role_integrity(cfg, dev_role)) + goto fail; + /* Parse IEs */ - if ((err = wl_cfg80211_parse_ap_ies(dev, info, &ies) < 0)) { + if ((err = wl_cfg80211_parse_ap_ies(dev, info, &ies)) < 0) { WL_ERR(("Parse IEs failed \n")); goto fail; } /* Set IEs to FW */ - if ((err = wl_cfg80211_set_ies(dev, info, bssidx) < 0)) { + if ((err = wl_cfg80211_set_ies(dev, info, bssidx)) < 0) { WL_ERR(("Set IEs failed \n")); goto fail; } @@ -6171,13 +7037,13 @@ wl_cfg80211_change_beacon( fail: return err; } -#else /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) */ +#else static s32 wl_cfg80211_add_set_beacon(struct wiphy *wiphy, struct net_device *dev, struct beacon_parameters *info) { s32 err = BCME_OK; - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); s32 ie_offset = 0; s32 bssidx = 0; u32 dev_role = NL80211_IFTYPE_AP; @@ -6187,23 +7053,29 @@ wl_cfg80211_add_set_beacon(struct wiphy *wiphy, struct net_device *dev, WL_DBG(("interval (%d) dtim_period (%d) head_len (%d) tail_len (%d)\n", info->interval, info->dtim_period, info->head_len, info->tail_len)); - if (dev == wl_to_prmry_ndev(wl)) { + if (dev == bcmcfg_to_prmry_ndev(cfg)) { dev_role = NL80211_IFTYPE_AP; - } else if (dev == wl->p2p_net) { + } +#if defined(WL_ENABLE_P2P_IF) + else if (dev == cfg->p2p_net) { /* Group Add request on p2p0 */ - dev = wl_to_prmry_ndev(wl); + dev = bcmcfg_to_prmry_ndev(cfg); dev_role = NL80211_IFTYPE_P2P_GO; } - if (wl_cfgp2p_find_idx(wl, dev, &bssidx) != BCME_OK) { +#endif /* WL_ENABLE_P2P_IF */ + if (wl_cfgp2p_find_idx(cfg, dev, &bssidx) != BCME_OK) { WL_ERR(("Find p2p index from dev(%p) failed\n", dev)); return BCME_ERROR; } - if (p2p_is_on(wl) && - (bssidx == wl_to_p2p_bss_bssidx(wl, + if (p2p_is_on(cfg) && + (bssidx == wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_CONNECTION))) { dev_role = NL80211_IFTYPE_P2P_GO; } + if (!check_dev_role_integrity(cfg, dev_role)) + goto fail; + ie_offset = DOT11_MGMT_HDR_LEN + DOT11_BCN_PRB_FIXED_LEN; /* find the SSID */ if ((ssid_ie = bcm_parse_tlvs((u8 *)&info->head[ie_offset], @@ -6211,14 +7083,14 @@ wl_cfg80211_add_set_beacon(struct wiphy *wiphy, struct net_device *dev, DOT11_MNG_SSID_ID)) != NULL) { if (dev_role == NL80211_IFTYPE_AP) { /* Store the hostapd SSID */ - memset(&wl->hostapd_ssid.SSID[0], 0x00, 32); - memcpy(&wl->hostapd_ssid.SSID[0], ssid_ie->data, ssid_ie->len); - wl->hostapd_ssid.SSID_len = ssid_ie->len; + memset(&cfg->hostapd_ssid.SSID[0], 0x00, 32); + memcpy(&cfg->hostapd_ssid.SSID[0], ssid_ie->data, ssid_ie->len); + cfg->hostapd_ssid.SSID_len = ssid_ie->len; } else { /* P2P GO */ - memset(&wl->p2p->ssid.SSID[0], 0x00, 32); - memcpy(wl->p2p->ssid.SSID, ssid_ie->data, ssid_ie->len); - wl->p2p->ssid.SSID_len = ssid_ie->len; + memset(&cfg->p2p->ssid.SSID[0], 0x00, 32); + memcpy(cfg->p2p->ssid.SSID, ssid_ie->data, ssid_ie->len); + cfg->p2p->ssid.SSID_len = ssid_ie->len; } } @@ -6229,7 +7101,7 @@ wl_cfg80211_add_set_beacon(struct wiphy *wiphy, struct net_device *dev, goto fail; } - if (wl_cfgp2p_set_management_ie(wl, dev, bssidx, + if (wl_cfgp2p_set_management_ie(cfg, dev, bssidx, VNDR_IE_BEACON_FLAG, (u8 *)info->tail, info->tail_len) < 0) { WL_ERR(("Beacon set IEs failed \n")); @@ -6265,7 +7137,7 @@ wl_cfg80211_add_set_beacon(struct wiphy *wiphy, struct net_device *dev, goto fail; } - if (wl_get_drv_status(wl, AP_CREATED, dev)) { + if (wl_get_drv_status(cfg, AP_CREATED, dev)) { /* Soft AP already running. Update changed params */ if (wl_cfg80211_hostapd_sec(dev, &ies, bssidx) < 0) { WL_ERR(("Hostapd update sec failed \n")); @@ -6292,13 +7164,14 @@ fail: return err; } -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) */ +#endif /* LINUX_VERSION < VERSION(3,4,0) || WL_COMPAT_WIRELESS */ #ifdef WL_SCHED_SCAN #define PNO_TIME 30 #define PNO_REPEAT 4 #define PNO_FREQ_EXPO_MAX 2 -int wl_cfg80211_sched_scan_start(struct wiphy *wiphy, +static int +wl_cfg80211_sched_scan_start(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_sched_scan_request *request) { @@ -6306,7 +7179,7 @@ int wl_cfg80211_sched_scan_start(struct wiphy *wiphy, int pno_repeat = PNO_REPEAT; int pno_freq_expo_max = PNO_FREQ_EXPO_MAX; wlc_ssid_t ssids_local[MAX_PFN_LIST_COUNT]; - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); struct cfg80211_ssid *ssid = NULL; int ssid_count = 0; int i; @@ -6349,18 +7222,12 @@ int wl_cfg80211_sched_scan_start(struct wiphy *wiphy, } if (ssid_count) { - if ((ret = dhd_dev_pno_set(dev, ssids_local, request->n_match_sets, - pno_time, pno_repeat, pno_freq_expo_max)) < 0) { + if ((ret = dhd_dev_pno_set_for_ssid(dev, ssids_local, request->n_match_sets, + pno_time, pno_repeat, pno_freq_expo_max, NULL, 0)) < 0) { WL_ERR(("PNO setup failed!! ret=%d \n", ret)); return -EINVAL; } - - /* Enable the PNO */ - if (dhd_dev_pno_enable(dev, 1) < 0) { - WL_ERR(("PNO enable failed!! ret=%d \n", ret)); - return -EINVAL; - } - wl->sched_scan_req = request; + cfg->sched_scan_req = request; } else { return -EINVAL; } @@ -6368,26 +7235,24 @@ int wl_cfg80211_sched_scan_start(struct wiphy *wiphy, return 0; } -int wl_cfg80211_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev) +static int +wl_cfg80211_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev) { - struct wl_priv *wl = wiphy_priv(wiphy); + struct bcm_cfg80211 *cfg = wiphy_priv(wiphy); WL_DBG(("Enter \n")); WL_PNO((">>> SCHED SCAN STOP\n")); - if (dhd_dev_pno_enable(dev, 0) < 0) - WL_ERR(("PNO disable failed")); - - if (dhd_dev_pno_reset(dev) < 0) - WL_ERR(("PNO reset failed")); + if (dhd_dev_pno_stop_for_ssid(dev) < 0) + WL_ERR(("PNO Stop for SSID failed")); - if (wl->scan_request && wl->sched_scan_running) { + if (cfg->scan_request && cfg->sched_scan_running) { WL_PNO((">>> Sched scan running. Aborting it..\n")); - wl_notify_escan_complete(wl, dev, true, true); + wl_notify_escan_complete(cfg, dev, true, true); } - wl->sched_scan_req = NULL; - wl->sched_scan_running = FALSE; + cfg->sched_scan_req = NULL; + cfg->sched_scan_running = FALSE; return 0; } @@ -6397,6 +7262,10 @@ static struct cfg80211_ops wl_cfg80211_ops = { .add_virtual_intf = wl_cfg80211_add_virtual_iface, .del_virtual_intf = wl_cfg80211_del_virtual_iface, .change_virtual_intf = wl_cfg80211_change_virtual_iface, +#if defined(WL_CFG80211_P2P_DEV_IF) + .start_p2p_device = wl_cfgp2p_start_p2p_device, + .stop_p2p_device = wl_cfgp2p_stop_p2p_device, +#endif /* WL_CFG80211_P2P_DEV_IF */ .scan = wl_cfg80211_scan, .set_wiphy_params = wl_cfg80211_set_wiphy_params, .join_ibss = wl_cfg80211_join_ibss, @@ -6422,27 +7291,31 @@ static struct cfg80211_ops wl_cfg80211_ops = { .mgmt_tx = wl_cfg80211_mgmt_tx, .mgmt_frame_register = wl_cfg80211_mgmt_frame_register, .change_bss = wl_cfg80211_change_bss, +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)) || defined(WL_COMPAT_WIRELESS) .set_channel = wl_cfg80211_set_channel, -#if 0 //LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) +#endif /* ((LINUX_VERSION < VERSION(3, 6, 0)) || WL_COMPAT_WIRELESS */ +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)) && !defined(WL_COMPAT_WIRELESS) .set_beacon = wl_cfg80211_add_set_beacon, .add_beacon = wl_cfg80211_add_set_beacon, #else .change_beacon = wl_cfg80211_change_beacon, .start_ap = wl_cfg80211_start_ap, .stop_ap = wl_cfg80211_stop_ap, -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) */ +#endif /* LINUX_VERSION < KERNEL_VERSION(3,4,0) && !WL_COMPAT_WIRELESS */ #ifdef WL_SCHED_SCAN .sched_scan_start = wl_cfg80211_sched_scan_start, .sched_scan_stop = wl_cfg80211_sched_scan_stop, -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) */ -#if 1 //defined(WL_SUPPORT_BACKPORTED_KPATCHES) || (LINUX_VERSION_CODE >= KERNEL_VERSION(3, \ +#endif /* WL_SCHED_SCAN */ +#if defined(WL_SUPPORT_BACKPORTED_KPATCHES) || (LINUX_VERSION_CODE >= KERNEL_VERSION(3, \ 2, 0)) .del_station = wl_cfg80211_del_station, + .change_station = wl_cfg80211_change_station, .mgmt_tx_cancel_wait = wl_cfg80211_mgmt_tx_cancel_wait, #endif /* WL_SUPPORT_BACKPORTED_KPATCHES || KERNEL_VERSION >= (3,2,0) */ -#if 1 //LINUX_VERSION_CODE > KERNEL_VERSION(3, 2, 0) - .tdls_oper = wl_cfg80211_tdls_oper -#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(3, 2, 0) */ +#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 2, 0)) || defined(WL_COMPAT_WIRELESS) + .tdls_oper = wl_cfg80211_tdls_oper, +#endif /* LINUX_VERSION > VERSION(3, 2, 0) || WL_COMPAT_WIRELESS */ + CFG80211_TESTMODE_CMD(dhd_cfg80211_testmode_cmd) }; s32 wl_mode_to_nl80211_iftype(s32 mode) @@ -6463,11 +7336,23 @@ s32 wl_mode_to_nl80211_iftype(s32 mode) return err; } -static s32 wl_setup_wiphy(struct wireless_dev *wdev, struct device *sdiofunc_dev) + +static s32 wl_setup_wiphy(struct wireless_dev *wdev, struct device *sdiofunc_dev, void *context) { s32 err = 0; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) || defined(WL_COMPAT_WIRELESS)) + dhd_pub_t *dhd = (dhd_pub_t *)context; + BCM_REFERENCE(dhd); + + if (!dhd) { + WL_ERR(("DHD is NULL!!")); + err = -ENODEV; + return err; + } +#endif + wdev->wiphy = - wiphy_new(&wl_cfg80211_ops, sizeof(struct wl_priv)); + wiphy_new(&wl_cfg80211_ops, sizeof(struct bcm_cfg80211)); if (unlikely(!wdev->wiphy)) { WL_ERR(("Couldn not allocate wiphy device\n")); err = -ENOMEM; @@ -6486,11 +7371,27 @@ static s32 wl_setup_wiphy(struct wireless_dev *wdev, struct device *sdiofunc_dev #endif /* WL_SCHED_SCAN */ wdev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) -#if !(defined(WLP2P) && defined(WL_ENABLE_P2P_IF)) + | BIT(NL80211_IFTYPE_ADHOC) +#if !defined(WL_ENABLE_P2P_IF) | BIT(NL80211_IFTYPE_MONITOR) -#endif +#endif /* !WL_ENABLE_P2P_IF */ +#if defined(WL_IFACE_COMB_NUM_CHANNELS) || defined(WL_CFG80211_P2P_DEV_IF) + | BIT(NL80211_IFTYPE_P2P_CLIENT) + | BIT(NL80211_IFTYPE_P2P_GO) +#endif /* WL_IFACE_COMB_NUM_CHANNELS || WL_CFG80211_P2P_DEV_IF */ +#if defined(WL_CFG80211_P2P_DEV_IF) + | BIT(NL80211_IFTYPE_P2P_DEVICE) +#endif /* WL_CFG80211_P2P_DEV_IF */ | BIT(NL80211_IFTYPE_AP); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) && \ + (defined(WL_IFACE_COMB_NUM_CHANNELS) || defined(WL_CFG80211_P2P_DEV_IF)) + WL_DBG(("Setting interface combinations for common mode\n")); + wdev->wiphy->iface_combinations = common_iface_combinations; + wdev->wiphy->n_iface_combinations = + ARRAY_SIZE(common_iface_combinations); +#endif /* LINUX_VER >= 3.0 && (WL_IFACE_COMB_NUM_CHANNELS || WL_CFG80211_P2P_DEV_IF) */ + wdev->wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz; wdev->wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM; @@ -6505,88 +7406,121 @@ static s32 wl_setup_wiphy(struct wireless_dev *wdev, struct device *sdiofunc_dev #endif /* !WL_POWERSAVE_DISABLED */ wdev->wiphy->flags |= WIPHY_FLAG_NETNS_OK | WIPHY_FLAG_4ADDR_AP | -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39) +#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && !defined(WL_COMPAT_WIRELESS) WIPHY_FLAG_SUPPORTS_SEPARATE_DEFAULT_KEYS | #endif WIPHY_FLAG_4ADDR_STATION; - /* If driver advertises FW_ROAM, the supplicant wouldn't - * send the BSSID & Freq in the connect command allowing the - * the driver to choose the AP to connect to. But unless we - * support ROAM_CACHE in firware this will delay the ASSOC as - * as the FW need to do a full scan before attempting to connect - * So that feature will just increase assoc. The better approach - * to let Supplicant to provide channel info and FW letter may roam - * if needed so DON'T advertise that featur eto Supplicant. +#if (defined(ROAM_ENABLE) || defined(BCMFW_ROAM_ENABLE)) && ((LINUX_VERSION_CODE >= \ + KERNEL_VERSION(3, 2, 0)) || defined(WL_COMPAT_WIRELESS)) && !defined(CUSTOMER_HW4) + /* Please use supplicant ver >= 76 if FW_ROAM is enabled + * If driver advertises FW_ROAM, older supplicant wouldn't + * send the BSSID & Freq in the connect req command. This + * will delay the ASSOC as the FW need to do a full scan + * before attempting to connect. Supplicant >=76 has patch + * to allow bssid & freq to be sent down to driver even if + * FW ROAM is advertised. */ -#if 1 //LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) -/* wdev->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM; */ -#endif -#if 1 //LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) + wdev->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM; +#endif /* ROAM_ENABLE && (LINUX_VERSION 3.2.0 || WL_COMPAT_WIRELESS) && !CUSTOMER_HW4 */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)) || defined(WL_COMPAT_WIRELESS) wdev->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL | WIPHY_FLAG_OFFCHAN_TX; #endif -#if 1 //defined(WL_SUPPORT_BACKPORTED_KPATCHES) || (LINUX_VERSION_CODE >= KERNEL_VERSION(3, \ +#if defined(WL_SUPPORT_BACKPORTED_KPATCHES) || (LINUX_VERSION_CODE >= KERNEL_VERSION(3, \ 4, 0)) - /* From 3.4 kernel ownards AP_SME flag can be advertised - * to remove the patch from supplicant - */ - wdev->wiphy->flags |= WIPHY_FLAG_HAVE_AP_SME; -#if 1 //(LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) - /* Supplicant distinguish between the SoftAP mode and other - * modes (e.g. P2P, WPS, HS2.0) when it builds the probe - * response frame from Supplicant MR1 and Kernel 3.4.0 or - * later version. To add Vendor specific IE into the - * probe response frame in case of SoftAP mode, - * AP_PROBE_RESP_OFFLOAD flag is set to wiphy->flags variable. - */ - if (strstr(fw_path, "_apsta") != NULL) { - wdev->wiphy->flags |= WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD; - wdev->wiphy->probe_resp_offload = 0; - } -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) */ + /* From 3.4 kernel ownards AP_SME flag can be advertised + * to remove the patch from supplicant + */ + wdev->wiphy->flags |= WIPHY_FLAG_HAVE_AP_SME; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) || defined(WL_COMPAT_WIRELESS)) + /* Supplicant distinguish between the SoftAP mode and other + * modes (e.g. P2P, WPS, HS2.0) when it builds the probe + * response frame from Supplicant MR1 and Kernel 3.4.0 or + * later version. To add Vendor specific IE into the + * probe response frame in case of SoftAP mode, + * AP_PROBE_RESP_OFFLOAD flag is set to wiphy->flags variable. + */ + if (dhd_get_fw_mode(dhd->info) == DHD_FLAG_HOSTAP_MODE) { + wdev->wiphy->flags |= WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD; + wdev->wiphy->probe_resp_offload = 0; + } +#endif #endif /* WL_SUPPORT_BACKPORTED_KPATCHES) || (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) */ -#if 1 //LINUX_VERSION_CODE > KERNEL_VERSION(3, 2, 0) - wdev->wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS; + + +#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 2, 0)) || defined(WL_COMPAT_WIRELESS) + wdev->wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS; #endif + +#if defined(CONFIG_PM) && defined(WL_CFG80211_P2P_DEV_IF) + /* + * From linux-3.10 kernel, wowlan packet filter is mandated to avoid the + * disconnection of connected network before suspend. So a dummy wowlan + * filter is configured for kernels linux-3.8 and above. + */ + wdev->wiphy->wowlan.flags = WIPHY_WOWLAN_ANY; +#endif /* CONFIG_PM && WL_CFG80211_P2P_DEV_IF */ + WL_DBG(("Registering custom regulatory)\n")); wdev->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY; wiphy_apply_custom_regulatory(wdev->wiphy, &brcm_regdom); + +#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) || defined(WL_VENDOR_EXT_SUPPORT) + WL_ERR(("Registering Vendor80211)\n")); + err = wl_cfgvendor_attach(wdev->wiphy); + if (unlikely(err < 0)) { + WL_ERR(("Couldn not attach vendor commands (%d)\n", err)); + } +#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) || defined(WL_VENDOR_EXT_SUPPORT) */ + + /* Now we can register wiphy with cfg80211 module */ err = wiphy_register(wdev->wiphy); if (unlikely(err < 0)) { WL_ERR(("Couldn not register wiphy device (%d)\n", err)); wiphy_free(wdev->wiphy); } + +#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) && (LINUX_VERSION_CODE <= \ + KERNEL_VERSION(3, 3, 0))) && defined(WL_IFACE_COMB_NUM_CHANNELS) + wdev->wiphy->flags &= ~WIPHY_FLAG_ENFORCE_COMBINATIONS; +#endif + return err; } -static void wl_free_wdev(struct wl_priv *wl) +static void wl_free_wdev(struct bcm_cfg80211 *cfg) { - struct wireless_dev *wdev = wl->wdev; + struct wireless_dev *wdev = cfg->wdev; struct wiphy *wiphy; if (!wdev) { WL_ERR(("wdev is invalid\n")); return; } wiphy = wdev->wiphy; + +#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) || defined(WL_VENDOR_EXT_SUPPORT) + wl_cfgvendor_detach(wdev->wiphy); +#endif /* if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) || defined(WL_VENDOR_EXT_SUPPORT) */ + wiphy_unregister(wdev->wiphy); wdev->wiphy->dev.parent = NULL; - wl_delete_all_netinfo(wl); + wl_delete_all_netinfo(cfg); wiphy_free(wiphy); - /* PLEASE do NOT call any function after wiphy_free, the driver's private structure "wl", + /* PLEASE do NOT call any function after wiphy_free, the driver's private structure "cfg", * which is the private part of wiphy, has been freed in wiphy_free !!!!!!!!!!! */ } -static s32 wl_inform_bss(struct wl_priv *wl) +static s32 wl_inform_bss(struct bcm_cfg80211 *cfg) { struct wl_scan_results *bss_list; struct wl_bss_info *bi = NULL; /* must be initialized */ s32 err = 0; s32 i; - bss_list = wl->bss_list; + bss_list = cfg->bss_list; WL_DBG(("scanned AP count (%d)\n", bss_list->count)); #if defined(CUSTOMER_HW4) && defined(ROAM_CHANNEL_CACHE) reset_roam_cache(); @@ -6596,25 +7530,25 @@ static s32 wl_inform_bss(struct wl_priv *wl) #if defined(CUSTOMER_HW4) && defined(ROAM_CHANNEL_CACHE) add_roam_cache(bi); #endif /* CUSTOMER_HW4 && ROAM_CHANNEL_CACHE */ - err = wl_inform_single_bss(wl, bi, 0); + err = wl_inform_single_bss(cfg, bi); if (unlikely(err)) break; } #if defined(CUSTOMER_HW4) && defined(ROAM_CHANNEL_CACHE) /* print_roam_cache(); */ - update_roam_cache(wl, ioctl_version); + update_roam_cache(cfg, ioctl_version); #endif /* CUSTOMER_HW4 && ROAM_CHANNEL_CACHE */ return err; } -static s32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi, u8 is_roam_done) +static s32 wl_inform_single_bss(struct bcm_cfg80211 *cfg, struct wl_bss_info *bi) { - struct wiphy *wiphy = wl_to_wiphy(wl); + struct wiphy *wiphy = bcmcfg_to_wiphy(cfg); struct ieee80211_mgmt *mgmt; struct ieee80211_channel *channel; struct ieee80211_supported_band *band; struct wl_cfg80211_bss_info *notif_bss_info; - struct wl_scan_req *sr = wl_to_sr(wl); + struct wl_scan_req *sr = wl_to_sr(cfg); struct beacon_proberesp *beacon_proberesp; struct cfg80211_bss *cbss = NULL; s32 mgmt_type; @@ -6622,7 +7556,6 @@ static s32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi, u8 i u32 freq; s32 err = 0; gfp_t aflags; - u8 *ie_offset = NULL; if (unlikely(dtoh32(bi->length) > WL_BSS_INFO_MAX)) { WL_DBG(("Beacon is larger than buffer. Discarding\n")); @@ -6637,7 +7570,7 @@ static s32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi, u8 i } mgmt = (struct ieee80211_mgmt *)notif_bss_info->frame_buf; notif_bss_info->channel = - bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(wl_chspec_driver_to_host(bi->chanspec)); + bi->ctl_ch ? bi->ctl_ch : wf_chspec_ctlchan(wl_chspec_driver_to_host(bi->chanspec)); if (notif_bss_info->channel <= CH_MAX_2G_CHANNEL) band = wiphy->bands[IEEE80211_BAND_2GHZ]; @@ -6648,55 +7581,26 @@ static s32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi, u8 i kfree(notif_bss_info); return -EINVAL; } - notif_bss_info->rssi = dtoh16(bi->RSSI) + RSSI_OFFSET; + notif_bss_info->rssi = wl_rssi_offset(dtoh16(bi->RSSI)); memcpy(mgmt->bssid, &bi->BSSID, ETHER_ADDR_LEN); - mgmt_type = wl->active_scan ? + mgmt_type = cfg->active_scan ? IEEE80211_STYPE_PROBE_RESP : IEEE80211_STYPE_BEACON; if (!memcmp(bi->SSID, sr->ssid.SSID, bi->SSID_len)) { mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | mgmt_type); } - beacon_proberesp = wl->active_scan ? + beacon_proberesp = cfg->active_scan ? (struct beacon_proberesp *)&mgmt->u.probe_resp : (struct beacon_proberesp *)&mgmt->u.beacon; beacon_proberesp->timestamp = 0; beacon_proberesp->beacon_int = cpu_to_le16(bi->beacon_period); beacon_proberesp->capab_info = cpu_to_le16(bi->capability); - wl_rst_ie(wl); - - ie_offset = ((u8 *) bi) + bi->ie_offset; - - if (is_roam_done && ((int)(*(ie_offset)) == WLAN_EID_SSID && - ((int)(*(ie_offset+1)) == 0 || (int)(*(ie_offset+2)) == 0))) { - u8 *ie_new_offset = NULL; - uint8 ie_new_length; - - WL_ERR(("WAR trace: Changing the SSID Info, from beacon %d\n", - bi->flags & WL_BSS_FLAGS_FROM_BEACON)); - - ie_new_offset = (u8 *)kzalloc(WL_BSS_INFO_MAX, GFP_KERNEL); - if (ie_new_offset) { - *(ie_new_offset) = WLAN_EID_SSID; - *(ie_new_offset+1) = bi->SSID_len; - memcpy(ie_new_offset+2, bi->SSID, bi->SSID_len); - ie_new_length = bi->ie_length - *(ie_offset+1) + bi->SSID_len; - - /* Copy the remaining IE apart from SSID IE from bi */ - memcpy(ie_new_offset+2 + bi->SSID_len, - ie_offset+2 + *(ie_offset+1), - bi->ie_length - 2 - *(ie_offset+1)); - wl_mrg_ie(wl, ie_new_offset, ie_new_length); - kfree(ie_new_offset); - } else { - wl_mrg_ie(wl, ((u8 *) bi) + bi->ie_offset, bi->ie_length); - } - } else { - wl_mrg_ie(wl, ((u8 *) bi) + bi->ie_offset, bi->ie_length); - } - - wl_cp_ie(wl, beacon_proberesp->variable, WL_BSS_INFO_MAX - + wl_rst_ie(cfg); + wl_update_hidden_ap_ie(bi, ((u8 *) bi) + bi->ie_offset, &bi->ie_length); + wl_mrg_ie(cfg, ((u8 *) bi) + bi->ie_offset, bi->ie_length); + wl_cp_ie(cfg, beacon_proberesp->variable, WL_BSS_INFO_MAX - offsetof(struct wl_cfg80211_bss_info, frame_buf)); notif_bss_info->frame_len = offsetof(struct ieee80211_mgmt, - u.beacon.variable) + wl_get_ielen(wl); + u.beacon.variable) + wl_get_ielen(cfg); #if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 38) && !defined(WL_COMPAT_WIRELESS) freq = ieee80211_channel_to_frequency(notif_bss_info->channel); (void)band->band; @@ -6722,7 +7626,7 @@ static s32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi, u8 i signal = notif_bss_info->rssi * 100; if (!mgmt->u.probe_resp.timestamp) { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) struct timespec ts; get_monotonic_boottime(&ts); mgmt->u.probe_resp.timestamp = ((u64)ts.tv_sec*1000000) @@ -6744,12 +7648,16 @@ static s32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi, u8 i return -EINVAL; } +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)) + cfg80211_put_bss(wiphy, cbss); +#else cfg80211_put_bss(cbss); +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) */ kfree(notif_bss_info); return err; } -static bool wl_is_linkup(struct wl_priv *wl, const wl_event_msg_t *e, struct net_device *ndev) +static bool wl_is_linkup(struct bcm_cfg80211 *cfg, const wl_event_msg_t *e, struct net_device *ndev) { u32 event = ntoh32(e->event_type); u32 status = ntoh32(e->status); @@ -6758,7 +7666,7 @@ static bool wl_is_linkup(struct wl_priv *wl, const wl_event_msg_t *e, struct net WL_DBG(("event %d, status %d flags %x\n", event, status, flags)); if (event == WLC_E_SET_SSID) { if (status == WLC_E_STATUS_SUCCESS) { - if (!wl_is_ibssmode(wl, ndev)) + if (!wl_is_ibssmode(cfg, ndev)) return true; } } else if (event == WLC_E_LINK) { @@ -6770,7 +7678,7 @@ static bool wl_is_linkup(struct wl_priv *wl, const wl_event_msg_t *e, struct net return false; } -static bool wl_is_linkdown(struct wl_priv *wl, const wl_event_msg_t *e) +static bool wl_is_linkdown(struct bcm_cfg80211 *cfg, const wl_event_msg_t *e) { u32 event = ntoh32(e->event_type); u16 flags = ntoh16(e->flags); @@ -6795,7 +7703,7 @@ static bool wl_is_linkdown(struct wl_priv *wl, const wl_event_msg_t *e) return false; } -static bool wl_is_nonetwork(struct wl_priv *wl, const wl_event_msg_t *e) +static bool wl_is_nonetwork(struct bcm_cfg80211 *cfg, const wl_event_msg_t *e) { u32 event = ntoh32(e->event_type); u32 status = ntoh32(e->status); @@ -6814,7 +7722,7 @@ static bool wl_is_nonetwork(struct wl_priv *wl, const wl_event_msg_t *e) * should use this new/del sta event mechanism for BRCM supplicant >= 22. */ static s32 -wl_notify_connect_status_ap(struct wl_priv *wl, struct net_device *ndev, +wl_notify_connect_status_ap(struct bcm_cfg80211 *cfg, struct net_device *ndev, const wl_event_msg_t *e, void *data) { s32 err = 0; @@ -6822,7 +7730,8 @@ wl_notify_connect_status_ap(struct wl_priv *wl, struct net_device *ndev, u32 reason = ntoh32(e->reason); u32 len = ntoh32(e->datalen); -#if 0 //(LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)) && !defined(WL_CFG80211_STA_EVENT) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)) && !defined(WL_CFG80211_STA_EVENT) \ + && !defined(WL_COMPAT_WIRELESS) bool isfree = false; u8 *mgmt_frame; u8 bsscfgidx = e->bsscfgidx; @@ -6834,23 +7743,29 @@ wl_notify_connect_status_ap(struct wl_priv *wl, struct net_device *ndev, struct ieee80211_supported_band *band; struct ether_addr da; struct ether_addr bssid; - struct wiphy *wiphy = wl_to_wiphy(wl); + struct wiphy *wiphy = bcmcfg_to_wiphy(cfg); channel_info_t ci; #else struct station_info sinfo; -#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)) && !WL_CFG80211_STA_EVENT */ +#endif /* (LINUX_VERSION < VERSION(3,2,0)) && !WL_CFG80211_STA_EVENT && !WL_COMPAT_WIRELESS */ WL_DBG(("event %d status %d reason %d\n", event, ntoh32(e->status), reason)); /* if link down, bsscfg is disabled. */ if (event == WLC_E_LINK && reason == WLC_E_LINK_BSSCFG_DIS && - wl_get_p2p_status(wl, IF_DELETING) && (ndev != wl_to_prmry_ndev(wl))) { + wl_get_p2p_status(cfg, IF_DELETING) && (ndev != bcmcfg_to_prmry_ndev(cfg))) { wl_add_remove_eventmsg(ndev, WLC_E_PROBREQ_MSG, false); WL_INFO(("AP mode link down !! \n")); - complete(&wl->iface_disable); + complete(&cfg->iface_disable); return 0; } -#if 0 //(LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)) && !defined(WL_CFG80211_STA_EVENT) + if (event == WLC_E_DISASSOC_IND || event == WLC_E_DEAUTH_IND || event == WLC_E_DEAUTH) { + WL_ERR(("event %s(%d) status %d reason %d\n", + bcmevent_names[event].name, event, ntoh32(e->status), reason)); + } + +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)) && !defined(WL_CFG80211_STA_EVENT) \ + && !defined(WL_COMPAT_WIRELESS) WL_DBG(("Enter \n")); if (!len && (event == WLC_E_DEAUTH)) { len = 2; /* reason code field */ @@ -6866,7 +7781,7 @@ wl_notify_connect_status_ap(struct wl_priv *wl, struct net_device *ndev, } memset(&bssid, 0, ETHER_ADDR_LEN); WL_DBG(("Enter event %d ndev %p\n", event, ndev)); - if (wl_get_mode_by_netdev(wl, ndev) == WL_INVALID) { + if (wl_get_mode_by_netdev(cfg, ndev) == WL_INVALID) { kfree(body); return WL_INVALID; } @@ -6874,8 +7789,8 @@ wl_notify_connect_status_ap(struct wl_priv *wl, struct net_device *ndev, memcpy(body, data, len); wldev_iovar_getbuf_bsscfg(ndev, "cur_etheraddr", - NULL, 0, wl->ioctl_buf, WLC_IOCTL_SMLEN, bsscfgidx, &wl->ioctl_buf_sync); - memcpy(da.octet, wl->ioctl_buf, ETHER_ADDR_LEN); + NULL, 0, cfg->ioctl_buf, WLC_IOCTL_SMLEN, bsscfgidx, &cfg->ioctl_buf_sync); + memcpy(da.octet, cfg->ioctl_buf, ETHER_ADDR_LEN); err = wldev_ioctl(ndev, WLC_GET_BSSID, &bssid, ETHER_ADDR_LEN, false); switch (event) { case WLC_E_ASSOC_IND: @@ -6927,23 +7842,23 @@ wl_notify_connect_status_ap(struct wl_priv *wl, struct net_device *ndev, isfree = true; if (event == WLC_E_ASSOC_IND && reason == DOT11_SC_SUCCESS) { -#if 1 //LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) || defined(WL_COMPAT_WIRELESS) cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, len, GFP_ATOMIC); #else cfg80211_rx_mgmt(ndev, freq, mgmt_frame, len, GFP_ATOMIC); -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) */ +#endif /* LINUX_VERSION >= VERSION(3,4,0) || WL_COMPAT_WIRELESS */ } else if (event == WLC_E_DISASSOC_IND) { -#if 1 //LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) || defined(WL_COMPAT_WIRELESS) cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, len, GFP_ATOMIC); #else cfg80211_rx_mgmt(ndev, freq, mgmt_frame, len, GFP_ATOMIC); -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) */ +#endif /* LINUX_VERSION >= VERSION(3,4,0) || WL_COMPAT_WIRELESS */ } else if ((event == WLC_E_DEAUTH_IND) || (event == WLC_E_DEAUTH)) { -#if 1 //LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) || defined(WL_COMPAT_WIRELESS) cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, len, GFP_ATOMIC); #else cfg80211_rx_mgmt(ndev, freq, mgmt_frame, len, GFP_ATOMIC); -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) */ +#endif /* LINUX_VERSION >= VERSION(3,4,0) || WL_COMPAT_WIRELESS */ } exit: @@ -6951,8 +7866,7 @@ exit: kfree(mgmt_frame); if (body) kfree(body); - return err; -#else /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) && !WL_CFG80211_STA_EVENT */ +#else /* LINUX_VERSION < VERSION(3,2,0) && !WL_CFG80211_STA_EVENT && !WL_COMPAT_WIRELESS */ sinfo.filled = 0; if (((event == WLC_E_ASSOC_IND) || (event == WLC_E_REASSOC_IND)) && reason == DOT11_SC_SUCCESS) { @@ -6969,17 +7883,17 @@ exit: } else if ((event == WLC_E_DEAUTH_IND) || (event == WLC_E_DEAUTH)) { cfg80211_del_sta(ndev, e->addr.octet, GFP_ATOMIC); } -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) && !WL_CFG80211_STA_EVENT */ +#endif /* LINUX_VERSION < VERSION(3,2,0) && !WL_CFG80211_STA_EVENT && !WL_COMPAT_WIRELESS */ return err; } static s32 -wl_get_auth_assoc_status(struct wl_priv *wl, struct net_device *ndev, +wl_get_auth_assoc_status(struct bcm_cfg80211 *cfg, struct net_device *ndev, const wl_event_msg_t *e) { u32 reason = ntoh32(e->reason); u32 event = ntoh32(e->event_type); - struct wl_security *sec = wl_read_prof(wl, ndev, WL_PROF_SEC); + struct wl_security *sec = wl_read_prof(cfg, ndev, WL_PROF_SEC); WL_DBG(("event type : %d, reason : %d\n", event, reason)); if (sec) { switch (event) { @@ -6995,55 +7909,107 @@ wl_get_auth_assoc_status(struct wl_priv *wl, struct net_device *ndev, } static s32 -wl_notify_connect_status(struct wl_priv *wl, struct net_device *ndev, +wl_notify_connect_status_ibss(struct bcm_cfg80211 *cfg, struct net_device *ndev, + const wl_event_msg_t *e, void *data) +{ + s32 err = 0; + u32 event = ntoh32(e->event_type); + u16 flags = ntoh16(e->flags); + u32 status = ntoh32(e->status); + bool active; + + if (event == WLC_E_JOIN) { + WL_DBG(("joined in IBSS network\n")); + } + if (event == WLC_E_START) { + WL_DBG(("started IBSS network\n")); + } + if (event == WLC_E_JOIN || event == WLC_E_START || + (event == WLC_E_LINK && (flags == WLC_EVENT_MSG_LINK))) { + if (wl_get_drv_status(cfg, CONNECTED, ndev)) { + /* ROAM or Redundant */ + u8 *cur_bssid = wl_read_prof(cfg, ndev, WL_PROF_BSSID); + if (memcmp(cur_bssid, &e->addr, ETHER_ADDR_LEN) == 0) { + WL_DBG(("IBSS connected event from same BSSID(" + MACDBG "), ignore it\n", MAC2STRDBG(cur_bssid))); + return err; + } + WL_INFO(("IBSS BSSID is changed from " MACDBG " to " MACDBG "\n", + MAC2STRDBG(cur_bssid), MAC2STRDBG((u8 *)&e->addr))); + wl_get_assoc_ies(cfg, ndev); + wl_update_prof(cfg, ndev, NULL, (void *)&e->addr, WL_PROF_BSSID); + wl_update_bss_info(cfg, ndev); + cfg80211_ibss_joined(ndev, (s8 *)&e->addr, GFP_KERNEL); + } + else { + /* New connection */ + WL_INFO(("IBSS connected to " MACDBG "\n", MAC2STRDBG((u8 *)&e->addr))); + wl_link_up(cfg); + wl_get_assoc_ies(cfg, ndev); + wl_update_prof(cfg, ndev, NULL, (void *)&e->addr, WL_PROF_BSSID); + wl_update_bss_info(cfg, ndev); + cfg80211_ibss_joined(ndev, (s8 *)&e->addr, GFP_KERNEL); + wl_set_drv_status(cfg, CONNECTED, ndev); + active = true; + wl_update_prof(cfg, ndev, NULL, (void *)&active, WL_PROF_ACT); + } + } else if ((event == WLC_E_LINK && !(flags & WLC_EVENT_MSG_LINK)) || + event == WLC_E_DEAUTH_IND || event == WLC_E_DISASSOC_IND) { + wl_clr_drv_status(cfg, CONNECTED, ndev); + wl_link_down(cfg); + wl_init_prof(cfg, ndev); + } + else if (event == WLC_E_SET_SSID && status == WLC_E_STATUS_NO_NETWORKS) { + WL_DBG(("no action - join fail (IBSS mode)\n")); + } + else { + WL_DBG(("no action (IBSS mode)\n")); +} + return err; +} + +static s32 +wl_notify_connect_status(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data) { bool act; + struct net_device *ndev = NULL; s32 err = 0; u32 event = ntoh32(e->event_type); - if (wl_get_mode_by_netdev(wl, ndev) == WL_MODE_AP) { - wl_notify_connect_status_ap(wl, ndev, e, data); - } else { + ndev = cfgdev_to_wlc_ndev(cfgdev, cfg); + + if (wl_get_mode_by_netdev(cfg, ndev) == WL_MODE_AP) { + err = wl_notify_connect_status_ap(cfg, ndev, e, data); + } else if (wl_get_mode_by_netdev(cfg, ndev) == WL_MODE_IBSS) { + err = wl_notify_connect_status_ibss(cfg, ndev, e, data); + } else if (wl_get_mode_by_netdev(cfg, ndev) == WL_MODE_BSS) { WL_DBG(("wl_notify_connect_status : event %d status : %d ndev %p\n", ntoh32(e->event_type), ntoh32(e->status), ndev)); if (event == WLC_E_ASSOC || event == WLC_E_AUTH) { - wl_get_auth_assoc_status(wl, ndev, e); + wl_get_auth_assoc_status(cfg, ndev, e); return 0; } - if (wl_is_linkup(wl, e, ndev)) { - wl_link_up(wl); + if (wl_is_linkup(cfg, e, ndev)) { + wl_link_up(cfg); act = true; - if (wl_is_ibssmode(wl, ndev)) { - printk("cfg80211_ibss_joined\n"); - cfg80211_ibss_joined(ndev, (s8 *)&e->addr, - GFP_KERNEL); - WL_DBG(("joined in IBSS network\n")); - } else { - if (!wl_get_drv_status(wl, DISCONNECTING, ndev)) { + if (!wl_get_drv_status(cfg, DISCONNECTING, ndev)) { printk("wl_bss_connect_done succeeded with " MACDBG "\n", MAC2STRDBG((u8*)(&e->addr))); - wl_bss_connect_done(wl, ndev, e, data, true); + wl_bss_connect_done(cfg, ndev, e, data, true); WL_DBG(("joined in BSS network \"%s\"\n", ((struct wlc_ssid *) - wl_read_prof(wl, ndev, WL_PROF_SSID))->SSID)); + wl_read_prof(cfg, ndev, WL_PROF_SSID))->SSID)); } - } - wl_update_prof(wl, ndev, e, &act, WL_PROF_ACT); - wl_update_prof(wl, ndev, NULL, (void *)&e->addr, WL_PROF_BSSID); + wl_update_prof(cfg, ndev, e, &act, WL_PROF_ACT); + wl_update_prof(cfg, ndev, NULL, (void *)&e->addr, WL_PROF_BSSID); - } else if (wl_is_linkdown(wl, e)) { - if (wl->scan_request) { - if (wl->escan_on) { - wl_notify_escan_complete(wl, ndev, true, true); - } else { - del_timer_sync(&wl->scan_timeout); - wl_iscan_aborted(wl); - } - } - if (wl_get_drv_status(wl, CONNECTED, ndev)) { + } else if (wl_is_linkdown(cfg, e)) { + if (cfg->scan_request) + wl_notify_escan_complete(cfg, ndev, true, true); + if (wl_get_drv_status(cfg, CONNECTED, ndev)) { scb_val_t scbval; - u8 *curbssid = wl_read_prof(wl, ndev, WL_PROF_BSSID); + u8 *curbssid = wl_read_prof(cfg, ndev, WL_PROF_BSSID); s32 reason = 0; if (event == WLC_E_DEAUTH_IND || event == WLC_E_DISASSOC_IND) reason = ntoh32(e->reason); @@ -7054,14 +8020,15 @@ wl_notify_connect_status(struct wl_priv *wl, struct net_device *ndev, "event : %d, reason=%d from " MACDBG "\n", ndev->name, event, ntoh32(e->reason), MAC2STRDBG((u8*)(&e->addr))); - if (memcmp(curbssid, &e->addr, ETHER_ADDR_LEN) != 0) { + if (!cfg->roam_offload && + memcmp(curbssid, &e->addr, ETHER_ADDR_LEN) != 0) { WL_ERR(("BSSID of event is not the connected BSSID" "(ignore it) cur: " MACDBG " event: " MACDBG"\n", MAC2STRDBG(curbssid), MAC2STRDBG((u8*)(&e->addr)))); return 0; } - wl_clr_drv_status(wl, CONNECTED, ndev); - if (! wl_get_drv_status(wl, DISCONNECTING, ndev)) { + wl_clr_drv_status(cfg, CONNECTED, ndev); + if (! wl_get_drv_status(cfg, DISCONNECTING, ndev)) { /* To make sure disconnect, explictly send dissassoc * for BSSID 00:00:00:00:00:00 issue */ @@ -7076,11 +8043,11 @@ wl_notify_connect_status(struct wl_priv *wl, struct net_device *ndev, err = 0; } cfg80211_disconnected(ndev, reason, NULL, 0, GFP_KERNEL); - wl_link_down(wl); - wl_init_prof(wl, ndev); + wl_link_down(cfg); + wl_init_prof(cfg, ndev); } } - else if (wl_get_drv_status(wl, CONNECTING, ndev)) { + else if (wl_get_drv_status(cfg, CONNECTING, ndev)) { printk("link down, during connecting\n"); #ifdef ESCAN_RESULT_PATCH if ((memcmp(connect_req_bssid, broad_bssid, ETHER_ADDR_LEN) == 0) || @@ -7088,70 +8055,106 @@ wl_notify_connect_status(struct wl_priv *wl, struct net_device *ndev, (memcmp(&e->addr, connect_req_bssid, ETHER_ADDR_LEN) == 0)) /* In case this event comes while associating another AP */ #endif /* ESCAN_RESULT_PATCH */ - wl_bss_connect_done(wl, ndev, e, data, false); + wl_bss_connect_done(cfg, ndev, e, data, false); } - wl_clr_drv_status(wl, DISCONNECTING, ndev); + wl_clr_drv_status(cfg, DISCONNECTING, ndev); /* if link down, bsscfg is diabled */ - if (ndev != wl_to_prmry_ndev(wl)) - complete(&wl->iface_disable); + if (ndev != bcmcfg_to_prmry_ndev(cfg)) + complete(&cfg->iface_disable); - } else if (wl_is_nonetwork(wl, e)) { + } else if (wl_is_nonetwork(cfg, e)) { printk("connect failed event=%d e->status %d e->reason %d \n", event, (int)ntoh32(e->status), (int)ntoh32(e->reason)); /* Clean up any pending scan request */ - if (wl->scan_request) { - if (wl->escan_on) { - wl_notify_escan_complete(wl, ndev, true, true); - } else { - del_timer_sync(&wl->scan_timeout); - wl_iscan_aborted(wl); - } - } - if (wl_get_drv_status(wl, CONNECTING, ndev)) - wl_bss_connect_done(wl, ndev, e, data, false); + if (cfg->scan_request) + wl_notify_escan_complete(cfg, ndev, true, true); + if (wl_get_drv_status(cfg, CONNECTING, ndev)) + wl_bss_connect_done(cfg, ndev, e, data, false); } else { - printk("%s nothing\n", __FUNCTION__); + WL_DBG(("%s nothing\n", __FUNCTION__)); } } + else { + WL_ERR(("Invalid ndev status %d\n", wl_get_mode_by_netdev(cfg, ndev))); + } return err; } +#ifdef WLAIBSS +void wl_cfg80211_set_txfail_pid(int pid) +{ + struct bcm_cfg80211 *cfg = g_bcm_cfg; + if (pid > 0) + cfg->aibss_txfail_pid = pid; + WL_DBG(("txfail : pid=%d\n", pid)); +} + +static s32 +wl_notify_aibss_txfail(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev, + const wl_event_msg_t *e, void *data) +{ + u32 evt = ntoh32(e->event_type); + int ret = -1; + + if (cfg->aibss_txfail_pid != 0) { + ret = wl_netlink_send_msg(cfg->aibss_txfail_pid, cfg->aibss_txfail_seq++, + (void *)&e->addr, ETHER_ADDR_LEN); + } + + WL_DBG(("txfail : evt=%d, pid=%d, ret=%d, mac=" MACF "\n", + evt, cfg->aibss_txfail_pid, ret, ETHERP_TO_MACF(&e->addr))); + return ret; +} +#endif /* WLAIBSS */ + static s32 -wl_notify_roaming_status(struct wl_priv *wl, struct net_device *ndev, +wl_notify_roaming_status(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data) { bool act; + struct net_device *ndev = NULL; s32 err = 0; u32 event = be32_to_cpu(e->event_type); u32 status = be32_to_cpu(e->status); WL_DBG(("Enter \n")); - if (event == WLC_E_ROAM && status == WLC_E_STATUS_SUCCESS) { - if (wl_get_drv_status(wl, CONNECTED, ndev)) - wl_bss_roaming_done(wl, ndev, e, data); + + ndev = cfgdev_to_wlc_ndev(cfgdev, cfg); + + if ((!cfg->disable_roam_event) && (event == WLC_E_BSSID)) { + wl_add_remove_eventmsg(ndev, WLC_E_ROAM, false); + cfg->disable_roam_event = TRUE; + } + + if ((cfg->disable_roam_event) && (event == WLC_E_ROAM)) + return err; + + if ((event == WLC_E_ROAM || event == WLC_E_BSSID) && status == WLC_E_STATUS_SUCCESS) { + if (wl_get_drv_status(cfg, CONNECTED, ndev)) + wl_bss_roaming_done(cfg, ndev, e, data); else - wl_bss_connect_done(wl, ndev, e, data, true); + wl_bss_connect_done(cfg, ndev, e, data, true); act = true; - wl_update_prof(wl, ndev, e, &act, WL_PROF_ACT); - wl_update_prof(wl, ndev, NULL, (void *)&e->addr, WL_PROF_BSSID); + wl_update_prof(cfg, ndev, e, &act, WL_PROF_ACT); + wl_update_prof(cfg, ndev, NULL, (void *)&e->addr, WL_PROF_BSSID); } return err; } -static s32 wl_get_assoc_ies(struct wl_priv *wl, struct net_device *ndev) +static s32 wl_get_assoc_ies(struct bcm_cfg80211 *cfg, struct net_device *ndev) { wl_assoc_info_t assoc_info; - struct wl_connect_info *conn_info = wl_to_conn(wl); + struct wl_connect_info *conn_info = wl_to_conn(cfg); s32 err = 0; WL_DBG(("Enter \n")); - err = wldev_iovar_getbuf(ndev, "assoc_info", NULL, 0, wl->extra_buf, + err = wldev_iovar_getbuf(ndev, "assoc_info", NULL, 0, cfg->extra_buf, WL_ASSOC_INFO_MAX, NULL); if (unlikely(err)) { WL_ERR(("could not get assoc info (%d)\n", err)); return err; } - memcpy(&assoc_info, wl->extra_buf, sizeof(wl_assoc_info_t)); + memcpy(&assoc_info, cfg->extra_buf, sizeof(wl_assoc_info_t)); assoc_info.req_len = htod32(assoc_info.req_len); assoc_info.resp_len = htod32(assoc_info.resp_len); assoc_info.flags = htod32(assoc_info.flags); @@ -7164,7 +8167,7 @@ static s32 wl_get_assoc_ies(struct wl_priv *wl, struct net_device *ndev) bzero(conn_info->resp_ie, sizeof(conn_info->resp_ie)); } if (assoc_info.req_len) { - err = wldev_iovar_getbuf(ndev, "assoc_req_ies", NULL, 0, wl->extra_buf, + err = wldev_iovar_getbuf(ndev, "assoc_req_ies", NULL, 0, cfg->extra_buf, WL_ASSOC_INFO_MAX, NULL); if (unlikely(err)) { WL_ERR(("could not get assoc req (%d)\n", err)); @@ -7175,7 +8178,7 @@ static s32 wl_get_assoc_ies(struct wl_priv *wl, struct net_device *ndev) conn_info->req_ie_len -= ETHER_ADDR_LEN; } if (conn_info->req_ie_len <= MAX_REQ_LINE) - memcpy(conn_info->req_ie, wl->extra_buf, conn_info->req_ie_len); + memcpy(conn_info->req_ie, cfg->extra_buf, conn_info->req_ie_len); else { WL_ERR(("IE size %d above max %d size \n", conn_info->req_ie_len, MAX_REQ_LINE)); @@ -7185,7 +8188,7 @@ static s32 wl_get_assoc_ies(struct wl_priv *wl, struct net_device *ndev) conn_info->req_ie_len = 0; } if (assoc_info.resp_len) { - err = wldev_iovar_getbuf(ndev, "assoc_resp_ies", NULL, 0, wl->extra_buf, + err = wldev_iovar_getbuf(ndev, "assoc_resp_ies", NULL, 0, cfg->extra_buf, WL_ASSOC_INFO_MAX, NULL); if (unlikely(err)) { WL_ERR(("could not get assoc resp (%d)\n", err)); @@ -7193,7 +8196,7 @@ static s32 wl_get_assoc_ies(struct wl_priv *wl, struct net_device *ndev) } conn_info->resp_ie_len = assoc_info.resp_len -sizeof(struct dot11_assoc_resp); if (conn_info->resp_ie_len <= MAX_REQ_LINE) - memcpy(conn_info->resp_ie, wl->extra_buf, conn_info->resp_ie_len); + memcpy(conn_info->resp_ie, cfg->extra_buf, conn_info->resp_ie_len); else { WL_ERR(("IE size %d above max %d size \n", conn_info->resp_ie_len, MAX_REQ_LINE)); @@ -7253,7 +8256,7 @@ static void wl_ch_to_chanspec(int ch, struct wl_join_params *join_params, } } -static s32 wl_update_bss_info(struct wl_priv *wl, struct net_device *ndev, u8 is_roam_done) +static s32 wl_update_bss_info(struct bcm_cfg80211 *cfg, struct net_device *ndev) { struct cfg80211_bss *bss; struct wl_bss_info *bi; @@ -7263,45 +8266,45 @@ static s32 wl_update_bss_info(struct wl_priv *wl, struct net_device *ndev, u8 is s32 dtim_period; size_t ie_len; u8 *ie; - u8 *ssidie; u8 *curbssid; s32 err = 0; struct wiphy *wiphy; + u32 channel; +#ifdef ROAM_CHANNEL_CACHE + struct ieee80211_channel *cur_channel; + u32 freq, band; +#endif /* ROAM_CHANNEL_CACHE */ - wiphy = wl_to_wiphy(wl); - - if (wl_is_ibssmode(wl, ndev)) - return err; + wiphy = bcmcfg_to_wiphy(cfg); - ssid = (struct wlc_ssid *)wl_read_prof(wl, ndev, WL_PROF_SSID); - curbssid = wl_read_prof(wl, ndev, WL_PROF_BSSID); + ssid = (struct wlc_ssid *)wl_read_prof(cfg, ndev, WL_PROF_SSID); + curbssid = wl_read_prof(cfg, ndev, WL_PROF_BSSID); bss = cfg80211_get_bss(wiphy, NULL, curbssid, ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS); - mutex_lock(&wl->usr_sync); + mutex_lock(&cfg->usr_sync); + + *(u32 *) cfg->extra_buf = htod32(WL_EXTRA_BUF_MAX); + err = wldev_ioctl(ndev, WLC_GET_BSS_INFO, + cfg->extra_buf, WL_EXTRA_BUF_MAX, false); + if (unlikely(err)) { + WL_ERR(("Could not get bss info %d\n", err)); + goto update_bss_info_out; + } + bi = (struct wl_bss_info *)(cfg->extra_buf + 4); + channel = bi->ctl_ch ? bi->ctl_ch : + CHSPEC_CHANNEL(wl_chspec_driver_to_host(bi->chanspec)); + wl_update_prof(cfg, ndev, NULL, &channel, WL_PROF_CHAN); + if (!bss) { WL_DBG(("Could not find the AP\n")); - *(u32 *) wl->extra_buf = htod32(WL_EXTRA_BUF_MAX); - err = wldev_ioctl(ndev, WLC_GET_BSS_INFO, - wl->extra_buf, WL_EXTRA_BUF_MAX, false); - if (unlikely(err)) { - WL_ERR(("Could not get bss info %d\n", err)); - goto update_bss_info_out; - } - bi = (struct wl_bss_info *)(wl->extra_buf + 4); if (memcmp(bi->BSSID.octet, curbssid, ETHER_ADDR_LEN)) { + WL_ERR(("Bssid doesn't match\n")); err = -EIO; goto update_bss_info_out; } - - ie = ((u8 *)bi) + bi->ie_offset; - ie_len = bi->ie_length; - ssidie = (u8 *)cfg80211_find_ie(WLAN_EID_SSID, ie, ie_len); - if (ssidie && ssidie[1] == bi->SSID_len && !ssidie[2] && bi->SSID[0]) - memcpy(ssidie + 2, bi->SSID, bi->SSID_len); - - err = wl_inform_single_bss(wl, bi, is_roam_done); + err = wl_inform_single_bss(cfg, bi); if (unlikely(err)) goto update_bss_info_out; @@ -7310,10 +8313,29 @@ static s32 wl_update_bss_info(struct wl_priv *wl, struct net_device *ndev, u8 is beacon_interval = cpu_to_le16(bi->beacon_period); } else { WL_DBG(("Found the AP in the list - BSSID %pM\n", bss->bssid)); +#ifdef ROAM_CHANNEL_CACHE +#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 38) && !defined(WL_COMPAT_WIRELESS) + freq = ieee80211_channel_to_frequency(channel); +#else + band = (channel <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ; + freq = ieee80211_channel_to_frequency(channel, band); +#endif + cur_channel = ieee80211_get_channel(wiphy, freq); + bss->channel = cur_channel; +#endif /* ROAM_CHANNEL_CACHE */ +#if defined(WL_CFG80211_P2P_DEV_IF) + ie = (u8 *)bss->ies->data; + ie_len = bss->ies->len; +#else ie = bss->information_elements; ie_len = bss->len_information_elements; +#endif /* WL_CFG80211_P2P_DEV_IF */ beacon_interval = bss->beacon_interval; +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)) + cfg80211_put_bss(wiphy, bss); +#else cfg80211_put_bss(bss); +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) */ } tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM); @@ -7333,66 +8355,62 @@ static s32 wl_update_bss_info(struct wl_priv *wl, struct net_device *ndev, u8 is } } - wl_update_prof(wl, ndev, NULL, &beacon_interval, WL_PROF_BEACONINT); - wl_update_prof(wl, ndev, NULL, &dtim_period, WL_PROF_DTIMPERIOD); + wl_update_prof(cfg, ndev, NULL, &beacon_interval, WL_PROF_BEACONINT); + wl_update_prof(cfg, ndev, NULL, &dtim_period, WL_PROF_DTIMPERIOD); update_bss_info_out: - mutex_unlock(&wl->usr_sync); + if (unlikely(err)) { + WL_ERR(("Failed with error %d\n", err)); + } + mutex_unlock(&cfg->usr_sync); return err; } static s32 -wl_bss_roaming_done(struct wl_priv *wl, struct net_device *ndev, +wl_bss_roaming_done(struct bcm_cfg80211 *cfg, struct net_device *ndev, const wl_event_msg_t *e, void *data) { - struct wl_connect_info *conn_info = wl_to_conn(wl); + struct wl_connect_info *conn_info = wl_to_conn(cfg); s32 err = 0; u8 *curbssid; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) - struct wl_bss_info *bss_info; - struct wiphy *wiphy = wl_to_wiphy(wl); +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)) || defined(WL_COMPAT_WIRELESS) + struct wiphy *wiphy = bcmcfg_to_wiphy(cfg); struct ieee80211_supported_band *band; struct ieee80211_channel *notify_channel = NULL; - u8 *buf; - u16 channel; + u32 *channel; u32 freq; -#endif /* LINUX_VERSION > 2.6.39 */ +#endif /* LINUX_VERSION > 2.6.39 || WL_COMPAT_WIRELESS */ - wl_get_assoc_ies(wl, ndev); - wl_update_prof(wl, ndev, NULL, (void *)(e->addr.octet), WL_PROF_BSSID); - curbssid = wl_read_prof(wl, ndev, WL_PROF_BSSID); - wl_update_bss_info(wl, ndev, 1); - wl_update_pmklist(ndev, wl->pmk_list, err); + wl_get_assoc_ies(cfg, ndev); + wl_update_prof(cfg, ndev, NULL, (void *)(e->addr.octet), WL_PROF_BSSID); + curbssid = wl_read_prof(cfg, ndev, WL_PROF_BSSID); + wl_update_bss_info(cfg, ndev); + wl_update_pmklist(ndev, cfg->pmk_list, err); -#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)) || defined(WL_COMPAT_WIRELESS) /* channel info for cfg80211_roamed introduced in 2.6.39-rc1 */ - buf = kzalloc(WL_EXTRA_BUF_MAX, GFP_KERNEL); - if (!buf) - goto done; - - *(__le32 *)buf = htod32(WL_EXTRA_BUF_MAX); - err = wldev_ioctl(ndev, WLC_GET_BSS_INFO, buf, WL_EXTRA_BUF_MAX, false); - if (err) - goto done; - - bss_info = (struct wl_bss_info *)(buf + 4); - channel = bss_info->ctl_ch ? bss_info->ctl_ch : - CHSPEC_CHANNEL(wl_chspec_driver_to_host(bss_info->chanspec)); - if (channel <= CH_MAX_2G_CHANNEL) + channel = (u32 *)wl_read_prof(cfg, ndev, WL_PROF_CHAN); + if (*channel <= CH_MAX_2G_CHANNEL) band = wiphy->bands[IEEE80211_BAND_2GHZ]; else band = wiphy->bands[IEEE80211_BAND_5GHZ]; - freq = ieee80211_channel_to_frequency(channel, band->band); + freq = ieee80211_channel_to_frequency(*channel, band->band); notify_channel = ieee80211_get_channel(wiphy, freq); -done: - kfree(buf); -#endif /* LINUX_VERSION > 2.6.39 */ - +#endif /* LINUX_VERSION > 2.6.39 || WL_COMPAT_WIRELESS */ +#ifdef WLFBT + /* back up the given FBT key for the further supplicant request, + * currently not checking the FBT is enabled for current BSS in DHD, + * because the supplicant decides to take it or not. + */ + if (data) { + memcpy(cfg->fbt_key, data, FBT_KEYLEN); + } +#endif /* WLFBT */ printk("wl_bss_roaming_done succeeded to " MACDBG "\n", MAC2STRDBG((u8*)(&e->addr))); cfg80211_roamed(ndev, -#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)) || defined(WL_COMPAT_WIRELESS) notify_channel, #endif curbssid, @@ -7400,29 +8418,30 @@ done: conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL); WL_DBG(("Report roaming result\n")); - wl_set_drv_status(wl, CONNECTED, ndev); + wl_set_drv_status(cfg, CONNECTED, ndev); return err; } static s32 -wl_bss_connect_done(struct wl_priv *wl, struct net_device *ndev, +wl_bss_connect_done(struct bcm_cfg80211 *cfg, struct net_device *ndev, const wl_event_msg_t *e, void *data, bool completed) { - struct wl_connect_info *conn_info = wl_to_conn(wl); - struct wl_security *sec = wl_read_prof(wl, ndev, WL_PROF_SEC); -#if defined(ROAM_ENABLE) && defined(ROAM_AP_ENV_DETECTION) - dhd_pub_t *dhd = (dhd_pub_t *)(wl->pub); -#endif /* ROAM_AP_ENV_DETECTION */ + struct wl_connect_info *conn_info = wl_to_conn(cfg); + struct wl_security *sec = wl_read_prof(cfg, ndev, WL_PROF_SEC); +#if (defined(ROAM_ENABLE) && defined(ROAM_AP_ENV_DETECTION)) || \ + defined(CUSTOM_SET_CPUCORE) + dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub); +#endif /* (ROAM_ENABLE && ROAM_AP_ENV_DETECTION) || CUSTOM_SET_CPUCORE */ s32 err = 0; - u8 *curbssid = wl_read_prof(wl, ndev, WL_PROF_BSSID); + u8 *curbssid = wl_read_prof(cfg, ndev, WL_PROF_BSSID); if (!sec) { WL_ERR(("sec is NULL\n")); return -ENODEV; } WL_DBG((" enter\n")); #ifdef ESCAN_RESULT_PATCH - if (wl_get_drv_status(wl, CONNECTED, ndev)) { + if (wl_get_drv_status(cfg, CONNECTED, ndev)) { if (memcmp(curbssid, connect_req_bssid, ETHER_ADDR_LEN) == 0) { WL_DBG((" Connected event of connected device e=%d s=%d, ignore it\n", ntoh32(e->event_type), ntoh32(e->status))); @@ -7436,33 +8455,44 @@ wl_bss_connect_done(struct wl_priv *wl, struct net_device *ndev, } #if defined(BCM4334_CHIP) - if (wl->scan_request) { - wl_notify_escan_complete(wl, ndev, true, true); + if (cfg->scan_request) { + wl_notify_escan_complete(cfg, ndev, true, true); } #endif #else - if (wl->scan_request) { - wl_notify_escan_complete(wl, ndev, true, true); + if (cfg->scan_request) { + wl_notify_escan_complete(cfg, ndev, true, true); } #endif /* ESCAN_RESULT_PATCH */ - if (wl_get_drv_status(wl, CONNECTING, ndev)) { - wl_clr_drv_status(wl, CONNECTING, ndev); + if (wl_get_drv_status(cfg, CONNECTING, ndev)) { + wl_cfg80211_scan_abort(cfg); + wl_clr_drv_status(cfg, CONNECTING, ndev); if (completed) { - wl_get_assoc_ies(wl, ndev); - wl_update_prof(wl, ndev, NULL, (void *)(e->addr.octet), WL_PROF_BSSID); - curbssid = wl_read_prof(wl, ndev, WL_PROF_BSSID); - wl_update_bss_info(wl, ndev, 0); - wl_update_pmklist(ndev, wl->pmk_list, err); - wl_set_drv_status(wl, CONNECTED, ndev); + wl_get_assoc_ies(cfg, ndev); + wl_update_prof(cfg, ndev, NULL, (void *)(e->addr.octet), WL_PROF_BSSID); + curbssid = wl_read_prof(cfg, ndev, WL_PROF_BSSID); + wl_update_bss_info(cfg, ndev); + wl_update_pmklist(ndev, cfg->pmk_list, err); + wl_set_drv_status(cfg, CONNECTED, ndev); #if defined(ROAM_ENABLE) && defined(ROAM_AP_ENV_DETECTION) if (dhd->roam_env_detection) wldev_iovar_setint(ndev, "roam_env_detection", AP_ENV_INDETERMINATE); #endif /* ROAM_AP_ENV_DETECTION */ - if (ndev != wl_to_prmry_ndev(wl)) { + if (ndev != bcmcfg_to_prmry_ndev(cfg)) { /* reinitialize completion to clear previous count */ - INIT_COMPLETION(wl->iface_disable); + INIT_COMPLETION(cfg->iface_disable); + } +#ifdef CUSTOM_SET_CPUCORE + if (wl_get_chan_isvht80(ndev, dhd)) { + if (ndev == bcmcfg_to_prmry_ndev(cfg)) + dhd->chan_isvht80 |= DHD_FLAG_STA_MODE; /* STA mode */ + else if (ndev == wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_CONNECTION)) + dhd->chan_isvht80 |= DHD_FLAG_P2P_MODE; /* p2p mode */ + dhd_set_cpucore(dhd, TRUE); } +#endif /* CUSTOM_SET_CPUCORE */ + } cfg80211_connect_result(ndev, curbssid, @@ -7480,17 +8510,27 @@ wl_bss_connect_done(struct wl_priv *wl, struct net_device *ndev, else WL_ERR(("Report connect result - connection failed\n")); } +#ifdef CONFIG_TCPACK_FASTTX + if (wl_get_chan_isvht80(ndev, dhd)) + wldev_iovar_setint(ndev, "tcpack_fast_tx", 0); + else + wldev_iovar_setint(ndev, "tcpack_fast_tx", 1); +#endif /* CONFIG_TCPACK_FASTTX */ + return err; } static s32 -wl_notify_mic_status(struct wl_priv *wl, struct net_device *ndev, +wl_notify_mic_status(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data) { + struct net_device *ndev = NULL; u16 flags = ntoh16(e->flags); enum nl80211_key_type key_type; - mutex_lock(&wl->usr_sync); + ndev = cfgdev_to_wlc_ndev(cfgdev, cfg); + + mutex_lock(&cfg->usr_sync); if (flags & WLC_EVENT_MSG_GROUP) key_type = NL80211_KEYTYPE_GROUP; else @@ -7498,55 +8538,59 @@ wl_notify_mic_status(struct wl_priv *wl, struct net_device *ndev, cfg80211_michael_mic_failure(ndev, (u8 *)&e->addr, key_type, -1, NULL, GFP_KERNEL); - mutex_unlock(&wl->usr_sync); + mutex_unlock(&cfg->usr_sync); return 0; } #ifdef PNO_SUPPORT static s32 -wl_notify_pfn_status(struct wl_priv *wl, struct net_device *ndev, +wl_notify_pfn_status(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data) { + struct net_device *ndev = NULL; + WL_ERR((">>> PNO Event\n")); + ndev = cfgdev_to_wlc_ndev(cfgdev, cfg); + #ifndef WL_SCHED_SCAN #ifndef CUSTOMER_HW4 - mutex_lock(&wl->usr_sync); + mutex_lock(&cfg->usr_sync); /* TODO: Use cfg80211_sched_scan_results(wiphy); */ cfg80211_disconnected(ndev, 0, NULL, 0, GFP_KERNEL); - mutex_unlock(&wl->usr_sync); + mutex_unlock(&cfg->usr_sync); #endif /* !CUSTOMER_HW4 */ #else /* If cfg80211 scheduled scan is supported, report the pno results via sched * scan results */ - wl_notify_sched_scan_results(wl, ndev, e, data); + wl_notify_sched_scan_results(cfg, ndev, e, data); #endif /* WL_SCHED_SCAN */ return 0; } #endif /* PNO_SUPPORT */ static s32 -wl_notify_scan_status(struct wl_priv *wl, struct net_device *ndev, +wl_notify_scan_status(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data) { struct channel_info channel_inform; struct wl_scan_results *bss_list; + struct net_device *ndev = NULL; u32 len = WL_SCAN_BUF_MAX; s32 err = 0; unsigned long flags; WL_DBG(("Enter \n")); - if (!wl_get_drv_status(wl, SCANNING, ndev)) { + if (!wl_get_drv_status(cfg, SCANNING, ndev)) { WL_ERR(("scan is not ready \n")); return err; } - if (wl->iscan_on && wl->iscan_kickstart) - return wl_wakeup_iscan(wl_to_iscan(wl)); + ndev = cfgdev_to_wlc_ndev(cfgdev, cfg); - mutex_lock(&wl->usr_sync); - wl_clr_drv_status(wl, SCANNING, ndev); + mutex_lock(&cfg->usr_sync); + wl_clr_drv_status(cfg, SCANNING, ndev); err = wldev_ioctl(ndev, WLC_GET_CHANNEL, &channel_inform, sizeof(channel_inform), false); if (unlikely(err)) { @@ -7559,12 +8603,12 @@ wl_notify_scan_status(struct wl_priv *wl, struct net_device *ndev, WL_DBG(("channel_inform.scan_channel (%d)\n", channel_inform.scan_channel)); } - wl->bss_list = wl->scan_results; - bss_list = wl->bss_list; + cfg->bss_list = cfg->scan_results; + bss_list = cfg->bss_list; memset(bss_list, 0, len); bss_list->buflen = htod32(len); err = wldev_ioctl(ndev, WLC_SCAN_RESULTS, bss_list, len, false); - if (unlikely(err)) { + if (unlikely(err) && unlikely(!cfg->scan_suppressed)) { WL_ERR(("%s Scan_results error (%d)\n", ndev->name, err)); err = -EINVAL; goto scan_done_out; @@ -7573,20 +8617,21 @@ wl_notify_scan_status(struct wl_priv *wl, struct net_device *ndev, bss_list->version = dtoh32(bss_list->version); bss_list->count = dtoh32(bss_list->count); - err = wl_inform_bss(wl); + err = wl_inform_bss(cfg); scan_done_out: - del_timer_sync(&wl->scan_timeout); - spin_lock_irqsave(&wl->cfgdrv_lock, flags); - if (wl->scan_request) { - cfg80211_scan_done(wl->scan_request, false); - wl->scan_request = NULL; + del_timer_sync(&cfg->scan_timeout); + spin_lock_irqsave(&cfg->cfgdrv_lock, flags); + if (cfg->scan_request) { + cfg80211_scan_done(cfg->scan_request, false); + cfg->scan_request = NULL; } - spin_unlock_irqrestore(&wl->cfgdrv_lock, flags); + spin_unlock_irqrestore(&cfg->cfgdrv_lock, flags); WL_DBG(("cfg80211_scan_done\n")); - mutex_unlock(&wl->usr_sync); + mutex_unlock(&cfg->usr_sync); return err; } + static s32 wl_frame_get_mgmt(u16 fc, const struct ether_addr *da, const struct ether_addr *sa, const struct ether_addr *bssid, @@ -7632,11 +8677,11 @@ wl_frame_get_mgmt(u16 fc, const struct ether_addr *da, #ifdef WL_CFG80211_GON_COLLISION static void -wl_gon_req_collision(struct wl_priv *wl, wl_action_frame_t *tx_act_frm, +wl_gon_req_collision(struct bcm_cfg80211 *cfg, wl_action_frame_t *tx_act_frm, wifi_p2p_pub_act_frame_t *rx_act_frm, struct net_device *ndev, struct ether_addr sa, struct ether_addr da) { - if (wl->afx_hdl->pending_tx_act_frm == NULL) + if (cfg->afx_hdl->pending_tx_act_frm == NULL) return; if (tx_act_frm && @@ -7661,20 +8706,20 @@ wl_gon_req_collision(struct wl_priv *wl, wl_action_frame_t *tx_act_frm, */ if (memcmp(sa.octet, da.octet, ETHER_ADDR_LEN) < 0) { /* block to send tx gon request */ - wl->block_gon_req_tx_count = BLOCK_GON_REQ_MAX_NUM; + cfg->block_gon_req_tx_count = BLOCK_GON_REQ_MAX_NUM; WL_ERR((" block to send gon req tx !!!\n")); /* if we are finding a common channel for sending af, * do not scan more to block to send current gon req */ - if (wl_get_drv_status_all(wl, FINDING_COMMON_CHANNEL)) { - wl_clr_drv_status(wl, FINDING_COMMON_CHANNEL, ndev); - complete(&wl->act_frm_scan); + if (wl_get_drv_status_all(cfg, FINDING_COMMON_CHANNEL)) { + wl_clr_drv_status(cfg, FINDING_COMMON_CHANNEL, ndev); + complete(&cfg->act_frm_scan); } } else { /* drop gon request of peer to process gon request by my device. */ WL_ERR((" drop to receive gon req rx !!! \n")); - wl->block_gon_req_rx_count = BLOCK_GON_REQ_MAX_NUM; + cfg->block_gon_req_rx_count = BLOCK_GON_REQ_MAX_NUM; } return; @@ -7682,25 +8727,38 @@ wl_gon_req_collision(struct wl_priv *wl, wl_action_frame_t *tx_act_frm, #endif /* WL_CFG80211_GON_COLLISION */ void -wl_stop_wait_next_action_frame(struct wl_priv *wl, struct net_device *ndev) +wl_stop_wait_next_action_frame(struct bcm_cfg80211 *cfg, struct net_device *ndev) { - if (wl_get_drv_status_all(wl, SENDING_ACT_FRM)) { - if (!(wl_get_p2p_status(wl, ACTION_TX_COMPLETED) || - wl_get_p2p_status(wl, ACTION_TX_NOACK))) - wl_set_p2p_status(wl, ACTION_TX_COMPLETED); + if (wl_get_drv_status_all(cfg, FINDING_COMMON_CHANNEL)) { + if (timer_pending(&cfg->p2p->listen_timer)) { + del_timer_sync(&cfg->p2p->listen_timer); + } + if (cfg->afx_hdl != NULL) { + if (cfg->afx_hdl->dev != NULL) { + wl_clr_drv_status(cfg, SCANNING, cfg->afx_hdl->dev); + wl_clr_drv_status(cfg, FINDING_COMMON_CHANNEL, cfg->afx_hdl->dev); + } + cfg->afx_hdl->peer_chan = WL_INVALID; + } + complete(&cfg->act_frm_scan); + WL_DBG(("*** Wake UP ** Working afx searching is cleared\n")); + } else if (wl_get_drv_status_all(cfg, SENDING_ACT_FRM)) { + if (!(wl_get_p2p_status(cfg, ACTION_TX_COMPLETED) || + wl_get_p2p_status(cfg, ACTION_TX_NOACK))) + wl_set_p2p_status(cfg, ACTION_TX_COMPLETED); WL_DBG(("*** Wake UP ** abort actframe iovar\n")); /* if channel is not zero, "actfame" uses off channel scan. * So abort scan for off channel completion. */ - if (wl->af_sent_channel) - wl_cfg80211_scan_abort(wl); + if (cfg->af_sent_channel) + wl_cfg80211_scan_abort(cfg); } #ifdef WL_CFG80211_SYNC_GON - else if (wl_get_drv_status_all(wl, WAITING_NEXT_ACT_FRM_LISTEN)) { + else if (wl_get_drv_status_all(cfg, WAITING_NEXT_ACT_FRM_LISTEN)) { WL_DBG(("*** Wake UP ** abort listen for next af frame\n")); /* So abort scan to cancel listen */ - wl_cfg80211_scan_abort(wl); + wl_cfg80211_scan_abort(cfg); } #endif /* WL_CFG80211_SYNC_GON */ } @@ -7741,25 +8799,25 @@ bool wl_cfg80211_is_wes(void *frame, u32 frame_len) return false; } +#endif /* WES_SUPPORT */ int wl_cfg80211_get_ioctl_version(void) { return ioctl_version; } -#endif /* WES_SUPPORT */ static s32 -wl_notify_rx_mgmt_frame(struct wl_priv *wl, struct net_device *ndev, +wl_notify_rx_mgmt_frame(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data) { struct ieee80211_supported_band *band; - struct wiphy *wiphy = wl_to_wiphy(wl); + struct wiphy *wiphy = bcmcfg_to_wiphy(cfg); struct ether_addr da; struct ether_addr bssid; bool isfree = false; s32 err = 0; s32 freq; - struct net_device *dev = NULL; + struct net_device *ndev = NULL; wifi_p2p_pub_act_frame_t *act_frm = NULL; wifi_p2p_action_frame_t *p2p_act_frm = NULL; wifi_p2psd_gas_pub_act_frame_t *sd_act_frm = NULL; @@ -7773,11 +8831,7 @@ wl_notify_rx_mgmt_frame(struct wl_priv *wl, struct net_device *ndev, memset(&bssid, 0, ETHER_ADDR_LEN); - if (wl->p2p_net == ndev) { - dev = wl_to_prmry_ndev(wl); - } else { - dev = ndev; - } + ndev = cfgdev_to_wlc_ndev(cfgdev, cfg); if (channel <= CH_MAX_2G_CHANNEL) band = wiphy->bands[IEEE80211_BAND_2GHZ]; @@ -7794,13 +8848,13 @@ wl_notify_rx_mgmt_frame(struct wl_priv *wl, struct net_device *ndev, freq = ieee80211_channel_to_frequency(channel, band->band); #endif if (event == WLC_E_ACTION_FRAME_RX) { - wldev_iovar_getbuf_bsscfg(dev, "cur_etheraddr", - NULL, 0, wl->ioctl_buf, WLC_IOCTL_SMLEN, bsscfgidx, &wl->ioctl_buf_sync); + wldev_iovar_getbuf_bsscfg(ndev, "cur_etheraddr", + NULL, 0, cfg->ioctl_buf, WLC_IOCTL_SMLEN, bsscfgidx, &cfg->ioctl_buf_sync); - err = wldev_ioctl(dev, WLC_GET_BSSID, &bssid, ETHER_ADDR_LEN, false); + err = wldev_ioctl(ndev, WLC_GET_BSSID, &bssid, ETHER_ADDR_LEN, false); if (err < 0) WL_ERR(("WLC_GET_BSSID error %d\n", err)); - memcpy(da.octet, wl->ioctl_buf, ETHER_ADDR_LEN); + memcpy(da.octet, cfg->ioctl_buf, ETHER_ADDR_LEN); err = wl_frame_get_mgmt(FC_ACTION, &da, &e->addr, &bssid, &mgmt_frame, &mgmt_frame_len, (u8 *)((wl_event_rx_frame_data_t *)rxframe + 1)); @@ -7824,16 +8878,14 @@ wl_notify_rx_mgmt_frame(struct wl_priv *wl, struct net_device *ndev, sd_act_frm = (wifi_p2psd_gas_pub_act_frame_t *) (&mgmt_frame[DOT11_MGMT_HDR_LEN]); - if (sd_act_frm && wl_get_drv_status_all(wl, WAITING_NEXT_ACT_FRM)) { - if (wl->next_af_subtype == sd_act_frm->action) { + if (sd_act_frm && wl_get_drv_status_all(cfg, WAITING_NEXT_ACT_FRM)) { + if (cfg->next_af_subtype == sd_act_frm->action) { WL_DBG(("We got a right next frame of SD!(%d)\n", sd_act_frm->action)); - wl_clr_drv_status(wl, WAITING_NEXT_ACT_FRM, - (ndev == wl->p2p_net) ? - wl_to_prmry_ndev(wl) : ndev); + wl_clr_drv_status(cfg, WAITING_NEXT_ACT_FRM, ndev); /* Stop waiting for next AF. */ - wl_stop_wait_next_action_frame(wl, ndev); + wl_stop_wait_next_action_frame(cfg, ndev); } } (void) sd_act_frm; @@ -7849,41 +8901,59 @@ wl_notify_rx_mgmt_frame(struct wl_priv *wl, struct net_device *ndev, goto exit; } #endif /* WES_SUPPORT */ - if (wl->p2p_net == ndev) - ndev = wl_to_prmry_ndev(wl); + + /* use primary device instead of p2p's */ + if (discover_cfgdev(cfgdev, cfg)) + cfgdev = bcmcfg_to_prmry_cfgdev(cfgdev, cfg); + + if (cfg->next_af_subtype != P2P_PAF_SUBTYPE_INVALID) { + u8 action = 0; + if (wl_get_public_action(&mgmt_frame[DOT11_MGMT_HDR_LEN], + mgmt_frame_len - DOT11_MGMT_HDR_LEN, &action) != BCME_OK) { + WL_DBG(("Recived action is not public action frame\n")); + } else if (cfg->next_af_subtype == action) { + WL_DBG(("Recived action is the waiting action(%d)\n", + action)); + wl_clr_drv_status(cfg, WAITING_NEXT_ACT_FRM, ndev); + + /* Stop waiting for next AF. */ + wl_stop_wait_next_action_frame(cfg, ndev); + } + } } if (act_frm) { #ifdef WL_CFG80211_GON_COLLISION if (act_frm->subtype == P2P_PAF_GON_REQ) { - wl_gon_req_collision(wl, - &wl->afx_hdl->pending_tx_act_frm->action_frame, + wl_gon_req_collision(cfg, + &cfg->afx_hdl->pending_tx_act_frm->action_frame, act_frm, ndev, e->addr, da); - if (wl->block_gon_req_rx_count) { + if (cfg->block_gon_req_rx_count) { WL_ERR(("drop frame GON Req Rx : count (%d)\n", - wl->block_gon_req_rx_count)); - wl->block_gon_req_rx_count--; + cfg->block_gon_req_rx_count)); + cfg->block_gon_req_rx_count--; goto exit; } } else if (act_frm->subtype == P2P_PAF_GON_CONF) { /* if go formation done, clear it */ - wl->block_gon_req_tx_count = 0; - wl->block_gon_req_rx_count = 0; + cfg->block_gon_req_tx_count = 0; + cfg->block_gon_req_rx_count = 0; } #endif /* WL_CFG80211_GON_COLLISION */ - if (wl_get_drv_status_all(wl, WAITING_NEXT_ACT_FRM)) { - if (wl->next_af_subtype == act_frm->subtype) { + if (wl_get_drv_status_all(cfg, WAITING_NEXT_ACT_FRM)) { + if (cfg->next_af_subtype == act_frm->subtype) { WL_DBG(("We got a right next frame!(%d)\n", act_frm->subtype)); - wl_clr_drv_status(wl, WAITING_NEXT_ACT_FRM, - (ndev == wl->p2p_net) ? - wl_to_prmry_ndev(wl) : ndev); + wl_clr_drv_status(cfg, WAITING_NEXT_ACT_FRM, ndev); + + if (cfg->next_af_subtype == P2P_PAF_GON_CONF) { + OSL_SLEEP(20); + } /* Stop waiting for next AF. */ - if (act_frm->subtype != P2P_PAF_GON_CONF) - wl_stop_wait_next_action_frame(wl, ndev); + wl_stop_wait_next_action_frame(cfg, ndev); } } } @@ -7895,11 +8965,11 @@ wl_notify_rx_mgmt_frame(struct wl_priv *wl, struct net_device *ndev, */ if (act_frm && ((act_frm->subtype == P2P_PAF_GON_CONF) || (act_frm->subtype == P2P_PAF_PROVDIS_RSP))) { - wldev_iovar_setint(dev, "mpc", 1); + wldev_iovar_setint(ndev, "mpc", 1); } if (act_frm && (act_frm->subtype == P2P_PAF_GON_CONF)) { WL_DBG(("P2P: GO_NEG_PHASE status cleared \n")); - wl_clr_p2p_status(wl, GO_NEG_PHASE); + wl_clr_p2p_status(cfg, GO_NEG_PHASE); } } else { mgmt_frame = (u8 *)((wl_event_rx_frame_data_t *)rxframe + 1); @@ -7914,16 +8984,16 @@ wl_notify_rx_mgmt_frame(struct wl_priv *wl, struct net_device *ndev, "WLC_E_P2P_PROBREQ_MSG":"WLC_E_PROBREQ_MSG")); #ifdef WL_CFG80211_USE_PRB_REQ_FOR_AF_TX - if (WL_DRV_STATUS_SENDING_AF_FRM_EXT(wl) && - !memcmp(wl->afx_hdl->tx_dst_addr.octet, e->addr.octet, + if (WL_DRV_STATUS_SENDING_AF_FRM_EXT(cfg) && + !memcmp(cfg->afx_hdl->tx_dst_addr.octet, e->addr.octet, ETHER_ADDR_LEN)) { - if (wl->afx_hdl->pending_tx_act_frm && - wl_get_drv_status_all(wl, FINDING_COMMON_CHANNEL)) { + if (cfg->afx_hdl->pending_tx_act_frm && + wl_get_drv_status_all(cfg, FINDING_COMMON_CHANNEL)) { s32 channel = CHSPEC_CHANNEL(hton16(rxframe->channel)); WL_DBG(("PROBE REQUEST : Peer found, channel : %d\n", channel)); - wl->afx_hdl->peer_chan = channel; - complete(&wl->act_frm_scan); + cfg->afx_hdl->peer_chan = channel; + complete(&cfg->act_frm_scan); } } #endif /* WL_CFG80211_USE_PRB_REQ_FOR_AF_TX */ @@ -7931,8 +9001,8 @@ wl_notify_rx_mgmt_frame(struct wl_priv *wl, struct net_device *ndev, /* Filter any P2P probe reqs arriving during the * GO-NEG Phase */ - if (wl->p2p && - wl_get_p2p_status(wl, GO_NEG_PHASE)) { + if (cfg->p2p && + wl_get_p2p_status(cfg, GO_NEG_PHASE)) { WL_DBG(("Filtering P2P probe_req while " "being in GO-Neg state\n")); return 0; @@ -7940,11 +9010,11 @@ wl_notify_rx_mgmt_frame(struct wl_priv *wl, struct net_device *ndev, } } -#if 1 //LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) - cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, mgmt_frame_len, GFP_ATOMIC); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) || defined(WL_COMPAT_WIRELESS) + cfg80211_rx_mgmt(cfgdev, freq, 0, mgmt_frame, mgmt_frame_len, GFP_ATOMIC); #else - cfg80211_rx_mgmt(ndev, freq, mgmt_frame, mgmt_frame_len, GFP_ATOMIC); -#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) */ + cfg80211_rx_mgmt(cfgdev, freq, mgmt_frame, mgmt_frame_len, GFP_ATOMIC); +#endif /* LINUX_VERSION >= VERSION(3, 4, 0) || WL_COMPAT_WIRELESS */ WL_DBG(("mgmt_frame_len (%d) , e->datalen (%d), channel (%d), freq (%d)\n", mgmt_frame_len, ntoh32(e->datalen), channel, freq)); @@ -7960,18 +9030,19 @@ exit: */ #define FULL_ESCAN_ON_PFN_NET_FOUND 0 static s32 -wl_notify_sched_scan_results(struct wl_priv *wl, struct net_device *ndev, +wl_notify_sched_scan_results(struct bcm_cfg80211 *cfg, struct net_device *ndev, const wl_event_msg_t *e, void *data) { wl_pfn_net_info_t *netinfo, *pnetinfo; - struct cfg80211_scan_request request; - struct wiphy *wiphy = wl_to_wiphy(wl); + struct wiphy *wiphy = bcmcfg_to_wiphy(cfg); int err = 0; + struct cfg80211_scan_request *request = NULL; struct cfg80211_ssid ssid[MAX_PFN_LIST_COUNT]; struct ieee80211_channel *channel = NULL; int channel_req = 0; int band = 0; struct wl_pfn_scanresults *pfn_result = (struct wl_pfn_scanresults *)data; + int n_pfn_results = pfn_result->count; WL_DBG(("Enter\n")); @@ -7979,26 +9050,32 @@ wl_notify_sched_scan_results(struct wl_priv *wl, struct net_device *ndev, WL_PNO(("PFN NET LOST event. Do Nothing \n")); return 0; } - WL_PNO((">>> PFN NET FOUND event. count:%d \n", pfn_result->count)); - if (pfn_result->count > 0) { + WL_PNO((">>> PFN NET FOUND event. count:%d \n", n_pfn_results)); + if (n_pfn_results > 0) { int i; - memset(&request, 0x00, sizeof(struct cfg80211_scan_request)); - memset(&ssid, 0x00, sizeof(ssid)); - request.wiphy = wiphy; - + if (n_pfn_results > MAX_PFN_LIST_COUNT) + n_pfn_results = MAX_PFN_LIST_COUNT; pnetinfo = (wl_pfn_net_info_t *)(data + sizeof(wl_pfn_scanresults_t) - sizeof(wl_pfn_net_info_t)); + + memset(&ssid, 0x00, sizeof(ssid)); + + request = kzalloc(sizeof(*request) + + sizeof(*request->channels) * n_pfn_results, + GFP_KERNEL); channel = (struct ieee80211_channel *)kzalloc( - (sizeof(struct ieee80211_channel) * MAX_PFN_LIST_COUNT), + (sizeof(struct ieee80211_channel) * n_pfn_results), GFP_KERNEL); - if (!channel) { + if (!request || !channel) { WL_ERR(("No memory")); err = -ENOMEM; goto out_err; } - for (i = 0; i < pfn_result->count; i++) { + request->wiphy = wiphy; + + for (i = 0; i < n_pfn_results; i++) { netinfo = &pnetinfo[i]; if (!netinfo) { WL_ERR(("Invalid netinfo ptr. index:%d", i)); @@ -8016,7 +9093,7 @@ wl_notify_sched_scan_results(struct wl_priv *wl, struct net_device *ndev, memcpy(ssid[i].ssid, netinfo->pfnsubnet.SSID, netinfo->pfnsubnet.SSID_len); ssid[i].ssid_len = netinfo->pfnsubnet.SSID_len; - request.n_ssids++; + request->n_ssids++; channel_req = netinfo->pfnsubnet.channel; band = (channel_req <= CH_MAX_2G_CHANNEL) ? NL80211_BAND_2GHZ @@ -8024,46 +9101,49 @@ wl_notify_sched_scan_results(struct wl_priv *wl, struct net_device *ndev, channel[i].center_freq = ieee80211_channel_to_frequency(channel_req, band); channel[i].band = band; channel[i].flags |= IEEE80211_CHAN_NO_HT40; - request.channels[i] = &channel[i]; - request.n_channels++; + request->channels[i] = &channel[i]; + request->n_channels++; } /* assign parsed ssid array */ - if (request.n_ssids) - request.ssids = &ssid[0]; + if (request->n_ssids) + request->ssids = &ssid[0]; - if (wl_get_drv_status_all(wl, SCANNING)) { + if (wl_get_drv_status_all(cfg, SCANNING)) { /* Abort any on-going scan */ - wl_notify_escan_complete(wl, ndev, true, true); + wl_notify_escan_complete(cfg, ndev, true, true); } - if (wl_get_p2p_status(wl, DISCOVERY_ON)) { + if (wl_get_p2p_status(cfg, DISCOVERY_ON)) { WL_PNO((">>> P2P discovery was ON. Disabling it\n")); - err = wl_cfgp2p_discover_enable_search(wl, false); + err = wl_cfgp2p_discover_enable_search(cfg, false); if (unlikely(err)) { - wl_clr_drv_status(wl, SCANNING, ndev); + wl_clr_drv_status(cfg, SCANNING, ndev); goto out_err; } + p2p_scan(cfg) = false; } - wl_set_drv_status(wl, SCANNING, ndev); + wl_set_drv_status(cfg, SCANNING, ndev); #if FULL_ESCAN_ON_PFN_NET_FOUND WL_PNO((">>> Doing Full ESCAN on PNO event\n")); - err = wl_do_escan(wl, wiphy, ndev, NULL); + err = wl_do_escan(cfg, wiphy, ndev, NULL); #else WL_PNO((">>> Doing targeted ESCAN on PNO event\n")); - err = wl_do_escan(wl, wiphy, ndev, &request); + err = wl_do_escan(cfg, wiphy, ndev, request); #endif if (err) { - wl_clr_drv_status(wl, SCANNING, ndev); + wl_clr_drv_status(cfg, SCANNING, ndev); goto out_err; } - wl->sched_scan_running = TRUE; + cfg->sched_scan_running = TRUE; } else { WL_ERR(("FALSE PNO Event. (pfn_count == 0) \n")); } out_err: + if (request) + kfree(request); if (channel) kfree(channel); return err; @@ -8080,434 +9160,239 @@ static void wl_init_conf(struct wl_conf *conf) conf->tx_power = -1; } -static void wl_init_prof(struct wl_priv *wl, struct net_device *ndev) +static void wl_init_prof(struct bcm_cfg80211 *cfg, struct net_device *ndev) { unsigned long flags; - struct wl_profile *profile = wl_get_profile_by_netdev(wl, ndev); + struct wl_profile *profile = wl_get_profile_by_netdev(cfg, ndev); - spin_lock_irqsave(&wl->cfgdrv_lock, flags); + spin_lock_irqsave(&cfg->cfgdrv_lock, flags); memset(profile, 0, sizeof(struct wl_profile)); - spin_unlock_irqrestore(&wl->cfgdrv_lock, flags); -} - -static void wl_init_event_handler(struct wl_priv *wl) -{ - memset(wl->evt_handler, 0, sizeof(wl->evt_handler)); - - wl->evt_handler[WLC_E_SCAN_COMPLETE] = wl_notify_scan_status; - wl->evt_handler[WLC_E_AUTH] = wl_notify_connect_status; - wl->evt_handler[WLC_E_ASSOC] = wl_notify_connect_status; - wl->evt_handler[WLC_E_LINK] = wl_notify_connect_status; - wl->evt_handler[WLC_E_DEAUTH_IND] = wl_notify_connect_status; - wl->evt_handler[WLC_E_DEAUTH] = wl_notify_connect_status; - wl->evt_handler[WLC_E_DISASSOC_IND] = wl_notify_connect_status; - wl->evt_handler[WLC_E_ASSOC_IND] = wl_notify_connect_status; - wl->evt_handler[WLC_E_REASSOC_IND] = wl_notify_connect_status; - wl->evt_handler[WLC_E_ROAM] = wl_notify_roaming_status; - wl->evt_handler[WLC_E_MIC_ERROR] = wl_notify_mic_status; - wl->evt_handler[WLC_E_SET_SSID] = wl_notify_connect_status; - wl->evt_handler[WLC_E_ACTION_FRAME_RX] = wl_notify_rx_mgmt_frame; - wl->evt_handler[WLC_E_PROBREQ_MSG] = wl_notify_rx_mgmt_frame; - wl->evt_handler[WLC_E_P2P_PROBREQ_MSG] = wl_notify_rx_mgmt_frame; - wl->evt_handler[WLC_E_P2P_DISC_LISTEN_COMPLETE] = wl_cfgp2p_listen_complete; - wl->evt_handler[WLC_E_ACTION_FRAME_COMPLETE] = wl_cfgp2p_action_tx_complete; - wl->evt_handler[WLC_E_ACTION_FRAME_OFF_CHAN_COMPLETE] = wl_cfgp2p_action_tx_complete; + spin_unlock_irqrestore(&cfg->cfgdrv_lock, flags); +} + +static void wl_init_event_handler(struct bcm_cfg80211 *cfg) +{ + memset(cfg->evt_handler, 0, sizeof(cfg->evt_handler)); + + cfg->evt_handler[WLC_E_SCAN_COMPLETE] = wl_notify_scan_status; + cfg->evt_handler[WLC_E_AUTH] = wl_notify_connect_status; + cfg->evt_handler[WLC_E_ASSOC] = wl_notify_connect_status; + cfg->evt_handler[WLC_E_LINK] = wl_notify_connect_status; + cfg->evt_handler[WLC_E_DEAUTH_IND] = wl_notify_connect_status; + cfg->evt_handler[WLC_E_DEAUTH] = wl_notify_connect_status; + cfg->evt_handler[WLC_E_DISASSOC_IND] = wl_notify_connect_status; + cfg->evt_handler[WLC_E_ASSOC_IND] = wl_notify_connect_status; + cfg->evt_handler[WLC_E_REASSOC_IND] = wl_notify_connect_status; + cfg->evt_handler[WLC_E_ROAM] = wl_notify_roaming_status; + cfg->evt_handler[WLC_E_MIC_ERROR] = wl_notify_mic_status; + cfg->evt_handler[WLC_E_SET_SSID] = wl_notify_connect_status; + cfg->evt_handler[WLC_E_ACTION_FRAME_RX] = wl_notify_rx_mgmt_frame; + cfg->evt_handler[WLC_E_PROBREQ_MSG] = wl_notify_rx_mgmt_frame; + cfg->evt_handler[WLC_E_P2P_PROBREQ_MSG] = wl_notify_rx_mgmt_frame; + cfg->evt_handler[WLC_E_P2P_DISC_LISTEN_COMPLETE] = wl_cfgp2p_listen_complete; + cfg->evt_handler[WLC_E_ACTION_FRAME_COMPLETE] = wl_cfgp2p_action_tx_complete; + cfg->evt_handler[WLC_E_ACTION_FRAME_OFF_CHAN_COMPLETE] = wl_cfgp2p_action_tx_complete; + cfg->evt_handler[WLC_E_JOIN] = wl_notify_connect_status; + cfg->evt_handler[WLC_E_START] = wl_notify_connect_status; #ifdef PNO_SUPPORT - wl->evt_handler[WLC_E_PFN_NET_FOUND] = wl_notify_pfn_status; + cfg->evt_handler[WLC_E_PFN_NET_FOUND] = wl_notify_pfn_status; #endif /* PNO_SUPPORT */ - wl->evt_handler[WLC_E_TDLS_PEER_EVENT] = wl_tdls_event_handler; +#ifdef WLTDLS + cfg->evt_handler[WLC_E_TDLS_PEER_EVENT] = wl_tdls_event_handler; +#endif /* WLTDLS */ + cfg->evt_handler[WLC_E_BSSID] = wl_notify_roaming_status; +#ifdef WLAIBSS + cfg->evt_handler[WLC_E_AIBSS_TXFAIL] = wl_notify_aibss_txfail; +#endif /* WLAIBSS */ +} + +#if defined(STATIC_WL_PRIV_STRUCT) +static void +wl_init_escan_result_buf(struct bcm_cfg80211 *cfg) +{ +#if defined(DUAL_ESCAN_RESULT_BUFFER) + cfg->escan_info.escan_buf[0] = DHD_OS_PREALLOC(cfg->pub, DHD_PREALLOC_WIPHY_ESCAN0, 0); + bzero(cfg->escan_info.escan_buf[0], ESCAN_BUF_SIZE); + cfg->escan_info.escan_buf[1] = DHD_OS_PREALLOC(cfg->pub, DHD_PREALLOC_WIPHY_ESCAN1, 0); + bzero(cfg->escan_info.escan_buf[1], ESCAN_BUF_SIZE); + cfg->escan_info.escan_type[0] = 0; + cfg->escan_info.escan_type[1] = 0; +#else + cfg->escan_info.escan_buf = DHD_OS_PREALLOC(cfg->pub, DHD_PREALLOC_WIPHY_ESCAN0, 0); + bzero(cfg->escan_info.escan_buf, ESCAN_BUF_SIZE); +#endif /* DUAL_ESCAN_RESULT_BUFFER */ +} + +static void +wl_deinit_escan_result_buf(struct bcm_cfg80211 *cfg) +{ +#if defined(DUAL_ESCAN_RESULT_BUFFER) + cfg->escan_info.escan_buf[0] = NULL; + cfg->escan_info.escan_buf[1] = NULL; + cfg->escan_info.escan_type[0] = 0; + cfg->escan_info.escan_type[1] = 0; +#else + cfg->escan_info.escan_buf = NULL; +#endif + } +#endif /* STATIC_WL_PRIV_STRUCT */ -static s32 wl_init_priv_mem(struct wl_priv *wl) +static s32 wl_init_priv_mem(struct bcm_cfg80211 *cfg) { WL_DBG(("Enter \n")); - wl->scan_results = (void *)kzalloc(WL_SCAN_BUF_MAX, GFP_KERNEL); - if (unlikely(!wl->scan_results)) { + cfg->scan_results = (void *)kzalloc(WL_SCAN_BUF_MAX, GFP_KERNEL); + if (unlikely(!cfg->scan_results)) { WL_ERR(("Scan results alloc failed\n")); goto init_priv_mem_out; } - wl->conf = (void *)kzalloc(sizeof(*wl->conf), GFP_KERNEL); - if (unlikely(!wl->conf)) { + cfg->conf = (void *)kzalloc(sizeof(*cfg->conf), GFP_KERNEL); + if (unlikely(!cfg->conf)) { WL_ERR(("wl_conf alloc failed\n")); goto init_priv_mem_out; } - wl->scan_req_int = - (void *)kzalloc(sizeof(*wl->scan_req_int), GFP_KERNEL); - if (unlikely(!wl->scan_req_int)) { + cfg->scan_req_int = + (void *)kzalloc(sizeof(*cfg->scan_req_int), GFP_KERNEL); + if (unlikely(!cfg->scan_req_int)) { WL_ERR(("Scan req alloc failed\n")); goto init_priv_mem_out; } - wl->ioctl_buf = (void *)kzalloc(WLC_IOCTL_MAXLEN, GFP_KERNEL); - if (unlikely(!wl->ioctl_buf)) { + cfg->ioctl_buf = (void *)kzalloc(WLC_IOCTL_MAXLEN, GFP_KERNEL); + if (unlikely(!cfg->ioctl_buf)) { WL_ERR(("Ioctl buf alloc failed\n")); goto init_priv_mem_out; } - wl->escan_ioctl_buf = (void *)kzalloc(WLC_IOCTL_MAXLEN, GFP_KERNEL); - if (unlikely(!wl->escan_ioctl_buf)) { + cfg->escan_ioctl_buf = (void *)kzalloc(WLC_IOCTL_MAXLEN, GFP_KERNEL); + if (unlikely(!cfg->escan_ioctl_buf)) { WL_ERR(("Ioctl buf alloc failed\n")); goto init_priv_mem_out; } - wl->extra_buf = (void *)kzalloc(WL_EXTRA_BUF_MAX, GFP_KERNEL); - if (unlikely(!wl->extra_buf)) { + cfg->extra_buf = (void *)kzalloc(WL_EXTRA_BUF_MAX, GFP_KERNEL); + if (unlikely(!cfg->extra_buf)) { WL_ERR(("Extra buf alloc failed\n")); goto init_priv_mem_out; } - wl->iscan = (void *)kzalloc(sizeof(*wl->iscan), GFP_KERNEL); - if (unlikely(!wl->iscan)) { - WL_ERR(("Iscan buf alloc failed\n")); - goto init_priv_mem_out; - } - wl->pmk_list = (void *)kzalloc(sizeof(*wl->pmk_list), GFP_KERNEL); - if (unlikely(!wl->pmk_list)) { + cfg->pmk_list = (void *)kzalloc(sizeof(*cfg->pmk_list), GFP_KERNEL); + if (unlikely(!cfg->pmk_list)) { WL_ERR(("pmk list alloc failed\n")); goto init_priv_mem_out; } - wl->sta_info = (void *)kzalloc(sizeof(*wl->sta_info), GFP_KERNEL); - if (unlikely(!wl->sta_info)) { + cfg->sta_info = (void *)kzalloc(sizeof(*cfg->sta_info), GFP_KERNEL); + if (unlikely(!cfg->sta_info)) { WL_ERR(("sta info alloc failed\n")); goto init_priv_mem_out; } #if defined(STATIC_WL_PRIV_STRUCT) - wl->conn_info = (void *)kzalloc(sizeof(*wl->conn_info), GFP_KERNEL); - if (unlikely(!wl->conn_info)) { - WL_ERR(("wl->conn_info alloc failed\n")); + cfg->conn_info = (void *)kzalloc(sizeof(*cfg->conn_info), GFP_KERNEL); + if (unlikely(!cfg->conn_info)) { + WL_ERR(("cfg->conn_info alloc failed\n")); goto init_priv_mem_out; } - wl->ie = (void *)kzalloc(sizeof(*wl->ie), GFP_KERNEL); - if (unlikely(!wl->ie)) { - WL_ERR(("wl->ie alloc failed\n")); + cfg->ie = (void *)kzalloc(sizeof(*cfg->ie), GFP_KERNEL); + if (unlikely(!cfg->ie)) { + WL_ERR(("cfg->ie alloc failed\n")); goto init_priv_mem_out; } -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - wl->escan_info.escan_buf[0] = dhd_os_prealloc(NULL, DHD_PREALLOC_WIPHY_ESCAN0, 0); - bzero(wl->escan_info.escan_buf[0], ESCAN_BUF_SIZE); - wl->escan_info.escan_buf[1] = dhd_os_prealloc(NULL, DHD_PREALLOC_WIPHY_ESCAN1, 0); - bzero(wl->escan_info.escan_buf[1], ESCAN_BUF_SIZE); -#else - wl->escan_info.escan_buf = dhd_os_prealloc(NULL, DHD_PREALLOC_WIPHY_ESCAN0, 0); - bzero(wl->escan_info.escan_buf, ESCAN_BUF_SIZE); -#endif /* CUSTOMER_HW4 && DUAL_ESCAN_RESULT_BUFFER */ + wl_init_escan_result_buf(cfg); #endif /* STATIC_WL_PRIV_STRUCT */ - wl->afx_hdl = (void *)kzalloc(sizeof(*wl->afx_hdl), GFP_KERNEL); - if (unlikely(!wl->afx_hdl)) { + cfg->afx_hdl = (void *)kzalloc(sizeof(*cfg->afx_hdl), GFP_KERNEL); + if (unlikely(!cfg->afx_hdl)) { WL_ERR(("afx hdl alloc failed\n")); goto init_priv_mem_out; } else { - init_completion(&wl->act_frm_scan); - init_completion(&wl->wait_next_af); + init_completion(&cfg->act_frm_scan); + init_completion(&cfg->wait_next_af); - INIT_WORK(&wl->afx_hdl->work, wl_cfg80211_afx_handler); + INIT_WORK(&cfg->afx_hdl->work, wl_cfg80211_afx_handler); } return 0; init_priv_mem_out: - wl_deinit_priv_mem(wl); + wl_deinit_priv_mem(cfg); return -ENOMEM; } -static void wl_deinit_priv_mem(struct wl_priv *wl) -{ - kfree(wl->scan_results); - wl->scan_results = NULL; - kfree(wl->conf); - wl->conf = NULL; - kfree(wl->scan_req_int); - wl->scan_req_int = NULL; - kfree(wl->ioctl_buf); - wl->ioctl_buf = NULL; - kfree(wl->escan_ioctl_buf); - wl->escan_ioctl_buf = NULL; - kfree(wl->extra_buf); - wl->extra_buf = NULL; - kfree(wl->iscan); - wl->iscan = NULL; - kfree(wl->pmk_list); - wl->pmk_list = NULL; - kfree(wl->sta_info); - wl->sta_info = NULL; +static void wl_deinit_priv_mem(struct bcm_cfg80211 *cfg) +{ + kfree(cfg->scan_results); + cfg->scan_results = NULL; + kfree(cfg->conf); + cfg->conf = NULL; + kfree(cfg->scan_req_int); + cfg->scan_req_int = NULL; + kfree(cfg->ioctl_buf); + cfg->ioctl_buf = NULL; + kfree(cfg->escan_ioctl_buf); + cfg->escan_ioctl_buf = NULL; + kfree(cfg->extra_buf); + cfg->extra_buf = NULL; + kfree(cfg->pmk_list); + cfg->pmk_list = NULL; + kfree(cfg->sta_info); + cfg->sta_info = NULL; #if defined(STATIC_WL_PRIV_STRUCT) - kfree(wl->conn_info); - wl->conn_info = NULL; - kfree(wl->ie); - wl->ie = NULL; -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - wl->escan_info.escan_buf[0] = NULL; - wl->escan_info.escan_buf[1] = NULL; -#else - wl->escan_info.escan_buf = NULL; -#endif /* CUSTOMER_HW4 && DUAL_ESCAN_RESULT_BUFFER */ + kfree(cfg->conn_info); + cfg->conn_info = NULL; + kfree(cfg->ie); + cfg->ie = NULL; + wl_deinit_escan_result_buf(cfg); #endif /* STATIC_WL_PRIV_STRUCT */ - if (wl->afx_hdl) { - cancel_work_sync(&wl->afx_hdl->work); - kfree(wl->afx_hdl); - wl->afx_hdl = NULL; + if (cfg->afx_hdl) { + cancel_work_sync(&cfg->afx_hdl->work); + kfree(cfg->afx_hdl); + cfg->afx_hdl = NULL; } - if (wl->ap_info) { - kfree(wl->ap_info->wpa_ie); - kfree(wl->ap_info->rsn_ie); - kfree(wl->ap_info->wps_ie); - kfree(wl->ap_info); - wl->ap_info = NULL; + if (cfg->ap_info) { + kfree(cfg->ap_info->wpa_ie); + kfree(cfg->ap_info->rsn_ie); + kfree(cfg->ap_info->wps_ie); + kfree(cfg->ap_info); + cfg->ap_info = NULL; } } -static s32 wl_create_event_handler(struct wl_priv *wl) +static s32 wl_create_event_handler(struct bcm_cfg80211 *cfg) { int ret = 0; WL_DBG(("Enter \n")); /* Do not use DHD in cfg driver */ - wl->event_tsk.thr_pid = -1; + cfg->event_tsk.thr_pid = -1; - PROC_START(wl_event_handler, wl, &wl->event_tsk, 0, "wl_event_handler"); - if (wl->event_tsk.thr_pid < 0) + PROC_START(wl_event_handler, cfg, &cfg->event_tsk, 0, "wl_event_handler"); + if (cfg->event_tsk.thr_pid < 0) ret = -ENOMEM; return ret; } -static void wl_destroy_event_handler(struct wl_priv *wl) -{ - if (wl->event_tsk.thr_pid >= 0) - PROC_STOP(&wl->event_tsk); -} - -static void wl_term_iscan(struct wl_priv *wl) +static void wl_destroy_event_handler(struct bcm_cfg80211 *cfg) { - struct wl_iscan_ctrl *iscan = wl_to_iscan(wl); - WL_TRACE(("In\n")); - if (wl->iscan_on && iscan->tsk) { - iscan->state = WL_ISCAN_STATE_IDLE; - WL_INFO(("SIGTERM\n")); - send_sig(SIGTERM, iscan->tsk, 1); - WL_DBG(("kthread_stop\n")); - kthread_stop(iscan->tsk); - iscan->tsk = NULL; - } -} - -static void wl_notify_iscan_complete(struct wl_iscan_ctrl *iscan, bool aborted) -{ - struct wl_priv *wl = iscan_to_wl(iscan); - struct net_device *ndev = wl_to_prmry_ndev(wl); - unsigned long flags; - - WL_DBG(("Enter \n")); - if (!wl_get_drv_status(wl, SCANNING, ndev)) { - wl_clr_drv_status(wl, SCANNING, ndev); - WL_ERR(("Scan complete while device not scanning\n")); - return; - } - spin_lock_irqsave(&wl->cfgdrv_lock, flags); - wl_clr_drv_status(wl, SCANNING, ndev); - if (likely(wl->scan_request)) { - cfg80211_scan_done(wl->scan_request, aborted); - wl->scan_request = NULL; - } - spin_unlock_irqrestore(&wl->cfgdrv_lock, flags); - wl->iscan_kickstart = false; -} - -static s32 wl_wakeup_iscan(struct wl_iscan_ctrl *iscan) -{ - if (likely(iscan->state != WL_ISCAN_STATE_IDLE)) { - WL_DBG(("wake up iscan\n")); - up(&iscan->sync); - return 0; - } - - return -EIO; -} - -static s32 -wl_get_iscan_results(struct wl_iscan_ctrl *iscan, u32 *status, - struct wl_scan_results **bss_list) -{ - struct wl_iscan_results list; - struct wl_scan_results *results; - struct wl_iscan_results *list_buf; - s32 err = 0; - - WL_DBG(("Enter \n")); - memset(iscan->scan_buf, 0, WL_ISCAN_BUF_MAX); - list_buf = (struct wl_iscan_results *)iscan->scan_buf; - results = &list_buf->results; - results->buflen = WL_ISCAN_RESULTS_FIXED_SIZE; - results->version = 0; - results->count = 0; - - memset(&list, 0, sizeof(list)); - list.results.buflen = htod32(WL_ISCAN_BUF_MAX); - err = wldev_iovar_getbuf(iscan->dev, "iscanresults", &list, - WL_ISCAN_RESULTS_FIXED_SIZE, iscan->scan_buf, - WL_ISCAN_BUF_MAX, NULL); - if (unlikely(err)) { - WL_ERR(("error (%d)\n", err)); - return err; - } - results->buflen = dtoh32(results->buflen); - results->version = dtoh32(results->version); - results->count = dtoh32(results->count); - WL_DBG(("results->count = %d\n", results->count)); - WL_DBG(("results->buflen = %d\n", results->buflen)); - *status = dtoh32(list_buf->status); - *bss_list = results; - - return err; -} - -static s32 wl_iscan_done(struct wl_priv *wl) -{ - struct wl_iscan_ctrl *iscan = wl->iscan; - s32 err = 0; - - iscan->state = WL_ISCAN_STATE_IDLE; - mutex_lock(&wl->usr_sync); - wl_inform_bss(wl); - wl_notify_iscan_complete(iscan, false); - mutex_unlock(&wl->usr_sync); - - return err; -} - -static s32 wl_iscan_pending(struct wl_priv *wl) -{ - struct wl_iscan_ctrl *iscan = wl->iscan; - s32 err = 0; - - /* Reschedule the timer */ - mod_timer(&iscan->timer, jiffies + msecs_to_jiffies(iscan->timer_ms)); - iscan->timer_on = 1; - - return err; -} - -static s32 wl_iscan_inprogress(struct wl_priv *wl) -{ - struct wl_iscan_ctrl *iscan = wl->iscan; - s32 err = 0; - - mutex_lock(&wl->usr_sync); - wl_inform_bss(wl); - wl_run_iscan(iscan, NULL, WL_SCAN_ACTION_CONTINUE); - mutex_unlock(&wl->usr_sync); - /* Reschedule the timer */ - mod_timer(&iscan->timer, jiffies + msecs_to_jiffies(iscan->timer_ms)); - iscan->timer_on = 1; - - return err; -} - -static s32 wl_iscan_aborted(struct wl_priv *wl) -{ - struct wl_iscan_ctrl *iscan = wl->iscan; - s32 err = 0; - - iscan->state = WL_ISCAN_STATE_IDLE; - mutex_lock(&wl->usr_sync); - wl_notify_iscan_complete(iscan, true); - mutex_unlock(&wl->usr_sync); - - return err; -} - -static s32 wl_iscan_thread(void *data) -{ - struct wl_iscan_ctrl *iscan = (struct wl_iscan_ctrl *)data; - struct wl_priv *wl = iscan_to_wl(iscan); - u32 status; - int err = 0; - - allow_signal(SIGTERM); - status = WL_SCAN_RESULTS_PARTIAL; - while (likely(!down_interruptible(&iscan->sync))) { - if (kthread_should_stop()) - break; - if (iscan->timer_on) { - del_timer_sync(&iscan->timer); - iscan->timer_on = 0; - } - mutex_lock(&wl->usr_sync); - err = wl_get_iscan_results(iscan, &status, &wl->bss_list); - if (unlikely(err)) { - status = WL_SCAN_RESULTS_ABORTED; - WL_ERR(("Abort iscan\n")); - } - mutex_unlock(&wl->usr_sync); - iscan->iscan_handler[status] (wl); - } - if (iscan->timer_on) { - del_timer_sync(&iscan->timer); - iscan->timer_on = 0; - } - WL_DBG(("was terminated\n")); - - return 0; + if (cfg->event_tsk.thr_pid >= 0) + PROC_STOP(&cfg->event_tsk); } static void wl_scan_timeout(unsigned long data) { wl_event_msg_t msg; - struct wl_priv *wl = (struct wl_priv *)data; + struct bcm_cfg80211 *cfg = (struct bcm_cfg80211 *)data; - if (!(wl->scan_request)) { + if (!(cfg->scan_request)) { WL_ERR(("timer expired but no scan request\n")); return; } bzero(&msg, sizeof(wl_event_msg_t)); WL_ERR(("timer expired\n")); - if (wl->escan_on) { - msg.event_type = hton32(WLC_E_ESCAN_RESULT); - msg.status = hton32(WLC_E_STATUS_TIMEOUT); - msg.reason = 0xFFFFFFFF; - wl_cfg80211_event(wl_to_prmry_ndev(wl), &msg, NULL); - } else { - /* Need to check it try to access SDIO */ - WL_ERR(("SCAN Timeout(ISCAN)\n")); - wl_notify_iscan_complete(wl_to_iscan(wl), true); - } -} - -static void wl_iscan_timer(unsigned long data) -{ - struct wl_iscan_ctrl *iscan = (struct wl_iscan_ctrl *)data; - - if (iscan) { - iscan->timer_on = 0; - WL_DBG(("timer expired\n")); - wl_wakeup_iscan(iscan); - } -} - -static s32 wl_invoke_iscan(struct wl_priv *wl) -{ - struct wl_iscan_ctrl *iscan = wl_to_iscan(wl); - int err = 0; - - if (wl->iscan_on && !iscan->tsk) { - iscan->state = WL_ISCAN_STATE_IDLE; - sema_init(&iscan->sync, 0); - iscan->tsk = kthread_run(wl_iscan_thread, iscan, "wl_iscan"); - if (IS_ERR(iscan->tsk)) { - WL_ERR(("Could not create iscan thread\n")); - iscan->tsk = NULL; - return -ENOMEM; - } - } - - return err; -} - -static void wl_init_iscan_handler(struct wl_iscan_ctrl *iscan) -{ - memset(iscan->iscan_handler, 0, sizeof(iscan->iscan_handler)); - iscan->iscan_handler[WL_SCAN_RESULTS_SUCCESS] = wl_iscan_done; - iscan->iscan_handler[WL_SCAN_RESULTS_PARTIAL] = wl_iscan_inprogress; - iscan->iscan_handler[WL_SCAN_RESULTS_PENDING] = wl_iscan_pending; - iscan->iscan_handler[WL_SCAN_RESULTS_ABORTED] = wl_iscan_aborted; - iscan->iscan_handler[WL_SCAN_RESULTS_NO_MEM] = wl_iscan_aborted; + msg.event_type = hton32(WLC_E_ESCAN_RESULT); + msg.status = hton32(WLC_E_STATUS_TIMEOUT); + msg.reason = 0xFFFFFFFF; + wl_cfg80211_event(bcmcfg_to_prmry_ndev(cfg), &msg, NULL); +#if defined(CUSTOMER_HW4) && defined(DHD_DEBUG) + if (!wl_scan_timeout_dbg_enabled) + wl_scan_timeout_dbg_set(); +#endif /* CUSTOMER_HW4 && DHD_DEBUG */ } static s32 @@ -8517,27 +9402,51 @@ wl_cfg80211_netdev_notifier_call(struct notifier_block * nb, { struct net_device *dev = ndev; struct wireless_dev *wdev = dev->ieee80211_ptr; - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; int refcnt = 0; WL_DBG(("Enter \n")); - if (!wdev || !wl || dev == wl_to_prmry_ndev(wl)) + + if (!wdev || !cfg || dev == bcmcfg_to_prmry_ndev(cfg)) return NOTIFY_DONE; + switch (state) { case NETDEV_DOWN: - while (work_pending(&wdev->cleanup_work) && refcnt < 100) { - if (refcnt%5 == 0) - WL_ERR(("[NETDEV_DOWN] work_pending (%d th)\n", refcnt)); + { + int max_wait_timeout = 5; + int max_wait_count = 100; + unsigned long limit = jiffies + max_wait_timeout * HZ; + while (work_pending(&wdev->cleanup_work)) { + if (refcnt%5 == 0) { + WL_ERR(("[NETDEV_DOWN] wait for " + "complete of cleanup_work" + " (%d th)\n", refcnt)); + } + if (!time_before(jiffies, limit)) { + WL_ERR(("[NETDEV_DOWN] cleanup_work" + " of CFG80211 is not" + " completed in %d sec\n", + max_wait_timeout)); + break; + } + if (refcnt >= max_wait_count) { + WL_ERR(("[NETDEV_DOWN] cleanup_work" + " of CFG80211 is not" + " completed in %d loop\n", + max_wait_count)); + break; + } set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(100); set_current_state(TASK_RUNNING); refcnt++; } break; + } case NETDEV_UNREGISTER: /* after calling list_del_rcu(&wdev->list) */ - wl_dealloc_netinfo(wl, ndev); + wl_dealloc_netinfo(cfg, ndev); break; case NETDEV_GOING_DOWN: /* At NETDEV_DOWN state, wdev_cleanup_work work will be called. @@ -8546,11 +9455,8 @@ wl_cfg80211_netdev_notifier_call(struct notifier_block * nb, * If the scanning is still working, wdev_cleanup_work call WARN_ON and * make the scan done forcibly. */ - if (wl_get_drv_status(wl, SCANNING, dev)) { - if (wl->escan_on) { - wl_notify_escan_complete(wl, dev, true, true); - } - } + if (wl_get_drv_status(cfg, SCANNING, dev)) + wl_notify_escan_complete(cfg, dev, true, true); break; } return NOTIFY_DONE; @@ -8558,13 +9464,17 @@ wl_cfg80211_netdev_notifier_call(struct notifier_block * nb, static struct notifier_block wl_cfg80211_netdev_notifier = { .notifier_call = wl_cfg80211_netdev_notifier_call, }; +/* to make sure we won't register the same notifier twice, otherwise a loop is likely to be + * created in kernel notifier link list (with 'next' pointing to itself) + */ +static bool wl_cfg80211_netdev_notifier_registered = FALSE; -static void wl_cfg80211_scan_abort(struct wl_priv *wl) +static void wl_cfg80211_scan_abort(struct bcm_cfg80211 *cfg) { wl_scan_params_t *params = NULL; s32 params_size = 0; s32 err = BCME_OK; - struct net_device *dev = wl_to_prmry_ndev(wl); + struct net_device *dev = bcmcfg_to_prmry_ndev(cfg); if (!in_atomic()) { /* Our scan params only need space for 1 channel and 0 ssids */ params = wl_cfg80211_scan_alloc_params(-1, 0, ¶ms_size); @@ -8582,7 +9492,7 @@ static void wl_cfg80211_scan_abort(struct wl_priv *wl) } } -static s32 wl_notify_escan_complete(struct wl_priv *wl, +static s32 wl_notify_escan_complete(struct bcm_cfg80211 *cfg, struct net_device *ndev, bool aborted, bool fw_abort) { @@ -8591,78 +9501,64 @@ static s32 wl_notify_escan_complete(struct wl_priv *wl, struct net_device *dev; WL_DBG(("Enter \n")); - if (!ndev) { WL_ERR(("ndev is null\n")); + err = BCME_ERROR; return err; } - if (wl->escan_info.ndev != ndev) { - WL_ERR(("ndev is different %p %p\n", wl->escan_info.ndev, ndev)); + if (cfg->escan_info.ndev != ndev) { + WL_ERR(("ndev is different %p %p\n", cfg->escan_info.ndev, ndev)); + err = BCME_ERROR; return err; } - if (wl->scan_request) { - if (wl->scan_request->dev == wl->p2p_net) - dev = wl_to_prmry_ndev(wl); - else - dev = wl->scan_request->dev; + if (cfg->scan_request) { + dev = bcmcfg_to_prmry_ndev(cfg); +#if defined(WL_ENABLE_P2P_IF) + if (cfg->scan_request->dev != cfg->p2p_net) + dev = cfg->scan_request->dev; +#endif /* WL_ENABLE_P2P_IF */ } else { - WL_DBG(("wl->scan_request is NULL may be internal scan." - "doing scan_abort for ndev %p primary %p p2p_net %p", - ndev, wl_to_prmry_ndev(wl), wl->p2p_net)); + WL_DBG(("cfg->scan_request is NULL may be internal scan." + "doing scan_abort for ndev %p primary %p", + ndev, bcmcfg_to_prmry_ndev(cfg))); dev = ndev; } - - if (fw_abort && !in_atomic()) { - wl_cfg80211_scan_abort(wl); - } - - if (timer_pending(&wl->scan_timeout)) - del_timer_sync(&wl->scan_timeout); + if (fw_abort && !in_atomic()) + wl_cfg80211_scan_abort(cfg); + if (timer_pending(&cfg->scan_timeout)) + del_timer_sync(&cfg->scan_timeout); #if defined(ESCAN_RESULT_PATCH) - if (likely(wl->scan_request)) { -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - u8 temp_id = wl->escan_info.cur_sync_id; - if (aborted) - wl->bss_list = - (wl_scan_results_t *)wl->escan_info.escan_buf[(temp_id+1)%2]; - else - wl->bss_list = - (wl_scan_results_t *)wl->escan_info.escan_buf[(temp_id)%2]; -#else - wl->bss_list = (wl_scan_results_t *)wl->escan_info.escan_buf; -#endif /* CUSTOMER_HW4 && DUAL_ESCAN_RESULT_BUFFER */ - wl_inform_bss(wl); + if (likely(cfg->scan_request)) { + cfg->bss_list = wl_escan_get_buf(cfg, aborted); + wl_inform_bss(cfg); } #endif /* ESCAN_RESULT_PATCH */ - spin_lock_irqsave(&wl->cfgdrv_lock, flags); + spin_lock_irqsave(&cfg->cfgdrv_lock, flags); #ifdef WL_SCHED_SCAN - if (wl->sched_scan_req && !wl->scan_request) { + if (cfg->sched_scan_req && !cfg->scan_request) { WL_PNO((">>> REPORTING SCHED SCAN RESULTS \n")); - if (aborted) - cfg80211_sched_scan_stopped(wl->sched_scan_req->wiphy); - else - cfg80211_sched_scan_results(wl->sched_scan_req->wiphy); - wl->sched_scan_running = FALSE; - wl->sched_scan_req = NULL; + if (!aborted) + cfg80211_sched_scan_results(cfg->sched_scan_req->wiphy); + cfg->sched_scan_running = FALSE; + cfg->sched_scan_req = NULL; } #endif /* WL_SCHED_SCAN */ - if (likely(wl->scan_request)) { - cfg80211_scan_done(wl->scan_request, aborted); - wl->scan_request = NULL; + if (likely(cfg->scan_request)) { + cfg80211_scan_done(cfg->scan_request, aborted); + cfg->scan_request = NULL; } - if (p2p_is_on(wl)) - wl_clr_p2p_status(wl, SCANNING); - wl_clr_drv_status(wl, SCANNING, dev); - spin_unlock_irqrestore(&wl->cfgdrv_lock, flags); + if (p2p_is_on(cfg)) + wl_clr_p2p_status(cfg, SCANNING); + wl_clr_drv_status(cfg, SCANNING, dev); + spin_unlock_irqrestore(&cfg->cfgdrv_lock, flags); return err; } -static s32 wl_escan_handler(struct wl_priv *wl, - struct net_device *ndev, +static s32 wl_escan_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data) { s32 err = BCME_OK; @@ -8672,6 +9568,7 @@ static s32 wl_escan_handler(struct wl_priv *wl, wl_bss_info_t *bss = NULL; wl_scan_results_t *list; wifi_p2p_ie_t * p2p_ie; + struct net_device *ndev = NULL; u32 bi_length; u32 i; u8 *p2p_dev_addr = NULL; @@ -8679,36 +9576,27 @@ static s32 wl_escan_handler(struct wl_priv *wl, WL_DBG((" enter event type : %d, status : %d \n", ntoh32(e->event_type), ntoh32(e->status))); - mutex_lock(&wl->usr_sync); + ndev = cfgdev_to_wlc_ndev(cfgdev, cfg); + + mutex_lock(&cfg->usr_sync); /* P2P SCAN is coming from primary interface */ - if (wl_get_p2p_status(wl, SCANNING)) { - if (wl_get_drv_status_all(wl, SENDING_ACT_FRM)) - ndev = wl->afx_hdl->dev; + if (wl_get_p2p_status(cfg, SCANNING)) { + if (wl_get_drv_status_all(cfg, SENDING_ACT_FRM)) + ndev = cfg->afx_hdl->dev; else - ndev = wl->escan_info.ndev; + ndev = cfg->escan_info.ndev; } - if (!ndev || !wl->escan_on || - (!wl_get_drv_status(wl, SCANNING, ndev) && - !wl->sched_scan_running)) { -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - WL_ERR(("escan is not ready ndev %p wl->escan_on %d" - " drv_status 0x%x e_type %d e_states %d\n", - ndev, wl->escan_on, wl_get_drv_status(wl, SCANNING, ndev), + if (!ndev || (!wl_get_drv_status(cfg, SCANNING, ndev) && !cfg->sched_scan_running)) { + WL_ERR(("escan is not ready ndev %p drv_status 0x%x e_type %d e_states %d\n", + ndev, wl_get_drv_status(cfg, SCANNING, ndev), ntoh32(e->event_type), ntoh32(e->status))); -#else - WL_ERR(("escan is not ready ndev %p wl->escan_on %d drv_status 0x%x\n", - ndev, wl->escan_on, wl_get_drv_status(wl, SCANNING, ndev))); -#endif /* CUSTOMER_HW4 && DUAL_ESCAN_RESULT_BUFFER */ goto exit; } -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) escan_result = (wl_escan_result_t *)data; -#endif if (status == WLC_E_STATUS_PARTIAL) { WL_INFO(("WLC_E_STATUS_PARTIAL \n")); - escan_result = (wl_escan_result_t *) data; if (!escan_result) { WL_ERR(("Invalid escan result (NULL pointer)\n")); goto exit; @@ -8727,63 +9615,48 @@ static s32 wl_escan_handler(struct wl_priv *wl, WL_ERR(("Invalid bss_info length %d: ignoring\n", bi_length)); goto exit; } -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - if (escan_result->sync_id != wl->escan_info.cur_sync_id) { - WL_ERR(("Escan sync id mismatch: status %d " - "cur_sync_id %d coming_sync_id %d\n", - status, wl->escan_info.cur_sync_id, escan_result->sync_id)); + if (wl_escan_check_sync_id(status, escan_result->sync_id, + cfg->escan_info.cur_sync_id) < 0) goto exit; - } -#endif /* CUSTOMER_HW4 && DUAL_ESCAN_RESULT_BUFFER */ - if (!(wl_to_wiphy(wl)->interface_modes & BIT(NL80211_IFTYPE_ADHOC))) { + if (!(bcmcfg_to_wiphy(cfg)->interface_modes & BIT(NL80211_IFTYPE_ADHOC))) { if (dtoh16(bi->capability) & DOT11_CAP_IBSS) { WL_DBG(("Ignoring IBSS result\n")); goto exit; } } - if (wl_get_drv_status_all(wl, FINDING_COMMON_CHANNEL)) { + if (wl_get_drv_status_all(cfg, FINDING_COMMON_CHANNEL)) { p2p_dev_addr = wl_cfgp2p_retreive_p2p_dev_addr(bi, bi_length); if (p2p_dev_addr && !memcmp(p2p_dev_addr, - wl->afx_hdl->tx_dst_addr.octet, ETHER_ADDR_LEN)) { + cfg->afx_hdl->tx_dst_addr.octet, ETHER_ADDR_LEN)) { s32 channel = wf_chspec_ctlchan( - wl_chspec_driver_to_host(bi->chanspec)); + wl_chspec_driver_to_host(bi->chanspec)); if ((channel > MAXCHANNEL) || (channel <= 0)) channel = WL_INVALID; else WL_ERR(("ACTION FRAME SCAN : Peer " MACDBG " found," - " channel : %d\n", - MAC2STRDBG(wl->afx_hdl->tx_dst_addr.octet), - channel)); + " channel : %d\n", + MAC2STRDBG(cfg->afx_hdl->tx_dst_addr.octet), + channel)); - wl_clr_p2p_status(wl, SCANNING); - wl->afx_hdl->peer_chan = channel; - complete(&wl->act_frm_scan); + wl_clr_p2p_status(cfg, SCANNING); + cfg->afx_hdl->peer_chan = channel; + complete(&cfg->act_frm_scan); goto exit; } } else { int cur_len = WL_SCAN_RESULTS_FIXED_SIZE; -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - list = (wl_scan_results_t *) - wl->escan_info.escan_buf[wl->escan_info.cur_sync_id % 2]; -#else - list = (wl_scan_results_t *)wl->escan_info.escan_buf; -#endif /* CUSTOMER_HW4 && DUAL_ESCAN_RESULT_BUFFER */ -#if defined(WLP2P) && defined(WL_ENABLE_P2P_IF) - if (wl->p2p_net && wl->scan_request && - wl->scan_request->dev == wl->p2p_net) { -#else - if (p2p_is_on(wl) && p2p_scan(wl)) { -#endif + list = wl_escan_get_buf(cfg, FALSE); + if (scan_req_match(cfg)) { #ifdef WL_HOST_BAND_MGMT s32 channel = 0; s32 channel_band = 0; #endif /* WL_HOST_BAND_MGMT */ /* p2p scan && allow only probe response */ - if ((wl->p2p->search_state != WL_P2P_DISC_ST_SCAN) && + if ((cfg->p2p->search_state != WL_P2P_DISC_ST_SCAN) && (bi->flags & WL_BSS_FLAGS_FROM_BEACON)) goto exit; if ((p2p_ie = wl_cfgp2p_find_p2pie(((u8 *) bi) + bi->ie_offset, @@ -8798,7 +9671,7 @@ static s32 wl_escan_handler(struct wl_priv *wl, WLC_BAND_5G : WLC_BAND_2G; - if ((wl->curr_band == WLC_BAND_5G) && + if ((cfg->curr_band == WLC_BAND_5G) && (channel_band == WLC_BAND_2G)) { /* Avoid sending the GO results in band conflict */ if (wl_cfgp2p_retreive_p2pattrib(p2p_ie, @@ -8891,12 +9764,8 @@ static s32 wl_escan_handler(struct wl_priv *wl, WL_ERR(("Buffer is too small: ignoring\n")); goto exit; } -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - memcpy(&(wl->escan_info.escan_buf[wl->escan_info.cur_sync_id % 2] - [list->buflen]), bi, bi_length); -#else - memcpy(&(wl->escan_info.escan_buf[list->buflen]), bi, bi_length); -#endif /* CUSTOMER_HW4 && DUAL_ESCAN_RESULT_BUFFER */ + + memcpy(&(((char *)list)[list->buflen]), bi, bi_length); list->version = dtoh32(bi->version); list->buflen += bi_length; list->count++; @@ -8905,130 +9774,101 @@ static s32 wl_escan_handler(struct wl_priv *wl, } else if (status == WLC_E_STATUS_SUCCESS) { - wl->escan_info.escan_state = WL_ESCAN_STATE_IDLE; -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - if (escan_result->sync_id != wl->escan_info.cur_sync_id) - WL_ERR(("Escan sync id mismatch: status %d " - "cur_sync_id %d coming_sync_id %d\n", - status, wl->escan_info.cur_sync_id, escan_result->sync_id)); -#endif /* CUSTOMER_HW4 && DUAL_ESCAN_RESULT_BUFFER */ - if (wl_get_drv_status_all(wl, FINDING_COMMON_CHANNEL)) { + cfg->escan_info.escan_state = WL_ESCAN_STATE_IDLE; + wl_escan_print_sync_id(status, cfg->escan_info.cur_sync_id, + escan_result->sync_id); + + if (wl_get_drv_status_all(cfg, FINDING_COMMON_CHANNEL)) { WL_INFO(("ACTION FRAME SCAN DONE\n")); - wl_clr_p2p_status(wl, SCANNING); - wl_clr_drv_status(wl, SCANNING, wl->afx_hdl->dev); - if (wl->afx_hdl->peer_chan == WL_INVALID) - complete(&wl->act_frm_scan); - } else if ((likely(wl->scan_request)) || (wl->sched_scan_running)) { + wl_clr_p2p_status(cfg, SCANNING); + wl_clr_drv_status(cfg, SCANNING, cfg->afx_hdl->dev); + if (cfg->afx_hdl->peer_chan == WL_INVALID) + complete(&cfg->act_frm_scan); + } else if ((likely(cfg->scan_request)) || (cfg->sched_scan_running)) { WL_INFO(("ESCAN COMPLETED\n")); -#if defined(DUAL_ESCAN_RESULT_BUFFER) - wl->bss_list = (wl_scan_results_t *) - wl->escan_info.escan_buf[wl->escan_info.cur_sync_id % 2]; -#else - wl->bss_list = (wl_scan_results_t *)wl->escan_info.escan_buf; -#endif /* CUSTOMER_HW4 && DUAL_ESCAN_RESULT_BUFFER */ - if (wl->scan_request && wl->scan_request->dev != wl->p2p_net) { + cfg->bss_list = wl_escan_get_buf(cfg, FALSE); + if (!scan_req_match(cfg)) { WL_TRACE_HW4(("SCAN COMPLETED: scanned AP count=%d\n", - wl->bss_list->count)); + cfg->bss_list->count)); } - wl_inform_bss(wl); - wl_notify_escan_complete(wl, ndev, false, false); + wl_inform_bss(cfg); + wl_notify_escan_complete(cfg, ndev, false, false); } -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - wl->escan_info.cur_sync_id++; -#endif + wl_escan_increment_sync_id(cfg, SCAN_BUF_NEXT); +#if defined(CUSTOMER_HW4) && defined(DHD_DEBUG) + if (wl_scan_timeout_dbg_enabled) + wl_scan_timeout_dbg_clear(); +#endif /* CUSTOMER_HW4 && DHD_DEBUG */ } else if (status == WLC_E_STATUS_ABORT) { - wl->escan_info.escan_state = WL_ESCAN_STATE_IDLE; -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - if (escan_result->sync_id != wl->escan_info.cur_sync_id) - WL_ERR(("Escan sync id mismatch: status %d " - "cur_sync_id %d coming_sync_id %d\n", - status, wl->escan_info.cur_sync_id, escan_result->sync_id)); -#endif /* CUSTOMER_HW4 && DUAL_ESCAN_RESULT_BUFFER */ - if (wl_get_drv_status_all(wl, FINDING_COMMON_CHANNEL)) { + cfg->escan_info.escan_state = WL_ESCAN_STATE_IDLE; + wl_escan_print_sync_id(status, escan_result->sync_id, + cfg->escan_info.cur_sync_id); + if (wl_get_drv_status_all(cfg, FINDING_COMMON_CHANNEL)) { WL_INFO(("ACTION FRAME SCAN DONE\n")); - wl_clr_drv_status(wl, SCANNING, wl->afx_hdl->dev); - wl_clr_p2p_status(wl, SCANNING); - if (wl->afx_hdl->peer_chan == WL_INVALID) - complete(&wl->act_frm_scan); - } else if ((likely(wl->scan_request)) || (wl->sched_scan_running)) { + wl_clr_drv_status(cfg, SCANNING, cfg->afx_hdl->dev); + wl_clr_p2p_status(cfg, SCANNING); + if (cfg->afx_hdl->peer_chan == WL_INVALID) + complete(&cfg->act_frm_scan); + } else if ((likely(cfg->scan_request)) || (cfg->sched_scan_running)) { WL_INFO(("ESCAN ABORTED\n")); -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - wl->bss_list = (wl_scan_results_t *) - wl->escan_info.escan_buf[(wl->escan_info.cur_sync_id + 1) % 2]; -#else - wl->bss_list = (wl_scan_results_t *)wl->escan_info.escan_buf; -#endif /* CUSTOMER_HW4 && DUAL_ESCAN_RESULT_BUFFER */ - if (wl->scan_request && wl->scan_request->dev != wl->p2p_net) { + cfg->bss_list = wl_escan_get_buf(cfg, TRUE); + if (!scan_req_match(cfg)) { WL_TRACE_HW4(("SCAN ABORTED: scanned AP count=%d\n", - wl->bss_list->count)); + cfg->bss_list->count)); } - wl_inform_bss(wl); - wl_notify_escan_complete(wl, ndev, true, false); + wl_inform_bss(cfg); + wl_notify_escan_complete(cfg, ndev, true, false); } -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - wl->escan_info.cur_sync_id += 2; -#endif + wl_escan_increment_sync_id(cfg, SCAN_BUF_CNT); } else if (status == WLC_E_STATUS_NEWSCAN) { - escan_result = (wl_escan_result_t *) data; - WL_ERR(("WLC_E_STATUS_NEWSCAN : scan_request[%p]\n", wl->scan_request)); + WL_ERR(("WLC_E_STATUS_NEWSCAN : scan_request[%p]\n", cfg->scan_request)); WL_ERR(("sync_id[%d], bss_count[%d]\n", escan_result->sync_id, escan_result->bss_count)); } else if (status == WLC_E_STATUS_TIMEOUT) { - WL_ERR(("WLC_E_STATUS_TIMEOUT : scan_request[%p]\n", wl->scan_request)); - WL_ERR(("escan_on[%d], reason[0x%x]\n", wl->escan_on, e->reason)); + WL_ERR(("WLC_E_STATUS_TIMEOUT : scan_request[%p]\n", cfg->scan_request)); + WL_ERR(("reason[0x%x]\n", e->reason)); if (e->reason == 0xFFFFFFFF) { - wl_notify_escan_complete(wl, wl->escan_info.ndev, true, true); + wl_notify_escan_complete(cfg, cfg->escan_info.ndev, true, true); } } else { WL_ERR(("unexpected Escan Event %d : abort\n", status)); - wl->escan_info.escan_state = WL_ESCAN_STATE_IDLE; -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - if (escan_result->sync_id != wl->escan_info.cur_sync_id) - WL_ERR(("Escan sync id mismatch: status %d " - "cur_sync_id %d coming_sync_id %d\n", - status, wl->escan_info.cur_sync_id, escan_result->sync_id)); -#endif /* CUSTOMER_HW4 && DUAL_ESCAN_RESULT_BUFFER */ - if (wl_get_drv_status_all(wl, FINDING_COMMON_CHANNEL)) { + cfg->escan_info.escan_state = WL_ESCAN_STATE_IDLE; + wl_escan_print_sync_id(status, escan_result->sync_id, + cfg->escan_info.cur_sync_id); + if (wl_get_drv_status_all(cfg, FINDING_COMMON_CHANNEL)) { WL_INFO(("ACTION FRAME SCAN DONE\n")); - wl_clr_p2p_status(wl, SCANNING); - wl_clr_drv_status(wl, SCANNING, wl->afx_hdl->dev); - if (wl->afx_hdl->peer_chan == WL_INVALID) - complete(&wl->act_frm_scan); - } else if ((likely(wl->scan_request)) || (wl->sched_scan_running)) { -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - wl->bss_list = (wl_scan_results_t *) - wl->escan_info.escan_buf[(wl->escan_info.cur_sync_id + 1) % 2]; -#else - wl->bss_list = (wl_scan_results_t *)wl->escan_info.escan_buf; -#endif /* CUSTOMER_HW4 && DUAL_ESCAN_RESULT_BUFFER */ - if (wl->scan_request && wl->scan_request->dev != wl->p2p_net) { + wl_clr_p2p_status(cfg, SCANNING); + wl_clr_drv_status(cfg, SCANNING, cfg->afx_hdl->dev); + if (cfg->afx_hdl->peer_chan == WL_INVALID) + complete(&cfg->act_frm_scan); + } else if ((likely(cfg->scan_request)) || (cfg->sched_scan_running)) { + cfg->bss_list = wl_escan_get_buf(cfg, TRUE); + if (!scan_req_match(cfg)) { WL_TRACE_HW4(("SCAN ABORTED(UNEXPECTED): " "scanned AP count=%d\n", - wl->bss_list->count)); + cfg->bss_list->count)); } - wl_inform_bss(wl); - wl_notify_escan_complete(wl, ndev, true, false); + wl_inform_bss(cfg); + wl_notify_escan_complete(cfg, ndev, true, false); } -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - wl->escan_info.cur_sync_id += 2; -#endif + wl_escan_increment_sync_id(cfg, 2); } exit: - mutex_unlock(&wl->usr_sync); + mutex_unlock(&cfg->usr_sync); return err; } -static void wl_cfg80211_concurrent_roam(struct wl_priv *wl, int enable) +static void wl_cfg80211_concurrent_roam(struct bcm_cfg80211 *cfg, int enable) { - u32 connected_cnt = wl_get_drv_status_all(wl, CONNECTED); + u32 connected_cnt = wl_get_drv_status_all(cfg, CONNECTED); struct net_info *iter, *next; int err; - if (!wl->roamoff_on_concurrent) + if (!cfg->roamoff_on_concurrent) return; if (enable && connected_cnt > 1) { - for_each_ndev(wl, iter, next) { + for_each_ndev(cfg, iter, next) { /* Save the current roam setting */ if ((err = wldev_iovar_getint(iter->ndev, "roam_off", (s32 *)&iter->roam_off)) != BCME_OK) { @@ -9037,19 +9877,19 @@ static void wl_cfg80211_concurrent_roam(struct wl_priv *wl, int enable) continue; } if ((err = wldev_iovar_setint(iter->ndev, "roam_off", 1)) != BCME_OK) { - WL_ERR(("%s:failed to set roam_off : %d\n", + WL_ERR((" %s:failed to set roam_off : %d\n", iter->ndev->name, err)); } } } else if (!enable) { - for_each_ndev(wl, iter, next) { + for_each_ndev(cfg, iter, next) { if (iter->roam_off != WL_INVALID) { if ((err = wldev_iovar_setint(iter->ndev, "roam_off", iter->roam_off)) == BCME_OK) iter->roam_off = WL_INVALID; else { - WL_ERR(("%s:failed to set roam_off : %d\n", + WL_ERR((" %s:failed to set roam_off : %d\n", iter->ndev->name, err)); } } @@ -9058,78 +9898,88 @@ static void wl_cfg80211_concurrent_roam(struct wl_priv *wl, int enable) return; } -static void wl_cfg80211_determine_vsdb_mode(struct wl_priv *wl) +static void wl_cfg80211_determine_vsdb_mode(struct bcm_cfg80211 *cfg) { #ifdef CUSTOMER_HW4 - u32 connected_cnt = wl_get_drv_status_all(wl, CONNECTED); + u32 connected_cnt = wl_get_drv_status_all(cfg, CONNECTED); if (connected_cnt > 1) { - wl->vsdb_mode = true; + cfg->vsdb_mode = true; } else { - wl->vsdb_mode = false; + cfg->vsdb_mode = false; } return; #else struct net_info *iter, *next; - u32 chan = 0; + u32 ctl_chan = 0; u32 chanspec = 0; - u32 prev_chan = 0; - u32 connected_cnt = wl_get_drv_status_all(wl, CONNECTED); - wl->vsdb_mode = false; + u32 pre_ctl_chan = 0; + u32 connected_cnt = wl_get_drv_status_all(cfg, CONNECTED); + cfg->vsdb_mode = false; if (connected_cnt <= 1) { return; } - for_each_ndev(wl, iter, next) { + for_each_ndev(cfg, iter, next) { chanspec = 0; - chan = 0; - if (wl_get_drv_status(wl, CONNECTED, iter->ndev)) { + ctl_chan = 0; + if (wl_get_drv_status(cfg, CONNECTED, iter->ndev)) { if (wldev_iovar_getint(iter->ndev, "chanspec", (s32 *)&chanspec) == BCME_OK) { - chan = CHSPEC_CHANNEL(chanspec); - if (CHSPEC_IS40(chanspec)) { - if (CHSPEC_SB_UPPER(chanspec)) - chan += CH_10MHZ_APART; - else - chan -= CH_10MHZ_APART; + chanspec = wl_chspec_driver_to_host(chanspec); + ctl_chan = wf_chspec_ctlchan(chanspec); + wl_update_prof(cfg, iter->ndev, NULL, + &ctl_chan, WL_PROF_CHAN); + } + if (!cfg->vsdb_mode) { + if (!pre_ctl_chan && ctl_chan) + pre_ctl_chan = ctl_chan; + else if (pre_ctl_chan && (pre_ctl_chan != ctl_chan)) { + cfg->vsdb_mode = true; } - wl_update_prof(wl, iter->ndev, NULL, - &chan, WL_PROF_CHAN); } - if (!prev_chan && chan) - prev_chan = chan; - else if (prev_chan && (prev_chan != chan)) - wl->vsdb_mode = true; } } + WL_ERR(("%s concurrency is enabled\n", cfg->vsdb_mode ? "Multi Channel" : "Same Channel")); return; #endif /* CUSTOMER_HW4 */ } -static s32 wl_notifier_change_state(struct wl_priv *wl, struct net_info *_net_info, + +static s32 wl_notifier_change_state(struct bcm_cfg80211 *cfg, struct net_info *_net_info, enum wl_status state, bool set) { s32 pm = PM_FAST; s32 err = BCME_OK; + u32 mode; u32 chan = 0; struct net_info *iter, *next; - struct net_device *primary_dev = wl_to_prmry_ndev(wl); + struct net_device *primary_dev = bcmcfg_to_prmry_ndev(cfg); WL_DBG(("Enter state %d set %d _net_info->pm_restore %d iface %s\n", state, set, _net_info->pm_restore, _net_info->ndev->name)); if (state != WL_STATUS_CONNECTED) return 0; - + mode = wl_get_mode_by_netdev(cfg, _net_info->ndev); if (set) { - wl_cfg80211_concurrent_roam(wl, 1); + wl_cfg80211_concurrent_roam(cfg, 1); - if (wl_get_mode_by_netdev(wl, _net_info->ndev) == WL_MODE_AP) { + if (mode == WL_MODE_AP) { if (wl_add_remove_eventmsg(primary_dev, WLC_E_P2P_PROBREQ_MSG, false)) WL_ERR((" failed to unset WLC_E_P2P_PROPREQ_MSG\n")); } - wl_cfg80211_determine_vsdb_mode(wl); - if (wl->vsdb_mode || _net_info->pm_block) { + wl_cfg80211_determine_vsdb_mode(cfg); + if (cfg->vsdb_mode || _net_info->pm_block) { + /* Delete pm_enable_work */ + wl_add_remove_pm_enable_work(cfg, FALSE, WL_HANDLER_MAINTAIN); + /* save PM_FAST in _net_info to restore this + * if _net_info->pm_block is false + */ + if (!_net_info->pm_block && (mode == WL_MODE_BSS)) { + _net_info->pm = PM_FAST; + _net_info->pm_restore = true; + } pm = PM_OFF; - for_each_ndev(wl, iter, next) { + for_each_ndev(cfg, iter, next) { if (iter->pm_restore) continue; /* Save the current power mode */ @@ -9142,19 +9992,47 @@ static s32 wl_notifier_change_state(struct wl_priv *wl, struct net_info *_net_in } } - for_each_ndev(wl, iter, next) { + for_each_ndev(cfg, iter, next) { + if ((err = wldev_ioctl(iter->ndev, WLC_SET_PM, &pm, + sizeof(pm), true)) != 0) { + if (err == -ENODEV) + WL_DBG(("%s:netdev not ready\n", iter->ndev->name)); + else + WL_ERR(("%s:error (%d)\n", iter->ndev->name, err)); + wl_cfg80211_update_power_mode(iter->ndev); + } + } + } else { + /* add PM Enable timer to go to power save mode + * if supplicant control pm mode, it will be cleared or + * updated by wl_cfg80211_set_power_mgmt() if not - for static IP & HW4 P2P, + * PM will be configured when timer expired + */ + + /* + * before calling pm_enable_timer, we need to set PM -1 for all ndev + */ + pm = PM_OFF; + + for_each_ndev(cfg, iter, next) { if ((err = wldev_ioctl(iter->ndev, WLC_SET_PM, &pm, sizeof(pm), true)) != 0) { if (err == -ENODEV) WL_DBG(("%s:netdev not ready\n", iter->ndev->name)); else WL_ERR(("%s:error (%d)\n", iter->ndev->name, err)); - iter->ndev->ieee80211_ptr->ps = false; } } + + if (cfg->pm_enable_work_on) { + wl_add_remove_pm_enable_work(cfg, FALSE, WL_HANDLER_DEL); + } + + cfg->pm_enable_work_on = true; + wl_add_remove_pm_enable_work(cfg, TRUE, WL_HANDLER_NOTUSE); } #if defined(CUSTOMER_HW4) && defined(WLTDLS) - if (wl->vsdb_mode) { + if (cfg->vsdb_mode) { err = wldev_iovar_setint(primary_dev, "tdls_enable", 0); } #endif /* defined(CUSTOMER_HW4) && defined(WLTDLS) */ @@ -9162,9 +10040,9 @@ static s32 wl_notifier_change_state(struct wl_priv *wl, struct net_info *_net_in else { /* clear */ chan = 0; /* clear chan information when the net device is disconnected */ - wl_update_prof(wl, _net_info->ndev, NULL, &chan, WL_PROF_CHAN); - wl_cfg80211_determine_vsdb_mode(wl); - for_each_ndev(wl, iter, next) { + wl_update_prof(cfg, _net_info->ndev, NULL, &chan, WL_PROF_CHAN); + wl_cfg80211_determine_vsdb_mode(cfg); + for_each_ndev(cfg, iter, next) { if (iter->pm_restore && iter->pm) { WL_DBG(("%s:restoring power save %s\n", iter->ndev->name, (iter->pm ? "enabled" : "disabled"))); @@ -9178,117 +10056,98 @@ static s32 wl_notifier_change_state(struct wl_priv *wl, struct net_info *_net_in break; } iter->pm_restore = 0; - iter->ndev->ieee80211_ptr->ps = true; + wl_cfg80211_update_power_mode(iter->ndev); } } - wl_cfg80211_concurrent_roam(wl, 0); + wl_cfg80211_concurrent_roam(cfg, 0); #if defined(CUSTOMER_HW4) && defined(WLTDLS) - if (!wl->vsdb_mode) { + if (!cfg->vsdb_mode) { err = wldev_iovar_setint(primary_dev, "tdls_enable", 1); } #endif /* defined(CUSTOMER_HW4) && defined(WLTDLS) */ } return err; } -static s32 wl_init_scan(struct wl_priv *wl) +static s32 wl_init_scan(struct bcm_cfg80211 *cfg) { - struct wl_iscan_ctrl *iscan = wl_to_iscan(wl); int err = 0; - if (wl->iscan_on) { - iscan->dev = wl_to_prmry_ndev(wl); - iscan->state = WL_ISCAN_STATE_IDLE; - wl_init_iscan_handler(iscan); - iscan->timer_ms = WL_ISCAN_TIMER_INTERVAL_MS; - init_timer(&iscan->timer); - iscan->timer.data = (unsigned long) iscan; - iscan->timer.function = wl_iscan_timer; - sema_init(&iscan->sync, 0); - iscan->tsk = kthread_run(wl_iscan_thread, iscan, "wl_iscan"); - if (IS_ERR(iscan->tsk)) { - WL_ERR(("Could not create iscan thread\n")); - iscan->tsk = NULL; - return -ENOMEM; - } - iscan->data = wl; - } else if (wl->escan_on) { - wl->evt_handler[WLC_E_ESCAN_RESULT] = wl_escan_handler; - wl->escan_info.escan_state = WL_ESCAN_STATE_IDLE; -#if defined(CUSTOMER_HW4) && defined(DUAL_ESCAN_RESULT_BUFFER) - wl->escan_info.cur_sync_id = 0; -#endif - } + cfg->evt_handler[WLC_E_ESCAN_RESULT] = wl_escan_handler; + cfg->escan_info.escan_state = WL_ESCAN_STATE_IDLE; + wl_escan_init_sync_id(cfg); + /* Init scan_timeout timer */ - init_timer(&wl->scan_timeout); - wl->scan_timeout.data = (unsigned long) wl; - wl->scan_timeout.function = wl_scan_timeout; + init_timer(&cfg->scan_timeout); + cfg->scan_timeout.data = (unsigned long) cfg; + cfg->scan_timeout.function = wl_scan_timeout; return err; } -static s32 wl_init_priv(struct wl_priv *wl) +static s32 wl_init_priv(struct bcm_cfg80211 *cfg) { - struct wiphy *wiphy = wl_to_wiphy(wl); - struct net_device *ndev = wl_to_prmry_ndev(wl); + struct wiphy *wiphy = bcmcfg_to_wiphy(cfg); + struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg); s32 err = 0; - wl->scan_request = NULL; - wl->pwr_save = !!(wiphy->flags & WIPHY_FLAG_PS_ON_BY_DEFAULT); - wl->iscan_on = false; - wl->escan_on = true; - wl->roam_on = false; - wl->iscan_kickstart = false; - wl->active_scan = true; - wl->rf_blocked = false; - wl->vsdb_mode = false; - wl->wlfc_on = false; - wl->roamoff_on_concurrent = true; + cfg->scan_request = NULL; + cfg->pwr_save = !!(wiphy->flags & WIPHY_FLAG_PS_ON_BY_DEFAULT); + cfg->roam_on = false; + cfg->active_scan = true; + cfg->rf_blocked = false; + cfg->vsdb_mode = false; + cfg->wlfc_on = false; + cfg->roamoff_on_concurrent = true; + cfg->disable_roam_event = false; /* register interested state */ - set_bit(WL_STATUS_CONNECTED, &wl->interrested_state); - spin_lock_init(&wl->cfgdrv_lock); - mutex_init(&wl->ioctl_buf_sync); - init_waitqueue_head(&wl->netif_change_event); - init_completion(&wl->send_af_done); - init_completion(&wl->iface_disable); - wl_init_eq(wl); - err = wl_init_priv_mem(wl); + set_bit(WL_STATUS_CONNECTED, &cfg->interrested_state); + spin_lock_init(&cfg->cfgdrv_lock); + mutex_init(&cfg->ioctl_buf_sync); + init_waitqueue_head(&cfg->netif_change_event); + init_completion(&cfg->send_af_done); + init_completion(&cfg->iface_disable); + wl_init_eq(cfg); + err = wl_init_priv_mem(cfg); if (err) return err; - if (wl_create_event_handler(wl)) + if (wl_create_event_handler(cfg)) return -ENOMEM; - wl_init_event_handler(wl); - mutex_init(&wl->usr_sync); - err = wl_init_scan(wl); + wl_init_event_handler(cfg); + mutex_init(&cfg->usr_sync); + mutex_init(&cfg->event_sync); + err = wl_init_scan(cfg); if (err) return err; - wl_init_conf(wl->conf); - wl_init_prof(wl, ndev); - wl_link_down(wl); - DNGL_FUNC(dhd_cfg80211_init, (wl)); + wl_init_conf(cfg->conf); + wl_init_prof(cfg, ndev); + wl_link_down(cfg); + DNGL_FUNC(dhd_cfg80211_init, (cfg)); return err; } -static void wl_deinit_priv(struct wl_priv *wl) +static void wl_deinit_priv(struct bcm_cfg80211 *cfg) { - DNGL_FUNC(dhd_cfg80211_deinit, (wl)); - wl_destroy_event_handler(wl); - wl_flush_eq(wl); - wl_link_down(wl); - del_timer_sync(&wl->scan_timeout); - wl_term_iscan(wl); - wl_deinit_priv_mem(wl); - unregister_netdevice_notifier(&wl_cfg80211_netdev_notifier); + DNGL_FUNC(dhd_cfg80211_deinit, (cfg)); + wl_destroy_event_handler(cfg); + wl_flush_eq(cfg); + wl_link_down(cfg); + del_timer_sync(&cfg->scan_timeout); + wl_deinit_priv_mem(cfg); + if (wl_cfg80211_netdev_notifier_registered) { + wl_cfg80211_netdev_notifier_registered = FALSE; + unregister_netdevice_notifier(&wl_cfg80211_netdev_notifier); + } } -#if defined(WLP2P) && defined(WL_ENABLE_P2P_IF) +#if defined(WL_ENABLE_P2P_IF) || defined(WL_NEWCFG_PRIVCMD_SUPPORT) static s32 wl_cfg80211_attach_p2p(void) { - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; WL_TRACE(("Enter \n")); - if (wl_cfgp2p_register_ndev(wl) < 0) { + if (wl_cfgp2p_register_ndev(cfg) < 0) { WL_ERR(("P2P attach failed. \n")); return -ENODEV; } @@ -9298,84 +10157,97 @@ static s32 wl_cfg80211_attach_p2p(void) static s32 wl_cfg80211_detach_p2p(void) { - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; struct wireless_dev *wdev; WL_DBG(("Enter \n")); - if (!wl) { + if (!cfg) { WL_ERR(("Invalid Ptr\n")); return -EINVAL; } else - wdev = wl->p2p_wdev; + wdev = cfg->p2p_wdev; +#ifndef WL_NEWCFG_PRIVCMD_SUPPORT if (!wdev) { WL_ERR(("Invalid Ptr\n")); return -EINVAL; } +#endif /* WL_NEWCFG_PRIVCMD_SUPPORT */ - wl_cfgp2p_unregister_ndev(wl); + wl_cfgp2p_unregister_ndev(cfg); - wl->p2p_wdev = NULL; - wl->p2p_net = NULL; + cfg->p2p_wdev = NULL; + cfg->p2p_net = NULL; +#ifndef WL_NEWCFG_PRIVCMD_SUPPORT WL_DBG(("Freeing 0x%08x \n", (unsigned int)wdev)); kfree(wdev); +#endif /* WL_NEWCFG_PRIVCMD_SUPPORT */ return 0; } -#endif /* defined(WLP2P) && defined(WL_ENABLE_P2P_IF) */ +#endif /* WL_ENABLE_P2P_IF || WL_NEWCFG_PRIVCMD_SUPPORT */ s32 wl_cfg80211_attach_post(struct net_device *ndev) { - struct wl_priv * wl = NULL; + struct bcm_cfg80211 * cfg = NULL; s32 err = 0; + s32 ret = 0; WL_TRACE(("In\n")); if (unlikely(!ndev)) { WL_ERR(("ndev is invaild\n")); return -ENODEV; } - wl = wlcfg_drv_priv; - if (unlikely(!wl)) { - WL_ERR(("wl is invaild\n")); + cfg = g_bcm_cfg; + if (unlikely(!cfg)) { + WL_ERR(("cfg is invaild\n")); return -EINVAL; } - if (!wl_get_drv_status(wl, READY, ndev)) { - if (wl->wdev && - wl_cfgp2p_supported(wl, ndev)) { + if (!wl_get_drv_status(cfg, READY, ndev)) { + if (cfg->wdev) { + ret = wl_cfgp2p_supported(cfg, ndev); + if (ret > 0) { #if !defined(WL_ENABLE_P2P_IF) - wl->wdev->wiphy->interface_modes |= + cfg->wdev->wiphy->interface_modes |= (BIT(NL80211_IFTYPE_P2P_CLIENT)| BIT(NL80211_IFTYPE_P2P_GO)); -#endif - if ((err = wl_cfgp2p_init_priv(wl)) != 0) +#endif /* !WL_ENABLE_P2P_IF */ + if ((err = wl_cfgp2p_init_priv(cfg)) != 0) goto fail; -#if defined(WLP2P) && defined(WL_ENABLE_P2P_IF) - if (wl->p2p_net) { +#if defined(WL_ENABLE_P2P_IF) + if (cfg->p2p_net) { /* Update MAC addr for p2p0 interface here. */ - memcpy(wl->p2p_net->dev_addr, ndev->dev_addr, ETH_ALEN); - wl->p2p_net->dev_addr[0] |= 0x02; + memcpy(cfg->p2p_net->dev_addr, ndev->dev_addr, ETH_ALEN); + cfg->p2p_net->dev_addr[0] |= 0x02; WL_ERR(("%s: p2p_dev_addr="MACDBG "\n", - wl->p2p_net->name, - MAC2STRDBG(wl->p2p_net->dev_addr))); + cfg->p2p_net->name, + MAC2STRDBG(cfg->p2p_net->dev_addr))); } else { WL_ERR(("p2p_net not yet populated." " Couldn't update the MAC Address for p2p0 \n")); return -ENODEV; } -#endif /* defined(WLP2P) && (WL_ENABLE_P2P_IF) */ - - wl->p2p_supported = true; +#endif /* WL_ENABLE_P2P_IF */ + cfg->p2p_supported = true; + } else if (ret == 0) { + if ((err = wl_cfgp2p_init_priv(cfg)) != 0) + goto fail; + } else { + /* SDIO bus timeout */ + err = -ENODEV; + goto fail; } + } } - wl_set_drv_status(wl, READY, ndev); + wl_set_drv_status(cfg, READY, ndev); fail: return err; } -s32 wl_cfg80211_attach(struct net_device *ndev, void *data) +s32 wl_cfg80211_attach(struct net_device *ndev, void *context) { struct wireless_dev *wdev; - struct wl_priv *wl; + struct bcm_cfg80211 *cfg; s32 err = 0; struct device *dev; @@ -9392,113 +10264,130 @@ s32 wl_cfg80211_attach(struct net_device *ndev, void *data) WL_ERR(("Could not allocate wireless device\n")); return -ENOMEM; } - err = wl_setup_wiphy(wdev, dev); + err = wl_setup_wiphy(wdev, dev, context); if (unlikely(err)) { kfree(wdev); return -ENOMEM; } wdev->iftype = wl_mode_to_nl80211_iftype(WL_MODE_BSS); - wl = (struct wl_priv *)wiphy_priv(wdev->wiphy); - wl->wdev = wdev; - wl->pub = data; - INIT_LIST_HEAD(&wl->net_list); + cfg = (struct bcm_cfg80211 *)wiphy_priv(wdev->wiphy); + cfg->wdev = wdev; + cfg->pub = context; + INIT_LIST_HEAD(&cfg->net_list); ndev->ieee80211_ptr = wdev; SET_NETDEV_DEV(ndev, wiphy_dev(wdev->wiphy)); wdev->netdev = ndev; - wl->state_notifier = wl_notifier_change_state; - err = wl_alloc_netinfo(wl, ndev, wdev, WL_MODE_BSS, PM_ENABLE); + cfg->state_notifier = wl_notifier_change_state; + err = wl_alloc_netinfo(cfg, ndev, wdev, WL_MODE_BSS, PM_ENABLE); if (err) { WL_ERR(("Failed to alloc net_info (%d)\n", err)); goto cfg80211_attach_out; } - err = wl_init_priv(wl); + err = wl_init_priv(cfg); if (err) { WL_ERR(("Failed to init iwm_priv (%d)\n", err)); goto cfg80211_attach_out; } - err = wl_setup_rfkill(wl, TRUE); + err = wl_setup_rfkill(cfg, TRUE); if (err) { WL_ERR(("Failed to setup rfkill %d\n", err)); goto cfg80211_attach_out; } #ifdef DEBUGFS_CFG80211 - err = wl_setup_debugfs(wl); + err = wl_setup_debugfs(cfg); if (err) { WL_ERR(("Failed to setup debugfs %d\n", err)); goto cfg80211_attach_out; } #endif - err = register_netdevice_notifier(&wl_cfg80211_netdev_notifier); - if (err) { - WL_ERR(("Failed to register notifierl %d\n", err)); - goto cfg80211_attach_out; + if (!wl_cfg80211_netdev_notifier_registered) { + wl_cfg80211_netdev_notifier_registered = TRUE; + err = register_netdevice_notifier(&wl_cfg80211_netdev_notifier); + if (err) { + wl_cfg80211_netdev_notifier_registered = FALSE; + WL_ERR(("Failed to register notifierl %d\n", err)); + goto cfg80211_attach_out; + } } #if defined(COEX_DHCP) - err = wl_cfg80211_btcoex_init(wl); - if (err) + cfg->btcoex_info = wl_cfg80211_btcoex_init(cfg->wdev->netdev); + if (!cfg->btcoex_info) goto cfg80211_attach_out; #endif - wlcfg_drv_priv = wl; + g_bcm_cfg = cfg; -#if defined(WLP2P) && defined(WL_ENABLE_P2P_IF) +#if defined(WL_ENABLE_P2P_IF) || defined(WL_NEWCFG_PRIVCMD_SUPPORT) err = wl_cfg80211_attach_p2p(); if (err) goto cfg80211_attach_out; -#endif +#endif /* WL_ENABLE_P2P_IF || WL_NEWCFG_PRIVCMD_SUPPORT */ return err; cfg80211_attach_out: - wl_setup_rfkill(wl, FALSE); - wl_free_wdev(wl); + wl_setup_rfkill(cfg, FALSE); + wl_free_wdev(cfg); return err; } void wl_cfg80211_detach(void *para) { - struct wl_priv *wl; + struct bcm_cfg80211 *cfg; (void)para; - wl = wlcfg_drv_priv; + cfg = g_bcm_cfg; WL_TRACE(("In\n")); + wl_add_remove_pm_enable_work(cfg, FALSE, WL_HANDLER_DEL); + #if defined(COEX_DHCP) - wl_cfg80211_btcoex_deinit(wl); + wl_cfg80211_btcoex_deinit(); + cfg->btcoex_info = NULL; #endif - wl_setup_rfkill(wl, FALSE); + wl_setup_rfkill(cfg, FALSE); #ifdef DEBUGFS_CFG80211 - wl_free_debugfs(wl); + wl_free_debugfs(cfg); #endif - if (wl->p2p_supported) { - if (timer_pending(&wl->p2p->listen_timer)) - del_timer_sync(&wl->p2p->listen_timer); - wl_cfgp2p_deinit_priv(wl); + if (cfg->p2p_supported) { + if (timer_pending(&cfg->p2p->listen_timer)) + del_timer_sync(&cfg->p2p->listen_timer); + wl_cfgp2p_deinit_priv(cfg); } -#if defined(WLP2P) && defined(WL_ENABLE_P2P_IF) + if (timer_pending(&cfg->scan_timeout)) + del_timer_sync(&cfg->scan_timeout); + +#if defined(WL_CFG80211_P2P_DEV_IF) + wl_cfgp2p_del_p2p_disc_if(cfg->p2p_wdev, cfg); +#endif /* WL_CFG80211_P2P_DEV_IF */ +#if defined(WL_ENABLE_P2P_IF) || defined(WL_NEWCFG_PRIVCMD_SUPPORT) wl_cfg80211_detach_p2p(); -#endif - wl_deinit_priv(wl); - wlcfg_drv_priv = NULL; +#endif /* WL_ENABLE_P2P_IF || WL_NEWCFG_PRIVCMD_SUPPORT */ + + wl_cfg80211_ibss_vsie_free(cfg); + wl_deinit_priv(cfg); + g_bcm_cfg = NULL; wl_cfg80211_clear_parent_dev(); - wl_free_wdev(wl); - /* PLEASE do NOT call any function after wl_free_wdev, the driver's private structure "wl", - * which is the private part of wiphy, has been freed in wl_free_wdev !!!!!!!!!!! - */ + wl_free_wdev(cfg); + /* PLEASE do NOT call any function after wl_free_wdev, the driver's private + * structure "cfg", which is the private part of wiphy, has been freed in + * wl_free_wdev !!!!!!!!!!! + */ } -static void wl_wakeup_event(struct wl_priv *wl) +static void wl_wakeup_event(struct bcm_cfg80211 *cfg) { - if (wl->event_tsk.thr_pid >= 0) { - DHD_OS_WAKE_LOCK(wl->pub); - up(&wl->event_tsk.sema); + if (cfg->event_tsk.thr_pid >= 0) { + DHD_OS_WAKE_LOCK(cfg->pub); + up(&cfg->event_tsk.sema); } } +#if (defined(WL_CFG80211_P2P_DEV_IF) || defined(WL_ENABLE_P2P_IF)) static int wl_is_p2p_event(struct wl_event_q *e) { switch (e->etype) { @@ -9513,8 +10402,8 @@ static int wl_is_p2p_event(struct wl_event_q *e) case WLC_E_ACTION_FRAME_COMPLETE: if (e->emsg.ifidx != 0) { - WL_TRACE(("P2P Event on Virtual I/F (ifidx:%d) \n", - e->emsg.ifidx)); + WL_TRACE(("P2P event(%d) on virtual interface(ifidx:%d)\n", + e->etype, e->emsg.ifidx)); /* We are only bothered about the P2P events received * on primary interface. For rest of them return false * so that it is sent over the interface corresponding @@ -9522,60 +10411,75 @@ static int wl_is_p2p_event(struct wl_event_q *e) */ return FALSE; } else { - WL_TRACE(("P2P Event on Primary I/F (ifidx:%d)." - " Sent it to p2p0 \n", e->emsg.ifidx)); + WL_TRACE(("P2P event(%d) on interface(ifidx:%d)\n", + e->etype, e->emsg.ifidx)); return TRUE; } break; default: - WL_TRACE(("NON-P2P Event %d on ifidx (ifidx:%d) \n", + WL_TRACE(("NON-P2P event(%d) on interface(ifidx:%d)\n", e->etype, e->emsg.ifidx)); return FALSE; } } +#endif /* BCMDONGLEHOST && (WL_CFG80211_P2P_DEV_IF || WL_ENABLE_P2P_IF) */ static s32 wl_event_handler(void *data) { - struct net_device *netdev; - struct wl_priv *wl = NULL; + struct bcm_cfg80211 *cfg = NULL; struct wl_event_q *e; tsk_ctl_t *tsk = (tsk_ctl_t *)data; + bcm_struct_cfgdev *cfgdev = NULL; - wl = (struct wl_priv *)tsk->parent; + cfg = (struct bcm_cfg80211 *)tsk->parent; -#ifndef USE_KTHREAD_API - DAEMONIZE("dhd_cfg80211_event"); - complete(&tsk->completed); -#else - WL_ERR(("tsk Enter, tsk = 0x%08x\n", (unsigned int)tsk)); -#endif + WL_ERR(("tsk Enter, tsk = 0x%p\n", tsk)); while (down_interruptible (&tsk->sema) == 0) { SMP_RD_BARRIER_DEPENDS(); if (tsk->terminated) break; - while ((e = wl_deq_event(wl))) { + while ((e = wl_deq_event(cfg))) { WL_DBG(("event type (%d), if idx: %d\n", e->etype, e->emsg.ifidx)); /* All P2P device address related events comes on primary interface since * there is no corresponding bsscfg for P2P interface. Map it to p2p0 * interface. */ - if ((wl_is_p2p_event(e) == TRUE) && (wl->p2p_net)) { - netdev = wl->p2p_net; +#if defined(WL_CFG80211_P2P_DEV_IF) + if ((wl_is_p2p_event(e) == TRUE) && (cfg->p2p_wdev)) { + cfgdev = bcmcfg_to_p2p_wdev(cfg); + } else { + struct net_device *ndev = NULL; + + ndev = dhd_idx2net((struct dhd_pub *)(cfg->pub), e->emsg.ifidx); + if (ndev) + cfgdev = ndev_to_wdev(ndev); + } +#elif defined(WL_ENABLE_P2P_IF) + if ((wl_is_p2p_event(e) == TRUE) && (cfg->p2p_net)) { + cfgdev = cfg->p2p_net; } else { - netdev = dhd_idx2net((struct dhd_pub *)(wl->pub), e->emsg.ifidx); + cfgdev = dhd_idx2net((struct dhd_pub *)(cfg->pub), + e->emsg.ifidx); + } +#endif /* WL_CFG80211_P2P_DEV_IF */ + + if (!cfgdev) { +#if defined(WL_CFG80211_P2P_DEV_IF) + cfgdev = bcmcfg_to_prmry_wdev(cfg); +#elif defined(WL_ENABLE_P2P_IF) + cfgdev = bcmcfg_to_prmry_ndev(cfg); +#endif /* WL_CFG80211_P2P_DEV_IF */ } - if (!netdev) - netdev = wl_to_prmry_ndev(wl); - if (e->etype < WLC_E_LAST && wl->evt_handler[e->etype]) { - wl->evt_handler[e->etype] (wl, netdev, &e->emsg, e->edata); + if (e->etype < WLC_E_LAST && cfg->evt_handler[e->etype]) { + cfg->evt_handler[e->etype] (cfg, cfgdev, &e->emsg, e->edata); } else { WL_DBG(("Unknown Event (%d): ignoring\n", e->etype)); } wl_put_event(e); } - DHD_OS_WAKE_UNLOCK(wl->pub); + DHD_OS_WAKE_UNLOCK(cfg->pub); } WL_ERR(("was terminated\n")); complete_and_exit(&tsk->completed, 0); @@ -9586,7 +10490,7 @@ void wl_cfg80211_event(struct net_device *ndev, const wl_event_msg_t * e, void *data) { u32 event_type = ntoh32(e->event_type); - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; #if (WL_DBG_LEVEL > 0) s8 *estr = (event_type <= sizeof(wl_dbg_estr) / WL_DBG_ESTR_MAX - 1) ? @@ -9594,6 +10498,25 @@ wl_cfg80211_event(struct net_device *ndev, const wl_event_msg_t * e, void *data) WL_DBG(("event_type (%d):" "WLC_E_" "%s\n", event_type, estr)); #endif /* (WL_DBG_LEVEL > 0) */ + if (wl_get_p2p_status(cfg, IF_CHANGING) || wl_get_p2p_status(cfg, IF_ADDING)) { + WL_ERR(("during IF change, ignore event %d\n", event_type)); + return; + } + + if (ndev != bcmcfg_to_prmry_ndev(cfg) && cfg->p2p_supported) { + if (ndev != wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_CONNECTION) && +#if defined(WL_ENABLE_P2P_IF) + (ndev != (cfg->p2p_net ? cfg->p2p_net : + wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_DEVICE))) && +#else + (ndev != wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_DEVICE)) && +#endif /* WL_ENABLE_P2P_IF */ + TRUE) { + WL_ERR(("ignore event %d, not interested\n", event_type)); + return; + } + } + if (event_type == WLC_E_PFN_NET_FOUND) { WL_DBG((" PNOEVENT: PNO_NET_FOUND\n")); } @@ -9601,45 +10524,45 @@ wl_cfg80211_event(struct net_device *ndev, const wl_event_msg_t * e, void *data) WL_DBG((" PNOEVENT: PNO_NET_LOST\n")); } - if (likely(!wl_enq_event(wl, ndev, event_type, e, data))) - wl_wakeup_event(wl); + if (likely(!wl_enq_event(cfg, ndev, event_type, e, data))) + wl_wakeup_event(cfg); } -static void wl_init_eq(struct wl_priv *wl) +static void wl_init_eq(struct bcm_cfg80211 *cfg) { - wl_init_eq_lock(wl); - INIT_LIST_HEAD(&wl->eq_list); + wl_init_eq_lock(cfg); + INIT_LIST_HEAD(&cfg->eq_list); } -static void wl_flush_eq(struct wl_priv *wl) +static void wl_flush_eq(struct bcm_cfg80211 *cfg) { struct wl_event_q *e; unsigned long flags; - flags = wl_lock_eq(wl); - while (!list_empty(&wl->eq_list)) { - e = list_first_entry(&wl->eq_list, struct wl_event_q, eq_list); + flags = wl_lock_eq(cfg); + while (!list_empty(&cfg->eq_list)) { + e = list_first_entry(&cfg->eq_list, struct wl_event_q, eq_list); list_del(&e->eq_list); kfree(e); } - wl_unlock_eq(wl, flags); + wl_unlock_eq(cfg, flags); } /* * retrieve first queued event from head */ -static struct wl_event_q *wl_deq_event(struct wl_priv *wl) +static struct wl_event_q *wl_deq_event(struct bcm_cfg80211 *cfg) { struct wl_event_q *e = NULL; unsigned long flags; - flags = wl_lock_eq(wl); - if (likely(!list_empty(&wl->eq_list))) { - e = list_first_entry(&wl->eq_list, struct wl_event_q, eq_list); + flags = wl_lock_eq(cfg); + if (likely(!list_empty(&cfg->eq_list))) { + e = list_first_entry(&cfg->eq_list, struct wl_event_q, eq_list); list_del(&e->eq_list); } - wl_unlock_eq(wl, flags); + wl_unlock_eq(cfg, flags); return e; } @@ -9649,8 +10572,8 @@ static struct wl_event_q *wl_deq_event(struct wl_priv *wl) */ static s32 -wl_enq_event(struct wl_priv *wl, struct net_device *ndev, u32 event, const wl_event_msg_t *msg, - void *data) +wl_enq_event(struct bcm_cfg80211 *cfg, struct net_device *ndev, u32 event, + const wl_event_msg_t *msg, void *data) { struct wl_event_q *e; s32 err = 0; @@ -9673,9 +10596,9 @@ wl_enq_event(struct wl_priv *wl, struct net_device *ndev, u32 event, const wl_ev memcpy(&e->emsg, msg, sizeof(wl_event_msg_t)); if (data) memcpy(e->edata, data, data_len); - flags = wl_lock_eq(wl); - list_add_tail(&e->eq_list, &wl->eq_list); - wl_unlock_eq(wl, flags); + flags = wl_lock_eq(cfg); + list_add_tail(&e->eq_list, &cfg->eq_list); + wl_unlock_eq(cfg, flags); return err; } @@ -9685,7 +10608,7 @@ static void wl_put_event(struct wl_event_q *e) kfree(e); } -static s32 wl_config_ifmode(struct wl_priv *wl, struct net_device *ndev, s32 iftype) +static s32 wl_config_ifmode(struct bcm_cfg80211 *cfg, struct net_device *ndev, s32 iftype) { s32 infra = 0; s32 err = 0; @@ -9722,19 +10645,84 @@ static s32 wl_config_ifmode(struct wl_priv *wl, struct net_device *ndev, s32 ift return err; } - wl_set_mode_by_netdev(wl, ndev, mode); + wl_set_mode_by_netdev(cfg, ndev, mode); return 0; } -s32 wl_add_remove_eventmsg(struct net_device *ndev, u16 event, bool add) +void wl_cfg80211_add_to_eventbuffer(struct wl_eventmsg_buf *ev, u16 event, bool set) { + if (!ev || (event > WLC_E_LAST)) + return; + + if (ev->num < MAX_EVENT_BUF_NUM) { + ev->event[ev->num].type = event; + ev->event[ev->num].set = set; + ev->num++; + } else { + WL_ERR(("evenbuffer doesn't support > %u events. Update" + " the define MAX_EVENT_BUF_NUM \n", MAX_EVENT_BUF_NUM)); + ASSERT(0); + } +} + +s32 wl_cfg80211_apply_eventbuffer( + struct net_device *ndev, + struct bcm_cfg80211 *cfg, + wl_eventmsg_buf_t *ev) +{ + char eventmask[WL_EVENTING_MASK_LEN]; + int i, ret = 0; s8 iovbuf[WL_EVENTING_MASK_LEN + 12]; + if (!ev || (!ev->num)) + return -EINVAL; + + mutex_lock(&cfg->event_sync); + + /* Read event_msgs mask */ + bcm_mkiovar("event_msgs", NULL, 0, iovbuf, + sizeof(iovbuf)); + ret = wldev_ioctl(ndev, WLC_GET_VAR, iovbuf, sizeof(iovbuf), false); + if (unlikely(ret)) { + WL_ERR(("Get event_msgs error (%d)\n", ret)); + goto exit; + } + memcpy(eventmask, iovbuf, WL_EVENTING_MASK_LEN); + + /* apply the set bits */ + for (i = 0; i < ev->num; i++) { + if (ev->event[i].set) + setbit(eventmask, ev->event[i].type); + else + clrbit(eventmask, ev->event[i].type); + } + + /* Write updated Event mask */ + bcm_mkiovar("event_msgs", eventmask, WL_EVENTING_MASK_LEN, iovbuf, + sizeof(iovbuf)); + ret = wldev_ioctl(ndev, WLC_SET_VAR, iovbuf, sizeof(iovbuf), true); + if (unlikely(ret)) { + WL_ERR(("Set event_msgs error (%d)\n", ret)); + } + +exit: + mutex_unlock(&cfg->event_sync); + return ret; +} + +s32 wl_add_remove_eventmsg(struct net_device *ndev, u16 event, bool add) +{ + s8 iovbuf[WL_EVENTING_MASK_LEN + 12]; s8 eventmask[WL_EVENTING_MASK_LEN]; s32 err = 0; - if (!ndev) + struct bcm_cfg80211 *cfg = g_bcm_cfg; + + if (!ndev || !cfg) return -ENODEV; + + mutex_lock(&cfg->event_sync); + /* Setup event_msgs */ bcm_mkiovar("event_msgs", NULL, 0, iovbuf, sizeof(iovbuf)); @@ -9758,13 +10746,13 @@ s32 wl_add_remove_eventmsg(struct net_device *ndev, u16 event, bool add) } eventmsg_out: + mutex_unlock(&cfg->event_sync); return err; - } -static int wl_construct_reginfo(struct wl_priv *wl, s32 bw_cap) +static int wl_construct_reginfo(struct bcm_cfg80211 *cfg, s32 bw_cap) { - struct net_device *dev = wl_to_prmry_ndev(wl); + struct net_device *dev = bcmcfg_to_prmry_ndev(cfg); struct ieee80211_channel *band_chan_arr = NULL; wl_uint32_list_t *list; u32 i, j, index, n_2g, n_5g, band, channel, array_size; @@ -9788,7 +10776,7 @@ static int wl_construct_reginfo(struct wl_priv *wl, s32 bw_cap) err = wldev_iovar_getbuf_bsscfg(dev, "chanspecs", NULL, - 0, pbuf, LOCAL_BUF_LEN, 0, &wl->ioctl_buf_sync); + 0, pbuf, LOCAL_BUF_LEN, 0, &cfg->ioctl_buf_sync); if (err != 0) { WL_ERR(("get chanspecs failed with %d\n", err)); kfree(pbuf); @@ -9890,8 +10878,10 @@ static int wl_construct_reginfo(struct wl_priv *wl, s32 bw_cap) if (channel & WL_CHAN_PASSIVE) band_chan_arr[index].flags |= IEEE80211_CHAN_PASSIVE_SCAN; - } else if (err == BCME_UNSUPPORTED) + } else if (err == BCME_UNSUPPORTED) { dfs_radar_disabled = TRUE; + WL_ERR(("does not support per_chan_info\n")); + } } } if (!update) @@ -9905,7 +10895,7 @@ static int wl_construct_reginfo(struct wl_priv *wl, s32 bw_cap) return err; } -s32 wl_update_wiphybands(struct wl_priv *wl) +s32 wl_update_wiphybands(struct bcm_cfg80211 *cfg, bool notify) { struct wiphy *wiphy; struct net_device *dev; @@ -9920,18 +10910,18 @@ s32 wl_update_wiphybands(struct wl_priv *wl) s32 cur_band = -1; struct ieee80211_supported_band *bands[IEEE80211_NUM_BANDS] = {NULL, }; - if (wl == NULL) { - wl = wlcfg_drv_priv; - mutex_lock(&wl->usr_sync); + if (cfg == NULL) { + cfg = g_bcm_cfg; + mutex_lock(&cfg->usr_sync); rollback_lock = true; } - dev = wl_to_prmry_ndev(wl); + dev = bcmcfg_to_prmry_ndev(cfg); memset(bandlist, 0, sizeof(bandlist)); err = wldev_ioctl(dev, WLC_GET_BANDLIST, bandlist, sizeof(bandlist), false); if (unlikely(err)) { - WL_ERR(("error real bandlist (%d)\n", err)); + WL_ERR(("error read bandlist (%d)\n", err)); goto end_bands; } err = wldev_ioctl(dev, WLC_GET_BAND, &cur_band, @@ -9952,14 +10942,14 @@ s32 wl_update_wiphybands(struct wl_priv *wl) } } - err = wl_construct_reginfo(wl, bw_cap); + err = wl_construct_reginfo(cfg, bw_cap); if (err) { WL_ERR(("wl_construct_reginfo() fails err=%d\n", err)); if (err != BCME_UNSUPPORTED) goto end_bands; err = 0; } - wiphy = wl_to_wiphy(wl); + wiphy = bcmcfg_to_wiphy(cfg); nband = bandlist[0]; for (i = 1; i <= nband && i < ARRAYSIZE(bandlist); i++) { @@ -9994,39 +10984,55 @@ s32 wl_update_wiphybands(struct wl_priv *wl) wiphy->bands[IEEE80211_BAND_2GHZ] = bands[IEEE80211_BAND_2GHZ]; wiphy->bands[IEEE80211_BAND_5GHZ] = bands[IEEE80211_BAND_5GHZ]; - wiphy_apply_custom_regulatory(wiphy, &brcm_regdom); + /* check if any bands populated otherwise makes 2Ghz as default */ + if (wiphy->bands[IEEE80211_BAND_2GHZ] == NULL && + wiphy->bands[IEEE80211_BAND_5GHZ] == NULL) { + /* Setup 2Ghz band as default */ + wiphy->bands[IEEE80211_BAND_2GHZ] = &__wl_band_2ghz; + } + + if (notify) + wiphy_apply_custom_regulatory(wiphy, &brcm_regdom); + end_bands: if (rollback_lock) - mutex_unlock(&wl->usr_sync); + mutex_unlock(&cfg->usr_sync); return err; } -static s32 __wl_cfg80211_up(struct wl_priv *wl) +static s32 __wl_cfg80211_up(struct bcm_cfg80211 *cfg) { s32 err = 0; #ifdef WL_HOST_BAND_MGMT s32 ret = 0; #endif /* WL_HOST_BAND_MGMT */ - struct net_device *ndev = wl_to_prmry_ndev(wl); + struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg); struct wireless_dev *wdev = ndev->ieee80211_ptr; WL_DBG(("In\n")); - err = dhd_config_dongle(wl, false); + err = dhd_config_dongle(cfg); if (unlikely(err)) return err; - err = wl_config_ifmode(wl, ndev, wdev->iftype); + err = wl_config_ifmode(cfg, ndev, wdev->iftype); if (unlikely(err && err != -EINPROGRESS)) { WL_ERR(("wl_config_ifmode failed\n")); + if (err == -1) { + WL_ERR(("return error %d\n", err)); + return err; + } } - err = wl_update_wiphybands(wl); + err = wl_update_wiphybands(cfg, true); if (unlikely(err)) { WL_ERR(("wl_update_wiphybands failed\n")); + if (err == -1) { + WL_ERR(("return error %d\n", err)); + return err; + } } - err = dhd_monitor_init(wl->pub); - err = wl_invoke_iscan(wl); + err = dhd_monitor_init(cfg->pub); #ifdef WL_HOST_BAND_MGMT /* By default the curr_band is initialized to BAND_AUTO */ @@ -10043,69 +11049,95 @@ static s32 __wl_cfg80211_up(struct wl_priv *wl) } } #endif /* WL_HOST_BAND_MGMT */ - - wl_set_drv_status(wl, READY, ndev); +#if defined(CUSTOMER_HW4) && defined(WES_SUPPORT) + /* Reset WES mode to 0 */ + wes_mode = 0; +#endif + INIT_DELAYED_WORK(&cfg->pm_enable_work, wl_cfg80211_work_handler); + wl_set_drv_status(cfg, READY, ndev); return err; } -static s32 __wl_cfg80211_down(struct wl_priv *wl) +static s32 __wl_cfg80211_down(struct bcm_cfg80211 *cfg) { s32 err = 0; unsigned long flags; struct net_info *iter, *next; - struct net_device *ndev = wl_to_prmry_ndev(wl); -#if defined(WL_CFG80211) && defined(SUPPORT_DEEP_SLEEP) - struct net_device *p2p_net = wl->p2p_net; -#endif + struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg); +#if defined(WL_CFG80211) && (defined(WL_ENABLE_P2P_IF) || \ + defined(WL_NEWCFG_PRIVCMD_SUPPORT)) + struct net_device *p2p_net = cfg->p2p_net; +#endif /* WL_CFG80211 && (WL_ENABLE_P2P_IF || WL_NEWCFG_PRIVCMD_SUPPORT) */ u32 bssidx = 0; +#ifdef PROP_TXSTATUS_VSDB + dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub); +#endif /* PROP_TXSTATUS_VSDB */ WL_DBG(("In\n")); + /* Delete pm_enable_work */ + wl_add_remove_pm_enable_work(cfg, FALSE, WL_HANDLER_DEL); + + if (cfg->p2p_supported) { + wl_clr_p2p_status(cfg, GO_NEG_PHASE); +#ifdef PROP_TXSTATUS_VSDB + if (cfg->p2p->vif_created) { + bool enabled = false; + dhd_wlfc_get_enable(dhd, &enabled); + if (enabled && cfg->wlfc_on && dhd->op_mode != DHD_FLAG_HOSTAP_MODE && + dhd->op_mode != DHD_FLAG_IBSS_MODE) { + dhd_wlfc_deinit(dhd); + cfg->wlfc_on = false; + } + } +#endif /* PROP_TXSTATUS_VSDB */ + } /* If primary BSS is operational (for e.g SoftAP), bring it down */ - if (!(wl_cfgp2p_find_idx(wl, ndev, &bssidx)) && + if (!(wl_cfgp2p_find_idx(cfg, ndev, &bssidx)) && wl_cfgp2p_bss_isup(ndev, bssidx)) { - if (wl_cfgp2p_bss(wl, ndev, bssidx, 0) < 0) + if (wl_cfgp2p_bss(cfg, ndev, bssidx, 0) < 0) WL_ERR(("BSS down failed \n")); } /* Check if cfg80211 interface is already down */ - if (!wl_get_drv_status(wl, READY, ndev)) + if (!wl_get_drv_status(cfg, READY, ndev)) return err; /* it is even not ready */ - for_each_ndev(wl, iter, next) - wl_set_drv_status(wl, SCAN_ABORTING, iter->ndev); + for_each_ndev(cfg, iter, next) + wl_set_drv_status(cfg, SCAN_ABORTING, iter->ndev); - wl_term_iscan(wl); - spin_lock_irqsave(&wl->cfgdrv_lock, flags); - if (wl->scan_request) { - cfg80211_scan_done(wl->scan_request, true); - wl->scan_request = NULL; + spin_lock_irqsave(&cfg->cfgdrv_lock, flags); + if (cfg->scan_request) { + cfg80211_scan_done(cfg->scan_request, true); + cfg->scan_request = NULL; } - spin_unlock_irqrestore(&wl->cfgdrv_lock, flags); + spin_unlock_irqrestore(&cfg->cfgdrv_lock, flags); - for_each_ndev(wl, iter, next) { - wl_clr_drv_status(wl, READY, iter->ndev); - wl_clr_drv_status(wl, SCANNING, iter->ndev); - wl_clr_drv_status(wl, SCAN_ABORTING, iter->ndev); - wl_clr_drv_status(wl, CONNECTING, iter->ndev); - wl_clr_drv_status(wl, CONNECTED, iter->ndev); - wl_clr_drv_status(wl, DISCONNECTING, iter->ndev); - wl_clr_drv_status(wl, AP_CREATED, iter->ndev); - wl_clr_drv_status(wl, AP_CREATING, iter->ndev); + for_each_ndev(cfg, iter, next) { + wl_clr_drv_status(cfg, READY, iter->ndev); + wl_clr_drv_status(cfg, SCANNING, iter->ndev); + wl_clr_drv_status(cfg, SCAN_ABORTING, iter->ndev); + wl_clr_drv_status(cfg, CONNECTING, iter->ndev); + wl_clr_drv_status(cfg, CONNECTED, iter->ndev); + wl_clr_drv_status(cfg, DISCONNECTING, iter->ndev); + wl_clr_drv_status(cfg, AP_CREATED, iter->ndev); + wl_clr_drv_status(cfg, AP_CREATING, iter->ndev); } - wl_to_prmry_ndev(wl)->ieee80211_ptr->iftype = + bcmcfg_to_prmry_ndev(cfg)->ieee80211_ptr->iftype = NL80211_IFTYPE_STATION; -#if defined(WL_CFG80211) && defined(SUPPORT_DEEP_SLEEP) - if (!trigger_deep_sleep) { +#if defined(WL_CFG80211) && (defined(WL_ENABLE_P2P_IF) || \ + defined(WL_NEWCFG_PRIVCMD_SUPPORT)) +#ifdef SUPPORT_DEEP_SLEEP + if (!trigger_deep_sleep) +#endif /* SUPPORT_DEEP_SLEEP */ if (p2p_net) dev_close(p2p_net); - } -#endif - DNGL_FUNC(dhd_cfg80211_down, (wl)); - wl_flush_eq(wl); - wl_link_down(wl); - if (wl->p2p_supported) - wl_cfgp2p_down(wl); +#endif /* WL_CFG80211 && (WL_ENABLE_P2P_IF || WL_NEWCFG_PRIVCMD_SUPPORT) */ + DNGL_FUNC(dhd_cfg80211_down, (cfg)); + wl_flush_eq(cfg); + wl_link_down(cfg); + if (cfg->p2p_supported) + wl_cfgp2p_down(cfg); dhd_monitor_uninit(); return err; @@ -10113,16 +11145,16 @@ static s32 __wl_cfg80211_down(struct wl_priv *wl) s32 wl_cfg80211_up(void *para) { - struct wl_priv *wl; + struct bcm_cfg80211 *cfg; s32 err = 0; int val = 1; dhd_pub_t *dhd; (void)para; WL_DBG(("In\n")); - wl = wlcfg_drv_priv; + cfg = g_bcm_cfg; - if ((err = wldev_ioctl(wl_to_prmry_ndev(wl), WLC_GET_VERSION, &val, + if ((err = wldev_ioctl(bcmcfg_to_prmry_ndev(cfg), WLC_GET_VERSION, &val, sizeof(int), false) < 0)) { WL_ERR(("WLC_GET_VERSION failed, err=%d\n", err)); return err; @@ -10136,62 +11168,66 @@ s32 wl_cfg80211_up(void *para) ioctl_version = val; WL_TRACE(("WLC_GET_VERSION=%d\n", ioctl_version)); - mutex_lock(&wl->usr_sync); - dhd = (dhd_pub_t *)(wl->pub); + mutex_lock(&cfg->usr_sync); + dhd = (dhd_pub_t *)(cfg->pub); if (!(dhd->op_mode & DHD_FLAG_HOSTAP_MODE)) { - err = wl_cfg80211_attach_post(wl_to_prmry_ndev(wl)); + err = wl_cfg80211_attach_post(bcmcfg_to_prmry_ndev(cfg)); if (unlikely(err)) return err; } #if defined(BCMSUP_4WAY_HANDSHAKE) && defined(WLAN_AKM_SUITE_FT_8021X) if (dhd->fw_4way_handshake) - wl->wdev->wiphy->features |= NL80211_FEATURE_FW_4WAY_HANDSHAKE; + cfg->wdev->wiphy->features |= NL80211_FEATURE_FW_4WAY_HANDSHAKE; #endif - err = __wl_cfg80211_up(wl); + err = __wl_cfg80211_up(cfg); if (unlikely(err)) WL_ERR(("__wl_cfg80211_up failed\n")); - mutex_unlock(&wl->usr_sync); +#ifdef ROAM_CHANNEL_CACHE + init_roam(ioctl_version); +#endif + mutex_unlock(&cfg->usr_sync); return err; } /* Private Event to Supplicant with indication that chip hangs */ int wl_cfg80211_hang(struct net_device *dev, u16 reason) { - struct wl_priv *wl; - wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg; + cfg = g_bcm_cfg; WL_ERR(("In : chip crash eventing\n")); + wl_add_remove_pm_enable_work(cfg, FALSE, WL_HANDLER_DEL); cfg80211_disconnected(dev, reason, NULL, 0, GFP_KERNEL); - if (wl != NULL) { - wl_link_down(wl); + if (cfg != NULL) { + wl_link_down(cfg); } return 0; } s32 wl_cfg80211_down(void *para) { - struct wl_priv *wl; + struct bcm_cfg80211 *cfg; s32 err = 0; (void)para; WL_DBG(("In\n")); - wl = wlcfg_drv_priv; - mutex_lock(&wl->usr_sync); - err = __wl_cfg80211_down(wl); - mutex_unlock(&wl->usr_sync); + cfg = g_bcm_cfg; + mutex_lock(&cfg->usr_sync); + err = __wl_cfg80211_down(cfg); + mutex_unlock(&cfg->usr_sync); return err; } -static void *wl_read_prof(struct wl_priv *wl, struct net_device *ndev, s32 item) +static void *wl_read_prof(struct bcm_cfg80211 *cfg, struct net_device *ndev, s32 item) { unsigned long flags; void *rptr = NULL; - struct wl_profile *profile = wl_get_profile_by_netdev(wl, ndev); + struct wl_profile *profile = wl_get_profile_by_netdev(cfg, ndev); if (!profile) return NULL; - spin_lock_irqsave(&wl->cfgdrv_lock, flags); + spin_lock_irqsave(&cfg->cfgdrv_lock, flags); switch (item) { case WL_PROF_SEC: rptr = &profile->sec; @@ -10209,24 +11245,24 @@ static void *wl_read_prof(struct wl_priv *wl, struct net_device *ndev, s32 item) rptr = &profile->channel; break; } - spin_unlock_irqrestore(&wl->cfgdrv_lock, flags); + spin_unlock_irqrestore(&cfg->cfgdrv_lock, flags); if (!rptr) WL_ERR(("invalid item (%d)\n", item)); return rptr; } static s32 -wl_update_prof(struct wl_priv *wl, struct net_device *ndev, +wl_update_prof(struct bcm_cfg80211 *cfg, struct net_device *ndev, const wl_event_msg_t *e, void *data, s32 item) { s32 err = 0; struct wlc_ssid *ssid; unsigned long flags; - struct wl_profile *profile = wl_get_profile_by_netdev(wl, ndev); + struct wl_profile *profile = wl_get_profile_by_netdev(cfg, ndev); if (!profile) return WL_INVALID; - spin_lock_irqsave(&wl->cfgdrv_lock, flags); + spin_lock_irqsave(&cfg->cfgdrv_lock, flags); switch (item) { case WL_PROF_SSID: ssid = (wlc_ssid_t *) data; @@ -10260,7 +11296,7 @@ wl_update_prof(struct wl_priv *wl, struct net_device *ndev, err = -EOPNOTSUPP; break; } - spin_unlock_irqrestore(&wl->cfgdrv_lock, flags); + spin_unlock_irqrestore(&cfg->cfgdrv_lock, flags); if (err == -EOPNOTSUPP) WL_ERR(("unsupported item (%d)\n", item)); @@ -10279,26 +11315,26 @@ void wl_cfg80211_dbg_level(u32 level) /* wl_dbg_level = level; */ } -static bool wl_is_ibssmode(struct wl_priv *wl, struct net_device *ndev) +static bool wl_is_ibssmode(struct bcm_cfg80211 *cfg, struct net_device *ndev) { - return wl_get_mode_by_netdev(wl, ndev) == WL_MODE_IBSS; + return wl_get_mode_by_netdev(cfg, ndev) == WL_MODE_IBSS; } -static __used bool wl_is_ibssstarter(struct wl_priv *wl) +static __used bool wl_is_ibssstarter(struct bcm_cfg80211 *cfg) { - return wl->ibss_starter; + return cfg->ibss_starter; } -static void wl_rst_ie(struct wl_priv *wl) +static void wl_rst_ie(struct bcm_cfg80211 *cfg) { - struct wl_ie *ie = wl_to_ie(wl); + struct wl_ie *ie = wl_to_ie(cfg); ie->offset = 0; } -static __used s32 wl_add_ie(struct wl_priv *wl, u8 t, u8 l, u8 *v) +static __used s32 wl_add_ie(struct bcm_cfg80211 *cfg, u8 t, u8 l, u8 *v) { - struct wl_ie *ie = wl_to_ie(wl); + struct wl_ie *ie = wl_to_ie(cfg); s32 err = 0; if (unlikely(ie->offset + l + 2 > WL_TLV_INFO_MAX)) { @@ -10313,9 +11349,32 @@ static __used s32 wl_add_ie(struct wl_priv *wl, u8 t, u8 l, u8 *v) return err; } -static s32 wl_mrg_ie(struct wl_priv *wl, u8 *ie_stream, u16 ie_size) +static void wl_update_hidden_ap_ie(struct wl_bss_info *bi, u8 *ie_stream, u32 *ie_size) +{ + u8 *ssidie; + ssidie = (u8 *)cfg80211_find_ie(WLAN_EID_SSID, ie_stream, *ie_size); + if (!ssidie) + return; + if (ssidie[1] != bi->SSID_len) { + if (ssidie[1]) { + WL_ERR(("%s: Wrong SSID len: %d != %d\n", + __FUNCTION__, ssidie[1], bi->SSID_len)); + return; + } + memmove(ssidie + bi->SSID_len + 2, ssidie + 2, *ie_size - (ssidie + 2 - ie_stream)); + memcpy(ssidie + 2, bi->SSID, bi->SSID_len); + *ie_size = *ie_size + bi->SSID_len; + ssidie[1] = bi->SSID_len; + return; + } + if (*(ssidie + 2) == '\0') + memcpy(ssidie + 2, bi->SSID, bi->SSID_len); + return; +} + +static s32 wl_mrg_ie(struct bcm_cfg80211 *cfg, u8 *ie_stream, u16 ie_size) { - struct wl_ie *ie = wl_to_ie(wl); + struct wl_ie *ie = wl_to_ie(cfg); s32 err = 0; if (unlikely(ie->offset + ie_size > WL_TLV_INFO_MAX)) { @@ -10328,9 +11387,9 @@ static s32 wl_mrg_ie(struct wl_priv *wl, u8 *ie_stream, u16 ie_size) return err; } -static s32 wl_cp_ie(struct wl_priv *wl, u8 *dst, u16 dst_size) +static s32 wl_cp_ie(struct bcm_cfg80211 *cfg, u8 *dst, u16 dst_size) { - struct wl_ie *ie = wl_to_ie(wl); + struct wl_ie *ie = wl_to_ie(cfg); s32 err = 0; if (unlikely(ie->offset > dst_size)) { @@ -10342,68 +11401,68 @@ static s32 wl_cp_ie(struct wl_priv *wl, u8 *dst, u16 dst_size) return err; } -static u32 wl_get_ielen(struct wl_priv *wl) +static u32 wl_get_ielen(struct bcm_cfg80211 *cfg) { - struct wl_ie *ie = wl_to_ie(wl); + struct wl_ie *ie = wl_to_ie(cfg); return ie->offset; } -static void wl_link_up(struct wl_priv *wl) +static void wl_link_up(struct bcm_cfg80211 *cfg) { - wl->link_up = true; + cfg->link_up = true; } -static void wl_link_down(struct wl_priv *wl) +static void wl_link_down(struct bcm_cfg80211 *cfg) { - struct wl_connect_info *conn_info = wl_to_conn(wl); + struct wl_connect_info *conn_info = wl_to_conn(cfg); WL_DBG(("In\n")); - wl->link_up = false; + cfg->link_up = false; conn_info->req_ie_len = 0; conn_info->resp_ie_len = 0; } -static unsigned long wl_lock_eq(struct wl_priv *wl) +static unsigned long wl_lock_eq(struct bcm_cfg80211 *cfg) { unsigned long flags; - spin_lock_irqsave(&wl->eq_lock, flags); + spin_lock_irqsave(&cfg->eq_lock, flags); return flags; } -static void wl_unlock_eq(struct wl_priv *wl, unsigned long flags) +static void wl_unlock_eq(struct bcm_cfg80211 *cfg, unsigned long flags) { - spin_unlock_irqrestore(&wl->eq_lock, flags); + spin_unlock_irqrestore(&cfg->eq_lock, flags); } -static void wl_init_eq_lock(struct wl_priv *wl) +static void wl_init_eq_lock(struct bcm_cfg80211 *cfg) { - spin_lock_init(&wl->eq_lock); + spin_lock_init(&cfg->eq_lock); } static void wl_delay(u32 ms) { if (in_atomic() || (ms < jiffies_to_msecs(1))) { - mdelay(ms); + OSL_DELAY(ms*1000); } else { - msleep(ms); + OSL_SLEEP(ms); } } s32 wl_cfg80211_get_p2p_dev_addr(struct net_device *net, struct ether_addr *p2pdev_addr) { - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; struct ether_addr p2pif_addr; struct ether_addr primary_mac; - if (!wl->p2p) + if (!cfg->p2p) return -1; - if (!p2p_is_on(wl)) { - get_primary_mac(wl, &primary_mac); + if (!p2p_is_on(cfg)) { + get_primary_mac(cfg, &primary_mac); wl_cfgp2p_generate_bss_mac(&primary_mac, p2pdev_addr, &p2pif_addr); } else { memcpy(p2pdev_addr->octet, - wl->p2p->dev_addr.octet, ETHER_ADDR_LEN); + cfg->p2p->dev_addr.octet, ETHER_ADDR_LEN); } @@ -10411,27 +11470,27 @@ s32 wl_cfg80211_get_p2p_dev_addr(struct net_device *net, struct ether_addr *p2pd } s32 wl_cfg80211_set_p2p_noa(struct net_device *net, char* buf, int len) { - struct wl_priv *wl; + struct bcm_cfg80211 *cfg; - wl = wlcfg_drv_priv; + cfg = g_bcm_cfg; - return wl_cfgp2p_set_p2p_noa(wl, net, buf, len); + return wl_cfgp2p_set_p2p_noa(cfg, net, buf, len); } s32 wl_cfg80211_get_p2p_noa(struct net_device *net, char* buf, int len) { - struct wl_priv *wl; - wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg; + cfg = g_bcm_cfg; - return wl_cfgp2p_get_p2p_noa(wl, net, buf, len); + return wl_cfgp2p_get_p2p_noa(cfg, net, buf, len); } s32 wl_cfg80211_set_p2p_ps(struct net_device *net, char* buf, int len) { - struct wl_priv *wl; - wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg; + cfg = g_bcm_cfg; - return wl_cfgp2p_set_p2p_ps(wl, net, buf, len); + return wl_cfgp2p_set_p2p_ps(cfg, net, buf, len); } s32 wl_cfg80211_channel_to_freq(u32 channel) @@ -10453,12 +11512,18 @@ s32 wl_cfg80211_channel_to_freq(u32 channel) return freq; } + +#ifdef WLTDLS static s32 -wl_tdls_event_handler(struct wl_priv *wl, struct net_device *ndev, +wl_tdls_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data) { + struct net_device *ndev = NULL; u32 reason = ntoh32(e->reason); s8 *msg = NULL; + + ndev = cfgdev_to_wlc_ndev(cfgdev, cfg); + switch (reason) { case WLC_E_TDLS_PEER_DISCOVERED : msg = " TDLS PEER DISCOVERD "; @@ -10472,91 +11537,108 @@ wl_tdls_event_handler(struct wl_priv *wl, struct net_device *ndev, } if (msg) { WL_ERR(("%s: " MACDBG " on %s ndev\n", msg, MAC2STRDBG((u8*)(&e->addr)), - (wl_to_prmry_ndev(wl) == ndev) ? "primary" : "secondary")); + (bcmcfg_to_prmry_ndev(cfg) == ndev) ? "primary" : "secondary")); } return 0; } -#if 1 //LINUX_VERSION_CODE > KERNEL_VERSION(3, 2, 0) +#endif /* WLTDLS */ + +#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 2, 0)) || defined(WL_COMPAT_WIRELESS) static s32 wl_cfg80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev, u8 *peer, enum nl80211_tdls_operation oper) { s32 ret = 0; #ifdef WLTDLS - struct wl_priv *wl; + struct bcm_cfg80211 *cfg; tdls_iovar_t info; - wl = wlcfg_drv_priv; + cfg = g_bcm_cfg; memset(&info, 0, sizeof(tdls_iovar_t)); if (peer) memcpy(&info.ea, peer, ETHER_ADDR_LEN); switch (oper) { case NL80211_TDLS_DISCOVERY_REQ: + /* turn on TDLS */ + ret = dhd_tdls_enable(dev, true, false, NULL); + if (ret < 0) + return ret; info.mode = TDLS_MANUAL_EP_DISCOVERY; break; case NL80211_TDLS_SETUP: - info.mode = TDLS_MANUAL_EP_CREATE; + /* auto mode on */ + ret = dhd_tdls_enable(dev, true, true, (struct ether_addr *)peer); + if (ret < 0) + return ret; break; case NL80211_TDLS_TEARDOWN: info.mode = TDLS_MANUAL_EP_DELETE; + /* auto mode off */ + ret = dhd_tdls_enable(dev, true, false, (struct ether_addr *)peer); + if (ret < 0) + return ret; break; default: WL_ERR(("Unsupported operation : %d\n", oper)); goto out; } - ret = wldev_iovar_setbuf(dev, "tdls_endpoint", &info, sizeof(info), - wl->ioctl_buf, WLC_IOCTL_MAXLEN, &wl->ioctl_buf_sync); - if (ret) { - WL_ERR(("tdls_endpoint error %d\n", ret)); + if (info.mode) { + ret = wldev_iovar_setbuf(dev, "tdls_endpoint", &info, sizeof(info), + cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync); + if (ret) { + WL_ERR(("tdls_endpoint error %d\n", ret)); + } } out: #endif /* WLTDLS */ return ret; } -#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(3, 2, 0) */ +#endif /* LINUX_VERSION > VERSION(3,2,0) || WL_COMPAT_WIRELESS */ s32 wl_cfg80211_set_wps_p2p_ie(struct net_device *net, char *buf, int len, enum wl_management_type type) { - struct wl_priv *wl; + struct bcm_cfg80211 *cfg; struct net_device *ndev = NULL; struct ether_addr primary_mac; s32 ret = 0; s32 bssidx = 0; s32 pktflag = 0; - wl = wlcfg_drv_priv; + cfg = g_bcm_cfg; - if (wl_get_drv_status(wl, AP_CREATING, net) || - wl_get_drv_status(wl, AP_CREATED, net)) { + if (wl_get_drv_status(cfg, AP_CREATING, net)) { + /* Vendor IEs should be set to FW + * after SoftAP interface is brought up + */ + goto exit; + } else if (wl_get_drv_status(cfg, AP_CREATED, net)) { ndev = net; bssidx = 0; - } else if (wl->p2p) { - if (net == wl->p2p_net) { - net = wl_to_prmry_ndev(wl); - } - if (!wl->p2p->on) { - get_primary_mac(wl, &primary_mac); - wl_cfgp2p_generate_bss_mac(&primary_mac, &wl->p2p->dev_addr, - &wl->p2p->int_addr); + } else if (cfg->p2p) { + net = ndev_to_wlc_ndev(net, cfg); + if (!cfg->p2p->on) { + get_primary_mac(cfg, &primary_mac); + wl_cfgp2p_generate_bss_mac(&primary_mac, &cfg->p2p->dev_addr, + &cfg->p2p->int_addr); /* In case of p2p_listen command, supplicant send remain_on_channel * without turning on P2P */ - p2p_on(wl) = true; - ret = wl_cfgp2p_enable_discovery(wl, net, NULL, 0); + p2p_on(cfg) = true; + ret = wl_cfgp2p_enable_discovery(cfg, net, NULL, 0); if (unlikely(ret)) { goto exit; } } - if (net != wl_to_prmry_ndev(wl)) { - if (wl_get_mode_by_netdev(wl, net) == WL_MODE_AP) { - ndev = wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_CONNECTION); - bssidx = wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_CONNECTION); + if (net != bcmcfg_to_prmry_ndev(cfg)) { + if (wl_get_mode_by_netdev(cfg, net) == WL_MODE_AP) { + ndev = wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_CONNECTION); + bssidx = wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_CONNECTION); } } else { - ndev = wl_to_p2p_bss_ndev(wl, P2PAPI_BSSCFG_PRIMARY); - bssidx = wl_to_p2p_bss_bssidx(wl, P2PAPI_BSSCFG_DEVICE); + ndev = wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_PRIMARY); + bssidx = wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_DEVICE); } } if (ndev != NULL) { @@ -10572,65 +11654,388 @@ s32 wl_cfg80211_set_wps_p2p_ie(struct net_device *net, char *buf, int len, break; } if (pktflag) - ret = wl_cfgp2p_set_management_ie(wl, ndev, bssidx, pktflag, buf, len); + ret = wl_cfgp2p_set_management_ie(cfg, ndev, bssidx, pktflag, buf, len); } exit: return ret; } +#ifdef WL_SUPPORT_AUTO_CHANNEL +static s32 +wl_cfg80211_set_auto_channel_scan_state(struct net_device *ndev) +{ + u32 val = 0; + s32 ret = BCME_ERROR; + struct bcm_cfg80211 *cfg = g_bcm_cfg; + + /* Disable mpc, to avoid automatic interface down. */ + val = 0; + + ret = wldev_iovar_setbuf_bsscfg(ndev, "mpc", (void *)&val, + sizeof(val), cfg->ioctl_buf, WLC_IOCTL_SMLEN, 0, + &cfg->ioctl_buf_sync); + if (ret < 0) { + WL_ERR(("set 'mpc' failed, error = %d\n", ret)); + goto done; + } + + /* Set interface up, explicitly. */ + val = 1; + + ret = wldev_ioctl(ndev, WLC_UP, (void *)&val, sizeof(val), true); + if (ret < 0) { + WL_ERR(("set interface up failed, error = %d\n", ret)); + goto done; + } + + /* Stop all scan explicitly, till auto channel selection complete. */ + wl_set_drv_status(cfg, SCANNING, ndev); + if (cfg->escan_info.ndev == NULL) { + ret = BCME_OK; + goto done; + } + ret = wl_notify_escan_complete(cfg, ndev, true, true); + if (ret < 0) { + WL_ERR(("set scan abort failed, error = %d\n", ret)); + goto done; + } + +done: + return ret; +} + +static bool +wl_cfg80211_valid_chanspec_p2p(chanspec_t chanspec) +{ + bool valid = false; + + /* channel 1 to 14 */ + if ((chanspec >= 0x2b01) && (chanspec <= 0x2b0e)) { + valid = true; + } + /* channel 36 to 48 */ + else if ((chanspec >= 0x1b24) && (chanspec <= 0x1b30)) { + valid = true; + } + /* channel 149 to 161 */ + else if ((chanspec >= 0x1b95) && (chanspec <= 0x1ba1)) { + valid = true; + } + else { + valid = false; + WL_INFO(("invalid P2P chanspec, channel = %d, chanspec = %04x\n", + CHSPEC_CHANNEL(chanspec), chanspec)); + } + + return valid; +} + +static s32 +wl_cfg80211_get_chanspecs_2g(struct net_device *ndev, void *buf, s32 buflen) +{ + s32 ret = BCME_ERROR; + struct bcm_cfg80211 *cfg = NULL; + wl_uint32_list_t *list = NULL; + chanspec_t chanspec = 0; + + memset(buf, 0, buflen); + + cfg = g_bcm_cfg; + list = (wl_uint32_list_t *)buf; + list->count = htod32(WL_NUMCHANSPECS); + + /* Restrict channels to 2.4GHz, 20MHz BW, no SB. */ + chanspec |= (WL_CHANSPEC_BAND_2G | WL_CHANSPEC_BW_20 | + WL_CHANSPEC_CTL_SB_NONE); + chanspec = wl_chspec_host_to_driver(chanspec); + + ret = wldev_iovar_getbuf_bsscfg(ndev, "chanspecs", (void *)&chanspec, + sizeof(chanspec), buf, buflen, 0, &cfg->ioctl_buf_sync); + if (ret < 0) { + WL_ERR(("get 'chanspecs' failed, error = %d\n", ret)); + } + + return ret; +} + +static s32 +wl_cfg80211_get_chanspecs_5g(struct net_device *ndev, void *buf, s32 buflen) +{ + u32 channel = 0; + s32 ret = BCME_ERROR; + s32 i = 0; + s32 j = 0; + struct bcm_cfg80211 *cfg = NULL; + wl_uint32_list_t *list = NULL; + chanspec_t chanspec = 0; + + memset(buf, 0, buflen); + + cfg = g_bcm_cfg; + list = (wl_uint32_list_t *)buf; + list->count = htod32(WL_NUMCHANSPECS); + + /* Restrict channels to 5GHz, 20MHz BW, no SB. */ + chanspec |= (WL_CHANSPEC_BAND_5G | WL_CHANSPEC_BW_20 | + WL_CHANSPEC_CTL_SB_NONE); + chanspec = wl_chspec_host_to_driver(chanspec); + + ret = wldev_iovar_getbuf_bsscfg(ndev, "chanspecs", (void *)&chanspec, + sizeof(chanspec), buf, buflen, 0, &cfg->ioctl_buf_sync); + if (ret < 0) { + WL_ERR(("get 'chanspecs' failed, error = %d\n", ret)); + goto done; + } + + /* Skip DFS and inavlid P2P channel. */ + for (i = 0, j = 0; i < dtoh32(list->count); i++) { + chanspec = (chanspec_t) dtoh32(list->element[i]); + channel = CHSPEC_CHANNEL(chanspec); + + ret = wldev_iovar_getint(ndev, "per_chan_info", &channel); + if (ret < 0) { + WL_ERR(("get 'per_chan_info' failed, error = %d\n", ret)); + goto done; + } + + if (CHANNEL_IS_RADAR(channel) || + !(wl_cfg80211_valid_chanspec_p2p(chanspec))) { + continue; + } else { + list->element[j] = list->element[i]; + } + + j++; + } + + list->count = j; + +done: + return ret; +} + +static s32 +wl_cfg80211_get_best_channel(struct net_device *ndev, void *buf, int buflen, + int *channel) +{ + s32 ret = BCME_ERROR; + int chosen = 0; + int retry = 0; + + /* Start auto channel selection scan. */ + ret = wldev_ioctl(ndev, WLC_START_CHANNEL_SEL, buf, buflen, true); + if (ret < 0) { + WL_ERR(("can't start auto channel scan, error = %d\n", ret)); + *channel = 0; + goto done; + } + + /* Wait for auto channel selection, worst case possible delay is 5250ms. */ + retry = CHAN_SEL_RETRY_COUNT; + + while (retry--) { + OSL_SLEEP(CHAN_SEL_IOCTL_DELAY); + + ret = wldev_ioctl(ndev, WLC_GET_CHANNEL_SEL, &chosen, sizeof(chosen), + false); + if ((ret == 0) && (dtoh32(chosen) != 0)) { + *channel = (u16)(chosen & 0x00FF); + WL_INFO(("selected channel = %d\n", *channel)); + break; + } + WL_INFO(("attempt = %d, ret = %d, chosen = %d\n", + (CHAN_SEL_RETRY_COUNT - retry), ret, dtoh32(chosen))); + } + + if (retry <= 0) { + WL_ERR(("failure, auto channel selection timed out\n")); + *channel = 0; + ret = BCME_ERROR; + } + +done: + return ret; +} + +static s32 +wl_cfg80211_restore_auto_channel_scan_state(struct net_device *ndev) +{ + u32 val = 0; + s32 ret = BCME_ERROR; + struct bcm_cfg80211 *cfg = g_bcm_cfg; + + /* Clear scan stop driver status. */ + wl_clr_drv_status(cfg, SCANNING, ndev); + + /* Enable mpc back to 1, irrespective of initial state. */ + val = 1; + + ret = wldev_iovar_setbuf_bsscfg(ndev, "mpc", (void *)&val, + sizeof(val), cfg->ioctl_buf, WLC_IOCTL_SMLEN, 0, + &cfg->ioctl_buf_sync); + if (ret < 0) { + WL_ERR(("set 'mpc' failed, error = %d\n", ret)); + } + + return ret; +} + +s32 +wl_cfg80211_get_best_channels(struct net_device *dev, char* cmd, int total_len) +{ + int channel = 0; + s32 ret = BCME_ERROR; + u8 *buf = NULL; + char *pos = cmd; + struct bcm_cfg80211 *cfg = NULL; + struct net_device *ndev = NULL; + + memset(cmd, 0, total_len); + + buf = kmalloc(CHANSPEC_BUF_SIZE, GFP_KERNEL); + if (buf == NULL) { + WL_ERR(("failed to allocate chanspec buffer\n")); + return -ENOMEM; + } + + /* + * Always use primary interface, irrespective of interface on which + * command came. + */ + cfg = g_bcm_cfg; + ndev = bcmcfg_to_prmry_ndev(cfg); + + /* + * Make sure that FW and driver are in right state to do auto channel + * selection scan. + */ + ret = wl_cfg80211_set_auto_channel_scan_state(ndev); + if (ret < 0) { + WL_ERR(("can't set auto channel scan state, error = %d\n", ret)); + goto done; + } + + /* Best channel selection in 2.4GHz band. */ + ret = wl_cfg80211_get_chanspecs_2g(ndev, (void *)buf, CHANSPEC_BUF_SIZE); + if (ret < 0) { + WL_ERR(("can't get chanspecs in 2.4GHz, error = %d\n", ret)); + goto done; + } + + ret = wl_cfg80211_get_best_channel(ndev, (void *)buf, CHANSPEC_BUF_SIZE, + &channel); + if (ret < 0) { + WL_ERR(("can't select best channel scan in 2.4GHz, error = %d\n", ret)); + goto done; + } + + if (CHANNEL_IS_2G(channel)) { + channel = ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ); + } else { + WL_ERR(("invalid 2.4GHz channel, channel = %d\n", channel)); + channel = 0; + } + + sprintf(pos, "%04d ", channel); + pos += 5; + + /* Best channel selection in 5GHz band. */ + ret = wl_cfg80211_get_chanspecs_5g(ndev, (void *)buf, CHANSPEC_BUF_SIZE); + if (ret < 0) { + WL_ERR(("can't get chanspecs in 5GHz, error = %d\n", ret)); + goto done; + } + + ret = wl_cfg80211_get_best_channel(ndev, (void *)buf, CHANSPEC_BUF_SIZE, + &channel); + if (ret < 0) { + WL_ERR(("can't select best channel scan in 5GHz, error = %d\n", ret)); + goto done; + } + + if (CHANNEL_IS_5G(channel)) { + channel = ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ); + } else { + WL_ERR(("invalid 5GHz channel, channel = %d\n", channel)); + channel = 0; + } + + sprintf(pos, "%04d ", channel); + pos += 5; + + /* Set overall best channel same as 5GHz best channel. */ + sprintf(pos, "%04d ", channel); + pos += 5; + +done: + if (NULL != buf) { + kfree(buf); + } + + /* Restore FW and driver back to normal state. */ + ret = wl_cfg80211_restore_auto_channel_scan_state(ndev); + if (ret < 0) { + WL_ERR(("can't restore auto channel scan state, error = %d\n", ret)); + } + + return (pos - cmd); +} +#endif /* WL_SUPPORT_AUTO_CHANNEL */ + static const struct rfkill_ops wl_rfkill_ops = { .set_block = wl_rfkill_set }; static int wl_rfkill_set(void *data, bool blocked) { - struct wl_priv *wl = (struct wl_priv *)data; + struct bcm_cfg80211 *cfg = (struct bcm_cfg80211 *)data; WL_DBG(("Enter \n")); WL_DBG(("RF %s\n", blocked ? "blocked" : "unblocked")); - if (!wl) + if (!cfg) return -EINVAL; - wl->rf_blocked = blocked; + cfg->rf_blocked = blocked; return 0; } -static int wl_setup_rfkill(struct wl_priv *wl, bool setup) +static int wl_setup_rfkill(struct bcm_cfg80211 *cfg, bool setup) { s32 err = 0; WL_DBG(("Enter \n")); - if (!wl) + if (!cfg) return -EINVAL; if (setup) { - wl->rfkill = rfkill_alloc("brcmfmac-wifi", + cfg->rfkill = rfkill_alloc("brcmfmac-wifi", wl_cfg80211_get_parent_dev(), - RFKILL_TYPE_WLAN, &wl_rfkill_ops, (void *)wl); + RFKILL_TYPE_WLAN, &wl_rfkill_ops, (void *)cfg); - if (!wl->rfkill) { + if (!cfg->rfkill) { err = -ENOMEM; goto err_out; } - err = rfkill_register(wl->rfkill); + err = rfkill_register(cfg->rfkill); if (err) - rfkill_destroy(wl->rfkill); + rfkill_destroy(cfg->rfkill); } else { - if (!wl->rfkill) { + if (!cfg->rfkill) { err = -ENOMEM; goto err_out; } - rfkill_unregister(wl->rfkill); - rfkill_destroy(wl->rfkill); + rfkill_unregister(cfg->rfkill); + rfkill_destroy(cfg->rfkill); } err_out: return err; } + #ifdef DEBUGFS_CFG80211 /** * Format : echo "SCAN:1 DBG:1" > /sys/kernel/debug/dhd/debug_level @@ -10717,41 +12122,42 @@ static const struct file_operations fops_debuglevel = { .llseek = NULL, }; -static s32 wl_setup_debugfs(struct wl_priv *wl) +static s32 wl_setup_debugfs(struct bcm_cfg80211 *cfg) { s32 err = 0; struct dentry *_dentry; - if (!wl) + if (!cfg) return -EINVAL; - wl->debugfs = debugfs_create_dir(KBUILD_MODNAME, NULL); - if (!wl->debugfs || IS_ERR(wl->debugfs)) { - if (wl->debugfs == ERR_PTR(-ENODEV)) + cfg->debugfs = debugfs_create_dir(KBUILD_MODNAME, NULL); + if (!cfg->debugfs || IS_ERR(cfg->debugfs)) { + if (cfg->debugfs == ERR_PTR(-ENODEV)) WL_ERR(("Debugfs is not enabled on this kernel\n")); else WL_ERR(("Can not create debugfs directory\n")); - wl->debugfs = NULL; + cfg->debugfs = NULL; goto exit; } _dentry = debugfs_create_file("debug_level", S_IRUSR | S_IWUSR, - wl->debugfs, wl, &fops_debuglevel); + cfg->debugfs, cfg, &fops_debuglevel); if (!_dentry || IS_ERR(_dentry)) { WL_ERR(("failed to create debug_level debug file\n")); - wl_free_debugfs(wl); + wl_free_debugfs(cfg); } exit: return err; } -static s32 wl_free_debugfs(struct wl_priv *wl) +static s32 wl_free_debugfs(struct bcm_cfg80211 *cfg) { - if (!wl) + if (!cfg) return -EINVAL; - if (wl->debugfs) - debugfs_remove_recursive(wl->debugfs); - wl->debugfs = NULL; + if (cfg->debugfs) + debugfs_remove_recursive(cfg->debugfs); + cfg->debugfs = NULL; return 0; } #endif /* DEBUGFS_CFG80211 */ + struct device *wl_cfg80211_get_parent_dev(void) { return cfg80211_parent_dev; @@ -10767,21 +12173,34 @@ static void wl_cfg80211_clear_parent_dev(void) cfg80211_parent_dev = NULL; } -static void get_primary_mac(struct wl_priv *wl, struct ether_addr *mac) +void get_primary_mac(struct bcm_cfg80211 *cfg, struct ether_addr *mac) { - wldev_iovar_getbuf_bsscfg(wl_to_prmry_ndev(wl), "cur_etheraddr", NULL, - 0, wl->ioctl_buf, WLC_IOCTL_SMLEN, 0, &wl->ioctl_buf_sync); - memcpy(mac->octet, wl->ioctl_buf, ETHER_ADDR_LEN); + wldev_iovar_getbuf_bsscfg(bcmcfg_to_prmry_ndev(cfg), "cur_etheraddr", NULL, + 0, cfg->ioctl_buf, WLC_IOCTL_SMLEN, 0, &cfg->ioctl_buf_sync); + memcpy(mac->octet, cfg->ioctl_buf, ETHER_ADDR_LEN); +} +static bool check_dev_role_integrity(struct bcm_cfg80211 *cfg, u32 dev_role) +{ + dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub); + if (((dev_role == NL80211_IFTYPE_AP) && + !(dhd->op_mode & DHD_FLAG_HOSTAP_MODE)) || + ((dev_role == NL80211_IFTYPE_P2P_GO) && + !(dhd->op_mode & DHD_FLAG_P2P_GO_MODE))) + { + WL_ERR(("device role select failed\n")); + return false; + } + return true; } int wl_cfg80211_do_driver_init(struct net_device *net) { - struct wl_priv *wl = *(struct wl_priv **)netdev_priv(net); + struct bcm_cfg80211 *cfg = *(struct bcm_cfg80211 **)netdev_priv(net); - if (!wl || !wl->wdev) + if (!cfg || !cfg->wdev) return -EINVAL; - if (dhd_do_driver_init(wl->wdev->netdev) < 0) + if (dhd_do_driver_init(cfg->wdev->netdev) < 0) return -1; return 0; @@ -10794,11 +12213,11 @@ void wl_cfg80211_enable_trace(bool set, u32 level) else wl_dbg_level |= (WL_DBG_LEVEL & level); } -#if 1 //defined(WL_SUPPORT_BACKPORTED_KPATCHES) || (LINUX_VERSION_CODE >= KERNEL_VERSION(3, \ +#if defined(WL_SUPPORT_BACKPORTED_KPATCHES) || (LINUX_VERSION_CODE >= KERNEL_VERSION(3, \ 2, 0)) static s32 wl_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy, - struct net_device *dev, u64 cookie) + bcm_struct_cfgdev *cfgdev, u64 cookie) { /* CFG80211 checks for tx_cancel_wait callback when ATTR_DURATION * is passed with CMD_FRAME. This callback is supposed to cancel @@ -10824,7 +12243,7 @@ wl_cfg80211_find_interworking_ie(u8 *parse, u32 len) static s32 -wl_cfg80211_add_iw_ie(struct wl_priv *wl, struct net_device *ndev, s32 bssidx, s32 pktflag, +wl_cfg80211_add_iw_ie(struct bcm_cfg80211 *cfg, struct net_device *ndev, s32 bssidx, s32 pktflag, uint8 ie_id, uint8 *data, uint8 data_len) { s32 err = BCME_OK; @@ -10855,7 +12274,7 @@ wl_cfg80211_add_iw_ie(struct wl_priv *wl, struct net_device *ndev, s32 bssidx, s return -ENOMEM; } - if (wl->iw_ie_len == data_len && !memcmp(wl->iw_ie, data, data_len)) { + if (cfg->iw_ie_len == data_len && !memcmp(cfg->iw_ie, data, data_len)) { WL_ERR(("Previous IW IE is equals to current IE\n")); err = BCME_OK; goto exit; @@ -10873,13 +12292,13 @@ wl_cfg80211_add_iw_ie(struct wl_priv *wl, struct net_device *ndev, s32 bssidx, s ie_setbuf->ie_buffer.ie_list[0].ie_data.id = ie_id; /* if already set with previous values, delete it first */ - if (wl->iw_ie_len != 0) { + if (cfg->iw_ie_len != 0) { WL_DBG(("Different IW_IE was already set. clear first\n")); ie_setbuf->ie_buffer.ie_list[0].ie_data.len = 0; err = wldev_iovar_setbuf_bsscfg(ndev, "ie", ie_setbuf, buf_len, - wl->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &wl->ioctl_buf_sync); + cfg->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &cfg->ioctl_buf_sync); if (err != BCME_OK) goto exit; @@ -10889,12 +12308,12 @@ wl_cfg80211_add_iw_ie(struct wl_priv *wl, struct net_device *ndev, s32 bssidx, s memcpy((uchar *)&ie_setbuf->ie_buffer.ie_list[0].ie_data.data[0], data, data_len); err = wldev_iovar_setbuf_bsscfg(ndev, "ie", ie_setbuf, buf_len, - wl->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &wl->ioctl_buf_sync); + cfg->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &cfg->ioctl_buf_sync); if (err == BCME_OK) { - memcpy(wl->iw_ie, data, data_len); - wl->iw_ie_len = data_len; - wl->wl11u = TRUE; + memcpy(cfg->iw_ie, data, data_len); + cfg->iw_ie_len = data_len; + cfg->wl11u = TRUE; err = wldev_iovar_setint_bsscfg(ndev, "grat_arp", 1, bssidx); } @@ -10910,7 +12329,7 @@ exit: s32 wl_cfg80211_set_band(struct net_device *ndev, int band) { - struct wl_priv *wl = wlcfg_drv_priv; + struct bcm_cfg80211 *cfg = g_bcm_cfg; int ret = 0; char ioctl_buf[50]; @@ -10926,8 +12345,145 @@ wl_cfg80211_set_band(struct net_device *ndev, int band) } WL_DBG(("Setting band to %d\n", band)); - wl->curr_band = band; + cfg->curr_band = band; return 0; } #endif /* WL_HOST_BAND_MGMT */ + + +int wl_cfg80211_scan_stop(bcm_struct_cfgdev *cfgdev) +{ + struct bcm_cfg80211 *cfg = NULL; + struct net_device *ndev = NULL; + unsigned long flags; + int clear_flag = 0; + int ret = 0; + + WL_TRACE(("Enter\n")); + + cfg = g_bcm_cfg; + if (!cfg) + return -EINVAL; + + ndev = cfgdev_to_wlc_ndev(cfgdev, cfg); + + spin_lock_irqsave(&cfg->cfgdrv_lock, flags); +#ifdef WL_CFG80211_P2P_DEV_IF + if (cfg->scan_request && cfg->scan_request->wdev == cfgdev) { +#else + if (cfg->scan_request && cfg->scan_request->dev == cfgdev) { +#endif + cfg80211_scan_done(cfg->scan_request, true); + cfg->scan_request = NULL; + clear_flag = 1; + } + spin_unlock_irqrestore(&cfg->cfgdrv_lock, flags); + + if (clear_flag) + wl_clr_drv_status(cfg, SCANNING, ndev); + + return ret; +} + +bool wl_cfg80211_is_vsdb_mode(void) +{ + return (g_bcm_cfg && g_bcm_cfg->vsdb_mode); +} + +void* wl_cfg80211_get_dhdp() +{ + struct bcm_cfg80211 *cfg = g_bcm_cfg; + + return cfg->pub; +} + +bool wl_cfg80211_is_p2p_active(void) +{ + return (g_bcm_cfg && g_bcm_cfg->p2p); +} + +static void wl_cfg80211_work_handler(struct work_struct * work) +{ + struct bcm_cfg80211 *cfg = NULL; + struct net_info *iter, *next; + s32 err = BCME_OK; + s32 pm = PM_FAST; + + cfg = container_of(work, struct bcm_cfg80211, pm_enable_work.work); + WL_DBG(("Enter \n")); + if (cfg->pm_enable_work_on) { + cfg->pm_enable_work_on = false; + for_each_ndev(cfg, iter, next) { + if (!wl_get_drv_status(cfg, CONNECTED, iter->ndev) || + (wl_get_mode_by_netdev(cfg, iter->ndev) != WL_MODE_BSS)) + continue; + if (iter->ndev) { + if ((err = wldev_ioctl(iter->ndev, WLC_SET_PM, + &pm, sizeof(pm), true)) != 0) { + if (err == -ENODEV) + WL_DBG(("%s:netdev not ready\n", iter->ndev->name)); + else + WL_ERR(("%s:error (%d)\n", iter->ndev->name, err)); + } else + wl_cfg80211_update_power_mode(iter->ndev); + } + } +#ifdef CUSTOMER_HW4 + DHD_OS_WAKE_UNLOCK(cfg->pub); +#endif /* CUSTOMER_HW4 */ + } +} + +u8 +wl_get_action_category(void *frame, u32 frame_len) +{ + u8 category; + u8 *ptr = (u8 *)frame; + if (frame == NULL) + return DOT11_ACTION_CAT_ERR_MASK; + if (frame_len < DOT11_ACTION_HDR_LEN) + return DOT11_ACTION_CAT_ERR_MASK; + category = ptr[DOT11_ACTION_CAT_OFF]; + WL_INFO(("Action Category: %d\n", category)); + return category; +} + +int +wl_get_public_action(void *frame, u32 frame_len, u8 *ret_action) +{ + u8 *ptr = (u8 *)frame; + if (frame == NULL || ret_action == NULL) + return BCME_ERROR; + if (frame_len < DOT11_ACTION_HDR_LEN) + return BCME_ERROR; + if (DOT11_ACTION_CAT_PUBLIC != wl_get_action_category(frame, frame_len)) + return BCME_ERROR; + *ret_action = ptr[DOT11_ACTION_ACT_OFF]; + WL_INFO(("Public Action : %d\n", *ret_action)); + return BCME_OK; +} + +static int +wl_cfg80211_delayed_roam(struct bcm_cfg80211 *cfg, struct net_device *ndev, + const struct ether_addr *bssid) +{ + s32 err; + wl_event_msg_t e; + + bzero(&e, sizeof(e)); + e.event_type = cpu_to_be32(WLC_E_ROAM); + memcpy(&e.addr, bssid, ETHER_ADDR_LEN); + /* trigger the roam event handler */ + err = wl_notify_roaming_status(cfg, ndev_to_cfgdev(ndev), &e, NULL); + + return err; +} + +#ifdef WLFBT +void +wl_cfg80211_get_fbt_key(uint8 *key) +{ + memcpy(key, g_bcm_cfg->fbt_key, FBT_KEYLEN); +} +#endif /* WLFBT */ |