From cde9070d9970eef1f7ec2360586c802a16230ad8 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Fri, 10 May 2024 07:43:50 +0000
Subject: [PATCH] rtl88x2CE_WiFi_linux driver
---
kernel/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/wl_cfg80211.c | 22928 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 16,192 insertions(+), 6,736 deletions(-)
diff --git a/kernel/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/wl_cfg80211.c b/kernel/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/wl_cfg80211.c
index b69ad33..d83e069 100644
--- a/kernel/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/wl_cfg80211.c
+++ b/kernel/drivers/net/wireless/rockchip_wlan/cywdhd/bcmdhd/wl_cfg80211.c
@@ -1,15 +1,16 @@
-/* SPDX-License-Identifier: GPL-2.0 */
/*
* Linux cfg80211 driver
*
- * Copyright (C) 1999-2019, Broadcom Corporation
- *
+ * Portions of this code are copyright (c) 2022 Cypress Semiconductor Corporation
+ *
+ * Copyright (C) 1999-2017, Broadcom Corporation
+ *
* Unless you and Broadcom execute a separate written software license
* agreement governing use of this software, this software is licensed to you
* under the terms of the GNU General Public License version 2 (the "GPL"),
* available at http://www.broadcom.com/licenses/GPLv2.php, with the
* following added to such license:
- *
+ *
* As a special exception, the copyright holders of this software give you
* permission to link this software with independent modules, and to copy and
* distribute the resulting executable under terms of your choice, provided that
@@ -17,7 +18,7 @@
* the license of that module. An independent module is a module which is not
* derived from this software. The special exception does not apply to any
* modifications of the software.
- *
+ *
* Notwithstanding the above, under no circumstances may you combine this
* software in any way with any other Broadcom software provided under a license
* other than the GPL, without Broadcom's express prior written consent.
@@ -25,23 +26,31 @@
*
* <<Broadcom-WL-IPTag/Open:>>
*
- * $Id: wl_cfg80211.c 715966 2019-05-30 02:36:59Z $
+ * $Id: wl_cfg80211.c 814814 2019-04-15 03:31:10Z $
*/
/* */
#include <typedefs.h>
#include <linuxver.h>
-#include <osl.h>
#include <linux/kernel.h>
#include <bcmutils.h>
+#include <bcmstdlib_s.h>
#include <bcmwifi_channels.h>
#include <bcmendian.h>
-#include <proto/ethernet.h>
-#include <proto/802.11.h>
+#include <ethernet.h>
+#ifdef WL_WPS_SYNC
+#include <eapol.h>
+#endif /* WL_WPS_SYNC */
+#include <802.11.h>
+#ifdef WL_FILS
+#include <fils.h>
+#include <frag.h>
+#endif /* WL_FILS */
+#include <bcmiov.h>
#include <linux/if_arp.h>
-#include <linux/uaccess.h>
+#include <asm/uaccess.h>
-#include <proto/ethernet.h>
+#include <ethernet.h>
#include <linux/kernel.h>
#include <linux/kthread.h>
#include <linux/netdevice.h>
@@ -54,14 +63,19 @@
#include <net/rtnetlink.h>
#include <wlioctl.h>
+#include <bcmevent.h>
#include <wldev_common.h>
#include <wl_cfg80211.h>
#include <wl_cfgp2p.h>
-#include <wl_android.h>
+#include <wl_cfgscan.h>
#include <bcmdevs.h>
+#ifdef OEM_ANDROID
+#include <wl_android.h>
+#endif // endif
#include <dngl_stats.h>
#include <dhd.h>
#include <dhd_linux.h>
+#include <dhd_linux_pktdump.h>
#include <dhd_debug.h>
#include <dhdioctl.h>
#include <wlioctl.h>
@@ -70,38 +84,99 @@
#ifdef PNO_SUPPORT
#include <dhd_pno.h>
#endif /* PNO_SUPPORT */
-
-#if defined(WL_VENDOR_EXT_SUPPORT)
#include <wl_cfgvendor.h>
-#endif /* defined(WL_VENDOR_EXT_SUPPORT) */
#ifdef WL_NAN
#include <wl_cfgnan.h>
#endif /* WL_NAN */
+
#ifdef PROP_TXSTATUS
#include <dhd_wlfc.h>
-#endif
+#endif // endif
#ifdef BCMPCIE
#include <dhd_flowring.h>
-#endif
+#endif // endif
+#ifdef RTT_SUPPORT
+#include <dhd_rtt.h>
+#endif /* RTT_SUPPORT */
-#ifdef WL11U
-#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 */
+#if defined(BIGDATA_SOFTAP) || defined(DHD_ENABLE_BIGDATA_LOGGING)
+#include <wl_bigdata.h>
+#endif /* BIGDATA_SOFTAP || DHD_ENABLE_BIGDATA_LOGGING */
-module_param(wl_dbg_level, uint, 0664);
+#ifdef DHD_EVENT_LOG_FILTER
+#include <dhd_event_log_filter.h>
+#endif /* DHD_EVENT_LOG_FILTER */
+#define BRCM_SAE_VENDOR_EVENT_BUF_LEN 500
+#ifdef DNGL_AXI_ERROR_LOGGING
+#include <bcmtlv.h>
+#endif /* DNGL_AXI_ERROR_LOGGING */
+
+#if defined(CONFIG_WLAN_BEYONDX) || defined(CONFIG_SEC_5GMODEL)
+#include <linux/dev_ril_bridge.h>
+#include <linux/notifier.h>
+#endif /* CONFIG_WLAN_BEYONDX || defined(CONFIG_SEC_5GMODEL) */
+
+#ifdef DHD_BANDSTEER
+#include <dhd_bandsteer.h>
+#endif /* DHD_BANDSTEER */
+
+#ifdef BCMWAPI_WPI
+/* these items should evetually go into wireless.h of the linux system headfile dir */
+#ifndef IW_ENCODE_ALG_SM4
+#define IW_ENCODE_ALG_SM4 0x20
+#endif // endif
+
+#ifndef IW_AUTH_WAPI_ENABLED
+#define IW_AUTH_WAPI_ENABLED 0x20
+#endif // endif
+
+#ifndef IW_AUTH_WAPI_VERSION_1
+#define IW_AUTH_WAPI_VERSION_1 0x00000008
+#endif // endif
+
+#ifndef IW_AUTH_CIPHER_SMS4
+#define IW_AUTH_CIPHER_SMS4 0x00000020
+#endif // endif
+
+#ifndef IW_AUTH_KEY_MGMT_WAPI_PSK
+#define IW_AUTH_KEY_MGMT_WAPI_PSK 4
+#endif // endif
+
+#ifndef IW_AUTH_KEY_MGMT_WAPI_CERT
+#define IW_AUTH_KEY_MGMT_WAPI_CERT 8
+#endif // endif
+#endif /* BCMWAPI_WPI */
+
+#ifdef BCMWAPI_WPI
+#define IW_WSEC_ENABLED(wsec) ((wsec) & (WEP_ENABLED | TKIP_ENABLED | AES_ENABLED | SMS4_ENABLED))
+#else /* BCMWAPI_WPI */
#define IW_WSEC_ENABLED(wsec) ((wsec) & (WEP_ENABLED | TKIP_ENABLED | AES_ENABLED))
+#endif /* BCMWAPI_WPI */
+
+#ifdef WL_SAE
+#define MGMT_AUTH_FRAME_DWELL_TIME 4000
+#define MGMT_AUTH_FRAME_WAIT_TIME (MGMT_AUTH_FRAME_DWELL_TIME + 100)
+#endif /* WL_SAE */
+
+#if (defined(WL_FW_OCE_AP_SELECT) || defined(BCMFW_ROAM_ENABLE) && ((LINUX_VERSION_CODE \
+ >= KERNEL_VERSION(3, 2, 0)) || defined(WL_COMPAT_WIRELESS)))
+uint fw_ap_select = true;
+#else
+uint fw_ap_select = false;
+#endif /* WL_FW_OCE_AP_SELECT && (ROAM_ENABLE || BCMFW_ROAM_ENABLE) */
+module_param(fw_ap_select, uint, 0660);
+/* this flag enable triggerrs bgscan method from supplicant */
+uint us_ap_select = false;
+module_param(us_ap_select, uint, 0660);
static struct device *cfg80211_parent_dev = NULL;
-/* g_bcm_cfg should be static. Do not change */
-static struct bcm_cfg80211 *g_bcm_cfg = NULL;
-u32 wl_dbg_level = WL_DBG_ERR;
+static struct bcm_cfg80211 *g_bcmcfg = NULL;
+u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_P2P_ACTION | WL_DBG_INFO;
+#define MAX_VIF_OFFSET 15
#define MAX_WAIT_TIME 1500
#ifdef WLAIBSS_MCHAN
#define IBSS_IF_NAME "ibss%d"
@@ -126,36 +201,45 @@
#define WL_AF_TX_KEEP_PRI_CONNECTION_VSDB(cfg)
#endif /* VSDB */
-#ifdef WL_CFG80211_SYNC_GON
-#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(cfg) wl_get_drv_status_all(cfg, SENDING_ACT_FRM)
-#endif /* WL_CFG80211_SYNC_GON */
-
#define DNGL_FUNC(func, parameters) func parameters
#define COEX_DHCP
#define WLAN_EID_SSID 0
#define CH_MIN_5G_CHANNEL 34
-#define CH_MIN_2G_CHANNEL 1
-#define ACTIVE_SCAN 1
-#define PASSIVE_SCAN 0
+#ifdef WLAIBSS
+enum abiss_event_type {
+ AIBSS_EVENT_TXFAIL
+};
+#endif // endif
+
+#ifdef WL_SAE
+/**
+ * enum mgmt_tx_status - mgmt frame tx status
+ *
+ * @MGMT_TX_ACK: mgmt frame acked
+ * @MGMT_TX_NOACK: mgmt frame not acked
+ * @MGMT_TX_OFF_CHAN_COMPLETED: off-channel complete
+ * @MGMT_TX_SEND_FRAME: mgmt frame tx is in progres
+ */
+enum mgmt_tx_status {
+ MGMT_TX_ACK,
+ MGMT_TX_NOACK,
+ MGMT_TX_OFF_CHAN_COMPLETED,
+ MGMT_TX_SEND_FRAME
+};
+#endif /* WL_SAE */
#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
4 && __GNUC_MINOR__ >= 6))
#define BCM_SET_LIST_FIRST_ENTRY(entry, ptr, type, member) \
-_Pragma("GCC diagnostic push") \
-_Pragma("GCC diagnostic ignored \"-Wcast-qual\"") \
+GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST(); \
(entry) = list_first_entry((ptr), type, member); \
-_Pragma("GCC diagnostic pop") \
+GCC_DIAGNOSTIC_POP(); \
#define BCM_SET_CONTAINER_OF(entry, ptr, type, member) \
-_Pragma("GCC diagnostic push") \
-_Pragma("GCC diagnostic ignored \"-Wcast-qual\"") \
+GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST(); \
entry = container_of((ptr), type, member); \
-_Pragma("GCC diagnostic pop") \
+GCC_DIAGNOSTIC_POP(); \
#else
#define BCM_SET_LIST_FIRST_ENTRY(entry, ptr, type, member) \
@@ -166,10 +250,17 @@
#endif /* STRICT_GCC_WARNINGS */
+#ifdef WL_RELMCAST
enum rmc_event_type {
RMC_EVENT_NONE,
RMC_EVENT_LEADER_CHECK_FAIL
};
+#endif /* WL_RELMCAST */
+
+#ifdef DHD_SSW_SPECIFIC_REQ
+#define WLC_AP_IOV_OP_MANUAL_AP_BSSCFG_CREATE 2
+#define WLC_AP_IOV_OP_MANUAL_STA_BSSCFG_CREATE 3
+#endif /* DHD_SSW_SPECIFIC_REQ */
/* This is to override regulatory domains defined in cfg80211 module (reg.c)
* By default world regulatory domain defined in reg.c puts the flags NL80211_RRF_PASSIVE_SCAN
@@ -184,9 +275,13 @@
4 && __GNUC_MINOR__ >= 6))
_Pragma("GCC diagnostic push")
_Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"")
-#endif
+#endif // endif
static const struct ieee80211_regdomain brcm_regdom = {
+#ifdef WL_6E
+ .n_reg_rules = 5,
+#else
.n_reg_rules = 4,
+#endif /* WL_6E */
.alpha2 = "99",
.reg_rules = {
/* IEEE 802.11b/g, channels 1..11 */
@@ -197,15 +292,19 @@
*/
REG_RULE(2484-10, 2484+10, 20, 6, 20, 0),
/* IEEE 802.11a, channel 36..64 */
- REG_RULE(5150-10, 5350+10, 40, 6, 20, 0),
+ REG_RULE(5150-10, 5350+10, 80, 6, 20, 0),
/* IEEE 802.11a, channel 100..165 */
- REG_RULE(5470-10, 5850+10, 40, 6, 20, 0), }
+ REG_RULE(5470-10, 5850+10, 80, 6, 20, 0),
+#ifdef WL_6E
+ /* IEEE 802.11ax, 6E */
+ REG_RULE(5935-10, 7115+10, 80, 6, 20, 0),
+#endif /* WL_6E */
+ }
};
#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
4 && __GNUC_MINOR__ >= 6))
_Pragma("GCC diagnostic pop")
-#endif
-
+#endif // endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) && \
(defined(WL_IFACE_COMB_NUM_CHANNELS) || defined(WL_CFG80211_P2P_DEV_IF))
@@ -224,12 +323,14 @@
* 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)
+ * linux-3.8 and above - max:4
+ * sta + NAN NMI + NAN DPI open + NAN DPI sec (since there is no iface type
+ * for NAN defined, registering it as STA type)
*/
#ifdef WL_ENABLE_P2P_IF
.max = 3,
#else
- .max = 2,
+ .max = 4,
#endif /* WL_ENABLE_P2P_IF */
.types = BIT(NL80211_IFTYPE_STATION),
},
@@ -248,29 +349,47 @@
.types = BIT(NL80211_IFTYPE_ADHOC),
},
};
-#ifdef BCM4330_CHIP
-#define NUM_DIFF_CHANNELS 1
-#else
-#define NUM_DIFF_CHANNELS 2
-#endif
+
+#define NUM_DIFF_CHANNELS 3
+
static const struct ieee80211_iface_combination
common_iface_combinations[] = {
{
.num_different_channels = NUM_DIFF_CHANNELS,
/*
- * max_interfaces = 4
- * The max no of interfaces will be used in dual p2p case.
- * {STA, P2P Device, P2P Group 1, P2P Group 2}. Though we
- * will not be using the STA functionality in this case, it
- * will remain registered as it is the primary interface.
+ * At Max 5 network interfaces can be registered concurrently
*/
- .max_interfaces = 4,
+ .max_interfaces = IFACE_MAX_CNT,
.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) */
+static const char *wl_if_state_strs[WL_IF_STATE_MAX + 1] = {
+ "WL_IF_CREATE_REQ",
+ "WL_IF_CREATE_DONE",
+ "WL_IF_DELETE_REQ",
+ "WL_IF_DELETE_DONE",
+ "WL_IF_CHANGE_REQ",
+ "WL_IF_CHANGE_DONE",
+ "WL_IF_STATE_MAX"
+};
+
+#ifdef BCMWAPI_WPI
+#if defined(ANDROID_PLATFORM_VERSION) && (ANDROID_PLATFORM_VERSION >= 8)
+/* WAPI define in ieee80211.h is used */
+#else
+#undef WLAN_AKM_SUITE_WAPI_PSK
+#define WLAN_AKM_SUITE_WAPI_PSK 0x000FAC04
+
+#undef WLAN_AKM_SUITE_WAPI_CERT
+#define WLAN_AKM_SUITE_WAPI_CERT 0x000FAC12
+
+#undef NL80211_WAPI_VERSION_1
+#define NL80211_WAPI_VERSION_1 1 << 3
+#endif /* ANDROID_PLATFORM_VERSION && ANDROID_PLATFORM_VERSION >= 8 */
+#endif /* BCMWAPI_WPI */
/* Data Element Definitions */
#define WPS_ID_CONFIG_METHODS 0x1008
@@ -308,38 +427,127 @@
#define PM_BLOCK 1
#define PM_ENABLE 0
-
-#define WL_AKM_SUITE_SHA256_1X 0x000FAC05
-#define WL_AKM_SUITE_SHA256_PSK 0x000FAC06
+/* GCMP crypto supported above kernel v4.0 */
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 0, 0))
+#define WL_GCMP
+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(4, 0, 0) */
#ifndef IBSS_COALESCE_ALLOWED
-#define IBSS_COALESCE_ALLOWED 0
-#endif
+#define IBSS_COALESCE_ALLOWED IBSS_COALESCE_DEFAULT
+#endif // endif
#ifndef IBSS_INITIAL_SCAN_ALLOWED
-#define IBSS_INITIAL_SCAN_ALLOWED 0
-#endif
-
+#define IBSS_INITIAL_SCAN_ALLOWED IBSS_INITIAL_SCAN_ALLOWED_DEFAULT
+#endif // endif
#define CUSTOM_RETRY_MASK 0xff000000 /* Mask for retry counter of custom dwell time */
#define LONG_LISTEN_TIME 2000
+
+#ifdef WBTEXT
+typedef struct wl_wbtext_bssid {
+ struct ether_addr ea;
+ struct list_head list;
+} wl_wbtext_bssid_t;
+
+static void wl_cfg80211_wbtext_update_rcc(struct bcm_cfg80211 *cfg, struct net_device *dev);
+static bool wl_cfg80211_wbtext_check_bssid_list(struct bcm_cfg80211 *cfg, struct ether_addr *ea);
+static bool wl_cfg80211_wbtext_add_bssid_list(struct bcm_cfg80211 *cfg, struct ether_addr *ea);
+static void wl_cfg80211_wbtext_clear_bssid_list(struct bcm_cfg80211 *cfg);
+static bool wl_cfg80211_wbtext_send_nbr_req(struct bcm_cfg80211 *cfg, struct net_device *dev,
+ struct wl_profile *profile);
+static bool wl_cfg80211_wbtext_send_btm_query(struct bcm_cfg80211 *cfg, struct net_device *dev,
+ struct wl_profile *profile);
+static void wl_cfg80211_wbtext_set_wnm_maxidle(struct bcm_cfg80211 *cfg, struct net_device *dev);
+static int wl_cfg80211_recv_nbr_resp(struct net_device *dev, uint8 *body, uint body_len);
+#endif /* WBTEXT */
+
+#ifdef RTT_SUPPORT
+static s32 wl_cfg80211_rtt_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data);
+#endif /* RTT_SUPPORT */
+#ifdef WL_CHAN_UTIL
+static s32 wl_cfg80211_bssload_report_event_handler(struct bcm_cfg80211 *cfg,
+ bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data);
+static s32 wl_cfg80211_start_bssload_report(struct net_device *ndev);
+#endif /* WL_CHAN_UTIL */
+
+#ifdef SUPPORT_AP_RADIO_PWRSAVE
+#define RADIO_PWRSAVE_PPS 10
+#define RADIO_PWRSAVE_QUIET_TIME 10
+#define RADIO_PWRSAVE_LEVEL 3
+#define RADIO_PWRSAVE_STAS_ASSOC_CHECK 0
+
+#define RADIO_PWRSAVE_LEVEL_MIN 1
+#define RADIO_PWRSAVE_LEVEL_MAX 9
+#define RADIO_PWRSAVE_PPS_MIN 1
+#define RADIO_PWRSAVE_QUIETTIME_MIN 1
+#define RADIO_PWRSAVE_ASSOCCHECK_MIN 0
+#define RADIO_PWRSAVE_ASSOCCHECK_MAX 1
+
+#define RADIO_PWRSAVE_MAJOR_VER 1
+#define RADIO_PWRSAVE_MINOR_VER 1
+#define RADIO_PWRSAVE_MAJOR_VER_SHIFT 8
+#define RADIO_PWRSAVE_VERSION \
+ ((RADIO_PWRSAVE_MAJOR_VER << RADIO_PWRSAVE_MAJOR_VER_SHIFT)| RADIO_PWRSAVE_MINOR_VER)
+#endif /* SUPPORT_AP_RADIO_PWRSAVE */
+
+/* SoftAP related parameters */
+#define DEFAULT_2G_SOFTAP_CHANNEL 1
+#define DEFAULT_5G_SOFTAP_CHANNEL 149
+#define WL_MAX_NUM_CSA_COUNTERS 255
+
+#define MAX_VNDR_OUI_STR_LEN 256u
+#define VNDR_OUI_STR_LEN 10u
+#define DOT11_DISCONNECT_RC 2u
+static const uchar *exclude_vndr_oui_list[] = {
+ "\x00\x50\xf2", /* Microsoft */
+ "\x00\x00\xf0", /* Samsung Elec */
+ WFA_OUI, /* WFA */
+ NULL
+};
+
+typedef struct wl_vndr_oui_entry {
+ uchar oui[DOT11_OUI_LEN];
+ struct list_head list;
+} wl_vndr_oui_entry_t;
+
+static int wl_vndr_ies_get_vendor_oui(struct bcm_cfg80211 *cfg,
+ struct net_device *ndev, char *vndr_oui, u32 vndr_oui_len);
+static void wl_vndr_ies_clear_vendor_oui_list(struct bcm_cfg80211 *cfg);
+static s32 wl_cfg80211_parse_vndr_ies(const u8 *parse, u32 len,
+ struct parsed_vndr_ies *vndr_ies);
+
+#if defined(WL_FW_OCE_AP_SELECT)
+static bool
+wl_cfgoce_has_ie(const u8 *ie, const u8 **tlvs, u32 *tlvs_len, const u8 *oui, u32 oui_len, u8 type);
+
+/* Check whether the given IE looks like WFA OCE IE. */
+#define wl_cfgoce_is_oce_ie(ie, tlvs, len) wl_cfgoce_has_ie(ie, tlvs, len, \
+ (const uint8 *)WFA_OUI, WFA_OUI_LEN, WFA_OUI_TYPE_MBO_OCE)
+
+/* Is any of the tlvs the expected entry? If
+ * not update the tlvs buffer pointer/length.
+ */
+static bool
+wl_cfgoce_has_ie(const u8 *ie, const u8 **tlvs, u32 *tlvs_len, const u8 *oui, u32 oui_len, u8 type)
+{
+ /* If the contents match the OUI and the type */
+ if (ie[TLV_LEN_OFF] >= oui_len + 1 &&
+ !bcmp(&ie[TLV_BODY_OFF], oui, oui_len) &&
+ type == ie[TLV_BODY_OFF + oui_len]) {
+ return TRUE;
+ }
+
+ return FALSE;
+}
+#endif /* WL_FW_OCE_AP_SELECT */
+
/*
* cfg80211_ops api/callback list
*/
-static s32 wl_frame_get_mgmt(u16 fc, const struct ether_addr *da,
- const struct ether_addr *sa, const struct ether_addr *bssid,
- u8 **pheader, u32 *body_len, u8 *pbody);
-static s32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
- struct cfg80211_scan_request *request,
- struct cfg80211_ssid *this_ssid);
-#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_frame_get_mgmt(struct bcm_cfg80211 *cfg, u16 fc,
+ const struct ether_addr *da, const struct ether_addr *sa,
+ const struct ether_addr *bssid, u8 **pheader, u32 *body_len, u8 *pbody);
static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
#ifdef WLAIBSS_MCHAN
static bcm_struct_cfgdev* bcm_cfg80211_add_ibss_if(struct wiphy *wiphy, char *name);
@@ -357,12 +565,15 @@
static s32 wl_cfg80211_get_station(struct wiphy *wiphy,
struct net_device *dev, u8 *mac,
struct station_info *sinfo);
-#endif
-static s32 wl_cfg80211_set_power_mgmt(struct wiphy *wiphy,
- struct net_device *dev, bool enabled,
- s32 timeout);
+#endif // endif
static int wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_connect_params *sme);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0))
+#if defined(WL_FILS) || defined(WL_OWE)
+static int wl_cfg80211_update_connect_params(struct wiphy *wiphy, struct net_device *dev,
+ struct cfg80211_connect_params *sme, u32 changed);
+#endif
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) */
static s32 wl_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev,
u16 reason_code);
#if defined(WL_CFG80211_P2P_DEV_IF)
@@ -409,49 +620,45 @@
#else
static s32 wl_cfg80211_del_station(struct wiphy *wiphy,
struct net_device *ndev, u8* mac_addr);
-#endif
+#endif // endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0))
static s32 wl_cfg80211_change_station(struct wiphy *wiphy,
struct net_device *dev, const u8 *mac, struct station_parameters *params);
#else
static s32 wl_cfg80211_change_station(struct wiphy *wiphy,
struct net_device *dev, u8 *mac, struct station_parameters *params);
-#endif
+#endif // endif
#endif /* WL_SUPPORT_BACKPORTED_KPATCHES || KERNEL_VER >= KERNEL_VERSION(3, 2, 0)) */
-#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
+#endif // endif
static s32 wl_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_pmksa *pmksa);
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 bcm_cfg80211 *cfg);
-static void wl_cfg80211_cancel_scan(struct bcm_cfg80211 *cfg);
-static s32 wl_notify_escan_complete(struct bcm_cfg80211 *cfg,
- struct net_device *ndev, bool aborted, bool fw_abort);
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 2, 0)) || defined(WL_COMPAT_WIRELESS)
#if (defined(CONFIG_ARCH_MSM) && defined(TDLS_MGMT_VERSION2)) || (LINUX_VERSION_CODE < \
KERNEL_VERSION(3, 16, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
static s32 wl_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
u8 *peer, u8 action_code, u8 dialog_token, u16 status_code,
- u32 peer_capability, const u8 *data, size_t len);
+ u32 peer_capability, const u8 *buf, size_t len);
#elif ((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)) && \
(LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)))
static s32 wl_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
const u8 *peer, u8 action_code, u8 dialog_token, u16 status_code,
- u32 peer_capability, const u8 *data, size_t len);
+ u32 peer_capability, const u8 *buf, size_t len);
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
static s32 wl_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
- const u8 *peer, u8 action_code, u8 dialog_token, u16 status_code,
- u32 peer_capability, bool initiator, const u8 *data, size_t len);
-#else
+ const u8 *peer, u8 action_code, u8 dialog_token, u16 status_code,
+ u32 peer_capability, bool initiator, const u8 *buf, size_t len);
+#else /* CONFIG_ARCH_MSM && TDLS_MGMT_VERSION2 */
static s32 wl_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
- u8 *peer, u8 action_code, u8 dialog_token, u16 status_code, const u8 *data,
- size_t len);
+ u8 *peer, u8 action_code, u8 dialog_token, u16 status_code,
+ const u8 *buf, size_t len);
#endif /* CONFIG_ARCH_MSM && TDLS_MGMT_VERSION2 */
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0))
static s32 wl_cfg80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,
@@ -459,51 +666,58 @@
#else
static s32 wl_cfg80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,
u8 *peer, enum nl80211_tdls_operation oper);
-#endif
-#endif
-#ifdef WL_SCHED_SCAN
-static int wl_cfg80211_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev);
-#endif
-#if defined(WL_VIRTUAL_APSTA) || defined(DUAL_STA_STATIC_IF)
-bcm_struct_cfgdev*
-wl_cfg80211_create_iface(struct wiphy *wiphy, enum nl80211_iftype
- iface_type, u8 *mac_addr, const char *name);
+#endif // endif
+#endif /* LINUX_VERSION > KERNEL_VERSION(3,2,0) || WL_COMPAT_WIRELESS */
+static s32 wl_cfg80211_set_ap_role(struct bcm_cfg80211 *cfg, struct net_device *dev);
+
+struct wireless_dev *
+wl_cfg80211_create_iface(struct wiphy *wiphy, wl_iftype_t
+ iface_type, u8 *mac_addr, const char *name);
s32
-wl_cfg80211_del_iface(struct wiphy *wiphy, bcm_struct_cfgdev *cfgdev);
-#endif /* defined(WL_VIRTUAL_APSTA) || defined(DUAL_STA_STATIC_IF) */
+wl_cfg80211_del_iface(struct wiphy *wiphy, struct wireless_dev *wdev);
s32 wl_cfg80211_interface_ops(struct bcm_cfg80211 *cfg,
struct net_device *ndev, s32 bsscfg_idx,
- enum nl80211_iftype iface_type, s32 del, u8 *addr);
+ wl_iftype_t iftype, s32 del, u8 *addr);
s32 wl_cfg80211_add_del_bss(struct bcm_cfg80211 *cfg,
struct net_device *ndev, s32 bsscfg_idx,
- enum nl80211_iftype iface_type, s32 del, u8 *addr);
+ wl_iftype_t brcm_iftype, s32 del, u8 *addr);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) || defined(WL_COMPAT_WIRELESS)
+static s32 wl_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *dev);
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) */
#ifdef GTK_OFFLOAD_SUPPORT
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0))
static s32 wl_cfg80211_set_rekey_data(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_gtk_rekey_data *data);
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) */
-#endif
+#endif /* GTK_OFFLOAD_SUPPORT */
chanspec_t wl_chspec_driver_to_host(chanspec_t chanspec);
chanspec_t wl_chspec_host_to_driver(chanspec_t chanspec);
-#ifdef WL11ULB
-static s32 wl_cfg80211_get_ulb_bw(struct wireless_dev *wdev);
-static chanspec_t wl_cfg80211_ulb_get_min_bw_chspec(struct wireless_dev *wdev, s32 bssidx);
-static s32 wl_cfg80211_ulbbw_to_ulbchspec(u32 ulb_bw);
-#else
-static inline chanspec_t wl_cfg80211_ulb_get_min_bw_chspec(
- struct wireless_dev *wdev, s32 bssidx)
-{
- return WL_CHANSPEC_BW_20;
-}
-#endif /* WL11ULB */
+static void wl_cfg80211_wait_for_disconnection(struct bcm_cfg80211 *cfg, struct net_device *dev);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
+int wl_cfg80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
+ struct cfg80211_csa_settings *params);
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) */
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0))
+static int wl_cfg80211_set_pmk(struct wiphy *wiphy, struct net_device *dev,
+ const struct cfg80211_pmk_conf *conf);
+static int wl_cfg80211_del_pmk(struct wiphy *wiphy, struct net_device *dev,
+ const u8 *aa);
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) */
+
+#ifdef WL_SAE
+static int
+wl_cfg80211_external_auth(struct wiphy *wiphy, struct net_device *dev,
+ struct cfg80211_external_auth_params *params);
+#endif /* WL_SAE */
/*
* event & event Q handlers for cfg80211 interfaces
*/
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_event_handler(struct work_struct *work_data);
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);
@@ -513,16 +727,13 @@
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 bcm_cfg80211 *cfg);
+static void wl_put_event(struct bcm_cfg80211 *cfg, struct wl_event_q *e);
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_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 bcm_cfg80211 *cfg, struct net_device *ndev,
const wl_event_msg_t *e, void *data, bool completed);
static s32 wl_bss_roaming_done(struct bcm_cfg80211 *cfg, struct net_device *ndev,
@@ -533,35 +744,54 @@
static s32 wl_notify_bt_wifi_handover_req(struct bcm_cfg80211 *cfg,
bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data);
#endif /* BT_WIFI_HANDOVER */
-#ifdef WL_SCHED_SCAN
-static s32
-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 bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
- const wl_event_msg_t *e, void *data);
-#endif /* PNO_SUPPORT */
#ifdef GSCAN_SUPPORT
-static s32 wl_notify_gscan_event(struct bcm_cfg80211 *wl, bcm_struct_cfgdev *cfgdev,
- const wl_event_msg_t *e, void *data);
static s32 wl_handle_roam_exp_event(struct bcm_cfg80211 *wl, bcm_struct_cfgdev *cfgdev,
const wl_event_msg_t *e, void *data);
#endif /* GSCAN_SUPPORT */
+#ifdef RSSI_MONITOR_SUPPORT
static s32 wl_handle_rssi_monitor_event(struct bcm_cfg80211 *wl, bcm_struct_cfgdev *cfgdev,
const wl_event_msg_t *e, void *data);
+#endif /* RSSI_MONITOR_SUPPORT */
static s32 wl_notifier_change_state(struct bcm_cfg80211 *cfg, struct net_info *_net_info,
enum wl_status state, bool set);
-#ifdef DHD_LOSSLESS_ROAMING
+#ifdef CUSTOM_EVENT_PM_WAKE
+static s32 wl_check_pmstatus(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data);
+#endif /* CUSTOM_EVENT_PM_WAKE */
+#if defined(DHD_LOSSLESS_ROAMING) || defined(DBG_PKT_MON)
static s32 wl_notify_roam_prep_status(struct bcm_cfg80211 *cfg,
bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data);
+#endif /* DHD_LOSSLESS_ROAMING || DBG_PKT_MON */
+#ifdef DHD_LOSSLESS_ROAMING
static void wl_del_roam_timeout(struct bcm_cfg80211 *cfg);
#endif /* DHD_LOSSLESS_ROAMING */
+#if !defined(DISABLE_11H) && defined(DHD_NOSCAN_DURING_CSA)
+static void wl_del_csa_timeout(struct bcm_cfg80211 *cfg);
+#endif // endif
-#ifdef WLTDLS
-static s32 wl_tdls_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+#ifdef WL_MBO
+static s32
+wl_mbo_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
const wl_event_msg_t *e, void *data);
-#endif /* WLTDLS */
+#endif /* WL_MBO */
+
+static s32
+wl_notify_dos_status(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data);
+#ifdef WL_SAE
+static s32
+wl_notify_extauth_req_event(struct bcm_cfg80211 *cfg,
+ bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data);
+static s32
+wl_notify_mgmt_frame_tx_complete(struct bcm_cfg80211 *cfg,
+ bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data);
+#endif /* WL_SAE */
+
+#ifdef ENABLE_HOGSQS
+static s32 wl_cfg80211_hogsqs_notify(struct bcm_cfg80211 *cfg,
+ bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data);
+#endif /* ENABLE_HOGSQS */
+
/*
* register/deregister parent device
*/
@@ -582,7 +812,6 @@
*/
static s32 wl_update_prof(struct bcm_cfg80211 *cfg, struct net_device *ndev,
const wl_event_msg_t *e, const void *data, s32 item);
-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);
/*
@@ -598,9 +827,21 @@
struct cfg80211_connect_params *sme);
static s32 wl_set_set_sharedkey(struct net_device *dev,
struct cfg80211_connect_params *sme);
+#ifdef WL_FILS
+static s32 wl_set_fils_params(struct net_device *dev,
+ struct cfg80211_connect_params *sme);
+#endif // endif
+#ifdef BCMWAPI_WPI
+static s32 wl_set_set_wapi_ie(struct net_device *dev,
+ struct cfg80211_connect_params *sme);
+#endif // endif
+#ifdef WL_GCMP
+static s32 wl_set_wsec_info_algos(struct net_device *dev, uint32 algos, uint32 mask);
+#endif /* WL_GCMP */
+
static s32 wl_get_assoc_ies(struct bcm_cfg80211 *cfg, struct net_device *ndev);
static s32 wl_ch_to_chanspec(struct net_device *dev, int ch,
- struct wl_join_params *join_params, size_t *join_params_size);
+ struct wl_join_params *join_params, size_t *join_params_size, struct ieee80211_channel *chan);
void wl_cfg80211_clear_security(struct bcm_cfg80211 *cfg);
/*
@@ -608,45 +849,31 @@
*/
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, const u8 *ie_stream, u32 *ie_size,
- bool roam);
+static void wl_update_hidden_ap_ie(wl_bss_info_t *bi, const u8 *ie_stream, u32 *ie_size,
+ bool update_ssid);
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 bcm_cfg80211 *cfg, struct net_device *ndev, s32 bssidx, s32 pktflag,
- uint8 ie_id, uint8 *data, uint8 data_len);
-#endif /* WL11U */
+static int wl_cfg80211_get_rsn_capa(const bcm_tlv_t *wpa2ie, const u8** rsn_cap);
+#endif // endif
static s32 wl_setup_wiphy(struct wireless_dev *wdev, struct device *dev, void *data);
static void wl_free_wdev(struct bcm_cfg80211 *cfg);
-#ifdef CONFIG_CFG80211_INTERNAL_REGDB
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
-static int
-#else
-static void
-#endif /* kernel version < 3.10.11 */
-wl_cfg80211_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request);
-#endif /* CONFIG_CFG80211_INTERNAL_REGDB */
-static s32 wl_inform_bss(struct bcm_cfg80211 *cfg);
-static s32 wl_inform_single_bss(struct bcm_cfg80211 *cfg, struct wl_bss_info *bi, bool roam);
-static s32 wl_update_bss_info(struct bcm_cfg80211 *cfg, struct net_device *ndev, bool roam);
+static s32 wl_inform_single_bss(struct bcm_cfg80211 *cfg, wl_bss_info_t *bi, bool update_ssid);
+static s32 wl_update_bss_info(struct bcm_cfg80211 *cfg, struct net_device *ndev, bool update_ssid);
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);
+
+#ifdef ENABLE_HOGSQS
+static void wl_cfg80211_hogsqs_event_handler(struct work_struct *work);
+#endif // endif
+
/*
* key indianess swap utilities
*/
@@ -673,16 +900,14 @@
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 s32 wl_config_infra(struct bcm_cfg80211 *cfg, struct net_device *ndev, u16 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);
-
int wl_cfg80211_get_ioctl_version(void);
/*
@@ -698,11 +923,8 @@
#ifdef DEBUGFS_CFG80211
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 bool check_dev_role_integrity(struct bcm_cfg80211 *cfg, u32 dev_role);
+#endif // endif
+static bool check_dev_role_integrity(struct bcm_cfg80211 *cfg, s32 mode, u32 dev_role);
#ifdef WL_CFG80211_ACL
/* ACL */
@@ -713,29 +935,153 @@
/*
* Some external functions, TODO: move them to dhd_linux.h
*/
-int dhd_add_monitor(char *name, struct net_device **new_ndev);
+#ifdef DHD_MONITOR_INTERFACE
+int dhd_add_monitor(const char *name, struct net_device **new_ndev);
int dhd_del_monitor(struct net_device *ndev);
int dhd_monitor_init(void *dhd_pub);
int dhd_monitor_uninit(void);
-int dhd_start_xmit(struct sk_buff *skb, struct net_device *net);
-#ifdef BCMSDIO
-extern uint16 dhd_get_chipid(dhd_pub_t * dhd);
-#endif
+#ifdef CFI_CHECK
+netdev_tx_t
+#else
+int
+#endif /* CFI_CHECK */
+dhd_start_xmit(struct sk_buff *skb, struct net_device *net);
+#endif /* DHD_MONITOR_INTERFACE */
+#ifdef ESCAN_CHANNEL_CACHE
+void reset_roam_cache(struct bcm_cfg80211 *cfg);
+void add_roam_cache(struct bcm_cfg80211 *cfg, wl_bss_info_t *bi);
+int get_roam_channel_list(int target_chan, chanspec_t *channels,
+ int n_channels, const wlc_ssid_t *ssid, int ioctl_ver, struct ieee80211_channel *chan);
+void set_roam_band(int band);
+#endif /* ESCAN_CHANNEL_CACHE */
+
+#ifdef ROAM_CHANNEL_CACHE
+int init_roam_cache(struct bcm_cfg80211 *cfg, int ioctl_ver);
+void print_roam_cache(struct bcm_cfg80211 *cfg);
+void update_roam_cache(struct bcm_cfg80211 *cfg, int ioctl_ver);
+#endif /* ROAM_CHANNEL_CACHE */
+
+#ifdef P2P_LISTEN_OFFLOADING
+s32 wl_cfg80211_p2plo_deinit(struct bcm_cfg80211 *cfg);
+#endif /* P2P_LISTEN_OFFLOADING */
+
+#ifdef CUSTOMER_HW4_DEBUG
+extern bool wl_scan_timeout_dbg_enabled;
+#endif /* CUSTOMER_HW4_DEBUG */
+#ifdef PKT_FILTER_SUPPORT
+extern uint dhd_pkt_filter_enable;
+extern uint dhd_master_mode;
+extern void dhd_pktfilter_offload_enable(dhd_pub_t * dhd, char *arg, int enable, int master_mode);
+#endif /* PKT_FILTER_SUPPORT */
+
+#ifdef SUPPORT_SET_CAC
+static void wl_cfg80211_set_cac(struct bcm_cfg80211 *cfg, int enable);
+#endif /* SUPPORT_SET_CAC */
static int wl_cfg80211_delayed_roam(struct bcm_cfg80211 *cfg, struct net_device *ndev,
const struct ether_addr *bssid);
+static s32 __wl_update_wiphybands(struct bcm_cfg80211 *cfg, bool notify);
+
+#ifdef WL_WPS_SYNC
+static void wl_init_wps_reauth_sm(struct bcm_cfg80211 *cfg);
+static void wl_deinit_wps_reauth_sm(struct bcm_cfg80211 *cfg);
+static void wl_wps_reauth_timeout(unsigned long data);
+static s32 wl_get_free_wps_inst(struct bcm_cfg80211 *cfg);
+static s32 wl_get_wps_inst_match(struct bcm_cfg80211 *cfg, struct net_device *ndev);
+static s32 wl_wps_session_add(struct net_device *ndev, u16 mode, u8 *peer_mac);
+static void wl_wps_session_del(struct net_device *ndev);
+static s32 wl_wps_session_update(struct net_device *ndev, u16 state, const u8 *peer_mac);
+static void wl_wps_handle_ifdel(struct net_device *ndev);
+#endif /* WL_WPS_SYNC */
+
+#if defined(WL_FW_OCE_AP_SELECT)
+bool static wl_cfg80211_is_oce_ap(struct wiphy *wiphy, const u8 *bssid_hint);
+#endif /* WL_FW_OCE_AP_SELECT */
+
+#ifdef WL_BCNRECV
+static s32 wl_bcnrecv_aborted_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data);
+#endif /* WL_BCNRECV */
+
+#ifdef WL_CAC_TS
+static s32 wl_cfg80211_cac_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data);
+#endif /* WL_CAC_TS */
+
+#if defined(WL_MBO) || defined(WL_OCE)
+static s32 wl_bssid_prune_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data);
+#endif /* WL_MBO || WL_OCE */
static int bw2cap[] = { 0, 0, WLC_BW_CAP_20MHZ, WLC_BW_CAP_40MHZ, WLC_BW_CAP_80MHZ,
WLC_BW_CAP_160MHZ, WLC_BW_CAP_160MHZ };
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0))
-#define CFG80211_DISCONNECTED(dev, reason, ie, len, loc_gen, gfp) \
- cfg80211_disconnected(dev, reason, ie, len, gfp);
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0))
-#define CFG80211_DISCONNECTED(dev, reason, ie, len, loc_gen, gfp) \
- cfg80211_disconnected(dev, reason, ie, len, loc_gen, gfp);
-#endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) || (defined(CONFIG_ARCH_MSM) && \
+ defined(CFG80211_DISCONNECTED_V2))
+#define CFG80211_GET_BSS(wiphy, channel, bssid, ssid, ssid_len) \
+ cfg80211_get_bss(wiphy, channel, bssid, ssid, ssid_len, \
+ IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY);
+#else
+#define CFG80211_GET_BSS(wiphy, channel, bssid, ssid, ssid_len) \
+ cfg80211_get_bss(wiphy, channel, bssid, ssid, ssid_len, \
+ WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) */
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)) || \
+ defined(CFG80211_CONNECT_TIMEOUT_REASON_CODE) || defined(WL_FILS) || \
+ defined(CONFIG_CFG80211_FILS_BKPORT)
+#define CFG80211_CONNECT_RESULT(dev, bssid, bss, req_ie, req_ie_len, resp_ie, \
+ resp_ie_len, status, gfp) \
+ cfg80211_connect_bss(dev, bssid, bss, req_ie, req_ie_len, resp_ie, \
+ resp_ie_len, status, gfp, NL80211_TIMEOUT_UNSPECIFIED);
+#else
+#define CFG80211_CONNECT_RESULT(dev, bssid, bss, req_ie, req_ie_len, resp_ie, \
+ resp_ie_len, status, gfp) \
+ cfg80211_connect_bss(dev, bssid, bss, req_ie, req_ie_len, resp_ie, \
+ resp_ie_len, status, gfp);
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) || \
+ * (CFG80211_CONNECT_TIMEOUT_REASON_CODE) ||
+ * WL_FILS || CONFIG_CFG80211_FILS_BKPORT
+ */
+#elif defined(CFG80211_CONNECT_TIMEOUT_REASON_CODE)
+/* There are customer kernels with backported changes for
+ * connect timeout. CFG80211_CONNECT_TIMEOUT_REASON_CODE define
+ * is available for kernels < 4.7 in such cases.
+ */
+#define CFG80211_CONNECT_RESULT(dev, bssid, bss, req_ie, req_ie_len, resp_ie, \
+ resp_ie_len, status, gfp) \
+ cfg80211_connect_bss(dev, bssid, bss, req_ie, req_ie_len, resp_ie, \
+ resp_ie_len, status, gfp, NL80211_TIMEOUT_UNSPECIFIED);
+#else
+/* Kernels < 4.7 doesn't support cfg80211_connect_bss */
+#define CFG80211_CONNECT_RESULT(dev, bssid, bss, req_ie, req_ie_len, resp_ie, \
+ resp_ie_len, status, gfp) \
+ cfg80211_connect_result(dev, bssid, req_ie, req_ie_len, resp_ie, \
+ resp_ie_len, status, gfp);
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) */
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+#define CFG80211_RX_MGMT(ndev, freq, sig_dbm, buf, len, flags, gfp) \
+ cfg80211_rx_mgmt(ndev_to_wdev(ndev), freq, sig_dbm, buf, len, flags)
+#elif ((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0)) && \
+ (LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)))
+#define CFG80211_RX_MGMT(ndev, freq, sig_dbm, buf, len, flags, gfp) \
+ cfg80211_rx_mgmt(ndev_to_wdev(ndev), freq, sig_dbm, buf, len, flags, gfp)
+#elif ((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) && \
+ (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)))
+#define CFG80211_RX_MGMT(ndev, freq, sig_dbm, buf, len, flags, gfp) \
+ cfg80211_rx_mgmt(ndev_to_wdev(ndev), freq, sig_dbm, buf, len, gfp)
+#elif ((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) && \
+ (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0))) || \
+ defined(WL_COMPAT_WIRELESS)
+#define CFG80211_RX_MGMT(ndev, freq, sig_dbm, buf, len, flags, gfp) \
+ cfg80211_rx_mgmt(ndev, freq, sig_dbm, buf, len, gfp)
+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0))
+#define CFG80211_RX_MGMT(ndev, freq, sig_dbm, buf, len, flags, gfp) \
+ cfg80211_rx_mgmt(ndev, freq, buf, len, gfp)
+#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)) */
#ifdef RSSI_OFFSET
static s32 wl_rssi_offset(s32 rssi)
@@ -747,21 +1093,20 @@
}
#else
#define wl_rssi_offset(x) x
-#endif
+#endif // endif
-#define IS_WPA_AKM(akm) ((akm) == RSN_AKM_NONE || \
- (akm) == RSN_AKM_UNSPECIFIED || \
+#define IS_WPA_AKM(akm) ((akm) == RSN_AKM_NONE || \
+ (akm) == RSN_AKM_UNSPECIFIED || \
(akm) == RSN_AKM_PSK)
-
extern int dhd_wait_pend8021x(struct net_device *dev);
#ifdef PROP_TXSTATUS_VSDB
extern int disable_proptx;
#endif /* PROP_TXSTATUS_VSDB */
-
-extern int passive_channel_skip;
-
+static s32
+wl_ap_start_ind(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data);
static s32
wl_csa_complete_ind(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
const wl_event_msg_t *e, void *data);
@@ -771,39 +1116,14 @@
int freq;
int chan_type;
};
-#endif
+#endif // endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0))
+#define CFG80211_PUT_BSS(wiphy, bss) cfg80211_put_bss(wiphy, bss);
+#else
+#define CFG80211_PUT_BSS(wiphy, bss) cfg80211_put_bss(bss);
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) */
-#if (WL_DBG_LEVEL > 0)
-#define WL_DBG_ESTR_MAX 50
-static s8 wl_dbg_estr[][WL_DBG_ESTR_MAX] = {
- "SET_SSID", "JOIN", "START", "AUTH", "AUTH_IND",
- "DEAUTH", "DEAUTH_IND", "ASSOC", "ASSOC_IND", "REASSOC",
- "REASSOC_IND", "DISASSOC", "DISASSOC_IND", "QUIET_START", "QUIET_END",
- "BEACON_RX", "LINK", "MIC_ERROR", "NDIS_LINK", "ROAM",
- "TXFAIL", "PMKID_CACHE", "RETROGRADE_TSF", "PRUNE", "AUTOAUTH",
- "EAPOL_MSG", "SCAN_COMPLETE", "ADDTS_IND", "DELTS_IND", "BCNSENT_IND",
- "BCNRX_MSG", "BCNLOST_MSG", "ROAM_PREP", "PFN_NET_FOUND",
- "PFN_NET_LOST",
- "RESET_COMPLETE", "JOIN_START", "ROAM_START", "ASSOC_START",
- "IBSS_ASSOC",
- "RADIO", "PSM_WATCHDOG", "WLC_E_CCX_ASSOC_START", "WLC_E_CCX_ASSOC_ABORT",
- "PROBREQ_MSG",
- "SCAN_CONFIRM_IND", "PSK_SUP", "COUNTRY_CODE_CHANGED",
- "EXCEEDED_MEDIUM_TIME", "ICV_ERROR",
- "UNICAST_DECODE_ERROR", "MULTICAST_DECODE_ERROR", "TRACE",
- "WLC_E_BTA_HCI_EVENT", "IF", "WLC_E_P2P_DISC_LISTEN_COMPLETE",
- "RSSI", "PFN_SCAN_COMPLETE", "WLC_E_EXTLOG_MSG",
- "ACTION_FRAME", "ACTION_FRAME_COMPLETE", "WLC_E_PRE_ASSOC_IND",
- "WLC_E_PRE_REASSOC_IND", "WLC_E_CHANNEL_ADOPTED", "WLC_E_AP_STARTED",
- "WLC_E_DFS_AP_STOP", "WLC_E_DFS_AP_RESUME", "WLC_E_WAI_STA_EVENT",
- "WLC_E_WAI_MSG", "WLC_E_ESCAN_RESULT", "WLC_E_ACTION_FRAME_OFF_CHAN_COMPLETE",
- "WLC_E_PROBRESP_MSG", "WLC_E_P2P_PROBREQ_MSG", "WLC_E_DCS_REQUEST", "WLC_E_FIFO_CREDIT_MAP",
- "WLC_E_ACTION_FRAME_RX", "WLC_E_WAKE_EVENT", "WLC_E_RM_COMPLETE"
-};
-#endif /* WL_DBG_LEVEL */
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0))
#define CHAN2G(_channel, _freq, _flags) { \
.band = IEEE80211_BAND_2GHZ, \
.center_freq = (_freq), \
@@ -821,25 +1141,17 @@
.max_antenna_gain = 0, \
.max_power = 30, \
}
-#else
-#define CHAN2G(_channel, _freq, _flags) { \
- .band = NL80211_BAND_2GHZ, \
- .center_freq = (_freq), \
- .hw_value = (_channel), \
- .flags = (_flags), \
- .max_antenna_gain = 0, \
- .max_power = 30, \
-}
-#define CHAN5G(_channel, _flags) { \
- .band = NL80211_BAND_5GHZ, \
- .center_freq = 5000 + (5 * (_channel)), \
+#ifdef WL_6E
+#define CHAN6G(_channel, _flags) { \
+ .band = IEEE80211_BAND_6GHZ, \
+ .center_freq = 5950 + (5 * (_channel)), \
.hw_value = (_channel), \
.flags = (_flags), \
.max_antenna_gain = 0, \
.max_power = 30, \
}
-#endif /* if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) */
+#endif /* WL_6E */
#define RATE_TO_BASE100KBPS(rate) (((rate) * 10) / 2)
#define RATETAB_ENT(_rateid, _flags) \
@@ -904,20 +1216,98 @@
CHAN5G(165, 0)
};
-/* Global define the IEEE80211_BAND_XX to NL80211_BAND_xx here
- * to prevent the verbosely #if #else for KERNEL VERSION
- * Except the ones in CHAN2G()/CHAN5G which cannot be changed from here
- */
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 0))
-#define IEEE80211_BAND_2GHZ NL80211_BAND_2GHZ
-#define IEEE80211_BAND_5GHZ NL80211_BAND_5GHZ
-#endif
+#ifdef WL_6E
+static struct ieee80211_channel __wl_6ghz_a_channels[] = {
+ CHAN6G(1, 0), CHAN6G(5, 0), CHAN6G(9, 0), CHAN6G(13, 0),
+ CHAN6G(17, 0), CHAN6G(21, 0), CHAN6G(25, 0), CHAN6G(29, 0),
+ CHAN6G(33, 0), CHAN6G(37, 0), CHAN6G(41, 0), CHAN6G(45, 0),
+ CHAN6G(49, 0), CHAN6G(53, 0), CHAN6G(57, 0), CHAN6G(61, 0),
+ CHAN6G(65, 0), CHAN6G(69, 0), CHAN6G(73, 0), CHAN6G(77, 0),
+ CHAN6G(81, 0), CHAN6G(85, 0), CHAN6G(89, 0), CHAN6G(93, 0),
+ CHAN6G(97, 0), CHAN6G(101, 0), CHAN6G(105, 0), CHAN6G(109, 0),
+ CHAN6G(113, 0), CHAN6G(117, 0), CHAN6G(121, 0), CHAN6G(125, 0),
+ CHAN6G(129, 0), CHAN6G(133, 0), CHAN6G(137, 0), CHAN6G(141, 0),
+ CHAN6G(145, 0), CHAN6G(149, 0), CHAN6G(153, 0), CHAN6G(157, 0),
+ CHAN6G(161, 0), CHAN6G(165, 0), CHAN6G(169, 0), CHAN6G(173, 0),
+ CHAN6G(177, 0), CHAN6G(181, 0), CHAN6G(185, 0), CHAN6G(189, 0),
+ CHAN6G(193, 0), CHAN6G(197, 0), CHAN6G(201, 0), CHAN6G(205, 0),
+ CHAN6G(209, 0), CHAN6G(213, 0), CHAN6G(217, 0), CHAN6G(221, 0),
+ CHAN6G(225, 0), CHAN6G(229, 0), CHAN6G(233, 0)
+};
+#endif /* WL_6E */
+
+#ifdef WL11AX
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 21))
+static u32 he = 0;
+struct ieee80211_sband_iftype_data sdata[IEEE80211_NUM_BANDS];
+static int wl_update_he_cap(struct bcm_cfg80211 *cfg, struct ieee80211_sband_iftype_data *data, int band)
+{
+ int idx = 1;
+ struct ieee80211_sta_he_cap *he_cap = &data->he_cap;
+ struct ieee80211_he_cap_elem *he_cap_elem =
+ &he_cap->he_cap_elem;
+ struct ieee80211_he_mcs_nss_supp *he_mcs =
+ &he_cap->he_mcs_nss_supp;
+
+ if(data == NULL) {
+ WL_ERR(("failed to allco mem\n"));
+ return 0;
+ }
+
+ data->types_mask= BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_AP);
+ he_cap->has_he = true;
+ he_cap_elem->mac_cap_info[0] =
+ IEEE80211_HE_MAC_CAP0_HTC_HE | IEEE80211_HE_MAC_CAP0_TWT_REQ;
+
+ he_cap_elem->mac_cap_info[2] =
+ IEEE80211_HE_MAC_CAP2_BSR;
+ if ((band == NL80211_BAND_5GHZ) || (band == NL80211_BAND_6GHZ))
+ he_cap_elem->phy_cap_info[0] =
+ IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G |
+ IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G |
+ IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G;
+ he_cap_elem->phy_cap_info[1] =
+ IEEE80211_HE_PHY_CAP1_LDPC_CODING_IN_PAYLOAD;
+ he_cap_elem->phy_cap_info[2] =
+ IEEE80211_HE_PHY_CAP2_NDP_4x_LTF_AND_3_2US;
+ he_cap_elem->phy_cap_info[3] =
+ IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER;
+ he_cap_elem->phy_cap_info[4] =
+ IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE |
+ IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_UNDER_80MHZ_MASK |
+ IEEE80211_HE_PHY_CAP4_BEAMFORMEE_MAX_STS_ABOVE_80MHZ_4;
+ he_cap_elem->phy_cap_info[5] =
+ IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_2;
+ he_cap_elem->phy_cap_info[6] =
+ IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_42_SU |
+ IEEE80211_HE_PHY_CAP6_CODEBOOK_SIZE_75_MU |
+ IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB |
+ IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB |
+ IEEE80211_HE_PHY_CAP6_TRIG_CQI_FB |
+ IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT;
+ he_cap_elem->phy_cap_info[7] =
+ IEEE80211_HE_PHY_CAP7_MAX_NC_1;
+ he_cap_elem->phy_cap_info[8] =
+ IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU |
+ IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU;
+ he_cap_elem->phy_cap_info[9] =
+ IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU |
+ IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU;
+ he_mcs->rx_mcs_80 = cpu_to_le16(0xfffa);
+ he_mcs->tx_mcs_80 = cpu_to_le16(0xfffa);
+ he_mcs->rx_mcs_160 = cpu_to_le16((0xfffa));
+ he_mcs->tx_mcs_160 = cpu_to_le16((0xfffa));
+ return idx;
+}
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 21) */
+#endif /* WL11AX */
+
static struct ieee80211_supported_band __wl_band_2ghz = {
.band = IEEE80211_BAND_2GHZ,
.channels = __wl_2ghz_channels,
.n_channels = ARRAY_SIZE(__wl_2ghz_channels),
.bitrates = wl_g_rates,
- .n_bitrates = wl_g_rates_size
+ .n_bitrates = wl_g_rates_size,
};
static struct ieee80211_supported_band __wl_band_5ghz_a = {
@@ -925,26 +1315,49 @@
.channels = __wl_5ghz_a_channels,
.n_channels = ARRAY_SIZE(__wl_5ghz_a_channels),
.bitrates = wl_a_rates,
- .n_bitrates = wl_a_rates_size
+ .n_bitrates = wl_a_rates_size,
};
-#if defined(WLFBT)
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0))
-#define WLAN_AKM_SUITE_FT_8021X 0x000FAC03
-#define WLAN_AKM_SUITE_FT_PSK 0x000FAC04
-#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) */
-#define WLAN_CIPHER_SUITE_PMK 0x00904C00
-#endif /* WLFBT */
+#ifdef WL_6E
+static struct ieee80211_supported_band __wl_band_6ghz = {
+ .band = IEEE80211_BAND_6GHZ,
+ .channels = __wl_6ghz_a_channels,
+ .n_channels = ARRAY_SIZE(__wl_6ghz_a_channels),
+ .bitrates = wl_a_rates,
+ .n_bitrates = wl_a_rates_size,
+};
+#endif /* WL_6E */
static const u32 __wl_cipher_suites[] = {
WLAN_CIPHER_SUITE_WEP40,
WLAN_CIPHER_SUITE_WEP104,
WLAN_CIPHER_SUITE_TKIP,
WLAN_CIPHER_SUITE_CCMP,
+#ifdef MFP
+ /*
+ * Advertising AES_CMAC cipher suite to userspace would imply that we
+ * are supporting MFP. So advertise only when MFP support is enabled.
+ */
WLAN_CIPHER_SUITE_AES_CMAC,
-#if defined(WLFBT) && defined(WLAN_CIPHER_SUITE_PMK)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0))
+ WLAN_CIPHER_SUITE_BIP_GMAC_256,
+ WLAN_CIPHER_SUITE_BIP_GMAC_128,
+ WLAN_CIPHER_SUITE_BIP_CMAC_256,
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) */
+#endif /* MFP */
+
+#ifdef BCMWAPI_WPI
+ WLAN_CIPHER_SUITE_SMS4,
+#endif // endif
+#if defined(WLAN_CIPHER_SUITE_PMK)
WLAN_CIPHER_SUITE_PMK,
-#endif
+#endif /* WLAN_CIPHER_SUITE_PMK */
+#ifdef WL_GCMP
+ WLAN_CIPHER_SUITE_GCMP,
+ WLAN_CIPHER_SUITE_GCMP_256,
+ WLAN_CIPHER_SUITE_BIP_GMAC_128,
+ WLAN_CIPHER_SUITE_BIP_GMAC_256,
+#endif /* WL_GCMP */
};
#ifdef WL_SUPPORT_ACS
@@ -963,15 +1376,19 @@
};
#endif /* WL_SUPPORT_ACS */
+#ifdef WL_CFG80211_GON_COLLISION
+#define BLOCK_GON_REQ_MAX_NUM 5
+#endif /* WL_CFG80211_GON_COLLISION */
#if defined(USE_DYNAMIC_MAXPKT_RXGLOM)
static int maxrxpktglom = 0;
-#endif
+#endif // endif
/* IOCtl version read from targeted driver */
-static int ioctl_version;
+int ioctl_version;
#ifdef DEBUGFS_CFG80211
-#define S_SUBLOGLEVEL 20
+#define SUBLOGLEVEL 20
+#define SUBLOGLEVELZ ((SUBLOGLEVEL) + (1))
static const struct {
u32 log_level;
char *sublogname;
@@ -983,44 +1400,133 @@
{WL_DBG_TRACE, "TRACE"},
{WL_DBG_P2P_ACTION, "P2PACTION"}
};
-#endif
+#endif // endif
+typedef struct rsn_cipher_algo_entry {
+ u32 cipher_suite;
+ u32 wsec_algo;
+ u32 wsec_key_algo;
+} rsn_cipher_algo_entry_t;
-static void wl_add_remove_pm_enable_work(struct bcm_cfg80211 *cfg, bool add_remove,
- enum wl_handler_del_type type)
+static const rsn_cipher_algo_entry_t rsn_cipher_algo_lookup_tbl[] = {
+ {WLAN_CIPHER_SUITE_WEP40, WEP_ENABLED, CRYPTO_ALGO_WEP1},
+ {WLAN_CIPHER_SUITE_WEP104, WEP_ENABLED, CRYPTO_ALGO_WEP128},
+ {WLAN_CIPHER_SUITE_TKIP, TKIP_ENABLED, CRYPTO_ALGO_TKIP},
+ {WLAN_CIPHER_SUITE_CCMP, AES_ENABLED, CRYPTO_ALGO_AES_CCM},
+ {WLAN_CIPHER_SUITE_AES_CMAC, AES_ENABLED, CRYPTO_ALGO_BIP},
+#ifdef BCMWAPI_WPI
+ {WLAN_CIPHER_SUITE_SMS4, SMS4_ENABLED, CRYPTO_ALGO_SMS4},
+#endif /* BCMWAPI_WPI */
+#ifdef WL_GCMP
+ {WLAN_CIPHER_SUITE_GCMP, AES_ENABLED, CRYPTO_ALGO_AES_GCM},
+ {WLAN_CIPHER_SUITE_GCMP_256, AES_ENABLED, CRYPTO_ALGO_AES_GCM256},
+ {WLAN_CIPHER_SUITE_BIP_GMAC_128, AES_ENABLED, CRYPTO_ALGO_BIP_GMAC},
+ {WLAN_CIPHER_SUITE_BIP_GMAC_256, AES_ENABLED, CRYPTO_ALGO_BIP_GMAC256},
+#endif /* WL_GCMP */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0))
+ {WLAN_CIPHER_SUITE_BIP_CMAC_256, AES_ENABLED, CRYPTO_ALGO_BIP_CMAC256},
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) */
+};
+
+typedef struct rsn_akm_wpa_auth_entry {
+ u32 akm_suite;
+ u32 wpa_auth;
+} rsn_akm_wpa_auth_entry_t;
+
+static const rsn_akm_wpa_auth_entry_t rsn_akm_wpa_auth_lookup_tbl[] = {
+#ifdef WL_OWE
+ {WLAN_AKM_SUITE_OWE, WPA3_AUTH_OWE},
+#endif /* WL_OWE */
+ {WLAN_AKM_SUITE_8021X, WPA2_AUTH_UNSPECIFIED},
+ {WL_AKM_SUITE_SHA256_1X, WPA2_AUTH_1X_SHA256},
+ {WL_AKM_SUITE_SHA256_PSK, WPA2_AUTH_PSK_SHA256},
+ {WLAN_AKM_SUITE_PSK, WPA2_AUTH_PSK},
+ {WLAN_AKM_SUITE_FT_8021X, WPA2_AUTH_UNSPECIFIED | WPA2_AUTH_FT},
+ {WLAN_AKM_SUITE_FT_PSK, WPA2_AUTH_PSK | WPA2_AUTH_FT},
+ {WLAN_AKM_SUITE_FILS_SHA256, WPA2_AUTH_FILS_SHA256},
+ {WLAN_AKM_SUITE_FILS_SHA384, WPA2_AUTH_FILS_SHA384},
+ {WLAN_AKM_SUITE_8021X_SUITE_B, WPA3_AUTH_1X_SUITE_B_SHA256},
+ {WLAN_AKM_SUITE_8021X_SUITE_B_192, WPA3_AUTH_1X_SUITE_B_SHA384},
+#ifdef BCMWAPI_WPI
+ {WLAN_AKM_SUITE_WAPI_CERT, WAPI_AUTH_UNSPECIFIED},
+ {WLAN_AKM_SUITE_WAPI_PSK, WAPI_AUTH_PSK},
+#endif /* BCMWAPI_WPI */
+#ifdef WL_SAE
+ {WLAN_AKM_SUITE_SAE, WPA3_AUTH_SAE_PSK},
+#endif /* WL_SAE */
+ {WLAN_AKM_SUITE_FT_8021X_SHA384, WPA3_AUTH_1X_SHA384 | WPA2_AUTH_FT},
+ {WLAN_AKM_SUITE_DPP, WPA2_WFA_AUTH_DPP}
+};
+
+#define BUFSZ 8
+#define BUFSZN BUFSZ + 1
+
+#define _S(x) #x
+#define S(x) _S(x)
+
+#define SOFT_AP_IF_NAME "swlan0"
+
+/* watchdog timer for disconnecting when fw is not associated for FW_ASSOC_WATCHDOG_TIME ms */
+uint32 fw_assoc_watchdog_ms = 0;
+bool fw_assoc_watchdog_started = 0;
+#define FW_ASSOC_WATCHDOG_TIME 10 * 1000 /* msec */
+
+static void wl_add_remove_pm_enable_work(struct bcm_cfg80211 *cfg,
+ enum wl_pm_workq_act_type type)
{
+ u16 wq_duration = 0;
+#if defined(OEM_ANDROID)
+ dhd_pub_t *dhd = NULL;
+#endif /* BCMDONGLEHOST && OEM_ANDROID */
+
if (cfg == NULL)
return;
- if (cfg->pm_enable_work_on) {
- if (add_remove) {
- schedule_delayed_work(&cfg->pm_enable_work,
- msecs_to_jiffies(WL_PM_ENABLE_TIMEOUT));
- } else {
- cancel_delayed_work_sync(&cfg->pm_enable_work);
+#if defined(OEM_ANDROID)
+ dhd = (dhd_pub_t *)(cfg->pub);
+#endif /* BCMDONGLEHOST && OEM_ANDROID */
- 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;
- break;
- }
+ mutex_lock(&cfg->pm_sync);
+ /*
+ * Make cancel and schedule work part mutually exclusive
+ * so that while cancelling, we are sure that there is no
+ * work getting scheduled.
+ */
+ if (delayed_work_pending(&cfg->pm_enable_work)) {
+ cancel_delayed_work(&cfg->pm_enable_work);
+#if defined(OEM_ANDROID)
+ DHD_PM_WAKE_UNLOCK(cfg->pub);
+#endif /* BCMDONGLEHOST && OEM_ANDROID */
+ }
+
+ if (type == WL_PM_WORKQ_SHORT) {
+ wq_duration = WL_PM_ENABLE_TIMEOUT;
+ } else if (type == WL_PM_WORKQ_LONG) {
+ wq_duration = (WL_PM_ENABLE_TIMEOUT*2);
+ }
+
+ /* It should schedule work item only if driver is up */
+#if defined(OEM_ANDROID)
+ if (wq_duration && dhd->up) {
+#else
+ if (wq_duration) {
+#endif /* BCMDONGLEHOST && OEM_ANDROID */
+ if (schedule_delayed_work(&cfg->pm_enable_work,
+ msecs_to_jiffies((const unsigned int)wq_duration))) {
+#if defined(OEM_ANDROID)
+ DHD_PM_WAKE_LOCK_TIMEOUT(cfg->pub, wq_duration);
+#endif /* BCMDONGLEHOST && OEM_ANDROID */
+ } else {
+ WL_ERR(("Can't schedule pm work handler\n"));
}
}
+ mutex_unlock(&cfg->pm_sync);
}
/* Return a new chanspec given a legacy chanspec
* Returns INVCHANSPEC on error
*/
-static chanspec_t
+chanspec_t
wl_chspec_from_legacy(chanspec_t legacy_chspec)
{
chanspec_t chspec;
@@ -1049,7 +1555,7 @@
if (wf_chspec_malformed(chspec)) {
WL_ERR(("wl_chspec_from_legacy: output chanspec (0x%04X) malformed\n",
- chspec));
+ chspec));
return INVCHANSPEC;
}
@@ -1066,7 +1572,7 @@
if (wf_chspec_malformed(chspec)) {
WL_ERR(("wl_chspec_to_legacy: input chanspec (0x%04X) malformed\n",
- chspec));
+ chspec));
return INVCHANSPEC;
}
@@ -1095,13 +1601,18 @@
/* cannot express the bandwidth */
char chanbuf[CHANSPEC_STR_LEN];
WL_ERR((
- "wl_chspec_to_legacy: unable to convert chanspec %s (0x%04X) "
- "to pre-11ac format\n",
- wf_chspec_ntoa(chspec, chanbuf), chspec));
+ "wl_chspec_to_legacy: unable to convert chanspec %s (0x%04X) "
+ "to pre-11ac format\n",
+ wf_chspec_ntoa(chspec, chanbuf), chspec));
return INVCHANSPEC;
}
return lchspec;
+}
+
+bool wl_cfg80211_is_hal_started(struct bcm_cfg80211 *cfg)
+{
+ return cfg->hal_started;
}
/* given a chanspec value, do the endian and chanspec version conversion to
@@ -1127,20 +1638,17 @@
* Returns INVCHANSPEC on error
*/
chanspec_t
-wl_ch_host_to_driver(s32 bssidx, u16 channel)
+wl_ch_host_to_driver(u16 channel)
{
chanspec_t chanspec;
+ chanspec_band_t band;
- chanspec = channel & WL_CHANSPEC_CHAN_MASK;
+ band = WL_CHANNEL_BAND(channel);
- if (channel <= CH_MAX_2G_CHANNEL)
- chanspec |= WL_CHANSPEC_BAND_2G;
- else
- chanspec |= WL_CHANSPEC_BAND_5G;
-
- chanspec |= wl_cfg80211_ulb_get_min_bw_chspec(NULL, bssidx);
-
- chanspec |= WL_CHANSPEC_CTL_SB_NONE;
+ chanspec = wf_create_20MHz_chspec(channel, band);
+ if (chanspec == INVCHANSPEC) {
+ return chanspec;
+ }
return wl_chspec_host_to_driver(chanspec);
}
@@ -1170,7 +1678,7 @@
char *c = NULL;
int count = 0;
- memset(n, 0, ETHER_ADDR_LEN);
+ bzero(n, ETHER_ADDR_LEN);
for (;;) {
n->octet[count++] = (uint8)simple_strtoul(a, &c, 16);
if (!*c++ || count == ETHER_ADDR_LEN)
@@ -1190,6 +1698,9 @@
[NL80211_IFTYPE_STATION] = {
.tx = 0xffff,
.rx = BIT(IEEE80211_STYPE_ACTION >> 4) |
+#ifdef WL_SAE
+ BIT(IEEE80211_STYPE_AUTH >> 4) |
+#endif /* WL_SAE */
BIT(IEEE80211_STYPE_PROBE_REQ >> 4)
},
[NL80211_IFTYPE_AP] = {
@@ -1259,13 +1770,54 @@
key->iv_initialized = dtoh32(key->iv_initialized);
}
+#if defined(WL_FW_OCE_AP_SELECT)
+bool static wl_cfg80211_is_oce_ap(struct wiphy *wiphy, const u8 *bssid_hint)
+{
+ const u8 *parse = NULL;
+ bcm_tlv_t *ie;
+ const struct cfg80211_bss_ies *ies;
+ u32 len;
+ struct cfg80211_bss *bss;
+
+ bss = CFG80211_GET_BSS(wiphy, NULL, bssid_hint, 0, 0);
+ if (!bss) {
+ WL_ERR(("Unable to find AP in the cache"));
+ return false;
+ }
+
+ if (rcu_access_pointer(bss->ies)) {
+ ies = rcu_access_pointer(bss->ies);
+ parse = ies->data;
+ len = ies->len;
+ } else {
+ WL_ERR(("ies is NULL"));
+ return false;
+ }
+
+ while ((ie = bcm_parse_tlvs(parse, len, DOT11_MNG_VS_ID))) {
+ if (wl_cfgoce_is_oce_ie((const uint8*)ie, (u8 const **)&parse, &len) == TRUE) {
+ return true;
+ } else {
+ ie = bcm_next_tlv((const bcm_tlv_t*) ie, &len);
+ if (!ie) {
+ return false;
+ }
+ parse = (uint8 *)ie;
+ WL_DBG(("NON OCE IE. next ie ptr:%p", parse));
+ }
+ }
+ WL_DBG(("OCE IE NOT found"));
+ return false;
+}
+#endif /* WL_FW_OCE_AP_SELECT */
+
/* Dump the contents of the encoded wps ie buffer and get pbc value */
static void
-wl_validate_wps_ie(char *wps_ie, s32 wps_ie_len, bool *pbc)
+wl_validate_wps_ie(const char *wps_ie, s32 wps_ie_len, bool *pbc)
{
#define WPS_IE_FIXED_LEN 6
- u16 len;
- u8 *subel = NULL;
+ s16 len;
+ const u8 *subel = NULL;
u16 subelt_id;
u16 subelt_len;
u16 val;
@@ -1274,7 +1826,7 @@
WL_ERR(("invalid argument : NULL\n"));
return;
}
- len = (u16)wps_ie[TLV_LEN_OFF];
+ len = (s16)wps_ie[TLV_LEN_OFF];
if (len > wps_ie_len) {
WL_ERR(("invalid length len %d, wps ie len %d\n", len, wps_ie_len));
@@ -1293,7 +1845,10 @@
subelt_len = HTON16(val);
len -= 4; /* for the attr id, attr len fields */
- len -= subelt_len; /* for the remaining fields in this attribute */
+ len -= (s16)subelt_len; /* for the remaining fields in this attribute */
+ if (len < 0) {
+ break;
+ }
WL_DBG((" subel=%p, subelt_id=0x%x subelt_len=%u\n",
subel, subelt_id, subelt_len));
@@ -1306,11 +1861,16 @@
valptr[1] = *(subel + 1);
WL_DBG((" attr WPS_ID_CONFIG_METHODS: %x\n", HTON16(val)));
} else if (subelt_id == WPS_ID_DEVICE_NAME) {
- char devname[100];
- memcpy(devname, subel, subelt_len);
- devname[subelt_len] = '\0';
- WL_DBG((" attr WPS_ID_DEVICE_NAME: %s (len %u)\n",
- devname, subelt_len));
+ char devname[33];
+ int namelen = MIN(subelt_len, (sizeof(devname) - 1));
+
+ if (namelen) {
+ memcpy(devname, subel, namelen);
+ devname[namelen] = '\0';
+ /* Printing len as rx'ed in the IE */
+ WL_DBG((" attr WPS_ID_DEVICE_NAME: %s (len %u)\n",
+ devname, subelt_len));
+ }
} else if (subelt_id == WPS_ID_DEVICE_PWD_ID) {
valptr[0] = *subel;
valptr[1] = *(subel + 1);
@@ -1349,12 +1909,12 @@
s32 err = 0;
s32 disable = 0;
s32 txpwrqdbm;
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
/* 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);
+ err = wldev_ioctl_set(dev, WLC_SET_RADIO, &disable, sizeof(disable));
if (unlikely(err)) {
WL_ERR(("WLC_SET_RADIO error (%d)\n", err));
return err;
@@ -1363,6 +1923,12 @@
if (dbm > 0xffff)
dbm = 0xffff;
txpwrqdbm = dbm * 4;
+#ifdef SUPPORT_WL_TXPOWER
+ if (type == NL80211_TX_POWER_AUTOMATIC)
+ txpwrqdbm = 127;
+ else
+ txpwrqdbm |= WL_TXPWR_OVERRIDE;
+#endif /* SUPPORT_WL_TXPOWER */
err = wldev_iovar_setbuf_bsscfg(dev, "qtxpower", (void *)&txpwrqdbm,
sizeof(txpwrqdbm), cfg->ioctl_buf, WLC_IOCTL_SMLEN, 0,
&cfg->ioctl_buf_sync);
@@ -1378,20 +1944,20 @@
{
s32 err = 0;
s32 txpwrdbm;
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ char ioctl_buf[WLC_IOCTL_SMLEN];
err = wldev_iovar_getbuf_bsscfg(dev, "qtxpower",
- NULL, 0, cfg->ioctl_buf, WLC_IOCTL_SMLEN, 0, &cfg->ioctl_buf_sync);
+ NULL, 0, ioctl_buf, WLC_IOCTL_SMLEN, 0, NULL);
if (unlikely(err)) {
WL_ERR(("error (%d)\n", err));
return err;
}
- memcpy(&txpwrdbm, cfg->ioctl_buf, sizeof(txpwrdbm));
+ memcpy(&txpwrdbm, ioctl_buf, sizeof(txpwrdbm));
txpwrdbm = dtoh32(txpwrdbm);
*dbm = (txpwrdbm & ~WL_TXPWR_OVERRIDE) / 4;
- WL_INFORM(("dBm=%d, txpwrdbm=0x%x\n", *dbm, txpwrdbm));
+ WL_DBG(("dBm=%d, txpwrdbm=0x%x\n", *dbm, txpwrdbm));
return err;
}
@@ -1399,65 +1965,1414 @@
static chanspec_t wl_cfg80211_get_shared_freq(struct wiphy *wiphy)
{
chanspec_t chspec;
- int err = 0;
+ int cur_band, err = 0;
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;
- s32 bssidx = 0; /* Explicitly set to primary bssidx */
+ wl_bss_info_t *bss = NULL;
+ u16 channel = WL_P2P_TEMP_CHAN;
char *buf;
- memset(&bssid, 0, sizeof(bssid));
- if ((err = wldev_ioctl(dev, WLC_GET_BSSID, &bssid, sizeof(bssid), false))) {
+ bzero(&bssid, sizeof(bssid));
+ if ((err = wldev_ioctl_get(dev, WLC_GET_BSSID, &bssid, sizeof(bssid)))) {
/* STA interface is not associated. So start the new interface on a temp
* channel . Later proper channel will be applied by the above framework
* via set_channel (cfg80211 API).
*/
- WL_DBG(("Not associated. Return first channel from supported channel list. \n"));
-
- if (!wldev_iovar_getint(dev, "chanspec", (s32*) &chspec)) {
- return chspec;
- } else {
- return wl_ch_host_to_driver(bssidx, WL_P2P_TEMP_CHAN);
+ WL_DBG(("Not associated. Return a temp channel. \n"));
+ cur_band = 0;
+ err = wldev_ioctl_get(dev, WLC_GET_BAND, &cur_band, sizeof(int));
+ if (unlikely(err)) {
+ WL_ERR(("Get band failed\n"));
+ } else if (cur_band == WLC_BAND_5G) {
+ channel = WL_P2P_TEMP_CHAN_5G;
}
+ return wl_ch_host_to_driver(channel);
}
-
- buf = kzalloc(WL_EXTRA_BUF_MAX, GFP_KERNEL);
+
+ buf = (char *)MALLOCZ(cfg->osh, WL_EXTRA_BUF_MAX);
if (!buf) {
WL_ERR(("buf alloc failed. use temp channel\n"));
- return wl_ch_host_to_driver(bssidx, WL_P2P_TEMP_CHAN);
+ return wl_ch_host_to_driver(channel);
}
*(u32 *)buf = htod32(WL_EXTRA_BUF_MAX);
- if ((err = wldev_ioctl(dev, WLC_GET_BSS_INFO, buf,
- WL_EXTRA_BUF_MAX, false))) {
+ if ((err = wldev_ioctl_get(dev, WLC_GET_BSS_INFO, buf,
+ WL_EXTRA_BUF_MAX))) {
WL_ERR(("Failed to get associated bss info, use temp channel \n"));
- chspec = wl_ch_host_to_driver(bssidx, WL_P2P_TEMP_CHAN);
+ chspec = wl_ch_host_to_driver(channel);
}
else {
- bss = (struct wl_bss_info *) (buf + 4);
- chspec = bss->chanspec;
+ bss = (wl_bss_info_t *) (buf + 4);
+ chspec = bss->chanspec;
+#ifdef WL_6E
+ /* Avoid p2p bring up in 6G based on bssinfo */
+ if (CHSPEC_IS6G(chspec)) {
+ channel = WL_P2P_TEMP_CHAN_5G;
+ chspec = wl_ch_host_to_driver(channel);
+ }
+#endif /* WL_6E */
WL_DBG(("Valid BSS Found. chanspec:%d \n", chspec));
}
- kfree(buf);
+ MFREE(cfg->osh, buf, WL_EXTRA_BUF_MAX);
return chspec;
}
-static bcm_struct_cfgdev *
-wl_cfg80211_add_monitor_if(char *name)
+static void
+wl_wlfc_enable(struct bcm_cfg80211 *cfg, bool enable)
+{
+#ifdef PROP_TXSTATUS_VSDB
+#if defined(BCMSDIO)
+ bool wlfc_enabled = FALSE;
+ s32 err;
+ dhd_pub_t *dhd;
+ struct net_device *primary_ndev = bcmcfg_to_prmry_ndev(cfg);
+
+ dhd = (dhd_pub_t *)(cfg->pub);
+ if (!dhd) {
+ return;
+ }
+
+ if (enable) {
+ if (!cfg->wlfc_on && !disable_proptx) {
+ dhd_wlfc_get_enable(dhd, &wlfc_enabled);
+ if (!wlfc_enabled && dhd->op_mode != DHD_FLAG_HOSTAP_MODE &&
+ dhd->op_mode != DHD_FLAG_IBSS_MODE) {
+ dhd_wlfc_init(dhd);
+ err = wldev_ioctl_set(primary_ndev, WLC_UP, &up, sizeof(s32));
+ if (err < 0)
+ WL_ERR(("WLC_UP return err:%d\n", err));
+ }
+ cfg->wlfc_on = true;
+ WL_DBG(("wlfc_on:%d \n", cfg->wlfc_on));
+ }
+ } else {
+ dhd_wlfc_get_enable(dhd, &wlfc_enabled);
+ if (wlfc_enabled && cfg->wlfc_on && dhd->op_mode != DHD_FLAG_HOSTAP_MODE &&
+ dhd->op_mode != DHD_FLAG_IBSS_MODE) {
+ cfg->wlfc_on = false;
+ }
+ }
+#endif /* defined(BCMSDIO) */
+#endif /* PROP_TXSTATUS_VSDB */
+}
+
+struct wireless_dev *
+wl_cfg80211_p2p_if_add(struct bcm_cfg80211 *cfg,
+ wl_iftype_t wl_iftype,
+ char const *name, u8 *mac_addr, s32 *ret_err)
+{
+ u16 chspec;
+ s16 cfg_type;
+ long timeout;
+ s32 err;
+ u16 p2p_iftype;
+ int dhd_mode;
+ struct net_device *new_ndev = NULL;
+ struct wiphy *wiphy = bcmcfg_to_wiphy(cfg);
+ struct ether_addr *p2p_addr;
+#if defined(WL_SUPPORT_MULTIP2P)
+ s32 is_mp2p_supported = BCME_ERROR;
+#endif // endif
+
+ *ret_err = BCME_OK;
+ if (!cfg->p2p) {
+ WL_ERR(("p2p not initialized\n"));
+ return NULL;
+ }
+
+#if defined(WL_CFG80211_P2P_DEV_IF)
+ if (wl_iftype == WL_IF_TYPE_P2P_DISC) {
+ /* Handle Dedicated P2P discovery Interface */
+ cfg->down_disc_if = FALSE;
+ return wl_cfgp2p_add_p2p_disc_if(cfg);
+ }
+#endif /* WL_CFG80211_P2P_DEV_IF */
+
+#if defined(WL_SUPPORT_MULTIP2P)
+ is_mp2p_supported = DHD_OPMODE_SUPPORTED(cfg->pub, DHD_FLAG_MP2P_MODE);
+#endif /* WL_SUPPORT_MULTIP2P */
+ if (wl_iftype == WL_IF_TYPE_P2P_GO) {
+ p2p_iftype = WL_P2P_IF_GO;
+ } else {
+ p2p_iftype = WL_P2P_IF_CLIENT;
+ }
+
+ /* Dual p2p doesn't support multiple P2PGO interfaces,
+ * p2p_go_count is the counter for GO creation
+ * requests.
+ */
+ if (TRUE &&
+#if defined(WL_SUPPORT_MULTIP2P)
+ (is_mp2p_supported <= 0) &&
+#endif // endif
+ ((cfg->p2p->p2p_go_count > 0) && (wl_iftype == WL_IF_TYPE_P2P_GO))) {
+ WL_ERR(("FW does not support multiple GO\n"));
+ *ret_err = -ENOTSUPP;
+ return NULL;
+ }
+ if (!cfg->p2p->on) {
+ p2p_on(cfg) = true;
+ wl_cfgp2p_set_firm_p2p(cfg);
+ wl_cfgp2p_init_discovery(cfg);
+ }
+
+ strlcpy(cfg->p2p->vir_ifname, name, sizeof(cfg->p2p->vir_ifname));
+ /* In concurrency case, STA may be already associated in a particular channel.
+ * so retrieve the current channel of primary interface and then start the virtual
+ * interface on that.
+ */
+ chspec = wl_cfg80211_get_shared_freq(wiphy);
+
+ /* For P2P mode, use P2P-specific driver features to create the
+ * bss: "cfg p2p_ifadd"
+ */
+ wl_set_p2p_status(cfg, IF_ADDING);
+ bzero(&cfg->if_event_info, sizeof(cfg->if_event_info));
+ cfg_type = wl_cfgp2p_get_conn_idx(cfg);
+ if (cfg_type == BCME_ERROR) {
+ wl_clr_p2p_status(cfg, IF_ADDING);
+ WL_ERR(("Failed to get connection idx for p2p interface"));
+ return NULL;
+ }
+
+ p2p_addr = wl_to_p2p_bss_macaddr(cfg, cfg_type);
+ memcpy(p2p_addr->octet, mac_addr, ETH_ALEN);
+
+ err = wl_cfgp2p_ifadd(cfg, p2p_addr,
+ htod32(p2p_iftype), chspec);
+ if (unlikely(err)) {
+ wl_clr_p2p_status(cfg, IF_ADDING);
+ WL_ERR((" virtual iface add failed (%d) \n", err));
+ return NULL;
+ }
+
+ /* Wait for WLC_E_IF event with IF_ADD opcode */
+ timeout = wait_event_interruptible_timeout(cfg->netif_change_event,
+ ((wl_get_p2p_status(cfg, IF_ADDING) == false) &&
+ (cfg->if_event_info.valid)),
+ msecs_to_jiffies(MAX_WAIT_TIME));
+ if (timeout > 0 && !wl_get_p2p_status(cfg, IF_ADDING) && cfg->if_event_info.valid) {
+ wl_if_event_info *event = &cfg->if_event_info;
+ new_ndev = wl_cfg80211_post_ifcreate(bcmcfg_to_prmry_ndev(cfg), event,
+ event->mac, cfg->p2p->vir_ifname, false);
+ if (unlikely(!new_ndev)) {
+ goto fail;
+ }
+
+ if (wl_iftype == WL_IF_TYPE_P2P_GO) {
+ cfg->p2p->p2p_go_count++;
+ }
+ /* Fill p2p specific data */
+ wl_to_p2p_bss_ndev(cfg, cfg_type) = new_ndev;
+ wl_to_p2p_bss_bssidx(cfg, cfg_type) = event->bssidx;
+
+ WL_ERR((" virtual interface(%s) is "
+ "created net attach done\n", cfg->p2p->vir_ifname));
+ dhd_mode = (wl_iftype == WL_IF_TYPE_P2P_GC) ?
+ DHD_FLAG_P2P_GC_MODE : DHD_FLAG_P2P_GO_MODE;
+ DNGL_FUNC(dhd_cfg80211_set_p2p_info, (cfg, dhd_mode));
+ /* reinitialize completion to clear previous count */
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0))
+ INIT_COMPLETION(cfg->iface_disable);
+#else
+ init_completion(&cfg->iface_disable);
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) */
+
+ return new_ndev->ieee80211_ptr;
+ }
+
+fail:
+ return NULL;
+}
+
+bool
+wl_cfg80211_check_vif_in_use(struct net_device *ndev)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+ bool nan_enabled = FALSE;
+
+#ifdef WL_NAN
+ nan_enabled = cfg->nan_enable;
+#endif /* WL_NAN */
+
+ if (nan_enabled || (wl_cfgp2p_vif_created(cfg)) ||
+ (dhd->op_mode & DHD_FLAG_HOSTAP_MODE)) {
+ WL_MEM(("%s: Virtual interfaces in use. NAN %d P2P %d softAP %d\n",
+ __FUNCTION__, nan_enabled, wl_cfgp2p_vif_created(cfg),
+ (dhd->op_mode & DHD_FLAG_HOSTAP_MODE)));
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+void
+wl_cfg80211_iface_state_ops(struct wireless_dev *wdev,
+ wl_interface_state_t state,
+ wl_iftype_t wl_iftype, u16 wl_mode)
+{
+ struct net_device *ndev;
+ struct bcm_cfg80211 *cfg;
+#if defined(CUSTOM_SET_CPUCORE)
+ dhd_pub_t *dhd;
+#endif // endif
+ s32 bssidx;
+
+ WL_DBG(("state:%s wl_iftype:%d mode:%d\n",
+ wl_if_state_strs[state], wl_iftype, wl_mode));
+ if (!wdev) {
+ WL_ERR(("wdev null\n"));
+ return;
+ }
+
+ if ((wl_iftype == WL_IF_TYPE_P2P_DISC) || (wl_iftype == WL_IF_TYPE_NAN_NMI)) {
+ /* P2P discovery is a netless device and uses a
+ * hidden bsscfg interface in fw. Don't apply the
+ * iface ops state changes for p2p discovery I/F.
+ * NAN NMI is netless device and uses a hidden bsscfg interface in fw.
+ * Don't apply iface ops state changes for NMI I/F.
+ */
+ return;
+ }
+
+ cfg = wiphy_priv(wdev->wiphy);
+ ndev = wdev->netdev;
+#ifdef CUSTOM_SET_CPUCORE
+ dhd = (dhd_pub_t *)(cfg->pub);
+#endif /* CUSTOM_SET_CPUCORE */
+
+ bssidx = wl_get_bssidx_by_wdev(cfg, wdev);
+ if (!ndev || (bssidx < 0)) {
+ WL_ERR(("ndev null. skip iface state ops\n"));
+ return;
+ }
+
+ switch (state) {
+ case WL_IF_CREATE_REQ:
+#ifdef WL_BCNRECV
+ /* check fakeapscan in progress then abort */
+ wl_android_bcnrecv_stop(ndev, WL_BCNRECV_CONCURRENCY);
+#endif /* WL_BCNRECV */
+ wl_cfg80211_scan_abort(cfg);
+#ifdef WLTDLS
+ /* disable TDLS if number of connected interfaces is >= 1 */
+ wl_cfg80211_tdls_config(cfg, TDLS_STATE_IF_CREATE, false);
+#endif /* WLTDLS */
+ break;
+ case WL_IF_DELETE_REQ:
+#ifdef WL_WPS_SYNC
+ wl_wps_handle_ifdel(ndev);
+#endif /* WPS_SYNC */
+ if (wl_get_drv_status(cfg, SCANNING, ndev)) {
+ /* Send completion for any pending scans */
+ wl_cfg80211_cancel_scan(cfg);
+ }
+
+#ifdef CUSTOM_SET_CPUCORE
+ dhd->chan_isvht80 &= ~DHD_FLAG_P2P_MODE;
+ if (!(dhd->chan_isvht80)) {
+ dhd_set_cpucore(dhd, FALSE);
+ }
+#endif /* CUSTOM_SET_CPUCORE */
+ wl_add_remove_pm_enable_work(cfg, WL_PM_WORKQ_DEL);
+ break;
+ case WL_IF_CREATE_DONE:
+ if (wl_mode == WL_MODE_BSS) {
+ /* Common code for sta type interfaces - STA, GC */
+ wldev_iovar_setint(ndev, "buf_key_b4_m4", 1);
+ }
+ if (wl_iftype == WL_IF_TYPE_P2P_GC) {
+ /* Disable firmware roaming for P2P interface */
+ wldev_iovar_setint(ndev, "roam_off", 1);
+ }
+ if (wl_mode == WL_MODE_AP) {
+ /* Common code for AP/GO */
+ }
+ break;
+ case WL_IF_DELETE_DONE:
+#ifdef WLTDLS
+ /* Enable back TDLS if connected interface is <= 1 */
+ wl_cfg80211_tdls_config(cfg, TDLS_STATE_IF_DELETE, false);
+#endif /* WLTDLS */
+ wl_wlfc_enable(cfg, false);
+ break;
+ case WL_IF_CHANGE_REQ:
+ /* Flush existing IEs from firmware on role change */
+ wl_cfg80211_clear_per_bss_ies(cfg, wdev);
+ break;
+ case WL_IF_CHANGE_DONE:
+ wl_wlfc_enable(cfg, true);
+ if (wl_mode == WL_MODE_BSS) {
+ /* Enable buffering of PTK key till EAPOL 4/4 is sent out */
+ wldev_iovar_setint(ndev, "buf_key_b4_m4", 1);
+ }
+ break;
+
+ default:
+ WL_ERR(("Unsupported state: %d\n", state));
+ return;
+ }
+}
+
+static s32
+wl_cfg80211_p2p_if_del(struct wiphy *wiphy, struct wireless_dev *wdev)
+{
+ struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
+ s16 bssidx;
+ s16 err;
+ s32 cfg_type;
+ struct net_device *ndev;
+ long timeout;
+
+ if (unlikely(!wl_get_drv_status(cfg, READY, bcmcfg_to_prmry_ndev(cfg)))) {
+ WL_INFORM_MEM(("device is not ready\n"));
+ return BCME_NOTFOUND;
+ }
+#ifdef WL_CFG80211_P2P_DEV_IF
+ if (wdev->iftype == NL80211_IFTYPE_P2P_DEVICE) {
+ /* Handle dedicated P2P discovery interface. */
+ return wl_cfgp2p_del_p2p_disc_if(wdev, cfg);
+ }
+#endif /* WL_CFG80211_P2P_DEV_IF */
+
+ /* Handle P2P Group Interface */
+ bssidx = wl_get_bssidx_by_wdev(cfg, wdev);
+ if (bssidx <= 0) {
+ WL_ERR(("bssidx not found\n"));
+ return BCME_NOTFOUND;
+ }
+ if (wl_cfgp2p_find_type(cfg, bssidx, &cfg_type) != BCME_OK) {
+ /* Couldn't find matching iftype */
+ WL_MEM(("non P2P interface\n"));
+ return BCME_NOTFOUND;
+ }
+
+ ndev = wdev->netdev;
+ wl_clr_p2p_status(cfg, GO_NEG_PHASE);
+ wl_clr_p2p_status(cfg, IF_ADDING);
+
+ /* for GO */
+ if (wl_get_mode_by_netdev(cfg, ndev) == WL_MODE_AP) {
+ wl_add_remove_eventmsg(ndev, WLC_E_PROBREQ_MSG, false);
+ cfg->p2p->p2p_go_count--;
+ /* disable interface before bsscfg free */
+ err = wl_cfgp2p_ifdisable(cfg, wl_to_p2p_bss_macaddr(cfg, cfg_type));
+ /* if fw doesn't support "ifdis",
+ do not wait for link down of ap mode
+ */
+ if (err == 0) {
+ WL_ERR(("Wait for Link Down event for GO !!!\n"));
+ wait_for_completion_timeout(&cfg->iface_disable,
+ msecs_to_jiffies(500));
+ } else if (err != BCME_UNSUPPORTED) {
+ msleep(300);
+ }
+ } else {
+ /* GC case */
+ if (wl_get_drv_status(cfg, DISCONNECTING, ndev)) {
+ WL_ERR(("Wait for Link Down event for GC !\n"));
+ wait_for_completion_timeout
+ (&cfg->iface_disable, msecs_to_jiffies(500));
+ }
+ }
+
+ bzero(&cfg->if_event_info, sizeof(cfg->if_event_info));
+ wl_set_p2p_status(cfg, IF_DELETING);
+ DNGL_FUNC(dhd_cfg80211_clean_p2p_info, (cfg));
+
+ err = wl_cfgp2p_ifdel(cfg, wl_to_p2p_bss_macaddr(cfg, cfg_type));
+ if (unlikely(err)) {
+ WL_ERR(("IFDEL operation failed, error code = %d\n", err));
+ goto fail;
+ } else {
+ /* Wait for WLC_E_IF event */
+ timeout = wait_event_interruptible_timeout(cfg->netif_change_event,
+ ((wl_get_p2p_status(cfg, IF_DELETING) == false) &&
+ (cfg->if_event_info.valid)),
+ msecs_to_jiffies(MAX_WAIT_TIME));
+ if (timeout > 0 && !wl_get_p2p_status(cfg, IF_DELETING) &&
+ cfg->if_event_info.valid) {
+ WL_ERR(("P2P IFDEL operation done\n"));
+ err = BCME_OK;
+ } else {
+ WL_ERR(("IFDEL didn't complete properly\n"));
+ err = -EINVAL;
+ }
+ }
+
+fail:
+ /* Even in failure case, attempt to remove the host data structure.
+ * Firmware would be cleaned up via WiFi reset done by the
+ * user space from hang event context (for android only).
+ */
+ bzero(cfg->p2p->vir_ifname, IFNAMSIZ);
+ wl_to_p2p_bss_bssidx(cfg, cfg_type) = -1;
+ wl_to_p2p_bss_ndev(cfg, cfg_type) = NULL;
+ wl_clr_drv_status(cfg, CONNECTED, wl_to_p2p_bss_ndev(cfg, cfg_type));
+ dhd_net_if_lock(ndev);
+ if (cfg->if_event_info.ifidx) {
+ /* Remove interface except for primary ifidx */
+ wl_cfg80211_remove_if(cfg, cfg->if_event_info.ifidx, ndev, FALSE);
+ }
+ dhd_net_if_unlock(ndev);
+ return err;
+}
+
+#ifdef WL_IFACE_MGMT_CONF
+#ifdef WL_IFACE_MGMT
+static s32
+wl_cfg80211_is_policy_config_allowed(struct bcm_cfg80211 *cfg)
+{
+ s32 ret = BCME_OK;
+ wl_iftype_t active_sec_iface = WL_IFACE_NOT_PRESENT;
+ bool p2p_disc_on = false;
+ bool sta_assoc_state = false;
+
+ mutex_lock(&cfg->if_sync);
+
+ sta_assoc_state = (wl_get_drv_status(cfg, CONNECTED, bcmcfg_to_prmry_ndev(cfg)) ||
+ wl_get_drv_status(cfg, CONNECTING, bcmcfg_to_prmry_ndev(cfg)));
+ active_sec_iface = wl_cfg80211_get_sec_iface(cfg);
+ p2p_disc_on = wl_get_p2p_status(cfg, SCANNING);
+
+ if ((sta_assoc_state == TRUE) || (p2p_disc_on == TRUE) ||
+ (cfg->nan_init_state == TRUE) ||
+ (active_sec_iface != WL_IFACE_NOT_PRESENT)) {
+ WL_INFORM_MEM(("Active iface matrix: sta_assoc_state = %d,"
+ " p2p_disc = %d, nan_disc = %d, active iface = %s\n",
+ sta_assoc_state, p2p_disc_on, cfg->nan_init_state,
+ wl_iftype_to_str(active_sec_iface)));
+ ret = BCME_BUSY;
+ }
+ mutex_unlock(&cfg->if_sync);
+ return ret;
+}
+#endif /* WL_IFACE_MGMT */
+#ifdef WL_NANP2P
+int
+wl_cfg80211_set_iface_conc_disc(struct net_device *ndev,
+ uint8 arg_val)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ if (!cfg) {
+ WL_ERR(("%s: Cannot find cfg\n", __FUNCTION__));
+ return BCME_ERROR;
+ }
+
+ if (wl_cfg80211_is_policy_config_allowed(cfg) != BCME_OK) {
+ WL_ERR(("Cant allow iface management modifications\n"));
+ return BCME_BUSY;
+ }
+
+ if (arg_val) {
+ cfg->conc_disc |= arg_val;
+ } else {
+ cfg->conc_disc &= ~arg_val;
+ }
+ return BCME_OK;
+}
+
+uint8
+wl_cfg80211_get_iface_conc_disc(struct net_device *ndev)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ if (!cfg) {
+ WL_ERR(("%s: Cannot find cfg\n", __FUNCTION__));
+ return BCME_ERROR;
+ }
+ return cfg->conc_disc;
+}
+#endif /* WL_NANP2P */
+#ifdef WL_IFACE_MGMT
+int
+wl_cfg80211_set_iface_policy(struct net_device *ndev,
+ char *arg, int len)
+{
+ int ret = BCME_OK;
+ uint8 i = 0;
+ iface_mgmt_data_t *iface_data = NULL;
+
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ if (!cfg) {
+ WL_ERR(("%s: Cannot find cfg\n", __FUNCTION__));
+ return BCME_ERROR;
+ }
+
+ if (wl_cfg80211_is_policy_config_allowed(cfg) != BCME_OK) {
+ WL_ERR(("Cant allow iface management modifications\n"));
+ return BCME_BUSY;
+ }
+
+ if (!arg || len <= 0 || len > sizeof(iface_mgmt_data_t)) {
+ return BCME_BADARG;
+ }
+
+ iface_data = (iface_mgmt_data_t *)arg;
+ if (iface_data->policy >= WL_IF_POLICY_INVALID) {
+ WL_ERR(("Unexpected value of policy = %d\n",
+ iface_data->policy));
+ return BCME_BADARG;
+ }
+
+ bzero(&cfg->iface_data, sizeof(iface_mgmt_data_t));
+ ret = memcpy_s(&cfg->iface_data, sizeof(iface_mgmt_data_t), arg, len);
+ if (ret != BCME_OK) {
+ WL_ERR(("Failed to copy iface data, src len = %d\n", len));
+ return ret;
+ }
+
+ if (cfg->iface_data.policy == WL_IF_POLICY_ROLE_PRIORITY) {
+ for (i = 0; i < WL_IF_TYPE_MAX; i++) {
+ WL_DBG(("iface = %s, priority[i] = %d\n",
+ wl_iftype_to_str(i), cfg->iface_data.priority[i]));
+ }
+ }
+
+ return ret;
+}
+
+uint8
+wl_cfg80211_get_iface_policy(struct net_device *ndev)
+
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ if (!cfg) {
+ WL_ERR(("%s: Cannot find cfg\n", __FUNCTION__));
+ return BCME_ERROR;
+ }
+
+ return cfg->iface_data.policy;
+}
+#endif /* WL_IFACE_MGMT */
+#endif /* WL_IFACE_MGMT_CONF */
+
+#ifdef WL_IFACE_MGMT
+/* Get active secondary data iface type */
+wl_iftype_t
+wl_cfg80211_get_sec_iface(struct bcm_cfg80211 *cfg)
+{
+#ifndef WL_STATIC_IF
+ dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+#endif /* !WL_STATIC_IF */
+ struct net_device *p2p_ndev = NULL;
+
+ p2p_ndev = wl_to_p2p_bss_ndev(cfg,
+ P2PAPI_BSSCFG_CONNECTION1);
+
+#ifdef WL_STATIC_IF
+ if (IS_CFG80211_STATIC_IF_ACTIVE(cfg)) {
+ if (IS_AP_IFACE(cfg->static_ndev->ieee80211_ptr)) {
+ return WL_IF_TYPE_AP;
+ }
+ }
+#else
+ if (dhd->op_mode & DHD_FLAG_HOSTAP_MODE) {
+ return WL_IF_TYPE_AP;
+ }
+#endif /* WL_STATIC_IF */
+
+ if (p2p_ndev && p2p_ndev->ieee80211_ptr) {
+ if (p2p_ndev->ieee80211_ptr->iftype == NL80211_IFTYPE_P2P_GO) {
+ return WL_IF_TYPE_P2P_GO;
+ }
+
+ if (p2p_ndev->ieee80211_ptr->iftype == NL80211_IFTYPE_P2P_CLIENT) {
+ return WL_IF_TYPE_P2P_GC;
+ }
+ }
+
+#ifdef WL_NAN
+ if (wl_cfgnan_is_dp_active(bcmcfg_to_prmry_ndev(cfg))) {
+ return WL_IF_TYPE_NAN;
+ }
+#endif /* WL_NAN */
+ return WL_IFACE_NOT_PRESENT;
+}
+
+/*
+* Handle incoming data interface request based on policy.
+* If there is any conflicting interface, that will be
+* deleted.
+*/
+s32
+wl_cfg80211_data_if_mgmt(struct bcm_cfg80211 *cfg,
+ wl_iftype_t new_wl_iftype)
+{
+ s32 ret = BCME_OK;
+ bool del_iface = false;
+ wl_iftype_t sec_wl_if_type = wl_cfg80211_get_sec_iface(cfg);
+
+ if (sec_wl_if_type == WL_IF_TYPE_NAN &&
+ new_wl_iftype == WL_IF_TYPE_NAN) {
+ /* Multi NDP is allowed irrespective of Policy */
+ return BCME_OK;
+ }
+
+ if (sec_wl_if_type == WL_IFACE_NOT_PRESENT) {
+ /*
+ * If there is no active secondary I/F, there
+ * is no interface conflict. Do nothing.
+ */
+ return BCME_OK;
+ }
+
+ /* Handle secondary data link case */
+ switch (cfg->iface_data.policy) {
+ case WL_IF_POLICY_CUSTOM:
+ case WL_IF_POLICY_DEFAULT: {
+ if (sec_wl_if_type == WL_IF_TYPE_NAN) {
+ /* NAN has the lowest priority */
+ del_iface = true;
+ } else {
+ /* Active iface is present, returning error */
+ ret = BCME_ERROR;
+ }
+ break;
+ }
+ case WL_IF_POLICY_FCFS: {
+ WL_INFORM_MEM(("Found active iface = %s, can't support new iface = %s\n",
+ wl_iftype_to_str(sec_wl_if_type), wl_iftype_to_str(new_wl_iftype)));
+ ret = BCME_ERROR;
+ break;
+ }
+ case WL_IF_POLICY_LP: {
+ WL_INFORM_MEM(("Remove active sec data interface, allow incoming iface\n"));
+ /* Delete existing data iface and allow incoming sec iface */
+ del_iface = true;
+ break;
+ }
+ case WL_IF_POLICY_ROLE_PRIORITY: {
+ WL_INFORM_MEM(("Existing iface = %s (%d) and new iface = %s (%d)\n",
+ wl_iftype_to_str(sec_wl_if_type),
+ cfg->iface_data.priority[sec_wl_if_type],
+ wl_iftype_to_str(new_wl_iftype),
+ cfg->iface_data.priority[new_wl_iftype]));
+ if (cfg->iface_data.priority[new_wl_iftype] >
+ cfg->iface_data.priority[sec_wl_if_type]) {
+ del_iface = true;
+ } else {
+ WL_ERR(("Can't support new iface = %s\n",
+ wl_iftype_to_str(new_wl_iftype)));
+ ret = BCME_ERROR;
+ }
+ break;
+ }
+ default: {
+ WL_ERR(("Unsupported interface policy = %d\n",
+ cfg->iface_data.policy));
+ return BCME_ERROR;
+ }
+ }
+ if (del_iface) {
+ ret = wl_cfg80211_delete_iface(cfg, sec_wl_if_type);
+ }
+ return ret;
+}
+
+/* Handle discovery ifaces based on policy */
+s32
+wl_cfg80211_disc_if_mgmt(struct bcm_cfg80211 *cfg,
+ wl_iftype_t new_wl_iftype, bool *disable_nan, bool *disable_p2p)
+{
+ s32 ret = BCME_OK;
+ wl_iftype_t sec_wl_if_type =
+ wl_cfg80211_get_sec_iface(cfg);
+ *disable_p2p = false;
+ *disable_nan = false;
+
+ if (sec_wl_if_type == WL_IF_TYPE_NAN &&
+ new_wl_iftype == WL_IF_TYPE_NAN) {
+ /* Multi NDP is allowed irrespective of Policy */
+ return BCME_OK;
+ }
+
+ /*
+ * Check for any policy conflicts with active secondary
+ * interface for incoming discovery iface
+ */
+ if ((sec_wl_if_type != WL_IFACE_NOT_PRESENT) &&
+ (is_discovery_iface(new_wl_iftype))) {
+ switch (cfg->iface_data.policy) {
+ case WL_IF_POLICY_CUSTOM: {
+ if (sec_wl_if_type == WL_IF_TYPE_NAN &&
+ new_wl_iftype == WL_IF_TYPE_P2P_DISC) {
+ WL_INFORM_MEM(("Allow P2P Discovery with active NDP\n"));
+ /* No further checks are required. */
+ return BCME_OK;
+ }
+ /*
+ * Intentional fall through to default policy
+ * as for AP and associated ifaces, both are same
+ */
+ }
+ /* fall through */
+ case WL_IF_POLICY_DEFAULT: {
+ if (sec_wl_if_type == WL_IF_TYPE_AP) {
+ WL_INFORM_MEM(("AP is active, cant support new iface\n"));
+ ret = BCME_ERROR;
+ } else if (sec_wl_if_type == WL_IF_TYPE_P2P_GC ||
+ sec_wl_if_type == WL_IF_TYPE_P2P_GO) {
+ if (new_wl_iftype == WL_IF_TYPE_P2P_DISC) {
+ /*
+ * Associated discovery case,
+ * Fall through
+ */
+ } else {
+ /* Active iface is present, returning error */
+ WL_INFORM_MEM(("P2P group is active,"
+ " cant support new iface\n"));
+ ret = BCME_ERROR;
+ }
+ } else if (sec_wl_if_type == WL_IF_TYPE_NAN) {
+ ret = wl_cfg80211_delete_iface(cfg, sec_wl_if_type);
+ }
+ break;
+ }
+ case WL_IF_POLICY_FCFS: {
+ WL_INFORM_MEM(("Can't support new iface = %s\n",
+ wl_iftype_to_str(new_wl_iftype)));
+ ret = BCME_ERROR;
+ break;
+ }
+ case WL_IF_POLICY_LP: {
+ /* Delete existing data iface n allow incoming sec iface */
+ WL_INFORM_MEM(("Remove active sec data interface = %s\n",
+ wl_iftype_to_str(sec_wl_if_type)));
+ ret = wl_cfg80211_delete_iface(cfg,
+ sec_wl_if_type);
+ break;
+ }
+ case WL_IF_POLICY_ROLE_PRIORITY: {
+ WL_INFORM_MEM(("Existing iface = %s (%d) and new iface = %s (%d)\n",
+ wl_iftype_to_str(sec_wl_if_type),
+ cfg->iface_data.priority[sec_wl_if_type],
+ wl_iftype_to_str(new_wl_iftype),
+ cfg->iface_data.priority[new_wl_iftype]));
+ if (cfg->iface_data.priority[new_wl_iftype] >
+ cfg->iface_data.priority[sec_wl_if_type]) {
+ WL_INFORM_MEM(("Remove active sec data iface\n"));
+ ret = wl_cfg80211_delete_iface(cfg,
+ sec_wl_if_type);
+ } else {
+ WL_ERR(("Can't support new iface = %s"
+ " due to low priority\n",
+ wl_iftype_to_str(new_wl_iftype)));
+ ret = BCME_ERROR;
+ }
+ break;
+ }
+ default: {
+ WL_ERR(("Unsupported policy\n"));
+ return BCME_ERROR;
+ }
+ }
+ } else {
+ /*
+ * Handle incoming new secondary iface request,
+ * irrespective of existing discovery ifaces
+ */
+ if ((cfg->iface_data.policy == WL_IF_POLICY_CUSTOM) &&
+ (new_wl_iftype == WL_IF_TYPE_NAN)) {
+ WL_INFORM_MEM(("Allow NAN Data Path\n"));
+ /* No further checks are required. */
+ return BCME_OK;
+ }
+ }
+
+ /* Check for any conflicting discovery iface */
+ switch (new_wl_iftype) {
+ case WL_IF_TYPE_P2P_DISC:
+ case WL_IF_TYPE_P2P_GO:
+ case WL_IF_TYPE_P2P_GC: {
+ *disable_nan = true;
+ break;
+ }
+ case WL_IF_TYPE_NAN_NMI:
+ case WL_IF_TYPE_NAN: {
+ *disable_p2p = true;
+ break;
+ }
+ case WL_IF_TYPE_STA:
+ case WL_IF_TYPE_AP: {
+ *disable_nan = true;
+ *disable_p2p = true;
+ break;
+ }
+ default: {
+ WL_ERR(("Unsupported\n"));
+ return BCME_ERROR;
+ }
+ }
+ return ret;
+}
+
+bool
+wl_cfg80211_is_associated_discovery(struct bcm_cfg80211 *cfg,
+ wl_iftype_t new_wl_iftype)
+{
+ struct net_device *p2p_ndev = NULL;
+ p2p_ndev = wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_CONNECTION1);
+
+ if (new_wl_iftype == WL_IF_TYPE_P2P_DISC && p2p_ndev &&
+ p2p_ndev->ieee80211_ptr &&
+ is_p2p_group_iface(p2p_ndev->ieee80211_ptr)) {
+ return true;
+ }
+#ifdef WL_NAN
+ else if ((new_wl_iftype == WL_IF_TYPE_NAN_NMI) &&
+ (wl_cfgnan_is_dp_active(bcmcfg_to_prmry_ndev(cfg)))) {
+ return true;
+ }
+#endif /* WL_NAN */
+ return false;
+}
+
+/* Handle incoming discovery iface request */
+s32
+wl_cfg80211_handle_discovery_config(struct bcm_cfg80211 *cfg,
+ wl_iftype_t new_wl_iftype)
+{
+ s32 ret = BCME_OK;
+ bool disable_p2p = false;
+ bool disable_nan = false;
+
+ wl_iftype_t active_sec_iface =
+ wl_cfg80211_get_sec_iface(cfg);
+
+ if (is_discovery_iface(new_wl_iftype) &&
+ (active_sec_iface != WL_IFACE_NOT_PRESENT)) {
+ if (wl_cfg80211_is_associated_discovery(cfg,
+ new_wl_iftype) == TRUE) {
+ WL_DBG(("Associate iface request is allowed= %s\n",
+ wl_iftype_to_str(new_wl_iftype)));
+ return ret;
+ }
+ }
+
+ ret = wl_cfg80211_disc_if_mgmt(cfg, new_wl_iftype,
+ &disable_nan, &disable_p2p);
+ if (ret != BCME_OK) {
+ WL_ERR(("Failed at disc iface mgmt, ret = %d\n", ret));
+ return ret;
+ }
+#ifdef WL_NANP2P
+ if (((new_wl_iftype == WL_IF_TYPE_P2P_DISC) && disable_nan) ||
+ ((new_wl_iftype == WL_IF_TYPE_NAN_NMI) && disable_p2p)) {
+ if ((cfg->nan_p2p_supported == TRUE) &&
+ (cfg->conc_disc == WL_NANP2P_CONC_SUPPORT)) {
+ WL_INFORM_MEM(("P2P + NAN conc is supported\n"));
+ disable_p2p = false;
+ disable_nan = false;
+ }
+ }
+#endif /* WL_NANP2P */
+
+ if (disable_nan) {
+#ifdef WL_NAN
+ /* Disable nan */
+ ret = wl_cfgnan_disable(cfg, NAN_CONCURRENCY_CONFLICT);
+ if (ret != BCME_OK) {
+ WL_ERR(("failed to disable nan, error[%d]\n", ret));
+ return ret;
+ }
+#endif /* WL_NAN */
+ }
+
+ if (disable_p2p) {
+ /* Disable p2p discovery */
+ ret = wl_cfg80211_deinit_p2p_discovery(cfg);
+ if (ret != BCME_OK) {
+ WL_ERR(("Failed to disable p2p_disc for allowing nan\n"));
+ return ret;
+ }
+ }
+ return ret;
+}
+
+/*
+* Check for any conflicting iface before adding iface.
+* Based on policy, either conflicting iface is removed
+* or new iface add request is blocked.
+*/
+s32
+wl_cfg80211_handle_if_role_conflict(struct bcm_cfg80211 *cfg,
+ wl_iftype_t new_wl_iftype)
+{
+ s32 ret = BCME_OK;
+
+ WL_INFORM_MEM(("Incoming iface = %s\n", wl_iftype_to_str(new_wl_iftype)));
+
+ if (!is_discovery_iface(new_wl_iftype)) {
+ /* Incoming data interface request */
+ if (wl_cfg80211_get_sec_iface(cfg) != WL_IFACE_NOT_PRESENT) {
+ /* active interface present - Apply interface data policy */
+ ret = wl_cfg80211_data_if_mgmt(cfg, new_wl_iftype);
+ if (ret != BCME_OK) {
+ WL_ERR(("if_mgmt fail:%d\n", ret));
+ return ret;
+ }
+ }
+ }
+ /* Apply discovery config */
+ ret = wl_cfg80211_handle_discovery_config(cfg, new_wl_iftype);
+ return ret;
+}
+#endif /* WL_IFACE_MGMT */
+
+#ifdef DHD_MONITOR_INTERFACE
+static struct wireless_dev *
+wl_cfg80211_add_monitor_if(struct wiphy *wiphy, const char *name)
{
#if defined(WL_ENABLE_P2P_IF) || defined(WL_CFG80211_P2P_DEV_IF)
- WL_INFORM(("wl_cfg80211_add_monitor_if: No more support monitor interface\n"));
+ WL_ERR(("wl_cfg80211_add_monitor_if: No more support monitor interface\n"));
return ERR_PTR(-EOPNOTSUPP);
#else
+ struct wireless *wdev;
struct net_device* ndev = NULL;
dhd_add_monitor(name, &ndev);
- WL_INFORM(("wl_cfg80211_add_monitor_if net device returned: 0x%p\n", ndev));
- return ndev_to_cfgdev(ndev);
+
+ wdev = kzalloc(sizeof(*wdev), GFP_KERNEL);
+ if (!wdev) {
+ WL_ERR(("wireless_dev alloc failed! \n"));
+ goto fail;
+ }
+
+ wdev->wiphy = wiphy;
+ wdev->iftype = iface_type;
+ ndev->ieee80211_ptr = wdev;
+ SET_NETDEV_DEV(ndev, wiphy_dev(wiphy));
+
+ WL_DBG(("wl_cfg80211_add_monitor_if net device returned: 0x%p\n", ndev));
+ return ndev->ieee80211_ptr;
#endif /* WL_ENABLE_P2P_IF || WL_CFG80211_P2P_DEV_IF */
+}
+#endif /* DHD_MONITOR_INTERFACE */
+
+static struct wireless_dev *
+wl_cfg80211_add_ibss(struct wiphy *wiphy, u16 wl_iftype, char const *name)
+{
+#ifdef WLAIBSS_MCHAN
+ /* AIBSS */
+ return bcm_cfg80211_add_ibss_if(wiphy, (char *)name);
+#else
+ /* Normal IBSS */
+ WL_ERR(("IBSS not supported on Virtual iface\n"));
+ return NULL;
+#endif // endif
+}
+
+s32
+wl_release_vif_macaddr(struct bcm_cfg80211 *cfg, u8 *mac_addr, u16 wl_iftype)
+{
+ struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg);
+ u16 org_toggle_bytes;
+ u16 cur_toggle_bytes;
+ u16 toggled_bit;
+
+ if (!ndev || !mac_addr || ETHER_ISNULLADDR(mac_addr)) {
+ return -EINVAL;
+ }
+ WL_DBG(("%s:Mac addr" MACDBG "\n",
+ __FUNCTION__, MAC2STRDBG(mac_addr)));
+
+#if defined(SPECIFIC_MAC_GEN_SCHEME)
+ if ((wl_iftype == WL_IF_TYPE_P2P_DISC) || (wl_iftype == WL_IF_TYPE_AP) ||
+ (wl_iftype == WL_IF_TYPE_P2P_GO) || (wl_iftype == WL_IF_TYPE_P2P_GC)) {
+ /* Avoid invoking release mac addr code for interfaces using
+ * fixed mac addr.
+ */
+ return BCME_OK;
+ }
+#else /* SPECIFIC_MAC_GEN_SCHEME */
+ if (wl_iftype == WL_IF_TYPE_P2P_DISC) {
+ return BCME_OK;
+ }
+#endif /* SPECIFIC_MAC_GEN_SCHEME */
+
+ /* Fetch last two bytes of mac address */
+ org_toggle_bytes = ntoh16(*((u16 *)&ndev->dev_addr[4]));
+ cur_toggle_bytes = ntoh16(*((u16 *)&mac_addr[4]));
+
+ toggled_bit = (org_toggle_bytes ^ cur_toggle_bytes);
+ WL_DBG(("org_toggle_bytes:%04X cur_toggle_bytes:%04X\n",
+ org_toggle_bytes, cur_toggle_bytes));
+ if (toggled_bit & cfg->vif_macaddr_mask) {
+ /* This toggled_bit is marked in the used mac addr
+ * mask. Clear it.
+ */
+ cfg->vif_macaddr_mask &= ~toggled_bit;
+ WL_INFORM(("MAC address - " MACDBG " released. toggled_bit:%04X vif_mask:%04X\n",
+ MAC2STRDBG(mac_addr), toggled_bit, cfg->vif_macaddr_mask));
+ } else {
+ WL_ERR(("MAC address - " MACDBG " not found in the used list."
+ " toggled_bit:%04x vif_mask:%04x\n", MAC2STRDBG(mac_addr),
+ toggled_bit, cfg->vif_macaddr_mask));
+ return -EINVAL;
+ }
+
+ return BCME_OK;
+}
+
+s32
+wl_get_vif_macaddr(struct bcm_cfg80211 *cfg, u16 wl_iftype, u8 *mac_addr)
+{
+ struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg);
+ u16 toggle_mask;
+ u16 toggle_bit;
+ u16 toggle_bytes;
+ u16 used;
+ u32 offset = 0;
+ /* Toggle mask starts from MSB of second last byte */
+ u16 mask = 0x8000;
+
+ if (!mac_addr) {
+ return -EINVAL;
+ }
+
+ memcpy(mac_addr, ndev->dev_addr, ETH_ALEN);
+/*
+ * VIF MAC address managment
+ * P2P Device addres: Primary MAC with locally admin. bit set
+ * P2P Group address/NAN NMI/Softap/NAN DPI: Primary MAC addr
+ * with local admin bit set and one additional bit toggled.
+ * cfg->vif_macaddr_mask will hold the info regarding the mac address
+ * released. Ensure to call wl_release_vif_macaddress to free up
+ * the mac address.
+ */
+#if defined(SPECIFIC_MAC_GEN_SCHEME)
+ if (wl_iftype == WL_IF_TYPE_P2P_DISC || wl_iftype == WL_IF_TYPE_AP) {
+ mac_addr[0] |= 0x02;
+ } else if ((wl_iftype == WL_IF_TYPE_P2P_GO) || (wl_iftype == WL_IF_TYPE_P2P_GC)) {
+ mac_addr[0] |= 0x02;
+ mac_addr[4] ^= 0x80;
+ }
+#else
+ if (wl_iftype == WL_IF_TYPE_P2P_DISC) {
+ mac_addr[0] |= 0x02;
+ }
+#endif /* SEPCIFIC_MAC_GEN_SCHEME */
+ else {
+ /* For locally administered mac addresses, we keep the
+ * OUI part constant and just work on the last two bytes.
+ */
+ mac_addr[0] |= 0x02;
+ toggle_mask = cfg->vif_macaddr_mask;
+ toggle_bytes = ntoh16(*((u16 *)&mac_addr[4]));
+ do {
+ used = toggle_mask & mask;
+ if (!used) {
+ /* Use this bit position */
+ toggle_bit = mask >> offset;
+ toggle_bytes ^= toggle_bit;
+ cfg->vif_macaddr_mask |= toggle_bit;
+ WL_DBG(("toggle_bit:%04X toggle_bytes:%04X toggle_mask:%04X\n",
+ toggle_bit, toggle_bytes, cfg->vif_macaddr_mask));
+ /* Macaddress are stored in network order */
+ mac_addr[5] = *((u8 *)&toggle_bytes);
+ mac_addr[4] = *(((u8 *)&toggle_bytes + 1));
+ break;
+ }
+
+ /* Shift by one */
+ toggle_mask = toggle_mask << 0x1;
+ offset++;
+ if (offset > MAX_VIF_OFFSET) {
+ /* We have used up all macaddresses. Something wrong! */
+ WL_ERR(("Entire range of macaddress used up.\n"));
+ ASSERT(0);
+ break;
+ }
+ } while (true);
+ }
+ WL_INFORM_MEM(("Get virtual I/F mac addr: "MACDBG"\n", MAC2STRDBG(mac_addr)));
+ return 0;
+}
+#ifdef DNGL_AXI_ERROR_LOGGING
+static s32
+_wl_cfg80211_check_axi_error(struct bcm_cfg80211 *cfg)
+{
+ s32 ret = BCME_OK;
+ dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+ hnd_ext_trap_hdr_t *hdr;
+ int axi_host_error_size;
+ uint8 *new_dst;
+ uint32 *ext_data = dhd->extended_trap_data;
+ struct file *fp = NULL;
+ char *filename = DHD_COMMON_DUMP_PATH
+ DHD_DUMP_AXI_ERROR_FILENAME
+ DHD_DUMP_HAL_FILENAME_SUFFIX;
+
+ WL_ERR(("%s: starts to read %s. Axi error \n", __FUNCTION__, filename));
+
+ fp = filp_open(filename, O_RDONLY, 0);
+
+ if (IS_ERR(fp) || (fp == NULL)) {
+ WL_ERR(("%s: Couldn't read the file, err %ld,File [%s] No previous axi error \n",
+ __FUNCTION__, PTR_ERR(fp), filename));
+ return ret;
+ }
+
+ kernel_read_compat(fp, fp->f_pos, (char *)dhd->axi_err_dump, sizeof(dhd_axi_error_dump_t));
+ filp_close(fp, NULL);
+
+ /* Delete axi error info file */
+ if (dhd_file_delete(filename) < 0) {
+ WL_ERR(("%s(): Failed to delete file: %s\n", __FUNCTION__, filename));
+ return ret;
+ }
+ WL_ERR(("%s(): Success to delete file: %s\n", __FUNCTION__, filename));
+
+ if (dhd->axi_err_dump->etd_axi_error_v1.signature != HND_EXT_TRAP_AXIERROR_SIGNATURE) {
+ WL_ERR(("%s: Invalid AXI signature: 0x%x\n",
+ __FUNCTION__, dhd->axi_err_dump->etd_axi_error_v1.signature));
+ }
+
+ /* First word is original trap_data */
+ ext_data++;
+
+ /* Followed by the extended trap data header */
+ hdr = (hnd_ext_trap_hdr_t *)ext_data;
+ new_dst = hdr->data;
+
+ axi_host_error_size = sizeof(dhd->axi_err_dump->axid)
+ + sizeof(dhd->axi_err_dump->fault_address);
+
+ /* TAG_TRAP_AXI_HOST_INFO tlv : host's axid, fault address */
+ new_dst = bcm_write_tlv(TAG_TRAP_AXI_HOST_INFO,
+ (const void *)dhd->axi_err_dump,
+ axi_host_error_size, new_dst);
+
+ /* TAG_TRAP_AXI_ERROR tlv */
+ new_dst = bcm_write_tlv(TAG_TRAP_AXI_ERROR,
+ (const void *)&dhd->axi_err_dump->etd_axi_error_v1,
+ sizeof(dhd->axi_err_dump->etd_axi_error_v1), new_dst);
+ hdr->len = new_dst - hdr->data;
+
+ dhd->dongle_trap_occured = TRUE;
+#ifdef WL_CFGVENDOR_SEND_HANG_EVENT
+ copy_hang_info_trap(dhd);
+#endif /* WL_CFGVENDOR_SEND_HANG_EVENT */
+ memset(dhd->axi_err_dump, 0, sizeof(dhd_axi_error_dump_t));
+
+ dhd->hang_reason = HANG_REASON_DONGLE_TRAP;
+ net_os_send_hang_message(bcmcfg_to_prmry_ndev(cfg));
+ ret = BCME_ERROR;
+ return ret;
+}
+#endif /* DNGL_AXI_ERROR_LOGGING */
+
+/* All Android/Linux private/Vendor Interface calls should make
+ * use of below API for interface creation.
+ */
+struct wireless_dev *
+wl_cfg80211_add_if(struct bcm_cfg80211 *cfg,
+ struct net_device *primary_ndev,
+ wl_iftype_t wl_iftype, const char *name, u8 *mac)
+{
+ u8 mac_addr[ETH_ALEN];
+ s32 err = -ENODEV;
+ struct wireless_dev *wdev = NULL;
+ struct wiphy *wiphy;
+ s32 wl_mode;
+ dhd_pub_t *dhd;
+ wl_iftype_t macaddr_iftype = wl_iftype;
+ char *tmp = NULL;
+ char vif_name[IFNAMSIZ] = {0};
+ u8 vif_mac_addr[ETH_ALEN] = {0};
+
+ WL_INFORM_MEM(("if name: %s, wl_iftype:%d \n",
+ name ? name : "NULL", wl_iftype));
+ if (!cfg || !primary_ndev || !name) {
+ WL_ERR(("cfg/ndev/name ptr null\n"));
+ return NULL;
+ }
+ if (wl_cfg80211_get_wdev_from_ifname(cfg, name)) {
+ WL_ERR(("Interface name %s exists!\n", name));
+ return NULL;
+ }
+
+ wiphy = bcmcfg_to_wiphy(cfg);
+ dhd = (dhd_pub_t *)(cfg->pub);
+ if (!dhd) {
+ return NULL;
+ }
+
+ if ((wl_mode = wl_iftype_to_mode(wl_iftype)) < 0) {
+ return NULL;
+ }
+ mutex_lock(&cfg->if_sync);
+#ifdef WL_NAN
+ if (wl_iftype == WL_IF_TYPE_NAN) {
+ /*
+ * Bypass the role conflict check for NDI and handle it
+ * from dp req and dp resp context
+ * because in aware comms, ndi gets created soon after nan enable.
+ */
+ } else
+#endif /* WL_NAN */
+#ifdef WL_IFACE_MGMT
+ if ((err = wl_cfg80211_handle_if_role_conflict(cfg, wl_iftype)) < 0) {
+ mutex_unlock(&cfg->if_sync);
+ return NULL;
+ }
+#endif /* WL_IFACE_MGMT */
+#ifdef DNGL_AXI_ERROR_LOGGING
+ /* Check the previous smmu fault error */
+ if ((err = _wl_cfg80211_check_axi_error(cfg)) < 0) {
+ mutex_unlock(&cfg->if_sync);
+ return NULL;
+ }
+#endif /* DNGL_AXI_ERROR_LOGGING */
+ /* Protect the interace op context */
+ /* Do pre-create ops */
+ wl_cfg80211_iface_state_ops(primary_ndev->ieee80211_ptr, WL_IF_CREATE_REQ,
+ wl_iftype, wl_mode);
+
+ if (strnicmp(name, SOFT_AP_IF_NAME, strlen(SOFT_AP_IF_NAME)) == 0) {
+ macaddr_iftype = WL_IF_TYPE_AP;
+ }
+
+ tmp = strchr(name, ' ');
+
+ /* For MBSS AP create_interface, command will be
+ * create_interface <interface_name> <ap_mac_addr>
+ * parsing the vif_name and vif_mac_addr from char name
+ */
+ if (tmp) {
+ int i;
+
+ /* skip space from delim after finding char */
+ tmp++;
+ mac = tmp;
+
+ for (i = 0; i < ETH_ALEN; i++) {
+ vif_mac_addr[i] = (hex_to_bin(mac[i * 3]) << 4)
+ | hex_to_bin(mac[i * 3 + 1]);
+ }
+
+ for (i = 0; i <= strlen(name); i++) {
+ if (*(name + i) != ' ') {
+ *(vif_name + i) = *(name + i);
+ } else {
+ *(vif_name + i) = '\0';
+ break;
+ }
+ }
+ }
+
+ if (mac) {
+ /* If mac address is provided, use that */
+ if (tmp != NULL)
+ memcpy(mac_addr, vif_mac_addr, ETH_ALEN);
+ else
+ memcpy(mac_addr, mac, ETH_ALEN);
+ } else if ((wl_get_vif_macaddr(cfg, macaddr_iftype, mac_addr) != BCME_OK)) {
+ /* Fetch the mac address to be used for virtual interface */
+ err = -EINVAL;
+ goto fail;
+ }
+
+ switch (wl_iftype) {
+ case WL_IF_TYPE_IBSS:
+ wdev = wl_cfg80211_add_ibss(wiphy, wl_iftype, name);
+ break;
+#ifdef DHD_MONITOR_INTERFACE
+ case WL_IF_TYPE_MONITOR:
+ wdev = wl_cfg80211_add_monitor_if(wiphy, name);
+ break;
+#endif /* DHD_MONITOR_INTERFACE */
+ case WL_IF_TYPE_STA:
+ case WL_IF_TYPE_AP:
+ case WL_IF_TYPE_NAN:
+ if (cfg->iface_cnt >= (IFACE_MAX_CNT - 1)) {
+ WL_ERR(("iface_cnt exceeds max cnt. created iface_cnt: %d\n",
+ cfg->iface_cnt));
+ err = -ENOTSUPP;
+ goto fail;
+ }
+ if (*vif_name)
+ wdev = wl_cfg80211_create_iface(cfg->wdev->wiphy,
+ wl_iftype, mac_addr, vif_name);
+ else
+ wdev = wl_cfg80211_create_iface(cfg->wdev->wiphy,
+ wl_iftype, mac_addr, name);
+ break;
+ case WL_IF_TYPE_P2P_DISC:
+ case WL_IF_TYPE_P2P_GO:
+ /* Intentional fall through */
+ case WL_IF_TYPE_P2P_GC:
+ if (cfg->p2p_supported) {
+ wdev = wl_cfg80211_p2p_if_add(cfg, wl_iftype,
+ name, mac_addr, &err);
+ break;
+ }
+ /* Intentionally fall through for unsupported interface
+ * handling when firmware doesn't support p2p
+ */
+ /* Intentional fall through */
+ default:
+ WL_ERR(("Unsupported interface type\n"));
+ err = -ENOTSUPP;
+ goto fail;
+ }
+
+ if (!wdev) {
+ WL_ERR(("vif create failed. err:%d\n", err));
+ if (err != -ENOTSUPP) {
+ err = -ENODEV;
+ }
+ goto fail;
+ }
+
+ /* Ensure decrementing in case of failure */
+ cfg->vif_count++;
+
+ wl_cfg80211_iface_state_ops(wdev,
+ WL_IF_CREATE_DONE, wl_iftype, wl_mode);
+
+ WL_INFORM_MEM(("Vif created. dev->ifindex:%d"
+ " cfg_iftype:%d, vif_count:%d\n",
+ (wdev->netdev ? wdev->netdev->ifindex : 0xff),
+ wdev->iftype, cfg->vif_count));
+ mutex_unlock(&cfg->if_sync);
+ return wdev;
+
+fail:
+ wl_cfg80211_iface_state_ops(primary_ndev->ieee80211_ptr,
+ WL_IF_DELETE_REQ, wl_iftype, wl_mode);
+
+ if (err != -ENOTSUPP) {
+ /* For non-supported interfaces, just return error and
+ * skip below recovery steps.
+ */
+#ifdef WL_CFGVENDOR_SEND_HANG_EVENT
+ wl_copy_hang_info_if_falure(primary_ndev, HANG_REASON_IFACE_DEL_FAILURE, err);
+#endif /* WL_CFGVENDOR_SEND_HANG_EVENT */
+ SUPP_LOG(("IF_ADD fail. err:%d\n", err));
+ wl_flush_fw_log_buffer(primary_ndev, FW_LOGSET_MASK_ALL);
+ if (dhd_query_bus_erros(dhd)) {
+ goto exit;
+ }
+ dhd->iface_op_failed = TRUE;
+#if defined(DHD_DEBUG) && defined(BCMPCIE) && defined(DHD_FW_COREDUMP)
+ if (dhd->memdump_enabled) {
+ dhd->memdump_type = DUMP_TYPE_IFACE_OP_FAILURE;
+ dhd_bus_mem_dump(dhd);
+ }
+#endif /* DHD_DEBUG && BCMPCIE && DHD_FW_COREDUMP */
+#if defined(OEM_ANDROID)
+ dhd->hang_reason = HANG_REASON_IFACE_ADD_FAILURE;
+ net_os_send_hang_message(bcmcfg_to_prmry_ndev(cfg));
+#endif /* BCMDONGLEHOST && OEM_ANDROID */
+ }
+exit:
+ mutex_unlock(&cfg->if_sync);
+ return NULL;
}
static bcm_struct_cfgdev *
@@ -1470,623 +3385,503 @@
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0))
unsigned char name_assign_type,
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)) */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0))
enum nl80211_iftype type,
-#else
- enum nl80211_iftype type, u32 *flags,
-#endif
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0))
+ u32 *flags,
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) */
struct vif_params *params)
{
- s32 err = -ENODEV;
- s32 timeout = -1;
- s32 wlif_type = -1;
- s32 mode = 0;
- s32 val = 0;
- s32 cfg_type;
- s32 dhd_mode = 0;
- chanspec_t chspec;
- struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
+ u16 wl_iftype;
+ u16 wl_mode;
struct net_device *primary_ndev;
- struct net_device *new_ndev;
- struct ether_addr primary_mac;
-#ifdef WL_VIRTUAL_APSTA
- bcm_struct_cfgdev *new_cfgdev;
-#endif /* WL_VIRTUAL_APSTA */
-#ifdef PROP_TXSTATUS_VSDB
-#if defined(BCMSDIO) || defined(BCMDBUS)
- s32 up = 1;
- dhd_pub_t *dhd;
- bool enabled;
-#endif /* defined(BCMSDIO) || defined(BCMDBUS) */
-#endif /* PROP_TXSTATUS_VSDB */
-#if defined(SUPPORT_AP_POWERSAVE)
- dhd_pub_t *dhd;
-#endif /* SUPPORT_AP_POWERSAVE */
+ struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
+ struct wireless_dev *wdev;
- if (!cfg)
+ WL_DBG(("Enter iftype: %d\n", type));
+ if (!cfg) {
return ERR_PTR(-EINVAL);
-
-#ifdef PROP_TXSTATUS_VSDB
-#if defined(BCMSDIO) || defined(BCMDBUS)
- dhd = (dhd_pub_t *)(cfg->pub);
-#endif /* defined(BCMSDIO) || defined(BCMDBUS) */
-#endif /* PROP_TXSTATUS_VSDB */
-#if defined(SUPPORT_AP_POWERSAVE)
- dhd = (dhd_pub_t *)(cfg->pub);
-#endif /* SUPPORT_AP_POWERSAVE */
+ }
/* Use primary I/F for sending cmds down to firmware */
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) {
- case NL80211_IFTYPE_ADHOC:
-#ifdef WLAIBSS_MCHAN
- return bcm_cfg80211_add_ibss_if(wiphy, (char *)name);
-#endif /* WLAIBSS_MCHAN */
- case NL80211_IFTYPE_AP_VLAN:
- case NL80211_IFTYPE_WDS:
- case NL80211_IFTYPE_MESH_POINT:
- WL_ERR(("Unsupported interface type\n"));
- mode = WL_MODE_IBSS;
- return NULL;
- case NL80211_IFTYPE_MONITOR:
- 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_STATION:
-#ifdef WL_VIRTUAL_APSTA
-#ifdef WLAIBSS_MCHAN
- if (cfg->ibss_cfgdev) {
- WL_ERR(("AIBSS is already operational. "
- " AIBSS & DUALSTA can't be used together \n"));
- return ERR_PTR(-ENOMEM);
- }
-#endif /* WLAIBSS_MCHAN */
- if (!name) {
- WL_ERR(("Interface name not provided \n"));
- return ERR_PTR(-ENODEV);
- }
-
- if (wl_cfgp2p_vif_created(cfg)) {
- WL_ERR(("Could not create new iface."
- "Already one p2p interface is running"));
- return ERR_PTR(-ENODEV);
- }
- new_cfgdev = wl_cfg80211_create_iface(cfg->wdev->wiphy,
- NL80211_IFTYPE_STATION, NULL, name);
- if (!new_cfgdev)
- return ERR_PTR(-ENOMEM);
- else
- return new_cfgdev;
-#endif /* WL_VIRTUAL_APSTA */
- case NL80211_IFTYPE_P2P_CLIENT:
- wlif_type = WL_P2P_IF_CLIENT;
- mode = WL_MODE_BSS;
- break;
- case NL80211_IFTYPE_P2P_GO:
- case NL80211_IFTYPE_AP:
- wlif_type = WL_P2P_IF_GO;
- mode = WL_MODE_AP;
- break;
- default:
- WL_ERR(("Unsupported interface type\n"));
- return ERR_PTR(-ENODEV);
- break;
- }
-
if (!name) {
- WL_ERR(("name is NULL\n"));
+ WL_ERR(("Interface name not provided \n"));
+ return ERR_PTR(-EINVAL);
+ }
+
+ if (cfg80211_to_wl_iftype(type, &wl_iftype, &wl_mode) < 0) {
+ return ERR_PTR(-EINVAL);
+ }
+
+ wdev = wl_cfg80211_add_if(cfg, primary_ndev, wl_iftype, name, NULL);
+ if (unlikely(!wdev)) {
return ERR_PTR(-ENODEV);
}
- if (cfg->p2p_supported && (wlif_type != -1)) {
- ASSERT(cfg->p2p); /* ensure expectation of p2p initialization */
-#ifdef PROP_TXSTATUS_VSDB
-#if defined(BCMSDIO) || defined(BCMDBUS)
- if (!dhd)
- return ERR_PTR(-ENODEV);
-#endif /* defined(BCMSDIO) || defined(BCMDBUS) */
-#endif /* PROP_TXSTATUS_VSDB */
- if (!cfg->p2p)
- return ERR_PTR(-ENODEV);
+ return wdev_to_cfgdev(wdev);
+}
- if (cfg->cfgdev_bssidx != -1) {
- WL_ERR(("Failed to start p2p, Maximum no of interface reached"));
- return ERR_PTR(-ENODEV);
- }
-
- 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(cfg, &primary_mac);
- }
-
- strncpy(cfg->p2p->vir_ifname, name, IFNAMSIZ - 1);
- cfg->p2p->vir_ifname[IFNAMSIZ - 1] = '\0';
-
- wl_cfg80211_scan_abort(cfg);
-#ifdef PROP_TXSTATUS_VSDB
-#if defined(BCMSDIO) || defined(BCMDBUS)
- 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 /* defined(BCMSDIO) || defined(BCMDBUS) */
-#endif /* PROP_TXSTATUS_VSDB */
-
- /* Dual p2p doesn't support multiple P2PGO interfaces,
- * p2p_go_count is the counter for GO creation
- * requests.
- */
- if ((cfg->p2p->p2p_go_count > 0) && (type == NL80211_IFTYPE_P2P_GO)) {
- WL_ERR(("Fw doesnot support multiple Go"));
- return ERR_PTR(-ENOMEM);
- }
- /* In concurrency case, STA may be already associated in a particular channel.
- * so retrieve the current channel of primary interface and then start the virtual
- * interface on that.
- */
- chspec = wl_cfg80211_get_shared_freq(wiphy);
-
- /* For P2P mode, use P2P-specific driver features to create the
- * bss: "cfg p2p_ifadd"
- */
- 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(primary_ndev, "mpc", 0);
- cfg_type = wl_cfgp2p_get_conn_idx(cfg);
- if (cfg_type == BCME_ERROR) {
- wl_clr_p2p_status(cfg, IF_ADDING);
- WL_ERR(("Failed to get connection idx for p2p interface"));
- goto fail;
- }
- err = wl_cfgp2p_ifadd(cfg, wl_to_p2p_bss_macaddr(cfg, cfg_type),
- 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(cfg->netif_change_event,
- ((wl_get_p2p_status(cfg, IF_ADDING) == false) &&
- (cfg->if_event_info.valid)), msecs_to_jiffies(MAX_WAIT_TIME));
-
- 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)
- */
- new_ndev = wl_cfg80211_allocate_if(cfg, event->ifidx, cfg->p2p->vir_ifname,
- event->mac, event->bssidx, event->name);
- if (new_ndev == NULL)
- goto fail;
-
- wl_to_p2p_bss_ndev(cfg, cfg_type) = new_ndev;
- wl_to_p2p_bss_bssidx(cfg, cfg_type) = event->bssidx;
- vwdev = kzalloc(sizeof(*vwdev), GFP_KERNEL);
- if (unlikely(!vwdev)) {
- WL_ERR(("Could not allocate wireless device\n"));
- err = -ENOMEM;
- goto fail;
- }
- vwdev->wiphy = cfg->wdev->wiphy;
- WL_INFORM(("virtual interface(%s) is created\n", cfg->p2p->vir_ifname));
- if (type == NL80211_IFTYPE_P2P_GO) {
- cfg->p2p->p2p_go_count++;
- }
- vwdev->iftype = type;
- 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);
- 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);
- err = -ENODEV;
- goto fail;
- }
- err = wl_alloc_netinfo(cfg, new_ndev, vwdev, mode, pm_mode, event->bssidx);
- if (unlikely(err != 0)) {
- WL_ERR(("Allocation of netinfo failed (%d) \n", err));
- goto fail;
- }
- val = 1;
- /* Disable firmware roaming for P2P interface */
- wldev_iovar_setint(new_ndev, "roam_off", val);
-#ifdef WL11ULB
- if (cfg->p2p_wdev && is_p2p_group_iface(new_ndev->ieee80211_ptr)) {
- u32 ulb_bw = wl_cfg80211_get_ulb_bw(cfg->p2p_wdev);
- if (ulb_bw) {
- /* Apply ULB BW settings on the newly spawned interface */
- WL_DBG(("[ULB] Applying ULB BW for the newly"
- "created P2P interface \n"));
- if (wl_cfg80211_set_ulb_bw(new_ndev,
- ulb_bw, new_ndev->name) < 0) {
- /*
- * If ulb_bw set failed, fail the iface creation.
- * wl_dealloc_netinfo_by_wdev will be called by the
- * unregister notifier.
- */
- wl_cfg80211_remove_if(cfg, event->ifidx, new_ndev);
- err = -EINVAL;
- goto fail;
- }
- }
- }
-#endif /* WL11ULB */
-
- 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));
-#ifdef SUPPORT_AP_POWERSAVE
- if (mode == WL_MODE_AP) {
- dhd_set_ap_powersave(dhd, 0, TRUE);
- }
-#endif /* SUPPORT_AP_POWERSAVE */
- 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 */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0))
- INIT_COMPLETION(cfg->iface_disable);
+static s32
+wl_cfg80211_del_ibss(struct wiphy *wiphy, struct wireless_dev *wdev)
+{
+ WL_INFORM_MEM(("del ibss wdev_ptr:%p\n", wdev));
+#ifdef WLAIBSS_MCHAN
+ /* AIBSS */
+ return bcm_cfg80211_del_ibss_if(wiphy, wdev);
#else
- init_completion(&cfg->iface_disable);
-#endif
- return ndev_to_cfgdev(new_ndev);
+ /* Normal IBSS */
+ return wl_cfg80211_del_iface(wiphy, wdev);
+#endif // endif
+}
+
+s32
+wl_cfg80211_del_if(struct bcm_cfg80211 *cfg, struct net_device *primary_ndev,
+ struct wireless_dev *wdev, char *ifname)
+{
+ int ret = BCME_OK;
+ mutex_lock(&cfg->if_sync);
+ ret = _wl_cfg80211_del_if(cfg, primary_ndev, wdev, ifname);
+ mutex_unlock(&cfg->if_sync);
+ return ret;
+}
+
+s32
+_wl_cfg80211_del_if(struct bcm_cfg80211 *cfg, struct net_device *primary_ndev,
+ struct wireless_dev *wdev, char *ifname)
+{
+ int ret = BCME_OK;
+ s32 bssidx;
+ struct wiphy *wiphy;
+ u16 wl_mode;
+ u16 wl_iftype;
+ struct net_info *netinfo;
+ dhd_pub_t *dhd;
+ BCM_REFERENCE(dhd);
+
+ if (!cfg) {
+ return -EINVAL;
+ }
+
+ dhd = (dhd_pub_t *)(cfg->pub);
+
+ if (!wdev && ifname) {
+ /* If only ifname is provided, fetch corresponding wdev ptr from our
+ * internal data structure
+ */
+ wdev = wl_cfg80211_get_wdev_from_ifname(cfg, ifname);
+ }
+
+ /* Check whether we have a valid wdev ptr */
+ if (unlikely(!wdev)) {
+ WL_ERR(("wdev not found. '%s' does not exists\n", ifname));
+ return -ENODEV;
+ }
+
+ WL_INFORM_MEM(("del vif. wdev cfg_iftype:%d\n", wdev->iftype));
+
+ wiphy = wdev->wiphy;
+#ifdef WL_CFG80211_P2P_DEV_IF
+ if (wdev->iftype == NL80211_IFTYPE_P2P_DEVICE) {
+ /* p2p discovery would be de-initialized in stop p2p
+ * device context/from other virtual i/f creation context
+ * so netinfo list may not have any node corresponding to
+ * discovery I/F. Handle it before bssidx check.
+ */
+ ret = wl_cfg80211_p2p_if_del(wiphy, wdev);
+ if (unlikely(ret)) {
+ goto exit;
} else {
- wl_clr_p2p_status(cfg, IF_ADDING);
- WL_ERR((" virtual interface(%s) is not created \n", cfg->p2p->vir_ifname));
-
- WL_ERR(("left timeout : %d\n", timeout));
- WL_ERR(("IF_ADDING status : %d\n", wl_get_p2p_status(cfg, IF_ADDING)));
- WL_ERR(("event valid : %d\n", cfg->if_event_info.valid));
-
- wl_clr_p2p_status(cfg, GO_NEG_PHASE);
- wl_set_p2p_status(cfg, IF_DELETING);
-
- err = wl_cfgp2p_ifdel(cfg, wl_to_p2p_bss_macaddr(cfg, cfg_type));
- if (err == BCME_OK) {
- timeout = wait_event_interruptible_timeout(cfg->netif_change_event,
- ((wl_get_p2p_status(cfg, IF_DELETING) == false) &&
- (cfg->if_event_info.valid)),
- msecs_to_jiffies(MAX_WAIT_TIME));
- if (timeout > 0 && !wl_get_p2p_status(cfg, IF_DELETING) &&
- cfg->if_event_info.valid) {
- WL_ERR(("IFDEL operation done\n"));
- } else {
- WL_ERR(("IFDEL didn't complete properly\n"));
- err = BCME_ERROR;
- }
+ /* success case. return from here */
+ if (cfg->vif_count) {
+ cfg->vif_count--;
}
- if (err != BCME_OK) {
- struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg);
-
- WL_ERR(("p2p_ifdel failed, error %d, sent HANG event to %s\n",
- err, ndev->name));
- net_os_send_hang_message(ndev);
- }
-
- memset(cfg->p2p->vir_ifname, '\0', IFNAMSIZ);
- wl_to_p2p_bss_bssidx(cfg, cfg_type) = -1;
-#ifdef PROP_TXSTATUS_VSDB
-#if defined(BCMSDIO) || defined(BCMDBUS)
- 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 /* defined(BCMSDIO) || defined(BCMDBUS) */
-#endif /* PROP_TXSTATUS_VSDB */
+ return BCME_OK;
}
}
-fail:
- if (wlif_type == WL_P2P_IF_GO)
- wldev_iovar_setint(primary_ndev, "mpc", 1);
- return ERR_PTR(err);
+#endif /* WL_CFG80211_P2P_DEV_IF */
+
+ if ((netinfo = wl_get_netinfo_by_wdev(cfg, wdev)) == NULL) {
+ WL_ERR(("Find netinfo from wdev %p failed\n", wdev));
+ ret = -ENODEV;
+ goto exit;
+ }
+
+ if (!wdev->netdev) {
+ WL_ERR(("ndev null! \n"));
+ } else {
+ /* Disable tx before del */
+ netif_tx_disable(wdev->netdev);
+ }
+
+ wl_iftype = netinfo->iftype;
+ wl_mode = wl_iftype_to_mode(wl_iftype);
+ bssidx = netinfo->bssidx;
+ WL_INFORM_MEM(("[IFDEL] cfg_iftype:%d wl_iftype:%d mode:%d bssidx:%d\n",
+ wdev->iftype, wl_iftype, wl_mode, bssidx));
+
+ /* Do pre-interface del ops */
+ wl_cfg80211_iface_state_ops(wdev, WL_IF_DELETE_REQ, wl_iftype, wl_mode);
+
+ switch (wl_iftype) {
+ case WL_IF_TYPE_P2P_GO:
+ case WL_IF_TYPE_P2P_GC:
+ case WL_IF_TYPE_AP:
+ case WL_IF_TYPE_STA:
+ case WL_IF_TYPE_NAN:
+ ret = wl_cfg80211_del_iface(wiphy, wdev);
+ break;
+ case WL_IF_TYPE_IBSS:
+ ret = wl_cfg80211_del_ibss(wiphy, wdev);
+ break;
+
+ default:
+ WL_ERR(("Unsupported interface type\n"));
+ ret = BCME_ERROR;
+ }
+
+exit:
+ if (ret == BCME_OK) {
+ /* Successful case */
+ if (cfg->vif_count) {
+ cfg->vif_count--;
+ }
+ wl_cfg80211_iface_state_ops(primary_ndev->ieee80211_ptr,
+ WL_IF_DELETE_DONE, wl_iftype, wl_mode);
+#ifdef WL_NAN
+ if (!((cfg->nancfg.mac_rand) && (wl_iftype == WL_IF_TYPE_NAN)))
+#endif /* WL_NAN */
+ {
+ wl_release_vif_macaddr(cfg, wdev->netdev->dev_addr, wl_iftype);
+ }
+ WL_INFORM_MEM(("vif deleted. vif_count:%d\n", cfg->vif_count));
+ } else {
+ if (!wdev->netdev) {
+ WL_ERR(("ndev null! \n"));
+ } else {
+ /* IF del failed. revert back tx queue status */
+ netif_tx_start_all_queues(wdev->netdev);
+ }
+
+ /* Skip generating log files and sending HANG event
+ * if driver state is not READY
+ */
+ if (wl_get_drv_status(cfg, READY, bcmcfg_to_prmry_ndev(cfg))) {
+#ifdef WL_CFGVENDOR_SEND_HANG_EVENT
+ wl_copy_hang_info_if_falure(primary_ndev,
+ HANG_REASON_IFACE_DEL_FAILURE, ret);
+#endif /* WL_CFGVENDOR_SEND_HANG_EVENT */
+ SUPP_LOG(("IF_DEL fail. err:%d\n", ret));
+ wl_flush_fw_log_buffer(primary_ndev, FW_LOGSET_MASK_ALL);
+ /* IF dongle is down due to previous hang or other conditions, sending
+ * one more hang notification is not needed.
+ */
+ if (dhd_query_bus_erros(dhd) || (ret == BCME_DONGLE_DOWN)) {
+ goto end;
+ }
+ dhd->iface_op_failed = TRUE;
+#if defined(DHD_FW_COREDUMP)
+ if (dhd->memdump_enabled && (ret != -EBADTYPE)) {
+ dhd->memdump_type = DUMP_TYPE_IFACE_OP_FAILURE;
+ dhd_bus_mem_dump(dhd);
+ }
+#endif /* DHD_FW_COREDUMP */
+#if defined(OEM_ANDROID)
+ WL_ERR(("Notify hang event to upper layer \n"));
+ dhd->hang_reason = HANG_REASON_IFACE_DEL_FAILURE;
+ net_os_send_hang_message(bcmcfg_to_prmry_ndev(cfg));
+#endif /* BCMDONGLEHOST && OEM_ANDROID */
+ }
+ }
+end:
+ return ret;
}
static s32
wl_cfg80211_del_virtual_iface(struct wiphy *wiphy, bcm_struct_cfgdev *cfgdev)
{
- struct net_device *dev = NULL;
- struct ether_addr p2p_mac;
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
- s32 timeout = -1;
- s32 ret = 0;
- s32 index = -1;
- s32 type = -1;
-#ifdef CUSTOM_SET_CPUCORE
- dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
-#endif /* CUSTOM_SET_CPUCORE */
- WL_DBG(("Enter\n"));
+ struct wireless_dev *wdev = cfgdev_to_wdev(cfgdev);
+ int ret = BCME_OK;
+ u16 wl_iftype;
+ u16 wl_mode;
+ struct net_device *primary_ndev;
-#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 (!cfg) {
+ return -EINVAL;
}
-#endif /* WL_CFG80211_P2P_DEV_IF */
- dev = cfgdev_to_wlc_ndev(cfgdev, cfg);
-#ifdef WLAIBSS_MCHAN
- if (cfgdev == cfg->ibss_cfgdev)
- return bcm_cfg80211_del_ibss_if(wiphy, cfgdev);
-#endif /* WLAIBSS_MCHAN */
-
-#ifdef WL_VIRTUAL_APSTA
- if (cfgdev == cfg->bss_cfgdev)
- return wl_cfg80211_del_iface(wiphy, cfgdev);
-#endif /* WL_VIRTUAL_APSTA */
- if ((index = wl_get_bssidx_by_wdev(cfg, cfgdev_to_wdev(cfgdev))) < 0) {
- WL_ERR(("Find p2p index from wdev failed\n"));
- return BCME_ERROR;
+ primary_ndev = bcmcfg_to_prmry_ndev(cfg);
+ wdev = cfgdev_to_wdev(cfgdev);
+ if (!wdev) {
+ WL_ERR(("wdev null"));
+ return -ENODEV;
}
- if (cfg->p2p_supported) {
- if (wl_cfgp2p_find_type(cfg, index, &type) != BCME_OK)
- return BCME_ERROR;
- memcpy(p2p_mac.octet, wl_to_p2p_bss_macaddr(cfg, type).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(cfg, GO_NEG_PHASE);
- if (wl_cfgp2p_vif_created(cfg)) {
- 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(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
- (&cfg->iface_disable, msecs_to_jiffies(500));
- }
-
- 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(cfg, dev) == WL_MODE_AP) {
- wl_add_remove_eventmsg(dev, WLC_E_PROBREQ_MSG, false);
- cfg->p2p->p2p_go_count--;
- /* disable interface before bsscfg free */
- 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(&cfg->iface_disable,
- msecs_to_jiffies(500));
- } else if (ret != BCME_UNSUPPORTED) {
- msleep(300);
- }
- }
- wl_cfg80211_clear_per_bss_ies(cfg, index);
-
- if (wl_get_mode_by_netdev(cfg, dev) != WL_MODE_AP)
- wldev_iovar_setint(dev, "buf_key_b4_m4", 0);
- memcpy(p2p_mac.octet, wl_to_p2p_bss_macaddr(cfg, type).octet,
- ETHER_ADDR_LEN);
- CFGP2P_INFO(("primary idx %d : cfg p2p_ifdis "MACDBG"\n",
- dev->ifindex, MAC2STRDBG(p2p_mac.octet)));
-
- /* delete interface after link down */
- 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));
- net_os_send_hang_message(ndev);
- } else {
- /* 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) &&
- (cfg->if_event_info.valid)),
- 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));
- }
- }
+ WL_DBG(("Enter wdev:%p iftype: %d\n", wdev, wdev->iftype));
+ if (cfg80211_to_wl_iftype(wdev->iftype, &wl_iftype, &wl_mode) < 0) {
+ WL_ERR(("Wrong iftype: %d\n", wdev->iftype));
+ return -ENODEV;
}
+
+ if ((ret = wl_cfg80211_del_if(cfg, primary_ndev,
+ wdev, NULL)) < 0) {
+ WL_ERR(("IF del failed\n"));
+ }
+
return ret;
}
static s32
-wl_cfg80211_change_virtual_iface(struct wiphy *wiphy, struct net_device *ndev,
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0))
- enum nl80211_iftype type,
-#else
- enum nl80211_iftype type, u32 *flags,
-#endif
- struct vif_params *params)
+wl_cfg80211_change_p2prole(struct wiphy *wiphy, struct net_device *ndev, enum nl80211_iftype type)
{
- s32 ap = 0;
- s32 infra = 0;
- s32 ibss = 0;
s32 wlif_type;
s32 mode = 0;
- s32 err = BCME_OK;
s32 index;
+ s32 err;
s32 conn_idx = -1;
chanspec_t chspec;
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
- struct net_device *primary_ndev = bcmcfg_to_prmry_ndev(cfg);
dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+#if defined(WL_SUPPORT_MULTIP2P)
+ s32 is_mp2p_supported = BCME_ERROR;
+#endif /* WL_SUPPORT_MULTIP2P */
- WL_DBG(("Enter type %d\n", type));
+ WL_INFORM_MEM(("Enter. current_role:%d new_role:%d \n", ndev->ieee80211_ptr->iftype, type));
+
+ if (!cfg->p2p || !wl_cfgp2p_vif_created(cfg)) {
+ WL_ERR(("P2P not initialized \n"));
+ return -EINVAL;
+ }
+
+ if (!is_p2p_group_iface(ndev->ieee80211_ptr)) {
+ WL_ERR(("Wrong if type \n"));
+ return -EINVAL;
+ }
+
+ /* Abort any on-going scans to avoid race condition issues */
+ wl_cfg80211_cancel_scan(cfg);
+
+ index = wl_get_bssidx_by_wdev(cfg, ndev->ieee80211_ptr);
+ if (index < 0) {
+ WL_ERR(("Find bsscfg index from ndev(%p) failed\n", ndev));
+ return BCME_ERROR;
+ }
+ if (wl_cfgp2p_find_type(cfg, index, &conn_idx) != BCME_OK) {
+ return BCME_ERROR;
+ }
+
+#if defined(WL_SUPPORT_MULTIP2P)
+ is_mp2p_supported = DHD_OPMODE_SUPPORTED(cfg->pub, DHD_FLAG_MP2P_MODE);
+#endif /* WL_SUPPORT_MULTIP2P */
+ /* In concurrency case, STA may be already associated in a particular
+ * channel. so retrieve the current channel of primary interface and
+ * then start the virtual interface on that.
+ */
+ chspec = wl_cfg80211_get_shared_freq(wiphy);
+ if (type == NL80211_IFTYPE_P2P_GO) {
+ /* Dual p2p doesn't support multiple P2PGO interfaces,
+ * p2p_go_count is the counter for GO creation
+ * requests.
+ */
+ if (TRUE &&
+#if defined(WL_SUPPORT_MULTIP2P)
+ (is_mp2p_supported <= 0) &&
+#endif // endif
+ (cfg->p2p->p2p_go_count > 0) && (type == NL80211_IFTYPE_P2P_GO)) {
+ WL_ERR(("FW does not support multiple GO\n"));
+ return BCME_ERROR;
+ }
+ mode = WL_MODE_AP;
+ wlif_type = WL_P2P_IF_GO;
+ dhd->op_mode &= ~DHD_FLAG_P2P_GC_MODE;
+ dhd->op_mode |= DHD_FLAG_P2P_GO_MODE;
+ } else {
+ wlif_type = WL_P2P_IF_CLIENT;
+ /* for GO */
+ if (wl_get_mode_by_netdev(cfg, ndev) == WL_MODE_AP) {
+ WL_INFORM_MEM(("Downgrading P2P GO to cfg_iftype:%d \n", type));
+ wl_add_remove_eventmsg(ndev, WLC_E_PROBREQ_MSG, false);
+ cfg->p2p->p2p_go_count--;
+ /* disable interface before bsscfg free */
+ err = wl_cfgp2p_ifdisable(cfg, wl_to_p2p_bss_macaddr(cfg, conn_idx));
+ /* if fw doesn't support "ifdis",
+ * do not wait for link down of ap mode
+ */
+ if (err == 0) {
+ WL_DBG(("Wait for Link Down event for GO !!!\n"));
+ wait_for_completion_timeout(&cfg->iface_disable,
+ msecs_to_jiffies(500));
+ } else if (err != BCME_UNSUPPORTED) {
+ msleep(300);
+ }
+ }
+ }
+
+ wl_set_p2p_status(cfg, IF_CHANGING);
+ wl_clr_p2p_status(cfg, IF_CHANGED);
+ wl_cfgp2p_ifchange(cfg, wl_to_p2p_bss_macaddr(cfg, conn_idx),
+ htod32(wlif_type), chspec, conn_idx);
+ wait_event_interruptible_timeout(cfg->netif_change_event,
+ (wl_get_p2p_status(cfg, IF_CHANGED) == true),
+ msecs_to_jiffies(MAX_WAIT_TIME));
+
+ wl_clr_p2p_status(cfg, IF_CHANGING);
+ wl_clr_p2p_status(cfg, IF_CHANGED);
+
+ if (mode == WL_MODE_AP) {
+ wl_set_drv_status(cfg, CONNECTED, ndev);
+ }
+
+ return BCME_OK;
+}
+
+static s32
+wl_cfg80211_change_virtual_iface(struct wiphy *wiphy, struct net_device *ndev,
+ enum nl80211_iftype type,
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0))
+ u32 *flags,
+#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) */
+ struct vif_params *params)
+{
+ s32 infra = 1;
+ s32 err = BCME_OK;
+ u16 wl_iftype;
+ u16 wl_mode;
+ struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
+ struct net_info *netinfo = NULL;
+ dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+ struct net_device *primary_ndev;
+
+ if (!dhd)
+ return -EINVAL;
+
+ WL_INFORM_MEM(("[%s] Enter. current cfg_iftype:%d new cfg_iftype:%d \n",
+ ndev->name, ndev->ieee80211_ptr->iftype, type));
+ primary_ndev = bcmcfg_to_prmry_ndev(cfg);
+
+ if (cfg80211_to_wl_iftype(type, &wl_iftype, &wl_mode) < 0) {
+ WL_ERR(("Unknown role \n"));
+ return -EINVAL;
+ }
+
+ mutex_lock(&cfg->if_sync);
+ netinfo = wl_get_netinfo_by_wdev(cfg, ndev->ieee80211_ptr);
+ if (unlikely(!netinfo)) {
+#ifdef WL_STATIC_IF
+ if (is_static_iface(cfg, ndev)) {
+ /* Incase of static interfaces, the netinfo will be
+ * allocated only when FW interface is initialized. So
+ * store the value and use it during initialization.
+ */
+ WL_INFORM_MEM(("skip change vif for static if\n"));
+ ndev->ieee80211_ptr->iftype = type;
+ err = BCME_OK;
+ } else
+#endif /* WL_STATIC_IF */
+ {
+ WL_ERR(("netinfo not found \n"));
+ err = -ENODEV;
+ }
+ goto fail;
+ }
+
+ /* perform pre-if-change tasks */
+ wl_cfg80211_iface_state_ops(ndev->ieee80211_ptr,
+ WL_IF_CHANGE_REQ, wl_iftype, wl_mode);
+
switch (type) {
+ case NL80211_IFTYPE_ADHOC:
+ infra = 0;
+ break;
+ case NL80211_IFTYPE_STATION:
+ /* Supplicant sets iftype to STATION while removing p2p GO */
+ if (ndev->ieee80211_ptr->iftype == NL80211_IFTYPE_P2P_GO) {
+ /* Downgrading P2P GO */
+ err = wl_cfg80211_change_p2prole(wiphy, ndev, type);
+ if (unlikely(err)) {
+ WL_ERR(("P2P downgrade failed \n"));
+ }
+ } else if (ndev->ieee80211_ptr->iftype == NL80211_IFTYPE_AP) {
+ /* Downgrade role from AP to STA */
+ if ((err = wl_cfg80211_add_del_bss(cfg, ndev,
+ netinfo->bssidx, wl_iftype, 0, NULL)) < 0) {
+ WL_ERR(("AP-STA Downgrade failed \n"));
+ goto fail;
+ }
+ }
+ break;
+ case NL80211_IFTYPE_AP:
+ /* intentional fall through */
+ case NL80211_IFTYPE_AP_VLAN:
+ {
+ if (!wl_get_drv_status(cfg, AP_CREATED, ndev)) {
+ dhd->op_mode = DHD_FLAG_HOSTAP_MODE;
+ err = wl_cfg80211_set_ap_role(cfg, ndev);
+ if (unlikely(err)) {
+ WL_ERR(("set ap role failed!\n"));
+ goto fail;
+ }
+ } else {
+ WL_INFORM_MEM(("AP_CREATED bit set. Skip role change\n"));
+ }
+ break;
+ }
+ case NL80211_IFTYPE_P2P_GO:
+ /* Intentional fall through */
+ case NL80211_IFTYPE_P2P_CLIENT:
+ infra = 1;
+ err = wl_cfg80211_change_p2prole(wiphy, ndev, type);
+ break;
case NL80211_IFTYPE_MONITOR:
case NL80211_IFTYPE_WDS:
case NL80211_IFTYPE_MESH_POINT:
- ap = 1;
- WL_ERR(("type (%d) : currently we do not support this type\n",
- type));
- break;
- case NL80211_IFTYPE_ADHOC:
- mode = WL_MODE_IBSS;
- ibss = 1;
- break;
- case NL80211_IFTYPE_STATION:
- case NL80211_IFTYPE_P2P_CLIENT:
- mode = WL_MODE_BSS;
- infra = 1;
- break;
- case NL80211_IFTYPE_AP:
- dhd->op_mode |= DHD_FLAG_HOSTAP_MODE;
- /* intentional fall through */
- case NL80211_IFTYPE_AP_VLAN:
- case NL80211_IFTYPE_P2P_GO:
- mode = WL_MODE_AP;
- ap = 1;
- break;
+ /* Intentional fall through */
default:
- return -EINVAL;
- }
- if (!dhd)
- return -EINVAL;
- if (ap) {
- wl_set_mode_by_netdev(cfg, ndev, mode);
- if (is_p2p_group_iface(ndev->ieee80211_ptr) &&
- cfg->p2p && wl_cfgp2p_vif_created(cfg)) {
- WL_DBG(("p2p_vif_created p2p_on (%d)\n", p2p_on(cfg)));
- wldev_iovar_setint(ndev, "mpc", 0);
- wl_notify_escan_complete(cfg, ndev, true, true);
-
- /* Dual p2p doesn't support multiple P2PGO interfaces,
- * p2p_go_count is the counter for GO creation
- * requests.
- */
- if ((cfg->p2p->p2p_go_count > 0) && (type == NL80211_IFTYPE_P2P_GO)) {
- wl_set_mode_by_netdev(cfg, ndev, WL_MODE_BSS);
- WL_ERR(("Fw doesnot support multiple GO "));
- return BCME_ERROR;
- }
- /* In concurrency case, STA may be already associated in a particular
- * channel. so retrieve the current channel of primary interface and
- * then start the virtual interface on that.
- */
- chspec = wl_cfg80211_get_shared_freq(wiphy);
- index = wl_get_bssidx_by_wdev(cfg, ndev->ieee80211_ptr);
- if (index < 0) {
- WL_ERR(("Find p2p index from ndev(%p) failed\n", ndev));
- return BCME_ERROR;
- }
- if (wl_cfgp2p_find_type(cfg, index, &conn_idx) != BCME_OK)
- return BCME_ERROR;
-
- wlif_type = WL_P2P_IF_GO;
- WL_DBG(("%s : ap (%d), infra (%d), iftype (%d) conn_idx (%d)\n",
- ndev->name, ap, infra, type, conn_idx));
- wl_set_p2p_status(cfg, IF_CHANGING);
- wl_clr_p2p_status(cfg, IF_CHANGED);
- wl_cfgp2p_ifchange(cfg, wl_to_p2p_bss_macaddr(cfg, conn_idx),
- htod32(wlif_type), chspec, conn_idx);
- 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(cfg, ndev, mode);
- dhd->op_mode &= ~DHD_FLAG_P2P_GC_MODE;
- dhd->op_mode |= DHD_FLAG_P2P_GO_MODE;
- wl_clr_p2p_status(cfg, IF_CHANGING);
- wl_clr_p2p_status(cfg, IF_CHANGED);
-#ifdef SUPPORT_AP_POWERSAVE
- dhd_set_ap_powersave(dhd, 0, TRUE);
-#endif /* SUPPORT_AP_POWERSAVE */
- } else if (((ndev == primary_ndev) ||
- (ndev == ((struct net_device *)cfgdev_to_ndev(cfg->bss_cfgdev)))) &&
- !wl_get_drv_status(cfg, AP_CREATED, ndev)) {
- wl_set_drv_status(cfg, AP_CREATING, ndev);
- } else {
- WL_ERR(("Cannot change the interface for GO or SOFTAP\n"));
- return -EINVAL;
- }
- } else {
- /* P2P GO interface deletion is handled on the basis of role type (AP).
- * So avoid changing role for p2p type.
- */
- if (ndev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO)
- wl_set_mode_by_netdev(cfg, ndev, mode);
- WL_DBG(("Change_virtual_iface for transition from GO/AP to client/STA"));
-#ifdef SUPPORT_AP_POWERSAVE
- dhd_set_ap_powersave(dhd, 0, FALSE);
-#endif /* SUPPORT_AP_POWERSAVE */
+ WL_ERR(("Unsupported type:%d \n", type));
+ err = -EINVAL;
+ goto fail;
}
- 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;
- }
+ err = wldev_ioctl_set(ndev, WLC_SET_INFRA, &infra, sizeof(s32));
+ if (err < 0) {
+ WL_ERR(("SET INFRA/IBSS error %d\n", err));
+ goto fail;
}
+ wl_cfg80211_iface_state_ops(primary_ndev->ieee80211_ptr,
+ WL_IF_CHANGE_DONE, wl_iftype, wl_mode);
+
+ /* Update new iftype in relevant structures */
ndev->ieee80211_ptr->iftype = type;
- return 0;
+ netinfo->iftype = wl_iftype;
+ WL_INFORM_MEM(("[%s] cfg_iftype changed to %d\n", ndev->name, type));
+
+fail:
+ if (err) {
+ wl_flush_fw_log_buffer(ndev, FW_LOGSET_MASK_ALL);
+ }
+ mutex_unlock(&cfg->if_sync);
+ return err;
}
s32
-wl_cfg80211_notify_ifadd(int ifidx, char *name, uint8 *mac, uint8 bssidx)
+wl_cfg80211_notify_ifadd(struct net_device *dev,
+ int ifidx, char *name, uint8 *mac, uint8 bssidx, uint8 role)
{
bool ifadd_expected = FALSE;
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ bool bss_pending_op = TRUE;
/* 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);
+ return wl_cfg80211_notify_ifchange(dev, ifidx, name, mac, bssidx);
/* Okay, we are expecting IF_ADD (as IF_ADDING is true) */
if (wl_get_p2p_status(cfg, IF_ADDING)) {
@@ -2094,7 +3889,7 @@
wl_clr_p2p_status(cfg, IF_ADDING);
} else if (cfg->bss_pending_op) {
ifadd_expected = TRUE;
- cfg->bss_pending_op = FALSE;
+ bss_pending_op = FALSE;
}
if (ifadd_expected) {
@@ -2103,10 +3898,19 @@
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_event_info->role = role;
+ strlcpy(if_event_info->name, name, sizeof(if_event_info->name));
+ if_event_info->name[IFNAMSIZ - 1] = '\0';
if (mac)
memcpy(if_event_info->mac, mac, ETHER_ADDR_LEN);
+
+ /* Update bss pendig operation status */
+ if (!bss_pending_op) {
+ cfg->bss_pending_op = FALSE;
+ }
+ WL_INFORM_MEM(("IF_ADD ifidx:%d bssidx:%d role:%d\n",
+ ifidx, bssidx, role));
+ OSL_SMP_WMB();
wake_up_interruptible(&cfg->netif_change_event);
return BCME_OK;
}
@@ -2115,24 +3919,31 @@
}
s32
-wl_cfg80211_notify_ifdel(int ifidx, char *name, uint8 *mac, uint8 bssidx)
+wl_cfg80211_notify_ifdel(struct net_device *dev, int ifidx, char *name, uint8 *mac, uint8 bssidx)
{
bool ifdel_expected = FALSE;
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
wl_if_event_info *if_event_info = &cfg->if_event_info;
+ bool bss_pending_op = TRUE;
if (wl_get_p2p_status(cfg, IF_DELETING)) {
ifdel_expected = TRUE;
wl_clr_p2p_status(cfg, IF_DELETING);
} else if (cfg->bss_pending_op) {
ifdel_expected = TRUE;
- cfg->bss_pending_op = FALSE;
+ bss_pending_op = FALSE;
}
if (ifdel_expected) {
if_event_info->valid = TRUE;
if_event_info->ifidx = ifidx;
if_event_info->bssidx = bssidx;
+ /* Update bss pendig operation status */
+ if (!bss_pending_op) {
+ cfg->bss_pending_op = FALSE;
+ }
+ WL_INFORM_MEM(("IF_DEL ifidx:%d bssidx:%d\n", ifidx, bssidx));
+ OSL_SMP_WMB();
wake_up_interruptible(&cfg->netif_change_event);
return BCME_OK;
}
@@ -2141,847 +3952,19 @@
}
s32
-wl_cfg80211_notify_ifchange(int ifidx, char *name, uint8 *mac, uint8 bssidx)
+wl_cfg80211_notify_ifchange(struct net_device * dev, int ifidx, char *name, uint8 *mac,
+ uint8 bssidx)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
if (wl_get_p2p_status(cfg, IF_CHANGING)) {
wl_set_p2p_status(cfg, IF_CHANGED);
+ OSL_SMP_WMB();
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)
-{
- s32 type = -1;
- s32 bssidx = -1;
-#ifdef PROP_TXSTATUS_VSDB
-#if defined(BCMSDIO) || defined(BCMDBUS)
- dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
- bool enabled;
-#endif /* defined(BCMSDIO) || defined(BCMDBUS) */
-#endif /* PROP_TXSTATUS_VSDB */
-
- bssidx = if_event_info->bssidx;
- if (bssidx != wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_CONNECTION1) &&
- bssidx != wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_CONNECTION2)) {
- WL_ERR(("got IF_DEL for if %d, not owned by cfg driver\n", bssidx));
- return BCME_ERROR;
- }
-
- if (p2p_is_on(cfg) && wl_cfgp2p_vif_created(cfg)) {
- if (cfg->scan_request && (cfg->escan_info.ndev == ndev)) {
- /* Abort any pending scan requests */
- cfg->escan_info.escan_state = WL_ESCAN_STATE_IDLE;
- WL_DBG(("ESCAN COMPLETED\n"));
- wl_notify_escan_complete(cfg, cfg->escan_info.ndev, true, false);
- }
-
- memset(cfg->p2p->vir_ifname, '\0', IFNAMSIZ);
- if (wl_cfgp2p_find_type(cfg, bssidx, &type) == BCME_OK) {
- /* Update P2P data */
- 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) = -1;
- } else if (wl_get_bssidx_by_wdev(cfg, ndev->ieee80211_ptr) < 0) {
- WL_ERR(("bssidx not known for the given ndev as per net_info data \n"));
- return BCME_ERROR;
- }
-
-#ifdef PROP_TXSTATUS_VSDB
-#if defined(BCMSDIO) || defined(BCMDBUS)
- 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 /* defined(BCMSDIO) || defined(BCMDBUS) */
-#endif /* PROP_TXSTATUS_VSDB */
- }
-
- dhd_net_if_lock(ndev);
- wl_cfg80211_remove_if(cfg, if_event_info->ifidx, ndev);
- dhd_net_if_unlock(ndev);
-
- return BCME_OK;
-}
-
-/* Find listen channel */
-static s32 wl_find_listen_channel(struct bcm_cfg80211 *cfg,
- const u8 *ie, u32 ie_len)
-{
- wifi_p2p_ie_t *p2p_ie;
- u8 *end, *pos;
- s32 listen_channel;
-
-/* unfortunately const cast required here - function is
- * a callback so its signature must not be changed
- * and cascade of changing wl_cfgp2p_find_p2pie
- * causes need for const cast in other places
- */
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#endif
- pos = (u8 *)ie;
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic pop")
-#endif
- p2p_ie = wl_cfgp2p_find_p2pie(pos, ie_len);
-
- if (p2p_ie == NULL)
- return 0;
-
- pos = p2p_ie->subelts;
- end = p2p_ie->subelts + (p2p_ie->len - 4);
-
- CFGP2P_DBG((" found p2p ie ! lenth %d \n",
- p2p_ie->len));
-
- while (pos < end) {
- uint16 attr_len;
- if (pos + 2 >= end) {
- CFGP2P_DBG((" -- Invalid P2P attribute"));
- return 0;
- }
- attr_len = ((uint16) (((pos + 1)[1] << 8) | (pos + 1)[0]));
-
- if (pos + 3 + attr_len > end) {
- CFGP2P_DBG(("P2P: Attribute underflow "
- "(len=%u left=%d)",
- attr_len, (int) (end - pos - 3)));
- return 0;
- }
-
- /* if Listen Channel att id is 6 and the vailue is valid,
- * return the listen channel
- */
- if (pos[0] == 6) {
- /* listen channel subel length format
- * 1(id) + 2(len) + 3(country) + 1(op. class) + 1(chan num)
- */
- listen_channel = pos[1 + 2 + 3 + 1];
-
- if (listen_channel == SOCIAL_CHAN_1 ||
- listen_channel == SOCIAL_CHAN_2 ||
- listen_channel == SOCIAL_CHAN_3) {
- CFGP2P_DBG((" Found my Listen Channel %d \n", listen_channel));
- return listen_channel;
- }
- }
- pos += 3 + attr_len;
- }
- return 0;
-}
-
-static void wl_scan_prep(struct wl_scan_params *params, struct cfg80211_scan_request *request)
-{
- u32 n_ssids;
- u32 n_channels;
- u16 channel;
- chanspec_t chanspec;
- s32 i = 0, j = 0, offset;
- char *ptr;
- wlc_ssid_t ssid;
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
- struct wireless_dev *wdev;
-
- memcpy(¶ms->bssid, ðer_bcast, ETHER_ADDR_LEN);
- params->bss_type = DOT11_BSSTYPE_ANY;
- params->scan_type = 0;
- params->nprobes = -1;
- params->active_time = -1;
- params->passive_time = -1;
- params->home_time = -1;
- params->channel_num = 0;
- memset(¶ms->ssid, 0, sizeof(wlc_ssid_t));
-
- WL_SCAN(("Preparing Scan request\n"));
- WL_SCAN(("nprobes=%d\n", params->nprobes));
- WL_SCAN(("active_time=%d\n", params->active_time));
- WL_SCAN(("passive_time=%d\n", params->passive_time));
- WL_SCAN(("home_time=%d\n", params->home_time));
- WL_SCAN(("scan_type=%d\n", params->scan_type));
-
- params->nprobes = htod32(params->nprobes);
- params->active_time = htod32(params->active_time);
- params->passive_time = htod32(params->passive_time);
- params->home_time = htod32(params->home_time);
-
- /* if request is null just exit so it will be all channel broadcast scan */
- if (!request)
- return;
-
- n_ssids = request->n_ssids;
- n_channels = request->n_channels;
-
- /* Copy channel array if applicable */
- WL_SCAN(("### List of channelspecs to scan ###\n"));
- if (n_channels > 0) {
- for (i = 0; i < n_channels; i++) {
- chanspec = 0;
- channel = ieee80211_frequency_to_channel(request->channels[i]->center_freq);
- /* SKIP DFS channels for Secondary interface */
- if ((cfg->escan_info.ndev != bcmcfg_to_prmry_ndev(cfg)) &&
- (request->channels[i]->flags &
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0))
- (IEEE80211_CHAN_RADAR | IEEE80211_CHAN_PASSIVE_SCAN)))
-#else
- (IEEE80211_CHAN_RADAR | IEEE80211_CHAN_NO_IR)))
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) */
- continue;
-
-#if defined(WL_CFG80211_P2P_DEV_IF)
- wdev = request->wdev;
-#else
- wdev = request->dev->ieee80211_ptr;
-#endif /* WL_CFG80211_P2P_DEV_IF */
- chanspec = wl_cfg80211_ulb_get_min_bw_chspec(wdev, -1);
- if (chanspec == INVCHANSPEC) {
- WL_ERR(("Invalid chanspec! Skipping channel\n"));
- continue;
- }
-
- if (request->channels[i]->band == IEEE80211_BAND_2GHZ) {
- chanspec |= WL_CHANSPEC_BAND_2G;
- } else {
- chanspec |= WL_CHANSPEC_BAND_5G;
- }
- params->channel_list[j] = channel;
- params->channel_list[j] &= WL_CHANSPEC_CHAN_MASK;
- params->channel_list[j] |= chanspec;
- WL_SCAN(("Chan : %d, Channel spec: %x \n",
- channel, params->channel_list[j]));
- params->channel_list[j] = wl_chspec_host_to_driver(params->channel_list[j]);
- j++;
- }
- } else {
- WL_SCAN(("Scanning all channels\n"));
- }
- n_channels = j;
- /* Copy ssid array if applicable */
- WL_SCAN(("### List of SSIDs to scan ###\n"));
- if (n_ssids > 0) {
- offset = offsetof(wl_scan_params_t, channel_list) + n_channels * sizeof(u16);
- offset = roundup(offset, sizeof(u32));
- ptr = (char*)params + offset;
- for (i = 0; i < n_ssids; i++) {
- memset(&ssid, 0, sizeof(wlc_ssid_t));
- ssid.SSID_len = request->ssids[i].ssid_len;
- memcpy(ssid.SSID, request->ssids[i].ssid, ssid.SSID_len);
- if (!ssid.SSID_len)
- WL_SCAN(("%d: Broadcast scan\n", i));
- else
- WL_SCAN(("%d: scan for %s size =%d\n", i,
- ssid.SSID, ssid.SSID_len));
- memcpy(ptr, &ssid, sizeof(wlc_ssid_t));
- ptr += sizeof(wlc_ssid_t);
- }
- } else {
- WL_SCAN(("Broadcast scan\n"));
- }
- /* Adding mask to channel numbers */
- params->channel_num =
- htod32((n_ssids << WL_SCAN_PARAMS_NSSID_SHIFT) |
- (n_channels & WL_SCAN_PARAMS_COUNT_MASK));
-
- if (n_channels == 1) {
- params->active_time = htod32(WL_SCAN_CONNECT_DWELL_TIME_MS);
- params->nprobes = htod32(params->active_time / WL_SCAN_JOIN_PROBE_INTERVAL_MS);
- }
-}
-
-static s32
-wl_get_valid_channels(struct net_device *ndev, u8 *valid_chan_list, s32 size)
-{
- wl_uint32_list_t *list;
- s32 err = BCME_OK;
- if (valid_chan_list == NULL || size <= 0)
- return -ENOMEM;
-
- memset(valid_chan_list, 0, size);
- list = (wl_uint32_list_t *)(void *) valid_chan_list;
- list->count = htod32(WL_NUMCHANNELS);
- err = wldev_ioctl(ndev, WLC_GET_VALID_CHANNELS, valid_chan_list, size, false);
- if (err != 0) {
- WL_ERR(("get channels failed with %d\n", err));
- }
-
- return err;
-}
-
-#if defined(USE_INITIAL_SHORT_DWELL_TIME)
-#define FIRST_SCAN_ACTIVE_DWELL_TIME_MS 40
-bool g_first_broadcast_scan = TRUE;
-#endif
-
-static s32
-wl_run_escan(struct bcm_cfg80211 *cfg, struct net_device *ndev,
- struct cfg80211_scan_request *request, uint16 action)
-{
- s32 err = BCME_OK;
- u32 n_channels;
- u32 n_ssids;
- s32 params_size = (WL_SCAN_PARAMS_FIXED_SIZE + OFFSETOF(wl_escan_params_t, params));
- wl_escan_params_t *params = NULL;
- u8 chan_buf[sizeof(u32)*(WL_NUMCHANNELS + 1)];
- u32 num_chans = 0;
- s32 channel;
- u32 n_valid_chan;
- s32 search_state = WL_P2P_DISC_ST_SCAN;
- u32 i, j, n_nodfs = 0;
- u16 *default_chan_list = NULL;
- wl_uint32_list_t *list;
- s32 bssidx = -1;
- struct net_device *dev = NULL;
-#if defined(USE_INITIAL_SHORT_DWELL_TIME)
- bool is_first_init_2g_scan = false;
-#endif
- p2p_scan_purpose_t p2p_scan_purpose = P2P_SCAN_PURPOSE_MIN;
-
- WL_DBG(("Enter \n"));
-
- /* scan request can come with empty request : perform all default scan */
- if (!cfg) {
- err = -EINVAL;
- goto exit;
- }
- if (!cfg->p2p_supported || !p2p_scan(cfg)) {
- /* LEGACY SCAN TRIGGER */
- WL_SCAN((" LEGACY E-SCAN START\n"));
-
-#if defined(USE_INITIAL_SHORT_DWELL_TIME)
- if (!request) {
- err = -EINVAL;
- goto exit;
- }
- if (ndev == bcmcfg_to_prmry_ndev(cfg) && g_first_broadcast_scan == true) {
- is_first_init_2g_scan = true;
- g_first_broadcast_scan = false;
- }
-#endif
-
- /* 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_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;
- goto exit;
- }
- wl_scan_prep(¶ms->params, request);
-
-#if 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
-
- params->version = htod32(ESCAN_REQ_VERSION);
- params->action = htod16(action);
- 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);
- err = -ENOMEM;
- goto exit;
- }
- if (cfg->active_scan == PASSIVE_SCAN) {
- params->params.scan_type = DOT11_SCANTYPE_PASSIVE;
- WL_DBG(("Passive scan_type %d \n", params->params.scan_type));
- }
-
- bssidx = wl_get_bssidx_by_wdev(cfg, ndev->ieee80211_ptr);
-
- err = wldev_iovar_setbuf(ndev, "escan", params, params_size,
- cfg->escan_ioctl_buf, WLC_IOCTL_MEDLEN, NULL);
- WL_ERR(("LEGACY_SCAN sync ID: %d, bssidx: %d\n", params->sync_id, bssidx));
- 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));
- } else {
- DBG_EVENT_LOG(cfg->pub, WIFI_EVENT_DRIVER_SCAN_REQUESTED);
- }
- kfree(params);
- }
- else if (p2p_is_on(cfg) && p2p_scan(cfg)) {
- /* P2P SCAN TRIGGER */
- s32 _freq = 0;
- n_nodfs = 0;
- if (request && request->n_channels) {
- num_chans = request->n_channels;
- WL_SCAN((" chann number : %d\n", num_chans));
- default_chan_list = kzalloc(num_chans * sizeof(*default_chan_list),
- GFP_KERNEL);
- if (default_chan_list == NULL) {
- WL_ERR(("channel list allocation failed \n"));
- err = -ENOMEM;
- goto exit;
- }
- 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 < num_chans; i++)
- {
- _freq = request->channels[i]->center_freq;
- channel = ieee80211_frequency_to_channel(_freq);
-
- /* ignore DFS channels */
- if (request->channels[i]->flags &
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0))
- (IEEE80211_CHAN_NO_IR
- | IEEE80211_CHAN_RADAR))
-#else
- (IEEE80211_CHAN_RADAR
- | IEEE80211_CHAN_PASSIVE_SCAN))
-#endif
- continue;
-
- for (j = 0; j < n_valid_chan; j++) {
- /* allows only supported channel on
- * current reguatory
- */
- if (channel == (dtoh32(list->element[j])))
- default_chan_list[n_nodfs++] =
- channel;
- }
-
- }
- }
- 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_INFORM(("P2P SEARCH PHASE START \n"));
- } else if (((dev = wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_CONNECTION1)) &&
- (wl_get_mode_by_netdev(cfg, dev) == WL_MODE_AP)) ||
- ((dev = wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_CONNECTION2)) &&
- (wl_get_mode_by_netdev(cfg, dev) == WL_MODE_AP))) {
- /* If you are already a GO, then do SEARCH only */
- WL_INFORM(("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_INFORM(("P2P SCAN STATE START \n"));
- num_chans = n_nodfs;
- p2p_scan_purpose = P2P_SCAN_NORMAL;
- }
- } else {
- err = -EINVAL;
- goto exit;
- }
- err = wl_cfgp2p_escan(cfg, ndev, ACTIVE_SCAN, num_chans, default_chan_list,
- search_state, action,
- wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_DEVICE), NULL,
- p2p_scan_purpose);
-
- if (!err)
- cfg->p2p->search_state = search_state;
-
- kfree(default_chan_list);
- }
-exit:
- if (unlikely(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 bcm_cfg80211 *cfg, struct wiphy *wiphy, struct net_device *ndev,
- struct cfg80211_scan_request *request)
-{
- s32 err = BCME_OK;
- s32 passive_scan;
- s32 passive_scan_time;
- s32 passive_scan_time_org;
- wl_scan_results_t *results;
- WL_SCAN(("Enter \n"));
- 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;
-
- 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)) {
- WL_ERR(("error (%d)\n", err));
- goto exit;
- }
-
- if (passive_channel_skip) {
-
- err = wldev_ioctl(ndev, WLC_GET_SCAN_PASSIVE_TIME,
- &passive_scan_time_org, sizeof(passive_scan_time_org), false);
- if (unlikely(err)) {
- WL_ERR(("== error (%d)\n", err));
- goto exit;
- }
-
- WL_SCAN(("PASSIVE SCAN time : %d \n", passive_scan_time_org));
-
- passive_scan_time = 0;
- err = wldev_ioctl(ndev, WLC_SET_SCAN_PASSIVE_TIME,
- &passive_scan_time, sizeof(passive_scan_time), true);
- if (unlikely(err)) {
- WL_ERR(("== error (%d)\n", err));
- goto exit;
- }
-
- WL_SCAN(("PASSIVE SCAN SKIPED!! (passive_channel_skip:%d) \n",
- passive_channel_skip));
- }
-
- err = wl_run_escan(cfg, ndev, request, WL_SCAN_ACTION_START);
-
- if (passive_channel_skip) {
- err = wldev_ioctl(ndev, WLC_SET_SCAN_PASSIVE_TIME,
- &passive_scan_time_org, sizeof(passive_scan_time_org), true);
- if (unlikely(err)) {
- WL_ERR(("== error (%d)\n", err));
- goto exit;
- }
-
- WL_SCAN(("PASSIVE SCAN RECOVERED!! (passive_scan_time_org:%d) \n",
- passive_scan_time_org));
- }
-
-exit:
- mutex_unlock(&cfg->usr_sync);
- return err;
-}
-
-static s32
-__wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
- struct cfg80211_scan_request *request,
- struct cfg80211_ssid *this_ssid)
-{
- struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
- struct cfg80211_ssid *ssids;
- struct ether_addr primary_mac;
- bool p2p_ssid;
-#ifdef WL11U
- bcm_tlv_t *interworking_ie;
-#endif
- s32 err = 0;
- s32 bssidx = -1;
- s32 i;
-
- unsigned long flags;
- static s32 busy_count = 0;
-#ifdef WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST
- struct net_device *remain_on_channel_ndev = NULL;
-#endif
-
- /*
- * Hostapd triggers scan before starting automatic channel selection
- * to collect channel characteristics. However firmware scan engine
- * doesn't support any channel characteristics collection along with
- * scan. Hence return scan success.
- */
- if (request && (scan_req_iftype(request) == NL80211_IFTYPE_AP)) {
- WL_INFORM(("Scan Command on SoftAP Interface. Ignoring...\n"));
- return 0;
- }
-
- ndev = ndev_to_wlc_ndev(ndev, cfg);
-
- 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(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(cfg, SCAN_ABORTING, ndev)) {
- WL_ERR(("Scanning being aborted\n"));
- return -EAGAIN;
- }
- if (request && request->n_ssids > WL_SCAN_PARAMS_SSID_MAX) {
- WL_ERR(("request null or n_ssids > WL_SCAN_PARAMS_SSID_MAX\n"));
- return -EOPNOTSUPP;
- }
-#ifdef WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST
- 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(cfg, remain_on_channel_ndev, true, true);
- }
-#endif /* WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST */
-
-
- /* Arm scan timeout timer */
- mod_timer(&cfg->scan_timeout, jiffies + msecs_to_jiffies(WL_SCAN_TIMER_INTERVAL_MS));
- if (request) { /* scan bss */
- ssids = request->ssids;
- 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 (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(cfg, &primary_mac);
-#if defined(P2P_IE_MISSING_FIX)
- cfg->p2p_prb_noti = false;
-#endif
- }
- 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 (!cfg->p2p_supported || !p2p_scan(cfg)) {
- if ((bssidx = wl_get_bssidx_by_wdev(cfg,
- ndev->ieee80211_ptr)) < 0) {
- 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(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);
-
- (void)wldev_iovar_setint_bsscfg(ndev, "grat_arp", 0,
- bssidx);
- cfg->wl11u = FALSE;
- cfg->iw_ie_len = 0;
- memset(cfg->iw_ie, 0, IW_IES_MAX_BUF_LEN);
- /* we don't care about error */
- }
-#endif /* WL11U */
- err = wl_cfg80211_set_mgmt_vndr_ies(cfg, ndev_to_cfgdev(ndev),
- bssidx, VNDR_IE_PRBREQ_FLAG, request->ie,
- request->ie_len);
-
- if (unlikely(err)) {
- goto scan_out;
- }
-
- }
- }
- } else { /* scan in ibss */
- ssids = this_ssid;
- }
-
- if (request && cfg->p2p_supported && !p2p_scan(cfg)) {
- WL_TRACE_HW4(("START SCAN\n"));
- DHD_OS_SCAN_WAKE_LOCK_TIMEOUT((dhd_pub_t *)(cfg->pub),
- SCAN_WAKE_LOCK_TIMEOUT);
- }
-
- if (cfg->p2p_supported) {
- if (p2p_on(cfg) && p2p_scan(cfg)) {
-
- /* 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;
- }
- }
- }
- err = wl_do_escan(cfg, wiphy, ndev, request);
- if (likely(!err))
- goto scan_success;
- else
- goto scan_out;
-
-scan_success:
- busy_count = 0;
- cfg->scan_request = request;
- wl_set_drv_status(cfg, SCANNING, ndev);
-
- return 0;
-
-scan_out:
- if (err == BCME_BUSY || err == BCME_NOTREADY) {
- WL_ERR(("Scan err = (%d), busy?%d", err, -EBUSY));
- err = -EBUSY;
- } else if ((err == BCME_EPERM) && cfg->scan_suppressed) {
- WL_ERR(("Scan not permitted due to scan suppress\n"));
- err = -EPERM;
- } else {
- /* For all other fw errors, use a generic error code as return
- * value to cfg80211 stack
- */
- err = -EAGAIN;
- }
-
-#define SCAN_EBUSY_RETRY_LIMIT 10
- if (err == -EBUSY) {
- if (busy_count++ > SCAN_EBUSY_RETRY_LIMIT) {
- struct ether_addr bssid;
- 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(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,
- &bssid, ETHER_ADDR_LEN, false)) == 0)
- WL_ERR(("FW is connected with " MACDBG "/n",
- MAC2STRDBG(bssid.octet)));
- else
- WL_ERR(("GET BSSID failed with %d\n", ret));
-
- wl_cfg80211_scan_abort(cfg);
-
- }
- } else {
- busy_count = 0;
- }
-
- wl_clr_drv_status(cfg, SCANNING, ndev);
- if (timer_pending(&cfg->scan_timeout))
- del_timer_sync(&cfg->scan_timeout);
- DHD_OS_SCAN_WAKE_UNLOCK((dhd_pub_t *)(cfg->pub));
- 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 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(cfg);
-
- if (ndev == bcmcfg_to_prmry_ndev(cfg)) {
- if (wl_cfg_multip2p_operational(cfg)) {
- WL_ERR(("wlan0 scan failed, p2p devices are operational"));
- return -ENODEV;
- }
- }
-
- err = __wl_cfg80211_scan(wiphy, ndev, request, NULL);
- if (unlikely(err)) {
- WL_ERR(("scan error (%d)\n", err));
- return err;
- }
-
- return err;
}
static s32 wl_set_rts(struct net_device *dev, u32 rts_threshold)
@@ -3013,8 +3996,16 @@
s32 err = 0;
u32 cmd = (l ? WLC_SET_LRL : WLC_SET_SRL);
+#ifdef CUSTOM_LONG_RETRY_LIMIT
+ if ((cmd == WLC_SET_LRL) &&
+ (retry != CUSTOM_LONG_RETRY_LIMIT)) {
+ WL_DBG(("CUSTOM_LONG_RETRY_LIMIT is used.Ignore configuration"));
+ return err;
+ }
+#endif /* CUSTOM_LONG_RETRY_LIMIT */
+
retry = htod32(retry);
- err = wldev_ioctl(dev, cmd, &retry, sizeof(retry), true);
+ err = wldev_ioctl_set(dev, cmd, &retry, sizeof(retry));
if (unlikely(err)) {
WL_ERR(("cmd (%d) , error (%d)\n", cmd, err));
return err;
@@ -3073,9 +4064,9 @@
int bw = 0, tmp_bw = 0;
int i;
u32 tmp_c;
- u16 kflags = in_atomic() ? GFP_ATOMIC : GFP_KERNEL;
+
#define LOCAL_BUF_SIZE 1024
- buf = (u8 *) kzalloc(LOCAL_BUF_SIZE, kflags);
+ buf = (u8 *)MALLOC(cfg->osh, LOCAL_BUF_SIZE);
if (!buf) {
WL_ERR(("buf memory alloc failed\n"));
goto exit;
@@ -3113,21 +4104,23 @@
}
}
exit:
- if (buf)
- kfree(buf);
+ if (buf) {
+ MFREE(cfg->osh, buf, LOCAL_BUF_SIZE);
+ }
#undef LOCAL_BUF_SIZE
- WL_INFORM(("return chanspec %x %d\n", ret_c, bw));
+ WL_DBG(("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)
+wl_cfg80211_ibss_vsie_set_buffer(struct net_device *dev, vndr_ie_setbuf_t *ibss_vsie,
+ int ibss_vsie_len)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
if (cfg != NULL && ibss_vsie != NULL) {
if (cfg->ibss_vsie != NULL) {
- kfree(cfg->ibss_vsie);
+ MFREE(cfg->osh, cfg->ibss_vsie, cfg->ibss_vsie_len);
}
cfg->ibss_vsie = ibss_vsie;
cfg->ibss_vsie_len = ibss_vsie_len;
@@ -3139,8 +4132,7 @@
{
/* free & initiralize VSIE (Vendor Specific IE) */
if (cfg->ibss_vsie != NULL) {
- kfree(cfg->ibss_vsie);
- cfg->ibss_vsie = NULL;
+ MFREE(cfg->osh, cfg->ibss_vsie, cfg->ibss_vsie_len);
cfg->ibss_vsie_len = 0;
}
}
@@ -3148,35 +4140,37 @@
s32
wl_cfg80211_ibss_vsie_delete(struct net_device *dev)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
char *ioctl_buf = NULL;
- s32 ret = BCME_OK;
+ s32 ret = BCME_OK, bssidx;
if (cfg != NULL && cfg->ibss_vsie != NULL) {
- ioctl_buf = kmalloc(WLC_IOCTL_MEDLEN, GFP_KERNEL);
+ ioctl_buf = (char *)MALLOC(cfg->osh, WLC_IOCTL_MEDLEN);
if (!ioctl_buf) {
WL_ERR(("ioctl memory alloc failed\n"));
return -ENOMEM;
}
-
+ if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
+ WL_ERR(("Find index failed\n"));
+ ret = BCME_ERROR;
+ goto end;
+ }
/* 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';
+ strlcpy(cfg->ibss_vsie->cmd, "del", sizeof(cfg->ibss_vsie->cmd));
- ret = wldev_iovar_setbuf(dev, "ie",
- cfg->ibss_vsie, cfg->ibss_vsie_len,
- ioctl_buf, WLC_IOCTL_MEDLEN, NULL);
+ ret = wldev_iovar_setbuf_bsscfg(dev, "vndr_ie",
+ cfg->ibss_vsie, cfg->ibss_vsie_len,
+ ioctl_buf, WLC_IOCTL_MEDLEN, bssidx, NULL);
WL_ERR(("ret=%d\n", ret));
if (ret == BCME_OK) {
- /* free & initiralize VSIE */
- kfree(cfg->ibss_vsie);
- cfg->ibss_vsie = NULL;
+ /* Free & initialize VSIE */
+ MFREE(cfg->osh, cfg->ibss_vsie, cfg->ibss_vsie_len);
cfg->ibss_vsie_len = 0;
}
-
+end:
if (ioctl_buf) {
- kfree(ioctl_buf);
+ MFREE(cfg->osh, ioctl_buf, WLC_IOCTL_MEDLEN);
}
}
@@ -3192,7 +4186,7 @@
struct wireless_dev* wdev = NULL;
struct net_device *new_ndev = NULL;
struct net_device *primary_ndev = NULL;
- s32 timeout;
+ long timeout;
wl_aibss_if_t aibss_if;
wl_if_event_info *event = NULL;
@@ -3206,15 +4200,15 @@
/* generate a new MAC address for the IBSS interface */
get_primary_mac(cfg, &cfg->ibss_if_addr);
cfg->ibss_if_addr.octet[4] ^= 0x40;
- memset(&aibss_if, sizeof(aibss_if), 0);
+ bzero(&aibss_if, sizeof(aibss_if));
memcpy(&aibss_if.addr, &cfg->ibss_if_addr, sizeof(aibss_if.addr));
aibss_if.chspec = 0;
aibss_if.len = sizeof(aibss_if);
cfg->bss_pending_op = TRUE;
- memset(&cfg->if_event_info, 0, sizeof(cfg->if_event_info));
+ bzero(&cfg->if_event_info, sizeof(cfg->if_event_info));
err = wldev_iovar_setbuf(primary_ndev, "aibss_ifadd", &aibss_if,
- sizeof(aibss_if), cfg->ioctl_buf, WLC_IOCTL_MAXLEN, NULL);
+ sizeof(aibss_if), cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
if (err) {
WL_ERR(("IOVAR aibss_ifadd failed with error %d\n", err));
goto fail;
@@ -3235,7 +4229,7 @@
event->mac, event->bssidx, event->name);
if (new_ndev == NULL)
goto fail;
- wdev = kzalloc(sizeof(*wdev), GFP_KERNEL);
+ wdev = (struct wireless_dev *)MALLOCZ(cfg->osh, sizeof(*wdev));
if (wdev == NULL)
goto fail;
wdev->wiphy = wiphy;
@@ -3248,10 +4242,11 @@
* needs to be modified to take one parameter (bool need_rtnl_lock)
*/
ASSERT_RTNL();
- if (wl_cfg80211_register_if(cfg, event->ifidx, new_ndev) != BCME_OK)
+ if (wl_cfg80211_register_if(cfg, event->ifidx, new_ndev, FALSE) != BCME_OK)
goto fail;
- wl_alloc_netinfo(cfg, new_ndev, wdev, WL_MODE_IBSS, PM_ENABLE, event->bssidx);
+ wl_alloc_netinfo(cfg, new_ndev, wdev, WL_IF_TYPE_IBSS,
+ PM_ENABLE, event->bssidx, event->ifidx);
cfg->ibss_cfgdev = ndev_to_cfgdev(new_ndev);
WL_ERR(("IBSS interface %s created\n", new_ndev->name));
return cfg->ibss_cfgdev;
@@ -3260,9 +4255,10 @@
WL_ERR(("failed to create IBSS interface %s \n", name));
cfg->bss_pending_op = FALSE;
if (new_ndev)
- wl_cfg80211_remove_if(cfg, event->ifidx, new_ndev);
- if (wdev)
- kfree(wdev);
+ wl_cfg80211_remove_if(cfg, event->ifidx, new_ndev, FALSE);
+ if (wdev) {
+ MFREE(cfg->osh, wdev, sizeof(*wdev));
+ }
return NULL;
}
@@ -3273,7 +4269,7 @@
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
struct net_device *ndev = NULL;
struct net_device *primary_ndev = NULL;
- s32 timeout;
+ long timeout;
if (!cfgdev || cfg->ibss_cfgdev != cfgdev || ETHER_ISNULLADDR(&cfg->ibss_if_addr.octet))
return -EINVAL;
@@ -3281,9 +4277,9 @@
primary_ndev = bcmcfg_to_prmry_ndev(cfg);
cfg->bss_pending_op = TRUE;
- memset(&cfg->if_event_info, 0, sizeof(cfg->if_event_info));
+ bzero(&cfg->if_event_info, sizeof(cfg->if_event_info));
err = wldev_iovar_setbuf(primary_ndev, "aibss_ifdel", &cfg->ibss_if_addr,
- sizeof(cfg->ibss_if_addr), cfg->ioctl_buf, WLC_IOCTL_MAXLEN, NULL);
+ sizeof(cfg->ibss_if_addr), cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
if (err) {
WL_ERR(("IOVAR aibss_ifdel failed with error %d\n", err));
goto fail;
@@ -3295,7 +4291,7 @@
goto fail;
}
- wl_cfg80211_remove_if(cfg, cfg->if_event_info.ifidx, ndev);
+ wl_cfg80211_remove_if(cfg, cfg->if_event_info.ifidx, ndev, FALSE);
cfg->ibss_cfgdev = NULL;
return 0;
@@ -3306,55 +4302,206 @@
#endif /* WLAIBSS_MCHAN */
s32
-wl_cfg80211_interface_ops(struct bcm_cfg80211 *cfg,
- struct net_device *ndev, s32 bsscfg_idx,
- enum nl80211_iftype iface_type, s32 del, u8 *addr)
+wl_cfg80211_to_fw_iftype(wl_iftype_t iftype)
{
- wl_interface_create_t iface;
- s32 ret;
- wl_interface_info_t *info;
+ s32 ret = BCME_ERROR;
- bzero(&iface, sizeof(wl_interface_create_t));
+ switch (iftype) {
+ case WL_IF_TYPE_AP:
+ ret = WL_INTERFACE_TYPE_AP;
+ break;
+ case WL_IF_TYPE_STA:
+ ret = WL_INTERFACE_TYPE_STA;
+ break;
+ case WL_IF_TYPE_NAN_NMI:
+ case WL_IF_TYPE_NAN:
+ ret = WL_INTERFACE_TYPE_NAN;
+ break;
+ case WL_IF_TYPE_P2P_DISC:
+ ret = WL_INTERFACE_TYPE_P2P_DISC;
+ break;
+ case WL_IF_TYPE_P2P_GO:
+ ret = WL_INTERFACE_TYPE_P2P_GO;
+ break;
+ case WL_IF_TYPE_P2P_GC:
+ ret = WL_INTERFACE_TYPE_P2P_GC;
+ break;
+ case WL_IF_TYPE_AWDL:
+ ret = WL_INTERFACE_TYPE_AWDL;
+ break;
- iface.ver = WL_INTERFACE_CREATE_VER;
-
- if (iface_type == NL80211_IFTYPE_AP)
- iface.flags = WL_INTERFACE_CREATE_AP;
- else
- iface.flags = WL_INTERFACE_CREATE_STA;
-
- if (del) {
- ret = wldev_iovar_setbuf(ndev, "interface_remove",
- NULL, 0, cfg->ioctl_buf, WLC_IOCTL_MEDLEN, NULL);
- } else {
- if (addr) {
- memcpy(&iface.mac_addr.octet, addr, ETH_ALEN);
- iface.flags |= WL_INTERFACE_MAC_USE;
- }
- ret = wldev_iovar_getbuf(ndev, "interface_create",
- &iface, sizeof(wl_interface_create_t),
- cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
- if (ret == 0) {
- /* success */
- info = (wl_interface_info_t *)cfg->ioctl_buf;
- WL_DBG(("wl interface create success!! bssidx:%d \n",
- info->bsscfgidx));
- ret = info->bsscfgidx;
- }
+ default:
+ WL_ERR(("Unsupported type:%d \n", iftype));
+ ret = -EINVAL;
+ break;
}
-
- if (ret < 0)
- WL_ERR(("Interface %s failed!! ret %d\n",
- del ? "remove" : "create", ret));
-
return ret;
}
+s32
+wl_cfg80211_interface_ops(struct bcm_cfg80211 *cfg,
+ struct net_device *ndev, s32 bsscfg_idx,
+ wl_iftype_t cfg_iftype, s32 del, u8 *addr)
+{
+ s32 ret;
+ struct wl_interface_create_v2 iface;
+ wl_interface_create_v3_t iface_v3;
+ struct wl_interface_info_v1 *info;
+ wl_interface_info_v2_t *info_v2;
+ uint32 ifflags = 0;
+ bool use_iface_info_v2 = false;
+ u8 ioctl_buf[WLC_IOCTL_SMLEN];
+ s32 iftype;
+
+ if (del) {
+ ret = wldev_iovar_setbuf(ndev, "interface_remove",
+ NULL, 0, ioctl_buf, sizeof(ioctl_buf), NULL);
+ if (unlikely(ret))
+ WL_ERR(("Interface remove failed!! ret %d\n", ret));
+ return ret;
+ }
+
+ /* Interface create */
+ bzero(&iface, sizeof(iface));
+ /*
+ * flags field is still used along with iftype inorder to support the old version of the
+ * FW work with the latest app changes.
+ */
+
+ iftype = wl_cfg80211_to_fw_iftype(cfg_iftype);
+ if (iftype < 0) {
+ return -ENOTSUPP;
+ }
+
+ if (addr) {
+ ifflags |= WL_INTERFACE_MAC_USE;
+ }
+
+ /* Pass ver = 0 for fetching the interface_create iovar version */
+ ret = wldev_iovar_getbuf(ndev, "interface_create",
+ &iface, sizeof(struct wl_interface_create_v2),
+ ioctl_buf, sizeof(ioctl_buf), NULL);
+ if (ret == BCME_UNSUPPORTED) {
+ WL_ERR(("interface_create iovar not supported\n"));
+ return ret;
+ } else if ((ret == 0) && *((uint32 *)ioctl_buf) == WL_INTERFACE_CREATE_VER_3) {
+ WL_DBG(("interface_create version 3. flags:0x%x \n", ifflags));
+ use_iface_info_v2 = true;
+ bzero(&iface_v3, sizeof(wl_interface_create_v3_t));
+ iface_v3.ver = WL_INTERFACE_CREATE_VER_3;
+ iface_v3.iftype = iftype;
+ iface_v3.flags = ifflags;
+ if (addr) {
+ memcpy(&iface_v3.mac_addr.octet, addr, ETH_ALEN);
+ }
+ ret = wldev_iovar_getbuf(ndev, "interface_create",
+ &iface_v3, sizeof(wl_interface_create_v3_t),
+ ioctl_buf, sizeof(ioctl_buf), NULL);
+ } else {
+ /* On any other error, attempt with iovar version 2 */
+ WL_DBG(("interface_create version 2. get_ver:%d ifflags:0x%x\n", ret, ifflags));
+ iface.ver = WL_INTERFACE_CREATE_VER_2;
+ iface.iftype = iftype;
+ iface.flags = ifflags;
+ if (addr) {
+ memcpy(&iface.mac_addr.octet, addr, ETH_ALEN);
+ }
+ ret = wldev_iovar_getbuf(ndev, "interface_create",
+ &iface, sizeof(struct wl_interface_create_v2),
+ ioctl_buf, sizeof(ioctl_buf), NULL);
+ }
+
+ if (unlikely(ret)) {
+ WL_ERR(("Interface create failed!! ret %d\n", ret));
+ return ret;
+ }
+
+ /* success case */
+ if (use_iface_info_v2 == true) {
+ info_v2 = (wl_interface_info_v2_t *)ioctl_buf;
+ ret = info_v2->bsscfgidx;
+ } else {
+ /* Use v1 struct */
+ info = (struct wl_interface_info_v1 *)ioctl_buf;
+ ret = info->bsscfgidx;
+ }
+
+ WL_DBG(("wl interface create success!! bssidx:%d \n", ret));
+ return ret;
+}
+
+#if defined(IGUANA_LEGACY_CHIPS)
+#define BCM4355_REV_C1 0x0c
+#define BCM4355_REV_D0 0x0d
+bool
+wl_customer6_legacy_chip_check(struct bcm_cfg80211 *cfg,
+ struct net_device *ndev)
+{
+ u32 chipnum;
+ wlc_rev_info_t revinfo;
+ int ret;
+
+ /* Get the device rev info */
+ bzero(&revinfo, sizeof(revinfo));
+ ret = wldev_ioctl_get(ndev, WLC_GET_REVINFO, &revinfo, sizeof(revinfo));
+ if (ret < 0) {
+ WL_ERR(("wl_customer6_legacy_chip_check: GET revinfo FAILED. ret:%d\n", ret));
+ ASSERT(0);
+ return false;
+ }
+
+ WL_DBG(("wl_customer6_legacy_chip_check: GET_REVINFO device 0x%x, vendor 0x%x,"
+ " chipnum 0x%x\n",
+ dtoh32(revinfo.deviceid), dtoh32(revinfo.vendorid), dtoh32(revinfo.chipnum)));
+ chipnum = revinfo.chipnum;
+ if (
+#ifdef BCM4350_CHIP_ID
+ (chipnum == BCM4350_CHIP_ID) ||
+#endif /* BCM4350_CHIP_ID */
+#ifdef BCM4355_CHIP_ID
+ ((chipnum == BCM4355_CHIP_ID) && (revinfo.chiprev < BCM4355_REV_C1 ||
+ revinfo.chiprev == BCM4355_REV_D0)) ||
+#endif /* BCM4355_CHIP_ID */
+#ifdef BCM4345_CHIP_ID
+ (chipnum == BCM4345_CHIP_ID) ||
+#endif /* BCM4345_CHIP_ID */
+#ifdef BCM4373_CHIP_ID
+ (chipnum == BCM4373_CHIP_ID) ||
+#endif /* BCM4373_CHIP_ID */
+ false) {
+ /* WAR required */
+ WL_DBG(("%s: Customer6 legacy chip identified\n", __FUNCTION__));
+ return true;
+ }
+
+ return false;
+}
+
+void
+wl_bss_iovar_war(struct bcm_cfg80211 *cfg,
+ struct net_device *ndev, s32 *val)
+{
+ if (wl_customer6_legacy_chip_check(cfg, ndev)) {
+ /* Few firmware branches have issues in bss iovar handling and
+ * that can't be changed since they are in production.
+ */
+ if (*val == WLC_AP_IOV_OP_MANUAL_AP_BSSCFG_CREATE) {
+ *val = WLC_AP_IOV_OP_MANUAL_STA_BSSCFG_CREATE;
+ } else if (*val == WLC_AP_IOV_OP_MANUAL_STA_BSSCFG_CREATE) {
+ *val = WLC_AP_IOV_OP_MANUAL_AP_BSSCFG_CREATE;
+ } else {
+ /* Ignore for other bss enums */
+ return;
+ }
+ WL_ERR(("wl bss %d\n", *val));
+ }
+}
+#endif // endif
s32
wl_cfg80211_add_del_bss(struct bcm_cfg80211 *cfg,
struct net_device *ndev, s32 bsscfg_idx,
- enum nl80211_iftype iface_type, s32 del, u8 *addr)
+ wl_iftype_t brcm_iftype, s32 del, u8 *addr)
{
s32 ret = BCME_OK;
s32 val = 0;
@@ -3365,22 +4512,23 @@
struct ether_addr ea;
} bss_setbuf;
- WL_INFORM(("iface_type:%d del:%d \n", iface_type, del));
+ WL_DBG(("wl_iftype:%d del:%d \n", brcm_iftype, del));
bzero(&bss_setbuf, sizeof(bss_setbuf));
- /* AP=3, STA=2, up=1, down=0, val=-1 */
+ /* AP=2, STA=3, up=1, down=0, val=-1 */
if (del) {
- val = -1;
- } else if (iface_type == NL80211_IFTYPE_AP) {
- /* AP Interface */
+ val = WLC_AP_IOV_OP_DELETE;
+ } else if (brcm_iftype == WL_IF_TYPE_AP) {
+ /* Add/role change to AP Interface */
WL_DBG(("Adding AP Interface \n"));
- val = 3;
- } else if (iface_type == NL80211_IFTYPE_STATION) {
+ val = WLC_AP_IOV_OP_MANUAL_AP_BSSCFG_CREATE;
+ } else if (brcm_iftype == WL_IF_TYPE_STA) {
+ /* Add/role change to STA Interface */
WL_DBG(("Adding STA Interface \n"));
- val = 2;
+ val = WLC_AP_IOV_OP_MANUAL_STA_BSSCFG_CREATE;
} else {
- WL_ERR((" add_del_bss NOT supported for IFACE type:0x%x", iface_type));
+ WL_ERR((" add_del_bss NOT supported for IFACE type:0x%x", brcm_iftype));
return -EINVAL;
}
@@ -3391,6 +4539,7 @@
memcpy(&bss_setbuf.ea.octet, addr, ETH_ALEN);
}
+ WL_INFORM_MEM(("wl bss %d bssidx:%d iface:%s \n", val, bsscfg_idx, ndev->name));
ret = wldev_iovar_setbuf(ndev, "bss", &bss_setbuf, sizeof(bss_setbuf),
cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
if (ret != 0)
@@ -3399,13 +4548,524 @@
return ret;
}
-#if defined(WL_VIRTUAL_APSTA) || defined(DUAL_STA_STATIC_IF)
+s32
+wl_cfg80211_bss_up(struct bcm_cfg80211 *cfg, struct net_device *ndev, s32 bsscfg_idx, s32 bss_up)
+{
+ s32 ret = BCME_OK;
+ s32 val = bss_up ? 1 : 0;
+
+ struct {
+ s32 cfg;
+ s32 val;
+ } bss_setbuf;
+
+ bss_setbuf.cfg = htod32(bsscfg_idx);
+ bss_setbuf.val = htod32(val);
+
+ WL_INFORM_MEM(("wl bss -C %d %s\n", bsscfg_idx, bss_up ? "up" : "down"));
+ ret = wldev_iovar_setbuf(ndev, "bss", &bss_setbuf, sizeof(bss_setbuf),
+ cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
+
+ if (ret != 0) {
+ WL_ERR(("'bss %d' failed with %d\n", bss_up, ret));
+ }
+
+ return ret;
+}
+
+bool
+wl_cfg80211_bss_isup(struct net_device *ndev, int bsscfg_idx)
+{
+ s32 result, val;
+ bool isup = false;
+ s8 getbuf[64];
+
+ /* Check if the BSS is up */
+ *(int*)getbuf = -1;
+ result = wldev_iovar_getbuf_bsscfg(ndev, "bss", &bsscfg_idx,
+ sizeof(bsscfg_idx), getbuf, sizeof(getbuf), 0, NULL);
+ if (result != 0) {
+ WL_ERR(("'cfg bss -C %d' failed: %d\n", bsscfg_idx, result));
+ WL_ERR(("NOTE: this ioctl error is normal "
+ "when the BSS has not been created yet.\n"));
+ } else {
+ val = *(int*)getbuf;
+ val = dtoh32(val);
+ WL_DBG(("wl bss -C %d = %d\n", bsscfg_idx, val));
+ isup = (val ? TRUE : FALSE);
+ }
+ return isup;
+}
+
+s32
+wl_iftype_to_mode(wl_iftype_t iftype)
+{
+ s32 mode = BCME_ERROR;
+
+ switch (iftype) {
+ case WL_IF_TYPE_STA:
+ case WL_IF_TYPE_P2P_GC:
+ case WL_IF_TYPE_P2P_DISC:
+ mode = WL_MODE_BSS;
+ break;
+ case WL_IF_TYPE_AP:
+ case WL_IF_TYPE_P2P_GO:
+ mode = WL_MODE_AP;
+ break;
+ case WL_IF_TYPE_NAN:
+ mode = WL_MODE_NAN;
+ break;
+ case WL_IF_TYPE_AWDL:
+ mode = WL_MODE_AWDL;
+ break;
+ case WL_IF_TYPE_AIBSS:
+ /* Intentional fall through */
+ case WL_IF_TYPE_IBSS:
+ mode = WL_MODE_IBSS;
+ break;
+ default:
+ WL_ERR(("Unsupported type:%d\n", iftype));
+ break;
+ }
+ return mode;
+}
+
+s32
+cfg80211_to_wl_iftype(uint16 type, uint16 *role, uint16 *mode)
+{
+ switch (type) {
+ case NL80211_IFTYPE_STATION:
+ *role = WL_IF_TYPE_STA;
+ *mode = WL_MODE_BSS;
+ break;
+ case NL80211_IFTYPE_AP:
+ *role = WL_IF_TYPE_AP;
+ *mode = WL_MODE_AP;
+ break;
+#ifdef WL_CFG80211_P2P_DEV_IF
+ case NL80211_IFTYPE_P2P_DEVICE:
+ *role = WL_IF_TYPE_P2P_DISC;
+ *mode = WL_MODE_BSS;
+ break;
+#endif /* WL_CFG80211_P2P_DEV_IF */
+ case NL80211_IFTYPE_P2P_GO:
+ *role = WL_IF_TYPE_P2P_GO;
+ *mode = WL_MODE_AP;
+ break;
+ case NL80211_IFTYPE_P2P_CLIENT:
+ *role = WL_IF_TYPE_P2P_GC;
+ *mode = WL_MODE_BSS;
+ break;
+ case NL80211_IFTYPE_MONITOR:
+ WL_ERR(("Unsupported mode \n"));
+ return BCME_UNSUPPORTED;
+ case NL80211_IFTYPE_ADHOC:
+ *role = WL_IF_TYPE_IBSS;
+ *mode = WL_MODE_IBSS;
+ break;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0))
+ case NL80211_IFTYPE_NAN:
+ *role = WL_IF_TYPE_NAN;
+ *mode = WL_MODE_NAN;
+ break;
+#endif // endif
+ default:
+ WL_ERR(("Unknown interface type:0x%x\n", type));
+ return BCME_ERROR;
+ }
+ return BCME_OK;
+}
+
+static s32
+wl_role_to_cfg80211_type(uint16 role, uint16 *wl_iftype, uint16 *mode)
+{
+ switch (role) {
+ case WLC_E_IF_ROLE_STA:
+ *wl_iftype = WL_IF_TYPE_STA;
+ *mode = WL_MODE_BSS;
+ return NL80211_IFTYPE_STATION;
+ case WLC_E_IF_ROLE_AP:
+ *wl_iftype = WL_IF_TYPE_AP;
+ *mode = WL_MODE_AP;
+ return NL80211_IFTYPE_AP;
+ case WLC_E_IF_ROLE_P2P_GO:
+ *wl_iftype = WL_IF_TYPE_P2P_GO;
+ *mode = WL_MODE_AP;
+ return NL80211_IFTYPE_P2P_GO;
+ case WLC_E_IF_ROLE_P2P_CLIENT:
+ *wl_iftype = WL_IF_TYPE_P2P_GC;
+ *mode = WL_MODE_BSS;
+ return NL80211_IFTYPE_P2P_CLIENT;
+ case WLC_E_IF_ROLE_IBSS:
+ *wl_iftype = WL_IF_TYPE_IBSS;
+ *mode = WL_MODE_IBSS;
+ return NL80211_IFTYPE_ADHOC;
+ case WLC_E_IF_ROLE_NAN:
+ *wl_iftype = WL_IF_TYPE_NAN;
+ *mode = WL_MODE_NAN;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)) && defined(WL_CFG80211_NAN)
+ /* NL80211_IFTYPE_NAN should only be used with CFG80211 NAN MGMT
+ * For Vendor HAL based NAN implementation, continue advertising
+ * as a STA interface
+ */
+ return NL80211_IFTYPE_NAN;
+#else
+ return NL80211_IFTYPE_STATION;
+#endif /* ((LINUX_VER >= KERNEL_VERSION(4, 9, 0))) && WL_CFG80211_NAN */
+
+ default:
+ WL_ERR(("Unknown interface role:0x%x. Forcing type station\n", role));
+ return BCME_ERROR;
+ }
+}
+
+struct net_device *
+wl_cfg80211_post_ifcreate(struct net_device *ndev,
+ wl_if_event_info *event, u8 *addr,
+ const char *name, bool rtnl_lock_reqd)
+{
+ struct bcm_cfg80211 *cfg;
+ struct net_device *primary_ndev;
+ struct net_device *new_ndev = NULL;
+ struct wireless_dev *wdev = NULL;
+#ifdef WL_STATIC_IF
+ int iface_num = 0;
+#endif /* WL_STATIC_IF */
+ s32 iface_type;
+ s32 ret = BCME_OK;
+ u16 mode;
+ u8 mac_addr[ETH_ALEN];
+ u16 wl_iftype;
+
+ if (!ndev || !event) {
+ WL_ERR(("Wrong arg\n"));
+ return NULL;
+ }
+
+ cfg = wl_get_cfg(ndev);
+ if (!cfg) {
+ WL_ERR(("cfg null\n"));
+ return NULL;
+ }
+
+ WL_DBG(("Enter. role:%d ifidx:%d bssidx:%d\n",
+ event->role, event->ifidx, event->bssidx));
+ if (!event->ifidx || !event->bssidx) {
+ /* Fw returned primary idx (0) for virtual interface */
+ WL_ERR(("Wrong index. ifidx:%d bssidx:%d \n",
+ event->ifidx, event->bssidx));
+ return NULL;
+ }
+
+ iface_type = wl_role_to_cfg80211_type(event->role, &wl_iftype, &mode);
+ if (iface_type < 0) {
+ /* Unknown iface type */
+ WL_ERR(("Wrong iface type \n"));
+ return NULL;
+ }
+
+ WL_DBG(("mac_ptr:%p name:%s role:%d nl80211_iftype:%d " MACDBG "\n",
+ addr, name, event->role, iface_type, MAC2STRDBG(event->mac)));
+ if (!name) {
+ /* If iface name is not provided, use dongle ifname */
+ name = event->name;
+ }
+
+ if (!addr) {
+ /* If mac address is not set, use primary mac with locally administered
+ * bit set.
+ */
+ primary_ndev = bcmcfg_to_prmry_ndev(cfg);
+ memcpy(mac_addr, primary_ndev->dev_addr, ETH_ALEN);
+ /* For customer6 builds, use primary mac address for virtual interface */
+ mac_addr[0] |= 0x02;
+ addr = mac_addr;
+ }
+
+#ifdef WL_STATIC_IF
+ if (is_static_iface_name(name, cfg)) {
+ new_ndev = wl_cfg80211_post_static_ifcreate(cfg, event, addr, iface_type, name);
+ if (!new_ndev) {
+ WL_ERR(("failed to get I/F pointer\n"));
+ return NULL;
+ }
+ wdev = new_ndev->ieee80211_ptr;
+ } else
+#endif /* WL_STATIC_IF */
+ {
+ new_ndev = wl_cfg80211_allocate_if(cfg, event->ifidx,
+ name, addr, event->bssidx, event->name);
+ if (!new_ndev) {
+ WL_ERR(("I/F allocation failed! \n"));
+ return NULL;
+ } else {
+ WL_DBG(("I/F allocation succeeded! ifidx:0x%x bssidx:0x%x \n",
+ event->ifidx, event->bssidx));
+ }
+
+ wdev = (struct wireless_dev *)MALLOCZ(cfg->osh, sizeof(*wdev));
+ if (!wdev) {
+ WL_ERR(("wireless_dev alloc failed! \n"));
+ wl_cfg80211_remove_if(cfg, event->ifidx, new_ndev, rtnl_lock_reqd);
+ return NULL;
+ }
+
+ wdev->wiphy = bcmcfg_to_wiphy(cfg);
+ wdev->iftype = iface_type;
+
+ new_ndev->ieee80211_ptr = wdev;
+ SET_NETDEV_DEV(new_ndev, wiphy_dev(wdev->wiphy));
+
+ memcpy(new_ndev->dev_addr, addr, ETH_ALEN);
+ if (wl_cfg80211_register_if(cfg, event->ifidx, new_ndev, rtnl_lock_reqd)
+ != BCME_OK) {
+ WL_ERR(("IFACE register failed \n"));
+ /* Post interface registration, wdev would be freed from the netdev
+ * destructor path. For other cases, handle it here.
+ */
+ MFREE(cfg->osh, wdev, sizeof(*wdev));
+ wl_cfg80211_remove_if(cfg, event->ifidx, new_ndev, rtnl_lock_reqd);
+ return NULL;
+ }
+ }
+
+ /* Initialize with the station mode params */
+ ret = wl_alloc_netinfo(cfg, new_ndev, wdev, wl_iftype,
+ PM_ENABLE, event->bssidx, event->ifidx);
+ if (unlikely(ret)) {
+ WL_ERR(("wl_alloc_netinfo Error (%d)\n", ret));
+ goto fail;
+ }
+
+ /* Apply the mode & infra setting based on iftype */
+ if ((ret = wl_config_infra(cfg, new_ndev, wl_iftype)) < 0) {
+ WL_ERR(("config ifmode failure (%d)\n", ret));
+ goto fail;
+ }
+
+ if (mode == WL_MODE_AP) {
+ wl_set_drv_status(cfg, AP_CREATING, new_ndev);
+ }
+
+ WL_INFORM_MEM(("Network Interface (%s) registered with host."
+ " cfg_iftype:%d wl_role:%d " MACDBG "\n",
+ new_ndev->name, iface_type, event->role, MAC2STRDBG(new_ndev->dev_addr)));
+
+#ifdef SUPPORT_SET_CAC
+ wl_cfg80211_set_cac(cfg, 0);
+#endif /* SUPPORT_SET_CAC */
+
+ return new_ndev;
+
+fail:
+#ifdef WL_STATIC_IF
+ /* remove static if from iflist */
+ if ((iface_num = get_iface_num(name, cfg)) >= 0) {
+ cfg->static_ndev_state[iface_num] = NDEV_STATE_FW_IF_FAILED;
+ wl_cfg80211_update_iflist_info(cfg, new_ndev, (DHD_MAX_IFS + iface_num), addr,
+ event->bssidx, event->name, NDEV_STATE_FW_IF_FAILED);
+ }
+#endif /* WL_STATIC_IF */
+ if (new_ndev) {
+ /* wdev would be freed from netdev destructor call back */
+ wl_cfg80211_remove_if(cfg, event->ifidx, new_ndev, rtnl_lock_reqd);
+ }
+
+ return NULL;
+}
+
+s32
+wl_cfg80211_delete_iface(struct bcm_cfg80211 *cfg,
+ wl_iftype_t sec_data_if_type)
+{
+ struct net_info *iter, *next;
+ struct net_device *primary_ndev;
+ s32 ret = BCME_OK;
+ uint8 i = 0;
+
+ BCM_REFERENCE(i);
+ BCM_REFERENCE(ret);
+
+ /* Note: This function will clean up only the network interface and host
+ * data structures. The firmware interface clean up will happen in the
+ * during chip reset (ifconfig wlan0 down for built-in drivers/rmmod
+ * context for the module case).
+ */
+ primary_ndev = bcmcfg_to_prmry_ndev(cfg);
+ WL_DBG(("Enter, deleting iftype %s\n",
+ wl_iftype_to_str(sec_data_if_type)));
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+ for_each_ndev(cfg, iter, next) {
+ GCC_DIAGNOSTIC_POP();
+ if (iter->ndev && (iter->ndev != primary_ndev)) {
+ if (iter->iftype != sec_data_if_type) {
+ continue;
+ }
+ switch (sec_data_if_type) {
+ case WL_IF_TYPE_P2P_GO:
+ case WL_IF_TYPE_P2P_GC: {
+ ret = _wl_cfg80211_del_if(cfg,
+ iter->ndev, NULL, iter->ndev->name);
+ break;
+ }
+#ifdef WL_NAN
+ case WL_IF_TYPE_NAN: {
+ if (cfg->nan_enable == false) {
+ WL_INFORM_MEM(("Nan is not active,"
+ " ignore NDI delete\n"));
+ } else {
+ ret = wl_cfgnan_delete_ndp(cfg, iter->ndev);
+ }
+ break;
+ }
+#endif /* WL_NAN */
+ case WL_IF_TYPE_AP: {
+ /* Cleanup AP */
+#ifdef WL_STATIC_IF
+ /* handle static ap */
+ if (is_static_iface(cfg, iter->ndev)) {
+ dev_close(iter->ndev);
+ } else
+#endif /* WL_STATIC_IF */
+ {
+ /* handle virtual created AP */
+ ret = _wl_cfg80211_del_if(cfg, iter->ndev,
+ NULL, iter->ndev->name);
+ }
+ break;
+ }
+ default: {
+ WL_ERR(("Unsupported interface type\n"));
+ ret = -ENOTSUPP;
+ goto fail;
+ }
+ }
+ }
+ }
+fail:
+ return ret;
+}
+
+void
+wl_cfg80211_cleanup_virtual_ifaces(struct bcm_cfg80211 *cfg, bool rtnl_lock_reqd)
+{
+ struct net_info *iter, *next;
+ struct net_device *primary_ndev;
+
+ /* Note: This function will clean up only the network interface and host
+ * data structures. The firmware interface clean up will happen in the
+ * during chip reset (ifconfig wlan0 down for built-in drivers/rmmod
+ * context for the module case).
+ */
+ primary_ndev = bcmcfg_to_prmry_ndev(cfg);
+ WL_DBG(("Enter\n"));
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+ for_each_ndev(cfg, iter, next) {
+ GCC_DIAGNOSTIC_POP();
+ if (iter->ndev && (iter->ndev != primary_ndev)) {
+ /* Ensure interfaces are down before deleting */
+#ifdef WL_STATIC_IF
+ /* Avoiding cleaning static ifaces */
+ if (!is_static_iface(cfg, iter->ndev))
+#endif /* WL_STATIC_IF */
+ {
+ dev_close(iter->ndev);
+ WL_DBG(("Cleaning up iface:%s \n", iter->ndev->name));
+ wl_cfg80211_post_ifdel(iter->ndev, rtnl_lock_reqd, 0);
+ }
+ }
+ }
+}
+
+s32
+wl_cfg80211_post_ifdel(struct net_device *ndev, bool rtnl_lock_reqd, s32 ifidx)
+{
+ s32 ret = BCME_OK;
+ struct bcm_cfg80211 *cfg;
+ struct net_info *netinfo = NULL;
+
+ if (!ndev || !ndev->ieee80211_ptr) {
+ /* No wireless dev done for this interface */
+ ret = -EINVAL;
+ goto exit;
+ }
+
+ cfg = wl_get_cfg(ndev);
+ if (!cfg) {
+ WL_ERR(("cfg null\n"));
+ ret = BCME_ERROR;
+ goto exit;
+ }
+
+ if (ifidx <= 0) {
+ WL_ERR(("Invalid IF idx for iface:%s\n", ndev->name));
+ ifidx = dhd_net2idx(((struct dhd_pub *)(cfg->pub))->info, ndev);
+ BCM_REFERENCE(ifidx);
+ if (ifidx <= 0) {
+ ASSERT(0);
+ ret = BCME_ERROR;
+ goto exit;
+ }
+ }
+
+ if ((netinfo = wl_get_netinfo_by_wdev(cfg, ndev_to_wdev(ndev))) == NULL) {
+ WL_ERR(("Find netinfo from wdev %p failed\n", ndev_to_wdev(ndev)));
+ ret = -ENODEV;
+ goto exit;
+ }
+
+#ifdef WL_STATIC_IF
+ if (is_static_iface(cfg, ndev)) {
+ ret = wl_cfg80211_post_static_ifdel(cfg, ndev);
+ } else
+#endif /* WL_STATIC_IF */
+ {
+ WL_INFORM_MEM(("[%s] cfg80211_remove_if ifidx:%d, vif_count:%d\n",
+ ndev->name, ifidx, cfg->vif_count));
+ wl_cfg80211_remove_if(cfg, ifidx, ndev, rtnl_lock_reqd);
+ cfg->bss_pending_op = FALSE;
+ }
+
+#ifdef SUPPORT_SET_CAC
+ wl_cfg80211_set_cac(cfg, 1);
+#endif /* SUPPORT_SET_CAC */
+exit:
+ return ret;
+}
+
+int
+wl_cfg80211_deinit_p2p_discovery(struct bcm_cfg80211 *cfg)
+{
+ s32 ret = BCME_OK;
+ bcm_struct_cfgdev *cfgdev;
+
+ if (cfg->p2p) {
+ /* De-initialize the p2p discovery interface, if operational */
+ WL_ERR(("Disabling P2P Discovery Interface \n"));
+#ifdef WL_CFG80211_P2P_DEV_IF
+ cfgdev = bcmcfg_to_p2p_wdev(cfg);
+#else
+ cfgdev = cfg->p2p_net;
+#endif // endif
+ if (cfgdev) {
+ ret = wl_cfg80211_scan_stop(cfg, cfgdev);
+ if (unlikely(ret < 0)) {
+ CFGP2P_ERR(("P2P scan stop failed, ret=%d\n", ret));
+ }
+ }
+
+ wl_cfgp2p_disable_discovery(cfg);
+ wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_DEVICE) = 0;
+ p2p_on(cfg) = false;
+ }
+ return ret;
+}
/* Create a Generic Network Interface and initialize it depending up on
* the interface type
*/
-bcm_struct_cfgdev*
+struct wireless_dev *
wl_cfg80211_create_iface(struct wiphy *wiphy,
- enum nl80211_iftype iface_type,
+ wl_iftype_t wl_iftype,
u8 *mac_addr, const char *name)
{
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
@@ -3413,20 +5073,29 @@
struct net_device *primary_ndev = NULL;
s32 ret = BCME_OK;
s32 bsscfg_idx = 0;
- u32 timeout;
+ long timeout;
wl_if_event_info *event = NULL;
- struct wireless_dev *wdev = NULL;
u8 addr[ETH_ALEN];
+ struct net_info *iter, *next;
WL_DBG(("Enter\n"));
-
if (!name) {
WL_ERR(("Interface name not provided\n"));
return NULL;
}
-
+ else {
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+ for_each_ndev(cfg, iter, next) {
+ GCC_DIAGNOSTIC_POP();
+ if (iter->ndev) {
+ if (strncmp(iter->ndev->name, name, strlen(name)) == 0) {
+ WL_ERR(("Interface name,%s exists!\n", iter->ndev->name));
+ return NULL;
+ }
+ }
+ }
+ }
primary_ndev = bcmcfg_to_prmry_ndev(cfg);
-
if (likely(!mac_addr)) {
/* Use primary MAC with the locally administered bit for the
* Secondary STA I/F
@@ -3438,54 +5107,32 @@
memcpy(addr, mac_addr, ETH_ALEN);
}
- if ((iface_type != NL80211_IFTYPE_STATION) && (iface_type != NL80211_IFTYPE_AP)) {
- WL_ERR(("IFACE type:%d not supported. STA "
- "or AP IFACE is only supported\n", iface_type));
- return NULL;
- }
-
cfg->bss_pending_op = TRUE;
- memset(&cfg->if_event_info, 0, sizeof(cfg->if_event_info));
-
- /* De-initialize the p2p discovery interface, if operational */
- if (p2p_is_on(cfg)) {
- WL_DBG(("Disabling P2P Discovery Interface \n"));
-#ifdef WL_CFG80211_P2P_DEV_IF
- ret = wl_cfg80211_scan_stop(bcmcfg_to_p2p_wdev(cfg));
-#else
- ret = wl_cfg80211_scan_stop(cfg->p2p_net);
-#endif
- if (unlikely(ret < 0)) {
- CFGP2P_ERR(("P2P scan stop failed, ret=%d\n", ret));
- }
-
- wl_cfgp2p_disable_discovery(cfg);
- wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_DEVICE) = 0;
- p2p_on(cfg) = false;
- }
+ bzero(&cfg->if_event_info, sizeof(cfg->if_event_info));
/*
* Intialize the firmware I/F.
*/
- ret = wl_cfg80211_interface_ops(cfg, primary_ndev, bsscfg_idx,
- NL80211_IFTYPE_STATION, 0, addr);
+ {
+ ret = wl_cfg80211_interface_ops(cfg, primary_ndev, bsscfg_idx,
+ wl_iftype, 0, addr);
+ }
if (ret == BCME_UNSUPPORTED) {
/* Use bssidx 1 by default */
bsscfg_idx = 1;
if ((ret = wl_cfg80211_add_del_bss(cfg, primary_ndev,
- bsscfg_idx, iface_type, 0, addr)) < 0) {
- return NULL;
+ bsscfg_idx, wl_iftype, 0, addr)) < 0) {
+ goto exit;
}
} else if (ret < 0) {
WL_ERR(("Interface create failed!! ret:%d \n", ret));
- goto fail;
+ goto exit;
} else {
/* Success */
bsscfg_idx = ret;
}
WL_DBG(("Interface created!! bssidx:%d \n", bsscfg_idx));
-
/*
* Wait till the firmware send a confirmation event back.
*/
@@ -3493,117 +5140,108 @@
timeout = wait_event_interruptible_timeout(cfg->netif_change_event,
!cfg->bss_pending_op, msecs_to_jiffies(MAX_WAIT_TIME));
if (timeout <= 0 || cfg->bss_pending_op) {
- WL_ERR(("ADD_IF event, didn't come. Return \n"));
- goto fail;
+ WL_ERR(("ADD_IF event, didn't come. Return. timeout:%lu bss_pending_op:%d\n",
+ timeout, cfg->bss_pending_op));
+ if (timeout == -ERESTARTSYS) {
+ WL_ERR(("waitqueue was interrupted by a signal, returns -ERESTARTSYS\n"));
+ }
+ goto exit;
}
+ event = &cfg->if_event_info;
/*
* Since FW operation is successful,we can go ahead with the
* the host interface creation.
*/
- event = &cfg->if_event_info;
- new_ndev = wl_cfg80211_allocate_if(cfg, event->ifidx,
- (char*)name, addr, event->bssidx, event->name);
- if (!new_ndev) {
- WL_ERR(("I/F allocation failed! \n"));
- goto fail;
- } else
- WL_DBG(("I/F allocation succeeded! ifidx:0x%x bssidx:0x%x \n",
- event->ifidx, event->bssidx));
+ new_ndev = wl_cfg80211_post_ifcreate(primary_ndev,
+ event, addr, name, false);
- wdev = kzalloc(sizeof(*wdev), GFP_KERNEL);
- if (!wdev) {
- WL_ERR(("wireless_dev alloc failed! \n"));
- goto fail;
+ if (new_ndev) {
+ /* Iface post ops successful. Return ndev/wdev ptr */
+ return new_ndev->ieee80211_ptr;
}
- wdev->wiphy = wiphy;
- wdev->iftype = iface_type;
- new_ndev->ieee80211_ptr = wdev;
- SET_NETDEV_DEV(new_ndev, wiphy_dev(wdev->wiphy));
-
- /* RTNL lock must have been acquired. */
- ASSERT_RTNL();
-
- /* Set the locally administed mac addr, if not applied already */
- if (memcmp(addr, event->mac, ETH_ALEN) != 0) {
- ret = wldev_iovar_setbuf_bsscfg(primary_ndev, "cur_etheraddr",
- addr, ETH_ALEN, cfg->ioctl_buf, WLC_IOCTL_MAXLEN,
- event->bssidx, &cfg->ioctl_buf_sync);
- if (unlikely(ret)) {
- WL_ERR(("set cur_etheraddr Error (%d)\n", ret));
- goto fail;
- }
- memcpy(new_ndev->dev_addr, addr, ETH_ALEN);
- }
-
- if (wl_cfg80211_register_if(cfg, event->ifidx, new_ndev) != BCME_OK) {
- WL_ERR(("IFACE register failed \n"));
- goto fail;
- }
-
- /* Initialize with the station mode params */
- wl_alloc_netinfo(cfg, new_ndev, wdev,
- (iface_type == NL80211_IFTYPE_STATION) ?
- WL_MODE_BSS : WL_MODE_AP, PM_ENABLE, event->bssidx);
- cfg->bss_cfgdev = ndev_to_cfgdev(new_ndev);
- cfg->cfgdev_bssidx = event->bssidx;
-
- WL_DBG(("Host Network Interface for Secondary I/F created"));
-
- return cfg->bss_cfgdev;
-
-fail:
+exit:
cfg->bss_pending_op = FALSE;
- cfg->cfgdev_bssidx = -1;
- if (wdev)
- kfree(wdev);
- if (new_ndev)
- wl_cfg80211_remove_if(cfg, event->ifidx, new_ndev);
-
return NULL;
}
s32
-wl_cfg80211_del_iface(struct wiphy *wiphy, bcm_struct_cfgdev *cfgdev)
+wl_cfg80211_del_iface(struct wiphy *wiphy, struct wireless_dev *wdev)
{
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
struct net_device *ndev = NULL;
- struct net_device *primary_ndev = NULL;
s32 ret = BCME_OK;
s32 bsscfg_idx = 1;
- u32 timeout;
- u32 ifidx;
- enum nl80211_iftype iface_type = NL80211_IFTYPE_STATION;
+ long timeout;
+ u16 wl_iftype;
+ u16 wl_mode;
WL_DBG(("Enter\n"));
-
- if (!cfg->bss_cfgdev)
- return 0;
/* If any scan is going on, abort it */
if (wl_get_drv_status_all(cfg, SCANNING)) {
WL_DBG(("Scan in progress. Aborting the scan!\n"));
- wl_notify_escan_complete(cfg, cfg->escan_info.ndev, true, true);
+ wl_cfg80211_cancel_scan(cfg);
}
- ndev = (struct net_device *)cfgdev_to_ndev(cfg->bss_cfgdev);
- primary_ndev = bcmcfg_to_prmry_ndev(cfg);
+ bsscfg_idx = wl_get_bssidx_by_wdev(cfg, wdev);
+ if (bsscfg_idx <= 0) {
+ /* validate bsscfgidx */
+ WL_ERR(("Wrong bssidx! \n"));
+ return -EINVAL;
+ }
- cfg->bss_pending_op = TRUE;
+ /* Handle p2p iface */
+ if ((ret = wl_cfg80211_p2p_if_del(wiphy, wdev)) != BCME_NOTFOUND) {
+ WL_DBG(("P2P iface del handled \n"));
+#ifdef SUPPORT_SET_CAC
+ wl_cfg80211_set_cac(cfg, 1);
+#endif /* SUPPORT_SET_CAC */
+ return ret;
+ }
+
+ ndev = wdev->netdev;
+ if (unlikely(!ndev)) {
+ WL_ERR(("ndev null! \n"));
+ return -EINVAL;
+ }
+
memset(&cfg->if_event_info, 0, sizeof(cfg->if_event_info));
+ if (cfg80211_to_wl_iftype(ndev->ieee80211_ptr->iftype,
+ &wl_iftype, &wl_mode) < 0) {
+ return -EINVAL;
+ }
+
+ WL_DBG(("del interface. bssidx:%d cfg_iftype:%d wl_iftype:%d",
+ bsscfg_idx, ndev->ieee80211_ptr->iftype, wl_iftype));
/* Delete the firmware interface. "interface_remove" command
* should go on the interface to be deleted
*/
- ret = wl_cfg80211_interface_ops(cfg, ndev, cfg->cfgdev_bssidx,
- NL80211_IFTYPE_STATION, 1, NULL);
+ if (wl_cfg80211_get_bus_state(cfg)) {
+ WL_ERR(("Bus state is down: %d\n", __LINE__));
+ ret = BCME_DONGLE_DOWN;
+ goto exit;
+ }
+
+ cfg->bss_pending_op = true;
+ ret = wl_cfg80211_interface_ops(cfg, ndev, bsscfg_idx,
+ wl_iftype, 1, NULL);
if (ret == BCME_UNSUPPORTED) {
if ((ret = wl_cfg80211_add_del_bss(cfg, ndev,
- bsscfg_idx, iface_type, true, NULL)) < 0) {
+ bsscfg_idx, wl_iftype, true, NULL)) < 0) {
WL_ERR(("DEL bss failed ret:%d \n", ret));
goto exit;
}
+ } else if ((ret == BCME_NOTAP) || (ret == BCME_NOTSTA)) {
+ /* De-init sequence involving role downgrade not happened.
+ * Do nothing and return error. The del command should be
+ * retried.
+ */
+ WL_ERR(("ifdel role mismatch:%d\n", ret));
+ ret = -EBADTYPE;
+ goto exit;
} else if (ret < 0) {
WL_ERR(("Interface DEL failed ret:%d \n", ret));
goto exit;
@@ -3613,20 +5251,34 @@
!cfg->bss_pending_op, msecs_to_jiffies(MAX_WAIT_TIME));
if (timeout <= 0 || cfg->bss_pending_op) {
WL_ERR(("timeout in waiting IF_DEL event\n"));
+ /* The interface unregister will happen from wifi reset context */
+ ret = -ETIMEDOUT;
+ /* fall through */
}
exit:
- ifidx = dhd_net2idx(((struct dhd_pub *)(cfg->pub))->info, ndev);
- wl_cfg80211_remove_if(cfg, ifidx, ndev);
- cfg->bss_cfgdev = NULL;
- cfg->cfgdev_bssidx = -1;
- cfg->bss_pending_op = FALSE;
+ if (ret < 0) {
+ WL_ERR(("iface del failed:%d\n", ret));
+#ifdef WL_STATIC_IF
+ if (is_static_iface(cfg, ndev)) {
+ /*
+ * For static interface, clean up the host data,
+ * irrespective of fw status. For dynamic
+ * interfaces it gets cleaned from dhd_stop context
+ */
+ wl_cfg80211_post_static_ifdel(cfg, ndev);
+ }
+#endif /* WL_STATIC_IF */
+ } else {
+ ret = wl_cfg80211_post_ifdel(ndev, false, cfg->if_event_info.ifidx);
+ if (unlikely(ret)) {
+ WL_ERR(("post_ifdel failed\n"));
+ }
+ }
- WL_DBG(("IF_DEL Done.\n"));
-
+ cfg->bss_pending_op = false;
return ret;
}
-#endif /* defined(WL_VIRTUAL_APSTA) || defined(DUAL_STA_STATIC_IF) */
static s32
wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
@@ -3647,8 +5299,9 @@
WL_TRACE(("In\n"));
RETURN_EIO_IF_NOT_UP(cfg);
- WL_INFORM(("JOIN BSSID:" MACDBG "\n", MAC2STRDBG(params->bssid)));
- if (!params->ssid || params->ssid_len <= 0) {
+ WL_INFORM_MEM(("IBSS JOIN BSSID:" MACDBG "\n", MAC2STRDBG(params->bssid)));
+ if (!params->ssid || params->ssid_len <= 0 ||
+ params->ssid_len > DOT11_MAX_SSID_LEN) {
WL_ERR(("Invalid parameter\n"));
return -EINVAL;
}
@@ -3711,6 +5364,11 @@
} else {
cfg->ibss_starter = true;
}
+
+ if (bss) {
+ CFG80211_PUT_BSS(wiphy, bss);
+ }
+
if (chan) {
if (chan->band == IEEE80211_BAND_5GHZ)
param[0] = WLC_BAND_5G;
@@ -3728,27 +5386,26 @@
* Join with specific BSSID and cached SSID
* If SSID is zero join based on BSSID only
*/
- memset(&join_params, 0, sizeof(join_params));
- memcpy((void *)join_params.ssid.SSID, (void *)params->ssid,
+ bzero(&join_params, sizeof(join_params));
+ memcpy((void *)join_params.ssid.SSID, (const 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);
- err = wldev_ioctl(dev, WLC_SET_DESIRED_BSSID, &join_params.params.bssid,
- ETHER_ADDR_LEN, true);
+ err = wldev_ioctl_set(dev, WLC_SET_DESIRED_BSSID, &join_params.params.bssid,
+ ETHER_ADDR_LEN);
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);
+ bzero(&join_params.params.bssid, ETHER_ADDR_LEN);
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);
+ err = wldev_ioctl_set(dev, WLC_SET_SCANSUPPRESS,
+ &scan_suppress, sizeof(int));
if (unlikely(err)) {
WL_ERR(("Scan Suppress Setting Failed (%d)\n", err));
return err;
@@ -3764,19 +5421,18 @@
wldev_iovar_setint(dev, "wpa_auth", WPA_AUTH_DISABLED);
wldev_iovar_setint(dev, "wsec", 0);
-
- err = wldev_ioctl(dev, WLC_SET_SSID, &join_params,
- join_params_size, true);
+ err = wldev_ioctl_set(dev, WLC_SET_SSID, &join_params,
+ join_params_size);
if (unlikely(err)) {
- WL_ERR(("Error (%d)\n", err));
+ WL_ERR(("IBSS set_ssid 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);
+ err = wldev_ioctl_set(dev, WLC_SET_SCANSUPPRESS,
+ &scan_suppress, sizeof(int));
if (unlikely(err)) {
WL_ERR(("Reset Scan Suppress Flag Failed (%d)\n", err));
return err;
@@ -3784,7 +5440,12 @@
}
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 */
+#ifdef WL_RELMCAST
cfg->rmc_event_seq = 0; /* initialize rmcfail sequence */
+#endif /* WL_RELMCAST */
return err;
}
@@ -3798,13 +5459,13 @@
RETURN_EIO_IF_NOT_UP(cfg);
wl_link_down(cfg);
- WL_ERR(("Leave IBSS\n"));
+ WL_INFORM_MEM(("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);
+ err = wldev_ioctl_set(dev, WLC_DISASSOC, &scbval,
+ sizeof(scb_val_t));
if (unlikely(err)) {
wl_clr_drv_status(cfg, DISCONNECTING, dev);
WL_ERR(("error(%d)\n", err));
@@ -3818,46 +5479,64 @@
}
#ifdef MFP
-static int wl_cfg80211_get_rsn_capa(bcm_tlv_t *wpa2ie, u8* capa)
+static
+int wl_cfg80211_get_rsn_capa(const bcm_tlv_t *wpa2ie,
+ const u8** rsn_cap)
{
u16 suite_count;
- wpa_suite_mcast_t *mcast;
- wpa_suite_ucast_t *ucast;
- u16 len;
- wpa_suite_auth_key_mgmt_t *mgmt;
+ const wpa_suite_mcast_t *mcast;
+ const wpa_suite_ucast_t *ucast;
+ int len;
+ const wpa_suite_auth_key_mgmt_t *mgmt;
if (!wpa2ie)
- return -1;
+ return BCME_BADARG;
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];
+
+ /* check for Multicast cipher suite */
+ if ((len -= (WPA_SUITE_LEN + WPA2_VERSION_LEN)) <= 0) {
+ return BCME_NOTFOUND;
+ }
+
+ mcast = (const wpa_suite_mcast_t *)&wpa2ie->data[WPA2_VERSION_LEN];
+
+ /* Check for the unicast suite(s) */
+ if (len < WPA_IE_SUITE_COUNT_LEN) {
+ return BCME_NOTFOUND;
+ }
+
+ ucast = (const 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];
+
+ /* Check for AUTH key management suite(s) */
+ if (len < WPA_IE_SUITE_COUNT_LEN) {
+ return BCME_NOTFOUND;
+ }
+
+ mgmt = (const 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
+ if ((suite_count <= NL80211_MAX_NR_CIPHER_SUITES) &&
+ (len -= (WPA_IE_SUITE_COUNT_LEN +
+ (WPA_SUITE_LEN * suite_count))) >= RSN_CAP_LEN) {
+ rsn_cap[0] = (const u8 *)&mgmt->list[suite_count];
+ } else {
return BCME_BADLEN;
+ }
- return 0;
+ return BCME_OK;
}
#endif /* MFP */
static s32
wl_set_wpa_version(struct net_device *dev, struct cfg80211_connect_params *sme)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
struct wl_security *sec;
s32 val = 0;
s32 err = 0;
@@ -3872,15 +5551,36 @@
val = WPA_AUTH_PSK |
WPA_AUTH_UNSPECIFIED;
else if (sme->crypto.wpa_versions & NL80211_WPA_VERSION_2)
- val = WPA2_AUTH_PSK|
- WPA2_AUTH_UNSPECIFIED;
+#ifdef WL_SAE
+ if (sme->crypto.akm_suites[0] == WLAN_AKM_SUITE_SAE)
+ val = WPA3_AUTH_SAE_PSK;
+ else
+#endif /* WL_SAE */
+#ifdef WL_OWE
+ if (sme->crypto.akm_suites[0] == WLAN_AKM_SUITE_OWE)
+ val = WPA3_AUTH_OWE;
+ else
+#endif /* WL_OWE */
+ val = WPA2_AUTH_PSK |
+ WPA2_AUTH_UNSPECIFIED;
+#if defined(WL_SAE) && (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
+ else if (sme->crypto.wpa_versions & NL80211_WPA_VERSION_3)
+ val = WPA3_AUTH_SAE_PSK;
+#endif /* WL_SAE */
else
val = WPA_AUTH_DISABLED;
if (is_wps_conn(sme))
val = WPA_AUTH_DISABLED;
- WL_DBG(("setting wpa_auth to 0x%0x\n", val));
+#ifdef BCMWAPI_WPI
+ if (sme->crypto.wpa_versions & NL80211_WAPI_VERSION_1) {
+ WL_DBG((" * wl_set_wpa_version, set wpa_auth"
+ " to WPA_AUTH_WAPI 0x400"));
+ val = WAPI_AUTH_PSK | WAPI_AUTH_UNSPECIFIED;
+ }
+#endif // endif
+ WL_INFORM_MEM(("[%s] wl wpa_auth 0x%0x\n", dev->name, val));
err = wldev_iovar_setint_bsscfg(dev, "wpa_auth", val, bssidx);
if (unlikely(err)) {
WL_ERR(("set wpa_auth failed (%d)\n", err));
@@ -3891,11 +5591,35 @@
return err;
}
+#ifdef BCMWAPI_WPI
+static s32
+wl_set_set_wapi_ie(struct net_device *dev, struct cfg80211_connect_params *sme)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ s32 err = 0;
+ s32 bssidx;
+
+ WL_DBG((" wl_set_set_wapi_ie\n"));
+ if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
+ WL_ERR(("Find p2p index from wdev(%p) failed\n", dev->ieee80211_ptr));
+ return BCME_ERROR;
+ }
+
+ err = wldev_iovar_setbuf_bsscfg(dev, "wapiie", (const void *)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));
+ return err;
+ }
+ WL_INFORM_MEM(("wapi_ie successfully (%s)\n", dev->name));
+ return err;
+}
+#endif /* BCMWAPI_WPI */
static s32
wl_set_auth_type(struct net_device *dev, struct cfg80211_connect_params *sme)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
struct wl_security *sec;
s32 val = 0;
s32 err = 0;
@@ -3919,12 +5643,33 @@
val = WL_AUTH_OPEN_SHARED;
WL_DBG(("automatic\n"));
break;
+#ifdef WL_FILS
+ case NL80211_AUTHTYPE_FILS_SK:
+ WL_DBG(("fils shared key\n"));
+ val = WL_AUTH_FILS_SHARED;
+ break;
+ case NL80211_AUTHTYPE_FILS_SK_PFS:
+ val = WL_AUTH_FILS_SHARED_PFS;
+ WL_DBG(("fils shared key with pfs\n"));
+ break;
+ case NL80211_AUTHTYPE_FILS_PK:
+ WL_DBG(("fils public key\n"));
+ val = WL_AUTH_FILS_PUBLIC;
+ break;
+#endif /* WL_FILS */
+#ifdef WL_SAE
+ case NL80211_AUTHTYPE_SAE:
+ WL_DBG(("SAE authentication\n"));
+ val = WL_AUTH_SAE;
+ break;
+#endif /* WL_SAE */
default:
val = 2;
WL_ERR(("invalid auth type (%d)\n", sme->auth_type));
break;
}
+ WL_INFORM_MEM(("[%s] wl auth 0x%0x \n", dev->name, val));
err = wldev_iovar_setint_bsscfg(dev, "auth", val, bssidx);
if (unlikely(err)) {
WL_ERR(("set auth failed (%d)\n", err));
@@ -3935,17 +5680,62 @@
return err;
}
+static u32
+wl_rsn_cipher_wsec_algo_lookup(uint32 cipher)
+{
+ uint i;
+
+ for (i = 0; i < ARRAYSIZE(rsn_cipher_algo_lookup_tbl); i++) {
+ if (cipher == rsn_cipher_algo_lookup_tbl[i].cipher_suite) {
+ return rsn_cipher_algo_lookup_tbl[i].wsec_algo;
+ }
+ }
+ return WSEC_NONE;
+}
+
+static u32
+wl_rsn_cipher_wsec_key_algo_lookup(uint32 cipher)
+{
+ uint i;
+
+ for (i = 0; i < ARRAYSIZE(rsn_cipher_algo_lookup_tbl); i++) {
+ if (cipher == rsn_cipher_algo_lookup_tbl[i].cipher_suite) {
+ return rsn_cipher_algo_lookup_tbl[i].wsec_key_algo;
+ }
+ }
+ return CRYPTO_ALGO_OFF;
+}
+
+static u32
+wl_rsn_akm_wpa_auth_lookup(uint32 akm)
+{
+ uint i;
+
+ for (i = 0; i < ARRAYSIZE(rsn_akm_wpa_auth_lookup_tbl); i++) {
+ if (akm == rsn_akm_wpa_auth_lookup_tbl[i].akm_suite) {
+ return rsn_akm_wpa_auth_lookup_tbl[i].wpa_auth;
+ }
+ }
+ return WPA_AUTH_DISABLED;
+}
+
static s32
wl_set_set_cipher(struct net_device *dev, struct cfg80211_connect_params *sme)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
struct wl_security *sec;
s32 pval = 0;
s32 gval = 0;
s32 err = 0;
s32 wsec_val = 0;
-
+#ifdef BCMWAPI_WPI
+ s32 wapi_val = 0;
+ s32 val = 0;
+#endif // endif
s32 bssidx;
+#ifdef WL_GCMP
+ uint32 algos = 0, mask = 0;
+#endif /* WL_GCMP */
if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
WL_ERR(("Find p2p index from wdev(%p) failed\n", dev->ieee80211_ptr));
@@ -3953,87 +5743,523 @@
}
if (sme->crypto.n_ciphers_pairwise) {
+ pval = wl_rsn_cipher_wsec_algo_lookup(sme->crypto.ciphers_pairwise[0]);
+ if (pval == WSEC_NONE) {
+ WL_ERR(("invalid cipher pairwise (%d)\n", sme->crypto.ciphers_pairwise[0]));
+ return BCME_BADARG;
+ }
switch (sme->crypto.ciphers_pairwise[0]) {
- case WLAN_CIPHER_SUITE_WEP40:
- case WLAN_CIPHER_SUITE_WEP104:
- pval = WEP_ENABLED;
+#ifdef BCMWAPI_WPI
+ case WLAN_CIPHER_SUITE_SMS4:
+ val = pval;
+ err = wl_set_set_wapi_ie(dev, sme);
+ if (unlikely(err)) {
+ WL_DBG(("Set wapi ie failed \n"));
+ return err;
+ } else {
+ WL_DBG(("Set wapi ie succeded\n"));
+ }
+ wapi_val = WAPI_AUTH_PSK | WAPI_AUTH_UNSPECIFIED;
+ WL_INFORM_MEM(("[WAPI] wl wpa_auth to 0x%0x (%s)\n", val, dev->name));
+ err = wldev_iovar_setint_bsscfg(dev, "wpa_auth", wapi_val, bssidx);
+ if (unlikely(err)) {
+ WL_ERR(("set wpa_auth failed (%d)\n", err));
+ return err;
+ }
break;
- case WLAN_CIPHER_SUITE_TKIP:
- pval = TKIP_ENABLED;
+#endif /* BCMWAPI_WPI */
+#ifdef WL_GCMP
+ case WLAN_CIPHER_SUITE_GCMP:
+ case WLAN_CIPHER_SUITE_GCMP_256:
+ algos = KEY_ALGO_MASK(wl_rsn_cipher_wsec_key_algo_lookup(
+ sme->crypto.ciphers_pairwise[0]));
+ mask = algos | KEY_ALGO_MASK(CRYPTO_ALGO_AES_CCM);
break;
- case WLAN_CIPHER_SUITE_CCMP:
- case WLAN_CIPHER_SUITE_AES_CMAC:
- pval = AES_ENABLED;
+#endif /* WL_GCMP */
+ default: /* No post processing required */
break;
- default:
- WL_ERR(("invalid cipher pairwise (%d)\n",
- sme->crypto.ciphers_pairwise[0]));
- return -EINVAL;
}
}
+#if defined(BCMSUP_4WAY_HANDSHAKE)
+ /* Ensure in-dongle supplicant is turned on when FBT wants to do the 4-way
+ * handshake.
+ * Note that the FW feature flag only exists on kernels that support the
+ * FT-EAP AKM suite.
+ */
+ if ((cfg->wdev->wiphy->features & NL80211_FEATURE_FW_4WAY_HANDSHAKE) &&
+ (FW_SUPPORTED(dhdp, idsup)))
+ {
+ err = wldev_iovar_setint_bsscfg(dev, "sup_wpa", 1, bssidx);
+ if (err) {
+ WL_ERR(("FBT: Error setting sup_wpa (%d)\n", err));
+ return err;
+ } else {
+ WL_INFORM_MEM(("idsup enabled.\n"));
+ }
+ }
+#endif /* BCMSUP_4WAY_HANDSHAKE */
if (sme->crypto.cipher_group) {
+ gval = wl_rsn_cipher_wsec_algo_lookup(sme->crypto.cipher_group);
+ if (gval == WSEC_NONE) {
+ WL_ERR(("invalid cipher group (%d)\n", sme->crypto.cipher_group));
+ return BCME_BADARG;
+ }
switch (sme->crypto.cipher_group) {
- case WLAN_CIPHER_SUITE_WEP40:
- case WLAN_CIPHER_SUITE_WEP104:
- gval = WEP_ENABLED;
+#ifdef BCMWAPI_WPI
+ case WLAN_CIPHER_SUITE_SMS4:
+ val = gval;
break;
- case WLAN_CIPHER_SUITE_TKIP:
- gval = TKIP_ENABLED;
+#endif // endif
+#ifdef WL_GCMP
+ case WLAN_CIPHER_SUITE_GCMP:
+ case WLAN_CIPHER_SUITE_GCMP_256:
+ algos = KEY_ALGO_MASK(
+ wl_rsn_cipher_wsec_key_algo_lookup(sme->crypto.cipher_group));
+ mask = algos | KEY_ALGO_MASK(CRYPTO_ALGO_AES_CCM);
break;
- case WLAN_CIPHER_SUITE_CCMP:
- gval = AES_ENABLED;
+#endif /* WL_GCMP */
+ default: /* No post processing required */
break;
- case WLAN_CIPHER_SUITE_AES_CMAC:
- gval = AES_ENABLED;
- break;
- default:
- WL_ERR(("invalid cipher group (%d)\n",
- sme->crypto.cipher_group));
- return -EINVAL;
}
}
WL_DBG(("pval (%d) gval (%d)\n", pval, gval));
+#ifdef WL_GCMP
+ WL_DBG(("algos:%x, mask:%x", algos, mask));
+#endif /* WL_GCMP */
if (is_wps_conn(sme)) {
- if (sme->privacy)
- err = wldev_iovar_setint_bsscfg(dev, "wsec", 4, bssidx);
- else
+ if (sme->privacy) {
+ wsec_val = 4;
+ } else {
/* WPS-2.0 allows no security */
- err = wldev_iovar_setint_bsscfg(dev, "wsec", 0, bssidx);
+ wsec_val = 0;
+ }
} else {
+#ifdef BCMWAPI_WPI
+ if (sme->crypto.cipher_group == WLAN_CIPHER_SUITE_SMS4) {
+ WL_DBG((" NO, is_wps_conn, WAPI set to SMS4_ENABLED"));
+ wsec_val = val;
+ } else
+#endif // endif
+ {
WL_DBG((" NO, is_wps_conn, Set pval | gval to WSEC"));
wsec_val = pval | gval;
-
- WL_DBG((" Set WSEC to fW 0x%x \n", wsec_val));
- err = wldev_iovar_setint_bsscfg(dev, "wsec",
- wsec_val, bssidx);
+ }
}
+
+ WL_INFORM_MEM(("[%s] wl wsec 0x%x\n", dev->name, wsec_val));
+ err = wldev_iovar_setint_bsscfg(dev, "wsec", wsec_val, bssidx);
if (unlikely(err)) {
WL_ERR(("error (%d)\n", err));
return err;
}
-
+#ifdef WL_GCMP
+ if (wl_set_wsec_info_algos(dev, algos, mask)) {
+ WL_ERR(("set wsec_info error (%d)\n", err));
+ }
+#endif /* WL_GCMP */
sec = wl_read_prof(cfg, dev, WL_PROF_SEC);
sec->cipher_pairwise = sme->crypto.ciphers_pairwise[0];
sec->cipher_group = sme->crypto.cipher_group;
+ return err;
+}
+#ifdef WL_GCMP
+static s32
+wl_set_wsec_info_algos(struct net_device *dev, uint32 algos, uint32 mask)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ s32 bssidx;
+ s32 err = 0;
+ wl_wsec_info_t *wsec_info;
+ bcm_xtlv_t *wsec_info_tlv;
+ uint16 tlv_data_len;
+ uint8 tlv_data[8];
+ uint32 param_len;
+ uint8 * buf;
+
+ WL_DBG(("enter.\n"));
+ if (!cfg) {
+ return BCME_ERROR;
+ }
+ if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
+ WL_ERR(("Find index from wdev(%p) failed\n", dev->ieee80211_ptr));
+ return BCME_ERROR;
+ }
+
+ buf = MALLOCZ(cfg->osh, sizeof(wl_wsec_info_t) + sizeof(tlv_data));
+ if (!buf) {
+ WL_ERR(("No memory"));
+ return BCME_NOMEM;
+ }
+ wsec_info = (wl_wsec_info_t *)buf;
+ wsec_info->version = WL_WSEC_INFO_VERSION;
+ wsec_info_tlv = (bcm_xtlv_t *)(buf + OFFSETOF(wl_wsec_info_t, tlvs));
+
+ wsec_info->num_tlvs++;
+ tlv_data_len = sizeof(tlv_data);
+ err = memcpy_s(tlv_data, sizeof(tlv_data), &algos, sizeof(algos));
+ if (err) {
+ goto exit;
+ }
+ err = memcpy_s(tlv_data + sizeof(algos), sizeof(mask), &mask, sizeof(mask));
+ if (err) {
+ goto exit;
+ }
+ bcm_xtlv_pack_xtlv(wsec_info_tlv, WL_WSEC_INFO_BSS_ALGOS, tlv_data_len, tlv_data, 0);
+ param_len = OFFSETOF(wl_wsec_info_t, tlvs) + WL_WSEC_INFO_TLV_HDR_LEN + tlv_data_len;
+
+ err = wldev_iovar_setbuf_bsscfg(dev, "wsec_info", wsec_info, param_len,
+ cfg->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &cfg->ioctl_buf_sync);
+exit:
+ MFREE(cfg->osh, buf, sizeof(wl_wsec_info_t) + sizeof(tlv_data));
+ return err;
+}
+#endif /* WL_GCMP */
+#ifdef MFP
+static s32
+wl_cfg80211_set_mfp(struct bcm_cfg80211 *cfg,
+ struct net_device *dev,
+ struct cfg80211_connect_params *sme)
+{
+ s32 mfp = WL_MFP_NONE;
+ s32 current_mfp = WL_MFP_NONE;
+ const bcm_tlv_t *wpa2_ie;
+ const u8* rsn_cap = NULL;
+ bool fw_support = false;
+ int err, count = 0;
+ const u8 *eptr = NULL, *ptr = NULL;
+ const u8* group_mgmt_cs = NULL;
+ const wpa_pmkid_list_t* pmkid = NULL;
+
+ if (!sme) {
+ /* No connection params from userspace, Do nothing. */
+ return 0;
+ }
+
+ /* Check fw support and retreive current mfp val */
+ err = wldev_iovar_getint(dev, "mfp", ¤t_mfp);
+ if (!err) {
+ fw_support = true;
+ }
+
+ /* Parse the wpa2ie to decode the MFP capablity */
+ if (((wpa2_ie = bcm_parse_tlvs((const u8 *)sme->ie, sme->ie_len,
+ DOT11_MNG_RSN_ID)) != NULL) &&
+ (wl_cfg80211_get_rsn_capa(wpa2_ie, &rsn_cap) == 0) && rsn_cap) {
+ WL_DBG(("rsn_cap 0x%x%x\n", rsn_cap[0], rsn_cap[1]));
+ /* Check for MFP cap in the RSN capability field */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0))
+ if (sme->mfp)
+#endif // endif
+ {
+ if (rsn_cap[0] & RSN_CAP_MFPR) {
+ mfp = WL_MFP_REQUIRED;
+ } else if (rsn_cap[0] & RSN_CAP_MFPC) {
+ mfp = WL_MFP_CAPABLE;
+ }
+ }
+ /*
+ * eptr --> end/last byte addr of wpa2_ie
+ * ptr --> to keep track of current/required byte addr
+ */
+ eptr = (const u8*)wpa2_ie + (wpa2_ie->len + TLV_HDR_LEN);
+ /* pointing ptr to the next byte after rns_cap */
+ ptr = (const u8*)rsn_cap + RSN_CAP_LEN;
+ if (mfp && (eptr - ptr) >= WPA2_PMKID_COUNT_LEN) {
+ /* pmkid now to point to 1st byte addr of pmkid in wpa2_ie */
+ pmkid = (const wpa_pmkid_list_t*)ptr;
+ count = pmkid->count.low | (pmkid->count.high << 8);
+ /* ptr now to point to last byte addr of pmkid */
+ ptr = (const u8*)pmkid + (count * WPA2_PMKID_LEN
+ + WPA2_PMKID_COUNT_LEN);
+ if ((eptr - ptr) >= WPA_SUITE_LEN) {
+ /* group_mgmt_cs now to point to first byte addr of bip */
+ group_mgmt_cs = ptr;
+ }
+ }
+ }
+
+ WL_DBG(("mfp:%d wpa2_ie ptr:%p mfp fw_support:%d\n",
+ mfp, wpa2_ie, fw_support));
+
+ if (fw_support == false) {
+ if (mfp) {
+ /* if mfp > 0, mfp capability set in wpa ie, but
+ * FW indicated error for mfp. Propagate the error up.
+ */
+ WL_ERR(("mfp capability found in wpaie. But fw doesn't"
+ "seem to support MFP\n"));
+ err = -EINVAL;
+ goto exit;
+ } else {
+ /* Firmware doesn't support mfp. But since connection request
+ * is for non-mfp case, don't bother.
+ */
+ err = BCME_OK;
+ goto exit;
+ }
+ } else if (mfp != current_mfp) {
+ err = wldev_iovar_setint(dev, "mfp", mfp);
+ if (unlikely(err)) {
+ WL_ERR(("mfp (%d) set failed ret:%d \n", mfp, err));
+ goto exit;
+ }
+ WL_INFORM_MEM(("[%s] wl mfp 0x%x\n", dev->name, mfp));
+ }
+
+ if (group_mgmt_cs && bcmp((const uint8 *)WPA2_OUI,
+ group_mgmt_cs, (WPA_SUITE_LEN - 1)) == 0) {
+ WL_DBG(("BIP is found\n"));
+ err = wldev_iovar_setbuf(dev, "bip",
+ group_mgmt_cs, WPA_SUITE_LEN, cfg->ioctl_buf,
+ WLC_IOCTL_SMLEN, &cfg->ioctl_buf_sync);
+ /*
+ * Dont return failure for unsupported cases
+ * of bip iovar for backward compatibility
+ */
+ if (err != BCME_UNSUPPORTED && err < 0) {
+ WL_ERR(("bip set error (%d)\n", err));
+#if defined(IGUANA_LEGACY_CHIPS)
+ if (wl_customer6_legacy_chip_check(cfg,
+ bcmcfg_to_prmry_ndev(cfg))) {
+ /* Ignore bip error: Some older firmwares doesn't
+ * support bip iovar/ return BCME_NOTUP while trying
+ * to set bip from connect context. These firmares
+ * include bip in RSNIE by default. So its okay to
+ * ignore the error.
+ */
+ err = BCME_OK;
+ goto exit;
+ } else
+#endif // endif
+ {
+ goto exit;
+ }
+ } else {
+ WL_INFORM_MEM(("[%s] wl bip %02X:%02X:%02X\n",
+ dev->name, group_mgmt_cs[0], group_mgmt_cs[1],
+ group_mgmt_cs[2]));
+ }
+ }
+exit:
+ if (err) {
+ wl_flush_fw_log_buffer(bcmcfg_to_prmry_ndev(cfg),
+ FW_LOGSET_MASK_ALL);
+ }
+
+ return 0;
+}
+#endif /* MFP */
+
+#ifdef WL_FILS
+bool
+wl_is_fils_supported(struct net_device *ndev)
+{
+ s32 err;
+ u8 ioctl_buf[WLC_IOCTL_SMLEN] = {0};
+ bcm_iov_buf_t *iov_buf = (bcm_iov_buf_t *)ioctl_buf;
+
+ iov_buf->version = WL_FILS_IOV_VERSION;
+ err = wldev_iovar_getbuf(ndev, "fils", (uint8*)iov_buf, sizeof(bcm_iov_buf_t),
+ iov_buf, WLC_IOCTL_SMLEN, NULL);
+ if (err == BCME_UNSUPPORTED) {
+ WL_DBG(("FILS NOT supported\n"));
+ return false;
+ }
+
+ WL_INFORM(("FILS supported\n"));
+ return true;
+}
+
+#define WL_NUM_OF_TLV_IN_SET_FILS_PARAMS 4u
+static s32
+wl_set_fils_params(struct net_device *dev, struct cfg80211_connect_params *sme)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ bcm_iov_buf_t *iov_buf = NULL;
+ bcm_xtlvbuf_t tbuf;
+ s32 err = BCME_OK;
+ uint32 buf_size;
+
+ if ((sme->auth_type != NL80211_AUTHTYPE_FILS_SK) &&
+ (sme->auth_type != NL80211_AUTHTYPE_FILS_SK_PFS) &&
+ (sme->auth_type != NL80211_AUTHTYPE_FILS_PK)) {
+ return BCME_OK;
+ }
+ if (sme->fils_erp_rrk_len > WL_MAX_FILS_KEY_LEN) {
+ WL_ERR(("%s: FILS rRK exceed allowed size\n", __FUNCTION__));
+ err = BCME_BADARG;
+ goto exit;
+ }
+ /* Check incoming buffer length */
+ buf_size = sme->fils_erp_username_len + sme->fils_erp_realm_len + sme->fils_erp_rrk_len +
+ sizeof(sme->fils_erp_next_seq_num) +
+ WL_NUM_OF_TLV_IN_SET_FILS_PARAMS * BCM_XTLV_HDR_SIZE_EX(BCM_XTLV_OPTION_ALIGN32) +
+ sizeof(bcm_iov_buf_t) - 1u;
+
+ if (buf_size > WLC_IOCTL_SMLEN) {
+ WL_ERR(("%s: FILS connect params arguments exceed allowed size\n", __FUNCTION__));
+ err = BCME_BADARG;
+ goto exit;
+ }
+ iov_buf = MALLOCZ(cfg->osh, WLC_IOCTL_SMLEN);
+ if (!iov_buf) {
+ WL_ERR(("%s: iov_buf alloc failed! %d bytes\n", __FUNCTION__, WLC_IOCTL_SMLEN));
+ err = BCME_NOMEM;
+ goto exit;
+ }
+ iov_buf->version = WL_FILS_IOV_VERSION;
+ iov_buf->id = WL_FILS_CMD_ADD_CONNECT_PARAMS;
+ /* check if this should be len w/o headers */
+ err = bcm_xtlv_buf_init(&tbuf, (uint8*)&iov_buf->data[0],
+ WLC_IOCTL_SMLEN - sizeof(bcm_iov_buf_t) + sizeof(uint16),
+ BCM_XTLV_OPTION_ALIGN32);
+ if (err != BCME_OK) {
+ WL_ERR(("%s: xtlv_context initialization failed\n", __FUNCTION__));
+ goto exit;
+ }
+ if (sme->fils_erp_username_len && sme->fils_erp_username != NULL) {
+ err = bcm_xtlv_put_data(&tbuf, WL_FILS_XTLV_ERP_USERNAME,
+ sme->fils_erp_username, sme->fils_erp_username_len);
+ if (err != BCME_OK) {
+ WL_ERR(("%s: write xtlv failed\n", __FUNCTION__));
+ goto exit;
+ }
+ }
+ if (sme->fils_erp_realm_len && sme->fils_erp_realm != NULL) {
+ err = bcm_xtlv_put_data(&tbuf, WL_FILS_XTLV_ERP_REALM,
+ sme->fils_erp_realm, sme->fils_erp_realm_len);
+ if (err != BCME_OK) {
+ WL_ERR(("%s: write xtlv failed\n", __FUNCTION__));
+ goto exit;
+ }
+ }
+ if (sme->fils_erp_rrk_len && sme->fils_erp_rrk != NULL) {
+ err = bcm_xtlv_put_data(&tbuf, WL_FILS_XTLV_ERP_RRK,
+ sme->fils_erp_rrk, sme->fils_erp_rrk_len);
+ if (err != BCME_OK) {
+ WL_ERR(("%s: write xtlv failed\n", __FUNCTION__));
+ goto exit;
+ }
+ }
+ err = bcm_xtlv_put_data(&tbuf, WL_FILS_XTLV_ERP_NEXT_SEQ_NUM,
+ (u8 *)&sme->fils_erp_next_seq_num, sizeof(sme->fils_erp_next_seq_num));
+ if (err != BCME_OK) {
+ WL_ERR(("%s: write xtlv failed\n", __FUNCTION__));
+ goto exit;
+ }
+ iov_buf->len = bcm_xtlv_buf_len(&tbuf);
+ err = wldev_iovar_setbuf(dev, "fils", iov_buf, iov_buf->len + sizeof(bcm_iov_buf_t) -
+ sizeof(uint16), cfg->ioctl_buf, WLC_IOCTL_SMLEN, &cfg->ioctl_buf_sync);
+ if (unlikely(err)) {
+ WL_ERR(("set fils params ioctl error (%d)\n", err));
+ goto exit;
+ }
+
+exit:
+ if (err != BCME_OK) {
+ WL_ERR(("set FILS params error %d\n", err));
+ }
+ else {
+ WL_INFORM_MEM(("FILS parameters succesfully applied\n"));
+ }
+ if (iov_buf) {
+ MFREE(cfg->osh, iov_buf, WLC_IOCTL_SMLEN);
+ }
+ return err;
+}
+
+#if !defined(WL_FILS_ROAM_OFFLD) && defined(WL_FILS)
+static s32
+wl_get_bcn_timeout(struct net_device *dev, u32 *bcn_timeout)
+{
+ s32 err = 0;
+
+ err = wldev_iovar_getint(dev, "bcn_timeout", bcn_timeout);
+ if (unlikely(err)) {
+ WL_ERR(("could not get bcn_timeout (%d)\n", err));
+ }
+ return err;
+}
+
+#define WL_ROAM_ENABLE 0
+#define WL_ROAM_DISABLE 1
+/* Beacon Timeout beacon loss in case FILS roaming offload is not supported by fw */
+#define WL_BCN_TIMEOUT 3
+
+static s32
+wl_fils_toggle_roaming(struct net_device *dev, u32 auth_type)
+{
+ s32 err = 0;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+
+ if (WPA2_AUTH_IS_FILS(auth_type) && !cfg->fils_info.fils_roam_disabled) {
+ err = wl_get_bcn_timeout(dev, &cfg->fils_info.fils_bcn_timeout_cache);
+ if (unlikely(err)) {
+ return err;
+ }
+ wl_dongle_roam(dev, WL_ROAM_DISABLE, WL_BCN_TIMEOUT);
+ cfg->fils_info.fils_roam_disabled = true;
+ WL_INFORM_MEM(("fw roam disabled for FILS akm\n"));
+ } else if (cfg->fils_info.fils_roam_disabled) {
+ /* Enable roaming back for other auth types */
+ wl_dongle_roam(dev, WL_ROAM_ENABLE, cfg->fils_info.fils_bcn_timeout_cache);
+ cfg->fils_info.fils_roam_disabled = false;
+ WL_INFORM_MEM(("fw roam enabled\n"));
+ }
+ return err;
+}
+#endif /* !WL_FILS_ROAM_OFFLD && WL_FILS */
+#endif /* WL_FILS */
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
+#ifdef WL_SAE
+static int
+wl_set_sae_password(struct net_device *net, const u8 *pwd_data, u16 pwd_len)
+{
+ struct wl_wsec_sae_pwd_le sae_pwd;
+ int err = 0;
+ u8 ioctl_buf[WLC_IOCTL_SMLEN];
+
+ if (pwd_len < WL_WSEC_MIN_SAE_PASSWORD_LEN || pwd_len > WL_WSEC_MAX_SAE_PASSWORD_LEN) {
+ WL_ERR(("len b/n >%d & <%d\n", WL_WSEC_MIN_SAE_PASSWORD_LEN,
+ WL_WSEC_MAX_SAE_PASSWORD_LEN));
+ return -EINVAL;
+ }
+ if (!pwd_data) {
+ WL_ERR(("pswd cannot be null\n"));
+ return -EINVAL;
+ }
+
+ sae_pwd.key_len = htod16(pwd_len);
+ memcpy(sae_pwd.key, pwd_data, pwd_len);
+
+ err = wldev_iovar_setbuf(net, "sae_password", &sae_pwd,
+ sizeof(sae_pwd), ioctl_buf, WLC_IOCTL_SMLEN, NULL);
+ if (err < 0)
+ WL_ERR(("failed to set SAE password in firmware (len=%u)\n",
+ pwd_len));
return err;
}
+#endif /* WL_SAE */
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)) */
static s32
wl_set_key_mgmt(struct net_device *dev, struct cfg80211_connect_params *sme)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
+#ifdef WL_SAE
+
+ dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+#endif /* WL_SAE */
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)) */
struct wl_security *sec;
s32 val = 0;
s32 err = 0;
s32 bssidx;
-#ifdef MFP
- s32 mfp = WL_MFP_NONE;
- bcm_tlv_t *wpa2_ie;
- u8 rsn_cap[2];
-#endif /* MFP */
if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
WL_ERR(("Find p2p index from wdev(%p) failed\n", dev->ieee80211_ptr));
@@ -4056,77 +6282,125 @@
val = WPA_AUTH_PSK;
break;
default:
- WL_ERR(("invalid cipher group (%d)\n",
- sme->crypto.cipher_group));
+ WL_ERR(("invalid akm suite (0x%x)\n",
+ sme->crypto.akm_suites[0]));
return -EINVAL;
}
} else if (val & (WPA2_AUTH_PSK |
WPA2_AUTH_UNSPECIFIED)) {
switch (sme->crypto.akm_suites[0]) {
- case WLAN_AKM_SUITE_8021X:
- val = WPA2_AUTH_UNSPECIFIED;
- break;
#ifdef MFP
+#if defined(IGUANA_LEGACY_CHIPS)
+ case WL_AKM_SUITE_SHA256_1X:
+ if (wl_customer6_legacy_chip_check(cfg, dev)) {
+ val = WPA2_AUTH_UNSPECIFIED;
+ } else {
+ val = WPA2_AUTH_1X_SHA256;
+ }
+ break;
+ case WL_AKM_SUITE_SHA256_PSK:
+ if (wl_customer6_legacy_chip_check(cfg, dev)) {
+ val = WPA2_AUTH_PSK;
+ } else {
+ val = WPA2_AUTH_PSK_SHA256;
+ }
+ break;
+#else
case WL_AKM_SUITE_SHA256_1X:
val = WPA2_AUTH_1X_SHA256;
break;
case WL_AKM_SUITE_SHA256_PSK:
val = WPA2_AUTH_PSK_SHA256;
break;
+#endif // endif
#endif /* MFP */
+ case WLAN_AKM_SUITE_8021X:
case WLAN_AKM_SUITE_PSK:
- val = WPA2_AUTH_PSK;
- break;
#if defined(WLFBT) && defined(WLAN_AKM_SUITE_FT_8021X)
case WLAN_AKM_SUITE_FT_8021X:
- val = WPA2_AUTH_UNSPECIFIED | WPA2_AUTH_FT;
- break;
-#endif
+#endif // endif
#if defined(WLFBT) && defined(WLAN_AKM_SUITE_FT_PSK)
case WLAN_AKM_SUITE_FT_PSK:
- val = WPA2_AUTH_PSK | WPA2_AUTH_FT;
+#endif // endif
+ case WLAN_AKM_SUITE_FILS_SHA256:
+ case WLAN_AKM_SUITE_FILS_SHA384:
+ case WLAN_AKM_SUITE_8021X_SUITE_B:
+ case WLAN_AKM_SUITE_8021X_SUITE_B_192:
+#ifdef WL_OWE
+ case WLAN_AKM_SUITE_OWE:
+#endif /* WL_OWE */
+#ifdef WL_SAE
+ case WLAN_AKM_SUITE_SAE:
+#endif /* WL_SAE */
+ case WLAN_AKM_SUITE_DPP:
+ case WLAN_AKM_SUITE_FT_8021X_SHA384:
+ val = wl_rsn_akm_wpa_auth_lookup(sme->crypto.akm_suites[0]);
break;
-#endif
+ case WLAN_AKM_SUITE_FT_FILS_SHA256:
+ val = WPA2_AUTH_FILS_SHA256 | WPA2_AUTH_FT;
+ break;
+ case WLAN_AKM_SUITE_FT_FILS_SHA384:
+ val = WPA2_AUTH_FILS_SHA384 | WPA2_AUTH_FT;
+ break;
default:
- WL_ERR(("invalid cipher group (%d)\n",
- sme->crypto.cipher_group));
+ WL_ERR(("invalid akm suite (0x%x)\n",
+ sme->crypto.akm_suites[0]));
return -EINVAL;
}
}
-
-#ifdef MFP
- 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)) {
- /* Check for MFP cap in the RSN capability field */
- if (rsn_cap[0] & RSN_CAP_MFPR) {
- mfp = WL_MFP_REQUIRED;
- } else if (rsn_cap[0] & RSN_CAP_MFPC) {
- mfp = WL_MFP_CAPABLE;
- }
+#ifdef BCMWAPI_WPI
+ else if (val & (WAPI_AUTH_PSK | WAPI_AUTH_UNSPECIFIED)) {
+ switch (sme->crypto.akm_suites[0]) {
+ case WLAN_AKM_SUITE_WAPI_CERT:
+ val = WAPI_AUTH_UNSPECIFIED;
+ break;
+ case WLAN_AKM_SUITE_WAPI_PSK:
+ val = WAPI_AUTH_PSK;
+ break;
+ default:
+ WL_ERR(("invalid akm suite (0x%x)\n",
+ sme->crypto.akm_suites[0]));
+ return -EINVAL;
+ }
}
- err = wldev_iovar_setint(dev, "mfp", mfp);
- if (unlikely(err)) {
- if (!mfp && (err == BCME_UNSUPPORTED)) {
- /* For non-mfp cases, if firmware doesn't support MFP
- * ignore the failure and proceed ahead.
- */
- WL_DBG(("fw doesn't support mfp \n"));
- err = 0;
- } else {
- WL_ERR(("mfp set failed ret:%d \n", err));
+#endif // endif
+
+#ifdef WL_FILS
+#if !defined(WL_FILS_ROAM_OFFLD)
+ err = wl_fils_toggle_roaming(dev, val);
+ if (unlikely(err)) {
+ return err;
+ }
+#endif /* !WL_FILS_ROAM_OFFLD */
+#endif /* !WL_FILS */
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0))
+#ifdef WL_SAE
+ if ((val & (WPA3_AUTH_SAE_PSK)) &&
+ FW_SUPPORTED(dhd, sae)) {
+ err = wl_set_sae_password(dev, sme->crypto.sae_pwd, sme->crypto.sae_pwd_len);
+ if (!err && (FW_SUPPORTED(dhd, idsup))) {
+ err = wldev_iovar_setint_bsscfg(dev, "sup_wpa", 1, bssidx);
+ if (err) {
+ WL_ERR(("Error setting sup_wpa (%d)\n", err));
return err;
}
- } else {
- WL_DBG(("mfp set to 0x%x \n", mfp));
+ }
+ }
+#endif /* WL_SAE */
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 0)) */
+
+#ifdef MFP
+ if ((err = wl_cfg80211_set_mfp(cfg, dev, sme)) < 0) {
+ WL_ERR(("MFP set failed err:%d\n", err));
+ return -EINVAL;
}
#endif /* MFP */
- WL_DBG(("setting wpa_auth to 0x%x\n", val));
-
+ WL_INFORM_MEM(("[%s] wl wpa_auth to 0x%x\n", dev->name, val));
err = wldev_iovar_setint_bsscfg(dev, "wpa_auth", val, bssidx);
if (unlikely(err)) {
- WL_ERR(("could not set wpa_auth (%d)\n", err));
+ WL_ERR(("could not set wpa_auth (0x%x)\n", err));
return err;
}
}
@@ -4140,7 +6414,7 @@
wl_set_set_sharedkey(struct net_device *dev,
struct cfg80211_connect_params *sme)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
struct wl_security *sec;
struct wl_wsec_key key;
s32 val;
@@ -4159,10 +6433,13 @@
sec->wpa_versions, sec->cipher_pairwise));
if (!(sec->wpa_versions & (NL80211_WPA_VERSION_1 |
NL80211_WPA_VERSION_2)) &&
+#ifdef BCMWAPI_WPI
+ !is_wapi(sec->cipher_pairwise) &&
+#endif // endif
(sec->cipher_pairwise & (WLAN_CIPHER_SUITE_WEP40 |
WLAN_CIPHER_SUITE_WEP104)))
{
- memset(&key, 0, sizeof(key));
+ bzero(&key, sizeof(key));
key.len = (u32) sme->key_len;
key.index = (u32) sme->key_idx;
if (unlikely(key.len > sizeof(key.data))) {
@@ -4171,14 +6448,10 @@
}
memcpy(key.data, sme->key, key.len);
key.flags = WL_PRIMARY_KEY;
- switch (sec->cipher_pairwise) {
- case WLAN_CIPHER_SUITE_WEP40:
- key.algo = CRYPTO_ALGO_WEP1;
- break;
- case WLAN_CIPHER_SUITE_WEP104:
- key.algo = CRYPTO_ALGO_WEP128;
- break;
- default:
+ if ((sec->cipher_pairwise == WLAN_CIPHER_SUITE_WEP40) ||
+ (sec->cipher_pairwise == WLAN_CIPHER_SUITE_WEP104)) {
+ key.algo = wl_rsn_cipher_wsec_key_algo_lookup(sec->cipher_pairwise);
+ } else {
WL_ERR(("Invalid algorithm (%d)\n",
sme->crypto.ciphers_pairwise[0]));
return -EINVAL;
@@ -4194,6 +6467,7 @@
WL_ERR(("WLC_SET_KEY error (%d)\n", err));
return err;
}
+ WL_INFORM_MEM(("key applied to fw\n"));
if (sec->auth_type == NL80211_AUTHTYPE_SHARED_KEY) {
WL_DBG(("set auth_type to shared key\n"));
val = WL_AUTH_SHARED_KEY; /* shared key */
@@ -4213,8 +6487,6 @@
static u8 broad_bssid[6];
#endif /* ESCAN_RESULT_PATCH */
-
-
#if defined(CUSTOM_SET_CPUCORE) || defined(CONFIG_TCPACK_FASTTX)
static bool wl_get_chan_isvht80(struct net_device *net, dhd_pub_t *dhd)
{
@@ -4225,11 +6497,302 @@
chanspec = wl_chspec_driver_to_host(chanspec);
isvht80 = chanspec & WL_CHANSPEC_BW_80;
- WL_INFO(("%s: chanspec(%x:%d)\n", __FUNCTION__, chanspec, isvht80));
+ WL_DBG(("wl_get_chan_isvht80: chanspec(%x:%d)\n", chanspec, isvht80));
return isvht80;
}
#endif /* CUSTOM_SET_CPUCORE || CONFIG_TCPACK_FASTTX */
+
+int wl_cfg80211_cleanup_mismatch_status(struct net_device *dev, struct bcm_cfg80211 *cfg,
+ bool disassociate)
+{
+ scb_val_t scbval;
+ int err = TRUE;
+ int wait_cnt;
+
+ if (disassociate) {
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
+ BCM_REFERENCE(dhdp);
+ DHD_STATLOG_CTRL(dhdp, ST(DISASSOC_INT_START),
+ dhd_net2idx(dhdp->info, dev), DOT11_RC_DISASSOC_LEAVING);
+ WL_ERR(("Disassociate previous connection!\n"));
+ wl_set_drv_status(cfg, DISCONNECTING, dev);
+ scbval.val = DOT11_RC_DISASSOC_LEAVING;
+ scbval.val = htod32(scbval.val);
+
+ err = wldev_ioctl_set(dev, WLC_DISASSOC, &scbval,
+ sizeof(scb_val_t));
+ if (unlikely(err)) {
+ wl_clr_drv_status(cfg, DISCONNECTING, dev);
+ WL_ERR(("error (%d)\n", err));
+ return err;
+ }
+ wait_cnt = 500/10;
+ } else {
+ wait_cnt = 200/10;
+ WL_ERR(("Waiting for previous DISCONNECTING status!\n"));
+ if (wl_get_drv_status(cfg, DISCONNECTING, dev)) {
+ wl_clr_drv_status(cfg, DISCONNECTING, dev);
+ }
+ }
+
+ while (wl_get_drv_status(cfg, DISCONNECTING, dev) && wait_cnt) {
+ WL_DBG(("Waiting for disconnection terminated, wait_cnt: %d\n",
+ wait_cnt));
+ wait_cnt--;
+ OSL_SLEEP(10);
+ }
+
+ if (wait_cnt == 0) {
+ WL_ERR(("DISCONNECING clean up failed!\n"));
+ /* Clear DISCONNECTING driver status as we have made sufficient attempts
+ * for driver clean up.
+ */
+ wl_clr_drv_status(cfg, DISCONNECTING, dev);
+ return BCME_NOTREADY;
+ }
+ return BCME_OK;
+}
+
+#ifdef WL_FILS
+static int
+wl_fils_add_hlp_container(struct bcm_cfg80211 *cfg, struct net_device *dev,
+ const uint8* ie_buf, uint16 ie_len)
+{
+ const bcm_tlv_ext_t *hlp_ie;
+
+ if ((hlp_ie = (const bcm_tlv_ext_t*)bcm_parse_tlvs_dot11((const uint8 *)ie_buf, ie_len,
+ FILS_HLP_CONTAINER_EXT_ID, TRUE))) {
+ u16 hlp_len = hlp_ie->len;
+ u16 left_len = (ie_len - ((const uint8*)hlp_ie - ie_buf));
+ bcm_iov_buf_t *iov_buf = 0;
+ uint8* pxtlv;
+ int err;
+ size_t iov_buf_len;
+ bcm_tlv_dot11_frag_tot_len(ie_buf, ie_len, FILS_HLP_CONTAINER_EXT_ID,
+ TRUE, (uint*)&hlp_len);
+
+ hlp_len += BCM_TLV_EXT_HDR_SIZE;
+
+ if ((hlp_len > DOT11_MAX_MPDU_BODY_LEN) || (hlp_len > left_len)) {
+ WL_ERR(("bad HLP length %d\n", hlp_len));
+ return EFAULT;
+ }
+ iov_buf_len = sizeof(bcm_iov_buf_t) + sizeof(bcm_xtlv_t) - 1 + hlp_len;
+ iov_buf = MALLOCZ(cfg->osh, iov_buf_len);
+ if (iov_buf == NULL) {
+ WL_ERR(("failed to allocated iov_buf\n"));
+ return ENOMEM;
+ }
+
+ prhex("HLP, HLP", (const uchar *)hlp_ie, hlp_len);
+
+ pxtlv = (uint8 *)&iov_buf->data[0];
+ ((bcm_xtlv_t*)pxtlv)->id = WL_FILS_XTLV_HLP_IE;
+ ((bcm_xtlv_t*)pxtlv)->len = hlp_len;
+
+ memcpy(((bcm_xtlv_t*)pxtlv)->data, hlp_ie, ((bcm_xtlv_t*)pxtlv)->len);
+
+ iov_buf->version = WL_FILS_IOV_VERSION;
+ iov_buf->id = WL_FILS_CMD_ADD_HLP_IE;
+ iov_buf->len = ((sizeof(bcm_xtlv_t)-1) + ((bcm_xtlv_t*)pxtlv)->len);
+
+ err = wldev_iovar_setbuf(dev, "fils", iov_buf,
+ sizeof(bcm_iov_buf_t) + iov_buf->len,
+ cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
+ if (unlikely(err)) {
+ WL_ERR(("fils wldev_iovar_setbuf error (%d)\n", err));
+ }
+ else {
+ WL_INFORM_MEM(("FILS HLP Packet succesfully updated\n"));
+ }
+ MFREE(cfg->osh, iov_buf, iov_buf_len);
+ }
+ return BCME_OK;
+}
+#endif /* WL_FILS */
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0))
+#define UPDATE_ASSOC_IES BIT(0)
+#ifndef UPDATE_FILS_ERP_INFO
+#define UPDATE_FILS_ERP_INFO BIT(1)
+#define UPDATE_AUTH_TYPE BIT(2)
+#endif // endif
+#if defined(WL_FILS) || defined(WL_OWE)
+static int
+wl_cfg80211_update_connect_params(struct wiphy *wiphy, struct net_device *dev,
+ struct cfg80211_connect_params *sme, u32 changed)
+{
+ struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
+ s32 bssidx = -1;
+ s32 err = BCME_OK;
+
+ if (changed & UPDATE_ASSOC_IES) {
+ WL_DBG(("update assoc ies\n"));
+ bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr);
+
+ err = wl_cfg80211_set_mgmt_vndr_ies(cfg, ndev_to_cfgdev(dev), bssidx,
+ VNDR_IE_ASSOCREQ_FLAG, sme->ie, sme->ie_len);
+
+ if (err) {
+ WL_ERR(("error updating vndr ies\n"));
+ goto exit;
+ }
+ }
+#if defined(WL_FILS)
+ if (changed & UPDATE_FILS_ERP_INFO) {
+ err = wl_set_fils_params(dev, sme);
+
+ if (unlikely(err)) {
+ WL_ERR(("Invalid FILS params\n"));
+ goto exit;
+ }
+ }
+ if (changed & UPDATE_AUTH_TYPE) {
+ err = wl_set_auth_type(dev, sme);
+ if (unlikely(err)) {
+ WL_ERR(("Invalid auth type\n"));
+ goto exit;
+ }
+ }
+ if ((changed & UPDATE_FILS_ERP_INFO) && !(changed & UPDATE_AUTH_TYPE)) {
+ WL_DBG(("Warning: FILS ERP params are set, but authentication type - not\n"));
+ }
+#endif // endif
+exit:
+ return err;
+
+}
+#endif
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) */
+
+#ifdef WL_SAE
+static int
+wl_cfg80211_external_auth(struct wiphy *wiphy, struct net_device *dev,
+ struct cfg80211_external_auth_params *params)
+{
+ int ret = 0;
+ struct wl_auth_req_status auth_status;
+ u8 ioctl_buf[WLC_IOCTL_SMLEN];
+
+ WL_DBG(("Enter\n"));
+
+ if (params->status == WLAN_STATUS_SUCCESS) {
+ auth_status.flags = WL_EXTAUTH_SUCCESS;
+ } else {
+ WL_ERR(("External authentication failed with %d\n",
+ params->status));
+ auth_status.flags = WL_EXTAUTH_FAIL;
+ }
+ memcpy(auth_status.peer_mac.octet, params->bssid, ETH_ALEN);
+ auth_status.ssid_len = min_t(u8, params->ssid.ssid_len,
+ IEEE80211_MAX_SSID_LEN);
+ memcpy(auth_status.ssid, params->ssid.ssid, auth_status.ssid_len);
+ memset(auth_status.pmkid, 0, WLAN_PMKID_LEN);
+ if (params->pmkid)
+ memcpy(auth_status.pmkid, params->pmkid, WLAN_PMKID_LEN);
+
+ ret = wldev_iovar_setbuf(dev, "auth_status", &auth_status,
+ sizeof(auth_status), ioctl_buf, WLC_IOCTL_SMLEN, NULL);
+ if (ret < 0)
+ WL_ERR(("auth_status iovar failed: ret=%d\n", ret));
+
+ return ret;
+}
+
+/**
+ * wl_notify_extauth_req_event() - host authentication request
+ *
+ * @cfg: object to handle cfg80211 interface
+ * @cfgdev: represents ndev or wdev
+ * @e: event message. Not used, to make it usable for fweh event dispatcher
+ * @data: payload of message, containing auth frame data
+ *
+ */
+static s32
+wl_notify_extauth_req_event(struct bcm_cfg80211 *cfg,
+ bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data)
+{
+ struct cfg80211_external_auth_params params;
+ struct wl_auth_req_status *auth_req = (struct wl_auth_req_status *)data;
+ struct net_device *ndev = cfgdev_to_ndev(cfgdev);
+ int err = 0;
+
+ WL_DBG(("EVENT: EXT_AUTH_REQ received\n"));
+
+ if (e->datalen < sizeof(*auth_req)) {
+ WL_ERR(("Ext auth req event data too small. Ignoring event\n"));
+ return -EINVAL;
+ }
+
+ memset(¶ms, 0, sizeof(params));
+ params.action = NL80211_EXTERNAL_AUTH_START;
+ params.key_mgmt_suite = ntohl(WLAN_AKM_SUITE_SAE);
+ params.status = WLAN_STATUS_SUCCESS;
+ params.ssid.ssid_len = min_t(u32, IEEE80211_MAX_SSID_LEN, auth_req->ssid_len);
+ memcpy(params.ssid.ssid, auth_req->ssid, params.ssid.ssid_len);
+ memcpy(params.bssid, auth_req->peer_mac.octet, ETH_ALEN);
+
+ err = cfg80211_external_auth_request(ndev, ¶ms, GFP_ATOMIC);
+ if (err) {
+ WL_ERR(("EXT_AUTH_REQ to supplicant failed\n"));
+ }
+ return err;
+}
+
+/**
+ * wl_notify_mgmt_frame_tx_complete() - transmit mgmt frame complete
+ *
+ * @cfg: object to handle cfg80211 interface
+ * @cfgdev: represents ndev or wdev
+ * @e: event message. Not used, to make it usable for fweh event dispatcher
+ * @data: payload of message, containing auth frame data
+ *
+ */
+static s32
+wl_notify_mgmt_frame_tx_complete(struct bcm_cfg80211 *cfg,
+ bcm_struct_cfgdev *cfgdev, const wl_event_msg_t *e, void *data)
+{
+ u32 event_type = ntoh32(e->event_type);
+ u32 status = ntoh32(e->status);
+ struct net_device *ndev = NULL;
+ u32 *packetid = (u32 *)data;
+ struct net_info *_net_info;
+
+ WL_DBG((" Enter\n"));
+
+ ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
+ _net_info = wl_get_netinfo_by_netdev(cfg, ndev);
+
+ WL_DBG(("EVENT: mgmt tx status: event %s, status=%d\n",
+ event_type == WLC_E_MGMT_FRAME_TXSTATUS ?
+ "MGMT_FRAME_TXSTATUS" : "MGMT_FRAME_OFF_CHAN_COMPLETE", e->status));
+
+ if (!test_bit(MGMT_TX_SEND_FRAME, &_net_info->mgmt_txstatus) ||
+ (*packetid != _net_info->mgmt_txid)) {
+ return 0;
+ }
+
+ if (event_type == WLC_E_MGMT_FRAME_TXSTATUS) {
+ if (status == WLC_E_STATUS_SUCCESS) {
+ set_bit(MGMT_TX_ACK,
+ &_net_info->mgmt_txstatus);
+ } else {
+ set_bit(MGMT_TX_NOACK,
+ &_net_info->mgmt_txstatus);
+ }
+ } else {
+ set_bit(MGMT_TX_OFF_CHAN_COMPLETED,
+ &_net_info->mgmt_txstatus);
+ }
+
+ complete(&_net_info->mgmt_tx_cpl);
+ return BCME_OK;
+}
+#endif /* WL_SAE */
+
+#define MAX_SCAN_ABORT_WAIT_CNT 20
+#define WAIT_SCAN_ABORT_OSL_SLEEP_TIME 10
static s32
wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
@@ -4240,29 +6803,73 @@
wl_extjoin_params_t *ext_join_params;
struct wl_join_params join_params;
size_t join_params_size;
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
+#if defined(ROAM_ENABLE) && defined(ROAM_AP_ENV_DETECTION)
+ s32 roam_trigger[2] = {0, 0};
+#endif /* ROAM_AP_ENV_DETECTION */
s32 err = 0;
- wpa_ie_fixed_t *wpa_ie;
- bcm_tlv_t *wpa2_ie;
- u8* wpaie = 0;
+ const wpa_ie_fixed_t *wpa_ie;
+ const bcm_tlv_t *wpa2_ie;
+ const u8* wpaie = 0;
u32 wpaie_len = 0;
u32 chan_cnt = 0;
struct ether_addr bssid;
s32 bssidx = -1;
- int ret;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
+ bool skip_hints = fw_ap_select;
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) */
+#ifdef ESCAN_CHANNEL_CACHE
+ chanspec_t chanspec_list[MAX_ROAM_CHANNEL];
+#endif /* ESCAN_CHANNEL_CACHE */
int wait_cnt;
WL_DBG(("In\n"));
+ if (!dev) {
+ WL_ERR(("dev is null\n"));
+ return -EINVAL;
+ }
+ BCM_REFERENCE(dhdp);
+ DHD_STATLOG_CTRL(dhdp, ST(ASSOC_START), dhd_net2idx(dhdp->info, dev), 0);
+
+#ifdef ESCAN_CHANNEL_CACHE
+ memset(chanspec_list, 0, (sizeof(chanspec_t) * MAX_ROAM_CHANNEL));
+#endif /* ESCAN_CHANNEL_CACHE */
+
+ /* Connection attempted via linux-wireless */
+ wl_set_drv_status(cfg, CFG80211_CONNECT, dev);
+#ifdef DHDTCPSYNC_FLOOD_BLK
+ dhd_reset_tcpsync_info_by_dev(dev);
+#endif /* DHDTCPSYNC_FLOOD_BLK */
+
+#if defined(SUPPORT_RANDOM_MAC_SCAN)
+ /* Disable scanmac if enabled */
+ if (cfg->scanmac_enabled) {
+ wl_cfg80211_scan_mac_disable(dev);
+ }
+#endif /* SUPPORT_RANDOM_MAC_SCAN */
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
- if (sme->channel_hint) {
- chan = sme->channel_hint;
- WL_DBG(("channel_hint (%d), channel_hint center_freq (%d)\n",
- ieee80211_frequency_to_channel(sme->channel_hint->center_freq),
- sme->channel_hint->center_freq));
- }
- if (sme->bssid_hint) {
- sme->bssid = sme->bssid_hint;
- WL_DBG(("bssid_hint "MACDBG" \n", MAC2STRDBG(sme->bssid_hint)));
+#if defined(WL_FW_OCE_AP_SELECT)
+ /* override bssid_hint for oce networks */
+ skip_hints = (fw_ap_select && wl_cfg80211_is_oce_ap(wiphy, sme->bssid_hint));
+#endif // endif
+ if (skip_hints) {
+ /* Let fw choose the best AP */
+ WL_INFORM(("skipping bssid & channel hint\n"));
+ /* sme->channel can point to an invalid address
+ * which gets assigned to chan instead of NULL */
+ chan = NULL;
+ } else {
+ if (sme->channel_hint) {
+ chan = sme->channel_hint;
+ WL_INFORM_MEM(("channel_hint (%d), channel_hint center_freq (%d)\n",
+ ieee80211_frequency_to_channel(sme->channel_hint->center_freq),
+ sme->channel_hint->center_freq));
+ }
+ if (sme->bssid_hint) {
+ sme->bssid = sme->bssid_hint;
+ WL_INFORM_MEM(("bssid_hint "MACDBG" \n", MAC2STRDBG(sme->bssid_hint)));
+ }
}
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) */
@@ -4277,68 +6884,83 @@
return -EINVAL;
}
- RETURN_EIO_IF_NOT_UP(cfg);
+ WL_DBG(("SME IE : len=%zu\n", sme->ie_len));
+ if (sme->ie != NULL && sme->ie_len > 0 && (wl_dbg_level & WL_DBG_DBG)) {
+ prhex(NULL, sme->ie, sme->ie_len);
+ }
+ RETURN_EIO_IF_NOT_UP(cfg);
/*
* Cancel ongoing scan to sync up with sme state machine of cfg80211.
*/
-#if !defined(ESCAN_RESULT_PATCH)
if (cfg->scan_request) {
- wl_notify_escan_complete(cfg, dev, true, true);
+ WL_TRACE_HW4(("Aborting the scan! \n"));
+ wl_cfg80211_scan_abort(cfg);
+ wait_cnt = MAX_SCAN_ABORT_WAIT_CNT;
+ while (wl_get_drv_status(cfg, SCANNING, dev) && wait_cnt) {
+ WL_DBG(("Waiting for SCANNING terminated, wait_cnt: %d\n", wait_cnt));
+ wait_cnt--;
+ OSL_SLEEP(WAIT_SCAN_ABORT_OSL_SLEEP_TIME);
+ }
+ if (wl_get_drv_status(cfg, SCANNING, dev)) {
+ wl_cfg80211_cancel_scan(cfg);
+ }
}
-#endif
#ifdef WL_SCHED_SCAN
+ /* Locks are taken in wl_cfg80211_sched_scan_stop()
+ * A start scan occuring during connect is unlikely
+ */
if (cfg->sched_scan_req) {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0))
+ wl_cfg80211_sched_scan_stop(wiphy, bcmcfg_to_prmry_ndev(cfg),
+ cfg->sched_scan_req->reqid);
+#else
wl_cfg80211_sched_scan_stop(wiphy, bcmcfg_to_prmry_ndev(cfg));
+#endif /* LINUX_VERSION_CODE <= KERNEL_VERSION(4, 11, 0) */
}
-#endif
+#endif /* WL_SCHED_SCAN */
+#ifdef WL_CFG80211_GON_COLLISION
+ /* init block gon req count */
+ 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)
memcpy(connect_req_bssid, sme->bssid, ETHER_ADDR_LEN);
else
bzero(connect_req_bssid, ETHER_ADDR_LEN);
bzero(broad_bssid, ETHER_ADDR_LEN);
-#endif
+#endif // endif
#if defined(USE_DYNAMIC_MAXPKT_RXGLOM)
maxrxpktglom = 0;
-#endif
- bzero(&bssid, sizeof(bssid));
- 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(cfg, DISCONNECTING, dev);
- scbval.val = DOT11_RC_DISASSOC_LEAVING;
- memcpy(&scbval.ea, &bssid, ETHER_ADDR_LEN);
- scbval.val = htod32(scbval.val);
-
- WL_DBG(("drv status CONNECTED is not set, but connected in FW!" MACDBG "/n",
- MAC2STRDBG(bssid.octet)));
- 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;
- }
- wait_cnt = 500/10;
- while (wl_get_drv_status(cfg, DISCONNECTING, dev) && wait_cnt) {
- WL_DBG(("Waiting for disconnection terminated, wait_cnt: %d\n",
- wait_cnt));
- wait_cnt--;
- 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(cfg, DISCONNECTING, dev) && wait_cnt) {
- WL_DBG(("Waiting for disconnection terminated, wait_cnt: %d\n", wait_cnt));
- wait_cnt--;
- OSL_SLEEP(10);
+#endif // endif
+ if (wl_get_drv_status(cfg, CONNECTING, dev) || wl_get_drv_status(cfg, CONNECTED, dev)) {
+ /* set nested connect bit to identify the context */
+ wl_set_drv_status(cfg, NESTED_CONNECT, dev);
+ /* DHD prev status is CONNECTING/CONNECTED */
+ err = wl_cfg80211_cleanup_mismatch_status(dev, cfg, TRUE);
+ } else if (wl_get_drv_status(cfg, DISCONNECTING, dev)) {
+ /* DHD prev status is DISCONNECTING */
+ err = wl_cfg80211_cleanup_mismatch_status(dev, cfg, false);
+ } else if (!wl_get_drv_status(cfg, CONNECTED, dev)) {
+ /* DHD previous status is not connected and FW connected */
+ if (wldev_ioctl_get(dev, WLC_GET_BSSID, &bssid, ETHER_ADDR_LEN) == 0) {
+ /* set nested connect bit to identify the context */
+ wl_set_drv_status(cfg, NESTED_CONNECT, dev);
+ err = wl_cfg80211_cleanup_mismatch_status(dev, cfg, true);
}
}
+
+ if (sme->bssid) {
+ wl_update_prof(cfg, dev, NULL, sme->bssid, WL_PROF_LATEST_BSSID);
+ } else {
+ wl_update_prof(cfg, dev, NULL, ðer_bcast, WL_PROF_LATEST_BSSID);
+ }
+
+ /* 'connect' request received */
+ wl_set_drv_status(cfg, CONNECTING, dev);
+ /* clear nested connect bit on proceeding for connection */
+ wl_clr_drv_status(cfg, NESTED_CONNECT, dev);
/* Clean BSSID */
bzero(&bssid, sizeof(bssid));
@@ -4350,94 +6972,180 @@
if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
WL_ERR(("Find p2p index from wdev(%p) failed\n",
dev->ieee80211_ptr));
- return BCME_ERROR;
+ err = BCME_ERROR;
+ goto exit;
}
wl_cfg80211_set_mgmt_vndr_ies(cfg, ndev_to_cfgdev(dev), bssidx,
VNDR_IE_ASSOCREQ_FLAG, sme->ie, sme->ie_len);
} else if (dev == bcmcfg_to_prmry_ndev(cfg)) {
+ if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
+ WL_ERR(("Find wlan index from wdev(%p) failed\n", dev->ieee80211_ptr));
+ err = BCME_ERROR;
+ goto exit;
+ }
+
/* find the RSN_IE */
- if ((wpa2_ie = bcm_parse_tlvs((u8 *)sme->ie, sme->ie_len,
+ if ((wpa2_ie = bcm_parse_tlvs((const u8 *)sme->ie, sme->ie_len,
DOT11_MNG_RSN_ID)) != NULL) {
WL_DBG((" WPA2 IE is found\n"));
}
/* find the WPA_IE */
- if ((wpa_ie = wl_cfgp2p_find_wpaie((u8 *)sme->ie,
+ if ((wpa_ie = wl_cfgp2p_find_wpaie(sme->ie,
sme->ie_len)) != NULL) {
WL_DBG((" WPA IE is found\n"));
}
- if (wpa_ie != NULL || wpa2_ie != NULL) {
- wpaie = (wpa_ie != NULL) ? (u8 *)wpa_ie : (u8 *)wpa2_ie;
+#ifdef WL_SAE
+ if (((wpa_ie != NULL) || (wpa2_ie != NULL))&&
+ (!((FW_SUPPORTED(dhdp, sae)) && (FW_SUPPORTED(dhdp, idsup)) &&
+ (sme->crypto.akm_suites[0] == WLAN_AKM_SUITE_SAE))))
+#else
+ if ((wpa_ie != NULL || wpa2_ie != NULL))
+#endif // endif
+ {
+ wpaie = (wpa_ie != NULL) ? (const u8 *)wpa_ie : (const u8 *)wpa2_ie;
wpaie_len = (wpa_ie != NULL) ? wpa_ie->length : wpa2_ie->len;
wpaie_len += WPA_RSN_IE_TAG_FIXED_LEN;
err = wldev_iovar_setbuf(dev, "wpaie", wpaie, wpaie_len,
- cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
+ cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
if (unlikely(err)) {
WL_ERR(("wpaie set error (%d)\n", err));
- return err;
+ goto exit;
}
} else {
err = wldev_iovar_setbuf(dev, "wpaie", NULL, 0,
- cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
+ cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
if (unlikely(err)) {
WL_ERR(("wpaie set error (%d)\n", err));
- return err;
+ goto exit;
}
}
-
- if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
- WL_ERR(("Find p2p index from wdev(%p) failed\n", dev->ieee80211_ptr));
- return BCME_ERROR;
- }
err = wl_cfg80211_set_mgmt_vndr_ies(cfg, ndev_to_cfgdev(dev), bssidx,
- VNDR_IE_ASSOCREQ_FLAG, (const u8 *)sme->ie, sme->ie_len);
+ VNDR_IE_ASSOCREQ_FLAG, (const u8 *)sme->ie, sme->ie_len);
if (unlikely(err)) {
- return err;
+ goto exit;
}
}
- if (chan) {
- /* If RCC is not enabled, use the channel provided by userspace */
- cfg->channel = ieee80211_frequency_to_channel(chan->center_freq);
- chan_cnt = 1;
- WL_DBG(("channel (%d), center_req (%d), %d channels\n", cfg->channel,
- chan->center_freq, chan_cnt));
- } else {
- /*
- * No channel information from user space. if RCC is enabled, the RCC
- * would prepare the channel list, else no channel would be provided
- * and firmware would need to do a full channel scan.
- */
- WL_DBG(("No channel info from user space\n"));
- cfg->channel = 0;
+#if defined(ROAM_ENABLE) && defined(ROAM_AP_ENV_DETECTION)
+ if (dhdp->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 SKIP_ROAM_TRIGGER_RESET
+ roam_trigger[1] = WLC_BAND_2G;
+ is_roamtrig_reset =
+ (wldev_ioctl_get(dev, WLC_GET_ROAM_TRIGGER, roam_trigger,
+ sizeof(roam_trigger)) == BCME_OK) &&
+ (roam_trigger[0] == WL_AUTO_ROAM_TRIGGER-10);
+#endif /* SKIP_ROAM_TRIGGER_RESET */
+ if (is_roamtrig_reset && is_roam_env_ok) {
+ roam_trigger[0] = WL_AUTO_ROAM_TRIGGER;
+ roam_trigger[1] = WLC_BAND_ALL;
+ err = wldev_ioctl_set(dev, WLC_SET_ROAM_TRIGGER, roam_trigger,
+ sizeof(roam_trigger));
+ if (unlikely(err)) {
+ WL_ERR((" failed to restore roam_trigger for auto env"
+ " detection\n"));
+ }
+ }
}
- WL_DBG(("3. set wapi version \n"));
+#endif /* ROAM_ENABLE && ROAM_AP_ENV_DETECTION */
+ if (chan &&
+#ifdef H2_BRING_UP
+ FALSE &&
+#endif /* H2_BRING_UP */
+ TRUE) {
+
+ cfg->channel = ieee80211_frequency_to_channel(chan->center_freq);
+ chan_cnt = 1;
+ WL_DBG(("channel (%d), center_req (%d), %d channels\n", cfg->channel,
+ chan->center_freq, chan_cnt));
+ } else {
+ WL_DBG(("No channel info from user space\n"));
+ cfg->channel = 0;
+ }
+#ifdef ESCAN_CHANNEL_CACHE
+ /*
+ * No channel information from user space. if ECC is enabled, the ECC
+ * would prepare the channel list, else no channel would be provided
+ * and firmware would need to do a full channel scan.
+ *
+ * Use cached channels. This might take slightly longer time compared
+ * to using a single channel based join. But ECC would help choose
+ * a better AP for a given ssid. For a given SSID there might multiple
+ * APs on different channels and ECC would scan all those channels
+ * before deciding up on the AP. This accounts for the additional delay.
+ */
+ if (cfg->rcc_enabled || cfg->channel == 0)
+ {
+ wlc_ssid_t ssid;
+ int band;
+
+ err = wldev_get_band(dev, &band);
+ if (!err) {
+ set_roam_band(band);
+ }
+
+ memcpy(ssid.SSID, sme->ssid, sme->ssid_len);
+ ssid.SSID_len = (uint32)sme->ssid_len;
+ chan_cnt = get_roam_channel_list(cfg->channel, chanspec_list,
+ MAX_ROAM_CHANNEL, &ssid, ioctl_version, chan);
+ WL_DBG(("RCC channel count:%d \n", chan_cnt));
+ }
+#endif /* ESCAN_CHANNEL_CACHE */
+ WL_DBG(("3. set wpa version \n"));
+
err = wl_set_wpa_version(dev, sme);
if (unlikely(err)) {
WL_ERR(("Invalid wpa_version\n"));
- return err;
+ goto exit;
}
+#ifdef BCMWAPI_WPI
+ if (sme->crypto.wpa_versions & NL80211_WAPI_VERSION_1)
+ WL_DBG(("4. WAPI Dont Set wl_set_auth_type\n"));
+ else {
+ WL_DBG(("4. wl_set_auth_type\n"));
+#endif // endif
err = wl_set_auth_type(dev, sme);
if (unlikely(err)) {
WL_ERR(("Invalid auth type\n"));
- return err;
+ goto exit;
}
-
+#ifdef BCMWAPI_WPI
+ }
+#endif // endif
+#ifdef WL_FILS
+ if (sme->ie && sme->ie_len) {
+ err = wl_fils_add_hlp_container(cfg, dev, sme->ie, sme->ie_len);
+ if (unlikely(err)) {
+ WL_ERR(("FILS sending HLP failed\n"));
+ goto exit;
+ }
+ }
+#endif /* WL_FILS */
err = wl_set_set_cipher(dev, sme);
if (unlikely(err)) {
WL_ERR(("Invalid ciper\n"));
- return err;
+ goto exit;
}
err = wl_set_key_mgmt(dev, sme);
if (unlikely(err)) {
WL_ERR(("Invalid key mgmt\n"));
- return err;
+ goto exit;
}
err = wl_set_set_sharedkey(dev, sme);
if (unlikely(err)) {
WL_ERR(("Invalid shared key\n"));
- return err;
+ goto exit;
}
+#ifdef WL_FILS
+ err = wl_set_fils_params(dev, sme);
+ if (unlikely(err)) {
+ WL_ERR(("Invalid FILS params\n"));
+ goto exit;
+ }
+#endif /* WL_FILS */
/*
* Join with specific BSSID and cached SSID
@@ -4445,21 +7153,38 @@
*/
join_params_size = WL_EXTJOIN_PARAMS_FIXED_SIZE +
chan_cnt * sizeof(chanspec_t);
- ext_join_params = (wl_extjoin_params_t*)kzalloc(join_params_size, GFP_KERNEL);
+ ext_join_params = (wl_extjoin_params_t *)MALLOCZ(cfg->osh, join_params_size);
if (ext_join_params == NULL) {
err = -ENOMEM;
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);
+ ext_join_params->ssid.SSID_len =
+ (uint32)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(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
*/
+#ifdef WL_6E
+ /* If chan is NULL in case of fw_ap_select=1
+ * avoiding dereferencing chan->center_freq */
+ if (chan && chan->center_freq > FREQ_START_6G_CHANNEL) {
+ ext_join_params->scan.active_time = chan_cnt ?
+ WL_SCAN_JOIN_ACTIVE_DWELL_TIME_MS_6E : -1;
+ ext_join_params->scan.passive_time = chan_cnt ?
+ WL_SCAN_JOIN_PASSIVE_DWELL_TIME_MS_6E : -1;
+ } else {
+ 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;
+ }
+#else
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;
+#endif /* WL_6E */
/* Set up join scan parameters */
ext_join_params->scan.scan_type = -1;
ext_join_params->scan.nprobes = chan_cnt ?
@@ -4471,7 +7196,8 @@
else
memcpy(&ext_join_params->assoc.bssid, ðer_bcast, ETH_ALEN);
ext_join_params->assoc.chanspec_num = chan_cnt;
- if (chan_cnt) {
+
+ if (chan_cnt && !cfg->rcc_enabled) {
if (cfg->channel) {
/*
* Use the channel provided by userspace
@@ -4483,11 +7209,12 @@
: WL_CHANSPEC_BAND_5G;
/* Get min_bw set for the interface */
- bw = wl_cfg80211_ulb_get_min_bw_chspec(dev->ieee80211_ptr, bssidx);
+ bw = WL_CHANSPEC_BW_20;
if (bw == INVCHANSPEC) {
WL_ERR(("Invalid chanspec \n"));
- kfree(ext_join_params);
- return BCME_ERROR;
+ MFREE(cfg->osh, ext_join_params, join_params_size);
+ err = BCME_ERROR;
+ goto exit;
}
ctl_sb = WL_CHANSPEC_CTL_SB_NONE;
@@ -4498,49 +7225,88 @@
wl_chspec_host_to_driver(ext_join_params->assoc.chanspec_list[0]);
}
}
+#ifdef ESCAN_CHANNEL_CACHE
+ else {
+ memcpy(ext_join_params->assoc.chanspec_list, chanspec_list,
+ sizeof(chanspec_t) * chan_cnt);
+ }
+#endif /* ESCAN_CHANNEL_CACHE */
ext_join_params->assoc.chanspec_num = htod32(ext_join_params->assoc.chanspec_num);
if (ext_join_params->ssid.SSID_len < IEEE80211_MAX_SSID_LEN) {
- WL_INFORM(("ssid \"%s\", len (%d)\n", ext_join_params->ssid.SSID,
+ WL_DBG(("ssid \"%s\", len (%d)\n", ext_join_params->ssid.SSID,
ext_join_params->ssid.SSID_len));
}
- wl_set_drv_status(cfg, CONNECTING, dev);
if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
WL_ERR(("Find p2p index from wdev(%p) failed\n", dev->ieee80211_ptr));
- kfree(ext_join_params);
- return BCME_ERROR;
+ MFREE(cfg->osh, ext_join_params, join_params_size);
+ err = BCME_ERROR;
+ goto exit;
}
+#ifdef DHD_EVENT_LOG_FILTER
+ if (dev == bcmcfg_to_prmry_ndev(cfg)) {
+ /* inform only for STA Interface */
+ dhd_event_log_filter_notify_connect_request(dhdp,
+ (uint8 *)(&ext_join_params->assoc.bssid), cfg->channel);
+ }
+#endif /* DHD_EVENT_LOG_FILTER */
+#ifdef WLTDLS
+ /* disable TDLS if number of connected interfaces is >= 1 */
+ wl_cfg80211_tdls_config(cfg, TDLS_STATE_CONNECT, false);
+#endif /* WLTDLS */
err = wldev_iovar_setbuf_bsscfg(dev, "join", ext_join_params, join_params_size,
cfg->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &cfg->ioctl_buf_sync);
-
if (cfg->rcc_enabled) {
- WL_ERR(("Connecting with" MACDBG " ssid \"%s\", len (%d) with rcc channels \n\n",
- MAC2STRDBG((u8*)(&ext_join_params->assoc.bssid)),
- ext_join_params->ssid.SSID, ext_join_params->ssid.SSID_len));
+ WL_ERR_KERN(("[%s] Connecting with " MACDBG " ssid \"%s\","
+ " len (%d) with rcc channels. chan_cnt:%d \n\n",
+ dev->name, MAC2STRDBG((u8*)(&ext_join_params->assoc.bssid)),
+ ext_join_params->ssid.SSID, ext_join_params->ssid.SSID_len, chan_cnt));
+ WL_INFORM_MEM(("[%s] Connecting with " MACDBG " ssid \"%s\","
+ " len (%d) with rcc channels. chan_cnt:%d \n\n",
+ dev->name, MAC2STRDBG((u8*)(&ext_join_params->assoc.bssid)),
+ "*****", ext_join_params->ssid.SSID_len, chan_cnt));
} else {
- WL_ERR(("Connecting with" MACDBG " ssid \"%s\", len (%d) channel=%d\n\n",
- MAC2STRDBG((u8*)(&ext_join_params->assoc.bssid)),
+ WL_ERR_KERN(("[%s] Connecting with " MACDBG " ssid \"%s\","
+ " len (%d) channels:%d \n\n",
+ dev->name, MAC2STRDBG((u8*)(&ext_join_params->assoc.bssid)),
ext_join_params->ssid.SSID, ext_join_params->ssid.SSID_len, cfg->channel));
+ WL_INFORM_MEM(("[%s] Connecting with " MACDBG " ssid \"%s\","
+ " len (%d) channels:%d \n\n",
+ dev->name, MAC2STRDBG((u8*)(&ext_join_params->assoc.bssid)),
+ "*****", ext_join_params->ssid.SSID_len, cfg->channel));
}
-
- kfree(ext_join_params);
+ SUPP_LOG(("[%s] Connecting with " MACDBG " ssid \"%s\","
+ "channel:%d rcc:%d\n",
+ dev->name, MAC2STRDBG((u8*)(&ext_join_params->assoc.bssid)),
+ ext_join_params->ssid.SSID, cfg->channel, cfg->rcc_enabled));
+ MFREE(cfg->osh, ext_join_params, join_params_size);
if (err) {
wl_clr_drv_status(cfg, CONNECTING, dev);
if (err == BCME_UNSUPPORTED) {
WL_DBG(("join iovar is not supported\n"));
goto set_ssid;
} else {
- WL_ERR(("error (%d)\n", err));
+ WL_ERR(("join iovar error (%d)\n", err));
goto exit;
}
} else
goto exit;
set_ssid:
- memset(&join_params, 0, sizeof(join_params));
+#if defined(ROAMEXP_SUPPORT)
+ /* Clear Blacklist bssid and Whitelist ssid list before join issue
+ * This is temporary fix since currently firmware roaming is not
+ * disabled by android framework before SSID join from framework
+ */
+ /* Flush blacklist bssid content */
+ dhd_dev_set_blacklist_bssid(dev, NULL, 0, true);
+ /* Flush whitelist ssid content */
+ dhd_dev_set_whitelist_ssid(dev, NULL, 0, true);
+#endif /* ROAMEXP_SUPPORT */
+ bzero(&join_params, sizeof(join_params));
join_params_size = sizeof(join_params.ssid);
- join_params.ssid.SSID_len = min(sizeof(join_params.ssid.SSID), sme->ssid_len);
+ join_params.ssid.SSID_len = (uint32)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(cfg, dev, NULL, &join_params.ssid, WL_PROF_SSID);
@@ -4549,7 +7315,8 @@
else
memcpy(&join_params.params.bssid, ðer_bcast, ETH_ALEN);
- if (wl_ch_to_chanspec(dev, cfg->channel, &join_params, &join_params_size) < 0) {
+ if (wl_ch_to_chanspec(dev, cfg->channel, &join_params, &join_params_size,
+ chan) < 0) {
WL_ERR(("Invalid chanspec\n"));
return -EINVAL;
}
@@ -4557,17 +7324,79 @@
WL_DBG(("join_param_size %zu\n", join_params_size));
if (join_params.ssid.SSID_len < IEEE80211_MAX_SSID_LEN) {
- WL_INFORM(("ssid \"%s\", len (%d)\n", join_params.ssid.SSID,
+ WL_INFORM_MEM(("ssid \"%s\", len (%d)\n", join_params.ssid.SSID,
join_params.ssid.SSID_len));
}
- wl_set_drv_status(cfg, CONNECTING, dev);
- err = wldev_ioctl(dev, WLC_SET_SSID, &join_params, join_params_size, true);
+ err = wldev_ioctl_set(dev, WLC_SET_SSID, &join_params, join_params_size);
+exit:
if (err) {
WL_ERR(("error (%d)\n", err));
wl_clr_drv_status(cfg, CONNECTING, dev);
+ wl_flush_fw_log_buffer(dev, FW_LOGSET_MASK_ALL);
+#ifdef WLTDLS
+ /* If connect fails, check whether we can enable back TDLS */
+ wl_cfg80211_tdls_config(cfg, TDLS_STATE_DISCONNECT, false);
+#endif /* WLTDLS */
}
-exit:
+#ifdef DBG_PKT_MON
+ if ((dev == bcmcfg_to_prmry_ndev(cfg)) && !err) {
+ DHD_DBG_PKT_MON_START(dhdp);
+ }
+#endif /* DBG_PKT_MON */
return err;
+}
+
+static void wl_cfg80211_disconnect_state_sync(struct bcm_cfg80211 *cfg, struct net_device *dev)
+{
+ struct wireless_dev *wdev;
+ uint8 wait_cnt;
+
+ if (!dev || !dev->ieee80211_ptr) {
+ WL_ERR(("wrong ndev\n"));
+ return;
+ }
+
+ wdev = dev->ieee80211_ptr;
+ wait_cnt = WAIT_FOR_DISCONNECT_STATE_SYNC;
+ while ((wdev->current_bss) && wait_cnt) {
+ WL_DBG(("Waiting for disconnect sync, wait_cnt: %d\n", wait_cnt));
+ wait_cnt--;
+ OSL_SLEEP(50);
+ }
+
+ if (wait_cnt == 0) {
+ /* state didn't get cleared within given timeout */
+ WL_INFORM_MEM(("cfg80211 state. wdev->current_bss non null\n"));
+ } else {
+ WL_MEM(("cfg80211 disconnect state sync done\n"));
+ }
+
+}
+
+static void wl_cfg80211_wait_for_disconnection(struct bcm_cfg80211 *cfg, struct net_device *dev)
+{
+ uint8 wait_cnt;
+ u32 status = 0;
+
+ wait_cnt = WAIT_FOR_DISCONNECT_MAX;
+ while ((status = wl_get_drv_status(cfg, DISCONNECTING, dev)) && wait_cnt) {
+ WL_DBG(("Waiting for disconnection, wait_cnt: %d\n", wait_cnt));
+ wait_cnt--;
+ OSL_SLEEP(50);
+ }
+
+ WL_INFORM_MEM(("Wait for disconnection done. status:%d wait_cnt:%d\n", status, wait_cnt));
+ if (!wait_cnt && wl_get_drv_status(cfg, DISCONNECTING, dev)) {
+ /* No response from firmware. Indicate connect result
+ * to clear cfg80211 state machine
+ */
+ WL_INFORM_MEM(("force send connect result\n"));
+ CFG80211_CONNECT_RESULT(dev, NULL, NULL, NULL, 0, NULL, 0,
+ WLAN_STATUS_UNSPECIFIED_FAILURE,
+ GFP_KERNEL);
+ wl_clr_drv_status(cfg, DISCONNECTING, dev);
+ }
+ return;
}
static s32
@@ -4578,57 +7407,112 @@
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 */
+ u8 *curbssid = NULL;
+ u8 null_bssid[ETHER_ADDR_LEN];
+ s32 bssidx = 0;
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
WL_ERR(("Reason %d\n", reason_code));
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);
+
+ BCM_REFERENCE(dhdp);
+ DHD_STATLOG_CTRL(dhdp, ST(DISASSOC_START),
+ dhd_net2idx(dhdp->info, dev), reason_code);
+#ifdef DHD_4WAYM4_FAIL_DISCONNECT
+ dhd_cleanup_m4_state_work(dhdp, dhd_net2idx(dhdp->info, dev));
+#endif /* DHD_4WAYM4_FAIL_DISCONNECT */
+
#ifdef ESCAN_RESULT_PATCH
- if (wl_get_drv_status(cfg, CONNECTING, dev) && curbssid &&
- (memcmp(curbssid, connect_req_bssid, ETHER_ADDR_LEN) == 0)) {
- WL_ERR(("Disconnecting from connecting device: " MACDBG "\n",
- MAC2STRDBG(curbssid)));
+ if (wl_get_drv_status(cfg, CONNECTING, dev)) {
+ if (curbssid) {
+ WL_ERR(("Disconnecting while CONNECTING status"
+ " connecting device: " MACDBG "\n", MAC2STRDBG(curbssid)));
+ } else {
+ WL_ERR(("Disconnecting while CONNECTING status \n"));
+ }
act = true;
}
#endif /* ESCAN_RESULT_PATCH */
+
+ if (!curbssid) {
+ WL_ERR(("Disconnecting while CONNECTING status %d\n", (int)sizeof(null_bssid)));
+ bzero(null_bssid, sizeof(null_bssid));
+ curbssid = null_bssid;
+ }
+
if (act) {
+#ifdef DBG_PKT_MON
+ /* Stop packet monitor */
+ if (dev == bcmcfg_to_prmry_ndev(cfg)) {
+ DHD_DBG_PKT_MON_STOP(dhdp);
+ }
+#endif /* DBG_PKT_MON */
/*
* Cancel ongoing scan to sync up with sme state machine of cfg80211.
*/
-#if !defined(ESCAN_RESULT_PATCH)
/* Let scan aborted by F/W */
if (cfg->scan_request) {
- wl_notify_escan_complete(cfg, dev, true, true);
+ WL_TRACE_HW4(("Aborting the scan! \n"));
+ wl_cfg80211_cancel_scan(cfg);
}
-#endif /* ESCAN_RESULT_PATCH */
+ /* Set DISCONNECTING state. We are clearing this state in all exit paths */
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(cfg, DISCONNECTING, dev);
- WL_ERR(("error (%d)\n", err));
- return err;
+ if (wl_get_drv_status(cfg, CONNECTING, dev) ||
+ wl_get_drv_status(cfg, CONNECTED, dev)) {
+ scbval.val = reason_code;
+ memcpy(&scbval.ea, curbssid, ETHER_ADDR_LEN);
+ scbval.val = htod32(scbval.val);
+ WL_INFORM_MEM(("[%s] wl disassoc\n", dev->name));
+ err = wldev_ioctl_set(dev, WLC_DISASSOC, &scbval,
+ sizeof(scb_val_t));
+ if (unlikely(err)) {
+ wl_clr_drv_status(cfg, DISCONNECTING, dev);
+ WL_ERR(("error (%d)\n", err));
+ goto exit;
+ }
}
+#ifdef WL_WPS_SYNC
+ /* If are in WPS reauth state, then we would be
+ * dropping the link down events. Ensure that
+ * Event is sent up for the disconnect Req
+ */
+ if (wl_wps_session_update(dev,
+ WPS_STATE_DISCONNECT, curbssid) == BCME_OK) {
+ WL_INFORM_MEM(("[WPS] Disconnect done.\n"));
+ wl_clr_drv_status(cfg, DISCONNECTING, dev);
+ }
+#endif /* WPS_SYNC */
+ wl_cfg80211_wait_for_disconnection(cfg, dev);
+ } else {
+ /* Not in connecting or connected state. However since disconnect came
+ * from upper layer, indicate connect fail to clear any state mismatch
+ */
+ WL_INFORM_MEM(("act is false. report connect result fail.\n"));
+ CFG80211_CONNECT_RESULT(dev, NULL, NULL, NULL, 0, NULL, 0,
+ WLAN_STATUS_UNSPECIFIED_FAILURE, GFP_KERNEL);
}
#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);
+ dhdp->chan_isvht80 &= ~DHD_FLAG_STA_MODE;
+ if (!(dhdp->chan_isvht80))
+ dhd_set_cpucore(dhdp, FALSE);
}
#endif /* CUSTOM_SET_CPUCORE */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0))
- /* cfg80211 expects disconnect event from DHD to release wdev->current_bss */
- CFG80211_DISCONNECTED(dev, reason_code, NULL, 0, false, GFP_KERNEL);
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) */
+ cfg->rssi = 0; /* reset backup of rssi */
+
+exit:
+ /* Clear IEs for disaasoc */
+ if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
+ WL_ERR(("Find index failed\n"));
+ err = -EINVAL;
+ return err;
+ }
+ WL_ERR(("Clearing disconnect IEs \n"));
+ err = wl_cfg80211_set_mgmt_vndr_ies(cfg,
+ ndev_to_cfgdev(dev), bssidx, VNDR_IE_DISASSOC_FLAG, NULL, 0);
return err;
}
@@ -4728,8 +7612,8 @@
/* Just select a new current key */
index = (u32) key_idx;
index = htod32(index);
- err = wldev_ioctl(dev, WLC_SET_KEY_PRIMARY, &index,
- sizeof(index), true);
+ err = wldev_ioctl_set(dev, WLC_SET_KEY_PRIMARY, &index,
+ sizeof(index));
if (unlikely(err)) {
WL_ERR(("error (%d)\n", err));
}
@@ -4747,11 +7631,12 @@
s32 bssidx;
s32 mode = wl_get_mode_by_netdev(cfg, dev);
+ WL_ERR(("key index (%d)\n", key_idx));
if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
WL_ERR(("Find p2p index from wdev(%p) failed\n", dev->ieee80211_ptr));
return BCME_ERROR;
}
- memset(&key, 0, sizeof(key));
+ bzero(&key, sizeof(key));
key.index = (u32) key_idx;
if (!ETHER_ISMULTI(mac_addr))
@@ -4787,36 +7672,15 @@
/* if IW_ENCODE_EXT_RX_SEQ_VALID set */
if (params->seq && params->seq_len == 6) {
/* rx iv */
- u8 *ivptr;
- ivptr = (u8 *) params->seq;
+ const u8 *ivptr;
+ ivptr = (const u8 *) params->seq;
key.rxiv.hi = (ivptr[5] << 24) | (ivptr[4] << 16) |
(ivptr[3] << 8) | ivptr[2];
key.rxiv.lo = (ivptr[1] << 8) | ivptr[0];
key.iv_initialized = true;
}
-
- switch (params->cipher) {
- case WLAN_CIPHER_SUITE_WEP40:
- key.algo = CRYPTO_ALGO_WEP1;
- WL_DBG(("WLAN_CIPHER_SUITE_WEP40\n"));
- break;
- case WLAN_CIPHER_SUITE_WEP104:
- key.algo = CRYPTO_ALGO_WEP128;
- WL_DBG(("WLAN_CIPHER_SUITE_WEP104\n"));
- break;
- case WLAN_CIPHER_SUITE_TKIP:
- key.algo = CRYPTO_ALGO_TKIP;
- WL_DBG(("WLAN_CIPHER_SUITE_TKIP\n"));
- break;
- case WLAN_CIPHER_SUITE_AES_CMAC:
- key.algo = CRYPTO_ALGO_AES_CCM;
- WL_DBG(("WLAN_CIPHER_SUITE_AES_CMAC\n"));
- break;
- case WLAN_CIPHER_SUITE_CCMP:
- key.algo = CRYPTO_ALGO_AES_CCM;
- WL_DBG(("WLAN_CIPHER_SUITE_CCMP\n"));
- break;
- default:
+ key.algo = wl_rsn_cipher_wsec_key_algo_lookup(params->cipher);
+ if (key.algo == CRYPTO_ALGO_OFF) { //not found.
WL_ERR(("Invalid cipher (0x%x)\n", params->cipher));
return -EINVAL;
}
@@ -4829,6 +7693,7 @@
WL_ERR(("WLC_SET_KEY error (%d)\n", err));
return err;
}
+ WL_INFORM_MEM(("[%s] wsec key set\n", dev->name));
}
return err;
}
@@ -4838,11 +7703,14 @@
{
int err;
wl_eventmsg_buf_t ev_buf;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
- if (dev != bcmcfg_to_prmry_ndev(g_bcm_cfg)) {
+ if (dev != bcmcfg_to_prmry_ndev(cfg)) {
/* roam offload is only for the primary device */
return -1;
}
+
+ WL_INFORM_MEM(("[%s] wl roam_offload %d\n", dev->name, enable));
err = wldev_iovar_setint(dev, "roam_offload", enable);
if (err)
return err;
@@ -4854,56 +7722,79 @@
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);
+ err = wl_cfg80211_apply_eventbuffer(dev, cfg, &ev_buf);
if (!err) {
- g_bcm_cfg->roam_offload = enable;
+ cfg->roam_offload = enable;
}
return err;
}
-#if defined(WL_VIRTUAL_APSTA)
-int
-wl_cfg80211_interface_create(struct net_device *dev, char *name)
+struct wireless_dev *
+wl_cfg80211_get_wdev_from_ifname(struct bcm_cfg80211 *cfg, const char *name)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
- bcm_struct_cfgdev *new_cfgdev;
-
- new_cfgdev = wl_cfg80211_create_iface(cfg->wdev->wiphy,
- NL80211_IFTYPE_STATION, NULL, name);
- if (!new_cfgdev) {
- return BCME_ERROR;
- }
- else {
- WL_DBG(("Iface %s created successfuly\n", name));
- return BCME_OK;
- }
-}
-
-int
-wl_cfg80211_interface_delete(struct net_device *dev, char *name)
-{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
struct net_info *iter, *next;
- int err = BCME_ERROR;
if (name == NULL) {
- return BCME_ERROR;
+ WL_ERR(("Iface name is not provided\n"));
+ return NULL;
}
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
for_each_ndev(cfg, iter, next) {
+ GCC_DIAGNOSTIC_POP();
if (iter->ndev) {
if (strcmp(iter->ndev->name, name) == 0) {
- err = wl_cfg80211_del_iface(cfg->wdev->wiphy, cfg->bss_cfgdev);
- break;
+ return iter->ndev->ieee80211_ptr;
}
}
}
- if (!err) {
- WL_DBG(("Iface %s deleted successfuly", name));
- }
- return err;
+
+ WL_DBG(("Iface %s not found\n", name));
+ return NULL;
}
-#endif /* defined (WL_VIRTUAL_APSTA) */
+
+#if defined(PKT_FILTER_SUPPORT) && defined(APSTA_BLOCK_ARP_DURING_DHCP)
+void
+wl_cfg80211_block_arp(struct net_device *dev, int enable)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
+
+ WL_INFORM_MEM(("[%s] Enter. enable:%d\n", dev->name, enable));
+ if (!dhd_pkt_filter_enable) {
+ WL_DBG(("Packet filter isn't enabled\n"));
+ return;
+ }
+
+ /* Block/Unblock ARP frames only if STA is connected to
+ * the upstream AP in case of STA+SoftAP Concurrenct mode
+ */
+ if (!wl_get_drv_status(cfg, CONNECTED, dev)) {
+ WL_DBG(("STA not connected to upstream AP\n"));
+ return;
+ }
+
+ if (enable) {
+ WL_DBG(("Enable ARP Filter\n"));
+ /* Add ARP filter */
+ dhd_packet_filter_add_remove(dhdp, TRUE, DHD_BROADCAST_ARP_FILTER_NUM);
+
+ /* Enable ARP packet filter - blacklist */
+ dhd_master_mode = FALSE;
+ dhd_pktfilter_offload_enable(dhdp, dhdp->pktfilter[DHD_BROADCAST_ARP_FILTER_NUM],
+ TRUE, dhd_master_mode);
+ } else {
+ WL_DBG(("Disable ARP Filter\n"));
+ /* Disable ARP packet filter */
+ dhd_master_mode = TRUE;
+ dhd_pktfilter_offload_enable(dhdp, dhdp->pktfilter[DHD_BROADCAST_ARP_FILTER_NUM],
+ FALSE, dhd_master_mode);
+
+ /* Delete ARP filter */
+ dhd_packet_filter_add_remove(dhdp, FALSE, DHD_BROADCAST_ARP_FILTER_NUM);
+ }
+}
+#endif /* PKT_FILTER_SUPPORT && APSTA_BLOCK_ARP_DURING_DHCP */
static s32
wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
@@ -4918,7 +7809,20 @@
s32 bssidx = 0;
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
s32 mode = wl_get_mode_by_netdev(cfg, dev);
- WL_DBG(("key index (%d)\n", key_idx));
+#ifdef WL_GCMP
+ uint32 algos = 0, mask = 0;
+#endif /* WL_GCMP */
+#if defined(WLAN_CIPHER_SUITE_PMK)
+ int j;
+ wsec_pmk_t pmk;
+ char keystring[WSEC_MAX_PSK_LEN + 1];
+ char* charptr = keystring;
+ u16 len;
+ struct wl_security *sec;
+#endif /* defined(WLAN_CIPHER_SUITE_PMK) */
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
+
+ WL_INFORM_MEM(("key index (%d) (0x%x)\n", key_idx, params->cipher));
RETURN_EIO_IF_NOT_UP(cfg);
if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
@@ -4932,9 +7836,13 @@
wl_add_keyext(wiphy, dev, key_idx, mac_addr, params);
goto exit;
}
- memset(&key, 0, sizeof(key));
+
+ BCM_REFERENCE(dhdp);
+ DHD_STATLOG_CTRL(dhdp, ST(INSTALL_KEY), dhd_net2idx(dhdp->info, dev), 0);
+
+ bzero(&key, sizeof(key));
/* Clear any buffered wep key */
- memset(&cfg->wep_key, 0, sizeof(struct wl_wsec_key));
+ bzero(&cfg->wep_key, sizeof(struct wl_wsec_key));
key.len = (u32) params->key_len;
key.index = (u32) key_idx;
@@ -4946,20 +7854,23 @@
memcpy(key.data, params->key, key.len);
key.flags = WL_PRIMARY_KEY;
+
+ key.algo = wl_rsn_cipher_wsec_key_algo_lookup(params->cipher);
+ val = wl_rsn_cipher_wsec_algo_lookup(params->cipher);
+ if (val == WSEC_NONE) {
+ WL_ERR(("Invalid cipher (0x%x)\n", params->cipher));
+#if defined(WLAN_CIPHER_SUITE_PMK)
+ /* WLAN_CIPHER_SUITE_PMK is not NL80211 standard ,but BRCM proprietary cipher suite.
+ * so it doesn't have right algo type too. Just for now, bypass this check for
+ * backward compatibility.
+ * TODO: deprecate this proprietary way and replace to nl80211 set_pmk API.
+ */
+ if (params->cipher != WLAN_CIPHER_SUITE_PMK)
+#endif /* defined(WLAN_CIPHER_SUITE_PMK) */
+ return -EINVAL;
+ }
switch (params->cipher) {
- case WLAN_CIPHER_SUITE_WEP40:
- key.algo = CRYPTO_ALGO_WEP1;
- val = WEP_ENABLED;
- WL_DBG(("WLAN_CIPHER_SUITE_WEP40\n"));
- break;
- case WLAN_CIPHER_SUITE_WEP104:
- key.algo = CRYPTO_ALGO_WEP128;
- val = WEP_ENABLED;
- WL_DBG(("WLAN_CIPHER_SUITE_WEP104\n"));
- break;
case WLAN_CIPHER_SUITE_TKIP:
- key.algo = CRYPTO_ALGO_TKIP;
- val = TKIP_ENABLED;
/* wpa_supplicant switches the third and fourth quarters of the TKIP key */
if (mode == WL_MODE_BSS) {
bcopy(&key.data[24], keybuf, sizeof(keybuf));
@@ -4968,50 +7879,55 @@
}
WL_DBG(("WLAN_CIPHER_SUITE_TKIP\n"));
break;
- case WLAN_CIPHER_SUITE_AES_CMAC:
- key.algo = CRYPTO_ALGO_AES_CCM;
- val = AES_ENABLED;
- WL_DBG(("WLAN_CIPHER_SUITE_AES_CMAC\n"));
- break;
- case WLAN_CIPHER_SUITE_CCMP:
- key.algo = CRYPTO_ALGO_AES_CCM;
- val = AES_ENABLED;
- WL_DBG(("WLAN_CIPHER_SUITE_CCMP\n"));
- break;
-#if defined(WLFBT) && defined(WLAN_CIPHER_SUITE_PMK)
- case WLAN_CIPHER_SUITE_PMK: {
- int j;
- wsec_pmk_t pmk;
- char keystring[WSEC_MAX_PSK_LEN + 1];
- char* charptr = keystring;
- uint len;
- struct wl_security *sec;
-
+#if defined(WLAN_CIPHER_SUITE_PMK)
+ case WLAN_CIPHER_SUITE_PMK:
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", (void *)params->key,
+
+ WL_MEM(("set_pmk: wpa_auth:%x akm:%x\n", sec->wpa_auth, params->cipher));
+ /* Avoid pmk set for SAE and OWE for external supplicant case. */
+ if (IS_AKM_SAE(sec->wpa_auth) || IS_AKM_OWE(sec->wpa_auth)) {
+ WL_INFORM_MEM(("skip pmk set for akm:%x\n", sec->wpa_auth));
+ break;
+ }
+
+ if ((sec->wpa_auth == WLAN_AKM_SUITE_8021X) ||
+ (sec->wpa_auth == WL_AKM_SUITE_SHA256_1X)) {
+ err = wldev_iovar_setbuf(dev, "okc_info_pmk", (const void *)params->key,
WSEC_MAX_PSK_LEN / 2, keystring, sizeof(keystring), NULL);
if (err) {
/* could fail in case that 'okc' is not supported */
- WL_INFORM(("Setting 'okc_info_pmk' failed, err=%d\n", err));
+ WL_INFORM_MEM(("okc_info_pmk failed, err=%d (ignore)\n", err));
}
}
/* copy the raw hex key to the appropriate format */
for (j = 0; j < (WSEC_MAX_PSK_LEN / 2); j++) {
charptr += snprintf(charptr, sizeof(keystring), "%02x", params->key[j]);
}
- len = strlen(keystring);
+ len = (u16)strlen(keystring);
pmk.key_len = htod16(len);
bcopy(keystring, pmk.key, len);
pmk.flags = htod16(WSEC_PASSPHRASE);
- err = wldev_ioctl(dev, WLC_SET_WSEC_PMK, &pmk, sizeof(pmk), true);
- if (err)
+
+ err = wldev_ioctl_set(dev, WLC_SET_WSEC_PMK, &pmk, sizeof(pmk));
+ if (err) {
return err;
- } break;
-#endif /* WLFBT && WLAN_CIPHER_SUITE_PMK */
- default:
- WL_ERR(("Invalid cipher (0x%x)\n", params->cipher));
- return -EINVAL;
+ }
+ /* Clear key length to delete key */
+ key.len = 0;
+ break;
+#endif /* WLAN_CIPHER_SUITE_PMK */
+#ifdef WL_GCMP
+ case WLAN_CIPHER_SUITE_GCMP:
+ case WLAN_CIPHER_SUITE_GCMP_256:
+ case WLAN_CIPHER_SUITE_BIP_GMAC_128:
+ case WLAN_CIPHER_SUITE_BIP_GMAC_256:
+ algos = KEY_ALGO_MASK(key.algo);
+ mask = algos | KEY_ALGO_MASK(CRYPTO_ALGO_AES_CCM);
+ break;
+#endif /* WL_GCMP */
+ default: /* No post processing required */
+ WL_DBG(("no post processing required (0x%x)\n", params->cipher));
+ break;
}
/* Set the new key/index */
@@ -5053,7 +7969,11 @@
WL_ERR(("set wsec error (%d)\n", err));
return err;
}
-
+#ifdef WL_GCMP
+ if (wl_set_wsec_info_algos(dev, algos, mask)) {
+ WL_ERR(("set wsec_info error (%d)\n", err));
+ }
+#endif /* WL_GCMP */
return err;
}
@@ -5065,6 +7985,7 @@
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
s32 err = 0;
s32 bssidx;
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
WL_ERR(("Find p2p index from wdev(%p) failed\n", dev->ieee80211_ptr));
@@ -5075,10 +7996,12 @@
#ifndef MFP
if ((key_idx >= DOT11_MAX_DEFAULT_KEYS) && (key_idx < DOT11_MAX_DEFAULT_KEYS+2))
return -EINVAL;
-#endif
+#endif // endif
RETURN_EIO_IF_NOT_UP(cfg);
- memset(&key, 0, sizeof(key));
+ BCM_REFERENCE(dhdp);
+ DHD_STATLOG_CTRL(dhdp, ST(DELETE_KEY), dhd_net2idx(dhdp->info, dev), 0);
+ bzero(&key, sizeof(key));
key.flags = WL_PRIMARY_KEY;
key.algo = CRYPTO_ALGO_OFF;
@@ -5103,6 +8026,7 @@
return err;
}
+/* NOTE : this function cannot work as is and is never called */
static s32
wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie,
@@ -5122,12 +8046,12 @@
}
WL_DBG(("key index (%d)\n", key_idx));
RETURN_EIO_IF_NOT_UP(cfg);
- memset(&key, 0, sizeof(key));
+ bzero(&key, sizeof(key));
key.index = key_idx;
swap_key_to_BE(&key);
- memset(¶ms, 0, sizeof(params));
+ bzero(¶ms, sizeof(params));
params.key_len = (u8) min_t(u8, DOT11_MAX_KEY_SIZE, key.len);
- memcpy((void *)params.key, key.data, params.key_len);
+ params.key = key.data;
err = wldev_iovar_getint_bsscfg(dev, "wsec", &wsec, bssidx);
if (unlikely(err)) {
@@ -5153,6 +8077,19 @@
params.cipher = WLAN_CIPHER_SUITE_AES_CMAC;
WL_DBG(("WLAN_CIPHER_SUITE_AES_CMAC\n"));
break;
+#ifdef BCMWAPI_WPI
+ case SMS4_ENABLED:
+ params.cipher = WLAN_CIPHER_SUITE_SMS4;
+ WL_DBG(("WLAN_CIPHER_SUITE_SMS4\n"));
+ break;
+#endif // endif
+#if defined(SUPPORT_SOFTAP_WPAWPA2_MIXED)
+ /* to connect to mixed mode AP */
+ case (AES_ENABLED | TKIP_ENABLED): /* TKIP CCMP */
+ params.cipher = WLAN_CIPHER_SUITE_AES_CMAC;
+ WL_DBG(("WLAN_CIPHER_SUITE_TKIP\n"));
+ break;
+#endif // endif
default:
WL_ERR(("Invalid algo (0x%x)\n", wsec));
return -EINVAL;
@@ -5169,165 +8106,529 @@
#ifdef MFP
return 0;
#else
- WL_INFORM(("Not supported\n"));
+ WL_INFORM_MEM(("Not supported\n"));
return -EOPNOTSUPP;
#endif /* MFP */
}
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0))
-static s32
-wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
- const u8 *mac, struct station_info *sinfo)
-#else
-static s32
-wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
- u8 *mac, struct station_info *sinfo)
-#endif
+static bool
+wl_check_assoc_state(struct bcm_cfg80211 *cfg, struct net_device *dev)
{
- struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
+ wl_assoc_info_t asinfo;
+ uint32 state = 0;
+ int err;
+
+ err = wldev_iovar_getbuf_bsscfg(dev, "assoc_info",
+ NULL, 0, cfg->ioctl_buf, WLC_IOCTL_MEDLEN, 0, &cfg->ioctl_buf_sync);
+ if (unlikely(err)) {
+ WL_ERR(("failed to get assoc_info : err=%d\n", err));
+ return FALSE;
+ } else {
+ memcpy(&asinfo, cfg->ioctl_buf, sizeof(wl_assoc_info_t));
+ state = dtoh32(asinfo.state);
+ WL_DBG(("assoc state=%d\n", state));
+ }
+
+ return (state > 0)? TRUE:FALSE;
+}
+
+static s32
+wl_cfg80211_get_rssi(struct net_device *dev, struct bcm_cfg80211 *cfg, s32 *rssi)
+{
+ s32 err = BCME_OK;
scb_val_t scb_val;
- s32 rssi;
- s32 rate;
- s32 err = 0;
- sta_info_t *sta;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0))
- s8 eabuf[ETHER_ADDR_STR_LEN];
-#endif
- 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, 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 = STA_INFO_BIT(INFO_INACTIVE_TIME);
- 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 (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0))
- if (sta->flags & WL_STA_ASSOC) {
- sinfo->filled |= STA_INFO_BIT(INFO_CONNECTED_TIME);
- sinfo->connected_time = sta->in;
- }
- WL_INFORM(("STA %s : idle time : %d sec, connected time :%d ms\n",
- bcm_ether_ntoa((const struct ether_addr *)mac, eabuf), sinfo->inactive_time,
- sta->idle * 1000));
-#endif
- } 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;
+#ifdef SUPPORT_RSSI_SUM_REPORT
+ wl_rssi_ant_mimo_t rssi_ant_mimo;
+#endif /* SUPPORT_RSSI_SUM_REPORT */
- if (cfg->roam_offload) {
- struct ether_addr bssid;
- memset(&bssid, 0, sizeof(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 (!ETHER_ISNULLADDR(&bssid.octet) &&
- 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)
- return err;
- 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)));
- }
+ if (dev == NULL || cfg == NULL) {
+ return BCME_ERROR;
+ }
- /* Report the current tx rate */
- rate = 0;
- err = wldev_ioctl(dev, WLC_GET_RATE, &rate, sizeof(rate), false);
- 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 |= STA_INFO_BIT(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;
+ /* initialize rssi */
+ *rssi = 0;
- 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));
- scb_val.val = 0;
- err = wldev_ioctl(dev, WLC_GET_RSSI, &scb_val,
- sizeof(scb_val_t), false);
- if (err) {
- WL_ERR(("Could not get rssi (%d)\n", err));
- goto get_station_err;
- }
- rssi = wl_rssi_offset(dtoh32(scb_val.val));
- sinfo->filled |= STA_INFO_BIT(INFO_SIGNAL);
- sinfo->signal = rssi;
- WL_DBG(("RSSI %d dBm\n", rssi));
- memset(&pktcnt, 0, sizeof(pktcnt));
- err = wldev_ioctl(dev, WLC_GET_PKTCNTS, &pktcnt,
- sizeof(pktcnt), false);
- if (!err) {
- sinfo->filled |= (STA_INFO_BIT(INFO_RX_PACKETS) |
- STA_INFO_BIT(INFO_RX_DROP_MISC) |
- STA_INFO_BIT(INFO_TX_PACKETS) |
- STA_INFO_BIT(INFO_TX_FAILED));
- sinfo->rx_packets = pktcnt.rx_good_pkt;
- sinfo->rx_dropped_misc = pktcnt.rx_bad_pkt;
- sinfo->tx_packets = pktcnt.tx_good_pkt;
- sinfo->tx_failed = pktcnt.tx_bad_pkt;
- }
-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(cfg, CONNECTED, dev);
- CFG80211_DISCONNECTED(dev, 0, NULL, 0, false, GFP_KERNEL);
- wl_link_down(cfg);
+#ifdef SUPPORT_RSSI_SUM_REPORT
+ /* Query RSSI sum across antennas */
+ bzero(&rssi_ant_mimo, sizeof(rssi_ant_mimo));
+ err = wl_get_rssi_per_ant(dev, dev->name, NULL, &rssi_ant_mimo);
+ if (err) {
+ WL_ERR(("Could not get rssi sum (%d)\n", err));
+ /* set rssi to zero and do not return error,
+ * because iovar phy_rssi_ant could return BCME_UNSUPPORTED
+ * when bssid was null during roaming
+ */
+ err = BCME_OK;
+ } else {
+ cfg->rssi_sum_report = TRUE;
+ if ((*rssi = rssi_ant_mimo.rssi_sum) >= 0) {
+ *rssi = 0;
}
}
- else {
- WL_ERR(("Invalid device mode %d\n", wl_get_mode_by_netdev(cfg, dev)));
+#endif /* SUPPORT_RSSI_SUM_REPORT */
+
+ /* if SUPPORT_RSSI_SUM_REPORT works once, do not use legacy method anymore */
+ if (cfg->rssi_sum_report == FALSE) {
+ bzero(&scb_val, sizeof(scb_val));
+ scb_val.val = 0;
+ err = wldev_ioctl_get(dev, WLC_GET_RSSI, &scb_val,
+ sizeof(scb_val_t));
+ if (err) {
+ WL_ERR(("Could not get rssi (%d)\n", err));
+ return err;
+ }
+ *rssi = wl_rssi_offset(dtoh32(scb_val.val));
+ }
+
+ if (*rssi >= 0) {
+ /* check assoc status including roaming */
+ DHD_OS_WAKE_LOCK((dhd_pub_t *)(cfg->pub));
+ if (wl_get_drv_status(cfg, CONNECTED, dev) && wl_check_assoc_state(cfg, dev)) {
+ *rssi = cfg->rssi; /* use previous RSSI */
+ WL_DBG(("use previous RSSI %d dBm\n", cfg->rssi));
+ } else {
+ *rssi = 0;
+ }
+ DHD_OS_WAKE_UNLOCK((dhd_pub_t *)(cfg->pub));
+ } else {
+ /* backup the current rssi */
+ cfg->rssi = *rssi;
}
return err;
}
+static int
+wl_cfg80211_ifstats_counters_cb(void *ctx, const uint8 *data, uint16 type, uint16 len)
+{
+ switch (type) {
+ case WL_IFSTATS_XTLV_IF_INDEX:
+ WL_DBG(("Stats received on interface index: %d\n", *data));
+ break;
+ case WL_IFSTATS_XTLV_GENERIC: {
+ if (len > sizeof(wl_if_stats_t)) {
+ WL_INFORM(("type 0x%x: cntbuf length too long! %d > %d\n",
+ type, len, (int)sizeof(wl_if_stats_t)));
+ }
+ memcpy(ctx, data, sizeof(wl_if_stats_t));
+ break;
+ }
+ default:
+ WL_DBG(("Unsupported counter type 0x%x\n", type));
+ break;
+ }
+
+ return BCME_OK;
+}
+
+/* Parameters to if_counters iovar need to be converted to XTLV format
+ * before sending to FW. The length of the top level XTLV container
+ * containing parameters should not exceed 228 bytes
+ */
+#define IF_COUNTERS_PARAM_CONTAINER_LEN_MAX 228
+
+int
+wl_cfg80211_ifstats_counters(struct net_device *dev, wl_if_stats_t *if_stats)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
+ uint8 *pbuf = NULL;
+ bcm_xtlvbuf_t xtlvbuf, local_xtlvbuf;
+ bcm_xtlv_t *xtlv;
+ uint16 expected_resp_len;
+ wl_stats_report_t *request = NULL, *response = NULL;
+ int bsscfg_idx;
+ int ret = BCME_OK;
+
+ pbuf = (uint8 *)MALLOCZ(dhdp->osh, WLC_IOCTL_MEDLEN);
+ if (!pbuf) {
+ WL_ERR(("Failed to allocate local pbuf\n"));
+ return BCME_NOMEM;
+ }
+
+ /* top level container length cannot exceed 228 bytes.
+ * This is because the output buffer is 1535 bytes long.
+ * Allow 1300 bytes for reporting stats coming in XTLV format
+ */
+ request = (wl_stats_report_t *)
+ MALLOCZ(dhdp->osh, IF_COUNTERS_PARAM_CONTAINER_LEN_MAX);
+ if (!request) {
+ WL_ERR(("Failed to allocate wl_stats_report_t with length (%d)\n",
+ IF_COUNTERS_PARAM_CONTAINER_LEN_MAX));
+ ret = BCME_NOMEM;
+ goto fail;
+ }
+
+ request->version = WL_STATS_REPORT_REQUEST_VERSION_V2;
+
+ /* Top level container... we will create it ourselves */
+ /* Leave space for report version, length, and top level XTLV
+ * WL_IFSTATS_XTLV_IF.
+ */
+ ret = bcm_xtlv_buf_init(&local_xtlvbuf,
+ (uint8*)(request->data) + BCM_XTLV_HDR_SIZE,
+ IF_COUNTERS_PARAM_CONTAINER_LEN_MAX -
+ offsetof(wl_stats_report_t, data) - BCM_XTLV_HDR_SIZE,
+ BCM_XTLV_OPTION_ALIGN32);
+
+ if (ret) {
+ goto fail;
+ }
+
+ /* Populate requests using this the local_xtlvbuf context. The xtlvbuf
+ * is used to fill the container containing the XTLVs populated using
+ * local_xtlvbuf.
+ */
+ ret = bcm_xtlv_buf_init(&xtlvbuf,
+ (uint8*)(request->data),
+ IF_COUNTERS_PARAM_CONTAINER_LEN_MAX -
+ offsetof(wl_stats_report_t, data),
+ BCM_XTLV_OPTION_ALIGN32);
+
+ if (ret) {
+ goto fail;
+ }
+
+ /* Request generic stats */
+ ret = bcm_xtlv_put_data(&local_xtlvbuf,
+ WL_IFSTATS_XTLV_GENERIC, NULL, 0);
+ if (ret) {
+ goto fail;
+ }
+
+ /* Complete the outer container with type and length
+ * only.
+ */
+ ret = bcm_xtlv_put_data(&xtlvbuf,
+ WL_IFSTATS_XTLV_IF,
+ NULL, bcm_xtlv_buf_len(&local_xtlvbuf));
+
+ if (ret) {
+ goto fail;
+ }
+
+ request->length = bcm_xtlv_buf_len(&xtlvbuf) +
+ offsetof(wl_stats_report_t, data);
+ bsscfg_idx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr);
+
+ /* send the command over to the device and get teh output */
+ ret = wldev_iovar_getbuf_bsscfg(dev, "if_counters", (void *)request,
+ request->length, pbuf, WLC_IOCTL_MEDLEN, bsscfg_idx,
+ &cfg->ioctl_buf_sync);
+ if (ret < 0) {
+ WL_ERR(("if_counters not supported ret=%d\n", ret));
+ goto fail;
+ }
+
+ /* Reuse request to process response */
+ response = (wl_stats_report_t *)pbuf;
+
+ /* version check */
+ if (response->version != WL_STATS_REPORT_REQUEST_VERSION_V2) {
+ ret = BCME_VERSION;
+ goto fail;
+ }
+
+ xtlv = (bcm_xtlv_t *)(response->data);
+
+ expected_resp_len =
+ (BCM_XTLV_LEN(xtlv) + OFFSETOF(wl_stats_report_t, data));
+
+ /* Check if the received length is as expected */
+ if ((response->length > WLC_IOCTL_MEDLEN) ||
+ (response->length < expected_resp_len)) {
+ ret = BCME_ERROR;
+ WL_ERR(("Illegal response length received. Got: %d"
+ " Expected: %d. Expected len must be <= %u\n",
+ response->length, expected_resp_len, WLC_IOCTL_MEDLEN));
+ goto fail;
+ }
+
+ /* check the type. The return data will be in
+ * WL_IFSTATS_XTLV_IF container. So check if that container is
+ * present
+ */
+ if (BCM_XTLV_ID(xtlv) != WL_IFSTATS_XTLV_IF) {
+ ret = BCME_ERROR;
+ WL_ERR(("unexpected type received: %d Expected: %d\n",
+ BCM_XTLV_ID(xtlv), WL_IFSTATS_XTLV_IF));
+ goto fail;
+ }
+
+ /* Process XTLVs within WL_IFSTATS_XTLV_IF container */
+ ret = bcm_unpack_xtlv_buf(if_stats,
+ (uint8*)response->data + BCM_XTLV_HDR_SIZE,
+ BCM_XTLV_LEN(xtlv), /* total length of all TLVs in container */
+ BCM_XTLV_OPTION_ALIGN32, wl_cfg80211_ifstats_counters_cb);
+ if (ret) {
+ WL_ERR(("Error unpacking XTLVs in wl_ifstats_counters: %d\n", ret));
+ }
+
+fail:
+ if (pbuf) {
+ MFREE(dhdp->osh, pbuf, WLC_IOCTL_MEDLEN);
+ }
+
+ if (request) {
+ MFREE(dhdp->osh, request, IF_COUNTERS_PARAM_CONTAINER_LEN_MAX);
+ }
+ return ret;
+}
+#undef IF_COUNTERS_PARAM_CONTAINER_LEN_MAX
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0))
static s32
+wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
+ const u8 *mac, struct station_info *sinfo)
+#else
+static s32
+wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev,
+ u8 *mac, struct station_info *sinfo)
+#endif // endif
+{
+ struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
+ s32 rssi = 0;
+ s32 rate = 0;
+ s32 err = 0;
+ u16 wl_iftype = 0;
+ u16 wl_mode = 0;
+ get_pktcnt_t pktcnt;
+ wl_if_stats_t *if_stats = NULL;
+ sta_info_v4_t *sta = NULL;
+ u8 *curmacp = NULL;
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) || defined(WL_COMPAT_WIRELESS)
+ s8 eabuf[ETHER_ADDR_STR_LEN];
+#endif // endif
+ dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+ bool fw_assoc_state = FALSE;
+ u32 dhd_assoc_state = 0;
+ void *buf;
+
+ RETURN_EIO_IF_NOT_UP(cfg);
+
+ if (cfg80211_to_wl_iftype(dev->ieee80211_ptr->iftype, &wl_iftype, &wl_mode) < 0) {
+ return -EINVAL;
+ }
+
+ buf = MALLOC(cfg->osh, MAX(sizeof(wl_if_stats_t), WLC_IOCTL_SMLEN));
+ if (buf == NULL) {
+ WL_ERR(("wl_cfg80211_get_station: MALLOC failed\n"));
+ goto error;
+ }
+
+ switch (wl_iftype) {
+ case WL_IF_TYPE_STA:
+ case WL_IF_TYPE_IBSS:
+ if (cfg->roam_offload) {
+ struct ether_addr bssid;
+ bzero(&bssid, sizeof(bssid));
+ err = wldev_ioctl_get(dev, WLC_GET_BSSID, &bssid, ETHER_ADDR_LEN);
+ 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;
+ }
+ }
+ }
+ dhd_assoc_state = wl_get_drv_status(cfg, CONNECTED, dev);
+ DHD_OS_WAKE_LOCK(dhd);
+ fw_assoc_state = dhd_is_associated(dhd, 0, &err);
+ if (dhd_assoc_state && !fw_assoc_state) {
+ /* check roam (join) status */
+ if (wl_check_assoc_state(cfg, dev)) {
+ fw_assoc_state = TRUE;
+ WL_DBG(("roam status\n"));
+ }
+ }
+ DHD_OS_WAKE_UNLOCK(dhd);
+ if (!dhd_assoc_state || !fw_assoc_state) {
+ WL_ERR(("NOT assoc\n"));
+ if (err == -ENODATA)
+ goto error;
+ if (!dhd_assoc_state) {
+ WL_TRACE_HW4(("drv state is not connected \n"));
+ }
+ if (!fw_assoc_state) {
+ WL_TRACE_HW4(("fw state is not associated \n"));
+ }
+ /* Disconnect due to fw is not associated for
+ * FW_ASSOC_WATCHDOG_TIME ms.
+ * 'err == 0' of dhd_is_associated() and '!fw_assoc_state'
+ * means that BSSID is null.
+ */
+ if (dhd_assoc_state && !fw_assoc_state && !err) {
+ if (!fw_assoc_watchdog_started) {
+ fw_assoc_watchdog_ms = OSL_SYSUPTIME();
+ fw_assoc_watchdog_started = TRUE;
+ WL_TRACE_HW4(("fw_assoc_watchdog_started \n"));
+ } else if (OSL_SYSUPTIME() - fw_assoc_watchdog_ms >
+ FW_ASSOC_WATCHDOG_TIME) {
+ fw_assoc_watchdog_started = FALSE;
+ err = -ENODEV;
+ WL_TRACE_HW4(("fw is not associated for %d ms \n",
+ (OSL_SYSUPTIME() - fw_assoc_watchdog_ms)));
+ goto get_station_err;
+ }
+ }
+ err = -ENODEV;
+ goto error;
+ }
+ if (dhd_is_associated(dhd, 0, NULL)) {
+ fw_assoc_watchdog_started = FALSE;
+ }
+ 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)));
+ }
+ /* go through to get another information */
+ /* fall through */
+ case WL_IF_TYPE_P2P_GC:
+ case WL_IF_TYPE_P2P_DISC:
+ if ((err = wl_cfg80211_get_rssi(dev, cfg, &rssi)) != BCME_OK) {
+ goto get_station_err;
+ }
+ sinfo->filled |= STA_INFO_BIT(INFO_SIGNAL);
+ sinfo->signal = rssi;
+ WL_DBG(("RSSI %d dBm\n", rssi));
+ /* go through to get another information */
+ /* fall through */
+ case WL_IF_TYPE_P2P_GO:
+ /* Report the current tx rate */
+ rate = 0;
+ err = wldev_ioctl_get(dev, WLC_GET_RATE, &rate, sizeof(rate));
+ if (err) {
+ WL_ERR(("Could not get rate (%d)\n", err));
+ } else {
+#if defined(USE_DYNAMIC_MAXPKT_RXGLOM)
+ int rxpktglom;
+#endif // endif
+ rate = dtoh32(rate);
+ sinfo->filled |= STA_INFO_BIT(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, &cfg->ioctl_buf_sync);
+ if (err < 0) {
+ WL_ERR(("set bus:maxtxpktglom failed, %d\n", err));
+ }
+ }
+#endif // endif
+ }
+ if_stats = (wl_if_stats_t *)buf;
+ bzero(if_stats, sizeof(*if_stats));
+ if (FW_SUPPORTED(dhd, ifst)) {
+ err = wl_cfg80211_ifstats_counters(dev, if_stats);
+ } else
+ {
+ err = wldev_iovar_getbuf(dev, "if_counters", NULL, 0,
+ (char *)if_stats, sizeof(*if_stats), NULL);
+ }
+
+ if (err) {
+ WL_ERR(("if_counters not supported ret=%d\n",
+ err));
+ bzero(&pktcnt, sizeof(pktcnt));
+ err = wldev_ioctl_get(dev, WLC_GET_PKTCNTS, &pktcnt,
+ sizeof(pktcnt));
+ if (!err) {
+ sinfo->rx_packets = pktcnt.rx_good_pkt;
+ sinfo->rx_dropped_misc = pktcnt.rx_bad_pkt;
+ sinfo->tx_packets = pktcnt.tx_good_pkt;
+ sinfo->tx_failed = pktcnt.tx_bad_pkt;
+ }
+ } else {
+ sinfo->rx_packets = (uint32)dtoh64(if_stats->rxframe);
+ sinfo->rx_dropped_misc = 0;
+ sinfo->tx_packets = (uint32)dtoh64(if_stats->txfrmsnt);
+ sinfo->tx_failed = (uint32)dtoh64(if_stats->txnobuf) +
+ (uint32)dtoh64(if_stats->txrunt) +
+ (uint32)dtoh64(if_stats->txfail);
+ }
+
+ sinfo->filled |= (STA_INFO_BIT(INFO_RX_PACKETS) |
+ STA_INFO_BIT(INFO_RX_DROP_MISC) |
+ STA_INFO_BIT(INFO_TX_PACKETS) |
+ STA_INFO_BIT(INFO_TX_FAILED));
+get_station_err:
+ if (err && (err != -ENODATA)) {
+ /* Disconnect due to zero BSSID or error to get RSSI */
+ scb_val_t scbval;
+ DHD_STATLOG_CTRL(dhd, ST(DISASSOC_INT_START),
+ dhd_net2idx(dhd->info, dev), DOT11_RC_DISASSOC_LEAVING);
+ scbval.val = htod32(DOT11_RC_DISASSOC_LEAVING);
+ err = wldev_ioctl_set(dev, WLC_DISASSOC, &scbval,
+ sizeof(scb_val_t));
+ if (unlikely(err)) {
+ WL_ERR(("disassoc error (%d)\n", err));
+ }
+
+ WL_ERR(("force cfg80211_disconnected: %d\n", err));
+ wl_clr_drv_status(cfg, CONNECTED, dev);
+ DHD_STATLOG_CTRL(dhd, ST(DISASSOC_DONE),
+ dhd_net2idx(dhd->info, dev), DOT11_RC_DISASSOC_LEAVING);
+ CFG80211_DISCONNECTED(dev, 0, NULL, 0, false, GFP_KERNEL);
+ wl_link_down(cfg);
+ }
+ break;
+ case WL_IF_TYPE_AP:
+ err = wldev_iovar_getbuf(dev, "sta_info", (const void*)mac,
+ ETHER_ADDR_LEN, buf, WLC_IOCTL_SMLEN, NULL);
+ if (err < 0) {
+ WL_ERR(("GET STA INFO failed, %d\n", err));
+ goto error;
+ }
+ sinfo->filled = STA_INFO_BIT(INFO_INACTIVE_TIME);
+ sta = (sta_info_v4_t *)buf;
+ if (sta->ver != WL_STA_VER_4 && sta->ver != WL_STA_VER_5) {
+ WL_ERR(("GET STA INFO version mismatch, %d\n", err));
+ return BCME_VERSION;
+ }
+ 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 (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)) || defined(WL_COMPAT_WIRELESS)
+ if (sta->flags & WL_STA_ASSOC) {
+ sinfo->filled |= STA_INFO_BIT(INFO_CONNECTED_TIME);
+ sinfo->connected_time = sta->in;
+ }
+ WL_INFORM_MEM(("[%s] STA %s : idle time : %d sec,"
+ " connected time :%d ms\n",
+ dev->name,
+ bcm_ether_ntoa((const struct ether_addr *)mac, eabuf),
+ sinfo->inactive_time, sta->idle * 1000));
+#endif // endif
+ break;
+ default :
+ WL_ERR(("Invalid device mode %d\n", wl_get_mode_by_netdev(cfg, dev)));
+ }
+error:
+ if (buf) {
+ MFREE(cfg->osh, buf, MAX(sizeof(wl_if_stats_t), WLC_IOCTL_SMLEN));
+ }
+
+ return err;
+}
+
+s32
wl_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *dev,
bool enabled, s32 timeout)
{
@@ -5335,15 +8636,24 @@
s32 err = 0;
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
struct net_info *_net_info = wl_get_netinfo_by_netdev(cfg, dev);
-
+ s32 mode;
+#ifdef RTT_SUPPORT
+ dhd_pub_t *dhd = cfg->pub;
+ rtt_status_info_t *rtt_status;
+#endif /* RTT_SUPPORT */
RETURN_EIO_IF_NOT_UP(cfg);
+
WL_DBG(("Enter\n"));
+ mode = wl_get_mode_by_netdev(cfg, dev);
if (cfg->p2p_net == dev || _net_info == NULL ||
- !wl_get_drv_status(cfg, CONNECTED, dev)) {
+ !wl_get_drv_status(cfg, CONNECTED, dev) ||
+ ((mode != WL_MODE_BSS) &&
+ (mode != WL_MODE_IBSS))) {
return err;
}
- /* Delete pm_enable_work */
- wl_add_remove_pm_enable_work(cfg, FALSE, WL_HANDLER_PEND);
+
+ /* Enlarge pm_enable_work */
+ wl_add_remove_pm_enable_work(cfg, WL_PM_WORKQ_LONG);
pm = enabled ? PM_FAST : PM_OFF;
if (_net_info->pm_block) {
@@ -5353,14 +8663,21 @@
}
pm = htod32(pm);
WL_DBG(("%s:power save %s\n", dev->name, (pm ? "enabled" : "disabled")));
- err = wldev_ioctl(dev, WLC_SET_PM, &pm, sizeof(pm), true);
- if (unlikely(err)) {
- if (err == -ENODEV)
- WL_DBG(("net_device is not ready yet\n"));
- else
- WL_ERR(("error (%d)\n", err));
- return err;
+#ifdef RTT_SUPPORT
+ rtt_status = GET_RTTSTATE(dhd);
+ if (rtt_status->status != RTT_ENABLED) {
+#endif /* RTT_SUPPORT */
+ err = wldev_ioctl_set(dev, WLC_SET_PM, &pm, sizeof(pm));
+ if (unlikely(err)) {
+ if (err == -ENODEV)
+ WL_DBG(("net_device is not ready yet\n"));
+ else
+ WL_ERR(("error (%d)\n", err));
+ return err;
+ }
+#ifdef RTT_SUPPORT
}
+#endif /* RTT_SUPPORT */
wl_cfg80211_update_power_mode(dev);
return err;
}
@@ -5369,23 +8686,11 @@
{
int err, pm = -1;
- err = wldev_ioctl(dev, WLC_GET_PM, &pm, sizeof(pm), true);
+ err = wldev_ioctl_get(dev, WLC_GET_PM, &pm, sizeof(pm));
if (err)
- WL_ERR(("%s:error (%d)\n", __FUNCTION__, err));
+ WL_ERR(("wl_cfg80211_update_power_mode: error (%d)\n", err));
else if (pm != -1 && dev->ieee80211_ptr)
dev->ieee80211_ptr->ps = (pm == PM_OFF) ? false : true;
-}
-
-void wl_cfg80211_set_passive_scan(struct net_device *dev, char *command)
-{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
-
- if (strcmp(command, "SCAN-ACTIVE") == 0) {
- cfg->active_scan = 1;
- } else if (strcmp(command, "SCAN-PASSIVE") == 0) {
- cfg->active_scan = 0;
- } else
- WL_ERR(("Unknown command \n"));
}
static __used u32 wl_find_msb(u16 bit16)
@@ -5420,22 +8725,158 @@
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg);
s32 err = BCME_OK;
+#if ((LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)) || defined(WL_COMPAT_WIRELESS)) && \
+ !defined(OEM_ANDROID)
+ int pkt_filter_id = WL_WOWLAN_PKT_FILTER_ID_FIRST;
+#endif /* (KERNEL_VERSION(2, 6, 39) || WL_COMPAT_WIRELES) && !OEM_ANDROID */
if (unlikely(!wl_get_drv_status(cfg, READY, ndev))) {
- WL_INFORM(("device is not ready\n"));
+ WL_INFORM_MEM(("device is not ready\n"));
return err;
}
+#if ((LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)) || defined(WL_COMPAT_WIRELESS)) && \
+ !defined(OEM_ANDROID)
+ while (pkt_filter_id <= WL_WOWLAN_PKT_FILTER_ID_LAST) {
+ /* delete wowlan pkt filter if any */
+ err = wldev_iovar_setbuf(ndev, "pkt_filter_delete", &pkt_filter_id,
+ sizeof(pkt_filter_id), cfg->ioctl_buf, WLC_IOCTL_SMLEN,
+ &cfg->ioctl_buf_sync);
+ /* pkt_filter_delete would return BCME_BADARG when pkt filter id
+ * does not exist in filter list of firmware, ignore it.
+ */
+ if (BCME_BADARG == err)
+ err = BCME_OK;
+
+ if (BCME_OK != err) {
+ WL_ERR(("pkt_filter_delete failed, id=%d, err=%d\n",
+ pkt_filter_id, err));
+ }
+ pkt_filter_id++;
+ }
+#endif /* (KERNEL_VERSION(2, 6, 39) || WL_COMPAT_WIRELES) && !OEM_ANDROID */
return err;
}
+#if ((LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)) || defined(WL_COMPAT_WIRELESS)) && \
+ !defined(OEM_ANDROID)
+static s32 wl_wowlan_config(struct wiphy *wiphy, struct cfg80211_wowlan *wow)
+{
+ s32 err = BCME_OK;
+ struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
+ struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39))
+ u32 i = 0, j = 0;
+ u32 buf_len = 0, pattern_size = 0;
+ wl_pkt_filter_t *pkt_filterp = NULL;
+ wl_pkt_filter_enable_t pkt_filter_enable;
+ u8 mask_bytes_len = 0, mask_byte_idx = 0, mask_bit_idx = 0;
+ const u32 max_buf_size = WL_PKT_FILTER_FIXED_LEN +
+ WL_PKT_FILTER_PATTERN_FIXED_LEN + (2 * WL_WOWLAN_MAX_PATTERN_LEN);
+
+ WL_DBG(("Enter\n"));
+
+ if (wow == NULL) {
+ WL_DBG(("wow config is null\n"));
+ return err;
+ }
+
+ /* configure wowlan pattern filters */
+ if (0 < wow->n_patterns) {
+ pkt_filterp = (wl_pkt_filter_t *)MALLOCZ(cfg->osh, max_buf_size);
+ if (pkt_filterp == NULL) {
+ WL_ERR(("Error allocating buffer for pkt filters\n"));
+ return -ENOMEM;
+ }
+
+ WL_DBG(("Pattern count=%d\n", wow->n_patterns));
+ while (i < wow->n_patterns) {
+
+ /* reset buffers */
+ buf_len = 0;
+ bzero(pkt_filterp, max_buf_size);
+
+ /* copy filter id */
+ store32_ua(&pkt_filterp->id, (WL_WOWLAN_PKT_FILTER_ID_FIRST + i));
+
+ /* copy filter type */
+ store32_ua(&pkt_filterp->type, WL_PKT_FILTER_TYPE_PATTERN_MATCH);
+
+ /* copy size */
+ pattern_size = htod32(wow->patterns[i].pattern_len);
+ store32_ua(&pkt_filterp->u.pattern.size_bytes, pattern_size);
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0))
+ /* copy offset */
+ store32_ua(&pkt_filterp->u.pattern.offset, wow->patterns[i].pkt_offset);
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) */
+
+ /* convert mask from bit to byte format */
+ j = 0;
+ mask_bit_idx = 0;
+ mask_byte_idx = 0;
+ mask_bytes_len = DIV_ROUND_UP(pattern_size, 8);
+ while ((mask_byte_idx < mask_bytes_len) &&
+ (mask_bit_idx < pattern_size)) {
+
+ if (isbitset(wow->patterns[i].mask[mask_byte_idx], mask_bit_idx++))
+ pkt_filterp->u.pattern.mask_and_pattern[j] = 0xFF;
+ j++;
+ if (mask_bit_idx >= 8) {
+ /* move to next mask byte */
+ mask_bit_idx = 0;
+ mask_byte_idx++;
+ }
+ }
+
+ /* copy pattern to be matched */
+ memcpy(&pkt_filterp->u.pattern.mask_and_pattern[pattern_size],
+ wow->patterns[i].pattern, pattern_size);
+
+ /* calculate filter buffer len */
+ buf_len += WL_PKT_FILTER_FIXED_LEN;
+ buf_len += (WL_PKT_FILTER_PATTERN_FIXED_LEN + (2 * pattern_size));
+
+ /* add pkt filter */
+ err = wldev_iovar_setbuf(ndev, "pkt_filter_add", pkt_filterp, buf_len,
+ cfg->ioctl_buf, WLC_IOCTL_MEDLEN, &cfg->ioctl_buf_sync);
+ if (BCME_OK != err) {
+ WL_ERR(("pkt_filter_add failed, id=%d, err=%d\n",
+ pkt_filterp->id, err));
+ goto exit;
+ }
+
+ /* enable pkt filter id */
+ pkt_filter_enable.id = pkt_filterp->id;
+ pkt_filter_enable.enable = TRUE;
+ err = wldev_iovar_setbuf(ndev, "pkt_filter_enable", &pkt_filter_enable,
+ sizeof(pkt_filter_enable),
+ cfg->ioctl_buf, WLC_IOCTL_SMLEN, &cfg->ioctl_buf_sync);
+ if (BCME_OK != err) {
+ WL_ERR(("pkt_filter_enable failed, id=%d, err=%d\n",
+ pkt_filterp->id, err));
+ goto exit;
+ }
+ i++; /* move to next pattern */
+ }
+ } else
+ WL_DBG(("wowlan filters not found\n"));
+
+exit:
+ if (pkt_filterp) {
+ MFREE(cfg->osh, pkt_filterp, max_buf_size);
+ }
+
+ return err;
+}
+#endif /* (KERNEL_VERSION(2, 6, 39) || WL_COMPAT_WIRELES) && !OEM_ANDROID */
+
+#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
+#endif // endif
{
s32 err = BCME_OK;
#ifdef DHD_CLEAR_ON_SUSPEND
@@ -5444,7 +8885,7 @@
struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg);
unsigned long flags;
if (unlikely(!wl_get_drv_status(cfg, READY, ndev))) {
- WL_INFORM(("device is not ready : status (%d)\n",
+ WL_INFORM_MEM(("device is not ready : status (%d)\n",
(int)cfg->status));
return err;
}
@@ -5453,14 +8894,9 @@
if (iter->ndev)
wl_set_drv_status(cfg, SCAN_ABORTING, iter->ndev);
}
- spin_lock_irqsave(&cfg->cfgdrv_lock, flags);
+ WL_CFG_DRV_LOCK(&cfg->cfgdrv_lock, flags);
if (cfg->scan_request) {
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 8, 0))
- struct cfg80211_scan_info info = { .aborted = true };
- cfg80211_scan_done(cfg->scan_request, &info);
-#else
cfg80211_scan_done(cfg->scan_request, true);
-#endif
cfg->scan_request = NULL;
}
for_each_ndev(cfg, iter, next) {
@@ -5469,7 +8905,7 @@
wl_clr_drv_status(cfg, SCAN_ABORTING, iter->ndev);
}
}
- spin_unlock_irqrestore(&cfg->cfgdrv_lock, flags);
+ WL_CFG_DRV_UNLOCK(&cfg->cfgdrv_lock, flags);
for_each_ndev(cfg, iter, next) {
if (iter->ndev) {
if (wl_get_drv_status(cfg, CONNECTING, iter->ndev)) {
@@ -5479,32 +8915,10 @@
}
#endif /* DHD_CLEAR_ON_SUSPEND */
-
-#ifdef CUS_11321
- {
- struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
- struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg);
- u8 gpiopol = 0; // 0:Set active high when wake up, 1:Set active low when wake up
- char strclear[6] = "clear";
- u32 wowl = WL_WOWL_DIS | WL_WOWL_BCN | WL_WOWL_GTK_FAILURE | WL_WOWL_RETR |
- WL_WOWL_TCPKEEP_TIME | WL_WOWL_TCPKEEP_DATA;
-
- /* enable ARPOE */
- wldev_iovar_setint(ndev, "arpoe", 1);
- wldev_iovar_setint(ndev, "arp_ol", 0xf);
- wldev_iovar_setint(ndev, "arp_peerage", 1000000);
-
- /* enable GTKOE */
- wldev_iovar_setint(ndev, "wake_event_enable", 4);
-
- /* enable WOWL */
- wldev_iovar_setint(ndev, "wowl_gpiopol", gpiopol);
- wldev_iovar_setbuf(ndev, "wowl_wakeind", strclear, sizeof(strclear),
- cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
- wldev_iovar_setint(ndev, "wowl", wowl);
- wldev_iovar_setint(ndev, "wowl_activate", 1);
- }
-#endif
+#if ((LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)) || defined(WL_COMPAT_WIRELESS)) && \
+ !defined(OEM_ANDROID)
+ err = wl_wowlan_config(wiphy, wow);
+#endif /* (KERNEL_VERSION(2, 6, 39) || WL_COMPAT_WIRELES) && !OEM_ANDROID */
return err;
}
@@ -5514,38 +8928,132 @@
s32 err)
{
int i, j;
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
struct net_device *primary_dev = bcmcfg_to_prmry_ndev(cfg);
+ int npmkids = cfg->pmk_list->pmkids.count;
+ ASSERT(cfg->pmk_list->pmkids.length >= (sizeof(u16)*2));
if (!pmk_list) {
- printk("pmk_list is NULL\n");
+ WL_INFORM_MEM(("pmk_list is NULL\n"));
return -EINVAL;
}
/* pmk list is supported only for STA interface i.e. primary interface
* Refer code wlc_bsscfg.c->wlc_bsscfg_sta_init
*/
if (primary_dev != dev) {
- WL_INFORM(("Not supporting Flushing pmklist on virtual"
+ WL_INFORM_MEM(("Not supporting Flushing pmklist on virtual"
" interfaces than primary interface\n"));
return err;
}
- WL_DBG(("No of elements %d\n", pmk_list->pmkids.npmkid));
- for (i = 0; i < pmk_list->pmkids.npmkid; i++) {
+ WL_DBG(("No of elements %d\n", npmkids));
+ for (i = 0; i < npmkids; i++) {
WL_DBG(("PMKID[%d]: %pM =\n", i,
- &pmk_list->pmkids.pmkid[i].BSSID));
+ &pmk_list->pmkids.pmkid[i].bssid));
for (j = 0; j < WPA2_PMKID_LEN; j++) {
- WL_DBG(("%02x\n", pmk_list->pmkids.pmkid[i].PMKID[j]));
+ WL_DBG(("%02x\n", pmk_list->pmkids.pmkid[i].pmkid[j]));
}
}
- if (likely(!err)) {
- err = wldev_iovar_setbuf(dev, "pmkid_info", (char *)pmk_list,
- sizeof(*pmk_list), cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
+ if (cfg->wlc_ver.wlc_ver_major > MIN_PMKID_LIST_V3_FW_MAJOR) {
+ pmk_list->pmkids.version = PMKID_LIST_VER_3;
+ err = wldev_iovar_setbuf(dev, "pmkid_info", (char *)pmk_list,
+ sizeof(*pmk_list), cfg->ioctl_buf,
+ WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
}
+ /* For wlc_ver_major 13 sending pmkid version as 2
+ * as firmware has not implemented the pmkid list ver 3
+ */
+ else if (cfg->wlc_ver.wlc_ver_major == MIN_PMKID_LIST_V2_FW_MAJOR ||
+ cfg->wlc_ver.wlc_ver_major == MIN_PMKID_LIST_V3_FW_MAJOR) {
+ u32 v2_list_size = (u32)(sizeof(pmkid_list_v2_t) + npmkids*sizeof(pmkid_v2_t));
+ pmkid_list_v2_t *pmkid_v2_list = (pmkid_list_v2_t *)MALLOCZ(cfg->osh, v2_list_size);
+ if (pmkid_v2_list == NULL) {
+ WL_ERR(("failed to allocate pmkid list\n"));
+ return BCME_NOMEM;
+ }
+
+ pmkid_v2_list->version = PMKID_LIST_VER_2;
+ /* Account for version, length and pmkid_v2_t fields */
+ pmkid_v2_list->length = (npmkids * sizeof(pmkid_v2_t)) + (2 * sizeof(u16));
+
+ for (i = 0; i < npmkids; i++) {
+ /* memcpy_s return checks not needed as buffers are of same size */
+ (void)memcpy_s(&pmkid_v2_list->pmkid[i].BSSID,
+ ETHER_ADDR_LEN, &pmk_list->pmkids.pmkid[i].bssid,
+ ETHER_ADDR_LEN);
+
+ /* copy pmkid if available */
+ if (pmk_list->pmkids.pmkid[i].pmkid_len) {
+ (void)memcpy_s(pmkid_v2_list->pmkid[i].PMKID,
+ WPA2_PMKID_LEN,
+ pmk_list->pmkids.pmkid[i].pmkid,
+ pmk_list->pmkids.pmkid[i].pmkid_len);
+ }
+
+ if (pmk_list->pmkids.pmkid[i].pmk_len) {
+ (void)memcpy_s(pmkid_v2_list->pmkid[i].pmk,
+ pmk_list->pmkids.pmkid[i].pmk_len,
+ pmk_list->pmkids.pmkid[i].pmk,
+ pmk_list->pmkids.pmkid[i].pmk_len);
+ pmkid_v2_list->pmkid[i].pmk_len = pmk_list->pmkids.pmkid[i].pmk_len;
+ }
+
+ if (pmk_list->pmkids.pmkid[i].ssid_len) {
+ (void)memcpy_s(pmkid_v2_list->pmkid[i].ssid.ssid,
+ pmk_list->pmkids.pmkid[i].ssid_len,
+ pmk_list->pmkids.pmkid[i].ssid,
+ pmk_list->pmkids.pmkid[i].ssid_len);
+ pmkid_v2_list->pmkid[i].ssid.ssid_len
+ = pmk_list->pmkids.pmkid[i].ssid_len;
+ }
+
+ (void)memcpy_s(pmkid_v2_list->pmkid[i].fils_cache_id,
+ FILS_CACHE_ID_LEN, &pmk_list->pmkids.pmkid[i].fils_cache_id,
+ FILS_CACHE_ID_LEN);
+ pmkid_v2_list->pmkid[i].length = PMKID_ELEM_V2_LENGTH;
+ }
+ err = wldev_iovar_setbuf(dev, "pmkid_info", (char *)pmkid_v2_list,
+ v2_list_size, cfg->ioctl_buf,
+ WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
+ if (unlikely(err)) {
+ WL_ERR(("pmkid_info failed (%d)\n", err));
+ }
+
+ MFREE(cfg->osh, pmkid_v2_list, v2_list_size);
+ }
+ else {
+ u32 v1_list_size = (u32)(sizeof(pmkid_list_v1_t) + npmkids*sizeof(pmkid_v1_t));
+ pmkid_list_v1_t *pmkid_v1_list = (pmkid_list_v1_t *)MALLOCZ(cfg->osh, v1_list_size);
+ if (pmkid_v1_list == NULL) {
+ WL_ERR(("failed to allocate pmkid list\n"));
+ return BCME_NOMEM;
+ }
+ for (i = 0; i < npmkids; i++) {
+ /* memcpy_s return checks not needed as buffers are of same size */
+ (void)memcpy_s(&pmkid_v1_list->pmkid[i].BSSID,
+ ETHER_ADDR_LEN, &pmk_list->pmkids.pmkid[i].bssid,
+ ETHER_ADDR_LEN);
+ (void)memcpy_s(pmkid_v1_list->pmkid[i].PMKID,
+ WPA2_PMKID_LEN, pmk_list->pmkids.pmkid[i].pmkid,
+ WPA2_PMKID_LEN);
+ pmkid_v1_list->npmkid++;
+ }
+ err = wldev_iovar_setbuf(dev, "pmkid_info", (char *)pmkid_v1_list,
+ v1_list_size, cfg->ioctl_buf,
+ WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
+ if (unlikely(err)) {
+ WL_ERR(("pmkid_info failed (%d)\n", err));
+ }
+
+ MFREE(cfg->osh, pmkid_v1_list, v1_list_size);
+ }
return err;
}
+/* TODO: remove temporal cfg->pmk_list list, and call wl_cfg80211_update_pmksa for single
+ * entry operation.
+ */
static s32
wl_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_pmksa *pmksa)
@@ -5553,76 +9061,259 @@
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
s32 err = 0;
int i;
+ int npmkids = cfg->pmk_list->pmkids.count;
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
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;
+ BCM_REFERENCE(dhdp);
+ DHD_STATLOG_CTRL(dhdp, ST(INSTALL_PMKSA), dhd_net2idx(dhdp->info, dev), 0);
+
+ for (i = 0; i < npmkids; i++) {
+ if (pmksa->bssid != NULL) {
+ if (!memcmp(pmksa->bssid, &cfg->pmk_list->pmkids.pmkid[i].bssid,
+ ETHER_ADDR_LEN))
+ break;
+ }
+#ifdef WL_FILS
+ else if (pmksa->ssid != NULL) {
+ if (!memcmp(pmksa->ssid, &cfg->pmk_list->pmkids.pmkid[i].ssid,
+ pmksa->ssid_len))
+ break;
+ }
+#endif /* WL_FILS */
+ }
if (i < WL_NUM_PMKIDS_MAX) {
- memcpy(&cfg->pmk_list->pmkids.pmkid[i].BSSID, pmksa->bssid,
- ETHER_ADDR_LEN);
- memcpy(&cfg->pmk_list->pmkids.pmkid[i].PMKID, pmksa->pmkid,
+ if (pmksa->bssid != NULL) {
+ memcpy(&cfg->pmk_list->pmkids.pmkid[i].bssid, pmksa->bssid,
+ ETHER_ADDR_LEN);
+ }
+#ifdef WL_FILS
+ else if (pmksa->ssid != NULL) {
+ cfg->pmk_list->pmkids.pmkid[i].ssid_len = pmksa->ssid_len;
+ memcpy(&cfg->pmk_list->pmkids.pmkid[i].ssid, pmksa->ssid,
+ pmksa->ssid_len);
+ memcpy(&cfg->pmk_list->pmkids.pmkid[i].fils_cache_id, pmksa->cache_id,
+ FILS_CACHE_ID_LEN);
+ }
+#endif /* WL_FILS */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || defined(WL_FILS))
+ if (pmksa->pmk_len) {
+ if (memcpy_s(&cfg->pmk_list->pmkids.pmkid[i].pmk, PMK_LEN_MAX, pmksa->pmk,
+ pmksa->pmk_len)) {
+ WL_ERR(("invalid pmk len = %lu", pmksa->pmk_len));
+ } else {
+ cfg->pmk_list->pmkids.pmkid[i].pmk_len = pmksa->pmk_len;
+ }
+ }
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || defined(WL_FILS) */
+ /* return check not required as buffer lengths are same */
+ (void)memcpy_s(cfg->pmk_list->pmkids.pmkid[i].pmkid, WPA2_PMKID_LEN, pmksa->pmkid,
WPA2_PMKID_LEN);
- if (i == cfg->pmk_list->pmkids.npmkid)
- cfg->pmk_list->pmkids.npmkid++;
+ cfg->pmk_list->pmkids.pmkid[i].pmkid_len = WPA2_PMKID_LEN;
+
+ /* set lifetime not to expire in firmware by default.
+ * Currently, wpa_supplicant control PMKID lifetime on his end. e.g) set 12 hours
+ * when it expired, wpa_supplicant should call set_pmksa/del_pmksa to update
+ * corresponding entry.
+ */
+ cfg->pmk_list->pmkids.pmkid[i].time_left = KEY_PERM_PMK;
+ if (i == npmkids) {
+ cfg->pmk_list->pmkids.length += sizeof(pmkid_v3_t);
+ cfg->pmk_list->pmkids.count++;
+ }
} else {
err = -EINVAL;
}
- WL_DBG(("set_pmksa,IW_PMKSA_ADD - PMKID: %pM =\n",
- &cfg->pmk_list->pmkids.pmkid[cfg->pmk_list->pmkids.npmkid - 1].BSSID));
+
+#if (WL_DBG_LEVEL > 0)
+ if (pmksa->bssid != NULL) {
+ WL_DBG(("set_pmksa,IW_PMKSA_ADD - PMKID: %pM =\n",
+ &cfg->pmk_list->pmkids.pmkid[npmkids - 1].bssid));
+ }
for (i = 0; i < WPA2_PMKID_LEN; i++) {
WL_DBG(("%02x\n",
- cfg->pmk_list->pmkids.pmkid[cfg->pmk_list->pmkids.npmkid - 1].
- PMKID[i]));
+ cfg->pmk_list->pmkids.pmkid[npmkids - 1].
+ pmkid[i]));
}
+#endif /* (WL_DBG_LEVEL > 0) */
err = wl_update_pmklist(dev, cfg->pmk_list, err);
return err;
}
+/* sending pmkid_info IOVAR to manipulate PMKID(PMKSA) list in firmware.
+ * input @pmksa: host given single pmksa info.
+ * if it's NULL, assume whole list manipulated. e.g) flush all PMKIDs in firmware.
+ * input @set: TRUE means adding PMKSA operation. FALSE means deleting.
+ * return: log internal BCME_XXX error, and convert it to -EINVAL to linux generic error code.
+ */
+static s32 wl_cfg80211_update_pmksa(struct wiphy *wiphy, struct net_device *dev,
+ struct cfg80211_pmksa *pmksa, bool set) {
+
+ struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
+ s32 err = 0;
+ pmkid_list_v3_t *pmk_list;
+ uint32 alloc_len;
+
+ RETURN_EIO_IF_NOT_UP(cfg);
+
+ if (cfg->wlc_ver.wlc_ver_major < MIN_PMKID_LIST_V3_FW_MAJOR) {
+ WL_ERR(("wlc_ver_major not supported:%d\n", cfg->wlc_ver.wlc_ver_major));
+ return BCME_VERSION;
+ }
+
+ alloc_len = OFFSETOF(pmkid_list_v3_t, pmkid) + ((pmksa) ? sizeof(pmkid_v3_t) : 0);
+ pmk_list = (pmkid_list_v3_t *)MALLOCZ(cfg->osh, alloc_len);
+
+ if (pmk_list == NULL) {
+ return BCME_NOMEM;
+ }
+
+ pmk_list->version = PMKID_LIST_VER_3;
+ pmk_list->length = alloc_len;
+ pmk_list->count = (pmksa) ? 1 : 0; // 1 means single entry operation, 0 means whole list.
+
+ /* controll set/del action by lifetime parameter accordingly.
+ * if set == TRUE, it's set PMKID action with lifetime permanent.
+ * if set == FALSE, it's del PMKID action with lifetime zero.
+ */
+ pmk_list->pmkid->time_left = (set) ? KEY_PERM_PMK : 0;
+
+ if (pmksa) {
+ if (pmksa->bssid) {
+ err = memcpy_s(&pmk_list->pmkid->bssid, sizeof(pmk_list->pmkid->bssid),
+ pmksa->bssid, ETHER_ADDR_LEN);
+ if (err) {
+ goto exit;
+ }
+ }
+ if (pmksa->pmkid) {
+ err = memcpy_s(&pmk_list->pmkid->pmkid, sizeof(pmk_list->pmkid->pmkid),
+ pmksa->pmkid, WPA2_PMKID_LEN);
+ if (err) {
+ goto exit;
+ }
+ }
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0))
+ if (pmksa->pmk) {
+ err = memcpy_s(&pmk_list->pmkid->pmk, sizeof(pmk_list->pmkid->pmk),
+ pmksa->pmk, pmksa->pmk_len);
+ if (err) {
+ goto exit;
+ }
+ pmk_list->pmkid->pmk_len = pmksa->pmk_len;
+ }
+ if (pmksa->ssid) {
+ err = memcpy_s(&pmk_list->pmkid->ssid, sizeof(pmk_list->pmkid->ssid),
+ pmksa->ssid, pmksa->ssid_len);
+ if (err) {
+ goto exit;
+ }
+ pmk_list->pmkid->ssid_len = pmksa->ssid_len;
+ }
+ if (pmksa->cache_id) {
+ pmk_list->pmkid->fils_cache_id = *pmksa->cache_id;
+ }
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) */
+ }
+ err = wldev_iovar_setbuf(dev, "pmkid_info", (char *)pmk_list,
+ alloc_len, cfg->ioctl_buf,
+ WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
+
+exit:
+ if (pmk_list) {
+ MFREE(cfg->osh, pmk_list, alloc_len);
+ }
+ return err;
+}
+
+/* TODO: remove temporal cfg->pmk_list list, and call wl_cfg80211_update_pmksa for single
+ * entry operation.
+ */
static s32
wl_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_pmksa *pmksa)
{
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
-
- struct _pmkid_list pmkid = {.npmkid = 0};
s32 err = 0;
int i;
-
+ int npmkids = cfg->pmk_list->pmkids.count;
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);
- WL_DBG(("del_pmksa,IW_PMKSA_REMOVE - PMKID: %pM =\n",
- &pmkid.pmkid[0].BSSID));
- for (i = 0; i < WPA2_PMKID_LEN; i++) {
- WL_DBG(("%02x\n", pmkid.pmkid[0].PMKID[i]));
+ if (!pmksa) {
+ WL_ERR(("pmksa is not initialized\n"));
+ return BCME_ERROR;
+ }
+ if (!npmkids) {
+ /* nmpkids = 0, nothing to delete */
+ WL_DBG(("npmkids=0. Skip del\n"));
+ return BCME_OK;
}
- 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 ((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(&cfg->pmk_list->pmkids.pmkid[i].PMKID,
- &cfg->pmk_list->pmkids.pmkid[i + 1].PMKID,
- WPA2_PMKID_LEN);
+#if (WL_DBG_LEVEL > 0)
+ if (pmksa->bssid) {
+ WL_DBG(("del_pmksa,IW_PMKSA_REMOVE - PMKID: %pM =\n",
+ pmksa->bssid));
+ }
+#ifdef WL_FILS
+ else if (pmksa->ssid) {
+ WL_DBG(("FILS: del_pmksa for ssid: "));
+ for (i = 0; i < pmksa->ssid_len; i++) {
+ WL_DBG(("%c", pmksa->ssid[i]));
}
- cfg->pmk_list->pmkids.npmkid--;
+ WL_DBG(("\n"));
+ }
+#endif /* WL_FILS */
+ if (pmksa->pmkid) {
+ for (i = 0; i < WPA2_PMKID_LEN; i++) {
+ WL_DBG(("%02x\n", pmksa->pmkid[i]));
+ }
+ }
+#endif /* (WL_DBG_LEVEL > 0) */
+
+ for (i = 0; i < npmkids; i++) {
+ if (pmksa->bssid) {
+ if (!memcmp
+ (pmksa->bssid, &cfg->pmk_list->pmkids.pmkid[i].bssid,
+ ETHER_ADDR_LEN)) {
+ break;
+ }
+ }
+#ifdef WL_FILS
+ else if (pmksa->ssid) {
+ if (!memcmp
+ (pmksa->ssid, &cfg->pmk_list->pmkids.pmkid[i].ssid,
+ pmksa->ssid_len)) {
+ break;
+ }
+ }
+#endif /* WL_FILS */
+ }
+ if ((npmkids > 0) && (i < npmkids)) {
+ bzero(&cfg->pmk_list->pmkids.pmkid[i], sizeof(pmkid_v3_t));
+ for (; i < (npmkids - 1); i++) {
+ (void)memcpy_s(&cfg->pmk_list->pmkids.pmkid[i],
+ sizeof(pmkid_v3_t),
+ &cfg->pmk_list->pmkids.pmkid[i + 1],
+ sizeof(pmkid_v3_t));
+ }
+ npmkids--;
+ cfg->pmk_list->pmkids.length -= sizeof(pmkid_v3_t);
+ cfg->pmk_list->pmkids.count--;
+
} else {
err = -EINVAL;
}
+
+ /* current wl_update_pmklist() doesn't delete corresponding PMKID entry.
+ * inside firmware. So we need to issue delete action explicitely through
+ * this function.
+ */
+ err = wl_cfg80211_update_pmksa(wiphy, dev, pmksa, FALSE);
+ /* intentional fall through even on error.
+ * it should work above MIN_PMKID_LIST_V3_FW_MAJOR, otherwise let ignore it.
+ */
err = wl_update_pmklist(dev, cfg->pmk_list, err);
@@ -5630,58 +9321,21 @@
}
+/* TODO: remove temporal cfg->pmk_list list, and call wl_cfg80211_update_pmksa for single
+ * entry operation.
+ */
static s32
wl_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_device *dev)
{
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
s32 err = 0;
RETURN_EIO_IF_NOT_UP(cfg);
- memset(cfg->pmk_list, 0, sizeof(*cfg->pmk_list));
+ bzero(cfg->pmk_list, sizeof(*cfg->pmk_list));
+ cfg->pmk_list->pmkids.length = OFFSETOF(pmkid_list_v3_t, pmkid);
+ cfg->pmk_list->pmkids.count = 0;
+ cfg->pmk_list->pmkids.version = PMKID_LIST_VER_3;
err = wl_update_pmklist(dev, cfg->pmk_list, err);
return err;
-
-}
-
-static wl_scan_params_t *
-wl_cfg80211_scan_alloc_params(int channel, int nprobes, int *out_params_size)
-{
- wl_scan_params_t *params;
- int params_size;
- int num_chans;
- int bssidx = 0;
-
- *out_params_size = 0;
-
- /* Our scan params only need space for 1 channel and 0 ssids */
- params_size = WL_SCAN_PARAMS_FIXED_SIZE + 1 * sizeof(uint16);
- params = (wl_scan_params_t*) kzalloc(params_size, GFP_KERNEL);
- if (params == NULL) {
- WL_ERR(("mem alloc failed (%d bytes)\n", params_size));
- return params;
- }
- memset(params, 0, params_size);
- params->nprobes = nprobes;
-
- num_chans = (channel == 0) ? 0 : 1;
-
- memcpy(¶ms->bssid, ðer_bcast, ETHER_ADDR_LEN);
- params->bss_type = DOT11_BSSTYPE_ANY;
- params->scan_type = DOT11_SCANTYPE_ACTIVE;
- params->nprobes = htod32(1);
- params->active_time = htod32(-1);
- params->passive_time = htod32(-1);
- params->home_time = htod32(10);
- if (channel == -1)
- params->channel_list[0] = htodchanspec(channel);
- else
- params->channel_list[0] = wl_ch_host_to_driver(bssidx, channel);
-
- /* Our scan params have 1 channel and 0 ssids */
- params->channel_num = htod32((0 << WL_SCAN_PARAMS_NSSID_SHIFT) |
- (num_chans & WL_SCAN_PARAMS_COUNT_MASK));
-
- *out_params_size = params_size; /* rtn size to the caller */
- return params;
}
#if defined(WL_CFG80211_P2P_DEV_IF)
@@ -5702,9 +9356,24 @@
struct ether_addr primary_mac;
struct net_device *ndev = NULL;
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
+ struct net_device *ndev_dpp_listen = NULL;
+
+ RETURN_EIO_IF_NOT_UP(cfg);
+#ifdef DHD_IFDEBUG
+ PRINT_WDEV_INFO(cfgdev);
+#endif /* DHD_IFDEBUG */
ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
+ /*
+ * dpp listen request will arrive on primary interface
+ * If so, mark dpp listen flag on this interface
+ */
+ ndev_dpp_listen = cfgdev_to_ndev(cfgdev);
+ if (ndev_dpp_listen)
+ wl_set_dpp_listen_by_netdev(cfg, ndev_dpp_listen, 1);
+
+ mutex_lock(&cfg->usr_sync);
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"));
@@ -5715,9 +9384,17 @@
goto exit;
}
+#ifdef P2P_LISTEN_OFFLOADING
+ if (wl_get_p2p_status(cfg, DISC_IN_PROGRESS)) {
+ WL_ERR(("P2P_FIND: Discovery offload is in progress\n"));
+ err = -EAGAIN;
+ goto exit;
+ }
+#endif /* P2P_LISTEN_OFFLOADING */
+
#ifndef WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST
if (wl_get_drv_status_all(cfg, SCANNING)) {
- wl_notify_escan_complete(cfg, cfg->escan_info.ndev, true, true);
+ wl_cfg80211_cancel_scan(cfg);
}
#endif /* not WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST */
@@ -5733,7 +9410,7 @@
#ifdef WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST
if (wl_get_drv_status(cfg, SCANNING, ndev)) {
- struct timer_list *_timer;
+ timer_list_compat_t *_timer;
WL_DBG(("scan is running. go to fake listen state\n"));
if (duration > LONG_LISTEN_TIME) {
@@ -5746,7 +9423,7 @@
del_timer_sync(&cfg->p2p->listen_timer);
}
- _timer = (struct timer_list *) &cfg->p2p->listen_timer;
+ _timer = &cfg->p2p->listen_timer;
wl_clr_p2p_status(cfg, LISTEN_EXPIRED);
INIT_TIMER(_timer, wl_cfgp2p_listen_expired, duration, 0);
@@ -5757,6 +9434,10 @@
}
#endif /* WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST */
+#ifdef WL_BCNRECV
+ /* check fakeapscan in progress then abort */
+ wl_android_bcnrecv_stop(ndev, WL_BCNRECV_LISTENBUSY);
+#endif /* WL_BCNRECV */
#ifdef WL_CFG80211_SYNC_GON
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.
@@ -5799,6 +9480,11 @@
wl_set_drv_status(cfg, FAKE_REMAINING_ON_CHANNEL, ndev);
}
#endif /* WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST */
+
+ if (err) {
+ wl_flush_fw_log_buffer(ndev, FW_LOGSET_MASK_ALL);
+ }
+
/* WAR: set err = ok to prevent cookie mismatch in wpa_supplicant
* and expire timer will send a completion to the upper layer
*/
@@ -5807,7 +9493,7 @@
exit:
if (err == BCME_OK) {
- WL_INFORM(("Success\n"));
+ WL_DBG(("Success\n"));
#if defined(WL_CFG80211_P2P_DEV_IF)
cfg80211_ready_on_channel(cfgdev, *cookie, channel,
duration, GFP_KERNEL);
@@ -5818,6 +9504,7 @@
} else {
WL_ERR(("Fail to Set (err=%d cookie:%llu)\n", err, *cookie));
}
+ mutex_unlock(&cfg->usr_sync);
return err;
}
@@ -5826,13 +9513,19 @@
bcm_struct_cfgdev *cfgdev, u64 cookie)
{
s32 err = 0;
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+
+ struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
#ifdef P2PLISTEN_AP_SAMECHN
struct net_device *dev;
#endif /* P2PLISTEN_AP_SAMECHN */
RETURN_EIO_IF_NOT_UP(cfg);
+
+#ifdef DHD_IFDEBUG
+ PRINT_WDEV_INFO(cfgdev);
+#endif /* DHD_IFDEBUG */
+
#if defined(WL_CFG80211_P2P_DEV_IF)
if (cfgdev->iftype == NL80211_IFTYPE_P2P_DEVICE) {
WL_DBG((" enter ) on P2P dedicated discover interface\n"));
@@ -5854,8 +9547,9 @@
wl_cfgp2p_set_p2p_mode(cfg, WL_P2P_DISC_ST_SCAN, 0, 0,
wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_DEVICE));
} else {
- WL_ERR(("%s : ignore, request cookie(%llu) is not matched. (cur : %llu)\n",
- __FUNCTION__, cookie, cfg->last_roc_id));
+ WL_ERR(("wl_cfg80211_cancel_remain_on_channel: ignore, request cookie(%llu)"
+ " is not matched. (cur : %llu)\n",
+ cookie, cfg->last_roc_id));
}
return err;
@@ -5865,23 +9559,26 @@
wl_cfg80211_afx_handler(struct work_struct *work)
{
struct afx_hdl *afx_instance;
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg;
s32 ret = BCME_OK;
BCM_SET_CONTAINER_OF(afx_instance, work, struct afx_hdl, work);
- 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(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(cfg, FINDING_COMMON_CHANNEL))
- complete(&cfg->act_frm_scan);
+ if (afx_instance) {
+ cfg = wl_get_cfg(afx_instance->dev);
+ if (cfg != 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(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(cfg, FINDING_COMMON_CHANNEL))
+ complete(&cfg->act_frm_scan);
+ }
}
}
}
@@ -5890,6 +9587,7 @@
wl_cfg80211_af_searching_channel(struct bcm_cfg80211 *cfg, struct net_device *dev)
{
u32 max_retry = WL_CHANNEL_SYNC_RETRY;
+ bool is_p2p_gas = false;
if (dev == NULL)
return -1;
@@ -5898,6 +9596,13 @@
wl_set_drv_status(cfg, FINDING_COMMON_CHANNEL, dev);
cfg->afx_hdl->is_active = TRUE;
+
+ 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;
+ }
/* Loop to wait until we find a peer's channel or the
* pending action frame tx is cancelled.
@@ -5915,6 +9620,9 @@
if ((cfg->afx_hdl->peer_chan != WL_INVALID) ||
!(wl_get_drv_status(cfg, FINDING_COMMON_CHANNEL, dev)))
+ break;
+
+ if (is_p2p_gas)
break;
if (cfg->afx_hdl->my_listen_chan) {
@@ -5945,15 +9653,69 @@
struct p2p_config_af_params {
s32 max_tx_retry; /* max tx retry count if tx no ack */
- /* To make sure to send successfully action frame, we have to turn off mpc
- * 0: off, 1: on, (-1): do nothing
- */
- s32 mpc_onoff;
+#ifdef WL_CFG80211_GON_COLLISION
+ /* drop tx go nego request if go nego collision occurs */
+ bool drop_tx_req;
+#endif // endif
#ifdef WL_CFG80211_SYNC_GON
bool extra_listen;
-#endif
+#endif // endif
bool search_channel; /* 1: search peer's channel to send af */
};
+
+#ifdef WL_DISABLE_HE_P2P
+static s32
+wl_cfg80211_he_p2p_disable(struct wiphy *wiphy, struct ether_addr peer_mac)
+{
+ struct cfg80211_bss *bss;
+ u8 *ie = NULL;
+ u32 ie_len = 0;
+ struct net_device *ndev = NULL;
+ s32 bssidx = 0;
+ s32 err = BCME_OK;
+ struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
+
+ bss = CFG80211_GET_BSS(wiphy, NULL, peer_mac.octet, NULL, 0);
+ if (!bss) {
+ WL_ERR(("Could not find the Peer device\n"));
+ return BCME_ERROR;
+ } else {
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+#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 */
+ GCC_DIAGNOSTIC_POP();
+ }
+ if (ie) {
+ if ((bcm_parse_tlvs_dot11(ie, ie_len,
+ EXT_MNG_HE_CAP_ID, TRUE)) == NULL) {
+ WL_DBG(("Peer does not support HE capability\n"));
+ ndev = wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_CONNECTION1);
+ if (ndev && (bssidx =
+ wl_get_bssidx_by_wdev(cfg, ndev->ieee80211_ptr)) < 0) {
+ WL_ERR(("Find index failed\n"));
+ err = BCME_ERROR;
+ } else {
+ WL_DBG(("Disabling HE for P2P\n"));
+ err = wl_cfg80211_set_he_mode(ndev, cfg, bssidx,
+ WL_IF_TYPE_P2P_DISC, FALSE);
+ if (err < 0) {
+ WL_ERR(("failed to set he features, error=%d\n", err));
+ }
+ }
+ } else {
+ WL_DBG(("Peer supports HE capability\n"));
+ }
+ }
+ CFG80211_PUT_BSS(wiphy, bss);
+
+ return err;
+}
+#endif /* WL_DISABLE_HE_P2P */
static s32
wl_cfg80211_config_p2p_pub_af_tx(struct wiphy *wiphy,
@@ -5966,26 +9728,34 @@
(wifi_p2p_pub_act_frame_t *) (action_frame->data);
/* initialize default value */
+#ifdef WL_CFG80211_GON_COLLISION
+ config_af_params->drop_tx_req = false;
+#endif // endif
#ifdef WL_CFG80211_SYNC_GON
config_af_params->extra_listen = true;
-#endif
+#endif // endif
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: {
+ /* Disable he if peer does not support before starting GONEG */
+#ifdef WL_DISABLE_HE_P2P
+ wl_cfg80211_he_p2p_disable(wiphy, action_frame->da);
+#endif /* WL_DISABLE_HE_P2P */
WL_DBG(("P2P: GO_NEG_PHASE status set \n"));
wl_set_p2p_status(cfg, GO_NEG_PHASE);
- config_af_params->mpc_onoff = 0;
config_af_params->search_channel = true;
cfg->next_af_subtype = act_frm->subtype + 1;
/* increase dwell time to wait for RESP frame */
af_params->dwell_time = WL_MED_DWELL_TIME;
+#ifdef WL_CFG80211_GON_COLLISION
+ config_af_params->drop_tx_req = true;
+#endif /* WL_CFG80211_GON_COLLISION */
break;
}
case P2P_PAF_GON_RSP: {
@@ -5999,12 +9769,14 @@
WL_DBG(("P2P: GO_NEG_PHASE status cleared \n"));
wl_clr_p2p_status(cfg, GO_NEG_PHASE);
- /* turn on mpc again if go nego is done */
- config_af_params->mpc_onoff = 1;
-
/* minimize dwell time */
af_params->dwell_time = WL_MIN_DWELL_TIME;
+#ifdef WL_CFG80211_GON_COLLISION
+ /* if go nego formation done, clear it */
+ 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;
#endif /* WL_CFG80211_SYNC_GON */
@@ -6049,7 +9821,6 @@
config_af_params->search_channel = true;
}
- config_af_params->mpc_onoff = 0;
cfg->next_af_subtype = act_frm->subtype + 1;
/* increase dwell time to wait for RESP frame */
af_params->dwell_time = WL_MED_DWELL_TIME;
@@ -6057,7 +9828,7 @@
}
case P2P_PAF_PROVDIS_RSP: {
cfg->next_af_subtype = P2P_PAF_GON_REQ;
- af_params->dwell_time = WL_MIN_DWELL_TIME;
+ af_params->dwell_time = WL_MED_DWELL_TIME;
#ifdef WL_CFG80211_SYNC_GON
config_af_params->extra_listen = false;
#endif /* WL_CFG80211_SYNC_GON */
@@ -6077,7 +9848,7 @@
void *frame, u16 frame_len)
{
struct wl_scan_results *bss_list;
- struct wl_bss_info *bi = NULL;
+ wl_bss_info_t *bi = NULL;
bool result = false;
s32 i;
chanspec_t chanspec;
@@ -6107,7 +9878,17 @@
return result;
}
#endif /* WL11U */
-
+static bool
+wl_cfg80211_check_dwell_overflow(int32 requested_dwell, ulong dwell_jiffies)
+{
+ if ((requested_dwell & CUSTOM_RETRY_MASK) &&
+ (jiffies_to_msecs(jiffies - dwell_jiffies) >
+ (requested_dwell & ~CUSTOM_RETRY_MASK))) {
+ WL_ERR(("Action frame TX retry time over dwell time!\n"));
+ return true;
+ }
+ return false;
+}
static bool
wl_cfg80211_send_action_frame(struct wiphy *wiphy, struct net_device *dev,
@@ -6125,9 +9906,12 @@
struct net_info *netinfo;
#ifdef VSDB
ulong off_chan_started_jiffies = 0;
-#endif
+#endif // endif
+ ulong dwell_jiffies = 0;
+ bool dwell_overflow = false;
dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+ int32 requested_dwell = af_params->dwell_time;
/* Add the default dwell time
* Dwell time to stay off-channel to wait for a response action frame
@@ -6150,11 +9934,13 @@
tx_retry = 0;
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;
+#ifdef WL_CFG80211_GON_COLLISION
+ config_af_params.drop_tx_req = false;
+#endif // endif
#ifdef WL_CFG80211_SYNC_GON
config_af_params.extra_listen = false;
-#endif
+#endif // endif
/* config parameters */
/* Public Action Frame Process - DOT11_ACTION_CAT_PUBLIC */
@@ -6167,6 +9953,16 @@
WL_DBG(("Unknown subtype.\n"));
}
+#ifdef WL_CFG80211_GON_COLLISION
+ if (config_af_params.drop_tx_req) {
+ if (cfg->block_gon_req_tx_count) {
+ /* drop gon req tx action frame */
+ WL_DBG(("Drop gon req tx action frame: count %d\n",
+ cfg->block_gon_req_tx_count));
+ goto exit;
+ }
+ }
+#endif /* WL_CFG80211_GON_COLLISION */
} else if (action_frame_len >= sizeof(wifi_p2psd_gas_pub_act_frame_t)) {
/* service discovery process */
if (action == P2PSD_ACTION_ID_GAS_IREQ ||
@@ -6179,6 +9975,15 @@
cfg->next_af_subtype = action + 1;
af_params->dwell_time = WL_MED_DWELL_TIME;
+ if (requested_dwell & CUSTOM_RETRY_MASK) {
+ config_af_params.max_tx_retry =
+ (requested_dwell & CUSTOM_RETRY_MASK) >> 24;
+ af_params->dwell_time =
+ (requested_dwell & ~CUSTOM_RETRY_MASK);
+ WL_DBG(("Custom retry(%d) and dwell time(%d) is set.\n",
+ config_af_params.max_tx_retry,
+ af_params->dwell_time));
+ }
} else if (action == P2PSD_ACTION_ID_GAS_IRESP ||
action == P2PSD_ACTION_ID_GAS_CRESP) {
/* configure service discovery response frame */
@@ -6201,12 +10006,7 @@
}
}
- /* To make sure to send successfully action frame, we have to turn off mpc */
- if (config_af_params.mpc_onoff == 0) {
- wldev_iovar_setint(dev, "mpc", 0);
- }
-
- netinfo = wl_get_netinfo_by_bssidx(cfg, bssidx);
+ netinfo = wl_get_netinfo_by_wdev(cfg, cfgdev_to_wdev(cfgdev));
/* validate channel and p2p ies */
if (config_af_params.search_channel && IS_P2P_SOCIAL(af_params->channel) &&
netinfo && netinfo->bss.ies.probe_req_ie_len) {
@@ -6224,11 +10024,11 @@
if (wl_get_drv_status(cfg, CONNECTING, bcmcfg_to_prmry_ndev(cfg))) {
OSL_SLEEP(50);
}
-#endif
+#endif // endif
/* if scan is ongoing, abort current scan. */
if (wl_get_drv_status_all(cfg, SCANNING)) {
- wl_notify_escan_complete(cfg, cfg->escan_info.ndev, true, true);
+ wl_cfg80211_cancel_scan(cfg);
}
/* Abort P2P listen */
@@ -6280,7 +10080,13 @@
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;
+ /* Even if we couldn't find peer channel, try to send the frame
+ * out. P2P cert 5.1.14 testbed device (realtek) doesn't seem to
+ * respond to probe request (Ideally it has to be in listen and
+ * responsd to probe request). However if we send Go neg req, the
+ * peer is sending GO-neg resp. So instead of giving up here, just
+ * proceed and attempt sending out the action frame.
+ */
}
wl_clr_drv_status(cfg, SCANNING, cfg->afx_hdl->dev);
@@ -6289,7 +10095,7 @@
* 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);
+ wl_cfg80211_cancel_scan(cfg);
/* Suspend P2P discovery's search-listen to prevent it from
* starting a scan or changing the channel.
*/
@@ -6299,7 +10105,14 @@
}
/* update channel */
- af_params->channel = cfg->afx_hdl->peer_chan;
+ if (cfg->afx_hdl->peer_chan != WL_INVALID) {
+ af_params->channel = cfg->afx_hdl->peer_chan;
+ WL_ERR(("Attempt tx on peer listen channel:%d ",
+ cfg->afx_hdl->peer_chan));
+ } else {
+ WL_ERR(("Attempt tx with the channel provided by userspace."
+ "Channel: %d\n", af_params->channel));
+ }
}
#ifdef VSDB
@@ -6310,11 +10123,14 @@
wl_cfgp2p_need_wait_actfrmae(cfg, action_frame->data, action_frame->len, true);
+ dwell_jiffies = jiffies;
/* Now send a tx action frame */
ack = wl_cfgp2p_tx_action_frame(cfg, dev, af_params, bssidx) ? false : true;
+ dwell_overflow = wl_cfg80211_check_dwell_overflow(requested_dwell, dwell_jiffies);
/* if failed, retry it. tx_retry_max value is configure by .... */
- while ((ack == false) && (tx_retry++ < config_af_params.max_tx_retry)) {
+ while ((ack == false) && (tx_retry++ < config_af_params.max_tx_retry) &&
+ !dwell_overflow) {
#ifdef VSDB
if (af_params->channel) {
if (jiffies_to_msecs(jiffies - off_chan_started_jiffies) >
@@ -6327,6 +10143,7 @@
#endif /* VSDB */
ack = wl_cfgp2p_tx_action_frame(cfg, dev, af_params, bssidx) ?
false : true;
+ dwell_overflow = wl_cfg80211_check_dwell_overflow(requested_dwell, dwell_jiffies);
}
if (ack == false) {
@@ -6343,6 +10160,9 @@
* the dwell time, go to listen state again to get next action response frame.
*/
if (ack && config_af_params.extra_listen &&
+#ifdef WL_CFG80211_GON_COLLISION
+ !cfg->block_gon_req_tx_count &&
+#endif /* WL_CFG80211_GON_COLLISION */
wl_get_drv_status_all(cfg, WAITING_NEXT_ACT_FRM) &&
cfg->af_sent_channel == cfg->afx_hdl->my_listen_chan) {
s32 extar_listen_time;
@@ -6366,18 +10186,25 @@
#endif /* WL_CFG80211_SYNC_GON */
wl_clr_drv_status(cfg, WAITING_NEXT_ACT_FRM, dev);
- if (cfg->afx_hdl->pending_tx_act_frm)
- cfg->afx_hdl->pending_tx_act_frm = NULL;
+ cfg->afx_hdl->pending_tx_act_frm = NULL;
- WL_INFORM(("-- sending Action Frame is %s, listen chan: %d\n",
- (ack) ? "Succeeded!!":"Failed!!", cfg->afx_hdl->my_listen_chan));
-
-
- /* if all done, turn mpc on again */
- if (config_af_params.mpc_onoff == 1) {
- wldev_iovar_setint(dev, "mpc", 1);
+ if (ack) {
+ WL_DBG(("-- Action Frame Tx succeeded, listen chan: %d\n",
+ cfg->afx_hdl->my_listen_chan));
+ } else {
+ WL_ERR(("-- Action Frame Tx failed, listen chan: %d\n",
+ cfg->afx_hdl->my_listen_chan));
}
+#ifdef WL_CFG80211_GON_COLLISION
+ 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 .
+ */
+ ack = true;
+ }
+#endif /* WL_CFG80211_GON_COLLISION */
return ack;
}
@@ -6395,12 +10222,12 @@
bool channel_type_valid,
#endif /* LINUX_VERSION_CODE <= KERNEL_VERSION(3, 7, 0) */
unsigned int wait, const u8* buf, size_t len,
-#if (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 (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0))
+#endif // endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)) || defined(WL_COMPAT_WIRELESS)
bool dont_wait_for_ack,
-#endif
+#endif // endif
u64 *cookie)
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) */
{
@@ -6411,7 +10238,7 @@
struct ieee80211_channel *channel = params->chan;
const u8 *buf = params->buf;
size_t len = params->len;
-#endif
+#endif // endif
const struct ieee80211_mgmt *mgmt;
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
struct net_device *dev = NULL;
@@ -6420,25 +10247,29 @@
u32 id;
bool ack = false;
s8 eabuf[ETHER_ADDR_STR_LEN];
+#ifdef WL_SAE
+ struct net_info *netinfo = NULL;
+ struct wl_mf_params *mf_params;
+ u32 mf_params_len = 0;
+ s32 timeout = 0;
+ s32 chan_nr;
+#endif // endif
WL_DBG(("Enter \n"));
- /* The CVE-2017-0706.dff patched here manually */
if (len > ACTION_FRAME_SIZE) {
WL_ERR(("bad length:%zu\n", len));
return BCME_BADLEN;
}
+#ifdef DHD_IFDEBUG
+ PRINT_WDEV_INFO(cfgdev);
+#endif /* DHD_IFDEBUG */
dev = cfgdev_to_wlc_ndev(cfgdev, cfg);
if (!dev) {
WL_ERR(("dev is NULL\n"));
return -EINVAL;
- }
-
- if (len > ACTION_FRAME_SIZE) {
- WL_ERR(("bad length:%zu\n", len));
- return BCME_BADLEN;
}
/* set bsscfg idx for iovar (wlan0: P2PAPI_BSSCFG_PRIMARY, p2p: P2PAPI_BSSCFG_DEVICE) */
@@ -6486,10 +10317,10 @@
#if defined(P2P_IE_MISSING_FIX)
if (!cfg->p2p_prb_noti) {
cfg->p2p_prb_noti = true;
- WL_DBG(("%s: TX 802_1X Probe Response first time.\n",
- __FUNCTION__));
+ WL_DBG(("wl_cfg80211_mgmt_tx: TX 802_1X Probe"
+ " Response first time.\n"));
}
-#endif
+#endif // endif
goto exit;
} else if (ieee80211_is_disassoc(mgmt->frame_control) ||
ieee80211_is_deauth(mgmt->frame_control)) {
@@ -6500,8 +10331,8 @@
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(dev, WLC_GET_ASSOCLIST,
- assoc_maclist, sizeof(mac_buf), false);
+ err = wldev_ioctl_get(dev, WLC_GET_ASSOCLIST,
+ assoc_maclist, sizeof(mac_buf));
if (err < 0)
WL_ERR(("WLC_GET_ASSOCLIST error %d\n", err));
else
@@ -6509,13 +10340,13 @@
}
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,
- sizeof(scb_val_t), true);
+ err = wldev_ioctl_set(dev, WLC_SCB_DEAUTHENTICATE_FOR_REASON, &scb_val,
+ sizeof(scb_val_t));
if (err < 0)
WL_ERR(("WLC_SCB_DEAUTHENTICATE_FOR_REASON error %d\n", err));
- WL_ERR(("Disconnect STA : %s scb_val.val %d\n",
- bcm_ether_ntoa((const struct ether_addr *)mgmt->da, eabuf),
- scb_val.val));
+ WL_ERR(("Disconnect STA : " MACDBG " scb_val.val %d\n",
+ MAC2STRDBG(bcm_ether_ntoa((const struct ether_addr *)mgmt->da,
+ eabuf)), scb_val.val));
if (num_associated > 0 && ETHER_ISBCAST(mgmt->da))
wl_delay(400);
@@ -6535,16 +10366,84 @@
* And previous off-channel action frame must be ended before new af tx.
*/
#ifndef WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST
- wl_notify_escan_complete(cfg, dev, true, true);
+ wl_cfg80211_cancel_scan(cfg);
#endif /* not WL_CFG80211_VSDB_PRIORITIZE_SCAN_REQUEST */
- }
+#ifdef WL_SAE
+ } else if (ieee80211_is_auth(mgmt->frame_control)) {
+ netinfo = wl_get_netinfo_by_wdev(cfg, cfgdev_to_wdev(cfgdev));
+ reinit_completion(&netinfo->mgmt_tx_cpl);
+ clear_bit(MGMT_TX_ACK, &netinfo->mgmt_txstatus);
+ clear_bit(MGMT_TX_NOACK, &netinfo->mgmt_txstatus);
+ clear_bit(MGMT_TX_OFF_CHAN_COMPLETED,
+ &netinfo->mgmt_txstatus);
+ mf_params_len = offsetof(struct wl_mf_params, data) +
+ (len - DOT11_MGMT_HDR_LEN);
+ mf_params = (wl_mf_params_t *)MALLOCZ(cfg->osh, mf_params_len);
+ if (!mf_params) {
+ WL_ERR(("Insufficient memory to allocate auth frame\n"));
+ err = -ENOMEM;
+ goto exit;
+ }
+ mf_params->dwell_time = MGMT_AUTH_FRAME_DWELL_TIME;
+ mf_params->len = cpu_to_le16(len - DOT11_MGMT_HDR_LEN);
+ mf_params->fc = mgmt->frame_control;
+
+ /* update channel */
+ if (!channel) {
+ mf_params->channel = 0;
+ } else {
+ chan_nr = ieee80211_frequency_to_channel(channel->center_freq);
+ mf_params->channel = cpu_to_le32(chan_nr);
+ }
+
+ memcpy(&mf_params->da.octet, &mgmt->da[0], ETH_ALEN);
+ memcpy(&mf_params->bssid.octet, &mgmt->bssid[0], ETH_ALEN);
+ *cookie = (u64)mf_params->data;
+ mf_params->packetId = cpu_to_le32(*cookie);
+
+ memcpy(mf_params->data, &buf[DOT11_MGMT_HDR_LEN],
+ le16_to_cpu(mf_params->len));
+
+ WL_DBG(("Auth frame, cookie=%lld, fc=%x, len=%d, channel=%d\n",
+ *cookie, mf_params->fc,
+ le16_to_cpu(mf_params->len),
+ mf_params->channel));
+
+ netinfo->mgmt_txid = mf_params->packetId;
+ set_bit(MGMT_TX_SEND_FRAME, &netinfo->mgmt_txstatus);
+
+ err = wldev_iovar_setbuf_bsscfg(dev, "mgmt_frame", mf_params, mf_params_len,
+ cfg->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &cfg->ioctl_buf_sync);
+ if (err < 0) {
+ WL_ERR(("Failed to send auth frame %d\n", err));
+ ack = false;
+ goto txstatus;
+ }
+
+ timeout = wait_for_completion_timeout(&netinfo->mgmt_tx_cpl,
+ MGMT_AUTH_FRAME_WAIT_TIME);
+ if ((timeout > 0) || test_bit(MGMT_TX_ACK, &netinfo->mgmt_txstatus)) {
+ WL_DBG(("TX auth frame operation is success\n"));
+ ack = true;
+ } else {
+ ack = false;
+ WL_ERR(("TX auth frame operation has failed, txstatus %ld\n",
+ netinfo->mgmt_txstatus));
+ }
+txstatus:
+ cfg80211_mgmt_tx_status(cfgdev_to_wdev(cfgdev), *cookie,
+ buf, len, ack, GFP_KERNEL);
+ MFREE(cfg->osh, mf_params, mf_params_len);
+ goto exit;
+#endif /* WL_SAE */
+ }
} else {
WL_ERR(("Driver only allows MGMT packet type\n"));
goto exit;
}
- af_params = (wl_af_params_t *) kzalloc(WL_WIFI_AF_PARAMS_SIZE, GFP_KERNEL);
+ af_params = (wl_af_params_t *)MALLOCZ(cfg->osh, WL_WIFI_AF_PARAMS_SIZE);
if (af_params == NULL)
{
@@ -6576,7 +10475,7 @@
af_params->dwell_time = params->wait;
#else
af_params->dwell_time = wait;
-#endif
+#endif // endif
memcpy(action_frame->data, &buf[DOT11_MGMT_HDR_LEN], action_frame->len);
@@ -6584,25 +10483,35 @@
action_frame, action_frame->len, bssidx);
cfg80211_mgmt_tx_status(cfgdev, *cookie, buf, len, ack, GFP_KERNEL);
- kfree(af_params);
+ MFREE(cfg->osh, af_params, WL_WIFI_AF_PARAMS_SIZE);
exit:
return err;
}
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+static void
+wl_cfg80211_update_mgmt_frame_register(struct wiphy *wiphy, struct wireless_dev *wdev,
+ struct mgmt_frame_regs *upd)
+{
+ WL_DBG(("mgmt_frame_regs: %x %x %x %x\n", upd->global_stypes,upd->interface_stypes,
+ upd->global_mcast_stypes,upd->interface_mcast_stypes));
+ return;
+}
+#else
static void
wl_cfg80211_mgmt_frame_register(struct wiphy *wiphy, bcm_struct_cfgdev *cfgdev,
- u16 frame_type, bool reg)
+ u16 frame, bool reg)
{
- WL_DBG(("frame_type: %x, reg: %d\n", frame_type, reg));
+ WL_DBG(("frame_type: %x, reg: %d\n", frame, reg));
- if (frame_type != (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_PROBE_REQ))
+ if (frame != (IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_PROBE_REQ))
return;
return;
}
-
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) */
static s32
wl_cfg80211_change_bss(struct wiphy *wiphy,
@@ -6611,18 +10520,14 @@
{
s32 err = 0;
s32 ap_isolate = 0;
-#ifdef PCIE_FULL_DONGLE
s32 ifidx = DHD_BAD_IF;
-#endif
-#if defined(PCIE_FULL_DONGLE)
dhd_pub_t *dhd;
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
dhd = (dhd_pub_t *)(cfg->pub);
#if defined(WL_ENABLE_P2P_IF)
if (cfg->p2p_net == dev)
dev = bcmcfg_to_prmry_ndev(cfg);
-#endif
-#endif
+#endif // endif
if (params->use_cts_prot >= 0) {
}
@@ -6638,7 +10543,6 @@
if (params->ap_isolate >= 0) {
ap_isolate = params->ap_isolate;
-#ifdef PCIE_FULL_DONGLE
ifidx = dhd_net2idx(dhd->info, dev);
if (ifidx != DHD_BAD_IF) {
@@ -6646,122 +10550,145 @@
} else {
WL_ERR(("Failed to set ap_isolate\n"));
}
-#else
- err = wldev_iovar_setint(dev, "ap_isolate", ap_isolate);
+#ifdef BCMSDIO
+ /* Onus of intra-BSS packet forwarding moved to DHD.
+ * DHD will handle packet intra-bss packet forwarding.
+ */
+ err = wldev_iovar_setint(dev, "ap_isolate", AP_ISOLATE_SENDUP_ALL);
if (unlikely(err))
{
WL_ERR(("set ap_isolate Error (%d)\n", err));
}
-#endif /* PCIE_FULL_DONGLE */
+#endif /* BCMSDIO */
}
if (params->ht_opmode >= 0) {
}
-
return err;
}
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
-static s32
-wl_cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev,
- struct ieee80211_channel *chan,
- struct cfg80211_chan_def chandef)
-#else
-static s32
-wl_cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev,
- struct ieee80211_channel *chan,
- enum nl80211_channel_type channel_type)
-#endif
+static int
+wl_get_bandwidth_cap(struct net_device *ndev, uint32 band, uint32 *bandwidth)
{
- s32 _chan;
- chanspec_t chspec = 0;
- chanspec_t fw_chspec = 0;
u32 bw = WL_CHANSPEC_BW_20;
-#ifdef WL11ULB
- u32 ulb_bw = wl_cfg80211_get_ulb_bw(dev->ieee80211_ptr);
-#endif /* WL11ULB */
-
s32 err = BCME_OK;
s32 bw_cap = 0;
struct {
u32 band;
u32 bw_cap;
} param = {0, 0};
+ u8 ioctl_buf[WLC_IOCTL_SMLEN];
+ u32 channel_width = 0;
+ struct wireless_dev *wdev = ndev_to_wdev(ndev);
+ struct wiphy *wiphy = wdev->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 (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- enum nl80211_channel_type channel_type = NL80211_CHAN_HT20;
-#endif
+#ifdef WL_6E
+ if (band == IEEE80211_BAND_5GHZ || band == IEEE80211_BAND_6GHZ) {
+ if (band == IEEE80211_BAND_5GHZ)
+ param.band = WLC_BAND_5G;
+ else if (band == IEEE80211_BAND_6GHZ)
+ param.band = WLC_BAND_6G;
+#else
+ if (band == IEEE80211_BAND_5GHZ) {
+ param.band = WLC_BAND_5G;
+#endif /* WL_6E AP */
+ channel_width = wl_get_chanwidth_by_netdev(cfg, ndev);
+ switch (channel_width) {
+ case WL_CHANSPEC_BW_80:
+ case WL_CHANSPEC_BW_40:
+ case WL_CHANSPEC_BW_20:
+ bw = channel_width;
+ /* resetting user specified channel width */
+ wl_set_chanwidth_by_netdev(cfg, ndev, 0);
+ break;
+ default:
+ err = wldev_iovar_getbuf(ndev, "bw_cap", ¶m, sizeof(param),
+ ioctl_buf, sizeof(ioctl_buf), NULL);
+ if (err) {
+ if (err != BCME_UNSUPPORTED) {
+ WL_ERR(("bw_cap failed, %d\n", err));
+ return err;
+ } else {
+ err = wldev_iovar_getint(ndev, "mimo_bw_cap",
+ &bw_cap);
+ if (err) {
+ WL_ERR(("error get mimo_bw_cap (%d)\n",
+ err));
+ }
+ if (bw_cap != WLC_N_BW_20ALL) {
+ bw = WL_CHANSPEC_BW_40;
+ }
+ }
+ } else {
+ if (WL_BW_CAP_80MHZ(ioctl_buf[0])) {
+ bw = WL_CHANSPEC_BW_80;
+ } else if (WL_BW_CAP_40MHZ(ioctl_buf[0])) {
+ bw = WL_CHANSPEC_BW_40;
+ } else {
+ bw = WL_CHANSPEC_BW_20;
+ }
+ }
+ break;
+ }
+ } else if (band == IEEE80211_BAND_2GHZ) {
+ bw = WL_CHANSPEC_BW_20;
+ }
+
+ *bandwidth = bw;
+
+ return err;
+}
+
+static s32
+wl_cfg80211_set_channel(struct wiphy *wiphy, struct net_device *dev,
+ struct ieee80211_channel *chan,
+ enum nl80211_channel_type channel_type)
+{
+ s32 _chan;
+ chanspec_t chspec = 0;
+ chanspec_t fw_chspec = 0;
+ u32 bw = WL_CHANSPEC_BW_20;
+ s32 err = BCME_OK;
+ struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
+#if defined(CUSTOM_SET_CPUCORE) || defined(APSTA_RESTRICTED_CHANNEL)
+ dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+#endif /* CUSTOM_SET_CPUCORE || APSTA_RESTRICTED_CHANNEL */
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));
-#if defined(CUSTOM_PLATFORM_NV_TEGRA)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0))
- WL_ERR(("chan_width = %d\n", chandef.width));
- switch (chandef.width) {
- case NL80211_CHAN_WIDTH_40:
- bw = WL_CHANSPEC_BW_40;
- break;
- case NL80211_CHAN_WIDTH_80:
- bw = WL_CHANSPEC_BW_80;
- break;
- case NL80211_CHAN_WIDTH_80P80:
- bw = WL_CHANSPEC_BW_8080;
- break;
- case NL80211_CHAN_WIDTH_160:
- bw = WL_CHANSPEC_BW_160;
- break;
- default:
- bw = WL_CHANSPEC_BW_20;
- break;
- }
- goto set_channel;
-#endif
-#endif
-
-
-#ifdef WL11ULB
- if (ulb_bw) {
- WL_DBG(("[ULB] setting AP/GO BW to ulb_bw 0x%x \n", ulb_bw));
- bw = wl_cfg80211_ulbbw_to_ulbchspec(ulb_bw);
- goto set_channel;
- }
-#endif /* WL11ULB */
- if (chan->band == IEEE80211_BAND_5GHZ) {
- param.band = WLC_BAND_5G;
- err = wldev_iovar_getbuf(dev, "bw_cap", ¶m, sizeof(param),
- cfg->ioctl_buf, WLC_IOCTL_SMLEN, &cfg->ioctl_buf_sync);
- if (err) {
- if (err != BCME_UNSUPPORTED) {
- WL_ERR(("bw_cap failed, %d\n", err));
- return err;
- } else {
- err = wldev_iovar_getint(dev, "mimo_bw_cap", &bw_cap);
- if (err) {
- WL_ERR(("error get mimo_bw_cap (%d)\n", err));
- }
- if (bw_cap != WLC_N_BW_20ALL)
- bw = WL_CHANSPEC_BW_40;
- }
- } else {
- if (WL_BW_CAP_80MHZ(cfg->ioctl_buf[0]))
- bw = WL_CHANSPEC_BW_80;
- else if (WL_BW_CAP_40MHZ(cfg->ioctl_buf[0]))
- bw = WL_CHANSPEC_BW_40;
- else
+#if defined(APSTA_RESTRICTED_CHANNEL)
+ if (wl_get_mode_by_netdev(cfg, dev) == WL_MODE_AP &&
+ DHD_OPMODE_STA_SOFTAP_CONCURR(dhd) &&
+ wl_get_drv_status(cfg, CONNECTED, bcmcfg_to_prmry_ndev(cfg))) {
+ u32 *sta_chan = (u32 *)wl_read_prof(cfg,
+ bcmcfg_to_prmry_ndev(cfg), WL_PROF_CHAN);
+ u32 sta_band = (*sta_chan > CH_MAX_2G_CHANNEL) ?
+ IEEE80211_BAND_5GHZ : IEEE80211_BAND_2GHZ;
+ if (chan->band == sta_band) {
+ /* Do not try SCC in 5GHz if channel is not CH149 */
+ _chan = (sta_band == IEEE80211_BAND_5GHZ &&
+ *sta_chan != DEFAULT_5G_SOFTAP_CHANNEL) ?
+ DEFAULT_2G_SOFTAP_CHANNEL : *sta_chan;
+ WL_ERR(("target channel will be changed to %d\n", _chan));
+ if (_chan <= CH_MAX_2G_CHANNEL) {
bw = WL_CHANSPEC_BW_20;
-
+ goto set_channel;
+ }
}
+ }
+#endif /* APSTA_RESTRICTED_CHANNEL */
- } else if (chan->band == IEEE80211_BAND_2GHZ)
- bw = WL_CHANSPEC_BW_20;
+ err = wl_get_bandwidth_cap(dev, chan->band, &bw);
+ if (err < 0) {
+ WL_ERR(("Failed to get bandwidth information, err=%d\n", err));
+ return err;
+ }
+
set_channel:
chspec = wf_channel2chspec(_chan, bw);
if (wf_chspec_valid(chspec)) {
@@ -6771,8 +10698,8 @@
fw_chspec)) == BCME_BADCHAN) {
if (bw == WL_CHANSPEC_BW_80)
goto change_bw;
- err = wldev_ioctl(dev, WLC_SET_CHANNEL,
- &_chan, sizeof(_chan), true);
+ err = wldev_ioctl_set(dev, WLC_SET_CHANNEL,
+ &_chan, sizeof(_chan));
if (err < 0) {
WL_ERR(("WLC_SET_CHANNEL error %d"
"chip may not be supporting this channel\n", err));
@@ -6780,6 +10707,20 @@
} else if (err) {
WL_ERR(("failed to set chanspec error %d\n", err));
}
+#ifdef DISABLE_WL_FRAMEBURST_SOFTAP
+ else {
+ /* Disable Frameburst only for stand-alone 2GHz SoftAP */
+ if (wl_get_mode_by_netdev(cfg, dev) == WL_MODE_AP &&
+ DHD_OPMODE_SUPPORTED(cfg->pub, DHD_FLAG_HOSTAP_MODE) &&
+ (_chan <= CH_MAX_2G_CHANNEL) &&
+ !wl_get_drv_status(cfg, CONNECTED,
+ bcmcfg_to_prmry_ndev(cfg))) {
+ WL_DBG(("Disabling frameburst on "
+ "stand-alone 2GHz SoftAP\n"));
+ wl_cfg80211_set_frameburst(cfg, FALSE);
+ }
+ }
+#endif /* DISABLE_WL_FRAMEBURST_SOFTAP */
} else {
WL_ERR(("failed to convert host chanspec to fw chanspec\n"));
err = BCME_ERROR;
@@ -6814,6 +10755,14 @@
}
}
#endif /* CUSTOM_SET_CPUCORE */
+ if (!err && (wl_get_mode_by_netdev(cfg, dev) == WL_MODE_AP)) {
+ /* Update AP/GO operating channel */
+ cfg->ap_oper_channel = ieee80211_frequency_to_channel(chan->center_freq);
+ }
+ if (err) {
+ wl_flush_fw_log_buffer(bcmcfg_to_prmry_ndev(cfg),
+ FW_LOGSET_MASK_ALL);
+ }
return err;
}
@@ -6822,14 +10771,49 @@
wl_cfg80211_get_remain_on_channel_ndev(struct bcm_cfg80211 *cfg)
{
struct net_info *_net_info, *next;
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
list_for_each_entry_safe(_net_info, next, &cfg->net_list, list) {
+ GCC_DIAGNOSTIC_POP();
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 */
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) || defined(WL_COMPAT_WIRELESS)
+#ifdef BCMWAPI_WPI
+static s32
+wl_validate_wapisecurity(struct net_device *dev, s32 bssidx)
+{
+ s32 err = BCME_OK;
+
+ /* set auth */
+ err = wldev_iovar_setint_bsscfg(dev, "auth", 0, bssidx);
+ if (err < 0) {
+ WL_ERR(("WAPI auth error %d\n", err));
+ return BCME_ERROR;
+ }
+
+ /* set wsec */
+ err = wldev_iovar_setint_bsscfg(dev, "wsec", SMS4_ENABLED, bssidx);
+ if (err < 0) {
+ WL_ERR(("WAPI wsec error %d\n", err));
+ return BCME_ERROR;
+ }
+
+ /* set upper-layer auth */
+ err = wldev_iovar_setint_bsscfg(dev, "wpa_auth", WAPI_AUTH_PSK, bssidx);
+ if (err < 0) {
+ WL_ERR(("WAPI wpa_auth error %d\n", err));
+ return BCME_ERROR;
+ }
+ return 0;
+}
+#endif /* BCMWAPI_WPI */
+#endif /* LINUX_VERSION >= VERSION(3,4,0) || WL_COMPAT_WIRELESS */
static s32
wl_validate_opensecurity(struct net_device *dev, s32 bssidx, bool privacy)
@@ -6872,8 +10856,65 @@
return 0;
}
+#define MAX_FILS_IND_IE_LEN 1024u
static s32
-wl_validate_wpa2ie(struct net_device *dev, bcm_tlv_t *wpa2ie, s32 bssidx)
+wl_validate_fils_ind_ie(struct net_device *dev, const bcm_tlv_t *filsindie, s32 bssidx)
+{
+ s32 err = BCME_OK;
+ struct bcm_cfg80211 *cfg = NULL;
+ bcm_iov_buf_t *iov_buf = NULL;
+ bcm_xtlv_t* pxtlv;
+ int iov_buf_size = 0;
+
+ if (!dev || !filsindie) {
+ WL_ERR(("%s: dev/filsidie is null\n", __FUNCTION__));
+ goto exit;
+ }
+
+ cfg = wl_get_cfg(dev);
+ if (!cfg) {
+ WL_ERR(("%s: cfg is null\n", __FUNCTION__));
+ goto exit;
+ }
+
+ iov_buf_size = sizeof(bcm_iov_buf_t) + sizeof(bcm_xtlv_t) + filsindie->len - 1;
+ iov_buf = MALLOCZ(cfg->osh, iov_buf_size);
+ if (!iov_buf) {
+ WL_ERR(("%s: iov_buf alloc failed! %d bytes\n", __FUNCTION__, iov_buf_size));
+ err = BCME_NOMEM;
+ goto exit;
+ }
+ iov_buf->version = WL_FILS_IOV_VERSION;
+ iov_buf->id = WL_FILS_CMD_ADD_IND_IE;
+ iov_buf->len = sizeof(bcm_xtlv_t) + filsindie->len - 1;
+ pxtlv = (bcm_xtlv_t*)&iov_buf->data[0];
+ pxtlv->id = WL_FILS_XTLV_IND_IE;
+ pxtlv->len = filsindie->len;
+ /* memcpy_s return check not required as buffer is allocated based on ie
+ * len
+ */
+ (void)memcpy_s(pxtlv->data, filsindie->len, filsindie->data, filsindie->len);
+
+ err = wldev_iovar_setbuf(dev, "fils", iov_buf, iov_buf_size,
+ cfg->ioctl_buf, WLC_IOCTL_SMLEN, &cfg->ioctl_buf_sync);
+ if (unlikely(err)) {
+ WL_ERR(("fils indication ioctl error (%d)\n", err));
+ goto exit;
+ }
+
+exit:
+ if (err < 0) {
+ WL_ERR(("FILS Ind setting error %d\n", err));
+ }
+
+ if (iov_buf) {
+ MFREE(cfg->osh, iov_buf, iov_buf_size);
+ }
+ return err;
+}
+
+static s32
+wl_validate_wpa2ie(struct net_device *dev, const bcm_tlv_t *wpa2ie, s32 bssidx)
{
s32 len = 0;
s32 err = BCME_OK;
@@ -6882,14 +10923,14 @@
u32 pval = 0;
u32 gval = 0;
u32 wpa_auth = 0;
- wpa_suite_mcast_t *mcast;
- wpa_suite_ucast_t *ucast;
- wpa_suite_auth_key_mgmt_t *mgmt;
- wpa_pmkid_list_t *pmkid;
+ const wpa_suite_mcast_t *mcast;
+ const wpa_suite_ucast_t *ucast;
+ const wpa_suite_auth_key_mgmt_t *mgmt;
+ const wpa_pmkid_list_t *pmkid;
int cnt = 0;
#ifdef MFP
int mfp = 0;
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
#endif /* MFP */
u16 suite_count;
@@ -6902,7 +10943,7 @@
WL_DBG(("Enter \n"));
len = wpa2ie->len - WPA2_VERSION_LEN;
/* check the mcast cipher */
- mcast = (wpa_suite_mcast_t *)&wpa2ie->data[WPA2_VERSION_LEN];
+ mcast = (const wpa_suite_mcast_t *)&wpa2ie->data[WPA2_VERSION_LEN];
switch (mcast->type) {
case WPA_CIPHER_NONE:
gval = 0;
@@ -6917,6 +10958,14 @@
case WPA_CIPHER_AES_CCM:
gval = AES_ENABLED;
break;
+#ifdef BCMWAPI_WPI
+ case WAPI_CIPHER_SMS4:
+ gval = SMS4_ENABLED;
+ break;
+#endif // endif
+ case WPA_CIPHER_AES_GCM256:
+ gval = AES_GCMP256;
+ break;
default:
WL_ERR(("No Security Info\n"));
break;
@@ -6925,7 +10974,7 @@
return BCME_BADLEN;
/* check the unicast cipher */
- ucast = (wpa_suite_ucast_t *)&mcast[1];
+ ucast = (const wpa_suite_ucast_t *)&mcast[1];
suite_count = ltoh16_ua(&ucast->count);
switch (ucast->list[0].type) {
case WPA_CIPHER_NONE:
@@ -6941,6 +10990,14 @@
case WPA_CIPHER_AES_CCM:
pval = AES_ENABLED;
break;
+#ifdef BCMWAPI_WPI
+ case WAPI_CIPHER_SMS4:
+ pval = SMS4_ENABLED;
+ break;
+#endif // endif
+ case WPA_CIPHER_AES_GCM256:
+ pval = AES_GCMP256;
+ break;
default:
WL_ERR(("No Security Info\n"));
}
@@ -6950,35 +11007,52 @@
/* FOR WPS , set SEC_OW_ENABLED */
wsec = (pval | gval | SES_OW_ENABLED);
/* check the AKM */
- mgmt = (wpa_suite_auth_key_mgmt_t *)&ucast->list[suite_count];
+ mgmt = (const wpa_suite_auth_key_mgmt_t *)&ucast->list[suite_count];
suite_count = cnt = ltoh16_ua(&mgmt->count);
while (cnt--) {
+ if (!bcmp(mgmt->list[cnt].oui, WPA2_OUI, WPA2_OUI_LEN)) {
switch (mgmt->list[cnt].type) {
case RSN_AKM_NONE:
- wpa_auth |= WPA_AUTH_NONE;
+ wpa_auth |= WPA_AUTH_NONE;
break;
case RSN_AKM_UNSPECIFIED:
- wpa_auth |= WPA2_AUTH_UNSPECIFIED;
+ wpa_auth |= WPA2_AUTH_UNSPECIFIED;
break;
case RSN_AKM_PSK:
- wpa_auth |= WPA2_AUTH_PSK;
- break;
-#ifdef MFP
- case RSN_AKM_MFP_PSK:
- wpa_auth |= WPA2_AUTH_PSK_SHA256;
- break;
- case RSN_AKM_MFP_1X:
- wpa_auth |= WPA2_AUTH_1X_SHA256;
+ wpa_auth |= WPA2_AUTH_PSK;
break;
+#ifdef MFP
+ case RSN_AKM_MFP_PSK:
+ wpa_auth |= WPA2_AUTH_PSK_SHA256;
+ break;
+ case RSN_AKM_MFP_1X:
+ wpa_auth |= WPA2_AUTH_1X_SHA256;
+ break;
+ case RSN_AKM_FILS_SHA256:
+ wpa_auth |= WPA2_AUTH_FILS_SHA256;
+ break;
+ case RSN_AKM_FILS_SHA384:
+ wpa_auth |= WPA2_AUTH_FILS_SHA384;
+ break;
+#ifdef WL_SAE
+ case RSN_AKM_SAE_PSK:
+ wpa_auth |= WPA3_AUTH_SAE_PSK;
+ break;
+ case RSN_AKM_SUITEB_SHA384_1X:
+ wpa_auth |= WPA3_AUTH_1X_SUITE_B_SHA384;
+ break;
+#endif /* WL_SAE */
#endif /* MFP */
default:
WL_ERR(("No Key Mgmt Info\n"));
}
+ } else if (!bcmp(mgmt->list[cnt].oui, WFA_OUI, WFA_OUI_LEN))
+ wpa_auth |= WPA2_WFA_AUTH_DPP;
}
if ((len -= (WPA_IE_SUITE_COUNT_LEN + (WPA_SUITE_LEN * suite_count))) >= RSN_CAP_LEN) {
- rsn_cap[0] = *(u8 *)&mgmt->list[suite_count];
- rsn_cap[1] = *((u8 *)&mgmt->list[suite_count] + 1);
+ rsn_cap[0] = *(const u8 *)&mgmt->list[suite_count];
+ rsn_cap[1] = *((const u8 *)&mgmt->list[suite_count] + 1);
if (rsn_cap[0] & (RSN_CAP_16_REPLAY_CNTRS << RSN_CAP_PTK_REPLAY_CNTR_SHIFT)) {
wme_bss_disable = 0;
@@ -7016,7 +11090,8 @@
len -= RSN_CAP_LEN;
if (len >= WPA2_PMKID_COUNT_LEN) {
- pmkid = (wpa_pmkid_list_t *)((u8 *)&mgmt->list[suite_count] + RSN_CAP_LEN);
+ pmkid = (const wpa_pmkid_list_t *)
+ ((const u8 *)&mgmt->list[suite_count] + RSN_CAP_LEN);
cnt = ltoh16_ua(&pmkid->count);
if (cnt != 0) {
WL_ERR(("AP has non-zero PMKID count. Wrong!\n"));
@@ -7029,16 +11104,12 @@
#ifdef MFP
len -= WPA2_PMKID_COUNT_LEN;
if (len >= WPA_SUITE_LEN) {
- err = wldev_iovar_setbuf_bsscfg(dev, "bip",
- (void *)((u8 *)&mgmt->list[suite_count] + RSN_CAP_LEN + WPA2_PMKID_COUNT_LEN),
- WPA_SUITE_LEN,
- cfg->ioctl_buf, WLC_IOCTL_SMLEN, bssidx, &cfg->ioctl_buf_sync);
- if (err < 0) {
- WL_ERR(("bip set error %d\n", err));
- return BCME_ERROR;
- }
+ cfg->bip_pos =
+ (const u8 *)&mgmt->list[suite_count] + RSN_CAP_LEN + WPA2_PMKID_COUNT_LEN;
+ } else {
+ cfg->bip_pos = NULL;
}
-#endif
+#endif // endif
/* set auth */
err = wldev_iovar_setint_bsscfg(dev, "auth", auth, bssidx);
@@ -7055,15 +11126,7 @@
}
#ifdef MFP
- if (mfp) {
- /* This needs to go after wsec otherwise the wsec command will
- * overwrite the values set by MFP
- */
- if ((err = wldev_iovar_setint_bsscfg(dev, "mfp", mfp, bssidx)) < 0) {
- WL_ERR(("MFP Setting failed. ret = %d \n", err));
- return err;
- }
- }
+ cfg->mfp_mode = mfp;
#endif /* MFP */
/* set upper-layer auth */
@@ -7077,11 +11140,11 @@
}
static s32
-wl_validate_wpaie(struct net_device *dev, wpa_ie_fixed_t *wpaie, s32 bssidx)
+wl_validate_wpaie(struct net_device *dev, const wpa_ie_fixed_t *wpaie, s32 bssidx)
{
- wpa_suite_mcast_t *mcast;
- wpa_suite_ucast_t *ucast;
- wpa_suite_auth_key_mgmt_t *mgmt;
+ const wpa_suite_mcast_t *mcast;
+ const wpa_suite_ucast_t *ucast;
+ const wpa_suite_auth_key_mgmt_t *mgmt;
u16 auth = 0; /* d11 open authentication */
u16 count;
s32 err = BCME_OK;
@@ -7100,12 +11163,12 @@
len -= WPA_IE_TAG_FIXED_LEN;
/* check for multicast cipher suite */
if (len < WPA_SUITE_LEN) {
- WL_INFORM(("no multicast cipher suite\n"));
+ WL_INFORM_MEM(("no multicast cipher suite\n"));
goto exit;
}
/* pick up multicast cipher */
- mcast = (wpa_suite_mcast_t *)&wpaie[1];
+ mcast = (const wpa_suite_mcast_t *)&wpaie[1];
len -= WPA_SUITE_LEN;
if (!bcmp(mcast->oui, WPA_OUI, WPA_OUI_LEN)) {
if (IS_WPA_CIPHER(mcast->type)) {
@@ -7132,11 +11195,11 @@
}
/* Check for unicast suite(s) */
if (len < WPA_IE_SUITE_COUNT_LEN) {
- WL_INFORM(("no unicast suite\n"));
+ WL_INFORM_MEM(("no unicast suite\n"));
goto exit;
}
/* walk thru unicast cipher list and pick up what we recognize */
- ucast = (wpa_suite_ucast_t *)&mcast[1];
+ ucast = (const wpa_suite_ucast_t *)&mcast[1];
count = ltoh16_ua(&ucast->count);
len -= WPA_IE_SUITE_COUNT_LEN;
for (i = 0; i < count && len >= WPA_SUITE_LEN;
@@ -7168,11 +11231,11 @@
len -= (count - i) * WPA_SUITE_LEN;
/* Check for auth key management suite(s) */
if (len < WPA_IE_SUITE_COUNT_LEN) {
- WL_INFORM((" no auth key mgmt suite\n"));
+ WL_INFORM_MEM((" no auth key mgmt suite\n"));
goto exit;
}
/* walk thru auth management suite list and pick up what we recognize */
- mgmt = (wpa_suite_auth_key_mgmt_t *)&ucast->list[count];
+ mgmt = (const wpa_suite_auth_key_mgmt_t *)&ucast->list[count];
count = ltoh16_ua(&mgmt->count);
len -= WPA_IE_SUITE_COUNT_LEN;
for (i = 0; i < count && len >= WPA_SUITE_LEN;
@@ -7222,6 +11285,249 @@
return 0;
}
+#if defined(SUPPORT_SOFTAP_WPAWPA2_MIXED)
+static u32 wl_get_cipher_type(uint8 type)
+{
+ u32 ret = 0;
+ switch (type) {
+ case WPA_CIPHER_NONE:
+ ret = 0;
+ break;
+ case WPA_CIPHER_WEP_40:
+ case WPA_CIPHER_WEP_104:
+ ret = WEP_ENABLED;
+ break;
+ case WPA_CIPHER_TKIP:
+ ret = TKIP_ENABLED;
+ break;
+ case WPA_CIPHER_AES_CCM:
+ ret = AES_ENABLED;
+ break;
+#ifdef BCMWAPI_WPI
+ case WAPI_CIPHER_SMS4:
+ ret = SMS4_ENABLED;
+ break;
+#endif // endif
+ default:
+ WL_ERR(("No Security Info\n"));
+ }
+ return ret;
+}
+
+static u32 wl_get_suite_auth_key_mgmt_type(uint8 type, const wpa_suite_mcast_t *mcast)
+{
+ u32 ret = 0;
+ u32 is_wpa2 = 0;
+
+ if (!bcmp(mcast->oui, WPA2_OUI, WPA2_OUI_LEN)) {
+ is_wpa2 = 1;
+ }
+
+ WL_INFORM_MEM(("%s, type = %d\n", is_wpa2 ? "WPA2":"WPA", type));
+ switch (type) {
+ case RSN_AKM_NONE:
+ /* For WPA and WPA2, AUTH_NONE is common */
+ ret = WPA_AUTH_NONE;
+ break;
+ case RSN_AKM_UNSPECIFIED:
+ if (is_wpa2) {
+ ret = WPA2_AUTH_UNSPECIFIED;
+ } else {
+ ret = WPA_AUTH_UNSPECIFIED;
+ }
+ break;
+ case RSN_AKM_PSK:
+ if (is_wpa2) {
+ ret = WPA2_AUTH_PSK;
+ } else {
+ ret = WPA_AUTH_PSK;
+ }
+ break;
+#ifdef WL_SAE
+ case RSN_AKM_SAE_PSK:
+ ret = WPA3_AUTH_SAE_PSK;
+ break;
+#endif /* WL_SAE */
+ default:
+ WL_ERR(("No Key Mgmt Info\n"));
+ }
+
+ return ret;
+}
+
+static s32
+wl_validate_wpaie_wpa2ie(struct net_device *dev, const wpa_ie_fixed_t *wpaie,
+ const bcm_tlv_t *wpa2ie, s32 bssidx)
+{
+ const wpa_suite_mcast_t *mcast;
+ const wpa_suite_ucast_t *ucast;
+ const wpa_suite_auth_key_mgmt_t *mgmt;
+ u16 auth = 0; /* d11 open authentication */
+ u16 count;
+ s32 err = BCME_OK;
+ u32 wme_bss_disable;
+ u16 suite_count;
+ u8 rsn_cap[2];
+ s32 len = 0;
+ u32 i;
+ u32 wsec1, wsec2, wsec;
+ u32 pval = 0;
+ u32 gval = 0;
+ u32 wpa_auth = 0;
+ u32 wpa_auth1 = 0;
+ u32 wpa_auth2 = 0;
+
+ if (wpaie == NULL || wpa2ie == NULL)
+ goto exit;
+
+ WL_DBG(("Enter \n"));
+ len = wpaie->length; /* value length */
+ len -= WPA_IE_TAG_FIXED_LEN;
+ /* check for multicast cipher suite */
+ if (len < WPA_SUITE_LEN) {
+ WL_INFORM_MEM(("no multicast cipher suite\n"));
+ goto exit;
+ }
+
+ /* pick up multicast cipher */
+ mcast = (const wpa_suite_mcast_t *)&wpaie[1];
+ len -= WPA_SUITE_LEN;
+ if (!bcmp(mcast->oui, WPA_OUI, WPA_OUI_LEN)) {
+ if (IS_WPA_CIPHER(mcast->type)) {
+ gval |= wl_get_cipher_type(mcast->type);
+ }
+ }
+ WL_DBG(("\nwpa ie validate\n"));
+ WL_DBG(("wpa ie mcast cipher = 0x%X\n", gval));
+
+ /* Check for unicast suite(s) */
+ if (len < WPA_IE_SUITE_COUNT_LEN) {
+ WL_INFORM_MEM(("no unicast suite\n"));
+ goto exit;
+ }
+
+ /* walk thru unicast cipher list and pick up what we recognize */
+ ucast = (const wpa_suite_ucast_t *)&mcast[1];
+ count = ltoh16_ua(&ucast->count);
+ len -= WPA_IE_SUITE_COUNT_LEN;
+ for (i = 0; i < count && len >= WPA_SUITE_LEN;
+ i++, len -= WPA_SUITE_LEN) {
+ if (!bcmp(ucast->list[i].oui, WPA_OUI, WPA_OUI_LEN)) {
+ if (IS_WPA_CIPHER(ucast->list[i].type)) {
+ pval |= wl_get_cipher_type(ucast->list[i].type);
+ }
+ }
+ }
+ WL_ERR(("wpa ie ucast count =%d, cipher = 0x%X\n", count, pval));
+
+ /* FOR WPS , set SEC_OW_ENABLED */
+ wsec1 = (pval | gval | SES_OW_ENABLED);
+ WL_ERR(("wpa ie wsec = 0x%X\n", wsec1));
+
+ len -= (count - i) * WPA_SUITE_LEN;
+ /* Check for auth key management suite(s) */
+ if (len < WPA_IE_SUITE_COUNT_LEN) {
+ WL_INFORM_MEM((" no auth key mgmt suite\n"));
+ goto exit;
+ }
+ /* walk thru auth management suite list and pick up what we recognize */
+ mgmt = (const wpa_suite_auth_key_mgmt_t *)&ucast->list[count];
+ count = ltoh16_ua(&mgmt->count);
+ len -= WPA_IE_SUITE_COUNT_LEN;
+ for (i = 0; i < count && len >= WPA_SUITE_LEN;
+ i++, len -= WPA_SUITE_LEN) {
+ if (!bcmp(mgmt->list[i].oui, WPA_OUI, WPA_OUI_LEN)) {
+ if (IS_WPA_AKM(mgmt->list[i].type)) {
+ wpa_auth1 |=
+ wl_get_suite_auth_key_mgmt_type(mgmt->list[i].type, mcast);
+ }
+ }
+
+ }
+ WL_ERR(("wpa ie wpa_suite_auth_key_mgmt count=%d, key_mgmt = 0x%X\n", count, wpa_auth1));
+ WL_ERR(("\nwpa2 ie validate\n"));
+
+ pval = 0;
+ gval = 0;
+ len = wpa2ie->len;
+ /* check the mcast cipher */
+ mcast = (const wpa_suite_mcast_t *)&wpa2ie->data[WPA2_VERSION_LEN];
+ gval = wl_get_cipher_type(mcast->type);
+
+ WL_ERR(("wpa2 ie mcast cipher = 0x%X\n", gval));
+ if ((len -= WPA_SUITE_LEN) <= 0)
+ {
+ WL_ERR(("P:wpa2 ie len[%d]", len));
+ return BCME_BADLEN;
+ }
+
+ /* check the unicast cipher */
+ ucast = (const wpa_suite_ucast_t *)&mcast[1];
+ suite_count = ltoh16_ua(&ucast->count);
+ WL_ERR((" WPA2 ucast cipher count=%d\n", suite_count));
+ pval |= wl_get_cipher_type(ucast->list[0].type);
+
+ if ((len -= (WPA_IE_SUITE_COUNT_LEN + (WPA_SUITE_LEN * suite_count))) <= 0)
+ return BCME_BADLEN;
+
+ WL_ERR(("wpa2 ie ucast cipher = 0x%X\n", pval));
+
+ /* FOR WPS , set SEC_OW_ENABLED */
+ wsec2 = (pval | gval | SES_OW_ENABLED);
+ WL_ERR(("wpa2 ie wsec = 0x%X\n", wsec2));
+
+ /* check the AKM */
+ mgmt = (const wpa_suite_auth_key_mgmt_t *)&ucast->list[suite_count];
+ suite_count = ltoh16_ua(&mgmt->count);
+ wpa_auth2 = wl_get_suite_auth_key_mgmt_type(mgmt->list[0].type, mcast);
+ WL_ERR(("wpa ie wpa_suite_auth_key_mgmt count=%d, key_mgmt = 0x%X\n", count, wpa_auth2));
+
+ if ((len -= (WPA_IE_SUITE_COUNT_LEN + (WPA_SUITE_LEN * suite_count))) >= RSN_CAP_LEN) {
+ rsn_cap[0] = *(const u8 *)&mgmt->list[suite_count];
+ rsn_cap[1] = *((const u8 *)&mgmt->list[suite_count] + 1);
+ if (rsn_cap[0] & (RSN_CAP_16_REPLAY_CNTRS << RSN_CAP_PTK_REPLAY_CNTR_SHIFT)) {
+ wme_bss_disable = 0;
+ } else {
+ wme_bss_disable = 1;
+ }
+ WL_DBG(("P:rsn_cap[0]=[0x%X]:wme_bss_disabled[%d]\n", rsn_cap[0], wme_bss_disable));
+
+ /* set wme_bss_disable to sync RSN Capabilities */
+ err = wldev_iovar_setint_bsscfg(dev, "wme_bss_disable", wme_bss_disable, bssidx);
+ if (err < 0) {
+ WL_ERR(("wme_bss_disable error %d\n", err));
+ return BCME_ERROR;
+ }
+ } else {
+ WL_DBG(("There is no RSN Capabilities. remained len %d\n", len));
+ }
+
+ wsec = (wsec1 | wsec2);
+ wpa_auth = (wpa_auth1 | wpa_auth2);
+ WL_ERR(("wpa_wpa2 wsec=0x%X wpa_auth=0x%X\n", wsec, wpa_auth));
+
+ /* set auth */
+ err = wldev_iovar_setint_bsscfg(dev, "auth", auth, bssidx);
+ if (err < 0) {
+ WL_ERR(("auth error %d\n", err));
+ return BCME_ERROR;
+ }
+ /* set wsec */
+ err = wldev_iovar_setint_bsscfg(dev, "wsec", wsec, bssidx);
+ if (err < 0) {
+ WL_ERR(("wsec error %d\n", err));
+ return BCME_ERROR;
+ }
+ /* set upper-layer auth */
+ err = wldev_iovar_setint_bsscfg(dev, "wpa_auth", wpa_auth, bssidx);
+ if (err < 0) {
+ WL_ERR(("wpa_auth error %d\n", err));
+ return BCME_ERROR;
+ }
+exit:
+ return 0;
+}
+#endif /* SUPPORT_SOFTAP_WPAWPA2_MIXED */
static s32
wl_cfg80211_bcn_validate_sec(
@@ -7231,7 +11537,7 @@
s32 bssidx,
bool privacy)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
wl_cfgbss_t *bss = wl_get_cfgbss_by_wdev(cfg, dev->ieee80211_ptr);
if (!bss) {
@@ -7250,6 +11556,15 @@
WL_DBG(("SoftAP: validating security"));
/* If wpa2_ie or wpa_ie is present validate it */
+#if defined(SUPPORT_SOFTAP_WPAWPA2_MIXED)
+ if ((ies->wpa_ie != NULL && ies->wpa2_ie != NULL)) {
+ if (wl_validate_wpaie_wpa2ie(dev, ies->wpa_ie, ies->wpa2_ie, bssidx) < 0) {
+ bss->security_mode = false;
+ return BCME_ERROR;
+ }
+ }
+ else {
+#endif /* SUPPORT_SOFTAP_WPAWPA2_MIXED */
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))) {
@@ -7257,39 +11572,79 @@
return BCME_ERROR;
}
+ if (ies->fils_ind_ie &&
+ (wl_validate_fils_ind_ie(dev, ies->fils_ind_ie, bssidx) < 0)) {
+ bss->security_mode = false;
+ return BCME_ERROR;
+ }
+
bss->security_mode = true;
if (bss->rsn_ie) {
- kfree(bss->rsn_ie);
+ MFREE(cfg->osh, bss->rsn_ie, bss->rsn_ie[1]
+ + WPA_RSN_IE_TAG_FIXED_LEN);
bss->rsn_ie = NULL;
}
if (bss->wpa_ie) {
- kfree(bss->wpa_ie);
+ MFREE(cfg->osh, bss->wpa_ie, bss->wpa_ie[1]
+ + WPA_RSN_IE_TAG_FIXED_LEN);
bss->wpa_ie = NULL;
}
if (bss->wps_ie) {
- kfree(bss->wps_ie);
+ MFREE(cfg->osh, bss->wps_ie, bss->wps_ie[1] + 2);
bss->wps_ie = NULL;
+ }
+ if (bss->fils_ind_ie) {
+ MFREE(cfg->osh, bss->fils_ind_ie, bss->fils_ind_ie[1]
+ + FILS_INDICATION_IE_TAG_FIXED_LEN);
}
if (ies->wpa_ie != NULL) {
/* WPAIE */
bss->rsn_ie = NULL;
- bss->wpa_ie = kmemdup(ies->wpa_ie,
- ies->wpa_ie->length + WPA_RSN_IE_TAG_FIXED_LEN,
- GFP_KERNEL);
+ bss->wpa_ie = MALLOCZ(cfg->osh,
+ ies->wpa_ie->length
+ + WPA_RSN_IE_TAG_FIXED_LEN);
+ if (bss->wpa_ie) {
+ memcpy(bss->wpa_ie, ies->wpa_ie,
+ ies->wpa_ie->length
+ + WPA_RSN_IE_TAG_FIXED_LEN);
+ }
} else if (ies->wpa2_ie != NULL) {
/* RSNIE */
bss->wpa_ie = NULL;
- bss->rsn_ie = kmemdup(ies->wpa2_ie,
- ies->wpa2_ie->len + WPA_RSN_IE_TAG_FIXED_LEN,
- GFP_KERNEL);
+ bss->rsn_ie = MALLOCZ(cfg->osh,
+ ies->wpa2_ie->len
+ + WPA_RSN_IE_TAG_FIXED_LEN);
+ if (bss->rsn_ie) {
+ memcpy(bss->rsn_ie, ies->wpa2_ie,
+ ies->wpa2_ie->len
+ + WPA_RSN_IE_TAG_FIXED_LEN);
+ }
}
+#ifdef WL_FILS
+ if (ies->fils_ind_ie) {
+ bss->fils_ind_ie = MALLOCZ(cfg->osh,
+ ies->fils_ind_ie->len
+ + FILS_INDICATION_IE_TAG_FIXED_LEN);
+ if (bss->fils_ind_ie) {
+ memcpy(bss->fils_ind_ie, ies->fils_ind_ie,
+ ies->fils_ind_ie->len
+ + FILS_INDICATION_IE_TAG_FIXED_LEN);
+ }
+ }
+#endif /* WL_FILS */
+#if defined(SUPPORT_SOFTAP_WPAWPA2_MIXED)
+ }
+#endif /* SUPPORT_SOFTAP_WPAWPA2_MIXED */
if (!ies->wpa2_ie && !ies->wpa_ie) {
wl_validate_opensecurity(dev, bssidx, privacy);
bss->security_mode = false;
}
if (ies->wps_ie) {
- bss->wps_ie = kmemdup(ies->wps_ie, ies->wps_ie_len, GFP_KERNEL);
+ bss->wps_ie = MALLOCZ(cfg->osh, ies->wps_ie_len);
+ if (bss->wps_ie) {
+ memcpy(bss->wps_ie, ies->wps_ie, ies->wps_ie_len);
+ }
}
}
@@ -7297,66 +11652,60 @@
}
-#if (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 bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
s32 err = BCME_OK;
WL_DBG(("interval (%d) \ndtim_period (%d) \n",
info->beacon_interval, info->dtim_period));
if (info->beacon_interval) {
- if ((err = wldev_ioctl(dev, WLC_SET_BCNPRD,
- &info->beacon_interval, sizeof(s32), true)) < 0) {
+ if ((err = wldev_ioctl_set(dev, WLC_SET_BCNPRD,
+ &info->beacon_interval, sizeof(s32))) < 0) {
WL_ERR(("Beacon Interval Set Error, %d\n", err));
return err;
}
}
if (info->dtim_period) {
- if ((err = wldev_ioctl(dev, WLC_SET_DTIMPRD,
- &info->dtim_period, sizeof(s32), true)) < 0) {
+ if ((err = wldev_ioctl_set(dev, WLC_SET_DTIMPRD,
+ &info->dtim_period, sizeof(s32))) < 0) {
WL_ERR(("DTIM Interval Set Error, %d\n", err));
return err;
}
}
if ((info->ssid) && (info->ssid_len > 0) &&
- (info->ssid_len <= 32)) {
+ (info->ssid_len <= DOT11_MAX_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(cfg->hostapd_ssid.SSID, 0x00, 32);
+ bzero(cfg->hostapd_ssid.SSID, DOT11_MAX_SSID_LEN);
memcpy(cfg->hostapd_ssid.SSID, info->ssid, info->ssid_len);
- cfg->hostapd_ssid.SSID_len = info->ssid_len;
+ cfg->hostapd_ssid.SSID_len = (uint32)info->ssid_len;
} else {
/* P2P GO */
- memset(cfg->p2p->ssid.SSID, 0x00, 32);
+ bzero(cfg->p2p->ssid.SSID, DOT11_MAX_SSID_LEN);
memcpy(cfg->p2p->ssid.SSID, info->ssid, info->ssid_len);
- cfg->p2p->ssid.SSID_len = info->ssid_len;
+ cfg->p2p->ssid.SSID_len = (uint32)info->ssid_len;
}
- }
-
- if (info->hidden_ssid) {
- if ((err = wldev_iovar_setint(dev, "closednet", 1)) < 0)
- WL_ERR(("failed to set hidden : %d\n", err));
- WL_DBG(("hidden_ssid_enum_val: %d \n", info->hidden_ssid));
}
return err;
}
-#endif
+#endif /* LINUX_VERSION >= VERSION(3,4,0) || WL_COMPAT_WIRELESS */
static s32
-wl_cfg80211_parse_ies(u8 *ptr, u32 len, struct parsed_ies *ies)
+wl_cfg80211_parse_ies(const u8 *ptr, u32 len, struct parsed_ies *ies)
{
s32 err = BCME_OK;
- memset(ies, 0, sizeof(struct parsed_ies));
+ bzero(ies, sizeof(struct parsed_ies));
/* find the WPSIE */
if ((ies->wps_ie = wl_cfgp2p_find_wpsie(ptr, len)) != NULL) {
@@ -7373,6 +11722,13 @@
ies->wpa2_ie_len = ies->wpa2_ie->len;
}
+ /* find the FILS_IND_IE */
+ if ((ies->fils_ind_ie = bcm_parse_tlvs(ptr, len,
+ DOT11_MNG_FILS_IND_ID)) != NULL) {
+ WL_DBG((" FILS IND IE found\n"));
+ ies->fils_ind_ie_len = ies->fils_ind_ie->len;
+ }
+
/* find the WPA_IE */
if ((ies->wpa_ie = wl_cfgp2p_find_wpaie(ptr, len)) != NULL) {
WL_DBG((" WPA found\n"));
@@ -7382,43 +11738,152 @@
return err;
}
+static s32
+wl_cfg80211_set_ap_role(
+ struct bcm_cfg80211 *cfg,
+ struct net_device *dev)
+{
+ s32 err = BCME_OK;
+ s32 infra = 1;
+ s32 ap = 0;
+ s32 pm;
+ s32 bssidx;
+ s32 apsta = 0;
+ if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
+ WL_ERR(("Find p2p index from wdev(%p) failed\n", dev->ieee80211_ptr));
+ return -EINVAL;
+ }
+
+ WL_INFORM_MEM(("[%s] Bringup SoftAP on bssidx:%d \n", dev->name, bssidx));
+
+ if ((err = wl_cfg80211_add_del_bss(cfg, dev, bssidx,
+ WL_IF_TYPE_AP, 0, NULL)) < 0) {
+ WL_ERR(("wl add_del_bss returned error:%d\n", err));
+ return err;
+ }
+
+ /*
+ * For older chips, "bss" iovar does not support
+ * bsscfg role change/upgradation, and still
+ * return BCME_OK on attempt
+ * Hence, below traditional way to handle the same
+ */
+
+ if ((err = wldev_ioctl_get(dev,
+ WLC_GET_AP, &ap, sizeof(s32))) < 0) {
+ WL_ERR(("Getting AP mode failed %d \n", err));
+ return err;
+ }
+
+ if (!ap) {
+ /* AP mode switch not supported. Try setting up AP explicitly */
+ err = wldev_iovar_getint(dev, "apsta", (s32 *)&apsta);
+ if (unlikely(err)) {
+ WL_ERR(("Could not get apsta %d\n", err));
+ return err;
+ }
+ if (apsta == 0) {
+ /* If apsta is not set, set it */
+
+ /* Check for any connected interfaces before wl down */
+ if (wl_get_drv_status_all(cfg, CONNECTED) > 0) {
+ WL_ERR(("Concurrent i/f operational. can't do wl down"));
+ return BCME_ERROR;
+ }
+ err = wldev_ioctl_set(dev, WLC_DOWN, &ap, sizeof(s32));
+ if (err < 0) {
+ WL_ERR(("WLC_DOWN error %d\n", err));
+ return err;
+ }
+ err = wldev_iovar_setint(dev, "apsta", 1);
+ if (err < 0) {
+ WL_ERR(("wl apsta 0 error %d\n", err));
+ return err;
+ }
+ ap = 1;
+ if ((err = wldev_ioctl_set(dev,
+ WLC_SET_AP, &ap, sizeof(s32))) < 0) {
+ WL_ERR(("setting AP mode failed %d \n", err));
+ return err;
+ }
+ }
+ }
+
+ if (bssidx == 0) {
+ pm = 0;
+ if ((err = wldev_ioctl_set(dev, WLC_SET_PM, &pm, sizeof(pm))) != 0) {
+ WL_ERR(("wl PM 0 returned error:%d\n", err));
+ /* Ignore error, if any */
+ err = BCME_OK;
+ }
+ err = wldev_ioctl_set(dev, WLC_SET_INFRA, &infra, sizeof(s32));
+ if (err < 0) {
+ WL_ERR(("SET INFRA error %d\n", err));
+ return err;
+ }
+ }
+
+ /* On success, mark AP creation in progress. */
+ wl_set_drv_status(cfg, AP_CREATING, dev);
+ return 0;
+}
+
+/* In RSDB downgrade cases, the link up event can get delayed upto 7-8 secs */
+#define MAX_AP_LINK_WAIT_TIME 10000
static s32
wl_cfg80211_bcn_bringup_ap(
struct net_device *dev,
struct parsed_ies *ies,
u32 dev_role, s32 bssidx)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
struct wl_join_params join_params;
bool is_bssup = false;
s32 infra = 1;
s32 join_params_size = 0;
- s32 ap = 1;
- s32 pm;
s32 wsec;
+#ifdef DISABLE_11H_SOFTAP
+ s32 spect = 0;
+#endif /* DISABLE_11H_SOFTAP */
+#ifdef SOFTAP_UAPSD_OFF
+ uint32 wme_apsd = 0;
+#endif /* SOFTAP_UAPSD_OFF */
s32 err = BCME_OK;
s32 is_rsdb_supported = BCME_ERROR;
+ long timeout;
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
+#ifndef IGUANA_LEGACY_CHIPS
+ s32 ap = 1;
+#endif // endif
is_rsdb_supported = DHD_OPMODE_SUPPORTED(cfg->pub, DHD_FLAG_RSDB_MODE);
if (is_rsdb_supported < 0)
return (-ENODEV);
- WL_DBG(("Enter dev_role:%d bssidx:%d\n", dev_role, bssidx));
+ WL_DBG(("Enter dev_role:%d bssidx:%d ifname:%s\n", dev_role, bssidx, dev->name));
/* Common code for SoftAP and P2P GO */
- wldev_iovar_setint(dev, "mpc", 0);
+ wl_clr_drv_status(cfg, AP_CREATED, dev);
+
+ /* Make sure INFRA is set for AP/GO */
+ err = wldev_ioctl_set(dev, WLC_SET_INFRA, &infra, sizeof(s32));
+ if (err < 0) {
+ WL_ERR(("SET INFRA error %d\n", err));
+ goto exit;
+ }
+
+ /* Do abort scan before creating GO */
+ wl_cfg80211_scan_abort(cfg);
if (dev_role == NL80211_IFTYPE_P2P_GO) {
- is_bssup = wl_cfgp2p_bss_isup(dev, bssidx);
+ is_bssup = wl_cfg80211_bss_isup(dev, bssidx);
if (!is_bssup && (ies->wpa2_ie != NULL)) {
-
- err = wldev_ioctl(dev, WLC_SET_INFRA, &infra, sizeof(s32), true);
+ err = wldev_iovar_setint_bsscfg(dev, "mpc", 0, bssidx);
if (err < 0) {
- WL_ERR(("SET INFRA error %d\n", err));
+ WL_ERR(("MPC setting failed, ret=%d\n", err));
goto exit;
}
-
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);
@@ -7427,78 +11892,101 @@
goto exit;
}
- /* Do abort scan before creating GO */
- wl_cfg80211_scan_abort(cfg);
+#ifdef MFP
+ err = wldev_iovar_setint_bsscfg(dev, "mfp", cfg->mfp_mode, bssidx);
+ if (err < 0) {
+ WL_ERR(("MFP Setting failed. ret = %d \n", err));
+ /* If fw doesn't support mfp, Ignore the error */
+ if (err != BCME_UNSUPPORTED) {
+ goto exit;
+ }
+ }
+#endif /* MFP */
- if ((err = wl_cfgp2p_bss(cfg, dev, bssidx, 1)) < 0) {
+ if ((err = wl_cfg80211_bss_up(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(cfg, AP_CREATING, dev))) {
- /* Device role SoftAP */
+ } else if (dev_role == NL80211_IFTYPE_AP) {
- WL_DBG(("Creating AP bssidx:%d dev_role:%d\n", bssidx, dev_role));
-
- if (bssidx == 0) {
- /* AP on primary Interface */
- if (is_rsdb_supported) {
- if ((err = wl_cfg80211_add_del_bss(cfg, dev, bssidx,
- NL80211_IFTYPE_AP, 0, NULL)) < 0) {
- WL_ERR(("wl add_del_bss returned error:%d\n", err));
- goto exit;
- }
- } else if (is_rsdb_supported == 0) {
- /* AP mode switch not supported. Try setting up AP explicitly */
- err = wldev_ioctl(dev, WLC_DOWN, &ap, sizeof(s32), true);
- if (err < 0) {
- WL_ERR(("WLC_DOWN error %d\n", err));
- goto exit;
- }
- err = wldev_iovar_setint(dev, "apsta", 0);
- if (err < 0) {
- WL_ERR(("wl apsta 0 error %d\n", err));
- goto exit;
- }
-
- if ((err = wldev_ioctl(dev,
- WLC_SET_AP, &ap, sizeof(s32), true)) < 0) {
- WL_ERR(("setting AP mode failed %d \n", err));
- goto exit;
- }
-
- }
-
- pm = 0;
- if ((err = wldev_ioctl(dev, WLC_SET_PM, &pm, sizeof(pm), true)) != 0) {
- WL_ERR(("wl PM 0 returned error:%d\n", err));
+ if (!wl_get_drv_status(cfg, AP_CREATING, dev)) {
+ /* Make sure fw is in proper state */
+ err = wl_cfg80211_set_ap_role(cfg, dev);
+ if (unlikely(err)) {
+ WL_ERR(("set ap role failed!\n"));
goto exit;
}
-
- err = wldev_ioctl(dev, WLC_SET_INFRA, &infra, sizeof(s32), true);
- if (err < 0) {
- WL_ERR(("SET INFRA error %d\n", err));
- goto exit;
- }
- } else if (cfg->cfgdev_bssidx && (bssidx == cfg->cfgdev_bssidx)) {
-
- WL_DBG(("Bringup SoftAP on virtual Interface bssidx:%d \n", bssidx));
-
- if ((err = wl_cfg80211_add_del_bss(cfg, dev,
- bssidx, NL80211_IFTYPE_AP, 0, NULL)) < 0) {
- WL_ERR(("wl bss ap returned error:%d\n", err));
- goto exit;
- }
-
}
- err = wldev_ioctl(dev, WLC_UP, &ap, sizeof(s32), true);
+ /* Device role SoftAP */
+ WL_DBG(("Creating AP bssidx:%d dev_role:%d\n", bssidx, dev_role));
+ /* Clear the status bit after use */
+ wl_clr_drv_status(cfg, AP_CREATING, dev);
+
+#ifdef DISABLE_11H_SOFTAP
+ if (is_rsdb_supported == 0) {
+ err = wldev_ioctl_set(dev, WLC_DOWN, &ap, sizeof(s32));
+ if (err < 0) {
+ WL_ERR(("WLC_DOWN error %d\n", err));
+ goto exit;
+ }
+ }
+ err = wldev_ioctl_set(dev, WLC_SET_SPECT_MANAGMENT,
+ &spect, sizeof(s32));
+ if (err < 0) {
+ WL_ERR(("SET SPECT_MANAGMENT error %d\n", err));
+ goto exit;
+ }
+#endif /* DISABLE_11H_SOFTAP */
+
+#ifdef WL_DISABLE_HE_SOFTAP
+ err = wl_cfg80211_set_he_mode(dev, cfg, bssidx, WL_IF_TYPE_AP, FALSE);
+ if (err < 0) {
+ WL_ERR(("failed to set he features, error=%d\n", err));
+ }
+#endif /* WL_DISABLE_HE_SOFTAP */
+
+#ifdef SOFTAP_UAPSD_OFF
+ err = wldev_iovar_setbuf_bsscfg(dev, "wme_apsd", &wme_apsd, sizeof(wme_apsd),
+ cfg->ioctl_buf, WLC_IOCTL_SMLEN, bssidx, &cfg->ioctl_buf_sync);
+ if (err < 0) {
+ WL_ERR(("failed to disable uapsd, error=%d\n", err));
+ }
+#endif /* SOFTAP_UAPSD_OFF */
+#ifndef IGUANA_LEGACY_CHIPS
+ err = wldev_ioctl_set(dev, WLC_UP, &ap, sizeof(s32));
if (unlikely(err)) {
WL_ERR(("WLC_UP error (%d)\n", err));
goto exit;
}
+#endif // endif
+#ifdef MFP
+ if (cfg->bip_pos) {
+ err = wldev_iovar_setbuf_bsscfg(dev, "bip",
+ (const void *)(cfg->bip_pos), WPA_SUITE_LEN, cfg->ioctl_buf,
+ WLC_IOCTL_SMLEN, bssidx, &cfg->ioctl_buf_sync);
+ if (err < 0) {
+ WL_ERR(("bip set error %d\n", err));
+#if defined(IGUANA_LEGACY_CHIPS)
+ if (wl_customer6_legacy_chip_check(cfg,
+ bcmcfg_to_prmry_ndev(cfg))) {
+ /* Ignore bip error: Some older firmwares doesn't
+ * support bip iovar/ return BCME_NOTUP while trying
+ * to set bip from AP bring up context. These firmares
+ * include bip in RSNIE by default. So its okay to ignore
+ * the error.
+ */
+ err = BCME_OK;
+ } else
+#endif // endif
+ {
+ goto exit;
+ }
+ }
+ }
+#endif /* MFP */
err = wldev_iovar_getint(dev, "wsec", (s32 *)&wsec);
if (unlikely(err)) {
@@ -7511,50 +11999,103 @@
sizeof(struct wl_wsec_key), cfg->ioctl_buf,
WLC_IOCTL_MAXLEN, bssidx, &cfg->ioctl_buf_sync);
/* clear the key after use */
- memset(&cfg->wep_key, 0, sizeof(struct wl_wsec_key));
+ bzero(&cfg->wep_key, sizeof(struct wl_wsec_key));
if (unlikely(err)) {
WL_ERR(("WLC_SET_KEY error (%d)\n", err));
goto exit;
}
}
- memset(&join_params, 0, sizeof(join_params));
- /* join parameters starts with ssid */
- join_params_size = sizeof(join_params.ssid);
- 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(cfg, AP_CREATING, dev);
- wl_set_drv_status(cfg, AP_CREATED, dev);
- } else {
- WL_ERR(("SoftAP/GO set ssid failed! \n"));
- goto exit;
- }
-
- if (bssidx != 0) {
- /* AP on Virtual Interface */
- if ((err = wl_cfgp2p_bss(cfg, dev, bssidx, 1)) < 0) {
- WL_ERR(("Virtual AP Bring up error %d\n", err));
+#ifdef MFP
+ /* This needs to go after wsec otherwise the wsec command will
+ * overwrite the values set by MFP
+ */
+ err = wldev_iovar_setint_bsscfg(dev, "mfp", cfg->mfp_mode, bssidx);
+ if (err < 0) {
+ WL_ERR(("MFP Setting failed. ret = %d \n", err));
+ /* If fw doesn't support mfp, Ignore the error */
+ if (err != BCME_UNSUPPORTED) {
goto exit;
}
}
+#endif /* MFP */
+
+ bzero(&join_params, sizeof(join_params));
+ /* join parameters starts with ssid */
+ join_params_size = sizeof(join_params.ssid);
+ join_params.ssid.SSID_len = MIN(cfg->hostapd_ssid.SSID_len,
+ (uint32)DOT11_MAX_SSID_LEN);
+ memcpy(join_params.ssid.SSID, cfg->hostapd_ssid.SSID,
+ join_params.ssid.SSID_len);
+ join_params.ssid.SSID_len = htod32(join_params.ssid.SSID_len);
+
+ /* create softap */
+ if ((err = wldev_ioctl_set(dev, WLC_SET_SSID, &join_params,
+ join_params_size)) != 0) {
+ WL_ERR(("SoftAP/GO set ssid failed! \n"));
+ goto exit;
+ } else {
+ WL_DBG((" SoftAP SSID \"%s\" \n", join_params.ssid.SSID));
+ }
+
+ if ((err = wl_cfg80211_bss_up(cfg, dev, bssidx, 1)) < 0) {
+ WL_ERR(("AP Bring up error %d\n", err));
+ goto exit;
+ }
+
+ } else {
+ WL_ERR(("Wrong interface type %d\n", dev_role));
+ goto exit;
}
- /* Mark AP/GO iface status to connected */
- wl_set_drv_status(cfg, CONNECTED, dev);
+ /* Wait for Linkup event to mark successful AP/GO bring up */
+ timeout = wait_event_interruptible_timeout(cfg->netif_change_event,
+ wl_get_drv_status(cfg, AP_CREATED, dev), msecs_to_jiffies(MAX_AP_LINK_WAIT_TIME));
+ if (timeout <= 0 || !wl_get_drv_status(cfg, AP_CREATED, dev)) {
+ WL_ERR(("Link up didn't come for AP interface. AP/GO creation failed! \n"));
+ if (timeout == -ERESTARTSYS) {
+ WL_ERR(("waitqueue was interrupted by a signal, returns -ERESTARTSYS\n"));
+ err = -ERESTARTSYS;
+ goto exit;
+ }
+ if (dhd_query_bus_erros(dhdp)) {
+ err = -ENODEV;
+ goto exit;
+ }
+ dhdp->iface_op_failed = TRUE;
+#if defined(DHD_DEBUG) && defined(DHD_FW_COREDUMP)
+ if (dhdp->memdump_enabled) {
+ dhdp->memdump_type = DUMP_TYPE_AP_LINKUP_FAILURE;
+ dhd_bus_mem_dump(dhdp);
+ }
+#endif /* DHD_DEBUG && DHD_FW_COREDUMP */
+ err = -ENODEV;
+ goto exit;
+ }
+ SUPP_LOG(("AP/GO Link up\n"));
exit:
- if (cfg->wep_key.len)
- memset(&cfg->wep_key, 0, sizeof(struct wl_wsec_key));
+ if (cfg->wep_key.len) {
+ bzero(&cfg->wep_key, sizeof(struct wl_wsec_key));
+ }
+
+#ifdef MFP
+ if (cfg->mfp_mode) {
+ cfg->mfp_mode = 0;
+ }
+
+ if (cfg->bip_pos) {
+ cfg->bip_pos = NULL;
+ }
+#endif /* MFP */
+
+ if (err) {
+ SUPP_LOG(("AP/GO bring up fail. err:%d\n", err));
+ }
return err;
}
-#if (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,
@@ -7562,40 +12103,38 @@
struct parsed_ies *ies)
{
struct parsed_ies prb_ies;
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
- u8 *vndr = NULL;
+ const u8 *vndr = NULL;
u32 vndr_ie_len = 0;
s32 err = BCME_OK;
/* Parse Beacon IEs */
- if (wl_cfg80211_parse_ies((u8 *)info->tail,
+ if (wl_cfg80211_parse_ies((const u8 *)info->tail,
info->tail_len, ies) < 0) {
WL_ERR(("Beacon get IEs failed \n"));
err = -EINVAL;
goto fail;
}
- vndr = (u8 *)info->proberesp_ies;
- vndr_ie_len = info->proberesp_ies_len;
+ vndr = (const u8 *)info->proberesp_ies;
+ vndr_ie_len = (uint32)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;
+ const struct ieee80211_mgmt *mgmt;
+ mgmt = (const struct ieee80211_mgmt *)info->probe_resp;
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);
+ vndr = (const u8 *)&mgmt->u.probe_resp.variable;
+ vndr_ie_len = (uint32)(info->probe_resp_len -
+ offsetof(const struct ieee80211_mgmt, u.probe_resp.variable));
}
}
-
/* Parse Probe Response IEs */
- if (wl_cfg80211_parse_ies(vndr, vndr_ie_len, &prb_ies) < 0) {
+ if (wl_cfg80211_parse_ies((const u8 *)vndr, vndr_ie_len, &prb_ies) < 0) {
WL_ERR(("PROBE RESP get IEs failed \n"));
err = -EINVAL;
}
-
fail:
return err;
@@ -7607,9 +12146,9 @@
struct cfg80211_beacon_data *info,
s32 bssidx)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
- u8 *vndr = NULL;
+ const u8 *vndr = NULL;
u32 vndr_ie_len = 0;
s32 err = BCME_OK;
@@ -7622,31 +12161,42 @@
WL_DBG(("Applied Vndr IEs for Beacon \n"));
}
- vndr = (u8 *)info->proberesp_ies;
- vndr_ie_len = info->proberesp_ies_len;
+ vndr = (const u8 *)info->proberesp_ies;
+ vndr_ie_len = (uint32)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;
+ const struct ieee80211_mgmt *mgmt;
+ mgmt = (const struct ieee80211_mgmt *)info->probe_resp;
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);
+ vndr = (const u8 *)&mgmt->u.probe_resp.variable;
+ vndr_ie_len = (uint32)(info->probe_resp_len -
+ offsetof(struct ieee80211_mgmt, u.probe_resp.variable));
}
}
/* Set Probe Response IEs to FW */
if ((err = wl_cfg80211_set_mgmt_vndr_ies(cfg, ndev_to_cfgdev(dev), bssidx,
VNDR_IE_PRBRSP_FLAG, vndr, vndr_ie_len)) < 0) {
- WL_ERR(("Set Probe Resp IE Failed \n"));
+ WL_ERR(("Set Probe Resp Vndr IE Failed \n"));
} else {
WL_DBG(("Applied Vndr IEs for Probe Resp \n"));
}
+ /* Set Assoc Response IEs to FW */
+ vndr = (const u8 *)info->assocresp_ies;
+ vndr_ie_len = (uint32)info->assocresp_ies_len;
+
+ if ((err = wl_cfg80211_set_mgmt_vndr_ies(cfg, ndev_to_cfgdev(dev), bssidx,
+ VNDR_IE_ASSOCRSP_FLAG, vndr, vndr_ie_len)) < 0) {
+ WL_ERR(("Set Assoc Resp Vndr IE Failed \n"));
+ } else {
+ WL_DBG(("Applied Vndr IEs for Assoc Resp \n"));
+ }
+
return err;
}
-#endif
+#endif /* LINUX_VERSION >= VERSION(3,4,0) || WL_COMPAT_WIRELESS */
static s32 wl_cfg80211_hostapd_sec(
struct net_device *dev,
@@ -7654,7 +12204,7 @@
s32 bssidx)
{
bool update_bss = 0;
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
wl_cfgbss_t *bss = wl_get_cfgbss_by_wdev(cfg, dev->ieee80211_ptr);
if (!bss) {
@@ -7666,54 +12216,171 @@
if (bss->wps_ie &&
memcmp(bss->wps_ie, ies->wps_ie, ies->wps_ie_len)) {
WL_DBG((" WPS IE is changed\n"));
- kfree(bss->wps_ie);
- bss->wps_ie = kmemdup(ies->wps_ie, ies->wps_ie_len, GFP_KERNEL);
+ MFREE(cfg->osh, bss->wps_ie, bss->wps_ie[1] + 2);
+ bss->wps_ie = MALLOCZ(cfg->osh, ies->wps_ie_len);
+ if (bss->wps_ie) {
+ memcpy(bss->wps_ie, ies->wps_ie, ies->wps_ie_len);
+ }
} else if (bss->wps_ie == NULL) {
WL_DBG((" WPS IE is added\n"));
- bss->wps_ie = kmemdup(ies->wps_ie, ies->wps_ie_len, GFP_KERNEL);
+ bss->wps_ie = MALLOCZ(cfg->osh, ies->wps_ie_len);
+ if (bss->wps_ie) {
+ memcpy(bss->wps_ie, ies->wps_ie, ies->wps_ie_len);
+ }
}
+#if defined(SUPPORT_SOFTAP_WPAWPA2_MIXED)
+ if (ies->wpa_ie != NULL && ies->wpa2_ie != NULL) {
+ WL_ERR(("update bss - wpa_ie and wpa2_ie is not null\n"));
+ if (!bss->security_mode) {
+ /* change from open mode to security mode */
+ update_bss = true;
+ bss->wpa_ie = MALLOCZ(cfg->osh,
+ ies->wpa_ie->length + WPA_RSN_IE_TAG_FIXED_LEN);
+ if (bss->wpa_ie) {
+ memcpy(bss->wpa_ie, ies->wpa_ie,
+ ies->wpa_ie->length + WPA_RSN_IE_TAG_FIXED_LEN);
+ }
+ bss->rsn_ie = MALLOCZ(cfg->osh,
+ ies->wpa2_ie->len + WPA_RSN_IE_TAG_FIXED_LEN);
+ if (bss->rsn_ie) {
+ memcpy(bss->rsn_ie, ies->wpa2_ie,
+ ies->wpa2_ie->len + WPA_RSN_IE_TAG_FIXED_LEN);
+ }
+ } else {
+ /* change from (WPA or WPA2 or WPA/WPA2) to WPA/WPA2 mixed mode */
+ if (bss->wpa_ie) {
+ if (memcmp(bss->wpa_ie,
+ ies->wpa_ie, ies->wpa_ie->length +
+ WPA_RSN_IE_TAG_FIXED_LEN)) {
+ MFREE(cfg->osh, bss->wpa_ie,
+ bss->wpa_ie[1] + WPA_RSN_IE_TAG_FIXED_LEN);
+ update_bss = true;
+ bss->wpa_ie = MALLOCZ(cfg->osh,
+ ies->wpa_ie->length
+ + WPA_RSN_IE_TAG_FIXED_LEN);
+ if (bss->wpa_ie) {
+ memcpy(bss->wpa_ie, ies->wpa_ie,
+ ies->wpa_ie->length
+ + WPA_RSN_IE_TAG_FIXED_LEN);
+ }
+ }
+ }
+ else {
+ update_bss = true;
+ bss->wpa_ie = MALLOCZ(cfg->osh,
+ ies->wpa_ie->length + WPA_RSN_IE_TAG_FIXED_LEN);
+ if (bss->wpa_ie) {
+ memcpy(bss->wpa_ie, ies->wpa_ie,
+ ies->wpa_ie->length
+ + WPA_RSN_IE_TAG_FIXED_LEN);
+ }
+ }
+ if (bss->rsn_ie) {
+ if (memcmp(bss->rsn_ie,
+ ies->wpa2_ie,
+ ies->wpa2_ie->len + WPA_RSN_IE_TAG_FIXED_LEN)) {
+ update_bss = true;
+ MFREE(cfg->osh, bss->rsn_ie,
+ bss->rsn_ie[1] + WPA_RSN_IE_TAG_FIXED_LEN);
+ bss->rsn_ie = MALLOCZ(cfg->osh,
+ ies->wpa2_ie->len
+ + WPA_RSN_IE_TAG_FIXED_LEN);
+ if (bss->rsn_ie) {
+ memcpy(bss->rsn_ie, ies->wpa2_ie,
+ ies->wpa2_ie->len
+ + WPA_RSN_IE_TAG_FIXED_LEN);
+ }
+ }
+ }
+ else {
+ update_bss = true;
+ bss->rsn_ie = MALLOCZ(cfg->osh,
+ ies->wpa2_ie->len
+ + WPA_RSN_IE_TAG_FIXED_LEN);
+ if (bss->rsn_ie) {
+ memcpy(bss->rsn_ie, ies->wpa2_ie,
+ ies->wpa2_ie->len
+ + WPA_RSN_IE_TAG_FIXED_LEN);
+ }
+ }
+ }
+ WL_ERR(("update_bss=%d\n", update_bss));
+ if (update_bss) {
+ bss->security_mode = true;
+ wl_cfg80211_bss_up(cfg, dev, bssidx, 0);
+ if (wl_validate_wpaie_wpa2ie(dev, ies->wpa_ie,
+ ies->wpa2_ie, bssidx) < 0) {
+ return BCME_ERROR;
+ }
+ wl_cfg80211_bss_up(cfg, dev, bssidx, 1);
+ }
+
+ }
+ else
+#endif /* SUPPORT_SOFTAP_WPAWPA2_MIXED */
if ((ies->wpa_ie != NULL || ies->wpa2_ie != NULL)) {
if (!bss->security_mode) {
/* change from open mode to security mode */
update_bss = true;
if (ies->wpa_ie != NULL) {
- bss->wpa_ie = kmemdup(ies->wpa_ie,
- ies->wpa_ie->length + WPA_RSN_IE_TAG_FIXED_LEN,
- GFP_KERNEL);
+ bss->wpa_ie = MALLOCZ(cfg->osh,
+ ies->wpa_ie->length + WPA_RSN_IE_TAG_FIXED_LEN);
+ if (bss->wpa_ie) {
+ memcpy(bss->wpa_ie,
+ ies->wpa_ie,
+ ies->wpa_ie->length
+ + WPA_RSN_IE_TAG_FIXED_LEN);
+ }
} else {
- bss->rsn_ie = kmemdup(ies->wpa2_ie,
- ies->wpa2_ie->len + WPA_RSN_IE_TAG_FIXED_LEN,
- GFP_KERNEL);
+ bss->rsn_ie = MALLOCZ(cfg->osh,
+ ies->wpa2_ie->len + WPA_RSN_IE_TAG_FIXED_LEN);
+ if (bss->rsn_ie) {
+ memcpy(bss->rsn_ie,
+ ies->wpa2_ie,
+ ies->wpa2_ie->len
+ + WPA_RSN_IE_TAG_FIXED_LEN);
+ }
}
} else if (bss->wpa_ie) {
/* change from WPA2 mode to WPA mode */
if (ies->wpa_ie != NULL) {
update_bss = true;
- kfree(bss->rsn_ie);
- bss->rsn_ie = NULL;
- bss->wpa_ie = kmemdup(ies->wpa_ie,
- ies->wpa_ie->length + WPA_RSN_IE_TAG_FIXED_LEN,
- GFP_KERNEL);
+ MFREE(cfg->osh, bss->rsn_ie,
+ bss->rsn_ie[1] + WPA_RSN_IE_TAG_FIXED_LEN);
+ bss->wpa_ie = MALLOCZ(cfg->osh,
+ ies->wpa_ie->length + WPA_RSN_IE_TAG_FIXED_LEN);
+ if (bss->wpa_ie) {
+ memcpy(bss->wpa_ie,
+ ies->wpa_ie,
+ ies->wpa_ie->length
+ + WPA_RSN_IE_TAG_FIXED_LEN);
+ }
} else if (memcmp(bss->rsn_ie,
ies->wpa2_ie, ies->wpa2_ie->len
+ WPA_RSN_IE_TAG_FIXED_LEN)) {
update_bss = true;
- kfree(bss->rsn_ie);
- bss->rsn_ie = kmemdup(ies->wpa2_ie,
- ies->wpa2_ie->len + WPA_RSN_IE_TAG_FIXED_LEN,
- GFP_KERNEL);
+ MFREE(cfg->osh, bss->rsn_ie,
+ bss->rsn_ie[1] + WPA_RSN_IE_TAG_FIXED_LEN);
+ bss->rsn_ie = MALLOCZ(cfg->osh,
+ ies->wpa2_ie->len + WPA_RSN_IE_TAG_FIXED_LEN);
+ if (bss->rsn_ie) {
+ memcpy(bss->rsn_ie,
+ ies->wpa2_ie,
+ ies->wpa2_ie->len
+ + WPA_RSN_IE_TAG_FIXED_LEN);
+ }
bss->wpa_ie = NULL;
}
}
if (update_bss) {
bss->security_mode = true;
- wl_cfgp2p_bss(cfg, dev, bssidx, 0);
+ wl_cfg80211_bss_up(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(cfg, dev, bssidx, 1);
+ wl_cfg80211_bss_up(cfg, dev, bssidx, 1);
}
}
} else {
@@ -7755,8 +12422,10 @@
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0))
const u8 *mac_addr = params->mac;
+#ifdef CUSTOM_BLOCK_DEAUTH_AT_EAP_FAILURE
+ u16 rc = params->reason_code;
+#endif /* CUSTOM_BLOCK_DEAUTH_AT_EAP_FAILURE */
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) */
-
WL_DBG(("Entry\n"));
if (mac_addr == NULL) {
WL_DBG(("mac_addr is NULL ignore it\n"));
@@ -7776,22 +12445,53 @@
}
assoc_maclist->count = MAX_NUM_OF_ASSOCIATED_DEV;
- err = wldev_ioctl(ndev, WLC_GET_ASSOCLIST,
- assoc_maclist, sizeof(mac_buf), false);
+ err = wldev_ioctl_get(ndev, WLC_GET_ASSOCLIST,
+ assoc_maclist, sizeof(mac_buf));
if (err < 0)
WL_ERR(("WLC_GET_ASSOCLIST error %d\n", err));
else
num_associated = assoc_maclist->count;
memcpy(scb_val.ea.octet, mac_addr, ETHER_ADDR_LEN);
- scb_val.val = DOT11_RC_DEAUTH_LEAVING;
- err = wldev_ioctl(dev, WLC_SCB_DEAUTHENTICATE_FOR_REASON, &scb_val,
- sizeof(scb_val_t), true);
- if (err < 0)
- WL_ERR(("WLC_SCB_DEAUTHENTICATE_FOR_REASON err %d\n", err));
- WL_ERR(("Disconnect STA : %s scb_val.val %d\n",
- bcm_ether_ntoa((const struct ether_addr *)mac_addr, eabuf),
- scb_val.val));
+#ifdef CUSTOM_BLOCK_DEAUTH_AT_EAP_FAILURE
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0))
+ if (rc == DOT11_RC_8021X_AUTH_FAIL) {
+ WL_ERR(("deauth will be sent at F/W\n"));
+ scb_val.val = DOT11_RC_8021X_AUTH_FAIL;
+ } else {
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) */
+#endif /* CUSTOM_BLOCK_DEAUTH_AT_EAP_FAILURE */
+
+#ifdef WL_WPS_SYNC
+ if (wl_wps_session_update(ndev,
+ WPS_STATE_DISCONNECT_CLIENT, mac_addr) == BCME_UNSUPPORTED) {
+ /* Ignore disconnect command from upper layer */
+ WL_INFORM_MEM(("[WPS] Ignore client disconnect.\n"));
+ } else
+#endif /* WL_WPS_SYNC */
+ {
+
+ /* need to guarantee EAP-Failure send out before deauth */
+ dhd_wait_pend8021x(dev);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0))
+ scb_val.val = cpu_to_le32(params->reason_code);
+#else
+ scb_val.val = DOT11_RC_DEAUTH_LEAVING;
+#endif // endif
+ err = wldev_ioctl_set(dev, WLC_SCB_DEAUTHENTICATE_FOR_REASON, &scb_val,
+ sizeof(scb_val_t));
+ if (err < 0) {
+ WL_ERR(("WLC_SCB_DEAUTHENTICATE_FOR_REASON err %d\n", err));
+ }
+ WL_INFORM_MEM(("Disconnect STA : " MACDBG " scb_val.val %d\n",
+ MAC2STRDBG(bcm_ether_ntoa((const struct ether_addr *)mac_addr,
+ eabuf)), scb_val.val));
+ }
+#ifdef CUSTOM_BLOCK_DEAUTH_AT_EAP_FAILURE
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0))
+ }
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) */
+#endif /* CUSTOM_BLOCK_DEAUTH_AT_EAP_FAILURE */
if (num_associated > 0 && ETHER_ISBCAST(mac_addr))
wl_delay(400);
@@ -7813,16 +12513,24 @@
struct net_device *dev,
u8 *mac,
struct station_parameters *params)
-#endif
+#endif // endif
{
- int err;
-#ifdef DHD_LOSSLESS_ROAMING
+ int err = BCME_OK;
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
-#endif
+#ifdef WBTEXT
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
+#endif /* WBTEXT */
WL_DBG(("SCB_AUTHORIZE mac_addr:"MACDBG" sta_flags_mask:0x%x "
"sta_flags_set:0x%x iface:%s \n", MAC2STRDBG(mac),
params->sta_flags_mask, params->sta_flags_set, dev->name));
+
+ if ((wl_get_mode_by_netdev(cfg, dev) == WL_MODE_BSS) &&
+ !(wl_get_drv_status(cfg, CONNECTED, dev))) {
+ /* Return error indicating not in connected state */
+ WL_ERR(("Ignore SCB_AUTHORIZE/DEAUTHORIZE in non connected state\n"));
+ return -ENOTSUPP;
+ }
/* Processing only authorize/de-authorize flag for now */
if (!(params->sta_flags_mask & BIT(NL80211_STA_FLAG_AUTHORIZED))) {
@@ -7831,31 +12539,97 @@
}
if (!(params->sta_flags_set & BIT(NL80211_STA_FLAG_AUTHORIZED))) {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0))
- err = wldev_ioctl(dev, WLC_SCB_DEAUTHORIZE, (u8 *)mac, ETH_ALEN, true);
-#else
- err = wldev_ioctl(dev, WLC_SCB_DEAUTHORIZE, mac, ETH_ALEN, true);
-#endif
- if (err)
+ err = wldev_ioctl_set(dev, WLC_SCB_DEAUTHORIZE, mac, ETH_ALEN);
+ if (unlikely(err)) {
WL_ERR(("WLC_SCB_DEAUTHORIZE error (%d)\n", err));
+ } else {
+ WL_INFORM_MEM(("[%s] WLC_SCB_DEAUTHORIZE " MACDBG "\n",
+ dev->name, MAC2STRDBG(mac)));
+ }
return err;
}
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0))
- err = wldev_ioctl(dev, WLC_SCB_AUTHORIZE, (u8 *)mac, ETH_ALEN, true);
-#else
- err = wldev_ioctl(dev, WLC_SCB_AUTHORIZE, mac, ETH_ALEN, true);
-#endif
- if (err)
+ err = wldev_ioctl_set(dev, WLC_SCB_AUTHORIZE, mac, ETH_ALEN);
+ if (unlikely(err)) {
WL_ERR(("WLC_SCB_AUTHORIZE error (%d)\n", err));
+ } else {
+ WL_INFORM_MEM(("[%s] WLC_SCB_AUTHORIZE " MACDBG "\n",
+ dev->name, MAC2STRDBG(mac)));
+#ifdef WL_WPS_SYNC
+ wl_wps_session_update(dev, WPS_STATE_AUTHORIZE, mac);
+#endif /* WL_WPS_SYNC */
+ }
#ifdef DHD_LOSSLESS_ROAMING
wl_del_roam_timeout(cfg);
-#endif
+#endif // endif
+#ifdef WBTEXT
+ /* send nbr request or BTM query to update RCC
+ * after 4-way handshake is completed
+ */
+ if (dev->ieee80211_ptr->iftype == NL80211_IFTYPE_STATION &&
+ dhdp->wbtext_support) {
+ wl_cfg80211_wbtext_update_rcc(cfg, dev);
+ }
+#endif /* WBTEXT */
+
return err;
}
#endif /* WL_SUPPORT_BACKPORTED_KPATCHES || KERNEL_VER >= KERNEL_VERSION(3, 2, 0)) */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
+static s32
+wl_cfg80211_set_scb_timings(
+ struct bcm_cfg80211 *cfg,
+ struct net_device *dev)
+{
+ int err;
+ u32 ps_pretend;
+ wl_scb_probe_t scb_probe;
+ u32 ps_pretend_retries;
+
+ bzero(&scb_probe, sizeof(wl_scb_probe_t));
+ scb_probe.scb_timeout = WL_SCB_TIMEOUT;
+ scb_probe.scb_activity_time = WL_SCB_ACTIVITY_TIME;
+ scb_probe.scb_max_probe = WL_SCB_MAX_PROBE;
+ err = wldev_iovar_setbuf(dev, "scb_probe", (void *)&scb_probe,
+ sizeof(wl_scb_probe_t), cfg->ioctl_buf, WLC_IOCTL_SMLEN,
+ &cfg->ioctl_buf_sync);
+ if (unlikely(err)) {
+ WL_ERR(("set 'scb_probe' failed, error = %d\n", err));
+ return err;
+ }
+
+ ps_pretend_retries = WL_PSPRETEND_RETRY_LIMIT;
+ err = wldev_iovar_setint(dev, "pspretend_retry_limit", ps_pretend_retries);
+ if (unlikely(err)) {
+ if (err == BCME_UNSUPPORTED) {
+ /* Ignore error if fw doesn't support the iovar */
+ WL_DBG(("set 'pspretend_retry_limit %d' failed, error = %d\n",
+ ps_pretend_retries, err));
+ } else {
+ WL_ERR(("set 'pspretend_retry_limit %d' failed, error = %d\n",
+ ps_pretend_retries, err));
+ return err;
+ }
+ }
+
+ ps_pretend = MAX(WL_SCB_MAX_PROBE / 2, WL_MIN_PSPRETEND_THRESHOLD);
+ err = wldev_iovar_setint(dev, "pspretend_threshold", ps_pretend);
+ if (unlikely(err)) {
+ if (err == BCME_UNSUPPORTED) {
+ /* Ignore error if fw doesn't support the iovar */
+ WL_DBG(("wl pspretend_threshold %d set error %d\n",
+ ps_pretend, err));
+ } else {
+ WL_ERR(("wl pspretend_threshold %d set error %d\n",
+ ps_pretend, err));
+ return err;
+ }
+ }
+
+ return 0;
+}
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) || defined(WL_COMPAT_WIRELESS)
static s32
wl_cfg80211_start_ap(
struct wiphy *wiphy,
@@ -7868,33 +12642,51 @@
s32 bssidx = 0;
u32 dev_role = 0;
dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+#ifdef WL11U
+ bcm_tlv_t *interworking_ie;
+ u32 iw_ie_len = 0;
+ u8 iw_ie[IW_IES_MAX_BUF_LEN];
+#endif // endif
+#ifdef ENABLE_HOGSQS
+ struct ieee80211_channel *chan_h;
+#endif /* ENABLE_HOGSQS */
+
WL_DBG(("Enter \n"));
- if ((dev == bcmcfg_to_prmry_ndev(cfg)) ||
- (dev == ((struct net_device *)cfgdev_to_ndev(cfg->bss_cfgdev)))) {
- WL_DBG(("Start AP req on iface: %s \n", dev->name));
- dev_role = NL80211_IFTYPE_AP;
+#if defined(SUPPORT_RANDOM_MAC_SCAN)
+ /* Disable scanmac if enabled */
+ if (cfg->scanmac_enabled) {
+ wl_cfg80211_scan_mac_disable(dev);
}
-#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 = bcmcfg_to_prmry_ndev(cfg);
- dev_role = NL80211_IFTYPE_P2P_GO;
- }
-#endif /* WL_ENABLE_P2P_IF */
- if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
+#endif /* SUPPORT_RANDOM_MAC_SCAN */
+
+ if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
WL_ERR(("Find p2p index from wdev(%p) failed\n", dev->ieee80211_ptr));
return BCME_ERROR;
}
if (p2p_is_on(cfg) && (dev->ieee80211_ptr->iftype == NL80211_IFTYPE_P2P_GO)) {
dev_role = NL80211_IFTYPE_P2P_GO;
- } else if (dev_role == NL80211_IFTYPE_AP) {
+ } else if (dev->ieee80211_ptr->iftype == NL80211_IFTYPE_AP) {
+ dev_role = NL80211_IFTYPE_AP;
dhd->op_mode |= DHD_FLAG_HOSTAP_MODE;
+ err = dhd_ndo_enable(dhd, FALSE);
+ WL_DBG(("Disabling NDO on Hostapd mode %d\n", err));
+ if (err) {
+ WL_ERR(("Disabling NDO Failed %d\n", err));
+ }
+#ifdef PKT_FILTER_SUPPORT
+ /* Disable packet filter */
+ if (dhd->early_suspended) {
+ WL_ERR(("Disable pkt_filter\n"));
+ dhd_enable_packet_filter(0, dhd);
+ }
+#endif /* PKT_FILTER_SUPPORT */
#ifdef ARP_OFFLOAD_SUPPORT
/* IF SoftAP is enabled, disable arpoe */
- dhd_arp_offload_set(dhd, 0);
- dhd_arp_offload_enable(dhd, FALSE);
+ if (dhd->op_mode & DHD_FLAG_STA_MODE) {
+ dhd_arp_offload_set(dhd, 0);
+ dhd_arp_offload_enable(dhd, FALSE);
+ }
#endif /* ARP_OFFLOAD_SUPPORT */
} else {
/* only AP or GO role need to be handled here. */
@@ -7902,19 +12694,29 @@
goto fail;
}
- if (!check_dev_role_integrity(cfg, dev_role)) {
+ /* disable TDLS */
+#ifdef WLTDLS
+ if (bssidx == 0) {
+ /* Disable TDLS for primary Iface. For virtual interface,
+ * tdls disable will happen from interface create context
+ */
+ wl_cfg80211_tdls_config(cfg, TDLS_STATE_AP_CREATE, false);
+ }
+#endif /* WLTDLS */
+
+ if (!check_dev_role_integrity(cfg, wl_get_mode_by_netdev(cfg, dev), dev_role)) {
err = -EINVAL;
goto fail;
}
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
+#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,
- dev->ieee80211_ptr->preset_chandef) < 0)) {
+ NL80211_CHAN_HT20) < 0)) {
WL_ERR(("Set channel failed \n"));
goto fail;
}
-#endif
+#endif /* ((LINUX_VERSION >= VERSION(3, 6, 0) && !WL_COMPAT_WIRELESS) */
if ((err = wl_cfg80211_bcn_set_params(info, dev,
dev_role, bssidx)) < 0) {
@@ -7927,25 +12729,76 @@
WL_ERR(("Set IEs failed \n"));
goto fail;
}
- if ((err = wl_cfg80211_bcn_validate_sec(dev, &ies,
- dev_role, bssidx, info->privacy)) < 0)
- {
- WL_ERR(("Beacon set security failed \n"));
- goto fail;
+
+#ifdef BCMWAPI_WPI
+ if (info->crypto.ciphers_pairwise[0] == WLAN_CIPHER_SUITE_SMS4) {
+ wl_validate_wapisecurity(dev, bssidx);
}
+ else
+#endif // endif
+ {
+ WL_ERR(("%s info->crypto.ciphers_pairwise[0] is not "
+ "WLAN_CIPHER_SUITE_SMS4 \n", __FUNCTION__));
+
+ if ((err = wl_cfg80211_bcn_validate_sec(dev, &ies,
+ dev_role, bssidx, info->privacy)) < 0)
+ {
+ WL_ERR(("Beacon set security failed \n"));
+ goto fail;
+ }
+ }
+
if ((err = wl_cfg80211_bcn_bringup_ap(dev, &ies,
dev_role, bssidx)) < 0) {
WL_ERR(("Beacon bring up AP/GO failed \n"));
goto fail;
}
+#ifdef BCMSDIO
+ if (dev_role == NL80211_IFTYPE_AP) {
+ dhd_set_role(dhd, WLC_E_IF_ROLE_AP, bssidx);
+ } else if (dev_role == NL80211_IFTYPE_P2P_GO) {
+ dhd_set_role(dhd, WLC_E_IF_ROLE_P2P_GO, bssidx);
+ }
+#endif /* BCMSDIO */
+ /* Set GC/STA SCB expiry timings. */
+ if ((err = wl_cfg80211_set_scb_timings(cfg, dev))) {
+ WL_ERR(("scb setting failed \n"));
+ goto fail;
+ }
+
+ wl_set_drv_status(cfg, CONNECTED, dev);
WL_DBG(("** AP/GO Created **\n"));
+
#ifdef WL_CFG80211_ACL
/* Enfoce Admission Control. */
if ((err = wl_cfg80211_set_mac_acl(wiphy, dev, info->acl)) < 0) {
WL_ERR(("Set ACL failed\n"));
}
#endif /* WL_CFG80211_ACL */
+
+#ifdef WL11U
+ wl_get_iwdata_by_netdev(cfg, dev, iw_ie, &iw_ie_len);
+ /* Add interworking IE from beacon data */
+ if ((interworking_ie = wl_cfg80211_find_interworking_ie(
+ info->beacon.beacon_ies, info->beacon.beacon_ies_len)) != NULL) {
+ err = wl_cfg80211_add_iw_ie(cfg, dev, bssidx,
+ VNDR_IE_CUSTOM_FLAG, interworking_ie->id,
+ interworking_ie->data, interworking_ie->len);
+ if (unlikely(err)) {
+ WL_ERR(("Failed to add interworking IE"));
+ }
+ } else if (iw_ie_len != 0) {
+ /* we have to clear IW IE and disable gratuitous APR */
+ wl_cfg80211_clear_iw_ie(cfg, dev, bssidx);
+
+ (void)wldev_iovar_setint_bsscfg(dev, "grat_arp", 0,
+ bssidx);
+ wl_clear_iwdata_by_netdev(cfg, dev);
+ /* we don't care about error */
+ cfg->wl11u = FALSE;
+ }
+#endif /* WL11U */
/* Set IEs to FW */
if ((err = wl_cfg80211_set_ies(dev, &info->beacon, bssidx)) < 0)
@@ -7954,20 +12807,80 @@
/* Enable Probe Req filter, WPS-AP certification 4.2.13 */
if ((dev_role == NL80211_IFTYPE_AP) && (ies.wps_ie != NULL)) {
bool pbc = 0;
- wl_validate_wps_ie((char *) ies.wps_ie, ies.wps_ie_len, &pbc);
+ wl_validate_wps_ie((const char *) ies.wps_ie, ies.wps_ie_len, &pbc);
if (pbc) {
WL_DBG(("set WLC_E_PROBREQ_MSG\n"));
wl_add_remove_eventmsg(dev, WLC_E_PROBREQ_MSG, true);
}
}
+ /* Configure hidden SSID */
+ if (info->hidden_ssid != NL80211_HIDDEN_SSID_NOT_IN_USE) {
+ if ((err = wldev_iovar_setint(dev, "closednet", 1)) < 0)
+ WL_ERR(("failed to set hidden : %d\n", err));
+ WL_DBG(("hidden_ssid_enum_val: %d \n", info->hidden_ssid));
+ }
+
+#ifdef SUPPORT_AP_RADIO_PWRSAVE
+ if (dev_role == NL80211_IFTYPE_AP) {
+ if (!wl_set_ap_rps(dev, FALSE, dev->name)) {
+ wl_cfg80211_init_ap_rps(cfg);
+ } else {
+ WL_ERR(("Set rpsnoa failed \n"));
+ }
+ }
+#endif /* SUPPORT_AP_RADIO_PWRSAVE */
+
+#ifdef ENABLE_HOGSQS
+ chan_h = dev->ieee80211_ptr->preset_chandef.chan;
+ if (chan_h->band == IEEE80211_BAND_5GHZ) {
+ s32 value = 0x0;
+
+ value = M_HOGSQS_CFG;
+ err = wldev_iovar_getint_bsscfg(dev, "hogsqs", &value, bssidx);
+ if (unlikely(err)) {
+ WL_ERR(("hogsqs command is failed %d %\n", err));
+ } else {
+ value |= 0x1003; /* enable mitigation */
+ value |= (M_HOGSQS_CFG << 16);
+ (void)wldev_iovar_setint_bsscfg(dev, "hogsqs",
+ value, bssidx);
+ }
+ }
+#endif /* ENABLE_HOGSQS */
+
fail:
if (err) {
WL_ERR(("ADD/SET beacon failed\n"));
- wldev_iovar_setint(dev, "mpc", 1);
+ wl_flush_fw_log_buffer(dev, FW_LOGSET_MASK_ALL);
+ wl_cfg80211_stop_ap(wiphy, dev);
if (dev_role == NL80211_IFTYPE_AP) {
dhd->op_mode &= ~DHD_FLAG_HOSTAP_MODE;
+#ifdef PKT_FILTER_SUPPORT
+ /* Enable packet filter */
+ if (dhd->early_suspended) {
+ WL_ERR(("Enable pkt_filter\n"));
+ dhd_enable_packet_filter(1, dhd);
+ }
+#endif /* PKT_FILTER_SUPPORT */
+#ifdef ARP_OFFLOAD_SUPPORT
+ /* IF SoftAP is disabled, enable arpoe back for STA mode. */
+ if (dhd->op_mode & DHD_FLAG_STA_MODE) {
+ dhd_arp_offload_set(dhd, dhd_arp_mode);
+ dhd_arp_offload_enable(dhd, TRUE);
+ }
+#endif /* ARP_OFFLOAD_SUPPORT */
+#ifdef DISABLE_WL_FRAMEBURST_SOFTAP
+ wl_cfg80211_set_frameburst(cfg, TRUE);
+#endif /* DISABLE_WL_FRAMEBURST_SOFTAP */
}
+#ifdef WLTDLS
+ if (bssidx == 0) {
+ /* Since AP creation failed, re-enable TDLS */
+ wl_cfg80211_tdls_config(cfg, TDLS_STATE_AP_DELETE, false);
+ }
+#endif /* WLTDLS */
+
}
return err;
@@ -7980,25 +12893,51 @@
{
int err = 0;
u32 dev_role = 0;
- int infra = 0;
int ap = 0;
s32 bssidx = 0;
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
- struct net_device *primary_ndev = bcmcfg_to_prmry_ndev(cfg);
s32 is_rsdb_supported = BCME_ERROR;
dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
WL_DBG(("Enter \n"));
+ if (wl_cfg80211_get_bus_state(cfg)) {
+ /* since bus is down, iovar will fail. recovery path will bringup the bus. */
+ WL_ERR(("bus is not ready\n"));
+ return BCME_OK;
+ }
is_rsdb_supported = DHD_OPMODE_SUPPORTED(cfg->pub, DHD_FLAG_RSDB_MODE);
if (is_rsdb_supported < 0)
return (-ENODEV);
+
+ wl_clr_drv_status(cfg, AP_CREATING, dev);
+ wl_clr_drv_status(cfg, AP_CREATED, dev);
+ cfg->ap_oper_channel = 0;
+
if (dev->ieee80211_ptr->iftype == NL80211_IFTYPE_AP) {
dev_role = NL80211_IFTYPE_AP;
WL_DBG(("stopping AP operation\n"));
+#ifdef DHD_BANDSTEER
+ if (dev->ieee80211_ptr->iftype == NL80211_IFTYPE_AP) {
+ /* Disable bandsteer */
+ cfg->ap_bs = 1;
+ cfg->p2p_bs = 1;
+ dhd_bandsteer_module_deinit(
+ bcmcfg_to_prmry_ndev(cfg), cfg->ap_bs, cfg->p2p_bs);
+ }
+#endif /* DHD_BANDSTEER */
} else if (dev->ieee80211_ptr->iftype == NL80211_IFTYPE_P2P_GO) {
dev_role = NL80211_IFTYPE_P2P_GO;
WL_DBG(("stopping P2P GO operation\n"));
+#ifdef DHD_BANDSTEER
+ if (dev->ieee80211_ptr->iftype == NL80211_IFTYPE_P2P_GO) {
+ /* Disable bandsteer */
+ cfg->ap_bs = 1;
+ cfg->p2p_bs = 1;
+ dhd_bandsteer_module_deinit(
+ bcmcfg_to_prmry_ndev(cfg), cfg->ap_bs, cfg->p2p_bs);
+ }
+#endif /* DHD_BANDSTEER */
} else {
WL_ERR(("no AP/P2P GO interface is operational.\n"));
return -EINVAL;
@@ -8009,95 +12948,89 @@
return BCME_ERROR;
}
- if (!check_dev_role_integrity(cfg, dev_role)) {
+ if (!check_dev_role_integrity(cfg, wl_get_mode_by_netdev(cfg, dev), dev_role)) {
WL_ERR(("role integrity check failed \n"));
err = -EINVAL;
goto exit;
}
+ /* Free up resources */
+ wl_cfg80211_cleanup_if(dev);
+
/* Clear AP/GO connected status */
wl_clr_drv_status(cfg, CONNECTED, dev);
-
- if ((err = wl_cfgp2p_bss(cfg, dev, bssidx, 0)) < 0) {
+ if ((err = wl_cfg80211_bss_up(cfg, dev, bssidx, 0)) < 0) {
WL_ERR(("bss down error %d\n", err));
}
if (dev_role == NL80211_IFTYPE_AP) {
- if (bssidx == 0) {
- /*
- * Bring down the AP interface by changing role to STA.
- * Don't do a down or "WLC_SET_AP 0" since the shared
- * interface may be still running
- */
- if (is_rsdb_supported) {
- if ((err = wl_cfg80211_add_del_bss(cfg, dev,
- bssidx, NL80211_IFTYPE_STATION, 0, NULL)) < 0) {
- 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;
- }
- }
- } else if (is_rsdb_supported == 0) {
- if (dev == primary_ndev) {
- err = wldev_ioctl(dev, WLC_DOWN, &ap, sizeof(s32), true);
- if (err < 0) {
- WL_ERR(("WLC_DOWN error (%d)\n", err));
- err = -ENOTSUPP;
- goto exit;
- }
+#ifdef DISABLE_WL_FRAMEBURST_SOFTAP
+ wl_cfg80211_set_frameburst(cfg, TRUE);
+#endif /* DISABLE_WL_FRAMEBURST_SOFTAP */
+#ifdef PKT_FILTER_SUPPORT
+ /* Enable packet filter */
+ if (dhd->early_suspended) {
+ WL_ERR(("Enable pkt_filter\n"));
+ dhd_enable_packet_filter(1, dhd);
+ }
+#endif /* PKT_FILTER_SUPPORT */
+#ifdef ARP_OFFLOAD_SUPPORT
+ /* IF SoftAP is disabled, enable arpoe back for STA mode. */
+ if (dhd->op_mode & DHD_FLAG_STA_MODE) {
+ dhd_arp_offload_set(dhd, dhd_arp_mode);
+ dhd_arp_offload_enable(dhd, TRUE);
+ }
+#endif /* ARP_OFFLOAD_SUPPORT */
- err = wldev_ioctl(dev, WLC_SET_AP, &ap, sizeof(s32), true);
- if (err < 0) {
- WL_ERR(("SET AP error %d\n", err));
- err = -ENOTSUPP;
- goto exit;
- }
-
- err = wldev_ioctl(dev, WLC_UP, &ap, sizeof(s32), true);
- if (err < 0) {
- WL_ERR(("WLC_UP error (%d)\n", err));
- err = -ENOTSUPP;
- goto exit;
- }
- }
-
- 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;
- }
- err = wldev_ioctl(dev, WLC_UP, &ap, sizeof(s32), true);
- if (unlikely(err)) {
- WL_ERR(("WLC_UP error (%d)\n", err));
- err = -EINVAL;
- goto exit;
- }
- }
- } else if (cfg->cfgdev_bssidx && (bssidx == cfg->cfgdev_bssidx)) {
- WL_DBG(("Stop SoftAP on virtual Interface bssidx:%d \n", bssidx));
- if ((err = wl_cfg80211_add_del_bss(cfg, dev,
- bssidx, NL80211_IFTYPE_STATION, 0, NULL)) < 0) {
- WL_ERR(("wl add_del_bss returned error:%d\n", err));
+ if (is_rsdb_supported == 0) {
+ /* For non-rsdb chips, we use stand alone AP. Do wl down on stop AP */
+ err = wldev_ioctl_set(dev, WLC_UP, &ap, sizeof(s32));
+ if (unlikely(err)) {
+ WL_ERR(("WLC_UP error (%d)\n", err));
+ err = -EINVAL;
goto exit;
}
}
- wl_clr_drv_status(cfg, AP_CREATED, dev);
- /* Turn on the MPC */
- wldev_iovar_setint(dev, "mpc", 1);
+#ifdef WL_DISABLE_HE_SOFTAP
+ if (wl_cfg80211_set_he_mode(dev, cfg, bssidx, WL_IF_TYPE_AP, TRUE) != BCME_OK) {
+ WL_ERR(("failed to set he features\n"));
+ }
+#endif /* WL_DISABLE_HE_SOFTAP */
- wl_cfg80211_clear_per_bss_ies(cfg, bssidx);
+ wl_cfg80211_clear_per_bss_ies(cfg, dev->ieee80211_ptr);
+#ifdef SUPPORT_AP_RADIO_PWRSAVE
+ if (!wl_set_ap_rps(dev, FALSE, dev->name)) {
+ wl_cfg80211_init_ap_rps(cfg);
+ } else {
+ WL_ERR(("Set rpsnoa failed \n"));
+ }
+#endif /* SUPPORT_AP_RADIO_PWRSAVE */
} else {
WL_DBG(("Stopping P2P GO \n"));
+#if defined(OEM_ANDROID)
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));
+#endif // endif
}
+ SUPP_LOG(("AP/GO Link down\n"));
exit:
+#ifdef WL11U
+ wl_clear_iwdata_by_netdev(cfg, dev);
+#endif // endif
+ if (err) {
+ /* In case of failure, flush fw logs */
+ wl_flush_fw_log_buffer(dev, FW_LOGSET_MASK_ALL);
+ SUPP_LOG(("AP/GO Link down fail. err:%d\n", err));
+ }
+#ifdef WLTDLS
+ if (bssidx == 0) {
+ /* re-enable TDLS if the number of connected interfaces is less than 2 */
+ wl_cfg80211_tdls_config(cfg, TDLS_STATE_AP_DELETE, false);
+ }
+#endif /* WLTDLS */
if (dev_role == NL80211_IFTYPE_AP) {
/* clear the AP mode */
@@ -8118,19 +13051,13 @@
u32 dev_role = 0;
s32 bssidx = 0;
bool pbc = 0;
+#ifdef WL11U
+ bcm_tlv_t *interworking_ie;
+ u32 iw_ie_len = 0;
+ u8 iw_ie[IW_IES_MAX_BUF_LEN];
+#endif // endif
WL_DBG(("Enter \n"));
-
- if (dev == bcmcfg_to_prmry_ndev(cfg)) {
- dev_role = NL80211_IFTYPE_AP;
- }
-#if defined(WL_ENABLE_P2P_IF)
- else if (dev == cfg->p2p_net) {
- /* Group Add request on p2p0 */
- dev = bcmcfg_to_prmry_ndev(cfg);
- dev_role = NL80211_IFTYPE_P2P_GO;
- }
-#endif /* WL_ENABLE_P2P_IF */
if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
WL_ERR(("Find p2p index from wdev(%p) failed\n", dev->ieee80211_ptr));
@@ -8139,9 +13066,14 @@
if (dev->ieee80211_ptr->iftype == NL80211_IFTYPE_P2P_GO) {
dev_role = NL80211_IFTYPE_P2P_GO;
+ } else if (dev->ieee80211_ptr->iftype == NL80211_IFTYPE_AP) {
+ dev_role = NL80211_IFTYPE_AP;
+ } else {
+ err = -EINVAL;
+ goto fail;
}
- if (!check_dev_role_integrity(cfg, dev_role)) {
+ if (!check_dev_role_integrity(cfg, wl_get_mode_by_netdev(cfg, dev), dev_role)) {
err = -EINVAL;
goto fail;
}
@@ -8158,6 +13090,31 @@
goto fail;
}
+#ifdef WL11U
+ wl_get_iwdata_by_netdev(cfg, dev, iw_ie, &iw_ie_len);
+ /* Add interworking IE from beacon data */
+ if ((interworking_ie = wl_cfg80211_find_interworking_ie(
+ info->beacon_ies, info->beacon_ies_len)) != NULL) {
+ err = wl_cfg80211_add_iw_ie(cfg, dev, bssidx,
+ VNDR_IE_CUSTOM_FLAG, interworking_ie->id,
+ interworking_ie->data, interworking_ie->len);
+ if (unlikely(err)) {
+ WL_ERR(("Failed to add interworking IE"));
+ }
+ } else if (iw_ie_len != 0) {
+ /* we have to clear IW IE and disable gratuitous APR */
+ wl_cfg80211_clear_iw_ie(cfg, dev, bssidx);
+
+ /* we don't bother whether grat_arp gets disabled or not */
+ (void)wldev_iovar_setint_bsscfg(dev, "grat_arp", 0,
+ bssidx);
+ wl_clear_iwdata_by_netdev(cfg, dev);
+ cfg->wl11u = FALSE;
+ } else {
+ WL_DBG(("no update in iw ie\n"));
+ }
+#endif /* WL11U */
+
/* Set IEs to FW */
if ((err = wl_cfg80211_set_ies(dev, info, bssidx)) < 0) {
WL_ERR(("Set IEs failed \n"));
@@ -8172,7 +13129,7 @@
}
/* Enable Probe Req filter, WPS-AP certification 4.2.13 */
if ((dev_role == NL80211_IFTYPE_AP) && (ies.wps_ie != NULL)) {
- wl_validate_wps_ie((char *) ies.wps_ie, ies.wps_ie_len, &pbc);
+ wl_validate_wps_ie((const char *) ies.wps_ie, ies.wps_ie_len, &pbc);
WL_DBG((" WPS AP, wps_ie is exists pbc=%d\n", pbc));
if (pbc)
wl_add_remove_eventmsg(dev, WLC_E_PROBREQ_MSG, true);
@@ -8182,6 +13139,9 @@
}
fail:
+ if (err) {
+ wl_flush_fw_log_buffer(dev, FW_LOGSET_MASK_ALL);
+ }
return err;
}
#else
@@ -8198,6 +13158,7 @@
bcm_tlv_t *ssid_ie;
bool pbc = 0;
bool privacy;
+ bool is_bss_up = 0;
dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
WL_DBG(("interval (%d) dtim_period (%d) head_len (%d) tail_len (%d)\n",
@@ -8225,7 +13186,7 @@
dhd->op_mode |= DHD_FLAG_HOSTAP_MODE;
}
- if (!check_dev_role_integrity(cfg, dev_role)) {
+ if (!check_dev_role_integrity(cfg, wl_get_mode_by_netdev(cfg, dev), dev_role)) {
err = -ENODEV;
goto fail;
}
@@ -8243,14 +13204,16 @@
DOT11_MNG_SSID_ID)) != NULL) {
if (dev_role == NL80211_IFTYPE_AP) {
/* Store the hostapd SSID */
- 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;
+ bzero(&cfg->hostapd_ssid.SSID[0], DOT11_MAX_SSID_LEN);
+ cfg->hostapd_ssid.SSID_len = MIN(ssid_ie->len, DOT11_MAX_SSID_LEN);
+ memcpy(&cfg->hostapd_ssid.SSID[0], ssid_ie->data,
+ cfg->hostapd_ssid.SSID_len);
} else {
/* P2P GO */
- 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;
+ bzero(&cfg->p2p->ssid.SSID[0], DOT11_MAX_SSID_LEN);
+ cfg->p2p->ssid.SSID_len = MIN(ssid_ie->len, DOT11_MAX_SSID_LEN);
+ memcpy(cfg->p2p->ssid.SSID, ssid_ie->data,
+ cfg->p2p->ssid.SSID_len);
}
}
@@ -8279,14 +13242,16 @@
} else {
WL_DBG(("Applied Vndr IEs for ProbeRsp \n"));
}
-#endif
+#endif // endif
+
+ is_bss_up = wl_cfg80211_bss_isup(dev, bssidx);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
privacy = info->privacy;
#else
privacy = 0;
-#endif
- if (!wl_cfgp2p_bss_isup(dev, bssidx) &&
+#endif // endif
+ if (!is_bss_up &&
(wl_cfg80211_bcn_validate_sec(dev, &ies, dev_role, bssidx, privacy) < 0))
{
WL_ERR(("Beacon set security failed \n"));
@@ -8296,22 +13261,31 @@
/* Set BI and DTIM period */
if (info->interval) {
- if ((err = wldev_ioctl(dev, WLC_SET_BCNPRD,
- &info->interval, sizeof(s32), true)) < 0) {
+ if ((err = wldev_ioctl_set(dev, WLC_SET_BCNPRD,
+ &info->interval, sizeof(s32))) < 0) {
WL_ERR(("Beacon Interval Set Error, %d\n", err));
return err;
}
}
if (info->dtim_period) {
- if ((err = wldev_ioctl(dev, WLC_SET_DTIMPRD,
- &info->dtim_period, sizeof(s32), true)) < 0) {
+ if ((err = wldev_ioctl_set(dev, WLC_SET_DTIMPRD,
+ &info->dtim_period, sizeof(s32))) < 0) {
WL_ERR(("DTIM Interval Set Error, %d\n", err));
return err;
}
}
- if ((err = wl_cfg80211_bcn_bringup_ap(dev, &ies, dev_role, bssidx)) < 0) {
+ /* If bss is already up, skip bring up */
+ if (!is_bss_up &&
+ (err = wl_cfg80211_bcn_bringup_ap(dev, &ies, dev_role, bssidx)) < 0)
+ {
WL_ERR(("Beacon bring up AP/GO failed \n"));
+ goto fail;
+ }
+
+ /* Set GC/STA SCB expiry timings. */
+ if ((err = wl_cfg80211_set_scb_timings(cfg, dev))) {
+ WL_ERR(("scb setting failed \n"));
goto fail;
}
@@ -8333,11 +13307,11 @@
}
WL_DBG(("** ADD/SET beacon done **\n"));
+ wl_set_drv_status(cfg, CONNECTED, dev);
fail:
if (err) {
WL_ERR(("ADD/SET beacon failed\n"));
- wldev_iovar_setint(dev, "mpc", 1);
if (dev_role == NL80211_IFTYPE_AP) {
/* clear the AP mode */
dhd->op_mode &= ~DHD_FLAG_HOSTAP_MODE;
@@ -8346,140 +13320,61 @@
return err;
}
-#endif
-#ifdef WL_SCHED_SCAN
-#define PNO_TIME 30
-#define PNO_REPEAT 4
-#define PNO_FREQ_EXPO_MAX 2
-static bool
-is_ssid_in_list(struct cfg80211_ssid *ssid, struct cfg80211_ssid *ssid_list, int count)
+static s32
+wl_cfg80211_del_beacon(struct wiphy *wiphy, struct net_device *dev)
{
- int i;
-
- if (!ssid || !ssid_list)
- return FALSE;
-
- for (i = 0; i < count; i++) {
- if (ssid->ssid_len == ssid_list[i].ssid_len) {
- if (strncmp(ssid->ssid, ssid_list[i].ssid, ssid->ssid_len) == 0)
- return TRUE;
- }
- }
- return FALSE;
-}
-
-static int
-wl_cfg80211_sched_scan_start(struct wiphy *wiphy,
- struct net_device *dev,
- struct cfg80211_sched_scan_request *request)
-{
- ushort pno_time = PNO_TIME;
- int pno_repeat = PNO_REPEAT;
- int pno_freq_expo_max = PNO_FREQ_EXPO_MAX;
- wlc_ssid_ext_t ssids_local[MAX_PFN_LIST_COUNT];
+ int err = 0;
+ s32 bssidx = 0;
+ int infra = 0;
+ struct wireless_dev *wdev = dev->ieee80211_ptr;
struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
- struct cfg80211_ssid *ssid = NULL;
- struct cfg80211_ssid *hidden_ssid_list = NULL;
- int ssid_cnt = 0;
- int i;
- int ret = 0;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- s32 rssi_thold = 0;
-#endif /* LINUX_KERNEL_VER >= 3.6 */
+ dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
- if (!request) {
- WL_ERR(("Sched scan request was NULL\n"));
+ WL_DBG(("Enter. \n"));
+
+ if (!wdev) {
+ WL_ERR(("wdev null \n"));
return -EINVAL;
}
- WL_DBG(("Enter \n"));
- WL_PNO((">>> SCHED SCAN START\n"));
- WL_PNO(("Enter n_match_sets:%d n_ssids:%d \n",
- request->n_match_sets, request->n_ssids));
- WL_PNO(("ssids:%d pno_time:%d pno_repeat:%d pno_freq:%d \n",
- request->n_ssids, pno_time, pno_repeat, pno_freq_expo_max));
-
-
- if (!request->n_ssids || !request->n_match_sets) {
- WL_ERR(("Invalid sched scan req!! n_ssids:%d \n", request->n_ssids));
- return -EINVAL;
+ if ((wdev->iftype != NL80211_IFTYPE_P2P_GO) && (wdev->iftype != NL80211_IFTYPE_AP)) {
+ WL_ERR(("Unspported iface type iftype:%d \n", wdev->iftype));
}
- memset(&ssids_local, 0, sizeof(ssids_local));
+ wl_clr_drv_status(cfg, AP_CREATING, dev);
+ wl_clr_drv_status(cfg, AP_CREATED, dev);
- if (request->n_ssids > 0) {
- hidden_ssid_list = request->ssids;
+ /* Clear AP/GO connected status */
+ wl_clr_drv_status(cfg, CONNECTED, dev);
+
+ cfg->ap_oper_channel = 0;
+
+ if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
+ WL_ERR(("find p2p index from wdev(%p) failed\n", dev->ieee80211_ptr));
+ return BCME_ERROR;
}
- for (i = 0; i < request->n_match_sets && ssid_cnt < MAX_PFN_LIST_COUNT; i++) {
- ssid = &request->match_sets[i].ssid;
- /* No need to include null ssid */
- if (ssid->ssid_len) {
- memcpy(ssids_local[ssid_cnt].SSID, ssid->ssid, ssid->ssid_len);
- ssids_local[ssid_cnt].SSID_len = ssid->ssid_len;
- if (is_ssid_in_list(ssid, hidden_ssid_list, request->n_ssids)) {
- ssids_local[ssid_cnt].hidden = TRUE;
- WL_PNO((">>> PNO hidden SSID (%s) \n", ssid->ssid));
- } else {
- ssids_local[ssid_cnt].hidden = FALSE;
- WL_PNO((">>> PNO non-hidden SSID (%s) \n", ssid->ssid));
- }
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
- /* Per BSS rssi threshold is available from kernel >= 3.15 */
- rssi_thold = request->match_sets[i].rssi_thold;
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- /* Blanket rssi threshold only available from cfg80211 */
- rssi_thold = request->rssi_thold;
-#endif /* KERNEL_VER >= 3.15 */
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- if (rssi_thold != NL80211_SCAN_RSSI_THOLD_OFF) {
- ssids_local[ssid_cnt].rssi_thresh =
- (int8)rssi_thold;
- }
-#endif /* KERNEL_VER >= 3.6 */
- ssid_cnt++;
- }
+ /* Do bss down */
+ if ((err = wl_cfg80211_bss_up(cfg, dev, bssidx, 0)) < 0) {
+ WL_ERR(("bss down error %d\n", err));
}
- if (ssid_cnt) {
- if ((ret = dhd_dev_pno_set_for_ssid(dev, ssids_local, ssid_cnt,
- pno_time, pno_repeat, pno_freq_expo_max, NULL, 0)) < 0) {
- WL_ERR(("PNO setup failed!! ret=%d \n", ret));
- return -EINVAL;
- }
- cfg->sched_scan_req = request;
- } else {
- return -EINVAL;
+ /* fall through is intentional */
+ err = wldev_ioctl_set(dev, WLC_SET_INFRA, &infra, sizeof(s32));
+ if (err < 0) {
+ WL_ERR(("SET INFRA error %d\n", err));
+ }
+ wl_cfg80211_clear_per_bss_ies(cfg, dev->ieee80211_ptr);
+
+ if (wdev->iftype == NL80211_IFTYPE_AP) {
+ /* clear the AP mode */
+ dhd->op_mode &= ~DHD_FLAG_HOSTAP_MODE;
}
return 0;
}
-
-static int
-wl_cfg80211_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev)
-{
- struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
-
- WL_DBG(("Enter \n"));
- WL_PNO((">>> SCHED SCAN STOP\n"));
-
- if (dhd_dev_pno_stop_for_ssid(dev) < 0)
- WL_ERR(("PNO Stop for SSID failed"));
-
- if (cfg->scan_request && cfg->sched_scan_running) {
- WL_PNO((">>> Sched scan running. Aborting it..\n"));
- wl_notify_escan_complete(cfg, dev, true, true);
- }
-
- cfg->sched_scan_req = NULL;
- cfg->sched_scan_running = FALSE;
-
- return 0;
-}
-#endif /* WL_SCHED_SCAN */
+#endif /* LINUX_VERSION < VERSION(3,4,0) || WL_COMPAT_WIRELESS */
#ifdef WL_SUPPORT_ACS
/*
@@ -8543,8 +13438,9 @@
cca_stats_n_flags *results;
char *buf;
int retry, err;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
- buf = kzalloc(sizeof(char) * WLC_IOCTL_MAXLEN, GFP_KERNEL);
+ buf = (char *)MALLOCZ(cfg->osh, sizeof(char) * WLC_IOCTL_MAXLEN);
if (unlikely(!buf)) {
WL_ERR(("%s: buf alloc failed\n", __func__));
return -ENOMEM;
@@ -8569,11 +13465,11 @@
results = (cca_stats_n_flags *)(buf);
wl_parse_dump_obss(results->buf, survey);
- kfree(buf);
+ MFREE(cfg->osh, buf, sizeof(char) * WLC_IOCTL_MAXLEN);
return 0;
exit:
- kfree(buf);
+ MFREE(cfg->osh, buf, sizeof(char) * WLC_IOCTL_MAXLEN);
return err;
}
@@ -8613,18 +13509,9 @@
}
if (!idx) {
- /* Disable mpc */
- val = 0;
- err = wldev_iovar_setbuf_bsscfg(ndev, "mpc", (void *)&val,
- sizeof(val), cfg->ioctl_buf, WLC_IOCTL_SMLEN, 0,
- &cfg->ioctl_buf_sync);
- if (err < 0) {
- WL_ERR(("set 'mpc' failed, error = %d\n", err));
- }
-
/* Set interface up, explicitly. */
val = 1;
- err = wldev_ioctl(ndev, WLC_UP, (void *)&val, sizeof(val), true);
+ err = wldev_ioctl_set(ndev, WLC_UP, (void *)&val, sizeof(val));
if (err < 0) {
WL_ERR(("set interface up failed, error = %d\n", err));
}
@@ -8634,8 +13521,8 @@
retry = IOCTL_RETRY_COUNT;
while (retry--) {
noise = 0;
- err = wldev_ioctl(ndev, WLC_GET_PHY_NOISE, &noise,
- sizeof(noise), false);
+ err = wldev_ioctl_get(ndev, WLC_GET_PHY_NOISE, &noise,
+ sizeof(noise));
if (err >= 0) {
break;
}
@@ -8648,8 +13535,8 @@
noise = CHAN_NOISE_DUMMY;
}
- survey = (struct wl_dump_survey *) kzalloc(sizeof(struct wl_dump_survey),
- GFP_KERNEL);
+ survey = (struct wl_dump_survey *)MALLOCZ(cfg->osh,
+ sizeof(struct wl_dump_survey));
if (unlikely(!survey)) {
WL_ERR(("%s: alloc failed\n", __func__));
return -ENOMEM;
@@ -8684,11 +13571,11 @@
info->filled = SURVEY_INFO_NOISE_DBM |SURVEY_INFO_CHANNEL_TIME |
SURVEY_INFO_CHANNEL_TIME_BUSY | SURVEY_INFO_CHANNEL_TIME_RX |
SURVEY_INFO_CHANNEL_TIME_TX;
- kfree(survey);
+ MFREE(cfg->osh, survey, sizeof(struct wl_dump_survey));
return 0;
exit:
- kfree(survey);
+ MFREE(cfg->osh, survey, sizeof(struct wl_dump_survey));
return err;
}
#endif /* WL_SUPPORT_ACS */
@@ -8702,6 +13589,9 @@
.stop_p2p_device = wl_cfgp2p_stop_p2p_device,
#endif /* WL_CFG80211_P2P_DEV_IF */
.scan = wl_cfg80211_scan,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0))
+ .abort_scan = wl_cfg80211_abort_scan,
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0)) */
.set_wiphy_params = wl_cfg80211_set_wiphy_params,
.join_ibss = wl_cfg80211_join_ibss,
.leave_ibss = wl_cfg80211_leave_ibss,
@@ -8724,19 +13614,24 @@
.remain_on_channel = wl_cfg80211_remain_on_channel,
.cancel_remain_on_channel = wl_cfg80211_cancel_remain_on_channel,
.mgmt_tx = wl_cfg80211_mgmt_tx,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+ .update_mgmt_frame_registrations = wl_cfg80211_update_mgmt_frame_register,
+#else
.mgmt_frame_register = wl_cfg80211_mgmt_frame_register,
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0) */
.change_bss = wl_cfg80211_change_bss,
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)) || defined(WL_COMPAT_WIRELESS)
.set_channel = wl_cfg80211_set_channel,
-#endif
-#if (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,
+ .del_beacon = wl_cfg80211_del_beacon,
#else
.change_beacon = wl_cfg80211_change_beacon,
.start_ap = wl_cfg80211_start_ap,
.stop_ap = wl_cfg80211_stop_ap,
-#endif
+#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,
@@ -8747,10 +13642,10 @@
.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 (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 2, 0)) || defined(WL_COMPAT_WIRELESS)
.tdls_mgmt = wl_cfg80211_tdls_mgmt,
.tdls_oper = wl_cfg80211_tdls_oper,
-#endif
+#endif /* LINUX_VERSION > VERSION(3, 2, 0) || WL_COMPAT_WIRELESS */
#ifdef WL_SUPPORT_ACS
.dump_survey = wl_cfg80211_dump_survey,
#endif /* WL_SUPPORT_ACS */
@@ -8761,7 +13656,23 @@
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0))
.set_rekey_data = wl_cfg80211_set_rekey_data,
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) */
-#endif
+#endif /* GTK_OFFLOAD_SUPPORT */
+#if defined(WL_FILS) || defined(WL_OWE)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0))
+ /* This should be enabled from kernel version which supports this */
+ .update_connect_params = wl_cfg80211_update_connect_params,
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) */
+#endif /* WL_FILS || defined(WL_OWE) */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0))
+ .set_pmk = wl_cfg80211_set_pmk,
+ .del_pmk = wl_cfg80211_del_pmk,
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
+ .channel_switch = wl_cfg80211_channel_switch,
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) */
+#ifdef WL_SAE
+ .external_auth = wl_cfg80211_external_auth,
+#endif /* WL_SAE */
};
s32 wl_mode_to_nl80211_iftype(s32 mode)
@@ -8782,59 +13693,32 @@
return err;
}
-#ifdef CONFIG_CFG80211_INTERNAL_REGDB
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
-static int
-#else
-static void
-#endif /* kernel version < 3.9.0 */
-wl_cfg80211_reg_notifier(
- struct wiphy *wiphy,
- struct regulatory_request *request)
+s32
+wl_cfg80211_set_country_code(struct net_device *net, char *country_code,
+ bool notify, bool user_enforced, int revinfo)
{
- struct bcm_cfg80211 *cfg = (struct bcm_cfg80211 *)wiphy_priv(wiphy);
- int ret = 0;
- int revinfo = -1;
-
- if (!request || !cfg) {
- WL_ERR(("Invalid arg\n"));
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
- return -EINVAL;
-#else
- return;
-#endif /* kernel version < 3.9.0 */
+ s32 ret = BCME_OK;
+#ifdef WL_NAN
+ struct wireless_dev *wdev = ndev_to_wdev(net);
+ struct wiphy *wiphy = wdev->wiphy;
+ struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
+ if (cfg->nan_enable) {
+ mutex_lock(&cfg->if_sync);
+ ret = wl_cfgnan_disable(cfg, NAN_COUNTRY_CODE_CHANGE);
+ mutex_unlock(&cfg->if_sync);
+ if (ret != BCME_OK) {
+ WL_ERR(("failed to disable nan, error[%d]\n", ret));
+ return ret;
+ }
}
-
- WL_DBG(("ccode: %c%c Initiator: %d\n",
- request->alpha2[0], request->alpha2[1], request->initiator));
-
- /* We support only REGDOM_SET_BY_USER as of now */
- if ((request->initiator != NL80211_REGDOM_SET_BY_USER) &&
- (request->initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE)) {
- WL_ERR(("reg_notifier for intiator:%d not supported : set default\n",
- request->initiator));
- /* in case of no supported country by regdb
- lets driver setup platform default Locale
- */
- }
-
- WL_ERR(("Set country code %c%c from %s\n",
- request->alpha2[0], request->alpha2[1],
- ((request->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE) ? " 11d AP" : "User")));
-
- if ((ret = wldev_set_country(bcmcfg_to_prmry_ndev(cfg), request->alpha2,
- false, (request->initiator == NL80211_REGDOM_SET_BY_USER ? true : false),
- revinfo)) < 0) {
+#endif /* WL_NAN */
+ ret = wldev_set_country(net, country_code,
+ notify, user_enforced, revinfo);
+ if (ret < 0) {
WL_ERR(("set country Failed :%d\n", ret));
}
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0))
return ret;
-#else
- return;
-#endif /* kernel version < 3.9.0 */
}
-#endif /* CONFIG_CFG80211_INTERNAL_REGDB */
#ifdef CONFIG_PM
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
@@ -8850,6 +13734,32 @@
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) */
#endif /* CONFIG_PM */
+int wl_features_set(u8 *array, uint8 len, u32 ftidx)
+{
+ u8* ft_byte;
+
+ if ((ftidx / 8u) >= len)
+ return BCME_BADARG;
+
+ ft_byte = &array[ftidx / 8u];
+ *ft_byte |= BIT(ftidx % 8u);
+ return BCME_OK;
+}
+
+#ifdef WL_SAE
+static s32 wl_wiphy_update_sae(struct wiphy *wiphy, dhd_pub_t *dhd)
+{
+
+ if (FW_SUPPORTED(dhd, sae_ext)) {
+ WL_DBG(("%s extsae enabled\n", __FUNCTION__));
+ wiphy->features |= NL80211_FEATURE_SAE;
+ } else if ((FW_SUPPORTED(dhd, sae)) && (FW_SUPPORTED(dhd, idsup))) {
+ wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_SAE_OFFLOAD);
+ WL_DBG(("%s intsae enabled\n", __FUNCTION__));
+ }
+ return BCME_OK;
+}
+#endif /* WL_SAE */
static s32 wl_setup_wiphy(struct wireless_dev *wdev, struct device *sdiofunc_dev, void *context)
{
s32 err = 0;
@@ -8859,7 +13769,7 @@
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) */
#endif /* CONFIG_PM */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 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);
@@ -8868,7 +13778,7 @@
err = -ENODEV;
return err;
}
-#endif
+#endif // endif
wdev->wiphy =
wiphy_new(&wl_cfg80211_ops, sizeof(struct bcm_cfg80211));
@@ -8886,7 +13796,11 @@
wdev->wiphy->max_sched_scan_ssids = MAX_PFN_LIST_COUNT;
wdev->wiphy->max_match_sets = MAX_PFN_LIST_COUNT;
wdev->wiphy->max_sched_scan_ie_len = WL_SCAN_IE_LEN_MAX;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0))
wdev->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
+#else
+ wdev->wiphy->max_sched_scan_reqs = 1;
+#endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)) */
#endif /* WL_SCHED_SCAN */
wdev->wiphy->interface_modes =
BIT(NL80211_IFTYPE_STATION)
@@ -8925,29 +13839,28 @@
#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
+#endif // endif
WIPHY_FLAG_4ADDR_STATION;
-#if ((defined(ROAM_ENABLE) || defined(BCMFW_ROAM_ENABLE)) && (LINUX_VERSION_CODE >= \
- KERNEL_VERSION(3, 2, 0)))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
/*
- * If FW ROAM flag is advertised, upper layer wouldn't provide
- * the bssid & freq in the connect command. This will result a
- * delay in initial connection time due to firmware doing a full
- * channel scan to figure out the channel & bssid. However kernel
- * ver >= 3.15, provides bssid_hint & freq_hint and hence kernel
- * ver >= 3.15 won't have any issue. So if this flags need to be
- * advertised for kernel < 3.15, suggest to use RCC along with it
- * to avoid the initial connection delay.
+ * If FW ROAM flag is advertised, upper layer doesn't provide the
+ * bssid & freq in the connect command. However, kernel ver >= 3.15,
+ * provides bssid_hint & freq_hint which can be used by the firmware.
+ * fw_ap_select variable determines whether FW selects the AP or the
+ * user space selects the target AP within the given ESS.
*/
- wdev->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM;
-#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0))
+ if (!us_ap_select)
+ wdev->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM;
+ else
+ WL_MEM(("upper layer roam is selected %s\n", __FUNCTION__));
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) */
+#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
+#endif // endif
#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
@@ -8958,9 +13871,9 @@
#ifdef WL_CFG80211_ACL
/* Configure ACL capabilities. */
wdev->wiphy->max_acl_mac_addrs = MAX_NUM_MAC_FILT;
-#endif
+#endif // endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
+#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
@@ -8972,12 +13885,12 @@
wdev->wiphy->flags |= WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD;
wdev->wiphy->probe_resp_offload = 0;
}
-#endif
+#endif // endif
#endif /* WL_SUPPORT_BACKPORTED_KPATCHES) || (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 2, 0)) || defined(WL_COMPAT_WIRELESS)
wdev->wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS;
-#endif
+#endif // endif
#if defined(CONFIG_PM) && defined(WL_CFG80211_P2P_DEV_IF)
/*
@@ -8989,8 +13902,10 @@
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
wdev->wiphy->wowlan = &brcm_wowlan_support;
/* If this is not provided cfg stack will get disconnect
- * during suspend.
- */
+ * during suspend.
+ * Note: wiphy->wowlan_config is freed by cfg80211 layer.
+ * so use malloc instead of MALLOC(osh) to avoid false alarm.
+ */
brcm_wowlan_config = kmalloc(sizeof(struct cfg80211_wowlan), GFP_KERNEL);
if (brcm_wowlan_config) {
brcm_wowlan_config->disconnect = true;
@@ -9002,10 +13917,10 @@
brcm_wowlan_config->tcp = NULL;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0))
brcm_wowlan_config->nd_config = NULL;
-#endif
+#endif // endif
} else {
WL_ERR(("Can not allocate memory for brcm_wowlan_config,"
- " So wiphy->wowlan_config is set to NULL\n"));
+ " So wiphy->wowlan_config is set to NULL\n"));
}
wdev->wiphy->wowlan_config = brcm_wowlan_config;
#else
@@ -9024,26 +13939,69 @@
wdev->wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG;
#else
wdev->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY;
-#endif
+#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(3, 14, 0) */
wiphy_apply_custom_regulatory(wdev->wiphy, &brcm_regdom);
-#if defined(WL_VENDOR_EXT_SUPPORT)
- WL_ERR(("Registering Vendor80211\n"));
+
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 14, 0)) || defined(WL_VENDOR_EXT_SUPPORT)
+ WL_INFORM_MEM(("Registering Vendor80211\n"));
err = wl_cfgvendor_attach(wdev->wiphy, dhd);
if (unlikely(err < 0)) {
WL_ERR(("Couldn not attach vendor commands (%d)\n", err));
}
-#endif /* defined(WL_VENDOR_EXT_SUPPORT) */
+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(3, 14, 0)) || defined(WL_VENDOR_EXT_SUPPORT) */
+#ifdef WL_FILS
+ wiphy_ext_feature_set(wdev->wiphy, NL80211_EXT_FEATURE_FILS_SK_OFFLOAD);
+#endif /* WL_FILS */
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
+ wdev->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH;
+ wdev->wiphy->max_num_csa_counters = WL_MAX_NUM_CSA_COUNTERS;
+#endif /* LINUX_VERSION_CODE > KERNEL_VERSION(3, 12, 0) */
+
+#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 // endif
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && \
+ defined(SUPPORT_RANDOM_MAC_SCAN)
+ wdev->wiphy->features |= (NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR |
+ NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR);
+ wdev->wiphy->max_sched_scan_plans = 1; /* multiple plans not supported */
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && defined(SUPPORT_RANDOM_MAC_SCAN) */
+
+#ifdef WL_SAE
+ wdev->wiphy->features |= NL80211_FEATURE_SAE;
+#endif /* WL_SAE */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0)) && defined(BCMSUP_4WAY_HANDSHAKE)
+ if (FW_SUPPORTED(dhd, idsup)) {
+ err = wiphy_ext_feature_set(wdev->wiphy,
+ NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK);
+ if (err) {
+ return err;
+ }
+ err = wiphy_ext_feature_set(wdev->wiphy,
+ NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X);
+ if (err) {
+ return err;
+ }
+ }
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) && defined(BCMSUP_4WAY_HANDSHAKE) */
+#ifdef WL_SCAN_TYPE
+ /* These scan types will be mapped to default scan on non-supported chipset */
+ /* Advertise scan type capability. */
+ wiphy_ext_feature_set(wdev->wiphy, NL80211_EXT_FEATURE_LOW_SPAN_SCAN);
+ wiphy_ext_feature_set(wdev->wiphy, NL80211_EXT_FEATURE_LOW_POWER_SCAN);
+ wiphy_ext_feature_set(wdev->wiphy, NL80211_EXT_FEATURE_HIGH_ACCURACY_SCAN);
+ wdev->wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN;
+#endif /* WL_SCAN_TYPE */
+
/* 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;
}
@@ -9059,53 +14017,63 @@
if (wdev->wiphy) {
wiphy = wdev->wiphy;
-#if defined(WL_VENDOR_EXT_SUPPORT)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 14, 0)) || defined(WL_VENDOR_EXT_SUPPORT)
wl_cfgvendor_detach(wdev->wiphy);
-#endif /* if defined(WL_VENDOR_EXT_SUPPORT) */
-#ifdef CONFIG_PM
+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(3, 14, 0)) || defined(WL_VENDOR_EXT_SUPPORT) */
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
- /* Reset wowlan & wowlan_config before Unregister to avoid Kernel Panic */
- WL_DBG(("wl_free_wdev Clearing wowlan Config \n"));
+ /* Reset wowlan & wowlan_config before Unregister to avoid Kernel Panic */
+ WL_DBG(("clear wowlan\n"));
wdev->wiphy->wowlan = NULL;
- if (wdev->wiphy->wowlan_config) {
- kfree(wdev->wiphy->wowlan_config);
- wdev->wiphy->wowlan_config = NULL;
- }
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) */
-#endif /* CONFIG_PM */
wiphy_unregister(wdev->wiphy);
wdev->wiphy->dev.parent = NULL;
wdev->wiphy = NULL;
}
wl_delete_all_netinfo(cfg);
- if (wiphy)
+ if (wiphy) {
+ MFREE(cfg->osh, wdev, sizeof(*wdev));
wiphy_free(wiphy);
+ }
/* 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 bcm_cfg80211 *cfg)
+s32 wl_inform_bss(struct bcm_cfg80211 *cfg)
{
struct wl_scan_results *bss_list;
- struct wl_bss_info *bi = NULL; /* must be initialized */
+ wl_bss_info_t *bi = NULL; /* must be initialized */
s32 err = 0;
s32 i;
bss_list = cfg->bss_list;
- WL_DBG(("scanned AP count (%d)\n", bss_list->count));
+ WL_MEM(("scanned AP count (%d)\n", bss_list->count));
+#ifdef ESCAN_CHANNEL_CACHE
+ reset_roam_cache(cfg);
+#endif /* ESCAN_CHANNEL_CACHE */
+ preempt_disable();
bi = next_bss(bss_list, bi);
for_each_bss(bss_list, bi, i) {
+#ifdef ESCAN_CHANNEL_CACHE
+ add_roam_cache(cfg, bi);
+#endif /* ESCAN_CHANNEL_CACHE */
err = wl_inform_single_bss(cfg, bi, false);
- if (unlikely(err))
- break;
+ if (unlikely(err)) {
+ WL_ERR(("bss inform failed\n"));
+ }
}
+ preempt_enable();
+ WL_MEM(("cfg80211 scan cache updated\n"));
+#ifdef ROAM_CHANNEL_CACHE
+ /* print_roam_cache(); */
+ update_roam_cache(cfg, ioctl_version);
+#endif /* ROAM_CHANNEL_CACHE */
return err;
}
-static s32 wl_inform_single_bss(struct bcm_cfg80211 *cfg, struct wl_bss_info *bi, bool roam)
+static s32 wl_inform_single_bss(struct bcm_cfg80211 *cfg, wl_bss_info_t *bi, bool update_ssid)
{
struct wiphy *wiphy = bcmcfg_to_wiphy(cfg);
struct ieee80211_mgmt *mgmt;
@@ -9115,19 +14083,34 @@
struct wl_scan_req *sr = wl_to_sr(cfg);
struct beacon_proberesp *beacon_proberesp;
struct cfg80211_bss *cbss = NULL;
+#if defined(WL_SUPPORT_BSS_BOOTTIME) && (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
+ struct cfg80211_inform_bss bss_data = {0x00, };
+#endif /* WL_SUPPORT_BSS_BOOTTIME */
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
+ log_conn_event_t *event_data = NULL;
+ tlv_log *tlv_data = NULL;
+ u32 alloc_len, tlv_len;
+ u32 payload_len;
s32 mgmt_type;
s32 signal;
u32 freq;
s32 err = 0;
gfp_t aflags;
+ u8 tmp_buf[IEEE80211_MAX_SSID_LEN + 1];
if (unlikely(dtoh32(bi->length) > WL_BSS_INFO_MAX)) {
WL_DBG(("Beacon is larger than buffer. Discarding\n"));
return err;
}
+
+ if (bi->SSID_len > IEEE80211_MAX_SSID_LEN) {
+ WL_ERR(("wrong SSID len:%d\n", bi->SSID_len));
+ return -EINVAL;
+ }
+
aflags = (in_atomic()) ? GFP_ATOMIC : GFP_KERNEL;
- notif_bss_info = kzalloc(sizeof(*notif_bss_info) + sizeof(*mgmt)
- - sizeof(u8) + WL_BSS_INFO_MAX, aflags);
+ notif_bss_info = (struct wl_cfg80211_bss_info *)MALLOCZ(cfg->osh,
+ sizeof(*notif_bss_info) + sizeof(*mgmt) - sizeof(u8) + WL_BSS_INFO_MAX);
if (unlikely(!notif_bss_info)) {
WL_ERR(("notif_bss_info alloc failed\n"));
return -ENOMEM;
@@ -9136,13 +14119,19 @@
notif_bss_info->channel =
wf_chspec_ctlchan(wl_chspec_driver_to_host(bi->chanspec));
+#ifdef WL_6E
+ if (CHSPEC_IS6G(wl_chspec_driver_to_host(bi->chanspec))) {
+ band = wiphy->bands[IEEE80211_BAND_6GHZ];
+ } else
+#endif /* WL_6E */
if (notif_bss_info->channel <= CH_MAX_2G_CHANNEL)
band = wiphy->bands[IEEE80211_BAND_2GHZ];
else
band = wiphy->bands[IEEE80211_BAND_5GHZ];
if (!band) {
WL_ERR(("No valid band"));
- kfree(notif_bss_info);
+ MFREE(cfg->osh, notif_bss_info, sizeof(*notif_bss_info)
+ + sizeof(*mgmt) - sizeof(u8) + WL_BSS_INFO_MAX);
return -EINVAL;
}
notif_bss_info->rssi = wl_rssi_offset(dtoh16(bi->RSSI));
@@ -9159,71 +14148,129 @@
beacon_proberesp->beacon_int = cpu_to_le16(bi->beacon_period);
beacon_proberesp->capab_info = cpu_to_le16(bi->capability);
wl_rst_ie(cfg);
- wl_update_hidden_ap_ie(bi, ((u8 *) bi) + bi->ie_offset, &bi->ie_length, roam);
+ wl_update_hidden_ap_ie(bi, ((u8 *) bi) + bi->ie_offset, &bi->ie_length, update_ssid);
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(cfg);
-#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 38)
+#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;
#else
freq = ieee80211_channel_to_frequency(notif_bss_info->channel, band->band);
-#endif
+#endif // endif
if (freq == 0) {
WL_ERR(("Invalid channel, fail to chcnage channel to freq\n"));
- kfree(notif_bss_info);
+ MFREE(cfg->osh, notif_bss_info, sizeof(*notif_bss_info)
+ + sizeof(*mgmt) - sizeof(u8) + WL_BSS_INFO_MAX);
return -EINVAL;
}
channel = ieee80211_get_channel(wiphy, freq);
if (unlikely(!channel)) {
WL_ERR(("ieee80211_get_channel error\n"));
- kfree(notif_bss_info);
+ MFREE(cfg->osh, notif_bss_info, sizeof(*notif_bss_info)
+ + sizeof(*mgmt) - sizeof(u8) + WL_BSS_INFO_MAX);
return -EINVAL;
}
- WL_DBG(("SSID : \"%s\", rssi %d, channel %d, capability : 0x04%x, bssid %pM"
- "mgmt_type %d frame_len %d\n", bi->SSID,
- notif_bss_info->rssi, notif_bss_info->channel,
+ memcpy(tmp_buf, bi->SSID, bi->SSID_len);
+ tmp_buf[bi->SSID_len] = '\0';
+ WL_DBG(("SSID : \"%s\", rssi %d, channel %d, freq %d, capability : 0x04%x, bssid %pM"
+ "mgmt_type %d frame_len %d\n", tmp_buf,
+ notif_bss_info->rssi, notif_bss_info->channel, freq,
mgmt->u.beacon.capab_info, &bi->BSSID, mgmt_type,
notif_bss_info->frame_len));
signal = notif_bss_info->rssi * 100;
+#if defined(WL_SUPPORT_BSS_BOOTTIME) && (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
+ bss_data.chan = channel;
+ bss_data.scan_width = NL80211_BSS_CHAN_WIDTH_20;
+ bss_data.boottime_ns = ktime_to_ns(ktime_get_boottime());
+ bss_data.signal = signal;
+#endif /* WL_SUPPORT_BSS_BOOTTIME */
if (!mgmt->u.probe_resp.timestamp) {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39))
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0))
- struct timespec64 ts;
- ktime_get_boottime_ts64(&ts);
+#if defined(WL_SUPPORT_BSS_BOOTTIME) && (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
+ mgmt->u.probe_resp.timestamp = bss_data.boottime_ns / 1000;
#else
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0))
struct timespec ts;
+#else
+ struct timespec64 ts;
+#endif // endif
get_monotonic_boottime(&ts);
-#endif
mgmt->u.probe_resp.timestamp = ((u64)ts.tv_sec*1000000)
+ ts.tv_nsec / 1000;
-#else
- struct timeval tv;
- do_gettimeofday(&tv);
- mgmt->u.probe_resp.timestamp = ((u64)tv.tv_sec*1000000)
- + tv.tv_usec;
-#endif
+#endif /* WL_SUPPORT_BSS_BOOTTIME */
}
-
-
+#if defined(WL_SUPPORT_BSS_BOOTTIME) && (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
+ cbss = cfg80211_inform_bss_frame_data(wiphy, &bss_data, mgmt,
+ le16_to_cpu(notif_bss_info->frame_len), aflags);
+#else
cbss = cfg80211_inform_bss_frame(wiphy, channel, mgmt,
le16_to_cpu(notif_bss_info->frame_len), signal, aflags);
+#endif /* WL_SUPPORT_BSS_BOOTTIME */
if (unlikely(!cbss)) {
- WL_ERR(("cfg80211_inform_bss_frame error\n"));
- kfree(notif_bss_info);
- return -EINVAL;
+ WL_ERR(("cfg80211_inform_bss_frame error bssid " MACDBG " channel %d \n",
+ MAC2STRDBG((u8*)(&bi->BSSID)), notif_bss_info->channel));
+ err = -EINVAL;
+ goto out_err;
}
+ CFG80211_PUT_BSS(wiphy, cbss);
-#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);
+ if (DBG_RING_ACTIVE(dhdp, DHD_EVENT_RING_ID) &&
+ (cfg->sched_scan_req && !cfg->scan_request)) {
+ alloc_len = sizeof(log_conn_event_t) + IEEE80211_MAX_SSID_LEN + sizeof(uint16) +
+ sizeof(int16);
+ event_data = (log_conn_event_t *)MALLOCZ(dhdp->osh, alloc_len);
+ if (!event_data) {
+ WL_ERR(("%s: failed to allocate the log_conn_event_t with "
+ "length(%d)\n", __func__, alloc_len));
+ goto out_err;
+ }
+ tlv_len = 3 * sizeof(tlv_log);
+ event_data->tlvs = (tlv_log *)MALLOCZ(cfg->osh, tlv_len);
+ if (!event_data->tlvs) {
+ WL_ERR(("%s: failed to allocate the log_conn_event_t with "
+ "length(%d)\n", __func__, tlv_len));
+ goto free_evt_data;
+ }
+
+ payload_len = sizeof(log_conn_event_t);
+ event_data->event = WIFI_EVENT_DRIVER_PNO_SCAN_RESULT_FOUND;
+ tlv_data = event_data->tlvs;
+
+ /* ssid */
+ tlv_data->tag = WIFI_TAG_SSID;
+ tlv_data->len = bi->SSID_len;
+ memcpy(tlv_data->value, bi->SSID, bi->SSID_len);
+ payload_len += TLV_LOG_SIZE(tlv_data);
+ tlv_data = TLV_LOG_NEXT(tlv_data);
+
+ /* channel */
+ tlv_data->tag = WIFI_TAG_CHANNEL;
+ tlv_data->len = sizeof(uint16);
+ memcpy(tlv_data->value, ¬if_bss_info->channel, sizeof(uint16));
+ payload_len += TLV_LOG_SIZE(tlv_data);
+ tlv_data = TLV_LOG_NEXT(tlv_data);
+
+ /* rssi */
+ tlv_data->tag = WIFI_TAG_RSSI;
+ tlv_data->len = sizeof(int16);
+ memcpy(tlv_data->value, ¬if_bss_info->rssi, sizeof(int16));
+ payload_len += TLV_LOG_SIZE(tlv_data);
+ tlv_data = TLV_LOG_NEXT(tlv_data);
+
+ dhd_os_push_push_ring_data(dhdp, DHD_EVENT_RING_ID,
+ event_data, payload_len);
+ MFREE(dhdp->osh, event_data->tlvs, tlv_len);
+free_evt_data:
+ MFREE(dhdp->osh, event_data, alloc_len);
+ }
+
+out_err:
+ MFREE(cfg->osh, notif_bss_info, sizeof(*notif_bss_info)
+ + sizeof(*mgmt) - sizeof(u8) + WL_BSS_INFO_MAX);
return err;
}
@@ -9232,10 +14279,45 @@
u32 event = ntoh32(e->event_type);
u32 status = ntoh32(e->status);
u16 flags = ntoh16(e->flags);
+#if defined(CUSTOM_SET_OCLOFF) || defined(CUSTOM_SET_ANTNPM)
+ dhd_pub_t *dhd;
+ dhd = (dhd_pub_t *)(cfg->pub);
+#endif /* CUSTOM_SET_OCLOFF || CUSTOM_SET_ANTNPM */
WL_DBG(("event %d, status %d flags %x\n", event, status, flags));
if (event == WLC_E_SET_SSID) {
if (status == WLC_E_STATUS_SUCCESS) {
+#ifdef CUSTOM_SET_OCLOFF
+ if (dhd->ocl_off) {
+ int err = 0;
+ int ocl_enable = 0;
+ err = wldev_iovar_setint(ndev, "ocl_enable", ocl_enable);
+ if (err != 0) {
+ WL_ERR(("[WIFI_SEC] wl_is_linkup: Set ocl_enable %d"
+ " failed %d\n",
+ ocl_enable, err));
+ } else {
+ WL_ERR(("[WIFI_SEC] wl_is_linkup: Set ocl_enable %d"
+ " succeeded %d\n",
+ ocl_enable, err));
+ }
+ }
+#endif /* CUSTOM_SET_OCLOFF */
+#ifdef CUSTOM_SET_ANTNPM
+ if (dhd->mimo_ant_set) {
+ int err = 0;
+
+ WL_ERR(("[WIFI_SEC] mimo_ant_set = %d\n", dhd->mimo_ant_set));
+ err = wldev_iovar_setint(ndev, "txchain", dhd->mimo_ant_set);
+ if (err != 0) {
+ WL_ERR(("[WIFI_SEC] Fail set txchain\n"));
+ }
+ err = wldev_iovar_setint(ndev, "rxchain", dhd->mimo_ant_set);
+ if (err != 0) {
+ WL_ERR(("[WIFI_SEC] Fail set rxchain\n"));
+ }
+ }
+#endif /* CUSTOM_SET_ANTNPM */
if (!wl_is_ibssmode(cfg, ndev))
return true;
}
@@ -9257,15 +14339,11 @@
event == WLC_E_DISASSOC_IND ||
event == WLC_E_DISASSOC ||
event == WLC_E_DEAUTH) {
-#if (WL_DBG_LEVEL > 0)
- WL_ERR(("Link down Reason : WLC_E_%s\n", wl_dbg_estr[event]));
-#endif /* (WL_DBG_LEVEL > 0) */
+ WL_ERR(("Link down Reason : %s\n", bcmevent_get_name(event)));
return true;
} else if (event == WLC_E_LINK) {
if (!(flags & WLC_EVENT_MSG_LINK)) {
-#if (WL_DBG_LEVEL > 0)
- WL_ERR(("Link down Reason : WLC_E_%s\n", wl_dbg_estr[event]));
-#endif /* (WL_DBG_LEVEL > 0) */
+ WL_ERR(("Link down Reason : %s\n", bcmevent_get_name(event)));
return true;
}
}
@@ -9282,17 +14360,144 @@
return true;
if (event == WLC_E_SET_SSID && status != WLC_E_STATUS_SUCCESS)
return true;
+ if (event == WLC_E_ASSOC_RESP_IE && status != WLC_E_STATUS_SUCCESS)
+ return true;
return false;
}
-/* The mainline kernel >= 3.2.0 has support for indicating new/del station
- * to AP/P2P GO via events. If this change is backported to kernel for which
- * this driver is being built, then define WL_CFG80211_STA_EVENT. You
- * should use this new/del sta event mechanism for BRCM supplicant >= 22.
- */
+#ifdef WL_SAE
static s32
-wl_notify_connect_status_ap(struct bcm_cfg80211 *cfg, struct net_device *ndev,
+wl_cfg80211_event_sae_key(struct bcm_cfg80211 *cfg, struct net_device *ndev,
+ wl_sae_key_info_t *sae_key)
+{
+ struct sk_buff *skb;
+ gfp_t kflags;
+ struct wiphy *wiphy = bcmcfg_to_wiphy(cfg);
+ int err = BCME_OK;
+
+ kflags = in_atomic() ? GFP_ATOMIC : GFP_KERNEL;
+#if (defined(CONFIG_ARCH_MSM) && defined(SUPPORT_WDEV_CFG80211_VENDOR_EVENT_ALLOC)) || \
+ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
+ skb = cfg80211_vendor_event_alloc(wiphy, ndev_to_wdev(ndev), BRCM_SAE_VENDOR_EVENT_BUF_LEN,
+ BRCM_VENDOR_EVENT_SAE_KEY, kflags);
+#else
+ skb = cfg80211_vendor_event_alloc(wiphy, BRCM_SAE_VENDOR_EVENT_BUF_LEN,
+ BRCM_VENDOR_EVENT_SAE_KEY, kflags);
+#endif /* (defined(CONFIG_ARCH_MSM) && defined(SUPPORT_WDEV_CFG80211_VENDOR_EVENT_ALLOC)) || */
+ /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0) */
+ if (!skb) {
+ WL_ERR(("skb alloc failed"));
+ err = BCME_NOMEM;
+ goto done;
+ }
+
+ WL_INFORM_MEM(("Received Sae Key event for "MACDBG" key length %x %x",
+ MAC2STRDBG(sae_key->peer_mac), sae_key->pmk_len, sae_key->pmkid_len));
+ nla_put(skb, BRCM_SAE_KEY_ATTR_PEER_MAC, ETHER_ADDR_LEN, sae_key->peer_mac);
+ nla_put(skb, BRCM_SAE_KEY_ATTR_PMK, sae_key->pmk_len, sae_key->pmk);
+ nla_put(skb, BRCM_SAE_KEY_ATTR_PMKID, sae_key->pmkid_len, sae_key->pmkid);
+ cfg80211_vendor_event(skb, kflags);
+
+done:
+ return err;
+}
+
+static s32
+wl_bss_handle_sae_auth(struct bcm_cfg80211 *cfg, struct net_device *ndev,
+ const wl_event_msg_t *event, void *data)
+{
+ int err = BCME_OK;
+ uint status = ntoh32(event->status);
+ wl_auth_event_t *auth_data;
+ wl_sae_key_info_t sae_key;
+ uint16 tlv_buf_len;
+
+ if (status == WLC_E_STATUS_SUCCESS) {
+ auth_data = (wl_auth_event_t *)data;
+ if (auth_data->version != WL_AUTH_EVENT_DATA_V1) {
+ WL_ERR(("unknown auth event data version %x\n",
+ auth_data->version));
+ err = BCME_VERSION;
+ goto done;
+ }
+
+ tlv_buf_len = auth_data->length - WL_AUTH_EVENT_FIXED_LEN_V1;
+
+ /* check if PMK info present */
+ sae_key.pmk = bcm_get_data_from_xtlv_buf(auth_data->xtlvs, tlv_buf_len,
+ WL_AUTH_PMK_TLV_ID, &(sae_key.pmk_len), BCM_XTLV_OPTION_ALIGN32);
+ if (!sae_key.pmk || !sae_key.pmk_len) {
+ WL_ERR(("Mandatory PMK info not present"));
+ err = BCME_NOTFOUND;
+ goto done;
+ }
+ /* check if PMKID info present */
+ sae_key.pmkid = bcm_get_data_from_xtlv_buf(auth_data->xtlvs, tlv_buf_len,
+ WL_AUTH_PMKID_TLV_ID, &(sae_key.pmkid_len), BCM_XTLV_OPTION_ALIGN32);
+ if (!sae_key.pmkid || !sae_key.pmkid_len) {
+ WL_ERR(("Mandatory PMKID info not present\n"));
+ err = BCME_NOTFOUND;
+ goto done;
+ }
+ memcpy_s(sae_key.peer_mac, ETHER_ADDR_LEN, event->addr.octet, ETHER_ADDR_LEN);
+ err = wl_cfg80211_event_sae_key(cfg, ndev, &sae_key);
+ if (err) {
+ WL_ERR(("Failed to event sae key info\n"));
+ }
+ } else {
+ WL_ERR(("sae auth status failure:%d\n", status));
+ }
+done:
+ return err;
+}
+#endif /* WL_SAE */
+
+static s32
+wl_get_auth_assoc_status(struct bcm_cfg80211 *cfg, struct net_device *ndev,
+ const wl_event_msg_t *e, void *data)
+{
+ u32 reason = ntoh32(e->reason);
+ u32 event = ntoh32(e->event_type);
+#ifdef WL_SAE
+ uint auth_type = ntoh32(e->auth_type);
+#endif /* WL_SAE */
+ struct wl_security *sec = wl_read_prof(cfg, ndev, WL_PROF_SEC);
+ WL_DBG(("event type : %d, reason : %d\n", event, reason));
+
+#if defined(DHD_ENABLE_BIGDATA_LOGGING)
+ (void)memcpy_s(&cfg->event_auth_assoc, sizeof(wl_event_msg_t),
+ e, sizeof(wl_event_msg_t));
+ WL_ERR(("event=%d status %d reason %d \n",
+ ntoh32(cfg->event_auth_assoc.event_type),
+ ntoh32(cfg->event_auth_assoc.status),
+ ntoh32(cfg->event_auth_assoc.reason)));
+#endif /* DHD_ENABLE_BIGDATA_LOGGING */
+ if (sec) {
+ switch (event) {
+ case WLC_E_ASSOC:
+ case WLC_E_AUTH:
+ case WLC_E_AUTH_IND:
+ sec->auth_assoc_res_status = reason;
+#ifdef WL_SAE
+ if ((event == WLC_E_AUTH || event == WLC_E_AUTH_IND) &&
+ auth_type == DOT11_SAE) {
+ wl_bss_handle_sae_auth(cfg, ndev, e, data);
+ }
+#endif /* WL_SAE */
+ break;
+ default:
+ break;
+ }
+ } else {
+ WL_ERR(("sec is NULL\n"));
+ }
+ return 0;
+}
+#if ((LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)) && !defined(WL_CFG80211_STA_EVENT) \
+ && !defined(WL_COMPAT_WIRELESS)) || defined(WL_CFG80211_AP_RX_MGMT_DISCONNECT)
+static s32
+wl_notify_connect_status_ap_rx_mgmt(struct bcm_cfg80211 *cfg, struct net_device *ndev,
const wl_event_msg_t *e, void *data)
{
s32 err = 0;
@@ -9300,7 +14505,6 @@
u32 reason = ntoh32(e->reason);
u32 len = ntoh32(e->datalen);
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)) && !defined(WL_CFG80211_STA_EVENT)
bool isfree = false;
u8 *mgmt_frame;
u8 bsscfgidx = e->bsscfgidx;
@@ -9314,26 +14518,7 @@
struct ether_addr bssid;
struct wiphy *wiphy = bcmcfg_to_wiphy(cfg);
channel_info_t ci;
-#else
- struct station_info sinfo;
-#endif
- 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(cfg, IF_DELETING) && (ndev != bcmcfg_to_prmry_ndev(cfg))) {
- wl_add_remove_eventmsg(ndev, WLC_E_PROBREQ_MSG, false);
- WL_INFORM(("AP mode link down !! \n"));
- complete(&cfg->iface_disable);
- return 0;
- }
-
- 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_get_name(event), event, ntoh32(e->status), reason));
- }
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)) && !defined(WL_CFG80211_STA_EVENT)
WL_DBG(("Enter \n"));
if (!len && (event == WLC_E_DEAUTH)) {
len = 2; /* reason code field */
@@ -9360,7 +14545,7 @@
NULL, 0, cfg->ioctl_buf, WLC_IOCTL_SMLEN, bsscfgidx, &cfg->ioctl_buf_sync);
memcpy(da.octet, cfg->ioctl_buf, ETHER_ADDR_LEN);
memset(&bssid, 0, sizeof(bssid));
- err = wldev_ioctl(ndev, WLC_GET_BSSID, &bssid, ETHER_ADDR_LEN, false);
+ err = wldev_ioctl_get(ndev, WLC_GET_BSSID, &bssid, ETHER_ADDR_LEN);
switch (event) {
case WLC_E_ASSOC_IND:
fc = FC_ASSOC_REQ;
@@ -9382,7 +14567,7 @@
goto exit;
}
memset(&ci, 0, sizeof(ci));
- if ((err = wldev_ioctl(ndev, WLC_GET_CHANNEL, &ci, sizeof(ci), false))) {
+ if ((err = wldev_ioctl_get(ndev, WLC_GET_CHANNEL, &ci, sizeof(ci)))) {
kfree(body);
return err;
}
@@ -9398,52 +14583,122 @@
kfree(body);
return -EINVAL;
}
-#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 38)
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 38) && !defined(WL_COMPAT_WIRELESS)
freq = ieee80211_channel_to_frequency(channel);
(void)band->band;
#else
freq = ieee80211_channel_to_frequency(channel, band->band);
-#endif
-
- err = wl_frame_get_mgmt(fc, &da, &e->addr, &bssid,
+#endif // endif
+ err = wl_frame_get_mgmt(cfg, fc, &da, &e->addr, &bssid,
&mgmt_frame, &len, body);
if (err < 0)
goto exit;
isfree = true;
- if (event == WLC_E_ASSOC_IND && reason == DOT11_SC_SUCCESS) {
-#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) && (LINUX_VERSION_CODE < \
- KERNEL_VERSION(3, 18, 0)))
- cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, len, GFP_ATOMIC);
-
-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
- cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, len);
-#else
- cfg80211_rx_mgmt(ndev, freq, mgmt_frame, len, GFP_ATOMIC);
-#endif
+ if (((event == WLC_E_ASSOC_IND) || (event == WLC_E_REASSOC_IND)) &&
+ reason == DOT11_SC_SUCCESS) {
+ CFG80211_RX_MGMT(ndev, freq, 0, mgmt_frame, len,
+ NL80211_RXMGMT_FLAG_ANSWERED, GFP_ATOMIC);
} else if (event == WLC_E_DISASSOC_IND) {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
- cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, len, GFP_ATOMIC);
-#else
- cfg80211_rx_mgmt(ndev, freq, mgmt_frame, len, GFP_ATOMIC);
-#endif
+ CFG80211_RX_MGMT(ndev, freq, 0, mgmt_frame, len,
+ NL80211_RXMGMT_FLAG_ANSWERED, GFP_ATOMIC);
} else if ((event == WLC_E_DEAUTH_IND) || (event == WLC_E_DEAUTH)) {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0))
- cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, len, GFP_ATOMIC);
-#else
- cfg80211_rx_mgmt(ndev, freq, mgmt_frame, len, GFP_ATOMIC);
-#endif
+ CFG80211_RX_MGMT(ndev, freq, 0, mgmt_frame, len,
+ NL80211_RXMGMT_FLAG_ANSWERED, GFP_ATOMIC);
}
-exit:
+ exit:
if (isfree)
kfree(mgmt_frame);
if (body)
kfree(body);
+
+ return err;
+}
+#endif /* LINUX_VERSION < VERSION(3,2,0) && !WL_CFG80211_STA_EVENT && !WL_COMPAT_WIRELESS */
+
+/* The mainline kernel >= 3.2.0 has support for indicating new/del station
+ * to AP/P2P GO via events. If this change is backported to kernel for which
+ * this driver is being built, then define WL_CFG80211_STA_EVENT. You
+ * should use this new/del sta event mechanism for BRCM supplicant >= 22.
+ */
+static s32
+wl_notify_connect_status_ap(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);
+ u32 reason = ntoh32(e->reason);
+ u32 status = ntoh32(e->status);
+#ifdef BIGDATA_SOFTAP
+ dhd_pub_t *dhdp;
+#endif /* BIGDATA_SOFTAP */
+
+ WL_INFORM_MEM(("[%s] Mode AP/GO. Event:%d status:%d reason:%d\n",
+ ndev->name, event, ntoh32(e->status), reason));
+
+ if (event == WLC_E_AUTH_IND) {
+ wl_get_auth_assoc_status(cfg, ndev, e, data);
+ return 0;
+ }
+ /* if link down, bsscfg is disabled. */
+ if (event == WLC_E_LINK && reason == WLC_E_LINK_BSSCFG_DIS &&
+ wl_get_p2p_status(cfg, IF_DELETING) && (ndev != bcmcfg_to_prmry_ndev(cfg))) {
+ wl_add_remove_eventmsg(ndev, WLC_E_PROBREQ_MSG, false);
+ WL_INFORM_MEM(("AP mode link down !! \n"));
+ complete(&cfg->iface_disable);
+ return 0;
+ }
+
+ if ((event == WLC_E_LINK) && (status == WLC_E_STATUS_SUCCESS) &&
+ (reason == WLC_E_REASON_INITIAL_ASSOC) &&
+ (wl_get_mode_by_netdev(cfg, ndev) == WL_MODE_AP)) {
+ if (!wl_get_drv_status(cfg, AP_CREATED, ndev)) {
+ /* AP/GO brought up successfull in firmware */
+ WL_INFORM_MEM(("AP/GO Link up\n"));
+ wl_set_drv_status(cfg, AP_CREATED, ndev);
+ OSL_SMP_WMB();
+ wake_up_interruptible(&cfg->netif_change_event);
+#ifdef BIGDATA_SOFTAP
+ wl_ap_stainfo_init(cfg);
+#endif /* BIGDATA_SOFTAP */
+#ifdef WL_BCNRECV
+ /* check fakeapscan is in progress, if progress then abort */
+ wl_android_bcnrecv_stop(ndev, WL_BCNRECV_CONCURRENCY);
+#endif /* WL_BCNRECV */
+ return 0;
+ }
+ }
+
+ if (event == WLC_E_DISASSOC_IND || event == WLC_E_DEAUTH_IND || event == WLC_E_DEAUTH) {
+ WL_DBG(("event %s(%d) status %d reason %d\n",
+ bcmevent_get_name(event), event, ntoh32(e->status), reason));
+ }
+
+#ifdef BIGDATA_SOFTAP
+ if (event == WLC_E_LINK && reason == WLC_E_LINK_BSSCFG_DIS) {
+ WL_ERR(("AP link down - skip get sta data\n"));
+ } else {
+ dhdp = (dhd_pub_t *)(cfg->pub);
+ if (dhdp && dhdp->op_mode & DHD_FLAG_HOSTAP_MODE) {
+ dhd_schedule_gather_ap_stadata(cfg, ndev, e);
+ }
+ }
+#endif /* BIGDATA_SOFTAP */
+
+#if !defined(WL_CFG80211_STA_EVENT) && !defined(WL_COMPAT_WIRELESS) && \
+ (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0))
+ return wl_notify_connect_status_ap_rx_mgmt(cfg, ndev, e, data);
#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) {
+ reason == DOT11_SC_SUCCESS) {
+ u32 len = ntoh32(e->datalen);
+ struct station_info sinfo;
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
+ memset(&sinfo, 0, sizeof(struct station_info));
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) */
+ sinfo.filled = 0;
/* Linux ver >= 4.0 assoc_req_ies_len is used instead of
* STATION_INFO_ASSOC_REQ_IES flag
*/
@@ -9456,36 +14711,105 @@
}
sinfo.assoc_req_ies = data;
sinfo.assoc_req_ies_len = len;
+ WL_INFORM_MEM(("[%s] new sta event for "MACDBG "\n",
+ ndev->name, MAC2STRDBG(e->addr.octet)));
cfg80211_new_sta(ndev, e->addr.octet, &sinfo, GFP_ATOMIC);
- } else if (event == WLC_E_DISASSOC_IND) {
+#ifdef WL_WPS_SYNC
+ wl_wps_session_update(ndev, WPS_STATE_LINKUP, e->addr.octet);
+#endif /* WL_WPS_SYNC */
+ } else if ((event == WLC_E_DEAUTH_IND) ||
+ ((event == WLC_E_DEAUTH) && (reason != DOT11_RC_RESERVED)) ||
+ (event == WLC_E_DISASSOC_IND)) {
+#if defined(WL_CFG80211_AP_RX_MGMT_DISCONNECT)
+ err = wl_notify_connect_status_ap_rx_mgmt(cfg, ndev, e, data);
+#else
+ WL_INFORM_MEM(("[%s] del sta event for "MACDBG "\n",
+ ndev->name, MAC2STRDBG(e->addr.octet)));
cfg80211_del_sta(ndev, e->addr.octet, GFP_ATOMIC);
- } else if ((event == WLC_E_DEAUTH_IND) || (event == WLC_E_DEAUTH)) {
- cfg80211_del_sta(ndev, e->addr.octet, GFP_ATOMIC);
+#endif /* WL_CFG80211_AP_RX_MGMT_DISCONNECT */
+#ifdef WL_WPS_SYNC
+ wl_wps_session_update(ndev, WPS_STATE_LINKDOWN, e->addr.octet);
+#endif /* WL_WPS_SYNC */
}
-#endif
+#endif /* LINUX_VERSION < VERSION(3,2,0) && !WL_CFG80211_STA_EVENT && !WL_COMPAT_WIRELESS */
return err;
}
-static s32
-wl_get_auth_assoc_status(struct bcm_cfg80211 *cfg, struct net_device *ndev,
- const wl_event_msg_t *e)
+#if defined(DHD_ENABLE_BIGDATA_LOGGING)
+enum {
+ BIGDATA_ASSOC_REJECT_NO_ACK = 1,
+ BIGDATA_ASSOC_REJECT_FAIL = 2,
+ BIGDATA_ASSOC_REJECT_UNSOLICITED = 3,
+ BIGDATA_ASSOC_REJECT_TIMEOUT = 4,
+ BIGDATA_ASSOC_REJECT_ABORT = 5,
+ BIGDATA_ASSOC_REJECT_NO_NETWWORKS = 6,
+ BIGDATA_ASSOC_REJECT_MAX = 50
+};
+
+int wl_get_connect_failed_status(struct bcm_cfg80211 *cfg, const wl_event_msg_t *e)
{
- u32 reason = ntoh32(e->reason);
- u32 event = ntoh32(e->event_type);
- 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) {
- case WLC_E_ASSOC:
- case WLC_E_AUTH:
- sec->auth_assoc_res_status = reason;
- default:
- break;
+ u32 status = ntoh32(e->status);
+
+ cfg->assoc_reject_status = 0;
+
+ if (status != WLC_E_STATUS_SUCCESS) {
+ WL_ERR(("auth assoc status event=%d e->status %d e->reason %d \n",
+ ntoh32(cfg->event_auth_assoc.event_type),
+ (int)ntoh32(cfg->event_auth_assoc.status),
+ (int)ntoh32(cfg->event_auth_assoc.reason)));
+
+ switch ((int)ntoh32(cfg->event_auth_assoc.status)) {
+ case WLC_E_STATUS_NO_ACK:
+ cfg->assoc_reject_status = BIGDATA_ASSOC_REJECT_NO_ACK;
+ break;
+ case WLC_E_STATUS_FAIL:
+ cfg->assoc_reject_status = BIGDATA_ASSOC_REJECT_FAIL;
+ break;
+ case WLC_E_STATUS_UNSOLICITED:
+ cfg->assoc_reject_status = BIGDATA_ASSOC_REJECT_UNSOLICITED;
+ break;
+ case WLC_E_STATUS_TIMEOUT:
+ cfg->assoc_reject_status = BIGDATA_ASSOC_REJECT_TIMEOUT;
+ break;
+ case WLC_E_STATUS_ABORT:
+ cfg->assoc_reject_status = BIGDATA_ASSOC_REJECT_ABORT;
+ break;
+ case WLC_E_STATUS_SUCCESS:
+ if (status == WLC_E_STATUS_NO_NETWORKS) {
+ cfg->assoc_reject_status =
+ BIGDATA_ASSOC_REJECT_NO_NETWWORKS;
+ break;
+ }
+ default:
+ cfg->assoc_reject_status = BIGDATA_ASSOC_REJECT_MAX;
+ break;
}
- } else
- WL_ERR(("sec is NULL\n"));
+ if (cfg->assoc_reject_status) {
+ if (ntoh32(cfg->event_auth_assoc.event_type) == WLC_E_ASSOC) {
+ cfg->assoc_reject_status += BIGDATA_ASSOC_REJECT_MAX;
+ }
+ }
+ }
+
+ WL_ERR(("assoc_reject_status %d \n", cfg->assoc_reject_status));
+
return 0;
}
+
+s32 wl_cfg80211_get_connect_failed_status(struct net_device *dev, char* cmd, int total_len)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ int bytes_written = 0;
+
+ if (cfg == NULL) {
+ return -1;
+ }
+ bytes_written = snprintf(cmd, total_len, "assoc_reject.status %d",
+ cfg->assoc_reject_status);
+ WL_ERR(("cmd: %s \n", cmd));
+ return bytes_written;
+}
+#endif /* DHD_ENABLE_BIGDATA_LOGGING */
static s32
wl_notify_connect_status_ibss(struct bcm_cfg80211 *cfg, struct net_device *ndev,
@@ -9504,10 +14828,10 @@
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) */
if (event == WLC_E_JOIN) {
- WL_DBG(("joined in IBSS network\n"));
+ WL_INFORM_MEM(("[%s] joined in IBSS network\n", ndev->name));
}
if (event == WLC_E_START) {
- WL_DBG(("started IBSS network\n"));
+ WL_INFORM_MEM(("[%s] started IBSS network\n", ndev->name));
}
if (event == WLC_E_JOIN || event == WLC_E_START ||
(event == WLC_E_LINK && (flags == WLC_EVENT_MSG_LINK))) {
@@ -9530,8 +14854,9 @@
MACDBG "), ignore it\n", MAC2STRDBG(cur_bssid)));
return err;
}
- WL_INFORM(("IBSS BSSID is changed from " MACDBG " to " MACDBG "\n",
- MAC2STRDBG(cur_bssid), MAC2STRDBG((const u8 *)&e->addr)));
+ WL_INFORM_MEM(("[%s] IBSS BSSID is changed from " MACDBG " to " MACDBG "\n",
+ ndev->name, MAC2STRDBG(cur_bssid),
+ MAC2STRDBG((const u8 *)&e->addr)));
wl_get_assoc_ies(cfg, ndev);
wl_update_prof(cfg, ndev, NULL, (const void *)&e->addr, WL_PROF_BSSID);
wl_update_bss_info(cfg, ndev, false);
@@ -9539,12 +14864,12 @@
cfg80211_ibss_joined(ndev, (const s8 *)&e->addr, channel, GFP_KERNEL);
#else
cfg80211_ibss_joined(ndev, (const s8 *)&e->addr, GFP_KERNEL);
-#endif
+#endif // endif
}
else {
/* New connection */
- WL_INFORM(("IBSS connected to " MACDBG "\n",
- MAC2STRDBG((const u8 *)&e->addr)));
+ WL_INFORM_MEM(("[%s] IBSS connected to " MACDBG "\n",
+ ndev->name, MAC2STRDBG((const u8 *)&e->addr)));
wl_link_up(cfg);
wl_get_assoc_ies(cfg, ndev);
wl_update_prof(cfg, ndev, NULL, (const void *)&e->addr, WL_PROF_BSSID);
@@ -9553,7 +14878,7 @@
cfg80211_ibss_joined(ndev, (const s8 *)&e->addr, channel, GFP_KERNEL);
#else
cfg80211_ibss_joined(ndev, (const s8 *)&e->addr, GFP_KERNEL);
-#endif
+#endif // endif
wl_set_drv_status(cfg, CONNECTED, ndev);
active = true;
wl_update_prof(cfg, ndev, NULL, (const void *)&active, WL_PROF_ACT);
@@ -9565,12 +14890,506 @@
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"));
+ WL_INFORM_MEM(("no action - join fail (IBSS mode)\n"));
}
else {
WL_DBG(("no action (IBSS mode)\n"));
}
return err;
+}
+
+#if defined(DHD_ENABLE_BIGDATA_LOGGING)
+#define WiFiALL_OUI "\x50\x6F\x9A" /* Wi-FiAll OUI */
+#define WiFiALL_OUI_LEN 3
+#define WiFiALL_OUI_TYPE 16
+
+/* 11kv feature flag for big data */
+#define WL_BIGDATA_11KV_QBSSLOAD 0x00000001
+#define WL_BIGDATA_11KV_PROXYARP 0x00000002
+#define WL_BIGDATA_11KV_TFS 0x00000004
+#define WL_BIGDATA_11KV_SLEEP 0x00000008
+#define WL_BIGDATA_11KV_TIMBC 0x00000010
+#define WL_BIGDATA_11KV_BSSTRANS 0x00000020
+#define WL_BIGDATA_11KV_DMS 0x00000040
+#define WL_BIGDATA_11KV_LINK_MEA 0x00000080
+#define WL_BIGDATA_11KV_NBRREP 0x00000100
+#define WL_BIGDATA_11KV_BCNPASSIVE 0x00000200
+#define WL_BIGDATA_11KV_BCNACTIVE 0x00000400
+#define WL_BIGDATA_11KV_BCNTABLE 0x00000800
+#define WL_BIGDATA_11KV_BSSAAD 0x00001000
+#define WL_BIGDATA_11KV_MAX 0x00002000
+
+#define WL_BIGDATA_SUPPORT_11K 0x00000001
+#define WL_BIGDATA_SUPPORT_11V 0x00000002
+
+typedef struct {
+ uint8 bitmap;
+ uint8 octet_len;
+ uint32 flag;
+} bigdata_11kv_t;
+
+bigdata_11kv_t bigdata_11k_info[] = {
+ {DOT11_RRM_CAP_LINK, DOT11_RRM_CAP_LEN, WL_BIGDATA_11KV_LINK_MEA},
+ {DOT11_RRM_CAP_NEIGHBOR_REPORT, DOT11_RRM_CAP_LEN, WL_BIGDATA_11KV_NBRREP},
+ {DOT11_RRM_CAP_BCN_PASSIVE, DOT11_RRM_CAP_LEN, WL_BIGDATA_11KV_BCNPASSIVE},
+ {DOT11_RRM_CAP_BCN_ACTIVE, DOT11_RRM_CAP_LEN, WL_BIGDATA_11KV_BCNACTIVE},
+ {DOT11_RRM_CAP_BCN_TABLE, DOT11_RRM_CAP_LEN, WL_BIGDATA_11KV_BCNTABLE},
+ {DOT11_RRM_CAP_BSSAAD, DOT11_RRM_CAP_LEN, WL_BIGDATA_11KV_BSSAAD},
+};
+
+bigdata_11kv_t bigdata_11v_info[] = {
+ {DOT11_EXT_CAP_PROXY_ARP, DOT11_EXTCAP_LEN_PROXY_ARP, WL_BIGDATA_11KV_PROXYARP},
+ {DOT11_EXT_CAP_TFS, DOT11_EXTCAP_LEN_TFS, WL_BIGDATA_11KV_TFS},
+ {DOT11_EXT_CAP_WNM_SLEEP, DOT11_EXTCAP_LEN_WNM_SLEEP, WL_BIGDATA_11KV_SLEEP},
+ {DOT11_EXT_CAP_TIMBC, DOT11_EXTCAP_LEN_TIMBC, WL_BIGDATA_11KV_TIMBC},
+ {DOT11_EXT_CAP_BSSTRANS_MGMT, DOT11_EXTCAP_LEN_BSSTRANS, WL_BIGDATA_11KV_BSSTRANS},
+ {DOT11_EXT_CAP_DMS, DOT11_EXTCAP_LEN_DMS, WL_BIGDATA_11KV_DMS}
+};
+
+static void
+wl_get_11kv_info(u8 *ie, u32 ie_len, uint8 *support_11kv, uint32 *flag_11kv)
+{
+ bcm_tlv_t *ie_11kv = NULL;
+ uint32 flag_11k = 0, flag_11v = 0;
+ int i;
+
+ /* parsing QBSS load ie */
+ if ((bcm_parse_tlvs(ie, (u32)ie_len,
+ DOT11_MNG_QBSS_LOAD_ID)) != NULL) {
+ flag_11k |= WL_BIGDATA_11KV_QBSSLOAD;
+ }
+
+ /* parsing RM IE for 11k */
+ if ((ie_11kv = bcm_parse_tlvs(ie, (u32)ie_len,
+ DOT11_MNG_RRM_CAP_ID)) != NULL) {
+ for (i = 0; i < ARRAYSIZE(bigdata_11k_info); i++) {
+ if ((ie_11kv->len >= bigdata_11k_info[i].octet_len) &&
+ isset(ie_11kv->data, bigdata_11k_info[i].bitmap)) {
+ flag_11k |= bigdata_11k_info[i].flag;
+ }
+ }
+ }
+
+ /* parsing extended cap. IE for 11v */
+ if ((ie_11kv = bcm_parse_tlvs(ie, (u32)ie_len,
+ DOT11_MNG_EXT_CAP_ID)) != NULL) {
+ for (i = 0; i < ARRAYSIZE(bigdata_11v_info); i++) {
+ if ((ie_11kv->len >= bigdata_11v_info[i].octet_len) &&
+ isset(ie_11kv->data, bigdata_11v_info[i].bitmap)) {
+ flag_11v |= bigdata_11v_info[i].flag;
+ }
+ }
+ }
+
+ if (flag_11k > 0) {
+ *support_11kv |= WL_BIGDATA_SUPPORT_11K;
+ }
+
+ if (flag_11v > 0) {
+ *support_11kv |= WL_BIGDATA_SUPPORT_11V;
+ }
+
+ *flag_11kv = flag_11k | flag_11v;
+}
+
+int wl_get_bss_info(struct bcm_cfg80211 *cfg, struct net_device *dev, struct ether_addr const *mac)
+{
+ s32 err = 0;
+ wl_bss_info_v109_1_t *bi;
+ uint8 eabuf[ETHER_ADDR_LEN];
+ u32 rate, channel, freq, supported_rate, nss = 0, mcs_map, mode_80211 = 0;
+ char rate_str[4];
+ u8 *ie = NULL;
+ u32 ie_len;
+ struct wiphy *wiphy;
+ struct cfg80211_bss *bss;
+ bcm_tlv_t *interworking_ie = NULL;
+ bcm_tlv_t *tlv_ie = NULL;
+ bcm_tlv_t *vht_ie = NULL;
+ vndr_ie_t *vndrie;
+ int16 ie_11u_rel_num = -1, ie_mu_mimo_cap = -1;
+ u32 i, remained_len, count = 0;
+ char roam_count_str[4], akm_str[4];
+ s32 val = 0;
+ uint8 support_11kv = 0;
+ uint32 flag_11kv = 0; /* bit flags of 11kv big data */
+
+ /* get BSS information */
+
+ strlcpy(cfg->bss_info, "x x x x x x x x x x x x x x x", sizeof(cfg->bss_info));
+
+ *(u32 *) cfg->extra_buf = htod32(WL_EXTRA_BUF_MAX);
+
+ err = wldev_ioctl_get(dev, WLC_GET_BSS_INFO, cfg->extra_buf, WL_EXTRA_BUF_MAX);
+ if (unlikely(err)) {
+ WL_ERR(("Could not get bss info %d\n", err));
+ cfg->roam_count = 0;
+ return -1;
+ }
+
+ if (!mac) {
+ WL_ERR(("mac is null \n"));
+ cfg->roam_count = 0;
+ return -1;
+ }
+
+ memcpy(eabuf, mac, ETHER_ADDR_LEN);
+
+ bi = (wl_bss_info_v109_1_t *)(cfg->extra_buf + 4);
+ channel = wf_chspec_ctlchan(bi->chanspec);
+
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 38) && !defined(WL_COMPAT_WIRELESS)
+ freq = ieee80211_channel_to_frequency(channel);
+#else
+#ifdef WL_6E
+ if (CHSPEC_IS6G(wl_chspec_driver_to_host(bi->chanspec))) {
+ freq = ieee80211_channel_to_frequency(channel, IEEE80211_BAND_6GHZ);
+ } else
+#endif /* WL_6E */
+ if (channel > 14) {
+ freq = ieee80211_channel_to_frequency(channel, IEEE80211_BAND_5GHZ);
+ } else {
+ freq = ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
+ }
+#endif /* LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 38) && !(WL_COMPAT_WIRELESS) */
+ rate = 0;
+ err = wldev_ioctl_get(dev, WLC_GET_RATE, &rate, sizeof(rate));
+ if (err) {
+ WL_ERR(("Could not get rate (%d)\n", err));
+ snprintf(rate_str, sizeof(rate_str), "x"); /* Unknown */
+
+ } else {
+ rate = dtoh32(rate);
+ snprintf(rate_str, sizeof(rate_str), "%d", (rate/2));
+ }
+
+ /* supported maximum rate */
+ supported_rate = (bi->rateset.rates[bi->rateset.count - 1] & 0x7f) / 2;
+
+ if (supported_rate < 12) {
+ mode_80211 = BIGDATA_DOT11_11B_MODE; /* 11b maximum rate is 11Mbps. 11b mode */
+ } else {
+ /* It's not HT Capable case. */
+ if (channel > 14) {
+ mode_80211 = BIGDATA_DOT11_11A_MODE; /* 11a mode */
+ } else {
+ mode_80211 = BIGDATA_DOT11_11G_MODE; /* 11g mode */
+ }
+ }
+
+ if (bi->n_cap) {
+ /* check Rx MCS Map for HT */
+ nss = 0;
+ mode_80211 = BIGDATA_DOT11_11N_MODE;
+ for (i = 0; i < MAX_STREAMS_SUPPORTED; i++) {
+ int8 bitmap = DOT11_HT_MCS_RATE_MASK;
+ if (i == MAX_STREAMS_SUPPORTED-1) {
+ bitmap = DOT11_RATE_MASK;
+ }
+ if (bi->basic_mcs[i] & bitmap) {
+ nss++;
+ }
+ }
+ }
+
+ if (bi->vht_cap) {
+ nss = 0;
+ mode_80211 = BIGDATA_DOT11_11AC_MODE;
+ for (i = 1; i <= VHT_CAP_MCS_MAP_NSS_MAX; i++) {
+ mcs_map = VHT_MCS_MAP_GET_MCS_PER_SS(i, dtoh16(bi->vht_rxmcsmap));
+ if (mcs_map != VHT_CAP_MCS_MAP_NONE) {
+ nss++;
+ }
+ }
+ }
+
+#if defined(WL11AX)
+ if (bi->he_cap) {
+ nss = 0;
+ mode_80211 = BIGDATA_DOT11_11AX_MODE;
+ for (i = 1; i <= HE_MCS_MAP_NSS_MAX; i++) {
+ mcs_map = HE_MCS_NSS_GET_MCS(i, dtoh32(bi->he_rxmcsmap));
+ if (mcs_map != HE_MCS_CODE_NONE) {
+ nss++;
+ }
+ }
+ }
+#endif /* WL11AX */
+
+ if (nss) {
+ nss = nss - 1;
+ }
+
+ wiphy = bcmcfg_to_wiphy(cfg);
+ bss = CFG80211_GET_BSS(wiphy, NULL, eabuf, bi->SSID, bi->SSID_len);
+ if (!bss) {
+ WL_ERR(("Could not find the AP\n"));
+ } else {
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+#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 */
+ GCC_DIAGNOSTIC_POP();
+ }
+
+ if (ie) {
+ ie_mu_mimo_cap = 0;
+ ie_11u_rel_num = 0;
+
+ if (bi->vht_cap) {
+ if ((vht_ie = bcm_parse_tlvs(ie, ie_len,
+ DOT11_MNG_VHT_CAP_ID)) != NULL) {
+ if (vht_ie->len >= VHT_CAP_IE_LEN) {
+ ie_mu_mimo_cap = (vht_ie->data[2] & 0x08) >> 3;
+ }
+ }
+ }
+
+ if ((interworking_ie = bcm_parse_tlvs(ie, ie_len,
+ DOT11_MNG_INTERWORKING_ID)) != NULL) {
+ if ((tlv_ie = bcm_parse_tlvs(ie, ie_len, DOT11_MNG_VS_ID)) != NULL) {
+ remained_len = ie_len;
+
+ while (tlv_ie) {
+ if (count > MAX_VNDR_IE_NUMBER)
+ break;
+
+ if (tlv_ie->id == DOT11_MNG_VS_ID) {
+ vndrie = (vndr_ie_t *) tlv_ie;
+
+ if (vndrie->len < (VNDR_IE_MIN_LEN + 1)) {
+ WL_ERR(("wl_get_bss_info: invalid vndr ie."
+ "length is too small %d\n",
+ vndrie->len));
+ break;
+ }
+
+ if (!bcmp(vndrie->oui,
+ (u8*)WiFiALL_OUI, WiFiALL_OUI_LEN) &&
+ (vndrie->data[0] == WiFiALL_OUI_TYPE))
+ {
+ WL_ERR(("Found Wi-FiAll OUI oui.\n"));
+ ie_11u_rel_num = vndrie->data[1];
+ ie_11u_rel_num = (ie_11u_rel_num & 0xf0)>>4;
+ ie_11u_rel_num += 1;
+
+ break;
+ }
+ }
+ count++;
+ tlv_ie = bcm_next_tlv(tlv_ie, &remained_len);
+ }
+ }
+ }
+
+ /* get 11kv information from ie of current bss */
+ wl_get_11kv_info(ie, ie_len, &support_11kv, &flag_11kv);
+ }
+
+ for (i = 0; i < bi->SSID_len; i++) {
+ if (bi->SSID[i] == ' ') {
+ bi->SSID[i] = '_';
+ }
+ }
+
+ /* 0 : None, 1 : OKC, 2 : FT, 3 : CCKM */
+ err = wldev_iovar_getint(dev, "wpa_auth", &val);
+ if (unlikely(err)) {
+ WL_ERR(("could not get wpa_auth (%d)\n", err));
+ snprintf(akm_str, sizeof(akm_str), "x"); /* Unknown */
+ } else {
+ WL_ERR(("wpa_auth val %d \n", val));
+ if (val & WPA2_AUTH_FT) {
+ snprintf(akm_str, sizeof(akm_str), "2");
+ } else if (val & (WPA_AUTH_UNSPECIFIED | WPA2_AUTH_UNSPECIFIED)) {
+ snprintf(akm_str, sizeof(akm_str), "1");
+ } else {
+ snprintf(akm_str, sizeof(akm_str), "0");
+ }
+ }
+
+ if (cfg->roam_offload) {
+ snprintf(roam_count_str, sizeof(roam_count_str), "x"); /* Unknown */
+ } else {
+ snprintf(roam_count_str, sizeof(roam_count_str), "%d", cfg->roam_count);
+ }
+ cfg->roam_count = 0;
+
+ WL_ERR(("BSSID:" MACDBG " SSID %s \n", MAC2STRDBG(eabuf), "*****"));
+ WL_ERR(("freq:%d, BW:%s, RSSI:%d dBm, Rate:%d Mbps, 11mode:%d, stream:%d,"
+ "MU-MIMO:%d, Passpoint:%d, SNR:%d, Noise:%d, \n"
+ "akm:%s, roam:%s, 11kv:%d/%d \n",
+ freq, wf_chspec_to_bw_str(bi->chanspec),
+ dtoh32(bi->RSSI), (rate / 2), mode_80211, nss,
+ ie_mu_mimo_cap, ie_11u_rel_num, bi->SNR, bi->phy_noise,
+ akm_str, roam_count_str, support_11kv, flag_11kv));
+
+ if (ie) {
+ snprintf(cfg->bss_info, GET_BSS_INFO_LEN,
+ MACOUI" %d %s %d %s %d %d %d %d %d %d %s %s %d %d",
+ MACOUI2STR(eabuf), freq, wf_chspec_to_bw_str(bi->chanspec),
+ dtoh32(bi->RSSI), rate_str, mode_80211, nss, ie_mu_mimo_cap,
+ ie_11u_rel_num, bi->SNR, bi->phy_noise, akm_str, roam_count_str,
+ support_11kv, flag_11kv);
+ } else {
+ /* ie_mu_mimo_cap and ie_11u_rel_num is unknow. */
+ snprintf(cfg->bss_info, GET_BSS_INFO_LEN,
+ MACOUI" %d %s %d %s %d %d x x %d %d %s %s x x",
+ MACOUI2STR(eabuf), freq, wf_chspec_to_bw_str(bi->chanspec),
+ dtoh32(bi->RSSI), rate_str, mode_80211, nss, bi->SNR,
+ bi->phy_noise, akm_str, roam_count_str);
+ }
+
+ CFG80211_PUT_BSS(wiphy, bss);
+
+ return 0;
+}
+
+s32 wl_cfg80211_get_bss_info(struct net_device *dev, char* cmd, int total_len)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+
+ if (cfg == NULL) {
+ return -1;
+ }
+
+ if (total_len < GET_BSS_INFO_LEN) {
+ WL_ERR(("wl_cfg80211_get_bss_info: Buffer insuffient %d\n", total_len));
+ return -1;
+ }
+
+ bzero(cmd, total_len);
+ memcpy(cmd, cfg->bss_info, GET_BSS_INFO_LEN);
+
+ WL_ERR_KERN(("cmd: %s \n", cmd));
+
+ return GET_BSS_INFO_LEN;
+}
+#endif /* DHD_ENABLE_BIGDATA_LOGGING */
+
+void wl_cfg80211_disassoc(struct net_device *ndev, uint32 reason)
+{
+ scb_val_t scbval;
+ s32 err;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
+
+ BCM_REFERENCE(cfg);
+ BCM_REFERENCE(dhdp);
+ DHD_STATLOG_CTRL(dhdp, ST(DISASSOC_INT_START),
+ dhd_net2idx(dhdp->info, ndev), WLAN_REASON_DEAUTH_LEAVING);
+
+ memset_s(&scbval, sizeof(scb_val_t), 0x0, sizeof(scb_val_t));
+ scbval.val = htod32(reason);
+ err = wldev_ioctl_set(ndev, WLC_DISASSOC, &scbval, sizeof(scb_val_t));
+ if (err < 0) {
+ WL_ERR(("WLC_DISASSOC error %d\n", err));
+ }
+}
+void wl_cfg80211_del_all_sta(struct net_device *ndev, uint32 reason)
+{
+ struct net_device *dev;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ scb_val_t scb_val;
+ int err;
+ 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;
+
+ dev = ndev_to_wlc_ndev(ndev, cfg);
+
+ if (p2p_is_on(cfg)) {
+ /* Suspend P2P discovery search-listen to prevent it from changing the
+ * channel.
+ */
+ if ((wl_cfgp2p_discover_enable_search(cfg, false)) < 0) {
+ WL_ERR(("Can not disable discovery mode\n"));
+ return;
+ }
+ }
+
+ assoc_maclist->count = MAX_NUM_OF_ASSOCIATED_DEV;
+ err = wldev_ioctl_get(ndev, WLC_GET_ASSOCLIST,
+ assoc_maclist, sizeof(mac_buf));
+ if (err < 0)
+ WL_ERR(("WLC_GET_ASSOCLIST error %d\n", err));
+ else
+ num_associated = assoc_maclist->count;
+
+ memset(scb_val.ea.octet, 0xff, ETHER_ADDR_LEN);
+ scb_val.val = DOT11_RC_DEAUTH_LEAVING;
+ scb_val.val = htod32(reason);
+ err = wldev_ioctl_set(dev, WLC_SCB_DEAUTHENTICATE_FOR_REASON, &scb_val,
+ sizeof(scb_val_t));
+ if (err < 0) {
+ WL_ERR(("WLC_SCB_DEAUTHENTICATE_FOR_REASON err %d\n", err));
+ }
+
+ if (num_associated > 0)
+ wl_delay(400);
+
+ return;
+}
+/* API to handle the Deauth from the AP.
+* For now we are deleting the PMKID cache in DHD/FW
+* in case of current connection is using SAE authnetication
+*/
+static s32
+wl_cfg80211_handle_deauth_ind(struct bcm_cfg80211 *cfg, struct net_device *ndev,
+ const wl_event_msg_t *e, void *data)
+{
+ int err = BCME_OK;
+#ifdef WL_SAE
+ uint8 bssid[ETHER_ADDR_LEN];
+ struct cfg80211_pmksa pmksa;
+ s32 val = 0;
+
+ err = wldev_iovar_getint(ndev, "wpa_auth", &val);
+ if (unlikely(err)) {
+ WL_ERR(("could not get wpa_auth (%d)\n", err));
+ goto done;
+ }
+ if (val == WPA3_AUTH_SAE_PSK) {
+ (void)memcpy_s(bssid, ETHER_ADDR_LEN,
+ (const uint8*)&e->addr, ETHER_ADDR_LEN);
+ memset_s(&pmksa, sizeof(pmksa), 0, sizeof(pmksa));
+ pmksa.bssid = bssid;
+ WL_INFORM_MEM(("Deleting the PMKSA for SAE AP "MACDBG,
+ MAC2STRDBG(e->addr.octet)));
+ wl_cfg80211_del_pmksa(cfg->wdev->wiphy, ndev, &pmksa);
+ }
+done:
+#endif /* WL_SAE */
+ return err;
+}
+
+static void
+wl_cache_assoc_resp_ies(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(cfg);
+ u32 datalen = ntoh32(e->datalen);
+ u32 event_type = ntoh32(e->event_type);
+
+ if (datalen > VNDR_IE_MIN_LEN &&
+ datalen < VNDR_IE_MAX_LEN &&
+ data) {
+ conn_info->resp_ie_len = datalen;
+ WL_DBG((" assoc resp IES len = %d\n", conn_info->resp_ie_len));
+ bzero(conn_info->resp_ie, sizeof(conn_info->resp_ie));
+ (void)memcpy_s(conn_info->resp_ie, sizeof(conn_info->resp_ie),
+ data, datalen);
+
+ WL_INFORM_MEM(("[%s] copied assoc resp ies, sent to upper layer:"
+ "event %d reason=%d ie_len=%d from " MACDBG "\n",
+ ndev->name, event_type, ntoh32(e->reason), datalen,
+ MAC2STRDBG((const u8*)(&e->addr))));
+ }
}
static s32
@@ -9581,53 +15400,222 @@
struct net_device *ndev = NULL;
s32 err = 0;
u32 event = ntoh32(e->event_type);
+ u32 datalen = ntoh32(e->datalen);
struct wiphy *wiphy = NULL;
struct cfg80211_bss *bss = NULL;
struct wlc_ssid *ssid = NULL;
u8 *bssid = 0;
+ s32 bssidx = 0;
+ u8 *ie_ptr = NULL;
+ uint32 ie_len = 0;
+#ifdef WL_ANALYTICS
+ struct parsed_vndr_ies disco_vndr_ie;
+ struct parsed_vndr_ie_info *vndrie_info = NULL;
+ uint32 i = 0;
+#endif /* WL_ANALYTICS */
+
+ dhd_pub_t *dhdp;
+ u32 mode;
+ int vndr_oui_num = 0;
+ char vndr_oui[MAX_VNDR_OUI_STR_LEN] = {0, };
+ bool loc_gen = false;
+#ifdef DHD_LOSSLESS_ROAMING
+ struct wl_security *sec;
+#endif /* DHD_LOSSLESS_ROAMING */
ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
+#ifdef DHD_LOSSLESS_ROAMING
+ sec = wl_read_prof(cfg, ndev, WL_PROF_SEC);
+#endif /* DHD_LOSSLESS_ROAMING */
+ dhdp = (dhd_pub_t *)(cfg->pub);
+ BCM_REFERENCE(dhdp);
- if (wl_get_mode_by_netdev(cfg, ndev) == WL_MODE_AP) {
+ mode = wl_get_mode_by_netdev(cfg, ndev);
+ /* Push link events to upper layer log */
+ SUPP_LOG(("[%s] Mode:%d event:%d status:0x%x reason:%d\n",
+ ndev->name, mode, ntoh32(e->event_type),
+ ntoh32(e->status), ntoh32(e->reason)));
+ if (mode == 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) {
+ } else if (mode == 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));
+ } else if (mode == WL_MODE_BSS) {
+ WL_INFORM_MEM(("[%s] Mode BSS. event:%d status:%d reason:%d\n",
+ ndev->name, ntoh32(e->event_type),
+ ntoh32(e->status), ntoh32(e->reason)));
+
+ if (!wl_get_drv_status(cfg, CFG80211_CONNECT, ndev)) {
+ /* Join attempt via non-cfg80211 interface.
+ * Don't send resultant events to cfg80211
+ * layer
+ */
+ WL_INFORM_MEM(("Event received in non-cfg80211"
+ " connect state. Ignore\n"));
+ return BCME_OK;
+ }
+
if (event == WLC_E_ASSOC || event == WLC_E_AUTH) {
- wl_get_auth_assoc_status(cfg, ndev, e);
+ wl_get_auth_assoc_status(cfg, ndev, e, data);
return 0;
}
+ if (event == WLC_E_ASSOC_RESP_IE) {
+ if (ntoh32(e->status) != WLC_E_STATUS_SUCCESS) {
+ wl_cache_assoc_resp_ies(cfg, ndev, e, data);
+ }
+ return 0;
+ }
+
+#if defined(OEM_ANDROID)
+ DHD_DISABLE_RUNTIME_PM((dhd_pub_t *)cfg->pub);
+#endif // endif
if (wl_is_linkup(cfg, e, ndev)) {
wl_link_up(cfg);
act = true;
if (!wl_get_drv_status(cfg, DISCONNECTING, ndev)) {
-#ifdef DHD_LOSSLESS_ROAMING
- bool is_connected = wl_get_drv_status(cfg, CONNECTED, ndev);
-#endif
+ WL_INFORM_MEM(("[%s] link up for bssid " MACDBG "\n",
+ ndev->name, MAC2STRDBG((const u8*)(&e->addr))));
+ if ((event == WLC_E_LINK) &&
+ (ntoh16(e->flags) & WLC_EVENT_MSG_LINK) &&
+ !wl_get_drv_status(cfg, CONNECTED, ndev) &&
+ !wl_get_drv_status(cfg, CONNECTING, ndev)) {
+ WL_INFORM_MEM(("link up in non-connected/"
+ "non-connecting state\n"));
+ wl_cfg80211_disassoc(ndev, WLAN_REASON_DEAUTH_LEAVING);
+ return BCME_OK;
+ }
- printk("wl_bss_connect_done succeeded with " MACDBG "\n",
- MAC2STRDBG((const u8*)(&e->addr)));
- wl_bss_connect_done(cfg, ndev, e, data, true);
- WL_DBG(("joined in BSS network \"%s\"\n",
- ((struct wlc_ssid *)
- wl_read_prof(cfg, ndev, WL_PROF_SSID))->SSID));
+#ifdef WL_WPS_SYNC
+ /* Avoid invocation for Roam cases */
+ if ((event == WLC_E_LINK) &&
+ !wl_get_drv_status(cfg, CONNECTED, ndev)) {
+ wl_wps_session_update(ndev,
+ WPS_STATE_LINKUP, e->addr.octet);
+ }
+#endif /* WL_WPS_SYNC */
+
+#ifdef DHD_EVENT_LOG_FILTER
+ if (event == WLC_E_LINK && ndev == bcmcfg_to_prmry_ndev(cfg)) {
+ int roam = FALSE;
+ uint8 eth_addr[ETHER_ADDR_LEN];
+ if (TRUE &&
#ifdef DHD_LOSSLESS_ROAMING
- if (event == WLC_E_LINK && is_connected &&
- !cfg->roam_offload) {
- wl_bss_roaming_done(cfg, ndev, e, data);
+ !cfg->roam_offload &&
+#endif /* DHD_LOSSLESS_ROAMING */
+ wl_get_drv_status(cfg, CONNECTED, ndev)) {
+ roam = TRUE;
}
+ memcpy(eth_addr, &(e->addr), ETHER_ADDR_LEN);
+ dhd_event_log_filter_notify_connect_done(dhdp,
+ eth_addr, roam);
+ }
+#endif /* DHD_EVENT_LOG_FILTER */
+
+#ifdef DHD_LOSSLESS_ROAMING
+ if (event == WLC_E_LINK &&
+ !cfg->roam_offload &&
+ !IS_AKM_SUITE_FT(sec) &&
+ wl_get_drv_status(cfg, CONNECTED, ndev))
+ wl_bss_roaming_done(cfg, ndev, e, data);
#endif /* DHD_LOSSLESS_ROAMING */
+ wl_update_prof(cfg, ndev, e, &act, WL_PROF_ACT);
+ wl_bss_connect_done(cfg, ndev, e, data, true);
+ if (ndev == bcmcfg_to_prmry_ndev(cfg)) {
+ vndr_oui_num = wl_vndr_ies_get_vendor_oui(cfg,
+ ndev, vndr_oui, ARRAY_SIZE(vndr_oui));
+ if (vndr_oui_num > 0) {
+ WL_INFORM_MEM(("[%s] vendor oui: %s\n",
+ ndev->name, vndr_oui));
+ }
}
+
+ WL_DBG(("joined in BSS network \"%s\"\n",
+ ((struct wlc_ssid *)wl_read_prof(cfg, ndev,
+ WL_PROF_SSID))->SSID));
+#ifdef WBTEXT
+ if (ndev->ieee80211_ptr->iftype == NL80211_IFTYPE_STATION &&
+ dhdp->wbtext_support && event == WLC_E_SET_SSID) {
+ /* set wnm_keepalives_max_idle after association */
+ wl_cfg80211_wbtext_set_wnm_maxidle(cfg, ndev);
+ }
+#endif /* WBTEXT */
+ }
wl_update_prof(cfg, ndev, e, &act, WL_PROF_ACT);
wl_update_prof(cfg, ndev, NULL, (const void *)&e->addr, WL_PROF_BSSID);
-
+#if defined(IGUANA_LEGACY_CHIPS)
} else if (wl_is_linkdown(cfg, e)) {
+ /* Lagacy chips like 4350 sends faliure status for WLC_E_SET_SSID even in
+ * case of successful connection. Since these firmware are in production,
+ * firmware change is avoided.
+ */
+#else
+ } else if (wl_is_linkdown(cfg, e) ||
+ ((event == WLC_E_SET_SSID) &&
+ (ntoh32(e->status) != WLC_E_STATUS_SUCCESS) &&
+ (wl_get_drv_status(cfg, CONNECTED, ndev)))) {
+#endif // endif
+ if (wl_is_linkdown(cfg, e)) {
+ /* Clear IEs for disaasoc */
+ if ((bssidx = wl_get_bssidx_by_wdev(cfg,
+ ndev->ieee80211_ptr)) < 0) {
+ WL_ERR(("Find index failed\n"));
+ } else {
+ WL_ERR(("link down--clearing disconnect IEs\n"));
+ if ((err = wl_cfg80211_set_mgmt_vndr_ies(cfg,
+ ndev_to_cfgdev(ndev), bssidx, VNDR_IE_DISASSOC_FLAG,
+ NULL, 0)) != BCME_OK) {
+ WL_ERR(("Failed to clear ies err = %d\n", err));
+ }
+ }
+ }
+
+ WL_INFORM_MEM(("link down. connection state bit status: [%u:%u:%u:%u]\n",
+ 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, NESTED_CONNECT, ndev)));
+
+#ifdef WL_WPS_SYNC
+ {
+ u8 wps_state;
+ if ((event == WLC_E_SET_SSID) &&
+ (ntoh32(e->status) != WLC_E_STATUS_SUCCESS)) {
+ /* connect fail */
+ wps_state = WPS_STATE_CONNECT_FAIL;
+ } else {
+ wps_state = WPS_STATE_LINKDOWN;
+ }
+ if (wl_wps_session_update(ndev,
+ wps_state, e->addr.octet) == BCME_UNSUPPORTED) {
+ /* Unexpected event. Ignore it. */
+ return 0;
+ }
+ }
+#endif /* WL_WPS_SYNC */
+
+ if (wl_get_drv_status(cfg, DISCONNECTING, ndev) &&
+ (wl_get_drv_status(cfg, NESTED_CONNECT, ndev) ||
+ wl_get_drv_status(cfg, CONNECTING, ndev))) {
+ /* wl_cfg80211_connect was called before 'DISCONNECTING' was
+ * cleared. Deauth/Link down event is caused by WLC_DISASSOC
+ * command issued from the wl_cfg80211_connect context. Ignore
+ * the event to avoid pre-empting the current connection
+ */
+ WL_DBG(("Nested connection case. Drop event. \n"));
+ wl_clr_drv_status(cfg, NESTED_CONNECT, ndev);
+ wl_clr_drv_status(cfg, DISCONNECTING, ndev);
+ /* Not in 'CONNECTED' state, clear it */
+ wl_clr_drv_status(cfg, CONNECTED, ndev);
+ return 0;
+ }
+
+ if (wl_get_drv_status(cfg, CONNECTED, ndev)) {
+ wl_flush_fw_log_buffer(bcmcfg_to_prmry_ndev(cfg),
+ FW_LOGSET_MASK_ALL);
+ }
#ifdef DHD_LOSSLESS_ROAMING
wl_del_roam_timeout(cfg);
-#endif
+#endif // endif
#ifdef P2PLISTEN_AP_SAMECHN
if (ndev == bcmcfg_to_prmry_ndev(cfg)) {
wl_cfg80211_set_p2p_resp_ap_chn(ndev, 0);
@@ -9637,115 +15625,362 @@
#endif /* P2PLISTEN_AP_SAMECHN */
wl_cfg80211_cancel_scan(cfg);
+#if defined(DHD_ENABLE_BIGDATA_LOGGING)
+ if (wl_get_drv_status(cfg, CONNECTED, ndev)) {
+ wl_get_bss_info(cfg, ndev, &e->addr);
+ }
+#endif /* DHD_ENABLE_BIGDATA_LOGGING */
/* Explicitly calling unlink to remove BSS in CFG */
- if (wl_cfgp2p_vif_created(cfg)) {
- wiphy = bcmcfg_to_wiphy(cfg);
- ssid = (struct wlc_ssid *)wl_read_prof(cfg, ndev, WL_PROF_SSID);
- bssid = (u8 *)wl_read_prof(cfg, ndev, WL_PROF_BSSID);
- if (ssid && bssid) {
- bss = cfg80211_get_bss(wiphy, NULL, bssid,
- ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS,
- WLAN_CAPABILITY_ESS);
- if (bss) {
- cfg80211_unlink_bss(wiphy, bss);
- }
+ wiphy = bcmcfg_to_wiphy(cfg);
+ ssid = (struct wlc_ssid *)wl_read_prof(cfg, ndev, WL_PROF_SSID);
+ bssid = (u8 *)wl_read_prof(cfg, ndev, WL_PROF_BSSID);
+ if (ssid && bssid) {
+ bss = CFG80211_GET_BSS(wiphy, NULL, bssid,
+ ssid->SSID, ssid->SSID_len);
+ if (bss) {
+ cfg80211_unlink_bss(wiphy, bss);
+ CFG80211_PUT_BSS(wiphy, bss);
}
}
if (wl_get_drv_status(cfg, CONNECTED, ndev)) {
scb_val_t scbval;
u8 *curbssid = wl_read_prof(cfg, ndev, WL_PROF_BSSID);
- s32 reason = 0;
- struct ether_addr bssid_dongle;
+ uint32 reason = 0;
+ struct ether_addr bssid_dongle = {{0, 0, 0, 0, 0, 0}};
+ struct ether_addr bssid_null = {{0, 0, 0, 0, 0, 0}};
- if (event == WLC_E_DEAUTH_IND || event == WLC_E_DISASSOC_IND)
+ if (event == WLC_E_DEAUTH_IND || event == WLC_E_DISASSOC_IND) {
reason = ntoh32(e->reason);
- /* WLAN_REASON_UNSPECIFIED is used for hang up event in Android */
- reason = (reason == WLAN_REASON_UNSPECIFIED)? 0 : reason;
-
- printk("link down if %s may call cfg80211_disconnected. "
- "event : %d, reason=%d from " MACDBG "\n",
- ndev->name, event, ntoh32(e->reason),
- MAC2STRDBG((const u8*)(&e->addr)));
+ if (reason > WLC_E_DEAUTH_MAX_REASON) {
+ WL_ERR(("Event %d original reason is %d, "
+ "changed 0xFF\n", event, reason));
+ reason = WLC_E_DEAUTH_MAX_REASON;
+ }
+ wl_cfg80211_handle_deauth_ind(cfg, ndev, e, data);
+ }
+#ifdef SET_SSID_FAIL_CUSTOM_RC
+ if ((event == WLC_E_SET_SSID) &&
+ (ntoh32(e->status) == WLC_E_STATUS_TIMEOUT)) {
+ reason = SET_SSID_FAIL_CUSTOM_RC;
+ }
+#endif /* SET_SSID_FAIL_CUSTOM_RC */
/* roam offload does not sync BSSID always, get it from dongle */
if (cfg->roam_offload) {
- memset(&bssid_dongle, 0, sizeof(bssid_dongle));
- if (wldev_ioctl(ndev, WLC_GET_BSSID, &bssid_dongle,
- sizeof(bssid_dongle), false) == BCME_OK) {
- curbssid = (u8 *)&bssid_dongle;
+ bzero(&bssid_dongle, sizeof(bssid_dongle));
+ if (wldev_ioctl_get(ndev, WLC_GET_BSSID, &bssid_dongle,
+ sizeof(bssid_dongle)) == BCME_OK) {
+ /* if not roam case, it would return null bssid */
+ if (memcmp(&bssid_dongle, &bssid_null,
+ ETHER_ADDR_LEN) != 0) {
+ curbssid = (u8 *)&bssid_dongle;
+ }
}
}
if (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((const u8*)(&e->addr))));
- return 0;
+ bool fw_assoc_state = TRUE;
+ dhd_pub_t *dhd = (dhd_pub_t *)cfg->pub;
+ fw_assoc_state = dhd_is_associated(dhd, e->ifidx, &err);
+ if (!fw_assoc_state) {
+ WL_ERR(("Event sends up even different BSSID"
+ " cur: " MACDBG " event: " MACDBG"\n",
+ MAC2STRDBG(curbssid),
+ MAC2STRDBG((const u8*)(&e->addr))));
+ } else {
+ WL_ERR(("BSSID of event is not the connected BSSID"
+ "(ignore it) cur: " MACDBG
+ " event: " MACDBG"\n",
+ MAC2STRDBG(curbssid),
+ MAC2STRDBG((const u8*)(&e->addr))));
+ return 0;
+ }
}
+#ifdef DBG_PKT_MON
+ /* Stop packet monitor */
+ if (ndev == bcmcfg_to_prmry_ndev(cfg)) {
+ DHD_DBG_PKT_MON_STOP(dhdp);
+ }
+#endif /* DBG_PKT_MON */
+ /* clear RSSI monitor, framework will set new cfg */
+#ifdef RSSI_MONITOR_SUPPORT
+ dhd_dev_set_rssi_monitor_cfg(bcmcfg_to_prmry_ndev(cfg),
+ FALSE, 0, 0);
+#endif /* RSSI_MONITOR_SUPPORT */
wl_clr_drv_status(cfg, CONNECTED, ndev);
- if (! wl_get_drv_status(cfg, DISCONNECTING, ndev)) {
+
+ if (!wl_get_drv_status(cfg, DISCONNECTING, ndev)) {
+ DHD_STATLOG_CTRL(dhdp, ST(DISASSOC_INT_START),
+ dhd_net2idx(dhdp->info, ndev),
+ WLAN_REASON_DEAUTH_LEAVING);
/* To make sure disconnect, explictly send dissassoc
* for BSSID 00:00:00:00:00:00 issue
*/
scbval.val = WLAN_REASON_DEAUTH_LEAVING;
-
+ WL_INFORM_MEM(("clear fw state\n"));
memcpy(&scbval.ea, curbssid, ETHER_ADDR_LEN);
scbval.val = htod32(scbval.val);
- err = wldev_ioctl(ndev, WLC_DISASSOC, &scbval,
- sizeof(scb_val_t), true);
+ err = wldev_ioctl_set(ndev, WLC_DISASSOC, &scbval,
+ sizeof(scb_val_t));
if (err < 0) {
WL_ERR(("WLC_DISASSOC error %d\n", err));
err = 0;
}
- CFG80211_DISCONNECTED(ndev, reason, NULL, 0,
- false, GFP_KERNEL);
- wl_link_down(cfg);
- wl_init_prof(cfg, ndev);
- memset(&cfg->last_roamed_addr, 0, ETHER_ADDR_LEN);
}
+ if (wl_get_drv_status(cfg, DISCONNECTING, ndev)) {
+ loc_gen = true;
+ }
+ WL_INFORM_MEM(("[%s] Indicate disconnect event to upper layer. "
+ "event: %d reason=%d from " MACDBG "\n",
+ ndev->name, event, ntoh32(e->reason),
+ MAC2STRDBG((const u8*)(&e->addr))));
+
+#ifdef WBTEXT
+ /* when STA was disconnected, clear join pref and set wbtext */
+ if (ndev->ieee80211_ptr->iftype == NL80211_IFTYPE_STATION &&
+ dhdp->wbtext_policy
+ == WL_BSSTRANS_POLICY_PRODUCT_WBTEXT) {
+ char smbuf[WLC_IOCTL_SMLEN];
+ char clear[] = { 0x01, 0x02, 0x00, 0x00, 0x03,
+ 0x02, 0x00, 0x00, 0x04, 0x02, 0x00, 0x00 };
+ if ((err = wldev_iovar_setbuf(ndev, "join_pref",
+ clear, sizeof(clear), smbuf,
+ sizeof(smbuf), NULL))
+ == BCME_OK) {
+ if ((err = wldev_iovar_setint(ndev,
+ "wnm_bsstrans_resp",
+ dhdp->wbtext_policy))
+ == BCME_OK) {
+ wl_cfg80211_wbtext_set_default(ndev);
+ } else {
+ WL_ERR(("wl_notify_connect_status:"
+ " Failed to"
+ " set wbtext = %d\n",
+ err));
+ }
+ } else {
+ WL_ERR(("wl_notify_connect_status:"
+ " Failed to clear join pref = %d\n",
+ err));
+ }
+ wl_cfg80211_wbtext_clear_bssid_list(cfg);
+ }
+#endif /* WBTEXT */
+ DHD_STATLOG_CTRL(dhdp, ST(DISASSOC_DONE),
+ dhd_net2idx(dhdp->info, ndev), reason);
+ /* Send up deauth and clear states */
+
+ /*
+ * FW sends body and body len as a part of deauth
+ * and disassoc events (WLC_E_DISASSOC_IND, WLC_E_DEAUTH_IND)
+ * The VIEs sits after reason code in the body. Reason code is
+ * 2 bytes long.
+ */
+ WL_DBG(("recv disconnect ies ie_len = %d\n", ie_len));
+ if (event == WLC_E_DISASSOC_IND || event == WLC_E_DEAUTH_IND) {
+ if ((datalen > DOT11_DISCONNECT_RC) &&
+ datalen < (VNDR_IE_MAX_LEN + DOT11_DISCONNECT_RC) &&
+ data) {
+ ie_ptr = (uchar*)data + DOT11_DISCONNECT_RC;
+ ie_len = datalen - DOT11_DISCONNECT_RC;
+ }
+ } else if (event == WLC_E_LINK &&
+ ntoh32(e->reason) == WLC_E_LINK_BCN_LOSS) {
+#ifdef WL_ANALYTICS
+ /*
+ * In case of linkdown, FW sends prb rsp IEs. Disco VIE
+ * are appended with prb rsp ies. Remove prb rsp IES and
+ * send disco vie to upper layer.
+ * Disco VIE has fixed len of 11 octets.
+ * As per SS spec.(2 octet header + 9 octet VIE)
+ */
+ if (datalen < (VNDR_IE_MAX_LEN + DOT11_DISCONNECT_RC) &&
+ datalen >= DOT11_DISCONNECT_RC &&
+ ((err = wl_cfg80211_parse_vndr_ies(
+ (const u8 *)data, datalen,
+ &disco_vndr_ie)) == BCME_OK)) {
+ for (i = 0; i < disco_vndr_ie.count; i++) {
+ vndrie_info = &disco_vndr_ie.ie_info[i];
+ if ((vndrie_info->vndrie.id ==
+ 0xDD) && (!memcmp(
+ vndrie_info->vndrie.oui,
+ SSE_OUI, DOT11_OUI_LEN)) &&
+ (vndrie_info->vndrie.data[0] ==
+ VENDOR_ENTERPRISE_STA_OUI_TYPE)) {
+ ie_ptr = (u8 *)vndrie_info->ie_ptr;
+ ie_len = vndrie_info->ie_len;
+ }
+ }
+ }
+#endif /* WL_ANALYTICS */
+ }
+
+ CFG80211_DISCONNECTED(ndev, reason, ie_ptr, ie_len,
+ loc_gen, GFP_KERNEL);
+ WL_INFORM_MEM(("[%s] Disconnect event sent to upper layer"
+ "event:%d reason=%d ie_len=%d from " MACDBG "\n",
+ ndev->name, event, ntoh32(e->reason), ie_len,
+ MAC2STRDBG((const u8*)(&e->addr))));
+
+ /* Wait for status to be cleared to prevent race condition
+ * issues with connect context
+ * In DISCONNECTING state, There is rtnl_lock issue on cfg80211.
+ */
+ if (!loc_gen)
+ wl_cfg80211_disconnect_state_sync(cfg, ndev);
+ wl_link_down(cfg);
+ wl_init_prof(cfg, ndev);
}
else if (wl_get_drv_status(cfg, CONNECTING, ndev)) {
- printk("link down, during connecting\n");
+ DHD_STATLOG_CTRL(dhdp, ST(DISASSOC_INT_START),
+ dhd_net2idx(dhdp->info, ndev), 0);
+ WL_INFORM_MEM(("link down, during connecting\n"));
+ /* Issue WLC_DISASSOC to prevent FW roam attempts.
+ * Do not issue WLC_DISASSOC again if the linkdown is
+ * generated due to local disassoc, to avoid connect-disconnect
+ * loop.
+ */
+ if (!((event == WLC_E_LINK) &&
+ (ntoh32(e->reason) == WLC_E_LINK_DISASSOC) &&
+ (ntoh32(e->status) == WLC_E_STATUS_SUCCESS))) {
+ err = wldev_ioctl_set(ndev, WLC_DISASSOC, NULL, 0);
+ if (err < 0) {
+ WL_ERR(("CONNECTING state,"
+ " WLC_DISASSOC error %d\n",
+ err));
+ err = 0;
+ }
#ifdef ESCAN_RESULT_PATCH
- if ((memcmp(connect_req_bssid, broad_bssid, ETHER_ADDR_LEN) == 0) ||
- (memcmp(&e->addr, broad_bssid, ETHER_ADDR_LEN) == 0) ||
- (memcmp(&e->addr, connect_req_bssid, ETHER_ADDR_LEN) == 0))
- /* In case this event comes while associating another AP */
+ if ((memcmp(connect_req_bssid, broad_bssid,
+ ETHER_ADDR_LEN) == 0) ||
+ (memcmp(&e->addr, broad_bssid,
+ ETHER_ADDR_LEN) == 0) ||
+ (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(cfg, ndev, e, data, false);
+ wl_bss_connect_done(cfg, ndev, e, data, false);
+ }
}
wl_clr_drv_status(cfg, DISCONNECTING, ndev);
/* if link down, bsscfg is diabled */
if (ndev != bcmcfg_to_prmry_ndev(cfg))
complete(&cfg->iface_disable);
-
+#ifdef REVERSE_AIFSN
+ ((dhd_pub_t *)cfg->pub)->aifsn_reverse = FALSE;
+#endif /* REVERSE_AIFSN */
+#ifdef WLTDLS
+ /* re-enable TDLS if the number of connected interfaces
+ * is less than 2.
+ */
+ wl_cfg80211_tdls_config(cfg, TDLS_STATE_DISCONNECT, false);
+#endif /* WLTDLS */
} 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));
+ WL_ERR(("connect failed event=%d e->status %d e->reason %d \n",
+ event, (int)ntoh32(e->status), (int)ntoh32(e->reason)));
+#ifdef WL_WPS_SYNC
+ if (wl_wps_session_update(ndev,
+ WPS_STATE_CONNECT_FAIL, e->addr.octet) == BCME_UNSUPPORTED) {
+ /* Unexpected event. Ignore it. */
+ return 0;
+ }
+#endif /* WL_WPS_SYNC */
+#if defined(DHD_ENABLE_BIGDATA_LOGGING)
+ if (event == WLC_E_SET_SSID) {
+ wl_get_connect_failed_status(cfg, e);
+ }
+#endif /* DHD_ENABLE_BIGDATA_LOGGING */
+ /* Dump FW preserve buffer content */
+ wl_flush_fw_log_buffer(ndev, FW_LOGSET_MASK_ALL);
+
/* Clean up any pending scan request */
wl_cfg80211_cancel_scan(cfg);
- if (wl_get_drv_status(cfg, CONNECTING, ndev))
+
+ if (wl_get_drv_status(cfg, CONNECTING, ndev)) {
+ if (!wl_get_drv_status(cfg, DISCONNECTING, ndev)) {
+ WL_INFORM_MEM(("wl dissassoc\n"));
+ err = wldev_ioctl_set(ndev, WLC_DISASSOC, NULL, 0);
+ if (err < 0) {
+ WL_ERR(("WLC_DISASSOC error %d\n", err));
+ err = 0;
+ }
+ } else {
+ WL_DBG(("connect fail. clear disconnecting bit\n"));
+ wl_clr_drv_status(cfg, DISCONNECTING, ndev);
+ }
wl_bss_connect_done(cfg, ndev, e, data, false);
+ wl_clr_drv_status(cfg, CONNECTING, ndev);
+ WL_INFORM_MEM(("connect fail reported\n"));
+ }
} else {
- WL_DBG(("%s nothing\n", __FUNCTION__));
+ WL_DBG(("wl_notify_connect_status nothing\n"));
}
- }
- else {
+#if defined(OEM_ANDROID)
+ DHD_ENABLE_RUNTIME_PM((dhd_pub_t *)cfg->pub);
+#endif // endif
+ } else {
WL_ERR(("Invalid ndev status %d\n", wl_get_mode_by_netdev(cfg, ndev)));
}
return err;
}
-void wl_cfg80211_set_rmc_pid(int pid)
+#ifdef WL_RELMCAST
+void wl_cfg80211_set_rmc_pid(struct net_device *dev, int pid)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
if (pid > 0)
cfg->rmc_event_pid = pid;
WL_DBG(("set pid for rmc event : pid=%d\n", pid));
}
+#endif /* WL_RELMCAST */
+#ifdef WLAIBSS
+void wl_cfg80211_set_txfail_pid(struct net_device *dev, int pid)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ if (pid > 0)
+ cfg->aibss_txfail_pid = pid;
+ WL_DBG(("set pid for aibss fail event : 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;
+#ifdef PCIE_FULL_DONGLE
+ dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+ u32 reason = ntoh32(e->reason);
+#endif // endif
+ if (cfg->aibss_txfail_pid != 0) {
+#ifdef PCIE_FULL_DONGLE
+ if (reason == AIBSS_PEER_FREE) {
+ uint8 ifindex;
+ wl_event_msg_t event;
+
+ bzero(&event, sizeof(wl_event_msg_t));
+ memcpy(&event, e, sizeof(wl_event_msg_t));
+
+ ifindex = (uint8)dhd_ifname2idx(dhd->info, event.ifname);
+ WL_INFORM_MEM(("Peer freed. Flow rings delete for peer.\n"));
+ dhd_flow_rings_delete_for_peer(dhd, ifindex,
+ (void *)&event.addr.octet[0]);
+ return 0;
+ }
+#endif // endif
+ ret = wl_netlink_send_msg(cfg->aibss_txfail_pid, AIBSS_EVENT_TXFAIL,
+ cfg->aibss_txfail_seq++, &e->addr, ETHER_ADDR_LEN);
+ }
+
+ WL_DBG(("txfail : evt=%d, pid=%d, ret=%d, mac=" MACF "\n",
+ evt, cfg->aibss_txfail_pid, ret, CONST_ETHERP_TO_MACF(&e->addr)));
+ return ret;
+}
+#endif /* WLAIBSS */
#ifdef WL_RELMCAST
static s32
wl_notify_rmc_status(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
@@ -9804,6 +16039,7 @@
}
#endif /* GSCAN_SUPPORT */
+#ifdef RSSI_MONITOR_SUPPORT
static s32 wl_handle_rssi_monitor_event(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
const wl_event_msg_t *e, void *data)
{
@@ -9812,6 +16048,7 @@
u32 datalen = be32_to_cpu(e->datalen);
struct net_device *ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
struct wiphy *wiphy = bcmcfg_to_wiphy(cfg);
+
if (datalen) {
wl_rssi_monitor_evt_t *evt_data = (wl_rssi_monitor_evt_t *)data;
if (evt_data->version == RSSI_MONITOR_VERSION) {
@@ -9830,6 +16067,7 @@
#endif /* WL_VENDOR_EXT_SUPPORT || CONFIG_BCMDHD_VENDOR_EXT */
return BCME_OK;
}
+#endif /* RSSI_MONITOR_SUPPORT */
static s32
wl_notify_roaming_status(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
@@ -9842,7 +16080,10 @@
u32 status = be32_to_cpu(e->status);
#ifdef DHD_LOSSLESS_ROAMING
struct wl_security *sec;
-#endif
+#endif // endif
+#if defined(WBTEXT)
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
+#endif /* WBTEXT */
WL_DBG(("Enter \n"));
ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
@@ -9857,81 +16098,299 @@
if ((event == WLC_E_ROAM || event == WLC_E_BSSID) && status == WLC_E_STATUS_SUCCESS) {
if (wl_get_drv_status(cfg, CONNECTED, ndev)) {
- if (cfg->roam_offload &&
- memcmp(&cfg->last_roamed_addr, &e->addr, ETHER_ADDR_LEN) == 0) {
- WL_INFORM(("BSSID already updated\n"));
- return err;
- }
#ifdef DHD_LOSSLESS_ROAMING
- if (cfg->roam_offload) {
+ sec = wl_read_prof(cfg, ndev, WL_PROF_SEC);
+ /* In order to reduce roaming delay, wl_bss_roaming_done is
+ * early called with WLC_E_LINK event. It is called from
+ * here only if WLC_E_LINK event is blocked for specific
+ * security type.
+ */
+ if (IS_AKM_SUITE_FT(sec)) {
wl_bss_roaming_done(cfg, ndev, e, data);
+ }
+ /* Roam timer is deleted mostly from wl_cfg80211_change_station
+ * after roaming is finished successfully. We need to delete
+ * the timer from here only for some security types that aren't
+ * using wl_cfg80211_change_station to authorize SCB
+ */
+ if (IS_AKM_SUITE_FT(sec) || IS_AKM_SUITE_CCKM(sec)) {
wl_del_roam_timeout(cfg);
}
- else {
- sec = wl_read_prof(cfg, ndev, WL_PROF_SEC);
- /* In order to reduce roaming delay, wl_bss_roaming_done is
- * early called with WLC_E_LINK event. It is called from
- * here only if WLC_E_LINK event is blocked for specific
- * security type.
- */
- if (IS_AKM_SUITE_FT(sec)) {
- wl_bss_roaming_done(cfg, ndev, e, data);
- }
- /* Roam timer is deleted mostly from wl_cfg80211_change_station
- * after roaming is finished successfully. We need to delete
- * the timer from here only for some security types that aren't
- * using wl_cfg80211_change_station to authorize SCB
+#else
+#if !defined(DHD_NONFT_ROAMING)
+ wl_bss_roaming_done(cfg, ndev, e, data);
+#endif /* !DHD_NONFT_ROAMING */
+#endif /* DHD_LOSSLESS_ROAMING */
+#ifdef WBTEXT
+ if (dhdp->wbtext_support) {
+ /* set wnm_keepalives_max_idle after association */
+ wl_cfg80211_wbtext_set_wnm_maxidle(cfg, ndev);
+
+ /* Mostly nbr request of BTM query will be handled
+ * from wl_cfg80211_change_station
+ * after key negotiation is finished.
+ * This part is only for some specific security
+ * types (FT, CCKM) that don't call
+ * wl_cfg80211_change_station after roaming
*/
if (IS_AKM_SUITE_FT(sec) || IS_AKM_SUITE_CCKM(sec)) {
- wl_del_roam_timeout(cfg);
+ /* send nbr request or BTM query to update RCC
+ * after roaming completed
+ */
+ wl_cfg80211_wbtext_update_rcc(cfg, ndev);
}
}
-#else
- wl_bss_roaming_done(cfg, ndev, e, data);
-#endif /* DHD_LOSSLESS_ROAMING */
- memcpy(&cfg->last_roamed_addr, (void *)&e->addr, ETHER_ADDR_LEN);
+#endif /* WBTEXT */
} else {
wl_bss_connect_done(cfg, ndev, e, data, true);
}
act = true;
wl_update_prof(cfg, ndev, e, &act, WL_PROF_ACT);
wl_update_prof(cfg, ndev, NULL, (const void *)&e->addr, WL_PROF_BSSID);
+
+ if (ndev == bcmcfg_to_prmry_ndev(cfg)) {
+ wl_vndr_ies_get_vendor_oui(cfg, ndev, NULL, 0);
+ }
}
#ifdef DHD_LOSSLESS_ROAMING
else if ((event == WLC_E_ROAM || event == WLC_E_BSSID) && status != WLC_E_STATUS_SUCCESS) {
wl_del_roam_timeout(cfg);
}
-#endif
+#endif // endif
return err;
}
+
+#ifdef CUSTOM_EVENT_PM_WAKE
+uint32 last_dpm_upd_time = 0; /* ms */
+#define DPM_UPD_LMT_TIME ((CUSTOM_EVENT_PM_WAKE + (5)) * (1000) * (4)) /* ms */
+#define DPM_UPD_LMT_RSSI -85 /* dbm */
+
+static s32
+wl_check_pmstatus(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data)
+{
+ s32 err = BCME_OK;
+ struct net_device *ndev = NULL;
+ u8 *pbuf = NULL;
+ uint32 cur_dpm_upd_time = 0;
+ dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+ s32 rssi;
+#ifdef SUPPORT_RSSI_SUM_REPORT
+ wl_rssi_ant_mimo_t rssi_ant_mimo;
+#endif /* SUPPORT_RSSI_SUM_REPORT */
+ ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
+
+ pbuf = (u8 *)MALLOCZ(cfg->osh, WLC_IOCTL_MEDLEN);
+ if (pbuf == NULL) {
+ WL_ERR(("failed to allocate local pbuf\n"));
+ return -ENOMEM;
+ }
+
+ err = wldev_iovar_getbuf_bsscfg(ndev, "dump",
+ "pm", strlen("pm"), pbuf, WLC_IOCTL_MEDLEN,
+ 0, &cfg->ioctl_buf_sync);
+
+ if (err) {
+ WL_ERR(("dump ioctl err = %d", err));
+ } else {
+ WL_ERR(("PM status : %s\n", pbuf));
+ }
+
+ if (pbuf) {
+ MFREE(cfg->osh, pbuf, WLC_IOCTL_MEDLEN);
+ }
+
+ if (dhd->early_suspended) {
+ /* LCD off */
+#ifdef SUPPORT_RSSI_SUM_REPORT
+ /* Query RSSI sum across antennas */
+ memset(&rssi_ant_mimo, 0, sizeof(rssi_ant_mimo));
+ err = wl_get_rssi_per_ant(ndev, ndev->name, NULL, &rssi_ant_mimo);
+ if (err) {
+ WL_ERR(("Could not get rssi sum (%d)\n", err));
+ }
+ rssi = rssi_ant_mimo.rssi_sum;
+ if (rssi == 0)
+#endif /* SUPPORT_RSSI_SUM_REPORT */
+ {
+ scb_val_t scb_val;
+ memset(&scb_val, 0, sizeof(scb_val_t));
+ scb_val.val = 0;
+ err = wldev_ioctl_get(ndev, WLC_GET_RSSI, &scb_val, sizeof(scb_val_t));
+ if (err) {
+ WL_ERR(("Could not get rssi (%d)\n", err));
+ }
+ rssi = wl_rssi_offset(dtoh32(scb_val.val));
+ }
+ WL_ERR(("RSSI %d dBm\n", rssi));
+ if (rssi > DPM_UPD_LMT_RSSI) {
+ return err;
+ }
+ } else {
+ /* LCD on */
+ return err;
+ }
+
+ if (last_dpm_upd_time == 0) {
+ last_dpm_upd_time = OSL_SYSUPTIME();
+ } else {
+ cur_dpm_upd_time = OSL_SYSUPTIME();
+ if (cur_dpm_upd_time - last_dpm_upd_time < DPM_UPD_LMT_TIME) {
+ scb_val_t scbval;
+ DHD_STATLOG_CTRL(dhd, ST(DISASSOC_INT_START),
+ dhd_net2idx(dhd->info, ndev), 0);
+ bzero(&scbval, sizeof(scb_val_t));
+
+ err = wldev_ioctl_set(ndev, WLC_DISASSOC,
+ &scbval, sizeof(scb_val_t));
+ if (err < 0) {
+ WL_ERR(("Disassoc error %d\n", err));
+ return err;
+ }
+ WL_ERR(("Force Disassoc due to updated DPM event.\n"));
+
+ last_dpm_upd_time = 0;
+ } else {
+ last_dpm_upd_time = cur_dpm_upd_time;
+ }
+ }
+
+ return err;
+}
+#endif /* CUSTOM_EVENT_PM_WAKE */
#ifdef QOS_MAP_SET
/* get user priority table */
uint8 *
-wl_get_up_table(void)
+wl_get_up_table(dhd_pub_t * dhdp, int idx)
{
- return (uint8 *)(g_bcm_cfg->up_table);
+ struct net_device *ndev;
+ struct bcm_cfg80211 *cfg;
+
+ ndev = dhd_idx2net(dhdp, idx);
+ if (ndev) {
+ cfg = wl_get_cfg(ndev);
+ if (cfg)
+ return (uint8 *)(cfg->up_table);
+ }
+
+ return NULL;
}
#endif /* QOS_MAP_SET */
-#ifdef DHD_LOSSLESS_ROAMING
+#if defined(DHD_LOSSLESS_ROAMING) || defined(DBG_PKT_MON)
static s32
wl_notify_roam_prep_status(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
const wl_event_msg_t *e, void *data)
{
- s32 err = 0;
-
+ struct wl_security *sec;
+ struct net_device *ndev;
dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
+ u32 status = ntoh32(e->status);
+ u32 reason = ntoh32(e->reason);
+
+ BCM_REFERENCE(sec);
+
+ if (status == WLC_E_STATUS_SUCCESS && reason != WLC_E_REASON_INITIAL_ASSOC) {
+ WL_ERR(("Attempting roam with reason code : %d\n", reason));
+ }
+
+#ifdef CONFIG_SILENT_ROAM
+ if (dhdp->in_suspend && reason == WLC_E_REASON_SILENT_ROAM) {
+ dhdp->sroamed = TRUE;
+ }
+#endif /* CONFIG_SILENT_ROAM */
+
+ ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
+
+#ifdef DBG_PKT_MON
+ if (ndev == bcmcfg_to_prmry_ndev(cfg)) {
+ DHD_DBG_PKT_MON_STOP(dhdp);
+ DHD_DBG_PKT_MON_START(dhdp);
+ }
+#endif /* DBG_PKT_MON */
+#ifdef DHD_LOSSLESS_ROAMING
+ sec = wl_read_prof(cfg, ndev, WL_PROF_SEC);
+ /* Disable Lossless Roaming for specific AKM suite
+ * Any other AKM suite can be added below if transition time
+ * is delayed because of Lossless Roaming
+ * and it causes any certication failure
+ */
+ if (IS_AKM_SUITE_FT(sec)) {
+ return BCME_OK;
+ }
dhdp->dequeue_prec_map = 1 << PRIO_8021D_NC;
/* Restore flow control */
dhd_txflowcontrol(dhdp, ALL_INTERFACES, OFF);
mod_timer(&cfg->roam_timeout, jiffies + msecs_to_jiffies(WL_ROAM_TIMEOUT_MS));
-
- return err;
-}
#endif /* DHD_LOSSLESS_ROAMING */
+
+ return BCME_OK;
+}
+#endif /* DHD_LOSSLESS_ROAMING || DBG_PKT_MON */
+
+static s32
+wl_notify_roam_start_status(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data)
+{
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) || defined(WL_VENDOR_EXT_SUPPORT)
+ struct net_device *ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
+ struct wiphy *wiphy = bcmcfg_to_wiphy(cfg);
+ int event_type;
+
+ event_type = WIFI_EVENT_ROAM_SCAN_STARTED;
+ wl_cfgvendor_send_async_event(wiphy, ndev, GOOGLE_ROAM_EVENT_START,
+ &event_type, sizeof(int));
+#endif /* (LINUX_VERSION_CODE > KERNEL_VERSION(3, 13, 0)) || (WL_VENDOR_EXT_SUPPORT) */
+
+ return BCME_OK;
+}
+
+#ifdef ENABLE_HOGSQS
+static s32
+wl_cfg80211_hogsqs_notify(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data)
+{
+ struct net_device *ndev = NULL;
+ struct wireless_dev *wdev = NULL;
+ struct ether_addr *hog_etheraddr;
+ gfp_t aflags;
+
+ ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
+ wdev = ndev_to_wdev(ndev);
+ aflags = (in_atomic()) ? GFP_ATOMIC : GFP_KERNEL;
+
+ hog_etheraddr = (struct ether_addr *)data;
+ WL_DBG(("RX HOGGER EVENT: " MACDBG "\n", MAC2STRDBG(hog_etheraddr->octet)));
+
+ mutex_lock(&cfg->usr_sync);
+ if ((wdev->iftype != NL80211_IFTYPE_AP) &&
+ (wdev->iftype != NL80211_IFTYPE_P2P_GO)) {
+ WL_DBG(("Ignore RX HOGGER EVENT \n"));
+ mutex_unlock(&cfg->usr_sync);
+ return -EINVAL;
+ }
+
+ /* Kernel cfg80211 API. this API makes NL80211_ATTR_CQM_PKT_LOSS_EVENT
+ * in wpa_supplicant
+ */
+ cfg80211_cqm_pktloss_notify(ndev, hog_etheraddr->octet, 10, aflags);
+ mutex_unlock(&cfg->usr_sync);
+
+ /* disable the Event of HOGGER */
+ wl_add_remove_eventextmsg(ndev, WLC_E_LDF_HOGGER, false);
+
+ /* after WL_HOGSQS_TIMEOUT_MS timeout, workqueue handler enable the
+ * event
+ */
+ schedule_delayed_work(&cfg->hogsqs_eventwork,
+ msecs_to_jiffies(WL_HOGSQS_TIMEOUT_MS));
+ return 0;
+
+}
+#endif /* ENABLE_HOGSQS */
static s32 wl_get_assoc_ies(struct bcm_cfg80211 *cfg, struct net_device *ndev)
{
@@ -9961,14 +16420,21 @@
conn_info->resp_ie_len = 0;
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, cfg->extra_buf,
- WL_ASSOC_INFO_MAX, NULL);
+ assoc_info.req_len, NULL);
if (unlikely(err)) {
WL_ERR(("could not get assoc req (%d)\n", err));
return err;
}
- conn_info->req_ie_len = assoc_info.req_len - sizeof(struct dot11_assoc_req);
+ if (assoc_info.req_len < sizeof(struct dot11_assoc_req)) {
+ WL_ERR(("req_len %d lessthan %d \n", assoc_info.req_len,
+ (int)sizeof(struct dot11_assoc_req)));
+ return BCME_BADLEN;
+ }
+ conn_info->req_ie_len = (uint32)(assoc_info.req_len
+ - sizeof(struct dot11_assoc_req));
if (assoc_info.flags & WLC_ASSOC_REQ_IS_REASSOC) {
conn_info->req_ie_len -= ETHER_ADDR_LEN;
}
@@ -9982,14 +16448,21 @@
} else {
conn_info->req_ie_len = 0;
}
+
if (assoc_info.resp_len) {
err = wldev_iovar_getbuf(ndev, "assoc_resp_ies", NULL, 0, cfg->extra_buf,
- WL_ASSOC_INFO_MAX, NULL);
+ assoc_info.resp_len, NULL);
if (unlikely(err)) {
WL_ERR(("could not get assoc resp (%d)\n", err));
return err;
}
- conn_info->resp_ie_len = assoc_info.resp_len -sizeof(struct dot11_assoc_resp);
+ if (assoc_info.resp_len < sizeof(struct dot11_assoc_resp)) {
+ WL_ERR(("resp_len %d is lessthan %d \n", assoc_info.resp_len,
+ (int)sizeof(struct dot11_assoc_resp)));
+ return BCME_BADLEN;
+ }
+ conn_info->resp_ie_len = assoc_info.resp_len -
+ (uint32)sizeof(struct dot11_assoc_resp);
if (conn_info->resp_ie_len <= MAX_REQ_LINE) {
memcpy(conn_info->resp_ie, cfg->extra_buf, conn_info->resp_ie_len);
} else {
@@ -10004,12 +16477,11 @@
DOT11_MNG_QOS_MAP_ID)) != NULL) {
WL_DBG((" QoS map set IE found in assoc response\n"));
if (!cfg->up_table) {
- cfg->up_table = kmalloc(UP_TABLE_MAX, GFP_KERNEL);
+ cfg->up_table = (uint8 *)MALLOC(cfg->osh, UP_TABLE_MAX);
}
wl_set_up_table(cfg->up_table, qos_map_ie);
} else {
- kfree(cfg->up_table);
- cfg->up_table = NULL;
+ MFREE(cfg->osh, cfg->up_table, UP_TABLE_MAX);
}
#endif /* QOS_MAP_SET */
} else {
@@ -10017,104 +16489,153 @@
}
WL_DBG(("req len (%d) resp len (%d)\n", conn_info->req_ie_len,
conn_info->resp_ie_len));
-
+#ifdef REVERSE_AIFSN
+ DHD_REVERSE_AIFSN(cfg->pub, ndev);
+#endif /* REVERSE_AIFSN */
return err;
}
static s32 wl_ch_to_chanspec(struct net_device *dev, int ch, struct wl_join_params *join_params,
- size_t *join_params_size)
+ size_t *join_params_size, struct ieee80211_channel *chan)
{
- struct bcm_cfg80211 *cfg;
- s32 bssidx = -1;
chanspec_t chanspec = 0, chspec;
+ struct bcm_cfg80211 *cfg =
+ (struct bcm_cfg80211 *)wiphy_priv(dev->ieee80211_ptr->wiphy);
- if (ch != 0) {
- cfg = (struct bcm_cfg80211 *)wiphy_priv(dev->ieee80211_ptr->wiphy);
- join_params->params.chanspec_num = 1;
- join_params->params.chanspec_list[0] = ch;
+ if ((ch != 0) && (cfg && !cfg->rcc_enabled)) {
+ join_params->params.chanspec_num = 1;
+ join_params->params.chanspec_list[0] = ch;
- if (join_params->params.chanspec_list[0] <= CH_MAX_2G_CHANNEL)
- chanspec |= WL_CHANSPEC_BAND_2G;
- else
- chanspec |= WL_CHANSPEC_BAND_5G;
+#ifdef WL_6E
+ if (chan->center_freq > FREQ_START_6G_CHANNEL) {
+ chanspec |= WL_CHANSPEC_BAND_6G;
+ } else
+#endif /* WL_6E */
+ if (join_params->params.chanspec_list[0] <= CH_MAX_2G_CHANNEL)
+ chanspec |= WL_CHANSPEC_BAND_2G;
+ else
+ chanspec |= WL_CHANSPEC_BAND_5G;
- /* Get the min_bw set for the interface */
- chspec = wl_cfg80211_ulb_get_min_bw_chspec(dev->ieee80211_ptr, bssidx);
- if (chspec == INVCHANSPEC) {
- WL_ERR(("Invalid chanspec \n"));
- return -EINVAL;
- }
- chanspec |= chspec;
- chanspec |= WL_CHANSPEC_CTL_SB_NONE;
+ /* Get the min_bw set for the interface */
+ chspec = WL_CHANSPEC_BW_20;
+ if (chspec == INVCHANSPEC) {
+ WL_ERR(("Invalid chanspec \n"));
+ return -EINVAL;
+ }
+ chanspec |= chspec;
+ chanspec |= WL_CHANSPEC_CTL_SB_NONE;
- *join_params_size += WL_ASSOC_PARAMS_FIXED_SIZE +
- join_params->params.chanspec_num * sizeof(chanspec_t);
+ *join_params_size += WL_ASSOC_PARAMS_FIXED_SIZE +
+ join_params->params.chanspec_num * sizeof(chanspec_t);
- join_params->params.chanspec_list[0] &= WL_CHANSPEC_CHAN_MASK;
- join_params->params.chanspec_list[0] |= chanspec;
- join_params->params.chanspec_list[0] =
- wl_chspec_host_to_driver(join_params->params.chanspec_list[0]);
+ join_params->params.chanspec_list[0] &= WL_CHANSPEC_CHAN_MASK;
+ join_params->params.chanspec_list[0] |= chanspec;
+ join_params->params.chanspec_list[0] =
+ wl_chspec_host_to_driver(join_params->params.chanspec_list[0]);
- join_params->params.chanspec_num =
- htod32(join_params->params.chanspec_num);
-
- WL_DBG(("join_params->params.chanspec_list[0]= %X, %d channels\n",
- join_params->params.chanspec_list[0],
- join_params->params.chanspec_num));
+ join_params->params.chanspec_num =
+ htod32(join_params->params.chanspec_num);
}
+#ifdef ESCAN_CHANNEL_CACHE
+ else {
+ /* If channel is not present and ESCAN_CHANNEL_CACHE is enabled,
+ * use the cached channel list
+ */
+ int n_channels;
+ n_channels = get_roam_channel_list(ch, join_params->params.chanspec_list,
+ MAX_ROAM_CHANNEL, &join_params->ssid, ioctl_version, chan);
+ join_params->params.chanspec_num = htod32(n_channels);
+ *join_params_size += WL_ASSOC_PARAMS_FIXED_SIZE +
+ join_params->params.chanspec_num * sizeof(chanspec_t);
+ }
+#endif /* ESCAN_CHANNEL_CACHE */
+
+ WL_DBG(("join_params->params.chanspec_list[0]= %X, %d channels\n",
+ join_params->params.chanspec_list[0],
+ join_params->params.chanspec_num));
return 0;
}
-static s32 wl_update_bss_info(struct bcm_cfg80211 *cfg, struct net_device *ndev, bool roam)
+static s32 wl_update_bss_info(struct bcm_cfg80211 *cfg, struct net_device *ndev,
+ bool update_ssid)
{
- struct wl_bss_info *bi;
+ struct cfg80211_bss *bss;
+ wl_bss_info_t *bi;
struct wlc_ssid *ssid;
- struct bcm_tlv *tim;
+ const struct bcm_tlv *tim;
s32 beacon_interval;
s32 dtim_period;
size_t ie_len;
- u8 *ie;
+ const u8 *ie;
u8 *curbssid;
s32 err = 0;
struct wiphy *wiphy;
u32 channel;
char *buf;
+ u32 freq, band;
wiphy = bcmcfg_to_wiphy(cfg);
ssid = (struct wlc_ssid *)wl_read_prof(cfg, ndev, WL_PROF_SSID);
curbssid = wl_read_prof(cfg, ndev, WL_PROF_BSSID);
-
- mutex_lock(&cfg->usr_sync);
-
- buf = kzalloc(WL_EXTRA_BUF_MAX, GFP_ATOMIC);
+ bss = CFG80211_GET_BSS(wiphy, NULL, curbssid,
+ ssid->SSID, ssid->SSID_len);
+ buf = (char *)MALLOCZ(cfg->osh, WL_EXTRA_BUF_MAX);
if (!buf) {
WL_ERR(("buffer alloc failed.\n"));
return BCME_NOMEM;
}
+ mutex_lock(&cfg->usr_sync);
*(u32 *)buf = htod32(WL_EXTRA_BUF_MAX);
- err = wldev_ioctl(ndev, WLC_GET_BSS_INFO, buf, WL_EXTRA_BUF_MAX, false);
-
+ err = wldev_ioctl_get(ndev, WLC_GET_BSS_INFO, buf, WL_EXTRA_BUF_MAX);
if (unlikely(err)) {
WL_ERR(("Could not get bss info %d\n", err));
goto update_bss_info_out;
}
- bi = (struct wl_bss_info *)(buf + 4);
+ bi = (wl_bss_info_t *)(buf + 4);
channel = wf_chspec_ctlchan(wl_chspec_driver_to_host(bi->chanspec));
wl_update_prof(cfg, ndev, NULL, &channel, WL_PROF_CHAN);
- if (memcmp(bi->BSSID.octet, curbssid, ETHER_ADDR_LEN)) {
- WL_ERR(("Bssid doesn't match\n"));
- err = -EIO;
- goto update_bss_info_out;
- }
- err = wl_inform_single_bss(cfg, bi, roam);
- if (unlikely(err))
- goto update_bss_info_out;
+ if (!bss) {
+ WL_DBG(("Could not find the AP\n"));
+ if (memcmp(bi->BSSID.octet, curbssid, ETHER_ADDR_LEN)) {
+ WL_ERR(("Bssid doesn't match\n"));
+ err = -EIO;
+ goto update_bss_info_out;
+ }
+ err = wl_inform_single_bss(cfg, bi, update_ssid);
+ if (unlikely(err))
+ goto update_bss_info_out;
- ie = ((u8 *)bi) + bi->ie_offset;
- ie_len = bi->ie_length;
- beacon_interval = cpu_to_le16(bi->beacon_period);
+ ie = ((u8 *)bi) + bi->ie_offset;
+ ie_len = bi->ie_length;
+ beacon_interval = cpu_to_le16(bi->beacon_period);
+ } else {
+ WL_DBG(("Found the AP in the list - BSSID %pM\n", bss->bssid));
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 38) && !defined(WL_COMPAT_WIRELESS)
+ freq = ieee80211_channel_to_frequency(channel);
+#else
+#ifdef WL_6E
+ band = CHSPEC_IS6G(wl_chspec_driver_to_host(bi->chanspec))? IEEE80211_BAND_6GHZ :
+ (channel <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
+#else
+ band = (channel <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
+#endif /* WL_6E */
+ freq = ieee80211_channel_to_frequency(channel, band);
+#endif /* LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 38) && !(WL_COMPAT_WIRELESS) */
+ bss->channel = ieee80211_get_channel(wiphy, freq);
+#if defined(WL_CFG80211_P2P_DEV_IF)
+ ie = (const 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;
+
+ CFG80211_PUT_BSS(wiphy, bss);
+ }
+
tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM);
if (tim) {
dtim_period = tim->data[1];
@@ -10125,8 +16646,8 @@
* so we speficially query dtim information.
*/
dtim_period = 0;
- err = wldev_ioctl(ndev, WLC_GET_DTIMPRD,
- &dtim_period, sizeof(dtim_period), false);
+ err = wldev_ioctl_get(ndev, WLC_GET_DTIMPRD,
+ &dtim_period, sizeof(dtim_period));
if (unlikely(err)) {
WL_ERR(("WLC_GET_DTIMPRD error (%d)\n", err));
goto update_bss_info_out;
@@ -10141,7 +16662,7 @@
WL_ERR(("Failed with error %d\n", err));
}
- kfree(buf);
+ MFREE(cfg->osh, buf, WL_EXTRA_BUF_MAX);
mutex_unlock(&cfg->usr_sync);
return err;
}
@@ -10153,40 +16674,102 @@
struct wl_connect_info *conn_info = wl_to_conn(cfg);
s32 err = 0;
u8 *curbssid;
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39))
+ u32 *channel;
+ scb_val_t scbval;
+#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;
- u32 *channel;
u32 freq;
-#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0))
+#ifdef BCM4359_CHIP
+ struct channel_info ci;
+ u32 cur_channel;
+#endif /* BCM4359_CHIP */
+#endif /* LINUX_VERSION > 2.6.39 || WL_COMPAT_WIRELESS */
+#if (defined(CONFIG_ARCH_MSM) && defined(CFG80211_ROAMED_API_UNIFIED)) || \
+ (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)) || defined(WL_FILS_ROAM_OFFLD) || \
+ defined(CFG80211_ROAM_API_GE_4_12)
struct cfg80211_roam_info roam_info;
-#endif
-
-
+#endif /* (CONFIG_ARCH_MSM && CFG80211_ROAMED_API_UNIFIED) || LINUX_VERSION >= 4.12.0 */
+#if defined(WL_FILS_ROAM_OFFLD)
+ struct wl_fils_info *fils_info = wl_to_fils_info(cfg);
+ struct wl_security *sec = wl_read_prof(cfg, ndev, WL_PROF_SEC);
+#endif // endif
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
+#ifdef DHD_POST_EAPOL_M1_AFTER_ROAM_EVT
+ dhd_if_t *ifp = NULL;
+#endif /* DHD_POST_EAPOL_M1_AFTER_ROAM_EVT */
#ifdef WLFBT
uint32 data_len = 0;
if (data)
data_len = ntoh32(e->datalen);
#endif /* WLFBT */
- wl_get_assoc_ies(cfg, ndev);
+ BCM_REFERENCE(dhdp);
+ curbssid = wl_read_prof(cfg, ndev, WL_PROF_BSSID);
+ channel = (u32 *)wl_read_prof(cfg, ndev, WL_PROF_CHAN);
+#ifdef BCM4359_CHIP
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)) || defined(WL_COMPAT_WIRELESS)
+ /* Skip calling cfg80211_roamed If the channels are same and
+ * the current bssid & the new bssid are same
+ * Also clear timer roam_timeout.
+ * Only used on BCM4359 devices.
+ */
+ bzero(&ci, sizeof(ci));
+ if ((wldev_ioctl_get(ndev, WLC_GET_CHANNEL, &ci,
+ sizeof(ci))) < 0) {
+ WL_ERR(("Failed to get current channel !"));
+ err = BCME_ERROR;
+ goto fail;
+ }
+ cur_channel = dtoh32(ci.hw_channel);
+ if ((*channel == cur_channel) && ((memcmp(curbssid, &e->addr,
+ ETHER_ADDR_LEN) == 0) || (memcmp(&cfg->last_roamed_addr,
+ &e->addr, ETHER_ADDR_LEN) == 0))) {
+ WL_ERR(("BSS already present, Skipping roamed event to"
+ " upper layer\n"));
+ goto fail;
+ }
+#endif /* LINUX_VERSION > 2.6.39 || WL_COMPAT_WIRELESS */
+#endif /* BCM4359 CHIP */
+
+ if ((err = wl_get_assoc_ies(cfg, ndev)) != BCME_OK) {
+ DHD_STATLOG_CTRL(dhdp, ST(DISASSOC_INT_START),
+ dhd_net2idx(dhdp->info, ndev), WLAN_REASON_DEAUTH_LEAVING);
+ WL_ERR(("Fetching Assoc IEs failed, Skipping roamed event to"
+ " upper layer\n"));
+ /* To make sure disconnect, and fw sync, explictly send dissassoc
+ * for BSSID 00:00:00:00:00:00 issue
+ */
+ bzero(&scbval, sizeof(scb_val_t));
+ scbval.val = WLAN_REASON_DEAUTH_LEAVING;
+ memcpy(&scbval.ea, curbssid, ETHER_ADDR_LEN);
+ scbval.val = htod32(scbval.val);
+ if (wldev_ioctl_set(ndev, WLC_DISASSOC, &scbval,
+ sizeof(scb_val_t)) < 0) {
+ WL_ERR(("WLC_DISASSOC error\n"));
+ }
+ goto fail;
+ }
+
wl_update_prof(cfg, ndev, NULL, (const void *)(e->addr.octet), WL_PROF_BSSID);
curbssid = wl_read_prof(cfg, ndev, WL_PROF_BSSID);
- wl_update_bss_info(cfg, ndev, true);
+ if ((err = wl_update_bss_info(cfg, ndev, true)) != BCME_OK) {
+ WL_ERR(("failed to update bss info, err=%d\n", err));
+ goto fail;
+ }
wl_update_pmklist(ndev, cfg->pmk_list, err);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39))
- /* channel info for cfg80211_roamed introduced in 2.6.39-rc1 */
channel = (u32 *)wl_read_prof(cfg, ndev, WL_PROF_CHAN);
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39)) || defined(WL_COMPAT_WIRELESS)
+ /* channel info for cfg80211_roamed introduced in 2.6.39-rc1 */
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);
notify_channel = ieee80211_get_channel(wiphy, freq);
-#endif
+#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,
@@ -10196,47 +16779,229 @@
memcpy(cfg->fbt_key, data, FBT_KEYLEN);
}
#endif /* WLFBT */
- printk("wl_bss_roaming_done succeeded to " MACDBG "\n",
- MAC2STRDBG((const u8*)(&e->addr)));
+#ifdef CUSTOM_LONG_RETRY_LIMIT
+ if (wl_set_retry(ndev, CUSTOM_LONG_RETRY_LIMIT, 1) < 0) {
+ WL_ERR(("CUSTOM_LONG_RETRY_LIMIT set fail!\n"));
+ }
+#endif /* CUSTOM_LONG_RETRY_LIMIT */
+ DHD_STATLOG_CTRL(dhdp, ST(REASSOC_INFORM),
+ dhd_net2idx(dhdp->info, ndev), 0);
+ WL_ERR(("Report roam event to upper layer. " MACDBG " (ch:%d)\n",
+ MAC2STRDBG((const u8*)(&e->addr)), *channel));
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0))
-//added by Eason 20200528
- memset(&roam_info, 0, sizeof(roam_info));
+#if (defined(CONFIG_ARCH_MSM) && defined(CFG80211_ROAMED_API_UNIFIED)) || \
+ (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)) || defined(WL_FILS_ROAM_OFFLD) || \
+ defined(CFG80211_ROAM_API_GE_4_12)
+ memset(&roam_info, 0, sizeof(struct cfg80211_roam_info));
roam_info.channel = notify_channel;
roam_info.bssid = curbssid;
roam_info.req_ie = conn_info->req_ie;
roam_info.req_ie_len = conn_info->req_ie_len;
roam_info.resp_ie = conn_info->resp_ie;
roam_info.resp_ie_len = conn_info->resp_ie_len;
-
+#if defined(WL_FILS_ROAM_OFFLD)
+ if ((sec->auth_type == DOT11_FILS_SKEY_PFS)||(sec->auth_type == DOT11_FILS_SKEY)) {
+ roam_info.fils.kek = fils_info->fils_kek;
+ roam_info.fils.kek_len = fils_info->fils_kek_len;
+ roam_info.fils.update_erp_next_seq_num = true;
+ roam_info.fils.erp_next_seq_num = fils_info->fils_erp_next_seq_num;
+ roam_info.fils.pmk = fils_info->fils_pmk;
+ roam_info.fils.pmk_len = fils_info->fils_kek_len;
+ roam_info.fils.pmkid = fils_info->fils_pmkid;
+ }
+#endif // endif
cfg80211_roamed(ndev, &roam_info, GFP_KERNEL);
#else
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
+#endif // endif
curbssid,
conn_info->req_ie, conn_info->req_ie_len,
conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);
-#endif
- WL_DBG(("Report roaming result\n"));
+#endif /* (CONFIG_ARCH_MSM && CFG80211_ROAMED_API_UNIFIED) || LINUX_VERSION >= 4.12.0 */
+ memcpy(&cfg->last_roamed_addr, &e->addr, ETHER_ADDR_LEN);
wl_set_drv_status(cfg, CONNECTED, ndev);
+#if defined(DHD_ENABLE_BIGDATA_LOGGING)
+ cfg->roam_count++;
+#endif /* DHD_ENABLE_BIGDATA_LOGGING */
+#ifdef WL_BAM
+ if (wl_adps_bad_ap_check(cfg, &e->addr)) {
+ if (wl_adps_enabled(cfg, ndev)) {
+ wl_adps_set_suspend(cfg, ndev, ADPS_SUSPEND);
+ }
+ }
+#endif /* WL_BAM */
+
+#ifdef DHD_POST_EAPOL_M1_AFTER_ROAM_EVT
+ ifp = dhd_get_ifp(dhdp, e->ifidx);
+ if (ifp) {
+ ifp->post_roam_evt = TRUE;
+ }
+#endif /* DHD_POST_EAPOL_M1_AFTER_ROAM_EVT */
+
+ /* Arm pkt logging timer */
+ dhd_dump_mod_pkt_timer(dhdp, PKT_CNT_RSN_ROAM);
+
+ return err;
+
+fail:
+#ifdef DHD_LOSSLESS_ROAMING
+ wl_del_roam_timeout(cfg);
+#endif /* DHD_LOSSLESS_ROAMING */
return err;
}
+static bool
+wl_cfg80211_verify_bss(struct bcm_cfg80211 *cfg, struct net_device *ndev,
+ struct cfg80211_bss **bss)
+{
+ struct wiphy *wiphy;
+ struct wlc_ssid *ssid;
+ uint8 *curbssid;
+ int count = 0;
+ int ret = false;
+ u8 cur_ssid[DOT11_MAX_SSID_LEN + 1];
+
+ wiphy = bcmcfg_to_wiphy(cfg);
+ ssid = (struct wlc_ssid *)wl_read_prof(cfg, ndev, WL_PROF_SSID);
+ curbssid = wl_read_prof(cfg, ndev, WL_PROF_BSSID);
+ if (!ssid) {
+ WL_ERR(("No SSID found in the saved profile \n"));
+ return false;
+ }
+
+ do {
+ *bss = CFG80211_GET_BSS(wiphy, NULL, curbssid,
+ ssid->SSID, ssid->SSID_len);
+ if (*bss || (count > 5)) {
+ break;
+ }
+
+ count++;
+ msleep(100);
+ } while (*bss == NULL);
+
+ WL_DBG(("cfg80211 bss_ptr:%p loop_cnt:%d\n", *bss, count));
+ if (*bss) {
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0))
+ /* Update the reference count after use. In case of kernel version >= 4.7
+ * the cfg802_put_bss is called in cfg80211_connect_bss context
+ */
+ CFG80211_PUT_BSS(wiphy, *bss);
+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) */
+ ret = true;
+ } else {
+ memset(cur_ssid, 0, DOT11_MAX_SSID_LEN);
+ strncpy(cur_ssid, ssid->SSID,
+ MIN(ssid->SSID_len, DOT11_MAX_SSID_LEN));
+ WL_ERR(("No bss entry for ssid:%s bssid:"MACDBG"\n",
+ cur_ssid, MAC2STRDBG(curbssid)));
+ }
+
+ return ret;
+}
+
+_Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"")
+#ifdef WL_FILS
+static s32
+wl_get_fils_connect_params(struct bcm_cfg80211 *cfg, struct net_device *ndev)
+{
+ const bcm_xtlv_t* pxtlv_out;
+ struct wl_fils_info *fils_info = wl_to_fils_info(cfg);
+ int err = BCME_OK;
+ bcm_iov_buf_t *iov_buf_in = NULL;
+ bcm_iov_buf_t iov_buf_out = {0};
+ u16 len;
+ u16 type;
+ const u8 *data;
+ iov_buf_in = MALLOCZ(cfg->osh, WLC_IOCTL_SMLEN);
+ if (!iov_buf_in) {
+ WL_ERR(("buf memory alloc failed\n"));
+ err = BCME_NOMEM;
+ goto exit;
+ }
+ iov_buf_out.version = WL_FILS_IOV_VERSION;
+ iov_buf_out.id = WL_FILS_CMD_GET_CONNECT_PARAMS;
+ err = wldev_iovar_getbuf(ndev, "fils", (uint8*)&iov_buf_out, sizeof(bcm_iov_buf_t),
+ iov_buf_in, WLC_IOCTL_SMLEN, &cfg->ioctl_buf_sync);
+ if (unlikely(err)) {
+ WL_ERR(("Get FILS Params Error (%d)\n", err));
+ goto exit;
+ }
+ pxtlv_out = (bcm_xtlv_t*)((bcm_iov_buf_t*)iov_buf_in)->data;
+ len = iov_buf_in->len;
+ do {
+ if (!bcm_valid_xtlv(pxtlv_out, iov_buf_in->len, BCM_XTLV_OPTION_ALIGN32)) {
+ WL_ERR(("%s: XTLV is not valid\n", __func__));
+ err = BCME_BADARG;
+ goto exit;
+ }
+ bcm_xtlv_unpack_xtlv(pxtlv_out, &type, &len, &data, BCM_XTLV_OPTION_ALIGN32);
+ switch (type) {
+ case WL_FILS_XTLV_ERP_NEXT_SEQ_NUM:
+ fils_info->fils_erp_next_seq_num = *(const u16 *)data;
+ break;
+ case WL_FILS_XTLV_KEK:
+ if (memcpy_s(fils_info->fils_kek,
+ WL_MAX_FILS_KEY_LEN, data, len) < 0) {
+ err = BCME_BADARG;
+ goto exit;
+ }
+ fils_info->fils_kek_len = len;
+ break;
+ case WL_FILS_XTLV_PMK:
+ if (memcpy_s(fils_info->fils_pmk,
+ WL_MAX_FILS_KEY_LEN, data, len) < 0) {
+ err = BCME_BADARG;
+ goto exit;
+ }
+ fils_info->fils_pmk_len = len;
+ break;
+ case WL_FILS_XTLV_PMKID:
+ if (memcpy_s(fils_info->fils_pmkid,
+ WL_MAX_FILS_KEY_LEN, data, len) < 0) {
+ err = BCME_BADARG;
+ goto exit;
+ }
+ break;
+ default:
+ WL_ERR(("%s: wrong XTLV code\n", __func__));
+ break;
+
+ }
+ } while ((pxtlv_out = bcm_next_xtlv(pxtlv_out, (int *)&iov_buf_in->len,
+ BCM_XTLV_OPTION_ALIGN32)) && iov_buf_in->len);
+exit:
+ if (iov_buf_in) {
+ MFREE(cfg->osh, iov_buf_in, WLC_IOCTL_SMLEN);
+ }
+ return err;
+}
+#endif /* WL_FILS */
static s32
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(cfg);
struct wl_security *sec = wl_read_prof(cfg, ndev, WL_PROF_SEC);
-#if defined(CUSTOM_SET_CPUCORE)
- dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
-#endif
s32 err = 0;
+#ifdef WL_FILS
+ struct cfg80211_connect_resp_params resp_params = {0};
+ struct wl_fils_info *fils_info = NULL;
+ struct wlc_ssid *ssid = NULL;
+ struct wiphy *wiphy = NULL;
+
+#endif /* WL_FILS */
u8 *curbssid = wl_read_prof(cfg, ndev, WL_PROF_BSSID);
+ u32 event_type = ntoh32(e->event_type);
+ struct cfg80211_bss *bss = NULL;
+ dhd_pub_t *dhdp;
+ dhdp = (dhd_pub_t *)(cfg->pub);
+ BCM_REFERENCE(dhdp);
+
if (!sec) {
WL_ERR(("sec is NULL\n"));
return -ENODEV;
@@ -10245,7 +17010,8 @@
#ifdef ESCAN_RESULT_PATCH
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",
+ WL_INFORM_MEM((" Connected event of connected device "
+ "e=%d s=%d, ignore it\n",
ntoh32(e->event_type), ntoh32(e->status)));
return err;
}
@@ -10255,60 +17021,138 @@
WL_DBG(("copy bssid\n"));
memcpy(curbssid, connect_req_bssid, ETHER_ADDR_LEN);
}
-
#else
if (cfg->scan_request) {
- wl_notify_escan_complete(cfg, ndev, true, true);
+ wl_cfg80211_cancel_scan(cfg);
}
#endif /* ESCAN_RESULT_PATCH */
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(cfg, ndev);
wl_update_prof(cfg, ndev, NULL, (const void *)(e->addr.octet),
WL_PROF_BSSID);
curbssid = wl_read_prof(cfg, ndev, WL_PROF_BSSID);
- wl_update_bss_info(cfg, ndev, false);
+ /*
+ * CFG layer relies on cached IEs (from probe/beacon) to fetch matching bss.
+ * For cases, there is no match available,
+ * need to update the cache based on bss info from fw.
+ */
+ wl_update_bss_info(cfg, ndev, true);
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 (dhdp->roam_env_detection)
+ wldev_iovar_setint(ndev, "roam_env_detection",
+ AP_ENV_INDETERMINATE);
+#endif /* ROAM_AP_ENV_DETECTION */
if (ndev != bcmcfg_to_prmry_ndev(cfg)) {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0)
init_completion(&cfg->iface_disable);
#else
/* reinitialize completion to clear previous count */
INIT_COMPLETION(cfg->iface_disable);
-#endif
+#endif // endif
}
#ifdef CUSTOM_SET_CPUCORE
- if (wl_get_chan_isvht80(ndev, dhd)) {
+ if (wl_get_chan_isvht80(ndev, dhdp)) {
if (ndev == bcmcfg_to_prmry_ndev(cfg))
- dhd->chan_isvht80 |= DHD_FLAG_STA_MODE; /* STA mode */
+ dhdp->chan_isvht80 |= DHD_FLAG_STA_MODE; /* STA mode */
else if (is_p2p_group_iface(ndev->ieee80211_ptr))
- dhd->chan_isvht80 |= DHD_FLAG_P2P_MODE; /* p2p mode */
- dhd_set_cpucore(dhd, TRUE);
+ dhdp->chan_isvht80 |= DHD_FLAG_P2P_MODE; /* p2p mode */
+ dhd_set_cpucore(dhdp, TRUE);
}
#endif /* CUSTOM_SET_CPUCORE */
-
+#ifdef CUSTOM_LONG_RETRY_LIMIT
+ if (wl_set_retry(ndev, CUSTOM_LONG_RETRY_LIMIT, 1) < 0) {
+ WL_ERR(("CUSTOM_LONG_RETRY_LIMIT set fail!\n"));
+ }
+#endif /* CUSTOM_LONG_RETRY_LIMIT */
+ bzero(&cfg->last_roamed_addr, ETHER_ADDR_LEN);
}
- cfg80211_connect_result(ndev,
- curbssid,
- conn_info->req_ie,
- conn_info->req_ie_len,
- conn_info->resp_ie,
- conn_info->resp_ie_len,
- completed ? WLAN_STATUS_SUCCESS :
- (sec->auth_assoc_res_status) ?
- sec->auth_assoc_res_status :
- WLAN_STATUS_UNSPECIFIED_FAILURE,
- GFP_KERNEL);
- if (completed)
- WL_INFORM(("Report connect result - connection succeeded\n"));
+ wl_clr_drv_status(cfg, CONNECTING, ndev);
+
+ if (completed && (wl_cfg80211_verify_bss(cfg, ndev, &bss) != true)) {
+ /* If bss entry is not available in the cfg80211 bss cache
+ * the wireless stack will complain and won't populate
+ * wdev->current_bss ptr
+ */
+ WL_ERR(("BSS entry not found. Indicate assoc event failure\n"));
+ completed = false;
+ sec->auth_assoc_res_status = WLAN_STATUS_UNSPECIFIED_FAILURE;
+ }
+#ifdef WL_FILS
+ if ((sec->auth_type == DOT11_FILS_SKEY_PFS)||(sec->auth_type == DOT11_FILS_SKEY)) {
+ wl_get_fils_connect_params(cfg, ndev);
+ fils_info = wl_to_fils_info(cfg);
+ ssid = (struct wlc_ssid *)wl_read_prof(cfg, ndev, WL_PROF_SSID);
+ wiphy = bcmcfg_to_wiphy(cfg);
+ resp_params.status = completed ? WLAN_STATUS_SUCCESS :
+ (sec->auth_assoc_res_status) ?
+ sec->auth_assoc_res_status :
+ WLAN_STATUS_UNSPECIFIED_FAILURE;
+ resp_params.bssid = curbssid;
+ resp_params.bss = CFG80211_GET_BSS(wiphy, NULL, curbssid,
+ ssid->SSID, ssid->SSID_len);
+ resp_params.req_ie = conn_info->req_ie;
+ resp_params.req_ie_len = conn_info->req_ie_len;
+ resp_params.resp_ie = conn_info->resp_ie;
+ resp_params.resp_ie_len = conn_info->resp_ie_len;
+#ifdef WL_FILS_ROAM_OFFLD
+ resp_params.fils.kek = fils_info->fils_kek;
+ resp_params.fils.kek_len = fils_info->fils_kek_len;
+ resp_params.fils.update_erp_next_seq_num = true;
+ resp_params.fils.erp_next_seq_num = fils_info->fils_erp_next_seq_num;
+ resp_params.fils.pmk = fils_info->fils_pmk;
+ resp_params.fils.pmk_len = fils_info->fils_kek_len;
+ resp_params.fils.pmkid = fils_info->fils_pmkid;
+#else
+ resp_params.fils_kek = fils_info->fils_kek;
+ resp_params.fils_kek_len = fils_info->fils_kek_len;
+ resp_params.update_erp_next_seq_num = true;
+ resp_params.fils_erp_next_seq_num = fils_info->fils_erp_next_seq_num;
+ resp_params.pmk = fils_info->fils_pmk;
+ resp_params.pmk_len = fils_info->fils_kek_len;
+ resp_params.pmkid = fils_info->fils_pmkid;
+#endif /* WL_FILS_ROAM_OFFLD */
+ cfg80211_connect_done(ndev, &resp_params, GFP_KERNEL);
+ }
else
- WL_ERR(("Report connect result - connection failed\n"));
+#endif /* WL_FILS */
+ {
+ CFG80211_CONNECT_RESULT(ndev,
+ curbssid,
+ bss,
+ conn_info->req_ie,
+ conn_info->req_ie_len,
+ conn_info->resp_ie,
+ conn_info->resp_ie_len,
+ completed ? WLAN_STATUS_SUCCESS :
+ (sec->auth_assoc_res_status) ?
+ sec->auth_assoc_res_status :
+ WLAN_STATUS_UNSPECIFIED_FAILURE,
+ GFP_KERNEL);
+ }
+ if (completed) {
+ WL_INFORM_MEM(("[%s] Report connect result - "
+ "connection succeeded\n", ndev->name));
+#ifdef WL_BAM
+ if (wl_adps_bad_ap_check(cfg, &e->addr)) {
+ if (wl_adps_enabled(cfg, ndev)) {
+ wl_adps_set_suspend(cfg, ndev, ADPS_SUSPEND);
+ }
+ }
+#endif /* WL_BAM */
+ } else
+ WL_ERR(("[%s] Report connect result - connection failed\n", ndev->name));
+ } else {
+ WL_INFORM_MEM(("[%s] Ignore event:%d. drv status"
+ " connecting:%x. connected:%d\n",
+ ndev->name, event_type, wl_get_drv_status(cfg, CONNECTING, ndev),
+ wl_get_drv_status(cfg, CONNECTED, ndev)));
}
#ifdef CONFIG_TCPACK_FASTTX
- if (wl_get_chan_isvht80(ndev, dhd))
+ if (wl_get_chan_isvht80(ndev, dhdp))
wldev_iovar_setint(ndev, "tcpack_fast_tx", 0);
else
wldev_iovar_setint(ndev, "tcpack_fast_tx", 1);
@@ -10327,12 +17171,15 @@
ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
+ WL_INFORM_MEM(("[%s] mic fail event - " MACDBG " \n",
+ ndev->name, MAC2STRDBG(e->addr.octet)));
mutex_lock(&cfg->usr_sync);
if (flags & WLC_EVENT_MSG_GROUP)
key_type = NL80211_KEYTYPE_GROUP;
else
key_type = NL80211_KEYTYPE_PAIRWISE;
+ wl_flush_fw_log_buffer(ndev, FW_LOGSET_MASK_ALL);
cfg80211_michael_mic_failure(ndev, (const u8 *)&e->addr, key_type, -1,
NULL, GFP_KERNEL);
mutex_unlock(&cfg->usr_sync);
@@ -10358,211 +17205,10 @@
}
#endif /* BT_WIFI_HANDOVER */
-#ifdef PNO_SUPPORT
static s32
-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
- mutex_lock(&cfg->usr_sync);
- /* TODO: Use cfg80211_sched_scan_results(wiphy); */
- CFG80211_DISCONNECTED(ndev, 0, NULL, 0, false, GFP_KERNEL);
- mutex_unlock(&cfg->usr_sync);
-#else
- /* If cfg80211 scheduled scan is supported, report the pno results via sched
- * scan results
- */
- wl_notify_sched_scan_results(cfg, ndev, e, data);
-#endif /* WL_SCHED_SCAN */
- return 0;
-}
-#endif /* PNO_SUPPORT */
-
-#ifdef GSCAN_SUPPORT
-static s32
-wl_notify_gscan_event(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
- const wl_event_msg_t *e, void *data)
-{
- s32 err = 0;
- u32 event = be32_to_cpu(e->event_type);
- void *ptr;
- int send_evt_bytes = 0;
- int batch_event_result_dummy = 0;
- struct net_device *ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
- struct wiphy *wiphy = bcmcfg_to_wiphy(cfg);
- u32 len = ntoh32(e->datalen);
-
- switch (event) {
- case WLC_E_PFN_SWC:
- ptr = dhd_dev_swc_scan_event(ndev, data, &send_evt_bytes);
- if (send_evt_bytes) {
- wl_cfgvendor_send_async_event(wiphy, ndev,
- GOOGLE_GSCAN_SIGNIFICANT_EVENT, ptr, send_evt_bytes);
- kfree(ptr);
- }
- break;
- case WLC_E_PFN_BEST_BATCHING:
- err = dhd_dev_retrieve_batch_scan(ndev);
- if (err < 0) {
- WL_ERR(("Batch retrieval already in progress %d\n", err));
- } else {
- wl_cfgvendor_send_async_event(wiphy, ndev,
- GOOGLE_GSCAN_BATCH_SCAN_EVENT,
- &batch_event_result_dummy, sizeof(int));
- }
- break;
- case WLC_E_PFN_SCAN_COMPLETE:
- batch_event_result_dummy = WIFI_SCAN_COMPLETE;
- wl_cfgvendor_send_async_event(wiphy, ndev,
- GOOGLE_SCAN_COMPLETE_EVENT,
- &batch_event_result_dummy, sizeof(int));
- break;
- case WLC_E_PFN_BSSID_NET_FOUND:
- ptr = dhd_dev_hotlist_scan_event(ndev, data, &send_evt_bytes,
- HOTLIST_FOUND);
- if (ptr) {
- wl_cfgvendor_send_hotlist_event(wiphy, ndev,
- ptr, send_evt_bytes, GOOGLE_GSCAN_GEOFENCE_FOUND_EVENT);
- dhd_dev_gscan_hotlist_cache_cleanup(ndev, HOTLIST_FOUND);
- } else {
- err = -ENOMEM;
- }
- break;
- case WLC_E_PFN_BSSID_NET_LOST:
- /* WLC_E_PFN_BSSID_NET_LOST is conflict shared with WLC_E_PFN_SCAN_ALLGONE
- * We currently do not use WLC_E_PFN_SCAN_ALLGONE, so if we get it, ignore
- */
- if (len) {
- ptr = dhd_dev_hotlist_scan_event(ndev, data, &send_evt_bytes,
- HOTLIST_LOST);
- if (ptr) {
- wl_cfgvendor_send_hotlist_event(wiphy, ndev,
- ptr, send_evt_bytes, GOOGLE_GSCAN_GEOFENCE_LOST_EVENT);
- dhd_dev_gscan_hotlist_cache_cleanup(ndev, HOTLIST_LOST);
- } else {
- err = -ENOMEM;
- }
- } else {
- err = -EINVAL;
- }
- break;
- case WLC_E_PFN_GSCAN_FULL_RESULT:
- ptr = dhd_dev_process_full_gscan_result(ndev, data, len, &send_evt_bytes);
- if (ptr) {
- wl_cfgvendor_send_async_event(wiphy, ndev,
- GOOGLE_SCAN_FULL_RESULTS_EVENT, ptr, send_evt_bytes);
- kfree(ptr);
- } else {
- err = -ENOMEM;
- }
- break;
- case WLC_E_PFN_SSID_EXT:
- ptr = dhd_dev_process_epno_result(ndev, data, event, &send_evt_bytes);
- if (ptr) {
- wl_cfgvendor_send_async_event(wiphy, ndev,
- GOOGLE_SCAN_EPNO_EVENT, ptr, send_evt_bytes);
- kfree(ptr);
- } else {
- err = -ENOMEM;
- }
- break;
- case WLC_E_PFN_NET_FOUND:
- break;
- default:
- WL_ERR(("Unknown event %d\n", event));
- break;
- }
- return err;
-}
-#endif /* GSCAN_SUPPORT */
-
-static s32
-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"));
-#ifdef STBLINUX
- ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
- if (!wl_get_drv_status(cfg, SCANNING, ndev)) {
- /* has been handled by WLC_E_ESCAN_RESULT handler */
-
- WL_DBG(("scan is not ready \n"));
- return err;
- }
-#else
- if (!wl_get_drv_status(cfg, SCANNING, ndev)) {
- WL_ERR(("scan is not ready \n"));
- return err;
- }
- ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
-#endif /* STBLINUX */
- mutex_lock(&cfg->usr_sync);
- wl_clr_drv_status(cfg, SCANNING, ndev);
- memset(&channel_inform, 0, sizeof(channel_inform));
- err = wldev_ioctl(ndev, WLC_GET_CHANNEL, &channel_inform,
- sizeof(channel_inform), false);
- if (unlikely(err)) {
- WL_ERR(("scan busy (%d)\n", err));
- goto scan_done_out;
- }
- channel_inform.scan_channel = dtoh32(channel_inform.scan_channel);
- if (unlikely(channel_inform.scan_channel)) {
-
- WL_DBG(("channel_inform.scan_channel (%d)\n",
- channel_inform.scan_channel));
- }
- 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) && unlikely(!cfg->scan_suppressed)) {
- WL_ERR(("%s Scan_results error (%d)\n", ndev->name, err));
- err = -EINVAL;
- goto scan_done_out;
- }
- bss_list->buflen = dtoh32(bss_list->buflen);
- bss_list->version = dtoh32(bss_list->version);
- bss_list->count = dtoh32(bss_list->count);
-
- err = wl_inform_bss(cfg);
-
-scan_done_out:
- del_timer_sync(&cfg->scan_timeout);
- spin_lock_irqsave(&cfg->cfgdrv_lock, flags);
- if (cfg->scan_request) {
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 8, 0))
- struct cfg80211_scan_info info = { .aborted = false };
- cfg80211_scan_done(cfg->scan_request, &info);
-#else
- cfg80211_scan_done(cfg->scan_request, false);
-#endif
- cfg->scan_request = NULL;
- }
- spin_unlock_irqrestore(&cfg->cfgdrv_lock, flags);
- WL_DBG(("cfg80211_scan_done\n"));
- 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,
- u8 **pheader, u32 *body_len, u8 *pbody)
+wl_frame_get_mgmt(struct bcm_cfg80211 *cfg, u16 fc,
+ const struct ether_addr *da, const struct ether_addr *sa,
+ const struct ether_addr *bssid, u8 **pheader, u32 *body_len, u8 *pbody)
{
struct dot11_management_header *hdr;
u32 totlen = 0;
@@ -10583,7 +17229,7 @@
break;
}
totlen += DOT11_MGMT_HDR_LEN + prebody_len;
- *pheader = kzalloc(totlen, GFP_KERNEL);
+ *pheader = (u8 *)MALLOCZ(cfg->osh, totlen);
if (*pheader == NULL) {
WL_ERR(("memory alloc failed \n"));
return -ENOMEM;
@@ -10602,10 +17248,62 @@
return err;
}
+#ifdef WL_CFG80211_GON_COLLISION
+static void
+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 (cfg->afx_hdl->pending_tx_act_frm == NULL)
+ return;
+
+ if (tx_act_frm &&
+ wl_cfgp2p_is_pub_action(tx_act_frm->data, tx_act_frm->len)) {
+ wifi_p2p_pub_act_frame_t *pact_frm;
+
+ pact_frm = (wifi_p2p_pub_act_frame_t *)tx_act_frm->data;
+
+ if (!(pact_frm->subtype == P2P_PAF_GON_REQ &&
+ rx_act_frm->subtype == P2P_PAF_GON_REQ)) {
+ return;
+ }
+ }
+
+ WL_ERR((" GO NEGO Request COLLISION !!! \n"));
+
+ /* if sa(peer) addr is less than da(my) addr,
+ * my device will process peer's gon request and block to send my gon req.
+ *
+ * if not (sa addr > da addr),
+ * my device will process gon request and drop gon req of peer.
+ */
+ if (memcmp(sa.octet, da.octet, ETHER_ADDR_LEN) < 0) {
+ /* block to send tx gon request */
+ 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(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"));
+ cfg->block_gon_req_rx_count = BLOCK_GON_REQ_MAX_NUM;
+ }
+
+ return;
+}
+#endif /* WL_CFG80211_GON_COLLISION */
void
-wl_stop_wait_next_action_frame(struct bcm_cfg80211 *cfg, struct net_device *ndev)
+wl_stop_wait_next_action_frame(struct bcm_cfg80211 *cfg, struct net_device *ndev, u8 bsscfgidx)
{
+ s32 err = 0;
+
if (wl_get_drv_status_all(cfg, FINDING_COMMON_CHANNEL)) {
if (timer_pending(&cfg->p2p->listen_timer)) {
del_timer_sync(&cfg->p2p->listen_timer);
@@ -10624,12 +17322,24 @@
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.
+ WL_DBG(("*** Wake UP ** abort actframe iovar on bsscfxidx %d\n", bsscfgidx));
+ /* Scan engine is not used for sending action frames in the latest driver
+ * branches. actframe_abort is used in the latest driver branches
+ * instead of scan abort.
+ * If actframe_abort iovar succeeds, don't execute scan abort.
+ * If actframe_abort fails with unsupported error,
+ * execute scan abort (for backward copmatibility).
*/
- if (cfg->af_sent_channel)
- wl_cfg80211_scan_abort(cfg);
+ if (cfg->af_sent_channel) {
+ err = wldev_iovar_setint_bsscfg(ndev, "actframe_abort", 1, bsscfgidx);
+ if (err < 0) {
+ if (err == BCME_UNSUPPORTED) {
+ wl_cfg80211_scan_abort(cfg);
+ } else {
+ WL_ERR(("actframe_abort failed. ret:%d\n", err));
+ }
+ }
+ }
}
#ifdef WL_CFG80211_SYNC_GON
else if (wl_get_drv_status_all(cfg, WAITING_NEXT_ACT_FRM_LISTEN)) {
@@ -10640,6 +17350,70 @@
#endif /* WL_CFG80211_SYNC_GON */
}
+#if defined(WLTDLS)
+bool wl_cfg80211_is_tdls_tunneled_frame(void *frame, u32 frame_len)
+{
+ unsigned char *data;
+
+ if (frame == NULL) {
+ WL_ERR(("Invalid frame \n"));
+ return false;
+ }
+
+ if (frame_len < 5) {
+ WL_ERR(("Invalid frame length [%d] \n", frame_len));
+ return false;
+ }
+
+ data = frame;
+
+ if (!memcmp(data, TDLS_TUNNELED_PRB_REQ, 5) ||
+ !memcmp(data, TDLS_TUNNELED_PRB_RESP, 5)) {
+ WL_DBG(("TDLS Vendor Specific Received type\n"));
+ return true;
+ }
+
+ return false;
+}
+#endif /* WLTDLS */
+
+#if defined(WES_SUPPORT)
+static int wes_mode = 0;
+int wl_cfg80211_set_wes_mode(int mode)
+{
+ wes_mode = mode;
+ return 0;
+}
+
+int wl_cfg80211_get_wes_mode(void)
+{
+ return wes_mode;
+}
+
+bool wl_cfg80211_is_wes(void *frame, u32 frame_len)
+{
+ unsigned char *data;
+
+ if (frame == NULL) {
+ WL_ERR(("Invalid frame \n"));
+ return false;
+ }
+
+ if (frame_len < 4) {
+ WL_ERR(("Invalid frame length [%d] \n", frame_len));
+ return false;
+ }
+
+ data = frame;
+
+ if (memcmp(data, "\x7f\x00\x00\xf0", 4) == 0) {
+ WL_DBG(("Receive WES VS Action Frame \n"));
+ return true;
+ }
+
+ return false;
+}
+#endif /* WES_SUPPORT */
int wl_cfg80211_get_ioctl_version(void)
{
@@ -10661,24 +17435,50 @@
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;
- wl_event_rx_frame_data_t *rxframe =
- (wl_event_rx_frame_data_t*)data;
- u32 event = ntoh32(e->event_type);
+ wl_event_rx_frame_data_t *rxframe;
+ u32 event;
u8 *mgmt_frame;
- u8 bsscfgidx = e->bsscfgidx;
- u32 mgmt_frame_len = ntoh32(e->datalen);
- u16 channel = ((ntoh16(rxframe->channel) & WL_CHANSPEC_CHAN_MASK));
-
- if (mgmt_frame_len < sizeof(wl_event_rx_frame_data_t)) {
- WL_ERR(("wrong datalen:%d\n", mgmt_frame_len));
+ u8 bsscfgidx;
+ u32 mgmt_frame_len;
+ u16 channel;
+#if defined(TDLS_MSG_ONLY_WFD) && defined(WLTDLS)
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
+#endif /* BCMDONGLEHOST && TDLS_MSG_ONLY_WFD && WLTDLS */
+ if (ntoh32(e->datalen) < sizeof(wl_event_rx_frame_data_t)) {
+ WL_ERR(("wrong datalen:%d\n", ntoh32(e->datalen)));
return -EINVAL;
}
- mgmt_frame_len -= sizeof(wl_event_rx_frame_data_t);
-
- memset(&bssid, 0, ETHER_ADDR_LEN);
-
+ mgmt_frame_len = ntoh32(e->datalen) - (uint32)sizeof(wl_event_rx_frame_data_t);
+ event = ntoh32(e->event_type);
+ bsscfgidx = e->bsscfgidx;
+ rxframe = (wl_event_rx_frame_data_t *)data;
+ if (!rxframe) {
+ WL_ERR(("rxframe: NULL\n"));
+ return -EINVAL;
+ }
+ channel = (ntoh16(rxframe->channel) & WL_CHANSPEC_CHAN_MASK);
+ bzero(&bssid, ETHER_ADDR_LEN);
ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
+ if ((ndev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP) &&
+ (event == WLC_E_PROBREQ_MSG)) {
+ struct net_info *iter, *next;
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+ for_each_ndev(cfg, iter, next) {
+ GCC_DIAGNOSTIC_POP();
+ if (iter->ndev && iter->wdev &&
+ iter->wdev->iftype == NL80211_IFTYPE_AP) {
+ ndev = iter->ndev;
+ cfgdev = ndev_to_cfgdev(ndev);
+ break;
+ }
+ }
+ }
+#ifdef WL_6E
+ if (CHSPEC_IS6G(ntoh16(rxframe->channel))) {
+ band = wiphy->bands[IEEE80211_BAND_6GHZ];
+ } else
+#endif /* WL_6E */
if (channel <= CH_MAX_2G_CHANNEL)
band = wiphy->bands[IEEE80211_BAND_2GHZ];
else
@@ -10687,21 +17487,27 @@
WL_ERR(("No valid band"));
return -EINVAL;
}
-#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 38)
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 38) && !defined(WL_COMPAT_WIRELESS)
freq = ieee80211_channel_to_frequency(channel);
(void)band->band;
#else
freq = ieee80211_channel_to_frequency(channel, band->band);
-#endif
+#endif // endif
if (event == WLC_E_ACTION_FRAME_RX) {
- wldev_iovar_getbuf_bsscfg(ndev, "cur_etheraddr",
- NULL, 0, cfg->ioctl_buf, WLC_IOCTL_SMLEN, bsscfgidx, &cfg->ioctl_buf_sync);
+ u8 ioctl_buf[WLC_IOCTL_SMLEN];
- err = wldev_ioctl(ndev, WLC_GET_BSSID, &bssid, ETHER_ADDR_LEN, false);
+ if ((err = wldev_iovar_getbuf_bsscfg(ndev, "cur_etheraddr",
+ NULL, 0, ioctl_buf, sizeof(ioctl_buf), bsscfgidx,
+ NULL)) != BCME_OK) {
+ WL_ERR(("WLC_GET_CUR_ETHERADDR failed, error %d\n", err));
+ goto exit;
+ }
+
+ err = wldev_ioctl_get(ndev, WLC_GET_BSSID, &bssid, ETHER_ADDR_LEN);
if (err < 0)
WL_ERR(("WLC_GET_BSSID error %d\n", err));
- memcpy(da.octet, cfg->ioctl_buf, ETHER_ADDR_LEN);
- err = wl_frame_get_mgmt(FC_ACTION, &da, &e->addr, &bssid,
+ memcpy(da.octet, ioctl_buf, ETHER_ADDR_LEN);
+ err = wl_frame_get_mgmt(cfg, FC_ACTION, &da, &e->addr, &bssid,
&mgmt_frame, &mgmt_frame_len,
(u8 *)((wl_event_rx_frame_data_t *)rxframe + 1));
if (err < 0) {
@@ -10731,25 +17537,33 @@
wl_clr_drv_status(cfg, WAITING_NEXT_ACT_FRM, ndev);
/* Stop waiting for next AF. */
- wl_stop_wait_next_action_frame(cfg, ndev);
+ wl_stop_wait_next_action_frame(cfg, ndev, bsscfgidx);
}
}
(void) sd_act_frm;
#ifdef WLTDLS
- } else if (mgmt_frame[DOT11_MGMT_HDR_LEN] == TDLS_AF_CATEGORY) {
- WL_DBG((" TDLS Action Frame Received type = %d \n",
- mgmt_frame[DOT11_MGMT_HDR_LEN + 1]));
-
+ } else if ((mgmt_frame[DOT11_MGMT_HDR_LEN] == TDLS_AF_CATEGORY) ||
+ (wl_cfg80211_is_tdls_tunneled_frame(
+ &mgmt_frame[DOT11_MGMT_HDR_LEN],
+ mgmt_frame_len - DOT11_MGMT_HDR_LEN))) {
+ if (mgmt_frame[DOT11_MGMT_HDR_LEN] == TDLS_AF_CATEGORY) {
+ WL_ERR((" TDLS Action Frame Received type = %d \n",
+ mgmt_frame[DOT11_MGMT_HDR_LEN + 1]));
+ }
+#ifdef TDLS_MSG_ONLY_WFD
+ if (!dhdp->tdls_mode) {
+ WL_DBG((" TDLS Frame filtered \n"));
+ goto exit;
+ }
+#else
if (mgmt_frame[DOT11_MGMT_HDR_LEN + 1] == TDLS_ACTION_SETUP_RESP) {
cfg->tdls_mgmt_frame = mgmt_frame;
cfg->tdls_mgmt_frame_len = mgmt_frame_len;
cfg->tdls_mgmt_freq = freq;
return 0;
}
-
- } else if (mgmt_frame[DOT11_MGMT_HDR_LEN] == TDLS_VENDOR_SPECIFIC) {
- WL_DBG((" TDLS Vendor Specific Received type \n"));
-#endif
+#endif /* TDLS_MSG_ONLY_WFD */
+#endif /* WLTDLS */
#ifdef QOS_MAP_SET
} else if (mgmt_frame[DOT11_MGMT_HDR_LEN] == DOT11_ACTION_CAT_QOS) {
/* update QoS map set table */
@@ -10759,20 +17573,41 @@
DOT11_MNG_QOS_MAP_ID)) != NULL) {
WL_DBG((" QoS map set IE found in QoS action frame\n"));
if (!cfg->up_table) {
- cfg->up_table = kmalloc(UP_TABLE_MAX, GFP_KERNEL);
+ cfg->up_table = (uint8 *)MALLOC(cfg->osh, UP_TABLE_MAX);
}
wl_set_up_table(cfg->up_table, qos_map_ie);
} else {
- kfree(cfg->up_table);
- cfg->up_table = NULL;
+ MFREE(cfg->osh, cfg->up_table, UP_TABLE_MAX);
}
#endif /* QOS_MAP_SET */
+#ifdef WBTEXT
+ } else if (mgmt_frame[DOT11_MGMT_HDR_LEN] == DOT11_ACTION_CAT_RRM) {
+ /* radio measurement category */
+ switch (mgmt_frame[DOT11_MGMT_HDR_LEN+1]) {
+ case DOT11_RM_ACTION_NR_REP:
+ if (wl_cfg80211_recv_nbr_resp(ndev,
+ &mgmt_frame[DOT11_MGMT_HDR_LEN],
+ mgmt_frame_len - DOT11_MGMT_HDR_LEN)
+ == BCME_OK) {
+ WL_DBG(("RCC updated by nbr response\n"));
+ }
+ break;
+ default:
+ break;
+ }
+#endif /* WBTEXT */
} else {
/*
* if we got normal action frame and ndev is p2p0,
* we have to change ndev from p2p0 to wlan0
*/
-
+#if defined(WES_SUPPORT)
+ if (wl_cfg80211_is_wes(&mgmt_frame[DOT11_MGMT_HDR_LEN],
+ mgmt_frame_len - DOT11_MGMT_HDR_LEN) && wes_mode == 0) {
+ /* Ignore WES VS Action frame */
+ goto exit;
+ }
+#endif /* WES_SUPPORT */
if (cfg->next_af_subtype != P2P_PAF_SUBTYPE_INVALID) {
u8 action = 0;
@@ -10785,12 +17620,30 @@
wl_clr_drv_status(cfg, WAITING_NEXT_ACT_FRM, ndev);
/* Stop waiting for next AF. */
- wl_stop_wait_next_action_frame(cfg, ndev);
+ wl_stop_wait_next_action_frame(cfg, ndev, bsscfgidx);
}
}
}
if (act_frm) {
+#ifdef WL_CFG80211_GON_COLLISION
+ if (act_frm->subtype == P2P_PAF_GON_REQ) {
+ wl_gon_req_collision(cfg,
+ &cfg->afx_hdl->pending_tx_act_frm->action_frame,
+ act_frm, ndev, e->addr, da);
+
+ if (cfg->block_gon_req_rx_count) {
+ WL_ERR(("drop frame GON Req Rx : count (%d)\n",
+ 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 */
+ 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(cfg, WAITING_NEXT_ACT_FRM)) {
if (cfg->next_af_subtype == act_frm->subtype) {
@@ -10803,20 +17656,21 @@
}
/* Stop waiting for next AF. */
- wl_stop_wait_next_action_frame(cfg, ndev);
+ wl_stop_wait_next_action_frame(cfg, ndev, bsscfgidx);
+ } else if ((cfg->next_af_subtype == P2P_PAF_GON_RSP) &&
+ (act_frm->subtype == P2P_PAF_GON_REQ)) {
+ /* If current received frame is GO NEG REQ and next
+ * expected frame is GO NEG RESP, do not send it up.
+ */
+ WL_ERR(("GO Neg req received while waiting for RESP."
+ "Discard incoming frame\n"));
+ goto exit;
}
}
}
wl_cfgp2p_print_actframe(false, &mgmt_frame[DOT11_MGMT_HDR_LEN],
mgmt_frame_len - DOT11_MGMT_HDR_LEN, channel);
- /*
- * After complete GO Negotiation, roll back to mpc mode
- */
- if (act_frm && ((act_frm->subtype == P2P_PAF_GON_CONF) ||
- (act_frm->subtype == P2P_PAF_PROVDIS_RSP))) {
- 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(cfg, GO_NEG_PHASE);
@@ -10846,13 +17700,55 @@
return 0;
}
if (prbreq_ies.wps_ie != NULL) {
- wl_validate_wps_ie((char *)prbreq_ies.wps_ie, prbreq_ies.wps_ie_len, &pbc);
+ wl_validate_wps_ie(
+ (const char *)prbreq_ies.wps_ie, prbreq_ies.wps_ie_len, &pbc);
WL_DBG((" wps_ie exist pbc = %d\n", pbc));
/* if pbc method, send prob_req mgmt frame to upper layer */
if (!pbc)
return 0;
} else
return 0;
+#ifdef WL_SAE
+ } else if (event == WLC_E_EXT_AUTH_FRAME_RX) {
+ u8 ioctl_buf[WLC_IOCTL_SMLEN];
+ u8 *frame;
+
+ WL_DBG(("EVENT: auth frame rx received\n"));
+ if (e->datalen < sizeof(*rxframe)) {
+ WL_ERR(("EXT_AUTH_RX: event data too small. Ignoring event\n"));
+ return -EINVAL;
+ }
+
+ bzero(&da, sizeof(da));
+ if ((err = wldev_iovar_getbuf_bsscfg(ndev, "cur_etheraddr",
+ NULL, 0, ioctl_buf, sizeof(ioctl_buf), bsscfgidx,
+ NULL)) != BCME_OK) {
+ WL_ERR(("EXT_AUTH_RX: cur_etheraddr iovar failed, error %d\n", err));
+ goto exit;
+ }
+ memcpy(da.octet, ioctl_buf, ETHER_ADDR_LEN);
+
+ err = wldev_ioctl_get(ndev, WLC_GET_BSSID, &bssid, ETHER_ADDR_LEN);
+ if (err < 0) {
+ if (cfgdev_to_wdev(cfgdev)->iftype == NL80211_IFTYPE_STATION) {
+ memcpy(bssid.octet, da.octet, ETHER_ADDR_LEN);
+ } else {
+ WL_ERR(("EXT_AUTH_RX: WLC_GET_BSSID failed, error %d\n", err));
+ }
+ }
+
+ frame = (u8 *)((wl_event_rx_frame_data_t *)rxframe + 1);
+ frame += DOT11_MGMT_HDR_LEN;
+ mgmt_frame_len -= DOT11_MGMT_HDR_LEN;
+ err = wl_frame_get_mgmt(cfg, FC_AUTH, &da, &e->addr, &bssid,
+ &mgmt_frame, &mgmt_frame_len, frame);
+ if (err < 0) {
+ WL_ERR(("EXT_AUTH_RX: mgmt frame to cfg80211, len %d channel %d freq %d\n",
+ mgmt_frame_len, channel, freq));
+ goto exit;
+ }
+ isfree = true;
+#endif /* WL_SAE */
} else {
mgmt_frame = (u8 *)((wl_event_rx_frame_data_t *)rxframe + 1);
@@ -10865,6 +17761,20 @@
WL_DBG((" Event %s\n", (event == WLC_E_P2P_PROBREQ_MSG) ?
"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(cfg) &&
+ !memcmp(cfg->afx_hdl->tx_dst_addr.octet, e->addr.octet,
+ ETHER_ADDR_LEN)) {
+ 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));
+ cfg->afx_hdl->peer_chan = channel;
+ complete(&cfg->act_frm_scan);
+ }
+ }
+#endif /* WL_CFG80211_USE_PRB_REQ_FOR_AF_TX */
/* Filter any P2P probe reqs arriving during the
* GO-NEG Phase
@@ -10872,7 +17782,7 @@
if (cfg->p2p &&
#if defined(P2P_IE_MISSING_FIX)
cfg->p2p_prb_noti &&
-#endif
+#endif // endif
wl_get_p2p_status(cfg, GO_NEG_PHASE)) {
WL_DBG(("Filtering P2P probe_req while "
"being in GO-Neg state\n"));
@@ -10885,155 +17795,25 @@
WL_DBG(("Rx Managment frame For P2P Discovery Interface \n"));
else
WL_DBG(("Rx Managment frame For Iface (%s) \n", ndev->name));
-
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
- cfg80211_rx_mgmt(cfgdev, freq, 0, mgmt_frame, mgmt_frame_len, 0);
-#elif(LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0))
+ cfg80211_rx_mgmt(cfgdev, freq, 0, mgmt_frame, mgmt_frame_len, 0);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
cfg80211_rx_mgmt(cfgdev, freq, 0, mgmt_frame, mgmt_frame_len, 0, GFP_ATOMIC);
#elif (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(cfgdev, freq, mgmt_frame, mgmt_frame_len, GFP_ATOMIC);
-#endif /* LINUX_VERSION >= VERSION(3, 14, 0) */
+#endif /* LINUX_VERSION >= VERSION(3, 18, 0) */
WL_DBG(("mgmt_frame_len (%d) , e->datalen (%d), channel (%d), freq (%d)\n",
mgmt_frame_len, ntoh32(e->datalen), channel, freq));
exit:
- if (isfree)
- kfree(mgmt_frame);
- return 0;
-}
-
-#ifdef WL_SCHED_SCAN
-/* If target scan is not reliable, set the below define to "1" to do a
- * full escan
- */
-#define FULL_ESCAN_ON_PFN_NET_FOUND 0
-static s32
-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 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"));
-
- if ((e->event_type == WLC_E_PFN_NET_LOST) || !data) {
- WL_PNO(("Do Nothing %d\n", e->event_type));
- return 0;
+ if (isfree) {
+ MFREE(cfg->osh, mgmt_frame, mgmt_frame_len);
}
- if (pfn_result->version != PFN_SCANRESULT_VERSION) {
- WL_ERR(("Incorrect version %d, expected %d\n", pfn_result->version,
- PFN_SCANRESULT_VERSION));
- return 0;
- }
- WL_PNO((">>> PFN NET FOUND event. count:%d \n", n_pfn_results));
- if (n_pfn_results > 0) {
- int i;
-
- 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) * n_pfn_results),
- GFP_KERNEL);
- if (!request || !channel) {
- WL_ERR(("No memory"));
- err = -ENOMEM;
- goto out_err;
- }
-
- request->wiphy = wiphy;
-
- for (i = 0; i < n_pfn_results; i++) {
- netinfo = &pnetinfo[i];
- if (!netinfo) {
- WL_ERR(("Invalid netinfo ptr. index:%d", i));
- err = -EINVAL;
- goto out_err;
- }
- WL_PNO((">>> SSID:%s Channel:%d \n",
- netinfo->pfnsubnet.SSID, netinfo->pfnsubnet.channel));
- /* PFN result doesn't have all the info which are required by the supplicant
- * (For e.g IEs) Do a target Escan so that sched scan results are reported
- * via wl_inform_single_bss in the required format. Escan does require the
- * scan request in the form of cfg80211_scan_request. For timebeing, create
- * cfg80211_scan_request one out of the received PNO event.
- */
- ssid[i].ssid_len = MIN(netinfo->pfnsubnet.SSID_len, DOT11_MAX_SSID_LEN);
- memcpy(ssid[i].ssid, netinfo->pfnsubnet.SSID, ssid[i].ssid_len);
- request->n_ssids++;
-
- channel_req = netinfo->pfnsubnet.channel;
- band = (channel_req <= CH_MAX_2G_CHANNEL) ? NL80211_BAND_2GHZ
- : NL80211_BAND_5GHZ;
- 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++;
- }
-
- /* assign parsed ssid array */
- if (request->n_ssids)
- request->ssids = &ssid[0];
-
- if (wl_get_drv_status_all(cfg, SCANNING)) {
- /* Abort any on-going scan */
- wl_notify_escan_complete(cfg, ndev, true, true);
- }
-
- if (wl_get_p2p_status(cfg, DISCOVERY_ON)) {
- WL_PNO((">>> P2P discovery was ON. Disabling it\n"));
- err = wl_cfgp2p_discover_enable_search(cfg, false);
- if (unlikely(err)) {
- wl_clr_drv_status(cfg, SCANNING, ndev);
- goto out_err;
- }
- p2p_scan(cfg) = false;
- }
-
- 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(cfg, wiphy, ndev, NULL);
-#else
- WL_PNO((">>> Doing targeted ESCAN on PNO event\n"));
- err = wl_do_escan(cfg, wiphy, ndev, request);
-#endif
- if (err) {
- wl_clr_drv_status(cfg, SCANNING, ndev);
- goto out_err;
- }
- 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;
}
-#endif /* WL_SCHED_SCAN */
static void wl_init_conf(struct wl_conf *conf)
{
@@ -11050,14 +17830,19 @@
unsigned long flags;
struct wl_profile *profile = wl_get_profile_by_netdev(cfg, ndev);
- spin_lock_irqsave(&cfg->cfgdrv_lock, flags);
- memset(profile, 0, sizeof(struct wl_profile));
- spin_unlock_irqrestore(&cfg->cfgdrv_lock, flags);
+ if (!profile) {
+ WL_ERR(("profile null\n"));
+ return;
+ }
+
+ WL_CFG_DRV_LOCK(&cfg->cfgdrv_lock, flags);
+ bzero(profile, sizeof(struct wl_profile));
+ WL_CFG_DRV_UNLOCK(&cfg->cfgdrv_lock, flags);
}
static void wl_init_event_handler(struct bcm_cfg80211 *cfg)
{
- memset(cfg->evt_handler, 0, sizeof(cfg->evt_handler));
+ bzero(cfg->evt_handler, 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;
@@ -11079,6 +17864,8 @@
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;
+ cfg->evt_handler[WLC_E_AUTH_IND] = wl_notify_connect_status;
+ cfg->evt_handler[WLC_E_ASSOC_RESP_IE] = wl_notify_connect_status;
#ifdef PNO_SUPPORT
cfg->evt_handler[WLC_E_PFN_NET_FOUND] = wl_notify_pfn_status;
#endif /* PNO_SUPPORT */
@@ -11086,48 +17873,131 @@
cfg->evt_handler[WLC_E_PFN_BEST_BATCHING] = wl_notify_gscan_event;
cfg->evt_handler[WLC_E_PFN_SCAN_COMPLETE] = wl_notify_gscan_event;
cfg->evt_handler[WLC_E_PFN_GSCAN_FULL_RESULT] = wl_notify_gscan_event;
- cfg->evt_handler[WLC_E_PFN_SWC] = wl_notify_gscan_event;
cfg->evt_handler[WLC_E_PFN_BSSID_NET_FOUND] = wl_notify_gscan_event;
cfg->evt_handler[WLC_E_PFN_BSSID_NET_LOST] = wl_notify_gscan_event;
cfg->evt_handler[WLC_E_PFN_SSID_EXT] = wl_notify_gscan_event;
cfg->evt_handler[WLC_E_GAS_FRAGMENT_RX] = wl_notify_gscan_event;
cfg->evt_handler[WLC_E_ROAM_EXP_EVENT] = wl_handle_roam_exp_event;
#endif /* GSCAN_SUPPORT */
+#ifdef RSSI_MONITOR_SUPPORT
cfg->evt_handler[WLC_E_RSSI_LQM] = wl_handle_rssi_monitor_event;
+#endif /* RSSI_MONITOR_SUPPORT */
#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 */
#ifdef WL_RELMCAST
cfg->evt_handler[WLC_E_RMC_EVENT] = wl_notify_rmc_status;
-#endif
+#endif /* WL_RELMCAST */
#ifdef BT_WIFI_HANDOVER
cfg->evt_handler[WLC_E_BT_WIFI_HANDOVER_REQ] = wl_notify_bt_wifi_handover_req;
-#endif
+#endif // endif
#ifdef WL_NAN
- cfg->evt_handler[WLC_E_NAN] = wl_cfgnan_notify_nan_status;
- cfg->evt_handler[WLC_E_PROXD] = wl_cfgnan_notify_proxd_status;
+ cfg->evt_handler[WLC_E_NAN_CRITICAL] = wl_cfgnan_notify_nan_status;
+ cfg->evt_handler[WLC_E_NAN_NON_CRITICAL] = wl_cfgnan_notify_nan_status;
#endif /* WL_NAN */
cfg->evt_handler[WLC_E_CSA_COMPLETE_IND] = wl_csa_complete_ind;
-#ifdef DHD_LOSSLESS_ROAMING
+ cfg->evt_handler[WLC_E_AP_STARTED] = wl_ap_start_ind;
+#ifdef CUSTOM_EVENT_PM_WAKE
+ cfg->evt_handler[WLC_E_EXCESS_PM_WAKE_EVENT] = wl_check_pmstatus;
+#endif /* CUSTOM_EVENT_PM_WAKE */
+#if defined(DHD_LOSSLESS_ROAMING) || defined(DBG_PKT_MON)
cfg->evt_handler[WLC_E_ROAM_PREP] = wl_notify_roam_prep_status;
-#endif
+#endif /* DHD_LOSSLESS_ROAMING || DBG_PKT_MON */
+ cfg->evt_handler[WLC_E_ROAM_START] = wl_notify_roam_start_status;
+#ifdef WL_BAM
+ cfg->evt_handler[WLC_E_ADPS] = wl_adps_event_handler;
+#endif /* WL_BAM */
+ cfg->evt_handler[WLC_E_PSK_SUP] = wl_cfg80211_sup_event_handler;
+#ifdef WL_BCNRECV
+ cfg->evt_handler[WLC_E_BCNRECV_ABORTED] = wl_bcnrecv_aborted_event_handler;
+#endif /* WL_BCNRECV */
+#ifdef WL_MBO
+ cfg->evt_handler[WLC_E_MBO] = wl_mbo_event_handler;
+#endif /* WL_MBO */
+#ifdef WL_CAC_TS
+ cfg->evt_handler[WLC_E_ADDTS_IND] = wl_cfg80211_cac_event_handler;
+ cfg->evt_handler[WLC_E_DELTS_IND] = wl_cfg80211_cac_event_handler;
+#endif /* WL_CAC_TS */
+#if defined(WL_MBO) || defined(WL_OCE)
+ cfg->evt_handler[WLC_E_PRUNE] = wl_bssid_prune_event_handler;
+#endif /* WL_MBO || WL_OCE */
+#ifdef RTT_SUPPORT
+ cfg->evt_handler[WLC_E_PROXD] = wl_cfg80211_rtt_event_handler;
+#endif // endif
+#ifdef WL_CHAN_UTIL
+ cfg->evt_handler[WLC_E_BSS_LOAD] = wl_cfg80211_bssload_report_event_handler;
+#endif /* WL_CHAN_UTIL */
+ cfg->evt_handler[WLC_E_IND_DOS_STATUS] = wl_notify_dos_status;
+#ifdef WL_SAE
+ cfg->evt_handler[WLC_E_EXT_AUTH_REQ] = wl_notify_extauth_req_event;
+ cfg->evt_handler[WLC_E_EXT_AUTH_FRAME_RX] = wl_notify_rx_mgmt_frame;
+ cfg->evt_handler[WLC_E_MGMT_FRAME_TXSTATUS] = wl_notify_mgmt_frame_tx_complete;
+ cfg->evt_handler[WLC_E_MGMT_FRAME_OFF_CHAN_COMPLETE] = wl_notify_mgmt_frame_tx_complete;
+#endif /* WL_SAE */
+#ifdef ENABLE_HOGSQS
+ cfg->evt_handler[WLC_E_LDF_HOGGER] = wl_cfg80211_hogsqs_notify;
+#endif /* ENABLE_HOGSQS */
+
}
#if defined(STATIC_WL_PRIV_STRUCT)
-static void
+static int
wl_init_escan_result_buf(struct bcm_cfg80211 *cfg)
{
+#ifdef DUAL_ESCAN_RESULT_BUFFER
+ cfg->escan_info.escan_buf[0] = DHD_OS_PREALLOC(cfg->pub,
+ DHD_PREALLOC_WIPHY_ESCAN0, ESCAN_BUF_SIZE);
+ if (cfg->escan_info.escan_buf[0] == NULL) {
+ WL_ERR(("Failed to alloc ESCAN_BUF0\n"));
+ return -ENOMEM;
+ }
+
+ cfg->escan_info.escan_buf[1] = DHD_OS_PREALLOC(cfg->pub,
+ DHD_PREALLOC_WIPHY_ESCAN1, ESCAN_BUF_SIZE);
+ if (cfg->escan_info.escan_buf[1] == NULL) {
+ WL_ERR(("Failed to alloc ESCAN_BUF1\n"));
+ return -ENOMEM;
+ }
+
+ bzero(cfg->escan_info.escan_buf[0], ESCAN_BUF_SIZE);
+ 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, ESCAN_BUF_SIZE);
+ if (cfg->escan_info.escan_buf == NULL) {
+ WL_ERR(("Failed to alloc ESCAN_BUF\n"));
+ return -ENOMEM;
+ }
bzero(cfg->escan_info.escan_buf, ESCAN_BUF_SIZE);
+#endif /* DUAL_ESCAN_RESULT_BUFFER */
+
+ return 0;
}
static void
wl_deinit_escan_result_buf(struct bcm_cfg80211 *cfg)
{
- cfg->escan_info.escan_buf = NULL;
+#ifdef DUAL_ESCAN_RESULT_BUFFER
+ if (cfg->escan_info.escan_buf[0] != NULL) {
+ cfg->escan_info.escan_buf[0] = NULL;
+ cfg->escan_info.escan_type[0] = 0;
+ }
+ if (cfg->escan_info.escan_buf[1] != NULL) {
+ cfg->escan_info.escan_buf[1] = NULL;
+ cfg->escan_info.escan_type[1] = 0;
+ }
+#else
+ if (cfg->escan_info.escan_buf != NULL) {
+ cfg->escan_info.escan_buf = NULL;
+ }
+#endif /* DUAL_ESCAN_RESULT_BUFFER */
}
#endif /* STATIC_WL_PRIV_STRUCT */
@@ -11135,58 +18005,62 @@
{
WL_DBG(("Enter \n"));
- cfg->scan_results = (void *)kzalloc(WL_SCAN_BUF_MAX, GFP_KERNEL);
+ cfg->scan_results = (struct wl_scan_results *)MALLOCZ(cfg->osh,
+ WL_SCAN_BUF_MAX);
if (unlikely(!cfg->scan_results)) {
WL_ERR(("Scan results alloc failed\n"));
goto init_priv_mem_out;
}
- cfg->conf = (void *)kzalloc(sizeof(*cfg->conf), GFP_KERNEL);
+ cfg->conf = (struct wl_conf *)MALLOCZ(cfg->osh, sizeof(*cfg->conf));
if (unlikely(!cfg->conf)) {
WL_ERR(("wl_conf alloc failed\n"));
goto init_priv_mem_out;
}
- cfg->scan_req_int =
- (void *)kzalloc(sizeof(*cfg->scan_req_int), GFP_KERNEL);
+ cfg->scan_req_int = (void *)MALLOCZ(cfg->osh,
+ sizeof(*cfg->scan_req_int));
if (unlikely(!cfg->scan_req_int)) {
WL_ERR(("Scan req alloc failed\n"));
goto init_priv_mem_out;
}
- cfg->ioctl_buf = (void *)kzalloc(WLC_IOCTL_MAXLEN, GFP_KERNEL);
+ cfg->ioctl_buf = (u8 *)MALLOCZ(cfg->osh, WLC_IOCTL_MAXLEN);
if (unlikely(!cfg->ioctl_buf)) {
WL_ERR(("Ioctl buf alloc failed\n"));
goto init_priv_mem_out;
}
- cfg->escan_ioctl_buf = (void *)kzalloc(WLC_IOCTL_MAXLEN, GFP_KERNEL);
+ cfg->escan_ioctl_buf = (void *)MALLOCZ(cfg->osh, WLC_IOCTL_MAXLEN);
if (unlikely(!cfg->escan_ioctl_buf)) {
WL_ERR(("Ioctl buf alloc failed\n"));
goto init_priv_mem_out;
}
- cfg->extra_buf = (void *)kzalloc(WL_EXTRA_BUF_MAX, GFP_KERNEL);
+ cfg->extra_buf = (void *)MALLOCZ(cfg->osh, WL_EXTRA_BUF_MAX);
if (unlikely(!cfg->extra_buf)) {
WL_ERR(("Extra buf alloc failed\n"));
goto init_priv_mem_out;
}
- cfg->pmk_list = (void *)kzalloc(sizeof(*cfg->pmk_list), GFP_KERNEL);
+ cfg->pmk_list = (void *)MALLOCZ(cfg->osh, sizeof(*cfg->pmk_list));
if (unlikely(!cfg->pmk_list)) {
WL_ERR(("pmk list alloc failed\n"));
goto init_priv_mem_out;
}
#if defined(STATIC_WL_PRIV_STRUCT)
- cfg->conn_info = (void *)kzalloc(sizeof(*cfg->conn_info), GFP_KERNEL);
+ cfg->conn_info = (void *)MALLOCZ(cfg->osh, sizeof(*cfg->conn_info));
if (unlikely(!cfg->conn_info)) {
- WL_ERR(("cfg->conn_info alloc failed\n"));
+ WL_ERR(("cfg->conn_info alloc failed\n"));
goto init_priv_mem_out;
}
- cfg->ie = (void *)kzalloc(sizeof(*cfg->ie), GFP_KERNEL);
+ cfg->ie = (void *)MALLOC(cfg->osh, sizeof(*cfg->ie));
if (unlikely(!cfg->ie)) {
- WL_ERR(("cfg->ie alloc failed\n"));
+ WL_ERR(("cfg->ie alloc failed\n"));
goto init_priv_mem_out;
}
- wl_init_escan_result_buf(cfg);
+ if (unlikely(wl_init_escan_result_buf(cfg))) {
+ WL_ERR(("Failed to init escan resul buf\n"));
+ goto init_priv_mem_out;
+ }
#endif /* STATIC_WL_PRIV_STRUCT */
- cfg->afx_hdl = (void *)kzalloc(sizeof(*cfg->afx_hdl), GFP_KERNEL);
+ cfg->afx_hdl = (void *)MALLOCZ(cfg->osh, sizeof(*cfg->afx_hdl));
if (unlikely(!cfg->afx_hdl)) {
- WL_ERR(("afx hdl alloc failed\n"));
+ WL_ERR(("afx hdl alloc failed\n"));
goto init_priv_mem_out;
} else {
init_completion(&cfg->act_frm_scan);
@@ -11196,8 +18070,9 @@
}
#ifdef WLTDLS
if (cfg->tdls_mgmt_frame) {
- kfree(cfg->tdls_mgmt_frame);
+ MFREE(cfg->osh, cfg->tdls_mgmt_frame, cfg->tdls_mgmt_frame_len);
cfg->tdls_mgmt_frame = NULL;
+ cfg->tdls_mgmt_frame_len = 0;
}
#endif /* WLTDLS */
return 0;
@@ -11210,31 +18085,21 @@
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;
+ MFREE(cfg->osh, cfg->scan_results, WL_SCAN_BUF_MAX);
+ MFREE(cfg->osh, cfg->conf, sizeof(*cfg->conf));
+ MFREE(cfg->osh, cfg->scan_req_int, sizeof(*cfg->scan_req_int));
+ MFREE(cfg->osh, cfg->ioctl_buf, WLC_IOCTL_MAXLEN);
+ MFREE(cfg->osh, cfg->escan_ioctl_buf, WLC_IOCTL_MAXLEN);
+ MFREE(cfg->osh, cfg->extra_buf, WL_EXTRA_BUF_MAX);
+ MFREE(cfg->osh, cfg->pmk_list, sizeof(*cfg->pmk_list));
#if defined(STATIC_WL_PRIV_STRUCT)
- kfree(cfg->conn_info);
- cfg->conn_info = NULL;
- kfree(cfg->ie);
- cfg->ie = NULL;
+ MFREE(cfg->osh, cfg->conn_info, sizeof(*cfg->conn_info));
+ MFREE(cfg->osh, cfg->ie, sizeof(*cfg->ie));
wl_deinit_escan_result_buf(cfg);
#endif /* STATIC_WL_PRIV_STRUCT */
if (cfg->afx_hdl) {
cancel_work_sync(&cfg->afx_hdl->work);
- kfree(cfg->afx_hdl);
- cfg->afx_hdl = NULL;
+ MFREE(cfg->osh, cfg->afx_hdl, sizeof(*cfg->afx_hdl));
}
}
@@ -11244,96 +18109,49 @@
int ret = 0;
WL_DBG(("Enter \n"));
- /* Do not use DHD in cfg driver */
- cfg->event_tsk.thr_pid = -1;
+#ifdef OEM_ANDROID
+ /* Allocate workqueue for event */
+ if (!cfg->event_workq) {
+ cfg->event_workq = alloc_workqueue("dhd_eventd",
+ WQ_MEM_RECLAIM | WQ_HIGHPRI | WQ_UNBOUND, 1);
+ }
- PROC_START(wl_event_handler, cfg, &cfg->event_tsk, 0, "wl_event_handler");
- if (cfg->event_tsk.thr_pid < 0)
+ if (!cfg->event_workq) {
ret = -ENOMEM;
+ } else {
+ INIT_WORK(&cfg->event_work, wl_event_handler);
+ }
+#else
+ INIT_WORK(&cfg->event_work, wl_event_handler);
+ cfg->event_workq_init = true;
+#endif /* OEM_ANDROID */
return ret;
}
static void wl_destroy_event_handler(struct bcm_cfg80211 *cfg)
{
- if (cfg->event_tsk.thr_pid >= 0)
- PROC_STOP(&cfg->event_tsk);
+#ifdef OEM_ANDROID
+ if (cfg && cfg->event_workq) {
+ cancel_work_sync(&cfg->event_work);
+ destroy_workqueue(cfg->event_workq);
+ cfg->event_workq = NULL;
+ }
+#else
+ if (cfg && cfg->event_workq_init) {
+ cancel_work_sync(&cfg->event_work);
+ cfg->event_workq_init = false;
+ }
+#endif /* OEM_ANDROID */
}
-void wl_terminate_event_handler(void)
+void wl_terminate_event_handler(struct net_device *dev)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
if (cfg) {
wl_destroy_event_handler(cfg);
wl_flush_eq(cfg);
}
-}
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
-static void wl_scan_timeout(struct timer_list *t)
-{
- struct bcm_cfg80211 *cfg = from_timer(cfg, t, scan_timeout);
-#else
-static void wl_scan_timeout(unsigned long data)
-{
- struct bcm_cfg80211 *cfg = (struct bcm_cfg80211 *)data;
-#endif
- wl_event_msg_t msg;
- struct wireless_dev *wdev = NULL;
- struct net_device *ndev = NULL;
- struct wl_scan_results *bss_list;
- struct wl_bss_info *bi = NULL;
- s32 i;
- u32 channel;
-#if defined(DHD_DEBUG) && defined(BCMPCIE) && defined(DHD_FW_COREDUMP)
- dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
- uint32 prev_memdump_mode = dhdp->memdump_enabled;
-#endif /* DHD_DEBUG && BCMPCIE && DHD_FW_COREDUMP */
-
- if (!(cfg->scan_request)) {
- WL_ERR(("timer expired but no scan request\n"));
- return;
- }
-
- bss_list = wl_escan_get_buf(cfg, FALSE);
- if (!bss_list) {
- WL_ERR(("bss_list is null. Didn't receive any partial scan results\n"));
- } else {
- WL_ERR(("scanned AP count (%d)\n", bss_list->count));
-
- bi = next_bss(bss_list, bi);
- for_each_bss(bss_list, bi, i) {
- channel = wf_chspec_ctlchan(wl_chspec_driver_to_host(bi->chanspec));
- WL_ERR(("SSID :%s Channel :%d\n", bi->SSID, channel));
- }
- }
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0))
- if (cfg->scan_request->dev)
- wdev = cfg->scan_request->dev->ieee80211_ptr;
-#else
- wdev = cfg->scan_request->wdev;
-#endif /* LINUX_VERSION < KERNEL_VERSION(3, 6, 0) */
- if (!wdev) {
- WL_ERR(("No wireless_dev present\n"));
- return;
- }
- ndev = wdev_to_wlc_ndev(wdev, cfg);
-
- bzero(&msg, sizeof(wl_event_msg_t));
- WL_ERR(("timer expired\n"));
-#if defined(DHD_DEBUG) && defined(BCMPCIE) && defined(DHD_FW_COREDUMP)
- if (dhdp->memdump_enabled) {
- dhdp->memdump_enabled = DUMP_MEMFILE;
- dhdp->memdump_type = DUMP_TYPE_SCAN_TIMEOUT;
- dhd_bus_mem_dump(dhdp);
- dhdp->memdump_enabled = prev_memdump_mode;
- }
-#endif /* DHD_DEBUG && BCMPCIE && DHD_FW_COREDUMP */
- msg.event_type = hton32(WLC_E_ESCAN_RESULT);
- msg.status = hton32(WLC_E_STATUS_TIMEOUT);
- msg.reason = 0xFFFFFFFF;
- wl_cfg80211_event(ndev, &msg, NULL);
}
#ifdef DHD_LOSSLESS_ROAMING
@@ -11349,15 +18167,9 @@
}
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
-static void wl_roam_timeout(struct timer_list *t)
-{
- struct bcm_cfg80211 *cfg = from_timer(cfg, t, wl_roam_timeout);
-#else
static void wl_roam_timeout(unsigned long data)
{
struct bcm_cfg80211 *cfg = (struct bcm_cfg80211 *)data;
-#endif
dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
WL_ERR(("roam timer expired\n"));
@@ -11368,6 +18180,124 @@
#endif /* DHD_LOSSLESS_ROAMING */
+#if defined(CONFIG_WLAN_BEYONDX) || defined(CONFIG_SEC_5GMODEL)
+#define CP_CHAN_INFO_RAT_MODE_LTE 3
+#define CP_CHAN_INFO_RAT_MODE_NR5G 7
+int g_mhs_chan_for_cpcoex = 0;
+
+struct __packed cam_cp_noti_info {
+ u8 rat;
+ u32 band;
+ u32 channel;
+};
+
+int
+wl_cfg80211_send_msg_to_ril()
+{
+ int id, buf = 1;
+
+ id = IPC_SYSTEM_CP_CHANNEL_INFO;
+ dev_ril_bridge_send_msg(id, sizeof(int), &buf);
+ WL_ERR(("[BeyondX] send message to ril.\n"));
+
+ OSL_SLEEP(500);
+ return 0;
+}
+
+int
+wl_cfg80211_ril_bridge_notifier_call(struct notifier_block *nb,
+ unsigned long size, void *buf)
+{
+ struct dev_ril_bridge_msg *msg;
+ struct cam_cp_noti_info *cp_noti_info;
+ static int mhs_channel_for_4g, mhs_channel_for_5g;
+ static int recv_msg_4g, recv_msg_5g;
+
+ WL_ERR(("[BeyondX] receive message from ril.\n"));
+ msg = (struct dev_ril_bridge_msg *)buf;
+
+ if (msg->dev_id == IPC_SYSTEM_CP_CHANNEL_INFO &&
+ msg->data_len <= sizeof(struct cam_cp_noti_info)) {
+ u8 rat;
+ u32 band;
+ u32 channel;
+
+ cp_noti_info = (struct cam_cp_noti_info *)msg->data;
+ rat = cp_noti_info->rat;
+ band = cp_noti_info->band;
+ channel = cp_noti_info->channel;
+
+ /* LTE/5G Band/Freq information => Mobile Hotspot channel mapping.
+ * LTE/B40: 38650~39649 => Ch.11
+ * LTE/B41: 39650~41589 => Ch.1
+ * 5G/N41: 499200~537999 => Ch.1
+ */
+ if (rat == CP_CHAN_INFO_RAT_MODE_LTE) {
+ recv_msg_4g = 1;
+ if (channel >= 38650 && channel <= 39649) {
+ mhs_channel_for_4g = 11;
+ } else if (channel >= 39650 && channel <= 41589) {
+ mhs_channel_for_4g = 1;
+ }
+ }
+ if (rat == CP_CHAN_INFO_RAT_MODE_NR5G) {
+ recv_msg_5g = 1;
+ if (channel >= 499200 && channel <= 537999) {
+ mhs_channel_for_5g = 1;
+ }
+ }
+
+ WL_DBG(("[BeyondX] rat: %u, band: %u, channel: %u, mhs_channel_for_4g: %u, "
+ "mhs_channel_for_5g: %u\n", rat, band, channel,
+ mhs_channel_for_4g, mhs_channel_for_5g));
+
+ if (recv_msg_4g && recv_msg_5g) {
+ if (mhs_channel_for_4g && mhs_channel_for_5g) {
+ /* if 4G/B40 + 5G/N41, select channel 6 for MHS */
+ if (mhs_channel_for_4g == 11 && mhs_channel_for_5g == 1) {
+ g_mhs_chan_for_cpcoex = 6;
+ /* if 4G(except for B40) + 5G/N41, select channel 1 for MHS */
+ } else {
+ g_mhs_chan_for_cpcoex = 1;
+ }
+ } else {
+ g_mhs_chan_for_cpcoex = mhs_channel_for_4g ? mhs_channel_for_4g :
+ mhs_channel_for_5g ? mhs_channel_for_5g : 0;
+ }
+ mhs_channel_for_4g = mhs_channel_for_5g = 0;
+ recv_msg_4g = recv_msg_5g = 0;
+ }
+ }
+
+ return 0;
+}
+
+static struct notifier_block wl_cfg80211_ril_bridge_notifier = {
+ .notifier_call = wl_cfg80211_ril_bridge_notifier_call,
+};
+
+static bool wl_cfg80211_ril_bridge_notifier_registered = FALSE;
+#endif /* CONFIG_WLAN_BEYONDX || defined(CONFIG_SEC_5GMODEL) */
+
+#if !defined(DISALBE_11H) && defined(DHD_NOSCAN_DURING_CSA)
+static void wl_del_csa_timeout(struct bcm_cfg80211 *cfg)
+{
+ if (cfg) {
+ if (timer_pending(&cfg->csa_timeout)) {
+ del_timer_sync(&cfg->csa_timeout);
+ }
+ }
+}
+
+static void wl_csa_timeout(unsigned long data)
+{
+ struct bcm_cfg80211 *cfg = (struct bcm_cfg80211 *)data;
+
+ if (cfg->in_csa)
+ cfg->in_csa = FALSE;
+}
+#endif /* !defined(DISALBE_11H) && defined(DHD_NOSCAN_DURING_CSA) */
+
static s32
wl_cfg80211_netdev_notifier_call(struct notifier_block * nb,
unsigned long state, void *ptr)
@@ -11377,13 +18307,32 @@
#else
struct net_device *dev = netdev_notifier_info_to_dev(ptr);
#endif /* LINUX_VERSION < VERSION(3, 11, 0) */
- struct wireless_dev *wdev = ndev_to_wdev(dev);
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct wireless_dev *wdev = NULL;
+ struct bcm_cfg80211 *cfg = NULL;
- WL_DBG(("Enter \n"));
-
- if (!wdev || !cfg || dev == bcmcfg_to_prmry_ndev(cfg))
+ WL_DBG(("Enter state:%lu ndev%p \n", state, dev));
+ if (!dev) {
+ WL_ERR(("dev null\n"));
return NOTIFY_DONE;
+ }
+
+ wdev = ndev_to_wdev(dev);
+ if (!wdev) {
+ WL_ERR(("wdev null. Do nothing\n"));
+ return NOTIFY_DONE;
+ }
+
+ cfg = (struct bcm_cfg80211 *)wiphy_priv(wdev->wiphy);
+ if (!cfg || (cfg != wl_cfg80211_get_bcmcfg())) {
+ /* If cfg80211 priv is null or doesn't match return */
+ WL_ERR(("wrong cfg ptr (%p)\n", cfg));
+ return NOTIFY_DONE;
+ }
+
+ if (dev == bcmcfg_to_prmry_ndev(cfg)) {
+ /* Nothing to be done for primary I/F */
+ return NOTIFY_DONE;
+ }
switch (state) {
case NETDEV_DOWN:
@@ -11422,9 +18371,8 @@
break;
}
case NETDEV_UNREGISTER:
+ wl_cfg80211_clear_per_bss_ies(cfg, wdev);
/* after calling list_del_rcu(&wdev->list) */
- wl_cfg80211_clear_per_bss_ies(cfg,
- wl_get_bssidx_by_wdev(cfg, wdev));
wl_dealloc_netinfo_by_wdev(cfg, wdev);
break;
case NETDEV_GOING_DOWN:
@@ -11435,7 +18383,7 @@
* wdev_cleanup_work call WARN_ON and make the scan done forcibly.
*/
if (wl_get_drv_status(cfg, SCANNING, dev))
- wl_notify_escan_complete(cfg, dev, true, true);
+ wl_cfg80211_cancel_scan(cfg);
break;
}
return NOTIFY_DONE;
@@ -11451,592 +18399,55 @@
*/
static bool wl_cfg80211_netdev_notifier_registered = FALSE;
-static void wl_cfg80211_cancel_scan(struct bcm_cfg80211 *cfg)
-{
- struct wireless_dev *wdev = NULL;
- struct net_device *ndev = NULL;
-
- if (!cfg->scan_request)
- return;
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0))
- if (cfg->scan_request->dev)
- wdev = cfg->scan_request->dev->ieee80211_ptr;
-#else
- wdev = cfg->scan_request->wdev;
-#endif /* LINUX_VERSION < KERNEL_VERSION(3, 6, 0) */
-
- if (!wdev) {
- WL_ERR(("No wireless_dev present\n"));
- return;
- }
-
- ndev = wdev_to_wlc_ndev(wdev, cfg);
- wl_notify_escan_complete(cfg, ndev, true, true);
- WL_ERR(("Scan aborted! \n"));
-}
-
-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 = 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);
- if (params == NULL) {
- WL_ERR(("scan params allocation failed \n"));
- err = -ENOMEM;
- } else {
- /* Do a scan abort to stop the driver's scan engine */
- err = wldev_ioctl(dev, WLC_SCAN, params, params_size, true);
- if (err < 0) {
- WL_ERR(("scan abort failed \n"));
- }
- kfree(params);
- }
- }
-#ifdef WLTDLS
- if (cfg->tdls_mgmt_frame) {
- kfree(cfg->tdls_mgmt_frame);
- cfg->tdls_mgmt_frame = NULL;
- }
-#endif /* WLTDLS */
-}
-
-static s32 wl_notify_escan_complete(struct bcm_cfg80211 *cfg,
- struct net_device *ndev,
- bool aborted, bool fw_abort)
-{
- s32 err = BCME_OK;
- unsigned long flags;
- struct net_device *dev;
-
- WL_DBG(("Enter \n"));
-
- mutex_lock(&cfg->scan_complete);
-
- if (!ndev) {
- WL_ERR(("ndev is null\n"));
- err = BCME_ERROR;
- goto out;
- }
-
- if (cfg->escan_info.ndev != ndev) {
- WL_ERR(("ndev is different %p %p\n", cfg->escan_info.ndev, ndev));
- err = BCME_ERROR;
- goto out;
- }
-
- 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;
-#elif defined(WL_CFG80211_P2P_DEV_IF)
- if (cfg->scan_request->wdev->iftype != NL80211_IFTYPE_P2P_DEVICE)
- dev = cfg->scan_request->wdev->netdev;
-#endif /* WL_ENABLE_P2P_IF */
- }
- else {
- 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(cfg);
- if (timer_pending(&cfg->scan_timeout))
- del_timer_sync(&cfg->scan_timeout);
-#if defined(ESCAN_RESULT_PATCH)
- 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(&cfg->cfgdrv_lock, flags);
-#ifdef WL_SCHED_SCAN
- if (cfg->sched_scan_req && !cfg->scan_request) {
- WL_PNO((">>> REPORTING SCHED SCAN RESULTS \n"));
- 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(cfg->scan_request)) {
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 8, 0))
- struct cfg80211_scan_info info;
- info.aborted = aborted;
- cfg80211_scan_done(cfg->scan_request, &info);
-#else
- cfg80211_scan_done(cfg->scan_request, aborted);
-#endif
- cfg->scan_request = NULL;
- DHD_OS_SCAN_WAKE_UNLOCK((dhd_pub_t *)(cfg->pub));
- }
- 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);
-
-out:
- mutex_unlock(&cfg->scan_complete);
- return err;
-}
-
-#ifdef ESCAN_BUF_OVERFLOW_MGMT
-static void
-wl_cfg80211_find_removal_candidate(wl_bss_info_t *bss, removal_element_t *candidate)
-{
- int idx;
- for (idx = 0; idx < BUF_OVERFLOW_MGMT_COUNT; idx++) {
- int len = BUF_OVERFLOW_MGMT_COUNT - idx - 1;
- if (bss->RSSI < candidate[idx].RSSI) {
- if (len)
- memcpy(&candidate[idx + 1], &candidate[idx],
- sizeof(removal_element_t) * len);
- candidate[idx].RSSI = bss->RSSI;
- candidate[idx].length = bss->length;
- memcpy(&candidate[idx].BSSID, &bss->BSSID, ETHER_ADDR_LEN);
- return;
- }
- }
-}
-
-static void
-wl_cfg80211_remove_lowRSSI_info(wl_scan_results_t *list, removal_element_t *candidate,
- wl_bss_info_t *bi)
-{
- int idx1, idx2;
- int total_delete_len = 0;
- for (idx1 = 0; idx1 < BUF_OVERFLOW_MGMT_COUNT; idx1++) {
- int cur_len = WL_SCAN_RESULTS_FIXED_SIZE;
- wl_bss_info_t *bss = NULL;
- if (candidate[idx1].RSSI >= bi->RSSI)
- continue;
- for (idx2 = 0; idx2 < list->count; idx2++) {
- bss = bss ? (wl_bss_info_t *)((uintptr)bss + dtoh32(bss->length)) :
- list->bss_info;
- if (!bcmp(&candidate[idx1].BSSID, &bss->BSSID, ETHER_ADDR_LEN) &&
- candidate[idx1].RSSI == bss->RSSI &&
- candidate[idx1].length == dtoh32(bss->length)) {
- u32 delete_len = dtoh32(bss->length);
- WL_DBG(("delete scan info of " MACDBG " to add new AP\n",
- MAC2STRDBG(bss->BSSID.octet)));
- if (idx2 < list->count -1) {
- memmove((u8 *)bss, (u8 *)bss + delete_len,
- list->buflen - cur_len - delete_len);
- }
- list->buflen -= delete_len;
- list->count--;
- total_delete_len += delete_len;
- /* if delete_len is greater than or equal to result length */
- if (total_delete_len >= bi->length) {
- return;
- }
- break;
- }
- cur_len += dtoh32(bss->length);
- }
- }
-}
-#endif /* ESCAN_BUF_OVERFLOW_MGMT */
-
-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;
- s32 status = ntoh32(e->status);
- wl_bss_info_t *bi;
- wl_escan_result_t *escan_result;
- 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;
-
- WL_DBG((" enter event type : %d, status : %d \n",
- ntoh32(e->event_type), ntoh32(e->status)));
-
- ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
-
- mutex_lock(&cfg->usr_sync);
- /* P2P SCAN is coming from primary interface */
- if (wl_get_p2p_status(cfg, SCANNING)) {
- if (wl_get_drv_status_all(cfg, SENDING_ACT_FRM))
- ndev = cfg->afx_hdl->dev;
- else
- ndev = cfg->escan_info.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)));
- goto exit;
- }
- escan_result = (wl_escan_result_t *)data;
-
- if (status == WLC_E_STATUS_PARTIAL) {
- WL_INFORM(("WLC_E_STATUS_PARTIAL \n"));
- DBG_EVENT_LOG(cfg->pub, WIFI_EVENT_DRIVER_SCAN_RESULT_FOUND);
- if (!escan_result) {
- WL_ERR(("Invalid escan result (NULL pointer)\n"));
- goto exit;
- }
- if ((dtoh32(escan_result->buflen) > (int)ESCAN_BUF_SIZE) ||
- (dtoh32(escan_result->buflen) < sizeof(wl_escan_result_t))) {
- WL_ERR(("Invalid escan buffer len:%d\n", dtoh32(escan_result->buflen)));
- goto exit;
- }
- if (dtoh16(escan_result->bss_count) != 1) {
- WL_ERR(("Invalid bss_count %d: ignoring\n", escan_result->bss_count));
- goto exit;
- }
- bi = escan_result->bss_info;
- if (!bi) {
- WL_ERR(("Invalid escan bss info (NULL pointer)\n"));
- goto exit;
- }
- bi_length = dtoh32(bi->length);
- if (bi_length != (dtoh32(escan_result->buflen) - WL_ESCAN_RESULTS_FIXED_SIZE)) {
- WL_ERR(("Invalid bss_info length %d: ignoring\n", bi_length));
- goto exit;
- }
- if (wl_escan_check_sync_id(status, escan_result->sync_id,
- cfg->escan_info.cur_sync_id) < 0)
- goto exit;
-
- 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(cfg, FINDING_COMMON_CHANNEL)) {
- p2p_dev_addr = wl_cfgp2p_retreive_p2p_dev_addr(bi, bi_length);
- if (p2p_dev_addr && !memcmp(p2p_dev_addr,
- cfg->afx_hdl->tx_dst_addr.octet, ETHER_ADDR_LEN)) {
- s32 channel = wf_chspec_ctlchan(
- 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(cfg->afx_hdl->tx_dst_addr.octet),
- channel));
-
- 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;
-#ifdef ESCAN_BUF_OVERFLOW_MGMT
- removal_element_t candidate[BUF_OVERFLOW_MGMT_COUNT];
- int remove_lower_rssi = FALSE;
-
- bzero(candidate, sizeof(removal_element_t)*BUF_OVERFLOW_MGMT_COUNT);
-#endif /* ESCAN_BUF_OVERFLOW_MGMT */
-
- list = wl_escan_get_buf(cfg, FALSE);
- if (scan_req_match(cfg)) {
- /* p2p scan && allow only probe response */
- 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,
- bi->ie_length)) == NULL) {
- WL_ERR(("Couldn't find P2PIE in probe"
- " response/beacon\n"));
- goto exit;
- }
- }
-#ifdef ESCAN_BUF_OVERFLOW_MGMT
- if (bi_length > ESCAN_BUF_SIZE - list->buflen)
- remove_lower_rssi = TRUE;
-#endif /* ESCAN_BUF_OVERFLOW_MGMT */
-
- for (i = 0; i < list->count; i++) {
- bss = bss ? (wl_bss_info_t *)((uintptr)bss + dtoh32(bss->length))
- : list->bss_info;
-#ifdef ESCAN_BUF_OVERFLOW_MGMT
- WL_TRACE(("%s("MACDBG"), i=%d bss: RSSI %d list->count %d\n",
- bss->SSID, MAC2STRDBG(bss->BSSID.octet),
- i, bss->RSSI, list->count));
-
- if (remove_lower_rssi)
- wl_cfg80211_find_removal_candidate(bss, candidate);
-#endif /* ESCAN_BUF_OVERFLOW_MGMT */
-
- if (!bcmp(&bi->BSSID, &bss->BSSID, ETHER_ADDR_LEN) &&
- (CHSPEC_BAND(wl_chspec_driver_to_host(bi->chanspec))
- == CHSPEC_BAND(wl_chspec_driver_to_host(bss->chanspec))) &&
- bi->SSID_len == bss->SSID_len &&
- !bcmp(bi->SSID, bss->SSID, bi->SSID_len)) {
-
- /* do not allow beacon data to update
- *the data recd from a probe response
- */
- if (!(bss->flags & WL_BSS_FLAGS_FROM_BEACON) &&
- (bi->flags & WL_BSS_FLAGS_FROM_BEACON))
- goto exit;
-
- WL_DBG(("%s("MACDBG"), i=%d prev: RSSI %d"
- " flags 0x%x, new: RSSI %d flags 0x%x\n",
- bss->SSID, MAC2STRDBG(bi->BSSID.octet), i,
- bss->RSSI, bss->flags, bi->RSSI, bi->flags));
-
- if ((bss->flags & WL_BSS_FLAGS_RSSI_ONCHANNEL) ==
- (bi->flags & WL_BSS_FLAGS_RSSI_ONCHANNEL)) {
- /* preserve max RSSI if the measurements are
- * both on-channel or both off-channel
- */
- WL_SCAN(("%s("MACDBG"), same onchan"
- ", RSSI: prev %d new %d\n",
- bss->SSID, MAC2STRDBG(bi->BSSID.octet),
- bss->RSSI, bi->RSSI));
- bi->RSSI = MAX(bss->RSSI, bi->RSSI);
- } else if ((bss->flags & WL_BSS_FLAGS_RSSI_ONCHANNEL) &&
- (bi->flags & WL_BSS_FLAGS_RSSI_ONCHANNEL) == 0) {
- /* preserve the on-channel rssi measurement
- * if the new measurement is off channel
- */
- WL_SCAN(("%s("MACDBG"), prev onchan"
- ", RSSI: prev %d new %d\n",
- bss->SSID, MAC2STRDBG(bi->BSSID.octet),
- bss->RSSI, bi->RSSI));
- bi->RSSI = bss->RSSI;
- bi->flags |= WL_BSS_FLAGS_RSSI_ONCHANNEL;
- }
- if (dtoh32(bss->length) != bi_length) {
- u32 prev_len = dtoh32(bss->length);
-
- WL_SCAN(("bss info replacement"
- " is occured(bcast:%d->probresp%d)\n",
- bss->ie_length, bi->ie_length));
- WL_DBG(("%s("MACDBG"), replacement!(%d -> %d)\n",
- bss->SSID, MAC2STRDBG(bi->BSSID.octet),
- prev_len, bi_length));
-
- if (list->buflen - prev_len + bi_length
- > ESCAN_BUF_SIZE) {
- WL_ERR(("Buffer is too small: keep the"
- " previous result of this AP\n"));
- /* Only update RSSI */
- bss->RSSI = bi->RSSI;
- bss->flags |= (bi->flags
- & WL_BSS_FLAGS_RSSI_ONCHANNEL);
- goto exit;
- }
-
- if (i < list->count - 1) {
- /* memory copy required by this case only */
- memmove((u8 *)bss + bi_length,
- (u8 *)bss + prev_len,
- list->buflen - cur_len - prev_len);
- }
- list->buflen -= prev_len;
- list->buflen += bi_length;
- }
- list->version = dtoh32(bi->version);
- memcpy((u8 *)bss, (u8 *)bi, bi_length);
- goto exit;
- }
- cur_len += dtoh32(bss->length);
- }
- if (bi_length > ESCAN_BUF_SIZE - list->buflen) {
-#ifdef ESCAN_BUF_OVERFLOW_MGMT
- wl_cfg80211_remove_lowRSSI_info(list, candidate, bi);
- if (bi_length > ESCAN_BUF_SIZE - list->buflen) {
- WL_DBG(("RSSI(" MACDBG ") is too low(%d) to add Buffer\n",
- MAC2STRDBG(bi->BSSID.octet), bi->RSSI));
- goto exit;
- }
-#else
- WL_ERR(("Buffer is too small: ignoring\n"));
- goto exit;
-#endif /* ESCAN_BUF_OVERFLOW_MGMT */
- }
-
- memcpy(&(((char *)list)[list->buflen]), bi, bi_length);
- list->version = dtoh32(bi->version);
- list->buflen += bi_length;
- list->count++;
-
- /*
- * !Broadcast && number of ssid = 1 && number of channels =1
- * means specific scan to association
- */
- if (wl_cfgp2p_is_p2p_specific_scan(cfg->scan_request)) {
- WL_ERR(("P2P assoc scan fast aborted.\n"));
- wl_notify_escan_complete(cfg, cfg->escan_info.ndev, false, true);
- goto exit;
- }
- }
- }
- else if (status == WLC_E_STATUS_SUCCESS) {
- 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_INFORM(("ACTION FRAME SCAN DONE\n"));
- 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_INFORM(("ESCAN COMPLETED\n"));
- DBG_EVENT_LOG(cfg->pub, WIFI_EVENT_DRIVER_SCAN_COMPLETE);
- cfg->bss_list = wl_escan_get_buf(cfg, FALSE);
- if (!scan_req_match(cfg)) {
- WL_TRACE_HW4(("SCAN COMPLETED: scanned AP count=%d\n",
- cfg->bss_list->count));
- }
- wl_inform_bss(cfg);
- wl_notify_escan_complete(cfg, ndev, false, false);
- }
- wl_escan_increment_sync_id(cfg, SCAN_BUF_NEXT);
- } else if ((status == WLC_E_STATUS_ABORT) || (status == WLC_E_STATUS_NEWSCAN) ||
- (status == WLC_E_STATUS_11HQUIET) || (status == WLC_E_STATUS_CS_ABORT) ||
- (status == WLC_E_STATUS_NEWASSOC)) {
- /* Handle all cases of scan abort */
- 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);
- WL_DBG(("ESCAN ABORT reason: %d\n", status));
- if (wl_get_drv_status_all(cfg, FINDING_COMMON_CHANNEL)) {
- WL_INFORM(("ACTION FRAME SCAN DONE\n"));
- 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_INFORM(("ESCAN ABORTED\n"));
- cfg->bss_list = wl_escan_get_buf(cfg, TRUE);
- if (!scan_req_match(cfg)) {
- WL_TRACE_HW4(("scan_req_match=0: scanned AP count=%d\n",
- cfg->bss_list->count));
- }
-
- wl_inform_bss(cfg);
- wl_notify_escan_complete(cfg, ndev, true, false);
- } else {
- /* If there is no pending host initiated scan, do nothing */
- WL_DBG(("ESCAN ABORT: No pending scans. Ignoring event.\n"));
- }
- wl_escan_increment_sync_id(cfg, SCAN_BUF_CNT);
- } else if (status == WLC_E_STATUS_TIMEOUT) {
- 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(cfg, cfg->escan_info.ndev, true, true);
- }
- } else {
- WL_ERR(("unexpected Escan Event %d : abort\n", status));
- 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_INFORM(("ACTION FRAME SCAN DONE\n"));
- 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",
- cfg->bss_list->count));
- }
- wl_inform_bss(cfg);
- wl_notify_escan_complete(cfg, ndev, true, false);
- }
- wl_escan_increment_sync_id(cfg, 2);
- }
-exit:
- mutex_unlock(&cfg->usr_sync);
- return err;
-}
-
static void wl_cfg80211_concurrent_roam(struct bcm_cfg80211 *cfg, int enable)
{
u32 connected_cnt = wl_get_drv_status_all(cfg, CONNECTED);
bool p2p_connected = wl_cfgp2p_vif_created(cfg);
struct net_info *iter, *next;
- int err;
if (!(cfg->roam_flags & WL_ROAM_OFF_ON_CONCURRENT))
return;
WL_DBG(("roam off:%d p2p_connected:%d connected_cnt:%d \n",
enable, p2p_connected, connected_cnt));
-
/* Disable FW roam when we have a concurrent P2P connection */
if (enable && p2p_connected && connected_cnt > 1) {
+
/* Mark it as to be reverted */
- cfg->roam_flags |= WL_ROAM_OFF_REVERT;
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#endif
+ cfg->roam_flags |= WL_ROAM_REVERT_STATUS;
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
for_each_ndev(cfg, iter, next) {
- if (iter->ndev) {
- /* Save the current roam setting */
- if ((err = wldev_iovar_getint(iter->ndev, "roam_off",
- (s32 *)&iter->roam_off)) != BCME_OK) {
- WL_ERR(("%s:Failed to get current roam setting err %d\n",
- iter->ndev->name, err));
- continue;
+ GCC_DIAGNOSTIC_POP();
+ if (iter->ndev && iter->wdev &&
+ iter->wdev->iftype == NL80211_IFTYPE_STATION) {
+ if (wldev_iovar_setint(iter->ndev, "roam_off", TRUE)
+ == BCME_OK) {
+ iter->roam_off = TRUE;
}
- if ((err = wldev_iovar_setint(iter->ndev,
- "roam_off", 1)) != BCME_OK) {
- WL_ERR((" %s:failed to set roam_off : %d\n",
- iter->ndev->name, err));
+ else {
+ WL_ERR(("error to enable roam_off\n"));
}
}
}
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic pop")
-#endif
}
- else if (!enable && (cfg->roam_flags & WL_ROAM_OFF_REVERT)) {
- cfg->roam_flags &= ~WL_ROAM_OFF_REVERT;
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#endif
+ else if (!enable && (cfg->roam_flags & WL_ROAM_REVERT_STATUS)) {
+ cfg->roam_flags &= ~WL_ROAM_REVERT_STATUS;
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
for_each_ndev(cfg, iter, next) {
- if (iter->ndev) {
+ GCC_DIAGNOSTIC_POP();
+ if (iter->ndev && iter->wdev &&
+ iter->wdev->iftype == NL80211_IFTYPE_STATION) {
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;
+ if (wldev_iovar_setint(iter->ndev, "roam_off", FALSE)
+ == BCME_OK) {
+ iter->roam_off = FALSE;
+ }
else {
- WL_ERR((" %s:failed to set roam_off : %d\n",
- iter->ndev->name, err));
+ WL_ERR(("error to disable roam_off\n"));
}
}
}
}
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic pop")
-#endif
}
return;
@@ -12054,12 +18465,9 @@
if (connected_cnt <= 1) {
return;
}
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#endif
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
for_each_ndev(cfg, iter, next) {
+ GCC_DIAGNOSTIC_POP();
/* p2p discovery iface ndev could be null */
if (iter->ndev) {
chanspec = 0;
@@ -12082,14 +18490,52 @@
}
}
}
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic pop")
-#endif
WL_ERR(("%s concurrency is enabled\n", cfg->vsdb_mode ? "Multi Channel" : "Same Channel"));
return;
}
+int
+wl_cfg80211_determine_p2p_rsdb_mode(struct bcm_cfg80211 *cfg)
+{
+ struct net_info *iter, *next;
+ u32 chanspec = 0;
+ u32 band = 0;
+ u32 pre_band = 0;
+ bool is_rsdb_supported = FALSE;
+ bool rsdb_mode = FALSE;
+
+ is_rsdb_supported = DHD_OPMODE_SUPPORTED(cfg->pub, DHD_FLAG_RSDB_MODE);
+
+ if (!is_rsdb_supported) {
+ return 0;
+ }
+
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+ for_each_ndev(cfg, iter, next) {
+ GCC_DIAGNOSTIC_POP();
+ /* p2p discovery iface ndev could be null */
+ if (iter->ndev) {
+ chanspec = 0;
+ band = 0;
+ if (wl_get_drv_status(cfg, CONNECTED, iter->ndev)) {
+ if (wldev_iovar_getint(iter->ndev, "chanspec",
+ (s32 *)&chanspec) == BCME_OK) {
+ chanspec = wl_chspec_driver_to_host(chanspec);
+ band = CHSPEC_BAND(chanspec);
+ }
+
+ if (!pre_band && band) {
+ pre_band = band;
+ } else if (pre_band && (pre_band != band)) {
+ rsdb_mode = TRUE;
+ }
+ }
+ }
+ }
+ WL_DBG(("RSDB mode is %s\n", rsdb_mode ? "enabled" : "disabled"));
+
+ return rsdb_mode;
+}
static s32 wl_notifier_change_state(struct bcm_cfg80211 *cfg, struct net_info *_net_info,
enum wl_status state, bool set)
@@ -12098,11 +18544,13 @@
s32 err = BCME_OK;
u32 mode;
u32 chan = 0;
- struct net_info *iter, *next;
struct net_device *primary_dev = bcmcfg_to_prmry_ndev(cfg);
- dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+ dhd_pub_t *dhd = cfg->pub;
+#ifdef RTT_SUPPORT
+ rtt_status_info_t *rtt_status;
+#endif /* RTT_SUPPORT */
if (dhd->busstate == DHD_BUS_DOWN) {
- WL_ERR(("%s : busstate is DHD_BUS_DOWN!\n", __FUNCTION__));
+ WL_ERR(("busstate is DHD_BUS_DOWN!\n"));
return 0;
}
WL_DBG(("Enter state %d set %d _net_info->pm_restore %d iface %s\n",
@@ -12113,208 +18561,89 @@
mode = wl_get_mode_by_netdev(cfg, _net_info->ndev);
if (set) {
wl_cfg80211_concurrent_roam(cfg, 1);
-
+ wl_cfg80211_determine_vsdb_mode(cfg);
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(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;
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#endif
- for_each_ndev(cfg, iter, next) {
- if (iter->pm_restore || (iter->ndev == NULL))
- continue;
- /* Save the current power mode */
- err = wldev_ioctl(iter->ndev, WLC_GET_PM, &iter->pm,
- sizeof(iter->pm), false);
- WL_DBG(("%s:power save %s\n", iter->ndev->name,
- iter->pm ? "enabled" : "disabled"));
- if (!err && iter->pm) {
- iter->pm_restore = true;
- }
- }
- for_each_ndev(cfg, iter, next) {
- if (iter->ndev) {
- if (!wl_get_drv_status(cfg, CONNECTED, iter->ndev))
- continue;
- 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);
- }
- }
- }
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic pop")
-#endif
- } 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
- */
+ pm = PM_OFF;
+ if ((err = wldev_ioctl_set(_net_info->ndev, WLC_SET_PM, &pm,
+ sizeof(pm))) != 0) {
+ if (err == -ENODEV)
+ WL_DBG(("%s:netdev not ready\n",
+ _net_info->ndev->name));
+ else
+ WL_ERR(("%s:error (%d)\n",
+ _net_info->ndev->name, err));
- /*
- * before calling pm_enable_timer, we need to set PM -1 for all ndev
- */
- pm = PM_OFF;
- if (!_net_info->pm_block) {
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#endif
- for_each_ndev(cfg, iter, next) {
- if (iter->pm_restore || (iter->ndev == NULL))
- continue;
- /* Save the current power mode */
- err = wldev_ioctl(iter->ndev, WLC_GET_PM, &iter->pm,
- sizeof(iter->pm), false);
- WL_DBG(("%s:power save %s\n", iter->ndev->name,
- iter->pm ? "enabled" : "disabled"));
- if (!err && iter->pm) {
- iter->pm_restore = true;
- }
- }
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic pop")
-#endif
- }
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#endif
- for_each_ndev(cfg, iter, next) {
- /* p2p discovery iface ndev ptr could be null */
- if (iter->ndev) {
- if (!wl_get_drv_status(cfg, CONNECTED, iter->ndev))
- continue;
- 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));
- }
- }
- }
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic pop")
-#endif
- if (cfg->pm_enable_work_on) {
- wl_add_remove_pm_enable_work(cfg, FALSE, WL_HANDLER_DEL);
- }
-
- cfg->pm_enable_work_on = true;
-#ifdef BCMSDIO
- /* Temporary WAR: disable PM work till PM is fixed in 43012 */
- if (dhd_get_chipid(dhd) != BCM43012_CHIP_ID)
-#endif
- wl_add_remove_pm_enable_work(cfg, TRUE, WL_HANDLER_NOTUSE);
-
+ wl_cfg80211_update_power_mode(_net_info->ndev);
}
+ wl_add_remove_pm_enable_work(cfg, WL_PM_WORKQ_SHORT);
#if defined(WLTDLS)
-#if defined(DISABLE_TDLS_IN_P2P)
- if (cfg->vsdb_mode || p2p_is_on(cfg))
-#else
- if (cfg->vsdb_mode)
-#endif /* defined(DISABLE_TDLS_IN_P2P) */
- {
-
+ if (wl_cfg80211_is_concurrent_mode(primary_dev)) {
err = wldev_iovar_setint(primary_dev, "tdls_enable", 0);
}
#endif /* defined(WLTDLS) */
- }
- else { /* clear */
+#ifdef DISABLE_FRAMEBURST_VSDB
+ if (!DHD_OPMODE_SUPPORTED(cfg->pub, DHD_FLAG_HOSTAP_MODE) &&
+ wl_cfg80211_is_concurrent_mode(primary_dev) &&
+ !wl_cfg80211_determine_p2p_rsdb_mode(cfg)) {
+ wl_cfg80211_set_frameburst(cfg, FALSE);
+ }
+#endif /* DISABLE_FRAMEBURST_VSDB */
+#ifdef DISABLE_WL_FRAMEBURST_SOFTAP
+ if (DHD_OPMODE_STA_SOFTAP_CONCURR(dhd) &&
+ wl_get_drv_status(cfg, CONNECTED, bcmcfg_to_prmry_ndev(cfg))) {
+ /* Enable frameburst for
+ * STA/SoftAP concurrent mode
+ */
+ wl_cfg80211_set_frameburst(cfg, TRUE);
+ }
+#endif /* DISABLE_WL_FRAMEBURST_SOFTAP */
+ } else { /* clear */
chan = 0;
/* clear chan information when the net device is disconnected */
wl_update_prof(cfg, _net_info->ndev, NULL, &chan, WL_PROF_CHAN);
wl_cfg80211_determine_vsdb_mode(cfg);
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#endif
- for_each_ndev(cfg, iter, next) {
- /* P2P discovery interface ndev ptr could be NULL */
- if (iter->ndev) {
- if (iter->pm_restore && iter->pm) {
- WL_DBG(("%s:restoring power save %s\n", iter->ndev->name,
- (iter->pm ? "enabled" : "disabled")));
- err = wldev_ioctl(iter->ndev,
- WLC_SET_PM, &iter->pm, sizeof(iter->pm), true);
- if (unlikely(err)) {
- if (err == -ENODEV)
- WL_DBG(("%s:netdev not ready\n",
- iter->ndev->name));
- else
- WL_ERR(("%s:error(%d)\n",
- iter->ndev->name, err));
- break;
- }
- iter->pm_restore = 0;
- wl_cfg80211_update_power_mode(iter->ndev);
+ if (primary_dev == _net_info->ndev) {
+ pm = PM_FAST;
+#ifdef RTT_SUPPORT
+ rtt_status = GET_RTTSTATE(dhd);
+ if (rtt_status->status != RTT_ENABLED)
+#endif /* RTT_SUPPORT */
+ if ((err = wldev_ioctl_set(_net_info->ndev, WLC_SET_PM, &pm,
+ sizeof(pm))) != 0) {
+ if (err == -ENODEV)
+ WL_DBG(("%s:netdev not ready\n",
+ _net_info->ndev->name));
+ else
+ WL_ERR(("%s:error (%d)\n",
+ _net_info->ndev->name, err));
+
+ wl_cfg80211_update_power_mode(_net_info->ndev);
}
- }
}
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic pop")
-#endif
wl_cfg80211_concurrent_roam(cfg, 0);
#if defined(WLTDLS)
- if (!cfg->vsdb_mode) {
+ if (!wl_cfg80211_is_concurrent_mode(primary_dev)) {
err = wldev_iovar_setint(primary_dev, "tdls_enable", 1);
}
#endif /* defined(WLTDLS) */
+#if defined(DISABLE_FRAMEBURST_VSDB)
+ if (!DHD_OPMODE_SUPPORTED(cfg->pub, DHD_FLAG_HOSTAP_MODE)) {
+ wl_cfg80211_set_frameburst(cfg, TRUE);
+ }
+#endif /* DISABLE_FRAMEBURST_VSDB */
+#ifdef DISABLE_WL_FRAMEBURST_SOFTAP
+ if (DHD_OPMODE_STA_SOFTAP_CONCURR(dhd) &&
+ (cfg->ap_oper_channel <= CH_MAX_2G_CHANNEL)) {
+ /* Disable frameburst for stand-alone 2GHz SoftAP */
+ wl_cfg80211_set_frameburst(cfg, FALSE);
+ }
+#endif /* DISABLE_WL_FRAMEBURST_SOFTAP */
}
- return err;
-}
-static s32 wl_init_scan(struct bcm_cfg80211 *cfg)
-{
- int err = 0;
-
- 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 */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
- timer_setup(&cfg->scan_timeout, wl_scan_timeout, 0);
-#else
- init_timer(&cfg->scan_timeout);
- cfg->scan_timeout.data = (unsigned long) cfg;
- cfg->scan_timeout.function = wl_scan_timeout;
-#endif
-
return err;
}
@@ -12324,17 +18653,20 @@
int err = 0;
/* Init roam timer */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
- timer_setup(&cfg->roam_timeout, wl_roam_timeout, 0);
-#else
- init_timer(&cfg->roam_timeout);
- cfg->roam_timeout.data = (unsigned long) cfg;
- cfg->roam_timeout.function = wl_roam_timeout;
-#endif
+ init_timer_compat(&cfg->roam_timeout, wl_roam_timeout, cfg);
return err;
}
#endif /* DHD_LOSSLESS_ROAMING */
+
+#if !defined(DISABLE_11H) && defined(DHD_NOSCAN_DURING_CSA)
+static s32 wl_init_csa_timeout(struct bcm_cfg80211 *cfg)
+{
+ /* Init csa timer */
+ init_timer_compat(&cfg->csa_timeout, wl_csa_timeout, cfg);
+ return 0;
+}
+#endif /* !defined(DISABLE_11H) && defined(DHD_NOSCAN_DURING_CSA) */
static s32 wl_init_priv(struct bcm_cfg80211 *cfg)
{
@@ -12344,16 +18676,19 @@
cfg->scan_request = NULL;
cfg->pwr_save = !!(wiphy->flags & WIPHY_FLAG_PS_ON_BY_DEFAULT);
+#ifdef DISABLE_BUILTIN_ROAM
cfg->roam_on = false;
+#else
+ cfg->roam_on = true;
+#endif /* DISABLE_BUILTIN_ROAM */
cfg->active_scan = true;
cfg->rf_blocked = false;
cfg->vsdb_mode = false;
-#if defined(BCMSDIO) || defined(BCMDBUS)
+#if defined(BCMSDIO)
cfg->wlfc_on = false;
-#endif /* defined(BCMSDIO) || defined(BCMDBUS) */
+#endif /* defined(BCMSDIO) */
cfg->roam_flags |= WL_ROAM_OFF_ON_CONCURRENT;
cfg->disable_roam_event = false;
- cfg->cfgdev_bssidx = -1;
/* register interested state */
set_bit(WL_STATUS_CONNECTED, &cfg->interrested_state);
spin_lock_init(&cfg->cfgdrv_lock);
@@ -12370,7 +18705,17 @@
wl_init_event_handler(cfg);
mutex_init(&cfg->usr_sync);
mutex_init(&cfg->event_sync);
- mutex_init(&cfg->scan_complete);
+ mutex_init(&cfg->if_sync);
+ mutex_init(&cfg->scan_sync);
+#ifdef WLTDLS
+ mutex_init(&cfg->tdls_sync);
+#endif /* WLTDLS */
+#ifdef WL_BCNRECV
+ mutex_init(&cfg->bcn_sync);
+#endif /* WL_BCNRECV */
+#ifdef WL_WPS_SYNC
+ wl_init_wps_reauth_sm(cfg);
+#endif /* WL_WPS_SYNC */
err = wl_init_scan(cfg);
if (err)
return err;
@@ -12380,11 +18725,23 @@
return err;
}
#endif /* DHD_LOSSLESS_ROAMING */
+#if !defined(DISABLE_11H) && defined(DHD_NOSCAN_DURING_CSA)
+ err = wl_init_csa_timeout(cfg);
+ if (err) {
+ return err;
+ }
+#endif // endif
wl_init_conf(cfg->conf);
wl_init_prof(cfg, ndev);
wl_link_down(cfg);
DNGL_FUNC(dhd_cfg80211_init, (cfg));
-
+#ifdef WL_NAN
+ cfg->nan_dp_state = NAN_DP_STATE_DISABLED;
+ init_waitqueue_head(&cfg->ndp_if_change_event);
+#endif /* WL_NAN */
+ cfg->pmk_list->pmkids.length = OFFSETOF(pmkid_list_v3_t, pmkid);
+ cfg->pmk_list->pmkids.count = 0;
+ cfg->pmk_list->pmkids.version = PMKID_LIST_VER_3;
return err;
}
@@ -12397,7 +18754,10 @@
del_timer_sync(&cfg->scan_timeout);
#ifdef DHD_LOSSLESS_ROAMING
del_timer_sync(&cfg->roam_timeout);
-#endif
+#endif // endif
+#if !defined(DISABLE_11H) && defined(DHD_NOSCAN_DURING_CSA)
+ del_timer_sync(&cfg->csa_timeout);
+#endif // endif
wl_deinit_priv_mem(cfg);
if (wl_cfg80211_netdev_notifier_registered) {
wl_cfg80211_netdev_notifier_registered = FALSE;
@@ -12405,11 +18765,9 @@
}
}
-#if defined(WL_ENABLE_P2P_IF)
-static s32 wl_cfg80211_attach_p2p(void)
+#if defined(WL_ENABLE_P2P_IF) || defined(WL_NEWCFG_PRIVCMD_SUPPORT)
+static s32 wl_cfg80211_attach_p2p(struct bcm_cfg80211 *cfg)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
-
WL_TRACE(("Enter \n"));
if (wl_cfgp2p_register_ndev(cfg) < 0) {
@@ -12420,37 +18778,43 @@
return 0;
}
-static s32 wl_cfg80211_detach_p2p(void)
+static s32 wl_cfg80211_detach_p2p(struct bcm_cfg80211 *cfg)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+#ifndef WL_NEWCFG_PRIVCMD_SUPPORT
struct wireless_dev *wdev;
+#endif /* WL_NEWCFG_PRIVCMD_SUPPORT */
WL_DBG(("Enter \n"));
if (!cfg) {
WL_ERR(("Invalid Ptr\n"));
return -EINVAL;
- } else
- wdev = cfg->p2p_wdev;
-
- if (!wdev) {
- WL_ERR(("Invalid Ptr\n"));
- return -EINVAL;
}
+#ifndef WL_NEWCFG_PRIVCMD_SUPPORT
+ else {
+ wdev = cfg->p2p_wdev;
+ if (!wdev) {
+ WL_ERR(("Invalid Ptr\n"));
+ return -EINVAL;
+ }
+ }
+#endif /* WL_NEWCFG_PRIVCMD_SUPPORT */
wl_cfgp2p_unregister_ndev(cfg);
cfg->p2p_wdev = NULL;
cfg->p2p_net = NULL;
+#ifndef WL_NEWCFG_PRIVCMD_SUPPORT
WL_DBG(("Freeing 0x%p \n", wdev));
- kfree(wdev);
+ MFREE(cfg->osh, wdev, sizeof(*wdev));
+#endif /* WL_NEWCFG_PRIVCMD_SUPPORT */
return 0;
}
-#endif
+#endif /* WL_ENABLE_P2P_IF || WL_NEWCFG_PRIVCMD_SUPPORT */
-s32 wl_cfg80211_attach_post(struct net_device *ndev)
+static s32 wl_cfg80211_attach_post(struct net_device *ndev)
{
- struct bcm_cfg80211 * cfg = NULL;
+ struct bcm_cfg80211 * cfg;
s32 err = 0;
s32 ret = 0;
WL_TRACE(("In\n"));
@@ -12458,7 +18822,7 @@
WL_ERR(("ndev is invaild\n"));
return -ENODEV;
}
- cfg = g_bcm_cfg;
+ cfg = wl_get_cfg(ndev);
if (unlikely(!cfg)) {
WL_ERR(("cfg is invaild\n"));
return -EINVAL;
@@ -12505,12 +18869,52 @@
return err;
}
+struct bcm_cfg80211 *wl_get_cfg(struct net_device *ndev)
+{
+ struct wireless_dev *wdev = ndev->ieee80211_ptr;
+
+ if (!wdev)
+ return NULL;
+
+ return wiphy_priv(wdev->wiphy);
+}
+
+s32
+wl_cfg80211_net_attach(struct net_device *primary_ndev)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(primary_ndev);
+
+#ifdef WL_STATIC_IF
+ char iname[STATIC_INAME_STRING_LEN];
+ int i = 0;
+#endif /* WL_STATIC_IF */
+ if (!cfg) {
+ WL_ERR(("cfg null\n"));
+ return BCME_ERROR;
+ }
+#ifdef WL_STATIC_IF
+ /* Register dummy n/w iface. FW init will happen only from dev_open */
+ for (i = 0; i < DHD_NUM_STATIC_IFACES; i++) {
+ snprintf(iname, sizeof(iname), WL_STATIC_IFNAME_PREFIX, i+1);
+ if (wl_cfg80211_register_static_if(cfg, NL80211_IFTYPE_STATION,
+ iname, (DHD_MAX_IFS + i)) == NULL) {
+ WL_ERR(("static i/f registration failed!\n"));
+ return BCME_ERROR;
+ }
+ }
+#endif /* WL_STATIC_IF */
+ return BCME_OK;
+}
+
s32 wl_cfg80211_attach(struct net_device *ndev, void *context)
{
struct wireless_dev *wdev;
struct bcm_cfg80211 *cfg;
s32 err = 0;
struct device *dev;
+ u16 bssidx = 0;
+ u16 ifidx = 0;
+ dhd_pub_t *dhd = (struct dhd_pub *)(context);
WL_TRACE(("In\n"));
if (!ndev) {
@@ -12520,27 +18924,33 @@
WL_DBG(("func %p\n", wl_cfg80211_get_parent_dev()));
dev = wl_cfg80211_get_parent_dev();
- wdev = kzalloc(sizeof(*wdev), GFP_KERNEL);
+ wdev = (struct wireless_dev *)MALLOCZ(dhd->osh, sizeof(*wdev));
if (unlikely(!wdev)) {
WL_ERR(("Could not allocate wireless device\n"));
return -ENOMEM;
}
err = wl_setup_wiphy(wdev, dev, context);
if (unlikely(err)) {
- kfree(wdev);
+ MFREE(dhd->osh, wdev, sizeof(*wdev));
return -ENOMEM;
}
wdev->iftype = wl_mode_to_nl80211_iftype(WL_MODE_BSS);
- cfg = (struct bcm_cfg80211 *)wiphy_priv(wdev->wiphy);
+ cfg = wiphy_priv(wdev->wiphy);
cfg->wdev = wdev;
cfg->pub = context;
+ cfg->osh = dhd->osh;
INIT_LIST_HEAD(&cfg->net_list);
+#ifdef WBTEXT
+ INIT_LIST_HEAD(&cfg->wbtext_bssid_list);
+#endif /* WBTEXT */
+ INIT_LIST_HEAD(&cfg->vndr_oui_list);
+ spin_lock_init(&cfg->vndr_oui_sync);
spin_lock_init(&cfg->net_list_sync);
ndev->ieee80211_ptr = wdev;
SET_NETDEV_DEV(ndev, wiphy_dev(wdev->wiphy));
wdev->netdev = ndev;
cfg->state_notifier = wl_notifier_change_state;
- err = wl_alloc_netinfo(cfg, ndev, wdev, WL_MODE_BSS, PM_ENABLE, 0);
+ err = wl_alloc_netinfo(cfg, ndev, wdev, WL_IF_TYPE_STA, PM_ENABLE, bssidx, ifidx);
if (err) {
WL_ERR(("Failed to alloc net_info (%d)\n", err));
goto cfg80211_attach_out;
@@ -12562,7 +18972,7 @@
WL_ERR(("Failed to setup debugfs %d\n", err));
goto cfg80211_attach_out;
}
-#endif
+#endif // endif
if (!wl_cfg80211_netdev_notifier_registered) {
wl_cfg80211_netdev_notifier_registered = TRUE;
err = register_netdevice_notifier(&wl_cfg80211_netdev_notifier);
@@ -12572,23 +18982,38 @@
goto cfg80211_attach_out;
}
}
-#if defined(COEX_DHCP)
+#if defined(OEM_ANDROID) && defined(COEX_DHCP)
cfg->btcoex_info = wl_cfg80211_btcoex_init(cfg->wdev->netdev);
if (!cfg->btcoex_info)
goto cfg80211_attach_out;
-#endif
+#endif /* defined(OEM_ANDROID) && defined(COEX_DHCP) */
+#if defined(SUPPORT_RANDOM_MAC_SCAN)
+ cfg->random_mac_enabled = FALSE;
+#endif /* SUPPORT_RANDOM_MAC_SCAN */
- g_bcm_cfg = cfg;
-
-#ifdef CONFIG_CFG80211_INTERNAL_REGDB
- wdev->wiphy->reg_notifier = wl_cfg80211_reg_notifier;
-#endif /* CONFIG_CFG80211_INTERNAL_REGDB */
-
-#if defined(WL_ENABLE_P2P_IF)
- err = wl_cfg80211_attach_p2p();
+#if defined(WL_ENABLE_P2P_IF) || defined(WL_NEWCFG_PRIVCMD_SUPPORT)
+ err = wl_cfg80211_attach_p2p(cfg);
if (err)
goto cfg80211_attach_out;
-#endif
+#endif /* WL_ENABLE_P2P_IF || WL_NEWCFG_PRIVCMD_SUPPORT */
+
+ INIT_DELAYED_WORK(&cfg->pm_enable_work, wl_cfg80211_work_handler);
+ mutex_init(&cfg->pm_sync);
+#ifdef WL_NAN
+ mutex_init(&cfg->nancfg.nan_sync);
+ init_waitqueue_head(&cfg->nancfg.nan_event_wait);
+#endif /* WL_NAN */
+ cfg->rssi_sum_report = FALSE;
+#ifdef WL_BAM
+ wl_bad_ap_mngr_init(cfg);
+#endif /* WL_BAM */
+#ifdef BIGDATA_SOFTAP
+ wl_attach_ap_stainfo(cfg);
+#endif /* BIGDATA_SOFTAP */
+#ifdef ENABLE_HOGSQS
+ INIT_DELAYED_WORK(&cfg->hogsqs_eventwork,
+ wl_cfg80211_hogsqs_event_handler);
+#endif // endif
return err;
@@ -12598,31 +19023,36 @@
return err;
}
-void wl_cfg80211_detach(void *para)
+void wl_cfg80211_detach(struct bcm_cfg80211 *cfg)
{
- struct bcm_cfg80211 *cfg;
+ WL_DBG(("Enter\n"));
+ if (!cfg) {
+ return;
+ }
+ wl_add_remove_pm_enable_work(cfg, WL_PM_WORKQ_DEL);
- (void)para;
- cfg = g_bcm_cfg;
+#ifdef ENABLE_HOGSQS
+ cancel_delayed_work_sync(&cfg->hogsqs_eventwork);
+#endif // endif
- WL_TRACE(("In\n"));
-
- wl_add_remove_pm_enable_work(cfg, FALSE, WL_HANDLER_DEL);
-
-#if defined(COEX_DHCP)
+#if defined(OEM_ANDROID) && defined(COEX_DHCP)
wl_cfg80211_btcoex_deinit();
cfg->btcoex_info = NULL;
-#endif
+#endif /* defined(OEM_ANDROID) && defined(COEX_DHCP) */
wl_setup_rfkill(cfg, FALSE);
#ifdef DEBUGFS_CFG80211
wl_free_debugfs(cfg);
-#endif
+#endif // endif
if (cfg->p2p_supported) {
if (timer_pending(&cfg->p2p->listen_timer))
del_timer_sync(&cfg->p2p->listen_timer);
wl_cfgp2p_deinit_priv(cfg);
}
+
+#ifdef WL_WPS_SYNC
+ wl_deinit_wps_reauth_sm(cfg);
+#endif /* WL_WPS_SYNC */
if (timer_pending(&cfg->scan_timeout))
del_timer_sync(&cfg->scan_timeout);
@@ -12632,122 +19062,244 @@
}
#endif /* DHD_LOSSLESS_ROAMING */
+#ifdef WL_STATIC_IF
+ wl_cfg80211_unregister_static_if(cfg);
+#endif /* WL_STATIC_IF */
+#if !defined(DISABLE_11H) && defined(DHD_NOSCAN_DURING_CSA)
+ if (timer_pending(&cfg->csa_timeout)) {
+ del_timer_sync(&cfg->csa_timeout);
+ }
+#endif // endif
#if defined(WL_CFG80211_P2P_DEV_IF)
if (cfg->p2p_wdev)
wl_cfgp2p_del_p2p_disc_if(cfg->p2p_wdev, cfg);
#endif /* WL_CFG80211_P2P_DEV_IF */
-#if defined(WL_ENABLE_P2P_IF)
- wl_cfg80211_detach_p2p();
-#endif
-
+#if defined(WL_ENABLE_P2P_IF) || defined(WL_NEWCFG_PRIVCMD_SUPPORT)
+ wl_cfg80211_detach_p2p(cfg);
+#endif /* WL_ENABLE_P2P_IF || WL_NEWCFG_PRIVCMD_SUPPORT */
+#ifdef WL_BAM
+ wl_bad_ap_mngr_deinit(cfg);
+#endif /* WL_BAM */
+#ifdef BIGDATA_SOFTAP
+ wl_detach_ap_stainfo(cfg);
+#endif /* BIGDATA_SOFTAP */
wl_cfg80211_ibss_vsie_free(cfg);
- wl_cfg80211_clear_mgmt_vndr_ies(cfg);
+ wl_dealloc_netinfo_by_wdev(cfg, cfg->wdev);
+ wl_cfg80211_set_bcmcfg(NULL);
wl_deinit_priv(cfg);
- g_bcm_cfg = NULL;
wl_cfg80211_clear_parent_dev();
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 !!!!!!!!!!!
*/
+ WL_DBG(("Exit\n"));
}
-static void wl_wakeup_event(struct bcm_cfg80211 *cfg)
+#if defined(CONFIG_WLAN_BEYONDX) || defined(CONFIG_SEC_5GMODEL)
+void wl_cfg80211_register_dev_ril_bridge_event_notifier()
{
- if (cfg->event_tsk.thr_pid >= 0) {
- DHD_EVENT_WAKE_LOCK(cfg->pub);
- up(&cfg->event_tsk.sema);
+ WL_DBG(("Enter\n"));
+ if (!wl_cfg80211_ril_bridge_notifier_registered) {
+ s32 err = 0;
+ wl_cfg80211_ril_bridge_notifier_registered = TRUE;
+ err = register_dev_ril_bridge_event_notifier(&wl_cfg80211_ril_bridge_notifier);
+ if (err) {
+ wl_cfg80211_ril_bridge_notifier_registered = FALSE;
+ WL_ERR(("Failed to register ril_notifier! %d\n", err));
+ }
}
}
-static s32 wl_event_handler(void *data)
+void wl_cfg80211_unregister_dev_ril_bridge_event_notifier()
+{
+ WL_DBG(("Enter\n"));
+ if (wl_cfg80211_ril_bridge_notifier_registered) {
+ wl_cfg80211_ril_bridge_notifier_registered = FALSE;
+ unregister_dev_ril_bridge_event_notifier(&wl_cfg80211_ril_bridge_notifier);
+ }
+}
+#endif /* CONFIG_WLAN_BEYONDX || defined(CONFIG_SEC_5GMODEL) */
+
+static void wl_print_event_data(struct bcm_cfg80211 *cfg,
+ uint32 event_type, const wl_event_msg_t *e)
+{
+ s32 status = ntoh32(e->status);
+ s32 reason = ntoh32(e->reason);
+ s32 ifidx = ntoh32(e->ifidx);
+ s32 bssidx = ntoh32(e->bsscfgidx);
+
+ switch (event_type) {
+ case WLC_E_ESCAN_RESULT:
+ if ((status == WLC_E_STATUS_SUCCESS) ||
+ (status == WLC_E_STATUS_ABORT)) {
+ WL_INFORM_MEM(("event_type (%d), ifidx: %d"
+ " bssidx: %d scan_type:%d\n",
+ event_type, ifidx, bssidx, status));
+ }
+ break;
+ case WLC_E_LINK:
+ case WLC_E_DISASSOC:
+ case WLC_E_DISASSOC_IND:
+ case WLC_E_DEAUTH:
+ case WLC_E_DEAUTH_IND:
+ WL_INFORM_MEM(("event_type (%d), ifidx: %d bssidx: %d"
+ " status:%d reason:%d\n",
+ event_type, ifidx, bssidx, status, reason));
+ break;
+
+ default:
+ /* Print only when DBG verbose is enabled */
+ WL_DBG(("event_type (%d), ifidx: %d bssidx: %d status:%d reason: %d\n",
+ event_type, ifidx, bssidx, status, reason));
+ }
+}
+
+static void wl_event_handler(struct work_struct *work_data)
{
struct bcm_cfg80211 *cfg = NULL;
struct wl_event_q *e;
- tsk_ctl_t *tsk = (tsk_ctl_t *)data;
struct wireless_dev *wdev = NULL;
- cfg = (struct bcm_cfg80211 *)tsk->parent;
+ WL_DBG(("Enter \n"));
+ BCM_SET_CONTAINER_OF(cfg, work_data, struct bcm_cfg80211, event_work);
+ cfg->wl_evt_hdlr_entry_time = OSL_LOCALTIME_NS();
+ DHD_EVENT_WAKE_LOCK(cfg->pub);
+ while ((e = wl_deq_event(cfg))) {
+ s32 status = ntoh32(e->emsg.status);
+ u32 event_type = ntoh32(e->emsg.event_type);
+ bool scan_cmplt_evt = (event_type == WLC_E_ESCAN_RESULT) &&
+ ((status == WLC_E_STATUS_SUCCESS) || (status == WLC_E_STATUS_ABORT));
- WL_ERR(("tsk Enter, tsk = 0x%p\n", tsk));
+ cfg->wl_evt_deq_time = OSL_LOCALTIME_NS();
+ if (scan_cmplt_evt) {
+ cfg->scan_deq_time = OSL_LOCALTIME_NS();
+ }
+ /* Print only critical events to avoid too many prints */
+ wl_print_event_data(cfg, e->etype, &e->emsg);
- while (down_interruptible (&tsk->sema) == 0) {
- SMP_RD_BARRIER_DEPENDS();
- if (tsk->terminated) {
- DHD_EVENT_WAKE_UNLOCK(cfg->pub);
+ if (e->emsg.ifidx > WL_MAX_IFS) {
+ WL_ERR((" Event ifidx not in range. val:%d \n", e->emsg.ifidx));
+ goto fail;
+ }
+
+ /* Make sure iface operations, don't creat race conditions */
+ mutex_lock(&cfg->if_sync);
+ if (!(wdev = wl_get_wdev_by_fw_idx(cfg,
+ e->emsg.bsscfgidx, e->emsg.ifidx))) {
+ /* For WLC_E_IF would be handled by wl_host_event */
+ if (e->etype != WLC_E_IF)
+ WL_ERR(("No wdev corresponding to bssidx: 0x%x found!"
+ " Ignoring event.\n", e->emsg.bsscfgidx));
+ } else if (e->etype < WLC_E_LAST && cfg->evt_handler[e->etype]) {
+ dhd_pub_t *dhd = (struct dhd_pub *)(cfg->pub);
+ if (dhd->busstate == DHD_BUS_DOWN) {
+ WL_ERR((": BUS is DOWN.\n"));
+ } else
+ {
+ WL_DBG(("event_type %d event_sub %d\n",
+ ntoh32(e->emsg.event_type),
+ ntoh32(e->emsg.reason)));
+ cfg->evt_handler[e->etype](cfg, wdev_to_cfgdev(wdev),
+ &e->emsg, e->edata);
+ if (scan_cmplt_evt) {
+ cfg->scan_hdlr_cmplt_time = OSL_LOCALTIME_NS();
+ }
+ }
+ } else {
+ WL_DBG(("Unknown Event (%d): ignoring\n", e->etype));
+ }
+ mutex_unlock(&cfg->if_sync);
+fail:
+ wl_put_event(cfg, e);
+ if (scan_cmplt_evt) {
+ cfg->scan_cmplt_time = OSL_LOCALTIME_NS();
+ }
+ cfg->wl_evt_hdlr_exit_time = OSL_LOCALTIME_NS();
+ }
+ DHD_EVENT_WAKE_UNLOCK(cfg->pub);
+}
+
+/*
+* Generic API to handle critical events which doesnt need
+* cfg enquening and sleepable API calls.
+*/
+s32
+wl_cfg80211_handle_critical_events(struct bcm_cfg80211 *cfg,
+ const wl_event_msg_t * e)
+{
+ s32 ret = BCME_ERROR;
+ u32 event_type = ntoh32(e->event_type);
+
+ if (event_type >= WLC_E_LAST) {
+ return BCME_ERROR;
+ }
+
+ switch (event_type) {
+ case WLC_E_NAN_CRITICAL: {
+#ifdef WL_NAN
+ if (ntoh32(e->reason) == WL_NAN_EVENT_STOP) {
+ /* Wakeup nan stop event waiting thread */
+ WL_INFORM_MEM((">> Critical Nan Stop Event Received\n"));
+ OSL_SMP_WMB();
+ cfg->nancfg.nan_event_recvd = true;
+ OSL_SMP_WMB();
+ wake_up(&cfg->nancfg.nan_event_wait);
+ ret = BCME_OK;
+ }
+#endif /* WL_NAN */
break;
}
- while ((e = wl_deq_event(cfg))) {
- WL_DBG(("event type (%d), ifidx: %d bssidx: %d \n",
- e->etype, e->emsg.ifidx, e->emsg.bsscfgidx));
-
- if (e->emsg.ifidx > WL_MAX_IFS) {
- WL_ERR((" Event ifidx not in range. val:%d \n", e->emsg.ifidx));
- goto fail;
- }
- if (e->etype == WLC_E_TDLS_PEER_EVENT)
- wdev = wl_get_wdev_by_bssidx(cfg, e->emsg.ifidx);
- else
- wdev = wl_get_wdev_by_bssidx(cfg, e->emsg.bsscfgidx);
-
- if (!wdev) {
- /* For WLC_E_IF would be handled by wl_host_event */
- if (e->etype != WLC_E_IF)
- WL_ERR(("No wdev corresponding to bssidx: 0x%x found!"
- " Ignoring event.\n", e->emsg.bsscfgidx));
- } else if (e->etype < WLC_E_LAST && cfg->evt_handler[e->etype]) {
- dhd_pub_t *dhd = (struct dhd_pub *)(cfg->pub);
- if (dhd->busstate == DHD_BUS_DOWN) {
- WL_ERR((": BUS is DOWN.\n"));
- } else
- cfg->evt_handler[e->etype](cfg, wdev_to_cfgdev(wdev),
- &e->emsg, e->edata);
- } else {
- WL_DBG(("Unknown Event (%d): ignoring\n", e->etype));
- }
-fail:
- wl_put_event(e);
- }
- DHD_EVENT_WAKE_UNLOCK(cfg->pub);
+ default:
+ ret = BCME_ERROR;
}
- WL_ERR(("was terminated\n"));
- complete_and_exit(&tsk->completed, 0);
- return 0;
+ return ret;
}
void
wl_cfg80211_event(struct net_device *ndev, const wl_event_msg_t * e, void *data)
{
+ s32 status = ntoh32(e->status);
u32 event_type = ntoh32(e->event_type);
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
struct net_info *netinfo;
-#if (WL_DBG_LEVEL > 0)
- s8 *estr = (event_type <= sizeof(wl_dbg_estr) / WL_DBG_ESTR_MAX - 1) ?
- wl_dbg_estr[event_type] : (s8 *) "Unknown";
- WL_DBG(("event_type (%d):" "WLC_E_" "%s\n", event_type, estr));
-#endif /* (WL_DBG_LEVEL > 0) */
-
+ WL_TRACE(("event_type (%d): reason (%d): %s\n", event_type, ntoh32(e->reason),
+ bcmevent_get_name(event_type)));
if ((cfg == NULL) || (cfg->p2p_supported && cfg->p2p == NULL)) {
WL_ERR(("Stale event ignored\n"));
return;
}
- 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));
+
+#ifdef OEM_ANDROID
+ if (cfg->event_workq == NULL) {
+ WL_ERR(("Event handler is not created\n"));
+ return;
+ }
+#else
+ if (!cfg->event_workq_init) {
+ WL_ERR(("Event handler is not created\n"));
+ return;
+ }
+#endif /* OEM_ANDROID */
+
+ if (event_type == WLC_E_IF) {
+ /* Don't process WLC_E_IF events in wl_cfg80211 layer */
return;
}
- if (event_type == WLC_E_TDLS_PEER_EVENT)
- netinfo = wl_get_netinfo_by_netdev(cfg, ndev);
- else
- netinfo = wl_get_netinfo_by_bssidx(cfg, e->bsscfgidx);
-
+ netinfo = wl_get_netinfo_by_fw_idx(cfg, e->bsscfgidx, e->ifidx);
if (!netinfo) {
/* Since the netinfo entry is not there, the netdev entry is not
* created via cfg80211 interface. so the event is not of interest
* to the cfg80211 layer.
*/
- WL_ERR(("ignore event %d, not interested\n", event_type));
+ WL_TRACE(("ignore event %d, not interested\n", event_type));
+ return;
+ }
+
+ /* Handle wl_cfg80211_critical_events */
+ if (wl_cfg80211_handle_critical_events(cfg, e) == BCME_OK) {
return;
}
@@ -12758,8 +19310,21 @@
WL_DBG((" PNOEVENT: PNO_NET_LOST\n"));
}
- if (likely(!wl_enq_event(cfg, ndev, event_type, e, data)))
- wl_wakeup_event(cfg);
+ if (likely(!wl_enq_event(cfg, ndev, event_type, e, data))) {
+#ifdef OEM_ANDROID
+ queue_work(cfg->event_workq, &cfg->event_work);
+#else
+ schedule_work(&cfg->event_work);
+#endif /* OEM_ANDROID */
+ }
+ /* Mark timeout value for thread sched */
+ if ((event_type == WLC_E_ESCAN_RESULT) &&
+ ((status == WLC_E_STATUS_SUCCESS) ||
+ (status == WLC_E_STATUS_ABORT))) {
+ cfg->scan_enq_time = OSL_LOCALTIME_NS();
+ WL_INFORM_MEM(("Enqueing escan completion (%d). WQ state:0x%x \n",
+ status, work_busy(&cfg->event_work)));
+ }
}
static void wl_init_eq(struct bcm_cfg80211 *cfg)
@@ -12777,7 +19342,7 @@
while (!list_empty_careful(&cfg->eq_list)) {
BCM_SET_LIST_FIRST_ENTRY(e, &cfg->eq_list, struct wl_event_q, eq_list);
list_del(&e->eq_list);
- kfree(e);
+ MFREE(cfg->osh, e, e->datalen + sizeof(struct wl_event_q));
}
wl_unlock_eq(cfg, flags);
}
@@ -12814,14 +19379,12 @@
uint32 evtq_size;
uint32 data_len;
unsigned long flags;
- gfp_t aflags;
data_len = 0;
if (data)
data_len = ntoh32(msg->datalen);
- evtq_size = sizeof(struct wl_event_q) + data_len;
- aflags = (in_atomic()) ? GFP_ATOMIC : GFP_KERNEL;
- e = kzalloc(evtq_size, aflags);
+ evtq_size = (uint32)(sizeof(struct wl_event_q) + data_len);
+ e = (struct wl_event_q *)MALLOCZ(cfg->osh, evtq_size);
if (unlikely(!e)) {
WL_ERR(("event alloc failed\n"));
return -ENOMEM;
@@ -12830,6 +19393,7 @@
memcpy(&e->emsg, msg, sizeof(wl_event_msg_t));
if (data)
memcpy(e->edata, data, data_len);
+ e->datalen = data_len;
flags = wl_lock_eq(cfg);
list_add_tail(&e->eq_list, &cfg->eq_list);
wl_unlock_eq(cfg, flags);
@@ -12837,50 +19401,47 @@
return err;
}
-static void wl_put_event(struct wl_event_q *e)
+static void wl_put_event(struct bcm_cfg80211 *cfg, struct wl_event_q *e)
{
- kfree(e);
+ MFREE(cfg->osh, e, e->datalen + sizeof(struct wl_event_q));
}
-static s32 wl_config_ifmode(struct bcm_cfg80211 *cfg, struct net_device *ndev, s32 iftype)
+static s32 wl_config_infra(struct bcm_cfg80211 *cfg, struct net_device *ndev, u16 iftype)
{
s32 infra = 0;
s32 err = 0;
- s32 mode = 0;
+ bool skip_infra = false;
+
switch (iftype) {
- case NL80211_IFTYPE_MONITOR:
- case NL80211_IFTYPE_WDS:
- WL_ERR(("type (%d) : currently we do not support this mode\n",
- iftype));
- err = -EINVAL;
- return err;
- case NL80211_IFTYPE_ADHOC:
- mode = WL_MODE_IBSS;
- break;
- case NL80211_IFTYPE_STATION:
- case NL80211_IFTYPE_P2P_CLIENT:
- mode = WL_MODE_BSS;
- infra = 1;
- break;
- case NL80211_IFTYPE_AP:
- case NL80211_IFTYPE_P2P_GO:
- mode = WL_MODE_AP;
- infra = 1;
- break;
- default:
- err = -EINVAL;
- WL_ERR(("invalid type (%d)\n", iftype));
- return err;
- }
- infra = htod32(infra);
- err = wldev_ioctl(ndev, WLC_SET_INFRA, &infra, sizeof(infra), true);
- if (unlikely(err)) {
- WL_ERR(("WLC_SET_INFRA error (%d)\n", err));
- return err;
+ case WL_IF_TYPE_IBSS:
+ case WL_IF_TYPE_AIBSS:
+ infra = 0;
+ break;
+ case WL_IF_TYPE_AP:
+ case WL_IF_TYPE_STA:
+ case WL_IF_TYPE_P2P_GO:
+ case WL_IF_TYPE_P2P_GC:
+ /* Intentional fall through */
+ infra = 1;
+ break;
+ case WL_IF_TYPE_MONITOR:
+ case WL_IF_TYPE_AWDL:
+ case WL_IF_TYPE_NAN:
+ /* Intentionall fall through */
+ default:
+ skip_infra = true;
+ WL_ERR(("Skipping infra setting for type:%d\n", iftype));
+ break;
}
- wl_set_mode_by_netdev(cfg, ndev, mode);
-
+ if (!skip_infra) {
+ infra = htod32(infra);
+ err = wldev_ioctl_set(ndev, WLC_SET_INFRA, &infra, sizeof(infra));
+ if (unlikely(err)) {
+ WL_ERR(("WLC_SET_INFRA error (%d)\n", err));
+ return err;
+ }
+ }
return 0;
}
@@ -12932,7 +19493,7 @@
/* Write updated Event mask */
ret = wldev_iovar_setbuf(ndev, "event_msgs", eventmask, sizeof(eventmask), iovbuf,
- sizeof(iovbuf), NULL);
+ sizeof(iovbuf), NULL);
if (unlikely(ret)) {
WL_ERR(("Set event_msgs error (%d)\n", ret));
}
@@ -12947,9 +19508,13 @@
s8 iovbuf[WL_EVENTING_MASK_LEN + 12];
s8 eventmask[WL_EVENTING_MASK_LEN];
s32 err = 0;
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg;
- if (!ndev || !cfg)
+ if (!ndev)
+ return -ENODEV;
+
+ cfg = wl_get_cfg(ndev);
+ if (!cfg)
return -ENODEV;
mutex_lock(&cfg->event_sync);
@@ -12967,7 +19532,7 @@
clrbit(eventmask, event);
}
err = wldev_iovar_setbuf(ndev, "event_msgs", eventmask, WL_EVENTING_MASK_LEN, iovbuf,
- sizeof(iovbuf), NULL);
+ sizeof(iovbuf), NULL);
if (unlikely(err)) {
WL_ERR(("Set event_msgs error (%d)\n", err));
goto eventmsg_out;
@@ -12978,12 +19543,292 @@
return err;
}
-static int wl_construct_reginfo(struct bcm_cfg80211 *cfg, s32 bw_cap)
+static void wl_get_bwcap(struct bcm_cfg80211 *cfg, u32 bw_cap[])
+{
+ u32 band, mimo_bwcap;
+ int err;
+ struct net_device *dev = bcmcfg_to_prmry_ndev(cfg);
+
+ band = WLC_BAND_2G;
+ err = wldev_iovar_getint(dev, "bw_cap", &band);
+ if (likely(!err)) {
+ bw_cap[NL80211_BAND_2GHZ] = band;
+
+ band = WLC_BAND_5G;
+ err = wldev_iovar_getint(dev, "bw_cap", &band);
+ if (likely(!err)) {
+ bw_cap[NL80211_BAND_5GHZ] = band;
+
+#ifdef WL_6E
+ band = WLC_BAND_6G;
+ err = wldev_iovar_getint(dev, "bw_cap", &band);
+ if (likely(!err)) {
+ bw_cap[NL80211_BAND_6GHZ] = band;
+ return;
+ }
+ WARN_ON(1);
+#else
+ return;
+#endif /* WL_6E */
+ }
+ WARN_ON(1);
+ return;
+ }
+ WARN_ON(1);
+
+ WL_ERR(("fallback to mimo_bw_cap info\n"));
+ mimo_bwcap = 0;
+ err = wldev_iovar_getint(dev, "mimo_bw_cap", &mimo_bwcap);
+ if (unlikely(err))
+ /* assume 20MHz if firmware does not give a clue */
+ mimo_bwcap = WLC_N_BW_20ALL;
+
+ switch (mimo_bwcap) {
+ case WLC_N_BW_40ALL:
+ bw_cap[NL80211_BAND_2GHZ] |= WLC_BW_40MHZ_BIT;
+ /* fall-thru */
+ case WLC_N_BW_20IN2G_40IN5G:
+ bw_cap[NL80211_BAND_5GHZ] |= WLC_BW_40MHZ_BIT;
+ /* fall-thru */
+ case WLC_N_BW_20ALL:
+ bw_cap[NL80211_BAND_2GHZ] |= WLC_BW_20MHZ_BIT;
+ bw_cap[NL80211_BAND_5GHZ] |= WLC_BW_20MHZ_BIT;
+ break;
+ default:
+ WL_ERR(("invalid mimo_bw_cap value\n"));
+ bw_cap[NL80211_BAND_2GHZ] |= WLC_BW_20MHZ_BIT;
+ bw_cap[NL80211_BAND_5GHZ] |= WLC_BW_20MHZ_BIT;
+ }
+}
+
+static void wl_update_ht_cap(struct ieee80211_supported_band *band,
+ u32 bwcap, u32 nchain)
+{
+ band->ht_cap.ht_supported = TRUE;
+ if (bwcap & WLC_BW_40MHZ_BIT) {
+ band->ht_cap.cap |= IEEE80211_HT_CAP_SGI_40;
+ band->ht_cap.cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40;
+ }
+ band->ht_cap.cap |= IEEE80211_HT_CAP_SGI_20;
+ band->ht_cap.cap |= IEEE80211_HT_CAP_DSSSCCK40;
+ band->ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
+ band->ht_cap.ampdu_density = IEEE80211_HT_MPDU_DENSITY_16;
+ band->ht_cap.mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED;
+
+ /* An HT shall support all EQM rates for one spatial stream */
+ memset(band->ht_cap.mcs.rx_mask, 0xff, nchain);
+}
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
+static void wl_update_vht_cap(struct bcm_cfg80211 *cfg, struct ieee80211_supported_band *band,
+ u32 bwcap)
+{
+ struct net_device *dev = bcmcfg_to_prmry_ndev(cfg);
+ s32 err = 0;
+ u32 j = 0;
+ s32 txstreams = 0;
+ s32 rxstreams = 0;
+ s32 ldpc_cap = 0;
+ s32 stbc_rx = 0;
+ s32 stbc_tx = 0;
+ s32 txbf_bfe_cap = 0;
+ s32 txbf_bfr_cap = 0;
+
+ /* not allowed in 2.4G band */
+ if (band->band == IEEE80211_BAND_2GHZ)
+ return;
+
+ if (bwcap == WLC_N_BW_40ALL || bwcap == WLC_N_BW_20IN2G_40IN5G)
+ band->ht_cap.cap |= IEEE80211_HT_CAP_SGI_40;
+
+ band->vht_cap.vht_supported = true;
+
+ err = wldev_iovar_getint(dev, "txstreams", &txstreams);
+ if (unlikely(err)) {
+ WL_ERR(("error reading txstreams (%d)\n", err));
+ }
+
+ err = wldev_iovar_getint(dev, "rxstreams", &rxstreams);
+ if (unlikely(err)) {
+ WL_ERR(("error reading rxstreams (%d)\n", err));
+ }
+
+ err = wldev_iovar_getint(dev, "ldpc_cap", &ldpc_cap);
+ if (unlikely(err)) {
+ WL_ERR(("error reading ldpc_cap (%d)\n", err));
+ }
+
+ err = wldev_iovar_getint(dev, "stbc_rx", &stbc_rx);
+ if (unlikely(err)) {
+ WL_ERR(("error reading stbc_rx (%d)\n", err));
+ }
+
+ err = wldev_iovar_getint(dev, "stbc_tx", &stbc_tx);
+ if (unlikely(err)) {
+ WL_ERR(("error reading stbc_tx (%d)\n", err));
+ }
+
+ err = wldev_iovar_getint(dev, "txbf_bfe_cap", &txbf_bfe_cap);
+ if (unlikely(err)) {
+ WL_ERR(("error reading txbf_bfe_cap (%d)\n", err));
+ }
+
+ err = wldev_iovar_getint(dev, "txbf_bfr_cap", &txbf_bfr_cap);
+ if (unlikely(err)) {
+ WL_ERR(("error reading txbf_bfr_cap (%d)\n", err));
+ }
+
+ /* Supported */
+ band->vht_cap.vht_supported = TRUE;
+
+ for (j = 1; j <= VHT_CAP_MCS_MAP_NSS_MAX; j++) {
+ /* TX stream rates. */
+ if (j <= txstreams) {
+ VHT_MCS_MAP_SET_MCS_PER_SS(j, VHT_CAP_MCS_MAP_0_9,
+ band->vht_cap.vht_mcs.tx_mcs_map);
+ } else {
+ VHT_MCS_MAP_SET_MCS_PER_SS(j, VHT_CAP_MCS_MAP_NONE,
+ band->vht_cap.vht_mcs.tx_mcs_map);
+ }
+
+ /* RX stream rates. */
+ if (j <= rxstreams) {
+ VHT_MCS_MAP_SET_MCS_PER_SS(j, VHT_CAP_MCS_MAP_0_9,
+ band->vht_cap.vht_mcs.rx_mcs_map);
+ } else {
+ VHT_MCS_MAP_SET_MCS_PER_SS(j, VHT_CAP_MCS_MAP_NONE,
+ band->vht_cap.vht_mcs.rx_mcs_map);
+ }
+ }
+
+ /* Capabilities */
+ /* 80 MHz is mandatory */
+ band->vht_cap.cap |=
+ IEEE80211_VHT_CAP_SHORT_GI_80;
+
+ if (WL_BW_CAP_160MHZ(bwcap)) {
+ band->vht_cap.cap |=
+ IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ;
+ band->vht_cap.cap |=
+ IEEE80211_VHT_CAP_SHORT_GI_160;
+ }
+ band->vht_cap.cap |=
+ IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454;
+
+ if (ldpc_cap)
+ band->vht_cap.cap |=
+ IEEE80211_VHT_CAP_RXLDPC;
+
+ if (stbc_tx)
+ band->vht_cap.cap |=
+ IEEE80211_VHT_CAP_TXSTBC;
+
+ if (stbc_rx)
+ band->vht_cap.cap |=
+ (stbc_rx << VHT_CAP_INFO_RX_STBC_SHIFT);
+
+ if (txbf_bfe_cap)
+ band->vht_cap.cap |=
+ IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE;
+
+ if (txbf_bfr_cap) {
+ band->vht_cap.cap |=
+ IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE;
+ }
+
+ if (txbf_bfe_cap || txbf_bfr_cap) {
+ band->vht_cap.cap |=
+ (2 << VHT_CAP_INFO_NUM_BMFMR_ANT_SHIFT);
+ band->vht_cap.cap |=
+ ((txstreams - 1) <<
+ VHT_CAP_INFO_NUM_SOUNDING_DIM_SHIFT);
+ band->vht_cap.cap |=
+ IEEE80211_VHT_CAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB;
+ }
+
+ /* AMPDU length limit, support max 1MB (2 ^ (13 + 7)) */
+ band->vht_cap.cap |=
+ (7 << VHT_CAP_INFO_AMPDU_MAXLEN_EXP_SHIFT);
+
+ WL_DBG(("%s 5GHz band vht_enab=%d vht_cap=%08x "
+ "vht_rx_mcs_map=%04x vht_tx_mcs_map=%04x\n",
+ __FUNCTION__,
+ band->vht_cap.vht_supported,
+ band->vht_cap.cap,
+ band->vht_cap.vht_mcs.rx_mcs_map,
+ band->vht_cap.vht_mcs.tx_mcs_map));
+}
+#endif // endif
+
+/* make up event mask ext message iovar for event larger than 128 */
+s32 wl_add_remove_eventextmsg(struct net_device *ndev, u16 event, bool add)
+{
+ uint8 msglen;
+ eventmsgs_ext_t *eventmask_msg = NULL;
+ char* iov_buf = NULL;
+ s32 err = 0;
+ struct bcm_cfg80211 *cfg = NULL;
+
+ if (!ndev)
+ return -ENODEV;
+
+ cfg = wl_get_cfg(ndev);
+ if (!cfg)
+ return -ENODEV;
+
+ iov_buf = (char*)kmalloc(WLC_IOCTL_SMLEN, GFP_KERNEL);
+ if (iov_buf == NULL) {
+ WL_ERR(("failed to allocate %d bytes for iov_buf\n", WLC_IOCTL_SMLEN));
+ return BCME_NOMEM;
+ }
+
+ msglen = ROUNDUP(WLC_E_LAST, NBBY)/NBBY + EVENTMSGS_EXT_STRUCT_SIZE;
+ eventmask_msg = (eventmsgs_ext_t*)kmalloc(msglen, GFP_KERNEL);
+ if (eventmask_msg == NULL) {
+ WL_ERR(("failed to allocate %d bytes for event_msg_ext\n", msglen));
+ return BCME_NOMEM;
+ }
+ bzero(eventmask_msg, msglen);
+ eventmask_msg->ver = EVENTMSGS_VER;
+ eventmask_msg->len = ROUNDUP(WLC_E_LAST, NBBY)/NBBY;
+
+ /* Setup event_msgs */
+ err = wldev_iovar_getbuf(ndev, "event_msgs_ext", (void *)eventmask_msg,
+ msglen, iov_buf, WLC_IOCTL_SMLEN, NULL);
+ if (err == 0) {
+ bcopy(iov_buf, eventmask_msg, msglen);
+
+ if (add) {
+ setbit(eventmask_msg->mask, event);
+ } else {
+ clrbit(eventmask_msg->mask, event);
+ }
+
+ /* Write updated Event mask */
+ eventmask_msg->ver = EVENTMSGS_VER;
+ eventmask_msg->command = EVENTMSGS_SET_MASK;
+ eventmask_msg->len = ROUNDUP(WLC_E_LAST, NBBY)/NBBY;
+
+ err = wldev_iovar_setbuf(ndev, "event_msgs_ext", (void *)eventmask_msg,
+ msglen, iov_buf, WLC_IOCTL_SMLEN, NULL);
+
+ if (err)
+ WL_ERR(("Get event_msgs error (%d)\n", err));
+ }
+
+ if (eventmask_msg)
+ kfree(eventmask_msg);
+ if (iov_buf)
+ kfree(iov_buf);
+ return err;
+}
+
+static int wl_construct_reginfo(struct bcm_cfg80211 *cfg, u32 bw_cap[])
{
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;
+ u32 i, j, index, n_2g, n_5g, n_6g, band, channel, array_size;
u32 *n_cnt = NULL;
chanspec_t c = 0;
s32 err = BCME_OK;
@@ -12992,9 +19837,8 @@
u8 *pbuf = NULL;
bool dfs_radar_disabled = FALSE;
-#define LOCAL_BUF_LEN 1024
- pbuf = kzalloc(LOCAL_BUF_LEN, GFP_KERNEL);
-
+#define LOCAL_BUF_LEN 2048
+ pbuf = (u8 *)MALLOCZ(cfg->osh, LOCAL_BUF_LEN);
if (pbuf == NULL) {
WL_ERR(("failed to allocate local buf\n"));
return -ENOMEM;
@@ -13004,13 +19848,12 @@
0, pbuf, LOCAL_BUF_LEN, 0, &cfg->ioctl_buf_sync);
if (err != 0) {
WL_ERR(("get chanspecs failed with %d\n", err));
- kfree(pbuf);
+ MFREE(cfg->osh, pbuf, LOCAL_BUF_LEN);
return err;
}
-#undef LOCAL_BUF_LEN
list = (wl_uint32_list_t *)(void *)pbuf;
- band = array_size = n_2g = n_5g = 0;
+ band = array_size = n_2g = n_5g = n_6g = 0;
for (i = 0; i < dtoh32(list->count); i++) {
index = 0;
update = false;
@@ -13029,15 +19872,24 @@
array_size = ARRAYSIZE(__wl_2ghz_channels);
n_cnt = &n_2g;
band = IEEE80211_BAND_2GHZ;
- ht40_allowed = (bw_cap == WLC_N_BW_40ALL)? true : false;
+ ht40_allowed = (bw_cap[band] == WLC_N_BW_40ALL)? true : false;
} else if (CHSPEC_IS5G(c) && channel >= CH_MIN_5G_CHANNEL) {
band_chan_arr = __wl_5ghz_a_channels;
array_size = ARRAYSIZE(__wl_5ghz_a_channels);
n_cnt = &n_5g;
band = IEEE80211_BAND_5GHZ;
- ht40_allowed = (bw_cap == WLC_N_BW_20ALL)? false : true;
+ ht40_allowed = (bw_cap[band] == WLC_N_BW_20ALL)? false : true;
+#ifdef WL_6E
+ } else if (CHSPEC_IS6G(c) && channel >= CH_MIN_6G_CHANNEL &&
+ (channel <= CH_MAX_6G_CHANNEL)) {
+ band_chan_arr = __wl_6ghz_a_channels;
+ array_size = ARRAYSIZE(__wl_6ghz_a_channels);
+ n_cnt = &n_6g;
+ band = IEEE80211_BAND_6GHZ;
+ ht40_allowed = (bw_cap[band] == WLC_N_BW_20ALL)? false : true;
+#endif /* WL_6E */
} else {
- WL_ERR(("Invalid channel Sepc. 0x%x.\n", c));
+ WL_ERR(("Invalid channel Spec. 0x%x.\n", c));
continue;
}
if (!ht40_allowed && CHSPEC_IS40(c))
@@ -13053,13 +19905,13 @@
else
index = *n_cnt;
if (index < array_size) {
-#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 38)
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 38) && !defined(WL_COMPAT_WIRELESS)
band_chan_arr[index].center_freq =
ieee80211_channel_to_frequency(channel);
#else
band_chan_arr[index].center_freq =
ieee80211_channel_to_frequency(channel, band);
-#endif
+#endif // endif
band_chan_arr[index].hw_value = channel;
band_chan_arr[index].beacon_found = false;
@@ -13087,8 +19939,13 @@
if (!dfs_radar_disabled) {
if (band == IEEE80211_BAND_2GHZ)
channel |= WL_CHANSPEC_BAND_2G;
- else
+ else if (band == IEEE80211_BAND_5GHZ)
channel |= WL_CHANSPEC_BAND_5G;
+#ifdef WL_6E
+ else if (band == IEEE80211_BAND_6GHZ)
+ channel |= WL_CHANSPEC_BAND_6G;
+#endif /* WL_6E */
+
channel |= WL_CHANSPEC_BW_20;
channel = wl_chspec_host_to_driver(channel);
err = wldev_iovar_getint(dev, "per_chan_info", &channel);
@@ -13101,7 +19958,7 @@
#else
band_chan_arr[index].flags |=
IEEE80211_CHAN_RADAR;
-#endif
+#endif // endif
}
if (channel & WL_CHAN_PASSIVE)
@@ -13111,7 +19968,7 @@
#else
band_chan_arr[index].flags |=
IEEE80211_CHAN_NO_IR;
-#endif
+#endif // endif
} else if (err == BCME_UNSUPPORTED) {
dfs_radar_disabled = TRUE;
WL_ERR(("does not support per_chan_info\n"));
@@ -13125,59 +19982,56 @@
}
__wl_band_2ghz.n_channels = n_2g;
__wl_band_5ghz_a.n_channels = n_5g;
- kfree(pbuf);
+#ifdef WL_6E
+ __wl_band_6ghz.n_channels = n_6g;
+#endif /* WL_6E */
+ MFREE(cfg->osh, pbuf, LOCAL_BUF_LEN);
+#undef LOCAL_BUF_LEN
+
return err;
}
-s32 wl_update_wiphybands(struct bcm_cfg80211 *cfg, bool notify)
+static s32 __wl_update_wiphybands(struct bcm_cfg80211 *cfg, bool notify)
{
struct wiphy *wiphy;
- struct net_device *dev;
+ struct net_device *dev = bcmcfg_to_prmry_ndev(cfg);
+#ifdef WL_6E
+ u32 bandlist[4];
+#else
u32 bandlist[3];
+#endif /* WL_6E */
u32 nband = 0;
u32 i = 0;
s32 err = 0;
s32 index = 0;
s32 nmode = 0;
+ u32 rxchain;
+ u32 nchain;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- u32 j = 0;
s32 vhtmode = 0;
- s32 txstreams = 0;
- s32 rxstreams = 0;
- s32 ldpc_cap = 0;
- s32 stbc_rx = 0;
- s32 stbc_tx = 0;
- s32 txbf_bfe_cap = 0;
- s32 txbf_bfr_cap = 0;
-#endif
- bool rollback_lock = false;
- s32 bw_cap = 0;
+#endif // endif
+#ifdef WL_SAE
+ dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+#endif /* WL_SAE */
+ u32 bw_cap[4] = { WLC_BW_20MHZ_BIT, /* 2GHz */
+ WLC_BW_20MHZ_BIT, /* 5GHz */
+ 0, /* 60GHz */
+ WLC_BW_20MHZ_BIT }; /* 6GHz */
s32 cur_band = -1;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0))
- struct ieee80211_supported_band *bands[NUM_NL80211_BANDS] = {NULL, };
-#else
struct ieee80211_supported_band *bands[IEEE80211_NUM_BANDS] = {NULL, };
-#endif
- if (cfg == NULL) {
- cfg = g_bcm_cfg;
- mutex_lock(&cfg->usr_sync);
- rollback_lock = true;
- }
- dev = bcmcfg_to_prmry_ndev(cfg);
-
- memset(bandlist, 0, sizeof(bandlist));
- err = wldev_ioctl(dev, WLC_GET_BANDLIST, bandlist,
- sizeof(bandlist), false);
+ bzero(bandlist, sizeof(bandlist));
+ err = wldev_ioctl_get(dev, WLC_GET_BANDLIST, bandlist,
+ sizeof(bandlist));
if (unlikely(err)) {
WL_ERR(("error read bandlist (%d)\n", err));
- goto end_bands;
+ return err;
}
- err = wldev_ioctl(dev, WLC_GET_BAND, &cur_band,
- sizeof(s32), false);
+ err = wldev_ioctl_get(dev, WLC_GET_BAND, &cur_band,
+ sizeof(s32));
if (unlikely(err)) {
WL_ERR(("error (%d)\n", err));
- goto end_bands;
+ return err;
}
err = wldev_iovar_getint(dev, "nmode", &nmode);
@@ -13190,184 +20044,101 @@
if (unlikely(err)) {
WL_ERR(("error reading vhtmode (%d)\n", err));
}
-
- if (vhtmode) {
- err = wldev_iovar_getint(dev, "txstreams", &txstreams);
- if (unlikely(err)) {
- WL_ERR(("error reading txstreams (%d)\n", err));
- }
-
- err = wldev_iovar_getint(dev, "rxstreams", &rxstreams);
- if (unlikely(err)) {
- WL_ERR(("error reading rxstreams (%d)\n", err));
- }
-
- err = wldev_iovar_getint(dev, "ldpc_cap", &ldpc_cap);
- if (unlikely(err)) {
- WL_ERR(("error reading ldpc_cap (%d)\n", err));
- }
-
- err = wldev_iovar_getint(dev, "stbc_rx", &stbc_rx);
- if (unlikely(err)) {
- WL_ERR(("error reading stbc_rx (%d)\n", err));
- }
-
- err = wldev_iovar_getint(dev, "stbc_tx", &stbc_tx);
- if (unlikely(err)) {
- WL_ERR(("error reading stbc_tx (%d)\n", err));
- }
-
- err = wldev_iovar_getint(dev, "txbf_bfe_cap", &txbf_bfe_cap);
- if (unlikely(err)) {
- WL_ERR(("error reading txbf_bfe_cap (%d)\n", err));
- }
-
- err = wldev_iovar_getint(dev, "txbf_bfr_cap", &txbf_bfr_cap);
- if (unlikely(err)) {
- WL_ERR(("error reading txbf_bfr_cap (%d)\n", err));
- }
- }
-#endif
+#endif // endif
/* For nmode and vhtmode check bw cap */
if (nmode ||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- vhtmode ||
-#endif
- 0) {
- err = wldev_iovar_getint(dev, "mimo_bw_cap", &bw_cap);
- if (unlikely(err)) {
- WL_ERR(("error get mimo_bw_cap (%d)\n", err));
- }
+ vhtmode ||
+#endif // endif
+ 0) {
+ wl_get_bwcap(cfg, bw_cap);
}
+
+ err = wldev_iovar_getint(dev, "rxchain", &rxchain);
+ if (err) {
+ WL_ERR(("rxchain error (%d)\n", err));
+ nchain = 1;
+ } else {
+ for (nchain = 0; rxchain; nchain++)
+ rxchain = rxchain & (rxchain - 1);
+ }
+ WL_DBG(("nchain=%d\n", nchain));
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;
+ return err;
}
+#ifdef WL11AX
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 21))
+ err = wldev_iovar_getint(dev, "he", &he);
+ if (unlikely(err)) {
+ WL_ERR(("error reading he (%d)\n", err));
+ }
+#endif // endif
+#endif // endif
+
wiphy = bcmcfg_to_wiphy(cfg);
nband = bandlist[0];
for (i = 1; i <= nband && i < ARRAYSIZE(bandlist); i++) {
index = -1;
if (bandlist[i] == WLC_BAND_5G && __wl_band_5ghz_a.n_channels > 0) {
- bands[IEEE80211_BAND_5GHZ] =
- &__wl_band_5ghz_a;
index = IEEE80211_BAND_5GHZ;
- if (nmode && (bw_cap == WLC_N_BW_40ALL || bw_cap == WLC_N_BW_20IN2G_40IN5G))
- bands[index]->ht_cap.cap |= IEEE80211_HT_CAP_SGI_40;
-
+ bands[index] = &__wl_band_5ghz_a;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
- /* VHT capabilities. */
if (vhtmode) {
- /* Supported */
- bands[index]->vht_cap.vht_supported = TRUE;
-
- for (j = 1; j <= VHT_CAP_MCS_MAP_NSS_MAX; j++) {
- /* TX stream rates. */
- if (j <= txstreams) {
- VHT_MCS_MAP_SET_MCS_PER_SS(j, VHT_CAP_MCS_MAP_0_9,
- bands[index]->vht_cap.vht_mcs.tx_mcs_map);
- } else {
- VHT_MCS_MAP_SET_MCS_PER_SS(j, VHT_CAP_MCS_MAP_NONE,
- bands[index]->vht_cap.vht_mcs.tx_mcs_map);
- }
-
- /* RX stream rates. */
- if (j <= rxstreams) {
- VHT_MCS_MAP_SET_MCS_PER_SS(j, VHT_CAP_MCS_MAP_0_9,
- bands[index]->vht_cap.vht_mcs.rx_mcs_map);
- } else {
- VHT_MCS_MAP_SET_MCS_PER_SS(j, VHT_CAP_MCS_MAP_NONE,
- bands[index]->vht_cap.vht_mcs.rx_mcs_map);
- }
- }
-
-
- /* Capabilities */
- /* 80 MHz is mandatory */
- bands[index]->vht_cap.cap |=
- IEEE80211_VHT_CAP_SHORT_GI_80;
-
- if (WL_BW_CAP_160MHZ(bw_cap)) {
- bands[index]->vht_cap.cap |=
- IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ;
- bands[index]->vht_cap.cap |=
- IEEE80211_VHT_CAP_SHORT_GI_160;
- }
-
- bands[index]->vht_cap.cap |=
- IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454;
-
- if (ldpc_cap)
- bands[index]->vht_cap.cap |=
- IEEE80211_VHT_CAP_RXLDPC;
-
- if (stbc_tx)
- bands[index]->vht_cap.cap |=
- IEEE80211_VHT_CAP_TXSTBC;
-
- if (stbc_rx)
- bands[index]->vht_cap.cap |=
- (stbc_rx << VHT_CAP_INFO_RX_STBC_SHIFT);
-
- if (txbf_bfe_cap)
- bands[index]->vht_cap.cap |=
- IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE;
-
- if (txbf_bfr_cap) {
- bands[index]->vht_cap.cap |=
- IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE;
- }
-
- if (txbf_bfe_cap || txbf_bfr_cap) {
- bands[index]->vht_cap.cap |=
- (2 << VHT_CAP_INFO_NUM_BMFMR_ANT_SHIFT);
- bands[index]->vht_cap.cap |=
- ((txstreams - 1) <<
- VHT_CAP_INFO_NUM_SOUNDING_DIM_SHIFT);
- bands[index]->vht_cap.cap |=
- IEEE80211_VHT_CAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB;
- }
-
- /* AMPDU length limit, support max 1MB (2 ^ (13 + 7)) */
- bands[index]->vht_cap.cap |=
- (7 << VHT_CAP_INFO_AMPDU_MAXLEN_EXP_SHIFT);
- WL_INFORM(("%s band[%d] vht_enab=%d vht_cap=%08x "
- "vht_rx_mcs_map=%04x vht_tx_mcs_map=%04x\n",
- __FUNCTION__, index,
- bands[index]->vht_cap.vht_supported,
- bands[index]->vht_cap.cap,
- bands[index]->vht_cap.vht_mcs.rx_mcs_map,
- bands[index]->vht_cap.vht_mcs.tx_mcs_map));
+ wl_update_vht_cap(cfg, bands[index], bw_cap[index]);
}
-#endif
+#endif // endif
+#ifdef WL11AX
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 21))
+ if(he) {
+ bands[index]->n_iftype_data = wl_update_he_cap(cfg, &sdata[index], NL80211_BAND_5GHZ);
+ bands[index]->iftype_data = &sdata[index];
+ }
+#endif // endif
+#endif // endif
}
else if (bandlist[i] == WLC_BAND_2G && __wl_band_2ghz.n_channels > 0) {
- bands[IEEE80211_BAND_2GHZ] =
- &__wl_band_2ghz;
index = IEEE80211_BAND_2GHZ;
- if (bw_cap == WLC_N_BW_40ALL)
- bands[index]->ht_cap.cap |= IEEE80211_HT_CAP_SGI_40;
+ bands[index] = &__wl_band_2ghz;
+#ifdef WL11AX
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 21))
+ if(he) {
+ bands[index]->n_iftype_data = wl_update_he_cap(cfg, &sdata[index], NL80211_BAND_2GHZ);
+ bands[index]->iftype_data = &sdata[index];
+ }
+#endif // endif
+#endif // endif
}
+#ifdef WL_6E
+ else if (bandlist[i] == WLC_BAND_6G && __wl_band_6ghz.n_channels > 0) {
+ index = IEEE80211_BAND_6GHZ;
+ bands[index] = &__wl_band_6ghz;
+#ifdef WL11AX
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 21))
+ if(he) {
+ bands[index]->n_iftype_data = wl_update_he_cap(cfg, &sdata[index], NL80211_BAND_6GHZ);
+ bands[index]->iftype_data = &sdata[index];
+ }
+#endif // endif
+#endif // endif
+ }
+#endif /* WL_6E */
if ((index >= 0) && nmode) {
- bands[index]->ht_cap.cap |=
- (IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_DSSSCCK40);
- bands[index]->ht_cap.ht_supported = TRUE;
- bands[index]->ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K;
- bands[index]->ht_cap.ampdu_density = IEEE80211_HT_MPDU_DENSITY_16;
- /* An HT shall support all EQM rates for one spatial stream */
- bands[index]->ht_cap.mcs.rx_mask[0] = 0xff;
+ wl_update_ht_cap(bands[index], bw_cap[index], nchain);
}
-
}
wiphy->bands[IEEE80211_BAND_2GHZ] = bands[IEEE80211_BAND_2GHZ];
wiphy->bands[IEEE80211_BAND_5GHZ] = bands[IEEE80211_BAND_5GHZ];
+#ifdef WL_6E
+ wiphy->bands[IEEE80211_BAND_6GHZ] = bands[IEEE80211_BAND_6GHZ];
+#endif /* WL_6E */
/* check if any bands populated otherwise makes 2Ghz as default */
if (wiphy->bands[IEEE80211_BAND_2GHZ] == NULL &&
@@ -13378,34 +20149,77 @@
if (notify)
wiphy_apply_custom_regulatory(wiphy, &brcm_regdom);
+#ifdef WL_SAE
+ (void)wl_wiphy_update_sae(wiphy, dhd);
+#endif /* WL_SAE */
- end_bands:
- if (rollback_lock)
- mutex_unlock(&cfg->usr_sync);
+ return 0;
+}
+
+s32 wl_update_wiphybands(struct bcm_cfg80211 *cfg, bool notify)
+{
+ s32 err;
+
+ mutex_lock(&cfg->usr_sync);
+ err = __wl_update_wiphybands(cfg, notify);
+ mutex_unlock(&cfg->usr_sync);
+
return err;
}
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_info *netinfo = NULL;
struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg);
struct wireless_dev *wdev = ndev->ieee80211_ptr;
+#ifdef WBTEXT
+ dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+#endif /* WBTEXT */
+#ifdef WLTDLS
+ u32 tdls;
+#endif /* WLTDLS */
+ u16 wl_iftype = 0;
+ u16 wl_mode = 0;
+ u8 ioctl_buf[WLC_IOCTL_SMLEN];
WL_DBG(("In\n"));
+
+ /* Reserve 0x8000 toggle bit for P2P GO/GC */
+ cfg->vif_macaddr_mask = 0x8000;
err = dhd_config_dongle(cfg);
if (unlikely(err))
return err;
- err = wl_config_ifmode(cfg, ndev, wdev->iftype);
+ /* Always bring up interface in STA mode.
+ * Did observe , if previous SofAP Bringup/cleanup
+ * is not done properly, iftype is stuck with AP mode.
+ * So during next wlan0 up, forcing the type to STA
+ */
+ netinfo = wl_get_netinfo_by_wdev(cfg, wdev);
+ if (!netinfo) {
+ WL_ERR(("there is no netinfo\n"));
+ return -ENODEV;
+ }
+ ndev->ieee80211_ptr->iftype = NL80211_IFTYPE_STATION;
+ netinfo->iftype = WL_IF_TYPE_STA;
+
+ if (cfg80211_to_wl_iftype(wdev->iftype, &wl_iftype, &wl_mode) < 0) {
+ return -EINVAL;
+ }
+ err = wl_config_infra(cfg, ndev, wl_iftype);
if (unlikely(err && err != -EINPROGRESS)) {
- WL_ERR(("wl_config_ifmode failed\n"));
+ WL_ERR(("wl_config_infra failed\n"));
if (err == -1) {
WL_ERR(("return error %d\n", err));
return err;
}
}
- err = wl_update_wiphybands(cfg, true);
+ err = __wl_update_wiphybands(cfg, true);
if (unlikely(err)) {
WL_ERR(("wl_update_wiphybands failed\n"));
if (err == -1) {
@@ -13413,18 +20227,39 @@
return err;
}
}
-
- err = wl_create_event_handler(cfg);
- if (err) {
- WL_ERR(("wl_create_event_handler failed\n"));
- return err;
+ if (!dhd_download_fw_on_driverload) {
+ err = wl_create_event_handler(cfg);
+ if (err) {
+ WL_ERR(("wl_create_event_handler failed\n"));
+ return err;
+ }
+ wl_init_event_handler(cfg);
}
- wl_init_event_handler(cfg);
-
err = wl_init_scan(cfg);
if (err) {
WL_ERR(("wl_init_scan failed\n"));
return err;
+ }
+ err = wldev_iovar_getbuf(ndev, "wlc_ver", NULL, 0,
+ &cfg->wlc_ver, sizeof(wl_wlc_version_t), NULL);
+ if (likely(!err)) {
+ WL_INFORM(("wl version. Major: %d\n",
+ cfg->wlc_ver.wlc_ver_major));
+ if ((cfg->wlc_ver.wlc_ver_major >= MIN_ESCAN_PARAM_V2_FW_MAJOR) &&
+ (wldev_iovar_getbuf(ndev, "scan_ver", NULL, 0,
+ ioctl_buf, sizeof(ioctl_buf), NULL) == BCME_OK)) {
+ WL_INFORM_MEM(("scan_params v2\n"));
+ /* use scan_params ver2 */
+ cfg->scan_params_v2 = true;
+ }
+ } else {
+ if (err == BCME_UNSUPPORTED) {
+ /* Ignore on unsupported chips */
+ err = BCME_OK;
+ } else {
+ WL_ERR(("wlc_ver query failed. err: %d\n", err));
+ return err;
+ }
}
#ifdef DHD_LOSSLESS_ROAMING
if (timer_pending(&cfg->roam_timeout)) {
@@ -13432,7 +20267,61 @@
}
#endif /* DHD_LOSSLESS_ROAMING */
+#ifdef DHD_MONITOR_INTERFACE
err = dhd_monitor_init(cfg->pub);
+#endif /* DHD_MONITOR_INTERFACE */
+
+#ifdef WL_HOST_BAND_MGMT
+ /* By default the curr_band is initialized to BAND_AUTO */
+ if ((ret = wl_cfg80211_set_band(ndev, WLC_BAND_AUTO)) < 0) {
+ if (ret == BCME_UNSUPPORTED) {
+ /* Don't fail the initialization, lets just
+ * fall back to the original method
+ */
+ WL_ERR(("WL_HOST_BAND_MGMT defined, "
+ "but roam_band iovar not supported \n"));
+ } else {
+ WL_ERR(("roam_band failed. ret=%d", ret));
+ err = -1;
+ }
+ }
+#endif /* WL_HOST_BAND_MGMT */
+#if defined(WES_SUPPORT)
+ /* Reset WES mode to 0 */
+ wes_mode = 0;
+#endif // endif
+#ifdef WBTEXT
+ /* when wifi up, set roam_prof to default value */
+ if (dhd->wbtext_support) {
+ if (dhd->op_mode & DHD_FLAG_STA_MODE) {
+ wl_cfg80211_wbtext_set_default(ndev);
+ wl_cfg80211_wbtext_clear_bssid_list(cfg);
+ }
+ }
+#endif /* WBTEXT */
+#ifdef WLTDLS
+ if (wldev_iovar_getint(ndev, "tdls_enable", &tdls) == 0) {
+ WL_DBG(("TDLS supported in fw\n"));
+ cfg->tdls_supported = true;
+ }
+#endif /* WLTDLS */
+#ifdef WL_IFACE_MGMT
+#ifdef CUSTOM_IF_MGMT_POLICY
+ cfg->iface_data.policy = CUSTOM_IF_MGMT_POLICY;
+#else
+ cfg->iface_data.policy = WL_IF_POLICY_DEFAULT;
+#endif /* CUSTOM_IF_MGMT_POLICY */
+#endif /* WL_IFACE_MGMT */
+#ifdef WL_NAN
+#ifdef WL_NANP2P
+ if (FW_SUPPORTED(dhd, nanp2p)) {
+ /* Enable NANP2P concurrent support */
+ cfg->conc_disc = WL_NANP2P_CONC_SUPPORT;
+ WL_INFORM_MEM(("nan + p2p conc discovery is supported\n"));
+ cfg->nan_p2p_supported = true;
+ }
+#endif /* WL_NANP2P */
+#endif /* WL_NAN */
INIT_DELAYED_WORK(&cfg->pm_enable_work, wl_cfg80211_work_handler);
wl_set_drv_status(cfg, READY, ndev);
@@ -13442,29 +20331,36 @@
static s32 __wl_cfg80211_down(struct bcm_cfg80211 *cfg)
{
s32 err = 0;
- unsigned long flags;
struct net_info *iter, *next;
struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg);
-#if defined(WL_CFG80211) && defined(WL_ENABLE_P2P_IF)
+#if defined(WL_CFG80211) && (defined(WL_ENABLE_P2P_IF) || \
+ defined(WL_NEWCFG_PRIVCMD_SUPPORT)) && !defined(PLATFORM_SLP)
struct net_device *p2p_net = cfg->p2p_net;
-#endif
-#ifdef PROP_TXSTATUS_VSDB
-#if defined(BCMSDIO) || defined(BCMDBUS)
+#endif /* WL_CFG80211 && (WL_ENABLE_P2P_IF || WL_NEWCFG_PRIVCMD_SUPPORT) && !PLATFORM_SLP */
dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
-#endif /* defined(BCMSDIO) || defined(BCMDBUS) */
-#endif /* PROP_TXSTATUS_VSDB */
- WL_DBG(("In\n"));
- /* Delete pm_enable_work */
- wl_add_remove_pm_enable_work(cfg, FALSE, WL_HANDLER_DEL);
+ WL_INFORM_MEM(("cfg80211 down\n"));
-#ifdef WL_NAN
- wl_cfgnan_stop_handler(ndev, g_bcm_cfg, NULL, 0, NULL);
-#endif /* WL_NAN */
+ /* Check if cfg80211 interface is already down */
+ if (!wl_get_drv_status(cfg, READY, ndev)) {
+ WL_DBG(("cfg80211 interface is already down\n"));
+ return err; /* it is even not ready */
+ }
+
+#ifdef SHOW_LOGTRACE
+ /* Stop the event logging */
+ wl_add_remove_eventmsg(ndev, WLC_E_TRACE, FALSE);
+#endif /* SHOW_LOGTRACE */
+
+ /* clear vendor OUI list */
+ wl_vndr_ies_clear_vendor_oui_list(cfg);
+
+ /* Delete pm_enable_work */
+ wl_add_remove_pm_enable_work(cfg, WL_PM_WORKQ_DEL);
if (cfg->p2p_supported) {
wl_clr_p2p_status(cfg, GO_NEG_PHASE);
#ifdef PROP_TXSTATUS_VSDB
-#if defined(BCMSDIO) || defined(BCMDBUS)
+#if defined(BCMSDIO)
if (wl_cfgp2p_vif_created(cfg)) {
bool enabled = false;
dhd_wlfc_get_enable(dhd, &enabled);
@@ -13474,63 +20370,88 @@
cfg->wlfc_on = false;
}
}
-#endif /* defined(BCMSDIO) || defined(BCMDBUS) */
+#endif /* defined(BCMSDIO) */
#endif /* PROP_TXSTATUS_VSDB */
}
- /* Check if cfg80211 interface is already down */
- if (!wl_get_drv_status(cfg, READY, ndev)) {
- WL_DBG(("cfg80211 interface is already down"));
- return err; /* it is even not ready */
+#ifdef WL_NAN
+ mutex_lock(&cfg->if_sync);
+ wl_cfgnan_disable(cfg, NAN_BUS_IS_DOWN);
+ mutex_unlock(&cfg->if_sync);
+#endif /* WL_NAN */
+
+ if (!dhd_download_fw_on_driverload) {
+ /* For built-in drivers/other drivers that do reset on
+ * "ifconfig <primary_iface> down", cleanup any left
+ * over interfaces
+ */
+ wl_cfg80211_cleanup_virtual_ifaces(cfg, false);
+ }
+ /* Clear used mac addr mask */
+ cfg->vif_macaddr_mask = 0;
+
+ if (dhd->up)
+ {
+ /* If primary BSS is operational (for e.g SoftAP), bring it down */
+ if (wl_cfg80211_bss_isup(ndev, 0)) {
+ if (wl_cfg80211_bss_up(cfg, ndev, 0, 0) < 0)
+ WL_ERR(("BSS down failed \n"));
+ }
+
+ /* clear all the security setting on primary Interface */
+ wl_cfg80211_clear_security(cfg);
}
-
- /* If primary BSS is operational (for e.g SoftAP), bring it down */
- if (wl_cfgp2p_bss_isup(ndev, 0)) {
- if (wl_cfgp2p_bss(cfg, ndev, 0, 0) < 0)
- WL_ERR(("BSS down failed \n"));
- }
-
- /* clear all the security setting on primary Interface */
- wl_cfg80211_clear_security(cfg);
-
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#endif
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
for_each_ndev(cfg, iter, next) {
+ GCC_DIAGNOSTIC_POP();
if (iter->ndev) /* p2p discovery iface is null */
wl_set_drv_status(cfg, SCAN_ABORTING, iter->ndev);
}
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic pop")
-#endif
- spin_lock_irqsave(&cfg->cfgdrv_lock, flags);
- if (cfg->scan_request) {
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 8, 0))
- struct cfg80211_scan_info info = { .aborted = true };
- cfg80211_scan_done(cfg->scan_request, &info);
-#else
- cfg80211_scan_done(cfg->scan_request, true);
-#endif
- cfg->scan_request = NULL;
- }
- spin_unlock_irqrestore(&cfg->cfgdrv_lock, flags);
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#endif
+#ifdef P2P_LISTEN_OFFLOADING
+ wl_cfg80211_p2plo_deinit(cfg);
+#endif /* P2P_LISTEN_OFFLOADING */
+
+ /* cancel and notify scan complete, if scan request is pending */
+ wl_cfg80211_cancel_scan(cfg);
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
for_each_ndev(cfg, iter, next) {
+ GCC_DIAGNOSTIC_POP();
/* p2p discovery iface ndev ptr could be null */
if (iter->ndev == NULL)
continue;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0))
- if (wl_get_drv_status(cfg, CONNECTED, iter->ndev)) {
+ WL_INFORM_MEM(("wl_cfg80211_down. connection state bit status: [%u:%u:%u:%u]"
+ " for %s\n",
+ wl_get_drv_status(cfg, CONNECTING, iter->ndev),
+ wl_get_drv_status(cfg, CONNECTED, iter->ndev),
+ wl_get_drv_status(cfg, DISCONNECTING, iter->ndev),
+ wl_get_drv_status(cfg, NESTED_CONNECT, iter->ndev),
+ iter->ndev->name));
+
+ if ((iter->ndev->ieee80211_ptr->iftype == NL80211_IFTYPE_STATION ||
+ iter->ndev->ieee80211_ptr->iftype == NL80211_IFTYPE_P2P_CLIENT) &&
+ wl_get_drv_status(cfg, CONNECTED, iter->ndev)) {
+
CFG80211_DISCONNECTED(iter->ndev, 0, NULL, 0, false, GFP_KERNEL);
+ }
+
+ if ((iter->ndev->ieee80211_ptr->iftype == NL80211_IFTYPE_STATION) &&
+ wl_get_drv_status(cfg, CONNECTING, iter->ndev)) {
+
+ u8 *latest_bssid = wl_read_prof(cfg, ndev, WL_PROF_LATEST_BSSID);
+ struct wiphy *wiphy = bcmcfg_to_wiphy(cfg);
+ struct wireless_dev *wdev = ndev->ieee80211_ptr;
+ struct cfg80211_bss *bss = CFG80211_GET_BSS(wiphy, NULL, latest_bssid,
+ wdev->ssid, wdev->ssid_len);
+
+ BCM_REFERENCE(bss);
+
+ CFG80211_CONNECT_RESULT(ndev,
+ latest_bssid, bss, NULL, 0, NULL, 0,
+ WLAN_STATUS_UNSPECIFIED_FAILURE,
+ GFP_KERNEL);
}
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) */
wl_clr_drv_status(cfg, READY, iter->ndev);
@@ -13541,22 +20462,27 @@
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_clr_drv_status(cfg, NESTED_CONNECT, iter->ndev);
+ wl_clr_drv_status(cfg, CFG80211_CONNECT, iter->ndev);
}
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic pop")
-#endif
bcmcfg_to_prmry_ndev(cfg)->ieee80211_ptr->iftype =
NL80211_IFTYPE_STATION;
-#if defined(WL_CFG80211) && defined(WL_ENABLE_P2P_IF)
+#if defined(WL_CFG80211) && (defined(WL_ENABLE_P2P_IF) || \
+ defined(WL_NEWCFG_PRIVCMD_SUPPORT)) && !defined(PLATFORM_SLP)
+#ifdef SUPPORT_DEEP_SLEEP
+ if (!trigger_deep_sleep)
+#endif /* SUPPORT_DEEP_SLEEP */
if (p2p_net)
dev_close(p2p_net);
-#endif
+#endif /* WL_CFG80211 && (WL_ENABLE_P2P_IF || WL_NEWCFG_PRIVCMD_SUPPORT)&& !PLATFORM_SLP */
/* Avoid deadlock from wl_cfg80211_down */
- mutex_unlock(&cfg->usr_sync);
- wl_destroy_event_handler(cfg);
- mutex_lock(&cfg->usr_sync);
+ if (!dhd_download_fw_on_driverload) {
+ mutex_unlock(&cfg->usr_sync);
+ wl_destroy_event_handler(cfg);
+ mutex_lock(&cfg->usr_sync);
+ }
+
wl_flush_eq(cfg);
wl_link_down(cfg);
if (cfg->p2p_supported) {
@@ -13569,28 +20495,34 @@
del_timer_sync(&cfg->scan_timeout);
}
+ wl_cfg80211_clear_mgmt_vndr_ies(cfg);
+#if defined(OEM_ANDROID)
DHD_OS_SCAN_WAKE_UNLOCK((dhd_pub_t *)(cfg->pub));
+#endif // endif
+#ifdef DHD_MONITOR_INTERFACE
dhd_monitor_uninit();
+#endif /* DHD_MONITOR_INTERFACE */
+
#ifdef WLAIBSS_MCHAN
bcm_cfg80211_del_ibss_if(cfg->wdev->wiphy, cfg->ibss_cfgdev);
#endif /* WLAIBSS_MCHAN */
-#if defined(WL_VIRTUAL_APSTA) || defined(DUAL_STA_STATIC_IF)
- /* Clean up if not removed already */
- if (cfg->bss_cfgdev)
- wl_cfg80211_del_iface(cfg->wdev->wiphy, cfg->bss_cfgdev);
-#endif /* defined (WL_VIRTUAL_APSTA) || defined (DUAL_STA_STATIC_IF) */
-
#ifdef WL11U
/* Clear interworking element. */
if (cfg->wl11u) {
+ wl_clear_iwdata(cfg);
cfg->wl11u = FALSE;
- cfg->iw_ie_len = 0;
- memset(cfg->iw_ie, 0, IW_IES_MAX_BUF_LEN);
}
#endif /* WL11U */
+#ifdef CUSTOMER_HW4_DEBUG
+ if (wl_scan_timeout_dbg_enabled) {
+ wl_scan_timeout_dbg_clear();
+ }
+#endif /* CUSTOMER_HW4_DEBUG */
+
+ cfg->disable_roam_event = false;
DNGL_FUNC(dhd_cfg80211_down, (cfg));
@@ -13602,7 +20534,64 @@
return err;
}
-s32 wl_cfg80211_up(void *para)
+#ifdef WL_STATIC_IF
+/* Gets index at which ndev is stored in static_ndev array - using name
+ * Returns error in case match not found. Caller needs to check
+ * validity of return value
+ */
+int
+get_iface_num(const char *name, struct bcm_cfg80211 *cfg)
+{
+ int i = 0;
+ for (i = 0; i < DHD_NUM_STATIC_IFACES; i++) {
+ if (strcmp(name, cfg->static_ndev[i]->name) == 0) {
+ return i;
+ }
+ }
+ return BCME_ERROR;
+}
+
+/* Checks whether interface is static or not by parsing static_ndev array */
+bool
+is_static_iface(struct bcm_cfg80211 *cfg, struct net_device *net)
+{
+ int i = 0;
+ for (i = 0; i < DHD_NUM_STATIC_IFACES; i++) {
+ if ((cfg && (cfg->static_ndev[i] == net))) {
+ return true;
+ }
+ }
+ return false;
+}
+
+/* Checks whether interface is static or not in the case when ndev is not available,
+* using the net dev name which is passed.
+*/
+bool
+is_static_iface_name(const char *name, struct bcm_cfg80211 *cfg)
+{
+ int inum = 0;
+ inum = get_iface_num(name, cfg);
+ if (inum >= 0) {
+ return true;
+ }
+ return false;
+}
+
+/* Returns the static_ndev_state of the virtual interface */
+int
+static_if_ndev_get_state(struct bcm_cfg80211 *cfg, struct net_device *net)
+{
+ int i = 0;
+ for (i = 0; i < DHD_NUM_STATIC_IFACES; i++) {
+ if ((cfg && (cfg->static_ndev[i] == net))) {
+ return cfg->static_ndev_state[i];
+ }
+ }
+ return NDEV_STATE_NONE;
+}
+#endif /* WL_STATIC_IF */
+s32 wl_cfg80211_up(struct net_device *net)
{
struct bcm_cfg80211 *cfg;
s32 err = 0;
@@ -13614,12 +20603,11 @@
s8 iovbuf[WLC_IOCTL_SMLEN];
#endif /* DISABLE_PM_BCNRX */
- (void)para;
WL_DBG(("In\n"));
- cfg = g_bcm_cfg;
+ cfg = wl_get_cfg(net);
- if ((err = wldev_ioctl(bcmcfg_to_prmry_ndev(cfg), WLC_GET_VERSION, &val,
- sizeof(int), false) < 0)) {
+ if ((err = wldev_ioctl_get(bcmcfg_to_prmry_ndev(cfg), WLC_GET_VERSION, &val,
+ sizeof(int)) < 0)) {
WL_ERR(("WLC_GET_VERSION failed, err=%d\n", err));
return err;
}
@@ -13641,63 +20629,104 @@
return err;
}
}
+#if defined(BCMSUP_4WAY_HANDSHAKE)
+ if (dhd->fw_4way_handshake) {
+ /* This is a hacky method to indicate fw 4WHS support and
+ * is used only for kernels (kernels < 3.14). For newer
+ * kernels, we would be using vendor extn. path to advertise
+ * FW based 4-way handshake feature support.
+ */
+ cfg->wdev->wiphy->features |= NL80211_FEATURE_FW_4WAY_HANDSHAKE;
+ }
+#endif /* BCMSUP_4WAY_HANDSHAKE */
err = __wl_cfg80211_up(cfg);
if (unlikely(err))
WL_ERR(("__wl_cfg80211_up failed\n"));
-
+#ifdef ROAM_CHANNEL_CACHE
+ if (init_roam_cache(cfg, ioctl_version) == 0) {
+ /* Enable support for Roam cache */
+ cfg->rcc_enabled = true;
+ WL_ERR(("Roam channel cache enabled\n"));
+ } else {
+ WL_ERR(("Failed to enable RCC.\n"));
+ }
+#endif /* ROAM_CHANNEL_CACHE */
/* IOVAR configurations with 'up' condition */
#ifdef DISABLE_PM_BCNRX
- interr = wldev_iovar_setbuf(bcmcfg_to_prmry_ndev(cfg), "pm_bcnrx",
- (char *)¶m, sizeof(param), iovbuf, sizeof(iovbuf), &cfg->ioctl_buf_sync);
+ interr = wldev_iovar_setbuf(net, "pm_bcnrx", (char *)¶m, sizeof(param), iovbuf,
+ sizeof(iovbuf), &cfg->ioctl_buf_sync);
- if (unlikely(interr))
- WL_ERR(("Set pm_bcnrx error (%d)\n", interr));
+ if (unlikely(interr)) {
+ WL_ERR(("Set pm_bcnrx returned (%d)\n", interr));
+ }
#endif /* DISABLE_PM_BCNRX */
+#ifdef WL_CHAN_UTIL
+ interr = wl_cfg80211_start_bssload_report(net);
+ if (unlikely(interr)) {
+ WL_ERR(("%s: Failed to start bssload_report eventing, err=%d\n",
+ __FUNCTION__, interr));
+ }
+#endif /* WL_CHAN_UTIL */
mutex_unlock(&cfg->usr_sync);
#ifdef WLAIBSS_MCHAN
bcm_cfg80211_add_ibss_if(cfg->wdev->wiphy, IBSS_IF_NAME);
#endif /* WLAIBSS_MCHAN */
-
-#ifdef DUAL_STA_STATIC_IF
-#ifdef WL_VIRTUAL_APSTA
-#error "Both DUAL STA and DUAL_STA_STATIC_IF can't be enabled together"
-#endif
- /* Static Interface support is currently supported only for STA only builds (without P2P) */
- wl_cfg80211_create_iface(cfg->wdev->wiphy, NL80211_IFTYPE_STATION, NULL, "wlan%d");
-#endif /* DUAL_STA_STATIC_IF */
-
return err;
}
/* Private Event to Supplicant with indication that chip hangs */
int wl_cfg80211_hang(struct net_device *dev, u16 reason)
{
- struct bcm_cfg80211 *cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ dhd_pub_t *dhd;
#if defined(SOFTAP_SEND_HANGEVT)
/* specifc mac address used for hang event */
uint8 hang_mac[ETHER_ADDR_LEN] = {0x11, 0x11, 0x11, 0x11, 0x11, 0x11};
- dhd_pub_t *dhd;
#endif /* SOFTAP_SEND_HANGEVT */
- if (!g_bcm_cfg) {
+ if (!cfg) {
return BCME_ERROR;
}
- cfg = g_bcm_cfg;
+ RETURN_EIO_IF_NOT_UP(cfg);
- WL_ERR(("In : chip crash eventing\n"));
- wl_add_remove_pm_enable_work(cfg, FALSE, WL_HANDLER_DEL);
-#if defined(SOFTAP_SEND_HANGEVT)
dhd = (dhd_pub_t *)(cfg->pub);
+#if defined(DHD_HANG_SEND_UP_TEST)
+ if (dhd->req_hang_type) {
+ WL_ERR(("wl_cfg80211_hang, Clear HANG test request 0x%x\n",
+ dhd->req_hang_type));
+ dhd->req_hang_type = 0;
+ }
+#endif /* DHD_HANG_SEND_UP_TEST */
+ if ((dhd->hang_reason <= HANG_REASON_MASK) || (dhd->hang_reason >= HANG_REASON_MAX)) {
+ WL_ERR(("wl_cfg80211_hang, Invalid hang reason 0x%x\n",
+ dhd->hang_reason));
+ dhd->hang_reason = HANG_REASON_UNKNOWN;
+ }
+#if defined(DHD_USE_EXTENDED_HANG_REASON) || defined(WL_CFGVENDOR_SEND_HANG_EVENT)
+ if (dhd->hang_reason != 0) {
+ reason = dhd->hang_reason;
+ }
+#endif /* DHD_USE_EXTENDED_HANG_REASON */
+ WL_ERR(("In : chip crash eventing, reason=0x%x\n", (uint32)(dhd->hang_reason)));
+
+ wl_add_remove_pm_enable_work(cfg, WL_PM_WORKQ_DEL);
+#ifdef SOFTAP_SEND_HANGEVT
if (dhd->op_mode & DHD_FLAG_HOSTAP_MODE) {
cfg80211_del_sta(dev, hang_mac, GFP_ATOMIC);
} else
#endif /* SOFTAP_SEND_HANGEVT */
{
- CFG80211_DISCONNECTED(dev, reason, NULL, 0, false, GFP_KERNEL);
+ if (dhd->up == TRUE) {
+#ifdef WL_CFGVENDOR_SEND_HANG_EVENT
+ wl_cfgvendor_send_hang_event(dev, reason);
+#else
+ CFG80211_DISCONNECTED(dev, reason, NULL, 0, false, GFP_KERNEL);
+#endif /* WL_CFGVENDOR_SEND_HANG_EVENT */
+ }
}
if (cfg != NULL) {
wl_link_down(cfg);
@@ -13705,14 +20734,12 @@
return 0;
}
-s32 wl_cfg80211_down(void *para)
+s32 wl_cfg80211_down(struct net_device *dev)
{
- struct bcm_cfg80211 *cfg;
- s32 err = 0;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ s32 err = BCME_ERROR;
- (void)para;
WL_DBG(("In\n"));
- cfg = g_bcm_cfg;
if (cfg) {
mutex_lock(&cfg->usr_sync);
@@ -13723,48 +20750,26 @@
return err;
}
-#if (defined(STBLINUX) && defined(WL_CFG80211))
-int wl_cfg80211_cleanup(void)
+void
+wl_cfg80211_sta_ifdown(struct net_device *dev)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
- struct net_device *ndev;
- unsigned long flags;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
- if (!cfg)
- return -EINVAL;
+ WL_DBG(("In\n"));
- ndev = bcmcfg_to_prmry_ndev(cfg);
- spin_lock_irqsave(&cfg->cfgdrv_lock, flags);
- if (cfg->scan_request) {
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 8, 0))
- struct cfg80211_scan_info info = { .aborted = true };
- cfg80211_scan_done(cfg->scan_request, &info);
-#else
- cfg80211_scan_done(cfg->scan_request, true);
-#endif
- cfg->scan_request = NULL;
+ if (cfg) {
+ /* cancel scan if anything pending */
+ wl_cfg80211_cancel_scan(cfg);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0))
+ if ((dev->ieee80211_ptr->iftype == NL80211_IFTYPE_STATION) &&
+ wl_get_drv_status(cfg, CONNECTED, dev)) {
+ CFG80211_DISCONNECTED(dev, 0, NULL, 0, false, GFP_KERNEL);
+ }
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) */
}
- spin_unlock_irqrestore(&cfg->cfgdrv_lock, flags);
-
- if (wl_get_drv_status(cfg, CONNECTED, ndev) ||
- wl_get_drv_status(cfg, CONNECTING, ndev)) {
- CFG80211_DISCONNECTED(ndev, 0, NULL, 0, false, GFP_KERNEL);
- }
-
- /* clear all flags */
- wl_clr_drv_status(cfg, SCANNING, ndev);
- wl_clr_drv_status(cfg, CONNECTING, ndev);
- wl_clr_drv_status(cfg, CONNECTED, ndev);
-
- /* Let kernel thread to handle the event */
- cond_resched();
- mdelay(500);
-
- return 0;
}
-#endif /* STBLINUX && WL_CFG80211 */
-static void *wl_read_prof(struct bcm_cfg80211 *cfg, struct net_device *ndev, s32 item)
+void *wl_read_prof(struct bcm_cfg80211 *cfg, struct net_device *ndev, s32 item)
{
unsigned long flags;
void *rptr = NULL;
@@ -13772,7 +20777,7 @@
if (!profile)
return NULL;
- spin_lock_irqsave(&cfg->cfgdrv_lock, flags);
+ WL_CFG_DRV_LOCK(&cfg->cfgdrv_lock, flags);
switch (item) {
case WL_PROF_SEC:
rptr = &profile->sec;
@@ -13789,8 +20794,11 @@
case WL_PROF_CHAN:
rptr = &profile->channel;
break;
+ case WL_PROF_LATEST_BSSID:
+ rptr = profile->latest_bssid;
+ break;
}
- spin_unlock_irqrestore(&cfg->cfgdrv_lock, flags);
+ WL_CFG_DRV_UNLOCK(&cfg->cfgdrv_lock, flags);
if (!rptr)
WL_ERR(("invalid item (%d)\n", item));
return rptr;
@@ -13807,20 +20815,20 @@
if (!profile)
return WL_INVALID;
- spin_lock_irqsave(&cfg->cfgdrv_lock, flags);
+ WL_CFG_DRV_LOCK(&cfg->cfgdrv_lock, flags);
switch (item) {
case WL_PROF_SSID:
ssid = (const wlc_ssid_t *) data;
- memset(profile->ssid.SSID, 0,
+ bzero(profile->ssid.SSID,
sizeof(profile->ssid.SSID));
- memcpy(profile->ssid.SSID, ssid->SSID, ssid->SSID_len);
- profile->ssid.SSID_len = ssid->SSID_len;
+ profile->ssid.SSID_len = MIN(ssid->SSID_len, DOT11_MAX_SSID_LEN);
+ memcpy(profile->ssid.SSID, ssid->SSID, profile->ssid.SSID_len);
break;
case WL_PROF_BSSID:
if (data)
memcpy(profile->bssid, data, ETHER_ADDR_LEN);
else
- memset(profile->bssid, 0, ETHER_ADDR_LEN);
+ bzero(profile->bssid, ETHER_ADDR_LEN);
break;
case WL_PROF_SEC:
memcpy(&profile->sec, data, sizeof(profile->sec));
@@ -13837,11 +20845,20 @@
case WL_PROF_CHAN:
profile->channel = *(const u32*)data;
break;
+ case WL_PROF_LATEST_BSSID:
+ if (data) {
+ memcpy_s(profile->latest_bssid, sizeof(profile->latest_bssid),
+ data, ETHER_ADDR_LEN);
+ } else {
+ memset_s(profile->latest_bssid, sizeof(profile->latest_bssid),
+ 0, ETHER_ADDR_LEN);
+ }
+ break;
default:
err = -EOPNOTSUPP;
break;
}
- spin_unlock_irqrestore(&cfg->cfgdrv_lock, flags);
+ WL_CFG_DRV_UNLOCK(&cfg->cfgdrv_lock, flags);
if (err == -EOPNOTSUPP)
WL_ERR(("unsupported item (%d)\n", item));
@@ -13875,6 +20892,7 @@
struct wl_ie *ie = wl_to_ie(cfg);
ie->offset = 0;
+ bzero(ie->buf, sizeof(ie->buf));
}
static __used s32 wl_add_ie(struct bcm_cfg80211 *cfg, u8 t, u8 l, u8 *v)
@@ -13894,41 +20912,63 @@
return err;
}
-static void wl_update_hidden_ap_ie(struct wl_bss_info *bi, const u8 *ie_stream, u32 *ie_size,
- bool roam)
+static void wl_update_hidden_ap_ie(wl_bss_info_t *bi, const u8 *ie_stream, u32 *ie_size,
+ bool update_ssid)
{
u8 *ssidie;
+ int32 ssid_len = MIN(bi->SSID_len, DOT11_MAX_SSID_LEN);
+ int32 remaining_ie_buf_len, available_buffer_len, unused_buf_len;
/* cfg80211_find_ie defined in kernel returning const u8 */
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#endif
+
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
ssidie = (u8 *)cfg80211_find_ie(WLAN_EID_SSID, ie_stream, *ie_size);
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic pop")
-#endif
- if (!ssidie)
+ GCC_DIAGNOSTIC_POP();
+
+ /* ERROR out if
+ * 1. No ssid IE is FOUND or
+ * 2. New ssid length is > what was allocated for existing ssid (as
+ * we do not want to overwrite the rest of the IEs) or
+ * 3. If in case of erroneous buffer input where ssid length doesnt match the space
+ * allocated to it.
+ */
+ if (!ssidie) {
return;
- if (ssidie[1] != bi->SSID_len) {
+ }
+ available_buffer_len = ((int)(*ie_size)) - (ssidie + 2 - ie_stream);
+ remaining_ie_buf_len = available_buffer_len - (int)ssidie[1];
+ unused_buf_len = WL_EXTRA_BUF_MAX - (4 + bi->length + *ie_size);
+ if (ssidie[1] > available_buffer_len) {
+ WL_ERR_MEM(("wl_update_hidden_ap_ie: skip wl_update_hidden_ap_ie : overflow\n"));
+ return;
+ }
+
+ if (ssidie[1] != ssid_len) {
if (ssidie[1]) {
- WL_ERR(("%s: Wrong SSID len: %d != %d\n",
- __FUNCTION__, ssidie[1], bi->SSID_len));
+ WL_ERR_RLMT(("wl_update_hidden_ap_ie: Wrong SSID len: %d != %d\n",
+ ssidie[1], bi->SSID_len));
}
- if (roam) {
- WL_ERR(("Changing the SSID Info.\n"));
- memmove(ssidie + bi->SSID_len + 2,
+ /*
+ * The bss info in firmware gets updated from beacon and probe resp.
+ * In case of hidden network, the bss_info that got updated by beacon,
+ * will not carry SSID and this can result in cfg80211_get_bss not finding a match.
+ * so include the SSID element.
+ */
+ if ((update_ssid && (ssid_len > ssidie[1])) && (unused_buf_len > ssid_len)) {
+ WL_INFORM_MEM(("Changing the SSID Info.\n"));
+ memmove(ssidie + ssid_len + 2,
(ssidie + 2) + ssidie[1],
- *ie_size - (ssidie + 2 + ssidie[1] - ie_stream));
- memcpy(ssidie + 2, bi->SSID, bi->SSID_len);
- *ie_size = *ie_size + bi->SSID_len - ssidie[1];
- ssidie[1] = bi->SSID_len;
+ remaining_ie_buf_len);
+ memcpy(ssidie + 2, bi->SSID, ssid_len);
+ *ie_size = *ie_size + ssid_len - ssidie[1];
+ ssidie[1] = ssid_len;
+ } else if (ssid_len < ssidie[1]) {
+ WL_ERR_MEM(("wl_update_hidden_ap_ie: Invalid SSID len: %d < %d\n",
+ bi->SSID_len, ssidie[1]));
}
return;
}
if (*(ssidie + 2) == '\0')
- memcpy(ssidie + 2, bi->SSID, bi->SSID_len);
+ memcpy(ssidie + 2, bi->SSID, ssid_len);
return;
}
@@ -13987,13 +21027,13 @@
{
unsigned long flags;
- spin_lock_irqsave(&cfg->eq_lock, flags);
+ WL_CFG_EQ_LOCK(&cfg->eq_lock, flags);
return flags;
}
static void wl_unlock_eq(struct bcm_cfg80211 *cfg, unsigned long flags)
{
- spin_unlock_irqrestore(&cfg->eq_lock, flags);
+ WL_CFG_EQ_UNLOCK(&cfg->eq_lock, flags);
}
static void wl_init_eq_lock(struct bcm_cfg80211 *cfg)
@@ -14012,13 +21052,14 @@
s32 wl_cfg80211_get_p2p_dev_addr(struct net_device *net, struct ether_addr *p2pdev_addr)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(net);
struct ether_addr primary_mac;
if (!cfg->p2p)
return -1;
if (!p2p_is_on(cfg)) {
get_primary_mac(cfg, &primary_mac);
wl_cfgp2p_generate_bss_mac(cfg, &primary_mac);
+ memcpy((void *)&p2pdev_addr, (void *)&primary_mac, ETHER_ADDR_LEN);
} else {
memcpy(p2pdev_addr->octet, wl_to_p2p_bss_macaddr(cfg, P2PAPI_BSSCFG_DEVICE).octet,
ETHER_ADDR_LEN);
@@ -14028,35 +21069,37 @@
}
s32 wl_cfg80211_set_p2p_noa(struct net_device *net, char* buf, int len)
{
- struct bcm_cfg80211 *cfg;
-
- cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(net);
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 bcm_cfg80211 *cfg;
- cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(net);
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 bcm_cfg80211 *cfg;
- cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(net);
return wl_cfgp2p_set_p2p_ps(cfg, net, buf, len);
}
s32 wl_cfg80211_set_p2p_ecsa(struct net_device *net, char* buf, int len)
{
- struct bcm_cfg80211 *cfg;
- cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(net);
return wl_cfgp2p_set_p2p_ecsa(cfg, net, buf, len);
+}
+
+s32 wl_cfg80211_increase_p2p_bw(struct net_device *net, char* buf, int len)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(net);
+
+ return wl_cfgp2p_increase_p2p_bw(cfg, net, buf, len);
}
#ifdef P2PLISTEN_AP_SAMECHN
@@ -14068,7 +21111,7 @@
/* disable PM for p2p responding on infra AP channel */
s32 pm = PM_OFF;
- ret = wldev_ioctl(net, WLC_SET_PM, &pm, sizeof(pm), true);
+ ret = wldev_ioctl_set(net, WLC_SET_PM, &pm, sizeof(pm));
}
return ret;
@@ -14079,7 +21122,7 @@
{
int freq = 0;
-#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 38)
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 38) && !defined(WL_COMPAT_WIRELESS)
freq = ieee80211_channel_to_frequency(channel);
#else
{
@@ -14090,13 +21133,12 @@
band = IEEE80211_BAND_5GHZ;
freq = ieee80211_channel_to_frequency(channel, band);
}
-#endif
+#endif // endif
return freq;
}
-
#ifdef WLTDLS
-static s32
+s32
wl_tdls_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
const wl_event_msg_t *e, void *data) {
@@ -14111,45 +21153,46 @@
msg = " TDLS PEER DISCOVERD ";
break;
case WLC_E_TDLS_PEER_CONNECTED :
-#ifdef PCIE_FULL_DONGLE
- dhd_tdls_update_peer_info(ndev, TRUE, (uint8 *)&e->addr.octet[0]);
-#endif /* PCIE_FULL_DONGLE */
if (cfg->tdls_mgmt_frame) {
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
cfg80211_rx_mgmt(cfgdev, cfg->tdls_mgmt_freq, 0,
- cfg->tdls_mgmt_frame, cfg->tdls_mgmt_frame_len,
- 0);
+ cfg->tdls_mgmt_frame, cfg->tdls_mgmt_frame_len, 0);
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
cfg80211_rx_mgmt(cfgdev, cfg->tdls_mgmt_freq, 0,
- cfg->tdls_mgmt_frame, cfg->tdls_mgmt_frame_len,
- 0, GFP_ATOMIC);
+ cfg->tdls_mgmt_frame, cfg->tdls_mgmt_frame_len, 0,
+ GFP_ATOMIC);
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) || \
- defined(WL_COMPAT_WIRELESS)
+ defined(WL_COMPAT_WIRELESS)
cfg80211_rx_mgmt(cfgdev, cfg->tdls_mgmt_freq, 0,
- cfg->tdls_mgmt_frame, cfg->tdls_mgmt_frame_len,
- GFP_ATOMIC);
+ cfg->tdls_mgmt_frame, cfg->tdls_mgmt_frame_len,
+ GFP_ATOMIC);
#else
cfg80211_rx_mgmt(cfgdev, cfg->tdls_mgmt_freq,
- cfg->tdls_mgmt_frame, cfg->tdls_mgmt_frame_len,
- GFP_ATOMIC);
-#endif /* LINUX_VERSION >= VERSION(3, 12, 0) */
+ cfg->tdls_mgmt_frame, cfg->tdls_mgmt_frame_len, GFP_ATOMIC);
+
+#endif /* LINUX_VERSION >= VERSION(3, 18,0) || WL_COMPAT_WIRELESS */
}
msg = " TDLS PEER CONNECTED ";
+#ifdef SUPPORT_SET_CAC
+ /* TDLS connect reset CAC */
+ wl_cfg80211_set_cac(cfg, 0);
+#endif /* SUPPORT_SET_CAC */
break;
case WLC_E_TDLS_PEER_DISCONNECTED :
-#ifdef PCIE_FULL_DONGLE
- dhd_tdls_update_peer_info(ndev, FALSE, (uint8 *)&e->addr.octet[0]);
-#endif /* PCIE_FULL_DONGLE */
if (cfg->tdls_mgmt_frame) {
- kfree(cfg->tdls_mgmt_frame);
- cfg->tdls_mgmt_frame = NULL;
+ MFREE(cfg->osh, cfg->tdls_mgmt_frame, cfg->tdls_mgmt_frame_len);
+ cfg->tdls_mgmt_frame_len = 0;
cfg->tdls_mgmt_freq = 0;
}
msg = "TDLS PEER DISCONNECTED ";
+#ifdef SUPPORT_SET_CAC
+ /* TDLS disconnec, set CAC */
+ wl_cfg80211_set_cac(cfg, 1);
+#endif /* SUPPORT_SET_CAC */
break;
}
if (msg) {
- WL_ERR(("%s: " MACDBG " on %s ndev\n", msg, MAC2STRDBG((u8*)(&e->addr)),
+ WL_ERR(("%s: " MACDBG " on %s ndev\n", msg, MAC2STRDBG((const u8*)(&e->addr)),
(bcmcfg_to_prmry_ndev(cfg) == ndev) ? "primary" : "secondary"));
}
return 0;
@@ -14157,79 +21200,88 @@
}
#endif /* WLTDLS */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 2, 0))
-static s32
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(3, 2, 0)) || defined(WL_COMPAT_WIRELESS)
#if (defined(CONFIG_ARCH_MSM) && defined(TDLS_MGMT_VERSION2)) || (LINUX_VERSION_CODE < \
KERNEL_VERSION(3, 16, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
+static s32
wl_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
- u8 *peer, u8 action_code, u8 dialog_token, u16 status_code,
- u32 peer_capability, const u8 *data, size_t len)
+ u8 *peer, u8 action_code, u8 dialog_token, u16 status_code,
+ u32 peer_capability, const u8 *buf, size_t len)
#elif ((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0)) && \
(LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)))
-wl_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
+static s32 wl_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
const u8 *peer, u8 action_code, u8 dialog_token, u16 status_code,
- u32 peer_capability, const u8 *data, size_t len)
+ u32 peer_capability, const u8 *buf, size_t len)
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
+static s32 wl_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
+ const u8 *peer, u8 action_code, u8 dialog_token, u16 status_code,
+ u32 peer_capability, bool initiator, const u8 *buf, size_t len)
+#else /* CONFIG_ARCH_MSM && TDLS_MGMT_VERSION2 */
+static s32
wl_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
- const u8 *peer, u8 action_code, u8 dialog_token, u16 status_code,
- u32 peer_capability, bool initiator, const u8 *data, size_t len)
-#else
-wl_cfg80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev,
- u8 *peer, u8 action_code, u8 dialog_token, u16 status_code, const u8 *data,
- size_t len)
-#endif /* CONFIG_ARCH_MSM && TDLS_MGMT_VERSION2 */
+ u8 *peer, u8 action_code, u8 dialog_token, u16 status_code,
+ const u8 *buf, size_t len)
+#endif /* CONFIG_ARCH_MSM && TDLS_MGMT_VERSION2 */
{
s32 ret = 0;
-#ifdef WLTDLS
+#if defined(TDLS_MSG_ONLY_WFD) && defined(WLTDLS)
struct bcm_cfg80211 *cfg;
tdls_wfd_ie_iovar_t info;
- memset(&info, 0, sizeof(tdls_wfd_ie_iovar_t));
- cfg = g_bcm_cfg;
+ bzero(&info, sizeof(info));
+ cfg = wl_get_cfg(dev);
#if defined(CONFIG_ARCH_MSM) && defined(TDLS_MGMT_VERSION2)
/* Some customer platform back ported this feature from kernel 3.15 to kernel 3.10
- * and that cuases build error
- */
+ * and that cuases build error
+ */
BCM_REFERENCE(peer_capability);
#endif /* CONFIG_ARCH_MSM && TDLS_MGMT_VERSION2 */
switch (action_code) {
- /* We need to set TDLS Wifi Display IE to firmware
- * using tdls_wfd_ie iovar
- */
- case WLAN_TDLS_SET_PROBE_WFD_IE:
- WL_ERR(("%s WLAN_TDLS_SET_PROBE_WFD_IE\n", __FUNCTION__));
- info.mode = TDLS_WFD_PROBE_IE_TX;
- memcpy(&info.data, data, len);
- info.length = len;
- break;
- case WLAN_TDLS_SET_SETUP_WFD_IE:
- WL_ERR(("%s WLAN_TDLS_SET_SETUP_WFD_IE\n", __FUNCTION__));
- info.mode = TDLS_WFD_IE_TX;
- memcpy(&info.data, data, len);
- info.length = len;
- break;
- case WLAN_TDLS_SET_WFD_ENABLED:
- WL_ERR(("%s WLAN_TDLS_SET_MODE_WFD_ENABLED\n", __FUNCTION__));
- dhd_tdls_set_mode((dhd_pub_t *)(cfg->pub), true);
- goto out;
- case WLAN_TDLS_SET_WFD_DISABLED:
- WL_ERR(("%s WLAN_TDLS_SET_MODE_WFD_DISABLED\n", __FUNCTION__));
- dhd_tdls_set_mode((dhd_pub_t *)(cfg->pub), false);
- goto out;
- default:
- WL_ERR(("Unsupported action code : %d\n", action_code));
- goto out;
- }
+ /* We need to set TDLS Wifi Display IE to firmware
+ * using tdls_wfd_ie iovar
+ */
+ case WLAN_TDLS_SET_PROBE_WFD_IE:
+ WL_ERR(("wl_cfg80211_tdls_mgmt: WLAN_TDLS_SET_PROBE_WFD_IE\n"));
+ info.mode = TDLS_WFD_PROBE_IE_TX;
+ if (len > sizeof(info.data)) {
+ return -EINVAL;
+ }
+ memcpy(&info.data, buf, len);
+ info.length = len;
+ break;
+ case WLAN_TDLS_SET_SETUP_WFD_IE:
+ WL_ERR(("wl_cfg80211_tdls_mgmt: WLAN_TDLS_SET_SETUP_WFD_IE\n"));
+ info.mode = TDLS_WFD_IE_TX;
+
+ if (len > sizeof(info.data)) {
+ return -EINVAL;
+ }
+ memcpy(&info.data, buf, len);
+ info.length = len;
+ break;
+ case WLAN_TDLS_SET_WFD_ENABLED:
+ WL_ERR(("wl_cfg80211_tdls_mgmt: WLAN_TDLS_SET_MODE_WFD_ENABLED\n"));
+ dhd_tdls_set_mode((dhd_pub_t *)(cfg->pub), true);
+ goto out;
+ case WLAN_TDLS_SET_WFD_DISABLED:
+ WL_ERR(("wl_cfg80211_tdls_mgmt: WLAN_TDLS_SET_MODE_WFD_DISABLED\n"));
+ dhd_tdls_set_mode((dhd_pub_t *)(cfg->pub), false);
+ goto out;
+ default:
+ WL_ERR(("Unsupported action code : %d\n", action_code));
+ goto out;
+ }
ret = wldev_iovar_setbuf(dev, "tdls_wfd_ie", &info, sizeof(info),
- cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
+ cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync);
if (ret) {
WL_ERR(("tdls_wfd_ie error %d\n", ret));
}
+
out:
-#endif /* WLTDLS */
+#endif /* TDLS_MSG_ONLY_WFD && WLTDLS */
return ret;
}
@@ -14241,17 +21293,16 @@
static s32
wl_cfg80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,
u8 *peer, enum nl80211_tdls_operation oper)
-#endif
+#endif // endif
{
s32 ret = 0;
#ifdef WLTDLS
- struct bcm_cfg80211 *cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
tdls_iovar_t info;
dhd_pub_t *dhdp;
bool tdls_auto_mode = false;
- cfg = g_bcm_cfg;
dhdp = (dhd_pub_t *)(cfg->pub);
- memset(&info, 0, sizeof(tdls_iovar_t));
+ bzero(&info, sizeof(tdls_iovar_t));
if (peer) {
memcpy(&info.ea, peer, ETHER_ADDR_LEN);
} else {
@@ -14264,7 +21315,7 @@
*/
if (memcmp(peer, (const uint8 *)BSSID_BROADCAST, ETHER_ADDR_LEN) == 0) {
info.mode = TDLS_MANUAL_EP_WFD_TPQ;
- WL_ERR(("%s TDLS TUNNELED PRBOBE REQUEST\n", __FUNCTION__));
+ WL_ERR(("wl_cfg80211_tdls_oper: TDLS TUNNELED PRBOBE REQUEST\n"));
} else {
info.mode = TDLS_MANUAL_EP_DISCOVERY;
}
@@ -14273,7 +21324,8 @@
if (dhdp->tdls_mode == true) {
info.mode = TDLS_MANUAL_EP_CREATE;
tdls_auto_mode = false;
- ret = dhd_tdls_enable(dev, false, tdls_auto_mode, NULL);
+ /* Do tear down and create a fresh one */
+ ret = wl_cfg80211_tdls_config(cfg, TDLS_STATE_TEARDOWN, tdls_auto_mode);
if (ret < 0) {
return ret;
}
@@ -14289,10 +21341,9 @@
goto out;
}
/* turn on TDLS */
- ret = dhd_tdls_enable(dev, true, tdls_auto_mode, NULL);
+ ret = wl_cfg80211_tdls_config(cfg, TDLS_STATE_SETUP, tdls_auto_mode);
if (ret < 0) {
return ret;
-
}
if (info.mode) {
ret = wldev_iovar_setbuf(dev, "tdls_endpoint", &info, sizeof(info),
@@ -14302,54 +21353,65 @@
}
}
out:
+ if (ret) {
+ wl_flush_fw_log_buffer(dev, FW_LOGSET_MASK_ALL);
+ return -ENOTSUPP;
+ }
#endif /* WLTDLS */
return ret;
}
-#endif
+#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,
+s32 wl_cfg80211_set_wps_p2p_ie(struct net_device *ndev, char *buf, int len,
enum wl_management_type type)
{
struct bcm_cfg80211 *cfg;
- struct net_device *ndev = NULL;
- struct ether_addr primary_mac;
s32 ret = 0;
+ struct ether_addr primary_mac;
s32 bssidx = 0;
s32 pktflag = 0;
- cfg = g_bcm_cfg;
+ cfg = wl_get_cfg(ndev);
- if (wl_get_drv_status(cfg, AP_CREATING, net)) {
+ if (wl_get_drv_status(cfg, AP_CREATING, ndev)) {
/* Vendor IEs should be set to FW
* after SoftAP interface is brought up
*/
+ WL_DBG(("Skipping set IE since AP is not up \n"));
goto exit;
- } else if (wl_get_drv_status(cfg, AP_CREATED, net)) {
- ndev = net;
- bssidx = 0;
- } 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(cfg, &primary_mac);
- /* In case of p2p_listen command, supplicant send remain_on_channel
- * without turning on P2P
- */
-
- p2p_on(cfg) = true;
- ret = wl_cfgp2p_enable_discovery(cfg, net, NULL, 0);
-
- if (unlikely(ret)) {
+ } else if (ndev == bcmcfg_to_prmry_ndev(cfg)) {
+ /* Either stand alone AP case or P2P discovery */
+ if (wl_get_drv_status(cfg, AP_CREATED, ndev)) {
+ /* Stand alone AP case on primary interface */
+ WL_DBG(("Apply IEs for Primary AP Interface \n"));
+ bssidx = 0;
+ } else {
+ if (!cfg->p2p) {
+ /* If p2p not initialized, return failure */
+ WL_ERR(("P2P not initialized \n"));
goto exit;
}
- }
- if (net == bcmcfg_to_prmry_ndev(cfg)) {
+ /* P2P Discovery case (p2p listen) */
+ if (!cfg->p2p->on) {
+ /* Turn on Discovery interface */
+ get_primary_mac(cfg, &primary_mac);
+ wl_cfgp2p_generate_bss_mac(cfg, &primary_mac);
+ p2p_on(cfg) = true;
+ ret = wl_cfgp2p_enable_discovery(cfg, ndev, NULL, 0);
+ if (unlikely(ret)) {
+ WL_ERR(("Enable discovery failed \n"));
+ goto exit;
+ }
+ }
+ WL_DBG(("Apply IEs for P2P Discovery Iface \n"));
ndev = wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_PRIMARY);
bssidx = wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_DEVICE);
- } else {
- ndev = net;
- bssidx = wl_get_bssidx_by_wdev(cfg, ndev->ieee80211_ptr);
- }
+ }
+ } else {
+ /* Virtual AP/ P2P Group Interface */
+ WL_DBG(("Apply IEs for iface:%s\n", ndev->name));
+ bssidx = wl_get_bssidx_by_wdev(cfg, ndev->ieee80211_ptr);
}
+
if (ndev != NULL) {
switch (type) {
case WL_BEACON:
@@ -14362,9 +21424,10 @@
pktflag = VNDR_IE_ASSOCRSP_FLAG;
break;
}
- if (pktflag)
+ if (pktflag) {
ret = wl_cfg80211_set_mgmt_vndr_ies(cfg,
ndev_to_cfgdev(ndev), bssidx, pktflag, buf, len);
+ }
}
exit:
return ret;
@@ -14376,23 +21439,11 @@
{
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;
- }
-
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
/* Set interface up, explicitly. */
val = 1;
- ret = wldev_ioctl(ndev, WLC_UP, (void *)&val, sizeof(val), true);
+ ret = wldev_ioctl_set(ndev, WLC_UP, (void *)&val, sizeof(val));
if (ret < 0) {
WL_ERR(("set interface up failed, error = %d\n", ret));
goto done;
@@ -14404,36 +21455,46 @@
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;
- }
+
+ wl_cfg80211_cancel_scan(cfg);
done:
return ret;
}
static bool
-wl_cfg80211_valid_channel_p2p(int channel)
+wl_cfg80211_valid_chanspec_p2p(chanspec_t chanspec)
{
bool valid = false;
+ char chanbuf[CHANSPEC_STR_LEN];
/* channel 1 to 14 */
- if ((channel >= 1) && (channel <= 14)) {
+ if ((chanspec >= 0x2b01) && (chanspec <= 0x2b0e)) {
valid = true;
}
+#ifdef IGUANA_LEGACY_CHIPS
/* channel 36 to 48 */
- else if ((channel >= 36) && (channel <= 48)) {
+ else if ((chanspec >= 0xd024) && (chanspec <= 0xd030)) {
valid = true;
}
/* channel 149 to 161 */
- else if ((channel >= 149) && (channel <= 161)) {
+ else if ((chanspec >= 0xd095) && (chanspec <= 0xd0a5)) {
valid = true;
}
+#else
+ /* channel 36 to 48 */
+ else if ((chanspec >= 0x1b24) && (chanspec <= 0x1b30)) {
+ valid = true;
+ }
+ /* channel 149 to 161 */
+ else if ((chanspec >= 0x1b95) && (chanspec <= 0x1ba1)) {
+ valid = true;
+ }
+#endif /* IGUANA_LEGACY_CHIPS */
else {
valid = false;
- WL_INFORM(("invalid P2P chanspec, channel = %d\n", channel));
+ WL_INFORM_MEM(("invalid P2P chanspec, chanspec = %s\n",
+ wf_chspec_ntoa_ex(chanspec, chanbuf)));
}
return valid;
@@ -14446,7 +21507,7 @@
struct bcm_cfg80211 *cfg = NULL;
chanspec_t chanspec = 0;
- cfg = g_bcm_cfg;
+ cfg = wl_get_cfg(ndev);
/* Restrict channels to 2.4GHz, 20MHz BW, no SB. */
chanspec |= (WL_CHANSPEC_BAND_2G | WL_CHANSPEC_BW_20 |
@@ -14469,11 +21530,9 @@
s32 ret = BCME_ERROR;
s32 i = 0;
s32 j = 0;
- struct bcm_cfg80211 *cfg = NULL;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
wl_uint32_list_t *list = NULL;
chanspec_t chanspec = 0;
-
- cfg = g_bcm_cfg;
/* Restrict channels to 5GHz, 20MHz BW, no SB. */
chanspec |= (WL_CHANSPEC_BAND_5G | WL_CHANSPEC_BW_20 |
@@ -14500,7 +21559,7 @@
}
if (CHANNEL_IS_RADAR(channel) ||
- !(wl_cfg80211_valid_channel_p2p(CHSPEC_CHANNEL(chanspec)))) {
+ !(wl_cfg80211_valid_chanspec_p2p(chanspec))) {
continue;
} else {
list->element[j] = list->element[i];
@@ -14524,7 +21583,7 @@
int retry = 0;
/* Start auto channel selection scan. */
- ret = wldev_ioctl(ndev, WLC_START_CHANNEL_SEL, buf, buflen, true);
+ ret = wldev_ioctl_set(ndev, WLC_START_CHANNEL_SEL, NULL, 0);
if (ret < 0) {
WL_ERR(("can't start auto channel scan, error = %d\n", ret));
*channel = 0;
@@ -14536,16 +21595,14 @@
while (retry--) {
OSL_SLEEP(CHAN_SEL_IOCTL_DELAY);
-
chosen = 0;
- ret = wldev_ioctl(ndev, WLC_GET_CHANNEL_SEL, &chosen, sizeof(chosen),
- false);
+ ret = wldev_ioctl_get(ndev, WLC_GET_CHANNEL_SEL, &chosen, sizeof(chosen));
if ((ret == 0) && (dtoh32(chosen) != 0)) {
*channel = (u16)(chosen & 0x00FF);
- WL_INFORM(("selected channel = %d\n", *channel));
+ WL_INFORM_MEM(("selected channel = %d\n", *channel));
break;
}
- WL_INFORM(("attempt = %d, ret = %d, chosen = %d\n",
+ WL_DBG(("attempt = %d, ret = %d, chosen = %d\n",
(CHAN_SEL_RETRY_COUNT - retry), ret, dtoh32(chosen)));
}
@@ -14562,24 +21619,11 @@
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;
-
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
/* 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;
+ return BCME_OK;
}
s32
@@ -14592,9 +21636,10 @@
struct bcm_cfg80211 *cfg = NULL;
struct net_device *ndev = NULL;
- memset(cmd, 0, total_len);
+ bzero(cmd, total_len);
+ cfg = wl_get_cfg(dev);
- buf = kzalloc(CHANSPEC_BUF_SIZE, GFP_KERNEL);
+ buf = (u8 *)MALLOC(cfg->osh, CHANSPEC_BUF_SIZE);
if (buf == NULL) {
WL_ERR(("failed to allocate chanspec buffer\n"));
return -ENOMEM;
@@ -14604,7 +21649,6 @@
* Always use primary interface, irrespective of interface on which
* command came.
*/
- cfg = g_bcm_cfg;
ndev = bcmcfg_to_prmry_ndev(cfg);
/*
@@ -14661,14 +21705,14 @@
channel = 0;
}
- pos += snprintf(pos, total_len, "%04d ", channel);
+ pos += snprintf(pos, total_len - (pos - cmd), "%04d ", channel);
/* Set overall best channel same as 5GHz best channel. */
- pos += snprintf(pos, total_len, "%04d ", channel);
+ pos += snprintf(pos, total_len - (pos - cmd), "%04d ", channel);
done:
if (NULL != buf) {
- kfree(buf);
+ MFREE(cfg->osh, buf, CHANSPEC_BUF_SIZE);
}
/* Restore FW and driver back to normal state. */
@@ -14747,20 +21791,24 @@
wl_debuglevel_write(struct file *file, const char __user *userbuf,
size_t count, loff_t *ppos)
{
- char tbuf[S_SUBLOGLEVEL * ARRAYSIZE(sublogname_map)], sublog[S_SUBLOGLEVEL];
+ char tbuf[SUBLOGLEVELZ * ARRAYSIZE(sublogname_map)], sublog[SUBLOGLEVELZ];
char *params, *token, *colon;
uint i, tokens, log_on = 0;
- memset(tbuf, 0, sizeof(tbuf));
- memset(sublog, 0, sizeof(sublog));
- if (copy_from_user(&tbuf, userbuf, min_t(size_t, (sizeof(tbuf) - 1), count)))
- return -EFAULT;
+ size_t minsize = min_t(size_t, (sizeof(tbuf) - 1), count);
+ bzero(tbuf, sizeof(tbuf));
+ bzero(sublog, sizeof(sublog));
+ if (copy_from_user(&tbuf, userbuf, minsize)) {
+ return -EFAULT;
+ }
+
+ tbuf[minsize] = '\0';
params = &tbuf[0];
colon = strchr(params, '\n');
if (colon != NULL)
*colon = '\0';
while ((token = strsep(¶ms, " ")) != NULL) {
- memset(sublog, 0, sizeof(sublog));
+ bzero(sublog, sizeof(sublog));
if (token == NULL || !*token)
break;
if (*token == '\0')
@@ -14769,7 +21817,7 @@
if (colon != NULL) {
*colon = ' ';
}
- tokens = sscanf(token, "%s %u", sublog, &log_on);
+ tokens = sscanf(token, "%"S(SUBLOGLEVEL)"s %u", sublog, &log_on);
if (colon != NULL)
*colon = ':';
@@ -14790,7 +21838,6 @@
"SUBMODULE:LEVEL (%d tokens)\n",
tbuf, token, tokens));
-
}
return count;
}
@@ -14800,9 +21847,9 @@
size_t count, loff_t *ppos)
{
char *param;
- char tbuf[S_SUBLOGLEVEL * ARRAYSIZE(sublogname_map)];
+ char tbuf[SUBLOGLEVELZ * ARRAYSIZE(sublogname_map)];
uint i;
- memset(tbuf, 0, sizeof(tbuf));
+ bzero(tbuf, sizeof(tbuf));
param = &tbuf[0];
for (i = 0; i < ARRAYSIZE(sublogname_map); i++) {
param += snprintf(param, sizeof(tbuf) - 1, "%s:%d ",
@@ -14857,6 +21904,16 @@
}
#endif /* DEBUGFS_CFG80211 */
+struct bcm_cfg80211 *wl_cfg80211_get_bcmcfg(void)
+{
+ return g_bcmcfg;
+}
+
+void wl_cfg80211_set_bcmcfg(struct bcm_cfg80211 *cfg)
+{
+ g_bcmcfg = cfg;
+}
+
struct device *wl_cfg80211_get_parent_dev(void)
{
return cfg80211_parent_dev;
@@ -14874,17 +21931,21 @@
void get_primary_mac(struct bcm_cfg80211 *cfg, struct ether_addr *mac)
{
- 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);
+ u8 ioctl_buf[WLC_IOCTL_SMLEN];
+
+ if (wldev_iovar_getbuf_bsscfg(bcmcfg_to_prmry_ndev(cfg),
+ "cur_etheraddr", NULL, 0, ioctl_buf, sizeof(ioctl_buf),
+ 0, NULL) == BCME_OK) {
+ memcpy(mac->octet, ioctl_buf, ETHER_ADDR_LEN);
+ } else {
+ bzero(mac->octet, ETHER_ADDR_LEN);
+ }
}
-static bool check_dev_role_integrity(struct bcm_cfg80211 *cfg, u32 dev_role)
+static bool check_dev_role_integrity(struct bcm_cfg80211 *cfg, s32 mode, 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)))
+ if (((dev_role == NL80211_IFTYPE_AP) || (dev_role == NL80211_IFTYPE_P2P_GO)) &&
+ (mode != WL_MODE_AP))
{
WL_ERR(("device role select failed role:%d op_mode:%d \n", dev_role, dhd->op_mode));
return false;
@@ -14928,113 +21989,89 @@
}
#endif /* WL_SUPPORT_BACKPORTED_PATCHES || KERNEL >= 3.2.0 */
-#ifdef WL11U
-bcm_tlv_t *
-wl_cfg80211_find_interworking_ie(u8 *parse, u32 len)
+#ifdef WL_HOST_BAND_MGMT
+s32
+wl_cfg80211_set_band(struct net_device *ndev, int band)
{
- bcm_tlv_t *ie;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ int ret = 0;
+ char ioctl_buf[50];
- while ((ie = bcm_parse_tlvs(parse, (u32)len, DOT11_MNG_INTERWORKING_ID))) {
- return (bcm_tlv_t *)ie;
+ if ((band < WLC_BAND_AUTO) || (band > WLC_BAND_2G)) {
+ WL_ERR(("Invalid band\n"));
+ return -EINVAL;
}
- return NULL;
+
+ if ((ret = wldev_iovar_setbuf(ndev, "roam_band", &band,
+ sizeof(int), ioctl_buf, sizeof(ioctl_buf), NULL)) < 0) {
+ WL_ERR(("seting roam_band failed code=%d\n", ret));
+ return ret;
+ }
+
+ WL_DBG(("Setting band to %d\n", band));
+ cfg->curr_band = band;
+
+ return 0;
}
+#endif /* WL_HOST_BAND_MGMT */
-
-static s32
-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
+wl_cfg80211_set_if_band(struct net_device *ndev, int band)
{
- s32 err = BCME_OK;
- s32 buf_len;
- s32 iecount;
- ie_setbuf_t *ie_setbuf;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ int ret = 0, wait_cnt;
+ char ioctl_buf[32];
- if (ie_id != DOT11_MNG_INTERWORKING_ID)
- return BCME_UNSUPPORTED;
-
- /* Validate the pktflag parameter */
- if ((pktflag & ~(VNDR_IE_BEACON_FLAG | VNDR_IE_PRBRSP_FLAG |
- VNDR_IE_ASSOCRSP_FLAG | VNDR_IE_AUTHRSP_FLAG |
- VNDR_IE_PRBREQ_FLAG | VNDR_IE_ASSOCREQ_FLAG|
- VNDR_IE_CUSTOM_FLAG))) {
- WL_ERR(("cfg80211 Add IE: Invalid packet flag 0x%x\n", pktflag));
- return -1;
+ if ((band < WLC_BAND_AUTO) || (band > WLC_BAND_2G)) {
+ WL_ERR(("Invalid band\n"));
+ return -EINVAL;
}
-
- /* use VNDR_IE_CUSTOM_FLAG flags for none vendor IE . currently fixed value */
- pktflag = htod32(pktflag);
-
- buf_len = sizeof(ie_setbuf_t) + data_len - 1;
- ie_setbuf = (ie_setbuf_t *) kzalloc(buf_len, GFP_KERNEL);
-
- if (!ie_setbuf) {
- WL_ERR(("Error allocating buffer for IE\n"));
- return -ENOMEM;
+ if (wl_get_drv_status(cfg, CONNECTED, ndev)) {
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
+ BCM_REFERENCE(dhdp);
+ DHD_STATLOG_CTRL(dhdp, ST(DISASSOC_INT_START),
+ dhd_net2idx(dhdp->info, ndev), 0);
+ ret = wldev_ioctl_set(ndev, WLC_DISASSOC, NULL, 0);
+ if (ret < 0) {
+ WL_ERR(("WLC_DISASSOC error %d\n", ret));
+ /* continue to set 'if_band' */
+ }
+ else {
+ /* This is to ensure that 'if_band' iovar is issued only after
+ * disconnection is completed
+ */
+ wait_cnt = WAIT_FOR_DISCONNECT_MAX;
+ while (wl_get_drv_status(cfg, CONNECTED, ndev) && wait_cnt) {
+ WL_DBG(("Wait until disconnected. wait_cnt: %d\n", wait_cnt));
+ wait_cnt--;
+ OSL_SLEEP(50);
+ }
+ }
}
-
- 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;
+ if ((ret = wldev_iovar_setbuf(ndev, "if_band", &band,
+ sizeof(int), ioctl_buf, sizeof(ioctl_buf), NULL)) < 0) {
+ WL_ERR(("seting if_band failed ret=%d\n", ret));
+ /* issue 'WLC_SET_BAND' if if_band is not supported */
+ if (ret == BCME_UNSUPPORTED) {
+ ret = wldev_set_band(ndev, band);
+ if (ret < 0) {
+ WL_ERR(("seting band failed ret=%d\n", ret));
+ }
+ }
}
-
- strncpy(ie_setbuf->cmd, "add", VNDR_IE_CMD_LEN - 1);
- ie_setbuf->cmd[VNDR_IE_CMD_LEN - 1] = '\0';
-
- /* Buffer contains only 1 IE */
- iecount = htod32(1);
- memcpy((void *)&ie_setbuf->ie_buffer.iecount, &iecount, sizeof(int));
- memcpy((void *)&ie_setbuf->ie_buffer.ie_list[0].pktflag, &pktflag, sizeof(uint32));
-
- /* Now, add the IE to the buffer */
- ie_setbuf->ie_buffer.ie_list[0].ie_data.id = ie_id;
-
- /* if already set with previous values, delete it first */
- 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,
- cfg->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &cfg->ioctl_buf_sync);
-
- if (err != BCME_OK)
- goto exit;
- }
-
- ie_setbuf->ie_buffer.ie_list[0].ie_data.len = data_len;
- 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,
- cfg->ioctl_buf, WLC_IOCTL_MAXLEN, bssidx, &cfg->ioctl_buf_sync);
-
- if (err == BCME_OK) {
- 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);
- }
-
-exit:
- if (ie_setbuf)
- kfree(ie_setbuf);
- return err;
+ return ret;
}
-#endif /* WL11U */
s32
wl_cfg80211_dfs_ap_move(struct net_device *ndev, char *data, char *command, int total_len)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
- char ioctl_buf[50];
+ char ioctl_buf[WLC_IOCTL_SMLEN];
int err = 0;
uint32 val = 0;
chanspec_t chanspec = 0;
int abort;
int bytes_written = 0;
- wl_dfs_ap_move_status_t *status;
+ struct wl_dfs_ap_move_status_v2 *status;
char chanbuf[CHANSPEC_STR_LEN];
const char *dfs_state_str[DFS_SCAN_S_MAX] = {
"Radar Free On Channel",
@@ -15044,16 +22081,16 @@
"RSDB Mode switch in Progress For Scan"
};
if (ndev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP) {
- bytes_written = snprintf(command, total_len, "AP is not UP\n");
+ bytes_written = snprintf(command, total_len, "AP is not up\n");
return bytes_written;
}
if (!*data) {
if ((err = wldev_iovar_getbuf(ndev, "dfs_ap_move", NULL, 0,
- cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync))) {
+ ioctl_buf, sizeof(ioctl_buf), NULL))) {
WL_ERR(("setting dfs_ap_move failed with err=%d \n", err));
return err;
}
- status = (wl_dfs_ap_move_status_t *)cfg->ioctl_buf;
+ status = (struct wl_dfs_ap_move_status_v2 *)ioctl_buf;
if (status->version != WL_DFS_AP_MOVE_VERSION) {
err = BCME_UNSUPPORTED;
@@ -15068,14 +22105,14 @@
bytes_written = snprintf(command, total_len,
"AP Target Chanspec %s (0x%x)\n", chanbuf, chanspec);
}
- bytes_written += snprintf(command + bytes_written, total_len,
- "%s\n", dfs_state_str[status->move_status]);
+ bytes_written += snprintf(command + bytes_written,
+ total_len - bytes_written,
+ "%s\n", dfs_state_str[status->move_status]);
return bytes_written;
} else {
bytes_written = snprintf(command, total_len, "dfs AP move in IDLE state\n");
return bytes_written;
}
-
}
abort = bcm_atoi(data);
@@ -15104,478 +22141,48 @@
return err;
}
-s32
-wl_cfg80211_wbtext_config(struct net_device *ndev, char *data, char *command, int total_len)
+bool wl_cfg80211_is_concurrent_mode(struct net_device *dev)
{
- uint i = 0;
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
- wl_roam_prof_band_t *rp;
- int err = -EINVAL, bytes_written = 0;
- size_t len = strlen(data);
- data[len] = '\0';
-
- rp = (wl_roam_prof_band_t *) kzalloc(sizeof(*rp)
- * WL_MAX_ROAM_PROF_BRACKETS, GFP_KERNEL);
- if (unlikely(!rp)) {
- WL_ERR(("%s: failed to allocate memory\n", __func__));
- err = -ENOMEM;
- goto exit;
- }
-
- rp->ver = WL_MAX_ROAM_PROF_VER;
- if (*data && (!strncmp(data, "b", 1))) {
- rp->band = WLC_BAND_2G;
- } else if (*data && (!strncmp(data, "a", 1))) {
- rp->band = WLC_BAND_5G;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ if ((cfg) && (wl_get_drv_status_all(cfg, CONNECTED) > 1)) {
+ return true;
} else {
- err = snprintf(command, total_len, "Missing band\n");
- goto exit;
+ return false;
}
- rp->len = 0;
- data++;
- if (!*data) {
- /* Getting roam profile from fw */
- if ((err = wldev_iovar_getbuf(ndev, "roam_prof", rp, sizeof(*rp),
- cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync))) {
- WL_ERR(("Getting roam_profile failed with err=%d \n", err));
- goto exit;
- }
- memcpy(rp, cfg->ioctl_buf, sizeof(*rp) * WL_MAX_ROAM_PROF_BRACKETS);
- /* roam_prof version get */
- if (rp->ver != WL_MAX_ROAM_PROF_VER) {
- WL_ERR(("bad version (=%d) in return data\n", rp->ver));
- err = -EINVAL;
- goto exit;
- }
- if ((rp->len % sizeof(wl_roam_prof_t)) != 0) {
- WL_ERR(("bad length (=%d) in return data\n", rp->len));
- err = -EINVAL;
- goto exit;
- }
- for (i = 0; i < WL_MAX_ROAM_PROF_BRACKETS; i++) {
- /* printing contents of roam profile data from fw and exits
- * if code hits any of one of the below condtion.
- */
- if (((i * sizeof(wl_roam_prof_t)) > rp->len) ||
- (rp->roam_prof[i].fullscan_period == 0)) {
- break;
- }
-
- bytes_written += snprintf(command+bytes_written,
- total_len, "RSSI[%d,%d] CU(trigger:%d%%: duration:%ds)\n",
- rp->roam_prof[i].roam_trigger, rp->roam_prof[i].rssi_lower,
- rp->roam_prof[i].channel_usage,
- rp->roam_prof[i].cu_avg_calc_dur);
- }
- err = bytes_written;
- goto exit;
- } else {
- /* setting roam profile to fw */
- data++;
- memset(rp->roam_prof, 0, sizeof(wl_roam_prof_t) * WL_MAX_ROAM_PROF_BRACKETS);
- for (i = 0; i < WL_MAX_ROAM_PROF_BRACKETS; i++) {
- rp->roam_prof[i].roam_trigger = simple_strtol(data, &data, 10);
- data++;
- rp->roam_prof[i].rssi_lower = simple_strtol(data, &data, 10);
- data++;
- rp->roam_prof[i].channel_usage = simple_strtol(data, &data, 10);
- data++;
- rp->roam_prof[i].cu_avg_calc_dur = simple_strtol(data, &data, 10);
- /* filling rows */
- rp->roam_prof[i].roam_flags = WL_ROAM_PROF_DEFAULT;
- rp->roam_prof[i].rssi_boost_thresh = WL_JOIN_PREF_RSSI_BOOST_MIN;
- rp->roam_prof[i].rssi_boost_delta = 0;
- rp->roam_prof[i].nfscan = WL_ROAM_FULLSCAN_NTIMES;
- rp->roam_prof[i].fullscan_period = WL_FULLROAM_PERIOD;
- rp->roam_prof[i].init_scan_period = WL_ROAM_SCAN_PERIOD;
- rp->roam_prof[i].backoff_multiplier = 1;
- rp->roam_prof[i].max_scan_period = WL_ROAM_SCAN_PERIOD;
- if (rp->band == WLC_BAND_2G)
- rp->roam_prof[i].roam_delta = WL_ROAM_DELTA_2G;
- else
- rp->roam_prof[i].roam_delta = WL_ROAM_DELTA_5G;
-
- /* update roam_delta to default score for cu enabled roam profile entry */
- if (rp->roam_prof[i].channel_usage != 0) {
- rp->roam_prof[i].roam_delta = WL_SCORE_DELTA_DEFAULT;
- }
-
- rp->len += sizeof(wl_roam_prof_t);
-
- if (*data == '\0') {
- break;
- }
- data++;
- }
- if ((err = wldev_iovar_setbuf(ndev, "roam_prof", rp,
- 8 + rp->len, cfg->ioctl_buf, WLC_IOCTL_MEDLEN, NULL)) < 0) {
- WL_ERR(("seting roam_profile failed with err %d\n", err));
- }
- }
-exit:
- if (rp) {
- kfree(rp);
- }
- return err;
}
-int wl_cfg80211_wbtext_weight_config(struct net_device *ndev, char *data,
- char *command, int total_len)
+void* wl_cfg80211_get_dhdp(struct net_device *dev)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
- int bytes_written = 0, err = -EINVAL, argc = 0;
- char rssi[5], band[5], weight[5];
- char *endptr = NULL;
- wnm_bss_select_weight_cfg_t *bwcfg;
-
- bwcfg = kzalloc(sizeof(*bwcfg), GFP_KERNEL);
- if (unlikely(!bwcfg)) {
- WL_ERR(("%s: failed to allocate memory\n", __func__));
- err = -ENOMEM;
- goto exit;
- }
- bwcfg->version = WNM_BSSLOAD_MONITOR_VERSION;
- bwcfg->type = 0;
- bwcfg->weight = 0;
-
- argc = sscanf(data, "%s %s %s", rssi, band, weight);
-
- if (!strcasecmp(rssi, "rssi"))
- bwcfg->type = WNM_BSS_SELECT_TYPE_RSSI;
- else if (!strcasecmp(rssi, "cu"))
- bwcfg->type = WNM_BSS_SELECT_TYPE_CU;
- else {
- /* Usage DRIVER WBTEXT_WEIGHT_CONFIG <rssi/cu> <band> <weight> */
- WL_ERR(("%s: Command usage error\n", __func__));
- goto exit;
- }
-
- if (!strcasecmp(band, "a"))
- bwcfg->band = WLC_BAND_5G;
- else if (!strcasecmp(band, "b"))
- bwcfg->band = WLC_BAND_2G;
- else if (!strcasecmp(band, "all"))
- bwcfg->band = WLC_BAND_ALL;
- else {
- WL_ERR(("%s: Command usage error\n", __func__));
- goto exit;
- }
-
- if (argc == 2) {
- /* If there is no data after band, getting wnm_bss_select_weight from fw */
- if (bwcfg->band == WLC_BAND_ALL) {
- WL_ERR(("band option \"all\" is for set only, not get\n"));
- goto exit;
- }
- if ((err = wldev_iovar_getbuf(ndev, "wnm_bss_select_weight", bwcfg,
- sizeof(*bwcfg),
- cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync))) {
- WL_ERR(("Getting wnm_bss_select_weight failed with err=%d \n", err));
- goto exit;
- }
- memcpy(bwcfg, cfg->ioctl_buf, sizeof(*bwcfg));
- bytes_written = snprintf(command, total_len, "%s %s weight = %d\n",
- (bwcfg->type == WNM_BSS_SELECT_TYPE_RSSI) ? "RSSI" : "CU",
- (bwcfg->band == WLC_BAND_2G) ? "2G" : "5G", bwcfg->weight);
- err = bytes_written;
- goto exit;
- } else {
- /* if weight is non integer returns command usage error */
- bwcfg->weight = simple_strtol(weight, &endptr, 0);
- if (*endptr != '\0') {
- WL_ERR(("%s: Command usage error", __func__));
- goto exit;
- }
- /* setting weight for iovar wnm_bss_select_weight to fw */
- if ((err = wldev_iovar_setbuf(ndev, "wnm_bss_select_weight", bwcfg,
- sizeof(*bwcfg),
- cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync))) {
- WL_ERR(("Getting wnm_bss_select_weight failed with err=%d\n", err));
- }
- }
-exit:
- if (bwcfg) {
- kfree(bwcfg);
- }
- return err;
-}
-
-/* WBTEXT_TUPLE_MIN_LEN_CHECK :strlen(low)+" "+strlen(high)+" "+strlen(factor) */
-#define WBTEXT_TUPLE_MIN_LEN_CHECK 5
-
-int wl_cfg80211_wbtext_table_config(struct net_device *ndev, char *data,
- char *command, int total_len)
-{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
- int bytes_written = 0, err = -EINVAL;
- char rssi[5], band[5];
- int btcfg_len = 0, i = 0, parsed_len = 0;
- wnm_bss_select_factor_cfg_t *btcfg;
- size_t slen = strlen(data);
- char *start_addr = NULL;
- data[slen] = '\0';
-
- btcfg = kzalloc((sizeof(*btcfg) + sizeof(*btcfg) *
- WL_FACTOR_TABLE_MAX_LIMIT), GFP_KERNEL);
- if (unlikely(!btcfg)) {
- WL_ERR(("%s: failed to allocate memory\n", __func__));
- err = -ENOMEM;
- goto exit;
- }
-
- btcfg->version = WNM_BSS_SELECT_FACTOR_VERSION;
- btcfg->band = WLC_BAND_AUTO;
- btcfg->type = 0;
- btcfg->count = 0;
-
- sscanf(data, "%s %s", rssi, band);
-
- if (!strcasecmp(rssi, "rssi")) {
- btcfg->type = WNM_BSS_SELECT_TYPE_RSSI;
- }
- else if (!strcasecmp(rssi, "cu")) {
- btcfg->type = WNM_BSS_SELECT_TYPE_CU;
- }
- else {
- WL_ERR(("%s: Command usage error\n", __func__));
- goto exit;
- }
-
- if (!strcasecmp(band, "a")) {
- btcfg->band = WLC_BAND_5G;
- }
- else if (!strcasecmp(band, "b")) {
- btcfg->band = WLC_BAND_2G;
- }
- else if (!strcasecmp(band, "all")) {
- btcfg->band = WLC_BAND_ALL;
- }
- else {
- WL_ERR(("%s: Command usage, Wrong band\n", __func__));
- goto exit;
- }
-
- if ((slen - 1) == (strlen(rssi) + strlen(band))) {
- /* Getting factor table using iovar 'wnm_bss_select_table' from fw */
- if ((err = wldev_iovar_getbuf(ndev, "wnm_bss_select_table", btcfg,
- sizeof(*btcfg),
- cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync))) {
- WL_ERR(("Getting wnm_bss_select_table failed with err=%d \n", err));
- goto exit;
- }
- memcpy(btcfg, cfg->ioctl_buf, sizeof(*btcfg));
- memcpy(btcfg, cfg->ioctl_buf, (btcfg->count+1) * sizeof(*btcfg));
-
- bytes_written += snprintf(command + bytes_written, total_len,
- "No of entries in table: %d\n", btcfg->count);
- bytes_written += snprintf(command + bytes_written, total_len, "%s factor table\n",
- (btcfg->type == WNM_BSS_SELECT_TYPE_RSSI) ? "RSSI" : "CU");
- bytes_written += snprintf(command + bytes_written, total_len,
- "low\thigh\tfactor\n");
- for (i = 0; i <= btcfg->count-1; i++) {
- bytes_written += snprintf(command + bytes_written, total_len,
- "%d\t%d\t%d\n", btcfg->params[i].low, btcfg->params[i].high,
- btcfg->params[i].factor);
- }
- err = bytes_written;
- goto exit;
- } else {
- memset(btcfg->params, 0, sizeof(*btcfg) * WL_FACTOR_TABLE_MAX_LIMIT);
- data += (strlen(rssi) + strlen(band) + 2);
- start_addr = data;
- slen = slen - (strlen(rssi) + strlen(band) + 2);
- for (i = 0; i < WL_FACTOR_TABLE_MAX_LIMIT; i++) {
- if (parsed_len + WBTEXT_TUPLE_MIN_LEN_CHECK <= slen) {
- btcfg->params[i].low = simple_strtol(data, &data, 10);
- data++;
- btcfg->params[i].high = simple_strtol(data, &data, 10);
- data++;
- btcfg->params[i].factor = simple_strtol(data, &data, 10);
- btcfg->count++;
- if (*data == '\0') {
- break;
- }
- data++;
- parsed_len = data - start_addr;
- } else {
- WL_ERR(("%s:Command usage:less no of args\n", __func__));
- goto exit;
- }
- }
- btcfg_len = sizeof(*btcfg) + ((btcfg->count) * sizeof(*btcfg));
- if ((err = wldev_iovar_setbuf(ndev, "wnm_bss_select_table", btcfg, btcfg_len,
- cfg->ioctl_buf, WLC_IOCTL_MEDLEN, NULL)) < 0) {
- WL_ERR(("seting wnm_bss_select_table failed with err %d\n", err));
- goto exit;
- }
- }
-exit:
- if (btcfg) {
- kfree(btcfg);
- }
- return err;
-}
-
-s32
-wl_cfg80211_wbtext_delta_config(struct net_device *ndev, char *data, char *command, int total_len)
-{
- uint i = 0;
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
- int err = -EINVAL, bytes_written = 0, argc = 0, val, len = 0;
- char delta[5], band[5], *endptr = NULL;
- wl_roam_prof_band_t *rp;
-
- rp = (wl_roam_prof_band_t *) kzalloc(sizeof(*rp)
- * WL_MAX_ROAM_PROF_BRACKETS, GFP_KERNEL);
- if (unlikely(!rp)) {
- WL_ERR(("%s: failed to allocate memory\n", __func__));
- err = -ENOMEM;
- goto exit;
- }
-
- argc = sscanf(data, "%s %s", band, delta);
- if (argc == 2) {
- if (!strcasecmp(band, "a"))
- rp->band = WLC_BAND_5G;
- else if (!strcasecmp(band, "b"))
- rp->band = WLC_BAND_2G;
- else {
- WL_ERR(("%s: Missing band\n", __func__));
- goto exit;
- }
- /* if delta is non integer returns command usage error */
- val = simple_strtol(delta, &endptr, 0);
- if (*endptr != '\0') {
- WL_ERR(("%s: Command usage error", __func__));
- goto exit;
- }
- /* Getting roam profile from fw */
- if ((err = wldev_iovar_getbuf(ndev, "roam_prof", rp, sizeof(*rp),
- cfg->ioctl_buf, WLC_IOCTL_MAXLEN, &cfg->ioctl_buf_sync))) {
- WL_ERR(("Getting roam_profile failed with err=%d \n", err));
- goto exit;
- }
- memcpy(rp, cfg->ioctl_buf, sizeof(wl_roam_prof_band_t));
- if (rp->ver != WL_MAX_ROAM_PROF_VER) {
- WL_ERR(("bad version (=%d) in return data\n", rp->ver));
- err = -EINVAL;
- goto exit;
- }
- if ((rp->len % sizeof(wl_roam_prof_t)) != 0) {
- WL_ERR(("bad length (=%d) in return data\n", rp->len));
- err = -EINVAL;
- goto exit;
- }
- for (i = 0; i < WL_MAX_ROAM_PROF_BRACKETS; i++) {
- /* printing contents of roam profile data from fw and exits
- * if code hits below condtion.
- */
- if (((i * sizeof(wl_roam_prof_t)) > rp->len) ||
- (rp->roam_prof[i].fullscan_period == 0)) {
- break;
- }
- if (rp->roam_prof[i].channel_usage != 0) {
- rp->roam_prof[i].roam_delta = val;
- }
- len += sizeof(wl_roam_prof_t);
- }
- }
- else {
- bytes_written = snprintf(command, total_len, "Usage error, less args\n");
- err = bytes_written;
- goto exit;
- }
- rp->len = len;
- if ((err = wldev_iovar_setbuf(ndev, "roam_prof", rp,
- sizeof(*rp), cfg->ioctl_buf, WLC_IOCTL_MEDLEN, NULL)) < 0) {
- WL_ERR(("seting roam_profile failed with err %d\n", err));
- }
-exit :
- if (rp) {
- kfree(rp);
- }
- return err;
-}
-
-
-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
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 8, 0))
- struct cfg80211_scan_info info = { .aborted = true };
- cfg80211_scan_done(cfg->scan_request, &info);
-#else
- cfg80211_scan_done(cfg->scan_request, true);
-#endif
- 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;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
return cfg->pub;
}
-bool wl_cfg80211_is_p2p_active(void)
+bool wl_cfg80211_is_p2p_active(struct net_device *dev)
{
- return (g_bcm_cfg && g_bcm_cfg->p2p);
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ return (cfg && cfg->p2p);
}
-bool wl_cfg80211_is_roam_offload(void)
+bool wl_cfg80211_is_roam_offload(struct net_device * dev)
{
- return (g_bcm_cfg && g_bcm_cfg->roam_offload);
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ return (cfg && cfg->roam_offload);
}
-bool wl_cfg80211_is_event_from_connected_bssid(const wl_event_msg_t *e, int ifidx)
+bool wl_cfg80211_is_event_from_connected_bssid(struct net_device * dev, const wl_event_msg_t *e,
+ int ifidx)
{
- dhd_pub_t *dhd = NULL;
- struct net_device *ndev = NULL;
u8 *curbssid = NULL;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
- dhd = (dhd_pub_t *)(g_bcm_cfg->pub);
-
- if (dhd) {
- ndev = dhd_idx2net(dhd, ifidx);
+ if (!cfg) {
+ /* When interface is created using wl
+ * ndev->ieee80211_ptr will be NULL.
+ */
+ return NULL;
}
-
- if (!dhd || !ndev) {
- return false;
- }
-
- curbssid = wl_read_prof(g_bcm_cfg, ndev, WL_PROF_BSSID);
+ curbssid = wl_read_prof(cfg, dev, WL_PROF_BSSID);
if (memcmp(curbssid, &e->addr, ETHER_ADDR_LEN) == 0) {
return true;
@@ -15591,40 +22198,46 @@
s32 pm = PM_FAST;
BCM_SET_CONTAINER_OF(cfg, work, struct bcm_cfg80211, pm_enable_work.work);
WL_DBG(("Enter \n"));
- if (cfg->pm_enable_work_on) {
- cfg->pm_enable_work_on = false;
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#endif
- for_each_ndev(cfg, iter, next) {
- /* p2p discovery iface ndev could be null */
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+ for_each_ndev(cfg, iter, next) {
+ GCC_DIAGNOSTIC_POP();
+ /* p2p discovery iface ndev could be null */
+ if (iter->ndev) {
+ if (!wl_get_drv_status(cfg, CONNECTED, iter->ndev) ||
+ (wl_get_mode_by_netdev(cfg, iter->ndev) != WL_MODE_BSS &&
+ wl_get_mode_by_netdev(cfg, iter->ndev) != WL_MODE_IBSS))
+ continue;
if (iter->ndev) {
- if (!wl_get_drv_status(cfg, CONNECTED, iter->ndev) ||
- (wl_get_mode_by_netdev(cfg, iter->ndev) != WL_MODE_BSS &&
- wl_get_mode_by_netdev(cfg, iter->ndev) != WL_MODE_IBSS))
- 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);
- }
+ if ((err = wldev_ioctl_set(iter->ndev, WLC_SET_PM,
+ &pm, sizeof(pm))) != 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);
}
}
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic pop")
-#endif
}
+#if defined(OEM_ANDROID)
+ DHD_PM_WAKE_UNLOCK(cfg->pub);
+#endif /* BCMDONGLEHOST && OEM_ANDROID */
}
+
+#ifdef ENABLE_HOGSQS
+static void wl_cfg80211_hogsqs_event_handler(struct work_struct *work)
+{
+ struct bcm_cfg80211 *cfg = NULL;
+ struct net_device *ndev = NULL;
+ BCM_SET_CONTAINER_OF(cfg, work, struct bcm_cfg80211,
+ hogsqs_eventwork.work);
+
+ ndev = bcmcfg_to_prmry_ndev(cfg);
+ wl_add_remove_eventextmsg(ndev, WLC_E_LDF_HOGGER, true);
+}
+#endif // endif
u8
wl_get_action_category(void *frame, u32 frame_len)
@@ -15636,7 +22249,7 @@
if (frame_len < DOT11_ACTION_HDR_LEN)
return DOT11_ACTION_CAT_ERR_MASK;
category = ptr[DOT11_ACTION_CAT_OFF];
- WL_INFORM(("Action Category: %d\n", category));
+ WL_DBG(("Action Category: %d\n", category));
return category;
}
@@ -15651,15 +22264,31 @@
if (DOT11_ACTION_CAT_PUBLIC != wl_get_action_category(frame, frame_len))
return BCME_ERROR;
*ret_action = ptr[DOT11_ACTION_ACT_OFF];
- WL_INFORM(("Public Action : %d\n", *ret_action));
+ WL_DBG(("Public Action : %d\n", *ret_action));
return BCME_OK;
}
#ifdef WLFBT
-void
-wl_cfg80211_get_fbt_key(uint8 *key)
+int
+wl_cfg80211_get_fbt_key(struct net_device *dev, uint8 *key, int total_len)
{
- memcpy(key, g_bcm_cfg->fbt_key, FBT_KEYLEN);
+ struct bcm_cfg80211 * cfg = wl_get_cfg(dev);
+ int bytes_written = -1;
+
+ if (total_len < FBT_KEYLEN) {
+ WL_ERR(("wl_cfg80211_get_fbt_key: Insufficient buffer \n"));
+ goto end;
+ }
+ if (cfg) {
+ memcpy(key, cfg->fbt_key, FBT_KEYLEN);
+ bytes_written = FBT_KEYLEN;
+ } else {
+ bzero(key, FBT_KEYLEN);
+ WL_ERR(("wl_cfg80211_get_fbt_key: Failed to copy KCK and KEK \n"));
+ }
+ prhex("KCK, KEK", (uchar *)key, FBT_KEYLEN);
+end:
+ return bytes_written;
}
#endif /* WLFBT */
@@ -15671,63 +22300,91 @@
wl_event_msg_t e;
bzero(&e, sizeof(e));
- e.event_type = cpu_to_be32(WLC_E_BSSID);
+ e.event_type = cpu_to_be32(WLC_E_ROAM);
memcpy(&e.addr, bssid, ETHER_ADDR_LEN);
/* trigger the roam event handler */
- WL_INFORM(("Delayed roam to " MACDBG "\n", MAC2STRDBG((u8*)(bssid))));
err = wl_notify_roaming_status(cfg, ndev_to_cfgdev(ndev), &e, NULL);
return err;
}
static s32
-wl_cfg80211_parse_vndr_ies(u8 *parse, u32 len,
+wl_cfg80211_parse_vndr_ies(const u8 *parse, u32 len,
struct parsed_vndr_ies *vndr_ies)
{
s32 err = BCME_OK;
- vndr_ie_t *vndrie;
- bcm_tlv_t *ie;
+ const vndr_ie_t *vndrie;
+ const bcm_tlv_t *ie;
struct parsed_vndr_ie_info *parsed_info;
u32 count = 0;
- s32 remained_len;
+ u32 remained_len;
- remained_len = (s32)len;
- memset(vndr_ies, 0, sizeof(*vndr_ies));
+ remained_len = len;
+ bzero(vndr_ies, sizeof(*vndr_ies));
- WL_INFORM(("---> len %d\n", len));
- ie = (bcm_tlv_t *) parse;
+ WL_DBG(("---> len %d\n", len));
+ ie = (const bcm_tlv_t *) parse;
if (!bcm_valid_tlv(ie, remained_len))
ie = NULL;
while (ie) {
if (count >= MAX_VNDR_IE_NUMBER)
break;
- if (ie->id == DOT11_MNG_VS_ID) {
- vndrie = (vndr_ie_t *) ie;
- /* len should be bigger than OUI length + one data length at least */
- if (vndrie->len < (VNDR_IE_MIN_LEN + 1)) {
- WL_ERR(("%s: invalid vndr ie. length is too small %d\n",
- __FUNCTION__, vndrie->len));
- goto end;
- }
- /* if wpa or wme ie, do not add ie */
- if (!bcmp(vndrie->oui, (u8*)WPA_OUI, WPA_OUI_LEN) &&
- ((vndrie->data[0] == WPA_OUI_TYPE) ||
- (vndrie->data[0] == WME_OUI_TYPE))) {
- CFGP2P_DBG(("Found WPA/WME oui. Do not add it\n"));
- goto end;
+ if (ie->id == DOT11_MNG_VS_ID || (ie->id == DOT11_MNG_ID_EXT_ID)) {
+ vndrie = (const vndr_ie_t *) ie;
+ if (ie->id == DOT11_MNG_ID_EXT_ID) {
+ /* len should be bigger than sizeof ID extn field at least */
+ if (vndrie->len < MIN_VENDOR_EXTN_IE_LEN) {
+ WL_ERR(("%s: invalid vndr extn ie."
+ " length %d\n",
+ __FUNCTION__, vndrie->len));
+ goto end;
+ }
+
+ /*
+ * skip parsing the HE capab & oper IE from upper layer
+ * to avoid sending it to the FW, as these IEs will be
+ * added by the FW based on the MAC & PHY capab if HE
+ * is enabled.
+ */
+ if ((ie->data[0] == EXT_MNG_HE_CAP_ID) ||
+ (ie->data[0] == EXT_MNG_HE_OP_ID)) {
+ goto end;
+ }
+ } else {
+ /* len should be bigger than OUI length +
+ * one data length at least
+ */
+ if (vndrie->len < (VNDR_IE_MIN_LEN + 1)) {
+ WL_ERR(("wl_cfg80211_parse_vndr_ies:"
+ " invalid vndr ie. length is too small %d\n",
+ vndrie->len));
+ goto end;
+ }
+
+ /* if wpa or wme ie, do not add ie */
+ if (!bcmp(vndrie->oui, (u8*)WPA_OUI, WPA_OUI_LEN) &&
+ ((vndrie->data[0] == WPA_OUI_TYPE) ||
+ (vndrie->data[0] == WME_OUI_TYPE))) {
+ CFGP2P_DBG(("Found WPA/WME oui. Do not add it\n"));
+ goto end;
+ }
}
parsed_info = &vndr_ies->ie_info[count++];
/* save vndr ie information */
- parsed_info->ie_ptr = (char *)vndrie;
+ parsed_info->ie_ptr = (const char *)vndrie;
parsed_info->ie_len = (vndrie->len + TLV_HDR_LEN);
memcpy(&parsed_info->vndrie, vndrie, sizeof(vndr_ie_t));
vndr_ies->count = count;
-
- WL_DBG(("\t ** OUI %02x %02x %02x, type 0x%02x \n",
- parsed_info->vndrie.oui[0], parsed_info->vndrie.oui[1],
- parsed_info->vndrie.oui[2], parsed_info->vndrie.data[0]));
+ if (ie->id == DOT11_MNG_ID_EXT_ID) {
+ WL_DBG(("\t ** Vendor Extension ie id: 0x%02x, len:%d\n",
+ ie->id, parsed_info->ie_len));
+ } else {
+ WL_DBG(("\t ** OUI "MACOUIDBG", type 0x%02x len:%d\n",
+ MACOUI2STRDBG(parsed_info->vndrie.oui),
+ parsed_info->vndrie.data[0], parsed_info->ie_len));
+ }
}
end:
ie = bcm_next_tlv(ie, &remained_len);
@@ -15735,26 +22392,204 @@
return err;
}
+static bool
+wl_vndr_ies_exclude_vndr_oui(struct parsed_vndr_ie_info *vndr_info)
+{
+ int i = 0;
+
+ while (exclude_vndr_oui_list[i]) {
+ if (!memcmp(vndr_info->vndrie.oui,
+ exclude_vndr_oui_list[i],
+ DOT11_OUI_LEN)) {
+ return TRUE;
+ }
+ i++;
+ }
+
+ return FALSE;
+}
+
+static bool
+wl_vndr_ies_check_duplicate_vndr_oui(struct bcm_cfg80211 *cfg,
+ struct parsed_vndr_ie_info *vndr_info)
+{
+ wl_vndr_oui_entry_t *oui_entry = NULL;
+ unsigned long flags;
+
+ WL_CFG_VNDR_OUI_SYNC_LOCK(&cfg->vndr_oui_sync, flags);
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+ list_for_each_entry(oui_entry, &cfg->vndr_oui_list, list) {
+ GCC_DIAGNOSTIC_POP();
+ if (!memcmp(oui_entry->oui, vndr_info->vndrie.oui, DOT11_OUI_LEN)) {
+ WL_CFG_VNDR_OUI_SYNC_UNLOCK(&cfg->vndr_oui_sync, flags);
+ return TRUE;
+ }
+ }
+ WL_CFG_VNDR_OUI_SYNC_UNLOCK(&cfg->vndr_oui_sync, flags);
+ return FALSE;
+}
+
+static bool
+wl_vndr_ies_add_vendor_oui_list(struct bcm_cfg80211 *cfg,
+ struct parsed_vndr_ie_info *vndr_info)
+{
+ wl_vndr_oui_entry_t *oui_entry = NULL;
+ unsigned long flags;
+
+ oui_entry = kmalloc(sizeof(*oui_entry), GFP_KERNEL);
+ if (oui_entry == NULL) {
+ WL_ERR(("alloc failed\n"));
+ return FALSE;
+ }
+
+ memcpy(oui_entry->oui, vndr_info->vndrie.oui, DOT11_OUI_LEN);
+
+ INIT_LIST_HEAD(&oui_entry->list);
+ WL_CFG_VNDR_OUI_SYNC_LOCK(&cfg->vndr_oui_sync, flags);
+ list_add_tail(&oui_entry->list, &cfg->vndr_oui_list);
+ WL_CFG_VNDR_OUI_SYNC_UNLOCK(&cfg->vndr_oui_sync, flags);
+
+ return TRUE;
+}
+
+static void
+wl_vndr_ies_clear_vendor_oui_list(struct bcm_cfg80211 *cfg)
+{
+ wl_vndr_oui_entry_t *oui_entry = NULL;
+ unsigned long flags;
+
+ WL_CFG_VNDR_OUI_SYNC_LOCK(&cfg->vndr_oui_sync, flags);
+ while (!list_empty(&cfg->vndr_oui_list)) {
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+ oui_entry = list_entry(cfg->vndr_oui_list.next, wl_vndr_oui_entry_t, list);
+ GCC_DIAGNOSTIC_POP();
+ if (oui_entry) {
+ list_del(&oui_entry->list);
+ kfree(oui_entry);
+ }
+ }
+ WL_CFG_VNDR_OUI_SYNC_UNLOCK(&cfg->vndr_oui_sync, flags);
+}
+
+static int
+wl_vndr_ies_get_vendor_oui(struct bcm_cfg80211 *cfg, struct net_device *ndev,
+ char *vndr_oui, u32 vndr_oui_len)
+{
+ int i;
+ int vndr_oui_num = 0;
+
+ struct wl_connect_info *conn_info = wl_to_conn(cfg);
+ wl_vndr_oui_entry_t *oui_entry = NULL;
+ struct parsed_vndr_ie_info *vndr_info;
+ struct parsed_vndr_ies vndr_ies;
+
+ char *pos = vndr_oui;
+ u32 remained_buf_len = vndr_oui_len;
+ unsigned long flags;
+
+ if (!conn_info->resp_ie_len) {
+ return BCME_ERROR;
+ }
+
+ wl_vndr_ies_clear_vendor_oui_list(cfg);
+
+ if ((wl_cfg80211_parse_vndr_ies((u8 *)conn_info->resp_ie,
+ conn_info->resp_ie_len, &vndr_ies)) == BCME_OK) {
+ for (i = 0; i < vndr_ies.count; i++) {
+ vndr_info = &vndr_ies.ie_info[i];
+ if (wl_vndr_ies_exclude_vndr_oui(vndr_info)) {
+ continue;
+ }
+
+ if (wl_vndr_ies_check_duplicate_vndr_oui(cfg, vndr_info)) {
+ continue;
+ }
+
+ wl_vndr_ies_add_vendor_oui_list(cfg, vndr_info);
+ vndr_oui_num++;
+ }
+ }
+
+ if (vndr_oui) {
+ WL_CFG_VNDR_OUI_SYNC_LOCK(&cfg->vndr_oui_sync, flags);
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+ list_for_each_entry(oui_entry, &cfg->vndr_oui_list, list) {
+ GCC_DIAGNOSTIC_POP();
+ if (remained_buf_len < VNDR_OUI_STR_LEN) {
+ WL_CFG_VNDR_OUI_SYNC_UNLOCK(&cfg->vndr_oui_sync, flags);
+ return BCME_ERROR;
+ }
+ pos += snprintf(pos, VNDR_OUI_STR_LEN, "%02X-%02X-%02X ",
+ oui_entry->oui[0], oui_entry->oui[1], oui_entry->oui[2]);
+ remained_buf_len -= VNDR_OUI_STR_LEN;
+ }
+ WL_CFG_VNDR_OUI_SYNC_UNLOCK(&cfg->vndr_oui_sync, flags);
+ }
+
+ return vndr_oui_num;
+}
+
+void
+wl_cfg80211_clear_p2p_disc_ies(struct bcm_cfg80211 *cfg)
+{
+ /* Legacy P2P used to store it in primary dev cache */
+ s32 index;
+ struct net_device *ndev;
+ s32 bssidx;
+ s32 ret;
+ s32 vndrie_flag[] = {VNDR_IE_BEACON_FLAG, VNDR_IE_PRBRSP_FLAG,
+ VNDR_IE_ASSOCRSP_FLAG, VNDR_IE_PRBREQ_FLAG, VNDR_IE_ASSOCREQ_FLAG};
+
+ WL_DBG(("Clear IEs for P2P Discovery Iface \n"));
+ /* certain vendors uses p2p0 interface in addition to
+ * the dedicated p2p interface supported by the linux
+ * kernel.
+ */
+ ndev = wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_PRIMARY);
+ bssidx = wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_DEVICE);
+ if (bssidx == WL_INVALID) {
+ WL_DBG(("No discovery I/F available. Do nothing.\n"));
+ return;
+ }
+
+ for (index = 0; index < ARRAYSIZE(vndrie_flag); index++) {
+ if ((ret = wl_cfg80211_set_mgmt_vndr_ies(cfg, ndev_to_cfgdev(ndev),
+ bssidx, vndrie_flag[index], NULL, 0)) < 0) {
+ if (ret != BCME_NOTFOUND) {
+ WL_ERR(("vndr_ies clear failed (%d). Ignoring.. \n", ret));
+ }
+ }
+ }
+
+ if (cfg->p2p_wdev && (ndev->ieee80211_ptr != cfg->p2p_wdev)) {
+ /* clear IEs for dedicated p2p interface */
+ wl_cfg80211_clear_per_bss_ies(cfg, cfg->p2p_wdev);
+ }
+}
+
s32
-wl_cfg80211_clear_per_bss_ies(struct bcm_cfg80211 *cfg, s32 bssidx)
+wl_cfg80211_clear_per_bss_ies(struct bcm_cfg80211 *cfg, struct wireless_dev *wdev)
{
s32 index;
+ s32 ret;
struct net_info *netinfo;
s32 vndrie_flag[] = {VNDR_IE_BEACON_FLAG, VNDR_IE_PRBRSP_FLAG,
VNDR_IE_ASSOCRSP_FLAG, VNDR_IE_PRBREQ_FLAG, VNDR_IE_ASSOCREQ_FLAG};
- netinfo = wl_get_netinfo_by_bssidx(cfg, bssidx);
+ netinfo = wl_get_netinfo_by_wdev(cfg, wdev);
if (!netinfo || !netinfo->wdev) {
WL_ERR(("netinfo or netinfo->wdev is NULL\n"));
return -1;
}
- WL_DBG(("clear management vendor IEs for bssidx:%d \n", bssidx));
+ WL_DBG(("clear management vendor IEs for bssidx:%d \n", netinfo->bssidx));
/* Clear the IEs set in the firmware so that host is in sync with firmware */
for (index = 0; index < ARRAYSIZE(vndrie_flag); index++) {
- if (wl_cfg80211_set_mgmt_vndr_ies(cfg, wdev_to_cfgdev(netinfo->wdev),
- bssidx, vndrie_flag[index], NULL, 0) < 0)
- WL_ERR(("vndr_ies clear failed. Ignoring.. \n"));
+ if ((ret = wl_cfg80211_set_mgmt_vndr_ies(cfg, wdev_to_cfgdev(netinfo->wdev),
+ netinfo->bssidx, vndrie_flag[index], NULL, 0)) < 0)
+ if (ret != BCME_NOTFOUND) {
+ WL_ERR(("vndr_ies clear failed. Ignoring.. \n"));
+ }
}
return 0;
@@ -15766,18 +22601,11 @@
struct net_info *iter, *next;
WL_DBG(("clear management vendor IEs \n"));
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#endif
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
for_each_ndev(cfg, iter, next) {
- wl_cfg80211_clear_per_bss_ies(cfg, iter->bssidx);
+ GCC_DIAGNOSTIC_POP();
+ wl_cfg80211_clear_per_bss_ies(cfg, iter->wdev);
}
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic pop")
-#endif
return 0;
}
@@ -15803,27 +22631,29 @@
s32 remained_buf_len;
wl_bss_vndr_ies_t *ies = NULL;
struct net_info *netinfo;
-
- WL_DBG(("Enter. pktflag:0x%x bssidx:%x vnd_ie_len:%d \n",
- pktflag, bssidx, vndr_ie_len));
+ struct wireless_dev *wdev;
ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
+ wdev = cfgdev_to_wdev(cfgdev);
if (bssidx > WL_MAX_IFS) {
WL_ERR(("bssidx > supported concurrent Ifaces \n"));
return -EINVAL;
}
- netinfo = wl_get_netinfo_by_bssidx(cfg, bssidx);
+ netinfo = wl_get_netinfo_by_wdev(cfg, wdev);
if (!netinfo) {
WL_ERR(("net_info ptr is NULL \n"));
return -EINVAL;
}
/* Clear the global buffer */
- memset(g_mgmt_ie_buf, 0, sizeof(g_mgmt_ie_buf));
+ bzero(g_mgmt_ie_buf, sizeof(g_mgmt_ie_buf));
curr_ie_buf = g_mgmt_ie_buf;
ies = &netinfo->bss.ies;
+
+ WL_DBG(("Enter. pktflag:0x%x bssidx:%x vnd_ie_len:%d wdev:%p\n",
+ pktflag, bssidx, vndr_ie_len, wdev));
switch (pktflag) {
case VNDR_IE_PRBRSP_FLAG :
@@ -15851,6 +22681,11 @@
mgmt_ie_len = &ies->assoc_req_ie_len;
mgmt_ie_buf_len = sizeof(ies->assoc_req_ie);
break;
+ case VNDR_IE_DISASSOC_FLAG :
+ mgmt_ie_buf = ies->disassoc_ie;
+ mgmt_ie_len = &ies->disassoc_ie_len;
+ mgmt_ie_buf_len = sizeof(ies->disassoc_ie);
+ break;
default:
mgmt_ie_buf = NULL;
mgmt_ie_len = NULL;
@@ -15865,23 +22700,13 @@
/* parse and save new vndr_ie in curr_ie_buff before comparing it */
if (vndr_ie && vndr_ie_len && curr_ie_buf) {
ptr = curr_ie_buf;
-/* must discard vndr_ie constness, attempt to change vndr_ie arg to non-const
- * causes cascade of errors in other places, fix involves const casts there
- */
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic push")
-_Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#endif
- if ((ret = wl_cfg80211_parse_vndr_ies((u8 *)vndr_ie,
- vndr_ie_len, &new_vndr_ies)) < 0) {
+
+ if ((ret = wl_cfg80211_parse_vndr_ies((const u8 *)vndr_ie,
+ vndr_ie_len, &new_vndr_ies)) < 0) {
WL_ERR(("parse vndr ie failed \n"));
goto exit;
}
-#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
- 4 && __GNUC_MINOR__ >= 6))
-_Pragma("GCC diagnostic pop")
-#endif
+
for (i = 0; i < new_vndr_ies.count; i++) {
struct parsed_vndr_ie_info *vndrie_info =
&new_vndr_ies.ie_info[i];
@@ -15902,7 +22727,7 @@
if (mgmt_ie_buf != NULL) {
if (parsed_ie_buf_len && (parsed_ie_buf_len == *mgmt_ie_len) &&
(memcmp(mgmt_ie_buf, curr_ie_buf, parsed_ie_buf_len) == 0)) {
- WL_INFORM(("Previous mgmt IE is equals to current IE"));
+ WL_DBG(("Previous mgmt IE is equals to current IE"));
goto exit;
}
@@ -15916,11 +22741,31 @@
for (i = 0; i < old_vndr_ies.count; i++) {
struct parsed_vndr_ie_info *vndrie_info =
&old_vndr_ies.ie_info[i];
+#if defined(WL_MBO) || defined(WL_OCE)
+ {
+ if ((vndrie_info->vndrie.id == 0xDD) &&
+ (!memcmp(vndrie_info->vndrie.oui, WFA_OUI, WFA_OUI_LEN)) &&
+ (vndrie_info->vndrie.data[0] == WFA_OUI_TYPE_MBO_OCE)) {
+ WL_DBG(("skipping ID : %d, Len: %d, OUI:"MACOUIDBG
+ ", type: %0x\n",
+ vndrie_info->vndrie.id,
+ vndrie_info->vndrie.len,
+ MACOUI2STRDBG(vndrie_info->vndrie.oui),
+ vndrie_info->vndrie.data[0]));
+ continue;
+ }
+ }
+#endif /* WL_MBO || WL_OCE */
- WL_INFORM(("DELETED ID : %d, Len: %d , OUI:%02x:%02x:%02x\n",
- vndrie_info->vndrie.id, vndrie_info->vndrie.len,
- vndrie_info->vndrie.oui[0], vndrie_info->vndrie.oui[1],
- vndrie_info->vndrie.oui[2]));
+ if (vndrie_info->vndrie.id == DOT11_MNG_ID_EXT_ID) {
+ WL_DBG(("DELETED VENDOR EXTN ID : %d, TYPE: %d Len: %d\n",
+ vndrie_info->vndrie.id, vndrie_info->vndrie.oui[0],
+ vndrie_info->vndrie.len));
+ } else {
+ WL_DBG(("DELETED ID : %d, Len: %d , OUI:"MACOUIDBG"\n",
+ vndrie_info->vndrie.id, vndrie_info->vndrie.len,
+ MACOUI2STRDBG(vndrie_info->vndrie.oui)));
+ }
del_add_ie_buf_len = wl_cfgp2p_vndr_ie(cfg, curr_ie_buf,
pktflag, vndrie_info->vndrie.oui,
@@ -15945,12 +22790,31 @@
for (i = 0; i < new_vndr_ies.count; i++) {
struct parsed_vndr_ie_info *vndrie_info =
&new_vndr_ies.ie_info[i];
-
- WL_INFORM(("ADDED ID : %d, Len: %d(%d), OUI:%02x:%02x:%02x\n",
- vndrie_info->vndrie.id, vndrie_info->vndrie.len,
- vndrie_info->ie_len - 2,
- vndrie_info->vndrie.oui[0], vndrie_info->vndrie.oui[1],
- vndrie_info->vndrie.oui[2]));
+#if defined(WL_MBO) || defined(WL_OCE)
+ {
+ if ((vndrie_info->vndrie.id == 0xDD) &&
+ (!memcmp(vndrie_info->vndrie.oui, WFA_OUI, WFA_OUI_LEN)) &&
+ (vndrie_info->vndrie.data[0] == WFA_OUI_TYPE_MBO_OCE)) {
+ WL_DBG(("skipping ID : %d, Len: %d, OUI:"MACOUIDBG
+ ",type :%0x\n",
+ vndrie_info->vndrie.id,
+ vndrie_info->vndrie.len,
+ MACOUI2STRDBG(vndrie_info->vndrie.oui),
+ vndrie_info->vndrie.data[0]));
+ continue;
+ }
+ }
+#endif /* WL_MBO || WL_OCE */
+ if (vndrie_info->vndrie.id == DOT11_MNG_ID_EXT_ID) {
+ WL_DBG(("ADDED VENDOR EXTN ID : %d, TYPE = %d, Len: %d\n",
+ vndrie_info->vndrie.id, vndrie_info->vndrie.oui[0],
+ vndrie_info->vndrie.len));
+ } else {
+ WL_DBG(("ADDED ID : %d, Len: %d(%d), OUI:"MACOUIDBG"\n",
+ vndrie_info->vndrie.id, vndrie_info->vndrie.len,
+ vndrie_info->ie_len - 2,
+ MACOUI2STRDBG(vndrie_info->vndrie.oui)));
+ }
del_add_ie_buf_len = wl_cfgp2p_vndr_ie(cfg, curr_ie_buf,
pktflag, vndrie_info->vndrie.oui,
@@ -16003,6 +22867,7 @@
int macnum = 0;
int macmode = MACLIST_MODE_DISABLED;
struct maclist *list;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(cfgdev);
/* get the MAC filter mode */
if (acl && acl->acl_policy == NL80211_ACL_POLICY_DENY_UNLESS_LISTED) {
@@ -16015,23 +22880,24 @@
/* if acl == NULL, macmode is still disabled.. */
if (macmode == MACLIST_MODE_DISABLED) {
if ((ret = wl_android_set_ap_mac_list(cfgdev, macmode, NULL)) != 0)
- WL_ERR(("%s : Setting MAC list failed error=%d\n", __FUNCTION__, ret));
+ WL_ERR(("wl_cfg80211_set_mac_acl: Setting MAC list"
+ " failed error=%d\n", ret));
return ret;
}
macnum = acl->n_acl_entries;
if (macnum < 0 || macnum > MAX_NUM_MAC_FILT) {
- WL_ERR(("%s : invalid number of MAC address entries %d\n",
- __FUNCTION__, macnum));
+ WL_ERR(("wl_cfg80211_set_mac_acl: invalid number of MAC address entries %d\n",
+ macnum));
return -1;
}
/* allocate memory for the MAC list */
- list = (struct maclist*)kmalloc(sizeof(int) +
- sizeof(struct ether_addr) * macnum, GFP_KERNEL);
+ list = (struct maclist *)MALLOC(cfg->osh, sizeof(int) +
+ sizeof(struct ether_addr) * macnum);
if (!list) {
- WL_ERR(("%s : failed to allocate memory\n", __FUNCTION__));
+ WL_ERR(("wl_cfg80211_set_mac_acl: failed to allocate memory\n"));
return -1;
}
@@ -16042,9 +22908,10 @@
}
/* set the list */
if ((ret = wl_android_set_ap_mac_list(cfgdev, macmode, list)) != 0)
- WL_ERR(("%s : Setting MAC list failed error=%d\n", __FUNCTION__, ret));
+ WL_ERR(("wl_cfg80211_set_mac_acl: Setting MAC list failed error=%d\n", ret));
- kfree(list);
+ MFREE(cfg->osh, list, sizeof(int) +
+ sizeof(struct ether_addr) * macnum);
return ret;
}
@@ -16055,17 +22922,15 @@
struct cfg80211_chan_def *chandef,
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION (3, 5, 0) && (LINUX_VERSION_CODE <= (3, 7, \
\
- \
- \
0)))
struct chan_info *chaninfo,
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) */
-struct wiphy *wiphy)
-
+ struct wiphy *wiphy)
{
uint16 freq = 0;
int chan_type = 0;
int channel = 0;
+ struct ieee80211_channel *chan;
if (!chandef) {
return -1;
@@ -16080,11 +22945,12 @@
{
if (CHSPEC_SB_UPPER(chanspec)) {
channel += CH_10MHZ_APART;
+ chan_type = NL80211_CHAN_HT40MINUS;
} else {
channel -= CH_10MHZ_APART;
+ chan_type = NL80211_CHAN_HT40PLUS;
}
}
- chan_type = NL80211_CHAN_HT40PLUS;
break;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION (3, 8, 0))
@@ -16104,9 +22970,9 @@
channel += (CH_10MHZ_APART + CH_20MHZ_APART);
}
- if (sb == WL_CHANSPEC_CTL_SB_LL || sb == WL_CHANSPEC_CTL_SB_LU)
+ if (sb == WL_CHANSPEC_CTL_SB_LU || sb == WL_CHANSPEC_CTL_SB_UU)
chan_type = NL80211_CHAN_HT40MINUS;
- else if (sb == WL_CHANSPEC_CTL_SB_UL || sb == WL_CHANSPEC_CTL_SB_UU)
+ else if (sb == WL_CHANSPEC_CTL_SB_LL || sb == WL_CHANSPEC_CTL_SB_UL)
chan_type = NL80211_CHAN_HT40PLUS;
}
break;
@@ -16122,11 +22988,20 @@
else
freq = ieee80211_channel_to_frequency(channel, NL80211_BAND_2GHZ);
+ chan = ieee80211_get_channel(wiphy, freq);
+ WL_DBG(("channel:%d freq:%d chan_type: %d chan_ptr:%p \n",
+ channel, freq, chan_type, chan));
+
+ if (unlikely(!chan)) {
+ /* fw and cfg80211 channel lists are not in sync */
+ WL_ERR(("Couldn't find matching channel in wiphy channel list \n"));
+ ASSERT(0);
+ return -EINVAL;
+ }
+
#if (LINUX_VERSION_CODE >= KERNEL_VERSION (3, 8, 0))
- cfg80211_chandef_create(chandef, ieee80211_get_channel(wiphy, freq), chan_type);
+ cfg80211_chandef_create(chandef, chan, chan_type);
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION (3, 5, 0) && (LINUX_VERSION_CODE <= (3, 7, \
- \
- \
\
0)))
chaninfo->freq = freq;
@@ -16143,27 +23018,36 @@
struct cfg80211_chan_def chandef;
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION (3, 5, 0) && (LINUX_VERSION_CODE <= (3, 7, \
\
- \
- \
0)))
struct chan_info chaninfo;
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION (3, 8, 0)) */
+#if !defined(DISALBE_11H) && defined(DHD_NOSCAN_DURING_CSA)
+ struct bcm_cfg80211 *cfg = NULL;
+#endif // endif
if (!wiphy) {
WL_ERR(("wiphy is null\n"));
return;
}
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION (3, 18, 0))
/* Channel switch support is only for AP/GO/ADHOC/MESH */
if (dev->ieee80211_ptr->iftype == NL80211_IFTYPE_STATION ||
dev->ieee80211_ptr->iftype == NL80211_IFTYPE_P2P_CLIENT) {
WL_ERR(("No channel switch notify support for STA/GC\n"));
return;
}
+#endif /* (LINUX_VERSION_CODE <= KERNEL_VERSION (3, 18, 0)) */
+
+#if !defined(DISALBE_11H) && defined(DHD_NOSCAN_DURING_CSA)
+ cfg = wl_get_cfg(dev);
+ if (cfg->in_csa) {
+ cfg->in_csa = FALSE;
+ wl_del_csa_timeout(cfg);
+ }
+#endif // endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION (3, 8, 0))
if (wl_chspec_chandef(chanspec, &chandef, wiphy)) {
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION (3, 5, 0) && (LINUX_VERSION_CODE <= (3, 7, \
- \
- \
\
0)))
if (wl_chspec_chandef(chanspec, &chaninfo, wiphy)) {
@@ -16177,8 +23061,6 @@
cfg80211_ch_switch_notify(dev, &chandef);
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION (3, 5, 0) && (LINUX_VERSION_CODE <= (3, 7, \
\
- \
- \
0)))
freq = chan_info.freq;
cfg80211_ch_switch_notify(dev, freq, chan_info.chan_type);
@@ -16189,208 +23071,67 @@
}
#endif /* LINUX_VERSION_CODE >= (3, 5, 0) */
-#ifdef WL11ULB
-s32
-wl_cfg80211_set_ulb_mode(struct net_device *dev, int mode)
+static void
+wl_ap_channel_ind(struct bcm_cfg80211 *cfg,
+ struct net_device *ndev,
+ chanspec_t chanspec)
{
- int ret;
- int cur_mode;
+ u32 channel = LCHSPEC_CHANNEL(chanspec);
- ret = wldev_iovar_getint(dev, "ulb_mode", &cur_mode);
- if (unlikely(ret)) {
- WL_ERR(("[ULB] ulb_mode get failed. ret:%d \n", ret));
- return ret;
- }
-
- if (cur_mode == mode) {
- /* If request mode is same as that of the current mode, then
- * do nothing (Avoid unnecessary wl down and up).
+ WL_INFORM_MEM(("(%s) AP channel:%d chspec:0x%x \n",
+ ndev->name, channel, chanspec));
+ if (cfg->ap_oper_channel && (cfg->ap_oper_channel != channel)) {
+ /*
+ * If cached channel is different from the channel indicated
+ * by the event, notify user space about the channel switch.
*/
- WL_INFORM(("[ULB] No change in ulb_mode. Do nothing.\n"));
- return 0;
- }
-
- /* setting of ulb_mode requires wl to be down */
- ret = wldev_ioctl(dev, WLC_DOWN, NULL, 0, true);
- if (unlikely(ret)) {
- WL_ERR(("[ULB] WLC_DOWN command failed:[%d]\n", ret));
- return ret;
- }
-
- if (mode >= MAX_SUPP_ULB_MODES) {
- WL_ERR(("[ULB] unsupported ulb_mode :[%d]\n", mode));
- return -EINVAL;
- }
-
- ret = wldev_iovar_setint(dev, "ulb_mode", mode);
- if (unlikely(ret)) {
- WL_ERR(("[ULB] ulb_mode set failed. ret:%d \n", ret));
- return ret;
- }
-
- ret = wldev_ioctl(dev, WLC_UP, NULL, 0, true);
- if (unlikely(ret)) {
- WL_ERR(("[ULB] WLC_DOWN command failed:[%d]\n", ret));
- return ret;
- }
-
- WL_DBG(("[ULB] ulb_mode set to %d successfully \n", mode));
-
- return ret;
-}
-
-static s32
-wl_cfg80211_ulbbw_to_ulbchspec(u32 bw)
-{
- if (bw == ULB_BW_DISABLED) {
- return WL_CHANSPEC_BW_20;
- } else if (bw == ULB_BW_10MHZ) {
- return WL_CHANSPEC_BW_10;
- } else if (bw == ULB_BW_5MHZ) {
- return WL_CHANSPEC_BW_5;
- } else if (bw == ULB_BW_2P5MHZ) {
- return WL_CHANSPEC_BW_2P5;
- } else {
- WL_ERR(("[ULB] unsupported value for ulb_bw \n"));
- return -EINVAL;
- }
-}
-
-static chanspec_t
-wl_cfg80211_ulb_get_min_bw_chspec(struct wireless_dev *wdev, s32 bssidx)
-{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
- struct net_info *_netinfo;
-
- /*
- * Return the chspec value corresponding to the
- * BW setting for a particular interface
- */
- if (wdev) {
- /* if wdev is provided, use it */
- _netinfo = wl_get_netinfo_by_wdev(cfg, wdev);
- } else if (bssidx >= 0) {
- /* if wdev is not provided, use it */
- _netinfo = wl_get_netinfo_by_bssidx(cfg, bssidx);
- } else {
- WL_ERR(("[ULB] wdev/bssidx not provided\n"));
- return INVCHANSPEC;
- }
-
- if (unlikely(!_netinfo)) {
- WL_ERR(("[ULB] net_info is null \n"));
- return INVCHANSPEC;
- }
-
- if (_netinfo->ulb_bw) {
- WL_DBG(("[ULB] wdev_ptr:%p ulb_bw:0x%x \n", _netinfo->wdev, _netinfo->ulb_bw));
- return wl_cfg80211_ulbbw_to_ulbchspec(_netinfo->ulb_bw);
- } else {
- return WL_CHANSPEC_BW_20;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
+ wl_cfg80211_ch_switch_notify(ndev, chanspec, bcmcfg_to_wiphy(cfg));
+#endif /* LINUX_VERSION_CODE >= (3, 5, 0) */
+ cfg->ap_oper_channel = channel;
}
}
static s32
-wl_cfg80211_get_ulb_bw(struct wireless_dev *wdev)
+wl_ap_start_ind(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+const wl_event_msg_t *e, void *data)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
- struct net_info *_netinfo = wl_get_netinfo_by_wdev(cfg, wdev);
+ struct net_device *ndev = NULL;
+ chanspec_t chanspec;
- /*
- * Return the ulb_bw setting for a
- * particular interface
- */
- if (unlikely(!_netinfo)) {
- WL_ERR(("[ULB] net_info is null \n"));
+ WL_DBG(("Enter\n"));
+ if (unlikely(e->status)) {
+ WL_ERR(("status:0x%x \n", e->status));
return -1;
}
- return _netinfo->ulb_bw;
+ if (!data) {
+ return -EINVAL;
+ }
+
+ if (likely(cfgdev)) {
+ ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
+ chanspec = *((chanspec_t *)data);
+
+#ifndef NO_CHANIND_FOR_AP_START
+ if (wl_get_mode_by_netdev(cfg, ndev) == WL_MODE_AP) {
+ /* For AP/GO role */
+ wl_ap_channel_ind(cfg, ndev, chanspec);
+ }
+#endif /* NO_CHANIND_FOR_AP_START */
+ }
+
+ return 0;
}
-s32
-wl_cfg80211_set_ulb_bw(struct net_device *dev,
- u32 ulb_bw, char *ifname)
-{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
- int ret;
- int mode;
- struct net_info *_netinfo = NULL, *iter, *next;
- u32 bssidx;
- enum nl80211_iftype iftype;
-
- if (!ifname)
- return -EINVAL;
-
- WL_DBG(("[ULB] Enter. bw_type:%d \n", ulb_bw));
-
- ret = wldev_iovar_getint(dev, "ulb_mode", &mode);
- if (unlikely(ret)) {
- WL_ERR(("[ULB] ulb_mode not supported \n"));
- return ret;
- }
-
- if (mode != ULB_MODE_STD_ALONE_MODE) {
- WL_ERR(("[ULB] ulb bw modification allowed only in stand-alone mode\n"));
- return -EINVAL;
- }
-
- if (ulb_bw >= MAX_SUPP_ULB_BW) {
- WL_ERR(("[ULB] unsupported value (%d) for ulb_bw \n", ulb_bw));
- return -EINVAL;
- }
-
-#ifdef WL_CFG80211_P2P_DEV_IF
- if (strcmp(ifname, "p2p-dev-wlan0") == 0) {
- iftype = NL80211_IFTYPE_P2P_DEVICE;
- /* Use wdev corresponding to the dedicated p2p discovery interface */
- if (likely(cfg->p2p_wdev)) {
- _netinfo = wl_get_netinfo_by_wdev(cfg, cfg->p2p_wdev);
- } else {
- return -ENODEV;
- }
- }
-#endif /* WL_CFG80211_P2P_DEV_IF */
- if (!_netinfo) {
- for_each_ndev(cfg, iter, next) {
- if (iter->ndev) {
- if (strncmp(iter->ndev->name, ifname, strlen(ifname)) == 0) {
- _netinfo = wl_get_netinfo_by_netdev(cfg, iter->ndev);
- iftype = NL80211_IFTYPE_STATION;
- }
- }
- }
- }
-
- if (!_netinfo)
- return -ENODEV;
- bssidx = _netinfo->bssidx;
- _netinfo->ulb_bw = ulb_bw;
-
-
- WL_DBG(("[ULB] Applying ulb_bw:%d for bssidx:%d \n", ulb_bw, bssidx));
- ret = wldev_iovar_setbuf_bsscfg(dev, "ulb_bw", (void *)&ulb_bw, 4,
- cfg->ioctl_buf, WLC_IOCTL_SMLEN, bssidx,
- &cfg->ioctl_buf_sync);
- if (unlikely(ret)) {
- WL_ERR(("[ULB] ulb_bw set failed. ret:%d \n", ret));
- return ret;
- }
-
- return ret;
-}
-#endif /* WL11ULB */
-
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
static s32
wl_csa_complete_ind(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
const wl_event_msg_t *e, void *data)
{
int error = 0;
- int chsp = 0;
+ u32 chanspec = 0;
struct net_device *ndev = NULL;
- struct wiphy *wiphy = NULL;
- chanspec_t chanspec;
+ struct ether_addr bssid;
WL_DBG(("Enter\n"));
if (unlikely(e->status)) {
@@ -16400,39 +23141,41 @@
if (likely(cfgdev)) {
ndev = cfgdev_to_wlc_ndev(cfgdev, cfg);
- wiphy = bcmcfg_to_wiphy(cfg);
- error = wldev_iovar_getint(ndev, "chanspec", &chsp);
+ /* Get association state if not AP and then query chanspec */
+ if (!((wl_get_mode_by_netdev(cfg, ndev)) == WL_MODE_AP)) {
+ error = wldev_ioctl_get(ndev, WLC_GET_BSSID, &bssid, ETHER_ADDR_LEN);
+ if (error) {
+ WL_ERR(("CSA on %s. Not associated. error=%d\n",
+ ndev->name, error));
+ return BCME_ERROR;
+ }
+ }
+
+ error = wldev_iovar_getint(ndev, "chanspec", &chanspec);
if (unlikely(error)) {
WL_ERR(("Get chanspec error: %d \n", error));
return -1;
}
- chanspec = wl_chspec_driver_to_host(chsp);
- wl_cfg80211_ch_switch_notify(ndev, chanspec, wiphy);
- } else {
- WL_ERR(("cfgdev is null\n"));
- return -1;
+
+ WL_INFORM_MEM(("[%s] CSA ind. ch:0x%x\n", ndev->name, chanspec));
+ if (wl_get_mode_by_netdev(cfg, ndev) == WL_MODE_AP) {
+ /* For AP/GO role */
+ wl_ap_channel_ind(cfg, ndev, chanspec);
+ } else {
+ /* STA/GC roles */
+ if (!wl_get_drv_status(cfg, CONNECTED, ndev)) {
+ WL_ERR(("CSA on %s. Not associated.\n", ndev->name));
+ return BCME_ERROR;
+ }
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
+ wl_cfg80211_ch_switch_notify(ndev, chanspec, bcmcfg_to_wiphy(cfg));
+#endif /* LINUX_VERSION_CODE >= (3, 5, 0) */
+ }
+
}
return 0;
}
-#else
-static s32
-wl_csa_complete_ind(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
-const wl_event_msg_t *e, void *data)
-{
- WL_ERR(("%s:Not sup for kernel < 3.5\n", __FUNCTION__));
- return 0;
-}
-#endif /* LINUX_VERSION_CODE >= (3, 5, 0) */
-
-
-#ifdef WL_NAN
-int
-wl_cfg80211_nan_cmd_handler(struct net_device *ndev, char *cmd, int cmd_len)
-{
- return wl_cfgnan_cmd_handler(ndev, g_bcm_cfg, cmd, cmd_len);
-}
-#endif /* WL_NAN */
void wl_cfg80211_clear_security(struct bcm_cfg80211 *cfg)
{
@@ -16455,9 +23198,9 @@
}
#ifdef WL_CFG80211_P2P_DEV_IF
-void wl_cfg80211_del_p2p_wdev(void)
+void wl_cfg80211_del_p2p_wdev(struct net_device *dev)
{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
struct wireless_dev *wdev = NULL;
WL_DBG(("Enter \n"));
@@ -16475,47 +23218,6 @@
}
#endif /* WL_CFG80211_P2P_DEV_IF */
-#if defined(WL_SUPPORT_AUTO_CHANNEL)
-int
-wl_cfg80211_set_spect(struct net_device *dev, int spect)
-{
- struct bcm_cfg80211 *cfg = g_bcm_cfg;
- int down = 1;
- int up = 1;
- int err = BCME_OK;
-
- if (!wl_get_drv_status_all(cfg, CONNECTED)) {
- err = wldev_ioctl(dev, WLC_DOWN, &down, sizeof(down), true);
- if (err) {
- WL_ERR(("%s: WLC_DOWN failed: code: %d\n", __func__, err));
- return err;
- }
-
- err = wldev_ioctl(dev, WLC_SET_SPECT_MANAGMENT, &spect, sizeof(spect), true);
- if (err) {
- WL_ERR(("%s: error setting spect: code: %d\n", __func__, err));
- return err;
- }
-
- err = wldev_ioctl(dev, WLC_UP, &up, sizeof(up), true);
- if (err) {
- WL_ERR(("%s: WLC_UP failed: code: %d\n", __func__, err));
- return err;
- }
- }
- return err;
-}
-
-int
-wl_cfg80211_get_sta_channel(struct net_device *dev)
-{
- if (wl_get_drv_status(g_bcm_cfg, CONNECTED, dev)) {
- return g_bcm_cfg->channel;
- }
- return BCME_OK;
-}
-#endif /* WL_SUPPORT_AUTO_CHANNEL */
-
#ifdef GTK_OFFLOAD_SUPPORT
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0))
static s32
@@ -16531,15 +23233,10 @@
WL_ERR(("data is NULL or wrong net device\n"));
return -EINVAL;
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
- prhex("kck", (uchar *) (data->kck), RSN_KCK_LENGTH);
- prhex("kek", (uchar *) (data->kek), RSN_KEK_LENGTH);
- prhex("replay_ctr", (uchar *) (data->replay_ctr), RSN_REPLAY_LEN);
-#else
- prhex("kck", data->kck, RSN_KCK_LENGTH);
- prhex("kek", data->kek, RSN_KEK_LENGTH);
- prhex("replay_ctr", data->replay_ctr, RSN_REPLAY_LEN);
-#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) */
+
+ prhex("kck", (const u8 *) (data->kck), RSN_KCK_LENGTH);
+ prhex("kek", (const u8 *) (data->kek), RSN_KEK_LENGTH);
+ prhex("replay_ctr", (const u8 *) (data->replay_ctr), RSN_REPLAY_LEN);
bcopy(data->kck, keyinfo.KCK, RSN_KCK_LENGTH);
bcopy(data->kek, keyinfo.KEK, RSN_KEK_LENGTH);
bcopy(data->replay_ctr, keyinfo.ReplayCounter, RSN_REPLAY_LEN);
@@ -16553,4 +23250,2763 @@
return err;
}
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) */
-#endif
+#endif /* GTK_OFFLOAD_SUPPORT */
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0))
+static int wl_cfg80211_set_pmk(struct wiphy *wiphy, struct net_device *dev,
+ const struct cfg80211_pmk_conf *conf)
+{
+ int ret = 0;
+ wsec_pmk_t pmk;
+ struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
+ struct wl_security *sec;
+ s32 bssidx;
+
+ pmk.key_len = conf->pmk_len;
+ if (pmk.key_len > sizeof(pmk.key)) {
+ ret = -EINVAL;
+ return ret;
+ }
+ pmk.flags = 0;
+ ret = memcpy_s(&pmk.key, sizeof(pmk.key), conf->pmk, conf->pmk_len);
+ if (ret) {
+ ret = -EINVAL;
+ return ret;
+ }
+
+ if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) < 0) {
+ WL_ERR(("Find index failed\n"));
+ ret = -EINVAL;
+ return ret;
+ }
+
+ sec = wl_read_prof(cfg, dev, WL_PROF_SEC);
+ if ((sec->wpa_auth == WLAN_AKM_SUITE_8021X) ||
+ (sec->wpa_auth == WL_AKM_SUITE_SHA256_1X)) {
+ ret = wldev_iovar_setbuf_bsscfg(dev, "okc_info_pmk", pmk.key, pmk.key_len,
+ cfg->ioctl_buf, WLC_IOCTL_SMLEN, bssidx, &cfg->ioctl_buf_sync);
+ if (ret) {
+ /* could fail in case that 'okc' is not supported */
+ WL_INFORM_MEM(("okc_info_pmk failed, err=%d (ignore)\n", ret));
+ }
+ }
+
+ ret = wldev_ioctl_set(dev, WLC_SET_WSEC_PMK, &pmk, sizeof(pmk));
+ if (ret) {
+ WL_ERR(("wl_cfg80211_set_pmk error:%d", ret));
+ ret = -EINVAL;
+ return ret;
+ }
+ return 0;
+}
+
+static int wl_cfg80211_del_pmk(struct wiphy *wiphy, struct net_device *dev,
+ const u8 *aa)
+{
+ int err = BCME_OK;
+ struct cfg80211_pmksa pmksa;
+
+ /* build up cfg80211_pmksa structure to use existing wl_cfg80211_update_pmksa API */
+ bzero(&pmksa, sizeof(pmksa));
+ pmksa.bssid = aa;
+
+ err = wl_cfg80211_update_pmksa(wiphy, dev, &pmksa, FALSE);
+
+ if (err) {
+ WL_ERR(("wl_cfg80211_update_pmksa err:%d\n", err));
+ err = -EINVAL;
+ }
+
+ return err;
+}
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) */
+
+#if defined(WL_SUPPORT_AUTO_CHANNEL)
+int
+wl_cfg80211_set_spect(struct net_device *dev, int spect)
+{
+ int wlc_down = 1;
+ int wlc_up = 1;
+ int err = BCME_OK;
+
+ err = wldev_ioctl_set(dev, WLC_DOWN, &wlc_down, sizeof(wlc_down));
+ if (err) {
+ WL_ERR(("%s: WLC_DOWN failed: code: %d\n", __func__, err));
+ return err;
+ }
+
+ err = wldev_ioctl_set(dev, WLC_SET_SPECT_MANAGMENT, &spect, sizeof(spect));
+ if (err) {
+ WL_ERR(("%s: error setting spect: code: %d\n", __func__, err));
+ return err;
+ }
+
+ err = wldev_ioctl_set(dev, WLC_UP, &wlc_up, sizeof(wlc_up));
+ if (err) {
+ WL_ERR(("%s: WLC_UP failed: code: %d\n", __func__, err));
+ return err;
+ }
+ return err;
+}
+
+int
+wl_cfg80211_get_sta_channel(struct bcm_cfg80211 *cfg)
+{
+ int channel = 0;
+
+ if (wl_get_drv_status(cfg, CONNECTED, bcmcfg_to_prmry_ndev(cfg))) {
+ channel = cfg->channel;
+ }
+ return channel;
+}
+#endif /* WL_SUPPORT_AUTO_CHANNEL */
+
+u64
+wl_cfg80211_get_new_roc_id(struct bcm_cfg80211 *cfg)
+{
+ u64 id = 0;
+ id = ++cfg->last_roc_id;
+#ifdef P2P_LISTEN_OFFLOADING
+ if (id == P2PO_COOKIE) {
+ id = ++cfg->last_roc_id;
+ }
+#endif /* P2P_LISTEN_OFFLOADING */
+ if (id == 0)
+ id = ++cfg->last_roc_id;
+ return id;
+}
+
+#ifdef WLTDLS
+s32
+wl_cfg80211_tdls_config(struct bcm_cfg80211 *cfg, enum wl_tdls_config state, bool auto_mode)
+{
+ struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg);
+ int err = 0;
+ struct net_info *iter, *next;
+ int update_reqd = 0;
+ int enable = 0;
+ dhd_pub_t *dhdp;
+ dhdp = (dhd_pub_t *)(cfg->pub);
+
+ /*
+ * TDLS need to be enabled only if we have a single STA/GC
+ * connection.
+ */
+
+ WL_DBG(("Enter state:%d\n", state));
+ if (!cfg->tdls_supported) {
+ /* FW doesn't support tdls. Do nothing */
+ return -ENODEV;
+ }
+
+ /* Protect tdls config session */
+ mutex_lock(&cfg->tdls_sync);
+
+ if (state == TDLS_STATE_TEARDOWN) {
+ /* Host initiated TDLS tear down */
+ err = dhd_tdls_enable(ndev, false, auto_mode, NULL);
+ goto exit;
+ } else if ((state == TDLS_STATE_AP_CREATE) ||
+ (state == TDLS_STATE_NMI_CREATE)) {
+ /* We don't support tdls while AP/GO/NAN is operational */
+ update_reqd = true;
+ enable = false;
+ } else if ((state == TDLS_STATE_CONNECT) || (state == TDLS_STATE_IF_CREATE)) {
+ if (wl_get_drv_status_all(cfg,
+ CONNECTED) >= TDLS_MAX_IFACE_FOR_ENABLE) {
+ /* For STA/GC connect command request, disable
+ * tdls if we have any concurrent interfaces
+ * operational.
+ */
+ WL_DBG(("Interface limit restriction. disable tdls.\n"));
+ update_reqd = true;
+ enable = false;
+ }
+ } else if ((state == TDLS_STATE_DISCONNECT) ||
+ (state == TDLS_STATE_AP_DELETE) ||
+ (state == TDLS_STATE_SETUP) ||
+ (state == TDLS_STATE_IF_DELETE)) {
+ /* Enable back the tdls connection only if we have less than
+ * or equal to a single STA/GC connection.
+ */
+ if (wl_get_drv_status_all(cfg,
+ CONNECTED) == 0) {
+ /* If there are no interfaces connected, enable tdls */
+ update_reqd = true;
+ enable = true;
+ } else if (wl_get_drv_status_all(cfg,
+ CONNECTED) == TDLS_MAX_IFACE_FOR_ENABLE) {
+ /* We have one interface in CONNECTED state.
+ * Verify whether its a STA interface before
+ * we enable back tdls.
+ */
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+ for_each_ndev(cfg, iter, next) {
+ GCC_DIAGNOSTIC_POP();
+ if ((iter->ndev) && (wl_get_drv_status(cfg, CONNECTED, ndev)) &&
+ (ndev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION)) {
+ WL_DBG(("Non STA iface operational. cfg_iftype:%d"
+ " Can't enable tdls.\n",
+ ndev->ieee80211_ptr->iftype));
+ err = -ENOTSUPP;
+ goto exit;
+ }
+ }
+ /* No AP/GO found. Enable back tdls */
+ update_reqd = true;
+ enable = true;
+ } else {
+ WL_DBG(("Concurrent connection mode. Can't enable tdls. \n"));
+ err = -ENOTSUPP;
+ goto exit;
+ }
+ } else {
+ WL_ERR(("Unknown tdls state:%d \n", state));
+ err = -EINVAL;
+ goto exit;
+ }
+
+ if (update_reqd == true) {
+ if (dhdp->tdls_enable == enable) {
+ WL_DBG(("No change in tdls state. Do nothing."
+ " tdls_enable:%d\n", enable));
+ goto exit;
+ }
+ err = wldev_iovar_setint(ndev, "tdls_enable", enable);
+ if (unlikely(err)) {
+ WL_ERR(("tdls_enable setting failed. err:%d\n", err));
+ goto exit;
+ } else {
+ WL_INFORM_MEM(("tdls_enable %d state:%d\n", enable, state));
+ /* Update the dhd state variable to be in sync */
+ dhdp->tdls_enable = enable;
+ if (state == TDLS_STATE_SETUP) {
+ /* For host initiated setup, apply TDLS params
+ * Don't propagate errors up for param config
+ * failures
+ */
+ dhd_tdls_enable(ndev, true, auto_mode, NULL);
+
+ }
+ }
+ } else {
+ WL_DBG(("Skip tdls config. state:%d update_reqd:%d "
+ "current_status:%d \n",
+ state, update_reqd, dhdp->tdls_enable));
+ }
+
+exit:
+ if (err) {
+ wl_flush_fw_log_buffer(ndev, FW_LOGSET_MASK_ALL);
+ }
+ mutex_unlock(&cfg->tdls_sync);
+ return err;
+}
+#endif /* WLTDLS */
+
+struct net_device* wl_get_ap_netdev(struct bcm_cfg80211 *cfg, char *ifname)
+{
+ struct net_info *iter, *next;
+ struct net_device *ndev = NULL;
+
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+ for_each_ndev(cfg, iter, next) {
+ GCC_DIAGNOSTIC_POP();
+ if (iter->ndev) {
+ if (strncmp(iter->ndev->name, ifname, IFNAMSIZ) == 0) {
+ if (iter->ndev->ieee80211_ptr->iftype == NL80211_IFTYPE_AP) {
+ ndev = iter->ndev;
+ break;
+ }
+ }
+ }
+ }
+
+ return ndev;
+}
+
+struct net_device*
+wl_get_netdev_by_name(struct bcm_cfg80211 *cfg, char *ifname)
+{
+ struct net_info *iter, *next;
+ struct net_device *ndev = NULL;
+
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+ for_each_ndev(cfg, iter, next) {
+ GCC_DIAGNOSTIC_POP();
+ if (iter->ndev) {
+ if (strncmp(iter->ndev->name, ifname, IFNAMSIZ) == 0) {
+ ndev = iter->ndev;
+ break;
+ }
+ }
+ }
+
+ return ndev;
+}
+
+#ifdef SUPPORT_AP_HIGHER_BEACONRATE
+#define WLC_RATE_FLAG 0x80
+#define RATE_MASK 0x7f
+
+int wl_set_ap_beacon_rate(struct net_device *dev, int val, char *ifname)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ dhd_pub_t *dhdp;
+ wl_rateset_args_t rs;
+ int error = BCME_ERROR, i;
+ struct net_device *ndev = NULL;
+
+ dhdp = (dhd_pub_t *)(cfg->pub);
+
+ if (dhdp && !(dhdp->op_mode & DHD_FLAG_HOSTAP_MODE)) {
+ WL_ERR(("Not Hostapd mode\n"));
+ return BCME_NOTAP;
+ }
+
+ ndev = wl_get_ap_netdev(cfg, ifname);
+
+ if (ndev == NULL) {
+ WL_ERR(("No softAP interface named %s\n", ifname));
+ return BCME_NOTAP;
+ }
+
+ bzero(&rs, sizeof(wl_rateset_args_t));
+ error = wldev_iovar_getbuf(ndev, "rateset", NULL, 0,
+ &rs, sizeof(wl_rateset_args_t), NULL);
+ if (error < 0) {
+ WL_ERR(("get rateset failed = %d\n", error));
+ return error;
+ }
+
+ if (rs.count < 1) {
+ WL_ERR(("Failed to get rate count\n"));
+ return BCME_ERROR;
+ }
+
+ /* Host delivers target rate in the unit of 500kbps */
+ /* To make it to 1mbps unit, atof should be implemented for 5.5mbps basic rate */
+ for (i = 0; i < rs.count && i < WL_NUMRATES; i++)
+ if (rs.rates[i] & WLC_RATE_FLAG)
+ if ((rs.rates[i] & RATE_MASK) == val)
+ break;
+
+ /* Valid rate has been delivered as an argument */
+ if (i < rs.count && i < WL_NUMRATES) {
+ error = wldev_iovar_setint(ndev, "force_bcn_rspec", val);
+ if (error < 0) {
+ WL_ERR(("set beacon rate failed = %d\n", error));
+ return BCME_ERROR;
+ }
+ } else {
+ WL_ERR(("Rate is invalid"));
+ return BCME_BADARG;
+ }
+
+ return BCME_OK;
+}
+
+int
+wl_get_ap_basic_rate(struct net_device *dev, char* command, char *ifname, int total_len)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ dhd_pub_t *dhdp;
+ wl_rateset_args_t rs;
+ int error = BCME_ERROR;
+ int i, bytes_written = 0;
+ struct net_device *ndev = NULL;
+
+ dhdp = (dhd_pub_t *)(cfg->pub);
+
+ if (!(dhdp->op_mode & DHD_FLAG_HOSTAP_MODE)) {
+ WL_ERR(("Not Hostapd mode\n"));
+ return BCME_NOTAP;
+ }
+
+ ndev = wl_get_ap_netdev(cfg, ifname);
+
+ if (ndev == NULL) {
+ WL_ERR(("No softAP interface named %s\n", ifname));
+ return BCME_NOTAP;
+ }
+
+ bzero(&rs, sizeof(wl_rateset_args_t));
+ error = wldev_iovar_getbuf(ndev, "rateset", NULL, 0,
+ &rs, sizeof(wl_rateset_args_t), NULL);
+ if (error < 0) {
+ WL_ERR(("get rateset failed = %d\n", error));
+ return error;
+ }
+
+ if (rs.count < 1) {
+ WL_ERR(("Failed to get rate count\n"));
+ return BCME_ERROR;
+ }
+
+ /* Delivers basic rate in the unit of 500kbps to host */
+ for (i = 0; i < rs.count && i < WL_NUMRATES; i++)
+ if (rs.rates[i] & WLC_RATE_FLAG)
+ bytes_written += snprintf(command + bytes_written, total_len,
+ "%d ", rs.rates[i] & RATE_MASK);
+
+ /* Remove last space in the command buffer */
+ if (bytes_written && (bytes_written < total_len)) {
+ command[bytes_written - 1] = '\0';
+ bytes_written--;
+ }
+
+ return bytes_written;
+
+}
+#endif /* SUPPORT_AP_HIGHER_BEACONRATE */
+
+#ifdef SUPPORT_AP_RADIO_PWRSAVE
+#define MSEC_PER_MIN (60000L)
+
+static int
+_wl_update_ap_rps_params(struct net_device *dev)
+{
+ struct bcm_cfg80211 *cfg = NULL;
+ rpsnoa_iovar_params_t iovar;
+ u8 smbuf[WLC_IOCTL_SMLEN];
+
+ if (!dev)
+ return BCME_BADARG;
+
+ cfg = wl_get_cfg(dev);
+
+ bzero(&iovar, sizeof(iovar));
+ bzero(smbuf, sizeof(smbuf));
+
+ iovar.hdr.ver = RADIO_PWRSAVE_VERSION;
+ iovar.hdr.subcmd = WL_RPSNOA_CMD_PARAMS;
+ iovar.hdr.len = sizeof(iovar);
+ iovar.param->band = WLC_BAND_ALL;
+ iovar.param->level = cfg->ap_rps_info.level;
+ iovar.param->stas_assoc_check = cfg->ap_rps_info.sta_assoc_check;
+ iovar.param->pps = cfg->ap_rps_info.pps;
+ iovar.param->quiet_time = cfg->ap_rps_info.quiet_time;
+
+ if (wldev_iovar_setbuf(dev, "rpsnoa", &iovar, sizeof(iovar),
+ smbuf, sizeof(smbuf), NULL)) {
+ WL_ERR(("Failed to set rpsnoa params"));
+ return BCME_ERROR;
+ }
+
+ return BCME_OK;
+}
+
+int
+wl_get_ap_rps(struct net_device *dev, char* command, char *ifname, int total_len)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ dhd_pub_t *dhdp;
+ int error = BCME_ERROR;
+ int bytes_written = 0;
+ struct net_device *ndev = NULL;
+ rpsnoa_iovar_status_t iovar;
+ u8 smbuf[WLC_IOCTL_SMLEN];
+ u32 chanspec = 0;
+ u8 idx = 0;
+ u16 state;
+ u32 sleep;
+ u32 time_since_enable;
+
+ dhdp = (dhd_pub_t *)(cfg->pub);
+
+ if (!dhdp) {
+ error = BCME_NOTUP;
+ goto fail;
+ }
+
+ if (!(dhdp->op_mode & DHD_FLAG_HOSTAP_MODE)) {
+ WL_ERR(("Not Hostapd mode\n"));
+ error = BCME_NOTAP;
+ goto fail;
+ }
+
+ ndev = wl_get_ap_netdev(cfg, ifname);
+
+ if (ndev == NULL) {
+ WL_ERR(("No softAP interface named %s\n", ifname));
+ error = BCME_NOTAP;
+ goto fail;
+ }
+
+ bzero(&iovar, sizeof(iovar));
+ bzero(smbuf, sizeof(smbuf));
+
+ iovar.hdr.ver = RADIO_PWRSAVE_VERSION;
+ iovar.hdr.subcmd = WL_RPSNOA_CMD_STATUS;
+ iovar.hdr.len = sizeof(iovar);
+ iovar.stats->band = WLC_BAND_ALL;
+
+ error = wldev_iovar_getbuf(ndev, "rpsnoa", &iovar, sizeof(iovar),
+ smbuf, sizeof(smbuf), NULL);
+ if (error < 0) {
+ WL_ERR(("get ap radio pwrsave failed = %d\n", error));
+ goto fail;
+ }
+
+ /* RSDB event doesn't seem to be handled correctly.
+ * So check chanspec of AP directly from the firmware
+ */
+ error = wldev_iovar_getint(ndev, "chanspec", (s32 *)&chanspec);
+ if (error < 0) {
+ WL_ERR(("get chanspec from AP failed = %d\n", error));
+ goto fail;
+ }
+
+ chanspec = wl_chspec_driver_to_host(chanspec);
+ if (CHSPEC_IS2G(chanspec))
+ idx = 0;
+ else if (CHSPEC_IS5G(chanspec))
+ idx = 1;
+ else {
+ error = BCME_BADCHAN;
+ goto fail;
+ }
+
+ state = ((rpsnoa_iovar_status_t *)smbuf)->stats[idx].state;
+ sleep = ((rpsnoa_iovar_status_t *)smbuf)->stats[idx].sleep_dur;
+ time_since_enable = ((rpsnoa_iovar_status_t *)smbuf)->stats[idx].sleep_avail_dur;
+
+ /* Conver ms to minute, round down only */
+ sleep = DIV_U64_BY_U32(sleep, MSEC_PER_MIN);
+ time_since_enable = DIV_U64_BY_U32(time_since_enable, MSEC_PER_MIN);
+
+ bytes_written += snprintf(command + bytes_written, total_len,
+ "state=%d sleep=%d time_since_enable=%d", state, sleep, time_since_enable);
+ error = bytes_written;
+
+fail:
+ return error;
+}
+
+int
+wl_set_ap_rps(struct net_device *dev, bool enable, char *ifname)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ dhd_pub_t *dhdp;
+ struct net_device *ndev = NULL;
+ rpsnoa_iovar_t iovar;
+ u8 smbuf[WLC_IOCTL_SMLEN];
+ int ret = BCME_OK;
+
+ dhdp = (dhd_pub_t *)(cfg->pub);
+
+ if (!dhdp) {
+ ret = BCME_NOTUP;
+ goto exit;
+ }
+
+ if (!(dhdp->op_mode & DHD_FLAG_HOSTAP_MODE)) {
+ WL_ERR(("Not Hostapd mode\n"));
+ ret = BCME_NOTAP;
+ goto exit;
+ }
+
+ ndev = wl_get_ap_netdev(cfg, ifname);
+
+ if (ndev == NULL) {
+ WL_ERR(("No softAP interface named %s\n", ifname));
+ ret = BCME_NOTAP;
+ goto exit;
+ }
+
+ if (cfg->ap_rps_info.enable != enable) {
+ cfg->ap_rps_info.enable = enable;
+ if (enable) {
+ ret = _wl_update_ap_rps_params(ndev);
+ if (ret) {
+ WL_ERR(("Filed to update rpsnoa params\n"));
+ goto exit;
+ }
+ }
+ bzero(&iovar, sizeof(iovar));
+ bzero(smbuf, sizeof(smbuf));
+
+ iovar.hdr.ver = RADIO_PWRSAVE_VERSION;
+ iovar.hdr.subcmd = WL_RPSNOA_CMD_ENABLE;
+ iovar.hdr.len = sizeof(iovar);
+ iovar.data->band = WLC_BAND_ALL;
+ iovar.data->value = (int16)enable;
+
+ ret = wldev_iovar_setbuf(ndev, "rpsnoa", &iovar, sizeof(iovar),
+ smbuf, sizeof(smbuf), NULL);
+ if (ret) {
+ WL_ERR(("Failed to enable AP radio power save"));
+ goto exit;
+ }
+ cfg->ap_rps_info.enable = enable;
+ }
+exit:
+ return ret;
+}
+
+int
+wl_update_ap_rps_params(struct net_device *dev, ap_rps_info_t* rps, char *ifname)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ dhd_pub_t *dhdp;
+ struct net_device *ndev = NULL;
+
+ dhdp = (dhd_pub_t *)(cfg->pub);
+
+ if (!dhdp)
+ return BCME_NOTUP;
+
+ if (!(dhdp->op_mode & DHD_FLAG_HOSTAP_MODE)) {
+ WL_ERR(("Not Hostapd mode\n"));
+ return BCME_NOTAP;
+ }
+
+ ndev = wl_get_ap_netdev(cfg, ifname);
+
+ if (ndev == NULL) {
+ WL_ERR(("No softAP interface named %s\n", ifname));
+ return BCME_NOTAP;
+ }
+
+ if (!rps)
+ return BCME_BADARG;
+
+ if (rps->pps < RADIO_PWRSAVE_PPS_MIN)
+ return BCME_BADARG;
+
+ if (rps->level < RADIO_PWRSAVE_LEVEL_MIN ||
+ rps->level > RADIO_PWRSAVE_LEVEL_MAX)
+ return BCME_BADARG;
+
+ if (rps->quiet_time < RADIO_PWRSAVE_QUIETTIME_MIN)
+ return BCME_BADARG;
+
+ if (rps->sta_assoc_check > RADIO_PWRSAVE_ASSOCCHECK_MAX ||
+ rps->sta_assoc_check < RADIO_PWRSAVE_ASSOCCHECK_MIN)
+ return BCME_BADARG;
+
+ cfg->ap_rps_info.pps = rps->pps;
+ cfg->ap_rps_info.level = rps->level;
+ cfg->ap_rps_info.quiet_time = rps->quiet_time;
+ cfg->ap_rps_info.sta_assoc_check = rps->sta_assoc_check;
+
+ if (cfg->ap_rps_info.enable) {
+ if (_wl_update_ap_rps_params(ndev)) {
+ WL_ERR(("Failed to update rpsnoa params"));
+ return BCME_ERROR;
+ }
+ }
+
+ return BCME_OK;
+}
+
+void
+wl_cfg80211_init_ap_rps(struct bcm_cfg80211 *cfg)
+{
+ cfg->ap_rps_info.enable = FALSE;
+ cfg->ap_rps_info.sta_assoc_check = RADIO_PWRSAVE_STAS_ASSOC_CHECK;
+ cfg->ap_rps_info.pps = RADIO_PWRSAVE_PPS;
+ cfg->ap_rps_info.quiet_time = RADIO_PWRSAVE_QUIET_TIME;
+ cfg->ap_rps_info.level = RADIO_PWRSAVE_LEVEL;
+}
+#endif /* SUPPORT_AP_RADIO_PWRSAVE */
+
+int
+wl_cfg80211_iface_count(struct net_device *dev)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ struct net_info *iter, *next;
+ int iface_count = 0;
+
+ /* Return the count of network interfaces (skip netless p2p discovery
+ * interface)
+ */
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+ for_each_ndev(cfg, iter, next) {
+ GCC_DIAGNOSTIC_POP();
+ if (iter->ndev) {
+ iface_count++;
+ }
+ }
+ return iface_count;
+}
+
+#ifdef WBTEXT
+static bool wl_cfg80211_wbtext_check_bssid_list(struct bcm_cfg80211 *cfg, struct ether_addr *ea)
+{
+ wl_wbtext_bssid_t *bssid = NULL;
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+ /* check duplicate */
+ list_for_each_entry(bssid, &cfg->wbtext_bssid_list, list) {
+ GCC_DIAGNOSTIC_POP();
+ if (!memcmp(bssid->ea.octet, ea, ETHER_ADDR_LEN)) {
+ return FALSE;
+ }
+ }
+
+ return TRUE;
+}
+
+static bool wl_cfg80211_wbtext_add_bssid_list(struct bcm_cfg80211 *cfg, struct ether_addr *ea)
+{
+ wl_wbtext_bssid_t *bssid = NULL;
+ char eabuf[ETHER_ADDR_STR_LEN];
+
+ bssid = (wl_wbtext_bssid_t *)MALLOC(cfg->osh, sizeof(wl_wbtext_bssid_t));
+ if (bssid == NULL) {
+ WL_ERR(("alloc failed\n"));
+ return FALSE;
+ }
+
+ memcpy(bssid->ea.octet, ea, ETHER_ADDR_LEN);
+
+ INIT_LIST_HEAD(&bssid->list);
+ list_add_tail(&bssid->list, &cfg->wbtext_bssid_list);
+
+ WL_DBG(("add wbtext bssid : %s\n", bcm_ether_ntoa(ea, eabuf)));
+
+ return TRUE;
+}
+
+static void wl_cfg80211_wbtext_clear_bssid_list(struct bcm_cfg80211 *cfg)
+{
+ wl_wbtext_bssid_t *bssid = NULL;
+ char eabuf[ETHER_ADDR_STR_LEN];
+
+ while (!list_empty(&cfg->wbtext_bssid_list)) {
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+ bssid = list_entry(cfg->wbtext_bssid_list.next, wl_wbtext_bssid_t, list);
+ GCC_DIAGNOSTIC_POP();
+ if (bssid) {
+ WL_DBG(("clear wbtext bssid : %s\n", bcm_ether_ntoa(&bssid->ea, eabuf)));
+ list_del(&bssid->list);
+ MFREE(cfg->osh, bssid, sizeof(wl_wbtext_bssid_t));
+ }
+ }
+}
+
+static void wl_cfg80211_wbtext_update_rcc(struct bcm_cfg80211 *cfg, struct net_device *dev)
+{
+ struct wl_connect_info *conn_info = wl_to_conn(cfg);
+ bcm_tlv_t * cap_ie = NULL;
+ bool req_sent = FALSE;
+ struct wl_profile *profile;
+
+ WL_DBG(("Enter\n"));
+
+ profile = wl_get_profile_by_netdev(cfg, dev);
+ if (!profile) {
+ WL_ERR(("no profile exists\n"));
+ return;
+ }
+
+ if (wl_cfg80211_wbtext_check_bssid_list(cfg,
+ (struct ether_addr *)&profile->bssid) == FALSE) {
+ WL_DBG(("already updated\n"));
+ return;
+ }
+
+ /* first, check NBR bit in RRM IE */
+ if ((cap_ie = bcm_parse_tlvs(conn_info->resp_ie, conn_info->resp_ie_len,
+ DOT11_MNG_RRM_CAP_ID)) != NULL) {
+ if (isset(cap_ie->data, DOT11_RRM_CAP_NEIGHBOR_REPORT)) {
+ WL_DBG(("sending neighbor report\n"));
+ req_sent = wl_cfg80211_wbtext_send_nbr_req(cfg, dev, profile);
+ }
+ }
+
+ /* if RRM nbr was not supported, check BTM bit in extend cap. IE */
+ if (!req_sent) {
+ if ((cap_ie = bcm_parse_tlvs(conn_info->resp_ie, conn_info->resp_ie_len,
+ DOT11_MNG_EXT_CAP_ID)) != NULL) {
+ if (cap_ie->len >= DOT11_EXTCAP_LEN_BSSTRANS &&
+ isset(cap_ie->data, DOT11_EXT_CAP_BSSTRANS_MGMT)) {
+ WL_DBG(("sending btm query\n"));
+ wl_cfg80211_wbtext_send_btm_query(cfg, dev, profile);
+ }
+ }
+ }
+}
+
+static bool wl_cfg80211_wbtext_send_nbr_req(struct bcm_cfg80211 *cfg, struct net_device *dev,
+ struct wl_profile *profile)
+{
+ int error = -1;
+ char *smbuf = NULL;
+ struct wl_connect_info *conn_info = wl_to_conn(cfg);
+ bcm_tlv_t * rrm_cap_ie = NULL;
+ wlc_ssid_t *ssid = NULL;
+ bool ret = FALSE;
+
+ WL_DBG(("Enter\n"));
+
+ /* check RRM nbr bit in extend cap. IE of assoc response */
+ if ((rrm_cap_ie = bcm_parse_tlvs(conn_info->resp_ie, conn_info->resp_ie_len,
+ DOT11_MNG_RRM_CAP_ID)) != NULL) {
+ if (!isset(rrm_cap_ie->data, DOT11_RRM_CAP_NEIGHBOR_REPORT)) {
+ WL_DBG(("AP doesn't support neighbor report\n"));
+ return FALSE;
+ }
+ }
+
+ smbuf = (char *)MALLOCZ(cfg->osh, WLC_IOCTL_MAXLEN);
+ if (smbuf == NULL) {
+ WL_ERR(("failed to allocated memory\n"));
+ goto nbr_req_out;
+ }
+
+ ssid = (wlc_ssid_t *)MALLOCZ(cfg->osh, sizeof(wlc_ssid_t));
+ if (ssid == NULL) {
+ WL_ERR(("failed to allocated memory\n"));
+ goto nbr_req_out;
+ }
+
+ ssid->SSID_len = MIN(profile->ssid.SSID_len, DOT11_MAX_SSID_LEN);
+ memcpy(ssid->SSID, profile->ssid.SSID, ssid->SSID_len);
+
+ error = wldev_iovar_setbuf(dev, "rrm_nbr_req", ssid,
+ sizeof(wlc_ssid_t), smbuf, WLC_IOCTL_MAXLEN, NULL);
+ if (error == BCME_OK) {
+ ret = wl_cfg80211_wbtext_add_bssid_list(cfg,
+ (struct ether_addr *)&profile->bssid);
+ } else {
+ WL_ERR(("failed to send neighbor report request, error=%d\n", error));
+ }
+
+nbr_req_out:
+ if (ssid) {
+ MFREE(cfg->osh, ssid, sizeof(wlc_ssid_t));
+ }
+
+ if (smbuf) {
+ MFREE(cfg->osh, smbuf, WLC_IOCTL_MAXLEN);
+ }
+ return ret;
+}
+
+static bool wl_cfg80211_wbtext_send_btm_query(struct bcm_cfg80211 *cfg, struct net_device *dev,
+ struct wl_profile *profile)
+
+{
+ int error = -1;
+ bool ret = FALSE;
+ wl_bsstrans_query_t btq;
+
+ WL_DBG(("Enter\n"));
+
+ bzero(&btq, sizeof(wl_bsstrans_query_t));
+
+ btq.version = WL_BSSTRANS_QUERY_VERSION_1;
+ error = wldev_iovar_setbuf(dev, "wnm_bsstrans_query", &btq,
+ sizeof(btq), cfg->ioctl_buf, WLC_IOCTL_SMLEN, &cfg->ioctl_buf_sync);
+ if (error == BCME_OK) {
+ ret = wl_cfg80211_wbtext_add_bssid_list(cfg,
+ (struct ether_addr *)&profile->bssid);
+ } else {
+ WL_ERR(("wl_cfg80211_wbtext_send_btm_query: failed to set BTM query,"
+ " error=%d\n", error));
+ }
+ return ret;
+}
+
+static void wl_cfg80211_wbtext_set_wnm_maxidle(struct bcm_cfg80211 *cfg, struct net_device *dev)
+{
+ keepalives_max_idle_t keepalive = {0, 0, 0, 0};
+ s32 bssidx, error;
+ int wnm_maxidle = 0;
+ struct wl_connect_info *conn_info = wl_to_conn(cfg);
+
+ /* AP supports wnm max idle ? */
+ if (bcm_parse_tlvs(conn_info->resp_ie, conn_info->resp_ie_len,
+ DOT11_MNG_BSS_MAX_IDLE_PERIOD_ID) != NULL) {
+ error = wldev_iovar_getint(dev, "wnm_maxidle", &wnm_maxidle);
+ if (error < 0) {
+ WL_ERR(("failed to get wnm max idle period : %d\n", error));
+ }
+ }
+
+ WL_DBG(("wnm max idle period : %d\n", wnm_maxidle));
+
+ /* if wnm maxidle has valid period, set it as keep alive */
+ if (wnm_maxidle > 0) {
+ keepalive.keepalive_count = 1;
+ }
+
+ if ((bssidx = wl_get_bssidx_by_wdev(cfg, dev->ieee80211_ptr)) >= 0) {
+ error = wldev_iovar_setbuf_bsscfg(dev, "wnm_keepalives_max_idle", &keepalive,
+ sizeof(keepalives_max_idle_t), cfg->ioctl_buf, WLC_IOCTL_SMLEN,
+ bssidx, &cfg->ioctl_buf_sync);
+ if (error < 0) {
+ WL_ERR(("set wnm_keepalives_max_idle failed : %d\n", error));
+ }
+ }
+}
+
+static int
+wl_cfg80211_recv_nbr_resp(struct net_device *dev, uint8 *body, uint body_len)
+{
+ dot11_rm_action_t *rm_rep;
+ bcm_tlv_t *tlvs;
+ uint tlv_len;
+ int i, error;
+ dot11_neighbor_rep_ie_t *nbr_rep_ie;
+ chanspec_t ch;
+ wl_roam_channel_list_t channel_list;
+ char iobuf[WLC_IOCTL_SMLEN];
+
+ if (body_len < DOT11_RM_ACTION_LEN) {
+ WL_ERR(("Received Neighbor Report frame with incorrect length %d\n",
+ body_len));
+ return BCME_ERROR;
+ }
+
+ rm_rep = (dot11_rm_action_t *)body;
+ WL_DBG(("received neighbor report (token = %d)\n", rm_rep->token));
+
+ tlvs = (bcm_tlv_t *)&rm_rep->data[0];
+
+ tlv_len = body_len - DOT11_RM_ACTION_LEN;
+
+ while (tlvs && tlvs->id == DOT11_MNG_NEIGHBOR_REP_ID) {
+ nbr_rep_ie = (dot11_neighbor_rep_ie_t *)tlvs;
+
+ if (nbr_rep_ie->len < DOT11_NEIGHBOR_REP_IE_FIXED_LEN) {
+ WL_ERR(("malformed Neighbor Report element with length %d\n",
+ nbr_rep_ie->len));
+ tlvs = bcm_next_tlv(tlvs, &tlv_len);
+ continue;
+ }
+
+ ch = CH20MHZ_CHSPEC(nbr_rep_ie->channel);
+ WL_DBG(("ch:%d, bssid:"MACDBG"\n",
+ ch, MAC2STRDBG(nbr_rep_ie->bssid.octet)));
+
+ /* get RCC list */
+ error = wldev_iovar_getbuf(dev, "roamscan_channels", 0, 0,
+ (void *)&channel_list, sizeof(channel_list), NULL);
+ if (error) {
+ WL_ERR(("Failed to get roamscan channels, error = %d\n", error));
+ return BCME_ERROR;
+ }
+
+ /* update RCC */
+ if (channel_list.n < MAX_ROAM_CHANNEL) {
+ for (i = 0; i < channel_list.n; i++) {
+ if (channel_list.channels[i] == ch) {
+ break;
+ }
+ }
+ if (i == channel_list.n) {
+ channel_list.channels[channel_list.n] = ch;
+ channel_list.n++;
+ }
+ }
+
+ /* set RCC list */
+ error = wldev_iovar_setbuf(dev, "roamscan_channels", &channel_list,
+ sizeof(channel_list), iobuf, sizeof(iobuf), NULL);
+ if (error) {
+ WL_DBG(("Failed to set roamscan channels, error = %d\n", error));
+ }
+
+ tlvs = bcm_next_tlv(tlvs, &tlv_len);
+ }
+
+ return BCME_OK;
+}
+#endif /* WBTEXT */
+#ifdef SUPPORT_SET_CAC
+static void
+wl_cfg80211_set_cac(struct bcm_cfg80211 *cfg, int enable)
+{
+ int ret = 0;
+ dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+
+ WL_DBG(("cac enable %d\n", enable));
+ if (!dhd) {
+ WL_ERR(("dhd is NULL\n"));
+ return;
+ }
+ if ((ret = dhd_wl_ioctl_set_intiovar(dhd, "cac", enable,
+ WLC_SET_VAR, TRUE, 0)) < 0) {
+ WL_ERR(("Failed set CAC, ret=%d\n", ret));
+ } else {
+ WL_DBG(("CAC set successfully\n"));
+ }
+ return;
+}
+#endif /* SUPPORT_SET_CAC */
+
+#ifdef SUPPORT_RSSI_SUM_REPORT
+int
+wl_get_rssi_per_ant(struct net_device *dev, char *ifname, char *peer_mac, void *param)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ wl_rssi_ant_mimo_t *get_param = (wl_rssi_ant_mimo_t *)param;
+ rssi_ant_param_t *set_param = NULL;
+ struct net_device *ifdev = NULL;
+ char iobuf[WLC_IOCTL_SMLEN];
+ int err = BCME_OK;
+ int iftype = 0;
+
+ bzero(iobuf, WLC_IOCTL_SMLEN);
+
+ /* Check the interface type */
+ ifdev = wl_get_netdev_by_name(cfg, ifname);
+ if (ifdev == NULL) {
+ WL_ERR(("Could not find net_device for ifname:%s\n", ifname));
+ err = BCME_BADARG;
+ goto fail;
+ }
+
+ iftype = ifdev->ieee80211_ptr->iftype;
+ if (iftype == NL80211_IFTYPE_AP || iftype == NL80211_IFTYPE_P2P_GO) {
+ if (peer_mac) {
+ set_param = (rssi_ant_param_t *)MALLOCZ(cfg->osh, sizeof(rssi_ant_param_t));
+ err = wl_cfg80211_ether_atoe(peer_mac, &set_param->ea);
+ if (!err) {
+ WL_ERR(("Invalid Peer MAC format\n"));
+ err = BCME_BADARG;
+ goto fail;
+ }
+ } else {
+ WL_ERR(("Peer MAC is not provided for iftype %d\n", iftype));
+ err = BCME_BADARG;
+ goto fail;
+ }
+ }
+
+ err = wldev_iovar_getbuf(ifdev, "phy_rssi_ant", peer_mac ?
+ (void *)&(set_param->ea) : NULL, peer_mac ? ETHER_ADDR_LEN : 0,
+ (void *)iobuf, sizeof(iobuf), NULL);
+ if (unlikely(err)) {
+ WL_ERR(("Failed to get rssi info, err=%d\n", err));
+ } else {
+ memcpy(get_param, iobuf, sizeof(wl_rssi_ant_mimo_t));
+ if (get_param->count == 0) {
+ WL_ERR(("Not supported on this chip\n"));
+ err = BCME_UNSUPPORTED;
+ }
+ }
+
+fail:
+ if (set_param) {
+ MFREE(cfg->osh, set_param, sizeof(rssi_ant_param_t));
+ }
+
+ return err;
+}
+
+int
+wl_get_rssi_logging(struct net_device *dev, void *param)
+{
+ rssilog_get_param_t *get_param = (rssilog_get_param_t *)param;
+ char iobuf[WLC_IOCTL_SMLEN];
+ int err = BCME_OK;
+
+ bzero(iobuf, WLC_IOCTL_SMLEN);
+ bzero(get_param, sizeof(*get_param));
+ err = wldev_iovar_getbuf(dev, "rssilog", NULL, 0, (void *)iobuf,
+ sizeof(iobuf), NULL);
+ if (err) {
+ WL_ERR(("Failed to get rssi logging info, err=%d\n", err));
+ } else {
+ memcpy(get_param, iobuf, sizeof(*get_param));
+ }
+
+ return err;
+}
+
+int
+wl_set_rssi_logging(struct net_device *dev, void *param)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ rssilog_set_param_t *set_param = (rssilog_set_param_t *)param;
+ int err;
+
+ err = wldev_iovar_setbuf(dev, "rssilog", set_param,
+ sizeof(*set_param), cfg->ioctl_buf, WLC_IOCTL_SMLEN,
+ &cfg->ioctl_buf_sync);
+ if (err) {
+ WL_ERR(("Failed to set rssi logging param, err=%d\n", err));
+ }
+
+ return err;
+}
+#endif /* SUPPORT_RSSI_SUM_REPORT */
+/* Function to flush the FW preserve buffer content
+* The buffer content is sent to host in form of events.
+*/
+void
+wl_flush_fw_log_buffer(struct net_device *dev, uint32 logset_mask)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(dev);
+ dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+ int i;
+ int err = 0;
+ u8 buf[WLC_IOCTL_SMLEN] = {0};
+ wl_el_set_params_t set_param;
+
+ /* Set the size of data to retrieve */
+ memset(&set_param, 0, sizeof(set_param));
+ set_param.size = WLC_IOCTL_SMLEN;
+
+ for (i = 0; i < dhd->event_log_max_sets; i++)
+ {
+ if ((0x01u << i) & logset_mask) {
+ set_param.set = i;
+ err = wldev_iovar_setbuf(dev, "event_log_get", &set_param,
+ sizeof(struct wl_el_set_params_s), buf, WLC_IOCTL_SMLEN,
+ NULL);
+ if (err) {
+ WL_DBG(("Failed to get fw preserve logs, err=%d\n", err));
+ }
+ }
+ }
+}
+#ifdef USE_WFA_CERT_CONF
+extern int g_frameburst;
+#endif /* USE_WFA_CERT_CONF */
+
+int
+wl_cfg80211_set_frameburst(struct bcm_cfg80211 *cfg, bool enable)
+{
+ int ret = BCME_OK;
+ int val = enable ? 1 : 0;
+
+#ifdef USE_WFA_CERT_CONF
+ if (!g_frameburst) {
+ WL_DBG(("Skip setting frameburst\n"));
+ return 0;
+ }
+#endif /* USE_WFA_CERT_CONF */
+
+ WL_DBG(("Set frameburst %d\n", val));
+ ret = wldev_ioctl_set(bcmcfg_to_prmry_ndev(cfg), WLC_SET_FAKEFRAG, &val, sizeof(val));
+ if (ret < 0) {
+ WL_ERR(("Failed set frameburst, ret=%d\n", ret));
+ } else {
+ WL_INFORM_MEM(("frameburst is %s\n", enable ? "enabled" : "disabled"));
+ }
+
+ return ret;
+}
+
+s32
+wl_cfg80211_set_transition_mode(struct net_device *ndev, u32 transition_disabled)
+{
+ int ret = BCME_OK;
+ int val = transition_disabled ? 0 : 1;
+
+ WL_DBG(("Set SAE transition mode %d\n", val));
+ ret = wldev_iovar_setint(ndev, "extsae_transition_mode", val);
+ if (ret < 0) {
+ WL_ERR(("Failed set SAE transition mode, ret=%d\n", ret));
+ } else {
+ WL_INFORM(("SAE transition mode is %s\n",
+ transition_disabled ? "disabled" : "enabled"));
+ }
+
+ return ret;
+}
+
+s32
+wl_cfg80211_set_sae_pwe(struct net_device *ndev, u8 sae_pwe)
+{
+ int ret = BCME_UNSUPPORTED;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+
+ /* sae_pwe 0: HnP, 1: H2E, 2: Both HnP and H2E */
+ WL_DBG(("Set SAE PWE derivation machanisme %d\n", sae_pwe));
+
+ if (FW_SUPPORTED(dhd, sae_ext))
+ ret = wldev_iovar_setint(ndev, "extsae_pwe", sae_pwe);
+
+ if (ret < 0)
+ WL_ERR(("Failed set SAE PWE, ret=%d\n", ret));
+
+ return ret;
+}
+
+s32
+wl_cfg80211_set_dbg_verbose(struct net_device *ndev, u32 level)
+{
+ /* configure verbose level for debugging */
+ if (level) {
+ /* Enable increased verbose */
+ wl_dbg_level |= WL_DBG_DBG;
+ } else {
+ /* Disable */
+ wl_dbg_level &= ~WL_DBG_DBG;
+ }
+ WL_INFORM(("debug verbose set to %d\n", level));
+
+ return BCME_OK;
+}
+
+const u8 *
+wl_find_attribute(const u8 *buf, u16 len, u16 element_id)
+{
+ const u8 *attrib;
+ u16 attrib_id;
+ u16 attrib_len;
+
+ if (!buf) {
+ WL_ERR(("buf null\n"));
+ return NULL;
+ }
+
+ attrib = buf;
+ while (len >= 4) {
+ /* attribute id */
+ attrib_id = *attrib++ << 8;
+ attrib_id |= *attrib++;
+ len -= 2;
+
+ /* 2-byte little endian */
+ attrib_len = *attrib++ << 8;
+ attrib_len |= *attrib++;
+
+ len -= 2;
+ if (attrib_id == element_id) {
+ /* This will point to start of subelement attrib after
+ * attribute id & len
+ */
+ return attrib;
+ }
+ if (len > attrib_len) {
+ len -= attrib_len; /* for the remaining subelt fields */
+ WL_DBG(("Attribue:%4x attrib_len:%d rem_len:%d\n",
+ attrib_id, attrib_len, len));
+
+ /* Go to next subelement */
+ attrib += attrib_len;
+ } else {
+ WL_ERR(("Incorrect Attribue:%4x attrib_len:%d\n",
+ attrib_id, attrib_len));
+ return NULL;
+ }
+ }
+ return NULL;
+}
+
+uint8 wl_cfg80211_get_bus_state(struct bcm_cfg80211 *cfg)
+{
+ dhd_pub_t *dhd = (dhd_pub_t *)(cfg->pub);
+ WL_INFORM(("dhd->hang_was_sent = %d and busstate = %d\n",
+ dhd->hang_was_sent, dhd->busstate));
+ return ((dhd->busstate == DHD_BUS_DOWN) || dhd->hang_was_sent);
+}
+
+#ifdef WL_WPS_SYNC
+static void wl_wps_reauth_timeout(unsigned long data)
+{
+ struct net_device *ndev = (struct net_device *)data;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ s32 inst;
+ unsigned long flags;
+
+ WL_CFG_WPS_SYNC_LOCK(&cfg->wps_sync, flags);
+ inst = wl_get_wps_inst_match(cfg, ndev);
+ if (inst >= 0) {
+ WL_ERR(("[%s][WPS] Reauth Timeout Inst:%d! state:%d\n",
+ ndev->name, inst, cfg->wps_session[inst].state));
+ if (cfg->wps_session[inst].state == WPS_STATE_REAUTH_WAIT) {
+ /* Session should get deleted from success (linkup) or
+ * deauth case. Just in case, link reassoc failed, clear
+ * state here.
+ */
+ WL_ERR(("[%s][WPS] Reauth Timeout Inst:%d!\n",
+ ndev->name, inst));
+ cfg->wps_session[inst].state = WPS_STATE_IDLE;
+ cfg->wps_session[inst].in_use = false;
+ }
+ }
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+}
+
+static void wl_init_wps_reauth_sm(struct bcm_cfg80211 *cfg)
+{
+ /* Only two instances are supported as of now. one for
+ * infra STA and other for infra STA/GC.
+ */
+ int i = 0;
+ struct net_device *pdev = bcmcfg_to_prmry_ndev(cfg);
+
+ spin_lock_init(&cfg->wps_sync);
+ for (i = 0; i < WPS_MAX_SESSIONS; i++) {
+ /* Init scan_timeout timer */
+ init_timer_compat(&cfg->wps_session[i].timer, wl_wps_reauth_timeout, pdev);
+ cfg->wps_session[i].in_use = false;
+ cfg->wps_session[i].state = WPS_STATE_IDLE;
+ }
+}
+
+static void wl_deinit_wps_reauth_sm(struct bcm_cfg80211 *cfg)
+{
+ int i = 0;
+
+ for (i = 0; i < WPS_MAX_SESSIONS; i++) {
+ cfg->wps_session[i].in_use = false;
+ cfg->wps_session[i].state = WPS_STATE_IDLE;
+ if (timer_pending(&cfg->wps_session[i].timer)) {
+ del_timer_sync(&cfg->wps_session[i].timer);
+ }
+ }
+
+}
+
+static s32
+wl_get_free_wps_inst(struct bcm_cfg80211 *cfg)
+{
+ int i;
+
+ for (i = 0; i < WPS_MAX_SESSIONS; i++) {
+ if (!cfg->wps_session[i].in_use) {
+ return i;
+ }
+ }
+ return BCME_ERROR;
+}
+
+static s32
+wl_get_wps_inst_match(struct bcm_cfg80211 *cfg, struct net_device *ndev)
+{
+ int i;
+
+ for (i = 0; i < WPS_MAX_SESSIONS; i++) {
+ if ((cfg->wps_session[i].in_use) &&
+ (ndev == cfg->wps_session[i].ndev)) {
+ return i;
+ }
+ }
+
+ return BCME_ERROR;
+}
+
+static s32
+wl_wps_session_add(struct net_device *ndev, u16 mode, u8 *mac_addr)
+{
+ s32 inst;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ unsigned long flags;
+
+ WL_CFG_WPS_SYNC_LOCK(&cfg->wps_sync, flags);
+ /* Fetch and initialize a wps instance */
+ inst = wl_get_free_wps_inst(cfg);
+ if (inst == BCME_ERROR) {
+ WL_ERR(("[WPS] No free insance\n"));
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ return BCME_ERROR;
+ }
+ cfg->wps_session[inst].in_use = true;
+ cfg->wps_session[inst].state = WPS_STATE_STARTED;
+ cfg->wps_session[inst].ndev = ndev;
+ cfg->wps_session[inst].mode = mode;
+ /* return check not required since both buffer lens are same */
+ (void)memcpy_s(cfg->wps_session[inst].peer_mac, ETH_ALEN, mac_addr, ETH_ALEN);
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+
+ WL_INFORM_MEM(("[%s][WPS] session created. Peer: " MACDBG "\n",
+ ndev->name, MAC2STRDBG(mac_addr)));
+ return BCME_OK;
+}
+
+static void
+wl_wps_session_del(struct net_device *ndev)
+{
+ s32 inst;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ unsigned long flags;
+ u16 cur_state;
+
+ WL_CFG_WPS_SYNC_LOCK(&cfg->wps_sync, flags);
+
+ /* Get current instance for the given ndev */
+ inst = wl_get_wps_inst_match(cfg, ndev);
+ if (inst == BCME_ERROR) {
+ WL_DBG(("[WPS] instance match NOT found\n"));
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ return;
+ }
+
+ cur_state = cfg->wps_session[inst].state;
+ if (cur_state != WPS_STATE_DONE) {
+ WL_DBG(("[WPS] wrong state:%d\n", cur_state));
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ return;
+ }
+
+ /* Mark this as unused */
+ cfg->wps_session[inst].in_use = false;
+ cfg->wps_session[inst].state = WPS_STATE_IDLE;
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+
+ /* Ensure this API is called from sleepable context. */
+ if (timer_pending(&cfg->wps_session[inst].timer)) {
+ del_timer_sync(&cfg->wps_session[inst].timer);
+ }
+
+ WL_INFORM_MEM(("[%s][WPS] session deleted\n", ndev->name));
+}
+
+static void
+wl_wps_handle_ifdel(struct net_device *ndev)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ unsigned long flags;
+ u16 cur_state;
+ s32 inst;
+
+ WL_CFG_WPS_SYNC_LOCK(&cfg->wps_sync, flags);
+ inst = wl_get_wps_inst_match(cfg, ndev);
+ if (inst == BCME_ERROR) {
+ WL_DBG(("[WPS] instance match NOT found\n"));
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ return;
+ }
+ cur_state = cfg->wps_session[inst].state;
+ cfg->wps_session[inst].state = WPS_STATE_DONE;
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+
+ WL_INFORM_MEM(("[%s][WPS] state:%x\n", ndev->name, cur_state));
+ if (cur_state > WPS_STATE_IDLE) {
+ wl_wps_session_del(ndev);
+ }
+}
+
+static s32
+wl_wps_handle_sta_linkdown(struct net_device *ndev, u16 inst)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ unsigned long flags;
+ u16 cur_state;
+ bool wps_done = false;
+
+ WL_CFG_WPS_SYNC_LOCK(&cfg->wps_sync, flags);
+ cur_state = cfg->wps_session[inst].state;
+ if (cur_state == WPS_STATE_REAUTH_WAIT) {
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ wl_clr_drv_status(cfg, CONNECTED, ndev);
+ wl_clr_drv_status(cfg, DISCONNECTING, ndev);
+ WL_INFORM_MEM(("[%s][WPS] REAUTH link down\n", ndev->name));
+ /* Drop the link down event while we are waiting for reauth */
+ return BCME_UNSUPPORTED;
+ } else if (cur_state == WPS_STATE_STARTED) {
+ /* Link down before reaching EAP-FAIL. End WPS session */
+ cfg->wps_session[inst].state = WPS_STATE_DONE;
+ wps_done = true;
+ WL_INFORM_MEM(("[%s][WPS] link down after wps start\n", ndev->name));
+ } else {
+ WL_DBG(("[%s][WPS] link down in state:%d\n",
+ ndev->name, cur_state));
+ }
+
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+
+ if (wps_done) {
+ wl_wps_session_del(ndev);
+ }
+ return BCME_OK;
+}
+
+static s32
+wl_wps_handle_peersta_linkdown(struct net_device *ndev, u16 inst, const u8 *peer_mac)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ unsigned long flags;
+ u16 cur_state;
+ s32 ret = BCME_OK;
+ bool wps_done = false;
+
+ WL_CFG_WPS_SYNC_LOCK(&cfg->wps_sync, flags);
+ cur_state = cfg->wps_session[inst].state;
+
+ if (!peer_mac) {
+ WL_ERR(("Invalid arg\n"));
+ ret = BCME_ERROR;
+ goto exit;
+ }
+
+ /* AP/GO can have multiple clients. so validate peer_mac addr
+ * and ensure states are updated only for right peer.
+ */
+ if (memcmp(cfg->wps_session[inst].peer_mac, peer_mac, ETH_ALEN)) {
+ /* Mac addr not matching. Ignore. */
+ WL_DBG(("[%s][WPS] No active WPS session"
+ "for the peer:" MACDBG "\n", ndev->name, MAC2STRDBG(peer_mac)));
+ ret = BCME_OK;
+ goto exit;
+ }
+ if (cur_state == WPS_STATE_REAUTH_WAIT) {
+ WL_INFORM_MEM(("[%s][WPS] REAUTH link down."
+ " Peer: " MACDBG "\n",
+ ndev->name, MAC2STRDBG(peer_mac)));
+ } else if (cur_state == WPS_STATE_STARTED) {
+ /* Link down before reaching REAUTH_WAIT state. WPS
+ * session ended.
+ */
+ cfg->wps_session[inst].state = WPS_STATE_DONE;
+ WL_INFORM_MEM(("[%s][WPS] link down after wps start"
+ " client:" MACDBG "\n",
+ ndev->name, MAC2STRDBG(peer_mac)));
+ wps_done = true;
+ /* since we have freed lock above, return from here */
+ ret = BCME_OK;
+ } else {
+ WL_ERR(("[%s][WPS] Unsupported state:%d",
+ ndev->name, cur_state));
+ ret = BCME_ERROR;
+ }
+exit:
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ if (wps_done) {
+ wl_wps_session_del(ndev);
+ }
+ return ret;
+}
+
+static s32
+wl_wps_handle_sta_linkup(struct net_device *ndev, u16 inst)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ unsigned long flags;
+ u16 cur_state;
+ s32 ret = BCME_OK;
+ bool wps_done = false;
+
+ WL_CFG_WPS_SYNC_LOCK(&cfg->wps_sync, flags);
+ cur_state = cfg->wps_session[inst].state;
+ if (cur_state == WPS_STATE_REAUTH_WAIT) {
+ /* WPS session succeeded. del session. */
+ cfg->wps_session[inst].state = WPS_STATE_DONE;
+ wps_done = true;
+ WL_INFORM_MEM(("[%s][WPS] WPS_REAUTH link up (WPS DONE)\n", ndev->name));
+ ret = BCME_OK;
+ } else {
+ WL_ERR(("[%s][WPS] unexpected link up in state:%d \n",
+ ndev->name, cur_state));
+ ret = BCME_ERROR;
+ }
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ if (wps_done) {
+ wl_wps_session_del(ndev);
+ }
+ return ret;
+}
+
+static s32
+wl_wps_handle_peersta_linkup(struct net_device *ndev, u16 inst, const u8 *peer_mac)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ unsigned long flags;
+ u16 cur_state;
+ s32 ret = BCME_OK;
+
+ WL_CFG_WPS_SYNC_LOCK(&cfg->wps_sync, flags);
+ cur_state = cfg->wps_session[inst].state;
+
+ /* For AP case, check whether call came for right peer */
+ if (!peer_mac ||
+ memcmp(cfg->wps_session[inst].peer_mac, peer_mac, ETH_ALEN)) {
+ WL_ERR(("[WPS] macaddr mismatch\n"));
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ /* Mac addr not matching. Ignore. */
+ return BCME_ERROR;
+ }
+
+ if (cur_state == WPS_STATE_REAUTH_WAIT) {
+ WL_INFORM_MEM(("[%s][WPS] REAUTH link up\n", ndev->name));
+ ret = BCME_OK;
+ } else {
+ WL_INFORM_MEM(("[%s][WPS] unexpected link up in state:%d \n",
+ ndev->name, cur_state));
+ ret = BCME_ERROR;
+ }
+
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+
+ return ret;
+}
+
+static s32
+wl_wps_handle_authorize(struct net_device *ndev, u16 inst, const u8 *peer_mac)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ unsigned long flags;
+ u16 cur_state;
+ bool wps_done = false;
+ s32 ret = BCME_OK;
+
+ WL_CFG_WPS_SYNC_LOCK(&cfg->wps_sync, flags);
+ cur_state = cfg->wps_session[inst].state;
+
+ /* For AP case, check whether call came for right peer */
+ if (!peer_mac ||
+ memcmp(cfg->wps_session[inst].peer_mac, peer_mac, ETH_ALEN)) {
+ WL_ERR(("[WPS] macaddr mismatch\n"));
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ /* Mac addr not matching. Ignore. */
+ return BCME_ERROR;
+ }
+
+ if (cur_state == WPS_STATE_REAUTH_WAIT) {
+ /* WPS session succeeded. del session. */
+ cfg->wps_session[inst].state = WPS_STATE_DONE;
+ wps_done = true;
+ WL_INFORM_MEM(("[%s][WPS] Authorize done (WPS DONE)\n", ndev->name));
+ ret = BCME_OK;
+ } else {
+ WL_INFORM_MEM(("[%s][WPS] unexpected Authorize in state:%d \n",
+ ndev->name, cur_state));
+ ret = BCME_ERROR;
+ }
+
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ if (wps_done) {
+ wl_wps_session_del(ndev);
+ }
+ return ret;
+}
+
+static s32
+wl_wps_handle_reauth(struct net_device *ndev, u16 inst, const u8 *peer_mac)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ unsigned long flags;
+ u16 cur_state;
+ u16 mode;
+ s32 ret = BCME_OK;
+
+ WL_CFG_WPS_SYNC_LOCK(&cfg->wps_sync, flags);
+ cur_state = cfg->wps_session[inst].state;
+ mode = cfg->wps_session[inst].mode;
+
+ if (((mode == WL_MODE_BSS) && (cur_state == WPS_STATE_STARTED)) ||
+ ((mode == WL_MODE_AP) && (cur_state == WPS_STATE_M8_SENT))) {
+ /* Move to reauth wait */
+ cfg->wps_session[inst].state = WPS_STATE_REAUTH_WAIT;
+ /* Use ndev to find the wps instance which fired the timer */
+ timer_set_private(&cfg->wps_session[inst].timer, ndev);
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ mod_timer(&cfg->wps_session[inst].timer,
+ jiffies + msecs_to_jiffies(WL_WPS_REAUTH_TIMEOUT));
+ WL_INFORM_MEM(("[%s][WPS] STATE_REAUTH_WAIT mode:%d Peer: " MACDBG "\n",
+ ndev->name, mode, MAC2STRDBG(peer_mac)));
+ return BCME_OK;
+ } else {
+ /* 802.1x cases */
+ WL_DBG(("[%s][WPS] EAP-FAIL\n", ndev->name));
+ }
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ return ret;
+}
+
+static s32
+wl_wps_handle_disconnect(struct net_device *ndev, u16 inst, const u8 *peer_mac)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ unsigned long flags;
+ u16 cur_state;
+ s32 ret = BCME_OK;
+
+ WL_CFG_WPS_SYNC_LOCK(&cfg->wps_sync, flags);
+ cur_state = cfg->wps_session[inst].state;
+ /* If Disconnect command comes from user space for STA/GC,
+ * respond with event without waiting for event from fw as
+ * it would be dropped by the WPS_SYNC code.
+ */
+ if (cur_state == WPS_STATE_REAUTH_WAIT) {
+ if (ETHER_ISBCAST(peer_mac)) {
+ WL_DBG(("[WPS] Bcast peer. Do nothing.\n"));
+ } else {
+ /* Notify link down */
+ CFG80211_DISCONNECTED(ndev,
+ WLAN_REASON_DEAUTH_LEAVING, NULL, 0,
+ true, GFP_ATOMIC);
+ }
+ } else {
+ WL_DBG(("[%s][WPS] Not valid state to report disconnected:%d",
+ ndev->name, cur_state));
+ ret = BCME_UNSUPPORTED;
+ }
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ return ret;
+}
+
+static s32
+wl_wps_handle_disconnect_client(struct net_device *ndev, u16 inst, const u8 *peer_mac)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ unsigned long flags;
+ u16 cur_state;
+ s32 ret = BCME_OK;
+ bool wps_done = false;
+
+ WL_CFG_WPS_SYNC_LOCK(&cfg->wps_sync, flags);
+ cur_state = cfg->wps_session[inst].state;
+ /* For GO/AP, ignore disconnect client during reauth state */
+ if (cur_state == WPS_STATE_REAUTH_WAIT) {
+ if (ETHER_ISBCAST(peer_mac)) {
+ /* If there is broadcast deauth, then mark wps session as ended */
+ cfg->wps_session[inst].state = WPS_STATE_DONE;
+ wps_done = true;
+ WL_INFORM_MEM(("[%s][WPS] BCAST deauth. WPS stopped.\n", ndev->name));
+ ret = BCME_OK;
+ goto exit;
+ } else if (!(memcmp(cfg->wps_session[inst].peer_mac,
+ peer_mac, ETH_ALEN))) {
+ WL_ERR(("[%s][WPS] Drop disconnect client\n", ndev->name));
+ ret = BCME_UNSUPPORTED;
+ }
+ }
+
+exit:
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ if (wps_done) {
+ wl_wps_session_del(ndev);
+ }
+ return ret;
+}
+
+static s32
+wl_wps_handle_connect_fail(struct net_device *ndev, u16 inst)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ unsigned long flags;
+ u16 cur_state;
+ bool wps_done = false;
+
+ WL_CFG_WPS_SYNC_LOCK(&cfg->wps_sync, flags);
+ cur_state = cfg->wps_session[inst].state;
+ if (cur_state == WPS_STATE_REAUTH_WAIT) {
+ cfg->wps_session[inst].state = WPS_STATE_DONE;
+ wl_clr_drv_status(cfg, CONNECTED, ndev);
+ wps_done = true;
+ WL_INFORM_MEM(("[%s][WPS] Connect fail. WPS stopped.\n",
+ ndev->name));
+ } else {
+ WL_ERR(("[%s][WPS] Connect fail. state:%d\n",
+ ndev->name, cur_state));
+ }
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ if (wps_done) {
+ wl_wps_session_del(ndev);
+ }
+ return BCME_OK;
+}
+
+static s32
+wl_wps_handle_m8_sent(struct net_device *ndev, u16 inst, const u8 *peer_mac)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ unsigned long flags;
+ u16 cur_state;
+ s32 ret = BCME_OK;
+
+ WL_CFG_WPS_SYNC_LOCK(&cfg->wps_sync, flags);
+ cur_state = cfg->wps_session[inst].state;
+
+ if (cur_state == WPS_STATE_STARTED) {
+ /* Move to M8 sent state */
+ cfg->wps_session[inst].state = WPS_STATE_M8_SENT;
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ return BCME_OK;
+ } else {
+ /* 802.1x cases */
+ WL_DBG(("[%s][WPS] Not valid state to send M8\n", ndev->name));
+ }
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ return ret;
+}
+
+static s32
+wl_wps_session_update(struct net_device *ndev, u16 state, const u8 *peer_mac)
+{
+ s32 inst;
+ u16 mode;
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ s32 ret = BCME_ERROR;
+ unsigned long flags;
+
+ WL_CFG_WPS_SYNC_LOCK(&cfg->wps_sync, flags);
+ /* Get current instance for the given ndev */
+ inst = wl_get_wps_inst_match(cfg, ndev);
+ if (inst == BCME_ERROR) {
+ /* No active WPS session. Do Nothing. */
+ WL_DBG(("[%s][WPS] No matching instance.\n", ndev->name));
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+ return BCME_NOTFOUND;
+ }
+ mode = cfg->wps_session[inst].mode;
+ WL_CFG_WPS_SYNC_UNLOCK(&cfg->wps_sync, flags);
+
+ WL_DBG(("[%s][WPS] state:%d mode:%d Peer: " MACDBG "\n",
+ ndev->name, state, mode, MAC2STRDBG(peer_mac)));
+
+ switch (state) {
+ case WPS_STATE_M8_RECVD:
+ {
+ /* Occasionally, due to race condition between ctrl
+ * and data path, deauth ind is recvd before EAP-FAIL.
+ * Ignore deauth ind before EAP-FAIL
+ * So move to REAUTH WAIT on receiving M8 on GC and
+ * ignore deauth ind before EAP-FAIL till 'x' timeout.
+ * Kickoff a timer to monitor reauth status.
+ */
+ if (mode == WL_MODE_BSS) {
+ ret = wl_wps_handle_reauth(ndev, inst, peer_mac);
+ } else {
+ /* Nothing to be done for AP/GO mode */
+ ret = BCME_OK;
+ }
+ break;
+ }
+ case WPS_STATE_M8_SENT:
+ {
+ /* Mantain the M8 sent state to verify
+ * EAP-FAIL sent is valid
+ */
+ if (mode == WL_MODE_AP) {
+ ret = wl_wps_handle_m8_sent(ndev, inst, peer_mac);
+ } else {
+ /* Nothing to be done for STA/GC mode */
+ ret = BCME_OK;
+ }
+ break;
+ }
+ case WPS_STATE_EAP_FAIL:
+ {
+ /* Move to REAUTH WAIT following EAP-FAIL TX on GO/AP.
+ * Kickoff a timer to monitor reauth status
+ */
+ if (mode == WL_MODE_AP) {
+ ret = wl_wps_handle_reauth(ndev, inst, peer_mac);
+ } else {
+ /* Nothing to be done for STA/GC mode */
+ ret = BCME_OK;
+ }
+ break;
+ }
+ case WPS_STATE_LINKDOWN:
+ {
+ if (mode == WL_MODE_BSS) {
+ ret = wl_wps_handle_sta_linkdown(ndev, inst);
+ } else if (mode == WL_MODE_AP) {
+ /* Take action only for matching peer mac */
+ if (!memcmp(cfg->wps_session[inst].peer_mac, peer_mac, ETH_ALEN)) {
+ ret = wl_wps_handle_peersta_linkdown(ndev, inst, peer_mac);
+ }
+ }
+ break;
+ }
+ case WPS_STATE_LINKUP:
+ {
+ if (mode == WL_MODE_BSS) {
+ wl_wps_handle_sta_linkup(ndev, inst);
+ } else if (mode == WL_MODE_AP) {
+ /* Take action only for matching peer mac */
+ if (!memcmp(cfg->wps_session[inst].peer_mac, peer_mac, ETH_ALEN)) {
+ wl_wps_handle_peersta_linkup(ndev, inst, peer_mac);
+ }
+ }
+ break;
+ }
+ case WPS_STATE_DISCONNECT_CLIENT:
+ {
+ /* Disconnect STA/GC command from user space */
+ if (mode == WL_MODE_AP) {
+ ret = wl_wps_handle_disconnect_client(ndev, inst, peer_mac);
+ } else {
+ WL_ERR(("[WPS] Unsupported mode %d\n", mode));
+ }
+ break;
+ }
+ case WPS_STATE_DISCONNECT:
+ {
+ /* Disconnect command on STA/GC interface */
+ if (mode == WL_MODE_BSS) {
+ ret = wl_wps_handle_disconnect(ndev, inst, peer_mac);
+ }
+ break;
+ }
+ case WPS_STATE_CONNECT_FAIL:
+ {
+ if (mode == WL_MODE_BSS) {
+ ret = wl_wps_handle_connect_fail(ndev, inst);
+ } else {
+ WL_ERR(("[WPS] Unsupported mode %d\n", mode));
+ }
+ break;
+ }
+ case WPS_STATE_AUTHORIZE:
+ {
+ if (mode == WL_MODE_AP) {
+ /* Take action only for matching peer mac */
+ if (!memcmp(cfg->wps_session[inst].peer_mac, peer_mac, ETH_ALEN)) {
+ wl_wps_handle_authorize(ndev, inst, peer_mac);
+ } else {
+ WL_INFORM_MEM(("[WPS] Authorize Request for wrong peer\n"));
+ }
+ }
+ break;
+ }
+
+ default:
+ WL_ERR(("[WPS] Unsupported state:%d mode:%d\n", state, mode));
+ ret = BCME_ERROR;
+ }
+
+ return ret;
+}
+
+#define EAP_EXP_ATTRIB_DATA_OFFSET 14
+void
+wl_handle_wps_states(struct net_device *ndev, u8 *pkt, u16 len, bool direction)
+{
+ eapol_header_t *eapol_hdr;
+ bool tx_packet = direction;
+ u16 eapol_type;
+ u16 mode;
+ u8 *peer_mac;
+
+ if (!ndev || !pkt) {
+ WL_ERR(("[WPS] Invalid arg\n"));
+ return;
+ }
+
+ if (len < (ETHER_HDR_LEN + EAPOL_HDR_LEN)) {
+ WL_ERR(("[WPS] Invalid len\n"));
+ return;
+ }
+
+ eapol_hdr = (eapol_header_t *)pkt;
+ eapol_type = eapol_hdr->type;
+
+ peer_mac = tx_packet ? eapol_hdr->eth.ether_dhost :
+ eapol_hdr->eth.ether_shost;
+ /*
+ * The implementation assumes only one WPS session would be active
+ * per interface at a time. Even for hostap, the wps_pin session
+ * is limited to one enrollee/client at a time. A session is marked
+ * started on WSC_START and gets cleared from below contexts
+ * a) Deauth/link down before reaching EAP-FAIL state. (Fail case)
+ * b) Link up following EAP-FAIL. (success case)
+ * c) Link up timeout after EAP-FAIL. (Fail case)
+ */
+
+ if (eapol_type == EAP_PACKET) {
+ wl_eap_header_t *eap;
+
+ if (len > sizeof(*eap)) {
+ eap = (wl_eap_header_t *)(pkt + ETHER_HDR_LEN + EAPOL_HDR_LEN);
+ if (eap->type == EAP_EXPANDED_TYPE) {
+ wl_eap_exp_t *exp = (wl_eap_exp_t *)eap->data;
+ if (eap->length > EAP_EXP_HDR_MIN_LENGTH) {
+ /* opcode is at fixed offset */
+ u8 opcode = exp->opcode;
+ u16 eap_len = ntoh16(eap->length);
+
+ WL_DBG(("[%s][WPS] EAP EXPANDED packet. opcode:%x len:%d\n",
+ ndev->name, opcode, eap_len));
+ if (opcode == EAP_WSC_MSG) {
+ const u8 *msg;
+ const u8* parse_buf = exp->data;
+ /* Check if recvd pkt is fragmented */
+ if ((!tx_packet) &&
+ (exp->flags &
+ EAP_EXP_FLAGS_FRAGMENTED_DATA)) {
+ if ((eap_len - EAP_EXP_ATTRIB_DATA_OFFSET)
+ > 2) {
+ parse_buf +=
+ EAP_EXP_FRAGMENT_LEN_OFFSET;
+ eap_len -=
+ EAP_EXP_FRAGMENT_LEN_OFFSET;
+ WL_DBG(("Rcvd EAP"
+ " fragmented pkt\n"));
+ } else {
+ /* If recvd pkt is fragmented
+ * and does not have
+ * length field drop the packet.
+ */
+ return;
+ }
+ }
+
+ msg = wl_find_attribute(parse_buf,
+ (eap_len - EAP_EXP_ATTRIB_DATA_OFFSET),
+ EAP_ATTRIB_MSGTYPE);
+ if (unlikely(!msg)) {
+ WL_ERR(("[WPS] ATTRIB MSG not found!\n"));
+ } else if ((*msg == EAP_WSC_MSG_M8) &&
+ !tx_packet) {
+ WL_INFORM_MEM(("[%s][WPS] M8\n",
+ ndev->name));
+ wl_wps_session_update(ndev,
+ WPS_STATE_M8_RECVD, peer_mac);
+ } else if ((*msg == EAP_WSC_MSG_M8) &&
+ tx_packet) {
+ WL_INFORM_MEM(("[%s][WPS] M8 Sent\n",
+ ndev->name));
+ wl_wps_session_update(ndev,
+ WPS_STATE_M8_SENT, peer_mac);
+ } else {
+ WL_DBG(("[%s][WPS] EAP WSC MSG: 0x%X\n",
+ ndev->name, *msg));
+ }
+ } else if (opcode == EAP_WSC_START) {
+ /* WSC session started. WSC_START - Tx from GO/AP.
+ * Session will be deleted on successful link up or
+ * on failure (deauth context)
+ */
+ mode = tx_packet ? WL_MODE_AP : WL_MODE_BSS;
+ wl_wps_session_add(ndev, mode, peer_mac);
+ WL_INFORM_MEM(("[%s][WPS] WSC_START Mode:%d\n",
+ ndev->name, mode));
+ } else if (opcode == EAP_WSC_DONE) {
+ /* WSC session done. TX on STA/GC. RX on GO/AP
+ * On devices where config file save fails, it may
+ * return WPS_NAK with config_error:0. But the
+ * connection would still proceed. Hence don't let
+ * state machine depend on WSC DONE.
+ */
+ WL_INFORM_MEM(("[%s][WPS] WSC_DONE\n", ndev->name));
+ }
+ }
+ }
+
+ if (eap->code == EAP_CODE_FAILURE) {
+ /* EAP_FAIL */
+ WL_INFORM_MEM(("[%s][WPS] EAP_FAIL\n", ndev->name));
+ wl_wps_session_update(ndev,
+ WPS_STATE_EAP_FAIL, peer_mac);
+ }
+ }
+ }
+}
+#endif /* WL_WPS_SYNC */
+
+s32
+wl_cfg80211_sup_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *event, void *data)
+{
+ int err = BCME_OK;
+ u32 status = ntoh32(event->status);
+ struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg);
+ u32 reason = ntoh32(event->reason);
+
+ if ((status == WLC_SUP_KEYED || status == WLC_SUP_KEYXCHANGE_WAIT_G1) &&
+ reason == WLC_E_SUP_OTHER) {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0))
+ /* NL80211_CMD_PORT_AUTHORIZED supported above >= 4.15 */
+ cfg80211_port_authorized(ndev, (u8 *)wl_read_prof(cfg, ndev, WL_PROF_BSSID),
+ GFP_KERNEL);
+ WL_INFORM_MEM(("4way HS finished. port authorized event sent\n"));
+#elif ((LINUX_VERSION_CODE > KERNEL_VERSION(3, 14, 0)) || \
+ defined(WL_VENDOR_EXT_SUPPORT))
+ err = wl_cfgvendor_send_async_event(bcmcfg_to_wiphy(cfg), ndev,
+ BRCM_VENDOR_EVENT_PORT_AUTHORIZED, NULL, 0);
+ WL_INFORM_MEM(("4way HS finished. port authorized event sent\n"));
+#else
+ /* not supported in kernel <= 3,14,0 */
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) */
+ } else if (status < WLC_SUP_KEYXCHANGE_WAIT_G1 && reason != WLC_E_SUP_OTHER) {
+ /* if any failure seen while 4way HS, should send NL80211_CMD_DISCONNECT */
+ WL_ERR(("4way HS error. status:%d, reason:%d\n", status, reason));
+ CFG80211_DISCONNECTED(ndev, 0, NULL, 0, false, GFP_KERNEL);
+ }
+
+ return err;
+}
+
+#ifdef WL_BCNRECV
+static s32
+wl_bcnrecv_aborted_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data)
+{
+ s32 status = ntoh32(e->status);
+ struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg);
+ /* Abort fakeapscan, when Roam is in progress */
+ if (status == WLC_E_STATUS_RXBCN_ABORT) {
+ wl_android_bcnrecv_stop(ndev, WL_BCNRECV_ROAMABORT);
+ } else {
+ WL_ERR(("UNKNOWN STATUS. status:%d\n", status));
+ }
+ return BCME_OK;
+}
+#endif /* WL_BCNRECV */
+
+#ifdef WL_MBO
+static s32
+wl_mbo_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data)
+{
+ s32 err = 0;
+ wl_event_mbo_t *mbo_evt = (wl_event_mbo_t *)data;
+ wl_event_mbo_cell_nw_switch_t *cell_sw_evt = NULL;
+ wl_btm_event_type_data_t *evt_data = NULL;
+
+ WL_INFORM(("MBO: Evt %u\n", mbo_evt->type));
+
+ if (mbo_evt->type == WL_MBO_E_CELLULAR_NW_SWITCH) {
+ cell_sw_evt = (wl_event_mbo_cell_nw_switch_t *)mbo_evt->data;
+ BCM_REFERENCE(cell_sw_evt);
+ SUPP_EVENT(("CTRL-EVENT-CELLULAR-SWITCH", "reason %d cur_assoc_time_left %u "
+ "reassoc_delay %u\n", cell_sw_evt->reason,
+ cell_sw_evt->assoc_time_remain, cell_sw_evt->reassoc_delay));
+ } else if (mbo_evt->type == WL_MBO_E_BTM_RCVD) {
+ evt_data = (wl_btm_event_type_data_t *)mbo_evt->data;
+ if (evt_data->version != WL_BTM_EVENT_DATA_VER_1) {
+ WL_ERR(("version mismatch. rcvd %u expected %u\n",
+ evt_data->version, WL_BTM_EVENT_DATA_VER_1));
+ return -1;
+ }
+ SUPP_EVENT(("CTRL-EVENT-BRCM-BTM-REQ-RCVD", "reason=%u\n",
+ evt_data->transition_reason));
+ } else {
+ WL_INFORM(("UNKNOWN EVENT. type:%u\n", mbo_evt->type));
+ }
+ return err;
+}
+#endif /* WL_MBO */
+
+#ifdef WL_CAC_TS
+static s32
+wl_cfg80211_cac_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data)
+{
+ u32 event = ntoh32(e->event_type);
+ s32 status = ntoh32(e->status);
+ s32 reason = ntoh32(e->reason);
+
+ BCM_REFERENCE(reason);
+
+ if (event == WLC_E_ADDTS_IND) {
+ /* The supp log format of adding ts_delay in success case needs to be maintained */
+ if (status == WLC_E_STATUS_SUCCESS) {
+ uint *ts_delay = (uint *)data;
+ BCM_REFERENCE(ts_delay);
+ SUPP_EVENT(("CTRL-EVENT-CAC-ADDTS", "status=%d reason=%d ts_delay=%u\n",
+ status, reason, *ts_delay));
+ } else {
+ SUPP_EVENT(("CTRL-EVENT-CAC-ADDTS", "status=%d reason=%d\n",
+ status, reason));
+ }
+ } else if (event == WLC_E_DELTS_IND) {
+ SUPP_EVENT(("CTRL-EVENT-CAC-DELTS", "status=%d reason=%d\n", status, reason));
+ }
+
+ return BCME_OK;
+}
+#endif /* WL_CAC_TS */
+
+#if defined(WL_MBO) || defined(WL_OCE)
+static s32
+wl_bssid_prune_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data)
+{
+ s32 err = 0;
+ uint reason = 0;
+ wl_bssid_pruned_evt_info_t *evt_info = (wl_bssid_pruned_evt_info_t *)data;
+
+ if (evt_info->version == WL_BSSID_PRUNE_EVT_VER_1) {
+ if (evt_info->reason == WLC_E_PRUNE_ASSOC_RETRY_DELAY) {
+ /* MBO assoc retry delay */
+ reason = WIFI_PRUNE_ASSOC_RETRY_DELAY;
+ SUPP_EVENT(("CTRL-EVENT-BRCM-BSSID-PRUNED", "ssid=%s bssid=" MACF
+ " reason=%u timeout_val=%u(ms)\n", evt_info->SSID,
+ ETHER_TO_MACF(evt_info->BSSID), reason, evt_info->time_remaining));
+ } else if (evt_info->reason == WLC_E_PRUNE_RSSI_ASSOC_REJ) {
+ /* OCE RSSI-based assoc rejection */
+ reason = WIFI_PRUNE_RSSI_ASSOC_REJ;
+ SUPP_EVENT(("CTRL-EVENT-BRCM-BSSID-PRUNED", "ssid=%s bssid=" MACF
+ " reason=%u timeout_val=%u(ms) rssi_threshold=%d(dBm)\n",
+ evt_info->SSID, ETHER_TO_MACF(evt_info->BSSID),
+ reason, evt_info->time_remaining, evt_info->rssi_threshold));
+ } else {
+ /* Invalid other than the assoc retry delay/RSSI assoc rejection
+ * in the current handler
+ */
+ BCM_REFERENCE(reason);
+ WL_INFORM(("INVALID. reason:%u\n", evt_info->reason));
+ }
+ } else {
+ WL_INFORM(("version mismatch. rcvd %u expected %u\n", evt_info->version,
+ WL_BSSID_PRUNE_EVT_VER_1));
+ }
+ return err;
+}
+#endif /* WL_MBO || WL_OCE */
+#ifdef RTT_SUPPORT
+static s32
+wl_cfg80211_rtt_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data)
+{
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
+ wl_event_msg_t event;
+
+ (void)memcpy_s(&event, sizeof(wl_event_msg_t),
+ e, sizeof(wl_event_msg_t));
+ return dhd_rtt_event_handler(dhdp, &event, data);
+}
+#endif /* RTT_SUPPORT */
+
+static s32
+wl_notify_dos_status(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data)
+{
+ u32 event = ntoh32(e->event_type);
+ s32 status = ntoh32(e->status);
+
+ if (event == WLC_E_IND_DOS_STATUS)
+ {
+ WL_INFORM(("DOS_STATUS_IND_EVENT_DETECTED\n"));
+ if ((status) == 1) {
+ WL_INFORM(("NORMAL\n"));
+ }
+ else if ((status) == 2) {
+ WL_INFORM(("ALERT\n"));
+ }
+ else if ((status) == 3) {
+ WL_INFORM(("PROTECTED\n"));
+ }
+ else if ((status) == 4) {
+ WL_INFORM(("MONITOR\n"));
+ }
+ else {
+ WL_INFORM(("STATE_UNKNOWN\n"));
+ }
+
+ }
+ else
+ WL_INFORM(("unknown_event\n"));
+ return 0;
+}
+void
+wl_print_verinfo(struct bcm_cfg80211 *cfg)
+{
+ char *ver_ptr;
+ uint32 alloc_len = MOD_PARAM_INFOLEN;
+
+ if (!cfg) {
+ WL_ERR(("cfg is NULL\n"));
+ return;
+ }
+
+ ver_ptr = (char *)MALLOCZ(cfg->osh, alloc_len);
+ if (!ver_ptr) {
+ WL_ERR(("Failed to alloc ver_ptr\n"));
+ return;
+ }
+
+ if (!dhd_os_get_version(bcmcfg_to_prmry_ndev(cfg),
+ TRUE, &ver_ptr, alloc_len)) {
+ WL_ERR(("DHD Version: %s\n", ver_ptr));
+ }
+
+ if (!dhd_os_get_version(bcmcfg_to_prmry_ndev(cfg),
+ FALSE, &ver_ptr, alloc_len)) {
+ WL_ERR(("F/W Version: %s\n", ver_ptr));
+ }
+
+ MFREE(cfg->osh, ver_ptr, alloc_len);
+}
+#if defined(WL_DISABLE_HE_SOFTAP) || defined(WL_DISABLE_HE_P2P)
+typedef struct {
+ uint16 id;
+ uint16 len;
+ uint32 val;
+} he_xtlv_v32;
+
+ static bool
+wl_he_get_uint_cb(void *ctx, uint16 *id, uint16 *len)
+{
+ he_xtlv_v32 *v32 = ctx;
+
+ *id = v32->id;
+ *len = v32->len;
+
+ return FALSE;
+}
+
+ static void
+wl_he_pack_uint_cb(void *ctx, uint16 id, uint16 len, uint8 *buf)
+{
+ he_xtlv_v32 *v32 = ctx;
+
+ BCM_REFERENCE(id);
+ BCM_REFERENCE(len);
+
+ v32->val = htod32(v32->val);
+
+ switch (v32->len) {
+ case sizeof(uint8):
+ *buf = (uint8)v32->val;
+ break;
+ case sizeof(uint16):
+ store16_ua(buf, (uint16)v32->val);
+ break;
+ case sizeof(uint32):
+ store32_ua(buf, v32->val);
+ break;
+ default:
+ /* ASSERT(0); */
+ break;
+ }
+}
+
+int wl_cfg80211_set_he_mode(struct net_device *dev, struct bcm_cfg80211 *cfg,
+ s32 bssidx, u32 interface_type, bool set)
+{
+ bcm_xtlv_t read_he_xtlv;
+ uint8 se_he_xtlv[32];
+ int se_he_xtlv_len = sizeof(se_he_xtlv);
+ he_xtlv_v32 v32;
+ u32 he_feature = 0;
+ s32 err = 0;
+ u32 he_interface = 0;
+
+ read_he_xtlv.id = WL_HE_CMD_FEATURES;
+ read_he_xtlv.len = 0;
+ err = wldev_iovar_getbuf_bsscfg(dev, "he", &read_he_xtlv, sizeof(read_he_xtlv),
+ cfg->ioctl_buf, WLC_IOCTL_SMLEN, bssidx, NULL);
+ if (err < 0) {
+ if (err == BCME_UNSUPPORTED) {
+ /* HE not supported. Do nothing. */
+ return BCME_OK;
+ }
+ WL_ERR(("HE get failed. error=%d\n", err));
+ } else {
+ he_feature = *(int*)cfg->ioctl_buf;
+ he_feature = dtoh32(he_feature);
+ }
+
+ v32.id = WL_HE_CMD_FEATURES;
+ v32.len = sizeof(s32);
+ if (interface_type == WL_IF_TYPE_P2P_DISC) {
+ he_interface = WL_HE_FEATURES_HE_P2P;
+ } else if (interface_type == WL_IF_TYPE_AP) {
+ he_interface = WL_HE_FEATURES_HE_AP;
+ } else {
+ WL_ERR(("HE request for Invalid interface type"));
+ err = BCME_BADARG;
+ return err;
+ }
+
+ if (set) {
+ v32.val = (he_feature | he_interface);
+ } else {
+ v32.val = (he_feature & ~he_interface);
+ }
+
+ err = bcm_pack_xtlv_buf((void *)&v32, se_he_xtlv, sizeof(se_he_xtlv),
+ BCM_XTLV_OPTION_ALIGN32, wl_he_get_uint_cb, wl_he_pack_uint_cb,
+ &se_he_xtlv_len);
+ if (err != BCME_OK) {
+ WL_ERR(("failed to pack he settvl=%d\n", err));
+ }
+
+ err = wldev_iovar_setbuf_bsscfg(dev, "he", &se_he_xtlv, sizeof(se_he_xtlv),
+ cfg->ioctl_buf, WLC_IOCTL_SMLEN, bssidx, &cfg->ioctl_buf_sync);
+ if (err < 0) {
+ WL_ERR(("failed to set he features, error=%d\n", err));
+ }
+ WL_INFORM(("Set HE[%d] done\n", set));
+
+ return err;
+}
+#endif /* WL_DISABLE_HE_SOFTAP || WL_DISABLE_HE_P2P */
+
+/* Get the concurrency mode */
+int wl_cfg80211_get_concurrency_mode(struct bcm_cfg80211 *cfg)
+{
+ struct net_info *iter, *next;
+ uint cmode = CONCURRENCY_MODE_NONE;
+ u32 connected_cnt = 0;
+ u32 pre_channel = 0, channel = 0;
+ u32 pre_band = 0;
+ u32 chanspec = 0;
+ u32 band = 0;
+
+ connected_cnt = wl_get_drv_status_all(cfg, CONNECTED);
+ if (connected_cnt <= 1) {
+ return cmode;
+ }
+ GCC_DIAGNOSTIC_PUSH_SUPPRESS_CAST();
+ for_each_ndev(cfg, iter, next) {
+ if (iter->ndev) {
+ if (wl_get_drv_status(cfg, CONNECTED, iter->ndev)) {
+ if (wldev_iovar_getint(iter->ndev, "chanspec",
+ (s32 *)&chanspec) == BCME_OK) {
+ channel = wf_chspec_ctlchan(
+ wl_chspec_driver_to_host(chanspec));
+ band = (channel <= CH_MAX_2G_CHANNEL) ?
+ IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
+ }
+ if ((!pre_channel && channel)) {
+ pre_band = band;
+ pre_channel = channel;
+ } else if (pre_channel) {
+ if ((pre_band == band) && (pre_channel == channel)) {
+ cmode = CONCURRENCY_SCC_MODE;
+ goto exit;
+ } else if ((pre_band == band) && (pre_channel != channel)) {
+ cmode = CONCURRENCY_VSDB_MODE;
+ goto exit;
+ } else if (pre_band != band) {
+ cmode = CONCURRENCY_RSDB_MODE;
+ goto exit;
+ }
+ }
+ }
+ }
+ }
+#if defined(STRICT_GCC_WARNINGS) && defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == \
+ 4 && __GNUC_MINOR__ >= 6))
+_Pragma("GCC diagnostic pop")
+#endif // endif
+exit:
+ return cmode;
+}
+#ifdef WL_CHAN_UTIL
+static s32
+wl_cfg80211_bssload_report_event_handler(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
+ const wl_event_msg_t *e, void *data)
+{
+ s32 err = BCME_OK;
+ struct sk_buff *skb = NULL;
+ s32 status = ntoh32(e->status);
+ u8 chan_use_percentage = 0;
+#if (defined(CONFIG_ARCH_MSM) && defined(SUPPORT_WDEV_CFG80211_VENDOR_EVENT_ALLOC)) || \
+ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
+ struct net_device *ndev = bcmcfg_to_prmry_ndev(cfg);
+#endif /* (defined(CONFIG_ARCH_MSM) && defined(SUPPORT_WDEV_CFG80211_VENDOR_EVENT_ALLOC)) || */
+ /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0) */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0))
+ struct wiphy *wiphy = bcmcfg_to_wiphy(cfg);
+ uint len;
+ gfp_t kflags;
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) */
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0))
+ len = CU_ATTR_HDR_LEN + sizeof(u8);
+ kflags = in_atomic() ? GFP_ATOMIC : GFP_KERNEL;
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) */
+
+#if (defined(CONFIG_ARCH_MSM) && defined(SUPPORT_WDEV_CFG80211_VENDOR_EVENT_ALLOC)) || \
+ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
+ skb = cfg80211_vendor_event_alloc(wiphy, ndev_to_wdev(ndev), len,
+ BRCM_VENDOR_EVENT_CU, kflags);
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0))
+ skb = cfg80211_vendor_event_alloc(wiphy, len, BRCM_VENDOR_EVENT_CU, kflags);
+#else
+ /* No support exist */
+#endif /* (defined(CONFIG_ARCH_MSM) && defined(SUPPORT_WDEV_CFG80211_VENDOR_EVENT_ALLOC)) || */
+ /* LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0) */
+ if (!skb) {
+ WL_ERR(("skb alloc failed"));
+ return -ENOMEM;
+ }
+
+ if ((status == WLC_E_STATUS_SUCCESS) && data) {
+ wl_bssload_t *bssload_report = (wl_bssload_t *)data;
+ chan_use_percentage = (bssload_report->chan_util * 100) / 255;
+ WL_DBG(("ChannelUtilization=%hhu\n", chan_use_percentage));
+ err = nla_put_u8(skb, CU_ATTR_PERCENTAGE, chan_use_percentage);
+ if (err < 0) {
+ WL_ERR(("Failed to put CU_ATTR_PERCENTAGE, err:%d\n", err));
+ }
+ }
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0))
+ cfg80211_vendor_event(skb, kflags);
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) */
+
+ return err;
+}
+
+#define WL_CHAN_UTIL_DEFAULT_INTERVAL 3000
+#define WL_CHAN_UTIL_THRESH_MIN 15
+#define WL_CHAN_UTIL_THRESH_INTERVAL 10
+#ifndef CUSTOM_CU_INTERVAL
+#define CUSTOM_CU_INTERVAL WL_CHAN_UTIL_DEFAULT_INTERVAL
+#endif /* CUSTOM_CU_INTERVAL */
+
+static s32
+wl_cfg80211_start_bssload_report(struct net_device *ndev)
+{
+ s32 err = BCME_OK;
+ wl_bssload_cfg_t blcfg;
+ u8 i;
+ struct bcm_cfg80211 *cfg;
+
+ if (!ndev) {
+ return -ENODEV;
+ }
+
+ cfg = wl_get_cfg(ndev);
+ if (!cfg) {
+ return -ENODEV;
+ }
+
+ /* Typecasting to void as the buffer size is same as the memset size */
+ (void)memset_s(&blcfg, sizeof(wl_bssload_cfg_t), 0, sizeof(wl_bssload_cfg_t));
+ /* Set default report interval 3 sec and 8 threshhold levels between 15 to 85% */
+ blcfg.rate_limit_msec = CUSTOM_CU_INTERVAL;
+ blcfg.num_util_levels = MAX_BSSLOAD_LEVELS;
+ for (i = 0; i < MAX_BSSLOAD_LEVELS; i++) {
+ blcfg.util_levels[i] = (((WL_CHAN_UTIL_THRESH_MIN +
+ (i * WL_CHAN_UTIL_THRESH_INTERVAL)) * 255) / 100);
+ }
+
+ err = wldev_iovar_setbuf(ndev, "bssload_report_event", &blcfg,
+ sizeof(wl_bssload_cfg_t), cfg->ioctl_buf, WLC_IOCTL_SMLEN, &cfg->ioctl_buf_sync);
+ if (unlikely(err)) {
+ WL_ERR(("Set event_msgs error (%d)\n", err));
+ }
+
+ return err;
+}
+#endif /* WL_CHAN_UTIL */
+
+s32
+wl_cfg80211_config_suspend_events(struct net_device *ndev, bool enable)
+{
+ s8 iovbuf[WL_EVENTING_MASK_LEN + 12];
+ s8 eventmask[WL_EVENTING_MASK_LEN];
+ s32 err = 0;
+ struct bcm_cfg80211 *cfg;
+
+ if (!ndev) {
+ return -ENODEV;
+ }
+
+ cfg = wl_get_cfg(ndev);
+ if (!cfg) {
+ return -ENODEV;
+ }
+
+ mutex_lock(&cfg->event_sync);
+ err = wldev_iovar_getbuf(ndev, "event_msgs", NULL, 0, iovbuf, sizeof(iovbuf), NULL);
+ if (unlikely(err)) {
+ WL_ERR(("Get event_msgs error (%d)\n", err));
+ goto eventmsg_out;
+ }
+
+ (void)memcpy_s(eventmask, WL_EVENTING_MASK_LEN, iovbuf, WL_EVENTING_MASK_LEN);
+ /* Add set/clear of event mask under feature specific flags */
+ if (enable) {
+ WL_DBG(("%s: Enabling events on resume\n", __FUNCTION__));
+#ifdef WL_CHAN_UTIL
+ setbit(eventmask, WLC_E_BSS_LOAD);
+#endif /* WL_CHAN_UTIL */
+ } else {
+ WL_DBG(("%s: Disabling events before suspend\n", __FUNCTION__));
+#ifdef WL_CHAN_UTIL
+ clrbit(eventmask, WLC_E_BSS_LOAD);
+#endif /* WL_CHAN_UTIL */
+ }
+
+ err = wldev_iovar_setbuf(ndev, "event_msgs", eventmask, WL_EVENTING_MASK_LEN, iovbuf,
+ sizeof(iovbuf), NULL);
+ if (unlikely(err)) {
+ WL_ERR(("Set event_msgs error (%d)\n", err));
+ goto eventmsg_out;
+ }
+
+eventmsg_out:
+ mutex_unlock(&cfg->event_sync);
+ return err;
+}
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0))
+int
+wl_cfg80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
+ struct cfg80211_csa_settings *params)
+{
+ s32 err = BCME_OK;
+ s32 chan = 0;
+ u32 band = 0;
+ u32 bw = WL_CHANSPEC_BW_20;
+ chanspec_t chspec = 0;
+ wl_chan_switch_t csa_arg;
+ struct cfg80211_chan_def *chandef = ¶ms->chandef;
+ struct bcm_cfg80211 *cfg = wiphy_priv(wiphy);
+
+ dev = ndev_to_wlc_ndev(dev, cfg);
+ chan = ieee80211_frequency_to_channel(chandef->chan->center_freq);
+ band = chandef->chan->band;
+
+ WL_ERR(("netdev_ifidx(%d), target channel(%d) target bandwidth(%d),"
+ " mode(%d), count(%d)\n", dev->ifindex, chan, chandef->width,
+ params->block_tx, params->count));
+
+ if (wl_get_mode_by_netdev(cfg, dev) != WL_MODE_AP) {
+ WL_ERR(("Channel Switch doesn't support on "
+ "the non-SoftAP mode\n"));
+ return -EINVAL;
+ }
+
+ if (chan == cfg->ap_oper_channel) {
+ WL_ERR(("Channel %d is same as current operating channel,"
+ " so skip\n", chan));
+ return BCME_OK;
+ }
+
+ if (band == IEEE80211_BAND_5GHZ) {
+#ifdef APSTA_RESTRICTED_CHANNEL
+ if (chan != DEFAULT_5G_SOFTAP_CHANNEL) {
+ WL_ERR(("Invalid 5G Channel, chan=%d\n", chan));
+ return -EINVAL;
+ }
+#endif /* APSTA_RESTRICTED_CHANNEL */
+ err = wl_get_bandwidth_cap(bcmcfg_to_prmry_ndev(cfg),
+ band, &bw);
+ if (err < 0) {
+ WL_ERR(("Failed to get bandwidth information,"
+ " err=%d\n", err));
+ return err;
+ }
+ } else if (band == IEEE80211_BAND_2GHZ) {
+#ifdef APSTA_RESTRICTED_CHANNEL
+ dhd_pub_t *dhdp = (dhd_pub_t *)(cfg->pub);
+ u32 *sta_chan = (u32 *)wl_read_prof(cfg,
+ bcmcfg_to_prmry_ndev(cfg), WL_PROF_CHAN);
+
+ /* In 2GHz STA/SoftAP concurrent mode, the operating channel
+ * of STA and SoftAP should be confgiured to the same 2GHz
+ * channel. Otherwise, it is an invalid configuration.
+ */
+ if (DHD_OPMODE_STA_SOFTAP_CONCURR(dhdp) &&
+ wl_get_drv_status(cfg, CONNECTED,
+ bcmcfg_to_prmry_ndev(cfg)) && sta_chan &&
+ (*sta_chan != chan)) {
+ WL_ERR(("Invalid 2G Channel in case of STA/SoftAP"
+ " concurrent mode, sta_chan=%d, chan=%d\n",
+ *sta_chan, chan));
+ return -EINVAL;
+ }
+#endif /* APSTA_RESTRICTED_CHANNEL */
+ bw = WL_CHANSPEC_BW_20;
+ } else {
+ WL_ERR(("invalid band (%d)\n", band));
+ return -EINVAL;
+ }
+
+ chspec = wf_channel2chspec(chan, bw);
+ if (!wf_chspec_valid(chspec)) {
+ WL_ERR(("Invalid chanspec 0x%x\n", chspec));
+ return -EINVAL;
+ }
+
+ /* Send CSA to associated STAs */
+ memset(&csa_arg, 0, sizeof(wl_chan_switch_t));
+ csa_arg.mode = params->block_tx;
+ csa_arg.count = params->count;
+ csa_arg.chspec = chspec;
+ csa_arg.frame_type = CSA_BROADCAST_ACTION_FRAME;
+ csa_arg.reg = 0;
+
+ err = wldev_iovar_setbuf(dev, "csa", &csa_arg, sizeof(wl_chan_switch_t),
+ cfg->ioctl_buf, WLC_IOCTL_SMLEN, &cfg->ioctl_buf_sync);
+ if (err < 0) {
+ WL_ERR(("Failed to switch channel, err=%d\n", err));
+ }
+
+ return err;
+}
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) */
+
+#ifdef WL_WIPSEVT
+int
+wl_cfg80211_wips_event(uint16 misdeauth, char* bssid)
+{
+ s32 err = BCME_OK;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0))
+ struct sk_buff *skb;
+ gfp_t kflags;
+ struct bcm_cfg80211 *cfg;
+ struct net_device *ndev;
+ struct wiphy *wiphy;
+
+ cfg = wl_cfg80211_get_bcmcfg();
+ if (!cfg || !cfg->wdev) {
+ WL_ERR(("WIPS evt invalid arg\n"));
+ return err;
+ }
+
+ ndev = bcmcfg_to_prmry_ndev(cfg);
+ wiphy = bcmcfg_to_wiphy(cfg);
+
+ kflags = in_atomic() ? GFP_ATOMIC : GFP_KERNEL;
+ skb = CFG80211_VENDOR_EVENT_ALLOC(wiphy, ndev_to_wdev(ndev),
+ BRCM_VENDOR_WIPS_EVENT_BUF_LEN, BRCM_VENDOR_EVENT_WIPS, kflags);
+
+ if (!skb) {
+ WL_ERR(("skb alloc failed"));
+ return BCME_NOMEM;
+ }
+
+ err = nla_put_u16(skb, WIPS_ATTR_DEAUTH_CNT, misdeauth);
+ if (unlikely(err)) {
+ WL_ERR(("nla_put_u16 WIPS_ATTR_DEAUTH_CNT failed\n"));
+ goto fail;
+ }
+ err = nla_put(skb, WPPS_ATTR_DEAUTH_BSSID, ETHER_ADDR_LEN, bssid);
+ if (unlikely(err)) {
+ WL_ERR(("nla_put WPPS_ATTR_DEAUTH_BSSID failed\n"));
+ goto fail;
+ }
+ cfg80211_vendor_event(skb, kflags);
+
+ return err;
+
+fail:
+ if (skb) {
+ nlmsg_free(skb);
+ }
+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) */
+ return err;
+}
+#endif /* WL_WIPSEVT */
+
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(3, 11, 1))
+void
+wl_cfg80211_overtemp_event(struct net_device *ndev)
+{
+ return;
+}
+#else
+void
+wl_cfg80211_overtemp_event(struct net_device *ndev)
+{
+ struct bcm_cfg80211 *cfg = wl_get_cfg(ndev);
+ struct wiphy *wiphy;
+ struct sk_buff *skb;
+ gfp_t kflags;
+
+ kflags = in_atomic() ? GFP_ATOMIC : GFP_KERNEL;
+
+ if (!cfg || !cfg->wdev) {
+ WL_ERR(("cfg=%p wdev=%p\n", cfg, (cfg ? cfg->wdev : NULL)));
+ return;
+ }
+
+ wiphy = cfg->wdev->wiphy;
+ if (!wiphy) {
+ WL_ERR(("wiphy is NULL\n"));
+ return;
+ }
+
+#if (defined(CONFIG_ARCH_MSM) && defined(SUPPORT_WDEV_CFG80211_VENDOR_EVENT_ALLOC)) || \
+ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 0)
+ skb = cfg80211_vendor_event_alloc(wiphy, ndev_to_wdev(ndev), 0,
+ BRCM_VENDOR_EVENT_OVERTEMP, kflags);
+#else
+ skb = cfg80211_vendor_event_alloc(wiphy, 0, BRCM_VENDOR_EVENT_OVERTEMP,
+ kflags);
+#endif // endif
+ cfg80211_vendor_event(skb, kflags);
+}
+#endif /* LINUX_VERSION_CODE <= KERNEL_VERSION(3, 11, 1) */
--
Gitblit v1.6.2