diff options
Diffstat (limited to 'drivers/net/wireless/sd8897/mlan')
45 files changed, 43796 insertions, 40486 deletions
diff --git a/drivers/net/wireless/sd8897/mlan/mlan.h b/drivers/net/wireless/sd8897/mlan/mlan.h index a341e1547099..d0db9016ce63 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan.h +++ b/drivers/net/wireless/sd8897/mlan/mlan.h @@ -3,7 +3,7 @@ * @brief This file declares all APIs that will be called from MOAL module. * It also defines the data structures used for APIs between MLAN and MOAL. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 diff --git a/drivers/net/wireless/sd8897/mlan/mlan_11ac.c b/drivers/net/wireless/sd8897/mlan/mlan_11ac.c index ba2d1fe8f776..c17ae7996e5c 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_11ac.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_11ac.c @@ -1,8 +1,8 @@ /** @file mlan_11ac.c - * + * * @brief This file contains the functions for station ioctl. * - * Copyright (C) 2011-2012, Marvell International Ltd. + * Copyright (C) 2011-2012, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -39,7 +39,7 @@ ********************************************************/ /** - * @brief determine the center frquency center index for bandwidth + * @brief determine the center frquency center index for bandwidth * of 80 MHz and 160 MHz * * @param pmpriv A pointer to mlan_private structure @@ -52,71 +52,71 @@ t_u8 wlan_get_center_freq_idx(IN mlan_private * pmpriv, - IN t_u8 band, IN t_u32 pri_chan, IN t_u8 chan_bw) + IN t_u8 band, IN t_u32 pri_chan, IN t_u8 chan_bw) { - t_u8 center_freq_idx = 0; - - if (band & BAND_AAC) { - switch (pri_chan) { - case 36: - case 40: - case 44: - case 48: - if (chan_bw == CHANNEL_BW_80MHZ) { - center_freq_idx = 42; - break; - } - case 52: - case 56: - case 60: - case 64: - if (chan_bw == CHANNEL_BW_80MHZ) { - center_freq_idx = 58; - break; - } else if (chan_bw == CHANNEL_BW_160MHZ) { - center_freq_idx = 50; - break; - } - case 100: - case 104: - case 108: - case 112: - if (chan_bw == CHANNEL_BW_80MHZ) { - center_freq_idx = 106; - break; - } - case 116: - case 120: - case 124: - case 128: - if (chan_bw == CHANNEL_BW_80MHZ) { - center_freq_idx = 122; - break; - } else if (chan_bw == CHANNEL_BW_160MHZ) { - center_freq_idx = 114; - break; - } - case 132: - case 136: - case 140: - case 144: - if (chan_bw == CHANNEL_BW_80MHZ) { - center_freq_idx = 138; - break; - } - case 149: - case 153: - case 157: - case 161: - if (chan_bw == CHANNEL_BW_80MHZ) { - center_freq_idx = 155; - break; - } - default: /* error. go to the default */ - center_freq_idx = 42; - } - } - return center_freq_idx; + t_u8 center_freq_idx = 0; + + if (band & BAND_AAC) { + switch (pri_chan) { + case 36: + case 40: + case 44: + case 48: + if (chan_bw == CHANNEL_BW_80MHZ) { + center_freq_idx = 42; + break; + } + case 52: + case 56: + case 60: + case 64: + if (chan_bw == CHANNEL_BW_80MHZ) { + center_freq_idx = 58; + break; + } else if (chan_bw == CHANNEL_BW_160MHZ) { + center_freq_idx = 50; + break; + } + case 100: + case 104: + case 108: + case 112: + if (chan_bw == CHANNEL_BW_80MHZ) { + center_freq_idx = 106; + break; + } + case 116: + case 120: + case 124: + case 128: + if (chan_bw == CHANNEL_BW_80MHZ) { + center_freq_idx = 122; + break; + } else if (chan_bw == CHANNEL_BW_160MHZ) { + center_freq_idx = 114; + break; + } + case 132: + case 136: + case 140: + case 144: + if (chan_bw == CHANNEL_BW_80MHZ) { + center_freq_idx = 138; + break; + } + case 149: + case 153: + case 157: + case 161: + if (chan_bw == CHANNEL_BW_80MHZ) { + center_freq_idx = 155; + break; + } + default: /* error. go to the default */ + center_freq_idx = 42; + } + } + return center_freq_idx; } /** @@ -130,25 +130,25 @@ wlan_get_center_freq_idx(IN mlan_private * pmpriv, */ static void wlan_fill_cap_info(mlan_private * priv, - MrvlIETypes_VHTCap_t * pvht_cap, t_u8 bands) + MrvlIETypes_VHTCap_t * pvht_cap, t_u8 bands) { - mlan_adapter *pmadapter = priv->adapter; - t_u32 usr_dot_11ac_dev_cap; + mlan_adapter *pmadapter = priv->adapter; + t_u32 usr_dot_11ac_dev_cap; - ENTER(); + ENTER(); - if (bands & BAND_A) - usr_dot_11ac_dev_cap = pmadapter->usr_dot_11ac_dev_cap_a; - else - usr_dot_11ac_dev_cap = pmadapter->usr_dot_11ac_dev_cap_bg; + if (bands & BAND_A) + usr_dot_11ac_dev_cap = pmadapter->usr_dot_11ac_dev_cap_a; + else + usr_dot_11ac_dev_cap = pmadapter->usr_dot_11ac_dev_cap_bg; - pvht_cap->vht_cap.vht_cap_info = usr_dot_11ac_dev_cap; + pvht_cap->vht_cap.vht_cap_info = usr_dot_11ac_dev_cap; - LEAVE(); + LEAVE(); } -/** - * @brief Set/get 11ac configuration +/** + * @brief Set/get 11ac configuration * * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer @@ -157,174 +157,219 @@ wlan_fill_cap_info(mlan_private * priv, */ static mlan_status wlan_11ac_ioctl_vhtcfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_11ac_cfg *cfg = MNULL; - t_u16 cmd_action = 0; - t_u32 usr_vht_cap_info = 0; - t_u32 cfg_value = 0; - t_u32 hw_value = 0; - t_u8 nss = 0; - - ENTER(); - -#define VHT_CAP_INFO_BIT_FIELDS ( MBIT(4)|MBIT(5)|MBIT(6)|MBIT(7)|\ + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_11ac_cfg *cfg = MNULL; + t_u16 cmd_action = 0; + t_u32 usr_vht_cap_info = 0; + t_u32 cfg_value = 0; + t_u32 hw_value = 0; + t_u8 nss = 0; + + ENTER(); + +#define VHT_CAP_INFO_BIT_FIELDS (MBIT(4)|MBIT(5)|MBIT(6)|MBIT(7)|\ MBIT(11)|MBIT(12)|MBIT(19)|MBIT(20)|\ - MBIT(21)|MBIT(22)|MBIT(28)|MBIT(29) ) - - cfg = (mlan_ds_11ac_cfg *) pioctl_req->pbuf; - - if (pioctl_req->action == MLAN_ACT_SET) { - /** SET operation */ - /** validate the user input and correct it if necessary */ - /** set bit fileds */ - usr_vht_cap_info = VHT_CAP_INFO_BIT_FIELDS & - cfg->param.vht_cfg.vht_cap_info & pmadapter->hw_dot_11ac_dev_cap; - /** set MAX MPDU LEN field (bit 0 - bit 1) */ - cfg_value = GET_VHTCAP_MAXMPDULEN(cfg->param.vht_cfg.vht_cap_info); - hw_value = GET_VHTCAP_MAXMPDULEN(pmadapter->hw_dot_11ac_dev_cap); - SET_VHTCAP_MAXMPDULEN(usr_vht_cap_info, MIN(cfg_value, hw_value)); - /** set CHAN Width Set field (bit 2 - bit 3) */ - cfg_value = GET_VHTCAP_CHWDSET(cfg->param.vht_cfg.vht_cap_info); - hw_value = GET_VHTCAP_CHWDSET(pmadapter->hw_dot_11ac_dev_cap); - SET_VHTCAP_CHWDSET(usr_vht_cap_info, MIN(cfg_value, hw_value)); - /** set Rx STBC field (bit 8 - bit 10) */ - cfg_value = GET_VHTCAP_RXSTBC(cfg->param.vht_cfg.vht_cap_info); - hw_value = GET_VHTCAP_RXSTBC(pmadapter->hw_dot_11ac_dev_cap); - SET_VHTCAP_RXSTBC(usr_vht_cap_info, MIN(cfg_value, hw_value)); - /** set Steering Number of BFer Ant (bit 13 - bit 15) */ - cfg_value = GET_VHTCAP_SNBFERANT(cfg->param.vht_cfg.vht_cap_info); - hw_value = GET_VHTCAP_SNBFERANT(pmadapter->hw_dot_11ac_dev_cap); - SET_VHTCAP_SNBFERANT(usr_vht_cap_info, MIN(cfg_value, hw_value)); - /** set Number of Sounding Dimension (bit 16 - bit 18) */ - cfg_value = GET_VHTCAP_NUMSNDDM(cfg->param.vht_cfg.vht_cap_info); - hw_value = GET_VHTCAP_NUMSNDDM(pmadapter->hw_dot_11ac_dev_cap); - SET_VHTCAP_NUMSNDDM(usr_vht_cap_info, MIN(cfg_value, hw_value)); - /** set Number of Max AMPDU Length Exponent (bit 23 - bit 25) */ - cfg_value = GET_VHTCAP_MAXAMPDULENEXP(cfg->param.vht_cfg.vht_cap_info); - hw_value = GET_VHTCAP_MAXAMPDULENEXP(pmadapter->hw_dot_11ac_dev_cap); - SET_VHTCAP_MAXAMPDULENEXP(usr_vht_cap_info, MIN(cfg_value, hw_value)); - /** set VHT Link Adaptation Capable (bit 26 - bit 27) */ - cfg_value = GET_VHTCAP_LINKADPCAP(cfg->param.vht_cfg.vht_cap_info); - hw_value = GET_VHTCAP_LINKADPCAP(pmadapter->hw_dot_11ac_dev_cap); - SET_VHTCAP_LINKADPCAP(usr_vht_cap_info, MIN(cfg_value, hw_value)); - /** update the user setting if it is beyond the hw capabiliteis */ - cfg->param.vht_cfg.vht_cap_info = usr_vht_cap_info; - PRINTM(MINFO, "Set: vht cap info 0x%x\n", usr_vht_cap_info); - - /** update the RX MCS map */ + MBIT(21)|MBIT(22)|MBIT(28)|MBIT(29)) + + cfg = (mlan_ds_11ac_cfg *) pioctl_req->pbuf; + + if (pioctl_req->action == MLAN_ACT_SET) { + /** SET operation */ + /** validate the user input and correct it if necessary */ + /** set bit fileds */ + usr_vht_cap_info = VHT_CAP_INFO_BIT_FIELDS & + cfg->param.vht_cfg.vht_cap_info & + pmadapter->hw_dot_11ac_dev_cap; + /** set MAX MPDU LEN field (bit 0 - bit 1) */ + cfg_value = + GET_VHTCAP_MAXMPDULEN(cfg->param.vht_cfg.vht_cap_info); + hw_value = + GET_VHTCAP_MAXMPDULEN(pmadapter->hw_dot_11ac_dev_cap); + SET_VHTCAP_MAXMPDULEN(usr_vht_cap_info, + MIN(cfg_value, hw_value)); + /** set CHAN Width Set field (bit 2 - bit 3) */ + cfg_value = GET_VHTCAP_CHWDSET(cfg->param.vht_cfg.vht_cap_info); + hw_value = GET_VHTCAP_CHWDSET(pmadapter->hw_dot_11ac_dev_cap); + SET_VHTCAP_CHWDSET(usr_vht_cap_info, MIN(cfg_value, hw_value)); + /** set Rx STBC field (bit 8 - bit 10) */ + cfg_value = GET_VHTCAP_RXSTBC(cfg->param.vht_cfg.vht_cap_info); + hw_value = GET_VHTCAP_RXSTBC(pmadapter->hw_dot_11ac_dev_cap); + SET_VHTCAP_RXSTBC(usr_vht_cap_info, MIN(cfg_value, hw_value)); + /** set Steering Number of BFer Ant (bit 13 - bit 15) */ + cfg_value = + GET_VHTCAP_SNBFERANT(cfg->param.vht_cfg.vht_cap_info); + hw_value = GET_VHTCAP_SNBFERANT(pmadapter->hw_dot_11ac_dev_cap); + SET_VHTCAP_SNBFERANT(usr_vht_cap_info, + MIN(cfg_value, hw_value)); + /** set Number of Sounding Dimension (bit 16 - bit 18) */ + cfg_value = + GET_VHTCAP_NUMSNDDM(cfg->param.vht_cfg.vht_cap_info); + hw_value = GET_VHTCAP_NUMSNDDM(pmadapter->hw_dot_11ac_dev_cap); + SET_VHTCAP_NUMSNDDM(usr_vht_cap_info, MIN(cfg_value, hw_value)); + /** set Number of Max AMPDU Length Exponent (bit 23 - bit 25) */ + cfg_value = + GET_VHTCAP_MAXAMPDULENEXP(cfg->param.vht_cfg. + vht_cap_info); + hw_value = + GET_VHTCAP_MAXAMPDULENEXP(pmadapter-> + hw_dot_11ac_dev_cap); + SET_VHTCAP_MAXAMPDULENEXP(usr_vht_cap_info, + MIN(cfg_value, hw_value)); + /** set VHT Link Adaptation Capable (bit 26 - bit 27) */ + cfg_value = + GET_VHTCAP_LINKADPCAP(cfg->param.vht_cfg.vht_cap_info); + hw_value = + GET_VHTCAP_LINKADPCAP(pmadapter->hw_dot_11ac_dev_cap); + SET_VHTCAP_LINKADPCAP(usr_vht_cap_info, + MIN(cfg_value, hw_value)); + /** update the user setting if it is beyond the hw capabiliteis */ + cfg->param.vht_cfg.vht_cap_info = usr_vht_cap_info; + PRINTM(MINFO, "Set: vht cap info 0x%x\n", usr_vht_cap_info); + + /** update the RX MCS map */ #define NO_NSS_SUPPORT 0x3 - if (cfg->param.vht_cfg.txrx & MLAN_RADIO_RX) { - /* use the previous user value */ - if (cfg->param.vht_cfg.vht_rx_mcs == 0xffffffff) - cfg->param.vht_cfg.vht_rx_mcs = - GET_VHTMCS(pmadapter->usr_dot_11ac_mcs_support); - for (nss = 1; nss <= 8; nss++) { - cfg_value = GET_VHTNSSMCS(cfg->param.vht_cfg.vht_rx_mcs, nss); - hw_value = - GET_DEVNSSRXMCS(pmadapter->hw_dot_11ac_mcs_support, nss); - if ((hw_value == NO_NSS_SUPPORT) || - (cfg_value == NO_NSS_SUPPORT)) - SET_VHTNSSMCS(cfg->param.vht_cfg.vht_rx_mcs, nss, - NO_NSS_SUPPORT); - else - SET_VHTNSSMCS(cfg->param.vht_cfg.vht_rx_mcs, nss, - MIN(cfg_value, hw_value)); - } - PRINTM(MINFO, "Set: vht rx mcs set 0x%08x\n", - cfg->param.vht_cfg.vht_rx_mcs); - /* use the previous user value */ - if (cfg->param.vht_cfg.vht_tx_mcs == 0xffffffff) - cfg->param.vht_cfg.vht_tx_mcs = - GET_VHTMCS(pmadapter->usr_dot_11ac_mcs_support >> 16); - for (nss = 1; nss <= 8; nss++) { - cfg_value = GET_VHTNSSMCS(cfg->param.vht_cfg.vht_tx_mcs, nss); - hw_value = - GET_DEVNSSTXMCS(pmadapter->hw_dot_11ac_mcs_support, nss); - if ((hw_value == NO_NSS_SUPPORT) || - (cfg_value == NO_NSS_SUPPORT)) - SET_VHTNSSMCS(cfg->param.vht_cfg.vht_tx_mcs, nss, - NO_NSS_SUPPORT); - else - SET_VHTNSSMCS(cfg->param.vht_cfg.vht_tx_mcs, nss, - MIN(cfg_value, hw_value)); - } - PRINTM(MINFO, "Set: vht tx mcs set 0x%08x\n", - cfg->param.vht_cfg.vht_tx_mcs); - - RESET_DEVRXMCSMAP(pmadapter->usr_dot_11ac_mcs_support); - pmadapter->usr_dot_11ac_mcs_support |= - GET_VHTMCS(cfg->param.vht_cfg.vht_rx_mcs); - RESET_DEVTXMCSMAP(pmadapter->usr_dot_11ac_mcs_support); - pmadapter->usr_dot_11ac_mcs_support |= - (GET_VHTMCS(cfg->param.vht_cfg.vht_tx_mcs) << 16); - PRINTM(MINFO, "Set: vht mcs set 0x%08x\n", - pmadapter->usr_dot_11ac_mcs_support); - } - } - - if (pmpriv->bss_role == MLAN_BSS_ROLE_STA) { - if (cfg->param.vht_cfg.txrx & MLAN_RADIO_RX) { - /* maximum VHT configuration used in association */ - if (pioctl_req->action == MLAN_ACT_SET) { - if (cfg->param.vht_cfg.band == BAND_SELECT_BG) - pmadapter->usr_dot_11ac_dev_cap_bg = usr_vht_cap_info; - else if (cfg->param.vht_cfg.band == BAND_SELECT_A) - pmadapter->usr_dot_11ac_dev_cap_a = usr_vht_cap_info; - else { - pmadapter->usr_dot_11ac_dev_cap_bg = usr_vht_cap_info; - pmadapter->usr_dot_11ac_dev_cap_a = usr_vht_cap_info; - } - - } else { - /** GET operation */ - if (cfg->param.vht_cfg.band == BAND_SELECT_BG) { - cfg->param.vht_cfg.vht_cap_info = - pmadapter->usr_dot_11ac_dev_cap_bg; - PRINTM(MINFO, "Get: vht cap info for 2.4GHz 0x%x\n", - pmadapter->usr_dot_11ac_dev_cap_bg); - } else if (cfg->param.vht_cfg.band == BAND_SELECT_A) { - cfg->param.vht_cfg.vht_cap_info = - pmadapter->usr_dot_11ac_dev_cap_a; - PRINTM(MINFO, "Get: vht cap info for 5GHz 0x%x\n", - pmadapter->usr_dot_11ac_dev_cap_a); - } else { - PRINTM(MINFO, - "Get: invalid band selection for vht cap info\n"); - ret = MLAN_STATUS_FAILURE; - } - cfg->param.vht_cfg.vht_rx_mcs = - GET_DEVRXMCSMAP(pmadapter->usr_dot_11ac_mcs_support); - cfg->param.vht_cfg.vht_tx_mcs = - GET_DEVTXMCSMAP(pmadapter->usr_dot_11ac_mcs_support); - } - LEAVE(); - return ret; - } - } - - if (pioctl_req->action == MLAN_ACT_SET) - cmd_action = HostCmd_ACT_GEN_SET; - else - cmd_action = HostCmd_ACT_GEN_GET; - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_11AC_CFG, - cmd_action, - 0, - (t_void *) pioctl_req, - (t_void *) & cfg->param.vht_cfg); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + if (cfg->param.vht_cfg.txrx & MLAN_RADIO_RX) { + /* use the previous user value */ + if (cfg->param.vht_cfg.vht_rx_mcs == 0xffffffff) + cfg->param.vht_cfg.vht_rx_mcs = + GET_VHTMCS(pmadapter-> + usr_dot_11ac_mcs_support); + for (nss = 1; nss <= 8; nss++) { + cfg_value = + GET_VHTNSSMCS(cfg->param.vht_cfg. + vht_rx_mcs, nss); + hw_value = + GET_DEVNSSRXMCS(pmadapter-> + hw_dot_11ac_mcs_support, + nss); + if ((hw_value == NO_NSS_SUPPORT) || + (cfg_value == NO_NSS_SUPPORT)) + SET_VHTNSSMCS(cfg->param.vht_cfg. + vht_rx_mcs, nss, + NO_NSS_SUPPORT); + else + SET_VHTNSSMCS(cfg->param.vht_cfg. + vht_rx_mcs, nss, + MIN(cfg_value, hw_value)); + } + PRINTM(MINFO, "Set: vht rx mcs set 0x%08x\n", + cfg->param.vht_cfg.vht_rx_mcs); + /* use the previous user value */ + if (cfg->param.vht_cfg.vht_tx_mcs == 0xffffffff) + cfg->param.vht_cfg.vht_tx_mcs = + GET_VHTMCS(pmadapter-> + usr_dot_11ac_mcs_support >> + 16); + for (nss = 1; nss <= 8; nss++) { + cfg_value = + GET_VHTNSSMCS(cfg->param.vht_cfg. + vht_tx_mcs, nss); + hw_value = + GET_DEVNSSTXMCS(pmadapter-> + hw_dot_11ac_mcs_support, + nss); + if ((hw_value == NO_NSS_SUPPORT) || + (cfg_value == NO_NSS_SUPPORT)) + SET_VHTNSSMCS(cfg->param.vht_cfg. + vht_tx_mcs, nss, + NO_NSS_SUPPORT); + else + SET_VHTNSSMCS(cfg->param.vht_cfg. + vht_tx_mcs, nss, + MIN(cfg_value, hw_value)); + } + PRINTM(MINFO, "Set: vht tx mcs set 0x%08x\n", + cfg->param.vht_cfg.vht_tx_mcs); + + RESET_DEVRXMCSMAP(pmadapter->usr_dot_11ac_mcs_support); + pmadapter->usr_dot_11ac_mcs_support |= + GET_VHTMCS(cfg->param.vht_cfg.vht_rx_mcs); + RESET_DEVTXMCSMAP(pmadapter->usr_dot_11ac_mcs_support); + pmadapter->usr_dot_11ac_mcs_support |= + (GET_VHTMCS(cfg->param.vht_cfg.vht_tx_mcs) << + 16); + PRINTM(MINFO, "Set: vht mcs set 0x%08x\n", + pmadapter->usr_dot_11ac_mcs_support); + } + } + + if (pmpriv->bss_role == MLAN_BSS_ROLE_STA) { + if (cfg->param.vht_cfg.txrx & MLAN_RADIO_RX) { + /* maximum VHT configuration used in association */ + if (pioctl_req->action == MLAN_ACT_SET) { + if (cfg->param.vht_cfg.band == BAND_SELECT_BG) + pmadapter->usr_dot_11ac_dev_cap_bg = + usr_vht_cap_info; + else if (cfg->param.vht_cfg.band == + BAND_SELECT_A) + pmadapter->usr_dot_11ac_dev_cap_a = + usr_vht_cap_info; + else { + pmadapter->usr_dot_11ac_dev_cap_bg = + usr_vht_cap_info; + pmadapter->usr_dot_11ac_dev_cap_a = + usr_vht_cap_info; + } + + } else { + /** GET operation */ + if (cfg->param.vht_cfg.band == BAND_SELECT_BG) { + cfg->param.vht_cfg.vht_cap_info = + pmadapter-> + usr_dot_11ac_dev_cap_bg; + PRINTM(MINFO, + "Get: vht cap info for 2.4GHz 0x%x\n", + pmadapter-> + usr_dot_11ac_dev_cap_bg); + } else if (cfg->param.vht_cfg.band == + BAND_SELECT_A) { + cfg->param.vht_cfg.vht_cap_info = + pmadapter-> + usr_dot_11ac_dev_cap_a; + PRINTM(MINFO, + "Get: vht cap info for 5GHz 0x%x\n", + pmadapter-> + usr_dot_11ac_dev_cap_a); + } else { + PRINTM(MINFO, + "Get: invalid band selection for vht cap info\n"); + ret = MLAN_STATUS_FAILURE; + } + cfg->param.vht_cfg.vht_rx_mcs = + GET_DEVRXMCSMAP(pmadapter-> + usr_dot_11ac_mcs_support); + cfg->param.vht_cfg.vht_tx_mcs = + GET_DEVTXMCSMAP(pmadapter-> + usr_dot_11ac_mcs_support); + } + LEAVE(); + return ret; + } + } + + if (pioctl_req->action == MLAN_ACT_SET) + cmd_action = HostCmd_ACT_GEN_SET; + else + cmd_action = HostCmd_ACT_GEN_GET; + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_11AC_CFG, + cmd_action, + 0, + (t_void *) pioctl_req, + (t_void *) & cfg->param.vht_cfg); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } -/** +/** * @brief Get supported MCS set * * @param pmadapter A pointer to mlan_adapter structure @@ -334,47 +379,47 @@ wlan_11ac_ioctl_vhtcfg(IN pmlan_adapter pmadapter, */ static mlan_status wlan_11ac_ioctl_supported_mcs_set(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { -// mlan_ds_11ac_cfg *cfg= MNULL; -// int rx_mcs_supp; -// t_u8 mcs_set[NUM_MCS_SUPP]; + /* mlan_ds_11ac_cfg *cfg= MNULL; */ + /* int rx_mcs_supp; */ + /* t_u8 mcs_set[NUM_MCS_SUPP]; */ - ENTER(); + ENTER(); #if 0 - if (pioctl_req->action == MLAN_ACT_SET) { - PRINTM(MERROR, "Set operation is not supported\n"); - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - rx_mcs_supp = GET_11ACRXMCSSUPP(pmadapter->usr_dot_11ac_mcs_support); - /* Set MCS */ - memset(pmadapter, (t_u8 *) mcs_set, 0xff, rx_mcs_supp); - /* Clear all the other values */ - memset(pmadapter, (t_u8 *) & mcs_set[rx_mcs_supp], 0, - NUM_MCS_FIELD - rx_mcs_supp); - /* Set MCS32 with 40MHz support */ - if (ISSUPP_CHANWIDTH80(pmadapter->usr_dot_11ac_dev_cap_bg) - || ISSUPP_CHANWIDTH80(pmadapter->usr_dot_11ac_dev_cap_a) - ) - SETHT_MCS32(mcs_set); - - cfg = (mlan_ds_11ac_cfg *) pioctl_req->pbuf; - memcpy(pmadapter, cfg->param.supported_mcs_set, mcs_set, NUM_MCS_SUPP); + if (pioctl_req->action == MLAN_ACT_SET) { + PRINTM(MERROR, "Set operation is not supported\n"); + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + rx_mcs_supp = GET_11ACRXMCSSUPP(pmadapter->usr_dot_11ac_mcs_support); + /* Set MCS */ + memset(pmadapter, (t_u8 *) mcs_set, 0xff, rx_mcs_supp); + /* Clear all the other values */ + memset(pmadapter, (t_u8 *) & mcs_set[rx_mcs_supp], 0, + NUM_MCS_FIELD - rx_mcs_supp); + /* Set MCS32 with 40MHz support */ + if (ISSUPP_CHANWIDTH80(pmadapter->usr_dot_11ac_dev_cap_bg) + || ISSUPP_CHANWIDTH80(pmadapter->usr_dot_11ac_dev_cap_a) + ) + SETHT_MCS32(mcs_set); + + cfg = (mlan_ds_11ac_cfg *) pioctl_req->pbuf; + memcpy(pmadapter, cfg->param.supported_mcs_set, mcs_set, NUM_MCS_SUPP); #endif - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } /******************************************************** Global Functions ********************************************************/ -/** +/** * @brief This function prints the 802.11ac device capability - * + * * @param pmadapter A pointer to mlan_adapter structure * @param cap Capability value * @@ -383,57 +428,62 @@ wlan_11ac_ioctl_supported_mcs_set(IN pmlan_adapter pmadapter, void wlan_show_dot11acdevcap(pmlan_adapter pmadapter, t_u32 cap) { - ENTER(); - - switch (GET_VHTCAP_MAXMPDULEN(cap)) { - case 0x00: - PRINTM(MINFO, "GET_HW_SPEC: Maximum MSDU length = 3895 octets\n"); - break; - case 0x01: - PRINTM(MINFO, "GET_HW_SPEC: Maximum MSDU length = 7991 octets\n"); - break; - case 0x10: - PRINTM(MINFO, "GET_HW_SPEC: Maximum MSDU length = 11454 octets\n"); - break; - default: - PRINTM(MINFO, "Unsupport value\n"); - break; - } - - PRINTM(MINFO, "GET_HW_SPEC: HTC-VHT %s\n", - (ISSUPP_11ACVHTHTCVHT(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: VHT TXOP PS %s\n", - (ISSUPP_11ACVHTTXOPPS(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: MU RX beamformee %s\n", - (ISSUPP_11ACMURXBEAMFORMEE(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: MU TX beamformee %s\n", - (ISSUPP_11ACMUTXBEAMFORMEE(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: SU RX Beamformee %s\n", - (ISSUPP_11ACSUBEAMFORMEE(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: SU TX Beamformer %s\n", - (ISSUPP_11ACSUBEAMFORMER(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: Rx STBC %s\n", - (ISSUPP_11ACRXSTBC(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: Tx STBC %s\n", - (ISSUPP_11ACTXSTBC(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: Short GI %s for 160MHz BW\n", - (ISSUPP_11ACSGI160(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: Short GI %s for 80MHz BW\n", - (ISSUPP_11ACSGI80(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: LDPC coding %s\n", - (ISSUPP_11ACLDPC(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: Channel BW 20/40/80/160/80+80 MHz %s\n", - (ISSUPP_11ACBW8080(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: Channel BW 20/40/80/160 MHz %s\n", - (ISSUPP_11ACBW160(cap) ? "supported" : "not supported")); - - LEAVE(); - return; + ENTER(); + + switch (GET_VHTCAP_MAXMPDULEN(cap)) { + case 0x00: + PRINTM(MINFO, + "GET_HW_SPEC: Maximum MSDU length = 3895 octets\n"); + break; + case 0x01: + PRINTM(MINFO, + "GET_HW_SPEC: Maximum MSDU length = 7991 octets\n"); + break; + case 0x10: + PRINTM(MINFO, + "GET_HW_SPEC: Maximum MSDU length = 11454 octets\n"); + break; + default: + PRINTM(MINFO, "Unsupport value\n"); + break; + } + + PRINTM(MINFO, "GET_HW_SPEC: HTC-VHT %s\n", + (ISSUPP_11ACVHTHTCVHT(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: VHT TXOP PS %s\n", + (ISSUPP_11ACVHTTXOPPS(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: MU RX beamformee %s\n", + (ISSUPP_11ACMURXBEAMFORMEE(cap) ? "supported" : + "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: MU TX beamformee %s\n", + (ISSUPP_11ACMUTXBEAMFORMEE(cap) ? "supported" : + "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: SU RX Beamformee %s\n", + (ISSUPP_11ACSUBEAMFORMEE(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: SU TX Beamformer %s\n", + (ISSUPP_11ACSUBEAMFORMER(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: Rx STBC %s\n", + (ISSUPP_11ACRXSTBC(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: Tx STBC %s\n", + (ISSUPP_11ACTXSTBC(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: Short GI %s for 160MHz BW\n", + (ISSUPP_11ACSGI160(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: Short GI %s for 80MHz BW\n", + (ISSUPP_11ACSGI80(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: LDPC coding %s\n", + (ISSUPP_11ACLDPC(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: Channel BW 20/40/80/160/80+80 MHz %s\n", + (ISSUPP_11ACBW8080(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: Channel BW 20/40/80/160 MHz %s\n", + (ISSUPP_11ACBW160(cap) ? "supported" : "not supported")); + + LEAVE(); + return; } -/** +/** * @brief This function prints the 802.11ac device MCS - * + * * @param pmadapter A pointer to mlan_adapter structure * @param support Support value * @@ -442,13 +492,13 @@ wlan_show_dot11acdevcap(pmlan_adapter pmadapter, t_u32 cap) void wlan_show_dot11acmcssupport(pmlan_adapter pmadapter, t_u32 support) { - ENTER(); + ENTER(); - PRINTM(MINFO, "GET_HW_SPEC: MCSs for %2dx%2d MIMO\n", - GET_DEVRXMCSMAP(support), GET_DEVTXMCSMAP(support)); + PRINTM(MINFO, "GET_HW_SPEC: MCSs for %2dx%2d MIMO\n", + GET_DEVRXMCSMAP(support), GET_DEVTXMCSMAP(support)); - LEAVE(); - return; + LEAVE(); + return; } /** @@ -459,91 +509,91 @@ wlan_show_dot11acmcssupport(pmlan_adapter pmadapter, t_u32 support) * @param bands Supported bands * @param mcs_map 2-bit MCS map * - * @return the max data rate for long GI + * @return the max data rate for long GI */ t_u16 wlan_convert_mcsmap_to_maxrate(mlan_private * priv, t_u8 bands, t_u16 mcs_map) { - t_u8 i; - t_u8 nss; - t_u8 max_mcs; - t_u16 max_rate = 0; - t_u32 usr_vht_cap_info = 0; - mlan_adapter *pmadapter = priv->adapter; - - /* tables of the MCS map to the highest data rate (in Mbps) supported for - long GI */ - t_u16 max_rate_lgi_80MHZ[8][3] = { - {0x124, 0x15F, 0x186} - , /* NSS = 1 */ - {0x249, 0x2BE, 0x30C} - , /* NSS = 2 */ - {0x36D, 0x41D, 0x492} - , /* NSS = 3 */ - {0x492, 0x57C, 0x618} - , /* NSS = 4 */ - {0x5B6, 0x6DB, 0x79E} - , /* NSS = 5 */ - {0x6DB, 0x83A, 0x0} - , /* NSS = 6 */ - {0x7FF, 0x999, 0xAAA} - , /* NSS = 7 */ - {0x924, 0xAF8, 0xC30} /* NSS = 8 */ - }; - t_u16 max_rate_lgi_160MHZ[8][3] = { - {0x249, 0x2BE, 0x30C} - , /* NSS = 1 */ - {0x492, 0x57C, 0x618} - , /* NSS = 2 */ - {0x6DB, 0x83A, 0x0} - , /* NSS = 3 */ - {0x924, 0xAF8, 0xC30} - , /* NSS = 4 */ - {0xB6D, 0xDB6, 0xF3C} - , /* NSS = 5 */ - {0xDB6, 0x1074, 0x1248} - , /* NSS = 6 */ - {0xFFF, 0x1332, 0x1554} - , /* NSS = 7 */ - {0x1248, 0x15F0, 0x1860} /* NSS = 8 */ - }; - - if (bands & BAND_AAC) - usr_vht_cap_info = pmadapter->usr_dot_11ac_dev_cap_a; - else - usr_vht_cap_info = pmadapter->usr_dot_11ac_dev_cap_bg; - - /* find the max NSS supported */ - nss = 0; - for (i = 0; i < 8; i++) { - max_mcs = (mcs_map >> (2 * i)) & 0x3; - if (max_mcs < 3) { - nss = i; - } - } - - max_mcs = (mcs_map >> (2 * nss)) & 0x3; - /* if max_mcs is 3, nss must be 0 (SS = 1). Thus, max mcs is MCS 9 */ - if (max_mcs >= 3) - max_mcs = 2; - - if (GET_VHTCAP_CHWDSET(usr_vht_cap_info)) { - /* support 160 MHz */ - max_rate = max_rate_lgi_160MHZ[nss][max_mcs]; - if (max_rate == 0) { - /* MCS9 is not supported in NSS6 */ - max_rate = max_rate_lgi_160MHZ[nss][max_mcs - 1]; - } - - } else { - max_rate = max_rate_lgi_80MHZ[nss][max_mcs]; - if (max_rate == 0) { - /* MCS9 is not supported in NSS3 */ - max_rate = max_rate_lgi_80MHZ[nss][max_mcs - 1]; - } - } - - return max_rate; + t_u8 i; + t_u8 nss; + t_u8 max_mcs; + t_u16 max_rate = 0; + t_u32 usr_vht_cap_info = 0; + mlan_adapter *pmadapter = priv->adapter; + + /* tables of the MCS map to the highest data rate (in Mbps) supported + for long GI */ + t_u16 max_rate_lgi_80MHZ[8][3] = { + {0x124, 0x15F, 0x186} + , /* NSS = 1 */ + {0x249, 0x2BE, 0x30C} + , /* NSS = 2 */ + {0x36D, 0x41D, 0x492} + , /* NSS = 3 */ + {0x492, 0x57C, 0x618} + , /* NSS = 4 */ + {0x5B6, 0x6DB, 0x79E} + , /* NSS = 5 */ + {0x6DB, 0x83A, 0x0} + , /* NSS = 6 */ + {0x7FF, 0x999, 0xAAA} + , /* NSS = 7 */ + {0x924, 0xAF8, 0xC30} /* NSS = 8 */ + }; + t_u16 max_rate_lgi_160MHZ[8][3] = { + {0x249, 0x2BE, 0x30C} + , /* NSS = 1 */ + {0x492, 0x57C, 0x618} + , /* NSS = 2 */ + {0x6DB, 0x83A, 0x0} + , /* NSS = 3 */ + {0x924, 0xAF8, 0xC30} + , /* NSS = 4 */ + {0xB6D, 0xDB6, 0xF3C} + , /* NSS = 5 */ + {0xDB6, 0x1074, 0x1248} + , /* NSS = 6 */ + {0xFFF, 0x1332, 0x1554} + , /* NSS = 7 */ + {0x1248, 0x15F0, 0x1860} /* NSS = 8 */ + }; + + if (bands & BAND_AAC) + usr_vht_cap_info = pmadapter->usr_dot_11ac_dev_cap_a; + else + usr_vht_cap_info = pmadapter->usr_dot_11ac_dev_cap_bg; + + /* find the max NSS supported */ + nss = 0; + for (i = 0; i < 8; i++) { + max_mcs = (mcs_map >> (2 * i)) & 0x3; + if (max_mcs < 3) { + nss = i; + } + } + + max_mcs = (mcs_map >> (2 * nss)) & 0x3; + /* if max_mcs is 3, nss must be 0 (SS = 1). Thus, max mcs is MCS 9 */ + if (max_mcs >= 3) + max_mcs = 2; + + if (GET_VHTCAP_CHWDSET(usr_vht_cap_info)) { + /* support 160 MHz */ + max_rate = max_rate_lgi_160MHZ[nss][max_mcs]; + if (max_rate == 0) { + /* MCS9 is not supported in NSS6 */ + max_rate = max_rate_lgi_160MHZ[nss][max_mcs - 1]; + } + + } else { + max_rate = max_rate_lgi_80MHZ[nss][max_mcs]; + if (max_rate == 0) { + /* MCS9 is not supported in NSS3 */ + max_rate = max_rate_lgi_80MHZ[nss][max_mcs - 1]; + } + } + + return max_rate; } /** @@ -557,68 +607,74 @@ wlan_convert_mcsmap_to_maxrate(mlan_private * priv, t_u8 bands, t_u16 mcs_map) */ void wlan_fill_vht_cap_tlv(mlan_private * priv, - MrvlIETypes_VHTCap_t * pvht_cap, t_u8 bands) + MrvlIETypes_VHTCap_t * pvht_cap, t_u8 bands) { - mlan_adapter *pmadapter = priv->adapter; - t_u16 mcs_map_user = 0; - t_u16 mcs_map_resp = 0; - t_u16 mcs_map_result = 0; - t_u16 mcs_user = 0; - t_u16 mcs_resp = 0; - t_u16 nss; - - ENTER(); - - /* Fill VHT cap info */ - wlan_fill_cap_info(priv, pvht_cap, bands); - pvht_cap->vht_cap.vht_cap_info = - wlan_cpu_to_le32(pvht_cap->vht_cap.vht_cap_info); - - /* Fill VHT MCS Set */ - /* rx MCS Set, find the minimum of the user rx mcs and ap rx mcs */ - mcs_map_user = GET_DEVRXMCSMAP(pmadapter->usr_dot_11ac_mcs_support); - mcs_map_resp = wlan_le16_to_cpu(pvht_cap->vht_cap.mcs_sets.rx_mcs_map); - mcs_map_result = 0; - for (nss = 1; nss <= 8; nss++) { - mcs_user = GET_VHTNSSMCS(mcs_map_user, nss); - mcs_resp = GET_VHTNSSMCS(mcs_map_resp, nss); - if ((mcs_user == NO_NSS_SUPPORT) || (mcs_resp == NO_NSS_SUPPORT)) - SET_VHTNSSMCS(mcs_map_result, nss, NO_NSS_SUPPORT); - else - SET_VHTNSSMCS(mcs_map_result, nss, MIN(mcs_user, mcs_resp)); - } - /* rx MCS map */ - pvht_cap->vht_cap.mcs_sets.rx_mcs_map = wlan_cpu_to_le16(mcs_map_result); - - /* rx highest rate */ - pvht_cap->vht_cap.mcs_sets.rx_max_rate = - wlan_convert_mcsmap_to_maxrate(priv, bands, mcs_map_result); - pvht_cap->vht_cap.mcs_sets.rx_max_rate = - wlan_cpu_to_le16(pvht_cap->vht_cap.mcs_sets.rx_max_rate); - - /* tx MCS Set find the minimum of the user tx mcs and ap tx mcs */ - mcs_map_user = GET_DEVTXMCSMAP(pmadapter->usr_dot_11ac_mcs_support); - mcs_map_resp = wlan_le16_to_cpu(pvht_cap->vht_cap.mcs_sets.tx_mcs_map); - mcs_map_result = 0; - for (nss = 1; nss <= 8; nss++) { - mcs_user = GET_VHTNSSMCS(mcs_map_user, nss); - mcs_resp = GET_VHTNSSMCS(mcs_map_resp, nss); - if ((mcs_user == NO_NSS_SUPPORT) || (mcs_resp == NO_NSS_SUPPORT)) - SET_VHTNSSMCS(mcs_map_result, nss, NO_NSS_SUPPORT); - else - SET_VHTNSSMCS(mcs_map_result, nss, MIN(mcs_user, mcs_resp)); - } - - /* tx MCS map */ - pvht_cap->vht_cap.mcs_sets.tx_mcs_map = wlan_cpu_to_le16(mcs_map_result); - /* tx highest rate */ - pvht_cap->vht_cap.mcs_sets.tx_max_rate = - wlan_convert_mcsmap_to_maxrate(priv, bands, mcs_map_result); - pvht_cap->vht_cap.mcs_sets.tx_max_rate = - wlan_cpu_to_le16(pvht_cap->vht_cap.mcs_sets.tx_max_rate); - - LEAVE(); - return; + mlan_adapter *pmadapter = priv->adapter; + t_u16 mcs_map_user = 0; + t_u16 mcs_map_resp = 0; + t_u16 mcs_map_result = 0; + t_u16 mcs_user = 0; + t_u16 mcs_resp = 0; + t_u16 nss; + + ENTER(); + + /* Fill VHT cap info */ + wlan_fill_cap_info(priv, pvht_cap, bands); + pvht_cap->vht_cap.vht_cap_info = + wlan_cpu_to_le32(pvht_cap->vht_cap.vht_cap_info); + + /* Fill VHT MCS Set */ + /* rx MCS Set, find the minimum of the user rx mcs and ap rx mcs */ + mcs_map_user = GET_DEVRXMCSMAP(pmadapter->usr_dot_11ac_mcs_support); + mcs_map_resp = wlan_le16_to_cpu(pvht_cap->vht_cap.mcs_sets.rx_mcs_map); + mcs_map_result = 0; + for (nss = 1; nss <= 8; nss++) { + mcs_user = GET_VHTNSSMCS(mcs_map_user, nss); + mcs_resp = GET_VHTNSSMCS(mcs_map_resp, nss); + if ((mcs_user == NO_NSS_SUPPORT) || + (mcs_resp == NO_NSS_SUPPORT)) + SET_VHTNSSMCS(mcs_map_result, nss, NO_NSS_SUPPORT); + else + SET_VHTNSSMCS(mcs_map_result, nss, + MIN(mcs_user, mcs_resp)); + } + /* rx MCS map */ + pvht_cap->vht_cap.mcs_sets.rx_mcs_map = + wlan_cpu_to_le16(mcs_map_result); + + /* rx highest rate */ + pvht_cap->vht_cap.mcs_sets.rx_max_rate = + wlan_convert_mcsmap_to_maxrate(priv, bands, mcs_map_result); + pvht_cap->vht_cap.mcs_sets.rx_max_rate = + wlan_cpu_to_le16(pvht_cap->vht_cap.mcs_sets.rx_max_rate); + + /* tx MCS Set find the minimum of the user tx mcs and ap tx mcs */ + mcs_map_user = GET_DEVTXMCSMAP(pmadapter->usr_dot_11ac_mcs_support); + mcs_map_resp = wlan_le16_to_cpu(pvht_cap->vht_cap.mcs_sets.tx_mcs_map); + mcs_map_result = 0; + for (nss = 1; nss <= 8; nss++) { + mcs_user = GET_VHTNSSMCS(mcs_map_user, nss); + mcs_resp = GET_VHTNSSMCS(mcs_map_resp, nss); + if ((mcs_user == NO_NSS_SUPPORT) || + (mcs_resp == NO_NSS_SUPPORT)) + SET_VHTNSSMCS(mcs_map_result, nss, NO_NSS_SUPPORT); + else + SET_VHTNSSMCS(mcs_map_result, nss, + MIN(mcs_user, mcs_resp)); + } + + /* tx MCS map */ + pvht_cap->vht_cap.mcs_sets.tx_mcs_map = + wlan_cpu_to_le16(mcs_map_result); + /* tx highest rate */ + pvht_cap->vht_cap.mcs_sets.tx_max_rate = + wlan_convert_mcsmap_to_maxrate(priv, bands, mcs_map_result); + pvht_cap->vht_cap.mcs_sets.tx_max_rate = + wlan_cpu_to_le16(pvht_cap->vht_cap.mcs_sets.tx_max_rate); + + LEAVE(); + return; } /** @@ -628,113 +684,122 @@ wlan_fill_vht_cap_tlv(mlan_private * priv, * @param pbss_desc A pointer to BSSDescriptor_t structure * @param ppbuffer A Pointer to command buffer pointer * - * @return bytes added to the buffer + * @return bytes added to the buffer */ int wlan_cmd_append_11ac_tlv(mlan_private * pmpriv, BSSDescriptor_t * pbss_desc, - t_u8 ** ppbuffer) + t_u8 ** ppbuffer) { - pmlan_adapter pmadapter = pmpriv->adapter; - MrvlIETypes_VHTCap_t *pvht_cap; - MrvlIETypes_OperModeNtf_t *pmrvl_oper_mode; - IEEEtypes_OperModeNtf_t *pieee_oper_mode; - MrvlIETypes_VHTOprat_t *pvht_op; - t_u8 supp_chwd_set; - t_u32 usr_vht_cap_info; - int ret_len = 0; - - ENTER(); - - /* Null Checks */ - if (ppbuffer == MNULL) { - LEAVE(); - return 0; - } - if (*ppbuffer == MNULL) { - LEAVE(); - return 0; - } - if (pbss_desc->bss_band & BAND_A) - usr_vht_cap_info = pmadapter->usr_dot_11ac_dev_cap_a; - else - usr_vht_cap_info = pmadapter->usr_dot_11ac_dev_cap_bg; - - /* VHT Capabilities IE */ - if (pbss_desc->pvht_cap) { - pvht_cap = (MrvlIETypes_VHTCap_t *) * ppbuffer; - memset(pmadapter, pvht_cap, 0, sizeof(MrvlIETypes_VHTCap_t)); - pvht_cap->header.type = wlan_cpu_to_le16(VHT_CAPABILITY); - pvht_cap->header.len = sizeof(VHT_capa_t); - memcpy(pmadapter, (t_u8 *) pvht_cap + sizeof(MrvlIEtypesHeader_t), - (t_u8 *) pbss_desc->pvht_cap + sizeof(IEEEtypes_Header_t), - pvht_cap->header.len); - - wlan_fill_vht_cap_tlv(pmpriv, pvht_cap, pbss_desc->bss_band); - - HEXDUMP("VHT_CAPABILITIES IE", (t_u8 *) pvht_cap, - sizeof(MrvlIETypes_VHTCap_t)); - *ppbuffer += sizeof(MrvlIETypes_VHTCap_t); - ret_len += sizeof(MrvlIETypes_VHTCap_t); - pvht_cap->header.len = wlan_cpu_to_le16(pvht_cap->header.len); - } - - /* VHT Operation IE */ - if (pbss_desc->pvht_oprat) { - if (pmpriv->bss_mode == MLAN_BSS_MODE_IBSS) { - pvht_op = (MrvlIETypes_VHTOprat_t *) * ppbuffer; - memset(pmadapter, pvht_op, 0, sizeof(MrvlIETypes_VHTOprat_t)); - pvht_op->header.type = wlan_cpu_to_le16(VHT_OPERATION); - pvht_op->header.len = sizeof(MrvlIETypes_VHTOprat_t) - - sizeof(MrvlIEtypesHeader_t); - memcpy(pmadapter, (t_u8 *) pvht_op + sizeof(MrvlIEtypesHeader_t), - (t_u8 *) pbss_desc->pvht_oprat + sizeof(IEEEtypes_Header_t), - pvht_op->header.len); - - /* negotiate the channel width and central freq */ - /* and keep the central freq as the peer suggests */ - supp_chwd_set = GET_VHTCAP_CHWDSET(usr_vht_cap_info); - if (supp_chwd_set == VHT_CAP_CHWD_80MHZ) - pvht_op->chan_width = MIN(VHT_OPER_CHWD_80MHZ, - pbss_desc->pvht_oprat->chan_width); - else if (supp_chwd_set == VHT_CAP_CHWD_160MHZ) - pvht_op->chan_width = MIN(VHT_OPER_CHWD_160MHZ, - pbss_desc->pvht_oprat->chan_width); - else if (supp_chwd_set == VHT_CAP_CHWD_80_80MHZ) - pvht_op->chan_width = MIN(VHT_OPER_CHWD_80_80MHZ, - pbss_desc->pvht_oprat->chan_width); - else - pvht_op->chan_width = VHT_OPER_CHWD_20_40MHZ; - - HEXDUMP("VHT_OPERATION IE", (t_u8 *) pvht_op, - sizeof(MrvlIETypes_VHTOprat_t)); - *ppbuffer += sizeof(MrvlIETypes_VHTOprat_t); - ret_len += sizeof(MrvlIETypes_VHTOprat_t); - pvht_op->header.len = wlan_cpu_to_le16(pvht_op->header.len); - } - } - /* Operating Mode Notification IE */ - if (pbss_desc->poper_mode) { - pieee_oper_mode = pbss_desc->poper_mode; - pmrvl_oper_mode = (MrvlIETypes_OperModeNtf_t *) * ppbuffer; - memset(pmadapter, pmrvl_oper_mode, 0, - sizeof(MrvlIETypes_OperModeNtf_t)); - pmrvl_oper_mode->header.type = wlan_cpu_to_le16(OPER_MODE_NTF); - pmrvl_oper_mode->header.len = sizeof(t_u8); - pmrvl_oper_mode->oper_mode = pieee_oper_mode->oper_mode; - - HEXDUMP("OPER MODE NTF IE", (t_u8 *) pmrvl_oper_mode, - sizeof(MrvlIETypes_OperModeNtf_t)); - *ppbuffer += sizeof(MrvlIETypes_OperModeNtf_t); - ret_len += sizeof(MrvlIETypes_OperModeNtf_t); - pmrvl_oper_mode->header.len = - wlan_cpu_to_le16(pmrvl_oper_mode->header.len); - } - - LEAVE(); - return ret_len; + pmlan_adapter pmadapter = pmpriv->adapter; + MrvlIETypes_VHTCap_t *pvht_cap; + MrvlIETypes_OperModeNtf_t *pmrvl_oper_mode; + IEEEtypes_OperModeNtf_t *pieee_oper_mode; + MrvlIETypes_VHTOprat_t *pvht_op; + t_u8 supp_chwd_set; + t_u32 usr_vht_cap_info; + int ret_len = 0; + + ENTER(); + + /* Null Checks */ + if (ppbuffer == MNULL) { + LEAVE(); + return 0; + } + if (*ppbuffer == MNULL) { + LEAVE(); + return 0; + } + if (pbss_desc->bss_band & BAND_A) + usr_vht_cap_info = pmadapter->usr_dot_11ac_dev_cap_a; + else + usr_vht_cap_info = pmadapter->usr_dot_11ac_dev_cap_bg; + + /* VHT Capabilities IE */ + if (pbss_desc->pvht_cap) { + pvht_cap = (MrvlIETypes_VHTCap_t *) * ppbuffer; + memset(pmadapter, pvht_cap, 0, sizeof(MrvlIETypes_VHTCap_t)); + pvht_cap->header.type = wlan_cpu_to_le16(VHT_CAPABILITY); + pvht_cap->header.len = sizeof(VHT_capa_t); + memcpy(pmadapter, + (t_u8 *) pvht_cap + sizeof(MrvlIEtypesHeader_t), + (t_u8 *) pbss_desc->pvht_cap + + sizeof(IEEEtypes_Header_t), pvht_cap->header.len); + + wlan_fill_vht_cap_tlv(pmpriv, pvht_cap, pbss_desc->bss_band); + + HEXDUMP("VHT_CAPABILITIES IE", (t_u8 *) pvht_cap, + sizeof(MrvlIETypes_VHTCap_t)); + *ppbuffer += sizeof(MrvlIETypes_VHTCap_t); + ret_len += sizeof(MrvlIETypes_VHTCap_t); + pvht_cap->header.len = wlan_cpu_to_le16(pvht_cap->header.len); + } + + /* VHT Operation IE */ + if (pbss_desc->pvht_oprat) { + if (pmpriv->bss_mode == MLAN_BSS_MODE_IBSS) { + pvht_op = (MrvlIETypes_VHTOprat_t *) * ppbuffer; + memset(pmadapter, pvht_op, 0, + sizeof(MrvlIETypes_VHTOprat_t)); + pvht_op->header.type = wlan_cpu_to_le16(VHT_OPERATION); + pvht_op->header.len = sizeof(MrvlIETypes_VHTOprat_t) - + sizeof(MrvlIEtypesHeader_t); + memcpy(pmadapter, + (t_u8 *) pvht_op + sizeof(MrvlIEtypesHeader_t), + (t_u8 *) pbss_desc->pvht_oprat + + sizeof(IEEEtypes_Header_t), pvht_op->header.len); + + /* negotiate the channel width and central freq */ + /* and keep the central freq as the peer suggests */ + supp_chwd_set = GET_VHTCAP_CHWDSET(usr_vht_cap_info); + if (supp_chwd_set == VHT_CAP_CHWD_80MHZ) + pvht_op->chan_width = MIN(VHT_OPER_CHWD_80MHZ, + pbss_desc-> + pvht_oprat-> + chan_width); + else if (supp_chwd_set == VHT_CAP_CHWD_160MHZ) + pvht_op->chan_width = MIN(VHT_OPER_CHWD_160MHZ, + pbss_desc-> + pvht_oprat-> + chan_width); + else if (supp_chwd_set == VHT_CAP_CHWD_80_80MHZ) + pvht_op->chan_width = + MIN(VHT_OPER_CHWD_80_80MHZ, + pbss_desc->pvht_oprat->chan_width); + else + pvht_op->chan_width = VHT_OPER_CHWD_20_40MHZ; + + HEXDUMP("VHT_OPERATION IE", (t_u8 *) pvht_op, + sizeof(MrvlIETypes_VHTOprat_t)); + *ppbuffer += sizeof(MrvlIETypes_VHTOprat_t); + ret_len += sizeof(MrvlIETypes_VHTOprat_t); + pvht_op->header.len = + wlan_cpu_to_le16(pvht_op->header.len); + } + } + /* Operating Mode Notification IE */ + if (pbss_desc->poper_mode) { + pieee_oper_mode = pbss_desc->poper_mode; + pmrvl_oper_mode = (MrvlIETypes_OperModeNtf_t *) * ppbuffer; + memset(pmadapter, pmrvl_oper_mode, 0, + sizeof(MrvlIETypes_OperModeNtf_t)); + pmrvl_oper_mode->header.type = wlan_cpu_to_le16(OPER_MODE_NTF); + pmrvl_oper_mode->header.len = sizeof(t_u8); + pmrvl_oper_mode->oper_mode = pieee_oper_mode->oper_mode; + + HEXDUMP("OPER MODE NTF IE", (t_u8 *) pmrvl_oper_mode, + sizeof(MrvlIETypes_OperModeNtf_t)); + *ppbuffer += sizeof(MrvlIETypes_OperModeNtf_t); + ret_len += sizeof(MrvlIETypes_OperModeNtf_t); + pmrvl_oper_mode->header.len = + wlan_cpu_to_le16(pmrvl_oper_mode->header.len); + } + + LEAVE(); + return ret_len; } -/** +/** * @brief 11ac configuration handler * * @param pmadapter A pointer to mlan_adapter structure @@ -745,39 +810,40 @@ wlan_cmd_append_11ac_tlv(mlan_private * pmpriv, BSSDescriptor_t * pbss_desc, mlan_status wlan_11ac_cfg_ioctl(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_11ac_cfg *cfg = MNULL; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_11ac_cfg)) { - PRINTM(MINFO, "MLAN bss IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_11ac_cfg); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - cfg = (mlan_ds_11ac_cfg *) pioctl_req->pbuf; - switch (cfg->sub_command) { - case MLAN_OID_11AC_VHT_CFG: - status = wlan_11ac_ioctl_vhtcfg(pmadapter, pioctl_req); - break; - case MLAN_OID_11AC_CFG_SUPPORTED_MCS_SET: - status = wlan_11ac_ioctl_supported_mcs_set(pmadapter, pioctl_req); - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - LEAVE(); - return status; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_11ac_cfg *cfg = MNULL; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_11ac_cfg)) { + PRINTM(MINFO, "MLAN bss IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_11ac_cfg); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + cfg = (mlan_ds_11ac_cfg *) pioctl_req->pbuf; + switch (cfg->sub_command) { + case MLAN_OID_11AC_VHT_CFG: + status = wlan_11ac_ioctl_vhtcfg(pmadapter, pioctl_req); + break; + case MLAN_OID_11AC_CFG_SUPPORTED_MCS_SET: + status = wlan_11ac_ioctl_supported_mcs_set(pmadapter, + pioctl_req); + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + LEAVE(); + return status; } -/** +/** * @brief This function prepares 11ac cfg command - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action the action: GET or SET @@ -786,36 +852,36 @@ wlan_11ac_cfg_ioctl(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) */ mlan_status wlan_cmd_11ac_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - pmlan_adapter pmadapter = pmpriv->adapter; - HostCmd_DS_11AC_CFG *vhtcfg = &cmd->params.vhtcfg; - mlan_ds_11ac_vht_cfg *vht_cfg = (mlan_ds_11ac_vht_cfg *) pdata_buf; - - ENTER(); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_11AC_CFG); - cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_11AC_CFG) + S_DS_GEN); - vhtcfg->action = wlan_cpu_to_le16(cmd_action); - vhtcfg->band_config = vht_cfg->band & 0xFF; - vhtcfg->misc_config = vht_cfg->txrx & 0x3; - if (vhtcfg->misc_config != 2) - vhtcfg->misc_config |= (vht_cfg->bwcfg << 2); - - vhtcfg->vht_cap_info = wlan_cpu_to_le32(vht_cfg->vht_cap_info); - vht_cfg->vht_rx_mcs = wlan_cpu_to_le32(vht_cfg->vht_rx_mcs); - memcpy(pmadapter, &vhtcfg->vht_supp_mcs_set[0], - &vht_cfg->vht_rx_mcs, sizeof(t_u32)); - vht_cfg->vht_tx_mcs = wlan_cpu_to_le32(vht_cfg->vht_tx_mcs); - memcpy(pmadapter, &vhtcfg->vht_supp_mcs_set[4], - &vht_cfg->vht_tx_mcs, sizeof(t_u32)); - LEAVE(); - return MLAN_STATUS_SUCCESS; + pmlan_adapter pmadapter = pmpriv->adapter; + HostCmd_DS_11AC_CFG *vhtcfg = &cmd->params.vhtcfg; + mlan_ds_11ac_vht_cfg *vht_cfg = (mlan_ds_11ac_vht_cfg *) pdata_buf; + + ENTER(); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_11AC_CFG); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_11AC_CFG) + S_DS_GEN); + vhtcfg->action = wlan_cpu_to_le16(cmd_action); + vhtcfg->band_config = vht_cfg->band & 0xFF; + vhtcfg->misc_config = vht_cfg->txrx & 0x3; + if (vhtcfg->misc_config != 2) + vhtcfg->misc_config |= (vht_cfg->bwcfg << 2); + + vhtcfg->vht_cap_info = wlan_cpu_to_le32(vht_cfg->vht_cap_info); + vht_cfg->vht_rx_mcs = wlan_cpu_to_le32(vht_cfg->vht_rx_mcs); + memcpy(pmadapter, &vhtcfg->vht_supp_mcs_set[0], + &vht_cfg->vht_rx_mcs, sizeof(t_u32)); + vht_cfg->vht_tx_mcs = wlan_cpu_to_le32(vht_cfg->vht_tx_mcs); + memcpy(pmadapter, &vhtcfg->vht_supp_mcs_set[4], + &vht_cfg->vht_tx_mcs, sizeof(t_u32)); + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of 11accfg - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -824,33 +890,35 @@ wlan_cmd_11ac_cfg(IN pmlan_private pmpriv, */ mlan_status wlan_ret_11ac_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, IN mlan_ioctl_req * pioctl_buf) { - pmlan_adapter pmadapter = pmpriv->adapter; - mlan_ds_11ac_cfg *cfg = MNULL; - HostCmd_DS_11AC_CFG *vhtcfg = &resp->params.vhtcfg; - - ENTER(); - cfg = (mlan_ds_11ac_cfg *) pioctl_buf->pbuf; - if (pioctl_buf && (wlan_le16_to_cpu(vhtcfg->action) == HostCmd_ACT_GEN_GET)) { - cfg->param.vht_cfg.band = vhtcfg->band_config; - cfg->param.vht_cfg.txrx = vhtcfg->misc_config & 0x03; - if (cfg->param.vht_cfg.txrx & 0x1) - cfg->param.vht_cfg.bwcfg = (vhtcfg->misc_config & 0x04) >> 2; - else - cfg->param.vht_cfg.bwcfg = 0; - - cfg->param.vht_cfg.vht_cap_info = - wlan_le32_to_cpu(vhtcfg->vht_cap_info); - memcpy(pmadapter, &cfg->param.vht_cfg.vht_rx_mcs, - &vhtcfg->vht_supp_mcs_set[0], sizeof(t_u32)); - cfg->param.vht_cfg.vht_rx_mcs = - wlan_le32_to_cpu(cfg->param.vht_cfg.vht_rx_mcs); - memcpy(pmadapter, &cfg->param.vht_cfg.vht_tx_mcs, - &vhtcfg->vht_supp_mcs_set[4], sizeof(t_u32)); - cfg->param.vht_cfg.vht_tx_mcs = - wlan_le32_to_cpu(cfg->param.vht_cfg.vht_tx_mcs); - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + pmlan_adapter pmadapter = pmpriv->adapter; + mlan_ds_11ac_cfg *cfg = MNULL; + HostCmd_DS_11AC_CFG *vhtcfg = &resp->params.vhtcfg; + + ENTER(); + cfg = (mlan_ds_11ac_cfg *) pioctl_buf->pbuf; + if (pioctl_buf && + (wlan_le16_to_cpu(vhtcfg->action) == HostCmd_ACT_GEN_GET)) { + cfg->param.vht_cfg.band = vhtcfg->band_config; + cfg->param.vht_cfg.txrx = vhtcfg->misc_config & 0x03; + if (cfg->param.vht_cfg.txrx & 0x1) + cfg->param.vht_cfg.bwcfg = + (vhtcfg->misc_config & 0x04) >> 2; + else + cfg->param.vht_cfg.bwcfg = 0; + + cfg->param.vht_cfg.vht_cap_info = + wlan_le32_to_cpu(vhtcfg->vht_cap_info); + memcpy(pmadapter, &cfg->param.vht_cfg.vht_rx_mcs, + &vhtcfg->vht_supp_mcs_set[0], sizeof(t_u32)); + cfg->param.vht_cfg.vht_rx_mcs = + wlan_le32_to_cpu(cfg->param.vht_cfg.vht_rx_mcs); + memcpy(pmadapter, &cfg->param.vht_cfg.vht_tx_mcs, + &vhtcfg->vht_supp_mcs_set[4], sizeof(t_u32)); + cfg->param.vht_cfg.vht_tx_mcs = + wlan_le32_to_cpu(cfg->param.vht_cfg.vht_tx_mcs); + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_11ac.h b/drivers/net/wireless/sd8897/mlan/mlan_11ac.h index afc1a5db2d9f..e13e1835f627 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_11ac.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_11ac.h @@ -1,8 +1,8 @@ /** @file mlan_11ac.h - * + * * @brief This file contains the functions for station ioctl. * - * Copyright (C) 2011-2012, Marvell International Ltd. + * Copyright (C) 2011-2012, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -28,23 +28,23 @@ void wlan_show_dot11acdevcap(pmlan_adapter pmadapter, t_u32 cap); void wlan_show_dot11acmcssupport(pmlan_adapter pmadapter, t_u32 support); t_u16 wlan_convert_mcsmap_to_maxrate(mlan_private * priv, t_u8 bands, - t_u16 mcs_map); + t_u16 mcs_map); void wlan_fill_vht_cap_tlv(mlan_private * priv, MrvlIETypes_VHTCap_t * pvht_cap, - t_u8 bands); + t_u8 bands); int wlan_cmd_append_11ac_tlv(mlan_private * pmpriv, BSSDescriptor_t * pbss_desc, - t_u8 ** ppbuffer); + t_u8 ** ppbuffer); mlan_status wlan_11ac_cfg_ioctl(pmlan_adapter pmadapter, - pmlan_ioctl_req pioctl_req); + pmlan_ioctl_req pioctl_req); mlan_status wlan_cmd_11ac_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf); mlan_status wlan_ret_11ac_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); t_u8 wlan_get_center_freq_idx(IN mlan_private * pmpriv, - IN t_u8 band, IN t_u32 pri_chan, IN t_u8 chan_bw); + IN t_u8 band, IN t_u32 pri_chan, IN t_u8 chan_bw); #endif /* _MLAN_11AC_H_ */ diff --git a/drivers/net/wireless/sd8897/mlan/mlan_11d.c b/drivers/net/wireless/sd8897/mlan/mlan_11d.c index e7df8232d8b2..f7bc58b41bcf 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_11d.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_11d.c @@ -39,25 +39,25 @@ Change log: typedef struct _region_code_mapping { /** Region */ - t_u8 region[COUNTRY_CODE_LEN]; + t_u8 region[COUNTRY_CODE_LEN]; /** Code */ - t_u8 code; + t_u8 code; } region_code_mapping_t; /** Region code mapping table */ static region_code_mapping_t region_code_mapping[] = { - {"US ", 0x10}, /* US FCC */ - {"CA ", 0x20}, /* IC Canada */ - {"SG ", 0x10}, /* Singapore */ - {"EU ", 0x30}, /* ETSI */ - {"AU ", 0x30}, /* Australia */ - {"KR ", 0x30}, /* Republic Of Korea */ - {"FR ", 0x32}, /* France */ - {"JP ", 0x40}, /* Japan */ - {"JP ", 0x41}, /* Japan */ - {"CN ", 0x50}, /* China */ - {"JP ", 0xFE}, /* Japan */ - {"JP ", 0xFF}, /* Japan special */ + {"US ", 0x10}, /* US FCC */ + {"CA ", 0x20}, /* IC Canada */ + {"SG ", 0x10}, /* Singapore */ + {"EU ", 0x30}, /* ETSI */ + {"AU ", 0x30}, /* Australia */ + {"KR ", 0x30}, /* Republic Of Korea */ + {"FR ", 0x32}, /* France */ + {"JP ", 0x40}, /* Japan */ + {"JP ", 0x41}, /* Japan */ + {"CN ", 0x50}, /* China */ + {"JP ", 0xFE}, /* Japan */ + {"JP ", 0xFF}, /* Japan special */ }; /** Default Tx power */ @@ -69,55 +69,55 @@ static region_code_mapping_t region_code_mapping[] = { /* Following two structures define the supported channels */ /** Channels for 802.11b/g */ static chan_freq_power_t channel_freq_power_UN_BG[] = { - {1, 2412, TX_PWR_DEFAULT}, - {2, 2417, TX_PWR_DEFAULT}, - {3, 2422, TX_PWR_DEFAULT}, - {4, 2427, TX_PWR_DEFAULT}, - {5, 2432, TX_PWR_DEFAULT}, - {6, 2437, TX_PWR_DEFAULT}, - {7, 2442, TX_PWR_DEFAULT}, - {8, 2447, TX_PWR_DEFAULT}, - {9, 2452, TX_PWR_DEFAULT}, - {10, 2457, TX_PWR_DEFAULT}, - {11, 2462, TX_PWR_DEFAULT}, - {12, 2467, TX_PWR_DEFAULT}, - {13, 2472, TX_PWR_DEFAULT}, - {14, 2484, TX_PWR_DEFAULT} + {1, 2412, TX_PWR_DEFAULT}, + {2, 2417, TX_PWR_DEFAULT}, + {3, 2422, TX_PWR_DEFAULT}, + {4, 2427, TX_PWR_DEFAULT}, + {5, 2432, TX_PWR_DEFAULT}, + {6, 2437, TX_PWR_DEFAULT}, + {7, 2442, TX_PWR_DEFAULT}, + {8, 2447, TX_PWR_DEFAULT}, + {9, 2452, TX_PWR_DEFAULT}, + {10, 2457, TX_PWR_DEFAULT}, + {11, 2462, TX_PWR_DEFAULT}, + {12, 2467, TX_PWR_DEFAULT}, + {13, 2472, TX_PWR_DEFAULT}, + {14, 2484, TX_PWR_DEFAULT} }; /** Channels for 802.11a/j */ static chan_freq_power_t channel_freq_power_UN_AJ[] = { - {8, 5040, TX_PWR_DEFAULT}, - {12, 5060, TX_PWR_DEFAULT}, - {16, 5080, TX_PWR_DEFAULT}, - {34, 5170, TX_PWR_DEFAULT}, - {38, 5190, TX_PWR_DEFAULT}, - {42, 5210, TX_PWR_DEFAULT}, - {46, 5230, TX_PWR_DEFAULT}, - {36, 5180, TX_PWR_DEFAULT}, - {40, 5200, TX_PWR_DEFAULT}, - {44, 5220, TX_PWR_DEFAULT}, - {48, 5240, TX_PWR_DEFAULT}, - {52, 5260, TX_PWR_DEFAULT}, - {56, 5280, TX_PWR_DEFAULT}, - {60, 5300, TX_PWR_DEFAULT}, - {64, 5320, TX_PWR_DEFAULT}, - {100, 5500, TX_PWR_DEFAULT}, - {104, 5520, TX_PWR_DEFAULT}, - {108, 5540, TX_PWR_DEFAULT}, - {112, 5560, TX_PWR_DEFAULT}, - {116, 5580, TX_PWR_DEFAULT}, - {120, 5600, TX_PWR_DEFAULT}, - {124, 5620, TX_PWR_DEFAULT}, - {128, 5640, TX_PWR_DEFAULT}, - {132, 5660, TX_PWR_DEFAULT}, - {136, 5680, TX_PWR_DEFAULT}, - {140, 5700, TX_PWR_DEFAULT}, - {149, 5745, TX_PWR_DEFAULT}, - {153, 5765, TX_PWR_DEFAULT}, - {157, 5785, TX_PWR_DEFAULT}, - {161, 5805, TX_PWR_DEFAULT}, - {165, 5825, TX_PWR_DEFAULT}, + {8, 5040, TX_PWR_DEFAULT}, + {12, 5060, TX_PWR_DEFAULT}, + {16, 5080, TX_PWR_DEFAULT}, + {34, 5170, TX_PWR_DEFAULT}, + {38, 5190, TX_PWR_DEFAULT}, + {42, 5210, TX_PWR_DEFAULT}, + {46, 5230, TX_PWR_DEFAULT}, + {36, 5180, TX_PWR_DEFAULT}, + {40, 5200, TX_PWR_DEFAULT}, + {44, 5220, TX_PWR_DEFAULT}, + {48, 5240, TX_PWR_DEFAULT}, + {52, 5260, TX_PWR_DEFAULT}, + {56, 5280, TX_PWR_DEFAULT}, + {60, 5300, TX_PWR_DEFAULT}, + {64, 5320, TX_PWR_DEFAULT}, + {100, 5500, TX_PWR_DEFAULT}, + {104, 5520, TX_PWR_DEFAULT}, + {108, 5540, TX_PWR_DEFAULT}, + {112, 5560, TX_PWR_DEFAULT}, + {116, 5580, TX_PWR_DEFAULT}, + {120, 5600, TX_PWR_DEFAULT}, + {124, 5620, TX_PWR_DEFAULT}, + {128, 5640, TX_PWR_DEFAULT}, + {132, 5660, TX_PWR_DEFAULT}, + {136, 5680, TX_PWR_DEFAULT}, + {140, 5700, TX_PWR_DEFAULT}, + {149, 5745, TX_PWR_DEFAULT}, + {153, 5765, TX_PWR_DEFAULT}, + {157, 5785, TX_PWR_DEFAULT}, + {161, 5805, TX_PWR_DEFAULT}, + {165, 5825, TX_PWR_DEFAULT}, /* {240, 4920, TX_PWR_DEFAULT}, {244, 4940, TX_PWR_DEFAULT}, {248, 4960, TX_PWR_DEFAULT}, @@ -145,22 +145,22 @@ channels for 11J JP 10M channel gap */ static t_u8 * wlan_11d_code_2_region(pmlan_adapter pmadapter, t_u8 code) { - t_u8 i; - t_u8 size = sizeof(region_code_mapping) / sizeof(region_code_mapping_t); - - ENTER(); - - /* Look for code in mapping table */ - for (i = 0; i < size; i++) { - if (region_code_mapping[i].code == code) { - LEAVE(); - return (region_code_mapping[i].region); - } - } - - LEAVE(); - /* Default is US */ - return (region_code_mapping[0].region); + t_u8 i; + t_u8 size = sizeof(region_code_mapping) / sizeof(region_code_mapping_t); + + ENTER(); + + /* Look for code in mapping table */ + for (i = 0; i < size; i++) { + if (region_code_mapping[i].code == code) { + LEAVE(); + return (region_code_mapping[i].region); + } + } + + LEAVE(); + /* Default is US */ + return (region_code_mapping[0].region); } /** @@ -175,44 +175,50 @@ wlan_11d_code_2_region(pmlan_adapter pmadapter, t_u8 code) */ static t_u8 wlan_11d_channel_known(pmlan_adapter pmadapter, - t_u8 band, - t_u8 chan, parsed_region_chan_11d_t * parsed_region_chan) + t_u8 band, + t_u8 chan, parsed_region_chan_11d_t * parsed_region_chan) { - chan_power_11d_t *pchan_pwr = parsed_region_chan->chan_pwr; - t_u8 no_of_chan = parsed_region_chan->no_of_chan; - t_u8 i = 0; - t_u8 ret = MFALSE; - mlan_private *pmpriv; - - ENTER(); - - HEXDUMP("11D: parsed_region_chan", (t_u8 *) pchan_pwr, - sizeof(chan_power_11d_t) * no_of_chan); - - /* Search channel */ - for (i = 0; i < no_of_chan; i++) { - if (chan == pchan_pwr[i].chan && band == pchan_pwr[i].band) { - PRINTM(MINFO, "11D: Found channel:%d (band:%d)\n", chan, band); - ret = MTRUE; - - if (band & BAND_A) { - /* If chan is a DFS channel, we need to see an AP on it */ - if ((pmpriv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_STA)) - && wlan_11h_radar_detect_required(pmpriv, chan)) { - PRINTM(MINFO, "11H: DFS channel %d, and ap_seen=%d\n", - chan, pchan_pwr[i].ap_seen); - ret = pchan_pwr[i].ap_seen; - } - } - - LEAVE(); - return ret; - } - } - - PRINTM(MINFO, "11D: Could not find channel:%d (band:%d)\n", chan, band); - LEAVE(); - return ret; + chan_power_11d_t *pchan_pwr = parsed_region_chan->chan_pwr; + t_u8 no_of_chan = parsed_region_chan->no_of_chan; + t_u8 i = 0; + t_u8 ret = MFALSE; + mlan_private *pmpriv; + + ENTER(); + + HEXDUMP("11D: parsed_region_chan", (t_u8 *) pchan_pwr, + sizeof(chan_power_11d_t) * no_of_chan); + + /* Search channel */ + for (i = 0; i < no_of_chan; i++) { + if (chan == pchan_pwr[i].chan && band == pchan_pwr[i].band) { + PRINTM(MINFO, "11D: Found channel:%d (band:%d)\n", chan, + band); + ret = MTRUE; + + if (band & BAND_A) { + /* If chan is a DFS channel, we need to see an + AP on it */ + pmpriv = wlan_get_priv(pmadapter, + MLAN_BSS_ROLE_STA); + if (pmpriv && + wlan_11h_radar_detect_required(pmpriv, + chan)) { + PRINTM(MINFO, + "11H: DFS channel %d, and ap_seen=%d\n", + chan, pchan_pwr[i].ap_seen); + ret = pchan_pwr[i].ap_seen; + } + } + + LEAVE(); + return ret; + } + } + + PRINTM(MINFO, "11D: Could not find channel:%d (band:%d)\n", chan, band); + LEAVE(); + return ret; } /** @@ -227,46 +233,46 @@ wlan_11d_channel_known(pmlan_adapter pmadapter, */ static t_void wlan_11d_generate_parsed_region_chan(pmlan_adapter pmadapter, - region_chan_t * region_chan, - parsed_region_chan_11d_t * - parsed_region_chan) + region_chan_t * region_chan, + parsed_region_chan_11d_t * + parsed_region_chan) { - chan_freq_power_t *cfp; - t_u8 i; - - ENTER(); - - /* Region channel must be provided */ - if (!region_chan) { - PRINTM(MWARN, "11D: region_chan is MNULL\n"); - LEAVE(); - return; - } - - /* Get channel-frequency-power trio */ - cfp = region_chan->pcfp; - if (!cfp) { - PRINTM(MWARN, "11D: cfp equal MNULL\n"); - LEAVE(); - return; - } - - /* Set channel, band and power */ - for (i = 0; i < region_chan->num_cfp; i++, cfp++) { - parsed_region_chan->chan_pwr[i].chan = (t_u8) cfp->channel; - parsed_region_chan->chan_pwr[i].band = region_chan->band; - parsed_region_chan->chan_pwr[i].pwr = (t_u8) cfp->max_tx_power; - PRINTM(MINFO, "11D: Chan[%d] Band[%d] Pwr[%d]\n", - parsed_region_chan->chan_pwr[i].chan, - parsed_region_chan->chan_pwr[i].band, - parsed_region_chan->chan_pwr[i].pwr); - } - parsed_region_chan->no_of_chan = region_chan->num_cfp; - - PRINTM(MINFO, "11D: no_of_chan[%d]\n", parsed_region_chan->no_of_chan); - - LEAVE(); - return; + chan_freq_power_t *cfp; + t_u8 i; + + ENTER(); + + /* Region channel must be provided */ + if (!region_chan) { + PRINTM(MWARN, "11D: region_chan is MNULL\n"); + LEAVE(); + return; + } + + /* Get channel-frequency-power trio */ + cfp = region_chan->pcfp; + if (!cfp) { + PRINTM(MWARN, "11D: cfp equal MNULL\n"); + LEAVE(); + return; + } + + /* Set channel, band and power */ + for (i = 0; i < region_chan->num_cfp; i++, cfp++) { + parsed_region_chan->chan_pwr[i].chan = (t_u8) cfp->channel; + parsed_region_chan->chan_pwr[i].band = region_chan->band; + parsed_region_chan->chan_pwr[i].pwr = (t_u8) cfp->max_tx_power; + PRINTM(MINFO, "11D: Chan[%d] Band[%d] Pwr[%d]\n", + parsed_region_chan->chan_pwr[i].chan, + parsed_region_chan->chan_pwr[i].band, + parsed_region_chan->chan_pwr[i].pwr); + } + parsed_region_chan->no_of_chan = region_chan->num_cfp; + + PRINTM(MINFO, "11D: no_of_chan[%d]\n", parsed_region_chan->no_of_chan); + + LEAVE(); + return; } /** @@ -279,70 +285,75 @@ wlan_11d_generate_parsed_region_chan(pmlan_adapter pmadapter, */ static mlan_status wlan_11d_generate_domain_info(pmlan_adapter pmadapter, - parsed_region_chan_11d_t * parsed_region_chan) + parsed_region_chan_11d_t * parsed_region_chan) { - t_u8 no_of_sub_band = 0; - t_u8 no_of_chan = parsed_region_chan->no_of_chan; - t_u8 no_of_parsed_chan = 0; - t_u8 first_chan = 0, next_chan = 0, max_pwr = 0; - t_u8 i, flag = MFALSE; - wlan_802_11d_domain_reg_t *domain_info = &pmadapter->domain_reg; - - ENTER(); - - /* Should be only place that clear domain_reg (besides init) */ - memset(pmadapter, domain_info, 0, sizeof(wlan_802_11d_domain_reg_t)); - - /* Set country code */ - memcpy(pmadapter, domain_info->country_code, - wlan_11d_code_2_region(pmadapter, (t_u8) pmadapter->region_code), - COUNTRY_CODE_LEN); - - PRINTM(MINFO, "11D: Number of channel = %d\n", no_of_chan); - HEXDUMP("11D: parsed_region_chan", (t_u8 *) parsed_region_chan, - sizeof(parsed_region_chan_11d_t)); - - /* Set channel and power */ - for (i = 0; i < no_of_chan; i++) { - if (!flag) { - flag = MTRUE; - next_chan = first_chan = parsed_region_chan->chan_pwr[i].chan; - max_pwr = parsed_region_chan->chan_pwr[i].pwr; - no_of_parsed_chan = 1; - continue; - } - - if (parsed_region_chan->chan_pwr[i].chan == next_chan + 1 && - parsed_region_chan->chan_pwr[i].pwr == max_pwr) { - next_chan++; - no_of_parsed_chan++; - } else { - domain_info->sub_band[no_of_sub_band].first_chan = first_chan; - domain_info->sub_band[no_of_sub_band].no_of_chan = - no_of_parsed_chan; - domain_info->sub_band[no_of_sub_band].max_tx_pwr = max_pwr; - no_of_sub_band++; - no_of_parsed_chan = 1; - next_chan = first_chan = parsed_region_chan->chan_pwr[i].chan; - max_pwr = parsed_region_chan->chan_pwr[i].pwr; - } - } - - if (flag) { - domain_info->sub_band[no_of_sub_band].first_chan = first_chan; - domain_info->sub_band[no_of_sub_band].no_of_chan = no_of_parsed_chan; - domain_info->sub_band[no_of_sub_band].max_tx_pwr = max_pwr; - no_of_sub_band++; - } - domain_info->no_of_sub_band = no_of_sub_band; - - PRINTM(MINFO, "11D: Number of sub-band =0x%x\n", - domain_info->no_of_sub_band); - HEXDUMP("11D: domain_info", (t_u8 *) domain_info, - COUNTRY_CODE_LEN + 1 + - sizeof(IEEEtypes_SubbandSet_t) * no_of_sub_band); - LEAVE(); - return MLAN_STATUS_SUCCESS; + t_u8 no_of_sub_band = 0; + t_u8 no_of_chan = parsed_region_chan->no_of_chan; + t_u8 no_of_parsed_chan = 0; + t_u8 first_chan = 0, next_chan = 0, max_pwr = 0; + t_u8 i, flag = MFALSE; + wlan_802_11d_domain_reg_t *domain_info = &pmadapter->domain_reg; + + ENTER(); + + /* Should be only place that clear domain_reg (besides init) */ + memset(pmadapter, domain_info, 0, sizeof(wlan_802_11d_domain_reg_t)); + + /* Set country code */ + memcpy(pmadapter, domain_info->country_code, + wlan_11d_code_2_region(pmadapter, (t_u8) pmadapter->region_code), + COUNTRY_CODE_LEN); + + PRINTM(MINFO, "11D: Number of channel = %d\n", no_of_chan); + HEXDUMP("11D: parsed_region_chan", (t_u8 *) parsed_region_chan, + sizeof(parsed_region_chan_11d_t)); + + /* Set channel and power */ + for (i = 0; i < no_of_chan; i++) { + if (!flag) { + flag = MTRUE; + next_chan = first_chan = + parsed_region_chan->chan_pwr[i].chan; + max_pwr = parsed_region_chan->chan_pwr[i].pwr; + no_of_parsed_chan = 1; + continue; + } + + if (parsed_region_chan->chan_pwr[i].chan == next_chan + 1 && + parsed_region_chan->chan_pwr[i].pwr == max_pwr) { + next_chan++; + no_of_parsed_chan++; + } else { + domain_info->sub_band[no_of_sub_band].first_chan = + first_chan; + domain_info->sub_band[no_of_sub_band].no_of_chan = + no_of_parsed_chan; + domain_info->sub_band[no_of_sub_band].max_tx_pwr = + max_pwr; + no_of_sub_band++; + no_of_parsed_chan = 1; + next_chan = first_chan = + parsed_region_chan->chan_pwr[i].chan; + max_pwr = parsed_region_chan->chan_pwr[i].pwr; + } + } + + if (flag) { + domain_info->sub_band[no_of_sub_band].first_chan = first_chan; + domain_info->sub_band[no_of_sub_band].no_of_chan = + no_of_parsed_chan; + domain_info->sub_band[no_of_sub_band].max_tx_pwr = max_pwr; + no_of_sub_band++; + } + domain_info->no_of_sub_band = no_of_sub_band; + + PRINTM(MINFO, "11D: Number of sub-band =0x%x\n", + domain_info->no_of_sub_band); + HEXDUMP("11D: domain_info", (t_u8 *) domain_info, + COUNTRY_CODE_LEN + 1 + + sizeof(IEEEtypes_SubbandSet_t) * no_of_sub_band); + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -356,52 +367,57 @@ wlan_11d_generate_domain_info(pmlan_adapter pmadapter, */ static mlan_status wlan_11d_update_chan_pwr_table(mlan_private * pmpriv, - BSSDescriptor_t * pbss_desc) + BSSDescriptor_t * pbss_desc) { - mlan_adapter *pmadapter = pmpriv->adapter; - parsed_region_chan_11d_t *parsed_region_chan = - &pmadapter->parsed_region_chan; - t_u16 i; - t_u8 tx_power = 0; - t_u8 chan; - - ENTER(); - - chan = pbss_desc->phy_param_set.ds_param_set.current_chan; - - tx_power = wlan_get_txpwr_of_chan_from_cfp(pmpriv, chan); - - if (!tx_power) { - PRINTM(MMSG, "11D: Invalid channel\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - /* Check whether the channel already exists in channel power table of - parsed region */ - for (i = 0; ((i < parsed_region_chan->no_of_chan) && - (i < MAX_NO_OF_CHAN)); i++) { - if (parsed_region_chan->chan_pwr[i].chan == chan - && parsed_region_chan->chan_pwr[i].band == pbss_desc->bss_band) { - /* Channel already exists, use minimum of existing and tx_power */ - parsed_region_chan->chan_pwr[i].pwr = - MIN(parsed_region_chan->chan_pwr[i].pwr, tx_power); - parsed_region_chan->chan_pwr[i].ap_seen = MTRUE; - break; - } - } - - if (i == parsed_region_chan->no_of_chan && i < MAX_NO_OF_CHAN) { - /* Channel not found. Update the channel in the channel-power table */ - parsed_region_chan->chan_pwr[i].chan = chan; - parsed_region_chan->chan_pwr[i].band = (t_u8) pbss_desc->bss_band; - parsed_region_chan->chan_pwr[i].pwr = tx_power; - parsed_region_chan->chan_pwr[i].ap_seen = MTRUE; - parsed_region_chan->no_of_chan++; - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + parsed_region_chan_11d_t *parsed_region_chan = + &pmadapter->parsed_region_chan; + t_u16 i; + t_u8 tx_power = 0; + t_u8 chan; + + ENTER(); + + chan = pbss_desc->phy_param_set.ds_param_set.current_chan; + + tx_power = wlan_get_txpwr_of_chan_from_cfp(pmpriv, chan); + + if (!tx_power) { + PRINTM(MMSG, "11D: Invalid channel\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + /* Check whether the channel already exists in channel power table of + parsed region */ + for (i = 0; ((i < parsed_region_chan->no_of_chan) && + (i < MAX_NO_OF_CHAN)); i++) { + if (parsed_region_chan->chan_pwr[i].chan == chan + && parsed_region_chan->chan_pwr[i].band == + pbss_desc->bss_band) { + /* Channel already exists, use minimum of existing and + tx_power */ + parsed_region_chan->chan_pwr[i].pwr = + MIN(parsed_region_chan->chan_pwr[i].pwr, + tx_power); + parsed_region_chan->chan_pwr[i].ap_seen = MTRUE; + break; + } + } + + if (i == parsed_region_chan->no_of_chan && i < MAX_NO_OF_CHAN) { + /* Channel not found. Update the channel in the channel-power + table */ + parsed_region_chan->chan_pwr[i].chan = chan; + parsed_region_chan->chan_pwr[i].band = + (t_u8) pbss_desc->bss_band; + parsed_region_chan->chan_pwr[i].pwr = tx_power; + parsed_region_chan->chan_pwr[i].ap_seen = MTRUE; + parsed_region_chan->no_of_chan++; + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -417,44 +433,46 @@ wlan_11d_update_chan_pwr_table(mlan_private * pmpriv, */ static t_u8 wlan_11d_get_chan(pmlan_adapter pmadapter, t_u8 band, t_u8 first_chan, - t_u8 no_of_chan, t_u8 * chan) + t_u8 no_of_chan, t_u8 * chan) { - chan_freq_power_t *cfp = MNULL; - t_u8 i; - t_u8 cfp_no = 0; - - ENTER(); - if (band & (BAND_B | BAND_G | BAND_GN | BAND_GAC)) { - cfp = channel_freq_power_UN_BG; - cfp_no = sizeof(channel_freq_power_UN_BG) / sizeof(chan_freq_power_t); - } else if (band & (BAND_A | BAND_AN | BAND_AAC)) { - cfp = channel_freq_power_UN_AJ; - cfp_no = sizeof(channel_freq_power_UN_AJ) / sizeof(chan_freq_power_t); - } else { - PRINTM(MERROR, "11D: Wrong Band[%d]\n", band); - LEAVE(); - return MFALSE; - } - /* Locate the first_chan */ - for (i = 0; i < cfp_no; i++) { - if (cfp && ((cfp + i)->channel == first_chan)) { - PRINTM(MINFO, "11D: first_chan found\n"); - break; - } - } - - if (i < cfp_no) { - /* Check if beyond the boundary */ - if (i + no_of_chan < cfp_no) { - /* Get first_chan + no_of_chan */ - *chan = (t_u8) (cfp + i + no_of_chan)->channel; - LEAVE(); - return MTRUE; - } - } - - LEAVE(); - return MFALSE; + chan_freq_power_t *cfp = MNULL; + t_u8 i; + t_u8 cfp_no = 0; + + ENTER(); + if (band & (BAND_B | BAND_G | BAND_GN | BAND_GAC)) { + cfp = channel_freq_power_UN_BG; + cfp_no = sizeof(channel_freq_power_UN_BG) / + sizeof(chan_freq_power_t); + } else if (band & (BAND_A | BAND_AN | BAND_AAC)) { + cfp = channel_freq_power_UN_AJ; + cfp_no = sizeof(channel_freq_power_UN_AJ) / + sizeof(chan_freq_power_t); + } else { + PRINTM(MERROR, "11D: Wrong Band[%d]\n", band); + LEAVE(); + return MFALSE; + } + /* Locate the first_chan */ + for (i = 0; i < cfp_no; i++) { + if (cfp && ((cfp + i)->channel == first_chan)) { + PRINTM(MINFO, "11D: first_chan found\n"); + break; + } + } + + if (i < cfp_no) { + /* Check if beyond the boundary */ + if (i + no_of_chan < cfp_no) { + /* Get first_chan + no_of_chan */ + *chan = (t_u8) (cfp + i + no_of_chan)->channel; + LEAVE(); + return MTRUE; + } + } + + LEAVE(); + return MFALSE; } /** @@ -467,76 +485,88 @@ wlan_11d_get_chan(pmlan_adapter pmadapter, t_u8 band, t_u8 first_chan, */ static mlan_status wlan_11d_process_country_info(mlan_private * pmpriv, - BSSDescriptor_t * pbss_desc) + BSSDescriptor_t * pbss_desc) { - mlan_adapter *pmadapter = pmpriv->adapter; - parsed_region_chan_11d_t region_chan; - parsed_region_chan_11d_t *parsed_region_chan = - &pmadapter->parsed_region_chan; - t_u16 i, j, num_chan_added = 0; - - ENTER(); - - memset(pmadapter, ®ion_chan, 0, sizeof(parsed_region_chan_11d_t)); - - /* Parse 11D country info */ - if (wlan_11d_parse_domain_info(pmadapter, &pbss_desc->country_info, - (t_u8) pbss_desc->bss_band, - ®ion_chan) != MLAN_STATUS_SUCCESS) { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - if (parsed_region_chan->no_of_chan != 0) { - /* - * Check if the channel number already exists in the - * chan-power table of parsed_region_chan - */ - for (i = 0; (i < region_chan.no_of_chan && i < MAX_NO_OF_CHAN); i++) { - for (j = 0; (j < parsed_region_chan->no_of_chan && - j < MAX_NO_OF_CHAN); j++) { - /* - * Channel already exists, update the tx power with new tx - * power, since country IE is valid here. - */ - if (region_chan.chan_pwr[i].chan == - parsed_region_chan->chan_pwr[j].chan && - region_chan.chan_pwr[i].band == - parsed_region_chan->chan_pwr[j].band) { - parsed_region_chan->chan_pwr[j].pwr = - region_chan.chan_pwr[i].pwr; - break; - } - } - - if (j == parsed_region_chan->no_of_chan && j < MAX_NO_OF_CHAN) { - /* - * Channel does not exist in the channel power table, - * update this new chan and tx_power to the channel power table - */ - parsed_region_chan->chan_pwr[parsed_region_chan->no_of_chan + - num_chan_added].chan = - region_chan.chan_pwr[i].chan; - parsed_region_chan->chan_pwr[parsed_region_chan->no_of_chan + - num_chan_added].band = - region_chan.chan_pwr[i].band; - parsed_region_chan->chan_pwr[parsed_region_chan->no_of_chan + - num_chan_added].pwr = - region_chan.chan_pwr[i].pwr; - parsed_region_chan->chan_pwr[parsed_region_chan->no_of_chan + - num_chan_added].ap_seen = MFALSE; - num_chan_added++; - } - } - parsed_region_chan->no_of_chan += num_chan_added; - } else { - /* Parsed region is empty, copy the first one */ - memcpy(pmadapter, parsed_region_chan, - ®ion_chan, sizeof(parsed_region_chan_11d_t)); - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + parsed_region_chan_11d_t region_chan; + parsed_region_chan_11d_t *parsed_region_chan = + &pmadapter->parsed_region_chan; + t_u16 i, j, num_chan_added = 0; + + ENTER(); + + memset(pmadapter, ®ion_chan, 0, sizeof(parsed_region_chan_11d_t)); + + /* Parse 11D country info */ + if (wlan_11d_parse_domain_info(pmadapter, &pbss_desc->country_info, + (t_u8) pbss_desc->bss_band, + ®ion_chan) != MLAN_STATUS_SUCCESS) { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + if (parsed_region_chan->no_of_chan != 0) { + /* + * Check if the channel number already exists in the + * chan-power table of parsed_region_chan + */ + for (i = 0; (i < region_chan.no_of_chan && i < MAX_NO_OF_CHAN); + i++) { + for (j = 0; + (j < parsed_region_chan->no_of_chan && + j < MAX_NO_OF_CHAN); j++) { + /* + * Channel already exists, update the tx power with new tx + * power, since country IE is valid here. + */ + if (region_chan.chan_pwr[i].chan == + parsed_region_chan->chan_pwr[j].chan && + region_chan.chan_pwr[i].band == + parsed_region_chan->chan_pwr[j].band) { + parsed_region_chan->chan_pwr[j].pwr = + region_chan.chan_pwr[i].pwr; + break; + } + } + + if (j == parsed_region_chan->no_of_chan && + j < MAX_NO_OF_CHAN) { + /* + * Channel does not exist in the channel power table, + * update this new chan and tx_power to the channel power table + */ + parsed_region_chan-> + chan_pwr[parsed_region_chan-> + no_of_chan + + num_chan_added].chan = + region_chan.chan_pwr[i].chan; + parsed_region_chan-> + chan_pwr[parsed_region_chan-> + no_of_chan + + num_chan_added].band = + region_chan.chan_pwr[i].band; + parsed_region_chan-> + chan_pwr[parsed_region_chan-> + no_of_chan + + num_chan_added].pwr = + region_chan.chan_pwr[i].pwr; + parsed_region_chan-> + chan_pwr[parsed_region_chan-> + no_of_chan + + num_chan_added].ap_seen = + MFALSE; + num_chan_added++; + } + } + parsed_region_chan->no_of_chan += num_chan_added; + } else { + /* Parsed region is empty, copy the first one */ + memcpy(pmadapter, parsed_region_chan, + ®ion_chan, sizeof(parsed_region_chan_11d_t)); + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -549,17 +579,17 @@ wlan_11d_process_country_info(mlan_private * pmpriv, */ static t_void wlan_11d_copy_chan_power(chan_power_11d_t * chan_dst, - chan_power_11d_t * chan_src) + chan_power_11d_t * chan_src) { - ENTER(); + ENTER(); - chan_dst->chan = chan_src->chan; - chan_dst->band = chan_src->band; - chan_dst->pwr = chan_src->pwr; - chan_dst->ap_seen = chan_src->ap_seen; + chan_dst->chan = chan_src->chan; + chan_dst->band = chan_src->band; + chan_dst->pwr = chan_src->pwr; + chan_dst->ap_seen = chan_src->ap_seen; - LEAVE(); - return; + LEAVE(); + return; } /** @@ -573,28 +603,30 @@ wlan_11d_copy_chan_power(chan_power_11d_t * chan_dst, static t_void wlan_11d_sort_parsed_region_chan(parsed_region_chan_11d_t * parsed_region_chan) { - int i, j; - chan_power_11d_t temp; - chan_power_11d_t *pchan_power = parsed_region_chan->chan_pwr; - - ENTER(); - - PRINTM(MINFO, "11D: Number of channel = %d\n", - parsed_region_chan->no_of_chan); - - // Use insertion sort method - for (i = 1; i < parsed_region_chan->no_of_chan; i++) { - wlan_11d_copy_chan_power(&temp, pchan_power + i); - for (j = i; j > 0 && (pchan_power + j - 1)->chan > temp.chan; j--) - wlan_11d_copy_chan_power(pchan_power + j, pchan_power + j - 1); - wlan_11d_copy_chan_power(pchan_power + j, &temp); - } - - HEXDUMP("11D: parsed_region_chan", (t_u8 *) parsed_region_chan, - sizeof(parsed_region_chan_11d_t)); - - LEAVE(); - return; + int i, j; + chan_power_11d_t temp; + chan_power_11d_t *pchan_power = parsed_region_chan->chan_pwr; + + ENTER(); + + PRINTM(MINFO, "11D: Number of channel = %d\n", + parsed_region_chan->no_of_chan); + + /* Use insertion sort method */ + for (i = 1; i < parsed_region_chan->no_of_chan; i++) { + wlan_11d_copy_chan_power(&temp, pchan_power + i); + for (j = i; j > 0 && (pchan_power + j - 1)->chan > temp.chan; + j--) + wlan_11d_copy_chan_power(pchan_power + j, + pchan_power + j - 1); + wlan_11d_copy_chan_power(pchan_power + j, &temp); + } + + HEXDUMP("11D: parsed_region_chan", (t_u8 *) parsed_region_chan, + sizeof(parsed_region_chan_11d_t)); + + LEAVE(); + return; } #endif /* STA_SUPPORT */ @@ -609,20 +641,20 @@ wlan_11d_sort_parsed_region_chan(parsed_region_chan_11d_t * parsed_region_chan) static mlan_status wlan_11d_send_domain_info(mlan_private * pmpriv, t_void * pioctl_buf) { - mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_status ret = MLAN_STATUS_SUCCESS; - ENTER(); + ENTER(); - /* Send cmd to FW to set domain info */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11D_DOMAIN_INFO, - HostCmd_ACT_GEN_SET, - 0, (t_void *) pioctl_buf, MNULL); - if (ret) - PRINTM(MERROR, "11D: Failed to download domain Info\n"); + /* Send cmd to FW to set domain info */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11D_DOMAIN_INFO, + HostCmd_ACT_GEN_SET, + 0, (t_void *) pioctl_buf, MNULL); + if (ret) + PRINTM(MERROR, "11D: Failed to download domain Info\n"); - LEAVE(); - return ret; + LEAVE(); + return ret; } /** @@ -638,27 +670,28 @@ wlan_11d_send_domain_info(mlan_private * pmpriv, t_void * pioctl_buf) */ static mlan_status wlan_11d_set_domain_info(mlan_private * pmpriv, - t_u8 band, - t_u8 country_code[COUNTRY_CODE_LEN], - t_u8 num_sub_band, - IEEEtypes_SubbandSet_t * sub_band_list) + t_u8 band, + t_u8 country_code[COUNTRY_CODE_LEN], + t_u8 num_sub_band, + IEEEtypes_SubbandSet_t * sub_band_list) { - mlan_adapter *pmadapter = pmpriv->adapter; - wlan_802_11d_domain_reg_t *pdomain = &pmadapter->domain_reg; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - memset(pmadapter, pdomain, 0, sizeof(wlan_802_11d_domain_reg_t)); - memcpy(pmadapter, pdomain->country_code, country_code, COUNTRY_CODE_LEN); - pdomain->band = band; - pdomain->no_of_sub_band = num_sub_band; - memcpy(pmadapter, pdomain->sub_band, sub_band_list, - MIN(MRVDRV_MAX_SUBBAND_802_11D, - num_sub_band) * sizeof(IEEEtypes_SubbandSet_t)); - - LEAVE(); - return ret; + mlan_adapter *pmadapter = pmpriv->adapter; + wlan_802_11d_domain_reg_t *pdomain = &pmadapter->domain_reg; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + memset(pmadapter, pdomain, 0, sizeof(wlan_802_11d_domain_reg_t)); + memcpy(pmadapter, pdomain->country_code, country_code, + COUNTRY_CODE_LEN); + pdomain->band = band; + pdomain->no_of_sub_band = num_sub_band; + memcpy(pmadapter, pdomain->sub_band, sub_band_list, + MIN(MRVDRV_MAX_SUBBAND_802_11D, + num_sub_band) * sizeof(IEEEtypes_SubbandSet_t)); + + LEAVE(); + return ret; } /******************************************************** @@ -675,9 +708,9 @@ wlan_11d_set_domain_info(mlan_private * pmpriv, t_bool wlan_is_station(mlan_private * pmpriv) { - ENTER(); - LEAVE(); - return (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) ? MTRUE : MFALSE; + ENTER(); + LEAVE(); + return (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) ? MTRUE : MFALSE; } /** @@ -690,9 +723,9 @@ wlan_is_station(mlan_private * pmpriv) t_bool wlan_11d_is_enabled(mlan_private * pmpriv) { - ENTER(); - LEAVE(); - return (pmpriv->state_11d.enable_11d == ENABLE_11D) ? MTRUE : MFALSE; + ENTER(); + LEAVE(); + return (pmpriv->state_11d.enable_11d == ENABLE_11D) ? MTRUE : MFALSE; } /** @@ -705,21 +738,21 @@ wlan_11d_is_enabled(mlan_private * pmpriv) t_void wlan_11d_priv_init(mlan_private * pmpriv) { - wlan_802_11d_state_t *state = &pmpriv->state_11d; + wlan_802_11d_state_t *state = &pmpriv->state_11d; - ENTER(); + ENTER(); - /* Start in disabled mode */ - state->enable_11d = DISABLE_11D; - if (!pmpriv->adapter->init_para.cfg_11d) - state->user_enable_11d = DEFAULT_11D_STATE; - else - state->user_enable_11d = - (pmpriv->adapter->init_para.cfg_11d == MLAN_INIT_PARA_DISABLED) ? - DISABLE_11D : ENABLE_11D; + /* Start in disabled mode */ + state->enable_11d = DISABLE_11D; + if (!pmpriv->adapter->init_para.cfg_11d) + state->user_enable_11d = DEFAULT_11D_STATE; + else + state->user_enable_11d = + (pmpriv->adapter->init_para.cfg_11d == + MLAN_INIT_PARA_DISABLED) ? DISABLE_11D : ENABLE_11D; - LEAVE(); - return; + LEAVE(); + return; } /** @@ -732,19 +765,19 @@ wlan_11d_priv_init(mlan_private * pmpriv) t_void wlan_11d_init(mlan_adapter * pmadapter) { - ENTER(); + ENTER(); #ifdef STA_SUPPORT - memset(pmadapter, &(pmadapter->parsed_region_chan), 0, - sizeof(parsed_region_chan_11d_t)); - memset(pmadapter, &(pmadapter->universal_channel), 0, - sizeof(region_chan_t)); + memset(pmadapter, &(pmadapter->parsed_region_chan), 0, + sizeof(parsed_region_chan_11d_t)); + memset(pmadapter, &(pmadapter->universal_channel), 0, + sizeof(region_chan_t)); #endif - memset(pmadapter, &(pmadapter->domain_reg), 0, - sizeof(wlan_802_11d_domain_reg_t)); + memset(pmadapter, &(pmadapter->domain_reg), 0, + sizeof(wlan_802_11d_domain_reg_t)); - LEAVE(); - return; + LEAVE(); + return; } /** @@ -760,33 +793,33 @@ mlan_status wlan_11d_enable(mlan_private * pmpriv, t_void * pioctl_buf, state_11d_t flag) { #ifdef STA_SUPPORT - mlan_adapter *pmadapter = pmpriv->adapter; + mlan_adapter *pmadapter = pmpriv->adapter; #endif - mlan_status ret = MLAN_STATUS_SUCCESS; - state_11d_t enable = flag; + mlan_status ret = MLAN_STATUS_SUCCESS; + state_11d_t enable = flag; - ENTER(); + ENTER(); - /* Send cmd to FW to enable/disable 11D function */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_SNMP_MIB, - HostCmd_ACT_GEN_SET, - Dot11D_i, (t_void *) pioctl_buf, &enable); + /* Send cmd to FW to enable/disable 11D function */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_SNMP_MIB, + HostCmd_ACT_GEN_SET, + Dot11D_i, (t_void *) pioctl_buf, &enable); - if (ret) { - PRINTM(MERROR, "11D: Failed to %s 11D\n", - (flag) ? "enable" : "disable"); - } + if (ret) { + PRINTM(MERROR, "11D: Failed to %s 11D\n", + (flag) ? "enable" : "disable"); + } #ifdef STA_SUPPORT - else { - /* clear parsed table regardless of flag */ - memset(pmadapter, &(pmadapter->parsed_region_chan), 0, - sizeof(parsed_region_chan_11d_t)); - } + else { + /* clear parsed table regardless of flag */ + memset(pmadapter, &(pmadapter->parsed_region_chan), 0, + sizeof(parsed_region_chan_11d_t)); + } #endif - LEAVE(); - return ret; + LEAVE(); + return ret; } /** @@ -801,55 +834,63 @@ wlan_11d_enable(mlan_private * pmpriv, t_void * pioctl_buf, state_11d_t flag) */ mlan_status wlan_cmd_802_11d_domain_info(mlan_private * pmpriv, - HostCmd_DS_COMMAND * pcmd, t_u16 cmd_action) + HostCmd_DS_COMMAND * pcmd, t_u16 cmd_action) { - mlan_adapter *pmadapter = pmpriv->adapter; - HostCmd_DS_802_11D_DOMAIN_INFO *pdomain_info = &pcmd->params.domain_info; - MrvlIEtypes_DomainParamSet_t *domain = &pdomain_info->domain; - t_u8 no_of_sub_band = pmadapter->domain_reg.no_of_sub_band; - - ENTER(); - - PRINTM(MINFO, "11D: number of sub-band=0x%x\n", no_of_sub_band); - - pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11D_DOMAIN_INFO); - pdomain_info->action = wlan_cpu_to_le16(cmd_action); - if (cmd_action == HostCmd_ACT_GEN_GET) { - /* Dump domain info */ - pcmd->size = wlan_cpu_to_le16(sizeof(pdomain_info->action) + S_DS_GEN); - HEXDUMP("11D: 802_11D_DOMAIN_INFO", (t_u8 *) pcmd, - wlan_le16_to_cpu(pcmd->size)); - LEAVE(); - return MLAN_STATUS_SUCCESS; - } - - /* Set domain info fields */ - domain->header.type = wlan_cpu_to_le16(TLV_TYPE_DOMAIN); - memcpy(pmadapter, domain->country_code, - pmadapter->domain_reg.country_code, sizeof(domain->country_code)); - - domain->header.len = ((no_of_sub_band * sizeof(IEEEtypes_SubbandSet_t)) + - sizeof(domain->country_code)); - - if (no_of_sub_band) { - memcpy(pmadapter, domain->sub_band, - pmadapter->domain_reg.sub_band, - MIN(MRVDRV_MAX_SUBBAND_802_11D, - no_of_sub_band) * sizeof(IEEEtypes_SubbandSet_t)); - - pcmd->size = wlan_cpu_to_le16(sizeof(pdomain_info->action) + - domain->header.len + - sizeof(MrvlIEtypesHeader_t) + S_DS_GEN); - } else { - pcmd->size = wlan_cpu_to_le16(sizeof(pdomain_info->action) + S_DS_GEN); - } - domain->header.len = wlan_cpu_to_le16(domain->header.len); - - HEXDUMP("11D: 802_11D_DOMAIN_INFO", (t_u8 *) pcmd, - wlan_le16_to_cpu(pcmd->size)); - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + HostCmd_DS_802_11D_DOMAIN_INFO *pdomain_info = + &pcmd->params.domain_info; + MrvlIEtypes_DomainParamSet_t *domain = &pdomain_info->domain; + t_u8 no_of_sub_band = pmadapter->domain_reg.no_of_sub_band; + + ENTER(); + + PRINTM(MINFO, "11D: number of sub-band=0x%x\n", no_of_sub_band); + + pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11D_DOMAIN_INFO); + pdomain_info->action = wlan_cpu_to_le16(cmd_action); + if (cmd_action == HostCmd_ACT_GEN_GET) { + /* Dump domain info */ + pcmd->size = + wlan_cpu_to_le16(sizeof(pdomain_info->action) + + S_DS_GEN); + HEXDUMP("11D: 802_11D_DOMAIN_INFO", (t_u8 *) pcmd, + wlan_le16_to_cpu(pcmd->size)); + LEAVE(); + return MLAN_STATUS_SUCCESS; + } + + /* Set domain info fields */ + domain->header.type = wlan_cpu_to_le16(TLV_TYPE_DOMAIN); + memcpy(pmadapter, domain->country_code, + pmadapter->domain_reg.country_code, + sizeof(domain->country_code)); + + domain->header.len = + ((no_of_sub_band * sizeof(IEEEtypes_SubbandSet_t)) + + sizeof(domain->country_code)); + + if (no_of_sub_band) { + memcpy(pmadapter, domain->sub_band, + pmadapter->domain_reg.sub_band, + MIN(MRVDRV_MAX_SUBBAND_802_11D, + no_of_sub_band) * sizeof(IEEEtypes_SubbandSet_t)); + + pcmd->size = wlan_cpu_to_le16(sizeof(pdomain_info->action) + + domain->header.len + + sizeof(MrvlIEtypesHeader_t) + + S_DS_GEN); + } else { + pcmd->size = + wlan_cpu_to_le16(sizeof(pdomain_info->action) + + S_DS_GEN); + } + domain->header.len = wlan_cpu_to_le16(domain->header.len); + + HEXDUMP("11D: 802_11D_DOMAIN_INFO", (t_u8 *) pcmd, + wlan_le16_to_cpu(pcmd->size)); + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -863,45 +904,46 @@ wlan_cmd_802_11d_domain_info(mlan_private * pmpriv, mlan_status wlan_ret_802_11d_domain_info(mlan_private * pmpriv, HostCmd_DS_COMMAND * resp) { - mlan_status ret = MLAN_STATUS_SUCCESS; - HostCmd_DS_802_11D_DOMAIN_INFO_RSP *domain_info = - &resp->params.domain_info_resp; - MrvlIEtypes_DomainParamSet_t *domain = &domain_info->domain; - t_u16 action = wlan_le16_to_cpu(domain_info->action); - t_u8 no_of_sub_band = 0; - - ENTER(); - - /* Dump domain info response data */ - HEXDUMP("11D: DOMAIN Info Rsp Data", (t_u8 *) resp, resp->size); - - no_of_sub_band = - (t_u8) ((wlan_le16_to_cpu(domain->header.len) - COUNTRY_CODE_LEN) - / sizeof(IEEEtypes_SubbandSet_t)); - - PRINTM(MINFO, "11D Domain Info Resp: number of sub-band=%d\n", - no_of_sub_band); - - if (no_of_sub_band > MRVDRV_MAX_SUBBAND_802_11D) { - PRINTM(MWARN, "11D: Invalid number of subbands %d returned!!\n", - no_of_sub_band); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - switch (action) { - case HostCmd_ACT_GEN_SET: /* Proc Set Action */ - break; - case HostCmd_ACT_GEN_GET: - break; - default: - PRINTM(MERROR, "11D: Invalid Action:%d\n", domain_info->action); - ret = MLAN_STATUS_FAILURE; - break; - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11D_DOMAIN_INFO_RSP *domain_info = + &resp->params.domain_info_resp; + MrvlIEtypes_DomainParamSet_t *domain = &domain_info->domain; + t_u16 action = wlan_le16_to_cpu(domain_info->action); + t_u8 no_of_sub_band = 0; + + ENTER(); + + /* Dump domain info response data */ + HEXDUMP("11D: DOMAIN Info Rsp Data", (t_u8 *) resp, resp->size); + + no_of_sub_band = + (t_u8) ((wlan_le16_to_cpu(domain->header.len) - + COUNTRY_CODE_LEN) + / sizeof(IEEEtypes_SubbandSet_t)); + + PRINTM(MINFO, "11D Domain Info Resp: number of sub-band=%d\n", + no_of_sub_band); + + if (no_of_sub_band > MRVDRV_MAX_SUBBAND_802_11D) { + PRINTM(MWARN, "11D: Invalid number of subbands %d returned!!\n", + no_of_sub_band); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + switch (action) { + case HostCmd_ACT_GEN_SET: /* Proc Set Action */ + break; + case HostCmd_ACT_GEN_GET: + break; + default: + PRINTM(MERROR, "11D: Invalid Action:%d\n", domain_info->action); + ret = MLAN_STATUS_FAILURE; + break; + } + + LEAVE(); + return ret; } #ifdef STA_SUPPORT @@ -917,84 +959,89 @@ wlan_ret_802_11d_domain_info(mlan_private * pmpriv, HostCmd_DS_COMMAND * resp) */ mlan_status wlan_11d_parse_domain_info(pmlan_adapter pmadapter, - IEEEtypes_CountryInfoFullSet_t * country_info, - t_u8 band, - parsed_region_chan_11d_t * parsed_region_chan) + IEEEtypes_CountryInfoFullSet_t * country_info, + t_u8 band, + parsed_region_chan_11d_t * parsed_region_chan) { - t_u8 no_of_sub_band, no_of_chan; - t_u8 last_chan, first_chan, cur_chan = 0; - t_u8 idx = 0; - t_u8 j, i; - - ENTER(); - - /* - * Validation Rules: - * 1. Valid Region Code - * 2. First Chan increment - * 3. Channel range no overlap - * 4. Channel is valid? - * 5. Channel is supported by Region? - * 6. Others - */ - - HEXDUMP("country_info", (t_u8 *) country_info, 30); - - /* Step 1: Check region_code */ - if (!(*(country_info->country_code)) || - (country_info->len <= COUNTRY_CODE_LEN)) { - /* No region info or wrong region info: treat as no 11D info */ - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - no_of_sub_band = (country_info->len - COUNTRY_CODE_LEN) / - sizeof(IEEEtypes_SubbandSet_t); - - for (j = 0, last_chan = 0; j < no_of_sub_band; j++) { - - if (country_info->sub_band[j].first_chan <= last_chan) { - /* Step2&3: Check First Chan Num increment and no overlap */ - PRINTM(MINFO, "11D: Chan[%d>%d] Overlap\n", - country_info->sub_band[j].first_chan, last_chan); - continue; - } - - first_chan = country_info->sub_band[j].first_chan; - no_of_chan = country_info->sub_band[j].no_of_chan; - - for (i = 0; idx < MAX_NO_OF_CHAN && i < no_of_chan; i++) { - /* Step 4 : Channel is supported? */ - if (wlan_11d_get_chan(pmadapter, band, first_chan, i, &cur_chan) == - MFALSE) { - /* Chan is not found in UN table */ - PRINTM(MWARN, "11D: channel is not supported: %d\n", i); - break; - } - - last_chan = cur_chan; - - /* Step 5: We don't need to check if cur_chan is supported by mrvl - in region */ - parsed_region_chan->chan_pwr[idx].chan = cur_chan; - parsed_region_chan->chan_pwr[idx].band = band; - parsed_region_chan->chan_pwr[idx].pwr = - country_info->sub_band[j].max_tx_pwr; - idx++; - } - - /* Step 6: Add other checking if any */ - } - - parsed_region_chan->no_of_chan = idx; - - PRINTM(MINFO, "11D: number of channel=0x%x\n", - parsed_region_chan->no_of_chan); - HEXDUMP("11D: parsed_region_chan", (t_u8 *) parsed_region_chan->chan_pwr, - sizeof(chan_power_11d_t) * idx); - - LEAVE(); - return MLAN_STATUS_SUCCESS; + t_u8 no_of_sub_band, no_of_chan; + t_u8 last_chan, first_chan, cur_chan = 0; + t_u8 idx = 0; + t_u8 j, i; + + ENTER(); + + /* + * Validation Rules: + * 1. Valid Region Code + * 2. First Chan increment + * 3. Channel range no overlap + * 4. Channel is valid? + * 5. Channel is supported by Region? + * 6. Others + */ + + HEXDUMP("country_info", (t_u8 *) country_info, 30); + + /* Step 1: Check region_code */ + if (!(*(country_info->country_code)) || + (country_info->len <= COUNTRY_CODE_LEN)) { + /* No region info or wrong region info: treat as no 11D info */ + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + no_of_sub_band = (country_info->len - COUNTRY_CODE_LEN) / + sizeof(IEEEtypes_SubbandSet_t); + + for (j = 0, last_chan = 0; j < no_of_sub_band; j++) { + + if (country_info->sub_band[j].first_chan <= last_chan) { + /* Step2&3: Check First Chan Num increment and no + overlap */ + PRINTM(MINFO, "11D: Chan[%d>%d] Overlap\n", + country_info->sub_band[j].first_chan, last_chan); + continue; + } + + first_chan = country_info->sub_band[j].first_chan; + no_of_chan = country_info->sub_band[j].no_of_chan; + + for (i = 0; idx < MAX_NO_OF_CHAN && i < no_of_chan; i++) { + /* Step 4 : Channel is supported? */ + if (wlan_11d_get_chan + (pmadapter, band, first_chan, i, + &cur_chan) == MFALSE) { + /* Chan is not found in UN table */ + PRINTM(MWARN, + "11D: channel is not supported: %d\n", + i); + break; + } + + last_chan = cur_chan; + + /* Step 5: We don't need to check if cur_chan is + supported by mrvl in region */ + parsed_region_chan->chan_pwr[idx].chan = cur_chan; + parsed_region_chan->chan_pwr[idx].band = band; + parsed_region_chan->chan_pwr[idx].pwr = + country_info->sub_band[j].max_tx_pwr; + idx++; + } + + /* Step 6: Add other checking if any */ + } + + parsed_region_chan->no_of_chan = idx; + + PRINTM(MINFO, "11D: number of channel=0x%x\n", + parsed_region_chan->no_of_chan); + HEXDUMP("11D: parsed_region_chan", + (t_u8 *) parsed_region_chan->chan_pwr, + sizeof(chan_power_11d_t) * idx); + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -1009,30 +1056,32 @@ wlan_11d_parse_domain_info(pmlan_adapter pmadapter, t_u32 wlan_11d_chan_2_freq(pmlan_adapter pmadapter, t_u8 chan, t_u8 band) { - chan_freq_power_t *cf; - t_u16 cnt; - t_u16 i; - t_u32 freq = 0; - - ENTER(); - - /* Get channel-frequency-power trios */ - if (band & (BAND_A | BAND_AN | BAND_AAC)) { - cf = channel_freq_power_UN_AJ; - cnt = sizeof(channel_freq_power_UN_AJ) / sizeof(chan_freq_power_t); - } else { - cf = channel_freq_power_UN_BG; - cnt = sizeof(channel_freq_power_UN_BG) / sizeof(chan_freq_power_t); - } - - /* Locate channel and return corresponding frequency */ - for (i = 0; i < cnt; i++) { - if (chan == cf[i].channel) - freq = cf[i].freq; - } - - LEAVE(); - return freq; + chan_freq_power_t *cf; + t_u16 cnt; + t_u16 i; + t_u32 freq = 0; + + ENTER(); + + /* Get channel-frequency-power trios */ + if (band & (BAND_A | BAND_AN | BAND_AAC)) { + cf = channel_freq_power_UN_AJ; + cnt = sizeof(channel_freq_power_UN_AJ) / + sizeof(chan_freq_power_t); + } else { + cf = channel_freq_power_UN_BG; + cnt = sizeof(channel_freq_power_UN_BG) / + sizeof(chan_freq_power_t); + } + + /* Locate channel and return corresponding frequency */ + for (i = 0; i < cnt; i++) { + if (chan == cf[i].channel) + freq = cf[i].freq; + } + + LEAVE(); + return freq; } /** @@ -1046,62 +1095,62 @@ wlan_11d_chan_2_freq(pmlan_adapter pmadapter, t_u8 chan, t_u8 band) mlan_status wlan_11d_set_universaltable(mlan_private * pmpriv, t_u8 band) { - mlan_adapter *pmadapter = pmpriv->adapter; - t_u16 size = sizeof(chan_freq_power_t); - t_u16 i = 0; - - ENTER(); - - memset(pmadapter, pmadapter->universal_channel, 0, - sizeof(pmadapter->universal_channel)); - - if (band & (BAND_B | BAND_G | BAND_GN)) - /* If band B, G or N */ - { - /* Set channel-frequency-power */ - pmadapter->universal_channel[i].num_cfp = - (t_u8) (sizeof(channel_freq_power_UN_BG) / size); - PRINTM(MINFO, "11D: BG-band num_cfp=%d\n", - pmadapter->universal_channel[i].num_cfp); - - pmadapter->universal_channel[i].pcfp = channel_freq_power_UN_BG; - pmadapter->universal_channel[i].valid = MTRUE; - - /* Set region code */ - pmadapter->universal_channel[i].region = UNIVERSAL_REGION_CODE; - - /* Set band */ - if (band & BAND_GN) - pmadapter->universal_channel[i].band = BAND_G; - else - pmadapter->universal_channel[i].band = - (band & BAND_G) ? BAND_G : BAND_B; - i++; - } - - if (band & (BAND_A | BAND_AN | BAND_AAC)) { - /* If band A */ - - /* Set channel-frequency-power */ - pmadapter->universal_channel[i].num_cfp = - sizeof(channel_freq_power_UN_AJ) / size; - PRINTM(MINFO, "11D: AJ-band num_cfp=%d\n", - pmadapter->universal_channel[i].num_cfp); - - pmadapter->universal_channel[i].pcfp = channel_freq_power_UN_AJ; - - pmadapter->universal_channel[i].valid = MTRUE; - - /* Set region code */ - pmadapter->universal_channel[i].region = UNIVERSAL_REGION_CODE; - - /* Set band */ - pmadapter->universal_channel[i].band = BAND_A; - i++; - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + t_u16 size = sizeof(chan_freq_power_t); + t_u16 i = 0; + + ENTER(); + + memset(pmadapter, pmadapter->universal_channel, 0, + sizeof(pmadapter->universal_channel)); + + if (band & (BAND_B | BAND_G | BAND_GN)) + /* If band B, G or N */ + { + /* Set channel-frequency-power */ + pmadapter->universal_channel[i].num_cfp = + (t_u8) (sizeof(channel_freq_power_UN_BG) / size); + PRINTM(MINFO, "11D: BG-band num_cfp=%d\n", + pmadapter->universal_channel[i].num_cfp); + + pmadapter->universal_channel[i].pcfp = channel_freq_power_UN_BG; + pmadapter->universal_channel[i].valid = MTRUE; + + /* Set region code */ + pmadapter->universal_channel[i].region = UNIVERSAL_REGION_CODE; + + /* Set band */ + if (band & BAND_GN) + pmadapter->universal_channel[i].band = BAND_G; + else + pmadapter->universal_channel[i].band = + (band & BAND_G) ? BAND_G : BAND_B; + i++; + } + + if (band & (BAND_A | BAND_AN | BAND_AAC)) { + /* If band A */ + + /* Set channel-frequency-power */ + pmadapter->universal_channel[i].num_cfp = + sizeof(channel_freq_power_UN_AJ) / size; + PRINTM(MINFO, "11D: AJ-band num_cfp=%d\n", + pmadapter->universal_channel[i].num_cfp); + + pmadapter->universal_channel[i].pcfp = channel_freq_power_UN_AJ; + + pmadapter->universal_channel[i].valid = MTRUE; + + /* Set region code */ + pmadapter->universal_channel[i].region = UNIVERSAL_REGION_CODE; + + /* Set band */ + pmadapter->universal_channel[i].band = BAND_A; + i++; + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -1116,22 +1165,23 @@ wlan_11d_set_universaltable(mlan_private * pmpriv, t_u8 band) */ t_u8 wlan_11d_get_scan_type(pmlan_adapter pmadapter, - t_u8 band, - t_u8 chan, parsed_region_chan_11d_t * parsed_region_chan) + t_u8 band, + t_u8 chan, parsed_region_chan_11d_t * parsed_region_chan) { - t_u8 scan_type = MLAN_SCAN_TYPE_PASSIVE; + t_u8 scan_type = MLAN_SCAN_TYPE_PASSIVE; - ENTER(); + ENTER(); - if (wlan_11d_channel_known(pmadapter, band, chan, parsed_region_chan)) { - /* Channel found */ - PRINTM(MINFO, "11D: Channel found and doing Active Scan\n"); - scan_type = MLAN_SCAN_TYPE_ACTIVE; - } else - PRINTM(MINFO, "11D: Channel not found and doing Passive Scan\n"); + if (wlan_11d_channel_known(pmadapter, band, chan, parsed_region_chan)) { + /* Channel found */ + PRINTM(MINFO, "11D: Channel found and doing Active Scan\n"); + scan_type = MLAN_SCAN_TYPE_ACTIVE; + } else + PRINTM(MINFO, + "11D: Channel not found and doing Passive Scan\n"); - LEAVE(); - return scan_type; + LEAVE(); + return scan_type; } /** @@ -1144,19 +1194,19 @@ wlan_11d_get_scan_type(pmlan_adapter pmadapter, mlan_status wlan_11d_clear_parsedtable(mlan_private * pmpriv) { - mlan_adapter *pmadapter = pmpriv->adapter; - mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + mlan_status ret = MLAN_STATUS_SUCCESS; - ENTER(); + ENTER(); - if (wlan_11d_is_enabled(pmpriv)) - memset(pmadapter, &(pmadapter->parsed_region_chan), 0, - sizeof(parsed_region_chan_11d_t)); - else - ret = MLAN_STATUS_FAILURE; + if (wlan_11d_is_enabled(pmpriv)) + memset(pmadapter, &(pmadapter->parsed_region_chan), 0, + sizeof(parsed_region_chan_11d_t)); + else + ret = MLAN_STATUS_FAILURE; - LEAVE(); - return ret; + LEAVE(); + return ret; } /** @@ -1171,88 +1221,91 @@ wlan_11d_clear_parsedtable(mlan_private * pmpriv) mlan_status wlan_11d_create_dnld_countryinfo(mlan_private * pmpriv, t_u8 band) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = pmpriv->adapter; - region_chan_t *region_chan; - parsed_region_chan_11d_t parsed_region_chan; - t_u8 j; - - ENTER(); - - /* Only valid if 11D is enabled */ - if (wlan_11d_is_enabled(pmpriv)) { - - PRINTM(MINFO, "11D: Band[%d]\n", band); - - /* Update parsed_region_chan; download domain info to FW */ - - /* Find region channel */ - for (j = 0; j < MAX_REGION_CHANNEL_NUM; j++) { - region_chan = &pmadapter->region_channel[j]; - - PRINTM(MINFO, "11D: [%d] region_chan->Band[%d]\n", j, - region_chan->band); - - if (!region_chan || !region_chan->valid || !region_chan->pcfp) - continue; - switch (region_chan->band) { - case BAND_A: - switch (band) { - case BAND_A: - case BAND_AN: - case BAND_A | BAND_AN: - case BAND_A | BAND_AN | BAND_AAC: - break; - default: - continue; - } - break; - case BAND_B: - case BAND_G: - switch (band) { - case BAND_B: - case BAND_G: - case BAND_G | BAND_B: - case BAND_GN: - case BAND_G | BAND_GN: - case BAND_B | BAND_G | BAND_GN: - case BAND_B | BAND_G | BAND_GN | BAND_GAC: - break; - default: - continue; - } - break; - default: - continue; - } - break; - } - - /* Check if region channel found */ - if (j >= MAX_REGION_CHANNEL_NUM) { - PRINTM(MERROR, "11D: region_chan not found. Band[%d]\n", band); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - /* Generate parsed region channel info from region channel */ - memset(pmadapter, &parsed_region_chan, 0, - sizeof(parsed_region_chan_11d_t)); - wlan_11d_generate_parsed_region_chan(pmadapter, region_chan, - &parsed_region_chan); - - /* Generate domain info from parsed region channel info */ - wlan_11d_generate_domain_info(pmadapter, &parsed_region_chan); - - /* Set domain info */ - ret = wlan_11d_send_domain_info(pmpriv, MNULL); - if (ret) { - PRINTM(MERROR, "11D: Error sending domain info to FW\n"); - } - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + region_chan_t *region_chan; + parsed_region_chan_11d_t parsed_region_chan; + t_u8 j; + + ENTER(); + + /* Only valid if 11D is enabled */ + if (wlan_11d_is_enabled(pmpriv)) { + + PRINTM(MINFO, "11D: Band[%d]\n", band); + + /* Update parsed_region_chan; download domain info to FW */ + + /* Find region channel */ + for (j = 0; j < MAX_REGION_CHANNEL_NUM; j++) { + region_chan = &pmadapter->region_channel[j]; + + PRINTM(MINFO, "11D: [%d] region_chan->Band[%d]\n", j, + region_chan->band); + + if (!region_chan || !region_chan->valid || + !region_chan->pcfp) + continue; + switch (region_chan->band) { + case BAND_A: + switch (band) { + case BAND_A: + case BAND_AN: + case BAND_A | BAND_AN: + case BAND_A | BAND_AN | BAND_AAC: + break; + default: + continue; + } + break; + case BAND_B: + case BAND_G: + switch (band) { + case BAND_B: + case BAND_G: + case BAND_G | BAND_B: + case BAND_GN: + case BAND_G | BAND_GN: + case BAND_B | BAND_G | BAND_GN: + case BAND_B | BAND_G | BAND_GN | BAND_GAC: + break; + default: + continue; + } + break; + default: + continue; + } + break; + } + + /* Check if region channel found */ + if (j >= MAX_REGION_CHANNEL_NUM) { + PRINTM(MERROR, "11D: region_chan not found. Band[%d]\n", + band); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + /* Generate parsed region channel info from region channel */ + memset(pmadapter, &parsed_region_chan, 0, + sizeof(parsed_region_chan_11d_t)); + wlan_11d_generate_parsed_region_chan(pmadapter, region_chan, + &parsed_region_chan); + + /* Generate domain info from parsed region channel info */ + wlan_11d_generate_domain_info(pmadapter, &parsed_region_chan); + + /* Set domain info */ + ret = wlan_11d_send_domain_info(pmpriv, MNULL); + if (ret) { + PRINTM(MERROR, + "11D: Error sending domain info to FW\n"); + } + } + + LEAVE(); + return ret; } /** @@ -1266,72 +1319,87 @@ wlan_11d_create_dnld_countryinfo(mlan_private * pmpriv, t_u8 band) */ mlan_status wlan_11d_parse_dnld_countryinfo(mlan_private * pmpriv, - BSSDescriptor_t * pbss_desc) + BSSDescriptor_t * pbss_desc) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = pmpriv->adapter; - parsed_region_chan_11d_t region_chan; - parsed_region_chan_11d_t bssdesc_region_chan; - t_u32 i, j; - - ENTER(); - - /* Only valid if 11D is enabled */ - if (wlan_11d_is_enabled(pmpriv)) { - - memset(pmadapter, ®ion_chan, 0, sizeof(parsed_region_chan_11d_t)); - memset(pmadapter, &bssdesc_region_chan, 0, - sizeof(parsed_region_chan_11d_t)); - - memcpy(pmadapter, ®ion_chan, - &pmadapter->parsed_region_chan, - sizeof(parsed_region_chan_11d_t)); - - if (pbss_desc) { - /* Parse domain info if available */ - ret = - wlan_11d_parse_domain_info(pmadapter, &pbss_desc->country_info, - (t_u8) pbss_desc->bss_band, - &bssdesc_region_chan); - - if (ret == MLAN_STATUS_SUCCESS) { - /* Update the channel-power table */ - for (i = 0; ((i < bssdesc_region_chan.no_of_chan) - && (i < MAX_NO_OF_CHAN)); i++) { - - for (j = 0; ((j < region_chan.no_of_chan) - && (j < MAX_NO_OF_CHAN)); j++) { - /* - * Channel already exists, use minimum of existing - * tx power and tx_power received from - * country info of the current AP - */ - if (region_chan.chan_pwr[i].chan == - bssdesc_region_chan.chan_pwr[j].chan && - region_chan.chan_pwr[i].band == - bssdesc_region_chan.chan_pwr[j].band) { - region_chan.chan_pwr[j].pwr = - MIN(region_chan.chan_pwr[j].pwr, - bssdesc_region_chan.chan_pwr[i].pwr); - break; - } - } - } - } - } - - /* Generate domain info */ - wlan_11d_generate_domain_info(pmadapter, ®ion_chan); - - /* Set domain info */ - ret = wlan_11d_send_domain_info(pmpriv, MNULL); - if (ret) { - PRINTM(MERROR, "11D: Error sending domain info to FW\n"); - } - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + parsed_region_chan_11d_t region_chan; + parsed_region_chan_11d_t bssdesc_region_chan; + t_u32 i, j; + + ENTER(); + + /* Only valid if 11D is enabled */ + if (wlan_11d_is_enabled(pmpriv)) { + + memset(pmadapter, ®ion_chan, 0, + sizeof(parsed_region_chan_11d_t)); + memset(pmadapter, &bssdesc_region_chan, 0, + sizeof(parsed_region_chan_11d_t)); + + memcpy(pmadapter, ®ion_chan, + &pmadapter->parsed_region_chan, + sizeof(parsed_region_chan_11d_t)); + + if (pbss_desc) { + /* Parse domain info if available */ + ret = wlan_11d_parse_domain_info(pmadapter, + &pbss_desc-> + country_info, + (t_u8) pbss_desc-> + bss_band, + &bssdesc_region_chan); + + if (ret == MLAN_STATUS_SUCCESS) { + /* Update the channel-power table */ + for (i = 0; + ((i < bssdesc_region_chan.no_of_chan) + && (i < MAX_NO_OF_CHAN)); i++) { + + for (j = 0; + ((j < region_chan.no_of_chan) + && (j < MAX_NO_OF_CHAN)); j++) { + /* + * Channel already exists, use minimum of existing + * tx power and tx_power received from + * country info of the current AP + */ + if (region_chan.chan_pwr[i]. + chan == + bssdesc_region_chan. + chan_pwr[j].chan && + region_chan.chan_pwr[i]. + band == + bssdesc_region_chan. + chan_pwr[j].band) { + region_chan.chan_pwr[j]. + pwr = + MIN(region_chan. + chan_pwr[j]. + pwr, + bssdesc_region_chan. + chan_pwr[i]. + pwr); + break; + } + } + } + } + } + + /* Generate domain info */ + wlan_11d_generate_domain_info(pmadapter, ®ion_chan); + + /* Set domain info */ + ret = wlan_11d_send_domain_info(pmpriv, MNULL); + if (ret) { + PRINTM(MERROR, + "11D: Error sending domain info to FW\n"); + } + } + + LEAVE(); + return ret; } /** @@ -1345,47 +1413,50 @@ wlan_11d_parse_dnld_countryinfo(mlan_private * pmpriv, mlan_status wlan_11d_prepare_dnld_domain_info_cmd(mlan_private * pmpriv) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = pmpriv->adapter; - IEEEtypes_CountryInfoFullSet_t *pcountry_full = MNULL; - t_u32 idx; - - ENTER(); - - /* Only valid if 11D is enabled */ - if (wlan_11d_is_enabled(pmpriv) && pmadapter->num_in_scan_table != 0) { - for (idx = 0; idx < pmadapter->num_in_scan_table; idx++) { - pcountry_full = &pmadapter->pscan_table[idx].country_info; - - ret = - wlan_11d_update_chan_pwr_table(pmpriv, - &pmadapter->pscan_table[idx]); - - if (*(pcountry_full->country_code) != 0 && - (pcountry_full->len > COUNTRY_CODE_LEN)) { - /* Country info found in the BSS Descriptor */ - ret = - wlan_11d_process_country_info(pmpriv, - &pmadapter->pscan_table[idx]); - } - } - - /* Sort parsed_region_chan in ascending channel number */ - wlan_11d_sort_parsed_region_chan(&pmadapter->parsed_region_chan); - - /* Check if connected */ - if (pmpriv->media_connected == MTRUE) { - ret = - wlan_11d_parse_dnld_countryinfo(pmpriv, - &pmpriv->curr_bss_params. - bss_descriptor); - } else { - ret = wlan_11d_parse_dnld_countryinfo(pmpriv, MNULL); - } - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + IEEEtypes_CountryInfoFullSet_t *pcountry_full = MNULL; + t_u32 idx; + + ENTER(); + + /* Only valid if 11D is enabled */ + if (wlan_11d_is_enabled(pmpriv) && pmadapter->num_in_scan_table != 0) { + for (idx = 0; idx < pmadapter->num_in_scan_table; idx++) { + pcountry_full = + &pmadapter->pscan_table[idx].country_info; + + ret = wlan_11d_update_chan_pwr_table(pmpriv, + &pmadapter-> + pscan_table[idx]); + + if (*(pcountry_full->country_code) != 0 && + (pcountry_full->len > COUNTRY_CODE_LEN)) { + /* Country info found in the BSS Descriptor */ + ret = wlan_11d_process_country_info(pmpriv, + &pmadapter-> + pscan_table + [idx]); + } + } + + /* Sort parsed_region_chan in ascending channel number */ + wlan_11d_sort_parsed_region_chan(&pmadapter-> + parsed_region_chan); + + /* Check if connected */ + if (pmpriv->media_connected == MTRUE) { + ret = wlan_11d_parse_dnld_countryinfo(pmpriv, + &pmpriv-> + curr_bss_params. + bss_descriptor); + } else { + ret = wlan_11d_parse_dnld_countryinfo(pmpriv, MNULL); + } + } + + LEAVE(); + return ret; } /** @@ -1398,52 +1469,54 @@ wlan_11d_prepare_dnld_domain_info_cmd(mlan_private * pmpriv) */ mlan_status wlan_11d_cfg_domain_info(IN pmlan_adapter pmadapter, - IN mlan_ioctl_req * pioctl_req) + IN mlan_ioctl_req * pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_11d_domain_info *domain_info = MNULL; - mlan_ds_11d_cfg *cfg_11d = MNULL; - t_u8 cfp_bg = 0, cfp_a = 0; - - ENTER(); - - cfg_11d = (mlan_ds_11d_cfg *) pioctl_req->pbuf; - domain_info = &cfg_11d->param.domain_info; - memcpy(pmadapter, pmadapter->country_code, domain_info->country_code, - COUNTRY_CODE_LEN); - wlan_11d_set_domain_info(pmpriv, domain_info->band, - domain_info->country_code, - domain_info->no_of_sub_band, - (IEEEtypes_SubbandSet_t *) domain_info->sub_band); - ret = wlan_11d_send_domain_info(pmpriv, pioctl_req); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - /* Update region code and table based on country code */ - if (wlan_misc_country_2_cfp_table_code(pmadapter, - domain_info->country_code, &cfp_bg, - &cfp_a)) { - PRINTM(MIOCTL, "Country code %c%c not found!\n", - domain_info->country_code[0], domain_info->country_code[1]); - goto done; - } - pmadapter->cfp_code_bg = cfp_bg; - pmadapter->cfp_code_a = cfp_a; - if (cfp_bg && cfp_a && (cfp_bg == cfp_a)) - pmadapter->region_code = cfp_a; - else - pmadapter->region_code = 0; - if (wlan_set_regiontable(pmpriv, pmadapter->region_code, - pmadapter->config_bands | pmadapter-> - adhoc_start_band)) { - PRINTM(MIOCTL, "Fail to set regiontabl\n"); - goto done; - } - done: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_11d_domain_info *domain_info = MNULL; + mlan_ds_11d_cfg *cfg_11d = MNULL; + t_u8 cfp_bg = 0, cfp_a = 0; + + ENTER(); + + cfg_11d = (mlan_ds_11d_cfg *) pioctl_req->pbuf; + domain_info = &cfg_11d->param.domain_info; + memcpy(pmadapter, pmadapter->country_code, domain_info->country_code, + COUNTRY_CODE_LEN); + wlan_11d_set_domain_info(pmpriv, domain_info->band, + domain_info->country_code, + domain_info->no_of_sub_band, + (IEEEtypes_SubbandSet_t *) domain_info-> + sub_band); + ret = wlan_11d_send_domain_info(pmpriv, pioctl_req); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + /* Update region code and table based on country code */ + if (wlan_misc_country_2_cfp_table_code(pmadapter, + domain_info->country_code, + &cfp_bg, &cfp_a)) { + PRINTM(MIOCTL, "Country code %c%c not found!\n", + domain_info->country_code[0], + domain_info->country_code[1]); + goto done; + } + pmadapter->cfp_code_bg = cfp_bg; + pmadapter->cfp_code_a = cfp_a; + if (cfp_bg && cfp_a && (cfp_bg == cfp_a)) + pmadapter->region_code = cfp_a; + else + pmadapter->region_code = 0; + if (wlan_set_regiontable(pmpriv, pmadapter->region_code, + pmadapter->config_bands | pmadapter-> + adhoc_start_band)) { + PRINTM(MIOCTL, "Fail to set regiontabl\n"); + goto done; + } +done: + LEAVE(); + return ret; } #endif /* STA_SUPPORT */ @@ -1461,52 +1534,52 @@ wlan_11d_cfg_domain_info(IN pmlan_adapter pmadapter, */ mlan_status wlan_11d_handle_uap_domain_info(mlan_private * pmpriv, - t_u8 band, - t_u8 * domain_tlv, t_void * pioctl_buf) + t_u8 band, + t_u8 * domain_tlv, t_void * pioctl_buf) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = pmpriv->adapter; - MrvlIEtypes_DomainParamSet_t *pdomain_tlv; - t_u8 num_sub_band = 0; - t_u8 cfp_bg = 0, cfp_a = 0; - - ENTER(); - - pdomain_tlv = (MrvlIEtypes_DomainParamSet_t *) domain_tlv; - - // update region code & table based on country string - if (wlan_misc_country_2_cfp_table_code(pmadapter, - pdomain_tlv->country_code, &cfp_bg, - &cfp_a) == MLAN_STATUS_SUCCESS) { - pmadapter->cfp_code_bg = cfp_bg; - pmadapter->cfp_code_a = cfp_a; - if (cfp_bg && cfp_a && (cfp_bg == cfp_a)) - pmadapter->region_code = cfp_a; - else - pmadapter->region_code = 0; - if (wlan_set_regiontable(pmpriv, pmadapter->region_code, - pmadapter->config_bands | pmadapter-> - adhoc_start_band)) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - } - - memcpy(pmadapter, pmadapter->country_code, pdomain_tlv->country_code, - COUNTRY_CODE_LEN); - num_sub_band = - ((pdomain_tlv->header.len - - COUNTRY_CODE_LEN) / sizeof(IEEEtypes_SubbandSet_t)); - - // TODO: don't just clobber pmadapter->domain_reg. - // Add some checking or merging between STA & UAP domain_info - - wlan_11d_set_domain_info(pmpriv, band, pdomain_tlv->country_code, - num_sub_band, pdomain_tlv->sub_band); - ret = wlan_11d_send_domain_info(pmpriv, pioctl_buf); - - done: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + MrvlIEtypes_DomainParamSet_t *pdomain_tlv; + t_u8 num_sub_band = 0; + t_u8 cfp_bg = 0, cfp_a = 0; + + ENTER(); + + pdomain_tlv = (MrvlIEtypes_DomainParamSet_t *) domain_tlv; + + /* update region code & table based on country string */ + if (wlan_misc_country_2_cfp_table_code(pmadapter, + pdomain_tlv->country_code, + &cfp_bg, + &cfp_a) == MLAN_STATUS_SUCCESS) { + pmadapter->cfp_code_bg = cfp_bg; + pmadapter->cfp_code_a = cfp_a; + if (cfp_bg && cfp_a && (cfp_bg == cfp_a)) + pmadapter->region_code = cfp_a; + else + pmadapter->region_code = 0; + if (wlan_set_regiontable(pmpriv, pmadapter->region_code, + pmadapter->config_bands | pmadapter-> + adhoc_start_band)) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + } + + memcpy(pmadapter, pmadapter->country_code, pdomain_tlv->country_code, + COUNTRY_CODE_LEN); + num_sub_band = + ((pdomain_tlv->header.len - + COUNTRY_CODE_LEN) / sizeof(IEEEtypes_SubbandSet_t)); + + /* TODO: don't just clobber pmadapter->domain_reg. Add some checking + or merging between STA & UAP domain_info */ + wlan_11d_set_domain_info(pmpriv, band, pdomain_tlv->country_code, + num_sub_band, pdomain_tlv->sub_band); + ret = wlan_11d_send_domain_info(pmpriv, pioctl_buf); + +done: + LEAVE(); + return ret; } #endif diff --git a/drivers/net/wireless/sd8897/mlan/mlan_11h.c b/drivers/net/wireless/sd8897/mlan/mlan_11h.c index c0fec715cac8..57481a960524 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_11h.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_11h.c @@ -52,25 +52,25 @@ Change Log: #define WLAN_11H_TPC_POWERCAPABILITY_MAX 20 /** Regulatory requirement for the duration of a channel availability check */ -#define WLAN_11H_CHANNEL_AVAIL_CHECK_DURATION 60000 /* in ms */ +#define WLAN_11H_CHANNEL_AVAIL_CHECK_DURATION 60000 /* in ms */ /** Starting Frequency for 11A band */ -#define START_FREQ_11A_BAND 5000 /* in MHz */ +#define START_FREQ_11A_BAND 5000 /* in MHz */ /** DFS Channel Move Time */ -#define DFS_CHAN_MOVE_TIME 10 /* in sec */ +#define DFS_CHAN_MOVE_TIME 10 /* in sec */ /** Regulatory requirement for the duration of a non-occupancy period */ -#define WLAN_11H_NON_OCCUPANCY_PERIOD 1800 /* in sec (30mins) */ +#define WLAN_11H_NON_OCCUPANCY_PERIOD 1800 /* in sec (30mins) */ /** Maximum allowable age (seconds) on DFS report data */ -#define MAX_DFS_REPORT_USABLE_AGE_SEC (120) // 2 minutes +#define MAX_DFS_REPORT_USABLE_AGE_SEC (120) /* 2 minutes */ /** Minimum delay for CHAN_SW IE to broadcast by FW */ -#define MIN_RDH_CHAN_SW_IE_PERIOD_MSEC (500) // 5 beacons @ 100ms +#define MIN_RDH_CHAN_SW_IE_PERIOD_MSEC (500) /* 5 beacons @ 100ms */ /** Maximum delay for CHAN_SW IE to broadcast by FW */ -#define MAX_RDH_CHAN_SW_IE_PERIOD_MSEC (3000) // 5 beacons @ 600ms +#define MAX_RDH_CHAN_SW_IE_PERIOD_MSEC (3000) /* 5 beacons @ 600ms */ /** Maximum retries on selecting new random channel */ #define MAX_RANDOM_CHANNEL_RETRIES (20) @@ -83,41 +83,42 @@ Change Log: /** Region codes 0x10, 0x20: channels 1 thru 11 supported */ static const - IEEEtypes_SupportChan_Subband_t wlan_11h_2_4G_region_FCC = { 1, 11 }; + IEEEtypes_SupportChan_Subband_t wlan_11h_2_4G_region_FCC = { 1, 11 }; /** Region codes 0x30, 0x32, 0x41, 0x50: channels 1 thru 13 supported */ static const - IEEEtypes_SupportChan_Subband_t wlan_11h_2_4G_region_EU = { 1, 13 }; + IEEEtypes_SupportChan_Subband_t wlan_11h_2_4G_region_EU = { 1, 13 }; /** Region code 0x40: only channel 14 supported */ static const - IEEEtypes_SupportChan_Subband_t wlan_11h_2_4G_region_JPN40 = { 14, 1 }; + IEEEtypes_SupportChan_Subband_t wlan_11h_2_4G_region_JPN40 = { 14, 1 }; /** JPN sub-band config : Start Channel = 8, NumChans = 3 */ static const - IEEEtypes_SupportChan_Subband_t wlan_11h_JPN_bottom_band = { 8, 3 }; + IEEEtypes_SupportChan_Subband_t wlan_11h_JPN_bottom_band = { 8, 3 }; /** U-NII sub-band config : Start Channel = 36, NumChans = 4 */ static const - IEEEtypes_SupportChan_Subband_t wlan_11h_unii_lower_band = { 36, 4 }; + IEEEtypes_SupportChan_Subband_t wlan_11h_unii_lower_band = { 36, 4 }; /** U-NII sub-band config : Start Channel = 52, NumChans = 4 */ static const - IEEEtypes_SupportChan_Subband_t wlan_11h_unii_middle_band = { 52, 4 }; + IEEEtypes_SupportChan_Subband_t wlan_11h_unii_middle_band = { 52, 4 }; /** U-NII sub-band config : Start Channel = 100, NumChans = 11 */ static const - IEEEtypes_SupportChan_Subband_t wlan_11h_unii_mid_upper_band = { 100, 11 }; + IEEEtypes_SupportChan_Subband_t wlan_11h_unii_mid_upper_band = + { 100, 11 }; /** U-NII sub-band config : Start Channel = 149, NumChans = 5 */ static const - IEEEtypes_SupportChan_Subband_t wlan_11h_unii_upper_band = { 149, 5 }; + IEEEtypes_SupportChan_Subband_t wlan_11h_unii_upper_band = { 149, 5 }; /** Internally passed structure used to send a CMD_802_11_TPC_INFO command */ typedef struct { - t_u8 chan; /**< Channel to which the power constraint applies */ - t_u8 power_constraint; /**< Local power constraint to send to firmware */ + t_u8 chan; /**< Channel to which the power constraint applies */ + t_u8 power_constraint; /**< Local power constraint to send to firmware */ } wlan_11h_tpc_info_param_t; /******************************************************** @@ -137,16 +138,16 @@ typedef struct static t_u32 wlan_11h_get_random_num(pmlan_adapter pmadapter) { - t_u32 sec, usec; + t_u32 sec, usec; - ENTER(); - pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, &sec, - &usec); - sec = (sec & 0xFFFF) + (sec >> 16); - usec = (usec & 0xFFFF) + (usec >> 16); + ENTER(); + pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, &sec, + &usec); + sec = (sec & 0xFFFF) + (sec >> 16); + usec = (usec & 0xFFFF) + (usec >> 16); - LEAVE(); - return ((usec << 16) | sec); + LEAVE(); + return ((usec << 16) | sec); } /** @@ -161,34 +162,35 @@ wlan_11h_get_random_num(pmlan_adapter pmadapter) */ static t_u32 wlan_11h_convert_ieee_to_mrvl_ie(mlan_adapter * pmadapter, - t_u8 * pout_buf, const t_u8 * pin_ie) + t_u8 * pout_buf, const t_u8 * pin_ie) { - MrvlIEtypesHeader_t mrvl_ie_hdr; - t_u8 *ptmp_buf = pout_buf; + MrvlIEtypesHeader_t mrvl_ie_hdr; + t_u8 *ptmp_buf = pout_buf; - ENTER(); - /* Assign the Element Id and Len to the Marvell struct attributes */ - mrvl_ie_hdr.type = wlan_cpu_to_le16(pin_ie[0]); - mrvl_ie_hdr.len = wlan_cpu_to_le16(pin_ie[1]); + ENTER(); + /* Assign the Element Id and Len to the Marvell struct attributes */ + mrvl_ie_hdr.type = wlan_cpu_to_le16(pin_ie[0]); + mrvl_ie_hdr.len = wlan_cpu_to_le16(pin_ie[1]); - /* If the element ID is zero, return without doing any copying */ - if (!mrvl_ie_hdr.type) { - LEAVE(); - return 0; - } + /* If the element ID is zero, return without doing any copying */ + if (!mrvl_ie_hdr.type) { + LEAVE(); + return 0; + } - /* Copy the header to the buffer pointer */ - memcpy(pmadapter, ptmp_buf, &mrvl_ie_hdr, sizeof(mrvl_ie_hdr)); + /* Copy the header to the buffer pointer */ + memcpy(pmadapter, ptmp_buf, &mrvl_ie_hdr, sizeof(mrvl_ie_hdr)); - /* Increment the temp buffer pointer by the size appended */ - ptmp_buf += sizeof(mrvl_ie_hdr); + /* Increment the temp buffer pointer by the size appended */ + ptmp_buf += sizeof(mrvl_ie_hdr); - /* Append the data section of the IE; length given by the IEEE IE length */ - memcpy(pmadapter, ptmp_buf, pin_ie + 2, pin_ie[1]); + /* Append the data section of the IE; length given by the IEEE IE + length */ + memcpy(pmadapter, ptmp_buf, pin_ie + 2, pin_ie[1]); - LEAVE(); - /* Return the number of bytes appended to pout_buf */ - return (sizeof(mrvl_ie_hdr) + pin_ie[1]); + LEAVE(); + /* Return the number of bytes appended to pout_buf */ + return (sizeof(mrvl_ie_hdr) + pin_ie[1]); } #ifdef STA_SUPPORT @@ -215,58 +217,62 @@ wlan_11h_convert_ieee_to_mrvl_ie(mlan_adapter * pmadapter, static t_u32 wlan_11h_set_ibss_dfs_ie(mlan_private * priv, IEEEtypes_IBSS_DFS_t * pdfs) { - t_u8 num_chans = 0; - MeasRptBasicMap_t initial_map; - mlan_adapter *adapter = priv->adapter; - - ENTER(); - - memset(adapter, pdfs, 0x00, sizeof(IEEEtypes_IBSS_DFS_t)); - - /* - * A basic measurement report is included with each channel in the - * map field. Initial value for the map for each supported channel - * is with only the unmeasured bit set. - */ - memset(adapter, &initial_map, 0x00, sizeof(initial_map)); - initial_map.unmeasured = 1; - - /* Set the DFS Owner and recovery interval fields */ - memcpy(adapter, pdfs->dfs_owner, priv->curr_addr, sizeof(pdfs->dfs_owner)); - pdfs->dfs_recovery_interval = WLAN_11H_DEFAULT_DFS_RECOVERY_INTERVAL; - - for (; (num_chans < adapter->parsed_region_chan.no_of_chan) - && (num_chans < WLAN_11H_MAX_IBSS_DFS_CHANNELS); num_chans++) { - pdfs->channel_map[num_chans].channel_number = - adapter->parsed_region_chan.chan_pwr[num_chans].chan; - - /* - * Set the initial map field with a basic measurement - */ - pdfs->channel_map[num_chans].rpt_map = initial_map; - } - - /* - * If we have an established channel map, include it and return - * a valid DFS element - */ - if (num_chans) { - PRINTM(MINFO, "11h: Added %d channels to IBSS DFS Map\n", num_chans); - - pdfs->element_id = IBSS_DFS; - pdfs->len = - (sizeof(pdfs->dfs_owner) + sizeof(pdfs->dfs_recovery_interval) - + num_chans * sizeof(IEEEtypes_ChannelMap_t)); - - LEAVE(); - return (pdfs->len + sizeof(pdfs->len) + sizeof(pdfs->element_id)); - } - - /* Ensure the element is zeroed out for an invalid return */ - memset(adapter, pdfs, 0x00, sizeof(IEEEtypes_IBSS_DFS_t)); - - LEAVE(); - return 0; + t_u8 num_chans = 0; + MeasRptBasicMap_t initial_map; + mlan_adapter *adapter = priv->adapter; + + ENTER(); + + memset(adapter, pdfs, 0x00, sizeof(IEEEtypes_IBSS_DFS_t)); + + /* + * A basic measurement report is included with each channel in the + * map field. Initial value for the map for each supported channel + * is with only the unmeasured bit set. + */ + memset(adapter, &initial_map, 0x00, sizeof(initial_map)); + initial_map.unmeasured = 1; + + /* Set the DFS Owner and recovery interval fields */ + memcpy(adapter, pdfs->dfs_owner, priv->curr_addr, + sizeof(pdfs->dfs_owner)); + pdfs->dfs_recovery_interval = WLAN_11H_DEFAULT_DFS_RECOVERY_INTERVAL; + + for (; (num_chans < adapter->parsed_region_chan.no_of_chan) + && (num_chans < WLAN_11H_MAX_IBSS_DFS_CHANNELS); num_chans++) { + pdfs->channel_map[num_chans].channel_number = + adapter->parsed_region_chan.chan_pwr[num_chans].chan; + + /* + * Set the initial map field with a basic measurement + */ + pdfs->channel_map[num_chans].rpt_map = initial_map; + } + + /* + * If we have an established channel map, include it and return + * a valid DFS element + */ + if (num_chans) { + PRINTM(MINFO, "11h: Added %d channels to IBSS DFS Map\n", + num_chans); + + pdfs->element_id = IBSS_DFS; + pdfs->len = + (sizeof(pdfs->dfs_owner) + + sizeof(pdfs->dfs_recovery_interval) + + num_chans * sizeof(IEEEtypes_ChannelMap_t)); + + LEAVE(); + return (pdfs->len + sizeof(pdfs->len) + + sizeof(pdfs->element_id)); + } + + /* Ensure the element is zeroed out for an invalid return */ + memset(adapter, pdfs, 0x00, sizeof(IEEEtypes_IBSS_DFS_t)); + + LEAVE(); + return 0; } #endif @@ -289,117 +295,141 @@ wlan_11h_set_ibss_dfs_ie(mlan_private * priv, IEEEtypes_IBSS_DFS_t * pdfs) */ static t_u16 wlan_11h_set_supp_channels_ie(mlan_private * priv, - t_u8 band, - IEEEtypes_SupportedChannels_t * psup_chan) + t_u8 band, + IEEEtypes_SupportedChannels_t * psup_chan) { - t_u16 num_subbands = 0; - t_u16 ret_len = 0; - t_u8 cfp_bg, cfp_a; - - ENTER(); - memset(priv->adapter, psup_chan, 0x00, - sizeof(IEEEtypes_SupportedChannels_t)); - - cfp_bg = cfp_a = priv->adapter->region_code; - if (!priv->adapter->region_code) { - /* Invalid region code, use CFP code */ - cfp_bg = priv->adapter->cfp_code_bg; - cfp_a = priv->adapter->cfp_code_a; - } - - if ((band & BAND_B) || (band & BAND_G)) { - /* - * Channels are contiguous in 2.4GHz, usually only one subband. - */ - switch (cfp_bg) { - case 0x10: /* USA FCC */ - case 0x20: /* Canada IC */ - default: - psup_chan->subband[num_subbands++] = wlan_11h_2_4G_region_FCC; - break; - case 0x30: /* Europe ETSI */ - case 0x32: /* France */ - case 0x41: /* Japan */ - case 0x50: /* China */ - psup_chan->subband[num_subbands++] = wlan_11h_2_4G_region_EU; - break; - case 0x40: /* Japan */ - psup_chan->subband[num_subbands++] = wlan_11h_2_4G_region_JPN40; - break; - case 0xff: /* Japan special */ - psup_chan->subband[num_subbands++] = wlan_11h_2_4G_region_EU; - psup_chan->subband[num_subbands++] = wlan_11h_2_4G_region_JPN40; - break; - } - } else if (band & BAND_A) { - /* - * Set the supported channel elements based on the region code, - * incrementing num_subbands for each sub-band we append to the - * element. - */ - switch (cfp_a) { - case 0x10: /* USA FCC */ - case 0x20: /* Canada IC */ - case 0x32: /* France */ - psup_chan->subband[num_subbands++] = wlan_11h_unii_lower_band; - psup_chan->subband[num_subbands++] = wlan_11h_unii_middle_band; - psup_chan->subband[num_subbands++] = wlan_11h_unii_mid_upper_band; - psup_chan->subband[num_subbands++] = wlan_11h_unii_upper_band; - break; - case 0x30: /* Europe ETSI */ - default: - psup_chan->subband[num_subbands++] = wlan_11h_unii_lower_band; - psup_chan->subband[num_subbands++] = wlan_11h_unii_middle_band; - psup_chan->subband[num_subbands++] = wlan_11h_unii_mid_upper_band; - break; - case 0x50: /* China */ - psup_chan->subband[num_subbands++] = wlan_11h_unii_upper_band; - break; - case 0x40: /* Japan */ - case 0x41: /* Japan */ - case 0xff: /* Japan special */ - psup_chan->subband[num_subbands++] = wlan_11h_JPN_bottom_band; - psup_chan->subband[num_subbands++] = wlan_11h_unii_lower_band; - psup_chan->subband[num_subbands++] = wlan_11h_unii_middle_band; - psup_chan->subband[num_subbands++] = wlan_11h_unii_mid_upper_band; - break; - case 0x1: /* Low band (5150-5250 MHz) channels */ - psup_chan->subband[num_subbands++] = wlan_11h_unii_lower_band; - break; - case 0x2: /* Lower middle band (5250-5350 MHz) channels */ - psup_chan->subband[num_subbands++] = wlan_11h_unii_middle_band; - break; - case 0x3: /* Upper middle band (5470-5725 MHz) channels */ - psup_chan->subband[num_subbands++] = wlan_11h_unii_mid_upper_band; - break; - case 0x4: /* High band (5725-5850 MHz) channels */ - psup_chan->subband[num_subbands++] = wlan_11h_unii_upper_band; - break; - case 0x5: /* Low band (5150-5250 MHz) and High band - (5725-5850 MHz) channels */ - psup_chan->subband[num_subbands++] = wlan_11h_unii_lower_band; - psup_chan->subband[num_subbands++] = wlan_11h_unii_upper_band; - break; - } - } - - /* - * If we have setup any supported subbands in the element, return a - * valid IE along with its size, else return 0. - */ - if (num_subbands) { - psup_chan->element_id = SUPPORTED_CHANNELS; - psup_chan->len = num_subbands * sizeof(IEEEtypes_SupportChan_Subband_t); - - ret_len = (t_u16) (psup_chan->len - + sizeof(psup_chan->len) + - sizeof(psup_chan->element_id)); - - HEXDUMP("11h: SupChan", (t_u8 *) psup_chan, ret_len); - } - - LEAVE(); - return ret_len; + t_u16 num_subbands = 0; + t_u16 ret_len = 0; + t_u8 cfp_bg, cfp_a; + + ENTER(); + memset(priv->adapter, psup_chan, 0x00, + sizeof(IEEEtypes_SupportedChannels_t)); + + cfp_bg = cfp_a = priv->adapter->region_code; + if (!priv->adapter->region_code) { + /* Invalid region code, use CFP code */ + cfp_bg = priv->adapter->cfp_code_bg; + cfp_a = priv->adapter->cfp_code_a; + } + + if ((band & BAND_B) || (band & BAND_G)) { + /* + * Channels are contiguous in 2.4GHz, usually only one subband. + */ + switch (cfp_bg) { + case 0x10: /* USA FCC */ + case 0x20: /* Canada IC */ + default: + psup_chan->subband[num_subbands++] = + wlan_11h_2_4G_region_FCC; + break; + case 0x30: /* Europe ETSI */ + case 0x32: /* France */ + case 0x41: /* Japan */ + case 0x50: /* China */ + psup_chan->subband[num_subbands++] = + wlan_11h_2_4G_region_EU; + break; + case 0x40: /* Japan */ + psup_chan->subband[num_subbands++] = + wlan_11h_2_4G_region_JPN40; + break; + case 0xff: /* Japan special */ + psup_chan->subband[num_subbands++] = + wlan_11h_2_4G_region_EU; + psup_chan->subband[num_subbands++] = + wlan_11h_2_4G_region_JPN40; + break; + } + } else if (band & BAND_A) { + /* + * Set the supported channel elements based on the region code, + * incrementing num_subbands for each sub-band we append to the + * element. + */ + switch (cfp_a) { + case 0x10: /* USA FCC */ + case 0x20: /* Canada IC */ + case 0x32: /* France */ + psup_chan->subband[num_subbands++] = + wlan_11h_unii_lower_band; + psup_chan->subband[num_subbands++] = + wlan_11h_unii_middle_band; + psup_chan->subband[num_subbands++] = + wlan_11h_unii_mid_upper_band; + psup_chan->subband[num_subbands++] = + wlan_11h_unii_upper_band; + break; + case 0x30: /* Europe ETSI */ + default: + psup_chan->subband[num_subbands++] = + wlan_11h_unii_lower_band; + psup_chan->subband[num_subbands++] = + wlan_11h_unii_middle_band; + psup_chan->subband[num_subbands++] = + wlan_11h_unii_mid_upper_band; + break; + case 0x50: /* China */ + psup_chan->subband[num_subbands++] = + wlan_11h_unii_upper_band; + break; + case 0x40: /* Japan */ + case 0x41: /* Japan */ + case 0xff: /* Japan special */ + psup_chan->subband[num_subbands++] = + wlan_11h_JPN_bottom_band; + psup_chan->subband[num_subbands++] = + wlan_11h_unii_lower_band; + psup_chan->subband[num_subbands++] = + wlan_11h_unii_middle_band; + psup_chan->subband[num_subbands++] = + wlan_11h_unii_mid_upper_band; + break; + case 0x1: /* Low band (5150-5250 MHz) channels */ + psup_chan->subband[num_subbands++] = + wlan_11h_unii_lower_band; + break; + case 0x2: /* Lower middle band (5250-5350 MHz) channels */ + psup_chan->subband[num_subbands++] = + wlan_11h_unii_middle_band; + break; + case 0x3: /* Upper middle band (5470-5725 MHz) channels */ + psup_chan->subband[num_subbands++] = + wlan_11h_unii_mid_upper_band; + break; + case 0x4: /* High band (5725-5850 MHz) channels */ + psup_chan->subband[num_subbands++] = + wlan_11h_unii_upper_band; + break; + case 0x5: /* Low band (5150-5250 MHz) and High band + (5725-5850 MHz) channels */ + psup_chan->subband[num_subbands++] = + wlan_11h_unii_lower_band; + psup_chan->subband[num_subbands++] = + wlan_11h_unii_upper_band; + break; + } + } + + /* + * If we have setup any supported subbands in the element, return a + * valid IE along with its size, else return 0. + */ + if (num_subbands) { + psup_chan->element_id = SUPPORTED_CHANNELS; + psup_chan->len = + num_subbands * sizeof(IEEEtypes_SupportChan_Subband_t); + + ret_len = (t_u16) (psup_chan->len + + sizeof(psup_chan->len) + + sizeof(psup_chan->element_id)); + + HEXDUMP("11h: SupChan", (t_u8 *) psup_chan, ret_len); + } + + LEAVE(); + return ret_len; } /** @@ -414,25 +444,25 @@ wlan_11h_set_supp_channels_ie(mlan_private * priv, */ static mlan_status wlan_11h_cmd_tpc_request(mlan_private * priv, - HostCmd_DS_COMMAND * pcmd_ptr, - const t_void * pinfo_buf) + HostCmd_DS_COMMAND * pcmd_ptr, + const t_void * pinfo_buf) { - ENTER(); + ENTER(); - memcpy(priv->adapter, &pcmd_ptr->params.tpc_req, pinfo_buf, - sizeof(HostCmd_DS_802_11_TPC_ADAPT_REQ)); + memcpy(priv->adapter, &pcmd_ptr->params.tpc_req, pinfo_buf, + sizeof(HostCmd_DS_802_11_TPC_ADAPT_REQ)); - pcmd_ptr->params.tpc_req.req.timeout = - wlan_cpu_to_le16(pcmd_ptr->params.tpc_req.req.timeout); + pcmd_ptr->params.tpc_req.req.timeout = + wlan_cpu_to_le16(pcmd_ptr->params.tpc_req.req.timeout); - /* Converted to little endian in wlan_11h_cmd_process */ - pcmd_ptr->size = sizeof(HostCmd_DS_802_11_TPC_ADAPT_REQ) + S_DS_GEN; + /* Converted to little endian in wlan_11h_cmd_process */ + pcmd_ptr->size = sizeof(HostCmd_DS_802_11_TPC_ADAPT_REQ) + S_DS_GEN; - HEXDUMP("11h: 11_TPC_ADAPT_REQ:", (t_u8 *) pcmd_ptr, - (t_u32) pcmd_ptr->size); + HEXDUMP("11h: 11_TPC_ADAPT_REQ:", (t_u8 *) pcmd_ptr, + (t_u32) pcmd_ptr->size); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -447,36 +477,36 @@ wlan_11h_cmd_tpc_request(mlan_private * priv, */ static mlan_status wlan_11h_cmd_tpc_info(mlan_private * priv, - HostCmd_DS_COMMAND * pcmd_ptr, const t_void * pinfo_buf) + HostCmd_DS_COMMAND * pcmd_ptr, const t_void * pinfo_buf) { - HostCmd_DS_802_11_TPC_INFO *ptpc_info = &pcmd_ptr->params.tpc_info; - MrvlIEtypes_LocalPowerConstraint_t *pconstraint = - &ptpc_info->local_constraint; - MrvlIEtypes_PowerCapability_t *pcap = &ptpc_info->power_cap; + HostCmd_DS_802_11_TPC_INFO *ptpc_info = &pcmd_ptr->params.tpc_info; + MrvlIEtypes_LocalPowerConstraint_t *pconstraint = + &ptpc_info->local_constraint; + MrvlIEtypes_PowerCapability_t *pcap = &ptpc_info->power_cap; - wlan_11h_device_state_t *pstate = &priv->adapter->state_11h; - const wlan_11h_tpc_info_param_t *ptpc_info_param = - (wlan_11h_tpc_info_param_t *) pinfo_buf; + wlan_11h_device_state_t *pstate = &priv->adapter->state_11h; + const wlan_11h_tpc_info_param_t *ptpc_info_param = + (wlan_11h_tpc_info_param_t *) pinfo_buf; - ENTER(); + ENTER(); - pcap->min_power = pstate->min_tx_power_capability; - pcap->max_power = pstate->max_tx_power_capability; - pcap->header.len = wlan_cpu_to_le16(2); - pcap->header.type = wlan_cpu_to_le16(TLV_TYPE_POWER_CAPABILITY); + pcap->min_power = pstate->min_tx_power_capability; + pcap->max_power = pstate->max_tx_power_capability; + pcap->header.len = wlan_cpu_to_le16(2); + pcap->header.type = wlan_cpu_to_le16(TLV_TYPE_POWER_CAPABILITY); - pconstraint->chan = ptpc_info_param->chan; - pconstraint->constraint = ptpc_info_param->power_constraint; - pconstraint->header.type = wlan_cpu_to_le16(TLV_TYPE_POWER_CONSTRAINT); - pconstraint->header.len = wlan_cpu_to_le16(2); + pconstraint->chan = ptpc_info_param->chan; + pconstraint->constraint = ptpc_info_param->power_constraint; + pconstraint->header.type = wlan_cpu_to_le16(TLV_TYPE_POWER_CONSTRAINT); + pconstraint->header.len = wlan_cpu_to_le16(2); - /* Converted to little endian in wlan_11h_cmd_process */ - pcmd_ptr->size = sizeof(HostCmd_DS_802_11_TPC_INFO) + S_DS_GEN; + /* Converted to little endian in wlan_11h_cmd_process */ + pcmd_ptr->size = sizeof(HostCmd_DS_802_11_TPC_INFO) + S_DS_GEN; - HEXDUMP("11h: TPC INFO", (t_u8 *) pcmd_ptr, (t_u32) pcmd_ptr->size); + HEXDUMP("11h: TPC INFO", (t_u8 *) pcmd_ptr, (t_u32) pcmd_ptr->size); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -491,29 +521,29 @@ wlan_11h_cmd_tpc_info(mlan_private * priv, */ static mlan_status wlan_11h_cmd_chan_sw_ann(mlan_private * priv, - HostCmd_DS_COMMAND * pcmd_ptr, - const t_void * pinfo_buf) + HostCmd_DS_COMMAND * pcmd_ptr, + const t_void * pinfo_buf) { - const HostCmd_DS_802_11_CHAN_SW_ANN *pch_sw_ann = - (HostCmd_DS_802_11_CHAN_SW_ANN *) pinfo_buf; + const HostCmd_DS_802_11_CHAN_SW_ANN *pch_sw_ann = + (HostCmd_DS_802_11_CHAN_SW_ANN *) pinfo_buf; - ENTER(); + ENTER(); - /* Converted to little endian in wlan_11h_cmd_process */ - pcmd_ptr->size = sizeof(HostCmd_DS_802_11_CHAN_SW_ANN) + S_DS_GEN; + /* Converted to little endian in wlan_11h_cmd_process */ + pcmd_ptr->size = sizeof(HostCmd_DS_802_11_CHAN_SW_ANN) + S_DS_GEN; - memcpy(priv->adapter, &pcmd_ptr->params.chan_sw_ann, pch_sw_ann, - sizeof(HostCmd_DS_802_11_CHAN_SW_ANN)); + memcpy(priv->adapter, &pcmd_ptr->params.chan_sw_ann, pch_sw_ann, + sizeof(HostCmd_DS_802_11_CHAN_SW_ANN)); - PRINTM(MINFO, "11h: ChSwAnn: %#x-%u, Seq=%u, Ret=%u\n", - pcmd_ptr->command, pcmd_ptr->size, pcmd_ptr->seq_num, - pcmd_ptr->result); - PRINTM(MINFO, "11h: ChSwAnn: Ch=%d, Cnt=%d, Mode=%d\n", - pch_sw_ann->new_chan, pch_sw_ann->switch_count, - pch_sw_ann->switch_mode); + PRINTM(MINFO, "11h: ChSwAnn: %#x-%u, Seq=%u, Ret=%u\n", + pcmd_ptr->command, pcmd_ptr->size, pcmd_ptr->seq_num, + pcmd_ptr->result); + PRINTM(MINFO, "11h: ChSwAnn: Ch=%d, Cnt=%d, Mode=%d\n", + pch_sw_ann->new_chan, pch_sw_ann->switch_count, + pch_sw_ann->switch_mode); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -528,50 +558,55 @@ wlan_11h_cmd_chan_sw_ann(mlan_private * priv, */ static mlan_status wlan_11h_cmd_chan_rpt_req(mlan_private * priv, - HostCmd_DS_COMMAND * pcmd_ptr, - const t_void * pinfo_buf) + HostCmd_DS_COMMAND * pcmd_ptr, + const t_void * pinfo_buf) { - const HostCmd_DS_CHAN_RPT_REQ *pchan_rpt_req = - (HostCmd_DS_CHAN_RPT_REQ *) pinfo_buf; - wlan_dfs_device_state_t *pstate_dfs = &priv->adapter->state_dfs; - MrvlIEtypes_ChanRpt11hBasic_t *ptlv_basic; - - ENTER(); - - if (pstate_dfs->dfs_check_pending) { - PRINTM(MERROR, "11h: ChanRptReq - previous CMD_CHAN_REPORT_REQUEST has" - " not returned its result yet (as EVENT_CHANNEL_READY)." - " This command will be dropped.\n"); - LEAVE(); - return MLAN_STATUS_PENDING; - } - - /* Converted to little endian in wlan_11h_cmd_process */ - pcmd_ptr->size = sizeof(HostCmd_DS_CHAN_RPT_REQ) + S_DS_GEN; - - memcpy(priv->adapter, &pcmd_ptr->params.chan_rpt_req, pchan_rpt_req, - sizeof(HostCmd_DS_CHAN_RPT_REQ)); - - /* if DFS channel, add BASIC report TLV, and set radar bit */ - if (wlan_11h_radar_detect_required(priv, pchan_rpt_req->chan_desc.chanNum)) { - ptlv_basic = - (MrvlIEtypes_ChanRpt11hBasic_t *) (((t_u8 *) (pcmd_ptr)) + - pcmd_ptr->size); - ptlv_basic->Header.type = wlan_cpu_to_le16(TLV_TYPE_CHANRPT_11H_BASIC); - ptlv_basic->Header.len = wlan_cpu_to_le16(sizeof(MeasRptBasicMap_t)); - memset(priv->adapter, &ptlv_basic->map, 0, sizeof(MeasRptBasicMap_t)); - ptlv_basic->map.radar = 1; - pcmd_ptr->size += sizeof(MrvlIEtypes_ChanRpt11hBasic_t); - } - - /* update dfs sturcture. dfs_check_pending is set when we receive CMD_RESP - == SUCCESS */ - pstate_dfs->dfs_check_pending = MFALSE; - pstate_dfs->dfs_radar_found = MFALSE; - pstate_dfs->dfs_check_channel = pchan_rpt_req->chan_desc.chanNum; - - LEAVE(); - return MLAN_STATUS_SUCCESS; + const HostCmd_DS_CHAN_RPT_REQ *pchan_rpt_req = + (HostCmd_DS_CHAN_RPT_REQ *) pinfo_buf; + wlan_dfs_device_state_t *pstate_dfs = &priv->adapter->state_dfs; + MrvlIEtypes_ChanRpt11hBasic_t *ptlv_basic; + + ENTER(); + + if (pstate_dfs->dfs_check_pending) { + PRINTM(MERROR, + "11h: ChanRptReq - previous CMD_CHAN_REPORT_REQUEST has" + " not returned its result yet (as EVENT_CHANNEL_READY)." + " This command will be dropped.\n"); + LEAVE(); + return MLAN_STATUS_PENDING; + } + + /* Converted to little endian in wlan_11h_cmd_process */ + pcmd_ptr->size = sizeof(HostCmd_DS_CHAN_RPT_REQ) + S_DS_GEN; + + memcpy(priv->adapter, &pcmd_ptr->params.chan_rpt_req, pchan_rpt_req, + sizeof(HostCmd_DS_CHAN_RPT_REQ)); + + /* if DFS channel, add BASIC report TLV, and set radar bit */ + if (wlan_11h_radar_detect_required + (priv, pchan_rpt_req->chan_desc.chanNum)) { + ptlv_basic = + (MrvlIEtypes_ChanRpt11hBasic_t *) (((t_u8 *) (pcmd_ptr)) + + pcmd_ptr->size); + ptlv_basic->Header.type = + wlan_cpu_to_le16(TLV_TYPE_CHANRPT_11H_BASIC); + ptlv_basic->Header.len = + wlan_cpu_to_le16(sizeof(MeasRptBasicMap_t)); + memset(priv->adapter, &ptlv_basic->map, 0, + sizeof(MeasRptBasicMap_t)); + ptlv_basic->map.radar = 1; + pcmd_ptr->size += sizeof(MrvlIEtypes_ChanRpt11hBasic_t); + } + + /* update dfs sturcture. dfs_check_pending is set when we receive + CMD_RESP == SUCCESS */ + pstate_dfs->dfs_check_pending = MFALSE; + pstate_dfs->dfs_radar_found = MFALSE; + pstate_dfs->dfs_check_channel = pchan_rpt_req->chan_desc.chanNum; + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -587,46 +622,46 @@ wlan_11h_cmd_chan_rpt_req(mlan_private * priv, */ static t_u32 wlan_11h_set_local_power_constraint_tlv(t_u8 ** ppbuffer, - t_u8 channel, - t_u8 power_constraint, - t_u8 min_tx_power_capability, - t_u8 max_tx_power_capability) + t_u8 channel, + t_u8 power_constraint, + t_u8 min_tx_power_capability, + t_u8 max_tx_power_capability) { - MrvlIEtypes_PowerCapability_t *pcap; - MrvlIEtypes_LocalPowerConstraint_t *pconstraint; - t_u8 *startPtr = MNULL; - - ENTER(); - - /* Null Checks */ - if ((ppbuffer == MNULL) || (((t_u8 *) (*ppbuffer)) == MNULL)) { - LEAVE(); - return 0; - } - - startPtr = (t_u8 *) (*ppbuffer); - - PRINTM(MINFO, - "11h: Set local power constraint = %d channel=%d min_tx_pwr=%d max_tx_pwr=%d\n", - power_constraint, channel, min_tx_power_capability, - max_tx_power_capability); - - pcap = (MrvlIEtypes_PowerCapability_t *) * ppbuffer; - pcap->header.type = wlan_cpu_to_le16(TLV_TYPE_POWER_CAPABILITY); - pcap->header.len = wlan_cpu_to_le16(2); - pcap->min_power = min_tx_power_capability; - pcap->max_power = max_tx_power_capability; - *ppbuffer += sizeof(MrvlIEtypesHeader_t) + 2; - - pconstraint = (MrvlIEtypes_LocalPowerConstraint_t *) * ppbuffer; - pconstraint->header.type = wlan_cpu_to_le16(TLV_TYPE_POWER_CONSTRAINT); - pconstraint->header.len = wlan_cpu_to_le16(2); - pconstraint->chan = channel; - pconstraint->constraint = power_constraint; - *ppbuffer += sizeof(MrvlIEtypesHeader_t) + 2; - - LEAVE(); - return (t_u32) (*ppbuffer - startPtr); + MrvlIEtypes_PowerCapability_t *pcap; + MrvlIEtypes_LocalPowerConstraint_t *pconstraint; + t_u8 *startPtr = MNULL; + + ENTER(); + + /* Null Checks */ + if ((ppbuffer == MNULL) || (((t_u8 *) (*ppbuffer)) == MNULL)) { + LEAVE(); + return 0; + } + + startPtr = (t_u8 *) (*ppbuffer); + + PRINTM(MINFO, + "11h: Set local power constraint = %d channel=%d min_tx_pwr=%d max_tx_pwr=%d\n", + power_constraint, channel, min_tx_power_capability, + max_tx_power_capability); + + pcap = (MrvlIEtypes_PowerCapability_t *) * ppbuffer; + pcap->header.type = wlan_cpu_to_le16(TLV_TYPE_POWER_CAPABILITY); + pcap->header.len = wlan_cpu_to_le16(2); + pcap->min_power = min_tx_power_capability; + pcap->max_power = max_tx_power_capability; + *ppbuffer += sizeof(MrvlIEtypesHeader_t) + 2; + + pconstraint = (MrvlIEtypes_LocalPowerConstraint_t *) * ppbuffer; + pconstraint->header.type = wlan_cpu_to_le16(TLV_TYPE_POWER_CONSTRAINT); + pconstraint->header.len = wlan_cpu_to_le16(2); + pconstraint->chan = channel; + pconstraint->constraint = power_constraint; + *ppbuffer += sizeof(MrvlIEtypesHeader_t) + 2; + + LEAVE(); + return (t_u32) (*ppbuffer - startPtr); } /** @@ -645,58 +680,62 @@ wlan_11h_set_local_power_constraint_tlv(t_u8 ** ppbuffer, */ static t_u32 wlan_11h_process_infra_join(mlan_private * priv, - t_u8 ** ppbuffer, - t_u8 band, - t_u32 channel, wlan_11h_bss_info_t * p11h_bss_info) + t_u8 ** ppbuffer, + t_u8 band, + t_u32 channel, wlan_11h_bss_info_t * p11h_bss_info) { - MrvlIEtypesHeader_t ie_header; - IEEEtypes_SupportedChannels_t sup_chan_ie; - t_u32 ret_len = 0; - t_u16 sup_chan_len = 0; - - ENTER(); - - /* Null Checks */ - if ((ppbuffer == MNULL) || (((t_u8 *) (*ppbuffer)) == MNULL)) { - LEAVE(); - return 0; - } - - ret_len += wlan_11h_set_local_power_constraint_tlv(ppbuffer, (t_u8) channel, - (t_u8) p11h_bss_info-> - power_constraint. - local_constraint, - (t_u8) priv->adapter-> - state_11h. - min_tx_power_capability, - (t_u8) priv->adapter-> - state_11h. - max_tx_power_capability); - - /* Setup the Supported Channels IE */ - sup_chan_len = wlan_11h_set_supp_channels_ie(priv, band, &sup_chan_ie); - - /* - * If we returned a valid Supported Channels IE, wrap and append it - */ - if (sup_chan_len) { - /* Wrap the supported channels IE with a passthrough TLV type */ - ie_header.type = wlan_cpu_to_le16(TLV_TYPE_PASSTHROUGH); - ie_header.len = sup_chan_len; - memcpy(priv->adapter, *ppbuffer, &ie_header, sizeof(ie_header)); - - /* Increment the return size and the return buffer pointer param */ - *ppbuffer += sizeof(ie_header); - ret_len += sizeof(ie_header); - - /* Copy the supported channels IE to the output buf, advance pointer */ - memcpy(priv->adapter, *ppbuffer, &sup_chan_ie, sup_chan_len); - *ppbuffer += sup_chan_len; - ret_len += sup_chan_len; - } - - LEAVE(); - return ret_len; + MrvlIEtypesHeader_t ie_header; + IEEEtypes_SupportedChannels_t sup_chan_ie; + t_u32 ret_len = 0; + t_u16 sup_chan_len = 0; + + ENTER(); + + /* Null Checks */ + if ((ppbuffer == MNULL) || (((t_u8 *) (*ppbuffer)) == MNULL)) { + LEAVE(); + return 0; + } + + ret_len += + wlan_11h_set_local_power_constraint_tlv(ppbuffer, + (t_u8) channel, + (t_u8) p11h_bss_info-> + power_constraint. + local_constraint, + (t_u8) priv->adapter-> + state_11h. + min_tx_power_capability, + (t_u8) priv->adapter-> + state_11h. + max_tx_power_capability); + + /* Setup the Supported Channels IE */ + sup_chan_len = wlan_11h_set_supp_channels_ie(priv, band, &sup_chan_ie); + + /* + * If we returned a valid Supported Channels IE, wrap and append it + */ + if (sup_chan_len) { + /* Wrap the supported channels IE with a passthrough TLV type */ + ie_header.type = wlan_cpu_to_le16(TLV_TYPE_PASSTHROUGH); + ie_header.len = sup_chan_len; + memcpy(priv->adapter, *ppbuffer, &ie_header, sizeof(ie_header)); + + /* Increment the return size and the return buffer pointer + param */ + *ppbuffer += sizeof(ie_header); + ret_len += sizeof(ie_header); + + /* Copy the supported channels IE to the output buf, advance + pointer */ + memcpy(priv->adapter, *ppbuffer, &sup_chan_ie, sup_chan_len); + *ppbuffer += sup_chan_len; + ret_len += sup_chan_len; + } + + LEAVE(); + return ret_len; } /** @@ -721,91 +760,106 @@ wlan_11h_process_infra_join(mlan_private * priv, */ static t_u32 wlan_11h_process_adhoc(mlan_private * priv, - t_u8 ** ppbuffer, - t_u32 channel, wlan_11h_bss_info_t * p11h_bss_info) + t_u8 ** ppbuffer, + t_u32 channel, wlan_11h_bss_info_t * p11h_bss_info) { - IEEEtypes_IBSS_DFS_t dfs_elem; - t_u32 size_appended; - t_u32 ret_len = 0; - t_s8 local_constraint = 0; - mlan_adapter *adapter = priv->adapter; + IEEEtypes_IBSS_DFS_t dfs_elem; + t_u32 size_appended; + t_u32 ret_len = 0; + t_s8 local_constraint = 0; + mlan_adapter *adapter = priv->adapter; - ENTER(); + ENTER(); #ifdef STA_SUPPORT - /* Format our own IBSS DFS Element. Include our channel map fields */ - wlan_11h_set_ibss_dfs_ie(priv, &dfs_elem); + /* Format our own IBSS DFS Element. Include our channel map fields */ + wlan_11h_set_ibss_dfs_ie(priv, &dfs_elem); #endif - if (p11h_bss_info) { - /* - * Copy the DFS Owner/Recovery Interval from the BSS we are joining - */ - memcpy(adapter, dfs_elem.dfs_owner, - p11h_bss_info->ibss_dfs.dfs_owner, sizeof(dfs_elem.dfs_owner)); - dfs_elem.dfs_recovery_interval = - p11h_bss_info->ibss_dfs.dfs_recovery_interval; - } - - /* Append the dfs element to the TLV buffer */ - size_appended = - wlan_11h_convert_ieee_to_mrvl_ie(adapter, (t_u8 *) * ppbuffer, - (t_u8 *) & dfs_elem); - - HEXDUMP("11h: IBSS-DFS", (t_u8 *) * ppbuffer, size_appended); - *ppbuffer += size_appended; - ret_len += size_appended; - - /* - * Check to see if we are joining a network. Join is indicated by the - * BSS Info pointer being valid (not NULL) - */ - if (p11h_bss_info) { - /* - * If there was a quiet element, include it in adhoc join command - */ - if (p11h_bss_info->quiet.element_id == QUIET) { - size_appended - = wlan_11h_convert_ieee_to_mrvl_ie(adapter, (t_u8 *) * ppbuffer, - (t_u8 *) & p11h_bss_info-> - quiet); - HEXDUMP("11h: Quiet", (t_u8 *) * ppbuffer, size_appended); - *ppbuffer += size_appended; - ret_len += size_appended; - } - - /* Copy the local constraint from the network */ - local_constraint = p11h_bss_info->power_constraint.local_constraint; - } else { - /* - * If we are the adhoc starter, we can add a quiet element - */ - if (adapter->state_11h.quiet_ie.quiet_period) { - size_appended = - wlan_11h_convert_ieee_to_mrvl_ie(adapter, (t_u8 *) * ppbuffer, - (t_u8 *) & adapter->state_11h. - quiet_ie); - HEXDUMP("11h: Quiet", (t_u8 *) * ppbuffer, size_appended); - *ppbuffer += size_appended; - ret_len += size_appended; - } - /* Use the local_constraint configured in the driver state */ - local_constraint = adapter->state_11h.usr_def_power_constraint; - } - - PRINTM(MINFO, "WEILIE 1: ppbuffer = %p\n", *ppbuffer); - - ret_len += - wlan_11h_set_local_power_constraint_tlv(ppbuffer, (t_u8) channel, - (t_u8) local_constraint, - (t_u8) priv->adapter->state_11h. - min_tx_power_capability, - (t_u8) priv->adapter->state_11h. - max_tx_power_capability); - PRINTM(MINFO, "WEILIE 2: ppbuffer = %p\n", *ppbuffer); - - LEAVE(); - return ret_len; + if (p11h_bss_info) { + /* + * Copy the DFS Owner/Recovery Interval from the BSS we are joining + */ + memcpy(adapter, dfs_elem.dfs_owner, + p11h_bss_info->ibss_dfs.dfs_owner, + sizeof(dfs_elem.dfs_owner)); + dfs_elem.dfs_recovery_interval = + p11h_bss_info->ibss_dfs.dfs_recovery_interval; + } + + /* Append the dfs element to the TLV buffer */ + size_appended = + wlan_11h_convert_ieee_to_mrvl_ie(adapter, (t_u8 *) * ppbuffer, + (t_u8 *) & dfs_elem); + + HEXDUMP("11h: IBSS-DFS", (t_u8 *) * ppbuffer, size_appended); + *ppbuffer += size_appended; + ret_len += size_appended; + + /* + * Check to see if we are joining a network. Join is indicated by the + * BSS Info pointer being valid (not NULL) + */ + if (p11h_bss_info) { + /* + * If there was a quiet element, include it in adhoc join command + */ + if (p11h_bss_info->quiet.element_id == QUIET) { + size_appended + = + wlan_11h_convert_ieee_to_mrvl_ie(adapter, + (t_u8 *) * + ppbuffer, + (t_u8 *) & + p11h_bss_info-> + quiet); + HEXDUMP("11h: Quiet", (t_u8 *) * ppbuffer, + size_appended); + *ppbuffer += size_appended; + ret_len += size_appended; + } + + /* Copy the local constraint from the network */ + local_constraint = + p11h_bss_info->power_constraint.local_constraint; + } else { + /* + * If we are the adhoc starter, we can add a quiet element + */ + if (adapter->state_11h.quiet_ie.quiet_period) { + size_appended = + wlan_11h_convert_ieee_to_mrvl_ie(adapter, + (t_u8 *) * + ppbuffer, + (t_u8 *) & + adapter-> + state_11h. + quiet_ie); + HEXDUMP("11h: Quiet", (t_u8 *) * ppbuffer, + size_appended); + *ppbuffer += size_appended; + ret_len += size_appended; + } + /* Use the local_constraint configured in the driver state */ + local_constraint = adapter->state_11h.usr_def_power_constraint; + } + + PRINTM(MINFO, "WEILIE 1: ppbuffer = %p\n", *ppbuffer); + + ret_len += + wlan_11h_set_local_power_constraint_tlv(ppbuffer, + (t_u8) channel, + (t_u8) local_constraint, + (t_u8) priv->adapter-> + state_11h. + min_tx_power_capability, + (t_u8) priv->adapter-> + state_11h. + max_tx_power_capability); + PRINTM(MINFO, "WEILIE 2: ppbuffer = %p\n", *ppbuffer); + + LEAVE(); + return ret_len; } /** @@ -823,9 +877,9 @@ wlan_11h_process_adhoc(mlan_private * priv, static t_bool wlan_11h_is_enabled(mlan_private * priv) { - ENTER(); - LEAVE(); - return (priv->intf_state_11h.is_11h_enabled); + ENTER(); + LEAVE(); + return (priv->intf_state_11h.is_11h_enabled); } /** @@ -840,9 +894,9 @@ wlan_11h_is_enabled(mlan_private * priv) static t_bool wlan_11h_is_slave_radar_det_active(mlan_private * priv) { - ENTER(); - LEAVE(); - return (priv->adapter->state_11h.is_slave_radar_det_active); + ENTER(); + LEAVE(); + return (priv->adapter->state_11h.is_slave_radar_det_active); } /** @@ -858,18 +912,18 @@ wlan_11h_is_slave_radar_det_active(mlan_private * priv) static t_bool wlan_11h_is_slave_active_on_dfs_chan(mlan_private * priv) { - t_bool ret = MFALSE; - - ENTER(); - if ((priv->media_connected == MTRUE) && - (priv->curr_bss_params.band & BAND_A) && - wlan_11h_radar_detect_required(priv, - priv->curr_bss_params.bss_descriptor. - channel)) - ret = MTRUE; - - LEAVE(); - return ret; + t_bool ret = MFALSE; + + ENTER(); + if ((priv->media_connected == MTRUE) && + (priv->curr_bss_params.band & BAND_A) && + wlan_11h_radar_detect_required(priv, + priv->curr_bss_params.bss_descriptor. + channel)) + ret = MTRUE; + + LEAVE(); + return ret; } /** @@ -885,28 +939,29 @@ wlan_11h_is_slave_active_on_dfs_chan(mlan_private * priv) static t_bool wlan_11h_is_master_active_on_dfs_chan(mlan_private * priv) { - t_bool ret = MFALSE; - - ENTER(); - if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) { - /* Ad-hoc creator */ - if (((priv->media_connected == MTRUE) - || (priv->adhoc_state == ADHOC_STARTING)) && - (priv->adapter->adhoc_start_band & BAND_A) && - wlan_11h_radar_detect_required(priv, priv->adhoc_channel)) - ret = MTRUE; - } else if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { - /* UAP */ + t_bool ret = MFALSE; + + ENTER(); + if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) { + /* Ad-hoc creator */ + if (((priv->media_connected == MTRUE) + || (priv->adhoc_state == ADHOC_STARTING)) && + (priv->adapter->adhoc_start_band & BAND_A) && + wlan_11h_radar_detect_required(priv, priv->adhoc_channel)) + ret = MTRUE; + } else if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { + /* UAP */ #ifdef UAP_SUPPORT - if ((priv->uap_bss_started == MTRUE) && - (priv->uap_state_chan_cb.band_config & BAND_CONFIG_5GHZ) && - wlan_11h_radar_detect_required(priv, - priv->uap_state_chan_cb.channel)) - ret = MTRUE; + if ((priv->uap_bss_started == MTRUE) && + (priv->uap_state_chan_cb.band_config & BAND_CONFIG_5GHZ) && + wlan_11h_radar_detect_required(priv, + priv->uap_state_chan_cb. + channel)) + ret = MTRUE; #endif - } - LEAVE(); - return ret; + } + LEAVE(); + return ret; } /** @@ -919,23 +974,23 @@ wlan_11h_is_master_active_on_dfs_chan(mlan_private * priv) static t_bool wlan_11h_is_dfs_master(mlan_private * priv) { - t_bool ret = MFALSE; - - ENTER(); - /* UAP: all are master */ - if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { - ret = MTRUE; - } - /* STA: only ad-hoc creator is master */ - else if ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) && - (priv->bss_mode == MLAN_BSS_MODE_IBSS) && - (priv->adhoc_state == ADHOC_STARTED || - priv->adhoc_state == ADHOC_STARTING)) { - ret = MTRUE; - } - /* all other cases = slave interface */ - LEAVE(); - return ret; + t_bool ret = MFALSE; + + ENTER(); + /* UAP: all are master */ + if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { + ret = MTRUE; + } + /* STA: only ad-hoc creator is master */ + else if ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) && + (priv->bss_mode == MLAN_BSS_MODE_IBSS) && + (priv->adhoc_state == ADHOC_STARTED || + priv->adhoc_state == ADHOC_STARTING)) { + ret = MTRUE; + } + /* all other cases = slave interface */ + LEAVE(); + return ret; } /* Need this as function to pass to wlan_count_priv_cond() */ @@ -950,11 +1005,11 @@ wlan_11h_is_dfs_master(mlan_private * priv) static t_bool wlan_11h_is_dfs_slave(mlan_private * priv) { - t_bool ret = MFALSE; - ENTER(); - ret = !wlan_11h_is_dfs_master(priv); - LEAVE(); - return ret; + t_bool ret = MFALSE; + ENTER(); + ret = !wlan_11h_is_dfs_master(priv); + LEAVE(); + return ret; } /** @@ -967,21 +1022,22 @@ wlan_11h_is_dfs_slave(mlan_private * priv) static t_bool wlan_is_intf_active(mlan_private * pmpriv) { - t_bool ret = MFALSE; - ENTER(); + t_bool ret = MFALSE; + ENTER(); #ifdef UAP_SUPPORT - if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) - /* NOTE: UAP's media_connected == true only after first STA associated. - Need different variable to tell if UAP has been started. */ - ret = pmpriv->uap_bss_started; - else + if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) + /* NOTE: UAP's media_connected == true only after first STA + associated. Need different variable to tell if UAP has been + started. */ + ret = pmpriv->uap_bss_started; + else #endif - if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) - ret = pmpriv->media_connected; + if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) + ret = pmpriv->media_connected; - LEAVE(); - return ret; + LEAVE(); + return ret; } /** @@ -994,19 +1050,19 @@ wlan_is_intf_active(mlan_private * pmpriv) static t_u32 wlan_11h_get_current_radar_detect_flags(mlan_adapter * pmadapter) { - t_u32 radar_det_flags = 0; + t_u32 radar_det_flags = 0; - ENTER(); - if (pmadapter->state_11h.is_master_radar_det_active) - radar_det_flags |= MASTER_RADAR_DET_MASK; - if (pmadapter->state_11h.is_slave_radar_det_active) - radar_det_flags |= SLAVE_RADAR_DET_MASK; + ENTER(); + if (pmadapter->state_11h.is_master_radar_det_active) + radar_det_flags |= MASTER_RADAR_DET_MASK; + if (pmadapter->state_11h.is_slave_radar_det_active) + radar_det_flags |= SLAVE_RADAR_DET_MASK; - PRINTM(MINFO, "%s: radar_det_state_curr=0x%x\n", - __FUNCTION__, radar_det_flags); + PRINTM(MINFO, "%s: radar_det_state_curr=0x%x\n", + __FUNCTION__, radar_det_flags); - LEAVE(); - return radar_det_flags; + LEAVE(); + return radar_det_flags; } /** @@ -1020,38 +1076,38 @@ wlan_11h_get_current_radar_detect_flags(mlan_adapter * pmadapter) static t_bool wlan_11h_check_radar_det_state(mlan_adapter * pmadapter, OUT t_u32 * pnew_state) { - t_u32 radar_det_state_new = 0; - t_bool ret; - - ENTER(); - PRINTM(MINFO, "%s: master_radar_det_pending=%d, " - " slave_radar_det_pending=%d\n", __FUNCTION__, - pmadapter->state_11h.master_radar_det_enable_pending, - pmadapter->state_11h.slave_radar_det_enable_pending); - - /* new state comes from evaluating interface states & pending starts */ - if (pmadapter->state_11h.master_radar_det_enable_pending || - (wlan_count_priv_cond(pmadapter, - wlan_11h_is_master_active_on_dfs_chan, - wlan_11h_is_dfs_master) > 0)) - radar_det_state_new |= MASTER_RADAR_DET_MASK; - if (pmadapter->state_11h.slave_radar_det_enable_pending || - (wlan_count_priv_cond(pmadapter, - wlan_11h_is_slave_active_on_dfs_chan, - wlan_11h_is_dfs_slave) > 0)) - radar_det_state_new |= SLAVE_RADAR_DET_MASK; - - PRINTM(MINFO, "%s: radar_det_state_new=0x%x\n", - __FUNCTION__, radar_det_state_new); - - /* now compare flags with current state */ - ret = (wlan_11h_get_current_radar_detect_flags(pmadapter) - != radar_det_state_new) ? MTRUE : MFALSE; - if (ret) - *pnew_state = radar_det_state_new; - - LEAVE(); - return ret; + t_u32 radar_det_state_new = 0; + t_bool ret; + + ENTER(); + PRINTM(MINFO, "%s: master_radar_det_pending=%d, " + " slave_radar_det_pending=%d\n", __FUNCTION__, + pmadapter->state_11h.master_radar_det_enable_pending, + pmadapter->state_11h.slave_radar_det_enable_pending); + + /* new state comes from evaluating interface states & pending starts */ + if (pmadapter->state_11h.master_radar_det_enable_pending || + (wlan_count_priv_cond(pmadapter, + wlan_11h_is_master_active_on_dfs_chan, + wlan_11h_is_dfs_master) > 0)) + radar_det_state_new |= MASTER_RADAR_DET_MASK; + if (pmadapter->state_11h.slave_radar_det_enable_pending || + (wlan_count_priv_cond(pmadapter, + wlan_11h_is_slave_active_on_dfs_chan, + wlan_11h_is_dfs_slave) > 0)) + radar_det_state_new |= SLAVE_RADAR_DET_MASK; + + PRINTM(MINFO, "%s: radar_det_state_new=0x%x\n", + __FUNCTION__, radar_det_state_new); + + /* now compare flags with current state */ + ret = (wlan_11h_get_current_radar_detect_flags(pmadapter) + != radar_det_state_new) ? MTRUE : MFALSE; + if (ret) + *pnew_state = radar_det_state_new; + + LEAVE(); + return ret; } /** @@ -1066,22 +1122,22 @@ static t_bool wlan_only_uap_priv_in_list(mlan_private ** priv_list, t_u8 priv_list_count) { #if defined(STA_SUPPORT) && !defined(UAP_SUPPORT) - return MFALSE; + return MFALSE; #else - t_u8 uap_count = 0; - t_u8 sta_count = 0; - t_u8 i; - - ENTER(); - for (i = 0; i < priv_list_count; i++) { - if (GET_BSS_ROLE(priv_list[i]) == MLAN_BSS_ROLE_UAP) - uap_count++; - else - sta_count++; - } - - LEAVE(); - return ((uap_count > 0) && (sta_count == 0)) ? MTRUE : MFALSE; + t_u8 uap_count = 0; + t_u8 sta_count = 0; + t_u8 i; + + ENTER(); + for (i = 0; i < priv_list_count; i++) { + if (GET_BSS_ROLE(priv_list[i]) == MLAN_BSS_ROLE_UAP) + uap_count++; + else + sta_count++; + } + + LEAVE(); + return ((uap_count > 0) && (sta_count == 0)) ? MTRUE : MFALSE; #endif } @@ -1095,21 +1151,21 @@ wlan_only_uap_priv_in_list(mlan_private ** priv_list, t_u8 priv_list_count) static t_u8 wlan_11h_get_channel_freq_idx(IN t_u8 channel_num) { - t_u8 index; - t_u8 center_freq[] = { 42, 58, 106, 122, 138, 155 }; - t_u8 chan_idx, ret = 0; + t_u8 index; + t_u8 center_freq[] = { 42, 58, 106, 122, 138, 155 }; + t_u8 chan_idx, ret = 0; - chan_idx = channel_num - 100; + chan_idx = channel_num - 100; - for (index = 0; index < sizeof(center_freq); index++) { - if ((chan_idx >= (center_freq[index] - 6)) && - (chan_idx <= (center_freq[index] + 6))) { - ret = center_freq[index]; - break; - } - } + for (index = 0; index < sizeof(center_freq); index++) { + if ((chan_idx >= (center_freq[index] - 6)) && + (chan_idx <= (center_freq[index] + 6))) { + ret = center_freq[index]; + break; + } + } - return ret; + return ret; } /** @@ -1123,143 +1179,157 @@ wlan_11h_get_channel_freq_idx(IN t_u8 channel_num) */ static mlan_status wlan_11h_prepare_custom_ie_chansw(IN mlan_adapter * pmadapter, - OUT mlan_ioctl_req ** ppioctl_req, - IN t_bool is_adding_ie) + OUT mlan_ioctl_req ** ppioctl_req, + IN t_bool is_adding_ie) { - mlan_ioctl_req *pioctl_req = MNULL; - mlan_ds_misc_cfg *pds_misc_cfg = MNULL; - custom_ie *pcust_chansw_ie = MNULL; - IEEEtypes_ChanSwitchAnn_t *pchansw_ie = MNULL; - mlan_status ret; - IEEEtypes_Header_t *pChanSwWrap_ie = MNULL; - IEEEtypes_WideBWChanSwitch_t *pbwchansw_ie = MNULL; - IEEEtypes_VhtTpcEnvelope_t *pvhttpcEnv_ie = MNULL; - t_u8 index; - mlan_private *pmpriv = MNULL; - - ENTER(); - - if (pmadapter == MNULL || ppioctl_req == MNULL) { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - /* allocate buffer for mlan_ioctl_req and mlan_ds_misc_cfg */ - /* FYI - will be freed as part of cmd_response handler */ - ret = pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, - sizeof(mlan_ioctl_req) + - sizeof(mlan_ds_misc_cfg), - MLAN_MEM_DEF, - (t_u8 **) & pioctl_req); - if ((ret != MLAN_STATUS_SUCCESS) || !pioctl_req) { - PRINTM(MERROR, "%s(): Could not allocate ioctl req\n", __FUNCTION__); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - pds_misc_cfg = (mlan_ds_misc_cfg *) ((t_u8 *) pioctl_req + - sizeof(mlan_ioctl_req)); - - /* prepare mlan_ioctl_req */ - memset(pmadapter, pioctl_req, 0x00, sizeof(mlan_ioctl_req)); - pioctl_req->req_id = MLAN_IOCTL_MISC_CFG; - pioctl_req->action = MLAN_ACT_SET; - pioctl_req->pbuf = (t_u8 *) pds_misc_cfg; - pioctl_req->buf_len = sizeof(mlan_ds_misc_cfg); - - /* prepare mlan_ds_misc_cfg */ - memset(pmadapter, pds_misc_cfg, 0x00, sizeof(mlan_ds_misc_cfg)); - pds_misc_cfg->sub_command = MLAN_OID_MISC_CUSTOM_IE; - pds_misc_cfg->param.cust_ie.type = TLV_TYPE_MGMT_IE; - pds_misc_cfg->param.cust_ie.len = (sizeof(custom_ie) - MAX_IE_SIZE); - - /* configure custom_ie api settings */ - pcust_chansw_ie = - (custom_ie *) & pds_misc_cfg->param.cust_ie.ie_data_list[0]; - pcust_chansw_ie->ie_index = 0xffff; /* Auto index */ - pcust_chansw_ie->ie_length = sizeof(IEEEtypes_ChanSwitchAnn_t); - pcust_chansw_ie->mgmt_subtype_mask = (is_adding_ie) - ? MBIT(8) | MBIT(5) /* add IE for BEACON | PROBE_RSP */ - : 0; /* remove IE */ - - /* prepare CHAN_SW IE inside ioctl */ - pchansw_ie = (IEEEtypes_ChanSwitchAnn_t *) pcust_chansw_ie->ie_buffer; - pchansw_ie->element_id = CHANNEL_SWITCH_ANN; - pchansw_ie->len = - sizeof(IEEEtypes_ChanSwitchAnn_t) - sizeof(IEEEtypes_Header_t); - pchansw_ie->chan_switch_mode = 1; /* STA should not transmit */ - pchansw_ie->new_channel_num = pmadapter->state_rdh.new_channel; - pchansw_ie->chan_switch_count = 0; /* simplification */ - - for (index = 0; index < pmadapter->state_rdh.priv_list_count; index++) { - pmpriv = pmadapter->state_rdh.priv_list[index]; - /* find the first AP interface */ - if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) { - if (pmpriv->is_11ac_enabled) { - - pChanSwWrap_ie = - (IEEEtypes_Header_t *) ((t_u8 *) pchansw_ie + - sizeof(IEEEtypes_ChanSwitchAnn_t)); - pChanSwWrap_ie->element_id = EXT_POWER_CONSTR; - /* will have multiple sub IEs */ - pChanSwWrap_ie->len = 0; - - /* prepare the Wide Bandwidth Channel Switch IE */ - pbwchansw_ie = - (IEEEtypes_WideBWChanSwitch_t *) ((t_u8 *) pChanSwWrap_ie + - sizeof - (IEEEtypes_Header_t)); - pbwchansw_ie->ieee_hdr.element_id = BW_CHANNEL_SWITCH; - pbwchansw_ie->ieee_hdr.len = - sizeof(IEEEtypes_WideBWChanSwitch_t) - - sizeof(IEEEtypes_Header_t); - pbwchansw_ie->new_channel_width = VHT_OPER_CHWD_80MHZ; /* fix - 80MHZ - now */ - pbwchansw_ie->new_channel_center_freq0 = - wlan_11h_get_channel_freq_idx(pmadapter->state_rdh. - new_channel); - pbwchansw_ie->new_channel_center_freq1 = - wlan_11h_get_channel_freq_idx(pmadapter->state_rdh. - new_channel); - pChanSwWrap_ie->len += sizeof(IEEEtypes_WideBWChanSwitch_t); - - /* prepare the VHT Transmit Power Envelope IE */ - pvhttpcEnv_ie = - (IEEEtypes_VhtTpcEnvelope_t *) ((t_u8 *) pChanSwWrap_ie + - sizeof(IEEEtypes_Header_t) + - sizeof - (IEEEtypes_WideBWChanSwitch_t)); - pvhttpcEnv_ie->ieee_hdr.element_id = VHT_TX_POWER_ENV; - pvhttpcEnv_ie->ieee_hdr.len = - sizeof(IEEEtypes_VhtTpcEnvelope_t) - - sizeof(IEEEtypes_Header_t); - pvhttpcEnv_ie->tpc_info = 3; /* Local Max TX Power Count= 3, - Local TX Power Unit - Inter=EIP(0) */ - pvhttpcEnv_ie->local_max_tp_20mhz = 0xff; - pvhttpcEnv_ie->local_max_tp_40mhz = 0xff; - pvhttpcEnv_ie->local_max_tp_80mhz = 0xff; - pChanSwWrap_ie->len += sizeof(IEEEtypes_VhtTpcEnvelope_t); - - pcust_chansw_ie->ie_length += - sizeof(IEEEtypes_WideBWChanSwitch_t) - + sizeof(IEEEtypes_VhtTpcEnvelope_t) - + sizeof(IEEEtypes_Header_t); - - PRINTM(MINFO, "Append Wide Bandwidth Channel Switch IE\n"); - break; - } - } - } - - pds_misc_cfg->param.cust_ie.len += pcust_chansw_ie->ie_length; - DBG_HEXDUMP(MCMD_D, "11h: custom_ie containing CHAN_SW IE", - (t_u8 *) pcust_chansw_ie, pds_misc_cfg->param.cust_ie.len); - - /* assign output pointer before returning */ - *ppioctl_req = pioctl_req; - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ioctl_req *pioctl_req = MNULL; + mlan_ds_misc_cfg *pds_misc_cfg = MNULL; + custom_ie *pcust_chansw_ie = MNULL; + IEEEtypes_ChanSwitchAnn_t *pchansw_ie = MNULL; + mlan_status ret; + IEEEtypes_Header_t *pChanSwWrap_ie = MNULL; + IEEEtypes_WideBWChanSwitch_t *pbwchansw_ie = MNULL; + IEEEtypes_VhtTpcEnvelope_t *pvhttpcEnv_ie = MNULL; + t_u8 index; + mlan_private *pmpriv = MNULL; + + ENTER(); + + if (pmadapter == MNULL || ppioctl_req == MNULL) { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + /* allocate buffer for mlan_ioctl_req and mlan_ds_misc_cfg */ + /* FYI - will be freed as part of cmd_response handler */ + ret = pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, + sizeof(mlan_ioctl_req) + + sizeof(mlan_ds_misc_cfg), + MLAN_MEM_DEF, + (t_u8 **) & pioctl_req); + if ((ret != MLAN_STATUS_SUCCESS) || !pioctl_req) { + PRINTM(MERROR, "%s(): Could not allocate ioctl req\n", + __FUNCTION__); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + pds_misc_cfg = (mlan_ds_misc_cfg *) ((t_u8 *) pioctl_req + + sizeof(mlan_ioctl_req)); + + /* prepare mlan_ioctl_req */ + memset(pmadapter, pioctl_req, 0x00, sizeof(mlan_ioctl_req)); + pioctl_req->req_id = MLAN_IOCTL_MISC_CFG; + pioctl_req->action = MLAN_ACT_SET; + pioctl_req->pbuf = (t_u8 *) pds_misc_cfg; + pioctl_req->buf_len = sizeof(mlan_ds_misc_cfg); + + /* prepare mlan_ds_misc_cfg */ + memset(pmadapter, pds_misc_cfg, 0x00, sizeof(mlan_ds_misc_cfg)); + pds_misc_cfg->sub_command = MLAN_OID_MISC_CUSTOM_IE; + pds_misc_cfg->param.cust_ie.type = TLV_TYPE_MGMT_IE; + pds_misc_cfg->param.cust_ie.len = (sizeof(custom_ie) - MAX_IE_SIZE); + + /* configure custom_ie api settings */ + pcust_chansw_ie = + (custom_ie *) & pds_misc_cfg->param.cust_ie.ie_data_list[0]; + pcust_chansw_ie->ie_index = 0xffff; /* Auto index */ + pcust_chansw_ie->ie_length = sizeof(IEEEtypes_ChanSwitchAnn_t); + pcust_chansw_ie->mgmt_subtype_mask = (is_adding_ie) + ? MBIT(8) | MBIT(5) /* add IE for BEACON | PROBE_RSP */ + : 0; /* remove IE */ + + /* prepare CHAN_SW IE inside ioctl */ + pchansw_ie = (IEEEtypes_ChanSwitchAnn_t *) pcust_chansw_ie->ie_buffer; + pchansw_ie->element_id = CHANNEL_SWITCH_ANN; + pchansw_ie->len = + sizeof(IEEEtypes_ChanSwitchAnn_t) - sizeof(IEEEtypes_Header_t); + pchansw_ie->chan_switch_mode = 1; /* STA should not transmit */ + pchansw_ie->new_channel_num = pmadapter->state_rdh.new_channel; + pchansw_ie->chan_switch_count = 0; /* simplification */ + + for (index = 0; index < pmadapter->state_rdh.priv_list_count; index++) { + pmpriv = pmadapter->state_rdh.priv_list[index]; + /* find the first AP interface */ + if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) { + if (pmpriv->is_11ac_enabled) { + + pChanSwWrap_ie = + (IEEEtypes_Header_t *) ((t_u8 *) + pchansw_ie + + sizeof + (IEEEtypes_ChanSwitchAnn_t)); + pChanSwWrap_ie->element_id = EXT_POWER_CONSTR; + /* will have multiple sub IEs */ + pChanSwWrap_ie->len = 0; + + /* prepare the Wide Bandwidth Channel Switch IE */ + pbwchansw_ie = + (IEEEtypes_WideBWChanSwitch_t + *) ((t_u8 *) pChanSwWrap_ie + + sizeof(IEEEtypes_Header_t)); + pbwchansw_ie->ieee_hdr.element_id = + BW_CHANNEL_SWITCH; + pbwchansw_ie->ieee_hdr.len = + sizeof(IEEEtypes_WideBWChanSwitch_t) - + sizeof(IEEEtypes_Header_t); + pbwchansw_ie->new_channel_width = VHT_OPER_CHWD_80MHZ; /* fix + 80MHZ + now */ + pbwchansw_ie->new_channel_center_freq0 = + wlan_11h_get_channel_freq_idx + (pmadapter->state_rdh.new_channel); + pbwchansw_ie->new_channel_center_freq1 = + wlan_11h_get_channel_freq_idx + (pmadapter->state_rdh.new_channel); + pChanSwWrap_ie->len += + sizeof(IEEEtypes_WideBWChanSwitch_t); + + /* prepare the VHT Transmit Power Envelope IE */ + pvhttpcEnv_ie = + (IEEEtypes_VhtTpcEnvelope_t *) ((t_u8 *) + pChanSwWrap_ie + + + sizeof + (IEEEtypes_Header_t) + + + sizeof + (IEEEtypes_WideBWChanSwitch_t)); + pvhttpcEnv_ie->ieee_hdr.element_id = + VHT_TX_POWER_ENV; + pvhttpcEnv_ie->ieee_hdr.len = + sizeof(IEEEtypes_VhtTpcEnvelope_t) - + sizeof(IEEEtypes_Header_t); + pvhttpcEnv_ie->tpc_info = 3; /* Local Max TX + Power Count= + 3, Local TX + Power Unit + Inter=EIP(0) */ + pvhttpcEnv_ie->local_max_tp_20mhz = 0xff; + pvhttpcEnv_ie->local_max_tp_40mhz = 0xff; + pvhttpcEnv_ie->local_max_tp_80mhz = 0xff; + pChanSwWrap_ie->len += + sizeof(IEEEtypes_VhtTpcEnvelope_t); + + pcust_chansw_ie->ie_length += + sizeof(IEEEtypes_WideBWChanSwitch_t) + + sizeof(IEEEtypes_VhtTpcEnvelope_t) + + sizeof(IEEEtypes_Header_t); + + PRINTM(MINFO, + "Append Wide Bandwidth Channel Switch IE\n"); + break; + } + } + } + + pds_misc_cfg->param.cust_ie.len += pcust_chansw_ie->ie_length; + DBG_HEXDUMP(MCMD_D, "11h: custom_ie containing CHAN_SW IE", + (t_u8 *) pcust_chansw_ie, pds_misc_cfg->param.cust_ie.len); + + /* assign output pointer before returning */ + *ppioctl_req = pioctl_req; + LEAVE(); + return MLAN_STATUS_SUCCESS; } #ifdef UAP_SUPPORT @@ -1277,77 +1347,84 @@ wlan_11h_prepare_custom_ie_chansw(IN mlan_adapter * pmadapter, static t_u8 wlan_11h_get_uap_start_channel(mlan_private * priv, t_u8 uap_band_cfg) { - t_u8 start_chn; - mlan_adapter *adapter = priv->adapter; - t_u32 region; - t_u32 rand_entry; - region_chan_t *chn_tbl; - t_u8 rand_tries = 0; - - // TODO: right now mostly a copy of wlan_11h_get_adhoc_start_channel. - // Improve to be more specfic to UAP, e.g. - // 1. take into account COUNTRY_CODE -> region_code - // 2. check domain_info for value channels - - ENTER(); - - /* - * Set start_chn to the Default. Used if 11h is disabled or the band - * does not require 11h support. - */ - start_chn = DEFAULT_AD_HOC_CHANNEL; - - /* - * Check that we are looking for a channel in the A Band - */ - if (uap_band_cfg & UAP_BAND_CONFIG_5GHZ) { - /* - * Set default to the A Band default. Used if random selection fails - * or if 11h is not enabled - */ - start_chn = DEFAULT_AD_HOC_CHANNEL_A; - - /* - * Check that 11h is enabled in the driver - */ - if (wlan_11h_is_enabled(priv)) { - /* - * Search the region_channel tables for a channel table - * that is marked for the A Band. - */ - for (region = 0; (region < MAX_REGION_CHANNEL_NUM); region++) { - chn_tbl = &adapter->region_channel[region]; - - /* Check if table is valid and marked for A Band */ - if (chn_tbl->valid - && chn_tbl->region == adapter->region_code - && chn_tbl->band & BAND_A) { - /* - * Set the start channel. Get a random number and - * use it to pick an entry in the table between 0 - * and the number of channels in the table (NumCFP). - */ - do { - rand_entry = - wlan_11h_get_random_num(adapter) % chn_tbl->num_cfp; - start_chn = (t_u8) chn_tbl->pcfp[rand_entry].channel; - } while (wlan_11h_is_channel_under_nop(adapter, start_chn) - && (++rand_tries < MAX_RANDOM_CHANNEL_RETRIES)); - } - } - } - } - - PRINTM(MCMD_D, "11h: UAP Get Start Channel %d\n", start_chn); - LEAVE(); - return start_chn; + t_u8 start_chn; + mlan_adapter *adapter = priv->adapter; + t_u32 region; + t_u32 rand_entry; + region_chan_t *chn_tbl; + t_u8 rand_tries = 0; + + /* TODO: right now mostly a copy of wlan_11h_get_adhoc_start_channel. + Improve to be more specfic to UAP, e.g. 1. take into account + COUNTRY_CODE -> region_code 2. check domain_info for value channels */ + ENTER(); + + /* + * Set start_chn to the Default. Used if 11h is disabled or the band + * does not require 11h support. + */ + start_chn = DEFAULT_AD_HOC_CHANNEL; + + /* + * Check that we are looking for a channel in the A Band + */ + if (uap_band_cfg & UAP_BAND_CONFIG_5GHZ) { + /* + * Set default to the A Band default. Used if random selection fails + * or if 11h is not enabled + */ + start_chn = DEFAULT_AD_HOC_CHANNEL_A; + + /* + * Check that 11h is enabled in the driver + */ + if (wlan_11h_is_enabled(priv)) { + /* + * Search the region_channel tables for a channel table + * that is marked for the A Band. + */ + for (region = 0; (region < MAX_REGION_CHANNEL_NUM); + region++) { + chn_tbl = &adapter->region_channel[region]; + + /* Check if table is valid and marked for A + Band */ + if (chn_tbl->valid + && chn_tbl->region == adapter->region_code + && chn_tbl->band & BAND_A) { + /* + * Set the start channel. Get a random number and + * use it to pick an entry in the table between 0 + * and the number of channels in the table (NumCFP). + */ + do { + rand_entry = + wlan_11h_get_random_num + (adapter) % + chn_tbl->num_cfp; + start_chn = + (t_u8) chn_tbl-> + pcfp[rand_entry]. + channel; + } while (wlan_11h_is_channel_under_nop + (adapter, start_chn) && + (++rand_tries < + MAX_RANDOM_CHANNEL_RETRIES)); + } + } + } + } + + PRINTM(MCMD_D, "11h: UAP Get Start Channel %d\n", start_chn); + LEAVE(); + return start_chn; } #endif /* UAP_SUPPORT */ #ifdef DEBUG_LEVEL1 static const char *DFS_TS_REPR_STRINGS[] = { "", - "NOP_start", - "CAC_completed" + "NOP_start", + "CAC_completed" }; #endif @@ -1364,30 +1441,32 @@ static const char *DFS_TS_REPR_STRINGS[] = { "", static wlan_dfs_timestamp_t * wlan_11h_find_dfs_timestamp(mlan_adapter * pmadapter, t_u8 channel) { - wlan_dfs_timestamp_t *pts = MNULL, *pts_found = MNULL; - - ENTER(); - pts = (wlan_dfs_timestamp_t *) util_peek_list(pmadapter->pmoal_handle, - &pmadapter->state_dfs. - dfs_ts_head, MNULL, MNULL); - - while (pts && - pts != (wlan_dfs_timestamp_t *) & pmadapter->state_dfs.dfs_ts_head) { - PRINTM(MINFO, - "dfs_timestamp(@ %p) - chan=%d, repr=%d(%s)," - " time(sec.usec)=%lu.%06lu\n", pts, pts->channel, - pts->represents, DFS_TS_REPR_STRINGS[pts->represents], - pts->ts_sec, pts->ts_usec); - - if (pts->channel == channel) { - pts_found = pts; - break; - } - pts = pts->pnext; - } - - LEAVE(); - return pts_found; + wlan_dfs_timestamp_t *pts = MNULL, *pts_found = MNULL; + + ENTER(); + pts = (wlan_dfs_timestamp_t *) util_peek_list(pmadapter->pmoal_handle, + &pmadapter->state_dfs. + dfs_ts_head, MNULL, + MNULL); + + while (pts && + pts != + (wlan_dfs_timestamp_t *) & pmadapter->state_dfs.dfs_ts_head) { + PRINTM(MINFO, + "dfs_timestamp(@ %p) - chan=%d, repr=%d(%s)," + " time(sec.usec)=%lu.%06lu\n", pts, pts->channel, + pts->represents, DFS_TS_REPR_STRINGS[pts->represents], + pts->ts_sec, pts->ts_usec); + + if (pts->channel == channel) { + pts_found = pts; + break; + } + pts = pts->pnext; + } + + LEAVE(); + return pts_found; } /** @@ -1398,15 +1477,16 @@ wlan_11h_find_dfs_timestamp(mlan_adapter * pmadapter, t_u8 channel) */ static t_void wlan_11h_remove_dfs_timestamp(mlan_adapter * pmadapter, - wlan_dfs_timestamp_t * pdfs_ts) + wlan_dfs_timestamp_t * pdfs_ts) { - ENTER(); - // dequeue and delete timestamp - util_unlink_list(pmadapter->pmoal_handle, - &pmadapter->state_dfs.dfs_ts_head, - (pmlan_linked_list) pdfs_ts, MNULL, MNULL); - pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, (t_u8 *) pdfs_ts); - LEAVE(); + ENTER(); + /* dequeue and delete timestamp */ + util_unlink_list(pmadapter->pmoal_handle, + &pmadapter->state_dfs.dfs_ts_head, + (pmlan_linked_list) pdfs_ts, MNULL, MNULL); + pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pdfs_ts); + LEAVE(); } /** @@ -1424,46 +1504,50 @@ wlan_11h_remove_dfs_timestamp(mlan_adapter * pmadapter, static mlan_status wlan_11h_add_dfs_timestamp(mlan_adapter * pmadapter, t_u8 repr, t_u8 channel) { - wlan_dfs_timestamp_t *pdfs_ts = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - pdfs_ts = wlan_11h_find_dfs_timestamp(pmadapter, channel); - - if (!pdfs_ts) { - // need to allocate new timestamp - ret = pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, - sizeof(wlan_dfs_timestamp_t), - MLAN_MEM_DEF, - (t_u8 **) & pdfs_ts); - if ((ret != MLAN_STATUS_SUCCESS) || !pdfs_ts) { - PRINTM(MERROR, "%s(): Could not allocate dfs_ts\n", __FUNCTION__); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - memset(pmadapter, (t_u8 *) pdfs_ts, 0, sizeof(wlan_dfs_timestamp_t)); - - util_enqueue_list_tail(pmadapter->pmoal_handle, - &pmadapter->state_dfs.dfs_ts_head, - (pmlan_linked_list) pdfs_ts, MNULL, MNULL); - pdfs_ts->channel = channel; - } - // (else, use existing timestamp for channel; see assumptions above) - - // update params - pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, - &pdfs_ts->ts_sec, - &pdfs_ts->ts_usec); - pdfs_ts->represents = repr; - - PRINTM(MCMD_D, "11h: add/update dfs_timestamp - chan=%d, repr=%d(%s)," - " time(sec.usec)=%lu.%06lu\n", pdfs_ts->channel, - pdfs_ts->represents, DFS_TS_REPR_STRINGS[pdfs_ts->represents], - pdfs_ts->ts_sec, pdfs_ts->ts_usec); - - LEAVE(); - return ret; + wlan_dfs_timestamp_t *pdfs_ts = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + pdfs_ts = wlan_11h_find_dfs_timestamp(pmadapter, channel); + + if (!pdfs_ts) { + /* need to allocate new timestamp */ + ret = pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, + sizeof + (wlan_dfs_timestamp_t), + MLAN_MEM_DEF, + (t_u8 **) & pdfs_ts); + if ((ret != MLAN_STATUS_SUCCESS) || !pdfs_ts) { + PRINTM(MERROR, "%s(): Could not allocate dfs_ts\n", + __FUNCTION__); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + memset(pmadapter, (t_u8 *) pdfs_ts, 0, + sizeof(wlan_dfs_timestamp_t)); + + util_enqueue_list_tail(pmadapter->pmoal_handle, + &pmadapter->state_dfs.dfs_ts_head, + (pmlan_linked_list) pdfs_ts, MNULL, + MNULL); + pdfs_ts->channel = channel; + } + /* (else, use existing timestamp for channel; see assumptions above) */ + + /* update params */ + pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, + &pdfs_ts->ts_sec, + &pdfs_ts->ts_usec); + pdfs_ts->represents = repr; + + PRINTM(MCMD_D, "11h: add/update dfs_timestamp - chan=%d, repr=%d(%s)," + " time(sec.usec)=%lu.%06lu\n", pdfs_ts->channel, + pdfs_ts->represents, DFS_TS_REPR_STRINGS[pdfs_ts->represents], + pdfs_ts->ts_sec, pdfs_ts->ts_usec); + + LEAVE(); + return ret; } /******************************************************** @@ -1482,9 +1566,9 @@ wlan_11h_add_dfs_timestamp(mlan_adapter * pmadapter, t_u8 repr, t_u8 channel) t_bool wlan_11h_is_master_radar_det_active(mlan_private * priv) { - ENTER(); - LEAVE(); - return (priv->adapter->state_11h.is_master_radar_det_active); + ENTER(); + LEAVE(); + return (priv->adapter->state_11h.is_master_radar_det_active); } /** @@ -1502,17 +1586,18 @@ wlan_11h_is_master_radar_det_active(mlan_private * priv) mlan_status wlan_11h_config_master_radar_det(mlan_private * priv, t_bool enable) { - mlan_status ret = MLAN_STATUS_FAILURE; - - ENTER(); - if (wlan_11h_is_dfs_master(priv) && - priv->adapter->init_para.dfs_master_radar_det_en) { - priv->adapter->state_11h.master_radar_det_enable_pending = enable; - ret = MLAN_STATUS_SUCCESS; - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_FAILURE; + + ENTER(); + if (wlan_11h_is_dfs_master(priv) && + priv->adapter->init_para.dfs_master_radar_det_en) { + priv->adapter->state_11h.master_radar_det_enable_pending = + enable; + ret = MLAN_STATUS_SUCCESS; + } + + LEAVE(); + return ret; } /** @@ -1530,16 +1615,17 @@ wlan_11h_config_master_radar_det(mlan_private * priv, t_bool enable) mlan_status wlan_11h_config_slave_radar_det(mlan_private * priv, t_bool enable) { - mlan_status ret = MLAN_STATUS_FAILURE; - - ENTER(); - if (wlan_11h_is_dfs_slave(priv) && - priv->adapter->init_para.dfs_slave_radar_det_en) { - priv->adapter->state_11h.slave_radar_det_enable_pending = enable; - ret = MLAN_STATUS_SUCCESS; - } - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_FAILURE; + + ENTER(); + if (wlan_11h_is_dfs_slave(priv) && + priv->adapter->init_para.dfs_slave_radar_det_en) { + priv->adapter->state_11h.slave_radar_det_enable_pending = + enable; + ret = MLAN_STATUS_SUCCESS; + } + LEAVE(); + return ret; } /** @@ -1557,34 +1643,37 @@ wlan_11h_config_slave_radar_det(mlan_private * priv, t_bool enable) mlan_status wlan_11h_check_update_radar_det_state(mlan_private * pmpriv) { - t_u32 new_radar_det_state = 0; - t_u32 mib_11h = 0; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - if (wlan_11h_check_radar_det_state(pmpriv->adapter, &new_radar_det_state)) { - PRINTM(MCMD_D, "%s: radar_det_state being updated.\n", __FUNCTION__); - - mib_11h |= new_radar_det_state; - /* keep priv's existing 11h state */ - if (pmpriv->intf_state_11h.is_11h_active) - mib_11h |= ENABLE_11H_MASK; - - /* Send cmd to FW to enable/disable 11h function in firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_SNMP_MIB, - HostCmd_ACT_GEN_SET, Dot11H_i, MNULL, &mib_11h); - if (ret) - ret = MLAN_STATUS_FAILURE; - } - - /* updated state sent OR no change, thus no longer pending */ - pmpriv->adapter->state_11h.master_radar_det_enable_pending = MFALSE; - pmpriv->adapter->state_11h.slave_radar_det_enable_pending = MFALSE; - - LEAVE(); - return ret; + t_u32 new_radar_det_state = 0; + t_u32 mib_11h = 0; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + if (wlan_11h_check_radar_det_state(pmpriv->adapter, + &new_radar_det_state)) { + PRINTM(MCMD_D, "%s: radar_det_state being updated.\n", + __FUNCTION__); + + mib_11h |= new_radar_det_state; + /* keep priv's existing 11h state */ + if (pmpriv->intf_state_11h.is_11h_active) + mib_11h |= ENABLE_11H_MASK; + + /* Send cmd to FW to enable/disable 11h function in firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_SNMP_MIB, + HostCmd_ACT_GEN_SET, + Dot11H_i, MNULL, &mib_11h); + if (ret) + ret = MLAN_STATUS_FAILURE; + } + + /* updated state sent OR no change, thus no longer pending */ + pmpriv->adapter->state_11h.master_radar_det_enable_pending = MFALSE; + pmpriv->adapter->state_11h.slave_radar_det_enable_pending = MFALSE; + + LEAVE(); + return ret; } /** @@ -1603,9 +1692,9 @@ wlan_11h_check_update_radar_det_state(mlan_private * pmpriv) t_bool wlan_11h_is_active(mlan_private * priv) { - ENTER(); - LEAVE(); - return (priv->intf_state_11h.is_11h_active); + ENTER(); + LEAVE(); + return (priv->intf_state_11h.is_11h_active); } /** @@ -1618,12 +1707,12 @@ wlan_11h_is_active(mlan_private * priv) t_void wlan_11h_tx_enable(mlan_private * priv) { - ENTER(); - if (priv->intf_state_11h.tx_disabled) { - wlan_recv_event(priv, MLAN_EVENT_ID_FW_START_TX, MNULL); - priv->intf_state_11h.tx_disabled = MFALSE; - } - LEAVE(); + ENTER(); + if (priv->intf_state_11h.tx_disabled) { + wlan_recv_event(priv, MLAN_EVENT_ID_FW_START_TX, MNULL); + priv->intf_state_11h.tx_disabled = MFALSE; + } + LEAVE(); } /** @@ -1636,12 +1725,12 @@ wlan_11h_tx_enable(mlan_private * priv) t_void wlan_11h_tx_disable(mlan_private * priv) { - ENTER(); - if (!priv->intf_state_11h.tx_disabled) { - priv->intf_state_11h.tx_disabled = MTRUE; - wlan_recv_event(priv, MLAN_EVENT_ID_FW_STOP_TX, MNULL); - } - LEAVE(); + ENTER(); + if (!priv->intf_state_11h.tx_disabled) { + priv->intf_state_11h.tx_disabled = MTRUE; + wlan_recv_event(priv, MLAN_EVENT_ID_FW_STOP_TX, MNULL); + } + LEAVE(); } /** @@ -1656,30 +1745,30 @@ wlan_11h_tx_disable(mlan_private * priv) mlan_status wlan_11h_activate(mlan_private * priv, t_void * pioctl_buf, t_bool flag) { - t_u32 enable = flag & ENABLE_11H_MASK; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - /* add bits for master/slave radar detect into enable. */ - enable |= wlan_11h_get_current_radar_detect_flags(priv->adapter); - - /* - * Send cmd to FW to enable/disable 11h function in firmware - */ - ret = wlan_prepare_cmd(priv, - HostCmd_CMD_802_11_SNMP_MIB, - HostCmd_ACT_GEN_SET, - Dot11H_i, (t_void *) pioctl_buf, &enable); - if (ret) - ret = MLAN_STATUS_FAILURE; - else - /* Set boolean flag in driver 11h state */ - priv->intf_state_11h.is_11h_active = flag; - - PRINTM(MINFO, "11h: %s\n", flag ? "Activate" : "Deactivate"); - - LEAVE(); - return ret; + t_u32 enable = flag & ENABLE_11H_MASK; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + /* add bits for master/slave radar detect into enable. */ + enable |= wlan_11h_get_current_radar_detect_flags(priv->adapter); + + /* + * Send cmd to FW to enable/disable 11h function in firmware + */ + ret = wlan_prepare_cmd(priv, + HostCmd_CMD_802_11_SNMP_MIB, + HostCmd_ACT_GEN_SET, + Dot11H_i, (t_void *) pioctl_buf, &enable); + if (ret) + ret = MLAN_STATUS_FAILURE; + else + /* Set boolean flag in driver 11h state */ + priv->intf_state_11h.is_11h_active = flag; + + PRINTM(MINFO, "11h: %s\n", flag ? "Activate" : "Deactivate"); + + LEAVE(); + return ret; } /** @@ -1692,60 +1781,62 @@ wlan_11h_activate(mlan_private * priv, t_void * pioctl_buf, t_bool flag) t_void wlan_11h_init(mlan_adapter * adapter) { - wlan_11h_device_state_t *pstate_11h = &adapter->state_11h; - IEEEtypes_Quiet_t *pquiet = &adapter->state_11h.quiet_ie; - wlan_dfs_device_state_t *pstate_dfs = &adapter->state_dfs; - wlan_radar_det_hndlg_state_t *pstate_rdh = &adapter->state_rdh; + wlan_11h_device_state_t *pstate_11h = &adapter->state_11h; + IEEEtypes_Quiet_t *pquiet = &adapter->state_11h.quiet_ie; + wlan_dfs_device_state_t *pstate_dfs = &adapter->state_dfs; + wlan_radar_det_hndlg_state_t *pstate_rdh = &adapter->state_rdh; #ifdef DFS_TESTING_SUPPORT - wlan_dfs_testing_settings_t *pdfs_test = &adapter->dfs_test_params; + wlan_dfs_testing_settings_t *pdfs_test = &adapter->dfs_test_params; #endif - ENTER(); - - /* Initialize 11H struct */ - pstate_11h->usr_def_power_constraint = WLAN_11H_TPC_POWERCONSTRAINT; - pstate_11h->min_tx_power_capability = WLAN_11H_TPC_POWERCAPABILITY_MIN; - pstate_11h->max_tx_power_capability = WLAN_11H_TPC_POWERCAPABILITY_MAX; - - pstate_11h->recvd_chanswann_event = MFALSE; - pstate_11h->master_radar_det_enable_pending = MFALSE; - pstate_11h->slave_radar_det_enable_pending = MFALSE; - pstate_11h->is_master_radar_det_active = MFALSE; - pstate_11h->is_slave_radar_det_active = MFALSE; - - /* Initialize quiet_ie */ - memset(adapter, pquiet, 0, sizeof(IEEEtypes_Quiet_t)); - pquiet->element_id = QUIET; - pquiet->len = (sizeof(pquiet->quiet_count) + sizeof(pquiet->quiet_period) - + sizeof(pquiet->quiet_duration) - + sizeof(pquiet->quiet_offset)); - - /* Initialize DFS struct */ - pstate_dfs->dfs_check_pending = MFALSE; - pstate_dfs->dfs_radar_found = MFALSE; - pstate_dfs->dfs_check_channel = 0; - pstate_dfs->dfs_report_time_sec = 0; - util_init_list((pmlan_linked_list) & pstate_dfs->dfs_ts_head); - - /* Initialize RDH struct */ - pstate_rdh->stage = RDH_OFF; - pstate_rdh->priv_list_count = 0; - pstate_rdh->priv_curr_idx = 0; - pstate_rdh->curr_channel = 0; - pstate_rdh->new_channel = 0; - pstate_rdh->uap_band_cfg = 0; - pstate_rdh->max_bcn_dtim_ms = 0; - memset(adapter, pstate_rdh->priv_list, 0, sizeof(pstate_rdh->priv_list)); + ENTER(); + + /* Initialize 11H struct */ + pstate_11h->usr_def_power_constraint = WLAN_11H_TPC_POWERCONSTRAINT; + pstate_11h->min_tx_power_capability = WLAN_11H_TPC_POWERCAPABILITY_MIN; + pstate_11h->max_tx_power_capability = WLAN_11H_TPC_POWERCAPABILITY_MAX; + + pstate_11h->recvd_chanswann_event = MFALSE; + pstate_11h->master_radar_det_enable_pending = MFALSE; + pstate_11h->slave_radar_det_enable_pending = MFALSE; + pstate_11h->is_master_radar_det_active = MFALSE; + pstate_11h->is_slave_radar_det_active = MFALSE; + + /* Initialize quiet_ie */ + memset(adapter, pquiet, 0, sizeof(IEEEtypes_Quiet_t)); + pquiet->element_id = QUIET; + pquiet->len = + (sizeof(pquiet->quiet_count) + sizeof(pquiet->quiet_period) + + sizeof(pquiet->quiet_duration) + + sizeof(pquiet->quiet_offset)); + + /* Initialize DFS struct */ + pstate_dfs->dfs_check_pending = MFALSE; + pstate_dfs->dfs_radar_found = MFALSE; + pstate_dfs->dfs_check_channel = 0; + pstate_dfs->dfs_report_time_sec = 0; + util_init_list((pmlan_linked_list) & pstate_dfs->dfs_ts_head); + + /* Initialize RDH struct */ + pstate_rdh->stage = RDH_OFF; + pstate_rdh->priv_list_count = 0; + pstate_rdh->priv_curr_idx = 0; + pstate_rdh->curr_channel = 0; + pstate_rdh->new_channel = 0; + pstate_rdh->uap_band_cfg = 0; + pstate_rdh->max_bcn_dtim_ms = 0; + memset(adapter, pstate_rdh->priv_list, 0, + sizeof(pstate_rdh->priv_list)); #ifdef DFS_TESTING_SUPPORT - /* Initialize DFS testing struct */ - pdfs_test->user_cac_period_msec = 0; - pdfs_test->user_nop_period_sec = 0; - pdfs_test->no_channel_change_on_radar = MFALSE; - pdfs_test->fixed_new_channel_on_radar = 0; + /* Initialize DFS testing struct */ + pdfs_test->user_cac_period_msec = 0; + pdfs_test->user_nop_period_sec = 0; + pdfs_test->no_channel_change_on_radar = MFALSE; + pdfs_test->fixed_new_channel_on_radar = 0; #endif - LEAVE(); + LEAVE(); } /** @@ -1758,27 +1849,32 @@ wlan_11h_init(mlan_adapter * adapter) t_void wlan_11h_cleanup(mlan_adapter * adapter) { - wlan_dfs_device_state_t *pstate_dfs = &adapter->state_dfs; - wlan_dfs_timestamp_t *pdfs_ts; - - ENTER(); - - /* cleanup dfs_timestamp list */ - pdfs_ts = (wlan_dfs_timestamp_t *) util_peek_list(adapter->pmoal_handle, - &pstate_dfs->dfs_ts_head, - MNULL, MNULL); - while (pdfs_ts) { - util_unlink_list(adapter->pmoal_handle, &pstate_dfs->dfs_ts_head, - (pmlan_linked_list) pdfs_ts, MNULL, MNULL); - adapter->callbacks.moal_mfree(adapter->pmoal_handle, (t_u8 *) pdfs_ts); - - pdfs_ts = (wlan_dfs_timestamp_t *) util_peek_list(adapter->pmoal_handle, - &pstate_dfs-> - dfs_ts_head, MNULL, - MNULL); - } - - LEAVE(); + wlan_dfs_device_state_t *pstate_dfs = &adapter->state_dfs; + wlan_dfs_timestamp_t *pdfs_ts; + + ENTER(); + + /* cleanup dfs_timestamp list */ + pdfs_ts = (wlan_dfs_timestamp_t *) util_peek_list(adapter->pmoal_handle, + &pstate_dfs-> + dfs_ts_head, MNULL, + MNULL); + while (pdfs_ts) { + util_unlink_list(adapter->pmoal_handle, + &pstate_dfs->dfs_ts_head, + (pmlan_linked_list) pdfs_ts, MNULL, MNULL); + adapter->callbacks.moal_mfree(adapter->pmoal_handle, + (t_u8 *) pdfs_ts); + + pdfs_ts = + (wlan_dfs_timestamp_t *) util_peek_list(adapter-> + pmoal_handle, + &pstate_dfs-> + dfs_ts_head, + MNULL, MNULL); + } + + LEAVE(); } /** @@ -1791,18 +1887,18 @@ wlan_11h_cleanup(mlan_adapter * adapter) t_void wlan_11h_priv_init(mlan_private * pmpriv) { - wlan_11h_interface_state_t *pistate_11h = &pmpriv->intf_state_11h; + wlan_11h_interface_state_t *pistate_11h = &pmpriv->intf_state_11h; - ENTER(); + ENTER(); - pistate_11h->is_11h_enabled = MTRUE; - pistate_11h->is_11h_active = MFALSE; - pistate_11h->adhoc_auto_sel_chan = MTRUE; - pistate_11h->tx_disabled = MFALSE; - pistate_11h->dfs_slave_csa_chan = 0; - pistate_11h->dfs_slave_csa_expire_at_sec = 0; + pistate_11h->is_11h_enabled = MTRUE; + pistate_11h->is_11h_active = MFALSE; + pistate_11h->adhoc_auto_sel_chan = MTRUE; + pistate_11h->tx_disabled = MFALSE; + pistate_11h->dfs_slave_csa_chan = 0; + pistate_11h->dfs_slave_csa_expire_at_sec = 0; - LEAVE(); + LEAVE(); } /** @@ -1819,73 +1915,82 @@ wlan_11h_priv_init(mlan_private * pmpriv) t_u8 wlan_11h_get_adhoc_start_channel(mlan_private * priv) { - t_u8 start_chn; - mlan_adapter *adapter = priv->adapter; - t_u32 region; - t_u32 rand_entry; - region_chan_t *chn_tbl; - t_u8 rand_tries = 0; - - ENTER(); - - /* - * Set start_chn to the Default. Used if 11h is disabled or the band - * does not require 11h support. - */ - start_chn = DEFAULT_AD_HOC_CHANNEL; - - /* - * Check that we are looking for a channel in the A Band - */ - if ((adapter->adhoc_start_band & BAND_A) - || (adapter->adhoc_start_band & BAND_AN) - ) { - /* - * Set default to the A Band default. Used if random selection fails - * or if 11h is not enabled - */ - start_chn = DEFAULT_AD_HOC_CHANNEL_A; - - /* - * Check that 11h is enabled in the driver - */ - if (wlan_11h_is_enabled(priv)) { - /* - * Search the region_channel tables for a channel table - * that is marked for the A Band. - */ - for (region = 0; (region < MAX_REGION_CHANNEL_NUM); region++) { - chn_tbl = &adapter->region_channel[region]; - - /* Check if table is valid and marked for A Band */ - if (chn_tbl->valid - && chn_tbl->region == adapter->region_code - && chn_tbl->band & BAND_A) { - /* - * Set the start channel. Get a random number and - * use it to pick an entry in the table between 0 - * and the number of channels in the table (NumCFP). - */ - do { - rand_entry = - wlan_11h_get_random_num(adapter) % chn_tbl->num_cfp; - start_chn = (t_u8) chn_tbl->pcfp[rand_entry].channel; - } while ((wlan_11h_is_channel_under_nop(adapter, start_chn) - || - ((adapter->state_rdh.stage == - RDH_GET_INFO_CHANNEL) && - wlan_11h_radar_detect_required(priv, start_chn))) - && (++rand_tries < MAX_RANDOM_CHANNEL_RETRIES)); - } - } - } - } - - PRINTM(MINFO, "11h: %s: AdHoc Channel set to %u\n", - wlan_11h_is_enabled(priv) ? "Enabled" : "Disabled", start_chn); - - LEAVE(); - return start_chn; + t_u8 start_chn; + mlan_adapter *adapter = priv->adapter; + t_u32 region; + t_u32 rand_entry; + region_chan_t *chn_tbl; + t_u8 rand_tries = 0; + + ENTER(); + + /* + * Set start_chn to the Default. Used if 11h is disabled or the band + * does not require 11h support. + */ + start_chn = DEFAULT_AD_HOC_CHANNEL; + + /* + * Check that we are looking for a channel in the A Band + */ + if ((adapter->adhoc_start_band & BAND_A) + || (adapter->adhoc_start_band & BAND_AN) + ) { + /* + * Set default to the A Band default. Used if random selection fails + * or if 11h is not enabled + */ + start_chn = DEFAULT_AD_HOC_CHANNEL_A; + + /* + * Check that 11h is enabled in the driver + */ + if (wlan_11h_is_enabled(priv)) { + /* + * Search the region_channel tables for a channel table + * that is marked for the A Band. + */ + for (region = 0; (region < MAX_REGION_CHANNEL_NUM); + region++) { + chn_tbl = &adapter->region_channel[region]; + + /* Check if table is valid and marked for A + Band */ + if (chn_tbl->valid + && chn_tbl->region == adapter->region_code + && chn_tbl->band & BAND_A) { + /* + * Set the start channel. Get a random number and + * use it to pick an entry in the table between 0 + * and the number of channels in the table (NumCFP). + */ + do { + rand_entry = + wlan_11h_get_random_num + (adapter) % + chn_tbl->num_cfp; + start_chn = + (t_u8) chn_tbl-> + pcfp[rand_entry]. + channel; + } while ((wlan_11h_is_channel_under_nop + (adapter, start_chn) || + ((adapter->state_rdh.stage == + RDH_GET_INFO_CHANNEL) && + wlan_11h_radar_detect_required + (priv, start_chn))) + && (++rand_tries < + MAX_RANDOM_CHANNEL_RETRIES)); + } + } + } + } + + PRINTM(MINFO, "11h: %s: AdHoc Channel set to %u\n", + wlan_11h_is_enabled(priv) ? "Enabled" : "Disabled", start_chn); + + LEAVE(); + return start_chn; } /** @@ -1902,29 +2007,31 @@ wlan_11h_get_adhoc_start_channel(mlan_private * priv) t_u8 wlan_11h_get_csa_closed_channel(mlan_private * priv) { - t_u32 sec, usec; - - ENTER(); - - if (!priv->intf_state_11h.dfs_slave_csa_chan) { - LEAVE(); - return 0; - } - - /* have csa channel, check if expired or not */ - priv->adapter->callbacks.moal_get_system_time(priv->adapter->pmoal_handle, - &sec, &usec); - if (sec > priv->intf_state_11h.dfs_slave_csa_expire_at_sec) { - /* expired: remove channel from blacklist table, and clear vars */ - wlan_set_chan_blacklist(priv, BAND_A, - priv->intf_state_11h.dfs_slave_csa_chan, - MFALSE); - priv->intf_state_11h.dfs_slave_csa_chan = 0; - priv->intf_state_11h.dfs_slave_csa_expire_at_sec = 0; - } - - LEAVE(); - return priv->intf_state_11h.dfs_slave_csa_chan; + t_u32 sec, usec; + + ENTER(); + + if (!priv->intf_state_11h.dfs_slave_csa_chan) { + LEAVE(); + return 0; + } + + /* have csa channel, check if expired or not */ + priv->adapter->callbacks.moal_get_system_time(priv->adapter-> + pmoal_handle, &sec, + &usec); + if (sec > priv->intf_state_11h.dfs_slave_csa_expire_at_sec) { + /* expired: remove channel from blacklist table, and clear vars + */ + wlan_set_chan_blacklist(priv, BAND_A, + priv->intf_state_11h.dfs_slave_csa_chan, + MFALSE); + priv->intf_state_11h.dfs_slave_csa_chan = 0; + priv->intf_state_11h.dfs_slave_csa_expire_at_sec = 0; + } + + LEAVE(); + return priv->intf_state_11h.dfs_slave_csa_chan; } /** @@ -1948,37 +2055,38 @@ wlan_11h_get_csa_closed_channel(mlan_private * priv) t_bool wlan_11h_radar_detect_required(mlan_private * priv, t_u8 channel) { - t_bool required = MFALSE; - - ENTER(); - - /* - * No checks for 11h or measurement code being enabled is placed here - * since regulatory requirements exist whether we support them or not. - */ - - required = wlan_get_cfp_radar_detect(priv, channel); - - if (!priv->adapter->region_code) - PRINTM(MINFO, "11h: Radar detection in CFP code[BG:%#x, A:%#x] " - "is %srequired for channel %d\n", - priv->adapter->cfp_code_bg, priv->adapter->cfp_code_a, - (required ? "" : "not "), channel); - else - PRINTM(MINFO, "11h: Radar detection in region %#02x " - "is %srequired for channel %d\n", - priv->adapter->region_code, (required ? "" : "not "), channel); - - if (required == MTRUE && priv->media_connected == MTRUE - && priv->curr_bss_params.bss_descriptor.channel == channel) { - required = MFALSE; - - PRINTM(MINFO, "11h: Radar detection not required. " - "Already operating on the channel\n"); - } - - LEAVE(); - return required; + t_bool required = MFALSE; + + ENTER(); + + /* + * No checks for 11h or measurement code being enabled is placed here + * since regulatory requirements exist whether we support them or not. + */ + + required = wlan_get_cfp_radar_detect(priv, channel); + + if (!priv->adapter->region_code) + PRINTM(MINFO, "11h: Radar detection in CFP code[BG:%#x, A:%#x] " + "is %srequired for channel %d\n", + priv->adapter->cfp_code_bg, priv->adapter->cfp_code_a, + (required ? "" : "not "), channel); + else + PRINTM(MINFO, "11h: Radar detection in region %#02x " + "is %srequired for channel %d\n", + priv->adapter->region_code, (required ? "" : "not "), + channel); + + if (required == MTRUE && priv->media_connected == MTRUE + && priv->curr_bss_params.bss_descriptor.channel == channel) { + required = MFALSE; + + PRINTM(MINFO, "11h: Radar detection not required. " + "Already operating on the channel\n"); + } + + LEAVE(); + return required; } /** @@ -2004,43 +2112,47 @@ wlan_11h_radar_detect_required(mlan_private * priv, t_u8 channel) */ t_s32 wlan_11h_issue_radar_detect(mlan_private * priv, - pmlan_ioctl_req pioctl_req, t_u8 channel) + pmlan_ioctl_req pioctl_req, t_u8 channel) { - t_s32 ret; - HostCmd_DS_CHAN_RPT_REQ chan_rpt_req; - - ENTER(); - - ret = wlan_11h_radar_detect_required(priv, channel); - if (ret) { - /* Prepare and issue CMD_CHAN_RPT_REQ. */ - memset(priv->adapter, &chan_rpt_req, 0x00, sizeof(chan_rpt_req)); - - chan_rpt_req.chan_desc.startFreq = START_FREQ_11A_BAND; - chan_rpt_req.chan_desc.chanWidth = 0; // 1 for 40Mhz - chan_rpt_req.chan_desc.chanNum = channel; - chan_rpt_req.millisec_dwell_time = - WLAN_11H_CHANNEL_AVAIL_CHECK_DURATION; + t_s32 ret; + HostCmd_DS_CHAN_RPT_REQ chan_rpt_req; + + ENTER(); + + ret = wlan_11h_radar_detect_required(priv, channel); + if (ret) { + /* Prepare and issue CMD_CHAN_RPT_REQ. */ + memset(priv->adapter, &chan_rpt_req, 0x00, + sizeof(chan_rpt_req)); + + chan_rpt_req.chan_desc.startFreq = START_FREQ_11A_BAND; + chan_rpt_req.chan_desc.chanWidth = 0; /* 1 for 40Mhz */ + chan_rpt_req.chan_desc.chanNum = channel; + chan_rpt_req.millisec_dwell_time = + WLAN_11H_CHANNEL_AVAIL_CHECK_DURATION; #ifdef DFS_TESTING_SUPPORT - if (priv->adapter->dfs_test_params.user_cac_period_msec) { - PRINTM(MCMD_D, "dfs_testing - user CAC period=%d (msec)\n", - priv->adapter->dfs_test_params.user_cac_period_msec); - chan_rpt_req.millisec_dwell_time = - priv->adapter->dfs_test_params.user_cac_period_msec; - } + if (priv->adapter->dfs_test_params.user_cac_period_msec) { + PRINTM(MCMD_D, + "dfs_testing - user CAC period=%d (msec)\n", + priv->adapter->dfs_test_params. + user_cac_period_msec); + chan_rpt_req.millisec_dwell_time = + priv->adapter->dfs_test_params. + user_cac_period_msec; + } #endif - PRINTM(MMSG, "11h: issuing DFS Radar check for channel=%d." - " Please wait for response...\n", channel); + PRINTM(MMSG, "11h: issuing DFS Radar check for channel=%d." + " Please wait for response...\n", channel); - ret = wlan_prepare_cmd(priv, HostCmd_CMD_CHAN_REPORT_REQUEST, - HostCmd_ACT_GEN_SET, 0, - (t_void *) pioctl_req, - (t_void *) & chan_rpt_req); - } + ret = wlan_prepare_cmd(priv, HostCmd_CMD_CHAN_REPORT_REQUEST, + HostCmd_ACT_GEN_SET, 0, + (t_void *) pioctl_req, + (t_void *) & chan_rpt_req); + } - LEAVE(); - return ret; + LEAVE(); + return ret; } /** @@ -2063,40 +2175,42 @@ wlan_11h_issue_radar_detect(mlan_private * priv, mlan_status wlan_11h_check_chan_report(mlan_private * priv, t_u8 chan) { - mlan_status ret = MLAN_STATUS_SUCCESS; - wlan_dfs_device_state_t *pstate_dfs = &priv->adapter->state_dfs; - t_u32 sec, usec; - - ENTER(); - - /* check report we hold is valid or not */ - priv->adapter->callbacks.moal_get_system_time(priv->adapter->pmoal_handle, - &sec, &usec); - - PRINTM(MINFO, "11h: %s()\n", __FUNCTION__); - PRINTM(MINFO, "- sec_now=%d, sec_report=%d.\n", - sec, pstate_dfs->dfs_report_time_sec); - PRINTM(MINFO, "- rpt_channel=%d, rpt_radar=%d.\n", - pstate_dfs->dfs_check_channel, pstate_dfs->dfs_radar_found); - - if ((!pstate_dfs->dfs_check_pending) && - (chan == pstate_dfs->dfs_check_channel) && - ((sec - pstate_dfs->dfs_report_time_sec) < - MAX_DFS_REPORT_USABLE_AGE_SEC)) { - /* valid and not out-dated, check if radar */ - if (pstate_dfs->dfs_radar_found) { - PRINTM(MMSG, "Radar was detected on channel %d.\n", chan); - ret = MLAN_STATUS_FAILURE; - } - } else { - // TODO: reissue report request if not pending. - // BUT HOW to make the code wait for it??? - /* For now, just fail since we don't have the info. */ - ret = MLAN_STATUS_PENDING; - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + wlan_dfs_device_state_t *pstate_dfs = &priv->adapter->state_dfs; + t_u32 sec, usec; + + ENTER(); + + /* check report we hold is valid or not */ + priv->adapter->callbacks.moal_get_system_time(priv->adapter-> + pmoal_handle, &sec, + &usec); + + PRINTM(MINFO, "11h: %s()\n", __FUNCTION__); + PRINTM(MINFO, "- sec_now=%d, sec_report=%d.\n", + sec, pstate_dfs->dfs_report_time_sec); + PRINTM(MINFO, "- rpt_channel=%d, rpt_radar=%d.\n", + pstate_dfs->dfs_check_channel, pstate_dfs->dfs_radar_found); + + if ((!pstate_dfs->dfs_check_pending) && + (chan == pstate_dfs->dfs_check_channel) && + ((sec - pstate_dfs->dfs_report_time_sec) < + MAX_DFS_REPORT_USABLE_AGE_SEC)) { + /* valid and not out-dated, check if radar */ + if (pstate_dfs->dfs_radar_found) { + PRINTM(MMSG, "Radar was detected on channel %d.\n", + chan); + ret = MLAN_STATUS_FAILURE; + } + } else { + /* TODO: reissue report request if not pending. BUT HOW to + make the code wait for it??? For now, just fail since we + don't have the info. */ + ret = MLAN_STATUS_PENDING; + } + + LEAVE(); + return ret; } /** @@ -2121,63 +2235,67 @@ wlan_11h_check_chan_report(mlan_private * priv, t_u8 chan) */ t_s32 wlan_11h_process_start(mlan_private * priv, - t_u8 ** ppbuffer, - IEEEtypes_CapInfo_t * pcap_info, - t_u32 channel, wlan_11h_bss_info_t * p11h_bss_info) + t_u8 ** ppbuffer, + IEEEtypes_CapInfo_t * pcap_info, + t_u32 channel, wlan_11h_bss_info_t * p11h_bss_info) { - mlan_adapter *adapter = priv->adapter; - t_s32 ret = MLAN_STATUS_SUCCESS; - t_bool is_dfs_chan = MFALSE; - - ENTER(); - if (wlan_11h_is_enabled(priv) - && ((adapter->adhoc_start_band & BAND_A) - || (adapter->adhoc_start_band & BAND_AN) - ) - ) { - if (!wlan_11d_is_enabled(priv)) { - /* No use having 11h enabled without 11d enabled */ - wlan_11d_enable(priv, MNULL, ENABLE_11D); + mlan_adapter *adapter = priv->adapter; + t_s32 ret = MLAN_STATUS_SUCCESS; + t_bool is_dfs_chan = MFALSE; + + ENTER(); + if (wlan_11h_is_enabled(priv) + && ((adapter->adhoc_start_band & BAND_A) + || (adapter->adhoc_start_band & BAND_AN) + ) + ) { + if (!wlan_11d_is_enabled(priv)) { + /* No use having 11h enabled without 11d enabled */ + wlan_11d_enable(priv, MNULL, ENABLE_11D); #ifdef STA_SUPPORT - wlan_11d_create_dnld_countryinfo(priv, adapter->adhoc_start_band); + wlan_11d_create_dnld_countryinfo(priv, + adapter-> + adhoc_start_band); #endif - } - - /* Activate 11h functions in firmware, turns on capability bit */ - wlan_11h_activate(priv, MNULL, MTRUE); - pcap_info->spectrum_mgmt = MTRUE; - - /* If using a DFS channel, enable radar detection. */ - is_dfs_chan = wlan_11h_radar_detect_required(priv, channel); - if (is_dfs_chan) { - if (!wlan_11h_is_master_radar_det_active(priv)) - wlan_11h_config_master_radar_det(priv, MTRUE); - } - wlan_11h_check_update_radar_det_state(priv); - - /* Set flag indicating this BSS we are starting is using 11h */ - p11h_bss_info->sensed_11h = MTRUE; - - if (is_dfs_chan) { - /* check if this channel is under NOP */ - if (wlan_11h_is_channel_under_nop(adapter, channel)) - ret = MLAN_STATUS_FAILURE; - /* check last channel report, if this channel is free of radar */ - if (ret == MLAN_STATUS_SUCCESS) - ret = wlan_11h_check_chan_report(priv, channel); - } - if (ret == MLAN_STATUS_SUCCESS) - ret = wlan_11h_process_adhoc(priv, ppbuffer, channel, MNULL); - else - ret = MLAN_STATUS_FAILURE; - } else { - /* Deactivate 11h functions in the firmware */ - wlan_11h_activate(priv, MNULL, MFALSE); - pcap_info->spectrum_mgmt = MFALSE; - wlan_11h_check_update_radar_det_state(priv); - } - LEAVE(); - return ret; + } + + /* Activate 11h functions in firmware, turns on capability bit */ + wlan_11h_activate(priv, MNULL, MTRUE); + pcap_info->spectrum_mgmt = MTRUE; + + /* If using a DFS channel, enable radar detection. */ + is_dfs_chan = wlan_11h_radar_detect_required(priv, channel); + if (is_dfs_chan) { + if (!wlan_11h_is_master_radar_det_active(priv)) + wlan_11h_config_master_radar_det(priv, MTRUE); + } + wlan_11h_check_update_radar_det_state(priv); + + /* Set flag indicating this BSS we are starting is using 11h */ + p11h_bss_info->sensed_11h = MTRUE; + + if (is_dfs_chan) { + /* check if this channel is under NOP */ + if (wlan_11h_is_channel_under_nop(adapter, channel)) + ret = MLAN_STATUS_FAILURE; + /* check last channel report, if this channel is free + of radar */ + if (ret == MLAN_STATUS_SUCCESS) + ret = wlan_11h_check_chan_report(priv, channel); + } + if (ret == MLAN_STATUS_SUCCESS) + ret = wlan_11h_process_adhoc(priv, ppbuffer, channel, + MNULL); + else + ret = MLAN_STATUS_FAILURE; + } else { + /* Deactivate 11h functions in the firmware */ + wlan_11h_activate(priv, MNULL, MFALSE); + pcap_info->spectrum_mgmt = MFALSE; + wlan_11h_check_update_radar_det_state(priv); + } + LEAVE(); + return ret; } /** @@ -2208,68 +2326,72 @@ wlan_11h_process_start(mlan_private * priv, */ t_s32 wlan_11h_process_join(mlan_private * priv, - t_u8 ** ppbuffer, - IEEEtypes_CapInfo_t * pcap_info, - t_u8 band, - t_u32 channel, wlan_11h_bss_info_t * p11h_bss_info) + t_u8 ** ppbuffer, + IEEEtypes_CapInfo_t * pcap_info, + t_u8 band, + t_u32 channel, wlan_11h_bss_info_t * p11h_bss_info) { - t_s32 ret = 0; - - ENTER(); - - if (priv->media_connected == MTRUE) { - if (wlan_11h_is_active(priv) == p11h_bss_info->sensed_11h) { - /* Assume DFS parameters are the same for roaming as long as the - current & next APs have the same spectrum mgmt capability bit - setting */ - ret = MLAN_STATUS_SUCCESS; - - } else { - /* No support for roaming between DFS/non-DFS yet */ - ret = MLAN_STATUS_FAILURE; - } - - LEAVE(); - return ret; - } - - if (p11h_bss_info->sensed_11h) { - if (!wlan_11d_is_enabled(priv)) { - /* No use having 11h enabled without 11d enabled */ - wlan_11d_enable(priv, MNULL, ENABLE_11D); + t_s32 ret = 0; + + ENTER(); + + if (priv->media_connected == MTRUE) { + if (wlan_11h_is_active(priv) == p11h_bss_info->sensed_11h) { + /* Assume DFS parameters are the same for roaming as + long as the current & next APs have the same + spectrum mgmt capability bit setting */ + ret = MLAN_STATUS_SUCCESS; + + } else { + /* No support for roaming between DFS/non-DFS yet */ + ret = MLAN_STATUS_FAILURE; + } + + LEAVE(); + return ret; + } + + if (p11h_bss_info->sensed_11h) { + if (!wlan_11d_is_enabled(priv)) { + /* No use having 11h enabled without 11d enabled */ + wlan_11d_enable(priv, MNULL, ENABLE_11D); #ifdef STA_SUPPORT - wlan_11d_parse_dnld_countryinfo(priv, priv->pattempted_bss_desc); + wlan_11d_parse_dnld_countryinfo(priv, + priv-> + pattempted_bss_desc); #endif - } - /* Activate 11h functions in firmware, turns on capability bit */ - wlan_11h_activate(priv, MNULL, MTRUE); - pcap_info->spectrum_mgmt = MTRUE; - - /* If using a DFS channel, enable radar detection. */ - if ((band & BAND_A) && wlan_11h_radar_detect_required(priv, channel)) { - if (!wlan_11h_is_slave_radar_det_active(priv)) - wlan_11h_config_slave_radar_det(priv, MTRUE); - } - wlan_11h_check_update_radar_det_state(priv); - - if (pcap_info->ibss) { - PRINTM(MINFO, "11h: Adhoc join: Sensed\n"); - ret = wlan_11h_process_adhoc(priv, ppbuffer, channel, - p11h_bss_info); - } else { - PRINTM(MINFO, "11h: Infra join: Sensed\n"); - ret = wlan_11h_process_infra_join(priv, ppbuffer, band, - channel, p11h_bss_info); - } - } else { - /* Deactivate 11h functions in the firmware */ - wlan_11h_activate(priv, MNULL, MFALSE); - pcap_info->spectrum_mgmt = MFALSE; - wlan_11h_check_update_radar_det_state(priv); - } - - LEAVE(); - return ret; + } + /* Activate 11h functions in firmware, turns on capability bit */ + wlan_11h_activate(priv, MNULL, MTRUE); + pcap_info->spectrum_mgmt = MTRUE; + + /* If using a DFS channel, enable radar detection. */ + if ((band & BAND_A) && + wlan_11h_radar_detect_required(priv, channel)) { + if (!wlan_11h_is_slave_radar_det_active(priv)) + wlan_11h_config_slave_radar_det(priv, MTRUE); + } + wlan_11h_check_update_radar_det_state(priv); + + if (pcap_info->ibss) { + PRINTM(MINFO, "11h: Adhoc join: Sensed\n"); + ret = wlan_11h_process_adhoc(priv, ppbuffer, channel, + p11h_bss_info); + } else { + PRINTM(MINFO, "11h: Infra join: Sensed\n"); + ret = wlan_11h_process_infra_join(priv, ppbuffer, band, + channel, + p11h_bss_info); + } + } else { + /* Deactivate 11h functions in the firmware */ + wlan_11h_activate(priv, MNULL, MFALSE); + pcap_info->spectrum_mgmt = MFALSE; + wlan_11h_check_update_radar_det_state(priv); + } + + LEAVE(); + return ret; } /** @@ -2302,33 +2424,33 @@ wlan_11h_process_join(mlan_private * priv, */ mlan_status wlan_11h_cmd_process(mlan_private * priv, - HostCmd_DS_COMMAND * pcmd_ptr, const t_void * pinfo_buf) + HostCmd_DS_COMMAND * pcmd_ptr, const t_void * pinfo_buf) { - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - switch (pcmd_ptr->command) { - case HostCmd_CMD_802_11_TPC_ADAPT_REQ: - ret = wlan_11h_cmd_tpc_request(priv, pcmd_ptr, pinfo_buf); - break; - case HostCmd_CMD_802_11_TPC_INFO: - ret = wlan_11h_cmd_tpc_info(priv, pcmd_ptr, pinfo_buf); - break; - case HostCmd_CMD_802_11_CHAN_SW_ANN: - ret = wlan_11h_cmd_chan_sw_ann(priv, pcmd_ptr, pinfo_buf); - break; - case HostCmd_CMD_CHAN_REPORT_REQUEST: - ret = wlan_11h_cmd_chan_rpt_req(priv, pcmd_ptr, pinfo_buf); - break; - default: - ret = MLAN_STATUS_FAILURE; - } - - pcmd_ptr->command = wlan_cpu_to_le16(pcmd_ptr->command); - pcmd_ptr->size = wlan_cpu_to_le16(pcmd_ptr->size); - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + switch (pcmd_ptr->command) { + case HostCmd_CMD_802_11_TPC_ADAPT_REQ: + ret = wlan_11h_cmd_tpc_request(priv, pcmd_ptr, pinfo_buf); + break; + case HostCmd_CMD_802_11_TPC_INFO: + ret = wlan_11h_cmd_tpc_info(priv, pcmd_ptr, pinfo_buf); + break; + case HostCmd_CMD_802_11_CHAN_SW_ANN: + ret = wlan_11h_cmd_chan_sw_ann(priv, pcmd_ptr, pinfo_buf); + break; + case HostCmd_CMD_CHAN_REPORT_REQUEST: + ret = wlan_11h_cmd_chan_rpt_req(priv, pcmd_ptr, pinfo_buf); + break; + default: + ret = MLAN_STATUS_FAILURE; + } + + pcmd_ptr->command = wlan_cpu_to_le16(pcmd_ptr->command); + pcmd_ptr->size = wlan_cpu_to_le16(pcmd_ptr->size); + + LEAVE(); + return ret; } /** @@ -2353,37 +2475,41 @@ wlan_11h_cmd_process(mlan_private * priv, mlan_status wlan_11h_cmdresp_process(mlan_private * priv, const HostCmd_DS_COMMAND * resp) { - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - switch (resp->command) { - case HostCmd_CMD_802_11_TPC_ADAPT_REQ: - HEXDUMP("11h: TPC REQUEST Rsp:", (t_u8 *) resp, (t_u32) resp->size); - memcpy(priv->adapter, priv->adapter->curr_cmd->pdata_buf, - &resp->params.tpc_req, sizeof(HostCmd_DS_802_11_TPC_ADAPT_REQ)); - break; - - case HostCmd_CMD_802_11_TPC_INFO: - HEXDUMP("11h: TPC INFO Rsp Data:", (t_u8 *) resp, (t_u32) resp->size); - break; - - case HostCmd_CMD_802_11_CHAN_SW_ANN: - PRINTM(MINFO, "11h: Ret ChSwAnn: Sz=%u, Seq=%u, Ret=%u\n", - resp->size, resp->seq_num, resp->result); - break; - - case HostCmd_CMD_CHAN_REPORT_REQUEST: - PRINTM(MINFO, "11h: Ret ChanRptReq. Set dfs_check_pending and wait" - " for EVENT_CHANNEL_REPORT.\n"); - priv->adapter->state_dfs.dfs_check_pending = MTRUE; - break; - - default: - ret = MLAN_STATUS_FAILURE; - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + switch (resp->command) { + case HostCmd_CMD_802_11_TPC_ADAPT_REQ: + HEXDUMP("11h: TPC REQUEST Rsp:", (t_u8 *) resp, + (t_u32) resp->size); + memcpy(priv->adapter, priv->adapter->curr_cmd->pdata_buf, + &resp->params.tpc_req, + sizeof(HostCmd_DS_802_11_TPC_ADAPT_REQ)); + break; + + case HostCmd_CMD_802_11_TPC_INFO: + HEXDUMP("11h: TPC INFO Rsp Data:", (t_u8 *) resp, + (t_u32) resp->size); + break; + + case HostCmd_CMD_802_11_CHAN_SW_ANN: + PRINTM(MINFO, "11h: Ret ChSwAnn: Sz=%u, Seq=%u, Ret=%u\n", + resp->size, resp->seq_num, resp->result); + break; + + case HostCmd_CMD_CHAN_REPORT_REQUEST: + PRINTM(MINFO, + "11h: Ret ChanRptReq. Set dfs_check_pending and wait" + " for EVENT_CHANNEL_REPORT.\n"); + priv->adapter->state_dfs.dfs_check_pending = MTRUE; + break; + + default: + ret = MLAN_STATUS_FAILURE; + } + + LEAVE(); + return ret; } /** @@ -2399,95 +2525,94 @@ wlan_11h_cmdresp_process(mlan_private * priv, const HostCmd_DS_COMMAND * resp) */ mlan_status wlan_11h_process_bss_elem(mlan_adapter * pmadapter, - wlan_11h_bss_info_t * p11h_bss_info, - const t_u8 * pelement) + wlan_11h_bss_info_t * p11h_bss_info, + const t_u8 * pelement) { - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u8 element_len = *((t_u8 *) pelement + 1); - - ENTER(); - switch (*pelement) { - case POWER_CONSTRAINT: - PRINTM(MINFO, "11h: Power Constraint IE Found\n"); - p11h_bss_info->sensed_11h = MTRUE; - memcpy(pmadapter, &p11h_bss_info->power_constraint, pelement, - MIN((element_len + sizeof(IEEEtypes_Header_t)), - sizeof(IEEEtypes_PowerConstraint_t))); - p11h_bss_info->power_constraint.len = - MIN(element_len, (sizeof(IEEEtypes_PowerConstraint_t) - - sizeof(IEEEtypes_Header_t))); - break; - - case POWER_CAPABILITY: - PRINTM(MINFO, "11h: Power Capability IE Found\n"); - p11h_bss_info->sensed_11h = MTRUE; - memcpy(pmadapter, &p11h_bss_info->power_capability, pelement, - MIN((element_len + sizeof(IEEEtypes_Header_t)), - sizeof(IEEEtypes_PowerCapability_t))); - p11h_bss_info->power_capability.len = - MIN(element_len, (sizeof(IEEEtypes_PowerCapability_t) - - sizeof(IEEEtypes_Header_t))); - break; - - case TPC_REPORT: - PRINTM(MINFO, "11h: Tpc Report IE Found\n"); - p11h_bss_info->sensed_11h = MTRUE; - memcpy(pmadapter, &p11h_bss_info->tpc_report, pelement, - MIN((element_len + sizeof(IEEEtypes_Header_t)), - sizeof(IEEEtypes_TPCReport_t))); - p11h_bss_info->tpc_report.len = - MIN(element_len, (sizeof(IEEEtypes_TPCReport_t) - - sizeof(IEEEtypes_Header_t))); - break; - - case CHANNEL_SWITCH_ANN: - PRINTM(MINFO, "11h: Channel Switch Ann IE Found\n"); - p11h_bss_info->sensed_11h = MTRUE; - memcpy(pmadapter, &p11h_bss_info->chan_switch_ann, pelement, - MIN((element_len + sizeof(IEEEtypes_Header_t)), - sizeof(IEEEtypes_ChanSwitchAnn_t))); - p11h_bss_info->chan_switch_ann.len = - MIN(element_len, (sizeof(IEEEtypes_ChanSwitchAnn_t) - - sizeof(IEEEtypes_Header_t))); - break; - - case QUIET: - PRINTM(MINFO, "11h: Quiet IE Found\n"); - p11h_bss_info->sensed_11h = MTRUE; - memcpy(pmadapter, &p11h_bss_info->quiet, pelement, - MIN((element_len + sizeof(IEEEtypes_Header_t)), - sizeof(IEEEtypes_Quiet_t))); - p11h_bss_info->quiet.len = MIN(element_len, (sizeof(IEEEtypes_Quiet_t) - - - sizeof - (IEEEtypes_Header_t))); - break; - - case IBSS_DFS: - PRINTM(MINFO, "11h: Ibss Dfs IE Found\n"); - p11h_bss_info->sensed_11h = MTRUE; - memcpy(pmadapter, &p11h_bss_info->ibss_dfs, pelement, - MIN((element_len + sizeof(IEEEtypes_Header_t)), - sizeof(IEEEtypes_IBSS_DFS_t))); - p11h_bss_info->ibss_dfs.len = - MIN(element_len, (sizeof(IEEEtypes_IBSS_DFS_t) - - sizeof(IEEEtypes_Header_t))); - break; - - case SUPPORTED_CHANNELS: - case TPC_REQUEST: - /* - * These elements are not in beacons/probe responses. Included here - * to cover set of enumerated 11h elements. - */ - break; - - default: - ret = MLAN_STATUS_FAILURE; - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u8 element_len = *((t_u8 *) pelement + 1); + + ENTER(); + switch (*pelement) { + case POWER_CONSTRAINT: + PRINTM(MINFO, "11h: Power Constraint IE Found\n"); + p11h_bss_info->sensed_11h = MTRUE; + memcpy(pmadapter, &p11h_bss_info->power_constraint, pelement, + MIN((element_len + sizeof(IEEEtypes_Header_t)), + sizeof(IEEEtypes_PowerConstraint_t))); + p11h_bss_info->power_constraint.len = + MIN(element_len, (sizeof(IEEEtypes_PowerConstraint_t) + - sizeof(IEEEtypes_Header_t))); + break; + + case POWER_CAPABILITY: + PRINTM(MINFO, "11h: Power Capability IE Found\n"); + p11h_bss_info->sensed_11h = MTRUE; + memcpy(pmadapter, &p11h_bss_info->power_capability, pelement, + MIN((element_len + sizeof(IEEEtypes_Header_t)), + sizeof(IEEEtypes_PowerCapability_t))); + p11h_bss_info->power_capability.len = + MIN(element_len, (sizeof(IEEEtypes_PowerCapability_t) + - sizeof(IEEEtypes_Header_t))); + break; + + case TPC_REPORT: + PRINTM(MINFO, "11h: Tpc Report IE Found\n"); + p11h_bss_info->sensed_11h = MTRUE; + memcpy(pmadapter, &p11h_bss_info->tpc_report, pelement, + MIN((element_len + sizeof(IEEEtypes_Header_t)), + sizeof(IEEEtypes_TPCReport_t))); + p11h_bss_info->tpc_report.len = + MIN(element_len, (sizeof(IEEEtypes_TPCReport_t) + - sizeof(IEEEtypes_Header_t))); + break; + + case CHANNEL_SWITCH_ANN: + PRINTM(MINFO, "11h: Channel Switch Ann IE Found\n"); + p11h_bss_info->sensed_11h = MTRUE; + memcpy(pmadapter, &p11h_bss_info->chan_switch_ann, pelement, + MIN((element_len + sizeof(IEEEtypes_Header_t)), + sizeof(IEEEtypes_ChanSwitchAnn_t))); + p11h_bss_info->chan_switch_ann.len = + MIN(element_len, (sizeof(IEEEtypes_ChanSwitchAnn_t) + - sizeof(IEEEtypes_Header_t))); + break; + + case QUIET: + PRINTM(MINFO, "11h: Quiet IE Found\n"); + p11h_bss_info->sensed_11h = MTRUE; + memcpy(pmadapter, &p11h_bss_info->quiet, pelement, + MIN((element_len + sizeof(IEEEtypes_Header_t)), + sizeof(IEEEtypes_Quiet_t))); + p11h_bss_info->quiet.len = + MIN(element_len, (sizeof(IEEEtypes_Quiet_t) + - sizeof(IEEEtypes_Header_t))); + break; + + case IBSS_DFS: + PRINTM(MINFO, "11h: Ibss Dfs IE Found\n"); + p11h_bss_info->sensed_11h = MTRUE; + memcpy(pmadapter, &p11h_bss_info->ibss_dfs, pelement, + MIN((element_len + sizeof(IEEEtypes_Header_t)), + sizeof(IEEEtypes_IBSS_DFS_t))); + p11h_bss_info->ibss_dfs.len = + MIN(element_len, (sizeof(IEEEtypes_IBSS_DFS_t) + - sizeof(IEEEtypes_Header_t))); + break; + + case SUPPORTED_CHANNELS: + case TPC_REQUEST: + /* + * These elements are not in beacons/probe responses. Included here + * to cover set of enumerated 11h elements. + */ + break; + + default: + ret = MLAN_STATUS_FAILURE; + } + + LEAVE(); + return ret; } /** @@ -2500,47 +2625,50 @@ wlan_11h_process_bss_elem(mlan_adapter * pmadapter, mlan_status wlan_11h_handle_event_chanswann(mlan_private * priv) { - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u32 sec, usec; - - ENTER(); - priv->adapter->state_11h.recvd_chanswann_event = MTRUE; - - /* unlikely: clean up previous csa if still on-going */ - if (priv->intf_state_11h.dfs_slave_csa_chan) { - wlan_set_chan_blacklist(priv, BAND_A, - priv->intf_state_11h.dfs_slave_csa_chan, - MFALSE); - } - - /* record channel and time of occurence */ - priv->intf_state_11h.dfs_slave_csa_chan = - priv->curr_bss_params.bss_descriptor.channel; - priv->adapter->callbacks.moal_get_system_time(priv->adapter->pmoal_handle, - &sec, &usec); - priv->intf_state_11h.dfs_slave_csa_expire_at_sec = sec + DFS_CHAN_MOVE_TIME; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u32 sec, usec; + + ENTER(); + priv->adapter->state_11h.recvd_chanswann_event = MTRUE; + + /* unlikely: clean up previous csa if still on-going */ + if (priv->intf_state_11h.dfs_slave_csa_chan) { + wlan_set_chan_blacklist(priv, BAND_A, + priv->intf_state_11h.dfs_slave_csa_chan, + MFALSE); + } + + /* record channel and time of occurence */ + priv->intf_state_11h.dfs_slave_csa_chan = + priv->curr_bss_params.bss_descriptor.channel; + priv->adapter->callbacks.moal_get_system_time(priv->adapter-> + pmoal_handle, &sec, + &usec); + priv->intf_state_11h.dfs_slave_csa_expire_at_sec = + sec + DFS_CHAN_MOVE_TIME; #ifdef STA_SUPPORT - /* do directed deauth. recvd_chanswann_event flag will cause different - reason code */ - PRINTM(MINFO, "11h: handle_event_chanswann() - sending deauth\n"); - ret = wlan_disconnect(priv, MNULL, - &priv->curr_bss_params.bss_descriptor.mac_address); - - /* clear region table so next scan will be all passive */ - PRINTM(MINFO, "11h: handle_event_chanswann() - clear region table\n"); - wlan_11d_clear_parsedtable(priv); - - /* add channel to blacklist table */ - PRINTM(MINFO, - "11h: handle_event_chanswann() - scan blacklist csa channel\n"); - wlan_set_chan_blacklist(priv, BAND_A, - priv->intf_state_11h.dfs_slave_csa_chan, MTRUE); + /* do directed deauth. recvd_chanswann_event flag will cause different + reason code */ + PRINTM(MINFO, "11h: handle_event_chanswann() - sending deauth\n"); + ret = wlan_disconnect(priv, MNULL, + &priv->curr_bss_params.bss_descriptor. + mac_address); + + /* clear region table so next scan will be all passive */ + PRINTM(MINFO, "11h: handle_event_chanswann() - clear region table\n"); + wlan_11d_clear_parsedtable(priv); + + /* add channel to blacklist table */ + PRINTM(MINFO, + "11h: handle_event_chanswann() - scan blacklist csa channel\n"); + wlan_set_chan_blacklist(priv, BAND_A, + priv->intf_state_11h.dfs_slave_csa_chan, MTRUE); #endif - priv->adapter->state_11h.recvd_chanswann_event = MFALSE; - LEAVE(); - return ret; + priv->adapter->state_11h.recvd_chanswann_event = MFALSE; + LEAVE(); + return ret; } #ifdef DFS_TESTING_SUPPORT @@ -2555,36 +2683,40 @@ wlan_11h_handle_event_chanswann(mlan_private * priv) mlan_status wlan_11h_ioctl_dfs_testing(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) { - mlan_ds_11h_cfg *ds_11hcfg = MNULL; - mlan_ds_11h_dfs_testing *dfs_test = MNULL; - wlan_dfs_testing_settings_t *pdfs_test_params = MNULL; - - ENTER(); - - ds_11hcfg = (mlan_ds_11h_cfg *) pioctl_req->pbuf; - dfs_test = &ds_11hcfg->param.dfs_testing; - pdfs_test_params = &pmadapter->dfs_test_params; - - if (pioctl_req->action == MLAN_ACT_GET) { - dfs_test->usr_cac_period_msec = pdfs_test_params->user_cac_period_msec; - dfs_test->usr_nop_period_sec = pdfs_test_params->user_nop_period_sec; - dfs_test->usr_no_chan_change = - pdfs_test_params->no_channel_change_on_radar; - dfs_test->usr_fixed_new_chan = - pdfs_test_params->fixed_new_channel_on_radar; - } else { - pdfs_test_params->user_cac_period_msec = dfs_test->usr_cac_period_msec; - pdfs_test_params->user_nop_period_sec = dfs_test->usr_nop_period_sec; - pdfs_test_params->no_channel_change_on_radar = - dfs_test->usr_no_chan_change; - pdfs_test_params->fixed_new_channel_on_radar = - dfs_test->usr_fixed_new_chan; - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_11h_cfg *ds_11hcfg = MNULL; + mlan_ds_11h_dfs_testing *dfs_test = MNULL; + wlan_dfs_testing_settings_t *pdfs_test_params = MNULL; + + ENTER(); + + ds_11hcfg = (mlan_ds_11h_cfg *) pioctl_req->pbuf; + dfs_test = &ds_11hcfg->param.dfs_testing; + pdfs_test_params = &pmadapter->dfs_test_params; + + if (pioctl_req->action == MLAN_ACT_GET) { + dfs_test->usr_cac_period_msec = + pdfs_test_params->user_cac_period_msec; + dfs_test->usr_nop_period_sec = + pdfs_test_params->user_nop_period_sec; + dfs_test->usr_no_chan_change = + pdfs_test_params->no_channel_change_on_radar; + dfs_test->usr_fixed_new_chan = + pdfs_test_params->fixed_new_channel_on_radar; + } else { + pdfs_test_params->user_cac_period_msec = + dfs_test->usr_cac_period_msec; + pdfs_test_params->user_nop_period_sec = + dfs_test->usr_nop_period_sec; + pdfs_test_params->no_channel_change_on_radar = + dfs_test->usr_no_chan_change; + pdfs_test_params->fixed_new_channel_on_radar = + dfs_test->usr_fixed_new_chan; + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -#endif // DFS_TESTING_SUPPORT +#endif /* DFS_TESTING_SUPPORT */ /** * @brief Check if channel is under NOP (Non-Occupancy Period) @@ -2598,43 +2730,47 @@ wlan_11h_ioctl_dfs_testing(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) t_bool wlan_11h_is_channel_under_nop(mlan_adapter * pmadapter, t_u8 channel) { - wlan_dfs_timestamp_t *pdfs_ts = MNULL; - t_u32 now_sec, now_usec; - t_bool ret = MFALSE; - - ENTER(); - pdfs_ts = wlan_11h_find_dfs_timestamp(pmadapter, channel); - - if (pdfs_ts && (pdfs_ts->channel == channel) - && (pdfs_ts->represents == DFS_TS_REPR_NOP_START)) { - /* found NOP_start timestamp entry on channel */ - pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, - &now_sec, &now_usec); + wlan_dfs_timestamp_t *pdfs_ts = MNULL; + t_u32 now_sec, now_usec; + t_bool ret = MFALSE; + + ENTER(); + pdfs_ts = wlan_11h_find_dfs_timestamp(pmadapter, channel); + + if (pdfs_ts && (pdfs_ts->channel == channel) + && (pdfs_ts->represents == DFS_TS_REPR_NOP_START)) { + /* found NOP_start timestamp entry on channel */ + pmadapter->callbacks.moal_get_system_time(pmadapter-> + pmoal_handle, + &now_sec, &now_usec); #ifdef DFS_TESTING_SUPPORT - if (pmadapter->dfs_test_params.user_nop_period_sec) { - PRINTM(MCMD_D, "dfs_testing - user NOP period=%d (sec)\n", - pmadapter->dfs_test_params.user_nop_period_sec); - if ((now_sec - pdfs_ts->ts_sec) <= - pmadapter->dfs_test_params.user_nop_period_sec) { - ret = MTRUE; - } - } else + if (pmadapter->dfs_test_params.user_nop_period_sec) { + PRINTM(MCMD_D, + "dfs_testing - user NOP period=%d (sec)\n", + pmadapter->dfs_test_params.user_nop_period_sec); + if ((now_sec - pdfs_ts->ts_sec) <= + pmadapter->dfs_test_params.user_nop_period_sec) { + ret = MTRUE; + } + } else #endif - { - if ((now_sec - pdfs_ts->ts_sec) <= WLAN_11H_NON_OCCUPANCY_PERIOD) - ret = MTRUE; - } - - /* if entry is expired, remove it */ - if (!ret) - wlan_11h_remove_dfs_timestamp(pmadapter, pdfs_ts); - else - PRINTM(MMSG, "11h: channel %d is under NOP - can't use.\n", - channel); - } - - LEAVE(); - return ret; + { + if ((now_sec - pdfs_ts->ts_sec) <= + WLAN_11H_NON_OCCUPANCY_PERIOD) + ret = MTRUE; + } + + /* if entry is expired, remove it */ + if (!ret) + wlan_11h_remove_dfs_timestamp(pmadapter, pdfs_ts); + else + PRINTM(MMSG, + "11h: channel %d is under NOP - can't use.\n", + channel); + } + + LEAVE(); + return ret; } /** @@ -2649,65 +2785,72 @@ wlan_11h_is_channel_under_nop(mlan_adapter * pmadapter, t_u8 channel) mlan_status wlan_11h_handle_event_chanrpt_ready(mlan_private * priv, mlan_event * pevent) { - mlan_status ret = MLAN_STATUS_SUCCESS; - HostCmd_DS_CHAN_RPT_RSP *pChanRptRsp; - MrvlIEtypes_Data_t *pTlv; - MeasRptBasicMap_t *pMeasRptBasic; - t_u8 *pBuffer; - t_s32 evtLen; - t_u16 tlvLen; - t_u32 sec, uSec; - wlan_dfs_device_state_t *pstate_dfs = &priv->adapter->state_dfs; - - ENTER(); - pChanRptRsp = (HostCmd_DS_CHAN_RPT_RSP *) & pevent->event_buf; - DBG_HEXDUMP(MCMD_D, "11h: Event ChanRptReady (HostCmd_DS_CHAN_RPT_RSP)", - (t_u8 *) pChanRptRsp, wlan_le32_to_cpu(pevent->event_len)); - - if (wlan_le32_to_cpu(pChanRptRsp->cmd_result) == MLAN_CMD_RESULT_SUCCESS) { - pBuffer = (t_u8 *) & pChanRptRsp->tlv_buffer; - evtLen = wlan_le32_to_cpu(pevent->event_len); - evtLen -= - sizeof(HostCmd_DS_CHAN_RPT_RSP) - sizeof(pChanRptRsp->tlv_buffer); - - while (evtLen >= sizeof(MrvlIEtypesHeader_t)) { - pTlv = (MrvlIEtypes_Data_t *) pBuffer; - tlvLen = wlan_le16_to_cpu(pTlv->header.len); - - switch (wlan_le16_to_cpu(pTlv->header.type)) { - case TLV_TYPE_CHANRPT_11H_BASIC: - pMeasRptBasic = (MeasRptBasicMap_t *) & pTlv->data; - if (pMeasRptBasic->radar) { - pstate_dfs->dfs_radar_found = MTRUE; - PRINTM(MMSG, "RADAR Detected on channel %d!\n", - pstate_dfs->dfs_check_channel); - /* add channel to NOP list */ - wlan_11h_add_dfs_timestamp(priv->adapter, - DFS_TS_REPR_NOP_START, - pstate_dfs->dfs_check_channel); - } - break; - - default: - break; - } - - pBuffer += (tlvLen + sizeof(pTlv->header)); - evtLen -= (tlvLen + sizeof(pTlv->header)); - evtLen = (evtLen > 0) ? evtLen : 0; - } - } else { - ret = MLAN_STATUS_FAILURE; - } - - /* Update DFS structure. */ - priv->adapter->callbacks.moal_get_system_time(priv->adapter->pmoal_handle, - &sec, &uSec); - pstate_dfs->dfs_report_time_sec = sec; - pstate_dfs->dfs_check_pending = MFALSE; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + HostCmd_DS_CHAN_RPT_RSP *pChanRptRsp; + MrvlIEtypes_Data_t *pTlv; + MeasRptBasicMap_t *pMeasRptBasic; + t_u8 *pBuffer; + t_s32 evtLen; + t_u16 tlvLen; + t_u32 sec, uSec; + wlan_dfs_device_state_t *pstate_dfs = &priv->adapter->state_dfs; + + ENTER(); + pChanRptRsp = (HostCmd_DS_CHAN_RPT_RSP *) & pevent->event_buf; + DBG_HEXDUMP(MCMD_D, "11h: Event ChanRptReady (HostCmd_DS_CHAN_RPT_RSP)", + (t_u8 *) pChanRptRsp, wlan_le32_to_cpu(pevent->event_len)); + + if (wlan_le32_to_cpu(pChanRptRsp->cmd_result) == + MLAN_CMD_RESULT_SUCCESS) { + pBuffer = (t_u8 *) & pChanRptRsp->tlv_buffer; + evtLen = wlan_le32_to_cpu(pevent->event_len); + evtLen -= + sizeof(HostCmd_DS_CHAN_RPT_RSP) - + sizeof(pChanRptRsp->tlv_buffer); + + while (evtLen >= sizeof(MrvlIEtypesHeader_t)) { + pTlv = (MrvlIEtypes_Data_t *) pBuffer; + tlvLen = wlan_le16_to_cpu(pTlv->header.len); + + switch (wlan_le16_to_cpu(pTlv->header.type)) { + case TLV_TYPE_CHANRPT_11H_BASIC: + pMeasRptBasic = + (MeasRptBasicMap_t *) & pTlv->data; + if (pMeasRptBasic->radar) { + pstate_dfs->dfs_radar_found = MTRUE; + PRINTM(MMSG, + "RADAR Detected on channel %d!\n", + pstate_dfs->dfs_check_channel); + /* add channel to NOP list */ + wlan_11h_add_dfs_timestamp(priv-> + adapter, + DFS_TS_REPR_NOP_START, + pstate_dfs-> + dfs_check_channel); + } + break; + + default: + break; + } + + pBuffer += (tlvLen + sizeof(pTlv->header)); + evtLen -= (tlvLen + sizeof(pTlv->header)); + evtLen = (evtLen > 0) ? evtLen : 0; + } + } else { + ret = MLAN_STATUS_FAILURE; + } + + /* Update DFS structure. */ + priv->adapter->callbacks.moal_get_system_time(priv->adapter-> + pmoal_handle, &sec, + &uSec); + pstate_dfs->dfs_report_time_sec = sec; + pstate_dfs->dfs_check_pending = MFALSE; + + LEAVE(); + return ret; } /** @@ -2720,13 +2863,13 @@ wlan_11h_handle_event_chanrpt_ready(mlan_private * priv, mlan_event * pevent) t_bool wlan_11h_radar_detected_tx_blocked(mlan_adapter * pmadapter) { - switch (pmadapter->state_rdh.stage) { - case RDH_OFF: - case RDH_CHK_INTFS: - case RDH_STOP_TRAFFIC: - return MFALSE; - } - return MTRUE; + switch (pmadapter->state_rdh.stage) { + case RDH_OFF: + case RDH_CHK_INTFS: + case RDH_STOP_TRAFFIC: + return MFALSE; + } + return MTRUE; } /** @@ -2739,11 +2882,12 @@ wlan_11h_radar_detected_tx_blocked(mlan_adapter * pmadapter) mlan_status wlan_11h_radar_detected_callback(t_void * priv) { - mlan_status ret; - ENTER(); - ret = wlan_11h_radar_detected_handling(((mlan_private *) (priv))->adapter); - LEAVE(); - return ret; + mlan_status ret; + ENTER(); + ret = wlan_11h_radar_detected_handling(((mlan_private *) (priv))-> + adapter); + LEAVE(); + return ret; } /** @@ -2757,499 +2901,583 @@ mlan_status wlan_11h_radar_detected_handling(mlan_adapter * pmadapter) { #ifdef DEBUG_LEVEL1 - const char *RDH_stage_str[] = { - "RDH_OFF", - "RDH_CHK_INTFS", - "RDH_STOP_TRAFFIC", - "RDH_GET_INFO_CHANNEL", - "RDH_GET_INFO_BEACON_DTIM", - "RDH_SET_CUSTOM_IE", - "RDH_REM_CUSTOM_IE", - "RDH_STOP_INTFS", - "RDH_SET_NEW_CHANNEL", - "RDH_RESTART_INTFS", - "RDH_RESTART_TRAFFIC" - }; + const char *RDH_stage_str[] = { + "RDH_OFF", + "RDH_CHK_INTFS", + "RDH_STOP_TRAFFIC", + "RDH_GET_INFO_CHANNEL", + "RDH_GET_INFO_BEACON_DTIM", + "RDH_SET_CUSTOM_IE", + "RDH_REM_CUSTOM_IE", + "RDH_STOP_INTFS", + "RDH_SET_NEW_CHANNEL", + "RDH_RESTART_INTFS", + "RDH_RESTART_TRAFFIC" + }; #endif - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = MNULL; - t_u32 i; - wlan_radar_det_hndlg_state_t *pstate_rdh = &pmadapter->state_rdh; - - ENTER(); - - switch (pstate_rdh->stage) { - case RDH_CHK_INTFS: - PRINTM(MCMD_D, "%s(): stage(%d)=%s\n", - __FUNCTION__, pstate_rdh->stage, - RDH_stage_str[pstate_rdh->stage]); - - /* get active interfaces */ - memset(pmadapter, pstate_rdh->priv_list, 0x00, - sizeof(pstate_rdh->priv_list)); - pstate_rdh->priv_list_count = wlan_get_privs_by_cond(pmadapter, - wlan_is_intf_active, - pstate_rdh-> - priv_list); - PRINTM(MCMD_D, "%s(): priv_list_count = %d\n", __FUNCTION__, - pstate_rdh->priv_list_count); - for (i = 0; i < pstate_rdh->priv_list_count; i++) - PRINTM(MINFO, "%s(): priv_list[%d] = %p\n", - __FUNCTION__, i, pstate_rdh->priv_list[i]); - - if (pstate_rdh->priv_list_count == 0) { - /* no interfaces active... nothing to do */ - PRINTM(MMSG, "11h: Radar Detected - no active priv's," - " skip event handling.\n"); - pstate_rdh->stage = RDH_OFF; - PRINTM(MCMD_D, "%s(): finished - stage(%d)=%s\n", - __FUNCTION__, pstate_rdh->stage, - RDH_stage_str[pstate_rdh->stage]); - break; // EXIT CASE - } - // else: start handling - pstate_rdh->curr_channel = 0; - pstate_rdh->new_channel = 0; - pstate_rdh->uap_band_cfg = 0; - pstate_rdh->max_bcn_dtim_ms = 0; - pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; - pstate_rdh->stage = RDH_STOP_TRAFFIC; - // FALL THROUGH TO NEXT STAGE - - case RDH_STOP_TRAFFIC: - PRINTM(MCMD_D, "%s(): stage(%d)=%s\n", - __FUNCTION__, pstate_rdh->stage, - RDH_stage_str[pstate_rdh->stage]); - - PRINTM(MMSG, "11h: Radar Detected - stopping host tx traffic.\n"); - for (i = 0; i < pstate_rdh->priv_list_count; i++) { - wlan_11h_tx_disable(pstate_rdh->priv_list[i]); - } - - pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; - pstate_rdh->stage = RDH_GET_INFO_CHANNEL; - // FALL THROUGH TO NEXT STAGE - - case RDH_GET_INFO_CHANNEL: - PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", - __FUNCTION__, pstate_rdh->stage, - RDH_stage_str[pstate_rdh->stage], pstate_rdh->priv_curr_idx); - - /* here, prefer STA info over UAP info - one less CMD to send */ - if (pstate_rdh->priv_curr_idx == RDH_STAGE_FIRST_ENTRY_PRIV_IDX) { - if (wlan_only_uap_priv_in_list(pstate_rdh->priv_list, - pstate_rdh->priv_list_count)) { + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = MNULL; + t_u32 i; + wlan_radar_det_hndlg_state_t *pstate_rdh = &pmadapter->state_rdh; + + ENTER(); + + switch (pstate_rdh->stage) { + case RDH_CHK_INTFS: + PRINTM(MCMD_D, "%s(): stage(%d)=%s\n", + __FUNCTION__, pstate_rdh->stage, + RDH_stage_str[pstate_rdh->stage]); + + /* get active interfaces */ + memset(pmadapter, pstate_rdh->priv_list, 0x00, + sizeof(pstate_rdh->priv_list)); + pstate_rdh->priv_list_count = wlan_get_privs_by_cond(pmadapter, + wlan_is_intf_active, + pstate_rdh-> + priv_list); + PRINTM(MCMD_D, "%s(): priv_list_count = %d\n", __FUNCTION__, + pstate_rdh->priv_list_count); + for (i = 0; i < pstate_rdh->priv_list_count; i++) + PRINTM(MINFO, "%s(): priv_list[%d] = %p\n", + __FUNCTION__, i, pstate_rdh->priv_list[i]); + + if (pstate_rdh->priv_list_count == 0) { + /* no interfaces active... nothing to do */ + PRINTM(MMSG, "11h: Radar Detected - no active priv's," + " skip event handling.\n"); + pstate_rdh->stage = RDH_OFF; + PRINTM(MCMD_D, "%s(): finished - stage(%d)=%s\n", + __FUNCTION__, pstate_rdh->stage, + RDH_stage_str[pstate_rdh->stage]); + break; /* EXIT CASE */ + } + /* else: start handling */ + pstate_rdh->curr_channel = 0; + pstate_rdh->new_channel = 0; + pstate_rdh->uap_band_cfg = 0; + pstate_rdh->max_bcn_dtim_ms = 0; + pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; + pstate_rdh->stage = RDH_STOP_TRAFFIC; + /* FALL THROUGH TO NEXT STAGE */ + + case RDH_STOP_TRAFFIC: + PRINTM(MCMD_D, "%s(): stage(%d)=%s\n", + __FUNCTION__, pstate_rdh->stage, + RDH_stage_str[pstate_rdh->stage]); + + PRINTM(MMSG, + "11h: Radar Detected - stopping host tx traffic.\n"); + for (i = 0; i < pstate_rdh->priv_list_count; i++) { + wlan_11h_tx_disable(pstate_rdh->priv_list[i]); + } + + pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; + pstate_rdh->stage = RDH_GET_INFO_CHANNEL; + /* FALL THROUGH TO NEXT STAGE */ + + case RDH_GET_INFO_CHANNEL: + PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", + __FUNCTION__, pstate_rdh->stage, + RDH_stage_str[pstate_rdh->stage], + pstate_rdh->priv_curr_idx); + + /* here, prefer STA info over UAP info - one less CMD to send */ + if (pstate_rdh->priv_curr_idx == RDH_STAGE_FIRST_ENTRY_PRIV_IDX) { + if (wlan_only_uap_priv_in_list(pstate_rdh->priv_list, + pstate_rdh-> + priv_list_count)) { #ifdef UAP_SUPPORT - /* Assume all UAPs on same channel, use first UAP */ - pmpriv = pstate_rdh->priv_list[0]; - pstate_rdh->priv_curr_idx = 0; - /* send cmd to get first UAP's info */ - pmpriv->uap_state_chan_cb.pioctl_req_curr = MNULL; - pmpriv->uap_state_chan_cb.get_chan_callback - = wlan_11h_radar_detected_callback; - ret = wlan_uap_get_channel(pmpriv); - break; // EXIT CASE + /* Assume all UAPs on same channel, use first + UAP */ + pmpriv = pstate_rdh->priv_list[0]; + pstate_rdh->priv_curr_idx = 0; + /* send cmd to get first UAP's info */ + pmpriv->uap_state_chan_cb.pioctl_req_curr = + MNULL; + pmpriv->uap_state_chan_cb.get_chan_callback = + wlan_11h_radar_detected_callback; + ret = wlan_uap_get_channel(pmpriv); + break; /* EXIT CASE */ #endif - } else { - /* Assume all STAs on same channel, find first STA */ - MASSERT(pstate_rdh->priv_list_count > 0); - for (i = 0; i < pstate_rdh->priv_list_count; i++) { - pmpriv = pstate_rdh->priv_list[i]; - if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) - break; - } - /* STA info kept in driver, just copy */ - pstate_rdh->curr_channel = - pmpriv->curr_bss_params.bss_descriptor.channel; - } - } + } else { + /* Assume all STAs on same channel, find first + STA */ + MASSERT(pstate_rdh->priv_list_count > 0); + for (i = 0; i < pstate_rdh->priv_list_count; + i++) { + pmpriv = pstate_rdh->priv_list[i]; + if (GET_BSS_ROLE(pmpriv) == + MLAN_BSS_ROLE_STA) + break; + } + /* STA info kept in driver, just copy */ + pstate_rdh->curr_channel = + pmpriv->curr_bss_params.bss_descriptor. + channel; + } + } #ifdef UAP_SUPPORT - else if (pstate_rdh->priv_curr_idx < pstate_rdh->priv_list_count) { - /* repeat entry: UAP return with info */ - pmpriv = pstate_rdh->priv_list[pstate_rdh->priv_curr_idx]; - pstate_rdh->curr_channel = pmpriv->uap_state_chan_cb.channel; - pstate_rdh->uap_band_cfg = pmpriv->uap_state_chan_cb.band_config; - PRINTM(MCMD_D, "%s(): uap_band_cfg=0x%02x\n", - __FUNCTION__, pstate_rdh->uap_band_cfg); - } + else if (pstate_rdh->priv_curr_idx < + pstate_rdh->priv_list_count) { + /* repeat entry: UAP return with info */ + pmpriv = pstate_rdh->priv_list[pstate_rdh-> + priv_curr_idx]; + pstate_rdh->curr_channel = + pmpriv->uap_state_chan_cb.channel; + pstate_rdh->uap_band_cfg = + pmpriv->uap_state_chan_cb.band_config; + PRINTM(MCMD_D, "%s(): uap_band_cfg=0x%02x\n", + __FUNCTION__, pstate_rdh->uap_band_cfg); + } #endif - /* add channel to NOP list */ - wlan_11h_add_dfs_timestamp(pmadapter, DFS_TS_REPR_NOP_START, - pstate_rdh->curr_channel); + /* add channel to NOP list */ + wlan_11h_add_dfs_timestamp(pmadapter, DFS_TS_REPR_NOP_START, + pstate_rdh->curr_channel); - /* choose new channel (!= curr channel) and move on */ - i = 0; - do { + /* choose new channel (!= curr channel) and move on */ + i = 0; + do { #ifdef UAP_SUPPORT - if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) - pstate_rdh->new_channel = wlan_11h_get_uap_start_channel(pmpriv, - pmpriv-> - uap_state_chan_cb. - band_config); - else + if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) + pstate_rdh->new_channel = + wlan_11h_get_uap_start_channel(pmpriv, + pmpriv-> + uap_state_chan_cb. + band_config); + else #endif - pstate_rdh->new_channel = - wlan_11h_get_adhoc_start_channel(pmpriv); - } while ((pstate_rdh->new_channel == pstate_rdh->curr_channel) && (++i < MAX_RANDOM_CHANNEL_RETRIES)); /* avoid - deadloop - */ - if (i >= MAX_RANDOM_CHANNEL_RETRIES) /* report error */ - PRINTM(MERROR, "%s(): ERROR - could not choose new_chan" - " (!= curr_chan) !!\n", __FUNCTION__); + pstate_rdh->new_channel = + wlan_11h_get_adhoc_start_channel + (pmpriv); + } while ((pstate_rdh->new_channel == pstate_rdh->curr_channel) && (++i < MAX_RANDOM_CHANNEL_RETRIES)); /* avoid + deadloop + */ + if (i >= MAX_RANDOM_CHANNEL_RETRIES) /* report error */ + PRINTM(MERROR, + "%s(): ERROR - could not choose new_chan" + " (!= curr_chan) !!\n", __FUNCTION__); #ifdef DFS_TESTING_SUPPORT - if (pmadapter->dfs_test_params.fixed_new_channel_on_radar) { - PRINTM(MCMD_D, "dfs_testing - user fixed new_chan=%d\n", - pmadapter->dfs_test_params.fixed_new_channel_on_radar); - pstate_rdh->new_channel = - pmadapter->dfs_test_params.fixed_new_channel_on_radar; - } + if (pmadapter->dfs_test_params.fixed_new_channel_on_radar) { + PRINTM(MCMD_D, "dfs_testing - user fixed new_chan=%d\n", + pmadapter->dfs_test_params. + fixed_new_channel_on_radar); + pstate_rdh->new_channel = + pmadapter->dfs_test_params. + fixed_new_channel_on_radar; + } #endif - PRINTM(MCMD_D, "%s(): curr_chan=%d, new_chan=%d\n", - __FUNCTION__, pstate_rdh->curr_channel, pstate_rdh->new_channel); + PRINTM(MCMD_D, "%s(): curr_chan=%d, new_chan=%d\n", + __FUNCTION__, pstate_rdh->curr_channel, + pstate_rdh->new_channel); - pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; - pstate_rdh->stage = RDH_GET_INFO_BEACON_DTIM; - // FALL THROUGH TO NEXT STAGE + pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; + pstate_rdh->stage = RDH_GET_INFO_BEACON_DTIM; + /* FALL THROUGH TO NEXT STAGE */ - case RDH_GET_INFO_BEACON_DTIM: - PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", - __FUNCTION__, pstate_rdh->stage, - RDH_stage_str[pstate_rdh->stage], pstate_rdh->priv_curr_idx); + case RDH_GET_INFO_BEACON_DTIM: + PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", + __FUNCTION__, pstate_rdh->stage, + RDH_stage_str[pstate_rdh->stage], + pstate_rdh->priv_curr_idx); #ifdef UAP_SUPPORT - /* check all intfs in this stage to find longest period */ - /* UAP intf callback returning with info */ - if (pstate_rdh->priv_curr_idx < pstate_rdh->priv_list_count) { - t_u16 bcn_dtim_msec; - pmpriv = pstate_rdh->priv_list[pstate_rdh->priv_curr_idx]; - PRINTM(MCMD_D, "%s(): uap.bcn_pd=%d, uap.dtim_pd=%d\n", - __FUNCTION__, pmpriv->uap_state_chan_cb.beacon_period, - pmpriv->uap_state_chan_cb.dtim_period); - bcn_dtim_msec = (pmpriv->uap_state_chan_cb.beacon_period - * pmpriv->uap_state_chan_cb.dtim_period); - if (bcn_dtim_msec > pstate_rdh->max_bcn_dtim_ms) - pstate_rdh->max_bcn_dtim_ms = bcn_dtim_msec; - } + /* check all intfs in this stage to find longest period */ + /* UAP intf callback returning with info */ + if (pstate_rdh->priv_curr_idx < pstate_rdh->priv_list_count) { + t_u16 bcn_dtim_msec; + pmpriv = pstate_rdh->priv_list[pstate_rdh-> + priv_curr_idx]; + PRINTM(MCMD_D, "%s(): uap.bcn_pd=%d, uap.dtim_pd=%d\n", + __FUNCTION__, + pmpriv->uap_state_chan_cb.beacon_period, + pmpriv->uap_state_chan_cb.dtim_period); + bcn_dtim_msec = + (pmpriv->uap_state_chan_cb.beacon_period * + pmpriv->uap_state_chan_cb.dtim_period); + if (bcn_dtim_msec > pstate_rdh->max_bcn_dtim_ms) + pstate_rdh->max_bcn_dtim_ms = bcn_dtim_msec; + } #endif - /* check next intf */ - while ((++pstate_rdh->priv_curr_idx) < pstate_rdh->priv_list_count) { - pmpriv = pstate_rdh->priv_list[pstate_rdh->priv_curr_idx]; + /* check next intf */ + while ((++pstate_rdh->priv_curr_idx) < + pstate_rdh->priv_list_count) { + pmpriv = pstate_rdh->priv_list[pstate_rdh-> + priv_curr_idx]; #ifdef UAP_SUPPORT - if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) { - pmpriv->uap_state_chan_cb.pioctl_req_curr = MNULL; - pmpriv->uap_state_chan_cb.get_chan_callback - = wlan_11h_radar_detected_callback; - ret = wlan_uap_get_beacon_dtim(pmpriv); - break; // leads to exit case - } else + if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) { + pmpriv->uap_state_chan_cb.pioctl_req_curr = + MNULL; + pmpriv->uap_state_chan_cb.get_chan_callback = + wlan_11h_radar_detected_callback; + ret = wlan_uap_get_beacon_dtim(pmpriv); + break; /* leads to exit case */ + } else #endif - { /* get STA info from driver and compare here */ - t_u16 bcn_pd_msec = 100; - t_u16 dtim_pd_msec = 1; - t_u16 bcn_dtim_msec; - - if (wlan_11h_is_dfs_master(pmpriv)) { /* adhoc creator */ - bcn_pd_msec = pmpriv->beacon_period; - } else { - bcn_pd_msec = - pmpriv->curr_bss_params.bss_descriptor.beacon_period; - // if (priv->bss_mode != MLAN_BSS_MODE_IBSS) - /* TODO: mlan_scan.c needs to parse TLV 0x05 (TIM) for - dtim_period */ - } - PRINTM(MCMD_D, "%s(): sta.bcn_pd=%d, sta.dtim_pd=%d\n", - __FUNCTION__, bcn_pd_msec, dtim_pd_msec); - bcn_dtim_msec = (bcn_pd_msec * dtim_pd_msec); - if (bcn_dtim_msec > pstate_rdh->max_bcn_dtim_ms) - pstate_rdh->max_bcn_dtim_ms = bcn_dtim_msec; - } - } - - if (pstate_rdh->priv_curr_idx < pstate_rdh->priv_list_count) - break; // EXIT CASE (for UAP) - // else - pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; - pstate_rdh->stage = RDH_SET_CUSTOM_IE; - // FALL THROUGH TO NEXT STAGE - - case RDH_SET_CUSTOM_IE: - PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", - __FUNCTION__, pstate_rdh->stage, - RDH_stage_str[pstate_rdh->stage], pstate_rdh->priv_curr_idx); - - /* add CHAN_SW IE - firmware will accept on any interface, and apply to - all */ - if (pstate_rdh->priv_curr_idx == RDH_STAGE_FIRST_ENTRY_PRIV_IDX) { - mlan_ioctl_req *pioctl_req = MNULL; - - ret = - wlan_11h_prepare_custom_ie_chansw(pmadapter, &pioctl_req, - MTRUE); - if ((ret != MLAN_STATUS_SUCCESS) || !pioctl_req) { - PRINTM(MERROR, "%s(): Error in preparng CHAN_SW IE.\n", - __FUNCTION__); - break; // EXIT CASE - } - - PRINTM(MMSG, - "11h: Radar Detected - adding CHAN_SW IE to interfaces.\n"); - pmpriv = pstate_rdh->priv_list[0]; - pstate_rdh->priv_curr_idx = 0; - pioctl_req->bss_index = pmpriv->bss_index; - ret = wlan_misc_ioctl_custom_ie_list(pmadapter, pioctl_req, MFALSE); - if (ret != MLAN_STATUS_SUCCESS && ret != MLAN_STATUS_PENDING) { - PRINTM(MERROR, - "%s(): Could not set IE for priv=%p [priv_bss_idx=%d]!\n", - __FUNCTION__, pmpriv, pmpriv->bss_index); - // TODO: how to handle this error case?? ignore & continue? - } - /* free ioctl buffer memory before we leave */ - pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, - (t_u8 *) pioctl_req); - break; // EXIT CASE - } - // else - pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; - pstate_rdh->stage = RDH_REM_CUSTOM_IE; - // FALL THROUGH TO NEXT STAGE - - case RDH_REM_CUSTOM_IE: - PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", - __FUNCTION__, pstate_rdh->stage, - RDH_stage_str[pstate_rdh->stage], pstate_rdh->priv_curr_idx); - - /* remove CHAN_SW IE - firmware will accept on any interface, and apply - to all */ - if (pstate_rdh->priv_curr_idx == RDH_STAGE_FIRST_ENTRY_PRIV_IDX) { - mlan_ioctl_req *pioctl_req = MNULL; - - /* first entry to this stage, do delay DFS requires a minimum of 5 - chances for clients to hear this IE. Use delay: 5 beacons <= - (BCN_DTIM_MSEC*5) <= 3 seconds). */ - t_u16 delay_ms = MAX(MIN_RDH_CHAN_SW_IE_PERIOD_MSEC, - MIN((5 * pstate_rdh->max_bcn_dtim_ms), - MAX_RDH_CHAN_SW_IE_PERIOD_MSEC)); - PRINTM(MMSG, "11h: Radar Detected - delay %d ms for FW to" - " broadcast CHAN_SW IE.\n", delay_ms); - wlan_mdelay(pmadapter, delay_ms); - PRINTM(MMSG, "11h: Radar Detected - delay over, removing" - " CHAN_SW IE from interfaces.\n"); - - ret = - wlan_11h_prepare_custom_ie_chansw(pmadapter, &pioctl_req, - MFALSE); - if ((ret != MLAN_STATUS_SUCCESS) || !pioctl_req) { - PRINTM(MERROR, "%s(): Error in preparng CHAN_SW IE.\n", - __FUNCTION__); - break; // EXIT CASE - } - - pmpriv = pstate_rdh->priv_list[0]; - pstate_rdh->priv_curr_idx = 0; - pioctl_req->bss_index = pmpriv->bss_index; - ret = wlan_misc_ioctl_custom_ie_list(pmadapter, pioctl_req, MFALSE); - if (ret != MLAN_STATUS_SUCCESS && ret != MLAN_STATUS_PENDING) { - PRINTM(MERROR, - "%s(): Could not set IE for priv=%p [priv_bss_idx=%d]!\n", - __FUNCTION__, pmpriv, pmpriv->bss_index); - // TODO: how to handle this error case?? ignore & continue? - } - /* free ioctl buffer memory before we leave */ - pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, - (t_u8 *) pioctl_req); - break; // EXIT CASE - } - // else - pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; - pstate_rdh->stage = RDH_STOP_INTFS; + { /* get STA info from driver and compare here */ + t_u16 bcn_pd_msec = 100; + t_u16 dtim_pd_msec = 1; + t_u16 bcn_dtim_msec; + + if (wlan_11h_is_dfs_master(pmpriv)) { /* adhoc + creator + */ + bcn_pd_msec = pmpriv->beacon_period; + } else { + bcn_pd_msec = + pmpriv->curr_bss_params. + bss_descriptor.beacon_period; + /* if (priv->bss_mode != + MLAN_BSS_MODE_IBSS) */ + /* TODO: mlan_scan.c needs to parse TLV + 0x05 (TIM) for dtim_period */ + } + PRINTM(MCMD_D, + "%s(): sta.bcn_pd=%d, sta.dtim_pd=%d\n", + __FUNCTION__, bcn_pd_msec, dtim_pd_msec); + bcn_dtim_msec = (bcn_pd_msec * dtim_pd_msec); + if (bcn_dtim_msec > pstate_rdh->max_bcn_dtim_ms) + pstate_rdh->max_bcn_dtim_ms = + bcn_dtim_msec; + } + } + + if (pstate_rdh->priv_curr_idx < pstate_rdh->priv_list_count) + break; /* EXIT CASE (for UAP) */ + /* else */ + pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; + pstate_rdh->stage = RDH_SET_CUSTOM_IE; + /* FALL THROUGH TO NEXT STAGE */ + + case RDH_SET_CUSTOM_IE: + PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", + __FUNCTION__, pstate_rdh->stage, + RDH_stage_str[pstate_rdh->stage], + pstate_rdh->priv_curr_idx); + + /* add CHAN_SW IE - firmware will accept on any interface, and + apply to all */ + if (pstate_rdh->priv_curr_idx == RDH_STAGE_FIRST_ENTRY_PRIV_IDX) { + mlan_ioctl_req *pioctl_req = MNULL; + + ret = wlan_11h_prepare_custom_ie_chansw(pmadapter, + &pioctl_req, + MTRUE); + if ((ret != MLAN_STATUS_SUCCESS) || !pioctl_req) { + PRINTM(MERROR, + "%s(): Error in preparng CHAN_SW IE.\n", + __FUNCTION__); + break; /* EXIT CASE */ + } + + PRINTM(MMSG, + "11h: Radar Detected - adding CHAN_SW IE to interfaces.\n"); + pmpriv = pstate_rdh->priv_list[0]; + pstate_rdh->priv_curr_idx = 0; + pioctl_req->bss_index = pmpriv->bss_index; + ret = wlan_misc_ioctl_custom_ie_list(pmadapter, + pioctl_req, + MFALSE); + if (ret != MLAN_STATUS_SUCCESS && + ret != MLAN_STATUS_PENDING) { + PRINTM(MERROR, + "%s(): Could not set IE for priv=%p [priv_bss_idx=%d]!\n", + __FUNCTION__, pmpriv, pmpriv->bss_index); + /* TODO: how to handle this error case?? ignore + & continue? */ + } + /* free ioctl buffer memory before we leave */ + pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pioctl_req); + break; /* EXIT CASE */ + } + /* else */ + pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; + pstate_rdh->stage = RDH_REM_CUSTOM_IE; + /* FALL THROUGH TO NEXT STAGE */ + + case RDH_REM_CUSTOM_IE: + PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", + __FUNCTION__, pstate_rdh->stage, + RDH_stage_str[pstate_rdh->stage], + pstate_rdh->priv_curr_idx); + + /* remove CHAN_SW IE - firmware will accept on any interface, + and apply to all */ + if (pstate_rdh->priv_curr_idx == RDH_STAGE_FIRST_ENTRY_PRIV_IDX) { + mlan_ioctl_req *pioctl_req = MNULL; + + /* first entry to this stage, do delay DFS requires a + minimum of 5 chances for clients to hear this IE. + Use delay: 5 beacons <= (BCN_DTIM_MSEC*5) <= 3 + seconds). */ + t_u16 delay_ms = MAX(MIN_RDH_CHAN_SW_IE_PERIOD_MSEC, + MIN((5 * + pstate_rdh->max_bcn_dtim_ms), + MAX_RDH_CHAN_SW_IE_PERIOD_MSEC)); + PRINTM(MMSG, + "11h: Radar Detected - delay %d ms for FW to" + " broadcast CHAN_SW IE.\n", delay_ms); + wlan_mdelay(pmadapter, delay_ms); + PRINTM(MMSG, + "11h: Radar Detected - delay over, removing" + " CHAN_SW IE from interfaces.\n"); + + ret = wlan_11h_prepare_custom_ie_chansw(pmadapter, + &pioctl_req, + MFALSE); + if ((ret != MLAN_STATUS_SUCCESS) || !pioctl_req) { + PRINTM(MERROR, + "%s(): Error in preparng CHAN_SW IE.\n", + __FUNCTION__); + break; /* EXIT CASE */ + } + + pmpriv = pstate_rdh->priv_list[0]; + pstate_rdh->priv_curr_idx = 0; + pioctl_req->bss_index = pmpriv->bss_index; + ret = wlan_misc_ioctl_custom_ie_list(pmadapter, + pioctl_req, + MFALSE); + if (ret != MLAN_STATUS_SUCCESS && + ret != MLAN_STATUS_PENDING) { + PRINTM(MERROR, + "%s(): Could not set IE for priv=%p [priv_bss_idx=%d]!\n", + __FUNCTION__, pmpriv, pmpriv->bss_index); + /* TODO: hiow to handle this error case?? + ignore & continue? */ + } + /* free ioctl buffer memory before we leave */ + pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pioctl_req); + break; /* EXIT CASE */ + } + /* else */ + pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; + pstate_rdh->stage = RDH_STOP_INTFS; #ifdef DFS_TESTING_SUPPORT - if (pmadapter->dfs_test_params.no_channel_change_on_radar) { - PRINTM(MCMD_D, "dfs_testing - no channel change on radar." - " Also skip stop/restart interface stages.\n", - pmadapter->dfs_test_params.no_channel_change_on_radar); - pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; - pstate_rdh->stage = RDH_RESTART_TRAFFIC; - goto rdh_restart_traffic; // skip several stages - } + if (pmadapter->dfs_test_params.no_channel_change_on_radar) { + PRINTM(MCMD_D, + "dfs_testing - no channel change on radar." + " Also skip stop/restart interface stages.\n", + pmadapter->dfs_test_params. + no_channel_change_on_radar); + pstate_rdh->priv_curr_idx = + RDH_STAGE_FIRST_ENTRY_PRIV_IDX; + pstate_rdh->stage = RDH_RESTART_TRAFFIC; + goto rdh_restart_traffic; /* skip several stages */ + } #endif - // FALL THROUGH TO NEXT STAGE - - case RDH_STOP_INTFS: - PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", - __FUNCTION__, pstate_rdh->stage, - RDH_stage_str[pstate_rdh->stage], pstate_rdh->priv_curr_idx); - - /* issues one cmd (DEAUTH/ADHOC_STOP/BSS_STOP) to each intf */ - while ((++pstate_rdh->priv_curr_idx) < pstate_rdh->priv_list_count) { - pmpriv = pstate_rdh->priv_list[pstate_rdh->priv_curr_idx]; + /* FALL THROUGH TO NEXT STAGE */ + + case RDH_STOP_INTFS: + PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", + __FUNCTION__, pstate_rdh->stage, + RDH_stage_str[pstate_rdh->stage], + pstate_rdh->priv_curr_idx); + + /* issues one cmd (DEAUTH/ADHOC_STOP/BSS_STOP) to each intf */ + while ((++pstate_rdh->priv_curr_idx) < + pstate_rdh->priv_list_count) { + pmpriv = pstate_rdh->priv_list[pstate_rdh-> + priv_curr_idx]; #ifdef UAP_SUPPORT - if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) { - ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_BSS_STOP, - HostCmd_ACT_GEN_SET, 0, MNULL, MNULL); - break; // leads to exit case - } + if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) { + ret = wlan_prepare_cmd(pmpriv, + HOST_CMD_APCMD_BSS_STOP, + HostCmd_ACT_GEN_SET, 0, + MNULL, MNULL); + break; /* leads to exit case */ + } #endif #ifdef STA_SUPPORT - if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) { - if (wlan_11h_is_dfs_master(pmpriv)) { - /* Save ad-hoc creator state before stop clears it */ - pmpriv->adhoc_state_prev = pmpriv->adhoc_state; - } - if (pmpriv->media_connected == MTRUE) { - wlan_disconnect(pmpriv, MNULL, MNULL); - break; // leads to exit case - } - } + if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) { + if (wlan_11h_is_dfs_master(pmpriv)) { + /* Save ad-hoc creator state before + stop clears it */ + pmpriv->adhoc_state_prev = + pmpriv->adhoc_state; + } + if (pmpriv->media_connected == MTRUE) { + wlan_disconnect(pmpriv, MNULL, MNULL); + break; /* leads to exit case */ + } + } #endif - } - - if (pstate_rdh->priv_curr_idx < pstate_rdh->priv_list_count || - ret == MLAN_STATUS_FAILURE) - break; // EXIT CASE - // else - pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; - pstate_rdh->stage = RDH_SET_NEW_CHANNEL; - // FALL THROUGH TO NEXT STAGE - - case RDH_SET_NEW_CHANNEL: - PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", - __FUNCTION__, pstate_rdh->stage, - RDH_stage_str[pstate_rdh->stage], pstate_rdh->priv_curr_idx); - - /* only set new channel for UAP intfs */ - while ((++pstate_rdh->priv_curr_idx) < pstate_rdh->priv_list_count) { - pmpriv = pstate_rdh->priv_list[pstate_rdh->priv_curr_idx]; + } + + if (pstate_rdh->priv_curr_idx < pstate_rdh->priv_list_count || + ret == MLAN_STATUS_FAILURE) + break; /* EXIT CASE */ + /* else */ + pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; + pstate_rdh->stage = RDH_SET_NEW_CHANNEL; + /* FALL THROUGH TO NEXT STAGE */ + + case RDH_SET_NEW_CHANNEL: + PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", + __FUNCTION__, pstate_rdh->stage, + RDH_stage_str[pstate_rdh->stage], + pstate_rdh->priv_curr_idx); + + /* only set new channel for UAP intfs */ + while ((++pstate_rdh->priv_curr_idx) < + pstate_rdh->priv_list_count) { + pmpriv = pstate_rdh->priv_list[pstate_rdh-> + priv_curr_idx]; #ifdef UAP_SUPPORT - if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) { - pmpriv->uap_state_chan_cb.pioctl_req_curr = MNULL; - pmpriv->uap_state_chan_cb.get_chan_callback - = wlan_11h_radar_detected_callback; - pstate_rdh->uap_band_cfg |= UAP_BAND_CONFIG_5GHZ; /* DFS - only - in - 5GHz - */ - ret = wlan_uap_set_channel(pmpriv, pstate_rdh->uap_band_cfg, - pstate_rdh->new_channel); - break; // leads to exit case - } + if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) { + pmpriv->uap_state_chan_cb.pioctl_req_curr = + MNULL; + pmpriv->uap_state_chan_cb.get_chan_callback = + wlan_11h_radar_detected_callback; + pstate_rdh->uap_band_cfg |= UAP_BAND_CONFIG_5GHZ; /* DFS + only + in + 5GHz + */ + ret = wlan_uap_set_channel(pmpriv, + pstate_rdh-> + uap_band_cfg, + pstate_rdh-> + new_channel); + break; /* leads to exit case */ + } #endif - } - - if (pstate_rdh->priv_curr_idx < pstate_rdh->priv_list_count || - ret == MLAN_STATUS_FAILURE) - break; // EXIT CASE (for UAP) - // else - pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; - pstate_rdh->stage = RDH_RESTART_INTFS; - // FALL THROUGH TO NEXT STAGE - - case RDH_RESTART_INTFS: - PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", - __FUNCTION__, pstate_rdh->stage, - RDH_stage_str[pstate_rdh->stage], pstate_rdh->priv_curr_idx); - - /* can only restart master intfs */ - while ((++pstate_rdh->priv_curr_idx) < pstate_rdh->priv_list_count) { - pmpriv = pstate_rdh->priv_list[pstate_rdh->priv_curr_idx]; + } + + if (pstate_rdh->priv_curr_idx < pstate_rdh->priv_list_count || + ret == MLAN_STATUS_FAILURE) + break; /* EXIT CASE (for UAP) */ + /* else */ + pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; + pstate_rdh->stage = RDH_RESTART_INTFS; + /* FALL THROUGH TO NEXT STAGE */ + + case RDH_RESTART_INTFS: + PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", + __FUNCTION__, pstate_rdh->stage, + RDH_stage_str[pstate_rdh->stage], + pstate_rdh->priv_curr_idx); + + /* can only restart master intfs */ + while ((++pstate_rdh->priv_curr_idx) < + pstate_rdh->priv_list_count) { + pmpriv = pstate_rdh->priv_list[pstate_rdh-> + priv_curr_idx]; #ifdef UAP_SUPPORT - if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) { - if (wlan_11h_radar_detect_required(pmpriv, - pstate_rdh->new_channel)) { - /* Radar detection is required for this channel, make sure - 11h is activated in the firmware */ - ret = wlan_11h_activate(pmpriv, MNULL, MTRUE); - ret = wlan_11h_config_master_radar_det(pmpriv, MTRUE); - ret = wlan_11h_check_update_radar_det_state(pmpriv); - } - ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_BSS_START, - HostCmd_ACT_GEN_SET, 0, MNULL, MNULL); - break; // leads to exit case - } + if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) { + if (wlan_11h_radar_detect_required(pmpriv, + pstate_rdh-> + new_channel)) + { + /* Radar detection is required for this + channel, make sure 11h is activated + in the firmware */ + ret = wlan_11h_activate(pmpriv, MNULL, + MTRUE); + ret = wlan_11h_config_master_radar_det + (pmpriv, MTRUE); + ret = wlan_11h_check_update_radar_det_state(pmpriv); + } + ret = wlan_prepare_cmd(pmpriv, + HOST_CMD_APCMD_BSS_START, + HostCmd_ACT_GEN_SET, 0, + MNULL, MNULL); + break; /* leads to exit case */ + } #endif #ifdef STA_SUPPORT - if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) { - /* Check previous state to find former Ad-hoc creator - interface. Set new state to Starting, so it'll be seen as a - DFS master. */ - if (pmpriv->adhoc_state_prev == ADHOC_STARTED) { - pmpriv->adhoc_state = ADHOC_STARTING; - pmpriv->adhoc_state_prev = ADHOC_IDLE; - } - if (wlan_11h_is_dfs_master(pmpriv)) { - /* set new adhoc channel here */ - pmpriv->adhoc_channel = pstate_rdh->new_channel; - if (wlan_11h_radar_detect_required(pmpriv, - pstate_rdh-> - new_channel)) { - /* Radar detection is required for this channel, make - sure 11h is activated in the firmware */ - ret = wlan_11h_activate(pmpriv, MNULL, MTRUE); - if (ret) - break; - ret = wlan_11h_config_master_radar_det(pmpriv, MTRUE); - if (ret) - break; - ret = wlan_11h_check_update_radar_det_state(pmpriv); - if (ret) - break; - } - ret = - wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_AD_HOC_START, - HostCmd_ACT_GEN_SET, 0, MNULL, - &pmpriv->adhoc_last_start_ssid); - break; // leads to exit case - } - - /* NOTE: DON'T reconnect slave STA intfs - infra/adhoc_joiner - Do we want to return to same AP/network (on radar channel)? - If want to connect back, depend on either: 1. driver's - reassoc thread 2. wpa_supplicant, or other user-space app */ - } + if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) { + /* Check previous state to find former Ad-hoc + creator interface. Set new state to + Starting, so it'll be seen as a DFS master. */ + if (pmpriv->adhoc_state_prev == ADHOC_STARTED) { + pmpriv->adhoc_state = ADHOC_STARTING; + pmpriv->adhoc_state_prev = ADHOC_IDLE; + } + if (wlan_11h_is_dfs_master(pmpriv)) { + /* set new adhoc channel here */ + pmpriv->adhoc_channel = + pstate_rdh->new_channel; + if (wlan_11h_radar_detect_required + (pmpriv, pstate_rdh->new_channel)) { + /* Radar detection is required + for this channel, make sure + 11h is activated in the + firmware */ + ret = wlan_11h_activate(pmpriv, + MNULL, + MTRUE); + if (ret) + break; + ret = wlan_11h_config_master_radar_det(pmpriv, MTRUE); + if (ret) + break; + ret = wlan_11h_check_update_radar_det_state(pmpriv); + if (ret) + break; + } + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_AD_HOC_START, + HostCmd_ACT_GEN_SET, + 0, MNULL, + &pmpriv-> + adhoc_last_start_ssid); + break; /* leads to exit case */ + } + + /* NOTE: DON'T reconnect slave STA intfs - + infra/adhoc_joiner Do we want to return to + same AP/network (on radar channel)? If want + to connect back, depend on either: 1. + driver's reassoc thread 2. wpa_supplicant, + or other user-space app */ + } #endif - } + } - if (pstate_rdh->priv_curr_idx < pstate_rdh->priv_list_count || - ret == MLAN_STATUS_FAILURE) - break; // EXIT CASE (for UAP) - // else - pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; - pstate_rdh->stage = RDH_RESTART_TRAFFIC; - // FALL THROUGH TO NEXT STAGE + if (pstate_rdh->priv_curr_idx < pstate_rdh->priv_list_count || + ret == MLAN_STATUS_FAILURE) + break; /* EXIT CASE (for UAP) */ + /* else */ + pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; + pstate_rdh->stage = RDH_RESTART_TRAFFIC; + /* FALL THROUGH TO NEXT STAGE */ - case RDH_RESTART_TRAFFIC: + case RDH_RESTART_TRAFFIC: #ifdef DFS_TESTING_SUPPORT - rdh_restart_traffic: +rdh_restart_traffic: #endif - PRINTM(MCMD_D, "%s(): stage(%d)=%s\n", - __FUNCTION__, pstate_rdh->stage, - RDH_stage_str[pstate_rdh->stage]); - - /* continue traffic for reactivated interfaces */ - PRINTM(MMSG, "11h: Radar Detected - restarting host tx traffic.\n"); - for (i = 0; i < pstate_rdh->priv_list_count; i++) { - wlan_11h_tx_enable(pstate_rdh->priv_list[i]); - } - - pstate_rdh->stage = RDH_OFF; /* DONE! */ - PRINTM(MCMD_D, "%s(): finished - stage(%d)=%s\n", - __FUNCTION__, pstate_rdh->stage, - RDH_stage_str[pstate_rdh->stage]); - break; - - default: - pstate_rdh->stage = RDH_OFF; /* cancel RDH to unblock Tx packets */ - break; - } - - LEAVE(); - return ret; + PRINTM(MCMD_D, "%s(): stage(%d)=%s\n", + __FUNCTION__, pstate_rdh->stage, + RDH_stage_str[pstate_rdh->stage]); + + /* continue traffic for reactivated interfaces */ + PRINTM(MMSG, + "11h: Radar Detected - restarting host tx traffic.\n"); + for (i = 0; i < pstate_rdh->priv_list_count; i++) { + wlan_11h_tx_enable(pstate_rdh->priv_list[i]); + } + + pstate_rdh->stage = RDH_OFF; /* DONE! */ + PRINTM(MCMD_D, "%s(): finished - stage(%d)=%s\n", + __FUNCTION__, pstate_rdh->stage, + RDH_stage_str[pstate_rdh->stage]); + break; + + default: + pstate_rdh->stage = RDH_OFF; /* cancel RDH to unblock Tx + packets */ + break; + } + + LEAVE(); + return ret; } /** @@ -3268,47 +3496,50 @@ wlan_11h_radar_detected_handling(mlan_adapter * pmadapter) mlan_status wlan_11h_dfs_event_preprocessing(mlan_adapter * pmadapter) { - mlan_status ret = MLAN_STATUS_FAILURE; - mlan_private *pmpriv = MNULL; - mlan_private *priv_list[MLAN_MAX_BSS_NUM]; - - ENTER(); - switch (pmadapter->event_cause & EVENT_ID_MASK) { - case EVENT_RADAR_DETECTED: - /* find active intf: prefer dfs_master over dfs_slave */ - if (wlan_get_privs_by_two_cond(pmadapter, - wlan_11h_is_master_active_on_dfs_chan, - wlan_11h_is_dfs_master, - MTRUE, priv_list)) { - pmpriv = priv_list[0]; - PRINTM(MINFO, "%s: found dfs_master priv=%p\n", - __FUNCTION__, pmpriv); - } else if (wlan_get_privs_by_two_cond(pmadapter, - wlan_11h_is_slave_active_on_dfs_chan, - wlan_11h_is_dfs_slave, - MTRUE, priv_list)) { - pmpriv = priv_list[0]; - PRINTM(MINFO, "%s: found dfs_slave priv=%p\n", - __FUNCTION__, pmpriv); - } - - /* update event_cause if we found an appropriate priv */ - if (pmpriv) { - pmlan_buffer pmevbuf = pmadapter->pmlan_buffer_event; - t_u32 new_event_cause = pmadapter->event_cause & EVENT_ID_MASK; - new_event_cause |= ((GET_BSS_NUM(pmpriv) & 0xff) << 16) | - ((pmpriv->bss_type & 0xff) << 24); - PRINTM(MINFO, "%s: priv - bss_num=%d, bss_type=%d\n", - __FUNCTION__, GET_BSS_NUM(pmpriv), pmpriv->bss_type); - memcpy(pmadapter, pmevbuf->pbuf + pmevbuf->data_offset, - &new_event_cause, sizeof(new_event_cause)); - ret = MLAN_STATUS_SUCCESS; - } - break; - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_FAILURE; + mlan_private *pmpriv = MNULL; + mlan_private *priv_list[MLAN_MAX_BSS_NUM]; + + ENTER(); + switch (pmadapter->event_cause & EVENT_ID_MASK) { + case EVENT_RADAR_DETECTED: + /* find active intf: prefer dfs_master over dfs_slave */ + if (wlan_get_privs_by_two_cond(pmadapter, + wlan_11h_is_master_active_on_dfs_chan, + wlan_11h_is_dfs_master, + MTRUE, priv_list)) { + pmpriv = priv_list[0]; + PRINTM(MINFO, "%s: found dfs_master priv=%p\n", + __FUNCTION__, pmpriv); + } else if (wlan_get_privs_by_two_cond(pmadapter, + wlan_11h_is_slave_active_on_dfs_chan, + wlan_11h_is_dfs_slave, + MTRUE, priv_list)) { + pmpriv = priv_list[0]; + PRINTM(MINFO, "%s: found dfs_slave priv=%p\n", + __FUNCTION__, pmpriv); + } + + /* update event_cause if we found an appropriate priv */ + if (pmpriv) { + pmlan_buffer pmevbuf = pmadapter->pmlan_buffer_event; + t_u32 new_event_cause = + pmadapter->event_cause & EVENT_ID_MASK; + new_event_cause |= + ((GET_BSS_NUM(pmpriv) & 0xff) << 16) | + ((pmpriv->bss_type & 0xff) << 24); + PRINTM(MINFO, "%s: priv - bss_num=%d, bss_type=%d\n", + __FUNCTION__, GET_BSS_NUM(pmpriv), + pmpriv->bss_type); + memcpy(pmadapter, pmevbuf->pbuf + pmevbuf->data_offset, + &new_event_cause, sizeof(new_event_cause)); + ret = MLAN_STATUS_SUCCESS; + } + break; + } + + LEAVE(); + return ret; } /** @@ -3323,56 +3554,58 @@ wlan_11h_dfs_event_preprocessing(mlan_adapter * pmadapter) mlan_status wlan_11h_switch_non_dfs_chan(mlan_private * priv, t_u8 * chan) { - mlan_status ret = MLAN_STATUS_FAILURE; - t_u32 i; - t_u32 rand_entry; - t_u8 def_chan; - t_u8 rand_tries = 0; - region_chan_t *chn_tbl = MNULL; - pmlan_adapter pmadapter = priv->adapter; - - ENTER(); - - /* get the channel table first */ - for (i = 0; i < MAX_REGION_CHANNEL_NUM; i++) { - if (pmadapter->region_channel[i].band == BAND_A - && pmadapter->region_channel[i].valid) { - chn_tbl = &pmadapter->region_channel[i]; - break; - } - } - - if (!chn_tbl || !chn_tbl->pcfp) { - goto done; - } - - do { - rand_entry = wlan_11h_get_random_num(pmadapter) % chn_tbl->num_cfp; - def_chan = (t_u8) chn_tbl->pcfp[rand_entry].channel; - rand_tries++; - } while ((wlan_11h_is_channel_under_nop(pmadapter, def_chan) || - chn_tbl->pcfp[rand_entry].passive_scan_or_radar_detect == MTRUE) - && (rand_tries < MAX_SWITCH_CHANNEL_RETRIES)); - - /* meet max retries, use the lowest non-dfs channel */ - if (rand_tries == MAX_SWITCH_CHANNEL_RETRIES) { - for (i = 0; i < chn_tbl->num_cfp; i++) { - if (chn_tbl->pcfp[i].passive_scan_or_radar_detect == MFALSE && - !wlan_11h_is_channel_under_nop(pmadapter, - (t_u8) chn_tbl->pcfp[i]. - channel)) { - def_chan = (t_u8) chn_tbl->pcfp[i].channel; - break; - } - } - if (i == chn_tbl->num_cfp) { - goto done; - } - } - - *chan = def_chan; - ret = MLAN_STATUS_SUCCESS; - done: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_FAILURE; + t_u32 i; + t_u32 rand_entry; + t_u8 def_chan; + t_u8 rand_tries = 0; + region_chan_t *chn_tbl = MNULL; + pmlan_adapter pmadapter = priv->adapter; + + ENTER(); + + /* get the channel table first */ + for (i = 0; i < MAX_REGION_CHANNEL_NUM; i++) { + if (pmadapter->region_channel[i].band == BAND_A + && pmadapter->region_channel[i].valid) { + chn_tbl = &pmadapter->region_channel[i]; + break; + } + } + + if (!chn_tbl || !chn_tbl->pcfp) { + goto done; + } + + do { + rand_entry = + wlan_11h_get_random_num(pmadapter) % chn_tbl->num_cfp; + def_chan = (t_u8) chn_tbl->pcfp[rand_entry].channel; + rand_tries++; + } while ((wlan_11h_is_channel_under_nop(pmadapter, def_chan) || + chn_tbl->pcfp[rand_entry].passive_scan_or_radar_detect == + MTRUE) && (rand_tries < MAX_SWITCH_CHANNEL_RETRIES)); + + /* meet max retries, use the lowest non-dfs channel */ + if (rand_tries == MAX_SWITCH_CHANNEL_RETRIES) { + for (i = 0; i < chn_tbl->num_cfp; i++) { + if (chn_tbl->pcfp[i].passive_scan_or_radar_detect == + MFALSE && + !wlan_11h_is_channel_under_nop(pmadapter, + (t_u8) chn_tbl-> + pcfp[i].channel)) { + def_chan = (t_u8) chn_tbl->pcfp[i].channel; + break; + } + } + if (i == chn_tbl->num_cfp) { + goto done; + } + } + + *chan = def_chan; + ret = MLAN_STATUS_SUCCESS; +done: + LEAVE(); + return ret; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_11h.h b/drivers/net/wireless/sd8897/mlan/mlan_11h.h index 7a69335bd999..3e8a2f1647c7 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_11h.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_11h.h @@ -3,7 +3,7 @@ * @brief This header file contains data structures and * function declarations of 802.11h * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -47,11 +47,11 @@ extern t_bool wlan_11h_is_master_radar_det_active(mlan_private * priv); /** Configure master radar detection. Need call wlan_11h_check_update_radar_det_state() after. */ extern mlan_status wlan_11h_config_master_radar_det(mlan_private * priv, - t_bool enable); + t_bool enable); /** Configure slave radar detection. Need call wlan_11h_check_update_radar_det_state() after. */ extern mlan_status wlan_11h_config_slave_radar_det(mlan_private * priv, - t_bool enable); + t_bool enable); /** Checks all interfaces and updates radar detect flags if necessary */ extern mlan_status wlan_11h_check_update_radar_det_state(mlan_private * pmpriv); @@ -67,7 +67,7 @@ extern void wlan_11h_tx_disable(mlan_private * priv); /** Activate 11h extensions in the firmware */ extern mlan_status wlan_11h_activate(mlan_private * priv, t_void * pioctl_buf, - t_bool flag); + t_bool flag); /** Initialize the 11h device structure */ extern void wlan_11h_init(mlan_adapter * pmadapter); @@ -89,58 +89,58 @@ extern t_bool wlan_11h_radar_detect_required(mlan_private * priv, t_u8 channel); /** Perform a standard availibility check on the specified channel */ extern t_s32 wlan_11h_issue_radar_detect(mlan_private * priv, - pmlan_ioctl_req pioctl_req, - t_u8 channel); + pmlan_ioctl_req pioctl_req, + t_u8 channel); /** Check previously issued radar report for a channel */ extern mlan_status wlan_11h_check_chan_report(mlan_private * priv, t_u8 chan); /** Add any 11h TLVs necessary to complete an adhoc start command */ extern t_s32 wlan_11h_process_start(mlan_private * priv, - t_u8 ** ppbuffer, - IEEEtypes_CapInfo_t * pcap_info, - t_u32 channel, - wlan_11h_bss_info_t * p11h_bss_info); + t_u8 ** ppbuffer, + IEEEtypes_CapInfo_t * pcap_info, + t_u32 channel, + wlan_11h_bss_info_t * p11h_bss_info); /** Add any 11h TLVs necessary to complete a join command (adhoc or infra) */ extern t_s32 wlan_11h_process_join(mlan_private * priv, - t_u8 ** ppbuffer, - IEEEtypes_CapInfo_t * pcap_info, - t_u8 band, - t_u32 channel, - wlan_11h_bss_info_t * p11h_bss_info); + t_u8 ** ppbuffer, + IEEEtypes_CapInfo_t * pcap_info, + t_u8 band, + t_u32 channel, + wlan_11h_bss_info_t * p11h_bss_info); /** Complete the firmware command preparation for an 11h command function */ extern mlan_status wlan_11h_cmd_process(mlan_private * priv, - HostCmd_DS_COMMAND * pcmd_ptr, - const t_void * pinfo_buf); + HostCmd_DS_COMMAND * pcmd_ptr, + const t_void * pinfo_buf); /** Process the response of an 11h firmware command */ extern mlan_status wlan_11h_cmdresp_process(mlan_private * priv, - const HostCmd_DS_COMMAND * resp); + const HostCmd_DS_COMMAND * resp); /** Receive IEs from scan processing and record any needed info for 11h */ extern mlan_status wlan_11h_process_bss_elem(mlan_adapter * pmadapter, - wlan_11h_bss_info_t * - p11h_bss_info, - const t_u8 * pelement); + wlan_11h_bss_info_t * + p11h_bss_info, + const t_u8 * pelement); /** Handler for EVENT_CHANNEL_SWITCH_ANN */ extern mlan_status wlan_11h_handle_event_chanswann(mlan_private * priv); /** Handler for EVENT_CHANNEL_REPORT_RDY */ extern mlan_status wlan_11h_handle_event_chanrpt_ready(mlan_private * priv, - mlan_event * pevent); + mlan_event * pevent); #ifdef DFS_TESTING_SUPPORT /** Handler for DFS_TESTING IOCTL */ extern mlan_status wlan_11h_ioctl_dfs_testing(pmlan_adapter pmadapter, - pmlan_ioctl_req pioctl_req); + pmlan_ioctl_req pioctl_req); #endif /** Check if channel is under a NOP duration (should not be used) */ extern t_bool wlan_11h_is_channel_under_nop(mlan_adapter * pmadapter, - t_u8 channel); + t_u8 channel); /** Check if RADAR_DETECTED handling is blocking data tx */ extern t_bool wlan_11h_radar_detected_tx_blocked(mlan_adapter * pmadapter); @@ -156,6 +156,6 @@ extern mlan_status wlan_11h_dfs_event_preprocessing(mlan_adapter * pmadapter); /** DFS switch to non-DFS channel */ extern mlan_status wlan_11h_switch_non_dfs_chan(mlan_private * priv, - t_u8 * chan); + t_u8 * chan); #endif /*_MLAN_11H_ */ diff --git a/drivers/net/wireless/sd8897/mlan/mlan_11n.c b/drivers/net/wireless/sd8897/mlan/mlan_11n.c index 5b37f26abf5c..b882142a1577 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_11n.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_11n.c @@ -2,7 +2,7 @@ * * @brief This file contains functions for 11n handling. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -44,7 +44,7 @@ Change log: Local Functions ********************************************************/ -/** +/** * * @brief set/get max tx buf size * @@ -55,22 +55,22 @@ Change log: */ static mlan_status wlan_11n_ioctl_max_tx_buf_size(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_11n_cfg *cfg = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_11n_cfg *cfg = MNULL; - ENTER(); - cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; - cfg->param.tx_buf_size = (t_u32) pmadapter->max_tx_buf_size; - pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; + ENTER(); + cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; + cfg->param.tx_buf_size = (t_u32) pmadapter->max_tx_buf_size; + pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** - * @brief Set/get htcapinfo configuration +/** + * @brief Set/get htcapinfo configuration * * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer @@ -79,63 +79,75 @@ wlan_11n_ioctl_max_tx_buf_size(IN pmlan_adapter pmadapter, */ static mlan_status wlan_11n_ioctl_htusrcfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_11n_cfg *cfg = MNULL; - - ENTER(); - - cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; - - if (pioctl_req->action == MLAN_ACT_SET) { - if (((cfg->param.htcap_cfg.htcap & ~IGN_HW_DEV_CAP) & - pmpriv->adapter->hw_dot_11n_dev_cap) - != (cfg->param.htcap_cfg.htcap & ~IGN_HW_DEV_CAP)) { - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - } else { - if (cfg->param.htcap_cfg.misc_cfg == BAND_SELECT_BG) { - pmadapter->usr_dot_11n_dev_cap_bg = cfg->param.htcap_cfg.htcap; - PRINTM(MINFO, "Set: UsrDot11nCap for 2.4GHz 0x%x\n", - pmadapter->usr_dot_11n_dev_cap_bg); - } - if (cfg->param.htcap_cfg.misc_cfg == BAND_SELECT_A) { - pmadapter->usr_dot_11n_dev_cap_a = cfg->param.htcap_cfg.htcap; - PRINTM(MINFO, "Set: UsrDot11nCap for 5GHz 0x%x\n", - pmadapter->usr_dot_11n_dev_cap_a); - } - if (cfg->param.htcap_cfg.misc_cfg == BAND_SELECT_BOTH) { - pmadapter->usr_dot_11n_dev_cap_bg = cfg->param.htcap_cfg.htcap; - pmadapter->usr_dot_11n_dev_cap_a = cfg->param.htcap_cfg.htcap; - PRINTM(MINFO, "Set: UsrDot11nCap for 2.4GHz and 5GHz 0x%x\n", - cfg->param.htcap_cfg.htcap); - } - } - } else { - /* Hardware 11N device capability required */ - if (cfg->param.htcap_cfg.hw_cap_req) - cfg->param.htcap_cfg.htcap = pmadapter->hw_dot_11n_dev_cap; - else { - if (cfg->param.htcap_cfg.misc_cfg == BAND_SELECT_BG) { - cfg->param.htcap_cfg.htcap = pmadapter->usr_dot_11n_dev_cap_bg; - PRINTM(MINFO, "Get: UsrDot11nCap for 2.4GHz 0x%x\n", - cfg->param.htcap_cfg.htcap); - } - if (cfg->param.htcap_cfg.misc_cfg == BAND_SELECT_A) { - cfg->param.htcap_cfg.htcap = pmadapter->usr_dot_11n_dev_cap_a; - PRINTM(MINFO, "Get: UsrDot11nCap for 5GHz 0x%x\n", - cfg->param.htcap_cfg.htcap); - } - } - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_11n_cfg *cfg = MNULL; + + ENTER(); + + cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; + + if (pioctl_req->action == MLAN_ACT_SET) { + if (((cfg->param.htcap_cfg.htcap & ~IGN_HW_DEV_CAP) & + pmpriv->adapter->hw_dot_11n_dev_cap) + != (cfg->param.htcap_cfg.htcap & ~IGN_HW_DEV_CAP)) { + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + } else { + if (cfg->param.htcap_cfg.misc_cfg == BAND_SELECT_BG) { + pmadapter->usr_dot_11n_dev_cap_bg = + cfg->param.htcap_cfg.htcap; + PRINTM(MINFO, + "Set: UsrDot11nCap for 2.4GHz 0x%x\n", + pmadapter->usr_dot_11n_dev_cap_bg); + } + if (cfg->param.htcap_cfg.misc_cfg == BAND_SELECT_A) { + pmadapter->usr_dot_11n_dev_cap_a = + cfg->param.htcap_cfg.htcap; + PRINTM(MINFO, + "Set: UsrDot11nCap for 5GHz 0x%x\n", + pmadapter->usr_dot_11n_dev_cap_a); + } + if (cfg->param.htcap_cfg.misc_cfg == BAND_SELECT_BOTH) { + pmadapter->usr_dot_11n_dev_cap_bg = + cfg->param.htcap_cfg.htcap; + pmadapter->usr_dot_11n_dev_cap_a = + cfg->param.htcap_cfg.htcap; + PRINTM(MINFO, + "Set: UsrDot11nCap for 2.4GHz and 5GHz 0x%x\n", + cfg->param.htcap_cfg.htcap); + } + } + } else { + /* Hardware 11N device capability required */ + if (cfg->param.htcap_cfg.hw_cap_req) + cfg->param.htcap_cfg.htcap = + pmadapter->hw_dot_11n_dev_cap; + else { + if (cfg->param.htcap_cfg.misc_cfg == BAND_SELECT_BG) { + cfg->param.htcap_cfg.htcap = + pmadapter->usr_dot_11n_dev_cap_bg; + PRINTM(MINFO, + "Get: UsrDot11nCap for 2.4GHz 0x%x\n", + cfg->param.htcap_cfg.htcap); + } + if (cfg->param.htcap_cfg.misc_cfg == BAND_SELECT_A) { + cfg->param.htcap_cfg.htcap = + pmadapter->usr_dot_11n_dev_cap_a; + PRINTM(MINFO, + "Get: UsrDot11nCap for 5GHz 0x%x\n", + cfg->param.htcap_cfg.htcap); + } + } + } + + LEAVE(); + return ret; } -/** +/** * @brief Enable/Disable AMSDU AGGR CTRL * * @param pmadapter A pointer to mlan_adapter structure @@ -145,37 +157,37 @@ wlan_11n_ioctl_htusrcfg(IN pmlan_adapter pmadapter, */ static mlan_status wlan_11n_ioctl_amsdu_aggr_ctrl(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_11n_cfg *cfg = MNULL; - t_u16 cmd_action = 0; - - ENTER(); - - cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) - cmd_action = HostCmd_ACT_GEN_SET; - else - cmd_action = HostCmd_ACT_GEN_GET; - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_AMSDU_AGGR_CTRL, - cmd_action, - 0, - (t_void *) pioctl_req, - (t_void *) & cfg->param.amsdu_aggr_ctrl); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_11n_cfg *cfg = MNULL; + t_u16 cmd_action = 0; + + ENTER(); + + cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) + cmd_action = HostCmd_ACT_GEN_SET; + else + cmd_action = HostCmd_ACT_GEN_GET; + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_AMSDU_AGGR_CTRL, + cmd_action, + 0, + (t_void *) pioctl_req, + (t_void *) & cfg->param.amsdu_aggr_ctrl); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } -/** - * @brief Set/get 11n configuration +/** + * @brief Set/get 11n configuration * * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer @@ -184,36 +196,36 @@ wlan_11n_ioctl_amsdu_aggr_ctrl(IN pmlan_adapter pmadapter, */ static mlan_status wlan_11n_ioctl_httxcfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_11n_cfg *cfg = MNULL; - t_u16 cmd_action = 0; - - ENTER(); - - cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) - cmd_action = HostCmd_ACT_GEN_SET; - else - cmd_action = HostCmd_ACT_GEN_GET; - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_11N_CFG, - cmd_action, - 0, - (t_void *) pioctl_req, - (t_void *) & cfg->param.tx_cfg); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_11n_cfg *cfg = MNULL; + t_u16 cmd_action = 0; + + ENTER(); + + cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) + cmd_action = HostCmd_ACT_GEN_SET; + else + cmd_action = HostCmd_ACT_GEN_GET; + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_11N_CFG, + cmd_action, + 0, + (t_void *) pioctl_req, + (t_void *) & cfg->param.tx_cfg); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } -/** +/** * @brief Set/get TX beamforming capabilities * * @param pmadapter A pointer to mlan_adapter structure @@ -223,25 +235,25 @@ wlan_11n_ioctl_httxcfg(IN pmlan_adapter pmadapter, */ static mlan_status wlan_11n_ioctl_tx_bf_cap(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_11n_cfg *cfg = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_11n_cfg *cfg = MNULL; - ENTER(); + ENTER(); - cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) - pmpriv->tx_bf_cap = cfg->param.tx_bf_cap; - else - cfg->param.tx_bf_cap = pmpriv->tx_bf_cap; + cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) + pmpriv->tx_bf_cap = cfg->param.tx_bf_cap; + else + cfg->param.tx_bf_cap = pmpriv->tx_bf_cap; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief Set/get TX beamforming configurations * * @param pmadapter A pointer to mlan_adapter structure @@ -251,36 +263,36 @@ wlan_11n_ioctl_tx_bf_cap(IN pmlan_adapter pmadapter, */ static mlan_status wlan_11n_ioctl_tx_bf_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_11n_cfg *cfg = MNULL; - t_u16 cmd_action = 0; - - ENTER(); - - cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) - cmd_action = HostCmd_ACT_GEN_SET; - else - cmd_action = HostCmd_ACT_GEN_GET; - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_TX_BF_CFG, - cmd_action, - 0, - (t_void *) pioctl_req, - (t_void *) & cfg->param.tx_bf); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_11n_cfg *cfg = MNULL; + t_u16 cmd_action = 0; + + ENTER(); + + cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) + cmd_action = HostCmd_ACT_GEN_SET; + else + cmd_action = HostCmd_ACT_GEN_GET; + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_TX_BF_CFG, + cmd_action, + 0, + (t_void *) pioctl_req, + (t_void *) & cfg->param.tx_bf); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } -/** +/** * @brief Set/get HT stream configurations * * @param pmadapter A pointer to mlan_adapter structure @@ -290,80 +302,81 @@ wlan_11n_ioctl_tx_bf_cfg(IN pmlan_adapter pmadapter, */ static mlan_status wlan_11n_ioctl_stream_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_11n_cfg *cfg = MNULL; - - ENTER(); - - cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) { - cfg->param.stream_cfg = pmadapter->usr_dev_mcs_support; - } else if (pioctl_req->action == MLAN_ACT_SET) { - switch (cfg->param.stream_cfg) { - case HT_STREAM_MODE_2X2: - if (pmadapter->hw_dev_mcs_support == HT_STREAM_MODE_1X1) { - PRINTM(MERROR, "HW does not support this mode\n"); - ret = MLAN_STATUS_FAILURE; - } else - pmadapter->usr_dev_mcs_support = cfg->param.stream_cfg; - break; - case HT_STREAM_MODE_1X1: - pmadapter->usr_dev_mcs_support = cfg->param.stream_cfg; - break; - default: - PRINTM(MERROR, "Invalid stream mode\n"); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - break; - } - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_11n_cfg *cfg = MNULL; + + ENTER(); + + cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) { + cfg->param.stream_cfg = pmadapter->usr_dev_mcs_support; + } else if (pioctl_req->action == MLAN_ACT_SET) { + switch (cfg->param.stream_cfg) { + case HT_STREAM_MODE_2X2: + if (pmadapter->hw_dev_mcs_support == HT_STREAM_MODE_1X1) { + PRINTM(MERROR, + "HW does not support this mode\n"); + ret = MLAN_STATUS_FAILURE; + } else + pmadapter->usr_dev_mcs_support = + cfg->param.stream_cfg; + break; + case HT_STREAM_MODE_1X1: + pmadapter->usr_dev_mcs_support = cfg->param.stream_cfg; + break; + default: + PRINTM(MERROR, "Invalid stream mode\n"); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + break; + } + } + + LEAVE(); + return ret; } /** - * @brief This function will resend addba request to all - * the peer in the TxBAStreamTbl - * + * @brief This function will resend addba request to all + * the peer in the TxBAStreamTbl + * * @param priv A pointer to mlan_private * - * @return N/A + * @return N/A */ static void wlan_11n_update_addba_request(mlan_private * priv) { - TxBAStreamTbl *ptx_tbl; - - ENTER(); - - if (! - (ptx_tbl = - (TxBAStreamTbl *) util_peek_list(priv->adapter->pmoal_handle, - &priv->tx_ba_stream_tbl_ptr, - priv->adapter->callbacks. - moal_spin_lock, - priv->adapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return; - } - - while (ptx_tbl != (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { - wlan_send_addba(priv, ptx_tbl->tid, ptx_tbl->ra); - ptx_tbl = ptx_tbl->pnext; - } - /* Signal MOAL to trigger mlan_main_process */ - wlan_recv_event(priv, MLAN_EVENT_ID_DRV_DEFER_HANDLING, MNULL); - LEAVE(); - return; + TxBAStreamTbl *ptx_tbl; + + ENTER(); + + ptx_tbl = (TxBAStreamTbl *) util_peek_list(priv->adapter->pmoal_handle, + &priv->tx_ba_stream_tbl_ptr, + priv->adapter->callbacks. + moal_spin_lock, + priv->adapter->callbacks. + moal_spin_unlock); + if (!ptx_tbl) { + LEAVE(); + return; + } + + while (ptx_tbl != (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { + wlan_send_addba(priv, ptx_tbl->tid, ptx_tbl->ra); + ptx_tbl = ptx_tbl->pnext; + } + /* Signal MOAL to trigger mlan_main_process */ + wlan_recv_event(priv, MLAN_EVENT_ID_DRV_DEFER_HANDLING, MNULL); + LEAVE(); + return; } -/** - * @brief Set/get addba parameter +/** + * @brief Set/get addba parameter * * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer @@ -372,79 +385,84 @@ wlan_11n_update_addba_request(mlan_private * priv) */ static mlan_status wlan_11n_ioctl_addba_param(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_11n_cfg *cfg = MNULL; - t_u32 timeout; - - ENTER(); - - cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) { - cfg->param.addba_param.timeout = pmpriv->add_ba_param.timeout; - cfg->param.addba_param.txwinsize = pmpriv->add_ba_param.tx_win_size; - cfg->param.addba_param.rxwinsize = pmpriv->add_ba_param.rx_win_size; - cfg->param.addba_param.txamsdu = pmpriv->add_ba_param.tx_amsdu; - cfg->param.addba_param.rxamsdu = pmpriv->add_ba_param.rx_amsdu; - } else { - timeout = pmpriv->add_ba_param.timeout; - pmpriv->add_ba_param.timeout = cfg->param.addba_param.timeout; - pmpriv->add_ba_param.tx_win_size = cfg->param.addba_param.txwinsize; - pmpriv->add_ba_param.rx_win_size = cfg->param.addba_param.rxwinsize; - pmpriv->add_ba_param.tx_amsdu = cfg->param.addba_param.txamsdu; - pmpriv->add_ba_param.rx_amsdu = cfg->param.addba_param.rxamsdu; - if (timeout != pmpriv->add_ba_param.timeout) { - wlan_11n_update_addba_request(pmpriv); - } - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_11n_cfg *cfg = MNULL; + t_u32 timeout; + + ENTER(); + + cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) { + cfg->param.addba_param.timeout = pmpriv->add_ba_param.timeout; + cfg->param.addba_param.txwinsize = + pmpriv->add_ba_param.tx_win_size; + cfg->param.addba_param.rxwinsize = + pmpriv->add_ba_param.rx_win_size; + cfg->param.addba_param.txamsdu = pmpriv->add_ba_param.tx_amsdu; + cfg->param.addba_param.rxamsdu = pmpriv->add_ba_param.rx_amsdu; + } else { + timeout = pmpriv->add_ba_param.timeout; + pmpriv->add_ba_param.timeout = cfg->param.addba_param.timeout; + pmpriv->add_ba_param.tx_win_size = + cfg->param.addba_param.txwinsize; + pmpriv->add_ba_param.rx_win_size = + cfg->param.addba_param.rxwinsize; + pmpriv->add_ba_param.tx_amsdu = cfg->param.addba_param.txamsdu; + pmpriv->add_ba_param.rx_amsdu = cfg->param.addba_param.rxamsdu; + if (timeout != pmpriv->add_ba_param.timeout) { + wlan_11n_update_addba_request(pmpriv); + } + } + + LEAVE(); + return ret; } /** * @brief This function send delba to specific tid - * + * * @param priv A pointer to mlan_priv - * @param tid tid + * @param tid tid * @return N/A */ void wlan_11n_delba(mlan_private * priv, int tid) { - RxReorderTbl *rx_reor_tbl_ptr; - - ENTER(); - - if (! - (rx_reor_tbl_ptr = - (RxReorderTbl *) util_peek_list(priv->adapter->pmoal_handle, - &priv->rx_reorder_tbl_ptr, - priv->adapter->callbacks. - moal_spin_lock, - priv->adapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return; - } - - while (rx_reor_tbl_ptr != (RxReorderTbl *) & priv->rx_reorder_tbl_ptr) { - if (rx_reor_tbl_ptr->tid == tid) { - PRINTM(MIOCTL, "Send delba to tid=%d, " MACSTR "\n", tid, - MAC2STR(rx_reor_tbl_ptr->ta)); - wlan_send_delba(priv, MNULL, tid, rx_reor_tbl_ptr->ta, 0); - } - rx_reor_tbl_ptr = rx_reor_tbl_ptr->pnext; - } - - LEAVE(); - return; + RxReorderTbl *rx_reor_tbl_ptr; + + ENTER(); + + rx_reor_tbl_ptr = + (RxReorderTbl *) util_peek_list(priv->adapter->pmoal_handle, + &priv->rx_reorder_tbl_ptr, + priv->adapter->callbacks. + moal_spin_lock, + priv->adapter->callbacks. + moal_spin_unlock); + if (!rx_reor_tbl_ptr) { + LEAVE(); + return; + } + + while (rx_reor_tbl_ptr != (RxReorderTbl *) & priv->rx_reorder_tbl_ptr) { + if (rx_reor_tbl_ptr->tid == tid) { + PRINTM(MIOCTL, "Send delba to tid=%d, " MACSTR "\n", + tid, MAC2STR(rx_reor_tbl_ptr->ta)); + wlan_send_delba(priv, MNULL, tid, rx_reor_tbl_ptr->ta, + 0); + } + rx_reor_tbl_ptr = rx_reor_tbl_ptr->pnext; + } + + LEAVE(); + return; } -/** - * @brief Set/get addba reject set +/** + * @brief Set/get addba reject set * * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer @@ -453,51 +471,58 @@ wlan_11n_delba(mlan_private * priv, int tid) */ static mlan_status wlan_11n_ioctl_addba_reject(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - int i = 0; - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_11n_cfg *cfg = MNULL; - - ENTER(); - - cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; - - if (pioctl_req->action == MLAN_ACT_GET) { - PRINTM(MINFO, "Get Addba reject\n"); - memcpy(pmadapter, cfg->param.addba_reject, pmpriv->addba_reject, - MAX_NUM_TID); - } else { - if (pmpriv->media_connected == MTRUE) { - for (i = 0; i < MAX_NUM_TID; i++) { - if (cfg->param.addba_reject[i] == ADDBA_RSP_STATUS_REJECT) { - PRINTM(MIOCTL, "Receive addba reject: tid=%d\n", i); - wlan_11n_delba(pmpriv, i); - } - } - wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_DEFER_HANDLING, MNULL); - } - for (i = 0; i < MAX_NUM_TID; i++) { - /* For AMPDU */ - if (cfg->param.addba_reject[i] > ADDBA_RSP_STATUS_REJECT) { - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - break; - } - - pmpriv->addba_reject[i] = cfg->param.addba_reject[i]; - } - } - - LEAVE(); - return ret; + int i = 0; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_11n_cfg *cfg = MNULL; + + ENTER(); + + cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; + + if (pioctl_req->action == MLAN_ACT_GET) { + PRINTM(MINFO, "Get Addba reject\n"); + memcpy(pmadapter, cfg->param.addba_reject, pmpriv->addba_reject, + MAX_NUM_TID); + } else { + if (pmpriv->media_connected == MTRUE) { + for (i = 0; i < MAX_NUM_TID; i++) { + if (cfg->param.addba_reject[i] == + ADDBA_RSP_STATUS_REJECT) { + PRINTM(MIOCTL, + "Receive addba reject: tid=%d\n", + i); + wlan_11n_delba(pmpriv, i); + } + } + wlan_recv_event(pmpriv, + MLAN_EVENT_ID_DRV_DEFER_HANDLING, + MNULL); + } + for (i = 0; i < MAX_NUM_TID; i++) { + /* For AMPDU */ + if (cfg->param.addba_reject[i] > + ADDBA_RSP_STATUS_REJECT) { + pioctl_req->status_code = + MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + break; + } + + pmpriv->addba_reject[i] = cfg->param.addba_reject[i]; + } + } + + LEAVE(); + return ret; } /** * @brief This function will send DELBA to entries in the priv's * Tx BA stream table - * + * * @param priv A pointer to mlan_private * @param pioctl_req A pointer to ioctl request buffer * @param tid TID @@ -508,60 +533,67 @@ wlan_11n_ioctl_addba_reject(IN pmlan_adapter pmadapter, */ static mlan_status wlan_send_delba_to_entry_in_txbastream_tbl(pmlan_private priv, - pmlan_ioctl_req pioctl_req, t_u8 tid, - t_u8 * peer_address, - TxBAStreamTbl * last_tx_ba_to_delete) + pmlan_ioctl_req pioctl_req, t_u8 tid, + t_u8 * peer_address, + TxBAStreamTbl * last_tx_ba_to_delete) { - pmlan_adapter pmadapter = priv->adapter; - TxBAStreamTbl *tx_ba_stream_tbl_ptr; - t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0 }; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - if (! - (tx_ba_stream_tbl_ptr = - (TxBAStreamTbl *) util_peek_list(pmadapter->pmoal_handle, - &priv->tx_ba_stream_tbl_ptr, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return ret; - } - - while (tx_ba_stream_tbl_ptr != - (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { - if (tx_ba_stream_tbl_ptr->ba_status == BA_STREAM_SETUP_COMPLETE) { - if (((tid == DELBA_ALL_TIDS) || (tid == tx_ba_stream_tbl_ptr->tid)) - && - (!memcmp - (pmadapter, peer_address, zero_mac, MLAN_MAC_ADDR_LENGTH) || - !memcmp(pmadapter, peer_address, tx_ba_stream_tbl_ptr->ra, - MLAN_MAC_ADDR_LENGTH))) { - if (last_tx_ba_to_delete && - (tx_ba_stream_tbl_ptr == last_tx_ba_to_delete)) - ret = - wlan_send_delba(priv, pioctl_req, - tx_ba_stream_tbl_ptr->tid, - tx_ba_stream_tbl_ptr->ra, 1); - else - ret = - wlan_send_delba(priv, MNULL, tx_ba_stream_tbl_ptr->tid, - tx_ba_stream_tbl_ptr->ra, 1); - } - } - tx_ba_stream_tbl_ptr = tx_ba_stream_tbl_ptr->pnext; - } - - LEAVE(); - return ret; + pmlan_adapter pmadapter = priv->adapter; + TxBAStreamTbl *tx_ba_stream_tbl_ptr; + t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0 }; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + tx_ba_stream_tbl_ptr = + (TxBAStreamTbl *) util_peek_list(pmadapter->pmoal_handle, + &priv->tx_ba_stream_tbl_ptr, + pmadapter->callbacks. + moal_spin_lock, + pmadapter->callbacks. + moal_spin_unlock); + if (!tx_ba_stream_tbl_ptr) { + LEAVE(); + return ret; + } + + while (tx_ba_stream_tbl_ptr != + (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { + if (tx_ba_stream_tbl_ptr->ba_status == BA_STREAM_SETUP_COMPLETE) { + if (((tid == DELBA_ALL_TIDS) || + (tid == tx_ba_stream_tbl_ptr->tid)) && + (!memcmp + (pmadapter, peer_address, zero_mac, + MLAN_MAC_ADDR_LENGTH) || + !memcmp(pmadapter, peer_address, + tx_ba_stream_tbl_ptr->ra, + MLAN_MAC_ADDR_LENGTH))) { + if (last_tx_ba_to_delete && + (tx_ba_stream_tbl_ptr == + last_tx_ba_to_delete)) + ret = wlan_send_delba(priv, pioctl_req, + tx_ba_stream_tbl_ptr-> + tid, + tx_ba_stream_tbl_ptr-> + ra, 1); + else + ret = wlan_send_delba(priv, MNULL, + tx_ba_stream_tbl_ptr-> + tid, + tx_ba_stream_tbl_ptr-> + ra, 1); + } + } + tx_ba_stream_tbl_ptr = tx_ba_stream_tbl_ptr->pnext; + } + + LEAVE(); + return ret; } /** * @brief This function will send DELBA to entries in the priv's * rx reordering table - * + * * @param priv A pointer to mlan_private * @param pioctl_req A pointer to ioctl request buffer * @param tid TID @@ -572,54 +604,62 @@ wlan_send_delba_to_entry_in_txbastream_tbl(pmlan_private priv, */ static mlan_status wlan_send_delba_to_entry_in_reorder_tbl(pmlan_private priv, - pmlan_ioctl_req pioctl_req, t_u8 tid, - t_u8 * peer_address, - RxReorderTbl * last_rx_ba_to_delete) + pmlan_ioctl_req pioctl_req, t_u8 tid, + t_u8 * peer_address, + RxReorderTbl * last_rx_ba_to_delete) { - pmlan_adapter pmadapter = priv->adapter; - RxReorderTbl *rx_reor_tbl_ptr; - t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0 }; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - if (! - (rx_reor_tbl_ptr = - (RxReorderTbl *) util_peek_list(pmadapter->pmoal_handle, - &priv->rx_reorder_tbl_ptr, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return ret; - } - - while (rx_reor_tbl_ptr != (RxReorderTbl *) & priv->rx_reorder_tbl_ptr) { - if (rx_reor_tbl_ptr->ba_status == BA_STREAM_SETUP_COMPLETE) { - if (((tid == DELBA_ALL_TIDS) || (tid == rx_reor_tbl_ptr->tid)) && - (!memcmp - (pmadapter, peer_address, zero_mac, MLAN_MAC_ADDR_LENGTH) || - !memcmp(pmadapter, peer_address, rx_reor_tbl_ptr->ta, - MLAN_MAC_ADDR_LENGTH))) { - if (last_rx_ba_to_delete && - (rx_reor_tbl_ptr == last_rx_ba_to_delete)) - ret = - wlan_send_delba(priv, pioctl_req, rx_reor_tbl_ptr->tid, - rx_reor_tbl_ptr->ta, 0); - else - ret = - wlan_send_delba(priv, MNULL, rx_reor_tbl_ptr->tid, - rx_reor_tbl_ptr->ta, 0); - } - } - rx_reor_tbl_ptr = rx_reor_tbl_ptr->pnext; - } - - LEAVE(); - return ret; + pmlan_adapter pmadapter = priv->adapter; + RxReorderTbl *rx_reor_tbl_ptr; + t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0 }; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + rx_reor_tbl_ptr = + (RxReorderTbl *) util_peek_list(pmadapter->pmoal_handle, + &priv->rx_reorder_tbl_ptr, + pmadapter->callbacks. + moal_spin_lock, + pmadapter->callbacks. + moal_spin_unlock); + if (!rx_reor_tbl_ptr) { + LEAVE(); + return ret; + } + + while (rx_reor_tbl_ptr != (RxReorderTbl *) & priv->rx_reorder_tbl_ptr) { + if (rx_reor_tbl_ptr->ba_status == BA_STREAM_SETUP_COMPLETE) { + if (((tid == DELBA_ALL_TIDS) || + (tid == rx_reor_tbl_ptr->tid)) && + (!memcmp + (pmadapter, peer_address, zero_mac, + MLAN_MAC_ADDR_LENGTH) || + !memcmp(pmadapter, peer_address, + rx_reor_tbl_ptr->ta, + MLAN_MAC_ADDR_LENGTH))) { + if (last_rx_ba_to_delete && + (rx_reor_tbl_ptr == last_rx_ba_to_delete)) + ret = wlan_send_delba(priv, pioctl_req, + rx_reor_tbl_ptr-> + tid, + rx_reor_tbl_ptr-> + ta, 0); + else + ret = wlan_send_delba(priv, MNULL, + rx_reor_tbl_ptr-> + tid, + rx_reor_tbl_ptr-> + ta, 0); + } + } + rx_reor_tbl_ptr = rx_reor_tbl_ptr->pnext; + } + + LEAVE(); + return ret; } -/** +/** * @brief IOCTL to delete BA * * @param pmadapter A pointer to mlan_adapter structure @@ -630,105 +670,120 @@ wlan_send_delba_to_entry_in_reorder_tbl(pmlan_private priv, static mlan_status wlan_11n_ioctl_delba(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_11n_cfg *cfg = MNULL; - TxBAStreamTbl *tx_ba_stream_tbl_ptr, *last_tx_ba_to_delete = MNULL; - RxReorderTbl *rx_reor_tbl_ptr, *last_rx_ba_to_delete = MNULL; - t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0 }; - t_u8 tid, *peer_address; - - ENTER(); - - cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; - tid = cfg->param.del_ba.tid; - peer_address = cfg->param.del_ba.peer_mac_addr; - - PRINTM(MINFO, "DelBA: direction %d, TID %d, peer address " MACSTR "\n", - cfg->param.del_ba.direction, tid, MAC2STR(peer_address)); - - if (cfg->param.del_ba.direction & DELBA_RX) { - rx_reor_tbl_ptr = - (RxReorderTbl *) util_peek_list(pmadapter->pmoal_handle, - &pmpriv->rx_reorder_tbl_ptr, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock); - - if (rx_reor_tbl_ptr) { - while (rx_reor_tbl_ptr != - (RxReorderTbl *) & pmpriv->rx_reorder_tbl_ptr) { - if (rx_reor_tbl_ptr->ba_status == BA_STREAM_SETUP_COMPLETE) { - if (((tid == DELBA_ALL_TIDS) || - (tid == rx_reor_tbl_ptr->tid)) && - (!memcmp - (pmadapter, peer_address, zero_mac, - MLAN_MAC_ADDR_LENGTH) || - !memcmp(pmadapter, peer_address, rx_reor_tbl_ptr->ta, - MLAN_MAC_ADDR_LENGTH))) { - /* Found RX BA to delete */ - last_rx_ba_to_delete = rx_reor_tbl_ptr; - } - } - rx_reor_tbl_ptr = rx_reor_tbl_ptr->pnext; - } - } - } - - if ((last_rx_ba_to_delete == MNULL) && - (cfg->param.del_ba.direction & DELBA_TX)) { - tx_ba_stream_tbl_ptr = - (TxBAStreamTbl *) util_peek_list(pmadapter->pmoal_handle, - &pmpriv->tx_ba_stream_tbl_ptr, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock); - - if (tx_ba_stream_tbl_ptr) { - while (tx_ba_stream_tbl_ptr != - (TxBAStreamTbl *) & pmpriv->tx_ba_stream_tbl_ptr) { - if (tx_ba_stream_tbl_ptr->ba_status == BA_STREAM_SETUP_COMPLETE) { - if (((tid == DELBA_ALL_TIDS) || - (tid == tx_ba_stream_tbl_ptr->tid)) && - (!memcmp - (pmadapter, peer_address, zero_mac, - MLAN_MAC_ADDR_LENGTH) || - !memcmp(pmadapter, peer_address, - tx_ba_stream_tbl_ptr->ra, - MLAN_MAC_ADDR_LENGTH))) { - /* Found TX BA to delete */ - last_tx_ba_to_delete = tx_ba_stream_tbl_ptr; - } - } - tx_ba_stream_tbl_ptr = tx_ba_stream_tbl_ptr->pnext; - } - } - } - - if (cfg->param.del_ba.direction & DELBA_TX) { - if (last_rx_ba_to_delete) - ret = - wlan_send_delba_to_entry_in_txbastream_tbl(pmpriv, MNULL, tid, - peer_address, MNULL); - else - ret = - wlan_send_delba_to_entry_in_txbastream_tbl(pmpriv, pioctl_req, - tid, peer_address, - last_tx_ba_to_delete); - } - if (last_rx_ba_to_delete) { - ret = - wlan_send_delba_to_entry_in_reorder_tbl(pmpriv, pioctl_req, tid, - peer_address, - last_rx_ba_to_delete); - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_11n_cfg *cfg = MNULL; + TxBAStreamTbl *tx_ba_stream_tbl_ptr, *last_tx_ba_to_delete = MNULL; + RxReorderTbl *rx_reor_tbl_ptr, *last_rx_ba_to_delete = MNULL; + t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0 }; + t_u8 tid, *peer_address; + + ENTER(); + + cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; + tid = cfg->param.del_ba.tid; + peer_address = cfg->param.del_ba.peer_mac_addr; + + PRINTM(MINFO, "DelBA: direction %d, TID %d, peer address " MACSTR "\n", + cfg->param.del_ba.direction, tid, MAC2STR(peer_address)); + + if (cfg->param.del_ba.direction & DELBA_RX) { + rx_reor_tbl_ptr = + (RxReorderTbl *) util_peek_list(pmadapter->pmoal_handle, + &pmpriv-> + rx_reorder_tbl_ptr, + pmadapter->callbacks. + moal_spin_lock, + pmadapter->callbacks. + moal_spin_unlock); + + if (rx_reor_tbl_ptr) { + while (rx_reor_tbl_ptr != + (RxReorderTbl *) & pmpriv->rx_reorder_tbl_ptr) { + if (rx_reor_tbl_ptr->ba_status == + BA_STREAM_SETUP_COMPLETE) { + if (((tid == DELBA_ALL_TIDS) || + (tid == rx_reor_tbl_ptr->tid)) && + (!memcmp + (pmadapter, peer_address, zero_mac, + MLAN_MAC_ADDR_LENGTH) || + !memcmp(pmadapter, peer_address, + rx_reor_tbl_ptr->ta, + MLAN_MAC_ADDR_LENGTH))) { + /* Found RX BA to delete */ + last_rx_ba_to_delete = + rx_reor_tbl_ptr; + } + } + rx_reor_tbl_ptr = rx_reor_tbl_ptr->pnext; + } + } + } + + if ((last_rx_ba_to_delete == MNULL) && + (cfg->param.del_ba.direction & DELBA_TX)) { + tx_ba_stream_tbl_ptr = + (TxBAStreamTbl *) util_peek_list(pmadapter-> + pmoal_handle, + &pmpriv-> + tx_ba_stream_tbl_ptr, + pmadapter->callbacks. + moal_spin_lock, + pmadapter->callbacks. + moal_spin_unlock); + + if (tx_ba_stream_tbl_ptr) { + while (tx_ba_stream_tbl_ptr != + (TxBAStreamTbl *) & pmpriv-> + tx_ba_stream_tbl_ptr) { + if (tx_ba_stream_tbl_ptr->ba_status == + BA_STREAM_SETUP_COMPLETE) { + if (((tid == DELBA_ALL_TIDS) || + (tid == tx_ba_stream_tbl_ptr->tid)) + && + (!memcmp + (pmadapter, peer_address, zero_mac, + MLAN_MAC_ADDR_LENGTH) || + !memcmp(pmadapter, peer_address, + tx_ba_stream_tbl_ptr->ra, + MLAN_MAC_ADDR_LENGTH))) { + /* Found TX BA to delete */ + last_tx_ba_to_delete = + tx_ba_stream_tbl_ptr; + } + } + tx_ba_stream_tbl_ptr = + tx_ba_stream_tbl_ptr->pnext; + } + } + } + + if (cfg->param.del_ba.direction & DELBA_TX) { + if (last_rx_ba_to_delete) + ret = wlan_send_delba_to_entry_in_txbastream_tbl(pmpriv, + MNULL, + tid, + peer_address, + MNULL); + else + ret = wlan_send_delba_to_entry_in_txbastream_tbl(pmpriv, + pioctl_req, + tid, + peer_address, + last_tx_ba_to_delete); + } + if (last_rx_ba_to_delete) { + ret = wlan_send_delba_to_entry_in_reorder_tbl(pmpriv, + pioctl_req, tid, + peer_address, + last_rx_ba_to_delete); + } + + LEAVE(); + return ret; } -/** +/** * @brief IOCTL to reject addba req * * @param pmadapter A pointer to mlan_adapter structure @@ -738,39 +793,40 @@ wlan_11n_ioctl_delba(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_11n_ioctl_rejectaddbareq(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_11n_cfg *cfg = MNULL; - t_u16 cmd_action = 0; - - ENTER(); - - cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) - cmd_action = HostCmd_ACT_GEN_SET; - else - cmd_action = HostCmd_ACT_GEN_GET; - - /* Send command to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_REJECT_ADDBA_REQ, - cmd_action, - 0, - (t_void *) pioctl_req, &cfg->param.reject_addba_req); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_11n_cfg *cfg = MNULL; + t_u16 cmd_action = 0; + + ENTER(); + + cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) + cmd_action = HostCmd_ACT_GEN_SET; + else + cmd_action = HostCmd_ACT_GEN_GET; + + /* Send command to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_REJECT_ADDBA_REQ, + cmd_action, + 0, + (t_void *) pioctl_req, + &cfg->param.reject_addba_req); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } /** * @brief This function will send DELBA to entries in the priv's * Tx BA stream table - * + * * @param priv A pointer to mlan_private * @param tid TID * @@ -779,41 +835,44 @@ wlan_11n_ioctl_rejectaddbareq(IN pmlan_adapter pmadapter, static void wlan_send_delba_txbastream_tbl(pmlan_private priv, t_u8 tid) { - pmlan_adapter pmadapter = priv->adapter; - TxBAStreamTbl *tx_ba_stream_tbl_ptr; - - ENTER(); - - if (! - (tx_ba_stream_tbl_ptr = - (TxBAStreamTbl *) util_peek_list(pmadapter->pmoal_handle, - &priv->tx_ba_stream_tbl_ptr, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return; - } - - while (tx_ba_stream_tbl_ptr != - (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { - if (tx_ba_stream_tbl_ptr->ba_status == BA_STREAM_SETUP_COMPLETE) { - if (tid == tx_ba_stream_tbl_ptr->tid) { - PRINTM(MIOCTL, "Tx:Send delba to tid=%d, " MACSTR "\n", tid, - MAC2STR(tx_ba_stream_tbl_ptr->ra)); - wlan_send_delba(priv, MNULL, tx_ba_stream_tbl_ptr->tid, - tx_ba_stream_tbl_ptr->ra, 1); - } - } - tx_ba_stream_tbl_ptr = tx_ba_stream_tbl_ptr->pnext; - } - - LEAVE(); - return; + pmlan_adapter pmadapter = priv->adapter; + TxBAStreamTbl *tx_ba_stream_tbl_ptr; + + ENTER(); + + tx_ba_stream_tbl_ptr = + (TxBAStreamTbl *) util_peek_list(pmadapter->pmoal_handle, + &priv->tx_ba_stream_tbl_ptr, + pmadapter->callbacks. + moal_spin_lock, + pmadapter->callbacks. + moal_spin_unlock); + if (!tx_ba_stream_tbl_ptr) { + LEAVE(); + return; + } + + while (tx_ba_stream_tbl_ptr != + (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { + if (tx_ba_stream_tbl_ptr->ba_status == BA_STREAM_SETUP_COMPLETE) { + if (tid == tx_ba_stream_tbl_ptr->tid) { + PRINTM(MIOCTL, + "Tx:Send delba to tid=%d, " MACSTR "\n", + tid, MAC2STR(tx_ba_stream_tbl_ptr->ra)); + wlan_send_delba(priv, MNULL, + tx_ba_stream_tbl_ptr->tid, + tx_ba_stream_tbl_ptr->ra, 1); + } + } + tx_ba_stream_tbl_ptr = tx_ba_stream_tbl_ptr->pnext; + } + + LEAVE(); + return; } -/** - * @brief Set/get aggr_prio_tbl +/** + * @brief Set/get aggr_prio_tbl * * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer @@ -822,66 +881,76 @@ wlan_send_delba_txbastream_tbl(pmlan_private priv, t_u8 tid) */ static mlan_status wlan_11n_ioctl_aggr_prio_tbl(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - int i = 0; - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_11n_cfg *cfg = MNULL; - - ENTER(); - - cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; - - if (pioctl_req->action == MLAN_ACT_GET) { - for (i = 0; i < MAX_NUM_TID; i++) { - cfg->param.aggr_prio_tbl.ampdu[i] = - pmpriv->aggr_prio_tbl[i].ampdu_user; - cfg->param.aggr_prio_tbl.amsdu[i] = pmpriv->aggr_prio_tbl[i].amsdu; - } - } else { - if (pmpriv->media_connected == MTRUE) { - for (i = 0; i < MAX_NUM_TID; i++) { - if (cfg->param.aggr_prio_tbl.ampdu[i] == BA_STREAM_NOT_ALLOWED) { - PRINTM(MIOCTL, - "Receive aggrpriotbl: BA not allowed tid=%d\n", i); - wlan_send_delba_txbastream_tbl(pmpriv, i); - } - } - wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_DEFER_HANDLING, MNULL); - } - - for (i = 0; i < MAX_NUM_TID; i++) { - /* For AMPDU */ - if ((cfg->param.aggr_prio_tbl.ampdu[i] > HIGH_PRIO_TID) && - (cfg->param.aggr_prio_tbl.ampdu[i] != BA_STREAM_NOT_ALLOWED)) { - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - break; - } - - pmpriv->aggr_prio_tbl[i].ampdu_ap = - pmpriv->aggr_prio_tbl[i].ampdu_user = - cfg->param.aggr_prio_tbl.ampdu[i]; - - /* For AMSDU */ - if ((cfg->param.aggr_prio_tbl.amsdu[i] > HIGH_PRIO_TID && - cfg->param.aggr_prio_tbl.amsdu[i] != BA_STREAM_NOT_ALLOWED)) { - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - break; - } else { - pmpriv->aggr_prio_tbl[i].amsdu = - cfg->param.aggr_prio_tbl.amsdu[i]; - } - } - } - - LEAVE(); - return ret; + int i = 0; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_11n_cfg *cfg = MNULL; + + ENTER(); + + cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; + + if (pioctl_req->action == MLAN_ACT_GET) { + for (i = 0; i < MAX_NUM_TID; i++) { + cfg->param.aggr_prio_tbl.ampdu[i] = + pmpriv->aggr_prio_tbl[i].ampdu_user; + cfg->param.aggr_prio_tbl.amsdu[i] = + pmpriv->aggr_prio_tbl[i].amsdu; + } + } else { + if (pmpriv->media_connected == MTRUE) { + for (i = 0; i < MAX_NUM_TID; i++) { + if (cfg->param.aggr_prio_tbl.ampdu[i] == + BA_STREAM_NOT_ALLOWED) { + PRINTM(MIOCTL, + "Receive aggrpriotbl: BA not allowed tid=%d\n", + i); + wlan_send_delba_txbastream_tbl(pmpriv, + i); + } + } + wlan_recv_event(pmpriv, + MLAN_EVENT_ID_DRV_DEFER_HANDLING, + MNULL); + } + + for (i = 0; i < MAX_NUM_TID; i++) { + /* For AMPDU */ + if ((cfg->param.aggr_prio_tbl.ampdu[i] > HIGH_PRIO_TID) + && (cfg->param.aggr_prio_tbl.ampdu[i] != + BA_STREAM_NOT_ALLOWED)) { + pioctl_req->status_code = + MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + break; + } + + pmpriv->aggr_prio_tbl[i].ampdu_ap = + pmpriv->aggr_prio_tbl[i].ampdu_user = + cfg->param.aggr_prio_tbl.ampdu[i]; + + /* For AMSDU */ + if ((cfg->param.aggr_prio_tbl.amsdu[i] > HIGH_PRIO_TID + && cfg->param.aggr_prio_tbl.amsdu[i] != + BA_STREAM_NOT_ALLOWED)) { + pioctl_req->status_code = + MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + break; + } else { + pmpriv->aggr_prio_tbl[i].amsdu = + cfg->param.aggr_prio_tbl.amsdu[i]; + } + } + } + + LEAVE(); + return ret; } -/** +/** * @brief Get supported MCS set * * @param pmadapter A pointer to mlan_adapter structure @@ -891,43 +960,43 @@ wlan_11n_ioctl_aggr_prio_tbl(IN pmlan_adapter pmadapter, */ static mlan_status wlan_11n_ioctl_supported_mcs_set(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_ds_11n_cfg *cfg = MNULL; - int rx_mcs_supp; - t_u8 mcs_set[NUM_MCS_FIELD]; - - ENTER(); - - if (pioctl_req->action == MLAN_ACT_SET) { - PRINTM(MERROR, "Set operation is not supported\n"); - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - rx_mcs_supp = GET_RXMCSSUPP(pmadapter->usr_dev_mcs_support); - /* Set MCS for 1x1/2x2 */ - memset(pmadapter, (t_u8 *) mcs_set, 0xff, rx_mcs_supp); - /* Clear all the other values */ - memset(pmadapter, (t_u8 *) & mcs_set[rx_mcs_supp], 0, - NUM_MCS_FIELD - rx_mcs_supp); - /* Set MCS32 with 40MHz support */ - if (ISSUPP_CHANWIDTH40(pmadapter->usr_dot_11n_dev_cap_bg) - || ISSUPP_CHANWIDTH40(pmadapter->usr_dot_11n_dev_cap_a) - ) - SETHT_MCS32(mcs_set); - - cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; - memcpy(pmadapter, cfg->param.supported_mcs_set, mcs_set, NUM_MCS_FIELD); - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_11n_cfg *cfg = MNULL; + int rx_mcs_supp; + t_u8 mcs_set[NUM_MCS_FIELD]; + + ENTER(); + + if (pioctl_req->action == MLAN_ACT_SET) { + PRINTM(MERROR, "Set operation is not supported\n"); + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + rx_mcs_supp = GET_RXMCSSUPP(pmadapter->usr_dev_mcs_support); + /* Set MCS for 1x1/2x2 */ + memset(pmadapter, (t_u8 *) mcs_set, 0xff, rx_mcs_supp); + /* Clear all the other values */ + memset(pmadapter, (t_u8 *) & mcs_set[rx_mcs_supp], 0, + NUM_MCS_FIELD - rx_mcs_supp); + /* Set MCS32 with 40MHz support */ + if (ISSUPP_CHANWIDTH40(pmadapter->usr_dot_11n_dev_cap_bg) + || ISSUPP_CHANWIDTH40(pmadapter->usr_dot_11n_dev_cap_a) + ) + SETHT_MCS32(mcs_set); + + cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; + memcpy(pmadapter, cfg->param.supported_mcs_set, mcs_set, NUM_MCS_FIELD); + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** - * @brief This function checks if the given pointer is valid entry of + * @brief This function checks if the given pointer is valid entry of * Tx BA Stream table - * + * * @param priv Pointer to mlan_private * @param ptxtblptr Pointer to tx ba stream entry * @@ -936,36 +1005,35 @@ wlan_11n_ioctl_supported_mcs_set(IN pmlan_adapter pmadapter, static int wlan_is_txbastreamptr_valid(mlan_private * priv, TxBAStreamTbl * ptxtblptr) { - TxBAStreamTbl *ptx_tbl; - - ENTER(); - - if (! - (ptx_tbl = - (TxBAStreamTbl *) util_peek_list(priv->adapter->pmoal_handle, - &priv->tx_ba_stream_tbl_ptr, MNULL, - MNULL))) { - LEAVE(); - return MFALSE; - } - - while (ptx_tbl != (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { - if (ptx_tbl == ptxtblptr) { - LEAVE(); - return MTRUE; - } - - ptx_tbl = ptx_tbl->pnext; - } - - LEAVE(); - return MFALSE; + TxBAStreamTbl *ptx_tbl; + + ENTER(); + + ptx_tbl = (TxBAStreamTbl *) util_peek_list(priv->adapter->pmoal_handle, + &priv->tx_ba_stream_tbl_ptr, + MNULL, MNULL); + if (!ptx_tbl) { + LEAVE(); + return MFALSE; + } + + while (ptx_tbl != (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { + if (ptx_tbl == ptxtblptr) { + LEAVE(); + return MTRUE; + } + + ptx_tbl = ptx_tbl->pnext; + } + + LEAVE(); + return MFALSE; } /** - * @brief This function will return the pointer to a entry in BA Stream + * @brief This function will return the pointer to a entry in BA Stream * table which matches the ba_status requested - * + * * @param priv A pointer to mlan_private * @param ba_status Current status of the BA stream * @@ -975,33 +1043,32 @@ wlan_is_txbastreamptr_valid(mlan_private * priv, TxBAStreamTbl * ptxtblptr) static TxBAStreamTbl * wlan_11n_get_txbastream_status(mlan_private * priv, baStatus_e ba_status) { - TxBAStreamTbl *ptx_tbl; - - ENTER(); - - if (! - (ptx_tbl = - (TxBAStreamTbl *) util_peek_list(priv->adapter->pmoal_handle, - &priv->tx_ba_stream_tbl_ptr, - priv->adapter->callbacks. - moal_spin_lock, - priv->adapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return MNULL; - } - - while (ptx_tbl != (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { - if (ptx_tbl->ba_status == ba_status) { - LEAVE(); - return ptx_tbl; - } - - ptx_tbl = ptx_tbl->pnext; - } - - LEAVE(); - return MNULL; + TxBAStreamTbl *ptx_tbl; + + ENTER(); + + ptx_tbl = (TxBAStreamTbl *) util_peek_list(priv->adapter->pmoal_handle, + &priv->tx_ba_stream_tbl_ptr, + priv->adapter->callbacks. + moal_spin_lock, + priv->adapter->callbacks. + moal_spin_unlock); + if (!ptx_tbl) { + LEAVE(); + return MNULL; + } + + while (ptx_tbl != (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { + if (ptx_tbl->ba_status == ba_status) { + LEAVE(); + return ptx_tbl; + } + + ptx_tbl = ptx_tbl->pnext; + } + + LEAVE(); + return MNULL; } /******************************************************** @@ -1020,67 +1087,67 @@ wlan_11n_get_txbastream_status(mlan_private * priv, baStatus_e ba_status) */ static void wlan_fill_cap_info(mlan_private * priv, - MrvlIETypes_HTCap_t * pht_cap, t_u8 bands) + MrvlIETypes_HTCap_t * pht_cap, t_u8 bands) { - mlan_adapter *pmadapter = priv->adapter; - t_u32 usr_dot_11n_dev_cap; - - ENTER(); - - if (bands & BAND_A) - usr_dot_11n_dev_cap = pmadapter->usr_dot_11n_dev_cap_a; - else - usr_dot_11n_dev_cap = pmadapter->usr_dot_11n_dev_cap_bg; - - if (ISSUPP_CHANWIDTH40(usr_dot_11n_dev_cap)) - SETHT_SUPPCHANWIDTH(pht_cap->ht_cap.ht_cap_info); - else - RESETHT_SUPPCHANWIDTH(pht_cap->ht_cap.ht_cap_info); - - if (ISSUPP_GREENFIELD(usr_dot_11n_dev_cap)) - SETHT_GREENFIELD(pht_cap->ht_cap.ht_cap_info); - else - RESETHT_GREENFIELD(pht_cap->ht_cap.ht_cap_info); - - if (ISSUPP_SHORTGI20(usr_dot_11n_dev_cap)) - SETHT_SHORTGI20(pht_cap->ht_cap.ht_cap_info); - else - RESETHT_SHORTGI20(pht_cap->ht_cap.ht_cap_info); - - if (ISSUPP_SHORTGI40(usr_dot_11n_dev_cap)) - SETHT_SHORTGI40(pht_cap->ht_cap.ht_cap_info); - else - RESETHT_SHORTGI40(pht_cap->ht_cap.ht_cap_info); - - if (ISSUPP_RXSTBC(usr_dot_11n_dev_cap)) - SETHT_RXSTBC(pht_cap->ht_cap.ht_cap_info, 1); - else - RESETHT_RXSTBC(pht_cap->ht_cap.ht_cap_info); - - if (ISENABLED_40MHZ_INTOLARENT(usr_dot_11n_dev_cap)) - SETHT_40MHZ_INTOLARANT(pht_cap->ht_cap.ht_cap_info); - else - RESETHT_40MHZ_INTOLARANT(pht_cap->ht_cap.ht_cap_info); - - /* No user config for LDPC coding capability yet */ - if (ISSUPP_RXLDPC(pmadapter->hw_dot_11n_dev_cap)) - SETHT_LDPCCODINGCAP(pht_cap->ht_cap.ht_cap_info); - else - RESETHT_LDPCCODINGCAP(pht_cap->ht_cap.ht_cap_info); - - /* No user config for TX STBC yet */ - if (ISSUPP_TXSTBC(pmadapter->hw_dot_11n_dev_cap)) - SETHT_TXSTBC(pht_cap->ht_cap.ht_cap_info); - else - RESETHT_TXSTBC(pht_cap->ht_cap.ht_cap_info); - - /* No user config for Delayed BACK yet */ - RESETHT_DELAYEDBACK(pht_cap->ht_cap.ht_cap_info); - - /* Need change to support 8k AMSDU receive */ - RESETHT_MAXAMSDU(pht_cap->ht_cap.ht_cap_info); - - LEAVE(); + mlan_adapter *pmadapter = priv->adapter; + t_u32 usr_dot_11n_dev_cap; + + ENTER(); + + if (bands & BAND_A) + usr_dot_11n_dev_cap = pmadapter->usr_dot_11n_dev_cap_a; + else + usr_dot_11n_dev_cap = pmadapter->usr_dot_11n_dev_cap_bg; + + if (ISSUPP_CHANWIDTH40(usr_dot_11n_dev_cap)) + SETHT_SUPPCHANWIDTH(pht_cap->ht_cap.ht_cap_info); + else + RESETHT_SUPPCHANWIDTH(pht_cap->ht_cap.ht_cap_info); + + if (ISSUPP_GREENFIELD(usr_dot_11n_dev_cap)) + SETHT_GREENFIELD(pht_cap->ht_cap.ht_cap_info); + else + RESETHT_GREENFIELD(pht_cap->ht_cap.ht_cap_info); + + if (ISSUPP_SHORTGI20(usr_dot_11n_dev_cap)) + SETHT_SHORTGI20(pht_cap->ht_cap.ht_cap_info); + else + RESETHT_SHORTGI20(pht_cap->ht_cap.ht_cap_info); + + if (ISSUPP_SHORTGI40(usr_dot_11n_dev_cap)) + SETHT_SHORTGI40(pht_cap->ht_cap.ht_cap_info); + else + RESETHT_SHORTGI40(pht_cap->ht_cap.ht_cap_info); + + if (ISSUPP_RXSTBC(usr_dot_11n_dev_cap)) + SETHT_RXSTBC(pht_cap->ht_cap.ht_cap_info, 1); + else + RESETHT_RXSTBC(pht_cap->ht_cap.ht_cap_info); + + if (ISENABLED_40MHZ_INTOLARENT(usr_dot_11n_dev_cap)) + SETHT_40MHZ_INTOLARANT(pht_cap->ht_cap.ht_cap_info); + else + RESETHT_40MHZ_INTOLARANT(pht_cap->ht_cap.ht_cap_info); + + /* No user config for LDPC coding capability yet */ + if (ISSUPP_RXLDPC(pmadapter->hw_dot_11n_dev_cap)) + SETHT_LDPCCODINGCAP(pht_cap->ht_cap.ht_cap_info); + else + RESETHT_LDPCCODINGCAP(pht_cap->ht_cap.ht_cap_info); + + /* No user config for TX STBC yet */ + if (ISSUPP_TXSTBC(pmadapter->hw_dot_11n_dev_cap)) + SETHT_TXSTBC(pht_cap->ht_cap.ht_cap_info); + else + RESETHT_TXSTBC(pht_cap->ht_cap.ht_cap_info); + + /* No user config for Delayed BACK yet */ + RESETHT_DELAYEDBACK(pht_cap->ht_cap.ht_cap_info); + + /* Need change to support 8k AMSDU receive */ + RESETHT_MAXAMSDU(pht_cap->ht_cap.ht_cap_info); + + LEAVE(); } /** @@ -1094,50 +1161,54 @@ wlan_fill_cap_info(mlan_private * priv, */ void wlan_fill_ht_cap_tlv(mlan_private * priv, - MrvlIETypes_HTCap_t * pht_cap, t_u8 bands) + MrvlIETypes_HTCap_t * pht_cap, t_u8 bands) { - mlan_adapter *pmadapter = priv->adapter; - int rx_mcs_supp; - t_u32 usr_dot_11n_dev_cap; - - ENTER(); - - if (bands & BAND_A) - usr_dot_11n_dev_cap = pmadapter->usr_dot_11n_dev_cap_a; - else - usr_dot_11n_dev_cap = pmadapter->usr_dot_11n_dev_cap_bg; - - /* Fill HT cap info */ - wlan_fill_cap_info(priv, pht_cap, bands); - pht_cap->ht_cap.ht_cap_info = wlan_cpu_to_le16(pht_cap->ht_cap.ht_cap_info); - - /* Set ampdu param */ - SETAMPDU_SIZE(pht_cap->ht_cap.ampdu_param, AMPDU_FACTOR_64K); - SETAMPDU_SPACING(pht_cap->ht_cap.ampdu_param, 0); - - rx_mcs_supp = GET_RXMCSSUPP(pmadapter->usr_dev_mcs_support); - /* Clear all the other values to get the minimum mcs set btw STA and AP */ - memset(pmadapter, (t_u8 *) & pht_cap->ht_cap.supported_mcs_set[rx_mcs_supp], - 0, NUM_MCS_FIELD - rx_mcs_supp); - /* Set MCS32 with 40MHz support */ - if (ISSUPP_CHANWIDTH40(usr_dot_11n_dev_cap)) - SETHT_MCS32(pht_cap->ht_cap.supported_mcs_set); - - /* Clear RD responder bit */ - RESETHT_EXTCAP_RDG(pht_cap->ht_cap.ht_ext_cap); - pht_cap->ht_cap.ht_ext_cap = wlan_cpu_to_le16(pht_cap->ht_cap.ht_ext_cap); - - /* Set Tx BF cap */ - pht_cap->ht_cap.tx_bf_cap = wlan_cpu_to_le32(priv->tx_bf_cap); - - LEAVE(); - return; + mlan_adapter *pmadapter = priv->adapter; + int rx_mcs_supp; + t_u32 usr_dot_11n_dev_cap; + + ENTER(); + + if (bands & BAND_A) + usr_dot_11n_dev_cap = pmadapter->usr_dot_11n_dev_cap_a; + else + usr_dot_11n_dev_cap = pmadapter->usr_dot_11n_dev_cap_bg; + + /* Fill HT cap info */ + wlan_fill_cap_info(priv, pht_cap, bands); + pht_cap->ht_cap.ht_cap_info = + wlan_cpu_to_le16(pht_cap->ht_cap.ht_cap_info); + + /* Set ampdu param */ + SETAMPDU_SIZE(pht_cap->ht_cap.ampdu_param, AMPDU_FACTOR_64K); + SETAMPDU_SPACING(pht_cap->ht_cap.ampdu_param, 0); + + rx_mcs_supp = GET_RXMCSSUPP(pmadapter->usr_dev_mcs_support); + /* Clear all the other values to get the minimum mcs set btw STA and AP + */ + memset(pmadapter, + (t_u8 *) & pht_cap->ht_cap.supported_mcs_set[rx_mcs_supp], 0, + NUM_MCS_FIELD - rx_mcs_supp); + /* Set MCS32 with 40MHz support */ + if (ISSUPP_CHANWIDTH40(usr_dot_11n_dev_cap)) + SETHT_MCS32(pht_cap->ht_cap.supported_mcs_set); + + /* Clear RD responder bit */ + RESETHT_EXTCAP_RDG(pht_cap->ht_cap.ht_ext_cap); + pht_cap->ht_cap.ht_ext_cap = + wlan_cpu_to_le16(pht_cap->ht_cap.ht_ext_cap); + + /* Set Tx BF cap */ + pht_cap->ht_cap.tx_bf_cap = wlan_cpu_to_le32(priv->tx_bf_cap); + + LEAVE(); + return; } #endif /* STA_SUPPORT */ -/** +/** * @brief This function prints the 802.11n device capability - * + * * @param pmadapter A pointer to mlan_adapter structure * @param cap Capability value * @@ -1146,69 +1217,69 @@ wlan_fill_ht_cap_tlv(mlan_private * priv, void wlan_show_dot11ndevcap(pmlan_adapter pmadapter, t_u32 cap) { - ENTER(); - - PRINTM(MINFO, "GET_HW_SPEC: Maximum MSDU length = %s octets\n", - (ISSUPP_MAXAMSDU(cap) ? "7935" : "3839")); - PRINTM(MINFO, "GET_HW_SPEC: Beam forming %s\n", - (ISSUPP_BEAMFORMING(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: Greenfield preamble %s\n", - (ISSUPP_GREENFIELD(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: AMPDU %s\n", - (ISSUPP_AMPDU(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: MIMO Power Save %s\n", - (ISSUPP_MIMOPS(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: Rx STBC %s\n", - (ISSUPP_RXSTBC(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: Tx STBC %s\n", - (ISSUPP_TXSTBC(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: Short GI for 40 Mhz %s\n", - (ISSUPP_SHORTGI40(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: Short GI for 20 Mhz %s\n", - (ISSUPP_SHORTGI20(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: LDPC coded packet receive %s\n", - (ISSUPP_RXLDPC(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: Number of Tx BA streams supported = %d\n", - ISSUPP_GETTXBASTREAM(cap)); - PRINTM(MINFO, "GET_HW_SPEC: 40 Mhz channel width %s\n", - (ISSUPP_CHANWIDTH40(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: 20 Mhz channel width %s\n", - (ISSUPP_CHANWIDTH20(cap) ? "supported" : "not supported")); - PRINTM(MINFO, "GET_HW_SPEC: 10 Mhz channel width %s\n", - (ISSUPP_CHANWIDTH10(cap) ? "supported" : "not supported")); - - if (ISSUPP_RXANTENNAA(cap)) { - PRINTM(MINFO, "GET_HW_SPEC: Presence of Rx antenna A\n"); - } - if (ISSUPP_RXANTENNAB(cap)) { - PRINTM(MINFO, "GET_HW_SPEC: Presence of Rx antenna B\n"); - } - if (ISSUPP_RXANTENNAC(cap)) { - PRINTM(MINFO, "GET_HW_SPEC: Presence of Rx antenna C\n"); - } - if (ISSUPP_RXANTENNAD(cap)) { - PRINTM(MINFO, "GET_HW_SPEC: Presence of Rx antenna D\n"); - } - if (ISSUPP_TXANTENNAA(cap)) { - PRINTM(MINFO, "GET_HW_SPEC: Presence of Tx antenna A\n"); - } - if (ISSUPP_TXANTENNAB(cap)) { - PRINTM(MINFO, "GET_HW_SPEC: Presence of Tx antenna B\n"); - } - if (ISSUPP_TXANTENNAC(cap)) { - PRINTM(MINFO, "GET_HW_SPEC: Presence of Tx antenna C\n"); - } - if (ISSUPP_TXANTENNAD(cap)) { - PRINTM(MINFO, "GET_HW_SPEC: Presence of Tx antenna D\n"); - } - - LEAVE(); - return; + ENTER(); + + PRINTM(MINFO, "GET_HW_SPEC: Maximum MSDU length = %s octets\n", + (ISSUPP_MAXAMSDU(cap) ? "7935" : "3839")); + PRINTM(MINFO, "GET_HW_SPEC: Beam forming %s\n", + (ISSUPP_BEAMFORMING(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: Greenfield preamble %s\n", + (ISSUPP_GREENFIELD(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: AMPDU %s\n", + (ISSUPP_AMPDU(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: MIMO Power Save %s\n", + (ISSUPP_MIMOPS(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: Rx STBC %s\n", + (ISSUPP_RXSTBC(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: Tx STBC %s\n", + (ISSUPP_TXSTBC(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: Short GI for 40 Mhz %s\n", + (ISSUPP_SHORTGI40(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: Short GI for 20 Mhz %s\n", + (ISSUPP_SHORTGI20(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: LDPC coded packet receive %s\n", + (ISSUPP_RXLDPC(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: Number of Tx BA streams supported = %d\n", + ISSUPP_GETTXBASTREAM(cap)); + PRINTM(MINFO, "GET_HW_SPEC: 40 Mhz channel width %s\n", + (ISSUPP_CHANWIDTH40(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: 20 Mhz channel width %s\n", + (ISSUPP_CHANWIDTH20(cap) ? "supported" : "not supported")); + PRINTM(MINFO, "GET_HW_SPEC: 10 Mhz channel width %s\n", + (ISSUPP_CHANWIDTH10(cap) ? "supported" : "not supported")); + + if (ISSUPP_RXANTENNAA(cap)) { + PRINTM(MINFO, "GET_HW_SPEC: Presence of Rx antenna A\n"); + } + if (ISSUPP_RXANTENNAB(cap)) { + PRINTM(MINFO, "GET_HW_SPEC: Presence of Rx antenna B\n"); + } + if (ISSUPP_RXANTENNAC(cap)) { + PRINTM(MINFO, "GET_HW_SPEC: Presence of Rx antenna C\n"); + } + if (ISSUPP_RXANTENNAD(cap)) { + PRINTM(MINFO, "GET_HW_SPEC: Presence of Rx antenna D\n"); + } + if (ISSUPP_TXANTENNAA(cap)) { + PRINTM(MINFO, "GET_HW_SPEC: Presence of Tx antenna A\n"); + } + if (ISSUPP_TXANTENNAB(cap)) { + PRINTM(MINFO, "GET_HW_SPEC: Presence of Tx antenna B\n"); + } + if (ISSUPP_TXANTENNAC(cap)) { + PRINTM(MINFO, "GET_HW_SPEC: Presence of Tx antenna C\n"); + } + if (ISSUPP_TXANTENNAD(cap)) { + PRINTM(MINFO, "GET_HW_SPEC: Presence of Tx antenna D\n"); + } + + LEAVE(); + return; } -/** +/** * @brief This function prints the 802.11n device MCS - * + * * @param pmadapter A pointer to mlan_adapter structure * @param support Support value * @@ -1217,19 +1288,19 @@ wlan_show_dot11ndevcap(pmlan_adapter pmadapter, t_u32 cap) void wlan_show_devmcssupport(pmlan_adapter pmadapter, t_u8 support) { - ENTER(); + ENTER(); - PRINTM(MINFO, "GET_HW_SPEC: MCSs for %dx%d MIMO\n", GET_RXMCSSUPP(support), - GET_TXMCSSUPP(support)); + PRINTM(MINFO, "GET_HW_SPEC: MCSs for %dx%d MIMO\n", + GET_RXMCSSUPP(support), GET_TXMCSSUPP(support)); - LEAVE(); - return; + LEAVE(); + return; } -/** +/** * @brief This function handles the command response of * delete a block ack request - * + * * @param priv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @@ -1238,52 +1309,58 @@ wlan_show_devmcssupport(pmlan_adapter pmadapter, t_u8 support) mlan_status wlan_ret_11n_delba(mlan_private * priv, HostCmd_DS_COMMAND * resp) { - int tid; - TxBAStreamTbl *ptx_ba_tbl; - HostCmd_DS_11N_DELBA *pdel_ba = - (HostCmd_DS_11N_DELBA *) & resp->params.del_ba; - - ENTER(); - - pdel_ba->del_ba_param_set = wlan_le16_to_cpu(pdel_ba->del_ba_param_set); - pdel_ba->reason_code = wlan_le16_to_cpu(pdel_ba->reason_code); - - tid = pdel_ba->del_ba_param_set >> DELBA_TID_POS; - if (pdel_ba->del_result == BA_RESULT_SUCCESS) { - mlan_11n_delete_bastream_tbl(priv, tid, pdel_ba->peer_mac_addr, - TYPE_DELBA_SENT, - INITIATOR_BIT(pdel_ba->del_ba_param_set)); - - if ((ptx_ba_tbl = wlan_11n_get_txbastream_status(priv, - BA_STREAM_SETUP_INPROGRESS))) - { - wlan_send_addba(priv, ptx_ba_tbl->tid, ptx_ba_tbl->ra); - } - } else { /* - * In case of failure, recreate the deleted stream in - * case we initiated the ADDBA - */ - if (INITIATOR_BIT(pdel_ba->del_ba_param_set)) { - wlan_11n_create_txbastream_tbl(priv, pdel_ba->peer_mac_addr, tid, - BA_STREAM_SETUP_INPROGRESS); - if ((ptx_ba_tbl = wlan_11n_get_txbastream_status(priv, - BA_STREAM_SETUP_INPROGRESS))) - { - mlan_11n_delete_bastream_tbl(priv, ptx_ba_tbl->tid, - ptx_ba_tbl->ra, TYPE_DELBA_SENT, - MTRUE); - } - } - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + int tid; + TxBAStreamTbl *ptx_ba_tbl; + HostCmd_DS_11N_DELBA *pdel_ba = + (HostCmd_DS_11N_DELBA *) & resp->params.del_ba; + + ENTER(); + + pdel_ba->del_ba_param_set = wlan_le16_to_cpu(pdel_ba->del_ba_param_set); + pdel_ba->reason_code = wlan_le16_to_cpu(pdel_ba->reason_code); + + tid = pdel_ba->del_ba_param_set >> DELBA_TID_POS; + if (pdel_ba->del_result == BA_RESULT_SUCCESS) { + mlan_11n_delete_bastream_tbl(priv, tid, pdel_ba->peer_mac_addr, + TYPE_DELBA_SENT, + INITIATOR_BIT(pdel_ba-> + del_ba_param_set)); + + ptx_ba_tbl = wlan_11n_get_txbastream_status(priv, + BA_STREAM_SETUP_INPROGRESS); + if (ptx_ba_tbl) { + wlan_send_addba(priv, ptx_ba_tbl->tid, ptx_ba_tbl->ra); + } + } else { /* + * In case of failure, recreate the deleted stream in + * case we initiated the ADDBA + */ + if (INITIATOR_BIT(pdel_ba->del_ba_param_set)) { + wlan_11n_create_txbastream_tbl(priv, + pdel_ba->peer_mac_addr, + tid, + BA_STREAM_SETUP_INPROGRESS); + ptx_ba_tbl = + wlan_11n_get_txbastream_status(priv, + BA_STREAM_SETUP_INPROGRESS); + if (ptx_ba_tbl) { + mlan_11n_delete_bastream_tbl(priv, + ptx_ba_tbl->tid, + ptx_ba_tbl->ra, + TYPE_DELBA_SENT, + MTRUE); + } + } + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of * add a block ack request - * + * * @param priv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @@ -1292,74 +1369,89 @@ wlan_ret_11n_delba(mlan_private * priv, HostCmd_DS_COMMAND * resp) mlan_status wlan_ret_11n_addba_req(mlan_private * priv, HostCmd_DS_COMMAND * resp) { - t_u8 tid; - HostCmd_DS_11N_ADDBA_RSP *padd_ba_rsp = - (HostCmd_DS_11N_ADDBA_RSP *) & resp->params.add_ba_rsp; - TxBAStreamTbl *ptx_ba_tbl; - raListTbl *ra_list = MNULL; - - ENTER(); - - padd_ba_rsp->block_ack_param_set = - wlan_le16_to_cpu(padd_ba_rsp->block_ack_param_set); - padd_ba_rsp->block_ack_tmo = wlan_le16_to_cpu(padd_ba_rsp->block_ack_tmo); - padd_ba_rsp->ssn = (wlan_le16_to_cpu(padd_ba_rsp->ssn)) & SSN_MASK; - padd_ba_rsp->status_code = wlan_le16_to_cpu(padd_ba_rsp->status_code); - - tid = (padd_ba_rsp->block_ack_param_set & BLOCKACKPARAM_TID_MASK) - >> BLOCKACKPARAM_TID_POS; - if (padd_ba_rsp->status_code == BA_RESULT_SUCCESS) { - if ((ptx_ba_tbl = wlan_11n_get_txbastream_tbl(priv, tid, - padd_ba_rsp-> - peer_mac_addr))) { - PRINTM(MCMND, - "ADDBA REQ: " MACSTR " tid=%d ssn=%d win_size=%d,amsdu=%d\n", - MAC2STR(padd_ba_rsp->peer_mac_addr), tid, padd_ba_rsp->ssn, - ((padd_ba_rsp-> - block_ack_param_set & BLOCKACKPARAM_WINSIZE_MASK) >> - BLOCKACKPARAM_WINSIZE_POS), - padd_ba_rsp-> - block_ack_param_set & BLOCKACKPARAM_AMSDU_SUPP_MASK); - ptx_ba_tbl->ba_status = BA_STREAM_SETUP_COMPLETE; - if ((padd_ba_rsp-> - block_ack_param_set & BLOCKACKPARAM_AMSDU_SUPP_MASK) && - priv->add_ba_param.tx_amsdu && - (priv->aggr_prio_tbl[tid].amsdu != BA_STREAM_NOT_ALLOWED)) - ptx_ba_tbl->amsdu = MTRUE; - else - ptx_ba_tbl->amsdu = MFALSE; - } else { - PRINTM(MERROR, "BA stream not created\n"); - } - } else { - mlan_11n_delete_bastream_tbl(priv, tid, padd_ba_rsp->peer_mac_addr, - TYPE_DELBA_SENT, MTRUE); - if (padd_ba_rsp->add_rsp_result != BA_RESULT_TIMEOUT) { + t_u8 tid; + HostCmd_DS_11N_ADDBA_RSP *padd_ba_rsp = + (HostCmd_DS_11N_ADDBA_RSP *) & resp->params.add_ba_rsp; + TxBAStreamTbl *ptx_ba_tbl; + raListTbl *ra_list = MNULL; + + ENTER(); + + padd_ba_rsp->block_ack_param_set = + wlan_le16_to_cpu(padd_ba_rsp->block_ack_param_set); + padd_ba_rsp->block_ack_tmo = + wlan_le16_to_cpu(padd_ba_rsp->block_ack_tmo); + padd_ba_rsp->ssn = (wlan_le16_to_cpu(padd_ba_rsp->ssn)) & SSN_MASK; + padd_ba_rsp->status_code = wlan_le16_to_cpu(padd_ba_rsp->status_code); + + tid = (padd_ba_rsp->block_ack_param_set & BLOCKACKPARAM_TID_MASK) + >> BLOCKACKPARAM_TID_POS; + if (padd_ba_rsp->status_code == BA_RESULT_SUCCESS) { + ptx_ba_tbl = wlan_11n_get_txbastream_tbl(priv, tid, + padd_ba_rsp-> + peer_mac_addr); + if (ptx_ba_tbl) { + PRINTM(MCMND, + "ADDBA REQ: " MACSTR + " tid=%d ssn=%d win_size=%d,amsdu=%d\n", + MAC2STR(padd_ba_rsp->peer_mac_addr), tid, + padd_ba_rsp->ssn, + ((padd_ba_rsp-> + block_ack_param_set & + BLOCKACKPARAM_WINSIZE_MASK) >> + BLOCKACKPARAM_WINSIZE_POS), + padd_ba_rsp-> + block_ack_param_set & + BLOCKACKPARAM_AMSDU_SUPP_MASK); + ptx_ba_tbl->ba_status = BA_STREAM_SETUP_COMPLETE; + if ((padd_ba_rsp-> + block_ack_param_set & + BLOCKACKPARAM_AMSDU_SUPP_MASK) && + priv->add_ba_param.tx_amsdu && + (priv->aggr_prio_tbl[tid].amsdu != + BA_STREAM_NOT_ALLOWED)) + ptx_ba_tbl->amsdu = MTRUE; + else + ptx_ba_tbl->amsdu = MFALSE; + } else { + PRINTM(MERROR, "BA stream not created\n"); + } + } else { + mlan_11n_delete_bastream_tbl(priv, tid, + padd_ba_rsp->peer_mac_addr, + TYPE_DELBA_SENT, MTRUE); + if (padd_ba_rsp->add_rsp_result != BA_RESULT_TIMEOUT) { #ifdef UAP_SUPPORT - if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) - disable_station_ampdu(priv, tid, padd_ba_rsp->peer_mac_addr); + if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) + disable_station_ampdu(priv, tid, + padd_ba_rsp-> + peer_mac_addr); #endif /* UAP_SUPPORT */ - priv->aggr_prio_tbl[tid].ampdu_ap = BA_STREAM_NOT_ALLOWED; - - } else { - /* reset packet threshold */ - ra_list = - wlan_wmm_get_ralist_node(priv, tid, padd_ba_rsp->peer_mac_addr); - if (ra_list) { - ra_list->packet_count = 0; - ra_list->ba_packet_threshold = - wlan_get_random_ba_threshold(priv->adapter); - } - } - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + priv->aggr_prio_tbl[tid].ampdu_ap = + BA_STREAM_NOT_ALLOWED; + + } else { + /* reset packet threshold */ + ra_list = + wlan_wmm_get_ralist_node(priv, tid, + padd_ba_rsp-> + peer_mac_addr); + if (ra_list) { + ra_list->packet_count = 0; + ra_list->ba_packet_threshold = + wlan_get_random_ba_threshold(priv-> + adapter); + } + } + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command of reconfigure tx buf - * + * * @param priv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -1369,34 +1461,34 @@ wlan_ret_11n_addba_req(mlan_private * priv, HostCmd_DS_COMMAND * resp) */ mlan_status wlan_cmd_recfg_tx_buf(mlan_private * priv, - HostCmd_DS_COMMAND * cmd, int cmd_action, void *pdata_buf) + HostCmd_DS_COMMAND * cmd, int cmd_action, void *pdata_buf) { - HostCmd_DS_TXBUF_CFG *ptx_buf = &cmd->params.tx_buf; - t_u16 action = (t_u16) cmd_action; - t_u16 buf_size = *((t_u16 *) pdata_buf); - - ENTER(); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_RECONFIGURE_TX_BUFF); - cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_TXBUF_CFG) - + S_DS_GEN); - ptx_buf->action = wlan_cpu_to_le16(action); - switch (action) { - case HostCmd_ACT_GEN_SET: - PRINTM(MCMND, "set tx_buf = %d\n", buf_size); - ptx_buf->buff_size = wlan_cpu_to_le16(buf_size); - break; - case HostCmd_ACT_GEN_GET: - default: - ptx_buf->buff_size = 0; - break; - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_TXBUF_CFG *ptx_buf = &cmd->params.tx_buf; + t_u16 action = (t_u16) cmd_action; + t_u16 buf_size = *((t_u16 *) pdata_buf); + + ENTER(); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_RECONFIGURE_TX_BUFF); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_TXBUF_CFG) + + S_DS_GEN); + ptx_buf->action = wlan_cpu_to_le16(action); + switch (action) { + case HostCmd_ACT_GEN_SET: + PRINTM(MCMND, "set tx_buf = %d\n", buf_size); + ptx_buf->buff_size = wlan_cpu_to_le16(buf_size); + break; + case HostCmd_ACT_GEN_GET: + default: + ptx_buf->buff_size = 0; + break; + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command of amsdu aggr control - * + * * @param priv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -1406,37 +1498,37 @@ wlan_cmd_recfg_tx_buf(mlan_private * priv, */ mlan_status wlan_cmd_amsdu_aggr_ctrl(mlan_private * priv, - HostCmd_DS_COMMAND * cmd, - int cmd_action, void *pdata_buf) + HostCmd_DS_COMMAND * cmd, + int cmd_action, void *pdata_buf) { - HostCmd_DS_AMSDU_AGGR_CTRL *pamsdu_ctrl = &cmd->params.amsdu_aggr_ctrl; - t_u16 action = (t_u16) cmd_action; - mlan_ds_11n_amsdu_aggr_ctrl *aa_ctrl = (mlan_ds_11n_amsdu_aggr_ctrl *) - pdata_buf; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_AMSDU_AGGR_CTRL); - cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_AMSDU_AGGR_CTRL) - + S_DS_GEN); - pamsdu_ctrl->action = wlan_cpu_to_le16(action); - switch (action) { - case HostCmd_ACT_GEN_SET: - pamsdu_ctrl->enable = wlan_cpu_to_le16(aa_ctrl->enable); - pamsdu_ctrl->curr_buf_size = 0; - break; - case HostCmd_ACT_GEN_GET: - default: - pamsdu_ctrl->curr_buf_size = 0; - break; - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_AMSDU_AGGR_CTRL *pamsdu_ctrl = &cmd->params.amsdu_aggr_ctrl; + t_u16 action = (t_u16) cmd_action; + mlan_ds_11n_amsdu_aggr_ctrl *aa_ctrl = (mlan_ds_11n_amsdu_aggr_ctrl *) + pdata_buf; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_AMSDU_AGGR_CTRL); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_AMSDU_AGGR_CTRL) + + S_DS_GEN); + pamsdu_ctrl->action = wlan_cpu_to_le16(action); + switch (action) { + case HostCmd_ACT_GEN_SET: + pamsdu_ctrl->enable = wlan_cpu_to_le16(aa_ctrl->enable); + pamsdu_ctrl->curr_buf_size = 0; + break; + case HostCmd_ACT_GEN_GET: + default: + pamsdu_ctrl->curr_buf_size = 0; + break; + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of amsdu aggr ctrl - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -1445,28 +1537,28 @@ wlan_cmd_amsdu_aggr_ctrl(mlan_private * priv, */ mlan_status wlan_ret_amsdu_aggr_ctrl(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - mlan_ds_11n_cfg *cfg = MNULL; - HostCmd_DS_AMSDU_AGGR_CTRL *amsdu_ctrl = &resp->params.amsdu_aggr_ctrl; - - ENTER(); - - if (pioctl_buf) { - cfg = (mlan_ds_11n_cfg *) pioctl_buf->pbuf; - cfg->param.amsdu_aggr_ctrl.enable = - wlan_le16_to_cpu(amsdu_ctrl->enable); - cfg->param.amsdu_aggr_ctrl.curr_buf_size = - wlan_le16_to_cpu(amsdu_ctrl->curr_buf_size); - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_11n_cfg *cfg = MNULL; + HostCmd_DS_AMSDU_AGGR_CTRL *amsdu_ctrl = &resp->params.amsdu_aggr_ctrl; + + ENTER(); + + if (pioctl_buf) { + cfg = (mlan_ds_11n_cfg *) pioctl_buf->pbuf; + cfg->param.amsdu_aggr_ctrl.enable = + wlan_le16_to_cpu(amsdu_ctrl->enable); + cfg->param.amsdu_aggr_ctrl.curr_buf_size = + wlan_le16_to_cpu(amsdu_ctrl->curr_buf_size); + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares 11n cfg command - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action the action: GET or SET @@ -1475,26 +1567,26 @@ wlan_ret_amsdu_aggr_ctrl(IN pmlan_private pmpriv, */ mlan_status wlan_cmd_11n_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - HostCmd_DS_11N_CFG *htcfg = &cmd->params.htcfg; - mlan_ds_11n_tx_cfg *txcfg = (mlan_ds_11n_tx_cfg *) pdata_buf; - - ENTER(); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_11N_CFG); - cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_11N_CFG) + S_DS_GEN); - htcfg->action = wlan_cpu_to_le16(cmd_action); - htcfg->ht_tx_cap = wlan_cpu_to_le16(txcfg->httxcap); - htcfg->ht_tx_info = wlan_cpu_to_le16(txcfg->httxinfo); - htcfg->misc_config = wlan_cpu_to_le16(txcfg->misc_cfg); - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_11N_CFG *htcfg = &cmd->params.htcfg; + mlan_ds_11n_tx_cfg *txcfg = (mlan_ds_11n_tx_cfg *) pdata_buf; + + ENTER(); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_11N_CFG); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_11N_CFG) + S_DS_GEN); + htcfg->action = wlan_cpu_to_le16(cmd_action); + htcfg->ht_tx_cap = wlan_cpu_to_le16(txcfg->httxcap); + htcfg->ht_tx_info = wlan_cpu_to_le16(txcfg->httxinfo); + htcfg->misc_config = wlan_cpu_to_le16(txcfg->misc_cfg); + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of 11ncfg - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -1503,25 +1595,28 @@ wlan_cmd_11n_cfg(IN pmlan_private pmpriv, */ mlan_status wlan_ret_11n_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, IN mlan_ioctl_req * pioctl_buf) { - mlan_ds_11n_cfg *cfg = MNULL; - HostCmd_DS_11N_CFG *htcfg = &resp->params.htcfg; - - ENTER(); - if (pioctl_buf && (wlan_le16_to_cpu(htcfg->action) == HostCmd_ACT_GEN_GET)) { - cfg = (mlan_ds_11n_cfg *) pioctl_buf->pbuf; - cfg->param.tx_cfg.httxcap = wlan_le16_to_cpu(htcfg->ht_tx_cap); - cfg->param.tx_cfg.httxinfo = wlan_le16_to_cpu(htcfg->ht_tx_info); - cfg->param.tx_cfg.misc_cfg = wlan_le16_to_cpu(htcfg->misc_config); - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_11n_cfg *cfg = MNULL; + HostCmd_DS_11N_CFG *htcfg = &resp->params.htcfg; + + ENTER(); + if (pioctl_buf && + (wlan_le16_to_cpu(htcfg->action) == HostCmd_ACT_GEN_GET)) { + cfg = (mlan_ds_11n_cfg *) pioctl_buf->pbuf; + cfg->param.tx_cfg.httxcap = wlan_le16_to_cpu(htcfg->ht_tx_cap); + cfg->param.tx_cfg.httxinfo = + wlan_le16_to_cpu(htcfg->ht_tx_info); + cfg->param.tx_cfg.misc_cfg = + wlan_le16_to_cpu(htcfg->misc_config); + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares reject addba req command - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action the action: GET or SET @@ -1530,26 +1625,29 @@ wlan_ret_11n_cfg(IN pmlan_private pmpriv, */ mlan_status wlan_cmd_reject_addba_req(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - HostCmd_DS_REJECT_ADDBA_REQ *pRejectAddbaReq = &cmd->params.rejectaddbareq; - mlan_ds_reject_addba_req *prejaddbareq = - (mlan_ds_reject_addba_req *) pdata_buf; - - ENTER(); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_REJECT_ADDBA_REQ); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_REJECT_ADDBA_REQ) + S_DS_GEN); - pRejectAddbaReq->action = wlan_cpu_to_le16(cmd_action); - pRejectAddbaReq->conditions = wlan_cpu_to_le32(prejaddbareq->conditions); - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_REJECT_ADDBA_REQ *pRejectAddbaReq = + &cmd->params.rejectaddbareq; + mlan_ds_reject_addba_req *prejaddbareq = + (mlan_ds_reject_addba_req *) pdata_buf; + + ENTER(); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_REJECT_ADDBA_REQ); + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_REJECT_ADDBA_REQ) + + S_DS_GEN); + pRejectAddbaReq->action = wlan_cpu_to_le16(cmd_action); + pRejectAddbaReq->conditions = + wlan_cpu_to_le32(prejaddbareq->conditions); + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of reject addba req - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -1558,26 +1656,28 @@ wlan_cmd_reject_addba_req(IN pmlan_private pmpriv, */ mlan_status wlan_ret_reject_addba_req(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - mlan_ds_11n_cfg *cfg = MNULL; - HostCmd_DS_REJECT_ADDBA_REQ *pRejectAddbaReq = &resp->params.rejectaddbareq; - - ENTER(); - if (pioctl_buf && - (wlan_le16_to_cpu(pRejectAddbaReq->action) == HostCmd_ACT_GEN_GET)) { - cfg = (mlan_ds_11n_cfg *) pioctl_buf->pbuf; - cfg->param.reject_addba_req.conditions = - wlan_le32_to_cpu(pRejectAddbaReq->conditions); - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_11n_cfg *cfg = MNULL; + HostCmd_DS_REJECT_ADDBA_REQ *pRejectAddbaReq = + &resp->params.rejectaddbareq; + + ENTER(); + if (pioctl_buf && + (wlan_le16_to_cpu(pRejectAddbaReq->action) == + HostCmd_ACT_GEN_GET)) { + cfg = (mlan_ds_11n_cfg *) pioctl_buf->pbuf; + cfg->param.reject_addba_req.conditions = + wlan_le32_to_cpu(pRejectAddbaReq->conditions); + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares TX BF configuration command - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -1586,75 +1686,83 @@ wlan_ret_reject_addba_req(IN pmlan_private pmpriv, */ mlan_status wlan_cmd_tx_bf_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - pmlan_adapter pmadapter = pmpriv->adapter; - HostCmd_DS_TX_BF_CFG *txbfcfg = &cmd->params.tx_bf_cfg; - mlan_ds_11n_tx_bf_cfg *txbf = (mlan_ds_11n_tx_bf_cfg *) pdata_buf; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_TX_BF_CFG); - cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_TX_BF_CFG) + S_DS_GEN); - - if (txbf->bf_action == SET_GET_BF_PERIODICITY) { - memcpy(pmadapter, txbfcfg->body.bf_periodicity.peer_mac, - txbf->body.bf_periodicity[0].peer_mac, MLAN_MAC_ADDR_LENGTH); - } - txbfcfg->action = wlan_cpu_to_le16(txbf->action); - txbfcfg->bf_action = wlan_cpu_to_le16(txbf->bf_action); - if (cmd_action == HostCmd_ACT_GEN_SET) { - switch (txbf->bf_action) { - case BF_GLOBAL_CONFIGURATION: - txbfcfg->body.bf_global_cfg.bf_enbl = - txbf->body.bf_global_cfg.bf_enbl; - txbfcfg->body.bf_global_cfg.sounding_enbl = - txbf->body.bf_global_cfg.sounding_enbl; - txbfcfg->body.bf_global_cfg.fb_type = - txbf->body.bf_global_cfg.fb_type; - txbfcfg->body.bf_global_cfg.snr_threshold = - txbf->body.bf_global_cfg.snr_threshold; - txbfcfg->body.bf_global_cfg.sounding_interval = - wlan_cpu_to_le16(txbf->body.bf_global_cfg.sounding_interval); - txbfcfg->body.bf_global_cfg.bf_mode = - txbf->body.bf_global_cfg.bf_mode; - break; - case TRIGGER_SOUNDING_FOR_PEER: - memcpy(pmadapter, txbfcfg->body.bf_sound_args.peer_mac, - txbf->body.bf_sound[0].peer_mac, MLAN_MAC_ADDR_LENGTH); - break; - case SET_GET_BF_PERIODICITY: - txbfcfg->body.bf_periodicity.interval = - wlan_cpu_to_le16(txbf->body.bf_periodicity->interval); - break; - case TX_BF_FOR_PEER_ENBL: - memcpy(pmadapter, txbfcfg->body.tx_bf_peer.peer_mac, - txbf->body.tx_bf_peer[0].peer_mac, MLAN_MAC_ADDR_LENGTH); - txbfcfg->body.tx_bf_peer.bf_enbl = txbf->body.tx_bf_peer[0].bf_enbl; - txbfcfg->body.tx_bf_peer.sounding_enbl = - txbf->body.tx_bf_peer[0].sounding_enbl; - txbfcfg->body.tx_bf_peer.fb_type = txbf->body.tx_bf_peer[0].fb_type; - break; - case SET_SNR_THR_PEER: - memcpy(pmadapter, txbfcfg->body.bf_snr.peer_mac, - txbf->body.bf_snr[0].peer_mac, MLAN_MAC_ADDR_LENGTH); - txbfcfg->body.bf_snr.snr = txbf->body.bf_snr[0].snr; - break; - default: - LEAVE(); - return MLAN_STATUS_FAILURE; - } - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + pmlan_adapter pmadapter = pmpriv->adapter; + HostCmd_DS_TX_BF_CFG *txbfcfg = &cmd->params.tx_bf_cfg; + mlan_ds_11n_tx_bf_cfg *txbf = (mlan_ds_11n_tx_bf_cfg *) pdata_buf; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_TX_BF_CFG); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_TX_BF_CFG) + S_DS_GEN); + + if (txbf->bf_action == SET_GET_BF_PERIODICITY) { + memcpy(pmadapter, txbfcfg->body.bf_periodicity.peer_mac, + txbf->body.bf_periodicity[0].peer_mac, + MLAN_MAC_ADDR_LENGTH); + } + txbfcfg->action = wlan_cpu_to_le16(txbf->action); + txbfcfg->bf_action = wlan_cpu_to_le16(txbf->bf_action); + if (cmd_action == HostCmd_ACT_GEN_SET) { + switch (txbf->bf_action) { + case BF_GLOBAL_CONFIGURATION: + txbfcfg->body.bf_global_cfg.bf_enbl = + txbf->body.bf_global_cfg.bf_enbl; + txbfcfg->body.bf_global_cfg.sounding_enbl = + txbf->body.bf_global_cfg.sounding_enbl; + txbfcfg->body.bf_global_cfg.fb_type = + txbf->body.bf_global_cfg.fb_type; + txbfcfg->body.bf_global_cfg.snr_threshold = + txbf->body.bf_global_cfg.snr_threshold; + txbfcfg->body.bf_global_cfg.sounding_interval = + wlan_cpu_to_le16(txbf->body.bf_global_cfg. + sounding_interval); + txbfcfg->body.bf_global_cfg.bf_mode = + txbf->body.bf_global_cfg.bf_mode; + break; + case TRIGGER_SOUNDING_FOR_PEER: + memcpy(pmadapter, txbfcfg->body.bf_sound_args.peer_mac, + txbf->body.bf_sound[0].peer_mac, + MLAN_MAC_ADDR_LENGTH); + break; + case SET_GET_BF_PERIODICITY: + txbfcfg->body.bf_periodicity.interval = + wlan_cpu_to_le16(txbf->body.bf_periodicity-> + interval); + break; + case TX_BF_FOR_PEER_ENBL: + memcpy(pmadapter, txbfcfg->body.tx_bf_peer.peer_mac, + txbf->body.tx_bf_peer[0].peer_mac, + MLAN_MAC_ADDR_LENGTH); + txbfcfg->body.tx_bf_peer.bf_enbl = + txbf->body.tx_bf_peer[0].bf_enbl; + txbfcfg->body.tx_bf_peer.sounding_enbl = + txbf->body.tx_bf_peer[0].sounding_enbl; + txbfcfg->body.tx_bf_peer.fb_type = + txbf->body.tx_bf_peer[0].fb_type; + break; + case SET_SNR_THR_PEER: + memcpy(pmadapter, txbfcfg->body.bf_snr.peer_mac, + txbf->body.bf_snr[0].peer_mac, + MLAN_MAC_ADDR_LENGTH); + txbfcfg->body.bf_snr.snr = txbf->body.bf_snr[0].snr; + break; + default: + LEAVE(); + return MLAN_STATUS_FAILURE; + } + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response * of TX BF configuration - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -1663,80 +1771,92 @@ wlan_cmd_tx_bf_cfg(IN pmlan_private pmpriv, */ mlan_status wlan_ret_tx_bf_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, IN mlan_ioctl_req * pioctl_buf) { - pmlan_adapter pmadapter = pmpriv->adapter; - HostCmd_DS_TX_BF_CFG *txbfcfg = &resp->params.tx_bf_cfg; - mlan_ds_11n_cfg *cfg_11n = MNULL; - mlan_ds_11n_tx_bf_cfg *txbf = MNULL; - bf_peer_args *tx_bf_peer; - bf_snr_thr_t *bf_snr; - int i; - - ENTER(); - - if (pioctl_buf) { - cfg_11n = (mlan_ds_11n_cfg *) pioctl_buf->pbuf; - txbf = (mlan_ds_11n_tx_bf_cfg *) & cfg_11n->param.tx_bf; - txbf->bf_action = wlan_le16_to_cpu(txbfcfg->bf_action); - switch (txbf->bf_action) { - case BF_GLOBAL_CONFIGURATION: - txbf->body.bf_global_cfg.bf_enbl = - txbfcfg->body.bf_global_cfg.bf_enbl; - txbf->body.bf_global_cfg.sounding_enbl = - txbfcfg->body.bf_global_cfg.sounding_enbl; - txbf->body.bf_global_cfg.fb_type = - txbfcfg->body.bf_global_cfg.fb_type; - txbf->body.bf_global_cfg.snr_threshold = - txbfcfg->body.bf_global_cfg.snr_threshold; - txbf->body.bf_global_cfg.sounding_interval = - wlan_le16_to_cpu(txbfcfg->body.bf_global_cfg.sounding_interval); - txbf->body.bf_global_cfg.bf_mode = - txbfcfg->body.bf_global_cfg.bf_mode; - break; - case TRIGGER_SOUNDING_FOR_PEER: - memcpy(pmadapter, txbf->body.bf_sound[0].peer_mac, - txbfcfg->body.bf_sound_args.peer_mac, MLAN_MAC_ADDR_LENGTH); - txbf->body.bf_sound[0].status = txbfcfg->body.bf_sound_args.status; - break; - case SET_GET_BF_PERIODICITY: - memcpy(pmadapter, txbf->body.bf_periodicity->peer_mac, - txbfcfg->body.bf_periodicity.peer_mac, MLAN_MAC_ADDR_LENGTH); - txbf->body.bf_periodicity->interval = - wlan_le16_to_cpu(txbfcfg->body.bf_periodicity.interval); - break; - case TX_BF_FOR_PEER_ENBL: - txbf->no_of_peers = *(t_u8 *) & txbfcfg->body; - tx_bf_peer = - (bf_peer_args *) ((t_u8 *) & txbfcfg->body + sizeof(t_u8)); - for (i = 0; i < txbf->no_of_peers; i++) { - memcpy(pmadapter, txbf->body.tx_bf_peer[i].peer_mac, - (t_u8 *) tx_bf_peer->peer_mac, MLAN_MAC_ADDR_LENGTH); - txbf->body.tx_bf_peer[i].bf_enbl = tx_bf_peer->bf_enbl; - txbf->body.tx_bf_peer[i].sounding_enbl = - tx_bf_peer->sounding_enbl; - txbf->body.tx_bf_peer[i].fb_type = tx_bf_peer->fb_type; - tx_bf_peer++; - } - break; - case SET_SNR_THR_PEER: - txbf->no_of_peers = *(t_u8 *) & txbfcfg->body; - bf_snr = (bf_snr_thr_t *) ((t_u8 *) & txbfcfg->body + sizeof(t_u8)); - for (i = 0; i < txbf->no_of_peers; i++) { - memcpy(pmadapter, txbf->body.bf_snr[i].peer_mac, - (t_u8 *) bf_snr->peer_mac, MLAN_MAC_ADDR_LENGTH); - txbf->body.bf_snr[i].snr = bf_snr->snr; - bf_snr++; - } - break; - default: - LEAVE(); - return MLAN_STATUS_FAILURE; - } - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + pmlan_adapter pmadapter = pmpriv->adapter; + HostCmd_DS_TX_BF_CFG *txbfcfg = &resp->params.tx_bf_cfg; + mlan_ds_11n_cfg *cfg_11n = MNULL; + mlan_ds_11n_tx_bf_cfg *txbf = MNULL; + bf_peer_args *tx_bf_peer; + bf_snr_thr_t *bf_snr; + int i; + + ENTER(); + + if (pioctl_buf) { + cfg_11n = (mlan_ds_11n_cfg *) pioctl_buf->pbuf; + txbf = (mlan_ds_11n_tx_bf_cfg *) & cfg_11n->param.tx_bf; + txbf->bf_action = wlan_le16_to_cpu(txbfcfg->bf_action); + switch (txbf->bf_action) { + case BF_GLOBAL_CONFIGURATION: + txbf->body.bf_global_cfg.bf_enbl = + txbfcfg->body.bf_global_cfg.bf_enbl; + txbf->body.bf_global_cfg.sounding_enbl = + txbfcfg->body.bf_global_cfg.sounding_enbl; + txbf->body.bf_global_cfg.fb_type = + txbfcfg->body.bf_global_cfg.fb_type; + txbf->body.bf_global_cfg.snr_threshold = + txbfcfg->body.bf_global_cfg.snr_threshold; + txbf->body.bf_global_cfg.sounding_interval = + wlan_le16_to_cpu(txbfcfg->body.bf_global_cfg. + sounding_interval); + txbf->body.bf_global_cfg.bf_mode = + txbfcfg->body.bf_global_cfg.bf_mode; + break; + case TRIGGER_SOUNDING_FOR_PEER: + memcpy(pmadapter, txbf->body.bf_sound[0].peer_mac, + txbfcfg->body.bf_sound_args.peer_mac, + MLAN_MAC_ADDR_LENGTH); + txbf->body.bf_sound[0].status = + txbfcfg->body.bf_sound_args.status; + break; + case SET_GET_BF_PERIODICITY: + memcpy(pmadapter, txbf->body.bf_periodicity->peer_mac, + txbfcfg->body.bf_periodicity.peer_mac, + MLAN_MAC_ADDR_LENGTH); + txbf->body.bf_periodicity->interval = + wlan_le16_to_cpu(txbfcfg->body.bf_periodicity. + interval); + break; + case TX_BF_FOR_PEER_ENBL: + txbf->no_of_peers = *(t_u8 *) & txbfcfg->body; + tx_bf_peer = + (bf_peer_args *) ((t_u8 *) & txbfcfg->body + + sizeof(t_u8)); + for (i = 0; i < txbf->no_of_peers; i++) { + memcpy(pmadapter, + txbf->body.tx_bf_peer[i].peer_mac, + (t_u8 *) tx_bf_peer->peer_mac, + MLAN_MAC_ADDR_LENGTH); + txbf->body.tx_bf_peer[i].bf_enbl = + tx_bf_peer->bf_enbl; + txbf->body.tx_bf_peer[i].sounding_enbl = + tx_bf_peer->sounding_enbl; + txbf->body.tx_bf_peer[i].fb_type = + tx_bf_peer->fb_type; + tx_bf_peer++; + } + break; + case SET_SNR_THR_PEER: + txbf->no_of_peers = *(t_u8 *) & txbfcfg->body; + bf_snr = (bf_snr_thr_t *) ((t_u8 *) & txbfcfg->body + + sizeof(t_u8)); + for (i = 0; i < txbf->no_of_peers; i++) { + memcpy(pmadapter, txbf->body.bf_snr[i].peer_mac, + (t_u8 *) bf_snr->peer_mac, + MLAN_MAC_ADDR_LENGTH); + txbf->body.bf_snr[i].snr = bf_snr->snr; + bf_snr++; + } + break; + default: + LEAVE(); + return MLAN_STATUS_FAILURE; + } + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } #ifdef STA_SUPPORT @@ -1748,76 +1868,78 @@ wlan_ret_tx_bf_cfg(IN pmlan_private pmpriv, * @param chan primary channel * @param chan_bw channel bandwidth * - * @return channel offset (NO_SEC_CHANNEL, SEC_CHANNEL_ABOVE, + * @return channel offset (NO_SEC_CHANNEL, SEC_CHANNEL_ABOVE, * SEC_CHANNEL_BELOW) */ t_u8 wlan_validate_chan_offset(IN mlan_private * pmpriv, - IN t_u8 band, IN t_u32 chan, IN t_u8 chan_bw) + IN t_u8 band, IN t_u32 chan, IN t_u8 chan_bw) { - t_u8 chan_offset; - pmlan_adapter pmadapter = pmpriv->adapter; - - if (chan_bw == CHANNEL_BW_40MHZ_ABOVE) - chan_offset = SEC_CHANNEL_ABOVE; - else if (chan_bw == CHANNEL_BW_40MHZ_BELOW) - chan_offset = SEC_CHANNEL_BELOW; - else - chan_offset = SEC_CHAN_NONE; - - /* validation */ - if (chan_offset != SEC_CHAN_NONE) { - if (band & BAND_GN) { - if ((chan == 1) || (chan == 2) || (chan == 3) || (chan == 4)) { - chan_offset = SEC_CHAN_ABOVE; - } else if ((chan == 10) || (chan == 11) || - (chan == 12) || (chan == 13)) { - chan_offset = SEC_CHAN_BELOW; - } - /* check if channel 12 is supported in the region */ - if (!wlan_find_cfp_by_band_and_channel(pmadapter, band, 12)) { - if ((chan == 8) || (chan == 9)) { - chan_offset = SEC_CHAN_BELOW; - } - } - } else if (band & BAND_AN) { - switch (chan) { - case 36: - case 44: - case 52: - case 60: - case 100: - case 108: - case 116: - case 124: - case 132: - case 140: - case 149: - case 157: - chan_offset = SEC_CHAN_ABOVE; - break; - case 40: - case 48: - case 56: - case 64: - case 104: - case 112: - case 120: - case 128: - case 136: - case 144: - case 153: - case 161: - chan_offset = SEC_CHAN_BELOW; - break; - case 165: - /* Special Case: 20Mhz-only Channel */ - chan_offset = SEC_CHAN_NONE; - break; - } - } - } - return chan_offset; + t_u8 chan_offset; + pmlan_adapter pmadapter = pmpriv->adapter; + + if (chan_bw == CHANNEL_BW_40MHZ_ABOVE) + chan_offset = SEC_CHANNEL_ABOVE; + else if (chan_bw == CHANNEL_BW_40MHZ_BELOW) + chan_offset = SEC_CHANNEL_BELOW; + else + chan_offset = SEC_CHAN_NONE; + + /* validation */ + if (chan_offset != SEC_CHAN_NONE) { + if (band & BAND_GN) { + if ((chan == 1) || (chan == 2) || (chan == 3) || + (chan == 4)) { + chan_offset = SEC_CHAN_ABOVE; + } else if ((chan == 10) || (chan == 11) || + (chan == 12) || (chan == 13)) { + chan_offset = SEC_CHAN_BELOW; + } + /* check if channel 12 is supported in the region */ + if (!wlan_find_cfp_by_band_and_channel + (pmadapter, band, 12)) { + if ((chan == 8) || (chan == 9)) { + chan_offset = SEC_CHAN_BELOW; + } + } + } else if (band & BAND_AN) { + switch (chan) { + case 36: + case 44: + case 52: + case 60: + case 100: + case 108: + case 116: + case 124: + case 132: + case 140: + case 149: + case 157: + chan_offset = SEC_CHAN_ABOVE; + break; + case 40: + case 48: + case 56: + case 64: + case 104: + case 112: + case 120: + case 128: + case 136: + case 144: + case 153: + case 161: + chan_offset = SEC_CHAN_BELOW; + break; + case 165: + /* Special Case: 20Mhz-only Channel */ + chan_offset = SEC_CHAN_NONE; + break; + } + } + } + return chan_offset; } /** @@ -1827,172 +1949,189 @@ wlan_validate_chan_offset(IN mlan_private * pmpriv, * @param pbss_desc A pointer to BSSDescriptor_t structure * @param ppbuffer A Pointer to command buffer pointer * - * @return bytes added to the buffer + * @return bytes added to the buffer */ int wlan_cmd_append_11n_tlv(IN mlan_private * pmpriv, - IN BSSDescriptor_t * pbss_desc, OUT t_u8 ** ppbuffer) + IN BSSDescriptor_t * pbss_desc, OUT t_u8 ** ppbuffer) { - pmlan_adapter pmadapter = pmpriv->adapter; - MrvlIETypes_HTCap_t *pht_cap; - MrvlIETypes_HTInfo_t *pht_info; - MrvlIEtypes_ChanListParamSet_t *pchan_list; - MrvlIETypes_2040BSSCo_t *p2040_bss_co; - MrvlIETypes_ExtCap_t *pext_cap; - t_u32 usr_dot_11n_dev_cap; - t_u32 usr_vht_cap_info; - int ret_len = 0; - - ENTER(); - - /* Null Checks */ - if (ppbuffer == MNULL) { - LEAVE(); - return 0; - } - if (*ppbuffer == MNULL) { - LEAVE(); - return 0; - } - - if (pbss_desc->bss_band & BAND_A) - usr_dot_11n_dev_cap = pmadapter->usr_dot_11n_dev_cap_a; - else - usr_dot_11n_dev_cap = pmadapter->usr_dot_11n_dev_cap_bg; - - if (pbss_desc->bss_band & BAND_A) - usr_vht_cap_info = pmadapter->usr_dot_11ac_dev_cap_a; - else - usr_vht_cap_info = pmadapter->usr_dot_11ac_dev_cap_bg; - - if (pbss_desc->pht_cap) { - pht_cap = (MrvlIETypes_HTCap_t *) * ppbuffer; - memset(pmadapter, pht_cap, 0, sizeof(MrvlIETypes_HTCap_t)); - pht_cap->header.type = wlan_cpu_to_le16(HT_CAPABILITY); - pht_cap->header.len = sizeof(HTCap_t); - memcpy(pmadapter, (t_u8 *) pht_cap + sizeof(MrvlIEtypesHeader_t), - (t_u8 *) pbss_desc->pht_cap + sizeof(IEEEtypes_Header_t), - pht_cap->header.len); - - pht_cap->ht_cap.ht_cap_info = - wlan_le16_to_cpu(pht_cap->ht_cap.ht_cap_info); - pht_cap->ht_cap.ht_ext_cap = - wlan_le16_to_cpu(pht_cap->ht_cap.ht_ext_cap); - wlan_fill_ht_cap_tlv(pmpriv, pht_cap, pbss_desc->bss_band); - - HEXDUMP("HT_CAPABILITIES IE", (t_u8 *) pht_cap, - sizeof(MrvlIETypes_HTCap_t)); - *ppbuffer += sizeof(MrvlIETypes_HTCap_t); - ret_len += sizeof(MrvlIETypes_HTCap_t); - pht_cap->header.len = wlan_cpu_to_le16(pht_cap->header.len); - } - - if (pbss_desc->pht_info) { - if (pmpriv->bss_mode == MLAN_BSS_MODE_IBSS) { - pht_info = (MrvlIETypes_HTInfo_t *) * ppbuffer; - memset(pmadapter, pht_info, 0, sizeof(MrvlIETypes_HTInfo_t)); - pht_info->header.type = wlan_cpu_to_le16(HT_OPERATION); - pht_info->header.len = sizeof(HTInfo_t); - - memcpy(pmadapter, (t_u8 *) pht_info + sizeof(MrvlIEtypesHeader_t), - (t_u8 *) pbss_desc->pht_info + sizeof(IEEEtypes_Header_t), - pht_info->header.len); - - if (!ISSUPP_CHANWIDTH40(usr_dot_11n_dev_cap)) { - RESET_CHANWIDTH40(pht_info->ht_info.field2); - } - - *ppbuffer += sizeof(MrvlIETypes_HTInfo_t); - ret_len += sizeof(MrvlIETypes_HTInfo_t); - pht_info->header.len = wlan_cpu_to_le16(pht_info->header.len); - } - - pchan_list = (MrvlIEtypes_ChanListParamSet_t *) * ppbuffer; - memset(pmadapter, pchan_list, 0, - sizeof(MrvlIEtypes_ChanListParamSet_t)); - pchan_list->header.type = wlan_cpu_to_le16(TLV_TYPE_CHANLIST); - pchan_list->header.len = sizeof(MrvlIEtypes_ChanListParamSet_t) - - sizeof(MrvlIEtypesHeader_t); - pchan_list->chan_scan_param[0].chan_number = - pbss_desc->pht_info->ht_info.pri_chan; - pchan_list->chan_scan_param[0].radio_type = - wlan_band_to_radio_type((t_u8) pbss_desc->bss_band); - /* support the VHT if the network to be join has the VHT operation */ - if (pbss_desc->pvht_oprat && - GET_VHTCAP_CHWDSET(usr_vht_cap_info) && - pbss_desc->pvht_oprat->chan_width == VHT_OPER_CHWD_80MHZ) { - if ((pbss_desc->bss_band & BAND_GAC) - || (pbss_desc->bss_band & BAND_AAC) - ) - pchan_list->chan_scan_param[0].radio_type |= CHAN_BW_80MHZ << 2; - } else - if (ISSUPP_CHANWIDTH40(usr_dot_11n_dev_cap) && - ISALLOWED_CHANWIDTH40(pbss_desc->pht_info->ht_info.field2)) { - SET_SECONDARYCHAN(pchan_list->chan_scan_param[0].radio_type, - GET_SECONDARYCHAN(pbss_desc->pht_info->ht_info. - field2)); - pchan_list->chan_scan_param[0].radio_type |= CHAN_BW_40MHZ << 2; - } - - HEXDUMP("ChanList", (t_u8 *) pchan_list, - sizeof(MrvlIEtypes_ChanListParamSet_t)); - HEXDUMP("pht_info", (t_u8 *) pbss_desc->pht_info, - sizeof(MrvlIETypes_HTInfo_t) - 2); - *ppbuffer += sizeof(MrvlIEtypes_ChanListParamSet_t); - ret_len += sizeof(MrvlIEtypes_ChanListParamSet_t); - pchan_list->header.len = wlan_cpu_to_le16(pchan_list->header.len); - } - - if (pbss_desc->pbss_co_2040) { - p2040_bss_co = (MrvlIETypes_2040BSSCo_t *) * ppbuffer; - memset(pmadapter, p2040_bss_co, 0, sizeof(MrvlIETypes_2040BSSCo_t)); - p2040_bss_co->header.type = wlan_cpu_to_le16(BSSCO_2040); - p2040_bss_co->header.len = sizeof(BSSCo2040_t); - - memcpy(pmadapter, (t_u8 *) p2040_bss_co + sizeof(MrvlIEtypesHeader_t), - (t_u8 *) pbss_desc->pbss_co_2040 + sizeof(IEEEtypes_Header_t), - p2040_bss_co->header.len); - - HEXDUMP("20/40 BSS Coexistence IE", (t_u8 *) p2040_bss_co, - sizeof(MrvlIETypes_2040BSSCo_t)); - *ppbuffer += sizeof(MrvlIETypes_2040BSSCo_t); - ret_len += sizeof(MrvlIETypes_2040BSSCo_t); - p2040_bss_co->header.len = wlan_cpu_to_le16(p2040_bss_co->header.len); - } - - if (pbss_desc->pext_cap) { - pext_cap = (MrvlIETypes_ExtCap_t *) * ppbuffer; - memset(pmadapter, pext_cap, 0, sizeof(MrvlIETypes_ExtCap_t)); - pext_cap->header.type = wlan_cpu_to_le16(EXT_CAPABILITY); - pext_cap->header.len = sizeof(ExtCap_t); - - memcpy(pmadapter, (t_u8 *) pext_cap + sizeof(MrvlIEtypesHeader_t), - (t_u8 *) pbss_desc->pext_cap + sizeof(IEEEtypes_Header_t), - pbss_desc->pext_cap->ieee_hdr.len); - if (!ISSUPP_EXTCAP_TDLS(pmpriv->ext_cap)) - RESET_EXTCAP_TDLS(pext_cap->ext_cap); - if (!ISSUPP_EXTCAP_INTERWORKING(pmpriv->ext_cap)) - RESET_EXTCAP_INTERWORKING(pext_cap->ext_cap); - if (!ISSUPP_EXTCAP_OPERMODENTF(pmpriv->ext_cap)) - RESET_EXTCAP_OPERMODENTF(pext_cap->ext_cap); - HEXDUMP("Extended Capabilities IE", (t_u8 *) pext_cap, - sizeof(MrvlIETypes_ExtCap_t)); - *ppbuffer += sizeof(MrvlIETypes_ExtCap_t); - ret_len += sizeof(MrvlIETypes_ExtCap_t); - pext_cap->header.len = wlan_cpu_to_le16(pext_cap->header.len); - } else if (wlan_is_ext_capa_support(pmpriv) || - (pmpriv->config_bands & BAND_AAC) - ) { - wlan_add_ext_capa_info_ie(pmpriv, ppbuffer); - ret_len += sizeof(MrvlIETypes_ExtCap_t); - } - LEAVE(); - return ret_len; + pmlan_adapter pmadapter = pmpriv->adapter; + MrvlIETypes_HTCap_t *pht_cap; + MrvlIETypes_HTInfo_t *pht_info; + MrvlIEtypes_ChanListParamSet_t *pchan_list; + MrvlIETypes_2040BSSCo_t *p2040_bss_co; + MrvlIETypes_ExtCap_t *pext_cap; + t_u32 usr_dot_11n_dev_cap; + t_u32 usr_vht_cap_info; + int ret_len = 0; + + ENTER(); + + /* Null Checks */ + if (ppbuffer == MNULL) { + LEAVE(); + return 0; + } + if (*ppbuffer == MNULL) { + LEAVE(); + return 0; + } + + if (pbss_desc->bss_band & BAND_A) + usr_dot_11n_dev_cap = pmadapter->usr_dot_11n_dev_cap_a; + else + usr_dot_11n_dev_cap = pmadapter->usr_dot_11n_dev_cap_bg; + + if (pbss_desc->bss_band & BAND_A) + usr_vht_cap_info = pmadapter->usr_dot_11ac_dev_cap_a; + else + usr_vht_cap_info = pmadapter->usr_dot_11ac_dev_cap_bg; + + if (pbss_desc->pht_cap) { + pht_cap = (MrvlIETypes_HTCap_t *) * ppbuffer; + memset(pmadapter, pht_cap, 0, sizeof(MrvlIETypes_HTCap_t)); + pht_cap->header.type = wlan_cpu_to_le16(HT_CAPABILITY); + pht_cap->header.len = sizeof(HTCap_t); + memcpy(pmadapter, + (t_u8 *) pht_cap + sizeof(MrvlIEtypesHeader_t), + (t_u8 *) pbss_desc->pht_cap + sizeof(IEEEtypes_Header_t), + pht_cap->header.len); + + pht_cap->ht_cap.ht_cap_info = + wlan_le16_to_cpu(pht_cap->ht_cap.ht_cap_info); + pht_cap->ht_cap.ht_ext_cap = + wlan_le16_to_cpu(pht_cap->ht_cap.ht_ext_cap); + wlan_fill_ht_cap_tlv(pmpriv, pht_cap, pbss_desc->bss_band); + + HEXDUMP("HT_CAPABILITIES IE", (t_u8 *) pht_cap, + sizeof(MrvlIETypes_HTCap_t)); + *ppbuffer += sizeof(MrvlIETypes_HTCap_t); + ret_len += sizeof(MrvlIETypes_HTCap_t); + pht_cap->header.len = wlan_cpu_to_le16(pht_cap->header.len); + } + + if (pbss_desc->pht_info) { + if (pmpriv->bss_mode == MLAN_BSS_MODE_IBSS) { + pht_info = (MrvlIETypes_HTInfo_t *) * ppbuffer; + memset(pmadapter, pht_info, 0, + sizeof(MrvlIETypes_HTInfo_t)); + pht_info->header.type = wlan_cpu_to_le16(HT_OPERATION); + pht_info->header.len = sizeof(HTInfo_t); + + memcpy(pmadapter, + (t_u8 *) pht_info + sizeof(MrvlIEtypesHeader_t), + (t_u8 *) pbss_desc->pht_info + + sizeof(IEEEtypes_Header_t), + pht_info->header.len); + + if (!ISSUPP_CHANWIDTH40(usr_dot_11n_dev_cap)) { + RESET_CHANWIDTH40(pht_info->ht_info.field2); + } + + *ppbuffer += sizeof(MrvlIETypes_HTInfo_t); + ret_len += sizeof(MrvlIETypes_HTInfo_t); + pht_info->header.len = + wlan_cpu_to_le16(pht_info->header.len); + } + + pchan_list = (MrvlIEtypes_ChanListParamSet_t *) * ppbuffer; + memset(pmadapter, pchan_list, 0, + sizeof(MrvlIEtypes_ChanListParamSet_t)); + pchan_list->header.type = wlan_cpu_to_le16(TLV_TYPE_CHANLIST); + pchan_list->header.len = + sizeof(MrvlIEtypes_ChanListParamSet_t) - + sizeof(MrvlIEtypesHeader_t); + pchan_list->chan_scan_param[0].chan_number = + pbss_desc->pht_info->ht_info.pri_chan; + pchan_list->chan_scan_param[0].radio_type = + wlan_band_to_radio_type((t_u8) pbss_desc->bss_band); + /* support the VHT if the network to be join has the VHT + operation */ + if (pbss_desc->pvht_oprat && + GET_VHTCAP_CHWDSET(usr_vht_cap_info) && + pbss_desc->pvht_oprat->chan_width == VHT_OPER_CHWD_80MHZ) { + if ((pbss_desc->bss_band & BAND_GAC) + || (pbss_desc->bss_band & BAND_AAC) + ) + pchan_list->chan_scan_param[0].radio_type |= + CHAN_BW_80MHZ << 2; + } else if (ISSUPP_CHANWIDTH40(usr_dot_11n_dev_cap) && + ISALLOWED_CHANWIDTH40(pbss_desc->pht_info->ht_info. + field2)) { + SET_SECONDARYCHAN(pchan_list->chan_scan_param[0]. + radio_type, + GET_SECONDARYCHAN(pbss_desc-> + pht_info->ht_info. + field2)); + pchan_list->chan_scan_param[0].radio_type |= + CHAN_BW_40MHZ << 2; + } + + HEXDUMP("ChanList", (t_u8 *) pchan_list, + sizeof(MrvlIEtypes_ChanListParamSet_t)); + HEXDUMP("pht_info", (t_u8 *) pbss_desc->pht_info, + sizeof(MrvlIETypes_HTInfo_t) - 2); + *ppbuffer += sizeof(MrvlIEtypes_ChanListParamSet_t); + ret_len += sizeof(MrvlIEtypes_ChanListParamSet_t); + pchan_list->header.len = + wlan_cpu_to_le16(pchan_list->header.len); + } + + if (pbss_desc->pbss_co_2040) { + p2040_bss_co = (MrvlIETypes_2040BSSCo_t *) * ppbuffer; + memset(pmadapter, p2040_bss_co, 0, + sizeof(MrvlIETypes_2040BSSCo_t)); + p2040_bss_co->header.type = wlan_cpu_to_le16(BSSCO_2040); + p2040_bss_co->header.len = sizeof(BSSCo2040_t); + + memcpy(pmadapter, + (t_u8 *) p2040_bss_co + sizeof(MrvlIEtypesHeader_t), + (t_u8 *) pbss_desc->pbss_co_2040 + + sizeof(IEEEtypes_Header_t), p2040_bss_co->header.len); + + HEXDUMP("20/40 BSS Coexistence IE", (t_u8 *) p2040_bss_co, + sizeof(MrvlIETypes_2040BSSCo_t)); + *ppbuffer += sizeof(MrvlIETypes_2040BSSCo_t); + ret_len += sizeof(MrvlIETypes_2040BSSCo_t); + p2040_bss_co->header.len = + wlan_cpu_to_le16(p2040_bss_co->header.len); + } + + if (pbss_desc->pext_cap) { + pext_cap = (MrvlIETypes_ExtCap_t *) * ppbuffer; + memset(pmadapter, pext_cap, 0, sizeof(MrvlIETypes_ExtCap_t)); + pext_cap->header.type = wlan_cpu_to_le16(EXT_CAPABILITY); + pext_cap->header.len = sizeof(ExtCap_t); + + memcpy(pmadapter, + (t_u8 *) pext_cap + sizeof(MrvlIEtypesHeader_t), + (t_u8 *) pbss_desc->pext_cap + + sizeof(IEEEtypes_Header_t), + pbss_desc->pext_cap->ieee_hdr.len); + if (!ISSUPP_EXTCAP_TDLS(pmpriv->ext_cap)) + RESET_EXTCAP_TDLS(pext_cap->ext_cap); + if (!ISSUPP_EXTCAP_INTERWORKING(pmpriv->ext_cap)) + RESET_EXTCAP_INTERWORKING(pext_cap->ext_cap); + if (!ISSUPP_EXTCAP_OPERMODENTF(pmpriv->ext_cap)) + RESET_EXTCAP_OPERMODENTF(pext_cap->ext_cap); + HEXDUMP("Extended Capabilities IE", (t_u8 *) pext_cap, + sizeof(MrvlIETypes_ExtCap_t)); + *ppbuffer += sizeof(MrvlIETypes_ExtCap_t); + ret_len += sizeof(MrvlIETypes_ExtCap_t); + pext_cap->header.len = wlan_cpu_to_le16(pext_cap->header.len); + } else if (wlan_is_ext_capa_support(pmpriv) || + (pmpriv->config_bands & BAND_AAC) + ) { + wlan_add_ext_capa_info_ie(pmpriv, ppbuffer); + ret_len += sizeof(MrvlIETypes_ExtCap_t); + } + LEAVE(); + return ret_len; } #endif /* STA_SUPPORT */ -/** +/** * @brief 11n configuration handler * * @param pmadapter A pointer to mlan_adapter structure @@ -2003,72 +2142,73 @@ wlan_cmd_append_11n_tlv(IN mlan_private * pmpriv, mlan_status wlan_11n_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_11n_cfg *cfg = MNULL; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_11n_cfg)) { - PRINTM(MINFO, "MLAN bss IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_11n_cfg); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; - switch (cfg->sub_command) { - case MLAN_OID_11N_CFG_TX: - status = wlan_11n_ioctl_httxcfg(pmadapter, pioctl_req); - break; - case MLAN_OID_11N_HTCAP_CFG: - status = wlan_11n_ioctl_htusrcfg(pmadapter, pioctl_req); - break; - case MLAN_OID_11N_CFG_AGGR_PRIO_TBL: - status = wlan_11n_ioctl_aggr_prio_tbl(pmadapter, pioctl_req); - break; - case MLAN_OID_11N_CFG_ADDBA_REJECT: - status = wlan_11n_ioctl_addba_reject(pmadapter, pioctl_req); - break; - case MLAN_OID_11N_CFG_ADDBA_PARAM: - status = wlan_11n_ioctl_addba_param(pmadapter, pioctl_req); - break; - case MLAN_OID_11N_CFG_DELBA: - status = wlan_11n_ioctl_delba(pmadapter, pioctl_req); - break; - case MLAN_OID_11N_CFG_REJECT_ADDBA_REQ: - status = wlan_11n_ioctl_rejectaddbareq(pmadapter, pioctl_req); - break; - case MLAN_OID_11N_CFG_MAX_TX_BUF_SIZE: - status = wlan_11n_ioctl_max_tx_buf_size(pmadapter, pioctl_req); - break; - case MLAN_OID_11N_CFG_AMSDU_AGGR_CTRL: - status = wlan_11n_ioctl_amsdu_aggr_ctrl(pmadapter, pioctl_req); - break; - case MLAN_OID_11N_CFG_SUPPORTED_MCS_SET: - status = wlan_11n_ioctl_supported_mcs_set(pmadapter, pioctl_req); - break; - case MLAN_OID_11N_CFG_TX_BF_CAP: - status = wlan_11n_ioctl_tx_bf_cap(pmadapter, pioctl_req); - break; - case MLAN_OID_11N_CFG_TX_BF_CFG: - status = wlan_11n_ioctl_tx_bf_cfg(pmadapter, pioctl_req); - break; - case MLAN_OID_11N_CFG_STREAM_CFG: - status = wlan_11n_ioctl_stream_cfg(pmadapter, pioctl_req); - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - LEAVE(); - return status; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_11n_cfg *cfg = MNULL; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_11n_cfg)) { + PRINTM(MINFO, "MLAN bss IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_11n_cfg); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + cfg = (mlan_ds_11n_cfg *) pioctl_req->pbuf; + switch (cfg->sub_command) { + case MLAN_OID_11N_CFG_TX: + status = wlan_11n_ioctl_httxcfg(pmadapter, pioctl_req); + break; + case MLAN_OID_11N_HTCAP_CFG: + status = wlan_11n_ioctl_htusrcfg(pmadapter, pioctl_req); + break; + case MLAN_OID_11N_CFG_AGGR_PRIO_TBL: + status = wlan_11n_ioctl_aggr_prio_tbl(pmadapter, pioctl_req); + break; + case MLAN_OID_11N_CFG_ADDBA_REJECT: + status = wlan_11n_ioctl_addba_reject(pmadapter, pioctl_req); + break; + case MLAN_OID_11N_CFG_ADDBA_PARAM: + status = wlan_11n_ioctl_addba_param(pmadapter, pioctl_req); + break; + case MLAN_OID_11N_CFG_DELBA: + status = wlan_11n_ioctl_delba(pmadapter, pioctl_req); + break; + case MLAN_OID_11N_CFG_REJECT_ADDBA_REQ: + status = wlan_11n_ioctl_rejectaddbareq(pmadapter, pioctl_req); + break; + case MLAN_OID_11N_CFG_MAX_TX_BUF_SIZE: + status = wlan_11n_ioctl_max_tx_buf_size(pmadapter, pioctl_req); + break; + case MLAN_OID_11N_CFG_AMSDU_AGGR_CTRL: + status = wlan_11n_ioctl_amsdu_aggr_ctrl(pmadapter, pioctl_req); + break; + case MLAN_OID_11N_CFG_SUPPORTED_MCS_SET: + status = wlan_11n_ioctl_supported_mcs_set(pmadapter, + pioctl_req); + break; + case MLAN_OID_11N_CFG_TX_BF_CAP: + status = wlan_11n_ioctl_tx_bf_cap(pmadapter, pioctl_req); + break; + case MLAN_OID_11N_CFG_TX_BF_CFG: + status = wlan_11n_ioctl_tx_bf_cfg(pmadapter, pioctl_req); + break; + case MLAN_OID_11N_CFG_STREAM_CFG: + status = wlan_11n_ioctl_stream_cfg(pmadapter, pioctl_req); + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + LEAVE(); + return status; } /** * @brief This function will delete the given entry in Tx BA Stream table - * + * * @param priv Pointer to mlan_private * @param ptx_tbl Pointer to tx ba stream entry to delete * @@ -2076,35 +2216,36 @@ wlan_11n_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ void wlan_11n_delete_txbastream_tbl_entry(mlan_private * priv, - TxBAStreamTbl * ptx_tbl) + TxBAStreamTbl * ptx_tbl) { - pmlan_adapter pmadapter = priv->adapter; + pmlan_adapter pmadapter = priv->adapter; - ENTER(); + ENTER(); - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->tx_ba_stream_tbl_ptr.plock); + pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, + priv->tx_ba_stream_tbl_ptr.plock); - if (!ptx_tbl || !wlan_is_txbastreamptr_valid(priv, ptx_tbl)) { - goto exit; - } + if (!ptx_tbl || !wlan_is_txbastreamptr_valid(priv, ptx_tbl)) { + goto exit; + } - PRINTM(MINFO, "Delete BA stream table entry: %p\n", ptx_tbl); + PRINTM(MINFO, "Delete BA stream table entry: %p\n", ptx_tbl); - util_unlink_list(pmadapter->pmoal_handle, &priv->tx_ba_stream_tbl_ptr, - (pmlan_linked_list) ptx_tbl, MNULL, MNULL); + util_unlink_list(pmadapter->pmoal_handle, &priv->tx_ba_stream_tbl_ptr, + (pmlan_linked_list) ptx_tbl, MNULL, MNULL); - pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, (t_u8 *) ptx_tbl); + pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) ptx_tbl); - exit: - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->tx_ba_stream_tbl_ptr.plock); - LEAVE(); +exit: + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->tx_ba_stream_tbl_ptr.plock); + LEAVE(); } /** * @brief This function will delete all the entries in Tx BA Stream table - * + * * @param priv A pointer to mlan_private * * @return N/A @@ -2112,32 +2253,33 @@ wlan_11n_delete_txbastream_tbl_entry(mlan_private * priv, void wlan_11n_deleteall_txbastream_tbl(mlan_private * priv) { - int i; - TxBAStreamTbl *del_tbl_ptr = MNULL; + int i; + TxBAStreamTbl *del_tbl_ptr = MNULL; - ENTER(); + ENTER(); - while ((del_tbl_ptr = (TxBAStreamTbl *) - util_peek_list(priv->adapter->pmoal_handle, - &priv->tx_ba_stream_tbl_ptr, - priv->adapter->callbacks.moal_spin_lock, - priv->adapter->callbacks.moal_spin_unlock))) { - wlan_11n_delete_txbastream_tbl_entry(priv, del_tbl_ptr); - } + while ((del_tbl_ptr = (TxBAStreamTbl *) + util_peek_list(priv->adapter->pmoal_handle, + &priv->tx_ba_stream_tbl_ptr, + priv->adapter->callbacks.moal_spin_lock, + priv->adapter->callbacks.moal_spin_unlock))) { + wlan_11n_delete_txbastream_tbl_entry(priv, del_tbl_ptr); + } - util_init_list((pmlan_linked_list) & priv->tx_ba_stream_tbl_ptr); + util_init_list((pmlan_linked_list) & priv->tx_ba_stream_tbl_ptr); - for (i = 0; i < MAX_NUM_TID; ++i) { - priv->aggr_prio_tbl[i].ampdu_ap = priv->aggr_prio_tbl[i].ampdu_user; - } + for (i = 0; i < MAX_NUM_TID; ++i) { + priv->aggr_prio_tbl[i].ampdu_ap = + priv->aggr_prio_tbl[i].ampdu_user; + } - LEAVE(); + LEAVE(); } /** - * @brief This function will return the pointer to an entry in BA Stream + * @brief This function will return the pointer to an entry in BA Stream * table which matches the give RA/TID pair - * + * * @param priv A pointer to mlan_private * @param tid TID to find in reordering table * @param ra RA to find in reordering table @@ -2148,44 +2290,44 @@ wlan_11n_deleteall_txbastream_tbl(mlan_private * priv) TxBAStreamTbl * wlan_11n_get_txbastream_tbl(mlan_private * priv, int tid, t_u8 * ra) { - TxBAStreamTbl *ptx_tbl; - pmlan_adapter pmadapter = priv->adapter; - - ENTER(); - - if (!(ptx_tbl = (TxBAStreamTbl *) util_peek_list(pmadapter->pmoal_handle, - &priv-> - tx_ba_stream_tbl_ptr, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return MNULL; - } - - while (ptx_tbl != (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { - - PRINTM(MDAT_D, "get_txbastream_tbl TID %d\n", ptx_tbl->tid); - DBG_HEXDUMP(MDAT_D, "RA", ptx_tbl->ra, MLAN_MAC_ADDR_LENGTH); - - if ((!memcmp(pmadapter, ptx_tbl->ra, ra, MLAN_MAC_ADDR_LENGTH)) - && (ptx_tbl->tid == tid)) { - LEAVE(); - return ptx_tbl; - } - - ptx_tbl = ptx_tbl->pnext; - } - - LEAVE(); - return MNULL; + TxBAStreamTbl *ptx_tbl; + pmlan_adapter pmadapter = priv->adapter; + + ENTER(); + + ptx_tbl = (TxBAStreamTbl *) util_peek_list(pmadapter->pmoal_handle, + &priv->tx_ba_stream_tbl_ptr, + pmadapter->callbacks. + moal_spin_lock, + pmadapter->callbacks. + moal_spin_unlock); + if (!ptx_tbl) { + LEAVE(); + return MNULL; + } + + while (ptx_tbl != (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { + + PRINTM(MDAT_D, "get_txbastream_tbl TID %d\n", ptx_tbl->tid); + DBG_HEXDUMP(MDAT_D, "RA", ptx_tbl->ra, MLAN_MAC_ADDR_LENGTH); + + if ((!memcmp(pmadapter, ptx_tbl->ra, ra, MLAN_MAC_ADDR_LENGTH)) + && (ptx_tbl->tid == tid)) { + LEAVE(); + return ptx_tbl; + } + + ptx_tbl = ptx_tbl->pnext; + } + + LEAVE(); + return MNULL; } /** - * @brief This function will create a entry in tx ba stream table for the + * @brief This function will create a entry in tx ba stream table for the * given RA/TID. - * + * * @param priv A pointer to mlan_private * @param ra RA to find in reordering table * @param tid TID to find in reordering table @@ -2195,39 +2337,40 @@ wlan_11n_get_txbastream_tbl(mlan_private * priv, int tid, t_u8 * ra) */ void wlan_11n_create_txbastream_tbl(mlan_private * priv, - t_u8 * ra, int tid, baStatus_e ba_status) + t_u8 * ra, int tid, baStatus_e ba_status) { - TxBAStreamTbl *newNode = MNULL; - pmlan_adapter pmadapter = priv->adapter; + TxBAStreamTbl *newNode = MNULL; + pmlan_adapter pmadapter = priv->adapter; - ENTER(); + ENTER(); - if (!wlan_11n_get_txbastream_tbl(priv, tid, ra)) { - PRINTM(MDAT_D, "get_txbastream_tbl TID %d\n", tid); - DBG_HEXDUMP(MDAT_D, "RA", ra, MLAN_MAC_ADDR_LENGTH); + if (!wlan_11n_get_txbastream_tbl(priv, tid, ra)) { + PRINTM(MDAT_D, "get_txbastream_tbl TID %d\n", tid); + DBG_HEXDUMP(MDAT_D, "RA", ra, MLAN_MAC_ADDR_LENGTH); - pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, - sizeof(TxBAStreamTbl), MLAN_MEM_DEF, - (t_u8 **) & newNode); - util_init_list((pmlan_linked_list) newNode); + pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, + sizeof(TxBAStreamTbl), + MLAN_MEM_DEF, + (t_u8 **) & newNode); + util_init_list((pmlan_linked_list) newNode); - newNode->tid = tid; - newNode->ba_status = ba_status; - memcpy(pmadapter, newNode->ra, ra, MLAN_MAC_ADDR_LENGTH); + newNode->tid = tid; + newNode->ba_status = ba_status; + memcpy(pmadapter, newNode->ra, ra, MLAN_MAC_ADDR_LENGTH); - util_enqueue_list_tail(pmadapter->pmoal_handle, - &priv->tx_ba_stream_tbl_ptr, - (pmlan_linked_list) newNode, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock); - } + util_enqueue_list_tail(pmadapter->pmoal_handle, + &priv->tx_ba_stream_tbl_ptr, + (pmlan_linked_list) newNode, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); + } - LEAVE(); + LEAVE(); } /** * @brief This function will send a block ack to given tid/ra - * + * * @param priv A pointer to mlan_private * @param tid TID to send the ADDBA * @param peer_mac MAC address to send the ADDBA @@ -2237,45 +2380,46 @@ wlan_11n_create_txbastream_tbl(mlan_private * priv, int wlan_send_addba(mlan_private * priv, int tid, t_u8 * peer_mac) { - HostCmd_DS_11N_ADDBA_REQ add_ba_req; - static t_u8 dialog_tok; - mlan_status ret; + HostCmd_DS_11N_ADDBA_REQ add_ba_req; + static t_u8 dialog_tok; + mlan_status ret; - ENTER(); + ENTER(); - PRINTM(MCMND, "Send addba: TID %d\n", tid); - DBG_HEXDUMP(MCMD_D, "Send addba RA", peer_mac, MLAN_MAC_ADDR_LENGTH); + PRINTM(MCMND, "Send addba: TID %d\n", tid); + DBG_HEXDUMP(MCMD_D, "Send addba RA", peer_mac, MLAN_MAC_ADDR_LENGTH); - add_ba_req.block_ack_param_set = (t_u16) ((tid << BLOCKACKPARAM_TID_POS) | - (priv->add_ba_param.tx_win_size - << BLOCKACKPARAM_WINSIZE_POS) | - IMMEDIATE_BLOCK_ACK); + add_ba_req.block_ack_param_set = + (t_u16) ((tid << BLOCKACKPARAM_TID_POS) | + (priv->add_ba_param. + tx_win_size << BLOCKACKPARAM_WINSIZE_POS) | + IMMEDIATE_BLOCK_ACK); /** enable AMSDU inside AMPDU */ - if (priv->add_ba_param.tx_amsdu && - (priv->aggr_prio_tbl[tid].amsdu != BA_STREAM_NOT_ALLOWED)) - add_ba_req.block_ack_param_set |= BLOCKACKPARAM_AMSDU_SUPP_MASK; - add_ba_req.block_ack_tmo = (t_u16) priv->add_ba_param.timeout; + if (priv->add_ba_param.tx_amsdu && + (priv->aggr_prio_tbl[tid].amsdu != BA_STREAM_NOT_ALLOWED)) + add_ba_req.block_ack_param_set |= BLOCKACKPARAM_AMSDU_SUPP_MASK; + add_ba_req.block_ack_tmo = (t_u16) priv->add_ba_param.timeout; - ++dialog_tok; + ++dialog_tok; - if (dialog_tok == 0) - dialog_tok = 1; + if (dialog_tok == 0) + dialog_tok = 1; - add_ba_req.dialog_token = dialog_tok; - memcpy(priv->adapter, &add_ba_req.peer_mac_addr, peer_mac, - MLAN_MAC_ADDR_LENGTH); + add_ba_req.dialog_token = dialog_tok; + memcpy(priv->adapter, &add_ba_req.peer_mac_addr, peer_mac, + MLAN_MAC_ADDR_LENGTH); - /* We don't wait for the response of this command */ - ret = wlan_prepare_cmd(priv, HostCmd_CMD_11N_ADDBA_REQ, - 0, 0, MNULL, &add_ba_req); + /* We don't wait for the response of this command */ + ret = wlan_prepare_cmd(priv, HostCmd_CMD_11N_ADDBA_REQ, + 0, 0, MNULL, &add_ba_req); - LEAVE(); - return ret; + LEAVE(); + return ret; } /** * @brief This function will delete a block ack to given tid/ra - * + * * @param priv A pointer to mlan_private * @param pioctl_req A pointer to ioctl request buffer * @param tid TID to send the ADDBA @@ -2286,38 +2430,39 @@ wlan_send_addba(mlan_private * priv, int tid, t_u8 * peer_mac) */ int wlan_send_delba(mlan_private * priv, pmlan_ioctl_req pioctl_req, int tid, - t_u8 * peer_mac, int initiator) + t_u8 * peer_mac, int initiator) { - HostCmd_DS_11N_DELBA delba; - mlan_status ret; + HostCmd_DS_11N_DELBA delba; + mlan_status ret; - ENTER(); + ENTER(); - memset(priv->adapter, &delba, 0, sizeof(delba)); - delba.del_ba_param_set = (tid << DELBA_TID_POS); + memset(priv->adapter, &delba, 0, sizeof(delba)); + delba.del_ba_param_set = (tid << DELBA_TID_POS); - if (initiator) - DELBA_INITIATOR(delba.del_ba_param_set); - else - DELBA_RECIPIENT(delba.del_ba_param_set); + if (initiator) + DELBA_INITIATOR(delba.del_ba_param_set); + else + DELBA_RECIPIENT(delba.del_ba_param_set); - memcpy(priv->adapter, &delba.peer_mac_addr, peer_mac, MLAN_MAC_ADDR_LENGTH); + memcpy(priv->adapter, &delba.peer_mac_addr, peer_mac, + MLAN_MAC_ADDR_LENGTH); - ret = wlan_prepare_cmd(priv, HostCmd_CMD_11N_DELBA, - HostCmd_ACT_GEN_SET, 0, (t_void *) pioctl_req, - (t_void *) & delba); + ret = wlan_prepare_cmd(priv, HostCmd_CMD_11N_DELBA, + HostCmd_ACT_GEN_SET, 0, (t_void *) pioctl_req, + (t_void *) & delba); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief This function handles the command response of * delete a block ack request - * + * * @param priv A pointer to mlan_private structure * @param del_ba A pointer to command response buffer * @@ -2326,27 +2471,27 @@ wlan_send_delba(mlan_private * priv, pmlan_ioctl_req pioctl_req, int tid, void wlan_11n_delete_bastream(mlan_private * priv, t_u8 * del_ba) { - HostCmd_DS_11N_DELBA *pdel_ba = (HostCmd_DS_11N_DELBA *) del_ba; - int tid; + HostCmd_DS_11N_DELBA *pdel_ba = (HostCmd_DS_11N_DELBA *) del_ba; + int tid; - ENTER(); + ENTER(); - DBG_HEXDUMP(MCMD_D, "Delba:", (t_u8 *) pdel_ba, 20); - pdel_ba->del_ba_param_set = wlan_le16_to_cpu(pdel_ba->del_ba_param_set); - pdel_ba->reason_code = wlan_le16_to_cpu(pdel_ba->reason_code); + DBG_HEXDUMP(MCMD_D, "Delba:", (t_u8 *) pdel_ba, 20); + pdel_ba->del_ba_param_set = wlan_le16_to_cpu(pdel_ba->del_ba_param_set); + pdel_ba->reason_code = wlan_le16_to_cpu(pdel_ba->reason_code); - tid = pdel_ba->del_ba_param_set >> DELBA_TID_POS; + tid = pdel_ba->del_ba_param_set >> DELBA_TID_POS; - mlan_11n_delete_bastream_tbl(priv, tid, pdel_ba->peer_mac_addr, - TYPE_DELBA_RECEIVE, - INITIATOR_BIT(pdel_ba->del_ba_param_set)); + mlan_11n_delete_bastream_tbl(priv, tid, pdel_ba->peer_mac_addr, + TYPE_DELBA_RECEIVE, + INITIATOR_BIT(pdel_ba->del_ba_param_set)); - LEAVE(); + LEAVE(); } -/** +/** * @brief Get Rx reordering table - * + * * @param priv A pointer to mlan_private structure * @param buf A pointer to rx_reorder_tbl structure * @return number of rx reorder table entry @@ -2354,48 +2499,48 @@ wlan_11n_delete_bastream(mlan_private * priv, t_u8 * del_ba) int wlan_get_rxreorder_tbl(mlan_private * priv, rx_reorder_tbl * buf) { - int i; - rx_reorder_tbl *ptbl = buf; - RxReorderTbl *rxReorderTblPtr; - int count = 0; - ENTER(); - if (! - (rxReorderTblPtr = - (RxReorderTbl *) util_peek_list(priv->adapter->pmoal_handle, - &priv->rx_reorder_tbl_ptr, - priv->adapter->callbacks. - moal_spin_lock, - priv->adapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return count; - } - while (rxReorderTblPtr != (RxReorderTbl *) & priv->rx_reorder_tbl_ptr) { - ptbl->tid = (t_u16) rxReorderTblPtr->tid; - memcpy(priv->adapter, ptbl->ta, rxReorderTblPtr->ta, - MLAN_MAC_ADDR_LENGTH); - ptbl->start_win = rxReorderTblPtr->start_win; - ptbl->win_size = rxReorderTblPtr->win_size; - ptbl->amsdu = rxReorderTblPtr->amsdu; - for (i = 0; i < rxReorderTblPtr->win_size; ++i) { - if (rxReorderTblPtr->rx_reorder_ptr[i]) - ptbl->buffer[i] = MTRUE; - else - ptbl->buffer[i] = MFALSE; - } - rxReorderTblPtr = rxReorderTblPtr->pnext; - ptbl++; - count++; - if (count >= MLAN_MAX_RX_BASTREAM_SUPPORTED) - break; - } - LEAVE(); - return count; + int i; + rx_reorder_tbl *ptbl = buf; + RxReorderTbl *rxReorderTblPtr; + int count = 0; + ENTER(); + rxReorderTblPtr = + (RxReorderTbl *) util_peek_list(priv->adapter->pmoal_handle, + &priv->rx_reorder_tbl_ptr, + priv->adapter->callbacks. + moal_spin_lock, + priv->adapter->callbacks. + moal_spin_unlock); + if (!rxReorderTblPtr) { + LEAVE(); + return count; + } + while (rxReorderTblPtr != (RxReorderTbl *) & priv->rx_reorder_tbl_ptr) { + ptbl->tid = (t_u16) rxReorderTblPtr->tid; + memcpy(priv->adapter, ptbl->ta, rxReorderTblPtr->ta, + MLAN_MAC_ADDR_LENGTH); + ptbl->start_win = rxReorderTblPtr->start_win; + ptbl->win_size = rxReorderTblPtr->win_size; + ptbl->amsdu = rxReorderTblPtr->amsdu; + for (i = 0; i < rxReorderTblPtr->win_size; ++i) { + if (rxReorderTblPtr->rx_reorder_ptr[i]) + ptbl->buffer[i] = MTRUE; + else + ptbl->buffer[i] = MFALSE; + } + rxReorderTblPtr = rxReorderTblPtr->pnext; + ptbl++; + count++; + if (count >= MLAN_MAX_RX_BASTREAM_SUPPORTED) + break; + } + LEAVE(); + return count; } -/** +/** * @brief Get transmit BA stream table - * + * * @param priv A pointer to mlan_private structure * @param buf A pointer to tx_ba_stream_tbl structure * @return number of ba stream table entry @@ -2403,60 +2548,63 @@ wlan_get_rxreorder_tbl(mlan_private * priv, rx_reorder_tbl * buf) int wlan_get_txbastream_tbl(mlan_private * priv, tx_ba_stream_tbl * buf) { - TxBAStreamTbl *ptxtbl; - tx_ba_stream_tbl *ptbl = buf; - int count = 0; - t_u32 bastream_max = 0; - - ENTER(); - - if (!(ptxtbl = (TxBAStreamTbl *) util_peek_list(priv->adapter->pmoal_handle, - &priv->tx_ba_stream_tbl_ptr, - priv->adapter->callbacks. - moal_spin_lock, - priv->adapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return count; - } - bastream_max = ISSUPP_GETTXBASTREAM(priv->adapter->hw_dot_11n_dev_cap); - if (bastream_max == 0) - bastream_max = MLAN_MAX_TX_BASTREAM_DEFAULT; - - while (ptxtbl != (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { - ptbl->tid = (t_u16) ptxtbl->tid; - PRINTM(MINFO, "tid=%d\n", ptbl->tid); - memcpy(priv->adapter, ptbl->ra, ptxtbl->ra, MLAN_MAC_ADDR_LENGTH); - ptbl->amsdu = ptxtbl->amsdu; - ptxtbl = ptxtbl->pnext; - ptbl++; - count++; - if (count >= bastream_max) - break; - } - - LEAVE(); - return count; + TxBAStreamTbl *ptxtbl; + tx_ba_stream_tbl *ptbl = buf; + int count = 0; + t_u32 bastream_max = 0; + + ENTER(); + + ptxtbl = (TxBAStreamTbl *) util_peek_list(priv->adapter->pmoal_handle, + &priv->tx_ba_stream_tbl_ptr, + priv->adapter->callbacks. + moal_spin_lock, + priv->adapter->callbacks. + moal_spin_unlock); + if (!ptxtbl) { + LEAVE(); + return count; + } + bastream_max = ISSUPP_GETTXBASTREAM(priv->adapter->hw_dot_11n_dev_cap); + if (bastream_max == 0) + bastream_max = MLAN_MAX_TX_BASTREAM_DEFAULT; + + while (ptxtbl != (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { + ptbl->tid = (t_u16) ptxtbl->tid; + PRINTM(MINFO, "tid=%d\n", ptbl->tid); + memcpy(priv->adapter, ptbl->ra, ptxtbl->ra, + MLAN_MAC_ADDR_LENGTH); + ptbl->amsdu = ptxtbl->amsdu; + ptxtbl = ptxtbl->pnext; + ptbl++; + count++; + if (count >= bastream_max) + break; + } + + LEAVE(); + return count; } /** * @brief This function cleans up txbastream_tbl for specific station - * + * * @param priv A pointer to mlan_private - * @param ra RA to find in txbastream_tbl + * @param ra RA to find in txbastream_tbl * @return N/A */ void wlan_11n_cleanup_txbastream_tbl(mlan_private * priv, t_u8 * ra) { - TxBAStreamTbl *ptx_tbl = MNULL; - t_u8 i; - ENTER(); - for (i = 0; i < MAX_NUM_TID; ++i) { - if ((ptx_tbl = wlan_11n_get_txbastream_tbl(priv, i, ra))) { - wlan_11n_delete_txbastream_tbl_entry(priv, ptx_tbl); - } - } - LEAVE(); - return; + TxBAStreamTbl *ptx_tbl = MNULL; + t_u8 i; + ENTER(); + for (i = 0; i < MAX_NUM_TID; ++i) { + ptx_tbl = wlan_11n_get_txbastream_tbl(priv, i, ra); + if (ptx_tbl) { + wlan_11n_delete_txbastream_tbl_entry(priv, ptx_tbl); + } + } + LEAVE(); + return; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_11n.h b/drivers/net/wireless/sd8897/mlan/mlan_11n.h index 21a3403b89ce..d039b8e51e85 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_11n.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_11n.h @@ -42,60 +42,60 @@ void wlan_show_devmcssupport(pmlan_adapter pmadapter, t_u8 support); mlan_status wlan_ret_11n_delba(mlan_private * priv, HostCmd_DS_COMMAND * resp); /** Handle the command response of an add block ack request */ mlan_status wlan_ret_11n_addba_req(mlan_private * priv, - HostCmd_DS_COMMAND * resp); + HostCmd_DS_COMMAND * resp); /** Handle the command response of 11ncfg command */ mlan_status wlan_ret_11n_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); /** Prepare 11ncfg command */ mlan_status wlan_cmd_11n_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, IN t_u16 cmd_action, - IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * cmd, IN t_u16 cmd_action, + IN t_void * pdata_buf); /** Prepare reject addba requst command */ mlan_status wlan_cmd_reject_addba_req(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, - IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, + IN t_void * pdata_buf); /** Handle the command response of rejecting addba request */ mlan_status wlan_ret_reject_addba_req(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); /** Prepare TX BF configuration command */ mlan_status wlan_cmd_tx_bf_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf); /** Handle the command response TX BF configuration */ mlan_status wlan_ret_tx_bf_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); #ifdef STA_SUPPORT /** Append the 802_11N tlv */ int wlan_cmd_append_11n_tlv(IN mlan_private * pmpriv, - IN BSSDescriptor_t * pbss_desc, - OUT t_u8 ** ppbuffer); + IN BSSDescriptor_t * pbss_desc, + OUT t_u8 ** ppbuffer); /** wlan fill HT cap tlv */ void wlan_fill_ht_cap_tlv(mlan_private * priv, MrvlIETypes_HTCap_t * pht_cap, - t_u8 band); + t_u8 band); #endif /* STA_SUPPORT */ /** Miscellaneous configuration handler */ mlan_status wlan_11n_cfg_ioctl(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); /** Delete Tx BA stream table entry */ void wlan_11n_delete_txbastream_tbl_entry(mlan_private * priv, - TxBAStreamTbl * ptx_tbl); + TxBAStreamTbl * ptx_tbl); /** Delete all Tx BA stream table entries */ void wlan_11n_deleteall_txbastream_tbl(mlan_private * priv); /** Get Tx BA stream table */ TxBAStreamTbl *wlan_11n_get_txbastream_tbl(mlan_private * priv, int tid, - t_u8 * ra); + t_u8 * ra); /** Create Tx BA stream table */ void wlan_11n_create_txbastream_tbl(mlan_private * priv, t_u8 * ra, int tid, - baStatus_e ba_status); + baStatus_e ba_status); /** Send ADD BA request */ int wlan_send_addba(mlan_private * priv, int tid, t_u8 * peer_mac); /** Send DEL BA request */ int wlan_send_delba(mlan_private * priv, pmlan_ioctl_req pioctl_req, int tid, - t_u8 * peer_mac, int initiator); + t_u8 * peer_mac, int initiator); /** This function handles the command response of delete a block ack request*/ void wlan_11n_delete_bastream(mlan_private * priv, t_u8 * del_ba); /** get rx reorder table */ @@ -106,25 +106,25 @@ int wlan_get_txbastream_tbl(mlan_private * priv, tx_ba_stream_tbl * buf); #define MIN_NUM_AMSDU 2 /** AMSDU Aggr control cmd resp */ mlan_status wlan_ret_amsdu_aggr_ctrl(pmlan_private pmpriv, - HostCmd_DS_COMMAND * resp, - mlan_ioctl_req * pioctl_buf); + HostCmd_DS_COMMAND * resp, + mlan_ioctl_req * pioctl_buf); /** reconfigure tx buf size */ mlan_status wlan_cmd_recfg_tx_buf(mlan_private * priv, - HostCmd_DS_COMMAND * cmd, - int cmd_action, void *pdata_buf); + HostCmd_DS_COMMAND * cmd, + int cmd_action, void *pdata_buf); /** AMSDU aggr control cmd */ mlan_status wlan_cmd_amsdu_aggr_ctrl(mlan_private * priv, - HostCmd_DS_COMMAND * cmd, - int cmd_action, void *pdata_buf); + HostCmd_DS_COMMAND * cmd, + int cmd_action, void *pdata_buf); t_u8 wlan_validate_chan_offset(IN mlan_private * pmpriv, - IN t_u8 band, IN t_u32 chan, IN t_u8 chan_bw); + IN t_u8 band, IN t_u32 chan, IN t_u8 chan_bw); /** clean up txbastream_tbl */ void wlan_11n_cleanup_txbastream_tbl(mlan_private * priv, t_u8 * ra); /** * @brief This function checks whether a station has 11N enabled or not - * + * * @param priv A pointer to mlan_private * @param mac station mac address * @return MTRUE or MFALSE @@ -132,16 +132,17 @@ void wlan_11n_cleanup_txbastream_tbl(mlan_private * priv, t_u8 * ra); static INLINE t_u8 is_station_11n_enabled(mlan_private * priv, t_u8 * mac) { - sta_node *sta_ptr = MNULL; - if ((sta_ptr = wlan_get_station_entry(priv, mac))) { - return (sta_ptr->is_11n_enabled) ? MTRUE : MFALSE; - } - return MFALSE; + sta_node *sta_ptr = MNULL; + sta_ptr = wlan_get_station_entry(priv, mac); + if (sta_ptr) { + return (sta_ptr->is_11n_enabled) ? MTRUE : MFALSE; + } + return MFALSE; } /** * @brief This function get station max amsdu size - * + * * @param priv A pointer to mlan_private * @param mac station mac address * @return max amsdu size statio supported @@ -149,16 +150,17 @@ is_station_11n_enabled(mlan_private * priv, t_u8 * mac) static INLINE t_u16 get_station_max_amsdu_size(mlan_private * priv, t_u8 * mac) { - sta_node *sta_ptr = MNULL; - if ((sta_ptr = wlan_get_station_entry(priv, mac))) { - return sta_ptr->max_amsdu; - } - return 0; + sta_node *sta_ptr = MNULL; + sta_ptr = wlan_get_station_entry(priv, mac); + if (sta_ptr) { + return sta_ptr->max_amsdu; + } + return 0; } /** * @brief This function checks whether a station allows AMPDU or not - * + * * @param priv A pointer to mlan_private * @param ptr A pointer to RA list table * @param tid TID value for ptr @@ -167,21 +169,23 @@ get_station_max_amsdu_size(mlan_private * priv, t_u8 * mac) static INLINE t_u8 is_station_ampdu_allowed(mlan_private * priv, raListTbl * ptr, int tid) { - sta_node *sta_ptr = MNULL; - if ((sta_ptr = wlan_get_station_entry(priv, ptr->ra))) { - if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { - if (priv->sec_info.wapi_enabled && !sta_ptr->wapi_key_on) - return MFALSE; - } - return ((sta_ptr->ampdu_sta[tid] != BA_STREAM_NOT_ALLOWED) - ? MTRUE : MFALSE); - } - return MFALSE; + sta_node *sta_ptr = MNULL; + sta_ptr = wlan_get_station_entry(priv, ptr->ra); + if (sta_ptr) { + if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { + if (priv->sec_info.wapi_enabled && + !sta_ptr->wapi_key_on) + return MFALSE; + } + return ((sta_ptr->ampdu_sta[tid] != BA_STREAM_NOT_ALLOWED) + ? MTRUE : MFALSE); + } + return MFALSE; } /** - * @brief This function disable station ampdu for specific tid - * + * @brief This function disable station ampdu for specific tid + * * @param priv A pointer to mlan_private * @param tid tid index * @param ra station mac address @@ -190,16 +194,17 @@ is_station_ampdu_allowed(mlan_private * priv, raListTbl * ptr, int tid) static INLINE void disable_station_ampdu(mlan_private * priv, t_u8 tid, t_u8 * ra) { - sta_node *sta_ptr = MNULL; - if ((sta_ptr = wlan_get_station_entry(priv, ra))) { - sta_ptr->ampdu_sta[tid] = BA_STREAM_NOT_ALLOWED; - } - return; + sta_node *sta_ptr = MNULL; + sta_ptr = wlan_get_station_entry(priv, ra); + if (sta_ptr) { + sta_ptr->ampdu_sta[tid] = BA_STREAM_NOT_ALLOWED; + } + return; } /** * @brief This function checks whether current BA stream is high priority or not - * + * * @param priv A pointer to mlan_private * @param tid TID * @@ -208,37 +213,36 @@ disable_station_ampdu(mlan_private * priv, t_u8 tid, t_u8 * ra) static INLINE t_u8 wlan_is_cur_bastream_high_prio(mlan_private * priv, int tid) { - TxBAStreamTbl *ptx_tbl; - - ENTER(); - - if (! - (ptx_tbl = - (TxBAStreamTbl *) util_peek_list(priv->adapter->pmoal_handle, - &priv->tx_ba_stream_tbl_ptr, - priv->adapter->callbacks. - moal_spin_lock, - priv->adapter->callbacks. - moal_spin_unlock))) - return MFALSE; - - while (ptx_tbl != (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { - if (priv->aggr_prio_tbl[tid].ampdu_user > - priv->aggr_prio_tbl[ptx_tbl->tid].ampdu_user) { - LEAVE(); - return MTRUE; - } - - ptx_tbl = ptx_tbl->pnext; - } - - LEAVE(); - return MFALSE; + TxBAStreamTbl *ptx_tbl; + + ENTER(); + + ptx_tbl = (TxBAStreamTbl *) util_peek_list(priv->adapter->pmoal_handle, + &priv->tx_ba_stream_tbl_ptr, + priv->adapter->callbacks. + moal_spin_lock, + priv->adapter->callbacks. + moal_spin_unlock); + if (!ptx_tbl) + return MFALSE; + + while (ptx_tbl != (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { + if (priv->aggr_prio_tbl[tid].ampdu_user > + priv->aggr_prio_tbl[ptx_tbl->tid].ampdu_user) { + LEAVE(); + return MTRUE; + } + + ptx_tbl = ptx_tbl->pnext; + } + + LEAVE(); + return MFALSE; } /** * @brief This function checks whether AMPDU is allowed or not - * + * * @param priv A pointer to mlan_private * @param ptr A pointer to RA list table * @param tid TID value for ptr @@ -249,19 +253,19 @@ static INLINE t_u8 wlan_is_ampdu_allowed(mlan_private * priv, raListTbl * ptr, int tid) { #ifdef UAP_SUPPORT - if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) - return is_station_ampdu_allowed(priv, ptr, tid); + if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) + return is_station_ampdu_allowed(priv, ptr, tid); #endif /* UAP_SUPPORT */ - if (priv->sec_info.wapi_enabled && !priv->sec_info.wapi_key_on) - return MFALSE; + if (priv->sec_info.wapi_enabled && !priv->sec_info.wapi_key_on) + return MFALSE; - return ((priv->aggr_prio_tbl[tid].ampdu_ap != BA_STREAM_NOT_ALLOWED) - ? MTRUE : MFALSE); + return ((priv->aggr_prio_tbl[tid].ampdu_ap != BA_STREAM_NOT_ALLOWED) + ? MTRUE : MFALSE); } /** * @brief This function checks whether AMSDU is allowed for BA stream - * + * * @param priv A pointer to mlan_private * @param ptr A pointer to RA list table * @param tid TID value for ptr @@ -271,19 +275,20 @@ wlan_is_ampdu_allowed(mlan_private * priv, raListTbl * ptr, int tid) static int INLINE wlan_is_amsdu_in_ampdu_allowed(mlan_private * priv, raListTbl * ptr, int tid) { - TxBAStreamTbl *ptx_tbl; - ENTER(); - if ((ptx_tbl = wlan_11n_get_txbastream_tbl(priv, tid, ptr->ra))) { - LEAVE(); - return ptx_tbl->amsdu; - } - LEAVE(); - return MFALSE; + TxBAStreamTbl *ptx_tbl; + ENTER(); + ptx_tbl = wlan_11n_get_txbastream_tbl(priv, tid, ptr->ra); + if (ptx_tbl) { + LEAVE(); + return ptx_tbl->amsdu; + } + LEAVE(); + return MFALSE; } /** * @brief This function checks whether AMSDU is allowed or not - * + * * @param priv A pointer to mlan_private * @param ptr A pointer to RA list table * @param tid TID value for ptr @@ -294,24 +299,26 @@ static INLINE t_u8 wlan_is_amsdu_allowed(mlan_private * priv, raListTbl * ptr, int tid) { #ifdef UAP_SUPPORT - sta_node *sta_ptr = MNULL; - if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { - if ((sta_ptr = wlan_get_station_entry(priv, ptr->ra))) { - if (priv->sec_info.wapi_enabled && !sta_ptr->wapi_key_on) - return MFALSE; - } - } + sta_node *sta_ptr = MNULL; + if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { + sta_ptr = wlan_get_station_entry(priv, ptr->ra); + if (sta_ptr) { + if (priv->sec_info.wapi_enabled && + !sta_ptr->wapi_key_on) + return MFALSE; + } + } #endif /* UAP_SUPPORT */ #define TXRATE_BITMAP_INDEX_MCS0_7 2 - return (((priv->aggr_prio_tbl[tid].amsdu != BA_STREAM_NOT_ALLOWED) - && ((priv->is_data_rate_auto) - || !((priv->bitmap_rates[TXRATE_BITMAP_INDEX_MCS0_7]) & 0x03))) - ? MTRUE : MFALSE); + return (((priv->aggr_prio_tbl[tid].amsdu != BA_STREAM_NOT_ALLOWED) + && ((priv->is_data_rate_auto) + || !((priv->bitmap_rates[TXRATE_BITMAP_INDEX_MCS0_7]) & + 0x03))) ? MTRUE : MFALSE); } /** * @brief This function checks whether a BA stream is available or not - * + * * @param priv A pointer to mlan_private * * @return MTRUE or MFALSE @@ -319,26 +326,27 @@ wlan_is_amsdu_allowed(mlan_private * priv, raListTbl * ptr, int tid) static INLINE t_u8 wlan_is_bastream_avail(mlan_private * priv) { - mlan_private *pmpriv = MNULL; - t_u8 i = 0; - t_u32 bastream_num = 0; - t_u32 bastream_max = 0; - for (i = 0; i < priv->adapter->priv_num; i++) { - if ((pmpriv = priv->adapter->priv[i])) - bastream_num += - wlan_wmm_list_len(priv->adapter, - (pmlan_list_head) & pmpriv-> - tx_ba_stream_tbl_ptr); - } - bastream_max = ISSUPP_GETTXBASTREAM(priv->adapter->hw_dot_11n_dev_cap); - if (bastream_max == 0) - bastream_max = MLAN_MAX_TX_BASTREAM_DEFAULT; - return (bastream_num < bastream_max ? MTRUE : MFALSE); + mlan_private *pmpriv = MNULL; + t_u8 i = 0; + t_u32 bastream_num = 0; + t_u32 bastream_max = 0; + for (i = 0; i < priv->adapter->priv_num; i++) { + pmpriv = priv->adapter->priv[i]; + if (pmpriv) + bastream_num += + wlan_wmm_list_len(priv->adapter, + (pmlan_list_head) & pmpriv-> + tx_ba_stream_tbl_ptr); + } + bastream_max = ISSUPP_GETTXBASTREAM(priv->adapter->hw_dot_11n_dev_cap); + if (bastream_max == 0) + bastream_max = MLAN_MAX_TX_BASTREAM_DEFAULT; + return (bastream_num < bastream_max ? MTRUE : MFALSE); } /** * @brief This function finds the stream to delete - * + * * @param priv A pointer to mlan_private * @param ptr A pointer to RA list table * @param ptr_tid TID value of ptr @@ -349,46 +357,46 @@ wlan_is_bastream_avail(mlan_private * priv) */ static INLINE t_u8 wlan_find_stream_to_delete(mlan_private * priv, - raListTbl * ptr, int ptr_tid, int *ptid, t_u8 * ra) + raListTbl * ptr, int ptr_tid, int *ptid, t_u8 * ra) { - int tid; - t_u8 ret = MFALSE; - TxBAStreamTbl *ptx_tbl; - - ENTER(); - - if (! - (ptx_tbl = - (TxBAStreamTbl *) util_peek_list(priv->adapter->pmoal_handle, - &priv->tx_ba_stream_tbl_ptr, - priv->adapter->callbacks. - moal_spin_lock, - priv->adapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return ret; - } - - tid = priv->aggr_prio_tbl[ptr_tid].ampdu_user; - - while (ptx_tbl != (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { - if (tid > priv->aggr_prio_tbl[ptx_tbl->tid].ampdu_user) { - tid = priv->aggr_prio_tbl[ptx_tbl->tid].ampdu_user; - *ptid = ptx_tbl->tid; - memcpy(priv->adapter, ra, ptx_tbl->ra, MLAN_MAC_ADDR_LENGTH); - ret = MTRUE; - } - - ptx_tbl = ptx_tbl->pnext; - } - - LEAVE(); - return ret; + int tid; + t_u8 ret = MFALSE; + TxBAStreamTbl *ptx_tbl; + + ENTER(); + + ptx_tbl = (TxBAStreamTbl *) util_peek_list(priv->adapter->pmoal_handle, + &priv->tx_ba_stream_tbl_ptr, + priv->adapter->callbacks. + moal_spin_lock, + priv->adapter->callbacks. + moal_spin_unlock); + if (!ptx_tbl) { + LEAVE(); + return ret; + } + + tid = priv->aggr_prio_tbl[ptr_tid].ampdu_user; + + while (ptx_tbl != (TxBAStreamTbl *) & priv->tx_ba_stream_tbl_ptr) { + if (tid > priv->aggr_prio_tbl[ptx_tbl->tid].ampdu_user) { + tid = priv->aggr_prio_tbl[ptx_tbl->tid].ampdu_user; + *ptid = ptx_tbl->tid; + memcpy(priv->adapter, ra, ptx_tbl->ra, + MLAN_MAC_ADDR_LENGTH); + ret = MTRUE; + } + + ptx_tbl = ptx_tbl->pnext; + } + + LEAVE(); + return ret; } /** * @brief This function checks whether BA stream is setup - * + * * @param priv A pointer to mlan_private * @param ptr A pointer to RA list table * @param tid TID value for ptr @@ -398,22 +406,23 @@ wlan_find_stream_to_delete(mlan_private * priv, static int INLINE wlan_is_bastream_setup(mlan_private * priv, raListTbl * ptr, int tid) { - TxBAStreamTbl *ptx_tbl; + TxBAStreamTbl *ptx_tbl; - ENTER(); + ENTER(); - if ((ptx_tbl = wlan_11n_get_txbastream_tbl(priv, tid, ptr->ra))) { - LEAVE(); - return IS_BASTREAM_SETUP(ptx_tbl) ? MTRUE : MFALSE; - } + ptx_tbl = wlan_11n_get_txbastream_tbl(priv, tid, ptr->ra); + if (ptx_tbl) { + LEAVE(); + return IS_BASTREAM_SETUP(ptx_tbl) ? MTRUE : MFALSE; + } - LEAVE(); - return MFALSE; + LEAVE(); + return MFALSE; } /** * @brief This function checks whether 11n is supported - * + * * @param priv A pointer to mlan_private * @param ra Address of the receiver STA * @@ -422,15 +431,15 @@ wlan_is_bastream_setup(mlan_private * priv, raListTbl * ptr, int tid) static int INLINE wlan_is_11n_enabled(mlan_private * priv, t_u8 * ra) { - int ret = MFALSE; - ENTER(); + int ret = MFALSE; + ENTER(); #ifdef UAP_SUPPORT - if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { - if ((!(ra[0] & 0x01)) && (priv->is_11n_enabled)) - ret = is_station_11n_enabled(priv, ra); - } + if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { + if ((!(ra[0] & 0x01)) && (priv->is_11n_enabled)) + ret = is_station_11n_enabled(priv, ra); + } #endif /* UAP_SUPPORT */ - LEAVE(); - return ret; + LEAVE(); + return ret; } #endif /* !_MLAN_11N_H_ */ diff --git a/drivers/net/wireless/sd8897/mlan/mlan_11n_aggr.c b/drivers/net/wireless/sd8897/mlan/mlan_11n_aggr.c index 7acaaa4b4aee..e755dbac7de0 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_11n_aggr.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_11n_aggr.c @@ -2,7 +2,7 @@ * * @brief This file contains functions for 11n Aggregation. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -59,85 +59,86 @@ Change log: */ static int wlan_11n_form_amsdu_pkt(pmlan_adapter pmadapter, t_u8 * amsdu_buf, t_u8 * data, - int pkt_len, int *pad) + int pkt_len, int *pad) { - int dt_offset, amsdu_buf_offset; - Rfc1042Hdr_t snap = { - 0xaa, /* LLC DSAP */ - 0xaa, /* LLC SSAP */ - 0x03, /* LLC CTRL */ - {0x00, 0x00, 0x00}, /* SNAP OUI */ - 0x0000 /* SNAP type */ - /* - * This field will be overwritten - * later with ethertype - */ - }; - - ENTER(); - - memcpy(pmadapter, amsdu_buf, data, (MLAN_MAC_ADDR_LENGTH) * 2); - dt_offset = amsdu_buf_offset = (MLAN_MAC_ADDR_LENGTH) * 2; - - snap.snap_type = *(t_u16 *) (data + dt_offset); - dt_offset += sizeof(t_u16); - *(t_u16 *) (amsdu_buf + amsdu_buf_offset) = mlan_htons(pkt_len + - LLC_SNAP_LEN - - ((2 * - MLAN_MAC_ADDR_LENGTH) - + sizeof(t_u16))); - amsdu_buf_offset += sizeof(t_u16); - memcpy(pmadapter, amsdu_buf + amsdu_buf_offset, &snap, LLC_SNAP_LEN); - amsdu_buf_offset += LLC_SNAP_LEN; - - memcpy(pmadapter, amsdu_buf + amsdu_buf_offset, data + dt_offset, - pkt_len - dt_offset); - *pad = - (((pkt_len + LLC_SNAP_LEN) & 3)) ? (4 - - (((pkt_len + - LLC_SNAP_LEN)) & 3)) : 0; - - LEAVE(); - return (pkt_len + LLC_SNAP_LEN + *pad); + int dt_offset, amsdu_buf_offset; + Rfc1042Hdr_t snap = { + 0xaa, /* LLC DSAP */ + 0xaa, /* LLC SSAP */ + 0x03, /* LLC CTRL */ + {0x00, 0x00, 0x00}, /* SNAP OUI */ + 0x0000 /* SNAP type */ + /* + * This field will be overwritten + * later with ethertype + */ + }; + + ENTER(); + + memcpy(pmadapter, amsdu_buf, data, (MLAN_MAC_ADDR_LENGTH) * 2); + dt_offset = amsdu_buf_offset = (MLAN_MAC_ADDR_LENGTH) * 2; + + snap.snap_type = *(t_u16 *) (data + dt_offset); + dt_offset += sizeof(t_u16); + *(t_u16 *) (amsdu_buf + amsdu_buf_offset) = mlan_htons(pkt_len + + LLC_SNAP_LEN - + ((2 * + MLAN_MAC_ADDR_LENGTH) + + + sizeof(t_u16))); + amsdu_buf_offset += sizeof(t_u16); + memcpy(pmadapter, amsdu_buf + amsdu_buf_offset, &snap, LLC_SNAP_LEN); + amsdu_buf_offset += LLC_SNAP_LEN; + + memcpy(pmadapter, amsdu_buf + amsdu_buf_offset, data + dt_offset, + pkt_len - dt_offset); + *pad = (((pkt_len + LLC_SNAP_LEN) & 3)) ? (4 - + (((pkt_len + + LLC_SNAP_LEN)) & 3)) : 0; + + LEAVE(); + return (pkt_len + LLC_SNAP_LEN + *pad); } /** * @brief Add TxPD to AMSDU header * * @param priv A pointer to mlan_private structure - * @param mbuf Pointer to buffer where the TxPD will be formed + * @param mbuf Pointer to buffer where the TxPD will be formed * * @return N/A */ static void wlan_11n_form_amsdu_txpd(mlan_private * priv, mlan_buffer * mbuf) { - TxPD *ptx_pd; - mlan_adapter *pmadapter = priv->adapter; + TxPD *ptx_pd; + mlan_adapter *pmadapter = priv->adapter; - ENTER(); + ENTER(); - ptx_pd = (TxPD *) mbuf->pbuf; - memset(pmadapter, ptx_pd, 0, sizeof(TxPD)); + ptx_pd = (TxPD *) mbuf->pbuf; + memset(pmadapter, ptx_pd, 0, sizeof(TxPD)); - /* - * Original priority has been overwritten - */ - ptx_pd->priority = (t_u8) mbuf->priority; - ptx_pd->pkt_delay_2ms = wlan_wmm_compute_driver_packet_delay(priv, mbuf); - ptx_pd->bss_num = GET_BSS_NUM(priv); - ptx_pd->bss_type = priv->bss_type; - /* Always zero as the data is followed by TxPD */ - ptx_pd->tx_pkt_offset = sizeof(TxPD); - ptx_pd->tx_pkt_type = PKT_TYPE_AMSDU; + /* + * Original priority has been overwritten + */ + ptx_pd->priority = (t_u8) mbuf->priority; + ptx_pd->pkt_delay_2ms = + wlan_wmm_compute_driver_packet_delay(priv, mbuf); + ptx_pd->bss_num = GET_BSS_NUM(priv); + ptx_pd->bss_type = priv->bss_type; + /* Always zero as the data is followed by TxPD */ + ptx_pd->tx_pkt_offset = sizeof(TxPD); + ptx_pd->tx_pkt_type = PKT_TYPE_AMSDU; - if (ptx_pd->tx_control == 0) - /* TxCtrl set by user or default */ - ptx_pd->tx_control = priv->pkt_tx_ctrl; + if (ptx_pd->tx_control == 0) + /* TxCtrl set by user or default */ + ptx_pd->tx_control = priv->pkt_tx_ctrl; - endian_convert_TxPD(ptx_pd); + endian_convert_TxPD(ptx_pd); - LEAVE(); + LEAVE(); } /** @@ -152,22 +153,22 @@ wlan_11n_form_amsdu_txpd(mlan_private * priv, mlan_buffer * mbuf) static INLINE void wlan_11n_update_pktlen_amsdu_txpd(mlan_private * priv, pmlan_buffer mbuf) { - TxPD *ptx_pd; - ENTER(); + TxPD *ptx_pd; + ENTER(); - ptx_pd = (TxPD *) mbuf->pbuf; - ptx_pd->tx_pkt_length = - (t_u16) wlan_cpu_to_le16(mbuf->data_len - sizeof(TxPD)); + ptx_pd = (TxPD *) mbuf->pbuf; + ptx_pd->tx_pkt_length = + (t_u16) wlan_cpu_to_le16(mbuf->data_len - sizeof(TxPD)); #ifdef STA_SUPPORT - if ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) && - (priv->adapter->pps_uapsd_mode)) { - if (MTRUE == wlan_check_last_packet_indication(priv)) { - priv->adapter->tx_lock_flag = MTRUE; - ptx_pd->flags = MRVDRV_TxPD_POWER_MGMT_LAST_PACKET; - } - } + if ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) && + (priv->adapter->pps_uapsd_mode)) { + if (MTRUE == wlan_check_last_packet_indication(priv)) { + priv->adapter->tx_lock_flag = MTRUE; + ptx_pd->flags = MRVDRV_TxPD_POWER_MGMT_LAST_PACKET; + } + } #endif /* STA_SUPPORT */ - LEAVE(); + LEAVE(); } /** @@ -181,26 +182,27 @@ wlan_11n_update_pktlen_amsdu_txpd(mlan_private * priv, pmlan_buffer mbuf) static int wlan_11n_get_num_aggrpkts(t_u8 * data, int total_pkt_len) { - int pkt_count = 0, pkt_len, pad; - t_u8 hdr_len = sizeof(Eth803Hdr_t); - - ENTER(); - while (total_pkt_len >= hdr_len) { - /* Length will be in network format, change it to host */ - pkt_len = mlan_ntohs((*(t_u16 *) (data + (2 * MLAN_MAC_ADDR_LENGTH)))); - if (pkt_len > total_pkt_len) { - PRINTM(MERROR, "Error in packet length.\n"); - break; - } - - pad = (((pkt_len + sizeof(Eth803Hdr_t)) & 3)) ? - (4 - ((pkt_len + sizeof(Eth803Hdr_t)) & 3)) : 0; - data += pkt_len + pad + sizeof(Eth803Hdr_t); - total_pkt_len -= pkt_len + pad + sizeof(Eth803Hdr_t); - ++pkt_count; - } - LEAVE(); - return pkt_count; + int pkt_count = 0, pkt_len, pad; + t_u8 hdr_len = sizeof(Eth803Hdr_t); + + ENTER(); + while (total_pkt_len >= hdr_len) { + /* Length will be in network format, change it to host */ + pkt_len = mlan_ntohs((*(t_u16 *) (data + (2 * + MLAN_MAC_ADDR_LENGTH)))); + if (pkt_len > total_pkt_len) { + PRINTM(MERROR, "Error in packet length.\n"); + break; + } + + pad = (((pkt_len + sizeof(Eth803Hdr_t)) & 3)) ? + (4 - ((pkt_len + sizeof(Eth803Hdr_t)) & 3)) : 0; + data += pkt_len + pad + sizeof(Eth803Hdr_t); + total_pkt_len -= pkt_len + pad + sizeof(Eth803Hdr_t); + ++pkt_count; + } + LEAVE(); + return pkt_count; } /******************************************************** @@ -208,7 +210,7 @@ wlan_11n_get_num_aggrpkts(t_u8 * data, int total_pkt_len) ********************************************************/ /** - * @brief Deaggregate the received AMSDU packet + * @brief Deaggregate the received AMSDU packet * * @param priv A pointer to mlan_private structure * @param pmbuf A pointer to aggregated data packet @@ -218,109 +220,110 @@ wlan_11n_get_num_aggrpkts(t_u8 * data, int total_pkt_len) mlan_status wlan_11n_deaggregate_pkt(mlan_private * priv, pmlan_buffer pmbuf) { - t_u16 pkt_len; - int total_pkt_len; - t_u8 *data; - t_u32 max_rx_data_size = MLAN_RX_DATA_BUF_SIZE; - int pad; - mlan_status ret = MLAN_STATUS_FAILURE; - RxPacketHdr_t *prx_pkt; - mlan_buffer *daggr_mbuf = MNULL; - mlan_adapter *pmadapter = priv->adapter; - t_u8 rfc1042_eth_hdr[MLAN_MAC_ADDR_LENGTH] = { 0xaa, 0xaa, 0x03, - 0x00, 0x00, 0x00 - }; - t_u8 hdr_len = sizeof(Eth803Hdr_t); - - ENTER(); - - data = (t_u8 *) (pmbuf->pbuf + pmbuf->data_offset); - total_pkt_len = pmbuf->data_len; - - /* Sanity test */ - if (total_pkt_len > max_rx_data_size) { - PRINTM(MERROR, "Total packet length greater than tx buffer" - " size %d\n", total_pkt_len); - goto done; - } - - pmbuf->use_count = wlan_11n_get_num_aggrpkts(data, total_pkt_len); - - while (total_pkt_len >= hdr_len) { - prx_pkt = (RxPacketHdr_t *) data; - /* Length will be in network format, change it to host */ - pkt_len = mlan_ntohs((*(t_u16 *) (data + (2 * MLAN_MAC_ADDR_LENGTH)))); - if (pkt_len > total_pkt_len) { - PRINTM(MERROR, - "Error in packet length: total_pkt_len = %d, pkt_len = %d\n", - total_pkt_len, pkt_len); - break; - } - - pad = (((pkt_len + sizeof(Eth803Hdr_t)) & 3)) ? - (4 - ((pkt_len + sizeof(Eth803Hdr_t)) & 3)) : 0; - - total_pkt_len -= pkt_len + pad + sizeof(Eth803Hdr_t); - - if (memcmp(pmadapter, &prx_pkt->rfc1042_hdr, - rfc1042_eth_hdr, sizeof(rfc1042_eth_hdr)) == 0) { - memmove(pmadapter, data + LLC_SNAP_LEN, data, (2 * - MLAN_MAC_ADDR_LENGTH)); - data += LLC_SNAP_LEN; - pkt_len += sizeof(Eth803Hdr_t) - LLC_SNAP_LEN; - } else { - *(t_u16 *) (data + (2 * MLAN_MAC_ADDR_LENGTH)) - = (t_u16) 0; - pkt_len += sizeof(Eth803Hdr_t); - } - daggr_mbuf = - wlan_alloc_mlan_buffer(pmadapter, pkt_len, 0, - MOAL_ALLOC_MLAN_BUFFER); - if (daggr_mbuf == MNULL) { - PRINTM(MERROR, "Error allocating daggr mlan_buffer\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - daggr_mbuf->bss_index = pmbuf->bss_index; - daggr_mbuf->buf_type = pmbuf->buf_type; - daggr_mbuf->data_len = pkt_len; - daggr_mbuf->in_ts_sec = pmbuf->in_ts_sec; - daggr_mbuf->in_ts_usec = pmbuf->in_ts_usec; - daggr_mbuf->pparent = pmbuf; - daggr_mbuf->priority = pmbuf->priority; - memcpy(pmadapter, daggr_mbuf->pbuf + daggr_mbuf->data_offset, data, - pkt_len); + t_u16 pkt_len; + int total_pkt_len; + t_u8 *data; + t_u32 max_rx_data_size = MLAN_RX_DATA_BUF_SIZE; + int pad; + mlan_status ret = MLAN_STATUS_FAILURE; + RxPacketHdr_t *prx_pkt; + mlan_buffer *daggr_mbuf = MNULL; + mlan_adapter *pmadapter = priv->adapter; + t_u8 rfc1042_eth_hdr[MLAN_MAC_ADDR_LENGTH] = { 0xaa, 0xaa, 0x03, + 0x00, 0x00, 0x00 + }; + t_u8 hdr_len = sizeof(Eth803Hdr_t); + + ENTER(); + + data = (t_u8 *) (pmbuf->pbuf + pmbuf->data_offset); + total_pkt_len = pmbuf->data_len; + + /* Sanity test */ + if (total_pkt_len > max_rx_data_size) { + PRINTM(MERROR, "Total packet length greater than tx buffer" + " size %d\n", total_pkt_len); + goto done; + } + + pmbuf->use_count = wlan_11n_get_num_aggrpkts(data, total_pkt_len); + + while (total_pkt_len >= hdr_len) { + prx_pkt = (RxPacketHdr_t *) data; + /* Length will be in network format, change it to host */ + pkt_len = mlan_ntohs((*(t_u16 *) (data + (2 * + MLAN_MAC_ADDR_LENGTH)))); + if (pkt_len > total_pkt_len) { + PRINTM(MERROR, + "Error in packet length: total_pkt_len = %d, pkt_len = %d\n", + total_pkt_len, pkt_len); + break; + } + + pad = (((pkt_len + sizeof(Eth803Hdr_t)) & 3)) ? + (4 - ((pkt_len + sizeof(Eth803Hdr_t)) & 3)) : 0; + + total_pkt_len -= pkt_len + pad + sizeof(Eth803Hdr_t); + + if (memcmp(pmadapter, &prx_pkt->rfc1042_hdr, + rfc1042_eth_hdr, sizeof(rfc1042_eth_hdr)) == 0) { + memmove(pmadapter, data + LLC_SNAP_LEN, data, (2 * + MLAN_MAC_ADDR_LENGTH)); + data += LLC_SNAP_LEN; + pkt_len += sizeof(Eth803Hdr_t) - LLC_SNAP_LEN; + } else { + *(t_u16 *) (data + (2 * MLAN_MAC_ADDR_LENGTH)) + = (t_u16) 0; + pkt_len += sizeof(Eth803Hdr_t); + } + daggr_mbuf = + wlan_alloc_mlan_buffer(pmadapter, pkt_len, 0, + MOAL_ALLOC_MLAN_BUFFER); + if (daggr_mbuf == MNULL) { + PRINTM(MERROR, "Error allocating daggr mlan_buffer\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + daggr_mbuf->bss_index = pmbuf->bss_index; + daggr_mbuf->buf_type = pmbuf->buf_type; + daggr_mbuf->data_len = pkt_len; + daggr_mbuf->in_ts_sec = pmbuf->in_ts_sec; + daggr_mbuf->in_ts_usec = pmbuf->in_ts_usec; + daggr_mbuf->pparent = pmbuf; + daggr_mbuf->priority = pmbuf->priority; + memcpy(pmadapter, daggr_mbuf->pbuf + daggr_mbuf->data_offset, + data, pkt_len); #ifdef UAP_SUPPORT - if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { - ret = wlan_uap_recv_packet(priv, daggr_mbuf); - } else { + if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { + ret = wlan_uap_recv_packet(priv, daggr_mbuf); + } else { #endif /* UAP_SUPPORT */ - ret = - pmadapter->callbacks.moal_recv_packet(pmadapter->pmoal_handle, - daggr_mbuf); + ret = pmadapter->callbacks.moal_recv_packet(pmadapter-> + pmoal_handle, + daggr_mbuf); #ifdef UAP_SUPPORT - } + } #endif /* UAP_SUPPORT */ - switch (ret) { - case MLAN_STATUS_PENDING: - break; - case MLAN_STATUS_FAILURE: - PRINTM(MERROR, "Deaggr, send to moal failed\n"); - daggr_mbuf->status_code = MLAN_ERROR_PKT_INVALID; - case MLAN_STATUS_SUCCESS: - wlan_recv_packet_complete(pmadapter, daggr_mbuf, ret); - break; - default: - break; - } - - data += pkt_len + pad; - } - - done: - LEAVE(); - return ret; + switch (ret) { + case MLAN_STATUS_PENDING: + break; + case MLAN_STATUS_FAILURE: + PRINTM(MERROR, "Deaggr, send to moal failed\n"); + daggr_mbuf->status_code = MLAN_ERROR_PKT_INVALID; + case MLAN_STATUS_SUCCESS: + wlan_recv_packet_complete(pmadapter, daggr_mbuf, ret); + break; + default: + break; + } + + data += pkt_len + pad; + } + +done: + LEAVE(); + return ret; } /** @@ -329,7 +332,7 @@ wlan_11n_deaggregate_pkt(mlan_private * priv, pmlan_buffer pmbuf) * @param priv A pointer to mlan_private structure * @param pra_list Pointer to the RA List table containing the pointers * to packets. - * @param headroom Any interface specific headroom that may be need. TxPD + * @param headroom Any interface specific headroom that may be need. TxPD * will be formed leaving this headroom. * @param ptrindex Pointer index * @@ -337,186 +340,205 @@ wlan_11n_deaggregate_pkt(mlan_private * priv, pmlan_buffer pmbuf) */ int wlan_11n_aggregate_pkt(mlan_private * priv, raListTbl * pra_list, - int headroom, int ptrindex) + int headroom, int ptrindex) { - int pkt_size = 0; - pmlan_adapter pmadapter = priv->adapter; - mlan_buffer *pmbuf_aggr, *pmbuf_src; - t_u8 *data; - int pad = 0; - mlan_status ret = MLAN_STATUS_SUCCESS; + int pkt_size = 0; + pmlan_adapter pmadapter = priv->adapter; + mlan_buffer *pmbuf_aggr, *pmbuf_src; + t_u8 *data; + int pad = 0; + mlan_status ret = MLAN_STATUS_SUCCESS; #ifdef DEBUG_LEVEL1 - t_u32 sec = 0, usec = 0; + t_u32 sec = 0, usec = 0; #endif - mlan_tx_param tx_param; + mlan_tx_param tx_param; #ifdef STA_SUPPORT - TxPD *ptx_pd = MNULL; + TxPD *ptx_pd = MNULL; #endif - t_u32 max_amsdu_size = MIN(pra_list->max_amsdu, pmadapter->tx_buf_size); - ENTER(); - - PRINTM(MDAT_D, "Handling Aggr packet\n"); - - if ((pmbuf_src = - (pmlan_buffer) util_peek_list(pmadapter->pmoal_handle, - &pra_list->buf_head, MNULL, MNULL))) { - - if (!(pmbuf_aggr = wlan_alloc_mlan_buffer(pmadapter, - pmadapter->tx_buf_size, 0, - MOAL_MALLOC_BUFFER))) { - PRINTM(MERROR, "Error allocating mlan_buffer\n"); - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - data = pmbuf_aggr->pbuf + headroom; - pmbuf_aggr->bss_index = pmbuf_src->bss_index; - pmbuf_aggr->buf_type = pmbuf_src->buf_type; - pmbuf_aggr->priority = pmbuf_src->priority; - pmbuf_aggr->pbuf = data; - pmbuf_aggr->data_offset = 0; - pmbuf_aggr->in_ts_sec = pmbuf_src->in_ts_sec; - pmbuf_aggr->in_ts_usec = pmbuf_src->in_ts_usec; - - /* Form AMSDU */ - wlan_11n_form_amsdu_txpd(priv, pmbuf_aggr); - pkt_size = sizeof(TxPD); + t_u32 max_amsdu_size = MIN(pra_list->max_amsdu, pmadapter->tx_buf_size); + ENTER(); + + PRINTM(MDAT_D, "Handling Aggr packet\n"); + + pmbuf_src = + (pmlan_buffer) util_peek_list(pmadapter->pmoal_handle, + &pra_list->buf_head, MNULL, + MNULL); + if (pmbuf_src) { + pmbuf_aggr = wlan_alloc_mlan_buffer(pmadapter, + pmadapter->tx_buf_size, 0, + MOAL_MALLOC_BUFFER); + if (!pmbuf_aggr) { + PRINTM(MERROR, "Error allocating mlan_buffer\n"); + pmadapter->callbacks.moal_spin_unlock(pmadapter-> + pmoal_handle, + priv->wmm. + ra_list_spinlock); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + data = pmbuf_aggr->pbuf + headroom; + pmbuf_aggr->bss_index = pmbuf_src->bss_index; + pmbuf_aggr->buf_type = pmbuf_src->buf_type; + pmbuf_aggr->priority = pmbuf_src->priority; + pmbuf_aggr->pbuf = data; + pmbuf_aggr->data_offset = 0; + pmbuf_aggr->in_ts_sec = pmbuf_src->in_ts_sec; + pmbuf_aggr->in_ts_usec = pmbuf_src->in_ts_usec; + + /* Form AMSDU */ + wlan_11n_form_amsdu_txpd(priv, pmbuf_aggr); + pkt_size = sizeof(TxPD); #ifdef STA_SUPPORT - if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) - ptx_pd = (TxPD *) pmbuf_aggr->pbuf; + if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) + ptx_pd = (TxPD *) pmbuf_aggr->pbuf; #endif - } else { - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - goto exit; - } - - while (pmbuf_src && ((pkt_size + (pmbuf_src->data_len + LLC_SNAP_LEN) - + headroom) <= max_amsdu_size)) { - - pmbuf_src = (pmlan_buffer) - util_dequeue_list(pmadapter->pmoal_handle, &pra_list->buf_head, - MNULL, MNULL); - - pra_list->total_pkts--; - - /* decrement for every PDU taken from the list */ - priv->wmm.pkts_queued[ptrindex]--; - util_scalar_decrement(pmadapter->pmoal_handle, - &priv->wmm.tx_pkts_queued, MNULL, MNULL); - - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - - pkt_size += wlan_11n_form_amsdu_pkt(pmadapter, - (data + pkt_size), - pmbuf_src->pbuf + - pmbuf_src->data_offset, - pmbuf_src->data_len, &pad); - - DBG_HEXDUMP(MDAT_D, "pmbuf_src", pmbuf_src, sizeof(mlan_buffer)); - wlan_write_data_complete(pmadapter, pmbuf_src, MLAN_STATUS_SUCCESS); - - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - - if (!wlan_is_ralist_valid(priv, pra_list, ptrindex)) { - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - pmbuf_src = - (pmlan_buffer) util_peek_list(pmadapter->pmoal_handle, - &pra_list->buf_head, MNULL, MNULL); - } - - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - - /* Last AMSDU packet does not need padding */ - pkt_size -= pad; - pmbuf_aggr->data_len = pkt_size; - wlan_11n_update_pktlen_amsdu_txpd(priv, pmbuf_aggr); - pmbuf_aggr->data_len += headroom; - pmbuf_aggr->pbuf = data - headroom; - tx_param.next_pkt_len = ((pmbuf_src) ? - pmbuf_src->data_len + sizeof(TxPD) : 0); - ret = wlan_sdio_host_to_card(pmadapter, MLAN_TYPE_DATA, - pmbuf_aggr, &tx_param); - switch (ret) { - case MLAN_STATUS_RESOURCE: - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - - if (!wlan_is_ralist_valid(priv, pra_list, ptrindex)) { - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - pmbuf_aggr->status_code = MLAN_ERROR_PKT_INVALID; - wlan_write_data_complete(pmadapter, pmbuf_aggr, - MLAN_STATUS_FAILURE); - LEAVE(); - return MLAN_STATUS_FAILURE; - } + } else { + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm. + ra_list_spinlock); + goto exit; + } + + while (pmbuf_src && ((pkt_size + (pmbuf_src->data_len + LLC_SNAP_LEN) + + headroom) <= max_amsdu_size)) { + + pmbuf_src = (pmlan_buffer) + util_dequeue_list(pmadapter->pmoal_handle, + &pra_list->buf_head, MNULL, MNULL); + + pra_list->total_pkts--; + + /* decrement for every PDU taken from the list */ + priv->wmm.pkts_queued[ptrindex]--; + util_scalar_decrement(pmadapter->pmoal_handle, + &priv->wmm.tx_pkts_queued, MNULL, MNULL); + + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm. + ra_list_spinlock); + + pkt_size += wlan_11n_form_amsdu_pkt(pmadapter, + (data + pkt_size), + pmbuf_src->pbuf + + pmbuf_src->data_offset, + pmbuf_src->data_len, &pad); + + DBG_HEXDUMP(MDAT_D, "pmbuf_src", pmbuf_src, + sizeof(mlan_buffer)); + wlan_write_data_complete(pmadapter, pmbuf_src, + MLAN_STATUS_SUCCESS); + + pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + + if (!wlan_is_ralist_valid(priv, pra_list, ptrindex)) { + pmadapter->callbacks.moal_spin_unlock(pmadapter-> + pmoal_handle, + priv->wmm. + ra_list_spinlock); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + pmbuf_src = + (pmlan_buffer) util_peek_list(pmadapter->pmoal_handle, + &pra_list->buf_head, + MNULL, MNULL); + } + + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + + /* Last AMSDU packet does not need padding */ + pkt_size -= pad; + pmbuf_aggr->data_len = pkt_size; + wlan_11n_update_pktlen_amsdu_txpd(priv, pmbuf_aggr); + pmbuf_aggr->data_len += headroom; + pmbuf_aggr->pbuf = data - headroom; + tx_param.next_pkt_len = ((pmbuf_src) ? + pmbuf_src->data_len + sizeof(TxPD) : 0); + ret = wlan_sdio_host_to_card(pmadapter, MLAN_TYPE_DATA, + pmbuf_aggr, &tx_param); + switch (ret) { + case MLAN_STATUS_RESOURCE: + pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + + if (!wlan_is_ralist_valid(priv, pra_list, ptrindex)) { + pmadapter->callbacks.moal_spin_unlock(pmadapter-> + pmoal_handle, + priv->wmm. + ra_list_spinlock); + pmbuf_aggr->status_code = MLAN_ERROR_PKT_INVALID; + wlan_write_data_complete(pmadapter, pmbuf_aggr, + MLAN_STATUS_FAILURE); + LEAVE(); + return MLAN_STATUS_FAILURE; + } #ifdef STA_SUPPORT - /* reset tx_lock_flag */ - if ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) && - pmadapter->pps_uapsd_mode && (pmadapter->tx_lock_flag == MTRUE)) { - pmadapter->tx_lock_flag = MFALSE; - ptx_pd->flags = 0; - } + /* reset tx_lock_flag */ + if ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) && + pmadapter->pps_uapsd_mode && + (pmadapter->tx_lock_flag == MTRUE)) { + pmadapter->tx_lock_flag = MFALSE; + ptx_pd->flags = 0; + } #endif - util_enqueue_list_head(pmadapter->pmoal_handle, &pra_list->buf_head, - (pmlan_linked_list) pmbuf_aggr, MNULL, MNULL); - - pra_list->total_pkts++; - - /* add back only one: aggregated packet is requeued as one */ - priv->wmm.pkts_queued[ptrindex]++; - util_scalar_increment(pmadapter->pmoal_handle, - &priv->wmm.tx_pkts_queued, MNULL, MNULL); - pmbuf_aggr->flags |= MLAN_BUF_FLAG_REQUEUED_PKT; - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - PRINTM(MINFO, "MLAN_STATUS_RESOURCE is returned\n"); - pmbuf_aggr->status_code = MLAN_ERROR_PKT_INVALID; - break; - case MLAN_STATUS_FAILURE: - pmadapter->data_sent = MFALSE; - PRINTM(MERROR, "Error: host_to_card failed: 0x%X\n", ret); - pmbuf_aggr->status_code = MLAN_ERROR_DATA_TX_FAIL; - pmadapter->dbg.num_tx_host_to_card_failure++; - wlan_write_data_complete(pmadapter, pmbuf_aggr, ret); - goto exit; - case MLAN_STATUS_PENDING: - pmadapter->data_sent = MFALSE; - break; - case MLAN_STATUS_SUCCESS: - wlan_write_data_complete(pmadapter, pmbuf_aggr, ret); - break; - default: - break; - } - if (ret != MLAN_STATUS_RESOURCE) { - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - if (wlan_is_ralist_valid(priv, pra_list, ptrindex)) { - priv->wmm.packets_out[ptrindex]++; - priv->wmm.tid_tbl_ptr[ptrindex].ra_list_curr = pra_list; - } - pmadapter->bssprio_tbl[priv->bss_priority].bssprio_cur = - pmadapter->bssprio_tbl[priv->bss_priority].bssprio_cur->pnext; - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - } - PRINTM_GET_SYS_TIME(MDATA, &sec, &usec); - PRINTM_NETINTF(MDATA, priv); - PRINTM(MDATA, "%lu.%06lu : Data => FW\n", sec, usec); - - exit: - LEAVE(); - return (pkt_size + headroom); + util_enqueue_list_head(pmadapter->pmoal_handle, + &pra_list->buf_head, + (pmlan_linked_list) pmbuf_aggr, MNULL, + MNULL); + + pra_list->total_pkts++; + + /* add back only one: aggregated packet is requeued as one */ + priv->wmm.pkts_queued[ptrindex]++; + util_scalar_increment(pmadapter->pmoal_handle, + &priv->wmm.tx_pkts_queued, MNULL, MNULL); + pmbuf_aggr->flags |= MLAN_BUF_FLAG_REQUEUED_PKT; + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm. + ra_list_spinlock); + PRINTM(MINFO, "MLAN_STATUS_RESOURCE is returned\n"); + pmbuf_aggr->status_code = MLAN_ERROR_PKT_INVALID; + break; + case MLAN_STATUS_FAILURE: + pmadapter->data_sent = MFALSE; + PRINTM(MERROR, "Error: host_to_card failed: 0x%X\n", ret); + pmbuf_aggr->status_code = MLAN_ERROR_DATA_TX_FAIL; + pmadapter->dbg.num_tx_host_to_card_failure++; + wlan_write_data_complete(pmadapter, pmbuf_aggr, ret); + goto exit; + case MLAN_STATUS_PENDING: + pmadapter->data_sent = MFALSE; + break; + case MLAN_STATUS_SUCCESS: + wlan_write_data_complete(pmadapter, pmbuf_aggr, ret); + break; + default: + break; + } + if (ret != MLAN_STATUS_RESOURCE) { + pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + if (wlan_is_ralist_valid(priv, pra_list, ptrindex)) { + priv->wmm.packets_out[ptrindex]++; + priv->wmm.tid_tbl_ptr[ptrindex].ra_list_curr = pra_list; + } + pmadapter->bssprio_tbl[priv->bss_priority].bssprio_cur = + pmadapter->bssprio_tbl[priv->bss_priority].bssprio_cur-> + pnext; + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm. + ra_list_spinlock); + } + PRINTM_GET_SYS_TIME(MDATA, &sec, &usec); + PRINTM_NETINTF(MDATA, priv); + PRINTM(MDATA, "%lu.%06lu : Data => FW\n", sec, usec); + +exit: + LEAVE(); + return (pkt_size + headroom); } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_11n_aggr.h b/drivers/net/wireless/sd8897/mlan/mlan_11n_aggr.h index ef8108a764c0..859ccef9d145 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_11n_aggr.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_11n_aggr.h @@ -32,6 +32,6 @@ Change log: mlan_status wlan_11n_deaggregate_pkt(pmlan_private priv, pmlan_buffer pmbuf); /** Deaggregate 11N packets */ int wlan_11n_aggregate_pkt(mlan_private * priv, raListTbl * ptr, - int headroom, int ptrindex); + int headroom, int ptrindex); #endif /* !_MLAN_11N_AGGR_H_ */ diff --git a/drivers/net/wireless/sd8897/mlan/mlan_11n_rxreorder.c b/drivers/net/wireless/sd8897/mlan/mlan_11n_rxreorder.c index 0db9b99a4d12..b65733671857 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_11n_rxreorder.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_11n_rxreorder.c @@ -2,20 +2,20 @@ * * @brief This file contains the handling of RxReordering in wlan * driver. - * - * Copyright (C) 2008-2011, Marvell International Ltd. - * - * This software file (the "File") is distributed by Marvell International - * Ltd. under the terms of the GNU General Public License Version 2, June 1991 - * (the "License"). You may use, redistribute and/or modify this File in - * accordance with the terms and conditions of the License, a copy of which + * + * Copyright (C) 2008-2011, Marvell International Ltd. + * + * This software file (the "File") is distributed by Marvell International + * Ltd. under the terms of the GNU General Public License Version 2, June 1991 + * (the "License"). You may use, redistribute and/or modify this File in + * accordance with the terms and conditions of the License, a copy of which * is available by writing to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. * - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about + * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE + * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE + * ARE EXPRESSLY DISCLAIMED. The License provides additional details about * this warranty disclaimer. */ @@ -45,9 +45,9 @@ Change log: Local Functions ********************************************************/ /** - * @brief This function will dispatch amsdu packet and + * @brief This function will dispatch amsdu packet and * forward it to kernel/upper layer - * + * * @param priv A pointer to mlan_private * @param pmbuf A pointer to the received buffer * @@ -56,25 +56,25 @@ Change log: static mlan_status wlan_11n_dispatch_amsdu_pkt(mlan_private * priv, pmlan_buffer pmbuf) { - RxPD *prx_pd; - prx_pd = (RxPD *) (pmbuf->pbuf + pmbuf->data_offset); - - ENTER(); - if (prx_pd->rx_pkt_type == PKT_TYPE_AMSDU) { - pmbuf->data_len = prx_pd->rx_pkt_length; - pmbuf->data_offset += prx_pd->rx_pkt_offset; - wlan_11n_deaggregate_pkt(priv, pmbuf); - LEAVE(); - return MLAN_STATUS_SUCCESS; - } - LEAVE(); - return MLAN_STATUS_FAILURE; + RxPD *prx_pd; + prx_pd = (RxPD *) (pmbuf->pbuf + pmbuf->data_offset); + + ENTER(); + if (prx_pd->rx_pkt_type == PKT_TYPE_AMSDU) { + pmbuf->data_len = prx_pd->rx_pkt_length; + pmbuf->data_offset += prx_pd->rx_pkt_offset; + wlan_11n_deaggregate_pkt(priv, pmbuf); + LEAVE(); + return MLAN_STATUS_SUCCESS; + } + LEAVE(); + return MLAN_STATUS_FAILURE; } /** - * @brief This function will process the rx packet and + * @brief This function will process the rx packet and * forward it to kernel/upper layer - * + * * @param priv A pointer to mlan_private * @param payload A pointer to rx packet payload * @@ -83,45 +83,45 @@ wlan_11n_dispatch_amsdu_pkt(mlan_private * priv, pmlan_buffer pmbuf) static mlan_status wlan_11n_dispatch_pkt(t_void * priv, t_void * payload) { - mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_status ret = MLAN_STATUS_SUCCESS; #ifdef STA_SUPPORT - pmlan_adapter pmadapter = ((pmlan_private) priv)->adapter; + pmlan_adapter pmadapter = ((pmlan_private) priv)->adapter; #endif - ENTER(); - if (payload == (t_void *) RX_PKT_DROPPED_IN_FW) { - LEAVE(); - return ret; - } + ENTER(); + if (payload == (t_void *) RX_PKT_DROPPED_IN_FW) { + LEAVE(); + return ret; + } #ifdef UAP_SUPPORT - if (GET_BSS_ROLE((mlan_private *) priv) == MLAN_BSS_ROLE_UAP) { - if (MLAN_STATUS_SUCCESS == - wlan_11n_dispatch_amsdu_pkt((mlan_private *) priv, - (pmlan_buffer) payload)) { - LEAVE(); - return ret; - } - ret = wlan_process_uap_rx_packet(priv, (pmlan_buffer) payload); - LEAVE(); - return ret; - } + if (GET_BSS_ROLE((mlan_private *) priv) == MLAN_BSS_ROLE_UAP) { + if (MLAN_STATUS_SUCCESS == + wlan_11n_dispatch_amsdu_pkt((mlan_private *) priv, + (pmlan_buffer) payload)) { + LEAVE(); + return ret; + } + ret = wlan_process_uap_rx_packet(priv, (pmlan_buffer) payload); + LEAVE(); + return ret; + } #endif /* UAP_SUPPORT */ #ifdef STA_SUPPORT - if (MLAN_STATUS_SUCCESS == - wlan_11n_dispatch_amsdu_pkt((mlan_private *) priv, - (pmlan_buffer) payload)) { - LEAVE(); - return ret; - } - ret = wlan_process_rx_packet(pmadapter, (pmlan_buffer) payload); + if (MLAN_STATUS_SUCCESS == + wlan_11n_dispatch_amsdu_pkt((mlan_private *) priv, + (pmlan_buffer) payload)) { + LEAVE(); + return ret; + } + ret = wlan_process_rx_packet(pmadapter, (pmlan_buffer) payload); #endif /* STA_SUPPORT */ - LEAVE(); - return ret; + LEAVE(); + return ret; } /** * @brief This function restarts the reordering timeout timer - * + * * @param pmadapter A pointer to mlan_adapter * @param rx_reor_tbl_ptr A pointer to structure RxReorderTbl * @@ -129,28 +129,28 @@ wlan_11n_dispatch_pkt(t_void * priv, t_void * payload) */ static void mlan_11n_rxreorder_timer_restart(pmlan_adapter pmadapter, - RxReorderTbl * rx_reor_tbl_ptr) + RxReorderTbl * rx_reor_tbl_ptr) { - ENTER(); - if (rx_reor_tbl_ptr->timer_context.timer_is_set) - pmadapter->callbacks.moal_stop_timer(pmadapter->pmoal_handle, - rx_reor_tbl_ptr->timer_context. - timer); - - pmadapter->callbacks.moal_start_timer(pmadapter->pmoal_handle, - rx_reor_tbl_ptr->timer_context.timer, - MFALSE, - (rx_reor_tbl_ptr->win_size - * MIN_FLUSH_TIMER_MS)); - - rx_reor_tbl_ptr->timer_context.timer_is_set = MTRUE; - LEAVE(); + ENTER(); + if (rx_reor_tbl_ptr->timer_context.timer_is_set) + pmadapter->callbacks.moal_stop_timer(pmadapter->pmoal_handle, + rx_reor_tbl_ptr-> + timer_context.timer); + + pmadapter->callbacks.moal_start_timer(pmadapter->pmoal_handle, + rx_reor_tbl_ptr->timer_context. + timer, MFALSE, + (rx_reor_tbl_ptr->win_size * + MIN_FLUSH_TIMER_MS)); + + rx_reor_tbl_ptr->timer_context.timer_is_set = MTRUE; + LEAVE(); } /** * @brief This function dispatches all the packets in the buffer. * There could be holes in the buffer. - * + * * @param priv A pointer to mlan_private * @param rx_reor_tbl_ptr A pointer to structure RxReorderTbl * @param start_win Start window @@ -159,59 +159,62 @@ mlan_11n_rxreorder_timer_restart(pmlan_adapter pmadapter, */ static mlan_status wlan_11n_dispatch_pkt_until_start_win(t_void * priv, - RxReorderTbl * rx_reor_tbl_ptr, - int start_win) + RxReorderTbl * rx_reor_tbl_ptr, + int start_win) { - int no_pkt_to_send, i, xchg; - mlan_status ret = MLAN_STATUS_SUCCESS; - void *rx_tmp_ptr = MNULL; - mlan_private *pmpriv = (mlan_private *) priv; - - ENTER(); - - no_pkt_to_send = (start_win > rx_reor_tbl_ptr->start_win) ? - MIN((start_win - rx_reor_tbl_ptr->start_win), - rx_reor_tbl_ptr->win_size) : rx_reor_tbl_ptr->win_size; - - for (i = 0; i < no_pkt_to_send; ++i) { - pmpriv->adapter->callbacks.moal_spin_lock(pmpriv->adapter->pmoal_handle, - pmpriv->rx_pkt_lock); - rx_tmp_ptr = MNULL; - if (rx_reor_tbl_ptr->rx_reorder_ptr[i]) { - rx_tmp_ptr = rx_reor_tbl_ptr->rx_reorder_ptr[i]; - rx_reor_tbl_ptr->rx_reorder_ptr[i] = MNULL; - } - pmpriv->adapter->callbacks.moal_spin_unlock(pmpriv->adapter-> - pmoal_handle, - pmpriv->rx_pkt_lock); - if (rx_tmp_ptr) - wlan_11n_dispatch_pkt(priv, rx_tmp_ptr); - } - - pmpriv->adapter->callbacks.moal_spin_lock(pmpriv->adapter->pmoal_handle, - pmpriv->rx_pkt_lock); - /* - * We don't have a circular buffer, hence use rotation to simulate - * circular buffer - */ - xchg = rx_reor_tbl_ptr->win_size - no_pkt_to_send; - for (i = 0; i < xchg; ++i) { - rx_reor_tbl_ptr->rx_reorder_ptr[i] = - rx_reor_tbl_ptr->rx_reorder_ptr[no_pkt_to_send + i]; - rx_reor_tbl_ptr->rx_reorder_ptr[no_pkt_to_send + i] = MNULL; - } - - rx_reor_tbl_ptr->start_win = start_win; - pmpriv->adapter->callbacks.moal_spin_unlock(pmpriv->adapter->pmoal_handle, - pmpriv->rx_pkt_lock); - - LEAVE(); - return ret; + int no_pkt_to_send, i, xchg; + mlan_status ret = MLAN_STATUS_SUCCESS; + void *rx_tmp_ptr = MNULL; + mlan_private *pmpriv = (mlan_private *) priv; + + ENTER(); + + no_pkt_to_send = (start_win > rx_reor_tbl_ptr->start_win) ? + MIN((start_win - rx_reor_tbl_ptr->start_win), + rx_reor_tbl_ptr->win_size) : rx_reor_tbl_ptr->win_size; + + for (i = 0; i < no_pkt_to_send; ++i) { + pmpriv->adapter->callbacks.moal_spin_lock(pmpriv->adapter-> + pmoal_handle, + pmpriv->rx_pkt_lock); + rx_tmp_ptr = MNULL; + if (rx_reor_tbl_ptr->rx_reorder_ptr[i]) { + rx_tmp_ptr = rx_reor_tbl_ptr->rx_reorder_ptr[i]; + rx_reor_tbl_ptr->rx_reorder_ptr[i] = MNULL; + } + pmpriv->adapter->callbacks.moal_spin_unlock(pmpriv->adapter-> + pmoal_handle, + pmpriv-> + rx_pkt_lock); + if (rx_tmp_ptr) + wlan_11n_dispatch_pkt(priv, rx_tmp_ptr); + } + + pmpriv->adapter->callbacks.moal_spin_lock(pmpriv->adapter->pmoal_handle, + pmpriv->rx_pkt_lock); + /* + * We don't have a circular buffer, hence use rotation to simulate + * circular buffer + */ + xchg = rx_reor_tbl_ptr->win_size - no_pkt_to_send; + for (i = 0; i < xchg; ++i) { + rx_reor_tbl_ptr->rx_reorder_ptr[i] = + rx_reor_tbl_ptr->rx_reorder_ptr[no_pkt_to_send + i]; + rx_reor_tbl_ptr->rx_reorder_ptr[no_pkt_to_send + i] = MNULL; + } + + rx_reor_tbl_ptr->start_win = start_win; + pmpriv->adapter->callbacks.moal_spin_unlock(pmpriv->adapter-> + pmoal_handle, + pmpriv->rx_pkt_lock); + + LEAVE(); + return ret; } /** * @brief This function will display the rxReorder table - * + * * @param pmadapter A pointer to mlan_adapter structure * @param rx_reor_tbl_ptr A pointer to structure RxReorderTbl * @@ -219,19 +222,19 @@ wlan_11n_dispatch_pkt_until_start_win(t_void * priv, */ static t_void wlan_11n_display_tbl_ptr(pmlan_adapter pmadapter, - RxReorderTbl * rx_reor_tbl_ptr) + RxReorderTbl * rx_reor_tbl_ptr) { - ENTER(); + ENTER(); - DBG_HEXDUMP(MDAT_D, "Reorder ptr", rx_reor_tbl_ptr->rx_reorder_ptr, - sizeof(t_void *) * rx_reor_tbl_ptr->win_size); + DBG_HEXDUMP(MDAT_D, "Reorder ptr", rx_reor_tbl_ptr->rx_reorder_ptr, + sizeof(t_void *) * rx_reor_tbl_ptr->win_size); - LEAVE(); + LEAVE(); } /** - * @brief This function will dispatch all packets sequentially - * from start_win until a hole is found and adjust the + * @brief This function will dispatch all packets sequentially + * from start_win until a hole is found and adjust the * start_win appropriately * * @param priv A pointer to mlan_private @@ -242,56 +245,61 @@ wlan_11n_display_tbl_ptr(pmlan_adapter pmadapter, static mlan_status wlan_11n_scan_and_dispatch(t_void * priv, RxReorderTbl * rx_reor_tbl_ptr) { - int i, j, xchg; - mlan_status ret = MLAN_STATUS_SUCCESS; - void *rx_tmp_ptr = MNULL; - mlan_private *pmpriv = (mlan_private *) priv; - - ENTER(); - - for (i = 0; i < rx_reor_tbl_ptr->win_size; ++i) { - pmpriv->adapter->callbacks.moal_spin_lock(pmpriv->adapter->pmoal_handle, - pmpriv->rx_pkt_lock); - if (!rx_reor_tbl_ptr->rx_reorder_ptr[i]) { - pmpriv->adapter->callbacks.moal_spin_unlock(pmpriv->adapter-> - pmoal_handle, - pmpriv->rx_pkt_lock); - break; - } - rx_tmp_ptr = rx_reor_tbl_ptr->rx_reorder_ptr[i]; - rx_reor_tbl_ptr->rx_reorder_ptr[i] = MNULL; - pmpriv->adapter->callbacks.moal_spin_unlock(pmpriv->adapter-> - pmoal_handle, - pmpriv->rx_pkt_lock); - wlan_11n_dispatch_pkt(priv, rx_tmp_ptr); - } - - pmpriv->adapter->callbacks.moal_spin_lock(pmpriv->adapter->pmoal_handle, - pmpriv->rx_pkt_lock); - /* - * We don't have a circular buffer, hence use rotation to simulate - * circular buffer - */ - if (i > 0) { - xchg = rx_reor_tbl_ptr->win_size - i; - for (j = 0; j < xchg; ++j) { - rx_reor_tbl_ptr->rx_reorder_ptr[j] = - rx_reor_tbl_ptr->rx_reorder_ptr[i + j]; - rx_reor_tbl_ptr->rx_reorder_ptr[i + j] = MNULL; - } - } - - rx_reor_tbl_ptr->start_win = (rx_reor_tbl_ptr->start_win + i) - & (MAX_TID_VALUE - 1); - - pmpriv->adapter->callbacks.moal_spin_unlock(pmpriv->adapter->pmoal_handle, - pmpriv->rx_pkt_lock); - LEAVE(); - return ret; + int i, j, xchg; + mlan_status ret = MLAN_STATUS_SUCCESS; + void *rx_tmp_ptr = MNULL; + mlan_private *pmpriv = (mlan_private *) priv; + + ENTER(); + + for (i = 0; i < rx_reor_tbl_ptr->win_size; ++i) { + pmpriv->adapter->callbacks.moal_spin_lock(pmpriv->adapter-> + pmoal_handle, + pmpriv->rx_pkt_lock); + if (!rx_reor_tbl_ptr->rx_reorder_ptr[i]) { + pmpriv->adapter->callbacks.moal_spin_unlock(pmpriv-> + adapter-> + pmoal_handle, + pmpriv-> + rx_pkt_lock); + break; + } + rx_tmp_ptr = rx_reor_tbl_ptr->rx_reorder_ptr[i]; + rx_reor_tbl_ptr->rx_reorder_ptr[i] = MNULL; + pmpriv->adapter->callbacks.moal_spin_unlock(pmpriv->adapter-> + pmoal_handle, + pmpriv-> + rx_pkt_lock); + wlan_11n_dispatch_pkt(priv, rx_tmp_ptr); + } + + pmpriv->adapter->callbacks.moal_spin_lock(pmpriv->adapter->pmoal_handle, + pmpriv->rx_pkt_lock); + /* + * We don't have a circular buffer, hence use rotation to simulate + * circular buffer + */ + if (i > 0) { + xchg = rx_reor_tbl_ptr->win_size - i; + for (j = 0; j < xchg; ++j) { + rx_reor_tbl_ptr->rx_reorder_ptr[j] = + rx_reor_tbl_ptr->rx_reorder_ptr[i + j]; + rx_reor_tbl_ptr->rx_reorder_ptr[i + j] = MNULL; + } + } + + rx_reor_tbl_ptr->start_win = (rx_reor_tbl_ptr->start_win + i) + & (MAX_TID_VALUE - 1); + + pmpriv->adapter->callbacks.moal_spin_unlock(pmpriv->adapter-> + pmoal_handle, + pmpriv->rx_pkt_lock); + LEAVE(); + return ret; } /** - * @brief This function delete rxreorder table's entry + * @brief This function delete rxreorder table's entry * and free the memory * * @param priv A pointer to mlan_private @@ -301,49 +309,52 @@ wlan_11n_scan_and_dispatch(t_void * priv, RxReorderTbl * rx_reor_tbl_ptr) */ static t_void wlan_11n_delete_rxreorder_tbl_entry(mlan_private * priv, - RxReorderTbl * rx_reor_tbl_ptr) + RxReorderTbl * rx_reor_tbl_ptr) { - pmlan_adapter pmadapter = priv->adapter; - - ENTER(); - - if (!rx_reor_tbl_ptr) { - LEAVE(); - return; - } - - wlan_11n_dispatch_pkt_until_start_win(priv, rx_reor_tbl_ptr, - (rx_reor_tbl_ptr->start_win + - rx_reor_tbl_ptr->win_size) - & (MAX_TID_VALUE - 1)); - - if (rx_reor_tbl_ptr->timer_context.timer) { - if (rx_reor_tbl_ptr->timer_context.timer_is_set) - priv->adapter->callbacks.moal_stop_timer(pmadapter->pmoal_handle, - rx_reor_tbl_ptr->timer_context. - timer); - priv->adapter->callbacks.moal_free_timer(pmadapter->pmoal_handle, - rx_reor_tbl_ptr->timer_context. - timer); - } - - PRINTM(MDAT_D, "Delete rx_reor_tbl_ptr: %p\n", rx_reor_tbl_ptr); - util_unlink_list(pmadapter->pmoal_handle, - &priv->rx_reorder_tbl_ptr, - (pmlan_linked_list) rx_reor_tbl_ptr, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock); - - pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, - (t_u8 *) rx_reor_tbl_ptr->rx_reorder_ptr); - pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, - (t_u8 *) rx_reor_tbl_ptr); - - LEAVE(); + pmlan_adapter pmadapter = priv->adapter; + + ENTER(); + + if (!rx_reor_tbl_ptr) { + LEAVE(); + return; + } + + wlan_11n_dispatch_pkt_until_start_win(priv, rx_reor_tbl_ptr, + (rx_reor_tbl_ptr->start_win + + rx_reor_tbl_ptr->win_size) + & (MAX_TID_VALUE - 1)); + + if (rx_reor_tbl_ptr->timer_context.timer) { + if (rx_reor_tbl_ptr->timer_context.timer_is_set) + priv->adapter->callbacks.moal_stop_timer(pmadapter-> + pmoal_handle, + rx_reor_tbl_ptr->timer_context. + timer); + priv->adapter->callbacks.moal_free_timer(pmadapter-> + pmoal_handle, + rx_reor_tbl_ptr->timer_context. + timer); + } + + PRINTM(MDAT_D, "Delete rx_reor_tbl_ptr: %p\n", rx_reor_tbl_ptr); + util_unlink_list(pmadapter->pmoal_handle, + &priv->rx_reorder_tbl_ptr, + (pmlan_linked_list) rx_reor_tbl_ptr, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); + + pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) rx_reor_tbl_ptr-> + rx_reorder_ptr); + pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) rx_reor_tbl_ptr); + + LEAVE(); } /** - * @brief This function returns the last used sequence number + * @brief This function returns the last used sequence number * * @param rx_reorder_tbl_ptr A pointer to structure RxReorderTbl * @@ -352,17 +363,17 @@ wlan_11n_delete_rxreorder_tbl_entry(mlan_private * priv, static int wlan_11n_find_last_seqnum(RxReorderTbl * rx_reorder_tbl_ptr) { - int i; - - ENTER(); - for (i = (rx_reorder_tbl_ptr->win_size - 1); i >= 0; --i) { - if (rx_reorder_tbl_ptr->rx_reorder_ptr[i]) { - LEAVE(); - return i; - } - } - LEAVE(); - return -1; + int i; + + ENTER(); + for (i = (rx_reorder_tbl_ptr->win_size - 1); i >= 0; --i) { + if (rx_reorder_tbl_ptr->rx_reorder_ptr[i]) { + LEAVE(); + return i; + } + } + LEAVE(); + return -1; } /** @@ -375,30 +386,33 @@ wlan_11n_find_last_seqnum(RxReorderTbl * rx_reorder_tbl_ptr) static t_void wlan_flush_data(t_void * context) { - reorder_tmr_cnxt_t *reorder_cnxt = (reorder_tmr_cnxt_t *) context; - int startWin; - - ENTER(); - reorder_cnxt->timer_is_set = MFALSE; - wlan_11n_display_tbl_ptr(reorder_cnxt->priv->adapter, reorder_cnxt->ptr); - - if ((startWin = wlan_11n_find_last_seqnum(reorder_cnxt->ptr)) >= 0) { - PRINTM(MINFO, "Flush data %d\n", startWin); - wlan_11n_dispatch_pkt_until_start_win(reorder_cnxt->priv, - reorder_cnxt->ptr, - ((reorder_cnxt->ptr->start_win + - startWin + 1) & (MAX_TID_VALUE - - 1))); - } - - wlan_11n_display_tbl_ptr(reorder_cnxt->priv->adapter, reorder_cnxt->ptr); - LEAVE(); + reorder_tmr_cnxt_t *reorder_cnxt = (reorder_tmr_cnxt_t *) context; + int startWin; + + ENTER(); + reorder_cnxt->timer_is_set = MFALSE; + wlan_11n_display_tbl_ptr(reorder_cnxt->priv->adapter, + reorder_cnxt->ptr); + + if ((startWin = wlan_11n_find_last_seqnum(reorder_cnxt->ptr)) >= 0) { + PRINTM(MINFO, "Flush data %d\n", startWin); + wlan_11n_dispatch_pkt_until_start_win(reorder_cnxt->priv, + reorder_cnxt->ptr, + ((reorder_cnxt->ptr-> + start_win + startWin + + 1) & (MAX_TID_VALUE - + 1))); + } + + wlan_11n_display_tbl_ptr(reorder_cnxt->priv->adapter, + reorder_cnxt->ptr); + LEAVE(); } /** - * @brief This function will create a entry in rx reordering table for the + * @brief This function will create a entry in rx reordering table for the * given ta/tid and will initialize it with seq_num, win_size - * + * * @param priv A pointer to mlan_private * @param ta ta to find in reordering table * @param tid tid to find in reordering table @@ -409,87 +423,93 @@ wlan_flush_data(t_void * context) */ static t_void wlan_11n_create_rxreorder_tbl(mlan_private * priv, t_u8 * ta, int tid, - int win_size, int seq_num) + int win_size, int seq_num) { - int i; - pmlan_adapter pmadapter = priv->adapter; - RxReorderTbl *rx_reor_tbl_ptr, *new_node; - sta_node *sta_ptr = MNULL; - t_u16 last_seq = 0; - - ENTER(); - - /* - * If we get a TID, ta pair which is already present dispatch all the - * the packets and move the window size until the ssn - */ - if ((rx_reor_tbl_ptr = wlan_11n_get_rxreorder_tbl(priv, tid, ta))) { - wlan_11n_dispatch_pkt_until_start_win(priv, rx_reor_tbl_ptr, seq_num); - } else { - PRINTM(MDAT_D, "%s: seq_num %d, tid %d, ta " MACSTR - ", win_size %d\n", __FUNCTION__, - seq_num, tid, MAC2STR(ta), win_size); - if (pmadapter->callbacks. - moal_malloc(pmadapter->pmoal_handle, sizeof(RxReorderTbl), - MLAN_MEM_DEF, (t_u8 **) & new_node)) { - PRINTM(MERROR, "Rx reorder memory allocation failed\n"); - LEAVE(); - return; - } - - util_init_list((pmlan_linked_list) new_node); - new_node->tid = tid; - memcpy(pmadapter, new_node->ta, ta, MLAN_MAC_ADDR_LENGTH); - new_node->start_win = seq_num; - if (queuing_ra_based(priv)) { - // TODO for adhoc - if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { - if ((sta_ptr = wlan_get_station_entry(priv, ta))) - last_seq = sta_ptr->rx_seq[tid]; - } - PRINTM(MINFO, "UAP/ADHOC:last_seq=%d start_win=%d\n", last_seq, - new_node->start_win); - } else { - last_seq = priv->rx_seq[tid]; - } - new_node->last_seq = last_seq; - new_node->win_size = win_size; - new_node->force_no_drop = MFALSE; - new_node->check_start_win = MTRUE; - - if (pmadapter->callbacks. - moal_malloc(pmadapter->pmoal_handle, sizeof(t_void *) * win_size, - MLAN_MEM_DEF, (t_u8 **) & new_node->rx_reorder_ptr)) { - PRINTM(MERROR, "Rx reorder table memory allocation" "failed\n"); - pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, - (t_u8 *) new_node); - LEAVE(); - return; - } - - PRINTM(MDAT_D, "Create ReorderPtr: %p start_win=%d last_seq=%d\n", - new_node, new_node->start_win, last_seq); - new_node->timer_context.ptr = new_node; - new_node->timer_context.priv = priv; - new_node->timer_context.timer_is_set = MFALSE; - new_node->ba_status = BA_STREAM_SETUP_INPROGRESS; - - pmadapter->callbacks.moal_init_timer(pmadapter->pmoal_handle, - &new_node->timer_context.timer, - wlan_flush_data, - &new_node->timer_context); - - for (i = 0; i < win_size; ++i) - new_node->rx_reorder_ptr[i] = MNULL; - - util_enqueue_list_tail(pmadapter->pmoal_handle, - &priv->rx_reorder_tbl_ptr, - (pmlan_linked_list) new_node, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock); - } - - LEAVE(); + int i; + pmlan_adapter pmadapter = priv->adapter; + RxReorderTbl *rx_reor_tbl_ptr, *new_node; + sta_node *sta_ptr = MNULL; + t_u16 last_seq = 0; + + ENTER(); + + /* + * If we get a TID, ta pair which is already present dispatch all the + * the packets and move the window size until the ssn + */ + if ((rx_reor_tbl_ptr = wlan_11n_get_rxreorder_tbl(priv, tid, ta))) { + wlan_11n_dispatch_pkt_until_start_win(priv, + rx_reor_tbl_ptr, seq_num); + } else { + PRINTM(MDAT_D, "%s: seq_num %d, tid %d, ta " MACSTR + ", win_size %d\n", __FUNCTION__, + seq_num, tid, MAC2STR(ta), win_size); + if (pmadapter->callbacks. + moal_malloc(pmadapter->pmoal_handle, sizeof(RxReorderTbl), + MLAN_MEM_DEF, (t_u8 **) & new_node)) { + PRINTM(MERROR, "Rx reorder memory allocation failed\n"); + LEAVE(); + return; + } + + util_init_list((pmlan_linked_list) new_node); + new_node->tid = tid; + memcpy(pmadapter, new_node->ta, ta, MLAN_MAC_ADDR_LENGTH); + new_node->start_win = seq_num; + if (queuing_ra_based(priv)) { + // TODO for adhoc + if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { + if ((sta_ptr = + wlan_get_station_entry(priv, ta))) + last_seq = sta_ptr->rx_seq[tid]; + } + PRINTM(MINFO, "UAP/ADHOC:last_seq=%d start_win=%d\n", + last_seq, new_node->start_win); + } else { + last_seq = priv->rx_seq[tid]; + } + new_node->last_seq = last_seq; + new_node->win_size = win_size; + new_node->force_no_drop = MFALSE; + new_node->check_start_win = MTRUE; + + if (pmadapter->callbacks. + moal_malloc(pmadapter->pmoal_handle, + sizeof(t_void *) * win_size, MLAN_MEM_DEF, + (t_u8 **) & new_node->rx_reorder_ptr)) { + PRINTM(MERROR, + "Rx reorder table memory allocation" "failed\n"); + pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) new_node); + LEAVE(); + return; + } + + PRINTM(MDAT_D, + "Create ReorderPtr: %p start_win=%d last_seq=%d\n", + new_node, new_node->start_win, last_seq); + new_node->timer_context.ptr = new_node; + new_node->timer_context.priv = priv; + new_node->timer_context.timer_is_set = MFALSE; + new_node->ba_status = BA_STREAM_SETUP_INPROGRESS; + + pmadapter->callbacks.moal_init_timer(pmadapter->pmoal_handle, + &new_node-> + timer_context.timer, + wlan_flush_data, + &new_node->timer_context); + + for (i = 0; i < win_size; ++i) + new_node->rx_reorder_ptr[i] = MNULL; + + util_enqueue_list_tail(pmadapter->pmoal_handle, + &priv->rx_reorder_tbl_ptr, + (pmlan_linked_list) new_node, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); + } + + LEAVE(); } /******************************************************** @@ -497,9 +517,9 @@ wlan_11n_create_rxreorder_tbl(mlan_private * priv, t_u8 * ta, int tid, ********************************************************/ /** - * @brief This function will return the pointer to a entry in rx reordering + * @brief This function will return the pointer to a entry in rx reordering * table which matches the give TA/TID pair - * + * * @param priv A pointer to mlan_private * @param ta ta to find in reordering table * @param tid tid to find in reordering table @@ -509,41 +529,41 @@ wlan_11n_create_rxreorder_tbl(mlan_private * priv, t_u8 * ta, int tid, RxReorderTbl * wlan_11n_get_rxreorder_tbl(mlan_private * priv, int tid, t_u8 * ta) { - RxReorderTbl *rx_reor_tbl_ptr; - - ENTER(); - - if (! - (rx_reor_tbl_ptr = - (RxReorderTbl *) util_peek_list(priv->adapter->pmoal_handle, - &priv->rx_reorder_tbl_ptr, - priv->adapter->callbacks. - moal_spin_lock, - priv->adapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return MNULL; - } - - while (rx_reor_tbl_ptr != (RxReorderTbl *) & priv->rx_reorder_tbl_ptr) { - if ((!memcmp - (priv->adapter, rx_reor_tbl_ptr->ta, ta, MLAN_MAC_ADDR_LENGTH)) && - (rx_reor_tbl_ptr->tid == tid)) { - LEAVE(); - return rx_reor_tbl_ptr; - } - - rx_reor_tbl_ptr = rx_reor_tbl_ptr->pnext; - } - - LEAVE(); - return MNULL; + RxReorderTbl *rx_reor_tbl_ptr; + + ENTER(); + + if (! + (rx_reor_tbl_ptr = + (RxReorderTbl *) util_peek_list(priv->adapter->pmoal_handle, + &priv->rx_reorder_tbl_ptr, + priv->adapter->callbacks. + moal_spin_lock, + priv->adapter->callbacks. + moal_spin_unlock))) { + LEAVE(); + return MNULL; + } + + while (rx_reor_tbl_ptr != (RxReorderTbl *) & priv->rx_reorder_tbl_ptr) { + if ((!memcmp + (priv->adapter, rx_reor_tbl_ptr->ta, ta, + MLAN_MAC_ADDR_LENGTH)) && (rx_reor_tbl_ptr->tid == tid)) { + LEAVE(); + return rx_reor_tbl_ptr; + } + + rx_reor_tbl_ptr = rx_reor_tbl_ptr->pnext; + } + + LEAVE(); + return MNULL; } -/** +/** * @brief This function prepares command for adding a block ack * request. - * + * * @param priv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param pdata_buf A pointer to data buffer @@ -552,31 +572,33 @@ wlan_11n_get_rxreorder_tbl(mlan_private * priv, int tid, t_u8 * ta) */ mlan_status wlan_cmd_11n_addba_req(mlan_private * priv, - HostCmd_DS_COMMAND * cmd, t_void * pdata_buf) + HostCmd_DS_COMMAND * cmd, t_void * pdata_buf) { - HostCmd_DS_11N_ADDBA_REQ *padd_ba_req = (HostCmd_DS_11N_ADDBA_REQ *) - & cmd->params.add_ba_req; - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_11N_ADDBA_REQ); - cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_11N_ADDBA_REQ) + S_DS_GEN); - - memcpy(priv->adapter, padd_ba_req, pdata_buf, - sizeof(HostCmd_DS_11N_ADDBA_REQ)); - padd_ba_req->block_ack_param_set = - wlan_cpu_to_le16(padd_ba_req->block_ack_param_set); - padd_ba_req->block_ack_tmo = wlan_cpu_to_le16(padd_ba_req->block_ack_tmo); - padd_ba_req->ssn = wlan_cpu_to_le16(padd_ba_req->ssn); - padd_ba_req->add_req_result = 0; - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_11N_ADDBA_REQ *padd_ba_req = (HostCmd_DS_11N_ADDBA_REQ *) + & cmd->params.add_ba_req; + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_11N_ADDBA_REQ); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_11N_ADDBA_REQ) + + S_DS_GEN); + + memcpy(priv->adapter, padd_ba_req, pdata_buf, + sizeof(HostCmd_DS_11N_ADDBA_REQ)); + padd_ba_req->block_ack_param_set = + wlan_cpu_to_le16(padd_ba_req->block_ack_param_set); + padd_ba_req->block_ack_tmo = + wlan_cpu_to_le16(padd_ba_req->block_ack_tmo); + padd_ba_req->ssn = wlan_cpu_to_le16(padd_ba_req->ssn); + padd_ba_req->add_req_result = 0; + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command for adding a block ack * response. - * + * * @param priv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param pdata_buf A pointer to data buffer @@ -585,78 +607,87 @@ wlan_cmd_11n_addba_req(mlan_private * priv, */ mlan_status wlan_cmd_11n_addba_rspgen(mlan_private * priv, - HostCmd_DS_COMMAND * cmd, void *pdata_buf) + HostCmd_DS_COMMAND * cmd, void *pdata_buf) { - HostCmd_DS_11N_ADDBA_RSP *padd_ba_rsp = (HostCmd_DS_11N_ADDBA_RSP *) - & cmd->params.add_ba_rsp; - HostCmd_DS_11N_ADDBA_REQ *pevt_addba_req = - (HostCmd_DS_11N_ADDBA_REQ *) pdata_buf; - t_u8 tid = 0; - int win_size = 0; - - ENTER(); - - pevt_addba_req->block_ack_param_set = - wlan_le16_to_cpu(pevt_addba_req->block_ack_param_set); - pevt_addba_req->block_ack_tmo = - wlan_le16_to_cpu(pevt_addba_req->block_ack_tmo); - pevt_addba_req->ssn = wlan_le16_to_cpu(pevt_addba_req->ssn); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_11N_ADDBA_RSP); - cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_11N_ADDBA_RSP) + S_DS_GEN); - - memcpy(priv->adapter, padd_ba_rsp->peer_mac_addr, - pevt_addba_req->peer_mac_addr, MLAN_MAC_ADDR_LENGTH); - padd_ba_rsp->dialog_token = pevt_addba_req->dialog_token; - padd_ba_rsp->block_ack_tmo = - wlan_cpu_to_le16(pevt_addba_req->block_ack_tmo); - padd_ba_rsp->ssn = wlan_cpu_to_le16(pevt_addba_req->ssn); - padd_ba_rsp->add_rsp_result = 0; - - padd_ba_rsp->block_ack_param_set = pevt_addba_req->block_ack_param_set; - tid = (padd_ba_rsp->block_ack_param_set & BLOCKACKPARAM_TID_MASK) - >> BLOCKACKPARAM_TID_POS; - if (priv->addba_reject[tid] - || (priv->port_ctrl_mode == MTRUE && priv->port_open == MFALSE) + HostCmd_DS_11N_ADDBA_RSP *padd_ba_rsp = (HostCmd_DS_11N_ADDBA_RSP *) + & cmd->params.add_ba_rsp; + HostCmd_DS_11N_ADDBA_REQ *pevt_addba_req = + (HostCmd_DS_11N_ADDBA_REQ *) pdata_buf; + t_u8 tid = 0; + int win_size = 0; + + ENTER(); + + pevt_addba_req->block_ack_param_set = + wlan_le16_to_cpu(pevt_addba_req->block_ack_param_set); + pevt_addba_req->block_ack_tmo = + wlan_le16_to_cpu(pevt_addba_req->block_ack_tmo); + pevt_addba_req->ssn = wlan_le16_to_cpu(pevt_addba_req->ssn); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_11N_ADDBA_RSP); + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_11N_ADDBA_RSP) + S_DS_GEN); + + memcpy(priv->adapter, padd_ba_rsp->peer_mac_addr, + pevt_addba_req->peer_mac_addr, MLAN_MAC_ADDR_LENGTH); + padd_ba_rsp->dialog_token = pevt_addba_req->dialog_token; + padd_ba_rsp->block_ack_tmo = + wlan_cpu_to_le16(pevt_addba_req->block_ack_tmo); + padd_ba_rsp->ssn = wlan_cpu_to_le16(pevt_addba_req->ssn); + padd_ba_rsp->add_rsp_result = 0; + + padd_ba_rsp->block_ack_param_set = pevt_addba_req->block_ack_param_set; + tid = (padd_ba_rsp->block_ack_param_set & BLOCKACKPARAM_TID_MASK) + >> BLOCKACKPARAM_TID_POS; + if (priv->addba_reject[tid] + || (priv->port_ctrl_mode == MTRUE && priv->port_open == MFALSE) #ifdef STA_SUPPORT - || ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) - && priv->wps.session_enable) + || ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) + && priv->wps.session_enable) #endif #ifdef UAP_SUPPORT - || ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) - && (priv->adapter->pending_bridge_pkts > RX_LOW_THRESHOLD)) + || ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) + && (priv->adapter->pending_bridge_pkts > RX_LOW_THRESHOLD)) #endif - ) - padd_ba_rsp->status_code = wlan_cpu_to_le16(ADDBA_RSP_STATUS_DECLINED); - else - padd_ba_rsp->status_code = wlan_cpu_to_le16(ADDBA_RSP_STATUS_ACCEPT); - padd_ba_rsp->block_ack_param_set &= ~BLOCKACKPARAM_WINSIZE_MASK; - if (!priv->add_ba_param.rx_amsdu || - (priv->aggr_prio_tbl[tid].amsdu == BA_STREAM_NOT_ALLOWED)) - /* We do not support AMSDU inside AMPDU, hence reset the bit */ - padd_ba_rsp->block_ack_param_set &= ~BLOCKACKPARAM_AMSDU_SUPP_MASK; - - padd_ba_rsp->block_ack_param_set |= (priv->add_ba_param.rx_win_size << - BLOCKACKPARAM_WINSIZE_POS); - win_size = (padd_ba_rsp->block_ack_param_set & BLOCKACKPARAM_WINSIZE_MASK) - >> BLOCKACKPARAM_WINSIZE_POS; - if (win_size == 0) - padd_ba_rsp->status_code = wlan_cpu_to_le16(ADDBA_RSP_STATUS_DECLINED); - - padd_ba_rsp->block_ack_param_set = - wlan_cpu_to_le16(padd_ba_rsp->block_ack_param_set); - - if (padd_ba_rsp->status_code == wlan_cpu_to_le16(ADDBA_RSP_STATUS_ACCEPT)) - wlan_11n_create_rxreorder_tbl(priv, pevt_addba_req->peer_mac_addr, tid, - win_size, pevt_addba_req->ssn); - LEAVE(); - return MLAN_STATUS_SUCCESS; + ) + padd_ba_rsp->status_code = + wlan_cpu_to_le16(ADDBA_RSP_STATUS_DECLINED); + else + padd_ba_rsp->status_code = + wlan_cpu_to_le16(ADDBA_RSP_STATUS_ACCEPT); + padd_ba_rsp->block_ack_param_set &= ~BLOCKACKPARAM_WINSIZE_MASK; + if (!priv->add_ba_param.rx_amsdu || + (priv->aggr_prio_tbl[tid].amsdu == BA_STREAM_NOT_ALLOWED)) + /* We do not support AMSDU inside AMPDU, hence reset the bit */ + padd_ba_rsp->block_ack_param_set &= + ~BLOCKACKPARAM_AMSDU_SUPP_MASK; + + padd_ba_rsp->block_ack_param_set |= (priv->add_ba_param.rx_win_size << + BLOCKACKPARAM_WINSIZE_POS); + win_size = + (padd_ba_rsp->block_ack_param_set & BLOCKACKPARAM_WINSIZE_MASK) + >> BLOCKACKPARAM_WINSIZE_POS; + if (win_size == 0) + padd_ba_rsp->status_code = + wlan_cpu_to_le16(ADDBA_RSP_STATUS_DECLINED); + + padd_ba_rsp->block_ack_param_set = + wlan_cpu_to_le16(padd_ba_rsp->block_ack_param_set); + + if (padd_ba_rsp->status_code == + wlan_cpu_to_le16(ADDBA_RSP_STATUS_ACCEPT)) + wlan_11n_create_rxreorder_tbl(priv, + pevt_addba_req->peer_mac_addr, + tid, win_size, + pevt_addba_req->ssn); + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command for deleting a block ack * request. - * + * * @param priv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param pdata_buf A pointer to data buffer @@ -665,29 +696,29 @@ wlan_cmd_11n_addba_rspgen(mlan_private * priv, */ mlan_status wlan_cmd_11n_delba(mlan_private * priv, - HostCmd_DS_COMMAND * cmd, void *pdata_buf) + HostCmd_DS_COMMAND * cmd, void *pdata_buf) { - HostCmd_DS_11N_DELBA *pdel_ba = (HostCmd_DS_11N_DELBA *) - & cmd->params.del_ba; + HostCmd_DS_11N_DELBA *pdel_ba = (HostCmd_DS_11N_DELBA *) + & cmd->params.del_ba; - ENTER(); + ENTER(); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_11N_DELBA); - cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_11N_DELBA) + S_DS_GEN); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_11N_DELBA); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_11N_DELBA) + S_DS_GEN); - memcpy(priv->adapter, pdel_ba, pdata_buf, sizeof(HostCmd_DS_11N_DELBA)); - pdel_ba->del_ba_param_set = wlan_cpu_to_le16(pdel_ba->del_ba_param_set); - pdel_ba->reason_code = wlan_cpu_to_le16(pdel_ba->reason_code); - pdel_ba->del_result = 0; + memcpy(priv->adapter, pdel_ba, pdata_buf, sizeof(HostCmd_DS_11N_DELBA)); + pdel_ba->del_ba_param_set = wlan_cpu_to_le16(pdel_ba->del_ba_param_set); + pdel_ba->reason_code = wlan_cpu_to_le16(pdel_ba->reason_code); + pdel_ba->del_result = 0; - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** * @brief This function will identify if RxReodering is needed for the packet * and will do the reordering if required before sending it to kernel - * + * * @param priv A pointer to mlan_private * @param seq_num Seqence number of the current packet * @param tid Tid of the current packet @@ -699,224 +730,265 @@ wlan_cmd_11n_delba(mlan_private * priv, */ mlan_status mlan_11n_rxreorder_pkt(void *priv, t_u16 seq_num, t_u16 tid, - t_u8 * ta, t_u8 pkt_type, void *payload) + t_u8 * ta, t_u8 pkt_type, void *payload) { - RxReorderTbl *rx_reor_tbl_ptr; - int prev_start_win, start_win, end_win, win_size; - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_adapter pmadapter = ((mlan_private *) priv)->adapter; - - ENTER(); - - if (! - (rx_reor_tbl_ptr = - wlan_11n_get_rxreorder_tbl((mlan_private *) priv, tid, ta))) { - if (pkt_type != PKT_TYPE_BAR) - wlan_11n_dispatch_pkt(priv, payload); - - LEAVE(); - return ret; - - } else { - if ((pkt_type == PKT_TYPE_AMSDU) && !rx_reor_tbl_ptr->amsdu) { - wlan_11n_dispatch_pkt(priv, payload); - LEAVE(); - return ret; - } - if (pkt_type == PKT_TYPE_BAR) - PRINTM(MDAT_D, "BAR "); - if (pkt_type == PKT_TYPE_AMSDU) - PRINTM(MDAT_D, "AMSDU "); - - if (rx_reor_tbl_ptr->check_start_win) { - rx_reor_tbl_ptr->check_start_win = MFALSE; - if ((seq_num != rx_reor_tbl_ptr->start_win) && - (rx_reor_tbl_ptr->last_seq != DEFAULT_SEQ_NUM)) { - end_win = - (rx_reor_tbl_ptr->start_win + rx_reor_tbl_ptr->win_size - - 1) & (MAX_TID_VALUE - 1); - if (((end_win > rx_reor_tbl_ptr->start_win) - && (rx_reor_tbl_ptr->last_seq >= - rx_reor_tbl_ptr->start_win) - && (rx_reor_tbl_ptr->last_seq < end_win)) || - ((end_win < rx_reor_tbl_ptr->start_win) && - ((rx_reor_tbl_ptr->last_seq >= rx_reor_tbl_ptr->start_win) - || (rx_reor_tbl_ptr->last_seq < end_win)))) { - PRINTM(MDAT_D, - "Update start_win: last_seq=%d, start_win=%d seq_num=%d\n", - rx_reor_tbl_ptr->last_seq, - rx_reor_tbl_ptr->start_win, seq_num); - rx_reor_tbl_ptr->start_win = rx_reor_tbl_ptr->last_seq + 1; - } else if ((seq_num < rx_reor_tbl_ptr->start_win) && - (seq_num > rx_reor_tbl_ptr->last_seq)) { - PRINTM(MDAT_D, - "Update start_win: last_seq=%d, start_win=%d seq_num=%d\n", - rx_reor_tbl_ptr->last_seq, - rx_reor_tbl_ptr->start_win, seq_num); - rx_reor_tbl_ptr->start_win = rx_reor_tbl_ptr->last_seq + 1; - } - } - } - - prev_start_win = start_win = rx_reor_tbl_ptr->start_win; - win_size = rx_reor_tbl_ptr->win_size; - end_win = ((start_win + win_size) - 1) & (MAX_TID_VALUE - 1); - - PRINTM(MDAT_D, "TID %d, TA " MACSTR "\n", tid, MAC2STR(ta)); - PRINTM(MDAT_D, - "1:seq_num %d start_win %d win_size %d end_win %d\n", - seq_num, start_win, win_size, end_win); - /* - * If seq_num is less then starting win then ignore and drop - * the packet - */ - if (rx_reor_tbl_ptr->force_no_drop) { - PRINTM(MDAT_D, "Force no drop packet after HS_ACTIVED\n"); - rx_reor_tbl_ptr->force_no_drop = MFALSE; - } else { - if ((start_win + TWOPOW11) > (MAX_TID_VALUE - 1)) { /* Wrap */ - if (seq_num >= ((start_win + (TWOPOW11)) & - (MAX_TID_VALUE - 1)) && (seq_num < start_win)) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - } else if ((seq_num < start_win) || - (seq_num > (start_win + (TWOPOW11)))) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - } - - /* - * If this packet is a BAR we adjust seq_num as - * WinStart = seq_num - */ - if (pkt_type == PKT_TYPE_BAR) - seq_num = ((seq_num + win_size) - 1) & (MAX_TID_VALUE - 1); - - PRINTM(MDAT_D, - "2:seq_num %d start_win %d win_size %d end_win %d\n", - seq_num, start_win, win_size, end_win); - - if (((end_win < start_win) && - (seq_num < start_win) && (seq_num > end_win)) - || ((end_win > start_win) && - ((seq_num > end_win) || (seq_num < start_win)))) { - - end_win = seq_num; - if (((seq_num - win_size) + 1) >= 0) - start_win = (end_win - win_size) + 1; - else - start_win = (MAX_TID_VALUE - (win_size - seq_num)) + 1; - - if ((ret = wlan_11n_dispatch_pkt_until_start_win(priv, - rx_reor_tbl_ptr, - start_win))) { - goto done; - } - } - - PRINTM(MDAT_D, "3:seq_num %d start_win %d win_size %d" - " end_win %d\n", seq_num, start_win, win_size, end_win); - if (pkt_type != PKT_TYPE_BAR) { - if (seq_num >= start_win) { - if (rx_reor_tbl_ptr->rx_reorder_ptr[seq_num - start_win]) { - PRINTM(MDAT_D, "Drop Duplicate Pkt\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - rx_reor_tbl_ptr->rx_reorder_ptr[seq_num - start_win] = payload; - } else { /* Wrap condition */ - if (rx_reor_tbl_ptr->rx_reorder_ptr[(seq_num - + (MAX_TID_VALUE)) - - start_win]) { - PRINTM(MDAT_D, "Drop Duplicate Pkt\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - rx_reor_tbl_ptr->rx_reorder_ptr[(seq_num - + (MAX_TID_VALUE)) - - start_win] = payload; - } - } - - wlan_11n_display_tbl_ptr(pmadapter, rx_reor_tbl_ptr); - - /* - * Dispatch all packets sequentially from start_win until a - * hole is found and adjust the start_win appropriately - */ - ret = wlan_11n_scan_and_dispatch(priv, rx_reor_tbl_ptr); - - wlan_11n_display_tbl_ptr(pmadapter, rx_reor_tbl_ptr); - } - - done: - if (!rx_reor_tbl_ptr->timer_context.timer_is_set || - (prev_start_win != rx_reor_tbl_ptr->start_win)) { - - mlan_11n_rxreorder_timer_restart(pmadapter, rx_reor_tbl_ptr); - } - - LEAVE(); - return ret; + RxReorderTbl *rx_reor_tbl_ptr; + int prev_start_win, start_win, end_win, win_size; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_adapter pmadapter = ((mlan_private *) priv)->adapter; + + ENTER(); + + if (! + (rx_reor_tbl_ptr = + wlan_11n_get_rxreorder_tbl((mlan_private *) priv, tid, ta))) { + if (pkt_type != PKT_TYPE_BAR) + wlan_11n_dispatch_pkt(priv, payload); + + LEAVE(); + return ret; + + } else { + if ((pkt_type == PKT_TYPE_AMSDU) && !rx_reor_tbl_ptr->amsdu) { + wlan_11n_dispatch_pkt(priv, payload); + LEAVE(); + return ret; + } + if (pkt_type == PKT_TYPE_BAR) + PRINTM(MDAT_D, "BAR "); + if (pkt_type == PKT_TYPE_AMSDU) + PRINTM(MDAT_D, "AMSDU "); + + if (rx_reor_tbl_ptr->check_start_win) { + rx_reor_tbl_ptr->check_start_win = MFALSE; + if ((seq_num != rx_reor_tbl_ptr->start_win) && + (rx_reor_tbl_ptr->last_seq != DEFAULT_SEQ_NUM)) { + end_win = + (rx_reor_tbl_ptr->start_win + + rx_reor_tbl_ptr->win_size - + 1) & (MAX_TID_VALUE - 1); + if (((end_win > rx_reor_tbl_ptr->start_win) + && (rx_reor_tbl_ptr->last_seq >= + rx_reor_tbl_ptr->start_win) + && (rx_reor_tbl_ptr->last_seq < end_win)) + || ((end_win < rx_reor_tbl_ptr->start_win) + && + ((rx_reor_tbl_ptr->last_seq >= + rx_reor_tbl_ptr->start_win) || + (rx_reor_tbl_ptr->last_seq < + end_win)))) { + PRINTM(MDAT_D, + "Update start_win: last_seq=%d, start_win=%d seq_num=%d\n", + rx_reor_tbl_ptr->last_seq, + rx_reor_tbl_ptr->start_win, + seq_num); + rx_reor_tbl_ptr->start_win = + rx_reor_tbl_ptr->last_seq + 1; + } else if ((seq_num < + rx_reor_tbl_ptr->start_win) && + (seq_num > + rx_reor_tbl_ptr->last_seq)) { + PRINTM(MDAT_D, + "Update start_win: last_seq=%d, start_win=%d seq_num=%d\n", + rx_reor_tbl_ptr->last_seq, + rx_reor_tbl_ptr->start_win, + seq_num); + rx_reor_tbl_ptr->start_win = + rx_reor_tbl_ptr->last_seq + 1; + } + } + } + if (rx_reor_tbl_ptr->force_no_drop) { + wlan_11n_dispatch_pkt_until_start_win(priv, + rx_reor_tbl_ptr, + (rx_reor_tbl_ptr-> + start_win + + rx_reor_tbl_ptr-> + win_size) + & (MAX_TID_VALUE - + 1)); + if (pkt_type != PKT_TYPE_BAR) + rx_reor_tbl_ptr->start_win = seq_num; + mlan_11n_rxreorder_timer_restart(pmadapter, + rx_reor_tbl_ptr); + } + + prev_start_win = start_win = rx_reor_tbl_ptr->start_win; + win_size = rx_reor_tbl_ptr->win_size; + end_win = ((start_win + win_size) - 1) & (MAX_TID_VALUE - 1); + + PRINTM(MDAT_D, "TID %d, TA " MACSTR "\n", tid, MAC2STR(ta)); + PRINTM(MDAT_D, + "1:seq_num %d start_win %d win_size %d end_win %d\n", + seq_num, start_win, win_size, end_win); + /* + * If seq_num is less then starting win then ignore and drop + * the packet + */ + if (rx_reor_tbl_ptr->force_no_drop || pkt_type == PKT_TYPE_BAR) { + PRINTM(MDAT_D, "No drop packet\n"); + rx_reor_tbl_ptr->force_no_drop = MFALSE; + } else { + if ((start_win + TWOPOW11) > (MAX_TID_VALUE - 1)) { /* Wrap + */ + if (seq_num >= ((start_win + (TWOPOW11)) & + (MAX_TID_VALUE - 1)) && + (seq_num < start_win)) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + } else if ((seq_num < start_win) || + (seq_num > (start_win + (TWOPOW11)))) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + } + + /* + * If this packet is a BAR we adjust seq_num as + * WinStart = seq_num + */ + if (pkt_type == PKT_TYPE_BAR) + seq_num = + ((seq_num + win_size) - 1) & (MAX_TID_VALUE - + 1); + + PRINTM(MDAT_D, + "2:seq_num %d start_win %d win_size %d end_win %d\n", + seq_num, start_win, win_size, end_win); + + if (((end_win < start_win) && + (seq_num < start_win) && (seq_num > end_win)) + || ((end_win > start_win) && + ((seq_num > end_win) || (seq_num < start_win)))) { + + end_win = seq_num; + if (((seq_num - win_size) + 1) >= 0) + start_win = (end_win - win_size) + 1; + else + start_win = (MAX_TID_VALUE - + (win_size - seq_num)) + 1; + + if ((ret = wlan_11n_dispatch_pkt_until_start_win(priv, + rx_reor_tbl_ptr, + start_win))) + { + goto done; + } + } + + PRINTM(MDAT_D, "3:seq_num %d start_win %d win_size %d" + " end_win %d\n", seq_num, start_win, win_size, end_win); + if (pkt_type != PKT_TYPE_BAR) { + if (seq_num >= start_win) { + if (rx_reor_tbl_ptr->rx_reorder_ptr[seq_num + - + start_win]) + { + PRINTM(MDAT_D, "Drop Duplicate Pkt\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + rx_reor_tbl_ptr->rx_reorder_ptr[seq_num + - start_win] = + payload; + } else { /* Wrap condition */ + if (rx_reor_tbl_ptr->rx_reorder_ptr[(seq_num + + + (MAX_TID_VALUE)) + - + start_win]) + { + PRINTM(MDAT_D, "Drop Duplicate Pkt\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + rx_reor_tbl_ptr->rx_reorder_ptr[(seq_num + + + (MAX_TID_VALUE)) + - start_win] = + payload; + } + } + + wlan_11n_display_tbl_ptr(pmadapter, rx_reor_tbl_ptr); + + /* + * Dispatch all packets sequentially from start_win until a + * hole is found and adjust the start_win appropriately + */ + ret = wlan_11n_scan_and_dispatch(priv, rx_reor_tbl_ptr); + + wlan_11n_display_tbl_ptr(pmadapter, rx_reor_tbl_ptr); + } + +done: + if (!rx_reor_tbl_ptr->timer_context.timer_is_set || + (prev_start_win != rx_reor_tbl_ptr->start_win)) { + + mlan_11n_rxreorder_timer_restart(pmadapter, rx_reor_tbl_ptr); + } + + LEAVE(); + return ret; } /** * @brief This function will delete an entry for a given tid/ta pair. tid/ta * are taken from delba_event body - * + * * @param priv A pointer to mlan_private * @param tid tid to send delba * @param peer_mac MAC address to send delba - * @param type TYPE_DELBA_SENT or TYPE_DELBA_RECEIVE + * @param type TYPE_DELBA_SENT or TYPE_DELBA_RECEIVE * @param initiator MTRUE if we are initiator of ADDBA, MFALSE otherwise * * @return N/A */ void mlan_11n_delete_bastream_tbl(mlan_private * priv, int tid, - t_u8 * peer_mac, t_u8 type, int initiator) + t_u8 * peer_mac, t_u8 type, int initiator) { - RxReorderTbl *rx_reor_tbl_ptr; - TxBAStreamTbl *ptxtbl; - t_u8 cleanup_rx_reorder_tbl; - - ENTER(); - - if (type == TYPE_DELBA_RECEIVE) - cleanup_rx_reorder_tbl = (initiator) ? MTRUE : MFALSE; - else - cleanup_rx_reorder_tbl = (initiator) ? MFALSE : MTRUE; - - PRINTM(MEVENT, "DELBA: " MACSTR " tid=%d," - "initiator=%d\n", MAC2STR(peer_mac), tid, initiator); - - if (cleanup_rx_reorder_tbl) { - if (!(rx_reor_tbl_ptr = wlan_11n_get_rxreorder_tbl(priv, tid, - peer_mac))) { - PRINTM(MWARN, "TID, TA not found in table!\n"); - LEAVE(); - return; - } - wlan_11n_delete_rxreorder_tbl_entry(priv, rx_reor_tbl_ptr); - } else { - if (!(ptxtbl = wlan_11n_get_txbastream_tbl(priv, tid, peer_mac))) { - PRINTM(MWARN, "TID, RA not found in table!\n"); - LEAVE(); - return; - } - - wlan_11n_delete_txbastream_tbl_entry(priv, ptxtbl); - } - - LEAVE(); + RxReorderTbl *rx_reor_tbl_ptr; + TxBAStreamTbl *ptxtbl; + t_u8 cleanup_rx_reorder_tbl; + + ENTER(); + + if (type == TYPE_DELBA_RECEIVE) + cleanup_rx_reorder_tbl = (initiator) ? MTRUE : MFALSE; + else + cleanup_rx_reorder_tbl = (initiator) ? MFALSE : MTRUE; + + PRINTM(MEVENT, "DELBA: " MACSTR " tid=%d," + "initiator=%d\n", MAC2STR(peer_mac), tid, initiator); + + if (cleanup_rx_reorder_tbl) { + if (!(rx_reor_tbl_ptr = wlan_11n_get_rxreorder_tbl(priv, tid, + peer_mac))) { + PRINTM(MWARN, "TID, TA not found in table!\n"); + LEAVE(); + return; + } + wlan_11n_delete_rxreorder_tbl_entry(priv, rx_reor_tbl_ptr); + } else { + if (!(ptxtbl = wlan_11n_get_txbastream_tbl(priv, tid, + peer_mac))) { + PRINTM(MWARN, "TID, RA not found in table!\n"); + LEAVE(); + return; + } + + wlan_11n_delete_txbastream_tbl_entry(priv, ptxtbl); + } + + LEAVE(); } -/** +/** * @brief This function handles the command response of * a block ack response - * + * * @param priv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @@ -925,60 +997,69 @@ mlan_11n_delete_bastream_tbl(mlan_private * priv, int tid, mlan_status wlan_ret_11n_addba_resp(mlan_private * priv, HostCmd_DS_COMMAND * resp) { - HostCmd_DS_11N_ADDBA_RSP *padd_ba_rsp = (HostCmd_DS_11N_ADDBA_RSP *) - & resp->params.add_ba_rsp; - int tid; - RxReorderTbl *rx_reor_tbl_ptr = MNULL; - - ENTER(); - - padd_ba_rsp->status_code = wlan_le16_to_cpu(padd_ba_rsp->status_code); - padd_ba_rsp->block_ack_param_set = - wlan_le16_to_cpu(padd_ba_rsp->block_ack_param_set); - padd_ba_rsp->block_ack_tmo = wlan_le16_to_cpu(padd_ba_rsp->block_ack_tmo); - padd_ba_rsp->ssn = wlan_le16_to_cpu(padd_ba_rsp->ssn); - - tid = (padd_ba_rsp->block_ack_param_set & BLOCKACKPARAM_TID_MASK) - >> BLOCKACKPARAM_TID_POS; - /* Check if we had rejected the ADDBA, if yes then do not create the stream */ - if (padd_ba_rsp->status_code == BA_RESULT_SUCCESS) { - PRINTM(MCMND, - "ADDBA RSP: " MACSTR " tid=%d ssn=%d win_size=%d,amsdu=%d\n", - MAC2STR(padd_ba_rsp->peer_mac_addr), tid, padd_ba_rsp->ssn, - ((padd_ba_rsp->block_ack_param_set & BLOCKACKPARAM_WINSIZE_MASK) - >> BLOCKACKPARAM_WINSIZE_POS), - padd_ba_rsp-> - block_ack_param_set & BLOCKACKPARAM_AMSDU_SUPP_MASK); - - if ((rx_reor_tbl_ptr = - wlan_11n_get_rxreorder_tbl(priv, tid, - padd_ba_rsp->peer_mac_addr))) { - rx_reor_tbl_ptr->ba_status = BA_STREAM_SETUP_COMPLETE; - if ((padd_ba_rsp-> - block_ack_param_set & BLOCKACKPARAM_AMSDU_SUPP_MASK) && - priv->add_ba_param.rx_amsdu && - (priv->aggr_prio_tbl[tid].amsdu != BA_STREAM_NOT_ALLOWED)) - rx_reor_tbl_ptr->amsdu = MTRUE; - else - rx_reor_tbl_ptr->amsdu = MFALSE; - } - } else { - PRINTM(MERROR, "ADDBA RSP: Failed(" MACSTR " tid=%d)\n", - MAC2STR(padd_ba_rsp->peer_mac_addr), tid); - if ((rx_reor_tbl_ptr = wlan_11n_get_rxreorder_tbl(priv, tid, - padd_ba_rsp-> - peer_mac_addr))) { - wlan_11n_delete_rxreorder_tbl_entry(priv, rx_reor_tbl_ptr); - } - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_11N_ADDBA_RSP *padd_ba_rsp = (HostCmd_DS_11N_ADDBA_RSP *) + & resp->params.add_ba_rsp; + int tid; + RxReorderTbl *rx_reor_tbl_ptr = MNULL; + + ENTER(); + + padd_ba_rsp->status_code = wlan_le16_to_cpu(padd_ba_rsp->status_code); + padd_ba_rsp->block_ack_param_set = + wlan_le16_to_cpu(padd_ba_rsp->block_ack_param_set); + padd_ba_rsp->block_ack_tmo = + wlan_le16_to_cpu(padd_ba_rsp->block_ack_tmo); + padd_ba_rsp->ssn = wlan_le16_to_cpu(padd_ba_rsp->ssn); + + tid = (padd_ba_rsp->block_ack_param_set & BLOCKACKPARAM_TID_MASK) + >> BLOCKACKPARAM_TID_POS; + /* Check if we had rejected the ADDBA, if yes then do not create the + stream */ + if (padd_ba_rsp->status_code == BA_RESULT_SUCCESS) { + PRINTM(MCMND, + "ADDBA RSP: " MACSTR + " tid=%d ssn=%d win_size=%d,amsdu=%d\n", + MAC2STR(padd_ba_rsp->peer_mac_addr), tid, + padd_ba_rsp->ssn, + ((padd_ba_rsp-> + block_ack_param_set & BLOCKACKPARAM_WINSIZE_MASK) + >> BLOCKACKPARAM_WINSIZE_POS), + padd_ba_rsp-> + block_ack_param_set & BLOCKACKPARAM_AMSDU_SUPP_MASK); + + if ((rx_reor_tbl_ptr = + wlan_11n_get_rxreorder_tbl(priv, tid, + padd_ba_rsp->peer_mac_addr))) { + rx_reor_tbl_ptr->ba_status = BA_STREAM_SETUP_COMPLETE; + if ((padd_ba_rsp-> + block_ack_param_set & + BLOCKACKPARAM_AMSDU_SUPP_MASK) && + priv->add_ba_param.rx_amsdu && + (priv->aggr_prio_tbl[tid].amsdu != + BA_STREAM_NOT_ALLOWED)) + rx_reor_tbl_ptr->amsdu = MTRUE; + else + rx_reor_tbl_ptr->amsdu = MFALSE; + } + } else { + PRINTM(MERROR, "ADDBA RSP: Failed(" MACSTR " tid=%d)\n", + MAC2STR(padd_ba_rsp->peer_mac_addr), tid); + if ((rx_reor_tbl_ptr = wlan_11n_get_rxreorder_tbl(priv, tid, + padd_ba_rsp-> + peer_mac_addr))) + { + wlan_11n_delete_rxreorder_tbl_entry(priv, + rx_reor_tbl_ptr); + } + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** * @brief This function handles ba_stream_timeout event - * + * * @param priv A pointer to mlan_private * @param event A pointer to structure HostCmd_DS_11N_BATIMEOUT * @@ -986,30 +1067,31 @@ wlan_ret_11n_addba_resp(mlan_private * priv, HostCmd_DS_COMMAND * resp) */ void wlan_11n_ba_stream_timeout(mlan_private * priv, - HostCmd_DS_11N_BATIMEOUT * event) + HostCmd_DS_11N_BATIMEOUT * event) { - HostCmd_DS_11N_DELBA delba; + HostCmd_DS_11N_DELBA delba; - ENTER(); + ENTER(); - DBG_HEXDUMP(MCMD_D, "Event:", (t_u8 *) event, 20); + DBG_HEXDUMP(MCMD_D, "Event:", (t_u8 *) event, 20); - memset(priv->adapter, &delba, 0, sizeof(HostCmd_DS_11N_DELBA)); - memcpy(priv->adapter, delba.peer_mac_addr, event->peer_mac_addr, - MLAN_MAC_ADDR_LENGTH); + memset(priv->adapter, &delba, 0, sizeof(HostCmd_DS_11N_DELBA)); + memcpy(priv->adapter, delba.peer_mac_addr, event->peer_mac_addr, + MLAN_MAC_ADDR_LENGTH); - delba.del_ba_param_set |= (t_u16) event->tid << DELBA_TID_POS; - delba.del_ba_param_set |= (t_u16) event->origninator << DELBA_INITIATOR_POS; - delba.reason_code = REASON_CODE_STA_TIMEOUT; - wlan_prepare_cmd(priv, HostCmd_CMD_11N_DELBA, 0, 0, MNULL, &delba); + delba.del_ba_param_set |= (t_u16) event->tid << DELBA_TID_POS; + delba.del_ba_param_set |= + (t_u16) event->origninator << DELBA_INITIATOR_POS; + delba.reason_code = REASON_CODE_STA_TIMEOUT; + wlan_prepare_cmd(priv, HostCmd_CMD_11N_DELBA, 0, 0, MNULL, &delba); - LEAVE(); - return; + LEAVE(); + return; } /** * @brief This function cleans up reorder tbl - * + * * @param priv A pointer to mlan_private * * @return N/A @@ -1017,117 +1099,133 @@ wlan_11n_ba_stream_timeout(mlan_private * priv, void wlan_11n_cleanup_reorder_tbl(mlan_private * priv) { - RxReorderTbl *del_tbl_ptr; + RxReorderTbl *del_tbl_ptr; - ENTER(); + ENTER(); - while ((del_tbl_ptr = (RxReorderTbl *) - util_peek_list(priv->adapter->pmoal_handle, - &priv->rx_reorder_tbl_ptr, - priv->adapter->callbacks.moal_spin_lock, - priv->adapter->callbacks.moal_spin_unlock))) { - wlan_11n_delete_rxreorder_tbl_entry(priv, del_tbl_ptr); - } + while ((del_tbl_ptr = (RxReorderTbl *) + util_peek_list(priv->adapter->pmoal_handle, + &priv->rx_reorder_tbl_ptr, + priv->adapter->callbacks.moal_spin_lock, + priv->adapter->callbacks.moal_spin_unlock))) { + wlan_11n_delete_rxreorder_tbl_entry(priv, del_tbl_ptr); + } - util_init_list((pmlan_linked_list) & priv->rx_reorder_tbl_ptr); + util_init_list((pmlan_linked_list) & priv->rx_reorder_tbl_ptr); - memset(priv->adapter, priv->rx_seq, 0xff, sizeof(priv->rx_seq)); - LEAVE(); + memset(priv->adapter, priv->rx_seq, 0xff, sizeof(priv->rx_seq)); + LEAVE(); } /** - * @brief This function handle the rxba_sync event - * + * @brief This function handle the rxba_sync event + * * @param priv A pointer to mlan_private - * @param event_buf A pointer to event buf + * @param event_buf A pointer to event buf * @param len event_buf length * @return N/A */ void wlan_11n_rxba_sync_event(mlan_private * priv, t_u8 * event_buf, t_u16 len) { - MrvlIEtypes_RxBaSync_t *tlv_rxba = (MrvlIEtypes_RxBaSync_t *) event_buf; - t_u16 tlv_type, tlv_len; - RxReorderTbl *rx_reor_tbl_ptr = MNULL; - t_u8 i, j; - t_u16 seq_num = 0; - int tlv_buf_left = len; - ENTER(); - DBG_HEXDUMP(MEVT_D, "RXBA_SYNC_EVT", event_buf, len); - while (tlv_buf_left >= sizeof(MrvlIEtypes_RxBaSync_t)) { - tlv_type = wlan_le16_to_cpu(tlv_rxba->header.type); - tlv_len = wlan_le16_to_cpu(tlv_rxba->header.len); - if (tlv_type != TLV_TYPE_RXBA_SYNC) { - PRINTM(MERROR, "Wrong TLV id=0x%x\n", tlv_type); - goto done; - } - tlv_rxba->seq_num = wlan_le16_to_cpu(tlv_rxba->seq_num); - tlv_rxba->bitmap_len = wlan_le16_to_cpu(tlv_rxba->bitmap_len); - PRINTM(MEVENT, MACSTR " tid=%d seq_num=%d bitmap_len=%d\n", - MAC2STR(tlv_rxba->mac), tlv_rxba->tid, tlv_rxba->seq_num, - tlv_rxba->bitmap_len); - rx_reor_tbl_ptr = - wlan_11n_get_rxreorder_tbl(priv, tlv_rxba->tid, tlv_rxba->mac); - if (!rx_reor_tbl_ptr) { - PRINTM(MEVENT, "Can not find rx_reorder_tbl\n"); - goto done; - } - for (i = 0; i < tlv_rxba->bitmap_len; i++) { - for (j = 0; j < 8; j++) { - if (tlv_rxba->bitmap[i] & (1 << j)) { - seq_num = - (tlv_rxba->seq_num + i * 8 + j) & (MAX_TID_VALUE - 1); - PRINTM(MEVENT, - "Fw dropped packet, seq=%d start_win=%d, win_size=%d\n", - seq_num, rx_reor_tbl_ptr->start_win, - rx_reor_tbl_ptr->win_size); - if (MLAN_STATUS_SUCCESS != - mlan_11n_rxreorder_pkt(priv, seq_num, tlv_rxba->tid, - tlv_rxba->mac, 0, - (t_void *) RX_PKT_DROPPED_IN_FW)) - { - PRINTM(MERROR, - "Fail to handle dropped packet, seq=%d\n", - seq_num); - } - } - } - } - tlv_buf_left -= (sizeof(MrvlIEtypesHeader_t) + tlv_len); - tlv_rxba = - (MrvlIEtypes_RxBaSync_t *) ((t_u8 *) tlv_rxba + tlv_len + - sizeof(MrvlIEtypesHeader_t)); - } - done: - LEAVE(); - return; + MrvlIEtypes_RxBaSync_t *tlv_rxba = (MrvlIEtypes_RxBaSync_t *) event_buf; + t_u16 tlv_type, tlv_len; + RxReorderTbl *rx_reor_tbl_ptr = MNULL; + t_u8 i, j; + t_u16 seq_num = 0; + int tlv_buf_left = len; + ENTER(); + + DBG_HEXDUMP(MEVT_D, "RXBA_SYNC_EVT", event_buf, len); + while (tlv_buf_left >= sizeof(MrvlIEtypes_RxBaSync_t)) { + tlv_type = wlan_le16_to_cpu(tlv_rxba->header.type); + tlv_len = wlan_le16_to_cpu(tlv_rxba->header.len); + if (tlv_type != TLV_TYPE_RXBA_SYNC) { + PRINTM(MERROR, "Wrong TLV id=0x%x\n", tlv_type); + goto done; + } + tlv_rxba->seq_num = wlan_le16_to_cpu(tlv_rxba->seq_num); + tlv_rxba->bitmap_len = wlan_le16_to_cpu(tlv_rxba->bitmap_len); + PRINTM(MEVENT, MACSTR " tid=%d seq_num=%d bitmap_len=%d\n", + MAC2STR(tlv_rxba->mac), tlv_rxba->tid, tlv_rxba->seq_num, + tlv_rxba->bitmap_len); + rx_reor_tbl_ptr = + wlan_11n_get_rxreorder_tbl(priv, tlv_rxba->tid, + tlv_rxba->mac); + if (!rx_reor_tbl_ptr) { + PRINTM(MEVENT, "Can not find rx_reorder_tbl\n"); + goto done; + } + if (rx_reor_tbl_ptr->force_no_drop) { + PRINTM(MEVENT, "Ignore RXBA_SYNC_EVT in resume\n"); + goto done; + } + for (i = 0; i < tlv_rxba->bitmap_len; i++) { + for (j = 0; j < 8; j++) { + if (tlv_rxba->bitmap[i] & (1 << j)) { + seq_num = + (tlv_rxba->seq_num + i * 8 + + j) & (MAX_TID_VALUE - 1); + PRINTM(MEVENT, + "Fw dropped packet, seq=%d start_win=%d, win_size=%d\n", + seq_num, + rx_reor_tbl_ptr->start_win, + rx_reor_tbl_ptr->win_size); + if (MLAN_STATUS_SUCCESS != + mlan_11n_rxreorder_pkt(priv, + seq_num, + tlv_rxba-> + tid, + tlv_rxba-> + mac, 0, + (t_void *) + RX_PKT_DROPPED_IN_FW)) + { + PRINTM(MERROR, + "Fail to handle dropped packet, seq=%d\n", + seq_num); + } + } + } + } + tlv_buf_left -= (sizeof(MrvlIEtypesHeader_t) + tlv_len); + tlv_rxba = + (MrvlIEtypes_RxBaSync_t *) ((t_u8 *) tlv_rxba + + tlv_len + + sizeof + (MrvlIEtypesHeader_t)); + } +done: + LEAVE(); + return; } /** * @brief This function cleans up reorder tbl for specific station - * + * * @param priv A pointer to mlan_private - * @param ta ta to find in reordering table + * @param ta ta to find in reordering table * @return N/A */ void wlan_cleanup_reorder_tbl(mlan_private * priv, t_u8 * ta) { - RxReorderTbl *rx_reor_tbl_ptr = MNULL; - t_u8 i; - ENTER(); - for (i = 0; i < MAX_NUM_TID; ++i) { - if ((rx_reor_tbl_ptr = wlan_11n_get_rxreorder_tbl(priv, i, ta))) { - wlan_11n_delete_rxreorder_tbl_entry(priv, rx_reor_tbl_ptr); - } - } - LEAVE(); - return; + RxReorderTbl *rx_reor_tbl_ptr = MNULL; + t_u8 i; + ENTER(); + for (i = 0; i < MAX_NUM_TID; ++i) { + if ((rx_reor_tbl_ptr = wlan_11n_get_rxreorder_tbl(priv, i, ta))) { + wlan_11n_delete_rxreorder_tbl_entry(priv, + rx_reor_tbl_ptr); + } + } + LEAVE(); + return; } /** - * @brief This function will set force_no_drop flag in rxreorder_tbl. - * + * @brief This function will set force_no_drop flag in rxreorder_tbl. + * * @param priv A pointer to mlan_private * @param flag MTRUE/MFALSE * @@ -1136,34 +1234,34 @@ wlan_cleanup_reorder_tbl(mlan_private * priv, t_u8 * ta) void wlan_set_rxreorder_tbl_no_drop_flag(mlan_private * priv, t_u8 flag) { - RxReorderTbl *rx_reor_tbl_ptr; - - ENTER(); - - if (! - (rx_reor_tbl_ptr = - (RxReorderTbl *) util_peek_list(priv->adapter->pmoal_handle, - &priv->rx_reorder_tbl_ptr, - priv->adapter->callbacks. - moal_spin_lock, - priv->adapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return; - } - - while (rx_reor_tbl_ptr != (RxReorderTbl *) & priv->rx_reorder_tbl_ptr) { - rx_reor_tbl_ptr->force_no_drop = flag; - rx_reor_tbl_ptr = rx_reor_tbl_ptr->pnext; - } - - LEAVE(); - return; + RxReorderTbl *rx_reor_tbl_ptr; + + ENTER(); + + if (! + (rx_reor_tbl_ptr = + (RxReorderTbl *) util_peek_list(priv->adapter->pmoal_handle, + &priv->rx_reorder_tbl_ptr, + priv->adapter->callbacks. + moal_spin_lock, + priv->adapter->callbacks. + moal_spin_unlock))) { + LEAVE(); + return; + } + + while (rx_reor_tbl_ptr != (RxReorderTbl *) & priv->rx_reorder_tbl_ptr) { + rx_reor_tbl_ptr->force_no_drop = flag; + rx_reor_tbl_ptr = rx_reor_tbl_ptr->pnext; + } + + LEAVE(); + return; } /** * @brief This function update all the rx_reorder_tbl's force_no_drop flag - * + * * @param pmadapter A pointer to mlan_adapter * @param flag MTRUE/MFALSE * @return N/A @@ -1171,13 +1269,13 @@ wlan_set_rxreorder_tbl_no_drop_flag(mlan_private * priv, t_u8 flag) void wlan_update_rxreorder_tbl(pmlan_adapter pmadapter, t_u8 flag) { - t_u8 i; - pmlan_private priv = MNULL; - for (i = 0; i < pmadapter->priv_num; i++) { - if (pmadapter->priv[i]) { - priv = pmadapter->priv[i]; - wlan_set_rxreorder_tbl_no_drop_flag(priv, flag); - } - } - return; + t_u8 i; + pmlan_private priv = MNULL; + for (i = 0; i < pmadapter->priv_num; i++) { + if (pmadapter->priv[i]) { + priv = pmadapter->priv[i]; + wlan_set_rxreorder_tbl_no_drop_flag(priv, flag); + } + } + return; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_11n_rxreorder.h b/drivers/net/wireless/sd8897/mlan/mlan_11n_rxreorder.h index 654b23f01250..9e10d1bdd158 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_11n_rxreorder.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_11n_rxreorder.h @@ -3,19 +3,19 @@ * @brief This file contains related macros, enum, and struct * of 11n RxReordering functionalities * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * - * This software file (the "File") is distributed by Marvell International - * Ltd. under the terms of the GNU General Public License Version 2, June 1991 - * (the "License"). You may use, redistribute and/or modify this File in - * accordance with the terms and conditions of the License, a copy of which + * This software file (the "File") is distributed by Marvell International + * Ltd. under the terms of the GNU General Public License Version 2, June 1991 + * (the "License"). You may use, redistribute and/or modify this File in + * accordance with the terms and conditions of the License, a copy of which * is available by writing to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. * - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about + * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE + * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE + * ARE EXPRESSLY DISCLAIMED. The License provides additional details about * this warranty disclaimer. */ @@ -75,23 +75,23 @@ Change log: #define RX_PKT_DROPPED_IN_FW 0xffffffff mlan_status mlan_11n_rxreorder_pkt(void *priv, t_u16 seqNum, t_u16 tid, - t_u8 * ta, t_u8 pkttype, void *payload); + t_u8 * ta, t_u8 pkttype, void *payload); void mlan_11n_delete_bastream_tbl(mlan_private * priv, int Tid, - t_u8 * PeerMACAddr, t_u8 type, int initiator); + t_u8 * PeerMACAddr, t_u8 type, int initiator); void wlan_11n_ba_stream_timeout(mlan_private * priv, - HostCmd_DS_11N_BATIMEOUT * event); + HostCmd_DS_11N_BATIMEOUT * event); mlan_status wlan_ret_11n_addba_resp(mlan_private * priv, - HostCmd_DS_COMMAND * resp); + HostCmd_DS_COMMAND * resp); mlan_status wlan_cmd_11n_delba(mlan_private * priv, HostCmd_DS_COMMAND * cmd, - void *pdata_buf); + void *pdata_buf); mlan_status wlan_cmd_11n_addba_rspgen(mlan_private * priv, - HostCmd_DS_COMMAND * cmd, - void *pdata_buf); + HostCmd_DS_COMMAND * cmd, + void *pdata_buf); mlan_status wlan_cmd_11n_addba_req(mlan_private * priv, - HostCmd_DS_COMMAND * cmd, void *pdata_buf); + HostCmd_DS_COMMAND * cmd, void *pdata_buf); void wlan_11n_cleanup_reorder_tbl(mlan_private * priv); RxReorderTbl *wlan_11n_get_rxreorder_tbl(mlan_private * priv, int tid, - t_u8 * ta); + t_u8 * ta); void wlan_11n_rxba_sync_event(mlan_private * priv, t_u8 * event_buf, t_u16 len); void wlan_update_rxreorder_tbl(pmlan_adapter pmadapter, t_u8 flag); diff --git a/drivers/net/wireless/sd8897/mlan/mlan_cfp.c b/drivers/net/wireless/sd8897/mlan/mlan_cfp.c index a4a21e636d8f..8b718e48c62e 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_cfp.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_cfp.c @@ -4,7 +4,7 @@ * @brief This file contains WLAN client mode channel, frequency and power * related code * - * Copyright (C) 2009-2012, Marvell International Ltd. + * Copyright (C) 2009-2012, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -13,7 +13,7 @@ * is available by writing to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * + * * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE * ARE EXPRESSLY DISCLAIMED. The License provides additional details about @@ -68,29 +68,29 @@ Change Log: typedef struct _country_code_mapping { /** Region */ - t_u8 country_code[COUNTRY_CODE_LEN]; + t_u8 country_code[COUNTRY_CODE_LEN]; /** Code for B/G CFP table */ - t_u8 cfp_code_bg; + t_u8 cfp_code_bg; /** Code for A CFP table */ - t_u8 cfp_code_a; + t_u8 cfp_code_a; } country_code_mapping_t; /** Region code mapping table */ static country_code_mapping_t country_code_mapping[] = { - {"US", 0x10, 0x10}, /* US FCC */ - {"CA", 0x10, 0x20}, /* IC Canada */ - {"SG", 0x10, 0x10}, /* Singapore */ - {"EU", 0x30, 0x30}, /* ETSI */ - {"AU", 0x30, 0x30}, /* Australia */ - {"KR", 0x30, 0x30}, /* Republic Of Korea */ - {"FR", 0x32, 0x32}, /* France */ - {"JP", 0xFF, 0x40}, /* Japan */ - {"CN", 0x30, 0x50}, /* China */ - {"DE", 0x30, 0x06}, /* Germany */ - {"ES", 0x30, 0x07}, /* Spain */ - {"AT", 0x30, 0x09}, /* Austria */ - {"BR", 0x01, 0x09}, /* Brazil */ - {"RU", 0x30, 0x0f}, /* Russia */ + {"US", 0x10, 0x10}, /* US FCC */ + {"CA", 0x10, 0x20}, /* IC Canada */ + {"SG", 0x10, 0x10}, /* Singapore */ + {"EU", 0x30, 0x30}, /* ETSI */ + {"AU", 0x30, 0x30}, /* Australia */ + {"KR", 0x30, 0x30}, /* Republic Of Korea */ + {"FR", 0x32, 0x32}, /* France */ + {"JP", 0xFF, 0x40}, /* Japan */ + {"CN", 0x30, 0x50}, /* China */ + {"DE", 0x30, 0x06}, /* Germany */ + {"ES", 0x30, 0x07}, /* Spain */ + {"AT", 0x30, 0x09}, /* Austria */ + {"BR", 0x01, 0x09}, /* Brazil */ + {"RU", 0x30, 0x0f}, /* Russia */ }; /** @@ -99,193 +99,193 @@ static country_code_mapping_t country_code_mapping[] = { typedef struct _cfp_table { /** Region or Code */ - t_u8 code; + t_u8 code; /** Frequency/Power */ - chan_freq_power_t *cfp; + chan_freq_power_t *cfp; /** No of CFP flag */ - int cfp_no; + int cfp_no; } cfp_table_t; /* Format { Channel, Frequency (MHz), MaxTxPower } */ /** Band: 'B/G', Region: USA FCC/Canada IC */ static chan_freq_power_t channel_freq_power_US_BG[] = { - {1, 2412, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {2, 2417, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {3, 2422, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {4, 2427, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {5, 2432, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {6, 2437, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {7, 2442, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {8, 2447, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {9, 2452, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {10, 2457, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {11, 2462, WLAN_TX_PWR_US_DEFAULT, MFALSE} + {1, 2412, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {2, 2417, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {3, 2422, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {4, 2427, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {5, 2432, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {6, 2437, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {7, 2442, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {8, 2447, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {9, 2452, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {10, 2457, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {11, 2462, WLAN_TX_PWR_US_DEFAULT, MFALSE} }; /** Band: 'B/G', Region: Europe ETSI/China */ static chan_freq_power_t channel_freq_power_EU_BG[] = { - {1, 2412, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {2, 2417, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {3, 2422, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {4, 2427, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {5, 2432, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {6, 2437, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {7, 2442, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {8, 2447, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {9, 2452, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {10, 2457, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {11, 2462, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {12, 2467, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {13, 2472, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE} + {1, 2412, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, + {2, 2417, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, + {3, 2422, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, + {4, 2427, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, + {5, 2432, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, + {6, 2437, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, + {7, 2442, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, + {8, 2447, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, + {9, 2452, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, + {10, 2457, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, + {11, 2462, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, + {12, 2467, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, + {13, 2472, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE} }; /** Band: 'B/G', Region: France */ static chan_freq_power_t channel_freq_power_FR_BG[] = { - {1, 2412, WLAN_TX_PWR_FR_100MW, MFALSE}, - {2, 2417, WLAN_TX_PWR_FR_100MW, MFALSE}, - {3, 2422, WLAN_TX_PWR_FR_100MW, MFALSE}, - {4, 2427, WLAN_TX_PWR_FR_100MW, MFALSE}, - {5, 2432, WLAN_TX_PWR_FR_100MW, MFALSE}, - {6, 2437, WLAN_TX_PWR_FR_100MW, MFALSE}, - {7, 2442, WLAN_TX_PWR_FR_100MW, MFALSE}, - {8, 2447, WLAN_TX_PWR_FR_100MW, MFALSE}, - {9, 2452, WLAN_TX_PWR_FR_100MW, MFALSE}, - {10, 2457, WLAN_TX_PWR_FR_10MW, MFALSE}, - {11, 2462, WLAN_TX_PWR_FR_10MW, MFALSE}, - {12, 2467, WLAN_TX_PWR_FR_10MW, MFALSE}, - {13, 2472, WLAN_TX_PWR_FR_10MW, MFALSE} + {1, 2412, WLAN_TX_PWR_FR_100MW, MFALSE}, + {2, 2417, WLAN_TX_PWR_FR_100MW, MFALSE}, + {3, 2422, WLAN_TX_PWR_FR_100MW, MFALSE}, + {4, 2427, WLAN_TX_PWR_FR_100MW, MFALSE}, + {5, 2432, WLAN_TX_PWR_FR_100MW, MFALSE}, + {6, 2437, WLAN_TX_PWR_FR_100MW, MFALSE}, + {7, 2442, WLAN_TX_PWR_FR_100MW, MFALSE}, + {8, 2447, WLAN_TX_PWR_FR_100MW, MFALSE}, + {9, 2452, WLAN_TX_PWR_FR_100MW, MFALSE}, + {10, 2457, WLAN_TX_PWR_FR_10MW, MFALSE}, + {11, 2462, WLAN_TX_PWR_FR_10MW, MFALSE}, + {12, 2467, WLAN_TX_PWR_FR_10MW, MFALSE}, + {13, 2472, WLAN_TX_PWR_FR_10MW, MFALSE} }; /** Band: 'B/G', Region: Japan */ static chan_freq_power_t channel_freq_power_JPN41_BG[] = { - {1, 2412, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {2, 2417, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {3, 2422, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {4, 2427, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {5, 2432, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {6, 2437, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {7, 2442, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {8, 2447, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {9, 2452, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {10, 2457, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {11, 2462, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {12, 2467, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {13, 2472, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE} + {1, 2412, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {2, 2417, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {3, 2422, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {4, 2427, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {5, 2432, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {6, 2437, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {7, 2442, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {8, 2447, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {9, 2452, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {10, 2457, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {11, 2462, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {12, 2467, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {13, 2472, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE} }; /** Band: 'B/G', Region: Japan */ static chan_freq_power_t channel_freq_power_JPN40_BG[] = { - {14, 2484, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE} + {14, 2484, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE} }; /** Band: 'B/G', Region: Japan */ static chan_freq_power_t channel_freq_power_JPNFE_BG[] = { - {1, 2412, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {2, 2417, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {3, 2422, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {4, 2427, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {5, 2432, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {6, 2437, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {7, 2442, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {8, 2447, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {9, 2452, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {10, 2457, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {11, 2462, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {12, 2467, WLAN_TX_PWR_JP_BG_DEFAULT, MTRUE}, - {13, 2472, WLAN_TX_PWR_JP_BG_DEFAULT, MTRUE} + {1, 2412, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {2, 2417, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {3, 2422, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {4, 2427, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {5, 2432, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {6, 2437, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {7, 2442, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {8, 2447, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {9, 2452, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {10, 2457, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {11, 2462, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {12, 2467, WLAN_TX_PWR_JP_BG_DEFAULT, MTRUE}, + {13, 2472, WLAN_TX_PWR_JP_BG_DEFAULT, MTRUE} }; /** Band : 'B/G', Region: Brazil */ static chan_freq_power_t channel_freq_power_BR_BG[] = { - {1, 2412, WLAN_TX_PWR_1000MW, MFALSE}, - {2, 2417, WLAN_TX_PWR_1000MW, MFALSE}, - {3, 2422, WLAN_TX_PWR_1000MW, MFALSE}, - {4, 2427, WLAN_TX_PWR_1000MW, MFALSE}, - {5, 2432, WLAN_TX_PWR_1000MW, MFALSE}, - {6, 2437, WLAN_TX_PWR_1000MW, MFALSE}, - {7, 2442, WLAN_TX_PWR_1000MW, MFALSE}, - {8, 2447, WLAN_TX_PWR_1000MW, MFALSE}, - {9, 2452, WLAN_TX_PWR_1000MW, MFALSE}, - {10, 2457, WLAN_TX_PWR_1000MW, MFALSE}, - {11, 2462, WLAN_TX_PWR_1000MW, MFALSE}, - {12, 2467, WLAN_TX_PWR_1000MW, MFALSE}, - {13, 2472, WLAN_TX_PWR_1000MW, MFALSE}, + {1, 2412, WLAN_TX_PWR_1000MW, MFALSE}, + {2, 2417, WLAN_TX_PWR_1000MW, MFALSE}, + {3, 2422, WLAN_TX_PWR_1000MW, MFALSE}, + {4, 2427, WLAN_TX_PWR_1000MW, MFALSE}, + {5, 2432, WLAN_TX_PWR_1000MW, MFALSE}, + {6, 2437, WLAN_TX_PWR_1000MW, MFALSE}, + {7, 2442, WLAN_TX_PWR_1000MW, MFALSE}, + {8, 2447, WLAN_TX_PWR_1000MW, MFALSE}, + {9, 2452, WLAN_TX_PWR_1000MW, MFALSE}, + {10, 2457, WLAN_TX_PWR_1000MW, MFALSE}, + {11, 2462, WLAN_TX_PWR_1000MW, MFALSE}, + {12, 2467, WLAN_TX_PWR_1000MW, MFALSE}, + {13, 2472, WLAN_TX_PWR_1000MW, MFALSE}, }; /** Band : 'B/G', Region: Special */ static chan_freq_power_t channel_freq_power_SPECIAL_BG[] = { - {1, 2412, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {2, 2417, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {3, 2422, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {4, 2427, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {5, 2432, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {6, 2437, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {7, 2442, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {8, 2447, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {9, 2452, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {10, 2457, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {11, 2462, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {12, 2467, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {13, 2472, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, - {14, 2484, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE} + {1, 2412, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {2, 2417, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {3, 2422, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {4, 2427, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {5, 2432, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {6, 2437, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {7, 2442, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {8, 2447, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {9, 2452, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {10, 2457, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {11, 2462, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {12, 2467, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {13, 2472, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE}, + {14, 2484, WLAN_TX_PWR_JP_BG_DEFAULT, MFALSE} }; /** * The 2.4GHz CFP tables */ static cfp_table_t cfp_table_BG[] = { - { - 0x01, /* Brazil */ - channel_freq_power_BR_BG, - sizeof(channel_freq_power_BR_BG) / sizeof(chan_freq_power_t), - } - , - {0x10, /* US FCC */ - channel_freq_power_US_BG, - sizeof(channel_freq_power_US_BG) / sizeof(chan_freq_power_t), - } - , - {0x20, /* CANADA IC */ - channel_freq_power_US_BG, - sizeof(channel_freq_power_US_BG) / sizeof(chan_freq_power_t), - } - , - {0x30, /* EU */ - channel_freq_power_EU_BG, - sizeof(channel_freq_power_EU_BG) / sizeof(chan_freq_power_t), - } - , - {0x32, /* FRANCE */ - channel_freq_power_FR_BG, - sizeof(channel_freq_power_FR_BG) / sizeof(chan_freq_power_t), - } - , - {0x40, /* JAPAN */ - channel_freq_power_JPN40_BG, - sizeof(channel_freq_power_JPN40_BG) / sizeof(chan_freq_power_t), - } - , - {0x41, /* JAPAN */ - channel_freq_power_JPN41_BG, - sizeof(channel_freq_power_JPN41_BG) / sizeof(chan_freq_power_t), - } - , - {0x50, /* China */ - channel_freq_power_EU_BG, - sizeof(channel_freq_power_EU_BG) / sizeof(chan_freq_power_t), - } - , - { - 0xfe, /* JAPAN */ - channel_freq_power_JPNFE_BG, - sizeof(channel_freq_power_JPNFE_BG) / sizeof(chan_freq_power_t), - } - , - {0xff, /* Special */ - channel_freq_power_SPECIAL_BG, - sizeof(channel_freq_power_SPECIAL_BG) / sizeof(chan_freq_power_t), - } - , + { + 0x01, /* Brazil */ + channel_freq_power_BR_BG, + sizeof(channel_freq_power_BR_BG) / sizeof(chan_freq_power_t), + } + , + {0x10, /* US FCC */ + channel_freq_power_US_BG, + sizeof(channel_freq_power_US_BG) / sizeof(chan_freq_power_t), + } + , + {0x20, /* CANADA IC */ + channel_freq_power_US_BG, + sizeof(channel_freq_power_US_BG) / sizeof(chan_freq_power_t), + } + , + {0x30, /* EU */ + channel_freq_power_EU_BG, + sizeof(channel_freq_power_EU_BG) / sizeof(chan_freq_power_t), + } + , + {0x32, /* FRANCE */ + channel_freq_power_FR_BG, + sizeof(channel_freq_power_FR_BG) / sizeof(chan_freq_power_t), + } + , + {0x40, /* JAPAN */ + channel_freq_power_JPN40_BG, + sizeof(channel_freq_power_JPN40_BG) / sizeof(chan_freq_power_t), + } + , + {0x41, /* JAPAN */ + channel_freq_power_JPN41_BG, + sizeof(channel_freq_power_JPN41_BG) / sizeof(chan_freq_power_t), + } + , + {0x50, /* China */ + channel_freq_power_EU_BG, + sizeof(channel_freq_power_EU_BG) / sizeof(chan_freq_power_t), + } + , + { + 0xfe, /* JAPAN */ + channel_freq_power_JPNFE_BG, + sizeof(channel_freq_power_JPNFE_BG) / sizeof(chan_freq_power_t), + } + , + {0xff, /* Special */ + channel_freq_power_SPECIAL_BG, + sizeof(channel_freq_power_SPECIAL_BG) / sizeof(chan_freq_power_t), + } + , /* Add new region here */ }; @@ -295,112 +295,112 @@ static cfp_table_t cfp_table_BG[] = { /* Format { Channel, Frequency (MHz), MaxTxPower, DFS } */ /** Band: 'A', Region: USA FCC, Spain, France */ static chan_freq_power_t channel_freq_power_A[] = { - {36, 5180, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {40, 5200, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {44, 5220, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {48, 5240, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {52, 5260, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {56, 5280, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {60, 5300, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {64, 5320, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {100, 5500, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {104, 5520, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {108, 5540, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {112, 5560, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {116, 5580, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {120, 5600, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {124, 5620, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {128, 5640, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {132, 5660, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {136, 5680, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {140, 5700, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {144, 5720, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {149, 5745, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {153, 5765, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {157, 5785, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {161, 5805, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {165, 5825, WLAN_TX_PWR_US_DEFAULT, MFALSE} + {36, 5180, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {40, 5200, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {44, 5220, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {48, 5240, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {52, 5260, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {56, 5280, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {60, 5300, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {64, 5320, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {100, 5500, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {104, 5520, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {108, 5540, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {112, 5560, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {116, 5580, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {120, 5600, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {124, 5620, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {128, 5640, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {132, 5660, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {136, 5680, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {140, 5700, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {144, 5720, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {149, 5745, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {153, 5765, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {157, 5785, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {161, 5805, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {165, 5825, WLAN_TX_PWR_US_DEFAULT, MFALSE} }; /** Band: 'A', Region: Canada IC */ static chan_freq_power_t channel_freq_power_CAN_A[] = { - {36, 5180, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {40, 5200, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {44, 5220, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {48, 5240, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {52, 5260, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {56, 5280, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {60, 5300, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {64, 5320, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {100, 5500, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {104, 5520, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {108, 5540, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {112, 5560, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {116, 5580, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {132, 5660, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {136, 5680, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {140, 5700, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {144, 5720, WLAN_TX_PWR_US_DEFAULT, MTRUE}, - {149, 5745, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {153, 5765, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {157, 5785, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {161, 5805, WLAN_TX_PWR_US_DEFAULT, MFALSE}, - {165, 5825, WLAN_TX_PWR_US_DEFAULT, MFALSE} + {36, 5180, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {40, 5200, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {44, 5220, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {48, 5240, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {52, 5260, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {56, 5280, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {60, 5300, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {64, 5320, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {100, 5500, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {104, 5520, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {108, 5540, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {112, 5560, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {116, 5580, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {132, 5660, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {136, 5680, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {140, 5700, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {144, 5720, WLAN_TX_PWR_US_DEFAULT, MTRUE}, + {149, 5745, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {153, 5765, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {157, 5785, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {161, 5805, WLAN_TX_PWR_US_DEFAULT, MFALSE}, + {165, 5825, WLAN_TX_PWR_US_DEFAULT, MFALSE} }; /** Band: 'A', Region: Europe ETSI */ static chan_freq_power_t channel_freq_power_EU_A[] = { - {36, 5180, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {40, 5200, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {44, 5220, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {48, 5240, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {52, 5260, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, - {56, 5280, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, - {60, 5300, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, - {64, 5320, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, - {100, 5500, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, - {104, 5520, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, - {108, 5540, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, - {112, 5560, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, - {116, 5580, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, - {120, 5600, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, - {124, 5620, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, - {128, 5640, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, - {132, 5660, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, - {136, 5680, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, - {140, 5700, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE} + {36, 5180, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, + {40, 5200, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, + {44, 5220, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, + {48, 5240, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, + {52, 5260, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, + {56, 5280, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, + {60, 5300, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, + {64, 5320, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, + {100, 5500, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, + {104, 5520, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, + {108, 5540, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, + {112, 5560, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, + {116, 5580, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, + {120, 5600, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, + {124, 5620, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, + {128, 5640, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, + {132, 5660, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, + {136, 5680, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE}, + {140, 5700, WLAN_TX_PWR_EMEA_DEFAULT, MTRUE} }; /** Band: 'A', Region: Japan */ static chan_freq_power_t channel_freq_power_JPN_A[] = { - {36, 5180, WLAN_TX_PWR_JP_A_DEFAULT, MFALSE}, - {40, 5200, WLAN_TX_PWR_JP_A_DEFAULT, MFALSE}, - {44, 5220, WLAN_TX_PWR_JP_A_DEFAULT, MFALSE}, - {48, 5240, WLAN_TX_PWR_JP_A_DEFAULT, MFALSE}, - {52, 5260, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, - {56, 5280, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, - {60, 5300, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, - {64, 5320, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, - {100, 5500, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, - {104, 5520, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, - {108, 5540, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, - {112, 5560, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, - {116, 5580, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, - {120, 5600, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, - {124, 5620, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, - {128, 5640, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, - {132, 5660, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, - {136, 5680, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, - {140, 5700, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE} + {36, 5180, WLAN_TX_PWR_JP_A_DEFAULT, MFALSE}, + {40, 5200, WLAN_TX_PWR_JP_A_DEFAULT, MFALSE}, + {44, 5220, WLAN_TX_PWR_JP_A_DEFAULT, MFALSE}, + {48, 5240, WLAN_TX_PWR_JP_A_DEFAULT, MFALSE}, + {52, 5260, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, + {56, 5280, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, + {60, 5300, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, + {64, 5320, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, + {100, 5500, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, + {104, 5520, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, + {108, 5540, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, + {112, 5560, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, + {116, 5580, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, + {120, 5600, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, + {124, 5620, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, + {128, 5640, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, + {132, 5660, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, + {136, 5680, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}, + {140, 5700, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE} }; /** Band: 'A', Region: China */ static chan_freq_power_t channel_freq_power_CN_A[] = { - {149, 5745, WLAN_TX_PWR_CN_2000MW, MFALSE}, - {153, 5765, WLAN_TX_PWR_CN_2000MW, MFALSE}, - {157, 5785, WLAN_TX_PWR_CN_2000MW, MFALSE}, - {161, 5805, WLAN_TX_PWR_CN_2000MW, MFALSE}, - {165, 5825, WLAN_TX_PWR_CN_2000MW, MFALSE} + {149, 5745, WLAN_TX_PWR_CN_2000MW, MFALSE}, + {153, 5765, WLAN_TX_PWR_CN_2000MW, MFALSE}, + {157, 5785, WLAN_TX_PWR_CN_2000MW, MFALSE}, + {161, 5805, WLAN_TX_PWR_CN_2000MW, MFALSE}, + {165, 5825, WLAN_TX_PWR_CN_2000MW, MFALSE} }; /** Band: 'A', NULL */ @@ -409,285 +409,287 @@ static chan_freq_power_t channel_freq_power_NULL_A[] = { /** Band: 'A', Region: Germany */ static chan_freq_power_t channel_freq_power_GRM_A[] = { - {36, 5180, WLAN_TX_PWR_200MW, MFALSE}, - {40, 5200, WLAN_TX_PWR_200MW, MFALSE}, - {44, 5220, WLAN_TX_PWR_200MW, MFALSE}, - {48, 5240, WLAN_TX_PWR_200MW, MFALSE}, - {52, 5260, WLAN_TX_PWR_200MW, MTRUE}, - {56, 5280, WLAN_TX_PWR_200MW, MTRUE}, - {60, 5300, WLAN_TX_PWR_200MW, MTRUE}, - {64, 5320, WLAN_TX_PWR_200MW, MTRUE}, - {100, 5500, WLAN_TX_PWR_1000MW, MTRUE}, - {104, 5520, WLAN_TX_PWR_1000MW, MTRUE}, - {108, 5540, WLAN_TX_PWR_1000MW, MTRUE}, - {112, 5560, WLAN_TX_PWR_1000MW, MTRUE}, - {116, 5580, WLAN_TX_PWR_1000MW, MTRUE}, - {120, 5600, WLAN_TX_PWR_1000MW, MTRUE}, - {124, 5620, WLAN_TX_PWR_1000MW, MTRUE}, - {128, 5640, WLAN_TX_PWR_1000MW, MTRUE}, - {132, 5660, WLAN_TX_PWR_1000MW, MTRUE}, - {136, 5680, WLAN_TX_PWR_1000MW, MTRUE}, - {140, 5700, WLAN_TX_PWR_1000MW, MTRUE}, + {36, 5180, WLAN_TX_PWR_200MW, MFALSE}, + {40, 5200, WLAN_TX_PWR_200MW, MFALSE}, + {44, 5220, WLAN_TX_PWR_200MW, MFALSE}, + {48, 5240, WLAN_TX_PWR_200MW, MFALSE}, + {52, 5260, WLAN_TX_PWR_200MW, MTRUE}, + {56, 5280, WLAN_TX_PWR_200MW, MTRUE}, + {60, 5300, WLAN_TX_PWR_200MW, MTRUE}, + {64, 5320, WLAN_TX_PWR_200MW, MTRUE}, + {100, 5500, WLAN_TX_PWR_1000MW, MTRUE}, + {104, 5520, WLAN_TX_PWR_1000MW, MTRUE}, + {108, 5540, WLAN_TX_PWR_1000MW, MTRUE}, + {112, 5560, WLAN_TX_PWR_1000MW, MTRUE}, + {116, 5580, WLAN_TX_PWR_1000MW, MTRUE}, + {120, 5600, WLAN_TX_PWR_1000MW, MTRUE}, + {124, 5620, WLAN_TX_PWR_1000MW, MTRUE}, + {128, 5640, WLAN_TX_PWR_1000MW, MTRUE}, + {132, 5660, WLAN_TX_PWR_1000MW, MTRUE}, + {136, 5680, WLAN_TX_PWR_1000MW, MTRUE}, + {140, 5700, WLAN_TX_PWR_1000MW, MTRUE}, }; /** Band: 'A', Region: Spain */ static chan_freq_power_t channel_freq_power_SPN0_A[] = { - {36, 5180, WLAN_TX_PWR_SP_30MW, MFALSE}, - {40, 5200, WLAN_TX_PWR_SP_30MW, MFALSE}, - {44, 5220, WLAN_TX_PWR_SP_30MW, MFALSE}, - {48, 5240, WLAN_TX_PWR_SP_30MW, MFALSE}, + {36, 5180, WLAN_TX_PWR_SP_30MW, MFALSE}, + {40, 5200, WLAN_TX_PWR_SP_30MW, MFALSE}, + {44, 5220, WLAN_TX_PWR_SP_30MW, MFALSE}, + {48, 5240, WLAN_TX_PWR_SP_30MW, MFALSE}, }; /** Band: 'A', Region: Spain */ static chan_freq_power_t channel_freq_power_SPN1_A[] = { - {36, 5180, WLAN_TX_PWR_SP_60MW, MFALSE}, - {40, 5200, WLAN_TX_PWR_SP_60MW, MFALSE}, - {44, 5220, WLAN_TX_PWR_SP_60MW, MFALSE}, - {48, 5240, WLAN_TX_PWR_SP_60MW, MFALSE}, + {36, 5180, WLAN_TX_PWR_SP_60MW, MFALSE}, + {40, 5200, WLAN_TX_PWR_SP_60MW, MFALSE}, + {44, 5220, WLAN_TX_PWR_SP_60MW, MFALSE}, + {48, 5240, WLAN_TX_PWR_SP_60MW, MFALSE}, }; /** Band: 'A', Region: Spain/Austria/Brazil */ static chan_freq_power_t channel_freq_power_SPN2_A[] = { - {36, 5180, WLAN_TX_PWR_200MW, MFALSE}, - {40, 5200, WLAN_TX_PWR_200MW, MFALSE}, - {44, 5220, WLAN_TX_PWR_200MW, MFALSE}, - {48, 5240, WLAN_TX_PWR_200MW, MFALSE}, - {52, 5260, WLAN_TX_PWR_200MW, MTRUE}, - {56, 5280, WLAN_TX_PWR_200MW, MTRUE}, - {60, 5300, WLAN_TX_PWR_200MW, MTRUE}, - {64, 5320, WLAN_TX_PWR_200MW, MTRUE}, + {36, 5180, WLAN_TX_PWR_200MW, MFALSE}, + {40, 5200, WLAN_TX_PWR_200MW, MFALSE}, + {44, 5220, WLAN_TX_PWR_200MW, MFALSE}, + {48, 5240, WLAN_TX_PWR_200MW, MFALSE}, + {52, 5260, WLAN_TX_PWR_200MW, MTRUE}, + {56, 5280, WLAN_TX_PWR_200MW, MTRUE}, + {60, 5300, WLAN_TX_PWR_200MW, MTRUE}, + {64, 5320, WLAN_TX_PWR_200MW, MTRUE}, }; /** Band: 'A', Region: Spain/Austria */ static chan_freq_power_t channel_freq_power_SPN3_A[] = { - {100, 5500, WLAN_TX_PWR_1000MW, MTRUE}, - {104, 5520, WLAN_TX_PWR_1000MW, MTRUE}, - {108, 5540, WLAN_TX_PWR_1000MW, MTRUE}, - {112, 5560, WLAN_TX_PWR_1000MW, MTRUE}, - {116, 5580, WLAN_TX_PWR_1000MW, MTRUE}, - {120, 5600, WLAN_TX_PWR_1000MW, MTRUE}, - {124, 5620, WLAN_TX_PWR_1000MW, MTRUE}, - {128, 5640, WLAN_TX_PWR_1000MW, MTRUE}, - {132, 5660, WLAN_TX_PWR_1000MW, MTRUE}, - {136, 5680, WLAN_TX_PWR_1000MW, MTRUE}, - {140, 5700, WLAN_TX_PWR_1000MW, MTRUE}, + {100, 5500, WLAN_TX_PWR_1000MW, MTRUE}, + {104, 5520, WLAN_TX_PWR_1000MW, MTRUE}, + {108, 5540, WLAN_TX_PWR_1000MW, MTRUE}, + {112, 5560, WLAN_TX_PWR_1000MW, MTRUE}, + {116, 5580, WLAN_TX_PWR_1000MW, MTRUE}, + {120, 5600, WLAN_TX_PWR_1000MW, MTRUE}, + {124, 5620, WLAN_TX_PWR_1000MW, MTRUE}, + {128, 5640, WLAN_TX_PWR_1000MW, MTRUE}, + {132, 5660, WLAN_TX_PWR_1000MW, MTRUE}, + {136, 5680, WLAN_TX_PWR_1000MW, MTRUE}, + {140, 5700, WLAN_TX_PWR_1000MW, MTRUE}, }; /** Band: 'A', Region: Austria */ static chan_freq_power_t channel_freq_power_AT_A[] = { - {149, 5745, WLAN_TX_PWR_25MW, MFALSE}, - {153, 5765, WLAN_TX_PWR_25MW, MFALSE}, - {157, 5785, WLAN_TX_PWR_25MW, MFALSE}, - {161, 5805, WLAN_TX_PWR_25MW, MFALSE}, - {165, 5825, WLAN_TX_PWR_25MW, MFALSE} + {149, 5745, WLAN_TX_PWR_25MW, MFALSE}, + {153, 5765, WLAN_TX_PWR_25MW, MFALSE}, + {157, 5785, WLAN_TX_PWR_25MW, MFALSE}, + {161, 5805, WLAN_TX_PWR_25MW, MFALSE}, + {165, 5825, WLAN_TX_PWR_25MW, MFALSE} }; /** Band: 'A', Region: Brazil */ static chan_freq_power_t channel_freq_power_BR1_A[] = { - {100, 5500, WLAN_TX_PWR_250MW, MTRUE}, - {104, 5520, WLAN_TX_PWR_250MW, MTRUE}, - {108, 5540, WLAN_TX_PWR_250MW, MTRUE}, - {112, 5560, WLAN_TX_PWR_250MW, MTRUE}, - {116, 5580, WLAN_TX_PWR_250MW, MTRUE}, - {120, 5600, WLAN_TX_PWR_250MW, MTRUE}, - {124, 5620, WLAN_TX_PWR_250MW, MTRUE}, - {128, 5640, WLAN_TX_PWR_250MW, MTRUE}, - {132, 5660, WLAN_TX_PWR_250MW, MTRUE}, - {136, 5680, WLAN_TX_PWR_250MW, MTRUE}, - {140, 5700, WLAN_TX_PWR_250MW, MTRUE}, + {100, 5500, WLAN_TX_PWR_250MW, MTRUE}, + {104, 5520, WLAN_TX_PWR_250MW, MTRUE}, + {108, 5540, WLAN_TX_PWR_250MW, MTRUE}, + {112, 5560, WLAN_TX_PWR_250MW, MTRUE}, + {116, 5580, WLAN_TX_PWR_250MW, MTRUE}, + {120, 5600, WLAN_TX_PWR_250MW, MTRUE}, + {124, 5620, WLAN_TX_PWR_250MW, MTRUE}, + {128, 5640, WLAN_TX_PWR_250MW, MTRUE}, + {132, 5660, WLAN_TX_PWR_250MW, MTRUE}, + {136, 5680, WLAN_TX_PWR_250MW, MTRUE}, + {140, 5700, WLAN_TX_PWR_250MW, MTRUE}, }; /** Band: 'A', Region: Brazil */ static chan_freq_power_t channel_freq_power_BR2_A[] = { - {149, 5745, WLAN_TX_PWR_1000MW, MFALSE}, - {153, 5765, WLAN_TX_PWR_1000MW, MFALSE}, - {157, 5785, WLAN_TX_PWR_1000MW, MFALSE}, - {161, 5805, WLAN_TX_PWR_1000MW, MFALSE}, - {165, 5825, WLAN_TX_PWR_1000MW, MFALSE} + {149, 5745, WLAN_TX_PWR_1000MW, MFALSE}, + {153, 5765, WLAN_TX_PWR_1000MW, MFALSE}, + {157, 5785, WLAN_TX_PWR_1000MW, MFALSE}, + {161, 5805, WLAN_TX_PWR_1000MW, MFALSE}, + {165, 5825, WLAN_TX_PWR_1000MW, MFALSE} }; /** Band: 'A', Region: Russia */ static chan_freq_power_t channel_freq_power_RU_A[] = { - {149, 5745, WLAN_TX_PWR_DEFAULT, MFALSE}, - {153, 5765, WLAN_TX_PWR_DEFAULT, MFALSE}, - {157, 5785, WLAN_TX_PWR_DEFAULT, MFALSE}, - {161, 5805, WLAN_TX_PWR_DEFAULT, MFALSE}, + {149, 5745, WLAN_TX_PWR_DEFAULT, MFALSE}, + {153, 5765, WLAN_TX_PWR_DEFAULT, MFALSE}, + {157, 5785, WLAN_TX_PWR_DEFAULT, MFALSE}, + {161, 5805, WLAN_TX_PWR_DEFAULT, MFALSE}, }; /** Band: 'A', Code: 1, Low band (5150-5250 MHz) channels */ static chan_freq_power_t channel_freq_power_low_band[] = { - {36, 5180, WLAN_TX_PWR_DEFAULT, MFALSE}, - {40, 5200, WLAN_TX_PWR_DEFAULT, MFALSE}, - {44, 5220, WLAN_TX_PWR_DEFAULT, MFALSE}, - {48, 5240, WLAN_TX_PWR_DEFAULT, MFALSE}, + {36, 5180, WLAN_TX_PWR_DEFAULT, MFALSE}, + {40, 5200, WLAN_TX_PWR_DEFAULT, MFALSE}, + {44, 5220, WLAN_TX_PWR_DEFAULT, MFALSE}, + {48, 5240, WLAN_TX_PWR_DEFAULT, MFALSE}, }; /** Band: 'A', Code: 2, Lower middle band (5250-5350 MHz) channels */ static chan_freq_power_t channel_freq_power_lower_middle_band[] = { - {52, 5260, WLAN_TX_PWR_DEFAULT, MTRUE}, - {56, 5280, WLAN_TX_PWR_DEFAULT, MTRUE}, - {60, 5300, WLAN_TX_PWR_DEFAULT, MTRUE}, - {64, 5320, WLAN_TX_PWR_DEFAULT, MTRUE}, + {52, 5260, WLAN_TX_PWR_DEFAULT, MTRUE}, + {56, 5280, WLAN_TX_PWR_DEFAULT, MTRUE}, + {60, 5300, WLAN_TX_PWR_DEFAULT, MTRUE}, + {64, 5320, WLAN_TX_PWR_DEFAULT, MTRUE}, }; /** Band: 'A', Code: 3, Upper middle band (5470-5725 MHz) channels */ static chan_freq_power_t channel_freq_power_upper_middle_band[] = { - {100, 5500, WLAN_TX_PWR_DEFAULT, MTRUE}, - {104, 5520, WLAN_TX_PWR_DEFAULT, MTRUE}, - {108, 5540, WLAN_TX_PWR_DEFAULT, MTRUE}, - {112, 5560, WLAN_TX_PWR_DEFAULT, MTRUE}, - {116, 5580, WLAN_TX_PWR_DEFAULT, MTRUE}, - {120, 5600, WLAN_TX_PWR_DEFAULT, MTRUE}, - {124, 5620, WLAN_TX_PWR_DEFAULT, MTRUE}, - {128, 5640, WLAN_TX_PWR_DEFAULT, MTRUE}, - {132, 5660, WLAN_TX_PWR_DEFAULT, MTRUE}, - {136, 5680, WLAN_TX_PWR_DEFAULT, MTRUE}, - {140, 5700, WLAN_TX_PWR_DEFAULT, MTRUE}, + {100, 5500, WLAN_TX_PWR_DEFAULT, MTRUE}, + {104, 5520, WLAN_TX_PWR_DEFAULT, MTRUE}, + {108, 5540, WLAN_TX_PWR_DEFAULT, MTRUE}, + {112, 5560, WLAN_TX_PWR_DEFAULT, MTRUE}, + {116, 5580, WLAN_TX_PWR_DEFAULT, MTRUE}, + {120, 5600, WLAN_TX_PWR_DEFAULT, MTRUE}, + {124, 5620, WLAN_TX_PWR_DEFAULT, MTRUE}, + {128, 5640, WLAN_TX_PWR_DEFAULT, MTRUE}, + {132, 5660, WLAN_TX_PWR_DEFAULT, MTRUE}, + {136, 5680, WLAN_TX_PWR_DEFAULT, MTRUE}, + {140, 5700, WLAN_TX_PWR_DEFAULT, MTRUE}, }; /** Band: 'A', Code: 4, High band (5725-5850 MHz) channels */ static chan_freq_power_t channel_freq_power_high_band[] = { - {149, 5745, WLAN_TX_PWR_DEFAULT, MFALSE}, - {153, 5765, WLAN_TX_PWR_DEFAULT, MFALSE}, - {157, 5785, WLAN_TX_PWR_DEFAULT, MFALSE}, - {161, 5805, WLAN_TX_PWR_DEFAULT, MFALSE}, - {165, 5825, WLAN_TX_PWR_DEFAULT, MFALSE} + {149, 5745, WLAN_TX_PWR_DEFAULT, MFALSE}, + {153, 5765, WLAN_TX_PWR_DEFAULT, MFALSE}, + {157, 5785, WLAN_TX_PWR_DEFAULT, MFALSE}, + {161, 5805, WLAN_TX_PWR_DEFAULT, MFALSE}, + {165, 5825, WLAN_TX_PWR_DEFAULT, MFALSE} }; /** Band: 'A', Code: 5, Low band (5150-5250 MHz) and * High band (5725-5850 MHz) channels */ static chan_freq_power_t channel_freq_power_low_high_band[] = { - {36, 5180, WLAN_TX_PWR_DEFAULT, MFALSE}, - {40, 5200, WLAN_TX_PWR_DEFAULT, MFALSE}, - {44, 5220, WLAN_TX_PWR_DEFAULT, MFALSE}, - {48, 5240, WLAN_TX_PWR_DEFAULT, MFALSE}, - {149, 5745, WLAN_TX_PWR_DEFAULT, MFALSE}, - {153, 5765, WLAN_TX_PWR_DEFAULT, MFALSE}, - {157, 5785, WLAN_TX_PWR_DEFAULT, MFALSE}, - {161, 5805, WLAN_TX_PWR_DEFAULT, MFALSE}, - {165, 5825, WLAN_TX_PWR_DEFAULT, MFALSE} + {36, 5180, WLAN_TX_PWR_DEFAULT, MFALSE}, + {40, 5200, WLAN_TX_PWR_DEFAULT, MFALSE}, + {44, 5220, WLAN_TX_PWR_DEFAULT, MFALSE}, + {48, 5240, WLAN_TX_PWR_DEFAULT, MFALSE}, + {149, 5745, WLAN_TX_PWR_DEFAULT, MFALSE}, + {153, 5765, WLAN_TX_PWR_DEFAULT, MFALSE}, + {157, 5785, WLAN_TX_PWR_DEFAULT, MFALSE}, + {161, 5805, WLAN_TX_PWR_DEFAULT, MFALSE}, + {165, 5825, WLAN_TX_PWR_DEFAULT, MFALSE} }; /** * The 5GHz CFP tables */ static cfp_table_t cfp_table_A[] = { - {0x1, /* Low band (5150-5250 MHz) channels */ - channel_freq_power_low_band, - sizeof(channel_freq_power_low_band) / sizeof(chan_freq_power_t) - } - , - {0x2, /* Lower middle band (5250-5350 MHz) channels */ - channel_freq_power_lower_middle_band, - sizeof(channel_freq_power_lower_middle_band) / sizeof(chan_freq_power_t) - } - , - {0x3, /* Upper middle band (5470-5725 MHz) channels */ - channel_freq_power_upper_middle_band, - sizeof(channel_freq_power_upper_middle_band) / sizeof(chan_freq_power_t) - } - , - {0x4, /* High band (5725-5850 MHz) channels */ - channel_freq_power_high_band, - sizeof(channel_freq_power_high_band) / sizeof(chan_freq_power_t) - } - , - {0x5, /* Low band (5150-5250 MHz) and High band - (5725-5850 MHz) channels */ - channel_freq_power_low_high_band, - sizeof(channel_freq_power_low_high_band) / sizeof(chan_freq_power_t) - } - , - {0x06, /* GERMANY */ - channel_freq_power_GRM_A, - sizeof(channel_freq_power_GRM_A) / sizeof(chan_freq_power_t), - } - , - {0x07, /* SPAIN */ - channel_freq_power_SPN0_A, - sizeof(channel_freq_power_SPN0_A) / sizeof(chan_freq_power_t), - } - , - {0x08, /* SPAIN */ - channel_freq_power_SPN1_A, - sizeof(channel_freq_power_SPN1_A) / sizeof(chan_freq_power_t), - } - , - {0x09, /* SPAIN/Austria/Brazil */ - channel_freq_power_SPN2_A, - sizeof(channel_freq_power_SPN2_A) / sizeof(chan_freq_power_t), - } - , - {0x0a, /* SPAIN/Austria */ - channel_freq_power_SPN3_A, - sizeof(channel_freq_power_SPN3_A) / sizeof(chan_freq_power_t), - } - , - {0x0b, /* Austria */ - channel_freq_power_AT_A, - sizeof(channel_freq_power_AT_A) / sizeof(chan_freq_power_t), - } - , - {0x0c, /* Brazil */ - channel_freq_power_BR1_A, - sizeof(channel_freq_power_BR1_A) / sizeof(chan_freq_power_t), - } - , - {0x0e, /* Brazil */ - channel_freq_power_BR2_A, - sizeof(channel_freq_power_BR2_A) / sizeof(chan_freq_power_t), - } - , - {0x0f, /* Russia */ - channel_freq_power_RU_A, - sizeof(channel_freq_power_RU_A) / sizeof(chan_freq_power_t), - } - , - {0x10, /* US FCC */ - channel_freq_power_A, - sizeof(channel_freq_power_A) / sizeof(chan_freq_power_t), - } - , - {0x20, /* CANADA IC */ - channel_freq_power_CAN_A, - sizeof(channel_freq_power_CAN_A) / sizeof(chan_freq_power_t), - } - , - {0x30, /* EU */ - channel_freq_power_EU_A, - sizeof(channel_freq_power_EU_A) / sizeof(chan_freq_power_t), - } - , - {0x32, /* FRANCE */ - channel_freq_power_A, - sizeof(channel_freq_power_A) / sizeof(chan_freq_power_t), - } - , - {0x40, /* JAPAN */ - channel_freq_power_JPN_A, - sizeof(channel_freq_power_JPN_A) / sizeof(chan_freq_power_t), - } - , - {0x41, /* JAPAN */ - channel_freq_power_JPN_A, - sizeof(channel_freq_power_JPN_A) / sizeof(chan_freq_power_t), - } - , - {0x50, /* China */ - channel_freq_power_CN_A, - sizeof(channel_freq_power_CN_A) / sizeof(chan_freq_power_t), - } - , - {0xfe, /* JAPAN */ - channel_freq_power_NULL_A, - sizeof(channel_freq_power_NULL_A) / sizeof(chan_freq_power_t), - } - , - {0xff, /* Special */ - channel_freq_power_JPN_A, - sizeof(channel_freq_power_JPN_A) / sizeof(chan_freq_power_t), - } - , + {0x1, /* Low band (5150-5250 MHz) channels */ + channel_freq_power_low_band, + sizeof(channel_freq_power_low_band) / sizeof(chan_freq_power_t) + } + , + {0x2, /* Lower middle band (5250-5350 MHz) channels */ + channel_freq_power_lower_middle_band, + sizeof(channel_freq_power_lower_middle_band) / + sizeof(chan_freq_power_t) + } + , + {0x3, /* Upper middle band (5470-5725 MHz) channels */ + channel_freq_power_upper_middle_band, + sizeof(channel_freq_power_upper_middle_band) / + sizeof(chan_freq_power_t) + } + , + {0x4, /* High band (5725-5850 MHz) channels */ + channel_freq_power_high_band, + sizeof(channel_freq_power_high_band) / sizeof(chan_freq_power_t) + } + , + {0x5, /* Low band (5150-5250 MHz) and High band + (5725-5850 MHz) channels */ + channel_freq_power_low_high_band, + sizeof(channel_freq_power_low_high_band) / sizeof(chan_freq_power_t) + } + , + {0x06, /* GERMANY */ + channel_freq_power_GRM_A, + sizeof(channel_freq_power_GRM_A) / sizeof(chan_freq_power_t), + } + , + {0x07, /* SPAIN */ + channel_freq_power_SPN0_A, + sizeof(channel_freq_power_SPN0_A) / sizeof(chan_freq_power_t), + } + , + {0x08, /* SPAIN */ + channel_freq_power_SPN1_A, + sizeof(channel_freq_power_SPN1_A) / sizeof(chan_freq_power_t), + } + , + {0x09, /* SPAIN/Austria/Brazil */ + channel_freq_power_SPN2_A, + sizeof(channel_freq_power_SPN2_A) / sizeof(chan_freq_power_t), + } + , + {0x0a, /* SPAIN/Austria */ + channel_freq_power_SPN3_A, + sizeof(channel_freq_power_SPN3_A) / sizeof(chan_freq_power_t), + } + , + {0x0b, /* Austria */ + channel_freq_power_AT_A, + sizeof(channel_freq_power_AT_A) / sizeof(chan_freq_power_t), + } + , + {0x0c, /* Brazil */ + channel_freq_power_BR1_A, + sizeof(channel_freq_power_BR1_A) / sizeof(chan_freq_power_t), + } + , + {0x0e, /* Brazil */ + channel_freq_power_BR2_A, + sizeof(channel_freq_power_BR2_A) / sizeof(chan_freq_power_t), + } + , + {0x0f, /* Russia */ + channel_freq_power_RU_A, + sizeof(channel_freq_power_RU_A) / sizeof(chan_freq_power_t), + } + , + {0x10, /* US FCC */ + channel_freq_power_A, + sizeof(channel_freq_power_A) / sizeof(chan_freq_power_t), + } + , + {0x20, /* CANADA IC */ + channel_freq_power_CAN_A, + sizeof(channel_freq_power_CAN_A) / sizeof(chan_freq_power_t), + } + , + {0x30, /* EU */ + channel_freq_power_EU_A, + sizeof(channel_freq_power_EU_A) / sizeof(chan_freq_power_t), + } + , + {0x32, /* FRANCE */ + channel_freq_power_A, + sizeof(channel_freq_power_A) / sizeof(chan_freq_power_t), + } + , + {0x40, /* JAPAN */ + channel_freq_power_JPN_A, + sizeof(channel_freq_power_JPN_A) / sizeof(chan_freq_power_t), + } + , + {0x41, /* JAPAN */ + channel_freq_power_JPN_A, + sizeof(channel_freq_power_JPN_A) / sizeof(chan_freq_power_t), + } + , + {0x50, /* China */ + channel_freq_power_CN_A, + sizeof(channel_freq_power_CN_A) / sizeof(chan_freq_power_t), + } + , + {0xfe, /* JAPAN */ + channel_freq_power_NULL_A, + sizeof(channel_freq_power_NULL_A) / sizeof(chan_freq_power_t), + } + , + {0xff, /* Special */ + channel_freq_power_JPN_A, + sizeof(channel_freq_power_JPN_A) / sizeof(chan_freq_power_t), + } + , /* Add new region here */ }; @@ -701,7 +703,7 @@ static cfp_table_t cfp_table_A[] = { * The table to keep region code */ t_u16 region_code_index[MRVDRV_MAX_REGION_CODE] = - { 0x10, 0x20, 0x30, 0x32, 0x40, 0x41, 0x50, 0xfe, 0xff }; + { 0x10, 0x20, 0x30, 0x32, 0x40, 0x41, 0x50, 0xfe, 0xff }; /** The table to keep CFP code for BG */ t_u16 cfp_code_index_bg[MRVDRV_MAX_CFP_CODE_BG] = { }; @@ -718,37 +720,37 @@ t_u8 AdhocRates_B[B_SUPPORTED_RATES] = { 0x82, 0x84, 0x8b, 0x96, 0 }; * The rates supported for ad-hoc G mode */ t_u8 AdhocRates_G[G_SUPPORTED_RATES] = - { 0x8c, 0x12, 0x98, 0x24, 0xb0, 0x48, 0x60, 0x6c, 0 }; + { 0x8c, 0x12, 0x98, 0x24, 0xb0, 0x48, 0x60, 0x6c, 0 }; /** * The rates supported for ad-hoc BG mode */ t_u8 AdhocRates_BG[BG_SUPPORTED_RATES] = - { 0x82, 0x84, 0x8b, 0x96, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, - 0x60, 0x6c, 0 + { 0x82, 0x84, 0x8b, 0x96, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, + 0x60, 0x6c, 0 }; /** * The rates supported in A mode for ad-hoc */ t_u8 AdhocRates_A[A_SUPPORTED_RATES] = - { 0x8c, 0x12, 0x98, 0x24, 0xb0, 0x48, 0x60, 0x6c, 0 }; + { 0x8c, 0x12, 0x98, 0x24, 0xb0, 0x48, 0x60, 0x6c, 0 }; /** * The rates supported in A mode (used for BAND_A) */ t_u8 SupportedRates_A[A_SUPPORTED_RATES] = - { 0x0c, 0x12, 0x18, 0x24, 0xb0, 0x48, 0x60, 0x6c, 0 }; + { 0x0c, 0x12, 0x18, 0x24, 0xb0, 0x48, 0x60, 0x6c, 0 }; /** * The rates supported by the card */ t_u16 WlanDataRates[WLAN_SUPPORTED_RATES_EXT] = - { 0x02, 0x04, 0x0B, 0x16, 0x00, 0x0C, 0x12, - 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90, - 0x0D, 0x1A, 0x27, 0x34, 0x4E, 0x68, 0x75, - 0x82, 0x0C, 0x1B, 0x36, 0x51, 0x6C, 0xA2, - 0xD8, 0xF3, 0x10E, 0x00 + { 0x02, 0x04, 0x0B, 0x16, 0x00, 0x0C, 0x12, + 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90, + 0x0D, 0x1A, 0x27, 0x34, 0x4E, 0x68, 0x75, + 0x82, 0x0C, 0x1B, 0x36, 0x51, 0x6C, 0xA2, + 0xD8, 0xF3, 0x10E, 0x00 }; /** @@ -760,14 +762,14 @@ t_u8 SupportedRates_B[B_SUPPORTED_RATES] = { 0x02, 0x04, 0x0b, 0x16, 0 }; * The rates supported in G mode (BAND_G, BAND_G|BAND_GN) */ t_u8 SupportedRates_G[G_SUPPORTED_RATES] = - { 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6c, 0 }; + { 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6c, 0 }; /** * The rates supported in BG mode (BAND_B|BAND_G, BAND_B|BAND_G|BAND_GN) */ t_u8 SupportedRates_BG[BG_SUPPORTED_RATES] = - { 0x02, 0x04, 0x0b, 0x0c, 0x12, 0x16, 0x18, 0x24, 0x30, 0x48, - 0x60, 0x6c, 0 + { 0x02, 0x04, 0x0b, 0x0c, 0x12, 0x16, 0x18, 0x24, 0x30, 0x48, + 0x60, 0x6c, 0 }; /** @@ -778,12 +780,12 @@ t_u8 SupportedRates_N[N_SUPPORTED_RATES] = { 0x02, 0x04, 0 }; /******************************************************** Local Functions ********************************************************/ -/** +/** * @brief Find a character in a string. - * + * * @param pmadapter A pointer to mlan_adapter structure * @param s A pointer to string - * @param c Character to be located + * @param c Character to be located * @param n The length of string * * @return A pointer to the first occurrence of c in string, or MNULL if c is not found. @@ -791,25 +793,25 @@ t_u8 SupportedRates_N[N_SUPPORTED_RATES] = { 0x02, 0x04, 0 }; static void * wlan_memchr(pmlan_adapter pmadapter, void *s, int c, int n) { - const t_u8 *p = (t_u8 *) s; + const t_u8 *p = (t_u8 *) s; - ENTER(); + ENTER(); - while (n--) { - if ((t_u8) c == *p++) { - LEAVE(); - return (void *) (p - 1); - } - } + while (n--) { + if ((t_u8) c == *p++) { + LEAVE(); + return (void *)(p - 1); + } + } - LEAVE(); - return MNULL; + LEAVE(); + return MNULL; } -/** - * @brief This function finds the CFP in +/** + * @brief This function finds the CFP in * cfp_table_BG/A based on region/code and band parameter. - * + * * @param pmadapter A pointer to mlan_adapter structure * @param region The region code * @param band The band @@ -819,60 +821,62 @@ wlan_memchr(pmlan_adapter pmadapter, void *s, int c, int n) */ static chan_freq_power_t * wlan_get_region_cfp_table(pmlan_adapter pmadapter, t_u8 region, t_u8 band, - int *cfp_no) + int *cfp_no) { - t_u32 i; - t_u8 cfp_bg, cfp_a; - - ENTER(); - - cfp_bg = cfp_a = region; - if (!region) { - /* Invalid region code, use CFP code */ - cfp_bg = pmadapter->cfp_code_bg; - cfp_a = pmadapter->cfp_code_a; - } - - if (band & (BAND_B | BAND_G | BAND_GN | BAND_GAC)) { - for (i = 0; i < MLAN_CFP_TABLE_SIZE_BG; i++) { - PRINTM(MINFO, "cfp_table_BG[%d].code=%d\n", i, - cfp_table_BG[i].code); - /* Check if region/code matches for BG bands */ - if (cfp_table_BG[i].code == cfp_bg) { - /* Select by band */ - *cfp_no = cfp_table_BG[i].cfp_no; - LEAVE(); - return cfp_table_BG[i].cfp; - } - } - } - if (band & (BAND_A | BAND_AN | BAND_AAC)) { - for (i = 0; i < MLAN_CFP_TABLE_SIZE_A; i++) { - PRINTM(MINFO, "cfp_table_A[%d].code=%d\n", i, cfp_table_A[i].code); - /* Check if region/code matches for A bands */ - if (cfp_table_A[i].code == cfp_a) { - /* Select by band */ - *cfp_no = cfp_table_A[i].cfp_no; - LEAVE(); - return cfp_table_A[i].cfp; - } - } - } - - if (!region) - PRINTM(MERROR, "Error Band[0x%x] or code[BG:%#x, A:%#x]\n", - band, cfp_bg, cfp_a); - else - PRINTM(MERROR, "Error Band[0x%x] or region[%#x]\n", band, region); - - LEAVE(); - return MNULL; + t_u32 i; + t_u8 cfp_bg, cfp_a; + + ENTER(); + + cfp_bg = cfp_a = region; + if (!region) { + /* Invalid region code, use CFP code */ + cfp_bg = pmadapter->cfp_code_bg; + cfp_a = pmadapter->cfp_code_a; + } + + if (band & (BAND_B | BAND_G | BAND_GN | BAND_GAC)) { + for (i = 0; i < MLAN_CFP_TABLE_SIZE_BG; i++) { + PRINTM(MINFO, "cfp_table_BG[%d].code=%d\n", i, + cfp_table_BG[i].code); + /* Check if region/code matches for BG bands */ + if (cfp_table_BG[i].code == cfp_bg) { + /* Select by band */ + *cfp_no = cfp_table_BG[i].cfp_no; + LEAVE(); + return cfp_table_BG[i].cfp; + } + } + } + if (band & (BAND_A | BAND_AN | BAND_AAC)) { + for (i = 0; i < MLAN_CFP_TABLE_SIZE_A; i++) { + PRINTM(MINFO, "cfp_table_A[%d].code=%d\n", i, + cfp_table_A[i].code); + /* Check if region/code matches for A bands */ + if (cfp_table_A[i].code == cfp_a) { + /* Select by band */ + *cfp_no = cfp_table_A[i].cfp_no; + LEAVE(); + return cfp_table_A[i].cfp; + } + } + } + + if (!region) + PRINTM(MERROR, "Error Band[0x%x] or code[BG:%#x, A:%#x]\n", + band, cfp_bg, cfp_a); + else + PRINTM(MERROR, "Error Band[0x%x] or region[%#x]\n", band, + region); + + LEAVE(); + return MNULL; } -/** +/** * @brief This function copies dynamic CFP elements from one table to another. * Only copy elements where channel numbers match. - * + * * @param pmadapter A pointer to mlan_adapter structure * @param cfp Destination table * @param num_cfp Number of elements in dest table @@ -881,27 +885,27 @@ wlan_get_region_cfp_table(pmlan_adapter pmadapter, t_u8 region, t_u8 band, */ static t_void wlan_cfp_copy_dynamic(pmlan_adapter pmadapter, - chan_freq_power_t * cfp, t_u8 num_cfp, - chan_freq_power_t * cfp_src, t_u8 num_cfp_src) + chan_freq_power_t * cfp, t_u8 num_cfp, + chan_freq_power_t * cfp_src, t_u8 num_cfp_src) { - int i, j; - ENTER(); - - /* first clear dest dynamic entries */ - for (i = 0; i < num_cfp; i++) - memset(pmadapter, &cfp[i].dynamic, 0x00, sizeof(cfp_dyn_t)); - - /* copy dynamic entries from source where channels match */ - if (cfp_src) { - for (i = 0; i < num_cfp; i++) - for (j = 0; j < num_cfp_src; j++) - if (cfp[i].channel == cfp_src[j].channel) { - cfp[i].dynamic = cfp_src[j].dynamic; - break; - } - } - - LEAVE(); + int i, j; + ENTER(); + + /* first clear dest dynamic entries */ + for (i = 0; i < num_cfp; i++) + memset(pmadapter, &cfp[i].dynamic, 0x00, sizeof(cfp_dyn_t)); + + /* copy dynamic entries from source where channels match */ + if (cfp_src) { + for (i = 0; i < num_cfp; i++) + for (j = 0; j < num_cfp_src; j++) + if (cfp[i].channel == cfp_src[j].channel) { + cfp[i].dynamic = cfp_src[j].dynamic; + break; + } + } + + LEAVE(); } /******************************************************** @@ -919,173 +923,184 @@ wlan_cfp_copy_dynamic(pmlan_adapter pmadapter, */ mlan_status wlan_misc_country_2_cfp_table_code(pmlan_adapter pmadapter, t_u8 * country_code, - t_u8 * cfp_bg, t_u8 * cfp_a) + t_u8 * cfp_bg, t_u8 * cfp_a) { - t_u8 i; - - ENTER(); - - /* Look for code in mapping table */ - for (i = 0; i < NELEMENTS(country_code_mapping); i++) { - if (!memcmp(pmadapter, country_code_mapping[i].country_code, - country_code, COUNTRY_CODE_LEN - 1)) { - *cfp_bg = country_code_mapping[i].cfp_code_bg; - *cfp_a = country_code_mapping[i].cfp_code_a; - LEAVE(); - return MLAN_STATUS_SUCCESS; - } - } - - LEAVE(); - return MLAN_STATUS_FAILURE; + t_u8 i; + + ENTER(); + + /* Look for code in mapping table */ + for (i = 0; i < NELEMENTS(country_code_mapping); i++) { + if (!memcmp(pmadapter, country_code_mapping[i].country_code, + country_code, COUNTRY_CODE_LEN - 1)) { + *cfp_bg = country_code_mapping[i].cfp_code_bg; + *cfp_a = country_code_mapping[i].cfp_code_a; + LEAVE(); + return MLAN_STATUS_SUCCESS; + } + } + + LEAVE(); + return MLAN_STATUS_FAILURE; } #ifdef STA_SUPPORT #endif /* STA_SUPPORT */ -/** +/** * @brief Use index to get the data rate - * + * * @param pmadapter A pointer to mlan_adapter structure * @param index The index of data rate * @param tx_rate_info Tx rate info * - * @return Data rate or 0 + * @return Data rate or 0 */ t_u32 wlan_index_to_data_rate(pmlan_adapter pmadapter, t_u8 index, t_u8 tx_rate_info) { #define MCS_NUM_SUPP 16 - t_u16 mcs_rate[4][MCS_NUM_SUPP] = - { {0x1b, 0x36, 0x51, 0x6c, 0xa2, 0xd8, 0xf3, 0x10e, 0x36, 0x6c, 0xa2, - 0xd8, 0x144, 0x1b0, 0x1e6, 0x21c} - , /* LG 40M */ - {0x1e, 0x3c, 0x5a, 0x78, 0xb4, 0xf0, 0x10e, 0x12c, 0x3c, 0x78, 0xb4, 0xf0, - 0x168, 0x1e0, 0x21c, 0x258} - , /* SG 40M */ - {0x0d, 0x1a, 0x27, 0x34, 0x4e, 0x68, 0x75, 0x82, 0x1a, 0x34, 0x4e, 0x68, - 0x9c, 0xd0, 0xea, 0x104} - , /* LG 20M */ - {0x0e, 0x1c, 0x2b, 0x39, 0x56, 0x73, 0x82, 0x90, 0x1c, 0x39, 0x56, 0x73, - 0xad, 0xe7, 0x104, 0x120} - }; /* SG 20M */ + t_u16 mcs_rate[4][MCS_NUM_SUPP] = + { {0x1b, 0x36, 0x51, 0x6c, 0xa2, 0xd8, 0xf3, 0x10e, 0x36, 0x6c, + 0xa2, 0xd8, 0x144, 0x1b0, 0x1e6, 0x21c} + , /* LG 40M */ + {0x1e, 0x3c, 0x5a, 0x78, 0xb4, 0xf0, 0x10e, 0x12c, 0x3c, 0x78, 0xb4, + 0xf0, 0x168, 0x1e0, 0x21c, 0x258} + , /* SG 40M */ + {0x0d, 0x1a, 0x27, 0x34, 0x4e, 0x68, 0x75, 0x82, 0x1a, 0x34, 0x4e, 0x68, + 0x9c, 0xd0, 0xea, 0x104} + , /* LG 20M */ + {0x0e, 0x1c, 0x2b, 0x39, 0x56, 0x73, 0x82, 0x90, 0x1c, 0x39, 0x56, 0x73, + 0xad, 0xe7, 0x104, 0x120} + }; /* SG 20M */ #define MCS_NUM_AC 10 - /* NSS 1. note: the value in the table is 2 multiplier of the actual rate - in other words, it is in the unit of 500 Kbs */ - t_u16 ac_mcs_rate_nss1[8][MCS_NUM_AC] = { - {0x75, 0xEA, 0x15F, 0x1D4, 0x2BE, 0x3A8, 0x41D, 0x492, 0x57C, 0x618} - , /* LG 160M */ - {0x82, 0x104, 0x186, 0x208, 0x30C, 0x410, 0x492, 0x514, 0x618, 0x6C6} - , /* SG 160M */ - {0x3B, 0x75, 0xB0, 0xEA, 0x15F, 0x1D4, 0x20F, 0x249, 0x2BE, 0x30C} - , /* LG 80M */ - {0x41, 0x82, 0xC3, 0x104, 0x186, 0x208, 0x249, 0x28A, 0x30C, 0x363} - , /* SG 80M */ - {0x1B, 0x36, 0x51, 0x6C, 0xA2, 0xD8, 0xF3, 0x10E, 0x144, 0x168} - , /* LG 40M */ - {0x1E, 0x3C, 0x5A, 0x78, 0xB4, 0xF0, 0x10E, 0x12C, 0x168, 0x190} - , /* SG 40M */ - {0xD, 0x1A, 0x27, 0x34, 0x4E, 0x68, 0x75, 0x82, 0x9C, 0x00} - , /* LG 20M */ - {0xF, 0x1D, 0x2C, 0x3A, 0x57, 0x74, 0x82, 0x91, 0xAE, 0x00} - , /* SG 20M */ - }; - /* NSS 2. note: the value in the table is 2 multiplier of the actual rate */ - t_u16 ac_mcs_rate_nss2[8][MCS_NUM_AC] = { - {0xEA, 0x1D4, 0x2BE, 0x3A8, 0x57C, 0x750, 0x83A, 0x924, 0xAF8, 0xC30} - , /* LG 160M */ - {0x104, 0x208, 0x30C, 0x410, 0x618, 0x820, 0x924, 0xA28, 0xC30, 0xD8B} - , /* SG 160M */ - - {0x75, 0xEA, 0x15F, 0x1D4, 0x2BE, 0x3A8, 0x41D, 0x492, 0x57C, 0x618} - , /* LG 80M */ - {0x82, 0x104, 0x186, 0x208, 0x30C, 0x410, 0x492, 0x514, 0x618, 0x6C6} - , /* SG 80M */ - {0x36, 0x6C, 0xA2, 0xD8, 0x144, 0x1B0, 0x1E6, 0x21C, 0x288, 0x2D0} - , /* LG 40M */ - {0x3C, 0x78, 0xB4, 0xF0, 0x168, 0x1E0, 0x21C, 0x258, 0x2D0, 0x320} - , /* SG 40M */ - {0x1A, 0x34, 0x4A, 0x68, 0x9C, 0xD0, 0xEA, 0x104, 0x138, 0x00} - , /* LG 20M */ - {0x1D, 0x3A, 0x57, 0x74, 0xAE, 0xE6, 0x104, 0x121, 0x15B, 0x00} - , /* SG 20M */ - }; - - t_u32 rate = 0; - t_u8 mcs_index = 0; - t_u8 bw = 0; - t_u8 gi = 0; - ENTER(); - - if ((tx_rate_info & 0x3) == MLAN_RATE_FORMAT_VHT) { - /* VHT rate */ - mcs_index = MIN(index & 0xF, 9); - /* 20M: bw=0, 40M: bw=1, 80M: bw=2, 160M: bw=3 */ - bw = (tx_rate_info & 0xC) >> 2; - /* LGI: gi =0, SGI: gi = 1 */ - gi = (tx_rate_info & 0x10) >> 4; - if ((index >> 4) == 1) { - /* NSS = 2 */ - rate = ac_mcs_rate_nss2[2 * (3 - bw) + gi][mcs_index]; - } else - /* NSS = 1 */ - rate = ac_mcs_rate_nss1[2 * (3 - bw) + gi][mcs_index]; - } else if ((tx_rate_info & 0x3) == MLAN_RATE_FORMAT_HT) { - /* HT rate */ - /* 20M: bw=0, 40M: bw=1 */ - bw = (tx_rate_info & 0xC) >> 2; - /* LGI: gi =0, SGI: gi = 1 */ - gi = (tx_rate_info & 0x10) >> 4; - if (index == MLAN_RATE_BITMAP_MCS0) { - if (gi == 1) - rate = 0x0D; /* MCS 32 SGI rate */ - else - rate = 0x0C; /* MCS 32 LGI rate */ - } else if (index < MCS_NUM_SUPP) { - if (bw <= 1) - rate = mcs_rate[2 * (1 - bw) + gi][index]; - else - rate = WlanDataRates[0]; - } else - rate = WlanDataRates[0]; - } else { - /* 11n non HT rates */ - if (index >= WLAN_SUPPORTED_RATES_EXT) - index = 0; - rate = WlanDataRates[index]; - } - LEAVE(); - return rate; + /* NSS 1. note: the value in the table is 2 multiplier of the actual + rate in other words, it is in the unit of 500 Kbs */ + t_u16 ac_mcs_rate_nss1[8][MCS_NUM_AC] = { + {0x75, 0xEA, 0x15F, 0x1D4, 0x2BE, 0x3A8, 0x41D, 0x492, 0x57C, + 0x618} + , /* LG 160M */ + {0x82, 0x104, 0x186, 0x208, 0x30C, 0x410, 0x492, 0x514, 0x618, + 0x6C6} + , /* SG 160M */ + {0x3B, 0x75, 0xB0, 0xEA, 0x15F, 0x1D4, 0x20F, 0x249, 0x2BE, + 0x30C} + , /* LG 80M */ + {0x41, 0x82, 0xC3, 0x104, 0x186, 0x208, 0x249, 0x28A, 0x30C, + 0x363} + , /* SG 80M */ + {0x1B, 0x36, 0x51, 0x6C, 0xA2, 0xD8, 0xF3, 0x10E, 0x144, 0x168} + , /* LG 40M */ + {0x1E, 0x3C, 0x5A, 0x78, 0xB4, 0xF0, 0x10E, 0x12C, 0x168, 0x190} + , /* SG 40M */ + {0xD, 0x1A, 0x27, 0x34, 0x4E, 0x68, 0x75, 0x82, 0x9C, 0x00} + , /* LG 20M */ + {0xF, 0x1D, 0x2C, 0x3A, 0x57, 0x74, 0x82, 0x91, 0xAE, 0x00} + , /* SG 20M */ + }; + /* NSS 2. note: the value in the table is 2 multiplier of the actual + rate */ + t_u16 ac_mcs_rate_nss2[8][MCS_NUM_AC] = { + {0xEA, 0x1D4, 0x2BE, 0x3A8, 0x57C, 0x750, 0x83A, 0x924, 0xAF8, + 0xC30} + , /* LG 160M */ + {0x104, 0x208, 0x30C, 0x410, 0x618, 0x820, 0x924, 0xA28, 0xC30, + 0xD8B} + , /* SG 160M */ + + {0x75, 0xEA, 0x15F, 0x1D4, 0x2BE, 0x3A8, 0x41D, 0x492, 0x57C, + 0x618} + , /* LG 80M */ + {0x82, 0x104, 0x186, 0x208, 0x30C, 0x410, 0x492, 0x514, 0x618, + 0x6C6} + , /* SG 80M */ + {0x36, 0x6C, 0xA2, 0xD8, 0x144, 0x1B0, 0x1E6, 0x21C, 0x288, + 0x2D0} + , /* LG 40M */ + {0x3C, 0x78, 0xB4, 0xF0, 0x168, 0x1E0, 0x21C, 0x258, 0x2D0, + 0x320} + , /* SG 40M */ + {0x1A, 0x34, 0x4A, 0x68, 0x9C, 0xD0, 0xEA, 0x104, 0x138, 0x00} + , /* LG 20M */ + {0x1D, 0x3A, 0x57, 0x74, 0xAE, 0xE6, 0x104, 0x121, 0x15B, 0x00} + , /* SG 20M */ + }; + + t_u32 rate = 0; + t_u8 mcs_index = 0; + t_u8 bw = 0; + t_u8 gi = 0; + ENTER(); + + if ((tx_rate_info & 0x3) == MLAN_RATE_FORMAT_VHT) { + /* VHT rate */ + mcs_index = MIN(index & 0xF, 9); + /* 20M: bw=0, 40M: bw=1, 80M: bw=2, 160M: bw=3 */ + bw = (tx_rate_info & 0xC) >> 2; + /* LGI: gi =0, SGI: gi = 1 */ + gi = (tx_rate_info & 0x10) >> 4; + if ((index >> 4) == 1) { + /* NSS = 2 */ + rate = ac_mcs_rate_nss2[2 * (3 - bw) + gi][mcs_index]; + } else + /* NSS = 1 */ + rate = ac_mcs_rate_nss1[2 * (3 - bw) + gi][mcs_index]; + } else if ((tx_rate_info & 0x3) == MLAN_RATE_FORMAT_HT) { + /* HT rate */ + /* 20M: bw=0, 40M: bw=1 */ + bw = (tx_rate_info & 0xC) >> 2; + /* LGI: gi =0, SGI: gi = 1 */ + gi = (tx_rate_info & 0x10) >> 4; + if (index == MLAN_RATE_BITMAP_MCS0) { + if (gi == 1) + rate = 0x0D; /* MCS 32 SGI rate */ + else + rate = 0x0C; /* MCS 32 LGI rate */ + } else if (index < MCS_NUM_SUPP) { + if (bw <= 1) + rate = mcs_rate[2 * (1 - bw) + gi][index]; + else + rate = WlanDataRates[0]; + } else + rate = WlanDataRates[0]; + } else { + /* 11n non HT rates */ + if (index >= WLAN_SUPPORTED_RATES_EXT) + index = 0; + rate = WlanDataRates[index]; + } + LEAVE(); + return rate; } -/** +/** * @brief Use rate to get the index - * + * * @param pmadapter A pointer to mlan_adapter structure * @param rate Data rate * - * @return Index or 0 + * @return Index or 0 */ t_u8 wlan_data_rate_to_index(pmlan_adapter pmadapter, t_u32 rate) { - t_u16 *ptr; - - ENTER(); - if (rate) - if ((ptr = wlan_memchr(pmadapter, WlanDataRates, (t_u8) rate, - sizeof(WlanDataRates)))) { - LEAVE(); - return (t_u8) (ptr - WlanDataRates); - } - LEAVE(); - return 0; + t_u16 *ptr; + + ENTER(); + if (rate) + if ((ptr = wlan_memchr(pmadapter, WlanDataRates, (t_u8) rate, + sizeof(WlanDataRates)))) { + LEAVE(); + return (t_u8) (ptr - WlanDataRates); + } + LEAVE(); + return 0; } -/** +/** * @brief Get active data rates - * + * * @param pmpriv A pointer to mlan_private structure * @param bss_mode The specified BSS mode (Infra/IBSS) * @param config_bands The specified band configuration @@ -1095,27 +1110,29 @@ wlan_data_rate_to_index(pmlan_adapter pmadapter, t_u32 rate) */ t_u32 wlan_get_active_data_rates(mlan_private * pmpriv, t_u32 bss_mode, - t_u8 config_bands, WLAN_802_11_RATES rates) + t_u8 config_bands, WLAN_802_11_RATES rates) { - t_u32 k; + t_u32 k; - ENTER(); + ENTER(); - if (pmpriv->media_connected != MTRUE) { - k = wlan_get_supported_rates(pmpriv, bss_mode, config_bands, rates); - } else { - k = wlan_copy_rates(rates, 0, pmpriv->curr_bss_params.data_rates, - pmpriv->curr_bss_params.num_of_rates); - } + if (pmpriv->media_connected != MTRUE) { + k = wlan_get_supported_rates(pmpriv, bss_mode, config_bands, + rates); + } else { + k = wlan_copy_rates(rates, 0, + pmpriv->curr_bss_params.data_rates, + pmpriv->curr_bss_params.num_of_rates); + } - LEAVE(); - return k; + LEAVE(); + return k; } #ifdef STA_SUPPORT -/** - * @brief This function search through all the regions cfp table to find the channel, - * if the channel is found then gets the MIN txpower of the channel +/** + * @brief This function search through all the regions cfp table to find the channel, + * if the channel is found then gets the MIN txpower of the channel * present in all the regions. * * @param pmpriv A pointer to mlan_private structure @@ -1126,54 +1143,61 @@ wlan_get_active_data_rates(mlan_private * pmpriv, t_u32 bss_mode, t_u8 wlan_get_txpwr_of_chan_from_cfp(mlan_private * pmpriv, t_u8 channel) { - t_u8 i = 0; - t_u8 j = 0; - t_u8 tx_power = 0; - t_u32 cfp_no; - chan_freq_power_t *cfp = MNULL; - chan_freq_power_t *cfp_a = MNULL; - t_u32 cfp_no_a; - - ENTER(); - - for (i = 0; i < MLAN_CFP_TABLE_SIZE_BG; i++) { - /* Get CFP */ - cfp = cfp_table_BG[i].cfp; - cfp_no = cfp_table_BG[i].cfp_no; - /* Find matching channel and get Tx power */ - for (j = 0; j < cfp_no; j++) { - if ((cfp + j)->channel == channel) { - if (tx_power != 0) - tx_power = MIN(tx_power, (cfp + j)->max_tx_power); - else - tx_power = (t_u8) (cfp + j)->max_tx_power; - break; - } - } - } - - for (i = 0; i < MLAN_CFP_TABLE_SIZE_A; i++) { - /* Get CFP */ - cfp_a = cfp_table_A[i].cfp; - cfp_no_a = cfp_table_A[i].cfp_no; - for (j = 0; j < cfp_no_a; j++) { - if ((cfp_a + j)->channel == channel) { - if (tx_power != 0) - tx_power = MIN(tx_power, (cfp_a + j)->max_tx_power); - else - tx_power = (t_u8) ((cfp_a + j)->max_tx_power); - break; - } - } - } - - LEAVE(); - return tx_power; + t_u8 i = 0; + t_u8 j = 0; + t_u8 tx_power = 0; + t_u32 cfp_no; + chan_freq_power_t *cfp = MNULL; + chan_freq_power_t *cfp_a = MNULL; + t_u32 cfp_no_a; + + ENTER(); + + for (i = 0; i < MLAN_CFP_TABLE_SIZE_BG; i++) { + /* Get CFP */ + cfp = cfp_table_BG[i].cfp; + cfp_no = cfp_table_BG[i].cfp_no; + /* Find matching channel and get Tx power */ + for (j = 0; j < cfp_no; j++) { + if ((cfp + j)->channel == channel) { + if (tx_power != 0) + tx_power = + MIN(tx_power, + (cfp + j)->max_tx_power); + else + tx_power = + (t_u8) (cfp + j)->max_tx_power; + break; + } + } + } + + for (i = 0; i < MLAN_CFP_TABLE_SIZE_A; i++) { + /* Get CFP */ + cfp_a = cfp_table_A[i].cfp; + cfp_no_a = cfp_table_A[i].cfp_no; + for (j = 0; j < cfp_no_a; j++) { + if ((cfp_a + j)->channel == channel) { + if (tx_power != 0) + tx_power = + MIN(tx_power, + (cfp_a + j)->max_tx_power); + else + tx_power = + (t_u8) ((cfp_a + + j)->max_tx_power); + break; + } + } + } + + LEAVE(); + return tx_power; } -/** +/** * @brief Get the channel frequency power info for a specific channel - * + * * @param pmadapter A pointer to mlan_adapter structure * @param band It can be BAND_A, BAND_G or BAND_B * @param channel The channel to search for @@ -1184,77 +1208,77 @@ wlan_get_txpwr_of_chan_from_cfp(mlan_private * pmpriv, t_u8 channel) chan_freq_power_t * wlan_get_cfp_by_band_and_channel(pmlan_adapter pmadapter, - t_u8 band, - t_u16 channel, region_chan_t * region_channel) + t_u8 band, + t_u16 channel, region_chan_t * region_channel) { - region_chan_t *rc; - chan_freq_power_t *cfp = MNULL; - int i, j; - - ENTER(); - - for (j = 0; !cfp && (j < MAX_REGION_CHANNEL_NUM); j++) { - rc = ®ion_channel[j]; - - if (!rc->valid || !rc->pcfp) - continue; - switch (rc->band) { - case BAND_A: - switch (band) { - case BAND_AN: - case BAND_A | BAND_AN: - case BAND_A | BAND_AN | BAND_AAC: - case BAND_A: /* Matching BAND_A */ - break; - - default: - continue; - } - break; - case BAND_B: - case BAND_G: - switch (band) { - case BAND_GN: - case BAND_B | BAND_G | BAND_GN: - case BAND_G | BAND_GN: - case BAND_GN | BAND_GAC: - case BAND_B | BAND_G | BAND_GN | BAND_GAC: - case BAND_G | BAND_GN | BAND_GAC: - case BAND_B | BAND_G: - case BAND_B: /* Matching BAND_B/G */ - case BAND_G: - case 0: - break; - default: - continue; - } - break; - default: - continue; - } - if (channel == FIRST_VALID_CHANNEL) - cfp = &rc->pcfp[0]; - else { - for (i = 0; i < rc->num_cfp; i++) { - if (rc->pcfp[i].channel == channel) { - cfp = &rc->pcfp[i]; - break; - } - } - } - } - - if (!cfp && channel) - PRINTM(MCMND, "wlan_get_cfp_by_band_and_channel(): cannot find " - "cfp by band %d & channel %d\n", band, channel); - - LEAVE(); - return cfp; + region_chan_t *rc; + chan_freq_power_t *cfp = MNULL; + int i, j; + + ENTER(); + + for (j = 0; !cfp && (j < MAX_REGION_CHANNEL_NUM); j++) { + rc = ®ion_channel[j]; + + if (!rc->valid || !rc->pcfp) + continue; + switch (rc->band) { + case BAND_A: + switch (band) { + case BAND_AN: + case BAND_A | BAND_AN: + case BAND_A | BAND_AN | BAND_AAC: + case BAND_A: /* Matching BAND_A */ + break; + + default: + continue; + } + break; + case BAND_B: + case BAND_G: + switch (band) { + case BAND_GN: + case BAND_B | BAND_G | BAND_GN: + case BAND_G | BAND_GN: + case BAND_GN | BAND_GAC: + case BAND_B | BAND_G | BAND_GN | BAND_GAC: + case BAND_G | BAND_GN | BAND_GAC: + case BAND_B | BAND_G: + case BAND_B: /* Matching BAND_B/G */ + case BAND_G: + case 0: + break; + default: + continue; + } + break; + default: + continue; + } + if (channel == FIRST_VALID_CHANNEL) + cfp = &rc->pcfp[0]; + else { + for (i = 0; i < rc->num_cfp; i++) { + if (rc->pcfp[i].channel == channel) { + cfp = &rc->pcfp[i]; + break; + } + } + } + } + + if (!cfp && channel) + PRINTM(MCMND, "wlan_get_cfp_by_band_and_channel(): cannot find " + "cfp by band %d & channel %d\n", band, channel); + + LEAVE(); + return cfp; } -/** +/** * @brief Find the channel frequency power info for a specific channel - * + * * @param pmadapter A pointer to mlan_adapter structure * @param band It can be BAND_A, BAND_G or BAND_B * @param channel The channel to search for @@ -1263,28 +1287,30 @@ wlan_get_cfp_by_band_and_channel(pmlan_adapter pmadapter, */ chan_freq_power_t * wlan_find_cfp_by_band_and_channel(mlan_adapter * pmadapter, - t_u8 band, t_u16 channel) + t_u8 band, t_u16 channel) { - chan_freq_power_t *cfp = MNULL; - - ENTER(); - - /* Any station(s) with 11D enabled */ - if (wlan_count_priv_cond(pmadapter, wlan_11d_is_enabled, - wlan_is_station) > 0) - cfp = wlan_get_cfp_by_band_and_channel(pmadapter, band, channel, - pmadapter->universal_channel); - else - cfp = wlan_get_cfp_by_band_and_channel(pmadapter, band, channel, - pmadapter->region_channel); - - LEAVE(); - return cfp; + chan_freq_power_t *cfp = MNULL; + + ENTER(); + + /* Any station(s) with 11D enabled */ + if (wlan_count_priv_cond(pmadapter, wlan_11d_is_enabled, + wlan_is_station) > 0) + cfp = wlan_get_cfp_by_band_and_channel(pmadapter, band, channel, + pmadapter-> + universal_channel); + else + cfp = wlan_get_cfp_by_band_and_channel(pmadapter, band, channel, + pmadapter-> + region_channel); + + LEAVE(); + return cfp; } -/** +/** * @brief Find the channel frequency power info for a specific frequency - * + * * @param pmadapter A pointer to mlan_adapter structure * @param band It can be BAND_A, BAND_G or BAND_B * @param freq The frequency to search for @@ -1294,75 +1320,76 @@ wlan_find_cfp_by_band_and_channel(mlan_adapter * pmadapter, chan_freq_power_t * wlan_find_cfp_by_band_and_freq(mlan_adapter * pmadapter, t_u8 band, t_u32 freq) { - chan_freq_power_t *cfp = MNULL; - region_chan_t *rc; - int i, j; - - ENTER(); - - for (j = 0; !cfp && (j < MAX_REGION_CHANNEL_NUM); j++) { - rc = &pmadapter->region_channel[j]; - - /* Any station(s) with 11D enabled */ - if (wlan_count_priv_cond(pmadapter, wlan_11d_is_enabled, - wlan_is_station) > 0) - rc = &pmadapter->universal_channel[j]; - - if (!rc->valid || !rc->pcfp) - continue; - switch (rc->band) { - case BAND_A: - switch (band) { - case BAND_AN: - case BAND_A | BAND_AN: - case BAND_A | BAND_AN | BAND_AAC: - case BAND_A: /* Matching BAND_A */ - break; - default: - continue; - } - break; - case BAND_B: - case BAND_G: - switch (band) { - case BAND_GN: - case BAND_B | BAND_G | BAND_GN: - case BAND_G | BAND_GN: - case BAND_GN | BAND_GAC: - case BAND_B | BAND_G | BAND_GN | BAND_GAC: - case BAND_G | BAND_GN | BAND_GAC: - case BAND_B | BAND_G: - case BAND_B: - case BAND_G: - case 0: - break; - default: - continue; - } - break; - default: - continue; - } - for (i = 0; i < rc->num_cfp; i++) { - if (rc->pcfp[i].freq == freq) { - cfp = &rc->pcfp[i]; - break; - } - } - } - - if (!cfp && freq) - PRINTM(MERROR, "wlan_find_cfp_by_band_and_freq(): cannot find cfp by " - "band %d & freq %d\n", band, freq); - - LEAVE(); - return cfp; + chan_freq_power_t *cfp = MNULL; + region_chan_t *rc; + int i, j; + + ENTER(); + + for (j = 0; !cfp && (j < MAX_REGION_CHANNEL_NUM); j++) { + rc = &pmadapter->region_channel[j]; + + /* Any station(s) with 11D enabled */ + if (wlan_count_priv_cond(pmadapter, wlan_11d_is_enabled, + wlan_is_station) > 0) + rc = &pmadapter->universal_channel[j]; + + if (!rc->valid || !rc->pcfp) + continue; + switch (rc->band) { + case BAND_A: + switch (band) { + case BAND_AN: + case BAND_A | BAND_AN: + case BAND_A | BAND_AN | BAND_AAC: + case BAND_A: /* Matching BAND_A */ + break; + default: + continue; + } + break; + case BAND_B: + case BAND_G: + switch (band) { + case BAND_GN: + case BAND_B | BAND_G | BAND_GN: + case BAND_G | BAND_GN: + case BAND_GN | BAND_GAC: + case BAND_B | BAND_G | BAND_GN | BAND_GAC: + case BAND_G | BAND_GN | BAND_GAC: + case BAND_B | BAND_G: + case BAND_B: + case BAND_G: + case 0: + break; + default: + continue; + } + break; + default: + continue; + } + for (i = 0; i < rc->num_cfp; i++) { + if (rc->pcfp[i].freq == freq) { + cfp = &rc->pcfp[i]; + break; + } + } + } + + if (!cfp && freq) + PRINTM(MERROR, + "wlan_find_cfp_by_band_and_freq(): cannot find cfp by " + "band %d & freq %d\n", band, freq); + + LEAVE(); + return cfp; } #endif /* STA_SUPPORT */ -/** +/** * @brief Check if Rate Auto - * + * * @param pmpriv A pointer to mlan_private structure * * @return MTRUE or MFALSE @@ -1370,25 +1397,25 @@ wlan_find_cfp_by_band_and_freq(mlan_adapter * pmadapter, t_u8 band, t_u32 freq) t_u8 wlan_is_rate_auto(mlan_private * pmpriv) { - t_u32 i; - int rate_num = 0; + t_u32 i; + int rate_num = 0; - ENTER(); + ENTER(); - for (i = 0; i < NELEMENTS(pmpriv->bitmap_rates); i++) - if (pmpriv->bitmap_rates[i]) - rate_num++; + for (i = 0; i < NELEMENTS(pmpriv->bitmap_rates); i++) + if (pmpriv->bitmap_rates[i]) + rate_num++; - LEAVE(); - if (rate_num > 1) - return MTRUE; - else - return MFALSE; + LEAVE(); + if (rate_num > 1) + return MTRUE; + else + return MFALSE; } -/** +/** * @brief Covert Rate Bitmap to Rate index - * + * * @param pmadapter Pointer to mlan_adapter structure * @param rate_bitmap Pointer to rate bitmap * @param size Size of the bitmap array @@ -1398,24 +1425,24 @@ wlan_is_rate_auto(mlan_private * pmpriv) int wlan_get_rate_index(pmlan_adapter pmadapter, t_u16 * rate_bitmap, int size) { - int i; + int i; - ENTER(); + ENTER(); - for (i = 0; i < size * 8; i++) { - if (rate_bitmap[i / 16] & (1 << (i % 16))) { - LEAVE(); - return i; - } - } + for (i = 0; i < size * 8; i++) { + if (rate_bitmap[i / 16] & (1 << (i % 16))) { + LEAVE(); + return i; + } + } - LEAVE(); - return -1; + LEAVE(); + return -1; } -/** +/** * @brief Get supported data rates - * + * * @param pmpriv A pointer to mlan_private structure * @param bss_mode The specified BSS mode (Infra/IBSS) * @param config_bands The specified band configuration @@ -1425,105 +1452,115 @@ wlan_get_rate_index(pmlan_adapter pmadapter, t_u16 * rate_bitmap, int size) */ t_u32 wlan_get_supported_rates(mlan_private * pmpriv, t_u32 bss_mode, - t_u8 config_bands, WLAN_802_11_RATES rates) + t_u8 config_bands, WLAN_802_11_RATES rates) { - t_u32 k = 0; - - ENTER(); - - if (bss_mode == MLAN_BSS_MODE_INFRA) { - /* Infra. mode */ - switch (config_bands) { - case BAND_B: - PRINTM(MINFO, "Infra Band=%d SupportedRates_B\n", config_bands); - k = wlan_copy_rates(rates, k, SupportedRates_B, - sizeof(SupportedRates_B)); - break; - case BAND_G: - case BAND_G | BAND_GN: - case BAND_G | BAND_GN | BAND_GAC: - PRINTM(MINFO, "Infra band=%d SupportedRates_G\n", config_bands); - k = wlan_copy_rates(rates, k, SupportedRates_G, - sizeof(SupportedRates_G)); - break; - case BAND_B | BAND_G: - case BAND_A | BAND_B | BAND_G: - case BAND_A | BAND_B: - case BAND_A | BAND_B | BAND_G | BAND_GN | BAND_AN: - case BAND_A | BAND_B | BAND_G | BAND_GN | BAND_AN | BAND_AAC: - case BAND_A | BAND_B | BAND_G | BAND_GN | BAND_AN | BAND_AAC | BAND_GAC: - case BAND_B | BAND_G | BAND_GN: - case BAND_B | BAND_G | BAND_GN | BAND_GAC: - PRINTM(MINFO, "Infra band=%d SupportedRates_BG\n", config_bands); + t_u32 k = 0; + + ENTER(); + + if (bss_mode == MLAN_BSS_MODE_INFRA) { + /* Infra. mode */ + switch (config_bands) { + case BAND_B: + PRINTM(MINFO, "Infra Band=%d SupportedRates_B\n", + config_bands); + k = wlan_copy_rates(rates, k, SupportedRates_B, + sizeof(SupportedRates_B)); + break; + case BAND_G: + case BAND_G | BAND_GN: + case BAND_G | BAND_GN | BAND_GAC: + PRINTM(MINFO, "Infra band=%d SupportedRates_G\n", + config_bands); + k = wlan_copy_rates(rates, k, SupportedRates_G, + sizeof(SupportedRates_G)); + break; + case BAND_B | BAND_G: + case BAND_A | BAND_B | BAND_G: + case BAND_A | BAND_B: + case BAND_A | BAND_B | BAND_G | BAND_GN | BAND_AN: + case BAND_A | BAND_B | BAND_G | BAND_GN | BAND_AN | BAND_AAC: + case BAND_A | BAND_B | BAND_G | BAND_GN | BAND_AN | BAND_AAC | BAND_GAC: + case BAND_B | BAND_G | BAND_GN: + case BAND_B | BAND_G | BAND_GN | BAND_GAC: + PRINTM(MINFO, "Infra band=%d SupportedRates_BG\n", + config_bands); #ifdef WIFI_DIRECT_SUPPORT - if (pmpriv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT) - k = wlan_copy_rates(rates, k, SupportedRates_G, - sizeof(SupportedRates_G)); - else - k = wlan_copy_rates(rates, k, SupportedRates_BG, - sizeof(SupportedRates_BG)); + if (pmpriv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT) + k = wlan_copy_rates(rates, k, SupportedRates_G, + sizeof(SupportedRates_G)); + else + k = wlan_copy_rates(rates, k, SupportedRates_BG, + sizeof(SupportedRates_BG)); #else - k = wlan_copy_rates(rates, k, SupportedRates_BG, - sizeof(SupportedRates_BG)); + k = wlan_copy_rates(rates, k, SupportedRates_BG, + sizeof(SupportedRates_BG)); #endif - break; - case BAND_A: - case BAND_A | BAND_G: - PRINTM(MINFO, "Infra band=%d SupportedRates_A\n", config_bands); - k = wlan_copy_rates(rates, k, SupportedRates_A, - sizeof(SupportedRates_A)); - break; - case BAND_AN: - case BAND_A | BAND_AN: - case BAND_A | BAND_G | BAND_AN | BAND_GN: - case BAND_A | BAND_G | BAND_AN | BAND_GN | BAND_AAC: - PRINTM(MINFO, "Infra band=%d SupportedRates_A\n", config_bands); - k = wlan_copy_rates(rates, k, SupportedRates_A, - sizeof(SupportedRates_A)); - break; - case BAND_GN: - case BAND_GN | BAND_GAC: - PRINTM(MINFO, "Infra band=%d SupportedRates_N\n", config_bands); - k = wlan_copy_rates(rates, k, SupportedRates_N, - sizeof(SupportedRates_N)); - break; - } - } else { - /* Ad-hoc mode */ - switch (config_bands) { - case BAND_B: - PRINTM(MINFO, "Band: Adhoc B\n"); - k = wlan_copy_rates(rates, k, AdhocRates_B, sizeof(AdhocRates_B)); - break; - case BAND_G: - case BAND_G | BAND_GN: - case BAND_G | BAND_GN | BAND_GAC: - PRINTM(MINFO, "Band: Adhoc G only\n"); - k = wlan_copy_rates(rates, k, AdhocRates_G, sizeof(AdhocRates_G)); - break; - case BAND_B | BAND_G: - case BAND_B | BAND_G | BAND_GN: - case BAND_B | BAND_G | BAND_GN | BAND_GAC: - PRINTM(MINFO, "Band: Adhoc BG\n"); - k = wlan_copy_rates(rates, k, AdhocRates_BG, sizeof(AdhocRates_BG)); - break; - case BAND_A: - case BAND_AN: - case BAND_A | BAND_AN: - case BAND_A | BAND_AN | BAND_AAC: - PRINTM(MINFO, "Band: Adhoc A\n"); - k = wlan_copy_rates(rates, k, AdhocRates_A, sizeof(AdhocRates_A)); - break; - } - } - - LEAVE(); - return k; + break; + case BAND_A: + case BAND_A | BAND_G: + PRINTM(MINFO, "Infra band=%d SupportedRates_A\n", + config_bands); + k = wlan_copy_rates(rates, k, SupportedRates_A, + sizeof(SupportedRates_A)); + break; + case BAND_AN: + case BAND_A | BAND_AN: + case BAND_A | BAND_G | BAND_AN | BAND_GN: + case BAND_A | BAND_G | BAND_AN | BAND_GN | BAND_AAC: + PRINTM(MINFO, "Infra band=%d SupportedRates_A\n", + config_bands); + k = wlan_copy_rates(rates, k, SupportedRates_A, + sizeof(SupportedRates_A)); + break; + case BAND_GN: + case BAND_GN | BAND_GAC: + PRINTM(MINFO, "Infra band=%d SupportedRates_N\n", + config_bands); + k = wlan_copy_rates(rates, k, SupportedRates_N, + sizeof(SupportedRates_N)); + break; + } + } else { + /* Ad-hoc mode */ + switch (config_bands) { + case BAND_B: + PRINTM(MINFO, "Band: Adhoc B\n"); + k = wlan_copy_rates(rates, k, AdhocRates_B, + sizeof(AdhocRates_B)); + break; + case BAND_G: + case BAND_G | BAND_GN: + case BAND_G | BAND_GN | BAND_GAC: + PRINTM(MINFO, "Band: Adhoc G only\n"); + k = wlan_copy_rates(rates, k, AdhocRates_G, + sizeof(AdhocRates_G)); + break; + case BAND_B | BAND_G: + case BAND_B | BAND_G | BAND_GN: + case BAND_B | BAND_G | BAND_GN | BAND_GAC: + PRINTM(MINFO, "Band: Adhoc BG\n"); + k = wlan_copy_rates(rates, k, AdhocRates_BG, + sizeof(AdhocRates_BG)); + break; + case BAND_A: + case BAND_AN: + case BAND_A | BAND_AN: + case BAND_A | BAND_AN | BAND_AAC: + PRINTM(MINFO, "Band: Adhoc A\n"); + k = wlan_copy_rates(rates, k, AdhocRates_A, + sizeof(AdhocRates_A)); + break; + } + } + + LEAVE(); + return k; } -/** - * @brief This function sets region table. - * +/** + * @brief This function sets region table. + * * @param pmpriv A pointer to mlan_private structure * @param region The region code * @param band The band @@ -1533,79 +1570,82 @@ wlan_get_supported_rates(mlan_private * pmpriv, t_u32 bss_mode, mlan_status wlan_set_regiontable(mlan_private * pmpriv, t_u8 region, t_u8 band) { - mlan_adapter *pmadapter = pmpriv->adapter; - int i = 0, j; - chan_freq_power_t *cfp; - int cfp_no; - region_chan_t region_chan_old[MAX_REGION_CHANNEL_NUM]; - - ENTER(); - - memcpy(pmadapter, region_chan_old, pmadapter->region_channel, - sizeof(pmadapter->region_channel)); - memset(pmadapter, pmadapter->region_channel, 0, - sizeof(pmadapter->region_channel)); - - if (band & (BAND_B | BAND_G | BAND_GN)) { - cfp = - wlan_get_region_cfp_table(pmadapter, region, - BAND_G | BAND_B | BAND_GN, &cfp_no); - if (cfp) { - pmadapter->region_channel[i].num_cfp = (t_u8) cfp_no; - pmadapter->region_channel[i].pcfp = cfp; - } else { - PRINTM(MERROR, "wrong region code %#x in Band B-G\n", region); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - pmadapter->region_channel[i].valid = MTRUE; - pmadapter->region_channel[i].region = region; - if (band & BAND_GN) - pmadapter->region_channel[i].band = BAND_G; - else - pmadapter->region_channel[i].band = - (band & BAND_G) ? BAND_G : BAND_B; - - for (j = 0; j < MAX_REGION_CHANNEL_NUM; j++) { - if (region_chan_old[j].band & (BAND_B | BAND_G)) - break; - } - if ((j < MAX_REGION_CHANNEL_NUM) && region_chan_old[j].valid) - wlan_cfp_copy_dynamic(pmadapter, cfp, cfp_no, - region_chan_old[j].pcfp, - region_chan_old[j].num_cfp); - else - wlan_cfp_copy_dynamic(pmadapter, cfp, cfp_no, MNULL, 0); - - i++; - } - if (band & (BAND_A | BAND_AN | BAND_AAC)) { - cfp = wlan_get_region_cfp_table(pmadapter, region, BAND_A, &cfp_no); - if (cfp) { - pmadapter->region_channel[i].num_cfp = (t_u8) cfp_no; - pmadapter->region_channel[i].pcfp = cfp; - } else { - PRINTM(MERROR, "wrong region code %#x in Band A\n", region); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - pmadapter->region_channel[i].valid = MTRUE; - pmadapter->region_channel[i].region = region; - pmadapter->region_channel[i].band = BAND_A; - - for (j = 0; j < MAX_REGION_CHANNEL_NUM; j++) { - if (region_chan_old[j].band & BAND_A) - break; - } - if ((j < MAX_REGION_CHANNEL_NUM) && region_chan_old[j].valid) - wlan_cfp_copy_dynamic(pmadapter, cfp, cfp_no, - region_chan_old[j].pcfp, - region_chan_old[j].num_cfp); - else - wlan_cfp_copy_dynamic(pmadapter, cfp, cfp_no, MNULL, 0); - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + int i = 0, j; + chan_freq_power_t *cfp; + int cfp_no; + region_chan_t region_chan_old[MAX_REGION_CHANNEL_NUM]; + + ENTER(); + + memcpy(pmadapter, region_chan_old, pmadapter->region_channel, + sizeof(pmadapter->region_channel)); + memset(pmadapter, pmadapter->region_channel, 0, + sizeof(pmadapter->region_channel)); + + if (band & (BAND_B | BAND_G | BAND_GN)) { + cfp = wlan_get_region_cfp_table(pmadapter, region, + BAND_G | BAND_B | BAND_GN, + &cfp_no); + if (cfp) { + pmadapter->region_channel[i].num_cfp = (t_u8) cfp_no; + pmadapter->region_channel[i].pcfp = cfp; + } else { + PRINTM(MERROR, "wrong region code %#x in Band B-G\n", + region); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + pmadapter->region_channel[i].valid = MTRUE; + pmadapter->region_channel[i].region = region; + if (band & BAND_GN) + pmadapter->region_channel[i].band = BAND_G; + else + pmadapter->region_channel[i].band = + (band & BAND_G) ? BAND_G : BAND_B; + + for (j = 0; j < MAX_REGION_CHANNEL_NUM; j++) { + if (region_chan_old[j].band & (BAND_B | BAND_G)) + break; + } + if ((j < MAX_REGION_CHANNEL_NUM) && region_chan_old[j].valid) + wlan_cfp_copy_dynamic(pmadapter, cfp, cfp_no, + region_chan_old[j].pcfp, + region_chan_old[j].num_cfp); + else + wlan_cfp_copy_dynamic(pmadapter, cfp, cfp_no, MNULL, 0); + + i++; + } + if (band & (BAND_A | BAND_AN | BAND_AAC)) { + cfp = wlan_get_region_cfp_table(pmadapter, region, BAND_A, + &cfp_no); + if (cfp) { + pmadapter->region_channel[i].num_cfp = (t_u8) cfp_no; + pmadapter->region_channel[i].pcfp = cfp; + } else { + PRINTM(MERROR, "wrong region code %#x in Band A\n", + region); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + pmadapter->region_channel[i].valid = MTRUE; + pmadapter->region_channel[i].region = region; + pmadapter->region_channel[i].band = BAND_A; + + for (j = 0; j < MAX_REGION_CHANNEL_NUM; j++) { + if (region_chan_old[j].band & BAND_A) + break; + } + if ((j < MAX_REGION_CHANNEL_NUM) && region_chan_old[j].valid) + wlan_cfp_copy_dynamic(pmadapter, cfp, cfp_no, + region_chan_old[j].pcfp, + region_chan_old[j].num_cfp); + else + wlan_cfp_copy_dynamic(pmadapter, cfp, cfp_no, MNULL, 0); + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -1614,53 +1654,53 @@ wlan_set_regiontable(mlan_private * pmpriv, t_u8 region, t_u8 band) * @param priv Private driver information structure * @param chnl Channel to determine radar detection requirements * - * @return + * @return * - MTRUE if radar detection is required * - MFALSE otherwise */ t_bool wlan_get_cfp_radar_detect(mlan_private * priv, t_u8 chnl) { - int i, j; - t_bool required = MFALSE; - chan_freq_power_t *pcfp = MNULL; - - ENTER(); - - /* get the cfp table first */ - for (i = 0; i < MAX_REGION_CHANNEL_NUM; i++) { - if (priv->adapter->region_channel[i].band == BAND_A) { - pcfp = priv->adapter->region_channel[i].pcfp; - break; - } - } - - if (!pcfp) { - /* This means operation in BAND-A is not support, we can just return - false here, it's harmless */ - goto done; - } - - /* get the radar detection requirements according to chan num */ - for (j = 0; j < priv->adapter->region_channel[i].num_cfp; j++) { - if (pcfp[j].channel == chnl) { - required = pcfp[j].passive_scan_or_radar_detect; - break; - } - } - - done: - LEAVE(); - return required; + int i, j; + t_bool required = MFALSE; + chan_freq_power_t *pcfp = MNULL; + + ENTER(); + + /* get the cfp table first */ + for (i = 0; i < MAX_REGION_CHANNEL_NUM; i++) { + if (priv->adapter->region_channel[i].band == BAND_A) { + pcfp = priv->adapter->region_channel[i].pcfp; + break; + } + } + + if (!pcfp) { + /* This means operation in BAND-A is not support, we can just + return false here, it's harmless */ + goto done; + } + + /* get the radar detection requirements according to chan num */ + for (j = 0; j < priv->adapter->region_channel[i].num_cfp; j++) { + if (pcfp[j].channel == chnl) { + required = pcfp[j].passive_scan_or_radar_detect; + break; + } + } + +done: + LEAVE(); + return required; } /** * @brief Get if scan type is passive or not on a certain channel for b/g band - * + * * @param priv Private driver information structure * @param chnl Channel to determine scan type - * - * @return + * + * @return * - MTRUE if scan type is passive * - MFALSE otherwise */ @@ -1668,47 +1708,47 @@ wlan_get_cfp_radar_detect(mlan_private * priv, t_u8 chnl) t_bool wlan_bg_scan_type_is_passive(mlan_private * priv, t_u8 chnl) { - int i, j; - t_bool passive = MFALSE; - chan_freq_power_t *pcfp = MNULL; - - ENTER(); - - /* get the cfp table first */ - for (i = 0; i < MAX_REGION_CHANNEL_NUM; i++) { - if (priv->adapter->region_channel[i].band & (BAND_B | BAND_G)) { - pcfp = priv->adapter->region_channel[i].pcfp; - break; - } - } - - if (!pcfp) { - /* This means operation in BAND-B or BAND_G is not support, we can - just return false here */ - goto done; - } - - /* get the bg scan type according to chan num */ - for (j = 0; j < priv->adapter->region_channel[i].num_cfp; j++) { - if (pcfp[j].channel == chnl) { - passive = pcfp[j].passive_scan_or_radar_detect; - break; - } - } - - done: - LEAVE(); - return passive; + int i, j; + t_bool passive = MFALSE; + chan_freq_power_t *pcfp = MNULL; + + ENTER(); + + /* get the cfp table first */ + for (i = 0; i < MAX_REGION_CHANNEL_NUM; i++) { + if (priv->adapter->region_channel[i].band & (BAND_B | BAND_G)) { + pcfp = priv->adapter->region_channel[i].pcfp; + break; + } + } + + if (!pcfp) { + /* This means operation in BAND-B or BAND_G is not support, we + can just return false here */ + goto done; + } + + /* get the bg scan type according to chan num */ + for (j = 0; j < priv->adapter->region_channel[i].num_cfp; j++) { + if (pcfp[j].channel == chnl) { + passive = pcfp[j].passive_scan_or_radar_detect; + break; + } + } + +done: + LEAVE(); + return passive; } /** * @brief Get if a channel is blacklisted or not - * + * * @param priv Private driver information structure * @param band Band to check * @param chan Channel to check - * - * @return + * + * @return * - MTRUE if channel is blacklisted * - MFALSE otherwise */ @@ -1716,43 +1756,43 @@ wlan_bg_scan_type_is_passive(mlan_private * priv, t_u8 chnl) t_bool wlan_is_chan_blacklisted(mlan_private * priv, t_u8 band, t_u8 chan) { - int i, j; - t_bool blacklist = MFALSE; - chan_freq_power_t *pcfp = MNULL; - - ENTER(); - - /* get the cfp table first */ - for (i = 0; i < MAX_REGION_CHANNEL_NUM; i++) { - if (priv->adapter->region_channel[i].band & band) { - pcfp = priv->adapter->region_channel[i].pcfp; - break; - } - } - - if (pcfp) { - /* check table according to chan num */ - for (j = 0; j < priv->adapter->region_channel[i].num_cfp; j++) { - if (pcfp[j].channel == chan) { - blacklist = pcfp[j].dynamic.blacklist; - break; - } - } - } - - LEAVE(); - return blacklist; + int i, j; + t_bool blacklist = MFALSE; + chan_freq_power_t *pcfp = MNULL; + + ENTER(); + + /* get the cfp table first */ + for (i = 0; i < MAX_REGION_CHANNEL_NUM; i++) { + if (priv->adapter->region_channel[i].band & band) { + pcfp = priv->adapter->region_channel[i].pcfp; + break; + } + } + + if (pcfp) { + /* check table according to chan num */ + for (j = 0; j < priv->adapter->region_channel[i].num_cfp; j++) { + if (pcfp[j].channel == chan) { + blacklist = pcfp[j].dynamic.blacklist; + break; + } + } + } + + LEAVE(); + return blacklist; } /** * @brief Set a channel as blacklisted or not - * + * * @param priv Private driver information structure * @param band Band to check * @param chan Channel to check * @param bl Blacklist if MTRUE - * - * @return + * + * @return * - MTRUE if channel setting is updated * - MFALSE otherwise */ @@ -1760,31 +1800,31 @@ wlan_is_chan_blacklisted(mlan_private * priv, t_u8 band, t_u8 chan) t_bool wlan_set_chan_blacklist(mlan_private * priv, t_u8 band, t_u8 chan, t_bool bl) { - int i, j; - t_bool set_bl = MFALSE; - chan_freq_power_t *pcfp = MNULL; - - ENTER(); - - /* get the cfp table first */ - for (i = 0; i < MAX_REGION_CHANNEL_NUM; i++) { - if (priv->adapter->region_channel[i].band & band) { - pcfp = priv->adapter->region_channel[i].pcfp; - break; - } - } - - if (pcfp) { - /* check table according to chan num */ - for (j = 0; j < priv->adapter->region_channel[i].num_cfp; j++) { - if (pcfp[j].channel == chan) { - pcfp[j].dynamic.blacklist = bl; - set_bl = MTRUE; - break; - } - } - } - - LEAVE(); - return set_bl; + int i, j; + t_bool set_bl = MFALSE; + chan_freq_power_t *pcfp = MNULL; + + ENTER(); + + /* get the cfp table first */ + for (i = 0; i < MAX_REGION_CHANNEL_NUM; i++) { + if (priv->adapter->region_channel[i].band & band) { + pcfp = priv->adapter->region_channel[i].pcfp; + break; + } + } + + if (pcfp) { + /* check table according to chan num */ + for (j = 0; j < priv->adapter->region_channel[i].num_cfp; j++) { + if (pcfp[j].channel == chan) { + pcfp[j].dynamic.blacklist = bl; + set_bl = MTRUE; + break; + } + } + } + + LEAVE(); + return set_bl; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_cmdevt.c b/drivers/net/wireless/sd8897/mlan/mlan_cmdevt.c index d5e5a59b0cfd..ce3ebc02e596 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_cmdevt.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_cmdevt.c @@ -3,7 +3,7 @@ * * @brief This file contains the handling of CMD/EVENT in MLAN * - * Copyright (C) 2009-2011, Marvell International Ltd. + * Copyright (C) 2009-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -12,7 +12,7 @@ * is available by writing to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * + * * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE * ARE EXPRESSLY DISCLAIMED. The License provides additional details about @@ -57,30 +57,31 @@ Change Log: void wlan_check_scan_queue(IN pmlan_adapter pmadapter) { - cmd_ctrl_node *pcmd_node = MNULL; - t_u16 num = 0; - - if (! - (pcmd_node = - (cmd_ctrl_node *) util_peek_list(pmadapter->pmoal_handle, - &pmadapter->scan_pending_q, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock))) { - PRINTM(MERROR, "No pending scan command\n"); - return; - } - while (pcmd_node != (cmd_ctrl_node *) & pmadapter->scan_pending_q) { - num++; - pcmd_node = pcmd_node->pnext; - } - PRINTM(MERROR, "num_pending_scan=%d\n", num); + cmd_ctrl_node *pcmd_node = MNULL; + t_u16 num = 0; + + if (! + (pcmd_node = + (cmd_ctrl_node *) util_peek_list(pmadapter->pmoal_handle, + &pmadapter->scan_pending_q, + pmadapter->callbacks. + moal_spin_lock, + pmadapter->callbacks. + moal_spin_unlock))) { + PRINTM(MERROR, "No pending scan command\n"); + return; + } + while (pcmd_node != (cmd_ctrl_node *) & pmadapter->scan_pending_q) { + num++; + pcmd_node = pcmd_node->pnext; + } + PRINTM(MERROR, "num_pending_scan=%d\n", num); } #endif /** * @brief This function will dump the pending commands id - * + * * @param pmadapter A pointer to mlan_adapter * * @return N/A @@ -88,189 +89,203 @@ wlan_check_scan_queue(IN pmlan_adapter pmadapter) static void wlan_dump_pending_commands(pmlan_adapter pmadapter) { - cmd_ctrl_node *pcmd_node = MNULL; - HostCmd_DS_COMMAND *pcmd; - - ENTER(); - - if (! - (pcmd_node = - (cmd_ctrl_node *) util_peek_list(pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return; - } - while (pcmd_node != (cmd_ctrl_node *) & pmadapter->cmd_pending_q) { - pcmd = - (HostCmd_DS_COMMAND *) (pcmd_node->cmdbuf->pbuf + - pcmd_node->cmdbuf->data_offset); - PRINTM(MERROR, "pending command id: 0x%x\n", - wlan_le16_to_cpu(pcmd->command)); - pcmd_node = pcmd_node->pnext; - } + cmd_ctrl_node *pcmd_node = MNULL; + HostCmd_DS_COMMAND *pcmd; + + ENTER(); + + if (! + (pcmd_node = + (cmd_ctrl_node *) util_peek_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + pmadapter->callbacks. + moal_spin_lock, + pmadapter->callbacks. + moal_spin_unlock))) { + LEAVE(); + return; + } + while (pcmd_node != (cmd_ctrl_node *) & pmadapter->cmd_pending_q) { + pcmd = (HostCmd_DS_COMMAND *) (pcmd_node->cmdbuf->pbuf + + pcmd_node->cmdbuf->data_offset); + PRINTM(MERROR, "pending command id: 0x%x ioctl_buf=%p\n", + wlan_le16_to_cpu(pcmd->command), pcmd_node->pioctl_buf); + pcmd_node = pcmd_node->pnext; + } #ifdef STA_SUPPORT - wlan_check_scan_queue(pmadapter); + wlan_check_scan_queue(pmadapter); #endif - LEAVE(); - return; + LEAVE(); + return; } #define REASON_CODE_NO_CMD_NODE 1 #define REASON_CODE_CMD_TIMEOUT 2 -/** +/** * @brief This function dump debug info - * + * * @return N/A */ t_void wlan_dump_info(mlan_adapter * pmadapter, t_u8 reason) { - cmd_ctrl_node *pcmd_node = MNULL; + cmd_ctrl_node *pcmd_node = MNULL; #ifdef DEBUG_LEVEL1 - t_u32 sec = 0, usec = 0; + t_u32 sec = 0, usec = 0; #endif - t_u8 i; - t_u16 cmd_id, cmd_act; - mlan_private *pmpriv = MNULL; - - ENTER(); - - PRINTM(MERROR, "------------Dump info-----------\n", reason); - switch (reason) { - case REASON_CODE_NO_CMD_NODE: - pmadapter->dbg.num_no_cmd_node++; - PRINTM(MERROR, "No Free command node\n"); - wlan_dump_pending_commands(pmadapter); - break; - case REASON_CODE_CMD_TIMEOUT: - PRINTM(MERROR, "Commmand Timeout\n"); - break; - default: - break; - } - if (reason != REASON_CODE_CMD_TIMEOUT) { - if (!pmadapter->curr_cmd) { - PRINTM(MERROR, "CurCmd Empty\n"); - } else { - pcmd_node = pmadapter->curr_cmd; - cmd_id = pmadapter->dbg.last_cmd_id[pmadapter->dbg.last_cmd_index]; - cmd_act = - pmadapter->dbg.last_cmd_act[pmadapter->dbg.last_cmd_index]; - PRINTM_GET_SYS_TIME(MERROR, &sec, &usec); - PRINTM(MERROR, "Current cmd id (%lu.%06lu) = 0x%x, act = 0x%x \n", - sec, usec, cmd_id, cmd_act); - if (pcmd_node->cmdbuf) { - t_u8 *pcmd_buf; - pcmd_buf = - pcmd_node->cmdbuf->pbuf + pcmd_node->cmdbuf->data_offset + - INTF_HEADER_LEN; - for (i = 0; i < 16; i++) { - PRINTM(MERROR, "%02x ", *pcmd_buf++); - } - PRINTM(MERROR, "\n"); - } - pmpriv = pcmd_node->priv; - if (pmpriv) { - PRINTM(MERROR, "BSS type = %d BSS role= %d\n", pmpriv->bss_type, - pmpriv->bss_role); - } - } - } - PRINTM(MERROR, "mlan_processing =%d\n", pmadapter->mlan_processing); - PRINTM(MERROR, "more_task_flag = %d\n", pmadapter->more_task_flag); - PRINTM(MERROR, "num_cmd_timeout = %d\n", pmadapter->dbg.num_cmd_timeout); - PRINTM(MERROR, "last_cmd_index = %d\n", pmadapter->dbg.last_cmd_index); - PRINTM(MERROR, "last_cmd_id = "); - for (i = 0; i < DBG_CMD_NUM; i++) { - PRINTM(MERROR, "0x%x ", pmadapter->dbg.last_cmd_id[i]); - } - PRINTM(MERROR, "\n"); - PRINTM(MERROR, "last_cmd_act = "); - for (i = 0; i < DBG_CMD_NUM; i++) { - PRINTM(MERROR, "0x%x ", pmadapter->dbg.last_cmd_act[i]); - } - PRINTM(MERROR, "\n"); - PRINTM(MERROR, "last_cmd_resp_index = %d\n", - pmadapter->dbg.last_cmd_resp_index); - PRINTM(MERROR, "last_cmd_resp_id = "); - for (i = 0; i < DBG_CMD_NUM; i++) { - PRINTM(MERROR, "0x%x ", pmadapter->dbg.last_cmd_resp_id[i]); - } - PRINTM(MERROR, "\n"); - PRINTM(MERROR, "last_event_index = %d\n", pmadapter->dbg.last_event_index); - PRINTM(MERROR, "last_event = "); - for (i = 0; i < DBG_CMD_NUM; i++) { - PRINTM(MERROR, "0x%x ", pmadapter->dbg.last_event[i]); - } - PRINTM(MERROR, "\n"); - - PRINTM(MERROR, "num_data_h2c_failure = %d\n", - pmadapter->dbg.num_tx_host_to_card_failure); - PRINTM(MERROR, "num_cmd_h2c_failure = %d\n", - pmadapter->dbg.num_cmd_host_to_card_failure); - PRINTM(MERROR, "num_data_c2h_failure = %d\n", - pmadapter->dbg.num_rx_card_to_host_failure); - PRINTM(MERROR, "num_cmdevt_c2h_failure = %d\n", - pmadapter->dbg.num_cmdevt_card_to_host_failure); - PRINTM(MERROR, "num_int_read_failure = %d\n", - pmadapter->dbg.num_int_read_failure); - PRINTM(MERROR, "last_int_status = %d\n", pmadapter->dbg.last_int_status); - PRINTM(MERROR, "num_no_cmd_node = %d\n", pmadapter->dbg.num_no_cmd_node); - PRINTM(MERROR, "num_event_deauth = %d\n", pmadapter->dbg.num_event_deauth); - PRINTM(MERROR, "num_event_disassoc = %d\n", - pmadapter->dbg.num_event_disassoc); - PRINTM(MERROR, "num_event_link_lost = %d\n", - pmadapter->dbg.num_event_link_lost); - PRINTM(MERROR, "num_cmd_deauth = %d\n", pmadapter->dbg.num_cmd_deauth); - PRINTM(MERROR, "num_cmd_assoc_success = %d\n", - pmadapter->dbg.num_cmd_assoc_success); - PRINTM(MERROR, "num_cmd_assoc_failure = %d\n", - pmadapter->dbg.num_cmd_assoc_failure); - PRINTM(MERROR, "cmd_resp_received=%d\n", pmadapter->cmd_resp_received); - PRINTM(MERROR, "event_received=%d\n", pmadapter->event_received); - - PRINTM(MERROR, "max_tx_buf_size=%d\n", pmadapter->max_tx_buf_size); - PRINTM(MERROR, "tx_buf_size=%d\n", pmadapter->tx_buf_size); - PRINTM(MERROR, "curr_tx_buf_size=%d\n", pmadapter->curr_tx_buf_size); - - PRINTM(MERROR, "data_sent=%d cmd_sent=%d\n", pmadapter->data_sent, - pmadapter->cmd_sent); - - PRINTM(MERROR, "ps_mode=%d ps_state=%d\n", pmadapter->ps_mode, - pmadapter->ps_state); - PRINTM(MERROR, "wakeup_dev_req=%d wakeup_tries=%d\n", - pmadapter->pm_wakeup_card_req, pmadapter->pm_wakeup_fw_try); - PRINTM(MERROR, "hs_configured=%d hs_activated=%d\n", - pmadapter->is_hs_configured, pmadapter->hs_activated); - PRINTM(MERROR, "pps_uapsd_mode=%d sleep_pd=%d\n", pmadapter->pps_uapsd_mode, - pmadapter->sleep_period.period); - PRINTM(MERROR, "tx_lock_flag = %d\n", pmadapter->tx_lock_flag); - PRINTM(MERROR, "scan_processing = %d\n", pmadapter->scan_processing); - PRINTM(MERROR, "mp_rd_bitmap=0x%x curr_rd_port=0x%x\n", - pmadapter->mp_rd_bitmap, pmadapter->curr_rd_port); - PRINTM(MERROR, "mp_wr_bitmap=0x%x curr_wr_port=0x%x\n", - pmadapter->mp_wr_bitmap, pmadapter->curr_wr_port); - if (reason != REASON_CODE_CMD_TIMEOUT) { - if ((pmadapter->dbg.num_no_cmd_node >= 5) - || (pmadapter->pm_wakeup_card_req && pmadapter->pm_wakeup_fw_try) - ) { - if (pmpriv) - wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_DBG_DUMP, MNULL); - else - wlan_recv_event(wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY), - MLAN_EVENT_ID_DRV_DBG_DUMP, MNULL); - } - } - PRINTM(MERROR, "-------- Dump info End---------\n", reason); - LEAVE(); - return; -} - -/** + t_u8 i; + t_u16 cmd_id, cmd_act; + mlan_private *pmpriv = MNULL; + + ENTER(); + + PRINTM(MERROR, "------------Dump info-----------\n", reason); + switch (reason) { + case REASON_CODE_NO_CMD_NODE: + pmadapter->dbg.num_no_cmd_node++; + PRINTM(MERROR, "No Free command node\n"); + wlan_dump_pending_commands(pmadapter); + break; + case REASON_CODE_CMD_TIMEOUT: + PRINTM(MERROR, "Commmand Timeout\n"); + break; + default: + break; + } + if (reason != REASON_CODE_CMD_TIMEOUT) { + if (!pmadapter->curr_cmd) { + PRINTM(MERROR, "CurCmd Empty\n"); + } else { + pcmd_node = pmadapter->curr_cmd; + cmd_id = pmadapter->dbg.last_cmd_id[pmadapter->dbg. + last_cmd_index]; + cmd_act = + pmadapter->dbg.last_cmd_act[pmadapter->dbg. + last_cmd_index]; + PRINTM_GET_SYS_TIME(MERROR, &sec, &usec); + PRINTM(MERROR, + "Current cmd id (%lu.%06lu) = 0x%x, act = 0x%x \n", + sec, usec, cmd_id, cmd_act); + if (pcmd_node->cmdbuf) { + t_u8 *pcmd_buf; + pcmd_buf = + pcmd_node->cmdbuf->pbuf + + pcmd_node->cmdbuf->data_offset + + INTF_HEADER_LEN; + for (i = 0; i < 16; i++) { + PRINTM(MERROR, "%02x ", *pcmd_buf++); + } + PRINTM(MERROR, "\n"); + } + pmpriv = pcmd_node->priv; + if (pmpriv) { + PRINTM(MERROR, "BSS type = %d BSS role= %d\n", + pmpriv->bss_type, pmpriv->bss_role); + } + } + } + PRINTM(MERROR, "mlan_processing =%d\n", pmadapter->mlan_processing); + PRINTM(MERROR, "more_task_flag = %d\n", pmadapter->more_task_flag); + PRINTM(MERROR, "num_cmd_timeout = %d\n", + pmadapter->dbg.num_cmd_timeout); + PRINTM(MERROR, "last_cmd_index = %d\n", pmadapter->dbg.last_cmd_index); + PRINTM(MERROR, "last_cmd_id = "); + for (i = 0; i < DBG_CMD_NUM; i++) { + PRINTM(MERROR, "0x%x ", pmadapter->dbg.last_cmd_id[i]); + } + PRINTM(MERROR, "\n"); + PRINTM(MERROR, "last_cmd_act = "); + for (i = 0; i < DBG_CMD_NUM; i++) { + PRINTM(MERROR, "0x%x ", pmadapter->dbg.last_cmd_act[i]); + } + PRINTM(MERROR, "\n"); + PRINTM(MERROR, "last_cmd_resp_index = %d\n", + pmadapter->dbg.last_cmd_resp_index); + PRINTM(MERROR, "last_cmd_resp_id = "); + for (i = 0; i < DBG_CMD_NUM; i++) { + PRINTM(MERROR, "0x%x ", pmadapter->dbg.last_cmd_resp_id[i]); + } + PRINTM(MERROR, "\n"); + PRINTM(MERROR, "last_event_index = %d\n", + pmadapter->dbg.last_event_index); + PRINTM(MERROR, "last_event = "); + for (i = 0; i < DBG_CMD_NUM; i++) { + PRINTM(MERROR, "0x%x ", pmadapter->dbg.last_event[i]); + } + PRINTM(MERROR, "\n"); + + PRINTM(MERROR, "num_data_h2c_failure = %d\n", + pmadapter->dbg.num_tx_host_to_card_failure); + PRINTM(MERROR, "num_cmd_h2c_failure = %d\n", + pmadapter->dbg.num_cmd_host_to_card_failure); + PRINTM(MERROR, "num_data_c2h_failure = %d\n", + pmadapter->dbg.num_rx_card_to_host_failure); + PRINTM(MERROR, "num_cmdevt_c2h_failure = %d\n", + pmadapter->dbg.num_cmdevt_card_to_host_failure); + PRINTM(MERROR, "num_int_read_failure = %d\n", + pmadapter->dbg.num_int_read_failure); + PRINTM(MERROR, "last_int_status = %d\n", + pmadapter->dbg.last_int_status); + PRINTM(MERROR, "num_no_cmd_node = %d\n", + pmadapter->dbg.num_no_cmd_node); + PRINTM(MERROR, "num_event_deauth = %d\n", + pmadapter->dbg.num_event_deauth); + PRINTM(MERROR, "num_event_disassoc = %d\n", + pmadapter->dbg.num_event_disassoc); + PRINTM(MERROR, "num_event_link_lost = %d\n", + pmadapter->dbg.num_event_link_lost); + PRINTM(MERROR, "num_cmd_deauth = %d\n", pmadapter->dbg.num_cmd_deauth); + PRINTM(MERROR, "num_cmd_assoc_success = %d\n", + pmadapter->dbg.num_cmd_assoc_success); + PRINTM(MERROR, "num_cmd_assoc_failure = %d\n", + pmadapter->dbg.num_cmd_assoc_failure); + PRINTM(MERROR, "cmd_resp_received=%d\n", pmadapter->cmd_resp_received); + PRINTM(MERROR, "event_received=%d\n", pmadapter->event_received); + + PRINTM(MERROR, "max_tx_buf_size=%d\n", pmadapter->max_tx_buf_size); + PRINTM(MERROR, "tx_buf_size=%d\n", pmadapter->tx_buf_size); + PRINTM(MERROR, "curr_tx_buf_size=%d\n", pmadapter->curr_tx_buf_size); + + PRINTM(MERROR, "data_sent=%d cmd_sent=%d\n", pmadapter->data_sent, + pmadapter->cmd_sent); + + PRINTM(MERROR, "ps_mode=%d ps_state=%d\n", pmadapter->ps_mode, + pmadapter->ps_state); + PRINTM(MERROR, "wakeup_dev_req=%d wakeup_tries=%d\n", + pmadapter->pm_wakeup_card_req, pmadapter->pm_wakeup_fw_try); + PRINTM(MERROR, "hs_configured=%d hs_activated=%d\n", + pmadapter->is_hs_configured, pmadapter->hs_activated); + PRINTM(MERROR, "pps_uapsd_mode=%d sleep_pd=%d\n", + pmadapter->pps_uapsd_mode, pmadapter->sleep_period.period); + PRINTM(MERROR, "tx_lock_flag = %d\n", pmadapter->tx_lock_flag); + PRINTM(MERROR, "scan_processing = %d\n", pmadapter->scan_processing); + PRINTM(MERROR, "mp_rd_bitmap=0x%x curr_rd_port=0x%x\n", + pmadapter->mp_rd_bitmap, pmadapter->curr_rd_port); + PRINTM(MERROR, "mp_wr_bitmap=0x%x curr_wr_port=0x%x\n", + pmadapter->mp_wr_bitmap, pmadapter->curr_wr_port); + if (reason != REASON_CODE_CMD_TIMEOUT) { + if ((pmadapter->dbg.num_no_cmd_node >= 5) + || (pmadapter->pm_wakeup_card_req && + pmadapter->pm_wakeup_fw_try) + ) { + if (pmpriv) + wlan_recv_event(pmpriv, + MLAN_EVENT_ID_DRV_DBG_DUMP, + MNULL); + else + wlan_recv_event(wlan_get_priv + (pmadapter, MLAN_BSS_ROLE_ANY), + MLAN_EVENT_ID_DRV_DBG_DUMP, + MNULL); + } + } + PRINTM(MERROR, "-------- Dump info End---------\n", reason); + LEAVE(); + return; +} + +/** * @brief This function convert a given character to hex * * @param chr Character to be converted @@ -280,14 +295,14 @@ wlan_dump_info(mlan_adapter * pmadapter, t_u8 reason) static t_u32 wlan_hexval(t_u8 chr) { - if (chr >= '0' && chr <= '9') - return chr - '0'; - if (chr >= 'A' && chr <= 'F') - return chr - 'A' + 10; - if (chr >= 'a' && chr <= 'f') - return chr - 'a' + 10; + if (chr >= '0' && chr <= '9') + return chr - '0'; + if (chr >= 'A' && chr <= 'F') + return chr - 'A' + 10; + if (chr >= 'a' && chr <= 'f') + return chr - 'a' + 10; - return 0; + return 0; } /** @@ -300,15 +315,15 @@ wlan_hexval(t_u8 chr) int wlan_atox(t_u8 * a) { - int i = 0; + int i = 0; - ENTER(); + ENTER(); - while (wlan_isxdigit(*a)) - i = i * 16 + wlan_hexval(*a++); + while (wlan_isxdigit(*a)) + i = i * 16 + wlan_hexval(*a++); - LEAVE(); - return i; + LEAVE(); + return i; } /** @@ -323,33 +338,33 @@ wlan_atox(t_u8 * a) static t_u32 wlan_parse_cal_cfg(t_u8 * src, t_size len, t_u8 * dst) { - t_u8 *ptr; - t_u8 *dptr; + t_u8 *ptr; + t_u8 *dptr; - ENTER(); - ptr = src; - dptr = dst; + ENTER(); + ptr = src; + dptr = dst; - while (ptr - src < len) { - if (*ptr && (wlan_isspace(*ptr) || *ptr == '\t')) { - ptr++; - continue; - } + while (ptr - src < len) { + if (*ptr && (wlan_isspace(*ptr) || *ptr == '\t')) { + ptr++; + continue; + } - if (wlan_isxdigit(*ptr)) { - *dptr++ = wlan_atox(ptr); - ptr += 2; - } else { - ptr++; - } - } - LEAVE(); - return (dptr - dst); + if (wlan_isxdigit(*ptr)) { + *dptr++ = wlan_atox(ptr); + ptr += 2; + } else { + ptr++; + } + } + LEAVE(); + return (dptr - dst); } -/** +/** * @brief This function initializes the command node. - * + * * @param pmpriv A pointer to mlan_private structure * @param pcmd_node A pointer to cmd_ctrl_node structure * @param cmd_oid Cmd oid: treated as sub command @@ -360,40 +375,41 @@ wlan_parse_cal_cfg(t_u8 * src, t_size len, t_u8 * dst) */ static void wlan_init_cmd_node(IN pmlan_private pmpriv, - IN cmd_ctrl_node * pcmd_node, - IN t_u32 cmd_oid, - IN t_void * pioctl_buf, IN t_void * pdata_buf) + IN cmd_ctrl_node * pcmd_node, + IN t_u32 cmd_oid, + IN t_void * pioctl_buf, IN t_void * pdata_buf) { - mlan_adapter *pmadapter = pmpriv->adapter; + mlan_adapter *pmadapter = pmpriv->adapter; - ENTER(); + ENTER(); - if (pcmd_node == MNULL) { - LEAVE(); - return; - } - pcmd_node->priv = pmpriv; - pcmd_node->cmd_oid = cmd_oid; - pcmd_node->pioctl_buf = pioctl_buf; - pcmd_node->pdata_buf = pdata_buf; + if (pcmd_node == MNULL) { + LEAVE(); + return; + } + pcmd_node->priv = pmpriv; + pcmd_node->cmd_oid = cmd_oid; + pcmd_node->pioctl_buf = pioctl_buf; + pcmd_node->pdata_buf = pdata_buf; - pcmd_node->cmdbuf = pcmd_node->pmbuf; + pcmd_node->cmdbuf = pcmd_node->pmbuf; - /* Make sure head_ptr for cmd buf is Align */ - pcmd_node->cmdbuf->data_offset = 0; - memset(pmadapter, pcmd_node->cmdbuf->pbuf, 0, MRVDRV_SIZE_OF_CMD_BUFFER); + /* Make sure head_ptr for cmd buf is Align */ + pcmd_node->cmdbuf->data_offset = 0; + memset(pmadapter, pcmd_node->cmdbuf->pbuf, 0, + MRVDRV_SIZE_OF_CMD_BUFFER); - /* Prepare mlan_buffer for command sending */ - pcmd_node->cmdbuf->buf_type = MLAN_BUF_TYPE_CMD; - pcmd_node->cmdbuf->data_offset += INTF_HEADER_LEN; + /* Prepare mlan_buffer for command sending */ + pcmd_node->cmdbuf->buf_type = MLAN_BUF_TYPE_CMD; + pcmd_node->cmdbuf->data_offset += INTF_HEADER_LEN; - LEAVE(); + LEAVE(); } -/** +/** * @brief This function gets a free command node if available in * command free queue. - * + * * @param pmadapter A pointer to mlan_adapter structure * * @return cmd_ctrl_node A pointer to cmd_ctrl_node structure or MNULL @@ -401,36 +417,42 @@ wlan_init_cmd_node(IN pmlan_private pmpriv, static cmd_ctrl_node * wlan_get_cmd_node(mlan_adapter * pmadapter) { - cmd_ctrl_node *pcmd_node; - - ENTER(); - - if (pmadapter == MNULL) { - LEAVE(); - return MNULL; - } - - if (util_peek_list(pmadapter->pmoal_handle, &pmadapter->cmd_free_q, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock)) { - pcmd_node = (cmd_ctrl_node *) util_dequeue_list(pmadapter->pmoal_handle, - &pmadapter->cmd_free_q, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock); - } else { - PRINTM(MERROR, "GET_CMD_NODE: cmd_ctrl_node is not available\n"); - pcmd_node = MNULL; - } - - LEAVE(); - return pcmd_node; + cmd_ctrl_node *pcmd_node; + + ENTER(); + + if (pmadapter == MNULL) { + LEAVE(); + return MNULL; + } + + if (util_peek_list(pmadapter->pmoal_handle, &pmadapter->cmd_free_q, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock)) { + pcmd_node = + (cmd_ctrl_node *) util_dequeue_list(pmadapter-> + pmoal_handle, + &pmadapter-> + cmd_free_q, + pmadapter-> + callbacks. + moal_spin_lock, + pmadapter-> + callbacks. + moal_spin_unlock); + } else { + PRINTM(MERROR, + "GET_CMD_NODE: cmd_ctrl_node is not available\n"); + pcmd_node = MNULL; + } + + LEAVE(); + return pcmd_node; } -/** +/** * @brief This function cleans command node. - * + * * @param pmadapter A pointer to mlan_adapter structure * @param pcmd_node A pointer to cmd_ctrl_node structure * @@ -439,31 +461,31 @@ wlan_get_cmd_node(mlan_adapter * pmadapter) static t_void wlan_clean_cmd_node(pmlan_adapter pmadapter, cmd_ctrl_node * pcmd_node) { - ENTER(); + ENTER(); - if (pcmd_node == MNULL) { - LEAVE(); - return; - } - pcmd_node->cmd_oid = 0; - pcmd_node->cmd_flag = 0; - pcmd_node->pioctl_buf = MNULL; - pcmd_node->pdata_buf = MNULL; + if (pcmd_node == MNULL) { + LEAVE(); + return; + } + pcmd_node->cmd_oid = 0; + pcmd_node->cmd_flag = 0; + pcmd_node->pioctl_buf = MNULL; + pcmd_node->pdata_buf = MNULL; - if (pcmd_node->respbuf) { - wlan_free_mlan_buffer(pmadapter, pcmd_node->respbuf); - pcmd_node->respbuf = MNULL; - } + if (pcmd_node->respbuf) { + wlan_free_mlan_buffer(pmadapter, pcmd_node->respbuf); + pcmd_node->respbuf = MNULL; + } - LEAVE(); - return; + LEAVE(); + return; } #ifdef STA_SUPPORT /** - * @brief This function will return the pointer to the first entry in + * @brief This function will return the pointer to the first entry in * pending cmd which matches the given req_id - * + * * @param pmadapter A pointer to mlan_adapter * @param req_id ioctl req_id. * @@ -472,40 +494,41 @@ wlan_clean_cmd_node(pmlan_adapter pmadapter, cmd_ctrl_node * pcmd_node) static cmd_ctrl_node * wlan_get_pending_ioctl_by_id(pmlan_adapter pmadapter, t_u32 req_id) { - cmd_ctrl_node *pcmd_node = MNULL; - mlan_ioctl_req *pioctl_buf = MNULL; - - ENTER(); - - if (! - (pcmd_node = - (cmd_ctrl_node *) util_peek_list(pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return MNULL; - } - while (pcmd_node != (cmd_ctrl_node *) & pmadapter->cmd_pending_q) { - if (pcmd_node->pioctl_buf) { - pioctl_buf = (mlan_ioctl_req *) pcmd_node->pioctl_buf; - if (pioctl_buf->req_id == req_id) { - LEAVE(); - return pcmd_node; - } - } - pcmd_node = pcmd_node->pnext; - } - LEAVE(); - return MNULL; + cmd_ctrl_node *pcmd_node = MNULL; + mlan_ioctl_req *pioctl_buf = MNULL; + + ENTER(); + + if (! + (pcmd_node = + (cmd_ctrl_node *) util_peek_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + pmadapter->callbacks. + moal_spin_lock, + pmadapter->callbacks. + moal_spin_unlock))) { + LEAVE(); + return MNULL; + } + while (pcmd_node != (cmd_ctrl_node *) & pmadapter->cmd_pending_q) { + if (pcmd_node->pioctl_buf) { + pioctl_buf = (mlan_ioctl_req *) pcmd_node->pioctl_buf; + if (pioctl_buf->req_id == req_id) { + LEAVE(); + return pcmd_node; + } + } + pcmd_node = pcmd_node->pnext; + } + LEAVE(); + return MNULL; } #endif /** - * @brief This function will return the pointer to the first entry in + * @brief This function will return the pointer to the first entry in * pending cmd which matches the given pioctl_req - * + * * @param pmadapter A pointer to mlan_adapter * @param pioctl_req A pointer to mlan_ioctl_req buf * @@ -514,35 +537,37 @@ wlan_get_pending_ioctl_by_id(pmlan_adapter pmadapter, t_u32 req_id) static cmd_ctrl_node * wlan_get_pending_ioctl_cmd(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) { - cmd_ctrl_node *pcmd_node = MNULL; - - ENTER(); - - if (! - (pcmd_node = - (cmd_ctrl_node *) util_peek_list(pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return MNULL; - } - while (pcmd_node != (cmd_ctrl_node *) & pmadapter->cmd_pending_q) { - if (pcmd_node->pioctl_buf && (pcmd_node->pioctl_buf == pioctl_req)) { - LEAVE(); - return pcmd_node; - } - pcmd_node = pcmd_node->pnext; - } - LEAVE(); - return MNULL; -} - -/** - * @brief This function will return the pointer to the first entry in + cmd_ctrl_node *pcmd_node = MNULL; + + ENTER(); + + if (! + (pcmd_node = + (cmd_ctrl_node *) util_peek_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + pmadapter->callbacks. + moal_spin_lock, + pmadapter->callbacks. + moal_spin_unlock))) { + LEAVE(); + return MNULL; + } + while (pcmd_node != (cmd_ctrl_node *) & pmadapter->cmd_pending_q) { + if (pcmd_node->pioctl_buf && + (pcmd_node->pioctl_buf == pioctl_req)) { + LEAVE(); + return pcmd_node; + } + pcmd_node = pcmd_node->pnext; + } + LEAVE(); + return MNULL; +} + +/** + * @brief This function will return the pointer to the first entry in * pending cmd which matches the given bss_index - * + * * @param pmadapter A pointer to mlan_adapter * @param bss_index bss_index * @@ -551,37 +576,38 @@ wlan_get_pending_ioctl_cmd(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) static cmd_ctrl_node * wlan_get_bss_pending_ioctl_cmd(pmlan_adapter pmadapter, t_u32 bss_index) { - cmd_ctrl_node *pcmd_node = MNULL; - mlan_ioctl_req *pioctl_buf = MNULL; - ENTER(); - - if (! - (pcmd_node = - (cmd_ctrl_node *) util_peek_list(pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return MNULL; - } - while (pcmd_node != (cmd_ctrl_node *) & pmadapter->cmd_pending_q) { - if (pcmd_node->pioctl_buf) { - pioctl_buf = (mlan_ioctl_req *) pcmd_node->pioctl_buf; - if (pioctl_buf->bss_index == bss_index) { - LEAVE(); - return pcmd_node; - } - } - pcmd_node = pcmd_node->pnext; - } - LEAVE(); - return MNULL; -} - -/** + cmd_ctrl_node *pcmd_node = MNULL; + mlan_ioctl_req *pioctl_buf = MNULL; + ENTER(); + + if (! + (pcmd_node = + (cmd_ctrl_node *) util_peek_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + pmadapter->callbacks. + moal_spin_lock, + pmadapter->callbacks. + moal_spin_unlock))) { + LEAVE(); + return MNULL; + } + while (pcmd_node != (cmd_ctrl_node *) & pmadapter->cmd_pending_q) { + if (pcmd_node->pioctl_buf) { + pioctl_buf = (mlan_ioctl_req *) pcmd_node->pioctl_buf; + if (pioctl_buf->bss_index == bss_index) { + LEAVE(); + return pcmd_node; + } + } + pcmd_node = pcmd_node->pnext; + } + LEAVE(); + return MNULL; +} + +/** * @brief This function handles the command response of host_cmd - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -590,28 +616,29 @@ wlan_get_bss_pending_ioctl_cmd(pmlan_adapter pmadapter, t_u32 bss_index) */ static mlan_status wlan_ret_host_cmd(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, IN mlan_ioctl_req * pioctl_buf) { - mlan_ds_misc_cfg *misc; - t_u16 size = wlan_le16_to_cpu(resp->size); + mlan_ds_misc_cfg *misc; + t_u16 size = wlan_le16_to_cpu(resp->size); - ENTER(); + ENTER(); - PRINTM(MINFO, "host command response size = %d\n", size); - size = MIN(size, MRVDRV_SIZE_OF_CMD_BUFFER); - if (pioctl_buf) { - misc = (mlan_ds_misc_cfg *) pioctl_buf->pbuf; - misc->param.hostcmd.len = size; - memcpy(pmpriv->adapter, misc->param.hostcmd.cmd, (void *) resp, size); - } + PRINTM(MINFO, "host command response size = %d\n", size); + size = MIN(size, MRVDRV_SIZE_OF_CMD_BUFFER); + if (pioctl_buf) { + misc = (mlan_ds_misc_cfg *) pioctl_buf->pbuf; + misc->param.hostcmd.len = size; + memcpy(pmpriv->adapter, misc->param.hostcmd.cmd, (void *)resp, + size); + } - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function sends host command to firmware. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param pdata_buf A pointer to data buffer @@ -619,23 +646,23 @@ wlan_ret_host_cmd(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_host_cmd(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) { - mlan_ds_misc_cmd *pcmd_ptr = (mlan_ds_misc_cmd *) pdata_buf; + mlan_ds_misc_cmd *pcmd_ptr = (mlan_ds_misc_cmd *) pdata_buf; - ENTER(); + ENTER(); - /* Copy the HOST command to command buffer */ - memcpy(pmpriv->adapter, (void *) cmd, pcmd_ptr->cmd, - MIN(MRVDRV_SIZE_OF_CMD_BUFFER, pcmd_ptr->len)); - PRINTM(MINFO, "Host command size = %d\n", pcmd_ptr->len); - LEAVE(); - return MLAN_STATUS_SUCCESS; + /* Copy the HOST command to command buffer */ + memcpy(pmpriv->adapter, (void *)cmd, pcmd_ptr->cmd, + MIN(MRVDRV_SIZE_OF_CMD_BUFFER, pcmd_ptr->len)); + PRINTM(MINFO, "Host command size = %d\n", pcmd_ptr->len); + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function downloads a command to firmware. - * + * * @param pmpriv A pointer to mlan_private structure * @param pcmd_node A pointer to cmd_ctrl_node structure * @@ -645,130 +672,135 @@ static mlan_status wlan_dnld_cmd_to_fw(IN mlan_private * pmpriv, IN cmd_ctrl_node * pcmd_node) { - mlan_adapter *pmadapter = pmpriv->adapter; - mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; - mlan_status ret = MLAN_STATUS_SUCCESS; - HostCmd_DS_COMMAND *pcmd; - mlan_ioctl_req *pioctl_buf = MNULL; - t_u16 cmd_code; - t_u16 cmd_size; + mlan_adapter *pmadapter = pmpriv->adapter; + mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; + mlan_status ret = MLAN_STATUS_SUCCESS; + HostCmd_DS_COMMAND *pcmd; + mlan_ioctl_req *pioctl_buf = MNULL; + t_u16 cmd_code; + t_u16 cmd_size; #ifdef DEBUG_LEVEL1 - t_u32 sec = 0, usec = 0; + t_u32 sec = 0, usec = 0; #endif - ENTER(); - - if (pcmd_node) - if (pcmd_node->pioctl_buf != MNULL) - pioctl_buf = (mlan_ioctl_req *) pcmd_node->pioctl_buf; - if (!pmadapter || !pcmd_node) { - if (pioctl_buf) - pioctl_buf->status_code = MLAN_ERROR_CMD_DNLD_FAIL; - ret = MLAN_STATUS_FAILURE; - goto done; - } - - pcmd = - (HostCmd_DS_COMMAND *) (pcmd_node->cmdbuf->pbuf + - pcmd_node->cmdbuf->data_offset); - - /* Sanity test */ - if (pcmd == MNULL || pcmd->size == 0) { - PRINTM(MERROR, "DNLD_CMD: pcmd is null or command size is zero, " - "Not sending\n"); - if (pioctl_buf) - pioctl_buf->status_code = MLAN_ERROR_CMD_DNLD_FAIL; - wlan_insert_cmd_to_free_q(pmadapter, pcmd_node); - ret = MLAN_STATUS_FAILURE; - goto done; - } - - /* Set command sequence number */ - pmadapter->seq_num++; - pcmd->seq_num = - wlan_cpu_to_le16(HostCmd_SET_SEQ_NO_BSS_INFO - (pmadapter->seq_num, pcmd_node->priv->bss_num, - pcmd_node->priv->bss_type)); - - wlan_request_cmd_lock(pmadapter); - pmadapter->curr_cmd = pcmd_node; - wlan_release_cmd_lock(pmadapter); - - cmd_code = wlan_le16_to_cpu(pcmd->command); - cmd_size = wlan_le16_to_cpu(pcmd->size); - - pcmd_node->cmdbuf->data_len = cmd_size; - - PRINTM_GET_SYS_TIME(MCMND, &sec, &usec); - PRINTM_NETINTF(MCMND, pmpriv); - PRINTM(MCMND, "DNLD_CMD (%lu.%06lu): 0x%x, act 0x%x, len %d, seqno 0x%x\n", - sec, usec, cmd_code, - wlan_le16_to_cpu(*(t_u16 *) ((t_u8 *) pcmd + S_DS_GEN)), cmd_size, - wlan_le16_to_cpu(pcmd->seq_num)); - DBG_HEXDUMP(MCMD_D, "DNLD_CMD", (t_u8 *) pcmd, cmd_size); - - /* Send the command to lower layer */ - - pcmd_node->cmdbuf->data_offset -= INTF_HEADER_LEN; - pcmd_node->cmdbuf->data_len += INTF_HEADER_LEN; - /* Extra header for SDIO is added here */ - ret = - wlan_sdio_host_to_card(pmadapter, MLAN_TYPE_CMD, pcmd_node->cmdbuf, - MNULL); - - if (ret == MLAN_STATUS_FAILURE) { - PRINTM(MERROR, "DNLD_CMD: Host to Card Failed\n"); - if (pioctl_buf) - pioctl_buf->status_code = MLAN_ERROR_CMD_DNLD_FAIL; - wlan_insert_cmd_to_free_q(pmadapter, pmadapter->curr_cmd); - - wlan_request_cmd_lock(pmadapter); - pmadapter->curr_cmd = MNULL; - wlan_release_cmd_lock(pmadapter); - - pmadapter->dbg.num_cmd_host_to_card_failure++; - ret = MLAN_STATUS_FAILURE; - goto done; - } - - /* Save the last command id and action to debug log */ - pmadapter->dbg.last_cmd_index = - (pmadapter->dbg.last_cmd_index + 1) % DBG_CMD_NUM; - pmadapter->dbg.last_cmd_id[pmadapter->dbg.last_cmd_index] = cmd_code; - pmadapter->dbg.last_cmd_act[pmadapter->dbg.last_cmd_index] = - wlan_le16_to_cpu(*(t_u16 *) ((t_u8 *) pcmd + S_DS_GEN)); - - /* Clear BSS_NO_BITS from HostCmd */ - cmd_code &= HostCmd_CMD_ID_MASK; - /* soft_reset command has no command response, we should return here */ - if (cmd_code == HostCmd_CMD_SOFT_RESET) { - PRINTM(MCMND, "DNLD_CMD: SoftReset\n"); - if (pioctl_buf) { - wlan_request_cmd_lock(pmadapter); - pmadapter->curr_cmd->pioctl_buf = MNULL; - wlan_release_cmd_lock(pmadapter); - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, pioctl_buf, - MLAN_STATUS_SUCCESS); - } - goto done; - } - - /* Setup the timer after transmit command */ - pcb->moal_start_timer(pmadapter->pmoal_handle, pmadapter->pmlan_cmd_timer, - MFALSE, MRVDRV_TIMER_10S); - - pmadapter->cmd_timer_is_set = MTRUE; - - ret = MLAN_STATUS_SUCCESS; - - done: - LEAVE(); - return ret; + ENTER(); + + if (pcmd_node) + if (pcmd_node->pioctl_buf != MNULL) + pioctl_buf = (mlan_ioctl_req *) pcmd_node->pioctl_buf; + if (!pmadapter || !pcmd_node) { + if (pioctl_buf) + pioctl_buf->status_code = MLAN_ERROR_CMD_DNLD_FAIL; + ret = MLAN_STATUS_FAILURE; + goto done; + } + + pcmd = (HostCmd_DS_COMMAND *) (pcmd_node->cmdbuf->pbuf + + pcmd_node->cmdbuf->data_offset); + + /* Sanity test */ + if (pcmd == MNULL || pcmd->size == 0) { + PRINTM(MERROR, + "DNLD_CMD: pcmd is null or command size is zero, " + "Not sending\n"); + if (pioctl_buf) + pioctl_buf->status_code = MLAN_ERROR_CMD_DNLD_FAIL; + wlan_insert_cmd_to_free_q(pmadapter, pcmd_node); + ret = MLAN_STATUS_FAILURE; + goto done; + } + + /* Set command sequence number */ + pmadapter->seq_num++; + pcmd->seq_num = + wlan_cpu_to_le16(HostCmd_SET_SEQ_NO_BSS_INFO + (pmadapter->seq_num, pcmd_node->priv->bss_num, + pcmd_node->priv->bss_type)); + + wlan_request_cmd_lock(pmadapter); + pmadapter->curr_cmd = pcmd_node; + wlan_release_cmd_lock(pmadapter); + + cmd_code = wlan_le16_to_cpu(pcmd->command); + cmd_size = wlan_le16_to_cpu(pcmd->size); + + pcmd_node->cmdbuf->data_len = cmd_size; + + PRINTM_GET_SYS_TIME(MCMND, &sec, &usec); + PRINTM_NETINTF(MCMND, pmpriv); + PRINTM(MCMND, + "DNLD_CMD (%lu.%06lu): 0x%x, act 0x%x, len %d, seqno 0x%x\n", + sec, usec, cmd_code, + wlan_le16_to_cpu(*(t_u16 *) ((t_u8 *) pcmd + S_DS_GEN)), + cmd_size, wlan_le16_to_cpu(pcmd->seq_num)); + DBG_HEXDUMP(MCMD_D, "DNLD_CMD", (t_u8 *) pcmd, cmd_size); + + /* Send the command to lower layer */ + + pcmd_node->cmdbuf->data_offset -= INTF_HEADER_LEN; + pcmd_node->cmdbuf->data_len += INTF_HEADER_LEN; + /* Extra header for SDIO is added here */ + ret = wlan_sdio_host_to_card(pmadapter, MLAN_TYPE_CMD, + pcmd_node->cmdbuf, MNULL); + + if (ret == MLAN_STATUS_FAILURE) { + PRINTM(MERROR, "DNLD_CMD: Host to Card Failed\n"); + if (pcmd_node->pioctl_buf) { + pioctl_buf = (mlan_ioctl_req *) pcmd_node->pioctl_buf; + pioctl_buf->status_code = MLAN_ERROR_CMD_DNLD_FAIL; + } + wlan_insert_cmd_to_free_q(pmadapter, pmadapter->curr_cmd); + + wlan_request_cmd_lock(pmadapter); + pmadapter->curr_cmd = MNULL; + wlan_release_cmd_lock(pmadapter); + + pmadapter->dbg.num_cmd_host_to_card_failure++; + ret = MLAN_STATUS_FAILURE; + goto done; + } + + /* Save the last command id and action to debug log */ + pmadapter->dbg.last_cmd_index = + (pmadapter->dbg.last_cmd_index + 1) % DBG_CMD_NUM; + pmadapter->dbg.last_cmd_id[pmadapter->dbg.last_cmd_index] = cmd_code; + pmadapter->dbg.last_cmd_act[pmadapter->dbg.last_cmd_index] = + wlan_le16_to_cpu(*(t_u16 *) ((t_u8 *) pcmd + S_DS_GEN)); + + /* Clear BSS_NO_BITS from HostCmd */ + cmd_code &= HostCmd_CMD_ID_MASK; + /* soft_reset command has no command response, we should return here */ + if (cmd_code == HostCmd_CMD_SOFT_RESET) { + PRINTM(MCMND, "DNLD_CMD: SoftReset\n"); + if (pcmd_node->pioctl_buf) { + pioctl_buf = (mlan_ioctl_req *) pcmd_node->pioctl_buf; + wlan_request_cmd_lock(pmadapter); + pmadapter->curr_cmd->pioctl_buf = MNULL; + wlan_release_cmd_lock(pmadapter); + pcb->moal_ioctl_complete(pmadapter->pmoal_handle, + pioctl_buf, + MLAN_STATUS_SUCCESS); + } + goto done; + } + + /* Setup the timer after transmit command */ + pcb->moal_start_timer(pmadapter->pmoal_handle, + pmadapter->pmlan_cmd_timer, MFALSE, + MRVDRV_TIMER_10S * 2); + + pmadapter->cmd_timer_is_set = MTRUE; + + ret = MLAN_STATUS_SUCCESS; + +done: + LEAVE(); + return ret; } /** * @brief This function sends sleep confirm command to firmware. - * + * * @param pmadapter A pointer to mlan_adapter structure * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -776,81 +808,84 @@ wlan_dnld_cmd_to_fw(IN mlan_private * pmpriv, IN cmd_ctrl_node * pcmd_node) static mlan_status wlan_dnld_sleep_confirm_cmd(mlan_adapter * pmadapter) { - mlan_status ret = MLAN_STATUS_SUCCESS; - static t_u32 i = 0; - t_u16 cmd_len = 0; - opt_sleep_confirm_buffer *sleep_cfm_buf = - (opt_sleep_confirm_buffer *) (pmadapter->psleep_cfm->pbuf + - pmadapter->psleep_cfm->data_offset); - - ENTER(); - - cmd_len = sizeof(OPT_Confirm_Sleep); - pmadapter->seq_num++; - sleep_cfm_buf->ps_cfm_sleep.seq_num = - wlan_cpu_to_le16(HostCmd_SET_SEQ_NO_BSS_INFO - (pmadapter->seq_num, - (wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY))-> - bss_num, - (wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY))-> - bss_type)); - DBG_HEXDUMP(MCMD_D, "SLEEP_CFM", &sleep_cfm_buf->ps_cfm_sleep, - sizeof(OPT_Confirm_Sleep)); - - /* Send sleep confirm command to firmware */ - - pmadapter->psleep_cfm->data_len = cmd_len + INTF_HEADER_LEN; - ret = wlan_sdio_host_to_card(pmadapter, MLAN_TYPE_CMD, - pmadapter->psleep_cfm, MNULL); - - if (ret == MLAN_STATUS_FAILURE) { - PRINTM(MERROR, "SLEEP_CFM: failed\n"); - pmadapter->dbg.num_cmd_sleep_cfm_host_to_card_failure++; - goto done; - } else { - if (GET_BSS_ROLE(wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY)) == - MLAN_BSS_ROLE_UAP) - pmadapter->ps_state = PS_STATE_SLEEP_CFM; + mlan_status ret = MLAN_STATUS_SUCCESS; + static t_u32 i = 0; + t_u16 cmd_len = 0; + opt_sleep_confirm_buffer *sleep_cfm_buf = + (opt_sleep_confirm_buffer *) (pmadapter->psleep_cfm->pbuf + + pmadapter->psleep_cfm-> + data_offset); + + ENTER(); + + cmd_len = sizeof(OPT_Confirm_Sleep); + pmadapter->seq_num++; + sleep_cfm_buf->ps_cfm_sleep.seq_num = + wlan_cpu_to_le16(HostCmd_SET_SEQ_NO_BSS_INFO + (pmadapter->seq_num, + (wlan_get_priv + (pmadapter, MLAN_BSS_ROLE_ANY))->bss_num, + (wlan_get_priv + (pmadapter, MLAN_BSS_ROLE_ANY))->bss_type)); + DBG_HEXDUMP(MCMD_D, "SLEEP_CFM", &sleep_cfm_buf->ps_cfm_sleep, + sizeof(OPT_Confirm_Sleep)); + + /* Send sleep confirm command to firmware */ + + pmadapter->psleep_cfm->data_len = cmd_len + INTF_HEADER_LEN; + ret = wlan_sdio_host_to_card(pmadapter, MLAN_TYPE_CMD, + pmadapter->psleep_cfm, MNULL); + + if (ret == MLAN_STATUS_FAILURE) { + PRINTM(MERROR, "SLEEP_CFM: failed\n"); + pmadapter->dbg.num_cmd_sleep_cfm_host_to_card_failure++; + goto done; + } else { + if (GET_BSS_ROLE(wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY)) == + MLAN_BSS_ROLE_UAP) + pmadapter->ps_state = PS_STATE_SLEEP_CFM; #ifdef STA_SUPPORT - if (GET_BSS_ROLE(wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY)) == - MLAN_BSS_ROLE_STA) { - if (!sleep_cfm_buf->ps_cfm_sleep.sleep_cfm.resp_ctrl) { - /* Response is not needed for sleep confirm command */ - pmadapter->ps_state = PS_STATE_SLEEP; - } else { - pmadapter->ps_state = PS_STATE_SLEEP_CFM; - } - - if (!sleep_cfm_buf->ps_cfm_sleep.sleep_cfm.resp_ctrl - && (pmadapter->is_hs_configured && - !pmadapter->sleep_period.period)) { - pmadapter->pm_wakeup_card_req = MTRUE; - wlan_host_sleep_activated_event(wlan_get_priv - (pmadapter, MLAN_BSS_ROLE_STA), - MTRUE); - } - } + if (GET_BSS_ROLE(wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY)) == + MLAN_BSS_ROLE_STA) { + if (!sleep_cfm_buf->ps_cfm_sleep.sleep_cfm.resp_ctrl) { + /* Response is not needed for sleep confirm + command */ + pmadapter->ps_state = PS_STATE_SLEEP; + } else { + pmadapter->ps_state = PS_STATE_SLEEP_CFM; + } + + if (!sleep_cfm_buf->ps_cfm_sleep.sleep_cfm.resp_ctrl + && (pmadapter->is_hs_configured && + !pmadapter->sleep_period.period)) { + pmadapter->pm_wakeup_card_req = MTRUE; + wlan_host_sleep_activated_event(wlan_get_priv + (pmadapter, + MLAN_BSS_ROLE_STA), + MTRUE); + } + } #endif /* STA_SUPPORT */ #define NUM_SC_PER_LINE 16 - if (++i % NUM_SC_PER_LINE == 0) - PRINTM(MEVENT, "+\n"); - else - PRINTM(MEVENT, "+"); - } + if (++i % NUM_SC_PER_LINE == 0) + PRINTM(MEVENT, "+\n"); + else + PRINTM(MEVENT, "+"); + } - done: - LEAVE(); - return ret; +done: + LEAVE(); + return ret; } /******************************************************** Global Functions ********************************************************/ -/** +/** * @brief Event handler - * + * * @param priv A pointer to mlan_private structure * @param event_id Event ID * @param pmevent Event buffer @@ -860,33 +895,33 @@ wlan_dnld_sleep_confirm_cmd(mlan_adapter * pmadapter) mlan_status wlan_recv_event(pmlan_private priv, mlan_event_id event_id, t_void * pmevent) { - pmlan_callbacks pcb = &priv->adapter->callbacks; + pmlan_callbacks pcb = &priv->adapter->callbacks; - ENTER(); + ENTER(); - if (pmevent) - /* The caller has provided the event. */ - pcb->moal_recv_event(priv->adapter->pmoal_handle, - (pmlan_event) pmevent); - else { - mlan_event mevent; + if (pmevent) + /* The caller has provided the event. */ + pcb->moal_recv_event(priv->adapter->pmoal_handle, + (pmlan_event) pmevent); + else { + mlan_event mevent; - memset(priv->adapter, &mevent, 0, sizeof(mlan_event)); - mevent.bss_index = priv->bss_index; - mevent.event_id = event_id; - mevent.event_len = 0; + memset(priv->adapter, &mevent, 0, sizeof(mlan_event)); + mevent.bss_index = priv->bss_index; + mevent.event_id = event_id; + mevent.event_len = 0; - pcb->moal_recv_event(priv->adapter->pmoal_handle, &mevent); - } + pcb->moal_recv_event(priv->adapter->pmoal_handle, &mevent); + } - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function allocates the command buffer and links * it to command free queue. - * + * * @param pmadapter A pointer to mlan_adapter structure * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -894,54 +929,55 @@ wlan_recv_event(pmlan_private priv, mlan_event_id event_id, t_void * pmevent) mlan_status wlan_alloc_cmd_buffer(IN mlan_adapter * pmadapter) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; - cmd_ctrl_node *pcmd_array = MNULL; - t_u32 buf_size; - t_u32 i; - - ENTER(); - - /* Allocate and initialize cmd_ctrl_node */ - buf_size = sizeof(cmd_ctrl_node) * MRVDRV_NUM_OF_CMD_BUFFER; - ret = - pcb->moal_malloc(pmadapter->pmoal_handle, buf_size, - MLAN_MEM_DEF | MLAN_MEM_DMA, (t_u8 **) & pcmd_array); - if (ret != MLAN_STATUS_SUCCESS || !pcmd_array) { - PRINTM(MERROR, "ALLOC_CMD_BUF: Failed to allocate pcmd_array\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - - pmadapter->cmd_pool = pcmd_array; - memset(pmadapter, pmadapter->cmd_pool, 0, buf_size); - - /* Allocate and initialize command buffers */ - for (i = 0; i < MRVDRV_NUM_OF_CMD_BUFFER; i++) { - if (!(pcmd_array[i].pmbuf = wlan_alloc_mlan_buffer(pmadapter, - MRVDRV_SIZE_OF_CMD_BUFFER, - 0, - MOAL_MALLOC_BUFFER))) - { - PRINTM(MERROR, - "ALLOC_CMD_BUF: Failed to allocate command buffer\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - } - - for (i = 0; i < MRVDRV_NUM_OF_CMD_BUFFER; i++) { - wlan_insert_cmd_to_free_q(pmadapter, &pcmd_array[i]); - } - ret = MLAN_STATUS_SUCCESS; - done: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; + cmd_ctrl_node *pcmd_array = MNULL; + t_u32 buf_size; + t_u32 i; + + ENTER(); + + /* Allocate and initialize cmd_ctrl_node */ + buf_size = sizeof(cmd_ctrl_node) * MRVDRV_NUM_OF_CMD_BUFFER; + ret = pcb->moal_malloc(pmadapter->pmoal_handle, buf_size, + MLAN_MEM_DEF | MLAN_MEM_DMA, + (t_u8 **) & pcmd_array); + if (ret != MLAN_STATUS_SUCCESS || !pcmd_array) { + PRINTM(MERROR, + "ALLOC_CMD_BUF: Failed to allocate pcmd_array\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + + pmadapter->cmd_pool = pcmd_array; + memset(pmadapter, pmadapter->cmd_pool, 0, buf_size); + + /* Allocate and initialize command buffers */ + for (i = 0; i < MRVDRV_NUM_OF_CMD_BUFFER; i++) { + if (!(pcmd_array[i].pmbuf = wlan_alloc_mlan_buffer(pmadapter, + MRVDRV_SIZE_OF_CMD_BUFFER, + 0, + MOAL_MALLOC_BUFFER))) + { + PRINTM(MERROR, + "ALLOC_CMD_BUF: Failed to allocate command buffer\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + } + + for (i = 0; i < MRVDRV_NUM_OF_CMD_BUFFER; i++) { + wlan_insert_cmd_to_free_q(pmadapter, &pcmd_array[i]); + } + ret = MLAN_STATUS_SUCCESS; +done: + LEAVE(); + return ret; } /** * @brief This function frees the command buffer. - * + * * @param pmadapter A pointer to mlan_adapter structure * * @return MLAN_STATUS_SUCCESS @@ -949,47 +985,48 @@ wlan_alloc_cmd_buffer(IN mlan_adapter * pmadapter) mlan_status wlan_free_cmd_buffer(IN mlan_adapter * pmadapter) { - mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; - cmd_ctrl_node *pcmd_array; - t_u32 i; - - ENTER(); - - /* Need to check if cmd pool is allocated or not */ - if (pmadapter->cmd_pool == MNULL) { - PRINTM(MINFO, "FREE_CMD_BUF: cmd_pool is Null\n"); - goto done; - } - - pcmd_array = pmadapter->cmd_pool; - - /* Release shared memory buffers */ - for (i = 0; i < MRVDRV_NUM_OF_CMD_BUFFER; i++) { - if (pcmd_array[i].pmbuf) { - PRINTM(MINFO, "Free all the command buffer.\n"); - wlan_free_mlan_buffer(pmadapter, pcmd_array[i].pmbuf); - pcmd_array[i].pmbuf = MNULL; - } - if (pcmd_array[i].respbuf) { - wlan_free_mlan_buffer(pmadapter, pcmd_array[i].respbuf); - pcmd_array[i].respbuf = MNULL; - } - } - /* Release cmd_ctrl_node */ - if (pmadapter->cmd_pool) { - PRINTM(MINFO, "Free command pool.\n"); - pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) pmadapter->cmd_pool); - pmadapter->cmd_pool = MNULL; - } - - done: - LEAVE(); - return MLAN_STATUS_SUCCESS; -} - -/** + mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; + cmd_ctrl_node *pcmd_array; + t_u32 i; + + ENTER(); + + /* Need to check if cmd pool is allocated or not */ + if (pmadapter->cmd_pool == MNULL) { + PRINTM(MINFO, "FREE_CMD_BUF: cmd_pool is Null\n"); + goto done; + } + + pcmd_array = pmadapter->cmd_pool; + + /* Release shared memory buffers */ + for (i = 0; i < MRVDRV_NUM_OF_CMD_BUFFER; i++) { + if (pcmd_array[i].pmbuf) { + PRINTM(MINFO, "Free all the command buffer.\n"); + wlan_free_mlan_buffer(pmadapter, pcmd_array[i].pmbuf); + pcmd_array[i].pmbuf = MNULL; + } + if (pcmd_array[i].respbuf) { + wlan_free_mlan_buffer(pmadapter, pcmd_array[i].respbuf); + pcmd_array[i].respbuf = MNULL; + } + } + /* Release cmd_ctrl_node */ + if (pmadapter->cmd_pool) { + PRINTM(MINFO, "Free command pool.\n"); + pcb->moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pmadapter->cmd_pool); + pmadapter->cmd_pool = MNULL; + } + +done: + LEAVE(); + return MLAN_STATUS_SUCCESS; +} + +/** * @brief This function handles events generated by firmware - * + * * @param pmadapter A pointer to mlan_adapter structure * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -997,68 +1034,70 @@ wlan_free_cmd_buffer(IN mlan_adapter * pmadapter) mlan_status wlan_process_event(pmlan_adapter pmadapter) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private priv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); - pmlan_buffer pmbuf = pmadapter->pmlan_buffer_event; - t_u32 eventcause = pmadapter->event_cause; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private priv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); + pmlan_buffer pmbuf = pmadapter->pmlan_buffer_event; + t_u32 eventcause = pmadapter->event_cause; #ifdef DEBUG_LEVEL1 - t_u32 in_ts_sec = 0, in_ts_usec = 0; + t_u32 in_ts_sec = 0, in_ts_usec = 0; #endif - ENTER(); - - /* Save the last event to debug log */ - pmadapter->dbg.last_event_index = - (pmadapter->dbg.last_event_index + 1) % DBG_CMD_NUM; - pmadapter->dbg.last_event[pmadapter->dbg.last_event_index] = - (t_u16) eventcause; - - if ((eventcause & EVENT_ID_MASK) == EVENT_RADAR_DETECTED) { - if (wlan_11h_dfs_event_preprocessing(pmadapter) == MLAN_STATUS_SUCCESS) { - memcpy(pmadapter, (t_u8 *) & eventcause, - pmbuf->pbuf + pmbuf->data_offset, sizeof(eventcause)); - } - } - /* Get BSS number and corresponding priv */ - priv = - wlan_get_priv_by_id(pmadapter, EVENT_GET_BSS_NUM(eventcause), - EVENT_GET_BSS_TYPE(eventcause)); - if (!priv) - priv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); - - /* Clear BSS_NO_BITS from event */ - eventcause &= EVENT_ID_MASK; - pmadapter->event_cause = eventcause; - - if (pmbuf) { - pmbuf->bss_index = priv->bss_index; - memcpy(pmadapter, - pmbuf->pbuf + pmbuf->data_offset, - (t_u8 *) & eventcause, sizeof(eventcause)); - } - - if (MTRUE && (eventcause != EVENT_PS_SLEEP && eventcause != EVENT_PS_AWAKE) - ) { - PRINTM_GET_SYS_TIME(MEVENT, &in_ts_sec, &in_ts_usec); - PRINTM_NETINTF(MEVENT, priv); - PRINTM(MEVENT, "%lu.%06lu : Event: 0x%x\n", in_ts_sec, in_ts_usec, - eventcause); - } - - ret = priv->ops.process_event(priv); - - pmadapter->event_cause = 0; - pmadapter->pmlan_buffer_event = MNULL; - if (pmbuf) { - wlan_free_mlan_buffer(pmadapter, pmbuf); - } - - LEAVE(); - return ret; -} - -/** + ENTER(); + + /* Save the last event to debug log */ + pmadapter->dbg.last_event_index = + (pmadapter->dbg.last_event_index + 1) % DBG_CMD_NUM; + pmadapter->dbg.last_event[pmadapter->dbg.last_event_index] = + (t_u16) eventcause; + + if ((eventcause & EVENT_ID_MASK) == EVENT_RADAR_DETECTED) { + if (wlan_11h_dfs_event_preprocessing(pmadapter) == + MLAN_STATUS_SUCCESS) { + memcpy(pmadapter, (t_u8 *) & eventcause, + pmbuf->pbuf + pmbuf->data_offset, + sizeof(eventcause)); + } + } + /* Get BSS number and corresponding priv */ + priv = wlan_get_priv_by_id(pmadapter, EVENT_GET_BSS_NUM(eventcause), + EVENT_GET_BSS_TYPE(eventcause)); + if (!priv) + priv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); + + /* Clear BSS_NO_BITS from event */ + eventcause &= EVENT_ID_MASK; + pmadapter->event_cause = eventcause; + + if (pmbuf) { + pmbuf->bss_index = priv->bss_index; + memcpy(pmadapter, + pmbuf->pbuf + pmbuf->data_offset, + (t_u8 *) & eventcause, sizeof(eventcause)); + } + + if (MTRUE + && (eventcause != EVENT_PS_SLEEP && eventcause != EVENT_PS_AWAKE) + ) { + PRINTM_GET_SYS_TIME(MEVENT, &in_ts_sec, &in_ts_usec); + PRINTM_NETINTF(MEVENT, priv); + PRINTM(MEVENT, "%lu.%06lu : Event: 0x%x\n", in_ts_sec, + in_ts_usec, eventcause); + } + + ret = priv->ops.process_event(priv); + + pmadapter->event_cause = 0; + pmadapter->pmlan_buffer_event = MNULL; + if (pmbuf) { + wlan_free_mlan_buffer(pmadapter, pmbuf); + } + + LEAVE(); + return ret; +} + +/** * @brief This function requests a lock on command queue. - * + * * @param pmadapter A pointer to mlan_adapter structure * * @return N/A @@ -1066,20 +1105,20 @@ wlan_process_event(pmlan_adapter pmadapter) t_void wlan_request_cmd_lock(IN mlan_adapter * pmadapter) { - mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; + mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; - ENTER(); + ENTER(); - /* Call MOAL spin lock callback function */ - pcb->moal_spin_lock(pmadapter->pmoal_handle, pmadapter->pmlan_cmd_lock); + /* Call MOAL spin lock callback function */ + pcb->moal_spin_lock(pmadapter->pmoal_handle, pmadapter->pmlan_cmd_lock); - LEAVE(); - return; + LEAVE(); + return; } -/** +/** * @brief This function releases a lock on command queue. - * + * * @param pmadapter A pointer to mlan_adapter structure * * @return N/A @@ -1087,20 +1126,21 @@ wlan_request_cmd_lock(IN mlan_adapter * pmadapter) t_void wlan_release_cmd_lock(IN mlan_adapter * pmadapter) { - mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; + mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; - ENTER(); + ENTER(); - /* Call MOAL spin unlock callback function */ - pcb->moal_spin_unlock(pmadapter->pmoal_handle, pmadapter->pmlan_cmd_lock); + /* Call MOAL spin unlock callback function */ + pcb->moal_spin_unlock(pmadapter->pmoal_handle, + pmadapter->pmlan_cmd_lock); - LEAVE(); - return; + LEAVE(); + return; } -/** +/** * @brief This function prepare the command before sending to firmware. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd_no Command number * @param cmd_action Command action: GET or SET @@ -1112,114 +1152,118 @@ wlan_release_cmd_lock(IN mlan_adapter * pmadapter) */ mlan_status wlan_prepare_cmd(IN mlan_private * pmpriv, - IN t_u16 cmd_no, - IN t_u16 cmd_action, - IN t_u32 cmd_oid, - IN t_void * pioctl_buf, IN t_void * pdata_buf) -{ - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = pmpriv->adapter; - cmd_ctrl_node *pcmd_node = MNULL; - HostCmd_DS_COMMAND *cmd_ptr = MNULL; - pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; - - ENTER(); - - /* Sanity test */ - if (!pmadapter || pmadapter->surprise_removed) { - PRINTM(MERROR, "PREP_CMD: Card is Removed\n"); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_FW_NOT_READY; - ret = MLAN_STATUS_FAILURE; - goto done; - } - - if (pmadapter->hw_status == WlanHardwareStatusReset) { - if ((cmd_no != HostCmd_CMD_FUNC_INIT) - ) { - PRINTM(MERROR, "PREP_CMD: FW is in reset state\n"); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_FW_NOT_READY; - ret = MLAN_STATUS_FAILURE; - goto done; - } - } - - /* Get a new command node */ - pcmd_node = wlan_get_cmd_node(pmadapter); - - if (pcmd_node == MNULL) { - PRINTM(MERROR, "PREP_CMD: No free cmd node\n"); - wlan_dump_info(pmadapter, REASON_CODE_NO_CMD_NODE); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_NO_MEM; - ret = MLAN_STATUS_FAILURE; - goto done; - } - - /* Initialize the command node */ - wlan_init_cmd_node(pmpriv, pcmd_node, cmd_oid, pioctl_buf, pdata_buf); - - if (pcmd_node->cmdbuf == MNULL) { - PRINTM(MERROR, "PREP_CMD: No free cmd buf\n"); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_NO_MEM; - ret = MLAN_STATUS_FAILURE; - goto done; - } - - cmd_ptr = - (HostCmd_DS_COMMAND *) (pcmd_node->cmdbuf->pbuf + - pcmd_node->cmdbuf->data_offset); - cmd_ptr->command = cmd_no; - cmd_ptr->result = 0; - - /* Prepare command */ - if (cmd_no) - ret = - pmpriv->ops.prepare_cmd(pmpriv, cmd_no, cmd_action, cmd_oid, - pioctl_buf, pdata_buf, cmd_ptr); - else { - ret = wlan_cmd_host_cmd(pmpriv, cmd_ptr, pdata_buf); - pcmd_node->cmd_flag |= CMD_F_HOSTCMD; - } - - /* Return error, since the command preparation failed */ - if (ret != MLAN_STATUS_SUCCESS) { - PRINTM(MERROR, "PREP_CMD: Command 0x%x preparation failed\n", cmd_no); - pcmd_node->pioctl_buf = MNULL; - wlan_insert_cmd_to_free_q(pmadapter, pcmd_node); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_CMD_DNLD_FAIL; - ret = MLAN_STATUS_FAILURE; - goto done; - } - - /* Send command */ + IN t_u16 cmd_no, + IN t_u16 cmd_action, + IN t_u32 cmd_oid, + IN t_void * pioctl_buf, IN t_void * pdata_buf) +{ + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + cmd_ctrl_node *pcmd_node = MNULL; + HostCmd_DS_COMMAND *cmd_ptr = MNULL; + pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; + + ENTER(); + + /* Sanity test */ + if (!pmadapter || pmadapter->surprise_removed) { + PRINTM(MERROR, "PREP_CMD: Card is Removed\n"); + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_FW_NOT_READY; + ret = MLAN_STATUS_FAILURE; + goto done; + } + + if (pmadapter->hw_status == WlanHardwareStatusReset) { + if ((cmd_no != HostCmd_CMD_FUNC_INIT) + ) { + PRINTM(MERROR, "PREP_CMD: FW is in reset state\n"); + if (pioctl_req) + pioctl_req->status_code = + MLAN_ERROR_FW_NOT_READY; + ret = MLAN_STATUS_FAILURE; + goto done; + } + } + + /* Get a new command node */ + pcmd_node = wlan_get_cmd_node(pmadapter); + + if (pcmd_node == MNULL) { + PRINTM(MERROR, "PREP_CMD: No free cmd node\n"); + wlan_dump_info(pmadapter, REASON_CODE_NO_CMD_NODE); + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_NO_MEM; + ret = MLAN_STATUS_FAILURE; + goto done; + } + + /* Initialize the command node */ + wlan_init_cmd_node(pmpriv, pcmd_node, cmd_oid, pioctl_buf, pdata_buf); + + if (pcmd_node->cmdbuf == MNULL) { + PRINTM(MERROR, "PREP_CMD: No free cmd buf\n"); + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_NO_MEM; + ret = MLAN_STATUS_FAILURE; + goto done; + } + + cmd_ptr = + (HostCmd_DS_COMMAND *) (pcmd_node->cmdbuf->pbuf + + pcmd_node->cmdbuf->data_offset); + cmd_ptr->command = cmd_no; + cmd_ptr->result = 0; + + /* Prepare command */ + if (cmd_no) + ret = pmpriv->ops.prepare_cmd(pmpriv, cmd_no, cmd_action, + cmd_oid, pioctl_buf, pdata_buf, + cmd_ptr); + else { + ret = wlan_cmd_host_cmd(pmpriv, cmd_ptr, pdata_buf); + pcmd_node->cmd_flag |= CMD_F_HOSTCMD; + } + + /* Return error, since the command preparation failed */ + if (ret != MLAN_STATUS_SUCCESS) { + PRINTM(MERROR, "PREP_CMD: Command 0x%x preparation failed\n", + cmd_no); + pcmd_node->pioctl_buf = MNULL; + wlan_insert_cmd_to_free_q(pmadapter, pcmd_node); + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_CMD_DNLD_FAIL; + ret = MLAN_STATUS_FAILURE; + goto done; + } + + /* Send command */ #ifdef STA_SUPPORT - if (cmd_no == HostCmd_CMD_802_11_SCAN - || cmd_no == HostCmd_CMD_802_11_SCAN_EXT) - wlan_queue_scan_cmd(pmpriv, pcmd_node); - else { + if (cmd_no == HostCmd_CMD_802_11_SCAN + || cmd_no == HostCmd_CMD_802_11_SCAN_EXT) + wlan_queue_scan_cmd(pmpriv, pcmd_node); + else { #endif - if ((cmd_no == HostCmd_CMD_802_11_HS_CFG_ENH) && - (cmd_action == HostCmd_ACT_GEN_SET) && - (pmadapter->hs_cfg.conditions == HOST_SLEEP_CFG_CANCEL)) - wlan_insert_cmd_to_pending_q(pmadapter, pcmd_node, MFALSE); - else - wlan_insert_cmd_to_pending_q(pmadapter, pcmd_node, MTRUE); + if ((cmd_no == HostCmd_CMD_802_11_HS_CFG_ENH) && + (cmd_action == HostCmd_ACT_GEN_SET) && + (pmadapter->hs_cfg.conditions == HOST_SLEEP_CFG_CANCEL)) + wlan_insert_cmd_to_pending_q(pmadapter, pcmd_node, + MFALSE); + else + wlan_insert_cmd_to_pending_q(pmadapter, pcmd_node, + MTRUE); #ifdef STA_SUPPORT - } + } #endif - done: - LEAVE(); - return ret; +done: + LEAVE(); + return ret; } -/** +/** * @brief This function inserts command node to cmd_free_q * after cleaning it. - * + * * @param pmadapter A pointer to mlan_adapter structure * @param pcmd_node A pointer to cmd_ctrl_node structure * @@ -1227,38 +1271,40 @@ wlan_prepare_cmd(IN mlan_private * pmpriv, */ t_void wlan_insert_cmd_to_free_q(IN mlan_adapter * pmadapter, - IN cmd_ctrl_node * pcmd_node) -{ - mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; - mlan_ioctl_req *pioctl_req = MNULL; - ENTER(); - - if (pcmd_node == MNULL) - goto done; - if (pcmd_node->pioctl_buf) { - pioctl_req = (mlan_ioctl_req *) pcmd_node->pioctl_buf; - if (pioctl_req->status_code != MLAN_ERROR_NO_ERROR) - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, - pioctl_req, MLAN_STATUS_FAILURE); - else - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, - pioctl_req, MLAN_STATUS_SUCCESS); - } - /* Clean the node */ - wlan_clean_cmd_node(pmadapter, pcmd_node); - - /* Insert node into cmd_free_q */ - util_enqueue_list_tail(pmadapter->pmoal_handle, &pmadapter->cmd_free_q, - (pmlan_linked_list) pcmd_node, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock); - done: - LEAVE(); -} - -/** + IN cmd_ctrl_node * pcmd_node) +{ + mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; + mlan_ioctl_req *pioctl_req = MNULL; + ENTER(); + + if (pcmd_node == MNULL) + goto done; + if (pcmd_node->pioctl_buf) { + pioctl_req = (mlan_ioctl_req *) pcmd_node->pioctl_buf; + if (pioctl_req->status_code != MLAN_ERROR_NO_ERROR) + pcb->moal_ioctl_complete(pmadapter->pmoal_handle, + pioctl_req, + MLAN_STATUS_FAILURE); + else + pcb->moal_ioctl_complete(pmadapter->pmoal_handle, + pioctl_req, + MLAN_STATUS_SUCCESS); + } + /* Clean the node */ + wlan_clean_cmd_node(pmadapter, pcmd_node); + + /* Insert node into cmd_free_q */ + util_enqueue_list_tail(pmadapter->pmoal_handle, &pmadapter->cmd_free_q, + (pmlan_linked_list) pcmd_node, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); +done: + LEAVE(); +} + +/** * @brief This function queues the command to cmd list. - * + * * @param pmadapter A pointer to mlan_adapter structure * @param pcmd_node A pointer to cmd_ctrl_node structure * @param add_tail Specify if the cmd needs to be queued in the header or tail @@ -1267,140 +1313,142 @@ wlan_insert_cmd_to_free_q(IN mlan_adapter * pmadapter, */ t_void wlan_insert_cmd_to_pending_q(IN mlan_adapter * pmadapter, - IN cmd_ctrl_node * pcmd_node, IN t_u32 add_tail) -{ - HostCmd_DS_COMMAND *pcmd = MNULL; - t_u16 command; - - ENTER(); - - if (pcmd_node == MNULL) { - PRINTM(MERROR, "QUEUE_CMD: pcmd_node is MNULL\n"); - goto done; - } - - pcmd = - (HostCmd_DS_COMMAND *) (pcmd_node->cmdbuf->pbuf + - pcmd_node->cmdbuf->data_offset); - - command = wlan_le16_to_cpu(pcmd->command); - - /* Exit_PS command needs to be queued in the header always. */ - if (command == HostCmd_CMD_802_11_PS_MODE_ENH) { - HostCmd_DS_802_11_PS_MODE_ENH *pm = &pcmd->params.psmode_enh; - if (wlan_le16_to_cpu(pm->action) == DIS_AUTO_PS) { - if (pmadapter->ps_state != PS_STATE_AWAKE) - add_tail = MFALSE; - } - } - - if (add_tail) { - util_enqueue_list_tail(pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, - (pmlan_linked_list) pcmd_node, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock); - } else { - util_enqueue_list_head(pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, - (pmlan_linked_list) pcmd_node, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock); - } - - PRINTM_NETINTF(MCMND, pcmd_node->priv); - PRINTM(MCMND, "QUEUE_CMD: cmd=0x%x is queued\n", command); - - done: - LEAVE(); - return; -} - -/** + IN cmd_ctrl_node * pcmd_node, IN t_u32 add_tail) +{ + HostCmd_DS_COMMAND *pcmd = MNULL; + t_u16 command; + + ENTER(); + + if (pcmd_node == MNULL) { + PRINTM(MERROR, "QUEUE_CMD: pcmd_node is MNULL\n"); + goto done; + } + + pcmd = (HostCmd_DS_COMMAND *) (pcmd_node->cmdbuf->pbuf + + pcmd_node->cmdbuf->data_offset); + + command = wlan_le16_to_cpu(pcmd->command); + + /* Exit_PS command needs to be queued in the header always. */ + if (command == HostCmd_CMD_802_11_PS_MODE_ENH) { + HostCmd_DS_802_11_PS_MODE_ENH *pm = &pcmd->params.psmode_enh; + if (wlan_le16_to_cpu(pm->action) == DIS_AUTO_PS) { + if (pmadapter->ps_state != PS_STATE_AWAKE) + add_tail = MFALSE; + } + } + + if (add_tail) { + util_enqueue_list_tail(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + (pmlan_linked_list) pcmd_node, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); + } else { + util_enqueue_list_head(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + (pmlan_linked_list) pcmd_node, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); + } + + PRINTM_NETINTF(MCMND, pcmd_node->priv); + PRINTM(MCMND, "QUEUE_CMD: cmd=0x%x is queued\n", command); + +done: + LEAVE(); + return; +} + +/** * @brief This function executes next command in command * pending queue. It will put firmware back to PS mode * if applicable. - * + * * @param pmadapter A pointer to mlan_adapter structure * - * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE + * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ mlan_status wlan_exec_next_cmd(mlan_adapter * pmadapter) { - mlan_private *priv = MNULL; - cmd_ctrl_node *pcmd_node = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - HostCmd_DS_COMMAND *pcmd; - - ENTER(); - - /* Sanity test */ - if (pmadapter == MNULL) { - PRINTM(MERROR, "EXEC_NEXT_CMD: pmadapter is MNULL\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - /* Check if already in processing */ - if (pmadapter->curr_cmd) { - PRINTM(MERROR, "EXEC_NEXT_CMD: there is command in processing!\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - - wlan_request_cmd_lock(pmadapter); - /* Check if any command is pending */ - pcmd_node = - (cmd_ctrl_node *) util_peek_list(pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock); - - if (pcmd_node) { - pcmd = - (HostCmd_DS_COMMAND *) (pcmd_node->cmdbuf->pbuf + - pcmd_node->cmdbuf->data_offset); - priv = pcmd_node->priv; - - if (pmadapter->ps_state != PS_STATE_AWAKE) { - PRINTM(MERROR, - "Cannot send command in sleep state, this should not happen\n"); - wlan_release_cmd_lock(pmadapter); - goto done; - } - - util_unlink_list(pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, - (pmlan_linked_list) pcmd_node, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock); - wlan_release_cmd_lock(pmadapter); - ret = wlan_dnld_cmd_to_fw(priv, pcmd_node); - priv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); - /* Any command sent to the firmware when host is in sleep mode, should - de-configure host sleep */ - /* We should skip the host sleep configuration command itself though */ - if (priv && - (pcmd->command != - wlan_cpu_to_le16(HostCmd_CMD_802_11_HS_CFG_ENH))) { - if (pmadapter->hs_activated == MTRUE) { - pmadapter->is_hs_configured = MFALSE; - wlan_host_sleep_activated_event(priv, MFALSE); - } - } - goto done; - } else { - wlan_release_cmd_lock(pmadapter); - } - ret = MLAN_STATUS_SUCCESS; - done: - LEAVE(); - return ret; -} - -/** + mlan_private *priv = MNULL; + cmd_ctrl_node *pcmd_node = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + HostCmd_DS_COMMAND *pcmd; + + ENTER(); + + /* Sanity test */ + if (pmadapter == MNULL) { + PRINTM(MERROR, "EXEC_NEXT_CMD: pmadapter is MNULL\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + /* Check if already in processing */ + if (pmadapter->curr_cmd) { + PRINTM(MERROR, + "EXEC_NEXT_CMD: there is command in processing!\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + + wlan_request_cmd_lock(pmadapter); + /* Check if any command is pending */ + pcmd_node = + (cmd_ctrl_node *) util_peek_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + pmadapter->callbacks. + moal_spin_lock, + pmadapter->callbacks. + moal_spin_unlock); + + if (pcmd_node) { + pcmd = (HostCmd_DS_COMMAND *) (pcmd_node->cmdbuf->pbuf + + pcmd_node->cmdbuf->data_offset); + priv = pcmd_node->priv; + + if (pmadapter->ps_state != PS_STATE_AWAKE) { + PRINTM(MERROR, + "Cannot send command in sleep state, this should not happen\n"); + wlan_release_cmd_lock(pmadapter); + goto done; + } + + util_unlink_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + (pmlan_linked_list) pcmd_node, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); + wlan_release_cmd_lock(pmadapter); + ret = wlan_dnld_cmd_to_fw(priv, pcmd_node); + priv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); + /* Any command sent to the firmware when host is in sleep mode, + should de-configure host sleep */ + /* We should skip the host sleep configuration command itself + though */ + if (priv && + (pcmd->command != + wlan_cpu_to_le16(HostCmd_CMD_802_11_HS_CFG_ENH))) { + if (pmadapter->hs_activated == MTRUE) { + pmadapter->is_hs_configured = MFALSE; + wlan_host_sleep_activated_event(priv, MFALSE); + } + } + goto done; + } else { + wlan_release_cmd_lock(pmadapter); + } + ret = MLAN_STATUS_SUCCESS; +done: + LEAVE(); + return ret; +} + +/** * @brief This function handles the command response - * + * * @param pmadapter A pointer to mlan_adapter structure * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -1408,278 +1456,291 @@ wlan_exec_next_cmd(mlan_adapter * pmadapter) mlan_status wlan_process_cmdresp(mlan_adapter * pmadapter) { - HostCmd_DS_COMMAND *resp = MNULL; - mlan_private *pmpriv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); - mlan_private *pmpriv_next = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u16 orig_cmdresp_no; - t_u16 cmdresp_no; - t_u16 cmdresp_result; - mlan_ioctl_req *pioctl_buf = MNULL; - mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; + HostCmd_DS_COMMAND *resp = MNULL; + mlan_private *pmpriv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); + mlan_private *pmpriv_next = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u16 orig_cmdresp_no; + t_u16 cmdresp_no; + t_u16 cmdresp_result; + mlan_ioctl_req *pioctl_buf = MNULL; + mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; #ifdef DEBUG_LEVEL1 - t_u32 sec = 0, usec = 0; + t_u32 sec = 0, usec = 0; #endif - t_u32 i; - - ENTER(); - - /* Now we got response from FW, cancel the command timer */ - if (pmadapter->cmd_timer_is_set) { - /* Cancel command timeout timer */ - pcb->moal_stop_timer(pmadapter->pmoal_handle, - pmadapter->pmlan_cmd_timer); - /* Cancel command timeout timer */ - pmadapter->cmd_timer_is_set = MFALSE; - } - - if (pmadapter->curr_cmd) - if (pmadapter->curr_cmd->pioctl_buf != MNULL) { - pioctl_buf = (mlan_ioctl_req *) pmadapter->curr_cmd->pioctl_buf; - } - - if (!pmadapter->curr_cmd || !pmadapter->curr_cmd->respbuf) { - resp = (HostCmd_DS_COMMAND *) pmadapter->upld_buf; - resp->command = wlan_le16_to_cpu(resp->command); - PRINTM(MERROR, "CMD_RESP: No curr_cmd, 0x%x\n", resp->command); - if (pioctl_buf) - pioctl_buf->status_code = MLAN_ERROR_CMD_RESP_FAIL; - ret = MLAN_STATUS_FAILURE; - goto done; - } - - pmadapter->num_cmd_timeout = 0; - - DBG_HEXDUMP(MCMD_D, "CMD_RESP", - pmadapter->curr_cmd->respbuf->pbuf + - pmadapter->curr_cmd->respbuf->data_offset, - pmadapter->curr_cmd->respbuf->data_len); - - resp = - (HostCmd_DS_COMMAND *) (pmadapter->curr_cmd->respbuf->pbuf + - pmadapter->curr_cmd->respbuf->data_offset); - wlan_request_cmd_lock(pmadapter); - if (pmadapter->curr_cmd->cmd_flag & CMD_F_CANCELED) { - cmd_ctrl_node *free_cmd = pmadapter->curr_cmd; - pmadapter->curr_cmd = MNULL; - wlan_release_cmd_lock(pmadapter); - PRINTM(MCMND, "CMD_RESP: 0x%x been canceled!\n", - wlan_le16_to_cpu(resp->command)); - wlan_insert_cmd_to_free_q(pmadapter, free_cmd); - if (pioctl_buf) - pioctl_buf->status_code = MLAN_ERROR_CMD_CANCEL; - ret = MLAN_STATUS_FAILURE; - goto done; - } else { - wlan_release_cmd_lock(pmadapter); - } - if (pmadapter->curr_cmd->cmd_flag & CMD_F_HOSTCMD) { - /* Copy original response back to response buffer */ - wlan_ret_host_cmd(pmpriv, resp, pioctl_buf); - } - orig_cmdresp_no = wlan_le16_to_cpu(resp->command); - resp->size = wlan_le16_to_cpu(resp->size); - resp->seq_num = wlan_le16_to_cpu(resp->seq_num); - resp->result = wlan_le16_to_cpu(resp->result); - - /* Get BSS number and corresponding priv */ - pmpriv = - wlan_get_priv_by_id(pmadapter, HostCmd_GET_BSS_NO(resp->seq_num), - HostCmd_GET_BSS_TYPE(resp->seq_num)); - if (!pmpriv) - pmpriv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); - /* Clear RET_BIT from HostCmd */ - resp->command = (orig_cmdresp_no & HostCmd_CMD_ID_MASK); - cmdresp_no = resp->command; - - cmdresp_result = resp->result; - - /* Save the last command response to debug log */ - pmadapter->dbg.last_cmd_resp_index = - (pmadapter->dbg.last_cmd_resp_index + 1) % DBG_CMD_NUM; - pmadapter->dbg.last_cmd_resp_id[pmadapter->dbg.last_cmd_resp_index] = - orig_cmdresp_no; - - PRINTM_GET_SYS_TIME(MCMND, &sec, &usec); - PRINTM_NETINTF(MCMND, pmadapter->curr_cmd->priv); - PRINTM(MCMND, "CMD_RESP (%lu.%06lu): 0x%x, result %d, len %d, seqno 0x%x\n", - sec, usec, orig_cmdresp_no, cmdresp_result, resp->size, - resp->seq_num); - - if (!(orig_cmdresp_no & HostCmd_RET_BIT)) { - PRINTM(MERROR, "CMD_RESP: Invalid response to command!\n"); - if (pioctl_buf) { - pioctl_buf->status_code = MLAN_ERROR_FW_CMDRESP; - } - wlan_insert_cmd_to_free_q(pmadapter, pmadapter->curr_cmd); - wlan_request_cmd_lock(pmadapter); - pmadapter->curr_cmd = MNULL; - wlan_release_cmd_lock(pmadapter); - ret = MLAN_STATUS_FAILURE; - goto done; - } - - if (pmadapter->curr_cmd->cmd_flag & CMD_F_HOSTCMD) { - pmadapter->curr_cmd->cmd_flag &= ~CMD_F_HOSTCMD; - if ((cmdresp_result == HostCmd_RESULT_OK) - && (cmdresp_no == HostCmd_CMD_802_11_HS_CFG_ENH)) - ret = wlan_ret_802_11_hs_cfg(pmpriv, resp, pioctl_buf); - } else { - /* handle response */ - ret = pmpriv->ops.process_cmdresp(pmpriv, cmdresp_no, resp, pioctl_buf); - } - - /* Check init command response */ - if (pmadapter->hw_status == WlanHardwareStatusInitializing) { - if (ret == MLAN_STATUS_FAILURE) { + t_u32 i; + + ENTER(); + + /* Now we got response from FW, cancel the command timer */ + if (pmadapter->cmd_timer_is_set) { + /* Cancel command timeout timer */ + pcb->moal_stop_timer(pmadapter->pmoal_handle, + pmadapter->pmlan_cmd_timer); + /* Cancel command timeout timer */ + pmadapter->cmd_timer_is_set = MFALSE; + } + + if (pmadapter->curr_cmd) + if (pmadapter->curr_cmd->pioctl_buf != MNULL) { + pioctl_buf = + (mlan_ioctl_req *) pmadapter->curr_cmd-> + pioctl_buf; + } + + if (!pmadapter->curr_cmd || !pmadapter->curr_cmd->respbuf) { + resp = (HostCmd_DS_COMMAND *) pmadapter->upld_buf; + resp->command = wlan_le16_to_cpu(resp->command); + PRINTM(MERROR, "CMD_RESP: No curr_cmd, 0x%x\n", resp->command); + if (pioctl_buf) + pioctl_buf->status_code = MLAN_ERROR_CMD_RESP_FAIL; + ret = MLAN_STATUS_FAILURE; + goto done; + } + + pmadapter->num_cmd_timeout = 0; + + DBG_HEXDUMP(MCMD_D, "CMD_RESP", + pmadapter->curr_cmd->respbuf->pbuf + + pmadapter->curr_cmd->respbuf->data_offset, + pmadapter->curr_cmd->respbuf->data_len); + + resp = (HostCmd_DS_COMMAND *) (pmadapter->curr_cmd->respbuf->pbuf + + pmadapter->curr_cmd->respbuf-> + data_offset); + wlan_request_cmd_lock(pmadapter); + if (pmadapter->curr_cmd->cmd_flag & CMD_F_CANCELED) { + cmd_ctrl_node *free_cmd = pmadapter->curr_cmd; + pmadapter->curr_cmd = MNULL; + wlan_release_cmd_lock(pmadapter); + PRINTM(MCMND, "CMD_RESP: 0x%x been canceled!\n", + wlan_le16_to_cpu(resp->command)); + wlan_insert_cmd_to_free_q(pmadapter, free_cmd); + if (pioctl_buf) + pioctl_buf->status_code = MLAN_ERROR_CMD_CANCEL; + ret = MLAN_STATUS_FAILURE; + goto done; + } else { + wlan_release_cmd_lock(pmadapter); + } + if (pmadapter->curr_cmd->cmd_flag & CMD_F_HOSTCMD) { + /* Copy original response back to response buffer */ + wlan_ret_host_cmd(pmpriv, resp, pioctl_buf); + } + orig_cmdresp_no = wlan_le16_to_cpu(resp->command); + resp->size = wlan_le16_to_cpu(resp->size); + resp->seq_num = wlan_le16_to_cpu(resp->seq_num); + resp->result = wlan_le16_to_cpu(resp->result); + + /* Get BSS number and corresponding priv */ + pmpriv = wlan_get_priv_by_id(pmadapter, + HostCmd_GET_BSS_NO(resp->seq_num), + HostCmd_GET_BSS_TYPE(resp->seq_num)); + if (!pmpriv) + pmpriv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); + /* Clear RET_BIT from HostCmd */ + resp->command = (orig_cmdresp_no & HostCmd_CMD_ID_MASK); + cmdresp_no = resp->command; + + cmdresp_result = resp->result; + + /* Save the last command response to debug log */ + pmadapter->dbg.last_cmd_resp_index = + (pmadapter->dbg.last_cmd_resp_index + 1) % DBG_CMD_NUM; + pmadapter->dbg.last_cmd_resp_id[pmadapter->dbg.last_cmd_resp_index] = + orig_cmdresp_no; + + PRINTM_GET_SYS_TIME(MCMND, &sec, &usec); + PRINTM_NETINTF(MCMND, pmadapter->curr_cmd->priv); + PRINTM(MCMND, + "CMD_RESP (%lu.%06lu): 0x%x, result %d, len %d, seqno 0x%x\n", + sec, usec, orig_cmdresp_no, cmdresp_result, resp->size, + resp->seq_num); + + if (!(orig_cmdresp_no & HostCmd_RET_BIT)) { + PRINTM(MERROR, "CMD_RESP: Invalid response to command!\n"); + if (pioctl_buf) { + pioctl_buf->status_code = MLAN_ERROR_FW_CMDRESP; + } + wlan_insert_cmd_to_free_q(pmadapter, pmadapter->curr_cmd); + wlan_request_cmd_lock(pmadapter); + pmadapter->curr_cmd = MNULL; + wlan_release_cmd_lock(pmadapter); + ret = MLAN_STATUS_FAILURE; + goto done; + } + + if (pmadapter->curr_cmd->cmd_flag & CMD_F_HOSTCMD) { + pmadapter->curr_cmd->cmd_flag &= ~CMD_F_HOSTCMD; + if ((cmdresp_result == HostCmd_RESULT_OK) + && (cmdresp_no == HostCmd_CMD_802_11_HS_CFG_ENH)) + ret = wlan_ret_802_11_hs_cfg(pmpriv, resp, pioctl_buf); + } else { + /* handle response */ + ret = pmpriv->ops.process_cmdresp(pmpriv, cmdresp_no, resp, + pioctl_buf); + } + + /* Check init command response */ + if (pmadapter->hw_status == WlanHardwareStatusInitializing) { + if (ret == MLAN_STATUS_FAILURE) { #if defined(STA_SUPPORT) - if (pmadapter->pwarm_reset_ioctl_req) { - /* warm reset failure */ - pmadapter->pwarm_reset_ioctl_req->status_code = - MLAN_ERROR_CMD_RESP_FAIL; - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, - pmadapter->pwarm_reset_ioctl_req, - MLAN_STATUS_FAILURE); - pmadapter->pwarm_reset_ioctl_req = MNULL; - goto done; - } + if (pmadapter->pwarm_reset_ioctl_req) { + /* warm reset failure */ + pmadapter->pwarm_reset_ioctl_req->status_code = + MLAN_ERROR_CMD_RESP_FAIL; + pcb->moal_ioctl_complete(pmadapter-> + pmoal_handle, + pmadapter-> + pwarm_reset_ioctl_req, + MLAN_STATUS_FAILURE); + pmadapter->pwarm_reset_ioctl_req = MNULL; + goto done; + } #endif - PRINTM(MERROR, "cmd 0x%02x failed during initialization\n", - cmdresp_no); - wlan_init_fw_complete(pmadapter); - goto done; - } - } - - wlan_request_cmd_lock(pmadapter); - if (pmadapter->curr_cmd) { - cmd_ctrl_node *free_cmd = pmadapter->curr_cmd; - pioctl_buf = (mlan_ioctl_req *) pmadapter->curr_cmd->pioctl_buf; - pmadapter->curr_cmd = MNULL; - wlan_release_cmd_lock(pmadapter); - - if (pioctl_buf && (ret == MLAN_STATUS_SUCCESS)) - pioctl_buf->status_code = MLAN_ERROR_NO_ERROR; - else if (pioctl_buf && (ret == MLAN_STATUS_FAILURE) && - !pioctl_buf->status_code) - pioctl_buf->status_code = MLAN_ERROR_CMD_RESP_FAIL; - - /* Clean up and put current command back to cmd_free_q */ - wlan_insert_cmd_to_free_q(pmadapter, free_cmd); - } else { - wlan_release_cmd_lock(pmadapter); - } - - if ((pmadapter->hw_status == WlanHardwareStatusInitializing) && - (pmadapter->last_init_cmd == cmdresp_no)) { - i = pmpriv->bss_index + 1; - while (i < pmadapter->priv_num && !(pmpriv_next = pmadapter->priv[i])) - i++; - if (pmpriv_next && pmpriv_next->bss_virtual) { - i = pmpriv_next->bss_index + 1; - /** skip virtual interface */ - while (i < pmadapter->priv_num && - !(pmpriv_next = pmadapter->priv[i])) - i++; - } - if (!pmpriv_next || i >= pmadapter->priv_num) { + PRINTM(MERROR, + "cmd 0x%02x failed during initialization\n", + cmdresp_no); + wlan_init_fw_complete(pmadapter); + goto done; + } + } + + wlan_request_cmd_lock(pmadapter); + if (pmadapter->curr_cmd) { + cmd_ctrl_node *free_cmd = pmadapter->curr_cmd; + pioctl_buf = (mlan_ioctl_req *) pmadapter->curr_cmd->pioctl_buf; + pmadapter->curr_cmd = MNULL; + wlan_release_cmd_lock(pmadapter); + + if (pioctl_buf && (ret == MLAN_STATUS_SUCCESS)) + pioctl_buf->status_code = MLAN_ERROR_NO_ERROR; + else if (pioctl_buf && (ret == MLAN_STATUS_FAILURE) && + !pioctl_buf->status_code) + pioctl_buf->status_code = MLAN_ERROR_CMD_RESP_FAIL; + + /* Clean up and put current command back to cmd_free_q */ + wlan_insert_cmd_to_free_q(pmadapter, free_cmd); + } else { + wlan_release_cmd_lock(pmadapter); + } + + if ((pmadapter->hw_status == WlanHardwareStatusInitializing) && + (pmadapter->last_init_cmd == cmdresp_no)) { + i = pmpriv->bss_index + 1; + while (i < pmadapter->priv_num && + !(pmpriv_next = pmadapter->priv[i])) + i++; + if (pmpriv_next && pmpriv_next->bss_virtual) { + i = pmpriv_next->bss_index + 1; + /** skip virtual interface */ + while (i < pmadapter->priv_num && + !(pmpriv_next = pmadapter->priv[i])) + i++; + } + if (!pmpriv_next || i >= pmadapter->priv_num) { #if defined(STA_SUPPORT) - if (pmadapter->pwarm_reset_ioctl_req) { - /* warm reset complete */ - pmadapter->hw_status = WlanHardwareStatusReady; - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, - pmadapter->pwarm_reset_ioctl_req, - MLAN_STATUS_SUCCESS); - pmadapter->pwarm_reset_ioctl_req = MNULL; - goto done; - } + if (pmadapter->pwarm_reset_ioctl_req) { + /* warm reset complete */ + pmadapter->hw_status = WlanHardwareStatusReady; + pcb->moal_ioctl_complete(pmadapter-> + pmoal_handle, + pmadapter-> + pwarm_reset_ioctl_req, + MLAN_STATUS_SUCCESS); + pmadapter->pwarm_reset_ioctl_req = MNULL; + goto done; + } #endif - pmadapter->hw_status = WlanHardwareStatusInitdone; - } else { - /* Issue init commands for the next interface */ - ret = pmpriv_next->ops.init_cmd(pmpriv_next, MFALSE); - } - } + pmadapter->hw_status = WlanHardwareStatusInitdone; + } else { + /* Issue init commands for the next interface */ + ret = pmpriv_next->ops.init_cmd(pmpriv_next, MFALSE); + } + } - done: - LEAVE(); - return ret; +done: + LEAVE(); + return ret; } -/** +/** * @brief This function handles the timeout of command sending. * It will re-send the same command again. - * + * * @param function_context A pointer to function_context * @return N/A */ t_void wlan_cmd_timeout_func(t_void * function_context) { - mlan_adapter *pmadapter = (mlan_adapter *) function_context; - cmd_ctrl_node *pcmd_node = MNULL; - mlan_ioctl_req *pioctl_buf = MNULL; + mlan_adapter *pmadapter = (mlan_adapter *) function_context; + cmd_ctrl_node *pcmd_node = MNULL; + mlan_ioctl_req *pioctl_buf = MNULL; #ifdef DEBUG_LEVEL1 - t_u32 sec = 0, usec = 0; + t_u32 sec = 0, usec = 0; #endif - t_u8 i; - mlan_private *pmpriv = MNULL; - - ENTER(); - - pmadapter->cmd_timer_is_set = MFALSE; - pmadapter->num_cmd_timeout++; - pmadapter->dbg.num_cmd_timeout++; - if (!pmadapter->curr_cmd) { - PRINTM(MWARN, "CurCmd Empty\n"); - goto exit; - } - pcmd_node = pmadapter->curr_cmd; - if (pcmd_node->pioctl_buf != MNULL) { - pioctl_buf = (mlan_ioctl_req *) pcmd_node->pioctl_buf; - pioctl_buf->status_code = MLAN_ERROR_CMD_TIMEOUT; - } - - pmadapter->dbg.timeout_cmd_id = - pmadapter->dbg.last_cmd_id[pmadapter->dbg.last_cmd_index]; - pmadapter->dbg.timeout_cmd_act = - pmadapter->dbg.last_cmd_act[pmadapter->dbg.last_cmd_index]; - PRINTM_GET_SYS_TIME(MERROR, &sec, &usec); - PRINTM(MERROR, "Timeout cmd id (%lu.%06lu) = 0x%x, act = 0x%x \n", sec, - usec, pmadapter->dbg.timeout_cmd_id, pmadapter->dbg.timeout_cmd_act); - if (pcmd_node->cmdbuf) { - t_u8 *pcmd_buf; - pcmd_buf = - pcmd_node->cmdbuf->pbuf + pcmd_node->cmdbuf->data_offset + - INTF_HEADER_LEN; - for (i = 0; i < 16; i++) { - PRINTM(MERROR, "%02x ", *pcmd_buf++); - } - PRINTM(MERROR, "\n"); - } - - pmpriv = pcmd_node->priv; - if (pmpriv) { - PRINTM(MERROR, "BSS type = %d BSS role= %d\n", pmpriv->bss_type, - pmpriv->bss_role); - } - wlan_dump_info(pmadapter, REASON_CODE_CMD_TIMEOUT); - - if (pmadapter->hw_status == WlanHardwareStatusInitializing) - wlan_init_fw_complete(pmadapter); - else { - /* Signal MOAL to perform extra handling for debugging */ - if (pmpriv) { - wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_DBG_DUMP, MNULL); - } else { - wlan_recv_event(wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY), - MLAN_EVENT_ID_DRV_DBG_DUMP, MNULL); - } - } - - exit: - LEAVE(); - return; + t_u8 i; + mlan_private *pmpriv = MNULL; + + ENTER(); + + pmadapter->cmd_timer_is_set = MFALSE; + pmadapter->num_cmd_timeout++; + pmadapter->dbg.num_cmd_timeout++; + if (!pmadapter->curr_cmd) { + PRINTM(MWARN, "CurCmd Empty\n"); + goto exit; + } + pcmd_node = pmadapter->curr_cmd; + if (pcmd_node->pioctl_buf != MNULL) { + pioctl_buf = (mlan_ioctl_req *) pcmd_node->pioctl_buf; + pioctl_buf->status_code = MLAN_ERROR_CMD_TIMEOUT; + } + + pmadapter->dbg.timeout_cmd_id = + pmadapter->dbg.last_cmd_id[pmadapter->dbg.last_cmd_index]; + pmadapter->dbg.timeout_cmd_act = + pmadapter->dbg.last_cmd_act[pmadapter->dbg.last_cmd_index]; + PRINTM_GET_SYS_TIME(MERROR, &sec, &usec); + PRINTM(MERROR, "Timeout cmd id (%lu.%06lu) = 0x%x, act = 0x%x \n", sec, + usec, pmadapter->dbg.timeout_cmd_id, + pmadapter->dbg.timeout_cmd_act); + if (pcmd_node->cmdbuf) { + t_u8 *pcmd_buf; + pcmd_buf = + pcmd_node->cmdbuf->pbuf + + pcmd_node->cmdbuf->data_offset + INTF_HEADER_LEN; + for (i = 0; i < 16; i++) { + PRINTM(MERROR, "%02x ", *pcmd_buf++); + } + PRINTM(MERROR, "\n"); + } + + pmpriv = pcmd_node->priv; + if (pmpriv) { + PRINTM(MERROR, "BSS type = %d BSS role= %d\n", pmpriv->bss_type, + pmpriv->bss_role); + } + wlan_dump_info(pmadapter, REASON_CODE_CMD_TIMEOUT); + + if (pmadapter->hw_status == WlanHardwareStatusInitializing) + wlan_init_fw_complete(pmadapter); + else { + /* Signal MOAL to perform extra handling for debugging */ + if (pmpriv) { + wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_DBG_DUMP, + MNULL); + } else { + wlan_recv_event(wlan_get_priv + (pmadapter, MLAN_BSS_ROLE_ANY), + MLAN_EVENT_ID_DRV_DBG_DUMP, MNULL); + } + } + +exit: + LEAVE(); + return; } #ifdef STA_SUPPORT @@ -1693,32 +1754,33 @@ wlan_cmd_timeout_func(t_void * function_context) t_void wlan_flush_scan_queue(IN pmlan_adapter pmadapter) { - mlan_callbacks *pcb = (pmlan_callbacks) & pmadapter->callbacks; - cmd_ctrl_node *pcmd_node = MNULL; + mlan_callbacks *pcb = (pmlan_callbacks) & pmadapter->callbacks; + cmd_ctrl_node *pcmd_node = MNULL; - ENTER(); + ENTER(); - while ((pcmd_node = - (cmd_ctrl_node *) util_peek_list(pmadapter->pmoal_handle, - &pmadapter->scan_pending_q, - pcb->moal_spin_lock, - pcb->moal_spin_unlock))) { - util_unlink_list(pmadapter->pmoal_handle, &pmadapter->scan_pending_q, - (pmlan_linked_list) pcmd_node, pcb->moal_spin_lock, - pcb->moal_spin_unlock); - pcmd_node->pioctl_buf = MNULL; - wlan_insert_cmd_to_free_q(pmadapter, pcmd_node); - } - wlan_request_cmd_lock(pmadapter); - pmadapter->scan_processing = MFALSE; - wlan_release_cmd_lock(pmadapter); + while ((pcmd_node = + (cmd_ctrl_node *) util_peek_list(pmadapter->pmoal_handle, + &pmadapter->scan_pending_q, + pcb->moal_spin_lock, + pcb->moal_spin_unlock))) { + util_unlink_list(pmadapter->pmoal_handle, + &pmadapter->scan_pending_q, + (pmlan_linked_list) pcmd_node, + pcb->moal_spin_lock, pcb->moal_spin_unlock); + pcmd_node->pioctl_buf = MNULL; + wlan_insert_cmd_to_free_q(pmadapter, pcmd_node); + } + wlan_request_cmd_lock(pmadapter); + pmadapter->scan_processing = MFALSE; + wlan_release_cmd_lock(pmadapter); - LEAVE(); + LEAVE(); } /** * @brief Cancel pending SCAN ioctl cmd. - * + * * @param pmadapter A pointer to mlan_adapter * * @return N/A @@ -1726,57 +1788,60 @@ wlan_flush_scan_queue(IN pmlan_adapter pmadapter) t_void wlan_cancel_pending_scan_cmd(pmlan_adapter pmadapter) { - pmlan_callbacks pcb = &pmadapter->callbacks; - cmd_ctrl_node *pcmd_node = MNULL; - mlan_ioctl_req *pioctl_buf = MNULL; - ENTER(); - - PRINTM(MIOCTL, "Cancel scan command\n"); - wlan_request_cmd_lock(pmadapter); - if (pmadapter->curr_cmd && pmadapter->curr_cmd->pioctl_buf) { - pioctl_buf = (mlan_ioctl_req *) pmadapter->curr_cmd->pioctl_buf; - if (pioctl_buf->req_id == MLAN_IOCTL_SCAN) { - PRINTM(MIOCTL, "wlan_cancel_scan: current command\n"); - pcmd_node = pmadapter->curr_cmd; - pcmd_node->pioctl_buf = MNULL; - pcmd_node->cmd_flag |= CMD_F_CANCELED; - pioctl_buf->status_code = MLAN_ERROR_CMD_CANCEL; - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, pioctl_buf, - MLAN_STATUS_FAILURE); - } - } - while ((pcmd_node = - wlan_get_pending_ioctl_by_id(pmadapter, - MLAN_IOCTL_SCAN)) != MNULL) { - PRINTM(MIOCTL, - "wlan_cancel_scan: find scan command in cmd_pending_q\n"); - util_unlink_list(pmadapter->pmoal_handle, &pmadapter->cmd_pending_q, - (pmlan_linked_list) pcmd_node, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock); - pioctl_buf = (mlan_ioctl_req *) pcmd_node->pioctl_buf; - pcmd_node->pioctl_buf = MNULL; - pioctl_buf->status_code = MLAN_ERROR_CMD_CANCEL; - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, pioctl_buf, - MLAN_STATUS_FAILURE); - wlan_release_cmd_lock(pmadapter); - wlan_insert_cmd_to_free_q(pmadapter, pcmd_node); - wlan_request_cmd_lock(pmadapter); - } - wlan_release_cmd_lock(pmadapter); - - /* IOCTL will be completed, avoid calling IOCTL complete again from EVENT */ - pmadapter->pext_scan_ioctl_req = MNULL; - /* Cancel all pending scan command */ - wlan_flush_scan_queue(pmadapter); - LEAVE(); - return; + pmlan_callbacks pcb = &pmadapter->callbacks; + cmd_ctrl_node *pcmd_node = MNULL; + mlan_ioctl_req *pioctl_buf = MNULL; + ENTER(); + + PRINTM(MIOCTL, "Cancel scan command\n"); + wlan_request_cmd_lock(pmadapter); + if (pmadapter->curr_cmd && pmadapter->curr_cmd->pioctl_buf) { + pioctl_buf = (mlan_ioctl_req *) pmadapter->curr_cmd->pioctl_buf; + if (pioctl_buf->req_id == MLAN_IOCTL_SCAN) { + PRINTM(MIOCTL, "wlan_cancel_scan: current command\n"); + pcmd_node = pmadapter->curr_cmd; + pcmd_node->pioctl_buf = MNULL; + pcmd_node->cmd_flag |= CMD_F_CANCELED; + pioctl_buf->status_code = MLAN_ERROR_CMD_CANCEL; + pcb->moal_ioctl_complete(pmadapter->pmoal_handle, + pioctl_buf, + MLAN_STATUS_FAILURE); + } + } + while ((pcmd_node = + wlan_get_pending_ioctl_by_id(pmadapter, + MLAN_IOCTL_SCAN)) != MNULL) { + PRINTM(MIOCTL, + "wlan_cancel_scan: find scan command in cmd_pending_q\n"); + util_unlink_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + (pmlan_linked_list) pcmd_node, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); + pioctl_buf = (mlan_ioctl_req *) pcmd_node->pioctl_buf; + pcmd_node->pioctl_buf = MNULL; + pioctl_buf->status_code = MLAN_ERROR_CMD_CANCEL; + pcb->moal_ioctl_complete(pmadapter->pmoal_handle, pioctl_buf, + MLAN_STATUS_FAILURE); + wlan_release_cmd_lock(pmadapter); + wlan_insert_cmd_to_free_q(pmadapter, pcmd_node); + wlan_request_cmd_lock(pmadapter); + } + wlan_release_cmd_lock(pmadapter); + + /* IOCTL will be completed, avoid calling IOCTL complete again from + EVENT */ + pmadapter->pext_scan_ioctl_req = MNULL; + /* Cancel all pending scan command */ + wlan_flush_scan_queue(pmadapter); + LEAVE(); + return; } #endif /** * @brief Cancel all pending cmd. - * + * * @param pmadapter A pointer to mlan_adapter * * @return N/A @@ -1784,51 +1849,56 @@ wlan_cancel_pending_scan_cmd(pmlan_adapter pmadapter) t_void wlan_cancel_all_pending_cmd(pmlan_adapter pmadapter) { - cmd_ctrl_node *pcmd_node = MNULL; - pmlan_callbacks pcb = &pmadapter->callbacks; - mlan_ioctl_req *pioctl_buf = MNULL; - - ENTER(); - /* Cancel current cmd */ - wlan_request_cmd_lock(pmadapter); - if ((pmadapter->curr_cmd) && (pmadapter->curr_cmd->pioctl_buf)) { - pioctl_buf = (mlan_ioctl_req *) pmadapter->curr_cmd->pioctl_buf; - pmadapter->curr_cmd->pioctl_buf = MNULL; - wlan_release_cmd_lock(pmadapter); - pioctl_buf->status_code = MLAN_ERROR_CMD_CANCEL; - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, pioctl_buf, - MLAN_STATUS_FAILURE); - } else { - wlan_release_cmd_lock(pmadapter); - } - /* Cancel all pending command */ - while ((pcmd_node = - (cmd_ctrl_node *) util_peek_list(pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, - pcb->moal_spin_lock, - pcb->moal_spin_unlock))) { - util_unlink_list(pmadapter->pmoal_handle, &pmadapter->cmd_pending_q, - (pmlan_linked_list) pcmd_node, pcb->moal_spin_lock, - pcb->moal_spin_unlock); - if (pcmd_node->pioctl_buf) { - pioctl_buf = (mlan_ioctl_req *) pcmd_node->pioctl_buf; - pioctl_buf->status_code = MLAN_ERROR_CMD_CANCEL; - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, pioctl_buf, - MLAN_STATUS_FAILURE); - pcmd_node->pioctl_buf = MNULL; - } - wlan_insert_cmd_to_free_q(pmadapter, pcmd_node); - } + cmd_ctrl_node *pcmd_node = MNULL; + pmlan_callbacks pcb = &pmadapter->callbacks; + mlan_ioctl_req *pioctl_buf = MNULL; + + ENTER(); + /* Cancel current cmd */ + wlan_request_cmd_lock(pmadapter); + if ((pmadapter->curr_cmd) && (pmadapter->curr_cmd->pioctl_buf)) { + pioctl_buf = (mlan_ioctl_req *) pmadapter->curr_cmd->pioctl_buf; + pmadapter->curr_cmd->pioctl_buf = MNULL; + wlan_release_cmd_lock(pmadapter); + pioctl_buf->status_code = MLAN_ERROR_CMD_CANCEL; + pcb->moal_ioctl_complete(pmadapter->pmoal_handle, pioctl_buf, + MLAN_STATUS_FAILURE); + } else { + wlan_release_cmd_lock(pmadapter); + } + /* Cancel all pending command */ + while ((pcmd_node = + (cmd_ctrl_node *) util_peek_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + pcb->moal_spin_lock, + pcb->moal_spin_unlock))) { + util_unlink_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + (pmlan_linked_list) pcmd_node, + pcb->moal_spin_lock, pcb->moal_spin_unlock); + if (pcmd_node->pioctl_buf) { + pioctl_buf = (mlan_ioctl_req *) pcmd_node->pioctl_buf; + pioctl_buf->status_code = MLAN_ERROR_CMD_CANCEL; + pcb->moal_ioctl_complete(pmadapter->pmoal_handle, + pioctl_buf, + MLAN_STATUS_FAILURE); + pcmd_node->pioctl_buf = MNULL; + } + wlan_insert_cmd_to_free_q(pmadapter, pcmd_node); + } #ifdef STA_SUPPORT - /* Cancel all pending scan command */ - wlan_flush_scan_queue(pmadapter); + /* IOCTL will be completed, avoid calling IOCTL complete again from + EVENT */ + pmadapter->pext_scan_ioctl_req = MNULL; + /* Cancel all pending scan command */ + wlan_flush_scan_queue(pmadapter); #endif - LEAVE(); + LEAVE(); } /** * @brief Cancel specific bss's pending ioctl cmd. - * + * * @param pmadapter A pointer to mlan_adapter * @param bss_index BSS index * @@ -1837,70 +1907,73 @@ wlan_cancel_all_pending_cmd(pmlan_adapter pmadapter) t_void wlan_cancel_bss_pending_cmd(pmlan_adapter pmadapter, t_u32 bss_index) { - pmlan_callbacks pcb = &pmadapter->callbacks; - cmd_ctrl_node *pcmd_node = MNULL; - mlan_ioctl_req *pioctl_buf = MNULL; + pmlan_callbacks pcb = &pmadapter->callbacks; + cmd_ctrl_node *pcmd_node = MNULL; + mlan_ioctl_req *pioctl_buf = MNULL; #ifdef STA_SUPPORT - t_u8 flash_scan = MFALSE; + t_u8 flash_scan = MFALSE; #endif - ENTER(); - - PRINTM(MIOCTL, "MOAL Cancel BSS IOCTL: bss_index=%d\n", (int) bss_index); - wlan_request_cmd_lock(pmadapter); - if (pmadapter->curr_cmd && pmadapter->curr_cmd->pioctl_buf) { - pioctl_buf = (mlan_ioctl_req *) pmadapter->curr_cmd->pioctl_buf; - if (pioctl_buf->bss_index == bss_index) { - pcmd_node = pmadapter->curr_cmd; - pcmd_node->pioctl_buf = MNULL; - pcmd_node->cmd_flag |= CMD_F_CANCELED; + ENTER(); + + PRINTM(MIOCTL, "MOAL Cancel BSS IOCTL: bss_index=%d\n", (int)bss_index); + wlan_request_cmd_lock(pmadapter); + if (pmadapter->curr_cmd && pmadapter->curr_cmd->pioctl_buf) { + pioctl_buf = (mlan_ioctl_req *) pmadapter->curr_cmd->pioctl_buf; + if (pioctl_buf->bss_index == bss_index) { + pcmd_node = pmadapter->curr_cmd; + pcmd_node->pioctl_buf = MNULL; + pcmd_node->cmd_flag |= CMD_F_CANCELED; #ifdef STA_SUPPORT - if (pioctl_buf->req_id == MLAN_IOCTL_SCAN) - flash_scan = MTRUE; + if (pioctl_buf->req_id == MLAN_IOCTL_SCAN) + flash_scan = MTRUE; #endif - pioctl_buf->status_code = MLAN_ERROR_CMD_CANCEL; - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, pioctl_buf, - MLAN_STATUS_FAILURE); - } - } - while ((pcmd_node = - wlan_get_bss_pending_ioctl_cmd(pmadapter, bss_index)) != MNULL) { - util_unlink_list(pmadapter->pmoal_handle, &pmadapter->cmd_pending_q, - (pmlan_linked_list) pcmd_node, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock); - pioctl_buf = (mlan_ioctl_req *) pcmd_node->pioctl_buf; - pcmd_node->pioctl_buf = MNULL; + pioctl_buf->status_code = MLAN_ERROR_CMD_CANCEL; + pcb->moal_ioctl_complete(pmadapter->pmoal_handle, + pioctl_buf, + MLAN_STATUS_FAILURE); + } + } + while ((pcmd_node = + wlan_get_bss_pending_ioctl_cmd(pmadapter, + bss_index)) != MNULL) { + util_unlink_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + (pmlan_linked_list) pcmd_node, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); + pioctl_buf = (mlan_ioctl_req *) pcmd_node->pioctl_buf; + pcmd_node->pioctl_buf = MNULL; #ifdef STA_SUPPORT - if (pioctl_buf->req_id == MLAN_IOCTL_SCAN) - flash_scan = MTRUE; + if (pioctl_buf->req_id == MLAN_IOCTL_SCAN) + flash_scan = MTRUE; #endif - pioctl_buf->status_code = MLAN_ERROR_CMD_CANCEL; - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, pioctl_buf, - MLAN_STATUS_FAILURE); - wlan_release_cmd_lock(pmadapter); - wlan_insert_cmd_to_free_q(pmadapter, pcmd_node); - wlan_request_cmd_lock(pmadapter); - } - wlan_release_cmd_lock(pmadapter); + pioctl_buf->status_code = MLAN_ERROR_CMD_CANCEL; + pcb->moal_ioctl_complete(pmadapter->pmoal_handle, pioctl_buf, + MLAN_STATUS_FAILURE); + wlan_release_cmd_lock(pmadapter); + wlan_insert_cmd_to_free_q(pmadapter, pcmd_node); + wlan_request_cmd_lock(pmadapter); + } + wlan_release_cmd_lock(pmadapter); #ifdef STA_SUPPORT - if (pmadapter->pext_scan_ioctl_req && - (pmadapter->pext_scan_ioctl_req->bss_index == bss_index)) - flash_scan = MTRUE; - if (flash_scan) { - /* IOCTL will be completed, avoid calling IOCTL complete again from - EVENT */ - pmadapter->pext_scan_ioctl_req = MNULL; - /* Cancel all pending scan command */ - wlan_flush_scan_queue(pmadapter); - } + if (pmadapter->pext_scan_ioctl_req && + (pmadapter->pext_scan_ioctl_req->bss_index == bss_index)) + flash_scan = MTRUE; + if (flash_scan) { + /* IOCTL will be completed, avoid calling IOCTL complete again + from EVENT */ + pmadapter->pext_scan_ioctl_req = MNULL; + /* Cancel all pending scan command */ + wlan_flush_scan_queue(pmadapter); + } #endif - LEAVE(); - return; + LEAVE(); + return; } /** * @brief Cancel pending ioctl cmd. - * + * * @param pmadapter A pointer to mlan_adapter * @param pioctl_req A pointer to mlan_ioctl_req buf * @@ -1909,51 +1982,52 @@ wlan_cancel_bss_pending_cmd(pmlan_adapter pmadapter, t_u32 bss_index) t_void wlan_cancel_pending_ioctl(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) { - pmlan_callbacks pcb = &pmadapter->callbacks; - cmd_ctrl_node *pcmd_node = MNULL; - - ENTER(); - - PRINTM(MIOCTL, "MOAL Cancel IOCTL: 0x%x sub_id=0x%x action=%d\n", - pioctl_req->req_id, *((t_u32 *) pioctl_req->pbuf), - (int) pioctl_req->action); - - wlan_request_cmd_lock(pmadapter); - if ((pmadapter->curr_cmd) && - (pmadapter->curr_cmd->pioctl_buf == pioctl_req)) { - pcmd_node = pmadapter->curr_cmd; - pcmd_node->pioctl_buf = MNULL; - pcmd_node->cmd_flag |= CMD_F_CANCELED; - } - - while ((pcmd_node = - wlan_get_pending_ioctl_cmd(pmadapter, pioctl_req)) != MNULL) { - util_unlink_list(pmadapter->pmoal_handle, &pmadapter->cmd_pending_q, - (pmlan_linked_list) pcmd_node, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock); - pcmd_node->pioctl_buf = MNULL; - wlan_release_cmd_lock(pmadapter); - wlan_insert_cmd_to_free_q(pmadapter, pcmd_node); - wlan_request_cmd_lock(pmadapter); - } - wlan_release_cmd_lock(pmadapter); + pmlan_callbacks pcb = &pmadapter->callbacks; + cmd_ctrl_node *pcmd_node = MNULL; + + ENTER(); + + PRINTM(MIOCTL, "MOAL Cancel IOCTL: 0x%x sub_id=0x%x action=%d\n", + pioctl_req->req_id, *((t_u32 *) pioctl_req->pbuf), + (int)pioctl_req->action); + + wlan_request_cmd_lock(pmadapter); + if ((pmadapter->curr_cmd) && + (pmadapter->curr_cmd->pioctl_buf == pioctl_req)) { + pcmd_node = pmadapter->curr_cmd; + pcmd_node->pioctl_buf = MNULL; + pcmd_node->cmd_flag |= CMD_F_CANCELED; + } + + while ((pcmd_node = + wlan_get_pending_ioctl_cmd(pmadapter, pioctl_req)) != MNULL) { + util_unlink_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + (pmlan_linked_list) pcmd_node, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); + pcmd_node->pioctl_buf = MNULL; + wlan_release_cmd_lock(pmadapter); + wlan_insert_cmd_to_free_q(pmadapter, pcmd_node); + wlan_request_cmd_lock(pmadapter); + } + wlan_release_cmd_lock(pmadapter); #ifdef STA_SUPPORT - if (pioctl_req->req_id == MLAN_IOCTL_SCAN) { - /* IOCTL will be completed, avoid calling IOCTL complete again from - EVENT */ - if (pmadapter->pext_scan_ioctl_req == pioctl_req) - pmadapter->pext_scan_ioctl_req = MNULL; - /* Cancel all pending scan command */ - wlan_flush_scan_queue(pmadapter); - } + if (pioctl_req->req_id == MLAN_IOCTL_SCAN) { + /* IOCTL will be completed, avoid calling IOCTL complete again + from EVENT */ + if (pmadapter->pext_scan_ioctl_req == pioctl_req) + pmadapter->pext_scan_ioctl_req = MNULL; + /* Cancel all pending scan command */ + wlan_flush_scan_queue(pmadapter); + } #endif - pioctl_req->status_code = MLAN_ERROR_CMD_CANCEL; - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, pioctl_req, - MLAN_STATUS_FAILURE); + pioctl_req->status_code = MLAN_ERROR_CMD_CANCEL; + pcb->moal_ioctl_complete(pmadapter->pmoal_handle, pioctl_req, + MLAN_STATUS_FAILURE); - LEAVE(); - return; + LEAVE(); + return; } /** @@ -1967,19 +2041,19 @@ wlan_cancel_pending_ioctl(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) */ mlan_status wlan_ret_ver_ext(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_VERSION_EXT *ver_ext = &resp->params.verext; - mlan_ds_get_info *info; - ENTER(); - if (pioctl_buf) { - info = (mlan_ds_get_info *) pioctl_buf->pbuf; - info->param.ver_ext.version_str_sel = ver_ext->version_str_sel; - memcpy(pmpriv->adapter, info->param.ver_ext.version_str, - ver_ext->version_str, sizeof(char) * 128); - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_VERSION_EXT *ver_ext = &resp->params.verext; + mlan_ds_get_info *info; + ENTER(); + if (pioctl_buf) { + info = (mlan_ds_get_info *) pioctl_buf->pbuf; + info->param.ver_ext.version_str_sel = ver_ext->version_str_sel; + memcpy(pmpriv->adapter, info->param.ver_ext.version_str, + ver_ext->version_str, sizeof(char) * 128); + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -1993,26 +2067,27 @@ wlan_ret_ver_ext(IN pmlan_private pmpriv, */ mlan_status wlan_ret_rx_mgmt_ind(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - mlan_ds_misc_cfg *misc = MNULL; - ENTER(); + mlan_ds_misc_cfg *misc = MNULL; + ENTER(); - if (pioctl_buf) { - misc = (mlan_ds_misc_cfg *) pioctl_buf->pbuf; - misc->param.mgmt_subtype_mask = - wlan_le32_to_cpu(resp->params.rx_mgmt_ind.mgmt_subtype_mask); - } + if (pioctl_buf) { + misc = (mlan_ds_misc_cfg *) pioctl_buf->pbuf; + misc->param.mgmt_subtype_mask = + wlan_le32_to_cpu(resp->params.rx_mgmt_ind. + mgmt_subtype_mask); + } - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** * @brief This function checks conditions and prepares to * send sleep confirm command to firmware if OK. - * + * * @param pmadapter A pointer to mlan_adapter structure * * @return N/A @@ -2020,24 +2095,24 @@ wlan_ret_rx_mgmt_ind(IN pmlan_private pmpriv, t_void wlan_check_ps_cond(mlan_adapter * pmadapter) { - ENTER(); + ENTER(); - if (!pmadapter->cmd_sent && - !pmadapter->curr_cmd && !IS_CARD_RX_RCVD(pmadapter)) { - wlan_dnld_sleep_confirm_cmd(pmadapter); - } else { - PRINTM(MCMND, "Delay Sleep Confirm (%s%s%s)\n", - (pmadapter->cmd_sent) ? "D" : "", - (pmadapter->curr_cmd) ? "C" : "", - (IS_CARD_RX_RCVD(pmadapter)) ? "R" : ""); - } + if (!pmadapter->cmd_sent && + !pmadapter->curr_cmd && !IS_CARD_RX_RCVD(pmadapter)) { + wlan_dnld_sleep_confirm_cmd(pmadapter); + } else { + PRINTM(MCMND, "Delay Sleep Confirm (%s%s%s)\n", + (pmadapter->cmd_sent) ? "D" : "", + (pmadapter->curr_cmd) ? "C" : "", + (IS_CARD_RX_RCVD(pmadapter)) ? "R" : ""); + } - LEAVE(); + LEAVE(); } -/** +/** * @brief This function sends the HS_ACTIVATED event to the application - * + * * @param priv A pointer to mlan_private structure * @param activated MTRUE if activated, MFALSE if de-activated * @@ -2046,28 +2121,29 @@ wlan_check_ps_cond(mlan_adapter * pmadapter) t_void wlan_host_sleep_activated_event(pmlan_private priv, t_u8 activated) { - ENTER(); + ENTER(); - if (activated) { - if (priv->adapter->is_hs_configured) { - priv->adapter->hs_activated = MTRUE; - wlan_update_rxreorder_tbl(priv->adapter, MTRUE); - PRINTM(MEVENT, "hs_activated\n"); - wlan_recv_event(priv, MLAN_EVENT_ID_DRV_HS_ACTIVATED, MNULL); - } else - PRINTM(MWARN, "hs_activated: HS not configured !!!\n"); - } else { - PRINTM(MEVENT, "hs_deactived\n"); - priv->adapter->hs_activated = MFALSE; - wlan_recv_event(priv, MLAN_EVENT_ID_DRV_HS_DEACTIVATED, MNULL); - } + if (activated) { + if (priv->adapter->is_hs_configured) { + priv->adapter->hs_activated = MTRUE; + wlan_update_rxreorder_tbl(priv->adapter, MTRUE); + PRINTM(MEVENT, "hs_activated\n"); + wlan_recv_event(priv, MLAN_EVENT_ID_DRV_HS_ACTIVATED, + MNULL); + } else + PRINTM(MWARN, "hs_activated: HS not configured !!!\n"); + } else { + PRINTM(MEVENT, "hs_deactived\n"); + priv->adapter->hs_activated = MFALSE; + wlan_recv_event(priv, MLAN_EVENT_ID_DRV_HS_DEACTIVATED, MNULL); + } - LEAVE(); + LEAVE(); } -/** +/** * @brief This function sends the HS_WAKEUP event to the application - * + * * @param priv A pointer to mlan_private structure * * @return N/A @@ -2075,20 +2151,20 @@ wlan_host_sleep_activated_event(pmlan_private priv, t_u8 activated) t_void wlan_host_sleep_wakeup_event(pmlan_private priv) { - ENTER(); + ENTER(); - if (priv->adapter->is_hs_configured) { - wlan_recv_event(priv, MLAN_EVENT_ID_FW_HS_WAKEUP, MNULL); - } else { - PRINTM(MWARN, "hs_wakeup: Host Sleep not configured !!!\n"); - } + if (priv->adapter->is_hs_configured) { + wlan_recv_event(priv, MLAN_EVENT_ID_FW_HS_WAKEUP, MNULL); + } else { + PRINTM(MWARN, "hs_wakeup: Host Sleep not configured !!!\n"); + } - LEAVE(); + LEAVE(); } -/** +/** * @brief This function handles the command response of hs_cfg - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -2097,67 +2173,68 @@ wlan_host_sleep_wakeup_event(pmlan_private priv) */ mlan_status wlan_ret_802_11_hs_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) -{ - pmlan_adapter pmadapter = pmpriv->adapter; - HostCmd_DS_802_11_HS_CFG_ENH *phs_cfg = &resp->params.opt_hs_cfg; - - ENTER(); - - if (wlan_le16_to_cpu(phs_cfg->action) == HS_ACTIVATE) { - /* clean up curr_cmd to allow suspend */ - if (pioctl_buf) - pioctl_buf->status_code = MLAN_ERROR_NO_ERROR; - /* Clean up and put current command back to cmd_free_q */ - wlan_insert_cmd_to_free_q(pmadapter, pmadapter->curr_cmd); - wlan_request_cmd_lock(pmadapter); - pmadapter->curr_cmd = MNULL; - wlan_release_cmd_lock(pmadapter); - wlan_host_sleep_activated_event(pmpriv, MTRUE); - goto done; - } else { - phs_cfg->params.hs_config.conditions = - wlan_le32_to_cpu(phs_cfg->params.hs_config.conditions); - PRINTM(MCMND, - "CMD_RESP: HS_CFG cmd reply result=%#x," - " conditions=0x%x gpio=0x%x gap=0x%x\n", resp->result, - phs_cfg->params.hs_config.conditions, - phs_cfg->params.hs_config.gpio, phs_cfg->params.hs_config.gap); - } - if (phs_cfg->params.hs_config.conditions != HOST_SLEEP_CFG_CANCEL) { - pmadapter->is_hs_configured = MTRUE; - } else { - pmadapter->is_hs_configured = MFALSE; - if (pmadapter->hs_activated) - wlan_host_sleep_activated_event(pmpriv, MFALSE); - } - - done: - LEAVE(); - return MLAN_STATUS_SUCCESS; -} - -/** + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) +{ + pmlan_adapter pmadapter = pmpriv->adapter; + HostCmd_DS_802_11_HS_CFG_ENH *phs_cfg = &resp->params.opt_hs_cfg; + + ENTER(); + + if (wlan_le16_to_cpu(phs_cfg->action) == HS_ACTIVATE) { + /* clean up curr_cmd to allow suspend */ + if (pioctl_buf) + pioctl_buf->status_code = MLAN_ERROR_NO_ERROR; + /* Clean up and put current command back to cmd_free_q */ + wlan_insert_cmd_to_free_q(pmadapter, pmadapter->curr_cmd); + wlan_request_cmd_lock(pmadapter); + pmadapter->curr_cmd = MNULL; + wlan_release_cmd_lock(pmadapter); + wlan_host_sleep_activated_event(pmpriv, MTRUE); + goto done; + } else { + phs_cfg->params.hs_config.conditions = + wlan_le32_to_cpu(phs_cfg->params.hs_config.conditions); + PRINTM(MCMND, + "CMD_RESP: HS_CFG cmd reply result=%#x," + " conditions=0x%x gpio=0x%x gap=0x%x\n", resp->result, + phs_cfg->params.hs_config.conditions, + phs_cfg->params.hs_config.gpio, + phs_cfg->params.hs_config.gap); + } + if (phs_cfg->params.hs_config.conditions != HOST_SLEEP_CFG_CANCEL) { + pmadapter->is_hs_configured = MTRUE; + } else { + pmadapter->is_hs_configured = MFALSE; + if (pmadapter->hs_activated) + wlan_host_sleep_activated_event(pmpriv, MFALSE); + } + +done: + LEAVE(); + return MLAN_STATUS_SUCCESS; +} + +/** * @brief Perform hs related activities on receiving the power up interrupt - * + * * @param pmadapter A pointer to the adapter structure * @return N/A */ t_void wlan_process_hs_config(pmlan_adapter pmadapter) { - ENTER(); - PRINTM(MINFO, "Recevie interrupt/data in HS mode\n"); - if (pmadapter->hs_cfg.gap == HOST_SLEEP_CFG_GAP_FF) - wlan_pm_wakeup_card(pmadapter); - LEAVE(); - return; + ENTER(); + PRINTM(MINFO, "Recevie interrupt/data in HS mode\n"); + if (pmadapter->hs_cfg.gap == HOST_SLEEP_CFG_GAP_FF) + wlan_pm_wakeup_card(pmadapter); + LEAVE(); + return; } -/** +/** * @brief Check sleep confirm command response and set the state to ASLEEP - * + * * @param pmadapter A pointer to the adapter structure * @param pbuf A pointer to the command response buffer * @param upld_len Command response buffer length @@ -2165,55 +2242,56 @@ wlan_process_hs_config(pmlan_adapter pmadapter) */ void wlan_process_sleep_confirm_resp(pmlan_adapter pmadapter, t_u8 * pbuf, - t_u32 upld_len) -{ - HostCmd_DS_COMMAND *cmd; - - ENTER(); - - if (!upld_len) { - PRINTM(MERROR, "Command size is 0\n"); - LEAVE(); - return; - } - cmd = (HostCmd_DS_COMMAND *) pbuf; - cmd->result = wlan_le16_to_cpu(cmd->result); - cmd->command = wlan_le16_to_cpu(cmd->command); - cmd->seq_num = wlan_le16_to_cpu(cmd->seq_num); - - /* Update sequence number */ - cmd->seq_num = HostCmd_GET_SEQ_NO(cmd->seq_num); - /* Clear RET_BIT from HostCmd */ - cmd->command &= HostCmd_CMD_ID_MASK; - - if (cmd->command != HostCmd_CMD_802_11_PS_MODE_ENH) { - PRINTM(MERROR, - "Received unexpected response for command %x, result = %x\n", - cmd->command, cmd->result); - LEAVE(); - return; - } - PRINTM(MEVENT, "#\n"); - if (cmd->result != MLAN_STATUS_SUCCESS) { - PRINTM(MERROR, "Sleep confirm command failed\n"); - pmadapter->pm_wakeup_card_req = MFALSE; - pmadapter->ps_state = PS_STATE_AWAKE; - LEAVE(); - return; - } - pmadapter->pm_wakeup_card_req = MTRUE; - - if (pmadapter->is_hs_configured) { - wlan_host_sleep_activated_event(wlan_get_priv - (pmadapter, MLAN_BSS_ROLE_ANY), MTRUE); - } - pmadapter->ps_state = PS_STATE_SLEEP; - LEAVE(); + t_u32 upld_len) +{ + HostCmd_DS_COMMAND *cmd; + + ENTER(); + + if (!upld_len) { + PRINTM(MERROR, "Command size is 0\n"); + LEAVE(); + return; + } + cmd = (HostCmd_DS_COMMAND *) pbuf; + cmd->result = wlan_le16_to_cpu(cmd->result); + cmd->command = wlan_le16_to_cpu(cmd->command); + cmd->seq_num = wlan_le16_to_cpu(cmd->seq_num); + + /* Update sequence number */ + cmd->seq_num = HostCmd_GET_SEQ_NO(cmd->seq_num); + /* Clear RET_BIT from HostCmd */ + cmd->command &= HostCmd_CMD_ID_MASK; + + if (cmd->command != HostCmd_CMD_802_11_PS_MODE_ENH) { + PRINTM(MERROR, + "Received unexpected response for command %x, result = %x\n", + cmd->command, cmd->result); + LEAVE(); + return; + } + PRINTM(MEVENT, "#\n"); + if (cmd->result != MLAN_STATUS_SUCCESS) { + PRINTM(MERROR, "Sleep confirm command failed\n"); + pmadapter->pm_wakeup_card_req = MFALSE; + pmadapter->ps_state = PS_STATE_AWAKE; + LEAVE(); + return; + } + pmadapter->pm_wakeup_card_req = MTRUE; + + if (pmadapter->is_hs_configured) { + wlan_host_sleep_activated_event(wlan_get_priv + (pmadapter, MLAN_BSS_ROLE_ANY), + MTRUE); + } + pmadapter->ps_state = PS_STATE_SLEEP; + LEAVE(); } /** * @brief This function prepares command of power mode - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action the action: GET or SET @@ -2223,121 +2301,149 @@ wlan_process_sleep_confirm_resp(pmlan_adapter pmadapter, t_u8 * pbuf, */ mlan_status wlan_cmd_enh_power_mode(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, - IN t_u16 ps_bitmap, IN t_void * pdata_buf) -{ - HostCmd_DS_802_11_PS_MODE_ENH *psmode_enh = &cmd->params.psmode_enh; - t_u8 *tlv = MNULL; - t_u16 cmd_size = 0; - - ENTER(); - - PRINTM(MCMND, "PS Command: action = 0x%x, bitmap = 0x%x\n", cmd_action, - ps_bitmap); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_PS_MODE_ENH); - if (cmd_action == DIS_AUTO_PS) { - psmode_enh->action = wlan_cpu_to_le16(DIS_AUTO_PS); - psmode_enh->params.ps_bitmap = wlan_cpu_to_le16(ps_bitmap); - cmd->size = wlan_cpu_to_le16(S_DS_GEN + AUTO_PS_FIX_SIZE); - } else if (cmd_action == GET_PS) { - psmode_enh->action = wlan_cpu_to_le16(GET_PS); - psmode_enh->params.ps_bitmap = wlan_cpu_to_le16(ps_bitmap); - cmd->size = wlan_cpu_to_le16(S_DS_GEN + AUTO_PS_FIX_SIZE); - } else if (cmd_action == EN_AUTO_PS) { - psmode_enh->action = wlan_cpu_to_le16(EN_AUTO_PS); - psmode_enh->params.auto_ps.ps_bitmap = wlan_cpu_to_le16(ps_bitmap); - cmd_size = S_DS_GEN + AUTO_PS_FIX_SIZE; - tlv = (t_u8 *) cmd + cmd_size; - if (ps_bitmap & BITMAP_STA_PS) { - pmlan_adapter pmadapter = pmpriv->adapter; - MrvlIEtypes_ps_param_t *ps_tlv = (MrvlIEtypes_ps_param_t *) tlv; - ps_param *ps_mode = &ps_tlv->param; - ps_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_PS_PARAM); - ps_tlv->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_ps_param_t) - - sizeof(MrvlIEtypesHeader_t)); - cmd_size += sizeof(MrvlIEtypes_ps_param_t); - tlv += sizeof(MrvlIEtypes_ps_param_t); - ps_mode->null_pkt_interval = - wlan_cpu_to_le16(pmadapter->null_pkt_interval); - ps_mode->multiple_dtims = - wlan_cpu_to_le16(pmadapter->multiple_dtim); - ps_mode->bcn_miss_timeout = - wlan_cpu_to_le16(pmadapter->bcn_miss_time_out); - ps_mode->local_listen_interval = - wlan_cpu_to_le16(pmadapter->local_listen_interval); - ps_mode->adhoc_wake_period = - wlan_cpu_to_le16(pmadapter->adhoc_awake_period); - ps_mode->delay_to_ps = wlan_cpu_to_le16(pmadapter->delay_to_ps); - ps_mode->mode = wlan_cpu_to_le16(pmadapter->enhanced_ps_mode); - } - if (ps_bitmap & BITMAP_AUTO_DS) { - MrvlIEtypes_auto_ds_param_t *auto_ps_tlv = - (MrvlIEtypes_auto_ds_param_t *) tlv; - auto_ds_param *auto_ds = &auto_ps_tlv->param; - t_u16 idletime = 0; - auto_ps_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_AUTO_DS_PARAM); - auto_ps_tlv->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_auto_ds_param_t) - - sizeof(MrvlIEtypesHeader_t)); - cmd_size += sizeof(MrvlIEtypes_auto_ds_param_t); - tlv += sizeof(MrvlIEtypes_auto_ds_param_t); - if (pdata_buf) - idletime = ((mlan_ds_auto_ds *) pdata_buf)->idletime; - auto_ds->deep_sleep_timeout = wlan_cpu_to_le16(idletime); - } + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, + IN t_u16 ps_bitmap, IN t_void * pdata_buf) +{ + HostCmd_DS_802_11_PS_MODE_ENH *psmode_enh = &cmd->params.psmode_enh; + t_u8 *tlv = MNULL; + t_u16 cmd_size = 0; + + ENTER(); + + PRINTM(MCMND, "PS Command: action = 0x%x, bitmap = 0x%x\n", cmd_action, + ps_bitmap); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_PS_MODE_ENH); + if (cmd_action == DIS_AUTO_PS) { + psmode_enh->action = wlan_cpu_to_le16(DIS_AUTO_PS); + psmode_enh->params.ps_bitmap = wlan_cpu_to_le16(ps_bitmap); + cmd->size = wlan_cpu_to_le16(S_DS_GEN + AUTO_PS_FIX_SIZE); + } else if (cmd_action == GET_PS) { + psmode_enh->action = wlan_cpu_to_le16(GET_PS); + psmode_enh->params.ps_bitmap = wlan_cpu_to_le16(ps_bitmap); + cmd->size = wlan_cpu_to_le16(S_DS_GEN + AUTO_PS_FIX_SIZE); + } else if (cmd_action == EN_AUTO_PS) { + psmode_enh->action = wlan_cpu_to_le16(EN_AUTO_PS); + psmode_enh->params.auto_ps.ps_bitmap = + wlan_cpu_to_le16(ps_bitmap); + cmd_size = S_DS_GEN + AUTO_PS_FIX_SIZE; + tlv = (t_u8 *) cmd + cmd_size; + if (ps_bitmap & BITMAP_STA_PS) { + pmlan_adapter pmadapter = pmpriv->adapter; + MrvlIEtypes_ps_param_t *ps_tlv = + (MrvlIEtypes_ps_param_t *) tlv; + ps_param *ps_mode = &ps_tlv->param; + ps_tlv->header.type = + wlan_cpu_to_le16(TLV_TYPE_PS_PARAM); + ps_tlv->header.len = + wlan_cpu_to_le16(sizeof(MrvlIEtypes_ps_param_t) + - sizeof(MrvlIEtypesHeader_t)); + cmd_size += sizeof(MrvlIEtypes_ps_param_t); + tlv += sizeof(MrvlIEtypes_ps_param_t); + ps_mode->null_pkt_interval = + wlan_cpu_to_le16(pmadapter->null_pkt_interval); + ps_mode->multiple_dtims = + wlan_cpu_to_le16(pmadapter->multiple_dtim); + ps_mode->bcn_miss_timeout = + wlan_cpu_to_le16(pmadapter->bcn_miss_time_out); + ps_mode->local_listen_interval = + wlan_cpu_to_le16(pmadapter-> + local_listen_interval); + ps_mode->adhoc_wake_period = + wlan_cpu_to_le16(pmadapter->adhoc_awake_period); + ps_mode->delay_to_ps = + wlan_cpu_to_le16(pmadapter->delay_to_ps); + ps_mode->mode = + wlan_cpu_to_le16(pmadapter->enhanced_ps_mode); + } + if (ps_bitmap & BITMAP_AUTO_DS) { + MrvlIEtypes_auto_ds_param_t *auto_ps_tlv = + (MrvlIEtypes_auto_ds_param_t *) tlv; + auto_ds_param *auto_ds = &auto_ps_tlv->param; + t_u16 idletime = 0; + auto_ps_tlv->header.type = + wlan_cpu_to_le16(TLV_TYPE_AUTO_DS_PARAM); + auto_ps_tlv->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_auto_ds_param_t) - + sizeof(MrvlIEtypesHeader_t)); + cmd_size += sizeof(MrvlIEtypes_auto_ds_param_t); + tlv += sizeof(MrvlIEtypes_auto_ds_param_t); + if (pdata_buf) + idletime = + ((mlan_ds_auto_ds *) pdata_buf)-> + idletime; + auto_ds->deep_sleep_timeout = + wlan_cpu_to_le16(idletime); + } #if defined(UAP_SUPPORT) - if (pdata_buf && - (ps_bitmap & (BITMAP_UAP_INACT_PS | BITMAP_UAP_DTIM_PS))) { - mlan_ds_ps_mgmt *ps_mgmt = (mlan_ds_ps_mgmt *) pdata_buf; - MrvlIEtypes_sleep_param_t *sleep_tlv = MNULL; - MrvlIEtypes_inact_sleep_param_t *inact_tlv = MNULL; - if (ps_mgmt->flags & PS_FLAG_SLEEP_PARAM) { - sleep_tlv = (MrvlIEtypes_sleep_param_t *) tlv; - sleep_tlv->header.type = - wlan_cpu_to_le16(TLV_TYPE_AP_SLEEP_PARAM); - sleep_tlv->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_sleep_param_t) - - sizeof(MrvlIEtypesHeader_t)); - sleep_tlv->ctrl_bitmap = - wlan_cpu_to_le32(ps_mgmt->sleep_param.ctrl_bitmap); - sleep_tlv->min_sleep = - wlan_cpu_to_le32(ps_mgmt->sleep_param.min_sleep); - sleep_tlv->max_sleep = - wlan_cpu_to_le32(ps_mgmt->sleep_param.max_sleep); - cmd_size += sizeof(MrvlIEtypes_sleep_param_t); - tlv += sizeof(MrvlIEtypes_sleep_param_t); - } - if (ps_mgmt->flags & PS_FLAG_INACT_SLEEP_PARAM) { - inact_tlv = (MrvlIEtypes_inact_sleep_param_t *) tlv; - inact_tlv->header.type = - wlan_cpu_to_le16(TLV_TYPE_AP_INACT_SLEEP_PARAM); - inact_tlv->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_inact_sleep_param_t) - - sizeof(MrvlIEtypesHeader_t)); - inact_tlv->inactivity_to = - wlan_cpu_to_le32(ps_mgmt->inact_param.inactivity_to); - inact_tlv->min_awake = - wlan_cpu_to_le32(ps_mgmt->inact_param.min_awake); - inact_tlv->max_awake = - wlan_cpu_to_le32(ps_mgmt->inact_param.max_awake); - cmd_size += sizeof(MrvlIEtypes_inact_sleep_param_t); - tlv += sizeof(MrvlIEtypes_inact_sleep_param_t); - } - } + if (pdata_buf && + (ps_bitmap & (BITMAP_UAP_INACT_PS | BITMAP_UAP_DTIM_PS))) { + mlan_ds_ps_mgmt *ps_mgmt = + (mlan_ds_ps_mgmt *) pdata_buf; + MrvlIEtypes_sleep_param_t *sleep_tlv = MNULL; + MrvlIEtypes_inact_sleep_param_t *inact_tlv = MNULL; + if (ps_mgmt->flags & PS_FLAG_SLEEP_PARAM) { + sleep_tlv = (MrvlIEtypes_sleep_param_t *) tlv; + sleep_tlv->header.type = + wlan_cpu_to_le16 + (TLV_TYPE_AP_SLEEP_PARAM); + sleep_tlv->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_sleep_param_t) + - + sizeof + (MrvlIEtypesHeader_t)); + sleep_tlv->ctrl_bitmap = + wlan_cpu_to_le32(ps_mgmt->sleep_param. + ctrl_bitmap); + sleep_tlv->min_sleep = + wlan_cpu_to_le32(ps_mgmt->sleep_param. + min_sleep); + sleep_tlv->max_sleep = + wlan_cpu_to_le32(ps_mgmt->sleep_param. + max_sleep); + cmd_size += sizeof(MrvlIEtypes_sleep_param_t); + tlv += sizeof(MrvlIEtypes_sleep_param_t); + } + if (ps_mgmt->flags & PS_FLAG_INACT_SLEEP_PARAM) { + inact_tlv = + (MrvlIEtypes_inact_sleep_param_t *) tlv; + inact_tlv->header.type = + wlan_cpu_to_le16 + (TLV_TYPE_AP_INACT_SLEEP_PARAM); + inact_tlv->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_inact_sleep_param_t) + - + sizeof + (MrvlIEtypesHeader_t)); + inact_tlv->inactivity_to = + wlan_cpu_to_le32(ps_mgmt->inact_param. + inactivity_to); + inact_tlv->min_awake = + wlan_cpu_to_le32(ps_mgmt->inact_param. + min_awake); + inact_tlv->max_awake = + wlan_cpu_to_le32(ps_mgmt->inact_param. + max_awake); + cmd_size += + sizeof(MrvlIEtypes_inact_sleep_param_t); + tlv += sizeof(MrvlIEtypes_inact_sleep_param_t); + } + } #endif - cmd->size = wlan_cpu_to_le16(cmd_size); - } + cmd->size = wlan_cpu_to_le16(cmd_size); + } - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of ps_mode_enh - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -2346,150 +2452,196 @@ wlan_cmd_enh_power_mode(pmlan_private pmpriv, */ mlan_status wlan_ret_enh_power_mode(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) -{ - pmlan_adapter pmadapter = pmpriv->adapter; - MrvlIEtypesHeader_t *mrvl_tlv = MNULL; - MrvlIEtypes_auto_ds_param_t *auto_ds_tlv = MNULL; - HostCmd_DS_802_11_PS_MODE_ENH *ps_mode = &resp->params.psmode_enh; - - ENTER(); - - ps_mode->action = wlan_le16_to_cpu(ps_mode->action); - PRINTM(MINFO, "CMD_RESP: PS_MODE cmd reply result=%#x action=0x%X\n", - resp->result, ps_mode->action); - if (ps_mode->action == EN_AUTO_PS) { - ps_mode->params.auto_ps.ps_bitmap = - wlan_le16_to_cpu(ps_mode->params.auto_ps.ps_bitmap); - if (ps_mode->params.auto_ps.ps_bitmap & BITMAP_AUTO_DS) { - PRINTM(MCMND, "Enabled auto deep sleep\n"); - pmpriv->adapter->is_deep_sleep = MTRUE; - mrvl_tlv = - (MrvlIEtypesHeader_t *) ((t_u8 *) ps_mode + AUTO_PS_FIX_SIZE); - while (wlan_le16_to_cpu(mrvl_tlv->type) != TLV_TYPE_AUTO_DS_PARAM) { - mrvl_tlv = - (MrvlIEtypesHeader_t *) ((t_u8 *) mrvl_tlv + - wlan_le16_to_cpu(mrvl_tlv->len) - + sizeof(MrvlIEtypesHeader_t)); - } - auto_ds_tlv = (MrvlIEtypes_auto_ds_param_t *) mrvl_tlv; - pmpriv->adapter->idle_time = - wlan_le16_to_cpu(auto_ds_tlv->param.deep_sleep_timeout); - } - if (ps_mode->params.auto_ps.ps_bitmap & BITMAP_STA_PS) { - PRINTM(MCMND, "Enabled STA power save\n"); - if (pmadapter->sleep_period.period) { - PRINTM(MCMND, "Setting uapsd/pps mode to TRUE\n"); - } - } + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) +{ + pmlan_adapter pmadapter = pmpriv->adapter; + MrvlIEtypesHeader_t *mrvl_tlv = MNULL; + MrvlIEtypes_auto_ds_param_t *auto_ds_tlv = MNULL; + HostCmd_DS_802_11_PS_MODE_ENH *ps_mode = &resp->params.psmode_enh; + + ENTER(); + + ps_mode->action = wlan_le16_to_cpu(ps_mode->action); + PRINTM(MINFO, "CMD_RESP: PS_MODE cmd reply result=%#x action=0x%X\n", + resp->result, ps_mode->action); + if (ps_mode->action == EN_AUTO_PS) { + ps_mode->params.auto_ps.ps_bitmap = + wlan_le16_to_cpu(ps_mode->params.auto_ps.ps_bitmap); + if (ps_mode->params.auto_ps.ps_bitmap & BITMAP_AUTO_DS) { + PRINTM(MCMND, "Enabled auto deep sleep\n"); + pmpriv->adapter->is_deep_sleep = MTRUE; + mrvl_tlv = + (MrvlIEtypesHeader_t *) ((t_u8 *) ps_mode + + AUTO_PS_FIX_SIZE); + while (wlan_le16_to_cpu(mrvl_tlv->type) != + TLV_TYPE_AUTO_DS_PARAM) { + mrvl_tlv = + (MrvlIEtypesHeader_t *) ((t_u8 *) + mrvl_tlv + + wlan_le16_to_cpu + (mrvl_tlv->len) + + + sizeof + (MrvlIEtypesHeader_t)); + } + auto_ds_tlv = (MrvlIEtypes_auto_ds_param_t *) mrvl_tlv; + pmpriv->adapter->idle_time = + wlan_le16_to_cpu(auto_ds_tlv->param. + deep_sleep_timeout); + } + if (ps_mode->params.auto_ps.ps_bitmap & BITMAP_STA_PS) { + PRINTM(MCMND, "Enabled STA power save\n"); + if (pmadapter->sleep_period.period) { + PRINTM(MCMND, + "Setting uapsd/pps mode to TRUE\n"); + } + } #if defined(UAP_SUPPORT) - if (ps_mode->params.auto_ps. - ps_bitmap & (BITMAP_UAP_INACT_PS | BITMAP_UAP_DTIM_PS)) { - pmadapter->ps_mode = Wlan802_11PowerModePSP; - PRINTM(MCMND, "Enabled uAP power save\n"); - } + if (ps_mode->params.auto_ps. + ps_bitmap & (BITMAP_UAP_INACT_PS | BITMAP_UAP_DTIM_PS)) { + pmadapter->ps_mode = Wlan802_11PowerModePSP; + PRINTM(MCMND, "Enabled uAP power save\n"); + } #endif - } else if (ps_mode->action == DIS_AUTO_PS) { - ps_mode->params.ps_bitmap = wlan_cpu_to_le16(ps_mode->params.ps_bitmap); - if (ps_mode->params.ps_bitmap & BITMAP_AUTO_DS) { - pmpriv->adapter->is_deep_sleep = MFALSE; - PRINTM(MCMND, "Disabled auto deep sleep\n"); - } - if (ps_mode->params.ps_bitmap & BITMAP_STA_PS) { - PRINTM(MCMND, "Disabled STA power save\n"); - if (pmadapter->sleep_period.period) { - pmadapter->delay_null_pkt = MFALSE; - pmadapter->tx_lock_flag = MFALSE; - pmadapter->pps_uapsd_mode = MFALSE; - } - } + } else if (ps_mode->action == DIS_AUTO_PS) { + ps_mode->params.ps_bitmap = + wlan_cpu_to_le16(ps_mode->params.ps_bitmap); + if (ps_mode->params.ps_bitmap & BITMAP_AUTO_DS) { + pmpriv->adapter->is_deep_sleep = MFALSE; + PRINTM(MCMND, "Disabled auto deep sleep\n"); + } + if (ps_mode->params.ps_bitmap & BITMAP_STA_PS) { + PRINTM(MCMND, "Disabled STA power save\n"); + if (pmadapter->sleep_period.period) { + pmadapter->delay_null_pkt = MFALSE; + pmadapter->tx_lock_flag = MFALSE; + pmadapter->pps_uapsd_mode = MFALSE; + } + } #if defined(UAP_SUPPORT) - if (ps_mode->params. - ps_bitmap & (BITMAP_UAP_INACT_PS | BITMAP_UAP_DTIM_PS)) { - pmadapter->ps_mode = Wlan802_11PowerModeCAM; - PRINTM(MCMND, "Disabled uAP power save\n"); - } + if (ps_mode->params. + ps_bitmap & (BITMAP_UAP_INACT_PS | BITMAP_UAP_DTIM_PS)) { + pmadapter->ps_mode = Wlan802_11PowerModeCAM; + PRINTM(MCMND, "Disabled uAP power save\n"); + } #endif - } else if (ps_mode->action == GET_PS) { - ps_mode->params.ps_bitmap = wlan_le16_to_cpu(ps_mode->params.ps_bitmap); - if (ps_mode->params.auto_ps. - ps_bitmap & (BITMAP_STA_PS | BITMAP_UAP_INACT_PS | - BITMAP_UAP_DTIM_PS)) - pmadapter->ps_mode = Wlan802_11PowerModePSP; - else - pmadapter->ps_mode = Wlan802_11PowerModeCAM; - PRINTM(MCMND, "ps_bitmap=0x%x\n", ps_mode->params.ps_bitmap); - if (pioctl_buf) { - mlan_ds_pm_cfg *pm_cfg = (mlan_ds_pm_cfg *) pioctl_buf->pbuf; - if (pm_cfg->sub_command == MLAN_OID_PM_CFG_IEEE_PS) { - if (ps_mode->params.auto_ps.ps_bitmap & BITMAP_STA_PS) - pm_cfg->param.ps_mode = 1; - else - pm_cfg->param.ps_mode = 0; - } + } else if (ps_mode->action == GET_PS) { + ps_mode->params.ps_bitmap = + wlan_le16_to_cpu(ps_mode->params.ps_bitmap); + if (ps_mode->params.auto_ps. + ps_bitmap & (BITMAP_STA_PS | BITMAP_UAP_INACT_PS | + BITMAP_UAP_DTIM_PS)) + pmadapter->ps_mode = Wlan802_11PowerModePSP; + else + pmadapter->ps_mode = Wlan802_11PowerModeCAM; + PRINTM(MCMND, "ps_bitmap=0x%x\n", ps_mode->params.ps_bitmap); + if (pioctl_buf) { + mlan_ds_pm_cfg *pm_cfg = + (mlan_ds_pm_cfg *) pioctl_buf->pbuf; + if (pm_cfg->sub_command == MLAN_OID_PM_CFG_IEEE_PS) { + if (ps_mode->params.auto_ps. + ps_bitmap & BITMAP_STA_PS) + pm_cfg->param.ps_mode = 1; + else + pm_cfg->param.ps_mode = 0; + } #if defined(UAP_SUPPORT) - if (pm_cfg->sub_command == MLAN_OID_PM_CFG_PS_MODE) { - MrvlIEtypes_sleep_param_t *sleep_tlv = MNULL; - MrvlIEtypes_inact_sleep_param_t *inact_tlv = MNULL; - MrvlIEtypesHeader_t *tlv = MNULL; - t_u16 tlv_type = 0; - t_u16 tlv_len = 0; - t_u16 tlv_buf_left = 0; - pm_cfg->param.ps_mgmt.flags = PS_FLAG_PS_MODE; - if (ps_mode->params.ps_bitmap & BITMAP_UAP_INACT_PS) - pm_cfg->param.ps_mgmt.ps_mode = PS_MODE_INACTIVITY; - else if (ps_mode->params.ps_bitmap & BITMAP_UAP_DTIM_PS) - pm_cfg->param.ps_mgmt.ps_mode = PS_MODE_PERIODIC_DTIM; - else - pm_cfg->param.ps_mgmt.ps_mode = PS_MODE_DISABLE; - tlv_buf_left = resp->size - (S_DS_GEN + AUTO_PS_FIX_SIZE); - tlv = - (MrvlIEtypesHeader_t *) ((t_u8 *) ps_mode + - AUTO_PS_FIX_SIZE); - while (tlv_buf_left >= sizeof(MrvlIEtypesHeader_t)) { - tlv_type = wlan_le16_to_cpu(tlv->type); - tlv_len = wlan_le16_to_cpu(tlv->len); - switch (tlv_type) { - case TLV_TYPE_AP_SLEEP_PARAM: - sleep_tlv = (MrvlIEtypes_sleep_param_t *) tlv; - pm_cfg->param.ps_mgmt.flags |= PS_FLAG_SLEEP_PARAM; - pm_cfg->param.ps_mgmt.sleep_param.ctrl_bitmap = - wlan_le32_to_cpu(sleep_tlv->ctrl_bitmap); - pm_cfg->param.ps_mgmt.sleep_param.min_sleep = - wlan_le32_to_cpu(sleep_tlv->min_sleep); - pm_cfg->param.ps_mgmt.sleep_param.max_sleep = - wlan_le32_to_cpu(sleep_tlv->max_sleep); - break; - case TLV_TYPE_AP_INACT_SLEEP_PARAM: - inact_tlv = (MrvlIEtypes_inact_sleep_param_t *) tlv; - pm_cfg->param.ps_mgmt.flags |= - PS_FLAG_INACT_SLEEP_PARAM; - pm_cfg->param.ps_mgmt.inact_param.inactivity_to = - wlan_le32_to_cpu(inact_tlv->inactivity_to); - pm_cfg->param.ps_mgmt.inact_param.min_awake = - wlan_le32_to_cpu(inact_tlv->min_awake); - pm_cfg->param.ps_mgmt.inact_param.max_awake = - wlan_le32_to_cpu(inact_tlv->max_awake); - break; - } - tlv_buf_left -= tlv_len + sizeof(MrvlIEtypesHeader_t); - tlv = - (MrvlIEtypesHeader_t *) ((t_u8 *) tlv + tlv_len + - sizeof(MrvlIEtypesHeader_t)); - } - } + if (pm_cfg->sub_command == MLAN_OID_PM_CFG_PS_MODE) { + MrvlIEtypes_sleep_param_t *sleep_tlv = MNULL; + MrvlIEtypes_inact_sleep_param_t *inact_tlv = + MNULL; + MrvlIEtypesHeader_t *tlv = MNULL; + t_u16 tlv_type = 0; + t_u16 tlv_len = 0; + t_u16 tlv_buf_left = 0; + pm_cfg->param.ps_mgmt.flags = PS_FLAG_PS_MODE; + if (ps_mode->params. + ps_bitmap & BITMAP_UAP_INACT_PS) + pm_cfg->param.ps_mgmt.ps_mode = + PS_MODE_INACTIVITY; + else if (ps_mode->params. + ps_bitmap & BITMAP_UAP_DTIM_PS) + pm_cfg->param.ps_mgmt.ps_mode = + PS_MODE_PERIODIC_DTIM; + else + pm_cfg->param.ps_mgmt.ps_mode = + PS_MODE_DISABLE; + tlv_buf_left = + resp->size - (S_DS_GEN + + AUTO_PS_FIX_SIZE); + tlv = (MrvlIEtypesHeader_t *) ((t_u8 *) ps_mode + + + AUTO_PS_FIX_SIZE); + while (tlv_buf_left >= + sizeof(MrvlIEtypesHeader_t)) { + tlv_type = wlan_le16_to_cpu(tlv->type); + tlv_len = wlan_le16_to_cpu(tlv->len); + switch (tlv_type) { + case TLV_TYPE_AP_SLEEP_PARAM: + sleep_tlv = + (MrvlIEtypes_sleep_param_t + *) tlv; + pm_cfg->param.ps_mgmt.flags |= + PS_FLAG_SLEEP_PARAM; + pm_cfg->param.ps_mgmt. + sleep_param. + ctrl_bitmap = + wlan_le32_to_cpu + (sleep_tlv-> + ctrl_bitmap); + pm_cfg->param.ps_mgmt. + sleep_param.min_sleep = + wlan_le32_to_cpu + (sleep_tlv->min_sleep); + pm_cfg->param.ps_mgmt. + sleep_param.max_sleep = + wlan_le32_to_cpu + (sleep_tlv->max_sleep); + break; + case TLV_TYPE_AP_INACT_SLEEP_PARAM: + inact_tlv = + (MrvlIEtypes_inact_sleep_param_t + *) tlv; + pm_cfg->param.ps_mgmt.flags |= + PS_FLAG_INACT_SLEEP_PARAM; + pm_cfg->param.ps_mgmt. + inact_param. + inactivity_to = + wlan_le32_to_cpu + (inact_tlv-> + inactivity_to); + pm_cfg->param.ps_mgmt. + inact_param.min_awake = + wlan_le32_to_cpu + (inact_tlv->min_awake); + pm_cfg->param.ps_mgmt. + inact_param.max_awake = + wlan_le32_to_cpu + (inact_tlv->max_awake); + break; + } + tlv_buf_left -= + tlv_len + + sizeof(MrvlIEtypesHeader_t); + tlv = (MrvlIEtypesHeader_t *) ((t_u8 *) + tlv + + tlv_len + + sizeof + (MrvlIEtypesHeader_t)); + } + } #endif - } - } + } + } - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of tx rate query - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -2498,133 +2650,166 @@ wlan_ret_enh_power_mode(IN pmlan_private pmpriv, */ mlan_status wlan_ret_802_11_tx_rate_query(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) -{ - mlan_adapter *pmadapter = pmpriv->adapter; - mlan_ds_rate *rate = MNULL; - ENTER(); - - pmpriv->tx_rate = resp->params.tx_rate.tx_rate; - pmpriv->tx_rate_info = resp->params.tx_rate.tx_rate_info; - if (!pmpriv->is_data_rate_auto) { - pmpriv->data_rate = wlan_index_to_data_rate(pmadapter, - pmpriv->tx_rate, - pmpriv->tx_rate_info); - } - - if (pioctl_buf) { - rate = (mlan_ds_rate *) pioctl_buf->pbuf; - if (rate->sub_command == MLAN_OID_RATE_CFG) { - if (rate->param.rate_cfg.rate_type == MLAN_RATE_INDEX) { - if ((pmpriv->tx_rate_info & 0x3) == MLAN_RATE_FORMAT_VHT) - /* VHT rate */ - rate->param.rate_cfg.rate = (pmpriv->tx_rate) & 0xF; - else if ((pmpriv->tx_rate_info & 0x3) == MLAN_RATE_FORMAT_HT) - /* HT rate */ - rate->param.rate_cfg.rate = - pmpriv->tx_rate + MLAN_RATE_INDEX_MCS0; - else - /* LG rate */ - /* For HostCmd_CMD_802_11_TX_RATE_QUERY, there is a hole - (0x4) in rate table between HR/DSSS and OFDM rates, so - minus 1 for OFDM rate index */ - rate->param.rate_cfg.rate = - (pmpriv->tx_rate > MLAN_RATE_INDEX_OFDM0) ? - pmpriv->tx_rate - 1 : pmpriv->tx_rate; - } else { - /* rate_type = MLAN_RATE_VALUE */ - rate->param.rate_cfg.rate = wlan_index_to_data_rate(pmadapter, - pmpriv-> - tx_rate, - pmpriv-> - tx_rate_info); - } - } else if (rate->sub_command == MLAN_OID_GET_DATA_RATE) { - /* Tx rate info */ - if ((pmpriv->tx_rate_info & 0x3) == MLAN_RATE_FORMAT_VHT) { - /* VHT rate */ - rate->param.data_rate.tx_rate_format = MLAN_RATE_FORMAT_VHT; - rate->param.data_rate.tx_ht_bw = - (pmpriv->tx_rate_info & 0xC) >> 2; - rate->param.data_rate.tx_ht_gi = - (pmpriv->tx_rate_info & 0x10) >> 4; - rate->param.data_rate.tx_nss = (pmpriv->tx_rate) >> 4; - rate->param.data_rate.tx_mcs_index = (pmpriv->tx_rate) & 0xF; - rate->param.data_rate.tx_data_rate = - wlan_index_to_data_rate(pmadapter, - pmpriv->tx_rate, - pmpriv->tx_rate_info); - } else if ((pmpriv->tx_rate_info & 0x3) == MLAN_RATE_FORMAT_HT) { - /* HT rate */ - rate->param.data_rate.tx_rate_format = MLAN_RATE_FORMAT_HT; - rate->param.data_rate.tx_ht_bw = - (pmpriv->tx_rate_info & 0xC) >> 2; - rate->param.data_rate.tx_ht_gi = - (pmpriv->tx_rate_info & 0x10) >> 4; - rate->param.data_rate.tx_mcs_index = pmpriv->tx_rate; - rate->param.data_rate.tx_data_rate = - wlan_index_to_data_rate(pmadapter, - pmpriv->tx_rate, - pmpriv->tx_rate_info); - } else { - /* LG rate */ - rate->param.data_rate.tx_rate_format = MLAN_RATE_FORMAT_LG; - /* For HostCmd_CMD_802_11_TX_RATE_QUERY, there is a hole in - rate table between HR/DSSS and OFDM rates, so minus 1 for - OFDM rate index */ - rate->param.data_rate.tx_data_rate = - (pmpriv->tx_rate > MLAN_RATE_INDEX_OFDM0) ? - pmpriv->tx_rate - 1 : pmpriv->tx_rate; - } - - /* Rx rate info */ - if ((pmpriv->rxpd_rate_info & 0x3) == MLAN_RATE_FORMAT_VHT) { - /* VHT rate */ - rate->param.data_rate.rx_rate_format = MLAN_RATE_FORMAT_VHT; - rate->param.data_rate.rx_ht_bw = - (pmpriv->rxpd_rate_info & 0xC) >> 2; - rate->param.data_rate.rx_ht_gi = - (pmpriv->rxpd_rate_info & 0x10) >> 4; - rate->param.data_rate.rx_nss = (pmpriv->rxpd_rate) >> 4; - rate->param.data_rate.rx_mcs_index = (pmpriv->rxpd_rate) & 0xF; - rate->param.data_rate.rx_data_rate = - wlan_index_to_data_rate(pmadapter, - pmpriv->rxpd_rate, - pmpriv->rxpd_rate_info); - } else if ((pmpriv->rxpd_rate_info & 0x3) == MLAN_RATE_FORMAT_HT) { - /* HT rate */ - rate->param.data_rate.rx_rate_format = MLAN_RATE_FORMAT_HT; - rate->param.data_rate.rx_ht_bw = - (pmpriv->rxpd_rate_info & 0xC) >> 2; - rate->param.data_rate.rx_ht_gi = - (pmpriv->rxpd_rate_info & 0x10) >> 4; - rate->param.data_rate.rx_mcs_index = pmpriv->rxpd_rate; - rate->param.data_rate.rx_data_rate = - wlan_index_to_data_rate(pmadapter, - pmpriv->rxpd_rate, - pmpriv->rxpd_rate_info); - } else { - /* LG rate */ - rate->param.data_rate.rx_rate_format = MLAN_RATE_FORMAT_LG; - /* For rate index in RxPD, there is a hole in rate table - between HR/DSSS and OFDM rates, so minus 1 for OFDM rate - index */ - rate->param.data_rate.rx_data_rate = - (pmpriv->rxpd_rate > MLAN_RATE_INDEX_OFDM0) ? - pmpriv->rxpd_rate - 1 : pmpriv->rxpd_rate; - } - } - pioctl_buf->data_read_written = sizeof(mlan_data_rate) + - MLAN_SUB_COMMAND_SIZE; - } - LEAVE(); - return MLAN_STATUS_SUCCESS; -} - -/** + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) +{ + mlan_adapter *pmadapter = pmpriv->adapter; + mlan_ds_rate *rate = MNULL; + ENTER(); + + pmpriv->tx_rate = resp->params.tx_rate.tx_rate; + pmpriv->tx_rate_info = resp->params.tx_rate.tx_rate_info; + if (!pmpriv->is_data_rate_auto) { + pmpriv->data_rate = wlan_index_to_data_rate(pmadapter, + pmpriv->tx_rate, + pmpriv-> + tx_rate_info); + } + + if (pioctl_buf) { + rate = (mlan_ds_rate *) pioctl_buf->pbuf; + if (rate->sub_command == MLAN_OID_RATE_CFG) { + if (rate->param.rate_cfg.rate_type == MLAN_RATE_INDEX) { + if ((pmpriv->tx_rate_info & 0x3) == + MLAN_RATE_FORMAT_VHT) + /* VHT rate */ + rate->param.rate_cfg.rate = + (pmpriv->tx_rate) & 0xF; + else if ((pmpriv->tx_rate_info & 0x3) == + MLAN_RATE_FORMAT_HT) + /* HT rate */ + rate->param.rate_cfg.rate = + pmpriv->tx_rate + + MLAN_RATE_INDEX_MCS0; + else + /* LG rate */ + /* For + HostCmd_CMD_802_11_TX_RATE_QUERY, + there is a hole (0x4) in rate table + between HR/DSSS and OFDM rates, so + minus 1 for OFDM rate index */ + rate->param.rate_cfg.rate = + (pmpriv->tx_rate > + MLAN_RATE_INDEX_OFDM0) ? + pmpriv->tx_rate - + 1 : pmpriv->tx_rate; + } else { + /* rate_type = MLAN_RATE_VALUE */ + rate->param.rate_cfg.rate = + wlan_index_to_data_rate(pmadapter, + pmpriv->tx_rate, + pmpriv-> + tx_rate_info); + } + } else if (rate->sub_command == MLAN_OID_GET_DATA_RATE) { + /* Tx rate info */ + if ((pmpriv->tx_rate_info & 0x3) == + MLAN_RATE_FORMAT_VHT) { + /* VHT rate */ + rate->param.data_rate.tx_rate_format = + MLAN_RATE_FORMAT_VHT; + rate->param.data_rate.tx_ht_bw = + (pmpriv->tx_rate_info & 0xC) >> 2; + rate->param.data_rate.tx_ht_gi = + (pmpriv->tx_rate_info & 0x10) >> 4; + rate->param.data_rate.tx_nss = + (pmpriv->tx_rate) >> 4; + rate->param.data_rate.tx_mcs_index = + (pmpriv->tx_rate) & 0xF; + rate->param.data_rate.tx_data_rate = + wlan_index_to_data_rate(pmadapter, + pmpriv->tx_rate, + pmpriv-> + tx_rate_info); + } else if ((pmpriv->tx_rate_info & 0x3) == + MLAN_RATE_FORMAT_HT) { + /* HT rate */ + rate->param.data_rate.tx_rate_format = + MLAN_RATE_FORMAT_HT; + rate->param.data_rate.tx_ht_bw = + (pmpriv->tx_rate_info & 0xC) >> 2; + rate->param.data_rate.tx_ht_gi = + (pmpriv->tx_rate_info & 0x10) >> 4; + rate->param.data_rate.tx_mcs_index = + pmpriv->tx_rate; + rate->param.data_rate.tx_data_rate = + wlan_index_to_data_rate(pmadapter, + pmpriv->tx_rate, + pmpriv-> + tx_rate_info); + } else { + /* LG rate */ + rate->param.data_rate.tx_rate_format = + MLAN_RATE_FORMAT_LG; + /* For HostCmd_CMD_802_11_TX_RATE_QUERY, there + is a hole in rate table between HR/DSSS and + OFDM rates, so minus 1 for OFDM rate index */ + rate->param.data_rate.tx_data_rate = + (pmpriv->tx_rate > + MLAN_RATE_INDEX_OFDM0) ? pmpriv-> + tx_rate - 1 : pmpriv->tx_rate; + } + + /* Rx rate info */ + if ((pmpriv->rxpd_rate_info & 0x3) == + MLAN_RATE_FORMAT_VHT) { + /* VHT rate */ + rate->param.data_rate.rx_rate_format = + MLAN_RATE_FORMAT_VHT; + rate->param.data_rate.rx_ht_bw = + (pmpriv->rxpd_rate_info & 0xC) >> 2; + rate->param.data_rate.rx_ht_gi = + (pmpriv->rxpd_rate_info & 0x10) >> 4; + rate->param.data_rate.rx_nss = + (pmpriv->rxpd_rate) >> 4; + rate->param.data_rate.rx_mcs_index = + (pmpriv->rxpd_rate) & 0xF; + rate->param.data_rate.rx_data_rate = + wlan_index_to_data_rate(pmadapter, + pmpriv-> + rxpd_rate, + pmpriv-> + rxpd_rate_info); + } else if ((pmpriv->rxpd_rate_info & 0x3) == + MLAN_RATE_FORMAT_HT) { + /* HT rate */ + rate->param.data_rate.rx_rate_format = + MLAN_RATE_FORMAT_HT; + rate->param.data_rate.rx_ht_bw = + (pmpriv->rxpd_rate_info & 0xC) >> 2; + rate->param.data_rate.rx_ht_gi = + (pmpriv->rxpd_rate_info & 0x10) >> 4; + rate->param.data_rate.rx_mcs_index = + pmpriv->rxpd_rate; + rate->param.data_rate.rx_data_rate = + wlan_index_to_data_rate(pmadapter, + pmpriv-> + rxpd_rate, + pmpriv-> + rxpd_rate_info); + } else { + /* LG rate */ + rate->param.data_rate.rx_rate_format = + MLAN_RATE_FORMAT_LG; + /* For rate index in RxPD, there is a hole in + rate table between HR/DSSS and OFDM rates, + so minus 1 for OFDM rate index */ + rate->param.data_rate.rx_data_rate = + (pmpriv->rxpd_rate > + MLAN_RATE_INDEX_OFDM0) ? pmpriv-> + rxpd_rate - 1 : pmpriv->rxpd_rate; + } + } + pioctl_buf->data_read_written = sizeof(mlan_data_rate) + + MLAN_SUB_COMMAND_SIZE; + } + LEAVE(); + return MLAN_STATUS_SUCCESS; +} + +/** * @brief This function prepares command of tx_rate_cfg. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -2634,207 +2819,238 @@ wlan_ret_802_11_tx_rate_query(IN pmlan_private pmpriv, */ mlan_status wlan_cmd_tx_rate_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) -{ - HostCmd_DS_TX_RATE_CFG *rate_cfg = - (HostCmd_DS_TX_RATE_CFG *) & (cmd->params.tx_rate_cfg); - MrvlRateScope_t *rate_scope; - MrvlRateDropPattern_t *rate_drop; - t_u16 *pbitmap_rates = (t_u16 *) pdata_buf; - - t_u32 i; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_TX_RATE_CFG); - - rate_cfg->action = wlan_cpu_to_le16(cmd_action); - - rate_scope = (MrvlRateScope_t *) ((t_u8 *) rate_cfg + - sizeof(HostCmd_DS_TX_RATE_CFG)); - rate_scope->type = wlan_cpu_to_le16(TLV_TYPE_RATE_SCOPE); - rate_scope->length = wlan_cpu_to_le16(sizeof(MrvlRateScope_t) - - sizeof(MrvlIEtypesHeader_t)); - if (pbitmap_rates != MNULL) { - rate_scope->hr_dsss_rate_bitmap = wlan_cpu_to_le16(pbitmap_rates[0]); - rate_scope->ofdm_rate_bitmap = wlan_cpu_to_le16(pbitmap_rates[1]); - for (i = 0; i < sizeof(rate_scope->ht_mcs_rate_bitmap) / sizeof(t_u16); - i++) - rate_scope->ht_mcs_rate_bitmap[i] = - wlan_cpu_to_le16(pbitmap_rates[2 + i]); - for (i = 0; i < sizeof(rate_scope->vht_mcs_rate_bitmap) / sizeof(t_u16); - i++) - rate_scope->vht_mcs_rate_bitmap[i] = - wlan_cpu_to_le16(pbitmap_rates - [2 + - sizeof(rate_scope->ht_mcs_rate_bitmap) / - sizeof(t_u16) + i]); - } else { - rate_scope->hr_dsss_rate_bitmap = - wlan_cpu_to_le16(pmpriv->bitmap_rates[0]); - rate_scope->ofdm_rate_bitmap = - wlan_cpu_to_le16(pmpriv->bitmap_rates[1]); - for (i = 0; i < sizeof(rate_scope->ht_mcs_rate_bitmap) / sizeof(t_u16); - i++) - rate_scope->ht_mcs_rate_bitmap[i] = - wlan_cpu_to_le16(pmpriv->bitmap_rates[2 + i]); - for (i = 0; i < sizeof(rate_scope->vht_mcs_rate_bitmap) / sizeof(t_u16); - i++) - rate_scope->vht_mcs_rate_bitmap[i] = - wlan_cpu_to_le16(pmpriv-> - bitmap_rates[2 + - sizeof(rate_scope-> - ht_mcs_rate_bitmap) / - sizeof(t_u16) + i]); - } - - rate_drop = (MrvlRateDropPattern_t *) ((t_u8 *) rate_scope + - sizeof(MrvlRateScope_t)); - rate_drop->type = wlan_cpu_to_le16(TLV_TYPE_RATE_DROP_PATTERN); - rate_drop->length = wlan_cpu_to_le16(sizeof(rate_drop->rate_drop_mode)); - rate_drop->rate_drop_mode = 0; - - cmd->size = wlan_cpu_to_le16(S_DS_GEN + sizeof(HostCmd_DS_TX_RATE_CFG) + - sizeof(MrvlRateScope_t) + - sizeof(MrvlRateDropPattern_t)); - - LEAVE(); - return MLAN_STATUS_SUCCESS; -} - -/** + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) +{ + HostCmd_DS_TX_RATE_CFG *rate_cfg = + (HostCmd_DS_TX_RATE_CFG *) & (cmd->params.tx_rate_cfg); + MrvlRateScope_t *rate_scope; + MrvlRateDropPattern_t *rate_drop; + t_u16 *pbitmap_rates = (t_u16 *) pdata_buf; + + t_u32 i; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_TX_RATE_CFG); + + rate_cfg->action = wlan_cpu_to_le16(cmd_action); + + rate_scope = (MrvlRateScope_t *) ((t_u8 *) rate_cfg + + sizeof(HostCmd_DS_TX_RATE_CFG)); + rate_scope->type = wlan_cpu_to_le16(TLV_TYPE_RATE_SCOPE); + rate_scope->length = wlan_cpu_to_le16(sizeof(MrvlRateScope_t) - + sizeof(MrvlIEtypesHeader_t)); + if (pbitmap_rates != MNULL) { + rate_scope->hr_dsss_rate_bitmap = + wlan_cpu_to_le16(pbitmap_rates[0]); + rate_scope->ofdm_rate_bitmap = + wlan_cpu_to_le16(pbitmap_rates[1]); + for (i = 0; + i < sizeof(rate_scope->ht_mcs_rate_bitmap) / sizeof(t_u16); + i++) + rate_scope->ht_mcs_rate_bitmap[i] = + wlan_cpu_to_le16(pbitmap_rates[2 + i]); + for (i = 0; + i < + sizeof(rate_scope->vht_mcs_rate_bitmap) / sizeof(t_u16); + i++) + rate_scope->vht_mcs_rate_bitmap[i] = + wlan_cpu_to_le16(pbitmap_rates + [2 + + sizeof(rate_scope-> + ht_mcs_rate_bitmap) / + sizeof(t_u16) + i]); + } else { + rate_scope->hr_dsss_rate_bitmap = + wlan_cpu_to_le16(pmpriv->bitmap_rates[0]); + rate_scope->ofdm_rate_bitmap = + wlan_cpu_to_le16(pmpriv->bitmap_rates[1]); + for (i = 0; + i < sizeof(rate_scope->ht_mcs_rate_bitmap) / sizeof(t_u16); + i++) + rate_scope->ht_mcs_rate_bitmap[i] = + wlan_cpu_to_le16(pmpriv->bitmap_rates[2 + i]); + for (i = 0; + i < + sizeof(rate_scope->vht_mcs_rate_bitmap) / sizeof(t_u16); + i++) + rate_scope->vht_mcs_rate_bitmap[i] = + wlan_cpu_to_le16(pmpriv-> + bitmap_rates[2 + + sizeof + (rate_scope-> + ht_mcs_rate_bitmap) + / sizeof(t_u16) + + i]); + } + + rate_drop = (MrvlRateDropPattern_t *) ((t_u8 *) rate_scope + + sizeof(MrvlRateScope_t)); + rate_drop->type = wlan_cpu_to_le16(TLV_TYPE_RATE_DROP_PATTERN); + rate_drop->length = wlan_cpu_to_le16(sizeof(rate_drop->rate_drop_mode)); + rate_drop->rate_drop_mode = 0; + + cmd->size = wlan_cpu_to_le16(S_DS_GEN + sizeof(HostCmd_DS_TX_RATE_CFG) + + sizeof(MrvlRateScope_t) + + sizeof(MrvlRateDropPattern_t)); + + LEAVE(); + return MLAN_STATUS_SUCCESS; +} + +/** * @brief This function handles the command response of tx_rate_cfg - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND - * @param pioctl_buf A pointer to mlan_ioctl_req structure + * @param pioctl_buf A pointer to mlan_ioctl_req structure * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ mlan_status wlan_ret_tx_rate_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) -{ - mlan_adapter *pmadapter = pmpriv->adapter; - mlan_ds_rate *ds_rate = MNULL; - HostCmd_DS_TX_RATE_CFG *prate_cfg = MNULL; - MrvlRateScope_t *prate_scope; - MrvlIEtypesHeader_t *head = MNULL; - t_u16 tlv, tlv_buf_len = 0; - t_u8 *tlv_buf; - t_u32 i; - t_s32 index; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - if (resp == MNULL) { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - prate_cfg = (HostCmd_DS_TX_RATE_CFG *) & (resp->params.tx_rate_cfg); - - tlv_buf = (t_u8 *) ((t_u8 *) prate_cfg) + sizeof(HostCmd_DS_TX_RATE_CFG); - if (tlv_buf) { - tlv_buf_len = *(t_u16 *) (tlv_buf + sizeof(t_u16)); - tlv_buf_len = wlan_le16_to_cpu(tlv_buf_len); - } - - while (tlv_buf && tlv_buf_len > 0) { - tlv = (*tlv_buf); - tlv = tlv | (*(tlv_buf + 1) << 8); - - switch (tlv) { - case TLV_TYPE_RATE_SCOPE: - prate_scope = (MrvlRateScope_t *) tlv_buf; - pmpriv->bitmap_rates[0] = - wlan_le16_to_cpu(prate_scope->hr_dsss_rate_bitmap); - pmpriv->bitmap_rates[1] = - wlan_le16_to_cpu(prate_scope->ofdm_rate_bitmap); - for (i = 0; - i < sizeof(prate_scope->ht_mcs_rate_bitmap) / sizeof(t_u16); - i++) - pmpriv->bitmap_rates[2 + i] = - wlan_le16_to_cpu(prate_scope->ht_mcs_rate_bitmap[i]); - for (i = 0; - i < sizeof(prate_scope->vht_mcs_rate_bitmap) / sizeof(t_u16); - i++) - pmpriv->bitmap_rates[2 + sizeof(prate_scope->ht_mcs_rate_bitmap) - / sizeof(t_u16) + i] = - wlan_le16_to_cpu(prate_scope->vht_mcs_rate_bitmap[i]); - break; - /* Add RATE_DROP tlv here */ - } - - head = (MrvlIEtypesHeader_t *) tlv_buf; - head->len = wlan_le16_to_cpu(head->len); - tlv_buf += head->len + sizeof(MrvlIEtypesHeader_t); - tlv_buf_len -= head->len; - } - - pmpriv->is_data_rate_auto = wlan_is_rate_auto(pmpriv); - - if (pmpriv->is_data_rate_auto) { - pmpriv->data_rate = 0; - } else { - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_TX_RATE_QUERY, - HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); - - } - - if (pioctl_buf) { - ds_rate = (mlan_ds_rate *) pioctl_buf->pbuf; - if (ds_rate == MNULL) { - PRINTM(MERROR, "Request buffer not found!\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - if (pmpriv->is_data_rate_auto) { - ds_rate->param.rate_cfg.is_rate_auto = MTRUE; - ds_rate->param.rate_cfg.rate_format = MLAN_RATE_FORMAT_AUTO; - } else { - ds_rate->param.rate_cfg.is_rate_auto = MFALSE; - /* check the LG rate */ - index = wlan_get_rate_index(pmadapter, &pmpriv->bitmap_rates[0], 4); - if (index != -1) { - if ((index >= MLAN_RATE_BITMAP_OFDM0) && - (index <= MLAN_RATE_BITMAP_OFDM7)) - index -= (MLAN_RATE_BITMAP_OFDM0 - MLAN_RATE_INDEX_OFDM0); - ds_rate->param.rate_cfg.rate_format = MLAN_RATE_FORMAT_LG; - ds_rate->param.rate_cfg.rate = index; - } - /* check the HT rate */ - index = wlan_get_rate_index(pmadapter, - &pmpriv->bitmap_rates[2], 16); - if (index != -1) { - ds_rate->param.rate_cfg.rate_format = MLAN_RATE_FORMAT_HT; - ds_rate->param.rate_cfg.rate = index; - } - /* check the VHT rate */ - index = wlan_get_rate_index(pmadapter, - &pmpriv->bitmap_rates[10], 16); - if (index != -1) { - ds_rate->param.rate_cfg.rate_format = MLAN_RATE_FORMAT_VHT; - ds_rate->param.rate_cfg.rate = index % 16; - ds_rate->param.rate_cfg.nss = index / 16; - } - PRINTM(MINFO, "Rate index is %d\n", ds_rate->param.rate_cfg.rate); - } - for (i = 0; i < MAX_BITMAP_RATES_SIZE; i++) { - ds_rate->param.rate_cfg.bitmap_rates[i] = pmpriv->bitmap_rates[i]; - } - - } - - LEAVE(); - return ret; -} - -/** - * @brief This function issues adapter specific commands + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) +{ + mlan_adapter *pmadapter = pmpriv->adapter; + mlan_ds_rate *ds_rate = MNULL; + HostCmd_DS_TX_RATE_CFG *prate_cfg = MNULL; + MrvlRateScope_t *prate_scope; + MrvlIEtypesHeader_t *head = MNULL; + t_u16 tlv, tlv_buf_len = 0; + t_u8 *tlv_buf; + t_u32 i; + t_s32 index; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + if (resp == MNULL) { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + prate_cfg = (HostCmd_DS_TX_RATE_CFG *) & (resp->params.tx_rate_cfg); + + tlv_buf = + (t_u8 *) ((t_u8 *) prate_cfg) + sizeof(HostCmd_DS_TX_RATE_CFG); + if (tlv_buf) { + tlv_buf_len = *(t_u16 *) (tlv_buf + sizeof(t_u16)); + tlv_buf_len = wlan_le16_to_cpu(tlv_buf_len); + } + + while (tlv_buf && tlv_buf_len > 0) { + tlv = (*tlv_buf); + tlv = tlv | (*(tlv_buf + 1) << 8); + + switch (tlv) { + case TLV_TYPE_RATE_SCOPE: + prate_scope = (MrvlRateScope_t *) tlv_buf; + pmpriv->bitmap_rates[0] = + wlan_le16_to_cpu(prate_scope-> + hr_dsss_rate_bitmap); + pmpriv->bitmap_rates[1] = + wlan_le16_to_cpu(prate_scope->ofdm_rate_bitmap); + for (i = 0; + i < + sizeof(prate_scope->ht_mcs_rate_bitmap) / + sizeof(t_u16); i++) + pmpriv->bitmap_rates[2 + i] = + wlan_le16_to_cpu(prate_scope-> + ht_mcs_rate_bitmap[i]); + for (i = 0; + i < + sizeof(prate_scope->vht_mcs_rate_bitmap) / + sizeof(t_u16); i++) + pmpriv->bitmap_rates[2 + + sizeof(prate_scope-> + ht_mcs_rate_bitmap) + / sizeof(t_u16) + i] = + wlan_le16_to_cpu(prate_scope-> + vht_mcs_rate_bitmap + [i]); + break; + /* Add RATE_DROP tlv here */ + } + + head = (MrvlIEtypesHeader_t *) tlv_buf; + head->len = wlan_le16_to_cpu(head->len); + tlv_buf += head->len + sizeof(MrvlIEtypesHeader_t); + tlv_buf_len -= head->len; + } + + pmpriv->is_data_rate_auto = wlan_is_rate_auto(pmpriv); + + if (pmpriv->is_data_rate_auto) { + pmpriv->data_rate = 0; + } else { + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_TX_RATE_QUERY, + HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); + + } + + if (pioctl_buf) { + ds_rate = (mlan_ds_rate *) pioctl_buf->pbuf; + if (ds_rate == MNULL) { + PRINTM(MERROR, "Request buffer not found!\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + if (pmpriv->is_data_rate_auto) { + ds_rate->param.rate_cfg.is_rate_auto = MTRUE; + ds_rate->param.rate_cfg.rate_format = + MLAN_RATE_FORMAT_AUTO; + } else { + ds_rate->param.rate_cfg.is_rate_auto = MFALSE; + /* check the LG rate */ + index = wlan_get_rate_index(pmadapter, + &pmpriv->bitmap_rates[0], + 4); + if (index != -1) { + if ((index >= MLAN_RATE_BITMAP_OFDM0) && + (index <= MLAN_RATE_BITMAP_OFDM7)) + index -= (MLAN_RATE_BITMAP_OFDM0 - + MLAN_RATE_INDEX_OFDM0); + ds_rate->param.rate_cfg.rate_format = + MLAN_RATE_FORMAT_LG; + ds_rate->param.rate_cfg.rate = index; + } + /* check the HT rate */ + index = wlan_get_rate_index(pmadapter, + &pmpriv->bitmap_rates[2], + 16); + if (index != -1) { + ds_rate->param.rate_cfg.rate_format = + MLAN_RATE_FORMAT_HT; + ds_rate->param.rate_cfg.rate = index; + } + /* check the VHT rate */ + index = wlan_get_rate_index(pmadapter, + &pmpriv->bitmap_rates[10], + 16); + if (index != -1) { + ds_rate->param.rate_cfg.rate_format = + MLAN_RATE_FORMAT_VHT; + ds_rate->param.rate_cfg.rate = index % 16; + ds_rate->param.rate_cfg.nss = index / 16; + } + PRINTM(MINFO, "Rate index is %d\n", + ds_rate->param.rate_cfg.rate); + } + for (i = 0; i < MAX_BITMAP_RATES_SIZE; i++) { + ds_rate->param.rate_cfg.bitmap_rates[i] = + pmpriv->bitmap_rates[i]; + } + + } + + LEAVE(); + return ret; +} + +/** + * @brief This function issues adapter specific commands * to initialize firmware * * @param pmadapter A pointer to mlan_adapter structure @@ -2844,113 +3060,115 @@ wlan_ret_tx_rate_cfg(IN pmlan_private pmpriv, mlan_status wlan_adapter_init_cmd(IN pmlan_adapter pmadapter) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = MNULL; #ifdef STA_SUPPORT - pmlan_private pmpriv_sta = MNULL; + pmlan_private pmpriv_sta = MNULL; #endif - ENTER(); + ENTER(); - pmpriv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); + pmpriv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); #ifdef STA_SUPPORT - pmpriv_sta = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_STA); + pmpriv_sta = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_STA); #endif - /* - * This should be issued in the very first to config - * SDIO_GPIO interrupt mode. - */ - if (wlan_set_sdio_gpio_int(pmpriv) != MLAN_STATUS_SUCCESS) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_FUNC_INIT, - HostCmd_ACT_GEN_SET, 0, MNULL, MNULL); - if (ret) { - ret = MLAN_STATUS_FAILURE; - goto done; - } + /* + * This should be issued in the very first to config + * SDIO_GPIO interrupt mode. + */ + if (wlan_set_sdio_gpio_int(pmpriv) != MLAN_STATUS_SUCCESS) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_FUNC_INIT, + HostCmd_ACT_GEN_SET, 0, MNULL, MNULL); + if (ret) { + ret = MLAN_STATUS_FAILURE; + goto done; + } /** Cal data dnld cmd prepare */ - if ((pmadapter->pcal_data) && (pmadapter->cal_data_len > 0)) { - ret = - wlan_prepare_cmd(pmpriv, HostCmd_CMD_CFG_DATA, HostCmd_ACT_GEN_SET, - 0, MNULL, MNULL); - if (ret) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - pmadapter->pcal_data = MNULL; - pmadapter->cal_data_len = 0; - } - - /* - * Get HW spec - */ - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_GET_HW_SPEC, - HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); - if (ret) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - /* Reconfigure tx buf size */ - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_RECONFIGURE_TX_BUFF, - HostCmd_ACT_GEN_SET, 0, MNULL, - &pmadapter->max_tx_buf_size); - if (ret) { - ret = MLAN_STATUS_FAILURE; - goto done; - } + if ((pmadapter->pcal_data) && (pmadapter->cal_data_len > 0)) { + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_CFG_DATA, + HostCmd_ACT_GEN_SET, 0, MNULL, MNULL); + if (ret) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + pmadapter->pcal_data = MNULL; + pmadapter->cal_data_len = 0; + } + + /* + * Get HW spec + */ + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_GET_HW_SPEC, + HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); + if (ret) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + /* Reconfigure tx buf size */ + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_RECONFIGURE_TX_BUFF, + HostCmd_ACT_GEN_SET, 0, MNULL, + &pmadapter->max_tx_buf_size); + if (ret) { + ret = MLAN_STATUS_FAILURE; + goto done; + } #if defined(STA_SUPPORT) - if (pmpriv_sta && (pmpriv_sta->state_11d.user_enable_11d == ENABLE_11D)) { - /* Send command to FW to enable 11d */ - ret = wlan_prepare_cmd(pmpriv_sta, - HostCmd_CMD_802_11_SNMP_MIB, - HostCmd_ACT_GEN_SET, - Dot11D_i, - MNULL, &pmpriv_sta->state_11d.user_enable_11d); - if (ret) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - } + if (pmpriv_sta && (pmpriv_sta->state_11d.user_enable_11d == ENABLE_11D)) { + /* Send command to FW to enable 11d */ + ret = wlan_prepare_cmd(pmpriv_sta, + HostCmd_CMD_802_11_SNMP_MIB, + HostCmd_ACT_GEN_SET, + Dot11D_i, + MNULL, + &pmpriv_sta->state_11d.user_enable_11d); + if (ret) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + } #endif #if defined(STA_SUPPORT) - if (pmpriv_sta && (pmadapter->ps_mode == Wlan802_11PowerModePSP)) { - ret = wlan_prepare_cmd(pmpriv_sta, HostCmd_CMD_802_11_PS_MODE_ENH, - EN_AUTO_PS, BITMAP_STA_PS, MNULL, MNULL); - if (ret) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - } + if (pmpriv_sta && (pmadapter->ps_mode == Wlan802_11PowerModePSP)) { + ret = wlan_prepare_cmd(pmpriv_sta, + HostCmd_CMD_802_11_PS_MODE_ENH, + EN_AUTO_PS, BITMAP_STA_PS, MNULL, MNULL); + if (ret) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + } #endif - if (pmadapter->init_auto_ds) { - mlan_ds_auto_ds auto_ds; - /* Enable auto deep sleep */ - auto_ds.idletime = pmadapter->idle_time; - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_PS_MODE_ENH, - EN_AUTO_PS, BITMAP_AUTO_DS, MNULL, &auto_ds); - if (ret) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - } - - ret = MLAN_STATUS_PENDING; - done: - LEAVE(); - return ret; -} - -/** + if (pmadapter->init_auto_ds) { + mlan_ds_auto_ds auto_ds; + /* Enable auto deep sleep */ + auto_ds.idletime = pmadapter->idle_time; + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_PS_MODE_ENH, + EN_AUTO_PS, BITMAP_AUTO_DS, MNULL, + &auto_ds); + if (ret) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + } + + ret = MLAN_STATUS_PENDING; +done: + LEAVE(); + return ret; +} + +/** * @brief This function prepares command of get_hw_spec. - * + * * @param pmpriv A pointer to mlan_private structure * @param pcmd A pointer to HostCmd_DS_COMMAND structure * @@ -2959,20 +3177,21 @@ wlan_adapter_init_cmd(IN pmlan_adapter pmadapter) mlan_status wlan_cmd_get_hw_spec(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND * pcmd) { - HostCmd_DS_GET_HW_SPEC *hw_spec = &pcmd->params.hw_spec; + HostCmd_DS_GET_HW_SPEC *hw_spec = &pcmd->params.hw_spec; - ENTER(); + ENTER(); - pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_GET_HW_SPEC); - pcmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_GET_HW_SPEC) + S_DS_GEN); - memcpy(pmpriv->adapter, hw_spec->permanent_addr, pmpriv->curr_addr, - MLAN_MAC_ADDR_LENGTH); + pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_GET_HW_SPEC); + pcmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_GET_HW_SPEC) + S_DS_GEN); + memcpy(pmpriv->adapter, hw_spec->permanent_addr, pmpriv->curr_addr, + MLAN_MAC_ADDR_LENGTH); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command of set_cfg_data. * * @param pmpriv A pointer to mlan_private strcture @@ -2984,45 +3203,46 @@ wlan_cmd_get_hw_spec(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND * pcmd) */ mlan_status wlan_cmd_cfg_data(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * pcmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * pcmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - mlan_status ret = MLAN_STATUS_SUCCESS; - HostCmd_DS_802_11_CFG_DATA *pcfg_data = &(pcmd->params.cfg_data); - pmlan_adapter pmadapter = pmpriv->adapter; - t_u32 len; - t_u32 cal_data_offset; - t_u8 *temp_pcmd = (t_u8 *) pcmd; + mlan_status ret = MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_CFG_DATA *pcfg_data = &(pcmd->params.cfg_data); + pmlan_adapter pmadapter = pmpriv->adapter; + t_u32 len; + t_u32 cal_data_offset; + t_u8 *temp_pcmd = (t_u8 *) pcmd; - ENTER(); + ENTER(); - cal_data_offset = S_DS_GEN + sizeof(HostCmd_DS_802_11_CFG_DATA); - if ((pmadapter->pcal_data) && (pmadapter->cal_data_len > 0)) { - len = wlan_parse_cal_cfg((t_u8 *) pmadapter->pcal_data, - pmadapter->cal_data_len, - (t_u8 *) (temp_pcmd + cal_data_offset)); - } else { - ret = MLAN_STATUS_FAILURE; - goto done; - } + cal_data_offset = S_DS_GEN + sizeof(HostCmd_DS_802_11_CFG_DATA); + if ((pmadapter->pcal_data) && (pmadapter->cal_data_len > 0)) { + len = wlan_parse_cal_cfg((t_u8 *) pmadapter->pcal_data, + pmadapter->cal_data_len, + (t_u8 *) (temp_pcmd + + cal_data_offset)); + } else { + ret = MLAN_STATUS_FAILURE; + goto done; + } - pcfg_data->action = cmd_action; - pcfg_data->type = 2; /* cal data type */ - pcfg_data->data_len = len; + pcfg_data->action = cmd_action; + pcfg_data->type = 2; /* cal data type */ + pcfg_data->data_len = len; - pcmd->command = HostCmd_CMD_CFG_DATA; - pcmd->size = pcfg_data->data_len + cal_data_offset; + pcmd->command = HostCmd_CMD_CFG_DATA; + pcmd->size = pcfg_data->data_len + cal_data_offset; - pcmd->command = wlan_cpu_to_le16(pcmd->command); - pcmd->size = wlan_cpu_to_le16(pcmd->size); + pcmd->command = wlan_cpu_to_le16(pcmd->command); + pcmd->size = wlan_cpu_to_le16(pcmd->size); - pcfg_data->action = wlan_cpu_to_le16(pcfg_data->action); - pcfg_data->type = wlan_cpu_to_le16(pcfg_data->type); - pcfg_data->data_len = wlan_cpu_to_le16(pcfg_data->data_len); + pcfg_data->action = wlan_cpu_to_le16(pcfg_data->action); + pcfg_data->type = wlan_cpu_to_le16(pcfg_data->type); + pcfg_data->data_len = wlan_cpu_to_le16(pcfg_data->data_len); - done: - LEAVE(); - return ret; +done: + LEAVE(); + return ret; } /** @@ -3036,23 +3256,23 @@ wlan_cmd_cfg_data(IN pmlan_private pmpriv, */ mlan_status wlan_ret_cfg_data(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, IN t_void * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, IN t_void * pioctl_buf) { - mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_status ret = MLAN_STATUS_SUCCESS; - ENTER(); + ENTER(); - if (resp->result != HostCmd_RESULT_OK) { - PRINTM(MERROR, "Cal data cmd resp failed\n"); - ret = MLAN_STATUS_FAILURE; - } - LEAVE(); - return ret; + if (resp->result != HostCmd_RESULT_OK) { + PRINTM(MERROR, "Cal data cmd resp failed\n"); + ret = MLAN_STATUS_FAILURE; + } + LEAVE(); + return ret; } -/** +/** * @brief This function prepares command of mac_control. - * + * * @param pmpriv A pointer to mlan_private structure * @param pcmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action Command action @@ -3062,31 +3282,32 @@ wlan_ret_cfg_data(IN pmlan_private pmpriv, */ mlan_status wlan_cmd_mac_control(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * pcmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * pcmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - HostCmd_DS_MAC_CONTROL *pmac = &pcmd->params.mac_ctrl; - t_u32 action = *((t_u32 *) pdata_buf); + HostCmd_DS_MAC_CONTROL *pmac = &pcmd->params.mac_ctrl; + t_u32 action = *((t_u32 *) pdata_buf); - ENTER(); + ENTER(); - if (cmd_action != HostCmd_ACT_GEN_SET) { - PRINTM(MERROR, "wlan_cmd_mac_control(): support SET only.\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } + if (cmd_action != HostCmd_ACT_GEN_SET) { + PRINTM(MERROR, "wlan_cmd_mac_control(): support SET only.\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } - pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_MAC_CONTROL); - pcmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_MAC_CONTROL) + S_DS_GEN); - pmac->action = wlan_cpu_to_le32(action); + pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_MAC_CONTROL); + pcmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_MAC_CONTROL) + S_DS_GEN); + pmac->action = wlan_cpu_to_le32(action); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of mac_control - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -3095,17 +3316,17 @@ wlan_cmd_mac_control(IN pmlan_private pmpriv, */ mlan_status wlan_ret_mac_control(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - ENTER(); - LEAVE(); - return MLAN_STATUS_SUCCESS; + ENTER(); + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of get_hw_spec - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to command buffer @@ -3114,147 +3335,156 @@ wlan_ret_mac_control(IN pmlan_private pmpriv, */ mlan_status wlan_ret_get_hw_spec(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, IN t_void * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, IN t_void * pioctl_buf) { - HostCmd_DS_GET_HW_SPEC *hw_spec = &resp->params.hw_spec; - mlan_adapter *pmadapter = pmpriv->adapter; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u32 i; - pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; + HostCmd_DS_GET_HW_SPEC *hw_spec = &resp->params.hw_spec; + mlan_adapter *pmadapter = pmpriv->adapter; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u32 i; + pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; - ENTER(); + ENTER(); - pmadapter->fw_cap_info = wlan_le32_to_cpu(hw_spec->fw_cap_info); + pmadapter->fw_cap_info = wlan_le32_to_cpu(hw_spec->fw_cap_info); #ifdef STA_SUPPORT - if (IS_SUPPORT_MULTI_BANDS(pmadapter)) { - pmadapter->fw_bands = (t_u8) GET_FW_DEFAULT_BANDS(pmadapter); - } else { - pmadapter->fw_bands = BAND_B; - } - - pmadapter->config_bands = pmadapter->fw_bands; - for (i = 0; i < pmadapter->priv_num; i++) { - if (pmadapter->priv[i]) - pmadapter->priv[i]->config_bands = pmadapter->fw_bands; - } - - if (pmadapter->fw_bands & BAND_A) { - if (pmadapter->fw_bands & BAND_GN) { - pmadapter->config_bands |= BAND_AN; - for (i = 0; i < pmadapter->priv_num; i++) { - if (pmadapter->priv[i]) - pmadapter->priv[i]->config_bands |= BAND_AN; - } - - pmadapter->fw_bands |= BAND_AN; - } - if (pmadapter->fw_bands & BAND_AAC) { - pmadapter->config_bands |= BAND_AAC; - for (i = 0; i < pmadapter->priv_num; i++) { - if (pmadapter->priv[i]) - pmadapter->priv[i]->config_bands |= BAND_AAC; - } - } - if ((pmadapter->fw_bands & BAND_AN) - ) { - pmadapter->adhoc_start_band = BAND_A | BAND_AN; - pmadapter->adhoc_11n_enabled = MTRUE; - } else - pmadapter->adhoc_start_band = BAND_A; - pmpriv->adhoc_channel = DEFAULT_AD_HOC_CHANNEL_A; - } else if ((pmadapter->fw_bands & BAND_GN) - ) { - pmadapter->adhoc_start_band = BAND_G | BAND_B | BAND_GN; - pmpriv->adhoc_channel = DEFAULT_AD_HOC_CHANNEL; - pmadapter->adhoc_11n_enabled = MTRUE; - } else if (pmadapter->fw_bands & BAND_G) { - pmadapter->adhoc_start_band = BAND_G | BAND_B; - pmpriv->adhoc_channel = DEFAULT_AD_HOC_CHANNEL; - } else if (pmadapter->fw_bands & BAND_B) { - pmadapter->adhoc_start_band = BAND_B; - pmpriv->adhoc_channel = DEFAULT_AD_HOC_CHANNEL; - } + if (IS_SUPPORT_MULTI_BANDS(pmadapter)) { + pmadapter->fw_bands = (t_u8) GET_FW_DEFAULT_BANDS(pmadapter); + } else { + pmadapter->fw_bands = BAND_B; + } + + pmadapter->config_bands = pmadapter->fw_bands; + for (i = 0; i < pmadapter->priv_num; i++) { + if (pmadapter->priv[i]) + pmadapter->priv[i]->config_bands = pmadapter->fw_bands; + } + + if (pmadapter->fw_bands & BAND_A) { + if (pmadapter->fw_bands & BAND_GN) { + pmadapter->config_bands |= BAND_AN; + for (i = 0; i < pmadapter->priv_num; i++) { + if (pmadapter->priv[i]) + pmadapter->priv[i]->config_bands |= + BAND_AN; + } + + pmadapter->fw_bands |= BAND_AN; + } + if (pmadapter->fw_bands & BAND_AAC) { + pmadapter->config_bands |= BAND_AAC; + for (i = 0; i < pmadapter->priv_num; i++) { + if (pmadapter->priv[i]) + pmadapter->priv[i]->config_bands |= + BAND_AAC; + } + } + if ((pmadapter->fw_bands & BAND_AN) + ) { + pmadapter->adhoc_start_band = BAND_A | BAND_AN; + pmadapter->adhoc_11n_enabled = MTRUE; + } else + pmadapter->adhoc_start_band = BAND_A; + pmpriv->adhoc_channel = DEFAULT_AD_HOC_CHANNEL_A; + } else if ((pmadapter->fw_bands & BAND_GN) + ) { + pmadapter->adhoc_start_band = BAND_G | BAND_B | BAND_GN; + pmpriv->adhoc_channel = DEFAULT_AD_HOC_CHANNEL; + pmadapter->adhoc_11n_enabled = MTRUE; + } else if (pmadapter->fw_bands & BAND_G) { + pmadapter->adhoc_start_band = BAND_G | BAND_B; + pmpriv->adhoc_channel = DEFAULT_AD_HOC_CHANNEL; + } else if (pmadapter->fw_bands & BAND_B) { + pmadapter->adhoc_start_band = BAND_B; + pmpriv->adhoc_channel = DEFAULT_AD_HOC_CHANNEL; + } #endif /* STA_SUPPORT */ - pmadapter->fw_release_number = hw_spec->fw_release_number; - pmadapter->number_of_antenna = wlan_le16_to_cpu(hw_spec->number_of_antenna); - - PRINTM(MINFO, "GET_HW_SPEC: fw_release_number- 0x%X\n", - wlan_le32_to_cpu(pmadapter->fw_release_number)); - PRINTM(MINFO, "GET_HW_SPEC: Permanent addr- " MACSTR "\n", - MAC2STR(hw_spec->permanent_addr)); - PRINTM(MINFO, "GET_HW_SPEC: hw_if_version=0x%X version=0x%X\n", - wlan_le16_to_cpu(hw_spec->hw_if_version), - wlan_le16_to_cpu(hw_spec->version)); - - if (pmpriv->curr_addr[0] == 0xff) - memmove(pmadapter, pmpriv->curr_addr, hw_spec->permanent_addr, - MLAN_MAC_ADDR_LENGTH); - - pmadapter->hw_dot_11n_dev_cap = wlan_le32_to_cpu(hw_spec->dot_11n_dev_cap); - pmadapter->usr_dot_11n_dev_cap_bg = pmadapter->hw_dot_11n_dev_cap & - DEFAULT_11N_CAP_MASK_BG; - pmadapter->usr_dot_11n_dev_cap_a = pmadapter->hw_dot_11n_dev_cap & - DEFAULT_11N_CAP_MASK_A; - pmadapter->usr_dev_mcs_support = pmadapter->hw_dev_mcs_support = - hw_spec->dev_mcs_support; - wlan_show_dot11ndevcap(pmadapter, pmadapter->hw_dot_11n_dev_cap); - wlan_show_devmcssupport(pmadapter, pmadapter->hw_dev_mcs_support); - pmadapter->hw_dot_11ac_dev_cap = wlan_le32_to_cpu(hw_spec->Dot11acDevCap); - pmadapter->usr_dot_11ac_mcs_support = pmadapter->hw_dot_11ac_mcs_support = - wlan_le32_to_cpu(hw_spec->Dot11acMcsSupport); - pmadapter->usr_dot_11ac_dev_cap_bg = pmadapter->hw_dot_11ac_dev_cap; - pmadapter->usr_dot_11ac_dev_cap_a = pmadapter->hw_dot_11ac_dev_cap; - wlan_show_dot11acdevcap(pmadapter, pmadapter->hw_dot_11ac_dev_cap); - wlan_show_dot11acmcssupport(pmadapter, pmadapter->hw_dot_11ac_mcs_support); - pmadapter->mp_end_port = wlan_le16_to_cpu(hw_spec->mp_end_port); - - pmadapter->max_mgmt_ie_index = wlan_le16_to_cpu(hw_spec->mgmt_buf_count); - PRINTM(MINFO, "GET_HW_SPEC: mgmt IE count=%d\n", - pmadapter->max_mgmt_ie_index); - if (!pmadapter->max_mgmt_ie_index) - pmadapter->max_mgmt_ie_index = MAX_MGMT_IE_INDEX; - - pmadapter->region_code = wlan_le16_to_cpu(hw_spec->region_code); - for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) { - /* Use the region code to search for the index */ - if (pmadapter->region_code == region_code_index[i]) - break; - } - /* If it's unidentified region code, use the default */ - if (i >= MRVDRV_MAX_REGION_CODE) { - pmadapter->region_code = MRVDRV_DEFAULT_REGION_CODE; - PRINTM(MWARN, "unidentified region code, use the default (0x%02x)\n", - MRVDRV_DEFAULT_REGION_CODE); - } - /* Synchronize CFP code with region code */ - pmadapter->cfp_code_bg = pmadapter->region_code; - pmadapter->cfp_code_a = pmadapter->region_code; - - if (wlan_set_regiontable(pmpriv, (t_u8) pmadapter->region_code, - pmadapter->fw_bands)) { - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_CMD_SCAN_FAIL; - ret = MLAN_STATUS_FAILURE; - goto done; - } + pmadapter->fw_release_number = hw_spec->fw_release_number; + pmadapter->number_of_antenna = + wlan_le16_to_cpu(hw_spec->number_of_antenna); + + PRINTM(MINFO, "GET_HW_SPEC: fw_release_number- 0x%X\n", + wlan_le32_to_cpu(pmadapter->fw_release_number)); + PRINTM(MINFO, "GET_HW_SPEC: Permanent addr- " MACSTR "\n", + MAC2STR(hw_spec->permanent_addr)); + PRINTM(MINFO, "GET_HW_SPEC: hw_if_version=0x%X version=0x%X\n", + wlan_le16_to_cpu(hw_spec->hw_if_version), + wlan_le16_to_cpu(hw_spec->version)); + + if (pmpriv->curr_addr[0] == 0xff) + memmove(pmadapter, pmpriv->curr_addr, hw_spec->permanent_addr, + MLAN_MAC_ADDR_LENGTH); + + pmadapter->hw_dot_11n_dev_cap = + wlan_le32_to_cpu(hw_spec->dot_11n_dev_cap); + pmadapter->usr_dot_11n_dev_cap_bg = + pmadapter->hw_dot_11n_dev_cap & DEFAULT_11N_CAP_MASK_BG; + pmadapter->usr_dot_11n_dev_cap_a = + pmadapter->hw_dot_11n_dev_cap & DEFAULT_11N_CAP_MASK_A; + pmadapter->usr_dev_mcs_support = pmadapter->hw_dev_mcs_support = + hw_spec->dev_mcs_support; + wlan_show_dot11ndevcap(pmadapter, pmadapter->hw_dot_11n_dev_cap); + wlan_show_devmcssupport(pmadapter, pmadapter->hw_dev_mcs_support); + pmadapter->hw_dot_11ac_dev_cap = + wlan_le32_to_cpu(hw_spec->Dot11acDevCap); + pmadapter->usr_dot_11ac_mcs_support = + pmadapter->hw_dot_11ac_mcs_support = + wlan_le32_to_cpu(hw_spec->Dot11acMcsSupport); + pmadapter->usr_dot_11ac_dev_cap_bg = pmadapter->hw_dot_11ac_dev_cap; + pmadapter->usr_dot_11ac_dev_cap_a = pmadapter->hw_dot_11ac_dev_cap; + wlan_show_dot11acdevcap(pmadapter, pmadapter->hw_dot_11ac_dev_cap); + wlan_show_dot11acmcssupport(pmadapter, + pmadapter->hw_dot_11ac_mcs_support); + pmadapter->mp_end_port = wlan_le16_to_cpu(hw_spec->mp_end_port); + + pmadapter->max_mgmt_ie_index = + wlan_le16_to_cpu(hw_spec->mgmt_buf_count); + PRINTM(MINFO, "GET_HW_SPEC: mgmt IE count=%d\n", + pmadapter->max_mgmt_ie_index); + if (!pmadapter->max_mgmt_ie_index) + pmadapter->max_mgmt_ie_index = MAX_MGMT_IE_INDEX; + + pmadapter->region_code = wlan_le16_to_cpu(hw_spec->region_code); + for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) { + /* Use the region code to search for the index */ + if (pmadapter->region_code == region_code_index[i]) + break; + } + /* If it's unidentified region code, use the default */ + if (i >= MRVDRV_MAX_REGION_CODE) { + pmadapter->region_code = MRVDRV_DEFAULT_REGION_CODE; + PRINTM(MWARN, + "unidentified region code, use the default (0x%02x)\n", + MRVDRV_DEFAULT_REGION_CODE); + } + /* Synchronize CFP code with region code */ + pmadapter->cfp_code_bg = pmadapter->region_code; + pmadapter->cfp_code_a = pmadapter->region_code; + + if (wlan_set_regiontable(pmpriv, (t_u8) pmadapter->region_code, + pmadapter->fw_bands)) { + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_CMD_SCAN_FAIL; + ret = MLAN_STATUS_FAILURE; + goto done; + } #ifdef STA_SUPPORT - if (wlan_11d_set_universaltable(pmpriv, pmadapter->fw_bands)) { - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_CMD_SCAN_FAIL; - ret = MLAN_STATUS_FAILURE; - goto done; - } + if (wlan_11d_set_universaltable(pmpriv, pmadapter->fw_bands)) { + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_CMD_SCAN_FAIL; + ret = MLAN_STATUS_FAILURE; + goto done; + } #endif /* STA_SUPPORT */ - done: - LEAVE(); - return ret; +done: + LEAVE(); + return ret; } -/** +/** * @brief This function prepares command of radio_control. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -3264,56 +3494,56 @@ wlan_ret_get_hw_spec(IN pmlan_private pmpriv, */ mlan_status wlan_cmd_802_11_radio_control(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) -{ - HostCmd_DS_802_11_RADIO_CONTROL *pradio_control = &cmd->params.radio; - t_u32 radio_ctl; - ENTER(); - cmd->size = wlan_cpu_to_le16((sizeof(HostCmd_DS_802_11_RADIO_CONTROL)) - + S_DS_GEN); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_RADIO_CONTROL); - pradio_control->action = wlan_cpu_to_le16(cmd_action); - memcpy(pmpriv->adapter, &radio_ctl, pdata_buf, sizeof(t_u32)); - pradio_control->control = wlan_cpu_to_le16((t_u16) radio_ctl); - LEAVE(); - return MLAN_STATUS_SUCCESS; -} - -/** + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) +{ + HostCmd_DS_802_11_RADIO_CONTROL *pradio_control = &cmd->params.radio; + t_u32 radio_ctl; + ENTER(); + cmd->size = wlan_cpu_to_le16((sizeof(HostCmd_DS_802_11_RADIO_CONTROL)) + + S_DS_GEN); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_RADIO_CONTROL); + pradio_control->action = wlan_cpu_to_le16(cmd_action); + memcpy(pmpriv->adapter, &radio_ctl, pdata_buf, sizeof(t_u32)); + pradio_control->control = wlan_cpu_to_le16((t_u16) radio_ctl); + LEAVE(); + return MLAN_STATUS_SUCCESS; +} + +/** * @brief This function handles the command response of radio_control - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND - * @param pioctl_buf A pointer to mlan_ioctl_req structure + * @param pioctl_buf A pointer to mlan_ioctl_req structure * * @return MLAN_STATUS_SUCCESS */ mlan_status wlan_ret_802_11_radio_control(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_802_11_RADIO_CONTROL *pradio_ctrl = - (HostCmd_DS_802_11_RADIO_CONTROL *) & resp->params.radio; - mlan_ds_radio_cfg *radio_cfg = MNULL; - mlan_adapter *pmadapter = pmpriv->adapter; + HostCmd_DS_802_11_RADIO_CONTROL *pradio_ctrl = + (HostCmd_DS_802_11_RADIO_CONTROL *) & resp->params.radio; + mlan_ds_radio_cfg *radio_cfg = MNULL; + mlan_adapter *pmadapter = pmpriv->adapter; - ENTER(); - pmadapter->radio_on = wlan_le16_to_cpu(pradio_ctrl->control); - if (pioctl_buf) { - radio_cfg = (mlan_ds_radio_cfg *) pioctl_buf->pbuf; - radio_cfg->param.radio_on_off = (t_u32) pmadapter->radio_on; - pioctl_buf->data_read_written = sizeof(mlan_ds_radio_cfg); - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + ENTER(); + pmadapter->radio_on = wlan_le16_to_cpu(pradio_ctrl->control); + if (pioctl_buf) { + radio_cfg = (mlan_ds_radio_cfg *) pioctl_buf->pbuf; + radio_cfg->param.radio_on_off = (t_u32) pmadapter->radio_on; + pioctl_buf->data_read_written = sizeof(mlan_ds_radio_cfg); + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } #ifdef WIFI_DIRECT_SUPPORT -/** +/** * @brief This function prepares command of remain_on_channel. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -3323,66 +3553,68 @@ wlan_ret_802_11_radio_control(IN pmlan_private pmpriv, */ mlan_status wlan_cmd_remain_on_channel(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) -{ - HostCmd_DS_REMAIN_ON_CHANNEL *remain_channel = &cmd->params.remain_on_chan; - mlan_ds_remain_chan *cfg = (mlan_ds_remain_chan *) pdata_buf; - ENTER(); - cmd->size = wlan_cpu_to_le16((sizeof(HostCmd_DS_REMAIN_ON_CHANNEL)) - + S_DS_GEN); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_REMAIN_ON_CHANNEL); - remain_channel->action = cmd_action; - if (cmd_action == HostCmd_ACT_GEN_SET) { - if (cfg->remove) { - remain_channel->action = HostCmd_ACT_GEN_REMOVE; - } else { - remain_channel->bandcfg = cfg->bandcfg; - remain_channel->channel = cfg->channel; - remain_channel->remain_period = - wlan_cpu_to_le32(cfg->remain_period); - } - } - remain_channel->action = wlan_cpu_to_le16(remain_channel->action); - - LEAVE(); - return MLAN_STATUS_SUCCESS; -} - -/** + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) +{ + HostCmd_DS_REMAIN_ON_CHANNEL *remain_channel = + &cmd->params.remain_on_chan; + mlan_ds_remain_chan *cfg = (mlan_ds_remain_chan *) pdata_buf; + ENTER(); + cmd->size = wlan_cpu_to_le16((sizeof(HostCmd_DS_REMAIN_ON_CHANNEL)) + + S_DS_GEN); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_REMAIN_ON_CHANNEL); + remain_channel->action = cmd_action; + if (cmd_action == HostCmd_ACT_GEN_SET) { + if (cfg->remove) { + remain_channel->action = HostCmd_ACT_GEN_REMOVE; + } else { + remain_channel->bandcfg = cfg->bandcfg; + remain_channel->channel = cfg->channel; + remain_channel->remain_period = + wlan_cpu_to_le32(cfg->remain_period); + } + } + remain_channel->action = wlan_cpu_to_le16(remain_channel->action); + + LEAVE(); + return MLAN_STATUS_SUCCESS; +} + +/** * @brief This function handles the command response of remain_on_channel - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND - * @param pioctl_buf A pointer to mlan_ioctl_req structure + * @param pioctl_buf A pointer to mlan_ioctl_req structure * * @return MLAN_STATUS_SUCCESS */ mlan_status wlan_ret_remain_on_channel(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) -{ - HostCmd_DS_REMAIN_ON_CHANNEL *remain_channel = &resp->params.remain_on_chan; - mlan_ds_radio_cfg *radio_cfg = MNULL; - - ENTER(); - if (pioctl_buf) { - radio_cfg = (mlan_ds_radio_cfg *) pioctl_buf->pbuf; - radio_cfg->param.remain_chan.status = remain_channel->status; - radio_cfg->param.remain_chan.bandcfg = remain_channel->bandcfg; - radio_cfg->param.remain_chan.channel = remain_channel->channel; - radio_cfg->param.remain_chan.remain_period = - wlan_le32_to_cpu(remain_channel->remain_period); - pioctl_buf->data_read_written = sizeof(mlan_ds_radio_cfg); - } - LEAVE(); - return MLAN_STATUS_SUCCESS; -} - -/** + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) +{ + HostCmd_DS_REMAIN_ON_CHANNEL *remain_channel = + &resp->params.remain_on_chan; + mlan_ds_radio_cfg *radio_cfg = MNULL; + + ENTER(); + if (pioctl_buf) { + radio_cfg = (mlan_ds_radio_cfg *) pioctl_buf->pbuf; + radio_cfg->param.remain_chan.status = remain_channel->status; + radio_cfg->param.remain_chan.bandcfg = remain_channel->bandcfg; + radio_cfg->param.remain_chan.channel = remain_channel->channel; + radio_cfg->param.remain_chan.remain_period = + wlan_le32_to_cpu(remain_channel->remain_period); + pioctl_buf->data_read_written = sizeof(mlan_ds_radio_cfg); + } + LEAVE(); + return MLAN_STATUS_SUCCESS; +} + +/** * @brief This function prepares command of wifi direct mode. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -3392,54 +3624,54 @@ wlan_ret_remain_on_channel(IN pmlan_private pmpriv, */ mlan_status wlan_cmd_wifi_direct_mode(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - HostCmd_DS_WIFI_DIRECT_MODE *wfd_mode = &cmd->params.wifi_direct_mode; - t_u16 mode = *((t_u16 *) pdata_buf); - ENTER(); - cmd->size = wlan_cpu_to_le16((sizeof(HostCmd_DS_WIFI_DIRECT_MODE)) - + S_DS_GEN); - cmd->command = wlan_cpu_to_le16(HOST_CMD_WIFI_DIRECT_MODE_CONFIG); - wfd_mode->action = wlan_cpu_to_le16(cmd_action); - if (cmd_action == HostCmd_ACT_GEN_SET) - wfd_mode->mode = wlan_cpu_to_le16(mode); + HostCmd_DS_WIFI_DIRECT_MODE *wfd_mode = &cmd->params.wifi_direct_mode; + t_u16 mode = *((t_u16 *) pdata_buf); + ENTER(); + cmd->size = wlan_cpu_to_le16((sizeof(HostCmd_DS_WIFI_DIRECT_MODE)) + + S_DS_GEN); + cmd->command = wlan_cpu_to_le16(HOST_CMD_WIFI_DIRECT_MODE_CONFIG); + wfd_mode->action = wlan_cpu_to_le16(cmd_action); + if (cmd_action == HostCmd_ACT_GEN_SET) + wfd_mode->mode = wlan_cpu_to_le16(mode); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of wifi direct mode - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND - * @param pioctl_buf A pointer to mlan_ioctl_req structure + * @param pioctl_buf A pointer to mlan_ioctl_req structure * * @return MLAN_STATUS_SUCCESS */ mlan_status wlan_ret_wifi_direct_mode(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_WIFI_DIRECT_MODE *wfd_mode = &resp->params.wifi_direct_mode; - mlan_ds_bss *bss = MNULL; + HostCmd_DS_WIFI_DIRECT_MODE *wfd_mode = &resp->params.wifi_direct_mode; + mlan_ds_bss *bss = MNULL; - ENTER(); - if (pioctl_buf) { - bss = (mlan_ds_bss *) pioctl_buf->pbuf; - bss->param.wfd_mode = wlan_le16_to_cpu(wfd_mode->mode); - pioctl_buf->data_read_written = sizeof(mlan_ds_bss); - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + ENTER(); + if (pioctl_buf) { + bss = (mlan_ds_bss *) pioctl_buf->pbuf; + bss->param.wfd_mode = wlan_le16_to_cpu(wfd_mode->mode); + pioctl_buf->data_read_written = sizeof(mlan_ds_bss); + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } #endif -/** +/** * @brief This function prepares command of hs wakeup reason. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param pdata_buf A pointer to data buffer @@ -3447,22 +3679,23 @@ wlan_ret_wifi_direct_mode(IN pmlan_private pmpriv, */ mlan_status wlan_cmd_hs_wakeup_reason(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) { - ENTER(); + ENTER(); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_HS_WAKEUP_REASON); - cmd->size = - wlan_cpu_to_le16((sizeof(HostCmd_DS_HS_WAKEUP_REASON)) + S_DS_GEN); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_HS_WAKEUP_REASON); + cmd->size = + wlan_cpu_to_le16((sizeof(HostCmd_DS_HS_WAKEUP_REASON)) + + S_DS_GEN); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of * hs wakeup reason - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to command buffer @@ -3471,27 +3704,27 @@ wlan_cmd_hs_wakeup_reason(IN pmlan_private pmpriv, */ mlan_status wlan_ret_hs_wakeup_reason(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_HS_WAKEUP_REASON *hs_wakeup_reason = - (HostCmd_DS_HS_WAKEUP_REASON *) & resp->params.hs_wakeup_reason; - mlan_ds_pm_cfg *pm_cfg = MNULL; + HostCmd_DS_HS_WAKEUP_REASON *hs_wakeup_reason = + (HostCmd_DS_HS_WAKEUP_REASON *) & resp->params.hs_wakeup_reason; + mlan_ds_pm_cfg *pm_cfg = MNULL; - ENTER(); + ENTER(); - pm_cfg = (mlan_ds_pm_cfg *) pioctl_buf->pbuf; - pm_cfg->param.wakeup_reason.hs_wakeup_reason = - wlan_le16_to_cpu(hs_wakeup_reason->wakeup_reason); - pioctl_buf->data_read_written = sizeof(mlan_ds_pm_cfg); + pm_cfg = (mlan_ds_pm_cfg *) pioctl_buf->pbuf; + pm_cfg->param.wakeup_reason.hs_wakeup_reason = + wlan_le16_to_cpu(hs_wakeup_reason->wakeup_reason); + pioctl_buf->data_read_written = sizeof(mlan_ds_pm_cfg); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command of rf_antenna. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -3501,30 +3734,31 @@ wlan_ret_hs_wakeup_reason(IN pmlan_private pmpriv, */ mlan_status wlan_cmd_802_11_rf_antenna(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) -{ - HostCmd_DS_802_11_RF_ANTENNA *pantenna = &cmd->params.antenna; - mlan_ds_ant_cfg *ant_cfg = (mlan_ds_ant_cfg *) pdata_buf; - - ENTER(); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_RF_ANTENNA); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_RF_ANTENNA) + S_DS_GEN); - - if (cmd_action == HostCmd_ACT_GEN_SET) { - pantenna->action_tx = wlan_cpu_to_le16(HostCmd_ACT_SET_TX); - pantenna->tx_antenna_mode = - wlan_cpu_to_le16((t_u16) ant_cfg->tx_antenna); - pantenna->action_rx = wlan_cpu_to_le16(HostCmd_ACT_SET_RX); - pantenna->rx_antenna_mode = - wlan_cpu_to_le16((t_u16) ant_cfg->rx_antenna); - } else { - pantenna->action_tx = wlan_cpu_to_le16(HostCmd_ACT_GET_TX); - pantenna->action_rx = wlan_cpu_to_le16(HostCmd_ACT_GET_RX); - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) +{ + HostCmd_DS_802_11_RF_ANTENNA *pantenna = &cmd->params.antenna; + mlan_ds_ant_cfg *ant_cfg = (mlan_ds_ant_cfg *) pdata_buf; + + ENTER(); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_RF_ANTENNA); + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_RF_ANTENNA) + + S_DS_GEN); + + if (cmd_action == HostCmd_ACT_GEN_SET) { + pantenna->action_tx = wlan_cpu_to_le16(HostCmd_ACT_SET_TX); + pantenna->tx_antenna_mode = + wlan_cpu_to_le16((t_u16) ant_cfg->tx_antenna); + pantenna->action_rx = wlan_cpu_to_le16(HostCmd_ACT_SET_RX); + pantenna->rx_antenna_mode = + wlan_cpu_to_le16((t_u16) ant_cfg->rx_antenna); + } else { + pantenna->action_tx = wlan_cpu_to_le16(HostCmd_ACT_GET_TX); + pantenna->action_rx = wlan_cpu_to_le16(HostCmd_ACT_GET_RX); + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -3538,34 +3772,34 @@ wlan_cmd_802_11_rf_antenna(IN pmlan_private pmpriv, */ mlan_status wlan_ret_802_11_rf_antenna(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_802_11_RF_ANTENNA *pantenna = &resp->params.antenna; - t_u16 tx_ant_mode = wlan_le16_to_cpu(pantenna->tx_antenna_mode); - t_u16 rx_ant_mode = wlan_le16_to_cpu(pantenna->rx_antenna_mode); - mlan_ds_radio_cfg *radio = MNULL; + HostCmd_DS_802_11_RF_ANTENNA *pantenna = &resp->params.antenna; + t_u16 tx_ant_mode = wlan_le16_to_cpu(pantenna->tx_antenna_mode); + t_u16 rx_ant_mode = wlan_le16_to_cpu(pantenna->rx_antenna_mode); + mlan_ds_radio_cfg *radio = MNULL; - ENTER(); + ENTER(); - PRINTM(MINFO, "RF_ANT_RESP: Tx action = 0x%x, Tx Mode = 0x%04x" - " Rx action = 0x%x, Rx Mode = 0x%04x\n", - wlan_le16_to_cpu(pantenna->action_tx), tx_ant_mode, - wlan_le16_to_cpu(pantenna->action_rx), rx_ant_mode); + PRINTM(MINFO, "RF_ANT_RESP: Tx action = 0x%x, Tx Mode = 0x%04x" + " Rx action = 0x%x, Rx Mode = 0x%04x\n", + wlan_le16_to_cpu(pantenna->action_tx), tx_ant_mode, + wlan_le16_to_cpu(pantenna->action_rx), rx_ant_mode); - if (pioctl_buf) { - radio = (mlan_ds_radio_cfg *) pioctl_buf->pbuf; - radio->param.ant_cfg.tx_antenna = tx_ant_mode; - radio->param.ant_cfg.rx_antenna = rx_ant_mode; - } + if (pioctl_buf) { + radio = (mlan_ds_radio_cfg *) pioctl_buf->pbuf; + radio->param.ant_cfg.tx_antenna = tx_ant_mode; + radio->param.ant_cfg.rx_antenna = rx_ant_mode; + } - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command of reg_access. - * + * * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action the action: GET or SET * @param pdata_buf A pointer to data buffer @@ -3573,85 +3807,109 @@ wlan_ret_802_11_rf_antenna(IN pmlan_private pmpriv, */ mlan_status wlan_cmd_reg_access(IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) -{ - mlan_ds_reg_rw *reg_rw; - - ENTER(); - - reg_rw = (mlan_ds_reg_rw *) pdata_buf; - switch (cmd->command) { - case HostCmd_CMD_MAC_REG_ACCESS: - { - HostCmd_DS_MAC_REG_ACCESS *mac_reg; - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_MAC_REG_ACCESS) + S_DS_GEN); - mac_reg = (HostCmd_DS_MAC_REG_ACCESS *) & cmd->params.mac_reg; - mac_reg->action = wlan_cpu_to_le16(cmd_action); - mac_reg->offset = wlan_cpu_to_le16((t_u16) reg_rw->offset); - mac_reg->value = wlan_cpu_to_le32(reg_rw->value); - break; - } - case HostCmd_CMD_BBP_REG_ACCESS: - { - HostCmd_DS_BBP_REG_ACCESS *bbp_reg; - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_BBP_REG_ACCESS) + S_DS_GEN); - bbp_reg = (HostCmd_DS_BBP_REG_ACCESS *) & cmd->params.bbp_reg; - bbp_reg->action = wlan_cpu_to_le16(cmd_action); - bbp_reg->offset = wlan_cpu_to_le16((t_u16) reg_rw->offset); - bbp_reg->value = (t_u8) reg_rw->value; - break; - } - case HostCmd_CMD_RF_REG_ACCESS: - { - HostCmd_DS_RF_REG_ACCESS *rf_reg; - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_RF_REG_ACCESS) + S_DS_GEN); - rf_reg = (HostCmd_DS_RF_REG_ACCESS *) & cmd->params.rf_reg; - rf_reg->action = wlan_cpu_to_le16(cmd_action); - rf_reg->offset = wlan_cpu_to_le16((t_u16) reg_rw->offset); - rf_reg->value = (t_u8) reg_rw->value; - break; - } - case HostCmd_CMD_CAU_REG_ACCESS: - { - HostCmd_DS_RF_REG_ACCESS *cau_reg; - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_RF_REG_ACCESS) + S_DS_GEN); - cau_reg = (HostCmd_DS_RF_REG_ACCESS *) & cmd->params.rf_reg; - cau_reg->action = wlan_cpu_to_le16(cmd_action); - cau_reg->offset = wlan_cpu_to_le16((t_u16) reg_rw->offset); - cau_reg->value = (t_u8) reg_rw->value; - break; - } - case HostCmd_CMD_802_11_EEPROM_ACCESS: - { - mlan_ds_read_eeprom *rd_eeprom = (mlan_ds_read_eeprom *) pdata_buf; - HostCmd_DS_802_11_EEPROM_ACCESS *cmd_eeprom = - (HostCmd_DS_802_11_EEPROM_ACCESS *) & cmd->params.eeprom; - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_EEPROM_ACCESS) + - S_DS_GEN); - cmd_eeprom->action = wlan_cpu_to_le16(cmd_action); - cmd_eeprom->offset = wlan_cpu_to_le16(rd_eeprom->offset); - cmd_eeprom->byte_count = wlan_cpu_to_le16(rd_eeprom->byte_count); - cmd_eeprom->value = 0; - break; - } - default: - LEAVE(); - return MLAN_STATUS_FAILURE; - } - cmd->command = wlan_cpu_to_le16(cmd->command); - - LEAVE(); - return MLAN_STATUS_SUCCESS; -} - -/** + IN t_u16 cmd_action, IN t_void * pdata_buf) +{ + mlan_ds_reg_rw *reg_rw; + + ENTER(); + + reg_rw = (mlan_ds_reg_rw *) pdata_buf; + switch (cmd->command) { + case HostCmd_CMD_MAC_REG_ACCESS: + { + HostCmd_DS_MAC_REG_ACCESS *mac_reg; + cmd->size = + wlan_cpu_to_le16(sizeof + (HostCmd_DS_MAC_REG_ACCESS) + + S_DS_GEN); + mac_reg = + (HostCmd_DS_MAC_REG_ACCESS *) & cmd->params. + mac_reg; + mac_reg->action = wlan_cpu_to_le16(cmd_action); + mac_reg->offset = + wlan_cpu_to_le16((t_u16) reg_rw->offset); + mac_reg->value = wlan_cpu_to_le32(reg_rw->value); + break; + } + case HostCmd_CMD_BBP_REG_ACCESS: + { + HostCmd_DS_BBP_REG_ACCESS *bbp_reg; + cmd->size = + wlan_cpu_to_le16(sizeof + (HostCmd_DS_BBP_REG_ACCESS) + + S_DS_GEN); + bbp_reg = + (HostCmd_DS_BBP_REG_ACCESS *) & cmd->params. + bbp_reg; + bbp_reg->action = wlan_cpu_to_le16(cmd_action); + bbp_reg->offset = + wlan_cpu_to_le16((t_u16) reg_rw->offset); + bbp_reg->value = (t_u8) reg_rw->value; + break; + } + case HostCmd_CMD_RF_REG_ACCESS: + { + HostCmd_DS_RF_REG_ACCESS *rf_reg; + cmd->size = + wlan_cpu_to_le16(sizeof + (HostCmd_DS_RF_REG_ACCESS) + + S_DS_GEN); + rf_reg = (HostCmd_DS_RF_REG_ACCESS *) & cmd->params. + rf_reg; + rf_reg->action = wlan_cpu_to_le16(cmd_action); + rf_reg->offset = + wlan_cpu_to_le16((t_u16) reg_rw->offset); + rf_reg->value = (t_u8) reg_rw->value; + break; + } + case HostCmd_CMD_CAU_REG_ACCESS: + { + HostCmd_DS_RF_REG_ACCESS *cau_reg; + cmd->size = + wlan_cpu_to_le16(sizeof + (HostCmd_DS_RF_REG_ACCESS) + + S_DS_GEN); + cau_reg = + (HostCmd_DS_RF_REG_ACCESS *) & cmd->params. + rf_reg; + cau_reg->action = wlan_cpu_to_le16(cmd_action); + cau_reg->offset = + wlan_cpu_to_le16((t_u16) reg_rw->offset); + cau_reg->value = (t_u8) reg_rw->value; + break; + } + case HostCmd_CMD_802_11_EEPROM_ACCESS: + { + mlan_ds_read_eeprom *rd_eeprom = + (mlan_ds_read_eeprom *) pdata_buf; + HostCmd_DS_802_11_EEPROM_ACCESS *cmd_eeprom = + (HostCmd_DS_802_11_EEPROM_ACCESS *) & cmd-> + params.eeprom; + cmd->size = + wlan_cpu_to_le16(sizeof + (HostCmd_DS_802_11_EEPROM_ACCESS) + + S_DS_GEN); + cmd_eeprom->action = wlan_cpu_to_le16(cmd_action); + cmd_eeprom->offset = + wlan_cpu_to_le16(rd_eeprom->offset); + cmd_eeprom->byte_count = + wlan_cpu_to_le16(rd_eeprom->byte_count); + cmd_eeprom->value = 0; + break; + } + default: + LEAVE(); + return MLAN_STATUS_FAILURE; + } + cmd->command = wlan_cpu_to_le16(cmd->command); + + LEAVE(); + return MLAN_STATUS_SUCCESS; +} + +/** * @brief This function handles the command response of reg_access - * + * * @param pmadapter A pointer to mlan_adapter structure * @param type The type of reg access (MAC, BBP or RF) * @param resp A pointer to HostCmd_DS_COMMAND @@ -3661,91 +3919,110 @@ wlan_cmd_reg_access(IN HostCmd_DS_COMMAND * cmd, */ mlan_status wlan_ret_reg_access(mlan_adapter * pmadapter, - t_u16 type, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) -{ - mlan_ds_reg_mem *reg_mem = MNULL; - mlan_ds_reg_rw *reg_rw = MNULL; - - ENTER(); - - if (pioctl_buf) { - reg_mem = (mlan_ds_reg_mem *) pioctl_buf->pbuf; - reg_rw = ®_mem->param.reg_rw; - switch (type) { - case HostCmd_CMD_MAC_REG_ACCESS: - { - HostCmd_DS_MAC_REG_ACCESS *reg; - reg = (HostCmd_DS_MAC_REG_ACCESS *) & resp->params.mac_reg; - reg_rw->offset = (t_u32) wlan_le16_to_cpu(reg->offset); - reg_rw->value = wlan_le32_to_cpu(reg->value); - break; - } - case HostCmd_CMD_BBP_REG_ACCESS: - { - HostCmd_DS_BBP_REG_ACCESS *reg; - reg = (HostCmd_DS_BBP_REG_ACCESS *) & resp->params.bbp_reg; - reg_rw->offset = (t_u32) wlan_le16_to_cpu(reg->offset); - reg_rw->value = (t_u32) reg->value; - break; - } - - case HostCmd_CMD_RF_REG_ACCESS: - { - HostCmd_DS_RF_REG_ACCESS *reg; - reg = (HostCmd_DS_RF_REG_ACCESS *) & resp->params.rf_reg; - reg_rw->offset = (t_u32) wlan_le16_to_cpu(reg->offset); - reg_rw->value = (t_u32) reg->value; - break; - } - case HostCmd_CMD_CAU_REG_ACCESS: - { - HostCmd_DS_RF_REG_ACCESS *reg; - reg = (HostCmd_DS_RF_REG_ACCESS *) & resp->params.rf_reg; - reg_rw->offset = (t_u32) wlan_le16_to_cpu(reg->offset); - reg_rw->value = (t_u32) reg->value; - break; - } - case HostCmd_CMD_802_11_EEPROM_ACCESS: - { - mlan_ds_read_eeprom *eeprom = ®_mem->param.rd_eeprom; - HostCmd_DS_802_11_EEPROM_ACCESS *cmd_eeprom = - (HostCmd_DS_802_11_EEPROM_ACCESS *) & resp->params.eeprom; - cmd_eeprom->byte_count = - wlan_le16_to_cpu(cmd_eeprom->byte_count); - PRINTM(MINFO, "EEPROM read len=%x\n", cmd_eeprom->byte_count); - if (eeprom->byte_count < cmd_eeprom->byte_count) { - eeprom->byte_count = 0; - PRINTM(MINFO, "EEPROM read return length is too big\n"); - pioctl_buf->status_code = MLAN_ERROR_CMD_RESP_FAIL; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - eeprom->offset = wlan_le16_to_cpu(cmd_eeprom->offset); - eeprom->byte_count = cmd_eeprom->byte_count; - if (eeprom->byte_count > 0) { - memcpy(pmadapter, &eeprom->value, &cmd_eeprom->value, - MIN(MAX_EEPROM_DATA, eeprom->byte_count)); - HEXDUMP("EEPROM", (char *) &eeprom->value, - MIN(MAX_EEPROM_DATA, eeprom->byte_count)); - } - break; - } - default: - pioctl_buf->status_code = MLAN_ERROR_CMD_RESP_FAIL; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; -} - -/** + t_u16 type, + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) +{ + mlan_ds_reg_mem *reg_mem = MNULL; + mlan_ds_reg_rw *reg_rw = MNULL; + + ENTER(); + + if (pioctl_buf) { + reg_mem = (mlan_ds_reg_mem *) pioctl_buf->pbuf; + reg_rw = ®_mem->param.reg_rw; + switch (type) { + case HostCmd_CMD_MAC_REG_ACCESS: + { + HostCmd_DS_MAC_REG_ACCESS *reg; + reg = (HostCmd_DS_MAC_REG_ACCESS *) & resp-> + params.mac_reg; + reg_rw->offset = + (t_u32) wlan_le16_to_cpu(reg->offset); + reg_rw->value = wlan_le32_to_cpu(reg->value); + break; + } + case HostCmd_CMD_BBP_REG_ACCESS: + { + HostCmd_DS_BBP_REG_ACCESS *reg; + reg = (HostCmd_DS_BBP_REG_ACCESS *) & resp-> + params.bbp_reg; + reg_rw->offset = + (t_u32) wlan_le16_to_cpu(reg->offset); + reg_rw->value = (t_u32) reg->value; + break; + } + + case HostCmd_CMD_RF_REG_ACCESS: + { + HostCmd_DS_RF_REG_ACCESS *reg; + reg = (HostCmd_DS_RF_REG_ACCESS *) & resp-> + params.rf_reg; + reg_rw->offset = + (t_u32) wlan_le16_to_cpu(reg->offset); + reg_rw->value = (t_u32) reg->value; + break; + } + case HostCmd_CMD_CAU_REG_ACCESS: + { + HostCmd_DS_RF_REG_ACCESS *reg; + reg = (HostCmd_DS_RF_REG_ACCESS *) & resp-> + params.rf_reg; + reg_rw->offset = + (t_u32) wlan_le16_to_cpu(reg->offset); + reg_rw->value = (t_u32) reg->value; + break; + } + case HostCmd_CMD_802_11_EEPROM_ACCESS: + { + mlan_ds_read_eeprom *eeprom = + ®_mem->param.rd_eeprom; + HostCmd_DS_802_11_EEPROM_ACCESS *cmd_eeprom = + (HostCmd_DS_802_11_EEPROM_ACCESS *) & + resp->params.eeprom; + cmd_eeprom->byte_count = + wlan_le16_to_cpu(cmd_eeprom-> + byte_count); + PRINTM(MINFO, "EEPROM read len=%x\n", + cmd_eeprom->byte_count); + if (eeprom->byte_count < cmd_eeprom->byte_count) { + eeprom->byte_count = 0; + PRINTM(MINFO, + "EEPROM read return length is too big\n"); + pioctl_buf->status_code = + MLAN_ERROR_CMD_RESP_FAIL; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + eeprom->offset = + wlan_le16_to_cpu(cmd_eeprom->offset); + eeprom->byte_count = cmd_eeprom->byte_count; + if (eeprom->byte_count > 0) { + memcpy(pmadapter, &eeprom->value, + &cmd_eeprom->value, + MIN(MAX_EEPROM_DATA, + eeprom->byte_count)); + HEXDUMP("EEPROM", + (char *)&eeprom->value, + MIN(MAX_EEPROM_DATA, + eeprom->byte_count)); + } + break; + } + default: + pioctl_buf->status_code = MLAN_ERROR_CMD_RESP_FAIL; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; +} + +/** * @brief This function prepares command of mem_access. - * + * * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action the action: GET or SET * @param pdata_buf A pointer to data buffer @@ -3753,28 +4030,28 @@ wlan_ret_reg_access(mlan_adapter * pmadapter, */ mlan_status wlan_cmd_mem_access(IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN t_u16 cmd_action, IN t_void * pdata_buf) { - mlan_ds_mem_rw *mem_rw = (mlan_ds_mem_rw *) pdata_buf; - HostCmd_DS_MEM_ACCESS *mem_access = - (HostCmd_DS_MEM_ACCESS *) & cmd->params.mem; + mlan_ds_mem_rw *mem_rw = (mlan_ds_mem_rw *) pdata_buf; + HostCmd_DS_MEM_ACCESS *mem_access = + (HostCmd_DS_MEM_ACCESS *) & cmd->params.mem; - ENTER(); + ENTER(); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_MEM_ACCESS); - cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_MEM_ACCESS) + S_DS_GEN); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_MEM_ACCESS); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_MEM_ACCESS) + S_DS_GEN); - mem_access->action = wlan_cpu_to_le16(cmd_action); - mem_access->addr = wlan_cpu_to_le32(mem_rw->addr); - mem_access->value = wlan_cpu_to_le32(mem_rw->value); + mem_access->action = wlan_cpu_to_le16(cmd_action); + mem_access->addr = wlan_cpu_to_le32(mem_rw->addr); + mem_access->value = wlan_cpu_to_le32(mem_rw->value); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of mem_access - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to command buffer @@ -3783,23 +4060,24 @@ wlan_cmd_mem_access(IN HostCmd_DS_COMMAND * cmd, */ mlan_status wlan_ret_mem_access(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - mlan_ds_reg_mem *reg_mem = MNULL; - mlan_ds_mem_rw *mem_rw = MNULL; - HostCmd_DS_MEM_ACCESS *mem = (HostCmd_DS_MEM_ACCESS *) & resp->params.mem; + mlan_ds_reg_mem *reg_mem = MNULL; + mlan_ds_mem_rw *mem_rw = MNULL; + HostCmd_DS_MEM_ACCESS *mem = + (HostCmd_DS_MEM_ACCESS *) & resp->params.mem; - ENTER(); + ENTER(); - if (pioctl_buf) { - reg_mem = (mlan_ds_reg_mem *) pioctl_buf->pbuf; - mem_rw = ®_mem->param.mem_rw; + if (pioctl_buf) { + reg_mem = (mlan_ds_reg_mem *) pioctl_buf->pbuf; + mem_rw = ®_mem->param.mem_rw; - mem_rw->addr = wlan_le32_to_cpu(mem->addr); - mem_rw->value = wlan_le32_to_cpu(mem->value); - } + mem_rw->addr = wlan_le32_to_cpu(mem->addr); + mem_rw->value = wlan_le32_to_cpu(mem->value); + } - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_decl.h b/drivers/net/wireless/sd8897/mlan/mlan_decl.h index 6656e0282ad5..58ddc5e97513 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_decl.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_decl.h @@ -2,7 +2,7 @@ * * @brief This file declares the generic data structures and APIs. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -27,7 +27,7 @@ Change log: #define _MLAN_DECL_H_ /** MLAN release version */ -#define MLAN_RELEASE_VERSION "396" +#define MLAN_RELEASE_VERSION "404" /** Re-define generic data types for MLAN/MOAL */ /** Signed char (1-byte) */ @@ -300,68 +300,68 @@ typedef t_u8 mlan_802_11_mac_addr[MLAN_MAC_ADDR_LENGTH]; /** mlan_status */ typedef enum _mlan_status { - MLAN_STATUS_FAILURE = 0xffffffff, - MLAN_STATUS_SUCCESS = 0, - MLAN_STATUS_PENDING, - MLAN_STATUS_RESOURCE, + MLAN_STATUS_FAILURE = 0xffffffff, + MLAN_STATUS_SUCCESS = 0, + MLAN_STATUS_PENDING, + MLAN_STATUS_RESOURCE, } mlan_status; /** mlan_error_code */ typedef enum _mlan_error_code { /** No error */ - MLAN_ERROR_NO_ERROR = 0, + MLAN_ERROR_NO_ERROR = 0, /** Firmware/device errors below (MSB=0) */ - MLAN_ERROR_FW_NOT_READY = 0x00000001, - MLAN_ERROR_FW_BUSY = 0x00000002, - MLAN_ERROR_FW_CMDRESP = 0x00000003, - MLAN_ERROR_DATA_TX_FAIL = 0x00000004, - MLAN_ERROR_DATA_RX_FAIL = 0x00000005, + MLAN_ERROR_FW_NOT_READY = 0x00000001, + MLAN_ERROR_FW_BUSY = 0x00000002, + MLAN_ERROR_FW_CMDRESP = 0x00000003, + MLAN_ERROR_DATA_TX_FAIL = 0x00000004, + MLAN_ERROR_DATA_RX_FAIL = 0x00000005, /** Driver errors below (MSB=1) */ - MLAN_ERROR_PKT_SIZE_INVALID = 0x80000001, - MLAN_ERROR_PKT_TIMEOUT = 0x80000002, - MLAN_ERROR_PKT_INVALID = 0x80000003, - MLAN_ERROR_CMD_INVALID = 0x80000004, - MLAN_ERROR_CMD_TIMEOUT = 0x80000005, - MLAN_ERROR_CMD_DNLD_FAIL = 0x80000006, - MLAN_ERROR_CMD_CANCEL = 0x80000007, - MLAN_ERROR_CMD_RESP_FAIL = 0x80000008, - MLAN_ERROR_CMD_ASSOC_FAIL = 0x80000009, - MLAN_ERROR_CMD_SCAN_FAIL = 0x8000000A, - MLAN_ERROR_IOCTL_INVALID = 0x8000000B, - MLAN_ERROR_IOCTL_FAIL = 0x8000000C, - MLAN_ERROR_EVENT_UNKNOWN = 0x8000000D, - MLAN_ERROR_INVALID_PARAMETER = 0x8000000E, - MLAN_ERROR_NO_MEM = 0x8000000F, + MLAN_ERROR_PKT_SIZE_INVALID = 0x80000001, + MLAN_ERROR_PKT_TIMEOUT = 0x80000002, + MLAN_ERROR_PKT_INVALID = 0x80000003, + MLAN_ERROR_CMD_INVALID = 0x80000004, + MLAN_ERROR_CMD_TIMEOUT = 0x80000005, + MLAN_ERROR_CMD_DNLD_FAIL = 0x80000006, + MLAN_ERROR_CMD_CANCEL = 0x80000007, + MLAN_ERROR_CMD_RESP_FAIL = 0x80000008, + MLAN_ERROR_CMD_ASSOC_FAIL = 0x80000009, + MLAN_ERROR_CMD_SCAN_FAIL = 0x8000000A, + MLAN_ERROR_IOCTL_INVALID = 0x8000000B, + MLAN_ERROR_IOCTL_FAIL = 0x8000000C, + MLAN_ERROR_EVENT_UNKNOWN = 0x8000000D, + MLAN_ERROR_INVALID_PARAMETER = 0x8000000E, + MLAN_ERROR_NO_MEM = 0x8000000F, /** More to add */ } mlan_error_code; /** mlan_buf_type */ typedef enum _mlan_buf_type { - MLAN_BUF_TYPE_CMD = 1, - MLAN_BUF_TYPE_DATA, - MLAN_BUF_TYPE_EVENT, - MLAN_BUF_TYPE_RAW_DATA, + MLAN_BUF_TYPE_CMD = 1, + MLAN_BUF_TYPE_DATA, + MLAN_BUF_TYPE_EVENT, + MLAN_BUF_TYPE_RAW_DATA, } mlan_buf_type; /** MLAN BSS type */ typedef enum _mlan_bss_type { - MLAN_BSS_TYPE_STA = 0, - MLAN_BSS_TYPE_UAP = 1, + MLAN_BSS_TYPE_STA = 0, + MLAN_BSS_TYPE_UAP = 1, #ifdef WIFI_DIRECT_SUPPORT - MLAN_BSS_TYPE_WIFIDIRECT = 2, + MLAN_BSS_TYPE_WIFIDIRECT = 2, #endif - MLAN_BSS_TYPE_ANY = 0xff, + MLAN_BSS_TYPE_ANY = 0xff, } mlan_bss_type; /** MLAN BSS role */ typedef enum _mlan_bss_role { - MLAN_BSS_ROLE_STA = 0, - MLAN_BSS_ROLE_UAP = 1, - MLAN_BSS_ROLE_ANY = 0xff, + MLAN_BSS_ROLE_STA = 0, + MLAN_BSS_ROLE_UAP = 1, + MLAN_BSS_ROLE_ANY = 0xff, } mlan_bss_role; /** BSS role bit mask */ @@ -373,69 +373,69 @@ typedef enum _mlan_bss_role /** mlan_data_frame_type */ typedef enum _mlan_data_frame_type { - MLAN_DATA_FRAME_TYPE_ETH_II = 0, - MLAN_DATA_FRAME_TYPE_802_11, + MLAN_DATA_FRAME_TYPE_ETH_II = 0, + MLAN_DATA_FRAME_TYPE_802_11, } mlan_data_frame_type; /** mlan_event_id */ typedef enum _mlan_event_id { - /* Event generated by firmware (MSB=0) */ - MLAN_EVENT_ID_FW_UNKNOWN = 0x00000001, - MLAN_EVENT_ID_FW_ADHOC_LINK_SENSED = 0x00000002, - MLAN_EVENT_ID_FW_ADHOC_LINK_LOST = 0x00000003, - MLAN_EVENT_ID_FW_DISCONNECTED = 0x00000004, - MLAN_EVENT_ID_FW_MIC_ERR_UNI = 0x00000005, - MLAN_EVENT_ID_FW_MIC_ERR_MUL = 0x00000006, - MLAN_EVENT_ID_FW_BCN_RSSI_LOW = 0x00000007, - MLAN_EVENT_ID_FW_BCN_RSSI_HIGH = 0x00000008, - MLAN_EVENT_ID_FW_BCN_SNR_LOW = 0x00000009, - MLAN_EVENT_ID_FW_BCN_SNR_HIGH = 0x0000000A, - MLAN_EVENT_ID_FW_MAX_FAIL = 0x0000000B, - MLAN_EVENT_ID_FW_DATA_RSSI_LOW = 0x0000000C, - MLAN_EVENT_ID_FW_DATA_RSSI_HIGH = 0x0000000D, - MLAN_EVENT_ID_FW_DATA_SNR_LOW = 0x0000000E, - MLAN_EVENT_ID_FW_DATA_SNR_HIGH = 0x0000000F, - MLAN_EVENT_ID_FW_LINK_QUALITY = 0x00000010, - MLAN_EVENT_ID_FW_PORT_RELEASE = 0x00000011, - MLAN_EVENT_ID_FW_PRE_BCN_LOST = 0x00000012, - MLAN_EVENT_ID_FW_DEBUG_INFO = 0x00000013, - MLAN_EVENT_ID_FW_WMM_CONFIG_CHANGE = 0x0000001A, - MLAN_EVENT_ID_FW_HS_WAKEUP = 0x0000001B, - MLAN_EVENT_ID_FW_BG_SCAN = 0x0000001D, - MLAN_EVENT_ID_FW_BG_SCAN_STOPPED = 0x0000001E, - MLAN_EVENT_ID_FW_WEP_ICV_ERR = 0x00000020, - MLAN_EVENT_ID_FW_STOP_TX = 0x00000021, - MLAN_EVENT_ID_FW_START_TX = 0x00000022, - MLAN_EVENT_ID_FW_CHANNEL_SWITCH_ANN = 0x00000023, - MLAN_EVENT_ID_FW_RADAR_DETECTED = 0x00000024, - MLAN_EVENT_ID_FW_CHANNEL_REPORT_RDY = 0x00000025, - MLAN_EVENT_ID_FW_BW_CHANGED = 0x00000026, + /* Event generated by firmware (MSB=0) */ + MLAN_EVENT_ID_FW_UNKNOWN = 0x00000001, + MLAN_EVENT_ID_FW_ADHOC_LINK_SENSED = 0x00000002, + MLAN_EVENT_ID_FW_ADHOC_LINK_LOST = 0x00000003, + MLAN_EVENT_ID_FW_DISCONNECTED = 0x00000004, + MLAN_EVENT_ID_FW_MIC_ERR_UNI = 0x00000005, + MLAN_EVENT_ID_FW_MIC_ERR_MUL = 0x00000006, + MLAN_EVENT_ID_FW_BCN_RSSI_LOW = 0x00000007, + MLAN_EVENT_ID_FW_BCN_RSSI_HIGH = 0x00000008, + MLAN_EVENT_ID_FW_BCN_SNR_LOW = 0x00000009, + MLAN_EVENT_ID_FW_BCN_SNR_HIGH = 0x0000000A, + MLAN_EVENT_ID_FW_MAX_FAIL = 0x0000000B, + MLAN_EVENT_ID_FW_DATA_RSSI_LOW = 0x0000000C, + MLAN_EVENT_ID_FW_DATA_RSSI_HIGH = 0x0000000D, + MLAN_EVENT_ID_FW_DATA_SNR_LOW = 0x0000000E, + MLAN_EVENT_ID_FW_DATA_SNR_HIGH = 0x0000000F, + MLAN_EVENT_ID_FW_LINK_QUALITY = 0x00000010, + MLAN_EVENT_ID_FW_PORT_RELEASE = 0x00000011, + MLAN_EVENT_ID_FW_PRE_BCN_LOST = 0x00000012, + MLAN_EVENT_ID_FW_DEBUG_INFO = 0x00000013, + MLAN_EVENT_ID_FW_WMM_CONFIG_CHANGE = 0x0000001A, + MLAN_EVENT_ID_FW_HS_WAKEUP = 0x0000001B, + MLAN_EVENT_ID_FW_BG_SCAN = 0x0000001D, + MLAN_EVENT_ID_FW_BG_SCAN_STOPPED = 0x0000001E, + MLAN_EVENT_ID_FW_WEP_ICV_ERR = 0x00000020, + MLAN_EVENT_ID_FW_STOP_TX = 0x00000021, + MLAN_EVENT_ID_FW_START_TX = 0x00000022, + MLAN_EVENT_ID_FW_CHANNEL_SWITCH_ANN = 0x00000023, + MLAN_EVENT_ID_FW_RADAR_DETECTED = 0x00000024, + MLAN_EVENT_ID_FW_CHANNEL_REPORT_RDY = 0x00000025, + MLAN_EVENT_ID_FW_BW_CHANGED = 0x00000026, #ifdef WIFI_DIRECT_SUPPORT - MLAN_EVENT_ID_FW_REMAIN_ON_CHAN_EXPIRED = 0x0000002B, + MLAN_EVENT_ID_FW_REMAIN_ON_CHAN_EXPIRED = 0x0000002B, #endif #ifdef UAP_SUPPORT - MLAN_EVENT_ID_UAP_FW_BSS_START = 0x0000002C, - MLAN_EVENT_ID_UAP_FW_BSS_ACTIVE = 0x0000002D, - MLAN_EVENT_ID_UAP_FW_BSS_IDLE = 0x0000002E, - MLAN_EVENT_ID_UAP_FW_STA_CONNECT = 0x00000030, - MLAN_EVENT_ID_UAP_FW_STA_DISCONNECT = 0x00000031, + MLAN_EVENT_ID_UAP_FW_BSS_START = 0x0000002C, + MLAN_EVENT_ID_UAP_FW_BSS_ACTIVE = 0x0000002D, + MLAN_EVENT_ID_UAP_FW_BSS_IDLE = 0x0000002E, + MLAN_EVENT_ID_UAP_FW_STA_CONNECT = 0x00000030, + MLAN_EVENT_ID_UAP_FW_STA_DISCONNECT = 0x00000031, #endif - /* Event generated by MLAN driver (MSB=1) */ - MLAN_EVENT_ID_DRV_CONNECTED = 0x80000001, - MLAN_EVENT_ID_DRV_DEFER_HANDLING = 0x80000002, - MLAN_EVENT_ID_DRV_HS_ACTIVATED = 0x80000003, - MLAN_EVENT_ID_DRV_HS_DEACTIVATED = 0x80000004, - MLAN_EVENT_ID_DRV_MGMT_FRAME = 0x80000005, - MLAN_EVENT_ID_DRV_OBSS_SCAN_PARAM = 0x80000006, - MLAN_EVENT_ID_DRV_PASSTHRU = 0x80000007, - MLAN_EVENT_ID_DRV_SCAN_REPORT = 0x80000009, - MLAN_EVENT_ID_DRV_MEAS_REPORT = 0x8000000A, - MLAN_EVENT_ID_DRV_ASSOC_FAILURE_REPORT = 0x8000000B, - MLAN_EVENT_ID_DRV_REPORT_STRING = 0x8000000F, - MLAN_EVENT_ID_DRV_DBG_DUMP = 0x80000012, - MLAN_EVENT_ID_DRV_BGSCAN_RESULT = 0x80000013, + /* Event generated by MLAN driver (MSB=1) */ + MLAN_EVENT_ID_DRV_CONNECTED = 0x80000001, + MLAN_EVENT_ID_DRV_DEFER_HANDLING = 0x80000002, + MLAN_EVENT_ID_DRV_HS_ACTIVATED = 0x80000003, + MLAN_EVENT_ID_DRV_HS_DEACTIVATED = 0x80000004, + MLAN_EVENT_ID_DRV_MGMT_FRAME = 0x80000005, + MLAN_EVENT_ID_DRV_OBSS_SCAN_PARAM = 0x80000006, + MLAN_EVENT_ID_DRV_PASSTHRU = 0x80000007, + MLAN_EVENT_ID_DRV_SCAN_REPORT = 0x80000009, + MLAN_EVENT_ID_DRV_MEAS_REPORT = 0x8000000A, + MLAN_EVENT_ID_DRV_ASSOC_FAILURE_REPORT = 0x8000000B, + MLAN_EVENT_ID_DRV_REPORT_STRING = 0x8000000F, + MLAN_EVENT_ID_DRV_DBG_DUMP = 0x80000012, + MLAN_EVENT_ID_DRV_BGSCAN_RESULT = 0x80000013, } mlan_event_id; /** Data Structures */ @@ -443,22 +443,22 @@ typedef enum _mlan_event_id typedef struct _mlan_fw_image { /** Helper image buffer pointer */ - t_u8 *phelper_buf; + t_u8 *phelper_buf; /** Helper image length */ - t_u32 helper_len; + t_u32 helper_len; /** Firmware image buffer pointer */ - t_u8 *pfw_buf; + t_u8 *pfw_buf; /** Firmware image length */ - t_u32 fw_len; + t_u32 fw_len; } mlan_fw_image, *pmlan_fw_image; /** Custom data structure */ typedef struct _mlan_init_param { /** Cal data buffer pointer */ - t_u8 *pcal_data_buf; + t_u8 *pcal_data_buf; /** Cal data length */ - t_u32 cal_data_len; + t_u32 cal_data_len; /** Other custom data */ } mlan_init_param, *pmlan_init_param; @@ -466,115 +466,115 @@ typedef struct _mlan_init_param typedef struct _mlan_event { /** BSS index number for multiple BSS support */ - t_u32 bss_index; + t_u32 bss_index; /** Event ID */ - mlan_event_id event_id; + mlan_event_id event_id; /** Event length */ - t_u32 event_len; + t_u32 event_len; /** Event buffer */ - t_u8 event_buf[1]; + t_u8 event_buf[1]; } mlan_event, *pmlan_event; /** mlan_event_scan_result data structure */ typedef MLAN_PACK_START struct _mlan_event_scan_result { /** Event ID */ - t_u16 event_id; + t_u16 event_id; /** BSS index number for multiple BSS support */ - t_u8 bss_index; + t_u8 bss_index; /** BSS type */ - t_u8 bss_type; + t_u8 bss_type; /** More event available or not */ - t_u8 more_event; + t_u8 more_event; /** Reserved */ - t_u8 reserved[3]; + t_u8 reserved[3]; /** Size of the response buffer */ - t_u16 buf_size; + t_u16 buf_size; /** Number of BSS in scan response */ - t_u8 num_of_set; + t_u8 num_of_set; } MLAN_PACK_END mlan_event_scan_result, *pmlan_event_scan_result; /** mlan_ioctl_req data structure */ typedef struct _mlan_ioctl_req { /** Status code from firmware/driver */ - t_u32 status_code; + t_u32 status_code; /** BSS index number for multiple BSS support */ - t_u32 bss_index; + t_u32 bss_index; /** Request id */ - t_u32 req_id; + t_u32 req_id; /** Action: set or get */ - t_u32 action; + t_u32 action; /** Pointer to buffer */ - t_u8 *pbuf; + t_u8 *pbuf; /** Length of buffer */ - t_u32 buf_len; + t_u32 buf_len; /** Length of the data read/written in buffer */ - t_u32 data_read_written; + t_u32 data_read_written; /** Length of buffer needed */ - t_u32 buf_len_needed; + t_u32 buf_len_needed; /** Reserved for MOAL module */ - t_ptr reserved_1; + t_ptr reserved_1; } mlan_ioctl_req, *pmlan_ioctl_req; /** mlan_buffer data structure */ typedef struct _mlan_buffer { /** Pointer to previous mlan_buffer */ - struct _mlan_buffer *pprev; + struct _mlan_buffer *pprev; /** Pointer to next mlan_buffer */ - struct _mlan_buffer *pnext; + struct _mlan_buffer *pnext; /** Status code from firmware/driver */ - t_u32 status_code; + t_u32 status_code; /** Flags for this buffer */ - t_u32 flags; + t_u32 flags; /** BSS index number for multiple BSS support */ - t_u32 bss_index; + t_u32 bss_index; /** Buffer descriptor, e.g. skb in Linux */ - t_void *pdesc; + t_void *pdesc; /** Pointer to buffer */ - t_u8 *pbuf; + t_u8 *pbuf; /** Offset to data */ - t_u32 data_offset; + t_u32 data_offset; /** Data length */ - t_u32 data_len; + t_u32 data_len; /** Buffer type: data, cmd, event etc. */ - mlan_buf_type buf_type; + mlan_buf_type buf_type; /** Fields below are valid for data packet only */ /** QoS priority */ - t_u32 priority; + t_u32 priority; /** Time stamp when packet is received (seconds) */ - t_u32 in_ts_sec; + t_u32 in_ts_sec; /** Time stamp when packet is received (micro seconds) */ - t_u32 in_ts_usec; + t_u32 in_ts_usec; /** Time stamp when packet is processed (seconds) */ - t_u32 out_ts_sec; + t_u32 out_ts_sec; /** Time stamp when packet is processed (micro seconds) */ - t_u32 out_ts_usec; + t_u32 out_ts_usec; /** Fields below are valid for MLAN module only */ /** Pointer to parent mlan_buffer */ - struct _mlan_buffer *pparent; + struct _mlan_buffer *pparent; /** Use count for this buffer */ - t_u32 use_count; + t_u32 use_count; } mlan_buffer, *pmlan_buffer; /** mlan_bss_attr data structure */ typedef struct _mlan_bss_attr { /** BSS type */ - t_u32 bss_type; + t_u32 bss_type; /** Data frame type: Ethernet II, 802.11, etc. */ - t_u32 frame_type; + t_u32 frame_type; /** The BSS is active (non-0) or not (0). */ - t_u32 active; + t_u32 active; /** BSS Priority */ - t_u32 bss_priority; + t_u32 bss_priority; /** BSS number */ - t_u32 bss_num; + t_u32 bss_num; /** The BSS is virtual */ - t_u32 bss_virtual; + t_u32 bss_virtual; } mlan_bss_attr, *pmlan_bss_attr; #ifdef PRAGMA_PACK @@ -584,39 +584,39 @@ typedef struct _mlan_bss_attr /** Type enumeration for the command result */ typedef MLAN_PACK_START enum _mlan_cmd_result_e { - MLAN_CMD_RESULT_SUCCESS = 0, - MLAN_CMD_RESULT_FAILURE = 1, - MLAN_CMD_RESULT_TIMEOUT = 2, - MLAN_CMD_RESULT_INVALID_DATA = 3 + MLAN_CMD_RESULT_SUCCESS = 0, + MLAN_CMD_RESULT_FAILURE = 1, + MLAN_CMD_RESULT_TIMEOUT = 2, + MLAN_CMD_RESULT_INVALID_DATA = 3 } MLAN_PACK_END mlan_cmd_result_e; /** Type enumeration of WMM AC_QUEUES */ typedef MLAN_PACK_START enum _mlan_wmm_ac_e { - WMM_AC_BK, - WMM_AC_BE, - WMM_AC_VI, - WMM_AC_VO + WMM_AC_BK, + WMM_AC_BE, + WMM_AC_VI, + WMM_AC_VO } MLAN_PACK_END mlan_wmm_ac_e; /** Type enumeration for the action field in the Queue Config command */ typedef MLAN_PACK_START enum _mlan_wmm_queue_config_action_e { - MLAN_WMM_QUEUE_CONFIG_ACTION_GET = 0, - MLAN_WMM_QUEUE_CONFIG_ACTION_SET = 1, - MLAN_WMM_QUEUE_CONFIG_ACTION_DEFAULT = 2, - MLAN_WMM_QUEUE_CONFIG_ACTION_MAX + MLAN_WMM_QUEUE_CONFIG_ACTION_GET = 0, + MLAN_WMM_QUEUE_CONFIG_ACTION_SET = 1, + MLAN_WMM_QUEUE_CONFIG_ACTION_DEFAULT = 2, + MLAN_WMM_QUEUE_CONFIG_ACTION_MAX } MLAN_PACK_END mlan_wmm_queue_config_action_e; /** Type enumeration for the action field in the queue stats command */ typedef MLAN_PACK_START enum _mlan_wmm_queue_stats_action_e { - MLAN_WMM_STATS_ACTION_START = 0, - MLAN_WMM_STATS_ACTION_STOP = 1, - MLAN_WMM_STATS_ACTION_GET_CLR = 2, - MLAN_WMM_STATS_ACTION_SET_CFG = 3, /* Not currently used */ - MLAN_WMM_STATS_ACTION_GET_CFG = 4, /* Not currently used */ - MLAN_WMM_STATS_ACTION_MAX + MLAN_WMM_STATS_ACTION_START = 0, + MLAN_WMM_STATS_ACTION_STOP = 1, + MLAN_WMM_STATS_ACTION_GET_CLR = 2, + MLAN_WMM_STATS_ACTION_SET_CFG = 3, /* Not currently used */ + MLAN_WMM_STATS_ACTION_GET_CFG = 4, /* Not currently used */ + MLAN_WMM_STATS_ACTION_MAX } MLAN_PACK_END mlan_wmm_queue_stats_action_e; /** @@ -626,22 +626,22 @@ typedef MLAN_PACK_START enum _mlan_wmm_queue_stats_action_e typedef MLAN_PACK_START struct { /** TSID: Range: 0->7 */ - t_u8 tid; + t_u8 tid; /** TSID specified is valid */ - t_u8 valid; + t_u8 valid; /** AC TSID is active on */ - t_u8 access_category; + t_u8 access_category; /** UP specified for the TSID */ - t_u8 user_priority; + t_u8 user_priority; /** Power save mode for TSID: 0 (legacy), 1 (UAPSD) */ - t_u8 psb; + t_u8 psb; /** Upstream(0), Downlink(1), Bidirectional(3) */ - t_u8 flow_dir; + t_u8 flow_dir; /** Medium time granted for the TSID */ - t_u16 medium_time; + t_u16 medium_time; } MLAN_PACK_END wlan_ioctl_wmm_ts_status_t, /** Type definition of mlan_ds_wmm_ts_status for MLAN_OID_WMM_CFG_TS_STATUS */ - mlan_ds_wmm_ts_status, *pmlan_ds_wmm_ts_status; + mlan_ds_wmm_ts_status, *pmlan_ds_wmm_ts_status; /** Max Ie length */ #define MAX_IE_SIZE 256 @@ -650,13 +650,13 @@ typedef MLAN_PACK_START struct typedef MLAN_PACK_START struct _custom_ie { /** IE Index */ - t_u16 ie_index; + t_u16 ie_index; /** Mgmt Subtype Mask */ - t_u16 mgmt_subtype_mask; + t_u16 mgmt_subtype_mask; /** IE Length */ - t_u16 ie_length; + t_u16 ie_length; /** IE buffer */ - t_u8 ie_buffer[MAX_IE_SIZE]; + t_u8 ie_buffer[MAX_IE_SIZE]; } MLAN_PACK_END custom_ie; /** Max IE index to FW */ @@ -668,35 +668,35 @@ typedef MLAN_PACK_START struct _custom_ie typedef MLAN_PACK_START struct _custom_ie_info { /** size of buffer */ - t_u16 buf_size; + t_u16 buf_size; /** no of buffers of buf_size */ - t_u16 buf_count; + t_u16 buf_count; } MLAN_PACK_END custom_ie_info; /** TLV buffer : Max Mgmt IE */ typedef MLAN_PACK_START struct _tlvbuf_max_mgmt_ie { /** Type */ - t_u16 type; + t_u16 type; /** Length */ - t_u16 len; + t_u16 len; /** No of tuples */ - t_u16 count; + t_u16 count; /** custom IE info tuples */ - custom_ie_info info[MAX_MGMT_IE_INDEX]; + custom_ie_info info[MAX_MGMT_IE_INDEX]; } MLAN_PACK_END tlvbuf_max_mgmt_ie; /** TLV buffer : custom IE */ typedef MLAN_PACK_START struct _tlvbuf_custom_ie { /** Type */ - t_u16 type; + t_u16 type; /** Length */ - t_u16 len; + t_u16 len; /** IE data */ - custom_ie ie_data_list[MAX_MGMT_IE_INDEX_TO_FW]; + custom_ie ie_data_list[MAX_MGMT_IE_INDEX_TO_FW]; /** Max mgmt IE TLV */ - tlvbuf_max_mgmt_ie max_mgmt_ie; + tlvbuf_max_mgmt_ie max_mgmt_ie; } MLAN_PACK_END mlan_ds_misc_custom_ie; #ifdef PRAGMA_PACK @@ -707,121 +707,124 @@ typedef MLAN_PACK_START struct _tlvbuf_custom_ie typedef struct _mlan_callbacks { /** moal_get_fw_data */ - mlan_status(*moal_get_fw_data) (IN t_void * pmoal_handle, - IN t_u32 offset, - IN t_u32 len, OUT t_u8 * pbuf); + mlan_status(*moal_get_fw_data) (IN t_void * pmoal_handle, + IN t_u32 offset, + IN t_u32 len, OUT t_u8 * pbuf); /** moal_init_fw_complete */ - mlan_status(*moal_init_fw_complete) (IN t_void * pmoal_handle, - IN mlan_status status); + mlan_status(*moal_init_fw_complete) (IN t_void * pmoal_handle, + IN mlan_status status); /** moal_shutdown_fw_complete */ - mlan_status(*moal_shutdown_fw_complete) (IN t_void * pmoal_handle, - IN mlan_status status); + mlan_status(*moal_shutdown_fw_complete) (IN t_void * pmoal_handle, + IN mlan_status status); /** moal_send_packet_complete */ - mlan_status(*moal_send_packet_complete) (IN t_void * pmoal_handle, - IN pmlan_buffer pmbuf, - IN mlan_status status); + mlan_status(*moal_send_packet_complete) (IN t_void * pmoal_handle, + IN pmlan_buffer pmbuf, + IN mlan_status status); /** moal_recv_complete */ - mlan_status(*moal_recv_complete) (IN t_void * pmoal_handle, - IN pmlan_buffer pmbuf, - IN t_u32 port, IN mlan_status status); + mlan_status(*moal_recv_complete) (IN t_void * pmoal_handle, + IN pmlan_buffer pmbuf, + IN t_u32 port, IN mlan_status status); /** moal_recv_packet */ - mlan_status(*moal_recv_packet) (IN t_void * pmoal_handle, - IN pmlan_buffer pmbuf); + mlan_status(*moal_recv_packet) (IN t_void * pmoal_handle, + IN pmlan_buffer pmbuf); /** moal_recv_event */ - mlan_status(*moal_recv_event) (IN t_void * pmoal_handle, - IN pmlan_event pmevent); + mlan_status(*moal_recv_event) (IN t_void * pmoal_handle, + IN pmlan_event pmevent); /** moal_ioctl_complete */ - mlan_status(*moal_ioctl_complete) (IN t_void * pmoal_handle, - IN pmlan_ioctl_req pioctl_req, - IN mlan_status status); + mlan_status(*moal_ioctl_complete) (IN t_void * pmoal_handle, + IN pmlan_ioctl_req pioctl_req, + IN mlan_status status); /** moal_alloc_mlan_buffer */ - mlan_status(*moal_alloc_mlan_buffer) (IN t_void * pmoal_handle, - IN t_u32 size, - OUT pmlan_buffer * pmbuf); + mlan_status(*moal_alloc_mlan_buffer) (IN t_void * pmoal_handle, + IN t_u32 size, + OUT pmlan_buffer * pmbuf); /** moal_free_mlan_buffer */ - mlan_status(*moal_free_mlan_buffer) (IN t_void * pmoal_handle, - IN pmlan_buffer pmbuf); + mlan_status(*moal_free_mlan_buffer) (IN t_void * pmoal_handle, + IN pmlan_buffer pmbuf); /** moal_write_reg */ - mlan_status(*moal_write_reg) (IN t_void * pmoal_handle, - IN t_u32 reg, IN t_u32 data); + mlan_status(*moal_write_reg) (IN t_void * pmoal_handle, + IN t_u32 reg, IN t_u32 data); /** moal_read_reg */ - mlan_status(*moal_read_reg) (IN t_void * pmoal_handle, - IN t_u32 reg, OUT t_u32 * data); + mlan_status(*moal_read_reg) (IN t_void * pmoal_handle, + IN t_u32 reg, OUT t_u32 * data); /** moal_write_data_sync */ - mlan_status(*moal_write_data_sync) (IN t_void * pmoal_handle, - IN pmlan_buffer pmbuf, - IN t_u32 port, IN t_u32 timeout); + mlan_status(*moal_write_data_sync) (IN t_void * pmoal_handle, + IN pmlan_buffer pmbuf, + IN t_u32 port, IN t_u32 timeout); /** moal_read_data_sync */ - mlan_status(*moal_read_data_sync) (IN t_void * pmoal_handle, - IN OUT pmlan_buffer pmbuf, - IN t_u32 port, IN t_u32 timeout); + mlan_status(*moal_read_data_sync) (IN t_void * pmoal_handle, + IN OUT pmlan_buffer pmbuf, + IN t_u32 port, IN t_u32 timeout); /** moal_malloc */ - mlan_status(*moal_malloc) (IN t_void * pmoal_handle, - IN t_u32 size, IN t_u32 flag, OUT t_u8 ** ppbuf); + mlan_status(*moal_malloc) (IN t_void * pmoal_handle, + IN t_u32 size, + IN t_u32 flag, OUT t_u8 ** ppbuf); /** moal_mfree */ - mlan_status(*moal_mfree) (IN t_void * pmoal_handle, IN t_u8 * pbuf); + mlan_status(*moal_mfree) (IN t_void * pmoal_handle, IN t_u8 * pbuf); /** moal_vmalloc */ - mlan_status(*moal_vmalloc) (IN t_void * pmoal_handle, - IN t_u32 size, OUT t_u8 ** ppbuf); + mlan_status(*moal_vmalloc) (IN t_void * pmoal_handle, + IN t_u32 size, OUT t_u8 ** ppbuf); /** moal_vfree */ - mlan_status(*moal_vfree) (IN t_void * pmoal_handle, IN t_u8 * pbuf); + mlan_status(*moal_vfree) (IN t_void * pmoal_handle, IN t_u8 * pbuf); /** moal_memset */ - t_void *(*moal_memset) (IN t_void * pmoal_handle, - IN t_void * pmem, IN t_u8 byte, IN t_u32 num); + t_void *(*moal_memset) (IN t_void * pmoal_handle, + IN t_void * pmem, IN t_u8 byte, IN t_u32 num); /** moal_memcpy */ - t_void *(*moal_memcpy) (IN t_void * pmoal_handle, - IN t_void * pdest, - IN const t_void * psrc, IN t_u32 num); + t_void *(*moal_memcpy) (IN t_void * pmoal_handle, + IN t_void * pdest, + IN const t_void * psrc, IN t_u32 num); /** moal_memmove */ - t_void *(*moal_memmove) (IN t_void * pmoal_handle, - IN t_void * pdest, - IN const t_void * psrc, IN t_u32 num); + t_void *(*moal_memmove) (IN t_void * pmoal_handle, + IN t_void * pdest, + IN const t_void * psrc, IN t_u32 num); /** moal_memcmp */ - t_s32(*moal_memcmp) (IN t_void * pmoal_handle, - IN const t_void * pmem1, - IN const t_void * pmem2, IN t_u32 num); + t_s32(*moal_memcmp) (IN t_void * pmoal_handle, + IN const t_void * pmem1, + IN const t_void * pmem2, IN t_u32 num); /** moal_udelay */ - t_void(*moal_udelay) (IN t_void * pmoal_handle, IN t_u32 udelay); + t_void(*moal_udelay) (IN t_void * pmoal_handle, IN t_u32 udelay); /** moal_get_system_time */ - mlan_status(*moal_get_system_time) (IN t_void * pmoal_handle, - OUT t_u32 * psec, OUT t_u32 * pusec); + mlan_status(*moal_get_system_time) (IN t_void * pmoal_handle, + OUT t_u32 * psec, + OUT t_u32 * pusec); /** moal_init_timer*/ - mlan_status(*moal_init_timer) (IN t_void * pmoal_handle, - OUT t_void ** pptimer, - IN t_void(*callback) (t_void * pcontext), - IN t_void * pcontext); + mlan_status(*moal_init_timer) (IN t_void * pmoal_handle, + OUT t_void ** pptimer, + IN t_void(*callback) (t_void * + pcontext), + IN t_void * pcontext); /** moal_free_timer */ - mlan_status(*moal_free_timer) (IN t_void * pmoal_handle, - IN t_void * ptimer); + mlan_status(*moal_free_timer) (IN t_void * pmoal_handle, + IN t_void * ptimer); /** moal_start_timer*/ - mlan_status(*moal_start_timer) (IN t_void * pmoal_handle, - IN t_void * ptimer, - IN t_u8 periodic, IN t_u32 msec); + mlan_status(*moal_start_timer) (IN t_void * pmoal_handle, + IN t_void * ptimer, + IN t_u8 periodic, IN t_u32 msec); /** moal_stop_timer*/ - mlan_status(*moal_stop_timer) (IN t_void * pmoal_handle, - IN t_void * ptimer); + mlan_status(*moal_stop_timer) (IN t_void * pmoal_handle, + IN t_void * ptimer); /** moal_init_lock */ - mlan_status(*moal_init_lock) (IN t_void * pmoal_handle, - OUT t_void ** pplock); + mlan_status(*moal_init_lock) (IN t_void * pmoal_handle, + OUT t_void ** pplock); /** moal_free_lock */ - mlan_status(*moal_free_lock) (IN t_void * pmoal_handle, - IN t_void * plock); + mlan_status(*moal_free_lock) (IN t_void * pmoal_handle, + IN t_void * plock); /** moal_spin_lock */ - mlan_status(*moal_spin_lock) (IN t_void * pmoal_handle, - IN t_void * plock); + mlan_status(*moal_spin_lock) (IN t_void * pmoal_handle, + IN t_void * plock); /** moal_spin_unlock */ - mlan_status(*moal_spin_unlock) (IN t_void * pmoal_handle, - IN t_void * plock); + mlan_status(*moal_spin_unlock) (IN t_void * pmoal_handle, + IN t_void * plock); /** moal_print */ - t_void(*moal_print) (IN t_void * pmoal_handle, - IN t_u32 level, IN char *pformat, IN ...); + t_void(*moal_print) (IN t_void * pmoal_handle, + IN t_u32 level, IN char *pformat, IN ...); /** moal_print_netintf */ - t_void(*moal_print_netintf) (IN t_void * pmoal_handle, - IN t_u32 bss_index, IN t_u32 level); + t_void(*moal_print_netintf) (IN t_void * pmoal_handle, + IN t_u32 bss_index, IN t_u32 level); /** moal_assert */ - t_void(*moal_assert) (IN t_void * pmoal_handle, IN t_u32 cond); + t_void(*moal_assert) (IN t_void * pmoal_handle, IN t_u32 cond); } mlan_callbacks, *pmlan_callbacks; /** Interrupt Mode SDIO */ @@ -840,40 +843,40 @@ typedef struct _mlan_callbacks typedef struct _mlan_device { /** MOAL Handle */ - t_void *pmoal_handle; + t_void *pmoal_handle; /** BSS Attributes */ - mlan_bss_attr bss_attr[MLAN_MAX_BSS_NUM]; + mlan_bss_attr bss_attr[MLAN_MAX_BSS_NUM]; /** Callbacks */ - mlan_callbacks callbacks; + mlan_callbacks callbacks; #ifdef MFG_CMD_SUPPORT /** MFG mode */ - t_u32 mfg_mode; + t_u32 mfg_mode; #endif /** SDIO interrupt mode (0: INT_MODE_SDIO, 1: INT_MODE_GPIO) */ - t_u32 int_mode; + t_u32 int_mode; /** GPIO interrupt pin number */ - t_u32 gpio_pin; + t_u32 gpio_pin; #ifdef DEBUG_LEVEL1 /** Driver debug bit masks */ - t_u32 drvdbg; + t_u32 drvdbg; #endif #ifdef SDIO_MULTI_PORT_TX_AGGR /** SDIO MPA Tx */ - t_u32 mpa_tx_cfg; + t_u32 mpa_tx_cfg; #endif #ifdef SDIO_MULTI_PORT_RX_AGGR /** SDIO MPA Rx */ - t_u32 mpa_rx_cfg; + t_u32 mpa_rx_cfg; #endif /** Auto deep sleep */ - t_u32 auto_ds; + t_u32 auto_ds; /** IEEE PS mode */ - t_u32 ps_mode; + t_u32 ps_mode; /** Max Tx buffer size */ - t_u32 max_tx_buf; + t_u32 max_tx_buf; #if defined(STA_SUPPORT) /** 802.11d configuration */ - t_u32 cfg_11d; + t_u32 cfg_11d; #endif } mlan_device, *pmlan_device; @@ -882,18 +885,18 @@ typedef struct _mlan_device /** Registration */ MLAN_API mlan_status mlan_register(IN pmlan_device pmdevice, - OUT t_void ** ppmlan_adapter); + OUT t_void ** ppmlan_adapter); /** Un-registration */ MLAN_API mlan_status mlan_unregister(IN t_void * pmlan_adapter); /** Firmware Downloading */ MLAN_API mlan_status mlan_dnld_fw(IN t_void * pmlan_adapter, - IN pmlan_fw_image pmfw); + IN pmlan_fw_image pmfw); /** Custom data pass API */ MLAN_API mlan_status mlan_set_init_param(IN t_void * pmlan_adapter, - IN pmlan_init_param pparam); + IN pmlan_init_param pparam); /** Firmware Initialization */ MLAN_API mlan_status mlan_init_fw(IN t_void * pmlan_adapter); @@ -906,20 +909,20 @@ MLAN_API mlan_status mlan_main_process(IN t_void * pmlan_adapter); /** Packet Transmission */ MLAN_API mlan_status mlan_send_packet(IN t_void * pmlan_adapter, - IN pmlan_buffer pmbuf); + IN pmlan_buffer pmbuf); /** Packet Reception complete callback */ MLAN_API mlan_status mlan_recv_packet_complete(IN t_void * pmlan_adapter, - IN pmlan_buffer pmbuf, - IN mlan_status status); + IN pmlan_buffer pmbuf, + IN mlan_status status); /** interrupt handler */ MLAN_API t_void mlan_interrupt(IN t_void * pmlan_adapter); /** mlan ioctl */ MLAN_API mlan_status mlan_ioctl(IN t_void * pmlan_adapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); /** mlan select wmm queue */ MLAN_API t_u8 mlan_select_wmm_queue(IN t_void * pmlan_adapter, - IN t_u8 bss_num, IN t_u8 tid); + IN t_u8 bss_num, IN t_u8 tid); #endif /* !_MLAN_DECL_H_ */ diff --git a/drivers/net/wireless/sd8897/mlan/mlan_fw.h b/drivers/net/wireless/sd8897/mlan/mlan_fw.h index dca07dd55907..cd3f85b1d630 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_fw.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_fw.h @@ -4,7 +4,7 @@ * structures and declares global function prototypes used * in MLAN module. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -35,11 +35,11 @@ Change log: typedef struct { /** Ethernet header destination address */ - t_u8 dest_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 dest_addr[MLAN_MAC_ADDR_LENGTH]; /** Ethernet header source address */ - t_u8 src_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 src_addr[MLAN_MAC_ADDR_LENGTH]; /** Ethernet header length */ - t_u16 h803_len; + t_u16 h803_len; } Eth803Hdr_t; @@ -47,15 +47,15 @@ typedef struct typedef struct { /** LLC DSAP */ - t_u8 llc_dsap; + t_u8 llc_dsap; /** LLC SSAP */ - t_u8 llc_ssap; + t_u8 llc_ssap; /** LLC CTRL */ - t_u8 llc_ctrl; + t_u8 llc_ctrl; /** SNAP OUI */ - t_u8 snap_oui[3]; + t_u8 snap_oui[3]; /** SNAP type */ - t_u16 snap_type; + t_u16 snap_type; } Rfc1042Hdr_t; @@ -67,9 +67,9 @@ typedef struct typedef MLAN_PACK_START struct { /** Etherner header */ - Eth803Hdr_t eth803_hdr; + Eth803Hdr_t eth803_hdr; /** RFC 1042 header */ - Rfc1042Hdr_t rfc1042_hdr; + Rfc1042Hdr_t rfc1042_hdr; } MLAN_PACK_END RxPacketHdr_t; @@ -114,7 +114,7 @@ typedef MLAN_PACK_START struct #define IS_SUPPORT_MULTI_BANDS(_adapter) \ (_adapter->fw_cap_info & FW_MULTI_BANDS_SUPPORT) /** Get default bands of the firmware */ - /* need to shift bit 12 and bit 13 in fw_cap_info from the firmware to bit 13 + /* need to shift bit 12 and bit 13 in fw_cap_info from the firmware to bit 13 and 14 for 11ac so that bit 11 is for GN, bit 12 for AN, bit 13 for GAC, and bit 14 for AAC, in order to be compatible with the band capability defined in the driver after right shift of 8 bits */ @@ -150,13 +150,13 @@ extern t_u8 AdhocRates_A[A_SUPPORTED_RATES]; typedef enum _KEY_TYPE_ID { /** Key type : WEP */ - KEY_TYPE_ID_WEP = 0, + KEY_TYPE_ID_WEP = 0, /** Key type : TKIP */ - KEY_TYPE_ID_TKIP = 1, + KEY_TYPE_ID_TKIP = 1, /** Key type : AES */ - KEY_TYPE_ID_AES = 2, - KEY_TYPE_ID_WAPI = 3, - KEY_TYPE_ID_AES_CMAC = 4, + KEY_TYPE_ID_AES = 2, + KEY_TYPE_ID_WAPI = 3, + KEY_TYPE_ID_AES_CMAC = 4, } KEY_TYPE_ID; /** Key Info flag for multicast key */ @@ -167,26 +167,26 @@ typedef enum _KEY_TYPE_ID /** KEY_INFO_WEP*/ typedef enum _KEY_INFO_WEP { - KEY_INFO_WEP_MCAST = 0x01, - KEY_INFO_WEP_UNICAST = 0x02, - KEY_INFO_WEP_ENABLED = 0x04 + KEY_INFO_WEP_MCAST = 0x01, + KEY_INFO_WEP_UNICAST = 0x02, + KEY_INFO_WEP_ENABLED = 0x04 } KEY_INFO_WEP; /** KEY_INFO_TKIP */ typedef enum _KEY_INFO_TKIP { - KEY_INFO_TKIP_MCAST = 0x01, - KEY_INFO_TKIP_UNICAST = 0x02, - KEY_INFO_TKIP_ENABLED = 0x04 + KEY_INFO_TKIP_MCAST = 0x01, + KEY_INFO_TKIP_UNICAST = 0x02, + KEY_INFO_TKIP_ENABLED = 0x04 } KEY_INFO_TKIP; /** KEY_INFO_AES*/ typedef enum _KEY_INFO_AES { - KEY_INFO_AES_MCAST = 0x01, - KEY_INFO_AES_UNICAST = 0x02, - KEY_INFO_AES_ENABLED = 0x04, - KEY_INFO_AES_MCAST_IGTK = 0x400, + KEY_INFO_AES_MCAST = 0x01, + KEY_INFO_AES_UNICAST = 0x02, + KEY_INFO_AES_ENABLED = 0x04, + KEY_INFO_AES_MCAST_IGTK = 0x400, } KEY_INFO_AES; /** WPA AES key length */ @@ -203,9 +203,9 @@ typedef enum _KEY_INFO_AES /** KEY_INFO_WAPI*/ typedef enum _KEY_INFO_WAPI { - KEY_INFO_WAPI_MCAST = 0x01, - KEY_INFO_WAPI_UNICAST = 0x02, - KEY_INFO_WAPI_ENABLED = 0x04 + KEY_INFO_WAPI_MCAST = 0x01, + KEY_INFO_WAPI_UNICAST = 0x02, + KEY_INFO_WAPI_ENABLED = 0x04 } KEY_INFO_WAPI; /** Maximum ethernet frame length sans FCS */ @@ -217,11 +217,11 @@ typedef enum _KEY_INFO_WAPI /** The number of times to try when polling for status bits */ #define MAX_POLL_TRIES 100 -/** The number of times to try when waiting for downloaded firmware to +/** The number of times to try when waiting for downloaded firmware to become active when multiple interface is present */ #define MAX_MULTI_INTERFACE_POLL_TRIES 1000 -/** The number of times to try when waiting for downloaded firmware to +/** The number of times to try when waiting for downloaded firmware to become active. (polling the scratch register). */ #define MAX_FIRMWARE_POLL_TRIES 100 @@ -248,17 +248,17 @@ typedef enum _KEY_INFO_WAPI /** WLAN_802_11_PRIVACY_FILTER */ typedef enum _WLAN_802_11_PRIVACY_FILTER { - Wlan802_11PrivFilterAcceptAll, - Wlan802_11PrivFilter8021xWEP + Wlan802_11PrivFilterAcceptAll, + Wlan802_11PrivFilter8021xWEP } WLAN_802_11_PRIVACY_FILTER; /** WLAN_802_11_WEP_STATUS */ typedef enum _WLAN_802_11_WEP_STATUS { - Wlan802_11WEPEnabled, - Wlan802_11WEPDisabled, - Wlan802_11WEPKeyAbsent, - Wlan802_11WEPNotSupported + Wlan802_11WEPEnabled, + Wlan802_11WEPDisabled, + Wlan802_11WEPKeyAbsent, + Wlan802_11WEPNotSupported } WLAN_802_11_WEP_STATUS; /** SNR calculation */ @@ -299,103 +299,103 @@ typedef enum _WLAN_802_11_WEP_STATUS #define TLV_TYPE_VENDOR_SPECIFIC_IE 0xdd /** TLV type : Key material */ -#define TLV_TYPE_KEY_MATERIAL (PROPRIETARY_TLV_BASE_ID + 0x00) // 0x0100 +#define TLV_TYPE_KEY_MATERIAL (PROPRIETARY_TLV_BASE_ID + 0x00) // 0x0100 /** TLV type : Channel list */ -#define TLV_TYPE_CHANLIST (PROPRIETARY_TLV_BASE_ID + 0x01) // 0x0101 +#define TLV_TYPE_CHANLIST (PROPRIETARY_TLV_BASE_ID + 0x01) // 0x0101 /** TLV type : Number of probes */ -#define TLV_TYPE_NUMPROBES (PROPRIETARY_TLV_BASE_ID + 0x02) // 0x0102 +#define TLV_TYPE_NUMPROBES (PROPRIETARY_TLV_BASE_ID + 0x02) // 0x0102 /** TLV type : Beacon RSSI low */ -#define TLV_TYPE_RSSI_LOW (PROPRIETARY_TLV_BASE_ID + 0x04) // 0x0104 +#define TLV_TYPE_RSSI_LOW (PROPRIETARY_TLV_BASE_ID + 0x04) // 0x0104 /** TLV type : Beacon SNR low */ -#define TLV_TYPE_SNR_LOW (PROPRIETARY_TLV_BASE_ID + 0x05) // 0x0105 +#define TLV_TYPE_SNR_LOW (PROPRIETARY_TLV_BASE_ID + 0x05) // 0x0105 /** TLV type : Fail count */ -#define TLV_TYPE_FAILCOUNT (PROPRIETARY_TLV_BASE_ID + 0x06) // 0x0106 +#define TLV_TYPE_FAILCOUNT (PROPRIETARY_TLV_BASE_ID + 0x06) // 0x0106 /** TLV type : BCN miss */ -#define TLV_TYPE_BCNMISS (PROPRIETARY_TLV_BASE_ID + 0x07) // 0x0107 +#define TLV_TYPE_BCNMISS (PROPRIETARY_TLV_BASE_ID + 0x07) // 0x0107 /** TLV type : LED behavior */ -#define TLV_TYPE_LEDBEHAVIOR (PROPRIETARY_TLV_BASE_ID + 0x09) // 0x0109 +#define TLV_TYPE_LEDBEHAVIOR (PROPRIETARY_TLV_BASE_ID + 0x09) // 0x0109 /** TLV type : Passthrough */ -#define TLV_TYPE_PASSTHROUGH (PROPRIETARY_TLV_BASE_ID + 0x0a) // 0x010a +#define TLV_TYPE_PASSTHROUGH (PROPRIETARY_TLV_BASE_ID + 0x0a) // 0x010a /** TLV type : Power TBL 2.4 Ghz */ -#define TLV_TYPE_POWER_TBL_2_4GHZ (PROPRIETARY_TLV_BASE_ID + 0x0c) // 0x010c +#define TLV_TYPE_POWER_TBL_2_4GHZ (PROPRIETARY_TLV_BASE_ID + 0x0c) // 0x010c /** TLV type : Power TBL 5 GHz */ -#define TLV_TYPE_POWER_TBL_5GHZ (PROPRIETARY_TLV_BASE_ID + 0x0d) // 0x010d +#define TLV_TYPE_POWER_TBL_5GHZ (PROPRIETARY_TLV_BASE_ID + 0x0d) // 0x010d /** TLV type : WMM queue status */ -#define TLV_TYPE_WMMQSTATUS (PROPRIETARY_TLV_BASE_ID + 0x10) // 0x0110 +#define TLV_TYPE_WMMQSTATUS (PROPRIETARY_TLV_BASE_ID + 0x10) // 0x0110 /** TLV type : Wildcard SSID */ -#define TLV_TYPE_WILDCARDSSID (PROPRIETARY_TLV_BASE_ID + 0x12) // 0x0112 +#define TLV_TYPE_WILDCARDSSID (PROPRIETARY_TLV_BASE_ID + 0x12) // 0x0112 /** TLV type : TSF timestamp */ -#define TLV_TYPE_TSFTIMESTAMP (PROPRIETARY_TLV_BASE_ID + 0x13) // 0x0113 +#define TLV_TYPE_TSFTIMESTAMP (PROPRIETARY_TLV_BASE_ID + 0x13) // 0x0113 /** TLV type : ARP filter */ -#define TLV_TYPE_ARP_FILTER (PROPRIETARY_TLV_BASE_ID + 0x15) // 0x0115 +#define TLV_TYPE_ARP_FILTER (PROPRIETARY_TLV_BASE_ID + 0x15) // 0x0115 /** TLV type : Beacon RSSI high */ -#define TLV_TYPE_RSSI_HIGH (PROPRIETARY_TLV_BASE_ID + 0x16) // 0x0116 +#define TLV_TYPE_RSSI_HIGH (PROPRIETARY_TLV_BASE_ID + 0x16) // 0x0116 /** TLV type : Beacon SNR high */ -#define TLV_TYPE_SNR_HIGH (PROPRIETARY_TLV_BASE_ID + 0x17) // 0x0117 +#define TLV_TYPE_SNR_HIGH (PROPRIETARY_TLV_BASE_ID + 0x17) // 0x0117 /** TLV type : Start BG scan later */ -#define TLV_TYPE_STARTBGSCANLATER (PROPRIETARY_TLV_BASE_ID + 0x1e) // 0x011e +#define TLV_TYPE_STARTBGSCANLATER (PROPRIETARY_TLV_BASE_ID + 0x1e) // 0x011e /** TLV type: BG scan repeat count */ -#define TLV_TYPE_REPEAT_COUNT (PROPRIETARY_TLV_BASE_ID + 0xb0) // 0x01b0 +#define TLV_TYPE_REPEAT_COUNT (PROPRIETARY_TLV_BASE_ID + 0xb0) // 0x01b0 /** TLV type : Authentication type */ -#define TLV_TYPE_AUTH_TYPE (PROPRIETARY_TLV_BASE_ID + 0x1f) // 0x011f +#define TLV_TYPE_AUTH_TYPE (PROPRIETARY_TLV_BASE_ID + 0x1f) // 0x011f /** TLV type : BSSID */ -#define TLV_TYPE_BSSID (PROPRIETARY_TLV_BASE_ID + 0x23) // 0x0123 +#define TLV_TYPE_BSSID (PROPRIETARY_TLV_BASE_ID + 0x23) // 0x0123 /** TLV type : Link Quality */ -#define TLV_TYPE_LINK_QUALITY (PROPRIETARY_TLV_BASE_ID + 0x24) // 0x0124 +#define TLV_TYPE_LINK_QUALITY (PROPRIETARY_TLV_BASE_ID + 0x24) // 0x0124 /** TLV type : Data RSSI low */ -#define TLV_TYPE_RSSI_LOW_DATA (PROPRIETARY_TLV_BASE_ID + 0x26) // 0x0126 +#define TLV_TYPE_RSSI_LOW_DATA (PROPRIETARY_TLV_BASE_ID + 0x26) // 0x0126 /** TLV type : Data SNR low */ -#define TLV_TYPE_SNR_LOW_DATA (PROPRIETARY_TLV_BASE_ID + 0x27) // 0x0127 +#define TLV_TYPE_SNR_LOW_DATA (PROPRIETARY_TLV_BASE_ID + 0x27) // 0x0127 /** TLV type : Data RSSI high */ -#define TLV_TYPE_RSSI_HIGH_DATA (PROPRIETARY_TLV_BASE_ID + 0x28) // 0x0128 +#define TLV_TYPE_RSSI_HIGH_DATA (PROPRIETARY_TLV_BASE_ID + 0x28) // 0x0128 /** TLV type : Data SNR high */ -#define TLV_TYPE_SNR_HIGH_DATA (PROPRIETARY_TLV_BASE_ID + 0x29) // 0x0129 +#define TLV_TYPE_SNR_HIGH_DATA (PROPRIETARY_TLV_BASE_ID + 0x29) // 0x0129 /** TLV type : Channel band list */ -#define TLV_TYPE_CHANNELBANDLIST (PROPRIETARY_TLV_BASE_ID + 0x2a) // 0x012a +#define TLV_TYPE_CHANNELBANDLIST (PROPRIETARY_TLV_BASE_ID + 0x2a) // 0x012a /** TLV type : Passphrase */ -#define TLV_TYPE_PASSPHRASE (PROPRIETARY_TLV_BASE_ID + 0x3c) // 0x013c +#define TLV_TYPE_PASSPHRASE (PROPRIETARY_TLV_BASE_ID + 0x3c) // 0x013c /** TLV type : Encryption Protocol TLV */ -#define TLV_TYPE_ENCRYPTION_PROTO (PROPRIETARY_TLV_BASE_ID + 0x40) // 0x0140 +#define TLV_TYPE_ENCRYPTION_PROTO (PROPRIETARY_TLV_BASE_ID + 0x40) // 0x0140 /** TLV type : Cipher TLV */ -#define TLV_TYPE_CIPHER (PROPRIETARY_TLV_BASE_ID + 0x42) // 0x0142 +#define TLV_TYPE_CIPHER (PROPRIETARY_TLV_BASE_ID + 0x42) // 0x0142 /** TLV type : PMK */ -#define TLV_TYPE_PMK (PROPRIETARY_TLV_BASE_ID + 0x44) // 0x0144 +#define TLV_TYPE_PMK (PROPRIETARY_TLV_BASE_ID + 0x44) // 0x0144 /** TLV type : BCN miss */ -#define TLV_TYPE_PRE_BCNMISS (PROPRIETARY_TLV_BASE_ID + 0x49) // 0x0149 +#define TLV_TYPE_PRE_BCNMISS (PROPRIETARY_TLV_BASE_ID + 0x49) // 0x0149 /** TLV type: WAPI IE */ -#define TLV_TYPE_WAPI_IE (PROPRIETARY_TLV_BASE_ID + 0x5e) // 0x015e +#define TLV_TYPE_WAPI_IE (PROPRIETARY_TLV_BASE_ID + 0x5e) // 0x015e /** TLV type: MGMT IE */ -#define TLV_TYPE_MGMT_IE (PROPRIETARY_TLV_BASE_ID + 0x69) // 0x0169 +#define TLV_TYPE_MGMT_IE (PROPRIETARY_TLV_BASE_ID + 0x69) // 0x0169 /** TLV type: MAX_MGMT_IE */ -#define TLV_TYPE_MAX_MGMT_IE (PROPRIETARY_TLV_BASE_ID + 0xaa) // 0x01aa +#define TLV_TYPE_MAX_MGMT_IE (PROPRIETARY_TLV_BASE_ID + 0xaa) // 0x01aa /** TLV type: hs wake hold off */ -#define TLV_TYPE_HS_WAKE_HOLDOFF (PROPRIETARY_TLV_BASE_ID + 0xB6) // 0x01b6 +#define TLV_TYPE_HS_WAKE_HOLDOFF (PROPRIETARY_TLV_BASE_ID + 0xB6) // 0x01b6 /** TLV type : HT Capabilities */ -#define TLV_TYPE_HT_CAP (PROPRIETARY_TLV_BASE_ID + 0x4a) // 0x014a +#define TLV_TYPE_HT_CAP (PROPRIETARY_TLV_BASE_ID + 0x4a) // 0x014a /** TLV type : HT Information */ -#define TLV_TYPE_HT_INFO (PROPRIETARY_TLV_BASE_ID + 0x4b) // 0x014b +#define TLV_TYPE_HT_INFO (PROPRIETARY_TLV_BASE_ID + 0x4b) // 0x014b /** TLV type : Secondary Channel Offset */ -#define TLV_SECONDARY_CHANNEL_OFFSET (PROPRIETARY_TLV_BASE_ID + 0x4c) // 0x014c +#define TLV_SECONDARY_CHANNEL_OFFSET (PROPRIETARY_TLV_BASE_ID + 0x4c) // 0x014c /** TLV type : 20/40 BSS Coexistence */ -#define TLV_TYPE_2040BSS_COEXISTENCE (PROPRIETARY_TLV_BASE_ID + 0x4d) // 0x014d +#define TLV_TYPE_2040BSS_COEXISTENCE (PROPRIETARY_TLV_BASE_ID + 0x4d) // 0x014d /** TLV type : Overlapping BSS Scan Parameters */ -#define TLV_TYPE_OVERLAP_BSS_SCAN_PARAM (PROPRIETARY_TLV_BASE_ID + 0x4e) // 0x014e +#define TLV_TYPE_OVERLAP_BSS_SCAN_PARAM (PROPRIETARY_TLV_BASE_ID + 0x4e) // 0x014e /** TLV type : Extended capabilities */ -#define TLV_TYPE_EXTCAP (PROPRIETARY_TLV_BASE_ID + 0x4f) // 0x014f +#define TLV_TYPE_EXTCAP (PROPRIETARY_TLV_BASE_ID + 0x4f) // 0x014f /** TLV type : Set of MCS values that STA desires to use within the BSS */ -#define TLV_TYPE_HT_OPERATIONAL_MCS_SET (PROPRIETARY_TLV_BASE_ID + 0x50) // 0x0150 +#define TLV_TYPE_HT_OPERATIONAL_MCS_SET (PROPRIETARY_TLV_BASE_ID + 0x50) // 0x0150 /** TLV type : RXBA_SYNC */ -#define TLV_TYPE_RXBA_SYNC (PROPRIETARY_TLV_BASE_ID + 0x99) // 0x0199 +#define TLV_TYPE_RXBA_SYNC (PROPRIETARY_TLV_BASE_ID + 0x99) // 0x0199 /** ADDBA TID mask */ #define ADDBA_TID_MASK (MBIT(2) | MBIT(3) | MBIT(4) | MBIT(5)) /** DELBA TID mask */ @@ -761,14 +761,14 @@ typedef enum _WLAN_802_11_WEP_STATUS #define RESET_DEVRXMCSMAP(DevMCSMap) (DevMCSMap &= 0xFFFF0000) /** TLV type : Rate scope */ -#define TLV_TYPE_RATE_DROP_PATTERN (PROPRIETARY_TLV_BASE_ID + 0x51) // 0x0151 +#define TLV_TYPE_RATE_DROP_PATTERN (PROPRIETARY_TLV_BASE_ID + 0x51) // 0x0151 /** TLV type : Rate drop pattern */ -#define TLV_TYPE_RATE_DROP_CONTROL (PROPRIETARY_TLV_BASE_ID + 0x52) // 0x0152 +#define TLV_TYPE_RATE_DROP_CONTROL (PROPRIETARY_TLV_BASE_ID + 0x52) // 0x0152 /** TLV type : Rate scope */ -#define TLV_TYPE_RATE_SCOPE (PROPRIETARY_TLV_BASE_ID + 0x53) // 0x0153 +#define TLV_TYPE_RATE_SCOPE (PROPRIETARY_TLV_BASE_ID + 0x53) // 0x0153 /** TLV type : Power group */ -#define TLV_TYPE_POWER_GROUP (PROPRIETARY_TLV_BASE_ID + 0x54) // 0x0154 +#define TLV_TYPE_POWER_GROUP (PROPRIETARY_TLV_BASE_ID + 0x54) // 0x0154 /** Modulation class for DSSS Rates */ #define MOD_CLASS_HR_DSSS 0x03 @@ -786,15 +786,15 @@ typedef enum _WLAN_802_11_WEP_STATUS #define HT_BW_80 2 /** TLV type : Scan Response */ -#define TLV_TYPE_BSS_SCAN_RSP (PROPRIETARY_TLV_BASE_ID + 0x56) // 0x0156 +#define TLV_TYPE_BSS_SCAN_RSP (PROPRIETARY_TLV_BASE_ID + 0x56) // 0x0156 /** TLV type : Scan Response Stats */ -#define TLV_TYPE_BSS_SCAN_INFO (PROPRIETARY_TLV_BASE_ID + 0x57) // 0x0157 +#define TLV_TYPE_BSS_SCAN_INFO (PROPRIETARY_TLV_BASE_ID + 0x57) // 0x0157 /** TLV type : 11h Basic Rpt */ -#define TLV_TYPE_CHANRPT_11H_BASIC (PROPRIETARY_TLV_BASE_ID + 0x5b) // 0x015b +#define TLV_TYPE_CHANRPT_11H_BASIC (PROPRIETARY_TLV_BASE_ID + 0x5b) // 0x015b /** TLV type : Action frame */ -#define TLV_TYPE_IEEE_ACTION_FRAME (PROPRIETARY_TLV_BASE_ID + 0x8c) // 0x018c +#define TLV_TYPE_IEEE_ACTION_FRAME (PROPRIETARY_TLV_BASE_ID + 0x8c) // 0x018c /** Firmware Host Command ID Constants */ /** Host Command ID : Get hardware specifications */ @@ -1033,10 +1033,10 @@ typedef enum _WLAN_802_11_WEP_STATUS /** Enhanced PS modes */ typedef enum _ENH_PS_MODES { - GET_PS = 0, - SLEEP_CONFIRM = 5, - DIS_AUTO_PS = 0xfe, - EN_AUTO_PS = 0xff, + GET_PS = 0, + SLEEP_CONFIRM = 5, + DIS_AUTO_PS = 0xfe, + EN_AUTO_PS = 0xff, } ENH_PS_MODES; /** Command RET code, MSB is set to 1 */ @@ -1327,37 +1327,37 @@ typedef enum _ENH_PS_MODES typedef MLAN_PACK_START struct _Event_WEP_ICV_ERR { /** Reason code */ - t_u16 reason_code; + t_u16 reason_code; /** Source MAC address */ - t_u8 src_mac_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 src_mac_addr[MLAN_MAC_ADDR_LENGTH]; /** WEP decryption used key */ - t_u8 wep_key_index; + t_u8 wep_key_index; /** WEP key length */ - t_u8 wep_key_length; + t_u8 wep_key_length; /** WEP key */ - t_u8 key[MAX_WEP_KEY_SIZE]; + t_u8 key[MAX_WEP_KEY_SIZE]; } MLAN_PACK_END Event_WEP_ICV_ERR; /** WLAN_802_11_FIXED_IEs */ typedef MLAN_PACK_START struct _WLAN_802_11_FIXED_IEs { /** Timestamp */ - t_u8 time_stamp[8]; + t_u8 time_stamp[8]; /** Beacon interval */ - t_u16 beacon_interval; + t_u16 beacon_interval; /** Capabilities*/ - t_u16 capabilities; + t_u16 capabilities; } MLAN_PACK_END WLAN_802_11_FIXED_IEs; /** WLAN_802_11_VARIABLE_IEs */ typedef MLAN_PACK_START struct _WLAN_802_11_VARIABLE_IEs { /** Element ID */ - t_u8 element_id; + t_u8 element_id; /** Length */ - t_u8 length; + t_u8 length; /** IE data */ - t_u8 data[1]; + t_u8 data[1]; } MLAN_PACK_END WLAN_802_11_VARIABLE_IEs; /** TLV related data structures*/ @@ -1365,18 +1365,18 @@ typedef MLAN_PACK_START struct _WLAN_802_11_VARIABLE_IEs typedef MLAN_PACK_START struct _MrvlIEtypesHeader { /** Header type */ - t_u16 type; + t_u16 type; /** Header length */ - t_u16 len; + t_u16 len; } MLAN_PACK_END MrvlIEtypesHeader_t; /** MrvlIEtypes_Data_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_Data_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Data */ - t_u8 data[1]; + t_u8 data[1]; } MLAN_PACK_END MrvlIEtypes_Data_t; #if defined(STA_SUPPORT) @@ -1409,121 +1409,121 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_Data_t typedef MLAN_PACK_START struct _TxPD { /** BSS type */ - t_u8 bss_type; + t_u8 bss_type; /** BSS number */ - t_u8 bss_num; + t_u8 bss_num; /** Tx packet length */ - t_u16 tx_pkt_length; + t_u16 tx_pkt_length; /** Tx packet offset */ - t_u16 tx_pkt_offset; + t_u16 tx_pkt_offset; /** Tx packet type */ - t_u16 tx_pkt_type; + t_u16 tx_pkt_type; /** Tx Control */ - t_u32 tx_control; + t_u32 tx_control; /** Pkt Priority */ - t_u8 priority; + t_u8 priority; /** Transmit Pkt Flags*/ - t_u8 flags; + t_u8 flags; /** Amount of time the packet has been queued in the driver (units = 2ms)*/ - t_u8 pkt_delay_2ms; + t_u8 pkt_delay_2ms; /** Reserved */ - t_u8 reserved1; + t_u8 reserved1; } MLAN_PACK_END TxPD, *PTxPD; /** RxPD Descriptor */ typedef MLAN_PACK_START struct _RxPD { /** BSS type */ - t_u8 bss_type; + t_u8 bss_type; /** BSS number */ - t_u8 bss_num; + t_u8 bss_num; /** Rx Packet Length */ - t_u16 rx_pkt_length; + t_u16 rx_pkt_length; /** Rx Pkt offset */ - t_u16 rx_pkt_offset; + t_u16 rx_pkt_offset; /** Rx packet type */ - t_u16 rx_pkt_type; + t_u16 rx_pkt_type; /** Sequence number */ - t_u16 seq_num; + t_u16 seq_num; /** Packet Priority */ - t_u8 priority; + t_u8 priority; /** Rx Packet Rate */ - t_u8 rx_rate; + t_u8 rx_rate; /** SNR */ - t_s8 snr; + t_s8 snr; /** Noise Floor */ - t_s8 nf; + t_s8 nf; /** [Bit 1] [Bit 0] RxRate format: legacy rate = 00 HT = 01 VHT = 10 - * [Bit 3] [Bit 2] HT/VHT Bandwidth BW20 = 00 BW40 = 01 BW80 = 10 BW160 = 11 - * [Bit 4] HT/VHT Guard interval LGI = 0 SGI = 1 + * [Bit 3] [Bit 2] HT/VHT Bandwidth BW20 = 00 BW40 = 01 BW80 = 10 BW160 = 11 + * [Bit 4] HT/VHT Guard interval LGI = 0 SGI = 1 * [Bit 5] STBC support Enabled = 1 * [Bit 6] LDPC support Enabled = 1 * [Bit 7] Reserved */ - t_u8 rate_info; + t_u8 rate_info; /** Reserved */ - t_u8 reserved; + t_u8 reserved; } MLAN_PACK_END RxPD, *PRxPD; #ifdef UAP_SUPPORT /** TxPD descriptor */ typedef MLAN_PACK_START struct _UapTxPD { - /** BSS type */ - t_u8 bss_type; - /** BSS number */ - t_u8 bss_num; - /** Tx packet length */ - t_u16 tx_pkt_length; - /** Tx packet offset */ - t_u16 tx_pkt_offset; - /** Tx packet type */ - t_u16 tx_pkt_type; - /** Tx Control */ - t_u32 tx_control; - /** Pkt Priority */ - t_u8 priority; - /** Transmit Pkt Flags*/ - t_u8 flags; - /** Amount of time the packet has been queued in the driver (units = 2ms)*/ - t_u8 pkt_delay_2ms; - /** Reserved */ - t_u8 reserved1; - /** Reserved */ - t_u32 reserved; + /** BSS type */ + t_u8 bss_type; + /** BSS number */ + t_u8 bss_num; + /** Tx packet length */ + t_u16 tx_pkt_length; + /** Tx packet offset */ + t_u16 tx_pkt_offset; + /** Tx packet type */ + t_u16 tx_pkt_type; + /** Tx Control */ + t_u32 tx_control; + /** Pkt Priority */ + t_u8 priority; + /** Transmit Pkt Flags*/ + t_u8 flags; + /** Amount of time the packet has been queued in the driver (units = 2ms)*/ + t_u8 pkt_delay_2ms; + /** Reserved */ + t_u8 reserved1; + /** Reserved */ + t_u32 reserved; } MLAN_PACK_END UapTxPD, *PUapTxPD; /** RxPD Descriptor */ typedef MLAN_PACK_START struct _UapRxPD { /** BSS Type */ - t_u8 bss_type; + t_u8 bss_type; /** BSS number*/ - t_u8 bss_num; + t_u8 bss_num; /** Rx packet length */ - t_u16 rx_pkt_length; + t_u16 rx_pkt_length; /** Rx packet offset */ - t_u16 rx_pkt_offset; + t_u16 rx_pkt_offset; /** Rx packet type */ - t_u16 rx_pkt_type; + t_u16 rx_pkt_type; /** Sequence number */ - t_u16 seq_num; + t_u16 seq_num; /** Packet Priority */ - t_u8 priority; + t_u8 priority; /** Rx Packet Rate */ - t_u8 rx_rate; + t_u8 rx_rate; /** SNR */ - t_s8 snr; + t_s8 snr; /** Noise Floor */ - t_s8 nf; + t_s8 nf; /** [Bit 1] [Bit 0] RxRate format: legacy rate = 00 HT = 01 VHT = 10 - * [Bit 3] [Bit 2] HT/VHT Bandwidth BW20 = 00 BW40 = 01 BW80 = 10 BW160 = 11 - * [Bit 4] HT/VHT Guard interval LGI = 0 SGI = 1 + * [Bit 3] [Bit 2] HT/VHT Bandwidth BW20 = 00 BW40 = 01 BW80 = 10 BW160 = 11 + * [Bit 4] HT/VHT Guard interval LGI = 0 SGI = 1 * [Bit 5] STBC support Enabled = 1 * [Bit 6] LDPC support Enabled = 1 * [Bit 7] Reserved */ - t_u8 rate_info; + t_u8 rate_info; /** Reserved */ - t_u8 reserved; + t_u8 reserved; } MLAN_PACK_END UapRxPD, *PUapRxPD; /** Fixed size of station association event */ @@ -1534,53 +1534,53 @@ typedef MLAN_PACK_START struct _UapRxPD typedef MLAN_PACK_START struct _IEEEtypes_FrameCtl_t { /** Order */ - t_u8 order:1; + t_u8 order:1; /** Wep */ - t_u8 wep:1; + t_u8 wep:1; /** More Data */ - t_u8 more_data:1; + t_u8 more_data:1; /** Power Mgmt */ - t_u8 pwr_mgmt:1; + t_u8 pwr_mgmt:1; /** Retry */ - t_u8 retry:1; + t_u8 retry:1; /** More Frag */ - t_u8 more_frag:1; + t_u8 more_frag:1; /** From DS */ - t_u8 from_ds:1; + t_u8 from_ds:1; /** To DS */ - t_u8 to_ds:1; + t_u8 to_ds:1; /** Sub Type */ - t_u8 sub_type:4; + t_u8 sub_type:4; /** Type */ - t_u8 type:2; + t_u8 type:2; /** Protocol Version */ - t_u8 protocol_version:2; + t_u8 protocol_version:2; } MLAN_PACK_END IEEEtypes_FrameCtl_t; #else typedef MLAN_PACK_START struct _IEEEtypes_FrameCtl_t { /** Protocol Version */ - t_u8 protocol_version:2; + t_u8 protocol_version:2; /** Type */ - t_u8 type:2; + t_u8 type:2; /** Sub Type */ - t_u8 sub_type:4; + t_u8 sub_type:4; /** To DS */ - t_u8 to_ds:1; + t_u8 to_ds:1; /** From DS */ - t_u8 from_ds:1; + t_u8 from_ds:1; /** More Frag */ - t_u8 more_frag:1; + t_u8 more_frag:1; /** Retry */ - t_u8 retry:1; + t_u8 retry:1; /** Power Mgmt */ - t_u8 pwr_mgmt:1; + t_u8 pwr_mgmt:1; /** More Data */ - t_u8 more_data:1; + t_u8 more_data:1; /** Wep */ - t_u8 wep:1; + t_u8 wep:1; /** Order */ - t_u8 order:1; + t_u8 order:1; } MLAN_PACK_END IEEEtypes_FrameCtl_t; #endif @@ -1588,34 +1588,34 @@ typedef MLAN_PACK_START struct _IEEEtypes_FrameCtl_t typedef MLAN_PACK_START struct _MrvlIETypes_MgmtFrameSet_t { /** Type */ - t_u16 type; + t_u16 type; /** Length */ - t_u16 len; + t_u16 len; /** Frame Control */ - IEEEtypes_FrameCtl_t frame_control; - /* t_u8 frame_contents[0]; */ + IEEEtypes_FrameCtl_t frame_control; + /* t_u8 frame_contents[0]; */ } MLAN_PACK_END MrvlIETypes_MgmtFrameSet_t; /** IEEEtypes_AssocRqst_t */ typedef MLAN_PACK_START struct _IEEEtypes_AssocRqst_t { /** Capability Info */ - t_u16 cap_info; + t_u16 cap_info; /** Listen Interval */ - t_u16 listen_interval; - /* t_u8 ie_buffer[0]; */ + t_u16 listen_interval; + /* t_u8 ie_buffer[0]; */ } MLAN_PACK_END IEEEtypes_AssocRqst_t; /** IEEEtypes_ReAssocRqst_t */ typedef MLAN_PACK_START struct _IEEEtypes_ReAssocRqst_t { /** Capability Info */ - t_u16 cap_info; + t_u16 cap_info; /** Listen Interval */ - t_u16 listen_interval; + t_u16 listen_interval; /** Current AP Address */ - t_u8 current_ap_addr[MLAN_MAC_ADDR_LENGTH]; - /* t_u8 ie_buffer[0]; */ + t_u8 current_ap_addr[MLAN_MAC_ADDR_LENGTH]; + /* t_u8 ie_buffer[0]; */ } MLAN_PACK_END IEEEtypes_ReAssocRqst_t; #endif /* UAP_SUPPORT */ @@ -1623,28 +1623,28 @@ typedef MLAN_PACK_START struct _IEEEtypes_ReAssocRqst_t typedef MLAN_PACK_START struct _wlan_802_11_header { /** Frame Control */ - t_u16 frm_ctl; + t_u16 frm_ctl; /** Duration ID */ - t_u16 duration_id; + t_u16 duration_id; /** Address1 */ - mlan_802_11_mac_addr addr1; + mlan_802_11_mac_addr addr1; /** Address2 */ - mlan_802_11_mac_addr addr2; + mlan_802_11_mac_addr addr2; /** Address3 */ - mlan_802_11_mac_addr addr3; + mlan_802_11_mac_addr addr3; /** Sequence Control */ - t_u16 seq_ctl; + t_u16 seq_ctl; /** Address4 */ - mlan_802_11_mac_addr addr4; + mlan_802_11_mac_addr addr4; } MLAN_PACK_END wlan_802_11_header; /** wlan_802_11_header packet from FW with length */ typedef MLAN_PACK_START struct _wlan_mgmt_pkt { /** Packet Length */ - t_u16 frm_len; + t_u16 frm_len; /** wlan_802_11_header */ - wlan_802_11_header wlan_header; + wlan_802_11_header wlan_header; } MLAN_PACK_END wlan_mgmt_pkt; #ifdef STA_SUPPORT @@ -1655,22 +1655,22 @@ typedef MLAN_PACK_START struct _wlan_mgmt_pkt typedef MLAN_PACK_START struct _chan_power_11d { /** 11D channel */ - t_u8 chan; + t_u8 chan; /** Band for channel */ - t_u8 band; + t_u8 band; /** 11D channel power */ - t_u8 pwr; + t_u8 pwr; /** AP seen on channel */ - t_u8 ap_seen; + t_u8 ap_seen; } MLAN_PACK_END chan_power_11d_t; /** Region channel info */ typedef MLAN_PACK_START struct _parsed_region_chan_11d { /** 11D channel power per channel */ - chan_power_11d_t chan_pwr[MAX_NO_OF_CHAN]; + chan_power_11d_t chan_pwr[MAX_NO_OF_CHAN]; /** 11D number of channels */ - t_u8 no_of_chan; + t_u8 no_of_chan; } MLAN_PACK_END parsed_region_chan_11d_t; #endif /* STA_SUPPORT */ @@ -1679,34 +1679,34 @@ typedef MLAN_PACK_START struct _ChanScanMode_t { #ifdef BIG_ENDIAN_SUPPORT /** Reserved */ - t_u8 reserved_6_7:2; + t_u8 reserved_6_7:2; /** First channel in scan */ - t_u8 first_chan:1; + t_u8 first_chan:1; /** Enable hidden ssid report */ - t_u8 hidden_ssid_report:1; + t_u8 hidden_ssid_report:1; /** Enable probe response timeout */ - t_u8 rsp_timeout_en:1; + t_u8 rsp_timeout_en:1; /** Multidomain scan mode */ - t_u8 multidomain_scan:1; + t_u8 multidomain_scan:1; /** Disble channel filtering flag */ - t_u8 disable_chan_filt:1; + t_u8 disable_chan_filt:1; /** Channel scan mode passive flag */ - t_u8 passive_scan:1; + t_u8 passive_scan:1; #else /** Channel scan mode passive flag */ - t_u8 passive_scan:1; + t_u8 passive_scan:1; /** Disble channel filtering flag */ - t_u8 disable_chan_filt:1; + t_u8 disable_chan_filt:1; /** Multidomain scan mode */ - t_u8 multidomain_scan:1; + t_u8 multidomain_scan:1; /** Enable probe response timeout */ - t_u8 rsp_timeout_en:1; + t_u8 rsp_timeout_en:1; /** Enable hidden ssid report */ - t_u8 hidden_ssid_report:1; + t_u8 hidden_ssid_report:1; /** First channel in scan */ - t_u8 first_chan:1; + t_u8 first_chan:1; /** Reserved */ - t_u8 reserved_6_7:2; + t_u8 reserved_6_7:2; #endif } MLAN_PACK_END ChanScanMode_t; @@ -1717,96 +1717,96 @@ typedef MLAN_PACK_START struct _ChanScanMode_t /** channel offset */ enum { - SEC_CHAN_NONE = 0, - SEC_CHAN_ABOVE = 1, - SEC_CHAN_BELOW = 3 + SEC_CHAN_NONE = 0, + SEC_CHAN_ABOVE = 1, + SEC_CHAN_BELOW = 3 }; /** channel bandwidth */ enum { - CHAN_BW_20MHZ = 0, - CHAN_BW_10MHZ, - CHAN_BW_40MHZ, - CHAN_BW_80MHZ, + CHAN_BW_20MHZ = 0, + CHAN_BW_10MHZ, + CHAN_BW_40MHZ, + CHAN_BW_80MHZ, }; /** ChanScanParamSet_t */ typedef MLAN_PACK_START struct _ChanScanParamSet_t { /** Channel scan parameter : Radio type */ - t_u8 radio_type; + t_u8 radio_type; /** Channel scan parameter : Channel number */ - t_u8 chan_number; + t_u8 chan_number; /** Channel scan parameter : Channel scan mode */ - ChanScanMode_t chan_scan_mode; + ChanScanMode_t chan_scan_mode; /** Channel scan parameter : Minimum scan time */ - t_u16 min_scan_time; + t_u16 min_scan_time; /** Channel scan parameter : Maximum scan time */ - t_u16 max_scan_time; + t_u16 max_scan_time; } MLAN_PACK_END ChanScanParamSet_t; /** MrvlIEtypes_ChanListParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_ChanListParamSet_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Channel scan parameters */ - ChanScanParamSet_t chan_scan_param[1]; + ChanScanParamSet_t chan_scan_param[1]; } MLAN_PACK_END MrvlIEtypes_ChanListParamSet_t; /** ChanBandParamSet_t */ typedef struct _ChanBandParamSet_t { /** Channel scan parameter : Radio type */ - t_u8 radio_type; + t_u8 radio_type; /** Channel number */ - t_u8 chan_number; + t_u8 chan_number; } ChanBandParamSet_t; /** MrvlIEtypes_ChanBandListParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_ChanBandListParamSet_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Channel Band parameters */ - ChanBandParamSet_t chan_band_param[1]; + ChanBandParamSet_t chan_band_param[1]; } MLAN_PACK_END MrvlIEtypes_ChanBandListParamSet_t; /** MrvlIEtypes_RatesParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_RatesParamSet_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Rates */ - t_u8 rates[1]; + t_u8 rates[1]; } MLAN_PACK_END MrvlIEtypes_RatesParamSet_t; /** MrvlIEtypes_SsIdParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_SsIdParamSet_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** SSID */ - t_u8 ssid[1]; + t_u8 ssid[1]; } MLAN_PACK_END MrvlIEtypes_SsIdParamSet_t; /** MrvlIEtypes_NumProbes_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_NumProbes_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Number of probes */ - t_u16 num_probes; + t_u16 num_probes; } MLAN_PACK_END MrvlIEtypes_NumProbes_t; /** MrvlIEtypes_WildCardSsIdParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_WildCardSsIdParamSet_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Maximum SSID length */ - t_u8 max_ssid_length; + t_u8 max_ssid_length; /** SSID */ - t_u8 ssid[1]; + t_u8 ssid[1]; } MLAN_PACK_END MrvlIEtypes_WildCardSsIdParamSet_t; /**TSF data size */ @@ -1815,79 +1815,79 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_WildCardSsIdParamSet_t typedef MLAN_PACK_START struct _MrvlIEtypes_TsfTimestamp_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** the length of each TSF data is 8 bytes, could be multiple TSF here */ - t_u8 tsf_data[1]; + t_u8 tsf_data[1]; } MLAN_PACK_END MrvlIEtypes_TsfTimestamp_t; /** CfParamSet_t */ typedef MLAN_PACK_START struct _CfParamSet_t { /** CF parameter : Count */ - t_u8 cfp_cnt; + t_u8 cfp_cnt; /** CF parameter : Period */ - t_u8 cfp_period; + t_u8 cfp_period; /** CF parameter : Duration */ - t_u16 cfp_max_duration; + t_u16 cfp_max_duration; /** CF parameter : Duration remaining */ - t_u16 cfp_duration_remaining; + t_u16 cfp_duration_remaining; } MLAN_PACK_END CfParamSet_t; /** IbssParamSet_t */ typedef MLAN_PACK_START struct _IbssParamSet_t { /** ATIM window value */ - t_u16 atim_window; + t_u16 atim_window; } MLAN_PACK_END IbssParamSet_t; /** MrvlIEtypes_SsParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_SsParamSet_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** CF/IBSS parameters sets */ - union - { - /** CF parameter set */ - CfParamSet_t cf_param_set[1]; - /** IBSS parameter set */ - IbssParamSet_t ibss_param_set[1]; - } cf_ibss; + union + { + /** CF parameter set */ + CfParamSet_t cf_param_set[1]; + /** IBSS parameter set */ + IbssParamSet_t ibss_param_set[1]; + } cf_ibss; } MLAN_PACK_END MrvlIEtypes_SsParamSet_t; /** FhParamSet_t */ typedef MLAN_PACK_START struct _FhParamSet_t { /** FH parameter : Dwell time */ - t_u16 dwell_time; + t_u16 dwell_time; /** FH parameter : Hop set */ - t_u8 hop_set; + t_u8 hop_set; /** FH parameter : Hop pattern */ - t_u8 hop_pattern; + t_u8 hop_pattern; /** FH parameter : Hop index */ - t_u8 hop_index; + t_u8 hop_index; } MLAN_PACK_END FhParamSet_t; /** DsParamSet_t */ typedef MLAN_PACK_START struct _DsParamSet_t { /** Current channel number */ - t_u8 current_chan; + t_u8 current_chan; } MLAN_PACK_END DsParamSet_t; /** MrvlIEtypes_PhyParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_PhyParamSet_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** FH/DS parameters */ - union - { - /** FH parameter set */ - FhParamSet_t fh_param_set[1]; - /** DS parameter set */ - DsParamSet_t ds_param_set[1]; - } fh_ds; + union + { + /** FH parameter set */ + FhParamSet_t fh_param_set[1]; + /** DS parameter set */ + DsParamSet_t ds_param_set[1]; + } fh_ds; } MLAN_PACK_END MrvlIEtypes_PhyParamSet_t; /* Auth type to be used in the Authentication portion of an Assoc seq */ @@ -1895,20 +1895,21 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_PhyParamSet_t typedef MLAN_PACK_START struct _MrvlIEtypes_AuthType_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Authentication type */ - t_u16 auth_type; + t_u16 auth_type; } MLAN_PACK_END MrvlIEtypes_AuthType_t; /** MrvlIETypes_ActionFrame_t */ typedef MLAN_PACK_START struct { - MrvlIEtypesHeader_t header; /**< Header */ + MrvlIEtypesHeader_t header; + /**< Header */ - t_u8 srcAddr[MLAN_MAC_ADDR_LENGTH]; - t_u8 dstAddr[MLAN_MAC_ADDR_LENGTH]; + t_u8 srcAddr[MLAN_MAC_ADDR_LENGTH]; + t_u8 dstAddr[MLAN_MAC_ADDR_LENGTH]; - IEEEtypes_ActionFrame_t actionFrame; + IEEEtypes_ActionFrame_t actionFrame; } MLAN_PACK_END MrvlIETypes_ActionFrame_t; @@ -1916,28 +1917,28 @@ typedef MLAN_PACK_START struct typedef MLAN_PACK_START struct _MrvlIEtypes_RxBaSync_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** mac address */ - t_u8 mac[MLAN_MAC_ADDR_LENGTH]; + t_u8 mac[MLAN_MAC_ADDR_LENGTH]; /** tid */ - t_u8 tid; + t_u8 tid; /** reserved field */ - t_u8 reserved; + t_u8 reserved; /** start seq num */ - t_u16 seq_num; + t_u16 seq_num; /** bitmap len */ - t_u16 bitmap_len; + t_u16 bitmap_len; /** bitmap */ - t_u8 bitmap[1]; + t_u8 bitmap[1]; } MLAN_PACK_END MrvlIEtypes_RxBaSync_t; /** MrvlIEtypes_RsnParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_RsnParamSet_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** RSN IE */ - t_u8 rsn_ie[1]; + t_u8 rsn_ie[1]; } MLAN_PACK_END MrvlIEtypes_RsnParamSet_t; /** Key_param_set fixed length */ @@ -1951,35 +1952,35 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_RsnParamSet_t typedef MLAN_PACK_START struct _cmac_param { /** IGTK pn */ - t_u8 ipn[IGTK_PN_SIZE]; + t_u8 ipn[IGTK_PN_SIZE]; /** aes key */ - t_u8 key[CMAC_AES_KEY_LEN]; + t_u8 key[CMAC_AES_KEY_LEN]; } MLAN_PACK_END cmac_param; /** MrvlIEtype_KeyParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtype_KeyParamSet_t { /** Type ID */ - t_u16 type; + t_u16 type; /** Length of Payload */ - t_u16 length; + t_u16 length; /** Type of Key: WEP=0, TKIP=1, AES=2 WAPI=3 AES_CMAC=4 */ - t_u16 key_type_id; + t_u16 key_type_id; /** Key Control Info specific to a key_type_id */ - t_u16 key_info; + t_u16 key_info; /** Length of key */ - t_u16 key_len; + t_u16 key_len; /** Key material of size key_len */ - t_u8 key[50]; + t_u8 key[50]; } MLAN_PACK_END MrvlIEtype_KeyParamSet_t; /** HostCmd_DS_802_11_KEY_MATERIAL */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_KEY_MATERIAL { /** Action */ - t_u16 action; + t_u16 action; /** Key parameter set */ - MrvlIEtype_KeyParamSet_t key_param_set; + MrvlIEtype_KeyParamSet_t key_param_set; } MLAN_PACK_END HostCmd_DS_802_11_KEY_MATERIAL; /** Data structure of WMM QoS information */ @@ -1987,19 +1988,19 @@ typedef MLAN_PACK_START struct _WmmQosInfo_t { #ifdef BIG_ENDIAN_SUPPORT /** QoS UAPSD */ - t_u8 qos_uapsd:1; + t_u8 qos_uapsd:1; /** Reserved */ - t_u8 reserved:3; + t_u8 reserved:3; /** Parameter set count */ - t_u8 para_set_count:4; + t_u8 para_set_count:4; #else /** Parameter set count */ - t_u8 para_set_count:4; + t_u8 para_set_count:4; /** Reserved */ - t_u8 reserved:3; + t_u8 reserved:3; /** QoS UAPSD */ - t_u8 qos_uapsd:1; -#endif /* BIG_ENDIAN_SUPPORT */ + t_u8 qos_uapsd:1; +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END WmmQosInfo_t, *pWmmQosInfo_t; /** Data structure of WMM ECW */ @@ -2007,15 +2008,15 @@ typedef MLAN_PACK_START struct _WmmEcw_t { #ifdef BIG_ENDIAN_SUPPORT /** Maximum Ecw */ - t_u8 ecw_max:4; + t_u8 ecw_max:4; /** Minimum Ecw */ - t_u8 ecw_min:4; + t_u8 ecw_min:4; #else /** Minimum Ecw */ - t_u8 ecw_min:4; + t_u8 ecw_min:4; /** Maximum Ecw */ - t_u8 ecw_max:4; -#endif /* BIG_ENDIAN_SUPPORT */ + t_u8 ecw_max:4; +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END WmmEcw_t, *pWmmEcw_t; /** Data structure of WMM Aci/Aifsn */ @@ -2023,48 +2024,48 @@ typedef MLAN_PACK_START struct _WmmAciAifsn_t { #ifdef BIG_ENDIAN_SUPPORT /** Reserved */ - t_u8 reserved:1; + t_u8 reserved:1; /** Aci */ - t_u8 aci:2; + t_u8 aci:2; /** Acm */ - t_u8 acm:1; + t_u8 acm:1; /** Aifsn */ - t_u8 aifsn:4; + t_u8 aifsn:4; #else /** Aifsn */ - t_u8 aifsn:4; + t_u8 aifsn:4; /** Acm */ - t_u8 acm:1; + t_u8 acm:1; /** Aci */ - t_u8 aci:2; + t_u8 aci:2; /** Reserved */ - t_u8 reserved:1; -#endif /* BIG_ENDIAN_SUPPORT */ + t_u8 reserved:1; +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END WmmAciAifsn_t, *pWmmAciAifsn_t; /** Data structure of WMM AC parameters */ typedef MLAN_PACK_START struct _WmmAcParameters_t { - WmmAciAifsn_t aci_aifsn; /**< AciAifSn */ - WmmEcw_t ecw; /**< Ecw */ - t_u16 tx_op_limit; /**< Tx op limit */ + WmmAciAifsn_t aci_aifsn; /**< AciAifSn */ + WmmEcw_t ecw; /**< Ecw */ + t_u16 tx_op_limit; /**< Tx op limit */ } MLAN_PACK_END WmmAcParameters_t, *pWmmAcParameters_t; /** Data structure of WMM parameter */ typedef MLAN_PACK_START struct _WmmParameter_t { /** OuiType: 00:50:f2:02 */ - t_u8 ouitype[4]; + t_u8 ouitype[4]; /** Oui subtype: 01 */ - t_u8 ouisubtype; + t_u8 ouisubtype; /** version: 01 */ - t_u8 version; + t_u8 version; /** QoS information */ - t_u8 qos_info; + t_u8 qos_info; /** Reserved */ - t_u8 reserved; + t_u8 reserved; /** AC Parameters Record WMM_AC_BE, WMM_AC_BK, WMM_AC_VI, WMM_AC_VO */ - WmmAcParameters_t ac_params[MAX_AC_QUEUES]; + WmmAcParameters_t ac_params[MAX_AC_QUEUES]; } MLAN_PACK_END WmmParameter_t, *pWmmParameter_t; /* Definition of firmware host command */ @@ -2072,13 +2073,13 @@ typedef MLAN_PACK_START struct _WmmParameter_t typedef MLAN_PACK_START struct _HostCmd_DS_GEN { /** Command */ - t_u16 command; + t_u16 command; /** Size */ - t_u16 size; + t_u16 size; /** Sequence number */ - t_u16 seq_num; + t_u16 seq_num; /** Result */ - t_u16 result; + t_u16 result; } MLAN_PACK_END HostCmd_DS_GEN; /** Size of HostCmd_DS_GEN */ @@ -2102,98 +2103,98 @@ typedef MLAN_PACK_START struct _HostCmd_DS_GEN /** Header structure for ARP filter */ typedef MLAN_PACK_START struct _arpfilter_header { - /** Type */ - t_u16 type; - /** TLV length */ - t_u16 len; + /** Type */ + t_u16 type; + /** TLV length */ + t_u16 len; } MLAN_PACK_END arpfilter_header; /** Filter entry structure */ typedef MLAN_PACK_START struct _filter_entry { - /** Address type */ - t_u16 addr_type; - /** Ether type */ - t_u16 eth_type; - /** IPv4 address */ - t_u32 ipv4_addr; + /** Address type */ + t_u16 addr_type; + /** Ether type */ + t_u16 eth_type; + /** IPv4 address */ + t_u32 ipv4_addr; } MLAN_PACK_END filter_entry; typedef MLAN_PACK_START struct _HostCmd_DS_MEF_CFG { /** Criteria */ - t_u32 criteria; + t_u32 criteria; /** Number of entries */ - t_u16 nentries; + t_u16 nentries; } MLAN_PACK_END HostCmd_DS_MEF_CFG; /* HostCmd_DS_802_11_SLEEP_PERIOD */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SLEEP_PERIOD { /** ACT_GET/ACT_SET */ - t_u16 action; + t_u16 action; /** Sleep Period in msec */ - t_u16 sleep_pd; + t_u16 sleep_pd; } MLAN_PACK_END HostCmd_DS_802_11_SLEEP_PERIOD; /* HostCmd_DS_802_11_SLEEP_PARAMS */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SLEEP_PARAMS { /** ACT_GET/ACT_SET */ - t_u16 action; + t_u16 action; /** Sleep clock error in ppm */ - t_u16 error; + t_u16 error; /** Wakeup offset in usec */ - t_u16 offset; + t_u16 offset; /** Clock stabilization time in usec */ - t_u16 stable_time; + t_u16 stable_time; /** Control periodic calibration */ - t_u8 cal_control; + t_u8 cal_control; /** Control the use of external sleep clock */ - t_u8 external_sleep_clk; + t_u8 external_sleep_clk; /** Reserved field, should be set to zero */ - t_u16 reserved; + t_u16 reserved; } MLAN_PACK_END HostCmd_DS_802_11_SLEEP_PARAMS; /** Sleep response control */ typedef enum _sleep_resp_ctrl { - RESP_NOT_NEEDED = 0, - RESP_NEEDED, + RESP_NOT_NEEDED = 0, + RESP_NEEDED, } sleep_resp_ctrl; /** Structure definition for the new ieee power save parameters*/ typedef MLAN_PACK_START struct __ps_param { /** Null packet interval */ - t_u16 null_pkt_interval; + t_u16 null_pkt_interval; /** Num dtims */ - t_u16 multiple_dtims; + t_u16 multiple_dtims; /** becaon miss interval */ - t_u16 bcn_miss_timeout; + t_u16 bcn_miss_timeout; /** local listen interval */ - t_u16 local_listen_interval; + t_u16 local_listen_interval; /** Adhoc awake period */ - t_u16 adhoc_wake_period; + t_u16 adhoc_wake_period; /** mode - (0x01 - firmware to automatically choose PS_POLL or NULL mode, 0x02 - PS_POLL, 0x03 - NULL mode ) */ - t_u16 mode; + t_u16 mode; /** Delay to PS in milliseconds */ - t_u16 delay_to_ps; + t_u16 delay_to_ps; } MLAN_PACK_END ps_param; /** Structure definition for the new auto deep sleep command */ typedef MLAN_PACK_START struct __auto_ds_param { /** Deep sleep inactivity timeout */ - t_u16 deep_sleep_timeout; + t_u16 deep_sleep_timeout; } MLAN_PACK_END auto_ds_param; /** Structure definition for sleep confirmation in the new ps command */ typedef MLAN_PACK_START struct __sleep_confirm_param { /** response control 0x00 - response not needed, 0x01 - response needed */ - t_u16 resp_ctrl; + t_u16 resp_ctrl; } MLAN_PACK_END sleep_confirm_param; /** bitmap for get auto deepsleep */ @@ -2208,123 +2209,124 @@ typedef MLAN_PACK_START struct __sleep_confirm_param typedef MLAN_PACK_START struct _auto_ps_param { /** bitmap for enable power save mode */ - t_u16 ps_bitmap; - /* auto deep sleep parameter, sta power save parameter uap inactivity - parameter uap DTIM parameter */ + t_u16 ps_bitmap; + /* auto deep sleep parameter, sta power save parameter uap inactivity + parameter uap DTIM parameter */ } MLAN_PACK_END auto_ps_param; /** fix size for auto ps */ #define AUTO_PS_FIX_SIZE 4 /** TLV type : auto ds param */ -#define TLV_TYPE_AUTO_DS_PARAM (PROPRIETARY_TLV_BASE_ID + 0x71) // 0x0171 +#define TLV_TYPE_AUTO_DS_PARAM (PROPRIETARY_TLV_BASE_ID + 0x71) // 0x0171 /** TLV type : ps param */ -#define TLV_TYPE_PS_PARAM (PROPRIETARY_TLV_BASE_ID + 0x72) // 0x0172 +#define TLV_TYPE_PS_PARAM (PROPRIETARY_TLV_BASE_ID + 0x72) // 0x0172 /** MrvlIEtypes_auto_ds_param_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_auto_ds_param_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** auto ds param */ - auto_ds_param param; + auto_ds_param param; } MLAN_PACK_END MrvlIEtypes_auto_ds_param_t; /** MrvlIEtypes_ps_param_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_ps_param_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** ps param */ - ps_param param; + ps_param param; } MLAN_PACK_END MrvlIEtypes_ps_param_t; /** Structure definition for new power save command */ typedef MLAN_PACK_START struct _HostCmd_DS_PS_MODE_ENH { /** Action */ - t_u16 action; + t_u16 action; /** Data speciifc to action */ - /* For IEEE power save data will be as UINT16 mode (0x01 - firmware to - automatically choose PS_POLL or NULL mode, 0x02 - PS_POLL, 0x03 - NULL - mode ) UINT16 NullpacketInterval UINT16 NumDtims UINT16 - BeaconMissInterval UINT16 locallisteninterval UINT16 adhocawakeperiod */ + /* For IEEE power save data will be as UINT16 mode (0x01 - firmware to + automatically choose PS_POLL or NULL mode, 0x02 - PS_POLL, 0x03 - + NULL mode ) UINT16 NullpacketInterval UINT16 NumDtims UINT16 + BeaconMissInterval UINT16 locallisteninterval UINT16 + adhocawakeperiod */ - /* For auto deep sleep */ - /* UINT16 Deep sleep inactivity timeout */ + /* For auto deep sleep */ + /* UINT16 Deep sleep inactivity timeout */ - /* For PS sleep confirm UINT16 responeCtrl - 0x00 - reponse from fw not - needed, 0x01 - response from fw is needed */ + /* For PS sleep confirm UINT16 responeCtrl - 0x00 - reponse from fw not + needed, 0x01 - response from fw is needed */ - union - { + union + { /** PS param definition */ - ps_param opt_ps; + ps_param opt_ps; /** Auto ds param definition */ - auto_ds_param auto_ds; + auto_ds_param auto_ds; /** Sleep comfirm param definition */ - sleep_confirm_param sleep_cfm; + sleep_confirm_param sleep_cfm; /** bitmap for get PS info and Disable PS mode */ - t_u16 ps_bitmap; + t_u16 ps_bitmap; /** auto ps param */ - auto_ps_param auto_ps; - } params; + auto_ps_param auto_ps; + } params; } MLAN_PACK_END HostCmd_DS_802_11_PS_MODE_ENH; /** HostCmd_DS_GET_HW_SPEC */ typedef MLAN_PACK_START struct _HostCmd_DS_GET_HW_SPEC { /** HW Interface version number */ - t_u16 hw_if_version; + t_u16 hw_if_version; /** HW version number */ - t_u16 version; + t_u16 version; /** Reserved field */ - t_u16 reserved; + t_u16 reserved; /** Max no of Multicast address */ - t_u16 num_of_mcast_adr; + t_u16 num_of_mcast_adr; /** MAC address */ - t_u8 permanent_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 permanent_addr[MLAN_MAC_ADDR_LENGTH]; /** Region Code */ - t_u16 region_code; + t_u16 region_code; /** Number of antenna used */ - t_u16 number_of_antenna; + t_u16 number_of_antenna; /** FW release number, example 0x1234=1.2.3.4 */ - t_u32 fw_release_number; + t_u32 fw_release_number; /** Reserved field */ - t_u32 reserved_1; + t_u32 reserved_1; /** Reserved field */ - t_u32 reserved_2; + t_u32 reserved_2; /** Reserved field */ - t_u32 reserved_3; + t_u32 reserved_3; /** FW/HW Capability */ - t_u32 fw_cap_info; + t_u32 fw_cap_info; /** 802.11n Device Capabilities */ - t_u32 dot_11n_dev_cap; + t_u32 dot_11n_dev_cap; /** MIMO abstraction of MCSs supported by device */ - t_u8 dev_mcs_support; - /** Valid end port at init */ - t_u16 mp_end_port; - /** mgmt IE buffer count */ - t_u16 mgmt_buf_count; + t_u8 dev_mcs_support; + /** Valid end port at init */ + t_u16 mp_end_port; + /** mgmt IE buffer count */ + t_u16 mgmt_buf_count; /** Reserved */ - t_u32 reserved_8; + t_u32 reserved_8; /** Reserved */ - t_u32 reserved_9; + t_u32 reserved_9; /** 802.11ac Device Capabilities */ - t_u32 Dot11acDevCap; + t_u32 Dot11acDevCap; /** MCSs supported by 802.11ac device */ - t_u32 Dot11acMcsSupport; + t_u32 Dot11acMcsSupport; } MLAN_PACK_END HostCmd_DS_GET_HW_SPEC; /** HostCmd_DS_802_11_CFG_DATA */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_CFG_DATA { /** Action */ - t_u16 action; + t_u16 action; /** Type */ - t_u16 type; + t_u16 type; /** Data length */ - t_u16 data_len; + t_u16 data_len; /** Data */ } MLAN_PACK_END HostCmd_DS_802_11_CFG_DATA; @@ -2332,121 +2334,121 @@ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_CFG_DATA typedef MLAN_PACK_START struct _HostCmd_DS_802_11_RSSI_INFO { /** Action */ - t_u16 action; + t_u16 action; /** Parameter used for exponential averaging for Data */ - t_u16 ndata; + t_u16 ndata; /** Parameter used for exponential averaging for Beacon */ - t_u16 nbcn; + t_u16 nbcn; /** Reserved field 0 */ - t_u16 reserved[9]; + t_u16 reserved[9]; /** Reserved field 1 */ - t_u64 reserved_1; + t_u64 reserved_1; } MLAN_PACK_END HostCmd_DS_802_11_RSSI_INFO; /** HostCmd_DS_802_11_RSSI_INFO_RSP */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_RSSI_INFO_RSP { /** Action */ - t_u16 action; + t_u16 action; /** Parameter used for exponential averaging for Data */ - t_u16 ndata; + t_u16 ndata; /** Parameter used for exponential averaging for beacon */ - t_u16 nbcn; + t_u16 nbcn; /** Last Data RSSI in dBm */ - t_s16 data_rssi_last; + t_s16 data_rssi_last; /** Last Data NF in dBm */ - t_s16 data_nf_last; + t_s16 data_nf_last; /** AVG DATA RSSI in dBm */ - t_s16 data_rssi_avg; + t_s16 data_rssi_avg; /** AVG DATA NF in dBm */ - t_s16 data_nf_avg; + t_s16 data_nf_avg; /** Last BEACON RSSI in dBm */ - t_s16 bcn_rssi_last; + t_s16 bcn_rssi_last; /** Last BEACON NF in dBm */ - t_s16 bcn_nf_last; + t_s16 bcn_nf_last; /** AVG BEACON RSSI in dBm */ - t_s16 bcn_rssi_avg; + t_s16 bcn_rssi_avg; /** AVG BEACON NF in dBm */ - t_s16 bcn_nf_avg; + t_s16 bcn_nf_avg; /** Last RSSI Beacon TSF */ - t_u64 tsf_bcn; + t_u64 tsf_bcn; } MLAN_PACK_END HostCmd_DS_802_11_RSSI_INFO_RSP; /** HostCmd_DS_802_11_MAC_ADDRESS */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_MAC_ADDRESS { /** Action */ - t_u16 action; + t_u16 action; /** MAC address */ - t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; } MLAN_PACK_END HostCmd_DS_802_11_MAC_ADDRESS; /** HostCmd_DS_MAC_CONTROL */ typedef MLAN_PACK_START struct _HostCmd_DS_MAC_CONTROL { /** Action */ - t_u32 action; + t_u32 action; } MLAN_PACK_END HostCmd_DS_MAC_CONTROL; /** HostCmd_DS_CMD_TX_DATA_PAUSE */ typedef MLAN_PACK_START struct _HostCmd_DS_CMD_TX_DATA_PAUSE { /** Action */ - t_u16 action; + t_u16 action; /** Enable/disable Tx data pause */ - t_u8 enable_tx_pause; + t_u8 enable_tx_pause; /** Max number of TX buffers allowed for all PS clients*/ - t_u8 pause_tx_count; + t_u8 pause_tx_count; } MLAN_PACK_END HostCmd_DS_CMD_TX_DATA_PAUSE; /** TLV type : TX pause TLV */ -#define TLV_TYPE_TX_PAUSE (PROPRIETARY_TLV_BASE_ID + 0x94) // 0x0194 +#define TLV_TYPE_TX_PAUSE (PROPRIETARY_TLV_BASE_ID + 0x94) // 0x0194 /** MrvlIEtypes_SsIdParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_tx_pause_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** peer mac address */ - t_u8 peermac[MLAN_MAC_ADDR_LENGTH]; + t_u8 peermac[MLAN_MAC_ADDR_LENGTH]; /** Tx pause state, 1--pause, 0--free flowing */ - t_u8 tx_pause; + t_u8 tx_pause; /** total packets queued for the client */ - t_u8 pkt_cnt; + t_u8 pkt_cnt; } MLAN_PACK_END MrvlIEtypes_tx_pause_t; /** HostCmd_CMD_MAC_MULTICAST_ADR */ typedef MLAN_PACK_START struct _HostCmd_DS_MAC_MULTICAST_ADR { /** Action */ - t_u16 action; + t_u16 action; /** Number of addresses */ - t_u16 num_of_adrs; + t_u16 num_of_adrs; /** List of MAC */ - t_u8 mac_list[MLAN_MAC_ADDR_LENGTH * MLAN_MAX_MULTICAST_LIST_SIZE]; + t_u8 mac_list[MLAN_MAC_ADDR_LENGTH * MLAN_MAX_MULTICAST_LIST_SIZE]; } MLAN_PACK_END HostCmd_DS_MAC_MULTICAST_ADR; /** HostCmd_CMD_802_11_DEAUTHENTICATE */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_DEAUTHENTICATE { /** MAC address */ - t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; /** Deauthentication resaon code */ - t_u16 reason_code; + t_u16 reason_code; } MLAN_PACK_END HostCmd_DS_802_11_DEAUTHENTICATE; /** HostCmd_DS_802_11_ASSOCIATE */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_ASSOCIATE { /** Peer STA address */ - t_u8 peer_sta_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 peer_sta_addr[MLAN_MAC_ADDR_LENGTH]; /** Capability information */ - IEEEtypes_CapInfo_t cap_info; + IEEEtypes_CapInfo_t cap_info; /** Listen interval */ - t_u16 listen_interval; + t_u16 listen_interval; /** Beacon period */ - t_u16 beacon_period; + t_u16 beacon_period; /** DTIM period */ - t_u8 dtim_period; + t_u8 dtim_period; /** * MrvlIEtypes_SsIdParamSet_t SsIdParamSet; @@ -2460,94 +2462,94 @@ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_ASSOCIATE typedef MLAN_PACK_START struct _HostCmd_DS_802_11_ASSOCIATE_RSP { /** Association response structure */ - IEEEtypes_AssocRsp_t assoc_rsp; + IEEEtypes_AssocRsp_t assoc_rsp; } MLAN_PACK_END HostCmd_DS_802_11_ASSOCIATE_RSP; /** HostCmd_DS_802_11_AD_HOC_START*/ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_AD_HOC_START { /** AdHoc SSID */ - t_u8 ssid[MLAN_MAX_SSID_LENGTH]; + t_u8 ssid[MLAN_MAX_SSID_LENGTH]; /** BSS mode */ - t_u8 bss_mode; + t_u8 bss_mode; /** Beacon period */ - t_u16 beacon_period; + t_u16 beacon_period; /** DTIM period */ - t_u8 dtim_period; + t_u8 dtim_period; /** SS parameter set */ - IEEEtypes_SsParamSet_t ss_param_set; + IEEEtypes_SsParamSet_t ss_param_set; /** PHY parameter set */ - IEEEtypes_PhyParamSet_t phy_param_set; + IEEEtypes_PhyParamSet_t phy_param_set; /** Reserved field */ - t_u16 reserved1; + t_u16 reserved1; /** Capability information */ - IEEEtypes_CapInfo_t cap; + IEEEtypes_CapInfo_t cap; /** Supported data rates */ - t_u8 DataRate[HOSTCMD_SUPPORTED_RATES]; + t_u8 DataRate[HOSTCMD_SUPPORTED_RATES]; } MLAN_PACK_END HostCmd_DS_802_11_AD_HOC_START; /** HostCmd_CMD_802_11_AD_HOC_START response */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_AD_HOC_START_RESULT { /** Padding */ - t_u8 pad[3]; + t_u8 pad[3]; /** AdHoc BSSID */ - t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; + t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; /** Padding to sync with FW structure*/ - t_u8 pad2[2]; + t_u8 pad2[2]; /** Result */ - t_u8 result; + t_u8 result; } MLAN_PACK_END HostCmd_DS_802_11_AD_HOC_START_RESULT; /** HostCmd_CMD_802_11_AD_HOC_START response */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_AD_HOC_JOIN_RESULT { /** Result */ - t_u8 result; + t_u8 result; } MLAN_PACK_END HostCmd_DS_802_11_AD_HOC_JOIN_RESULT; /** AdHoc_BssDesc_t */ typedef MLAN_PACK_START struct _AdHoc_BssDesc_t { /** BSSID */ - t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; + t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; /** SSID */ - t_u8 ssid[MLAN_MAX_SSID_LENGTH]; + t_u8 ssid[MLAN_MAX_SSID_LENGTH]; /** BSS mode */ - t_u8 bss_mode; + t_u8 bss_mode; /** Beacon period */ - t_u16 beacon_period; + t_u16 beacon_period; /** DTIM period */ - t_u8 dtim_period; + t_u8 dtim_period; /** Timestamp */ - t_u8 time_stamp[8]; + t_u8 time_stamp[8]; /** Local time */ - t_u8 local_time[8]; + t_u8 local_time[8]; /** PHY parameter set */ - IEEEtypes_PhyParamSet_t phy_param_set; + IEEEtypes_PhyParamSet_t phy_param_set; /** SS parameter set */ - IEEEtypes_SsParamSet_t ss_param_set; + IEEEtypes_SsParamSet_t ss_param_set; /** Capability information */ - IEEEtypes_CapInfo_t cap; + IEEEtypes_CapInfo_t cap; /** Supported data rates */ - t_u8 data_rates[HOSTCMD_SUPPORTED_RATES]; + t_u8 data_rates[HOSTCMD_SUPPORTED_RATES]; - /* - * DO NOT ADD ANY FIELDS TO THIS STRUCTURE. - * It is used in the Adhoc join command and will cause a - * binary layout mismatch with the firmware - */ + /* + * DO NOT ADD ANY FIELDS TO THIS STRUCTURE. + * It is used in the Adhoc join command and will cause a + * binary layout mismatch with the firmware + */ } MLAN_PACK_END AdHoc_BssDesc_t; /** HostCmd_DS_802_11_AD_HOC_JOIN */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_AD_HOC_JOIN { /** AdHoc BSS descriptor */ - AdHoc_BssDesc_t bss_descriptor; + AdHoc_BssDesc_t bss_descriptor; /** Reserved field */ - t_u16 reserved1; + t_u16 reserved1; /** Reserved field */ - t_u16 reserved2; + t_u16 reserved2; } MLAN_PACK_END HostCmd_DS_802_11_AD_HOC_JOIN; /** Interrupt Raising Edge */ @@ -2561,72 +2563,72 @@ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_AD_HOC_JOIN typedef MLAN_PACK_START struct _HostCmd_DS_SDIO_GPIO_INT_CONFIG { /** Action */ - t_u16 action; + t_u16 action; /** GPIO interrupt pin */ - t_u16 gpio_pin; + t_u16 gpio_pin; /** GPIO interrupt edge, 1: failing edge; 0: raising edge */ - t_u16 gpio_int_edge; + t_u16 gpio_int_edge; /** GPIO interrupt pulse widthin usec units */ - t_u16 gpio_pulse_width; + t_u16 gpio_pulse_width; } MLAN_PACK_END HostCmd_DS_SDIO_GPIO_INT_CONFIG; typedef MLAN_PACK_START struct _HostCmd_DS_SDIO_PULL_CTRL { /** Action */ - t_u16 action; + t_u16 action; /** The delay of pulling up in us */ - t_u16 pull_up; + t_u16 pull_up; /** The delay of pulling down in us */ - t_u16 pull_down; + t_u16 pull_down; } MLAN_PACK_END HostCmd_DS_SDIO_PULL_CTRL; /** HostCmd_DS_802_11_GET_LOG */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_GET_LOG { /** Number of multicast transmitted frames */ - t_u32 mcast_tx_frame; + t_u32 mcast_tx_frame; /** Number of failures */ - t_u32 failed; + t_u32 failed; /** Number of retries */ - t_u32 retry; + t_u32 retry; /** Number of multiretries */ - t_u32 multiretry; + t_u32 multiretry; /** Number of duplicate frames */ - t_u32 frame_dup; + t_u32 frame_dup; /** Number of RTS success */ - t_u32 rts_success; + t_u32 rts_success; /** Number of RTS failure */ - t_u32 rts_failure; + t_u32 rts_failure; /** Number of acknowledgement failure */ - t_u32 ack_failure; + t_u32 ack_failure; /** Number of fragmented packets received */ - t_u32 rx_frag; + t_u32 rx_frag; /** Number of multicast frames received */ - t_u32 mcast_rx_frame; + t_u32 mcast_rx_frame; /** FCS error */ - t_u32 fcs_error; + t_u32 fcs_error; /** Number of transmitted frames */ - t_u32 tx_frame; + t_u32 tx_frame; /** Reserved field */ - t_u32 reserved; + t_u32 reserved; /** Number of WEP icv error for each key */ - t_u32 wep_icv_err_cnt[4]; + t_u32 wep_icv_err_cnt[4]; /** Beacon received count */ - t_u32 bcn_rcv_cnt; + t_u32 bcn_rcv_cnt; /** Beacon missed count */ - t_u32 bcn_miss_cnt; + t_u32 bcn_miss_cnt; } MLAN_PACK_END HostCmd_DS_802_11_GET_LOG; /**_HostCmd_TX_RATE_QUERY */ typedef MLAN_PACK_START struct _HostCmd_TX_RATE_QUERY { /** Tx rate */ - t_u8 tx_rate; + t_u8 tx_rate; /** Tx Rate Info: - * [Bit 0-1] tx rate formate: LG = 0, HT = 1, VHT = 2 + * [Bit 0-1] tx rate formate: LG = 0, HT = 1, VHT = 2 * [Bit 2-3] HT/VHT Bandwidth: BW20 = 0, BW40 = 1, BW80 = 2, BW160 = 3 * [Bit 4] HT/VHT Guard Interval: LGI = 0, SGI = 1 */ - t_u8 tx_rate_info; + t_u8 tx_rate_info; } MLAN_PACK_END HostCmd_TX_RATE_QUERY; typedef MLAN_PACK_START struct _hs_config_param @@ -2636,55 +2638,55 @@ typedef MLAN_PACK_START struct _hs_config_param * bit2=1: mac events * bit3=1: multicast data */ - t_u32 conditions; + t_u32 conditions; /** GPIO pin or 0xff for interface */ - t_u8 gpio; + t_u8 gpio; /** gap in milliseconds or or 0xff for special setting when GPIO is used to wakeup host */ - t_u8 gap; + t_u8 gap; } MLAN_PACK_END hs_config_param; /** HS Action 0x0001 - Configure enhanced host sleep mode, 0x0002 - Activate enhanced host sleep mode */ typedef enum _Host_Sleep_Action { - HS_CONFIGURE = 0x0001, - HS_ACTIVATE = 0x0002, + HS_CONFIGURE = 0x0001, + HS_ACTIVATE = 0x0002, } Host_Sleep_Action; /** Structure definition for activating enhanced hs */ typedef MLAN_PACK_START struct __hs_activate_param { /** response control 0x00 - response not needed, 0x01 - response needed */ - t_u16 resp_ctrl; + t_u16 resp_ctrl; } MLAN_PACK_END hs_activate_param; /** HostCmd_DS_802_11_HS_CFG_ENH */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_HS_CFG_ENH { /** Action 0x0001 - Configure enhanced host sleep mode, 0x0002 - Activate enhanced host sleep mode */ - t_u16 action; + t_u16 action; - union - { + union + { /** Configure enhanced hs */ - hs_config_param hs_config; + hs_config_param hs_config; /** Activate enhanced hs */ - hs_activate_param hs_activate; - } params; + hs_activate_param hs_activate; + } params; } MLAN_PACK_END HostCmd_DS_802_11_HS_CFG_ENH; /** SNMP_MIB_INDEX */ typedef enum _SNMP_MIB_INDEX { - OpRateSet_i = 1, - DtimPeriod_i = 3, - RtsThresh_i = 5, - ShortRetryLim_i = 6, - LongRetryLim_i = 7, - FragThresh_i = 8, - Dot11D_i = 9, - Dot11H_i = 10, - WwsMode_i = 17, - Thermal_i = 34, + OpRateSet_i = 1, + DtimPeriod_i = 3, + RtsThresh_i = 5, + ShortRetryLim_i = 6, + LongRetryLim_i = 7, + FragThresh_i = 8, + Dot11D_i = 9, + Dot11H_i = 10, + WwsMode_i = 17, + Thermal_i = 34, } SNMP_MIB_INDEX; /** max SNMP buf size */ @@ -2694,13 +2696,13 @@ typedef enum _SNMP_MIB_INDEX typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SNMP_MIB { /** SNMP query type */ - t_u16 query_type; + t_u16 query_type; /** SNMP object ID */ - t_u16 oid; + t_u16 oid; /** SNMP buffer size */ - t_u16 buf_size; + t_u16 buf_size; /** Value */ - t_u8 value[1]; + t_u8 value[1]; } MLAN_PACK_END HostCmd_DS_802_11_SNMP_MIB; /** Radio on */ @@ -2712,102 +2714,102 @@ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SNMP_MIB typedef MLAN_PACK_START struct _HostCmd_DS_802_11_RADIO_CONTROL { /** Action */ - t_u16 action; + t_u16 action; /** Control */ - t_u16 control; + t_u16 control; } MLAN_PACK_END HostCmd_DS_802_11_RADIO_CONTROL; /** MrvlRateScope_t */ typedef MLAN_PACK_START struct _MrvlRateScope_t { /** Header Type */ - t_u16 type; + t_u16 type; /** Header Length */ - t_u16 length; + t_u16 length; /** Bitmap of HR/DSSS rates */ - t_u16 hr_dsss_rate_bitmap; + t_u16 hr_dsss_rate_bitmap; /** Bitmap of OFDM rates */ - t_u16 ofdm_rate_bitmap; + t_u16 ofdm_rate_bitmap; /** Bitmap of HT-MCSs allowed for initial rate */ - t_u16 ht_mcs_rate_bitmap[8]; - t_u16 vht_mcs_rate_bitmap[8]; + t_u16 ht_mcs_rate_bitmap[8]; + t_u16 vht_mcs_rate_bitmap[8]; } MLAN_PACK_END MrvlRateScope_t; /** MrvlRateDropPattern_t */ typedef MLAN_PACK_START struct _MrvlRateDropPattern_t { /** Header Type */ - t_u16 type; + t_u16 type; /** Header Length */ - t_u16 length; + t_u16 length; /** Rate Drop Mode */ - t_u32 rate_drop_mode; - /* MrvlRateDropControl_t RateDropControl[0]; */ + t_u32 rate_drop_mode; + /* MrvlRateDropControl_t RateDropControl[0]; */ } MLAN_PACK_END MrvlRateDropPattern_t; /** HostCmd_DS_TX_RATE_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_TX_RATE_CFG { /** Action */ - t_u16 action; - t_u16 reserved_1; - /* MrvlRateScope_t RateScope; MrvlRateDropPattern_t RateDrop; */ + t_u16 action; + t_u16 reserved_1; + /* MrvlRateScope_t RateScope; MrvlRateDropPattern_t RateDrop; */ } MLAN_PACK_END HostCmd_DS_TX_RATE_CFG; /** Power_Group_t */ typedef MLAN_PACK_START struct _Power_Group_t { /** Modulation Class */ - t_u8 modulation_class; + t_u8 modulation_class; /** MCS Code or Legacy RateID */ - t_u8 first_rate_code; + t_u8 first_rate_code; /** MCS Code or Legacy RateID */ - t_u8 last_rate_code; + t_u8 last_rate_code; /** Power Adjustment Step */ - t_s8 power_step; + t_s8 power_step; /** Minimal Tx Power Level [dBm] */ - t_s8 power_min; + t_s8 power_min; /** Maximal Tx Power Level [dBm] */ - t_s8 power_max; + t_s8 power_max; /** 0: HTBW20, 1: HTBW40 */ - t_u8 ht_bandwidth; + t_u8 ht_bandwidth; /** Reserved */ - t_u8 reserved; + t_u8 reserved; } MLAN_PACK_END Power_Group_t; /** MrvlTypes_Power_Group_t */ typedef MLAN_PACK_START struct _MrvlTypes_Power_Group_t { /** Header Type */ - t_u16 type; + t_u16 type; /** Header Length */ - t_u16 length; - /* Power_Group_t PowerGroups */ + t_u16 length; + /* Power_Group_t PowerGroups */ } MLAN_PACK_END MrvlTypes_Power_Group_t; /** HostCmd_CMD_TXPWR_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_TXPWR_CFG { /** Action */ - t_u16 action; + t_u16 action; /** Power group configuration index */ - t_u16 cfg_index; + t_u16 cfg_index; /** Power group configuration mode */ - t_u32 mode; - /* MrvlTypes_Power_Group_t PowerGrpCfg[0] */ + t_u32 mode; + /* MrvlTypes_Power_Group_t PowerGrpCfg[0] */ } MLAN_PACK_END HostCmd_DS_TXPWR_CFG; /** HostCmd_CMD_802_11_RF_TX_POWER */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_RF_TX_POWER { /** Action */ - t_u16 action; + t_u16 action; /** Current power level */ - t_s16 current_level; + t_s16 current_level; /** Maximum power */ - t_s8 max_power; + t_s8 max_power; /** Minimum power */ - t_s8 min_power; + t_s8 min_power; } MLAN_PACK_END HostCmd_DS_802_11_RF_TX_POWER; /** Connection type infra */ @@ -2824,7 +2826,7 @@ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_RF_TX_POWER typedef MLAN_PACK_START struct _HostCmd_DS_SET_BSS_MODE { /** connection type */ - t_u8 con_type; + t_u8 con_type; } MLAN_PACK_END HostCmd_DS_SET_BSS_MODE; #ifdef WIFI_DIRECT_SUPPORT @@ -2832,26 +2834,26 @@ typedef MLAN_PACK_START struct _HostCmd_DS_SET_BSS_MODE typedef MLAN_PACK_START struct _HostCmd_DS_REMAIN_ON_CHANNEL { /** Action 0-GET, 1-SET, 4 CLEAR*/ - t_u16 action; + t_u16 action; /** Not used set to zero */ - t_u8 status; + t_u8 status; /** Not used set to zero */ - t_u8 reserved; + t_u8 reserved; /** Band cfg */ - t_u8 bandcfg; + t_u8 bandcfg; /** channel */ - t_u8 channel; + t_u8 channel; /** remain time: Unit ms*/ - t_u32 remain_period; + t_u32 remain_period; } MLAN_PACK_END HostCmd_DS_REMAIN_ON_CHANNEL; /** HostCmd_DS_WIFI_DIRECT_MODE */ typedef MLAN_PACK_START struct _HostCmd_DS_WIFI_DIRECT_MODE { /** Action 0-GET, 1-SET*/ - t_u16 action; + t_u16 action; /**0:disable 1:listen 2:GO 3:p2p client 4:find 5:stop find*/ - t_u16 mode; + t_u16 mode; } MLAN_PACK_END HostCmd_DS_WIFI_DIRECT_MODE; #endif @@ -2878,17 +2880,17 @@ typedef MLAN_PACK_START struct _wlan_scan_cmd_config * - MLAN_SCAN_MODE_IBSS (adhoc) * - MLAN_SCAN_MODE_ANY (unrestricted, adhoc and infrastructure) */ - t_u8 bss_mode; + t_u8 bss_mode; /** * Specific BSSID used to filter scan results in the firmware */ - t_u8 specific_bssid[MLAN_MAC_ADDR_LENGTH]; + t_u8 specific_bssid[MLAN_MAC_ADDR_LENGTH]; /** * Length of TLVs sent in command starting at tlvBuffer */ - t_u32 tlv_buf_len; + t_u32 tlv_buf_len; /** * SSID TLV(s) and ChanList TLVs to be sent in the firmware command @@ -2896,8 +2898,8 @@ typedef MLAN_PACK_START struct _wlan_scan_cmd_config * TLV_TYPE_CHANLIST, MrvlIEtypes_ChanListParamSet_t * TLV_TYPE_SSID, MrvlIEtypes_SsIdParamSet_t */ - t_u8 tlv_buf[1]; /* SSID TLV(s) and ChanList TLVs are stored - here */ + t_u8 tlv_buf[1]; /* SSID TLV(s) and ChanList TLVs are stored + here */ } MLAN_PACK_END wlan_scan_cmd_config; /** @@ -2909,42 +2911,42 @@ typedef MLAN_PACK_START struct * - Zero based scan entry to start retrieval in command request * - Number of scans entries returned in command response */ - t_u32 scan_number; + t_u32 scan_number; /** * Buffer marker for multiple wlan_ioctl_get_scan_table_entry structures. * Each struct is padded to the nearest 32 bit boundary. */ - t_u8 scan_table_entry_buf[1]; + t_u8 scan_table_entry_buf[1]; } MLAN_PACK_END wlan_get_scan_table_info; /** Generic structure defined for parsing WPA/RSN IEs for GTK/PTK OUIs */ typedef MLAN_PACK_START struct { - /** Group key oui */ - t_u8 GrpKeyOui[4]; - /** Number of PTKs */ - t_u8 PtkCnt[2]; - /** Ptk body starts here */ - t_u8 PtkBody[4]; + /** Group key oui */ + t_u8 GrpKeyOui[4]; + /** Number of PTKs */ + t_u8 PtkCnt[2]; + /** Ptk body starts here */ + t_u8 PtkBody[4]; } MLAN_PACK_END IEBody; #endif /* STA_SUPPORT */ -/* - * This scan handle Country Information IE(802.11d compliant) - * Define data structure for HostCmd_CMD_802_11_SCAN +/* + * This scan handle Country Information IE(802.11d compliant) + * Define data structure for HostCmd_CMD_802_11_SCAN */ /** HostCmd_DS_802_11_SCAN */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SCAN { /** BSS mode */ - t_u8 bss_mode; + t_u8 bss_mode; /** BSSID */ - t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; + t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; /** TLV buffer */ - t_u8 tlv_buffer[1]; - /** MrvlIEtypes_SsIdParamSet_t SsIdParamSet; + t_u8 tlv_buffer[1]; + /** MrvlIEtypes_SsIdParamSet_t SsIdParamSet; * MrvlIEtypes_ChanListParamSet_t ChanListParamSet; - * MrvlIEtypes_RatesParamSet_t OpRateSet; + * MrvlIEtypes_RatesParamSet_t OpRateSet; */ } MLAN_PACK_END HostCmd_DS_802_11_SCAN; @@ -2956,9 +2958,9 @@ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SCAN typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SCAN_EXT { /** Reserved */ - t_u32 reserved; + t_u32 reserved; /** TLV buffer */ - t_u8 tlv_buffer[1]; + t_u8 tlv_buffer[1]; /** MrvlIEtypes_Bssid_List_t BssIdList; * MrvlIEtypes_SsIdParamSet_t SSIDParamSet; * MrvlIEtypes_ChanListParamSet_t ChanListParamSet; @@ -2971,322 +2973,322 @@ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SCAN_EXT typedef MLAN_PACK_START struct _MrvlIEtypes_Bss_Scan_Rsp_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** BSSID of the BSS descriptor */ - t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; + t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; /** Beacon/Probe response buffer */ - t_u8 frame_body[1]; + t_u8 frame_body[1]; } MLAN_PACK_END MrvlIEtypes_Bss_Scan_Rsp_t; typedef MLAN_PACK_START struct _MrvlIEtypes_Bss_Scan_Info_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** RSSI for scan entry */ - t_s16 rssi; + t_s16 rssi; /** Channel ANPI */ - t_s16 anpi; + t_s16 anpi; /** Channel load (parts per 255) */ - t_u8 cca_busy_fraction; + t_u8 cca_busy_fraction; /** Band */ - t_u8 band; + t_u8 band; /** Channel */ - t_u8 channel; + t_u8 channel; /** Reserved */ - t_u8 reserved; + t_u8 reserved; /** TSF data */ - t_u64 tsf; + t_u64 tsf; } MLAN_PACK_END MrvlIEtypes_Bss_Scan_Info_t; /** HostCmd_DS_RX_MGMT_IND */ typedef MLAN_PACK_START struct _HostCmd_DS_RX_MGMT_IND { /** Action */ - t_u16 action; + t_u16 action; /** Mgmt frame subtype mask */ - t_u32 mgmt_subtype_mask; + t_u32 mgmt_subtype_mask; } MLAN_PACK_END HostCmd_DS_RX_MGMT_IND; /** HostCmd_DS_802_11_SCAN_RSP */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SCAN_RSP { /** Size of BSS descriptor */ - t_u16 bss_descript_size; + t_u16 bss_descript_size; /** Numner of sets */ - t_u8 number_of_sets; + t_u8 number_of_sets; /** BSS descriptor and TLV buffer */ - t_u8 bss_desc_and_tlv_buffer[1]; + t_u8 bss_desc_and_tlv_buffer[1]; } MLAN_PACK_END HostCmd_DS_802_11_SCAN_RSP; /** HostCmd_DS_802_11_BG_SCAN_CONFIG */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_BG_SCAN_CONFIG { /** action */ - t_u16 action; + t_u16 action; /** 0: disable, 1: enable */ - t_u8 enable; + t_u8 enable; /** bss type */ - t_u8 bss_type; + t_u8 bss_type; /** num of channel per scan */ - t_u8 chan_per_scan; + t_u8 chan_per_scan; /** reserved field */ - t_u8 reserved; + t_u8 reserved; /** reserved field */ - t_u16 reserved1; + t_u16 reserved1; /** interval between consecutive scans */ - t_u32 scan_interval; + t_u32 scan_interval; /** reserved field */ - t_u32 reserved2; + t_u32 reserved2; /** condition to trigger report to host */ - t_u32 report_condition; + t_u32 report_condition; /** reserved field */ - t_u16 reserved3; + t_u16 reserved3; } MLAN_PACK_END HostCmd_DS_802_11_BG_SCAN_CONFIG; /** HostCmd_DS_802_11_BG_SCAN_QUERY */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_BG_SCAN_QUERY { /** Flush */ - t_u8 flush; + t_u8 flush; } MLAN_PACK_END HostCmd_DS_802_11_BG_SCAN_QUERY; /** HostCmd_DS_802_11_BG_SCAN_QUERY_RSP */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_BG_SCAN_QUERY_RSP { /** Report condition */ - t_u32 report_condition; + t_u32 report_condition; /** Scan response */ - HostCmd_DS_802_11_SCAN_RSP scan_resp; + HostCmd_DS_802_11_SCAN_RSP scan_resp; } MLAN_PACK_END HostCmd_DS_802_11_BG_SCAN_QUERY_RSP; /** MrvlIEtypes_StartLater_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_StartLater_t { /** Header */ - MrvlIEtypesHeader_t header; - /* 0 - BGScan start immediately, 1 - BGScan will start later after "Scan - Interval" */ - t_u16 value; + MrvlIEtypesHeader_t header; + /* 0 - BGScan start immediately, 1 - BGScan will start later after + "Scan Interval" */ + t_u16 value; } MLAN_PACK_END MrvlIEtypes_StartLater_t; /** MrvlIEtypes_RepeatCount_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_RepeatCount_t { /** Header */ - MrvlIEtypesHeader_t header; - /* Repeat count */ - t_u16 repeat_count; + MrvlIEtypesHeader_t header; + /* Repeat count */ + t_u16 repeat_count; } MLAN_PACK_END MrvlIEtypes_RepeatCount_t; /** MrvlIEtypes_DomainParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_DomainParamSet { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Country code */ - t_u8 country_code[COUNTRY_CODE_LEN]; + t_u8 country_code[COUNTRY_CODE_LEN]; /** Set of subbands */ - IEEEtypes_SubbandSet_t sub_band[1]; + IEEEtypes_SubbandSet_t sub_band[1]; } MLAN_PACK_END MrvlIEtypes_DomainParamSet_t; /** HostCmd_DS_802_11D_DOMAIN_INFO */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11D_DOMAIN_INFO { /** Action */ - t_u16 action; + t_u16 action; /** Domain parameter set */ - MrvlIEtypes_DomainParamSet_t domain; + MrvlIEtypes_DomainParamSet_t domain; } MLAN_PACK_END HostCmd_DS_802_11D_DOMAIN_INFO; /** HostCmd_DS_802_11D_DOMAIN_INFO_RSP */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11D_DOMAIN_INFO_RSP { /** Action */ - t_u16 action; + t_u16 action; /** Domain parameter set */ - MrvlIEtypes_DomainParamSet_t domain; + MrvlIEtypes_DomainParamSet_t domain; } MLAN_PACK_END HostCmd_DS_802_11D_DOMAIN_INFO_RSP; /** HostCmd_DS_11N_ADDBA_REQ */ typedef MLAN_PACK_START struct _HostCmd_DS_11N_ADDBA_REQ { /** Result of the ADDBA Request Operation */ - t_u8 add_req_result; + t_u8 add_req_result; /** Peer MAC address */ - t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; /** Dialog Token */ - t_u8 dialog_token; + t_u8 dialog_token; /** Block Ack Parameter Set */ - t_u16 block_ack_param_set; + t_u16 block_ack_param_set; /** Block Act Timeout Value */ - t_u16 block_ack_tmo; + t_u16 block_ack_tmo; /** Starting Sequence Number */ - t_u16 ssn; + t_u16 ssn; } MLAN_PACK_END HostCmd_DS_11N_ADDBA_REQ; /** HostCmd_DS_11N_ADDBA_RSP */ typedef MLAN_PACK_START struct _HostCmd_DS_11N_ADDBA_RSP { /** Result of the ADDBA Response Operation */ - t_u8 add_rsp_result; + t_u8 add_rsp_result; /** Peer MAC address */ - t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; /** Dialog Token */ - t_u8 dialog_token; + t_u8 dialog_token; /** Status Code */ - t_u16 status_code; + t_u16 status_code; /** Block Ack Parameter Set */ - t_u16 block_ack_param_set; + t_u16 block_ack_param_set; /** Block Act Timeout Value */ - t_u16 block_ack_tmo; + t_u16 block_ack_tmo; /** Starting Sequence Number */ - t_u16 ssn; + t_u16 ssn; } MLAN_PACK_END HostCmd_DS_11N_ADDBA_RSP; /** HostCmd_DS_11N_DELBA */ typedef MLAN_PACK_START struct _HostCmd_DS_11N_DELBA { /** Result of the ADDBA Request Operation */ - t_u8 del_result; + t_u8 del_result; /** Peer MAC address */ - t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; /** Delete Block Ack Parameter Set */ - t_u16 del_ba_param_set; + t_u16 del_ba_param_set; /** Reason Code sent for DELBA */ - t_u16 reason_code; + t_u16 reason_code; /** Reserved */ - t_u8 reserved; + t_u8 reserved; } MLAN_PACK_END HostCmd_DS_11N_DELBA; /** HostCmd_DS_11N_BATIMEOUT */ typedef MLAN_PACK_START struct _HostCmd_DS_11N_BATIMEOUT { /** TID */ - t_u8 tid; + t_u8 tid; /** Peer MAC address */ - t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; /** Delete Block Ack Parameter Set */ - t_u8 origninator; + t_u8 origninator; } MLAN_PACK_END HostCmd_DS_11N_BATIMEOUT; /** HostCmd_DS_11N_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_11N_CFG { /** Action */ - t_u16 action; + t_u16 action; /** HTTxCap */ - t_u16 ht_tx_cap; + t_u16 ht_tx_cap; /** HTTxInfo */ - t_u16 ht_tx_info; + t_u16 ht_tx_info; /** Misc configuration */ - t_u16 misc_config; + t_u16 misc_config; } MLAN_PACK_END HostCmd_DS_11N_CFG; /** HostCmd_DS_11N_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_REJECT_ADDBA_REQ { /** Action */ - t_u16 action; + t_u16 action; /** Bit0 : host sleep activated * Bit1 : auto reconnect enabled * Others : reserved */ - t_u32 conditions; + t_u32 conditions; } MLAN_PACK_END HostCmd_DS_REJECT_ADDBA_REQ; /** HostCmd_DS_TXBUF_CFG*/ typedef MLAN_PACK_START struct _HostCmd_DS_TXBUF_CFG { /** Action */ - t_u16 action; + t_u16 action; /** Buffer Size */ - t_u16 buff_size; + t_u16 buff_size; /** End Port_for Multiport */ - t_u16 mp_end_port; + t_u16 mp_end_port; /** Reserved */ - t_u16 reserved3; + t_u16 reserved3; } MLAN_PACK_END HostCmd_DS_TXBUF_CFG; /** HostCmd_DS_AMSDU_AGGR_CTRL */ typedef MLAN_PACK_START struct _HostCmd_DS_AMSDU_AGGR_CTRL { /** Action */ - t_u16 action; + t_u16 action; /** Enable */ - t_u16 enable; + t_u16 enable; /** Get the current Buffer Size valid */ - t_u16 curr_buf_size; + t_u16 curr_buf_size; } MLAN_PACK_END HostCmd_DS_AMSDU_AGGR_CTRL; /** HostCmd_DS_11AC_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_11AC_CFG { /** Action */ - t_u16 action; + t_u16 action; /** BandConfig */ - t_u8 band_config; + t_u8 band_config; /** Misc Configuration */ - t_u8 misc_config; + t_u8 misc_config; /** VHT Capability Info */ - t_u32 vht_cap_info; + t_u32 vht_cap_info; /** VHT Support MCS Set */ - t_u8 vht_supp_mcs_set[VHT_MCS_SET_LEN]; + t_u8 vht_supp_mcs_set[VHT_MCS_SET_LEN]; } MLAN_PACK_END HostCmd_DS_11AC_CFG; /** HostCmd_DS_11ACTXBUF_CFG*/ typedef MLAN_PACK_START struct _HostCmd_DS_11ACTXBUF_CFG { /** Action */ - t_u16 action; + t_u16 action; /** Buffer Size */ - t_u16 buff_size; + t_u16 buff_size; /** End Port_for Multiport */ - t_u16 mp_end_port; + t_u16 mp_end_port; /** Reserved */ - t_u16 reserved3; + t_u16 reserved3; } MLAN_PACK_END HostCmd_DS_11ACTXBUF_CFG; /** HostCmd_DS_ECL_SYSTEM_CLOCK_CONFIG */ typedef MLAN_PACK_START struct _HostCmd_DS_ECL_SYSTEM_CLOCK_CONFIG { /** Action */ - t_u16 action; + t_u16 action; /** Current system clock */ - t_u16 cur_sys_clk; + t_u16 cur_sys_clk; /** Clock type */ - t_u16 sys_clk_type; + t_u16 sys_clk_type; /** Length of clocks */ - t_u16 sys_clk_len; + t_u16 sys_clk_len; /** System clocks */ - t_u16 sys_clk[16]; + t_u16 sys_clk[16]; } MLAN_PACK_END HostCmd_DS_ECL_SYSTEM_CLOCK_CONFIG; /** MrvlIEtypes_WmmParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_WmmParamSet_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** WMM IE */ - t_u8 wmm_ie[1]; + t_u8 wmm_ie[1]; } MLAN_PACK_END MrvlIEtypes_WmmParamSet_t; /** MrvlIEtypes_WmmQueueStatus_t */ typedef MLAN_PACK_START struct { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Queue index */ - t_u8 queue_index; + t_u8 queue_index; /** Disabled flag */ - t_u8 disabled; + t_u8 disabled; /** Medium time allocation in 32us units*/ - t_u16 medium_time; + t_u16 medium_time; /** Flow required flag */ - t_u8 flow_required; + t_u8 flow_required; /** Flow created flag */ - t_u8 flow_created; + t_u8 flow_created; /** Reserved */ - t_u32 reserved; + t_u32 reserved; } MLAN_PACK_END MrvlIEtypes_WmmQueueStatus_t; /** Size of a TSPEC. Used to allocate necessary buffer space in commands */ @@ -3307,24 +3309,24 @@ typedef MLAN_PACK_START struct /** * @brief Firmware command structure to retrieve the firmware WMM status. * - * Used to retrieve the status of each WMM AC Queue in TLV + * Used to retrieve the status of each WMM AC Queue in TLV * format (MrvlIEtypes_WmmQueueStatus_t) as well as the current WMM - * parameter IE advertised by the AP. - * + * parameter IE advertised by the AP. + * * Used in response to a EVENT_WMM_STATUS_CHANGE event signaling * a QOS change on one of the ACs or a change in the WMM Parameter in * the Beacon. * - * TLV based command, byte arrays used for max sizing purpose. There are no + * TLV based command, byte arrays used for max sizing purpose. There are no * arguments sent in the command, the TLVs are returned by the firmware. */ typedef MLAN_PACK_START struct { /** Queue status TLV */ - t_u8 queue_status_tlv[sizeof(MrvlIEtypes_WmmQueueStatus_t) - * MAX_AC_QUEUES]; + t_u8 queue_status_tlv[sizeof(MrvlIEtypes_WmmQueueStatus_t) + * MAX_AC_QUEUES]; /** WMM parameter TLV */ - t_u8 wmm_param_tlv[sizeof(IEEEtypes_WmmParameter_t) + 2]; + t_u8 wmm_param_tlv[sizeof(IEEEtypes_WmmParameter_t) + 2]; } MLAN_PACK_END HostCmd_DS_WMM_GET_STATUS; @@ -3333,12 +3335,13 @@ MLAN_PACK_END HostCmd_DS_WMM_GET_STATUS; */ typedef MLAN_PACK_START struct { - mlan_cmd_result_e command_result; /**< Command result */ - t_u32 timeout_ms; /**< Timeout value in milliseconds */ - t_u8 dialog_token; /**< Dialog token */ - t_u8 ieee_status_code; /**< IEEE status code */ - t_u8 tspec_data[WMM_TSPEC_SIZE]; /**< TSPEC data */ - t_u8 addts_extra_ie_buf[WMM_ADDTS_EXTRA_IE_BYTES]; /**< Extra IE buffer */ + mlan_cmd_result_e command_result;/**< Command result */ + t_u32 timeout_ms; /**< Timeout value in milliseconds */ + t_u8 dialog_token; /**< Dialog token */ + t_u8 ieee_status_code; /**< IEEE status code */ + t_u8 tspec_data[WMM_TSPEC_SIZE]; /**< TSPEC data */ + t_u8 addts_extra_ie_buf[WMM_ADDTS_EXTRA_IE_BYTES]; + /**< Extra IE buffer */ } MLAN_PACK_END HostCmd_DS_WMM_ADDTS_REQ; /** @@ -3346,10 +3349,11 @@ typedef MLAN_PACK_START struct */ typedef MLAN_PACK_START struct { - mlan_cmd_result_e command_result; /**< Command result */ - t_u8 dialog_token; /**< Dialog token */ - t_u8 ieee_reason_code; /**< IEEE reason code */ - t_u8 tspec_data[WMM_TSPEC_SIZE]; /**< TSPEC data */ + mlan_cmd_result_e command_result; + /**< Command result */ + t_u8 dialog_token; /**< Dialog token */ + t_u8 ieee_reason_code; /**< IEEE reason code */ + t_u8 tspec_data[WMM_TSPEC_SIZE];/**< TSPEC data */ } MLAN_PACK_END HostCmd_DS_WMM_DELTS_REQ; /** @@ -3359,15 +3363,17 @@ typedef MLAN_PACK_START struct */ typedef MLAN_PACK_START struct { - mlan_wmm_queue_config_action_e action; /**< Set, Get, or Default */ - mlan_wmm_ac_e access_category; /**< WMM_AC_BK(0) to WMM_AC_VO(3) */ + mlan_wmm_queue_config_action_e action; + /**< Set, Get, or Default */ + mlan_wmm_ac_e access_category; /**< WMM_AC_BK(0) to WMM_AC_VO(3) */ /** @brief MSDU lifetime expiry per 802.11e * - * - Ignored if 0 on a set command + * - Ignored if 0 on a set command * - Set to the 802.11e specified 500 TUs when defaulted */ - t_u16 msdu_lifetime_expiry; - t_u8 tlv_buffer[WMM_QUEUE_CONFIG_EXTRA_TLV_BYTES]; /**< Not supported */ + t_u16 msdu_lifetime_expiry; + t_u8 tlv_buffer[WMM_QUEUE_CONFIG_EXTRA_TLV_BYTES]; + /**< Not supported */ } MLAN_PACK_END HostCmd_DS_WMM_QUEUE_CONFIG; /** @@ -3378,20 +3384,24 @@ typedef MLAN_PACK_START struct */ typedef MLAN_PACK_START struct { - mlan_wmm_queue_stats_action_e action; /**< Start, Stop, or Get */ + mlan_wmm_queue_stats_action_e action; + /**< Start, Stop, or Get */ #ifdef BIG_ENDIAN_SUPPORT - t_u8 select_bin:7; /**< WMM_AC_BK(0) to WMM_AC_VO(3), or TID */ - t_u8 select_is_userpri:1; /**< Set if select_bin is UP, Clear for AC */ + t_u8 select_bin:7; /**< WMM_AC_BK(0) to WMM_AC_VO(3), or TID */ + t_u8 select_is_userpri:1; + /**< Set if select_bin is UP, Clear for AC */ #else - t_u8 select_is_userpri:1; /**< Set if select_bin is UP, Clear for AC */ - t_u8 select_bin:7; /**< WMM_AC_BK(0) to WMM_AC_VO(3), or TID */ + t_u8 select_is_userpri:1; + /**< Set if select_bin is UP, Clear for AC */ + t_u8 select_bin:7; /**< WMM_AC_BK(0) to WMM_AC_VO(3), or TID */ #endif - t_u16 pkt_count; /**< Number of successful packets transmitted */ - t_u16 pkt_loss; /**< Packets lost; not included in pktCount */ - t_u32 avg_queue_delay; /**< Average Queue delay in microsec */ - t_u32 avg_tx_delay; /**< Average Transmission delay in microsec */ - t_u16 used_time; /**< Calc used time - units of 32 microsec */ - t_u16 policed_time; /**< Calc policed time - units of 32 microsec */ + t_u16 pkt_count; /**< Number of successful packets transmitted */ + t_u16 pkt_loss; /**< Packets lost; not included in pktCount */ + t_u32 avg_queue_delay; + /**< Average Queue delay in microsec */ + t_u32 avg_tx_delay; /**< Average Transmission delay in microsec */ + t_u16 used_time; /**< Calc used time - units of 32 microsec */ + t_u16 policed_time; /**< Calc policed time - units of 32 microsec */ /** @brief Queue Delay Histogram; number of packets per queue delay range * * [0] - 0ms <= delay < 5ms @@ -3402,9 +3412,9 @@ typedef MLAN_PACK_START struct * [5] - 40ms <= delay < 50ms * [6] - 50ms <= delay < msduLifetime (TUs) */ - t_u16 delay_histogram[WMM_STATS_PKTS_HIST_BINS]; + t_u16 delay_histogram[WMM_STATS_PKTS_HIST_BINS]; /** Reserved */ - t_u16 reserved_1; + t_u16 reserved_1; } MLAN_PACK_END HostCmd_DS_WMM_QUEUE_STATS; /** @@ -3415,285 +3425,285 @@ typedef MLAN_PACK_START struct typedef MLAN_PACK_START struct { /** TSID: Range: 0->7 */ - t_u8 tid; + t_u8 tid; /** TSID specified is valid */ - t_u8 valid; + t_u8 valid; /** AC TSID is active on */ - t_u8 access_category; + t_u8 access_category; /** UP specified for the TSID */ - t_u8 user_priority; + t_u8 user_priority; /** Power save mode for TSID: 0 (legacy), 1 (UAPSD) */ - t_u8 psb; + t_u8 psb; /** Uplink(1), Downlink(2), Bidirectional(3) */ - t_u8 flow_dir; + t_u8 flow_dir; /** Medium time granted for the TSID */ - t_u16 medium_time; + t_u16 medium_time; } MLAN_PACK_END HostCmd_DS_WMM_TS_STATUS; /** Firmware status for a specific AC */ typedef MLAN_PACK_START struct { /** Disabled flag */ - t_u8 disabled; + t_u8 disabled; /** Flow required flag */ - t_u8 flow_required; + t_u8 flow_required; /** Flow created flag */ - t_u8 flow_created; + t_u8 flow_created; } MLAN_PACK_END WmmAcStatus_t; /** Local Power Capability */ typedef MLAN_PACK_START struct _MrvlIEtypes_PowerCapability_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Minmum power */ - t_s8 min_power; + t_s8 min_power; /** Maximum power */ - t_s8 max_power; + t_s8 max_power; } MLAN_PACK_END MrvlIEtypes_PowerCapability_t; /** HT Capabilities element */ typedef MLAN_PACK_START struct _MrvlIETypes_HTCap_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** HTCap struct */ - HTCap_t ht_cap; + HTCap_t ht_cap; } MLAN_PACK_END MrvlIETypes_HTCap_t; /** HT Information element */ typedef MLAN_PACK_START struct _MrvlIETypes_HTInfo_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** HTInfo struct */ - HTInfo_t ht_info; + HTInfo_t ht_info; } MLAN_PACK_END MrvlIETypes_HTInfo_t; /** 20/40 BSS Coexistence element */ typedef MLAN_PACK_START struct _MrvlIETypes_2040BSSCo_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** BSSCo2040_t struct */ - BSSCo2040_t bss_co_2040; + BSSCo2040_t bss_co_2040; } MLAN_PACK_END MrvlIETypes_2040BSSCo_t; /** Extended Capabilities element */ typedef MLAN_PACK_START struct _MrvlIETypes_ExtCap_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** ExtCap_t struct */ - ExtCap_t ext_cap; + ExtCap_t ext_cap; } MLAN_PACK_END MrvlIETypes_ExtCap_t; /** Overlapping BSS Scan Parameters element */ typedef MLAN_PACK_START struct _MrvlIETypes_OverlapBSSScanParam_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** OBSSScanParam_t struct */ - OBSSScanParam_t obss_scan_param; + OBSSScanParam_t obss_scan_param; } MLAN_PACK_END MrvlIETypes_OverlapBSSScanParam_t; /** Set of MCS values that STA desires to use within the BSS */ typedef MLAN_PACK_START struct _MrvlIETypes_HTOperationalMCSSet_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Bitmap indicating MCSs that STA desires to use within the BSS */ - t_u8 ht_operational_mcs_bitmap[16]; + t_u8 ht_operational_mcs_bitmap[16]; } MLAN_PACK_END MrvlIETypes_HTOperationalMCSSet_t; /** VHT Capabilities element */ typedef MLAN_PACK_START struct _MrvlIETypes_VHTCap_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** VHTCap struct */ - VHT_capa_t vht_cap; + VHT_capa_t vht_cap; } MLAN_PACK_END MrvlIETypes_VHTCap_t; /** VHT Operations IE */ typedef MLAN_PACK_START struct _MrvlIETypes_VHTOprat_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; - t_u8 chan_width; - t_u8 chan_center_freq_1; - t_u8 chan_center_freq_2; + t_u8 chan_width; + t_u8 chan_center_freq_1; + t_u8 chan_center_freq_2; /** Basic MCS set map, each 2 bits stands for a Nss */ - t_u16 basic_MCS_map; + t_u16 basic_MCS_map; } MLAN_PACK_END MrvlIETypes_VHTOprat_t; /** VHT Transmit Power Envelope IE */ typedef MLAN_PACK_START struct _MrvlIETypes_VHTtxpower_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; - t_u8 max_tx_power; - t_u8 chan_center_freq; - t_u8 chan_width; + t_u8 max_tx_power; + t_u8 chan_center_freq; + t_u8 chan_width; } MLAN_PACK_END MrvlIETypes_VHTtxpower_t; /** Extended Power Constraint IE */ typedef MLAN_PACK_START struct _MrvlIETypes_ExtPwerCons_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** channel width */ - t_u8 chan_width; + t_u8 chan_width; /** local power constraint */ - t_u8 local_power_cons; + t_u8 local_power_cons; } MLAN_PACK_END MrvlIETypes_ExtPwerCons_t; /** Extended BSS Load IE */ typedef MLAN_PACK_START struct _MrvlIETypes_ExtBSSload_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; - t_u8 MU_MIMO_capa_count; - t_u8 stream_underutilization; - t_u8 VHT40_util; - t_u8 VHT80_util; - t_u8 VHT160_util; + t_u8 MU_MIMO_capa_count; + t_u8 stream_underutilization; + t_u8 VHT40_util; + t_u8 VHT80_util; + t_u8 VHT160_util; } MLAN_PACK_END MrvlIETypes_ExtBSSload_t; /** Quiet Channel IE */ typedef MLAN_PACK_START struct _MrvlIETypes_QuietChan_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; - t_u8 AP_quiet_mode; - t_u8 quiet_count; - t_u8 quiet_period; - t_u16 quiet_dur; - t_u16 quiet_offset; + t_u8 AP_quiet_mode; + t_u8 quiet_count; + t_u8 quiet_period; + t_u16 quiet_dur; + t_u16 quiet_offset; } MLAN_PACK_END MrvlIETypes_QuietChan_t; /** Wide Bandwidth Channel Switch IE */ typedef MLAN_PACK_START struct _MrvlIETypes_BWSwitch_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; - t_u8 new_chan_width; - t_u8 new_chan_center_freq_1; - t_u8 new_chan_center_freq_2; + t_u8 new_chan_width; + t_u8 new_chan_center_freq_1; + t_u8 new_chan_center_freq_2; } MLAN_PACK_END MrvlIETypes_BWSwitch_t; /** AID IE */ typedef MLAN_PACK_START struct _MrvlIETypes_AID_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** AID number */ - t_u16 AID; + t_u16 AID; } MLAN_PACK_END MrvlIETypes_AID_t; /** Operating Mode Notification IE */ typedef MLAN_PACK_START struct _MrvlIETypes_OperModeNtf_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** operating mdoe */ - t_u8 oper_mode; + t_u8 oper_mode; } MLAN_PACK_END MrvlIETypes_OperModeNtf_t; /** bf global args */ typedef struct MLAN_PACK_START _bf_global_cfg_args { /** Global enable/disable bf */ - t_u8 bf_enbl; + t_u8 bf_enbl; /** Global enable/disable sounding */ - t_u8 sounding_enbl; + t_u8 sounding_enbl; /** FB Type */ - t_u8 fb_type; + t_u8 fb_type; /** SNR Threshold */ - t_u8 snr_threshold; + t_u8 snr_threshold; /** Sounding interval */ - t_u16 sounding_interval; + t_u16 sounding_interval; /** BF mode */ - t_u8 bf_mode; + t_u8 bf_mode; /** Reserved */ - t_u8 reserved; + t_u8 reserved; } MLAN_PACK_END bf_global_cfg_args; /** bf_trigger_sound_args_t */ typedef MLAN_PACK_START struct _bf_trigger_sound_args_t { /** Peer MAC address */ - t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; + t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; /** Status */ - t_u8 status; + t_u8 status; } MLAN_PACK_END bf_trigger_sound_args_t; /** bf periodicity args */ typedef MLAN_PACK_START struct _bf_periodicity_args { /** Peer MAC address */ - t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; + t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; /** Current Tx BF Interval */ - t_u16 interval; + t_u16 interval; /** Status */ - t_u8 status; + t_u8 status; } MLAN_PACK_END bf_periodicity_args; /** bf peer configuration args */ typedef struct MLAN_PACK_START _bf_peer_args { /** Peer MAC address */ - t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; + t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; /** Reserved */ - t_u16 reserved; + t_u16 reserved; /** Enable/Disable Beamforming */ - t_u8 bf_enbl; + t_u8 bf_enbl; /** Enable/Disable sounding */ - t_u8 sounding_enbl; + t_u8 sounding_enbl; /** FB Type */ - t_u8 fb_type; + t_u8 fb_type; } MLAN_PACK_END bf_peer_args; /** bf_snr_thr_t */ typedef MLAN_PACK_START struct _bf_snr_thr_t { /** Peer MAC address */ - t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; + t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; /** SNR */ - t_u8 snr; + t_u8 snr; } MLAN_PACK_END bf_snr_thr_t; /** HostCmd_DS_TX_BF_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_TX_BF_CFG { - /* Beamforming action */ - t_u16 bf_action; - /* action - SET/GET */ - t_u16 action; - - MLAN_PACK_START union - { - bf_global_cfg_args bf_global_cfg; - bf_trigger_sound_args_t bf_sound_args; - bf_periodicity_args bf_periodicity; - bf_peer_args tx_bf_peer; - bf_snr_thr_t bf_snr; - } MLAN_PACK_END body; + /* Beamforming action */ + t_u16 bf_action; + /* action - SET/GET */ + t_u16 action; + + MLAN_PACK_START union + { + bf_global_cfg_args bf_global_cfg; + bf_trigger_sound_args_t bf_sound_args; + bf_periodicity_args bf_periodicity; + bf_peer_args tx_bf_peer; + bf_snr_thr_t bf_snr; + } MLAN_PACK_END body; } MLAN_PACK_END HostCmd_DS_TX_BF_CFG; #ifdef WIFI_DIRECT_SUPPORT @@ -3701,9 +3711,9 @@ typedef MLAN_PACK_START struct _HostCmd_DS_TX_BF_CFG typedef MLAN_PACK_START struct _MrvlIEtypes_psk_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** PSK */ - t_u8 psk[MLAN_MAX_KEY_LENGTH]; + t_u8 psk[MLAN_MAX_KEY_LENGTH]; } MLAN_PACK_END MrvlIEtypes_psk_t; #endif /* WIFI_DIRECT_SUPPORT */ @@ -3711,18 +3721,18 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_psk_t typedef MLAN_PACK_START struct _MrvlIEtypes_PMK_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** PMK */ - t_u8 pmk[1]; + t_u8 pmk[1]; } MLAN_PACK_END MrvlIEtypes_PMK_t; /** MrvlIEtypes_Passphrase_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_Passphrase_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Passphrase */ - char passphrase[1]; + char passphrase[1]; } MLAN_PACK_END MrvlIEtypes_Passphrase_t; /* unicastCipher - @@ -3742,14 +3752,14 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_Passphrase_t typedef MLAN_PACK_START struct _MrvlIEtypes_Cipher_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** PairCipher */ - t_u8 pair_cipher; + t_u8 pair_cipher; /** GroupCipher */ - t_u8 group_cipher; + t_u8 group_cipher; } MLAN_PACK_END MrvlIEtypes_Cipher_t; -/* rsnMode - +/* rsnMode - * Bit 0 : No RSN * Bit 1-2 : RFU * Bit 3 : WPA @@ -3762,18 +3772,18 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_Cipher_t typedef MLAN_PACK_START struct _MrvlIEtypes_EncrProto_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** EncrProto */ - t_u16 rsn_mode; + t_u16 rsn_mode; } MLAN_PACK_END MrvlIEtypes_EncrProto_t; /** MrvlIEtypes_Bssid_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_Bssid_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Bssid */ - t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; + t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; } MLAN_PACK_END MrvlIEtypes_Bssid_t; /* @@ -3785,11 +3795,11 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_Bssid_t typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SUPPLICANT_PMK { /** CMD Action GET/SET/CLEAR */ - t_u16 action; + t_u16 action; /** CacheResult initialized to 0 */ - t_u16 cache_result; + t_u16 cache_result; /** TLV Buffer */ - t_u8 tlv_buffer[1]; + t_u8 tlv_buffer[1]; /** MrvlIEtypes_SsidParamSet_t SsidParamSet; * MrvlIEtypes_PMK_t Pmk; * MrvlIEtypes_Passphrase_t Passphrase; @@ -3806,173 +3816,173 @@ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SUPPLICANT_PMK typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SUPPLICANT_PROFILE { /** GET/SET/GET_CURRENT */ - t_u16 action; + t_u16 action; /** Reserved */ - t_u16 reserved; + t_u16 reserved; /** TLVBuffer */ - t_u8 tlv_buf[1]; - /* MrvlIEtypes_EncrProto_t */ + t_u8 tlv_buf[1]; + /* MrvlIEtypes_EncrProto_t */ } MLAN_PACK_END HostCmd_DS_802_11_SUPPLICANT_PROFILE; /** HostCmd_CMD_802_11_RF_CHANNEL */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_RF_CHANNEL { /** Action */ - t_u16 action; + t_u16 action; /** Current channel */ - t_u16 current_channel; + t_u16 current_channel; /** RF type */ - t_u16 rf_type; + t_u16 rf_type; /** Reserved field */ - t_u16 reserved; + t_u16 reserved; #ifdef STA_SUPPORT /** Reserved */ - t_u8 reserved_1[32]; -#else /* STA_SUPPORT */ + t_u8 reserved_1[32]; +#else /* STA_SUPPORT */ /** List of channels */ - t_u8 channel_list[32]; -#endif /* !STA_SUPPORT */ + t_u8 channel_list[32]; +#endif /* !STA_SUPPORT */ } MLAN_PACK_END HostCmd_DS_802_11_RF_CHANNEL; /** HostCmd_DS_VERSION_EXT */ typedef MLAN_PACK_START struct _HostCmd_DS_VERSION_EXT { /** Selected version string */ - t_u8 version_str_sel; + t_u8 version_str_sel; /** Version string */ - char version_str[128]; + char version_str[128]; } MLAN_PACK_END HostCmd_DS_VERSION_EXT; /** HostCmd_CMD_802_11_RF_ANTENNA */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_RF_ANTENNA { /** Action for Tx antenna */ - t_u16 action_tx; + t_u16 action_tx; /** Tx antenna mode Bit0:1, Bit1:2, Bit0-1:1+2, 0xffff: diversity */ - t_u16 tx_antenna_mode; + t_u16 tx_antenna_mode; /** Action for Rx antenna */ - t_u16 action_rx; + t_u16 action_rx; /** Rx antenna mode Bit0:1, Bit1:2, Bit0-1:1+2, 0xffff: diversity */ - t_u16 rx_antenna_mode; + t_u16 rx_antenna_mode; } MLAN_PACK_END HostCmd_DS_802_11_RF_ANTENNA; /** HostCmd_DS_802_11_IBSS_STATUS */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_IBSS_STATUS { /** Action */ - t_u16 action; + t_u16 action; /** Enable */ - t_u16 enable; + t_u16 enable; /** BSSID */ - t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; + t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; /** Beacon interval */ - t_u16 beacon_interval; + t_u16 beacon_interval; /** ATIM window interval */ - t_u16 atim_window; + t_u16 atim_window; /** User G rate protection */ - t_u16 use_g_rate_protect; + t_u16 use_g_rate_protect; } MLAN_PACK_END HostCmd_DS_802_11_IBSS_STATUS; /** HostCmd_DS_MGMT_IE_LIST_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_MGMT_IE_LIST { /** Action */ - t_u16 action; + t_u16 action; /** Get/Set mgmt IE */ - mlan_ds_misc_custom_ie ds_mgmt_ie; + mlan_ds_misc_custom_ie ds_mgmt_ie; } MLAN_PACK_END HostCmd_DS_MGMT_IE_LIST_CFG; /** HostCmd_CMD_MAC_REG_ACCESS */ typedef MLAN_PACK_START struct _HostCmd_DS_MAC_REG_ACCESS { /** Action */ - t_u16 action; + t_u16 action; /** MAC register offset */ - t_u16 offset; + t_u16 offset; /** MAC register value */ - t_u32 value; + t_u32 value; } MLAN_PACK_END HostCmd_DS_MAC_REG_ACCESS; /** HostCmd_CMD_BBP_REG_ACCESS */ typedef MLAN_PACK_START struct _HostCmd_DS_BBP_REG_ACCESS { /** Acion */ - t_u16 action; + t_u16 action; /** BBP register offset */ - t_u16 offset; + t_u16 offset; /** BBP register value */ - t_u8 value; + t_u8 value; /** Reserved field */ - t_u8 reserved[3]; + t_u8 reserved[3]; } MLAN_PACK_END HostCmd_DS_BBP_REG_ACCESS; /** HostCmd_CMD_RF_REG_ACCESS */ typedef MLAN_PACK_START struct _HostCmd_DS_RF_REG_ACCESS { /** Action */ - t_u16 action; + t_u16 action; /** RF register offset */ - t_u16 offset; + t_u16 offset; /** RF register value */ - t_u8 value; + t_u8 value; /** Reserved field */ - t_u8 reserved[3]; + t_u8 reserved[3]; } MLAN_PACK_END HostCmd_DS_RF_REG_ACCESS; /** HostCmd_DS_802_11_EEPROM_ACCESS */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_EEPROM_ACCESS { - /** Action */ - t_u16 action; + /** Action */ + t_u16 action; - /** multiple 4 */ - t_u16 offset; - /** Number of bytes */ - t_u16 byte_count; - /** Value */ - t_u8 value; + /** multiple 4 */ + t_u16 offset; + /** Number of bytes */ + t_u16 byte_count; + /** Value */ + t_u8 value; } MLAN_PACK_END HostCmd_DS_802_11_EEPROM_ACCESS; /** HostCmd_DS_MEM_ACCESS */ typedef MLAN_PACK_START struct _HostCmd_DS_MEM_ACCESS { - /** Action */ - t_u16 action; - /** Reserved field */ - t_u16 reserved; - /** Address */ - t_u32 addr; - /** Value */ - t_u32 value; + /** Action */ + t_u16 action; + /** Reserved field */ + t_u16 reserved; + /** Address */ + t_u32 addr; + /** Value */ + t_u32 value; } MLAN_PACK_END HostCmd_DS_MEM_ACCESS; /** HostCmd_DS_SUBSCRIBE_EVENT */ typedef MLAN_PACK_START struct _HostCmd_DS_SUBSCRIBE_EVENT { /** Action */ - t_u16 action; + t_u16 action; /** Bitmap of subscribed events */ - t_u16 event_bitmap; + t_u16 event_bitmap; } MLAN_PACK_END HostCmd_DS_SUBSCRIBE_EVENT; /** HostCmd_DS_OTP_USER_DATA */ typedef MLAN_PACK_START struct _HostCmd_DS_OTP_USER_DATA { - /** Action */ - t_u16 action; - /** Reserved field */ - t_u16 reserved; - /** User data length */ - t_u16 user_data_length; - /** User data */ - t_u8 user_data[1]; + /** Action */ + t_u16 action; + /** Reserved field */ + t_u16 reserved; + /** User data length */ + t_u16 user_data_length; + /** User data */ + t_u8 user_data[1]; } MLAN_PACK_END HostCmd_DS_OTP_USER_DATA; /** HostCmd_CMD_HS_WAKEUP_REASON */ typedef MLAN_PACK_START struct _HostCmd_DS_HS_WAKEUP_REASON { /** wakeupReason: - * 0: unknown + * 0: unknown * 1: Broadcast data matched * 2: Multicast data matched * 3: Unicast data matched @@ -3981,45 +3991,45 @@ typedef MLAN_PACK_START struct _HostCmd_DS_HS_WAKEUP_REASON * 6: Non-maskable condition matched (EAPoL rekey) * 7: Magic pattern matched * Others: reserved. (set to 0) */ - t_u16 wakeup_reason; + t_u16 wakeup_reason; } MLAN_PACK_END HostCmd_DS_HS_WAKEUP_REASON; /** MrvlIEtypes_HsWakeHoldoff_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_HsWakeHoldoff_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Minimum delay between HsActive and HostWake (in msec) */ - t_u16 min_wake_holdoff; + t_u16 min_wake_holdoff; } MLAN_PACK_END MrvlIEtypes_HsWakeHoldoff_t; /** HostCmd_DS_INACTIVITY_TIMEOUT_EXT */ typedef MLAN_PACK_START struct _HostCmd_DS_INACTIVITY_TIMEOUT_EXT { /** ACT_GET/ACT_SET */ - t_u16 action; + t_u16 action; /** uS, 0 means 1000uS(1ms) */ - t_u16 timeout_unit; + t_u16 timeout_unit; /** Inactivity timeout for unicast data */ - t_u16 unicast_timeout; + t_u16 unicast_timeout; /** Inactivity timeout for multicast data */ - t_u16 mcast_timeout; + t_u16 mcast_timeout; /** Timeout for additional RX traffic after Null PM1 packet exchange */ - t_u16 ps_entry_timeout; + t_u16 ps_entry_timeout; /** Reserved to further expansion */ - t_u16 reserved; + t_u16 reserved; } MLAN_PACK_END HostCmd_DS_INACTIVITY_TIMEOUT_EXT; /** TLV type : STA Mac address */ -#define TLV_TYPE_STA_MAC_ADDRESS (PROPRIETARY_TLV_BASE_ID + 0x20) // 0x0120 +#define TLV_TYPE_STA_MAC_ADDRESS (PROPRIETARY_TLV_BASE_ID + 0x20) // 0x0120 /** MrvlIEtypes_MacAddr_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_MacAddr_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** mac address */ - t_u8 mac[MLAN_MAC_ADDR_LENGTH]; + t_u8 mac[MLAN_MAC_ADDR_LENGTH]; } MLAN_PACK_END MrvlIEtypes_MacAddr_t; /** Assoc Request */ @@ -4039,236 +4049,236 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_MacAddr_t #ifdef UAP_SUPPORT /** TLV type : AP Channel band Config */ -#define TLV_TYPE_UAP_CHAN_BAND_CONFIG (PROPRIETARY_TLV_BASE_ID + 0x2a) // 0x012a +#define TLV_TYPE_UAP_CHAN_BAND_CONFIG (PROPRIETARY_TLV_BASE_ID + 0x2a) // 0x012a /** TLV type : AP Mac address */ -#define TLV_TYPE_UAP_MAC_ADDRESS (PROPRIETARY_TLV_BASE_ID + 0x2b) // 0x012b +#define TLV_TYPE_UAP_MAC_ADDRESS (PROPRIETARY_TLV_BASE_ID + 0x2b) // 0x012b /** TLV type : AP Beacon period */ -#define TLV_TYPE_UAP_BEACON_PERIOD (PROPRIETARY_TLV_BASE_ID + 0x2c) // 0x012c +#define TLV_TYPE_UAP_BEACON_PERIOD (PROPRIETARY_TLV_BASE_ID + 0x2c) // 0x012c /** TLV type : AP DTIM period */ -#define TLV_TYPE_UAP_DTIM_PERIOD (PROPRIETARY_TLV_BASE_ID + 0x2d) // 0x012d +#define TLV_TYPE_UAP_DTIM_PERIOD (PROPRIETARY_TLV_BASE_ID + 0x2d) // 0x012d /** TLV type : AP Tx power */ -#define TLV_TYPE_UAP_TX_POWER (PROPRIETARY_TLV_BASE_ID + 0x2f) // 0x012f +#define TLV_TYPE_UAP_TX_POWER (PROPRIETARY_TLV_BASE_ID + 0x2f) // 0x012f /** TLV type : AP SSID broadcast control */ -#define TLV_TYPE_UAP_BCAST_SSID_CTL (PROPRIETARY_TLV_BASE_ID + 0x30) // 0x0130 +#define TLV_TYPE_UAP_BCAST_SSID_CTL (PROPRIETARY_TLV_BASE_ID + 0x30) // 0x0130 /** TLV type : AP Preamble control */ -#define TLV_TYPE_UAP_PREAMBLE_CTL (PROPRIETARY_TLV_BASE_ID + 0x31) // 0x0131 +#define TLV_TYPE_UAP_PREAMBLE_CTL (PROPRIETARY_TLV_BASE_ID + 0x31) // 0x0131 /** TLV type : AP Antenna control */ -#define TLV_TYPE_UAP_ANTENNA_CTL (PROPRIETARY_TLV_BASE_ID + 0x32) // 0x0132 +#define TLV_TYPE_UAP_ANTENNA_CTL (PROPRIETARY_TLV_BASE_ID + 0x32) // 0x0132 /** TLV type : AP RTS threshold */ -#define TLV_TYPE_UAP_RTS_THRESHOLD (PROPRIETARY_TLV_BASE_ID + 0x33) // 0x0133 +#define TLV_TYPE_UAP_RTS_THRESHOLD (PROPRIETARY_TLV_BASE_ID + 0x33) // 0x0133 /** TLV type : AP Tx data rate */ -#define TLV_TYPE_UAP_TX_DATA_RATE (PROPRIETARY_TLV_BASE_ID + 0x35) // 0x0135 +#define TLV_TYPE_UAP_TX_DATA_RATE (PROPRIETARY_TLV_BASE_ID + 0x35) // 0x0135 /** TLV type: AP Packet forwarding control */ -#define TLV_TYPE_UAP_PKT_FWD_CTL (PROPRIETARY_TLV_BASE_ID + 0x36) // 0x0136 +#define TLV_TYPE_UAP_PKT_FWD_CTL (PROPRIETARY_TLV_BASE_ID + 0x36) // 0x0136 /** TLV type: STA information */ -#define TLV_TYPE_UAP_STA_INFO (PROPRIETARY_TLV_BASE_ID + 0x37) // 0x0137 +#define TLV_TYPE_UAP_STA_INFO (PROPRIETARY_TLV_BASE_ID + 0x37) // 0x0137 /** TLV type: AP STA MAC address filter */ -#define TLV_TYPE_UAP_STA_MAC_ADDR_FILTER (PROPRIETARY_TLV_BASE_ID + 0x38) // 0x0138 +#define TLV_TYPE_UAP_STA_MAC_ADDR_FILTER (PROPRIETARY_TLV_BASE_ID + 0x38) // 0x0138 /** TLV type: AP STA ageout timer */ -#define TLV_TYPE_UAP_STA_AGEOUT_TIMER (PROPRIETARY_TLV_BASE_ID + 0x39) // 0x0139 +#define TLV_TYPE_UAP_STA_AGEOUT_TIMER (PROPRIETARY_TLV_BASE_ID + 0x39) // 0x0139 /** TLV type: AP WEP keys */ -#define TLV_TYPE_UAP_WEP_KEY (PROPRIETARY_TLV_BASE_ID + 0x3b) // 0x013b +#define TLV_TYPE_UAP_WEP_KEY (PROPRIETARY_TLV_BASE_ID + 0x3b) // 0x013b /** TLV type: AP WPA passphrase */ -#define TLV_TYPE_UAP_WPA_PASSPHRASE (PROPRIETARY_TLV_BASE_ID + 0x3c) // 0x013c +#define TLV_TYPE_UAP_WPA_PASSPHRASE (PROPRIETARY_TLV_BASE_ID + 0x3c) // 0x013c /** TLV type: AP protocol */ -#define TLV_TYPE_UAP_ENCRYPT_PROTOCOL (PROPRIETARY_TLV_BASE_ID + 0x40) // 0x0140 +#define TLV_TYPE_UAP_ENCRYPT_PROTOCOL (PROPRIETARY_TLV_BASE_ID + 0x40) // 0x0140 /** TLV type: AP AKMP */ -#define TLV_TYPE_UAP_AKMP (PROPRIETARY_TLV_BASE_ID + 0x41) // 0x0141 +#define TLV_TYPE_UAP_AKMP (PROPRIETARY_TLV_BASE_ID + 0x41) // 0x0141 /** TLV type: AP Fragment threshold */ -#define TLV_TYPE_UAP_FRAG_THRESHOLD (PROPRIETARY_TLV_BASE_ID + 0x46) // 0x0146 +#define TLV_TYPE_UAP_FRAG_THRESHOLD (PROPRIETARY_TLV_BASE_ID + 0x46) // 0x0146 /** TLV type: AP Group rekey timer */ -#define TLV_TYPE_UAP_GRP_REKEY_TIME (PROPRIETARY_TLV_BASE_ID + 0x47) // 0x0147 +#define TLV_TYPE_UAP_GRP_REKEY_TIME (PROPRIETARY_TLV_BASE_ID + 0x47) // 0x0147 /**TLV type : AP Max Station number */ -#define TLV_TYPE_UAP_MAX_STA_CNT (PROPRIETARY_TLV_BASE_ID + 0x55) // 0x0155 +#define TLV_TYPE_UAP_MAX_STA_CNT (PROPRIETARY_TLV_BASE_ID + 0x55) // 0x0155 /**TLV type : AP Retry limit */ -#define TLV_TYPE_UAP_RETRY_LIMIT (PROPRIETARY_TLV_BASE_ID + 0x5d) // 0x015d +#define TLV_TYPE_UAP_RETRY_LIMIT (PROPRIETARY_TLV_BASE_ID + 0x5d) // 0x015d /** TLV type : AP MCBC data rate */ -#define TLV_TYPE_UAP_MCBC_DATA_RATE (PROPRIETARY_TLV_BASE_ID + 0x62) // 0x0162 +#define TLV_TYPE_UAP_MCBC_DATA_RATE (PROPRIETARY_TLV_BASE_ID + 0x62) // 0x0162 /**TLV type: AP RSN replay protection */ -#define TLV_TYPE_UAP_RSN_REPLAY_PROTECT (PROPRIETARY_TLV_BASE_ID + 0x64) // 0x0164 +#define TLV_TYPE_UAP_RSN_REPLAY_PROTECT (PROPRIETARY_TLV_BASE_ID + 0x64) // 0x0164 /** TLV ID : Management Frame */ -#define TLV_TYPE_UAP_MGMT_FRAME (PROPRIETARY_TLV_BASE_ID + 0x68) // 0x0168 +#define TLV_TYPE_UAP_MGMT_FRAME (PROPRIETARY_TLV_BASE_ID + 0x68) // 0x0168 #ifdef UAP_SUPPORT /**TLV type: AP mgmt IE passthru mask */ -#define TLV_TYPE_UAP_MGMT_IE_PASSTHRU_MASK (PROPRIETARY_TLV_BASE_ID + 0x70) // 0x0170 +#define TLV_TYPE_UAP_MGMT_IE_PASSTHRU_MASK (PROPRIETARY_TLV_BASE_ID + 0x70) // 0x0170 #endif /** TLV : 20/40 coex config */ -#define TLV_TYPE_2040_BSS_COEX_CONTROL (PROPRIETARY_TLV_BASE_ID + 0x98) // 0x0198 +#define TLV_TYPE_2040_BSS_COEX_CONTROL (PROPRIETARY_TLV_BASE_ID + 0x98) // 0x0198 /**TLV type: AP pairwise handshake timeout */ -#define TLV_TYPE_UAP_EAPOL_PWK_HSK_TIMEOUT (PROPRIETARY_TLV_BASE_ID + 0x75) // 0x0175 +#define TLV_TYPE_UAP_EAPOL_PWK_HSK_TIMEOUT (PROPRIETARY_TLV_BASE_ID + 0x75) // 0x0175 /**TLV type: AP pairwise handshake retries */ -#define TLV_TYPE_UAP_EAPOL_PWK_HSK_RETRIES (PROPRIETARY_TLV_BASE_ID + 0x76) // 0x0176 +#define TLV_TYPE_UAP_EAPOL_PWK_HSK_RETRIES (PROPRIETARY_TLV_BASE_ID + 0x76) // 0x0176 /**TLV type: AP groupwise handshake timeout */ -#define TLV_TYPE_UAP_EAPOL_GWK_HSK_TIMEOUT (PROPRIETARY_TLV_BASE_ID + 0x77) // 0x0177 +#define TLV_TYPE_UAP_EAPOL_GWK_HSK_TIMEOUT (PROPRIETARY_TLV_BASE_ID + 0x77) // 0x0177 /**TLV type: AP groupwise handshake retries */ -#define TLV_TYPE_UAP_EAPOL_GWK_HSK_RETRIES (PROPRIETARY_TLV_BASE_ID + 0x78) // 0x0178 +#define TLV_TYPE_UAP_EAPOL_GWK_HSK_RETRIES (PROPRIETARY_TLV_BASE_ID + 0x78) // 0x0178 /** TLV type: AP PS STA ageout timer */ -#define TLV_TYPE_UAP_PS_STA_AGEOUT_TIMER (PROPRIETARY_TLV_BASE_ID + 0x7b) // 0x017b +#define TLV_TYPE_UAP_PS_STA_AGEOUT_TIMER (PROPRIETARY_TLV_BASE_ID + 0x7b) // 0x017b /** TLV type : Pairwise Cipher */ -#define TLV_TYPE_PWK_CIPHER (PROPRIETARY_TLV_BASE_ID + 0x91) // 0x0191 +#define TLV_TYPE_PWK_CIPHER (PROPRIETARY_TLV_BASE_ID + 0x91) // 0x0191 /** TLV type : Group Cipher */ -#define TLV_TYPE_GWK_CIPHER (PROPRIETARY_TLV_BASE_ID + 0x92) // 0x0192 +#define TLV_TYPE_GWK_CIPHER (PROPRIETARY_TLV_BASE_ID + 0x92) // 0x0192 /** TLV type : BSS Status */ -#define TLV_TYPE_BSS_STATUS (PROPRIETARY_TLV_BASE_ID + 0x93) // 0x0193 +#define TLV_TYPE_BSS_STATUS (PROPRIETARY_TLV_BASE_ID + 0x93) // 0x0193 #ifdef WIFI_DIRECT_SUPPORT /** TLV type : AP PSK */ -#define TLV_TYPE_UAP_PSK (PROPRIETARY_TLV_BASE_ID + 0xa8) // 0x01a8 +#define TLV_TYPE_UAP_PSK (PROPRIETARY_TLV_BASE_ID + 0xa8) // 0x01a8 #endif /* WIFI_DIRECT_SUPPORT */ /** MrvlIEtypes_beacon_period_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_beacon_period_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** beacon period */ - t_u16 beacon_period; + t_u16 beacon_period; } MLAN_PACK_END MrvlIEtypes_beacon_period_t; /** MrvlIEtypes_dtim_period_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_dtim_period_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** DTIM period */ - t_u8 dtim_period; + t_u8 dtim_period; } MLAN_PACK_END MrvlIEtypes_dtim_period_t; /** MrvlIEtypes_tx_rate_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_tx_rate_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** tx data rate */ - t_u16 tx_data_rate; + t_u16 tx_data_rate; } MLAN_PACK_END MrvlIEtypes_tx_rate_t; /** MrvlIEtypes_mcbc_rate_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_mcbc_rate_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** mcbc data rate */ - t_u16 mcbc_data_rate; + t_u16 mcbc_data_rate; } MLAN_PACK_END MrvlIEtypes_mcbc_rate_t; /** MrvlIEtypes_tx_power_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_tx_power_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** tx power */ - t_u8 tx_power; + t_u8 tx_power; } MLAN_PACK_END MrvlIEtypes_tx_power_t; /** MrvlIEtypes_bcast_ssid_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_bcast_ssid_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** bcast ssid control*/ - t_u8 bcast_ssid_ctl; + t_u8 bcast_ssid_ctl; } MLAN_PACK_END MrvlIEtypes_bcast_ssid_t; /** MrvlIEtypes_antenna_mode_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_antenna_mode_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** which antenna */ - t_u8 which_antenna; + t_u8 which_antenna; /** antenna mode*/ - t_u8 antenna_mode; + t_u8 antenna_mode; } MLAN_PACK_END MrvlIEtypes_antenna_mode_t; /** MrvlIEtypes_pkt_forward_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_pkt_forward_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** pkt foward control */ - t_u8 pkt_forward_ctl; + t_u8 pkt_forward_ctl; } MLAN_PACK_END MrvlIEtypes_pkt_forward_t; /** MrvlIEtypes_max_sta_count_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_max_sta_count_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** max station count */ - t_u16 max_sta_count; + t_u16 max_sta_count; } MLAN_PACK_END MrvlIEtypes_max_sta_count_t; /** MrvlIEtypes_sta_ageout_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_sta_ageout_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** station age out timer */ - t_u32 sta_ageout_timer; + t_u32 sta_ageout_timer; } MLAN_PACK_END MrvlIEtypes_sta_ageout_t; /** MrvlIEtypes_rts_threshold_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_rts_threshold_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** rts threshold */ - t_u16 rts_threshold; + t_u16 rts_threshold; } MLAN_PACK_END MrvlIEtypes_rts_threshold_t; /** MrvlIEtypes_frag_threshold_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_frag_threshold_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** frag threshold */ - t_u16 frag_threshold; + t_u16 frag_threshold; } MLAN_PACK_END MrvlIEtypes_frag_threshold_t; /** MrvlIEtypes_retry_limit_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_retry_limit_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** retry limit */ - t_u8 retry_limit; + t_u8 retry_limit; } MLAN_PACK_END MrvlIEtypes_retry_limit_t; /** MrvlIEtypes_eapol_pwk_hsk_timeout_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_eapol_pwk_hsk_timeout_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** pairwise update timeout in milliseconds */ - t_u32 pairwise_update_timeout; + t_u32 pairwise_update_timeout; } MLAN_PACK_END MrvlIEtypes_eapol_pwk_hsk_timeout_t; /** MrvlIEtypes_eapol_pwk_hsk_retries_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_eapol_pwk_hsk_retries_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** pairwise handshake retries */ - t_u32 pwk_retries; + t_u32 pwk_retries; } MLAN_PACK_END MrvlIEtypes_eapol_pwk_hsk_retries_t; /** MrvlIEtypes_eapol_gwk_hsk_timeout_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_eapol_gwk_hsk_timeout_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** groupwise update timeout in milliseconds */ - t_u32 groupwise_update_timeout; + t_u32 groupwise_update_timeout; } MLAN_PACK_END MrvlIEtypes_eapol_gwk_hsk_timeout_t; /** MrvlIEtypes_eapol_gwk_hsk_retries_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_eapol_gwk_hsk_retries_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** groupwise handshake retries */ - t_u32 gwk_retries; + t_u32 gwk_retries; } MLAN_PACK_END MrvlIEtypes_eapol_gwk_hsk_retries_t; #ifdef UAP_SUPPORT @@ -4276,9 +4286,9 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_eapol_gwk_hsk_retries_t typedef MLAN_PACK_START struct _MrvlIEtypes_mgmt_ie_passthru_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** mgmt IE mask value */ - t_u32 mgmt_ie_mask; + t_u32 mgmt_ie_mask; } MLAN_PACK_END MrvlIEtypes_mgmt_ie_passthru_t; #endif @@ -4286,22 +4296,22 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_mgmt_ie_passthru_t typedef MLAN_PACK_START struct _MrvlIEtypes_2040_coex_enable_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Enable */ - t_u8 enable_2040coex; + t_u8 enable_2040coex; } MLAN_PACK_END MrvlIEtypes_2040_coex_enable_t; /** MrvlIEtypes_mac_filter_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_mac_filter_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Filter mode */ - t_u8 filter_mode; + t_u8 filter_mode; /** Number of STA MACs */ - t_u8 count; + t_u8 count; /** STA MAC addresses buffer */ - t_u8 mac_address[1]; + t_u8 mac_address[1]; } MLAN_PACK_END MrvlIEtypes_mac_filter_t; /** setting for band_config - band=5GHZ */ @@ -4311,279 +4321,279 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_mac_filter_t typedef MLAN_PACK_START struct _MrvlIEtypes_channel_band_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Band Configuration * * [7-6] Channel Selection Mode; 00 manual, 01 ACS * [3-2] Channel Width; 00 20 MHz * [1-0] Band Info; 00 2.4 GHz */ - t_u8 band_config; + t_u8 band_config; /** channel */ - t_u8 channel; + t_u8 channel; } MLAN_PACK_END MrvlIEtypes_channel_band_t; /** MrvlIEtypes_auth_type_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_auth_type_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Authentication type */ - t_u8 auth_type; + t_u8 auth_type; } MLAN_PACK_END MrvlIEtypes_auth_type_t; /** MrvlIEtypes_encrypt_protocol_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_encrypt_protocol_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** encryption protocol */ - t_u16 protocol; + t_u16 protocol; } MLAN_PACK_END MrvlIEtypes_encrypt_protocol_t; /** MrvlIEtypes_pwk_cipher_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_pwk_cipher_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** protocol */ - t_u16 protocol; + t_u16 protocol; /** pairwise cipher */ - t_u8 pairwise_cipher; + t_u8 pairwise_cipher; /** reserved */ - t_u8 reserved; + t_u8 reserved; } MLAN_PACK_END MrvlIEtypes_pwk_cipher_t; /** MrvlIEtypes_gwk_cipher_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_gwk_cipher_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** group cipher */ - t_u8 group_cipher; + t_u8 group_cipher; /** reserved */ - t_u8 reserved; + t_u8 reserved; } MLAN_PACK_END MrvlIEtypes_gwk_cipher_t; /** MrvlIEtypes_akmp_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_akmp_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** key management */ - t_u16 key_mgmt; + t_u16 key_mgmt; /** key management operation */ - t_u16 key_mgmt_operation; + t_u16 key_mgmt_operation; } MLAN_PACK_END MrvlIEtypes_akmp_t; /** MrvlIEtypes_passphrase_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_passphrase_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** passphrase */ - t_u8 passphrase[1]; + t_u8 passphrase[1]; } MLAN_PACK_END MrvlIEtypes_passphrase_t; /** MrvlIEtypes_rsn_replay_prot_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_rsn_replay_prot_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** rsn replay proection */ - t_u8 rsn_replay_prot; + t_u8 rsn_replay_prot; } MLAN_PACK_END MrvlIEtypes_rsn_replay_prot_t; /** MrvlIEtypes_group_rekey_time_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_group_rekey_time_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** group key rekey time */ - t_u32 gk_rekey_time; + t_u32 gk_rekey_time; } MLAN_PACK_END MrvlIEtypes_group_rekey_time_t; /** MrvlIEtypes_wep_key_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_wep_key_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** key index */ - t_u8 key_index; + t_u8 key_index; /** is default */ - t_u8 is_default; + t_u8 is_default; /** key data */ - t_u8 key[1]; + t_u8 key[1]; } MLAN_PACK_END MrvlIEtypes_wep_key_t; /** MrvlIEtypes_bss_status_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_bss_status_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** BSS status, READ only */ - t_u16 bss_status; + t_u16 bss_status; } MLAN_PACK_END MrvlIEtypes_bss_status_t; /** MrvlIEtypes_preamble_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_preamble_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** preamble type, READ only */ - t_u8 preamble_type; + t_u8 preamble_type; } MLAN_PACK_END MrvlIEtypes_preamble_t; /** MrvlIEtypes_wmm_parameter_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_wmm_parameter_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** WMM parameter */ - WmmParameter_t wmm_para; + WmmParameter_t wmm_para; } MLAN_PACK_END MrvlIEtypes_wmm_parameter_t; /** SNMP_MIB_UAP_INDEX */ typedef enum _SNMP_MIB_UAP_INDEX { - tkip_mic_failures = 0x0b, - ccmp_decrypt_errors = 0x0c, - wep_undecryptable_count = 0x0d, - wep_icv_error_count = 0x0e, - decrypt_failure_count = 0xf, - dot11_failed_count = 0x12, - dot11_retry_count = 0x13, - dot11_multi_retry_count = 0x14, - dot11_frame_dup_count = 0x15, - dot11_rts_success_count = 0x16, - dot11_rts_failure_count = 0x17, - dot11_ack_failure_count = 0x18, - dot11_rx_fragment_count = 0x19, - dot11_mcast_rx_frame_count = 0x1a, - dot11_fcs_error_count = 0x1b, - dot11_tx_frame_count = 0x1c, - dot11_rsna_tkip_cm_invoked = 0x1d, - dot11_rsna_4way_hshk_failures = 0x1e, - dot11_mcast_tx_count = 0x1f, + tkip_mic_failures = 0x0b, + ccmp_decrypt_errors = 0x0c, + wep_undecryptable_count = 0x0d, + wep_icv_error_count = 0x0e, + decrypt_failure_count = 0xf, + dot11_failed_count = 0x12, + dot11_retry_count = 0x13, + dot11_multi_retry_count = 0x14, + dot11_frame_dup_count = 0x15, + dot11_rts_success_count = 0x16, + dot11_rts_failure_count = 0x17, + dot11_ack_failure_count = 0x18, + dot11_rx_fragment_count = 0x19, + dot11_mcast_rx_frame_count = 0x1a, + dot11_fcs_error_count = 0x1b, + dot11_tx_frame_count = 0x1c, + dot11_rsna_tkip_cm_invoked = 0x1d, + dot11_rsna_4way_hshk_failures = 0x1e, + dot11_mcast_tx_count = 0x1f, } SNMP_MIB_UAP_INDEX; /** MrvlIEtypes_snmp_oid_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_snmp_oid_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** data */ - t_u32 data; + t_u32 data; } MLAN_PACK_END MrvlIEtypes_snmp_oid_t; /** HostCmd_SYS_CONFIG */ typedef MLAN_PACK_START struct _HostCmd_DS_SYS_CONFIG { - /** CMD Action GET/SET*/ - t_u16 action; - /** Tlv buffer */ - t_u8 tlv_buffer[1]; + /** CMD Action GET/SET*/ + t_u16 action; + /** Tlv buffer */ + t_u8 tlv_buffer[1]; } MLAN_PACK_END HostCmd_DS_SYS_CONFIG; /** HostCmd_SYS_CONFIG */ typedef MLAN_PACK_START struct _HostCmd_DS_SYS_INFO { /** sys info */ - t_u8 sys_info[64]; + t_u8 sys_info[64]; } MLAN_PACK_END HostCmd_DS_SYS_INFO; /** HostCmd_DS_STA_DEAUTH */ typedef MLAN_PACK_START struct _HostCmd_DS_STA_DEAUTH { /** mac address */ - t_u8 mac[MLAN_MAC_ADDR_LENGTH]; + t_u8 mac[MLAN_MAC_ADDR_LENGTH]; /** reason code */ - t_u16 reason; + t_u16 reason; } MLAN_PACK_END HostCmd_DS_STA_DEAUTH; /** Host Command id: POWER_MGMT */ #define HOST_CMD_POWER_MGMT_EXT 0x00ef /** TLV type: AP Sleep param */ -#define TLV_TYPE_AP_SLEEP_PARAM (PROPRIETARY_TLV_BASE_ID + 0x6a) // 0x016a +#define TLV_TYPE_AP_SLEEP_PARAM (PROPRIETARY_TLV_BASE_ID + 0x6a) // 0x016a /** TLV type: AP Inactivity Sleep param */ -#define TLV_TYPE_AP_INACT_SLEEP_PARAM (PROPRIETARY_TLV_BASE_ID + 0x6b) // 0x016b +#define TLV_TYPE_AP_INACT_SLEEP_PARAM (PROPRIETARY_TLV_BASE_ID + 0x6b) // 0x016b /** MrvlIEtypes_sleep_param_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_sleep_param_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** control bitmap */ - t_u32 ctrl_bitmap; + t_u32 ctrl_bitmap; /** min_sleep */ - t_u32 min_sleep; + t_u32 min_sleep; /** max_sleep */ - t_u32 max_sleep; + t_u32 max_sleep; } MLAN_PACK_END MrvlIEtypes_sleep_param_t; /** MrvlIEtypes_inact_sleep_param_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_inact_sleep_param_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** inactivity timeout */ - t_u32 inactivity_to; + t_u32 inactivity_to; /** min_awake */ - t_u32 min_awake; + t_u32 min_awake; /** max_awake */ - t_u32 max_awake; + t_u32 max_awake; } MLAN_PACK_END MrvlIEtypes_inact_sleep_param_t; /** HostCmd_DS_POWER_MGMT */ typedef MLAN_PACK_START struct _HostCmd_DS_POWER_MGMT_EXT { /** CMD Action Get/Set*/ - t_u16 action; + t_u16 action; /** power mode */ - t_u16 power_mode; + t_u16 power_mode; } MLAN_PACK_END HostCmd_DS_POWER_MGMT_EXT; /** MrvlIEtypes_ps_sta_ageout_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_ps_sta_ageout_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** station age out timer */ - t_u32 ps_sta_ageout_timer; + t_u32 ps_sta_ageout_timer; } MLAN_PACK_END MrvlIEtypes_ps_sta_ageout_t; /** MrvlIEtypes_sta_info_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_sta_info_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** STA MAC address */ - t_u8 mac_address[MLAN_MAC_ADDR_LENGTH]; + t_u8 mac_address[MLAN_MAC_ADDR_LENGTH]; /** Power mfg status */ - t_u8 power_mfg_status; + t_u8 power_mfg_status; /** RSSI */ - t_s8 rssi; + t_s8 rssi; } MLAN_PACK_END MrvlIEtypes_sta_info_t; /** HostCmd_DS_STA_LIST */ typedef MLAN_PACK_START struct _HostCmd_DS_STA_LIST { /** Number of STAs */ - t_u16 sta_count; - /* MrvlIEtypes_sta_info_t sta_info[0]; */ + t_u16 sta_count; + /* MrvlIEtypes_sta_info_t sta_info[0]; */ } MLAN_PACK_END HostCmd_DS_STA_LIST; /** TLV ID : WAPI Information */ -#define TLV_TYPE_AP_WAPI_INFO (PROPRIETARY_TLV_BASE_ID + 0x67) // 0x0167 +#define TLV_TYPE_AP_WAPI_INFO (PROPRIETARY_TLV_BASE_ID + 0x67) // 0x0167 /** MrvlIEtypes_sta_info_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_wapi_info_t { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Multicast PN */ - t_u8 multicast_PN[16]; + t_u8 multicast_PN[16]; } MLAN_PACK_END MrvlIEtypes_wapi_info_t; #endif /* UAP_SUPPORT */ @@ -4592,11 +4602,12 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_wapi_info_t */ typedef MLAN_PACK_START struct { - MrvlIEtypesHeader_t header; /**< Marvell TLV header: ID/Len */ - t_u8 chan; /**< Channel local constraint applies to */ + MrvlIEtypesHeader_t header; + /**< Marvell TLV header: ID/Len */ + t_u8 chan; /**< Channel local constraint applies to */ /** Power constraint included in beacons and used by fw to offset 11d info */ - t_u8 constraint; + t_u8 constraint; } MLAN_PACK_END MrvlIEtypes_LocalPowerConstraint_t; @@ -4609,480 +4620,490 @@ typedef MLAN_PACK_START struct /** TPC Info structure sent in CMD_802_11_TPC_INFO command to firmware */ typedef MLAN_PACK_START struct { - MrvlIEtypes_LocalPowerConstraint_t local_constraint; /**< Local constraint */ - MrvlIEtypes_PowerCapability_t power_cap; /**< Power Capability */ + MrvlIEtypes_LocalPowerConstraint_t local_constraint; + /**< Local constraint */ + MrvlIEtypes_PowerCapability_t power_cap; /**< Power Capability */ } MLAN_PACK_END HostCmd_DS_802_11_TPC_INFO; /** TPC Request structure sent in CMD_802_11_TPC_ADAPT_REQ command to firmware */ typedef MLAN_PACK_START struct { - t_u8 dest_mac[MLAN_MAC_ADDR_LENGTH]; /**< Destination STA address */ - t_u16 timeout; /**< Response timeout in ms */ - t_u8 rate_index; /**< IEEE Rate index to send request */ + t_u8 dest_mac[MLAN_MAC_ADDR_LENGTH]; /**< Destination STA address */ + t_u16 timeout; /**< Response timeout in ms */ + t_u8 rate_index; /**< IEEE Rate index to send request */ } MLAN_PACK_END HostCmd_TpcRequest; /** TPC Response structure received from the CMD_802_11_TPC_ADAPT_REQ command */ typedef MLAN_PACK_START struct { - t_u8 tpc_ret_code; /**< Firmware command result status code */ - t_s8 tx_power; /**< Reported TX Power from the TPC Report element */ - t_s8 link_margin; /**< Reported link margin from the TPC Report element */ - t_s8 rssi; /**< RSSI of the received TPC Report frame */ + t_u8 tpc_ret_code; /**< Firmware command result status code */ + t_s8 tx_power; /**< Reported TX Power from the TPC Report element */ + t_s8 link_margin; /**< Reported link margin from the TPC Report element */ + t_s8 rssi; /**< RSSI of the received TPC Report frame */ } MLAN_PACK_END HostCmd_TpcResponse; /** CMD_802_11_TPC_ADAPT_REQ substruct. Union of the TPC request and response */ typedef MLAN_PACK_START union { - HostCmd_TpcRequest req; /**< Request struct sent to firmware */ - HostCmd_TpcResponse resp; /**< Response struct received from firmware */ + HostCmd_TpcRequest req; + /**< Request struct sent to firmware */ + HostCmd_TpcResponse resp; + /**< Response struct received from firmware */ } MLAN_PACK_END HostCmd_DS_802_11_TPC_ADAPT_REQ; /** CMD_802_11_CHAN_SW_ANN firmware command substructure */ typedef MLAN_PACK_START struct { - t_u8 switch_mode; /**< Set to 1 for a quiet switch request, no STA tx */ - t_u8 new_chan; /**< Requested new channel */ - t_u8 switch_count; /**< Number of TBTTs until the switch is to occur */ + t_u8 switch_mode; + /**< Set to 1 for a quiet switch request, no STA tx */ + t_u8 new_chan; /**< Requested new channel */ + t_u8 switch_count; + /**< Number of TBTTs until the switch is to occur */ } MLAN_PACK_END HostCmd_DS_802_11_CHAN_SW_ANN; -/** - * @brief Enumeration of measurement types, including max supported +/** + * @brief Enumeration of measurement types, including max supported * enum for 11h/11k */ typedef MLAN_PACK_START enum _MeasType_t { - WLAN_MEAS_BASIC = 0, /**< 11h: Basic */ - WLAN_MEAS_NUM_TYPES, /**< Number of enumerated measurements */ - WLAN_MEAS_11H_MAX_TYPE = WLAN_MEAS_BASIC, /**< Max 11h measurement */ + WLAN_MEAS_BASIC = 0, /**< 11h: Basic */ + WLAN_MEAS_NUM_TYPES, /**< Number of enumerated measurements */ + WLAN_MEAS_11H_MAX_TYPE = WLAN_MEAS_BASIC, /**< Max 11h measurement */ } MLAN_PACK_END MeasType_t; -/** +/** * @brief Mode octet of the measurement request element (7.3.2.21) */ typedef MLAN_PACK_START struct { #ifdef BIG_ENDIAN_SUPPORT - t_u8 rsvd5_7:3; /**< Reserved */ - t_u8 duration_mandatory:1; /**< 11k: duration spec. for meas. is mandatory */ - t_u8 report:1; /**< 11h: en/disable report rcpt. of spec. type */ - t_u8 request:1; /**< 11h: en/disable requests of specified type */ - t_u8 enable:1; /**< 11h: enable report/request bits */ - t_u8 parallel:1; /**< 11k: series or parallel with previous meas */ + t_u8 rsvd5_7:3; /**< Reserved */ + t_u8 duration_mandatory:1;/**< 11k: duration spec. for meas. is mandatory */ + t_u8 report:1; /**< 11h: en/disable report rcpt. of spec. type */ + t_u8 request:1; /**< 11h: en/disable requests of specified type */ + t_u8 enable:1; /**< 11h: enable report/request bits */ + t_u8 parallel:1; /**< 11k: series or parallel with previous meas */ #else - t_u8 parallel:1; /**< 11k: series or parallel with previous meas */ - t_u8 enable:1; /**< 11h: enable report/request bits */ - t_u8 request:1; /**< 11h: en/disable requests of specified type */ - t_u8 report:1; /**< 11h: en/disable report rcpt. of spec. type */ - t_u8 duration_mandatory:1; /**< 11k: duration spec. for meas. is mandatory */ - t_u8 rsvd5_7:3; /**< Reserved */ -#endif /* BIG_ENDIAN_SUPPORT */ + t_u8 parallel:1; /**< 11k: series or parallel with previous meas */ + t_u8 enable:1; /**< 11h: enable report/request bits */ + t_u8 request:1; /**< 11h: en/disable requests of specified type */ + t_u8 report:1; /**< 11h: en/disable report rcpt. of spec. type */ + t_u8 duration_mandatory:1;/**< 11k: duration spec. for meas. is mandatory */ + t_u8 rsvd5_7:3; /**< Reserved */ +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END MeasReqMode_t; -/** +/** * @brief Common measurement request structure (7.3.2.21.1 to 7.3.2.21.3) */ typedef MLAN_PACK_START struct { - t_u8 channel; /**< Channel to measure */ - t_u64 start_time; /**< TSF Start time of measurement (0 for immediate) */ - t_u16 duration; /**< TU duration of the measurement */ + t_u8 channel; /**< Channel to measure */ + t_u64 start_time; + /**< TSF Start time of measurement (0 for immediate) */ + t_u16 duration;/**< TU duration of the measurement */ } MLAN_PACK_END MeasReqCommonFormat_t; -/** +/** * @brief Basic measurement request structure (7.3.2.21.1) */ typedef MeasReqCommonFormat_t MeasReqBasic_t; -/** +/** * @brief CCA measurement request structure (7.3.2.21.2) */ typedef MeasReqCommonFormat_t MeasReqCCA_t; -/** +/** * @brief RPI measurement request structure (7.3.2.21.3) */ typedef MeasReqCommonFormat_t MeasReqRPI_t; -/** - * @brief Union of the availble measurement request types. Passed in the +/** + * @brief Union of the availble measurement request types. Passed in the * driver/firmware interface. */ typedef union { - MeasReqBasic_t basic; /**< Basic measurement request */ - MeasReqCCA_t cca; /**< CCA measurement request */ - MeasReqRPI_t rpi; /**< RPI measurement request */ + MeasReqBasic_t basic; + /**< Basic measurement request */ + MeasReqCCA_t cca; /**< CCA measurement request */ + MeasReqRPI_t rpi; /**< RPI measurement request */ } MeasRequest_t; -/** +/** * @brief Mode octet of the measurement report element (7.3.2.22) */ typedef MLAN_PACK_START struct { #ifdef BIG_ENDIAN_SUPPORT - t_u8 rsvd3_7:5; /**< Reserved */ - t_u8 refused:1; /**< Measurement refused */ - t_u8 incapable:1; /**< Incapable of performing measurement */ - t_u8 late:1; /**< Start TSF time missed for measurement */ + t_u8 rsvd3_7:5; /**< Reserved */ + t_u8 refused:1; /**< Measurement refused */ + t_u8 incapable:1; /**< Incapable of performing measurement */ + t_u8 late:1; /**< Start TSF time missed for measurement */ #else - t_u8 late:1; /**< Start TSF time missed for measurement */ - t_u8 incapable:1; /**< Incapable of performing measurement */ - t_u8 refused:1; /**< Measurement refused */ - t_u8 rsvd3_7:5; /**< Reserved */ -#endif /* BIG_ENDIAN_SUPPORT */ + t_u8 late:1; /**< Start TSF time missed for measurement */ + t_u8 incapable:1; /**< Incapable of performing measurement */ + t_u8 refused:1; /**< Measurement refused */ + t_u8 rsvd3_7:5; /**< Reserved */ +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END MeasRptMode_t; -/** +/** * @brief Basic measurement report (7.3.2.22.1) */ typedef MLAN_PACK_START struct { - t_u8 channel; /**< Channel to measured */ - t_u64 start_time; /**< Start time (TSF) of measurement */ - t_u16 duration; /**< Duration of measurement in TUs */ - MeasRptBasicMap_t map; /**< Basic measurement report */ + t_u8 channel; /**< Channel to measured */ + t_u64 start_time; /**< Start time (TSF) of measurement */ + t_u16 duration; /**< Duration of measurement in TUs */ + MeasRptBasicMap_t map; /**< Basic measurement report */ } MLAN_PACK_END MeasRptBasic_t; -/** +/** * @brief CCA measurement report (7.3.2.22.2) */ typedef MLAN_PACK_START struct { - t_u8 channel; /**< Channel to measured */ - t_u64 start_time; /**< Start time (TSF) of measurement */ - t_u16 duration; /**< Duration of measurement in TUs */ - t_u8 busy_fraction; /**< Fractional duration CCA indicated chan busy */ + t_u8 channel; /**< Channel to measured */ + t_u64 start_time; /**< Start time (TSF) of measurement */ + t_u16 duration; /**< Duration of measurement in TUs */ + t_u8 busy_fraction; /**< Fractional duration CCA indicated chan busy */ } MLAN_PACK_END MeasRptCCA_t; -/** +/** * @brief RPI measurement report (7.3.2.22.3) */ typedef MLAN_PACK_START struct { - t_u8 channel; /**< Channel to measured */ - t_u64 start_time; /**< Start time (TSF) of measurement */ - t_u16 duration; /**< Duration of measurement in TUs */ - t_u8 density[8]; /**< RPI Density histogram report */ + t_u8 channel; /**< Channel to measured */ + t_u64 start_time; /**< Start time (TSF) of measurement */ + t_u16 duration; /**< Duration of measurement in TUs */ + t_u8 density[8]; /**< RPI Density histogram report */ } MLAN_PACK_END MeasRptRPI_t; -/** - * @brief Union of the availble measurement report types. Passed in the +/** + * @brief Union of the availble measurement report types. Passed in the * driver/firmware interface. */ typedef union { - MeasRptBasic_t basic; /**< Basic measurement report */ - MeasRptCCA_t cca; /**< CCA measurement report */ - MeasRptRPI_t rpi; /**< RPI measurement report */ + MeasRptBasic_t basic;/**< Basic measurement report */ + MeasRptCCA_t cca; /**< CCA measurement report */ + MeasRptRPI_t rpi; /**< RPI measurement report */ } MeasReport_t; -/** +/** * @brief Structure passed to firmware to perform a measurement */ typedef MLAN_PACK_START struct { - t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; /**< Reporting STA address */ - t_u8 dialog_token; /**< Measurement dialog toke */ - MeasReqMode_t req_mode; /**< Report mode */ - MeasType_t meas_type; /**< Measurement type */ - MeasRequest_t req; /**< Measurement request data */ + t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; /**< Reporting STA address */ + t_u8 dialog_token; /**< Measurement dialog toke */ + MeasReqMode_t req_mode; /**< Report mode */ + MeasType_t meas_type; /**< Measurement type */ + MeasRequest_t req; /**< Measurement request data */ } MLAN_PACK_END HostCmd_DS_MEASUREMENT_REQUEST; -/** +/** * @brief Structure passed back from firmware with a measurement report, * also can be to send a measurement report to another STA */ typedef MLAN_PACK_START struct { - t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; /**< Reporting STA address */ - t_u8 dialog_token; /**< Measurement dialog token */ - MeasRptMode_t rpt_mode; /**< Report mode */ - MeasType_t meas_type; /**< Measurement type */ - MeasReport_t rpt; /**< Measurement report data */ + t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; /**< Reporting STA address */ + t_u8 dialog_token; /**< Measurement dialog token */ + MeasRptMode_t rpt_mode; /**< Report mode */ + MeasType_t meas_type; /**< Measurement type */ + MeasReport_t rpt; /**< Measurement report data */ } MLAN_PACK_END HostCmd_DS_MEASUREMENT_REPORT; typedef MLAN_PACK_START struct { - t_u16 startFreq; - t_u8 chanWidth; - t_u8 chanNum; + t_u16 startFreq; + t_u8 chanWidth; + t_u8 chanNum; } MLAN_PACK_END MrvlChannelDesc_t; typedef MLAN_PACK_START struct { - MrvlIEtypesHeader_t Header; /**< Header */ + MrvlIEtypesHeader_t Header; /**< Header */ - MeasRptBasicMap_t map; /**< IEEE 802.11h basic meas report */ + MeasRptBasicMap_t map; /**< IEEE 802.11h basic meas report */ } MLAN_PACK_END MrvlIEtypes_ChanRpt11hBasic_t; typedef MLAN_PACK_START struct { - MrvlChannelDesc_t chan_desc; /**< Channel band, number */ - t_u32 millisec_dwell_time; /**< Channel dwell time in milliseconds */ + MrvlChannelDesc_t chan_desc; + /**< Channel band, number */ + t_u32 millisec_dwell_time; + /**< Channel dwell time in milliseconds */ } MLAN_PACK_END HostCmd_DS_CHAN_RPT_REQ; typedef MLAN_PACK_START struct { - t_u32 cmd_result; /**< Rpt request command result (0 == SUCCESS) */ - t_u64 start_tsf; /**< TSF Measurement started */ - t_u32 duration; /**< Duration of measurement in microsecs */ - t_u8 tlv_buffer[1]; /**< TLV Buffer */ + t_u32 cmd_result; /**< Rpt request command result (0 == SUCCESS) */ + t_u64 start_tsf; /**< TSF Measurement started */ + t_u32 duration; /**< Duration of measurement in microsecs */ + t_u8 tlv_buffer[1]; + /**< TLV Buffer */ } MLAN_PACK_END HostCmd_DS_CHAN_RPT_RSP; /** statistics threshold */ typedef MLAN_PACK_START struct { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** value */ - t_u8 value; + t_u8 value; /** reporting frequency */ - t_u8 frequency; + t_u8 frequency; } MLAN_PACK_END MrvlIEtypes_BeaconHighRssiThreshold_t, - MrvlIEtypes_BeaconLowRssiThreshold_t, - MrvlIEtypes_BeaconHighSnrThreshold_t, - MrvlIEtypes_BeaconLowSnrThreshold_t, - MrvlIEtypes_FailureCount_t, - MrvlIEtypes_DataLowRssiThreshold_t, - MrvlIEtypes_DataHighRssiThreshold_t, - MrvlIEtypes_DataLowSnrThreshold_t, - MrvlIEtypes_DataHighSnrThreshold_t, - MrvlIETypes_PreBeaconMissed_t, MrvlIEtypes_BeaconsMissed_t; + MrvlIEtypes_BeaconLowRssiThreshold_t, + MrvlIEtypes_BeaconHighSnrThreshold_t, + MrvlIEtypes_BeaconLowSnrThreshold_t, + MrvlIEtypes_FailureCount_t, + MrvlIEtypes_DataLowRssiThreshold_t, + MrvlIEtypes_DataHighRssiThreshold_t, + MrvlIEtypes_DataLowSnrThreshold_t, + MrvlIEtypes_DataHighSnrThreshold_t, + MrvlIETypes_PreBeaconMissed_t, MrvlIEtypes_BeaconsMissed_t; /** statistics threshold for LinkQuality */ typedef MLAN_PACK_START struct { /** Header */ - MrvlIEtypesHeader_t header; + MrvlIEtypesHeader_t header; /** Link SNR threshold (dB) */ - t_u16 link_snr; + t_u16 link_snr; /** Link SNR frequency */ - t_u16 link_snr_freq; - /* Second minimum rate value as per the rate table below */ - t_u16 link_rate; - /* Second minimum rate frequency */ - t_u16 link_rate_freq; - /* Tx latency value (us) */ - t_u16 link_tx_latency; - /* Tx latency frequency */ - t_u16 link_tx_lantency_freq; + t_u16 link_snr_freq; + /* Second minimum rate value as per the rate table below */ + t_u16 link_rate; + /* Second minimum rate frequency */ + t_u16 link_rate_freq; + /* Tx latency value (us) */ + t_u16 link_tx_latency; + /* Tx latency frequency */ + t_u16 link_tx_lantency_freq; } MLAN_PACK_END MrvlIEtypes_LinkQualityThreshold_t; /** HostCmd_DS_COMMAND */ typedef struct MLAN_PACK_START _HostCmd_DS_COMMAND { /** Command Header : Command */ - t_u16 command; + t_u16 command; /** Command Header : Size */ - t_u16 size; + t_u16 size; /** Command Header : Sequence number */ - t_u16 seq_num; + t_u16 seq_num; /** Command Header : Result */ - t_u16 result; + t_u16 result; /** Command Body */ - union - { - /** Hardware specifications */ - HostCmd_DS_GET_HW_SPEC hw_spec; - /** Cfg data */ - HostCmd_DS_802_11_CFG_DATA cfg_data; - /** MAC control */ - HostCmd_DS_MAC_CONTROL mac_ctrl; - /** MAC address */ - HostCmd_DS_802_11_MAC_ADDRESS mac_addr; - /** MAC muticast address */ - HostCmd_DS_MAC_MULTICAST_ADR mc_addr; - /** Get log */ - HostCmd_DS_802_11_GET_LOG get_log; - /** RSSI information */ - HostCmd_DS_802_11_RSSI_INFO rssi_info; - /** RSSI information response */ - HostCmd_DS_802_11_RSSI_INFO_RSP rssi_info_rsp; - /** SNMP MIB */ - HostCmd_DS_802_11_SNMP_MIB smib; - /** Radio control */ - HostCmd_DS_802_11_RADIO_CONTROL radio; - /** RF channel */ - HostCmd_DS_802_11_RF_CHANNEL rf_channel; - /** Tx rate query */ - HostCmd_TX_RATE_QUERY tx_rate; - /** Tx rate configuration */ - HostCmd_DS_TX_RATE_CFG tx_rate_cfg; - /** Tx power configuration */ - HostCmd_DS_TXPWR_CFG txp_cfg; - /** RF Tx power configuration */ - HostCmd_DS_802_11_RF_TX_POWER txp; - - /** RF antenna */ - HostCmd_DS_802_11_RF_ANTENNA antenna; - /** Enhanced power save command */ - HostCmd_DS_802_11_PS_MODE_ENH psmode_enh; - HostCmd_DS_802_11_HS_CFG_ENH opt_hs_cfg; - /** Scan */ - HostCmd_DS_802_11_SCAN scan; - /** Extended Scan */ - HostCmd_DS_802_11_SCAN_EXT ext_scan; - - /** Mgmt frame subtype mask */ - HostCmd_DS_RX_MGMT_IND rx_mgmt_ind; - /** Scan response */ - HostCmd_DS_802_11_SCAN_RSP scan_resp; - - HostCmd_DS_802_11_BG_SCAN_CONFIG bg_scan_config; - HostCmd_DS_802_11_BG_SCAN_QUERY bg_scan_query; - HostCmd_DS_802_11_BG_SCAN_QUERY_RSP bg_scan_query_resp; - HostCmd_DS_SUBSCRIBE_EVENT subscribe_event; - HostCmd_DS_OTP_USER_DATA otp_user_data; - /** Associate */ - HostCmd_DS_802_11_ASSOCIATE associate; - - /** Associate response */ - HostCmd_DS_802_11_ASSOCIATE_RSP associate_rsp; - /** Deauthenticate */ - HostCmd_DS_802_11_DEAUTHENTICATE deauth; - /** Ad-Hoc start */ - HostCmd_DS_802_11_AD_HOC_START adhoc_start; - /** Ad-Hoc start result */ - HostCmd_DS_802_11_AD_HOC_START_RESULT adhoc_start_result; - /** Ad-Hoc join result */ - HostCmd_DS_802_11_AD_HOC_JOIN_RESULT adhoc_join_result; - /** Ad-Hoc join */ - HostCmd_DS_802_11_AD_HOC_JOIN adhoc_join; - /** Domain information */ - HostCmd_DS_802_11D_DOMAIN_INFO domain_info; - /** Domain information response */ - HostCmd_DS_802_11D_DOMAIN_INFO_RSP domain_info_resp; - HostCmd_DS_802_11_TPC_ADAPT_REQ tpc_req; - HostCmd_DS_802_11_TPC_INFO tpc_info; - HostCmd_DS_802_11_CHAN_SW_ANN chan_sw_ann; - HostCmd_DS_CHAN_RPT_REQ chan_rpt_req; - HostCmd_DS_MEASUREMENT_REQUEST meas_req; - HostCmd_DS_MEASUREMENT_REPORT meas_rpt; - /** Add BA request */ - HostCmd_DS_11N_ADDBA_REQ add_ba_req; - /** Add BA response */ - HostCmd_DS_11N_ADDBA_RSP add_ba_rsp; - /** Delete BA entry */ - HostCmd_DS_11N_DELBA del_ba; - /** Tx buffer configuration */ - HostCmd_DS_TXBUF_CFG tx_buf; - /** AMSDU Aggr Ctrl configuration */ - HostCmd_DS_AMSDU_AGGR_CTRL amsdu_aggr_ctrl; - /** 11n configuration */ - HostCmd_DS_11N_CFG htcfg; - /** reject addba req conditions configuration */ - HostCmd_DS_REJECT_ADDBA_REQ rejectaddbareq; - /* RANDYTODO need add more */ - /** HostCmd_DS_11AC_CFG */ - HostCmd_DS_11AC_CFG vhtcfg; - /** HostCmd_DS_11ACTXBUF_CFG*/ - HostCmd_DS_11ACTXBUF_CFG ac_tx_buf; - /** 11n configuration */ - HostCmd_DS_TX_BF_CFG tx_bf_cfg; - /** WMM status get */ - HostCmd_DS_WMM_GET_STATUS get_wmm_status; - /** WMM ADDTS */ - HostCmd_DS_WMM_ADDTS_REQ add_ts; - /** WMM DELTS */ - HostCmd_DS_WMM_DELTS_REQ del_ts; - /** WMM set/get queue config */ - HostCmd_DS_WMM_QUEUE_CONFIG queue_config; - /** WMM on/of/get queue statistics */ - HostCmd_DS_WMM_QUEUE_STATS queue_stats; - /** WMM get traffic stream status */ - HostCmd_DS_WMM_TS_STATUS ts_status; - /** Key material */ - HostCmd_DS_802_11_KEY_MATERIAL key_material; - /** E-Supplicant PSK */ - HostCmd_DS_802_11_SUPPLICANT_PMK esupplicant_psk; - /** E-Supplicant profile */ - HostCmd_DS_802_11_SUPPLICANT_PROFILE esupplicant_profile; - /** Extended version */ - HostCmd_DS_VERSION_EXT verext; - /** Adhoc Coalescing */ - HostCmd_DS_802_11_IBSS_STATUS ibss_coalescing; - /** Mgmt IE list configuration */ - HostCmd_DS_MGMT_IE_LIST_CFG mgmt_ie_list; - /** System clock configuration */ - HostCmd_DS_ECL_SYSTEM_CLOCK_CONFIG sys_clock_cfg; - /** MAC register access */ - HostCmd_DS_MAC_REG_ACCESS mac_reg; - /** BBP register access */ - HostCmd_DS_BBP_REG_ACCESS bbp_reg; - /** RF register access */ - HostCmd_DS_RF_REG_ACCESS rf_reg; - /** EEPROM register access */ - HostCmd_DS_802_11_EEPROM_ACCESS eeprom; - /** Memory access */ - HostCmd_DS_MEM_ACCESS mem; - - /** Inactivity timeout extend */ - HostCmd_DS_INACTIVITY_TIMEOUT_EXT inactivity_to; + union + { + /** Hardware specifications */ + HostCmd_DS_GET_HW_SPEC hw_spec; + /** Cfg data */ + HostCmd_DS_802_11_CFG_DATA cfg_data; + /** MAC control */ + HostCmd_DS_MAC_CONTROL mac_ctrl; + /** MAC address */ + HostCmd_DS_802_11_MAC_ADDRESS mac_addr; + /** MAC muticast address */ + HostCmd_DS_MAC_MULTICAST_ADR mc_addr; + /** Get log */ + HostCmd_DS_802_11_GET_LOG get_log; + /** RSSI information */ + HostCmd_DS_802_11_RSSI_INFO rssi_info; + /** RSSI information response */ + HostCmd_DS_802_11_RSSI_INFO_RSP rssi_info_rsp; + /** SNMP MIB */ + HostCmd_DS_802_11_SNMP_MIB smib; + /** Radio control */ + HostCmd_DS_802_11_RADIO_CONTROL radio; + /** RF channel */ + HostCmd_DS_802_11_RF_CHANNEL rf_channel; + /** Tx rate query */ + HostCmd_TX_RATE_QUERY tx_rate; + /** Tx rate configuration */ + HostCmd_DS_TX_RATE_CFG tx_rate_cfg; + /** Tx power configuration */ + HostCmd_DS_TXPWR_CFG txp_cfg; + /** RF Tx power configuration */ + HostCmd_DS_802_11_RF_TX_POWER txp; + + /** RF antenna */ + HostCmd_DS_802_11_RF_ANTENNA antenna; + /** Enhanced power save command */ + HostCmd_DS_802_11_PS_MODE_ENH psmode_enh; + HostCmd_DS_802_11_HS_CFG_ENH opt_hs_cfg; + /** Scan */ + HostCmd_DS_802_11_SCAN scan; + /** Extended Scan */ + HostCmd_DS_802_11_SCAN_EXT ext_scan; + + /** Mgmt frame subtype mask */ + HostCmd_DS_RX_MGMT_IND rx_mgmt_ind; + /** Scan response */ + HostCmd_DS_802_11_SCAN_RSP scan_resp; + + HostCmd_DS_802_11_BG_SCAN_CONFIG bg_scan_config; + HostCmd_DS_802_11_BG_SCAN_QUERY bg_scan_query; + HostCmd_DS_802_11_BG_SCAN_QUERY_RSP bg_scan_query_resp; + HostCmd_DS_SUBSCRIBE_EVENT subscribe_event; + HostCmd_DS_OTP_USER_DATA otp_user_data; + /** Associate */ + HostCmd_DS_802_11_ASSOCIATE associate; + + /** Associate response */ + HostCmd_DS_802_11_ASSOCIATE_RSP associate_rsp; + /** Deauthenticate */ + HostCmd_DS_802_11_DEAUTHENTICATE deauth; + /** Ad-Hoc start */ + HostCmd_DS_802_11_AD_HOC_START adhoc_start; + /** Ad-Hoc start result */ + HostCmd_DS_802_11_AD_HOC_START_RESULT adhoc_start_result; + /** Ad-Hoc join result */ + HostCmd_DS_802_11_AD_HOC_JOIN_RESULT adhoc_join_result; + /** Ad-Hoc join */ + HostCmd_DS_802_11_AD_HOC_JOIN adhoc_join; + /** Domain information */ + HostCmd_DS_802_11D_DOMAIN_INFO domain_info; + /** Domain information response */ + HostCmd_DS_802_11D_DOMAIN_INFO_RSP domain_info_resp; + HostCmd_DS_802_11_TPC_ADAPT_REQ tpc_req; + HostCmd_DS_802_11_TPC_INFO tpc_info; + HostCmd_DS_802_11_CHAN_SW_ANN chan_sw_ann; + HostCmd_DS_CHAN_RPT_REQ chan_rpt_req; + HostCmd_DS_MEASUREMENT_REQUEST meas_req; + HostCmd_DS_MEASUREMENT_REPORT meas_rpt; + /** Add BA request */ + HostCmd_DS_11N_ADDBA_REQ add_ba_req; + /** Add BA response */ + HostCmd_DS_11N_ADDBA_RSP add_ba_rsp; + /** Delete BA entry */ + HostCmd_DS_11N_DELBA del_ba; + /** Tx buffer configuration */ + HostCmd_DS_TXBUF_CFG tx_buf; + /** AMSDU Aggr Ctrl configuration */ + HostCmd_DS_AMSDU_AGGR_CTRL amsdu_aggr_ctrl; + /** 11n configuration */ + HostCmd_DS_11N_CFG htcfg; + /** reject addba req conditions configuration */ + HostCmd_DS_REJECT_ADDBA_REQ rejectaddbareq; + /* RANDYTODO need add more */ + /** HostCmd_DS_11AC_CFG */ + HostCmd_DS_11AC_CFG vhtcfg; + /** HostCmd_DS_11ACTXBUF_CFG*/ + HostCmd_DS_11ACTXBUF_CFG ac_tx_buf; + /** 11n configuration */ + HostCmd_DS_TX_BF_CFG tx_bf_cfg; + /** WMM status get */ + HostCmd_DS_WMM_GET_STATUS get_wmm_status; + /** WMM ADDTS */ + HostCmd_DS_WMM_ADDTS_REQ add_ts; + /** WMM DELTS */ + HostCmd_DS_WMM_DELTS_REQ del_ts; + /** WMM set/get queue config */ + HostCmd_DS_WMM_QUEUE_CONFIG queue_config; + /** WMM on/of/get queue statistics */ + HostCmd_DS_WMM_QUEUE_STATS queue_stats; + /** WMM get traffic stream status */ + HostCmd_DS_WMM_TS_STATUS ts_status; + /** Key material */ + HostCmd_DS_802_11_KEY_MATERIAL key_material; + /** E-Supplicant PSK */ + HostCmd_DS_802_11_SUPPLICANT_PMK esupplicant_psk; + /** E-Supplicant profile */ + HostCmd_DS_802_11_SUPPLICANT_PROFILE esupplicant_profile; + /** Extended version */ + HostCmd_DS_VERSION_EXT verext; + /** Adhoc Coalescing */ + HostCmd_DS_802_11_IBSS_STATUS ibss_coalescing; + /** Mgmt IE list configuration */ + HostCmd_DS_MGMT_IE_LIST_CFG mgmt_ie_list; + /** System clock configuration */ + HostCmd_DS_ECL_SYSTEM_CLOCK_CONFIG sys_clock_cfg; + /** MAC register access */ + HostCmd_DS_MAC_REG_ACCESS mac_reg; + /** BBP register access */ + HostCmd_DS_BBP_REG_ACCESS bbp_reg; + /** RF register access */ + HostCmd_DS_RF_REG_ACCESS rf_reg; + /** EEPROM register access */ + HostCmd_DS_802_11_EEPROM_ACCESS eeprom; + /** Memory access */ + HostCmd_DS_MEM_ACCESS mem; + + /** Inactivity timeout extend */ + HostCmd_DS_INACTIVITY_TIMEOUT_EXT inactivity_to; #ifdef UAP_SUPPORT - HostCmd_DS_SYS_CONFIG sys_config; - HostCmd_DS_SYS_INFO sys_info; - HostCmd_DS_STA_DEAUTH sta_deauth; - HostCmd_DS_STA_LIST sta_list; - HostCmd_DS_POWER_MGMT_EXT pm_cfg; -#endif /* UAP_SUPPORT */ + HostCmd_DS_SYS_CONFIG sys_config; + HostCmd_DS_SYS_INFO sys_info; + HostCmd_DS_STA_DEAUTH sta_deauth; + HostCmd_DS_STA_LIST sta_list; + HostCmd_DS_POWER_MGMT_EXT pm_cfg; +#endif /* UAP_SUPPORT */ /** Sleep period command */ - HostCmd_DS_802_11_SLEEP_PERIOD sleep_pd; + HostCmd_DS_802_11_SLEEP_PERIOD sleep_pd; /** Sleep params command */ - HostCmd_DS_802_11_SLEEP_PARAMS sleep_param; + HostCmd_DS_802_11_SLEEP_PARAMS sleep_param; /** SDIO GPIO interrupt config command */ - HostCmd_DS_SDIO_GPIO_INT_CONFIG sdio_gpio_int; - HostCmd_DS_SDIO_PULL_CTRL sdio_pull_ctl; - HostCmd_DS_SET_BSS_MODE bss_mode; - HostCmd_DS_CMD_TX_DATA_PAUSE tx_data_pause; + HostCmd_DS_SDIO_GPIO_INT_CONFIG sdio_gpio_int; + HostCmd_DS_SDIO_PULL_CTRL sdio_pull_ctl; + HostCmd_DS_SET_BSS_MODE bss_mode; + HostCmd_DS_CMD_TX_DATA_PAUSE tx_data_pause; #ifdef WIFI_DIRECT_SUPPORT - HostCmd_DS_REMAIN_ON_CHANNEL remain_on_chan; - HostCmd_DS_WIFI_DIRECT_MODE wifi_direct_mode; + HostCmd_DS_REMAIN_ON_CHANNEL remain_on_chan; + HostCmd_DS_WIFI_DIRECT_MODE wifi_direct_mode; #endif - HostCmd_DS_HS_WAKEUP_REASON hs_wakeup_reason; - } params; + HostCmd_DS_HS_WAKEUP_REASON hs_wakeup_reason; + } params; } MLAN_PACK_END HostCmd_DS_COMMAND; /** PS_CMD_ConfirmSleep */ typedef MLAN_PACK_START struct _OPT_Confirm_Sleep { /** Command */ - t_u16 command; + t_u16 command; /** Size */ - t_u16 size; + t_u16 size; /** Sequence number */ - t_u16 seq_num; + t_u16 seq_num; /** Result */ - t_u16 result; + t_u16 result; /** Action */ - t_u16 action; + t_u16 action; /** Sleep comfirm param definition */ - sleep_confirm_param sleep_cfm; + sleep_confirm_param sleep_cfm; } MLAN_PACK_END OPT_Confirm_Sleep; typedef struct MLAN_PACK_START _opt_sleep_confirm_buffer { /** Header for interface */ - t_u8 hdr[4]; + t_u8 hdr[4]; /** New power save command used to send sleep confirmation to the firmware */ - OPT_Confirm_Sleep ps_cfm_sleep; + OPT_Confirm_Sleep ps_cfm_sleep; } MLAN_PACK_END opt_sleep_confirm_buffer; #ifdef PRAGMA_PACK diff --git a/drivers/net/wireless/sd8897/mlan/mlan_ieee.h b/drivers/net/wireless/sd8897/mlan/mlan_ieee.h index 9cccb49fc338..3bc62d980bba 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_ieee.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_ieee.h @@ -1,9 +1,9 @@ /** @file mlan_ieee.h * - * @brief This file contains IEEE information element related + * @brief This file contains IEEE information element related * definitions used in MLAN and MOAL module. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -39,10 +39,10 @@ Change log: /** WLAN_802_11_NETWORK_TYPE */ typedef enum _WLAN_802_11_NETWORK_TYPE { - Wlan802_11FH, - Wlan802_11DS, - /* Defined as upper bound */ - Wlan802_11NetworkTypeMax + Wlan802_11FH, + Wlan802_11DS, + /* Defined as upper bound */ + Wlan802_11NetworkTypeMax } WLAN_802_11_NETWORK_TYPE; /** Maximum size of IEEE Information Elements */ @@ -67,91 +67,91 @@ typedef enum _WLAN_802_11_NETWORK_TYPE /** IEEE Type definitions */ typedef MLAN_PACK_START enum _IEEEtypes_ElementId_e { - SSID = 0, - SUPPORTED_RATES = 1, + SSID = 0, + SUPPORTED_RATES = 1, - FH_PARAM_SET = 2, - DS_PARAM_SET = 3, - CF_PARAM_SET = 4, + FH_PARAM_SET = 2, + DS_PARAM_SET = 3, + CF_PARAM_SET = 4, - IBSS_PARAM_SET = 6, + IBSS_PARAM_SET = 6, #ifdef STA_SUPPORT - COUNTRY_INFO = 7, + COUNTRY_INFO = 7, #endif /* STA_SUPPORT */ - POWER_CONSTRAINT = 32, - POWER_CAPABILITY = 33, - TPC_REQUEST = 34, - TPC_REPORT = 35, - SUPPORTED_CHANNELS = 36, - CHANNEL_SWITCH_ANN = 37, - QUIET = 40, - IBSS_DFS = 41, - HT_CAPABILITY = 45, - HT_OPERATION = 61, - BSSCO_2040 = 72, - OVERLAPBSSSCANPARAM = 74, - EXT_CAPABILITY = 127, - - VHT_CAPABILITY = 191, - VHT_OPERATION = 192, - EXT_BSS_LOAD = 193, - BW_CHANNEL_SWITCH = 194, - VHT_TX_POWER_ENV = 195, - EXT_POWER_CONSTR = 196, - AID_INFO = 197, - QUIET_CHAN = 198, - OPER_MODE_NTF = 199, - - ERP_INFO = 42, - - EXTENDED_SUPPORTED_RATES = 50, - - VENDOR_SPECIFIC_221 = 221, - WMM_IE = VENDOR_SPECIFIC_221, - - WPS_IE = VENDOR_SPECIFIC_221, - - WPA_IE = VENDOR_SPECIFIC_221, - RSN_IE = 48, - VS_IE = VENDOR_SPECIFIC_221, - WAPI_IE = 68, + POWER_CONSTRAINT = 32, + POWER_CAPABILITY = 33, + TPC_REQUEST = 34, + TPC_REPORT = 35, + SUPPORTED_CHANNELS = 36, + CHANNEL_SWITCH_ANN = 37, + QUIET = 40, + IBSS_DFS = 41, + HT_CAPABILITY = 45, + HT_OPERATION = 61, + BSSCO_2040 = 72, + OVERLAPBSSSCANPARAM = 74, + EXT_CAPABILITY = 127, + + VHT_CAPABILITY = 191, + VHT_OPERATION = 192, + EXT_BSS_LOAD = 193, + BW_CHANNEL_SWITCH = 194, + VHT_TX_POWER_ENV = 195, + EXT_POWER_CONSTR = 196, + AID_INFO = 197, + QUIET_CHAN = 198, + OPER_MODE_NTF = 199, + + ERP_INFO = 42, + + EXTENDED_SUPPORTED_RATES = 50, + + VENDOR_SPECIFIC_221 = 221, + WMM_IE = VENDOR_SPECIFIC_221, + + WPS_IE = VENDOR_SPECIFIC_221, + + WPA_IE = VENDOR_SPECIFIC_221, + RSN_IE = 48, + VS_IE = VENDOR_SPECIFIC_221, + WAPI_IE = 68, } MLAN_PACK_END IEEEtypes_ElementId_e; /** IEEE IE header */ typedef MLAN_PACK_START struct _IEEEtypes_Header_t { /** Element ID */ - t_u8 element_id; + t_u8 element_id; /** Length */ - t_u8 len; + t_u8 len; } MLAN_PACK_END IEEEtypes_Header_t, *pIEEEtypes_Header_t; /** Vendor specific IE header */ typedef MLAN_PACK_START struct _IEEEtypes_VendorHeader_t { /** Element ID */ - t_u8 element_id; + t_u8 element_id; /** Length */ - t_u8 len; + t_u8 len; /** OUI */ - t_u8 oui[3]; + t_u8 oui[3]; /** OUI type */ - t_u8 oui_type; + t_u8 oui_type; /** OUI subtype */ - t_u8 oui_subtype; + t_u8 oui_subtype; /** Version */ - t_u8 version; + t_u8 version; } MLAN_PACK_END IEEEtypes_VendorHeader_t, *pIEEEtypes_VendorHeader_t; /** Vendor specific IE */ typedef MLAN_PACK_START struct _IEEEtypes_VendorSpecific_t { /** Vendor specific IE header */ - IEEEtypes_VendorHeader_t vend_hdr; + IEEEtypes_VendorHeader_t vend_hdr; /** IE Max - size of previous fields */ - t_u8 data[IEEE_MAX_IE_SIZE - sizeof(IEEEtypes_VendorHeader_t)]; + t_u8 data[IEEE_MAX_IE_SIZE - sizeof(IEEEtypes_VendorHeader_t)]; } MLAN_PACK_END IEEEtypes_VendorSpecific_t, *pIEEEtypes_VendorSpecific_t; @@ -159,9 +159,9 @@ MLAN_PACK_END IEEEtypes_VendorSpecific_t, *pIEEEtypes_VendorSpecific_t; typedef MLAN_PACK_START struct _IEEEtypes_Generic_t { /** Generic IE header */ - IEEEtypes_Header_t ieee_hdr; + IEEEtypes_Header_t ieee_hdr; /** IE Max - size of previous fields */ - t_u8 data[IEEE_MAX_IE_SIZE - sizeof(IEEEtypes_Header_t)]; + t_u8 data[IEEE_MAX_IE_SIZE - sizeof(IEEEtypes_Header_t)]; } MLAN_PACK_END IEEEtypes_Generic_t, *pIEEEtypes_Generic_t; @@ -169,9 +169,9 @@ MLAN_PACK_END IEEEtypes_Generic_t, *pIEEEtypes_Generic_t; typedef MLAN_PACK_START struct _TLV_Generic_t { /** Type */ - t_u16 type; + t_u16 type; /** Length */ - t_u16 len; + t_u16 len; } MLAN_PACK_END TLV_Generic_t, *pTLV_Generic_t; /** Capability information mask */ @@ -182,54 +182,54 @@ typedef MLAN_PACK_START struct _TLV_Generic_t #ifdef BIG_ENDIAN_SUPPORT typedef MLAN_PACK_START struct _IEEEtypes_CapInfo_t { - t_u8 rsrvd1:2; - t_u8 dsss_ofdm:1; - t_u8 rsvrd2:2; - t_u8 short_slot_time:1; - t_u8 rsrvd3:1; - t_u8 spectrum_mgmt:1; - t_u8 chan_agility:1; - t_u8 pbcc:1; - t_u8 short_preamble:1; - t_u8 privacy:1; - t_u8 cf_poll_rqst:1; - t_u8 cf_pollable:1; - t_u8 ibss:1; - t_u8 ess:1; + t_u8 rsrvd1:2; + t_u8 dsss_ofdm:1; + t_u8 rsvrd2:2; + t_u8 short_slot_time:1; + t_u8 rsrvd3:1; + t_u8 spectrum_mgmt:1; + t_u8 chan_agility:1; + t_u8 pbcc:1; + t_u8 short_preamble:1; + t_u8 privacy:1; + t_u8 cf_poll_rqst:1; + t_u8 cf_pollable:1; + t_u8 ibss:1; + t_u8 ess:1; } MLAN_PACK_END IEEEtypes_CapInfo_t, *pIEEEtypes_CapInfo_t; #else typedef MLAN_PACK_START struct _IEEEtypes_CapInfo_t { /** Capability Bit Map : ESS */ - t_u8 ess:1; + t_u8 ess:1; /** Capability Bit Map : IBSS */ - t_u8 ibss:1; + t_u8 ibss:1; /** Capability Bit Map : CF pollable */ - t_u8 cf_pollable:1; + t_u8 cf_pollable:1; /** Capability Bit Map : CF poll request */ - t_u8 cf_poll_rqst:1; + t_u8 cf_poll_rqst:1; /** Capability Bit Map : privacy */ - t_u8 privacy:1; + t_u8 privacy:1; /** Capability Bit Map : Short preamble */ - t_u8 short_preamble:1; + t_u8 short_preamble:1; /** Capability Bit Map : PBCC */ - t_u8 pbcc:1; + t_u8 pbcc:1; /** Capability Bit Map : Channel agility */ - t_u8 chan_agility:1; + t_u8 chan_agility:1; /** Capability Bit Map : Spectrum management */ - t_u8 spectrum_mgmt:1; + t_u8 spectrum_mgmt:1; /** Capability Bit Map : Reserved */ - t_u8 rsrvd3:1; + t_u8 rsrvd3:1; /** Capability Bit Map : Short slot time */ - t_u8 short_slot_time:1; + t_u8 short_slot_time:1; /** Capability Bit Map : APSD */ - t_u8 Apsd:1; + t_u8 Apsd:1; /** Capability Bit Map : Reserved */ - t_u8 rsvrd2:1; + t_u8 rsvrd2:1; /** Capability Bit Map : DSS OFDM */ - t_u8 dsss_ofdm:1; + t_u8 dsss_ofdm:1; /** Capability Bit Map : Reserved */ - t_u8 rsrvd1:2; + t_u8 rsrvd1:2; } MLAN_PACK_END IEEEtypes_CapInfo_t, *pIEEEtypes_CapInfo_t; #endif /* BIG_ENDIAN_SUPPORT */ @@ -237,85 +237,85 @@ typedef MLAN_PACK_START struct _IEEEtypes_CapInfo_t typedef MLAN_PACK_START struct _IEEEtypes_CfParamSet_t { /** CF peremeter : Element ID */ - t_u8 element_id; + t_u8 element_id; /** CF peremeter : Length */ - t_u8 len; + t_u8 len; /** CF peremeter : Count */ - t_u8 cfp_cnt; + t_u8 cfp_cnt; /** CF peremeter : Period */ - t_u8 cfp_period; + t_u8 cfp_period; /** CF peremeter : Maximum duration */ - t_u16 cfp_max_duration; + t_u16 cfp_max_duration; /** CF peremeter : Remaining duration */ - t_u16 cfp_duration_remaining; + t_u16 cfp_duration_remaining; } MLAN_PACK_END IEEEtypes_CfParamSet_t, *pIEEEtypes_CfParamSet_t; /** IEEEtypes_IbssParamSet_t */ typedef MLAN_PACK_START struct _IEEEtypes_IbssParamSet_t { /** Element ID */ - t_u8 element_id; + t_u8 element_id; /** Length */ - t_u8 len; + t_u8 len; /** ATIM window value in milliseconds */ - t_u16 atim_window; + t_u16 atim_window; } MLAN_PACK_END IEEEtypes_IbssParamSet_t, *pIEEEtypes_IbssParamSet_t; /** IEEEtypes_SsParamSet_t */ typedef MLAN_PACK_START union _IEEEtypes_SsParamSet_t { /** SS parameter : CF parameter set */ - IEEEtypes_CfParamSet_t cf_param_set; + IEEEtypes_CfParamSet_t cf_param_set; /** SS parameter : IBSS parameter set */ - IEEEtypes_IbssParamSet_t ibss_param_set; + IEEEtypes_IbssParamSet_t ibss_param_set; } MLAN_PACK_END IEEEtypes_SsParamSet_t, *pIEEEtypes_SsParamSet_t; /** IEEEtypes_FhParamSet_t */ typedef MLAN_PACK_START struct _IEEEtypes_FhParamSet_t { /** FH parameter : Element ID */ - t_u8 element_id; + t_u8 element_id; /** FH parameter : Length */ - t_u8 len; + t_u8 len; /** FH parameter : Dwell time in milliseconds */ - t_u16 dwell_time; + t_u16 dwell_time; /** FH parameter : Hop set */ - t_u8 hop_set; + t_u8 hop_set; /** FH parameter : Hop pattern */ - t_u8 hop_pattern; + t_u8 hop_pattern; /** FH parameter : Hop index */ - t_u8 hop_index; + t_u8 hop_index; } MLAN_PACK_END IEEEtypes_FhParamSet_t, *pIEEEtypes_FhParamSet_t; /** IEEEtypes_DsParamSet_t */ typedef MLAN_PACK_START struct _IEEEtypes_DsParamSet_t { /** DS parameter : Element ID */ - t_u8 element_id; + t_u8 element_id; /** DS parameter : Length */ - t_u8 len; + t_u8 len; /** DS parameter : Current channel */ - t_u8 current_chan; + t_u8 current_chan; } MLAN_PACK_END IEEEtypes_DsParamSet_t, *pIEEEtypes_DsParamSet_t; /** IEEEtypes_PhyParamSet_t */ typedef MLAN_PACK_START union _IEEEtypes_PhyParamSet_t { /** FH parameter set */ - IEEEtypes_FhParamSet_t fh_param_set; + IEEEtypes_FhParamSet_t fh_param_set; /** DS parameter set */ - IEEEtypes_DsParamSet_t ds_param_set; + IEEEtypes_DsParamSet_t ds_param_set; } MLAN_PACK_END IEEEtypes_PhyParamSet_t, *pIEEEtypes_PhyParamSet_t; /** IEEEtypes_ERPInfo_t */ typedef MLAN_PACK_START struct _IEEEtypes_ERPInfo_t { /** Element ID */ - t_u8 element_id; + t_u8 element_id; /** Length */ - t_u8 len; + t_u8 len; /** ERP flags */ - t_u8 erp_flags; + t_u8 erp_flags; } MLAN_PACK_END IEEEtypes_ERPInfo_t, *pIEEEtypes_ERPInfo_t; /** IEEEtypes_AId_t */ @@ -330,13 +330,13 @@ typedef t_u16 IEEEtypes_StatusCode_t; typedef MLAN_PACK_START struct _IEEEtypes_AssocRsp_t { /** Capability information */ - IEEEtypes_CapInfo_t capability; + IEEEtypes_CapInfo_t capability; /** Association response status code */ - IEEEtypes_StatusCode_t status_code; + IEEEtypes_StatusCode_t status_code; /** Association ID */ - IEEEtypes_AId_t a_id; + IEEEtypes_AId_t a_id; /** IE data buffer */ - t_u8 ie_buffer[1]; + t_u8 ie_buffer[1]; } MLAN_PACK_END IEEEtypes_AssocRsp_t, *pIEEEtypes_AssocRsp_t; /** 802.11 supported rates */ @@ -369,50 +369,50 @@ typedef t_u8 WLAN_802_11_RATES[WLAN_SUPPORTED_RATES]; typedef MLAN_PACK_START struct _wpa_suite_t { /** OUI */ - t_u8 oui[3]; + t_u8 oui[3]; /** tyep */ - t_u8 type; + t_u8 type; } MLAN_PACK_END wpa_suite, wpa_suite_mcast_t; /** wpa_suite_ucast_t */ typedef MLAN_PACK_START struct { - /* count */ - t_u16 count; + /* count */ + t_u16 count; /** wpa_suite list */ - wpa_suite list[1]; + wpa_suite list[1]; } MLAN_PACK_END wpa_suite_ucast_t, wpa_suite_auth_key_mgmt_t; /** IEEEtypes_Rsn_t */ typedef MLAN_PACK_START struct _IEEEtypes_Rsn_t { /** Rsn : Element ID */ - t_u8 element_id; + t_u8 element_id; /** Rsn : Length */ - t_u8 len; + t_u8 len; /** Rsn : version */ - t_u16 version; + t_u16 version; /** Rsn : group cipher */ - wpa_suite_mcast_t group_cipher; + wpa_suite_mcast_t group_cipher; /** Rsn : pairwise cipher */ - wpa_suite_ucast_t pairwise_cipher; + wpa_suite_ucast_t pairwise_cipher; } MLAN_PACK_END IEEEtypes_Rsn_t, *pIEEEtypes_Rsn_t; /** IEEEtypes_Wpa_t */ typedef MLAN_PACK_START struct _IEEEtypes_Wpa_t { /** Wpa : Element ID */ - t_u8 element_id; + t_u8 element_id; /** Wpa : Length */ - t_u8 len; + t_u8 len; /** Wpa : oui */ - t_u8 oui[4]; + t_u8 oui[4]; /** version */ - t_u16 version; + t_u16 version; /** Wpa : group cipher */ - wpa_suite_mcast_t group_cipher; + wpa_suite_mcast_t group_cipher; /** Wpa : pairwise cipher */ - wpa_suite_ucast_t pairwise_cipher; + wpa_suite_ucast_t pairwise_cipher; } MLAN_PACK_END IEEEtypes_Wpa_t, *pIEEEtypes_Wpa_t; /** Maximum number of AC QOS queues available in the driver/firmware */ @@ -423,19 +423,19 @@ typedef MLAN_PACK_START struct _IEEEtypes_WmmQosInfo_t { #ifdef BIG_ENDIAN_SUPPORT /** QoS UAPSD */ - t_u8 qos_uapsd:1; + t_u8 qos_uapsd:1; /** Reserved */ - t_u8 reserved:3; + t_u8 reserved:3; /** Parameter set count */ - t_u8 para_set_count:4; + t_u8 para_set_count:4; #else /** Parameter set count */ - t_u8 para_set_count:4; + t_u8 para_set_count:4; /** Reserved */ - t_u8 reserved:3; + t_u8 reserved:3; /** QoS UAPSD */ - t_u8 qos_uapsd:1; -#endif /* BIG_ENDIAN_SUPPORT */ + t_u8 qos_uapsd:1; +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END IEEEtypes_WmmQosInfo_t, *pIEEEtypes_WmmQosInfo_t; /** Data structure of WMM Aci/Aifsn */ @@ -443,23 +443,23 @@ typedef MLAN_PACK_START struct _IEEEtypes_WmmAciAifsn_t { #ifdef BIG_ENDIAN_SUPPORT /** Reserved */ - t_u8 reserved:1; + t_u8 reserved:1; /** Aci */ - t_u8 aci:2; + t_u8 aci:2; /** Acm */ - t_u8 acm:1; + t_u8 acm:1; /** Aifsn */ - t_u8 aifsn:4; + t_u8 aifsn:4; #else /** Aifsn */ - t_u8 aifsn:4; + t_u8 aifsn:4; /** Acm */ - t_u8 acm:1; + t_u8 acm:1; /** Aci */ - t_u8 aci:2; + t_u8 aci:2; /** Reserved */ - t_u8 reserved:1; -#endif /* BIG_ENDIAN_SUPPORT */ + t_u8 reserved:1; +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END IEEEtypes_WmmAciAifsn_t, *pIEEEtypes_WmmAciAifsn_t; /** Data structure of WMM ECW */ @@ -467,23 +467,23 @@ typedef MLAN_PACK_START struct _IEEEtypes_WmmEcw_t { #ifdef BIG_ENDIAN_SUPPORT /** Maximum Ecw */ - t_u8 ecw_max:4; + t_u8 ecw_max:4; /** Minimum Ecw */ - t_u8 ecw_min:4; + t_u8 ecw_min:4; #else /** Minimum Ecw */ - t_u8 ecw_min:4; + t_u8 ecw_min:4; /** Maximum Ecw */ - t_u8 ecw_max:4; -#endif /* BIG_ENDIAN_SUPPORT */ + t_u8 ecw_max:4; +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END IEEEtypes_WmmEcw_t, *pIEEEtypes_WmmEcw_t; /** Data structure of WMM AC parameters */ typedef MLAN_PACK_START struct _IEEEtypes_WmmAcParameters_t { - IEEEtypes_WmmAciAifsn_t aci_aifsn; /**< AciAifSn */ - IEEEtypes_WmmEcw_t ecw; /**< Ecw */ - t_u16 tx_op_limit; /**< Tx op limit */ + IEEEtypes_WmmAciAifsn_t aci_aifsn; /**< AciAifSn */ + IEEEtypes_WmmEcw_t ecw; /**< Ecw */ + t_u16 tx_op_limit; /**< Tx op limit */ } MLAN_PACK_END IEEEtypes_WmmAcParameters_t, *pIEEEtypes_WmmAcParameters_t; /** Data structure of WMM Info IE */ @@ -493,16 +493,16 @@ typedef MLAN_PACK_START struct _IEEEtypes_WmmInfo_t /** * WMM Info IE - Vendor Specific Header: * element_id [221/0xdd] - * Len [7] + * Len [7] * Oui [00:50:f2] * OuiType [2] * OuiSubType [0] * Version [1] */ - IEEEtypes_VendorHeader_t vend_hdr; + IEEEtypes_VendorHeader_t vend_hdr; /** QoS information */ - IEEEtypes_WmmQosInfo_t qos_info; + IEEEtypes_WmmQosInfo_t qos_info; } MLAN_PACK_END IEEEtypes_WmmInfo_t, *pIEEEtypes_WmmInfo_t; @@ -512,31 +512,31 @@ typedef MLAN_PACK_START struct _IEEEtypes_WmmParameter_t /** * WMM Parameter IE - Vendor Specific Header: * element_id [221/0xdd] - * Len [24] + * Len [24] * Oui [00:50:f2] * OuiType [2] * OuiSubType [1] * Version [1] */ - IEEEtypes_VendorHeader_t vend_hdr; + IEEEtypes_VendorHeader_t vend_hdr; /** QoS information */ - IEEEtypes_WmmQosInfo_t qos_info; + IEEEtypes_WmmQosInfo_t qos_info; /** Reserved */ - t_u8 reserved; + t_u8 reserved; /** AC Parameters Record WMM_AC_BE, WMM_AC_BK, WMM_AC_VI, WMM_AC_VO */ - IEEEtypes_WmmAcParameters_t ac_params[MAX_AC_QUEUES]; + IEEEtypes_WmmAcParameters_t ac_params[MAX_AC_QUEUES]; } MLAN_PACK_END IEEEtypes_WmmParameter_t, *pIEEEtypes_WmmParameter_t; /** Enumerator for TSPEC direction */ typedef MLAN_PACK_START enum _IEEEtypes_WMM_TSPEC_TS_Info_Direction_e { - TSPEC_DIR_UPLINK = 0, - TSPEC_DIR_DOWNLINK = 1, - /* 2 is a reserved value */ - TSPEC_DIR_BIDIRECT = 3, + TSPEC_DIR_UPLINK = 0, + TSPEC_DIR_DOWNLINK = 1, + /* 2 is a reserved value */ + TSPEC_DIR_BIDIRECT = 3, } MLAN_PACK_END IEEEtypes_WMM_TSPEC_TS_Info_Direction_e; @@ -544,8 +544,8 @@ typedef MLAN_PACK_START enum _IEEEtypes_WMM_TSPEC_TS_Info_Direction_e typedef MLAN_PACK_START enum _IEEEtypes_WMM_TSPEC_TS_Info_PSB_e { - TSPEC_PSB_LEGACY = 0, - TSPEC_PSB_TRIG = 1, + TSPEC_PSB_LEGACY = 0, + TSPEC_PSB_TRIG = 1, } MLAN_PACK_END IEEEtypes_WMM_TSPEC_TS_Info_PSB_e; @@ -553,10 +553,10 @@ typedef MLAN_PACK_START enum _IEEEtypes_WMM_TSPEC_TS_Info_PSB_e typedef MLAN_PACK_START enum _IEEEtypes_WMM_TSPEC_TS_Info_AckPolicy_e { - TSPEC_ACKPOLICY_NORMAL = 0, - TSPEC_ACKPOLICY_NOACK = 1, - /* 2 is reserved */ - TSPEC_ACKPOLICY_BLOCKACK = 3, + TSPEC_ACKPOLICY_NORMAL = 0, + TSPEC_ACKPOLICY_NOACK = 1, + /* 2 is reserved */ + TSPEC_ACKPOLICY_BLOCKACK = 3, } MLAN_PACK_END IEEEtypes_WMM_TSPEC_TS_Info_AckPolicy_e; @@ -564,8 +564,8 @@ typedef MLAN_PACK_START enum _IEEEtypes_WMM_TSPEC_TS_Info_AckPolicy_e typedef MLAN_PACK_START enum _IEEEtypes_WMM_TSPEC_TS_TRAFFIC_TYPE_e { - TSPEC_TRAFFIC_APERIODIC = 0, - TSPEC_TRAFFIC_PERIODIC = 1, + TSPEC_TRAFFIC_APERIODIC = 0, + TSPEC_TRAFFIC_PERIODIC = 1, } MLAN_PACK_END IEEEtypes_WMM_TSPEC_TS_TRAFFIC_TYPE_e; @@ -573,31 +573,31 @@ typedef MLAN_PACK_START enum _IEEEtypes_WMM_TSPEC_TS_TRAFFIC_TYPE_e typedef MLAN_PACK_START struct { #ifdef BIG_ENDIAN_SUPPORT - t_u8 Reserved17_23:7; // ! Reserved - t_u8 Schedule:1; - IEEEtypes_WMM_TSPEC_TS_Info_AckPolicy_e AckPolicy:2; - t_u8 UserPri:3; // ! 802.1d User Priority - IEEEtypes_WMM_TSPEC_TS_Info_PSB_e PowerSaveBehavior:1; // ! - // Legacy/Trigg - t_u8 Aggregation:1; // ! Reserved - t_u8 AccessPolicy2:1; // ! - t_u8 AccessPolicy1:1; // ! - IEEEtypes_WMM_TSPEC_TS_Info_Direction_e Direction:2; - t_u8 TID:4; // ! Unique identifier - IEEEtypes_WMM_TSPEC_TS_TRAFFIC_TYPE_e TrafficType:1; + t_u8 Reserved17_23:7; // ! Reserved + t_u8 Schedule:1; + IEEEtypes_WMM_TSPEC_TS_Info_AckPolicy_e AckPolicy:2; + t_u8 UserPri:3; // ! 802.1d User Priority + IEEEtypes_WMM_TSPEC_TS_Info_PSB_e PowerSaveBehavior:1; // ! + // Legacy/Trigg + t_u8 Aggregation:1; // ! Reserved + t_u8 AccessPolicy2:1; // ! + t_u8 AccessPolicy1:1; // ! + IEEEtypes_WMM_TSPEC_TS_Info_Direction_e Direction:2; + t_u8 TID:4; // ! Unique identifier + IEEEtypes_WMM_TSPEC_TS_TRAFFIC_TYPE_e TrafficType:1; #else - IEEEtypes_WMM_TSPEC_TS_TRAFFIC_TYPE_e TrafficType:1; - t_u8 TID:4; // ! Unique identifier - IEEEtypes_WMM_TSPEC_TS_Info_Direction_e Direction:2; - t_u8 AccessPolicy1:1; // ! - t_u8 AccessPolicy2:1; // ! - t_u8 Aggregation:1; // ! Reserved - IEEEtypes_WMM_TSPEC_TS_Info_PSB_e PowerSaveBehavior:1; // ! - // Legacy/Trigg - t_u8 UserPri:3; // ! 802.1d User Priority - IEEEtypes_WMM_TSPEC_TS_Info_AckPolicy_e AckPolicy:2; - t_u8 Schedule:1; - t_u8 Reserved17_23:7; // ! Reserved + IEEEtypes_WMM_TSPEC_TS_TRAFFIC_TYPE_e TrafficType:1; + t_u8 TID:4; // ! Unique identifier + IEEEtypes_WMM_TSPEC_TS_Info_Direction_e Direction:2; + t_u8 AccessPolicy1:1; // ! + t_u8 AccessPolicy2:1; // ! + t_u8 Aggregation:1; // ! Reserved + IEEEtypes_WMM_TSPEC_TS_Info_PSB_e PowerSaveBehavior:1; // ! + // Legacy/Trigg + t_u8 UserPri:3; // ! 802.1d User Priority + IEEEtypes_WMM_TSPEC_TS_Info_AckPolicy_e AckPolicy:2; + t_u8 Schedule:1; + t_u8 Reserved17_23:7; // ! Reserved #endif } MLAN_PACK_END IEEEtypes_WMM_TSPEC_TS_Info_t; @@ -605,13 +605,13 @@ typedef MLAN_PACK_START struct typedef MLAN_PACK_START struct { #ifdef BIG_ENDIAN_SUPPORT - t_u16 Fixed:1; // ! 1: Fixed size given in Size, 0: Var, size - // is nominal - t_u16 Size:15; // ! Nominal size in octets + t_u16 Fixed:1; // ! 1: Fixed size given in Size, 0: Var, size + // is nominal + t_u16 Size:15; // ! Nominal size in octets #else - t_u16 Size:15; // ! Nominal size in octets - t_u16 Fixed:1; // ! 1: Fixed size given in Size, 0: Var, size - // is nominal + t_u16 Size:15; // ! Nominal size in octets + t_u16 Fixed:1; // ! 1: Fixed size given in Size, 0: Var, size + // is nominal #endif } MLAN_PACK_END IEEEtypes_WMM_TSPEC_NomMSDUSize_t; @@ -619,11 +619,11 @@ typedef MLAN_PACK_START struct typedef MLAN_PACK_START struct { #ifdef BIG_ENDIAN_SUPPORT - t_u16 Whole:3; // ! Whole portion - t_u16 Fractional:13; // ! Fractional portion + t_u16 Whole:3; // ! Whole portion + t_u16 Fractional:13; // ! Fractional portion #else - t_u16 Fractional:13; // ! Fractional portion - t_u16 Whole:3; // ! Whole portion + t_u16 Fractional:13; // ! Fractional portion + t_u16 Whole:3; // ! Whole portion #endif } MLAN_PACK_END IEEEtypes_WMM_TSPEC_SBWA; @@ -631,34 +631,34 @@ typedef MLAN_PACK_START struct typedef MLAN_PACK_START struct { - IEEEtypes_WMM_TSPEC_TS_Info_t TSInfo; - IEEEtypes_WMM_TSPEC_NomMSDUSize_t NomMSDUSize; - t_u16 MaximumMSDUSize; - t_u32 MinServiceInterval; - t_u32 MaxServiceInterval; - t_u32 InactivityInterval; - t_u32 SuspensionInterval; - t_u32 ServiceStartTime; - t_u32 MinimumDataRate; - t_u32 MeanDataRate; - t_u32 PeakDataRate; - t_u32 MaxBurstSize; - t_u32 DelayBound; - t_u32 MinPHYRate; - IEEEtypes_WMM_TSPEC_SBWA SurplusBWAllowance; - t_u16 MediumTime; + IEEEtypes_WMM_TSPEC_TS_Info_t TSInfo; + IEEEtypes_WMM_TSPEC_NomMSDUSize_t NomMSDUSize; + t_u16 MaximumMSDUSize; + t_u32 MinServiceInterval; + t_u32 MaxServiceInterval; + t_u32 InactivityInterval; + t_u32 SuspensionInterval; + t_u32 ServiceStartTime; + t_u32 MinimumDataRate; + t_u32 MeanDataRate; + t_u32 PeakDataRate; + t_u32 MaxBurstSize; + t_u32 DelayBound; + t_u32 MinPHYRate; + IEEEtypes_WMM_TSPEC_SBWA SurplusBWAllowance; + t_u16 MediumTime; } MLAN_PACK_END IEEEtypes_WMM_TSPEC_Body_t; /** Data structure of WMM TSPEC all elements */ typedef MLAN_PACK_START struct { - t_u8 ElementId; - t_u8 Len; - t_u8 OuiType[4]; /* 00:50:f2:02 */ - t_u8 OuiSubType; /* 01 */ - t_u8 Version; + t_u8 ElementId; + t_u8 Len; + t_u8 OuiType[4]; /* 00:50:f2:02 */ + t_u8 OuiSubType; /* 01 */ + t_u8 Version; - IEEEtypes_WMM_TSPEC_Body_t TspecBody; + IEEEtypes_WMM_TSPEC_Body_t TspecBody; } MLAN_PACK_END IEEEtypes_WMM_TSPEC_t; @@ -666,28 +666,28 @@ typedef MLAN_PACK_START struct typedef MLAN_PACK_START enum _IEEEtypes_ActionCategory_e { - IEEE_MGMT_ACTION_CATEGORY_SPECTRUM_MGMT = 0, - IEEE_MGMT_ACTION_CATEGORY_QOS = 1, - IEEE_MGMT_ACTION_CATEGORY_DLS = 2, - IEEE_MGMT_ACTION_CATEGORY_BLOCK_ACK = 3, - IEEE_MGMT_ACTION_CATEGORY_PUBLIC = 4, - IEEE_MGMT_ACTION_CATEGORY_RADIO_RSRC = 5, - IEEE_MGMT_ACTION_CATEGORY_FAST_BSS_TRANS = 6, - IEEE_MGMT_ACTION_CATEGORY_HT = 7, + IEEE_MGMT_ACTION_CATEGORY_SPECTRUM_MGMT = 0, + IEEE_MGMT_ACTION_CATEGORY_QOS = 1, + IEEE_MGMT_ACTION_CATEGORY_DLS = 2, + IEEE_MGMT_ACTION_CATEGORY_BLOCK_ACK = 3, + IEEE_MGMT_ACTION_CATEGORY_PUBLIC = 4, + IEEE_MGMT_ACTION_CATEGORY_RADIO_RSRC = 5, + IEEE_MGMT_ACTION_CATEGORY_FAST_BSS_TRANS = 6, + IEEE_MGMT_ACTION_CATEGORY_HT = 7, - IEEE_MGMT_ACTION_CATEGORY_WNM = 10, - IEEE_MGMT_ACTION_CATEGORY_UNPROTECT_WNM = 11, + IEEE_MGMT_ACTION_CATEGORY_WNM = 10, + IEEE_MGMT_ACTION_CATEGORY_UNPROTECT_WNM = 11, - IEEE_MGMT_ACTION_CATEGORY_WMM_TSPEC = 17 + IEEE_MGMT_ACTION_CATEGORY_WMM_TSPEC = 17 } MLAN_PACK_END IEEEtypes_ActionCategory_e; /** WMM TSPEC operations */ typedef MLAN_PACK_START enum _IEEEtypes_WMM_Tspec_Action_e { - TSPEC_ACTION_CODE_ADDTS_REQ = 0, - TSPEC_ACTION_CODE_ADDTS_RSP = 1, - TSPEC_ACTION_CODE_DELTS = 2, + TSPEC_ACTION_CODE_ADDTS_REQ = 0, + TSPEC_ACTION_CODE_ADDTS_RSP = 1, + TSPEC_ACTION_CODE_DELTS = 2, } MLAN_PACK_END IEEEtypes_WMM_Tspec_Action_e; @@ -695,9 +695,9 @@ typedef MLAN_PACK_START enum _IEEEtypes_WMM_Tspec_Action_e typedef MLAN_PACK_START struct { - IEEEtypes_ActionCategory_e category; - IEEEtypes_WMM_Tspec_Action_e action; - t_u8 dialogToken; + IEEEtypes_ActionCategory_e category; + IEEEtypes_WMM_Tspec_Action_e action; + t_u8 dialogToken; } MLAN_PACK_END IEEEtypes_WMM_Tspec_Action_Base_Tspec_t; @@ -705,53 +705,53 @@ typedef MLAN_PACK_START struct typedef MLAN_PACK_START struct { - IEEEtypes_WMM_Tspec_Action_Base_Tspec_t tspecAct; - t_u8 statusCode; - IEEEtypes_WMM_TSPEC_t tspecIE; + IEEEtypes_WMM_Tspec_Action_Base_Tspec_t tspecAct; + t_u8 statusCode; + IEEEtypes_WMM_TSPEC_t tspecIE; - /* Place holder for additional elements after the TSPEC */ - t_u8 subElem[256]; + /* Place holder for additional elements after the TSPEC */ + t_u8 subElem[256]; } MLAN_PACK_END IEEEtypes_Action_WMM_AddTsReq_t; /** WMM TSPEC AddTS response structure */ typedef MLAN_PACK_START struct { - IEEEtypes_WMM_Tspec_Action_Base_Tspec_t tspecAct; - t_u8 statusCode; - IEEEtypes_WMM_TSPEC_t tspecIE; + IEEEtypes_WMM_Tspec_Action_Base_Tspec_t tspecAct; + t_u8 statusCode; + IEEEtypes_WMM_TSPEC_t tspecIE; - /* Place holder for additional elements after the TSPEC */ - t_u8 subElem[256]; + /* Place holder for additional elements after the TSPEC */ + t_u8 subElem[256]; } MLAN_PACK_END IEEEtypes_Action_WMM_AddTsRsp_t; /** WMM TSPEC DelTS structure */ typedef MLAN_PACK_START struct { - IEEEtypes_WMM_Tspec_Action_Base_Tspec_t tspecAct; - t_u8 reasonCode; - IEEEtypes_WMM_TSPEC_t tspecIE; + IEEEtypes_WMM_Tspec_Action_Base_Tspec_t tspecAct; + t_u8 reasonCode; + IEEEtypes_WMM_TSPEC_t tspecIE; } MLAN_PACK_END IEEEtypes_Action_WMM_DelTs_t; /** union of WMM TSPEC structures */ typedef MLAN_PACK_START union { - IEEEtypes_WMM_Tspec_Action_Base_Tspec_t tspecAct; + IEEEtypes_WMM_Tspec_Action_Base_Tspec_t tspecAct; - IEEEtypes_Action_WMM_AddTsReq_t addTsReq; - IEEEtypes_Action_WMM_AddTsRsp_t addTsRsp; - IEEEtypes_Action_WMM_DelTs_t delTs; + IEEEtypes_Action_WMM_AddTsReq_t addTsReq; + IEEEtypes_Action_WMM_AddTsRsp_t addTsRsp; + IEEEtypes_Action_WMM_DelTs_t delTs; } MLAN_PACK_END IEEEtypes_Action_WMMAC_t; /** union of WMM TSPEC & Action category */ typedef MLAN_PACK_START union { - IEEEtypes_ActionCategory_e category; + IEEEtypes_ActionCategory_e category; - IEEEtypes_Action_WMMAC_t wmmAc; + IEEEtypes_Action_WMMAC_t wmmAc; } MLAN_PACK_END IEEEtypes_ActionFrame_t; @@ -759,11 +759,11 @@ typedef MLAN_PACK_START union typedef MLAN_PACK_START struct _IEEEtypes_SubbandSet_t { /** First channel */ - t_u8 first_chan; + t_u8 first_chan; /** Number of channels */ - t_u8 no_of_chan; + t_u8 no_of_chan; /** Maximum Tx power in dBm */ - t_u8 max_tx_pwr; + t_u8 max_tx_pwr; } MLAN_PACK_END IEEEtypes_SubbandSet_t, *pIEEEtypes_SubbandSet_t; #ifdef STA_SUPPORT @@ -771,28 +771,28 @@ typedef MLAN_PACK_START struct _IEEEtypes_SubbandSet_t typedef MLAN_PACK_START struct _IEEEtypes_CountryInfoSet_t { /** Element ID */ - t_u8 element_id; + t_u8 element_id; /** Length */ - t_u8 len; + t_u8 len; /** Country code */ - t_u8 country_code[COUNTRY_CODE_LEN]; + t_u8 country_code[COUNTRY_CODE_LEN]; /** Set of subbands */ - IEEEtypes_SubbandSet_t sub_band[1]; + IEEEtypes_SubbandSet_t sub_band[1]; } MLAN_PACK_END IEEEtypes_CountryInfoSet_t, *pIEEEtypes_CountryInfoSet_t; /** Data structure for Country IE full set */ typedef MLAN_PACK_START struct _IEEEtypes_CountryInfoFullSet_t { /** Element ID */ - t_u8 element_id; + t_u8 element_id; /** Length */ - t_u8 len; + t_u8 len; /** Country code */ - t_u8 country_code[COUNTRY_CODE_LEN]; + t_u8 country_code[COUNTRY_CODE_LEN]; /** Set of subbands */ - IEEEtypes_SubbandSet_t sub_band[MRVDRV_MAX_SUBBAND_802_11D]; + IEEEtypes_SubbandSet_t sub_band[MRVDRV_MAX_SUBBAND_802_11D]; } MLAN_PACK_END IEEEtypes_CountryInfoFullSet_t, - *pIEEEtypes_CountryInfoFullSet_t; + *pIEEEtypes_CountryInfoFullSet_t; #endif /* STA_SUPPORT */ @@ -800,39 +800,39 @@ typedef MLAN_PACK_START struct _IEEEtypes_CountryInfoFullSet_t typedef struct MLAN_PACK_START _HTCap_t { /** HT Capabilities Info field */ - t_u16 ht_cap_info; + t_u16 ht_cap_info; /** A-MPDU Parameters field */ - t_u8 ampdu_param; + t_u8 ampdu_param; /** Supported MCS Set field */ - t_u8 supported_mcs_set[16]; + t_u8 supported_mcs_set[16]; /** HT Extended Capabilities field */ - t_u16 ht_ext_cap; + t_u16 ht_ext_cap; /** Transmit Beamforming Capabilities field */ - t_u32 tx_bf_cap; + t_u32 tx_bf_cap; /** Antenna Selection Capability field */ - t_u8 asel; + t_u8 asel; } MLAN_PACK_END HTCap_t, *pHTCap_t; /** HT Information Data */ typedef struct MLAN_PACK_START _HTInfo_t { /** Primary channel */ - t_u8 pri_chan; + t_u8 pri_chan; /** Field 2 */ - t_u8 field2; + t_u8 field2; /** Field 3 */ - t_u16 field3; + t_u16 field3; /** Field 4 */ - t_u16 field4; + t_u16 field4; /** Bitmap indicating MCSs supported by all HT STAs in the BSS */ - t_u8 basic_mcs_set[16]; + t_u8 basic_mcs_set[16]; } MLAN_PACK_END HTInfo_t, *pHTInfo_t; /** 20/40 BSS Coexistence Data */ typedef struct MLAN_PACK_START _BSSCo2040_t { /** 20/40 BSS Coexistence value */ - t_u8 bss_co_2040_value; + t_u8 bss_co_2040_value; } MLAN_PACK_END BSSCo2040_t, *pBSSCo2040_t; #ifdef BIG_ENDIAN_SUPPORT @@ -840,140 +840,140 @@ typedef struct MLAN_PACK_START _BSSCo2040_t typedef struct MLAN_PACK_START _ExtCap_t { /** Extended Capabilities value */ - t_u8 rsvdBit63:1; /* bit 63 */ - t_u8 OperModeNtf:1; /* bit 62 */ - t_u8 TDLSWildBandwidth:1; /* bit 61 */ - t_u8 rsvdBit60:1; /* bit 60 */ - t_u8 rsvdBit59:1; /* bit 59 */ - t_u8 rsvdBit58:1; /* bit 58 */ - t_u8 rsvdBit57:1; /* bit 57 */ - t_u8 rsvdBit56:1; /* bit 56 */ - t_u8 rsvdBit55:1; /* bit 55 */ - t_u8 rsvdBit54:1; /* bit 54 */ - t_u8 rsvdBit53:1; /* bit 53 */ - t_u8 rsvdBit52:1; /* bit 52 */ - t_u8 rsvdBit51:1; /* bit 51 */ - t_u8 rsvdBit50:1; /* bit 50 */ - t_u8 rsvdBit49:1; /* bit 49 */ - t_u8 rsvdBit48:1; /* bit 48 */ - t_u8 rsvdBit47:1; /* bit 47 */ - t_u8 rsvdBit46:1; /* bit 46 */ - t_u8 rsvdBit45:1; /* bit 45 */ - t_u8 rsvdBit44:1; /* bit 44 */ - t_u8 rsvdBit43:1; /* bit 43 */ - t_u8 rsvdBit42:1; /* bit 42 */ - t_u8 rsvdBit41:1; /* bit 41 */ - t_u8 rsvdBit40:1; /* bit 40 */ - t_u8 TDLSChlSwitchProhib:1; /* bit 39 */ - t_u8 TDLSProhibited:1; /* bit 38 */ - t_u8 TDLSSupport:1; /* bit 37 */ - t_u8 MSGCF_Capa:1; /* bit 36 */ - t_u8 Reserved35:1; /* bit 35 */ - t_u8 SSPN_Interface:1; /* bit 34 */ - t_u8 EBR:1; /* bit 33 */ - t_u8 Qos_Map:1; /* bit 32 */ - t_u8 Interworking:1; /* bit 31 */ - t_u8 TDLSChannelSwitching:1; /* bit 30 */ - t_u8 TDLSPeerPSMSupport:1; /* bit 29 */ - t_u8 TDLSPeerUAPSDSupport:1; /* bit 28 */ - t_u8 UTC:1; /* bit 27 */ - t_u8 DMS:1; /* bit 26 */ - t_u8 SSID_List:1; /* bit 25 */ - t_u8 ChannelUsage:1; /* bit 24 */ - t_u8 TimingMeasurement:1; /* bit 23 */ - t_u8 MultipleBSSID:1; /* bit 22 */ - t_u8 AC_StationCount:1; /* bit 21 */ - t_u8 QoSTrafficCap:1; /* bit 20 */ - t_u8 BSS_Transition:1; /* bit 19 */ - t_u8 TIM_Broadcast:1; /* bit 18 */ - t_u8 WNM_Sleep:1; /* bit 17 */ - t_u8 TFS:1; /* bit 16 */ - t_u8 GeospatialLocation:1; /* bit 15 */ - t_u8 CivicLocation:1; /* bit 14 */ - t_u8 CollocatedIntf:1; /* bit 13 */ - t_u8 ProxyARPService:1; /* bit 12 */ - t_u8 FMS:1; /* bit 11 */ - t_u8 LocationTracking:1; /* bit 10 */ - t_u8 MulticastDiagnostics:1; /* bit 9 */ - t_u8 Diagnostics:1; /* bit 8 */ - t_u8 Event:1; /* bit 7 */ - t_u8 SPSMP_Support:1; /* bit 6 */ - t_u8 Reserved5:1; /* bit 5 */ - t_u8 PSMP_Capable:1; /* bit 4 */ - t_u8 RejectUnadmFrame:1; /* bit 3 */ - t_u8 ExtChanSwitching:1; /* bit 2 */ - t_u8 Reserved1:1; /* bit 1 */ - t_u8 BSS_CoexistSupport:1; /* bit 0 */ + t_u8 rsvdBit63:1; /* bit 63 */ + t_u8 OperModeNtf:1; /* bit 62 */ + t_u8 TDLSWildBandwidth:1; /* bit 61 */ + t_u8 rsvdBit60:1; /* bit 60 */ + t_u8 rsvdBit59:1; /* bit 59 */ + t_u8 rsvdBit58:1; /* bit 58 */ + t_u8 rsvdBit57:1; /* bit 57 */ + t_u8 rsvdBit56:1; /* bit 56 */ + t_u8 rsvdBit55:1; /* bit 55 */ + t_u8 rsvdBit54:1; /* bit 54 */ + t_u8 rsvdBit53:1; /* bit 53 */ + t_u8 rsvdBit52:1; /* bit 52 */ + t_u8 rsvdBit51:1; /* bit 51 */ + t_u8 rsvdBit50:1; /* bit 50 */ + t_u8 rsvdBit49:1; /* bit 49 */ + t_u8 rsvdBit48:1; /* bit 48 */ + t_u8 rsvdBit47:1; /* bit 47 */ + t_u8 rsvdBit46:1; /* bit 46 */ + t_u8 rsvdBit45:1; /* bit 45 */ + t_u8 rsvdBit44:1; /* bit 44 */ + t_u8 rsvdBit43:1; /* bit 43 */ + t_u8 rsvdBit42:1; /* bit 42 */ + t_u8 rsvdBit41:1; /* bit 41 */ + t_u8 rsvdBit40:1; /* bit 40 */ + t_u8 TDLSChlSwitchProhib:1; /* bit 39 */ + t_u8 TDLSProhibited:1; /* bit 38 */ + t_u8 TDLSSupport:1; /* bit 37 */ + t_u8 MSGCF_Capa:1; /* bit 36 */ + t_u8 Reserved35:1; /* bit 35 */ + t_u8 SSPN_Interface:1; /* bit 34 */ + t_u8 EBR:1; /* bit 33 */ + t_u8 Qos_Map:1; /* bit 32 */ + t_u8 Interworking:1; /* bit 31 */ + t_u8 TDLSChannelSwitching:1; /* bit 30 */ + t_u8 TDLSPeerPSMSupport:1; /* bit 29 */ + t_u8 TDLSPeerUAPSDSupport:1; /* bit 28 */ + t_u8 UTC:1; /* bit 27 */ + t_u8 DMS:1; /* bit 26 */ + t_u8 SSID_List:1; /* bit 25 */ + t_u8 ChannelUsage:1; /* bit 24 */ + t_u8 TimingMeasurement:1; /* bit 23 */ + t_u8 MultipleBSSID:1; /* bit 22 */ + t_u8 AC_StationCount:1; /* bit 21 */ + t_u8 QoSTrafficCap:1; /* bit 20 */ + t_u8 BSS_Transition:1; /* bit 19 */ + t_u8 TIM_Broadcast:1; /* bit 18 */ + t_u8 WNM_Sleep:1; /* bit 17 */ + t_u8 TFS:1; /* bit 16 */ + t_u8 GeospatialLocation:1; /* bit 15 */ + t_u8 CivicLocation:1; /* bit 14 */ + t_u8 CollocatedIntf:1; /* bit 13 */ + t_u8 ProxyARPService:1; /* bit 12 */ + t_u8 FMS:1; /* bit 11 */ + t_u8 LocationTracking:1; /* bit 10 */ + t_u8 MulticastDiagnostics:1; /* bit 9 */ + t_u8 Diagnostics:1; /* bit 8 */ + t_u8 Event:1; /* bit 7 */ + t_u8 SPSMP_Support:1; /* bit 6 */ + t_u8 Reserved5:1; /* bit 5 */ + t_u8 PSMP_Capable:1; /* bit 4 */ + t_u8 RejectUnadmFrame:1; /* bit 3 */ + t_u8 ExtChanSwitching:1; /* bit 2 */ + t_u8 Reserved1:1; /* bit 1 */ + t_u8 BSS_CoexistSupport:1; /* bit 0 */ } MLAN_PACK_END ExtCap_t, *pExtCap_t; #else /** Extended Capabilities Data */ typedef struct MLAN_PACK_START _ExtCap_t { /** Extended Capabilities value */ - t_u8 BSS_CoexistSupport:1; /* bit 0 */ - t_u8 Reserved1:1; /* bit 1 */ - t_u8 ExtChanSwitching:1; /* bit 2 */ - t_u8 RejectUnadmFrame:1; /* bit 3 */ - t_u8 PSMP_Capable:1; /* bit 4 */ - t_u8 Reserved5:1; /* bit 5 */ - t_u8 SPSMP_Support:1; /* bit 6 */ - t_u8 Event:1; /* bit 7 */ - t_u8 Diagnostics:1; /* bit 8 */ - t_u8 MulticastDiagnostics:1; /* bit 9 */ - t_u8 LocationTracking:1; /* bit 10 */ - t_u8 FMS:1; /* bit 11 */ - t_u8 ProxyARPService:1; /* bit 12 */ - t_u8 CollocatedIntf:1; /* bit 13 */ - t_u8 CivicLocation:1; /* bit 14 */ - t_u8 GeospatialLocation:1; /* bit 15 */ - t_u8 TFS:1; /* bit 16 */ - t_u8 WNM_Sleep:1; /* bit 17 */ - t_u8 TIM_Broadcast:1; /* bit 18 */ - t_u8 BSS_Transition:1; /* bit 19 */ - t_u8 QoSTrafficCap:1; /* bit 20 */ - t_u8 AC_StationCount:1; /* bit 21 */ - t_u8 MultipleBSSID:1; /* bit 22 */ - t_u8 TimingMeasurement:1; /* bit 23 */ - t_u8 ChannelUsage:1; /* bit 24 */ - t_u8 SSID_List:1; /* bit 25 */ - t_u8 DMS:1; /* bit 26 */ - t_u8 UTC:1; /* bit 27 */ - t_u8 TDLSPeerUAPSDSupport:1; /* bit 28 */ - t_u8 TDLSPeerPSMSupport:1; /* bit 29 */ - t_u8 TDLSChannelSwitching:1; /* bit 30 */ - t_u8 Interworking:1; /* bit 31 */ - t_u8 Qos_Map:1; /* bit 32 */ - t_u8 EBR:1; /* bit 33 */ - t_u8 SSPN_Interface:1; /* bit 34 */ - t_u8 Reserved35:1; /* bit 35 */ - t_u8 MSGCF_Capa:1; /* bit 36 */ - t_u8 TDLSSupport:1; /* bit 37 */ - t_u8 TDLSProhibited:1; /* bit 38 */ - t_u8 TDLSChlSwitchProhib:1; /* bit 39 */ - t_u8 rsvdBit40:1; /* bit 40 */ - t_u8 rsvdBit41:1; /* bit 41 */ - t_u8 rsvdBit42:1; /* bit 42 */ - t_u8 rsvdBit43:1; /* bit 43 */ - t_u8 rsvdBit44:1; /* bit 44 */ - t_u8 rsvdBit45:1; /* bit 45 */ - t_u8 rsvdBit46:1; /* bit 46 */ - t_u8 rsvdBit47:1; /* bit 47 */ - t_u8 rsvdBit48:1; /* bit 48 */ - t_u8 rsvdBit49:1; /* bit 49 */ - t_u8 rsvdBit50:1; /* bit 50 */ - t_u8 rsvdBit51:1; /* bit 51 */ - t_u8 rsvdBit52:1; /* bit 52 */ - t_u8 rsvdBit53:1; /* bit 53 */ - t_u8 rsvdBit54:1; /* bit 54 */ - t_u8 rsvdBit55:1; /* bit 55 */ - t_u8 rsvdBit56:1; /* bit 56 */ - t_u8 rsvdBit57:1; /* bit 57 */ - t_u8 rsvdBit58:1; /* bit 58 */ - t_u8 rsvdBit59:1; /* bit 59 */ - t_u8 rsvdBit60:1; /* bit 60 */ - t_u8 TDLSWildBandwidth:1; /* bit 61 */ - t_u8 OperModeNtf:1; /* bit 62 */ - t_u8 rsvdBit63:1; /* bit 63 */ + t_u8 BSS_CoexistSupport:1; /* bit 0 */ + t_u8 Reserved1:1; /* bit 1 */ + t_u8 ExtChanSwitching:1; /* bit 2 */ + t_u8 RejectUnadmFrame:1; /* bit 3 */ + t_u8 PSMP_Capable:1; /* bit 4 */ + t_u8 Reserved5:1; /* bit 5 */ + t_u8 SPSMP_Support:1; /* bit 6 */ + t_u8 Event:1; /* bit 7 */ + t_u8 Diagnostics:1; /* bit 8 */ + t_u8 MulticastDiagnostics:1; /* bit 9 */ + t_u8 LocationTracking:1; /* bit 10 */ + t_u8 FMS:1; /* bit 11 */ + t_u8 ProxyARPService:1; /* bit 12 */ + t_u8 CollocatedIntf:1; /* bit 13 */ + t_u8 CivicLocation:1; /* bit 14 */ + t_u8 GeospatialLocation:1; /* bit 15 */ + t_u8 TFS:1; /* bit 16 */ + t_u8 WNM_Sleep:1; /* bit 17 */ + t_u8 TIM_Broadcast:1; /* bit 18 */ + t_u8 BSS_Transition:1; /* bit 19 */ + t_u8 QoSTrafficCap:1; /* bit 20 */ + t_u8 AC_StationCount:1; /* bit 21 */ + t_u8 MultipleBSSID:1; /* bit 22 */ + t_u8 TimingMeasurement:1; /* bit 23 */ + t_u8 ChannelUsage:1; /* bit 24 */ + t_u8 SSID_List:1; /* bit 25 */ + t_u8 DMS:1; /* bit 26 */ + t_u8 UTC:1; /* bit 27 */ + t_u8 TDLSPeerUAPSDSupport:1; /* bit 28 */ + t_u8 TDLSPeerPSMSupport:1; /* bit 29 */ + t_u8 TDLSChannelSwitching:1; /* bit 30 */ + t_u8 Interworking:1; /* bit 31 */ + t_u8 Qos_Map:1; /* bit 32 */ + t_u8 EBR:1; /* bit 33 */ + t_u8 SSPN_Interface:1; /* bit 34 */ + t_u8 Reserved35:1; /* bit 35 */ + t_u8 MSGCF_Capa:1; /* bit 36 */ + t_u8 TDLSSupport:1; /* bit 37 */ + t_u8 TDLSProhibited:1; /* bit 38 */ + t_u8 TDLSChlSwitchProhib:1; /* bit 39 */ + t_u8 rsvdBit40:1; /* bit 40 */ + t_u8 rsvdBit41:1; /* bit 41 */ + t_u8 rsvdBit42:1; /* bit 42 */ + t_u8 rsvdBit43:1; /* bit 43 */ + t_u8 rsvdBit44:1; /* bit 44 */ + t_u8 rsvdBit45:1; /* bit 45 */ + t_u8 rsvdBit46:1; /* bit 46 */ + t_u8 rsvdBit47:1; /* bit 47 */ + t_u8 rsvdBit48:1; /* bit 48 */ + t_u8 rsvdBit49:1; /* bit 49 */ + t_u8 rsvdBit50:1; /* bit 50 */ + t_u8 rsvdBit51:1; /* bit 51 */ + t_u8 rsvdBit52:1; /* bit 52 */ + t_u8 rsvdBit53:1; /* bit 53 */ + t_u8 rsvdBit54:1; /* bit 54 */ + t_u8 rsvdBit55:1; /* bit 55 */ + t_u8 rsvdBit56:1; /* bit 56 */ + t_u8 rsvdBit57:1; /* bit 57 */ + t_u8 rsvdBit58:1; /* bit 58 */ + t_u8 rsvdBit59:1; /* bit 59 */ + t_u8 rsvdBit60:1; /* bit 60 */ + t_u8 TDLSWildBandwidth:1; /* bit 61 */ + t_u8 OperModeNtf:1; /* bit 62 */ + t_u8 rsvdBit63:1; /* bit 63 */ } MLAN_PACK_END ExtCap_t, *pExtCap_t; #endif @@ -981,74 +981,74 @@ typedef struct MLAN_PACK_START _ExtCap_t typedef struct MLAN_PACK_START _OverlapBSSScanParam_t { /** OBSS Scan Passive Dwell in milliseconds */ - t_u16 obss_scan_passive_dwell; + t_u16 obss_scan_passive_dwell; /** OBSS Scan Active Dwell in milliseconds */ - t_u16 obss_scan_active_dwell; + t_u16 obss_scan_active_dwell; /** BSS Channel Width Trigger Scan Interval in seconds */ - t_u16 bss_chan_width_trigger_scan_int; + t_u16 bss_chan_width_trigger_scan_int; /** OBSS Scan Passive Total Per Channel */ - t_u16 obss_scan_passive_total; + t_u16 obss_scan_passive_total; /** OBSS Scan Active Total Per Channel */ - t_u16 obss_scan_active_total; + t_u16 obss_scan_active_total; /** BSS Width Channel Transition Delay Factor */ - t_u16 bss_width_chan_trans_delay; + t_u16 bss_width_chan_trans_delay; /** OBSS Scan Activity Threshold */ - t_u16 obss_scan_active_threshold; + t_u16 obss_scan_active_threshold; } MLAN_PACK_END OBSSScanParam_t, *pOBSSScanParam_t; /** HT Capabilities IE */ typedef MLAN_PACK_START struct _IEEEtypes_HTCap_t { /** Generic IE header */ - IEEEtypes_Header_t ieee_hdr; + IEEEtypes_Header_t ieee_hdr; /** HTCap struct */ - HTCap_t ht_cap; + HTCap_t ht_cap; } MLAN_PACK_END IEEEtypes_HTCap_t, *pIEEEtypes_HTCap_t; /** HT Information IE */ typedef MLAN_PACK_START struct _IEEEtypes_HTInfo_t { /** Generic IE header */ - IEEEtypes_Header_t ieee_hdr; + IEEEtypes_Header_t ieee_hdr; /** HTInfo struct */ - HTInfo_t ht_info; + HTInfo_t ht_info; } MLAN_PACK_END IEEEtypes_HTInfo_t, *pIEEEtypes_HTInfo_t; /** 20/40 BSS Coexistence IE */ typedef MLAN_PACK_START struct _IEEEtypes_2040BSSCo_t { /** Generic IE header */ - IEEEtypes_Header_t ieee_hdr; + IEEEtypes_Header_t ieee_hdr; /** BSSCo2040_t struct */ - BSSCo2040_t bss_co_2040; + BSSCo2040_t bss_co_2040; } MLAN_PACK_END IEEEtypes_2040BSSCo_t, *pIEEEtypes_2040BSSCo_t; /** Extended Capabilities IE */ typedef MLAN_PACK_START struct _IEEEtypes_ExtCap_t { /** Generic IE header */ - IEEEtypes_Header_t ieee_hdr; + IEEEtypes_Header_t ieee_hdr; /** ExtCap_t struct */ - ExtCap_t ext_cap; + ExtCap_t ext_cap; } MLAN_PACK_END IEEEtypes_ExtCap_t, *pIEEEtypes_ExtCap_t; /** Overlapping BSS Scan Parameters IE */ typedef MLAN_PACK_START struct _IEEEtypes_OverlapBSSScanParam_t { /** Generic IE header */ - IEEEtypes_Header_t ieee_hdr; + IEEEtypes_Header_t ieee_hdr; /** OBSSScanParam_t struct */ - OBSSScanParam_t obss_scan_param; + OBSSScanParam_t obss_scan_param; } MLAN_PACK_END IEEEtypes_OverlapBSSScanParam_t, - *pIEEEtypes_OverlapBSSScanParam_t; + *pIEEEtypes_OverlapBSSScanParam_t; /** VHT MCS rate set field, refer to 802.11ac */ typedef MLAN_PACK_START struct _VHT_MCS_set { - t_u16 rx_mcs_map; - t_u16 rx_max_rate; /* bit 29-31 reserved */ - t_u16 tx_mcs_map; - t_u16 tx_max_rate; /* bit 61-63 reserved */ + t_u16 rx_mcs_map; + t_u16 rx_max_rate; /* bit 29-31 reserved */ + t_u16 tx_mcs_map; + t_u16 tx_max_rate; /* bit 61-63 reserved */ } MLAN_PACK_END VHT_MCS_set_t, *pVHT_MCS_set_t; /** VHT Capabilities info field, reference 802.11ac D1.4 p89 */ @@ -1056,55 +1056,55 @@ typedef MLAN_PACK_START struct _VHT_capa { #if 0 #ifdef BIG_ENDIAN_SUPPORT - t_u8 mpdu_max_len:2; - t_u8 chan_width:2; - t_u8 rx_LDPC:1; - t_u8 sgi_80:1; - t_u8 sgi_160:1; - t_u8 tx_STBC:1; - t_u8 rx_STBC:3; - t_u8 SU_beamformer_capa:1; - t_u8 SU_beamformee_capa:1; - t_u8 beamformer_ante_num:3; - t_u8 sounding_dim_num:3; - t_u8 MU_beamformer_capa:1; - t_u8 MU_beamformee_capa:1; - t_u8 VHT_TXOP_ps:1; - t_u8 HTC_VHT_capa:1; - t_u8 max_ampdu_len:3; - t_u8 link_apapt_capa:2; - t_u8 reserved_1:4; + t_u8 mpdu_max_len:2; + t_u8 chan_width:2; + t_u8 rx_LDPC:1; + t_u8 sgi_80:1; + t_u8 sgi_160:1; + t_u8 tx_STBC:1; + t_u8 rx_STBC:3; + t_u8 SU_beamformer_capa:1; + t_u8 SU_beamformee_capa:1; + t_u8 beamformer_ante_num:3; + t_u8 sounding_dim_num:3; + t_u8 MU_beamformer_capa:1; + t_u8 MU_beamformee_capa:1; + t_u8 VHT_TXOP_ps:1; + t_u8 HTC_VHT_capa:1; + t_u8 max_ampdu_len:3; + t_u8 link_apapt_capa:2; + t_u8 reserved_1:4; #else - t_u8 reserved_1:4; - t_u8 link_apapt_capa:2; - t_u8 max_ampdu_len:3; - t_u8 HTC_VHT_capa:1; - t_u8 VHT_TXOP_ps:1; - t_u8 MU_beamformee_capa:1; - t_u8 MU_beamformer_capa:1; - t_u8 sounding_dim_num:3; - t_u8 beamformer_ante_num:3; - t_u8 SU_beamformee_capa:1; - t_u8 SU_beamformer_capa:1; - t_u8 rx_STBC:3; - t_u8 tx_STBC:1; - t_u8 sgi_160:1; - t_u8 sgi_80:1; - t_u8 rx_LDPC:1; - t_u8 chan_width:2; - t_u8 mpdu_max_len:2; -#endif /* BIG_ENDIAN_SUPPORT */ + t_u8 reserved_1:4; + t_u8 link_apapt_capa:2; + t_u8 max_ampdu_len:3; + t_u8 HTC_VHT_capa:1; + t_u8 VHT_TXOP_ps:1; + t_u8 MU_beamformee_capa:1; + t_u8 MU_beamformer_capa:1; + t_u8 sounding_dim_num:3; + t_u8 beamformer_ante_num:3; + t_u8 SU_beamformee_capa:1; + t_u8 SU_beamformer_capa:1; + t_u8 rx_STBC:3; + t_u8 tx_STBC:1; + t_u8 sgi_160:1; + t_u8 sgi_80:1; + t_u8 rx_LDPC:1; + t_u8 chan_width:2; + t_u8 mpdu_max_len:2; +#endif /* BIG_ENDIAN_SUPPORT */ #endif - t_u32 vht_cap_info; - VHT_MCS_set_t mcs_sets; + t_u32 vht_cap_info; + VHT_MCS_set_t mcs_sets; } MLAN_PACK_END VHT_capa_t, *pVHT_capa_t; /** VHT Capabilities IE */ typedef MLAN_PACK_START struct _IEEEtypes_VHTCap_t { /** Generic IE header */ - IEEEtypes_Header_t ieee_hdr; - VHT_capa_t vht_cap; + IEEEtypes_Header_t ieee_hdr; + VHT_capa_t vht_cap; } MLAN_PACK_END IEEEtypes_VHTCap_t, *pIEEEtypes_VHTCap_t; #define VHT_CAP_CHWD_80MHZ 0 @@ -1115,12 +1115,12 @@ typedef MLAN_PACK_START struct _IEEEtypes_VHTCap_t typedef MLAN_PACK_START struct _IEEEtypes_VHTOprat_t { /** Generic IE header */ - IEEEtypes_Header_t ieee_hdr; - t_u8 chan_width; - t_u8 chan_center_freq_1; - t_u8 chan_center_freq_2; + IEEEtypes_Header_t ieee_hdr; + t_u8 chan_width; + t_u8 chan_center_freq_1; + t_u8 chan_center_freq_2; /** Basic MCS set map, each 2 bits stands for a Nss */ - t_u16 basic_MCS_map; + t_u16 basic_MCS_map; } MLAN_PACK_END IEEEtypes_VHTOprat_t, *pIEEEtypes_VHTOprat_t; #define VHT_OPER_CHWD_20_40MHZ 0 @@ -1132,73 +1132,73 @@ typedef MLAN_PACK_START struct _IEEEtypes_VHTOprat_t typedef MLAN_PACK_START struct _IEEEtypes_VHTtxpower_t { /** Generic IE header */ - IEEEtypes_Header_t ieee_hdr; - t_u8 max_tx_power; - t_u8 chan_center_freq; - t_u8 chan_width; + IEEEtypes_Header_t ieee_hdr; + t_u8 max_tx_power; + t_u8 chan_center_freq; + t_u8 chan_width; } MLAN_PACK_END IEEEtypes_VHTtxpower_t, *pIEEEtypes_VHTtxpower_t; /** Extended Power Constraint IE */ typedef MLAN_PACK_START struct _IEEEtypes_ExtPwerCons_t { /** Generic IE header */ - IEEEtypes_Header_t ieee_hdr; + IEEEtypes_Header_t ieee_hdr; /** channel width */ - t_u8 chan_width; + t_u8 chan_width; /** local power constraint */ - t_u8 local_power_cons; + t_u8 local_power_cons; } MLAN_PACK_END IEEEtypes_ExtPwerCons_t, *pIEEEtypes_ExtPwerCons_t; /** Extended BSS Load IE */ typedef MLAN_PACK_START struct _IEEEtypes_ExtBSSload_t { /** Generic IE header */ - IEEEtypes_Header_t ieee_hdr; - t_u8 MU_MIMO_capa_count; - t_u8 stream_underutilization; - t_u8 VHT40_util; - t_u8 VHT80_util; - t_u8 VHT160_util; + IEEEtypes_Header_t ieee_hdr; + t_u8 MU_MIMO_capa_count; + t_u8 stream_underutilization; + t_u8 VHT40_util; + t_u8 VHT80_util; + t_u8 VHT160_util; } MLAN_PACK_END IEEEtypes_ExtBSSload_t, *pIEEEtypes_ExtBSSload_t; /** Quiet Channel IE */ typedef MLAN_PACK_START struct _IEEEtypes_QuietChan_t { /** Generic IE header */ - IEEEtypes_Header_t ieee_hdr; - t_u8 AP_quiet_mode; - t_u8 quiet_count; - t_u8 quiet_period; - t_u16 quiet_dur; - t_u16 quiet_offset; + IEEEtypes_Header_t ieee_hdr; + t_u8 AP_quiet_mode; + t_u8 quiet_count; + t_u8 quiet_period; + t_u16 quiet_dur; + t_u16 quiet_offset; } MLAN_PACK_END IEEEtypes_QuietChan_t, *pIEEEtypes_QuietChan_t; /** Wide Bandwidth Channel Switch IE */ typedef MLAN_PACK_START struct _IEEEtypes_BWSwitch_t { /** Generic IE header */ - IEEEtypes_Header_t ieee_hdr; - t_u8 new_chan_width; - t_u8 new_chan_center_freq_1; - t_u8 new_chan_center_freq_2; + IEEEtypes_Header_t ieee_hdr; + t_u8 new_chan_width; + t_u8 new_chan_center_freq_1; + t_u8 new_chan_center_freq_2; } MLAN_PACK_END IEEEtypes_BWSwitch_t, *pIEEEtypes_BWSwitch_t; /** AID IE */ typedef MLAN_PACK_START struct _IEEEtypes_AID_t { /** Generic IE header */ - IEEEtypes_Header_t ieee_hdr; + IEEEtypes_Header_t ieee_hdr; /** AID number */ - t_u16 AID; + t_u16 AID; } MLAN_PACK_END IEEEtypes_AID_t, *pIEEEtypes_AID_t; /** Operating Mode Notificaton IE */ typedef MLAN_PACK_START struct _IEEEtypes_OperModeNtf_t { /** Generic IE header */ - IEEEtypes_Header_t ieee_hdr; + IEEEtypes_Header_t ieee_hdr; /** Operating Mode */ - t_u8 oper_mode; + t_u8 oper_mode; } MLAN_PACK_END IEEEtypes_OperModeNtf_t, *pIEEEtypes_OperModeNtf_t; /** Maximum number of subbands in the IEEEtypes_SupportedChannels_t structure */ @@ -1210,37 +1210,41 @@ typedef MLAN_PACK_START struct _IEEEtypes_OperModeNtf_t /** IEEE Power Constraint element (7.3.2.15) */ typedef MLAN_PACK_START struct { - t_u8 element_id; /**< IEEE Element ID = 32 */ - t_u8 len; /**< Element length after id and len */ - t_u8 local_constraint; /**< Local power constraint applied to 11d chan info */ + t_u8 element_id; /**< IEEE Element ID = 32 */ + t_u8 len; /**< Element length after id and len */ + t_u8 local_constraint; + /**< Local power constraint applied to 11d chan info */ } MLAN_PACK_END IEEEtypes_PowerConstraint_t; /** IEEE Power Capability element (7.3.2.16) */ typedef MLAN_PACK_START struct { - t_u8 element_id; /**< IEEE Element ID = 33 */ - t_u8 len; /**< Element length after id and len */ - t_s8 min_tx_power_capability; /**< Minimum Transmit power (dBm) */ - t_s8 max_tx_power_capability; /**< Maximum Transmit power (dBm) */ + t_u8 element_id; /**< IEEE Element ID = 33 */ + t_u8 len; /**< Element length after id and len */ + t_s8 min_tx_power_capability; + /**< Minimum Transmit power (dBm) */ + t_s8 max_tx_power_capability; + /**< Maximum Transmit power (dBm) */ } MLAN_PACK_END IEEEtypes_PowerCapability_t; /** IEEE TPC Report element (7.3.2.18) */ typedef MLAN_PACK_START struct { - t_u8 element_id; /**< IEEE Element ID = 35 */ - t_u8 len; /**< Element length after id and len */ - t_s8 tx_power; /**< Max power used to transmit the TPC Report frame (dBm) */ - t_s8 link_margin; /**< Link margin when TPC Request received (dB) */ + t_u8 element_id;/**< IEEE Element ID = 35 */ + t_u8 len; /**< Element length after id and len */ + t_s8 tx_power; /**< Max power used to transmit the TPC Report frame (dBm) */ + t_s8 link_margin; + /**< Link margin when TPC Request received (dB) */ } MLAN_PACK_END IEEEtypes_TPCReport_t; /* IEEE Supported Channel sub-band description (7.3.2.19) */ -/** - * Sub-band description used in the supported channels element. +/** + * Sub-band description used in the supported channels element. */ typedef MLAN_PACK_START struct { - t_u8 start_chan; /**< Starting channel in the subband */ - t_u8 num_chans; /**< Number of channels in the subband */ + t_u8 start_chan;/**< Starting channel in the subband */ + t_u8 num_chans; /**< Number of channels in the subband */ } MLAN_PACK_END IEEEtypes_SupportChan_Subband_t; @@ -1251,11 +1255,11 @@ typedef MLAN_PACK_START struct */ typedef MLAN_PACK_START struct { - t_u8 element_id; /**< IEEE Element ID = 36 */ - t_u8 len; /**< Element length after id and len */ + t_u8 element_id;/**< IEEE Element ID = 36 */ + t_u8 len; /**< Element length after id and len */ /** Configured sub-bands information in the element */ - IEEEtypes_SupportChan_Subband_t subband[WLAN_11H_MAX_SUBBANDS]; + IEEEtypes_SupportChan_Subband_t subband[WLAN_11H_MAX_SUBBANDS]; } MLAN_PACK_END IEEEtypes_SupportedChannels_t; @@ -1263,15 +1267,15 @@ typedef MLAN_PACK_START struct /** * Provided in beacons and probe responses. Used to advertise when * and to which channel it is changing to. Only starting STAs in - * an IBSS and APs are allowed to originate a chan switch element. + * an IBSS and APs are allowed to originate a chan switch element. */ typedef MLAN_PACK_START struct { - t_u8 element_id; /**< IEEE Element ID = 37 */ - t_u8 len; /**< Element length after id and len */ - t_u8 chan_switch_mode; /**< STA should not transmit any frames if 1 */ - t_u8 new_channel_num; /**< Channel # that AP/IBSS is moving to */ - t_u8 chan_switch_count; /**< # of TBTTs before channel switch */ + t_u8 element_id; /**< IEEE Element ID = 37 */ + t_u8 len; /**< Element length after id and len */ + t_u8 chan_switch_mode; /**< STA should not transmit any frames if 1 */ + t_u8 new_channel_num; /**< Channel # that AP/IBSS is moving to */ + t_u8 chan_switch_count; /**< # of TBTTs before channel switch */ } MLAN_PACK_END IEEEtypes_ChanSwitchAnn_t; @@ -1284,10 +1288,10 @@ typedef MLAN_PACK_START struct typedef MLAN_PACK_START struct { /** Generic IE header IEEE Element ID = 194*/ - IEEEtypes_Header_t ieee_hdr; - t_u8 new_channel_width; - t_u8 new_channel_center_freq0; - t_u8 new_channel_center_freq1; + IEEEtypes_Header_t ieee_hdr; + t_u8 new_channel_width; + t_u8 new_channel_center_freq0; + t_u8 new_channel_center_freq1; } MLAN_PACK_END IEEEtypes_WideBWChanSwitch_t; /* IEEE VHT Transmit Power Envelope Element */ @@ -1299,27 +1303,28 @@ typedef MLAN_PACK_START struct typedef MLAN_PACK_START struct { /** Generic IE header IEEE Element ID = 195*/ - IEEEtypes_Header_t ieee_hdr; - t_u8 tpc_info; /**< Transmit Power Information>*/ - t_u8 local_max_tp_20mhz; /**< Local Maximum Transmit Power for 20 MHZ>*/ - t_u8 local_max_tp_40mhz; /**< Local Maximum Transmit Power for 40 MHZ>*/ - t_u8 local_max_tp_80mhz; /**< Local Maximum Transmit Power for 80 MHZ>*/ + IEEEtypes_Header_t ieee_hdr; + t_u8 tpc_info; /**< Transmit Power Information>*/ + t_u8 local_max_tp_20mhz;/**< Local Maximum Transmit Power for 20 MHZ>*/ + t_u8 local_max_tp_40mhz;/**< Local Maximum Transmit Power for 40 MHZ>*/ + t_u8 local_max_tp_80mhz;/**< Local Maximum Transmit Power for 80 MHZ>*/ } MLAN_PACK_END IEEEtypes_VhtTpcEnvelope_t; /* IEEE Quiet Period Element (7.3.2.23) */ /** - * Provided in beacons and probe responses. Indicates times during + * Provided in beacons and probe responses. Indicates times during * which the STA should not be transmitting data. Only starting STAs in - * an IBSS and APs are allowed to originate a quiet element. + * an IBSS and APs are allowed to originate a quiet element. */ typedef MLAN_PACK_START struct { - t_u8 element_id; /**< IEEE Element ID = 40 */ - t_u8 len; /**< Element length after id and len */ - t_u8 quiet_count; /**< Number of TBTTs until beacon with the quiet period */ - t_u8 quiet_period; /**< Regular quiet period, # of TBTTS between periods */ - t_u16 quiet_duration; /**< Duration of the quiet period in TUs */ - t_u16 quiet_offset; /**< Offset in TUs from the TBTT for the quiet period */ + t_u8 element_id; /**< IEEE Element ID = 40 */ + t_u8 len; /**< Element length after id and len */ + t_u8 quiet_count; /**< Number of TBTTs until beacon with the quiet period */ + t_u8 quiet_period; /**< Regular quiet period, # of TBTTS between periods */ + t_u16 quiet_duration; + /**< Duration of the quiet period in TUs */ + t_u16 quiet_offset; /**< Offset in TUs from the TBTT for the quiet period */ } MLAN_PACK_END IEEEtypes_Quiet_t; @@ -1329,69 +1334,74 @@ typedef MLAN_PACK_START struct typedef MLAN_PACK_START struct { #ifdef BIG_ENDIAN_SUPPORT - t_u8 rsvd5_7:3; /**< Reserved */ - t_u8 unmeasured:1; /**< Channel is unmeasured */ - t_u8 radar:1; /**< Radar detected on channel */ - t_u8 unidentified_sig:1; /**< Unidentified signal found on channel */ - t_u8 ofdm_preamble:1; /**< OFDM preamble detected on channel */ - t_u8 bss:1; /**< At least one valid MPDU received on channel */ + t_u8 rsvd5_7:3; /**< Reserved */ + t_u8 unmeasured:1; /**< Channel is unmeasured */ + t_u8 radar:1; /**< Radar detected on channel */ + t_u8 unidentified_sig:1; /**< Unidentified signal found on channel */ + t_u8 ofdm_preamble:1; /**< OFDM preamble detected on channel */ + t_u8 bss:1; /**< At least one valid MPDU received on channel */ #else - t_u8 bss:1; /**< At least one valid MPDU received on channel */ - t_u8 ofdm_preamble:1; /**< OFDM preamble detected on channel */ - t_u8 unidentified_sig:1; /**< Unidentified signal found on channel */ - t_u8 radar:1; /**< Radar detected on channel */ - t_u8 unmeasured:1; /**< Channel is unmeasured */ - t_u8 rsvd5_7:3; /**< Reserved */ -#endif /* BIG_ENDIAN_SUPPORT */ + t_u8 bss:1; /**< At least one valid MPDU received on channel */ + t_u8 ofdm_preamble:1; /**< OFDM preamble detected on channel */ + t_u8 unidentified_sig:1; /**< Unidentified signal found on channel */ + t_u8 radar:1; /**< Radar detected on channel */ + t_u8 unmeasured:1; /**< Channel is unmeasured */ + t_u8 rsvd5_7:3; /**< Reserved */ +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END MeasRptBasicMap_t; /* IEEE DFS Channel Map field (7.3.2.24) */ /** - * Used to list supported channels and provide a octet "map" field which - * contains a basic measurement report for that channel in the + * Used to list supported channels and provide a octet "map" field which + * contains a basic measurement report for that channel in the * IEEEtypes_IBSS_DFS_t element */ typedef MLAN_PACK_START struct { - t_u8 channel_number; /**< Channel number */ - MeasRptBasicMap_t rpt_map; /**< Basic measurement report for the channel */ + t_u8 channel_number; /**< Channel number */ + MeasRptBasicMap_t rpt_map; + /**< Basic measurement report for the channel */ } MLAN_PACK_END IEEEtypes_ChannelMap_t; /* IEEE IBSS DFS Element (7.3.2.24) */ /** - * IBSS DFS element included in ad hoc beacons and probe responses. + * IBSS DFS element included in ad hoc beacons and probe responses. * Provides information regarding the IBSS DFS Owner as well as the * originating STAs supported channels and basic measurement results. */ typedef MLAN_PACK_START struct { - t_u8 element_id; /**< IEEE Element ID = 41 */ - t_u8 len; /**< Element length after id and len */ - t_u8 dfs_owner[MLAN_MAC_ADDR_LENGTH]; /**< DFS Owner STA Address */ - t_u8 dfs_recovery_interval; /**< DFS Recovery time in TBTTs */ + t_u8 element_id; /**< IEEE Element ID = 41 */ + t_u8 len; /**< Element length after id and len */ + t_u8 dfs_owner[MLAN_MAC_ADDR_LENGTH]; + /**< DFS Owner STA Address */ + t_u8 dfs_recovery_interval; /**< DFS Recovery time in TBTTs */ /** Variable length map field, one Map entry for each supported channel */ - IEEEtypes_ChannelMap_t channel_map[WLAN_11H_MAX_IBSS_DFS_CHANNELS]; + IEEEtypes_ChannelMap_t channel_map[WLAN_11H_MAX_IBSS_DFS_CHANNELS]; } MLAN_PACK_END IEEEtypes_IBSS_DFS_t; /* 802.11h BSS information kept for each BSSID received in scan results */ /** * IEEE BSS information needed from scan results for later processing in - * join commands + * join commands */ typedef struct { - t_u8 sensed_11h; /**< Capability bit set or 11h IE found in this BSS */ + t_u8 sensed_11h; + /**< Capability bit set or 11h IE found in this BSS */ - IEEEtypes_PowerConstraint_t power_constraint; /**< Power Constraint IE */ - IEEEtypes_PowerCapability_t power_capability; /**< Power Capability IE */ - IEEEtypes_TPCReport_t tpc_report; /**< TPC Report IE */ - IEEEtypes_ChanSwitchAnn_t chan_switch_ann; /**< Channel Switch Announcement IE */ - IEEEtypes_Quiet_t quiet; /**< Quiet IE */ - IEEEtypes_IBSS_DFS_t ibss_dfs; /**< IBSS DFS Element IE */ + IEEEtypes_PowerConstraint_t power_constraint; + /**< Power Constraint IE */ + IEEEtypes_PowerCapability_t power_capability; + /**< Power Capability IE */ + IEEEtypes_TPCReport_t tpc_report; /**< TPC Report IE */ + IEEEtypes_ChanSwitchAnn_t chan_switch_ann;/**< Channel Switch Announcement IE */ + IEEEtypes_Quiet_t quiet; /**< Quiet IE */ + IEEEtypes_IBSS_DFS_t ibss_dfs; /**< IBSS DFS Element IE */ } wlan_11h_bss_info_t; @@ -1410,16 +1420,16 @@ typedef struct /** * IOCTL SSID List sub-structure sent in wlan_ioctl_user_scan_cfg - * + * * Used to specify SSID specific filters as well as SSID pattern matching * filters for scan result processing in firmware. */ typedef MLAN_PACK_START struct _wlan_user_scan_ssid { /** SSID */ - t_u8 ssid[MLAN_MAX_SSID_LENGTH + 1]; + t_u8 ssid[MLAN_MAX_SSID_LENGTH + 1]; /** Maximum length of SSID */ - t_u8 max_len; + t_u8 max_len; } MLAN_PACK_END wlan_user_scan_ssid; /** @@ -1431,21 +1441,21 @@ typedef MLAN_PACK_START struct _wlan_user_scan_ssid typedef MLAN_PACK_START struct _wlan_user_scan_chan { /** Channel Number to scan */ - t_u8 chan_number; + t_u8 chan_number; /** Radio type: 'B/G' Band = 0, 'A' Band = 1 */ - t_u8 radio_type; + t_u8 radio_type; /** Scan type: Active = 1, Passive = 2 */ - t_u8 scan_type; + t_u8 scan_type; /** Reserved */ - t_u8 reserved; + t_u8 reserved; /** Scan duration in milliseconds; if 0 default used */ - t_u32 scan_time; + t_u32 scan_time; } MLAN_PACK_END wlan_user_scan_chan; /** * Input structure to configure an immediate scan cmd to firmware * - * Specifies a number of parameters to be used in general for the scan + * Specifies a number of parameters to be used in general for the scan * as well as a channel list (wlan_user_scan_chan) for each scan period * desired. */ @@ -1457,7 +1467,7 @@ typedef MLAN_PACK_START struct * If set, the scan results will accumulate, replacing any previous * matched entries for a BSS with the new scan data */ - t_u8 keep_previous_scan; + t_u8 keep_previous_scan; /** * BSS mode to be sent in the firmware command * @@ -1466,29 +1476,29 @@ typedef MLAN_PACK_START struct * * - MLAN_SCAN_MODE_BSS (infrastructure) * - MLAN_SCAN_MODE_IBSS (adhoc) - * - MLAN_SCAN_MODE_ANY (unrestricted, adhoc and infrastructure) + * - MLAN_SCAN_MODE_ANY (unrestricted, adhoc and infrastructure) */ - t_u8 bss_mode; + t_u8 bss_mode; /** * Configure the number of probe requests for active chan scans */ - t_u8 num_probes; + t_u8 num_probes; /** * @brief Reserved */ - t_u8 reserved; + t_u8 reserved; /** * @brief BSSID filter sent in the firmware command to limit the results */ - t_u8 specific_bssid[MLAN_MAC_ADDR_LENGTH]; + t_u8 specific_bssid[MLAN_MAC_ADDR_LENGTH]; /** * SSID filter list used in the to limit the scan results */ - wlan_user_scan_ssid ssid_list[MRVDRV_MAX_SSID_LIST_LENGTH]; + wlan_user_scan_ssid ssid_list[MRVDRV_MAX_SSID_LIST_LENGTH]; /** * Variable number (fixed maximum) of channels to scan up */ - wlan_user_scan_chan chan_list[WLAN_USER_SCAN_CHAN_MAX]; + wlan_user_scan_chan chan_list[WLAN_USER_SCAN_CHAN_MAX]; } MLAN_PACK_END wlan_user_scan_cfg; /** Default scan interval in millisecond*/ @@ -1517,36 +1527,36 @@ typedef MLAN_PACK_START struct typedef MLAN_PACK_START struct { /** action */ - t_u16 action; + t_u16 action; /** enable/disable */ - t_u8 enable; - /** BSS type: + t_u8 enable; + /** BSS type: * MLAN_SCAN_MODE_BSS (infrastructure) * MLAN_SCAN_MODE_IBSS (adhoc) - * MLAN_SCAN_MODE_ANY (unrestricted, adhoc and infrastructure) + * MLAN_SCAN_MODE_ANY (unrestricted, adhoc and infrastructure) */ - t_u8 bss_type; + t_u8 bss_type; /** number of channel scanned during each scan */ - t_u8 chan_per_scan; + t_u8 chan_per_scan; /** interval between consecutive scan */ - t_u32 scan_interval; + t_u32 scan_interval; /** bit 0: ssid match bit 1: ssid match and SNR exceeded * bit 2: ssid match and RSSI exceeded * bit 31: wait for all channel scan to complete to report scan result */ - t_u32 report_condition; - /* Configure the number of probe requests for active chan scans */ - t_u8 num_probes; + t_u32 report_condition; + /* Configure the number of probe requests for active chan scans */ + t_u8 num_probes; /** RSSI threshold */ - t_u8 rssi_threshold; + t_u8 rssi_threshold; /** SNR threshold */ - t_u8 snr_threshold; + t_u8 snr_threshold; /** repeat count */ - t_u16 repeat_count; + t_u16 repeat_count; /** SSID filter list used in the to limit the scan results */ - wlan_user_scan_ssid ssid_list[MRVDRV_MAX_SSID_LIST_LENGTH]; + wlan_user_scan_ssid ssid_list[MRVDRV_MAX_SSID_LIST_LENGTH]; /** Variable number (fixed maximum) of channels to scan up */ - wlan_user_scan_chan chan_list[WLAN_BG_SCAN_CHAN_MAX]; + wlan_user_scan_chan chan_list[WLAN_BG_SCAN_CHAN_MAX]; } MLAN_PACK_END wlan_bgscan_cfg; #endif /* STA_SUPPORT */ @@ -1560,151 +1570,151 @@ typedef MLAN_PACK_START struct typedef struct _BSSDescriptor_t { /** MAC address */ - mlan_802_11_mac_addr mac_address; + mlan_802_11_mac_addr mac_address; /** SSID */ - mlan_802_11_ssid ssid; + mlan_802_11_ssid ssid; /** WEP encryption requirement */ - t_u32 privacy; + t_u32 privacy; /** Receive signal strength in dBm */ - t_s32 rssi; + t_s32 rssi; /** Channel */ - t_u32 channel; + t_u32 channel; /** Freq */ - t_u32 freq; + t_u32 freq; /** Beacon period */ - t_u16 beacon_period; + t_u16 beacon_period; /** ATIM window */ - t_u32 atim_window; + t_u32 atim_window; /** ERP flags */ - t_u8 erp_flags; + t_u8 erp_flags; /** Type of network in use */ - WLAN_802_11_NETWORK_TYPE network_type_use; + WLAN_802_11_NETWORK_TYPE network_type_use; /** Network infrastructure mode */ - t_u32 bss_mode; + t_u32 bss_mode; /** Network supported rates */ - WLAN_802_11_RATES supported_rates; + WLAN_802_11_RATES supported_rates; /** Supported data rates */ - t_u8 data_rates[WLAN_SUPPORTED_RATES]; + t_u8 data_rates[WLAN_SUPPORTED_RATES]; /** Network band. * BAND_B(0x01): 'b' band * BAND_G(0x02): 'g' band * BAND_A(0X04): 'a' band */ - t_u16 bss_band; + t_u16 bss_band; /** TSF timestamp from the current firmware TSF */ - t_u64 network_tsf; + t_u64 network_tsf; /** TSF value included in the beacon/probe response */ - t_u8 time_stamp[8]; + t_u8 time_stamp[8]; /** PHY parameter set */ - IEEEtypes_PhyParamSet_t phy_param_set; + IEEEtypes_PhyParamSet_t phy_param_set; /** SS parameter set */ - IEEEtypes_SsParamSet_t ss_param_set; + IEEEtypes_SsParamSet_t ss_param_set; /** Capability information */ - IEEEtypes_CapInfo_t cap_info; + IEEEtypes_CapInfo_t cap_info; /** WMM IE */ - IEEEtypes_WmmParameter_t wmm_ie; + IEEEtypes_WmmParameter_t wmm_ie; /** 802.11h BSS information */ - wlan_11h_bss_info_t wlan_11h_bss_info; + wlan_11h_bss_info_t wlan_11h_bss_info; /** Indicate disabling 11n when associate with AP */ - t_u8 disable_11n; + t_u8 disable_11n; /** 802.11n BSS information */ /** HT Capabilities IE */ - IEEEtypes_HTCap_t *pht_cap; + IEEEtypes_HTCap_t *pht_cap; /** HT Capabilities Offset */ - t_u16 ht_cap_offset; + t_u16 ht_cap_offset; /** HT Information IE */ - IEEEtypes_HTInfo_t *pht_info; + IEEEtypes_HTInfo_t *pht_info; /** HT Information Offset */ - t_u16 ht_info_offset; + t_u16 ht_info_offset; /** 20/40 BSS Coexistence IE */ - IEEEtypes_2040BSSCo_t *pbss_co_2040; + IEEEtypes_2040BSSCo_t *pbss_co_2040; /** 20/40 BSS Coexistence Offset */ - t_u16 bss_co_2040_offset; + t_u16 bss_co_2040_offset; /** Extended Capabilities IE */ - IEEEtypes_ExtCap_t *pext_cap; + IEEEtypes_ExtCap_t *pext_cap; /** Extended Capabilities Offset */ - t_u16 ext_cap_offset; + t_u16 ext_cap_offset; /** Overlapping BSS Scan Parameters IE */ - IEEEtypes_OverlapBSSScanParam_t *poverlap_bss_scan_param; + IEEEtypes_OverlapBSSScanParam_t *poverlap_bss_scan_param; /** Overlapping BSS Scan Parameters Offset */ - t_u16 overlap_bss_offset; + t_u16 overlap_bss_offset; /** VHT Capabilities IE */ - IEEEtypes_VHTCap_t *pvht_cap; + IEEEtypes_VHTCap_t *pvht_cap; /** VHT Capabilities IE offset */ - t_u16 vht_cap_offset; + t_u16 vht_cap_offset; /** VHT Operations IE */ - IEEEtypes_VHTOprat_t *pvht_oprat; + IEEEtypes_VHTOprat_t *pvht_oprat; /** VHT Operations IE offset */ - t_u16 vht_oprat_offset; + t_u16 vht_oprat_offset; /** VHT Transmit Power Envelope IE */ - IEEEtypes_VHTtxpower_t *pvht_txpower; + IEEEtypes_VHTtxpower_t *pvht_txpower; /** VHT Transmit Power Envelope IE offset */ - t_u16 vht_txpower_offset; + t_u16 vht_txpower_offset; /** Extended Power Constraint IE */ - IEEEtypes_ExtPwerCons_t *pext_pwer; + IEEEtypes_ExtPwerCons_t *pext_pwer; /** Extended Power Constraint IE offset */ - t_u16 ext_pwer_offset; + t_u16 ext_pwer_offset; /** Extended BSS Load IE */ - IEEEtypes_ExtBSSload_t *pext_bssload; + IEEEtypes_ExtBSSload_t *pext_bssload; /** Extended BSS Load IE offset */ - t_u16 ext_bssload_offset; + t_u16 ext_bssload_offset; /** Quiet Channel IE */ - IEEEtypes_QuietChan_t *pquiet_chan; + IEEEtypes_QuietChan_t *pquiet_chan; /** Quiet Channel IE offset */ - t_u16 quiet_chan_offset; + t_u16 quiet_chan_offset; /** Operating Mode Notification IE */ - IEEEtypes_OperModeNtf_t *poper_mode; + IEEEtypes_OperModeNtf_t *poper_mode; /** Operating Mode Notification IE offset */ - t_u16 oper_mode_offset; + t_u16 oper_mode_offset; #ifdef STA_SUPPORT /** Country information set */ - IEEEtypes_CountryInfoFullSet_t country_info; -#endif /* STA_SUPPORT */ + IEEEtypes_CountryInfoFullSet_t country_info; +#endif /* STA_SUPPORT */ /** WPA IE */ - IEEEtypes_VendorSpecific_t *pwpa_ie; + IEEEtypes_VendorSpecific_t *pwpa_ie; /** WPA IE offset in the beacon buffer */ - t_u16 wpa_offset; + t_u16 wpa_offset; /** RSN IE */ - IEEEtypes_Generic_t *prsn_ie; + IEEEtypes_Generic_t *prsn_ie; /** RSN IE offset in the beacon buffer */ - t_u16 rsn_offset; + t_u16 rsn_offset; #ifdef STA_SUPPORT /** WAPI IE */ - IEEEtypes_Generic_t *pwapi_ie; + IEEEtypes_Generic_t *pwapi_ie; /** WAPI IE offset in the beacon buffer */ - t_u16 wapi_offset; + t_u16 wapi_offset; #endif /** Pointer to the returned scan response */ - t_u8 *pbeacon_buf; + t_u8 *pbeacon_buf; /** Length of the stored scan response */ - t_u32 beacon_buf_size; + t_u32 beacon_buf_size; /** Max allocated size for updated scan response */ - t_u32 beacon_buf_size_max; + t_u32 beacon_buf_size_max; } BSSDescriptor_t, *pBSSDescriptor_t; diff --git a/drivers/net/wireless/sd8897/mlan/mlan_init.c b/drivers/net/wireless/sd8897/mlan/mlan_init.c index face1718ee4f..3fbb5a713fe9 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_init.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_init.c @@ -1,9 +1,9 @@ /** @file mlan_init.c - * + * * @brief This file contains the initialization for FW - * and HW. + * and HW. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -49,7 +49,7 @@ Change log: /** * @brief This function adds a BSS priority table - * + * * @param priv A pointer to mlan_private structure * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -57,43 +57,44 @@ Change log: static mlan_status wlan_add_bsspriotbl(pmlan_private priv) { - pmlan_adapter pmadapter = priv->adapter; - mlan_bssprio_node *pbssprio = MNULL; - mlan_status status = MLAN_STATUS_SUCCESS; - - ENTER(); - - if ((status = - pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, - sizeof(mlan_bssprio_node), - MLAN_MEM_DEF, - (t_u8 **) & pbssprio))) { - PRINTM(MERROR, "Failed to allocate bsspriotbl\n"); - LEAVE(); - return status; - } - - pbssprio->priv = priv; - - util_init_list((pmlan_linked_list) pbssprio); - - if (!pmadapter->bssprio_tbl[priv->bss_priority].bssprio_cur) - pmadapter->bssprio_tbl[priv->bss_priority].bssprio_cur = pbssprio; - - util_enqueue_list_tail(pmadapter->pmoal_handle, - &pmadapter->bssprio_tbl[priv-> - bss_priority].bssprio_head, - (pmlan_linked_list) pbssprio, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock); - - LEAVE(); - return status; + pmlan_adapter pmadapter = priv->adapter; + mlan_bssprio_node *pbssprio = MNULL; + mlan_status status = MLAN_STATUS_SUCCESS; + + ENTER(); + + if ((status = + pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, + sizeof(mlan_bssprio_node), + MLAN_MEM_DEF, + (t_u8 **) & pbssprio))) { + PRINTM(MERROR, "Failed to allocate bsspriotbl\n"); + LEAVE(); + return status; + } + + pbssprio->priv = priv; + + util_init_list((pmlan_linked_list) pbssprio); + + if (!pmadapter->bssprio_tbl[priv->bss_priority].bssprio_cur) + pmadapter->bssprio_tbl[priv->bss_priority].bssprio_cur + = pbssprio; + + util_enqueue_list_tail(pmadapter->pmoal_handle, + &pmadapter->bssprio_tbl[priv-> + bss_priority].bssprio_head, + (pmlan_linked_list) pbssprio, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); + + LEAVE(); + return status; } /** * @brief This function deletes the BSS priority table - * + * * @param priv A pointer to mlan_private structure * * @return N/A @@ -101,57 +102,69 @@ wlan_add_bsspriotbl(pmlan_private priv) static t_void wlan_delete_bsspriotbl(pmlan_private priv) { - int i; - pmlan_adapter pmadapter = priv->adapter; - mlan_bssprio_node *pbssprio_node = MNULL, *ptmp_node = MNULL, **ppcur = - MNULL; - pmlan_list_head phead; - - ENTER(); - - for (i = 0; i < pmadapter->priv_num; ++i) { - phead = &pmadapter->bssprio_tbl[i].bssprio_head; - ppcur = &pmadapter->bssprio_tbl[i].bssprio_cur; - PRINTM(MINFO, - "Delete BSS priority table, index = %d, i = %d, phead = %p, pcur = %p\n", - priv->bss_index, i, phead, *ppcur); - if (*ppcur) { - pbssprio_node = - (mlan_bssprio_node *) util_peek_list(pmadapter->pmoal_handle, - phead, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock); - while (pbssprio_node && ((pmlan_list_head) pbssprio_node != phead)) { - ptmp_node = pbssprio_node->pnext; - if (pbssprio_node->priv == priv) { - PRINTM(MINFO, "Delete node, pnode = %p, pnext = %p\n", - pbssprio_node, ptmp_node); - util_unlink_list(pmadapter->pmoal_handle, phead, - (pmlan_linked_list) pbssprio_node, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock); - pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, - (t_u8 *) pbssprio_node); - } - pbssprio_node = ptmp_node; - } - *ppcur = (mlan_bssprio_node *) phead; - } - } - - LEAVE(); + int i; + pmlan_adapter pmadapter = priv->adapter; + mlan_bssprio_node *pbssprio_node = MNULL, *ptmp_node = MNULL, **ppcur = + MNULL; + pmlan_list_head phead; + + ENTER(); + + for (i = 0; i < pmadapter->priv_num; ++i) { + phead = &pmadapter->bssprio_tbl[i].bssprio_head; + ppcur = &pmadapter->bssprio_tbl[i].bssprio_cur; + PRINTM(MINFO, + "Delete BSS priority table, index = %d, i = %d, phead = %p, pcur = %p\n", + priv->bss_index, i, phead, *ppcur); + if (*ppcur) { + pbssprio_node = + (mlan_bssprio_node *) util_peek_list(pmadapter-> + pmoal_handle, + phead, + pmadapter-> + callbacks. + moal_spin_lock, + pmadapter-> + callbacks. + moal_spin_unlock); + while (pbssprio_node && + ((pmlan_list_head) pbssprio_node != phead)) { + ptmp_node = pbssprio_node->pnext; + if (pbssprio_node->priv == priv) { + PRINTM(MINFO, + "Delete node, pnode = %p, pnext = %p\n", + pbssprio_node, ptmp_node); + util_unlink_list(pmadapter-> + pmoal_handle, phead, + (pmlan_linked_list) + pbssprio_node, + pmadapter->callbacks. + moal_spin_lock, + pmadapter->callbacks. + moal_spin_unlock); + pmadapter->callbacks. + moal_mfree(pmadapter-> + pmoal_handle, + (t_u8 *) + pbssprio_node); + } + pbssprio_node = ptmp_node; + } + *ppcur = (mlan_bssprio_node *) phead; + } + } + + LEAVE(); } /******************************************************** Global Functions ********************************************************/ -/** +/** * @brief This function allocates buffer for the members of adapter * structure like command buffer and BSSID list. - * + * * @param pmadapter A pointer to mlan_adapter structure * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -159,88 +172,91 @@ wlan_delete_bsspriotbl(pmlan_private priv) mlan_status wlan_allocate_adapter(pmlan_adapter pmadapter) { - mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_status ret = MLAN_STATUS_SUCCESS; #ifdef STA_SUPPORT - t_u32 buf_size; - BSSDescriptor_t *ptemp_scan_table = MNULL; + t_u32 buf_size; + BSSDescriptor_t *ptemp_scan_table = MNULL; #endif - ENTER(); + ENTER(); #ifdef STA_SUPPORT - /* Allocate buffer to store the BSSID list */ - buf_size = sizeof(BSSDescriptor_t) * MRVDRV_MAX_BSSID_LIST; - if (pmadapter->callbacks.moal_vmalloc && pmadapter->callbacks.moal_vfree) - ret = - pmadapter->callbacks.moal_vmalloc(pmadapter->pmoal_handle, buf_size, - (t_u8 **) & ptemp_scan_table); - else - ret = - pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, buf_size, - MLAN_MEM_DEF, - (t_u8 **) & ptemp_scan_table); - if (ret != MLAN_STATUS_SUCCESS || !ptemp_scan_table) { - PRINTM(MERROR, "Failed to allocate scan table\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - pmadapter->pscan_table = ptemp_scan_table; - ret = - pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, - DEFAULT_SCAN_BEACON_BUFFER, - MLAN_MEM_DEF, - (t_u8 **) & pmadapter->bcn_buf); - if (ret != MLAN_STATUS_SUCCESS || !pmadapter->bcn_buf) { - PRINTM(MERROR, "Failed to allocate bcn buf\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - pmadapter->bcn_buf_size = DEFAULT_SCAN_BEACON_BUFFER; + /* Allocate buffer to store the BSSID list */ + buf_size = sizeof(BSSDescriptor_t) * MRVDRV_MAX_BSSID_LIST; + if (pmadapter->callbacks.moal_vmalloc && + pmadapter->callbacks.moal_vfree) + ret = pmadapter->callbacks.moal_vmalloc(pmadapter->pmoal_handle, + buf_size, + (t_u8 **) & + ptemp_scan_table); + else + ret = pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, + buf_size, MLAN_MEM_DEF, + (t_u8 **) & + ptemp_scan_table); + if (ret != MLAN_STATUS_SUCCESS || !ptemp_scan_table) { + PRINTM(MERROR, "Failed to allocate scan table\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + pmadapter->pscan_table = ptemp_scan_table; + ret = pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, + DEFAULT_SCAN_BEACON_BUFFER, + MLAN_MEM_DEF, + (t_u8 **) & pmadapter->bcn_buf); + if (ret != MLAN_STATUS_SUCCESS || !pmadapter->bcn_buf) { + PRINTM(MERROR, "Failed to allocate bcn buf\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + pmadapter->bcn_buf_size = DEFAULT_SCAN_BEACON_BUFFER; #endif - /* Allocate command buffer */ - ret = wlan_alloc_cmd_buffer(pmadapter); - if (ret != MLAN_STATUS_SUCCESS) { - PRINTM(MERROR, "Failed to allocate command buffer\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - ret = - pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, - MAX_MP_REGS + DMA_ALIGNMENT, - MLAN_MEM_DEF | MLAN_MEM_DMA, - (t_u8 **) & pmadapter->mp_regs_buf); - if (ret != MLAN_STATUS_SUCCESS || !pmadapter->mp_regs_buf) { - PRINTM(MERROR, "Failed to allocate mp_regs_buf\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - pmadapter->mp_regs = - (t_u8 *) ALIGN_ADDR(pmadapter->mp_regs_buf, DMA_ALIGNMENT); + /* Allocate command buffer */ + ret = wlan_alloc_cmd_buffer(pmadapter); + if (ret != MLAN_STATUS_SUCCESS) { + PRINTM(MERROR, "Failed to allocate command buffer\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + ret = pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, + MAX_MP_REGS + DMA_ALIGNMENT, + MLAN_MEM_DEF | MLAN_MEM_DMA, + (t_u8 **) & pmadapter-> + mp_regs_buf); + if (ret != MLAN_STATUS_SUCCESS || !pmadapter->mp_regs_buf) { + PRINTM(MERROR, "Failed to allocate mp_regs_buf\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + pmadapter->mp_regs = + (t_u8 *) ALIGN_ADDR(pmadapter->mp_regs_buf, DMA_ALIGNMENT); #if defined(SDIO_MULTI_PORT_TX_AGGR) || defined(SDIO_MULTI_PORT_RX_AGGR) - ret = wlan_alloc_sdio_mpa_buffers(pmadapter, SDIO_MP_TX_AGGR_DEF_BUF_SIZE, - SDIO_MP_RX_AGGR_DEF_BUF_SIZE); - if (ret != MLAN_STATUS_SUCCESS) { - PRINTM(MERROR, "Failed to allocate sdio mp-a buffers\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } + ret = wlan_alloc_sdio_mpa_buffers(pmadapter, + SDIO_MP_TX_AGGR_DEF_BUF_SIZE, + SDIO_MP_RX_AGGR_DEF_BUF_SIZE); + if (ret != MLAN_STATUS_SUCCESS) { + PRINTM(MERROR, "Failed to allocate sdio mp-a buffers\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } #endif - pmadapter->psleep_cfm = - wlan_alloc_mlan_buffer(pmadapter, sizeof(opt_sleep_confirm_buffer), 0, - MOAL_MALLOC_BUFFER); + pmadapter->psleep_cfm = + wlan_alloc_mlan_buffer(pmadapter, + sizeof(opt_sleep_confirm_buffer), 0, + MOAL_MALLOC_BUFFER); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** * @brief This function initializes the private structure * and sets default values to the members of mlan_private. - * + * * @param priv A pointer to mlan_private structure * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -248,132 +264,133 @@ wlan_allocate_adapter(pmlan_adapter pmadapter) mlan_status wlan_init_priv(pmlan_private priv) { - t_u32 i; - pmlan_adapter pmadapter = priv->adapter; - mlan_status ret = MLAN_STATUS_SUCCESS; + t_u32 i; + pmlan_adapter pmadapter = priv->adapter; + mlan_status ret = MLAN_STATUS_SUCCESS; - ENTER(); + ENTER(); - priv->media_connected = MFALSE; - memset(pmadapter, priv->curr_addr, 0xff, MLAN_MAC_ADDR_LENGTH); + priv->media_connected = MFALSE; + memset(pmadapter, priv->curr_addr, 0xff, MLAN_MAC_ADDR_LENGTH); #ifdef STA_SUPPORT - priv->pkt_tx_ctrl = 0; - priv->bss_mode = MLAN_BSS_MODE_INFRA; - priv->data_rate = 0; /* Initially indicate the rate as auto */ - priv->is_data_rate_auto = MTRUE; - priv->bcn_avg_factor = DEFAULT_BCN_AVG_FACTOR; - priv->data_avg_factor = DEFAULT_DATA_AVG_FACTOR; - - priv->sec_info.wep_status = Wlan802_11WEPDisabled; - priv->sec_info.authentication_mode = MLAN_AUTH_MODE_AUTO; - priv->sec_info.encryption_mode = MLAN_ENCRYPTION_MODE_NONE; - for (i = 0; i < sizeof(priv->wep_key) / sizeof(priv->wep_key[0]); i++) - memset(pmadapter, &priv->wep_key[i], 0, sizeof(mrvl_wep_key_t)); - priv->wep_key_curr_index = 0; - priv->ewpa_query = MFALSE; - priv->adhoc_aes_enabled = MFALSE; - priv->curr_pkt_filter = - HostCmd_ACT_MAC_STATIC_DYNAMIC_BW_ENABLE | - HostCmd_ACT_MAC_RX_ON | HostCmd_ACT_MAC_TX_ON | - HostCmd_ACT_MAC_ETHERNETII_ENABLE; - - priv->beacon_period = MLAN_BEACON_INTERVAL; - priv->pattempted_bss_desc = MNULL; - memset(pmadapter, &priv->curr_bss_params, 0, sizeof(priv->curr_bss_params)); - priv->listen_interval = MLAN_DEFAULT_LISTEN_INTERVAL; - - memset(pmadapter, &priv->assoc_rsp_buf, 0, sizeof(priv->assoc_rsp_buf)); - priv->assoc_rsp_size = 0; - - wlan_11d_priv_init(priv); - wlan_11h_priv_init(priv); + priv->pkt_tx_ctrl = 0; + priv->bss_mode = MLAN_BSS_MODE_INFRA; + priv->data_rate = 0; /* Initially indicate the rate as auto */ + priv->is_data_rate_auto = MTRUE; + priv->bcn_avg_factor = DEFAULT_BCN_AVG_FACTOR; + priv->data_avg_factor = DEFAULT_DATA_AVG_FACTOR; + + priv->sec_info.wep_status = Wlan802_11WEPDisabled; + priv->sec_info.authentication_mode = MLAN_AUTH_MODE_AUTO; + priv->sec_info.encryption_mode = MLAN_ENCRYPTION_MODE_NONE; + for (i = 0; i < sizeof(priv->wep_key) / sizeof(priv->wep_key[0]); i++) + memset(pmadapter, &priv->wep_key[i], 0, sizeof(mrvl_wep_key_t)); + priv->wep_key_curr_index = 0; + priv->ewpa_query = MFALSE; + priv->adhoc_aes_enabled = MFALSE; + priv->curr_pkt_filter = + HostCmd_ACT_MAC_STATIC_DYNAMIC_BW_ENABLE | + HostCmd_ACT_MAC_RX_ON | HostCmd_ACT_MAC_TX_ON | + HostCmd_ACT_MAC_ETHERNETII_ENABLE; + + priv->beacon_period = MLAN_BEACON_INTERVAL; + priv->pattempted_bss_desc = MNULL; + memset(pmadapter, &priv->curr_bss_params, 0, + sizeof(priv->curr_bss_params)); + priv->listen_interval = MLAN_DEFAULT_LISTEN_INTERVAL; + + memset(pmadapter, &priv->assoc_rsp_buf, 0, sizeof(priv->assoc_rsp_buf)); + priv->assoc_rsp_size = 0; + + wlan_11d_priv_init(priv); + wlan_11h_priv_init(priv); #ifdef UAP_SUPPORT - priv->uap_bss_started = MFALSE; - memset(pmadapter, &priv->uap_state_chan_cb, 0, - sizeof(priv->uap_state_chan_cb)); + priv->uap_bss_started = MFALSE; + memset(pmadapter, &priv->uap_state_chan_cb, 0, + sizeof(priv->uap_state_chan_cb)); #endif #if defined(UAP_SUPPORT) - priv->num_drop_pkts = 0; + priv->num_drop_pkts = 0; #endif #if defined(STA_SUPPORT) - priv->adhoc_state_prev = ADHOC_IDLE; - memset(pmadapter, &priv->adhoc_last_start_ssid, 0, - sizeof(priv->adhoc_last_start_ssid)); + priv->adhoc_state_prev = ADHOC_IDLE; + memset(pmadapter, &priv->adhoc_last_start_ssid, 0, + sizeof(priv->adhoc_last_start_ssid)); #endif - priv->adhoc_channel = DEFAULT_AD_HOC_CHANNEL; - priv->atim_window = 0; - priv->adhoc_state = ADHOC_IDLE; - priv->tx_power_level = 0; - priv->max_tx_power_level = 0; - priv->min_tx_power_level = 0; - priv->tx_rate = 0; - priv->rxpd_rate_info = 0; - /* refer to V15 CMD_TX_RATE_QUERY */ - priv->rxpd_vhtinfo = 0; - priv->rxpd_rate = 0; - priv->rate_bitmap = 0; - priv->data_rssi_last = 0; - priv->data_rssi_avg = 0; - priv->data_nf_avg = 0; - priv->data_nf_last = 0; - priv->bcn_rssi_last = 0; - priv->bcn_rssi_avg = 0; - priv->bcn_nf_avg = 0; - priv->bcn_nf_last = 0; - - priv->sec_info.ewpa_enabled = MFALSE; - priv->sec_info.wpa_enabled = MFALSE; - priv->sec_info.wpa2_enabled = MFALSE; - memset(pmadapter, &priv->wpa_ie, 0, sizeof(priv->wpa_ie)); - memset(pmadapter, &priv->aes_key, 0, sizeof(priv->aes_key)); - priv->wpa_ie_len = 0; - priv->wpa_is_gtk_set = MFALSE; + priv->adhoc_channel = DEFAULT_AD_HOC_CHANNEL; + priv->atim_window = 0; + priv->adhoc_state = ADHOC_IDLE; + priv->tx_power_level = 0; + priv->max_tx_power_level = 0; + priv->min_tx_power_level = 0; + priv->tx_rate = 0; + priv->rxpd_rate_info = 0; + /* refer to V15 CMD_TX_RATE_QUERY */ + priv->rxpd_vhtinfo = 0; + priv->rxpd_rate = 0; + priv->rate_bitmap = 0; + priv->data_rssi_last = 0; + priv->data_rssi_avg = 0; + priv->data_nf_avg = 0; + priv->data_nf_last = 0; + priv->bcn_rssi_last = 0; + priv->bcn_rssi_avg = 0; + priv->bcn_nf_avg = 0; + priv->bcn_nf_last = 0; + + priv->sec_info.ewpa_enabled = MFALSE; + priv->sec_info.wpa_enabled = MFALSE; + priv->sec_info.wpa2_enabled = MFALSE; + memset(pmadapter, &priv->wpa_ie, 0, sizeof(priv->wpa_ie)); + memset(pmadapter, &priv->aes_key, 0, sizeof(priv->aes_key)); + priv->wpa_ie_len = 0; + priv->wpa_is_gtk_set = MFALSE; #if defined(STA_SUPPORT) - priv->pmfcfg.mfpc = 0; - priv->pmfcfg.mfpr = 0; + priv->pmfcfg.mfpc = 0; + priv->pmfcfg.mfpr = 0; #endif - priv->sec_info.wapi_enabled = MFALSE; - priv->wapi_ie_len = 0; - priv->sec_info.wapi_key_on = MFALSE; + priv->sec_info.wapi_enabled = MFALSE; + priv->wapi_ie_len = 0; + priv->sec_info.wapi_key_on = MFALSE; - memset(pmadapter, &priv->wps, 0, sizeof(priv->wps)); - memset(pmadapter, &priv->gen_ie_buf, 0, sizeof(priv->gen_ie_buf)); - priv->gen_ie_buf_len = 0; + memset(pmadapter, &priv->wps, 0, sizeof(priv->wps)); + memset(pmadapter, &priv->gen_ie_buf, 0, sizeof(priv->gen_ie_buf)); + priv->gen_ie_buf_len = 0; #endif /* STA_SUPPORT */ - priv->tx_bf_cap = 0; - priv->wmm_required = MTRUE; - priv->wmm_enabled = MFALSE; - priv->wmm_qosinfo = 0; + priv->tx_bf_cap = 0; + priv->wmm_required = MTRUE; + priv->wmm_enabled = MFALSE; + priv->wmm_qosinfo = 0; #ifdef STA_SUPPORT - priv->pcurr_bcn_buf = MNULL; - priv->curr_bcn_size = 0; - memset(pmadapter, &priv->ext_cap, 0, sizeof(priv->ext_cap)); - SET_EXTCAP_OPERMODENTF(priv->ext_cap); + priv->pcurr_bcn_buf = MNULL; + priv->curr_bcn_size = 0; + memset(pmadapter, &priv->ext_cap, 0, sizeof(priv->ext_cap)); + SET_EXTCAP_OPERMODENTF(priv->ext_cap); #endif /* STA_SUPPORT */ - for (i = 0; i < MAX_NUM_TID; i++) - priv->addba_reject[i] = ADDBA_RSP_STATUS_ACCEPT; - priv->max_amsdu = 0; + for (i = 0; i < MAX_NUM_TID; i++) + priv->addba_reject[i] = ADDBA_RSP_STATUS_ACCEPT; + priv->max_amsdu = 0; - if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) { - priv->port_ctrl_mode = MTRUE; - } else { - priv->port_ctrl_mode = MFALSE; - } - priv->port_open = MFALSE; + if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) { + priv->port_ctrl_mode = MTRUE; + } else { + priv->port_ctrl_mode = MFALSE; + } + priv->port_open = MFALSE; - ret = wlan_add_bsspriotbl(priv); + ret = wlan_add_bsspriotbl(priv); - LEAVE(); - return ret; + LEAVE(); + return ret; } /** * @brief This function initializes the adapter structure * and sets default values to the members of adapter. - * + * * @param pmadapter A pointer to mlan_adapter structure * * @return N/A @@ -381,223 +398,230 @@ wlan_init_priv(pmlan_private priv) t_void wlan_init_adapter(pmlan_adapter pmadapter) { - opt_sleep_confirm_buffer *sleep_cfm_buf = MNULL; - ENTER(); + opt_sleep_confirm_buffer *sleep_cfm_buf = MNULL; + ENTER(); - sleep_cfm_buf = (opt_sleep_confirm_buffer *) (pmadapter->psleep_cfm->pbuf + - pmadapter->psleep_cfm-> - data_offset); + sleep_cfm_buf = + (opt_sleep_confirm_buffer *) (pmadapter->psleep_cfm->pbuf + + pmadapter->psleep_cfm-> + data_offset); #ifdef MFG_CMD_SUPPORT - if (pmadapter->init_para.mfg_mode == MLAN_INIT_PARA_DISABLED) { - pmadapter->mfg_mode = MFALSE; - } else { - pmadapter->mfg_mode = pmadapter->init_para.mfg_mode; - } + if (pmadapter->init_para.mfg_mode == MLAN_INIT_PARA_DISABLED) { + pmadapter->mfg_mode = MFALSE; + } else { + pmadapter->mfg_mode = pmadapter->init_para.mfg_mode; + } #endif - pmadapter->int_mode = pmadapter->init_para.int_mode; - pmadapter->gpio_pin = pmadapter->init_para.gpio_pin; + pmadapter->int_mode = pmadapter->init_para.int_mode; + pmadapter->gpio_pin = pmadapter->init_para.gpio_pin; #if defined(STA_SUPPORT) - pmadapter->pwarm_reset_ioctl_req = MNULL; + pmadapter->pwarm_reset_ioctl_req = MNULL; #endif - pmadapter->cmd_sent = MFALSE; - pmadapter->data_sent = MTRUE; - pmadapter->mp_rd_bitmap = 0; - pmadapter->mp_wr_bitmap = 0; - pmadapter->curr_rd_port = 0; - pmadapter->curr_wr_port = 0; - pmadapter->mp_data_port_mask = DATA_PORT_MASK; + pmadapter->cmd_sent = MFALSE; + pmadapter->data_sent = MTRUE; + pmadapter->mp_rd_bitmap = 0; + pmadapter->mp_wr_bitmap = 0; + pmadapter->curr_rd_port = 0; + pmadapter->curr_wr_port = 0; + pmadapter->mp_data_port_mask = DATA_PORT_MASK; #ifdef SDIO_MULTI_PORT_TX_AGGR - pmadapter->mpa_tx.buf_len = 0; - pmadapter->mpa_tx.pkt_cnt = 0; - pmadapter->mpa_tx.start_port = 0; - - if (!pmadapter->init_para.mpa_tx_cfg) { - pmadapter->mpa_tx.enabled = MFALSE; - } else if (pmadapter->init_para.mpa_tx_cfg == MLAN_INIT_PARA_DISABLED) { - pmadapter->mpa_tx.enabled = MFALSE; - } else { - pmadapter->mpa_tx.enabled = MTRUE; - } - pmadapter->mpa_tx.pkt_aggr_limit = SDIO_MP_AGGR_DEF_PKT_LIMIT; + pmadapter->mpa_tx.buf_len = 0; + pmadapter->mpa_tx.pkt_cnt = 0; + pmadapter->mpa_tx.start_port = 0; + + if (!pmadapter->init_para.mpa_tx_cfg) { + pmadapter->mpa_tx.enabled = MFALSE; + } else if (pmadapter->init_para.mpa_tx_cfg == MLAN_INIT_PARA_DISABLED) { + pmadapter->mpa_tx.enabled = MFALSE; + } else { + pmadapter->mpa_tx.enabled = MTRUE; + } + pmadapter->mpa_tx.pkt_aggr_limit = SDIO_MP_AGGR_DEF_PKT_LIMIT; #endif /* SDIO_MULTI_PORT_TX_AGGR */ #ifdef SDIO_MULTI_PORT_RX_AGGR - pmadapter->mpa_rx.buf_len = 0; - pmadapter->mpa_rx.pkt_cnt = 0; - pmadapter->mpa_rx.start_port = 0; - - if (!pmadapter->init_para.mpa_rx_cfg) { - pmadapter->mpa_rx.enabled = MFALSE; - } else if (pmadapter->init_para.mpa_rx_cfg == MLAN_INIT_PARA_DISABLED) { - pmadapter->mpa_rx.enabled = MFALSE; - } else { - pmadapter->mpa_rx.enabled = MTRUE; - } - pmadapter->mpa_rx.pkt_aggr_limit = SDIO_MP_AGGR_DEF_PKT_LIMIT; + pmadapter->mpa_rx.buf_len = 0; + pmadapter->mpa_rx.pkt_cnt = 0; + pmadapter->mpa_rx.start_port = 0; + + if (!pmadapter->init_para.mpa_rx_cfg) { + pmadapter->mpa_rx.enabled = MFALSE; + } else if (pmadapter->init_para.mpa_rx_cfg == MLAN_INIT_PARA_DISABLED) { + pmadapter->mpa_rx.enabled = MFALSE; + } else { + pmadapter->mpa_rx.enabled = MTRUE; + } + pmadapter->mpa_rx.pkt_aggr_limit = SDIO_MP_AGGR_DEF_PKT_LIMIT; #endif /* SDIO_MULTI_PORT_RX_AGGR */ - pmadapter->cmd_resp_received = MFALSE; - pmadapter->event_received = MFALSE; - pmadapter->data_received = MFALSE; + pmadapter->cmd_resp_received = MFALSE; + pmadapter->event_received = MFALSE; + pmadapter->data_received = MFALSE; - pmadapter->cmd_timer_is_set = MFALSE; + pmadapter->cmd_timer_is_set = MFALSE; - /* PnP and power profile */ - pmadapter->surprise_removed = MFALSE; + /* PnP and power profile */ + pmadapter->surprise_removed = MFALSE; - /* Status variables */ - pmadapter->hw_status = WlanHardwareStatusInitializing; + /* Status variables */ + pmadapter->hw_status = WlanHardwareStatusInitializing; - if (!pmadapter->init_para.ps_mode) { - pmadapter->ps_mode = DEFAULT_PS_MODE; - } else if (pmadapter->init_para.ps_mode == MLAN_INIT_PARA_DISABLED) { - pmadapter->ps_mode = Wlan802_11PowerModeCAM; - } else { - pmadapter->ps_mode = Wlan802_11PowerModePSP; - } - pmadapter->ps_state = PS_STATE_AWAKE; - pmadapter->need_to_wakeup = MFALSE; + if (!pmadapter->init_para.ps_mode) { + pmadapter->ps_mode = DEFAULT_PS_MODE; + } else if (pmadapter->init_para.ps_mode == MLAN_INIT_PARA_DISABLED) { + pmadapter->ps_mode = Wlan802_11PowerModeCAM; + } else { + pmadapter->ps_mode = Wlan802_11PowerModePSP; + } + pmadapter->ps_state = PS_STATE_AWAKE; + pmadapter->need_to_wakeup = MFALSE; #ifdef STA_SUPPORT - pmadapter->scan_block = MFALSE; - /* Scan type */ - pmadapter->scan_type = MLAN_SCAN_TYPE_ACTIVE; - /* Scan mode */ - pmadapter->scan_mode = HostCmd_BSS_MODE_ANY; - /* Scan time */ - pmadapter->specific_scan_time = MRVDRV_SPECIFIC_SCAN_CHAN_TIME; - pmadapter->active_scan_time = MRVDRV_ACTIVE_SCAN_CHAN_TIME; - pmadapter->passive_scan_time = MRVDRV_PASSIVE_SCAN_CHAN_TIME; - - pmadapter->num_in_scan_table = 0; - memset(pmadapter, pmadapter->pscan_table, 0, - (sizeof(BSSDescriptor_t) * MRVDRV_MAX_BSSID_LIST)); - pmadapter->ext_scan = 0; - pmadapter->scan_probes = DEFAULT_PROBES; - - memset(pmadapter, pmadapter->bcn_buf, 0, pmadapter->bcn_buf_size); - pmadapter->pbcn_buf_end = pmadapter->bcn_buf; - - pmadapter->radio_on = RADIO_ON; - pmadapter->multiple_dtim = MRVDRV_DEFAULT_MULTIPLE_DTIM; - - pmadapter->local_listen_interval = 0; /* default value in firmware - will be used */ + pmadapter->scan_block = MFALSE; + /* Scan type */ + pmadapter->scan_type = MLAN_SCAN_TYPE_ACTIVE; + /* Scan mode */ + pmadapter->scan_mode = HostCmd_BSS_MODE_ANY; + /* Scan time */ + pmadapter->specific_scan_time = MRVDRV_SPECIFIC_SCAN_CHAN_TIME; + pmadapter->active_scan_time = MRVDRV_ACTIVE_SCAN_CHAN_TIME; + pmadapter->passive_scan_time = MRVDRV_PASSIVE_SCAN_CHAN_TIME; + + pmadapter->num_in_scan_table = 0; + memset(pmadapter, pmadapter->pscan_table, 0, + (sizeof(BSSDescriptor_t) * MRVDRV_MAX_BSSID_LIST)); + pmadapter->ext_scan = 0; + pmadapter->scan_probes = DEFAULT_PROBES; + + memset(pmadapter, pmadapter->bcn_buf, 0, pmadapter->bcn_buf_size); + pmadapter->pbcn_buf_end = pmadapter->bcn_buf; + + pmadapter->radio_on = RADIO_ON; + pmadapter->multiple_dtim = MRVDRV_DEFAULT_MULTIPLE_DTIM; + + pmadapter->local_listen_interval = 0; /* default value in firmware + will be used */ #endif /* STA_SUPPORT */ - pmadapter->is_deep_sleep = MFALSE; - pmadapter->idle_time = DEEP_SLEEP_IDLE_TIME; - if (!pmadapter->init_para.auto_ds) { - pmadapter->init_auto_ds = DEFAULT_AUTO_DS_MODE; - } else if (pmadapter->init_para.auto_ds == MLAN_INIT_PARA_DISABLED) { - pmadapter->init_auto_ds = MFALSE; - } else { - pmadapter->init_auto_ds = MTRUE; - } - - pmadapter->delay_null_pkt = MFALSE; - pmadapter->delay_to_ps = DELAY_TO_PS_DEFAULT; - pmadapter->enhanced_ps_mode = PS_MODE_AUTO; - - pmadapter->gen_null_pkt = MFALSE; /* Disable NULL Pkt generation-default */ - pmadapter->pps_uapsd_mode = MFALSE; /* Disable pps/uapsd mode -default */ - - pmadapter->pm_wakeup_card_req = MFALSE; - - pmadapter->pm_wakeup_fw_try = MFALSE; - - if (!pmadapter->init_para.max_tx_buf) - pmadapter->max_tx_buf_size = MLAN_TX_DATA_BUF_SIZE_2K; - else - pmadapter->max_tx_buf_size = (t_u16) pmadapter->init_para.max_tx_buf; - pmadapter->tx_buf_size = MLAN_TX_DATA_BUF_SIZE_2K; - pmadapter->curr_tx_buf_size = MLAN_TX_DATA_BUF_SIZE_2K; - - pmadapter->is_hs_configured = MFALSE; - pmadapter->hs_cfg.conditions = HOST_SLEEP_DEF_COND; - pmadapter->hs_cfg.gpio = HOST_SLEEP_DEF_GPIO; - pmadapter->hs_cfg.gap = HOST_SLEEP_DEF_GAP; - pmadapter->hs_activated = MFALSE; - pmadapter->min_wake_holdoff = HOST_SLEEP_DEF_WAKE_HOLDOFF; - - memset(pmadapter, pmadapter->event_body, 0, sizeof(pmadapter->event_body)); - pmadapter->hw_dot_11n_dev_cap = 0; - pmadapter->hw_dev_mcs_support = 0; - pmadapter->usr_dot_11n_dev_cap_bg = 0; - pmadapter->usr_dot_11n_dev_cap_a = 0; - pmadapter->usr_dev_mcs_support = 0; + pmadapter->is_deep_sleep = MFALSE; + pmadapter->idle_time = DEEP_SLEEP_IDLE_TIME; + if (!pmadapter->init_para.auto_ds) { + pmadapter->init_auto_ds = DEFAULT_AUTO_DS_MODE; + } else if (pmadapter->init_para.auto_ds == MLAN_INIT_PARA_DISABLED) { + pmadapter->init_auto_ds = MFALSE; + } else { + pmadapter->init_auto_ds = MTRUE; + } + + pmadapter->delay_null_pkt = MFALSE; + pmadapter->delay_to_ps = DELAY_TO_PS_DEFAULT; + pmadapter->enhanced_ps_mode = PS_MODE_AUTO; + + pmadapter->gen_null_pkt = MFALSE; /* Disable NULL Pkt + generation-default */ + pmadapter->pps_uapsd_mode = MFALSE; /* Disable pps/uapsd mode + -default */ + + pmadapter->pm_wakeup_card_req = MFALSE; + + pmadapter->pm_wakeup_fw_try = MFALSE; + + if (!pmadapter->init_para.max_tx_buf) + pmadapter->max_tx_buf_size = MLAN_TX_DATA_BUF_SIZE_2K; + else + pmadapter->max_tx_buf_size = + (t_u16) pmadapter->init_para.max_tx_buf; + pmadapter->tx_buf_size = MLAN_TX_DATA_BUF_SIZE_2K; + pmadapter->curr_tx_buf_size = MLAN_TX_DATA_BUF_SIZE_2K; + + pmadapter->is_hs_configured = MFALSE; + pmadapter->hs_cfg.conditions = HOST_SLEEP_DEF_COND; + pmadapter->hs_cfg.gpio = HOST_SLEEP_DEF_GPIO; + pmadapter->hs_cfg.gap = HOST_SLEEP_DEF_GAP; + pmadapter->hs_activated = MFALSE; + pmadapter->min_wake_holdoff = HOST_SLEEP_DEF_WAKE_HOLDOFF; + + memset(pmadapter, pmadapter->event_body, 0, + sizeof(pmadapter->event_body)); + pmadapter->hw_dot_11n_dev_cap = 0; + pmadapter->hw_dev_mcs_support = 0; + pmadapter->usr_dot_11n_dev_cap_bg = 0; + pmadapter->usr_dot_11n_dev_cap_a = 0; + pmadapter->usr_dev_mcs_support = 0; #ifdef STA_SUPPORT - pmadapter->chan_bandwidth = 0; - pmadapter->adhoc_11n_enabled = MFALSE; + pmadapter->chan_bandwidth = 0; + pmadapter->adhoc_11n_enabled = MFALSE; #endif /* STA_SUPPORT */ - pmadapter->hw_dot_11ac_dev_cap = 0; - pmadapter->hw_dot_11ac_mcs_support = 0; - pmadapter->usr_dot_11ac_dev_cap_bg = 0; - pmadapter->usr_dot_11ac_dev_cap_a = 0; - pmadapter->usr_dot_11ac_mcs_support = 0; - - /* Initialize 802.11d */ - wlan_11d_init(pmadapter); - - wlan_11h_init(pmadapter); - - wlan_wmm_init(pmadapter); - pmadapter->bypass_pkt_count = 0; - if (pmadapter->psleep_cfm) { - pmadapter->psleep_cfm->buf_type = MLAN_BUF_TYPE_CMD; - pmadapter->psleep_cfm->data_len = sizeof(OPT_Confirm_Sleep); - memset(pmadapter, &sleep_cfm_buf->ps_cfm_sleep, 0, - sizeof(OPT_Confirm_Sleep)); - sleep_cfm_buf->ps_cfm_sleep.command = - wlan_cpu_to_le16(HostCmd_CMD_802_11_PS_MODE_ENH); - sleep_cfm_buf->ps_cfm_sleep.size = - wlan_cpu_to_le16(sizeof(OPT_Confirm_Sleep)); - sleep_cfm_buf->ps_cfm_sleep.result = 0; - sleep_cfm_buf->ps_cfm_sleep.action = wlan_cpu_to_le16(SLEEP_CONFIRM); - sleep_cfm_buf->ps_cfm_sleep.sleep_cfm.resp_ctrl = - wlan_cpu_to_le16(RESP_NEEDED); - } - memset(pmadapter, &pmadapter->sleep_params, 0, - sizeof(pmadapter->sleep_params)); - memset(pmadapter, &pmadapter->sleep_period, 0, - sizeof(pmadapter->sleep_period)); - pmadapter->tx_lock_flag = MFALSE; - pmadapter->null_pkt_interval = 0; - pmadapter->fw_bands = 0; - pmadapter->config_bands = 0; - pmadapter->adhoc_start_band = 0; - pmadapter->pscan_channels = MNULL; - pmadapter->fw_release_number = 0; - pmadapter->fw_cap_info = 0; - memset(pmadapter, &pmadapter->upld_buf, 0, sizeof(pmadapter->upld_buf)); - pmadapter->upld_len = 0; - pmadapter->event_cause = 0; - pmadapter->pmlan_buffer_event = MNULL; - memset(pmadapter, &pmadapter->region_channel, 0, - sizeof(pmadapter->region_channel)); - pmadapter->region_code = 0; - memcpy(pmadapter, pmadapter->country_code, MRVDRV_DEFAULT_COUNTRY_CODE, - COUNTRY_CODE_LEN); - pmadapter->bcn_miss_time_out = DEFAULT_BCN_MISS_TIMEOUT; - pmadapter->adhoc_awake_period = 0; + pmadapter->hw_dot_11ac_dev_cap = 0; + pmadapter->hw_dot_11ac_mcs_support = 0; + pmadapter->usr_dot_11ac_dev_cap_bg = 0; + pmadapter->usr_dot_11ac_dev_cap_a = 0; + pmadapter->usr_dot_11ac_mcs_support = 0; + + /* Initialize 802.11d */ + wlan_11d_init(pmadapter); + + wlan_11h_init(pmadapter); + + wlan_wmm_init(pmadapter); + pmadapter->bypass_pkt_count = 0; + if (pmadapter->psleep_cfm) { + pmadapter->psleep_cfm->buf_type = MLAN_BUF_TYPE_CMD; + pmadapter->psleep_cfm->data_len = sizeof(OPT_Confirm_Sleep); + memset(pmadapter, &sleep_cfm_buf->ps_cfm_sleep, 0, + sizeof(OPT_Confirm_Sleep)); + sleep_cfm_buf->ps_cfm_sleep.command = + wlan_cpu_to_le16(HostCmd_CMD_802_11_PS_MODE_ENH); + sleep_cfm_buf->ps_cfm_sleep.size = + wlan_cpu_to_le16(sizeof(OPT_Confirm_Sleep)); + sleep_cfm_buf->ps_cfm_sleep.result = 0; + sleep_cfm_buf->ps_cfm_sleep.action = + wlan_cpu_to_le16(SLEEP_CONFIRM); + sleep_cfm_buf->ps_cfm_sleep.sleep_cfm.resp_ctrl = + wlan_cpu_to_le16(RESP_NEEDED); + } + memset(pmadapter, &pmadapter->sleep_params, 0, + sizeof(pmadapter->sleep_params)); + memset(pmadapter, &pmadapter->sleep_period, 0, + sizeof(pmadapter->sleep_period)); + pmadapter->tx_lock_flag = MFALSE; + pmadapter->null_pkt_interval = 0; + pmadapter->fw_bands = 0; + pmadapter->config_bands = 0; + pmadapter->adhoc_start_band = 0; + pmadapter->pscan_channels = MNULL; + pmadapter->fw_release_number = 0; + pmadapter->fw_cap_info = 0; + memset(pmadapter, &pmadapter->upld_buf, 0, sizeof(pmadapter->upld_buf)); + pmadapter->upld_len = 0; + pmadapter->event_cause = 0; + pmadapter->pmlan_buffer_event = MNULL; + memset(pmadapter, &pmadapter->region_channel, 0, + sizeof(pmadapter->region_channel)); + pmadapter->region_code = 0; + memcpy(pmadapter, pmadapter->country_code, MRVDRV_DEFAULT_COUNTRY_CODE, + COUNTRY_CODE_LEN); + pmadapter->bcn_miss_time_out = DEFAULT_BCN_MISS_TIMEOUT; + pmadapter->adhoc_awake_period = 0; #ifdef STA_SUPPORT - memset(pmadapter, &pmadapter->arp_filter, 0, sizeof(pmadapter->arp_filter)); - pmadapter->arp_filter_size = 0; + memset(pmadapter, &pmadapter->arp_filter, 0, + sizeof(pmadapter->arp_filter)); + pmadapter->arp_filter_size = 0; #endif /* STA_SUPPORT */ - LEAVE(); - return; + LEAVE(); + return; } /** - * @brief This function intializes the lock variables and + * @brief This function intializes the lock variables and * the list heads. - * + * * @param pmadapter A pointer to a mlan_adapter structure * * @return MLAN_STATUS_SUCCESS -- on success, @@ -607,217 +631,243 @@ wlan_init_adapter(pmlan_adapter pmadapter) mlan_status wlan_init_lock_list(IN pmlan_adapter pmadapter) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private priv = MNULL; - pmlan_callbacks pcb = &pmadapter->callbacks; - t_s32 i = 0; - t_u32 j = 0; - - ENTER(); - - if (pcb->moal_init_lock(pmadapter->pmoal_handle, &pmadapter->pmlan_lock) - != MLAN_STATUS_SUCCESS) { - ret = MLAN_STATUS_FAILURE; - goto error; - } - if (pcb->moal_init_lock(pmadapter->pmoal_handle, &pmadapter->pint_lock) - != MLAN_STATUS_SUCCESS) { - ret = MLAN_STATUS_FAILURE; - goto error; - } - if (pcb-> - moal_init_lock(pmadapter->pmoal_handle, &pmadapter->pmain_proc_lock) - != MLAN_STATUS_SUCCESS) { - ret = MLAN_STATUS_FAILURE; - goto error; - } - if (pcb->moal_init_lock(pmadapter->pmoal_handle, &pmadapter->pmlan_cmd_lock) - != MLAN_STATUS_SUCCESS) { - ret = MLAN_STATUS_FAILURE; - goto error; - } - for (i = 0; i < pmadapter->priv_num; i++) { - if (pmadapter->priv[i]) { - priv = pmadapter->priv[i]; - if (pcb->moal_init_lock(pmadapter->pmoal_handle, &priv->rx_pkt_lock) - != MLAN_STATUS_SUCCESS) { - ret = MLAN_STATUS_FAILURE; - goto error; - } - if (pcb-> - moal_init_lock(pmadapter->pmoal_handle, - &priv->wmm.ra_list_spinlock) - != MLAN_STATUS_SUCCESS) { - ret = MLAN_STATUS_FAILURE; - goto error; - } + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private priv = MNULL; + pmlan_callbacks pcb = &pmadapter->callbacks; + t_s32 i = 0; + t_u32 j = 0; + + ENTER(); + + if (pcb->moal_init_lock(pmadapter->pmoal_handle, &pmadapter->pmlan_lock) + != MLAN_STATUS_SUCCESS) { + ret = MLAN_STATUS_FAILURE; + goto error; + } + if (pcb->moal_init_lock(pmadapter->pmoal_handle, &pmadapter->pint_lock) + != MLAN_STATUS_SUCCESS) { + ret = MLAN_STATUS_FAILURE; + goto error; + } + if (pcb-> + moal_init_lock(pmadapter->pmoal_handle, &pmadapter->pmain_proc_lock) + != MLAN_STATUS_SUCCESS) { + ret = MLAN_STATUS_FAILURE; + goto error; + } + if (pcb-> + moal_init_lock(pmadapter->pmoal_handle, &pmadapter->pmlan_cmd_lock) + != MLAN_STATUS_SUCCESS) { + ret = MLAN_STATUS_FAILURE; + goto error; + } + for (i = 0; i < pmadapter->priv_num; i++) { + if (pmadapter->priv[i]) { + priv = pmadapter->priv[i]; + if (pcb-> + moal_init_lock(pmadapter->pmoal_handle, + &priv->rx_pkt_lock) + != MLAN_STATUS_SUCCESS) { + ret = MLAN_STATUS_FAILURE; + goto error; + } + if (pcb-> + moal_init_lock(pmadapter->pmoal_handle, + &priv->wmm.ra_list_spinlock) + != MLAN_STATUS_SUCCESS) { + ret = MLAN_STATUS_FAILURE; + goto error; + } #ifdef STA_SUPPORT - if (pcb-> - moal_init_lock(pmadapter->pmoal_handle, - &priv->curr_bcn_buf_lock) - != MLAN_STATUS_SUCCESS) { - ret = MLAN_STATUS_FAILURE; - goto error; - } + if (pcb-> + moal_init_lock(pmadapter->pmoal_handle, + &priv->curr_bcn_buf_lock) + != MLAN_STATUS_SUCCESS) { + ret = MLAN_STATUS_FAILURE; + goto error; + } #endif - } - } - - /* Initialize cmd_free_q */ - util_init_list_head((t_void *) pmadapter->pmoal_handle, - &pmadapter->cmd_free_q, MTRUE, - pmadapter->callbacks.moal_init_lock); - /* Initialize cmd_pending_q */ - util_init_list_head((t_void *) pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, MTRUE, - pmadapter->callbacks.moal_init_lock); - /* Initialize scan_pending_q */ - util_init_list_head((t_void *) pmadapter->pmoal_handle, - &pmadapter->scan_pending_q, MTRUE, - pmadapter->callbacks.moal_init_lock); - - for (i = 0; i < pmadapter->priv_num; ++i) { - util_init_list_head((t_void *) pmadapter->pmoal_handle, - &pmadapter->bssprio_tbl[i].bssprio_head, - MTRUE, pmadapter->callbacks.moal_init_lock); - pmadapter->bssprio_tbl[i].bssprio_cur = MNULL; - } - - for (i = 0; i < pmadapter->priv_num; i++) { - if (pmadapter->priv[i]) { - priv = pmadapter->priv[i]; - for (j = 0; j < MAX_NUM_TID; ++j) { - util_init_list_head((t_void *) pmadapter->pmoal_handle, - &priv->wmm.tid_tbl_ptr[j].ra_list, MTRUE, - priv->adapter->callbacks.moal_init_lock); - } - util_init_list_head((t_void *) pmadapter->pmoal_handle, - &priv->tx_ba_stream_tbl_ptr, MTRUE, - pmadapter->callbacks.moal_init_lock); - util_init_list_head((t_void *) pmadapter->pmoal_handle, - &priv->rx_reorder_tbl_ptr, MTRUE, - pmadapter->callbacks.moal_init_lock); - util_scalar_init((t_void *) pmadapter->pmoal_handle, - &priv->wmm.tx_pkts_queued, 0, - priv->wmm.ra_list_spinlock, - pmadapter->callbacks.moal_init_lock); - util_scalar_init((t_void *) pmadapter->pmoal_handle, - &priv->wmm.highest_queued_prio, HIGH_PRIO_TID, - priv->wmm.ra_list_spinlock, - pmadapter->callbacks.moal_init_lock); - util_init_list_head((t_void *) pmadapter->pmoal_handle, - &priv->sta_list, MTRUE, - pmadapter->callbacks.moal_init_lock); - /* Initialize bypass_txq */ - util_init_list_head((t_void *) pmadapter->pmoal_handle, - &priv->bypass_txq, MTRUE, - pmadapter->callbacks.moal_init_lock); - } - } - - error: - LEAVE(); - return ret; + } + } + + /* Initialize cmd_free_q */ + util_init_list_head((t_void *) pmadapter->pmoal_handle, + &pmadapter->cmd_free_q, MTRUE, + pmadapter->callbacks.moal_init_lock); + /* Initialize cmd_pending_q */ + util_init_list_head((t_void *) pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, MTRUE, + pmadapter->callbacks.moal_init_lock); + /* Initialize scan_pending_q */ + util_init_list_head((t_void *) pmadapter->pmoal_handle, + &pmadapter->scan_pending_q, MTRUE, + pmadapter->callbacks.moal_init_lock); + + for (i = 0; i < pmadapter->priv_num; ++i) { + util_init_list_head((t_void *) pmadapter->pmoal_handle, + &pmadapter->bssprio_tbl[i].bssprio_head, + MTRUE, pmadapter->callbacks.moal_init_lock); + pmadapter->bssprio_tbl[i].bssprio_cur = MNULL; + } + + for (i = 0; i < pmadapter->priv_num; i++) { + if (pmadapter->priv[i]) { + priv = pmadapter->priv[i]; + for (j = 0; j < MAX_NUM_TID; ++j) { + util_init_list_head((t_void *) pmadapter-> + pmoal_handle, + &priv->wmm.tid_tbl_ptr[j]. + ra_list, MTRUE, + priv->adapter->callbacks. + moal_init_lock); + } + util_init_list_head((t_void *) pmadapter->pmoal_handle, + &priv->tx_ba_stream_tbl_ptr, MTRUE, + pmadapter->callbacks. + moal_init_lock); + util_init_list_head((t_void *) pmadapter->pmoal_handle, + &priv->rx_reorder_tbl_ptr, MTRUE, + pmadapter->callbacks. + moal_init_lock); + util_scalar_init((t_void *) pmadapter->pmoal_handle, + &priv->wmm.tx_pkts_queued, 0, + priv->wmm.ra_list_spinlock, + pmadapter->callbacks.moal_init_lock); + util_scalar_init((t_void *) pmadapter->pmoal_handle, + &priv->wmm.highest_queued_prio, + HIGH_PRIO_TID, + priv->wmm.ra_list_spinlock, + pmadapter->callbacks.moal_init_lock); + util_init_list_head((t_void *) pmadapter->pmoal_handle, + &priv->sta_list, MTRUE, + pmadapter->callbacks. + moal_init_lock); + /* Initialize bypass_txq */ + util_init_list_head((t_void *) pmadapter->pmoal_handle, + &priv->bypass_txq, MTRUE, + pmadapter->callbacks. + moal_init_lock); + } + } + +error: + LEAVE(); + return ret; } /** * @brief This function releases the lock variables - * + * * @param pmadapter A pointer to a mlan_adapter structure * - * @return None + * @return None * */ t_void wlan_free_lock_list(IN pmlan_adapter pmadapter) { - pmlan_private priv = MNULL; - pmlan_callbacks pcb = &pmadapter->callbacks; - t_s32 i = 0; - t_s32 j = 0; - - ENTER(); - - if (pmadapter->pmlan_lock) - pcb->moal_free_lock(pmadapter->pmoal_handle, pmadapter->pmlan_lock); - if (pmadapter->pint_lock) - pcb->moal_free_lock(pmadapter->pmoal_handle, pmadapter->pint_lock); - if (pmadapter->pmain_proc_lock) - pcb->moal_free_lock(pmadapter->pmoal_handle, - pmadapter->pmain_proc_lock); - if (pmadapter->pmlan_cmd_lock) - pcb->moal_free_lock(pmadapter->pmoal_handle, pmadapter->pmlan_cmd_lock); - - for (i = 0; i < pmadapter->priv_num; i++) { - if (pmadapter->priv[i]) { - priv = pmadapter->priv[i]; - if (priv->rx_pkt_lock) - pcb->moal_free_lock(pmadapter->pmoal_handle, priv->rx_pkt_lock); - if (priv->wmm.ra_list_spinlock) - pcb->moal_free_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); + pmlan_private priv = MNULL; + pmlan_callbacks pcb = &pmadapter->callbacks; + t_s32 i = 0; + t_s32 j = 0; + + ENTER(); + + if (pmadapter->pmlan_lock) + pcb->moal_free_lock(pmadapter->pmoal_handle, + pmadapter->pmlan_lock); + if (pmadapter->pint_lock) + pcb->moal_free_lock(pmadapter->pmoal_handle, + pmadapter->pint_lock); + if (pmadapter->pmain_proc_lock) + pcb->moal_free_lock(pmadapter->pmoal_handle, + pmadapter->pmain_proc_lock); + if (pmadapter->pmlan_cmd_lock) + pcb->moal_free_lock(pmadapter->pmoal_handle, + pmadapter->pmlan_cmd_lock); + + for (i = 0; i < pmadapter->priv_num; i++) { + if (pmadapter->priv[i]) { + priv = pmadapter->priv[i]; + if (priv->rx_pkt_lock) + pcb->moal_free_lock(pmadapter->pmoal_handle, + priv->rx_pkt_lock); + if (priv->wmm.ra_list_spinlock) + pcb->moal_free_lock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); #ifdef STA_SUPPORT - if (priv->curr_bcn_buf_lock) - pcb->moal_free_lock(pmadapter->pmoal_handle, - priv->curr_bcn_buf_lock); + if (priv->curr_bcn_buf_lock) + pcb->moal_free_lock(pmadapter->pmoal_handle, + priv->curr_bcn_buf_lock); #endif - } - } - - /* Free lists */ - util_free_list_head((t_void *) pmadapter->pmoal_handle, - &pmadapter->cmd_free_q, - pmadapter->callbacks.moal_free_lock); - - util_free_list_head((t_void *) pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, - pmadapter->callbacks.moal_free_lock); - - util_free_list_head((t_void *) pmadapter->pmoal_handle, - &pmadapter->scan_pending_q, - pmadapter->callbacks.moal_free_lock); - - for (i = 0; i < pmadapter->priv_num; i++) - util_free_list_head((t_void *) pmadapter->pmoal_handle, - &pmadapter->bssprio_tbl[i].bssprio_head, - pcb->moal_free_lock); - - for (i = 0; i < pmadapter->priv_num; i++) { - if (pmadapter->priv[i]) { - priv = pmadapter->priv[i]; - util_free_list_head((t_void *) pmadapter->pmoal_handle, - &priv->sta_list, - priv->adapter->callbacks.moal_free_lock); - util_free_list_head((t_void *) pmadapter->pmoal_handle, - &priv->bypass_txq, - pmadapter->callbacks.moal_free_lock); - - for (j = 0; j < MAX_NUM_TID; ++j) - util_free_list_head((t_void *) priv->adapter->pmoal_handle, - &priv->wmm.tid_tbl_ptr[j].ra_list, - priv->adapter->callbacks.moal_free_lock); - util_free_list_head((t_void *) priv->adapter->pmoal_handle, - &priv->tx_ba_stream_tbl_ptr, - priv->adapter->callbacks.moal_free_lock); - util_free_list_head((t_void *) priv->adapter->pmoal_handle, - &priv->rx_reorder_tbl_ptr, - priv->adapter->callbacks.moal_free_lock); - util_scalar_free((t_void *) priv->adapter->pmoal_handle, - &priv->wmm.tx_pkts_queued, - priv->adapter->callbacks.moal_free_lock); - util_scalar_free((t_void *) priv->adapter->pmoal_handle, - &priv->wmm.highest_queued_prio, - priv->adapter->callbacks.moal_free_lock); - } - } - - LEAVE(); - return; + } + } + + /* Free lists */ + util_free_list_head((t_void *) pmadapter->pmoal_handle, + &pmadapter->cmd_free_q, + pmadapter->callbacks.moal_free_lock); + + util_free_list_head((t_void *) pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + pmadapter->callbacks.moal_free_lock); + + util_free_list_head((t_void *) pmadapter->pmoal_handle, + &pmadapter->scan_pending_q, + pmadapter->callbacks.moal_free_lock); + + for (i = 0; i < pmadapter->priv_num; i++) + util_free_list_head((t_void *) pmadapter->pmoal_handle, + &pmadapter->bssprio_tbl[i].bssprio_head, + pcb->moal_free_lock); + + for (i = 0; i < pmadapter->priv_num; i++) { + if (pmadapter->priv[i]) { + priv = pmadapter->priv[i]; + util_free_list_head((t_void *) pmadapter->pmoal_handle, + &priv->sta_list, + priv->adapter->callbacks. + moal_free_lock); + util_free_list_head((t_void *) pmadapter->pmoal_handle, + &priv->bypass_txq, + pmadapter->callbacks. + moal_free_lock); + + for (j = 0; j < MAX_NUM_TID; ++j) + util_free_list_head((t_void *) priv->adapter-> + pmoal_handle, + &priv->wmm.tid_tbl_ptr[j]. + ra_list, + priv->adapter->callbacks. + moal_free_lock); + util_free_list_head((t_void *) priv->adapter-> + pmoal_handle, + &priv->tx_ba_stream_tbl_ptr, + priv->adapter->callbacks. + moal_free_lock); + util_free_list_head((t_void *) priv->adapter-> + pmoal_handle, + &priv->rx_reorder_tbl_ptr, + priv->adapter->callbacks. + moal_free_lock); + util_scalar_free((t_void *) priv->adapter->pmoal_handle, + &priv->wmm.tx_pkts_queued, + priv->adapter->callbacks. + moal_free_lock); + util_scalar_free((t_void *) priv->adapter->pmoal_handle, + &priv->wmm.highest_queued_prio, + priv->adapter->callbacks. + moal_free_lock); + } + } + + LEAVE(); + return; } /** * @brief This function intializes the timers - * + * * @param pmadapter A pointer to a mlan_adapter structure * * @return MLAN_STATUS_SUCCESS -- on success, @@ -827,42 +877,43 @@ wlan_free_lock_list(IN pmlan_adapter pmadapter) mlan_status wlan_init_timer(IN pmlan_adapter pmadapter) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_callbacks pcb = &pmadapter->callbacks; - ENTER(); - - if (pcb-> - moal_init_timer(pmadapter->pmoal_handle, &pmadapter->pmlan_cmd_timer, - wlan_cmd_timeout_func, pmadapter) - != MLAN_STATUS_SUCCESS) { - ret = MLAN_STATUS_FAILURE; - goto error; - } - error: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_callbacks pcb = &pmadapter->callbacks; + ENTER(); + + if (pcb-> + moal_init_timer(pmadapter->pmoal_handle, + &pmadapter->pmlan_cmd_timer, wlan_cmd_timeout_func, + pmadapter) + != MLAN_STATUS_SUCCESS) { + ret = MLAN_STATUS_FAILURE; + goto error; + } +error: + LEAVE(); + return ret; } /** * @brief This function releases the timers - * + * * @param pmadapter A pointer to a mlan_adapter structure * - * @return None + * @return None * */ t_void wlan_free_timer(IN pmlan_adapter pmadapter) { - pmlan_callbacks pcb = &pmadapter->callbacks; - ENTER(); + pmlan_callbacks pcb = &pmadapter->callbacks; + ENTER(); - if (pmadapter->pmlan_cmd_timer) - pcb->moal_free_timer(pmadapter->pmoal_handle, - pmadapter->pmlan_cmd_timer); + if (pmadapter->pmlan_cmd_timer) + pcb->moal_free_timer(pmadapter->pmoal_handle, + pmadapter->pmlan_cmd_timer); - LEAVE(); - return; + LEAVE(); + return; } /** @@ -875,59 +926,59 @@ wlan_free_timer(IN pmlan_adapter pmadapter) mlan_status wlan_init_fw(IN pmlan_adapter pmadapter) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private priv = MNULL; - t_u8 i = 0; - - ENTER(); - - /* Initialize adapter structure */ - wlan_init_adapter(pmadapter); - - for (i = 0; i < pmadapter->priv_num; i++) { - if (pmadapter->priv[i]) { - priv = pmadapter->priv[i]; - - /* Initialize private structure */ - if ((ret = wlan_init_priv(priv))) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - } - } + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private priv = MNULL; + t_u8 i = 0; + + ENTER(); + + /* Initialize adapter structure */ + wlan_init_adapter(pmadapter); + + for (i = 0; i < pmadapter->priv_num; i++) { + if (pmadapter->priv[i]) { + priv = pmadapter->priv[i]; + + /* Initialize private structure */ + if ((ret = wlan_init_priv(priv))) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + } + } #ifdef MFG_CMD_SUPPORT - if (pmadapter->mfg_mode != MTRUE) { + if (pmadapter->mfg_mode != MTRUE) { #endif - /* Issue firmware initialize commands for first BSS, for other - interfaces it will be called after getting the last init command - response of previous interface */ - priv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); - ret = priv->ops.init_cmd(priv, MTRUE); - if (ret == MLAN_STATUS_FAILURE) - goto done; + /* Issue firmware initialize commands for first BSS, for other + interfaces it will be called after getting the last init + command response of previous interface */ + priv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); + ret = priv->ops.init_cmd(priv, MTRUE); + if (ret == MLAN_STATUS_FAILURE) + goto done; #ifdef MFG_CMD_SUPPORT - } + } #endif - if (util_peek_list(pmadapter->pmoal_handle, &pmadapter->cmd_pending_q, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock)) { - /* Send the first command in queue and return */ - if (mlan_main_process(pmadapter) == MLAN_STATUS_FAILURE) - ret = MLAN_STATUS_FAILURE; - else - ret = MLAN_STATUS_PENDING; - } else { - pmadapter->hw_status = WlanHardwareStatusReady; - } - done: - LEAVE(); - return ret; + if (util_peek_list(pmadapter->pmoal_handle, &pmadapter->cmd_pending_q, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock)) { + /* Send the first command in queue and return */ + if (mlan_main_process(pmadapter) == MLAN_STATUS_FAILURE) + ret = MLAN_STATUS_FAILURE; + else + ret = MLAN_STATUS_PENDING; + } else { + pmadapter->hw_status = WlanHardwareStatusReady; + } +done: + LEAVE(); + return ret; } -/** +/** * @brief This function frees the structure of adapter - * + * * @param pmadapter A pointer to mlan_adapter structure * * @return N/A @@ -935,64 +986,65 @@ wlan_init_fw(IN pmlan_adapter pmadapter) t_void wlan_free_adapter(pmlan_adapter pmadapter) { - mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; - ENTER(); - - if (!pmadapter) { - PRINTM(MERROR, "The adapter is NULL\n"); - LEAVE(); - return; - } - - wlan_cancel_all_pending_cmd(pmadapter); - /* Free command buffer */ - PRINTM(MINFO, "Free Command buffer\n"); - wlan_free_cmd_buffer(pmadapter); - - if (pmadapter->cmd_timer_is_set) { - /* Cancel command timeout timer */ - pcb->moal_stop_timer(pmadapter->pmoal_handle, - pmadapter->pmlan_cmd_timer); - pmadapter->cmd_timer_is_set = MFALSE; - } + mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; + ENTER(); + + if (!pmadapter) { + PRINTM(MERROR, "The adapter is NULL\n"); + LEAVE(); + return; + } + + wlan_cancel_all_pending_cmd(pmadapter); + /* Free command buffer */ + PRINTM(MINFO, "Free Command buffer\n"); + wlan_free_cmd_buffer(pmadapter); + + if (pmadapter->cmd_timer_is_set) { + /* Cancel command timeout timer */ + pcb->moal_stop_timer(pmadapter->pmoal_handle, + pmadapter->pmlan_cmd_timer); + pmadapter->cmd_timer_is_set = MFALSE; + } #ifdef STA_SUPPORT - PRINTM(MINFO, "Free ScanTable\n"); - if (pmadapter->pscan_table) { - if (pcb->moal_vmalloc && pcb->moal_vfree) { - pcb->moal_vfree(pmadapter->pmoal_handle, - (t_u8 *) pmadapter->pscan_table); - } else - pcb->moal_mfree(pmadapter->pmoal_handle, - (t_u8 *) pmadapter->pscan_table); - pmadapter->pscan_table = MNULL; - } - if (pmadapter->bcn_buf) { - pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) pmadapter->bcn_buf); - pmadapter->bcn_buf = MNULL; - } + PRINTM(MINFO, "Free ScanTable\n"); + if (pmadapter->pscan_table) { + if (pcb->moal_vmalloc && pcb->moal_vfree) { + pcb->moal_vfree(pmadapter->pmoal_handle, + (t_u8 *) pmadapter->pscan_table); + } else + pcb->moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pmadapter->pscan_table); + pmadapter->pscan_table = MNULL; + } + if (pmadapter->bcn_buf) { + pcb->moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pmadapter->bcn_buf); + pmadapter->bcn_buf = MNULL; + } #endif - wlan_11h_cleanup(pmadapter); + wlan_11h_cleanup(pmadapter); - if (pmadapter->mp_regs_buf) { - pcb->moal_mfree(pmadapter->pmoal_handle, - (t_u8 *) pmadapter->mp_regs_buf); - pmadapter->mp_regs_buf = MNULL; - pmadapter->mp_regs = MNULL; - } + if (pmadapter->mp_regs_buf) { + pcb->moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pmadapter->mp_regs_buf); + pmadapter->mp_regs_buf = MNULL; + pmadapter->mp_regs = MNULL; + } #if defined(SDIO_MULTI_PORT_TX_AGGR) || defined(SDIO_MULTI_PORT_RX_AGGR) - wlan_free_sdio_mpa_buffers(pmadapter); + wlan_free_sdio_mpa_buffers(pmadapter); #endif - wlan_free_mlan_buffer(pmadapter, pmadapter->psleep_cfm); - pmadapter->psleep_cfm = MNULL; + wlan_free_mlan_buffer(pmadapter, pmadapter->psleep_cfm); + pmadapter->psleep_cfm = MNULL; - LEAVE(); - return; + LEAVE(); + return; } -/** +/** * @brief This function frees the structure of priv - * + * * @param pmpriv A pointer to mlan_private structure * * @return N/A @@ -1000,16 +1052,16 @@ wlan_free_adapter(pmlan_adapter pmadapter) t_void wlan_free_priv(mlan_private * pmpriv) { - ENTER(); - wlan_clean_txrx(pmpriv); - wlan_delete_bsspriotbl(pmpriv); + ENTER(); + wlan_clean_txrx(pmpriv); + wlan_delete_bsspriotbl(pmpriv); #ifdef STA_SUPPORT - wlan_free_curr_bcn(pmpriv); + wlan_free_curr_bcn(pmpriv); #endif /* STA_SUPPORT */ - wlan_delete_station_list(pmpriv); - LEAVE(); + wlan_delete_station_list(pmpriv); + LEAVE(); } /** @@ -1023,20 +1075,20 @@ wlan_free_priv(mlan_private * pmpriv) mlan_status wlan_init_fw_complete(IN pmlan_adapter pmadapter) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_callbacks pcb = &pmadapter->callbacks; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_callbacks pcb = &pmadapter->callbacks; - ENTER(); + ENTER(); - /* Check if hardware is ready */ - if (pmadapter->hw_status != WlanHardwareStatusReady) - status = MLAN_STATUS_FAILURE; + /* Check if hardware is ready */ + if (pmadapter->hw_status != WlanHardwareStatusReady) + status = MLAN_STATUS_FAILURE; - /* Invoke callback */ - ret = pcb->moal_init_fw_complete(pmadapter->pmoal_handle, status); - LEAVE(); - return ret; + /* Invoke callback */ + ret = pcb->moal_init_fw_complete(pmadapter->pmoal_handle, status); + LEAVE(); + return ret; } /** @@ -1050,14 +1102,14 @@ wlan_init_fw_complete(IN pmlan_adapter pmadapter) mlan_status wlan_shutdown_fw_complete(IN pmlan_adapter pmadapter) { - pmlan_callbacks pcb = &pmadapter->callbacks; - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - pmadapter->hw_status = WlanHardwareStatusNotReady; - /* Invoke callback */ - ret = pcb->moal_shutdown_fw_complete(pmadapter->pmoal_handle, status); - LEAVE(); - return ret; + pmlan_callbacks pcb = &pmadapter->callbacks; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + pmadapter->hw_status = WlanHardwareStatusNotReady; + /* Invoke callback */ + ret = pcb->moal_shutdown_fw_complete(pmadapter->pmoal_handle, status); + LEAVE(); + return ret; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_init.h b/drivers/net/wireless/sd8897/mlan/mlan_init.h index 4496741a3cfb..aced8327ec56 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_init.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_init.h @@ -3,7 +3,7 @@ * @brief This file defines the FW initialization data * structures. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -45,33 +45,33 @@ Change log: typedef struct _FWHeader { /** FW download command */ - t_u32 dnld_cmd; + t_u32 dnld_cmd; /** FW base address */ - t_u32 base_addr; + t_u32 base_addr; /** FW data length */ - t_u32 data_length; + t_u32 data_length; /** FW CRC */ - t_u32 crc; + t_u32 crc; } FWHeader; /** FWData */ typedef struct _FWData { /** FW data header */ - FWHeader fw_header; + FWHeader fw_header; /** FW data sequence number */ - t_u32 seq_num; + t_u32 seq_num; /** FW data buffer */ - t_u8 data[1]; + t_u8 data[1]; } FWData; /** FWSyncHeader */ typedef struct _FWSyncHeader { /** FW sync header command */ - t_u32 cmd; + t_u32 cmd; /** FW sync header sequence number */ - t_u32 seq_num; + t_u32 seq_num; } FWSyncHeader; #ifdef BIG_ENDIAN_SUPPORT diff --git a/drivers/net/wireless/sd8897/mlan/mlan_ioctl.h b/drivers/net/wireless/sd8897/mlan/mlan_ioctl.h index 824d3453d233..a491322cffb2 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_ioctl.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_ioctl.h @@ -2,7 +2,7 @@ * * @brief This file declares the IOCTL data structures and APIs. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -29,210 +29,210 @@ Change log: /** Enumeration for IOCTL request ID */ enum _mlan_ioctl_req_id { - /* Scan Group */ - MLAN_IOCTL_SCAN = 0x00010000, - MLAN_OID_SCAN_NORMAL = 0x00010001, - MLAN_OID_SCAN_SPECIFIC_SSID = 0x00010002, - MLAN_OID_SCAN_USER_CONFIG = 0x00010003, - MLAN_OID_SCAN_CONFIG = 0x00010004, - MLAN_OID_SCAN_GET_CURRENT_BSS = 0x00010005, - MLAN_OID_SCAN_CANCEL = 0x00010006, - MLAN_OID_SCAN_TABLE_FLUSH = 0x0001000A, - MLAN_OID_SCAN_BGSCAN_CONFIG = 0x0001000B, - /* BSS Configuration Group */ - MLAN_IOCTL_BSS = 0x00020000, - MLAN_OID_BSS_START = 0x00020001, - MLAN_OID_BSS_STOP = 0x00020002, - MLAN_OID_BSS_MODE = 0x00020003, - MLAN_OID_BSS_CHANNEL = 0x00020004, - MLAN_OID_BSS_CHANNEL_LIST = 0x00020005, - MLAN_OID_BSS_MAC_ADDR = 0x00020006, - MLAN_OID_BSS_MULTICAST_LIST = 0x00020007, - MLAN_OID_BSS_FIND_BSS = 0x00020008, - MLAN_OID_IBSS_BCN_INTERVAL = 0x00020009, - MLAN_OID_IBSS_ATIM_WINDOW = 0x0002000A, - MLAN_OID_IBSS_CHANNEL = 0x0002000B, + /* Scan Group */ + MLAN_IOCTL_SCAN = 0x00010000, + MLAN_OID_SCAN_NORMAL = 0x00010001, + MLAN_OID_SCAN_SPECIFIC_SSID = 0x00010002, + MLAN_OID_SCAN_USER_CONFIG = 0x00010003, + MLAN_OID_SCAN_CONFIG = 0x00010004, + MLAN_OID_SCAN_GET_CURRENT_BSS = 0x00010005, + MLAN_OID_SCAN_CANCEL = 0x00010006, + MLAN_OID_SCAN_TABLE_FLUSH = 0x0001000A, + MLAN_OID_SCAN_BGSCAN_CONFIG = 0x0001000B, + /* BSS Configuration Group */ + MLAN_IOCTL_BSS = 0x00020000, + MLAN_OID_BSS_START = 0x00020001, + MLAN_OID_BSS_STOP = 0x00020002, + MLAN_OID_BSS_MODE = 0x00020003, + MLAN_OID_BSS_CHANNEL = 0x00020004, + MLAN_OID_BSS_CHANNEL_LIST = 0x00020005, + MLAN_OID_BSS_MAC_ADDR = 0x00020006, + MLAN_OID_BSS_MULTICAST_LIST = 0x00020007, + MLAN_OID_BSS_FIND_BSS = 0x00020008, + MLAN_OID_IBSS_BCN_INTERVAL = 0x00020009, + MLAN_OID_IBSS_ATIM_WINDOW = 0x0002000A, + MLAN_OID_IBSS_CHANNEL = 0x0002000B, #ifdef UAP_SUPPORT - MLAN_OID_UAP_BSS_CONFIG = 0x0002000C, - MLAN_OID_UAP_DEAUTH_STA = 0x0002000D, - MLAN_OID_UAP_BSS_RESET = 0x0002000E, + MLAN_OID_UAP_BSS_CONFIG = 0x0002000C, + MLAN_OID_UAP_DEAUTH_STA = 0x0002000D, + MLAN_OID_UAP_BSS_RESET = 0x0002000E, #endif #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) - MLAN_OID_BSS_ROLE = 0x0002000F, + MLAN_OID_BSS_ROLE = 0x0002000F, #endif #ifdef WIFI_DIRECT_SUPPORT - MLAN_OID_WIFI_DIRECT_MODE = 0x00020010, + MLAN_OID_WIFI_DIRECT_MODE = 0x00020010, #endif #ifdef STA_SUPPORT - MLAN_OID_BSS_LISTEN_INTERVAL = 0x00020011, + MLAN_OID_BSS_LISTEN_INTERVAL = 0x00020011, #endif - MLAN_OID_BSS_REMOVE = 0x00020014, + MLAN_OID_BSS_REMOVE = 0x00020014, - /* Radio Configuration Group */ - MLAN_IOCTL_RADIO_CFG = 0x00030000, - MLAN_OID_RADIO_CTRL = 0x00030001, - MLAN_OID_BAND_CFG = 0x00030002, - MLAN_OID_ANT_CFG = 0x00030003, + /* Radio Configuration Group */ + MLAN_IOCTL_RADIO_CFG = 0x00030000, + MLAN_OID_RADIO_CTRL = 0x00030001, + MLAN_OID_BAND_CFG = 0x00030002, + MLAN_OID_ANT_CFG = 0x00030003, #ifdef WIFI_DIRECT_SUPPORT - MLAN_OID_REMAIN_CHAN_CFG = 0x00030004, + MLAN_OID_REMAIN_CHAN_CFG = 0x00030004, #endif - /* SNMP MIB Group */ - MLAN_IOCTL_SNMP_MIB = 0x00040000, - MLAN_OID_SNMP_MIB_RTS_THRESHOLD = 0x00040001, - MLAN_OID_SNMP_MIB_FRAG_THRESHOLD = 0x00040002, - MLAN_OID_SNMP_MIB_RETRY_COUNT = 0x00040003, + /* SNMP MIB Group */ + MLAN_IOCTL_SNMP_MIB = 0x00040000, + MLAN_OID_SNMP_MIB_RTS_THRESHOLD = 0x00040001, + MLAN_OID_SNMP_MIB_FRAG_THRESHOLD = 0x00040002, + MLAN_OID_SNMP_MIB_RETRY_COUNT = 0x00040003, #if defined(UAP_SUPPORT) - MLAN_OID_SNMP_MIB_DOT11D = 0x00040004, - MLAN_OID_SNMP_MIB_DOT11H = 0x00040005, + MLAN_OID_SNMP_MIB_DOT11D = 0x00040004, + MLAN_OID_SNMP_MIB_DOT11H = 0x00040005, #endif - MLAN_OID_SNMP_MIB_DTIM_PERIOD = 0x00040006, - - /* Status Information Group */ - MLAN_IOCTL_GET_INFO = 0x00050000, - MLAN_OID_GET_STATS = 0x00050001, - MLAN_OID_GET_SIGNAL = 0x00050002, - MLAN_OID_GET_FW_INFO = 0x00050003, - MLAN_OID_GET_VER_EXT = 0x00050004, - MLAN_OID_GET_BSS_INFO = 0x00050005, - MLAN_OID_GET_DEBUG_INFO = 0x00050006, + MLAN_OID_SNMP_MIB_DTIM_PERIOD = 0x00040006, + + /* Status Information Group */ + MLAN_IOCTL_GET_INFO = 0x00050000, + MLAN_OID_GET_STATS = 0x00050001, + MLAN_OID_GET_SIGNAL = 0x00050002, + MLAN_OID_GET_FW_INFO = 0x00050003, + MLAN_OID_GET_VER_EXT = 0x00050004, + MLAN_OID_GET_BSS_INFO = 0x00050005, + MLAN_OID_GET_DEBUG_INFO = 0x00050006, #ifdef UAP_SUPPORT - MLAN_OID_UAP_STA_LIST = 0x00050007, + MLAN_OID_UAP_STA_LIST = 0x00050007, #endif - /* Security Configuration Group */ - MLAN_IOCTL_SEC_CFG = 0x00060000, - MLAN_OID_SEC_CFG_AUTH_MODE = 0x00060001, - MLAN_OID_SEC_CFG_ENCRYPT_MODE = 0x00060002, - MLAN_OID_SEC_CFG_WPA_ENABLED = 0x00060003, - MLAN_OID_SEC_CFG_ENCRYPT_KEY = 0x00060004, - MLAN_OID_SEC_CFG_PASSPHRASE = 0x00060005, - MLAN_OID_SEC_CFG_EWPA_ENABLED = 0x00060006, - MLAN_OID_SEC_CFG_ESUPP_MODE = 0x00060007, - MLAN_OID_SEC_CFG_WAPI_ENABLED = 0x00060009, - MLAN_OID_SEC_CFG_PORT_CTRL_ENABLED = 0x0006000A, - - /* Rate Group */ - MLAN_IOCTL_RATE = 0x00070000, - MLAN_OID_RATE_CFG = 0x00070001, - MLAN_OID_GET_DATA_RATE = 0x00070002, - MLAN_OID_SUPPORTED_RATES = 0x00070003, - - /* Power Configuration Group */ - MLAN_IOCTL_POWER_CFG = 0x00080000, - MLAN_OID_POWER_CFG = 0x00080001, - MLAN_OID_POWER_CFG_EXT = 0x00080002, - - /* Power Management Configuration Group */ - MLAN_IOCTL_PM_CFG = 0x00090000, - MLAN_OID_PM_CFG_IEEE_PS = 0x00090001, - MLAN_OID_PM_CFG_HS_CFG = 0x00090002, - MLAN_OID_PM_CFG_INACTIVITY_TO = 0x00090003, - MLAN_OID_PM_CFG_DEEP_SLEEP = 0x00090004, - MLAN_OID_PM_CFG_SLEEP_PD = 0x00090005, - MLAN_OID_PM_CFG_PS_CFG = 0x00090006, - MLAN_OID_PM_CFG_SLEEP_PARAMS = 0x00090008, + /* Security Configuration Group */ + MLAN_IOCTL_SEC_CFG = 0x00060000, + MLAN_OID_SEC_CFG_AUTH_MODE = 0x00060001, + MLAN_OID_SEC_CFG_ENCRYPT_MODE = 0x00060002, + MLAN_OID_SEC_CFG_WPA_ENABLED = 0x00060003, + MLAN_OID_SEC_CFG_ENCRYPT_KEY = 0x00060004, + MLAN_OID_SEC_CFG_PASSPHRASE = 0x00060005, + MLAN_OID_SEC_CFG_EWPA_ENABLED = 0x00060006, + MLAN_OID_SEC_CFG_ESUPP_MODE = 0x00060007, + MLAN_OID_SEC_CFG_WAPI_ENABLED = 0x00060009, + MLAN_OID_SEC_CFG_PORT_CTRL_ENABLED = 0x0006000A, + + /* Rate Group */ + MLAN_IOCTL_RATE = 0x00070000, + MLAN_OID_RATE_CFG = 0x00070001, + MLAN_OID_GET_DATA_RATE = 0x00070002, + MLAN_OID_SUPPORTED_RATES = 0x00070003, + + /* Power Configuration Group */ + MLAN_IOCTL_POWER_CFG = 0x00080000, + MLAN_OID_POWER_CFG = 0x00080001, + MLAN_OID_POWER_CFG_EXT = 0x00080002, + + /* Power Management Configuration Group */ + MLAN_IOCTL_PM_CFG = 0x00090000, + MLAN_OID_PM_CFG_IEEE_PS = 0x00090001, + MLAN_OID_PM_CFG_HS_CFG = 0x00090002, + MLAN_OID_PM_CFG_INACTIVITY_TO = 0x00090003, + MLAN_OID_PM_CFG_DEEP_SLEEP = 0x00090004, + MLAN_OID_PM_CFG_SLEEP_PD = 0x00090005, + MLAN_OID_PM_CFG_PS_CFG = 0x00090006, + MLAN_OID_PM_CFG_SLEEP_PARAMS = 0x00090008, #ifdef UAP_SUPPORT - MLAN_OID_PM_CFG_PS_MODE = 0x00090009, + MLAN_OID_PM_CFG_PS_MODE = 0x00090009, #endif /* UAP_SUPPORT */ - MLAN_OID_PM_INFO = 0x0009000A, - MLAN_OID_PM_HS_WAKEUP_REASON = 0x0009000B, - - /* WMM Configuration Group */ - MLAN_IOCTL_WMM_CFG = 0x000A0000, - MLAN_OID_WMM_CFG_ENABLE = 0x000A0001, - MLAN_OID_WMM_CFG_QOS = 0x000A0002, - MLAN_OID_WMM_CFG_ADDTS = 0x000A0003, - MLAN_OID_WMM_CFG_DELTS = 0x000A0004, - MLAN_OID_WMM_CFG_QUEUE_CONFIG = 0x000A0005, - MLAN_OID_WMM_CFG_QUEUE_STATS = 0x000A0006, - MLAN_OID_WMM_CFG_QUEUE_STATUS = 0x000A0007, - MLAN_OID_WMM_CFG_TS_STATUS = 0x000A0008, - - /* WPS Configuration Group */ - MLAN_IOCTL_WPS_CFG = 0x000B0000, - MLAN_OID_WPS_CFG_SESSION = 0x000B0001, - - /* 802.11n Configuration Group */ - MLAN_IOCTL_11N_CFG = 0x000C0000, - MLAN_OID_11N_CFG_TX = 0x000C0001, - MLAN_OID_11N_HTCAP_CFG = 0x000C0002, - MLAN_OID_11N_CFG_ADDBA_REJECT = 0x000C0003, - MLAN_OID_11N_CFG_AGGR_PRIO_TBL = 0x000C0004, - MLAN_OID_11N_CFG_ADDBA_PARAM = 0x000C0005, - MLAN_OID_11N_CFG_MAX_TX_BUF_SIZE = 0x000C0006, - MLAN_OID_11N_CFG_AMSDU_AGGR_CTRL = 0x000C0007, - MLAN_OID_11N_CFG_SUPPORTED_MCS_SET = 0x000C0008, - MLAN_OID_11N_CFG_TX_BF_CAP = 0x000C0009, - MLAN_OID_11N_CFG_TX_BF_CFG = 0x000C000A, - MLAN_OID_11N_CFG_STREAM_CFG = 0x000C000B, - MLAN_OID_11N_CFG_DELBA = 0x000C000C, - MLAN_OID_11N_CFG_REJECT_ADDBA_REQ = 0x000C000D, - - /* 802.11d Configuration Group */ - MLAN_IOCTL_11D_CFG = 0x000D0000, + MLAN_OID_PM_INFO = 0x0009000A, + MLAN_OID_PM_HS_WAKEUP_REASON = 0x0009000B, + + /* WMM Configuration Group */ + MLAN_IOCTL_WMM_CFG = 0x000A0000, + MLAN_OID_WMM_CFG_ENABLE = 0x000A0001, + MLAN_OID_WMM_CFG_QOS = 0x000A0002, + MLAN_OID_WMM_CFG_ADDTS = 0x000A0003, + MLAN_OID_WMM_CFG_DELTS = 0x000A0004, + MLAN_OID_WMM_CFG_QUEUE_CONFIG = 0x000A0005, + MLAN_OID_WMM_CFG_QUEUE_STATS = 0x000A0006, + MLAN_OID_WMM_CFG_QUEUE_STATUS = 0x000A0007, + MLAN_OID_WMM_CFG_TS_STATUS = 0x000A0008, + + /* WPS Configuration Group */ + MLAN_IOCTL_WPS_CFG = 0x000B0000, + MLAN_OID_WPS_CFG_SESSION = 0x000B0001, + + /* 802.11n Configuration Group */ + MLAN_IOCTL_11N_CFG = 0x000C0000, + MLAN_OID_11N_CFG_TX = 0x000C0001, + MLAN_OID_11N_HTCAP_CFG = 0x000C0002, + MLAN_OID_11N_CFG_ADDBA_REJECT = 0x000C0003, + MLAN_OID_11N_CFG_AGGR_PRIO_TBL = 0x000C0004, + MLAN_OID_11N_CFG_ADDBA_PARAM = 0x000C0005, + MLAN_OID_11N_CFG_MAX_TX_BUF_SIZE = 0x000C0006, + MLAN_OID_11N_CFG_AMSDU_AGGR_CTRL = 0x000C0007, + MLAN_OID_11N_CFG_SUPPORTED_MCS_SET = 0x000C0008, + MLAN_OID_11N_CFG_TX_BF_CAP = 0x000C0009, + MLAN_OID_11N_CFG_TX_BF_CFG = 0x000C000A, + MLAN_OID_11N_CFG_STREAM_CFG = 0x000C000B, + MLAN_OID_11N_CFG_DELBA = 0x000C000C, + MLAN_OID_11N_CFG_REJECT_ADDBA_REQ = 0x000C000D, + + /* 802.11d Configuration Group */ + MLAN_IOCTL_11D_CFG = 0x000D0000, #ifdef STA_SUPPORT - MLAN_OID_11D_CFG_ENABLE = 0x000D0001, - MLAN_OID_11D_CLR_CHAN_TABLE = 0x000D0002, + MLAN_OID_11D_CFG_ENABLE = 0x000D0001, + MLAN_OID_11D_CLR_CHAN_TABLE = 0x000D0002, #endif /* STA_SUPPORT */ - MLAN_OID_11D_DOMAIN_INFO = 0x000D0003, + MLAN_OID_11D_DOMAIN_INFO = 0x000D0003, - /* Register Memory Access Group */ - MLAN_IOCTL_REG_MEM = 0x000E0000, - MLAN_OID_REG_RW = 0x000E0001, - MLAN_OID_EEPROM_RD = 0x000E0002, - MLAN_OID_MEM_RW = 0x000E0003, + /* Register Memory Access Group */ + MLAN_IOCTL_REG_MEM = 0x000E0000, + MLAN_OID_REG_RW = 0x000E0001, + MLAN_OID_EEPROM_RD = 0x000E0002, + MLAN_OID_MEM_RW = 0x000E0003, - /* Multi-Radio Configuration Group */ - MLAN_IOCTL_MFR_CFG = 0x00100000, + /* Multi-Radio Configuration Group */ + MLAN_IOCTL_MFR_CFG = 0x00100000, - /* 802.11h Configuration Group */ - MLAN_IOCTL_11H_CFG = 0x00110000, - MLAN_OID_11H_CHANNEL_CHECK = 0x00110001, - MLAN_OID_11H_LOCAL_POWER_CONSTRAINT = 0x00110002, + /* 802.11h Configuration Group */ + MLAN_IOCTL_11H_CFG = 0x00110000, + MLAN_OID_11H_CHANNEL_CHECK = 0x00110001, + MLAN_OID_11H_LOCAL_POWER_CONSTRAINT = 0x00110002, #if defined(DFS_TESTING_SUPPORT) - MLAN_OID_11H_DFS_TESTING = 0x00110003, + MLAN_OID_11H_DFS_TESTING = 0x00110003, #endif - /* 802.11n Configuration Group RANDYTODO for value assign */ - MLAN_IOCTL_11AC_CFG = 0x00120000, - MLAN_OID_11AC_VHT_CFG = 0x00120001, - MLAN_OID_11AC_CFG_SUPPORTED_MCS_SET = 0x00120002, + /* 802.11n Configuration Group RANDYTODO for value assign */ + MLAN_IOCTL_11AC_CFG = 0x00120000, + MLAN_OID_11AC_VHT_CFG = 0x00120001, + MLAN_OID_11AC_CFG_SUPPORTED_MCS_SET = 0x00120002, - /* Miscellaneous Configuration Group */ - MLAN_IOCTL_MISC_CFG = 0x00200000, - MLAN_OID_MISC_GEN_IE = 0x00200001, - MLAN_OID_MISC_REGION = 0x00200002, - MLAN_OID_MISC_WARM_RESET = 0x00200003, + /* Miscellaneous Configuration Group */ + MLAN_IOCTL_MISC_CFG = 0x00200000, + MLAN_OID_MISC_GEN_IE = 0x00200001, + MLAN_OID_MISC_REGION = 0x00200002, + MLAN_OID_MISC_WARM_RESET = 0x00200003, #if defined(SDIO_MULTI_PORT_TX_AGGR) || defined(SDIO_MULTI_PORT_RX_AGGR) - MLAN_OID_MISC_SDIO_MPA_CTRL = 0x00200006, + MLAN_OID_MISC_SDIO_MPA_CTRL = 0x00200006, #endif - MLAN_OID_MISC_HOST_CMD = 0x00200007, - MLAN_OID_MISC_SYS_CLOCK = 0x00200009, - MLAN_OID_MISC_SOFT_RESET = 0x0020000A, - MLAN_OID_MISC_WWS = 0x0020000B, - MLAN_OID_MISC_ASSOC_RSP = 0x0020000C, - MLAN_OID_MISC_INIT_SHUTDOWN = 0x0020000D, - MLAN_OID_MISC_CUSTOM_IE = 0x0020000F, - MLAN_OID_MISC_TX_DATAPAUSE = 0x00200012, - MLAN_OID_MISC_IP_ADDR = 0x00200013, - MLAN_OID_MISC_MAC_CONTROL = 0x00200014, - MLAN_OID_MISC_MEF_CFG = 0x00200015, - MLAN_OID_MISC_CFP_CODE = 0x00200016, - MLAN_OID_MISC_COUNTRY_CODE = 0x00200017, - MLAN_OID_MISC_THERMAL = 0x00200018, - MLAN_OID_MISC_RX_MGMT_IND = 0x00200019, - MLAN_OID_MISC_SUBSCRIBE_EVENT = 0x0020001A, + MLAN_OID_MISC_HOST_CMD = 0x00200007, + MLAN_OID_MISC_SYS_CLOCK = 0x00200009, + MLAN_OID_MISC_SOFT_RESET = 0x0020000A, + MLAN_OID_MISC_WWS = 0x0020000B, + MLAN_OID_MISC_ASSOC_RSP = 0x0020000C, + MLAN_OID_MISC_INIT_SHUTDOWN = 0x0020000D, + MLAN_OID_MISC_CUSTOM_IE = 0x0020000F, + MLAN_OID_MISC_TX_DATAPAUSE = 0x00200012, + MLAN_OID_MISC_IP_ADDR = 0x00200013, + MLAN_OID_MISC_MAC_CONTROL = 0x00200014, + MLAN_OID_MISC_MEF_CFG = 0x00200015, + MLAN_OID_MISC_CFP_CODE = 0x00200016, + MLAN_OID_MISC_COUNTRY_CODE = 0x00200017, + MLAN_OID_MISC_THERMAL = 0x00200018, + MLAN_OID_MISC_RX_MGMT_IND = 0x00200019, + MLAN_OID_MISC_SUBSCRIBE_EVENT = 0x0020001A, #ifdef DEBUG_LEVEL1 - MLAN_OID_MISC_DRVDBG = 0x0020001B, + MLAN_OID_MISC_DRVDBG = 0x0020001B, #endif - MLAN_OID_MISC_OTP_USER_DATA = 0x0020001D, - MLAN_OID_MISC_TXCONTROL = 0x00200020, + MLAN_OID_MISC_OTP_USER_DATA = 0x0020001D, + MLAN_OID_MISC_TXCONTROL = 0x00200020, #ifdef STA_SUPPORT - MLAN_OID_MISC_EXT_CAP_CFG = 0x00200021, + MLAN_OID_MISC_EXT_CAP_CFG = 0x00200021, #endif #if defined(STA_SUPPORT) - MLAN_OID_MISC_PMFCFG = 0x00200022, + MLAN_OID_MISC_PMFCFG = 0x00200022, #endif }; @@ -242,33 +242,33 @@ enum _mlan_ioctl_req_id /** Enumeration for the action of IOCTL request */ enum _mlan_act_ioctl { - MLAN_ACT_SET = 1, - MLAN_ACT_GET, - MLAN_ACT_CANCEL + MLAN_ACT_SET = 1, + MLAN_ACT_GET, + MLAN_ACT_CANCEL }; /** Enumeration for generic enable/disable */ enum _mlan_act_generic { - MLAN_ACT_DISABLE = 0, - MLAN_ACT_ENABLE = 1 + MLAN_ACT_DISABLE = 0, + MLAN_ACT_ENABLE = 1 }; /** Enumeration for scan mode */ enum _mlan_scan_mode { - MLAN_SCAN_MODE_UNCHANGED = 0, - MLAN_SCAN_MODE_BSS, - MLAN_SCAN_MODE_IBSS, - MLAN_SCAN_MODE_ANY + MLAN_SCAN_MODE_UNCHANGED = 0, + MLAN_SCAN_MODE_BSS, + MLAN_SCAN_MODE_IBSS, + MLAN_SCAN_MODE_ANY }; /** Enumeration for scan type */ enum _mlan_scan_type { - MLAN_SCAN_TYPE_UNCHANGED = 0, - MLAN_SCAN_TYPE_ACTIVE, - MLAN_SCAN_TYPE_PASSIVE + MLAN_SCAN_TYPE_UNCHANGED = 0, + MLAN_SCAN_TYPE_ACTIVE, + MLAN_SCAN_TYPE_PASSIVE }; /** Max number of supported rates */ @@ -298,22 +298,22 @@ enum _mlan_scan_type typedef struct _wlan_get_scan_table_fixed { /** BSSID of this network */ - t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; + t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; /** Channel this beacon/probe response was detected */ - t_u8 channel; + t_u8 channel; /** RSSI for the received packet */ - t_u8 rssi; + t_u8 rssi; /** TSF value in microseconds from the firmware at packet reception */ - t_u64 network_tsf; + t_u64 network_tsf; } wlan_get_scan_table_fixed; /** mlan_802_11_ssid data structure */ typedef struct _mlan_802_11_ssid { /** SSID Length */ - t_u32 ssid_len; + t_u32 ssid_len; /** SSID information field */ - t_u8 ssid[MLAN_MAX_SSID_LENGTH]; + t_u8 ssid[MLAN_MAX_SSID_LENGTH]; } mlan_802_11_ssid, *pmlan_802_11_ssid; /** @@ -325,12 +325,12 @@ typedef struct * - Zero based scan entry to start retrieval in command request * - Number of scans entries returned in command response */ - t_u32 scan_number; + t_u32 scan_number; /** * Buffer marker for multiple wlan_ioctl_get_scan_table_entry structures. * Each struct is padded to the nearest 32 bit boundary. */ - t_u8 scan_table_entry_buf[1]; + t_u8 scan_table_entry_buf[1]; } wlan_ioctl_get_scan_table_info; /** @@ -346,110 +346,110 @@ typedef struct _wlan_ioctl_get_scan_table_entry * response without breaking backwards compatibility. Use the length * to find the offset for the bssInfoLength field, not a sizeof() calc. */ - t_u32 fixed_field_length; + t_u32 fixed_field_length; /** * Length of the BSS Information (probe resp or beacon) that * follows after the fixed_field_length */ - t_u32 bss_info_length; + t_u32 bss_info_length; /** * Always present, fixed length data fields for the BSS */ - wlan_get_scan_table_fixed fixed_fields; - - /* - * Probe response or beacon scanned for the BSS. - * - * Field layout: - * - TSF 8 octets - * - Beacon Interval 2 octets - * - Capability Info 2 octets - * - * - IEEE Infomation Elements; variable number & length per 802.11 spec - */ - /* t_u8 bss_info_buffer[0]; */ + wlan_get_scan_table_fixed fixed_fields; + + /* + * Probe response or beacon scanned for the BSS. + * + * Field layout: + * - TSF 8 octets + * - Beacon Interval 2 octets + * - Capability Info 2 octets + * + * - IEEE Infomation Elements; variable number & length per 802.11 spec + */ + /* t_u8 bss_info_buffer[0]; */ } wlan_ioctl_get_scan_table_entry; /** Type definition of mlan_scan_time_params */ typedef struct _mlan_scan_time_params { /** Scan channel time for specific scan in milliseconds */ - t_u32 specific_scan_time; + t_u32 specific_scan_time; /** Scan channel time for active scan in milliseconds */ - t_u32 active_scan_time; + t_u32 active_scan_time; /** Scan channel time for passive scan in milliseconds */ - t_u32 passive_scan_time; + t_u32 passive_scan_time; } mlan_scan_time_params, *pmlan_scan_time_params; /** Type definition of mlan_user_scan */ typedef struct _mlan_user_scan { /** Length of scan_cfg_buf */ - t_u32 scan_cfg_len; + t_u32 scan_cfg_len; /** Buffer of scan config */ - t_u8 scan_cfg_buf[1]; + t_u8 scan_cfg_buf[1]; } mlan_user_scan, *pmlan_user_scan; /** Type definition of mlan_scan_req */ typedef struct _mlan_scan_req { /** BSS mode for scanning */ - t_u32 scan_mode; + t_u32 scan_mode; /** Scan type */ - t_u32 scan_type; + t_u32 scan_type; /** SSID */ - mlan_802_11_ssid scan_ssid; + mlan_802_11_ssid scan_ssid; /** Scan time parameters */ - mlan_scan_time_params scan_time; + mlan_scan_time_params scan_time; /** Scan config parameters in user scan */ - mlan_user_scan user_scan; + mlan_user_scan user_scan; } mlan_scan_req, *pmlan_scan_req; /** Type defnition of mlan_scan_resp */ typedef struct _mlan_scan_resp { /** Number of scan result */ - t_u32 num_in_scan_table; + t_u32 num_in_scan_table; /** Scan table */ - t_u8 *pscan_table; - /* Age in seconds */ - t_u32 age_in_secs; + t_u8 *pscan_table; + /* Age in seconds */ + t_u32 age_in_secs; } mlan_scan_resp, *pmlan_scan_resp; /** Type definition of mlan_scan_cfg */ typedef struct _mlan_scan_cfg { /** Scan type */ - t_u32 scan_type; + t_u32 scan_type; /** BSS mode for scanning */ - t_u32 scan_mode; + t_u32 scan_mode; /** Scan probe */ - t_u32 scan_probe; + t_u32 scan_probe; /** Scan time parameters */ - mlan_scan_time_params scan_time; + mlan_scan_time_params scan_time; /** Extended Scan */ - t_u32 ext_scan; + t_u32 ext_scan; } mlan_scan_cfg, *pmlan_scan_cfg; /** Type defnition of mlan_ds_scan for MLAN_IOCTL_SCAN */ typedef struct _mlan_ds_scan { /** Sub-command */ - t_u32 sub_command; + t_u32 sub_command; /** Scan request/response */ - union - { - /** Scan request */ - mlan_scan_req scan_req; - /** Scan response */ - mlan_scan_resp scan_resp; - /** Scan config parameters in user scan */ - mlan_user_scan user_scan; - /** Scan config parameters */ - mlan_scan_cfg scan_cfg; - } param; + union + { + /** Scan request */ + mlan_scan_req scan_req; + /** Scan response */ + mlan_scan_resp scan_resp; + /** Scan config parameters in user scan */ + mlan_user_scan user_scan; + /** Scan config parameters */ + mlan_scan_cfg scan_cfg; + } param; } mlan_ds_scan, *pmlan_ds_scan; /*-----------------------------------------------------------------*/ @@ -458,9 +458,9 @@ typedef struct _mlan_ds_scan /** Enumeration for BSS mode */ enum _mlan_bss_mode { - MLAN_BSS_MODE_INFRA = 1, - MLAN_BSS_MODE_IBSS, - MLAN_BSS_MODE_AUTO + MLAN_BSS_MODE_INFRA = 1, + MLAN_BSS_MODE_IBSS, + MLAN_BSS_MODE_AUTO }; /** Maximum key length */ @@ -493,11 +493,11 @@ enum _mlan_bss_mode typedef struct _mlan_multicast_list { /** Multicast mode */ - t_u32 mode; + t_u32 mode; /** Number of multicast addresses in the list */ - t_u32 num_multicast_addr; + t_u32 num_multicast_addr; /** Multicast address list */ - mlan_802_11_mac_addr mac_list[MLAN_MAX_MULTICAST_LIST_SIZE]; + mlan_802_11_mac_addr mac_list[MLAN_MAX_MULTICAST_LIST_SIZE]; } mlan_multicast_list, *pmlan_multicast_list; /** Max channel */ @@ -510,31 +510,31 @@ typedef struct _mlan_multicast_list typedef struct _chan_freq { /** Channel Number */ - t_u32 channel; + t_u32 channel; /** Frequency of this Channel */ - t_u32 freq; + t_u32 freq; } chan_freq; /** mlan_chan_list data structure for MLAN_OID_BSS_CHANNEL_LIST */ typedef struct _mlan_chan_list { /** Number of channel */ - t_u32 num_of_chan; + t_u32 num_of_chan; /** Channel-Frequency table */ - chan_freq cf[MLAN_MAX_CHANNEL_NUM]; + chan_freq cf[MLAN_MAX_CHANNEL_NUM]; } mlan_chan_list; /** mlan_ssid_bssid data structure for MLAN_OID_BSS_START and MLAN_OID_BSS_FIND_BSS */ typedef struct _mlan_ssid_bssid { /** SSID */ - mlan_802_11_ssid ssid; + mlan_802_11_ssid ssid; /** BSSID */ - mlan_802_11_mac_addr bssid; + mlan_802_11_mac_addr bssid; /** index in BSSID list, start from 1 */ - t_u32 idx; + t_u32 idx; /** Receive signal strength in dBm */ - t_s32 rssi; + t_s32 rssi; } mlan_ssid_bssid; #ifdef UAP_SUPPORT @@ -581,7 +581,7 @@ typedef struct _mlan_ssid_bssid #define MAX_GRP_TIMER 86400 /** Maximum value of 4 byte configuration */ -#define MAX_VALID_DWORD 0x7FFFFFFF /* (1 << 31) - 1 */ +#define MAX_VALID_DWORD 0x7FFFFFFF /* (1 << 31) - 1 */ /** Band config ACS mode */ #define BAND_CONFIG_ACS_MODE 0x40 @@ -640,65 +640,65 @@ typedef struct _mlan_ssid_bssid typedef struct _channel_list { /** Channel Number */ - t_u8 chan_number; + t_u8 chan_number; /** Band Config */ - t_u8 band_config_type; + t_u8 band_config_type; } scan_chan_list; /** mac_filter data structure */ typedef struct _mac_filter { /** mac filter mode */ - t_u16 filter_mode; + t_u16 filter_mode; /** mac adress count */ - t_u16 mac_count; + t_u16 mac_count; /** mac address list */ - mlan_802_11_mac_addr mac_list[MAX_MAC_FILTER_NUM]; + mlan_802_11_mac_addr mac_list[MAX_MAC_FILTER_NUM]; } mac_filter; /** wpa parameter */ typedef struct _wpa_param { /** Pairwise cipher WPA */ - t_u8 pairwise_cipher_wpa; + t_u8 pairwise_cipher_wpa; /** Pairwise cipher WPA2 */ - t_u8 pairwise_cipher_wpa2; + t_u8 pairwise_cipher_wpa2; /** group cipher */ - t_u8 group_cipher; + t_u8 group_cipher; /** RSN replay protection */ - t_u8 rsn_protection; + t_u8 rsn_protection; /** passphrase length */ - t_u32 length; + t_u32 length; /** passphrase */ - t_u8 passphrase[64]; + t_u8 passphrase[64]; /**group key rekey time in seconds */ - t_u32 gk_rekey_time; + t_u32 gk_rekey_time; } wpa_param; /** wep key */ typedef struct _wep_key { /** key index 0-3 */ - t_u8 key_index; + t_u8 key_index; /** is default */ - t_u8 is_default; + t_u8 is_default; /** length */ - t_u16 length; + t_u16 length; /** key data */ - t_u8 key[26]; + t_u8 key[26]; } wep_key; /** wep param */ typedef struct _wep_param { /** key 0 */ - wep_key key0; + wep_key key0; /** key 1 */ - wep_key key1; + wep_key key1; /** key 2 */ - wep_key key2; + wep_key key2; /** key 3 */ - wep_key key3; + wep_key key3; } wep_param; /** Data structure of WMM QoS information */ @@ -706,19 +706,19 @@ typedef struct _wmm_qos_info_t { #ifdef BIG_ENDIAN_SUPPORT /** QoS UAPSD */ - t_u8 qos_uapsd:1; + t_u8 qos_uapsd:1; /** Reserved */ - t_u8 reserved:3; + t_u8 reserved:3; /** Parameter set count */ - t_u8 para_set_count:4; + t_u8 para_set_count:4; #else /** Parameter set count */ - t_u8 para_set_count:4; + t_u8 para_set_count:4; /** Reserved */ - t_u8 reserved:3; + t_u8 reserved:3; /** QoS UAPSD */ - t_u8 qos_uapsd:1; -#endif /* BIG_ENDIAN_SUPPORT */ + t_u8 qos_uapsd:1; +#endif /* BIG_ENDIAN_SUPPORT */ } wmm_qos_info_t, *pwmm_qos_info_t; /** Data structure of WMM ECW */ @@ -726,15 +726,15 @@ typedef struct _wmm_ecw_t { #ifdef BIG_ENDIAN_SUPPORT /** Maximum Ecw */ - t_u8 ecw_max:4; + t_u8 ecw_max:4; /** Minimum Ecw */ - t_u8 ecw_min:4; + t_u8 ecw_min:4; #else /** Minimum Ecw */ - t_u8 ecw_min:4; + t_u8 ecw_min:4; /** Maximum Ecw */ - t_u8 ecw_max:4; -#endif /* BIG_ENDIAN_SUPPORT */ + t_u8 ecw_max:4; +#endif /* BIG_ENDIAN_SUPPORT */ } wmm_ecw_t, *pwmm_ecw_t; /** Data structure of WMM Aci/Aifsn */ @@ -742,48 +742,48 @@ typedef struct _wmm_aci_aifsn_t { #ifdef BIG_ENDIAN_SUPPORT /** Reserved */ - t_u8 reserved:1; + t_u8 reserved:1; /** Aci */ - t_u8 aci:2; + t_u8 aci:2; /** Acm */ - t_u8 acm:1; + t_u8 acm:1; /** Aifsn */ - t_u8 aifsn:4; + t_u8 aifsn:4; #else /** Aifsn */ - t_u8 aifsn:4; + t_u8 aifsn:4; /** Acm */ - t_u8 acm:1; + t_u8 acm:1; /** Aci */ - t_u8 aci:2; + t_u8 aci:2; /** Reserved */ - t_u8 reserved:1; -#endif /* BIG_ENDIAN_SUPPORT */ + t_u8 reserved:1; +#endif /* BIG_ENDIAN_SUPPORT */ } wmm_aci_aifsn_t, *pwmm_aci_aifsn_t; /** Data structure of WMM AC parameters */ typedef struct _wmm_ac_parameters_t { - wmm_aci_aifsn_t aci_aifsn; /**< AciAifSn */ - wmm_ecw_t ecw; /**< Ecw */ - t_u16 tx_op_limit; /**< Tx op limit */ + wmm_aci_aifsn_t aci_aifsn; /**< AciAifSn */ + wmm_ecw_t ecw; /**< Ecw */ + t_u16 tx_op_limit; /**< Tx op limit */ } wmm_ac_parameters_t, *pwmm_ac_parameters_t; /** Data structure of WMM parameter IE */ typedef struct _wmm_parameter_t { /** OuiType: 00:50:f2:02 */ - t_u8 ouitype[4]; + t_u8 ouitype[4]; /** Oui subtype: 01 */ - t_u8 ouisubtype; + t_u8 ouisubtype; /** version: 01 */ - t_u8 version; + t_u8 version; /** QoS information */ - t_u8 qos_info; + t_u8 qos_info; /** Reserved */ - t_u8 reserved; + t_u8 reserved; /** AC Parameters Record WMM_AC_BE, WMM_AC_BK, WMM_AC_VI, WMM_AC_VO */ - wmm_ac_parameters_t ac_params[MAX_AC_QUEUES]; + wmm_ac_parameters_t ac_params[MAX_AC_QUEUES]; } wmm_parameter_t, *pwmm_parameter_t; /** 5G band */ @@ -801,111 +801,111 @@ typedef struct _wmm_parameter_t typedef struct _mlan_uap_bss_param { /** AP mac addr */ - mlan_802_11_mac_addr mac_addr; + mlan_802_11_mac_addr mac_addr; /** SSID */ - mlan_802_11_ssid ssid; + mlan_802_11_ssid ssid; /** Broadcast ssid control */ - t_u8 bcast_ssid_ctl; + t_u8 bcast_ssid_ctl; /** Radio control: on/off */ - t_u8 radio_ctl; + t_u8 radio_ctl; /** dtim period */ - t_u8 dtim_period; + t_u8 dtim_period; /** beacon period */ - t_u16 beacon_period; + t_u16 beacon_period; /** rates */ - t_u8 rates[MAX_DATA_RATES]; + t_u8 rates[MAX_DATA_RATES]; /** Tx data rate */ - t_u16 tx_data_rate; + t_u16 tx_data_rate; /** multicast/broadcast data rate */ - t_u16 mcbc_data_rate; + t_u16 mcbc_data_rate; /** Tx power level in dBm */ - t_u8 tx_power_level; + t_u8 tx_power_level; /** Tx antenna */ - t_u8 tx_antenna; + t_u8 tx_antenna; /** Rx antenna */ - t_u8 rx_antenna; + t_u8 rx_antenna; /** packet forward control */ - t_u8 pkt_forward_ctl; + t_u8 pkt_forward_ctl; /** max station count */ - t_u16 max_sta_count; + t_u16 max_sta_count; /** mac filter */ - mac_filter filter; + mac_filter filter; /** station ageout timer in unit of 100ms */ - t_u32 sta_ageout_timer; + t_u32 sta_ageout_timer; /** PS station ageout timer in unit of 100ms */ - t_u32 ps_sta_ageout_timer; + t_u32 ps_sta_ageout_timer; /** RTS threshold */ - t_u16 rts_threshold; + t_u16 rts_threshold; /** fragmentation threshold */ - t_u16 frag_threshold; + t_u16 frag_threshold; /** retry_limit */ - t_u16 retry_limit; + t_u16 retry_limit; /** pairwise update timeout in milliseconds */ - t_u32 pairwise_update_timeout; + t_u32 pairwise_update_timeout; /** pairwise handshake retries */ - t_u32 pwk_retries; + t_u32 pwk_retries; /** groupwise update timeout in milliseconds */ - t_u32 groupwise_update_timeout; + t_u32 groupwise_update_timeout; /** groupwise handshake retries */ - t_u32 gwk_retries; + t_u32 gwk_retries; /** preamble type */ - t_u8 preamble_type; + t_u8 preamble_type; /** band cfg */ - t_u8 band_cfg; + t_u8 band_cfg; /** channel */ - t_u8 channel; + t_u8 channel; /** auth mode */ - t_u16 auth_mode; + t_u16 auth_mode; /** encryption protocol */ - t_u16 protocol; + t_u16 protocol; /** key managment type */ - t_u16 key_mgmt; + t_u16 key_mgmt; /** wep param */ - wep_param wep_cfg; + wep_param wep_cfg; /** wpa param */ - wpa_param wpa_cfg; + wpa_param wpa_cfg; /** Mgmt IE passthru mask */ - t_u32 mgmt_ie_passthru_mask; - /* - * 11n HT Cap HTCap_t ht_cap - */ + t_u32 mgmt_ie_passthru_mask; + /* + * 11n HT Cap HTCap_t ht_cap + */ /** HT Capabilities Info field */ - t_u16 ht_cap_info; + t_u16 ht_cap_info; /** A-MPDU Parameters field */ - t_u8 ampdu_param; + t_u8 ampdu_param; /** Supported MCS Set field */ - t_u8 supported_mcs_set[16]; + t_u8 supported_mcs_set[16]; /** HT Extended Capabilities field */ - t_u16 ht_ext_cap; + t_u16 ht_ext_cap; /** Transmit Beamforming Capabilities field */ - t_u32 tx_bf_cap; + t_u32 tx_bf_cap; /** Antenna Selection Capability field */ - t_u8 asel; + t_u8 asel; /** Enable 2040 Coex */ - t_u8 enable_2040coex; + t_u8 enable_2040coex; /** key management operation */ - t_u16 key_mgmt_operation; + t_u16 key_mgmt_operation; /** BSS status */ - t_u16 bss_status; + t_u16 bss_status; #ifdef WIFI_DIRECT_SUPPORT - /* pre shared key */ - t_u8 psk[MLAN_MAX_KEY_LENGTH]; -#endif /* WIFI_DIRECT_SUPPORT */ + /* pre shared key */ + t_u8 psk[MLAN_MAX_KEY_LENGTH]; +#endif /* WIFI_DIRECT_SUPPORT */ /** Number of channels in scan_channel_list */ - t_u32 num_of_chan; + t_u32 num_of_chan; /** scan channel list in ACS mode */ - scan_chan_list chan_list[MLAN_MAX_CHANNEL]; + scan_chan_list chan_list[MLAN_MAX_CHANNEL]; /** Wmm parameters */ - wmm_parameter_t wmm_para; + wmm_parameter_t wmm_para; } mlan_uap_bss_param; /** mlan_deauth_param */ typedef struct _mlan_deauth_param { /** STA mac addr */ - t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; /** deauth reason */ - t_u16 reason_code; + t_u16 reason_code; } mlan_deauth_param; #endif @@ -928,47 +928,47 @@ typedef struct _mlan_deauth_param typedef struct _mlan_ds_bss { /** Sub-command */ - t_u32 sub_command; + t_u32 sub_command; /** BSS parameter */ - union - { - /** SSID-BSSID for MLAN_OID_BSS_START */ - mlan_ssid_bssid ssid_bssid; - /** BSSID for MLAN_OID_BSS_STOP */ - mlan_802_11_mac_addr bssid; - /** BSS mode for MLAN_OID_BSS_MODE */ - t_u32 bss_mode; - /** BSS channel/frequency for MLAN_OID_BSS_CHANNEL */ - chan_freq bss_chan; - /** BSS channel list for MLAN_OID_BSS_CHANNEL_LIST */ - mlan_chan_list chanlist; - /** MAC address for MLAN_OID_BSS_MAC_ADDR */ - mlan_802_11_mac_addr mac_addr; - /** Multicast list for MLAN_OID_BSS_MULTICAST_LIST */ - mlan_multicast_list multicast_list; - /** Beacon interval for MLAN_OID_IBSS_BCN_INTERVAL */ - t_u32 bcn_interval; - /** ATIM window for MLAN_OID_IBSS_ATIM_WINDOW */ - t_u32 atim_window; + union + { + /** SSID-BSSID for MLAN_OID_BSS_START */ + mlan_ssid_bssid ssid_bssid; + /** BSSID for MLAN_OID_BSS_STOP */ + mlan_802_11_mac_addr bssid; + /** BSS mode for MLAN_OID_BSS_MODE */ + t_u32 bss_mode; + /** BSS channel/frequency for MLAN_OID_BSS_CHANNEL */ + chan_freq bss_chan; + /** BSS channel list for MLAN_OID_BSS_CHANNEL_LIST */ + mlan_chan_list chanlist; + /** MAC address for MLAN_OID_BSS_MAC_ADDR */ + mlan_802_11_mac_addr mac_addr; + /** Multicast list for MLAN_OID_BSS_MULTICAST_LIST */ + mlan_multicast_list multicast_list; + /** Beacon interval for MLAN_OID_IBSS_BCN_INTERVAL */ + t_u32 bcn_interval; + /** ATIM window for MLAN_OID_IBSS_ATIM_WINDOW */ + t_u32 atim_window; #ifdef UAP_SUPPORT - /** BSS param for AP mode for MLAN_OID_UAP_BSS_CONFIG */ - mlan_uap_bss_param bss_config; - /** deauth param for MLAN_OID_UAP_DEAUTH_STA */ - mlan_deauth_param deauth_param; + /** BSS param for AP mode for MLAN_OID_UAP_BSS_CONFIG */ + mlan_uap_bss_param bss_config; + /** deauth param for MLAN_OID_UAP_DEAUTH_STA */ + mlan_deauth_param deauth_param; #endif #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) - /** BSS role for MLAN_OID_BSS_ROLE */ - t_u8 bss_role; + /** BSS role for MLAN_OID_BSS_ROLE */ + t_u8 bss_role; #endif #ifdef WIFI_DIRECT_SUPPORT - /** wifi direct mode for MLAN_OID_WIFI_DIRECT_MODE */ - t_u16 wfd_mode; + /** wifi direct mode for MLAN_OID_WIFI_DIRECT_MODE */ + t_u16 wfd_mode; #endif #ifdef STA_SUPPORT - /** Listen interval for MLAN_OID_BSS_LISTEN_INTERVAL */ - t_u16 listen_interval; + /** Listen interval for MLAN_OID_BSS_LISTEN_INTERVAL */ + t_u16 listen_interval; #endif - } param; + } param; } mlan_ds_bss, *pmlan_ds_bss; /*-----------------------------------------------------------------*/ @@ -977,13 +977,13 @@ typedef struct _mlan_ds_bss /** Enumeration for band */ enum _mlan_band_def { - BAND_B = 1, - BAND_G = 2, - BAND_A = 4, - BAND_GN = 8, - BAND_AN = 16, - BAND_GAC = 32, - BAND_AAC = 64, + BAND_B = 1, + BAND_G = 2, + BAND_A = 4, + BAND_GN = 8, + BAND_AN = 16, + BAND_GAC = 32, + BAND_AAC = 64, }; /** NO secondary channel */ @@ -1009,24 +1009,24 @@ enum _mlan_band_def typedef struct _mlan_ds_band_cfg { /** Infra band */ - t_u32 config_bands; + t_u32 config_bands; /** Ad-hoc start band */ - t_u32 adhoc_start_band; + t_u32 adhoc_start_band; /** Ad-hoc start channel */ - t_u32 adhoc_channel; + t_u32 adhoc_channel; /** Ad-hoc channel bandwidth */ - t_u32 adhoc_chan_bandwidth; + t_u32 adhoc_chan_bandwidth; /** fw supported band */ - t_u32 fw_bands; + t_u32 fw_bands; } mlan_ds_band_cfg; /** Type definition of mlan_ds_ant_cfg for MLAN_OID_ANT_CFG */ typedef struct _mlan_ds_ant_cfg { /** Tx antenna mode */ - t_u32 tx_antenna; + t_u32 tx_antenna; /** Rx antenna mode */ - t_u32 rx_antenna; + t_u32 rx_antenna; } mlan_ds_ant_cfg, *pmlan_ds_ant_cfg; #ifdef WIFI_DIRECT_SUPPORT @@ -1034,15 +1034,15 @@ typedef struct _mlan_ds_ant_cfg typedef struct _mlan_ds_remain_chan { /** remove flag */ - t_u16 remove; + t_u16 remove; /** status */ - t_u8 status; + t_u8 status; /** Band cfg */ - t_u8 bandcfg; + t_u8 bandcfg; /** channel */ - t_u8 channel; + t_u8 channel; /** remain time: Unit ms*/ - t_u32 remain_period; + t_u32 remain_period; } mlan_ds_remain_chan, *pmlan_ds_remain_chan; #endif @@ -1050,23 +1050,23 @@ typedef struct _mlan_ds_remain_chan typedef struct _mlan_ds_radio_cfg { /** Sub-command */ - t_u32 sub_command; + t_u32 sub_command; /** Radio control parameter */ - union - { - /** Radio on/off for MLAN_OID_RADIO_CTRL */ - t_u32 radio_on_off; - /** Band info for MLAN_OID_BAND_CFG */ - mlan_ds_band_cfg band_cfg; - /** Antenna info for MLAN_OID_ANT_CFG */ - mlan_ds_ant_cfg ant_cfg; - /** Antenna info for MLAN_OID_ANT_CFG */ - t_u32 antenna; + union + { + /** Radio on/off for MLAN_OID_RADIO_CTRL */ + t_u32 radio_on_off; + /** Band info for MLAN_OID_BAND_CFG */ + mlan_ds_band_cfg band_cfg; + /** Antenna info for MLAN_OID_ANT_CFG */ + mlan_ds_ant_cfg ant_cfg; + /** Antenna info for MLAN_OID_ANT_CFG */ + t_u32 antenna; #ifdef WIFI_DIRECT_SUPPORT - /** remain on channel for MLAN_OID_REMAIN_CHAN_CFG */ - mlan_ds_remain_chan remain_chan; + /** remain on channel for MLAN_OID_REMAIN_CHAN_CFG */ + mlan_ds_remain_chan remain_chan; #endif - } param; + } param; } mlan_ds_radio_cfg, *pmlan_ds_radio_cfg; /*-----------------------------------------------------------------*/ @@ -1076,23 +1076,23 @@ typedef struct _mlan_ds_radio_cfg typedef struct _mlan_ds_snmp_mib { /** Sub-command */ - t_u32 sub_command; + t_u32 sub_command; /** SNMP MIB parameter */ - union - { - /** RTS threshold for MLAN_OID_SNMP_MIB_RTS_THRESHOLD */ - t_u32 rts_threshold; - /** Fragment threshold for MLAN_OID_SNMP_MIB_FRAG_THRESHOLD */ - t_u32 frag_threshold; - /** Retry count for MLAN_OID_SNMP_MIB_RETRY_COUNT */ - t_u32 retry_count; + union + { + /** RTS threshold for MLAN_OID_SNMP_MIB_RTS_THRESHOLD */ + t_u32 rts_threshold; + /** Fragment threshold for MLAN_OID_SNMP_MIB_FRAG_THRESHOLD */ + t_u32 frag_threshold; + /** Retry count for MLAN_OID_SNMP_MIB_RETRY_COUNT */ + t_u32 retry_count; #if defined(UAP_SUPPORT) - /** OID value for MLAN_OID_SNMP_MIB_DOT11D/H */ - t_u32 oid_value; + /** OID value for MLAN_OID_SNMP_MIB_DOT11D/H */ + t_u32 oid_value; #endif - /** DTIM period for MLAN_OID_SNMP_MIB_DTIM_PERIOD */ - t_u32 dtim_period; - } param; + /** DTIM period for MLAN_OID_SNMP_MIB_DTIM_PERIOD */ + t_u32 dtim_period; + } param; } mlan_ds_snmp_mib, *pmlan_ds_snmp_mib; /*-----------------------------------------------------------------*/ @@ -1101,10 +1101,10 @@ typedef struct _mlan_ds_snmp_mib /** Enumeration for ad-hoc status */ enum _mlan_adhoc_status { - ADHOC_IDLE, - ADHOC_STARTED, - ADHOC_JOINED, - ADHOC_COALESCED, ADHOC_STARTING + ADHOC_IDLE, + ADHOC_STARTED, + ADHOC_JOINED, + ADHOC_COALESCED, ADHOC_STARTING }; /** Type definition of mlan_ds_get_stats for MLAN_OID_GET_STATS */ @@ -1112,78 +1112,78 @@ typedef struct _mlan_ds_get_stats { /** Statistics counter */ /** Multicast transmitted frame count */ - t_u32 mcast_tx_frame; + t_u32 mcast_tx_frame; /** Failure count */ - t_u32 failed; + t_u32 failed; /** Retry count */ - t_u32 retry; + t_u32 retry; /** Multi entry count */ - t_u32 multi_retry; + t_u32 multi_retry; /** Duplicate frame count */ - t_u32 frame_dup; + t_u32 frame_dup; /** RTS success count */ - t_u32 rts_success; + t_u32 rts_success; /** RTS failure count */ - t_u32 rts_failure; + t_u32 rts_failure; /** Ack failure count */ - t_u32 ack_failure; + t_u32 ack_failure; /** Rx fragmentation count */ - t_u32 rx_frag; + t_u32 rx_frag; /** Multicast Tx frame count */ - t_u32 mcast_rx_frame; + t_u32 mcast_rx_frame; /** FCS error count */ - t_u32 fcs_error; + t_u32 fcs_error; /** Tx frame count */ - t_u32 tx_frame; + t_u32 tx_frame; /** WEP ICV error count */ - t_u32 wep_icv_error[4]; + t_u32 wep_icv_error[4]; /** beacon recv count */ - t_u32 bcn_rcv_cnt; + t_u32 bcn_rcv_cnt; /** beacon miss count */ - t_u32 bcn_miss_cnt; + t_u32 bcn_miss_cnt; } mlan_ds_get_stats, *pmlan_ds_get_stats; /** Type definition of mlan_ds_uap_stats for MLAN_OID_GET_STATS */ typedef struct _mlan_ds_uap_stats { /** tkip mic failures */ - t_u32 tkip_mic_failures; + t_u32 tkip_mic_failures; /** ccmp decrypt errors */ - t_u32 ccmp_decrypt_errors; + t_u32 ccmp_decrypt_errors; /** wep undecryptable count */ - t_u32 wep_undecryptable_count; + t_u32 wep_undecryptable_count; /** wep icv error count */ - t_u32 wep_icv_error_count; + t_u32 wep_icv_error_count; /** decrypt failure count */ - t_u32 decrypt_failure_count; + t_u32 decrypt_failure_count; /** dot11 multicast tx count */ - t_u32 mcast_tx_count; + t_u32 mcast_tx_count; /** dot11 failed count */ - t_u32 failed_count; + t_u32 failed_count; /** dot11 retry count */ - t_u32 retry_count; + t_u32 retry_count; /** dot11 multi retry count */ - t_u32 multi_retry_count; + t_u32 multi_retry_count; /** dot11 frame duplicate count */ - t_u32 frame_dup_count; + t_u32 frame_dup_count; /** dot11 rts success count */ - t_u32 rts_success_count; + t_u32 rts_success_count; /** dot11 rts failure count */ - t_u32 rts_failure_count; + t_u32 rts_failure_count; /** dot11 ack failure count */ - t_u32 ack_failure_count; + t_u32 ack_failure_count; /** dot11 rx ragment count */ - t_u32 rx_fragment_count; + t_u32 rx_fragment_count; /** dot11 mcast rx frame count */ - t_u32 mcast_rx_frame_count; + t_u32 mcast_rx_frame_count; /** dot11 fcs error count */ - t_u32 fcs_error_count; + t_u32 fcs_error_count; /** dot11 tx frame count */ - t_u32 tx_frame_count; + t_u32 tx_frame_count; /** dot11 rsna tkip cm invoked */ - t_u32 rsna_tkip_cm_invoked; + t_u32 rsna_tkip_cm_invoked; /** dot11 rsna 4way handshake failures */ - t_u32 rsna_4way_hshk_failures; + t_u32 rsna_4way_hshk_failures; } mlan_ds_uap_stats, *pmlan_ds_uap_stats; /** Mask of last beacon RSSI */ @@ -1217,60 +1217,60 @@ typedef struct _mlan_ds_uap_stats typedef struct _mlan_ds_get_signal { /** Selector of get operation */ - /* - * Bit0: Last Beacon RSSI, Bit1: Average Beacon RSSI, - * Bit2: Last Data RSSI, Bit3: Average Data RSSI, - * Bit4: Last Beacon SNR, Bit5: Average Beacon SNR, - * Bit6: Last Data SNR, Bit7: Average Data SNR, - * Bit8: Last Beacon NF, Bit9: Average Beacon NF, - * Bit10: Last Data NF, Bit11: Average Data NF - */ - t_u16 selector; + /* + * Bit0: Last Beacon RSSI, Bit1: Average Beacon RSSI, + * Bit2: Last Data RSSI, Bit3: Average Data RSSI, + * Bit4: Last Beacon SNR, Bit5: Average Beacon SNR, + * Bit6: Last Data SNR, Bit7: Average Data SNR, + * Bit8: Last Beacon NF, Bit9: Average Beacon NF, + * Bit10: Last Data NF, Bit11: Average Data NF + */ + t_u16 selector; /** RSSI */ /** RSSI of last beacon */ - t_s16 bcn_rssi_last; + t_s16 bcn_rssi_last; /** RSSI of beacon average */ - t_s16 bcn_rssi_avg; + t_s16 bcn_rssi_avg; /** RSSI of last data packet */ - t_s16 data_rssi_last; + t_s16 data_rssi_last; /** RSSI of data packet average */ - t_s16 data_rssi_avg; + t_s16 data_rssi_avg; /** SNR */ /** SNR of last beacon */ - t_s16 bcn_snr_last; + t_s16 bcn_snr_last; /** SNR of beacon average */ - t_s16 bcn_snr_avg; + t_s16 bcn_snr_avg; /** SNR of last data packet */ - t_s16 data_snr_last; + t_s16 data_snr_last; /** SNR of data packet average */ - t_s16 data_snr_avg; + t_s16 data_snr_avg; /** NF */ /** NF of last beacon */ - t_s16 bcn_nf_last; + t_s16 bcn_nf_last; /** NF of beacon average */ - t_s16 bcn_nf_avg; + t_s16 bcn_nf_avg; /** NF of last data packet */ - t_s16 data_nf_last; + t_s16 data_nf_last; /** NF of data packet average */ - t_s16 data_nf_avg; + t_s16 data_nf_avg; } mlan_ds_get_signal, *pmlan_ds_get_signal; /** mlan_fw_info data structure for MLAN_OID_GET_FW_INFO */ typedef struct _mlan_fw_info { /** Firmware version */ - t_u32 fw_ver; + t_u32 fw_ver; /** MAC address */ - mlan_802_11_mac_addr mac_addr; + mlan_802_11_mac_addr mac_addr; /** Device support for MIMO abstraction of MCSs */ - t_u8 hw_dev_mcs_support; - /** fw supported band */ - t_u8 fw_bands; - /** region code */ - t_u16 region_code; + t_u8 hw_dev_mcs_support; + /** fw supported band */ + t_u8 fw_bands; + /** region code */ + t_u16 region_code; } mlan_fw_info, *pmlan_fw_info; /** Version string buffer length */ @@ -1280,60 +1280,60 @@ typedef struct _mlan_fw_info typedef struct _mlan_ver_ext { /** Selected version string */ - t_u32 version_str_sel; + t_u32 version_str_sel; /** Version string */ - char version_str[MLAN_MAX_VER_STR_LEN]; + char version_str[MLAN_MAX_VER_STR_LEN]; } mlan_ver_ext, *pmlan_ver_ext; /** mlan_bss_info data structure for MLAN_OID_GET_BSS_INFO */ typedef struct _mlan_bss_info { /** BSS mode */ - t_u32 bss_mode; + t_u32 bss_mode; /** SSID */ - mlan_802_11_ssid ssid; + mlan_802_11_ssid ssid; /** Table index */ - t_u32 scan_table_idx; + t_u32 scan_table_idx; /** Channel */ - t_u32 bss_chan; + t_u32 bss_chan; /** Band */ - t_u8 bss_band; + t_u8 bss_band; /** Region code */ - t_u32 region_code; + t_u32 region_code; /** Connection status */ - t_u32 media_connected; + t_u32 media_connected; /** Radio on */ - t_u32 radio_on; + t_u32 radio_on; /** Max power level in dBm */ - t_s32 max_power_level; + t_s32 max_power_level; /** Min power level in dBm */ - t_s32 min_power_level; + t_s32 min_power_level; /** Adhoc state */ - t_u32 adhoc_state; + t_u32 adhoc_state; /** NF of last beacon */ - t_s32 bcn_nf_last; + t_s32 bcn_nf_last; /** wep status */ - t_u32 wep_status; + t_u32 wep_status; /** scan block status */ - t_u8 scan_block; + t_u8 scan_block; /** Host Sleep configured flag */ - t_u32 is_hs_configured; + t_u32 is_hs_configured; /** Deep Sleep flag */ - t_u32 is_deep_sleep; + t_u32 is_deep_sleep; /** BSSID */ - mlan_802_11_mac_addr bssid; + mlan_802_11_mac_addr bssid; #ifdef STA_SUPPORT /** Capability Info */ - t_u16 capability_info; + t_u16 capability_info; /** Beacon Interval */ - t_u16 beacon_interval; + t_u16 beacon_interval; /** Listen Interval */ - t_u16 listen_interval; + t_u16 listen_interval; /** Association Id */ - t_u16 assoc_id; + t_u16 assoc_id; /** AP/Peer supported rates */ - t_u8 peer_supp_rates[MLAN_SUPPORTED_RATES]; -#endif /* STA_SUPPORT */ + t_u8 peer_supp_rates[MLAN_SUPPORTED_RATES]; +#endif /* STA_SUPPORT */ } mlan_bss_info, *pmlan_bss_info; /** MAXIMUM number of TID */ @@ -1346,28 +1346,28 @@ typedef struct _mlan_bss_info typedef struct { /** TID */ - t_u16 tid; + t_u16 tid; /** TA */ - t_u8 ta[MLAN_MAC_ADDR_LENGTH]; + t_u8 ta[MLAN_MAC_ADDR_LENGTH]; /** Start window */ - t_u32 start_win; + t_u32 start_win; /** Window size */ - t_u32 win_size; + t_u32 win_size; /** amsdu flag */ - t_u8 amsdu; + t_u8 amsdu; /** buffer status */ - t_u32 buffer[MAX_RX_WINSIZE]; + t_u32 buffer[MAX_RX_WINSIZE]; } rx_reorder_tbl; /** tx_ba_stream_tbl */ typedef struct { /** TID */ - t_u16 tid; + t_u16 tid; /** RA */ - t_u8 ra[MLAN_MAC_ADDR_LENGTH]; + t_u8 ra[MLAN_MAC_ADDR_LENGTH]; /** amsdu flag */ - t_u8 amsdu; + t_u8 amsdu; } tx_ba_stream_tbl; /** Debug command number */ @@ -1376,131 +1376,131 @@ typedef struct /** mlan_debug_info data structure for MLAN_OID_GET_DEBUG_INFO */ typedef struct _mlan_debug_info { - /* WMM AC_BK count */ - t_u32 wmm_ac_bk; - /* WMM AC_BE count */ - t_u32 wmm_ac_be; - /* WMM AC_VI count */ - t_u32 wmm_ac_vi; - /* WMM AC_VO count */ - t_u32 wmm_ac_vo; + /* WMM AC_BK count */ + t_u32 wmm_ac_bk; + /* WMM AC_BE count */ + t_u32 wmm_ac_be; + /* WMM AC_VI count */ + t_u32 wmm_ac_vi; + /* WMM AC_VO count */ + t_u32 wmm_ac_vo; /** Corresponds to max_tx_buf_size member of mlan_adapter*/ - t_u32 max_tx_buf_size; + t_u32 max_tx_buf_size; /** Corresponds to tx_buf_size member of mlan_adapter*/ - t_u32 tx_buf_size; + t_u32 tx_buf_size; /** Corresponds to curr_tx_buf_size member of mlan_adapter*/ - t_u32 curr_tx_buf_size; + t_u32 curr_tx_buf_size; /** Tx table num */ - t_u32 tx_tbl_num; + t_u32 tx_tbl_num; /** Tx ba stream table */ - tx_ba_stream_tbl tx_tbl[MLAN_MAX_TX_BASTREAM_SUPPORTED]; + tx_ba_stream_tbl tx_tbl[MLAN_MAX_TX_BASTREAM_SUPPORTED]; /** Rx table num */ - t_u32 rx_tbl_num; + t_u32 rx_tbl_num; /** Rx reorder table*/ - rx_reorder_tbl rx_tbl[MLAN_MAX_RX_BASTREAM_SUPPORTED]; + rx_reorder_tbl rx_tbl[MLAN_MAX_RX_BASTREAM_SUPPORTED]; /** Corresponds to ps_mode member of mlan_adapter */ - t_u16 ps_mode; + t_u16 ps_mode; /** Corresponds to ps_state member of mlan_adapter */ - t_u32 ps_state; + t_u32 ps_state; #ifdef STA_SUPPORT /** Corresponds to is_deep_sleep member of mlan_adapter */ - t_u8 is_deep_sleep; + t_u8 is_deep_sleep; #endif /** STA_SUPPORT */ /** Corresponds to pm_wakeup_card_req member of mlan_adapter */ - t_u8 pm_wakeup_card_req; + t_u8 pm_wakeup_card_req; /** Corresponds to pm_wakeup_fw_try member of mlan_adapter */ - t_u32 pm_wakeup_fw_try; + t_u32 pm_wakeup_fw_try; /** Corresponds to is_hs_configured member of mlan_adapter */ - t_u8 is_hs_configured; + t_u8 is_hs_configured; /** Corresponds to hs_activated member of mlan_adapter */ - t_u8 hs_activated; + t_u8 hs_activated; /** Corresponds to pps_uapsd_mode member of mlan_adapter */ - t_u16 pps_uapsd_mode; + t_u16 pps_uapsd_mode; /** Corresponds to sleep_period.period member of mlan_adapter */ - t_u16 sleep_pd; + t_u16 sleep_pd; /** Corresponds to wmm_qosinfo member of mlan_private */ - t_u8 qos_cfg; + t_u8 qos_cfg; /** Corresponds to tx_lock_flag member of mlan_adapter */ - t_u8 tx_lock_flag; + t_u8 tx_lock_flag; /** Corresponds to port_open member of mlan_private */ - t_u8 port_open; + t_u8 port_open; /** bypass pkt count */ - t_u16 bypass_pkt_count; + t_u16 bypass_pkt_count; /** Corresponds to scan_processing member of mlan_adapter */ - t_u32 scan_processing; + t_u32 scan_processing; /** Number of host to card command failures */ - t_u32 num_cmd_host_to_card_failure; + t_u32 num_cmd_host_to_card_failure; /** Number of host to card sleep confirm failures */ - t_u32 num_cmd_sleep_cfm_host_to_card_failure; + t_u32 num_cmd_sleep_cfm_host_to_card_failure; /** Number of host to card Tx failures */ - t_u32 num_tx_host_to_card_failure; + t_u32 num_tx_host_to_card_failure; /** Number of card to host command/event failures */ - t_u32 num_cmdevt_card_to_host_failure; + t_u32 num_cmdevt_card_to_host_failure; /** Number of card to host Rx failures */ - t_u32 num_rx_card_to_host_failure; + t_u32 num_rx_card_to_host_failure; /** Number of interrupt read failures */ - t_u32 num_int_read_failure; + t_u32 num_int_read_failure; /** Last interrupt status */ - t_u32 last_int_status; + t_u32 last_int_status; /** Number of deauthentication events */ - t_u32 num_event_deauth; + t_u32 num_event_deauth; /** Number of disassosiation events */ - t_u32 num_event_disassoc; + t_u32 num_event_disassoc; /** Number of link lost events */ - t_u32 num_event_link_lost; + t_u32 num_event_link_lost; /** Number of deauthentication commands */ - t_u32 num_cmd_deauth; + t_u32 num_cmd_deauth; /** Number of association comamnd successes */ - t_u32 num_cmd_assoc_success; + t_u32 num_cmd_assoc_success; /** Number of association command failures */ - t_u32 num_cmd_assoc_failure; + t_u32 num_cmd_assoc_failure; /** Number of Tx timeouts */ - t_u32 num_tx_timeout; + t_u32 num_tx_timeout; /** Number of command timeouts */ - t_u32 num_cmd_timeout; + t_u32 num_cmd_timeout; /** Timeout command ID */ - t_u16 timeout_cmd_id; + t_u16 timeout_cmd_id; /** Timeout command action */ - t_u16 timeout_cmd_act; + t_u16 timeout_cmd_act; /** List of last command IDs */ - t_u16 last_cmd_id[DBG_CMD_NUM]; + t_u16 last_cmd_id[DBG_CMD_NUM]; /** List of last command actions */ - t_u16 last_cmd_act[DBG_CMD_NUM]; + t_u16 last_cmd_act[DBG_CMD_NUM]; /** Last command index */ - t_u16 last_cmd_index; + t_u16 last_cmd_index; /** List of last command response IDs */ - t_u16 last_cmd_resp_id[DBG_CMD_NUM]; + t_u16 last_cmd_resp_id[DBG_CMD_NUM]; /** Last command response index */ - t_u16 last_cmd_resp_index; + t_u16 last_cmd_resp_index; /** List of last events */ - t_u16 last_event[DBG_CMD_NUM]; + t_u16 last_event[DBG_CMD_NUM]; /** Last event index */ - t_u16 last_event_index; + t_u16 last_event_index; /** Number of no free command node */ - t_u16 num_no_cmd_node; + t_u16 num_no_cmd_node; /** Corresponds to data_sent member of mlan_adapter */ - t_u8 data_sent; + t_u8 data_sent; /** Corresponds to cmd_sent member of mlan_adapter */ - t_u8 cmd_sent; + t_u8 cmd_sent; /** SDIO multiple port read bitmap */ - t_u32 mp_rd_bitmap; + t_u32 mp_rd_bitmap; /** SDIO multiple port write bitmap */ - t_u32 mp_wr_bitmap; + t_u32 mp_wr_bitmap; /** Current available port for read */ - t_u8 curr_rd_port; + t_u8 curr_rd_port; /** Current available port for write */ - t_u8 curr_wr_port; + t_u8 curr_wr_port; /** Corresponds to cmdresp_received member of mlan_adapter */ - t_u8 cmd_resp_received; + t_u8 cmd_resp_received; /** Corresponds to event_received member of mlan_adapter */ - t_u8 event_received; + t_u8 event_received; /** pendig tx pkts */ - t_u32 tx_pkts_queued; + t_u32 tx_pkts_queued; #ifdef UAP_SUPPORT /** pending bridge pkts */ - t_u16 num_bridge_pkts; + t_u16 num_bridge_pkts; /** dropped pkts */ - t_u32 num_drop_pkts; + t_u32 num_drop_pkts; #endif } mlan_debug_info, *pmlan_debug_info; @@ -1512,20 +1512,20 @@ typedef struct _mlan_debug_info typedef struct _sta_info { /** STA MAC address */ - t_u8 mac_address[MLAN_MAC_ADDR_LENGTH]; + t_u8 mac_address[MLAN_MAC_ADDR_LENGTH]; /** Power mfg status */ - t_u8 power_mfg_status; + t_u8 power_mfg_status; /** RSSI */ - t_s8 rssi; + t_s8 rssi; } sta_info; /** mlan_ds_sta_list structure for MLAN_OID_UAP_STA_LIST */ typedef struct _mlan_ds_sta_list { /** station count */ - t_u16 sta_count; + t_u16 sta_count; /** station list */ - sta_info info[MAX_NUM_CLIENTS]; + sta_info info[MAX_NUM_CLIENTS]; } mlan_ds_sta_list, *pmlan_ds_sta_list; #endif @@ -1533,30 +1533,30 @@ typedef struct _mlan_ds_sta_list typedef struct _mlan_ds_get_info { /** Sub-command */ - t_u32 sub_command; + t_u32 sub_command; /** Status information parameter */ - union - { - /** Signal information for MLAN_OID_GET_SIGNAL */ - mlan_ds_get_signal signal; - /** Statistics information for MLAN_OID_GET_STATS */ - mlan_ds_get_stats stats; - /** Firmware information for MLAN_OID_GET_FW_INFO */ - mlan_fw_info fw_info; - /** Extended version information for MLAN_OID_GET_VER_EXT */ - mlan_ver_ext ver_ext; - /** BSS information for MLAN_OID_GET_BSS_INFO */ - mlan_bss_info bss_info; - /** Debug information for MLAN_OID_GET_DEBUG_INFO */ - mlan_debug_info debug_info; + union + { + /** Signal information for MLAN_OID_GET_SIGNAL */ + mlan_ds_get_signal signal; + /** Statistics information for MLAN_OID_GET_STATS */ + mlan_ds_get_stats stats; + /** Firmware information for MLAN_OID_GET_FW_INFO */ + mlan_fw_info fw_info; + /** Extended version information for MLAN_OID_GET_VER_EXT */ + mlan_ver_ext ver_ext; + /** BSS information for MLAN_OID_GET_BSS_INFO */ + mlan_bss_info bss_info; + /** Debug information for MLAN_OID_GET_DEBUG_INFO */ + mlan_debug_info debug_info; #ifdef UAP_SUPPORT - /** UAP Statistics information for MLAN_OID_GET_STATS */ - mlan_ds_uap_stats ustats; - /** UAP station list for MLAN_OID_UAP_STA_LIST */ - mlan_ds_sta_list sta_list; + /** UAP Statistics information for MLAN_OID_GET_STATS */ + mlan_ds_uap_stats ustats; + /** UAP station list for MLAN_OID_UAP_STA_LIST */ + mlan_ds_sta_list sta_list; #endif - } param; + } param; } mlan_ds_get_info, *pmlan_ds_get_info; /*-----------------------------------------------------------------*/ @@ -1565,29 +1565,29 @@ typedef struct _mlan_ds_get_info /** Enumeration for authentication mode */ enum _mlan_auth_mode { - MLAN_AUTH_MODE_OPEN = 0x00, - MLAN_AUTH_MODE_SHARED = 0x01, - MLAN_AUTH_MODE_NETWORKEAP = 0x80, - MLAN_AUTH_MODE_AUTO = 0xFF, + MLAN_AUTH_MODE_OPEN = 0x00, + MLAN_AUTH_MODE_SHARED = 0x01, + MLAN_AUTH_MODE_NETWORKEAP = 0x80, + MLAN_AUTH_MODE_AUTO = 0xFF, }; /** Enumeration for encryption mode */ enum _mlan_encryption_mode { - MLAN_ENCRYPTION_MODE_NONE = 0, - MLAN_ENCRYPTION_MODE_WEP40 = 1, - MLAN_ENCRYPTION_MODE_TKIP = 2, - MLAN_ENCRYPTION_MODE_CCMP = 3, - MLAN_ENCRYPTION_MODE_WEP104 = 4, + MLAN_ENCRYPTION_MODE_NONE = 0, + MLAN_ENCRYPTION_MODE_WEP40 = 1, + MLAN_ENCRYPTION_MODE_TKIP = 2, + MLAN_ENCRYPTION_MODE_CCMP = 3, + MLAN_ENCRYPTION_MODE_WEP104 = 4, }; /** Enumeration for PSK */ enum _mlan_psk_type { - MLAN_PSK_PASSPHRASE = 1, - MLAN_PSK_PMK, - MLAN_PSK_CLEAR, - MLAN_PSK_QUERY, + MLAN_PSK_PASSPHRASE = 1, + MLAN_PSK_PMK, + MLAN_PSK_CLEAR, + MLAN_PSK_QUERY, }; /** The bit to indicate the key is for unicast */ @@ -1629,41 +1629,41 @@ enum _mlan_psk_type typedef struct _mlan_ds_encrypt_key { /** Key disabled, all other fields will be ignore when this flag set to MTRUE */ - t_u32 key_disable; + t_u32 key_disable; /** key removed flag, when this flag is set to MTRUE, only key_index will be check */ - t_u32 key_remove; + t_u32 key_remove; /** Key index, used as current tx key index when is_current_wep_key is set to MTRUE */ - t_u32 key_index; + t_u32 key_index; /** Current Tx key flag */ - t_u32 is_current_wep_key; + t_u32 is_current_wep_key; /** Key length */ - t_u32 key_len; + t_u32 key_len; /** Key */ - t_u8 key_material[MLAN_MAX_KEY_LENGTH]; + t_u8 key_material[MLAN_MAX_KEY_LENGTH]; /** mac address */ - t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; /** wapi key flag */ - t_u32 is_wapi_key; + t_u32 is_wapi_key; /** Initial packet number */ - t_u8 pn[PN_SIZE]; + t_u8 pn[PN_SIZE]; /** key flags */ - t_u32 key_flags; + t_u32 key_flags; } mlan_ds_encrypt_key, *pmlan_ds_encrypt_key; /** Type definition of mlan_passphrase_t */ typedef struct _mlan_passphrase_t { /** Length of passphrase */ - t_u32 passphrase_len; + t_u32 passphrase_len; /** Passphrase */ - t_u8 passphrase[MLAN_MAX_PASSPHRASE_LENGTH]; + t_u8 passphrase[MLAN_MAX_PASSPHRASE_LENGTH]; } mlan_passphrase_t; /** Type defnition of mlan_pmk_t */ typedef struct _mlan_pmk_t { /** PMK */ - t_u8 pmk[MLAN_MAX_KEY_LENGTH]; + t_u8 pmk[MLAN_MAX_KEY_LENGTH]; } mlan_pmk_t; /** Embedded supplicant RSN type: No RSN */ @@ -1688,59 +1688,59 @@ typedef struct _mlan_pmk_t typedef struct _mlan_ds_passphrase { /** SSID may be used */ - mlan_802_11_ssid ssid; + mlan_802_11_ssid ssid; /** BSSID may be used */ - mlan_802_11_mac_addr bssid; + mlan_802_11_mac_addr bssid; /** Flag for passphrase or pmk used */ - t_u16 psk_type; + t_u16 psk_type; /** Passphrase or PMK */ - union - { - /** Passphrase */ - mlan_passphrase_t passphrase; - /** PMK */ - mlan_pmk_t pmk; - } psk; + union + { + /** Passphrase */ + mlan_passphrase_t passphrase; + /** PMK */ + mlan_pmk_t pmk; + } psk; } mlan_ds_passphrase, *pmlan_ds_passphrase; /** Type definition of mlan_ds_esupp_mode for MLAN_OID_SEC_CFG_ESUPP_MODE */ typedef struct _mlan_ds_ewpa_mode { /** RSN mode */ - t_u32 rsn_mode; + t_u32 rsn_mode; /** Active pairwise cipher */ - t_u32 act_paircipher; + t_u32 act_paircipher; /** Active pairwise cipher */ - t_u32 act_groupcipher; + t_u32 act_groupcipher; } mlan_ds_esupp_mode, *pmlan_ds_esupp_mode; /** Type definition of mlan_ds_sec_cfg for MLAN_IOCTL_SEC_CFG */ typedef struct _mlan_ds_sec_cfg { /** Sub-command */ - t_u32 sub_command; + t_u32 sub_command; /** Security configuration parameter */ - union - { - /** Authentication mode for MLAN_OID_SEC_CFG_AUTH_MODE */ - t_u32 auth_mode; - /** Encryption mode for MLAN_OID_SEC_CFG_ENCRYPT_MODE */ - t_u32 encrypt_mode; - /** WPA enabled flag for MLAN_OID_SEC_CFG_WPA_ENABLED */ - t_u32 wpa_enabled; - /** WAPI enabled flag for MLAN_OID_SEC_CFG_WAPI_ENABLED */ - t_u32 wapi_enabled; - /** Port Control enabled flag for MLAN_OID_SEC_CFG_PORT_CTRL */ - t_u32 port_ctrl_enabled; - /** Encryption key for MLAN_OID_SEC_CFG_ENCRYPT_KEY */ - mlan_ds_encrypt_key encrypt_key; - /** Passphrase for MLAN_OID_SEC_CFG_PASSPHRASE */ - mlan_ds_passphrase passphrase; - /** Embedded supplicant WPA enabled flag for MLAN_OID_SEC_CFG_EWPA_ENABLED */ - t_u32 ewpa_enabled; - /** Embedded supplicant mode for MLAN_OID_SEC_CFG_ESUPP_MODE */ - mlan_ds_esupp_mode esupp_mode; - } param; + union + { + /** Authentication mode for MLAN_OID_SEC_CFG_AUTH_MODE */ + t_u32 auth_mode; + /** Encryption mode for MLAN_OID_SEC_CFG_ENCRYPT_MODE */ + t_u32 encrypt_mode; + /** WPA enabled flag for MLAN_OID_SEC_CFG_WPA_ENABLED */ + t_u32 wpa_enabled; + /** WAPI enabled flag for MLAN_OID_SEC_CFG_WAPI_ENABLED */ + t_u32 wapi_enabled; + /** Port Control enabled flag for MLAN_OID_SEC_CFG_PORT_CTRL */ + t_u32 port_ctrl_enabled; + /** Encryption key for MLAN_OID_SEC_CFG_ENCRYPT_KEY */ + mlan_ds_encrypt_key encrypt_key; + /** Passphrase for MLAN_OID_SEC_CFG_PASSPHRASE */ + mlan_ds_passphrase passphrase; + /** Embedded supplicant WPA enabled flag for MLAN_OID_SEC_CFG_EWPA_ENABLED */ + t_u32 ewpa_enabled; + /** Embedded supplicant mode for MLAN_OID_SEC_CFG_ESUPP_MODE */ + mlan_ds_esupp_mode esupp_mode; + } param; } mlan_ds_sec_cfg, *pmlan_ds_sec_cfg; /*-----------------------------------------------------------------*/ @@ -1749,18 +1749,18 @@ typedef struct _mlan_ds_sec_cfg /** Enumeration for rate type */ enum _mlan_rate_type { - MLAN_RATE_INDEX, - MLAN_RATE_VALUE, - MLAN_RATE_BITMAP + MLAN_RATE_INDEX, + MLAN_RATE_VALUE, + MLAN_RATE_BITMAP }; /** Enumeration for rate format */ enum _mlan_rate_format { - MLAN_RATE_FORMAT_LG = 0, - MLAN_RATE_FORMAT_HT, - MLAN_RATE_FORMAT_VHT, - MLAN_RATE_FORMAT_AUTO = 0xFF, + MLAN_RATE_FORMAT_LG = 0, + MLAN_RATE_FORMAT_HT, + MLAN_RATE_FORMAT_VHT, + MLAN_RATE_FORMAT_AUTO = 0xFF, }; /** Max bitmap rates size */ #define MAX_BITMAP_RATES_SIZE 18 @@ -1769,101 +1769,101 @@ enum _mlan_rate_format typedef struct _mlan_rate_cfg_t { /** Fixed rate: 0, auto rate: 1 */ - t_u32 is_rate_auto; + t_u32 is_rate_auto; /** Rate type. 0: index; 1: value; 2: bitmap */ - t_u32 rate_type; + t_u32 rate_type; /** Rate/MCS index or rate value if fixed rate */ - t_u32 rate; + t_u32 rate; /** Rate Bitmap */ - t_u16 bitmap_rates[MAX_BITMAP_RATES_SIZE]; + t_u16 bitmap_rates[MAX_BITMAP_RATES_SIZE]; /** NSS */ - t_u32 nss; - /* LG rate: 0, HT rate: 1, VHT rate: 2 */ - t_u32 rate_format; + t_u32 nss; + /* LG rate: 0, HT rate: 1, VHT rate: 2 */ + t_u32 rate_format; } mlan_rate_cfg_t; /** HT channel bandwidth */ typedef enum _mlan_ht_bw { - MLAN_HT_BW20, - MLAN_HT_BW40, + MLAN_HT_BW20, + MLAN_HT_BW40, /** VHT channel bandwidth */ - MLAN_VHT_BW80, - MLAN_VHT_BW160, + MLAN_VHT_BW80, + MLAN_VHT_BW160, } mlan_ht_bw; /** HT guard interval */ typedef enum _mlan_ht_gi { - MLAN_HT_LGI, - MLAN_HT_SGI, + MLAN_HT_LGI, + MLAN_HT_SGI, } mlan_ht_gi; typedef enum _mlan_vht_stbc { - MLAN_VHT_STBC, - MLAN_VHT_NO_STBC, + MLAN_VHT_STBC, + MLAN_VHT_NO_STBC, } mlan_vht_stbc; typedef enum _mlan_vht_ldpc { - MLAN_VHT_LDPC, - MLAN_VHT_NO_LDPC, + MLAN_VHT_LDPC, + MLAN_VHT_NO_LDPC, } mlan_vht_ldpc; /** Band and BSS mode */ typedef struct _mlan_band_data_rate { /** Band configuration */ - t_u8 config_bands; + t_u8 config_bands; /** BSS mode (Infra or IBSS) */ - t_u8 bss_mode; + t_u8 bss_mode; } mlan_band_data_rate; /** Type definition of mlan_data_rate for MLAN_OID_GET_DATA_RATE */ typedef struct _mlan_data_rate { /** Tx data rate */ - t_u32 tx_data_rate; + t_u32 tx_data_rate; /** Rx data rate */ - t_u32 rx_data_rate; + t_u32 rx_data_rate; /** Tx channel bandwidth */ - t_u32 tx_ht_bw; + t_u32 tx_ht_bw; /** Tx guard interval */ - t_u32 tx_ht_gi; + t_u32 tx_ht_gi; /** Rx channel bandwidth */ - t_u32 rx_ht_bw; + t_u32 rx_ht_bw; /** Rx guard interval */ - t_u32 rx_ht_gi; + t_u32 rx_ht_gi; /** MCS index */ - t_u32 tx_mcs_index; - t_u32 rx_mcs_index; + t_u32 tx_mcs_index; + t_u32 rx_mcs_index; /** NSS */ - t_u32 tx_nss; - t_u32 rx_nss; - /* LG rate: 0, HT rate: 1, VHT rate: 2 */ - t_u32 tx_rate_format; - t_u32 rx_rate_format; + t_u32 tx_nss; + t_u32 rx_nss; + /* LG rate: 0, HT rate: 1, VHT rate: 2 */ + t_u32 tx_rate_format; + t_u32 rx_rate_format; } mlan_data_rate; /** Type definition of mlan_ds_rate for MLAN_IOCTL_RATE */ typedef struct _mlan_ds_rate { /** Sub-command */ - t_u32 sub_command; + t_u32 sub_command; /** Rate configuration parameter */ - union - { - /** Rate configuration for MLAN_OID_RATE_CFG */ - mlan_rate_cfg_t rate_cfg; - /** Data rate for MLAN_OID_GET_DATA_RATE */ - mlan_data_rate data_rate; - /** Supported rates for MLAN_OID_SUPPORTED_RATES */ - t_u8 rates[MLAN_SUPPORTED_RATES]; - /** Band/BSS mode for getting supported rates */ - mlan_band_data_rate rate_band_cfg; - } param; + union + { + /** Rate configuration for MLAN_OID_RATE_CFG */ + mlan_rate_cfg_t rate_cfg; + /** Data rate for MLAN_OID_GET_DATA_RATE */ + mlan_data_rate data_rate; + /** Supported rates for MLAN_OID_SUPPORTED_RATES */ + t_u8 rates[MLAN_SUPPORTED_RATES]; + /** Band/BSS mode for getting supported rates */ + mlan_band_data_rate rate_band_cfg; + } param; } mlan_ds_rate, *pmlan_ds_rate; /*-----------------------------------------------------------------*/ @@ -1874,9 +1874,9 @@ typedef struct _mlan_ds_rate typedef struct _mlan_power_cfg_t { /** Is power auto */ - t_u32 is_power_auto; + t_u32 is_power_auto; /** Power level in dBm */ - t_s32 power_level; + t_s32 power_level; } mlan_power_cfg_t; /** max power table size */ @@ -1888,45 +1888,45 @@ typedef struct mlan_power_group { /** rate format (LG: 0, HT: 1, VHT: 2, no auto ctrl: 0xFF) */ - t_u32 rate_format; + t_u32 rate_format; /** bandwidth (LG: 20 MHz, HT: 20/40 MHz, VHT: 80/160/80+80 MHz) */ - t_u32 bandwidth; + t_u32 bandwidth; /** NSS */ - t_u32 nss; + t_u32 nss; /** LG: first rate index, HT/VHT: first MCS */ - t_u32 first_rate_ind; + t_u32 first_rate_ind; /** LG: last rate index, HT/VHT: last MCS */ - t_u32 last_rate_ind; + t_u32 last_rate_ind; /** minmum tx power (dBm) */ - t_s32 power_min; + t_s32 power_min; /** maximum tx power (dBm) */ - t_s32 power_max; + t_s32 power_max; /** tx power step (dB) */ - t_s32 power_step; + t_s32 power_step; } mlan_power_group; /** Type definition of mlan_power_cfg_ext for MLAN_OID_POWER_CFG_EXT */ typedef struct _mlan_power_cfg_ext { /** number of power_groups */ - t_u32 num_pwr_grp; + t_u32 num_pwr_grp; /** array of power groups */ - mlan_power_group power_group[MAX_POWER_GROUP]; + mlan_power_group power_group[MAX_POWER_GROUP]; } mlan_power_cfg_ext; /** Type definition of mlan_ds_power_cfg for MLAN_IOCTL_POWER_CFG */ typedef struct _mlan_ds_power_cfg { /** Sub-command */ - t_u32 sub_command; + t_u32 sub_command; /** Power configuration parameter */ - union - { - /** Power configuration for MLAN_OID_POWER_CFG */ - mlan_power_cfg_t power_cfg; - /** Extended power configuration for MLAN_OID_POWER_CFG_EXT */ - mlan_power_cfg_ext power_ext; - } param; + union + { + /** Power configuration for MLAN_OID_POWER_CFG */ + mlan_power_cfg_t power_cfg; + /** Extended power configuration for MLAN_OID_POWER_CFG_EXT */ + mlan_power_cfg_ext power_ext; + } param; } mlan_ds_power_cfg, *pmlan_ds_power_cfg; /*-----------------------------------------------------------------*/ @@ -1949,28 +1949,28 @@ typedef struct _mlan_ds_power_cfg /** Host sleep config conditions: Default */ #define HOST_SLEEP_DEF_COND (HOST_SLEEP_COND_BROADCAST_DATA | HOST_SLEEP_COND_UNICAST_DATA | HOST_SLEEP_COND_MAC_EVENT) /** Host sleep config GPIO : Default */ -#define HOST_SLEEP_DEF_GPIO 0xff +#define HOST_SLEEP_DEF_GPIO 0x10 /** Host sleep config gap : Default */ -#define HOST_SLEEP_DEF_GAP 200 +#define HOST_SLEEP_DEF_GAP 100 /** Host sleep config min wake holdoff */ -#define HOST_SLEEP_DEF_WAKE_HOLDOFF 0; +#define HOST_SLEEP_DEF_WAKE_HOLDOFF 200; /** Type definition of mlan_ds_hs_cfg for MLAN_OID_PM_CFG_HS_CFG */ typedef struct _mlan_ds_hs_cfg { /** MTRUE to invoke the HostCmd, MFALSE otherwise */ - t_u32 is_invoke_hostcmd; + t_u32 is_invoke_hostcmd; /** Host sleep config condition */ /** Bit0: broadcast data * Bit1: unicast data * Bit2: mac event - * Bit3: multicast data + * Bit3: multicast data */ - t_u32 conditions; + t_u32 conditions; /** GPIO pin or 0xff for interface */ - t_u32 gpio; + t_u32 gpio; /** Gap in milliseconds or or 0xff for special setting when GPIO is used to wakeup host */ - t_u32 gap; + t_u32 gap; } mlan_ds_hs_cfg, *pmlan_ds_hs_cfg; /** Enable deep sleep mode */ @@ -1984,22 +1984,22 @@ typedef struct _mlan_ds_hs_cfg typedef struct _mlan_ds_auto_ds { /** auto ds mode, 0 - disable, 1 - enable */ - t_u16 auto_ds; + t_u16 auto_ds; /** auto ds idle time in milliseconds */ - t_u16 idletime; + t_u16 idletime; } mlan_ds_auto_ds; /** Type definition of mlan_ds_inactivity_to for MLAN_OID_PM_CFG_INACTIVITY_TO */ typedef struct _mlan_ds_inactivity_to { /** Timeout unit in microsecond, 0 means 1000us (1ms) */ - t_u32 timeout_unit; + t_u32 timeout_unit; /** Inactivity timeout for unicast data */ - t_u32 unicast_timeout; + t_u32 unicast_timeout; /** Inactivity timeout for multicast data */ - t_u32 mcast_timeout; + t_u32 mcast_timeout; /** Timeout for additional Rx traffic after Null PM1 packet exchange */ - t_u32 ps_entry_timeout; + t_u32 ps_entry_timeout; } mlan_ds_inactivity_to, *pmlan_ds_inactivity_to; /** Minimum sleep period in milliseconds */ @@ -2062,58 +2062,58 @@ typedef struct _mlan_ds_inactivity_to typedef struct _mlan_ds_ps_cfg { /** PS null interval in seconds */ - t_u32 ps_null_interval; + t_u32 ps_null_interval; /** Multiple DTIM interval */ - t_u32 multiple_dtim_interval; + t_u32 multiple_dtim_interval; /** Listen interval */ - t_u32 listen_interval; + t_u32 listen_interval; /** Adhoc awake period */ - t_u32 adhoc_awake_period; + t_u32 adhoc_awake_period; /** Beacon miss timeout in milliseconds */ - t_u32 bcn_miss_timeout; + t_u32 bcn_miss_timeout; /** Delay to PS in milliseconds */ - t_s32 delay_to_ps; + t_s32 delay_to_ps; /** PS mode */ - t_u32 ps_mode; + t_u32 ps_mode; } mlan_ds_ps_cfg, *pmlan_ds_ps_cfg; /** Type definition of mlan_ds_sleep_params for MLAN_OID_PM_CFG_SLEEP_PARAMS */ typedef struct _mlan_ds_sleep_params { /** Error */ - t_u32 error; + t_u32 error; /** Offset in microseconds */ - t_u32 offset; + t_u32 offset; /** Stable time in microseconds */ - t_u32 stable_time; + t_u32 stable_time; /** Calibration control */ - t_u32 cal_control; + t_u32 cal_control; /** External sleep clock */ - t_u32 ext_sleep_clk; + t_u32 ext_sleep_clk; /** Reserved */ - t_u32 reserved; + t_u32 reserved; } mlan_ds_sleep_params, *pmlan_ds_sleep_params; /** sleep_param */ typedef struct _ps_sleep_param { /** control bitmap */ - t_u32 ctrl_bitmap; + t_u32 ctrl_bitmap; /** minimum sleep period (micro second) */ - t_u32 min_sleep; + t_u32 min_sleep; /** maximum sleep period (micro second) */ - t_u32 max_sleep; + t_u32 max_sleep; } ps_sleep_param; /** inactivity sleep_param */ typedef struct _inact_sleep_param { /** inactivity timeout (micro second) */ - t_u32 inactivity_to; + t_u32 inactivity_to; /** miniumu awake period (micro second) */ - t_u32 min_awake; + t_u32 min_awake; /** maximum awake period (micro second) */ - t_u32 max_awake; + t_u32 max_awake; } inact_sleep_param; /** flag for ps mode */ @@ -2134,57 +2134,57 @@ typedef struct _inact_sleep_param typedef struct _mlan_ds_ps_mgmt { /** flags for valid field */ - t_u16 flags; + t_u16 flags; /** power mode */ - t_u16 ps_mode; + t_u16 ps_mode; /** sleep param */ - ps_sleep_param sleep_param; + ps_sleep_param sleep_param; /** inactivity sleep param */ - inact_sleep_param inact_param; + inact_sleep_param inact_param; } mlan_ds_ps_mgmt; /** mlan_ds_ps_info */ typedef struct _mlan_ds_ps_info { /** suspend allowed flag */ - t_u32 is_suspend_allowed; + t_u32 is_suspend_allowed; } mlan_ds_ps_info; /** Type definition of mlan_ds_wakeup_reason for MLAN_OID_PM_HS_WAKEUP_REASON */ typedef struct _mlan_ds_hs_wakeup_reason { - t_u16 hs_wakeup_reason; + t_u16 hs_wakeup_reason; } mlan_ds_hs_wakeup_reason; /** Type definition of mlan_ds_pm_cfg for MLAN_IOCTL_PM_CFG */ typedef struct _mlan_ds_pm_cfg { /** Sub-command */ - t_u32 sub_command; + t_u32 sub_command; /** Power management parameter */ - union - { - /** Power saving mode for MLAN_OID_PM_CFG_IEEE_PS */ - t_u32 ps_mode; - /** Host Sleep configuration for MLAN_OID_PM_CFG_HS_CFG */ - mlan_ds_hs_cfg hs_cfg; - /** Deep sleep mode for MLAN_OID_PM_CFG_DEEP_SLEEP */ - mlan_ds_auto_ds auto_deep_sleep; - /** Inactivity timeout for MLAN_OID_PM_CFG_INACTIVITY_TO */ - mlan_ds_inactivity_to inactivity_to; - /** Sleep period for MLAN_OID_PM_CFG_SLEEP_PD */ - t_u32 sleep_period; - /** PS configuration parameters for MLAN_OID_PM_CFG_PS_CFG */ - mlan_ds_ps_cfg ps_cfg; - /** PS configuration parameters for MLAN_OID_PM_CFG_SLEEP_PARAMS */ - mlan_ds_sleep_params sleep_params; - /** PS configuration parameters for MLAN_OID_PM_CFG_PS_MODE */ - mlan_ds_ps_mgmt ps_mgmt; - /** power info for MLAN_OID_PM_INFO */ - mlan_ds_ps_info ps_info; - /** hs wakeup reason for MLAN_OID_PM_HS_WAKEUP_REASON */ - mlan_ds_hs_wakeup_reason wakeup_reason; - } param; + union + { + /** Power saving mode for MLAN_OID_PM_CFG_IEEE_PS */ + t_u32 ps_mode; + /** Host Sleep configuration for MLAN_OID_PM_CFG_HS_CFG */ + mlan_ds_hs_cfg hs_cfg; + /** Deep sleep mode for MLAN_OID_PM_CFG_DEEP_SLEEP */ + mlan_ds_auto_ds auto_deep_sleep; + /** Inactivity timeout for MLAN_OID_PM_CFG_INACTIVITY_TO */ + mlan_ds_inactivity_to inactivity_to; + /** Sleep period for MLAN_OID_PM_CFG_SLEEP_PD */ + t_u32 sleep_period; + /** PS configuration parameters for MLAN_OID_PM_CFG_PS_CFG */ + mlan_ds_ps_cfg ps_cfg; + /** PS configuration parameters for MLAN_OID_PM_CFG_SLEEP_PARAMS */ + mlan_ds_sleep_params sleep_params; + /** PS configuration parameters for MLAN_OID_PM_CFG_PS_MODE */ + mlan_ds_ps_mgmt ps_mgmt; + /** power info for MLAN_OID_PM_INFO */ + mlan_ds_ps_info ps_info; + /** hs wakeup reason for MLAN_OID_PM_HS_WAKEUP_REASON */ + mlan_ds_hs_wakeup_reason wakeup_reason; + } param; } mlan_ds_pm_cfg, *pmlan_ds_pm_cfg; /*-----------------------------------------------------------------*/ @@ -2203,7 +2203,7 @@ typedef struct _mlan_ds_pm_cfg /** * @brief IOCTL structure to send an ADDTS request and retrieve the response. * - * IOCTL structure from the application layer relayed to firmware to + * IOCTL structure from the application layer relayed to firmware to * instigate an ADDTS management frame with an appropriate TSPEC IE as well * as any additional IEs appended in the ADDTS Action frame. * @@ -2211,36 +2211,40 @@ typedef struct _mlan_ds_pm_cfg */ typedef struct { - mlan_cmd_result_e cmd_result; /**< Firmware execution result */ + mlan_cmd_result_e cmd_result; /**< Firmware execution result */ - t_u32 timeout_ms; /**< Timeout value in milliseconds */ - t_u8 ieee_status_code; /**< IEEE status code */ + t_u32 timeout_ms; /**< Timeout value in milliseconds */ + t_u8 ieee_status_code; /**< IEEE status code */ - t_u32 ie_data_len; /**< Length of ie block in ie_data */ - t_u8 ie_data[MLAN_WMM_TSPEC_SIZE /**< TSPEC to send in the ADDTS */ - + MLAN_WMM_ADDTS_EXTRA_IE_BYTES]; /**< Extra IE buf*/ + t_u32 ie_data_len; /**< Length of ie block in ie_data */ + t_u8 ie_data[MLAN_WMM_TSPEC_SIZE + /**< TSPEC to send in the ADDTS */ + + MLAN_WMM_ADDTS_EXTRA_IE_BYTES]; + /**< Extra IE buf*/ } wlan_ioctl_wmm_addts_req_t; /** * @brief IOCTL structure to send a DELTS request. * - * IOCTL structure from the application layer relayed to firmware to + * IOCTL structure from the application layer relayed to firmware to * instigate an DELTS management frame with an appropriate TSPEC IE. * * @sa woal_wmm_delts_req_ioctl */ typedef struct { - mlan_cmd_result_e cmd_result; /**< Firmware execution result */ - t_u8 ieee_reason_code; /**< IEEE reason code sent, unused for WMM */ - t_u32 ie_data_len; /**< Length of ie block in ie_data */ - t_u8 ie_data[MLAN_WMM_TSPEC_SIZE]; /**< TSPEC to send in the DELTS */ + mlan_cmd_result_e cmd_result; + /**< Firmware execution result */ + t_u8 ieee_reason_code; /**< IEEE reason code sent, unused for WMM */ + t_u32 ie_data_len; /**< Length of ie block in ie_data */ + t_u8 ie_data[MLAN_WMM_TSPEC_SIZE]; + /**< TSPEC to send in the DELTS */ } wlan_ioctl_wmm_delts_req_t; /** * @brief IOCTL structure to configure a specific AC Queue's parameters * - * IOCTL structure from the application layer relayed to firmware to + * IOCTL structure from the application layer relayed to firmware to * get, set, or default the WMM AC queue parameters. * * - msdu_lifetime_expiry is ignored if set to 0 on a set command @@ -2249,10 +2253,10 @@ typedef struct */ typedef struct { - mlan_wmm_queue_config_action_e action; /**< Set, Get, or Default */ - mlan_wmm_ac_e access_category; /**< WMM_AC_BK(0) to WMM_AC_VO(3) */ - t_u16 msdu_lifetime_expiry; /**< lifetime expiry in TUs */ - t_u8 supported_rates[10]; /**< Not supported yet */ + mlan_wmm_queue_config_action_e action;/**< Set, Get, or Default */ + mlan_wmm_ac_e access_category; /**< WMM_AC_BK(0) to WMM_AC_VO(3) */ + t_u16 msdu_lifetime_expiry; /**< lifetime expiry in TUs */ + t_u8 supported_rates[10]; /**< Not supported yet */ } wlan_ioctl_wmm_queue_config_t; /** @@ -2267,21 +2271,21 @@ typedef struct typedef struct { /** Action of Queue Config : Start, Stop, or Get */ - mlan_wmm_queue_stats_action_e action; + mlan_wmm_queue_stats_action_e action; /** User Priority */ - t_u8 user_priority; + t_u8 user_priority; /** Number of successful packets transmitted */ - t_u16 pkt_count; + t_u16 pkt_count; /** Packets lost; not included in pkt_count */ - t_u16 pkt_loss; + t_u16 pkt_loss; /** Average Queue delay in microseconds */ - t_u32 avg_queue_delay; + t_u32 avg_queue_delay; /** Average Transmission delay in microseconds */ - t_u32 avg_tx_delay; + t_u32 avg_tx_delay; /** Calculated used time in units of 32 microseconds */ - t_u16 used_time; + t_u16 used_time; /** Calculated policed time in units of 32 microseconds */ - t_u16 policed_time; + t_u16 policed_time; /** Queue Delay Histogram; number of packets per queue delay range * * [0] - 0ms <= delay < 5ms @@ -2292,24 +2296,24 @@ typedef struct * [5] - 40ms <= delay < 50ms * [6] - 50ms <= delay < msduLifetime (TUs) */ - t_u16 delay_histogram[MLAN_WMM_STATS_PKTS_HIST_BINS]; + t_u16 delay_histogram[MLAN_WMM_STATS_PKTS_HIST_BINS]; } wlan_ioctl_wmm_queue_stats_t, /** Type definition of mlan_ds_wmm_queue_stats for MLAN_OID_WMM_CFG_QUEUE_STATS */ - mlan_ds_wmm_queue_stats, *pmlan_ds_wmm_queue_stats; + mlan_ds_wmm_queue_stats, *pmlan_ds_wmm_queue_stats; -/** +/** * @brief IOCTL sub structure for a specific WMM AC Status */ typedef struct { /** WMM Acm */ - t_u8 wmm_acm; + t_u8 wmm_acm; /** Flow required flag */ - t_u8 flow_required; + t_u8 flow_required; /** Flow created flag */ - t_u8 flow_created; + t_u8 flow_created; /** Disabled flag */ - t_u8 disabled; + t_u8 disabled; } wlan_ioctl_wmm_queue_status_ac_t; /** @@ -2324,79 +2328,79 @@ typedef struct typedef struct { /** WMM AC queue status */ - wlan_ioctl_wmm_queue_status_ac_t ac_status[MLAN_WMM_MAX_AC_QUEUES]; + wlan_ioctl_wmm_queue_status_ac_t ac_status[MLAN_WMM_MAX_AC_QUEUES]; } wlan_ioctl_wmm_queue_status_t, /** Type definition of mlan_ds_wmm_queue_status for MLAN_OID_WMM_CFG_QUEUE_STATUS */ - mlan_ds_wmm_queue_status, *pmlan_ds_wmm_queue_status; + mlan_ds_wmm_queue_status, *pmlan_ds_wmm_queue_status; /** Type definition of mlan_ds_wmm_addts for MLAN_OID_WMM_CFG_ADDTS */ typedef struct _mlan_ds_wmm_addts { /** Result of ADDTS request */ - mlan_cmd_result_e result; + mlan_cmd_result_e result; /** Timeout value in milliseconds */ - t_u32 timeout; + t_u32 timeout; /** IEEE status code */ - t_u32 status_code; + t_u32 status_code; /** Dialog token */ - t_u8 dialog_tok; + t_u8 dialog_tok; /** TSPEC data length */ - t_u8 ie_data_len; + t_u8 ie_data_len; /** TSPEC to send in the ADDTS + buffering for any extra IEs */ - t_u8 ie_data[MLAN_WMM_TSPEC_SIZE + MLAN_WMM_ADDTS_EXTRA_IE_BYTES]; + t_u8 ie_data[MLAN_WMM_TSPEC_SIZE + MLAN_WMM_ADDTS_EXTRA_IE_BYTES]; } mlan_ds_wmm_addts, *pmlan_ds_wmm_addts; /** Type definition of mlan_ds_wmm_delts for MLAN_OID_WMM_CFG_DELTS */ typedef struct _mlan_ds_wmm_delts { /** Result of DELTS request */ - mlan_cmd_result_e result; + mlan_cmd_result_e result; /** IEEE status code */ - t_u32 status_code; + t_u32 status_code; /** TSPEC data length */ - t_u8 ie_data_len; + t_u8 ie_data_len; /** TSPEC to send in the DELTS */ - t_u8 ie_data[MLAN_WMM_TSPEC_SIZE]; + t_u8 ie_data[MLAN_WMM_TSPEC_SIZE]; } mlan_ds_wmm_delts, *pmlan_ds_wmm_delts; /** Type definition of mlan_ds_wmm_queue_config for MLAN_OID_WMM_CFG_QUEUE_CONFIG */ typedef struct _mlan_ds_wmm_queue_config { /** Action of Queue Config : Set, Get, or Default */ - mlan_wmm_queue_config_action_e action; + mlan_wmm_queue_config_action_e action; /** WMM Access Category: WMM_AC_BK(0) to WMM_AC_VO(3) */ - mlan_wmm_ac_e access_category; + mlan_wmm_ac_e access_category; /** Lifetime expiry in TUs */ - t_u16 msdu_lifetime_expiry; + t_u16 msdu_lifetime_expiry; /** Reserve for future use */ - t_u8 reserved[10]; + t_u8 reserved[10]; } mlan_ds_wmm_queue_config, *pmlan_ds_wmm_queue_config; /** Type definition of mlan_ds_wmm_cfg for MLAN_IOCTL_WMM_CFG */ typedef struct _mlan_ds_wmm_cfg { /** Sub-command */ - t_u32 sub_command; + t_u32 sub_command; /** WMM configuration parameter */ - union - { - /** WMM enable for MLAN_OID_WMM_CFG_ENABLE */ - t_u32 wmm_enable; - /** QoS configuration for MLAN_OID_WMM_CFG_QOS */ - t_u8 qos_cfg; - /** WMM add TS for MLAN_OID_WMM_CFG_ADDTS */ - mlan_ds_wmm_addts addts; - /** WMM delete TS for MLAN_OID_WMM_CFG_DELTS */ - mlan_ds_wmm_delts delts; - /** WMM queue configuration for MLAN_OID_WMM_CFG_QUEUE_CONFIG */ - mlan_ds_wmm_queue_config q_cfg; - /** WMM queue status for MLAN_OID_WMM_CFG_QUEUE_STATS */ - mlan_ds_wmm_queue_stats q_stats; - /** WMM queue status for MLAN_OID_WMM_CFG_QUEUE_STATUS */ - mlan_ds_wmm_queue_status q_status; - /** WMM TS status for MLAN_OID_WMM_CFG_TS_STATUS */ - mlan_ds_wmm_ts_status ts_status; - } param; + union + { + /** WMM enable for MLAN_OID_WMM_CFG_ENABLE */ + t_u32 wmm_enable; + /** QoS configuration for MLAN_OID_WMM_CFG_QOS */ + t_u8 qos_cfg; + /** WMM add TS for MLAN_OID_WMM_CFG_ADDTS */ + mlan_ds_wmm_addts addts; + /** WMM delete TS for MLAN_OID_WMM_CFG_DELTS */ + mlan_ds_wmm_delts delts; + /** WMM queue configuration for MLAN_OID_WMM_CFG_QUEUE_CONFIG */ + mlan_ds_wmm_queue_config q_cfg; + /** WMM queue status for MLAN_OID_WMM_CFG_QUEUE_STATS */ + mlan_ds_wmm_queue_stats q_stats; + /** WMM queue status for MLAN_OID_WMM_CFG_QUEUE_STATUS */ + mlan_ds_wmm_queue_status q_status; + /** WMM TS status for MLAN_OID_WMM_CFG_TS_STATUS */ + mlan_ds_wmm_ts_status ts_status; + } param; } mlan_ds_wmm_cfg, *pmlan_ds_wmm_cfg; /*-----------------------------------------------------------------*/ @@ -2405,21 +2409,21 @@ typedef struct _mlan_ds_wmm_cfg /** Enumeration for WPS session */ enum _mlan_wps_status { - MLAN_WPS_CFG_SESSION_START = 1, - MLAN_WPS_CFG_SESSION_END = 0 + MLAN_WPS_CFG_SESSION_START = 1, + MLAN_WPS_CFG_SESSION_END = 0 }; /** Type definition of mlan_ds_wps_cfg for MLAN_IOCTL_WPS_CFG */ typedef struct _mlan_ds_wps_cfg { /** Sub-command */ - t_u32 sub_command; + t_u32 sub_command; /** WPS configuration parameter */ - union - { - /** WPS session for MLAN_OID_WPS_CFG_SESSION */ - t_u32 wps_session; - } param; + union + { + /** WPS session for MLAN_OID_WPS_CFG_SESSION */ + t_u32 wps_session; + } param; } mlan_ds_wps_cfg, *pmlan_ds_wps_cfg; /*-----------------------------------------------------------------*/ @@ -2443,37 +2447,37 @@ typedef struct _mlan_ds_wps_cfg typedef struct _mlan_ds_11n_htcap_cfg { /** HT Capability information */ - t_u32 htcap; + t_u32 htcap; /** Band selection */ - t_u32 misc_cfg; + t_u32 misc_cfg; /** Hardware HT cap information required */ - t_u32 hw_cap_req; + t_u32 hw_cap_req; } mlan_ds_11n_htcap_cfg, *pmlan_ds_11n_htcap_cfg; /** Type definition of mlan_ds_11n_addba_param for MLAN_OID_11N_CFG_ADDBA_PARAM */ typedef struct _mlan_ds_11n_addba_param { /** Timeout */ - t_u32 timeout; + t_u32 timeout; /** Buffer size for ADDBA request */ - t_u32 txwinsize; + t_u32 txwinsize; /** Buffer size for ADDBA response */ - t_u32 rxwinsize; + t_u32 rxwinsize; /** amsdu for ADDBA request */ - t_u8 txamsdu; + t_u8 txamsdu; /** amsdu for ADDBA response */ - t_u8 rxamsdu; + t_u8 rxamsdu; } mlan_ds_11n_addba_param, *pmlan_ds_11n_addba_param; /** Type definition of mlan_ds_11n_tx_cfg for MLAN_OID_11N_CFG_TX */ typedef struct _mlan_ds_11n_tx_cfg { /** HTTxCap */ - t_u16 httxcap; + t_u16 httxcap; /** HTTxInfo */ - t_u16 httxinfo; + t_u16 httxinfo; /** Band selection */ - t_u32 misc_cfg; + t_u32 misc_cfg; } mlan_ds_11n_tx_cfg, *pmlan_ds_11n_tx_cfg; /** BF Global Configuration */ @@ -2496,101 +2500,101 @@ typedef struct _mlan_ds_11n_tx_cfg typedef struct _mlan_bf_global_cfg_args { /** Global enable/disable bf */ - t_u8 bf_enbl; + t_u8 bf_enbl; /** Global enable/disable sounding */ - t_u8 sounding_enbl; + t_u8 sounding_enbl; /** FB Type */ - t_u8 fb_type; + t_u8 fb_type; /** SNR Threshold */ - t_u8 snr_threshold; + t_u8 snr_threshold; /** Sounding interval in milliseconds */ - t_u16 sounding_interval; + t_u16 sounding_interval; /** BF mode */ - t_u8 bf_mode; + t_u8 bf_mode; /** Reserved */ - t_u8 reserved; + t_u8 reserved; } mlan_bf_global_cfg_args; /** trigger sounding args */ typedef struct _mlan_trigger_sound_args { /** Peer MAC address */ - t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; + t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; /** Status */ - t_u8 status; + t_u8 status; } mlan_trigger_sound_args; /** bf periodicity args */ typedef struct _mlan_bf_periodicity_args { /** Peer MAC address */ - t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; + t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; /** Current Tx BF Interval in milliseconds */ - t_u16 interval; + t_u16 interval; /** Status */ - t_u8 status; + t_u8 status; } mlan_bf_periodicity_args; /** tx bf peer args */ typedef struct _mlan_tx_bf_peer_args { /** Peer MAC address */ - t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; + t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; /** Reserved */ - t_u16 reserved; + t_u16 reserved; /** Enable/Disable Beamforming */ - t_u8 bf_enbl; + t_u8 bf_enbl; /** Enable/Disable sounding */ - t_u8 sounding_enbl; + t_u8 sounding_enbl; /** FB Type */ - t_u8 fb_type; + t_u8 fb_type; } mlan_tx_bf_peer_args; /** SNR threshold args */ typedef struct _mlan_snr_thr_args { /** Peer MAC address */ - t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; + t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; /** SNR for peer */ - t_u8 snr; + t_u8 snr; } mlan_snr_thr_args; /** Type definition of mlan_ds_11n_tx_bf_cfg for MLAN_OID_11N_CFG_TX_BF_CFG */ typedef struct _mlan_ds_11n_tx_bf_cfg { /** BF Action */ - t_u16 bf_action; + t_u16 bf_action; /** Action */ - t_u16 action; + t_u16 action; /** Number of peers */ - t_u32 no_of_peers; - union - { - mlan_bf_global_cfg_args bf_global_cfg; - mlan_trigger_sound_args bf_sound[MAX_PEER_MAC_TUPLES]; - mlan_bf_periodicity_args bf_periodicity[MAX_PEER_MAC_TUPLES]; - mlan_tx_bf_peer_args tx_bf_peer[MAX_PEER_MAC_TUPLES]; - mlan_snr_thr_args bf_snr[MAX_PEER_MAC_TUPLES]; - } body; + t_u32 no_of_peers; + union + { + mlan_bf_global_cfg_args bf_global_cfg; + mlan_trigger_sound_args bf_sound[MAX_PEER_MAC_TUPLES]; + mlan_bf_periodicity_args bf_periodicity[MAX_PEER_MAC_TUPLES]; + mlan_tx_bf_peer_args tx_bf_peer[MAX_PEER_MAC_TUPLES]; + mlan_snr_thr_args bf_snr[MAX_PEER_MAC_TUPLES]; + } body; } mlan_ds_11n_tx_bf_cfg, *pmlan_ds_11n_tx_bf_cfg; -/** Type definition of mlan_ds_11n_amsdu_aggr_ctrl for +/** Type definition of mlan_ds_11n_amsdu_aggr_ctrl for * MLAN_OID_11N_AMSDU_AGGR_CTRL*/ typedef struct _mlan_ds_11n_amsdu_aggr_ctrl { /** Enable/Disable */ - t_u16 enable; + t_u16 enable; /** Current AMSDU size valid */ - t_u16 curr_buf_size; + t_u16 curr_buf_size; } mlan_ds_11n_amsdu_aggr_ctrl, *pmlan_ds_11n_amsdu_aggr_ctrl; /** Type definition of mlan_ds_11n_aggr_prio_tbl for MLAN_OID_11N_CFG_AGGR_PRIO_TBL */ typedef struct _mlan_ds_11n_aggr_prio_tbl { /** ampdu priority table */ - t_u8 ampdu[MAX_NUM_TID]; + t_u8 ampdu[MAX_NUM_TID]; /** amsdu priority table */ - t_u8 amsdu[MAX_NUM_TID]; + t_u8 amsdu[MAX_NUM_TID]; } mlan_ds_11n_aggr_prio_tbl, *pmlan_ds_11n_aggr_prio_tbl; /** DelBA All TIDs */ @@ -2604,11 +2608,11 @@ typedef struct _mlan_ds_11n_aggr_prio_tbl typedef struct _mlan_ds_11n_delba { /** TID */ - t_u8 tid; + t_u8 tid; /** Peer MAC address */ - t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; /** Direction (Tx: bit 0, Rx: bit 1) */ - t_u8 direction; + t_u8 direction; } mlan_ds_11n_delba, *pmlan_ds_11n_delba; /** Type definition of mlan_ds_delba for MLAN_OID_11N_CFG_REJECT_ADDBA_REQ */ @@ -2618,44 +2622,44 @@ typedef struct _mlan_ds_reject_addba_req * Bit1 : auto reconnect enabled * Others : reserved */ - t_u32 conditions; + t_u32 conditions; } mlan_ds_reject_addba_req, *pmlan_ds_reject_addba_req; /** Type definition of mlan_ds_11n_cfg for MLAN_IOCTL_11N_CFG */ typedef struct _mlan_ds_11n_cfg { /** Sub-command */ - t_u32 sub_command; + t_u32 sub_command; /** 802.11n configuration parameter */ - union - { - /** Tx param for 11n for MLAN_OID_11N_CFG_TX */ - mlan_ds_11n_tx_cfg tx_cfg; - /** Aggr priority table for MLAN_OID_11N_CFG_AGGR_PRIO_TBL */ - mlan_ds_11n_aggr_prio_tbl aggr_prio_tbl; - /** Add BA param for MLAN_OID_11N_CFG_ADDBA_PARAM */ - mlan_ds_11n_addba_param addba_param; - /** Add BA Reject paramters for MLAN_OID_11N_CFG_ADDBA_REJECT */ - t_u8 addba_reject[MAX_NUM_TID]; - /** Tx buf size for MLAN_OID_11N_CFG_MAX_TX_BUF_SIZE */ - t_u32 tx_buf_size; - /** HT cap info configuration for MLAN_OID_11N_HTCAP_CFG */ - mlan_ds_11n_htcap_cfg htcap_cfg; - /** Tx param for 11n for MLAN_OID_11N_AMSDU_AGGR_CTRL */ - mlan_ds_11n_amsdu_aggr_ctrl amsdu_aggr_ctrl; - /** Supported MCS Set field */ - t_u8 supported_mcs_set[NUM_MCS_FIELD]; - /** Transmit Beamforming Capabilities field */ - t_u32 tx_bf_cap; - /** Transmit Beamforming configuration */ - mlan_ds_11n_tx_bf_cfg tx_bf; - /** HT stream configuration */ - t_u32 stream_cfg; - /** DelBA for MLAN_OID_11N_CFG_DELBA */ - mlan_ds_11n_delba del_ba; - /** Reject Addba Req for MLAN_OID_11N_CFG_REJECT_ADDBA_REQ */ - mlan_ds_reject_addba_req reject_addba_req; - } param; + union + { + /** Tx param for 11n for MLAN_OID_11N_CFG_TX */ + mlan_ds_11n_tx_cfg tx_cfg; + /** Aggr priority table for MLAN_OID_11N_CFG_AGGR_PRIO_TBL */ + mlan_ds_11n_aggr_prio_tbl aggr_prio_tbl; + /** Add BA param for MLAN_OID_11N_CFG_ADDBA_PARAM */ + mlan_ds_11n_addba_param addba_param; + /** Add BA Reject paramters for MLAN_OID_11N_CFG_ADDBA_REJECT */ + t_u8 addba_reject[MAX_NUM_TID]; + /** Tx buf size for MLAN_OID_11N_CFG_MAX_TX_BUF_SIZE */ + t_u32 tx_buf_size; + /** HT cap info configuration for MLAN_OID_11N_HTCAP_CFG */ + mlan_ds_11n_htcap_cfg htcap_cfg; + /** Tx param for 11n for MLAN_OID_11N_AMSDU_AGGR_CTRL */ + mlan_ds_11n_amsdu_aggr_ctrl amsdu_aggr_ctrl; + /** Supported MCS Set field */ + t_u8 supported_mcs_set[NUM_MCS_FIELD]; + /** Transmit Beamforming Capabilities field */ + t_u32 tx_bf_cap; + /** Transmit Beamforming configuration */ + mlan_ds_11n_tx_bf_cfg tx_bf; + /** HT stream configuration */ + t_u32 stream_cfg; + /** DelBA for MLAN_OID_11N_CFG_DELBA */ + mlan_ds_11n_delba del_ba; + /** Reject Addba Req for MLAN_OID_11N_CFG_REJECT_ADDBA_REQ */ + mlan_ds_reject_addba_req reject_addba_req; + } param; } mlan_ds_11n_cfg, *pmlan_ds_11n_cfg; #define NUM_MCS_SUPP 20 @@ -2665,24 +2669,24 @@ typedef struct _mlan_ds_11n_cfg typedef struct _mlan_ds_11ac_vhtcap_cfg { /** HT Capability information */ - t_u32 vhtcap; + t_u32 vhtcap; /** Band selection */ - t_u32 misc_cfg; + t_u32 misc_cfg; /** Hardware HT cap information required */ - t_u32 hw_cap_req; + t_u32 hw_cap_req; } mlan_ds_11ac_vhtcap_cfg, *pmlan_ds_11ac_vhtcap_cfg; /** Type definition of mlan_ds_11ac_tx_cfg for MLAN_OID_11AC_CFG_TX */ typedef struct _mlan_ds_11ac_tx_cfg { /** Band selection */ - t_u8 band_cfg; + t_u8 band_cfg; /** misc configuration */ - t_u8 misc_cfg; + t_u8 misc_cfg; /** HTTxCap */ - t_u16 vhttxcap; + t_u16 vhttxcap; /** HTTxInfo */ - t_u16 vhttxinfo; + t_u16 vhttxinfo; } mlan_ds_11ac_tx_cfg, *pmlan_ds_11ac_tx_cfg; /** Tx */ @@ -2696,32 +2700,32 @@ typedef struct _mlan_ds_11ac_tx_cfg typedef struct _mlan_ds_11ac_vht_cfg { /** Band selection (1: 2.4G, 2: 5 G, 3: both 2.4G and 5G) */ - t_u32 band; + t_u32 band; /** TxRx (1: Tx, 2: Rx, 3: both Tx and Rx) */ - t_u32 txrx; + t_u32 txrx; /** BW CFG (0: 11N CFG, 1: vhtcap) */ - t_u32 bwcfg; + t_u32 bwcfg; /** VHT capabilities. */ - t_u32 vht_cap_info; + t_u32 vht_cap_info; /** VHT Tx mcs */ - t_u32 vht_tx_mcs; + t_u32 vht_tx_mcs; /** VHT Rx mcs */ - t_u32 vht_rx_mcs; + t_u32 vht_rx_mcs; } mlan_ds_11ac_vht_cfg, *pmlan_ds_11ac_vht_cfg; /** Type definition of mlan_ds_11ac_cfg for MLAN_IOCTL_11AC_CFG */ typedef struct _mlan_ds_11ac_cfg { /** Sub-command */ - t_u32 sub_command; + t_u32 sub_command; /** 802.11n configuration parameter */ - union - { - /** VHT configuration for MLAN_OID_11AC_VHT_CFG */ - mlan_ds_11ac_vht_cfg vht_cfg; - /** Supported MCS Set field */ - t_u8 supported_mcs_set[NUM_MCS_SUPP]; - } param; + union + { + /** VHT configuration for MLAN_OID_11AC_VHT_CFG */ + mlan_ds_11ac_vht_cfg vht_cfg; + /** Supported MCS Set field */ + t_u8 supported_mcs_set[NUM_MCS_SUPP]; + } param; } mlan_ds_11ac_cfg, *pmlan_ds_11ac_cfg; /** Country code length */ @@ -2738,24 +2742,24 @@ typedef struct _mlan_ds_11ac_cfg typedef struct _mlan_ds_subband_set_t { /** First channel */ - t_u8 first_chan; + t_u8 first_chan; /** Number of channels */ - t_u8 no_of_chan; + t_u8 no_of_chan; /** Maximum Tx power in dBm */ - t_u8 max_tx_pwr; + t_u8 max_tx_pwr; } mlan_ds_subband_set_t; /** Domain regulatory information */ typedef struct _mlan_ds_11d_domain_info { /** Country Code */ - t_u8 country_code[COUNTRY_CODE_LEN]; + t_u8 country_code[COUNTRY_CODE_LEN]; /** Band that channels in sub_band belong to */ - t_u8 band; + t_u8 band; /** No. of subband in below */ - t_u8 no_of_sub_band; + t_u8 no_of_sub_band; /** Subband data to send/last sent */ - mlan_ds_subband_set_t sub_band[MRVDRV_MAX_SUBBAND_802_11D]; + mlan_ds_subband_set_t sub_band[MRVDRV_MAX_SUBBAND_802_11D]; } mlan_ds_11d_domain_info; #endif @@ -2763,21 +2767,21 @@ typedef struct _mlan_ds_11d_domain_info typedef struct _mlan_ds_11d_cfg { /** Sub-command */ - t_u32 sub_command; + t_u32 sub_command; /** 802.11d configuration parameter */ - union - { + union + { #ifdef STA_SUPPORT - /** Enable for MLAN_OID_11D_CFG_ENABLE */ - t_u32 enable_11d; - /** Domain info for MLAN_OID_11D_DOMAIN_INFO */ - mlan_ds_11d_domain_info domain_info; -#endif /* STA_SUPPORT */ + /** Enable for MLAN_OID_11D_CFG_ENABLE */ + t_u32 enable_11d; + /** Domain info for MLAN_OID_11D_DOMAIN_INFO */ + mlan_ds_11d_domain_info domain_info; +#endif /* STA_SUPPORT */ #ifdef UAP_SUPPORT - /** tlv data for MLAN_OID_11D_DOMAIN_INFO */ - t_u8 domain_tlv[MAX_IE_SIZE]; -#endif /* UAP_SUPPORT */ - } param; + /** tlv data for MLAN_OID_11D_DOMAIN_INFO */ + t_u8 domain_tlv[MAX_IE_SIZE]; +#endif /* UAP_SUPPORT */ + } param; } mlan_ds_11d_cfg, *pmlan_ds_11d_cfg; /*-----------------------------------------------------------------*/ @@ -2786,21 +2790,21 @@ typedef struct _mlan_ds_11d_cfg /** Enumeration for register type */ enum _mlan_reg_type { - MLAN_REG_MAC = 1, - MLAN_REG_BBP, - MLAN_REG_RF, - MLAN_REG_CAU = 5, + MLAN_REG_MAC = 1, + MLAN_REG_BBP, + MLAN_REG_RF, + MLAN_REG_CAU = 5, }; /** Type definition of mlan_ds_reg_rw for MLAN_OID_REG_RW */ typedef struct _mlan_ds_reg_rw { /** Register type */ - t_u32 type; + t_u32 type; /** Offset */ - t_u32 offset; + t_u32 offset; /** Value */ - t_u32 value; + t_u32 value; } mlan_ds_reg_rw; /** Maximum EEPROM data */ @@ -2810,37 +2814,37 @@ typedef struct _mlan_ds_reg_rw typedef struct _mlan_ds_read_eeprom { /** Multiples of 4 */ - t_u16 offset; + t_u16 offset; /** Number of bytes */ - t_u16 byte_count; + t_u16 byte_count; /** Value */ - t_u8 value[MAX_EEPROM_DATA]; + t_u8 value[MAX_EEPROM_DATA]; } mlan_ds_read_eeprom; /** Type definition of mlan_ds_mem_rw for MLAN_OID_MEM_RW */ typedef struct _mlan_ds_mem_rw { /** Address */ - t_u32 addr; + t_u32 addr; /** Value */ - t_u32 value; + t_u32 value; } mlan_ds_mem_rw; /** Type definition of mlan_ds_reg_mem for MLAN_IOCTL_REG_MEM */ typedef struct _mlan_ds_reg_mem { /** Sub-command */ - t_u32 sub_command; + t_u32 sub_command; /** Register memory access parameter */ - union - { - /** Register access for MLAN_OID_REG_RW */ - mlan_ds_reg_rw reg_rw; - /** EEPROM access for MLAN_OID_EEPROM_RD */ - mlan_ds_read_eeprom rd_eeprom; - /** Memory access for MLAN_OID_MEM_RW */ - mlan_ds_mem_rw mem_rw; - } param; + union + { + /** Register access for MLAN_OID_REG_RW */ + mlan_ds_reg_rw reg_rw; + /** EEPROM access for MLAN_OID_EEPROM_RD */ + mlan_ds_read_eeprom rd_eeprom; + /** Memory access for MLAN_OID_MEM_RW */ + mlan_ds_mem_rw mem_rw; + } param; } mlan_ds_reg_mem, *pmlan_ds_reg_mem; /*-----------------------------------------------------------------*/ @@ -2855,13 +2859,13 @@ typedef struct _mlan_ds_reg_mem typedef struct _mlan_ds_11h_dfs_testing { /** User-configured CAC period in milliseconds, 0 to use default */ - t_u16 usr_cac_period_msec; + t_u16 usr_cac_period_msec; /** User-configured NOP period in seconds, 0 to use default */ - t_u16 usr_nop_period_sec; + t_u16 usr_nop_period_sec; /** User-configured skip channel change, 0 to disable */ - t_u8 usr_no_chan_change; + t_u8 usr_no_chan_change; /** User-configured fixed channel to change to, 0 to use random channel */ - t_u8 usr_fixed_new_chan; + t_u8 usr_fixed_new_chan; } mlan_ds_11h_dfs_testing, *pmlan_ds_11h_dfs_testing; #endif @@ -2869,16 +2873,16 @@ typedef struct _mlan_ds_11h_dfs_testing typedef struct _mlan_ds_11h_cfg { /** Sub-command */ - t_u32 sub_command; - union - { - /** Local power constraint for MLAN_OID_11H_LOCAL_POWER_CONSTRAINT */ - t_s8 usr_local_power_constraint; + t_u32 sub_command; + union + { + /** Local power constraint for MLAN_OID_11H_LOCAL_POWER_CONSTRAINT */ + t_s8 usr_local_power_constraint; #if defined(DFS_TESTING_SUPPORT) - /** User-configuation for MLAN_OID_11H_DFS_TESTING */ - mlan_ds_11h_dfs_testing dfs_testing; + /** User-configuation for MLAN_OID_11H_DFS_TESTING */ + mlan_ds_11h_dfs_testing dfs_testing; #endif - } param; + } param; } mlan_ds_11h_cfg, *pmlan_ds_11h_cfg; /*-----------------------------------------------------------------*/ @@ -2896,9 +2900,9 @@ typedef struct _mlan_ds_11h_cfg /** Enumeration for IE type */ enum _mlan_ie_type { - MLAN_IE_TYPE_GEN_IE = 0, + MLAN_IE_TYPE_GEN_IE = 0, #ifdef STA_SUPPORT - MLAN_IE_TYPE_ARP_FILTER, + MLAN_IE_TYPE_ARP_FILTER, #endif /* STA_SUPPORT */ }; @@ -2906,11 +2910,11 @@ enum _mlan_ie_type typedef struct _mlan_ds_misc_gen_ie { /** IE type */ - t_u32 type; + t_u32 type; /** IE length */ - t_u32 len; + t_u32 len; /** IE buffer */ - t_u8 ie_data[MAX_IE_SIZE]; + t_u8 ie_data[MAX_IE_SIZE]; } mlan_ds_misc_gen_ie; #if defined(SDIO_MULTI_PORT_TX_AGGR) || defined(SDIO_MULTI_PORT_RX_AGGR) @@ -2918,17 +2922,17 @@ typedef struct _mlan_ds_misc_gen_ie typedef struct _mlan_ds_misc_sdio_mpa_ctrl { /** SDIO MP-A TX enable/disable */ - t_u16 tx_enable; + t_u16 tx_enable; /** SDIO MP-A RX enable/disable */ - t_u16 rx_enable; + t_u16 rx_enable; /** SDIO MP-A TX buf size */ - t_u16 tx_buf_size; + t_u16 tx_buf_size; /** SDIO MP-A RX buf size */ - t_u16 rx_buf_size; + t_u16 rx_buf_size; /** SDIO MP-A TX Max Ports */ - t_u16 tx_max_ports; + t_u16 tx_max_ports; /** SDIO MP-A RX Max Ports */ - t_u16 rx_max_ports; + t_u16 rx_max_ports; } mlan_ds_misc_sdio_mpa_ctrl; #endif @@ -2936,9 +2940,9 @@ typedef struct _mlan_ds_misc_sdio_mpa_ctrl typedef struct _mlan_ds_misc_cmd { /** Command length */ - t_u32 len; + t_u32 len; /** Command buffer */ - t_u8 cmd[MLAN_SIZE_OF_CMD_BUFFER]; + t_u8 cmd[MLAN_SIZE_OF_CMD_BUFFER]; } mlan_ds_misc_cmd; /** Maximum number of system clocks */ @@ -2953,13 +2957,13 @@ typedef struct _mlan_ds_misc_cmd typedef struct _mlan_ds_misc_sys_clock { /** Current system clock */ - t_u16 cur_sys_clk; + t_u16 cur_sys_clk; /** Clock type */ - t_u16 sys_clk_type; + t_u16 sys_clk_type; /** Number of clocks */ - t_u16 sys_clk_num; + t_u16 sys_clk_num; /** System clocks */ - t_u16 sys_clk[MLAN_MAX_CLK_NUM]; + t_u16 sys_clk[MLAN_MAX_CLK_NUM]; } mlan_ds_misc_sys_clock; /** Maximum response buffer length */ @@ -2969,25 +2973,25 @@ typedef struct _mlan_ds_misc_sys_clock typedef struct _mlan_ds_misc_assoc_rsp { /** Associate response buffer */ - t_u8 assoc_resp_buf[ASSOC_RSP_BUF_SIZE]; + t_u8 assoc_resp_buf[ASSOC_RSP_BUF_SIZE]; /** Response buffer length */ - t_u32 assoc_resp_len; + t_u32 assoc_resp_len; } mlan_ds_misc_assoc_rsp; /** Enumeration for function init/shutdown */ enum _mlan_func_cmd { - MLAN_FUNC_INIT = 1, - MLAN_FUNC_SHUTDOWN, + MLAN_FUNC_INIT = 1, + MLAN_FUNC_SHUTDOWN, }; /** Type definition of mlan_ds_misc_tx_datapause for MLAN_OID_MISC_TX_DATAPAUSE */ typedef struct _mlan_ds_misc_tx_datapause { /** Tx data pause flag */ - t_u16 tx_pause; + t_u16 tx_pause; /** Max number of Tx buffers for all PS clients */ - t_u16 tx_buf_cnt; + t_u16 tx_buf_cnt; } mlan_ds_misc_tx_datapause; /** IP address length */ @@ -3009,13 +3013,13 @@ typedef struct _mlan_ds_misc_tx_datapause typedef struct _mlan_ds_misc_ipaddr_cfg { /** Operation code */ - t_u32 op_code; + t_u32 op_code; /** IP address type */ - t_u32 ip_addr_type; + t_u32 ip_addr_type; /** Number of IP */ - t_u32 ip_addr_num; + t_u32 ip_addr_num; /** IP address */ - t_u8 ip_addr[MAX_IPADDR][IPADDR_LEN]; + t_u8 ip_addr[MAX_IPADDR][IPADDR_LEN]; } mlan_ds_misc_ipaddr_cfg; /* MEF configuration disable */ @@ -3031,29 +3035,29 @@ typedef struct _mlan_ds_misc_ipaddr_cfg typedef struct _mlan_ds_misc_mef_cfg { /** Sub-ID for operation */ - t_u32 sub_id; + t_u32 sub_id; /** Parameter according to sub-ID */ - union - { - /** MEF command buffer for MEF_CFG_HOSTCMD */ - mlan_ds_misc_cmd cmd_buf; - } param; + union + { + /** MEF command buffer for MEF_CFG_HOSTCMD */ + mlan_ds_misc_cmd cmd_buf; + } param; } mlan_ds_misc_mef_cfg; /** Type definition of mlan_ds_misc_cfp_code for MLAN_OID_MISC_CFP_CODE */ typedef struct _mlan_ds_misc_cfp_code { /** CFP table code for 2.4GHz */ - t_u32 cfp_code_bg; + t_u32 cfp_code_bg; /** CFP table code for 5GHz */ - t_u32 cfp_code_a; + t_u32 cfp_code_a; } mlan_ds_misc_cfp_code; /** Type definition of mlan_ds_misc_country_code for MLAN_OID_MISC_COUNTRY_CODE */ typedef struct _mlan_ds_misc_country_code { /** Country Code */ - t_u8 country_code[COUNTRY_CODE_LEN]; + t_u8 country_code[COUNTRY_CODE_LEN]; } mlan_ds_misc_country_code; /** action for set */ @@ -3091,63 +3095,63 @@ typedef struct _mlan_ds_misc_country_code typedef struct _mlan_ds_subscribe_evt { /** evt action */ - t_u16 evt_action; + t_u16 evt_action; /** bitmap for subscribe event */ - t_u16 evt_bitmap; + t_u16 evt_bitmap; /** Absolute value of RSSI threshold value (dBm) */ - t_u8 low_rssi; + t_u8 low_rssi; /** 0--report once, 1--report everytime happen, N -- report only happend > N consecutive times */ - t_u8 low_rssi_freq; + t_u8 low_rssi_freq; /** SNR threshold value (dB) */ - t_u8 low_snr; + t_u8 low_snr; /** 0--report once, 1--report everytime happen, N -- report only happend > N consecutive times */ - t_u8 low_snr_freq; + t_u8 low_snr_freq; /** Failure count threshold */ - t_u8 failure_count; + t_u8 failure_count; /** 0--report once, 1--report everytime happen, N -- report only happend > N consecutive times */ - t_u8 failure_count_freq; + t_u8 failure_count_freq; /** num of missed beacons */ - t_u8 beacon_miss; + t_u8 beacon_miss; /** 0--report once, 1--report everytime happen, N -- report only happend > N consecutive times */ - t_u8 beacon_miss_freq; + t_u8 beacon_miss_freq; /** Absolute value of RSSI threshold value (dBm) */ - t_u8 high_rssi; + t_u8 high_rssi; /** 0--report once, 1--report everytime happen, N -- report only happend > N consecutive times */ - t_u8 high_rssi_freq; + t_u8 high_rssi_freq; /** SNR threshold value (dB) */ - t_u8 high_snr; + t_u8 high_snr; /** 0--report once, 1--report everytime happen, N -- report only happend > N consecutive times */ - t_u8 high_snr_freq; + t_u8 high_snr_freq; /** Absolute value of data RSSI threshold value (dBm) */ - t_u8 data_low_rssi; + t_u8 data_low_rssi; /** 0--report once, 1--report everytime happen, N -- report only happend > N consecutive times */ - t_u8 data_low_rssi_freq; + t_u8 data_low_rssi_freq; /** Absolute value of data SNR threshold value (dBm) */ - t_u8 data_low_snr; + t_u8 data_low_snr; /** 0--report once, 1--report everytime happen, N -- report only happend > N consecutive times */ - t_u8 data_low_snr_freq; + t_u8 data_low_snr_freq; /** Absolute value of data RSSI threshold value (dBm) */ - t_u8 data_high_rssi; + t_u8 data_high_rssi; /** 0--report once, 1--report everytime happen, N -- report only happend > N consecutive times */ - t_u8 data_high_rssi_freq; + t_u8 data_high_rssi_freq; /** Absolute value of data SNR threshold value (dBm) */ - t_u8 data_high_snr; + t_u8 data_high_snr; /** 0--report once, 1--report everytime happen, N -- report only happend > N consecutive times */ - t_u8 data_high_snr_freq; - /* Link SNR threshold (dB) */ - t_u16 link_snr; - /* Link SNR frequency */ - t_u16 link_snr_freq; - /* Second minimum rate value as per the rate table below */ - t_u16 link_rate; - /* Second minimum rate frequency */ - t_u16 link_rate_freq; - /* Tx latency value (us) */ - t_u16 link_tx_latency; - /* Tx latency frequency */ - t_u16 link_tx_lantency_freq; - /* Number of pre missed beacons */ - t_u8 pre_beacon_miss; + t_u8 data_high_snr_freq; + /* Link SNR threshold (dB) */ + t_u16 link_snr; + /* Link SNR frequency */ + t_u16 link_snr_freq; + /* Second minimum rate value as per the rate table below */ + t_u16 link_rate; + /* Second minimum rate frequency */ + t_u16 link_rate_freq; + /* Tx latency value (us) */ + t_u16 link_tx_latency; + /* Tx latency frequency */ + t_u16 link_tx_lantency_freq; + /* Number of pre missed beacons */ + t_u8 pre_beacon_miss; } mlan_ds_subscribe_evt; /** Max OTP user data length */ @@ -3157,20 +3161,20 @@ typedef struct _mlan_ds_subscribe_evt typedef struct _mlan_ds_misc_otp_user_data { /** Reserved */ - t_u16 reserved; + t_u16 reserved; /** OTP user data length */ - t_u16 user_data_length; + t_u16 user_data_length; /** User data buffer */ - t_u8 user_data[MAX_OTP_USER_DATA_LEN]; + t_u8 user_data[MAX_OTP_USER_DATA_LEN]; } mlan_ds_misc_otp_user_data; #if defined(STA_SUPPORT) typedef struct _mlan_ds_misc_pmfcfg { /** Management Frame Protection Capable */ - t_u8 mfpc; + t_u8 mfpc; /** Management Frame Protection Required */ - t_u8 mfpr; + t_u8 mfpr; } mlan_ds_misc_pmfcfg; #endif @@ -3178,62 +3182,62 @@ typedef struct _mlan_ds_misc_pmfcfg typedef struct _mlan_ds_misc_cfg { /** Sub-command */ - t_u32 sub_command; + t_u32 sub_command; /** Miscellaneous configuration parameter */ - union - { - /** Generic IE for MLAN_OID_MISC_GEN_IE */ - mlan_ds_misc_gen_ie gen_ie; - /** Region code for MLAN_OID_MISC_REGION */ - t_u32 region_code; + union + { + /** Generic IE for MLAN_OID_MISC_GEN_IE */ + mlan_ds_misc_gen_ie gen_ie; + /** Region code for MLAN_OID_MISC_REGION */ + t_u32 region_code; #if defined(SDIO_MULTI_PORT_TX_AGGR) || defined(SDIO_MULTI_PORT_RX_AGGR) - /** SDIO MP-A Ctrl command for MLAN_OID_MISC_SDIO_MPA_CTRL */ - mlan_ds_misc_sdio_mpa_ctrl mpa_ctrl; + /** SDIO MP-A Ctrl command for MLAN_OID_MISC_SDIO_MPA_CTRL */ + mlan_ds_misc_sdio_mpa_ctrl mpa_ctrl; #endif - /** Hostcmd for MLAN_OID_MISC_HOST_CMD */ - mlan_ds_misc_cmd hostcmd; - /** System clock for MLAN_OID_MISC_SYS_CLOCK */ - mlan_ds_misc_sys_clock sys_clock; - /** WWS set/get for MLAN_OID_MISC_WWS */ - t_u32 wws_cfg; - /** Get associate response for MLAN_OID_MISC_ASSOC_RSP */ - mlan_ds_misc_assoc_rsp assoc_resp; - /** Function init/shutdown for MLAN_OID_MISC_INIT_SHUTDOWN */ - t_u32 func_init_shutdown; - /** Custom IE for MLAN_OID_MISC_CUSTOM_IE */ - mlan_ds_misc_custom_ie cust_ie; - /** Tx data pause for MLAN_OID_MISC_TX_DATAPAUSE */ - mlan_ds_misc_tx_datapause tx_datapause; - /** IP address configuration */ - mlan_ds_misc_ipaddr_cfg ipaddr_cfg; - /** MAC control for MLAN_OID_MISC_MAC_CONTROL */ - t_u32 mac_ctrl; - /** MEF configuration for MLAN_OID_MISC_MEF_CFG */ - mlan_ds_misc_mef_cfg mef_cfg; - /** CFP code for MLAN_OID_MISC_CFP_CODE */ - mlan_ds_misc_cfp_code cfp_code; - /** Country code for MLAN_OID_MISC_COUNTRY_CODE */ - mlan_ds_misc_country_code country_code; - /** Thermal reading for MLAN_OID_MISC_THERMAL */ - t_u32 thermal; - /** Mgmt subtype mask for MLAN_OID_MISC_RX_MGMT_IND */ - t_u32 mgmt_subtype_mask; - /** subscribe event for MLAN_OID_MISC_SUBSCRIBE_EVENT */ - mlan_ds_subscribe_evt subscribe_event; + /** Hostcmd for MLAN_OID_MISC_HOST_CMD */ + mlan_ds_misc_cmd hostcmd; + /** System clock for MLAN_OID_MISC_SYS_CLOCK */ + mlan_ds_misc_sys_clock sys_clock; + /** WWS set/get for MLAN_OID_MISC_WWS */ + t_u32 wws_cfg; + /** Get associate response for MLAN_OID_MISC_ASSOC_RSP */ + mlan_ds_misc_assoc_rsp assoc_resp; + /** Function init/shutdown for MLAN_OID_MISC_INIT_SHUTDOWN */ + t_u32 func_init_shutdown; + /** Custom IE for MLAN_OID_MISC_CUSTOM_IE */ + mlan_ds_misc_custom_ie cust_ie; + /** Tx data pause for MLAN_OID_MISC_TX_DATAPAUSE */ + mlan_ds_misc_tx_datapause tx_datapause; + /** IP address configuration */ + mlan_ds_misc_ipaddr_cfg ipaddr_cfg; + /** MAC control for MLAN_OID_MISC_MAC_CONTROL */ + t_u32 mac_ctrl; + /** MEF configuration for MLAN_OID_MISC_MEF_CFG */ + mlan_ds_misc_mef_cfg mef_cfg; + /** CFP code for MLAN_OID_MISC_CFP_CODE */ + mlan_ds_misc_cfp_code cfp_code; + /** Country code for MLAN_OID_MISC_COUNTRY_CODE */ + mlan_ds_misc_country_code country_code; + /** Thermal reading for MLAN_OID_MISC_THERMAL */ + t_u32 thermal; + /** Mgmt subtype mask for MLAN_OID_MISC_RX_MGMT_IND */ + t_u32 mgmt_subtype_mask; + /** subscribe event for MLAN_OID_MISC_SUBSCRIBE_EVENT */ + mlan_ds_subscribe_evt subscribe_event; #ifdef DEBUG_LEVEL1 - /** Driver debug bit masks */ - t_u32 drvdbg; + /** Driver debug bit masks */ + t_u32 drvdbg; #endif #ifdef STA_SUPPORT - t_u8 ext_cap[8]; + t_u8 ext_cap[8]; #endif - mlan_ds_misc_otp_user_data otp_user_data; - /** Tx control */ - t_u32 tx_control; + mlan_ds_misc_otp_user_data otp_user_data; + /** Tx control */ + t_u32 tx_control; #if defined(STA_SUPPORT) - mlan_ds_misc_pmfcfg pmfcfg; + mlan_ds_misc_pmfcfg pmfcfg; #endif - } param; + } param; } mlan_ds_misc_cfg, *pmlan_ds_misc_cfg; #endif /* !_MLAN_IOCTL_H_ */ diff --git a/drivers/net/wireless/sd8897/mlan/mlan_join.c b/drivers/net/wireless/sd8897/mlan/mlan_join.c index d91f63d79a54..dba70675b442 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_join.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_join.c @@ -6,7 +6,7 @@ * for sending adhoc start, adhoc join, and association commands * to the firmware. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -55,7 +55,7 @@ Change log: /** * @brief Append a generic IE as a pass through TLV to a TLV buffer. * - * This function is called from the network join command prep. routine. + * This function is called from the network join command prep. routine. * If the IE buffer has been setup by the application, this routine appends * the buffer as a pass through TLV type to the request. * @@ -67,116 +67,122 @@ Change log: static int wlan_cmd_append_generic_ie(mlan_private * priv, t_u8 ** ppbuffer) { - int ret_len = 0; - MrvlIEtypesHeader_t ie_header; - - ENTER(); - - /* Null Checks */ - if (ppbuffer == MNULL) { - LEAVE(); - return 0; - } - if (*ppbuffer == MNULL) { - LEAVE(); - return 0; - } - - /* - * If there is a generic ie buffer setup, append it to the return - * parameter buffer pointer. - */ - if (priv->gen_ie_buf_len) { - PRINTM(MINFO, "append generic IE %d to %p\n", priv->gen_ie_buf_len, - *ppbuffer); - - /* Wrap the generic IE buffer with a pass through TLV type */ - ie_header.type = wlan_cpu_to_le16(TLV_TYPE_PASSTHROUGH); - ie_header.len = wlan_cpu_to_le16(priv->gen_ie_buf_len); - memcpy(priv->adapter, *ppbuffer, &ie_header, sizeof(ie_header)); - - /* Increment the return size and the return buffer pointer param */ - *ppbuffer += sizeof(ie_header); - ret_len += sizeof(ie_header); - - /* Copy the generic IE buffer to the output buffer, advance pointer */ - memcpy(priv->adapter, *ppbuffer, priv->gen_ie_buf, - priv->gen_ie_buf_len); - - /* Increment the return size and the return buffer pointer param */ - *ppbuffer += priv->gen_ie_buf_len; - ret_len += priv->gen_ie_buf_len; - - /* Reset the generic IE buffer */ - priv->gen_ie_buf_len = 0; - } - - /* return the length appended to the buffer */ - LEAVE(); - return ret_len; + int ret_len = 0; + MrvlIEtypesHeader_t ie_header; + + ENTER(); + + /* Null Checks */ + if (ppbuffer == MNULL) { + LEAVE(); + return 0; + } + if (*ppbuffer == MNULL) { + LEAVE(); + return 0; + } + + /* + * If there is a generic ie buffer setup, append it to the return + * parameter buffer pointer. + */ + if (priv->gen_ie_buf_len) { + PRINTM(MINFO, "append generic IE %d to %p\n", + priv->gen_ie_buf_len, *ppbuffer); + + /* Wrap the generic IE buffer with a pass through TLV type */ + ie_header.type = wlan_cpu_to_le16(TLV_TYPE_PASSTHROUGH); + ie_header.len = wlan_cpu_to_le16(priv->gen_ie_buf_len); + memcpy(priv->adapter, *ppbuffer, &ie_header, sizeof(ie_header)); + + /* Increment the return size and the return buffer pointer + param */ + *ppbuffer += sizeof(ie_header); + ret_len += sizeof(ie_header); + + /* Copy the generic IE buffer to the output buffer, advance + pointer */ + memcpy(priv->adapter, *ppbuffer, priv->gen_ie_buf, + priv->gen_ie_buf_len); + + /* Increment the return size and the return buffer pointer + param */ + *ppbuffer += priv->gen_ie_buf_len; + ret_len += priv->gen_ie_buf_len; + + /* Reset the generic IE buffer */ + priv->gen_ie_buf_len = 0; + } + + /* return the length appended to the buffer */ + LEAVE(); + return ret_len; } /** * @brief Append TSF tracking info from the scan table for the target AP - * - * This function is called from the network join command prep. routine. + * + * This function is called from the network join command prep. routine. * The TSF table TSF sent to the firmware contains two TSF values: * - the TSF of the target AP from its previous beacon/probe response * - the TSF timestamp of our local MAC at the time we observed the * beacon/probe response. - * + * * The firmware uses the timestamp values to set an initial TSF value * in the MAC for the new association after a reassociation attempt. - * + * * @param pmpriv A pointer to mlan_private structure * @param ppbuffer A pointer to command buffer pointer * @param pbss_desc A pointer to the BSS Descriptor from the scan table of * the AP we are trying to join - * + * * @return bytes added to the buffer */ static int wlan_cmd_append_tsf_tlv(mlan_private * pmriv, t_u8 ** ppbuffer, - BSSDescriptor_t * pbss_desc) + BSSDescriptor_t * pbss_desc) { - MrvlIEtypes_TsfTimestamp_t tsf_tlv; - t_u64 tsf_val; + MrvlIEtypes_TsfTimestamp_t tsf_tlv; + t_u64 tsf_val; - ENTER(); + ENTER(); - /* Null Checks */ - if (ppbuffer == MNULL) { - LEAVE(); - return 0; - } - if (*ppbuffer == MNULL) { - LEAVE(); - return 0; - } + /* Null Checks */ + if (ppbuffer == MNULL) { + LEAVE(); + return 0; + } + if (*ppbuffer == MNULL) { + LEAVE(); + return 0; + } - memset(pmriv->adapter, &tsf_tlv, 0x00, sizeof(MrvlIEtypes_TsfTimestamp_t)); + memset(pmriv->adapter, &tsf_tlv, 0x00, + sizeof(MrvlIEtypes_TsfTimestamp_t)); - tsf_tlv.header.type = wlan_cpu_to_le16(TLV_TYPE_TSFTIMESTAMP); - tsf_tlv.header.len = wlan_cpu_to_le16(2 * sizeof(tsf_val)); + tsf_tlv.header.type = wlan_cpu_to_le16(TLV_TYPE_TSFTIMESTAMP); + tsf_tlv.header.len = wlan_cpu_to_le16(2 * sizeof(tsf_val)); - memcpy(pmriv->adapter, *ppbuffer, &tsf_tlv, sizeof(tsf_tlv.header)); - *ppbuffer += sizeof(tsf_tlv.header); + memcpy(pmriv->adapter, *ppbuffer, &tsf_tlv, sizeof(tsf_tlv.header)); + *ppbuffer += sizeof(tsf_tlv.header); - /* TSF timestamp from the firmware TSF when the bcn/prb rsp was received */ - tsf_val = wlan_cpu_to_le64(pbss_desc->network_tsf); - memcpy(pmriv->adapter, *ppbuffer, &tsf_val, sizeof(tsf_val)); - *ppbuffer += sizeof(tsf_val); + /* TSF timestamp from the firmware TSF when the bcn/prb rsp was + received */ + tsf_val = wlan_cpu_to_le64(pbss_desc->network_tsf); + memcpy(pmriv->adapter, *ppbuffer, &tsf_val, sizeof(tsf_val)); + *ppbuffer += sizeof(tsf_val); - memcpy(pmriv->adapter, &tsf_val, pbss_desc->time_stamp, sizeof(tsf_val)); + memcpy(pmriv->adapter, &tsf_val, pbss_desc->time_stamp, + sizeof(tsf_val)); - PRINTM(MINFO, "ASSOC: TSF offset calc: %016llx - %016llx\n", - tsf_val, pbss_desc->network_tsf); + PRINTM(MINFO, "ASSOC: TSF offset calc: %016llx - %016llx\n", + tsf_val, pbss_desc->network_tsf); - memcpy(pmriv->adapter, *ppbuffer, &tsf_val, sizeof(tsf_val)); - *ppbuffer += sizeof(tsf_val); + memcpy(pmriv->adapter, *ppbuffer, &tsf_val, sizeof(tsf_val)); + *ppbuffer += sizeof(tsf_val); - LEAVE(); - return (sizeof(tsf_tlv.header) + (2 * sizeof(tsf_val))); + LEAVE(); + return (sizeof(tsf_tlv.header) + (2 * sizeof(tsf_val))); } /** @@ -197,66 +203,65 @@ wlan_cmd_append_tsf_tlv(mlan_private * pmriv, t_u8 ** ppbuffer, */ static mlan_status wlan_get_common_rates(IN mlan_private * pmpriv, - IN t_u8 * rate1, - IN t_u32 rate1_size, IN t_u8 * rate2, IN t_u32 rate2_size) + IN t_u8 * rate1, + IN t_u32 rate1_size, IN t_u8 * rate2, IN t_u32 rate2_size) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_callbacks *pcb = (mlan_callbacks *) & pmpriv->adapter->callbacks; - t_u8 *ptr = rate1; - t_u8 *tmp = MNULL; - t_u32 i, j; - - ENTER(); - - ret = - pcb->moal_malloc(pmpriv->adapter->pmoal_handle, rate1_size, - MLAN_MEM_DEF, &tmp); - if (ret != MLAN_STATUS_SUCCESS || !tmp) { - PRINTM(MERROR, "Failed to allocate buffer\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - - memcpy(pmpriv->adapter, tmp, rate1, rate1_size); - memset(pmpriv->adapter, rate1, 0, rate1_size); - - for (i = 0; rate2[i] && i < rate2_size; i++) { - for (j = 0; tmp[j] && j < rate1_size; j++) { - /* Check common rate, excluding the bit for basic rate */ - if ((rate2[i] & 0x7F) == (tmp[j] & 0x7F)) { - *rate1++ = tmp[j]; - break; - } - } - } - - HEXDUMP("rate1 (AP) Rates", tmp, rate1_size); - HEXDUMP("rate2 (Card) Rates", rate2, rate2_size); - HEXDUMP("Common Rates", ptr, rate1 - ptr); - PRINTM(MINFO, "Tx DataRate is set to 0x%X\n", pmpriv->data_rate); - - if (!pmpriv->is_data_rate_auto) { - while (*ptr) { - if ((*ptr & 0x7f) == pmpriv->data_rate) { - ret = MLAN_STATUS_SUCCESS; - goto done; - } - ptr++; - } - PRINTM(MMSG, "Previously set fixed data rate %#x is not " - "compatible with the network\n", pmpriv->data_rate); - - ret = MLAN_STATUS_FAILURE; - goto done; - } - - ret = MLAN_STATUS_SUCCESS; - done: - if (tmp) - pcb->moal_mfree(pmpriv->adapter->pmoal_handle, tmp); - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_callbacks *pcb = (mlan_callbacks *) & pmpriv->adapter->callbacks; + t_u8 *ptr = rate1; + t_u8 *tmp = MNULL; + t_u32 i, j; + + ENTER(); + + ret = pcb->moal_malloc(pmpriv->adapter->pmoal_handle, rate1_size, + MLAN_MEM_DEF, &tmp); + if (ret != MLAN_STATUS_SUCCESS || !tmp) { + PRINTM(MERROR, "Failed to allocate buffer\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + + memcpy(pmpriv->adapter, tmp, rate1, rate1_size); + memset(pmpriv->adapter, rate1, 0, rate1_size); + + for (i = 0; rate2[i] && i < rate2_size; i++) { + for (j = 0; tmp[j] && j < rate1_size; j++) { + /* Check common rate, excluding the bit for basic rate */ + if ((rate2[i] & 0x7F) == (tmp[j] & 0x7F)) { + *rate1++ = tmp[j]; + break; + } + } + } + + HEXDUMP("rate1 (AP) Rates", tmp, rate1_size); + HEXDUMP("rate2 (Card) Rates", rate2, rate2_size); + HEXDUMP("Common Rates", ptr, rate1 - ptr); + PRINTM(MINFO, "Tx DataRate is set to 0x%X\n", pmpriv->data_rate); + + if (!pmpriv->is_data_rate_auto) { + while (*ptr) { + if ((*ptr & 0x7f) == pmpriv->data_rate) { + ret = MLAN_STATUS_SUCCESS; + goto done; + } + ptr++; + } + PRINTM(MMSG, "Previously set fixed data rate %#x is not " + "compatible with the network\n", pmpriv->data_rate); + + ret = MLAN_STATUS_FAILURE; + goto done; + } + + ret = MLAN_STATUS_SUCCESS; +done: + if (tmp) + pcb->moal_mfree(pmpriv->adapter->pmoal_handle, tmp); + + LEAVE(); + return ret; } /** @@ -273,43 +278,45 @@ wlan_get_common_rates(IN mlan_private * pmpriv, */ static mlan_status wlan_setup_rates_from_bssdesc(IN mlan_private * pmpriv, - IN BSSDescriptor_t * pbss_desc, - OUT t_u8 * pout_rates, - OUT t_u32 * pout_rates_size) + IN BSSDescriptor_t * pbss_desc, + OUT t_u8 * pout_rates, + OUT t_u32 * pout_rates_size) { - t_u8 card_rates[WLAN_SUPPORTED_RATES]; - t_u32 card_rates_size = 0; - ENTER(); - /* Copy AP supported rates */ - memcpy(pmpriv->adapter, pout_rates, pbss_desc->supported_rates, - WLAN_SUPPORTED_RATES); - - if ((pmpriv->adapter->region_code == COUNTRY_CODE_JP_40 || - pmpriv->adapter->region_code == COUNTRY_CODE_JP_FF) - && (pbss_desc->phy_param_set.ds_param_set.current_chan == 14)) { - /* Special Case: For Japan, 11G rates on CH14 are not allowed */ - card_rates_size = wlan_get_supported_rates(pmpriv, pmpriv->bss_mode, - BAND_B, card_rates); - } else { - /* Get the STA supported rates */ - card_rates_size = wlan_get_supported_rates(pmpriv, pmpriv->bss_mode, - pmpriv->config_bands, - card_rates); - } - /* Get the common rates between AP and STA supported rates */ - if (wlan_get_common_rates(pmpriv, pout_rates, WLAN_SUPPORTED_RATES, - card_rates, card_rates_size)) { - *pout_rates_size = 0; - PRINTM(MERROR, "wlan_get_common_rates failed\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - *pout_rates_size = - MIN(wlan_strlen((char *) pout_rates), WLAN_SUPPORTED_RATES); - - LEAVE(); - return MLAN_STATUS_SUCCESS; + t_u8 card_rates[WLAN_SUPPORTED_RATES]; + t_u32 card_rates_size = 0; + ENTER(); + /* Copy AP supported rates */ + memcpy(pmpriv->adapter, pout_rates, pbss_desc->supported_rates, + WLAN_SUPPORTED_RATES); + + if ((pmpriv->adapter->region_code == COUNTRY_CODE_JP_40 || + pmpriv->adapter->region_code == COUNTRY_CODE_JP_FF) + && (pbss_desc->phy_param_set.ds_param_set.current_chan == 14)) { + /* Special Case: For Japan, 11G rates on CH14 are not allowed */ + card_rates_size = + wlan_get_supported_rates(pmpriv, pmpriv->bss_mode, + BAND_B, card_rates); + } else { + /* Get the STA supported rates */ + card_rates_size = + wlan_get_supported_rates(pmpriv, pmpriv->bss_mode, + pmpriv->config_bands, + card_rates); + } + /* Get the common rates between AP and STA supported rates */ + if (wlan_get_common_rates(pmpriv, pout_rates, WLAN_SUPPORTED_RATES, + card_rates, card_rates_size)) { + *pout_rates_size = 0; + PRINTM(MERROR, "wlan_get_common_rates failed\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + *pout_rates_size = + MIN(wlan_strlen((char *)pout_rates), WLAN_SUPPORTED_RATES); + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -322,34 +329,35 @@ wlan_setup_rates_from_bssdesc(IN mlan_private * pmpriv, */ static t_void wlan_update_tsf_timestamps(IN mlan_private * pmpriv, - IN BSSDescriptor_t * pnew_bss_desc) + IN BSSDescriptor_t * pnew_bss_desc) { - mlan_adapter *pmadapter = pmpriv->adapter; - t_u32 table_idx; - t_u64 new_tsf_base; - t_s64 tsf_delta; + mlan_adapter *pmadapter = pmpriv->adapter; + t_u32 table_idx; + t_u64 new_tsf_base; + t_s64 tsf_delta; - ENTER(); + ENTER(); - memcpy(pmpriv->adapter, &new_tsf_base, pnew_bss_desc->time_stamp, - sizeof(new_tsf_base)); + memcpy(pmpriv->adapter, &new_tsf_base, pnew_bss_desc->time_stamp, + sizeof(new_tsf_base)); - tsf_delta = new_tsf_base - pnew_bss_desc->network_tsf; + tsf_delta = new_tsf_base - pnew_bss_desc->network_tsf; - PRINTM(MINFO, "TSF: Update TSF timestamps, 0x%016llx -> 0x%016llx\n", - pnew_bss_desc->network_tsf, new_tsf_base); + PRINTM(MINFO, "TSF: Update TSF timestamps, 0x%016llx -> 0x%016llx\n", + pnew_bss_desc->network_tsf, new_tsf_base); - for (table_idx = 0; table_idx < pmadapter->num_in_scan_table; table_idx++) { - pmadapter->pscan_table[table_idx].network_tsf += tsf_delta; - } + for (table_idx = 0; table_idx < pmadapter->num_in_scan_table; + table_idx++) { + pmadapter->pscan_table[table_idx].network_tsf += tsf_delta; + } - LEAVE(); + LEAVE(); } /** - * @brief Append a wapi IE + * @brief Append a wapi IE * - * This function is called from the network join command prep. routine. + * This function is called from the network join command prep. routine. * If the IE buffer has been setup by the application, this routine appends * the buffer as a wapi TLV type to the request. * @@ -361,49 +369,53 @@ wlan_update_tsf_timestamps(IN mlan_private * pmpriv, static int wlan_cmd_append_wapi_ie(mlan_private * priv, t_u8 ** ppBuffer) { - int retLen = 0; - MrvlIEtypesHeader_t ie_header; - - ENTER(); - - /* Null Checks */ - if (ppBuffer == MNULL) { - LEAVE(); - return 0; - } - if (*ppBuffer == MNULL) { - LEAVE(); - return 0; - } - - /* - * If there is a wapi ie buffer setup, append it to the return - * parameter buffer pointer. - */ - if (priv->wapi_ie_len) { - PRINTM(MCMND, "append wapi ie %d to %p\n", priv->wapi_ie_len, - *ppBuffer); - - /* Wrap the generic IE buffer with a pass through TLV type */ - ie_header.type = wlan_cpu_to_le16(TLV_TYPE_WAPI_IE); - ie_header.len = wlan_cpu_to_le16(priv->wapi_ie_len); - memcpy(priv->adapter, *ppBuffer, &ie_header, sizeof(ie_header)); - - /* Increment the return size and the return buffer pointer param */ - *ppBuffer += sizeof(ie_header); - retLen += sizeof(ie_header); - - /* Copy the wapi IE buffer to the output buffer, advance pointer */ - memcpy(priv->adapter, *ppBuffer, priv->wapi_ie, priv->wapi_ie_len); - - /* Increment the return size and the return buffer pointer param */ - *ppBuffer += priv->wapi_ie_len; - retLen += priv->wapi_ie_len; - - } - /* return the length appended to the buffer */ - LEAVE(); - return retLen; + int retLen = 0; + MrvlIEtypesHeader_t ie_header; + + ENTER(); + + /* Null Checks */ + if (ppBuffer == MNULL) { + LEAVE(); + return 0; + } + if (*ppBuffer == MNULL) { + LEAVE(); + return 0; + } + + /* + * If there is a wapi ie buffer setup, append it to the return + * parameter buffer pointer. + */ + if (priv->wapi_ie_len) { + PRINTM(MCMND, "append wapi ie %d to %p\n", priv->wapi_ie_len, + *ppBuffer); + + /* Wrap the generic IE buffer with a pass through TLV type */ + ie_header.type = wlan_cpu_to_le16(TLV_TYPE_WAPI_IE); + ie_header.len = wlan_cpu_to_le16(priv->wapi_ie_len); + memcpy(priv->adapter, *ppBuffer, &ie_header, sizeof(ie_header)); + + /* Increment the return size and the return buffer pointer + param */ + *ppBuffer += sizeof(ie_header); + retLen += sizeof(ie_header); + + /* Copy the wapi IE buffer to the output buffer, advance + pointer */ + memcpy(priv->adapter, *ppBuffer, priv->wapi_ie, + priv->wapi_ie_len); + + /* Increment the return size and the return buffer pointer + param */ + *ppBuffer += priv->wapi_ie_len; + retLen += priv->wapi_ie_len; + + } + /* return the length appended to the buffer */ + LEAVE(); + return retLen; } /******************************************************** @@ -418,100 +430,109 @@ wlan_cmd_append_wapi_ie(mlan_private * priv, t_u8 ** ppBuffer) */ void wlan_update_rsn_ie(mlan_private * pmpriv, - MrvlIEtypes_RsnParamSet_t * ptlv_rsn_ie) + MrvlIEtypes_RsnParamSet_t * ptlv_rsn_ie) { - t_u16 *prsn_cap; - t_u16 *ptr; - t_u16 *akm_suite_count_ptr; - t_u16 pmf_mask = 0x00; - t_u8 *temp; - int pairwise_cipher_count = 0; - int akm_suite_count = 0; - int temp_akm_suite_count = 0; - int found = 0; - t_u8 sha_256_oui[4] = { 0x00, 0x0f, 0xac, 0x06 }; - mlan_adapter *pmadapter = pmpriv->adapter; - - pmf_mask = - (((pmpriv->pmfcfg.mfpc << MFPC_BIT) | (pmpriv->pmfcfg. - mfpr << MFPR_BIT)) | - (~PMF_MASK)); - /* prsn_cap = prsn_ie->rsn_ie + 2 bytes version + 4 bytes - group_cipher_suite + 2 bytes pairwise_cipher_count + - pairwise_cipher_count * PAIRWISE_CIPHER_SUITE_LEN + 2 bytes - akm_suite_count + akm_suite_count * AKM_SUITE_LEN */ - ptr = (t_u16 *) (ptlv_rsn_ie->rsn_ie + sizeof(t_u16) + 4 * sizeof(t_u8)); - pairwise_cipher_count = *ptr; - ptr = (t_u16 *) (ptlv_rsn_ie->rsn_ie + sizeof(t_u16) + 4 * sizeof(t_u8) - + sizeof(t_u16) + - pairwise_cipher_count * PAIRWISE_CIPHER_SUITE_LEN); - temp_akm_suite_count = *ptr; - akm_suite_count = *ptr; - /* Save pointer to akm_suite_count in RSN IE to update it later */ - akm_suite_count_ptr = ptr; - temp = ptlv_rsn_ie->rsn_ie + sizeof(t_u16) + 4 * sizeof(t_u8) - + sizeof(t_u16) + pairwise_cipher_count * PAIRWISE_CIPHER_SUITE_LEN + sizeof(t_u16); /* ptr - now - points - to - the - 1st - AKM - suite - */ - if (temp_akm_suite_count > 1) { - while (temp_akm_suite_count) { - if (!memcmp(pmadapter, temp, sha_256_oui, AKM_SUITE_LEN)) { - found = 1; - break; - } - temp += AKM_SUITE_LEN; - temp_akm_suite_count--; - } - if (found) { - /* Copy SHA256 as AKM suite */ - memcpy(pmadapter, - ptlv_rsn_ie->rsn_ie + (sizeof(t_u16) + 4 * sizeof(t_u8) - + sizeof(t_u16) + - pairwise_cipher_count * - PAIRWISE_CIPHER_SUITE_LEN + - sizeof(t_u16)), sha_256_oui, - AKM_SUITE_LEN); - /* Shift remaining bytes of RSN IE after this */ - memmove(pmadapter, - ptlv_rsn_ie->rsn_ie + (sizeof(t_u16) + 4 * sizeof(t_u8) - + sizeof(t_u16) + - pairwise_cipher_count * - PAIRWISE_CIPHER_SUITE_LEN + - sizeof(t_u16) + AKM_SUITE_LEN), - ptlv_rsn_ie->rsn_ie + (sizeof(t_u16) + 4 * sizeof(t_u8) + - sizeof(t_u16) + - pairwise_cipher_count * - PAIRWISE_CIPHER_SUITE_LEN + - sizeof(t_u16) + - akm_suite_count * AKM_SUITE_LEN), - ptlv_rsn_ie->header.len - (sizeof(t_u16) + - 4 * sizeof(t_u8) + - sizeof(t_u16) + - pairwise_cipher_count * - PAIRWISE_CIPHER_SUITE_LEN + - sizeof(t_u16) + - akm_suite_count * - AKM_SUITE_LEN)); - ptlv_rsn_ie->header.len = - ptlv_rsn_ie->header.len - (akm_suite_count - 1) * AKM_SUITE_LEN; - /* Update akm suite count */ - akm_suite_count = 1; - *akm_suite_count_ptr = akm_suite_count; - } - } - ptr = (t_u16 *) (ptlv_rsn_ie->rsn_ie + sizeof(t_u16) + 4 * sizeof(t_u8) - + sizeof(t_u16) + - pairwise_cipher_count * PAIRWISE_CIPHER_SUITE_LEN + - sizeof(t_u16) + akm_suite_count * AKM_SUITE_LEN); - prsn_cap = ptr; - *prsn_cap |= PMF_MASK; - *prsn_cap &= pmf_mask; + t_u16 *prsn_cap; + t_u16 *ptr; + t_u16 *akm_suite_count_ptr; + t_u16 pmf_mask = 0x00; + t_u8 *temp; + int pairwise_cipher_count = 0; + int akm_suite_count = 0; + int temp_akm_suite_count = 0; + int found = 0; + t_u8 sha_256_oui[4] = { 0x00, 0x0f, 0xac, 0x06 }; + mlan_adapter *pmadapter = pmpriv->adapter; + + pmf_mask = + (((pmpriv->pmfcfg.mfpc << MFPC_BIT) | (pmpriv->pmfcfg. + mfpr << MFPR_BIT)) | + (~PMF_MASK)); + /* prsn_cap = prsn_ie->rsn_ie + 2 bytes version + 4 bytes + group_cipher_suite + 2 bytes pairwise_cipher_count + + pairwise_cipher_count * PAIRWISE_CIPHER_SUITE_LEN + 2 bytes + akm_suite_count + akm_suite_count * AKM_SUITE_LEN */ + ptr = (t_u16 *) (ptlv_rsn_ie->rsn_ie + sizeof(t_u16) + + 4 * sizeof(t_u8)); + pairwise_cipher_count = *ptr; + ptr = (t_u16 *) (ptlv_rsn_ie->rsn_ie + sizeof(t_u16) + 4 * sizeof(t_u8) + + sizeof(t_u16) + + pairwise_cipher_count * PAIRWISE_CIPHER_SUITE_LEN); + temp_akm_suite_count = *ptr; + akm_suite_count = *ptr; + /* Save pointer to akm_suite_count in RSN IE to update it later */ + akm_suite_count_ptr = ptr; + temp = ptlv_rsn_ie->rsn_ie + sizeof(t_u16) + 4 * sizeof(t_u8) + + sizeof(t_u16) + pairwise_cipher_count * PAIRWISE_CIPHER_SUITE_LEN + sizeof(t_u16); /* ptr + now + points + to + the + 1st + AKM + suite + */ + if (temp_akm_suite_count > 1) { + while (temp_akm_suite_count) { + if (!memcmp + (pmadapter, temp, sha_256_oui, AKM_SUITE_LEN)) { + found = 1; + break; + } + temp += AKM_SUITE_LEN; + temp_akm_suite_count--; + } + if (found) { + /* Copy SHA256 as AKM suite */ + memcpy(pmadapter, + ptlv_rsn_ie->rsn_ie + (sizeof(t_u16) + + 4 * sizeof(t_u8) + + sizeof(t_u16) + + pairwise_cipher_count * + PAIRWISE_CIPHER_SUITE_LEN + + sizeof(t_u16)), + sha_256_oui, AKM_SUITE_LEN); + /* Shift remaining bytes of RSN IE after this */ + memmove(pmadapter, + ptlv_rsn_ie->rsn_ie + (sizeof(t_u16) + + 4 * sizeof(t_u8) + + sizeof(t_u16) + + pairwise_cipher_count * + PAIRWISE_CIPHER_SUITE_LEN + + sizeof(t_u16) + + AKM_SUITE_LEN), + ptlv_rsn_ie->rsn_ie + (sizeof(t_u16) + + 4 * sizeof(t_u8) + + sizeof(t_u16) + + pairwise_cipher_count * + PAIRWISE_CIPHER_SUITE_LEN + + sizeof(t_u16) + + akm_suite_count * + AKM_SUITE_LEN), + ptlv_rsn_ie->header.len - (sizeof(t_u16) + + 4 * sizeof(t_u8) + + sizeof(t_u16) + + pairwise_cipher_count + * + PAIRWISE_CIPHER_SUITE_LEN + + sizeof(t_u16) + + akm_suite_count * + AKM_SUITE_LEN)); + ptlv_rsn_ie->header.len = + ptlv_rsn_ie->header.len - (akm_suite_count - + 1) * AKM_SUITE_LEN; + /* Update akm suite count */ + akm_suite_count = 1; + *akm_suite_count_ptr = akm_suite_count; + } + } + ptr = (t_u16 *) (ptlv_rsn_ie->rsn_ie + sizeof(t_u16) + 4 * sizeof(t_u8) + + sizeof(t_u16) + + pairwise_cipher_count * PAIRWISE_CIPHER_SUITE_LEN + + sizeof(t_u16) + akm_suite_count * AKM_SUITE_LEN); + prsn_cap = ptr; + *prsn_cap |= PMF_MASK; + *prsn_cap &= pmf_mask; } /** @@ -519,277 +540,320 @@ wlan_update_rsn_ie(mlan_private * pmpriv, * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure - * @param pdata_buf A pointer cast of BSSDescriptor_t from the + * @param pdata_buf A pointer cast of BSSDescriptor_t from the * scan table to assoc * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ mlan_status wlan_cmd_802_11_associate(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = pmpriv->adapter; - HostCmd_DS_802_11_ASSOCIATE *passo = &cmd->params.associate; - BSSDescriptor_t *pbss_desc; - MrvlIEtypes_SsIdParamSet_t *pssid_tlv; - MrvlIEtypes_PhyParamSet_t *pphy_tlv; - MrvlIEtypes_SsParamSet_t *pss_tlv; - MrvlIEtypes_RatesParamSet_t *prates_tlv; - MrvlIEtypes_AuthType_t *pauth_tlv; - MrvlIEtypes_RsnParamSet_t *prsn_ie_tlv; - MrvlIEtypes_ChanListParamSet_t *pchan_tlv; - WLAN_802_11_RATES rates; - t_u32 rates_size; - t_u16 tmp_cap; - t_u8 *pos; - - ENTER(); - - pbss_desc = (BSSDescriptor_t *) pdata_buf; - pos = (t_u8 *) passo; - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_ASSOCIATE); - - /* Save so we know which BSS Desc to use in the response handler */ - pmpriv->pattempted_bss_desc = pbss_desc; - - memcpy(pmadapter, passo->peer_sta_addr, - pbss_desc->mac_address, sizeof(passo->peer_sta_addr)); - pos += sizeof(passo->peer_sta_addr); - - /* Set the listen interval */ - passo->listen_interval = wlan_cpu_to_le16(pmpriv->listen_interval); - /* Set the beacon period */ - passo->beacon_period = wlan_cpu_to_le16(pbss_desc->beacon_period); - - pos += sizeof(passo->cap_info); - pos += sizeof(passo->listen_interval); - pos += sizeof(passo->beacon_period); - pos += sizeof(passo->dtim_period); - - pssid_tlv = (MrvlIEtypes_SsIdParamSet_t *) pos; - pssid_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_SSID); - pssid_tlv->header.len = (t_u16) pbss_desc->ssid.ssid_len; - memcpy(pmadapter, pssid_tlv->ssid, pbss_desc->ssid.ssid, - pssid_tlv->header.len); - pos += sizeof(pssid_tlv->header) + pssid_tlv->header.len; - pssid_tlv->header.len = wlan_cpu_to_le16(pssid_tlv->header.len); - - pphy_tlv = (MrvlIEtypes_PhyParamSet_t *) pos; - pphy_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_PHY_DS); - pphy_tlv->header.len = sizeof(pphy_tlv->fh_ds.ds_param_set); - memcpy(pmadapter, &pphy_tlv->fh_ds.ds_param_set, - &pbss_desc->phy_param_set.ds_param_set.current_chan, - sizeof(pphy_tlv->fh_ds.ds_param_set)); - pos += sizeof(pphy_tlv->header) + pphy_tlv->header.len; - pphy_tlv->header.len = wlan_cpu_to_le16(pphy_tlv->header.len); - - pss_tlv = (MrvlIEtypes_SsParamSet_t *) pos; - pss_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_CF); - pss_tlv->header.len = sizeof(pss_tlv->cf_ibss.cf_param_set); - pos += sizeof(pss_tlv->header) + pss_tlv->header.len; - pss_tlv->header.len = wlan_cpu_to_le16(pss_tlv->header.len); - - /* Get the common rates supported between the driver and the BSS Desc */ - if (wlan_setup_rates_from_bssdesc(pmpriv, pbss_desc, rates, &rates_size)) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - /* Save the data rates into Current BSS state structure */ - pmpriv->curr_bss_params.num_of_rates = rates_size; - memcpy(pmadapter, &pmpriv->curr_bss_params.data_rates, rates, rates_size); - - /* Setup the Rates TLV in the association command */ - prates_tlv = (MrvlIEtypes_RatesParamSet_t *) pos; - prates_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_RATES); - prates_tlv->header.len = wlan_cpu_to_le16((t_u16) rates_size); - memcpy(pmadapter, prates_tlv->rates, rates, rates_size); - pos += sizeof(prates_tlv->header) + rates_size; - PRINTM(MINFO, "ASSOC_CMD: Rates size = %d\n", rates_size); - - /* Add the Authentication type to be used for Auth frames if needed */ - if (pmpriv->sec_info.authentication_mode != MLAN_AUTH_MODE_AUTO) { - pauth_tlv = (MrvlIEtypes_AuthType_t *) pos; - pauth_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_AUTH_TYPE); - pauth_tlv->header.len = sizeof(pauth_tlv->auth_type); - if ((pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled) - || (pmpriv->sec_info.authentication_mode == - MLAN_AUTH_MODE_NETWORKEAP)) - pauth_tlv->auth_type = - wlan_cpu_to_le16((t_u16) pmpriv->sec_info.authentication_mode); - else - pauth_tlv->auth_type = wlan_cpu_to_le16(MLAN_AUTH_MODE_OPEN); - pos += sizeof(pauth_tlv->header) + pauth_tlv->header.len; - pauth_tlv->header.len = wlan_cpu_to_le16(pauth_tlv->header.len); - } - - if (IS_SUPPORT_MULTI_BANDS(pmadapter) - && (pbss_desc->bss_band & pmpriv->config_bands) - && !(ISSUPP_11NENABLED(pmadapter->fw_cap_info) - && (!pbss_desc->disable_11n) - && (pmpriv->config_bands & BAND_GN - || pmpriv->config_bands & BAND_AN) - && (pbss_desc->pht_cap) - ) - ) { - /* Append a channel TLV for the channel the attempted AP was found on */ - pchan_tlv = (MrvlIEtypes_ChanListParamSet_t *) pos; - pchan_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_CHANLIST); - pchan_tlv->header.len = wlan_cpu_to_le16(sizeof(ChanScanParamSet_t)); - - memset(pmadapter, pchan_tlv->chan_scan_param, 0x00, - sizeof(ChanScanParamSet_t)); - pchan_tlv->chan_scan_param[0].chan_number = - (pbss_desc->phy_param_set.ds_param_set.current_chan); - PRINTM(MINFO, "Assoc: TLV Chan = %d\n", - pchan_tlv->chan_scan_param[0].chan_number); - - pchan_tlv->chan_scan_param[0].radio_type = - wlan_band_to_radio_type((t_u8) pbss_desc->bss_band); - - PRINTM(MINFO, "Assoc: TLV Band = %d\n", - pchan_tlv->chan_scan_param[0].radio_type); - pos += sizeof(pchan_tlv->header) + sizeof(ChanScanParamSet_t); - } - if (!pmpriv->wps.session_enable) { - if ((pmpriv->sec_info.wpa_enabled || pmpriv->sec_info.wpa2_enabled)) { - prsn_ie_tlv = (MrvlIEtypes_RsnParamSet_t *) pos; - prsn_ie_tlv->header.type = (t_u16) pmpriv->wpa_ie[0]; /* WPA_IE - or - RSN_IE - */ - prsn_ie_tlv->header.type = prsn_ie_tlv->header.type & 0x00FF; - prsn_ie_tlv->header.type = - wlan_cpu_to_le16(prsn_ie_tlv->header.type); - prsn_ie_tlv->header.len = (t_u16) pmpriv->wpa_ie[1]; - prsn_ie_tlv->header.len = prsn_ie_tlv->header.len & 0x00FF; - if (prsn_ie_tlv->header.len <= (sizeof(pmpriv->wpa_ie) - 2)) - memcpy(pmadapter, prsn_ie_tlv->rsn_ie, &pmpriv->wpa_ie[2], - prsn_ie_tlv->header.len); - else { - ret = MLAN_STATUS_FAILURE; - goto done; - } - HEXDUMP("ASSOC_CMD: RSN IE", (t_u8 *) prsn_ie_tlv, - sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len); - pos += sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len; - prsn_ie_tlv->header.len = wlan_cpu_to_le16(prsn_ie_tlv->header.len); - } else if (pmpriv->sec_info.ewpa_enabled) { - prsn_ie_tlv = (MrvlIEtypes_RsnParamSet_t *) pos; - if (pbss_desc->pwpa_ie) { - prsn_ie_tlv->header.type = - (t_u16) (*(pbss_desc->pwpa_ie)).vend_hdr.element_id; - prsn_ie_tlv->header.type = prsn_ie_tlv->header.type & 0x00FF; - prsn_ie_tlv->header.type = - wlan_cpu_to_le16(prsn_ie_tlv->header.type); - prsn_ie_tlv->header.len = - (t_u16) (*(pbss_desc->pwpa_ie)).vend_hdr.len; - prsn_ie_tlv->header.len = prsn_ie_tlv->header.len & 0x00FF; - if (prsn_ie_tlv->header.len <= (sizeof(pmpriv->wpa_ie))) { - memcpy(pmadapter, prsn_ie_tlv->rsn_ie, - &((*(pbss_desc->pwpa_ie)).vend_hdr.oui[0]), - prsn_ie_tlv->header.len); - } else { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - HEXDUMP("ASSOC_CMD: RSN IE", (t_u8 *) prsn_ie_tlv, - sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len); - pos += sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len; - prsn_ie_tlv->header.len = - wlan_cpu_to_le16(prsn_ie_tlv->header.len); - } - if (pbss_desc->prsn_ie) { - prsn_ie_tlv = (MrvlIEtypes_RsnParamSet_t *) pos; - prsn_ie_tlv->header.type = - (t_u16) (*(pbss_desc->prsn_ie)).ieee_hdr.element_id; - prsn_ie_tlv->header.type = prsn_ie_tlv->header.type & 0x00FF; - prsn_ie_tlv->header.type = - wlan_cpu_to_le16(prsn_ie_tlv->header.type); - prsn_ie_tlv->header.len = - (t_u16) (*(pbss_desc->prsn_ie)).ieee_hdr.len; - prsn_ie_tlv->header.len = prsn_ie_tlv->header.len & 0x00FF; - if (prsn_ie_tlv->header.len <= (sizeof(pmpriv->wpa_ie))) { - memcpy(pmadapter, prsn_ie_tlv->rsn_ie, - &((*(pbss_desc->prsn_ie)).data[0]) - , prsn_ie_tlv->header.len); - if (pmpriv->pmfcfg.mfpc || pmpriv->pmfcfg.mfpr) { - wlan_update_rsn_ie(pmpriv, prsn_ie_tlv); - } - } else { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - HEXDUMP("ASSOC_CMD: RSN IE", (t_u8 *) prsn_ie_tlv, - sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len); - pos += sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len; - prsn_ie_tlv->header.len = - wlan_cpu_to_le16(prsn_ie_tlv->header.len); - } - } - } - - if (ISSUPP_11NENABLED(pmadapter->fw_cap_info) - && (!pbss_desc->disable_11n) - && (pmpriv->config_bands & BAND_GN || pmpriv->config_bands & BAND_AN)) - wlan_cmd_append_11n_tlv(pmpriv, pbss_desc, &pos); - - if (ISSUPP_11ACENABLED(pmadapter->fw_cap_info) - && (!pbss_desc->disable_11n) - && (pmpriv->config_bands & BAND_GAC || pmpriv->config_bands & BAND_AAC)) - wlan_cmd_append_11ac_tlv(pmpriv, pbss_desc, &pos); - - wlan_wmm_process_association_req(pmpriv, &pos, &pbss_desc->wmm_ie, - pbss_desc->pht_cap); - if (pmpriv->sec_info.wapi_enabled && pmpriv->wapi_ie_len) { - wlan_cmd_append_wapi_ie(pmpriv, &pos); - } - - wlan_cmd_append_generic_ie(pmpriv, &pos); - - wlan_cmd_append_tsf_tlv(pmpriv, &pos, pbss_desc); - - if (wlan_11d_create_dnld_countryinfo(pmpriv, (t_u8) pbss_desc->bss_band)) { - PRINTM(MERROR, "Dnld_countryinfo_11d failed\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - if (wlan_11d_parse_dnld_countryinfo(pmpriv, pmpriv->pattempted_bss_desc)) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - /* - * Call 11h join API after capability bits are set so adhoc/infra 11h - * behavior can be properly triggered. pos modified if data is appended - */ - wlan_11h_process_join(pmpriv, &pos, &passo->cap_info, - (t_u8) pbss_desc->bss_band, - pbss_desc->phy_param_set.ds_param_set.current_chan, - &pbss_desc->wlan_11h_bss_info); - - cmd->size = wlan_cpu_to_le16((t_u16) (pos - (t_u8 *) passo) + S_DS_GEN); - - /* Set the Capability info at last */ - memcpy(pmadapter, &tmp_cap, &pbss_desc->cap_info, sizeof(passo->cap_info)); - - if (pmpriv->config_bands == BAND_B) { - SHORT_SLOT_TIME_DISABLED(tmp_cap); - } - - tmp_cap &= CAPINFO_MASK; - PRINTM(MINFO, "ASSOC_CMD: tmp_cap=%4X CAPINFO_MASK=%4lX\n", - tmp_cap, CAPINFO_MASK); - tmp_cap = wlan_cpu_to_le16(tmp_cap); - memcpy(pmadapter, &passo->cap_info, &tmp_cap, sizeof(passo->cap_info)); - - done: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + HostCmd_DS_802_11_ASSOCIATE *passo = &cmd->params.associate; + BSSDescriptor_t *pbss_desc; + MrvlIEtypes_SsIdParamSet_t *pssid_tlv; + MrvlIEtypes_PhyParamSet_t *pphy_tlv; + MrvlIEtypes_SsParamSet_t *pss_tlv; + MrvlIEtypes_RatesParamSet_t *prates_tlv; + MrvlIEtypes_AuthType_t *pauth_tlv; + MrvlIEtypes_RsnParamSet_t *prsn_ie_tlv; + MrvlIEtypes_ChanListParamSet_t *pchan_tlv; + WLAN_802_11_RATES rates; + t_u32 rates_size; + t_u16 tmp_cap; + t_u8 *pos; + + ENTER(); + + pbss_desc = (BSSDescriptor_t *) pdata_buf; + pos = (t_u8 *) passo; + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_ASSOCIATE); + + /* Save so we know which BSS Desc to use in the response handler */ + pmpriv->pattempted_bss_desc = pbss_desc; + + memcpy(pmadapter, passo->peer_sta_addr, + pbss_desc->mac_address, sizeof(passo->peer_sta_addr)); + pos += sizeof(passo->peer_sta_addr); + + /* Set the listen interval */ + passo->listen_interval = wlan_cpu_to_le16(pmpriv->listen_interval); + /* Set the beacon period */ + passo->beacon_period = wlan_cpu_to_le16(pbss_desc->beacon_period); + + pos += sizeof(passo->cap_info); + pos += sizeof(passo->listen_interval); + pos += sizeof(passo->beacon_period); + pos += sizeof(passo->dtim_period); + + pssid_tlv = (MrvlIEtypes_SsIdParamSet_t *) pos; + pssid_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_SSID); + pssid_tlv->header.len = (t_u16) pbss_desc->ssid.ssid_len; + memcpy(pmadapter, pssid_tlv->ssid, pbss_desc->ssid.ssid, + pssid_tlv->header.len); + pos += sizeof(pssid_tlv->header) + pssid_tlv->header.len; + pssid_tlv->header.len = wlan_cpu_to_le16(pssid_tlv->header.len); + + pphy_tlv = (MrvlIEtypes_PhyParamSet_t *) pos; + pphy_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_PHY_DS); + pphy_tlv->header.len = sizeof(pphy_tlv->fh_ds.ds_param_set); + memcpy(pmadapter, &pphy_tlv->fh_ds.ds_param_set, + &pbss_desc->phy_param_set.ds_param_set.current_chan, + sizeof(pphy_tlv->fh_ds.ds_param_set)); + pos += sizeof(pphy_tlv->header) + pphy_tlv->header.len; + pphy_tlv->header.len = wlan_cpu_to_le16(pphy_tlv->header.len); + + pss_tlv = (MrvlIEtypes_SsParamSet_t *) pos; + pss_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_CF); + pss_tlv->header.len = sizeof(pss_tlv->cf_ibss.cf_param_set); + pos += sizeof(pss_tlv->header) + pss_tlv->header.len; + pss_tlv->header.len = wlan_cpu_to_le16(pss_tlv->header.len); + + /* Get the common rates supported between the driver and the BSS Desc */ + if (wlan_setup_rates_from_bssdesc + (pmpriv, pbss_desc, rates, &rates_size)) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + /* Save the data rates into Current BSS state structure */ + pmpriv->curr_bss_params.num_of_rates = rates_size; + memcpy(pmadapter, &pmpriv->curr_bss_params.data_rates, rates, + rates_size); + + /* Setup the Rates TLV in the association command */ + prates_tlv = (MrvlIEtypes_RatesParamSet_t *) pos; + prates_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_RATES); + prates_tlv->header.len = wlan_cpu_to_le16((t_u16) rates_size); + memcpy(pmadapter, prates_tlv->rates, rates, rates_size); + pos += sizeof(prates_tlv->header) + rates_size; + PRINTM(MINFO, "ASSOC_CMD: Rates size = %d\n", rates_size); + + /* Add the Authentication type to be used for Auth frames if needed */ + if (pmpriv->sec_info.authentication_mode != MLAN_AUTH_MODE_AUTO) { + pauth_tlv = (MrvlIEtypes_AuthType_t *) pos; + pauth_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_AUTH_TYPE); + pauth_tlv->header.len = sizeof(pauth_tlv->auth_type); + if ((pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled) + || (pmpriv->sec_info.authentication_mode == + MLAN_AUTH_MODE_NETWORKEAP)) + pauth_tlv->auth_type = + wlan_cpu_to_le16((t_u16) pmpriv->sec_info. + authentication_mode); + else + pauth_tlv->auth_type = + wlan_cpu_to_le16(MLAN_AUTH_MODE_OPEN); + pos += sizeof(pauth_tlv->header) + pauth_tlv->header.len; + pauth_tlv->header.len = wlan_cpu_to_le16(pauth_tlv->header.len); + } + + if (IS_SUPPORT_MULTI_BANDS(pmadapter) + && (pbss_desc->bss_band & pmpriv->config_bands) + && !(ISSUPP_11NENABLED(pmadapter->fw_cap_info) + && (!pbss_desc->disable_11n) + && (pmpriv->config_bands & BAND_GN + || pmpriv->config_bands & BAND_AN) + && (pbss_desc->pht_cap) + ) + ) { + /* Append a channel TLV for the channel the attempted AP was + found on */ + pchan_tlv = (MrvlIEtypes_ChanListParamSet_t *) pos; + pchan_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_CHANLIST); + pchan_tlv->header.len = + wlan_cpu_to_le16(sizeof(ChanScanParamSet_t)); + + memset(pmadapter, pchan_tlv->chan_scan_param, 0x00, + sizeof(ChanScanParamSet_t)); + pchan_tlv->chan_scan_param[0].chan_number = + (pbss_desc->phy_param_set.ds_param_set.current_chan); + PRINTM(MINFO, "Assoc: TLV Chan = %d\n", + pchan_tlv->chan_scan_param[0].chan_number); + + pchan_tlv->chan_scan_param[0].radio_type = + wlan_band_to_radio_type((t_u8) pbss_desc->bss_band); + + PRINTM(MINFO, "Assoc: TLV Band = %d\n", + pchan_tlv->chan_scan_param[0].radio_type); + pos += sizeof(pchan_tlv->header) + sizeof(ChanScanParamSet_t); + } + if (!pmpriv->wps.session_enable) { + if ((pmpriv->sec_info.wpa_enabled + || pmpriv->sec_info.wpa2_enabled)) { + prsn_ie_tlv = (MrvlIEtypes_RsnParamSet_t *) pos; + prsn_ie_tlv->header.type = (t_u16) pmpriv->wpa_ie[0]; /* WPA_IE + or + RSN_IE + */ + prsn_ie_tlv->header.type = + prsn_ie_tlv->header.type & 0x00FF; + prsn_ie_tlv->header.type = + wlan_cpu_to_le16(prsn_ie_tlv->header.type); + prsn_ie_tlv->header.len = (t_u16) pmpriv->wpa_ie[1]; + prsn_ie_tlv->header.len = + prsn_ie_tlv->header.len & 0x00FF; + if (prsn_ie_tlv->header.len <= + (sizeof(pmpriv->wpa_ie) - 2)) + memcpy(pmadapter, prsn_ie_tlv->rsn_ie, + &pmpriv->wpa_ie[2], + prsn_ie_tlv->header.len); + else { + ret = MLAN_STATUS_FAILURE; + goto done; + } + HEXDUMP("ASSOC_CMD: RSN IE", (t_u8 *) prsn_ie_tlv, + sizeof(prsn_ie_tlv->header) + + prsn_ie_tlv->header.len); + pos += sizeof(prsn_ie_tlv->header) + + prsn_ie_tlv->header.len; + prsn_ie_tlv->header.len = + wlan_cpu_to_le16(prsn_ie_tlv->header.len); + } else if (pmpriv->sec_info.ewpa_enabled) { + prsn_ie_tlv = (MrvlIEtypes_RsnParamSet_t *) pos; + if (pbss_desc->pwpa_ie) { + prsn_ie_tlv->header.type = + (t_u16) (*(pbss_desc->pwpa_ie)). + vend_hdr.element_id; + prsn_ie_tlv->header.type = + prsn_ie_tlv->header.type & 0x00FF; + prsn_ie_tlv->header.type = + wlan_cpu_to_le16(prsn_ie_tlv->header. + type); + prsn_ie_tlv->header.len = + (t_u16) (*(pbss_desc->pwpa_ie)). + vend_hdr.len; + prsn_ie_tlv->header.len = + prsn_ie_tlv->header.len & 0x00FF; + if (prsn_ie_tlv->header.len <= + (sizeof(pmpriv->wpa_ie))) { + memcpy(pmadapter, prsn_ie_tlv->rsn_ie, + &((*(pbss_desc->pwpa_ie)). + vend_hdr.oui[0]), + prsn_ie_tlv->header.len); + } else { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + HEXDUMP("ASSOC_CMD: RSN IE", + (t_u8 *) prsn_ie_tlv, + sizeof(prsn_ie_tlv->header) + + prsn_ie_tlv->header.len); + pos += sizeof(prsn_ie_tlv->header) + + prsn_ie_tlv->header.len; + prsn_ie_tlv->header.len = + wlan_cpu_to_le16(prsn_ie_tlv->header. + len); + } + if (pbss_desc->prsn_ie) { + prsn_ie_tlv = (MrvlIEtypes_RsnParamSet_t *) pos; + prsn_ie_tlv->header.type = + (t_u16) (*(pbss_desc->prsn_ie)). + ieee_hdr.element_id; + prsn_ie_tlv->header.type = + prsn_ie_tlv->header.type & 0x00FF; + prsn_ie_tlv->header.type = + wlan_cpu_to_le16(prsn_ie_tlv->header. + type); + prsn_ie_tlv->header.len = + (t_u16) (*(pbss_desc->prsn_ie)). + ieee_hdr.len; + prsn_ie_tlv->header.len = + prsn_ie_tlv->header.len & 0x00FF; + if (prsn_ie_tlv->header.len <= + (sizeof(pmpriv->wpa_ie))) { + memcpy(pmadapter, prsn_ie_tlv->rsn_ie, + &((*(pbss_desc->prsn_ie)). + data[0]) + , prsn_ie_tlv->header.len); + if (pmpriv->pmfcfg.mfpc || + pmpriv->pmfcfg.mfpr) { + wlan_update_rsn_ie(pmpriv, + prsn_ie_tlv); + } + } else { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + HEXDUMP("ASSOC_CMD: RSN IE", + (t_u8 *) prsn_ie_tlv, + sizeof(prsn_ie_tlv->header) + + prsn_ie_tlv->header.len); + pos += sizeof(prsn_ie_tlv->header) + + prsn_ie_tlv->header.len; + prsn_ie_tlv->header.len = + wlan_cpu_to_le16(prsn_ie_tlv->header. + len); + } + } + } + + if (ISSUPP_11NENABLED(pmadapter->fw_cap_info) + && (!pbss_desc->disable_11n) + && (pmpriv->config_bands & BAND_GN + || pmpriv->config_bands & BAND_AN)) + wlan_cmd_append_11n_tlv(pmpriv, pbss_desc, &pos); + + if (ISSUPP_11ACENABLED(pmadapter->fw_cap_info) + && (!pbss_desc->disable_11n) + && (pmpriv->config_bands & BAND_GAC + || pmpriv->config_bands & BAND_AAC)) + wlan_cmd_append_11ac_tlv(pmpriv, pbss_desc, &pos); + + wlan_wmm_process_association_req(pmpriv, &pos, &pbss_desc->wmm_ie, + pbss_desc->pht_cap); + if (pmpriv->sec_info.wapi_enabled && pmpriv->wapi_ie_len) { + wlan_cmd_append_wapi_ie(pmpriv, &pos); + } + + wlan_cmd_append_generic_ie(pmpriv, &pos); + + wlan_cmd_append_tsf_tlv(pmpriv, &pos, pbss_desc); + + if (wlan_11d_create_dnld_countryinfo + (pmpriv, (t_u8) pbss_desc->bss_band)) { + PRINTM(MERROR, "Dnld_countryinfo_11d failed\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + if (wlan_11d_parse_dnld_countryinfo + (pmpriv, pmpriv->pattempted_bss_desc)) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + /* + * Call 11h join API after capability bits are set so adhoc/infra 11h + * behavior can be properly triggered. pos modified if data is appended + */ + wlan_11h_process_join(pmpriv, &pos, &passo->cap_info, + (t_u8) pbss_desc->bss_band, + pbss_desc->phy_param_set.ds_param_set. + current_chan, &pbss_desc->wlan_11h_bss_info); + + cmd->size = wlan_cpu_to_le16((t_u16) (pos - (t_u8 *) passo) + S_DS_GEN); + + /* Set the Capability info at last */ + memcpy(pmadapter, &tmp_cap, &pbss_desc->cap_info, + sizeof(passo->cap_info)); + + if (pmpriv->config_bands == BAND_B) { + SHORT_SLOT_TIME_DISABLED(tmp_cap); + } + + tmp_cap &= CAPINFO_MASK; + PRINTM(MINFO, "ASSOC_CMD: tmp_cap=%4X CAPINFO_MASK=%4lX\n", + tmp_cap, CAPINFO_MASK); + tmp_cap = wlan_cpu_to_le16(tmp_cap); + memcpy(pmadapter, &passo->cap_info, &tmp_cap, sizeof(passo->cap_info)); + +done: + LEAVE(); + return ret; } /** @@ -842,7 +906,7 @@ wlan_cmd_802_11_associate(IN mlan_private * pmpriv, * .------------------------------------------------------------. * * - * For cases where an association response was received, the IEEE + * For cases where an association response was received, the IEEE * standard association response frame is returned: * * .------------------------------------------------------------. @@ -870,223 +934,236 @@ wlan_cmd_802_11_associate(IN mlan_private * pmpriv, */ mlan_status wlan_ret_802_11_associate(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * resp, IN t_void * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, IN t_void * pioctl_buf) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ioctl_req *pioctl_req = (mlan_ioctl_req *) pioctl_buf; - IEEEtypes_AssocRsp_t *passoc_rsp; - BSSDescriptor_t *pbss_desc; - t_u8 enable_data = MTRUE; - t_u8 event_buf[100]; - mlan_event *pevent = (mlan_event *) event_buf; - t_u8 cur_mac[MLAN_MAC_ADDR_LENGTH]; - t_u8 media_connected = pmpriv->media_connected; - mlan_adapter *pmadapter = pmpriv->adapter; - - ENTER(); - - passoc_rsp = (IEEEtypes_AssocRsp_t *) & resp->params; - passoc_rsp->status_code = wlan_le16_to_cpu(passoc_rsp->status_code); - if (pmpriv->media_connected == MTRUE) - memcpy(pmpriv->adapter, cur_mac, - pmpriv->curr_bss_params.bss_descriptor.mac_address, - MLAN_MAC_ADDR_LENGTH); - - HEXDUMP("ASSOC_RESP:", (t_u8 *) & resp->params, (resp->size - S_DS_GEN)); - - pmpriv->assoc_rsp_size = MIN(resp->size - S_DS_GEN, - sizeof(pmpriv->assoc_rsp_buf)); - - memcpy(pmpriv->adapter, pmpriv->assoc_rsp_buf, &resp->params, - pmpriv->assoc_rsp_size); - - if (passoc_rsp->status_code) { - if (pmpriv->media_connected == MTRUE) { - if (pmpriv->port_ctrl_mode == MTRUE) - pmpriv->port_open = pmpriv->prior_port_status; - if (!memcmp - (pmpriv->adapter, cur_mac, - pmpriv->pattempted_bss_desc->mac_address, - MLAN_MAC_ADDR_LENGTH)) - wlan_reset_connect_state(pmpriv, MTRUE); - else - wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_ASSOC_FAILURE_REPORT, - MNULL); - } else - wlan_reset_connect_state(pmpriv, MTRUE); - pmpriv->adapter->dbg.num_cmd_assoc_failure++; - PRINTM(MERROR, "ASSOC_RESP: Association Failed, " - "status code = %d, error = 0x%x, a_id = 0x%x\n", - wlan_le16_to_cpu(passoc_rsp->status_code), - wlan_le16_to_cpu(*(t_u16 *) & passoc_rsp->capability), - wlan_le16_to_cpu(passoc_rsp->a_id)); - - ret = MLAN_STATUS_FAILURE; - goto done; - } - - /* Send a Media Connected event, according to the Spec */ - pmpriv->media_connected = MTRUE; - - pmpriv->adapter->pps_uapsd_mode = MFALSE; - pmpriv->adapter->tx_lock_flag = MFALSE; - pmpriv->adapter->delay_null_pkt = MFALSE; - - /* Set the attempted BSSID Index to current */ - pbss_desc = pmpriv->pattempted_bss_desc; - - PRINTM(MCMND, "ASSOC_RESP: %-32s (a_id = 0x%x)\n", pbss_desc->ssid.ssid, - wlan_le16_to_cpu(passoc_rsp->a_id)); - - /* Make a copy of current BSSID descriptor */ - memcpy(pmpriv->adapter, &pmpriv->curr_bss_params.bss_descriptor, - pbss_desc, sizeof(BSSDescriptor_t)); - - /* Update curr_bss_params */ - pmpriv->curr_bss_params.bss_descriptor.channel - = pbss_desc->phy_param_set.ds_param_set.current_chan; - - pmpriv->curr_bss_params.band = (t_u8) pbss_desc->bss_band; - - /* - * Adjust the timestamps in the scan table to be relative to the newly - * associated AP's TSF - */ - wlan_update_tsf_timestamps(pmpriv, pbss_desc); - - if (pbss_desc->wmm_ie.vend_hdr.element_id == WMM_IE) - pmpriv->curr_bss_params.wmm_enabled = MTRUE; - else - pmpriv->curr_bss_params.wmm_enabled = MFALSE; - - if ((pmpriv->wmm_required - || (pbss_desc->pht_cap && - (pbss_desc->pht_cap->ieee_hdr.element_id == HT_CAPABILITY)) - ) && pmpriv->curr_bss_params.wmm_enabled) - pmpriv->wmm_enabled = MTRUE; - else - pmpriv->wmm_enabled = MFALSE; - - pmpriv->curr_bss_params.wmm_uapsd_enabled = MFALSE; - - if (pmpriv->wmm_enabled == MTRUE) - pmpriv->curr_bss_params.wmm_uapsd_enabled - = pbss_desc->wmm_ie.qos_info.qos_uapsd; - - PRINTM(MINFO, "ASSOC_RESP: curr_pkt_filter is 0x%x\n", - pmpriv->curr_pkt_filter); - if (pmpriv->sec_info.wpa_enabled || pmpriv->sec_info.wpa2_enabled) - pmpriv->wpa_is_gtk_set = MFALSE; - - if (pmpriv->wmm_enabled) - /* Don't re-enable carrier until we get the WMM_GET_STATUS event */ - enable_data = MFALSE; - else - /* Since WMM is not enabled, setup the queues with the defaults */ - wlan_wmm_setup_queues(pmpriv); - - if (enable_data) { - PRINTM(MINFO, "Post association, re-enabling data flow\n"); - } - - /* Reset SNR/NF/RSSI values */ - pmpriv->data_rssi_last = 0; - pmpriv->data_nf_last = 0; - pmpriv->data_rssi_avg = 0; - pmpriv->data_nf_avg = 0; - pmpriv->bcn_rssi_last = 0; - pmpriv->bcn_nf_last = 0; - pmpriv->bcn_rssi_avg = 0; - pmpriv->bcn_nf_avg = 0; - pmpriv->rxpd_rate = 0; - pmpriv->rxpd_rate_info = 0; - if (pbss_desc->pvht_cap && pbss_desc->pht_cap) { - if (GET_VHTCAP_MAXMPDULEN(pbss_desc->pvht_cap->vht_cap.vht_cap_info) == - 2) - pmpriv->max_amsdu = MLAN_TX_DATA_BUF_SIZE_12K; - else if (GET_VHTCAP_MAXMPDULEN - (pbss_desc->pvht_cap->vht_cap.vht_cap_info) == 1) - pmpriv->max_amsdu = MLAN_TX_DATA_BUF_SIZE_8K; - else - pmpriv->max_amsdu = MLAN_TX_DATA_BUF_SIZE_4K; - } else if (pbss_desc->pht_cap) { - if (GETHT_MAXAMSDU(pbss_desc->pht_cap->ht_cap.ht_cap_info)) - pmpriv->max_amsdu = MLAN_TX_DATA_BUF_SIZE_8K; - else - pmpriv->max_amsdu = MLAN_TX_DATA_BUF_SIZE_4K; - } - - wlan_save_curr_bcn(pmpriv); - - pmpriv->adapter->dbg.num_cmd_assoc_success++; - - PRINTM(MINFO, "ASSOC_RESP: Associated\n"); - pevent->bss_index = pmpriv->bss_index; - pevent->event_id = MLAN_EVENT_ID_DRV_CONNECTED; - pevent->event_len = MLAN_MAC_ADDR_LENGTH; - memcpy(pmpriv->adapter, (t_u8 *) pevent->event_buf, - (t_u8 *) pmpriv->curr_bss_params.bss_descriptor.mac_address, - MLAN_MAC_ADDR_LENGTH); - - /* Add the ra_list here for infra mode as there will be only 1 ra always */ - if (media_connected) { - /** replace ralist's mac address with new mac address */ - if (0 == - wlan_ralist_update(pmpriv, cur_mac, - pmpriv->curr_bss_params.bss_descriptor. - mac_address)) - wlan_ralist_add(pmpriv, - pmpriv->curr_bss_params.bss_descriptor.mac_address); - wlan_11n_cleanup_reorder_tbl(pmpriv); - - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - pmpriv->wmm.ra_list_spinlock); - wlan_11n_deleteall_txbastream_tbl(pmpriv); - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - pmpriv->wmm.ra_list_spinlock); - } else - wlan_ralist_add(pmpriv, - pmpriv->curr_bss_params.bss_descriptor.mac_address); - - wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_CONNECTED, pevent); - - /* Send OBSS scan param to the application if available */ - wlan_2040_coex_event(pmpriv); - - if (!pmpriv->sec_info.wpa_enabled - && !pmpriv->sec_info.wpa2_enabled - && !pmpriv->sec_info.ewpa_enabled - && !pmpriv->sec_info.wapi_enabled && !pmpriv->wps.session_enable) { - /* We are in Open/WEP mode, open port immediately */ - if (pmpriv->port_ctrl_mode == MTRUE) { - pmpriv->port_open = MTRUE; - PRINTM(MINFO, "ASSOC_RESP: port_status = OPEN\n"); - } - } - - if (pmpriv->sec_info.wpa_enabled - || pmpriv->sec_info.wpa2_enabled - || pmpriv->sec_info.ewpa_enabled - || pmpriv->sec_info.wapi_enabled || pmpriv->wps.session_enable) - pmpriv->adapter->scan_block = MTRUE; - - done: - /* Need to indicate IOCTL complete */ - if (pioctl_req != MNULL) { - if (ret != MLAN_STATUS_SUCCESS) { - if (passoc_rsp->status_code) - pioctl_req->status_code = - (wlan_le16_to_cpu(*(t_u16 *) & passoc_rsp->capability) << - 16) + wlan_le16_to_cpu(passoc_rsp->status_code); - else - pioctl_req->status_code = MLAN_ERROR_CMD_ASSOC_FAIL; - } else { - pioctl_req->status_code = MLAN_ERROR_NO_ERROR; - } - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ioctl_req *pioctl_req = (mlan_ioctl_req *) pioctl_buf; + IEEEtypes_AssocRsp_t *passoc_rsp; + BSSDescriptor_t *pbss_desc; + t_u8 enable_data = MTRUE; + t_u8 event_buf[100]; + mlan_event *pevent = (mlan_event *) event_buf; + t_u8 cur_mac[MLAN_MAC_ADDR_LENGTH]; + t_u8 media_connected = pmpriv->media_connected; + mlan_adapter *pmadapter = pmpriv->adapter; + + ENTER(); + + passoc_rsp = (IEEEtypes_AssocRsp_t *) & resp->params; + passoc_rsp->status_code = wlan_le16_to_cpu(passoc_rsp->status_code); + if (pmpriv->media_connected == MTRUE) + memcpy(pmpriv->adapter, cur_mac, + pmpriv->curr_bss_params.bss_descriptor.mac_address, + MLAN_MAC_ADDR_LENGTH); + + HEXDUMP("ASSOC_RESP:", (t_u8 *) & resp->params, + (resp->size - S_DS_GEN)); + + pmpriv->assoc_rsp_size = MIN(resp->size - S_DS_GEN, + sizeof(pmpriv->assoc_rsp_buf)); + + memcpy(pmpriv->adapter, pmpriv->assoc_rsp_buf, &resp->params, + pmpriv->assoc_rsp_size); + + if (passoc_rsp->status_code) { + if (pmpriv->media_connected == MTRUE) { + if (pmpriv->port_ctrl_mode == MTRUE) + pmpriv->port_open = pmpriv->prior_port_status; + if (!memcmp + (pmpriv->adapter, cur_mac, + pmpriv->pattempted_bss_desc->mac_address, + MLAN_MAC_ADDR_LENGTH)) + wlan_reset_connect_state(pmpriv, MTRUE); + else + wlan_recv_event(pmpriv, + MLAN_EVENT_ID_DRV_ASSOC_FAILURE_REPORT, + MNULL); + } else + wlan_reset_connect_state(pmpriv, MTRUE); + pmpriv->adapter->dbg.num_cmd_assoc_failure++; + PRINTM(MERROR, "ASSOC_RESP: Association Failed, " + "status code = %d, error = 0x%x, a_id = 0x%x\n", + wlan_le16_to_cpu(passoc_rsp->status_code), + wlan_le16_to_cpu(*(t_u16 *) & passoc_rsp->capability), + wlan_le16_to_cpu(passoc_rsp->a_id)); + + ret = MLAN_STATUS_FAILURE; + goto done; + } + + /* Send a Media Connected event, according to the Spec */ + pmpriv->media_connected = MTRUE; + + pmpriv->adapter->pps_uapsd_mode = MFALSE; + pmpriv->adapter->tx_lock_flag = MFALSE; + pmpriv->adapter->delay_null_pkt = MFALSE; + + /* Set the attempted BSSID Index to current */ + pbss_desc = pmpriv->pattempted_bss_desc; + + PRINTM(MCMND, "ASSOC_RESP: %-32s (a_id = 0x%x)\n", pbss_desc->ssid.ssid, + wlan_le16_to_cpu(passoc_rsp->a_id)); + + /* Make a copy of current BSSID descriptor */ + memcpy(pmpriv->adapter, &pmpriv->curr_bss_params.bss_descriptor, + pbss_desc, sizeof(BSSDescriptor_t)); + + /* Update curr_bss_params */ + pmpriv->curr_bss_params.bss_descriptor.channel + = pbss_desc->phy_param_set.ds_param_set.current_chan; + + pmpriv->curr_bss_params.band = (t_u8) pbss_desc->bss_band; + + /* + * Adjust the timestamps in the scan table to be relative to the newly + * associated AP's TSF + */ + wlan_update_tsf_timestamps(pmpriv, pbss_desc); + + if (pbss_desc->wmm_ie.vend_hdr.element_id == WMM_IE) + pmpriv->curr_bss_params.wmm_enabled = MTRUE; + else + pmpriv->curr_bss_params.wmm_enabled = MFALSE; + + if ((pmpriv->wmm_required + || (pbss_desc->pht_cap && + (pbss_desc->pht_cap->ieee_hdr.element_id == HT_CAPABILITY)) + ) && pmpriv->curr_bss_params.wmm_enabled) + pmpriv->wmm_enabled = MTRUE; + else + pmpriv->wmm_enabled = MFALSE; + + pmpriv->curr_bss_params.wmm_uapsd_enabled = MFALSE; + + if (pmpriv->wmm_enabled == MTRUE) + pmpriv->curr_bss_params.wmm_uapsd_enabled + = pbss_desc->wmm_ie.qos_info.qos_uapsd; + + PRINTM(MINFO, "ASSOC_RESP: curr_pkt_filter is 0x%x\n", + pmpriv->curr_pkt_filter); + if (pmpriv->sec_info.wpa_enabled || pmpriv->sec_info.wpa2_enabled) + pmpriv->wpa_is_gtk_set = MFALSE; + + if (pmpriv->wmm_enabled) + /* Don't re-enable carrier until we get the WMM_GET_STATUS + event */ + enable_data = MFALSE; + else + /* Since WMM is not enabled, setup the queues with the defaults + */ + wlan_wmm_setup_queues(pmpriv); + + if (enable_data) { + PRINTM(MINFO, "Post association, re-enabling data flow\n"); + } + + /* Reset SNR/NF/RSSI values */ + pmpriv->data_rssi_last = 0; + pmpriv->data_nf_last = 0; + pmpriv->data_rssi_avg = 0; + pmpriv->data_nf_avg = 0; + pmpriv->bcn_rssi_last = 0; + pmpriv->bcn_nf_last = 0; + pmpriv->bcn_rssi_avg = 0; + pmpriv->bcn_nf_avg = 0; + pmpriv->rxpd_rate = 0; + pmpriv->rxpd_rate_info = 0; + if (pbss_desc->pvht_cap && pbss_desc->pht_cap) { + if (GET_VHTCAP_MAXMPDULEN + (pbss_desc->pvht_cap->vht_cap.vht_cap_info) == 2) + pmpriv->max_amsdu = MLAN_TX_DATA_BUF_SIZE_12K; + else if (GET_VHTCAP_MAXMPDULEN + (pbss_desc->pvht_cap->vht_cap.vht_cap_info) == 1) + pmpriv->max_amsdu = MLAN_TX_DATA_BUF_SIZE_8K; + else + pmpriv->max_amsdu = MLAN_TX_DATA_BUF_SIZE_4K; + } else if (pbss_desc->pht_cap) { + if (GETHT_MAXAMSDU(pbss_desc->pht_cap->ht_cap.ht_cap_info)) + pmpriv->max_amsdu = MLAN_TX_DATA_BUF_SIZE_8K; + else + pmpriv->max_amsdu = MLAN_TX_DATA_BUF_SIZE_4K; + } + + wlan_save_curr_bcn(pmpriv); + + pmpriv->adapter->dbg.num_cmd_assoc_success++; + + PRINTM(MINFO, "ASSOC_RESP: Associated\n"); + pevent->bss_index = pmpriv->bss_index; + pevent->event_id = MLAN_EVENT_ID_DRV_CONNECTED; + pevent->event_len = MLAN_MAC_ADDR_LENGTH; + memcpy(pmpriv->adapter, (t_u8 *) pevent->event_buf, + (t_u8 *) pmpriv->curr_bss_params.bss_descriptor.mac_address, + MLAN_MAC_ADDR_LENGTH); + + /* Add the ra_list here for infra mode as there will be only 1 ra + always */ + if (media_connected) { + /** replace ralist's mac address with new mac address */ + if (0 == + wlan_ralist_update(pmpriv, cur_mac, + pmpriv->curr_bss_params.bss_descriptor. + mac_address)) + wlan_ralist_add(pmpriv, + pmpriv->curr_bss_params.bss_descriptor. + mac_address); + wlan_11n_cleanup_reorder_tbl(pmpriv); + + pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, + pmpriv->wmm. + ra_list_spinlock); + wlan_11n_deleteall_txbastream_tbl(pmpriv); + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + pmpriv->wmm. + ra_list_spinlock); + } else + wlan_ralist_add(pmpriv, + pmpriv->curr_bss_params.bss_descriptor. + mac_address); + + wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_CONNECTED, pevent); + + /* Send OBSS scan param to the application if available */ + wlan_2040_coex_event(pmpriv); + + if (!pmpriv->sec_info.wpa_enabled + && !pmpriv->sec_info.wpa2_enabled + && !pmpriv->sec_info.ewpa_enabled + && !pmpriv->sec_info.wapi_enabled && !pmpriv->wps.session_enable) { + /* We are in Open/WEP mode, open port immediately */ + if (pmpriv->port_ctrl_mode == MTRUE) { + pmpriv->port_open = MTRUE; + PRINTM(MINFO, "ASSOC_RESP: port_status = OPEN\n"); + } + } + + if (pmpriv->sec_info.wpa_enabled + || pmpriv->sec_info.wpa2_enabled + || pmpriv->sec_info.ewpa_enabled + || pmpriv->sec_info.wapi_enabled || pmpriv->wps.session_enable) + pmpriv->adapter->scan_block = MTRUE; + +done: + /* Need to indicate IOCTL complete */ + if (pioctl_req != MNULL) { + if (ret != MLAN_STATUS_SUCCESS) { + if (passoc_rsp->status_code) + pioctl_req->status_code = + (wlan_le16_to_cpu + (*(t_u16 *) & passoc_rsp-> + capability) << 16) + + wlan_le16_to_cpu(passoc_rsp-> + status_code); + else + pioctl_req->status_code = + MLAN_ERROR_CMD_ASSOC_FAIL; + } else { + pioctl_req->status_code = MLAN_ERROR_NO_ERROR; + } + } + + LEAVE(); + return ret; } /** @@ -1100,405 +1177,454 @@ wlan_ret_802_11_associate(IN mlan_private * pmpriv, */ mlan_status wlan_cmd_802_11_ad_hoc_start(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = pmpriv->adapter; - HostCmd_DS_802_11_AD_HOC_START *padhoc_start = &cmd->params.adhoc_start; - BSSDescriptor_t *pbss_desc; - t_u32 cmd_append_size = 0; - t_u32 i; - t_u16 tmp_cap; - MrvlIEtypes_ChanListParamSet_t *pchan_tlv; - - MrvlIEtypes_RsnParamSet_t *prsn_ie_tlv; - MrvlIETypes_HTCap_t *pht_cap; - MrvlIETypes_HTInfo_t *pht_info; - t_u32 rx_mcs_supp = 0; - MrvlIETypes_VHTCap_t *pvht_cap = MNULL; - MrvlIETypes_VHTOprat_t *pvht_op = MNULL; - t_u16 mcs_map_user = 0; - /* wpa ie for WPA_NONE AES */ - const t_u8 wpa_ie[24] = { 0xdd, 0x16, 0x00, 0x50, 0xf2, 0x01, 0x01, 0x00, - 0x00, 0x50, 0xf2, 0x04, 0x01, 0x00, 0x00, 0x50, - 0xf2, 0x00, 0x01, 0x00, 0x00, 0x50, 0xf2, 0x00 - }; - t_s32 append_size_11h = 0; - t_u8 *pos = (t_u8 *) padhoc_start + sizeof(HostCmd_DS_802_11_AD_HOC_START); - - ENTER(); - - if (!pmadapter) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_AD_HOC_START); - - pbss_desc = &pmpriv->curr_bss_params.bss_descriptor; - pmpriv->pattempted_bss_desc = pbss_desc; - - /* - * Fill in the parameters for 2 data structures: - * 1. HostCmd_DS_802_11_AD_HOC_START command - * 2. pbss_desc - * Driver will fill up SSID, bss_mode,IBSS param, Physical Param, - * probe delay, and Cap info. - * Firmware will fill up beacon period, Basic rates - * and operational rates. - */ - - memset(pmadapter, padhoc_start->ssid, 0, MLAN_MAX_SSID_LENGTH); - - memcpy(pmadapter, padhoc_start->ssid, - ((mlan_802_11_ssid *) pdata_buf)->ssid, - MIN(MLAN_MAX_SSID_LENGTH, - ((mlan_802_11_ssid *) pdata_buf)->ssid_len)); - - PRINTM(MINFO, "ADHOC_S_CMD: SSID = %s\n", padhoc_start->ssid); - - memset(pmadapter, pbss_desc->ssid.ssid, 0, MLAN_MAX_SSID_LENGTH); - memcpy(pmadapter, pbss_desc->ssid.ssid, - ((mlan_802_11_ssid *) pdata_buf)->ssid, - MIN(MLAN_MAX_SSID_LENGTH, - ((mlan_802_11_ssid *) pdata_buf)->ssid_len)); - - pbss_desc->ssid.ssid_len = - MIN(MLAN_MAX_SSID_LENGTH, ((mlan_802_11_ssid *) pdata_buf)->ssid_len); - - /* Set the BSS mode */ - padhoc_start->bss_mode = HostCmd_BSS_MODE_IBSS; - pbss_desc->bss_mode = MLAN_BSS_MODE_IBSS; - padhoc_start->beacon_period = wlan_cpu_to_le16(pmpriv->beacon_period); - pbss_desc->beacon_period = pmpriv->beacon_period; - - /* Set Physical param set */ + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + HostCmd_DS_802_11_AD_HOC_START *padhoc_start = &cmd->params.adhoc_start; + BSSDescriptor_t *pbss_desc; + t_u32 cmd_append_size = 0; + t_u32 i; + t_u16 tmp_cap; + MrvlIEtypes_ChanListParamSet_t *pchan_tlv; + + MrvlIEtypes_RsnParamSet_t *prsn_ie_tlv; + MrvlIETypes_HTCap_t *pht_cap; + MrvlIETypes_HTInfo_t *pht_info; + t_u32 rx_mcs_supp = 0; + MrvlIETypes_VHTCap_t *pvht_cap = MNULL; + MrvlIETypes_VHTOprat_t *pvht_op = MNULL; + t_u16 mcs_map_user = 0; + /* wpa ie for WPA_NONE AES */ + const t_u8 wpa_ie[24] = + { 0xdd, 0x16, 0x00, 0x50, 0xf2, 0x01, 0x01, 0x00, + 0x00, 0x50, 0xf2, 0x04, 0x01, 0x00, 0x00, 0x50, + 0xf2, 0x00, 0x01, 0x00, 0x00, 0x50, 0xf2, 0x00 + }; + t_s32 append_size_11h = 0; + t_u8 *pos = + (t_u8 *) padhoc_start + sizeof(HostCmd_DS_802_11_AD_HOC_START); + + ENTER(); + + if (!pmadapter) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_AD_HOC_START); + + pbss_desc = &pmpriv->curr_bss_params.bss_descriptor; + pmpriv->pattempted_bss_desc = pbss_desc; + + /* + * Fill in the parameters for 2 data structures: + * 1. HostCmd_DS_802_11_AD_HOC_START command + * 2. pbss_desc + * Driver will fill up SSID, bss_mode,IBSS param, Physical Param, + * probe delay, and Cap info. + * Firmware will fill up beacon period, Basic rates + * and operational rates. + */ + + memset(pmadapter, padhoc_start->ssid, 0, MLAN_MAX_SSID_LENGTH); + + memcpy(pmadapter, padhoc_start->ssid, + ((mlan_802_11_ssid *) pdata_buf)->ssid, + MIN(MLAN_MAX_SSID_LENGTH, + ((mlan_802_11_ssid *) pdata_buf)->ssid_len)); + + PRINTM(MINFO, "ADHOC_S_CMD: SSID = %s\n", padhoc_start->ssid); + + memset(pmadapter, pbss_desc->ssid.ssid, 0, MLAN_MAX_SSID_LENGTH); + memcpy(pmadapter, pbss_desc->ssid.ssid, + ((mlan_802_11_ssid *) pdata_buf)->ssid, + MIN(MLAN_MAX_SSID_LENGTH, + ((mlan_802_11_ssid *) pdata_buf)->ssid_len)); + + pbss_desc->ssid.ssid_len = + MIN(MLAN_MAX_SSID_LENGTH, + ((mlan_802_11_ssid *) pdata_buf)->ssid_len); + + /* Set the BSS mode */ + padhoc_start->bss_mode = HostCmd_BSS_MODE_IBSS; + pbss_desc->bss_mode = MLAN_BSS_MODE_IBSS; + padhoc_start->beacon_period = wlan_cpu_to_le16(pmpriv->beacon_period); + pbss_desc->beacon_period = pmpriv->beacon_period; + + /* Set Physical param set */ /** Parameter IE Id */ #define DS_PARA_IE_ID 3 /** Parameter IE length */ #define DS_PARA_IE_LEN 1 - padhoc_start->phy_param_set.ds_param_set.element_id = DS_PARA_IE_ID; - padhoc_start->phy_param_set.ds_param_set.len = DS_PARA_IE_LEN; + padhoc_start->phy_param_set.ds_param_set.element_id = DS_PARA_IE_ID; + padhoc_start->phy_param_set.ds_param_set.len = DS_PARA_IE_LEN; - if (!wlan_get_cfp_by_band_and_channel - (pmadapter, pmadapter->adhoc_start_band, (t_u16) pmpriv->adhoc_channel, - pmadapter->region_channel)) { + if (!wlan_get_cfp_by_band_and_channel + (pmadapter, pmadapter->adhoc_start_band, + (t_u16) pmpriv->adhoc_channel, pmadapter->region_channel)) { - chan_freq_power_t *cfp; - cfp = - wlan_get_cfp_by_band_and_channel(pmadapter, - pmadapter->adhoc_start_band, - FIRST_VALID_CHANNEL, - pmadapter->region_channel); - if (cfp) - pmpriv->adhoc_channel = (t_u8) cfp->channel; - } + chan_freq_power_t *cfp; + cfp = wlan_get_cfp_by_band_and_channel(pmadapter, + pmadapter-> + adhoc_start_band, + FIRST_VALID_CHANNEL, + pmadapter-> + region_channel); + if (cfp) + pmpriv->adhoc_channel = (t_u8) cfp->channel; + } - MASSERT(pmpriv->adhoc_channel); + MASSERT(pmpriv->adhoc_channel); - PRINTM(MINFO, "ADHOC_S_CMD: Creating ADHOC on Channel %d\n", - pmpriv->adhoc_channel); + PRINTM(MINFO, "ADHOC_S_CMD: Creating ADHOC on Channel %d\n", + pmpriv->adhoc_channel); - pmpriv->curr_bss_params.bss_descriptor.channel = pmpriv->adhoc_channel; - pmpriv->curr_bss_params.band = pmadapter->adhoc_start_band; + pmpriv->curr_bss_params.bss_descriptor.channel = pmpriv->adhoc_channel; + pmpriv->curr_bss_params.band = pmadapter->adhoc_start_band; - pbss_desc->channel = pmpriv->adhoc_channel; - padhoc_start->phy_param_set.ds_param_set.current_chan = - pmpriv->adhoc_channel; + pbss_desc->channel = pmpriv->adhoc_channel; + padhoc_start->phy_param_set.ds_param_set.current_chan = + pmpriv->adhoc_channel; - memcpy(pmadapter, &pbss_desc->phy_param_set, - &padhoc_start->phy_param_set, sizeof(IEEEtypes_PhyParamSet_t)); + memcpy(pmadapter, &pbss_desc->phy_param_set, + &padhoc_start->phy_param_set, sizeof(IEEEtypes_PhyParamSet_t)); - pbss_desc->network_type_use = Wlan802_11DS; + pbss_desc->network_type_use = Wlan802_11DS; - /* Set IBSS param set */ + /* Set IBSS param set */ /** IBSS parameter IE Id */ #define IBSS_PARA_IE_ID 6 /** IBSS parameter IE length */ #define IBSS_PARA_IE_LEN 2 - padhoc_start->ss_param_set.ibss_param_set.element_id = IBSS_PARA_IE_ID; - padhoc_start->ss_param_set.ibss_param_set.len = IBSS_PARA_IE_LEN; - padhoc_start->ss_param_set.ibss_param_set.atim_window - = wlan_cpu_to_le16(pmpriv->atim_window); - pbss_desc->atim_window = pmpriv->atim_window; - memcpy(pmadapter, &pbss_desc->ss_param_set, - &padhoc_start->ss_param_set, sizeof(IEEEtypes_SsParamSet_t)); - - /* Set Capability info */ - padhoc_start->cap.ess = 0; - padhoc_start->cap.ibss = 1; - pbss_desc->cap_info.ibss = 1; - - /* Set up privacy in pbss_desc */ - if (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled - || pmpriv->adhoc_aes_enabled - || pmpriv->sec_info.wpa_enabled || pmpriv->sec_info.ewpa_enabled) { + padhoc_start->ss_param_set.ibss_param_set.element_id = IBSS_PARA_IE_ID; + padhoc_start->ss_param_set.ibss_param_set.len = IBSS_PARA_IE_LEN; + padhoc_start->ss_param_set.ibss_param_set.atim_window + = wlan_cpu_to_le16(pmpriv->atim_window); + pbss_desc->atim_window = pmpriv->atim_window; + memcpy(pmadapter, &pbss_desc->ss_param_set, + &padhoc_start->ss_param_set, sizeof(IEEEtypes_SsParamSet_t)); + + /* Set Capability info */ + padhoc_start->cap.ess = 0; + padhoc_start->cap.ibss = 1; + pbss_desc->cap_info.ibss = 1; + + /* Set up privacy in pbss_desc */ + if (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled + || pmpriv->adhoc_aes_enabled + || pmpriv->sec_info.wpa_enabled || pmpriv->sec_info.ewpa_enabled) { /** Ad-Hoc capability privacy on */ #define AD_HOC_CAP_PRIVACY_ON 1 - PRINTM(MINFO, "ADHOC_S_CMD: wep_status set, Privacy to WEP\n"); - pbss_desc->privacy = Wlan802_11PrivFilter8021xWEP; - padhoc_start->cap.privacy = AD_HOC_CAP_PRIVACY_ON; - } else { - PRINTM(MWARN, "ADHOC_S_CMD: wep_status NOT set, Setting " - "Privacy to ACCEPT ALL\n"); - pbss_desc->privacy = Wlan802_11PrivFilterAcceptAll; - } - - memset(pmadapter, padhoc_start->DataRate, 0, - sizeof(padhoc_start->DataRate)); - - if ((pmpriv->adapter->region_code == COUNTRY_CODE_JP_40 || - pmpriv->adapter->region_code == COUNTRY_CODE_JP_FF) - && (pbss_desc->phy_param_set.ds_param_set.current_chan == 14)) { - wlan_get_active_data_rates(pmpriv, pmpriv->bss_mode, - BAND_B, padhoc_start->DataRate); - } else { - wlan_get_active_data_rates(pmpriv, pmpriv->bss_mode, - pmadapter->adhoc_start_band, - padhoc_start->DataRate); - } - - if ((pmadapter->adhoc_start_band & BAND_G) && - (pmpriv->curr_pkt_filter & HostCmd_ACT_MAC_ADHOC_G_PROTECTION_ON)) { - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_MAC_CONTROL, - HostCmd_ACT_GEN_SET, - 0, MNULL, &pmpriv->curr_pkt_filter); - - if (ret) { - PRINTM(MERROR, "ADHOC_S_CMD: G Protection config failed\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - } - /* Find the last non zero */ - for (i = 0; i < sizeof(padhoc_start->DataRate) && padhoc_start->DataRate[i]; - i++); - - pmpriv->curr_bss_params.num_of_rates = i; - - /* Copy the ad-hoc creating rates into Current BSS rate structure */ - memcpy(pmadapter, &pmpriv->curr_bss_params.data_rates, - &padhoc_start->DataRate, pmpriv->curr_bss_params.num_of_rates); - - PRINTM(MINFO, "ADHOC_S_CMD: Rates=%02x %02x %02x %02x \n", - padhoc_start->DataRate[0], padhoc_start->DataRate[1], - padhoc_start->DataRate[2], padhoc_start->DataRate[3]); - - PRINTM(MINFO, "ADHOC_S_CMD: AD HOC Start command is ready\n"); - - if (IS_SUPPORT_MULTI_BANDS(pmadapter)) { - /* Append a channel TLV */ - pchan_tlv = (MrvlIEtypes_ChanListParamSet_t *) pos; - pchan_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_CHANLIST); - pchan_tlv->header.len = wlan_cpu_to_le16(sizeof(ChanScanParamSet_t)); - - memset(pmadapter, pchan_tlv->chan_scan_param, 0x00, - sizeof(ChanScanParamSet_t)); - pchan_tlv->chan_scan_param[0].chan_number = - (t_u8) pmpriv->curr_bss_params.bss_descriptor.channel; - - PRINTM(MINFO, "ADHOC_S_CMD: TLV Chan = %d\n", - pchan_tlv->chan_scan_param[0].chan_number); - - pchan_tlv->chan_scan_param[0].radio_type - = wlan_band_to_radio_type(pmpriv->curr_bss_params.band); - if (pmadapter->adhoc_start_band & BAND_GN - || pmadapter->adhoc_start_band & BAND_AN - || pmadapter->adhoc_start_band & BAND_GAC - || pmadapter->adhoc_start_band & BAND_AAC) { - if (pmadapter->chan_bandwidth == CHANNEL_BW_40MHZ_ABOVE) { - pchan_tlv->chan_scan_param[0].radio_type |= - SECOND_CHANNEL_ABOVE; - pchan_tlv->chan_scan_param[0].radio_type |= CHAN_BW_40MHZ << 2; - } else if (pmadapter->chan_bandwidth == CHANNEL_BW_40MHZ_BELOW) { - pchan_tlv->chan_scan_param[0].radio_type |= - SECOND_CHANNEL_BELOW; - pchan_tlv->chan_scan_param[0].radio_type |= CHAN_BW_40MHZ << 2; - } else if (pmadapter->chan_bandwidth == CHANNEL_BW_80MHZ) { - pchan_tlv->chan_scan_param[0].radio_type |= CHAN_BW_80MHZ << 2; - } - } - PRINTM(MINFO, "ADHOC_S_CMD: TLV Band = %d\n", - pchan_tlv->chan_scan_param[0].radio_type); - pos += sizeof(pchan_tlv->header) + sizeof(ChanScanParamSet_t); - cmd_append_size += - sizeof(pchan_tlv->header) + sizeof(ChanScanParamSet_t); - } - - if (wlan_11d_create_dnld_countryinfo(pmpriv, pmpriv->curr_bss_params.band)) { - PRINTM(MERROR, "ADHOC_S_CMD: dnld_countryinfo_11d failed\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - - /* - * Call 11h start API to add any 11h flags/elements as TLV parameters - */ - append_size_11h = wlan_11h_process_start(pmpriv, &pos, &padhoc_start->cap, - pmpriv->adhoc_channel, - &pbss_desc->wlan_11h_bss_info); - if (append_size_11h >= 0) - cmd_append_size += append_size_11h; - else { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - if (pmpriv->sec_info.ewpa_enabled) { - memcpy(pmadapter, pmpriv->wpa_ie, wpa_ie, sizeof(wpa_ie)); - pmpriv->wpa_ie_len = sizeof(wpa_ie); - } - - if (pmpriv->sec_info.wpa_enabled || pmpriv->sec_info.ewpa_enabled) { - prsn_ie_tlv = (MrvlIEtypes_RsnParamSet_t *) pos; - prsn_ie_tlv->header.type = (t_u16) pmpriv->wpa_ie[0]; /* WPA_IE or - RSN_IE */ - prsn_ie_tlv->header.type = prsn_ie_tlv->header.type & 0x00FF; - prsn_ie_tlv->header.type = wlan_cpu_to_le16(prsn_ie_tlv->header.type); - prsn_ie_tlv->header.len = (t_u16) pmpriv->wpa_ie[1]; - prsn_ie_tlv->header.len = prsn_ie_tlv->header.len & 0x00FF; - if (prsn_ie_tlv->header.len <= (sizeof(pmpriv->wpa_ie) - 2)) - memcpy(pmadapter, prsn_ie_tlv->rsn_ie, &pmpriv->wpa_ie[2], - prsn_ie_tlv->header.len); - else { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - DBG_HEXDUMP(MCMD_D, "ADHOC_S_CMD: RSN IE", (t_u8 *) prsn_ie_tlv, - sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len); - pos += sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len; - cmd_append_size += - sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len; - prsn_ie_tlv->header.len = wlan_cpu_to_le16(prsn_ie_tlv->header.len); - } - - if (pmadapter->adhoc_11n_enabled == MTRUE) { - { - pht_cap = (MrvlIETypes_HTCap_t *) pos; - memset(pmadapter, pht_cap, 0, sizeof(MrvlIETypes_HTCap_t)); - pht_cap->header.type = wlan_cpu_to_le16(HT_CAPABILITY); - pht_cap->header.len = sizeof(HTCap_t); - rx_mcs_supp = GET_RXMCSSUPP(pmadapter->usr_dev_mcs_support); - /* Set MCS for 1x1/2x2 */ - memset(pmadapter, (t_u8 *) pht_cap->ht_cap.supported_mcs_set, 0xff, - rx_mcs_supp); - wlan_fill_ht_cap_tlv(pmpriv, pht_cap, pmpriv->curr_bss_params.band); - HEXDUMP("ADHOC_START: HT_CAPABILITIES IE", (t_u8 *) pht_cap, - sizeof(MrvlIETypes_HTCap_t)); - pos += sizeof(MrvlIETypes_HTCap_t); - cmd_append_size += sizeof(MrvlIETypes_HTCap_t); - pht_cap->header.len = wlan_cpu_to_le16(pht_cap->header.len); - } - { - pht_info = (MrvlIETypes_HTInfo_t *) pos; - memset(pmadapter, pht_info, 0, sizeof(MrvlIETypes_HTInfo_t)); - pht_info->header.type = wlan_cpu_to_le16(HT_OPERATION); - pht_info->header.len = sizeof(HTInfo_t); - pht_info->ht_info.pri_chan = - (t_u8) pmpriv->curr_bss_params.bss_descriptor.channel; - if ((pmadapter->chan_bandwidth == CHANNEL_BW_40MHZ_ABOVE) || - (pmadapter->chan_bandwidth == CHANNEL_BW_40MHZ_BELOW)) { - pht_info->ht_info.field2 = pmadapter->chan_bandwidth; - SET_CHANWIDTH40(pht_info->ht_info.field2); - } - pht_info->ht_info.field3 = NON_GREENFIELD_STAS; - pht_info->ht_info.basic_mcs_set[0] = 0xff; - HEXDUMP("ADHOC_START: HT_INFORMATION IE", (t_u8 *) pht_info, - sizeof(MrvlIETypes_HTInfo_t)); - pos += sizeof(MrvlIETypes_HTInfo_t); - cmd_append_size += sizeof(MrvlIETypes_HTInfo_t); - pht_info->header.len = wlan_cpu_to_le16(pht_info->header.len); - } - if (ISSUPP_11ACENABLED(pmadapter->fw_cap_info) - && (pmadapter->adhoc_start_band & BAND_GAC - || pmadapter->adhoc_start_band & BAND_AAC)) { - /* VHT Capabilities IE */ - pvht_cap = (MrvlIETypes_VHTCap_t *) pos; - memset(pmadapter, pvht_cap, 0, sizeof(MrvlIETypes_VHTCap_t)); - pht_cap->header.type = wlan_cpu_to_le16(VHT_CAPABILITY); - pht_cap->header.len = sizeof(VHT_capa_t); - /* rx MCS Map */ - mcs_map_user = GET_DEVRXMCSMAP(pmadapter->usr_dot_11ac_mcs_support); - pvht_cap->vht_cap.mcs_sets.rx_mcs_map = - wlan_cpu_to_le16(mcs_map_user); - /* rx highest rate */ - pvht_cap->vht_cap.mcs_sets.rx_max_rate = - wlan_convert_mcsmap_to_maxrate(pmpriv, - pmadapter->adhoc_start_band, - mcs_map_user); - pvht_cap->vht_cap.mcs_sets.rx_max_rate = - wlan_cpu_to_le16(pvht_cap->vht_cap.mcs_sets.rx_max_rate); - /* tx MCS map */ - mcs_map_user = GET_DEVTXMCSMAP(pmadapter->usr_dot_11ac_mcs_support); - pvht_cap->vht_cap.mcs_sets.tx_mcs_map = - wlan_cpu_to_le16(mcs_map_user); - /* tx highest rate */ - pvht_cap->vht_cap.mcs_sets.tx_max_rate = - wlan_convert_mcsmap_to_maxrate(pmpriv, - pmadapter->adhoc_start_band, - mcs_map_user); - pvht_cap->vht_cap.mcs_sets.tx_max_rate = - wlan_cpu_to_le16(pvht_cap->vht_cap.mcs_sets.tx_max_rate); - - wlan_fill_vht_cap_tlv(pmpriv, pvht_cap, - pmadapter->adhoc_start_band); - HEXDUMP("VHT_CAPABILITIES IE", (t_u8 *) pvht_cap, - sizeof(MrvlIETypes_VHTCap_t)); - pos += sizeof(MrvlIETypes_VHTCap_t); - cmd_append_size += sizeof(MrvlIETypes_VHTCap_t); - pvht_cap->header.len = wlan_cpu_to_le16(pvht_cap->header.len); - /* VHT Operation IE */ - pvht_op = (MrvlIETypes_VHTOprat_t *) pos; - memset(pmadapter, pvht_cap, 0, sizeof(MrvlIETypes_VHTOprat_t)); - pvht_op->header.type = wlan_cpu_to_le16(VHT_OPERATION); - pvht_op->header.len = sizeof(MrvlIETypes_VHTOprat_t) - - sizeof(MrvlIEtypesHeader_t); - if (pmadapter->chan_bandwidth == CHANNEL_BW_80MHZ) { - pvht_op->chan_width = VHT_OPER_CHWD_80MHZ; - /* central frequency */ - pvht_op->chan_center_freq_1 = - wlan_get_center_freq_idx(pmpriv, - pmadapter->adhoc_start_band, - pmpriv->adhoc_channel, - pmadapter->chan_bandwidth); - /* basic MCS (rx MCS Map) */ - pvht_op->basic_MCS_map = - GET_DEVRXMCSMAP(pmadapter->usr_dot_11ac_mcs_support); - pvht_op->basic_MCS_map = - wlan_cpu_to_le16(pvht_op->basic_MCS_map); - } - - HEXDUMP("VHT_OPERATION IE", (t_u8 *) pvht_op, - sizeof(MrvlIETypes_VHTOprat_t)); - pos += sizeof(MrvlIETypes_VHTOprat_t); - cmd_append_size += sizeof(MrvlIETypes_VHTOprat_t); - pvht_op->header.len = wlan_cpu_to_le16(pvht_op->header.len); - } - } - - cmd->size = - (t_u16) wlan_cpu_to_le16((t_u16) (sizeof(HostCmd_DS_802_11_AD_HOC_START) - + S_DS_GEN + cmd_append_size)); - - memcpy(pmadapter, &tmp_cap, &padhoc_start->cap, sizeof(t_u16)); - - if (pmadapter->adhoc_start_band == BAND_B) { - SHORT_SLOT_TIME_DISABLED(tmp_cap); - } else { - SHORT_SLOT_TIME_ENABLED(tmp_cap); - } - - tmp_cap = wlan_cpu_to_le16(tmp_cap); - memcpy(pmadapter, &padhoc_start->cap, &tmp_cap, sizeof(t_u16)); - - ret = MLAN_STATUS_SUCCESS; - done: - LEAVE(); - return ret; + PRINTM(MINFO, "ADHOC_S_CMD: wep_status set, Privacy to WEP\n"); + pbss_desc->privacy = Wlan802_11PrivFilter8021xWEP; + padhoc_start->cap.privacy = AD_HOC_CAP_PRIVACY_ON; + } else { + PRINTM(MWARN, "ADHOC_S_CMD: wep_status NOT set, Setting " + "Privacy to ACCEPT ALL\n"); + pbss_desc->privacy = Wlan802_11PrivFilterAcceptAll; + } + + memset(pmadapter, padhoc_start->DataRate, 0, + sizeof(padhoc_start->DataRate)); + + if ((pmpriv->adapter->region_code == COUNTRY_CODE_JP_40 || + pmpriv->adapter->region_code == COUNTRY_CODE_JP_FF) + && (pbss_desc->phy_param_set.ds_param_set.current_chan == 14)) { + wlan_get_active_data_rates(pmpriv, pmpriv->bss_mode, + BAND_B, padhoc_start->DataRate); + } else { + wlan_get_active_data_rates(pmpriv, pmpriv->bss_mode, + pmadapter->adhoc_start_band, + padhoc_start->DataRate); + } + + if ((pmadapter->adhoc_start_band & BAND_G) && + (pmpriv->curr_pkt_filter & HostCmd_ACT_MAC_ADHOC_G_PROTECTION_ON)) { + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_MAC_CONTROL, + HostCmd_ACT_GEN_SET, + 0, MNULL, &pmpriv->curr_pkt_filter); + + if (ret) { + PRINTM(MERROR, + "ADHOC_S_CMD: G Protection config failed\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + } + /* Find the last non zero */ + for (i = 0; + i < sizeof(padhoc_start->DataRate) && padhoc_start->DataRate[i]; + i++) ; + + pmpriv->curr_bss_params.num_of_rates = i; + + /* Copy the ad-hoc creating rates into Current BSS rate structure */ + memcpy(pmadapter, &pmpriv->curr_bss_params.data_rates, + &padhoc_start->DataRate, pmpriv->curr_bss_params.num_of_rates); + + PRINTM(MINFO, "ADHOC_S_CMD: Rates=%02x %02x %02x %02x \n", + padhoc_start->DataRate[0], padhoc_start->DataRate[1], + padhoc_start->DataRate[2], padhoc_start->DataRate[3]); + + PRINTM(MINFO, "ADHOC_S_CMD: AD HOC Start command is ready\n"); + + if (IS_SUPPORT_MULTI_BANDS(pmadapter)) { + /* Append a channel TLV */ + pchan_tlv = (MrvlIEtypes_ChanListParamSet_t *) pos; + pchan_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_CHANLIST); + pchan_tlv->header.len = + wlan_cpu_to_le16(sizeof(ChanScanParamSet_t)); + + memset(pmadapter, pchan_tlv->chan_scan_param, 0x00, + sizeof(ChanScanParamSet_t)); + pchan_tlv->chan_scan_param[0].chan_number = + (t_u8) pmpriv->curr_bss_params.bss_descriptor.channel; + + PRINTM(MINFO, "ADHOC_S_CMD: TLV Chan = %d\n", + pchan_tlv->chan_scan_param[0].chan_number); + + pchan_tlv->chan_scan_param[0].radio_type + = wlan_band_to_radio_type(pmpriv->curr_bss_params.band); + if (pmadapter->adhoc_start_band & BAND_GN + || pmadapter->adhoc_start_band & BAND_AN + || pmadapter->adhoc_start_band & BAND_GAC + || pmadapter->adhoc_start_band & BAND_AAC) { + if (pmadapter->chan_bandwidth == CHANNEL_BW_40MHZ_ABOVE) { + pchan_tlv->chan_scan_param[0].radio_type |= + SECOND_CHANNEL_ABOVE; + pchan_tlv->chan_scan_param[0].radio_type |= + CHAN_BW_40MHZ << 2; + } else if (pmadapter->chan_bandwidth == + CHANNEL_BW_40MHZ_BELOW) { + pchan_tlv->chan_scan_param[0].radio_type |= + SECOND_CHANNEL_BELOW; + pchan_tlv->chan_scan_param[0].radio_type |= + CHAN_BW_40MHZ << 2; + } else if (pmadapter->chan_bandwidth == + CHANNEL_BW_80MHZ) { + pchan_tlv->chan_scan_param[0].radio_type |= + CHAN_BW_80MHZ << 2; + } + } + PRINTM(MINFO, "ADHOC_S_CMD: TLV Band = %d\n", + pchan_tlv->chan_scan_param[0].radio_type); + pos += sizeof(pchan_tlv->header) + sizeof(ChanScanParamSet_t); + cmd_append_size += + sizeof(pchan_tlv->header) + sizeof(ChanScanParamSet_t); + } + + if (wlan_11d_create_dnld_countryinfo + (pmpriv, pmpriv->curr_bss_params.band)) { + PRINTM(MERROR, "ADHOC_S_CMD: dnld_countryinfo_11d failed\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + + /* + * Call 11h start API to add any 11h flags/elements as TLV parameters + */ + append_size_11h = + wlan_11h_process_start(pmpriv, &pos, &padhoc_start->cap, + pmpriv->adhoc_channel, + &pbss_desc->wlan_11h_bss_info); + if (append_size_11h >= 0) + cmd_append_size += append_size_11h; + else { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + if (pmpriv->sec_info.ewpa_enabled) { + memcpy(pmadapter, pmpriv->wpa_ie, wpa_ie, sizeof(wpa_ie)); + pmpriv->wpa_ie_len = sizeof(wpa_ie); + } + + if (pmpriv->sec_info.wpa_enabled || pmpriv->sec_info.ewpa_enabled) { + prsn_ie_tlv = (MrvlIEtypes_RsnParamSet_t *) pos; + prsn_ie_tlv->header.type = (t_u16) pmpriv->wpa_ie[0]; /* WPA_IE + or + RSN_IE + */ + prsn_ie_tlv->header.type = prsn_ie_tlv->header.type & 0x00FF; + prsn_ie_tlv->header.type = + wlan_cpu_to_le16(prsn_ie_tlv->header.type); + prsn_ie_tlv->header.len = (t_u16) pmpriv->wpa_ie[1]; + prsn_ie_tlv->header.len = prsn_ie_tlv->header.len & 0x00FF; + if (prsn_ie_tlv->header.len <= (sizeof(pmpriv->wpa_ie) - 2)) + memcpy(pmadapter, prsn_ie_tlv->rsn_ie, + &pmpriv->wpa_ie[2], prsn_ie_tlv->header.len); + else { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + DBG_HEXDUMP(MCMD_D, "ADHOC_S_CMD: RSN IE", (t_u8 *) prsn_ie_tlv, + sizeof(prsn_ie_tlv->header) + + prsn_ie_tlv->header.len); + pos += sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len; + cmd_append_size += + sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len; + prsn_ie_tlv->header.len = + wlan_cpu_to_le16(prsn_ie_tlv->header.len); + } + + if (pmadapter->adhoc_11n_enabled == MTRUE) { + { + pht_cap = (MrvlIETypes_HTCap_t *) pos; + memset(pmadapter, pht_cap, 0, + sizeof(MrvlIETypes_HTCap_t)); + pht_cap->header.type = wlan_cpu_to_le16(HT_CAPABILITY); + pht_cap->header.len = sizeof(HTCap_t); + rx_mcs_supp = + GET_RXMCSSUPP(pmadapter->usr_dev_mcs_support); + /* Set MCS for 1x1/2x2 */ + memset(pmadapter, + (t_u8 *) pht_cap->ht_cap.supported_mcs_set, 0xff, + rx_mcs_supp); + wlan_fill_ht_cap_tlv(pmpriv, pht_cap, + pmpriv->curr_bss_params.band); + HEXDUMP("ADHOC_START: HT_CAPABILITIES IE", + (t_u8 *) pht_cap, sizeof(MrvlIETypes_HTCap_t)); + pos += sizeof(MrvlIETypes_HTCap_t); + cmd_append_size += sizeof(MrvlIETypes_HTCap_t); + pht_cap->header.len = + wlan_cpu_to_le16(pht_cap->header.len); + } + { + pht_info = (MrvlIETypes_HTInfo_t *) pos; + memset(pmadapter, pht_info, 0, + sizeof(MrvlIETypes_HTInfo_t)); + pht_info->header.type = wlan_cpu_to_le16(HT_OPERATION); + pht_info->header.len = sizeof(HTInfo_t); + pht_info->ht_info.pri_chan = + (t_u8) pmpriv->curr_bss_params.bss_descriptor. + channel; + if ((pmadapter->chan_bandwidth == + CHANNEL_BW_40MHZ_ABOVE) || + (pmadapter->chan_bandwidth == + CHANNEL_BW_40MHZ_BELOW)) { + pht_info->ht_info.field2 = + pmadapter->chan_bandwidth; + SET_CHANWIDTH40(pht_info->ht_info.field2); + } + pht_info->ht_info.field3 = NON_GREENFIELD_STAS; + pht_info->ht_info.basic_mcs_set[0] = 0xff; + HEXDUMP("ADHOC_START: HT_INFORMATION IE", + (t_u8 *) pht_info, + sizeof(MrvlIETypes_HTInfo_t)); + pos += sizeof(MrvlIETypes_HTInfo_t); + cmd_append_size += sizeof(MrvlIETypes_HTInfo_t); + pht_info->header.len = + wlan_cpu_to_le16(pht_info->header.len); + } + if (ISSUPP_11ACENABLED(pmadapter->fw_cap_info) + && (pmadapter->adhoc_start_band & BAND_GAC + || pmadapter->adhoc_start_band & BAND_AAC)) { + /* VHT Capabilities IE */ + pvht_cap = (MrvlIETypes_VHTCap_t *) pos; + memset(pmadapter, pvht_cap, 0, + sizeof(MrvlIETypes_VHTCap_t)); + pht_cap->header.type = wlan_cpu_to_le16(VHT_CAPABILITY); + pht_cap->header.len = sizeof(VHT_capa_t); + /* rx MCS Map */ + mcs_map_user = + GET_DEVRXMCSMAP(pmadapter-> + usr_dot_11ac_mcs_support); + pvht_cap->vht_cap.mcs_sets.rx_mcs_map = + wlan_cpu_to_le16(mcs_map_user); + /* rx highest rate */ + pvht_cap->vht_cap.mcs_sets.rx_max_rate = + wlan_convert_mcsmap_to_maxrate(pmpriv, + pmadapter-> + adhoc_start_band, + mcs_map_user); + pvht_cap->vht_cap.mcs_sets.rx_max_rate = + wlan_cpu_to_le16(pvht_cap->vht_cap.mcs_sets. + rx_max_rate); + /* tx MCS map */ + mcs_map_user = + GET_DEVTXMCSMAP(pmadapter-> + usr_dot_11ac_mcs_support); + pvht_cap->vht_cap.mcs_sets.tx_mcs_map = + wlan_cpu_to_le16(mcs_map_user); + /* tx highest rate */ + pvht_cap->vht_cap.mcs_sets.tx_max_rate = + wlan_convert_mcsmap_to_maxrate(pmpriv, + pmadapter-> + adhoc_start_band, + mcs_map_user); + pvht_cap->vht_cap.mcs_sets.tx_max_rate = + wlan_cpu_to_le16(pvht_cap->vht_cap.mcs_sets. + tx_max_rate); + + wlan_fill_vht_cap_tlv(pmpriv, pvht_cap, + pmadapter->adhoc_start_band); + HEXDUMP("VHT_CAPABILITIES IE", (t_u8 *) pvht_cap, + sizeof(MrvlIETypes_VHTCap_t)); + pos += sizeof(MrvlIETypes_VHTCap_t); + cmd_append_size += sizeof(MrvlIETypes_VHTCap_t); + pvht_cap->header.len = + wlan_cpu_to_le16(pvht_cap->header.len); + /* VHT Operation IE */ + pvht_op = (MrvlIETypes_VHTOprat_t *) pos; + memset(pmadapter, pvht_cap, 0, + sizeof(MrvlIETypes_VHTOprat_t)); + pvht_op->header.type = wlan_cpu_to_le16(VHT_OPERATION); + pvht_op->header.len = sizeof(MrvlIETypes_VHTOprat_t) - + sizeof(MrvlIEtypesHeader_t); + if (pmadapter->chan_bandwidth == CHANNEL_BW_80MHZ) { + pvht_op->chan_width = VHT_OPER_CHWD_80MHZ; + /* central frequency */ + pvht_op->chan_center_freq_1 = + wlan_get_center_freq_idx(pmpriv, + pmadapter-> + adhoc_start_band, + pmpriv-> + adhoc_channel, + pmadapter-> + chan_bandwidth); + /* basic MCS (rx MCS Map) */ + pvht_op->basic_MCS_map = + GET_DEVRXMCSMAP(pmadapter-> + usr_dot_11ac_mcs_support); + pvht_op->basic_MCS_map = + wlan_cpu_to_le16(pvht_op-> + basic_MCS_map); + } + + HEXDUMP("VHT_OPERATION IE", (t_u8 *) pvht_op, + sizeof(MrvlIETypes_VHTOprat_t)); + pos += sizeof(MrvlIETypes_VHTOprat_t); + cmd_append_size += sizeof(MrvlIETypes_VHTOprat_t); + pvht_op->header.len = + wlan_cpu_to_le16(pvht_op->header.len); + } + } + + cmd->size = + (t_u16) + wlan_cpu_to_le16((t_u16) (sizeof(HostCmd_DS_802_11_AD_HOC_START) + + S_DS_GEN + cmd_append_size)); + + memcpy(pmadapter, &tmp_cap, &padhoc_start->cap, sizeof(t_u16)); + + if (pmadapter->adhoc_start_band == BAND_B) { + SHORT_SLOT_TIME_DISABLED(tmp_cap); + } else { + SHORT_SLOT_TIME_ENABLED(tmp_cap); + } + + tmp_cap = wlan_cpu_to_le16(tmp_cap); + memcpy(pmadapter, &padhoc_start->cap, &tmp_cap, sizeof(t_u16)); + + ret = MLAN_STATUS_SUCCESS; +done: + LEAVE(); + return ret; } /** @@ -1506,252 +1632,281 @@ wlan_cmd_802_11_ad_hoc_start(IN mlan_private * pmpriv, * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure - * @param pdata_buf Void cast of BSSDescriptor_t from the + * @param pdata_buf Void cast of BSSDescriptor_t from the * scan table to join * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ mlan_status wlan_cmd_802_11_ad_hoc_join(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = pmpriv->adapter; - HostCmd_DS_802_11_AD_HOC_JOIN *padhoc_join = &cmd->params.adhoc_join; - BSSDescriptor_t *pbss_desc = (BSSDescriptor_t *) pdata_buf; - MrvlIEtypes_ChanListParamSet_t *pchan_tlv; - MrvlIEtypes_RsnParamSet_t *prsn_ie_tlv; - t_u32 cmd_append_size = 0; - t_u16 tmp_cap; - t_u32 i, rates_size = 0; - t_u32 curr_pkt_filter; - t_u8 *pos = (t_u8 *) padhoc_join + sizeof(HostCmd_DS_802_11_AD_HOC_JOIN); - - ENTER(); + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + HostCmd_DS_802_11_AD_HOC_JOIN *padhoc_join = &cmd->params.adhoc_join; + BSSDescriptor_t *pbss_desc = (BSSDescriptor_t *) pdata_buf; + MrvlIEtypes_ChanListParamSet_t *pchan_tlv; + MrvlIEtypes_RsnParamSet_t *prsn_ie_tlv; + t_u32 cmd_append_size = 0; + t_u16 tmp_cap; + t_u32 i, rates_size = 0; + t_u32 curr_pkt_filter; + t_u8 *pos = + (t_u8 *) padhoc_join + sizeof(HostCmd_DS_802_11_AD_HOC_JOIN); + + ENTER(); /** Use G protection */ #define USE_G_PROTECTION 0x02 - if (pbss_desc->erp_flags & USE_G_PROTECTION) { - curr_pkt_filter = - pmpriv->curr_pkt_filter | HostCmd_ACT_MAC_ADHOC_G_PROTECTION_ON; - - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_MAC_CONTROL, - HostCmd_ACT_GEN_SET, 0, MNULL, &curr_pkt_filter); - if (ret) { - PRINTM(MERROR, "ADHOC_J_CMD: G Protection config failed\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - } - - pmpriv->pattempted_bss_desc = pbss_desc; - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_AD_HOC_JOIN); - - padhoc_join->bss_descriptor.bss_mode = HostCmd_BSS_MODE_IBSS; - - padhoc_join->bss_descriptor.beacon_period - = wlan_cpu_to_le16(pbss_desc->beacon_period); - - memcpy(pmadapter, &padhoc_join->bss_descriptor.bssid, - &pbss_desc->mac_address, MLAN_MAC_ADDR_LENGTH); - - memcpy(pmadapter, &padhoc_join->bss_descriptor.ssid, - &pbss_desc->ssid.ssid, - MIN(MLAN_MAX_SSID_LENGTH, pbss_desc->ssid.ssid_len)); - - memcpy(pmadapter, &padhoc_join->bss_descriptor.phy_param_set, - &pbss_desc->phy_param_set, sizeof(IEEEtypes_PhyParamSet_t)); - - memcpy(pmadapter, &padhoc_join->bss_descriptor.ss_param_set, - &pbss_desc->ss_param_set, sizeof(IEEEtypes_SsParamSet_t)); - - memcpy(pmadapter, &tmp_cap, &pbss_desc->cap_info, - sizeof(IEEEtypes_CapInfo_t)); - - tmp_cap &= CAPINFO_MASK; - - PRINTM(MINFO, "ADHOC_J_CMD: tmp_cap=%4X CAPINFO_MASK=%4lX\n", - tmp_cap, CAPINFO_MASK); - memcpy(pmadapter, &padhoc_join->bss_descriptor.cap, &tmp_cap, - sizeof(IEEEtypes_CapInfo_t)); - - /* Information on BSSID descriptor passed to FW */ - PRINTM(MINFO, - "ADHOC_J_CMD: BSSID = " MACSTR ", SSID = %s\n", - MAC2STR(padhoc_join->bss_descriptor.bssid), - padhoc_join->bss_descriptor.ssid); - - for (i = 0; i < WLAN_SUPPORTED_RATES && pbss_desc->supported_rates[i]; i++); - rates_size = i; - - /* Copy Data Rates from the Rates recorded in scan response */ - memset(pmadapter, padhoc_join->bss_descriptor.data_rates, 0, - sizeof(padhoc_join->bss_descriptor.data_rates)); - memcpy(pmadapter, padhoc_join->bss_descriptor.data_rates, - pbss_desc->supported_rates, rates_size); - - HEXDUMP("Adapted Rates:", padhoc_join->bss_descriptor.data_rates, - rates_size); - - /* Copy the adhoc join rates into Current BSS state structure */ - pmpriv->curr_bss_params.num_of_rates = rates_size; - memcpy(pmadapter, &pmpriv->curr_bss_params.data_rates, - pbss_desc->supported_rates, rates_size); - - /* Copy the channel information */ - pmpriv->curr_bss_params.bss_descriptor.channel = pbss_desc->channel; - pmpriv->curr_bss_params.band = (t_u8) pbss_desc->bss_band; - - if (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled - || pmpriv->adhoc_aes_enabled - || pmpriv->sec_info.wpa_enabled || pmpriv->sec_info.ewpa_enabled) - padhoc_join->bss_descriptor.cap.privacy = AD_HOC_CAP_PRIVACY_ON; - - if (IS_SUPPORT_MULTI_BANDS(pmadapter)) { - /* Append a channel TLV */ - pchan_tlv = (MrvlIEtypes_ChanListParamSet_t *) pos; - pchan_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_CHANLIST); - pchan_tlv->header.len = wlan_cpu_to_le16(sizeof(ChanScanParamSet_t)); - - memset(pmadapter, pchan_tlv->chan_scan_param, 0x00, - sizeof(ChanScanParamSet_t)); - pchan_tlv->chan_scan_param[0].chan_number = - (pbss_desc->phy_param_set.ds_param_set.current_chan); - PRINTM(MINFO, "ADHOC_J_CMD: TLV Chan = %d\n", - pchan_tlv->chan_scan_param[0].chan_number); - - pchan_tlv->chan_scan_param[0].radio_type - = wlan_band_to_radio_type((t_u8) pbss_desc->bss_band); - - PRINTM(MINFO, "ADHOC_J_CMD: TLV Band = %d\n", - pchan_tlv->chan_scan_param[0].radio_type); - pos += sizeof(pchan_tlv->header) + sizeof(ChanScanParamSet_t); - cmd_append_size += - sizeof(pchan_tlv->header) + sizeof(ChanScanParamSet_t); - } - - if (wlan_11d_create_dnld_countryinfo(pmpriv, (t_u8) pbss_desc->bss_band)) { - PRINTM(MERROR, "Dnld_countryinfo_11d failed\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - if (wlan_11d_parse_dnld_countryinfo(pmpriv, pmpriv->pattempted_bss_desc)) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - /* - * Call 11h join API after capability bits are set so - * adhoc/infra 11h behavior can be properly triggered. - * pos modified if data is appended - */ - cmd_append_size += wlan_11h_process_join(pmpriv, &pos, - &padhoc_join->bss_descriptor.cap, - (t_u8) pbss_desc->bss_band, - pbss_desc->channel, - &pbss_desc->wlan_11h_bss_info); - - if (pmpriv->sec_info.wpa_enabled) { - prsn_ie_tlv = (MrvlIEtypes_RsnParamSet_t *) pos; - prsn_ie_tlv->header.type = (t_u16) pmpriv->wpa_ie[0]; /* WPA_IE or - RSN_IE */ - prsn_ie_tlv->header.type = prsn_ie_tlv->header.type & 0x00FF; - prsn_ie_tlv->header.type = wlan_cpu_to_le16(prsn_ie_tlv->header.type); - prsn_ie_tlv->header.len = (t_u16) pmpriv->wpa_ie[1]; - prsn_ie_tlv->header.len = prsn_ie_tlv->header.len & 0x00FF; - if (prsn_ie_tlv->header.len <= (sizeof(pmpriv->wpa_ie) - 2)) - memcpy(pmadapter, prsn_ie_tlv->rsn_ie, &pmpriv->wpa_ie[2], - prsn_ie_tlv->header.len); - else { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - HEXDUMP("ADHOC_JOIN: RSN IE", (t_u8 *) prsn_ie_tlv, - sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len); - pos += sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len; - cmd_append_size += - sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len; - prsn_ie_tlv->header.len = wlan_cpu_to_le16(prsn_ie_tlv->header.len); - } else if (pmpriv->sec_info.ewpa_enabled) { - prsn_ie_tlv = (MrvlIEtypes_RsnParamSet_t *) pos; - if (pbss_desc->pwpa_ie) { - prsn_ie_tlv->header.type = - (t_u16) (*(pbss_desc->pwpa_ie)).vend_hdr.element_id; - prsn_ie_tlv->header.type = prsn_ie_tlv->header.type & 0x00FF; - prsn_ie_tlv->header.type = - wlan_cpu_to_le16(prsn_ie_tlv->header.type); - prsn_ie_tlv->header.len = - (t_u16) (*(pbss_desc->pwpa_ie)).vend_hdr.len; - prsn_ie_tlv->header.len = prsn_ie_tlv->header.len & 0x00FF; - if (prsn_ie_tlv->header.len <= (sizeof(pmpriv->wpa_ie))) { - memcpy(pmadapter, prsn_ie_tlv->rsn_ie, - &((*(pbss_desc->pwpa_ie)).vend_hdr.oui[0]), - prsn_ie_tlv->header.len); - } else { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - HEXDUMP("ADHOC_JOIN: RSN IE", (t_u8 *) prsn_ie_tlv, - sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len); - pos += sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len; - cmd_append_size += - sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len; - prsn_ie_tlv->header.len = wlan_cpu_to_le16(prsn_ie_tlv->header.len); - } - if (pbss_desc->prsn_ie) { - prsn_ie_tlv = (MrvlIEtypes_RsnParamSet_t *) pos; - prsn_ie_tlv->header.type = - (t_u16) (*(pbss_desc->prsn_ie)).ieee_hdr.element_id; - prsn_ie_tlv->header.type = prsn_ie_tlv->header.type & 0x00FF; - prsn_ie_tlv->header.type = - wlan_cpu_to_le16(prsn_ie_tlv->header.type); - prsn_ie_tlv->header.len = - (t_u16) (*(pbss_desc->prsn_ie)).ieee_hdr.len; - prsn_ie_tlv->header.len = prsn_ie_tlv->header.len & 0x00FF; - if (prsn_ie_tlv->header.len <= (sizeof(pmpriv->wpa_ie))) { - memcpy(pmadapter, prsn_ie_tlv->rsn_ie, - &((*(pbss_desc->prsn_ie)).data[0]) - , prsn_ie_tlv->header.len); - } else { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - HEXDUMP("ADHOC_JOIN: RSN IE", (t_u8 *) prsn_ie_tlv, - sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len); - pos += sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len; - cmd_append_size += - sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len; - prsn_ie_tlv->header.len = wlan_cpu_to_le16(prsn_ie_tlv->header.len); - } - } - - if (ISSUPP_11NENABLED(pmadapter->fw_cap_info) - ) - cmd_append_size += wlan_cmd_append_11n_tlv(pmpriv, pbss_desc, &pos); - if (ISSUPP_11ACENABLED(pmadapter->fw_cap_info) - && (pmadapter->adhoc_start_band & BAND_GAC - || pmadapter->adhoc_start_band & BAND_AAC)) - wlan_cmd_append_11ac_tlv(pmpriv, pbss_desc, &pos); - - cmd->size = - (t_u16) wlan_cpu_to_le16((t_u16) (sizeof(HostCmd_DS_802_11_AD_HOC_JOIN) - + S_DS_GEN + cmd_append_size)); - - memcpy(pmadapter, &tmp_cap, &padhoc_join->bss_descriptor.cap, - sizeof(IEEEtypes_CapInfo_t)); - tmp_cap = wlan_cpu_to_le16(tmp_cap); - - memcpy(pmadapter, &padhoc_join->bss_descriptor.cap, - &tmp_cap, sizeof(IEEEtypes_CapInfo_t)); - - done: - LEAVE(); - return ret; + if (pbss_desc->erp_flags & USE_G_PROTECTION) { + curr_pkt_filter = + pmpriv-> + curr_pkt_filter | HostCmd_ACT_MAC_ADHOC_G_PROTECTION_ON; + + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_MAC_CONTROL, + HostCmd_ACT_GEN_SET, + 0, MNULL, &curr_pkt_filter); + if (ret) { + PRINTM(MERROR, + "ADHOC_J_CMD: G Protection config failed\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + } + + pmpriv->pattempted_bss_desc = pbss_desc; + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_AD_HOC_JOIN); + + padhoc_join->bss_descriptor.bss_mode = HostCmd_BSS_MODE_IBSS; + + padhoc_join->bss_descriptor.beacon_period + = wlan_cpu_to_le16(pbss_desc->beacon_period); + + memcpy(pmadapter, &padhoc_join->bss_descriptor.bssid, + &pbss_desc->mac_address, MLAN_MAC_ADDR_LENGTH); + + memcpy(pmadapter, &padhoc_join->bss_descriptor.ssid, + &pbss_desc->ssid.ssid, + MIN(MLAN_MAX_SSID_LENGTH, pbss_desc->ssid.ssid_len)); + + memcpy(pmadapter, &padhoc_join->bss_descriptor.phy_param_set, + &pbss_desc->phy_param_set, sizeof(IEEEtypes_PhyParamSet_t)); + + memcpy(pmadapter, &padhoc_join->bss_descriptor.ss_param_set, + &pbss_desc->ss_param_set, sizeof(IEEEtypes_SsParamSet_t)); + + memcpy(pmadapter, &tmp_cap, &pbss_desc->cap_info, + sizeof(IEEEtypes_CapInfo_t)); + + tmp_cap &= CAPINFO_MASK; + + PRINTM(MINFO, "ADHOC_J_CMD: tmp_cap=%4X CAPINFO_MASK=%4lX\n", + tmp_cap, CAPINFO_MASK); + memcpy(pmadapter, &padhoc_join->bss_descriptor.cap, &tmp_cap, + sizeof(IEEEtypes_CapInfo_t)); + + /* Information on BSSID descriptor passed to FW */ + PRINTM(MINFO, + "ADHOC_J_CMD: BSSID = " MACSTR ", SSID = %s\n", + MAC2STR(padhoc_join->bss_descriptor.bssid), + padhoc_join->bss_descriptor.ssid); + + for (i = 0; i < WLAN_SUPPORTED_RATES && pbss_desc->supported_rates[i]; + i++) ; + rates_size = i; + + /* Copy Data Rates from the Rates recorded in scan response */ + memset(pmadapter, padhoc_join->bss_descriptor.data_rates, 0, + sizeof(padhoc_join->bss_descriptor.data_rates)); + memcpy(pmadapter, padhoc_join->bss_descriptor.data_rates, + pbss_desc->supported_rates, rates_size); + + HEXDUMP("Adapted Rates:", padhoc_join->bss_descriptor.data_rates, + rates_size); + + /* Copy the adhoc join rates into Current BSS state structure */ + pmpriv->curr_bss_params.num_of_rates = rates_size; + memcpy(pmadapter, &pmpriv->curr_bss_params.data_rates, + pbss_desc->supported_rates, rates_size); + + /* Copy the channel information */ + pmpriv->curr_bss_params.bss_descriptor.channel = pbss_desc->channel; + pmpriv->curr_bss_params.band = (t_u8) pbss_desc->bss_band; + + if (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled + || pmpriv->adhoc_aes_enabled + || pmpriv->sec_info.wpa_enabled || pmpriv->sec_info.ewpa_enabled) + padhoc_join->bss_descriptor.cap.privacy = AD_HOC_CAP_PRIVACY_ON; + + if (IS_SUPPORT_MULTI_BANDS(pmadapter)) { + /* Append a channel TLV */ + pchan_tlv = (MrvlIEtypes_ChanListParamSet_t *) pos; + pchan_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_CHANLIST); + pchan_tlv->header.len = + wlan_cpu_to_le16(sizeof(ChanScanParamSet_t)); + + memset(pmadapter, pchan_tlv->chan_scan_param, 0x00, + sizeof(ChanScanParamSet_t)); + pchan_tlv->chan_scan_param[0].chan_number = + (pbss_desc->phy_param_set.ds_param_set.current_chan); + PRINTM(MINFO, "ADHOC_J_CMD: TLV Chan = %d\n", + pchan_tlv->chan_scan_param[0].chan_number); + + pchan_tlv->chan_scan_param[0].radio_type + = wlan_band_to_radio_type((t_u8) pbss_desc->bss_band); + + PRINTM(MINFO, "ADHOC_J_CMD: TLV Band = %d\n", + pchan_tlv->chan_scan_param[0].radio_type); + pos += sizeof(pchan_tlv->header) + sizeof(ChanScanParamSet_t); + cmd_append_size += + sizeof(pchan_tlv->header) + sizeof(ChanScanParamSet_t); + } + + if (wlan_11d_create_dnld_countryinfo + (pmpriv, (t_u8) pbss_desc->bss_band)) { + PRINTM(MERROR, "Dnld_countryinfo_11d failed\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + if (wlan_11d_parse_dnld_countryinfo + (pmpriv, pmpriv->pattempted_bss_desc)) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + /* + * Call 11h join API after capability bits are set so + * adhoc/infra 11h behavior can be properly triggered. + * pos modified if data is appended + */ + cmd_append_size += wlan_11h_process_join(pmpriv, &pos, + &padhoc_join->bss_descriptor. + cap, + (t_u8) pbss_desc->bss_band, + pbss_desc->channel, + &pbss_desc->wlan_11h_bss_info); + + if (pmpriv->sec_info.wpa_enabled) { + prsn_ie_tlv = (MrvlIEtypes_RsnParamSet_t *) pos; + prsn_ie_tlv->header.type = (t_u16) pmpriv->wpa_ie[0]; /* WPA_IE + or + RSN_IE + */ + prsn_ie_tlv->header.type = prsn_ie_tlv->header.type & 0x00FF; + prsn_ie_tlv->header.type = + wlan_cpu_to_le16(prsn_ie_tlv->header.type); + prsn_ie_tlv->header.len = (t_u16) pmpriv->wpa_ie[1]; + prsn_ie_tlv->header.len = prsn_ie_tlv->header.len & 0x00FF; + if (prsn_ie_tlv->header.len <= (sizeof(pmpriv->wpa_ie) - 2)) + memcpy(pmadapter, prsn_ie_tlv->rsn_ie, + &pmpriv->wpa_ie[2], prsn_ie_tlv->header.len); + else { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + HEXDUMP("ADHOC_JOIN: RSN IE", (t_u8 *) prsn_ie_tlv, + sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len); + pos += sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len; + cmd_append_size += + sizeof(prsn_ie_tlv->header) + prsn_ie_tlv->header.len; + prsn_ie_tlv->header.len = + wlan_cpu_to_le16(prsn_ie_tlv->header.len); + } else if (pmpriv->sec_info.ewpa_enabled) { + prsn_ie_tlv = (MrvlIEtypes_RsnParamSet_t *) pos; + if (pbss_desc->pwpa_ie) { + prsn_ie_tlv->header.type = + (t_u16) (*(pbss_desc->pwpa_ie)).vend_hdr. + element_id; + prsn_ie_tlv->header.type = + prsn_ie_tlv->header.type & 0x00FF; + prsn_ie_tlv->header.type = + wlan_cpu_to_le16(prsn_ie_tlv->header.type); + prsn_ie_tlv->header.len = + (t_u16) (*(pbss_desc->pwpa_ie)).vend_hdr.len; + prsn_ie_tlv->header.len = + prsn_ie_tlv->header.len & 0x00FF; + if (prsn_ie_tlv->header.len <= (sizeof(pmpriv->wpa_ie))) { + memcpy(pmadapter, prsn_ie_tlv->rsn_ie, + &((*(pbss_desc->pwpa_ie)).vend_hdr. + oui[0]), prsn_ie_tlv->header.len); + } else { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + HEXDUMP("ADHOC_JOIN: RSN IE", (t_u8 *) prsn_ie_tlv, + sizeof(prsn_ie_tlv->header) + + prsn_ie_tlv->header.len); + pos += sizeof(prsn_ie_tlv->header) + + prsn_ie_tlv->header.len; + cmd_append_size += + sizeof(prsn_ie_tlv->header) + + prsn_ie_tlv->header.len; + prsn_ie_tlv->header.len = + wlan_cpu_to_le16(prsn_ie_tlv->header.len); + } + if (pbss_desc->prsn_ie) { + prsn_ie_tlv = (MrvlIEtypes_RsnParamSet_t *) pos; + prsn_ie_tlv->header.type = + (t_u16) (*(pbss_desc->prsn_ie)).ieee_hdr. + element_id; + prsn_ie_tlv->header.type = + prsn_ie_tlv->header.type & 0x00FF; + prsn_ie_tlv->header.type = + wlan_cpu_to_le16(prsn_ie_tlv->header.type); + prsn_ie_tlv->header.len = + (t_u16) (*(pbss_desc->prsn_ie)).ieee_hdr.len; + prsn_ie_tlv->header.len = + prsn_ie_tlv->header.len & 0x00FF; + if (prsn_ie_tlv->header.len <= (sizeof(pmpriv->wpa_ie))) { + memcpy(pmadapter, prsn_ie_tlv->rsn_ie, + &((*(pbss_desc->prsn_ie)).data[0]) + , prsn_ie_tlv->header.len); + } else { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + HEXDUMP("ADHOC_JOIN: RSN IE", (t_u8 *) prsn_ie_tlv, + sizeof(prsn_ie_tlv->header) + + prsn_ie_tlv->header.len); + pos += sizeof(prsn_ie_tlv->header) + + prsn_ie_tlv->header.len; + cmd_append_size += + sizeof(prsn_ie_tlv->header) + + prsn_ie_tlv->header.len; + prsn_ie_tlv->header.len = + wlan_cpu_to_le16(prsn_ie_tlv->header.len); + } + } + + if (ISSUPP_11NENABLED(pmadapter->fw_cap_info) + ) + cmd_append_size += + wlan_cmd_append_11n_tlv(pmpriv, pbss_desc, &pos); + if (ISSUPP_11ACENABLED(pmadapter->fw_cap_info) + && (pmadapter->adhoc_start_band & BAND_GAC + || pmadapter->adhoc_start_band & BAND_AAC)) + wlan_cmd_append_11ac_tlv(pmpriv, pbss_desc, &pos); + + cmd->size = + (t_u16) + wlan_cpu_to_le16((t_u16) (sizeof(HostCmd_DS_802_11_AD_HOC_JOIN) + + S_DS_GEN + cmd_append_size)); + + memcpy(pmadapter, &tmp_cap, &padhoc_join->bss_descriptor.cap, + sizeof(IEEEtypes_CapInfo_t)); + tmp_cap = wlan_cpu_to_le16(tmp_cap); + + memcpy(pmadapter, &padhoc_join->bss_descriptor.cap, + &tmp_cap, sizeof(IEEEtypes_CapInfo_t)); + +done: + LEAVE(); + return ret; } /** @@ -1766,101 +1921,101 @@ wlan_cmd_802_11_ad_hoc_join(IN mlan_private * pmpriv, */ mlan_status wlan_ret_802_11_ad_hoc(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * resp, IN t_void * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, IN t_void * pioctl_buf) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ioctl_req *pioctl_req = (mlan_ioctl_req *) pioctl_buf; - HostCmd_DS_802_11_AD_HOC_START_RESULT *padhoc_start_result = - &resp->params.adhoc_start_result; - HostCmd_DS_802_11_AD_HOC_JOIN_RESULT *padhoc_join_result = - &resp->params.adhoc_join_result; - BSSDescriptor_t *pbss_desc; - t_u16 command = resp->command; - t_u8 result = 0; - t_u8 event_buf[100]; - mlan_event *pevent = (mlan_event *) event_buf; - - ENTER(); - - if (command == HostCmd_CMD_802_11_AD_HOC_START) - result = padhoc_start_result->result; - else - result = padhoc_join_result->result; - - pbss_desc = pmpriv->pattempted_bss_desc; - - /* - * Join result code 0 --> SUCCESS - */ - if (result) { - PRINTM(MERROR, "ADHOC_RESP Failed 0x%x\n", result); - if (pmpriv->media_connected == MTRUE) - wlan_reset_connect_state(pmpriv, MTRUE); - if (pmpriv->adhoc_state == ADHOC_STARTING) - pmpriv->adhoc_state = ADHOC_IDLE; - - memset(pmpriv->adapter, &pmpriv->curr_bss_params.bss_descriptor, - 0x00, sizeof(BSSDescriptor_t)); - - ret = MLAN_STATUS_FAILURE; - goto done; - } - - /* Send a Media Connected event, according to the Spec */ - pmpriv->media_connected = MTRUE; - - if (command == HostCmd_CMD_802_11_AD_HOC_START) { - PRINTM(MINFO, "ADHOC_S_RESP %s\n", pbss_desc->ssid.ssid); - - /* Update the created network descriptor with the new BSSID */ - memcpy(pmpriv->adapter, pbss_desc->mac_address, - padhoc_start_result->bssid, MLAN_MAC_ADDR_LENGTH); - - pmpriv->adhoc_state = ADHOC_STARTED; - if (pmpriv->adapter->state_rdh.stage == RDH_RESTART_INTFS) - wlan_11h_radar_detected_callback((t_void *) pmpriv); - } else { - /* - * Now the join cmd should be successful. - * If BSSID has changed use SSID to compare instead of BSSID - */ - PRINTM(MINFO, "ADHOC_J_RESP %s\n", pbss_desc->ssid.ssid); - - /* - * Make a copy of current BSSID descriptor, only needed for join since - * the current descriptor is already being used for adhoc start - */ - memcpy(pmpriv->adapter, &pmpriv->curr_bss_params.bss_descriptor, - pbss_desc, sizeof(BSSDescriptor_t)); - - pmpriv->adhoc_state = ADHOC_JOINED; - } - - PRINTM(MINFO, "ADHOC_RESP: Channel = %d\n", pmpriv->adhoc_channel); - PRINTM(MINFO, "ADHOC_RESP: BSSID = " MACSTR "\n", - MAC2STR(pmpriv->curr_bss_params.bss_descriptor.mac_address)); - - pevent->bss_index = pmpriv->bss_index; - pevent->event_id = MLAN_EVENT_ID_DRV_CONNECTED; - pevent->event_len = MLAN_MAC_ADDR_LENGTH; - memcpy(pmpriv->adapter, (t_u8 *) pevent->event_buf, - (t_u8 *) pmpriv->curr_bss_params.bss_descriptor.mac_address, - MLAN_MAC_ADDR_LENGTH); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_CONNECTED, pevent); - wlan_save_curr_bcn(pmpriv); - - done: - /* Need to indicate IOCTL complete */ - if (pioctl_req != MNULL) { - if (ret != MLAN_STATUS_SUCCESS) { - pioctl_req->status_code = MLAN_ERROR_CMD_ASSOC_FAIL; - } else { - pioctl_req->status_code = MLAN_ERROR_NO_ERROR; - } - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ioctl_req *pioctl_req = (mlan_ioctl_req *) pioctl_buf; + HostCmd_DS_802_11_AD_HOC_START_RESULT *padhoc_start_result = + &resp->params.adhoc_start_result; + HostCmd_DS_802_11_AD_HOC_JOIN_RESULT *padhoc_join_result = + &resp->params.adhoc_join_result; + BSSDescriptor_t *pbss_desc; + t_u16 command = resp->command; + t_u8 result = 0; + t_u8 event_buf[100]; + mlan_event *pevent = (mlan_event *) event_buf; + + ENTER(); + + if (command == HostCmd_CMD_802_11_AD_HOC_START) + result = padhoc_start_result->result; + else + result = padhoc_join_result->result; + + pbss_desc = pmpriv->pattempted_bss_desc; + + /* + * Join result code 0 --> SUCCESS + */ + if (result) { + PRINTM(MERROR, "ADHOC_RESP Failed 0x%x\n", result); + if (pmpriv->media_connected == MTRUE) + wlan_reset_connect_state(pmpriv, MTRUE); + if (pmpriv->adhoc_state == ADHOC_STARTING) + pmpriv->adhoc_state = ADHOC_IDLE; + + memset(pmpriv->adapter, &pmpriv->curr_bss_params.bss_descriptor, + 0x00, sizeof(BSSDescriptor_t)); + + ret = MLAN_STATUS_FAILURE; + goto done; + } + + /* Send a Media Connected event, according to the Spec */ + pmpriv->media_connected = MTRUE; + + if (command == HostCmd_CMD_802_11_AD_HOC_START) { + PRINTM(MINFO, "ADHOC_S_RESP %s\n", pbss_desc->ssid.ssid); + + /* Update the created network descriptor with the new BSSID */ + memcpy(pmpriv->adapter, pbss_desc->mac_address, + padhoc_start_result->bssid, MLAN_MAC_ADDR_LENGTH); + + pmpriv->adhoc_state = ADHOC_STARTED; + if (pmpriv->adapter->state_rdh.stage == RDH_RESTART_INTFS) + wlan_11h_radar_detected_callback((t_void *) pmpriv); + } else { + /* + * Now the join cmd should be successful. + * If BSSID has changed use SSID to compare instead of BSSID + */ + PRINTM(MINFO, "ADHOC_J_RESP %s\n", pbss_desc->ssid.ssid); + + /* + * Make a copy of current BSSID descriptor, only needed for join since + * the current descriptor is already being used for adhoc start + */ + memcpy(pmpriv->adapter, &pmpriv->curr_bss_params.bss_descriptor, + pbss_desc, sizeof(BSSDescriptor_t)); + + pmpriv->adhoc_state = ADHOC_JOINED; + } + + PRINTM(MINFO, "ADHOC_RESP: Channel = %d\n", pmpriv->adhoc_channel); + PRINTM(MINFO, "ADHOC_RESP: BSSID = " MACSTR "\n", + MAC2STR(pmpriv->curr_bss_params.bss_descriptor.mac_address)); + + pevent->bss_index = pmpriv->bss_index; + pevent->event_id = MLAN_EVENT_ID_DRV_CONNECTED; + pevent->event_len = MLAN_MAC_ADDR_LENGTH; + memcpy(pmpriv->adapter, (t_u8 *) pevent->event_buf, + (t_u8 *) pmpriv->curr_bss_params.bss_descriptor.mac_address, + MLAN_MAC_ADDR_LENGTH); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_CONNECTED, pevent); + wlan_save_curr_bcn(pmpriv); + +done: + /* Need to indicate IOCTL complete */ + if (pioctl_req != MNULL) { + if (ret != MLAN_STATUS_SUCCESS) { + pioctl_req->status_code = MLAN_ERROR_CMD_ASSOC_FAIL; + } else { + pioctl_req->status_code = MLAN_ERROR_NO_ERROR; + } + } + + LEAVE(); + return ret; } /** @@ -1874,36 +2029,37 @@ wlan_ret_802_11_ad_hoc(IN mlan_private * pmpriv, */ mlan_status wlan_associate(IN mlan_private * pmpriv, - IN t_void * pioctl_buf, IN BSSDescriptor_t * pbss_desc) + IN t_void * pioctl_buf, IN BSSDescriptor_t * pbss_desc) { - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u8 current_bssid[MLAN_MAC_ADDR_LENGTH]; - pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; - - ENTER(); - - /* Return error if the pmadapter or table entry is not marked as infra */ - if ((pmpriv->bss_mode != MLAN_BSS_MODE_INFRA) || - (pbss_desc->bss_mode != MLAN_BSS_MODE_INFRA)) { - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - memcpy(pmpriv->adapter, ¤t_bssid, - &pmpriv->curr_bss_params.bss_descriptor.mac_address, - sizeof(current_bssid)); - - /* Clear any past association response stored for application retrieval */ - pmpriv->assoc_rsp_size = 0; - - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_ASSOCIATE, - HostCmd_ACT_GEN_SET, 0, pioctl_buf, pbss_desc); - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u8 current_bssid[MLAN_MAC_ADDR_LENGTH]; + pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; + + ENTER(); + + /* Return error if the pmadapter or table entry is not marked as infra */ + if ((pmpriv->bss_mode != MLAN_BSS_MODE_INFRA) || + (pbss_desc->bss_mode != MLAN_BSS_MODE_INFRA)) { + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + memcpy(pmpriv->adapter, ¤t_bssid, + &pmpriv->curr_bss_params.bss_descriptor.mac_address, + sizeof(current_bssid)); + + /* Clear any past association response stored for application retrieval + */ + pmpriv->assoc_rsp_size = 0; + + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_ASSOCIATE, + HostCmd_ACT_GEN_SET, 0, pioctl_buf, pbss_desc); + + LEAVE(); + return ret; } /** @@ -1917,48 +2073,49 @@ wlan_associate(IN mlan_private * pmpriv, */ mlan_status wlan_adhoc_start(IN mlan_private * pmpriv, - IN t_void * pioctl_buf, IN mlan_802_11_ssid * padhoc_ssid) + IN t_void * pioctl_buf, IN mlan_802_11_ssid * padhoc_ssid) { - mlan_status ret = MLAN_STATUS_SUCCESS; - wlan_meas_state_t *pmeas_state = &pmpriv->adapter->state_meas; - t_u8 radar = MFALSE; - pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; - - ENTER(); - - /* - * If the report indicates no measurement was done, leave the default - * return value alone. - */ - if (!pmeas_state->meas_rpt_returned.rpt.basic.map.unmeasured) { - radar = - pmeas_state->meas_rpt_returned.rpt.basic.map.radar ? MTRUE : MFALSE; - } - - if (radar) { - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - ret = MLAN_STATUS_FAILURE; - LEAVE(); - return ret; - } - - PRINTM(MINFO, "Adhoc Channel = %d\n", pmpriv->adhoc_channel); - PRINTM(MINFO, "curr_bss_params.channel = %d\n", - pmpriv->curr_bss_params.bss_descriptor.channel); - PRINTM(MINFO, "curr_bss_params.band = %d\n", pmpriv->curr_bss_params.band); - - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_AD_HOC_START, - HostCmd_ACT_GEN_SET, 0, pioctl_buf, padhoc_ssid); + mlan_status ret = MLAN_STATUS_SUCCESS; + wlan_meas_state_t *pmeas_state = &pmpriv->adapter->state_meas; + t_u8 radar = MFALSE; + pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; + + ENTER(); + + /* + * If the report indicates no measurement was done, leave the default + * return value alone. + */ + if (!pmeas_state->meas_rpt_returned.rpt.basic.map.unmeasured) { + radar = pmeas_state->meas_rpt_returned.rpt.basic.map. + radar ? MTRUE : MFALSE; + } + + if (radar) { + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + ret = MLAN_STATUS_FAILURE; + LEAVE(); + return ret; + } + + PRINTM(MINFO, "Adhoc Channel = %d\n", pmpriv->adhoc_channel); + PRINTM(MINFO, "curr_bss_params.channel = %d\n", + pmpriv->curr_bss_params.bss_descriptor.channel); + PRINTM(MINFO, "curr_bss_params.band = %d\n", + pmpriv->curr_bss_params.band); + + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_AD_HOC_START, + HostCmd_ACT_GEN_SET, 0, pioctl_buf, padhoc_ssid); #if defined(STA_SUPPORT) - if (ret == MLAN_STATUS_SUCCESS) - memcpy(pmpriv->adapter, &pmpriv->adhoc_last_start_ssid, - padhoc_ssid, sizeof(mlan_802_11_ssid)); + if (ret == MLAN_STATUS_SUCCESS) + memcpy(pmpriv->adapter, &pmpriv->adhoc_last_start_ssid, + padhoc_ssid, sizeof(mlan_802_11_ssid)); #endif - LEAVE(); - return ret; + LEAVE(); + return ret; } /** @@ -1973,48 +2130,50 @@ wlan_adhoc_start(IN mlan_private * pmpriv, */ mlan_status wlan_adhoc_join(IN mlan_private * pmpriv, - IN t_void * pioctl_buf, IN BSSDescriptor_t * pbss_desc) + IN t_void * pioctl_buf, IN BSSDescriptor_t * pbss_desc) { - pmlan_adapter pmadapter = pmpriv->adapter; - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; - - ENTER(); - - PRINTM(MINFO, "wlan_adhoc_join: CurBss.ssid =%s\n", - pmpriv->curr_bss_params.bss_descriptor.ssid.ssid); - PRINTM(MINFO, "wlan_adhoc_join: CurBss.ssid_len =%u\n", - pmpriv->curr_bss_params.bss_descriptor.ssid.ssid_len); - PRINTM(MINFO, "wlan_adhoc_join: ssid =%s\n", pbss_desc->ssid.ssid); - PRINTM(MINFO, "wlan_adhoc_join: ssid len =%u\n", pbss_desc->ssid.ssid_len); - - /* Check if the requested SSID is already joined */ - if (pmpriv->curr_bss_params.bss_descriptor.ssid.ssid_len && - !wlan_ssid_cmp(pmadapter, &pbss_desc->ssid, - &pmpriv->curr_bss_params.bss_descriptor.ssid) && - (pmpriv->curr_bss_params.bss_descriptor.bss_mode == - MLAN_BSS_MODE_IBSS)) { - - PRINTM(MINFO, - "ADHOC_J_CMD: New ad-hoc SSID is the same as current, " - "not attempting to re-join\n"); - - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - PRINTM(MINFO, "curr_bss_params.channel = %d\n", - pmpriv->curr_bss_params.bss_descriptor.channel); - PRINTM(MINFO, "curr_bss_params.band = %d\n", pmpriv->curr_bss_params.band); - - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_AD_HOC_JOIN, - HostCmd_ACT_GEN_SET, 0, pioctl_buf, pbss_desc); - - LEAVE(); - return ret; + pmlan_adapter pmadapter = pmpriv->adapter; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; + + ENTER(); + + PRINTM(MINFO, "wlan_adhoc_join: CurBss.ssid =%s\n", + pmpriv->curr_bss_params.bss_descriptor.ssid.ssid); + PRINTM(MINFO, "wlan_adhoc_join: CurBss.ssid_len =%u\n", + pmpriv->curr_bss_params.bss_descriptor.ssid.ssid_len); + PRINTM(MINFO, "wlan_adhoc_join: ssid =%s\n", pbss_desc->ssid.ssid); + PRINTM(MINFO, "wlan_adhoc_join: ssid len =%u\n", + pbss_desc->ssid.ssid_len); + + /* Check if the requested SSID is already joined */ + if (pmpriv->curr_bss_params.bss_descriptor.ssid.ssid_len && + !wlan_ssid_cmp(pmadapter, &pbss_desc->ssid, + &pmpriv->curr_bss_params.bss_descriptor.ssid) && + (pmpriv->curr_bss_params.bss_descriptor.bss_mode == + MLAN_BSS_MODE_IBSS)) { + + PRINTM(MINFO, + "ADHOC_J_CMD: New ad-hoc SSID is the same as current, " + "not attempting to re-join\n"); + + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + PRINTM(MINFO, "curr_bss_params.channel = %d\n", + pmpriv->curr_bss_params.bss_descriptor.channel); + PRINTM(MINFO, "curr_bss_params.band = %d\n", + pmpriv->curr_bss_params.band); + + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_AD_HOC_JOIN, + HostCmd_ACT_GEN_SET, 0, pioctl_buf, pbss_desc); + + LEAVE(); + return ret; } /** @@ -2028,52 +2187,62 @@ wlan_adhoc_join(IN mlan_private * pmpriv, */ mlan_status wlan_disconnect(IN mlan_private * pmpriv, - IN mlan_ioctl_req * pioctl_req, IN mlan_802_11_mac_addr * mac) + IN mlan_ioctl_req * pioctl_req, IN mlan_802_11_mac_addr * mac) { - mlan_802_11_mac_addr mac_address; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; - - ENTER(); - - if (pmpriv->media_connected == MTRUE) { - if (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) { - if (mac) { - if (!memcmp(pmpriv->adapter, mac, zero_mac, sizeof(zero_mac))) - memcpy(pmpriv->adapter, (t_u8 *) & mac_address, - (t_u8 *) & pmpriv->curr_bss_params.bss_descriptor. - mac_address, MLAN_MAC_ADDR_LENGTH); - else { - memcpy(pmpriv->adapter, (t_u8 *) & mac_address, - (t_u8 *) mac, MLAN_MAC_ADDR_LENGTH); - } - } else { - memcpy(pmpriv->adapter, (t_u8 *) & mac_address, - (t_u8 *) & pmpriv->curr_bss_params.bss_descriptor. - mac_address, MLAN_MAC_ADDR_LENGTH); - } - - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_DEAUTHENTICATE, - HostCmd_ACT_GEN_SET, - 0, (t_void *) pioctl_req, &mac_address); - - if (ret == MLAN_STATUS_SUCCESS && pioctl_req) - ret = MLAN_STATUS_PENDING; - - } else if (pmpriv->bss_mode == MLAN_BSS_MODE_IBSS) { - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_AD_HOC_STOP, - HostCmd_ACT_GEN_SET, - 0, (t_void *) pioctl_req, MNULL); - - if (ret == MLAN_STATUS_SUCCESS && pioctl_req) - ret = MLAN_STATUS_PENDING; - } - } - - LEAVE(); - return ret; + mlan_802_11_mac_addr mac_address; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; + + ENTER(); + + if (pmpriv->media_connected == MTRUE) { + if (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) { + if (mac) { + if (!memcmp + (pmpriv->adapter, mac, zero_mac, + sizeof(zero_mac))) + memcpy(pmpriv->adapter, + (t_u8 *) & mac_address, + (t_u8 *) & pmpriv-> + curr_bss_params.bss_descriptor. + mac_address, + MLAN_MAC_ADDR_LENGTH); + else { + memcpy(pmpriv->adapter, + (t_u8 *) & mac_address, + (t_u8 *) mac, + MLAN_MAC_ADDR_LENGTH); + } + } else { + memcpy(pmpriv->adapter, (t_u8 *) & mac_address, + (t_u8 *) & pmpriv->curr_bss_params. + bss_descriptor.mac_address, + MLAN_MAC_ADDR_LENGTH); + } + + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_DEAUTHENTICATE, + HostCmd_ACT_GEN_SET, + 0, + (t_void *) pioctl_req, + &mac_address); + + if (ret == MLAN_STATUS_SUCCESS && pioctl_req) + ret = MLAN_STATUS_PENDING; + + } else if (pmpriv->bss_mode == MLAN_BSS_MODE_IBSS) { + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_AD_HOC_STOP, + HostCmd_ACT_GEN_SET, + 0, (t_void *) pioctl_req, MNULL); + + if (ret == MLAN_STATUS_SUCCESS && pioctl_req) + ret = MLAN_STATUS_PENDING; + } + } + + LEAVE(); + return ret; } /** @@ -2086,25 +2255,25 @@ wlan_disconnect(IN mlan_private * pmpriv, t_u8 wlan_band_to_radio_type(IN t_u8 band) { - t_u8 ret_radio_type; - - ENTER(); - - switch (band) { - case BAND_A: - case BAND_AN: - case BAND_A | BAND_AN: - case BAND_A | BAND_AN | BAND_AAC: - ret_radio_type = HostCmd_SCAN_RADIO_TYPE_A; - break; - case BAND_B: - case BAND_G: - case BAND_B | BAND_G: - default: - ret_radio_type = HostCmd_SCAN_RADIO_TYPE_BG; - break; - } - - LEAVE(); - return ret_radio_type; + t_u8 ret_radio_type; + + ENTER(); + + switch (band) { + case BAND_A: + case BAND_AN: + case BAND_A | BAND_AN: + case BAND_A | BAND_AN | BAND_AAC: + ret_radio_type = HostCmd_SCAN_RADIO_TYPE_A; + break; + case BAND_B: + case BAND_G: + case BAND_B | BAND_G: + default: + ret_radio_type = HostCmd_SCAN_RADIO_TYPE_BG; + break; + } + + LEAVE(); + return ret_radio_type; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_join.h b/drivers/net/wireless/sd8897/mlan/mlan_join.h index d7091f3a4b28..2464109fd393 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_join.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_join.h @@ -6,8 +6,8 @@ * Driver interface functions and type declarations for the join module * implemented in mlan_join.c. Process all start/join requests for * both adhoc and infrastructure networks - * - * Copyright (C) 2008-2011, Marvell International Ltd. + * + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 diff --git a/drivers/net/wireless/sd8897/mlan/mlan_main.h b/drivers/net/wireless/sd8897/mlan/mlan_main.h index b56a77df48af..f367d861459c 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_main.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_main.h @@ -4,7 +4,7 @@ * structures and declares global function prototypes used * in MLAN module. * - * Copyright (C) 2008-2012, Marvell International Ltd. + * Copyright (C) 2008-2012, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -30,11 +30,11 @@ Change log: #ifdef DEBUG_LEVEL1 extern t_void(*print_callback) (IN t_void * pmoal_handle, - IN t_u32 level, IN char *pformat, IN ...); + IN t_u32 level, IN char *pformat, IN ...); extern mlan_status(*get_sys_time_callback) (IN t_void * pmoal_handle, - OUT t_u32 * psec, - OUT t_u32 * pusec); + OUT t_u32 * psec, + OUT t_u32 * pusec); extern t_u32 mlan_drvdbg; @@ -448,12 +448,12 @@ do { \ #ifdef SDIO_MULTI_PORT_TX_AGGR /** Multi port TX aggregation buffer size */ -#define SDIO_MP_TX_AGGR_DEF_BUF_SIZE (16384) /* 16K */ +#define SDIO_MP_TX_AGGR_DEF_BUF_SIZE (16384) /* 16K */ #endif /* SDIO_MULTI_PORT_TX_AGGR */ #ifdef SDIO_MULTI_PORT_RX_AGGR /** Multi port RX aggregation buffer size */ -#define SDIO_MP_RX_AGGR_DEF_BUF_SIZE (32768) /* 32K */ +#define SDIO_MP_RX_AGGR_DEF_BUF_SIZE (32768) /* 32K */ #endif /* SDIO_MULTI_PORT_RX_AGGR */ /** High threshold at which to start drop packets */ @@ -468,89 +468,89 @@ do { \ typedef struct _wlan_dbg { /** Number of host to card command failures */ - t_u32 num_cmd_host_to_card_failure; + t_u32 num_cmd_host_to_card_failure; /** Number of host to card sleep confirm failures */ - t_u32 num_cmd_sleep_cfm_host_to_card_failure; + t_u32 num_cmd_sleep_cfm_host_to_card_failure; /** Number of host to card Tx failures */ - t_u32 num_tx_host_to_card_failure; + t_u32 num_tx_host_to_card_failure; /** Number of card to host command/event failures */ - t_u32 num_cmdevt_card_to_host_failure; + t_u32 num_cmdevt_card_to_host_failure; /** Number of card to host Rx failures */ - t_u32 num_rx_card_to_host_failure; + t_u32 num_rx_card_to_host_failure; /** Number of interrupt read failures */ - t_u32 num_int_read_failure; + t_u32 num_int_read_failure; /** Last interrupt status */ - t_u32 last_int_status; + t_u32 last_int_status; /** Number of deauthentication events */ - t_u32 num_event_deauth; + t_u32 num_event_deauth; /** Number of disassosiation events */ - t_u32 num_event_disassoc; + t_u32 num_event_disassoc; /** Number of link lost events */ - t_u32 num_event_link_lost; + t_u32 num_event_link_lost; /** Number of deauthentication commands */ - t_u32 num_cmd_deauth; + t_u32 num_cmd_deauth; /** Number of association comamnd successes */ - t_u32 num_cmd_assoc_success; + t_u32 num_cmd_assoc_success; /** Number of association command failures */ - t_u32 num_cmd_assoc_failure; + t_u32 num_cmd_assoc_failure; /** Number of Tx timeouts */ - t_u32 num_tx_timeout; + t_u32 num_tx_timeout; /** Number of command timeouts */ - t_u32 num_cmd_timeout; + t_u32 num_cmd_timeout; /** Timeout command ID */ - t_u16 timeout_cmd_id; + t_u16 timeout_cmd_id; /** Timeout command action */ - t_u16 timeout_cmd_act; + t_u16 timeout_cmd_act; /** List of last command IDs */ - t_u16 last_cmd_id[DBG_CMD_NUM]; + t_u16 last_cmd_id[DBG_CMD_NUM]; /** List of last command actions */ - t_u16 last_cmd_act[DBG_CMD_NUM]; + t_u16 last_cmd_act[DBG_CMD_NUM]; /** Last command index */ - t_u16 last_cmd_index; + t_u16 last_cmd_index; /** List of last command response IDs */ - t_u16 last_cmd_resp_id[DBG_CMD_NUM]; + t_u16 last_cmd_resp_id[DBG_CMD_NUM]; /** Last command response index */ - t_u16 last_cmd_resp_index; + t_u16 last_cmd_resp_index; /** List of last events */ - t_u16 last_event[DBG_CMD_NUM]; + t_u16 last_event[DBG_CMD_NUM]; /** Last event index */ - t_u16 last_event_index; + t_u16 last_event_index; /** Number of no free command node */ - t_u16 num_no_cmd_node; + t_u16 num_no_cmd_node; } wlan_dbg; /** Hardware status codes */ typedef enum _WLAN_HARDWARE_STATUS { - WlanHardwareStatusReady, - WlanHardwareStatusInitializing, - WlanHardwareStatusInitdone, - WlanHardwareStatusReset, - WlanHardwareStatusClosing, - WlanHardwareStatusNotReady + WlanHardwareStatusReady, + WlanHardwareStatusInitializing, + WlanHardwareStatusInitdone, + WlanHardwareStatusReset, + WlanHardwareStatusClosing, + WlanHardwareStatusNotReady } WLAN_HARDWARE_STATUS; /** WLAN_802_11_POWER_MODE */ typedef enum _WLAN_802_11_POWER_MODE { - Wlan802_11PowerModeCAM, - Wlan802_11PowerModePSP + Wlan802_11PowerModeCAM, + Wlan802_11PowerModePSP } WLAN_802_11_POWER_MODE; /** tx param */ typedef struct _mlan_tx_param { /** next packet length */ - t_u32 next_pkt_len; + t_u32 next_pkt_len; } mlan_tx_param; /** PS_STATE */ typedef enum _PS_STATE { - PS_STATE_AWAKE, - PS_STATE_PRE_SLEEP, - PS_STATE_SLEEP_CFM, - PS_STATE_SLEEP + PS_STATE_AWAKE, + PS_STATE_PRE_SLEEP, + PS_STATE_SLEEP_CFM, + PS_STATE_SLEEP } PS_STATE; /** Minimum flush timer for win size of 1 is 50 ms */ @@ -562,26 +562,26 @@ typedef struct _TxBAStreamTbl TxBAStreamTbl; typedef struct { /** Window size for initiator */ - t_u32 tx_win_size; + t_u32 tx_win_size; /** Window size for receiver */ - t_u32 rx_win_size; + t_u32 rx_win_size; /** Block ack timeout */ - t_u32 timeout; + t_u32 timeout; /** amsdu support for ADDBA request */ - t_u8 tx_amsdu; + t_u8 tx_amsdu; /** amsdu support for ADDBA response */ - t_u8 rx_amsdu; + t_u8 rx_amsdu; } add_ba_param_t; /** Tx aggregation data structure */ typedef struct _txAggr_t { /** AMPDU user */ - t_u8 ampdu_user; + t_u8 ampdu_user; /** AMPDU AP */ - t_u8 ampdu_ap; + t_u8 ampdu_ap; /** AMSDU */ - t_u8 amsdu; + t_u8 amsdu; } tx_aggr_t; /** RA list table */ @@ -591,34 +591,34 @@ typedef struct _raListTbl raListTbl; struct _raListTbl { /** Pointer to previous node */ - raListTbl *pprev; + raListTbl *pprev; /** Pointer to next node */ - raListTbl *pnext; + raListTbl *pnext; /** Buffer list head */ - mlan_list_head buf_head; + mlan_list_head buf_head; /** RA list buffer */ - t_u8 ra[MLAN_MAC_ADDR_LENGTH]; + t_u8 ra[MLAN_MAC_ADDR_LENGTH]; /** total packets in RA list */ - t_u16 total_pkts; - /** packets received */ - t_u16 packet_count; - /** packet count threshold to setup BA */ - t_u8 ba_packet_threshold; - /** is 11n enabled */ - t_u8 is_11n_enabled; - /** max amsdu size */ - t_u16 max_amsdu; - /** tx_pause flag */ - t_u8 tx_pause; + t_u16 total_pkts; + /** packets received */ + t_u16 packet_count; + /** packet count threshold to setup BA */ + t_u8 ba_packet_threshold; + /** is 11n enabled */ + t_u8 is_11n_enabled; + /** max amsdu size */ + t_u16 max_amsdu; + /** tx_pause flag */ + t_u8 tx_pause; }; /** TID table */ typedef struct _tidTbl { /** RA list head */ - mlan_list_head ra_list; + mlan_list_head ra_list; /** Current RA list */ - raListTbl *ra_list_curr; + raListTbl *ra_list_curr; } tid_tbl_t; /** Highest priority setting for a packet (uses voice AC) */ @@ -637,108 +637,108 @@ typedef struct _tidTbl typedef struct _wmm_desc { /** TID table */ - tid_tbl_t tid_tbl_ptr[MAX_NUM_TID]; + tid_tbl_t tid_tbl_ptr[MAX_NUM_TID]; /** Packets out */ - t_u32 packets_out[MAX_NUM_TID]; + t_u32 packets_out[MAX_NUM_TID]; /** Packets queued */ - t_u32 pkts_queued[MAX_NUM_TID]; + t_u32 pkts_queued[MAX_NUM_TID]; /** Spin lock to protect ra_list */ - t_void *ra_list_spinlock; + t_void *ra_list_spinlock; /** AC status */ - WmmAcStatus_t ac_status[MAX_AC_QUEUES]; + WmmAcStatus_t ac_status[MAX_AC_QUEUES]; /** AC downgraded values */ - mlan_wmm_ac_e ac_down_graded_vals[MAX_AC_QUEUES]; + mlan_wmm_ac_e ac_down_graded_vals[MAX_AC_QUEUES]; /** Max driver packet delay sent to the firmware for expiry eval */ - t_u32 drv_pkt_delay_max; + t_u32 drv_pkt_delay_max; /** WMM queue priority table */ - t_u8 queue_priority[MAX_AC_QUEUES]; + t_u8 queue_priority[MAX_AC_QUEUES]; /** User priority packet transmission control */ - t_u32 user_pri_pkt_tx_ctrl[WMM_HIGHEST_PRIORITY + 1]; /* UP: 0 to 7 */ + t_u32 user_pri_pkt_tx_ctrl[WMM_HIGHEST_PRIORITY + 1]; /* UP: 0 to 7 */ /** Number of transmit packets queued */ - mlan_scalar tx_pkts_queued; + mlan_scalar tx_pkts_queued; /** Tracks highest priority with a packet queued */ - mlan_scalar highest_queued_prio; + mlan_scalar highest_queued_prio; } wmm_desc_t; /** Security structure */ typedef struct _wlan_802_11_security_t { /** WPA enabled flag */ - t_u8 wpa_enabled; + t_u8 wpa_enabled; /** E-Supplicant enabled flag */ - t_u8 ewpa_enabled; + t_u8 ewpa_enabled; /** WPA2 enabled flag */ - t_u8 wpa2_enabled; + t_u8 wpa2_enabled; /** WAPI enabled flag */ - t_u8 wapi_enabled; + t_u8 wapi_enabled; /** WAPI key on flag */ - t_u8 wapi_key_on; + t_u8 wapi_key_on; /** WEP status */ - WLAN_802_11_WEP_STATUS wep_status; + WLAN_802_11_WEP_STATUS wep_status; /** Authentication mode */ - t_u32 authentication_mode; + t_u32 authentication_mode; /** Encryption mode */ - t_u32 encryption_mode; + t_u32 encryption_mode; } wlan_802_11_security_t; /** Current Basic Service Set State Structure */ typedef struct { /** BSS descriptor */ - BSSDescriptor_t bss_descriptor; + BSSDescriptor_t bss_descriptor; /** WMM enable? */ - t_u8 wmm_enabled; + t_u8 wmm_enabled; /** Uapsd enable?*/ - t_u8 wmm_uapsd_enabled; + t_u8 wmm_uapsd_enabled; /** Band */ - t_u8 band; + t_u8 band; /** Number of rates supported */ - t_u32 num_of_rates; + t_u32 num_of_rates; /** Supported rates*/ - t_u8 data_rates[WLAN_SUPPORTED_RATES]; + t_u8 data_rates[WLAN_SUPPORTED_RATES]; } current_bss_params_t; /** Sleep_params */ typedef struct _sleep_params_t { /** Sleep parameter error */ - t_u16 sp_error; + t_u16 sp_error; /** Sleep parameter offset */ - t_u16 sp_offset; + t_u16 sp_offset; /** Sleep parameter stable time */ - t_u16 sp_stable_time; + t_u16 sp_stable_time; /** Sleep parameter calibration control */ - t_u8 sp_cal_control; + t_u8 sp_cal_control; /** Sleep parameter external sleep clock */ - t_u8 sp_ext_sleep_clk; + t_u8 sp_ext_sleep_clk; /** Sleep parameter reserved */ - t_u16 sp_reserved; + t_u16 sp_reserved; } sleep_params_t; /** Sleep_period */ typedef struct sleep_period_t { /** Sleep period */ - t_u16 period; + t_u16 period; /** Reserved */ - t_u16 reserved; + t_u16 reserved; } sleep_period_t; /** mrvl_wep_key_t */ typedef struct _mrvl_wep_key_t { /** Length */ - t_u32 length; + t_u32 length; /** WEP key index */ - t_u32 key_index; + t_u32 key_index; /** WEP key length */ - t_u32 key_length; + t_u32 key_length; /** WEP keys */ - t_u8 key_material[MRVL_KEY_BUFFER_SIZE_IN_BYTE]; + t_u8 key_material[MRVL_KEY_BUFFER_SIZE_IN_BYTE]; } mrvl_wep_key_t; /** Maximum number of region channel */ @@ -748,45 +748,45 @@ typedef struct _mrvl_wep_key_t typedef struct _cfp_dyn_t { /** TRUE: Channel is blacklisted (do not use) */ - t_bool blacklist; + t_bool blacklist; } cfp_dyn_t; /** Chan-Freq-TxPower mapping table*/ typedef struct _chan_freq_power_t { /** Channel Number */ - t_u16 channel; + t_u16 channel; /** Frequency of this Channel */ - t_u32 freq; + t_u32 freq; /** Max allowed Tx power level */ - t_u16 max_tx_power; - /** TRUE:radar detect required for BAND A or passive scan for BAND B/G; + t_u16 max_tx_power; + /** TRUE:radar detect required for BAND A or passive scan for BAND B/G; * FALSE:radar detect not required for BAND A or active scan for BAND B/G*/ - t_bool passive_scan_or_radar_detect; + t_bool passive_scan_or_radar_detect; /** Elements associated to cfp that change at run-time */ - cfp_dyn_t dynamic; + cfp_dyn_t dynamic; } chan_freq_power_t; /** Region-band mapping table */ typedef struct _region_chan_t { /** TRUE if this entry is valid */ - t_u8 valid; + t_u8 valid; /** Region code for US, Japan ... */ - t_u8 region; + t_u8 region; /** Band B/G/A, used for BAND_CONFIG cmd */ - t_u8 band; + t_u8 band; /** Actual No. of elements in the array below */ - t_u8 num_cfp; + t_u8 num_cfp; /** chan-freq-txpower mapping table */ - chan_freq_power_t *pcfp; + chan_freq_power_t *pcfp; } region_chan_t; /** State of 11d */ typedef enum _state_11d_t { - DISABLE_11D = 0, - ENABLE_11D = 1, + DISABLE_11D = 0, + ENABLE_11D = 1, } state_11d_t; #define DEFAULT_11D_STATE DISABLE_11D @@ -795,39 +795,39 @@ typedef enum _state_11d_t typedef struct _wlan_802_11d_domain_reg { /** Country Code */ - t_u8 country_code[COUNTRY_CODE_LEN]; + t_u8 country_code[COUNTRY_CODE_LEN]; /** band that channels in sub_band belong to */ - t_u8 band; + t_u8 band; /** No. of subband in below */ - t_u8 no_of_sub_band; + t_u8 no_of_sub_band; /** Subband data to send/last sent */ - IEEEtypes_SubbandSet_t sub_band[MRVDRV_MAX_SUBBAND_802_11D]; + IEEEtypes_SubbandSet_t sub_band[MRVDRV_MAX_SUBBAND_802_11D]; } wlan_802_11d_domain_reg_t; /** Data for state machine */ typedef struct _wlan_802_11d_state { /** True for enabling 11D */ - state_11d_t enable_11d; + state_11d_t enable_11d; /** True for user enabling 11D */ - state_11d_t user_enable_11d; + state_11d_t user_enable_11d; } wlan_802_11d_state_t; /** 802.11h State information kept in the 'mlan_private' driver structure */ typedef struct { /** Indicates whether 11h is enabled in the driver */ - t_bool is_11h_enabled; + t_bool is_11h_enabled; /** Indicates whether 11h is active in the firmware */ - t_bool is_11h_active; + t_bool is_11h_active; /** Master device using automatic channel select */ - t_bool adhoc_auto_sel_chan; + t_bool adhoc_auto_sel_chan; /** Set when driver receives a STOP TX event from fw */ - t_bool tx_disabled; + t_bool tx_disabled; /** Channel that ChanSwAnn was received for, non-zero = active */ - t_u8 dfs_slave_csa_chan; + t_u8 dfs_slave_csa_chan; /** Expiry for above variable, seconds in system time */ - t_u32 dfs_slave_csa_expire_at_sec; + t_u32 dfs_slave_csa_expire_at_sec; } wlan_11h_interface_state_t; #if defined(UAP_SUPPORT) @@ -836,17 +836,17 @@ typedef struct { /** UAP internal callback after wlan_uap_get_channel */ /** (parameter is really pointer to mlan_private) */ - mlan_status(*get_chan_callback) (t_void *); + mlan_status(*get_chan_callback) (t_void *); /** current ioctl_req (to be completed in callback) */ - pmlan_ioctl_req pioctl_req_curr; + pmlan_ioctl_req pioctl_req_curr; /** band_cfg from MrvlIEtypes_channel_band_t */ - t_u8 band_config; + t_u8 band_config; /** channel from MrvlIEtypes_channel_band_t */ - t_u8 channel; + t_u8 channel; /** beacon period (in msec) from MrvlIEtypes_beacon_period_t */ - t_u16 beacon_period; + t_u16 beacon_period; /** dtim period (no unit) from MrvlIEtypes_dtim_period_t */ - t_u8 dtim_period; + t_u8 dtim_period; } wlan_uap_get_info_cb_t; #endif @@ -854,300 +854,301 @@ typedef struct typedef struct { /** WPS IE */ - IEEEtypes_VendorSpecific_t wps_ie; + IEEEtypes_VendorSpecific_t wps_ie; /** Session enable flag */ - t_u8 session_enable; + t_u8 session_enable; } wps_t; /** mlan_operations data structure */ typedef struct _mlan_operations { /** cmd init handler */ - mlan_status(*init_cmd) (IN t_void * priv, IN t_u8 first_bss); + mlan_status(*init_cmd) (IN t_void * priv, IN t_u8 first_bss); /** ioctl handler */ - mlan_status(*ioctl) (t_void * adapter, pmlan_ioctl_req pioctl_req); + mlan_status(*ioctl) (t_void * adapter, pmlan_ioctl_req pioctl_req); /** cmd handler */ - mlan_status(*prepare_cmd) (IN t_void * priv, - IN t_u16 cmd_no, - IN t_u16 cmd_action, - IN t_u32 cmd_oid, - IN t_void * pioctl_buf, - IN t_void * pdata_buf, IN t_void * pcmd_buf); + mlan_status(*prepare_cmd) (IN t_void * priv, + IN t_u16 cmd_no, + IN t_u16 cmd_action, + IN t_u32 cmd_oid, + IN t_void * pioctl_buf, + IN t_void * pdata_buf, IN t_void * pcmd_buf); /** cmdresp handler */ - mlan_status(*process_cmdresp) (IN t_void * priv, - IN t_u16 cmdresp_no, - IN t_void * pcmd_buf, IN t_void * pioctl); + mlan_status(*process_cmdresp) (IN t_void * priv, + IN t_u16 cmdresp_no, + IN t_void * pcmd_buf, + IN t_void * pioctl); /** rx handler */ - mlan_status(*process_rx_packet) (IN t_void * adapter, - IN pmlan_buffer pmbuf); + mlan_status(*process_rx_packet) (IN t_void * adapter, + IN pmlan_buffer pmbuf); /** event handler */ - mlan_status(*process_event) (IN t_void * priv); + mlan_status(*process_event) (IN t_void * priv); /** txpd handler */ - t_void *(*process_txpd) (IN t_void * priv, IN pmlan_buffer pmbuf); + t_void *(*process_txpd) (IN t_void * priv, IN pmlan_buffer pmbuf); /** BSS role */ - mlan_bss_role bss_role; + mlan_bss_role bss_role; } mlan_operations; /** Private structure for MLAN */ typedef struct _mlan_private { /** Pointer to mlan_adapter */ - struct _mlan_adapter *adapter; + struct _mlan_adapter *adapter; /** BSS index */ - t_u8 bss_index; + t_u8 bss_index; /** BSS type */ - t_u8 bss_type; + t_u8 bss_type; /** BSS role */ - t_u8 bss_role; + t_u8 bss_role; /** BSS virtual flag */ - t_u8 bss_virtual; + t_u8 bss_virtual; /** BSS Priority */ - t_u8 bss_priority; + t_u8 bss_priority; /** BSS number */ - t_u8 bss_num; + t_u8 bss_num; /** Frame type */ - t_u8 frame_type; + t_u8 frame_type; /** MAC address information */ - t_u8 curr_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 curr_addr[MLAN_MAC_ADDR_LENGTH]; /** Media connection status */ - t_bool media_connected; + t_bool media_connected; /** Current packet filter */ - t_u32 curr_pkt_filter; + t_u32 curr_pkt_filter; /** Infrastructure mode */ - t_u32 bss_mode; + t_u32 bss_mode; /** Tx packet control */ - t_u32 pkt_tx_ctrl; + t_u32 pkt_tx_ctrl; /** Tx power level */ - t_s16 tx_power_level; + t_s16 tx_power_level; /** Maximum Tx power level */ - t_s8 max_tx_power_level; + t_s8 max_tx_power_level; /** Minimum Tx power level */ - t_s8 min_tx_power_level; + t_s8 min_tx_power_level; /** Tx rate */ - t_u8 tx_rate; - t_u8 tx_rate_info; + t_u8 tx_rate; + t_u8 tx_rate_info; /** rxpd_htinfo */ - t_u8 rxpd_rate_info; + t_u8 rxpd_rate_info; /** max amsdu size */ - t_u16 max_amsdu; + t_u16 max_amsdu; #ifdef UAP_SUPPORT /** UAP 11n flag */ - t_u8 is_11n_enabled; -#endif /* UAP_SUPPORT */ + t_u8 is_11n_enabled; +#endif /* UAP_SUPPORT */ #ifdef UAP_SUPPORT /** UAP 11ac flag */ - t_u8 is_11ac_enabled; -#endif /* UAP_SUPPORT */ + t_u8 is_11ac_enabled; +#endif /* UAP_SUPPORT */ /** tx vht_info */ - t_u8 tx_vhtinfo; + t_u8 tx_vhtinfo; /** rxpd_vhtinfo */ - t_u8 rxpd_vhtinfo; + t_u8 rxpd_vhtinfo; #ifdef UAP_SUPPORT /** packet forward control */ - t_u8 pkt_fwd; + t_u8 pkt_fwd; /** dropped pkts */ - t_u32 num_drop_pkts; + t_u32 num_drop_pkts; #endif /** TX beamforming capability */ - t_u32 tx_bf_cap; + t_u32 tx_bf_cap; /** Rx PD rate */ - t_u8 rxpd_rate; + t_u8 rxpd_rate; /** Rate bitmap */ - t_u16 rate_bitmap; + t_u16 rate_bitmap; /** Bitmap rates */ - t_u16 bitmap_rates[MAX_BITMAP_RATES_SIZE]; + t_u16 bitmap_rates[MAX_BITMAP_RATES_SIZE]; /** Data rate */ - t_u32 data_rate; + t_u32 data_rate; /** Automatic data rate flag */ - t_u8 is_data_rate_auto; + t_u8 is_data_rate_auto; /** Factor for calculating beacon average */ - t_u16 bcn_avg_factor; + t_u16 bcn_avg_factor; /** Factor for calculating data average */ - t_u16 data_avg_factor; + t_u16 data_avg_factor; /** Last data RSSI */ - t_s16 data_rssi_last; + t_s16 data_rssi_last; /** Last data Noise Floor */ - t_s16 data_nf_last; + t_s16 data_nf_last; /** Average data RSSI */ - t_s16 data_rssi_avg; + t_s16 data_rssi_avg; /** Averag data Noise Floor */ - t_s16 data_nf_avg; + t_s16 data_nf_avg; /** Last beacon RSSI */ - t_s16 bcn_rssi_last; + t_s16 bcn_rssi_last; /** Last beacon Noise Floor */ - t_s16 bcn_nf_last; + t_s16 bcn_nf_last; /** Average beacon RSSI */ - t_s16 bcn_rssi_avg; + t_s16 bcn_rssi_avg; /** Average beacon Noise Floor */ - t_s16 bcn_nf_avg; + t_s16 bcn_nf_avg; /** Attempted BSS descriptor */ - BSSDescriptor_t *pattempted_bss_desc; + BSSDescriptor_t *pattempted_bss_desc; /** Current SSID/BSSID related parameters*/ - current_bss_params_t curr_bss_params; + current_bss_params_t curr_bss_params; /** User selected bands */ - t_u8 config_bands; + t_u8 config_bands; /** Beacon period */ - t_u16 beacon_period; + t_u16 beacon_period; /** Listen interval */ - t_u16 listen_interval; + t_u16 listen_interval; /** ATIM window */ - t_u16 atim_window; + t_u16 atim_window; /** AdHoc channel */ - t_u8 adhoc_channel; + t_u8 adhoc_channel; /** AdHoc link sensed flag */ - t_u8 adhoc_is_link_sensed; + t_u8 adhoc_is_link_sensed; /** AdHoc operating state */ - t_u8 adhoc_state; + t_u8 adhoc_state; #if defined(STA_SUPPORT) /** AdHoc operating state backup */ - t_u8 adhoc_state_prev; + t_u8 adhoc_state_prev; /** AdHoc previous ssid used for Start */ - mlan_802_11_ssid adhoc_last_start_ssid; + mlan_802_11_ssid adhoc_last_start_ssid; #endif /** FSM variable for 11d support */ - wlan_802_11d_state_t state_11d; + wlan_802_11d_state_t state_11d; /** FSM variable for 11h support */ - wlan_11h_interface_state_t intf_state_11h; + wlan_11h_interface_state_t intf_state_11h; #ifdef UAP_SUPPORT /** Whether UAP interface has started */ - t_bool uap_bss_started; + t_bool uap_bss_started; /**UAP operating channel*/ - t_u8 uap_channel; + t_u8 uap_channel; /** state variable for UAP Get Info callback */ - wlan_uap_get_info_cb_t uap_state_chan_cb; -#endif /* UAP_SUPPORT */ + wlan_uap_get_info_cb_t uap_state_chan_cb; +#endif /* UAP_SUPPORT */ /** Security related */ /** Encryption parameter */ - wlan_802_11_security_t sec_info; + wlan_802_11_security_t sec_info; /** WEP keys */ - mrvl_wep_key_t wep_key[MRVL_NUM_WEP_KEY]; + mrvl_wep_key_t wep_key[MRVL_NUM_WEP_KEY]; /** Current WEP key index */ - t_u16 wep_key_curr_index; + t_u16 wep_key_curr_index; /** EWPA query 0: disable, 1: enable */ - t_u8 ewpa_query; + t_u8 ewpa_query; /** Encryption Key*/ - t_u8 wpa_ie[256]; + t_u8 wpa_ie[256]; /** WPA IE length */ - t_u8 wpa_ie_len; + t_u8 wpa_ie_len; /** GTK set flag */ - t_u8 wpa_is_gtk_set; + t_u8 wpa_is_gtk_set; /** AES key material */ - HostCmd_DS_802_11_KEY_MATERIAL aes_key; + HostCmd_DS_802_11_KEY_MATERIAL aes_key; #if defined(STA_SUPPORT) - /* Mgmt Frame Protection config */ - mlan_ds_misc_pmfcfg pmfcfg; + /* Mgmt Frame Protection config */ + mlan_ds_misc_pmfcfg pmfcfg; #endif /** WAPI IE */ - t_u8 wapi_ie[256]; + t_u8 wapi_ie[256]; /** WAPI IE length */ - t_u8 wapi_ie_len; + t_u8 wapi_ie_len; /** Pointer to the station table */ - mlan_list_head sta_list; + mlan_list_head sta_list; /** MGMT IE */ - custom_ie mgmt_ie[MAX_MGMT_IE_INDEX]; + custom_ie mgmt_ie[MAX_MGMT_IE_INDEX]; /** mgmt frame passthru mask */ - t_u32 mgmt_frame_passthru_mask; + t_u32 mgmt_frame_passthru_mask; /** Advanced Encryption Standard */ - t_u8 adhoc_aes_enabled; + t_u8 adhoc_aes_enabled; /** WMM required */ - t_u8 wmm_required; + t_u8 wmm_required; /** WMM enabled */ - t_u8 wmm_enabled; + t_u8 wmm_enabled; /** WMM qos info */ - t_u8 wmm_qosinfo; + t_u8 wmm_qosinfo; /** WMM related variable*/ - wmm_desc_t wmm; + wmm_desc_t wmm; /** Pointer to the Transmit BA stream table*/ - mlan_list_head tx_ba_stream_tbl_ptr; + mlan_list_head tx_ba_stream_tbl_ptr; /** Pointer to the priorities for AMSDU/AMPDU table*/ - tx_aggr_t aggr_prio_tbl[MAX_NUM_TID]; + tx_aggr_t aggr_prio_tbl[MAX_NUM_TID]; /** Pointer to the priorities for AMSDU/AMPDU table*/ - t_u8 addba_reject[MAX_NUM_TID]; + t_u8 addba_reject[MAX_NUM_TID]; /** Struct to store ADDBA parameters */ - add_ba_param_t add_ba_param; + add_ba_param_t add_ba_param; /** last rx_seq */ - t_u16 rx_seq[MAX_NUM_TID]; + t_u16 rx_seq[MAX_NUM_TID]; /** Pointer to the Receive Reordering table*/ - mlan_list_head rx_reorder_tbl_ptr; + mlan_list_head rx_reorder_tbl_ptr; /** Lock for Rx packets */ - t_void *rx_pkt_lock; + t_void *rx_pkt_lock; #ifdef STA_SUPPORT /** Buffer to store the association response for application retrieval */ - t_u8 assoc_rsp_buf[MRVDRV_ASSOC_RSP_BUF_SIZE]; + t_u8 assoc_rsp_buf[MRVDRV_ASSOC_RSP_BUF_SIZE]; /** Length of the data stored in assoc_rsp_buf */ - t_u32 assoc_rsp_size; + t_u32 assoc_rsp_size; /** Generic IEEE IEs passed from the application to be inserted into the - * association request to firmware + * association request to firmware */ - t_u8 gen_ie_buf[MRVDRV_GENIE_BUF_SIZE]; + t_u8 gen_ie_buf[MRVDRV_GENIE_BUF_SIZE]; /** Length of the data stored in gen_ie_buf */ - t_u8 gen_ie_buf_len; + t_u8 gen_ie_buf_len; - t_u8 *pcurr_bcn_buf; - t_u32 curr_bcn_size; - t_void *curr_bcn_buf_lock; + t_u8 *pcurr_bcn_buf; + t_u32 curr_bcn_size; + t_void *curr_bcn_buf_lock; /** WPS */ - wps_t wps; -#endif /* STA_SUPPORT */ + wps_t wps; +#endif /* STA_SUPPORT */ /** function table */ - mlan_operations ops; + mlan_operations ops; /** Port Control mode */ - t_u8 port_ctrl_mode; + t_u8 port_ctrl_mode; /** Port open flag */ - t_u8 port_open; + t_u8 port_open; /** Port open flag state at time of association attempt */ - t_u8 prior_port_status; + t_u8 prior_port_status; /** Bypass TX queue */ - mlan_list_head bypass_txq; + mlan_list_head bypass_txq; /** IP address operation */ - t_u32 op_code; + t_u32 op_code; /** IP address */ - t_u8 ip_addr[IPADDR_LEN]; + t_u8 ip_addr[IPADDR_LEN]; #ifdef STA_SUPPORT - ExtCap_t ext_cap; + ExtCap_t ext_cap; #endif } mlan_private, *pmlan_private; /** BA stream status */ typedef enum _baStatus_e { - BA_STREAM_NOT_SETUP = 0, - BA_STREAM_SETUP_INPROGRESS, - BA_STREAM_SETUP_COMPLETE + BA_STREAM_NOT_SETUP = 0, + BA_STREAM_SETUP_INPROGRESS, + BA_STREAM_SETUP_COMPLETE } baStatus_e; /** Tx BA stream table */ struct _TxBAStreamTbl { /** TxBAStreamTbl previous node */ - TxBAStreamTbl *pprev; + TxBAStreamTbl *pprev; /** TxBAStreamTbl next node */ - TxBAStreamTbl *pnext; + TxBAStreamTbl *pnext; /** TID */ - int tid; + int tid; /** RA */ - t_u8 ra[MLAN_MAC_ADDR_LENGTH]; + t_u8 ra[MLAN_MAC_ADDR_LENGTH]; /** BA stream status */ - baStatus_e ba_status; - t_u8 amsdu; + baStatus_e ba_status; + t_u8 amsdu; }; /** RX reorder table */ @@ -1156,43 +1157,43 @@ typedef struct _RxReorderTbl RxReorderTbl; typedef struct { /** Timer for flushing */ - t_void *timer; + t_void *timer; /** Timer set flag */ - t_u8 timer_is_set; + t_u8 timer_is_set; /** RxReorderTbl ptr */ - RxReorderTbl *ptr; + RxReorderTbl *ptr; /** Priv pointer */ - mlan_private *priv; + mlan_private *priv; } reorder_tmr_cnxt_t; /** RX reorder table */ struct _RxReorderTbl { /** RxReorderTbl previous node */ - RxReorderTbl *pprev; + RxReorderTbl *pprev; /** RxReorderTbl next node */ - RxReorderTbl *pnext; + RxReorderTbl *pnext; /** TID */ - int tid; + int tid; /** TA */ - t_u8 ta[MLAN_MAC_ADDR_LENGTH]; + t_u8 ta[MLAN_MAC_ADDR_LENGTH]; /** Start window */ - int start_win; + int start_win; /** last_seq */ - int last_seq; + int last_seq; /** Window size */ - int win_size; + int win_size; /** Pointer to pointer to RxReorderTbl */ - t_void **rx_reorder_ptr; + t_void **rx_reorder_ptr; /** Timer context */ - reorder_tmr_cnxt_t timer_context; + reorder_tmr_cnxt_t timer_context; /** BA stream status */ - baStatus_e ba_status; - t_u8 amsdu; + baStatus_e ba_status; + t_u8 amsdu; /** no packet drop flag for rx_reorder_tbl */ - t_u8 force_no_drop; + t_u8 force_no_drop; /** flag for check start win */ - t_u8 check_start_win; + t_u8 check_start_win; }; /** BSS priority node */ @@ -1202,11 +1203,11 @@ typedef struct _mlan_bssprio_node mlan_bssprio_node; struct _mlan_bssprio_node { /** Pointer to previous node */ - mlan_bssprio_node *pprev; + mlan_bssprio_node *pprev; /** Pointer to next node */ - mlan_bssprio_node *pnext; + mlan_bssprio_node *pnext; /** Pointer to priv */ - pmlan_private priv; + pmlan_private priv; }; /** BSS priority table */ @@ -1216,9 +1217,9 @@ typedef struct _mlan_bssprio_tbl mlan_bssprio_tbl; struct _mlan_bssprio_tbl { /** BSS priority list head */ - mlan_list_head bssprio_head; + mlan_list_head bssprio_head; /** Current priority node */ - mlan_bssprio_node *bssprio_cur; + mlan_bssprio_node *bssprio_cur; }; /** cmd_ctrl_node */ @@ -1228,25 +1229,25 @@ typedef struct _cmd_ctrl_node cmd_ctrl_node; struct _cmd_ctrl_node { /** Pointer to previous node */ - cmd_ctrl_node *pprev; + cmd_ctrl_node *pprev; /** Pointer to next node */ - cmd_ctrl_node *pnext; + cmd_ctrl_node *pnext; /** Pointer to priv */ - pmlan_private priv; + pmlan_private priv; /** Command OID for sub-command use */ - t_u32 cmd_oid; + t_u32 cmd_oid; /** Command flag */ - t_u32 cmd_flag; + t_u32 cmd_flag; /** Pointer to mlan_buffer */ - mlan_buffer *cmdbuf; + mlan_buffer *cmdbuf; /** Pointer to mlan_buffer */ - mlan_buffer *respbuf; + mlan_buffer *respbuf; /** Command parameter */ - t_void *pdata_buf; + t_void *pdata_buf; /** Pointer to mlan_ioctl_req if command is from IOCTL */ - t_void *pioctl_buf; + t_void *pioctl_buf; /** pre_allocated mlan_buffer for cmd */ - mlan_buffer *pmbuf; + mlan_buffer *pmbuf; }; /** station node */ @@ -1256,61 +1257,61 @@ typedef struct _sta_node sta_node; struct _sta_node { /** previous node */ - sta_node *pprev; + sta_node *pprev; /** next node */ - sta_node *pnext; + sta_node *pnext; /** station mac address */ - t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; /** wmm flag */ - t_u8 is_wmm_enabled; + t_u8 is_wmm_enabled; /** 11n flag */ - t_u8 is_11n_enabled; + t_u8 is_11n_enabled; /** AMPDU STA */ - t_u8 ampdu_sta[MAX_NUM_TID]; + t_u8 ampdu_sta[MAX_NUM_TID]; /** last rx_seq */ - t_u16 rx_seq[MAX_NUM_TID]; + t_u16 rx_seq[MAX_NUM_TID]; /** max amsdu size */ - t_u16 max_amsdu; + t_u16 max_amsdu; /** 11ac flag */ - t_u8 is_11ac_enabled; + t_u8 is_11ac_enabled; /** wapi key on off flag */ - t_u8 wapi_key_on; + t_u8 wapi_key_on; /** tx pause status */ - t_u8 tx_pause; + t_u8 tx_pause; }; /** 802.11h State information kept in the 'mlan_adapter' driver structure */ typedef struct { /** Min TX Power capability sent to FW for 11h use and fw power control */ - t_s8 min_tx_power_capability; + t_s8 min_tx_power_capability; /** Max TX Power capability sent to FW for 11h use and fw power control */ - t_s8 max_tx_power_capability; + t_s8 max_tx_power_capability; /** User provisioned local power constraint sent in association requests */ - t_s8 usr_def_power_constraint; + t_s8 usr_def_power_constraint; /** Received CHANNEL_SWITCH_ANN event */ - t_bool recvd_chanswann_event; + t_bool recvd_chanswann_event; /** Indicates an interface wants to enable master radar detection */ - t_bool master_radar_det_enable_pending; + t_bool master_radar_det_enable_pending; /** Indicates an interface wants to enable slave radar detection */ - t_bool slave_radar_det_enable_pending; + t_bool slave_radar_det_enable_pending; /** Indicates whether master radar detection active in the firmware */ - t_bool is_master_radar_det_active; + t_bool is_master_radar_det_active; /** Indicates whether slave radar detection active in the firmware */ - t_bool is_slave_radar_det_active; + t_bool is_slave_radar_det_active; /** Quiet IE */ - IEEEtypes_Quiet_t quiet_ie; + IEEEtypes_Quiet_t quiet_ie; } wlan_11h_device_state_t; /** Enumeration for DFS Timestamp represents field */ enum _dfs_timestamp_repr_e { /** Ignore entry */ - DFS_TS_REPR_NOT_IN_USE = 0, + DFS_TS_REPR_NOT_IN_USE = 0, /** NOP (Non-Occupancy Period) start time */ - DFS_TS_REPR_NOP_START = 1, + DFS_TS_REPR_NOP_START = 1, /** CAC (Channel Availability Check) completion time */ - DFS_TS_REPR_CAC_COMPLETION + DFS_TS_REPR_CAC_COMPLETION }; /** DFS Timestamp type used for marking NOP/CAC events */ @@ -1320,71 +1321,71 @@ typedef struct _wlan_dfs_timestamp_t wlan_dfs_timestamp_t; struct _wlan_dfs_timestamp_t { /** Pointer to previous node */ - wlan_dfs_timestamp_t *pprev; + wlan_dfs_timestamp_t *pprev; /** Pointer to next node */ - wlan_dfs_timestamp_t *pnext; + wlan_dfs_timestamp_t *pnext; /** WLAN Channel number */ - t_u8 channel; + t_u8 channel; /** What this timestamp represents */ - t_u8 represents; + t_u8 represents; /** reserved field */ - t_u16 reserved; + t_u16 reserved; /** timestamp - seconds */ - t_u32 ts_sec; + t_u32 ts_sec; /** timestamp - microseconds */ - t_u32 ts_usec; + t_u32 ts_usec; }; /** DFS State information kept in the 'mlan_adapter' driver structure */ typedef struct { /** Indicates whether DFS channel check is occurring in firmware */ - t_bool dfs_check_pending; + t_bool dfs_check_pending; /** Indicates whether DFS channel check found radar */ - t_bool dfs_radar_found; + t_bool dfs_radar_found; /** Channel radar is being checked on. BAND_A is assumed. */ - t_u8 dfs_check_channel; + t_u8 dfs_check_channel; /** Timestamp when we got last report, to determine if data is old or not. */ - t_u32 dfs_report_time_sec; + t_u32 dfs_report_time_sec; /** List for holding dfs_timestamps for NOP/CAC events */ - mlan_list_head dfs_ts_head; + mlan_list_head dfs_ts_head; } wlan_dfs_device_state_t; /** Enumeration for mlan_ds_11h_radar_det_hndlg stages */ enum _mlan_ds_11h_rdh_stages { - RDH_OFF = 0, - RDH_CHK_INTFS = 1, - RDH_STOP_TRAFFIC, - RDH_GET_INFO_CHANNEL, - RDH_GET_INFO_BEACON_DTIM, - RDH_SET_CUSTOM_IE, - RDH_REM_CUSTOM_IE, - RDH_STOP_INTFS, - RDH_SET_NEW_CHANNEL, - RDH_RESTART_INTFS, - RDH_RESTART_TRAFFIC + RDH_OFF = 0, + RDH_CHK_INTFS = 1, + RDH_STOP_TRAFFIC, + RDH_GET_INFO_CHANNEL, + RDH_GET_INFO_BEACON_DTIM, + RDH_SET_CUSTOM_IE, + RDH_REM_CUSTOM_IE, + RDH_STOP_INTFS, + RDH_SET_NEW_CHANNEL, + RDH_RESTART_INTFS, + RDH_RESTART_TRAFFIC }; /** State info for Radar Detected Handling kept in 'mlan_adapter' */ typedef struct { /** Stage (of Operation) */ - t_u8 stage; + t_u8 stage; /** Number of interfaces to handle */ - t_u8 priv_list_count; + t_u8 priv_list_count; /** Index of interface in process (used by some stages) */ - t_u8 priv_curr_idx; + t_u8 priv_curr_idx; /** Current Channel (to leave) */ - t_u8 curr_channel; + t_u8 curr_channel; /** New Channel (to switch to) */ - t_u8 new_channel; + t_u8 new_channel; /** UAP band_config */ - t_u8 uap_band_cfg; + t_u8 uap_band_cfg; /** BEACON*DTIM period (in msec; max of STA/UAP) */ - t_u16 max_bcn_dtim_ms; + t_u16 max_bcn_dtim_ms; /** List of interfaces to handle */ - mlan_private *priv_list[MLAN_MAX_BSS_NUM]; + mlan_private *priv_list[MLAN_MAX_BSS_NUM]; } wlan_radar_det_hndlg_state_t; #ifdef DFS_TESTING_SUPPORT @@ -1392,20 +1393,20 @@ typedef struct typedef struct { /** user-configured CAC period (in msec) */ - t_u16 user_cac_period_msec; + t_u16 user_cac_period_msec; /** user-configured NOP period (in sec) */ - t_u16 user_nop_period_sec; + t_u16 user_nop_period_sec; /** user-configured skip channel change on radar */ - t_bool no_channel_change_on_radar; + t_bool no_channel_change_on_radar; /** user-configured new channel to change to on radar */ - t_u8 fixed_new_channel_on_radar; + t_u8 fixed_new_channel_on_radar; } wlan_dfs_testing_settings_t; #endif /* DFS_SUPPORT_TESTING */ /** * @brief Driver measurement state held in 'mlan_adapter' structure - * - * Used to record a measurement request that the driver is pending on + * + * Used to record a measurement request that the driver is pending on * the result (received measurement report). */ typedef struct @@ -1414,12 +1415,12 @@ typedef struct * Dialog token of a pending measurement request/report. Used to * block execution while waiting for the specific dialog token */ - t_u8 meas_rpt_pend_on; + t_u8 meas_rpt_pend_on; /** * Measurement report received from the firmware that we were pending on */ - HostCmd_DS_MEASUREMENT_REPORT meas_rpt_returned; + HostCmd_DS_MEASUREMENT_REPORT meas_rpt_returned; } wlan_meas_state_t; @@ -1427,24 +1428,24 @@ typedef struct /** data structure for SDIO MPA TX */ typedef struct _sdio_mpa_tx { - /** allocated buf for tx aggreation */ - t_u8 *head_ptr; - /** multiport tx aggregation buffer pointer */ - t_u8 *buf; - /** multiport tx aggregation buffer length */ - t_u32 buf_len; - /** multiport tx aggregation packet count */ - t_u32 pkt_cnt; - /** multiport tx aggregation ports */ - t_u32 ports; - /** multiport tx aggregation starting port */ - t_u16 start_port; - /** multiport tx aggregation enable/disable flag */ - t_u8 enabled; - /** multiport tx aggregation buffer size */ - t_u32 buf_size; - /** multiport tx aggregation pkt aggr limit */ - t_u32 pkt_aggr_limit; + /** allocated buf for tx aggreation */ + t_u8 *head_ptr; + /** multiport tx aggregation buffer pointer */ + t_u8 *buf; + /** multiport tx aggregation buffer length */ + t_u32 buf_len; + /** multiport tx aggregation packet count */ + t_u32 pkt_cnt; + /** multiport tx aggregation ports */ + t_u32 ports; + /** multiport tx aggregation starting port */ + t_u16 start_port; + /** multiport tx aggregation enable/disable flag */ + t_u8 enabled; + /** multiport tx aggregation buffer size */ + t_u32 buf_size; + /** multiport tx aggregation pkt aggr limit */ + t_u32 pkt_aggr_limit; } sdio_mpa_tx; #endif @@ -1452,30 +1453,30 @@ typedef struct _sdio_mpa_tx /** data structure for SDIO MPA RX */ typedef struct _sdio_mpa_rx { - /** allocated buf for rx aggreation */ - t_u8 *head_ptr; - /** multiport rx aggregation buffer pointer */ - t_u8 *buf; - /** multiport rx aggregation buffer length */ - t_u32 buf_len; - /** multiport rx aggregation packet count */ - t_u32 pkt_cnt; - /** multiport rx aggregation ports */ - t_u32 ports; - /** multiport rx aggregation starting port */ - t_u16 start_port; - - /** multiport rx aggregation mbuf array */ - pmlan_buffer mbuf_arr[SDIO_MP_AGGR_DEF_PKT_LIMIT]; - /** multiport rx aggregation pkt len array */ - t_u32 len_arr[SDIO_MP_AGGR_DEF_PKT_LIMIT]; - - /** multiport rx aggregation enable/disable flag */ - t_u8 enabled; - /** multiport rx aggregation buffer size */ - t_u32 buf_size; - /** multiport rx aggregation pkt aggr limit */ - t_u32 pkt_aggr_limit; + /** allocated buf for rx aggreation */ + t_u8 *head_ptr; + /** multiport rx aggregation buffer pointer */ + t_u8 *buf; + /** multiport rx aggregation buffer length */ + t_u32 buf_len; + /** multiport rx aggregation packet count */ + t_u32 pkt_cnt; + /** multiport rx aggregation ports */ + t_u32 ports; + /** multiport rx aggregation starting port */ + t_u16 start_port; + + /** multiport rx aggregation mbuf array */ + pmlan_buffer mbuf_arr[SDIO_MP_AGGR_DEF_PKT_LIMIT]; + /** multiport rx aggregation pkt len array */ + t_u32 len_arr[SDIO_MP_AGGR_DEF_PKT_LIMIT]; + + /** multiport rx aggregation enable/disable flag */ + t_u8 enabled; + /** multiport rx aggregation buffer size */ + t_u32 buf_size; + /** multiport rx aggregation pkt aggr limit */ + t_u32 pkt_aggr_limit; } sdio_mpa_rx; #endif /* SDIO_MULTI_PORT_RX_AGGR */ @@ -1484,379 +1485,379 @@ typedef struct _mlan_init_para { #ifdef MFG_CMD_SUPPORT /** MFG mode */ - t_u32 mfg_mode; + t_u32 mfg_mode; #endif /** SDIO interrupt mode (0: INT_MODE_SDIO, 1: INT_MODE_GPIO) */ - t_u32 int_mode; + t_u32 int_mode; /** GPIO interrupt pin number */ - t_u32 gpio_pin; + t_u32 gpio_pin; #ifdef SDIO_MULTI_PORT_TX_AGGR /** SDIO MPA Tx */ - t_u32 mpa_tx_cfg; + t_u32 mpa_tx_cfg; #endif #ifdef SDIO_MULTI_PORT_RX_AGGR /** SDIO MPA Rx */ - t_u32 mpa_rx_cfg; + t_u32 mpa_rx_cfg; #endif /** Auto deep sleep */ - t_u32 auto_ds; + t_u32 auto_ds; /** IEEE PS mode */ - t_u32 ps_mode; + t_u32 ps_mode; /** Max Tx buffer size */ - t_u32 max_tx_buf; + t_u32 max_tx_buf; /** 802.11d configuration */ - t_u32 cfg_11d; + t_u32 cfg_11d; /** 802.11H DFS Master Radar Detect */ - t_u32 dfs_master_radar_det_en; + t_u32 dfs_master_radar_det_en; /** 802.11H DFS Slave Radar Detect */ - t_u32 dfs_slave_radar_det_en; + t_u32 dfs_slave_radar_det_en; } mlan_init_para, *pmlan_init_para; /** Adapter data structure for MLAN */ typedef struct _mlan_adapter { /** MOAL handle structure */ - t_void *pmoal_handle; + t_void *pmoal_handle; /** Private pointer */ - pmlan_private priv[MLAN_MAX_BSS_NUM]; + pmlan_private priv[MLAN_MAX_BSS_NUM]; /** Total number of Priv number */ - t_u8 priv_num; + t_u8 priv_num; /** Priority table for bss */ - mlan_bssprio_tbl bssprio_tbl[MLAN_MAX_BSS_NUM]; + mlan_bssprio_tbl bssprio_tbl[MLAN_MAX_BSS_NUM]; /** Callback table */ - mlan_callbacks callbacks; + mlan_callbacks callbacks; /** Init parameters */ - mlan_init_para init_para; + mlan_init_para init_para; /** mlan_lock for init/shutdown */ - t_void *pmlan_lock; + t_void *pmlan_lock; /** main_proc_lock for main_process */ - t_void *pmain_proc_lock; + t_void *pmain_proc_lock; /** mlan_processing */ - t_u32 mlan_processing; + t_u32 mlan_processing; /** more task flag */ - t_u32 more_task_flag; + t_u32 more_task_flag; /** Max tx buf size */ - t_u16 max_tx_buf_size; + t_u16 max_tx_buf_size; /** Tx buf size */ - t_u16 tx_buf_size; + t_u16 tx_buf_size; /** current tx buf size in fw */ - t_u16 curr_tx_buf_size; + t_u16 curr_tx_buf_size; /** IO port */ - t_u32 ioport; + t_u32 ioport; /** STATUS variables */ - WLAN_HARDWARE_STATUS hw_status; + WLAN_HARDWARE_STATUS hw_status; /** PnP SUPPORT */ - t_u8 surprise_removed; + t_u8 surprise_removed; /** Radio on flag */ - t_u16 radio_on; + t_u16 radio_on; /** Firmware release number */ - t_u32 fw_release_number; + t_u32 fw_release_number; /** Number of antenna used */ - t_u16 number_of_antenna; + t_u16 number_of_antenna; /** Firmware capability information */ - t_u32 fw_cap_info; + t_u32 fw_cap_info; /** pint_lock for interrupt handling */ - t_void *pint_lock; + t_void *pint_lock; /** Interrupt status */ - t_u8 sdio_ireg; + t_u8 sdio_ireg; /** SDIO multiple port read bitmap */ - t_u32 mp_rd_bitmap; + t_u32 mp_rd_bitmap; /** SDIO multiple port write bitmap */ - t_u32 mp_wr_bitmap; + t_u32 mp_wr_bitmap; /** SDIO end port from txbufcfg */ - t_u16 mp_end_port; + t_u16 mp_end_port; /** SDIO port mask calculated based on txbufcfg end port */ - t_u32 mp_data_port_mask; + t_u32 mp_data_port_mask; /** Current available port for read */ - t_u8 curr_rd_port; + t_u8 curr_rd_port; /** Current available port for write */ - t_u8 curr_wr_port; + t_u8 curr_wr_port; /** Array to store values of SDIO multiple port group registers */ - t_u8 *mp_regs; + t_u8 *mp_regs; /** allocated buf to read SDIO multiple port group registers */ - t_u8 *mp_regs_buf; + t_u8 *mp_regs_buf; #ifdef SDIO_MULTI_PORT_TX_AGGR - /** data structure for SDIO MPA TX */ - sdio_mpa_tx mpa_tx; -#endif /* SDIO_MULTI_PORT_TX_AGGR */ + /** data structure for SDIO MPA TX */ + sdio_mpa_tx mpa_tx; +#endif /* SDIO_MULTI_PORT_TX_AGGR */ #ifdef SDIO_MULTI_PORT_RX_AGGR - /** data structure for SDIO MPA RX */ - sdio_mpa_rx mpa_rx; -#endif /* SDIO_MULTI_PORT_RX_AGGR */ + /** data structure for SDIO MPA RX */ + sdio_mpa_rx mpa_rx; +#endif /* SDIO_MULTI_PORT_RX_AGGR */ /** SDIO interrupt mode (0: INT_MODE_SDIO, 1: INT_MODE_GPIO) */ - t_u32 int_mode; + t_u32 int_mode; /** GPIO interrupt pin number */ - t_u32 gpio_pin; + t_u32 gpio_pin; /** Event cause */ - t_u32 event_cause; + t_u32 event_cause; /** Event buffer */ - pmlan_buffer pmlan_buffer_event; + pmlan_buffer pmlan_buffer_event; /** Upload length */ - t_u32 upld_len; + t_u32 upld_len; /** Upload buffer*/ - t_u8 upld_buf[WLAN_UPLD_SIZE]; - /** Data sent: + t_u8 upld_buf[WLAN_UPLD_SIZE]; + /** Data sent: * TRUE - Data is sent to fw, no Tx Done received * FALSE - Tx done received for previous Tx */ - t_u8 data_sent; - /** CMD sent: + t_u8 data_sent; + /** CMD sent: * TRUE - CMD is sent to fw, no CMD Done received * FALSE - CMD done received for previous CMD */ - t_u8 cmd_sent; - /** CMD Response received: + t_u8 cmd_sent; + /** CMD Response received: * TRUE - CMD is response is received from fw, and yet to process * FALSE - No cmd response to process */ - t_u8 cmd_resp_received; - /** Event received: + t_u8 cmd_resp_received; + /** Event received: * TRUE - Event received from fw, and yet to process * FALSE - No events to process */ - t_u8 event_received; + t_u8 event_received; /** Data received: * TRUE - Data received from fw * FALSE - No Data received */ - t_u8 data_received; + t_u8 data_received; /** Command-related variables */ /** Command sequence number */ - t_u16 seq_num; + t_u16 seq_num; /** Command controller nodes */ - cmd_ctrl_node *cmd_pool; + cmd_ctrl_node *cmd_pool; /** Current Command */ - cmd_ctrl_node *curr_cmd; + cmd_ctrl_node *curr_cmd; /** mlan_lock for command */ - t_void *pmlan_cmd_lock; + t_void *pmlan_cmd_lock; /** Number of command timeouts */ - t_u32 num_cmd_timeout; + t_u32 num_cmd_timeout; /** Last init fw command id */ - t_u16 last_init_cmd; + t_u16 last_init_cmd; /** Command timer */ - t_void *pmlan_cmd_timer; + t_void *pmlan_cmd_timer; /** Command timer set flag */ - t_u8 cmd_timer_is_set; + t_u8 cmd_timer_is_set; /** Command Queues */ /** Free command buffers */ - mlan_list_head cmd_free_q; + mlan_list_head cmd_free_q; /** Pending command buffers */ - mlan_list_head cmd_pending_q; + mlan_list_head cmd_pending_q; /** Command queue for scanning */ - mlan_list_head scan_pending_q; + mlan_list_head scan_pending_q; /** mlan_processing */ - t_u32 scan_processing; + t_u32 scan_processing; /** Region code */ - t_u16 region_code; + t_u16 region_code; /** Region Channel data */ - region_chan_t region_channel[MAX_REGION_CHANNEL_NUM]; + region_chan_t region_channel[MAX_REGION_CHANNEL_NUM]; /** CFP table code for 2.4GHz */ - t_u8 cfp_code_bg; + t_u8 cfp_code_bg; /** CFP table code for 5GHz */ - t_u8 cfp_code_a; + t_u8 cfp_code_a; #ifdef STA_SUPPORT /** Universal Channel data */ - region_chan_t universal_channel[MAX_REGION_CHANNEL_NUM]; + region_chan_t universal_channel[MAX_REGION_CHANNEL_NUM]; /** Parsed region channel */ - parsed_region_chan_11d_t parsed_region_chan; -#endif /* STA_SUPPORT */ + parsed_region_chan_11d_t parsed_region_chan; +#endif /* STA_SUPPORT */ /** 11D and Domain Regulatory Data */ - wlan_802_11d_domain_reg_t domain_reg; + wlan_802_11d_domain_reg_t domain_reg; /** Country Code */ - t_u8 country_code[COUNTRY_CODE_LEN]; + t_u8 country_code[COUNTRY_CODE_LEN]; /** FSM variable for 11h support */ - wlan_11h_device_state_t state_11h; + wlan_11h_device_state_t state_11h; /** FSM variable for DFS support */ - wlan_dfs_device_state_t state_dfs; + wlan_dfs_device_state_t state_dfs; /** FSM variable for RDH support */ - wlan_radar_det_hndlg_state_t state_rdh; + wlan_radar_det_hndlg_state_t state_rdh; #ifdef DFS_TESTING_SUPPORT /** User configured settings for DFS testing */ - wlan_dfs_testing_settings_t dfs_test_params; + wlan_dfs_testing_settings_t dfs_test_params; #endif /** FSM variable for MEAS support */ - wlan_meas_state_t state_meas; + wlan_meas_state_t state_meas; /** Scan table */ - BSSDescriptor_t *pscan_table; + BSSDescriptor_t *pscan_table; /** scan age in secs */ - t_u32 age_in_secs; - t_u8 bgscan_reported; + t_u32 age_in_secs; + t_u8 bgscan_reported; /** Number of records in the scan table */ - t_u32 num_in_scan_table; + t_u32 num_in_scan_table; /** Scan probes */ - t_u16 scan_probes; + t_u16 scan_probes; /** Scan type */ - t_u8 scan_type; + t_u8 scan_type; /** Scan mode */ - t_u32 scan_mode; + t_u32 scan_mode; /** Specific scan time */ - t_u16 specific_scan_time; + t_u16 specific_scan_time; /** Active scan time */ - t_u16 active_scan_time; + t_u16 active_scan_time; /** Passive scan time */ - t_u16 passive_scan_time; + t_u16 passive_scan_time; /** Scan block flag */ - t_u8 scan_block; + t_u8 scan_block; /** Extended scan or legacy scan */ - t_u8 ext_scan; - t_u16 bcn_buf_size; + t_u8 ext_scan; + t_u16 bcn_buf_size; /** Beacon buffer */ - t_u8 *bcn_buf; + t_u8 *bcn_buf; /** Pointer to valid beacon buffer end */ - t_u8 *pbcn_buf_end; + t_u8 *pbcn_buf_end; /** F/W supported bands */ - t_u8 fw_bands; + t_u8 fw_bands; /** User selected band to start adhoc network */ - t_u8 adhoc_start_band; + t_u8 adhoc_start_band; /** User selected bands */ - t_u8 config_bands; + t_u8 config_bands; /** Pointer to channel list last sent to the firmware for scanning */ - ChanScanParamSet_t *pscan_channels; + ChanScanParamSet_t *pscan_channels; /** Tx lock flag */ - t_u8 tx_lock_flag; + t_u8 tx_lock_flag; /** sleep_params_t */ - sleep_params_t sleep_params; + sleep_params_t sleep_params; /** sleep_period_t (Enhanced Power Save) */ - sleep_period_t sleep_period; + sleep_period_t sleep_period; /** Power Save mode */ /** * Wlan802_11PowerModeCAM = disable * Wlan802_11PowerModePSP = enable */ - t_u16 ps_mode; + t_u16 ps_mode; /** Power Save state */ - t_u32 ps_state; + t_u32 ps_state; /** Need to wakeup flag */ - t_u8 need_to_wakeup; + t_u8 need_to_wakeup; /** Multiple DTIM */ - t_u16 multiple_dtim; + t_u16 multiple_dtim; /** Local listen interval */ - t_u16 local_listen_interval; + t_u16 local_listen_interval; /** Null packet interval */ - t_u16 null_pkt_interval; + t_u16 null_pkt_interval; /** Power save confirm sleep command buffer */ - pmlan_buffer psleep_cfm; + pmlan_buffer psleep_cfm; /** Beacon miss timeout */ - t_u16 bcn_miss_time_out; + t_u16 bcn_miss_time_out; /** AdHoc awake period */ - t_u16 adhoc_awake_period; + t_u16 adhoc_awake_period; /** Deep Sleep flag */ - t_u8 is_deep_sleep; + t_u8 is_deep_sleep; /** Idle time */ - t_u16 idle_time; + t_u16 idle_time; /** Auto Deep Sleep enabled at init time */ - t_u8 init_auto_ds; + t_u8 init_auto_ds; /** delay null pkt flag */ - t_u8 delay_null_pkt; + t_u8 delay_null_pkt; /** Delay to PS in milliseconds */ - t_u16 delay_to_ps; + t_u16 delay_to_ps; /** Enhanced PS mode */ - t_u16 enhanced_ps_mode; + t_u16 enhanced_ps_mode; /** Device wakeup required flag */ - t_u8 pm_wakeup_card_req; + t_u8 pm_wakeup_card_req; /** Gen NULL pkg */ - t_u16 gen_null_pkt; + t_u16 gen_null_pkt; /** PPS/UAPSD mode flag */ - t_u16 pps_uapsd_mode; + t_u16 pps_uapsd_mode; /** Number of wakeup tries */ - t_u32 pm_wakeup_fw_try; + t_u32 pm_wakeup_fw_try; /** Host Sleep configured flag */ - t_u8 is_hs_configured; + t_u8 is_hs_configured; /** Host Sleep configuration */ - hs_config_param hs_cfg; + hs_config_param hs_cfg; /** Host Sleep activated flag */ - t_u8 hs_activated; + t_u8 hs_activated; /** Event body */ - t_u8 event_body[MAX_EVENT_SIZE]; + t_u8 event_body[MAX_EVENT_SIZE]; /** 802.11n device capabilities */ - t_u32 hw_dot_11n_dev_cap; + t_u32 hw_dot_11n_dev_cap; /** Device support for MIMO abstraction of MCSs */ - t_u8 hw_dev_mcs_support; + t_u8 hw_dev_mcs_support; /** 802.11n Device Capabilities for 2.4GHz */ - t_u32 usr_dot_11n_dev_cap_bg; + t_u32 usr_dot_11n_dev_cap_bg; /** 802.11n Device Capabilities for 5GHz */ - t_u32 usr_dot_11n_dev_cap_a; + t_u32 usr_dot_11n_dev_cap_a; /** MIMO abstraction of MCSs supported by device */ - t_u8 usr_dev_mcs_support; + t_u8 usr_dev_mcs_support; #ifdef STA_SUPPORT /** Enable 11n support for adhoc start */ - t_u8 adhoc_11n_enabled; + t_u8 adhoc_11n_enabled; /** Adhoc Secondary Channel Bandwidth */ - t_u8 chan_bandwidth; -#endif /* STA_SUPPORT */ + t_u8 chan_bandwidth; +#endif /* STA_SUPPORT */ /** 802.11ac device capabilities */ - t_u32 hw_dot_11ac_dev_cap; + t_u32 hw_dot_11ac_dev_cap; /** 802.11ac device support for MIMO abstraction of MCSs */ - t_u32 hw_dot_11ac_mcs_support; + t_u32 hw_dot_11ac_mcs_support; /** 802.11ac Device Capabilities for 2.4GHz */ - t_u32 usr_dot_11ac_dev_cap_bg; + t_u32 usr_dot_11ac_dev_cap_bg; /** 802.11ac Device Capabilities for 5GHz */ - t_u32 usr_dot_11ac_dev_cap_a; + t_u32 usr_dot_11ac_dev_cap_a; /** MIMO abstraction of MCSs supported by device */ - t_u32 usr_dot_11ac_mcs_support; + t_u32 usr_dot_11ac_mcs_support; /** max mgmt IE index in device */ - t_u16 max_mgmt_ie_index; + t_u16 max_mgmt_ie_index; #ifdef MFG_CMD_SUPPORT - t_u32 mfg_mode; + t_u32 mfg_mode; #endif /** Debug */ - wlan_dbg dbg; + wlan_dbg dbg; /** RX pending for forwarding packets */ - t_u16 pending_bridge_pkts; + t_u16 pending_bridge_pkts; #ifdef STA_SUPPORT /** ARP filter buffer */ - t_u8 arp_filter[ARP_FILTER_MAX_BUF_SIZE]; + t_u8 arp_filter[ARP_FILTER_MAX_BUF_SIZE]; /** ARP filter buffer size */ - t_u32 arp_filter_size; -#endif /* STA_SUPPORT */ + t_u32 arp_filter_size; +#endif /* STA_SUPPORT */ /** Minimum delay between HsActive and HostWake (in msec) */ - t_u16 min_wake_holdoff; + t_u16 min_wake_holdoff; /** Bypass TX queue pkt count */ - t_u16 bypass_pkt_count; + t_u16 bypass_pkt_count; #if defined(STA_SUPPORT) /** warm-reset IOCTL request buffer pointer */ - pmlan_ioctl_req pwarm_reset_ioctl_req; + pmlan_ioctl_req pwarm_reset_ioctl_req; #endif /** Extended SCAN IOCTL request buffer pointer */ - pmlan_ioctl_req pext_scan_ioctl_req; + pmlan_ioctl_req pext_scan_ioctl_req; /** Cal data pointer */ - t_u8 *pcal_data; + t_u8 *pcal_data; /** Cal data length */ - t_u32 cal_data_len; + t_u32 cal_data_len; } mlan_adapter, *pmlan_adapter; @@ -1887,7 +1888,7 @@ mlan_status wlan_shutdown_fw_complete(IN pmlan_adapter pmadapter); /** Receive event */ mlan_status wlan_recv_event(pmlan_private priv, - mlan_event_id event_id, t_void * pmevent); + mlan_event_id event_id, t_void * pmevent); /** Initialize mlan_adapter structure */ t_void wlan_init_adapter(IN pmlan_adapter pmadapter); @@ -1900,31 +1901,31 @@ mlan_status wlan_process_event(pmlan_adapter pmadapter); /** Prepare command */ mlan_status wlan_prepare_cmd(IN pmlan_private priv, - IN t_u16 cmd_no, - IN t_u16 cmd_action, - IN t_u32 cmd_oid, - IN t_void * pioctl_buf, IN t_void * pdata_buf); + IN t_u16 cmd_no, + IN t_u16 cmd_action, + IN t_u32 cmd_oid, + IN t_void * pioctl_buf, IN t_void * pdata_buf); /** cmd timeout handler */ t_void wlan_cmd_timeout_func(t_void * FunctionContext); /** process host cmd */ mlan_status wlan_misc_ioctl_host_cmd(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); /** process init/shutdown cmd*/ mlan_status wlan_misc_ioctl_init_shutdown(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); /** process debug info */ mlan_status wlan_get_info_debug_info(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) /** Set/Get BSS role */ mlan_status wlan_bss_ioctl_bss_role(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); #endif mlan_status wlan_set_ewpa_mode(mlan_private * priv, - mlan_ds_passphrase * psec_pp); + mlan_ds_passphrase * psec_pp); mlan_status wlan_find_bss(mlan_private * pmpriv, pmlan_ioctl_req pioctl_req); /** Allocate memory for adapter structure members */ @@ -1950,18 +1951,18 @@ t_void wlan_cancel_pending_scan_cmd(pmlan_adapter pmadapter); t_void wlan_cancel_all_pending_cmd(pmlan_adapter pmadapter); /**Cancel pending ioctl */ t_void wlan_cancel_pending_ioctl(pmlan_adapter pmadapter, - pmlan_ioctl_req pioctl_req); + pmlan_ioctl_req pioctl_req); /**Cancel bss pending ioctl */ t_void wlan_cancel_bss_pending_cmd(pmlan_adapter pmadapter, t_u32 bss_index); /** Insert command to free queue */ t_void wlan_insert_cmd_to_free_q(IN mlan_adapter * pmadapter, - IN cmd_ctrl_node * pcmd_node); + IN cmd_ctrl_node * pcmd_node); /** Insert command to pending queue */ t_void wlan_insert_cmd_to_pending_q(IN mlan_adapter * pmadapter, - IN cmd_ctrl_node * pcmd_node, - IN t_u32 addtail); + IN cmd_ctrl_node * pcmd_node, + IN t_u32 addtail); /** Execute next command */ mlan_status wlan_exec_next_cmd(mlan_adapter * pmadapter); @@ -1971,29 +1972,29 @@ mlan_status wlan_process_cmdresp(mlan_adapter * pmadapter); mlan_status wlan_handle_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf); /** Process transmission */ mlan_status wlan_process_tx(pmlan_private priv, pmlan_buffer pmbuf, - mlan_tx_param * tx_param); + mlan_tx_param * tx_param); /** Transmit a null data packet */ mlan_status wlan_send_null_packet(pmlan_private priv, t_u8 flags); #if defined(SDIO_MULTI_PORT_TX_AGGR) || defined(SDIO_MULTI_PORT_RX_AGGR) mlan_status wlan_alloc_sdio_mpa_buffers(IN mlan_adapter * pmadapter, - t_u32 mpa_tx_buf_size, - t_u32 mpa_rx_buf_size); + t_u32 mpa_tx_buf_size, + t_u32 mpa_rx_buf_size); mlan_status wlan_free_sdio_mpa_buffers(IN mlan_adapter * pmadapter); #endif /** Process write data complete */ mlan_status wlan_write_data_complete(pmlan_adapter pmlan_adapter, - pmlan_buffer pmbuf, mlan_status status); + pmlan_buffer pmbuf, mlan_status status); /** Process receive packet complete */ mlan_status wlan_recv_packet_complete(pmlan_adapter pmadapter, - pmlan_buffer pmbuf, mlan_status status); + pmlan_buffer pmbuf, mlan_status status); /** Clean Tx Rx queues */ t_void wlan_clean_txrx(pmlan_private priv); t_void wlan_add_buf_bypass_txqueue(mlan_adapter * pmadapter, - pmlan_buffer pmbuf); + pmlan_buffer pmbuf); t_void wlan_process_bypass_tx(mlan_adapter * pmadapter); t_void wlan_cleanup_bypass_txq(pmlan_private priv); t_u8 wlan_bypass_tx_list_empty(mlan_adapter * pmadapter); @@ -2006,44 +2007,44 @@ t_u8 wlan_check_last_packet_indication(pmlan_private priv); /** function to allocate a mlan_buffer */ pmlan_buffer wlan_alloc_mlan_buffer(mlan_adapter * pmadapter, t_u32 data_len, - t_u32 head_room, t_u32 malloc_flag); + t_u32 head_room, t_u32 malloc_flag); /** function to free a mlan_buffer */ t_void wlan_free_mlan_buffer(mlan_adapter * pmadapter, pmlan_buffer pmbuf); /** command resp handler for version ext */ mlan_status wlan_ret_ver_ext(pmlan_private pmpriv, HostCmd_DS_COMMAND * resp, - mlan_ioctl_req * pioctl_buf); + mlan_ioctl_req * pioctl_buf); /** command resp handler for rx mgmt forward registration */ mlan_status wlan_ret_rx_mgmt_ind(pmlan_private pmpriv, - HostCmd_DS_COMMAND * resp, - mlan_ioctl_req * pioctl_buf); + HostCmd_DS_COMMAND * resp, + mlan_ioctl_req * pioctl_buf); /** Check Power Save condition */ t_void wlan_check_ps_cond(mlan_adapter * pmadapter); /** handle command for enhanced power save mode */ mlan_status wlan_cmd_enh_power_mode(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, - IN t_u16 ps_bitmap, IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, + IN t_u16 ps_bitmap, IN t_void * pdata_buf); /** handle command resp for enhanced power save mode */ mlan_status wlan_ret_enh_power_mode(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); /** handle commnand for cfg data */ mlan_status wlan_cmd_cfg_data(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * pcmd, - IN t_u16 cmd_action, IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * pcmd, + IN t_u16 cmd_action, IN t_void * pdata_buf); /** handle command resp for cfg data */ mlan_status wlan_ret_cfg_data(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN t_void * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN t_void * pioctl_buf); /** Process sleep confirm command response */ void wlan_process_sleep_confirm_resp(pmlan_adapter pmadapter, t_u8 * pbuf, - t_u32 len); + t_u32 len); /** Perform hs related activities on receving the power up interrupt */ void wlan_process_hs_config(pmlan_adapter pmadapter); @@ -2052,79 +2053,79 @@ mlan_status wlan_pm_reset_card(pmlan_adapter adapter); mlan_status wlan_pm_wakeup_card(pmlan_adapter pmadapter); mlan_status wlan_process_802dot11_mgmt_pkt(mlan_private * priv, t_u8 * payload, - t_u32 payload_len); + t_u32 payload_len); mlan_status wlan_pm_ioctl_hscfg(pmlan_adapter pmadapter, - pmlan_ioctl_req pioctl_req); + pmlan_ioctl_req pioctl_req); #ifdef WIFI_DIRECT_SUPPORT mlan_status wlan_bss_ioctl_wifi_direct_mode(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); mlan_status wlan_cmd_wifi_direct_mode(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, - IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, + IN t_void * pdata_buf); mlan_status wlan_ret_wifi_direct_mode(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); mlan_status wlan_radio_ioctl_remain_chan_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); mlan_status wlan_cmd_remain_on_channel(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, - IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, + IN t_void * pdata_buf); mlan_status wlan_ret_remain_on_channel(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); #endif /** get pm info */ mlan_status wlan_get_pm_info(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); mlan_status wlan_bss_ioctl_bss_remove(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); mlan_status wlan_get_hs_wakeup_reason(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); mlan_status wlan_cmd_hs_wakeup_reason(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * cmd, + IN t_void * pdata_buf); mlan_status wlan_ret_hs_wakeup_reason(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); mlan_status wlan_radio_ioctl_radio_ctl(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); mlan_status wlan_radio_ioctl_ant_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); mlan_status wlan_cmd_tx_rate_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf); mlan_status wlan_ret_tx_rate_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); mlan_status wlan_rate_ioctl_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); mlan_status wlan_ret_802_11_tx_rate_query(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); mlan_status wlan_rate_ioctl_get_data_rate(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); t_void wlan_host_sleep_activated_event(pmlan_private priv, t_u8 activated); /** Handles the command response of hs_cfg */ mlan_status wlan_ret_802_11_hs_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); /** Sends HS_WAKEUP event to applications */ t_void wlan_host_sleep_wakeup_event(pmlan_private priv); @@ -2139,22 +2140,22 @@ mlan_status wlan_ops_sta_ioctl(t_void * adapter, pmlan_ioctl_req pioctl_req); /** cmd handler for station mode */ mlan_status wlan_ops_sta_prepare_cmd(IN t_void * priv, - IN t_u16 cmd_no, - IN t_u16 cmd_action, - IN t_u32 cmd_oid, - IN t_void * pioctl_buf, - IN t_void * pdata_buf, - IN t_void * pcmd_buf); + IN t_u16 cmd_no, + IN t_u16 cmd_action, + IN t_u32 cmd_oid, + IN t_void * pioctl_buf, + IN t_void * pdata_buf, + IN t_void * pcmd_buf); /** cmdresp handler for station mode */ mlan_status wlan_ops_sta_process_cmdresp(IN t_void * priv, - IN t_u16 cmdresp_no, - IN t_void * pcmd_buf, - IN t_void * pioctl); + IN t_u16 cmdresp_no, + IN t_void * pcmd_buf, + IN t_void * pioctl); /** rx handler for station mode */ mlan_status wlan_ops_sta_process_rx_packet(IN t_void * adapter, - IN pmlan_buffer pmbuf); + IN pmlan_buffer pmbuf); /** event handler for station mode */ mlan_status wlan_ops_sta_process_event(IN t_void * priv); @@ -2170,75 +2171,75 @@ mlan_status wlan_flush_scan_table(IN pmlan_adapter pmadapter); /** Scan for networks */ mlan_status wlan_scan_networks(IN mlan_private * pmpriv, - IN t_void * pioctl_buf, - IN const wlan_user_scan_cfg * puser_scan_in); + IN t_void * pioctl_buf, + IN const wlan_user_scan_cfg * puser_scan_in); /** Scan for specific SSID */ mlan_status wlan_scan_specific_ssid(IN mlan_private * pmpriv, - IN t_void * pioctl_buf, - IN mlan_802_11_ssid * preq_ssid); + IN t_void * pioctl_buf, + IN mlan_802_11_ssid * preq_ssid); /** Scan command handler */ mlan_status wlan_cmd_802_11_scan(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * pcmd, - IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * pcmd, + IN t_void * pdata_buf); /** Queue scan command handler */ t_void wlan_queue_scan_cmd(IN mlan_private * pmpriv, - IN cmd_ctrl_node * pcmd_node); + IN cmd_ctrl_node * pcmd_node); /** Handler for scan command response */ mlan_status wlan_ret_802_11_scan(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN t_void * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN t_void * pioctl_buf); /** Extended scan command handler */ mlan_status wlan_cmd_802_11_scan_ext(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * pcmd, - IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * pcmd, + IN t_void * pdata_buf); /** Handler for extended scan command response */ mlan_status wlan_ret_802_11_scan_ext(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN t_void * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN t_void * pioctl_buf); /** Handler event for extended scan report */ mlan_status wlan_handle_event_ext_scan_report(IN mlan_private * pmpriv, - IN mlan_buffer * pmbuf); + IN mlan_buffer * pmbuf); /** check network compatibility */ t_s32 wlan_is_network_compatible(IN mlan_private * pmpriv, - IN t_u32 index, IN t_u32 mode); + IN t_u32 index, IN t_u32 mode); /** Find an SSID in a list */ t_s32 wlan_find_ssid_in_list(IN pmlan_private pmpriv, - IN mlan_802_11_ssid * ssid, - IN t_u8 * bssid, IN t_u32 mode); + IN mlan_802_11_ssid * ssid, + IN t_u8 * bssid, IN t_u32 mode); /** Find a BSSID in a list */ t_s32 wlan_find_bssid_in_list(IN mlan_private * pmpriv, - IN t_u8 * bssid, IN t_u32 mode); + IN t_u8 * bssid, IN t_u32 mode); /** Find best network */ mlan_status wlan_find_best_network(IN mlan_private * pmpriv, - OUT mlan_ssid_bssid * preq_ssid_bssid); + OUT mlan_ssid_bssid * preq_ssid_bssid); /** Compare two SSIDs */ t_s32 wlan_ssid_cmp(IN pmlan_adapter pmadapter, - IN mlan_802_11_ssid * ssid1, IN mlan_802_11_ssid * ssid2); + IN mlan_802_11_ssid * ssid1, IN mlan_802_11_ssid * ssid2); /** Associate */ mlan_status wlan_associate(IN mlan_private * pmpriv, - IN t_void * pioctl_buf, - IN BSSDescriptor_t * pBSSDesc); + IN t_void * pioctl_buf, + IN BSSDescriptor_t * pBSSDesc); /** Associate command handler */ mlan_status wlan_cmd_802_11_associate(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * cmd, + IN t_void * pdata_buf); /** Handler for association command response */ mlan_status wlan_ret_802_11_associate(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN t_void * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN t_void * pioctl_buf); /** Reset connected state */ t_void wlan_reset_connect_state(IN pmlan_private priv, IN t_u8 drv_disconnect); @@ -2250,61 +2251,61 @@ t_u8 wlan_band_to_radio_type(IN t_u8 band); /** Disconnect */ mlan_status wlan_disconnect(IN mlan_private * pmpriv, - IN mlan_ioctl_req * pioctl_req, - IN mlan_802_11_mac_addr * mac); + IN mlan_ioctl_req * pioctl_req, + IN mlan_802_11_mac_addr * mac); /** Ad-Hoc start */ mlan_status wlan_adhoc_start(IN mlan_private * pmpriv, - IN t_void * pioctl_buf, - IN mlan_802_11_ssid * padhoc_ssid); + IN t_void * pioctl_buf, + IN mlan_802_11_ssid * padhoc_ssid); /** Ad-Hoc join */ mlan_status wlan_adhoc_join(IN mlan_private * pmpriv, - IN t_void * pioctl_buf, - IN BSSDescriptor_t * pBSSDesc); + IN t_void * pioctl_buf, + IN BSSDescriptor_t * pBSSDesc); /** Ad-Hoc start command handler */ mlan_status wlan_cmd_802_11_ad_hoc_start(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * cmd, + IN t_void * pdata_buf); /** Ad-Hoc command handler */ mlan_status wlan_cmd_802_11_ad_hoc_join(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * cmd, + IN t_void * pdata_buf); /** Handler for Ad-Hoc commands */ mlan_status wlan_ret_802_11_ad_hoc(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN t_void * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN t_void * pioctl_buf); /** Handler for bgscan query commands */ mlan_status wlan_cmd_802_11_bg_scan_query(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * pcmd, - IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * pcmd, + IN t_void * pdata_buf); /** Handler for bgscan config command */ mlan_status wlan_cmd_bgscan_config(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * pcmd, - IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * pcmd, + IN t_void * pdata_buf); /** Hander for bgscan config command response */ mlan_status wlan_ret_bgscan_config(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); mlan_status wlan_ret_802_11_bgscan_query(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); /** Get Channel-Frequency-Power by band and channel */ chan_freq_power_t *wlan_get_cfp_by_band_and_channel(pmlan_adapter pmadapter, - t_u8 band, t_u16 channel, - region_chan_t * - region_channel); + t_u8 band, t_u16 channel, + region_chan_t * + region_channel); /** Find Channel-Frequency-Power by band and channel */ chan_freq_power_t *wlan_find_cfp_by_band_and_channel(mlan_adapter * pmadapter, - t_u8 band, t_u16 channel); + t_u8 band, t_u16 channel); /** Find Channel-Frequency-Power by band and frequency */ chan_freq_power_t *wlan_find_cfp_by_band_and_freq(mlan_adapter * pmadapter, - t_u8 band, t_u32 freq); + t_u8 band, t_u32 freq); /** Get Tx power of channel from Channel-Frequency-Power */ t_u8 wlan_get_txpwr_of_chan_from_cfp(mlan_private * pmpriv, t_u8 channel); /** find frequency from band and channel */ @@ -2320,13 +2321,13 @@ t_void wlan_free_curr_bcn(IN mlan_private * pmpriv); /* Rate related functions */ /** Convert index into data rate */ t_u32 wlan_index_to_data_rate(pmlan_adapter pmadapter, t_u8 index, - t_u8 rate_info); + t_u8 rate_info); /** Get active data rates */ t_u32 wlan_get_active_data_rates(mlan_private * pmpriv, t_u32 bss_mode, - t_u8 config_bands, WLAN_802_11_RATES rates); + t_u8 config_bands, WLAN_802_11_RATES rates); /** Get supported data rates */ t_u32 wlan_get_supported_rates(mlan_private * pmpriv, t_u32 bss_mode, - t_u8 config_bands, WLAN_802_11_RATES rates); + t_u8 config_bands, WLAN_802_11_RATES rates); /** Convert data rate to index */ t_u8 wlan_data_rate_to_index(pmlan_adapter pmadapter, t_u32 rate); /** Check if rate is auto */ @@ -2352,7 +2353,7 @@ t_bool wlan_bg_scan_type_is_passive(mlan_private * priv, t_u8 chnl); t_bool wlan_is_chan_blacklisted(mlan_private * priv, t_u8 band, t_u8 chan); /** set blacklist setting for a channel */ t_bool wlan_set_chan_blacklist(mlan_private * priv, t_u8 band, t_u8 chan, - t_bool bl); + t_bool bl); /* 802.11D related functions */ /** Initialize 11D */ @@ -2361,18 +2362,18 @@ t_void wlan_11d_priv_init(mlan_private * pmpriv); t_void wlan_11d_init(mlan_adapter * pmadapter); /** Enable 11D */ mlan_status wlan_11d_enable(mlan_private * pmpriv, t_void * pioctl_buf, - state_11d_t flag); + state_11d_t flag); /** Get if 11D is enabled */ t_bool wlan_11d_is_enabled(mlan_private * pmpriv); /** Get if priv is station */ t_bool wlan_is_station(mlan_private * pmpriv); /** Command handler for 11D country info */ mlan_status wlan_cmd_802_11d_domain_info(mlan_private * pmpriv, - HostCmd_DS_COMMAND * pcmd, - t_u16 cmd_action); + HostCmd_DS_COMMAND * pcmd, + t_u16 cmd_action); /** Handler for 11D country info command response */ mlan_status wlan_ret_802_11d_domain_info(mlan_private * pmpriv, - HostCmd_DS_COMMAND * resp); + HostCmd_DS_COMMAND * resp); #ifdef STA_SUPPORT /** Convert channel to frequency */ t_u32 wlan_11d_chan_2_freq(pmlan_adapter pmadapter, t_u8 chan, t_u8 band); @@ -2384,35 +2385,35 @@ mlan_status wlan_11d_clear_parsedtable(mlan_private * pmpriv); mlan_status wlan_11d_create_dnld_countryinfo(mlan_private * pmpriv, t_u8 band); /** Get scan type from 11D info */ t_u8 wlan_11d_get_scan_type(pmlan_adapter pmadapter, t_u8 band, t_u8 chan, - parsed_region_chan_11d_t * parsed_region_chan); + parsed_region_chan_11d_t * parsed_region_chan); /** Parse 11D country info */ mlan_status wlan_11d_parse_dnld_countryinfo(mlan_private * pmpriv, - BSSDescriptor_t * pBSSDesc); + BSSDescriptor_t * pBSSDesc); /** Prepare 11D domain information for download */ mlan_status wlan_11d_prepare_dnld_domain_info_cmd(mlan_private * pmpriv); /** Parse 11D country information into domain info */ mlan_status wlan_11d_parse_domain_info(pmlan_adapter pmadapter, - IEEEtypes_CountryInfoFullSet_t * - country_info, t_u8 band, - parsed_region_chan_11d_t * - parsed_region_chan); + IEEEtypes_CountryInfoFullSet_t * + country_info, t_u8 band, + parsed_region_chan_11d_t * + parsed_region_chan); /** Configure 11D domain info command */ mlan_status wlan_11d_cfg_domain_info(IN pmlan_adapter pmadapter, - IN mlan_ioctl_req * pioctl_req); + IN mlan_ioctl_req * pioctl_req); #endif /* STA_SUPPORT */ #ifdef UAP_SUPPORT /** Handle 11D domain information from UAP */ mlan_status wlan_11d_handle_uap_domain_info(mlan_private * pmpriv, - t_u8 band, - t_u8 * domain_tlv, - t_void * pioctl_buf); + t_u8 band, + t_u8 * domain_tlv, + t_void * pioctl_buf); #endif /** This function converts region string to CFP table code */ mlan_status wlan_misc_country_2_cfp_table_code(IN pmlan_adapter pmadapter, - IN t_u8 * country_code, - OUT t_u8 * cfp_bg, - OUT t_u8 * cfp_a); + IN t_u8 * country_code, + OUT t_u8 * cfp_bg, + OUT t_u8 * cfp_a); /** check if station list is empty */ t_u8 wlan_is_station_list_empty(mlan_private * priv); @@ -2428,13 +2429,13 @@ sta_node *wlan_add_station_entry(mlan_private * priv, t_u8 * mac); /** find specific ie */ t_u8 *wlan_get_specific_ie(pmlan_private priv, t_u8 * ie_buf, t_u8 ie_len, - IEEEtypes_ElementId_e id); + IEEEtypes_ElementId_e id); t_u8 wlan_is_wmm_ie_present(pmlan_adapter pmadapter, t_u8 * pbuf, - t_u16 buf_len); + t_u16 buf_len); /** * @brief This function checks tx_pause flag for peer - * + * * @param priv A pointer to mlan_private * @param ra Address of the receiver STA * @@ -2443,19 +2444,19 @@ t_u8 wlan_is_wmm_ie_present(pmlan_adapter pmadapter, t_u8 * pbuf, static int INLINE wlan_is_tx_pause(mlan_private * priv, t_u8 * ra) { - sta_node *sta_ptr = MNULL; - if ((sta_ptr = wlan_get_station_entry(priv, ra))) { - return sta_ptr->tx_pause; - } - return MFALSE; + sta_node *sta_ptr = MNULL; + if ((sta_ptr = wlan_get_station_entry(priv, ra))) { + return sta_ptr->tx_pause; + } + return MFALSE; } t_void wlan_update_ralist_tx_pause(pmlan_private priv, t_u8 * mac, - t_u8 tx_pause); + t_u8 tx_pause); #ifdef UAP_SUPPORT mlan_status wlan_process_uap_rx_packet(IN mlan_private * priv, - IN pmlan_buffer pmbuf); + IN pmlan_buffer pmbuf); t_void wlan_drop_tx_pkts(pmlan_private priv); #endif /* UAP_SUPPORT */ @@ -2465,73 +2466,73 @@ mlan_status wlan_uap_recv_packet(IN mlan_private * priv, IN pmlan_buffer pmbuf); #endif /* UAP_SUPPORT */ mlan_status wlan_misc_ioctl_custom_ie_list(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req, - IN t_bool send_ioctl); + IN pmlan_ioctl_req pioctl_req, + IN t_bool send_ioctl); mlan_status wlan_cmd_get_hw_spec(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * pcmd); + IN HostCmd_DS_COMMAND * pcmd); mlan_status wlan_ret_get_hw_spec(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN t_void * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN t_void * pioctl_buf); mlan_status wlan_misc_ioctl_mac_control(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); mlan_status wlan_cmd_mac_control(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * pcmd, - IN t_u16 cmd_action, IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * pcmd, + IN t_u16 cmd_action, IN t_void * pdata_buf); mlan_status wlan_ret_mac_control(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); mlan_status wlan_cmd_802_11_radio_control(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, - IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, + IN t_void * pdata_buf); mlan_status wlan_ret_802_11_radio_control(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); mlan_status wlan_cmd_802_11_rf_antenna(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, - IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, + IN t_void * pdata_buf); mlan_status wlan_ret_802_11_rf_antenna(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); mlan_status wlan_ret_reg_access(mlan_adapter * pmadapter, - t_u16 type, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + t_u16 type, + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); mlan_status wlan_ret_mem_access(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf); mlan_status wlan_reg_mem_ioctl_reg_rw(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); mlan_status wlan_reg_mem_ioctl_read_eeprom(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); mlan_status wlan_reg_mem_ioctl_mem_rw(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); mlan_status wlan_cmd_reg_access(IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf); + IN t_u16 cmd_action, IN t_void * pdata_buf); mlan_status wlan_cmd_mem_access(IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf); + IN t_u16 cmd_action, IN t_void * pdata_buf); mlan_status wlan_get_info_ver_ext(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); mlan_status wlan_reg_rx_mgmt_ind(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); #ifdef DEBUG_LEVEL1 mlan_status wlan_set_drvdbg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); #endif #ifdef STA_SUPPORT mlan_status wlan_misc_ext_capa_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); t_u32 wlan_is_ext_capa_support(IN mlan_private * pmpriv); #endif @@ -2541,14 +2542,14 @@ void wlan_add_ext_capa_info_ie(IN mlan_private * pmpriv, OUT t_u8 ** pptlv_out); #endif mlan_status wlan_misc_otp_user_data(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); mlan_status wlan_misc_ioctl_txcontrol(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); -/** +/** * @brief RA based queueing - * + * * @param priv A pointer to mlan_private structure * * @return MTRUE or MFALSE @@ -2556,20 +2557,20 @@ mlan_status wlan_misc_ioctl_txcontrol(IN pmlan_adapter pmadapter, static INLINE t_u8 queuing_ra_based(pmlan_private priv) { - /* - * Currently we assume if we are in Infra, then DA=RA. This might not be - * true in the future - */ - if ((priv->bss_mode == MLAN_BSS_MODE_INFRA) && - (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA)) - return MFALSE; - - return MTRUE; + /* + * Currently we assume if we are in Infra, then DA=RA. This might not be + * true in the future + */ + if ((priv->bss_mode == MLAN_BSS_MODE_INFRA) && + (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA)) + return MFALSE; + + return MTRUE; } -/** +/** * @brief Copy Rates - * + * * @param dest A pointer to Dest Buf * @param pos The position for copy * @param src A pointer to Src Buf @@ -2580,20 +2581,20 @@ queuing_ra_based(pmlan_private priv) static INLINE t_u32 wlan_copy_rates(t_u8 * dest, t_u32 pos, t_u8 * src, int len) { - int i; + int i; - for (i = 0; i < len && src[i]; i++, pos++) { - if (pos >= sizeof(WLAN_802_11_RATES)) - break; - dest[pos] = src[i]; - } + for (i = 0; i < len && src[i]; i++, pos++) { + if (pos >= sizeof(WLAN_802_11_RATES)) + break; + dest[pos] = src[i]; + } - return pos; + return pos; } -/** +/** * @brief strlen - * + * * @param str A pointer to string * * @return Length of string @@ -2601,11 +2602,11 @@ wlan_copy_rates(t_u8 * dest, t_u32 pos, t_u8 * src, int len) static INLINE t_u32 wlan_strlen(const char *str) { - t_u32 i; + t_u32 i; - for (i = 0; str[i] != 0; i++) { - } - return i; + for (i = 0; str[i] != 0; i++) { + } + return i; } /** @@ -2618,8 +2619,8 @@ wlan_strlen(const char *str) static INLINE t_u32 wlan_isxdigit(t_u8 chr) { - return ((chr <= 'f' && chr >= 'a') || (chr <= 'F' && chr >= 'A') || - (chr <= '9' && chr >= '0')); + return ((chr <= 'f' && chr >= 'a') || (chr <= 'F' && chr >= 'A') || + (chr <= '9' && chr >= '0')); } /** @@ -2632,15 +2633,15 @@ wlan_isxdigit(t_u8 chr) static INLINE t_u32 wlan_isspace(t_u8 chr) { - return (chr <= ' ' && (chr == ' ' || (chr <= 13 && chr >= 9))); + return (chr <= ' ' && (chr == ' ' || (chr <= 13 && chr >= 9))); } /** delay unit */ typedef enum _delay_unit { - USEC, - MSEC, - SEC, + USEC, + MSEC, + SEC, } t_delay_unit; /** delay function */ @@ -2661,9 +2662,9 @@ t_void wlan_delay_func(mlan_adapter * pmadapter, t_u32 delay, t_delay_unit u); /** Get BSS number from priv */ #define GET_BSS_NUM(priv) (priv)->bss_num -/** +/** * @brief This function returns priv based on the BSS num and BSS type - * + * * @param pmadapter A pointer to mlan_adapter * @param bss_num BSS number * @param bss_type BSS type @@ -2673,22 +2674,22 @@ t_void wlan_delay_func(mlan_adapter * pmadapter, t_u32 delay, t_delay_unit u); static INLINE mlan_private * wlan_get_priv_by_id(mlan_adapter * pmadapter, t_u32 bss_num, t_u32 bss_type) { - int i; - - for (i = 0; i < MIN(pmadapter->priv_num, MLAN_MAX_BSS_NUM); i++) { - if (pmadapter->priv[i]) { - if ((pmadapter->priv[i]->bss_num == bss_num) && - (pmadapter->priv[i]->bss_type == bss_type)) - return (pmadapter->priv[i]); - } - } - return MNULL; + int i; + + for (i = 0; i < MIN(pmadapter->priv_num, MLAN_MAX_BSS_NUM); i++) { + if (pmadapter->priv[i]) { + if ((pmadapter->priv[i]->bss_num == bss_num) && + (pmadapter->priv[i]->bss_type == bss_type)) + return (pmadapter->priv[i]); + } + } + return MNULL; } -/** +/** * @brief This function returns first available priv * based on the BSS role - * + * * @param pmadapter A pointer to mlan_adapter * @param bss_role BSS role or MLAN_BSS_ROLE_ANY * @@ -2697,23 +2698,23 @@ wlan_get_priv_by_id(mlan_adapter * pmadapter, t_u32 bss_num, t_u32 bss_type) static INLINE mlan_private * wlan_get_priv(mlan_adapter * pmadapter, mlan_bss_role bss_role) { - int i; - - for (i = 0; i < MIN(pmadapter->priv_num, MLAN_MAX_BSS_NUM); i++) { - if (pmadapter->priv[i]) { - if (bss_role == MLAN_BSS_ROLE_ANY || - GET_BSS_ROLE(pmadapter->priv[i]) == bss_role) - return (pmadapter->priv[i]); - } - } - return MNULL; + int i; + + for (i = 0; i < MIN(pmadapter->priv_num, MLAN_MAX_BSS_NUM); i++) { + if (pmadapter->priv[i]) { + if (bss_role == MLAN_BSS_ROLE_ANY || + GET_BSS_ROLE(pmadapter->priv[i]) == bss_role) + return (pmadapter->priv[i]); + } + } + return MNULL; } /** * @brief This function counts the number of occurences for a certain * condition among privs. Which privs are checked can be configured * via a second condition. - * + * * @param pmadapter A pointer to mlan_adapter * @param count_cond Function pointer to condition to count on privs * @param check_cond Function pointer to condition to decide whether priv @@ -2723,32 +2724,33 @@ wlan_get_priv(mlan_adapter * pmadapter, mlan_bss_role bss_role) */ static int INLINE wlan_count_priv_cond(mlan_adapter * pmadapter, - t_bool(*count_cond) (IN pmlan_private pmpriv), - t_bool(*check_cond) (IN pmlan_private pmpriv)) + t_bool(*count_cond) (IN pmlan_private pmpriv), + t_bool(*check_cond) (IN pmlan_private pmpriv)) { - pmlan_private pmpriv; - int count = 0; - int i; - - if (pmadapter == MNULL || count_cond == MNULL) - return 0; - - for (i = 0; i < pmadapter->priv_num; i++) { - if ((pmpriv = pmadapter->priv[i])) { - if ((check_cond == MNULL) || (check_cond && check_cond(pmpriv))) { - if (count_cond(pmpriv)) - count++; - } - } - } - - return count; + pmlan_private pmpriv; + int count = 0; + int i; + + if (pmadapter == MNULL || count_cond == MNULL) + return 0; + + for (i = 0; i < pmadapter->priv_num; i++) { + if ((pmpriv = pmadapter->priv[i])) { + if ((check_cond == MNULL) || + (check_cond && check_cond(pmpriv))) { + if (count_cond(pmpriv)) + count++; + } + } + } + + return count; } /** * @brief This function runs a procedure on each priv. * Which privs it is run on can be configured via a condition. - * + * * @param pmadapter A pointer to mlan_adapter * @param operation Function pointer to produedure to operate on priv * @param check_cond Function pointer to condition to decide whether priv @@ -2758,26 +2760,27 @@ wlan_count_priv_cond(mlan_adapter * pmadapter, */ static int INLINE wlan_do_task_on_privs(mlan_adapter * pmadapter, - t_void(*operation) (IN pmlan_private pmpriv), - t_bool(*check_cond) (IN pmlan_private pmpriv)) + t_void(*operation) (IN pmlan_private pmpriv), + t_bool(*check_cond) (IN pmlan_private pmpriv)) { - pmlan_private pmpriv; - int count = 0; - int i; - - if (pmadapter == MNULL || operation == MNULL) - return 0; - - for (i = 0; i < pmadapter->priv_num; i++) { - if ((pmpriv = pmadapter->priv[i])) { - if ((check_cond == MNULL) || (check_cond && check_cond(pmpriv))) { - operation(pmpriv); - count++; - } - } - } - - return count; + pmlan_private pmpriv; + int count = 0; + int i; + + if (pmadapter == MNULL || operation == MNULL) + return 0; + + for (i = 0; i < pmadapter->priv_num; i++) { + if ((pmpriv = pmadapter->priv[i])) { + if ((check_cond == MNULL) || + (check_cond && check_cond(pmpriv))) { + operation(pmpriv); + count++; + } + } + } + + return count; } /** @@ -2798,25 +2801,25 @@ wlan_do_task_on_privs(mlan_adapter * pmadapter, */ static int INLINE wlan_get_privs_by_cond(mlan_adapter * pmadapter, - t_bool(*check_cond) (IN pmlan_private pmpriv), - mlan_private ** ppriv_list) + t_bool(*check_cond) (IN pmlan_private pmpriv), + mlan_private ** ppriv_list) { - pmlan_private pmpriv; - int count = 0; - int i; - - if (pmadapter == MNULL || check_cond == MNULL || ppriv_list == MNULL) - return 0; - - for (i = 0; i < pmadapter->priv_num; i++) { - if ((pmpriv = pmadapter->priv[i])) { - if (check_cond(pmpriv)) { - ppriv_list[count++] = pmpriv; - } - } - } - - return count; + pmlan_private pmpriv; + int count = 0; + int i; + + if (pmadapter == MNULL || check_cond == MNULL || ppriv_list == MNULL) + return 0; + + for (i = 0; i < pmadapter->priv_num; i++) { + if ((pmpriv = pmadapter->priv[i])) { + if (check_cond(pmpriv)) { + ppriv_list[count++] = pmpriv; + } + } + } + + return count; } /** @@ -2841,33 +2844,33 @@ wlan_get_privs_by_cond(mlan_adapter * pmadapter, */ static int INLINE wlan_get_privs_by_two_cond(mlan_adapter * pmadapter, - t_bool(*check_cond) (IN pmlan_private pmpriv), - t_bool(*check_cond_2) (IN pmlan_private pmpriv), - t_bool and_conditions, mlan_private ** ppriv_list) + t_bool(*check_cond) (IN pmlan_private pmpriv), + t_bool(*check_cond_2) (IN pmlan_private pmpriv), + t_bool and_conditions, mlan_private ** ppriv_list) { - pmlan_private pmpriv; - int count = 0; - int i; - - if (pmadapter == MNULL || check_cond == MNULL || - check_cond_2 == MNULL || ppriv_list == MNULL) - return 0; - - for (i = 0; i < pmadapter->priv_num; i++) { - if ((pmpriv = pmadapter->priv[i])) { - if (and_conditions) { - if (check_cond(pmpriv) && check_cond_2(pmpriv)) { - ppriv_list[count++] = pmpriv; - } - } else { - if (check_cond(pmpriv) || check_cond_2(pmpriv)) { - ppriv_list[count++] = pmpriv; - } - } - } - } - - return count; + pmlan_private pmpriv; + int count = 0; + int i; + + if (pmadapter == MNULL || check_cond == MNULL || + check_cond_2 == MNULL || ppriv_list == MNULL) + return 0; + + for (i = 0; i < pmadapter->priv_num; i++) { + if ((pmpriv = pmadapter->priv[i])) { + if (and_conditions) { + if (check_cond(pmpriv) && check_cond_2(pmpriv)) { + ppriv_list[count++] = pmpriv; + } + } else { + if (check_cond(pmpriv) || check_cond_2(pmpriv)) { + ppriv_list[count++] = pmpriv; + } + } + } + } + + return count; } #endif /* !_MLAN_MAIN_H_ */ diff --git a/drivers/net/wireless/sd8897/mlan/mlan_meas.c b/drivers/net/wireless/sd8897/mlan/mlan_meas.c index 19c4131c7bc1..723ed43c0762 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_meas.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_meas.c @@ -4,14 +4,14 @@ * @brief Implementation of measurement interface code with the app/firmware * * Driver implementation for sending and retrieving measurement requests - * and responses. - * + * and responses. + * * Current use is limited to 802.11h. * * Requires use of the following preprocessor define: * - ENABLE_MEAS * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -20,7 +20,7 @@ * is available by writing to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * + * * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE * ARE EXPRESSLY DISCLAIMED. The License provides additional details about @@ -41,33 +41,33 @@ Change Log: #include "mlan_meas.h" /** Default measurement duration when not provided by the application */ -#define WLAN_MEAS_DEFAULT_MEAS_DURATION 1000U /* TUs */ +#define WLAN_MEAS_DEFAULT_MEAS_DURATION 1000U /* TUs */ #ifdef DEBUG_LEVEL2 /** String descriptions of the different measurement enums. Debug display */ static const char *meas_type_str[WLAN_MEAS_NUM_TYPES] = { - "basic", + "basic", }; /******************************************************** Local Functions ********************************************************/ -/** +/** * @brief Retrieve the measurement string representation of a meas_type enum * Used for debug display only * * @param meas_type Measurement type enumeration input for string lookup - * + * * @return Constant string representing measurement type */ static const char * wlan_meas_get_meas_type_str(MeasType_t meas_type) { - if (meas_type <= WLAN_MEAS_11H_MAX_TYPE) - return meas_type_str[meas_type]; + if (meas_type <= WLAN_MEAS_11H_MAX_TYPE) + return meas_type_str[meas_type]; - return "Invld"; + return "Invld"; } #endif @@ -81,42 +81,44 @@ wlan_meas_get_meas_type_str(MeasType_t meas_type) static void wlan_meas_dump_meas_req(const HostCmd_DS_MEASUREMENT_REQUEST * pmeas_req) { - ENTER(); + ENTER(); - PRINTM(MINFO, "Meas: Req: ------------------------------\n"); + PRINTM(MINFO, "Meas: Req: ------------------------------\n"); - PRINTM(MINFO, "Meas: Req: mac_addr: " MACSTR "\n", - MAC2STR(pmeas_req->mac_addr)); + PRINTM(MINFO, "Meas: Req: mac_addr: " MACSTR "\n", + MAC2STR(pmeas_req->mac_addr)); - PRINTM(MINFO, "Meas: Req: dlgTkn: %d\n", pmeas_req->dialog_token); - PRINTM(MINFO, "Meas: Req: mode: dm[%c] rpt[%c] req[%c]\n", - pmeas_req->req_mode.duration_mandatory ? 'X' : ' ', - pmeas_req->req_mode.report ? 'X' : ' ', - pmeas_req->req_mode.request ? 'X' : ' '); - PRINTM(MINFO, "Meas: Req: : en[%c] par[%c]\n", - pmeas_req->req_mode.enable ? 'X' : ' ', - pmeas_req->req_mode.parallel ? 'X' : ' '); + PRINTM(MINFO, "Meas: Req: dlgTkn: %d\n", pmeas_req->dialog_token); + PRINTM(MINFO, "Meas: Req: mode: dm[%c] rpt[%c] req[%c]\n", + pmeas_req->req_mode.duration_mandatory ? 'X' : ' ', + pmeas_req->req_mode.report ? 'X' : ' ', + pmeas_req->req_mode.request ? 'X' : ' '); + PRINTM(MINFO, "Meas: Req: : en[%c] par[%c]\n", + pmeas_req->req_mode.enable ? 'X' : ' ', + pmeas_req->req_mode.parallel ? 'X' : ' '); #ifdef DEBUG_LEVEL2 - PRINTM(MINFO, "Meas: Req: measTyp: %s\n", - wlan_meas_get_meas_type_str(pmeas_req->meas_type)); + PRINTM(MINFO, "Meas: Req: measTyp: %s\n", + wlan_meas_get_meas_type_str(pmeas_req->meas_type)); #endif - switch (pmeas_req->meas_type) { - case WLAN_MEAS_BASIC: - /* Lazy cheat, fields of bas, cca, rpi union match on the request */ - PRINTM(MINFO, "Meas: Req: chan: %u\n", pmeas_req->req.basic.channel); - PRINTM(MINFO, "Meas: Req: strt: %llu\n", - wlan_le64_to_cpu(pmeas_req->req.basic.start_time)); - PRINTM(MINFO, "Meas: Req: dur: %u\n", - wlan_le16_to_cpu(pmeas_req->req.basic.duration)); - break; - default: - PRINTM(MINFO, "Meas: Req: <unhandled>\n"); - break; - } - - PRINTM(MINFO, "Meas: Req: ------------------------------\n"); - LEAVE(); + switch (pmeas_req->meas_type) { + case WLAN_MEAS_BASIC: + /* Lazy cheat, fields of bas, cca, rpi union match on the + request */ + PRINTM(MINFO, "Meas: Req: chan: %u\n", + pmeas_req->req.basic.channel); + PRINTM(MINFO, "Meas: Req: strt: %llu\n", + wlan_le64_to_cpu(pmeas_req->req.basic.start_time)); + PRINTM(MINFO, "Meas: Req: dur: %u\n", + wlan_le16_to_cpu(pmeas_req->req.basic.duration)); + break; + default: + PRINTM(MINFO, "Meas: Req: <unhandled>\n"); + break; + } + + PRINTM(MINFO, "Meas: Req: ------------------------------\n"); + LEAVE(); } /** @@ -129,113 +131,117 @@ wlan_meas_dump_meas_req(const HostCmd_DS_MEASUREMENT_REQUEST * pmeas_req) static void wlan_meas_dump_meas_rpt(const HostCmd_DS_MEASUREMENT_REPORT * pmeas_rpt) { - ENTER(); + ENTER(); - PRINTM(MINFO, "Meas: Rpt: ------------------------------\n"); - PRINTM(MINFO, "Meas: Rpt: mac_addr: " MACSTR "\n", - MAC2STR(pmeas_rpt->mac_addr)); + PRINTM(MINFO, "Meas: Rpt: ------------------------------\n"); + PRINTM(MINFO, "Meas: Rpt: mac_addr: " MACSTR "\n", + MAC2STR(pmeas_rpt->mac_addr)); - PRINTM(MINFO, "Meas: Rpt: dlgTkn: %d\n", pmeas_rpt->dialog_token); + PRINTM(MINFO, "Meas: Rpt: dlgTkn: %d\n", pmeas_rpt->dialog_token); - PRINTM(MINFO, "Meas: Rpt: rptMode: (%x): Rfs[%c] ICp[%c] Lt[%c]\n", - *(t_u8 *) & pmeas_rpt->rpt_mode, - pmeas_rpt->rpt_mode.refused ? 'X' : ' ', - pmeas_rpt->rpt_mode.incapable ? 'X' : ' ', - pmeas_rpt->rpt_mode.late ? 'X' : ' '); + PRINTM(MINFO, "Meas: Rpt: rptMode: (%x): Rfs[%c] ICp[%c] Lt[%c]\n", + *(t_u8 *) & pmeas_rpt->rpt_mode, + pmeas_rpt->rpt_mode.refused ? 'X' : ' ', + pmeas_rpt->rpt_mode.incapable ? 'X' : ' ', + pmeas_rpt->rpt_mode.late ? 'X' : ' '); #ifdef DEBUG_LEVEL2 - PRINTM(MINFO, "Meas: Rpt: measTyp: %s\n", - wlan_meas_get_meas_type_str(pmeas_rpt->meas_type)); + PRINTM(MINFO, "Meas: Rpt: measTyp: %s\n", + wlan_meas_get_meas_type_str(pmeas_rpt->meas_type)); #endif - switch (pmeas_rpt->meas_type) { - case WLAN_MEAS_BASIC: - PRINTM(MINFO, "Meas: Rpt: chan: %u\n", pmeas_rpt->rpt.basic.channel); - PRINTM(MINFO, "Meas: Rpt: strt: %llu\n", - wlan_le64_to_cpu(pmeas_rpt->rpt.basic.start_time)); - PRINTM(MINFO, "Meas: Rpt: dur: %u\n", - wlan_le16_to_cpu(pmeas_rpt->rpt.basic.duration)); - PRINTM(MINFO, "Meas: Rpt: bas: (%x): unmsd[%c], radar[%c]\n", - *(t_u8 *) & (pmeas_rpt->rpt.basic.map), - pmeas_rpt->rpt.basic.map.unmeasured ? 'X' : ' ', - pmeas_rpt->rpt.basic.map.radar ? 'X' : ' '); - PRINTM(MINFO, "Meas: Rpt: bas: unidSig[%c] ofdm[%c] bss[%c]\n", - pmeas_rpt->rpt.basic.map.unidentified_sig ? 'X' : ' ', - pmeas_rpt->rpt.basic.map.ofdm_preamble ? 'X' : ' ', - pmeas_rpt->rpt.basic.map.bss ? 'X' : ' '); - break; - default: - PRINTM(MINFO, "Meas: Rpt: <unhandled>\n"); - break; - } - - PRINTM(MINFO, "Meas: Rpt: ------------------------------\n"); - LEAVE(); + switch (pmeas_rpt->meas_type) { + case WLAN_MEAS_BASIC: + PRINTM(MINFO, "Meas: Rpt: chan: %u\n", + pmeas_rpt->rpt.basic.channel); + PRINTM(MINFO, "Meas: Rpt: strt: %llu\n", + wlan_le64_to_cpu(pmeas_rpt->rpt.basic.start_time)); + PRINTM(MINFO, "Meas: Rpt: dur: %u\n", + wlan_le16_to_cpu(pmeas_rpt->rpt.basic.duration)); + PRINTM(MINFO, "Meas: Rpt: bas: (%x): unmsd[%c], radar[%c]\n", + *(t_u8 *) & (pmeas_rpt->rpt.basic.map), + pmeas_rpt->rpt.basic.map.unmeasured ? 'X' : ' ', + pmeas_rpt->rpt.basic.map.radar ? 'X' : ' '); + PRINTM(MINFO, "Meas: Rpt: bas: unidSig[%c] ofdm[%c] bss[%c]\n", + pmeas_rpt->rpt.basic.map.unidentified_sig ? 'X' : ' ', + pmeas_rpt->rpt.basic.map.ofdm_preamble ? 'X' : ' ', + pmeas_rpt->rpt.basic.map.bss ? 'X' : ' '); + break; + default: + PRINTM(MINFO, "Meas: Rpt: <unhandled>\n"); + break; + } + + PRINTM(MINFO, "Meas: Rpt: ------------------------------\n"); + LEAVE(); } /** * @brief Retrieve a measurement report from the firmware - * + * * Callback from command processing when a measurement report is received * from the firmware. Perform the following when a report is received: * * -# Debug displays the report if compiled with the appropriate flags - * -# If we are pending on a specific measurement report token, and it + * -# If we are pending on a specific measurement report token, and it * matches the received report's token, store the report and wake up * any pending threads * * @param pmpriv Private driver information structure * @param resp HostCmd_DS_COMMAND struct returned from the firmware command - * passing a HostCmd_DS_MEASUREMENT_REPORT structure. + * passing a HostCmd_DS_MEASUREMENT_REPORT structure. * * @return MLAN_STATUS_SUCCESS */ static int wlan_meas_cmdresp_get_report(mlan_private * pmpriv, - const HostCmd_DS_COMMAND * resp) + const HostCmd_DS_COMMAND * resp) { - mlan_adapter *pmadapter = pmpriv->adapter; - const HostCmd_DS_MEASUREMENT_REPORT *pmeas_rpt = &resp->params.meas_rpt; + mlan_adapter *pmadapter = pmpriv->adapter; + const HostCmd_DS_MEASUREMENT_REPORT *pmeas_rpt = &resp->params.meas_rpt; - ENTER(); + ENTER(); - PRINTM(MINFO, "Meas: Rpt: %#x-%u, Seq=%u, Ret=%u\n", - resp->command, resp->size, resp->seq_num, resp->result); + PRINTM(MINFO, "Meas: Rpt: %#x-%u, Seq=%u, Ret=%u\n", + resp->command, resp->size, resp->seq_num, resp->result); - /* Debug displays the measurement report */ - wlan_meas_dump_meas_rpt(pmeas_rpt); + /* Debug displays the measurement report */ + wlan_meas_dump_meas_rpt(pmeas_rpt); - /* - * Check if we are pending on a measurement report and it matches - * the dialog token of the received report: - */ - if (pmadapter->state_meas.meas_rpt_pend_on - && pmadapter->state_meas.meas_rpt_pend_on == pmeas_rpt->dialog_token) { - PRINTM(MINFO, "Meas: Rpt: RCV'd Pend on meas #%d\n", - pmadapter->state_meas.meas_rpt_pend_on); + /* + * Check if we are pending on a measurement report and it matches + * the dialog token of the received report: + */ + if (pmadapter->state_meas.meas_rpt_pend_on + && pmadapter->state_meas.meas_rpt_pend_on == + pmeas_rpt->dialog_token) { + PRINTM(MINFO, "Meas: Rpt: RCV'd Pend on meas #%d\n", + pmadapter->state_meas.meas_rpt_pend_on); - /* Clear the pending report indicator */ - pmadapter->state_meas.meas_rpt_pend_on = 0; + /* Clear the pending report indicator */ + pmadapter->state_meas.meas_rpt_pend_on = 0; - /* Copy the received report into the measurement state for retrieval */ - memcpy(pmadapter, &pmadapter->state_meas.meas_rpt_returned, pmeas_rpt, - sizeof(pmadapter->state_meas.meas_rpt_returned)); + /* Copy the received report into the measurement state for + retrieval */ + memcpy(pmadapter, &pmadapter->state_meas.meas_rpt_returned, + pmeas_rpt, + sizeof(pmadapter->state_meas.meas_rpt_returned)); - /* - * Wake up any threads pending on the wait queue - */ - wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_MEAS_REPORT, MNULL); - } + /* + * Wake up any threads pending on the wait queue + */ + wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_MEAS_REPORT, MNULL); + } - LEAVE(); + LEAVE(); - return MLAN_STATUS_SUCCESS; + return MLAN_STATUS_SUCCESS; } /** * @brief Prepare CMD_MEASURMENT_REPORT firmware command * * @param pmpriv Private driver information structure - * @param pcmd_ptr Output parameter: Pointer to the command being prepared + * @param pcmd_ptr Output parameter: Pointer to the command being prepared * for the firmware * @param pinfo_buf HostCmd_DS_MEASUREMENT_REQUEST passed as void data block * @@ -243,40 +249,40 @@ wlan_meas_cmdresp_get_report(mlan_private * pmpriv, */ static int wlan_meas_cmd_request(mlan_private * pmpriv, - HostCmd_DS_COMMAND * pcmd_ptr, const void *pinfo_buf) + HostCmd_DS_COMMAND * pcmd_ptr, const void *pinfo_buf) { - const HostCmd_DS_MEASUREMENT_REQUEST *pmeas_req = - (HostCmd_DS_MEASUREMENT_REQUEST *) pinfo_buf; + const HostCmd_DS_MEASUREMENT_REQUEST *pmeas_req = + (HostCmd_DS_MEASUREMENT_REQUEST *) pinfo_buf; - ENTER(); + ENTER(); - pcmd_ptr->command = HostCmd_CMD_MEASUREMENT_REQUEST; - pcmd_ptr->size = sizeof(HostCmd_DS_MEASUREMENT_REQUEST) + S_DS_GEN; + pcmd_ptr->command = HostCmd_CMD_MEASUREMENT_REQUEST; + pcmd_ptr->size = sizeof(HostCmd_DS_MEASUREMENT_REQUEST) + S_DS_GEN; - memcpy(pmpriv->adapter, &pcmd_ptr->params.meas_req, pmeas_req, - sizeof(pcmd_ptr->params.meas_req)); + memcpy(pmpriv->adapter, &pcmd_ptr->params.meas_req, pmeas_req, + sizeof(pcmd_ptr->params.meas_req)); - PRINTM(MINFO, "Meas: Req: %#x-%u, Seq=%u, Ret=%u\n", - pcmd_ptr->command, pcmd_ptr->size, pcmd_ptr->seq_num, - pcmd_ptr->result); + PRINTM(MINFO, "Meas: Req: %#x-%u, Seq=%u, Ret=%u\n", + pcmd_ptr->command, pcmd_ptr->size, pcmd_ptr->seq_num, + pcmd_ptr->result); - wlan_meas_dump_meas_req(pmeas_req); + wlan_meas_dump_meas_req(pmeas_req); - LEAVE(); + LEAVE(); - return MLAN_STATUS_SUCCESS; + return MLAN_STATUS_SUCCESS; } /** * @brief Retrieve a measurement report from the firmware * - * The firmware will send a EVENT_MEAS_REPORT_RDY event when it + * The firmware will send a EVENT_MEAS_REPORT_RDY event when it * completes or receives a measurement report. The event response * handler will then start a HostCmd_CMD_MEASUREMENT_REPORT firmware command * which gets completed for transmission to the firmware in this routine. * * @param pmpriv Private driver information structure - * @param pcmd_ptr Output parameter: Pointer to the command being prepared + * @param pcmd_ptr Output parameter: Pointer to the command being prepared * for the firmware * * @return MLAN_STATUS_SUCCESS @@ -284,41 +290,41 @@ wlan_meas_cmd_request(mlan_private * pmpriv, static int wlan_meas_cmd_get_report(mlan_private * pmpriv, HostCmd_DS_COMMAND * pcmd_ptr) { - ENTER(); + ENTER(); - pcmd_ptr->command = HostCmd_CMD_MEASUREMENT_REPORT; - pcmd_ptr->size = sizeof(HostCmd_DS_MEASUREMENT_REPORT) + S_DS_GEN; + pcmd_ptr->command = HostCmd_CMD_MEASUREMENT_REPORT; + pcmd_ptr->size = sizeof(HostCmd_DS_MEASUREMENT_REPORT) + S_DS_GEN; - memset(pmpriv->adapter, &pcmd_ptr->params.meas_rpt, 0x00, - sizeof(pcmd_ptr->params.meas_rpt)); + memset(pmpriv->adapter, &pcmd_ptr->params.meas_rpt, 0x00, + sizeof(pcmd_ptr->params.meas_rpt)); - /* - * Set the meas_rpt.mac_addr to our mac address to get a meas report, - * setting the mac to another STA address instructs the firmware - * to transmit this measurement report frame instead - */ - memcpy(pmpriv->adapter, pcmd_ptr->params.meas_rpt.mac_addr, - pmpriv->curr_addr, sizeof(pcmd_ptr->params.meas_rpt.mac_addr)); + /* + * Set the meas_rpt.mac_addr to our mac address to get a meas report, + * setting the mac to another STA address instructs the firmware + * to transmit this measurement report frame instead + */ + memcpy(pmpriv->adapter, pcmd_ptr->params.meas_rpt.mac_addr, + pmpriv->curr_addr, sizeof(pcmd_ptr->params.meas_rpt.mac_addr)); - LEAVE(); + LEAVE(); - return MLAN_STATUS_SUCCESS; + return MLAN_STATUS_SUCCESS; } /******************************************************** Global functions ********************************************************/ -/** +/** * @brief Send the input measurement request to the firmware. * * If the dialog token in the measurement request is set to 0, the function * will use an local static auto-incremented token in the measurement * request. This ensures the dialog token is always set. * - * If wait_for_resp_timeout is set, the function will block its return on + * If wait_for_resp_timeout is set, the function will block its return on * a timeout or returned measurement report that matches the requests - * dialog token. + * dialog token. * * @param pmpriv Private driver information structure * @param pmeas_req Pointer to the measurement request to send @@ -336,43 +342,43 @@ wlan_meas_cmd_get_report(mlan_private * pmpriv, HostCmd_DS_COMMAND * pcmd_ptr) */ int wlan_meas_util_send_req(mlan_private * pmpriv, - HostCmd_DS_MEASUREMENT_REQUEST * pmeas_req, - t_u32 wait_for_resp_timeout, pmlan_ioctl_req pioctl_req, - HostCmd_DS_MEASUREMENT_REPORT * pmeas_rpt) + HostCmd_DS_MEASUREMENT_REQUEST * pmeas_req, + t_u32 wait_for_resp_timeout, pmlan_ioctl_req pioctl_req, + HostCmd_DS_MEASUREMENT_REPORT * pmeas_rpt) { - static t_u8 auto_dialog_tok = 0; - wlan_meas_state_t *pmeas_state = &pmpriv->adapter->state_meas; - int ret; - - ENTER(); - - /* If dialogTok was set to 0 or not provided, autoset */ - pmeas_req->dialog_token = (pmeas_req->dialog_token ? - pmeas_req->dialog_token : ++auto_dialog_tok); - - /* Check for rollover of the dialog token. Avoid using 0 as a token */ - pmeas_req->dialog_token = (pmeas_req->dialog_token ? - pmeas_req->dialog_token : 1); - - /* - * If the request is to pend waiting for the result, set the dialog token - * of this measurement request in the state structure. The measurement - * report handling routines can then check the incoming measurement - * reports for a match with this dialog token. - */ - if (wait_for_resp_timeout) { - pmeas_state->meas_rpt_pend_on = pmeas_req->dialog_token; - PRINTM(MINFO, "Meas: Req: START Pend on meas #%d\n", - pmeas_req->dialog_token); - } - - /* Send the measurement request to the firmware */ - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_MEASUREMENT_REQUEST, - HostCmd_ACT_GEN_SET, - 0, (t_void *) pioctl_req, (void *) pmeas_req); - - LEAVE(); - return ret; + static t_u8 auto_dialog_tok = 0; + wlan_meas_state_t *pmeas_state = &pmpriv->adapter->state_meas; + int ret; + + ENTER(); + + /* If dialogTok was set to 0 or not provided, autoset */ + pmeas_req->dialog_token = (pmeas_req->dialog_token ? + pmeas_req->dialog_token : ++auto_dialog_tok); + + /* Check for rollover of the dialog token. Avoid using 0 as a token */ + pmeas_req->dialog_token = (pmeas_req->dialog_token ? + pmeas_req->dialog_token : 1); + + /* + * If the request is to pend waiting for the result, set the dialog token + * of this measurement request in the state structure. The measurement + * report handling routines can then check the incoming measurement + * reports for a match with this dialog token. + */ + if (wait_for_resp_timeout) { + pmeas_state->meas_rpt_pend_on = pmeas_req->dialog_token; + PRINTM(MINFO, "Meas: Req: START Pend on meas #%d\n", + pmeas_req->dialog_token); + } + + /* Send the measurement request to the firmware */ + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_MEASUREMENT_REQUEST, + HostCmd_ACT_GEN_SET, + 0, (t_void *) pioctl_req, (void *)pmeas_req); + + LEAVE(); + return ret; } /** @@ -385,7 +391,7 @@ wlan_meas_util_send_req(mlan_private * pmpriv, * - HostCmd_CMD_MEASUREMENT_REPORT * * @param pmpriv Private driver information structure - * @param pcmd_ptr Output parameter: Pointer to the command being prepared + * @param pcmd_ptr Output parameter: Pointer to the command being prepared * for the firmware * @param pinfo_buf Void buffer passthrough with data necessary for a * specific command type @@ -395,30 +401,30 @@ wlan_meas_util_send_req(mlan_private * pmpriv, */ int wlan_meas_cmd_process(mlan_private * pmpriv, - HostCmd_DS_COMMAND * pcmd_ptr, const void *pinfo_buf) + HostCmd_DS_COMMAND * pcmd_ptr, const void *pinfo_buf) { - int ret = MLAN_STATUS_SUCCESS; - - ENTER(); - switch (pcmd_ptr->command) { - case HostCmd_CMD_MEASUREMENT_REQUEST: - ret = wlan_meas_cmd_request(pmpriv, pcmd_ptr, pinfo_buf); - break; - case HostCmd_CMD_MEASUREMENT_REPORT: - ret = wlan_meas_cmd_get_report(pmpriv, pcmd_ptr); - break; - default: - ret = MLAN_STATUS_FAILURE; - } - - pcmd_ptr->command = wlan_cpu_to_le16(pcmd_ptr->command); - pcmd_ptr->size = wlan_cpu_to_le16(pcmd_ptr->size); - LEAVE(); - return ret; + int ret = MLAN_STATUS_SUCCESS; + + ENTER(); + switch (pcmd_ptr->command) { + case HostCmd_CMD_MEASUREMENT_REQUEST: + ret = wlan_meas_cmd_request(pmpriv, pcmd_ptr, pinfo_buf); + break; + case HostCmd_CMD_MEASUREMENT_REPORT: + ret = wlan_meas_cmd_get_report(pmpriv, pcmd_ptr); + break; + default: + ret = MLAN_STATUS_FAILURE; + } + + pcmd_ptr->command = wlan_cpu_to_le16(pcmd_ptr->command); + pcmd_ptr->size = wlan_cpu_to_le16(pcmd_ptr->size); + LEAVE(); + return ret; } /** - * @brief Handle the command response from the firmware for a measurement + * @brief Handle the command response from the firmware for a measurement * command * * Use the Command field to determine if the command response being @@ -434,23 +440,23 @@ wlan_meas_cmd_process(mlan_private * pmpriv, */ int wlan_meas_cmdresp_process(mlan_private * pmpriv, - const HostCmd_DS_COMMAND * resp) + const HostCmd_DS_COMMAND * resp) { - int ret = MLAN_STATUS_SUCCESS; - - ENTER(); - switch (resp->command) { - case HostCmd_CMD_MEASUREMENT_REQUEST: - PRINTM(MINFO, "Meas: Req Resp: Sz=%u, Seq=%u, Ret=%u\n", - resp->size, resp->seq_num, resp->result); - break; - case HostCmd_CMD_MEASUREMENT_REPORT: - ret = wlan_meas_cmdresp_get_report(pmpriv, resp); - break; - default: - ret = MLAN_STATUS_FAILURE; - } - - LEAVE(); - return ret; + int ret = MLAN_STATUS_SUCCESS; + + ENTER(); + switch (resp->command) { + case HostCmd_CMD_MEASUREMENT_REQUEST: + PRINTM(MINFO, "Meas: Req Resp: Sz=%u, Seq=%u, Ret=%u\n", + resp->size, resp->seq_num, resp->result); + break; + case HostCmd_CMD_MEASUREMENT_REPORT: + ret = wlan_meas_cmdresp_get_report(pmpriv, resp); + break; + default: + ret = MLAN_STATUS_FAILURE; + } + + LEAVE(); + return ret; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_meas.h b/drivers/net/wireless/sd8897/mlan/mlan_meas.h index 0eb51d3a3bb2..bd28808d5be2 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_meas.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_meas.h @@ -5,11 +5,11 @@ * * Driver interface functions and type declarations for the measurement module * implemented in mlan_meas.c - * + * * @sa mlan_meas.c * - * Copyright (C) 2008-2011, Marvell International Ltd. - * + * Copyright (C) 2008-2011, Marvell International Ltd. + * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 * (the "License"). You may use, redistribute and/or modify this File in @@ -17,7 +17,7 @@ * is available by writing to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * + * * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE * ARE EXPRESSLY DISCLAIMED. The License provides additional details about @@ -38,17 +38,17 @@ Change Log: /* Send a given measurement request to the firmware, report back the result */ extern int wlan_meas_util_send_req(mlan_private * pmpriv, - HostCmd_DS_MEASUREMENT_REQUEST * pmeas_req, - t_u32 wait_for_resp_timeout, pmlan_ioctl_req pioctl_req, - HostCmd_DS_MEASUREMENT_REPORT * pmeas_rpt); + HostCmd_DS_MEASUREMENT_REQUEST * pmeas_req, + t_u32 wait_for_resp_timeout, pmlan_ioctl_req pioctl_req, + HostCmd_DS_MEASUREMENT_REPORT * pmeas_rpt); /* Setup a measurement command before it is sent to the firmware */ extern int wlan_meas_cmd_process(mlan_private * pmpriv, - HostCmd_DS_COMMAND * pcmd_ptr, - const t_void * pinfo_buf); + HostCmd_DS_COMMAND * pcmd_ptr, + const t_void * pinfo_buf); /* Handle a given measurement command response from the firmware */ extern int wlan_meas_cmdresp_process(mlan_private * pmpriv, - const HostCmd_DS_COMMAND * resp); + const HostCmd_DS_COMMAND * resp); #endif /* _MLAN_MEAS_H_ */ diff --git a/drivers/net/wireless/sd8897/mlan/mlan_misc.c b/drivers/net/wireless/sd8897/mlan/mlan_misc.c index af2631506107..d31ff5298cd7 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_misc.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_misc.c @@ -3,7 +3,7 @@ * * @brief This file include miscellaneous functions for MLAN module * - * Copyright (C) 2009-2011, Marvell International Ltd. + * Copyright (C) 2009-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -12,7 +12,7 @@ * is available by writing to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * + * * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE * ARE EXPRESSLY DISCLAIMED. The License provides additional details about @@ -69,31 +69,31 @@ extern t_u8 ac_to_tid[4][2]; * @param pmpriv A pointer to mlan_private structure * @param idx index to check for in use * - * @return MLAN_STATUS_SUCCESS --unused, otherwise used. + * @return MLAN_STATUS_SUCCESS --unused, otherwise used. */ static mlan_status wlan_is_custom_ie_index_unused(IN pmlan_private pmpriv, IN t_u16 idx) { - t_u8 i = 0; - pmlan_adapter pmadapter = pmpriv->adapter; - pmlan_private priv; - ENTER(); - - for (i = 0; i < pmadapter->priv_num; i++) { - priv = pmadapter->priv[i]; - /* Check for other interfaces only */ - if (priv && priv->bss_index != pmpriv->bss_index) { - - if (priv->mgmt_ie[idx].mgmt_subtype_mask && - priv->mgmt_ie[idx].ie_length) { - /* used entry found */ - LEAVE(); - return MLAN_STATUS_FAILURE; - } - } - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + t_u8 i = 0; + pmlan_adapter pmadapter = pmpriv->adapter; + pmlan_private priv; + ENTER(); + + for (i = 0; i < pmadapter->priv_num; i++) { + priv = pmadapter->priv[i]; + /* Check for other interfaces only */ + if (priv && priv->bss_index != pmpriv->bss_index) { + + if (priv->mgmt_ie[idx].mgmt_subtype_mask && + priv->mgmt_ie[idx].ie_length) { + /* used entry found */ + LEAVE(); + return MLAN_STATUS_FAILURE; + } + } + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -109,77 +109,84 @@ wlan_is_custom_ie_index_unused(IN pmlan_private pmpriv, IN t_u16 idx) */ static mlan_status wlan_custom_ioctl_get_autoidx(IN pmlan_private pmpriv, - IN pmlan_ioctl_req pioctl_req, - IN t_u16 mask, - IN custom_ie * ie_data, OUT t_u16 * idx) + IN pmlan_ioctl_req pioctl_req, + IN t_u16 mask, + IN custom_ie * ie_data, OUT t_u16 * idx) { - t_u16 index = 0, insert = MFALSE; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - /* Determine the index where the IE needs to be inserted */ - while (!insert) { - while (index < pmpriv->adapter->max_mgmt_ie_index) { - if (pmpriv->mgmt_ie[index].mgmt_subtype_mask == - MLAN_CUSTOM_IE_AUTO_IDX_MASK) { - index++; - continue; - } - if (pmpriv->mgmt_ie[index].mgmt_subtype_mask == mask) { - /* Duplicate IE should be avoided */ - if (pmpriv->mgmt_ie[index].ie_length) { - if (!memcmp - (pmpriv->adapter, pmpriv->mgmt_ie[index].ie_buffer, - ie_data->ie_buffer, - pmpriv->mgmt_ie[index].ie_length)) { - PRINTM(MINFO, - "IE with the same mask exists at index %d mask=0x%x\n", - index, mask); - *idx = MLAN_CUSTOM_IE_AUTO_IDX_MASK; - goto done; - } - } - /* Check if enough space is available */ - if (pmpriv->mgmt_ie[index].ie_length + ie_data->ie_length > - MAX_IE_SIZE) { - index++; - continue; - } - insert = MTRUE; - break; - } - index++; - } - if (!insert) { - for (index = 0; index < pmpriv->adapter->max_mgmt_ie_index; index++) { - if (pmpriv->mgmt_ie[index].ie_length == 0) { - /* - * Check if this index is in use by other interface - * If yes, move ahead to next index - */ - if (MLAN_STATUS_SUCCESS == - wlan_is_custom_ie_index_unused(pmpriv, index)) { - insert = MTRUE; - break; - } else { - PRINTM(MINFO, "Skipping IE index %d in use.\n", index); - } - } - } - } - if (index == pmpriv->adapter->max_mgmt_ie_index && !insert) { - PRINTM(MERROR, "Failed to Set the IE buffer\n"); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; - ret = MLAN_STATUS_FAILURE; - goto done; - } - } - - *idx = index; - done: - LEAVE(); - return ret; + t_u16 index = 0, insert = MFALSE; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + /* Determine the index where the IE needs to be inserted */ + while (!insert) { + while (index < pmpriv->adapter->max_mgmt_ie_index) { + if (pmpriv->mgmt_ie[index].mgmt_subtype_mask == + MLAN_CUSTOM_IE_AUTO_IDX_MASK) { + index++; + continue; + } + if (pmpriv->mgmt_ie[index].mgmt_subtype_mask == mask) { + /* Duplicate IE should be avoided */ + if (pmpriv->mgmt_ie[index].ie_length) { + if (!memcmp + (pmpriv->adapter, + pmpriv->mgmt_ie[index].ie_buffer, + ie_data->ie_buffer, + pmpriv->mgmt_ie[index]. + ie_length)) { + PRINTM(MINFO, + "IE with the same mask exists at index %d mask=0x%x\n", + index, mask); + *idx = MLAN_CUSTOM_IE_AUTO_IDX_MASK; + goto done; + } + } + /* Check if enough space is available */ + if (pmpriv->mgmt_ie[index].ie_length + + ie_data->ie_length > MAX_IE_SIZE) { + index++; + continue; + } + insert = MTRUE; + break; + } + index++; + } + if (!insert) { + for (index = 0; + index < pmpriv->adapter->max_mgmt_ie_index; + index++) { + if (pmpriv->mgmt_ie[index].ie_length == 0) { + /* + * Check if this index is in use by other interface + * If yes, move ahead to next index + */ + if (MLAN_STATUS_SUCCESS == + wlan_is_custom_ie_index_unused + (pmpriv, index)) { + insert = MTRUE; + break; + } else { + PRINTM(MINFO, + "Skipping IE index %d in use.\n", + index); + } + } + } + } + if (index == pmpriv->adapter->max_mgmt_ie_index && !insert) { + PRINTM(MERROR, "Failed to Set the IE buffer\n"); + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; + ret = MLAN_STATUS_FAILURE; + goto done; + } + } + + *idx = index; +done: + LEAVE(); + return ret; } /** @@ -195,76 +202,84 @@ wlan_custom_ioctl_get_autoidx(IN pmlan_private pmpriv, static mlan_status wlan_custom_ioctl_auto_delete(IN pmlan_private pmpriv, - IN pmlan_ioctl_req pioctl_req, - IN custom_ie * ie_data, IN t_u16 idx) + IN pmlan_ioctl_req pioctl_req, + IN custom_ie * ie_data, IN t_u16 idx) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_adapter pmadapter = pmpriv->adapter; - t_u16 index = 0, insert = MFALSE, del_len; - t_u8 del_ie[MAX_IE_SIZE], ie[MAX_IE_SIZE]; - t_s32 cnt, tmp_len = 0; - t_u8 *tmp_ie; - - ENTER(); - memset(pmpriv->adapter, del_ie, 0, MAX_IE_SIZE); - memcpy(pmpriv->adapter, del_ie, ie_data->ie_buffer, - MIN(MAX_IE_SIZE, ie_data->ie_length)); - del_len = MIN(MAX_IE_SIZE, ie_data->ie_length); - - if (MLAN_CUSTOM_IE_AUTO_IDX_MASK == idx) - ie_data->ie_index = 0; - - for (index = 0; index < pmadapter->max_mgmt_ie_index; index++) { - if (MLAN_CUSTOM_IE_AUTO_IDX_MASK != idx) - index = idx; - tmp_ie = pmpriv->mgmt_ie[index].ie_buffer; - tmp_len = pmpriv->mgmt_ie[index].ie_length; - cnt = 0; - while (tmp_len) { - if (!memcmp(pmpriv->adapter, tmp_ie, del_ie, del_len)) { - memcpy(pmpriv->adapter, ie, pmpriv->mgmt_ie[index].ie_buffer, - cnt); - if (pmpriv->mgmt_ie[index].ie_length > (cnt + del_len)) - memcpy(pmpriv->adapter, &ie[cnt], - &pmpriv->mgmt_ie[index].ie_buffer[cnt + del_len], - (pmpriv->mgmt_ie[index].ie_length - - (cnt + del_len))); - memset(pmpriv->adapter, &pmpriv->mgmt_ie[index].ie_buffer, 0, - sizeof(pmpriv->mgmt_ie[index].ie_buffer)); - memcpy(pmpriv->adapter, &pmpriv->mgmt_ie[index].ie_buffer, ie, - pmpriv->mgmt_ie[index].ie_length - del_len); - pmpriv->mgmt_ie[index].ie_length -= del_len; - if (MLAN_CUSTOM_IE_AUTO_IDX_MASK == idx) - /* set a bit to indicate caller about update */ - ie_data->ie_index |= (((t_u16) 1) << index); - insert = MTRUE; - tmp_ie = pmpriv->mgmt_ie[index].ie_buffer; - tmp_len = pmpriv->mgmt_ie[index].ie_length; - cnt = 0; - continue; - } - tmp_ie++; - tmp_len--; - cnt++; - } - if (MLAN_CUSTOM_IE_AUTO_IDX_MASK != idx) - break; - } - if (index == pmadapter->max_mgmt_ie_index && !insert) { - PRINTM(MERROR, "Failed to Clear IE buffer\n"); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; - ret = MLAN_STATUS_FAILURE; - } - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_adapter pmadapter = pmpriv->adapter; + t_u16 index = 0, insert = MFALSE, del_len; + t_u8 del_ie[MAX_IE_SIZE], ie[MAX_IE_SIZE]; + t_s32 cnt, tmp_len = 0; + t_u8 *tmp_ie; + + ENTER(); + memset(pmpriv->adapter, del_ie, 0, MAX_IE_SIZE); + memcpy(pmpriv->adapter, del_ie, ie_data->ie_buffer, + MIN(MAX_IE_SIZE, ie_data->ie_length)); + del_len = MIN(MAX_IE_SIZE, ie_data->ie_length); + + if (MLAN_CUSTOM_IE_AUTO_IDX_MASK == idx) + ie_data->ie_index = 0; + + for (index = 0; index < pmadapter->max_mgmt_ie_index; index++) { + if (MLAN_CUSTOM_IE_AUTO_IDX_MASK != idx) + index = idx; + tmp_ie = pmpriv->mgmt_ie[index].ie_buffer; + tmp_len = pmpriv->mgmt_ie[index].ie_length; + cnt = 0; + while (tmp_len) { + if (!memcmp(pmpriv->adapter, tmp_ie, del_ie, del_len)) { + memcpy(pmpriv->adapter, ie, + pmpriv->mgmt_ie[index].ie_buffer, cnt); + if (pmpriv->mgmt_ie[index].ie_length > + (cnt + del_len)) + memcpy(pmpriv->adapter, &ie[cnt], + &pmpriv->mgmt_ie[index]. + ie_buffer[cnt + del_len], + (pmpriv->mgmt_ie[index]. + ie_length - (cnt + del_len))); + memset(pmpriv->adapter, + &pmpriv->mgmt_ie[index].ie_buffer, 0, + sizeof(pmpriv->mgmt_ie[index]. + ie_buffer)); + memcpy(pmpriv->adapter, + &pmpriv->mgmt_ie[index].ie_buffer, ie, + pmpriv->mgmt_ie[index].ie_length - + del_len); + pmpriv->mgmt_ie[index].ie_length -= del_len; + if (MLAN_CUSTOM_IE_AUTO_IDX_MASK == idx) + /* set a bit to indicate caller about + update */ + ie_data->ie_index |= + (((t_u16) 1) << index); + insert = MTRUE; + tmp_ie = pmpriv->mgmt_ie[index].ie_buffer; + tmp_len = pmpriv->mgmt_ie[index].ie_length; + cnt = 0; + continue; + } + tmp_ie++; + tmp_len--; + cnt++; + } + if (MLAN_CUSTOM_IE_AUTO_IDX_MASK != idx) + break; + } + if (index == pmadapter->max_mgmt_ie_index && !insert) { + PRINTM(MERROR, "Failed to Clear IE buffer\n"); + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; + ret = MLAN_STATUS_FAILURE; + } + LEAVE(); + return ret; } /******************************************************** Global Functions ********************************************************/ -/** +/** * @brief send host cmd * * @param pmadapter A pointer to mlan_adapter structure @@ -274,28 +289,28 @@ wlan_custom_ioctl_auto_delete(IN pmlan_private pmpriv, */ mlan_status wlan_misc_ioctl_host_cmd(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_misc_cfg *misc = MNULL; - - ENTER(); - - misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - 0, - 0, - 0, - (t_void *) pioctl_req, - (t_void *) & misc->param.hostcmd); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_misc_cfg *misc = MNULL; + + ENTER(); + + misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + 0, + 0, + 0, + (t_void *) pioctl_req, + (t_void *) & misc->param.hostcmd); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } /** @@ -308,42 +323,42 @@ wlan_misc_ioctl_host_cmd(IN pmlan_adapter pmadapter, */ mlan_status wlan_misc_ioctl_init_shutdown(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_misc_cfg *misc_cfg = MNULL; - t_u16 cmd; - - ENTER(); - - misc_cfg = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - if (misc_cfg->param.func_init_shutdown == MLAN_FUNC_INIT) - cmd = HostCmd_CMD_FUNC_INIT; - else if (misc_cfg->param.func_init_shutdown == MLAN_FUNC_SHUTDOWN) - cmd = HostCmd_CMD_FUNC_SHUTDOWN; - else { - PRINTM(MERROR, "Unsupported parameter\n"); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - - /* Send command to firmware */ - ret = wlan_prepare_cmd(pmpriv, - cmd, - HostCmd_ACT_GEN_SET, - 0, (t_void *) pioctl_req, MNULL); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - exit: - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_misc_cfg *misc_cfg = MNULL; + t_u16 cmd; + + ENTER(); + + misc_cfg = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + if (misc_cfg->param.func_init_shutdown == MLAN_FUNC_INIT) + cmd = HostCmd_CMD_FUNC_INIT; + else if (misc_cfg->param.func_init_shutdown == MLAN_FUNC_SHUTDOWN) + cmd = HostCmd_CMD_FUNC_SHUTDOWN; + else { + PRINTM(MERROR, "Unsupported parameter\n"); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + + /* Send command to firmware */ + ret = wlan_prepare_cmd(pmpriv, + cmd, + HostCmd_ACT_GEN_SET, + 0, (t_void *) pioctl_req, MNULL); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +exit: + LEAVE(); + return ret; } -/** +/** * @brief Get debug information * * @param pmadapter A pointer to mlan_adapter structure @@ -353,202 +368,246 @@ wlan_misc_ioctl_init_shutdown(IN pmlan_adapter pmadapter, */ mlan_status wlan_get_info_debug_info(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_get_info *info; - t_u8 *ptid; - - ENTER(); - - info = (mlan_ds_get_info *) pioctl_req->pbuf; - - if (pioctl_req->action == MLAN_ACT_SET) { - pmadapter->max_tx_buf_size = - (t_u16) info->param.debug_info.max_tx_buf_size; - pmadapter->tx_buf_size = (t_u16) info->param.debug_info.tx_buf_size; - pmadapter->curr_tx_buf_size = - (t_u16) info->param.debug_info.curr_tx_buf_size; - pmadapter->ps_mode = info->param.debug_info.ps_mode; - pmadapter->ps_state = info->param.debug_info.ps_state; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_get_info *info; + t_u8 *ptid; + + ENTER(); + + info = (mlan_ds_get_info *) pioctl_req->pbuf; + + if (pioctl_req->action == MLAN_ACT_SET) { + pmadapter->max_tx_buf_size = + (t_u16) info->param.debug_info.max_tx_buf_size; + pmadapter->tx_buf_size = + (t_u16) info->param.debug_info.tx_buf_size; + pmadapter->curr_tx_buf_size = + (t_u16) info->param.debug_info.curr_tx_buf_size; + pmadapter->ps_mode = info->param.debug_info.ps_mode; + pmadapter->ps_state = info->param.debug_info.ps_state; #ifdef STA_SUPPORT - pmadapter->is_deep_sleep = info->param.debug_info.is_deep_sleep; + pmadapter->is_deep_sleep = info->param.debug_info.is_deep_sleep; #endif /* STA_SUPPORT */ - pmadapter->pm_wakeup_card_req = - info->param.debug_info.pm_wakeup_card_req; - pmadapter->pm_wakeup_fw_try = info->param.debug_info.pm_wakeup_fw_try; - pmadapter->is_hs_configured = info->param.debug_info.is_hs_configured; - pmadapter->hs_activated = info->param.debug_info.hs_activated; - pmadapter->pps_uapsd_mode = info->param.debug_info.pps_uapsd_mode; - pmadapter->sleep_period.period = info->param.debug_info.sleep_pd; - pmpriv->wmm_qosinfo = info->param.debug_info.qos_cfg; - pmadapter->tx_lock_flag = info->param.debug_info.tx_lock_flag; - pmpriv->port_open = info->param.debug_info.port_open; - pmadapter->bypass_pkt_count = info->param.debug_info.bypass_pkt_count; - pmadapter->scan_processing = info->param.debug_info.scan_processing; - pmadapter->dbg.num_cmd_host_to_card_failure = - info->param.debug_info.num_cmd_host_to_card_failure; - pmadapter->dbg.num_cmd_sleep_cfm_host_to_card_failure = - info->param.debug_info.num_cmd_sleep_cfm_host_to_card_failure; - pmadapter->dbg.num_tx_host_to_card_failure = - info->param.debug_info.num_tx_host_to_card_failure; - pmadapter->dbg.num_cmdevt_card_to_host_failure = - info->param.debug_info.num_cmdevt_card_to_host_failure; - pmadapter->dbg.num_rx_card_to_host_failure = - info->param.debug_info.num_rx_card_to_host_failure; - pmadapter->dbg.num_int_read_failure = - info->param.debug_info.num_int_read_failure; - pmadapter->dbg.last_int_status = info->param.debug_info.last_int_status; - pmadapter->dbg.num_event_deauth = - info->param.debug_info.num_event_deauth; - pmadapter->dbg.num_event_disassoc = - info->param.debug_info.num_event_disassoc; - pmadapter->dbg.num_event_link_lost = - info->param.debug_info.num_event_link_lost; - pmadapter->dbg.num_cmd_deauth = info->param.debug_info.num_cmd_deauth; - pmadapter->dbg.num_cmd_assoc_success = - info->param.debug_info.num_cmd_assoc_success; - pmadapter->dbg.num_cmd_assoc_failure = - info->param.debug_info.num_cmd_assoc_failure; - pmadapter->dbg.num_tx_timeout = info->param.debug_info.num_tx_timeout; - pmadapter->dbg.num_cmd_timeout = info->param.debug_info.num_cmd_timeout; - pmadapter->dbg.timeout_cmd_id = info->param.debug_info.timeout_cmd_id; - pmadapter->dbg.timeout_cmd_act = info->param.debug_info.timeout_cmd_act; - memcpy(pmadapter, pmadapter->dbg.last_cmd_id, - info->param.debug_info.last_cmd_id, - sizeof(pmadapter->dbg.last_cmd_id)); - memcpy(pmadapter, pmadapter->dbg.last_cmd_act, - info->param.debug_info.last_cmd_act, - sizeof(pmadapter->dbg.last_cmd_act)); - pmadapter->dbg.last_cmd_index = info->param.debug_info.last_cmd_index; - memcpy(pmadapter, pmadapter->dbg.last_cmd_resp_id, - info->param.debug_info.last_cmd_resp_id, - sizeof(pmadapter->dbg.last_cmd_resp_id)); - pmadapter->dbg.last_cmd_resp_index = - info->param.debug_info.last_cmd_resp_index; - memcpy(pmadapter, pmadapter->dbg.last_event, - info->param.debug_info.last_event, - sizeof(pmadapter->dbg.last_event)); - pmadapter->dbg.last_event_index = - info->param.debug_info.last_event_index; - pmadapter->dbg.num_no_cmd_node = info->param.debug_info.num_no_cmd_node; - - pmadapter->data_sent = info->param.debug_info.data_sent; - pmadapter->cmd_sent = info->param.debug_info.cmd_sent; - pmadapter->mp_rd_bitmap = info->param.debug_info.mp_rd_bitmap; - pmadapter->mp_wr_bitmap = info->param.debug_info.mp_wr_bitmap; - pmadapter->curr_rd_port = info->param.debug_info.curr_rd_port; - pmadapter->curr_wr_port = info->param.debug_info.curr_wr_port; - pmadapter->cmd_resp_received = info->param.debug_info.cmd_resp_received; + pmadapter->pm_wakeup_card_req = + info->param.debug_info.pm_wakeup_card_req; + pmadapter->pm_wakeup_fw_try = + info->param.debug_info.pm_wakeup_fw_try; + pmadapter->is_hs_configured = + info->param.debug_info.is_hs_configured; + pmadapter->hs_activated = info->param.debug_info.hs_activated; + pmadapter->pps_uapsd_mode = + info->param.debug_info.pps_uapsd_mode; + pmadapter->sleep_period.period = + info->param.debug_info.sleep_pd; + pmpriv->wmm_qosinfo = info->param.debug_info.qos_cfg; + pmadapter->tx_lock_flag = info->param.debug_info.tx_lock_flag; + pmpriv->port_open = info->param.debug_info.port_open; + pmadapter->bypass_pkt_count = + info->param.debug_info.bypass_pkt_count; + pmadapter->scan_processing = + info->param.debug_info.scan_processing; + pmadapter->dbg.num_cmd_host_to_card_failure = + info->param.debug_info.num_cmd_host_to_card_failure; + pmadapter->dbg.num_cmd_sleep_cfm_host_to_card_failure = + info->param.debug_info. + num_cmd_sleep_cfm_host_to_card_failure; + pmadapter->dbg.num_tx_host_to_card_failure = + info->param.debug_info.num_tx_host_to_card_failure; + pmadapter->dbg.num_cmdevt_card_to_host_failure = + info->param.debug_info.num_cmdevt_card_to_host_failure; + pmadapter->dbg.num_rx_card_to_host_failure = + info->param.debug_info.num_rx_card_to_host_failure; + pmadapter->dbg.num_int_read_failure = + info->param.debug_info.num_int_read_failure; + pmadapter->dbg.last_int_status = + info->param.debug_info.last_int_status; + pmadapter->dbg.num_event_deauth = + info->param.debug_info.num_event_deauth; + pmadapter->dbg.num_event_disassoc = + info->param.debug_info.num_event_disassoc; + pmadapter->dbg.num_event_link_lost = + info->param.debug_info.num_event_link_lost; + pmadapter->dbg.num_cmd_deauth = + info->param.debug_info.num_cmd_deauth; + pmadapter->dbg.num_cmd_assoc_success = + info->param.debug_info.num_cmd_assoc_success; + pmadapter->dbg.num_cmd_assoc_failure = + info->param.debug_info.num_cmd_assoc_failure; + pmadapter->dbg.num_tx_timeout = + info->param.debug_info.num_tx_timeout; + pmadapter->dbg.num_cmd_timeout = + info->param.debug_info.num_cmd_timeout; + pmadapter->dbg.timeout_cmd_id = + info->param.debug_info.timeout_cmd_id; + pmadapter->dbg.timeout_cmd_act = + info->param.debug_info.timeout_cmd_act; + memcpy(pmadapter, pmadapter->dbg.last_cmd_id, + info->param.debug_info.last_cmd_id, + sizeof(pmadapter->dbg.last_cmd_id)); + memcpy(pmadapter, pmadapter->dbg.last_cmd_act, + info->param.debug_info.last_cmd_act, + sizeof(pmadapter->dbg.last_cmd_act)); + pmadapter->dbg.last_cmd_index = + info->param.debug_info.last_cmd_index; + memcpy(pmadapter, pmadapter->dbg.last_cmd_resp_id, + info->param.debug_info.last_cmd_resp_id, + sizeof(pmadapter->dbg.last_cmd_resp_id)); + pmadapter->dbg.last_cmd_resp_index = + info->param.debug_info.last_cmd_resp_index; + memcpy(pmadapter, pmadapter->dbg.last_event, + info->param.debug_info.last_event, + sizeof(pmadapter->dbg.last_event)); + pmadapter->dbg.last_event_index = + info->param.debug_info.last_event_index; + pmadapter->dbg.num_no_cmd_node = + info->param.debug_info.num_no_cmd_node; + + pmadapter->data_sent = info->param.debug_info.data_sent; + pmadapter->cmd_sent = info->param.debug_info.cmd_sent; + pmadapter->mp_rd_bitmap = info->param.debug_info.mp_rd_bitmap; + pmadapter->mp_wr_bitmap = info->param.debug_info.mp_wr_bitmap; + pmadapter->curr_rd_port = info->param.debug_info.curr_rd_port; + pmadapter->curr_wr_port = info->param.debug_info.curr_wr_port; + pmadapter->cmd_resp_received = + info->param.debug_info.cmd_resp_received; #ifdef UAP_SUPPORT - pmadapter->pending_bridge_pkts = info->param.debug_info.num_bridge_pkts; - pmpriv->num_drop_pkts = info->param.debug_info.num_drop_pkts; + pmadapter->pending_bridge_pkts = + info->param.debug_info.num_bridge_pkts; + pmpriv->num_drop_pkts = info->param.debug_info.num_drop_pkts; #endif - } else { /* MLAN_ACT_GET */ - ptid = ac_to_tid[WMM_AC_BK]; - info->param.debug_info.wmm_ac_bk = - pmpriv->wmm.packets_out[ptid[0]] + pmpriv->wmm.packets_out[ptid[1]]; - ptid = ac_to_tid[WMM_AC_BE]; - info->param.debug_info.wmm_ac_be = - pmpriv->wmm.packets_out[ptid[0]] + pmpriv->wmm.packets_out[ptid[1]]; - ptid = ac_to_tid[WMM_AC_VI]; - info->param.debug_info.wmm_ac_vi = - pmpriv->wmm.packets_out[ptid[0]] + pmpriv->wmm.packets_out[ptid[1]]; - ptid = ac_to_tid[WMM_AC_VO]; - info->param.debug_info.wmm_ac_vo = - pmpriv->wmm.packets_out[ptid[0]] + pmpriv->wmm.packets_out[ptid[1]]; - info->param.debug_info.max_tx_buf_size = - (t_u32) pmadapter->max_tx_buf_size; - info->param.debug_info.tx_buf_size = (t_u32) pmadapter->tx_buf_size; - info->param.debug_info.curr_tx_buf_size = - (t_u32) pmadapter->curr_tx_buf_size; - info->param.debug_info.rx_tbl_num = - wlan_get_rxreorder_tbl(pmpriv, info->param.debug_info.rx_tbl); - info->param.debug_info.tx_tbl_num = - wlan_get_txbastream_tbl(pmpriv, info->param.debug_info.tx_tbl); - info->param.debug_info.ps_mode = pmadapter->ps_mode; - info->param.debug_info.ps_state = pmadapter->ps_state; + } else { /* MLAN_ACT_GET */ + ptid = ac_to_tid[WMM_AC_BK]; + info->param.debug_info.wmm_ac_bk = + pmpriv->wmm.packets_out[ptid[0]] + + pmpriv->wmm.packets_out[ptid[1]]; + ptid = ac_to_tid[WMM_AC_BE]; + info->param.debug_info.wmm_ac_be = + pmpriv->wmm.packets_out[ptid[0]] + + pmpriv->wmm.packets_out[ptid[1]]; + ptid = ac_to_tid[WMM_AC_VI]; + info->param.debug_info.wmm_ac_vi = + pmpriv->wmm.packets_out[ptid[0]] + + pmpriv->wmm.packets_out[ptid[1]]; + ptid = ac_to_tid[WMM_AC_VO]; + info->param.debug_info.wmm_ac_vo = + pmpriv->wmm.packets_out[ptid[0]] + + pmpriv->wmm.packets_out[ptid[1]]; + info->param.debug_info.max_tx_buf_size = + (t_u32) pmadapter->max_tx_buf_size; + info->param.debug_info.tx_buf_size = + (t_u32) pmadapter->tx_buf_size; + info->param.debug_info.curr_tx_buf_size = + (t_u32) pmadapter->curr_tx_buf_size; + info->param.debug_info.rx_tbl_num = + wlan_get_rxreorder_tbl(pmpriv, + info->param.debug_info.rx_tbl); + info->param.debug_info.tx_tbl_num = + wlan_get_txbastream_tbl(pmpriv, + info->param.debug_info.tx_tbl); + info->param.debug_info.ps_mode = pmadapter->ps_mode; + info->param.debug_info.ps_state = pmadapter->ps_state; #ifdef STA_SUPPORT - info->param.debug_info.is_deep_sleep = pmadapter->is_deep_sleep; + info->param.debug_info.is_deep_sleep = pmadapter->is_deep_sleep; #endif /* STA_SUPPORT */ - info->param.debug_info.pm_wakeup_card_req = - pmadapter->pm_wakeup_card_req; - info->param.debug_info.pm_wakeup_fw_try = pmadapter->pm_wakeup_fw_try; - info->param.debug_info.is_hs_configured = pmadapter->is_hs_configured; - info->param.debug_info.hs_activated = pmadapter->hs_activated; - info->param.debug_info.pps_uapsd_mode = pmadapter->pps_uapsd_mode; - info->param.debug_info.sleep_pd = pmadapter->sleep_period.period; - info->param.debug_info.qos_cfg = pmpriv->wmm_qosinfo; - info->param.debug_info.tx_lock_flag = pmadapter->tx_lock_flag; - info->param.debug_info.port_open = pmpriv->port_open; - info->param.debug_info.bypass_pkt_count = pmadapter->bypass_pkt_count; - info->param.debug_info.scan_processing = pmadapter->scan_processing; - info->param.debug_info.num_cmd_host_to_card_failure - = pmadapter->dbg.num_cmd_host_to_card_failure; - info->param.debug_info.num_cmd_sleep_cfm_host_to_card_failure - = pmadapter->dbg.num_cmd_sleep_cfm_host_to_card_failure; - info->param.debug_info.num_tx_host_to_card_failure - = pmadapter->dbg.num_tx_host_to_card_failure; - info->param.debug_info.num_cmdevt_card_to_host_failure - = pmadapter->dbg.num_cmdevt_card_to_host_failure; - info->param.debug_info.num_rx_card_to_host_failure - = pmadapter->dbg.num_rx_card_to_host_failure; - info->param.debug_info.num_int_read_failure = - pmadapter->dbg.num_int_read_failure; - info->param.debug_info.last_int_status = pmadapter->dbg.last_int_status; - info->param.debug_info.num_event_deauth = - pmadapter->dbg.num_event_deauth; - info->param.debug_info.num_event_disassoc = - pmadapter->dbg.num_event_disassoc; - info->param.debug_info.num_event_link_lost = - pmadapter->dbg.num_event_link_lost; - info->param.debug_info.num_cmd_deauth = pmadapter->dbg.num_cmd_deauth; - info->param.debug_info.num_cmd_assoc_success = - pmadapter->dbg.num_cmd_assoc_success; - info->param.debug_info.num_cmd_assoc_failure = - pmadapter->dbg.num_cmd_assoc_failure; - info->param.debug_info.num_tx_timeout = pmadapter->dbg.num_tx_timeout; - info->param.debug_info.num_cmd_timeout = pmadapter->dbg.num_cmd_timeout; - info->param.debug_info.timeout_cmd_id = pmadapter->dbg.timeout_cmd_id; - info->param.debug_info.timeout_cmd_act = pmadapter->dbg.timeout_cmd_act; - memcpy(pmadapter, info->param.debug_info.last_cmd_id, - pmadapter->dbg.last_cmd_id, sizeof(pmadapter->dbg.last_cmd_id)); - memcpy(pmadapter, info->param.debug_info.last_cmd_act, - pmadapter->dbg.last_cmd_act, - sizeof(pmadapter->dbg.last_cmd_act)); - info->param.debug_info.last_cmd_index = pmadapter->dbg.last_cmd_index; - memcpy(pmadapter, info->param.debug_info.last_cmd_resp_id, - pmadapter->dbg.last_cmd_resp_id, - sizeof(pmadapter->dbg.last_cmd_resp_id)); - info->param.debug_info.last_cmd_resp_index = - pmadapter->dbg.last_cmd_resp_index; - memcpy(pmadapter, info->param.debug_info.last_event, - pmadapter->dbg.last_event, sizeof(pmadapter->dbg.last_event)); - info->param.debug_info.last_event_index = - pmadapter->dbg.last_event_index; - info->param.debug_info.num_no_cmd_node = pmadapter->dbg.num_no_cmd_node; - info->param.debug_info.mp_rd_bitmap = pmadapter->mp_rd_bitmap; - info->param.debug_info.mp_wr_bitmap = pmadapter->mp_wr_bitmap; - info->param.debug_info.curr_rd_port = pmadapter->curr_rd_port; - info->param.debug_info.curr_wr_port = pmadapter->curr_wr_port; - info->param.debug_info.data_sent = pmadapter->data_sent; - info->param.debug_info.cmd_sent = pmadapter->cmd_sent; - info->param.debug_info.cmd_resp_received = pmadapter->cmd_resp_received; - info->param.debug_info.tx_pkts_queued = - util_scalar_read(pmadapter->pmoal_handle, - &pmpriv->wmm.tx_pkts_queued, MNULL, MNULL); + info->param.debug_info.pm_wakeup_card_req = + pmadapter->pm_wakeup_card_req; + info->param.debug_info.pm_wakeup_fw_try = + pmadapter->pm_wakeup_fw_try; + info->param.debug_info.is_hs_configured = + pmadapter->is_hs_configured; + info->param.debug_info.hs_activated = pmadapter->hs_activated; + info->param.debug_info.pps_uapsd_mode = + pmadapter->pps_uapsd_mode; + info->param.debug_info.sleep_pd = + pmadapter->sleep_period.period; + info->param.debug_info.qos_cfg = pmpriv->wmm_qosinfo; + info->param.debug_info.tx_lock_flag = pmadapter->tx_lock_flag; + info->param.debug_info.port_open = pmpriv->port_open; + info->param.debug_info.bypass_pkt_count = + pmadapter->bypass_pkt_count; + info->param.debug_info.scan_processing = + pmadapter->scan_processing; + info->param.debug_info.num_cmd_host_to_card_failure = + pmadapter->dbg.num_cmd_host_to_card_failure; + info->param.debug_info.num_cmd_sleep_cfm_host_to_card_failure = + pmadapter->dbg.num_cmd_sleep_cfm_host_to_card_failure; + info->param.debug_info.num_tx_host_to_card_failure = + pmadapter->dbg.num_tx_host_to_card_failure; + info->param.debug_info.num_cmdevt_card_to_host_failure = + pmadapter->dbg.num_cmdevt_card_to_host_failure; + info->param.debug_info.num_rx_card_to_host_failure = + pmadapter->dbg.num_rx_card_to_host_failure; + info->param.debug_info.num_int_read_failure = + pmadapter->dbg.num_int_read_failure; + info->param.debug_info.last_int_status = + pmadapter->dbg.last_int_status; + info->param.debug_info.num_event_deauth = + pmadapter->dbg.num_event_deauth; + info->param.debug_info.num_event_disassoc = + pmadapter->dbg.num_event_disassoc; + info->param.debug_info.num_event_link_lost = + pmadapter->dbg.num_event_link_lost; + info->param.debug_info.num_cmd_deauth = + pmadapter->dbg.num_cmd_deauth; + info->param.debug_info.num_cmd_assoc_success = + pmadapter->dbg.num_cmd_assoc_success; + info->param.debug_info.num_cmd_assoc_failure = + pmadapter->dbg.num_cmd_assoc_failure; + info->param.debug_info.num_tx_timeout = + pmadapter->dbg.num_tx_timeout; + info->param.debug_info.num_cmd_timeout = + pmadapter->dbg.num_cmd_timeout; + info->param.debug_info.timeout_cmd_id = + pmadapter->dbg.timeout_cmd_id; + info->param.debug_info.timeout_cmd_act = + pmadapter->dbg.timeout_cmd_act; + memcpy(pmadapter, info->param.debug_info.last_cmd_id, + pmadapter->dbg.last_cmd_id, + sizeof(pmadapter->dbg.last_cmd_id)); + memcpy(pmadapter, info->param.debug_info.last_cmd_act, + pmadapter->dbg.last_cmd_act, + sizeof(pmadapter->dbg.last_cmd_act)); + info->param.debug_info.last_cmd_index = + pmadapter->dbg.last_cmd_index; + memcpy(pmadapter, info->param.debug_info.last_cmd_resp_id, + pmadapter->dbg.last_cmd_resp_id, + sizeof(pmadapter->dbg.last_cmd_resp_id)); + info->param.debug_info.last_cmd_resp_index = + pmadapter->dbg.last_cmd_resp_index; + memcpy(pmadapter, info->param.debug_info.last_event, + pmadapter->dbg.last_event, + sizeof(pmadapter->dbg.last_event)); + info->param.debug_info.last_event_index = + pmadapter->dbg.last_event_index; + info->param.debug_info.num_no_cmd_node = + pmadapter->dbg.num_no_cmd_node; + info->param.debug_info.mp_rd_bitmap = pmadapter->mp_rd_bitmap; + info->param.debug_info.mp_wr_bitmap = pmadapter->mp_wr_bitmap; + info->param.debug_info.curr_rd_port = pmadapter->curr_rd_port; + info->param.debug_info.curr_wr_port = pmadapter->curr_wr_port; + info->param.debug_info.data_sent = pmadapter->data_sent; + info->param.debug_info.cmd_sent = pmadapter->cmd_sent; + info->param.debug_info.cmd_resp_received = + pmadapter->cmd_resp_received; + info->param.debug_info.tx_pkts_queued = + util_scalar_read(pmadapter->pmoal_handle, + &pmpriv->wmm.tx_pkts_queued, MNULL, + MNULL); #ifdef UAP_SUPPORT - info->param.debug_info.num_bridge_pkts = pmadapter->pending_bridge_pkts; - info->param.debug_info.num_drop_pkts = pmpriv->num_drop_pkts; + info->param.debug_info.num_bridge_pkts = + pmadapter->pending_bridge_pkts; + info->param.debug_info.num_drop_pkts = pmpriv->num_drop_pkts; #endif - } + } - pioctl_req->data_read_written = - sizeof(mlan_debug_info) + MLAN_SUB_COMMAND_SIZE; + pioctl_req->data_read_written = + sizeof(mlan_debug_info) + MLAN_SUB_COMMAND_SIZE; - LEAVE(); - return ret; + LEAVE(); + return ret; } /** @@ -561,35 +620,36 @@ wlan_get_info_debug_info(IN pmlan_adapter pmadapter, */ mlan_status wlan_misc_ioctl_mac_control(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u16 cmd_action = 0; - - ENTER(); - - misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - - if (pioctl_req->action == MLAN_ACT_GET) { - misc->param.mac_ctrl = pmpriv->curr_pkt_filter; - } else { - pmpriv->curr_pkt_filter = misc->param.mac_ctrl; - cmd_action = HostCmd_ACT_GEN_SET; - - /* Send command to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_MAC_CONTROL, - cmd_action, 0, - (t_void *) pioctl_req, &misc->param.mac_ctrl); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - } - - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u16 cmd_action = 0; + + ENTER(); + + misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + + if (pioctl_req->action == MLAN_ACT_GET) { + misc->param.mac_ctrl = pmpriv->curr_pkt_filter; + } else { + pmpriv->curr_pkt_filter = misc->param.mac_ctrl; + cmd_action = HostCmd_ACT_GEN_SET; + + /* Send command to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_MAC_CONTROL, + cmd_action, 0, + (t_void *) pioctl_req, + &misc->param.mac_ctrl); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + } + + LEAVE(); + return ret; } /** @@ -602,16 +662,15 @@ wlan_misc_ioctl_mac_control(IN pmlan_adapter pmadapter, mlan_status wlan_pm_wakeup_card(IN pmlan_adapter pmadapter) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_callbacks pcb = &pmadapter->callbacks; - - ENTER(); - PRINTM(MEVENT, "Wakeup device...\n"); - ret = - pcb->moal_write_reg(pmadapter->pmoal_handle, HOST_TO_CARD_EVENT_REG, - HOST_POWER_UP); - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_callbacks pcb = &pmadapter->callbacks; + + ENTER(); + PRINTM(MEVENT, "Wakeup device...\n"); + ret = pcb->moal_write_reg(pmadapter->pmoal_handle, + HOST_TO_CARD_EVENT_REG, HOST_POWER_UP); + LEAVE(); + return ret; } /** @@ -624,19 +683,19 @@ wlan_pm_wakeup_card(IN pmlan_adapter pmadapter) mlan_status wlan_pm_reset_card(IN pmlan_adapter pmadapter) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_callbacks pcb = &pmadapter->callbacks; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_callbacks pcb = &pmadapter->callbacks; - ENTER(); + ENTER(); - ret = - pcb->moal_write_reg(pmadapter->pmoal_handle, HOST_TO_CARD_EVENT_REG, 0); + ret = pcb->moal_write_reg(pmadapter->pmoal_handle, + HOST_TO_CARD_EVENT_REG, 0); - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief Set/Get HS configuration * * @param pmadapter A pointer to mlan_adapter structure @@ -647,146 +706,155 @@ wlan_pm_reset_card(IN pmlan_adapter pmadapter) mlan_status wlan_pm_ioctl_hscfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_pm_cfg *pm = MNULL; - mlan_status status = MLAN_STATUS_SUCCESS; - t_u32 prev_cond = 0; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_pm_cfg *pm = MNULL; + mlan_status status = MLAN_STATUS_SUCCESS; + t_u32 prev_cond = 0; - ENTER(); + ENTER(); - pm = (mlan_ds_pm_cfg *) pioctl_req->pbuf; + pm = (mlan_ds_pm_cfg *) pioctl_req->pbuf; - switch (pioctl_req->action) { - case MLAN_ACT_SET: + switch (pioctl_req->action) { + case MLAN_ACT_SET: #ifdef STA_SUPPORT - if (pmadapter->pps_uapsd_mode) { - PRINTM(MINFO, "Host Sleep IOCTL is blocked in UAPSD/PPS mode\n"); - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } + if (pmadapter->pps_uapsd_mode) { + PRINTM(MINFO, + "Host Sleep IOCTL is blocked in UAPSD/PPS mode\n"); + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } #endif /* STA_SUPPORT */ - if (pm->param.hs_cfg.is_invoke_hostcmd == MTRUE) { - if (pm->param.hs_cfg.conditions == HOST_SLEEP_CFG_CANCEL) { - if (pmadapter->is_hs_configured == MFALSE) { - /* Already cancelled */ - break; - } - /* Save previous condition */ - prev_cond = pmadapter->hs_cfg.conditions; - pmadapter->hs_cfg.conditions = pm->param.hs_cfg.conditions; - } else if (pmadapter->hs_cfg.conditions == HOST_SLEEP_CFG_CANCEL) { - /* Return failure if no parameters for HS enable */ - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - status = MLAN_STATUS_FAILURE; - break; - } - status = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_HS_CFG_ENH, - HostCmd_ACT_GEN_SET, - 0, (t_void *) pioctl_req, - (t_void *) (&pmadapter->hs_cfg)); - if (status == MLAN_STATUS_SUCCESS) - status = MLAN_STATUS_PENDING; - if (pm->param.hs_cfg.conditions == HOST_SLEEP_CFG_CANCEL) { - /* Restore previous condition */ - pmadapter->hs_cfg.conditions = prev_cond; - } - } else { - pmadapter->hs_cfg.conditions = pm->param.hs_cfg.conditions; - pmadapter->hs_cfg.gpio = (t_u8) pm->param.hs_cfg.gpio; - pmadapter->hs_cfg.gap = (t_u8) pm->param.hs_cfg.gap; - } - break; - case MLAN_ACT_GET: - pm->param.hs_cfg.conditions = pmadapter->hs_cfg.conditions; - pm->param.hs_cfg.gpio = pmadapter->hs_cfg.gpio; - pm->param.hs_cfg.gap = pmadapter->hs_cfg.gap; - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - - LEAVE(); - return status; + if (pm->param.hs_cfg.is_invoke_hostcmd == MTRUE) { + if (pm->param.hs_cfg.conditions == + HOST_SLEEP_CFG_CANCEL) { + if (pmadapter->is_hs_configured == MFALSE) { + /* Already cancelled */ + break; + } + /* Save previous condition */ + prev_cond = pmadapter->hs_cfg.conditions; + pmadapter->hs_cfg.conditions = + pm->param.hs_cfg.conditions; + } else if (pmadapter->hs_cfg.conditions == + HOST_SLEEP_CFG_CANCEL) { + /* Return failure if no parameters for HS + enable */ + pioctl_req->status_code = + MLAN_ERROR_INVALID_PARAMETER; + status = MLAN_STATUS_FAILURE; + break; + } + status = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_HS_CFG_ENH, + HostCmd_ACT_GEN_SET, + 0, (t_void *) pioctl_req, + (t_void *) (&pmadapter-> + hs_cfg)); + if (status == MLAN_STATUS_SUCCESS) + status = MLAN_STATUS_PENDING; + if (pm->param.hs_cfg.conditions == + HOST_SLEEP_CFG_CANCEL) { + /* Restore previous condition */ + pmadapter->hs_cfg.conditions = prev_cond; + } + } else { + pmadapter->hs_cfg.conditions = + pm->param.hs_cfg.conditions; + pmadapter->hs_cfg.gpio = (t_u8) pm->param.hs_cfg.gpio; + pmadapter->hs_cfg.gap = (t_u8) pm->param.hs_cfg.gap; + } + break; + case MLAN_ACT_GET: + pm->param.hs_cfg.conditions = pmadapter->hs_cfg.conditions; + pm->param.hs_cfg.gpio = pmadapter->hs_cfg.gpio; + pm->param.hs_cfg.gap = pmadapter->hs_cfg.gap; + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + + LEAVE(); + return status; } -/** +/** * @brief This function allocates a mlan_buffer. * * @param pmadapter Pointer to mlan_adapter * @param data_len Data length * @param head_room head_room reserved in mlan_buffer - * @param malloc_flag flag to user moal_malloc + * @param malloc_flag flag to user moal_malloc * @return mlan_buffer pointer or MNULL */ pmlan_buffer wlan_alloc_mlan_buffer(mlan_adapter * pmadapter, t_u32 data_len, - t_u32 head_room, t_u32 malloc_flag) + t_u32 head_room, t_u32 malloc_flag) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_buffer pmbuf = MNULL; - t_u32 buf_size = 0; - t_u8 *tmp_buf = MNULL; - pmlan_callbacks pcb = &pmadapter->callbacks; - - ENTER(); - - /* make sure that the data length is at least SDIO block size */ - data_len = ALIGN_SZ(data_len, MLAN_SDIO_BLOCK_SIZE); - - /* head_room is not implemented for malloc mlan buffer */ - - switch (malloc_flag) { - case MOAL_MALLOC_BUFFER: - buf_size = sizeof(mlan_buffer) + data_len + DMA_ALIGNMENT; - ret = - pcb->moal_malloc(pmadapter->pmoal_handle, buf_size, - MLAN_MEM_DEF | MLAN_MEM_DMA, (t_u8 **) & pmbuf); - if ((ret != MLAN_STATUS_SUCCESS) || !pmbuf) { - pmbuf = MNULL; - goto exit; - } - memset(pmadapter, pmbuf, 0, sizeof(mlan_buffer)); - - pmbuf->pdesc = MNULL; - /* Align address */ - pmbuf->pbuf = - (t_u8 *) ALIGN_ADDR((t_u8 *) pmbuf + sizeof(mlan_buffer), - DMA_ALIGNMENT); - pmbuf->data_offset = 0; - pmbuf->data_len = data_len; - pmbuf->flags |= MLAN_BUF_FLAG_MALLOC_BUF; - break; - - case MOAL_ALLOC_MLAN_BUFFER: - /* use moal_alloc_mlan_buffer, head_room supported */ - ret = pcb->moal_alloc_mlan_buffer(pmadapter->pmoal_handle, - data_len + DMA_ALIGNMENT + head_room, - &pmbuf); - if ((ret != MLAN_STATUS_SUCCESS) || !pmbuf) { - PRINTM(MERROR, "Failed to allocate 'mlan_buffer'\n"); - goto exit; - } - pmbuf->data_offset = head_room; - tmp_buf = - (t_u8 *) ALIGN_ADDR(pmbuf->pbuf + pmbuf->data_offset, - DMA_ALIGNMENT); - pmbuf->data_offset += - (t_u32) (tmp_buf - (pmbuf->pbuf + pmbuf->data_offset)); - pmbuf->data_len = data_len; - pmbuf->flags = 0; - break; - } - - exit: - LEAVE(); - return pmbuf; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_buffer pmbuf = MNULL; + t_u32 buf_size = 0; + t_u8 *tmp_buf = MNULL; + pmlan_callbacks pcb = &pmadapter->callbacks; + + ENTER(); + + /* make sure that the data length is at least SDIO block size */ + data_len = ALIGN_SZ(data_len, MLAN_SDIO_BLOCK_SIZE); + + /* head_room is not implemented for malloc mlan buffer */ + + switch (malloc_flag) { + case MOAL_MALLOC_BUFFER: + buf_size = sizeof(mlan_buffer) + data_len + DMA_ALIGNMENT; + ret = pcb->moal_malloc(pmadapter->pmoal_handle, buf_size, + MLAN_MEM_DEF | MLAN_MEM_DMA, + (t_u8 **) & pmbuf); + if ((ret != MLAN_STATUS_SUCCESS) || !pmbuf) { + pmbuf = MNULL; + goto exit; + } + memset(pmadapter, pmbuf, 0, sizeof(mlan_buffer)); + + pmbuf->pdesc = MNULL; + /* Align address */ + pmbuf->pbuf = + (t_u8 *) ALIGN_ADDR((t_u8 *) pmbuf + + sizeof(mlan_buffer), DMA_ALIGNMENT); + pmbuf->data_offset = 0; + pmbuf->data_len = data_len; + pmbuf->flags |= MLAN_BUF_FLAG_MALLOC_BUF; + break; + + case MOAL_ALLOC_MLAN_BUFFER: + /* use moal_alloc_mlan_buffer, head_room supported */ + ret = pcb->moal_alloc_mlan_buffer(pmadapter->pmoal_handle, + data_len + DMA_ALIGNMENT + + head_room, &pmbuf); + if ((ret != MLAN_STATUS_SUCCESS) || !pmbuf) { + PRINTM(MERROR, "Failed to allocate 'mlan_buffer'\n"); + goto exit; + } + pmbuf->data_offset = head_room; + tmp_buf = + (t_u8 *) ALIGN_ADDR(pmbuf->pbuf + pmbuf->data_offset, + DMA_ALIGNMENT); + pmbuf->data_offset += + (t_u32) (tmp_buf - (pmbuf->pbuf + pmbuf->data_offset)); + pmbuf->data_len = data_len; + pmbuf->flags = 0; + break; + } + +exit: + LEAVE(); + return pmbuf; } -/** +/** * @brief This function frees a mlan_buffer. * * @param pmadapter Pointer to mlan_adapter @@ -797,25 +865,27 @@ wlan_alloc_mlan_buffer(mlan_adapter * pmadapter, t_u32 data_len, t_void wlan_free_mlan_buffer(mlan_adapter * pmadapter, pmlan_buffer pmbuf) { - pmlan_callbacks pcb = &pmadapter->callbacks; - ENTER(); - - if (pcb && pmbuf) { - if (pmbuf->flags & MLAN_BUF_FLAG_BRIDGE_BUF) - pmadapter->pending_bridge_pkts--; - if (pmbuf->flags & MLAN_BUF_FLAG_MALLOC_BUF) - pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) pmbuf); - else - pcb->moal_free_mlan_buffer(pmadapter->pmoal_handle, pmbuf); - } - - LEAVE(); - return; + pmlan_callbacks pcb = &pmadapter->callbacks; + ENTER(); + + if (pcb && pmbuf) { + if (pmbuf->flags & MLAN_BUF_FLAG_BRIDGE_BUF) + pmadapter->pending_bridge_pkts--; + if (pmbuf->flags & MLAN_BUF_FLAG_MALLOC_BUF) + pcb->moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pmbuf); + else + pcb->moal_free_mlan_buffer(pmadapter->pmoal_handle, + pmbuf); + } + + LEAVE(); + return; } -/** +/** * @brief Delay function implementation - * + * * @param pmadapter A pointer to mlan_adapter structure * @param delay Delay value * @param u Units of delay (sec, msec or usec) @@ -825,57 +895,58 @@ wlan_free_mlan_buffer(mlan_adapter * pmadapter, pmlan_buffer pmbuf) t_void wlan_delay_func(mlan_adapter * pmadapter, t_u32 delay, t_delay_unit u) { - t_u32 now_tv_sec, now_tv_usec; - t_u32 upto_tv_sec, upto_tv_usec; - pmlan_callbacks pcb = &pmadapter->callbacks; - - ENTER(); - - if (pcb->moal_udelay) { - if (u == SEC) { - delay *= 1000000; - } else if (u == MSEC) { - delay *= 1000; - } - pcb->moal_udelay(pmadapter->pmoal_handle, delay); - } else { - - pcb->moal_get_system_time(pmadapter->pmoal_handle, &upto_tv_sec, - &upto_tv_usec); - - switch (u) { - case SEC: - upto_tv_sec += delay; - break; - case MSEC: - delay *= 1000; - case USEC: - upto_tv_sec += (delay / 1000000); - upto_tv_usec += (delay % 1000000); - break; - } - - do { - pcb->moal_get_system_time(pmadapter->pmoal_handle, &now_tv_sec, - &now_tv_usec); - if (now_tv_sec > upto_tv_sec) { - LEAVE(); - return; - } - - if ((now_tv_sec == upto_tv_sec) && (now_tv_usec >= upto_tv_usec)) { - LEAVE(); - return; - } - } while (MTRUE); - } - - LEAVE(); - return; + t_u32 now_tv_sec, now_tv_usec; + t_u32 upto_tv_sec, upto_tv_usec; + pmlan_callbacks pcb = &pmadapter->callbacks; + + ENTER(); + + if (pcb->moal_udelay) { + if (u == SEC) { + delay *= 1000000; + } else if (u == MSEC) { + delay *= 1000; + } + pcb->moal_udelay(pmadapter->pmoal_handle, delay); + } else { + + pcb->moal_get_system_time(pmadapter->pmoal_handle, &upto_tv_sec, + &upto_tv_usec); + + switch (u) { + case SEC: + upto_tv_sec += delay; + break; + case MSEC: + delay *= 1000; + case USEC: + upto_tv_sec += (delay / 1000000); + upto_tv_usec += (delay % 1000000); + break; + } + + do { + pcb->moal_get_system_time(pmadapter->pmoal_handle, + &now_tv_sec, &now_tv_usec); + if (now_tv_sec > upto_tv_sec) { + LEAVE(); + return; + } + + if ((now_tv_sec == upto_tv_sec) && + (now_tv_usec >= upto_tv_usec)) { + LEAVE(); + return; + } + } while (MTRUE); + } + + LEAVE(); + return; } -/** - * @brief BSS remove +/** + * @brief BSS remove * * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer @@ -884,16 +955,16 @@ wlan_delay_func(mlan_adapter * pmadapter, t_u32 delay, t_delay_unit u) */ mlan_status wlan_bss_ioctl_bss_remove(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - ENTER(); - wlan_cancel_bss_pending_cmd(pmadapter, pioctl_req->bss_index); - LEAVE(); - return MLAN_STATUS_SUCCESS; + ENTER(); + wlan_cancel_bss_pending_cmd(pmadapter, pioctl_req->bss_index); + LEAVE(); + return MLAN_STATUS_SUCCESS; } #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) -/** +/** * @brief Set/Get BSS role * * @param pmadapter A pointer to mlan_adapter structure @@ -903,100 +974,103 @@ wlan_bss_ioctl_bss_remove(IN pmlan_adapter pmadapter, */ mlan_status wlan_bss_ioctl_bss_role(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_bss *bss = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - HostCmd_DS_VERSION_EXT dummy; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_bss *bss = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + HostCmd_DS_VERSION_EXT dummy; #if defined(WIFI_DIRECT_SUPPORT) - t_u8 bss_mode; + t_u8 bss_mode; #endif - t_u8 i, global_band = 0; - int j; - - ENTER(); - - bss = (mlan_ds_bss *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) { - bss->param.bss_role = GET_BSS_ROLE(pmpriv); - } else { - if (GET_BSS_ROLE(pmpriv) == bss->param.bss_role) { - PRINTM(MIOCTL, "BSS ie already in the desired role!\n"); - goto done; - } - /** Switch BSS role */ - wlan_free_priv(pmpriv); - - pmpriv->bss_role = bss->param.bss_role; - if (pmpriv->bss_type == MLAN_BSS_TYPE_UAP) - pmpriv->bss_type = MLAN_BSS_TYPE_STA; - else if (pmpriv->bss_type == MLAN_BSS_TYPE_STA) - pmpriv->bss_type = MLAN_BSS_TYPE_UAP; - - /* Initialize private structures */ - wlan_init_priv(pmpriv); - - /* Initialize function table */ - for (j = 0; mlan_ops[j]; j++) { - if (mlan_ops[j]->bss_role == GET_BSS_ROLE(pmpriv)) { - memcpy(pmadapter, &pmpriv->ops, mlan_ops[j], - sizeof(mlan_operations)); - } - } - - for (i = 0; i < pmadapter->priv_num; i++) { - if (pmadapter->priv[i] && - GET_BSS_ROLE(pmadapter->priv[i]) == MLAN_BSS_ROLE_STA) - global_band |= pmadapter->priv[i]->config_bands; - } - - if (global_band != pmadapter->config_bands) { - if (wlan_set_regiontable(pmpriv, (t_u8) pmadapter->region_code, - global_band | pmadapter-> - adhoc_start_band)) { - pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - if (wlan_11d_set_universaltable - (pmpriv, global_band | pmadapter->adhoc_start_band)) { - pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - pmadapter->config_bands = global_band; - } - - /* Issue commands to initialize firmware */ + t_u8 i, global_band = 0; + int j; + + ENTER(); + + bss = (mlan_ds_bss *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) { + bss->param.bss_role = GET_BSS_ROLE(pmpriv); + } else { + if (GET_BSS_ROLE(pmpriv) == bss->param.bss_role) { + PRINTM(MIOCTL, "BSS ie already in the desired role!\n"); + goto done; + } + /** Switch BSS role */ + wlan_free_priv(pmpriv); + + pmpriv->bss_role = bss->param.bss_role; + if (pmpriv->bss_type == MLAN_BSS_TYPE_UAP) + pmpriv->bss_type = MLAN_BSS_TYPE_STA; + else if (pmpriv->bss_type == MLAN_BSS_TYPE_STA) + pmpriv->bss_type = MLAN_BSS_TYPE_UAP; + + /* Initialize private structures */ + wlan_init_priv(pmpriv); + + /* Initialize function table */ + for (j = 0; mlan_ops[j]; j++) { + if (mlan_ops[j]->bss_role == GET_BSS_ROLE(pmpriv)) { + memcpy(pmadapter, &pmpriv->ops, mlan_ops[j], + sizeof(mlan_operations)); + } + } + + for (i = 0; i < pmadapter->priv_num; i++) { + if (pmadapter->priv[i] && + GET_BSS_ROLE(pmadapter->priv[i]) == + MLAN_BSS_ROLE_STA) + global_band |= pmadapter->priv[i]->config_bands; + } + + if (global_band != pmadapter->config_bands) { + if (wlan_set_regiontable + (pmpriv, (t_u8) pmadapter->region_code, + global_band | pmadapter->adhoc_start_band)) { + pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + if (wlan_11d_set_universaltable + (pmpriv, + global_band | pmadapter->adhoc_start_band)) { + pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + pmadapter->config_bands = global_band; + } + + /* Issue commands to initialize firmware */ #if defined(WIFI_DIRECT_SUPPORT) - if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) - bss_mode = BSS_MODE_WIFIDIRECT_CLIENT; - else - bss_mode = BSS_MODE_WIFIDIRECT_GO; - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_SET_BSS_MODE, - HostCmd_ACT_GEN_SET, 0, MNULL, &bss_mode); - if (ret) - goto done; + if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) + bss_mode = BSS_MODE_WIFIDIRECT_CLIENT; + else + bss_mode = BSS_MODE_WIFIDIRECT_GO; + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_SET_BSS_MODE, + HostCmd_ACT_GEN_SET, 0, MNULL, + &bss_mode); + if (ret) + goto done; #endif - ret = pmpriv->ops.init_cmd(pmpriv, MFALSE); - if (ret == MLAN_STATUS_FAILURE) - goto done; - - /* Issue dummy Get command to complete the ioctl */ - memset(pmadapter, &dummy, 0, sizeof(HostCmd_DS_VERSION_EXT)); - ret = - wlan_prepare_cmd(pmpriv, HostCmd_CMD_VERSION_EXT, - HostCmd_ACT_GEN_GET, 0, (t_void *) pioctl_req, - (t_void *) & dummy); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - } - - done: - LEAVE(); - return ret; + ret = pmpriv->ops.init_cmd(pmpriv, MFALSE); + if (ret == MLAN_STATUS_FAILURE) + goto done; + + /* Issue dummy Get command to complete the ioctl */ + memset(pmadapter, &dummy, 0, sizeof(HostCmd_DS_VERSION_EXT)); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_VERSION_EXT, + HostCmd_ACT_GEN_GET, 0, + (t_void *) pioctl_req, + (t_void *) & dummy); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + } + +done: + LEAVE(); + return ret; } #endif @@ -1012,219 +1086,288 @@ wlan_bss_ioctl_bss_role(IN pmlan_adapter pmadapter, */ mlan_status wlan_misc_ioctl_custom_ie_list(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req, - IN t_bool send_ioctl) + IN pmlan_ioctl_req pioctl_req, + IN t_bool send_ioctl) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - custom_ie *ie_data = MNULL; - t_u16 cmd_action = 0, index, mask, i, len, app_data_len; - t_s32 ioctl_len; - t_u8 *tmp_ie; - - ENTER(); - - if ((misc->param.cust_ie.len == 0) || - (misc->param.cust_ie.len == sizeof(t_u16))) { - pioctl_req->action = MLAN_ACT_GET; - /* Get the IE */ - cmd_action = HostCmd_ACT_GEN_GET; - } else { - /* ioctl_len : ioctl length from application, start with - misc->param.cust_ie.len and reach upto 0 */ - ioctl_len = misc->param.cust_ie.len; - - /* app_data_len : length from application, start with 0 and reach upto - ioctl_len */ - app_data_len = sizeof(MrvlIEtypesHeader_t); - misc->param.cust_ie.len = 0; - - while (ioctl_len > 0) { - ie_data = (custom_ie *) (((t_u8 *) & misc->param.cust_ie) - + app_data_len); - ioctl_len -= (ie_data->ie_length + MLAN_CUSTOM_IE_HDR_SIZE); - app_data_len += (ie_data->ie_length + MLAN_CUSTOM_IE_HDR_SIZE); - - index = ie_data->ie_index; - mask = ie_data->mgmt_subtype_mask; - if (MLAN_CUSTOM_IE_AUTO_IDX_MASK == index) { /* Need to be - Autohandled */ - if (mask == MLAN_CUSTOM_IE_DELETE_MASK) { /* Automatic - Deletion */ - ret = - wlan_custom_ioctl_auto_delete(pmpriv, pioctl_req, - ie_data, index); - /* if IE to delete is not found, return error */ - if (ret == MLAN_STATUS_FAILURE) { - goto done; - } - index = ie_data->ie_index; - memset(pmadapter, ie_data, 0, - sizeof(custom_ie) * MAX_MGMT_IE_INDEX_TO_FW); - len = 0; - for (i = 0; i < pmadapter->max_mgmt_ie_index; i++) { - /* Check if index is updated before sending to FW */ - if (index & ((t_u16) 1) << i) { - memcpy(pmadapter, (t_u8 *) ie_data + len, &i, - sizeof(ie_data->ie_index)); - len += sizeof(ie_data->ie_index); - memcpy(pmadapter, (t_u8 *) ie_data + len, - &pmpriv->mgmt_ie[i].mgmt_subtype_mask, - sizeof(ie_data->mgmt_subtype_mask)); - len += sizeof(ie_data->mgmt_subtype_mask); - memcpy(pmadapter, (t_u8 *) ie_data + len, - &pmpriv->mgmt_ie[i].ie_length, - sizeof(ie_data->ie_length)); - len += sizeof(ie_data->ie_length); - if (pmpriv->mgmt_ie[i].ie_length) { - memcpy(pmadapter, (t_u8 *) ie_data + len, - &pmpriv->mgmt_ie[i].ie_buffer, - pmpriv->mgmt_ie[i].ie_length); - len += pmpriv->mgmt_ie[i].ie_length; - } - } - } - misc->param.cust_ie.len += len; - pioctl_req->action = MLAN_ACT_SET; - cmd_action = HostCmd_ACT_GEN_SET; - } else { /* Automatic Addition */ - if (MLAN_STATUS_FAILURE == - wlan_custom_ioctl_get_autoidx(pmpriv, pioctl_req, mask, - ie_data, &index)) { - PRINTM(MERROR, "Failed to Set the IE buffer\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - mask &= ~MLAN_CUSTOM_IE_NEW_MASK; - if (MLAN_CUSTOM_IE_AUTO_IDX_MASK == index) { - ret = MLAN_STATUS_SUCCESS; - goto done; - } - tmp_ie = (t_u8 *) & pmpriv->mgmt_ie[index].ie_buffer; - memcpy(pmadapter, tmp_ie + pmpriv->mgmt_ie[index].ie_length, - &ie_data->ie_buffer, ie_data->ie_length); - pmpriv->mgmt_ie[index].ie_length += ie_data->ie_length; - pmpriv->mgmt_ie[index].ie_index = index; - pmpriv->mgmt_ie[index].mgmt_subtype_mask = mask; - - pioctl_req->action = MLAN_ACT_SET; - cmd_action = HostCmd_ACT_GEN_SET; - ie_data->ie_index = index; - ie_data->ie_length = pmpriv->mgmt_ie[index].ie_length; - memcpy(pmadapter, &ie_data->ie_buffer, - &pmpriv->mgmt_ie[index].ie_buffer, - pmpriv->mgmt_ie[index].ie_length); - misc->param.cust_ie.len += - pmpriv->mgmt_ie[index].ie_length + - MLAN_CUSTOM_IE_HDR_SIZE; - } - } else { - if (index >= pmadapter->max_mgmt_ie_index) { - PRINTM(MERROR, "Invalid custom IE index %d\n", index); - ret = MLAN_STATUS_FAILURE; - goto done; - } - /* Set/Clear the IE and save it */ - if (ie_data->mgmt_subtype_mask == MLAN_CUSTOM_IE_DELETE_MASK && - ie_data->ie_length) { - PRINTM(MINFO, "Clear the IE buffer\n"); - ret = - wlan_custom_ioctl_auto_delete(pmpriv, pioctl_req, - ie_data, index); - /* if IE to delete is not found, return error */ - if (ret == MLAN_STATUS_FAILURE) { - goto done; - } - memset(pmadapter, ie_data, 0, - sizeof(custom_ie) * MAX_MGMT_IE_INDEX_TO_FW); - memcpy(pmadapter, (t_u8 *) ie_data, &pmpriv->mgmt_ie[index], - pmpriv->mgmt_ie[index].ie_length + - MLAN_CUSTOM_IE_HDR_SIZE); - } else { - /* - * Check if this index is being used on any other - * interfaces. If yes, then the request needs to be rejected. - */ - ret = wlan_is_custom_ie_index_unused(pmpriv, index); - if (ret == MLAN_STATUS_FAILURE) { - PRINTM(MERROR, - "IE index is used by other interface.\n"); - PRINTM(MERROR, - "Set or delete on index %d is not allowed.\n", - index); - pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; - goto done; - } - PRINTM(MINFO, "Set the IE buffer\n"); - if (ie_data->mgmt_subtype_mask == - MLAN_CUSTOM_IE_DELETE_MASK) - ie_data->ie_length = 0; - else { - if ((pmpriv->mgmt_ie[index].mgmt_subtype_mask == - ie_data->mgmt_subtype_mask) && - (pmpriv->mgmt_ie[index].ie_length == - ie_data->ie_length) && - !memcmp(pmpriv->adapter, - pmpriv->mgmt_ie[index].ie_buffer, - ie_data->ie_buffer, ie_data->ie_length)) { - PRINTM(MIOCTL, - "same custom ie already configured!\n"); - if (ioctl_len <= 0 && misc->param.cust_ie.len == 0) { - goto done; - } else { - /* remove matching IE from app buffer */ - app_data_len -= - ie_data->ie_length + - MLAN_CUSTOM_IE_HDR_SIZE; - memmove(pmadapter, (t_u8 *) ie_data, - ie_data->ie_buffer + ie_data->ie_length, - ioctl_len); - continue; - } - } - } - memset(pmadapter, &pmpriv->mgmt_ie[index], 0, - sizeof(custom_ie)); - memcpy(pmadapter, &pmpriv->mgmt_ie[index], ie_data, - sizeof(custom_ie)); - } - - misc->param.cust_ie.len += pmpriv->mgmt_ie[index].ie_length + - MLAN_CUSTOM_IE_HDR_SIZE; - pioctl_req->action = MLAN_ACT_SET; - cmd_action = HostCmd_ACT_GEN_SET; - } - } - } - - /* Send command to firmware */ - if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) { - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_MGMT_IE_LIST, - cmd_action, - 0, - (send_ioctl) ? (t_void *) pioctl_req : MNULL, - &misc->param.cust_ie); - } + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + custom_ie *ie_data = MNULL; + t_u16 cmd_action = 0, index, mask, i, len, app_data_len; + t_s32 ioctl_len; + t_u8 *tmp_ie; + + ENTER(); + + if ((misc->param.cust_ie.len == 0) || + (misc->param.cust_ie.len == sizeof(t_u16))) { + pioctl_req->action = MLAN_ACT_GET; + /* Get the IE */ + cmd_action = HostCmd_ACT_GEN_GET; + } else { + /* ioctl_len : ioctl length from application, start with + misc->param.cust_ie.len and reach upto 0 */ + ioctl_len = misc->param.cust_ie.len; + + /* app_data_len : length from application, start with 0 and + reach upto ioctl_len */ + app_data_len = sizeof(MrvlIEtypesHeader_t); + misc->param.cust_ie.len = 0; + + while (ioctl_len > 0) { + ie_data = + (custom_ie *) (((t_u8 *) & misc->param.cust_ie) + + app_data_len); + ioctl_len -= + (ie_data->ie_length + MLAN_CUSTOM_IE_HDR_SIZE); + app_data_len += + (ie_data->ie_length + MLAN_CUSTOM_IE_HDR_SIZE); + + index = ie_data->ie_index; + mask = ie_data->mgmt_subtype_mask; + if (MLAN_CUSTOM_IE_AUTO_IDX_MASK == index) { /* Need + to + be + Autohandled + */ + if (mask == MLAN_CUSTOM_IE_DELETE_MASK) { /* Automatic + Deletion + */ + ret = wlan_custom_ioctl_auto_delete + (pmpriv, pioctl_req, ie_data, + index); + /* if IE to delete is not found, return + error */ + if (ret == MLAN_STATUS_FAILURE) { + goto done; + } + index = ie_data->ie_index; + memset(pmadapter, ie_data, 0, + sizeof(custom_ie) * + MAX_MGMT_IE_INDEX_TO_FW); + len = 0; + for (i = 0; + i < pmadapter->max_mgmt_ie_index; + i++) { + /* Check if index is updated + before sending to FW */ + if (index & ((t_u16) 1) << i) { + memcpy(pmadapter, + (t_u8 *) ie_data + + len, &i, + sizeof(ie_data-> + ie_index)); + len += sizeof(ie_data-> + ie_index); + memcpy(pmadapter, + (t_u8 *) ie_data + + len, + &pmpriv-> + mgmt_ie[i]. + mgmt_subtype_mask, + sizeof(ie_data-> + mgmt_subtype_mask)); + len += sizeof(ie_data-> + mgmt_subtype_mask); + memcpy(pmadapter, + (t_u8 *) ie_data + + len, + &pmpriv-> + mgmt_ie[i]. + ie_length, + sizeof(ie_data-> + ie_length)); + len += sizeof(ie_data-> + ie_length); + if (pmpriv->mgmt_ie[i]. + ie_length) { + memcpy(pmadapter, (t_u8 *) ie_data + len, &pmpriv->mgmt_ie[i].ie_buffer, pmpriv->mgmt_ie[i].ie_length); + len += pmpriv-> + mgmt_ie + [i]. + ie_length; + } + } + } + misc->param.cust_ie.len += len; + pioctl_req->action = MLAN_ACT_SET; + cmd_action = HostCmd_ACT_GEN_SET; + } else { /* Automatic Addition */ + if (MLAN_STATUS_FAILURE == + wlan_custom_ioctl_get_autoidx + (pmpriv, pioctl_req, mask, ie_data, + &index)) { + PRINTM(MERROR, + "Failed to Set the IE buffer\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + mask &= ~MLAN_CUSTOM_IE_NEW_MASK; + if (MLAN_CUSTOM_IE_AUTO_IDX_MASK == + index) { + ret = MLAN_STATUS_SUCCESS; + goto done; + } + tmp_ie = (t_u8 *) & pmpriv-> + mgmt_ie[index].ie_buffer; + memcpy(pmadapter, + tmp_ie + + pmpriv->mgmt_ie[index].ie_length, + &ie_data->ie_buffer, + ie_data->ie_length); + pmpriv->mgmt_ie[index].ie_length += + ie_data->ie_length; + pmpriv->mgmt_ie[index].ie_index = index; + pmpriv->mgmt_ie[index]. + mgmt_subtype_mask = mask; + + pioctl_req->action = MLAN_ACT_SET; + cmd_action = HostCmd_ACT_GEN_SET; + ie_data->ie_index = index; + ie_data->ie_length = + pmpriv->mgmt_ie[index]. + ie_length; + memcpy(pmadapter, &ie_data->ie_buffer, + &pmpriv->mgmt_ie[index]. + ie_buffer, + pmpriv->mgmt_ie[index]. + ie_length); + misc->param.cust_ie.len += + pmpriv->mgmt_ie[index]. + ie_length + + MLAN_CUSTOM_IE_HDR_SIZE; + } + } else { + if (index >= pmadapter->max_mgmt_ie_index) { + PRINTM(MERROR, + "Invalid custom IE index %d\n", + index); + ret = MLAN_STATUS_FAILURE; + goto done; + } + /* Set/Clear the IE and save it */ + if (ie_data->mgmt_subtype_mask == + MLAN_CUSTOM_IE_DELETE_MASK && + ie_data->ie_length) { + PRINTM(MINFO, "Clear the IE buffer\n"); + ret = wlan_custom_ioctl_auto_delete + (pmpriv, pioctl_req, ie_data, + index); + /* if IE to delete is not found, return + error */ + if (ret == MLAN_STATUS_FAILURE) { + goto done; + } + memset(pmadapter, ie_data, 0, + sizeof(custom_ie) * + MAX_MGMT_IE_INDEX_TO_FW); + memcpy(pmadapter, (t_u8 *) ie_data, + &pmpriv->mgmt_ie[index], + pmpriv->mgmt_ie[index]. + ie_length + + MLAN_CUSTOM_IE_HDR_SIZE); + } else { + /* + * Check if this index is being used on any other + * interfaces. If yes, then the request needs to be rejected. + */ + ret = wlan_is_custom_ie_index_unused + (pmpriv, index); + if (ret == MLAN_STATUS_FAILURE) { + PRINTM(MERROR, + "IE index is used by other interface.\n"); + PRINTM(MERROR, + "Set or delete on index %d is not allowed.\n", + index); + pioctl_req->status_code = + MLAN_ERROR_IOCTL_FAIL; + goto done; + } + PRINTM(MINFO, "Set the IE buffer\n"); + if (ie_data->mgmt_subtype_mask == + MLAN_CUSTOM_IE_DELETE_MASK) + ie_data->ie_length = 0; + else { + if ((pmpriv->mgmt_ie[index]. + mgmt_subtype_mask == + ie_data->mgmt_subtype_mask) + && (pmpriv->mgmt_ie[index]. + ie_length == + ie_data->ie_length) && + !memcmp(pmpriv->adapter, + pmpriv-> + mgmt_ie[index]. + ie_buffer, + ie_data->ie_buffer, + ie_data-> + ie_length)) { + PRINTM(MIOCTL, + "same custom ie already configured!\n"); + if (ioctl_len <= 0 && + misc->param.cust_ie. + len == 0) { + goto done; + } else { + /* remove + matching IE + from app + buffer */ + app_data_len -= + ie_data-> + ie_length + + + MLAN_CUSTOM_IE_HDR_SIZE; + memmove(pmadapter, (t_u8 *) ie_data, ie_data->ie_buffer + ie_data->ie_length, ioctl_len); + continue; + } + } + } + memset(pmadapter, + &pmpriv->mgmt_ie[index], 0, + sizeof(custom_ie)); + memcpy(pmadapter, + &pmpriv->mgmt_ie[index], ie_data, + sizeof(custom_ie)); + } + + misc->param.cust_ie.len += + pmpriv->mgmt_ie[index].ie_length + + MLAN_CUSTOM_IE_HDR_SIZE; + pioctl_req->action = MLAN_ACT_SET; + cmd_action = HostCmd_ACT_GEN_SET; + } + } + } + + /* Send command to firmware */ + if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) { + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_MGMT_IE_LIST, + cmd_action, + 0, + (send_ioctl) ? (t_void *) pioctl_req : + MNULL, &misc->param.cust_ie); + } #ifdef UAP_SUPPORT - else if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) { - ret = wlan_prepare_cmd(pmpriv, - HOST_CMD_APCMD_SYS_CONFIGURE, - cmd_action, - 0, - (send_ioctl) ? (t_void *) pioctl_req : MNULL, - (send_ioctl) ? MNULL : &misc->param.cust_ie); - } + else if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) { + ret = wlan_prepare_cmd(pmpriv, + HOST_CMD_APCMD_SYS_CONFIGURE, + cmd_action, + 0, + (send_ioctl) ? (t_void *) pioctl_req : + MNULL, + (send_ioctl) ? MNULL : &misc->param. + cust_ie); + } #endif - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - done: - LEAVE(); - return ret; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; +done: + LEAVE(); + return ret; } -/** +/** * @brief Read/write adapter register * * @param pmadapter A pointer to mlan_adapter structure @@ -1234,55 +1377,55 @@ wlan_misc_ioctl_custom_ie_list(IN pmlan_adapter pmadapter, */ mlan_status wlan_reg_mem_ioctl_reg_rw(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_reg_mem *reg_mem = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u16 cmd_action = 0, cmd_no; - - ENTER(); - - reg_mem = (mlan_ds_reg_mem *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) - cmd_action = HostCmd_ACT_GEN_GET; - else - cmd_action = HostCmd_ACT_GEN_SET; - - switch (reg_mem->param.reg_rw.type) { - case MLAN_REG_MAC: - cmd_no = HostCmd_CMD_MAC_REG_ACCESS; - break; - case MLAN_REG_BBP: - cmd_no = HostCmd_CMD_BBP_REG_ACCESS; - break; - case MLAN_REG_RF: - cmd_no = HostCmd_CMD_RF_REG_ACCESS; - break; - case MLAN_REG_CAU: - cmd_no = HostCmd_CMD_CAU_REG_ACCESS; - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, cmd_no, cmd_action, - 0, (t_void *) pioctl_req, - (t_void *) & reg_mem->param.reg_rw); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - exit: - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_reg_mem *reg_mem = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u16 cmd_action = 0, cmd_no; + + ENTER(); + + reg_mem = (mlan_ds_reg_mem *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) + cmd_action = HostCmd_ACT_GEN_GET; + else + cmd_action = HostCmd_ACT_GEN_SET; + + switch (reg_mem->param.reg_rw.type) { + case MLAN_REG_MAC: + cmd_no = HostCmd_CMD_MAC_REG_ACCESS; + break; + case MLAN_REG_BBP: + cmd_no = HostCmd_CMD_BBP_REG_ACCESS; + break; + case MLAN_REG_RF: + cmd_no = HostCmd_CMD_RF_REG_ACCESS; + break; + case MLAN_REG_CAU: + cmd_no = HostCmd_CMD_CAU_REG_ACCESS; + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, cmd_no, cmd_action, + 0, (t_void *) pioctl_req, + (t_void *) & reg_mem->param.reg_rw); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +exit: + LEAVE(); + return ret; } -/** - * @brief Read the EEPROM contents of the card +/** + * @brief Read the EEPROM contents of the card * * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer @@ -1291,33 +1434,33 @@ wlan_reg_mem_ioctl_reg_rw(IN pmlan_adapter pmadapter, */ mlan_status wlan_reg_mem_ioctl_read_eeprom(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_reg_mem *reg_mem = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u16 cmd_action = 0; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_reg_mem *reg_mem = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u16 cmd_action = 0; - ENTER(); + ENTER(); - reg_mem = (mlan_ds_reg_mem *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) - cmd_action = HostCmd_ACT_GEN_GET; + reg_mem = (mlan_ds_reg_mem *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) + cmd_action = HostCmd_ACT_GEN_GET; - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_EEPROM_ACCESS, - cmd_action, 0, (t_void *) pioctl_req, - (t_void *) & reg_mem->param.rd_eeprom); + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_EEPROM_ACCESS, + cmd_action, 0, (t_void *) pioctl_req, + (t_void *) & reg_mem->param.rd_eeprom); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief Read/write memory of device * * @param pmadapter A pointer to mlan_adapter structure @@ -1327,38 +1470,38 @@ wlan_reg_mem_ioctl_read_eeprom(IN pmlan_adapter pmadapter, */ mlan_status wlan_reg_mem_ioctl_mem_rw(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_reg_mem *reg_mem = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u16 cmd_action = 0; - - ENTER(); - - reg_mem = (mlan_ds_reg_mem *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) - cmd_action = HostCmd_ACT_GEN_GET; - else - cmd_action = HostCmd_ACT_GEN_SET; - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_MEM_ACCESS, - cmd_action, 0, - (t_void *) pioctl_req, - (t_void *) & reg_mem->param.mem_rw); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_reg_mem *reg_mem = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u16 cmd_action = 0; + + ENTER(); + + reg_mem = (mlan_ds_reg_mem *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) + cmd_action = HostCmd_ACT_GEN_GET; + else + cmd_action = HostCmd_ACT_GEN_SET; + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_MEM_ACCESS, + cmd_action, 0, + (t_void *) pioctl_req, + (t_void *) & reg_mem->param.mem_rw); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } /** * @brief This function will check if station list is empty - * + * * @param priv A pointer to mlan_private * * @return MFALSE/MTRUE @@ -1366,22 +1509,22 @@ wlan_reg_mem_ioctl_mem_rw(IN pmlan_adapter pmadapter, t_u8 wlan_is_station_list_empty(mlan_private * priv) { - ENTER(); - if (!(util_peek_list(priv->adapter->pmoal_handle, - &priv->sta_list, - priv->adapter->callbacks.moal_spin_lock, - priv->adapter->callbacks.moal_spin_unlock))) { - LEAVE(); - return MTRUE; - } - LEAVE(); - return MFALSE; + ENTER(); + if (!(util_peek_list(priv->adapter->pmoal_handle, + &priv->sta_list, + priv->adapter->callbacks.moal_spin_lock, + priv->adapter->callbacks.moal_spin_unlock))) { + LEAVE(); + return MTRUE; + } + LEAVE(); + return MFALSE; } /** * @brief This function will return the pointer to station entry in station list * table which matches the give mac address - * + * * @param priv A pointer to mlan_private * @param mac mac address to find in station list table * @@ -1390,39 +1533,40 @@ wlan_is_station_list_empty(mlan_private * priv) sta_node * wlan_get_station_entry(mlan_private * priv, t_u8 * mac) { - sta_node *sta_ptr; - - ENTER(); - - if (!mac) { - LEAVE(); - return MNULL; - } - if (!(sta_ptr = (sta_node *) util_peek_list(priv->adapter->pmoal_handle, - &priv->sta_list, - priv->adapter->callbacks. - moal_spin_lock, - priv->adapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return MNULL; - } - while (sta_ptr != (sta_node *) & priv->sta_list) { - if (!memcmp - (priv->adapter, sta_ptr->mac_addr, mac, MLAN_MAC_ADDR_LENGTH)) { - LEAVE(); - return sta_ptr; - } - sta_ptr = sta_ptr->pnext; - } - LEAVE(); - return MNULL; + sta_node *sta_ptr; + + ENTER(); + + if (!mac) { + LEAVE(); + return MNULL; + } + if (!(sta_ptr = (sta_node *) util_peek_list(priv->adapter->pmoal_handle, + &priv->sta_list, + priv->adapter->callbacks. + moal_spin_lock, + priv->adapter->callbacks. + moal_spin_unlock))) { + LEAVE(); + return MNULL; + } + while (sta_ptr != (sta_node *) & priv->sta_list) { + if (!memcmp + (priv->adapter, sta_ptr->mac_addr, mac, + MLAN_MAC_ADDR_LENGTH)) { + LEAVE(); + return sta_ptr; + } + sta_ptr = sta_ptr->pnext; + } + LEAVE(); + return MNULL; } /** * @brief This function will add a pointer to station entry in station list * table with the give mac address, if it does not exist already - * + * * @param priv A pointer to mlan_private * @param mac mac address to find in station list table * @@ -1431,65 +1575,65 @@ wlan_get_station_entry(mlan_private * priv, t_u8 * mac) sta_node * wlan_add_station_entry(mlan_private * priv, t_u8 * mac) { - sta_node *sta_ptr = MNULL; - mlan_adapter *pmadapter = priv->adapter; - - ENTER(); - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - - sta_ptr = wlan_get_station_entry(priv, mac); - if (sta_ptr) - goto done; - if (priv->adapter->callbacks. - moal_malloc(priv->adapter->pmoal_handle, sizeof(sta_node), MLAN_MEM_DEF, - (t_u8 **) & sta_ptr)) { - PRINTM(MERROR, "Failed to allocate memory for station node\n"); - LEAVE(); - return MNULL; - } - memset(priv->adapter, sta_ptr, 0, sizeof(sta_node)); - memcpy(priv->adapter, sta_ptr->mac_addr, mac, MLAN_MAC_ADDR_LENGTH); - util_enqueue_list_tail(priv->adapter->pmoal_handle, &priv->sta_list, - (pmlan_linked_list) sta_ptr, - priv->adapter->callbacks.moal_spin_lock, - priv->adapter->callbacks.moal_spin_unlock); - done: - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - LEAVE(); - return sta_ptr; + sta_node *sta_ptr = MNULL; + mlan_adapter *pmadapter = priv->adapter; + + ENTER(); + pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + + sta_ptr = wlan_get_station_entry(priv, mac); + if (sta_ptr) + goto done; + if (priv->adapter->callbacks. + moal_malloc(priv->adapter->pmoal_handle, sizeof(sta_node), + MLAN_MEM_DEF, (t_u8 **) & sta_ptr)) { + PRINTM(MERROR, "Failed to allocate memory for station node\n"); + LEAVE(); + return MNULL; + } + memset(priv->adapter, sta_ptr, 0, sizeof(sta_node)); + memcpy(priv->adapter, sta_ptr->mac_addr, mac, MLAN_MAC_ADDR_LENGTH); + util_enqueue_list_tail(priv->adapter->pmoal_handle, &priv->sta_list, + (pmlan_linked_list) sta_ptr, + priv->adapter->callbacks.moal_spin_lock, + priv->adapter->callbacks.moal_spin_unlock); +done: + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + LEAVE(); + return sta_ptr; } /** * @brief This function will delete a station entry from station list - * - * + * + * * @param priv A pointer to mlan_private - * @param mac station's mac address + * @param mac station's mac address * * @return N/A */ t_void wlan_delete_station_entry(mlan_private * priv, t_u8 * mac) { - sta_node *sta_ptr = MNULL; - mlan_adapter *pmadapter = priv->adapter; - ENTER(); - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - if ((sta_ptr = wlan_get_station_entry(priv, mac))) { - util_unlink_list(priv->adapter->pmoal_handle, &priv->sta_list, - (pmlan_linked_list) sta_ptr, - priv->adapter->callbacks.moal_spin_lock, - priv->adapter->callbacks.moal_spin_unlock); - priv->adapter->callbacks.moal_mfree(priv->adapter->pmoal_handle, - (t_u8 *) sta_ptr); - } - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - LEAVE(); - return; + sta_node *sta_ptr = MNULL; + mlan_adapter *pmadapter = priv->adapter; + ENTER(); + pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + if ((sta_ptr = wlan_get_station_entry(priv, mac))) { + util_unlink_list(priv->adapter->pmoal_handle, &priv->sta_list, + (pmlan_linked_list) sta_ptr, + priv->adapter->callbacks.moal_spin_lock, + priv->adapter->callbacks.moal_spin_unlock); + priv->adapter->callbacks.moal_mfree(priv->adapter->pmoal_handle, + (t_u8 *) sta_ptr); + } + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + LEAVE(); + return; } /** @@ -1502,24 +1646,24 @@ wlan_delete_station_entry(mlan_private * priv, t_u8 * mac) t_void wlan_delete_station_list(pmlan_private priv) { - sta_node *sta_ptr; - - ENTER(); - while ((sta_ptr = - (sta_node *) util_dequeue_list(priv->adapter->pmoal_handle, - &priv->sta_list, - priv->adapter->callbacks. - moal_spin_lock, - priv->adapter->callbacks. - moal_spin_unlock))) { - priv->adapter->callbacks.moal_mfree(priv->adapter->pmoal_handle, - (t_u8 *) sta_ptr); - } - LEAVE(); - return; + sta_node *sta_ptr; + + ENTER(); + while ((sta_ptr = + (sta_node *) util_dequeue_list(priv->adapter->pmoal_handle, + &priv->sta_list, + priv->adapter->callbacks. + moal_spin_lock, + priv->adapter->callbacks. + moal_spin_unlock))) { + priv->adapter->callbacks.moal_mfree(priv->adapter->pmoal_handle, + (t_u8 *) sta_ptr); + } + LEAVE(); + return; } -/** +/** * @brief Get extended version information * * @param pmadapter A pointer to mlan_adapter structure @@ -1530,29 +1674,29 @@ wlan_delete_station_list(pmlan_private priv) mlan_status wlan_get_info_ver_ext(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_get_info *pinfo = (mlan_ds_get_info *) pioctl_req->pbuf; - mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_get_info *pinfo = (mlan_ds_get_info *) pioctl_req->pbuf; + mlan_status ret = MLAN_STATUS_SUCCESS; - ENTER(); + ENTER(); - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_VERSION_EXT, - HostCmd_ACT_GEN_GET, - 0, - (t_void *) pioctl_req, - &pinfo->param.ver_ext.version_str_sel); + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_VERSION_EXT, + HostCmd_ACT_GEN_GET, + 0, + (t_void *) pioctl_req, + &pinfo->param.ver_ext.version_str_sel); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } #ifdef DEBUG_LEVEL1 -/** +/** * @brief Set driver debug bit masks in order to enhance performance * * @param pmadapter A pointer to mlan_adapter structure @@ -1563,20 +1707,20 @@ wlan_get_info_ver_ext(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) mlan_status wlan_set_drvdbg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + mlan_status ret = MLAN_STATUS_SUCCESS; - ENTER(); + ENTER(); - /* Set driver debug bit masks */ - mlan_drvdbg = misc->param.drvdbg; + /* Set driver debug bit masks */ + mlan_drvdbg = misc->param.drvdbg; - LEAVE(); - return ret; + LEAVE(); + return ret; } #endif -/** +/** * @brief Rx mgmt frame forward register * * @param pmadapter A pointer to mlan_adapter structure @@ -1587,33 +1731,33 @@ wlan_set_drvdbg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) mlan_status wlan_reg_rx_mgmt_ind(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + mlan_status ret = MLAN_STATUS_SUCCESS; - ENTER(); + ENTER(); - /* Set passthru mask for mgmt frame */ - pmpriv->mgmt_frame_passthru_mask = misc->param.mgmt_subtype_mask; + /* Set passthru mask for mgmt frame */ + pmpriv->mgmt_frame_passthru_mask = misc->param.mgmt_subtype_mask; - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_RX_MGMT_IND, - pioctl_req->action, - 0, - (t_void *) pioctl_req, - &misc->param.mgmt_subtype_mask); + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_RX_MGMT_IND, + pioctl_req->action, + 0, + (t_void *) pioctl_req, + &misc->param.mgmt_subtype_mask); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } /** * @brief This function processes the 802.11 mgmt Frame - * + * * @param priv A pointer to mlan_private * @param payload A pointer to the received buffer * @param payload_len Length of the received buffer @@ -1622,79 +1766,81 @@ wlan_reg_rx_mgmt_ind(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ mlan_status wlan_process_802dot11_mgmt_pkt(IN mlan_private * priv, - IN t_u8 * payload, IN t_u32 payload_len) + IN t_u8 * payload, IN t_u32 payload_len) { - pmlan_adapter pmadapter = priv->adapter; - pmlan_callbacks pcb = &pmadapter->callbacks; - mlan_status ret = MLAN_STATUS_SUCCESS; - wlan_802_11_header *pieee_pkt_hdr = MNULL; - t_u16 sub_type = 0; - t_u8 *event_buf = MNULL; - mlan_event *pevent = MNULL; - t_u8 unicast = 0; - - ENTER(); - if (payload_len > (MAX_EVENT_SIZE - sizeof(mlan_event))) { - PRINTM(MERROR, "Dropping large mgmt frame,len =%d\n", payload_len); - LEAVE(); - return ret; - } - /* Check packet type-subtype and compare with mgmt_passthru_mask If event - is needed to host, just eventify it */ - pieee_pkt_hdr = (wlan_802_11_header *) payload; - sub_type = IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE(pieee_pkt_hdr->frm_ctl); - if (((1 << sub_type) & priv->mgmt_frame_passthru_mask) == 0) { - PRINTM(MINFO, "Dropping mgmt frame for subtype %d.\n", sub_type); - LEAVE(); - return ret; - } - switch (sub_type) { - case SUBTYPE_ASSOC_REQUEST: - case SUBTYPE_REASSOC_REQUEST: - case SUBTYPE_DISASSOC: - case SUBTYPE_DEAUTH: - case SUBTYPE_ACTION: - case SUBTYPE_AUTH: - case SUBTYPE_PROBE_RESP: - unicast = MTRUE; - break; - default: - break; - } - if (unicast == MTRUE) { - if (memcmp - (pmadapter, pieee_pkt_hdr->addr1, priv->curr_addr, - MLAN_MAC_ADDR_LENGTH)) { - PRINTM(MINFO, - "Dropping mgmt frame for others: type=%d " MACSTR "\n", - sub_type, MAC2STR(pieee_pkt_hdr->addr1)); - LEAVE(); - return ret; - } - } - /* Allocate memory for event buffer */ - ret = - pcb->moal_malloc(pmadapter->pmoal_handle, MAX_EVENT_SIZE, MLAN_MEM_DEF, - &event_buf); - if ((ret != MLAN_STATUS_SUCCESS) || !event_buf) { - PRINTM(MERROR, "Could not allocate buffer for event buf\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - pevent = (pmlan_event) event_buf; - pevent->bss_index = priv->bss_index; - pevent->event_id = MLAN_EVENT_ID_DRV_MGMT_FRAME; - pevent->event_len = payload_len + sizeof(pevent->event_id); - memcpy(pmadapter, (t_u8 *) pevent->event_buf, - (t_u8 *) & pevent->event_id, sizeof(pevent->event_id)); - memcpy(pmadapter, (t_u8 *) (pevent->event_buf + sizeof(pevent->event_id)), - payload, payload_len); - wlan_recv_event(priv, MLAN_EVENT_ID_DRV_MGMT_FRAME, pevent); - - if (event_buf) - pcb->moal_mfree(pmadapter->pmoal_handle, event_buf); - LEAVE(); - return MLAN_STATUS_SUCCESS; + pmlan_adapter pmadapter = priv->adapter; + pmlan_callbacks pcb = &pmadapter->callbacks; + mlan_status ret = MLAN_STATUS_SUCCESS; + wlan_802_11_header *pieee_pkt_hdr = MNULL; + t_u16 sub_type = 0; + t_u8 *event_buf = MNULL; + mlan_event *pevent = MNULL; + t_u8 unicast = 0; + + ENTER(); + if (payload_len > (MAX_EVENT_SIZE - sizeof(mlan_event))) { + PRINTM(MERROR, "Dropping large mgmt frame,len =%d\n", + payload_len); + LEAVE(); + return ret; + } + /* Check packet type-subtype and compare with mgmt_passthru_mask If + event is needed to host, just eventify it */ + pieee_pkt_hdr = (wlan_802_11_header *) payload; + sub_type = IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE(pieee_pkt_hdr->frm_ctl); + if (((1 << sub_type) & priv->mgmt_frame_passthru_mask) == 0) { + PRINTM(MINFO, "Dropping mgmt frame for subtype %d.\n", + sub_type); + LEAVE(); + return ret; + } + switch (sub_type) { + case SUBTYPE_ASSOC_REQUEST: + case SUBTYPE_REASSOC_REQUEST: + case SUBTYPE_DISASSOC: + case SUBTYPE_DEAUTH: + case SUBTYPE_ACTION: + case SUBTYPE_AUTH: + case SUBTYPE_PROBE_RESP: + unicast = MTRUE; + break; + default: + break; + } + if (unicast == MTRUE) { + if (memcmp + (pmadapter, pieee_pkt_hdr->addr1, priv->curr_addr, + MLAN_MAC_ADDR_LENGTH)) { + PRINTM(MINFO, + "Dropping mgmt frame for others: type=%d " MACSTR + "\n", sub_type, MAC2STR(pieee_pkt_hdr->addr1)); + LEAVE(); + return ret; + } + } + /* Allocate memory for event buffer */ + ret = pcb->moal_malloc(pmadapter->pmoal_handle, MAX_EVENT_SIZE, + MLAN_MEM_DEF, &event_buf); + if ((ret != MLAN_STATUS_SUCCESS) || !event_buf) { + PRINTM(MERROR, "Could not allocate buffer for event buf\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + pevent = (pmlan_event) event_buf; + pevent->bss_index = priv->bss_index; + pevent->event_id = MLAN_EVENT_ID_DRV_MGMT_FRAME; + pevent->event_len = payload_len + sizeof(pevent->event_id); + memcpy(pmadapter, (t_u8 *) pevent->event_buf, + (t_u8 *) & pevent->event_id, sizeof(pevent->event_id)); + memcpy(pmadapter, + (t_u8 *) (pevent->event_buf + sizeof(pevent->event_id)), payload, + payload_len); + wlan_recv_event(priv, MLAN_EVENT_ID_DRV_MGMT_FRAME, pevent); + + if (event_buf) + pcb->moal_mfree(pmadapter->pmoal_handle, event_buf); + LEAVE(); + return MLAN_STATUS_SUCCESS; } #ifdef STA_SUPPORT @@ -1708,26 +1854,26 @@ wlan_process_802dot11_mgmt_pkt(IN mlan_private * priv, */ mlan_status wlan_misc_ext_capa_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - if (MLAN_ACT_GET == pioctl_req->action) - memcpy(pmpriv->adapter, &misc->param.ext_cap, &pmpriv->ext_cap, - sizeof(misc->param.ext_cap)); - else if (MLAN_ACT_SET == pioctl_req->action) { - memcpy(pmpriv->adapter, &pmpriv->ext_cap, &misc->param.ext_cap, - sizeof(misc->param.ext_cap)); - if (pmpriv->config_bands & BAND_AAC) - SET_EXTCAP_OPERMODENTF(pmpriv->ext_cap); - } - - LEAVE(); - return ret; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + if (MLAN_ACT_GET == pioctl_req->action) + memcpy(pmpriv->adapter, &misc->param.ext_cap, &pmpriv->ext_cap, + sizeof(misc->param.ext_cap)); + else if (MLAN_ACT_SET == pioctl_req->action) { + memcpy(pmpriv->adapter, &pmpriv->ext_cap, &misc->param.ext_cap, + sizeof(misc->param.ext_cap)); + if (pmpriv->config_bands & BAND_AAC) + SET_EXTCAP_OPERMODENTF(pmpriv->ext_cap); + } + + LEAVE(); + return ret; } /** @@ -1740,19 +1886,19 @@ wlan_misc_ext_capa_cfg(IN pmlan_adapter pmadapter, t_u32 wlan_is_ext_capa_support(mlan_private * pmpriv) { - ENTER(); - - /* So far there are only three bits are meaningful */ - if (ISSUPP_EXTCAP_TDLS(pmpriv->ext_cap) - || ISSUPP_EXTCAP_INTERWORKING(pmpriv->ext_cap) - || ISSUPP_EXTCAP_OPERMODENTF(pmpriv->ext_cap) - ) { - LEAVE(); - return MTRUE; - } else { - LEAVE(); - return MFALSE; - } + ENTER(); + + /* So far there are only three bits are meaningful */ + if (ISSUPP_EXTCAP_TDLS(pmpriv->ext_cap) + || ISSUPP_EXTCAP_INTERWORKING(pmpriv->ext_cap) + || ISSUPP_EXTCAP_OPERMODENTF(pmpriv->ext_cap) + ) { + LEAVE(); + return MTRUE; + } else { + LEAVE(); + return MFALSE; + } } #endif @@ -1768,19 +1914,19 @@ wlan_is_ext_capa_support(mlan_private * pmpriv) void wlan_add_ext_capa_info_ie(IN mlan_private * pmpriv, OUT t_u8 ** pptlv_out) { - MrvlIETypes_ExtCap_t *pext_cap = MNULL; + MrvlIETypes_ExtCap_t *pext_cap = MNULL; - ENTER(); + ENTER(); - pext_cap = (MrvlIETypes_ExtCap_t *) * pptlv_out; - memset(pmpriv->adapter, pext_cap, 0, sizeof(MrvlIETypes_ExtCap_t)); - pext_cap->header.type = wlan_cpu_to_le16(EXT_CAPABILITY); - pext_cap->header.len = wlan_cpu_to_le16(sizeof(ExtCap_t)); - memcpy(pmpriv->adapter, &pext_cap->ext_cap, &pmpriv->ext_cap, - sizeof(pmpriv->ext_cap)); - *pptlv_out += sizeof(MrvlIETypes_ExtCap_t); + pext_cap = (MrvlIETypes_ExtCap_t *) * pptlv_out; + memset(pmpriv->adapter, pext_cap, 0, sizeof(MrvlIETypes_ExtCap_t)); + pext_cap->header.type = wlan_cpu_to_le16(EXT_CAPABILITY); + pext_cap->header.len = wlan_cpu_to_le16(sizeof(ExtCap_t)); + memcpy(pmpriv->adapter, &pext_cap->ext_cap, &pmpriv->ext_cap, + sizeof(pmpriv->ext_cap)); + *pptlv_out += sizeof(MrvlIETypes_ExtCap_t); - LEAVE(); + LEAVE(); } #endif @@ -1794,32 +1940,33 @@ wlan_add_ext_capa_info_ie(IN mlan_private * pmpriv, OUT t_u8 ** pptlv_out) */ mlan_status wlan_misc_otp_user_data(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - mlan_status ret = MLAN_STATUS_FAILURE; - - ENTER(); - - if (misc->param.otp_user_data.user_data_length > MAX_OTP_USER_DATA_LEN) { - PRINTM(MERROR, "Invalid OTP user data length\n"); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return ret; - } - - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_OTP_READ_USER_DATA, - HostCmd_ACT_GEN_GET, - 0, - (t_void *) pioctl_req, &misc->param.otp_user_data); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + mlan_status ret = MLAN_STATUS_FAILURE; + + ENTER(); + + if (misc->param.otp_user_data.user_data_length > MAX_OTP_USER_DATA_LEN) { + PRINTM(MERROR, "Invalid OTP user data length\n"); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return ret; + } + + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_OTP_READ_USER_DATA, + HostCmd_ACT_GEN_GET, + 0, + (t_void *) pioctl_req, + &misc->param.otp_user_data); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } /** @@ -1834,57 +1981,58 @@ wlan_misc_otp_user_data(IN pmlan_adapter pmadapter, t_u8 wlan_is_wmm_ie_present(pmlan_adapter pmadapter, t_u8 * pbuf, t_u16 buf_len) { - t_u16 bytes_left = buf_len; - IEEEtypes_ElementId_e element_id; - t_u8 *pcurrent_ptr = pbuf; - t_u8 element_len; - t_u16 total_ie_len; - IEEEtypes_VendorSpecific_t *pvendor_ie; - const t_u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 }; - t_u8 find_wmm_ie = MFALSE; - - ENTER(); - - /* Process variable IE */ - while (bytes_left >= 2) { - element_id = (IEEEtypes_ElementId_e) (*((t_u8 *) pcurrent_ptr)); - element_len = *((t_u8 *) pcurrent_ptr + 1); - total_ie_len = element_len + sizeof(IEEEtypes_Header_t); - - if (bytes_left < total_ie_len) { - PRINTM(MERROR, "InterpretIE: Error in processing IE, " - "bytes left < IE length\n"); - bytes_left = 0; - continue; - } - switch (element_id) { - case VENDOR_SPECIFIC_221: - pvendor_ie = (IEEEtypes_VendorSpecific_t *) pcurrent_ptr; - if (!memcmp - (pmadapter, pvendor_ie->vend_hdr.oui, wmm_oui, - sizeof(wmm_oui))) { - find_wmm_ie = MTRUE; - PRINTM(MINFO, "find WMM IE\n"); - } - break; - default: - break; - } - pcurrent_ptr += element_len + 2; - /* Need to account for IE ID and IE Len */ - bytes_left -= (element_len + 2); - if (find_wmm_ie) - break; - } - - LEAVE(); - return find_wmm_ie; + t_u16 bytes_left = buf_len; + IEEEtypes_ElementId_e element_id; + t_u8 *pcurrent_ptr = pbuf; + t_u8 element_len; + t_u16 total_ie_len; + IEEEtypes_VendorSpecific_t *pvendor_ie; + const t_u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 }; + t_u8 find_wmm_ie = MFALSE; + + ENTER(); + + /* Process variable IE */ + while (bytes_left >= 2) { + element_id = (IEEEtypes_ElementId_e) (*((t_u8 *) pcurrent_ptr)); + element_len = *((t_u8 *) pcurrent_ptr + 1); + total_ie_len = element_len + sizeof(IEEEtypes_Header_t); + + if (bytes_left < total_ie_len) { + PRINTM(MERROR, "InterpretIE: Error in processing IE, " + "bytes left < IE length\n"); + bytes_left = 0; + continue; + } + switch (element_id) { + case VENDOR_SPECIFIC_221: + pvendor_ie = + (IEEEtypes_VendorSpecific_t *) pcurrent_ptr; + if (!memcmp + (pmadapter, pvendor_ie->vend_hdr.oui, wmm_oui, + sizeof(wmm_oui))) { + find_wmm_ie = MTRUE; + PRINTM(MINFO, "find WMM IE\n"); + } + break; + default: + break; + } + pcurrent_ptr += element_len + 2; + /* Need to account for IE ID and IE Len */ + bytes_left -= (element_len + 2); + if (find_wmm_ie) + break; + } + + LEAVE(); + return find_wmm_ie; } /** * @brief This function will search for the specific ie - * - * + * + * * @param priv A pointer to mlan_private * @param ie_buf A pointer to ie_buf * @param ie_len total ie length @@ -1894,41 +2042,41 @@ wlan_is_wmm_ie_present(pmlan_adapter pmadapter, t_u8 * pbuf, t_u16 buf_len) */ t_u8 * wlan_get_specific_ie(pmlan_private priv, t_u8 * ie_buf, t_u8 ie_len, - IEEEtypes_ElementId_e id) + IEEEtypes_ElementId_e id) { - t_u32 bytes_left = ie_len; - t_u8 *pcurrent_ptr = ie_buf; - t_u16 total_ie_len; - t_u8 *ie_ptr = MNULL; - IEEEtypes_ElementId_e element_id; - t_u8 element_len; - - ENTER(); - - DBG_HEXDUMP(MCMD_D, "ie", ie_buf, ie_len); - while (bytes_left >= 2) { - element_id = (IEEEtypes_ElementId_e) (*((t_u8 *) pcurrent_ptr)); - element_len = *((t_u8 *) pcurrent_ptr + 1); - total_ie_len = element_len + sizeof(IEEEtypes_Header_t); - if (bytes_left < total_ie_len) { - PRINTM(MERROR, "InterpretIE: Error in processing IE, " - "bytes left < IE length\n"); - break; - } - if (element_id == id) { - PRINTM(MCMND, "Find IE: id=%d\n", id); - DBG_HEXDUMP(MCMND, "IE", pcurrent_ptr, total_ie_len); - ie_ptr = pcurrent_ptr; - break; - } - pcurrent_ptr += element_len + 2; - /* Need to account for IE ID and IE Len */ - bytes_left -= (element_len + 2); - } - - LEAVE(); - - return ie_ptr; + t_u32 bytes_left = ie_len; + t_u8 *pcurrent_ptr = ie_buf; + t_u16 total_ie_len; + t_u8 *ie_ptr = MNULL; + IEEEtypes_ElementId_e element_id; + t_u8 element_len; + + ENTER(); + + DBG_HEXDUMP(MCMD_D, "ie", ie_buf, ie_len); + while (bytes_left >= 2) { + element_id = (IEEEtypes_ElementId_e) (*((t_u8 *) pcurrent_ptr)); + element_len = *((t_u8 *) pcurrent_ptr + 1); + total_ie_len = element_len + sizeof(IEEEtypes_Header_t); + if (bytes_left < total_ie_len) { + PRINTM(MERROR, "InterpretIE: Error in processing IE, " + "bytes left < IE length\n"); + break; + } + if (element_id == id) { + PRINTM(MCMND, "Find IE: id=%d\n", id); + DBG_HEXDUMP(MCMND, "IE", pcurrent_ptr, total_ie_len); + ie_ptr = pcurrent_ptr; + break; + } + pcurrent_ptr += element_len + 2; + /* Need to account for IE ID and IE Len */ + bytes_left -= (element_len + 2); + } + + LEAVE(); + + return ie_ptr; } /** @@ -1942,30 +2090,32 @@ wlan_get_specific_ie(pmlan_private priv, t_u8 * ie_buf, t_u8 ie_len, mlan_status wlan_get_pm_info(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_pm_cfg *pm_cfg = MNULL; - pmlan_callbacks pcb = &pmadapter->callbacks; - - ENTER(); - - pm_cfg = (mlan_ds_pm_cfg *) pioctl_req->pbuf; - pm_cfg->param.ps_info.is_suspend_allowed = MTRUE; - if (util_peek_list(pmadapter->pmoal_handle, &pmadapter->cmd_pending_q, - pcb->moal_spin_lock, pcb->moal_spin_unlock) - || pmadapter->curr_cmd || !wlan_bypass_tx_list_empty(pmadapter) - || !wlan_wmm_lists_empty(pmadapter) - || pmadapter->sdio_ireg) { - pm_cfg->param.ps_info.is_suspend_allowed = MFALSE; - PRINTM(MIOCTL, - "PM: cmd_pending_q=%p,curr_cmd=%p,wmm_list_empty=%d, by_pass=%d sdio_ireg=0x%x\n", - util_peek_list(pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, pcb->moal_spin_lock, - pcb->moal_spin_unlock), pmadapter->curr_cmd, - wlan_wmm_lists_empty(pmadapter), - wlan_bypass_tx_list_empty(pmadapter), pmadapter->sdio_ireg); - } - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_pm_cfg *pm_cfg = MNULL; + pmlan_callbacks pcb = &pmadapter->callbacks; + + ENTER(); + + pm_cfg = (mlan_ds_pm_cfg *) pioctl_req->pbuf; + pm_cfg->param.ps_info.is_suspend_allowed = MTRUE; + if (util_peek_list(pmadapter->pmoal_handle, &pmadapter->cmd_pending_q, + pcb->moal_spin_lock, pcb->moal_spin_unlock) + || pmadapter->curr_cmd || !wlan_bypass_tx_list_empty(pmadapter) + || !wlan_wmm_lists_empty(pmadapter) + || pmadapter->sdio_ireg) { + pm_cfg->param.ps_info.is_suspend_allowed = MFALSE; + PRINTM(MIOCTL, + "PM: cmd_pending_q=%p,curr_cmd=%p,wmm_list_empty=%d, by_pass=%d sdio_ireg=0x%x\n", + util_peek_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + pcb->moal_spin_lock, + pcb->moal_spin_unlock), + pmadapter->curr_cmd, wlan_wmm_lists_empty(pmadapter), + wlan_bypass_tx_list_empty(pmadapter), + pmadapter->sdio_ireg); + } + LEAVE(); + return ret; } /** @@ -1978,32 +2128,33 @@ wlan_get_pm_info(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ mlan_status wlan_get_hs_wakeup_reason(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - pmlan_ds_pm_cfg pm_cfg = MNULL; - mlan_status ret = MLAN_STATUS_FAILURE; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + pmlan_ds_pm_cfg pm_cfg = MNULL; + mlan_status ret = MLAN_STATUS_FAILURE; - ENTER(); + ENTER(); - pm_cfg = (mlan_ds_pm_cfg *) pioctl_req->pbuf; + pm_cfg = (mlan_ds_pm_cfg *) pioctl_req->pbuf; - /* Send command to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_HS_WAKEUP_REASON, - HostCmd_ACT_GEN_GET, - 0, - (t_void *) pioctl_req, &pm_cfg->param.wakeup_reason); + /* Send command to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_HS_WAKEUP_REASON, + HostCmd_ACT_GEN_GET, + 0, + (t_void *) pioctl_req, + &pm_cfg->param.wakeup_reason); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief Set/Get radio status * * @param pmadapter A pointer to mlan_adapter structure @@ -2013,47 +2164,47 @@ wlan_get_hs_wakeup_reason(IN pmlan_adapter pmadapter, */ mlan_status wlan_radio_ioctl_radio_ctl(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_radio_cfg *radio_cfg = MNULL; - t_u16 cmd_action = 0; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - - ENTER(); - - radio_cfg = (mlan_ds_radio_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) { - if (pmadapter->radio_on == radio_cfg->param.radio_on_off) { - ret = MLAN_STATUS_SUCCESS; - goto exit; - } else { - if (pmpriv->media_connected == MTRUE) { - ret = MLAN_STATUS_FAILURE; - goto exit; - } - cmd_action = HostCmd_ACT_GEN_SET; - } - } else - cmd_action = HostCmd_ACT_GEN_GET; - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_RADIO_CONTROL, - cmd_action, - 0, - (t_void *) pioctl_req, - &radio_cfg->param.radio_on_off); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - exit: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_radio_cfg *radio_cfg = MNULL; + t_u16 cmd_action = 0; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + + ENTER(); + + radio_cfg = (mlan_ds_radio_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) { + if (pmadapter->radio_on == radio_cfg->param.radio_on_off) { + ret = MLAN_STATUS_SUCCESS; + goto exit; + } else { + if (pmpriv->media_connected == MTRUE) { + ret = MLAN_STATUS_FAILURE; + goto exit; + } + cmd_action = HostCmd_ACT_GEN_SET; + } + } else + cmd_action = HostCmd_ACT_GEN_GET; + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_RADIO_CONTROL, + cmd_action, + 0, + (t_void *) pioctl_req, + &radio_cfg->param.radio_on_off); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +exit: + LEAVE(); + return ret; } -/** +/** * @brief Set/Get antenna configuration * * @param pmadapter A pointer to mlan_adapter structure @@ -2063,55 +2214,57 @@ wlan_radio_ioctl_radio_ctl(IN pmlan_adapter pmadapter, */ mlan_status wlan_radio_ioctl_ant_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_radio_cfg *radio_cfg = MNULL; - t_u16 cmd_action = 0; - mlan_ds_ant_cfg *ant_cfg = MNULL; - - ENTER(); - - radio_cfg = (mlan_ds_radio_cfg *) pioctl_req->pbuf; - ant_cfg = &radio_cfg->param.ant_cfg; - - if (pioctl_req->action == MLAN_ACT_SET) { - /* User input validation */ - if (!ant_cfg->tx_antenna || - ant_cfg->tx_antenna & ~RF_ANTENNA_MASK(pmadapter-> - number_of_antenna)) { - PRINTM(MERROR, "Invalid antenna setting\n"); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - if (ant_cfg->rx_antenna) { - if (ant_cfg-> - rx_antenna & ~RF_ANTENNA_MASK(pmadapter->number_of_antenna)) { - PRINTM(MERROR, "Invalid antenna setting\n"); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - } else - ant_cfg->rx_antenna = ant_cfg->tx_antenna; - cmd_action = HostCmd_ACT_GEN_SET; - } else - cmd_action = HostCmd_ACT_GEN_GET; - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_RF_ANTENNA, - cmd_action, - 0, (t_void *) pioctl_req, (t_void *) ant_cfg); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - exit: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_radio_cfg *radio_cfg = MNULL; + t_u16 cmd_action = 0; + mlan_ds_ant_cfg *ant_cfg = MNULL; + + ENTER(); + + radio_cfg = (mlan_ds_radio_cfg *) pioctl_req->pbuf; + ant_cfg = &radio_cfg->param.ant_cfg; + + if (pioctl_req->action == MLAN_ACT_SET) { + /* User input validation */ + if (!ant_cfg->tx_antenna || + ant_cfg->tx_antenna & ~RF_ANTENNA_MASK(pmadapter-> + number_of_antenna)) { + PRINTM(MERROR, "Invalid antenna setting\n"); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + if (ant_cfg->rx_antenna) { + if (ant_cfg-> + rx_antenna & ~RF_ANTENNA_MASK(pmadapter-> + number_of_antenna)) { + PRINTM(MERROR, "Invalid antenna setting\n"); + pioctl_req->status_code = + MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + } else + ant_cfg->rx_antenna = ant_cfg->tx_antenna; + cmd_action = HostCmd_ACT_GEN_SET; + } else + cmd_action = HostCmd_ACT_GEN_GET; + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_RF_ANTENNA, + cmd_action, + 0, (t_void *) pioctl_req, (t_void *) ant_cfg); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +exit: + LEAVE(); + return ret; } /** @@ -2124,23 +2277,23 @@ wlan_radio_ioctl_ant_cfg(IN pmlan_adapter pmadapter, */ static mlan_status wlan_rate_ioctl_get_rate_bitmap(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - ENTER(); + ENTER(); - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_TX_RATE_CFG, - HostCmd_ACT_GEN_GET, - 0, (t_void *) pioctl_req, MNULL); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_TX_RATE_CFG, + HostCmd_ACT_GEN_GET, + 0, (t_void *) pioctl_req, MNULL); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } /** @@ -2153,45 +2306,46 @@ wlan_rate_ioctl_get_rate_bitmap(IN pmlan_adapter pmadapter, */ static mlan_status wlan_rate_ioctl_set_rate_bitmap(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_ds_rate *ds_rate = MNULL; - mlan_status ret = MLAN_STATUS_FAILURE; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - t_u16 *bitmap_rates = MNULL; - - ENTER(); - - ds_rate = (mlan_ds_rate *) pioctl_req->pbuf; - bitmap_rates = ds_rate->param.rate_cfg.bitmap_rates; - - PRINTM(MINFO, "RateBitmap=%04x%04x%04x%04x%04x%04x%04x%04x" - "%04x%04x%04x%04x%04x%04x%04x%04x%04x%04x, " - "IsRateAuto=%d, DataRate=%d\n", - bitmap_rates[17], bitmap_rates[16], - bitmap_rates[15], bitmap_rates[14], - bitmap_rates[13], bitmap_rates[12], - bitmap_rates[11], bitmap_rates[10], - bitmap_rates[9], bitmap_rates[8], - bitmap_rates[7], bitmap_rates[6], - bitmap_rates[5], bitmap_rates[4], - bitmap_rates[3], bitmap_rates[2], - bitmap_rates[1], bitmap_rates[0], - pmpriv->is_data_rate_auto, pmpriv->data_rate); - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_TX_RATE_CFG, - HostCmd_ACT_GEN_SET, - 0, (t_void *) pioctl_req, (t_void *) bitmap_rates); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_ds_rate *ds_rate = MNULL; + mlan_status ret = MLAN_STATUS_FAILURE; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + t_u16 *bitmap_rates = MNULL; + + ENTER(); + + ds_rate = (mlan_ds_rate *) pioctl_req->pbuf; + bitmap_rates = ds_rate->param.rate_cfg.bitmap_rates; + + PRINTM(MINFO, "RateBitmap=%04x%04x%04x%04x%04x%04x%04x%04x" + "%04x%04x%04x%04x%04x%04x%04x%04x%04x%04x, " + "IsRateAuto=%d, DataRate=%d\n", + bitmap_rates[17], bitmap_rates[16], + bitmap_rates[15], bitmap_rates[14], + bitmap_rates[13], bitmap_rates[12], + bitmap_rates[11], bitmap_rates[10], + bitmap_rates[9], bitmap_rates[8], + bitmap_rates[7], bitmap_rates[6], + bitmap_rates[5], bitmap_rates[4], + bitmap_rates[3], bitmap_rates[2], + bitmap_rates[1], bitmap_rates[0], + pmpriv->is_data_rate_auto, pmpriv->data_rate); + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_TX_RATE_CFG, + HostCmd_ACT_GEN_SET, + 0, + (t_void *) pioctl_req, (t_void *) bitmap_rates); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } -/** +/** * @brief Get rate value * * @param pmadapter A pointer to mlan_adapter structure @@ -2201,58 +2355,59 @@ wlan_rate_ioctl_set_rate_bitmap(IN pmlan_adapter pmadapter, */ static mlan_status wlan_rate_ioctl_get_rate_value(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_ds_rate *rate = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - - ENTER(); - - rate = (mlan_ds_rate *) pioctl_req->pbuf; - rate->param.rate_cfg.is_rate_auto = pmpriv->is_data_rate_auto; - pioctl_req->data_read_written = - sizeof(mlan_rate_cfg_t) + MLAN_SUB_COMMAND_SIZE; - - /* If not connected, set rate to the lowest in each band */ - if (pmpriv->media_connected != MTRUE) { - if (pmpriv->config_bands & (BAND_B | BAND_G)) { - /* Return the lowest supported rate for BG band */ - rate->param.rate_cfg.rate = SupportedRates_BG[0] & 0x7f; - } else if (pmpriv->config_bands & (BAND_A | BAND_B)) { - /* Return the lowest supported rate for A band */ - rate->param.rate_cfg.rate = SupportedRates_BG[0] & 0x7f; - } else if (pmpriv->config_bands & BAND_A) { - /* Return the lowest supported rate for A band */ - rate->param.rate_cfg.rate = SupportedRates_A[0] & 0x7f; - } else if (pmpriv->config_bands & BAND_G) { - /* Return the lowest supported rate for G band */ - rate->param.rate_cfg.rate = SupportedRates_G[0] & 0x7f; - } else if (pmpriv->config_bands & BAND_B) { - /* Return the lowest supported rate for B band */ - rate->param.rate_cfg.rate = SupportedRates_B[0] & 0x7f; - } else if (pmpriv->config_bands & BAND_GN) { - /* Return the lowest supported rate for N band */ - rate->param.rate_cfg.rate = SupportedRates_N[0] & 0x7f; - } else { - PRINTM(MMSG, "Invalid Band 0x%x\n", pmpriv->config_bands); - } - - } else { - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_TX_RATE_QUERY, - HostCmd_ACT_GEN_GET, - 0, (t_void *) pioctl_req, MNULL); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - } - - LEAVE(); - return ret; + mlan_ds_rate *rate = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + + ENTER(); + + rate = (mlan_ds_rate *) pioctl_req->pbuf; + rate->param.rate_cfg.is_rate_auto = pmpriv->is_data_rate_auto; + pioctl_req->data_read_written = + sizeof(mlan_rate_cfg_t) + MLAN_SUB_COMMAND_SIZE; + + /* If not connected, set rate to the lowest in each band */ + if (pmpriv->media_connected != MTRUE) { + if (pmpriv->config_bands & (BAND_B | BAND_G)) { + /* Return the lowest supported rate for BG band */ + rate->param.rate_cfg.rate = SupportedRates_BG[0] & 0x7f; + } else if (pmpriv->config_bands & (BAND_A | BAND_B)) { + /* Return the lowest supported rate for A band */ + rate->param.rate_cfg.rate = SupportedRates_BG[0] & 0x7f; + } else if (pmpriv->config_bands & BAND_A) { + /* Return the lowest supported rate for A band */ + rate->param.rate_cfg.rate = SupportedRates_A[0] & 0x7f; + } else if (pmpriv->config_bands & BAND_G) { + /* Return the lowest supported rate for G band */ + rate->param.rate_cfg.rate = SupportedRates_G[0] & 0x7f; + } else if (pmpriv->config_bands & BAND_B) { + /* Return the lowest supported rate for B band */ + rate->param.rate_cfg.rate = SupportedRates_B[0] & 0x7f; + } else if (pmpriv->config_bands & BAND_GN) { + /* Return the lowest supported rate for N band */ + rate->param.rate_cfg.rate = SupportedRates_N[0] & 0x7f; + } else { + PRINTM(MMSG, "Invalid Band 0x%x\n", + pmpriv->config_bands); + } + + } else { + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_TX_RATE_QUERY, + HostCmd_ACT_GEN_GET, + 0, (t_void *) pioctl_req, MNULL); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + } + + LEAVE(); + return ret; } -/** +/** * @brief Set rate value * * @param pmadapter A pointer to mlan_adapter structure @@ -2262,86 +2417,92 @@ wlan_rate_ioctl_get_rate_value(IN pmlan_adapter pmadapter, */ static mlan_status wlan_rate_ioctl_set_rate_value(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_ds_rate *ds_rate = MNULL; - WLAN_802_11_RATES rates; - t_u8 *rate = MNULL; - int rate_index = 0; - t_u16 bitmap_rates[MAX_BITMAP_RATES_SIZE]; - t_u32 i = 0; - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - - ENTER(); - - ds_rate = (mlan_ds_rate *) pioctl_req->pbuf; - - if (ds_rate->param.rate_cfg.is_rate_auto) { - memset(pmadapter, bitmap_rates, 0, sizeof(bitmap_rates)); - /* Support all HR/DSSS rates */ - bitmap_rates[0] = 0x000F; - /* Support all OFDM rates */ - bitmap_rates[1] = 0x00FF; - /* Rates talbe [0] HR/DSSS,[1] OFDM,[2..9] HT,[10..17] VHT */ - /* Support all HT-MCSs rate */ - for (i = 0; i < NELEMENTS(pmpriv->bitmap_rates) - 3 - 8; i++) - bitmap_rates[i + 2] = 0xFFFF; - bitmap_rates[9] = 0x3FFF; - /* Support all VHT-MCSs rate */ - for (i = 0; i < NELEMENTS(pmpriv->bitmap_rates) - 10; i++) - bitmap_rates[i + 10] = 0x03FF; /* 10 Bits valid */ - } else { - memset(pmadapter, rates, 0, sizeof(rates)); - wlan_get_active_data_rates(pmpriv, pmpriv->bss_mode, - (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) ? - pmpriv->config_bands : pmadapter-> - adhoc_start_band, rates); - rate = rates; - for (i = 0; (rate[i] && i < WLAN_SUPPORTED_RATES); i++) { - PRINTM(MINFO, "Rate=0x%X Wanted=0x%X\n", rate[i], - ds_rate->param.rate_cfg.rate); - if ((rate[i] & 0x7f) == (ds_rate->param.rate_cfg.rate & 0x7f)) - break; - } - if (!rate[i] || (i == WLAN_SUPPORTED_RATES)) { - PRINTM(MERROR, "The fixed data rate 0x%X is out " - "of range\n", ds_rate->param.rate_cfg.rate); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - memset(pmadapter, bitmap_rates, 0, sizeof(bitmap_rates)); - - rate_index = - wlan_data_rate_to_index(pmadapter, ds_rate->param.rate_cfg.rate); - - /* Only allow b/g rates to be set */ - if (rate_index >= MLAN_RATE_INDEX_HRDSSS0 && - rate_index <= MLAN_RATE_INDEX_HRDSSS3) - bitmap_rates[0] = 1 << rate_index; - else { - rate_index -= 1; /* There is a 0x00 in the table */ - if (rate_index >= MLAN_RATE_INDEX_OFDM0 && - rate_index <= MLAN_RATE_INDEX_OFDM7) - bitmap_rates[1] = 1 << (rate_index - MLAN_RATE_INDEX_OFDM0); - } - } - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_TX_RATE_CFG, - HostCmd_ACT_GEN_SET, - 0, (t_void *) pioctl_req, bitmap_rates); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - exit: - LEAVE(); - return ret; + mlan_ds_rate *ds_rate = MNULL; + WLAN_802_11_RATES rates; + t_u8 *rate = MNULL; + int rate_index = 0; + t_u16 bitmap_rates[MAX_BITMAP_RATES_SIZE]; + t_u32 i = 0; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + + ENTER(); + + ds_rate = (mlan_ds_rate *) pioctl_req->pbuf; + + if (ds_rate->param.rate_cfg.is_rate_auto) { + memset(pmadapter, bitmap_rates, 0, sizeof(bitmap_rates)); + /* Support all HR/DSSS rates */ + bitmap_rates[0] = 0x000F; + /* Support all OFDM rates */ + bitmap_rates[1] = 0x00FF; + /* Rates talbe [0] HR/DSSS,[1] OFDM,[2..9] HT,[10..17] VHT */ + /* Support all HT-MCSs rate */ + for (i = 0; i < NELEMENTS(pmpriv->bitmap_rates) - 3 - 8; i++) + bitmap_rates[i + 2] = 0xFFFF; + bitmap_rates[9] = 0x3FFF; + /* Support all VHT-MCSs rate */ + for (i = 0; i < NELEMENTS(pmpriv->bitmap_rates) - 10; i++) + bitmap_rates[i + 10] = 0x03FF; /* 10 Bits valid */ + } else { + memset(pmadapter, rates, 0, sizeof(rates)); + wlan_get_active_data_rates(pmpriv, pmpriv->bss_mode, + (pmpriv->bss_mode == + MLAN_BSS_MODE_INFRA) ? pmpriv-> + config_bands : pmadapter-> + adhoc_start_band, rates); + rate = rates; + for (i = 0; (rate[i] && i < WLAN_SUPPORTED_RATES); i++) { + PRINTM(MINFO, "Rate=0x%X Wanted=0x%X\n", rate[i], + ds_rate->param.rate_cfg.rate); + if ((rate[i] & 0x7f) == + (ds_rate->param.rate_cfg.rate & 0x7f)) + break; + } + if (!rate[i] || (i == WLAN_SUPPORTED_RATES)) { + PRINTM(MERROR, "The fixed data rate 0x%X is out " + "of range\n", ds_rate->param.rate_cfg.rate); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + memset(pmadapter, bitmap_rates, 0, sizeof(bitmap_rates)); + + rate_index = + wlan_data_rate_to_index(pmadapter, + ds_rate->param.rate_cfg.rate); + + /* Only allow b/g rates to be set */ + if (rate_index >= MLAN_RATE_INDEX_HRDSSS0 && + rate_index <= MLAN_RATE_INDEX_HRDSSS3) + bitmap_rates[0] = 1 << rate_index; + else { + rate_index -= 1; /* There is a 0x00 in the table + */ + if (rate_index >= MLAN_RATE_INDEX_OFDM0 && + rate_index <= MLAN_RATE_INDEX_OFDM7) + bitmap_rates[1] = + 1 << (rate_index - + MLAN_RATE_INDEX_OFDM0); + } + } + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_TX_RATE_CFG, + HostCmd_ACT_GEN_SET, + 0, (t_void *) pioctl_req, bitmap_rates); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +exit: + LEAVE(); + return ret; } -/** +/** * @brief Get rate index * * @param pmadapter A pointer to mlan_adapter structure @@ -2351,26 +2512,26 @@ wlan_rate_ioctl_set_rate_value(IN pmlan_adapter pmadapter, */ static mlan_status wlan_rate_ioctl_get_rate_index(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - ENTER(); + ENTER(); - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_TX_RATE_CFG, - HostCmd_ACT_GEN_GET, - 0, (t_void *) pioctl_req, MNULL); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_TX_RATE_CFG, + HostCmd_ACT_GEN_GET, + 0, (t_void *) pioctl_req, MNULL); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief Set rate index * * @param pmadapter A pointer to mlan_adapter structure @@ -2380,118 +2541,125 @@ wlan_rate_ioctl_get_rate_index(IN pmlan_adapter pmadapter, */ static mlan_status wlan_rate_ioctl_set_rate_index(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - t_u32 rate_index; - t_u32 rate_format; - t_u32 nss; - t_u32 i; - mlan_ds_rate *ds_rate = MNULL; - mlan_status ret = MLAN_STATUS_FAILURE; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - t_u16 bitmap_rates[MAX_BITMAP_RATES_SIZE]; - int tx_mcs_supp = GET_TXMCSSUPP(pmadapter->usr_dev_mcs_support); - - ENTER(); - - ds_rate = (mlan_ds_rate *) pioctl_req->pbuf; - rate_format = ds_rate->param.rate_cfg.rate_format; - nss = ds_rate->param.rate_cfg.nss; - rate_index = ds_rate->param.rate_cfg.rate; - - if (ds_rate->param.rate_cfg.is_rate_auto) { - memset(pmadapter, bitmap_rates, 0, sizeof(bitmap_rates)); - /* Rates talbe [0]: HR/DSSS;[1]: OFDM; [2..9] HT; */ - /* Support all HR/DSSS rates */ - bitmap_rates[0] = 0x000F; - /* Support all OFDM rates */ - bitmap_rates[1] = 0x00FF; - /* Support all HT-MCSs rate */ - for (i = 2; i < 9; i++) - bitmap_rates[i] = 0xFFFF; - bitmap_rates[9] = 0x3FFF; - /* [10..17] VHT */ - /* Support all VHT-MCSs rate for NSS 1 and 2 */ - for (i = 10; i < 12; i++) - bitmap_rates[i] = 0x03FF; /* 10 Bits valid */ - /* Set to 0 as default value for all other NSSs */ - for (i = 12; i < NELEMENTS(bitmap_rates); i++) - bitmap_rates[i] = 0x0; - } else { - PRINTM(MINFO, "Rate index is %d\n", rate_index); - if ((rate_format == MLAN_RATE_FORMAT_HT) && - (rate_index > MLAN_RATE_INDEX_MCS7 && - rate_index <= MLAN_RATE_INDEX_MCS15) && (tx_mcs_supp < 2)) { - PRINTM(MERROR, - "HW don't support 2x2, rate_index=%d hw_mcs_supp=0x%x\n", - rate_index, pmadapter->usr_dev_mcs_support); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - memset(pmadapter, bitmap_rates, 0, sizeof(bitmap_rates)); - if (rate_format == MLAN_RATE_FORMAT_LG) { - /* Bitmap of HR/DSSS rates */ - if ((rate_index >= MLAN_RATE_INDEX_HRDSSS0) && - (rate_index <= MLAN_RATE_INDEX_HRDSSS3)) { - bitmap_rates[0] = 1 << rate_index; - ret = MLAN_STATUS_SUCCESS; - /* Bitmap of OFDM rates */ - } else if ((rate_index >= MLAN_RATE_INDEX_OFDM0) && - (rate_index <= MLAN_RATE_INDEX_OFDM7)) { - bitmap_rates[1] = 1 << (rate_index - MLAN_RATE_INDEX_OFDM0); - ret = MLAN_STATUS_SUCCESS; - } - } else if (rate_format == MLAN_RATE_FORMAT_HT) { - if ((rate_index >= MLAN_RATE_INDEX_MCS0) && - (rate_index <= MLAN_RATE_INDEX_MCS32)) { - bitmap_rates[2 + (rate_index / 16)] = 1 << (rate_index % 16); - ret = MLAN_STATUS_SUCCESS; - } - } - if (rate_format == MLAN_RATE_FORMAT_VHT) { - if ((rate_index <= MLAN_RATE_INDEX_MCS9) && - (MLAN_RATE_NSS1 <= nss) && (nss <= MLAN_RATE_NSS2)) { - bitmap_rates[10 + nss - MLAN_RATE_NSS1] = (1 << rate_index); - ret = MLAN_STATUS_SUCCESS; - } - } - - if (ret == MLAN_STATUS_FAILURE) { - PRINTM(MERROR, "Invalid MCS index=%d. \n", rate_index); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - } - - PRINTM(MINFO, "RateBitmap=%04x%04x%04x%04x%04x%04x%04x%04x" - "%04x%04x%04x%04x%04x%04x%04x%04x%04x%04x, " - "IsRateAuto=%d, DataRate=%d\n", - bitmap_rates[17], bitmap_rates[16], - bitmap_rates[15], bitmap_rates[14], - bitmap_rates[13], bitmap_rates[12], - bitmap_rates[11], bitmap_rates[10], - bitmap_rates[9], bitmap_rates[8], - bitmap_rates[7], bitmap_rates[6], - bitmap_rates[5], bitmap_rates[4], - bitmap_rates[3], bitmap_rates[2], - bitmap_rates[1], bitmap_rates[0], - pmpriv->is_data_rate_auto, pmpriv->data_rate); - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_TX_RATE_CFG, - HostCmd_ACT_GEN_SET, - 0, (t_void *) pioctl_req, (t_void *) bitmap_rates); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + t_u32 rate_index; + t_u32 rate_format; + t_u32 nss; + t_u32 i; + mlan_ds_rate *ds_rate = MNULL; + mlan_status ret = MLAN_STATUS_FAILURE; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + t_u16 bitmap_rates[MAX_BITMAP_RATES_SIZE]; + int tx_mcs_supp = GET_TXMCSSUPP(pmadapter->usr_dev_mcs_support); + + ENTER(); + + ds_rate = (mlan_ds_rate *) pioctl_req->pbuf; + rate_format = ds_rate->param.rate_cfg.rate_format; + nss = ds_rate->param.rate_cfg.nss; + rate_index = ds_rate->param.rate_cfg.rate; + + if (ds_rate->param.rate_cfg.is_rate_auto) { + memset(pmadapter, bitmap_rates, 0, sizeof(bitmap_rates)); + /* Rates talbe [0]: HR/DSSS;[1]: OFDM; [2..9] HT; */ + /* Support all HR/DSSS rates */ + bitmap_rates[0] = 0x000F; + /* Support all OFDM rates */ + bitmap_rates[1] = 0x00FF; + /* Support all HT-MCSs rate */ + for (i = 2; i < 9; i++) + bitmap_rates[i] = 0xFFFF; + bitmap_rates[9] = 0x3FFF; + /* [10..17] VHT */ + /* Support all VHT-MCSs rate for NSS 1 and 2 */ + for (i = 10; i < 12; i++) + bitmap_rates[i] = 0x03FF; /* 10 Bits valid */ + /* Set to 0 as default value for all other NSSs */ + for (i = 12; i < NELEMENTS(bitmap_rates); i++) + bitmap_rates[i] = 0x0; + } else { + PRINTM(MINFO, "Rate index is %d\n", rate_index); + if ((rate_format == MLAN_RATE_FORMAT_HT) && + (rate_index > MLAN_RATE_INDEX_MCS7 && + rate_index <= MLAN_RATE_INDEX_MCS15) && + (tx_mcs_supp < 2)) { + PRINTM(MERROR, + "HW don't support 2x2, rate_index=%d hw_mcs_supp=0x%x\n", + rate_index, pmadapter->usr_dev_mcs_support); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + memset(pmadapter, bitmap_rates, 0, sizeof(bitmap_rates)); + if (rate_format == MLAN_RATE_FORMAT_LG) { + /* Bitmap of HR/DSSS rates */ + if ((rate_index >= MLAN_RATE_INDEX_HRDSSS0) && + (rate_index <= MLAN_RATE_INDEX_HRDSSS3)) { + bitmap_rates[0] = 1 << rate_index; + ret = MLAN_STATUS_SUCCESS; + /* Bitmap of OFDM rates */ + } else if ((rate_index >= MLAN_RATE_INDEX_OFDM0) && + (rate_index <= MLAN_RATE_INDEX_OFDM7)) { + bitmap_rates[1] = + 1 << (rate_index - + MLAN_RATE_INDEX_OFDM0); + ret = MLAN_STATUS_SUCCESS; + } + } else if (rate_format == MLAN_RATE_FORMAT_HT) { + if ((rate_index >= MLAN_RATE_INDEX_MCS0) && + (rate_index <= MLAN_RATE_INDEX_MCS32)) { + bitmap_rates[2 + (rate_index / 16)] = + 1 << (rate_index % 16); + ret = MLAN_STATUS_SUCCESS; + } + } + if (rate_format == MLAN_RATE_FORMAT_VHT) { + if ((rate_index <= MLAN_RATE_INDEX_MCS9) && + (MLAN_RATE_NSS1 <= nss) && + (nss <= MLAN_RATE_NSS2)) { + bitmap_rates[10 + nss - MLAN_RATE_NSS1] = + (1 << rate_index); + ret = MLAN_STATUS_SUCCESS; + } + } + + if (ret == MLAN_STATUS_FAILURE) { + PRINTM(MERROR, "Invalid MCS index=%d. \n", rate_index); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + } + + PRINTM(MINFO, "RateBitmap=%04x%04x%04x%04x%04x%04x%04x%04x" + "%04x%04x%04x%04x%04x%04x%04x%04x%04x%04x, " + "IsRateAuto=%d, DataRate=%d\n", + bitmap_rates[17], bitmap_rates[16], + bitmap_rates[15], bitmap_rates[14], + bitmap_rates[13], bitmap_rates[12], + bitmap_rates[11], bitmap_rates[10], + bitmap_rates[9], bitmap_rates[8], + bitmap_rates[7], bitmap_rates[6], + bitmap_rates[5], bitmap_rates[4], + bitmap_rates[3], bitmap_rates[2], + bitmap_rates[1], bitmap_rates[0], + pmpriv->is_data_rate_auto, pmpriv->data_rate); + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_TX_RATE_CFG, + HostCmd_ACT_GEN_SET, + 0, + (t_void *) pioctl_req, (t_void *) bitmap_rates); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } -/** +/** * @brief Rate configuration command handler * * @param pmadapter A pointer to mlan_adapter structure @@ -2502,34 +2670,40 @@ wlan_rate_ioctl_set_rate_index(IN pmlan_adapter pmadapter, mlan_status wlan_rate_ioctl_cfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_ds_rate *rate = MNULL; - mlan_status status = MLAN_STATUS_SUCCESS; - - ENTER(); - - rate = (mlan_ds_rate *) pioctl_req->pbuf; - if (rate->param.rate_cfg.rate_type == MLAN_RATE_BITMAP) { - if (pioctl_req->action == MLAN_ACT_GET) - status = wlan_rate_ioctl_get_rate_bitmap(pmadapter, pioctl_req); - else - status = wlan_rate_ioctl_set_rate_bitmap(pmadapter, pioctl_req); - } else if (rate->param.rate_cfg.rate_type == MLAN_RATE_VALUE) { - if (pioctl_req->action == MLAN_ACT_GET) - status = wlan_rate_ioctl_get_rate_value(pmadapter, pioctl_req); - else - status = wlan_rate_ioctl_set_rate_value(pmadapter, pioctl_req); - } else { - if (pioctl_req->action == MLAN_ACT_GET) - status = wlan_rate_ioctl_get_rate_index(pmadapter, pioctl_req); - else - status = wlan_rate_ioctl_set_rate_index(pmadapter, pioctl_req); - } - - LEAVE(); - return status; + mlan_ds_rate *rate = MNULL; + mlan_status status = MLAN_STATUS_SUCCESS; + + ENTER(); + + rate = (mlan_ds_rate *) pioctl_req->pbuf; + if (rate->param.rate_cfg.rate_type == MLAN_RATE_BITMAP) { + if (pioctl_req->action == MLAN_ACT_GET) + status = wlan_rate_ioctl_get_rate_bitmap(pmadapter, + pioctl_req); + else + status = wlan_rate_ioctl_set_rate_bitmap(pmadapter, + pioctl_req); + } else if (rate->param.rate_cfg.rate_type == MLAN_RATE_VALUE) { + if (pioctl_req->action == MLAN_ACT_GET) + status = wlan_rate_ioctl_get_rate_value(pmadapter, + pioctl_req); + else + status = wlan_rate_ioctl_set_rate_value(pmadapter, + pioctl_req); + } else { + if (pioctl_req->action == MLAN_ACT_GET) + status = wlan_rate_ioctl_get_rate_index(pmadapter, + pioctl_req); + else + status = wlan_rate_ioctl_set_rate_index(pmadapter, + pioctl_req); + } + + LEAVE(); + return status; } -/** +/** * @brief Get data rates * * @param pmadapter A pointer to mlan_adapter structure @@ -2539,33 +2713,33 @@ wlan_rate_ioctl_cfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ mlan_status wlan_rate_ioctl_get_data_rate(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - if (pioctl_req->action != MLAN_ACT_GET) { - ret = MLAN_STATUS_FAILURE; - goto exit; - } - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_TX_RATE_QUERY, - HostCmd_ACT_GEN_GET, - 0, (t_void *) pioctl_req, MNULL); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - exit: - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + if (pioctl_req->action != MLAN_ACT_GET) { + ret = MLAN_STATUS_FAILURE; + goto exit; + } + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_TX_RATE_QUERY, + HostCmd_ACT_GEN_GET, + 0, (t_void *) pioctl_req, MNULL); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +exit: + LEAVE(); + return ret; } #ifdef WIFI_DIRECT_SUPPORT -/** +/** * @brief Set/Get wifi_direct_mode * * @param pmadapter A pointer to mlan_adapter structure @@ -2575,37 +2749,37 @@ wlan_rate_ioctl_get_data_rate(IN pmlan_adapter pmadapter, */ mlan_status wlan_bss_ioctl_wifi_direct_mode(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_bss *bss = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_bss *bss = MNULL; - t_u16 cmd_action = 0; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + t_u16 cmd_action = 0; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - ENTER(); + ENTER(); - bss = (mlan_ds_bss *) pioctl_req->pbuf; + bss = (mlan_ds_bss *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) - cmd_action = HostCmd_ACT_GEN_SET; - else - cmd_action = HostCmd_ACT_GEN_GET; + if (pioctl_req->action == MLAN_ACT_SET) + cmd_action = HostCmd_ACT_GEN_SET; + else + cmd_action = HostCmd_ACT_GEN_GET; - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HOST_CMD_WIFI_DIRECT_MODE_CONFIG, - cmd_action, - 0, (t_void *) pioctl_req, &bss->param.wfd_mode); + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HOST_CMD_WIFI_DIRECT_MODE_CONFIG, + cmd_action, + 0, (t_void *) pioctl_req, &bss->param.wfd_mode); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief Set/Get remain on channel setting * * @param pmadapter A pointer to mlan_adapter structure @@ -2615,34 +2789,34 @@ wlan_bss_ioctl_wifi_direct_mode(IN pmlan_adapter pmadapter, */ mlan_status wlan_radio_ioctl_remain_chan_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_radio_cfg *radio_cfg = MNULL; - t_u16 cmd_action = 0; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - - ENTER(); - - radio_cfg = (mlan_ds_radio_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) - cmd_action = HostCmd_ACT_GEN_SET; - else - cmd_action = HostCmd_ACT_GEN_GET; - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_REMAIN_ON_CHANNEL, - cmd_action, - 0, - (t_void *) pioctl_req, - &radio_cfg->param.remain_chan); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_radio_cfg *radio_cfg = MNULL; + t_u16 cmd_action = 0; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + + ENTER(); + + radio_cfg = (mlan_ds_radio_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) + cmd_action = HostCmd_ACT_GEN_SET; + else + cmd_action = HostCmd_ACT_GEN_GET; + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_REMAIN_ON_CHANNEL, + cmd_action, + 0, + (t_void *) pioctl_req, + &radio_cfg->param.remain_chan); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } #endif @@ -2656,20 +2830,20 @@ wlan_radio_ioctl_remain_chan_cfg(IN pmlan_adapter pmadapter, */ mlan_status wlan_misc_ioctl_txcontrol(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_misc_cfg *misc = MNULL; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_misc_cfg *misc = MNULL; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - ENTER(); + ENTER(); - misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) - pmpriv->pkt_tx_ctrl = misc->param.tx_control; - else - misc->param.tx_control = pmpriv->pkt_tx_ctrl; + misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) + pmpriv->pkt_tx_ctrl = misc->param.tx_control; + else + misc->param.tx_control = pmpriv->pkt_tx_ctrl; - LEAVE(); - return ret; + LEAVE(); + return ret; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_module.c b/drivers/net/wireless/sd8897/mlan/mlan_module.c index cd0bd0c5fb78..7140a29d81c8 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_module.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_module.c @@ -2,7 +2,7 @@ * * @brief This file declares the exported symbols from MLAN. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 diff --git a/drivers/net/wireless/sd8897/mlan/mlan_scan.c b/drivers/net/wireless/sd8897/mlan/mlan_scan.c index 8b9f3bb81235..46218d37e903 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_scan.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_scan.c @@ -5,7 +5,7 @@ * IOCTL handlers as well as command preparation and response routines * for sending scan commands to the firmware. * - * Copyright (C) 2008-2012, Marvell International Ltd. + * Copyright (C) 2008-2012, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -83,9 +83,9 @@ Change log: typedef union { /** Scan configuration (variable length) */ - wlan_scan_cmd_config config; + wlan_scan_cmd_config config; /** Max allocated block */ - t_u8 config_alloc_buf[MAX_SCAN_CFG_ALLOC]; + t_u8 config_alloc_buf[MAX_SCAN_CFG_ALLOC]; } wlan_scan_cmd_config_tlv; /******************************************************** @@ -98,31 +98,31 @@ typedef union /** Cipher suite definition */ enum cipher_suite { - CIPHER_SUITE_WEP40, - CIPHER_SUITE_TKIP, - CIPHER_SUITE_CCMP, - CIPHER_SUITE_WEP104, - CIPHER_SUITE_MAX + CIPHER_SUITE_WEP40, + CIPHER_SUITE_TKIP, + CIPHER_SUITE_CCMP, + CIPHER_SUITE_WEP104, + CIPHER_SUITE_MAX }; static t_u8 wpa_oui[CIPHER_SUITE_MAX][4] = { - {0x00, 0x50, 0xf2, 0x01}, /* WEP40 */ - {0x00, 0x50, 0xf2, 0x02}, /* TKIP */ - {0x00, 0x50, 0xf2, 0x04}, /* AES */ - {0x00, 0x50, 0xf2, 0x05}, /* WEP104 */ + {0x00, 0x50, 0xf2, 0x01}, /* WEP40 */ + {0x00, 0x50, 0xf2, 0x02}, /* TKIP */ + {0x00, 0x50, 0xf2, 0x04}, /* AES */ + {0x00, 0x50, 0xf2, 0x05}, /* WEP104 */ }; static t_u8 rsn_oui[CIPHER_SUITE_MAX][4] = { - {0x00, 0x0f, 0xac, 0x01}, /* WEP40 */ - {0x00, 0x0f, 0xac, 0x02}, /* TKIP */ - {0x00, 0x0f, 0xac, 0x04}, /* AES */ - {0x00, 0x0f, 0xac, 0x05}, /* WEP104 */ + {0x00, 0x0f, 0xac, 0x01}, /* WEP40 */ + {0x00, 0x0f, 0xac, 0x02}, /* TKIP */ + {0x00, 0x0f, 0xac, 0x04}, /* AES */ + {0x00, 0x0f, 0xac, 0x05}, /* WEP104 */ }; /** * @brief This function will parse a given IE for a given OUI * - * Parse a given WPA/RSN IE to find if it has a given oui in PTK, + * Parse a given WPA/RSN IE to find if it has a given oui in PTK, * if no OUI found for PTK it returns 0. * * @param pbss_desc A pointer to current BSS descriptor @@ -131,29 +131,33 @@ static t_u8 rsn_oui[CIPHER_SUITE_MAX][4] = { static t_u8 search_oui_in_ie(mlan_adapter * pmadapter, IEBody * ie_body, t_u8 * oui) { - t_u8 count; - - count = ie_body->PtkCnt[0]; - - ENTER(); - /* There could be multiple OUIs for PTK hence 1) Take the length. 2) Check - all the OUIs for AES. 3) If one of them is AES then pass success. */ - while (count) { - if (!memcmp(pmadapter, ie_body->PtkBody, oui, sizeof(ie_body->PtkBody))) { - LEAVE(); - return MLAN_OUI_PRESENT; - } - - --count; - if (count) { - ie_body = (IEBody *) ((t_u8 *) ie_body + sizeof(ie_body->PtkBody)); - } - } - - PRINTM(MINFO, "The OUI %x:%x:%x:%x is not found in PTK \n", oui[0], oui[1], - oui[2], oui[3]); - LEAVE(); - return MLAN_OUI_NOT_PRESENT; + t_u8 count; + + count = ie_body->PtkCnt[0]; + + ENTER(); + /* There could be multiple OUIs for PTK hence 1) Take the length. 2) + Check all the OUIs for AES. 3) If one of them is AES then pass + success. */ + while (count) { + if (!memcmp + (pmadapter, ie_body->PtkBody, oui, + sizeof(ie_body->PtkBody))) { + LEAVE(); + return MLAN_OUI_PRESENT; + } + + --count; + if (count) { + ie_body = (IEBody *) ((t_u8 *) ie_body + + sizeof(ie_body->PtkBody)); + } + } + + PRINTM(MINFO, "The OUI %x:%x:%x:%x is not found in PTK \n", oui[0], + oui[1], oui[2], oui[3]); + LEAVE(); + return MLAN_OUI_NOT_PRESENT; } /** @@ -167,26 +171,26 @@ search_oui_in_ie(mlan_adapter * pmadapter, IEBody * ie_body, t_u8 * oui) */ static t_u8 is_rsn_oui_present(mlan_adapter * pmadapter, BSSDescriptor_t * pbss_desc, - t_u32 cipher_suite) + t_u32 cipher_suite) { - t_u8 *oui = MNULL; - IEBody *ie_body = MNULL; - t_u8 ret = MLAN_OUI_NOT_PRESENT; - - ENTER(); - if (((pbss_desc->prsn_ie) && - ((*(pbss_desc->prsn_ie)).ieee_hdr.element_id == RSN_IE))) { - ie_body = - (IEBody *) (((t_u8 *) pbss_desc->prsn_ie->data) + - RSN_GTK_OUI_OFFSET); - oui = &rsn_oui[cipher_suite][0]; - if ((ret = search_oui_in_ie(pmadapter, ie_body, oui))) { - LEAVE(); - return ret; - } - } - LEAVE(); - return ret; + t_u8 *oui = MNULL; + IEBody *ie_body = MNULL; + t_u8 ret = MLAN_OUI_NOT_PRESENT; + + ENTER(); + if (((pbss_desc->prsn_ie) && + ((*(pbss_desc->prsn_ie)).ieee_hdr.element_id == RSN_IE))) { + ie_body = + (IEBody *) (((t_u8 *) pbss_desc->prsn_ie->data) + + RSN_GTK_OUI_OFFSET); + oui = &rsn_oui[cipher_suite][0]; + if ((ret = search_oui_in_ie(pmadapter, ie_body, oui))) { + LEAVE(); + return ret; + } + } + LEAVE(); + return ret; } /** @@ -200,49 +204,49 @@ is_rsn_oui_present(mlan_adapter * pmadapter, BSSDescriptor_t * pbss_desc, */ static t_u8 is_wpa_oui_present(mlan_adapter * pmadapter, BSSDescriptor_t * pbss_desc, - t_u32 cipher_suite) + t_u32 cipher_suite) { - t_u8 *oui = MNULL; - IEBody *ie_body = MNULL; - t_u8 ret = MLAN_OUI_NOT_PRESENT; - - ENTER(); - if (((pbss_desc->pwpa_ie) && - ((*(pbss_desc->pwpa_ie)).vend_hdr.element_id == WPA_IE))) { - ie_body = (IEBody *) pbss_desc->pwpa_ie->data; - oui = &wpa_oui[cipher_suite][0]; - if ((ret = search_oui_in_ie(pmadapter, ie_body, oui))) { - LEAVE(); - return ret; - } - } - LEAVE(); - return ret; + t_u8 *oui = MNULL; + IEBody *ie_body = MNULL; + t_u8 ret = MLAN_OUI_NOT_PRESENT; + + ENTER(); + if (((pbss_desc->pwpa_ie) && + ((*(pbss_desc->pwpa_ie)).vend_hdr.element_id == WPA_IE))) { + ie_body = (IEBody *) pbss_desc->pwpa_ie->data; + oui = &wpa_oui[cipher_suite][0]; + if ((ret = search_oui_in_ie(pmadapter, ie_body, oui))) { + LEAVE(); + return ret; + } + } + LEAVE(); + return ret; } /** - * @brief compare config band and a band from the scan result, + * @brief compare config band and a band from the scan result, * which is defined by functiion radio_type_to_band(t_u8 radio_type) above * * @param cfg_band: band configured * scan_band: band from scan result * - * @return matched: non-zero. unmatched: 0 + * @return matched: non-zero. unmatched: 0 * */ static t_u8 wlan_is_band_compatible(t_u8 cfg_band, t_u8 scan_band) { - t_u8 band; - switch (scan_band) { - case BAND_A: - band = BAND_A | BAND_AN | BAND_AAC; - break; - case BAND_G: - default: - band = BAND_B | BAND_G | BAND_GN | BAND_GAC; - } - return cfg_band & band; + t_u8 band; + switch (scan_band) { + case BAND_A: + band = BAND_A | BAND_AN | BAND_AAC; + break; + case BAND_G: + default: + band = BAND_B | BAND_G | BAND_GN | BAND_GAC; + } + return cfg_band & band; } /** @@ -257,19 +261,19 @@ wlan_is_band_compatible(t_u8 cfg_band, t_u8 scan_band) static t_u8 radio_type_to_band(t_u8 radio_type) { - t_u8 ret_band; - - switch (radio_type) { - case HostCmd_SCAN_RADIO_TYPE_A: - ret_band = BAND_A; - break; - case HostCmd_SCAN_RADIO_TYPE_BG: - default: - ret_band = BAND_G; - break; - } - - return ret_band; + t_u8 ret_band; + + switch (radio_type) { + case HostCmd_SCAN_RADIO_TYPE_A: + ret_band = BAND_A; + break; + case HostCmd_SCAN_RADIO_TYPE_BG: + default: + ret_band = BAND_G; + break; + } + + return ret_band; } /** @@ -284,39 +288,45 @@ radio_type_to_band(t_u8 radio_type) static t_s32 wlan_find_best_network_in_list(IN mlan_private * pmpriv) { - mlan_adapter *pmadapter = pmpriv->adapter; - t_u32 mode = pmpriv->bss_mode; - t_s32 best_net = -1; - t_s32 best_rssi = 0; - t_u32 i; - - ENTER(); - - PRINTM(MINFO, "Num of BSSIDs = %d\n", pmadapter->num_in_scan_table); - - for (i = 0; i < pmadapter->num_in_scan_table; i++) { - switch (mode) { - case MLAN_BSS_MODE_INFRA: - case MLAN_BSS_MODE_IBSS: - if (wlan_is_network_compatible(pmpriv, i, mode) >= 0) { - if (SCAN_RSSI(pmadapter->pscan_table[i].rssi) > best_rssi) { - best_rssi = SCAN_RSSI(pmadapter->pscan_table[i].rssi); - best_net = i; - } - } - break; - case MLAN_BSS_MODE_AUTO: - default: - if (SCAN_RSSI(pmadapter->pscan_table[i].rssi) > best_rssi) { - best_rssi = SCAN_RSSI(pmadapter->pscan_table[i].rssi); - best_net = i; - } - break; - } - } - - LEAVE(); - return best_net; + mlan_adapter *pmadapter = pmpriv->adapter; + t_u32 mode = pmpriv->bss_mode; + t_s32 best_net = -1; + t_s32 best_rssi = 0; + t_u32 i; + + ENTER(); + + PRINTM(MINFO, "Num of BSSIDs = %d\n", pmadapter->num_in_scan_table); + + for (i = 0; i < pmadapter->num_in_scan_table; i++) { + switch (mode) { + case MLAN_BSS_MODE_INFRA: + case MLAN_BSS_MODE_IBSS: + if (wlan_is_network_compatible(pmpriv, i, mode) >= 0) { + if (SCAN_RSSI(pmadapter->pscan_table[i].rssi) > + best_rssi) { + best_rssi = + SCAN_RSSI(pmadapter-> + pscan_table[i].rssi); + best_net = i; + } + } + break; + case MLAN_BSS_MODE_AUTO: + default: + if (SCAN_RSSI(pmadapter->pscan_table[i].rssi) > + best_rssi) { + best_rssi = + SCAN_RSSI(pmadapter->pscan_table[i]. + rssi); + best_net = i; + } + break; + } + } + + LEAVE(); + return best_net; } /** @@ -330,7 +340,7 @@ wlan_find_best_network_in_list(IN mlan_private * pmpriv) * @param puser_scan_in MNULL or pointer to scan configuration parameters * @param pscan_chan_list Output parameter: Resulting channel list to scan * @param filtered_scan Flag indicating whether or not a BSSID or SSID filter - * is being sent in the command to firmware. Used to + * is being sent in the command to firmware. Used to * increase the number of channels sent in a scan * command and to disable the firmware channel scan * filter. @@ -339,121 +349,139 @@ wlan_find_best_network_in_list(IN mlan_private * pmpriv) */ static t_void wlan_scan_create_channel_list(IN mlan_private * pmpriv, - IN const wlan_user_scan_cfg * puser_scan_in, - OUT ChanScanParamSet_t * pscan_chan_list, - IN t_u8 filtered_scan) + IN const wlan_user_scan_cfg * puser_scan_in, + OUT ChanScanParamSet_t * pscan_chan_list, + IN t_u8 filtered_scan) { - mlan_adapter *pmadapter = pmpriv->adapter; - region_chan_t *pscan_region; - chan_freq_power_t *cfp; - t_u32 region_idx; - t_u32 chan_idx = 0; - t_u32 next_chan; - t_u8 scan_type; - t_u8 radio_type; - - ENTER(); - - for (region_idx = 0; - region_idx < NELEMENTS(pmadapter->region_channel); region_idx++) { - - if (wlan_11d_is_enabled(pmpriv) && pmpriv->media_connected != MTRUE) { - /* Scan all the supported chan for the first scan */ - if (!pmadapter->universal_channel[region_idx].valid) - continue; - pscan_region = &pmadapter->universal_channel[region_idx]; - } else { - if (!pmadapter->region_channel[region_idx].valid) - continue; - pscan_region = &pmadapter->region_channel[region_idx]; - } - - if (puser_scan_in && !puser_scan_in->chan_list[0].chan_number && - puser_scan_in->chan_list[0].radio_type & BAND_SPECIFIED) { - radio_type = - puser_scan_in->chan_list[0].radio_type & ~BAND_SPECIFIED; - if (!radio_type && (pscan_region->band != BAND_B) && - (pscan_region->band != BAND_G)) - continue; - if (radio_type && (pscan_region->band != BAND_A)) - continue; - } - if (!wlan_is_band_compatible - (pmpriv->config_bands | pmadapter->adhoc_start_band, - pscan_region->band)) - continue; - for (next_chan = 0; - next_chan < pscan_region->num_cfp; next_chan++, chan_idx++) { - /* Set the default scan type to the user specified type, will later - be changed to passive on a per channel basis if restricted by - regulatory requirements (11d or 11h) */ - scan_type = pmadapter->scan_type; - cfp = pscan_region->pcfp + next_chan; - - if (scan_type == MLAN_SCAN_TYPE_ACTIVE - && wlan_11d_is_enabled(pmpriv)) { - scan_type = wlan_11d_get_scan_type(pmadapter, - pscan_region->band, - (t_u8) cfp->channel, - &pmadapter-> - parsed_region_chan); - } - - switch (pscan_region->band) { - case BAND_A: - pscan_chan_list[chan_idx].radio_type = - HostCmd_SCAN_RADIO_TYPE_A; - if (!wlan_11d_is_enabled(pmpriv)) { - /* 11D not available... play it safe on DFS channels */ - if (wlan_11h_radar_detect_required - (pmpriv, (t_u8) cfp->channel)) - scan_type = MLAN_SCAN_TYPE_PASSIVE; - } - break; - case BAND_B: - case BAND_G: - if (!wlan_11d_is_enabled(pmpriv)) - if (wlan_bg_scan_type_is_passive - (pmpriv, (t_u8) cfp->channel)) { - scan_type = MLAN_SCAN_TYPE_PASSIVE; - } - default: - pscan_chan_list[chan_idx].radio_type = - HostCmd_SCAN_RADIO_TYPE_BG; - break; - } - - if (puser_scan_in && puser_scan_in->chan_list[0].scan_time) { - pscan_chan_list[chan_idx].max_scan_time = - wlan_cpu_to_le16((t_u16) puser_scan_in->chan_list[0]. - scan_time); - } else if (scan_type == MLAN_SCAN_TYPE_PASSIVE) { - pscan_chan_list[chan_idx].max_scan_time = - wlan_cpu_to_le16(pmadapter->passive_scan_time); - } else if (filtered_scan) { - pscan_chan_list[chan_idx].max_scan_time = - wlan_cpu_to_le16(pmadapter->specific_scan_time); - } else { - pscan_chan_list[chan_idx].max_scan_time = - wlan_cpu_to_le16(pmadapter->active_scan_time); - } - - if (scan_type == MLAN_SCAN_TYPE_PASSIVE) { - pscan_chan_list[chan_idx].chan_scan_mode.passive_scan = MTRUE; - } else { - pscan_chan_list[chan_idx].chan_scan_mode.passive_scan = MFALSE; - } - - pscan_chan_list[chan_idx].chan_number = (t_u8) cfp->channel; - - if (filtered_scan) { - pscan_chan_list[chan_idx].chan_scan_mode.disable_chan_filt = - MTRUE; - } - } - } - - LEAVE(); + mlan_adapter *pmadapter = pmpriv->adapter; + region_chan_t *pscan_region; + chan_freq_power_t *cfp; + t_u32 region_idx; + t_u32 chan_idx = 0; + t_u32 next_chan; + t_u8 scan_type; + t_u8 radio_type; + + ENTER(); + + for (region_idx = 0; + region_idx < NELEMENTS(pmadapter->region_channel); region_idx++) { + + if (wlan_11d_is_enabled(pmpriv) && + pmpriv->media_connected != MTRUE) { + /* Scan all the supported chan for the first scan */ + if (!pmadapter->universal_channel[region_idx].valid) + continue; + pscan_region = + &pmadapter->universal_channel[region_idx]; + } else { + if (!pmadapter->region_channel[region_idx].valid) + continue; + pscan_region = &pmadapter->region_channel[region_idx]; + } + + if (puser_scan_in && !puser_scan_in->chan_list[0].chan_number && + puser_scan_in->chan_list[0].radio_type & BAND_SPECIFIED) { + radio_type = + puser_scan_in->chan_list[0]. + radio_type & ~BAND_SPECIFIED; + if (!radio_type && (pscan_region->band != BAND_B) && + (pscan_region->band != BAND_G)) + continue; + if (radio_type && (pscan_region->band != BAND_A)) + continue; + } + if (!wlan_is_band_compatible + (pmpriv->config_bands | pmadapter->adhoc_start_band, + pscan_region->band)) + continue; + for (next_chan = 0; + next_chan < pscan_region->num_cfp; + next_chan++, chan_idx++) { + /* Set the default scan type to the user specified + type, will later be changed to passive on a per + channel basis if restricted by regulatory + requirements (11d or 11h) */ + scan_type = pmadapter->scan_type; + cfp = pscan_region->pcfp + next_chan; + + if (scan_type == MLAN_SCAN_TYPE_ACTIVE + && wlan_11d_is_enabled(pmpriv)) { + scan_type = wlan_11d_get_scan_type(pmadapter, + pscan_region-> + band, + (t_u8) cfp-> + channel, + &pmadapter-> + parsed_region_chan); + } + + switch (pscan_region->band) { + case BAND_A: + pscan_chan_list[chan_idx].radio_type = + HostCmd_SCAN_RADIO_TYPE_A; + if (!wlan_11d_is_enabled(pmpriv)) { + /* 11D not available... play it safe on + DFS channels */ + if (wlan_11h_radar_detect_required + (pmpriv, (t_u8) cfp->channel)) + scan_type = + MLAN_SCAN_TYPE_PASSIVE; + } + break; + case BAND_B: + case BAND_G: + if (!wlan_11d_is_enabled(pmpriv)) + if (wlan_bg_scan_type_is_passive + (pmpriv, (t_u8) cfp->channel)) { + scan_type = + MLAN_SCAN_TYPE_PASSIVE; + } + default: + pscan_chan_list[chan_idx].radio_type = + HostCmd_SCAN_RADIO_TYPE_BG; + break; + } + + if (puser_scan_in && + puser_scan_in->chan_list[0].scan_time) { + pscan_chan_list[chan_idx].max_scan_time = + wlan_cpu_to_le16((t_u16) puser_scan_in-> + chan_list[0]. + scan_time); + } else if (scan_type == MLAN_SCAN_TYPE_PASSIVE) { + pscan_chan_list[chan_idx].max_scan_time = + wlan_cpu_to_le16(pmadapter-> + passive_scan_time); + } else if (filtered_scan) { + pscan_chan_list[chan_idx].max_scan_time = + wlan_cpu_to_le16(pmadapter-> + specific_scan_time); + } else { + pscan_chan_list[chan_idx].max_scan_time = + wlan_cpu_to_le16(pmadapter-> + active_scan_time); + } + + if (scan_type == MLAN_SCAN_TYPE_PASSIVE) { + pscan_chan_list[chan_idx].chan_scan_mode. + passive_scan = MTRUE; + } else { + pscan_chan_list[chan_idx].chan_scan_mode. + passive_scan = MFALSE; + } + + pscan_chan_list[chan_idx].chan_number = + (t_u8) cfp->channel; + + if (filtered_scan) { + pscan_chan_list[chan_idx].chan_scan_mode. + disable_chan_filt = MTRUE; + } + } + } + + LEAVE(); } /** @@ -467,22 +495,22 @@ wlan_scan_create_channel_list(IN mlan_private * pmpriv, static void wlan_add_wps_probe_request_ie(IN mlan_private * pmpriv, OUT t_u8 ** pptlv_out) { - MrvlIEtypesHeader_t *tlv; - - ENTER(); - - if (pmpriv->wps.wps_ie.vend_hdr.len) { - tlv = (MrvlIEtypesHeader_t *) * pptlv_out; - tlv->type = wlan_cpu_to_le16(VENDOR_SPECIFIC_221); - tlv->len = wlan_cpu_to_le16(pmpriv->wps.wps_ie.vend_hdr.len); - *pptlv_out += sizeof(MrvlIEtypesHeader_t); - memcpy(pmpriv->adapter, *pptlv_out, - pmpriv->wps.wps_ie.vend_hdr.oui, - pmpriv->wps.wps_ie.vend_hdr.len); - *pptlv_out += (pmpriv->wps.wps_ie.vend_hdr.len - + sizeof(MrvlIEtypesHeader_t)); - } - LEAVE(); + MrvlIEtypesHeader_t *tlv; + + ENTER(); + + if (pmpriv->wps.wps_ie.vend_hdr.len) { + tlv = (MrvlIEtypesHeader_t *) * pptlv_out; + tlv->type = wlan_cpu_to_le16(VENDOR_SPECIFIC_221); + tlv->len = wlan_cpu_to_le16(pmpriv->wps.wps_ie.vend_hdr.len); + *pptlv_out += sizeof(MrvlIEtypesHeader_t); + memcpy(pmpriv->adapter, *pptlv_out, + pmpriv->wps.wps_ie.vend_hdr.oui, + pmpriv->wps.wps_ie.vend_hdr.len); + *pptlv_out += (pmpriv->wps.wps_ie.vend_hdr.len + + sizeof(MrvlIEtypesHeader_t)); + } + LEAVE(); } /** @@ -510,285 +538,336 @@ wlan_add_wps_probe_request_ie(IN mlan_private * pmpriv, OUT t_u8 ** pptlv_out) */ static mlan_status wlan_scan_channel_list(IN mlan_private * pmpriv, - IN t_void * pioctl_buf, - IN t_u32 max_chan_per_scan, - IN t_u8 filtered_scan, - OUT wlan_scan_cmd_config * pscan_cfg_out, - OUT MrvlIEtypes_ChanListParamSet_t * pchan_tlv_out, - IN ChanScanParamSet_t * pscan_chan_list) + IN t_void * pioctl_buf, + IN t_u32 max_chan_per_scan, + IN t_u8 filtered_scan, + OUT wlan_scan_cmd_config * pscan_cfg_out, + OUT MrvlIEtypes_ChanListParamSet_t * pchan_tlv_out, + IN ChanScanParamSet_t * pscan_chan_list) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = pmpriv->adapter; - ChanScanParamSet_t *ptmp_chan_list; - ChanScanParamSet_t *pstart_chan; - pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; - t_u8 *pchan_tlv_out_temp = MNULL; - t_u8 *ptlv_temp = MNULL; - t_bool foundJPch14 = MFALSE; - t_u16 tlv_buf_len = 0; - t_u32 tlv_idx; - t_u32 total_scan_time; - t_u32 done_early; - t_u32 cmd_no; - t_u32 first_chan = 1; - mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; - - ENTER(); - - if (!pscan_cfg_out || !pchan_tlv_out || !pscan_chan_list) { - PRINTM(MINFO, "Scan: Null detect: %p, %p, %p\n", - pscan_cfg_out, pchan_tlv_out, pscan_chan_list); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_CMD_SCAN_FAIL; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - if (!pscan_chan_list->chan_number) { - PRINTM(MERROR, "Scan: No channel configured\n"); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_CMD_SCAN_FAIL; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - /* check expiry before preparing scan list - may affect blacklist */ - wlan_11h_get_csa_closed_channel(pmpriv); - - pchan_tlv_out->header.type = wlan_cpu_to_le16(TLV_TYPE_CHANLIST); - - /* Set the temp channel struct pointer to the start of the desired list */ - ptmp_chan_list = pscan_chan_list; - - /* Loop through the desired channel list, sending a new firmware scan - commands for each max_chan_per_scan channels (or for 1,6,11 individually - if configured accordingly) */ - while (ptmp_chan_list->chan_number) { - - tlv_idx = 0; - total_scan_time = 0; - pchan_tlv_out->header.len = 0; - pstart_chan = ptmp_chan_list; - done_early = MFALSE; - - /* - * Construct the Channel TLV for the scan command. Continue to - * insert channel TLVs until: - * - the tlv_idx hits the maximum configured per scan command - * - the next channel to insert is 0 (end of desired channel list) - * - done_early is set (controlling individual scanning of 1,6,11) - */ - while (tlv_idx < max_chan_per_scan && ptmp_chan_list->chan_number && - !done_early) { - - if (wlan_is_chan_blacklisted(pmpriv, - radio_type_to_band(ptmp_chan_list-> - radio_type), - ptmp_chan_list->chan_number)) { - ptmp_chan_list++; - continue; - } - - if (first_chan) { - ptmp_chan_list->chan_scan_mode.first_chan = MTRUE; - first_chan = 0; - } - - PRINTM(MINFO, "Scan: Chan(%3d), Radio(%d), Mode(%d,%d), Dur(%d)\n", - ptmp_chan_list->chan_number, - ptmp_chan_list->radio_type, - ptmp_chan_list->chan_scan_mode.passive_scan, - ptmp_chan_list->chan_scan_mode.disable_chan_filt, - wlan_le16_to_cpu(ptmp_chan_list->max_scan_time)); - - if (foundJPch14 == MTRUE) { - foundJPch14 = MFALSE; - /* Restore the TLV buffer */ - pchan_tlv_out = - (MrvlIEtypes_ChanListParamSet_t *) pchan_tlv_out_temp; - pchan_tlv_out->header.type = - wlan_cpu_to_le16(TLV_TYPE_CHANLIST); - pchan_tlv_out->header.len = 0; - if (ptlv_temp) { - memcpy(pmadapter, pscan_cfg_out->tlv_buf, ptlv_temp, - tlv_buf_len); - pcb->moal_mfree(pmadapter->pmoal_handle, ptlv_temp); - ptlv_temp = MNULL; - } - } - - /* Special Case: For Japan, Scan on CH14 for 11G rates is not - allowed Hence Rates TLV needs to be updated to support only 11B - rates */ - if ((pmadapter->region_code == COUNTRY_CODE_JP_40 || - pmadapter->region_code == COUNTRY_CODE_JP_FF) - && (ptmp_chan_list->chan_number == 14)) { - - t_u8 *ptlv_pos = pscan_cfg_out->tlv_buf; - t_u16 old_ratetlv_len, new_ratetlv_len; - MrvlIEtypesHeader_t *header; - MrvlIEtypes_RatesParamSet_t *prates_tlv; - - /* Preserve the current TLV buffer */ - ret = pcb->moal_malloc(pmadapter->pmoal_handle, - MAX_SCAN_CFG_ALLOC - CHAN_TLV_MAX_SIZE, - MLAN_MEM_DEF, (t_u8 **) & ptlv_temp); - if (ret != MLAN_STATUS_SUCCESS || !ptlv_temp) { - PRINTM(MERROR, - "Memory allocation for pscan_cfg_out failed!\n"); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_NO_MEM; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - pchan_tlv_out_temp = (t_u8 *) pchan_tlv_out; - tlv_buf_len = - (t_u32) (pchan_tlv_out_temp - pscan_cfg_out->tlv_buf); - memcpy(pmadapter, ptlv_temp, ptlv_pos, tlv_buf_len); - - /* Search for Rates TLV */ - while ((!foundJPch14) && (ptlv_pos < pchan_tlv_out_temp)) { - header = (MrvlIEtypesHeader_t *) ptlv_pos; - if (header->type == wlan_cpu_to_le16(TLV_TYPE_RATES)) - foundJPch14 = MTRUE; - else - ptlv_pos += - (sizeof(MrvlIEtypesHeader_t) + - wlan_le16_to_cpu(header->len)); - } - - if (foundJPch14) { - /* Update the TLV buffer with *new* Rates TLV and rearrange - remaining TLV buffer */ - prates_tlv = (MrvlIEtypes_RatesParamSet_t *) ptlv_pos; - old_ratetlv_len = - sizeof(MrvlIEtypesHeader_t) + - wlan_le16_to_cpu(prates_tlv->header.len); - - prates_tlv->header.len = - wlan_copy_rates(prates_tlv->rates, 0, SupportedRates_B, - sizeof(SupportedRates_B)); - new_ratetlv_len = - sizeof(MrvlIEtypesHeader_t) + prates_tlv->header.len; - prates_tlv->header.len = - wlan_cpu_to_le16(prates_tlv->header.len); - - memmove(pmadapter, ptlv_pos + new_ratetlv_len, - ptlv_pos + old_ratetlv_len, - (t_u32) (pchan_tlv_out_temp - - (ptlv_pos + old_ratetlv_len))); - pchan_tlv_out = (MrvlIEtypes_ChanListParamSet_t *) - (pchan_tlv_out_temp - - (old_ratetlv_len - new_ratetlv_len)); - pchan_tlv_out->header.type = - wlan_cpu_to_le16(TLV_TYPE_CHANLIST); - pchan_tlv_out->header.len = 0; - } - } - - /* Copy the current channel TLV to the command being prepared */ - memcpy(pmadapter, pchan_tlv_out->chan_scan_param + tlv_idx, - ptmp_chan_list, sizeof(pchan_tlv_out->chan_scan_param)); - - /* Increment the TLV header length by the size appended */ - pchan_tlv_out->header.len += sizeof(pchan_tlv_out->chan_scan_param); - - /* - * The tlv buffer length is set to the number of bytes of the - * between the channel tlv pointer and the start of the - * tlv buffer. This compensates for any TLVs that were appended - * before the channel list. - */ - pscan_cfg_out->tlv_buf_len = (t_u32) ((t_u8 *) pchan_tlv_out - - pscan_cfg_out->tlv_buf); - - /* Add the size of the channel tlv header and the data length */ - pscan_cfg_out->tlv_buf_len += (sizeof(pchan_tlv_out->header) - + pchan_tlv_out->header.len); - - /* Increment the index to the channel tlv we are constructing */ - tlv_idx++; - - /* Count the total scan time per command */ - total_scan_time += wlan_le16_to_cpu(ptmp_chan_list->max_scan_time); - - done_early = MFALSE; - - /* Stop the loop if the *current* channel is in the 1,6,11 set and - we are not filtering on a BSSID or SSID. */ - if (!filtered_scan && (ptmp_chan_list->chan_number == 1 || - ptmp_chan_list->chan_number == 6 || - ptmp_chan_list->chan_number == 11)) { - done_early = MTRUE; - } - - /* Stop the loop if the *current* channel is 14 and region code is - Japan (0x40 or 0xFF) */ - if ((pmadapter->region_code == COUNTRY_CODE_JP_40 || - pmadapter->region_code == COUNTRY_CODE_JP_FF) - && (ptmp_chan_list->chan_number == 14)) { - done_early = MTRUE; - } - - /* Increment the tmp pointer to the next channel to be scanned */ - ptmp_chan_list++; - - /* Stop the loop if the *next* channel is in the 1,6,11 set. This - will cause it to be the only channel scanned on the next - interation */ - if (!filtered_scan && (ptmp_chan_list->chan_number == 1 || - ptmp_chan_list->chan_number == 6 || - ptmp_chan_list->chan_number == 11)) { - done_early = MTRUE; - } - - /* Stop the loop if the *next* channel is 14 and region code is - Japan (0x40 or 0xFF) */ - if ((pmadapter->region_code == COUNTRY_CODE_JP_40 || - pmadapter->region_code == COUNTRY_CODE_JP_FF) - && (ptmp_chan_list->chan_number == 14)) { - done_early = MTRUE; - } - } - - /* The total scan time should be less than scan command timeout value */ - if (total_scan_time > MRVDRV_MAX_TOTAL_SCAN_TIME) { - PRINTM(MMSG, - "Total scan time %d ms is over limit (%d ms), scan skipped\n", - total_scan_time, MRVDRV_MAX_TOTAL_SCAN_TIME); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_CMD_SCAN_FAIL; - ret = MLAN_STATUS_FAILURE; - break; - } - - pchan_tlv_out->header.len = wlan_cpu_to_le16(pchan_tlv_out->header.len); - - pmadapter->pscan_channels = pstart_chan; - - /* Send the scan command to the firmware with the specified cfg */ - if (pmadapter->ext_scan) - cmd_no = HostCmd_CMD_802_11_SCAN_EXT; - else - cmd_no = HostCmd_CMD_802_11_SCAN; - ret = wlan_prepare_cmd(pmpriv, - cmd_no, - HostCmd_ACT_GEN_SET, - 0, pioctl_buf, pscan_cfg_out); - if (ret) - break; - } - - LEAVE(); - - if (ptlv_temp) { - pcb->moal_mfree(pmadapter->pmoal_handle, ptlv_temp); - } - - if (ret) { - return MLAN_STATUS_FAILURE; - } - - return MLAN_STATUS_SUCCESS; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + ChanScanParamSet_t *ptmp_chan_list; + ChanScanParamSet_t *pstart_chan; + pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; + t_u8 *pchan_tlv_out_temp = MNULL; + t_u8 *ptlv_temp = MNULL; + t_bool foundJPch14 = MFALSE; + t_u16 tlv_buf_len = 0; + t_u32 tlv_idx; + t_u32 total_scan_time; + t_u32 done_early; + t_u32 cmd_no; + t_u32 first_chan = 1; + mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; + + ENTER(); + + if (!pscan_cfg_out || !pchan_tlv_out || !pscan_chan_list) { + PRINTM(MINFO, "Scan: Null detect: %p, %p, %p\n", + pscan_cfg_out, pchan_tlv_out, pscan_chan_list); + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_CMD_SCAN_FAIL; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + if (!pscan_chan_list->chan_number) { + PRINTM(MERROR, "Scan: No channel configured\n"); + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_CMD_SCAN_FAIL; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + /* check expiry before preparing scan list - may affect blacklist */ + wlan_11h_get_csa_closed_channel(pmpriv); + + pchan_tlv_out->header.type = wlan_cpu_to_le16(TLV_TYPE_CHANLIST); + + /* Set the temp channel struct pointer to the start of the desired list + */ + ptmp_chan_list = pscan_chan_list; + + /* Loop through the desired channel list, sending a new firmware scan + commands for each max_chan_per_scan channels (or for 1,6,11 + individually if configured accordingly) */ + while (ptmp_chan_list->chan_number) { + + tlv_idx = 0; + total_scan_time = 0; + pchan_tlv_out->header.len = 0; + pstart_chan = ptmp_chan_list; + done_early = MFALSE; + + /* + * Construct the Channel TLV for the scan command. Continue to + * insert channel TLVs until: + * - the tlv_idx hits the maximum configured per scan command + * - the next channel to insert is 0 (end of desired channel list) + * - done_early is set (controlling individual scanning of 1,6,11) + */ + while (tlv_idx < max_chan_per_scan && + ptmp_chan_list->chan_number && !done_early) { + + if (wlan_is_chan_blacklisted(pmpriv, + radio_type_to_band + (ptmp_chan_list-> + radio_type), + ptmp_chan_list-> + chan_number)) { + ptmp_chan_list++; + continue; + } + + if (first_chan) { + ptmp_chan_list->chan_scan_mode.first_chan = + MTRUE; + first_chan = 0; + } + + PRINTM(MINFO, + "Scan: Chan(%3d), Radio(%d), Mode(%d,%d), Dur(%d)\n", + ptmp_chan_list->chan_number, + ptmp_chan_list->radio_type, + ptmp_chan_list->chan_scan_mode.passive_scan, + ptmp_chan_list->chan_scan_mode.disable_chan_filt, + wlan_le16_to_cpu(ptmp_chan_list->max_scan_time)); + + if (foundJPch14 == MTRUE) { + foundJPch14 = MFALSE; + /* Restore the TLV buffer */ + pchan_tlv_out = + (MrvlIEtypes_ChanListParamSet_t *) + pchan_tlv_out_temp; + pchan_tlv_out->header.type = + wlan_cpu_to_le16(TLV_TYPE_CHANLIST); + pchan_tlv_out->header.len = 0; + if (ptlv_temp) { + memcpy(pmadapter, + pscan_cfg_out->tlv_buf, + ptlv_temp, tlv_buf_len); + pcb->moal_mfree(pmadapter->pmoal_handle, + ptlv_temp); + ptlv_temp = MNULL; + } + } + + /* Special Case: For Japan, Scan on CH14 for 11G rates + is not allowed Hence Rates TLV needs to be updated + to support only 11B rates */ + if ((pmadapter->region_code == COUNTRY_CODE_JP_40 || + pmadapter->region_code == COUNTRY_CODE_JP_FF) + && (ptmp_chan_list->chan_number == 14)) { + + t_u8 *ptlv_pos = pscan_cfg_out->tlv_buf; + t_u16 old_ratetlv_len, new_ratetlv_len; + MrvlIEtypesHeader_t *header; + MrvlIEtypes_RatesParamSet_t *prates_tlv; + + /* Preserve the current TLV buffer */ + ret = pcb->moal_malloc(pmadapter->pmoal_handle, + MAX_SCAN_CFG_ALLOC - + CHAN_TLV_MAX_SIZE, + MLAN_MEM_DEF, + (t_u8 **) & ptlv_temp); + if (ret != MLAN_STATUS_SUCCESS || !ptlv_temp) { + PRINTM(MERROR, + "Memory allocation for pscan_cfg_out failed!\n"); + if (pioctl_req) + pioctl_req->status_code = + MLAN_ERROR_NO_MEM; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + pchan_tlv_out_temp = (t_u8 *) pchan_tlv_out; + tlv_buf_len = + (t_u32) (pchan_tlv_out_temp - + pscan_cfg_out->tlv_buf); + memcpy(pmadapter, ptlv_temp, ptlv_pos, + tlv_buf_len); + + /* Search for Rates TLV */ + while ((!foundJPch14) && + (ptlv_pos < pchan_tlv_out_temp)) { + header = (MrvlIEtypesHeader_t *) + ptlv_pos; + if (header->type == + wlan_cpu_to_le16(TLV_TYPE_RATES)) + foundJPch14 = MTRUE; + else + ptlv_pos += + (sizeof + (MrvlIEtypesHeader_t) + + wlan_le16_to_cpu + (header->len)); + } + + if (foundJPch14) { + /* Update the TLV buffer with *new* + Rates TLV and rearrange remaining + TLV buffer */ + prates_tlv = + (MrvlIEtypes_RatesParamSet_t *) + ptlv_pos; + old_ratetlv_len = + sizeof(MrvlIEtypesHeader_t) + + wlan_le16_to_cpu(prates_tlv-> + header.len); + + prates_tlv->header.len = + wlan_copy_rates(prates_tlv-> + rates, 0, + SupportedRates_B, + sizeof + (SupportedRates_B)); + new_ratetlv_len = + sizeof(MrvlIEtypesHeader_t) + + prates_tlv->header.len; + prates_tlv->header.len = + wlan_cpu_to_le16(prates_tlv-> + header.len); + + memmove(pmadapter, + ptlv_pos + new_ratetlv_len, + ptlv_pos + old_ratetlv_len, + (t_u32) (pchan_tlv_out_temp - + (ptlv_pos + + old_ratetlv_len))); + pchan_tlv_out = + (MrvlIEtypes_ChanListParamSet_t + *) + (pchan_tlv_out_temp - + (old_ratetlv_len - + new_ratetlv_len)); + pchan_tlv_out->header.type = + wlan_cpu_to_le16 + (TLV_TYPE_CHANLIST); + pchan_tlv_out->header.len = 0; + } + } + + /* Copy the current channel TLV to the command being + prepared */ + memcpy(pmadapter, + pchan_tlv_out->chan_scan_param + tlv_idx, + ptmp_chan_list, + sizeof(pchan_tlv_out->chan_scan_param)); + + /* Increment the TLV header length by the size appended + */ + pchan_tlv_out->header.len += + sizeof(pchan_tlv_out->chan_scan_param); + + /* + * The tlv buffer length is set to the number of bytes of the + * between the channel tlv pointer and the start of the + * tlv buffer. This compensates for any TLVs that were appended + * before the channel list. + */ + pscan_cfg_out->tlv_buf_len = + (t_u32) ((t_u8 *) pchan_tlv_out - + pscan_cfg_out->tlv_buf); + + /* Add the size of the channel tlv header and the data + length */ + pscan_cfg_out->tlv_buf_len += + (sizeof(pchan_tlv_out->header) + + pchan_tlv_out->header.len); + + /* Increment the index to the channel tlv we are + constructing */ + tlv_idx++; + + /* Count the total scan time per command */ + total_scan_time += + wlan_le16_to_cpu(ptmp_chan_list->max_scan_time); + + done_early = MFALSE; + + /* Stop the loop if the *current* channel is in the + 1,6,11 set and we are not filtering on a BSSID or + SSID. */ + if (!filtered_scan && + (ptmp_chan_list->chan_number == 1 || + ptmp_chan_list->chan_number == 6 || + ptmp_chan_list->chan_number == 11)) { + done_early = MTRUE; + } + + /* Stop the loop if the *current* channel is 14 and + region code is Japan (0x40 or 0xFF) */ + if ((pmadapter->region_code == COUNTRY_CODE_JP_40 || + pmadapter->region_code == COUNTRY_CODE_JP_FF) + && (ptmp_chan_list->chan_number == 14)) { + done_early = MTRUE; + } + + /* Increment the tmp pointer to the next channel to be + scanned */ + ptmp_chan_list++; + + /* Stop the loop if the *next* channel is in the 1,6,11 + set. This will cause it to be the only channel + scanned on the next interation */ + if (!filtered_scan && + (ptmp_chan_list->chan_number == 1 || + ptmp_chan_list->chan_number == 6 || + ptmp_chan_list->chan_number == 11)) { + done_early = MTRUE; + } + + /* Stop the loop if the *next* channel is 14 and region + code is Japan (0x40 or 0xFF) */ + if ((pmadapter->region_code == COUNTRY_CODE_JP_40 || + pmadapter->region_code == COUNTRY_CODE_JP_FF) + && (ptmp_chan_list->chan_number == 14)) { + done_early = MTRUE; + } + } + + /* The total scan time should be less than scan command timeout + value */ + if (total_scan_time > MRVDRV_MAX_TOTAL_SCAN_TIME) { + PRINTM(MMSG, + "Total scan time %d ms is over limit (%d ms), scan skipped\n", + total_scan_time, MRVDRV_MAX_TOTAL_SCAN_TIME); + if (pioctl_req) + pioctl_req->status_code = + MLAN_ERROR_CMD_SCAN_FAIL; + ret = MLAN_STATUS_FAILURE; + break; + } + + pchan_tlv_out->header.len = + wlan_cpu_to_le16(pchan_tlv_out->header.len); + + pmadapter->pscan_channels = pstart_chan; + + /* Send the scan command to the firmware with the specified cfg + */ + if (pmadapter->ext_scan) + cmd_no = HostCmd_CMD_802_11_SCAN_EXT; + else + cmd_no = HostCmd_CMD_802_11_SCAN; + ret = wlan_prepare_cmd(pmpriv, + cmd_no, + HostCmd_ACT_GEN_SET, + 0, pioctl_buf, pscan_cfg_out); + if (ret) + break; + } + + LEAVE(); + + if (ptlv_temp) { + pcb->moal_mfree(pmadapter->pmoal_handle, ptlv_temp); + } + + if (ret) { + return MLAN_STATUS_FAILURE; + } + + return MLAN_STATUS_SUCCESS; } /** @@ -816,14 +895,14 @@ wlan_scan_channel_list(IN mlan_private * pmpriv, * @param pscan_cfg_out Output parameter: Resulting scan configuration * @param ppchan_list_out Output parameter: Pointer to the start of the * channel TLV portion of the output scan config - * @param pscan_chan_list Output parameter: Pointer to the resulting + * @param pscan_chan_list Output parameter: Pointer to the resulting * channel list to scan * @param pmax_chan_per_scan Output parameter: Number of channels to scan for * each issuance of the firmware scan command * @param pfiltered_scan Output parameter: Flag indicating whether or not * a BSSID or SSID filter is being sent in the * command to firmware. Used to increase the number - * of channels sent in a scan command and to + * of channels sent in a scan command and to * disable the firmware channel scan filter. * @param pscan_current_only Output parameter: Flag indicating whether or not * we are only scanning our current active channel @@ -832,302 +911,331 @@ wlan_scan_channel_list(IN mlan_private * pmpriv, */ static mlan_status wlan_scan_setup_scan_config(IN mlan_private * pmpriv, - IN const wlan_user_scan_cfg * puser_scan_in, - OUT wlan_scan_cmd_config * pscan_cfg_out, - OUT MrvlIEtypes_ChanListParamSet_t ** - ppchan_list_out, - OUT ChanScanParamSet_t * pscan_chan_list, - OUT t_u8 * pmax_chan_per_scan, - OUT t_u8 * pfiltered_scan, - OUT t_u8 * pscan_current_only) + IN const wlan_user_scan_cfg * puser_scan_in, + OUT wlan_scan_cmd_config * pscan_cfg_out, + OUT MrvlIEtypes_ChanListParamSet_t ** + ppchan_list_out, + OUT ChanScanParamSet_t * pscan_chan_list, + OUT t_u8 * pmax_chan_per_scan, + OUT t_u8 * pfiltered_scan, + OUT t_u8 * pscan_current_only) { - mlan_adapter *pmadapter = pmpriv->adapter; - mlan_status ret = MLAN_STATUS_SUCCESS; - MrvlIEtypes_NumProbes_t *pnum_probes_tlv; - MrvlIEtypes_WildCardSsIdParamSet_t *pwildcard_ssid_tlv; - MrvlIEtypes_RatesParamSet_t *prates_tlv; - - const t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0, 0, 0, 0, 0, 0 }; - t_u8 *ptlv_pos; - t_u32 num_probes; - t_u32 ssid_len; - t_u32 chan_idx; - t_u32 scan_type; - t_u16 scan_dur; - t_u8 channel; - t_u8 radio_type; - t_u32 ssid_idx; - t_u8 ssid_filter; - WLAN_802_11_RATES rates; - t_u32 rates_size; - MrvlIETypes_HTCap_t *pht_cap; - - MrvlIETypes_VHTCap_t *pvht_cap; - ENTER(); - - /* The tlv_buf_len is calculated for each scan command. The TLVs added in - this routine will be preserved since the routine that sends the command - will append channelTLVs at *ppchan_list_out. The difference between the - *ppchan_list_out and the tlv_buf start will be used to calculate the - size of anything we add in this routine. */ - pscan_cfg_out->tlv_buf_len = 0; - - /* Running tlv pointer. Assigned to ppchan_list_out at end of function so - later routines know where channels can be added to the command buf */ - ptlv_pos = pscan_cfg_out->tlv_buf; - - /* Initialize the scan as un-filtered; the flag is later set to TRUE below - if a SSID or BSSID filter is sent in the command */ - *pfiltered_scan = MFALSE; - - /* Initialize the scan as not being only on the current channel. If the - channel list is customized, only contains one channel, and is the active - channel, this is set true and data flow is not halted. */ - *pscan_current_only = MFALSE; - - if (puser_scan_in) { - - ssid_filter = MFALSE; - - /* Set the bss type scan filter, use Adapter setting if unset */ - pscan_cfg_out->bss_mode = (puser_scan_in->bss_mode - ? (t_u8) puser_scan_in->bss_mode : - (t_u8) pmadapter->scan_mode); - - /* Set the number of probes to send, use Adapter setting if unset */ - num_probes = (puser_scan_in->num_probes ? puser_scan_in->num_probes : - pmadapter->scan_probes); - /* - * Set the BSSID filter to the incoming configuration, - * if non-zero. If not set, it will remain disabled (all zeros). - */ - memcpy(pmadapter, pscan_cfg_out->specific_bssid, - puser_scan_in->specific_bssid, - sizeof(pscan_cfg_out->specific_bssid)); - - for (ssid_idx = 0; ((ssid_idx < NELEMENTS(puser_scan_in->ssid_list)) - && (*puser_scan_in->ssid_list[ssid_idx].ssid || - puser_scan_in->ssid_list[ssid_idx].max_len)); - ssid_idx++) { - - ssid_len = - wlan_strlen((char *) puser_scan_in->ssid_list[ssid_idx].ssid); - - pwildcard_ssid_tlv - = (MrvlIEtypes_WildCardSsIdParamSet_t *) ptlv_pos; - pwildcard_ssid_tlv->header.type - = wlan_cpu_to_le16(TLV_TYPE_WILDCARDSSID); - pwildcard_ssid_tlv->header.len - = (t_u16) (ssid_len - + sizeof(pwildcard_ssid_tlv->max_ssid_length)); - pwildcard_ssid_tlv->max_ssid_length - = puser_scan_in->ssid_list[ssid_idx].max_len; - - memcpy(pmadapter, pwildcard_ssid_tlv->ssid, - puser_scan_in->ssid_list[ssid_idx].ssid, - MIN(MLAN_MAX_SSID_LENGTH, ssid_len)); - - ptlv_pos += (sizeof(pwildcard_ssid_tlv->header) - + pwildcard_ssid_tlv->header.len); - - pwildcard_ssid_tlv->header.len - = wlan_cpu_to_le16(pwildcard_ssid_tlv->header.len); - - PRINTM(MINFO, "Scan: ssid_list[%d]: %s, %d\n", - ssid_idx, - pwildcard_ssid_tlv->ssid, - pwildcard_ssid_tlv->max_ssid_length); - - if (ssid_len) { - ssid_filter = MTRUE; - } - } - - /* - * The default number of channels sent in the command is low to - * ensure the response buffer from the firmware does not truncate - * scan results. That is not an issue with an SSID or BSSID - * filter applied to the scan results in the firmware. - */ - if ((ssid_idx && ssid_filter) || - memcmp(pmadapter, pscan_cfg_out->specific_bssid, &zero_mac, - sizeof(zero_mac))) { - *pfiltered_scan = MTRUE; - } - - } else { - pscan_cfg_out->bss_mode = (t_u8) pmadapter->scan_mode; - num_probes = pmadapter->scan_probes; - } - - /* - * If a specific BSSID or SSID is used, the number of channels in the - * scan command will be increased to the absolute maximum. - */ - if (*pfiltered_scan) - *pmax_chan_per_scan = MRVDRV_MAX_CHANNELS_PER_SPECIFIC_SCAN; - else - *pmax_chan_per_scan = MRVDRV_CHANNELS_PER_SCAN_CMD; - - /* If the input config or adapter has the number of Probes set, add tlv */ - if (num_probes) { - - PRINTM(MINFO, "Scan: num_probes = %d\n", num_probes); - - pnum_probes_tlv = (MrvlIEtypes_NumProbes_t *) ptlv_pos; - pnum_probes_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_NUMPROBES); - pnum_probes_tlv->header.len = sizeof(pnum_probes_tlv->num_probes); - pnum_probes_tlv->num_probes = wlan_cpu_to_le16((t_u16) num_probes); - - ptlv_pos += - sizeof(pnum_probes_tlv->header) + pnum_probes_tlv->header.len; - - pnum_probes_tlv->header.len = - wlan_cpu_to_le16(pnum_probes_tlv->header.len); - } - - /* Append rates tlv */ - memset(pmadapter, rates, 0, sizeof(rates)); - - rates_size = wlan_get_supported_rates(pmpriv, pmpriv->bss_mode, - (pmpriv->bss_mode == - MLAN_BSS_MODE_INFRA) ? pmpriv-> - config_bands : pmadapter-> - adhoc_start_band, rates); - - prates_tlv = (MrvlIEtypes_RatesParamSet_t *) ptlv_pos; - prates_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_RATES); - prates_tlv->header.len = wlan_cpu_to_le16((t_u16) rates_size); - memcpy(pmadapter, prates_tlv->rates, rates, rates_size); - ptlv_pos += sizeof(prates_tlv->header) + rates_size; - - PRINTM(MINFO, "SCAN_CMD: Rates size = %d\n", rates_size); - - if (ISSUPP_11NENABLED(pmpriv->adapter->fw_cap_info) - && (pmpriv->config_bands & BAND_GN || pmpriv->config_bands & BAND_AN)) { - pht_cap = (MrvlIETypes_HTCap_t *) ptlv_pos; - memset(pmadapter, pht_cap, 0, sizeof(MrvlIETypes_HTCap_t)); - pht_cap->header.type = wlan_cpu_to_le16(HT_CAPABILITY); - pht_cap->header.len = sizeof(HTCap_t); - wlan_fill_ht_cap_tlv(pmpriv, pht_cap, pmpriv->config_bands); - HEXDUMP("SCAN: HT_CAPABILITIES IE", (t_u8 *) pht_cap, - sizeof(MrvlIETypes_HTCap_t)); - ptlv_pos += sizeof(MrvlIETypes_HTCap_t); - pht_cap->header.len = wlan_cpu_to_le16(pht_cap->header.len); - } - - if (ISSUPP_11ACENABLED(pmpriv->adapter->fw_cap_info) - && (pmpriv->config_bands & BAND_AAC)) { - pvht_cap = (MrvlIETypes_VHTCap_t *) ptlv_pos; - memset(pmadapter, pvht_cap, 0, sizeof(MrvlIETypes_VHTCap_t)); - pvht_cap->header.type = wlan_cpu_to_le16(VHT_CAPABILITY); - pvht_cap->header.len = sizeof(VHT_capa_t); - wlan_fill_vht_cap_tlv(pmpriv, pvht_cap, pmpriv->config_bands); - HEXDUMP("SCAN: VHT_CAPABILITIES IE", (t_u8 *) pvht_cap, - sizeof(MrvlIETypes_VHTCap_t)); - ptlv_pos += sizeof(MrvlIETypes_VHTCap_t); - pvht_cap->header.len = wlan_cpu_to_le16(pvht_cap->header.len); - } - if (wlan_is_ext_capa_support(pmpriv)) - wlan_add_ext_capa_info_ie(pmpriv, &ptlv_pos); - wlan_add_wps_probe_request_ie(pmpriv, &ptlv_pos); - - /* - * Set the output for the channel TLV to the address in the tlv buffer - * past any TLVs that were added in this function (SSID, num_probes). - * Channel TLVs will be added past this for each scan command, preserving - * the TLVs that were previously added. - */ - *ppchan_list_out = (MrvlIEtypes_ChanListParamSet_t *) ptlv_pos; - - if (puser_scan_in && puser_scan_in->chan_list[0].chan_number) { - - PRINTM(MINFO, "Scan: Using supplied channel list\n"); - - for (chan_idx = 0; - chan_idx < WLAN_USER_SCAN_CHAN_MAX - && puser_scan_in->chan_list[chan_idx].chan_number; chan_idx++) { - - channel = puser_scan_in->chan_list[chan_idx].chan_number; - (pscan_chan_list + chan_idx)->chan_number = channel; - - radio_type = puser_scan_in->chan_list[chan_idx].radio_type; - (pscan_chan_list + chan_idx)->radio_type = radio_type; - - scan_type = puser_scan_in->chan_list[chan_idx].scan_type; - if (scan_type == MLAN_SCAN_TYPE_UNCHANGED) - scan_type = pmadapter->scan_type; - - if (radio_type == HostCmd_SCAN_RADIO_TYPE_A) { - if (pmadapter->fw_bands & BAND_A) - PRINTM(MINFO, "UserScan request for A Band channel %d!!\n", - channel); - else { - PRINTM(MERROR, "Scan in A band is not allowed!!\n"); - ret = MLAN_STATUS_FAILURE; - LEAVE(); - return ret; - - } - } - - /* Prevent active scanning on a radar controlled channel */ - if (radio_type == HostCmd_SCAN_RADIO_TYPE_A) { - if (wlan_11h_radar_detect_required(pmpriv, channel)) { - scan_type = MLAN_SCAN_TYPE_PASSIVE; - } - } - if (radio_type == HostCmd_SCAN_RADIO_TYPE_BG) { - if (wlan_bg_scan_type_is_passive(pmpriv, channel)) { - scan_type = MLAN_SCAN_TYPE_PASSIVE; - } - } - if (scan_type == MLAN_SCAN_TYPE_PASSIVE) { - (pscan_chan_list + chan_idx)->chan_scan_mode.passive_scan = - MTRUE; - } else { - (pscan_chan_list + chan_idx)->chan_scan_mode.passive_scan = - MFALSE; - } - - if (puser_scan_in->chan_list[chan_idx].scan_time) { - scan_dur = (t_u16) puser_scan_in->chan_list[chan_idx].scan_time; - } else { - if (scan_type == MLAN_SCAN_TYPE_PASSIVE) { - scan_dur = pmadapter->passive_scan_time; - } else if (*pfiltered_scan) { - scan_dur = pmadapter->specific_scan_time; - } else { - scan_dur = pmadapter->active_scan_time; - } - } - - (pscan_chan_list + chan_idx)->min_scan_time = - wlan_cpu_to_le16(scan_dur); - (pscan_chan_list + chan_idx)->max_scan_time = - wlan_cpu_to_le16(scan_dur); - if (*pfiltered_scan) { - (pscan_chan_list + chan_idx)->chan_scan_mode.disable_chan_filt = - MTRUE; - } - } - - /* Check if we are only scanning the current channel */ - if ((chan_idx == 1) - && (puser_scan_in->chan_list[0].chan_number - == pmpriv->curr_bss_params.bss_descriptor.channel)) { - *pscan_current_only = MTRUE; - PRINTM(MINFO, "Scan: Scanning current channel only\n"); - } - - } else { - PRINTM(MINFO, "Scan: Creating full region channel list\n"); - wlan_scan_create_channel_list(pmpriv, puser_scan_in, pscan_chan_list, - *pfiltered_scan); - } - - LEAVE(); - return ret; + mlan_adapter *pmadapter = pmpriv->adapter; + mlan_status ret = MLAN_STATUS_SUCCESS; + MrvlIEtypes_NumProbes_t *pnum_probes_tlv; + MrvlIEtypes_WildCardSsIdParamSet_t *pwildcard_ssid_tlv; + MrvlIEtypes_RatesParamSet_t *prates_tlv; + + const t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0, 0, 0, 0, 0, 0 }; + t_u8 *ptlv_pos; + t_u32 num_probes; + t_u32 ssid_len; + t_u32 chan_idx; + t_u32 scan_type; + t_u16 scan_dur; + t_u8 channel; + t_u8 radio_type; + t_u32 ssid_idx; + t_u8 ssid_filter; + WLAN_802_11_RATES rates; + t_u32 rates_size; + MrvlIETypes_HTCap_t *pht_cap; + + MrvlIETypes_VHTCap_t *pvht_cap; + ENTER(); + + /* The tlv_buf_len is calculated for each scan command. The TLVs added + in this routine will be preserved since the routine that sends the + command will append channelTLVs at *ppchan_list_out. The difference + between the *ppchan_list_out and the tlv_buf start will be used to + calculate the size of anything we add in this routine. */ + pscan_cfg_out->tlv_buf_len = 0; + + /* Running tlv pointer. Assigned to ppchan_list_out at end of function + so later routines know where channels can be added to the command + buf */ + ptlv_pos = pscan_cfg_out->tlv_buf; + + /* Initialize the scan as un-filtered; the flag is later set to TRUE + below if a SSID or BSSID filter is sent in the command */ + *pfiltered_scan = MFALSE; + + /* Initialize the scan as not being only on the current channel. If + the channel list is customized, only contains one channel, and is + the active channel, this is set true and data flow is not halted. */ + *pscan_current_only = MFALSE; + + if (puser_scan_in) { + + ssid_filter = MFALSE; + + /* Set the bss type scan filter, use Adapter setting if unset */ + pscan_cfg_out->bss_mode = (puser_scan_in->bss_mode + ? (t_u8) puser_scan_in->bss_mode : + (t_u8) pmadapter->scan_mode); + + /* Set the number of probes to send, use Adapter setting if + unset */ + num_probes = + (puser_scan_in->num_probes ? puser_scan_in-> + num_probes : pmadapter->scan_probes); + /* + * Set the BSSID filter to the incoming configuration, + * if non-zero. If not set, it will remain disabled (all zeros). + */ + memcpy(pmadapter, pscan_cfg_out->specific_bssid, + puser_scan_in->specific_bssid, + sizeof(pscan_cfg_out->specific_bssid)); + + for (ssid_idx = 0; + ((ssid_idx < NELEMENTS(puser_scan_in->ssid_list)) + && (*puser_scan_in->ssid_list[ssid_idx].ssid || + puser_scan_in->ssid_list[ssid_idx].max_len)); + ssid_idx++) { + + ssid_len = + wlan_strlen((char *)puser_scan_in-> + ssid_list[ssid_idx].ssid); + + pwildcard_ssid_tlv + = + (MrvlIEtypes_WildCardSsIdParamSet_t *) ptlv_pos; + pwildcard_ssid_tlv->header.type = + wlan_cpu_to_le16(TLV_TYPE_WILDCARDSSID); + pwildcard_ssid_tlv->header.len = + (t_u16) (ssid_len + + sizeof(pwildcard_ssid_tlv-> + max_ssid_length)); + pwildcard_ssid_tlv->max_ssid_length = + puser_scan_in->ssid_list[ssid_idx].max_len; + + memcpy(pmadapter, pwildcard_ssid_tlv->ssid, + puser_scan_in->ssid_list[ssid_idx].ssid, + MIN(MLAN_MAX_SSID_LENGTH, ssid_len)); + + ptlv_pos += (sizeof(pwildcard_ssid_tlv->header) + + pwildcard_ssid_tlv->header.len); + + pwildcard_ssid_tlv->header.len + = + wlan_cpu_to_le16(pwildcard_ssid_tlv->header. + len); + + PRINTM(MINFO, "Scan: ssid_list[%d]: %s, %d\n", + ssid_idx, + pwildcard_ssid_tlv->ssid, + pwildcard_ssid_tlv->max_ssid_length); + + if (ssid_len) { + ssid_filter = MTRUE; + } + } + + /* + * The default number of channels sent in the command is low to + * ensure the response buffer from the firmware does not truncate + * scan results. That is not an issue with an SSID or BSSID + * filter applied to the scan results in the firmware. + */ + if ((ssid_idx && ssid_filter) || + memcmp(pmadapter, pscan_cfg_out->specific_bssid, &zero_mac, + sizeof(zero_mac))) { + *pfiltered_scan = MTRUE; + } + + } else { + pscan_cfg_out->bss_mode = (t_u8) pmadapter->scan_mode; + num_probes = pmadapter->scan_probes; + } + + /* + * If a specific BSSID or SSID is used, the number of channels in the + * scan command will be increased to the absolute maximum. + */ + if (*pfiltered_scan) + *pmax_chan_per_scan = MRVDRV_MAX_CHANNELS_PER_SPECIFIC_SCAN; + else + *pmax_chan_per_scan = MRVDRV_CHANNELS_PER_SCAN_CMD; + + /* If the input config or adapter has the number of Probes set, add tlv + */ + if (num_probes) { + + PRINTM(MINFO, "Scan: num_probes = %d\n", num_probes); + + pnum_probes_tlv = (MrvlIEtypes_NumProbes_t *) ptlv_pos; + pnum_probes_tlv->header.type = + wlan_cpu_to_le16(TLV_TYPE_NUMPROBES); + pnum_probes_tlv->header.len = + sizeof(pnum_probes_tlv->num_probes); + pnum_probes_tlv->num_probes = + wlan_cpu_to_le16((t_u16) num_probes); + + ptlv_pos += + sizeof(pnum_probes_tlv->header) + + pnum_probes_tlv->header.len; + + pnum_probes_tlv->header.len = + wlan_cpu_to_le16(pnum_probes_tlv->header.len); + } + + /* Append rates tlv */ + memset(pmadapter, rates, 0, sizeof(rates)); + + rates_size = wlan_get_supported_rates(pmpriv, pmpriv->bss_mode, + (pmpriv->bss_mode == + MLAN_BSS_MODE_INFRA) ? pmpriv-> + config_bands : pmadapter-> + adhoc_start_band, rates); + + prates_tlv = (MrvlIEtypes_RatesParamSet_t *) ptlv_pos; + prates_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_RATES); + prates_tlv->header.len = wlan_cpu_to_le16((t_u16) rates_size); + memcpy(pmadapter, prates_tlv->rates, rates, rates_size); + ptlv_pos += sizeof(prates_tlv->header) + rates_size; + + PRINTM(MINFO, "SCAN_CMD: Rates size = %d\n", rates_size); + + if (ISSUPP_11NENABLED(pmpriv->adapter->fw_cap_info) + && (pmpriv->config_bands & BAND_GN + || pmpriv->config_bands & BAND_AN)) { + pht_cap = (MrvlIETypes_HTCap_t *) ptlv_pos; + memset(pmadapter, pht_cap, 0, sizeof(MrvlIETypes_HTCap_t)); + pht_cap->header.type = wlan_cpu_to_le16(HT_CAPABILITY); + pht_cap->header.len = sizeof(HTCap_t); + wlan_fill_ht_cap_tlv(pmpriv, pht_cap, pmpriv->config_bands); + HEXDUMP("SCAN: HT_CAPABILITIES IE", (t_u8 *) pht_cap, + sizeof(MrvlIETypes_HTCap_t)); + ptlv_pos += sizeof(MrvlIETypes_HTCap_t); + pht_cap->header.len = wlan_cpu_to_le16(pht_cap->header.len); + } + + if (ISSUPP_11ACENABLED(pmpriv->adapter->fw_cap_info) + && (pmpriv->config_bands & BAND_AAC)) { + pvht_cap = (MrvlIETypes_VHTCap_t *) ptlv_pos; + memset(pmadapter, pvht_cap, 0, sizeof(MrvlIETypes_VHTCap_t)); + pvht_cap->header.type = wlan_cpu_to_le16(VHT_CAPABILITY); + pvht_cap->header.len = sizeof(VHT_capa_t); + wlan_fill_vht_cap_tlv(pmpriv, pvht_cap, pmpriv->config_bands); + HEXDUMP("SCAN: VHT_CAPABILITIES IE", (t_u8 *) pvht_cap, + sizeof(MrvlIETypes_VHTCap_t)); + ptlv_pos += sizeof(MrvlIETypes_VHTCap_t); + pvht_cap->header.len = wlan_cpu_to_le16(pvht_cap->header.len); + } + if (wlan_is_ext_capa_support(pmpriv)) + wlan_add_ext_capa_info_ie(pmpriv, &ptlv_pos); + wlan_add_wps_probe_request_ie(pmpriv, &ptlv_pos); + + /* + * Set the output for the channel TLV to the address in the tlv buffer + * past any TLVs that were added in this function (SSID, num_probes). + * Channel TLVs will be added past this for each scan command, preserving + * the TLVs that were previously added. + */ + *ppchan_list_out = (MrvlIEtypes_ChanListParamSet_t *) ptlv_pos; + + if (puser_scan_in && puser_scan_in->chan_list[0].chan_number) { + + PRINTM(MINFO, "Scan: Using supplied channel list\n"); + + for (chan_idx = 0; + chan_idx < WLAN_USER_SCAN_CHAN_MAX + && puser_scan_in->chan_list[chan_idx].chan_number; + chan_idx++) { + + channel = + puser_scan_in->chan_list[chan_idx].chan_number; + (pscan_chan_list + chan_idx)->chan_number = channel; + + radio_type = + puser_scan_in->chan_list[chan_idx].radio_type; + (pscan_chan_list + chan_idx)->radio_type = radio_type; + + scan_type = + puser_scan_in->chan_list[chan_idx].scan_type; + if (scan_type == MLAN_SCAN_TYPE_UNCHANGED) + scan_type = pmadapter->scan_type; + + if (radio_type == HostCmd_SCAN_RADIO_TYPE_A) { + if (pmadapter->fw_bands & BAND_A) + PRINTM(MINFO, + "UserScan request for A Band channel %d!!\n", + channel); + else { + PRINTM(MERROR, + "Scan in A band is not allowed!!\n"); + ret = MLAN_STATUS_FAILURE; + LEAVE(); + return ret; + + } + } + + /* Prevent active scanning on a radar controlled + channel */ + if (radio_type == HostCmd_SCAN_RADIO_TYPE_A) { + if (wlan_11h_radar_detect_required + (pmpriv, channel)) { + scan_type = MLAN_SCAN_TYPE_PASSIVE; + } + } + if (radio_type == HostCmd_SCAN_RADIO_TYPE_BG) { + if (wlan_bg_scan_type_is_passive + (pmpriv, channel)) { + scan_type = MLAN_SCAN_TYPE_PASSIVE; + } + } + if (scan_type == MLAN_SCAN_TYPE_PASSIVE) { + (pscan_chan_list + + chan_idx)->chan_scan_mode.passive_scan = MTRUE; + } else { + (pscan_chan_list + + chan_idx)->chan_scan_mode.passive_scan = + MFALSE; + } + + if (puser_scan_in->chan_list[chan_idx].scan_time) { + scan_dur = + (t_u16) puser_scan_in-> + chan_list[chan_idx].scan_time; + } else { + if (scan_type == MLAN_SCAN_TYPE_PASSIVE) { + scan_dur = pmadapter->passive_scan_time; + } else if (*pfiltered_scan) { + scan_dur = + pmadapter->specific_scan_time; + } else { + scan_dur = pmadapter->active_scan_time; + } + } + + (pscan_chan_list + chan_idx)->min_scan_time = + wlan_cpu_to_le16(scan_dur); + (pscan_chan_list + chan_idx)->max_scan_time = + wlan_cpu_to_le16(scan_dur); + if (*pfiltered_scan) { + (pscan_chan_list + + chan_idx)->chan_scan_mode.disable_chan_filt = + MTRUE; + } + } + + /* Check if we are only scanning the current channel */ + if ((chan_idx == 1) + && (puser_scan_in->chan_list[0].chan_number + == pmpriv->curr_bss_params.bss_descriptor.channel)) { + *pscan_current_only = MTRUE; + PRINTM(MINFO, "Scan: Scanning current channel only\n"); + } + + } else { + PRINTM(MINFO, "Scan: Creating full region channel list\n"); + wlan_scan_create_channel_list(pmpriv, puser_scan_in, + pscan_chan_list, *pfiltered_scan); + } + + LEAVE(); + return ret; } /** @@ -1140,72 +1248,78 @@ wlan_scan_setup_scan_config(IN mlan_private * pmpriv, * @param pmadapter Pointer to the mlan_adapter structure * @param ptlv Pointer to the start of the TLV buffer to parse * @param tlv_buf_size Size of the TLV buffer - * @param req_tlv_type Request TLV's type + * @param req_tlv_type Request TLV's type * @param pptlv Output parameter: Pointer to the request TLV if found * * @return N/A */ static t_void wlan_ret_802_11_scan_get_tlv_ptrs(IN pmlan_adapter pmadapter, - IN MrvlIEtypes_Data_t * ptlv, - IN t_u32 tlv_buf_size, - IN t_u32 req_tlv_type, - OUT MrvlIEtypes_Data_t ** pptlv) + IN MrvlIEtypes_Data_t * ptlv, + IN t_u32 tlv_buf_size, + IN t_u32 req_tlv_type, + OUT MrvlIEtypes_Data_t ** pptlv) { - MrvlIEtypes_Data_t *pcurrent_tlv; - t_u32 tlv_buf_left; - t_u32 tlv_type; - t_u32 tlv_len; - - ENTER(); - - pcurrent_tlv = ptlv; - tlv_buf_left = tlv_buf_size; - *pptlv = MNULL; - - PRINTM(MINFO, "SCAN_RESP: tlv_buf_size = %d\n", tlv_buf_size); - - while (tlv_buf_left >= sizeof(MrvlIEtypesHeader_t)) { - - tlv_type = wlan_le16_to_cpu(pcurrent_tlv->header.type); - tlv_len = wlan_le16_to_cpu(pcurrent_tlv->header.len); - - if (sizeof(ptlv->header) + tlv_len > tlv_buf_left) { - PRINTM(MERROR, "SCAN_RESP: TLV buffer corrupt\n"); - break; - } - - if (req_tlv_type == tlv_type) { - switch (tlv_type) { - case TLV_TYPE_TSFTIMESTAMP: - PRINTM(MINFO, "SCAN_RESP: TSF Timestamp TLV, len = %d\n", - tlv_len); - *pptlv = (MrvlIEtypes_Data_t *) pcurrent_tlv; - break; - case TLV_TYPE_CHANNELBANDLIST: - PRINTM(MINFO, "SCAN_RESP: CHANNEL BAND LIST TLV, len = %d\n", - tlv_len); - *pptlv = (MrvlIEtypes_Data_t *) pcurrent_tlv; - break; - default: - PRINTM(MERROR, "SCAN_RESP: Unhandled TLV = %d\n", tlv_type); - /* Give up, this seems corrupted */ - LEAVE(); - return; - } - } - - if (*pptlv) { - // HEXDUMP("SCAN_RESP: TLV Buf", (t_u8 *)*pptlv+4, tlv_len); - break; - } - - tlv_buf_left -= (sizeof(ptlv->header) + tlv_len); - pcurrent_tlv = (MrvlIEtypes_Data_t *) (pcurrent_tlv->data + tlv_len); - - } /* while */ - - LEAVE(); + MrvlIEtypes_Data_t *pcurrent_tlv; + t_u32 tlv_buf_left; + t_u32 tlv_type; + t_u32 tlv_len; + + ENTER(); + + pcurrent_tlv = ptlv; + tlv_buf_left = tlv_buf_size; + *pptlv = MNULL; + + PRINTM(MINFO, "SCAN_RESP: tlv_buf_size = %d\n", tlv_buf_size); + + while (tlv_buf_left >= sizeof(MrvlIEtypesHeader_t)) { + + tlv_type = wlan_le16_to_cpu(pcurrent_tlv->header.type); + tlv_len = wlan_le16_to_cpu(pcurrent_tlv->header.len); + + if (sizeof(ptlv->header) + tlv_len > tlv_buf_left) { + PRINTM(MERROR, "SCAN_RESP: TLV buffer corrupt\n"); + break; + } + + if (req_tlv_type == tlv_type) { + switch (tlv_type) { + case TLV_TYPE_TSFTIMESTAMP: + PRINTM(MINFO, + "SCAN_RESP: TSF Timestamp TLV, len = %d\n", + tlv_len); + *pptlv = (MrvlIEtypes_Data_t *) pcurrent_tlv; + break; + case TLV_TYPE_CHANNELBANDLIST: + PRINTM(MINFO, + "SCAN_RESP: CHANNEL BAND LIST TLV, len = %d\n", + tlv_len); + *pptlv = (MrvlIEtypes_Data_t *) pcurrent_tlv; + break; + default: + PRINTM(MERROR, + "SCAN_RESP: Unhandled TLV = %d\n", + tlv_type); + /* Give up, this seems corrupted */ + LEAVE(); + return; + } + } + + if (*pptlv) { + // HEXDUMP("SCAN_RESP: TLV Buf", (t_u8 *)*pptlv+4, + // tlv_len); + break; + } + + tlv_buf_left -= (sizeof(ptlv->header) + tlv_len); + pcurrent_tlv = + (MrvlIEtypes_Data_t *) (pcurrent_tlv->data + tlv_len); + + } /* while */ + + LEAVE(); } /** @@ -1225,487 +1339,552 @@ wlan_ret_802_11_scan_get_tlv_ptrs(IN pmlan_adapter pmadapter, */ static mlan_status wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, - OUT BSSDescriptor_t * pbss_entry, - IN t_u8 ** pbeacon_info, - IN t_u32 * bytes_left, IN t_u8 ext_scan) + OUT BSSDescriptor_t * pbss_entry, + IN t_u8 ** pbeacon_info, + IN t_u32 * bytes_left, IN t_u8 ext_scan) { - mlan_status ret = MLAN_STATUS_SUCCESS; - IEEEtypes_ElementId_e element_id; - IEEEtypes_FhParamSet_t *pfh_param_set; - IEEEtypes_DsParamSet_t *pds_param_set; - IEEEtypes_CfParamSet_t *pcf_param_set; - IEEEtypes_IbssParamSet_t *pibss_param_set; - IEEEtypes_CapInfo_t *pcap_info; - WLAN_802_11_FIXED_IEs fixed_ie; - t_u8 *pcurrent_ptr; - t_u8 *prate; - t_u8 element_len; - t_u16 total_ie_len; - t_u8 bytes_to_copy; - t_u8 rate_size; - t_u16 beacon_size; - t_u8 found_data_rate_ie; - t_u32 bytes_left_for_current_beacon; - IEEEtypes_ERPInfo_t *perp_info; - - IEEEtypes_VendorSpecific_t *pvendor_ie; - const t_u8 wpa_oui[4] = { 0x00, 0x50, 0xf2, 0x01 }; - const t_u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 }; - - IEEEtypes_CountryInfoSet_t *pcountry_info; - - ENTER(); - - found_data_rate_ie = MFALSE; - rate_size = 0; - beacon_size = 0; - - if (*bytes_left >= sizeof(beacon_size)) { - /* Extract & convert beacon size from the command buffer */ - memcpy(pmadapter, &beacon_size, *pbeacon_info, sizeof(beacon_size)); - beacon_size = wlan_le16_to_cpu(beacon_size); - *bytes_left -= sizeof(beacon_size); - *pbeacon_info += sizeof(beacon_size); - } - - if (!beacon_size || beacon_size > *bytes_left) { - - *pbeacon_info += *bytes_left; - *bytes_left = 0; - - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - /* Initialize the current working beacon pointer for this BSS iteration */ - pcurrent_ptr = *pbeacon_info; - - /* Advance the return beacon pointer past the current beacon */ - *pbeacon_info += beacon_size; - *bytes_left -= beacon_size; - - bytes_left_for_current_beacon = beacon_size; - - if (bytes_left_for_current_beacon < - (MLAN_MAC_ADDR_LENGTH + sizeof(t_u8) + sizeof(WLAN_802_11_FIXED_IEs))) { - PRINTM(MERROR, "InterpretIE: Not enough bytes left\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - memcpy(pmadapter, pbss_entry->mac_address, pcurrent_ptr, - MLAN_MAC_ADDR_LENGTH); - PRINTM(MINFO, "InterpretIE: AP MAC Addr-" MACSTR "\n", - MAC2STR(pbss_entry->mac_address)); - - pcurrent_ptr += MLAN_MAC_ADDR_LENGTH; - bytes_left_for_current_beacon -= MLAN_MAC_ADDR_LENGTH; - - /* - * Next 4 fields are RSSI (for legacy scan only), time stamp, - * beacon interval, and capability information - */ - if (!ext_scan) { - /* RSSI is 1 byte long */ - pbss_entry->rssi = (t_s32) (*pcurrent_ptr); - PRINTM(MINFO, "InterpretIE: RSSI=%02X\n", *pcurrent_ptr); - pcurrent_ptr += 1; - bytes_left_for_current_beacon -= 1; - } - - /* - * The RSSI is not part of the beacon/probe response. After we have - * advanced pcurrent_ptr past the RSSI field, save the remaining - * data for use at the application layer - */ - pbss_entry->pbeacon_buf = pcurrent_ptr; - pbss_entry->beacon_buf_size = bytes_left_for_current_beacon; - - /* Time stamp is 8 bytes long */ - memcpy(pmadapter, fixed_ie.time_stamp, pcurrent_ptr, 8); - memcpy(pmadapter, pbss_entry->time_stamp, pcurrent_ptr, 8); - pcurrent_ptr += 8; - bytes_left_for_current_beacon -= 8; - - /* Beacon interval is 2 bytes long */ - memcpy(pmadapter, &fixed_ie.beacon_interval, pcurrent_ptr, 2); - pbss_entry->beacon_period = wlan_le16_to_cpu(fixed_ie.beacon_interval); - pcurrent_ptr += 2; - bytes_left_for_current_beacon -= 2; - - /* Capability information is 2 bytes long */ - memcpy(pmadapter, &fixed_ie.capabilities, pcurrent_ptr, 2); - PRINTM(MINFO, "InterpretIE: fixed_ie.capabilities=0x%X\n", - fixed_ie.capabilities); - fixed_ie.capabilities = wlan_le16_to_cpu(fixed_ie.capabilities); - pcap_info = (IEEEtypes_CapInfo_t *) & fixed_ie.capabilities; - memcpy(pmadapter, &pbss_entry->cap_info, pcap_info, - sizeof(IEEEtypes_CapInfo_t)); - pcurrent_ptr += 2; - bytes_left_for_current_beacon -= 2; - - /* Rest of the current buffer are IE's */ - PRINTM(MINFO, "InterpretIE: IELength for this AP = %d\n", - bytes_left_for_current_beacon); - - HEXDUMP("InterpretIE: IE info", (t_u8 *) pcurrent_ptr, - bytes_left_for_current_beacon); - - if (pcap_info->privacy) { - PRINTM(MINFO, "InterpretIE: AP WEP enabled\n"); - pbss_entry->privacy = Wlan802_11PrivFilter8021xWEP; - } else { - pbss_entry->privacy = Wlan802_11PrivFilterAcceptAll; - } - - if (pcap_info->ibss == 1) { - pbss_entry->bss_mode = MLAN_BSS_MODE_IBSS; - } else { - pbss_entry->bss_mode = MLAN_BSS_MODE_INFRA; - } - - if (pcap_info->spectrum_mgmt == 1) { - PRINTM(MINFO, "InterpretIE: 11h- Spectrum Management " - "capability bit found\n"); - pbss_entry->wlan_11h_bss_info.sensed_11h = 1; - } - - /* Process variable IE */ - while (bytes_left_for_current_beacon >= 2) { - element_id = (IEEEtypes_ElementId_e) (*((t_u8 *) pcurrent_ptr)); - element_len = *((t_u8 *) pcurrent_ptr + 1); - total_ie_len = element_len + sizeof(IEEEtypes_Header_t); - - if (bytes_left_for_current_beacon < total_ie_len) { - PRINTM(MERROR, "InterpretIE: Error in processing IE, " - "bytes left < IE length\n"); - bytes_left_for_current_beacon = 0; - continue; - } - - switch (element_id) { - - case SSID: - if (element_len > MRVDRV_MAX_SSID_LENGTH) { - bytes_left_for_current_beacon = 0; - continue; - } - if (!pbss_entry->ssid.ssid_len) { - pbss_entry->ssid.ssid_len = element_len; - memcpy(pmadapter, pbss_entry->ssid.ssid, (pcurrent_ptr + 2), - element_len); - } - PRINTM(MINFO, "InterpretIE: ssid: %-32s\n", pbss_entry->ssid.ssid); - break; - - case SUPPORTED_RATES: - if (element_len > WLAN_SUPPORTED_RATES) { - bytes_left_for_current_beacon = 0; - continue; - } - memcpy(pmadapter, pbss_entry->data_rates, pcurrent_ptr + 2, - element_len); - memcpy(pmadapter, pbss_entry->supported_rates, pcurrent_ptr + 2, - element_len); - HEXDUMP("InterpretIE: SupportedRates:", pbss_entry->supported_rates, - element_len); - rate_size = element_len; - found_data_rate_ie = MTRUE; - break; - - case FH_PARAM_SET: - pfh_param_set = (IEEEtypes_FhParamSet_t *) pcurrent_ptr; - pbss_entry->network_type_use = Wlan802_11FH; - memcpy(pmadapter, &pbss_entry->phy_param_set.fh_param_set, - pfh_param_set, MIN(total_ie_len, - sizeof(IEEEtypes_FhParamSet_t))); - pbss_entry->phy_param_set.fh_param_set.len = - MIN(element_len, (sizeof(IEEEtypes_FhParamSet_t) - - sizeof(IEEEtypes_Header_t))); - pbss_entry->phy_param_set.fh_param_set.dwell_time - = - wlan_le16_to_cpu(pbss_entry->phy_param_set.fh_param_set. - dwell_time); - break; - - case DS_PARAM_SET: - pds_param_set = (IEEEtypes_DsParamSet_t *) pcurrent_ptr; - - pbss_entry->network_type_use = Wlan802_11DS; - pbss_entry->channel = pds_param_set->current_chan; - - memcpy(pmadapter, &pbss_entry->phy_param_set.ds_param_set, - pds_param_set, MIN(total_ie_len, - sizeof(IEEEtypes_DsParamSet_t))); - pbss_entry->phy_param_set.ds_param_set.len = - MIN(element_len, (sizeof(IEEEtypes_DsParamSet_t) - - sizeof(IEEEtypes_Header_t))); - break; - - case CF_PARAM_SET: - pcf_param_set = (IEEEtypes_CfParamSet_t *) pcurrent_ptr; - memcpy(pmadapter, &pbss_entry->ss_param_set.cf_param_set, - pcf_param_set, MIN(total_ie_len, - sizeof(IEEEtypes_CfParamSet_t))); - pbss_entry->ss_param_set.cf_param_set.len = - MIN(element_len, (sizeof(IEEEtypes_CfParamSet_t) - - sizeof(IEEEtypes_Header_t))); - break; - - case IBSS_PARAM_SET: - pibss_param_set = (IEEEtypes_IbssParamSet_t *) pcurrent_ptr; - pbss_entry->atim_window = - wlan_le16_to_cpu(pibss_param_set->atim_window); - memcpy(pmadapter, &pbss_entry->ss_param_set.ibss_param_set, - pibss_param_set, MIN(total_ie_len, - sizeof(IEEEtypes_IbssParamSet_t))); - pbss_entry->ss_param_set.ibss_param_set.len = - MIN(element_len, (sizeof(IEEEtypes_IbssParamSet_t) - - sizeof(IEEEtypes_Header_t))); - break; - - /* Handle Country Info IE */ - case COUNTRY_INFO: - pcountry_info = (IEEEtypes_CountryInfoSet_t *) pcurrent_ptr; - - if (pcountry_info->len < sizeof(pcountry_info->country_code) || - (unsigned) (pcountry_info->len + 2) > - sizeof(IEEEtypes_CountryInfoFullSet_t)) { - PRINTM(MERROR, - "InterpretIE: 11D- Err " - "country_info len =%d min=%d max=%d\n", - pcountry_info->len, sizeof(pcountry_info->country_code), - sizeof(IEEEtypes_CountryInfoFullSet_t)); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - memcpy(pmadapter, &pbss_entry->country_info, - pcountry_info, pcountry_info->len + 2); - HEXDUMP("InterpretIE: 11D- country_info:", - (t_u8 *) pcountry_info, (t_u32) (pcountry_info->len + 2)); - break; - - case ERP_INFO: - perp_info = (IEEEtypes_ERPInfo_t *) pcurrent_ptr; - pbss_entry->erp_flags = perp_info->erp_flags; - break; - - case POWER_CONSTRAINT: - case POWER_CAPABILITY: - case TPC_REPORT: - case CHANNEL_SWITCH_ANN: - case QUIET: - case IBSS_DFS: - case SUPPORTED_CHANNELS: - case TPC_REQUEST: - wlan_11h_process_bss_elem(pmadapter, &pbss_entry->wlan_11h_bss_info, - pcurrent_ptr); - break; - case EXTENDED_SUPPORTED_RATES: - /* - * Only process extended supported rate - * if data rate is already found. - * Data rate IE should come before - * extended supported rate IE - */ - if (found_data_rate_ie) { - if ((element_len + rate_size) > WLAN_SUPPORTED_RATES) { - bytes_to_copy = (WLAN_SUPPORTED_RATES - rate_size); - } else { - bytes_to_copy = element_len; - } - - prate = (t_u8 *) pbss_entry->data_rates; - prate += rate_size; - memcpy(pmadapter, prate, pcurrent_ptr + 2, bytes_to_copy); - - prate = (t_u8 *) pbss_entry->supported_rates; - prate += rate_size; - memcpy(pmadapter, prate, pcurrent_ptr + 2, bytes_to_copy); - } - HEXDUMP("InterpretIE: ExtSupportedRates:", - pbss_entry->supported_rates, element_len + rate_size); - break; - - case VENDOR_SPECIFIC_221: - pvendor_ie = (IEEEtypes_VendorSpecific_t *) pcurrent_ptr; - - if (!memcmp - (pmadapter, pvendor_ie->vend_hdr.oui, wpa_oui, - sizeof(wpa_oui))) { - pbss_entry->pwpa_ie = - (IEEEtypes_VendorSpecific_t *) pcurrent_ptr; - pbss_entry->wpa_offset = - (t_u16) (pcurrent_ptr - pbss_entry->pbeacon_buf); - HEXDUMP("InterpretIE: Resp WPA_IE", - (t_u8 *) pbss_entry->pwpa_ie, - ((*(pbss_entry->pwpa_ie)).vend_hdr.len + - sizeof(IEEEtypes_Header_t))); - } else - if (!memcmp - (pmadapter, pvendor_ie->vend_hdr.oui, wmm_oui, - sizeof(wmm_oui))) { - if (total_ie_len == sizeof(IEEEtypes_WmmParameter_t) - || total_ie_len == sizeof(IEEEtypes_WmmInfo_t)) { - - /* - * Only accept and copy the WMM IE if it matches - * the size expected for the WMM Info IE or the - * WMM Parameter IE. - */ - memcpy(pmadapter, (t_u8 *) & pbss_entry->wmm_ie, - pcurrent_ptr, total_ie_len); - HEXDUMP("InterpretIE: Resp WMM_IE", - (t_u8 *) & pbss_entry->wmm_ie, total_ie_len); - } - } - break; - case RSN_IE: - pbss_entry->prsn_ie = (IEEEtypes_Generic_t *) pcurrent_ptr; - pbss_entry->rsn_offset = - (t_u16) (pcurrent_ptr - pbss_entry->pbeacon_buf); - HEXDUMP("InterpretIE: Resp RSN_IE", (t_u8 *) pbss_entry->prsn_ie, - (*(pbss_entry->prsn_ie)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); - break; - case WAPI_IE: - pbss_entry->pwapi_ie = (IEEEtypes_Generic_t *) pcurrent_ptr; - pbss_entry->wapi_offset = - (t_u16) (pcurrent_ptr - pbss_entry->pbeacon_buf); - HEXDUMP("InterpretIE: Resp WAPI_IE", (t_u8 *) pbss_entry->pwapi_ie, - (*(pbss_entry->pwapi_ie)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); - break; - case HT_CAPABILITY: - pbss_entry->pht_cap = (IEEEtypes_HTCap_t *) pcurrent_ptr; - pbss_entry->ht_cap_offset = - (t_u16) (pcurrent_ptr - pbss_entry->pbeacon_buf); - HEXDUMP("InterpretIE: Resp HTCAP_IE", (t_u8 *) pbss_entry->pht_cap, - (*(pbss_entry->pht_cap)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); - break; - case HT_OPERATION: - pbss_entry->pht_info = (IEEEtypes_HTInfo_t *) pcurrent_ptr; - pbss_entry->ht_info_offset = - (t_u16) (pcurrent_ptr - pbss_entry->pbeacon_buf); - HEXDUMP("InterpretIE: Resp HTINFO_IE", - (t_u8 *) pbss_entry->pht_info, - (*(pbss_entry->pht_info)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); - break; - case BSSCO_2040: - pbss_entry->pbss_co_2040 = (IEEEtypes_2040BSSCo_t *) pcurrent_ptr; - pbss_entry->bss_co_2040_offset = - (t_u16) (pcurrent_ptr - pbss_entry->pbeacon_buf); - HEXDUMP("InterpretIE: Resp 2040BSSCOEXISTANCE_IE", - (t_u8 *) pbss_entry->pbss_co_2040, - (*(pbss_entry->pbss_co_2040)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); - break; - case EXT_CAPABILITY: - pbss_entry->pext_cap = (IEEEtypes_ExtCap_t *) pcurrent_ptr; - pbss_entry->ext_cap_offset = - (t_u16) (pcurrent_ptr - pbss_entry->pbeacon_buf); - HEXDUMP("InterpretIE: Resp EXTCAP_IE", - (t_u8 *) pbss_entry->pext_cap, - (*(pbss_entry->pext_cap)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); - break; - case OVERLAPBSSSCANPARAM: - pbss_entry->poverlap_bss_scan_param = - (IEEEtypes_OverlapBSSScanParam_t *) pcurrent_ptr; - pbss_entry->overlap_bss_offset = - (t_u16) (pcurrent_ptr - pbss_entry->pbeacon_buf); - HEXDUMP("InterpretIE: Resp OBSS_IE", - (t_u8 *) pbss_entry->poverlap_bss_scan_param, - (*(pbss_entry->poverlap_bss_scan_param)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); - break; - case VHT_CAPABILITY: - pbss_entry->pvht_cap = (IEEEtypes_VHTCap_t *) pcurrent_ptr; - pbss_entry->vht_cap_offset = - (t_u16) (pcurrent_ptr - pbss_entry->pbeacon_buf); - HEXDUMP("InterpretIE: Resp VHTCAP_IE", - (t_u8 *) pbss_entry->pvht_cap, - (*(pbss_entry->pvht_cap)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); - break; - case VHT_OPERATION: - pbss_entry->pvht_oprat = (IEEEtypes_VHTOprat_t *) pcurrent_ptr; - pbss_entry->vht_oprat_offset = - (t_u16) (pcurrent_ptr - pbss_entry->pbeacon_buf); - HEXDUMP("InterpretIE: Resp VHTOPER_IE", - (t_u8 *) pbss_entry->pvht_oprat, - (*(pbss_entry->pvht_oprat)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); - break; - case EXT_BSS_LOAD: - pbss_entry->pext_bssload = (IEEEtypes_ExtBSSload_t *) pcurrent_ptr; - pbss_entry->ext_bssload_offset = - (t_u16) (pcurrent_ptr - pbss_entry->pbeacon_buf); - HEXDUMP("InterpretIE: Resp EXTBSSLOAD_IE", - (t_u8 *) pbss_entry->pext_bssload, - (*(pbss_entry->pext_bssload)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); - break; - case VHT_TX_POWER_ENV: - pbss_entry->pvht_txpower = (IEEEtypes_VHTtxpower_t *) pcurrent_ptr; - pbss_entry->vht_txpower_offset = - (t_u16) (pcurrent_ptr - pbss_entry->pbeacon_buf); - HEXDUMP("InterpretIE: Resp TXPOW_IE", - (t_u8 *) pbss_entry->pvht_txpower, - (*(pbss_entry->pvht_txpower)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); - break; - case EXT_POWER_CONSTR: - pbss_entry->pext_pwer = (IEEEtypes_ExtPwerCons_t *) pcurrent_ptr; - pbss_entry->ext_pwer_offset = - (t_u16) (pcurrent_ptr - pbss_entry->pbeacon_buf); - HEXDUMP("InterpretIE: Resp EXTPOW_IE", - (t_u8 *) pbss_entry->pext_pwer, - (*(pbss_entry->pext_pwer)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); - break; - case QUIET_CHAN: - pbss_entry->pquiet_chan = (IEEEtypes_QuietChan_t *) pcurrent_ptr; - pbss_entry->quiet_chan_offset = - (t_u16) (pcurrent_ptr - pbss_entry->pbeacon_buf); - HEXDUMP("InterpretIE: Resp QUIETCHAN_IE", - (t_u8 *) pbss_entry->pquiet_chan, - (*(pbss_entry->pquiet_chan)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); - break; - case BW_CHANNEL_SWITCH: - /* RANDYTODO */ - break; - case AID_INFO: - break; - case OPER_MODE_NTF: - pbss_entry->poper_mode = (IEEEtypes_OperModeNtf_t *) pcurrent_ptr; - pbss_entry->oper_mode_offset = - (t_u16) (pcurrent_ptr - pbss_entry->pbeacon_buf); - HEXDUMP("InterpretIE: Resp OPERMODENTF_IE", - (t_u8 *) pbss_entry->poper_mode, - (*(pbss_entry->poper_mode)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); - break; - } - - pcurrent_ptr += element_len + 2; - - /* Need to account for IE ID and IE Len */ - bytes_left_for_current_beacon -= (element_len + 2); - - } /* while (bytes_left_for_current_beacon > 2) */ - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + IEEEtypes_ElementId_e element_id; + IEEEtypes_FhParamSet_t *pfh_param_set; + IEEEtypes_DsParamSet_t *pds_param_set; + IEEEtypes_CfParamSet_t *pcf_param_set; + IEEEtypes_IbssParamSet_t *pibss_param_set; + IEEEtypes_CapInfo_t *pcap_info; + WLAN_802_11_FIXED_IEs fixed_ie; + t_u8 *pcurrent_ptr; + t_u8 *prate; + t_u8 element_len; + t_u16 total_ie_len; + t_u8 bytes_to_copy; + t_u8 rate_size; + t_u16 beacon_size; + t_u8 found_data_rate_ie; + t_u32 bytes_left_for_current_beacon; + IEEEtypes_ERPInfo_t *perp_info; + + IEEEtypes_VendorSpecific_t *pvendor_ie; + const t_u8 wpa_oui[4] = { 0x00, 0x50, 0xf2, 0x01 }; + const t_u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 }; + + IEEEtypes_CountryInfoSet_t *pcountry_info; + + ENTER(); + + found_data_rate_ie = MFALSE; + rate_size = 0; + beacon_size = 0; + + if (*bytes_left >= sizeof(beacon_size)) { + /* Extract & convert beacon size from the command buffer */ + memcpy(pmadapter, &beacon_size, *pbeacon_info, + sizeof(beacon_size)); + beacon_size = wlan_le16_to_cpu(beacon_size); + *bytes_left -= sizeof(beacon_size); + *pbeacon_info += sizeof(beacon_size); + } + + if (!beacon_size || beacon_size > *bytes_left) { + + *pbeacon_info += *bytes_left; + *bytes_left = 0; + + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + /* Initialize the current working beacon pointer for this BSS iteration + */ + pcurrent_ptr = *pbeacon_info; + + /* Advance the return beacon pointer past the current beacon */ + *pbeacon_info += beacon_size; + *bytes_left -= beacon_size; + + bytes_left_for_current_beacon = beacon_size; + + if (bytes_left_for_current_beacon < + (MLAN_MAC_ADDR_LENGTH + sizeof(t_u8) + + sizeof(WLAN_802_11_FIXED_IEs))) { + PRINTM(MERROR, "InterpretIE: Not enough bytes left\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + memcpy(pmadapter, pbss_entry->mac_address, pcurrent_ptr, + MLAN_MAC_ADDR_LENGTH); + PRINTM(MINFO, "InterpretIE: AP MAC Addr-" MACSTR "\n", + MAC2STR(pbss_entry->mac_address)); + + pcurrent_ptr += MLAN_MAC_ADDR_LENGTH; + bytes_left_for_current_beacon -= MLAN_MAC_ADDR_LENGTH; + + /* + * Next 4 fields are RSSI (for legacy scan only), time stamp, + * beacon interval, and capability information + */ + if (!ext_scan) { + /* RSSI is 1 byte long */ + pbss_entry->rssi = (t_s32) (*pcurrent_ptr); + PRINTM(MINFO, "InterpretIE: RSSI=%02X\n", *pcurrent_ptr); + pcurrent_ptr += 1; + bytes_left_for_current_beacon -= 1; + } + + /* + * The RSSI is not part of the beacon/probe response. After we have + * advanced pcurrent_ptr past the RSSI field, save the remaining + * data for use at the application layer + */ + pbss_entry->pbeacon_buf = pcurrent_ptr; + pbss_entry->beacon_buf_size = bytes_left_for_current_beacon; + + /* Time stamp is 8 bytes long */ + memcpy(pmadapter, fixed_ie.time_stamp, pcurrent_ptr, 8); + memcpy(pmadapter, pbss_entry->time_stamp, pcurrent_ptr, 8); + pcurrent_ptr += 8; + bytes_left_for_current_beacon -= 8; + + /* Beacon interval is 2 bytes long */ + memcpy(pmadapter, &fixed_ie.beacon_interval, pcurrent_ptr, 2); + pbss_entry->beacon_period = wlan_le16_to_cpu(fixed_ie.beacon_interval); + pcurrent_ptr += 2; + bytes_left_for_current_beacon -= 2; + + /* Capability information is 2 bytes long */ + memcpy(pmadapter, &fixed_ie.capabilities, pcurrent_ptr, 2); + PRINTM(MINFO, "InterpretIE: fixed_ie.capabilities=0x%X\n", + fixed_ie.capabilities); + fixed_ie.capabilities = wlan_le16_to_cpu(fixed_ie.capabilities); + pcap_info = (IEEEtypes_CapInfo_t *) & fixed_ie.capabilities; + memcpy(pmadapter, &pbss_entry->cap_info, pcap_info, + sizeof(IEEEtypes_CapInfo_t)); + pcurrent_ptr += 2; + bytes_left_for_current_beacon -= 2; + + /* Rest of the current buffer are IE's */ + PRINTM(MINFO, "InterpretIE: IELength for this AP = %d\n", + bytes_left_for_current_beacon); + + HEXDUMP("InterpretIE: IE info", (t_u8 *) pcurrent_ptr, + bytes_left_for_current_beacon); + + if (pcap_info->privacy) { + PRINTM(MINFO, "InterpretIE: AP WEP enabled\n"); + pbss_entry->privacy = Wlan802_11PrivFilter8021xWEP; + } else { + pbss_entry->privacy = Wlan802_11PrivFilterAcceptAll; + } + + if (pcap_info->ibss == 1) { + pbss_entry->bss_mode = MLAN_BSS_MODE_IBSS; + } else { + pbss_entry->bss_mode = MLAN_BSS_MODE_INFRA; + } + + if (pcap_info->spectrum_mgmt == 1) { + PRINTM(MINFO, "InterpretIE: 11h- Spectrum Management " + "capability bit found\n"); + pbss_entry->wlan_11h_bss_info.sensed_11h = 1; + } + + /* Process variable IE */ + while (bytes_left_for_current_beacon >= 2) { + element_id = (IEEEtypes_ElementId_e) (*((t_u8 *) pcurrent_ptr)); + element_len = *((t_u8 *) pcurrent_ptr + 1); + total_ie_len = element_len + sizeof(IEEEtypes_Header_t); + + if (bytes_left_for_current_beacon < total_ie_len) { + PRINTM(MERROR, "InterpretIE: Error in processing IE, " + "bytes left < IE length\n"); + bytes_left_for_current_beacon = 0; + continue; + } + + switch (element_id) { + + case SSID: + if (element_len > MRVDRV_MAX_SSID_LENGTH) { + bytes_left_for_current_beacon = 0; + continue; + } + if (!pbss_entry->ssid.ssid_len) { + pbss_entry->ssid.ssid_len = element_len; + memcpy(pmadapter, pbss_entry->ssid.ssid, + (pcurrent_ptr + 2), element_len); + } + PRINTM(MINFO, "InterpretIE: ssid: %-32s\n", + pbss_entry->ssid.ssid); + break; + + case SUPPORTED_RATES: + if (element_len > WLAN_SUPPORTED_RATES) { + bytes_left_for_current_beacon = 0; + continue; + } + memcpy(pmadapter, pbss_entry->data_rates, + pcurrent_ptr + 2, element_len); + memcpy(pmadapter, pbss_entry->supported_rates, + pcurrent_ptr + 2, element_len); + HEXDUMP("InterpretIE: SupportedRates:", + pbss_entry->supported_rates, element_len); + rate_size = element_len; + found_data_rate_ie = MTRUE; + break; + + case FH_PARAM_SET: + pfh_param_set = (IEEEtypes_FhParamSet_t *) pcurrent_ptr; + pbss_entry->network_type_use = Wlan802_11FH; + memcpy(pmadapter, + &pbss_entry->phy_param_set.fh_param_set, + pfh_param_set, MIN(total_ie_len, + sizeof + (IEEEtypes_FhParamSet_t))); + pbss_entry->phy_param_set.fh_param_set.len = + MIN(element_len, (sizeof(IEEEtypes_FhParamSet_t) + - + sizeof(IEEEtypes_Header_t))); + pbss_entry->phy_param_set.fh_param_set.dwell_time = + wlan_le16_to_cpu(pbss_entry->phy_param_set. + fh_param_set.dwell_time); + break; + + case DS_PARAM_SET: + pds_param_set = (IEEEtypes_DsParamSet_t *) pcurrent_ptr; + + pbss_entry->network_type_use = Wlan802_11DS; + pbss_entry->channel = pds_param_set->current_chan; + + memcpy(pmadapter, + &pbss_entry->phy_param_set.ds_param_set, + pds_param_set, MIN(total_ie_len, + sizeof + (IEEEtypes_DsParamSet_t))); + pbss_entry->phy_param_set.ds_param_set.len = + MIN(element_len, (sizeof(IEEEtypes_DsParamSet_t) + - + sizeof(IEEEtypes_Header_t))); + break; + + case CF_PARAM_SET: + pcf_param_set = (IEEEtypes_CfParamSet_t *) pcurrent_ptr; + memcpy(pmadapter, + &pbss_entry->ss_param_set.cf_param_set, + pcf_param_set, MIN(total_ie_len, + sizeof + (IEEEtypes_CfParamSet_t))); + pbss_entry->ss_param_set.cf_param_set.len = + MIN(element_len, (sizeof(IEEEtypes_CfParamSet_t) + - + sizeof(IEEEtypes_Header_t))); + break; + + case IBSS_PARAM_SET: + pibss_param_set = + (IEEEtypes_IbssParamSet_t *) pcurrent_ptr; + pbss_entry->atim_window = + wlan_le16_to_cpu(pibss_param_set->atim_window); + memcpy(pmadapter, + &pbss_entry->ss_param_set.ibss_param_set, + pibss_param_set, MIN(total_ie_len, + sizeof + (IEEEtypes_IbssParamSet_t))); + pbss_entry->ss_param_set.ibss_param_set.len = + MIN(element_len, + (sizeof(IEEEtypes_IbssParamSet_t) + - sizeof(IEEEtypes_Header_t))); + break; + + /* Handle Country Info IE */ + case COUNTRY_INFO: + pcountry_info = + (IEEEtypes_CountryInfoSet_t *) pcurrent_ptr; + + if (pcountry_info->len < + sizeof(pcountry_info->country_code) || + (unsigned)(pcountry_info->len + 2) > + sizeof(IEEEtypes_CountryInfoFullSet_t)) { + PRINTM(MERROR, + "InterpretIE: 11D- Err " + "country_info len =%d min=%d max=%d\n", + pcountry_info->len, + sizeof(pcountry_info->country_code), + sizeof(IEEEtypes_CountryInfoFullSet_t)); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + memcpy(pmadapter, &pbss_entry->country_info, + pcountry_info, pcountry_info->len + 2); + HEXDUMP("InterpretIE: 11D- country_info:", + (t_u8 *) pcountry_info, + (t_u32) (pcountry_info->len + 2)); + break; + + case ERP_INFO: + perp_info = (IEEEtypes_ERPInfo_t *) pcurrent_ptr; + pbss_entry->erp_flags = perp_info->erp_flags; + break; + + case POWER_CONSTRAINT: + case POWER_CAPABILITY: + case TPC_REPORT: + case CHANNEL_SWITCH_ANN: + case QUIET: + case IBSS_DFS: + case SUPPORTED_CHANNELS: + case TPC_REQUEST: + wlan_11h_process_bss_elem(pmadapter, + &pbss_entry-> + wlan_11h_bss_info, + pcurrent_ptr); + break; + case EXTENDED_SUPPORTED_RATES: + /* + * Only process extended supported rate + * if data rate is already found. + * Data rate IE should come before + * extended supported rate IE + */ + if (found_data_rate_ie) { + if ((element_len + rate_size) > + WLAN_SUPPORTED_RATES) { + bytes_to_copy = + (WLAN_SUPPORTED_RATES - + rate_size); + } else { + bytes_to_copy = element_len; + } + + prate = (t_u8 *) pbss_entry->data_rates; + prate += rate_size; + memcpy(pmadapter, prate, pcurrent_ptr + 2, + bytes_to_copy); + + prate = (t_u8 *) pbss_entry->supported_rates; + prate += rate_size; + memcpy(pmadapter, prate, pcurrent_ptr + 2, + bytes_to_copy); + } + HEXDUMP("InterpretIE: ExtSupportedRates:", + pbss_entry->supported_rates, + element_len + rate_size); + break; + + case VENDOR_SPECIFIC_221: + pvendor_ie = + (IEEEtypes_VendorSpecific_t *) pcurrent_ptr; + + if (!memcmp + (pmadapter, pvendor_ie->vend_hdr.oui, wpa_oui, + sizeof(wpa_oui))) { + pbss_entry->pwpa_ie = + (IEEEtypes_VendorSpecific_t *) + pcurrent_ptr; + pbss_entry->wpa_offset = + (t_u16) (pcurrent_ptr - + pbss_entry->pbeacon_buf); + HEXDUMP("InterpretIE: Resp WPA_IE", + (t_u8 *) pbss_entry->pwpa_ie, + ((*(pbss_entry->pwpa_ie)).vend_hdr.len + + sizeof(IEEEtypes_Header_t))); + } else if (!memcmp + (pmadapter, pvendor_ie->vend_hdr.oui, + wmm_oui, sizeof(wmm_oui))) { + if (total_ie_len == + sizeof(IEEEtypes_WmmParameter_t) + || total_ie_len == + sizeof(IEEEtypes_WmmInfo_t)) { + + /* + * Only accept and copy the WMM IE if it matches + * the size expected for the WMM Info IE or the + * WMM Parameter IE. + */ + memcpy(pmadapter, + (t_u8 *) & pbss_entry->wmm_ie, + pcurrent_ptr, total_ie_len); + HEXDUMP("InterpretIE: Resp WMM_IE", + (t_u8 *) & pbss_entry->wmm_ie, + total_ie_len); + } + } + break; + case RSN_IE: + pbss_entry->prsn_ie = + (IEEEtypes_Generic_t *) pcurrent_ptr; + pbss_entry->rsn_offset = + (t_u16) (pcurrent_ptr - + pbss_entry->pbeacon_buf); + HEXDUMP("InterpretIE: Resp RSN_IE", + (t_u8 *) pbss_entry->prsn_ie, + (*(pbss_entry->prsn_ie)).ieee_hdr.len + + sizeof(IEEEtypes_Header_t)); + break; + case WAPI_IE: + pbss_entry->pwapi_ie = + (IEEEtypes_Generic_t *) pcurrent_ptr; + pbss_entry->wapi_offset = + (t_u16) (pcurrent_ptr - + pbss_entry->pbeacon_buf); + HEXDUMP("InterpretIE: Resp WAPI_IE", + (t_u8 *) pbss_entry->pwapi_ie, + (*(pbss_entry->pwapi_ie)).ieee_hdr.len + + sizeof(IEEEtypes_Header_t)); + break; + case HT_CAPABILITY: + pbss_entry->pht_cap = + (IEEEtypes_HTCap_t *) pcurrent_ptr; + pbss_entry->ht_cap_offset = + (t_u16) (pcurrent_ptr - + pbss_entry->pbeacon_buf); + HEXDUMP("InterpretIE: Resp HTCAP_IE", + (t_u8 *) pbss_entry->pht_cap, + (*(pbss_entry->pht_cap)).ieee_hdr.len + + sizeof(IEEEtypes_Header_t)); + break; + case HT_OPERATION: + pbss_entry->pht_info = + (IEEEtypes_HTInfo_t *) pcurrent_ptr; + pbss_entry->ht_info_offset = + (t_u16) (pcurrent_ptr - + pbss_entry->pbeacon_buf); + HEXDUMP("InterpretIE: Resp HTINFO_IE", + (t_u8 *) pbss_entry->pht_info, + (*(pbss_entry->pht_info)).ieee_hdr.len + + sizeof(IEEEtypes_Header_t)); + break; + case BSSCO_2040: + pbss_entry->pbss_co_2040 = + (IEEEtypes_2040BSSCo_t *) pcurrent_ptr; + pbss_entry->bss_co_2040_offset = + (t_u16) (pcurrent_ptr - + pbss_entry->pbeacon_buf); + HEXDUMP("InterpretIE: Resp 2040BSSCOEXISTANCE_IE", + (t_u8 *) pbss_entry->pbss_co_2040, + (*(pbss_entry->pbss_co_2040)).ieee_hdr.len + + sizeof(IEEEtypes_Header_t)); + break; + case EXT_CAPABILITY: + pbss_entry->pext_cap = + (IEEEtypes_ExtCap_t *) pcurrent_ptr; + pbss_entry->ext_cap_offset = + (t_u16) (pcurrent_ptr - + pbss_entry->pbeacon_buf); + HEXDUMP("InterpretIE: Resp EXTCAP_IE", + (t_u8 *) pbss_entry->pext_cap, + (*(pbss_entry->pext_cap)).ieee_hdr.len + + sizeof(IEEEtypes_Header_t)); + break; + case OVERLAPBSSSCANPARAM: + pbss_entry->poverlap_bss_scan_param = + (IEEEtypes_OverlapBSSScanParam_t *) + pcurrent_ptr; + pbss_entry->overlap_bss_offset = + (t_u16) (pcurrent_ptr - + pbss_entry->pbeacon_buf); + HEXDUMP("InterpretIE: Resp OBSS_IE", + (t_u8 *) pbss_entry->poverlap_bss_scan_param, + (*(pbss_entry->poverlap_bss_scan_param)). + ieee_hdr.len + sizeof(IEEEtypes_Header_t)); + break; + case VHT_CAPABILITY: + pbss_entry->pvht_cap = + (IEEEtypes_VHTCap_t *) pcurrent_ptr; + pbss_entry->vht_cap_offset = + (t_u16) (pcurrent_ptr - + pbss_entry->pbeacon_buf); + HEXDUMP("InterpretIE: Resp VHTCAP_IE", + (t_u8 *) pbss_entry->pvht_cap, + (*(pbss_entry->pvht_cap)).ieee_hdr.len + + sizeof(IEEEtypes_Header_t)); + break; + case VHT_OPERATION: + pbss_entry->pvht_oprat = + (IEEEtypes_VHTOprat_t *) pcurrent_ptr; + pbss_entry->vht_oprat_offset = + (t_u16) (pcurrent_ptr - + pbss_entry->pbeacon_buf); + HEXDUMP("InterpretIE: Resp VHTOPER_IE", + (t_u8 *) pbss_entry->pvht_oprat, + (*(pbss_entry->pvht_oprat)).ieee_hdr.len + + sizeof(IEEEtypes_Header_t)); + break; + case EXT_BSS_LOAD: + pbss_entry->pext_bssload = + (IEEEtypes_ExtBSSload_t *) pcurrent_ptr; + pbss_entry->ext_bssload_offset = + (t_u16) (pcurrent_ptr - + pbss_entry->pbeacon_buf); + HEXDUMP("InterpretIE: Resp EXTBSSLOAD_IE", + (t_u8 *) pbss_entry->pext_bssload, + (*(pbss_entry->pext_bssload)).ieee_hdr.len + + sizeof(IEEEtypes_Header_t)); + break; + case VHT_TX_POWER_ENV: + pbss_entry->pvht_txpower = + (IEEEtypes_VHTtxpower_t *) pcurrent_ptr; + pbss_entry->vht_txpower_offset = + (t_u16) (pcurrent_ptr - + pbss_entry->pbeacon_buf); + HEXDUMP("InterpretIE: Resp TXPOW_IE", + (t_u8 *) pbss_entry->pvht_txpower, + (*(pbss_entry->pvht_txpower)).ieee_hdr.len + + sizeof(IEEEtypes_Header_t)); + break; + case EXT_POWER_CONSTR: + pbss_entry->pext_pwer = + (IEEEtypes_ExtPwerCons_t *) pcurrent_ptr; + pbss_entry->ext_pwer_offset = + (t_u16) (pcurrent_ptr - + pbss_entry->pbeacon_buf); + HEXDUMP("InterpretIE: Resp EXTPOW_IE", + (t_u8 *) pbss_entry->pext_pwer, + (*(pbss_entry->pext_pwer)).ieee_hdr.len + + sizeof(IEEEtypes_Header_t)); + break; + case QUIET_CHAN: + pbss_entry->pquiet_chan = + (IEEEtypes_QuietChan_t *) pcurrent_ptr; + pbss_entry->quiet_chan_offset = + (t_u16) (pcurrent_ptr - + pbss_entry->pbeacon_buf); + HEXDUMP("InterpretIE: Resp QUIETCHAN_IE", + (t_u8 *) pbss_entry->pquiet_chan, + (*(pbss_entry->pquiet_chan)).ieee_hdr.len + + sizeof(IEEEtypes_Header_t)); + break; + case BW_CHANNEL_SWITCH: + /* RANDYTODO */ + break; + case AID_INFO: + break; + case OPER_MODE_NTF: + pbss_entry->poper_mode = + (IEEEtypes_OperModeNtf_t *) pcurrent_ptr; + pbss_entry->oper_mode_offset = + (t_u16) (pcurrent_ptr - + pbss_entry->pbeacon_buf); + HEXDUMP("InterpretIE: Resp OPERMODENTF_IE", + (t_u8 *) pbss_entry->poper_mode, + (*(pbss_entry->poper_mode)).ieee_hdr.len + + sizeof(IEEEtypes_Header_t)); + break; + } + + pcurrent_ptr += element_len + 2; + + /* Need to account for IE ID and IE Len */ + bytes_left_for_current_beacon -= (element_len + 2); + + } /* while (bytes_left_for_current_beacon > 2) */ + + LEAVE(); + return ret; } /** * @brief Adjust ie's position in BSSDescriptor_t - * + * * @param pmpriv A pointer to mlan_private structure * @param pbss_entry A pointer to BSSDescriptor_t structure * @@ -1713,108 +1892,123 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, */ static t_void wlan_adjust_ie_in_bss_entry(IN mlan_private * pmpriv, - IN BSSDescriptor_t * pbss_entry) + IN BSSDescriptor_t * pbss_entry) { - ENTER(); - if (pbss_entry->pbeacon_buf) { - if (pbss_entry->pwpa_ie) { - pbss_entry->pwpa_ie = (IEEEtypes_VendorSpecific_t *) - (pbss_entry->pbeacon_buf + pbss_entry->wpa_offset); - } - if (pbss_entry->prsn_ie) { - pbss_entry->prsn_ie = (IEEEtypes_Generic_t *) - (pbss_entry->pbeacon_buf + pbss_entry->rsn_offset); - } - if (pbss_entry->pwapi_ie) { - pbss_entry->pwapi_ie = (IEEEtypes_Generic_t *) - (pbss_entry->pbeacon_buf + pbss_entry->wapi_offset); - } - if (pbss_entry->pht_cap) { - pbss_entry->pht_cap = (IEEEtypes_HTCap_t *) - (pbss_entry->pbeacon_buf + pbss_entry->ht_cap_offset); - } - if (pbss_entry->pht_info) { - pbss_entry->pht_info = (IEEEtypes_HTInfo_t *) - (pbss_entry->pbeacon_buf + pbss_entry->ht_info_offset); - } - if (pbss_entry->pbss_co_2040) { - pbss_entry->pbss_co_2040 = (IEEEtypes_2040BSSCo_t *) - (pbss_entry->pbeacon_buf + pbss_entry->bss_co_2040_offset); - } - if (pbss_entry->pext_cap) { - pbss_entry->pext_cap = (IEEEtypes_ExtCap_t *) - (pbss_entry->pbeacon_buf + pbss_entry->ext_cap_offset); - } - if (pbss_entry->poverlap_bss_scan_param) { - pbss_entry->poverlap_bss_scan_param = - (IEEEtypes_OverlapBSSScanParam_t *) - (pbss_entry->pbeacon_buf + pbss_entry->overlap_bss_offset); - } - if (pbss_entry->pvht_cap) { - pbss_entry->pvht_cap = (IEEEtypes_VHTCap_t *) - (pbss_entry->pbeacon_buf + pbss_entry->vht_cap_offset); - } - if (pbss_entry->pvht_oprat) { - pbss_entry->pvht_oprat = (IEEEtypes_VHTOprat_t *) - (pbss_entry->pbeacon_buf + pbss_entry->vht_oprat_offset); - } - if (pbss_entry->pvht_txpower) { - pbss_entry->pvht_txpower = (IEEEtypes_VHTtxpower_t *) - (pbss_entry->pbeacon_buf + pbss_entry->vht_txpower_offset); - } - if (pbss_entry->pext_pwer) { - pbss_entry->pext_pwer = (IEEEtypes_ExtPwerCons_t *) - (pbss_entry->pbeacon_buf + pbss_entry->ext_pwer_offset); - } - if (pbss_entry->pext_bssload) { - pbss_entry->pext_bssload = (IEEEtypes_ExtBSSload_t *) - (pbss_entry->pbeacon_buf + pbss_entry->ext_bssload_offset); - } - if (pbss_entry->pquiet_chan) { - pbss_entry->pquiet_chan = (IEEEtypes_QuietChan_t *) - (pbss_entry->pbeacon_buf + pbss_entry->quiet_chan_offset); - } - if (pbss_entry->poper_mode) { - pbss_entry->poper_mode = (IEEEtypes_OperModeNtf_t *) - (pbss_entry->pbeacon_buf + pbss_entry->oper_mode_offset); - } - } else { - pbss_entry->pwpa_ie = MNULL; - pbss_entry->wpa_offset = 0; - pbss_entry->prsn_ie = MNULL; - pbss_entry->rsn_offset = 0; - pbss_entry->pwapi_ie = MNULL; - pbss_entry->wapi_offset = 0; - pbss_entry->pht_cap = MNULL; - pbss_entry->ht_cap_offset = 0; - pbss_entry->pht_info = MNULL; - pbss_entry->ht_info_offset = 0; - pbss_entry->pbss_co_2040 = MNULL; - pbss_entry->bss_co_2040_offset = 0; - pbss_entry->pext_cap = MNULL; - pbss_entry->ext_cap_offset = 0; - pbss_entry->poverlap_bss_scan_param = MNULL; - pbss_entry->overlap_bss_offset = 0; - } - LEAVE(); - return; + ENTER(); + if (pbss_entry->pbeacon_buf) { + if (pbss_entry->pwpa_ie) { + pbss_entry->pwpa_ie = (IEEEtypes_VendorSpecific_t *) + (pbss_entry->pbeacon_buf + + pbss_entry->wpa_offset); + } + if (pbss_entry->prsn_ie) { + pbss_entry->prsn_ie = (IEEEtypes_Generic_t *) + (pbss_entry->pbeacon_buf + + pbss_entry->rsn_offset); + } + if (pbss_entry->pwapi_ie) { + pbss_entry->pwapi_ie = (IEEEtypes_Generic_t *) + (pbss_entry->pbeacon_buf + + pbss_entry->wapi_offset); + } + if (pbss_entry->pht_cap) { + pbss_entry->pht_cap = (IEEEtypes_HTCap_t *) + (pbss_entry->pbeacon_buf + + pbss_entry->ht_cap_offset); + } + if (pbss_entry->pht_info) { + pbss_entry->pht_info = (IEEEtypes_HTInfo_t *) + (pbss_entry->pbeacon_buf + + pbss_entry->ht_info_offset); + } + if (pbss_entry->pbss_co_2040) { + pbss_entry->pbss_co_2040 = (IEEEtypes_2040BSSCo_t *) + (pbss_entry->pbeacon_buf + + pbss_entry->bss_co_2040_offset); + } + if (pbss_entry->pext_cap) { + pbss_entry->pext_cap = (IEEEtypes_ExtCap_t *) + (pbss_entry->pbeacon_buf + + pbss_entry->ext_cap_offset); + } + if (pbss_entry->poverlap_bss_scan_param) { + pbss_entry->poverlap_bss_scan_param = + (IEEEtypes_OverlapBSSScanParam_t *) + (pbss_entry->pbeacon_buf + + pbss_entry->overlap_bss_offset); + } + if (pbss_entry->pvht_cap) { + pbss_entry->pvht_cap = (IEEEtypes_VHTCap_t *) + (pbss_entry->pbeacon_buf + + pbss_entry->vht_cap_offset); + } + if (pbss_entry->pvht_oprat) { + pbss_entry->pvht_oprat = (IEEEtypes_VHTOprat_t *) + (pbss_entry->pbeacon_buf + + pbss_entry->vht_oprat_offset); + } + if (pbss_entry->pvht_txpower) { + pbss_entry->pvht_txpower = (IEEEtypes_VHTtxpower_t *) + (pbss_entry->pbeacon_buf + + pbss_entry->vht_txpower_offset); + } + if (pbss_entry->pext_pwer) { + pbss_entry->pext_pwer = (IEEEtypes_ExtPwerCons_t *) + (pbss_entry->pbeacon_buf + + pbss_entry->ext_pwer_offset); + } + if (pbss_entry->pext_bssload) { + pbss_entry->pext_bssload = (IEEEtypes_ExtBSSload_t *) + (pbss_entry->pbeacon_buf + + pbss_entry->ext_bssload_offset); + } + if (pbss_entry->pquiet_chan) { + pbss_entry->pquiet_chan = (IEEEtypes_QuietChan_t *) + (pbss_entry->pbeacon_buf + + pbss_entry->quiet_chan_offset); + } + if (pbss_entry->poper_mode) { + pbss_entry->poper_mode = (IEEEtypes_OperModeNtf_t *) + (pbss_entry->pbeacon_buf + + pbss_entry->oper_mode_offset); + } + } else { + pbss_entry->pwpa_ie = MNULL; + pbss_entry->wpa_offset = 0; + pbss_entry->prsn_ie = MNULL; + pbss_entry->rsn_offset = 0; + pbss_entry->pwapi_ie = MNULL; + pbss_entry->wapi_offset = 0; + pbss_entry->pht_cap = MNULL; + pbss_entry->ht_cap_offset = 0; + pbss_entry->pht_info = MNULL; + pbss_entry->ht_info_offset = 0; + pbss_entry->pbss_co_2040 = MNULL; + pbss_entry->bss_co_2040_offset = 0; + pbss_entry->pext_cap = MNULL; + pbss_entry->ext_cap_offset = 0; + pbss_entry->poverlap_bss_scan_param = MNULL; + pbss_entry->overlap_bss_offset = 0; + } + LEAVE(); + return; } /** * @brief Store a beacon or probe response for a BSS returned in the scan - * + * * Store a new scan response or an update for a previous scan response. New - * entries need to verify that they do not exceed the total amount of + * entries need to verify that they do not exceed the total amount of * memory allocated for the table. - * Replacement entries need to take into consideration the amount of space + * Replacement entries need to take into consideration the amount of space * currently allocated for the beacon/probe response and adjust the entry - * as needed. + * as needed. * * A small amount of extra pad (SCAN_BEACON_ENTRY_PAD) is generally reserved * for an entry in case it is a beacon since a probe response for the - * network will by larger per the standard. This helps to reduce the - * amount of memory copying to fit a new probe response into an entry + * network will by larger per the standard. This helps to reduce the + * amount of memory copying to fit a new probe response into an entry * already occupied by a network's previously stored beacon. * * @param pmpriv A pointer to mlan_private structure @@ -1827,308 +2021,376 @@ wlan_adjust_ie_in_bss_entry(IN mlan_private * pmpriv, */ static t_void wlan_ret_802_11_scan_store_beacon(IN mlan_private * pmpriv, - IN t_u32 beacon_idx, - IN t_u32 num_of_ent, - IN BSSDescriptor_t * pnew_beacon) + IN t_u32 beacon_idx, + IN t_u32 num_of_ent, + IN BSSDescriptor_t * pnew_beacon) { - mlan_adapter *pmadapter = pmpriv->adapter; - t_u8 *pbcn_store; - t_u32 new_bcn_size; - t_u32 old_bcn_size; - t_u32 bcn_space; - t_u32 adj_idx; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u8 *tmp_buf; - t_u16 bcn_size = 0; - t_u32 bcn_offset = 0; - - ENTER(); - - if (pmadapter->pscan_table[beacon_idx].pbeacon_buf) { - - new_bcn_size = pnew_beacon->beacon_buf_size; - old_bcn_size = pmadapter->pscan_table[beacon_idx].beacon_buf_size; - bcn_space = pmadapter->pscan_table[beacon_idx].beacon_buf_size_max; - pbcn_store = pmadapter->pscan_table[beacon_idx].pbeacon_buf; - - /* Set the max to be the same as current entry unless changed below */ - pnew_beacon->beacon_buf_size_max = bcn_space; - - if (new_bcn_size == old_bcn_size) { - /* - * Beacon is the same size as the previous entry. - * Replace the previous contents with the scan result - */ - memcpy(pmadapter, pbcn_store, - pnew_beacon->pbeacon_buf, pnew_beacon->beacon_buf_size); - - } else if (new_bcn_size <= bcn_space) { - /* - * New beacon size will fit in the amount of space - * we have previously allocated for it - */ - - /* Copy the new beacon buffer entry over the old one */ - memcpy(pmadapter, pbcn_store, pnew_beacon->pbeacon_buf, - new_bcn_size); - - /* - * If the old beacon size was less than the maximum - * we had allotted for the entry, and the new entry - * is even smaller, reset the max size to the old beacon - * entry and compress the storage space (leaving a new - * pad space of (old_bcn_size - new_bcn_size). - */ - if (old_bcn_size < bcn_space && new_bcn_size <= old_bcn_size) { - /* - * Old Beacon size is smaller than the allotted storage size. - * Shrink the allotted storage space. - */ - PRINTM(MINFO, "AppControl: Smaller Duplicate Beacon (%d), " - "old = %d, new = %d, space = %d, left = %d\n", - beacon_idx, old_bcn_size, new_bcn_size, bcn_space, - (pmadapter->bcn_buf_size - - (pmadapter->pbcn_buf_end - pmadapter->bcn_buf))); - - /* - * memmove (since the memory overlaps) the data - * after the beacon we just stored to the end of - * the current beacon. This cleans up any unused - * space the old larger beacon was using in the buffer - */ - memmove(pmadapter, - (void *) ((t_ptr) pbcn_store + (t_ptr) old_bcn_size), - (void *) ((t_ptr) pbcn_store + (t_ptr) bcn_space), - (t_u32) ((t_ptr) pmadapter->pbcn_buf_end - - ((t_ptr) pbcn_store + (t_ptr) bcn_space))); - - /* - * Decrement the end pointer by the difference between - * the old larger size and the new smaller size since - * we are using less space due to the new beacon being - * smaller - */ - pmadapter->pbcn_buf_end -= (bcn_space - old_bcn_size); - - /* Set the maximum storage size to the old beacon size */ - pnew_beacon->beacon_buf_size_max = old_bcn_size; - - /* Adjust beacon buffer pointers that are past the current */ - for (adj_idx = 0; adj_idx < num_of_ent; adj_idx++) { - if (pmadapter->pscan_table[adj_idx].pbeacon_buf > - pbcn_store) { - pmadapter->pscan_table[adj_idx].pbeacon_buf -= - (bcn_space - old_bcn_size); - wlan_adjust_ie_in_bss_entry(pmpriv, - &pmadapter-> - pscan_table[adj_idx]); - } - } - } - } else if (pmadapter->pbcn_buf_end + (new_bcn_size - bcn_space) - < (pmadapter->bcn_buf + pmadapter->bcn_buf_size)) { - /* - * Beacon is larger than space previously allocated (bcn_space) - * and there is enough space left in the beaconBuffer to store - * the additional data - */ - PRINTM(MINFO, "AppControl: Larger Duplicate Beacon (%d), " - "old = %d, new = %d, space = %d, left = %d\n", - beacon_idx, old_bcn_size, new_bcn_size, bcn_space, - (pmadapter->bcn_buf_size - - (pmadapter->pbcn_buf_end - pmadapter->bcn_buf))); - - /* - * memmove (since the memory overlaps) the data - * after the beacon we just stored to the end of - * the current beacon. This moves the data for - * the beacons after this further in memory to - * make space for the new larger beacon we are - * about to copy in. - */ - memmove(pmadapter, - (void *) ((t_ptr) pbcn_store + (t_ptr) new_bcn_size), - (void *) ((t_ptr) pbcn_store + (t_ptr) bcn_space), - (t_u32) ((t_ptr) pmadapter->pbcn_buf_end - - ((t_ptr) pbcn_store + (t_ptr) bcn_space))); - - /* Copy the new beacon buffer entry over the old one */ - memcpy(pmadapter, pbcn_store, pnew_beacon->pbeacon_buf, - new_bcn_size); - - /* Move the beacon end pointer by the amount of new beacon data we - are adding */ - pmadapter->pbcn_buf_end += (new_bcn_size - bcn_space); - - /* - * This entry is bigger than the allotted max space - * previously reserved. Increase the max space to - * be equal to the new beacon size - */ - pnew_beacon->beacon_buf_size_max = new_bcn_size; - - /* Adjust beacon buffer pointers that are past the current */ - for (adj_idx = 0; adj_idx < num_of_ent; adj_idx++) { - if (pmadapter->pscan_table[adj_idx].pbeacon_buf > pbcn_store) { - pmadapter->pscan_table[adj_idx].pbeacon_buf - += (new_bcn_size - bcn_space); - wlan_adjust_ie_in_bss_entry(pmpriv, - &pmadapter-> - pscan_table[adj_idx]); - } - } - } else { - /* - * Beacon is larger than the previously allocated space, but - * there is not enough free space to store the additional data - */ - PRINTM(MERROR, - "AppControl: Failed: Larger Duplicate Beacon (%d)," - " old = %d, new = %d, space = %d, left = %d\n", - beacon_idx, old_bcn_size, new_bcn_size, bcn_space, - (pmadapter->bcn_buf_size - - (pmadapter->pbcn_buf_end - pmadapter->bcn_buf))); - - /* Storage failure, keep old beacon intact */ - pnew_beacon->beacon_buf_size = old_bcn_size; - if (pnew_beacon->pwpa_ie) - pnew_beacon->wpa_offset = - pmadapter->pscan_table[beacon_idx].wpa_offset; - if (pnew_beacon->prsn_ie) - pnew_beacon->rsn_offset = - pmadapter->pscan_table[beacon_idx].rsn_offset; - if (pnew_beacon->pwapi_ie) - pnew_beacon->wapi_offset = - pmadapter->pscan_table[beacon_idx].wapi_offset; - if (pnew_beacon->pht_cap) - pnew_beacon->ht_cap_offset = - pmadapter->pscan_table[beacon_idx].ht_cap_offset; - if (pnew_beacon->pht_info) - pnew_beacon->ht_info_offset = - pmadapter->pscan_table[beacon_idx].ht_info_offset; - if (pnew_beacon->pbss_co_2040) - pnew_beacon->bss_co_2040_offset = - pmadapter->pscan_table[beacon_idx].bss_co_2040_offset; - if (pnew_beacon->pext_cap) - pnew_beacon->ext_cap_offset = - pmadapter->pscan_table[beacon_idx].ext_cap_offset; - if (pnew_beacon->poverlap_bss_scan_param) - pnew_beacon->overlap_bss_offset = - pmadapter->pscan_table[beacon_idx].overlap_bss_offset; - if (pnew_beacon->pvht_cap) - pnew_beacon->vht_cap_offset = - pmadapter->pscan_table[beacon_idx].vht_cap_offset; - if (pnew_beacon->pvht_oprat) - pnew_beacon->vht_oprat_offset = - pmadapter->pscan_table[beacon_idx].vht_oprat_offset; - if (pnew_beacon->pvht_txpower) - pnew_beacon->vht_txpower_offset = - pmadapter->pscan_table[beacon_idx].vht_txpower_offset; - if (pnew_beacon->pext_pwer) - pnew_beacon->ext_pwer_offset = - pmadapter->pscan_table[beacon_idx].ext_pwer_offset; - if (pnew_beacon->pext_bssload) - pnew_beacon->ext_bssload_offset = - pmadapter->pscan_table[beacon_idx].ext_bssload_offset; - if (pnew_beacon->pquiet_chan) - pnew_beacon->quiet_chan_offset = - pmadapter->pscan_table[beacon_idx].quiet_chan_offset; - if (pnew_beacon->poper_mode) - pnew_beacon->oper_mode_offset = - pmadapter->pscan_table[beacon_idx].oper_mode_offset; - } - /* Point the new entry to its permanent storage space */ - pnew_beacon->pbeacon_buf = pbcn_store; - wlan_adjust_ie_in_bss_entry(pmpriv, pnew_beacon); - } else { - if ((pmadapter->pbcn_buf_end + pnew_beacon->beacon_buf_size + - SCAN_BEACON_ENTRY_PAD > (pmadapter->bcn_buf + - pmadapter->bcn_buf_size)) && - (pmadapter->bcn_buf_size < MAX_SCAN_BEACON_BUFFER)) { - /* no space for this entry, realloc bcn buffer */ - ret = pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, - pmadapter->bcn_buf_size + - DEFAULT_SCAN_BEACON_BUFFER, - MLAN_MEM_DEF, - (t_u8 **) & tmp_buf); - if ((ret == MLAN_STATUS_SUCCESS) && (tmp_buf)) { - PRINTM(MCMND, - "Realloc Beacon buffer, old size=%d, new_size=%d\n", - pmadapter->bcn_buf_size, - pmadapter->bcn_buf_size + DEFAULT_SCAN_BEACON_BUFFER); - bcn_size = pmadapter->pbcn_buf_end - pmadapter->bcn_buf; - memcpy(pmadapter, tmp_buf, pmadapter->bcn_buf, bcn_size); - /* Adjust beacon buffer pointers that are past the current */ - for (adj_idx = 0; adj_idx < num_of_ent; adj_idx++) { - bcn_offset = - pmadapter->pscan_table[adj_idx].pbeacon_buf - - pmadapter->bcn_buf; - pmadapter->pscan_table[adj_idx].pbeacon_buf = - tmp_buf + bcn_offset; - wlan_adjust_ie_in_bss_entry(pmpriv, - &pmadapter-> - pscan_table[adj_idx]); - } - pmadapter->pbcn_buf_end = tmp_buf + bcn_size; - pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, - (t_u8 *) pmadapter->bcn_buf); - pmadapter->bcn_buf = tmp_buf; - pmadapter->bcn_buf_size += DEFAULT_SCAN_BEACON_BUFFER; - } - } - /* - * No existing beacon data exists for this entry, check to see - * if we can fit it in the remaining space - */ - if (pmadapter->pbcn_buf_end + pnew_beacon->beacon_buf_size + - SCAN_BEACON_ENTRY_PAD < (pmadapter->bcn_buf + - pmadapter->bcn_buf_size)) { - - /* - * Copy the beacon buffer data from the local entry to the - * adapter dev struct buffer space used to store the raw - * beacon data for each entry in the scan table - */ - memcpy(pmadapter, pmadapter->pbcn_buf_end, pnew_beacon->pbeacon_buf, - pnew_beacon->beacon_buf_size); - - /* Update the beacon ptr to point to the table save area */ - pnew_beacon->pbeacon_buf = pmadapter->pbcn_buf_end; - pnew_beacon->beacon_buf_size_max = (pnew_beacon->beacon_buf_size - + SCAN_BEACON_ENTRY_PAD); - wlan_adjust_ie_in_bss_entry(pmpriv, pnew_beacon); - - /* Increment the end pointer by the size reserved */ - pmadapter->pbcn_buf_end += pnew_beacon->beacon_buf_size_max; - - PRINTM(MINFO, "AppControl: Beacon[%02d] sz=%03d," - " used = %04d, left = %04d\n", - beacon_idx, - pnew_beacon->beacon_buf_size, - (pmadapter->pbcn_buf_end - pmadapter->bcn_buf), - (pmadapter->bcn_buf_size - - (pmadapter->pbcn_buf_end - pmadapter->bcn_buf))); - } else { - /* - * No space for new beacon - */ - PRINTM(MCMND, "AppControl: No space beacon (%d): " - MACSTR "; sz=%03d, left=%03d\n", - beacon_idx, - MAC2STR(pnew_beacon->mac_address), - pnew_beacon->beacon_buf_size, - (pmadapter->bcn_buf_size - - (pmadapter->pbcn_buf_end - pmadapter->bcn_buf))); - - /* Storage failure; clear storage records for this bcn */ - pnew_beacon->pbeacon_buf = MNULL; - pnew_beacon->beacon_buf_size = 0; - pnew_beacon->beacon_buf_size_max = 0; - wlan_adjust_ie_in_bss_entry(pmpriv, pnew_beacon); - } - } - - LEAVE(); + mlan_adapter *pmadapter = pmpriv->adapter; + t_u8 *pbcn_store; + t_u32 new_bcn_size; + t_u32 old_bcn_size; + t_u32 bcn_space; + t_u32 adj_idx; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u8 *tmp_buf; + t_u16 bcn_size = 0; + t_u32 bcn_offset = 0; + + ENTER(); + + if (pmadapter->pscan_table[beacon_idx].pbeacon_buf) { + + new_bcn_size = pnew_beacon->beacon_buf_size; + old_bcn_size = + pmadapter->pscan_table[beacon_idx].beacon_buf_size; + bcn_space = + pmadapter->pscan_table[beacon_idx].beacon_buf_size_max; + pbcn_store = pmadapter->pscan_table[beacon_idx].pbeacon_buf; + + /* Set the max to be the same as current entry unless changed + below */ + pnew_beacon->beacon_buf_size_max = bcn_space; + + if (new_bcn_size == old_bcn_size) { + /* + * Beacon is the same size as the previous entry. + * Replace the previous contents with the scan result + */ + memcpy(pmadapter, pbcn_store, + pnew_beacon->pbeacon_buf, + pnew_beacon->beacon_buf_size); + + } else if (new_bcn_size <= bcn_space) { + /* + * New beacon size will fit in the amount of space + * we have previously allocated for it + */ + + /* Copy the new beacon buffer entry over the old one */ + memcpy(pmadapter, pbcn_store, pnew_beacon->pbeacon_buf, + new_bcn_size); + + /* + * If the old beacon size was less than the maximum + * we had allotted for the entry, and the new entry + * is even smaller, reset the max size to the old beacon + * entry and compress the storage space (leaving a new + * pad space of (old_bcn_size - new_bcn_size). + */ + if (old_bcn_size < bcn_space && + new_bcn_size <= old_bcn_size) { + /* + * Old Beacon size is smaller than the allotted storage size. + * Shrink the allotted storage space. + */ + PRINTM(MINFO, + "AppControl: Smaller Duplicate Beacon (%d), " + "old = %d, new = %d, space = %d, left = %d\n", + beacon_idx, old_bcn_size, new_bcn_size, + bcn_space, + (pmadapter->bcn_buf_size - + (pmadapter->pbcn_buf_end - + pmadapter->bcn_buf))); + + /* + * memmove (since the memory overlaps) the data + * after the beacon we just stored to the end of + * the current beacon. This cleans up any unused + * space the old larger beacon was using in the buffer + */ + memmove(pmadapter, + (void *)((t_ptr) pbcn_store + + (t_ptr) old_bcn_size), + (void *)((t_ptr) pbcn_store + + (t_ptr) bcn_space), + (t_u32) ((t_ptr) pmadapter-> + pbcn_buf_end - + ((t_ptr) pbcn_store + + (t_ptr) bcn_space))); + + /* + * Decrement the end pointer by the difference between + * the old larger size and the new smaller size since + * we are using less space due to the new beacon being + * smaller + */ + pmadapter->pbcn_buf_end -= + (bcn_space - old_bcn_size); + + /* Set the maximum storage size to the old + beacon size */ + pnew_beacon->beacon_buf_size_max = old_bcn_size; + + /* Adjust beacon buffer pointers that are past + the current */ + for (adj_idx = 0; adj_idx < num_of_ent; + adj_idx++) { + if (pmadapter->pscan_table[adj_idx]. + pbeacon_buf > pbcn_store) { + pmadapter->pscan_table[adj_idx]. + pbeacon_buf -= + (bcn_space - + old_bcn_size); + wlan_adjust_ie_in_bss_entry + (pmpriv, + &pmadapter-> + pscan_table[adj_idx]); + } + } + } + } else if (pmadapter->pbcn_buf_end + (new_bcn_size - bcn_space) + < (pmadapter->bcn_buf + pmadapter->bcn_buf_size)) { + /* + * Beacon is larger than space previously allocated (bcn_space) + * and there is enough space left in the beaconBuffer to store + * the additional data + */ + PRINTM(MINFO, + "AppControl: Larger Duplicate Beacon (%d), " + "old = %d, new = %d, space = %d, left = %d\n", + beacon_idx, old_bcn_size, new_bcn_size, + bcn_space, + (pmadapter->bcn_buf_size - + (pmadapter->pbcn_buf_end - + pmadapter->bcn_buf))); + + /* + * memmove (since the memory overlaps) the data + * after the beacon we just stored to the end of + * the current beacon. This moves the data for + * the beacons after this further in memory to + * make space for the new larger beacon we are + * about to copy in. + */ + memmove(pmadapter, + (void *)((t_ptr) pbcn_store + + (t_ptr) new_bcn_size), + (void *)((t_ptr) pbcn_store + + (t_ptr) bcn_space), + (t_u32) ((t_ptr) pmadapter->pbcn_buf_end - + ((t_ptr) pbcn_store + + (t_ptr) bcn_space))); + + /* Copy the new beacon buffer entry over the old one */ + memcpy(pmadapter, pbcn_store, pnew_beacon->pbeacon_buf, + new_bcn_size); + + /* Move the beacon end pointer by the amount of new + beacon data we are adding */ + pmadapter->pbcn_buf_end += (new_bcn_size - bcn_space); + + /* + * This entry is bigger than the allotted max space + * previously reserved. Increase the max space to + * be equal to the new beacon size + */ + pnew_beacon->beacon_buf_size_max = new_bcn_size; + + /* Adjust beacon buffer pointers that are past the + current */ + for (adj_idx = 0; adj_idx < num_of_ent; adj_idx++) { + if (pmadapter->pscan_table[adj_idx]. + pbeacon_buf > pbcn_store) { + pmadapter->pscan_table[adj_idx]. + pbeacon_buf += + (new_bcn_size - bcn_space); + wlan_adjust_ie_in_bss_entry(pmpriv, + &pmadapter-> + pscan_table + [adj_idx]); + } + } + } else { + /* + * Beacon is larger than the previously allocated space, but + * there is not enough free space to store the additional data + */ + PRINTM(MERROR, + "AppControl: Failed: Larger Duplicate Beacon (%d)," + " old = %d, new = %d, space = %d, left = %d\n", + beacon_idx, old_bcn_size, new_bcn_size, + bcn_space, + (pmadapter->bcn_buf_size - + (pmadapter->pbcn_buf_end - + pmadapter->bcn_buf))); + + /* Storage failure, keep old beacon intact */ + pnew_beacon->beacon_buf_size = old_bcn_size; + if (pnew_beacon->pwpa_ie) + pnew_beacon->wpa_offset = + pmadapter->pscan_table[beacon_idx]. + wpa_offset; + if (pnew_beacon->prsn_ie) + pnew_beacon->rsn_offset = + pmadapter->pscan_table[beacon_idx]. + rsn_offset; + if (pnew_beacon->pwapi_ie) + pnew_beacon->wapi_offset = + pmadapter->pscan_table[beacon_idx]. + wapi_offset; + if (pnew_beacon->pht_cap) + pnew_beacon->ht_cap_offset = + pmadapter->pscan_table[beacon_idx]. + ht_cap_offset; + if (pnew_beacon->pht_info) + pnew_beacon->ht_info_offset = + pmadapter->pscan_table[beacon_idx]. + ht_info_offset; + if (pnew_beacon->pbss_co_2040) + pnew_beacon->bss_co_2040_offset = + pmadapter->pscan_table[beacon_idx]. + bss_co_2040_offset; + if (pnew_beacon->pext_cap) + pnew_beacon->ext_cap_offset = + pmadapter->pscan_table[beacon_idx]. + ext_cap_offset; + if (pnew_beacon->poverlap_bss_scan_param) + pnew_beacon->overlap_bss_offset = + pmadapter->pscan_table[beacon_idx]. + overlap_bss_offset; + if (pnew_beacon->pvht_cap) + pnew_beacon->vht_cap_offset = + pmadapter->pscan_table[beacon_idx]. + vht_cap_offset; + if (pnew_beacon->pvht_oprat) + pnew_beacon->vht_oprat_offset = + pmadapter->pscan_table[beacon_idx]. + vht_oprat_offset; + if (pnew_beacon->pvht_txpower) + pnew_beacon->vht_txpower_offset = + pmadapter->pscan_table[beacon_idx]. + vht_txpower_offset; + if (pnew_beacon->pext_pwer) + pnew_beacon->ext_pwer_offset = + pmadapter->pscan_table[beacon_idx]. + ext_pwer_offset; + if (pnew_beacon->pext_bssload) + pnew_beacon->ext_bssload_offset = + pmadapter->pscan_table[beacon_idx]. + ext_bssload_offset; + if (pnew_beacon->pquiet_chan) + pnew_beacon->quiet_chan_offset = + pmadapter->pscan_table[beacon_idx]. + quiet_chan_offset; + if (pnew_beacon->poper_mode) + pnew_beacon->oper_mode_offset = + pmadapter->pscan_table[beacon_idx]. + oper_mode_offset; + } + /* Point the new entry to its permanent storage space */ + pnew_beacon->pbeacon_buf = pbcn_store; + wlan_adjust_ie_in_bss_entry(pmpriv, pnew_beacon); + } else { + if ((pmadapter->pbcn_buf_end + pnew_beacon->beacon_buf_size + + SCAN_BEACON_ENTRY_PAD > (pmadapter->bcn_buf + + pmadapter->bcn_buf_size)) && + (pmadapter->bcn_buf_size < MAX_SCAN_BEACON_BUFFER)) { + /* no space for this entry, realloc bcn buffer */ + ret = pmadapter->callbacks.moal_malloc(pmadapter-> + pmoal_handle, + pmadapter-> + bcn_buf_size + + DEFAULT_SCAN_BEACON_BUFFER, + MLAN_MEM_DEF, + (t_u8 **) & + tmp_buf); + if ((ret == MLAN_STATUS_SUCCESS) && (tmp_buf)) { + PRINTM(MCMND, + "Realloc Beacon buffer, old size=%d, new_size=%d\n", + pmadapter->bcn_buf_size, + pmadapter->bcn_buf_size + + DEFAULT_SCAN_BEACON_BUFFER); + bcn_size = + pmadapter->pbcn_buf_end - + pmadapter->bcn_buf; + memcpy(pmadapter, tmp_buf, pmadapter->bcn_buf, + bcn_size); + /* Adjust beacon buffer pointers that are past + the current */ + for (adj_idx = 0; adj_idx < num_of_ent; + adj_idx++) { + bcn_offset = + pmadapter->pscan_table[adj_idx]. + pbeacon_buf - + pmadapter->bcn_buf; + pmadapter->pscan_table[adj_idx]. + pbeacon_buf = + tmp_buf + bcn_offset; + wlan_adjust_ie_in_bss_entry(pmpriv, + &pmadapter-> + pscan_table + [adj_idx]); + } + pmadapter->pbcn_buf_end = tmp_buf + bcn_size; + pmadapter->callbacks.moal_mfree(pmadapter-> + pmoal_handle, + (t_u8 *) + pmadapter-> + bcn_buf); + pmadapter->bcn_buf = tmp_buf; + pmadapter->bcn_buf_size += + DEFAULT_SCAN_BEACON_BUFFER; + } + } + /* + * No existing beacon data exists for this entry, check to see + * if we can fit it in the remaining space + */ + if (pmadapter->pbcn_buf_end + pnew_beacon->beacon_buf_size + + SCAN_BEACON_ENTRY_PAD < (pmadapter->bcn_buf + + pmadapter->bcn_buf_size)) { + + /* + * Copy the beacon buffer data from the local entry to the + * adapter dev struct buffer space used to store the raw + * beacon data for each entry in the scan table + */ + memcpy(pmadapter, pmadapter->pbcn_buf_end, + pnew_beacon->pbeacon_buf, + pnew_beacon->beacon_buf_size); + + /* Update the beacon ptr to point to the table save + area */ + pnew_beacon->pbeacon_buf = pmadapter->pbcn_buf_end; + pnew_beacon->beacon_buf_size_max = + (pnew_beacon->beacon_buf_size + + SCAN_BEACON_ENTRY_PAD); + wlan_adjust_ie_in_bss_entry(pmpriv, pnew_beacon); + + /* Increment the end pointer by the size reserved */ + pmadapter->pbcn_buf_end += + pnew_beacon->beacon_buf_size_max; + + PRINTM(MINFO, "AppControl: Beacon[%02d] sz=%03d," + " used = %04d, left = %04d\n", + beacon_idx, + pnew_beacon->beacon_buf_size, + (pmadapter->pbcn_buf_end - pmadapter->bcn_buf), + (pmadapter->bcn_buf_size - + (pmadapter->pbcn_buf_end - + pmadapter->bcn_buf))); + } else { + /* + * No space for new beacon + */ + PRINTM(MCMND, "AppControl: No space beacon (%d): " + MACSTR "; sz=%03d, left=%03d\n", + beacon_idx, + MAC2STR(pnew_beacon->mac_address), + pnew_beacon->beacon_buf_size, + (pmadapter->bcn_buf_size - + (pmadapter->pbcn_buf_end - + pmadapter->bcn_buf))); + + /* Storage failure; clear storage records for this bcn */ + pnew_beacon->pbeacon_buf = MNULL; + pnew_beacon->beacon_buf_size = 0; + pnew_beacon->beacon_buf_size_max = 0; + wlan_adjust_ie_in_bss_entry(pmpriv, pnew_beacon); + } + } + + LEAVE(); } /** @@ -2141,103 +2403,120 @@ wlan_ret_802_11_scan_store_beacon(IN mlan_private * pmpriv, static t_void wlan_restore_curr_bcn(IN mlan_private * pmpriv) { - mlan_adapter *pmadapter = pmpriv->adapter; - mlan_callbacks *pcb = (pmlan_callbacks) & pmadapter->callbacks; - BSSDescriptor_t *pcurr_bss = &pmpriv->curr_bss_params.bss_descriptor; - - ENTER(); - - if (pmpriv->pcurr_bcn_buf && - ((pmadapter->pbcn_buf_end + pmpriv->curr_bcn_size) < - (pmadapter->bcn_buf + pmadapter->bcn_buf_size))) { - - pcb->moal_spin_lock(pmadapter->pmoal_handle, pmpriv->curr_bcn_buf_lock); - - /* restore the current beacon buffer */ - memcpy(pmadapter, pmadapter->pbcn_buf_end, pmpriv->pcurr_bcn_buf, - pmpriv->curr_bcn_size); - pcurr_bss->pbeacon_buf = pmadapter->pbcn_buf_end; - pcurr_bss->beacon_buf_size = pmpriv->curr_bcn_size; - pmadapter->pbcn_buf_end += pmpriv->curr_bcn_size; - - /* adjust the pointers in the current bss descriptor */ - if (pcurr_bss->pwpa_ie) { - pcurr_bss->pwpa_ie = (IEEEtypes_VendorSpecific_t *) - (pcurr_bss->pbeacon_buf + pcurr_bss->wpa_offset); - } - if (pcurr_bss->prsn_ie) { - pcurr_bss->prsn_ie = (IEEEtypes_Generic_t *) - (pcurr_bss->pbeacon_buf + pcurr_bss->rsn_offset); - } - if (pcurr_bss->pht_cap) { - pcurr_bss->pht_cap = (IEEEtypes_HTCap_t *) - (pcurr_bss->pbeacon_buf + pcurr_bss->ht_cap_offset); - } - - if (pcurr_bss->pht_info) { - pcurr_bss->pht_info = (IEEEtypes_HTInfo_t *) - (pcurr_bss->pbeacon_buf + pcurr_bss->ht_info_offset); - } - - if (pcurr_bss->pbss_co_2040) { - pcurr_bss->pbss_co_2040 = (IEEEtypes_2040BSSCo_t *) - (pcurr_bss->pbeacon_buf + pcurr_bss->bss_co_2040_offset); - } - - if (pcurr_bss->pext_cap) { - pcurr_bss->pext_cap = (IEEEtypes_ExtCap_t *) - (pcurr_bss->pbeacon_buf + pcurr_bss->ext_cap_offset); - } - - if (pcurr_bss->poverlap_bss_scan_param) { - pcurr_bss->poverlap_bss_scan_param = - (IEEEtypes_OverlapBSSScanParam_t *) - (pcurr_bss->pbeacon_buf + pcurr_bss->overlap_bss_offset); - } - - if (pcurr_bss->pvht_cap) { - pcurr_bss->pvht_cap = (IEEEtypes_VHTCap_t *) - (pcurr_bss->pbeacon_buf + pcurr_bss->vht_cap_offset); - } - - if (pcurr_bss->pvht_oprat) { - pcurr_bss->pvht_oprat = (IEEEtypes_VHTOprat_t *) - (pcurr_bss->pbeacon_buf + pcurr_bss->vht_oprat_offset); - } - - if (pcurr_bss->pvht_txpower) { - pcurr_bss->pvht_txpower = (IEEEtypes_VHTtxpower_t *) - (pcurr_bss->pbeacon_buf + pcurr_bss->vht_txpower_offset); - } - - if (pcurr_bss->pext_pwer) { - pcurr_bss->pext_pwer = (IEEEtypes_ExtPwerCons_t *) - (pcurr_bss->pbeacon_buf + pcurr_bss->ext_pwer_offset); - } - - if (pcurr_bss->pext_bssload) { - pcurr_bss->pext_bssload = (IEEEtypes_ExtBSSload_t *) - (pcurr_bss->pbeacon_buf + pcurr_bss->ext_bssload_offset); - } - - if (pcurr_bss->pquiet_chan) { - pcurr_bss->pquiet_chan = (IEEEtypes_QuietChan_t *) - (pcurr_bss->pbeacon_buf + pcurr_bss->quiet_chan_offset); - } - - if (pcurr_bss->poper_mode) { - pcurr_bss->poper_mode = (IEEEtypes_OperModeNtf_t *) - (pcurr_bss->pbeacon_buf + pcurr_bss->oper_mode_offset); - } - pcb->moal_spin_unlock(pmadapter->pmoal_handle, - pmpriv->curr_bcn_buf_lock); - - PRINTM(MINFO, "current beacon restored %d\n", pmpriv->curr_bcn_size); - } else { - PRINTM(MWARN, "curr_bcn_buf not saved or bcn_buf has no space\n"); - } - - LEAVE(); + mlan_adapter *pmadapter = pmpriv->adapter; + mlan_callbacks *pcb = (pmlan_callbacks) & pmadapter->callbacks; + BSSDescriptor_t *pcurr_bss = &pmpriv->curr_bss_params.bss_descriptor; + + ENTER(); + + if (pmpriv->pcurr_bcn_buf && + ((pmadapter->pbcn_buf_end + pmpriv->curr_bcn_size) < + (pmadapter->bcn_buf + pmadapter->bcn_buf_size))) { + + pcb->moal_spin_lock(pmadapter->pmoal_handle, + pmpriv->curr_bcn_buf_lock); + + /* restore the current beacon buffer */ + memcpy(pmadapter, pmadapter->pbcn_buf_end, + pmpriv->pcurr_bcn_buf, pmpriv->curr_bcn_size); + pcurr_bss->pbeacon_buf = pmadapter->pbcn_buf_end; + pcurr_bss->beacon_buf_size = pmpriv->curr_bcn_size; + pmadapter->pbcn_buf_end += pmpriv->curr_bcn_size; + + /* adjust the pointers in the current bss descriptor */ + if (pcurr_bss->pwpa_ie) { + pcurr_bss->pwpa_ie = (IEEEtypes_VendorSpecific_t *) + (pcurr_bss->pbeacon_buf + + pcurr_bss->wpa_offset); + } + if (pcurr_bss->prsn_ie) { + pcurr_bss->prsn_ie = (IEEEtypes_Generic_t *) + (pcurr_bss->pbeacon_buf + + pcurr_bss->rsn_offset); + } + if (pcurr_bss->pht_cap) { + pcurr_bss->pht_cap = (IEEEtypes_HTCap_t *) + (pcurr_bss->pbeacon_buf + + pcurr_bss->ht_cap_offset); + } + + if (pcurr_bss->pht_info) { + pcurr_bss->pht_info = (IEEEtypes_HTInfo_t *) + (pcurr_bss->pbeacon_buf + + pcurr_bss->ht_info_offset); + } + + if (pcurr_bss->pbss_co_2040) { + pcurr_bss->pbss_co_2040 = (IEEEtypes_2040BSSCo_t *) + (pcurr_bss->pbeacon_buf + + pcurr_bss->bss_co_2040_offset); + } + + if (pcurr_bss->pext_cap) { + pcurr_bss->pext_cap = (IEEEtypes_ExtCap_t *) + (pcurr_bss->pbeacon_buf + + pcurr_bss->ext_cap_offset); + } + + if (pcurr_bss->poverlap_bss_scan_param) { + pcurr_bss->poverlap_bss_scan_param = + (IEEEtypes_OverlapBSSScanParam_t *) + (pcurr_bss->pbeacon_buf + + pcurr_bss->overlap_bss_offset); + } + + if (pcurr_bss->pvht_cap) { + pcurr_bss->pvht_cap = (IEEEtypes_VHTCap_t *) + (pcurr_bss->pbeacon_buf + + pcurr_bss->vht_cap_offset); + } + + if (pcurr_bss->pvht_oprat) { + pcurr_bss->pvht_oprat = (IEEEtypes_VHTOprat_t *) + (pcurr_bss->pbeacon_buf + + pcurr_bss->vht_oprat_offset); + } + + if (pcurr_bss->pvht_txpower) { + pcurr_bss->pvht_txpower = (IEEEtypes_VHTtxpower_t *) + (pcurr_bss->pbeacon_buf + + pcurr_bss->vht_txpower_offset); + } + + if (pcurr_bss->pext_pwer) { + pcurr_bss->pext_pwer = (IEEEtypes_ExtPwerCons_t *) + (pcurr_bss->pbeacon_buf + + pcurr_bss->ext_pwer_offset); + } + + if (pcurr_bss->pext_bssload) { + pcurr_bss->pext_bssload = (IEEEtypes_ExtBSSload_t *) + (pcurr_bss->pbeacon_buf + + pcurr_bss->ext_bssload_offset); + } + + if (pcurr_bss->pquiet_chan) { + pcurr_bss->pquiet_chan = (IEEEtypes_QuietChan_t *) + (pcurr_bss->pbeacon_buf + + pcurr_bss->quiet_chan_offset); + } + + if (pcurr_bss->poper_mode) { + pcurr_bss->poper_mode = (IEEEtypes_OperModeNtf_t *) + (pcurr_bss->pbeacon_buf + + pcurr_bss->oper_mode_offset); + } + pcb->moal_spin_unlock(pmadapter->pmoal_handle, + pmpriv->curr_bcn_buf_lock); + + PRINTM(MINFO, "current beacon restored %d\n", + pmpriv->curr_bcn_size); + } else { + PRINTM(MWARN, + "curr_bcn_buf not saved or bcn_buf has no space\n"); + } + + LEAVE(); } /** @@ -2257,86 +2536,117 @@ wlan_restore_curr_bcn(IN mlan_private * pmpriv) static t_void wlan_scan_process_results(IN mlan_private * pmpriv) { - mlan_adapter *pmadapter = pmpriv->adapter; - t_s32 j; - t_u32 i; - - ENTER(); - - if (pmpriv->media_connected == MTRUE) { - - j = wlan_find_ssid_in_list(pmpriv, - &pmpriv->curr_bss_params.bss_descriptor.ssid, - pmpriv->curr_bss_params.bss_descriptor. - mac_address, pmpriv->bss_mode); - - if (j >= 0) { - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - pmpriv->curr_bcn_buf_lock); - pmpriv->curr_bss_params.bss_descriptor.pwpa_ie = MNULL; - pmpriv->curr_bss_params.bss_descriptor.wpa_offset = 0; - pmpriv->curr_bss_params.bss_descriptor.prsn_ie = MNULL; - pmpriv->curr_bss_params.bss_descriptor.rsn_offset = 0; - pmpriv->curr_bss_params.bss_descriptor.pwapi_ie = MNULL; - pmpriv->curr_bss_params.bss_descriptor.wapi_offset = 0; - pmpriv->curr_bss_params.bss_descriptor.pht_cap = MNULL; - pmpriv->curr_bss_params.bss_descriptor.ht_cap_offset = 0; - pmpriv->curr_bss_params.bss_descriptor.pht_info = MNULL; - pmpriv->curr_bss_params.bss_descriptor.ht_info_offset = 0; - pmpriv->curr_bss_params.bss_descriptor.pbss_co_2040 = MNULL; - pmpriv->curr_bss_params.bss_descriptor.bss_co_2040_offset = 0; - pmpriv->curr_bss_params.bss_descriptor.pext_cap = MNULL; - pmpriv->curr_bss_params.bss_descriptor.ext_cap_offset = 0; - pmpriv->curr_bss_params.bss_descriptor.poverlap_bss_scan_param = - MNULL; - pmpriv->curr_bss_params.bss_descriptor.overlap_bss_offset = 0; - pmpriv->curr_bss_params.bss_descriptor.pvht_cap = MNULL; - pmpriv->curr_bss_params.bss_descriptor.vht_cap_offset = 0; - pmpriv->curr_bss_params.bss_descriptor.pvht_oprat = MNULL; - pmpriv->curr_bss_params.bss_descriptor.vht_oprat_offset = 0; - pmpriv->curr_bss_params.bss_descriptor.pvht_txpower = MNULL; - pmpriv->curr_bss_params.bss_descriptor.vht_txpower_offset = 0; - pmpriv->curr_bss_params.bss_descriptor.pext_pwer = MNULL; - pmpriv->curr_bss_params.bss_descriptor.ext_pwer_offset = 0; - pmpriv->curr_bss_params.bss_descriptor.pext_bssload = MNULL; - pmpriv->curr_bss_params.bss_descriptor.ext_bssload_offset = 0; - pmpriv->curr_bss_params.bss_descriptor.pquiet_chan = MNULL; - pmpriv->curr_bss_params.bss_descriptor.quiet_chan_offset = 0; - pmpriv->curr_bss_params.bss_descriptor.poper_mode = MNULL; - pmpriv->curr_bss_params.bss_descriptor.oper_mode_offset = 0; - pmpriv->curr_bss_params.bss_descriptor.pbeacon_buf = MNULL; - pmpriv->curr_bss_params.bss_descriptor.beacon_buf_size = 0; - pmpriv->curr_bss_params.bss_descriptor.beacon_buf_size_max = 0; - - PRINTM(MINFO, "Found current ssid/bssid in list @ index #%d\n", j); - /* Make a copy of current BSSID descriptor */ - memcpy(pmadapter, &pmpriv->curr_bss_params.bss_descriptor, - &pmadapter->pscan_table[j], - sizeof(pmpriv->curr_bss_params.bss_descriptor)); - - wlan_save_curr_bcn(pmpriv); - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - pmpriv->curr_bcn_buf_lock); - } else { - wlan_restore_curr_bcn(pmpriv); - } - } - - for (i = 0; i < pmadapter->num_in_scan_table; i++) - PRINTM(MINFO, "Scan:(%02d) " MACSTR ", " - "RSSI[%03d], SSID[%s]\n", - i, - MAC2STR(pmadapter->pscan_table[i].mac_address), - (t_s32) pmadapter->pscan_table[i].rssi, - pmadapter->pscan_table[i].ssid.ssid); - - /* - * Prepares domain info from scan table and downloads the - * domain info command to the FW. - */ - wlan_11d_prepare_dnld_domain_info_cmd(pmpriv); - - LEAVE(); + mlan_adapter *pmadapter = pmpriv->adapter; + t_s32 j; + t_u32 i; + + ENTER(); + + if (pmpriv->media_connected == MTRUE) { + + j = wlan_find_ssid_in_list(pmpriv, + &pmpriv->curr_bss_params. + bss_descriptor.ssid, + pmpriv->curr_bss_params. + bss_descriptor.mac_address, + pmpriv->bss_mode); + + if (j >= 0) { + pmadapter->callbacks.moal_spin_lock(pmadapter-> + pmoal_handle, + pmpriv-> + curr_bcn_buf_lock); + pmpriv->curr_bss_params.bss_descriptor.pwpa_ie = MNULL; + pmpriv->curr_bss_params.bss_descriptor.wpa_offset = 0; + pmpriv->curr_bss_params.bss_descriptor.prsn_ie = MNULL; + pmpriv->curr_bss_params.bss_descriptor.rsn_offset = 0; + pmpriv->curr_bss_params.bss_descriptor.pwapi_ie = MNULL; + pmpriv->curr_bss_params.bss_descriptor.wapi_offset = 0; + pmpriv->curr_bss_params.bss_descriptor.pht_cap = MNULL; + pmpriv->curr_bss_params.bss_descriptor.ht_cap_offset = + 0; + pmpriv->curr_bss_params.bss_descriptor.pht_info = MNULL; + pmpriv->curr_bss_params.bss_descriptor.ht_info_offset = + 0; + pmpriv->curr_bss_params.bss_descriptor.pbss_co_2040 = + MNULL; + pmpriv->curr_bss_params.bss_descriptor. + bss_co_2040_offset = 0; + pmpriv->curr_bss_params.bss_descriptor.pext_cap = MNULL; + pmpriv->curr_bss_params.bss_descriptor.ext_cap_offset = + 0; + pmpriv->curr_bss_params.bss_descriptor. + poverlap_bss_scan_param = MNULL; + pmpriv->curr_bss_params.bss_descriptor. + overlap_bss_offset = 0; + pmpriv->curr_bss_params.bss_descriptor.pvht_cap = MNULL; + pmpriv->curr_bss_params.bss_descriptor.vht_cap_offset = + 0; + pmpriv->curr_bss_params.bss_descriptor.pvht_oprat = + MNULL; + pmpriv->curr_bss_params.bss_descriptor. + vht_oprat_offset = 0; + pmpriv->curr_bss_params.bss_descriptor.pvht_txpower = + MNULL; + pmpriv->curr_bss_params.bss_descriptor. + vht_txpower_offset = 0; + pmpriv->curr_bss_params.bss_descriptor.pext_pwer = + MNULL; + pmpriv->curr_bss_params.bss_descriptor.ext_pwer_offset = + 0; + pmpriv->curr_bss_params.bss_descriptor.pext_bssload = + MNULL; + pmpriv->curr_bss_params.bss_descriptor. + ext_bssload_offset = 0; + pmpriv->curr_bss_params.bss_descriptor.pquiet_chan = + MNULL; + pmpriv->curr_bss_params.bss_descriptor. + quiet_chan_offset = 0; + pmpriv->curr_bss_params.bss_descriptor.poper_mode = + MNULL; + pmpriv->curr_bss_params.bss_descriptor. + oper_mode_offset = 0; + pmpriv->curr_bss_params.bss_descriptor.pbeacon_buf = + MNULL; + pmpriv->curr_bss_params.bss_descriptor.beacon_buf_size = + 0; + pmpriv->curr_bss_params.bss_descriptor. + beacon_buf_size_max = 0; + + PRINTM(MINFO, + "Found current ssid/bssid in list @ index #%d\n", + j); + /* Make a copy of current BSSID descriptor */ + memcpy(pmadapter, + &pmpriv->curr_bss_params.bss_descriptor, + &pmadapter->pscan_table[j], + sizeof(pmpriv->curr_bss_params.bss_descriptor)); + + wlan_save_curr_bcn(pmpriv); + pmadapter->callbacks.moal_spin_unlock(pmadapter-> + pmoal_handle, + pmpriv-> + curr_bcn_buf_lock); + } else { + wlan_restore_curr_bcn(pmpriv); + } + } + + for (i = 0; i < pmadapter->num_in_scan_table; i++) + PRINTM(MINFO, "Scan:(%02d) " MACSTR ", " + "RSSI[%03d], SSID[%s]\n", + i, + MAC2STR(pmadapter->pscan_table[i].mac_address), + (t_s32) pmadapter->pscan_table[i].rssi, + pmadapter->pscan_table[i].ssid.ssid); + + /* + * Prepares domain info from scan table and downloads the + * domain info command to the FW. + */ + wlan_11d_prepare_dnld_domain_info_cmd(pmpriv); + + LEAVE(); } /** @@ -2356,196 +2666,252 @@ wlan_scan_process_results(IN mlan_private * pmpriv) static t_void wlan_scan_delete_table_entry(IN mlan_private * pmpriv, IN t_s32 table_idx) { - mlan_adapter *pmadapter = pmpriv->adapter; - t_u32 del_idx; - t_u32 beacon_buf_adj; - t_u8 *pbeacon_buf; - - ENTER(); - - /* - * Shift the saved beacon buffer data for the scan table back over the - * entry being removed. Update the end of buffer pointer. Save the - * deleted buffer allocation size for pointer adjustments for entries - * compacted after the deleted index. - */ - beacon_buf_adj = pmadapter->pscan_table[table_idx].beacon_buf_size_max; - - PRINTM(MINFO, "Scan: Delete Entry %d, beacon buffer removal = %d bytes\n", - table_idx, beacon_buf_adj); - - /* Check if the table entry had storage allocated for its beacon */ - if (beacon_buf_adj) { - pbeacon_buf = pmadapter->pscan_table[table_idx].pbeacon_buf; - - /* - * Remove the entry's buffer space, decrement the table end pointer - * by the amount we are removing - */ - pmadapter->pbcn_buf_end -= beacon_buf_adj; - - PRINTM(MINFO, - "Scan: Delete Entry %d, compact data: %p <- %p (sz = %d)\n", - table_idx, - pbeacon_buf, - pbeacon_buf + beacon_buf_adj, - pmadapter->pbcn_buf_end - pbeacon_buf); - - /* - * Compact data storage. Copy all data after the deleted entry's - * end address (pbeacon_buf + beacon_buf_adj) back to the original - * start address (pbeacon_buf). - * - * Scan table entries affected by the move will have their entry - * pointer adjusted below. - * - * Use memmove since the dest/src memory regions overlap. - */ - memmove(pmadapter, pbeacon_buf, - (void *) ((t_ptr) pbeacon_buf + (t_ptr) beacon_buf_adj), - (t_u32) ((t_ptr) pmadapter->pbcn_buf_end - - (t_ptr) pbeacon_buf)); - } - - PRINTM(MINFO, "Scan: Delete Entry %d, num_in_scan_table = %d\n", - table_idx, pmadapter->num_in_scan_table); - - /* Shift all of the entries after the table_idx back by one, compacting the - table and removing the requested entry */ - for (del_idx = table_idx; (del_idx + 1) < pmadapter->num_in_scan_table; - del_idx++) { - /* Copy the next entry over this one */ - memcpy(pmadapter, pmadapter->pscan_table + del_idx, - pmadapter->pscan_table + del_idx + 1, sizeof(BSSDescriptor_t)); - - /* - * Adjust this entry's pointer to its beacon buffer based on the - * removed/compacted entry from the deleted index. Don't decrement - * if the buffer pointer is MNULL (no data stored for this entry). - */ - if (pmadapter->pscan_table[del_idx].pbeacon_buf) { - pmadapter->pscan_table[del_idx].pbeacon_buf -= beacon_buf_adj; - if (pmadapter->pscan_table[del_idx].pwpa_ie) { - pmadapter->pscan_table[del_idx].pwpa_ie = - (IEEEtypes_VendorSpecific_t *) - (pmadapter->pscan_table[del_idx].pbeacon_buf + - pmadapter->pscan_table[del_idx].wpa_offset); - } - if (pmadapter->pscan_table[del_idx].prsn_ie) { - pmadapter->pscan_table[del_idx].prsn_ie = - (IEEEtypes_Generic_t *) - (pmadapter->pscan_table[del_idx].pbeacon_buf + - pmadapter->pscan_table[del_idx].rsn_offset); - } - if (pmadapter->pscan_table[del_idx].pwapi_ie) { - pmadapter->pscan_table[del_idx].pwapi_ie = - (IEEEtypes_Generic_t *) - (pmadapter->pscan_table[del_idx].pbeacon_buf + - pmadapter->pscan_table[del_idx].wapi_offset); - } - if (pmadapter->pscan_table[del_idx].pht_cap) { - pmadapter->pscan_table[del_idx].pht_cap = - (IEEEtypes_HTCap_t *) (pmadapter->pscan_table[del_idx]. - pbeacon_buf + - pmadapter->pscan_table[del_idx]. - ht_cap_offset); - } - - if (pmadapter->pscan_table[del_idx].pht_info) { - pmadapter->pscan_table[del_idx].pht_info = - (IEEEtypes_HTInfo_t *) (pmadapter->pscan_table[del_idx]. - pbeacon_buf + - pmadapter->pscan_table[del_idx]. - ht_info_offset); - } - if (pmadapter->pscan_table[del_idx].pbss_co_2040) { - pmadapter->pscan_table[del_idx].pbss_co_2040 = - (IEEEtypes_2040BSSCo_t *) (pmadapter->pscan_table[del_idx]. - pbeacon_buf + - pmadapter->pscan_table[del_idx]. - bss_co_2040_offset); - } - if (pmadapter->pscan_table[del_idx].pext_cap) { - pmadapter->pscan_table[del_idx].pext_cap = - (IEEEtypes_ExtCap_t *) (pmadapter->pscan_table[del_idx]. - pbeacon_buf + - pmadapter->pscan_table[del_idx]. - ext_cap_offset); - } - if (pmadapter->pscan_table[del_idx].poverlap_bss_scan_param) { - pmadapter->pscan_table[del_idx].poverlap_bss_scan_param = - (IEEEtypes_OverlapBSSScanParam_t *) (pmadapter-> - pscan_table[del_idx]. - pbeacon_buf + - pmadapter-> - pscan_table[del_idx]. - overlap_bss_offset); - } - - if (pmadapter->pscan_table[del_idx].pvht_cap) { - pmadapter->pscan_table[del_idx].pvht_cap = - (IEEEtypes_VHTCap_t *) (pmadapter->pscan_table[del_idx]. - pbeacon_buf + - pmadapter->pscan_table[del_idx]. - vht_cap_offset); - } - - if (pmadapter->pscan_table[del_idx].pvht_oprat) { - pmadapter->pscan_table[del_idx].pvht_oprat = - (IEEEtypes_VHTOprat_t *) (pmadapter->pscan_table[del_idx]. - pbeacon_buf + - pmadapter->pscan_table[del_idx]. - vht_oprat_offset); - } - if (pmadapter->pscan_table[del_idx].pvht_txpower) { - pmadapter->pscan_table[del_idx].pvht_txpower = - (IEEEtypes_VHTtxpower_t *) (pmadapter->pscan_table[del_idx]. - pbeacon_buf + - pmadapter->pscan_table[del_idx]. - vht_txpower_offset); - } - if (pmadapter->pscan_table[del_idx].pext_pwer) { - pmadapter->pscan_table[del_idx].pext_pwer = - (IEEEtypes_ExtPwerCons_t *) (pmadapter-> - pscan_table[del_idx]. - pbeacon_buf + - pmadapter-> - pscan_table[del_idx]. - ext_pwer_offset); - } - if (pmadapter->pscan_table[del_idx].pext_bssload) { - pmadapter->pscan_table[del_idx].pext_bssload = - (IEEEtypes_ExtBSSload_t *) (pmadapter->pscan_table[del_idx]. - pbeacon_buf + - pmadapter->pscan_table[del_idx]. - ext_bssload_offset); - } - if (pmadapter->pscan_table[del_idx].pquiet_chan) { - pmadapter->pscan_table[del_idx].pquiet_chan = - (IEEEtypes_QuietChan_t *) (pmadapter->pscan_table[del_idx]. - pbeacon_buf + - pmadapter->pscan_table[del_idx]. - quiet_chan_offset); - } - if (pmadapter->pscan_table[del_idx].poper_mode) { - pmadapter->pscan_table[del_idx].poper_mode = - (IEEEtypes_OperModeNtf_t *) (pmadapter-> - pscan_table[del_idx]. - pbeacon_buf + - pmadapter-> - pscan_table[del_idx]. - oper_mode_offset); - } - } - } - - /* The last entry is invalid now that it has been deleted or moved back */ - memset(pmadapter, pmadapter->pscan_table + pmadapter->num_in_scan_table - 1, - 0x00, sizeof(BSSDescriptor_t)); - - pmadapter->num_in_scan_table--; - - LEAVE(); + mlan_adapter *pmadapter = pmpriv->adapter; + t_u32 del_idx; + t_u32 beacon_buf_adj; + t_u8 *pbeacon_buf; + + ENTER(); + + /* + * Shift the saved beacon buffer data for the scan table back over the + * entry being removed. Update the end of buffer pointer. Save the + * deleted buffer allocation size for pointer adjustments for entries + * compacted after the deleted index. + */ + beacon_buf_adj = pmadapter->pscan_table[table_idx].beacon_buf_size_max; + + PRINTM(MINFO, + "Scan: Delete Entry %d, beacon buffer removal = %d bytes\n", + table_idx, beacon_buf_adj); + + /* Check if the table entry had storage allocated for its beacon */ + if (beacon_buf_adj) { + pbeacon_buf = pmadapter->pscan_table[table_idx].pbeacon_buf; + + /* + * Remove the entry's buffer space, decrement the table end pointer + * by the amount we are removing + */ + pmadapter->pbcn_buf_end -= beacon_buf_adj; + + PRINTM(MINFO, + "Scan: Delete Entry %d, compact data: %p <- %p (sz = %d)\n", + table_idx, + pbeacon_buf, + pbeacon_buf + beacon_buf_adj, + pmadapter->pbcn_buf_end - pbeacon_buf); + + /* + * Compact data storage. Copy all data after the deleted entry's + * end address (pbeacon_buf + beacon_buf_adj) back to the original + * start address (pbeacon_buf). + * + * Scan table entries affected by the move will have their entry + * pointer adjusted below. + * + * Use memmove since the dest/src memory regions overlap. + */ + memmove(pmadapter, pbeacon_buf, + (void *)((t_ptr) pbeacon_buf + (t_ptr) beacon_buf_adj), + (t_u32) ((t_ptr) pmadapter->pbcn_buf_end - + (t_ptr) pbeacon_buf)); + } + + PRINTM(MINFO, "Scan: Delete Entry %d, num_in_scan_table = %d\n", + table_idx, pmadapter->num_in_scan_table); + + /* Shift all of the entries after the table_idx back by one, compacting + the table and removing the requested entry */ + for (del_idx = table_idx; (del_idx + 1) < pmadapter->num_in_scan_table; + del_idx++) { + /* Copy the next entry over this one */ + memcpy(pmadapter, pmadapter->pscan_table + del_idx, + pmadapter->pscan_table + del_idx + 1, + sizeof(BSSDescriptor_t)); + + /* + * Adjust this entry's pointer to its beacon buffer based on the + * removed/compacted entry from the deleted index. Don't decrement + * if the buffer pointer is MNULL (no data stored for this entry). + */ + if (pmadapter->pscan_table[del_idx].pbeacon_buf) { + pmadapter->pscan_table[del_idx].pbeacon_buf -= + beacon_buf_adj; + if (pmadapter->pscan_table[del_idx].pwpa_ie) { + pmadapter->pscan_table[del_idx].pwpa_ie = + (IEEEtypes_VendorSpecific_t *) + (pmadapter->pscan_table[del_idx]. + pbeacon_buf + + pmadapter->pscan_table[del_idx]. + wpa_offset); + } + if (pmadapter->pscan_table[del_idx].prsn_ie) { + pmadapter->pscan_table[del_idx].prsn_ie = + (IEEEtypes_Generic_t *) + (pmadapter->pscan_table[del_idx]. + pbeacon_buf + + pmadapter->pscan_table[del_idx]. + rsn_offset); + } + if (pmadapter->pscan_table[del_idx].pwapi_ie) { + pmadapter->pscan_table[del_idx].pwapi_ie = + (IEEEtypes_Generic_t *) + (pmadapter->pscan_table[del_idx]. + pbeacon_buf + + pmadapter->pscan_table[del_idx]. + wapi_offset); + } + if (pmadapter->pscan_table[del_idx].pht_cap) { + pmadapter->pscan_table[del_idx].pht_cap = + (IEEEtypes_HTCap_t *) (pmadapter-> + pscan_table + [del_idx]. + pbeacon_buf + + pmadapter-> + pscan_table + [del_idx]. + ht_cap_offset); + } + + if (pmadapter->pscan_table[del_idx].pht_info) { + pmadapter->pscan_table[del_idx].pht_info = + (IEEEtypes_HTInfo_t *) (pmadapter-> + pscan_table + [del_idx]. + pbeacon_buf + + pmadapter-> + pscan_table + [del_idx]. + ht_info_offset); + } + if (pmadapter->pscan_table[del_idx].pbss_co_2040) { + pmadapter->pscan_table[del_idx].pbss_co_2040 = + (IEEEtypes_2040BSSCo_t *) (pmadapter-> + pscan_table + [del_idx]. + pbeacon_buf + + pmadapter-> + pscan_table + [del_idx]. + bss_co_2040_offset); + } + if (pmadapter->pscan_table[del_idx].pext_cap) { + pmadapter->pscan_table[del_idx].pext_cap = + (IEEEtypes_ExtCap_t *) (pmadapter-> + pscan_table + [del_idx]. + pbeacon_buf + + pmadapter-> + pscan_table + [del_idx]. + ext_cap_offset); + } + if (pmadapter->pscan_table[del_idx]. + poverlap_bss_scan_param) { + pmadapter->pscan_table[del_idx]. + poverlap_bss_scan_param = + (IEEEtypes_OverlapBSSScanParam_t + *) (pmadapter->pscan_table[del_idx]. + pbeacon_buf + + pmadapter->pscan_table[del_idx]. + overlap_bss_offset); + } + + if (pmadapter->pscan_table[del_idx].pvht_cap) { + pmadapter->pscan_table[del_idx].pvht_cap = + (IEEEtypes_VHTCap_t *) (pmadapter-> + pscan_table + [del_idx]. + pbeacon_buf + + pmadapter-> + pscan_table + [del_idx]. + vht_cap_offset); + } + + if (pmadapter->pscan_table[del_idx].pvht_oprat) { + pmadapter->pscan_table[del_idx].pvht_oprat = + (IEEEtypes_VHTOprat_t *) (pmadapter-> + pscan_table + [del_idx]. + pbeacon_buf + + pmadapter-> + pscan_table + [del_idx]. + vht_oprat_offset); + } + if (pmadapter->pscan_table[del_idx].pvht_txpower) { + pmadapter->pscan_table[del_idx].pvht_txpower = + (IEEEtypes_VHTtxpower_t *) (pmadapter-> + pscan_table + [del_idx]. + pbeacon_buf + + + pmadapter-> + pscan_table + [del_idx]. + vht_txpower_offset); + } + if (pmadapter->pscan_table[del_idx].pext_pwer) { + pmadapter->pscan_table[del_idx].pext_pwer = + (IEEEtypes_ExtPwerCons_t *) (pmadapter-> + pscan_table + [del_idx]. + pbeacon_buf + + + pmadapter-> + pscan_table + [del_idx]. + ext_pwer_offset); + } + if (pmadapter->pscan_table[del_idx].pext_bssload) { + pmadapter->pscan_table[del_idx].pext_bssload = + (IEEEtypes_ExtBSSload_t *) (pmadapter-> + pscan_table + [del_idx]. + pbeacon_buf + + + pmadapter-> + pscan_table + [del_idx]. + ext_bssload_offset); + } + if (pmadapter->pscan_table[del_idx].pquiet_chan) { + pmadapter->pscan_table[del_idx].pquiet_chan = + (IEEEtypes_QuietChan_t *) (pmadapter-> + pscan_table + [del_idx]. + pbeacon_buf + + pmadapter-> + pscan_table + [del_idx]. + quiet_chan_offset); + } + if (pmadapter->pscan_table[del_idx].poper_mode) { + pmadapter->pscan_table[del_idx].poper_mode = + (IEEEtypes_OperModeNtf_t *) (pmadapter-> + pscan_table + [del_idx]. + pbeacon_buf + + + pmadapter-> + pscan_table + [del_idx]. + oper_mode_offset); + } + } + } + + /* The last entry is invalid now that it has been deleted or moved back + */ + memset(pmadapter, + pmadapter->pscan_table + pmadapter->num_in_scan_table - 1, 0x00, + sizeof(BSSDescriptor_t)); + + pmadapter->num_in_scan_table--; + + LEAVE(); } /** @@ -2562,29 +2928,30 @@ wlan_scan_delete_table_entry(IN mlan_private * pmpriv, IN t_s32 table_idx) */ static mlan_status wlan_scan_delete_ssid_table_entry(IN mlan_private * pmpriv, - IN mlan_802_11_ssid * pdel_ssid) + IN mlan_802_11_ssid * pdel_ssid) { - mlan_status ret = MLAN_STATUS_FAILURE; - t_s32 table_idx; - - ENTER(); - - PRINTM(MINFO, "Scan: Delete Ssid Entry: %-32s\n", pdel_ssid->ssid); - - /* If the requested SSID is found in the table, delete it. Then keep - searching the table for multiple entries for the SSID until no more are - found */ - while ((table_idx = wlan_find_ssid_in_list(pmpriv, - pdel_ssid, - MNULL, - MLAN_BSS_MODE_AUTO)) >= 0) { - PRINTM(MINFO, "Scan: Delete SSID Entry: Found Idx = %d\n", table_idx); - ret = MLAN_STATUS_SUCCESS; - wlan_scan_delete_table_entry(pmpriv, table_idx); - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_FAILURE; + t_s32 table_idx; + + ENTER(); + + PRINTM(MINFO, "Scan: Delete Ssid Entry: %-32s\n", pdel_ssid->ssid); + + /* If the requested SSID is found in the table, delete it. Then keep + searching the table for multiple entries for the SSID until no more + are found */ + while ((table_idx = wlan_find_ssid_in_list(pmpriv, + pdel_ssid, + MNULL, + MLAN_BSS_MODE_AUTO)) >= 0) { + PRINTM(MINFO, "Scan: Delete SSID Entry: Found Idx = %d\n", + table_idx); + ret = MLAN_STATUS_SUCCESS; + wlan_scan_delete_table_entry(pmpriv, table_idx); + } + + LEAVE(); + return ret; } /******************************************************** @@ -2607,278 +2974,300 @@ wlan_scan_delete_ssid_table_entry(IN mlan_private * pmpriv, * @param index Index in scan table to check against current driver settings * @param mode Network mode: Infrastructure or IBSS * - * @return Index in ScanTable, or negative value if error + * @return Index in ScanTable, or negative value if error */ t_s32 wlan_is_network_compatible(IN mlan_private * pmpriv, - IN t_u32 index, IN t_u32 mode) + IN t_u32 index, IN t_u32 mode) { - mlan_adapter *pmadapter = pmpriv->adapter; - BSSDescriptor_t *pbss_desc; - - ENTER(); - - pbss_desc = &pmadapter->pscan_table[index]; - pbss_desc->disable_11n = MFALSE; - - /* Don't check for compatibility if roaming */ - if ((pmpriv->media_connected == MTRUE) - && (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) - && (pbss_desc->bss_mode == MLAN_BSS_MODE_INFRA)) { - LEAVE(); - return index; - } - - /* if the VHT CAP IE exists, the HT CAP IE should exist too */ - if (pbss_desc->pvht_cap && !pbss_desc->pht_cap) { - PRINTM(MINFO, - "Don't connect to AP as HT CAP IE is not found from the 11AC AP.\n"); - LEAVE(); - return -1; - } - - if (pbss_desc->wlan_11h_bss_info.chan_switch_ann.element_id == - CHANNEL_SWITCH_ANN) { - PRINTM(MINFO, "Don't connect to AP with CHANNEL_SWITCH_ANN IE.\n"); - LEAVE(); - return -1; - } - - if (pmpriv->wps.session_enable == MTRUE) { - PRINTM(MINFO, "Return success directly in WPS period\n"); - LEAVE(); - return index; - } - - if ((pbss_desc->bss_mode == mode) && - (pmpriv->sec_info.ewpa_enabled == MTRUE)) { - if (((pbss_desc->pwpa_ie) && - ((*(pbss_desc->pwpa_ie)).vend_hdr.element_id == WPA_IE)) || - ((pbss_desc->prsn_ie) && - ((*(pbss_desc->prsn_ie)).ieee_hdr.element_id == RSN_IE))) { - if (((pmpriv->adapter->config_bands & BAND_GN || - pmpriv->adapter->config_bands & BAND_AN) && - pbss_desc->pht_cap) - && (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) - && !is_wpa_oui_present(pmpriv->adapter, pbss_desc, - CIPHER_SUITE_CCMP) - && !is_rsn_oui_present(pmpriv->adapter, pbss_desc, - CIPHER_SUITE_CCMP)) { - - if (is_wpa_oui_present - (pmpriv->adapter, pbss_desc, CIPHER_SUITE_TKIP) - || is_rsn_oui_present(pmpriv->adapter, pbss_desc, - CIPHER_SUITE_TKIP)) { - PRINTM(MINFO, - "Disable 11n if AES is not supported by AP\n"); - pbss_desc->disable_11n = MTRUE; - } else { - LEAVE(); - return -1; - } - } - LEAVE(); - return index; - } else { - PRINTM(MINFO, "ewpa_enabled: Ignore none WPA/WPA2 AP\n"); - LEAVE(); - return -1; - } - } - - if (pmpriv->sec_info.wapi_enabled && - (pbss_desc->pwapi_ie && - ((*(pbss_desc->pwapi_ie)).ieee_hdr.element_id == WAPI_IE))) { - PRINTM(MINFO, "Return success for WAPI AP\n"); - LEAVE(); - return index; - } - - if (pbss_desc->bss_mode == mode) { - if (pmpriv->sec_info.wep_status == Wlan802_11WEPDisabled - && !pmpriv->sec_info.wpa_enabled - && !pmpriv->sec_info.wpa2_enabled - && ((!pbss_desc->pwpa_ie) || - ((*(pbss_desc->pwpa_ie)).vend_hdr.element_id != WPA_IE)) - && ((!pbss_desc->prsn_ie) || - ((*(pbss_desc->prsn_ie)).ieee_hdr.element_id != RSN_IE)) - && !pmpriv->adhoc_aes_enabled && - pmpriv->sec_info.encryption_mode == MLAN_ENCRYPTION_MODE_NONE && - !pbss_desc->privacy) { - /* No security */ - LEAVE(); - return index; - } else if (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled - && !pmpriv->sec_info.wpa_enabled - && !pmpriv->sec_info.wpa2_enabled - && !pmpriv->adhoc_aes_enabled && pbss_desc->privacy) { - /* Static WEP enabled */ - PRINTM(MINFO, "Disable 11n in WEP mode\n"); - pbss_desc->disable_11n = MTRUE; - /* Reject the following cases: */ - /* case 1: RSN IE w/o WEP OUI and WPA IE w/o WEP OUI case 2: RSN IE - w/o WEP OUI and No WPA IE case 3: WPA IE w/o WEP OUI and No RSN - IE * */ - if (((pbss_desc->prsn_ie) && - ((*(pbss_desc->prsn_ie)).ieee_hdr.element_id == RSN_IE)) || - ((pbss_desc->pwpa_ie) && - ((*(pbss_desc->pwpa_ie)).vend_hdr.element_id == WPA_IE))) { - if (!is_rsn_oui_present - (pmpriv->adapter, pbss_desc, CIPHER_SUITE_WEP40) && - !is_rsn_oui_present(pmpriv->adapter, pbss_desc, - CIPHER_SUITE_WEP104) && - !is_wpa_oui_present(pmpriv->adapter, pbss_desc, - CIPHER_SUITE_WEP40) && - !is_wpa_oui_present(pmpriv->adapter, pbss_desc, - CIPHER_SUITE_WEP104)) - index = -1; - } - - LEAVE(); - return index; - } else if (pmpriv->sec_info.wep_status == Wlan802_11WEPDisabled - && pmpriv->sec_info.wpa_enabled - && !pmpriv->sec_info.wpa2_enabled - && ((pbss_desc->pwpa_ie) && - ((*(pbss_desc->pwpa_ie)).vend_hdr.element_id == WPA_IE)) - && !pmpriv->adhoc_aes_enabled - /* - * Privacy bit may NOT be set in some APs like LinkSys WRT54G - * && pbss_desc->privacy - */ - ) { - /* WPA enabled */ - PRINTM(MINFO, - "wlan_is_network_compatible() WPA: index=%d wpa_ie=%#x " - "rsn_ie=%#x WEP=%s WPA=%s WPA2=%s EncMode=%#x " - "privacy=%#x\n", index, - (pbss_desc->pwpa_ie) ? (*(pbss_desc->pwpa_ie)).vend_hdr. - element_id : 0, - (pbss_desc->prsn_ie) ? (*(pbss_desc->prsn_ie)).ieee_hdr. - element_id : 0, - (pmpriv->sec_info.wep_status == - Wlan802_11WEPEnabled) ? "e" : "d", - (pmpriv->sec_info.wpa_enabled) ? "e" : "d", - (pmpriv->sec_info.wpa2_enabled) ? "e" : "d", - pmpriv->sec_info.encryption_mode, pbss_desc->privacy); - if (((pmpriv->adapter->config_bands & BAND_GN || - pmpriv->adapter->config_bands & BAND_AN) && - pbss_desc->pht_cap) - && (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) - && !is_wpa_oui_present(pmpriv->adapter, pbss_desc, - CIPHER_SUITE_CCMP)) { - if (is_wpa_oui_present - (pmpriv->adapter, pbss_desc, CIPHER_SUITE_TKIP)) { - PRINTM(MINFO, - "Disable 11n if AES is not supported by AP\n"); - pbss_desc->disable_11n = MTRUE; - } else { - LEAVE(); - return -1; - } - } - LEAVE(); - return index; - } else if (pmpriv->sec_info.wep_status == Wlan802_11WEPDisabled - && !pmpriv->sec_info.wpa_enabled - && pmpriv->sec_info.wpa2_enabled - && ((pbss_desc->prsn_ie) && - ((*(pbss_desc->prsn_ie)).ieee_hdr.element_id == RSN_IE)) - && !pmpriv->adhoc_aes_enabled - /* - * Privacy bit may NOT be set in some APs like LinkSys WRT54G - * && pbss_desc->privacy - */ - ) { - /* WPA2 enabled */ - PRINTM(MINFO, - "wlan_is_network_compatible() WPA2: index=%d wpa_ie=%#x " - "rsn_ie=%#x WEP=%s WPA=%s WPA2=%s EncMode=%#x " - "privacy=%#x\n", index, - (pbss_desc->pwpa_ie) ? (*(pbss_desc->pwpa_ie)).vend_hdr. - element_id : 0, - (pbss_desc->prsn_ie) ? (*(pbss_desc->prsn_ie)).ieee_hdr. - element_id : 0, - (pmpriv->sec_info.wep_status == - Wlan802_11WEPEnabled) ? "e" : "d", - (pmpriv->sec_info.wpa_enabled) ? "e" : "d", - (pmpriv->sec_info.wpa2_enabled) ? "e" : "d", - pmpriv->sec_info.encryption_mode, pbss_desc->privacy); - if (((pmpriv->adapter->config_bands & BAND_GN || - pmpriv->adapter->config_bands & BAND_AN) && - pbss_desc->pht_cap) - && (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) - && !is_rsn_oui_present(pmpriv->adapter, pbss_desc, - CIPHER_SUITE_CCMP)) { - if (is_rsn_oui_present - (pmpriv->adapter, pbss_desc, CIPHER_SUITE_TKIP)) { - PRINTM(MINFO, - "Disable 11n if AES is not supported by AP\n"); - pbss_desc->disable_11n = MTRUE; - } else { - LEAVE(); - return -1; - } - } - LEAVE(); - return index; - } else if (pmpriv->sec_info.wep_status == Wlan802_11WEPDisabled - && !pmpriv->sec_info.wpa_enabled - && !pmpriv->sec_info.wpa2_enabled - && ((!pbss_desc->pwpa_ie) || - ((*(pbss_desc->pwpa_ie)).vend_hdr.element_id != WPA_IE)) - && ((!pbss_desc->prsn_ie) || - ((*(pbss_desc->prsn_ie)).ieee_hdr.element_id != RSN_IE)) - && pmpriv->adhoc_aes_enabled && - pmpriv->sec_info.encryption_mode == MLAN_ENCRYPTION_MODE_NONE - && pbss_desc->privacy) { - /* Ad-hoc AES enabled */ - LEAVE(); - return index; - } else if (pmpriv->sec_info.wep_status == Wlan802_11WEPDisabled - && !pmpriv->sec_info.wpa_enabled - && !pmpriv->sec_info.wpa2_enabled - && ((!pbss_desc->pwpa_ie) || - ((*(pbss_desc->pwpa_ie)).vend_hdr.element_id != WPA_IE)) - && ((!pbss_desc->prsn_ie) || - ((*(pbss_desc->prsn_ie)).ieee_hdr.element_id != RSN_IE)) - && !pmpriv->adhoc_aes_enabled && - pmpriv->sec_info.encryption_mode != MLAN_ENCRYPTION_MODE_NONE - && pbss_desc->privacy) { - /* Dynamic WEP enabled */ - PRINTM(MINFO, "wlan_is_network_compatible() dynamic WEP: index=%d " - "wpa_ie=%#x rsn_ie=%#x EncMode=%#x privacy=%#x\n", - index, - (pbss_desc->pwpa_ie) ? (*(pbss_desc->pwpa_ie)).vend_hdr. - element_id : 0, - (pbss_desc->prsn_ie) ? (*(pbss_desc->prsn_ie)).ieee_hdr. - element_id : 0, pmpriv->sec_info.encryption_mode, - pbss_desc->privacy); - LEAVE(); - return index; - } - - /* Security doesn't match */ - PRINTM(MINFO, - "wlan_is_network_compatible() FAILED: index=%d wpa_ie=%#x " - "rsn_ie=%#x WEP=%s WPA=%s WPA2=%s EncMode=%#x privacy=%#x\n", - index, - (pbss_desc->pwpa_ie) ? (*(pbss_desc->pwpa_ie)).vend_hdr. - element_id : 0, - (pbss_desc->prsn_ie) ? (*(pbss_desc->prsn_ie)).ieee_hdr. - element_id : 0, - (pmpriv->sec_info.wep_status == - Wlan802_11WEPEnabled) ? "e" : "d", - (pmpriv->sec_info.wpa_enabled) ? "e" : "d", - (pmpriv->sec_info.wpa2_enabled) ? "e" : "d", - pmpriv->sec_info.encryption_mode, pbss_desc->privacy); - LEAVE(); - return -1; - } - - /* Mode doesn't match */ - LEAVE(); - return -1; + mlan_adapter *pmadapter = pmpriv->adapter; + BSSDescriptor_t *pbss_desc; + + ENTER(); + + pbss_desc = &pmadapter->pscan_table[index]; + pbss_desc->disable_11n = MFALSE; + + /* Don't check for compatibility if roaming */ + if ((pmpriv->media_connected == MTRUE) + && (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) + && (pbss_desc->bss_mode == MLAN_BSS_MODE_INFRA)) { + LEAVE(); + return index; + } + + /* if the VHT CAP IE exists, the HT CAP IE should exist too */ + if (pbss_desc->pvht_cap && !pbss_desc->pht_cap) { + PRINTM(MINFO, + "Don't connect to AP as HT CAP IE is not found from the 11AC AP.\n"); + LEAVE(); + return -1; + } + + if (pbss_desc->wlan_11h_bss_info.chan_switch_ann.element_id == + CHANNEL_SWITCH_ANN) { + PRINTM(MINFO, + "Don't connect to AP with CHANNEL_SWITCH_ANN IE.\n"); + LEAVE(); + return -1; + } + + if (pmpriv->wps.session_enable == MTRUE) { + PRINTM(MINFO, "Return success directly in WPS period\n"); + LEAVE(); + return index; + } + + if ((pbss_desc->bss_mode == mode) && + (pmpriv->sec_info.ewpa_enabled == MTRUE)) { + if (((pbss_desc->pwpa_ie) && + ((*(pbss_desc->pwpa_ie)).vend_hdr.element_id == WPA_IE)) || + ((pbss_desc->prsn_ie) && + ((*(pbss_desc->prsn_ie)).ieee_hdr.element_id == RSN_IE))) { + if (((pmpriv->adapter->config_bands & BAND_GN || + pmpriv->adapter->config_bands & BAND_AN) && + pbss_desc->pht_cap) + && (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) + && !is_wpa_oui_present(pmpriv->adapter, pbss_desc, + CIPHER_SUITE_CCMP) + && !is_rsn_oui_present(pmpriv->adapter, pbss_desc, + CIPHER_SUITE_CCMP)) { + + if (is_wpa_oui_present + (pmpriv->adapter, pbss_desc, + CIPHER_SUITE_TKIP) + || is_rsn_oui_present(pmpriv->adapter, + pbss_desc, + CIPHER_SUITE_TKIP)) { + PRINTM(MINFO, + "Disable 11n if AES is not supported by AP\n"); + pbss_desc->disable_11n = MTRUE; + } else { + LEAVE(); + return -1; + } + } + LEAVE(); + return index; + } else { + PRINTM(MINFO, + "ewpa_enabled: Ignore none WPA/WPA2 AP\n"); + LEAVE(); + return -1; + } + } + + if (pmpriv->sec_info.wapi_enabled && + (pbss_desc->pwapi_ie && + ((*(pbss_desc->pwapi_ie)).ieee_hdr.element_id == WAPI_IE))) { + PRINTM(MINFO, "Return success for WAPI AP\n"); + LEAVE(); + return index; + } + + if (pbss_desc->bss_mode == mode) { + if (pmpriv->sec_info.wep_status == Wlan802_11WEPDisabled + && !pmpriv->sec_info.wpa_enabled + && !pmpriv->sec_info.wpa2_enabled + && ((!pbss_desc->pwpa_ie) || + ((*(pbss_desc->pwpa_ie)).vend_hdr.element_id != WPA_IE)) + && ((!pbss_desc->prsn_ie) || + ((*(pbss_desc->prsn_ie)).ieee_hdr.element_id != RSN_IE)) + && !pmpriv->adhoc_aes_enabled && + pmpriv->sec_info.encryption_mode == + MLAN_ENCRYPTION_MODE_NONE && !pbss_desc->privacy) { + /* No security */ + LEAVE(); + return index; + } else if (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled + && !pmpriv->sec_info.wpa_enabled + && !pmpriv->sec_info.wpa2_enabled + && !pmpriv->adhoc_aes_enabled + && pbss_desc->privacy) { + /* Static WEP enabled */ + PRINTM(MINFO, "Disable 11n in WEP mode\n"); + pbss_desc->disable_11n = MTRUE; + /* Reject the following cases: */ + /* case 1: RSN IE w/o WEP OUI and WPA IE w/o WEP OUI + case 2: RSN IE w/o WEP OUI and No WPA IE case 3: WPA + IE w/o WEP OUI and No RSN IE * */ + if (((pbss_desc->prsn_ie) && + ((*(pbss_desc->prsn_ie)).ieee_hdr.element_id == + RSN_IE)) || ((pbss_desc->pwpa_ie) && + ((*(pbss_desc->pwpa_ie)).vend_hdr. + element_id == WPA_IE))) { + if (!is_rsn_oui_present + (pmpriv->adapter, pbss_desc, + CIPHER_SUITE_WEP40) && + !is_rsn_oui_present(pmpriv->adapter, + pbss_desc, + CIPHER_SUITE_WEP104) && + !is_wpa_oui_present(pmpriv->adapter, + pbss_desc, + CIPHER_SUITE_WEP40) && + !is_wpa_oui_present(pmpriv->adapter, + pbss_desc, + CIPHER_SUITE_WEP104)) + index = -1; + } + + LEAVE(); + return index; + } else if (pmpriv->sec_info.wep_status == Wlan802_11WEPDisabled + && pmpriv->sec_info.wpa_enabled + && !pmpriv->sec_info.wpa2_enabled + && ((pbss_desc->pwpa_ie) && + ((*(pbss_desc->pwpa_ie)).vend_hdr.element_id == + WPA_IE)) + && !pmpriv->adhoc_aes_enabled + /* + * Privacy bit may NOT be set in some APs like LinkSys WRT54G + * && pbss_desc->privacy + */ + ) { + /* WPA enabled */ + PRINTM(MINFO, + "wlan_is_network_compatible() WPA: index=%d wpa_ie=%#x " + "rsn_ie=%#x WEP=%s WPA=%s WPA2=%s EncMode=%#x " + "privacy=%#x\n", index, + (pbss_desc->pwpa_ie) ? (*(pbss_desc->pwpa_ie)). + vend_hdr.element_id : 0, + (pbss_desc->prsn_ie) ? (*(pbss_desc->prsn_ie)). + ieee_hdr.element_id : 0, + (pmpriv->sec_info.wep_status == + Wlan802_11WEPEnabled) ? "e" : "d", + (pmpriv->sec_info.wpa_enabled) ? "e" : "d", + (pmpriv->sec_info.wpa2_enabled) ? "e" : "d", + pmpriv->sec_info.encryption_mode, + pbss_desc->privacy); + if (((pmpriv->adapter->config_bands & BAND_GN || + pmpriv->adapter->config_bands & BAND_AN) && + pbss_desc->pht_cap) + && (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) + && !is_wpa_oui_present(pmpriv->adapter, pbss_desc, + CIPHER_SUITE_CCMP)) { + if (is_wpa_oui_present + (pmpriv->adapter, pbss_desc, + CIPHER_SUITE_TKIP)) { + PRINTM(MINFO, + "Disable 11n if AES is not supported by AP\n"); + pbss_desc->disable_11n = MTRUE; + } else { + LEAVE(); + return -1; + } + } + LEAVE(); + return index; + } else if (pmpriv->sec_info.wep_status == Wlan802_11WEPDisabled + && !pmpriv->sec_info.wpa_enabled + && pmpriv->sec_info.wpa2_enabled + && ((pbss_desc->prsn_ie) && + ((*(pbss_desc->prsn_ie)).ieee_hdr.element_id == + RSN_IE)) + && !pmpriv->adhoc_aes_enabled + /* + * Privacy bit may NOT be set in some APs like LinkSys WRT54G + * && pbss_desc->privacy + */ + ) { + /* WPA2 enabled */ + PRINTM(MINFO, + "wlan_is_network_compatible() WPA2: index=%d wpa_ie=%#x " + "rsn_ie=%#x WEP=%s WPA=%s WPA2=%s EncMode=%#x " + "privacy=%#x\n", index, + (pbss_desc->pwpa_ie) ? (*(pbss_desc->pwpa_ie)). + vend_hdr.element_id : 0, + (pbss_desc->prsn_ie) ? (*(pbss_desc->prsn_ie)). + ieee_hdr.element_id : 0, + (pmpriv->sec_info.wep_status == + Wlan802_11WEPEnabled) ? "e" : "d", + (pmpriv->sec_info.wpa_enabled) ? "e" : "d", + (pmpriv->sec_info.wpa2_enabled) ? "e" : "d", + pmpriv->sec_info.encryption_mode, + pbss_desc->privacy); + if (((pmpriv->adapter->config_bands & BAND_GN || + pmpriv->adapter->config_bands & BAND_AN) && + pbss_desc->pht_cap) + && (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) + && !is_rsn_oui_present(pmpriv->adapter, pbss_desc, + CIPHER_SUITE_CCMP)) { + if (is_rsn_oui_present + (pmpriv->adapter, pbss_desc, + CIPHER_SUITE_TKIP)) { + PRINTM(MINFO, + "Disable 11n if AES is not supported by AP\n"); + pbss_desc->disable_11n = MTRUE; + } else { + LEAVE(); + return -1; + } + } + LEAVE(); + return index; + } else if (pmpriv->sec_info.wep_status == Wlan802_11WEPDisabled + && !pmpriv->sec_info.wpa_enabled + && !pmpriv->sec_info.wpa2_enabled + && ((!pbss_desc->pwpa_ie) || + ((*(pbss_desc->pwpa_ie)).vend_hdr.element_id != + WPA_IE)) + && ((!pbss_desc->prsn_ie) || + ((*(pbss_desc->prsn_ie)).ieee_hdr.element_id != + RSN_IE)) + && pmpriv->adhoc_aes_enabled && + pmpriv->sec_info.encryption_mode == + MLAN_ENCRYPTION_MODE_NONE && pbss_desc->privacy) { + /* Ad-hoc AES enabled */ + LEAVE(); + return index; + } else if (pmpriv->sec_info.wep_status == Wlan802_11WEPDisabled + && !pmpriv->sec_info.wpa_enabled + && !pmpriv->sec_info.wpa2_enabled + && ((!pbss_desc->pwpa_ie) || + ((*(pbss_desc->pwpa_ie)).vend_hdr.element_id != + WPA_IE)) + && ((!pbss_desc->prsn_ie) || + ((*(pbss_desc->prsn_ie)).ieee_hdr.element_id != + RSN_IE)) + && !pmpriv->adhoc_aes_enabled && + pmpriv->sec_info.encryption_mode != + MLAN_ENCRYPTION_MODE_NONE && pbss_desc->privacy) { + /* Dynamic WEP enabled */ + PRINTM(MINFO, + "wlan_is_network_compatible() dynamic WEP: index=%d " + "wpa_ie=%#x rsn_ie=%#x EncMode=%#x privacy=%#x\n", + index, + (pbss_desc->pwpa_ie) ? (*(pbss_desc->pwpa_ie)). + vend_hdr.element_id : 0, + (pbss_desc->prsn_ie) ? (*(pbss_desc->prsn_ie)). + ieee_hdr.element_id : 0, + pmpriv->sec_info.encryption_mode, + pbss_desc->privacy); + LEAVE(); + return index; + } + + /* Security doesn't match */ + PRINTM(MINFO, + "wlan_is_network_compatible() FAILED: index=%d wpa_ie=%#x " + "rsn_ie=%#x WEP=%s WPA=%s WPA2=%s EncMode=%#x privacy=%#x\n", + index, + (pbss_desc->pwpa_ie) ? (*(pbss_desc->pwpa_ie)).vend_hdr. + element_id : 0, + (pbss_desc->prsn_ie) ? (*(pbss_desc->prsn_ie)).ieee_hdr. + element_id : 0, + (pmpriv->sec_info.wep_status == + Wlan802_11WEPEnabled) ? "e" : "d", + (pmpriv->sec_info.wpa_enabled) ? "e" : "d", + (pmpriv->sec_info.wpa2_enabled) ? "e" : "d", + pmpriv->sec_info.encryption_mode, pbss_desc->privacy); + LEAVE(); + return -1; + } + + /* Mode doesn't match */ + LEAVE(); + return -1; } /** @@ -2886,24 +3275,24 @@ wlan_is_network_compatible(IN mlan_private * pmpriv, * * @param pmadapter A pointer to mlan_adapter structure * - * @return MLAN_STATUS_SUCCESS + * @return MLAN_STATUS_SUCCESS */ mlan_status wlan_flush_scan_table(IN pmlan_adapter pmadapter) { - ENTER(); + ENTER(); - PRINTM(MINFO, "Flushing scan table\n"); + PRINTM(MINFO, "Flushing scan table\n"); - memset(pmadapter, pmadapter->pscan_table, 0, - (sizeof(BSSDescriptor_t) * MRVDRV_MAX_BSSID_LIST)); - pmadapter->num_in_scan_table = 0; + memset(pmadapter, pmadapter->pscan_table, 0, + (sizeof(BSSDescriptor_t) * MRVDRV_MAX_BSSID_LIST)); + pmadapter->num_in_scan_table = 0; - memset(pmadapter, pmadapter->bcn_buf, 0, pmadapter->bcn_buf_size); - pmadapter->pbcn_buf_end = pmadapter->bcn_buf; + memset(pmadapter, pmadapter->bcn_buf, 0, pmadapter->bcn_buf_size); + pmadapter->pbcn_buf_end = pmadapter->bcn_buf; - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -2922,121 +3311,131 @@ wlan_flush_scan_table(IN pmlan_adapter pmadapter) */ mlan_status wlan_scan_networks(IN mlan_private * pmpriv, - IN t_void * pioctl_buf, - IN const wlan_user_scan_cfg * puser_scan_in) + IN t_void * pioctl_buf, + IN const wlan_user_scan_cfg * puser_scan_in) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = pmpriv->adapter; - mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; - cmd_ctrl_node *pcmd_node = MNULL; - pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; - - wlan_scan_cmd_config_tlv *pscan_cfg_out = MNULL; - MrvlIEtypes_ChanListParamSet_t *pchan_list_out; - t_u32 buf_size; - ChanScanParamSet_t *pscan_chan_list; - - t_u8 keep_previous_scan; - t_u8 filtered_scan; - t_u8 scan_current_chan_only; - t_u8 max_chan_per_scan; - - ENTER(); - - ret = - pcb->moal_malloc(pmadapter->pmoal_handle, - sizeof(wlan_scan_cmd_config_tlv), MLAN_MEM_DEF, - (t_u8 **) & pscan_cfg_out); - if (ret != MLAN_STATUS_SUCCESS || !pscan_cfg_out) { - PRINTM(MERROR, "Memory allocation for pscan_cfg_out failed!\n"); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_NO_MEM; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - buf_size = sizeof(ChanScanParamSet_t) * WLAN_USER_SCAN_CHAN_MAX; - ret = - pcb->moal_malloc(pmadapter->pmoal_handle, buf_size, MLAN_MEM_DEF, - (t_u8 **) & pscan_chan_list); - if (ret != MLAN_STATUS_SUCCESS || !pscan_chan_list) { - PRINTM(MERROR, "Failed to allocate scan_chan_list\n"); - if (pscan_cfg_out) - pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) pscan_cfg_out); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_NO_MEM; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - memset(pmadapter, pscan_chan_list, 0x00, buf_size); - memset(pmadapter, pscan_cfg_out, 0x00, sizeof(wlan_scan_cmd_config_tlv)); - - keep_previous_scan = MFALSE; - - ret = wlan_scan_setup_scan_config(pmpriv, - puser_scan_in, - &pscan_cfg_out->config, - &pchan_list_out, - pscan_chan_list, - &max_chan_per_scan, - &filtered_scan, &scan_current_chan_only); - if (ret != MLAN_STATUS_SUCCESS) { - - PRINTM(MERROR, "Failed to setup scan config\n"); - if (pscan_cfg_out) - pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) pscan_cfg_out); - if (pscan_chan_list) - pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) pscan_chan_list); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - if (puser_scan_in) { - keep_previous_scan = puser_scan_in->keep_previous_scan; - } - - if (keep_previous_scan == MFALSE) { - memset(pmadapter, pmadapter->pscan_table, 0x00, - sizeof(BSSDescriptor_t) * MRVDRV_MAX_BSSID_LIST); - pmadapter->num_in_scan_table = 0; - pmadapter->pbcn_buf_end = pmadapter->bcn_buf; - } - - ret = wlan_scan_channel_list(pmpriv, - pioctl_buf, - max_chan_per_scan, - filtered_scan, - &pscan_cfg_out->config, - pchan_list_out, pscan_chan_list); - - /* Get scan command from scan_pending_q and put to cmd_pending_q */ - if (ret == MLAN_STATUS_SUCCESS) { - if (util_peek_list - (pmadapter->pmoal_handle, &pmadapter->scan_pending_q, - pcb->moal_spin_lock, pcb->moal_spin_unlock)) { - pcmd_node = - (cmd_ctrl_node *) util_dequeue_list(pmadapter->pmoal_handle, - &pmadapter->scan_pending_q, - pcb->moal_spin_lock, - pcb->moal_spin_unlock); - pmadapter->pext_scan_ioctl_req = pioctl_req; - wlan_request_cmd_lock(pmadapter); - pmadapter->scan_processing = MTRUE; - wlan_release_cmd_lock(pmadapter); - wlan_insert_cmd_to_pending_q(pmadapter, pcmd_node, MTRUE); - } - } - if (pscan_cfg_out) - pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) pscan_cfg_out); - - if (pscan_chan_list) - pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) pscan_chan_list); - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + mlan_callbacks *pcb = (mlan_callbacks *) & pmadapter->callbacks; + cmd_ctrl_node *pcmd_node = MNULL; + pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; + + wlan_scan_cmd_config_tlv *pscan_cfg_out = MNULL; + MrvlIEtypes_ChanListParamSet_t *pchan_list_out; + t_u32 buf_size; + ChanScanParamSet_t *pscan_chan_list; + + t_u8 keep_previous_scan; + t_u8 filtered_scan; + t_u8 scan_current_chan_only; + t_u8 max_chan_per_scan; + + ENTER(); + + ret = pcb->moal_malloc(pmadapter->pmoal_handle, + sizeof(wlan_scan_cmd_config_tlv), MLAN_MEM_DEF, + (t_u8 **) & pscan_cfg_out); + if (ret != MLAN_STATUS_SUCCESS || !pscan_cfg_out) { + PRINTM(MERROR, "Memory allocation for pscan_cfg_out failed!\n"); + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_NO_MEM; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + buf_size = sizeof(ChanScanParamSet_t) * WLAN_USER_SCAN_CHAN_MAX; + ret = pcb->moal_malloc(pmadapter->pmoal_handle, buf_size, MLAN_MEM_DEF, + (t_u8 **) & pscan_chan_list); + if (ret != MLAN_STATUS_SUCCESS || !pscan_chan_list) { + PRINTM(MERROR, "Failed to allocate scan_chan_list\n"); + if (pscan_cfg_out) + pcb->moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pscan_cfg_out); + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_NO_MEM; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + memset(pmadapter, pscan_chan_list, 0x00, buf_size); + memset(pmadapter, pscan_cfg_out, 0x00, + sizeof(wlan_scan_cmd_config_tlv)); + + keep_previous_scan = MFALSE; + + ret = wlan_scan_setup_scan_config(pmpriv, + puser_scan_in, + &pscan_cfg_out->config, + &pchan_list_out, + pscan_chan_list, + &max_chan_per_scan, + &filtered_scan, + &scan_current_chan_only); + if (ret != MLAN_STATUS_SUCCESS) { + + PRINTM(MERROR, "Failed to setup scan config\n"); + if (pscan_cfg_out) + pcb->moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pscan_cfg_out); + if (pscan_chan_list) + pcb->moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pscan_chan_list); + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + if (puser_scan_in) { + keep_previous_scan = puser_scan_in->keep_previous_scan; + } + + if (keep_previous_scan == MFALSE) { + memset(pmadapter, pmadapter->pscan_table, 0x00, + sizeof(BSSDescriptor_t) * MRVDRV_MAX_BSSID_LIST); + pmadapter->num_in_scan_table = 0; + pmadapter->pbcn_buf_end = pmadapter->bcn_buf; + } + + ret = wlan_scan_channel_list(pmpriv, + pioctl_buf, + max_chan_per_scan, + filtered_scan, + &pscan_cfg_out->config, + pchan_list_out, pscan_chan_list); + + /* Get scan command from scan_pending_q and put to cmd_pending_q */ + if (ret == MLAN_STATUS_SUCCESS) { + if (util_peek_list + (pmadapter->pmoal_handle, &pmadapter->scan_pending_q, + pcb->moal_spin_lock, pcb->moal_spin_unlock)) { + pcmd_node = + (cmd_ctrl_node *) util_dequeue_list(pmadapter-> + pmoal_handle, + &pmadapter-> + scan_pending_q, + pcb-> + moal_spin_lock, + pcb-> + moal_spin_unlock); + pmadapter->pext_scan_ioctl_req = pioctl_req; + wlan_request_cmd_lock(pmadapter); + pmadapter->scan_processing = MTRUE; + wlan_release_cmd_lock(pmadapter); + wlan_insert_cmd_to_pending_q(pmadapter, pcmd_node, + MTRUE); + } + } + if (pscan_cfg_out) + pcb->moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pscan_cfg_out); + + if (pscan_chan_list) + pcb->moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pscan_chan_list); + + LEAVE(); + return ret; } /** @@ -3059,32 +3458,33 @@ wlan_scan_networks(IN mlan_private * pmpriv, */ mlan_status wlan_cmd_802_11_scan(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * pcmd, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * pcmd, IN t_void * pdata_buf) { - HostCmd_DS_802_11_SCAN *pscan_cmd = &pcmd->params.scan; - wlan_scan_cmd_config *pscan_cfg; + HostCmd_DS_802_11_SCAN *pscan_cmd = &pcmd->params.scan; + wlan_scan_cmd_config *pscan_cfg; - ENTER(); + ENTER(); - pscan_cfg = (wlan_scan_cmd_config *) pdata_buf; + pscan_cfg = (wlan_scan_cmd_config *) pdata_buf; - /* Set fixed field variables in scan command */ - pscan_cmd->bss_mode = pscan_cfg->bss_mode; - memcpy(pmpriv->adapter, pscan_cmd->bssid, pscan_cfg->specific_bssid, - sizeof(pscan_cmd->bssid)); - memcpy(pmpriv->adapter, pscan_cmd->tlv_buffer, pscan_cfg->tlv_buf, - pscan_cfg->tlv_buf_len); + /* Set fixed field variables in scan command */ + pscan_cmd->bss_mode = pscan_cfg->bss_mode; + memcpy(pmpriv->adapter, pscan_cmd->bssid, pscan_cfg->specific_bssid, + sizeof(pscan_cmd->bssid)); + memcpy(pmpriv->adapter, pscan_cmd->tlv_buffer, pscan_cfg->tlv_buf, + pscan_cfg->tlv_buf_len); - pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_SCAN); + pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_SCAN); - /* Size is equal to the sizeof(fixed portions) + the TLV len + header */ - pcmd->size = (t_u16) wlan_cpu_to_le16((t_u16) (sizeof(pscan_cmd->bss_mode) - + sizeof(pscan_cmd->bssid) - + pscan_cfg->tlv_buf_len - + S_DS_GEN)); + /* Size is equal to the sizeof(fixed portions) + the TLV len + header */ + pcmd->size = + (t_u16) wlan_cpu_to_le16((t_u16) (sizeof(pscan_cmd->bss_mode) + + sizeof(pscan_cmd->bssid) + + pscan_cfg->tlv_buf_len + + S_DS_GEN)); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -3114,309 +3514,345 @@ wlan_cmd_802_11_scan(IN mlan_private * pmpriv, */ mlan_status wlan_ret_802_11_scan(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * resp, IN t_void * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, IN t_void * pioctl_buf) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = pmpriv->adapter; - mlan_callbacks *pcb = MNULL; - mlan_ioctl_req *pioctl_req = (mlan_ioctl_req *) pioctl_buf; - cmd_ctrl_node *pcmd_node = MNULL; - HostCmd_DS_802_11_SCAN_RSP *pscan_rsp = MNULL; - BSSDescriptor_t *bss_new_entry = MNULL; - MrvlIEtypes_Data_t *ptlv; - MrvlIEtypes_TsfTimestamp_t *ptsf_tlv = MNULL; - t_u8 *pbss_info; - t_u32 scan_resp_size; - t_u32 bytes_left; - t_u32 num_in_table; - t_u32 bss_idx; - t_u32 idx; - t_u32 tlv_buf_size; - t_u64 tsf_val; - chan_freq_power_t *cfp; - MrvlIEtypes_ChanBandListParamSet_t *pchan_band_tlv = MNULL; - ChanBandParamSet_t *pchan_band; - t_u8 band; - t_u8 is_bgscan_resp; - t_u32 age_ts_usec; - t_u8 null_ssid[MLAN_MAX_SSID_LENGTH] = { 0 }; - - ENTER(); - pcb = (pmlan_callbacks) & pmadapter->callbacks; - - is_bgscan_resp = (resp->command == HostCmd_CMD_802_11_BG_SCAN_QUERY); - if (is_bgscan_resp) { - pscan_rsp = &resp->params.bg_scan_query_resp.scan_resp; - } else { - pscan_rsp = &resp->params.scan_resp; - } - - if (pscan_rsp->number_of_sets > MRVDRV_MAX_BSSID_LIST) { - PRINTM(MERROR, "SCAN_RESP: Invalid number of AP returned (%d)!!\n", - pscan_rsp->number_of_sets); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_CMD_SCAN_FAIL; - ret = MLAN_STATUS_FAILURE; - goto done; - } - - bytes_left = wlan_le16_to_cpu(pscan_rsp->bss_descript_size); - PRINTM(MINFO, "SCAN_RESP: bss_descript_size %d\n", bytes_left); - - scan_resp_size = resp->size; - - PRINTM(MINFO, "SCAN_RESP: returned %d APs before parsing\n", - pscan_rsp->number_of_sets); - - num_in_table = pmadapter->num_in_scan_table; - pbss_info = pscan_rsp->bss_desc_and_tlv_buffer; - - /* - * The size of the TLV buffer is equal to the entire command response - * size (scan_resp_size) minus the fixed fields (sizeof()'s), the - * BSS Descriptions (bss_descript_size as bytesLef) and the command - * response header (S_DS_GEN) - */ - tlv_buf_size = scan_resp_size - (bytes_left - + sizeof(pscan_rsp->bss_descript_size) - + sizeof(pscan_rsp->number_of_sets) - + S_DS_GEN); - - ptlv = - (MrvlIEtypes_Data_t *) (pscan_rsp->bss_desc_and_tlv_buffer + - bytes_left); - - /* Search the TLV buffer space in the scan response for any valid TLVs */ - wlan_ret_802_11_scan_get_tlv_ptrs(pmadapter, - ptlv, - tlv_buf_size, - TLV_TYPE_TSFTIMESTAMP, - (MrvlIEtypes_Data_t **) & ptsf_tlv); - - /* Search the TLV buffer space in the scan response for any valid TLVs */ - wlan_ret_802_11_scan_get_tlv_ptrs(pmadapter, - ptlv, - tlv_buf_size, - TLV_TYPE_CHANNELBANDLIST, - (MrvlIEtypes_Data_t **) & pchan_band_tlv); - - /* - * Process each scan response returned (pscan_rsp->number_of_sets). Save - * the information in the bss_new_entry and then insert into the - * driver scan table either as an update to an existing entry - * or as an addition at the end of the table - */ - ret = - pcb->moal_malloc(pmadapter->pmoal_handle, sizeof(BSSDescriptor_t), - MLAN_MEM_DEF, (t_u8 **) & bss_new_entry); - - if (ret != MLAN_STATUS_SUCCESS || !bss_new_entry) { - PRINTM(MERROR, "Memory allocation for bss_new_entry failed!\n"); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_NO_MEM; - ret = MLAN_STATUS_FAILURE; - goto done; - } - - for (idx = 0; idx < pscan_rsp->number_of_sets && bytes_left; idx++) { - /* Zero out the bss_new_entry we are about to store info in */ - memset(pmadapter, bss_new_entry, 0x00, sizeof(BSSDescriptor_t)); - - /* Process the data fields and IEs returned for this BSS */ - if (wlan_interpret_bss_desc_with_ie(pmadapter, - bss_new_entry, - &pbss_info, - &bytes_left, - MFALSE) == MLAN_STATUS_SUCCESS) { - PRINTM(MINFO, "SCAN_RESP: BSSID = " MACSTR "\n", - MAC2STR(bss_new_entry->mac_address)); - - band = BAND_G; - if (pchan_band_tlv) { - pchan_band = &pchan_band_tlv->chan_band_param[idx]; - band = - radio_type_to_band(pchan_band-> - radio_type & (MBIT(0) | MBIT(1))); - if (!bss_new_entry->channel) - bss_new_entry->channel = pchan_band->chan_number; - } - /* Save the band designation for this entry for use in join */ - bss_new_entry->bss_band = band; - - cfp = wlan_find_cfp_by_band_and_channel(pmadapter, - (t_u8) bss_new_entry-> - bss_band, - (t_u16) bss_new_entry-> - channel); - if (cfp) - bss_new_entry->freq = cfp->freq; - else - bss_new_entry->freq = 0; - - /* Skip entry if on blacklisted channel */ - if (cfp && cfp->dynamic.blacklist) { - PRINTM(MINFO, - "SCAN_RESP: dropping entry on blacklist channel.\n"); - continue; - } - - /* - * Search the scan table for the same bssid - */ - for (bss_idx = 0; bss_idx < num_in_table; bss_idx++) { - if (!memcmp(pmadapter, bss_new_entry->mac_address, - pmadapter->pscan_table[bss_idx].mac_address, - sizeof(bss_new_entry->mac_address))) { - /* - * If the SSID matches as well, it is a duplicate of - * this entry. Keep the bss_idx set to this - * entry so we replace the old contents in the table - */ - if ((bss_new_entry->ssid.ssid_len == - pmadapter->pscan_table[bss_idx].ssid.ssid_len) - && (!memcmp(pmadapter, bss_new_entry->ssid.ssid, - pmadapter->pscan_table[bss_idx].ssid.ssid, - bss_new_entry->ssid.ssid_len))) { - PRINTM(MINFO, "SCAN_RESP: Duplicate of index: %d\n", - bss_idx); - - break; - } - /* - * If the SSID is NULL for same BSSID keep the bss_idx set - * to this entry so we replace the old contents in the table - */ - if (!memcmp - (pmadapter, pmadapter->pscan_table[bss_idx].ssid.ssid, - null_ssid, - pmadapter->pscan_table[bss_idx].ssid.ssid_len)) { - PRINTM(MINFO, "SCAN_RESP: Duplicate of index: %d\n", - bss_idx); - break; - } - } - } - /* - * If the bss_idx is equal to the number of entries in the table, - * the new entry was not a duplicate; append it to the scan - * table - */ - if (bss_idx == num_in_table) { - /* Range check the bss_idx, keep it limited to the last entry */ - if (bss_idx == MRVDRV_MAX_BSSID_LIST) { - bss_idx--; - } else { - num_in_table++; - } - } - - /* - * Save the beacon/probe response returned for later application - * retrieval. Duplicate beacon/probe responses are updated if - * possible - */ - wlan_ret_802_11_scan_store_beacon(pmpriv, - bss_idx, - num_in_table, bss_new_entry); - if (bss_new_entry->pbeacon_buf == MNULL) { - PRINTM(MCMND, "No space for beacon, drop this entry\n"); - num_in_table--; - continue; - } - /* - * If the TSF TLV was appended to the scan results, save - * this entry's TSF value in the networkTSF field. The - * networkTSF is the firmware's TSF value at the time the - * beacon or probe response was received. - */ - if (ptsf_tlv) { - memcpy(pmpriv->adapter, &tsf_val, - &ptsf_tlv->tsf_data[idx * TSF_DATA_SIZE], - sizeof(tsf_val)); - tsf_val = wlan_le64_to_cpu(tsf_val); - memcpy(pmpriv->adapter, &bss_new_entry->network_tsf, - &tsf_val, sizeof(bss_new_entry->network_tsf)); - } - - /* Copy the locally created bss_new_entry to the scan table */ - memcpy(pmadapter, &pmadapter->pscan_table[bss_idx], - bss_new_entry, sizeof(pmadapter->pscan_table[bss_idx])); - - } else { - /* Error parsing/interpreting the scan response, skipped */ - PRINTM(MERROR, - "SCAN_RESP: wlan_interpret_bss_desc_with_ie returned error\n"); - } - } - - PRINTM(MINFO, "SCAN_RESP: Scanned %2d APs, %d valid, %d total\n", - pscan_rsp->number_of_sets, - num_in_table - pmadapter->num_in_scan_table, num_in_table); - - /* Update the total number of BSSIDs in the scan table */ - pmadapter->num_in_scan_table = num_in_table; - /* Update the age_in_second */ - pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, - &pmadapter->age_in_secs, - &age_ts_usec); - if (is_bgscan_resp) - goto done; - if (!util_peek_list - (pmadapter->pmoal_handle, &pmadapter->scan_pending_q, - pcb->moal_spin_lock, pcb->moal_spin_unlock)) { - wlan_request_cmd_lock(pmadapter); - pmadapter->scan_processing = MFALSE; - wlan_release_cmd_lock(pmadapter); - /* - * Process the resulting scan table: - * - Remove any bad ssids - * - Update our current BSS information from scan data - */ - wlan_scan_process_results(pmpriv); - - /* Need to indicate IOCTL complete */ - if (pioctl_req != MNULL) { - pioctl_req->status_code = MLAN_ERROR_NO_ERROR; - - /* Indicate ioctl complete */ - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, - (pmlan_ioctl_req) pioctl_buf, - MLAN_STATUS_SUCCESS); - } - pmadapter->bgscan_reported = MFALSE; - wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_SCAN_REPORT, MNULL); - } else { - /* If firmware not ready, do not issue any more scan commands */ - if (pmadapter->hw_status != WlanHardwareStatusReady) { - /* Flush all pending scan commands */ - wlan_flush_scan_queue(pmadapter); - /* Indicate IOCTL complete */ - if (pioctl_req != MNULL) { - pioctl_req->status_code = MLAN_ERROR_FW_NOT_READY; - - /* Indicate ioctl complete */ - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, - (pmlan_ioctl_req) pioctl_buf, - MLAN_STATUS_FAILURE); - } - } else { - /* Get scan command from scan_pending_q and put to cmd_pending_q */ - pcmd_node = - (cmd_ctrl_node *) util_dequeue_list(pmadapter->pmoal_handle, - &pmadapter->scan_pending_q, - pcb->moal_spin_lock, - pcb->moal_spin_unlock); - - wlan_insert_cmd_to_pending_q(pmadapter, pcmd_node, MTRUE); - } - } - - done: - if (bss_new_entry) - pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) bss_new_entry); - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + mlan_callbacks *pcb = MNULL; + mlan_ioctl_req *pioctl_req = (mlan_ioctl_req *) pioctl_buf; + cmd_ctrl_node *pcmd_node = MNULL; + HostCmd_DS_802_11_SCAN_RSP *pscan_rsp = MNULL; + BSSDescriptor_t *bss_new_entry = MNULL; + MrvlIEtypes_Data_t *ptlv; + MrvlIEtypes_TsfTimestamp_t *ptsf_tlv = MNULL; + t_u8 *pbss_info; + t_u32 scan_resp_size; + t_u32 bytes_left; + t_u32 num_in_table; + t_u32 bss_idx; + t_u32 idx; + t_u32 tlv_buf_size; + t_u64 tsf_val; + chan_freq_power_t *cfp; + MrvlIEtypes_ChanBandListParamSet_t *pchan_band_tlv = MNULL; + ChanBandParamSet_t *pchan_band; + t_u8 band; + t_u8 is_bgscan_resp; + t_u32 age_ts_usec; + t_u8 null_ssid[MLAN_MAX_SSID_LENGTH] = { 0 }; + + ENTER(); + pcb = (pmlan_callbacks) & pmadapter->callbacks; + + is_bgscan_resp = (resp->command == HostCmd_CMD_802_11_BG_SCAN_QUERY); + if (is_bgscan_resp) { + pscan_rsp = &resp->params.bg_scan_query_resp.scan_resp; + } else { + pscan_rsp = &resp->params.scan_resp; + } + + if (pscan_rsp->number_of_sets > MRVDRV_MAX_BSSID_LIST) { + PRINTM(MERROR, + "SCAN_RESP: Invalid number of AP returned (%d)!!\n", + pscan_rsp->number_of_sets); + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_CMD_SCAN_FAIL; + ret = MLAN_STATUS_FAILURE; + goto done; + } + + bytes_left = wlan_le16_to_cpu(pscan_rsp->bss_descript_size); + PRINTM(MINFO, "SCAN_RESP: bss_descript_size %d\n", bytes_left); + + scan_resp_size = resp->size; + + PRINTM(MINFO, "SCAN_RESP: returned %d APs before parsing\n", + pscan_rsp->number_of_sets); + + num_in_table = pmadapter->num_in_scan_table; + pbss_info = pscan_rsp->bss_desc_and_tlv_buffer; + + /* + * The size of the TLV buffer is equal to the entire command response + * size (scan_resp_size) minus the fixed fields (sizeof()'s), the + * BSS Descriptions (bss_descript_size as bytesLef) and the command + * response header (S_DS_GEN) + */ + tlv_buf_size = scan_resp_size - (bytes_left + + sizeof(pscan_rsp->bss_descript_size) + + sizeof(pscan_rsp->number_of_sets) + + S_DS_GEN); + + ptlv = (MrvlIEtypes_Data_t *) (pscan_rsp->bss_desc_and_tlv_buffer + + bytes_left); + + /* Search the TLV buffer space in the scan response for any valid TLVs */ + wlan_ret_802_11_scan_get_tlv_ptrs(pmadapter, + ptlv, + tlv_buf_size, + TLV_TYPE_TSFTIMESTAMP, + (MrvlIEtypes_Data_t **) & ptsf_tlv); + + /* Search the TLV buffer space in the scan response for any valid TLVs */ + wlan_ret_802_11_scan_get_tlv_ptrs(pmadapter, + ptlv, + tlv_buf_size, + TLV_TYPE_CHANNELBANDLIST, + (MrvlIEtypes_Data_t **) & + pchan_band_tlv); + + /* + * Process each scan response returned (pscan_rsp->number_of_sets). Save + * the information in the bss_new_entry and then insert into the + * driver scan table either as an update to an existing entry + * or as an addition at the end of the table + */ + ret = pcb->moal_malloc(pmadapter->pmoal_handle, sizeof(BSSDescriptor_t), + MLAN_MEM_DEF, (t_u8 **) & bss_new_entry); + + if (ret != MLAN_STATUS_SUCCESS || !bss_new_entry) { + PRINTM(MERROR, "Memory allocation for bss_new_entry failed!\n"); + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_NO_MEM; + ret = MLAN_STATUS_FAILURE; + goto done; + } + + for (idx = 0; idx < pscan_rsp->number_of_sets && bytes_left; idx++) { + /* Zero out the bss_new_entry we are about to store info in */ + memset(pmadapter, bss_new_entry, 0x00, sizeof(BSSDescriptor_t)); + + /* Process the data fields and IEs returned for this BSS */ + if (wlan_interpret_bss_desc_with_ie(pmadapter, + bss_new_entry, + &pbss_info, + &bytes_left, + MFALSE) == + MLAN_STATUS_SUCCESS) { + PRINTM(MINFO, "SCAN_RESP: BSSID = " MACSTR "\n", + MAC2STR(bss_new_entry->mac_address)); + + band = BAND_G; + if (pchan_band_tlv) { + pchan_band = + &pchan_band_tlv->chan_band_param[idx]; + band = radio_type_to_band(pchan_band-> + radio_type & (MBIT(0) + | + MBIT + (1))); + if (!bss_new_entry->channel) + bss_new_entry->channel = + pchan_band->chan_number; + } + /* Save the band designation for this entry for use in + join */ + bss_new_entry->bss_band = band; + + cfp = wlan_find_cfp_by_band_and_channel(pmadapter, + (t_u8) + bss_new_entry-> + bss_band, + (t_u16) + bss_new_entry-> + channel); + if (cfp) + bss_new_entry->freq = cfp->freq; + else + bss_new_entry->freq = 0; + + /* Skip entry if on blacklisted channel */ + if (cfp && cfp->dynamic.blacklist) { + PRINTM(MINFO, + "SCAN_RESP: dropping entry on blacklist channel.\n"); + continue; + } + + /* + * Search the scan table for the same bssid + */ + for (bss_idx = 0; bss_idx < num_in_table; bss_idx++) { + if (!memcmp + (pmadapter, bss_new_entry->mac_address, + pmadapter->pscan_table[bss_idx]. + mac_address, + sizeof(bss_new_entry->mac_address))) { + /* + * If the SSID matches as well, it is a duplicate of + * this entry. Keep the bss_idx set to this + * entry so we replace the old contents in the table + */ + if ((bss_new_entry->ssid.ssid_len == + pmadapter->pscan_table[bss_idx]. + ssid.ssid_len) + && + (!memcmp + (pmadapter, + bss_new_entry->ssid.ssid, + pmadapter->pscan_table[bss_idx]. + ssid.ssid, + bss_new_entry->ssid.ssid_len))) { + PRINTM(MINFO, + "SCAN_RESP: Duplicate of index: %d\n", + bss_idx); + + break; + } + /* + * If the SSID is NULL for same BSSID keep the bss_idx set + * to this entry so we replace the old contents in the table + */ + if (!memcmp + (pmadapter, + pmadapter->pscan_table[bss_idx]. + ssid.ssid, null_ssid, + pmadapter->pscan_table[bss_idx]. + ssid.ssid_len)) { + PRINTM(MINFO, + "SCAN_RESP: Duplicate of index: %d\n", + bss_idx); + break; + } + } + } + /* + * If the bss_idx is equal to the number of entries in the table, + * the new entry was not a duplicate; append it to the scan + * table + */ + if (bss_idx == num_in_table) { + /* Range check the bss_idx, keep it limited to + the last entry */ + if (bss_idx == MRVDRV_MAX_BSSID_LIST) { + bss_idx--; + } else { + num_in_table++; + } + } + + /* + * Save the beacon/probe response returned for later application + * retrieval. Duplicate beacon/probe responses are updated if + * possible + */ + wlan_ret_802_11_scan_store_beacon(pmpriv, + bss_idx, + num_in_table, + bss_new_entry); + if (bss_new_entry->pbeacon_buf == MNULL) { + PRINTM(MCMND, + "No space for beacon, drop this entry\n"); + num_in_table--; + continue; + } + /* + * If the TSF TLV was appended to the scan results, save + * this entry's TSF value in the networkTSF field. The + * networkTSF is the firmware's TSF value at the time the + * beacon or probe response was received. + */ + if (ptsf_tlv) { + memcpy(pmpriv->adapter, &tsf_val, + &ptsf_tlv->tsf_data[idx * TSF_DATA_SIZE], + sizeof(tsf_val)); + tsf_val = wlan_le64_to_cpu(tsf_val); + memcpy(pmpriv->adapter, + &bss_new_entry->network_tsf, &tsf_val, + sizeof(bss_new_entry->network_tsf)); + } + + /* Copy the locally created bss_new_entry to the scan + table */ + memcpy(pmadapter, &pmadapter->pscan_table[bss_idx], + bss_new_entry, + sizeof(pmadapter->pscan_table[bss_idx])); + + } else { + /* Error parsing/interpreting the scan response, + skipped */ + PRINTM(MERROR, + "SCAN_RESP: wlan_interpret_bss_desc_with_ie returned error\n"); + } + } + + PRINTM(MINFO, "SCAN_RESP: Scanned %2d APs, %d valid, %d total\n", + pscan_rsp->number_of_sets, + num_in_table - pmadapter->num_in_scan_table, num_in_table); + + /* Update the total number of BSSIDs in the scan table */ + pmadapter->num_in_scan_table = num_in_table; + /* Update the age_in_second */ + pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, + &pmadapter->age_in_secs, + &age_ts_usec); + if (is_bgscan_resp) + goto done; + if (!util_peek_list + (pmadapter->pmoal_handle, &pmadapter->scan_pending_q, + pcb->moal_spin_lock, pcb->moal_spin_unlock)) { + wlan_request_cmd_lock(pmadapter); + pmadapter->scan_processing = MFALSE; + wlan_release_cmd_lock(pmadapter); + /* + * Process the resulting scan table: + * - Remove any bad ssids + * - Update our current BSS information from scan data + */ + wlan_scan_process_results(pmpriv); + + /* Need to indicate IOCTL complete */ + if (pioctl_req != MNULL) { + pioctl_req->status_code = MLAN_ERROR_NO_ERROR; + + /* Indicate ioctl complete */ + pcb->moal_ioctl_complete(pmadapter->pmoal_handle, + (pmlan_ioctl_req) pioctl_buf, + MLAN_STATUS_SUCCESS); + } + pmadapter->bgscan_reported = MFALSE; + wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_SCAN_REPORT, MNULL); + } else { + /* If firmware not ready, do not issue any more scan commands */ + if (pmadapter->hw_status != WlanHardwareStatusReady) { + /* Flush all pending scan commands */ + wlan_flush_scan_queue(pmadapter); + /* Indicate IOCTL complete */ + if (pioctl_req != MNULL) { + pioctl_req->status_code = + MLAN_ERROR_FW_NOT_READY; + + /* Indicate ioctl complete */ + pcb->moal_ioctl_complete(pmadapter-> + pmoal_handle, + (pmlan_ioctl_req) + pioctl_buf, + MLAN_STATUS_FAILURE); + } + } else { + /* Get scan command from scan_pending_q and put to + cmd_pending_q */ + pcmd_node = + (cmd_ctrl_node *) util_dequeue_list(pmadapter-> + pmoal_handle, + &pmadapter-> + scan_pending_q, + pcb-> + moal_spin_lock, + pcb-> + moal_spin_unlock); + + wlan_insert_cmd_to_pending_q(pmadapter, pcmd_node, + MTRUE); + } + } + +done: + if (bss_new_entry) + pcb->moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) bss_new_entry); + + LEAVE(); + return ret; } /** @@ -3436,27 +3872,27 @@ wlan_ret_802_11_scan(IN mlan_private * pmpriv, */ mlan_status wlan_cmd_802_11_scan_ext(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * pcmd, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * pcmd, IN t_void * pdata_buf) { - HostCmd_DS_802_11_SCAN_EXT *pext_scan_cmd = &pcmd->params.ext_scan; - wlan_scan_cmd_config *pscan_cfg = MNULL; + HostCmd_DS_802_11_SCAN_EXT *pext_scan_cmd = &pcmd->params.ext_scan; + wlan_scan_cmd_config *pscan_cfg = MNULL; - ENTER(); + ENTER(); - pscan_cfg = (wlan_scan_cmd_config *) pdata_buf; + pscan_cfg = (wlan_scan_cmd_config *) pdata_buf; - memcpy(pmpriv->adapter, pext_scan_cmd->tlv_buffer, - pscan_cfg->tlv_buf, pscan_cfg->tlv_buf_len); + memcpy(pmpriv->adapter, pext_scan_cmd->tlv_buffer, + pscan_cfg->tlv_buf, pscan_cfg->tlv_buf_len); - pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_SCAN_EXT); + pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_SCAN_EXT); - /* Size is equal to the sizeof(fixed portions) + the TLV len + header */ - pcmd->size = wlan_cpu_to_le16((t_u16) (sizeof(pext_scan_cmd->reserved) - + pscan_cfg->tlv_buf_len - + S_DS_GEN)); + /* Size is equal to the sizeof(fixed portions) + the TLV len + header */ + pcmd->size = wlan_cpu_to_le16((t_u16) (sizeof(pext_scan_cmd->reserved) + + pscan_cfg->tlv_buf_len + + S_DS_GEN)); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -3470,14 +3906,14 @@ wlan_cmd_802_11_scan_ext(IN mlan_private * pmpriv, */ mlan_status wlan_ret_802_11_scan_ext(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * resp, IN t_void * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, IN t_void * pioctl_buf) { - ENTER(); + ENTER(); - PRINTM(MINFO, "EXT scan returns successfully\n"); + PRINTM(MINFO, "EXT scan returns successfully\n"); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -3492,262 +3928,297 @@ wlan_ret_802_11_scan_ext(IN mlan_private * pmpriv, */ static mlan_status wlan_parse_ext_scan_result(IN mlan_private * pmpriv, - IN t_u8 number_of_sets, - IN t_u8 * pscan_resp, IN t_u16 scan_resp_size) + IN t_u8 number_of_sets, + IN t_u8 * pscan_resp, IN t_u16 scan_resp_size) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = pmpriv->adapter; - mlan_callbacks *pcb = MNULL; - BSSDescriptor_t *bss_new_entry = MNULL; - t_u8 *pbss_info; - t_u32 bytes_left; - t_u32 bytes_left_for_tlv; - t_u32 num_in_table; - t_u32 bss_idx; - t_u32 idx; - t_u64 tsf_val; - chan_freq_power_t *cfp; - t_u16 tlv_type, tlv_len; - MrvlIEtypes_Data_t *ptlv = MNULL; - MrvlIEtypes_Bss_Scan_Rsp_t *pscan_rsp_tlv = MNULL; - MrvlIEtypes_Bss_Scan_Info_t *pscan_info_tlv = MNULL; - t_u8 band; - t_u32 age_ts_usec; - t_u8 null_ssid[MLAN_MAX_SSID_LENGTH] = { 0 }; - - ENTER(); - pcb = (pmlan_callbacks) & pmadapter->callbacks; - - if (number_of_sets > MRVDRV_MAX_BSSID_LIST) { - PRINTM(MERROR, "EXT_SCAN: Invalid number of AP returned (%d)!!\n", - number_of_sets); - ret = MLAN_STATUS_FAILURE; - goto done; - } - - bytes_left = scan_resp_size; - PRINTM(MINFO, "EXT_SCAN: bss_descript_size %d\n", scan_resp_size); - PRINTM(MINFO, "EXT_SCAN: returned %d APs before parsing\n", number_of_sets); - - num_in_table = pmadapter->num_in_scan_table; - ptlv = (MrvlIEtypes_Data_t *) pscan_resp; - - /* - * Process each scan response returned number_of_sets. Save - * the information in the bss_new_entry and then insert into the - * driver scan table either as an update to an existing entry - * or as an addition at the end of the table - */ - ret = - pcb->moal_malloc(pmadapter->pmoal_handle, sizeof(BSSDescriptor_t), - MLAN_MEM_DEF, (t_u8 **) & bss_new_entry); - - if (ret != MLAN_STATUS_SUCCESS || !bss_new_entry) { - PRINTM(MERROR, "Memory allocation for bss_new_entry failed!\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - - for (idx = 0; idx < number_of_sets && bytes_left > - sizeof(MrvlIEtypesHeader_t); idx++) { - tlv_type = wlan_le16_to_cpu(ptlv->header.type); - tlv_len = wlan_le16_to_cpu(ptlv->header.len); - if (bytes_left < sizeof(MrvlIEtypesHeader_t) + tlv_len) { - PRINTM(MERROR, "EXT_SCAN: Error bytes left < TLV length\n"); - break; - } - pscan_rsp_tlv = MNULL; - pscan_info_tlv = MNULL; - bytes_left_for_tlv = bytes_left; - /* BSS response TLV with beacon or probe response buffer at the initial - position of each descriptor */ - if (tlv_type == TLV_TYPE_BSS_SCAN_RSP) { - pbss_info = (t_u8 *) ptlv; - pscan_rsp_tlv = (MrvlIEtypes_Bss_Scan_Rsp_t *) ptlv; - ptlv = (MrvlIEtypes_Data_t *) (ptlv->data + tlv_len); - bytes_left_for_tlv -= (tlv_len + sizeof(MrvlIEtypesHeader_t)); - } else - break; - - /* Process variable TLV */ - while (bytes_left_for_tlv >= sizeof(MrvlIEtypesHeader_t) && - wlan_le16_to_cpu(ptlv->header.type) != TLV_TYPE_BSS_SCAN_RSP) { - tlv_type = wlan_le16_to_cpu(ptlv->header.type); - tlv_len = wlan_le16_to_cpu(ptlv->header.len); - if (bytes_left_for_tlv < sizeof(MrvlIEtypesHeader_t) + tlv_len) { - PRINTM(MERROR, "EXT_SCAN: Error in processing TLV, " - "bytes left < TLV length\n"); - pscan_rsp_tlv = MNULL; - bytes_left_for_tlv = 0; - continue; - } - switch (tlv_type) { - case TLV_TYPE_BSS_SCAN_INFO: - pscan_info_tlv = (MrvlIEtypes_Bss_Scan_Info_t *) ptlv; - if (tlv_len != sizeof(MrvlIEtypes_Bss_Scan_Info_t) - - sizeof(MrvlIEtypesHeader_t)) { - bytes_left_for_tlv = 0; - continue; - } - break; - default: - break; - } - ptlv = (MrvlIEtypes_Data_t *) (ptlv->data + tlv_len); - bytes_left -= (tlv_len + sizeof(MrvlIEtypesHeader_t)); - bytes_left_for_tlv -= (tlv_len + sizeof(MrvlIEtypesHeader_t)); - } - /* No BSS response TLV */ - if (pscan_rsp_tlv == MNULL) - break; - - /* Advance pointer to the beacon buffer length and update the bytes - count so that the function wlan_interpret_bss_desc_with_ie() can - handle the scan buffer withut any change */ - pbss_info += sizeof(t_u16); - bytes_left -= sizeof(t_u16); - - /* Zero out the bss_new_entry we are about to store info in */ - memset(pmadapter, bss_new_entry, 0x00, sizeof(BSSDescriptor_t)); - - /* Process the data fields and IEs returned for this BSS */ - if (wlan_interpret_bss_desc_with_ie(pmadapter, - bss_new_entry, - &pbss_info, - &bytes_left, - MTRUE) == MLAN_STATUS_SUCCESS) { - PRINTM(MINFO, "EXT_SCAN: BSSID = " MACSTR "\n", - MAC2STR(bss_new_entry->mac_address)); - - band = BAND_G; - /* - * If the BSS info TLV was appended to the scan results, save - * this entry's TSF value in the networkTSF field. The - * networkTSF is the firmware's TSF value at the time the - * beacon or probe response was received. - */ - if (pscan_info_tlv) { - /* RSSI is 2 byte long */ - bss_new_entry->rssi = - -(t_s32) (wlan_le16_to_cpu(pscan_info_tlv->rssi)); - PRINTM(MINFO, "EXT_SCAN: RSSI=%d\n", bss_new_entry->rssi); - memcpy(pmpriv->adapter, &tsf_val, &pscan_info_tlv->tsf, - sizeof(tsf_val)); - tsf_val = wlan_le64_to_cpu(tsf_val); - memcpy(pmpriv->adapter, &bss_new_entry->network_tsf, - &tsf_val, sizeof(bss_new_entry->network_tsf)); - band = radio_type_to_band(pscan_info_tlv->band); - } - /* Save the band designation for this entry for use in join */ - bss_new_entry->bss_band = band; - - cfp = wlan_find_cfp_by_band_and_channel(pmadapter, - (t_u8) bss_new_entry-> - bss_band, - (t_u16) bss_new_entry-> - channel); - if (cfp) - bss_new_entry->freq = cfp->freq; - else - bss_new_entry->freq = 0; - - /* Skip entry if on blacklisted channel */ - if (cfp && cfp->dynamic.blacklist) { - PRINTM(MINFO, - "EXT_SCAN: dropping entry on blacklist channel.\n"); - continue; - } - - /* - * Search the scan table for the same bssid - */ - for (bss_idx = 0; bss_idx < num_in_table; bss_idx++) { - if (!memcmp(pmadapter, bss_new_entry->mac_address, - pmadapter->pscan_table[bss_idx].mac_address, - sizeof(bss_new_entry->mac_address))) { - /* - * If the SSID matches as well, it is a duplicate of - * this entry. Keep the bss_idx set to this - * entry so we replace the old contents in the table - */ - if ((bss_new_entry->ssid.ssid_len == - pmadapter->pscan_table[bss_idx].ssid.ssid_len) - && (!memcmp(pmadapter, bss_new_entry->ssid.ssid, - pmadapter->pscan_table[bss_idx].ssid.ssid, - bss_new_entry->ssid.ssid_len))) { - PRINTM(MINFO, "EXT_SCAN: Duplicate of index: %d\n", - bss_idx); - break; - } - /* - * If the SSID is NULL for same BSSID keep the bss_idx set - * to this entry so we replace the old contents in the table - */ - if (!memcmp - (pmadapter, pmadapter->pscan_table[bss_idx].ssid.ssid, - null_ssid, - pmadapter->pscan_table[bss_idx].ssid.ssid_len)) { - PRINTM(MINFO, "EXT_SCAN: Duplicate of index: %d\n", - bss_idx); - break; - } - } - } - /* - * If the bss_idx is equal to the number of entries in the table, - * the new entry was not a duplicate; append it to the scan - * table - */ - if (bss_idx == num_in_table) { - /* Range check the bss_idx, keep it limited to the last entry */ - if (bss_idx == MRVDRV_MAX_BSSID_LIST) { - bss_idx--; - } else { - num_in_table++; - } - } - - /* - * Save the beacon/probe response returned for later application - * retrieval. Duplicate beacon/probe responses are updated if - * possible - */ - wlan_ret_802_11_scan_store_beacon(pmpriv, - bss_idx, - num_in_table, bss_new_entry); - if (bss_new_entry->pbeacon_buf == MNULL) { - PRINTM(MCMND, "No space for beacon, drop this entry\n"); - num_in_table--; - continue; - } - - /* Copy the locally created bss_new_entry to the scan table */ - memcpy(pmadapter, &pmadapter->pscan_table[bss_idx], - bss_new_entry, sizeof(pmadapter->pscan_table[bss_idx])); - } else { - /* Error parsing/interpreting the scan response, skipped */ - PRINTM(MERROR, - "EXT_SCAN: wlan_interpret_bss_desc_with_ie returned error\n"); - } - } - - PRINTM(MINFO, "EXT_SCAN: Scanned %2d APs, %d valid, %d total\n", - number_of_sets, num_in_table - pmadapter->num_in_scan_table, - num_in_table); - - /* Update the total number of BSSIDs in the scan table */ - pmadapter->num_in_scan_table = num_in_table; - /* Update the age_in_second */ - pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, - &pmadapter->age_in_secs, - &age_ts_usec); - - done: - if (bss_new_entry) - pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) bss_new_entry); - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + mlan_callbacks *pcb = MNULL; + BSSDescriptor_t *bss_new_entry = MNULL; + t_u8 *pbss_info; + t_u32 bytes_left; + t_u32 bytes_left_for_tlv; + t_u32 num_in_table; + t_u32 bss_idx; + t_u32 idx; + t_u64 tsf_val; + chan_freq_power_t *cfp; + t_u16 tlv_type, tlv_len; + MrvlIEtypes_Data_t *ptlv = MNULL; + MrvlIEtypes_Bss_Scan_Rsp_t *pscan_rsp_tlv = MNULL; + MrvlIEtypes_Bss_Scan_Info_t *pscan_info_tlv = MNULL; + t_u8 band; + t_u32 age_ts_usec; + t_u8 null_ssid[MLAN_MAX_SSID_LENGTH] = { 0 }; + + ENTER(); + pcb = (pmlan_callbacks) & pmadapter->callbacks; + + if (number_of_sets > MRVDRV_MAX_BSSID_LIST) { + PRINTM(MERROR, + "EXT_SCAN: Invalid number of AP returned (%d)!!\n", + number_of_sets); + ret = MLAN_STATUS_FAILURE; + goto done; + } + + bytes_left = scan_resp_size; + PRINTM(MINFO, "EXT_SCAN: bss_descript_size %d\n", scan_resp_size); + PRINTM(MINFO, "EXT_SCAN: returned %d APs before parsing\n", + number_of_sets); + + num_in_table = pmadapter->num_in_scan_table; + ptlv = (MrvlIEtypes_Data_t *) pscan_resp; + + /* + * Process each scan response returned number_of_sets. Save + * the information in the bss_new_entry and then insert into the + * driver scan table either as an update to an existing entry + * or as an addition at the end of the table + */ + ret = pcb->moal_malloc(pmadapter->pmoal_handle, sizeof(BSSDescriptor_t), + MLAN_MEM_DEF, (t_u8 **) & bss_new_entry); + + if (ret != MLAN_STATUS_SUCCESS || !bss_new_entry) { + PRINTM(MERROR, "Memory allocation for bss_new_entry failed!\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + + for (idx = 0; idx < number_of_sets && bytes_left > + sizeof(MrvlIEtypesHeader_t); idx++) { + tlv_type = wlan_le16_to_cpu(ptlv->header.type); + tlv_len = wlan_le16_to_cpu(ptlv->header.len); + if (bytes_left < sizeof(MrvlIEtypesHeader_t) + tlv_len) { + PRINTM(MERROR, + "EXT_SCAN: Error bytes left < TLV length\n"); + break; + } + pscan_rsp_tlv = MNULL; + pscan_info_tlv = MNULL; + bytes_left_for_tlv = bytes_left; + /* BSS response TLV with beacon or probe response buffer at the + initial position of each descriptor */ + if (tlv_type == TLV_TYPE_BSS_SCAN_RSP) { + pbss_info = (t_u8 *) ptlv; + pscan_rsp_tlv = (MrvlIEtypes_Bss_Scan_Rsp_t *) ptlv; + ptlv = (MrvlIEtypes_Data_t *) (ptlv->data + tlv_len); + bytes_left_for_tlv -= + (tlv_len + sizeof(MrvlIEtypesHeader_t)); + } else + break; + + /* Process variable TLV */ + while (bytes_left_for_tlv >= sizeof(MrvlIEtypesHeader_t) && + wlan_le16_to_cpu(ptlv->header.type) != + TLV_TYPE_BSS_SCAN_RSP) { + tlv_type = wlan_le16_to_cpu(ptlv->header.type); + tlv_len = wlan_le16_to_cpu(ptlv->header.len); + if (bytes_left_for_tlv < + sizeof(MrvlIEtypesHeader_t) + tlv_len) { + PRINTM(MERROR, + "EXT_SCAN: Error in processing TLV, " + "bytes left < TLV length\n"); + pscan_rsp_tlv = MNULL; + bytes_left_for_tlv = 0; + continue; + } + switch (tlv_type) { + case TLV_TYPE_BSS_SCAN_INFO: + pscan_info_tlv = + (MrvlIEtypes_Bss_Scan_Info_t *) ptlv; + if (tlv_len != + sizeof(MrvlIEtypes_Bss_Scan_Info_t) - + sizeof(MrvlIEtypesHeader_t)) { + bytes_left_for_tlv = 0; + continue; + } + break; + default: + break; + } + ptlv = (MrvlIEtypes_Data_t *) (ptlv->data + tlv_len); + bytes_left -= (tlv_len + sizeof(MrvlIEtypesHeader_t)); + bytes_left_for_tlv -= + (tlv_len + sizeof(MrvlIEtypesHeader_t)); + } + /* No BSS response TLV */ + if (pscan_rsp_tlv == MNULL) + break; + + /* Advance pointer to the beacon buffer length and update the + bytes count so that the function + wlan_interpret_bss_desc_with_ie() can handle the scan buffer + withut any change */ + pbss_info += sizeof(t_u16); + bytes_left -= sizeof(t_u16); + + /* Zero out the bss_new_entry we are about to store info in */ + memset(pmadapter, bss_new_entry, 0x00, sizeof(BSSDescriptor_t)); + + /* Process the data fields and IEs returned for this BSS */ + if (wlan_interpret_bss_desc_with_ie(pmadapter, + bss_new_entry, + &pbss_info, + &bytes_left, + MTRUE) == + MLAN_STATUS_SUCCESS) { + PRINTM(MINFO, "EXT_SCAN: BSSID = " MACSTR "\n", + MAC2STR(bss_new_entry->mac_address)); + + band = BAND_G; + /* + * If the BSS info TLV was appended to the scan results, save + * this entry's TSF value in the networkTSF field. The + * networkTSF is the firmware's TSF value at the time the + * beacon or probe response was received. + */ + if (pscan_info_tlv) { + /* RSSI is 2 byte long */ + bss_new_entry->rssi = + -(t_s32) (wlan_le16_to_cpu + (pscan_info_tlv->rssi)); + PRINTM(MINFO, "EXT_SCAN: RSSI=%d\n", + bss_new_entry->rssi); + memcpy(pmpriv->adapter, &tsf_val, + &pscan_info_tlv->tsf, sizeof(tsf_val)); + tsf_val = wlan_le64_to_cpu(tsf_val); + memcpy(pmpriv->adapter, + &bss_new_entry->network_tsf, &tsf_val, + sizeof(bss_new_entry->network_tsf)); + band = radio_type_to_band(pscan_info_tlv->band); + } + /* Save the band designation for this entry for use in + join */ + bss_new_entry->bss_band = band; + + cfp = wlan_find_cfp_by_band_and_channel(pmadapter, + (t_u8) + bss_new_entry-> + bss_band, + (t_u16) + bss_new_entry-> + channel); + if (cfp) + bss_new_entry->freq = cfp->freq; + else + bss_new_entry->freq = 0; + + /* Skip entry if on blacklisted channel */ + if (cfp && cfp->dynamic.blacklist) { + PRINTM(MINFO, + "EXT_SCAN: dropping entry on blacklist channel.\n"); + continue; + } + + /* + * Search the scan table for the same bssid + */ + for (bss_idx = 0; bss_idx < num_in_table; bss_idx++) { + if (!memcmp + (pmadapter, bss_new_entry->mac_address, + pmadapter->pscan_table[bss_idx]. + mac_address, + sizeof(bss_new_entry->mac_address))) { + /* + * If the SSID matches as well, it is a duplicate of + * this entry. Keep the bss_idx set to this + * entry so we replace the old contents in the table + */ + if ((bss_new_entry->ssid.ssid_len == + pmadapter->pscan_table[bss_idx]. + ssid.ssid_len) + && + (!memcmp + (pmadapter, + bss_new_entry->ssid.ssid, + pmadapter->pscan_table[bss_idx]. + ssid.ssid, + bss_new_entry->ssid.ssid_len))) { + PRINTM(MINFO, + "EXT_SCAN: Duplicate of index: %d\n", + bss_idx); + break; + } + /* + * If the SSID is NULL for same BSSID keep the bss_idx set + * to this entry so we replace the old contents in the table + */ + if (!memcmp + (pmadapter, + pmadapter->pscan_table[bss_idx]. + ssid.ssid, null_ssid, + pmadapter->pscan_table[bss_idx]. + ssid.ssid_len)) { + PRINTM(MINFO, + "EXT_SCAN: Duplicate of index: %d\n", + bss_idx); + break; + } + } + } + /* + * If the bss_idx is equal to the number of entries in the table, + * the new entry was not a duplicate; append it to the scan + * table + */ + if (bss_idx == num_in_table) { + /* Range check the bss_idx, keep it limited to + the last entry */ + if (bss_idx == MRVDRV_MAX_BSSID_LIST) { + bss_idx--; + } else { + num_in_table++; + } + } + + /* + * Save the beacon/probe response returned for later application + * retrieval. Duplicate beacon/probe responses are updated if + * possible + */ + wlan_ret_802_11_scan_store_beacon(pmpriv, + bss_idx, + num_in_table, + bss_new_entry); + if (bss_new_entry->pbeacon_buf == MNULL) { + PRINTM(MCMND, + "No space for beacon, drop this entry\n"); + num_in_table--; + continue; + } + + /* Copy the locally created bss_new_entry to the scan + table */ + memcpy(pmadapter, &pmadapter->pscan_table[bss_idx], + bss_new_entry, + sizeof(pmadapter->pscan_table[bss_idx])); + } else { + /* Error parsing/interpreting the scan response, + skipped */ + PRINTM(MERROR, + "EXT_SCAN: wlan_interpret_bss_desc_with_ie returned error\n"); + } + } + + PRINTM(MINFO, "EXT_SCAN: Scanned %2d APs, %d valid, %d total\n", + number_of_sets, num_in_table - pmadapter->num_in_scan_table, + num_in_table); + + /* Update the total number of BSSIDs in the scan table */ + pmadapter->num_in_scan_table = num_in_table; + /* Update the age_in_second */ + pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, + &pmadapter->age_in_secs, + &age_ts_usec); + +done: + if (bss_new_entry) + pcb->moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) bss_new_entry); + + LEAVE(); + return ret; } /** @@ -3760,80 +4231,92 @@ wlan_parse_ext_scan_result(IN mlan_private * pmpriv, */ mlan_status wlan_handle_event_ext_scan_report(IN mlan_private * pmpriv, - IN mlan_buffer * pmbuf) + IN mlan_buffer * pmbuf) { - mlan_adapter *pmadapter = pmpriv->adapter; - mlan_callbacks *pcb = &pmadapter->callbacks; - mlan_ioctl_req *pioctl_req = MNULL; - cmd_ctrl_node *pcmd_node = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - - mlan_event_scan_result *pevent_scan = (pmlan_event_scan_result) - (pmbuf->pbuf + pmbuf->data_offset); - t_u8 *ptlv = (pmbuf->pbuf + pmbuf->data_offset - + sizeof(mlan_event_scan_result)); - t_u16 tlv_buf_left = wlan_cpu_to_le16(pevent_scan->buf_size); - - DBG_HEXDUMP(MCMD_D, "EVENT EXT_SCAN", pmbuf->pbuf + - pmbuf->data_offset, pmbuf->data_len); - wlan_parse_ext_scan_result(pmpriv, pevent_scan->num_of_set, - ptlv, tlv_buf_left); - if (!pevent_scan->more_event) { - pioctl_req = pmadapter->pext_scan_ioctl_req; - if (!util_peek_list(pmadapter->pmoal_handle, - &pmadapter->scan_pending_q, pcb->moal_spin_lock, - pcb->moal_spin_unlock)) { - pmadapter->pext_scan_ioctl_req = MNULL; - wlan_request_cmd_lock(pmadapter); - pmadapter->scan_processing = MFALSE; - wlan_release_cmd_lock(pmadapter); - /* - * Process the resulting scan table: - * - Remove any bad ssids - * - Update our current BSS information from scan data - */ - wlan_scan_process_results(pmpriv); - - /* Need to indicate IOCTL complete */ - if (pioctl_req != MNULL) { - pioctl_req->status_code = MLAN_ERROR_NO_ERROR; - /* Indicate ioctl complete */ - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, - (pmlan_ioctl_req) pioctl_req, - MLAN_STATUS_SUCCESS); - } - pmadapter->bgscan_reported = MFALSE; - wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_SCAN_REPORT, MNULL); - } else { - /* If firmware not ready, do not issue any more scan commands */ - if (pmadapter->hw_status != WlanHardwareStatusReady) { - /* Flush all pending scan commands */ - wlan_flush_scan_queue(pmadapter); - /* Indicate IOCTL complete */ - if (pioctl_req != MNULL) { - pioctl_req->status_code = MLAN_ERROR_FW_NOT_READY; - - /* Indicate ioctl complete */ - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, - (pmlan_ioctl_req) pioctl_req, - MLAN_STATUS_FAILURE); - } - } else { - /* Get scan command from scan_pending_q and put to - cmd_pending_q */ - pcmd_node = - (cmd_ctrl_node *) util_dequeue_list(pmadapter->pmoal_handle, - &pmadapter-> - scan_pending_q, - pcb->moal_spin_lock, - pcb->moal_spin_unlock); - wlan_insert_cmd_to_pending_q(pmadapter, pcmd_node, MTRUE); - } - } - } - - LEAVE(); - return ret; + mlan_adapter *pmadapter = pmpriv->adapter; + mlan_callbacks *pcb = &pmadapter->callbacks; + mlan_ioctl_req *pioctl_req = MNULL; + cmd_ctrl_node *pcmd_node = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + + mlan_event_scan_result *pevent_scan = (pmlan_event_scan_result) + (pmbuf->pbuf + pmbuf->data_offset); + t_u8 *ptlv = (pmbuf->pbuf + pmbuf->data_offset + + sizeof(mlan_event_scan_result)); + t_u16 tlv_buf_left = wlan_cpu_to_le16(pevent_scan->buf_size); + + DBG_HEXDUMP(MCMD_D, "EVENT EXT_SCAN", pmbuf->pbuf + + pmbuf->data_offset, pmbuf->data_len); + wlan_parse_ext_scan_result(pmpriv, pevent_scan->num_of_set, + ptlv, tlv_buf_left); + if (!pevent_scan->more_event) { + pioctl_req = pmadapter->pext_scan_ioctl_req; + if (!util_peek_list(pmadapter->pmoal_handle, + &pmadapter->scan_pending_q, + pcb->moal_spin_lock, + pcb->moal_spin_unlock)) { + pmadapter->pext_scan_ioctl_req = MNULL; + wlan_request_cmd_lock(pmadapter); + pmadapter->scan_processing = MFALSE; + wlan_release_cmd_lock(pmadapter); + /* + * Process the resulting scan table: + * - Remove any bad ssids + * - Update our current BSS information from scan data + */ + wlan_scan_process_results(pmpriv); + + /* Need to indicate IOCTL complete */ + if (pioctl_req != MNULL) { + pioctl_req->status_code = MLAN_ERROR_NO_ERROR; + /* Indicate ioctl complete */ + pcb->moal_ioctl_complete(pmadapter-> + pmoal_handle, + (pmlan_ioctl_req) + pioctl_req, + MLAN_STATUS_SUCCESS); + } + pmadapter->bgscan_reported = MFALSE; + wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_SCAN_REPORT, + MNULL); + } else { + /* If firmware not ready, do not issue any more scan + commands */ + if (pmadapter->hw_status != WlanHardwareStatusReady) { + /* Flush all pending scan commands */ + wlan_flush_scan_queue(pmadapter); + /* Indicate IOCTL complete */ + if (pioctl_req != MNULL) { + pioctl_req->status_code = + MLAN_ERROR_FW_NOT_READY; + + /* Indicate ioctl complete */ + pcb->moal_ioctl_complete(pmadapter-> + pmoal_handle, + (pmlan_ioctl_req) + pioctl_req, + MLAN_STATUS_FAILURE); + } + } else { + /* Get scan command from scan_pending_q and put + to cmd_pending_q */ + pcmd_node = + (cmd_ctrl_node *) + util_dequeue_list(pmadapter-> + pmoal_handle, + &pmadapter-> + scan_pending_q, + pcb->moal_spin_lock, + pcb-> + moal_spin_unlock); + wlan_insert_cmd_to_pending_q(pmadapter, + pcmd_node, MTRUE); + } + } + } + + LEAVE(); + return ret; } /** @@ -3848,21 +4331,22 @@ wlan_handle_event_ext_scan_report(IN mlan_private * pmpriv, */ mlan_status wlan_cmd_802_11_bg_scan_query(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * pcmd, - IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * pcmd, + IN t_void * pdata_buf) { - HostCmd_DS_802_11_BG_SCAN_QUERY *bg_query = &pcmd->params.bg_scan_query; + HostCmd_DS_802_11_BG_SCAN_QUERY *bg_query = &pcmd->params.bg_scan_query; - ENTER(); + ENTER(); - pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_BG_SCAN_QUERY); - pcmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_BG_SCAN_QUERY) + S_DS_GEN); + pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_BG_SCAN_QUERY); + pcmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_BG_SCAN_QUERY) + + S_DS_GEN); - bg_query->flush = MTRUE; + bg_query->flush = MTRUE; - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -3880,123 +4364,146 @@ wlan_cmd_802_11_bg_scan_query(IN mlan_private * pmpriv, */ static t_u8 wlan_bgscan_create_channel_list(IN mlan_private * pmpriv, - IN const wlan_bgscan_cfg * pbg_scan_in, - MrvlIEtypes_ChanListParamSet_t * tlv_chan_list) + IN const wlan_bgscan_cfg * pbg_scan_in, + MrvlIEtypes_ChanListParamSet_t * tlv_chan_list) { - mlan_adapter *pmadapter = pmpriv->adapter; - region_chan_t *pscan_region; - chan_freq_power_t *cfp; - t_u32 region_idx; - t_u32 chan_idx = 0; - t_u32 next_chan; - t_u8 scan_type; - t_u8 radio_type; - - ENTER(); - - for (region_idx = 0; - region_idx < NELEMENTS(pmadapter->region_channel); region_idx++) { - - if (wlan_11d_is_enabled(pmpriv) && pmpriv->media_connected != MTRUE) { - /* Scan all the supported chan for the first scan */ - if (!pmadapter->universal_channel[region_idx].valid) - continue; - pscan_region = &pmadapter->universal_channel[region_idx]; - } else { - if (!pmadapter->region_channel[region_idx].valid) - continue; - pscan_region = &pmadapter->region_channel[region_idx]; - } - - if (pbg_scan_in && !pbg_scan_in->chan_list[0].chan_number && - pbg_scan_in->chan_list[0].radio_type & BAND_SPECIFIED) { - radio_type = pbg_scan_in->chan_list[0].radio_type & ~BAND_SPECIFIED; - if (!radio_type && (pscan_region->band != BAND_B) && - (pscan_region->band != BAND_G)) - continue; - if (radio_type && (pscan_region->band != BAND_A)) - continue; - } - if (!wlan_is_band_compatible - (pmpriv->config_bands | pmadapter->adhoc_start_band, - pscan_region->band)) - continue; - for (next_chan = 0; - next_chan < pscan_region->num_cfp; next_chan++, chan_idx++) { - if (chan_idx >= WLAN_BG_SCAN_CHAN_MAX) - break; - /* Set the default scan type to ACTIVE SCAN type, will later be - changed to passive on a per channel basis if restricted by - regulatory requirements (11d or 11h) */ - scan_type = MLAN_SCAN_TYPE_ACTIVE; - cfp = pscan_region->pcfp + next_chan; - if (scan_type == MLAN_SCAN_TYPE_ACTIVE - && wlan_11d_is_enabled(pmpriv)) { - scan_type = wlan_11d_get_scan_type(pmadapter, - pscan_region->band, - (t_u8) cfp->channel, - &pmadapter-> - parsed_region_chan); - } - switch (pscan_region->band) { - case BAND_A: - tlv_chan_list->chan_scan_param[chan_idx].radio_type = - HostCmd_SCAN_RADIO_TYPE_A; - if (!wlan_11d_is_enabled(pmpriv)) { - /* 11D not available... play it safe on DFS channels */ - if (wlan_11h_radar_detect_required - (pmpriv, (t_u8) cfp->channel)) - scan_type = MLAN_SCAN_TYPE_PASSIVE; - } - break; - case BAND_B: - case BAND_G: - if (!wlan_11d_is_enabled(pmpriv)) - if (wlan_bg_scan_type_is_passive - (pmpriv, (t_u8) cfp->channel)) - scan_type = MLAN_SCAN_TYPE_PASSIVE; - default: - tlv_chan_list->chan_scan_param[chan_idx].radio_type = - HostCmd_SCAN_RADIO_TYPE_BG; - break; - } - - if (pbg_scan_in && pbg_scan_in->chan_list[0].scan_time) { - tlv_chan_list->chan_scan_param[chan_idx].max_scan_time = - wlan_cpu_to_le16((t_u16) pbg_scan_in->chan_list[0]. - scan_time); - tlv_chan_list->chan_scan_param[chan_idx].min_scan_time = - wlan_cpu_to_le16((t_u16) pbg_scan_in->chan_list[0]. - scan_time); - } else if (scan_type == MLAN_SCAN_TYPE_PASSIVE) { - tlv_chan_list->chan_scan_param[chan_idx].max_scan_time = - wlan_cpu_to_le16(pmadapter->passive_scan_time); - tlv_chan_list->chan_scan_param[chan_idx].min_scan_time = - wlan_cpu_to_le16(pmadapter->passive_scan_time); - } else { - tlv_chan_list->chan_scan_param[chan_idx].max_scan_time = - wlan_cpu_to_le16(pmadapter->specific_scan_time); - tlv_chan_list->chan_scan_param[chan_idx].min_scan_time = - wlan_cpu_to_le16(pmadapter->specific_scan_time); - } - - if (scan_type == MLAN_SCAN_TYPE_PASSIVE) { - tlv_chan_list->chan_scan_param[chan_idx].chan_scan_mode. - passive_scan = MTRUE; - } else { - tlv_chan_list->chan_scan_param[chan_idx].chan_scan_mode. - passive_scan = MFALSE; - } - - tlv_chan_list->chan_scan_param[chan_idx].chan_number = - (t_u8) cfp->channel; - tlv_chan_list->chan_scan_param[chan_idx].chan_scan_mode. - disable_chan_filt = MTRUE; - } - } - - LEAVE(); - return chan_idx; + mlan_adapter *pmadapter = pmpriv->adapter; + region_chan_t *pscan_region; + chan_freq_power_t *cfp; + t_u32 region_idx; + t_u32 chan_idx = 0; + t_u32 next_chan; + t_u8 scan_type; + t_u8 radio_type; + + ENTER(); + + for (region_idx = 0; + region_idx < NELEMENTS(pmadapter->region_channel); region_idx++) { + + if (wlan_11d_is_enabled(pmpriv) && + pmpriv->media_connected != MTRUE) { + /* Scan all the supported chan for the first scan */ + if (!pmadapter->universal_channel[region_idx].valid) + continue; + pscan_region = + &pmadapter->universal_channel[region_idx]; + } else { + if (!pmadapter->region_channel[region_idx].valid) + continue; + pscan_region = &pmadapter->region_channel[region_idx]; + } + + if (pbg_scan_in && !pbg_scan_in->chan_list[0].chan_number && + pbg_scan_in->chan_list[0].radio_type & BAND_SPECIFIED) { + radio_type = + pbg_scan_in->chan_list[0]. + radio_type & ~BAND_SPECIFIED; + if (!radio_type && (pscan_region->band != BAND_B) && + (pscan_region->band != BAND_G)) + continue; + if (radio_type && (pscan_region->band != BAND_A)) + continue; + } + if (!wlan_is_band_compatible + (pmpriv->config_bands | pmadapter->adhoc_start_band, + pscan_region->band)) + continue; + for (next_chan = 0; + next_chan < pscan_region->num_cfp; + next_chan++, chan_idx++) { + if (chan_idx >= WLAN_BG_SCAN_CHAN_MAX) + break; + /* Set the default scan type to ACTIVE SCAN type, will + later be changed to passive on a per channel basis + if restricted by regulatory requirements (11d or + 11h) */ + scan_type = MLAN_SCAN_TYPE_ACTIVE; + cfp = pscan_region->pcfp + next_chan; + if (scan_type == MLAN_SCAN_TYPE_ACTIVE + && wlan_11d_is_enabled(pmpriv)) { + scan_type = wlan_11d_get_scan_type(pmadapter, + pscan_region-> + band, + (t_u8) cfp-> + channel, + &pmadapter-> + parsed_region_chan); + } + switch (pscan_region->band) { + case BAND_A: + tlv_chan_list->chan_scan_param[chan_idx]. + radio_type = HostCmd_SCAN_RADIO_TYPE_A; + if (!wlan_11d_is_enabled(pmpriv)) { + /* 11D not available... play it safe on + DFS channels */ + if (wlan_11h_radar_detect_required + (pmpriv, (t_u8) cfp->channel)) + scan_type = + MLAN_SCAN_TYPE_PASSIVE; + } + break; + case BAND_B: + case BAND_G: + if (!wlan_11d_is_enabled(pmpriv)) + if (wlan_bg_scan_type_is_passive + (pmpriv, (t_u8) cfp->channel)) + scan_type = + MLAN_SCAN_TYPE_PASSIVE; + default: + tlv_chan_list->chan_scan_param[chan_idx]. + radio_type = HostCmd_SCAN_RADIO_TYPE_BG; + break; + } + + if (pbg_scan_in && pbg_scan_in->chan_list[0].scan_time) { + tlv_chan_list->chan_scan_param[chan_idx]. + max_scan_time = + wlan_cpu_to_le16((t_u16) pbg_scan_in-> + chan_list[0]. + scan_time); + tlv_chan_list->chan_scan_param[chan_idx]. + min_scan_time = + wlan_cpu_to_le16((t_u16) pbg_scan_in-> + chan_list[0]. + scan_time); + } else if (scan_type == MLAN_SCAN_TYPE_PASSIVE) { + tlv_chan_list->chan_scan_param[chan_idx]. + max_scan_time = + wlan_cpu_to_le16(pmadapter-> + passive_scan_time); + tlv_chan_list->chan_scan_param[chan_idx]. + min_scan_time = + wlan_cpu_to_le16(pmadapter-> + passive_scan_time); + } else { + tlv_chan_list->chan_scan_param[chan_idx]. + max_scan_time = + wlan_cpu_to_le16(pmadapter-> + specific_scan_time); + tlv_chan_list->chan_scan_param[chan_idx]. + min_scan_time = + wlan_cpu_to_le16(pmadapter-> + specific_scan_time); + } + + if (scan_type == MLAN_SCAN_TYPE_PASSIVE) { + tlv_chan_list->chan_scan_param[chan_idx]. + chan_scan_mode.passive_scan = MTRUE; + } else { + tlv_chan_list->chan_scan_param[chan_idx]. + chan_scan_mode.passive_scan = MFALSE; + } + + tlv_chan_list->chan_scan_param[chan_idx].chan_number = + (t_u8) cfp->channel; + tlv_chan_list->chan_scan_param[chan_idx].chan_scan_mode. + disable_chan_filt = MTRUE; + } + } + + LEAVE(); + return chan_idx; } /** @@ -4011,201 +4518,232 @@ wlan_bgscan_create_channel_list(IN mlan_private * pmpriv, */ mlan_status wlan_cmd_bgscan_config(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * pcmd, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * pcmd, IN t_void * pdata_buf) { - mlan_adapter *pmadapter = pmpriv->adapter; - HostCmd_DS_802_11_BG_SCAN_CONFIG *bg_scan = &pcmd->params.bg_scan_config; - wlan_bgscan_cfg *bg_scan_in = (wlan_bgscan_cfg *) pdata_buf; - t_u16 cmd_size = 0; - MrvlIEtypes_NumProbes_t *pnum_probes_tlv = MNULL; - MrvlIEtypes_BeaconLowRssiThreshold_t *rssi_tlv = MNULL; - MrvlIEtypes_BeaconLowSnrThreshold_t *snr_tlv = MNULL; - MrvlIEtypes_WildCardSsIdParamSet_t *pwildcard_ssid_tlv = MNULL; - MrvlIEtypes_ChanListParamSet_t *tlv_chan_list = MNULL; - MrvlIEtypes_StartLater_t *tlv_start_later = MNULL; - MrvlIEtypes_RepeatCount_t *tlv_repeat = MNULL; - t_u8 *tlv = MNULL; - t_u16 num_probes = 0; - t_u32 ssid_idx; - t_u32 ssid_len = 0; - t_u32 chan_idx; - t_u32 chan_num; - t_u8 radio_type; - t_u16 scan_dur; - t_u8 scan_type; - - ENTER(); - - pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_BG_SCAN_CONFIG); - bg_scan->action = wlan_cpu_to_le16(bg_scan_in->action); - bg_scan->enable = bg_scan_in->enable; - bg_scan->bss_type = bg_scan_in->bss_type; - cmd_size = sizeof(HostCmd_DS_802_11_BG_SCAN_CONFIG) + S_DS_GEN; - if (bg_scan_in->chan_per_scan) - bg_scan->chan_per_scan = bg_scan_in->chan_per_scan; - else - bg_scan->chan_per_scan = MRVDRV_MAX_CHANNELS_PER_SPECIFIC_SCAN; - if (bg_scan_in->scan_interval) - bg_scan->scan_interval = wlan_cpu_to_le32(bg_scan_in->scan_interval); - else - bg_scan->scan_interval = wlan_cpu_to_le32(DEFAULT_BGSCAN_INTERVAL); - bg_scan->report_condition = wlan_cpu_to_le32(bg_scan_in->report_condition); - - if ((bg_scan_in->action == BG_SCAN_ACT_GET) || - (bg_scan_in->action == BG_SCAN_ACT_GET_PPS_UAPSD) || (!bg_scan->enable)) - goto done; - - tlv = (t_u8 *) bg_scan + sizeof(HostCmd_DS_802_11_BG_SCAN_CONFIG); - num_probes = (bg_scan_in->num_probes ? bg_scan_in->num_probes : - pmadapter->scan_probes); - if (num_probes) { - pnum_probes_tlv = (MrvlIEtypes_NumProbes_t *) tlv; - pnum_probes_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_NUMPROBES); - pnum_probes_tlv->header.len = - wlan_cpu_to_le16(sizeof(pnum_probes_tlv->num_probes)); - pnum_probes_tlv->num_probes = wlan_cpu_to_le16((t_u16) num_probes); - tlv += sizeof(MrvlIEtypes_NumProbes_t); - cmd_size += sizeof(MrvlIEtypes_NumProbes_t); - } - if (bg_scan_in->rssi_threshold) { - rssi_tlv = (MrvlIEtypes_BeaconLowRssiThreshold_t *) tlv; - rssi_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_RSSI_LOW); - rssi_tlv->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_BeaconLowRssiThreshold_t) - - sizeof(MrvlIEtypesHeader_t)); - rssi_tlv->value = bg_scan_in->rssi_threshold; - rssi_tlv->frequency = 0; - tlv += sizeof(MrvlIEtypes_BeaconLowRssiThreshold_t); - cmd_size += sizeof(MrvlIEtypes_BeaconLowRssiThreshold_t); - } - if (bg_scan_in->snr_threshold) { - snr_tlv = (MrvlIEtypes_BeaconLowSnrThreshold_t *) tlv; - snr_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_SNR_LOW); - snr_tlv->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_BeaconLowSnrThreshold_t) - - sizeof(MrvlIEtypesHeader_t)); - snr_tlv->value = bg_scan_in->snr_threshold; - snr_tlv->frequency = 0; - tlv += sizeof(MrvlIEtypes_BeaconLowRssiThreshold_t); - cmd_size += sizeof(MrvlIEtypes_BeaconLowRssiThreshold_t); - } - if (bg_scan_in->repeat_count) { - tlv_repeat = (MrvlIEtypes_RepeatCount_t *) tlv; - tlv_repeat->header.type = wlan_cpu_to_le16(TLV_TYPE_REPEAT_COUNT); - tlv_repeat->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_RepeatCount_t) - - sizeof(MrvlIEtypesHeader_t)); - tlv_repeat->repeat_count = wlan_cpu_to_le16(bg_scan_in->repeat_count); - tlv += sizeof(MrvlIEtypes_RepeatCount_t); - cmd_size += sizeof(MrvlIEtypes_RepeatCount_t); - } - for (ssid_idx = 0; ((ssid_idx < NELEMENTS(bg_scan_in->ssid_list)) - && (*bg_scan_in->ssid_list[ssid_idx].ssid || - bg_scan_in->ssid_list[ssid_idx].max_len)); - ssid_idx++) { - ssid_len = wlan_strlen((char *) bg_scan_in->ssid_list[ssid_idx].ssid); - pwildcard_ssid_tlv = (MrvlIEtypes_WildCardSsIdParamSet_t *) tlv; - pwildcard_ssid_tlv->header.type = - wlan_cpu_to_le16(TLV_TYPE_WILDCARDSSID); - pwildcard_ssid_tlv->header.len = - (t_u16) (ssid_len + sizeof(pwildcard_ssid_tlv->max_ssid_length)); - pwildcard_ssid_tlv->max_ssid_length = - bg_scan_in->ssid_list[ssid_idx].max_len; - memcpy(pmadapter, pwildcard_ssid_tlv->ssid, - bg_scan_in->ssid_list[ssid_idx].ssid, MIN(MLAN_MAX_SSID_LENGTH, - ssid_len)); - tlv += - sizeof(pwildcard_ssid_tlv->header) + pwildcard_ssid_tlv->header.len; - cmd_size += - sizeof(pwildcard_ssid_tlv->header) + pwildcard_ssid_tlv->header.len; - pwildcard_ssid_tlv->header.len = - wlan_cpu_to_le16(pwildcard_ssid_tlv->header.len); - PRINTM(MINFO, "Scan: ssid_list[%d]: %s, %d\n", ssid_idx, - pwildcard_ssid_tlv->ssid, pwildcard_ssid_tlv->max_ssid_length); - } - if (bg_scan_in->chan_list[0].chan_number) { - tlv_chan_list = (MrvlIEtypes_ChanListParamSet_t *) tlv; - PRINTM(MINFO, "Scan: Using supplied channel list\n"); - chan_num = 0; - for (chan_idx = 0; chan_idx < WLAN_BG_SCAN_CHAN_MAX - && bg_scan_in->chan_list[chan_idx].chan_number; chan_idx++) { - radio_type = bg_scan_in->chan_list[chan_idx].radio_type; - if (!wlan_is_band_compatible - (pmpriv->config_bands | pmadapter->adhoc_start_band, - radio_type_to_band(radio_type))) - continue; - scan_type = bg_scan_in->chan_list[chan_idx].scan_type; - /* Prevent active scanning on a radar controlled channel */ - if (radio_type == HostCmd_SCAN_RADIO_TYPE_A) { - if (wlan_11h_radar_detect_required - (pmpriv, bg_scan_in->chan_list[chan_idx].chan_number)) { - scan_type = MLAN_SCAN_TYPE_PASSIVE; - } - } - if (radio_type == HostCmd_SCAN_RADIO_TYPE_BG) { - if (wlan_bg_scan_type_is_passive - (pmpriv, bg_scan_in->chan_list[chan_idx].chan_number)) { - scan_type = MLAN_SCAN_TYPE_PASSIVE; - } - } - tlv_chan_list->chan_scan_param[chan_num].chan_number = - bg_scan_in->chan_list[chan_idx].chan_number; - tlv_chan_list->chan_scan_param[chan_num].radio_type = - bg_scan_in->chan_list[chan_idx].radio_type; - - if (scan_type == MLAN_SCAN_TYPE_PASSIVE) { - tlv_chan_list->chan_scan_param[chan_num].chan_scan_mode. - passive_scan = MTRUE; - } else { - tlv_chan_list->chan_scan_param[chan_num].chan_scan_mode. - passive_scan = MFALSE; - } - if (bg_scan_in->chan_list[chan_idx].scan_time) { - scan_dur = (t_u16) bg_scan_in->chan_list[chan_idx].scan_time; - } else { - if (scan_type == MLAN_SCAN_TYPE_PASSIVE) { - scan_dur = pmadapter->passive_scan_time; - } else { - scan_dur = pmadapter->specific_scan_time; - } - } - tlv_chan_list->chan_scan_param[chan_num].min_scan_time = - wlan_cpu_to_le16(scan_dur); - tlv_chan_list->chan_scan_param[chan_num].max_scan_time = - wlan_cpu_to_le16(scan_dur); - chan_num++; - } - tlv_chan_list->header.type = wlan_cpu_to_le16(TLV_TYPE_CHANLIST); - tlv_chan_list->header.len = - wlan_cpu_to_le16(sizeof(ChanScanParamSet_t) * chan_num); - tlv += - sizeof(MrvlIEtypesHeader_t) + sizeof(ChanScanParamSet_t) * chan_num; - cmd_size += - sizeof(MrvlIEtypesHeader_t) + sizeof(ChanScanParamSet_t) * chan_num; - } else { - tlv_chan_list = (MrvlIEtypes_ChanListParamSet_t *) tlv; - chan_num = - wlan_bgscan_create_channel_list(pmpriv, bg_scan_in, tlv_chan_list); - tlv_chan_list->header.type = wlan_cpu_to_le16(TLV_TYPE_CHANLIST); - tlv_chan_list->header.len = - wlan_cpu_to_le16(sizeof(ChanScanParamSet_t) * chan_num); - tlv += - sizeof(MrvlIEtypesHeader_t) + sizeof(ChanScanParamSet_t) * chan_num; - cmd_size += - sizeof(MrvlIEtypesHeader_t) + sizeof(ChanScanParamSet_t) * chan_num; - } - tlv_start_later = (MrvlIEtypes_StartLater_t *) tlv; - tlv_start_later->header.type = wlan_cpu_to_le16(TLV_TYPE_STARTBGSCANLATER); - tlv_start_later->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_StartLater_t) - - sizeof(MrvlIEtypesHeader_t)); - tlv_start_later->value = 0; - tlv += sizeof(MrvlIEtypes_StartLater_t); - cmd_size += sizeof(MrvlIEtypes_StartLater_t); - done: - pcmd->size = wlan_cpu_to_le16(cmd_size); - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = pmpriv->adapter; + HostCmd_DS_802_11_BG_SCAN_CONFIG *bg_scan = + &pcmd->params.bg_scan_config; + wlan_bgscan_cfg *bg_scan_in = (wlan_bgscan_cfg *) pdata_buf; + t_u16 cmd_size = 0; + MrvlIEtypes_NumProbes_t *pnum_probes_tlv = MNULL; + MrvlIEtypes_BeaconLowRssiThreshold_t *rssi_tlv = MNULL; + MrvlIEtypes_BeaconLowSnrThreshold_t *snr_tlv = MNULL; + MrvlIEtypes_WildCardSsIdParamSet_t *pwildcard_ssid_tlv = MNULL; + MrvlIEtypes_ChanListParamSet_t *tlv_chan_list = MNULL; + MrvlIEtypes_StartLater_t *tlv_start_later = MNULL; + MrvlIEtypes_RepeatCount_t *tlv_repeat = MNULL; + t_u8 *tlv = MNULL; + t_u16 num_probes = 0; + t_u32 ssid_idx; + t_u32 ssid_len = 0; + t_u32 chan_idx; + t_u32 chan_num; + t_u8 radio_type; + t_u16 scan_dur; + t_u8 scan_type; + + ENTER(); + + pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_BG_SCAN_CONFIG); + bg_scan->action = wlan_cpu_to_le16(bg_scan_in->action); + bg_scan->enable = bg_scan_in->enable; + bg_scan->bss_type = bg_scan_in->bss_type; + cmd_size = sizeof(HostCmd_DS_802_11_BG_SCAN_CONFIG) + S_DS_GEN; + if (bg_scan_in->chan_per_scan) + bg_scan->chan_per_scan = bg_scan_in->chan_per_scan; + else + bg_scan->chan_per_scan = MRVDRV_MAX_CHANNELS_PER_SPECIFIC_SCAN; + if (bg_scan_in->scan_interval) + bg_scan->scan_interval = + wlan_cpu_to_le32(bg_scan_in->scan_interval); + else + bg_scan->scan_interval = + wlan_cpu_to_le32(DEFAULT_BGSCAN_INTERVAL); + bg_scan->report_condition = + wlan_cpu_to_le32(bg_scan_in->report_condition); + + if ((bg_scan_in->action == BG_SCAN_ACT_GET) || + (bg_scan_in->action == BG_SCAN_ACT_GET_PPS_UAPSD) || + (!bg_scan->enable)) + goto done; + + tlv = (t_u8 *) bg_scan + sizeof(HostCmd_DS_802_11_BG_SCAN_CONFIG); + num_probes = (bg_scan_in->num_probes ? bg_scan_in->num_probes : + pmadapter->scan_probes); + if (num_probes) { + pnum_probes_tlv = (MrvlIEtypes_NumProbes_t *) tlv; + pnum_probes_tlv->header.type = + wlan_cpu_to_le16(TLV_TYPE_NUMPROBES); + pnum_probes_tlv->header.len = + wlan_cpu_to_le16(sizeof(pnum_probes_tlv->num_probes)); + pnum_probes_tlv->num_probes = + wlan_cpu_to_le16((t_u16) num_probes); + tlv += sizeof(MrvlIEtypes_NumProbes_t); + cmd_size += sizeof(MrvlIEtypes_NumProbes_t); + } + if (bg_scan_in->rssi_threshold) { + rssi_tlv = (MrvlIEtypes_BeaconLowRssiThreshold_t *) tlv; + rssi_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_RSSI_LOW); + rssi_tlv->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_BeaconLowRssiThreshold_t) + - sizeof(MrvlIEtypesHeader_t)); + rssi_tlv->value = bg_scan_in->rssi_threshold; + rssi_tlv->frequency = 0; + tlv += sizeof(MrvlIEtypes_BeaconLowRssiThreshold_t); + cmd_size += sizeof(MrvlIEtypes_BeaconLowRssiThreshold_t); + } + if (bg_scan_in->snr_threshold) { + snr_tlv = (MrvlIEtypes_BeaconLowSnrThreshold_t *) tlv; + snr_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_SNR_LOW); + snr_tlv->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_BeaconLowSnrThreshold_t) - + sizeof(MrvlIEtypesHeader_t)); + snr_tlv->value = bg_scan_in->snr_threshold; + snr_tlv->frequency = 0; + tlv += sizeof(MrvlIEtypes_BeaconLowRssiThreshold_t); + cmd_size += sizeof(MrvlIEtypes_BeaconLowRssiThreshold_t); + } + if (bg_scan_in->repeat_count) { + tlv_repeat = (MrvlIEtypes_RepeatCount_t *) tlv; + tlv_repeat->header.type = + wlan_cpu_to_le16(TLV_TYPE_REPEAT_COUNT); + tlv_repeat->header.len = + wlan_cpu_to_le16(sizeof(MrvlIEtypes_RepeatCount_t) - + sizeof(MrvlIEtypesHeader_t)); + tlv_repeat->repeat_count = + wlan_cpu_to_le16(bg_scan_in->repeat_count); + tlv += sizeof(MrvlIEtypes_RepeatCount_t); + cmd_size += sizeof(MrvlIEtypes_RepeatCount_t); + } + for (ssid_idx = 0; ((ssid_idx < NELEMENTS(bg_scan_in->ssid_list)) + && (*bg_scan_in->ssid_list[ssid_idx].ssid || + bg_scan_in->ssid_list[ssid_idx].max_len)); + ssid_idx++) { + ssid_len = + wlan_strlen((char *)bg_scan_in->ssid_list[ssid_idx]. + ssid); + pwildcard_ssid_tlv = (MrvlIEtypes_WildCardSsIdParamSet_t *) tlv; + pwildcard_ssid_tlv->header.type = + wlan_cpu_to_le16(TLV_TYPE_WILDCARDSSID); + pwildcard_ssid_tlv->header.len = + (t_u16) (ssid_len + + sizeof(pwildcard_ssid_tlv->max_ssid_length)); + pwildcard_ssid_tlv->max_ssid_length = + bg_scan_in->ssid_list[ssid_idx].max_len; + memcpy(pmadapter, pwildcard_ssid_tlv->ssid, + bg_scan_in->ssid_list[ssid_idx].ssid, + MIN(MLAN_MAX_SSID_LENGTH, ssid_len)); + tlv += sizeof(pwildcard_ssid_tlv->header) + + pwildcard_ssid_tlv->header.len; + cmd_size += + sizeof(pwildcard_ssid_tlv->header) + + pwildcard_ssid_tlv->header.len; + pwildcard_ssid_tlv->header.len = + wlan_cpu_to_le16(pwildcard_ssid_tlv->header.len); + PRINTM(MINFO, "Scan: ssid_list[%d]: %s, %d\n", ssid_idx, + pwildcard_ssid_tlv->ssid, + pwildcard_ssid_tlv->max_ssid_length); + } + if (bg_scan_in->chan_list[0].chan_number) { + tlv_chan_list = (MrvlIEtypes_ChanListParamSet_t *) tlv; + PRINTM(MINFO, "Scan: Using supplied channel list\n"); + chan_num = 0; + for (chan_idx = 0; chan_idx < WLAN_BG_SCAN_CHAN_MAX + && bg_scan_in->chan_list[chan_idx].chan_number; + chan_idx++) { + radio_type = bg_scan_in->chan_list[chan_idx].radio_type; + if (!wlan_is_band_compatible + (pmpriv->config_bands | pmadapter->adhoc_start_band, + radio_type_to_band(radio_type))) + continue; + scan_type = bg_scan_in->chan_list[chan_idx].scan_type; + /* Prevent active scanning on a radar controlled + channel */ + if (radio_type == HostCmd_SCAN_RADIO_TYPE_A) { + if (wlan_11h_radar_detect_required + (pmpriv, + bg_scan_in->chan_list[chan_idx]. + chan_number)) { + scan_type = MLAN_SCAN_TYPE_PASSIVE; + } + } + if (radio_type == HostCmd_SCAN_RADIO_TYPE_BG) { + if (wlan_bg_scan_type_is_passive + (pmpriv, + bg_scan_in->chan_list[chan_idx]. + chan_number)) { + scan_type = MLAN_SCAN_TYPE_PASSIVE; + } + } + tlv_chan_list->chan_scan_param[chan_num].chan_number = + bg_scan_in->chan_list[chan_idx].chan_number; + tlv_chan_list->chan_scan_param[chan_num].radio_type = + bg_scan_in->chan_list[chan_idx].radio_type; + + if (scan_type == MLAN_SCAN_TYPE_PASSIVE) { + tlv_chan_list->chan_scan_param[chan_num]. + chan_scan_mode.passive_scan = MTRUE; + } else { + tlv_chan_list->chan_scan_param[chan_num]. + chan_scan_mode.passive_scan = MFALSE; + } + if (bg_scan_in->chan_list[chan_idx].scan_time) { + scan_dur = + (t_u16) bg_scan_in->chan_list[chan_idx]. + scan_time; + } else { + if (scan_type == MLAN_SCAN_TYPE_PASSIVE) { + scan_dur = pmadapter->passive_scan_time; + } else { + scan_dur = + pmadapter->specific_scan_time; + } + } + tlv_chan_list->chan_scan_param[chan_num].min_scan_time = + wlan_cpu_to_le16(scan_dur); + tlv_chan_list->chan_scan_param[chan_num].max_scan_time = + wlan_cpu_to_le16(scan_dur); + chan_num++; + } + tlv_chan_list->header.type = + wlan_cpu_to_le16(TLV_TYPE_CHANLIST); + tlv_chan_list->header.len = + wlan_cpu_to_le16(sizeof(ChanScanParamSet_t) * chan_num); + tlv += sizeof(MrvlIEtypesHeader_t) + + sizeof(ChanScanParamSet_t) * chan_num; + cmd_size += + sizeof(MrvlIEtypesHeader_t) + + sizeof(ChanScanParamSet_t) * chan_num; + } else { + tlv_chan_list = (MrvlIEtypes_ChanListParamSet_t *) tlv; + chan_num = + wlan_bgscan_create_channel_list(pmpriv, bg_scan_in, + tlv_chan_list); + tlv_chan_list->header.type = + wlan_cpu_to_le16(TLV_TYPE_CHANLIST); + tlv_chan_list->header.len = + wlan_cpu_to_le16(sizeof(ChanScanParamSet_t) * chan_num); + tlv += sizeof(MrvlIEtypesHeader_t) + + sizeof(ChanScanParamSet_t) * chan_num; + cmd_size += + sizeof(MrvlIEtypesHeader_t) + + sizeof(ChanScanParamSet_t) * chan_num; + } + tlv_start_later = (MrvlIEtypes_StartLater_t *) tlv; + tlv_start_later->header.type = + wlan_cpu_to_le16(TLV_TYPE_STARTBGSCANLATER); + tlv_start_later->header.len = + wlan_cpu_to_le16(sizeof(MrvlIEtypes_StartLater_t) - + sizeof(MrvlIEtypesHeader_t)); + tlv_start_later->value = 0; + tlv += sizeof(MrvlIEtypes_StartLater_t); + cmd_size += sizeof(MrvlIEtypes_StartLater_t); +done: + pcmd->size = wlan_cpu_to_le16(cmd_size); + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -4219,33 +4757,35 @@ wlan_cmd_bgscan_config(IN mlan_private * pmpriv, */ mlan_status wlan_ret_bgscan_config(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - mlan_ds_scan *pscan = MNULL; - HostCmd_DS_802_11_BG_SCAN_CONFIG *bg_scan = &resp->params.bg_scan_config; - wlan_bgscan_cfg *bg_scan_out = MNULL; - - ENTER(); - if (pioctl_buf) { - pscan = (mlan_ds_scan *) pioctl_buf->pbuf; - bg_scan_out = (wlan_bgscan_cfg *) pscan->param.user_scan.scan_cfg_buf; - bg_scan_out->action = wlan_le16_to_cpu(bg_scan->action); - if ((bg_scan_out->action == BG_SCAN_ACT_GET) && - (bg_scan_out->action == BG_SCAN_ACT_GET_PPS_UAPSD)) { - bg_scan_out->enable = bg_scan->enable; - bg_scan_out->bss_type = bg_scan->bss_type; - bg_scan_out->chan_per_scan = bg_scan->chan_per_scan; - bg_scan_out->scan_interval = - wlan_le32_to_cpu(bg_scan->scan_interval); - bg_scan_out->report_condition = - wlan_le32_to_cpu(bg_scan->report_condition); - pioctl_buf->data_read_written = - sizeof(mlan_ds_scan) + MLAN_SUB_COMMAND_SIZE; - } - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_scan *pscan = MNULL; + HostCmd_DS_802_11_BG_SCAN_CONFIG *bg_scan = + &resp->params.bg_scan_config; + wlan_bgscan_cfg *bg_scan_out = MNULL; + + ENTER(); + if (pioctl_buf) { + pscan = (mlan_ds_scan *) pioctl_buf->pbuf; + bg_scan_out = + (wlan_bgscan_cfg *) pscan->param.user_scan.scan_cfg_buf; + bg_scan_out->action = wlan_le16_to_cpu(bg_scan->action); + if ((bg_scan_out->action == BG_SCAN_ACT_GET) && + (bg_scan_out->action == BG_SCAN_ACT_GET_PPS_UAPSD)) { + bg_scan_out->enable = bg_scan->enable; + bg_scan_out->bss_type = bg_scan->bss_type; + bg_scan_out->chan_per_scan = bg_scan->chan_per_scan; + bg_scan_out->scan_interval = + wlan_le32_to_cpu(bg_scan->scan_interval); + bg_scan_out->report_condition = + wlan_le32_to_cpu(bg_scan->report_condition); + pioctl_buf->data_read_written = + sizeof(mlan_ds_scan) + MLAN_SUB_COMMAND_SIZE; + } + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -4258,24 +4798,26 @@ wlan_ret_bgscan_config(IN mlan_private * pmpriv, */ mlan_status wlan_ret_802_11_bgscan_query(IN mlan_private * pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - mlan_ds_scan *pscan = MNULL; - mlan_adapter *pmadapter = pmpriv->adapter; - ENTER(); - wlan_ret_802_11_scan(pmpriv, resp, MNULL); - if (pioctl_buf) { - pscan = (mlan_ds_scan *) pioctl_buf->pbuf; - pscan->param.scan_resp.pscan_table = (t_u8 *) pmadapter->pscan_table; - pscan->param.scan_resp.num_in_scan_table = pmadapter->num_in_scan_table; - pscan->param.scan_resp.age_in_secs = pmadapter->age_in_secs; - pioctl_buf->data_read_written = sizeof(mlan_scan_resp) + - MLAN_SUB_COMMAND_SIZE; - - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_scan *pscan = MNULL; + mlan_adapter *pmadapter = pmpriv->adapter; + ENTER(); + wlan_ret_802_11_scan(pmpriv, resp, MNULL); + if (pioctl_buf) { + pscan = (mlan_ds_scan *) pioctl_buf->pbuf; + pscan->param.scan_resp.pscan_table = + (t_u8 *) pmadapter->pscan_table; + pscan->param.scan_resp.num_in_scan_table = + pmadapter->num_in_scan_table; + pscan->param.scan_resp.age_in_secs = pmadapter->age_in_secs; + pioctl_buf->data_read_written = sizeof(mlan_scan_resp) + + MLAN_SUB_COMMAND_SIZE; + + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -4290,69 +4832,79 @@ wlan_ret_802_11_bgscan_query(IN mlan_private * pmpriv, */ t_s32 wlan_find_ssid_in_list(IN mlan_private * pmpriv, - IN mlan_802_11_ssid * ssid, - IN t_u8 * bssid, IN t_u32 mode) + IN mlan_802_11_ssid * ssid, + IN t_u8 * bssid, IN t_u32 mode) { - mlan_adapter *pmadapter = pmpriv->adapter; - t_s32 net = -1, j; - t_u8 best_rssi = 0; - t_u32 i; - - ENTER(); - PRINTM(MINFO, "Num of entries in scan table = %d\n", - pmadapter->num_in_scan_table); - - /* - * Loop through the table until the maximum is reached or until a match - * is found based on the bssid field comparison - */ - for (i = 0; - i < pmadapter->num_in_scan_table && (!bssid || (bssid && net < 0)); - i++) { - if (!wlan_ssid_cmp(pmadapter, &pmadapter->pscan_table[i].ssid, ssid) && - (!bssid - || !memcmp(pmadapter, pmadapter->pscan_table[i].mac_address, bssid, - MLAN_MAC_ADDR_LENGTH))) { - - if ((mode == MLAN_BSS_MODE_INFRA) && - !wlan_is_band_compatible(pmpriv->config_bands, - pmadapter->pscan_table[i].bss_band)) - continue; - - switch (mode) { - case MLAN_BSS_MODE_INFRA: - case MLAN_BSS_MODE_IBSS: - j = wlan_is_network_compatible(pmpriv, i, mode); - - if (j >= 0) { - if (SCAN_RSSI(pmadapter->pscan_table[i].rssi) > best_rssi) { - best_rssi = SCAN_RSSI(pmadapter->pscan_table[i].rssi); - net = i; - } - } else { - if (net == -1) { - net = j; - } - } - break; - case MLAN_BSS_MODE_AUTO: - default: - /* - * Do not check compatibility if the mode requested is - * Auto/Unknown. Allows generic find to work without - * verifying against the Adapter security settings - */ - if (SCAN_RSSI(pmadapter->pscan_table[i].rssi) > best_rssi) { - best_rssi = SCAN_RSSI(pmadapter->pscan_table[i].rssi); - net = i; - } - break; - } - } - } - - LEAVE(); - return net; + mlan_adapter *pmadapter = pmpriv->adapter; + t_s32 net = -1, j; + t_u8 best_rssi = 0; + t_u32 i; + + ENTER(); + PRINTM(MINFO, "Num of entries in scan table = %d\n", + pmadapter->num_in_scan_table); + + /* + * Loop through the table until the maximum is reached or until a match + * is found based on the bssid field comparison + */ + for (i = 0; + i < pmadapter->num_in_scan_table && (!bssid || (bssid && net < 0)); + i++) { + if (!wlan_ssid_cmp + (pmadapter, &pmadapter->pscan_table[i].ssid, ssid) && + (!bssid || + !memcmp(pmadapter, pmadapter->pscan_table[i].mac_address, + bssid, MLAN_MAC_ADDR_LENGTH))) { + + if ((mode == MLAN_BSS_MODE_INFRA) && + !wlan_is_band_compatible(pmpriv->config_bands, + pmadapter->pscan_table[i]. + bss_band)) + continue; + + switch (mode) { + case MLAN_BSS_MODE_INFRA: + case MLAN_BSS_MODE_IBSS: + j = wlan_is_network_compatible(pmpriv, i, mode); + + if (j >= 0) { + if (SCAN_RSSI + (pmadapter->pscan_table[i].rssi) > + best_rssi) { + best_rssi = + SCAN_RSSI(pmadapter-> + pscan_table + [i].rssi); + net = i; + } + } else { + if (net == -1) { + net = j; + } + } + break; + case MLAN_BSS_MODE_AUTO: + default: + /* + * Do not check compatibility if the mode requested is + * Auto/Unknown. Allows generic find to work without + * verifying against the Adapter security settings + */ + if (SCAN_RSSI(pmadapter->pscan_table[i].rssi) > + best_rssi) { + best_rssi = + SCAN_RSSI(pmadapter-> + pscan_table[i].rssi); + net = i; + } + break; + } + } + } + + LEAVE(); + return net; } /** @@ -4366,51 +4918,53 @@ wlan_find_ssid_in_list(IN mlan_private * pmpriv, */ t_s32 wlan_find_bssid_in_list(IN mlan_private * pmpriv, - IN t_u8 * bssid, IN t_u32 mode) + IN t_u8 * bssid, IN t_u32 mode) { - mlan_adapter *pmadapter = pmpriv->adapter; - t_s32 net = -1; - t_u32 i; - - ENTER(); - - if (!bssid) { - LEAVE(); - return -1; - } - - PRINTM(MINFO, "FindBSSID: Num of BSSIDs = %d\n", - pmadapter->num_in_scan_table); - - /* - * Look through the scan table for a compatible match. The ret return - * variable will be equal to the index in the scan table (greater - * than zero) if the network is compatible. The loop will continue - * past a matched bssid that is not compatible in case there is an - * AP with multiple SSIDs assigned to the same BSSID - */ - for (i = 0; net < 0 && i < pmadapter->num_in_scan_table; i++) { - if (!memcmp - (pmadapter, pmadapter->pscan_table[i].mac_address, bssid, - MLAN_MAC_ADDR_LENGTH)) { - if ((mode == MLAN_BSS_MODE_INFRA) && - !wlan_is_band_compatible(pmpriv->config_bands, - pmadapter->pscan_table[i].bss_band)) - continue; - switch (mode) { - case MLAN_BSS_MODE_INFRA: - case MLAN_BSS_MODE_IBSS: - net = wlan_is_network_compatible(pmpriv, i, mode); - break; - default: - net = i; - break; - } - } - } - - LEAVE(); - return net; + mlan_adapter *pmadapter = pmpriv->adapter; + t_s32 net = -1; + t_u32 i; + + ENTER(); + + if (!bssid) { + LEAVE(); + return -1; + } + + PRINTM(MINFO, "FindBSSID: Num of BSSIDs = %d\n", + pmadapter->num_in_scan_table); + + /* + * Look through the scan table for a compatible match. The ret return + * variable will be equal to the index in the scan table (greater + * than zero) if the network is compatible. The loop will continue + * past a matched bssid that is not compatible in case there is an + * AP with multiple SSIDs assigned to the same BSSID + */ + for (i = 0; net < 0 && i < pmadapter->num_in_scan_table; i++) { + if (!memcmp + (pmadapter, pmadapter->pscan_table[i].mac_address, bssid, + MLAN_MAC_ADDR_LENGTH)) { + if ((mode == MLAN_BSS_MODE_INFRA) && + !wlan_is_band_compatible(pmpriv->config_bands, + pmadapter->pscan_table[i]. + bss_band)) + continue; + switch (mode) { + case MLAN_BSS_MODE_INFRA: + case MLAN_BSS_MODE_IBSS: + net = wlan_is_network_compatible(pmpriv, i, + mode); + break; + default: + net = i; + break; + } + } + } + + LEAVE(); + return net; } /** @@ -4424,27 +4978,27 @@ wlan_find_bssid_in_list(IN mlan_private * pmpriv, */ t_s32 wlan_ssid_cmp(IN pmlan_adapter pmadapter, - IN mlan_802_11_ssid * ssid1, IN mlan_802_11_ssid * ssid2) + IN mlan_802_11_ssid * ssid1, IN mlan_802_11_ssid * ssid2) { - ENTER(); + ENTER(); - if (!ssid1 || !ssid2) { - LEAVE(); - return -1; - } + if (!ssid1 || !ssid2) { + LEAVE(); + return -1; + } - if (ssid1->ssid_len != ssid2->ssid_len) { - LEAVE(); - return -1; - } + if (ssid1->ssid_len != ssid2->ssid_len) { + LEAVE(); + return -1; + } - LEAVE(); - return memcmp(pmadapter, ssid1->ssid, ssid2->ssid, ssid1->ssid_len); + LEAVE(); + return memcmp(pmadapter, ssid1->ssid, ssid2->ssid, ssid1->ssid_len); } -/** +/** * @brief This function inserts scan command node to scan_pending_q. - * + * * @param pmpriv A pointer to mlan_private structure * @param pcmd_node A pointer to cmd_ctrl_node structure * @return N/A @@ -4452,19 +5006,20 @@ wlan_ssid_cmp(IN pmlan_adapter pmadapter, t_void wlan_queue_scan_cmd(IN mlan_private * pmpriv, IN cmd_ctrl_node * pcmd_node) { - mlan_adapter *pmadapter = pmpriv->adapter; + mlan_adapter *pmadapter = pmpriv->adapter; - ENTER(); + ENTER(); - if (pcmd_node == MNULL) - goto done; - util_enqueue_list_tail(pmadapter->pmoal_handle, &pmadapter->scan_pending_q, - (pmlan_linked_list) pcmd_node, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock); + if (pcmd_node == MNULL) + goto done; + util_enqueue_list_tail(pmadapter->pmoal_handle, + &pmadapter->scan_pending_q, + (pmlan_linked_list) pcmd_node, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); - done: - LEAVE(); +done: + LEAVE(); } /** @@ -4477,43 +5032,43 @@ wlan_queue_scan_cmd(IN mlan_private * pmpriv, IN cmd_ctrl_node * pcmd_node) */ mlan_status wlan_find_best_network(IN mlan_private * pmpriv, - OUT mlan_ssid_bssid * preq_ssid_bssid) + OUT mlan_ssid_bssid * preq_ssid_bssid) { - mlan_adapter *pmadapter = pmpriv->adapter; - mlan_status ret = MLAN_STATUS_SUCCESS; - BSSDescriptor_t *preq_bss; - t_s32 i; + mlan_adapter *pmadapter = pmpriv->adapter; + mlan_status ret = MLAN_STATUS_SUCCESS; + BSSDescriptor_t *preq_bss; + t_s32 i; - ENTER(); + ENTER(); - memset(pmadapter, preq_ssid_bssid, 0, sizeof(mlan_ssid_bssid)); + memset(pmadapter, preq_ssid_bssid, 0, sizeof(mlan_ssid_bssid)); - i = wlan_find_best_network_in_list(pmpriv); + i = wlan_find_best_network_in_list(pmpriv); - if (i >= 0) { - preq_bss = &pmadapter->pscan_table[i]; - memcpy(pmadapter, &preq_ssid_bssid->ssid, &preq_bss->ssid, - sizeof(mlan_802_11_ssid)); - memcpy(pmadapter, (t_u8 *) & preq_ssid_bssid->bssid, - (t_u8 *) & preq_bss->mac_address, MLAN_MAC_ADDR_LENGTH); + if (i >= 0) { + preq_bss = &pmadapter->pscan_table[i]; + memcpy(pmadapter, &preq_ssid_bssid->ssid, &preq_bss->ssid, + sizeof(mlan_802_11_ssid)); + memcpy(pmadapter, (t_u8 *) & preq_ssid_bssid->bssid, + (t_u8 *) & preq_bss->mac_address, MLAN_MAC_ADDR_LENGTH); - /* Make sure we are in the right mode */ - if (pmpriv->bss_mode == MLAN_BSS_MODE_AUTO) - pmpriv->bss_mode = preq_bss->bss_mode; - } + /* Make sure we are in the right mode */ + if (pmpriv->bss_mode == MLAN_BSS_MODE_AUTO) + pmpriv->bss_mode = preq_bss->bss_mode; + } - if (!preq_ssid_bssid->ssid.ssid_len) { - ret = MLAN_STATUS_FAILURE; - goto done; - } + if (!preq_ssid_bssid->ssid.ssid_len) { + ret = MLAN_STATUS_FAILURE; + goto done; + } - PRINTM(MINFO, "Best network found = [%s], " - "[" MACSTR "]\n", - preq_ssid_bssid->ssid.ssid, MAC2STR(preq_ssid_bssid->bssid)); + PRINTM(MINFO, "Best network found = [%s], " + "[" MACSTR "]\n", + preq_ssid_bssid->ssid.ssid, MAC2STR(preq_ssid_bssid->bssid)); - done: - LEAVE(); - return ret; +done: + LEAVE(); + return ret; } /** @@ -4527,59 +5082,59 @@ wlan_find_best_network(IN mlan_private * pmpriv, */ mlan_status wlan_scan_specific_ssid(IN mlan_private * pmpriv, - IN t_void * pioctl_buf, IN mlan_802_11_ssid * preq_ssid) + IN t_void * pioctl_buf, IN mlan_802_11_ssid * preq_ssid) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_callbacks *pcb = (mlan_callbacks *) & pmpriv->adapter->callbacks; - wlan_user_scan_cfg *pscan_cfg; - pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_callbacks *pcb = (mlan_callbacks *) & pmpriv->adapter->callbacks; + wlan_user_scan_cfg *pscan_cfg; + pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; - ENTER(); + ENTER(); - if (!preq_ssid) { - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_CMD_SCAN_FAIL; - ret = MLAN_STATUS_FAILURE; - goto done; - } + if (!preq_ssid) { + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_CMD_SCAN_FAIL; + ret = MLAN_STATUS_FAILURE; + goto done; + } - wlan_scan_delete_ssid_table_entry(pmpriv, preq_ssid); + wlan_scan_delete_ssid_table_entry(pmpriv, preq_ssid); - ret = - pcb->moal_malloc(pmpriv->adapter->pmoal_handle, - sizeof(wlan_user_scan_cfg), MLAN_MEM_DEF, - (t_u8 **) & pscan_cfg); + ret = pcb->moal_malloc(pmpriv->adapter->pmoal_handle, + sizeof(wlan_user_scan_cfg), MLAN_MEM_DEF, + (t_u8 **) & pscan_cfg); - if (ret != MLAN_STATUS_SUCCESS || !pscan_cfg) { - PRINTM(MERROR, "Memory allocation for pscan_cfg failed!\n"); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_NO_MEM; - ret = MLAN_STATUS_FAILURE; - goto done; - } + if (ret != MLAN_STATUS_SUCCESS || !pscan_cfg) { + PRINTM(MERROR, "Memory allocation for pscan_cfg failed!\n"); + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_NO_MEM; + ret = MLAN_STATUS_FAILURE; + goto done; + } - memset(pmpriv->adapter, pscan_cfg, 0x00, sizeof(wlan_user_scan_cfg)); + memset(pmpriv->adapter, pscan_cfg, 0x00, sizeof(wlan_user_scan_cfg)); - memcpy(pmpriv->adapter, pscan_cfg->ssid_list[0].ssid, - preq_ssid->ssid, preq_ssid->ssid_len); - pscan_cfg->keep_previous_scan = MTRUE; + memcpy(pmpriv->adapter, pscan_cfg->ssid_list[0].ssid, + preq_ssid->ssid, preq_ssid->ssid_len); + pscan_cfg->keep_previous_scan = MTRUE; - ret = wlan_scan_networks(pmpriv, pioctl_buf, pscan_cfg); + ret = wlan_scan_networks(pmpriv, pioctl_buf, pscan_cfg); - if (pscan_cfg) - pcb->moal_mfree(pmpriv->adapter->pmoal_handle, (t_u8 *) pscan_cfg); + if (pscan_cfg) + pcb->moal_mfree(pmpriv->adapter->pmoal_handle, + (t_u8 *) pscan_cfg); - done: - LEAVE(); - return ret; +done: + LEAVE(); + return ret; } /** * @brief Save a beacon buffer of the current bss descriptor - * Save the current beacon buffer to restore in the following cases that + * Save the current beacon buffer to restore in the following cases that * makes the bcn_buf not to contain the current ssid's beacon buffer. - * - the current ssid was not found somehow in the last scan. - * - the current ssid was the last entry of the scan table and overloaded. + * - the current ssid was not found somehow in the last scan. + * - the current ssid was the last entry of the scan table and overloaded. * * @param pmpriv A pointer to mlan_private structure * @@ -4588,39 +5143,43 @@ wlan_scan_specific_ssid(IN mlan_private * pmpriv, t_void wlan_save_curr_bcn(IN mlan_private * pmpriv) { - mlan_adapter *pmadapter = pmpriv->adapter; - mlan_callbacks *pcb = (pmlan_callbacks) & pmadapter->callbacks; - BSSDescriptor_t *pcurr_bss = &pmpriv->curr_bss_params.bss_descriptor; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - /* save the beacon buffer if it is not saved or updated */ - if ((pmpriv->pcurr_bcn_buf == MNULL) || - (pmpriv->curr_bcn_size != pcurr_bss->beacon_buf_size) || - (memcmp(pmpriv->adapter, pmpriv->pcurr_bcn_buf, pcurr_bss->pbeacon_buf, - pcurr_bss->beacon_buf_size))) { - - if (pmpriv->pcurr_bcn_buf) { - pcb->moal_mfree(pmadapter->pmoal_handle, pmpriv->pcurr_bcn_buf); - pmpriv->pcurr_bcn_buf = MNULL; - } - pmpriv->curr_bcn_size = pcurr_bss->beacon_buf_size; - - if (pmpriv->curr_bcn_size) { - ret = - pcb->moal_malloc(pmadapter->pmoal_handle, - pcurr_bss->beacon_buf_size, MLAN_MEM_DEF, - &pmpriv->pcurr_bcn_buf); - - if ((ret == MLAN_STATUS_SUCCESS) && pmpriv->pcurr_bcn_buf) { - memcpy(pmpriv->adapter, pmpriv->pcurr_bcn_buf, - pcurr_bss->pbeacon_buf, pcurr_bss->beacon_buf_size); - PRINTM(MINFO, "current beacon saved %d\n", - pmpriv->curr_bcn_size); - } - } - } - LEAVE(); + mlan_adapter *pmadapter = pmpriv->adapter; + mlan_callbacks *pcb = (pmlan_callbacks) & pmadapter->callbacks; + BSSDescriptor_t *pcurr_bss = &pmpriv->curr_bss_params.bss_descriptor; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + /* save the beacon buffer if it is not saved or updated */ + if ((pmpriv->pcurr_bcn_buf == MNULL) || + (pmpriv->curr_bcn_size != pcurr_bss->beacon_buf_size) || + (memcmp + (pmpriv->adapter, pmpriv->pcurr_bcn_buf, pcurr_bss->pbeacon_buf, + pcurr_bss->beacon_buf_size))) { + + if (pmpriv->pcurr_bcn_buf) { + pcb->moal_mfree(pmadapter->pmoal_handle, + pmpriv->pcurr_bcn_buf); + pmpriv->pcurr_bcn_buf = MNULL; + } + pmpriv->curr_bcn_size = pcurr_bss->beacon_buf_size; + + if (pmpriv->curr_bcn_size) { + ret = pcb->moal_malloc(pmadapter->pmoal_handle, + pcurr_bss->beacon_buf_size, + MLAN_MEM_DEF, + &pmpriv->pcurr_bcn_buf); + + if ((ret == MLAN_STATUS_SUCCESS) && + pmpriv->pcurr_bcn_buf) { + memcpy(pmpriv->adapter, pmpriv->pcurr_bcn_buf, + pcurr_bss->pbeacon_buf, + pcurr_bss->beacon_buf_size); + PRINTM(MINFO, "current beacon saved %d\n", + pmpriv->curr_bcn_size); + } + } + } + LEAVE(); } /** @@ -4633,13 +5192,13 @@ wlan_save_curr_bcn(IN mlan_private * pmpriv) t_void wlan_free_curr_bcn(IN mlan_private * pmpriv) { - mlan_adapter *pmadapter = pmpriv->adapter; - mlan_callbacks *pcb = (pmlan_callbacks) & pmadapter->callbacks; - - ENTER(); - if (pmpriv->pcurr_bcn_buf) { - pcb->moal_mfree(pmadapter->pmoal_handle, pmpriv->pcurr_bcn_buf); - pmpriv->pcurr_bcn_buf = MNULL; - } - LEAVE(); + mlan_adapter *pmadapter = pmpriv->adapter; + mlan_callbacks *pcb = (pmlan_callbacks) & pmadapter->callbacks; + + ENTER(); + if (pmpriv->pcurr_bcn_buf) { + pcb->moal_mfree(pmadapter->pmoal_handle, pmpriv->pcurr_bcn_buf); + pmpriv->pcurr_bcn_buf = MNULL; + } + LEAVE(); } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_sdio.c b/drivers/net/wireless/sd8897/mlan/mlan_sdio.c index d3376d3e0029..affb42b36cf5 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_sdio.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_sdio.c @@ -1,8 +1,8 @@ /** @file mlan_sdio.c * * @brief This file contains SDIO specific code - * - * Copyright (C) 2008-2011, Marvell International Ltd. + * + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -47,99 +47,102 @@ Change log: Local Functions ********************************************************/ -/** +/** * @brief This function counts the bits of unsigned int number - * - * @param num number - * @return number of bits + * + * @param num number + * @return number of bits */ static t_u32 INLINE bitcount(t_u32 num) { - t_u32 count = 0; - static t_u32 nibblebits[] = - { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 }; - for (; num != 0; num >>= 4) - count += nibblebits[num & 0x0f]; - return count; + t_u32 count = 0; + static t_u32 nibblebits[] = + { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 }; + for (; num != 0; num >>= 4) + count += nibblebits[num & 0x0f]; + return count; } -/** +/** * @brief This function initialize the SDIO port - * + * * @param pmadapter A pointer to mlan_adapter structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ static mlan_status wlan_sdio_init_ioport(mlan_adapter * pmadapter) { - t_u32 reg; - pmlan_callbacks pcb = &pmadapter->callbacks; - - ENTER(); - pmadapter->ioport = 0; - - pmadapter->ioport = MEM_PORT; - - PRINTM(MINFO, "SDIO FUNC1 IO port: 0x%x\n", pmadapter->ioport); - - /* enable sdio cmd53 new mode */ - if (MLAN_STATUS_SUCCESS == pcb->moal_read_reg(pmadapter->pmoal_handle, - CARD_CONFIG_2_1_REG, ®)) { - pcb->moal_write_reg(pmadapter->pmoal_handle, - CARD_CONFIG_2_1_REG, reg | CMD53_NEW_MODE); - } else { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - /* configure cmd port */ - /* enable reading rx length from the register */ - if (MLAN_STATUS_SUCCESS == pcb->moal_read_reg(pmadapter->pmoal_handle, - CMD_CONFIG_0, ®)) { - pcb->moal_write_reg(pmadapter->pmoal_handle, - CMD_CONFIG_0, reg | CMD_PORT_RD_LEN_EN); - } else { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - /* enable Dnld/Upld ready auto reset for cmd port after cmd53 is completed - */ - if (MLAN_STATUS_SUCCESS == pcb->moal_read_reg(pmadapter->pmoal_handle, - CMD_CONFIG_1, ®)) { - pcb->moal_write_reg(pmadapter->pmoal_handle, - CMD_CONFIG_1, reg | CMD_PORT_AUTO_EN); - } else { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - /* Set Host interrupt reset to read to clear */ - if (MLAN_STATUS_SUCCESS == - pcb->moal_read_reg(pmadapter->pmoal_handle, HOST_INT_RSR_REG, ®)) { - pcb->moal_write_reg(pmadapter->pmoal_handle, HOST_INT_RSR_REG, - reg | HOST_INT_RSR_MASK); - } else { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - /* Dnld/Upld ready set to auto reset */ - if (MLAN_STATUS_SUCCESS == - pcb->moal_read_reg(pmadapter->pmoal_handle, CARD_MISC_CFG_REG, ®)) { - pcb->moal_write_reg(pmadapter->pmoal_handle, CARD_MISC_CFG_REG, - reg | AUTO_RE_ENABLE_INT); - } else { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + t_u32 reg; + pmlan_callbacks pcb = &pmadapter->callbacks; + + ENTER(); + pmadapter->ioport = 0; + + pmadapter->ioport = MEM_PORT; + + PRINTM(MINFO, "SDIO FUNC1 IO port: 0x%x\n", pmadapter->ioport); + + /* enable sdio cmd53 new mode */ + if (MLAN_STATUS_SUCCESS == pcb->moal_read_reg(pmadapter->pmoal_handle, + CARD_CONFIG_2_1_REG, + ®)) { + pcb->moal_write_reg(pmadapter->pmoal_handle, + CARD_CONFIG_2_1_REG, reg | CMD53_NEW_MODE); + } else { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + /* configure cmd port */ + /* enable reading rx length from the register */ + if (MLAN_STATUS_SUCCESS == pcb->moal_read_reg(pmadapter->pmoal_handle, + CMD_CONFIG_0, ®)) { + pcb->moal_write_reg(pmadapter->pmoal_handle, + CMD_CONFIG_0, reg | CMD_PORT_RD_LEN_EN); + } else { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + /* enable Dnld/Upld ready auto reset for cmd port after cmd53 is + completed */ + if (MLAN_STATUS_SUCCESS == pcb->moal_read_reg(pmadapter->pmoal_handle, + CMD_CONFIG_1, ®)) { + pcb->moal_write_reg(pmadapter->pmoal_handle, + CMD_CONFIG_1, reg | CMD_PORT_AUTO_EN); + } else { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + /* Set Host interrupt reset to read to clear */ + if (MLAN_STATUS_SUCCESS == + pcb->moal_read_reg(pmadapter->pmoal_handle, HOST_INT_RSR_REG, + ®)) { + pcb->moal_write_reg(pmadapter->pmoal_handle, HOST_INT_RSR_REG, + reg | HOST_INT_RSR_MASK); + } else { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + /* Dnld/Upld ready set to auto reset */ + if (MLAN_STATUS_SUCCESS == + pcb->moal_read_reg(pmadapter->pmoal_handle, CARD_MISC_CFG_REG, + ®)) { + pcb->moal_write_reg(pmadapter->pmoal_handle, CARD_MISC_CFG_REG, + reg | AUTO_RE_ENABLE_INT); + } else { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function sends data to the card. - * + * * @param pmadapter A pointer to mlan_adapter structure * @param pmbuf A pointer to mlan_buffer (pmbuf->data_len should include SDIO header) * @param port Port @@ -148,39 +151,41 @@ wlan_sdio_init_ioport(mlan_adapter * pmadapter) static mlan_status wlan_write_data_sync(mlan_adapter * pmadapter, mlan_buffer * pmbuf, t_u32 port) { - t_u32 i = 0; - pmlan_callbacks pcb = &pmadapter->callbacks; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - do { - ret = - pcb->moal_write_data_sync(pmadapter->pmoal_handle, pmbuf, port, 0); - if (ret != MLAN_STATUS_SUCCESS) { - i++; - PRINTM(MERROR, "host_to_card, write iomem (%d) failed: %d\n", i, - ret); - if (MLAN_STATUS_SUCCESS != - pcb->moal_write_reg(pmadapter->pmoal_handle, - HOST_TO_CARD_EVENT_REG, HOST_TERM_CMD53)) { - PRINTM(MERROR, "write CFG reg failed\n"); - } - ret = MLAN_STATUS_FAILURE; - if (i > MAX_WRITE_IOMEM_RETRY) { - pmbuf->status_code = MLAN_ERROR_DATA_TX_FAIL; - goto exit; - } - } - } while (ret == MLAN_STATUS_FAILURE); - exit: - LEAVE(); - return ret; + t_u32 i = 0; + pmlan_callbacks pcb = &pmadapter->callbacks; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + do { + ret = pcb->moal_write_data_sync(pmadapter->pmoal_handle, pmbuf, + port, 0); + if (ret != MLAN_STATUS_SUCCESS) { + i++; + PRINTM(MERROR, + "host_to_card, write iomem (%d) failed: %d\n", i, + ret); + if (MLAN_STATUS_SUCCESS != + pcb->moal_write_reg(pmadapter->pmoal_handle, + HOST_TO_CARD_EVENT_REG, + HOST_TERM_CMD53)) { + PRINTM(MERROR, "write CFG reg failed\n"); + } + ret = MLAN_STATUS_FAILURE; + if (i > MAX_WRITE_IOMEM_RETRY) { + pmbuf->status_code = MLAN_ERROR_DATA_TX_FAIL; + goto exit; + } + } + } while (ret == MLAN_STATUS_FAILURE); +exit: + LEAVE(); + return ret; } -/** +/** * @brief This function gets available SDIO port for reading cmd/data - * + * * @param pmadapter A pointer to mlan_adapter structure * @param pport A pointer to port number * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -188,39 +193,40 @@ wlan_write_data_sync(mlan_adapter * pmadapter, mlan_buffer * pmbuf, t_u32 port) static mlan_status wlan_get_rd_port(mlan_adapter * pmadapter, t_u8 * pport) { - t_u32 rd_bitmap = pmadapter->mp_rd_bitmap; - - ENTER(); - - PRINTM(MIF_D, "wlan_get_rd_port: mp_rd_bitmap=0x%08x\n", rd_bitmap); - - if (!(rd_bitmap & (DATA_PORT_MASK))) { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - if (pmadapter->mp_rd_bitmap & (1 << pmadapter->curr_rd_port)) { - pmadapter->mp_rd_bitmap &= (t_u32) (~(1 << pmadapter->curr_rd_port)); - *pport = pmadapter->curr_rd_port; - - /* hw rx wraps round only after port (MAX_PORT-1) */ - if (++pmadapter->curr_rd_port == MAX_PORT) - /* port 0 is not reserved for cmd port */ - pmadapter->curr_rd_port = 0; - } else { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - PRINTM(MIF_D, "port=%d mp_rd_bitmap=0x%08x -> 0x%08x\n", - *pport, rd_bitmap, pmadapter->mp_rd_bitmap); - LEAVE(); - return MLAN_STATUS_SUCCESS; + t_u32 rd_bitmap = pmadapter->mp_rd_bitmap; + + ENTER(); + + PRINTM(MIF_D, "wlan_get_rd_port: mp_rd_bitmap=0x%08x\n", rd_bitmap); + + if (!(rd_bitmap & (DATA_PORT_MASK))) { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + if (pmadapter->mp_rd_bitmap & (1 << pmadapter->curr_rd_port)) { + pmadapter->mp_rd_bitmap &= + (t_u32) (~(1 << pmadapter->curr_rd_port)); + *pport = pmadapter->curr_rd_port; + + /* hw rx wraps round only after port (MAX_PORT-1) */ + if (++pmadapter->curr_rd_port == MAX_PORT) + /* port 0 is not reserved for cmd port */ + pmadapter->curr_rd_port = 0; + } else { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + PRINTM(MIF_D, "port=%d mp_rd_bitmap=0x%08x -> 0x%08x\n", + *pport, rd_bitmap, pmadapter->mp_rd_bitmap); + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function gets available SDIO port for writing data - * + * * @param pmadapter A pointer to mlan_adapter structure * @param pport A pointer to port number * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -228,39 +234,41 @@ wlan_get_rd_port(mlan_adapter * pmadapter, t_u8 * pport) static mlan_status wlan_get_wr_port_data(mlan_adapter * pmadapter, t_u8 * pport) { - t_u32 wr_bitmap = pmadapter->mp_wr_bitmap; - - ENTER(); - - PRINTM(MIF_D, "wlan_get_wr_port_data: mp_wr_bitmap=0x%08x\n", wr_bitmap); - - if (!(wr_bitmap & DATA_PORT_MASK)) { - pmadapter->data_sent = MTRUE; - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - - if (pmadapter->mp_wr_bitmap & (1 << pmadapter->curr_wr_port)) { - pmadapter->mp_wr_bitmap &= (t_u32) (~(1 << pmadapter->curr_wr_port)); - *pport = pmadapter->curr_wr_port; - /* hw tx wraps round only after port (MAX_PORT-1) */ - if (++pmadapter->curr_wr_port == MAX_PORT) - pmadapter->curr_wr_port = 0; - } else { - pmadapter->data_sent = MTRUE; - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - - PRINTM(MIF_D, "port=%d mp_wr_bitmap=0x%08x -> 0x%08x\n", - *pport, wr_bitmap, pmadapter->mp_wr_bitmap); - LEAVE(); - return MLAN_STATUS_SUCCESS; + t_u32 wr_bitmap = pmadapter->mp_wr_bitmap; + + ENTER(); + + PRINTM(MIF_D, "wlan_get_wr_port_data: mp_wr_bitmap=0x%08x\n", + wr_bitmap); + + if (!(wr_bitmap & DATA_PORT_MASK)) { + pmadapter->data_sent = MTRUE; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + + if (pmadapter->mp_wr_bitmap & (1 << pmadapter->curr_wr_port)) { + pmadapter->mp_wr_bitmap &= + (t_u32) (~(1 << pmadapter->curr_wr_port)); + *pport = pmadapter->curr_wr_port; + /* hw tx wraps round only after port (MAX_PORT-1) */ + if (++pmadapter->curr_wr_port == MAX_PORT) + pmadapter->curr_wr_port = 0; + } else { + pmadapter->data_sent = MTRUE; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + + PRINTM(MIF_D, "port=%d mp_wr_bitmap=0x%08x -> 0x%08x\n", + *pport, wr_bitmap, pmadapter->mp_wr_bitmap); + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function polls the card status register. - * + * * @param pmadapter A pointer to mlan_adapter structure * @param bits the bit mask * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -268,33 +276,35 @@ wlan_get_wr_port_data(mlan_adapter * pmadapter, t_u8 * pport) static mlan_status wlan_sdio_poll_card_status(mlan_adapter * pmadapter, t_u8 bits) { - pmlan_callbacks pcb = &pmadapter->callbacks; - t_u32 tries; - t_u32 cs = 0; - - ENTER(); - - for (tries = 0; tries < MAX_POLL_TRIES; tries++) { - if (pcb-> - moal_read_reg(pmadapter->pmoal_handle, CARD_TO_HOST_EVENT_REG, - &cs) != MLAN_STATUS_SUCCESS) - break; - else if ((cs & bits) == bits) { - LEAVE(); - return MLAN_STATUS_SUCCESS; - } - wlan_udelay(pmadapter, 10); - } - - PRINTM(MERROR, "wlan_sdio_poll_card_status failed, tries = %d, cs = 0x%x\n", - tries, cs); - LEAVE(); - return MLAN_STATUS_FAILURE; + pmlan_callbacks pcb = &pmadapter->callbacks; + t_u32 tries; + t_u32 cs = 0; + + ENTER(); + + for (tries = 0; tries < MAX_POLL_TRIES; tries++) { + if (pcb-> + moal_read_reg(pmadapter->pmoal_handle, + CARD_TO_HOST_EVENT_REG, + &cs) != MLAN_STATUS_SUCCESS) + break; + else if ((cs & bits) == bits) { + LEAVE(); + return MLAN_STATUS_SUCCESS; + } + wlan_udelay(pmadapter, 10); + } + + PRINTM(MERROR, + "wlan_sdio_poll_card_status failed, tries = %d, cs = 0x%x\n", + tries, cs); + LEAVE(); + return MLAN_STATUS_FAILURE; } -/** +/** * @brief This function reads firmware status registers - * + * * @param pmadapter A pointer to mlan_adapter structure * @param dat A pointer to keep returned data * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -302,31 +312,31 @@ wlan_sdio_poll_card_status(mlan_adapter * pmadapter, t_u8 bits) static mlan_status wlan_sdio_read_fw_status(mlan_adapter * pmadapter, t_u16 * dat) { - pmlan_callbacks pcb = &pmadapter->callbacks; - t_u32 fws0 = 0, fws1 = 0; - - ENTER(); - if (MLAN_STATUS_SUCCESS != - pcb->moal_read_reg(pmadapter->pmoal_handle, CARD_FW_STATUS0_REG, - &fws0)) { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - if (MLAN_STATUS_SUCCESS != - pcb->moal_read_reg(pmadapter->pmoal_handle, CARD_FW_STATUS1_REG, - &fws1)) { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - *dat = (t_u16) ((fws1 << 8) | fws0); - LEAVE(); - return MLAN_STATUS_SUCCESS; + pmlan_callbacks pcb = &pmadapter->callbacks; + t_u32 fws0 = 0, fws1 = 0; + + ENTER(); + if (MLAN_STATUS_SUCCESS != + pcb->moal_read_reg(pmadapter->pmoal_handle, CARD_FW_STATUS0_REG, + &fws0)) { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + if (MLAN_STATUS_SUCCESS != + pcb->moal_read_reg(pmadapter->pmoal_handle, CARD_FW_STATUS1_REG, + &fws1)) { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + *dat = (t_u16) ((fws1 << 8) | fws0); + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @brief This function disables the host interrupts mask. - * + * * @param pmadapter A pointer to mlan_adapter structure * @param mask the interrupt mask * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -334,37 +344,37 @@ wlan_sdio_read_fw_status(mlan_adapter * pmadapter, t_u16 * dat) static mlan_status wlan_sdio_disable_host_int_mask(pmlan_adapter pmadapter, t_u8 mask) { - t_u32 host_int_mask = 0; - pmlan_callbacks pcb = &pmadapter->callbacks; - - ENTER(); - - /* Read back the host_int_mask register */ - if (MLAN_STATUS_SUCCESS != - pcb->moal_read_reg(pmadapter->pmoal_handle, HOST_INT_MASK_REG, - &host_int_mask)) { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - /* Update with the mask and write back to the register */ - host_int_mask &= ~mask; - - if (MLAN_STATUS_SUCCESS != - pcb->moal_write_reg(pmadapter->pmoal_handle, HOST_INT_MASK_REG, - host_int_mask)) { - PRINTM(MWARN, "Disable host interrupt failed\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + t_u32 host_int_mask = 0; + pmlan_callbacks pcb = &pmadapter->callbacks; + + ENTER(); + + /* Read back the host_int_mask register */ + if (MLAN_STATUS_SUCCESS != + pcb->moal_read_reg(pmadapter->pmoal_handle, HOST_INT_MASK_REG, + &host_int_mask)) { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + /* Update with the mask and write back to the register */ + host_int_mask &= ~mask; + + if (MLAN_STATUS_SUCCESS != + pcb->moal_write_reg(pmadapter->pmoal_handle, HOST_INT_MASK_REG, + host_int_mask)) { + PRINTM(MWARN, "Disable host interrupt failed\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function enables the host interrupts mask - * + * * @param pmadapter A pointer to mlan_adapter structure * @param mask the interrupt mask * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -372,25 +382,26 @@ wlan_sdio_disable_host_int_mask(pmlan_adapter pmadapter, t_u8 mask) static mlan_status wlan_sdio_enable_host_int_mask(pmlan_adapter pmadapter, t_u8 mask) { - pmlan_callbacks pcb = &pmadapter->callbacks; + pmlan_callbacks pcb = &pmadapter->callbacks; - ENTER(); + ENTER(); - /* Simply write the mask to the register */ - if (MLAN_STATUS_SUCCESS != - pcb->moal_write_reg(pmadapter->pmoal_handle, HOST_INT_MASK_REG, mask)) { - PRINTM(MWARN, "Enable host interrupt failed\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } + /* Simply write the mask to the register */ + if (MLAN_STATUS_SUCCESS != + pcb->moal_write_reg(pmadapter->pmoal_handle, HOST_INT_MASK_REG, + mask)) { + PRINTM(MWARN, "Enable host interrupt failed\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function reads data from the card. - * + * * @param pmadapter A pointer to mlan_adapter structure * @param type A pointer to keep type as data or command * @param nb A pointer to keep the data/cmd length returned in buffer @@ -401,44 +412,47 @@ wlan_sdio_enable_host_int_mask(pmlan_adapter pmadapter, t_u8 mask) */ static mlan_status wlan_sdio_card_to_host(mlan_adapter * pmadapter, - t_u32 * type, t_u32 * nb, pmlan_buffer pmbuf, - t_u32 npayload, t_u32 ioport) + t_u32 * type, t_u32 * nb, pmlan_buffer pmbuf, + t_u32 npayload, t_u32 ioport) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_callbacks pcb = &pmadapter->callbacks; - - ENTER(); - - if (!pmbuf) { - PRINTM(MWARN, "pmbuf is NULL!\n"); - ret = MLAN_STATUS_FAILURE; - goto exit; - } - - ret = pcb->moal_read_data_sync(pmadapter->pmoal_handle, pmbuf, ioport, 0); - - if (ret != MLAN_STATUS_SUCCESS) { - PRINTM(MERROR, "card_to_host, read iomem failed: %d\n", ret); - pmbuf->status_code = MLAN_ERROR_DATA_RX_FAIL; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - *nb = wlan_le16_to_cpu(*(t_u16 *) (pmbuf->pbuf + pmbuf->data_offset)); - if (*nb > npayload) { - PRINTM(MERROR, "invalid packet, *nb=%d, npayload=%d\n", *nb, npayload); - pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - - DBG_HEXDUMP(MIF_D, "SDIO Blk Rd", pmbuf->pbuf + pmbuf->data_offset, - MIN(*nb, MAX_DATA_DUMP_LEN)); - - *type = wlan_le16_to_cpu(*(t_u16 *) (pmbuf->pbuf + pmbuf->data_offset + 2)); - - exit: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_callbacks pcb = &pmadapter->callbacks; + + ENTER(); + + if (!pmbuf) { + PRINTM(MWARN, "pmbuf is NULL!\n"); + ret = MLAN_STATUS_FAILURE; + goto exit; + } + + ret = pcb->moal_read_data_sync(pmadapter->pmoal_handle, pmbuf, ioport, + 0); + + if (ret != MLAN_STATUS_SUCCESS) { + PRINTM(MERROR, "card_to_host, read iomem failed: %d\n", ret); + pmbuf->status_code = MLAN_ERROR_DATA_RX_FAIL; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + *nb = wlan_le16_to_cpu(*(t_u16 *) (pmbuf->pbuf + pmbuf->data_offset)); + if (*nb > npayload) { + PRINTM(MERROR, "invalid packet, *nb=%d, npayload=%d\n", *nb, + npayload); + pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + + DBG_HEXDUMP(MIF_D, "SDIO Blk Rd", pmbuf->pbuf + pmbuf->data_offset, + MIN(*nb, MAX_DATA_DUMP_LEN)); + + *type = wlan_le16_to_cpu(*(t_u16 *) + (pmbuf->pbuf + pmbuf->data_offset + 2)); + +exit: + LEAVE(); + return ret; } /** @@ -452,193 +466,202 @@ wlan_sdio_card_to_host(mlan_adapter * pmadapter, static mlan_status wlan_prog_fw_w_helper(IN pmlan_adapter pmadapter, IN pmlan_fw_image pmfw) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_callbacks pcb = &pmadapter->callbacks; - t_u8 *firmware = pmfw->pfw_buf; - t_u32 firmwarelen = pmfw->fw_len; - t_u32 offset = 0; - t_u32 base0, base1; - t_void *tmpfwbuf = MNULL; - t_u32 tmpfwbufsz; - t_u8 *fwbuf; - mlan_buffer mbuf; - t_u16 len = 0; - t_u32 txlen = 0, tx_blocks = 0, tries = 0; - t_u32 i = 0; - - ENTER(); - - if (!firmware && !pcb->moal_get_fw_data) { - PRINTM(MMSG, "No firmware image found! Terminating download\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - PRINTM(MINFO, "WLAN: Downloading FW image (%d bytes)\n", firmwarelen); - - tmpfwbufsz = ALIGN_SZ(WLAN_UPLD_SIZE, DMA_ALIGNMENT); - ret = - pcb->moal_malloc(pmadapter->pmoal_handle, tmpfwbufsz, - MLAN_MEM_DEF | MLAN_MEM_DMA, (t_u8 **) & tmpfwbuf); - if ((ret != MLAN_STATUS_SUCCESS) || !tmpfwbuf) { - PRINTM(MERROR, - "Unable to allocate buffer for firmware. Terminating download\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - memset(pmadapter, tmpfwbuf, 0, tmpfwbufsz); - /* Ensure 8-byte aligned firmware buffer */ - fwbuf = (t_u8 *) ALIGN_ADDR(tmpfwbuf, DMA_ALIGNMENT); - - /* Perform firmware data transfer */ - do { - /* The host polls for the DN_LD_CARD_RDY and CARD_IO_READY bits */ - ret = - wlan_sdio_poll_card_status(pmadapter, - CARD_IO_READY | DN_LD_CARD_RDY); - if (ret != MLAN_STATUS_SUCCESS) { - PRINTM(MFATAL, - "WLAN: FW download with helper poll status timeout @ %d\n", - offset); - goto done; - } - - /* More data? */ - if (firmwarelen && offset >= firmwarelen) - break; - - for (tries = 0; tries < MAX_POLL_TRIES; tries++) { - if ((ret = pcb->moal_read_reg(pmadapter->pmoal_handle, - READ_BASE_0_REG, - &base0)) != MLAN_STATUS_SUCCESS) { - PRINTM(MERROR, - "Dev BASE0 register read failed:" - " base0=0x%04X(%d). Terminating download\n", base0, - base0); - goto done; - } - if ((ret = pcb->moal_read_reg(pmadapter->pmoal_handle, - READ_BASE_1_REG, - &base1)) != MLAN_STATUS_SUCCESS) { - PRINTM(MERROR, - "Dev BASE1 register read failed:" - " base1=0x%04X(%d). Terminating download\n", base1, - base1); - goto done; - } - len = (t_u16) (((base1 & 0xff) << 8) | (base0 & 0xff)); - - if (len) - break; - wlan_udelay(pmadapter, 10); - } - - if (!len) - break; - else if (len > WLAN_UPLD_SIZE) { - PRINTM(MFATAL, - "WLAN: FW download failure @ %d, invalid length %d\n", - offset, len); - ret = MLAN_STATUS_FAILURE; - goto done; - } - - txlen = len; - - if (len & MBIT(0)) { - i++; - if (i > MAX_WRITE_IOMEM_RETRY) { - PRINTM(MFATAL, - "WLAN: FW download failure @ %d, over max retry count\n", - offset); - ret = MLAN_STATUS_FAILURE; - goto done; - } - PRINTM(MERROR, "WLAN: FW CRC error indicated by the helper:" - " len = 0x%04X, txlen = %d\n", len, txlen); - len &= ~MBIT(0); - - PRINTM(MERROR, "WLAN: retry: %d, offset %d\n", i, offset); - DBG_HEXDUMP(MERROR, "WLAN: FW block:", mbuf.pbuf, len); - - /* Setting this to 0 to resend from same offset */ - txlen = 0; - } else { - i = 0; - - /* Set blocksize to transfer - checking for last block */ - if (firmwarelen && firmwarelen - offset < txlen) { - txlen = firmwarelen - offset; - } - PRINTM(MINFO, "."); - - tx_blocks = - (txlen + MLAN_SDIO_BLOCK_SIZE_FW_DNLD - - 1) / MLAN_SDIO_BLOCK_SIZE_FW_DNLD; - - /* Copy payload to buffer */ - if (firmware) - memmove(pmadapter, fwbuf, &firmware[offset], txlen); - else - pcb->moal_get_fw_data(pmadapter->pmoal_handle, offset, txlen, - fwbuf); - } - - /* Send data */ - memset(pmadapter, &mbuf, 0, sizeof(mlan_buffer)); - mbuf.pbuf = (t_u8 *) fwbuf; - mbuf.data_len = tx_blocks * MLAN_SDIO_BLOCK_SIZE_FW_DNLD; - - ret = - pcb->moal_write_data_sync(pmadapter->pmoal_handle, &mbuf, - pmadapter->ioport, 0); - if (ret != MLAN_STATUS_SUCCESS) { - PRINTM(MERROR, "WLAN: FW download, write iomem (%d) failed @ %d\n", - i, offset); - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, HOST_TO_CARD_EVENT_REG, - HOST_TERM_CMD53) != MLAN_STATUS_SUCCESS) { - PRINTM(MERROR, "write CFG reg failed\n"); - } - ret = MLAN_STATUS_FAILURE; - goto done; - } - - offset += txlen; - } while (MTRUE); - - PRINTM(MINFO, "\nFW download over, size %d bytes\n", offset); - - ret = MLAN_STATUS_SUCCESS; - done: - if (tmpfwbuf) - pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) tmpfwbuf); - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_callbacks pcb = &pmadapter->callbacks; + t_u8 *firmware = pmfw->pfw_buf; + t_u32 firmwarelen = pmfw->fw_len; + t_u32 offset = 0; + t_u32 base0, base1; + t_void *tmpfwbuf = MNULL; + t_u32 tmpfwbufsz; + t_u8 *fwbuf; + mlan_buffer mbuf; + t_u16 len = 0; + t_u32 txlen = 0, tx_blocks = 0, tries = 0; + t_u32 i = 0; + + ENTER(); + + if (!firmware && !pcb->moal_get_fw_data) { + PRINTM(MMSG, "No firmware image found! Terminating download\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + PRINTM(MINFO, "WLAN: Downloading FW image (%d bytes)\n", firmwarelen); + + tmpfwbufsz = ALIGN_SZ(WLAN_UPLD_SIZE, DMA_ALIGNMENT); + ret = pcb->moal_malloc(pmadapter->pmoal_handle, tmpfwbufsz, + MLAN_MEM_DEF | MLAN_MEM_DMA, + (t_u8 **) & tmpfwbuf); + if ((ret != MLAN_STATUS_SUCCESS) || !tmpfwbuf) { + PRINTM(MERROR, + "Unable to allocate buffer for firmware. Terminating download\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + memset(pmadapter, tmpfwbuf, 0, tmpfwbufsz); + /* Ensure 8-byte aligned firmware buffer */ + fwbuf = (t_u8 *) ALIGN_ADDR(tmpfwbuf, DMA_ALIGNMENT); + + /* Perform firmware data transfer */ + do { + /* The host polls for the DN_LD_CARD_RDY and CARD_IO_READY bits + */ + ret = wlan_sdio_poll_card_status(pmadapter, + CARD_IO_READY | + DN_LD_CARD_RDY); + if (ret != MLAN_STATUS_SUCCESS) { + PRINTM(MFATAL, + "WLAN: FW download with helper poll status timeout @ %d\n", + offset); + goto done; + } + + /* More data? */ + if (firmwarelen && offset >= firmwarelen) + break; + + for (tries = 0; tries < MAX_POLL_TRIES; tries++) { + if ((ret = pcb->moal_read_reg(pmadapter->pmoal_handle, + READ_BASE_0_REG, + &base0)) != + MLAN_STATUS_SUCCESS) { + PRINTM(MERROR, + "Dev BASE0 register read failed:" + " base0=0x%04X(%d). Terminating download\n", + base0, base0); + goto done; + } + if ((ret = pcb->moal_read_reg(pmadapter->pmoal_handle, + READ_BASE_1_REG, + &base1)) != + MLAN_STATUS_SUCCESS) { + PRINTM(MERROR, + "Dev BASE1 register read failed:" + " base1=0x%04X(%d). Terminating download\n", + base1, base1); + goto done; + } + len = (t_u16) (((base1 & 0xff) << 8) | (base0 & 0xff)); + + if (len) + break; + wlan_udelay(pmadapter, 10); + } + + if (!len) + break; + else if (len > WLAN_UPLD_SIZE) { + PRINTM(MFATAL, + "WLAN: FW download failure @ %d, invalid length %d\n", + offset, len); + ret = MLAN_STATUS_FAILURE; + goto done; + } + + txlen = len; + + if (len & MBIT(0)) { + i++; + if (i > MAX_WRITE_IOMEM_RETRY) { + PRINTM(MFATAL, + "WLAN: FW download failure @ %d, over max retry count\n", + offset); + ret = MLAN_STATUS_FAILURE; + goto done; + } + PRINTM(MERROR, + "WLAN: FW CRC error indicated by the helper:" + " len = 0x%04X, txlen = %d\n", len, txlen); + len &= ~MBIT(0); + + PRINTM(MERROR, "WLAN: retry: %d, offset %d\n", i, + offset); + DBG_HEXDUMP(MERROR, "WLAN: FW block:", mbuf.pbuf, len); + + /* Setting this to 0 to resend from same offset */ + txlen = 0; + } else { + i = 0; + + /* Set blocksize to transfer - checking for last block */ + if (firmwarelen && firmwarelen - offset < txlen) { + txlen = firmwarelen - offset; + } + PRINTM(MINFO, "."); + + tx_blocks = + (txlen + MLAN_SDIO_BLOCK_SIZE_FW_DNLD - + 1) / MLAN_SDIO_BLOCK_SIZE_FW_DNLD; + + /* Copy payload to buffer */ + if (firmware) + memmove(pmadapter, fwbuf, &firmware[offset], + txlen); + else + pcb->moal_get_fw_data(pmadapter->pmoal_handle, + offset, txlen, fwbuf); + } + + /* Send data */ + memset(pmadapter, &mbuf, 0, sizeof(mlan_buffer)); + mbuf.pbuf = (t_u8 *) fwbuf; + mbuf.data_len = tx_blocks * MLAN_SDIO_BLOCK_SIZE_FW_DNLD; + + ret = pcb->moal_write_data_sync(pmadapter->pmoal_handle, &mbuf, + pmadapter->ioport, 0); + if (ret != MLAN_STATUS_SUCCESS) { + PRINTM(MERROR, + "WLAN: FW download, write iomem (%d) failed @ %d\n", + i, offset); + if (pcb-> + moal_write_reg(pmadapter->pmoal_handle, + HOST_TO_CARD_EVENT_REG, + HOST_TERM_CMD53) != + MLAN_STATUS_SUCCESS) { + PRINTM(MERROR, "write CFG reg failed\n"); + } + ret = MLAN_STATUS_FAILURE; + goto done; + } + + offset += txlen; + } while (MTRUE); + + PRINTM(MMSG, "Wlan: FW download over, firmwarelen=%d downloaded %d\n", + firmwarelen, offset); + + ret = MLAN_STATUS_SUCCESS; +done: + if (tmpfwbuf) + pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) tmpfwbuf); + + LEAVE(); + return ret; } -/** +/** * @brief This function disables the host interrupts. - * + * * @param pmadapter A pointer to mlan_adapter structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ static mlan_status wlan_disable_host_int(pmlan_adapter pmadapter) { - mlan_status ret; + mlan_status ret; - ENTER(); - ret = wlan_sdio_disable_host_int_mask(pmadapter, HIM_DISABLE); - LEAVE(); - return ret; + ENTER(); + ret = wlan_sdio_disable_host_int_mask(pmadapter, HIM_DISABLE); + LEAVE(); + return ret; } -/** - * @brief This function decodes the rx packet & +/** + * @brief This function decodes the rx packet & * calls corresponding handlers according to the packet type - * + * * @param pmadapter A pointer to mlan_adapter structure * @param pmbuf A pointer to the SDIO data/cmd buffer * @param upld_typ Type of rx packet @@ -646,85 +669,91 @@ wlan_disable_host_int(pmlan_adapter pmadapter) */ static mlan_status wlan_decode_rx_packet(mlan_adapter * pmadapter, mlan_buffer * pmbuf, - t_u32 upld_typ) + t_u32 upld_typ) { - t_u8 *cmdBuf; - t_u32 event; - - ENTER(); - - switch (upld_typ) { - case MLAN_TYPE_DATA: - PRINTM(MINFO, "--- Rx: Data packet ---\n"); - pmbuf->data_len = (pmadapter->upld_len - INTF_HEADER_LEN); - pmbuf->data_offset += INTF_HEADER_LEN; - wlan_handle_rx_packet(pmadapter, pmbuf); - pmadapter->data_received = MTRUE; - break; - - case MLAN_TYPE_CMD: - PRINTM(MINFO, "--- Rx: Cmd Response ---\n"); - /* take care of curr_cmd = NULL case */ - if (!pmadapter->curr_cmd) { - cmdBuf = pmadapter->upld_buf; - if (pmadapter->ps_state == PS_STATE_SLEEP_CFM) { - wlan_process_sleep_confirm_resp(pmadapter, - pmbuf->pbuf + - pmbuf->data_offset + - INTF_HEADER_LEN, - pmadapter->upld_len - - INTF_HEADER_LEN); - } - pmadapter->upld_len -= INTF_HEADER_LEN; - memcpy(pmadapter, cmdBuf, - pmbuf->pbuf + pmbuf->data_offset + INTF_HEADER_LEN, - MIN(MRVDRV_SIZE_OF_CMD_BUFFER, - pmadapter->upld_len - INTF_HEADER_LEN)); - wlan_free_mlan_buffer(pmadapter, pmbuf); - } else { - pmadapter->cmd_resp_received = MTRUE; - pmadapter->upld_len -= INTF_HEADER_LEN; - pmbuf->data_len = pmadapter->upld_len; - pmbuf->data_offset += INTF_HEADER_LEN; - pmadapter->curr_cmd->respbuf = pmbuf; - } - break; - - case MLAN_TYPE_EVENT: - PRINTM(MINFO, "--- Rx: Event ---\n"); - event = *(t_u32 *) & pmbuf->pbuf[pmbuf->data_offset + INTF_HEADER_LEN]; - pmadapter->event_cause = wlan_le32_to_cpu(event); - if ((pmadapter->upld_len > MLAN_EVENT_HEADER_LEN) && - ((pmadapter->upld_len - MLAN_EVENT_HEADER_LEN) < MAX_EVENT_SIZE)) { - memcpy(pmadapter, pmadapter->event_body, - pmbuf->pbuf + pmbuf->data_offset + MLAN_EVENT_HEADER_LEN, - pmadapter->upld_len - MLAN_EVENT_HEADER_LEN); - } - - /* event cause has been saved to adapter->event_cause */ - pmadapter->event_received = MTRUE; - pmbuf->data_len = pmadapter->upld_len; - pmadapter->pmlan_buffer_event = pmbuf; - - /* remove SDIO header */ - pmbuf->data_offset += INTF_HEADER_LEN; - pmbuf->data_len -= INTF_HEADER_LEN; - break; - - default: - PRINTM(MERROR, "SDIO unknown upload type = 0x%x\n", upld_typ); - wlan_free_mlan_buffer(pmadapter, pmbuf); - break; - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + t_u8 *cmdBuf; + t_u32 event; + + ENTER(); + + switch (upld_typ) { + case MLAN_TYPE_DATA: + PRINTM(MINFO, "--- Rx: Data packet ---\n"); + pmbuf->data_len = (pmadapter->upld_len - INTF_HEADER_LEN); + pmbuf->data_offset += INTF_HEADER_LEN; + wlan_handle_rx_packet(pmadapter, pmbuf); + pmadapter->data_received = MTRUE; + break; + + case MLAN_TYPE_CMD: + PRINTM(MINFO, "--- Rx: Cmd Response ---\n"); + /* take care of curr_cmd = NULL case */ + if (!pmadapter->curr_cmd) { + cmdBuf = pmadapter->upld_buf; + if (pmadapter->ps_state == PS_STATE_SLEEP_CFM) { + wlan_process_sleep_confirm_resp(pmadapter, + pmbuf->pbuf + + pmbuf-> + data_offset + + INTF_HEADER_LEN, + pmadapter-> + upld_len - + INTF_HEADER_LEN); + } + pmadapter->upld_len -= INTF_HEADER_LEN; + memcpy(pmadapter, cmdBuf, + pmbuf->pbuf + pmbuf->data_offset + + INTF_HEADER_LEN, MIN(MRVDRV_SIZE_OF_CMD_BUFFER, + pmadapter->upld_len - + INTF_HEADER_LEN)); + wlan_free_mlan_buffer(pmadapter, pmbuf); + } else { + pmadapter->cmd_resp_received = MTRUE; + pmadapter->upld_len -= INTF_HEADER_LEN; + pmbuf->data_len = pmadapter->upld_len; + pmbuf->data_offset += INTF_HEADER_LEN; + pmadapter->curr_cmd->respbuf = pmbuf; + } + break; + + case MLAN_TYPE_EVENT: + PRINTM(MINFO, "--- Rx: Event ---\n"); + event = *(t_u32 *) & pmbuf->pbuf[pmbuf->data_offset + + INTF_HEADER_LEN]; + pmadapter->event_cause = wlan_le32_to_cpu(event); + if ((pmadapter->upld_len > MLAN_EVENT_HEADER_LEN) && + ((pmadapter->upld_len - MLAN_EVENT_HEADER_LEN) < + MAX_EVENT_SIZE)) { + memcpy(pmadapter, pmadapter->event_body, + pmbuf->pbuf + pmbuf->data_offset + + MLAN_EVENT_HEADER_LEN, + pmadapter->upld_len - MLAN_EVENT_HEADER_LEN); + } + + /* event cause has been saved to adapter->event_cause */ + pmadapter->event_received = MTRUE; + pmbuf->data_len = pmadapter->upld_len; + pmadapter->pmlan_buffer_event = pmbuf; + + /* remove SDIO header */ + pmbuf->data_offset += INTF_HEADER_LEN; + pmbuf->data_len -= INTF_HEADER_LEN; + break; + + default: + PRINTM(MERROR, "SDIO unknown upload type = 0x%x\n", upld_typ); + wlan_free_mlan_buffer(pmadapter, pmbuf); + break; + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } #ifdef SDIO_MULTI_PORT_RX_AGGR -/** +/** * @brief This function receives data from the card in aggregate mode. - * + * * @param pmadapter A pointer to mlan_adapter structure * @param pmbuf A pointer to the SDIO data/cmd buffer * @param port Current port on which packet needs to be rxed @@ -733,187 +762,194 @@ wlan_decode_rx_packet(mlan_adapter * pmadapter, mlan_buffer * pmbuf, */ static mlan_status wlan_sdio_card_to_host_mp_aggr(mlan_adapter * pmadapter, mlan_buffer - * pmbuf, t_u8 port, t_u16 rx_len) + * pmbuf, t_u8 port, t_u16 rx_len) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_callbacks pcb = &pmadapter->callbacks; - t_s32 f_do_rx_aggr = 0; - t_s32 f_do_rx_cur = 0; - t_s32 f_aggr_cur = 0; - mlan_buffer mbuf_aggr; - mlan_buffer *mbuf_deaggr; - t_u32 pind = 0; - t_u32 pkt_len, pkt_type = 0; - t_u8 *curr_ptr; - t_u32 cmd53_port = 0; - t_u32 port_count = 0; - - ENTER(); - - if (!pmadapter->mpa_rx.enabled) { - PRINTM(MINFO, "card_2_host_mp_aggr: rx aggregation disabled !\n"); - - f_do_rx_cur = 1; - goto rx_curr_single; - } - - if (pmadapter->mp_rd_bitmap & DATA_PORT_MASK) { - /* Some more data RX pending */ - PRINTM(MINFO, "card_2_host_mp_aggr: Not last packet\n"); - - if (MP_RX_AGGR_IN_PROGRESS(pmadapter)) { - if (MP_RX_AGGR_BUF_HAS_ROOM(pmadapter, rx_len)) { - f_aggr_cur = 1; - } else { - /* No room in Aggr buf, do rx aggr now */ - f_do_rx_aggr = 1; - f_do_rx_cur = 1; - } - } else { - /* Rx aggr not in progress */ - f_aggr_cur = 1; - } - - } else { - /* No more data RX pending */ - PRINTM(MINFO, "card_2_host_mp_aggr: Last packet\n"); - - if (MP_RX_AGGR_IN_PROGRESS(pmadapter)) { - f_do_rx_aggr = 1; - if (MP_RX_AGGR_BUF_HAS_ROOM(pmadapter, rx_len)) { - f_aggr_cur = 1; - } else { - /* No room in Aggr buf, do rx aggr now */ - f_do_rx_cur = 1; - } - } else { - f_do_rx_cur = 1; - } - - } - - if (f_aggr_cur) { - PRINTM(MINFO, "Current packet aggregation.\n"); - /* Curr pkt can be aggregated */ - MP_RX_AGGR_SETUP(pmadapter, pmbuf, port, rx_len); - - if (MP_RX_AGGR_PKT_LIMIT_REACHED(pmadapter) || - MP_RX_AGGR_PORT_LIMIT_REACHED(pmadapter)) { - PRINTM(MINFO, - "card_2_host_mp_aggr: Aggregation Packet limit reached\n"); - /* No more pkts allowed in Aggr buf, rx it */ - f_do_rx_aggr = 1; - } - } - - if (f_do_rx_aggr) { - /* do aggr RX now */ - PRINTM(MINFO, "do_rx_aggr: num of packets: %d\n", - pmadapter->mpa_rx.pkt_cnt); - - memset(pmadapter, &mbuf_aggr, 0, sizeof(mlan_buffer)); - - mbuf_aggr.pbuf = (t_u8 *) pmadapter->mpa_rx.buf; - mbuf_aggr.data_len = pmadapter->mpa_rx.buf_len; - port_count = bitcount(pmadapter->mpa_rx.ports) - 1; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_callbacks pcb = &pmadapter->callbacks; + t_s32 f_do_rx_aggr = 0; + t_s32 f_do_rx_cur = 0; + t_s32 f_aggr_cur = 0; + mlan_buffer mbuf_aggr; + mlan_buffer *mbuf_deaggr; + t_u32 pind = 0; + t_u32 pkt_len, pkt_type = 0; + t_u8 *curr_ptr; + t_u32 cmd53_port = 0; + t_u32 port_count = 0; + + ENTER(); + + if (!pmadapter->mpa_rx.enabled) { + PRINTM(MINFO, + "card_2_host_mp_aggr: rx aggregation disabled !\n"); + + f_do_rx_cur = 1; + goto rx_curr_single; + } + + if (pmadapter->mp_rd_bitmap & DATA_PORT_MASK) { + /* Some more data RX pending */ + PRINTM(MINFO, "card_2_host_mp_aggr: Not last packet\n"); + + if (MP_RX_AGGR_IN_PROGRESS(pmadapter)) { + if (MP_RX_AGGR_BUF_HAS_ROOM(pmadapter, rx_len)) { + f_aggr_cur = 1; + } else { + /* No room in Aggr buf, do rx aggr now */ + f_do_rx_aggr = 1; + f_do_rx_cur = 1; + } + } else { + /* Rx aggr not in progress */ + f_aggr_cur = 1; + } + + } else { + /* No more data RX pending */ + PRINTM(MINFO, "card_2_host_mp_aggr: Last packet\n"); + + if (MP_RX_AGGR_IN_PROGRESS(pmadapter)) { + f_do_rx_aggr = 1; + if (MP_RX_AGGR_BUF_HAS_ROOM(pmadapter, rx_len)) { + f_aggr_cur = 1; + } else { + /* No room in Aggr buf, do rx aggr now */ + f_do_rx_cur = 1; + } + } else { + f_do_rx_cur = 1; + } + + } + + if (f_aggr_cur) { + PRINTM(MINFO, "Current packet aggregation.\n"); + /* Curr pkt can be aggregated */ + MP_RX_AGGR_SETUP(pmadapter, pmbuf, port, rx_len); + + if (MP_RX_AGGR_PKT_LIMIT_REACHED(pmadapter) || + MP_RX_AGGR_PORT_LIMIT_REACHED(pmadapter)) { + PRINTM(MINFO, + "card_2_host_mp_aggr: Aggregation Packet limit reached\n"); + /* No more pkts allowed in Aggr buf, rx it */ + f_do_rx_aggr = 1; + } + } + + if (f_do_rx_aggr) { + /* do aggr RX now */ + PRINTM(MINFO, "do_rx_aggr: num of packets: %d\n", + pmadapter->mpa_rx.pkt_cnt); + + memset(pmadapter, &mbuf_aggr, 0, sizeof(mlan_buffer)); + + mbuf_aggr.pbuf = (t_u8 *) pmadapter->mpa_rx.buf; + mbuf_aggr.data_len = pmadapter->mpa_rx.buf_len; + port_count = bitcount(pmadapter->mpa_rx.ports) - 1; // port_count = pmadapter->mpa_rx.pkt_cnt - 1; - cmd53_port = - (pmadapter->ioport | SDIO_MPA_ADDR_BASE | (port_count << 8)) - + pmadapter->mpa_rx.start_port; - if (MLAN_STATUS_SUCCESS != - pcb->moal_read_data_sync(pmadapter->pmoal_handle, &mbuf_aggr, - cmd53_port, 0)) { - pmbuf->status_code = MLAN_ERROR_DATA_RX_FAIL; - ret = MLAN_STATUS_FAILURE; - goto done; - } - - DBG_HEXDUMP(MIF_D, "SDIO MP-A Blk Rd", pmadapter->mpa_rx.buf, - MIN(pmadapter->mpa_rx.buf_len, MAX_DATA_DUMP_LEN)); - - curr_ptr = pmadapter->mpa_rx.buf; - - for (pind = 0; pind < pmadapter->mpa_rx.pkt_cnt; pind++) { - - /* get curr PKT len & type */ - pkt_len = wlan_le16_to_cpu(*(t_u16 *) & curr_ptr[0]); - pkt_type = wlan_le16_to_cpu(*(t_u16 *) & curr_ptr[2]); - - PRINTM(MINFO, "RX: [%d] pktlen: %d pkt_type: 0x%x\n", pind, - pkt_len, pkt_type); - - /* copy pkt to deaggr buf */ - mbuf_deaggr = pmadapter->mpa_rx.mbuf_arr[pind]; - if ((pkt_type == MLAN_TYPE_DATA) && - (pkt_len <= pmadapter->mpa_rx.len_arr[pind])) { - memcpy(pmadapter, mbuf_deaggr->pbuf + mbuf_deaggr->data_offset, - curr_ptr, pkt_len); - pmadapter->upld_len = pkt_len; - /* Process de-aggr packet */ - wlan_decode_rx_packet(pmadapter, mbuf_deaggr, pkt_type); - } else { - PRINTM(MERROR, - "Wrong aggr packet: type=%d, len=%d, max_len=%d\n", - pkt_type, pkt_len, pmadapter->mpa_rx.len_arr[pind]); - wlan_free_mlan_buffer(pmadapter, mbuf_deaggr); - } - curr_ptr += pmadapter->mpa_rx.len_arr[pind]; - } - MP_RX_AGGR_BUF_RESET(pmadapter); - } - - rx_curr_single: - if (f_do_rx_cur) { - PRINTM(MINFO, "RX: f_do_rx_cur: port: %d rx_len: %d\n", port, rx_len); - - if (MLAN_STATUS_SUCCESS != wlan_sdio_card_to_host(pmadapter, &pkt_type, - (t_u32 *) & - pmadapter->upld_len, - pmbuf, rx_len, - pmadapter->ioport + - port)) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - if (pkt_type != MLAN_TYPE_DATA) { - PRINTM(MERROR, - "receive a wrong pkt from DATA PORT: type=%d, len=%dd\n", - pkt_type, pmbuf->data_len); - pmbuf->status_code = MLAN_ERROR_DATA_RX_FAIL; - ret = MLAN_STATUS_FAILURE; - goto done; - } - wlan_decode_rx_packet(pmadapter, pmbuf, pkt_type); - } - - done: - if (ret == MLAN_STATUS_FAILURE) { - if (MP_RX_AGGR_IN_PROGRESS(pmadapter)) { - /* MP-A transfer failed - cleanup */ - for (pind = 0; pind < pmadapter->mpa_rx.pkt_cnt; pind++) { - wlan_free_mlan_buffer(pmadapter, - pmadapter->mpa_rx.mbuf_arr[pind]); - } - MP_RX_AGGR_BUF_RESET(pmadapter); - } - - if (f_do_rx_cur) { - /* Single Transfer pending */ - /* Free curr buff also */ - wlan_free_mlan_buffer(pmadapter, pmbuf); - } - } - - LEAVE(); - return ret; + cmd53_port = + (pmadapter-> + ioport | SDIO_MPA_ADDR_BASE | (port_count << 8)) + + pmadapter->mpa_rx.start_port; + if (MLAN_STATUS_SUCCESS != + pcb->moal_read_data_sync(pmadapter->pmoal_handle, + &mbuf_aggr, cmd53_port, 0)) { + pmbuf->status_code = MLAN_ERROR_DATA_RX_FAIL; + ret = MLAN_STATUS_FAILURE; + goto done; + } + + DBG_HEXDUMP(MIF_D, "SDIO MP-A Blk Rd", pmadapter->mpa_rx.buf, + MIN(pmadapter->mpa_rx.buf_len, MAX_DATA_DUMP_LEN)); + + curr_ptr = pmadapter->mpa_rx.buf; + + for (pind = 0; pind < pmadapter->mpa_rx.pkt_cnt; pind++) { + + /* get curr PKT len & type */ + pkt_len = wlan_le16_to_cpu(*(t_u16 *) & curr_ptr[0]); + pkt_type = wlan_le16_to_cpu(*(t_u16 *) & curr_ptr[2]); + + PRINTM(MINFO, "RX: [%d] pktlen: %d pkt_type: 0x%x\n", + pind, pkt_len, pkt_type); + + /* copy pkt to deaggr buf */ + mbuf_deaggr = pmadapter->mpa_rx.mbuf_arr[pind]; + if ((pkt_type == MLAN_TYPE_DATA) && + (pkt_len <= pmadapter->mpa_rx.len_arr[pind])) { + memcpy(pmadapter, + mbuf_deaggr->pbuf + + mbuf_deaggr->data_offset, curr_ptr, + pkt_len); + pmadapter->upld_len = pkt_len; + /* Process de-aggr packet */ + wlan_decode_rx_packet(pmadapter, mbuf_deaggr, + pkt_type); + } else { + PRINTM(MERROR, + "Wrong aggr packet: type=%d, len=%d, max_len=%d\n", + pkt_type, pkt_len, + pmadapter->mpa_rx.len_arr[pind]); + wlan_free_mlan_buffer(pmadapter, mbuf_deaggr); + } + curr_ptr += pmadapter->mpa_rx.len_arr[pind]; + } + MP_RX_AGGR_BUF_RESET(pmadapter); + } + +rx_curr_single: + if (f_do_rx_cur) { + PRINTM(MINFO, "RX: f_do_rx_cur: port: %d rx_len: %d\n", port, + rx_len); + + if (MLAN_STATUS_SUCCESS != + wlan_sdio_card_to_host(pmadapter, &pkt_type, + (t_u32 *) & pmadapter->upld_len, + pmbuf, rx_len, + pmadapter->ioport + port)) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + if (pkt_type != MLAN_TYPE_DATA) { + PRINTM(MERROR, + "receive a wrong pkt from DATA PORT: type=%d, len=%dd\n", + pkt_type, pmbuf->data_len); + pmbuf->status_code = MLAN_ERROR_DATA_RX_FAIL; + ret = MLAN_STATUS_FAILURE; + goto done; + } + wlan_decode_rx_packet(pmadapter, pmbuf, pkt_type); + } + +done: + if (ret == MLAN_STATUS_FAILURE) { + if (MP_RX_AGGR_IN_PROGRESS(pmadapter)) { + /* MP-A transfer failed - cleanup */ + for (pind = 0; pind < pmadapter->mpa_rx.pkt_cnt; pind++) { + wlan_free_mlan_buffer(pmadapter, + pmadapter->mpa_rx. + mbuf_arr[pind]); + } + MP_RX_AGGR_BUF_RESET(pmadapter); + } + + if (f_do_rx_cur) { + /* Single Transfer pending */ + /* Free curr buff also */ + wlan_free_mlan_buffer(pmadapter, pmbuf); + } + } + + LEAVE(); + return ret; } #endif #ifdef SDIO_MULTI_PORT_TX_AGGR -/** +/** * @brief This function sends data to the card in SDIO aggregated mode. - * + * * @param pmadapter A pointer to mlan_adapter structure * @param mbuf A pointer to the SDIO data/cmd buffer * @param port current port for aggregation @@ -922,124 +958,137 @@ wlan_sdio_card_to_host_mp_aggr(mlan_adapter * pmadapter, mlan_buffer */ static mlan_status wlan_host_to_card_mp_aggr(mlan_adapter * pmadapter, mlan_buffer * mbuf, - t_u8 port, t_u32 next_pkt_len) + t_u8 port, t_u32 next_pkt_len) { - mlan_status ret = MLAN_STATUS_SUCCESS; - t_s32 f_send_aggr_buf = 0; - t_s32 f_send_cur_buf = 0; - t_s32 f_precopy_cur_buf = 0; - t_s32 f_postcopy_cur_buf = 0; - t_u32 cmd53_port = 0; - t_u32 port_count = 0; - mlan_buffer mbuf_aggr; - - ENTER(); - - PRINTM(MIF_D, "host_2_card_mp_aggr: next_pkt_len: %d curr_port:%d\n", - next_pkt_len, port); - - if (!pmadapter->mpa_tx.enabled) { - PRINTM(MINFO, "host_2_card_mp_aggr: tx aggregation disabled !\n"); - - f_send_cur_buf = 1; - goto tx_curr_single; - } - - if (next_pkt_len) { - /* More pkt in TX queue */ - PRINTM(MINFO, "host_2_card_mp_aggr: More packets in Queue.\n"); - - if (MP_TX_AGGR_IN_PROGRESS(pmadapter)) { - if (!MP_TX_AGGR_PORT_LIMIT_REACHED(pmadapter) && - MP_TX_AGGR_BUF_HAS_ROOM(pmadapter, mbuf, mbuf->data_len)) { - f_precopy_cur_buf = 1; - - if (!(pmadapter->mp_wr_bitmap & (1 << pmadapter->curr_wr_port)) - || !MP_TX_AGGR_BUF_HAS_ROOM(pmadapter, mbuf, - mbuf->data_len + - next_pkt_len)) { - f_send_aggr_buf = 1; - } - } else { - /* No room in Aggr buf, send it */ - f_send_aggr_buf = 1; - - if (MP_TX_AGGR_PORT_LIMIT_REACHED(pmadapter) || - !(pmadapter-> - mp_wr_bitmap & (1 << pmadapter->curr_wr_port))) { - f_send_cur_buf = 1; - } else { - f_postcopy_cur_buf = 1; - } - } - } else { - if (MP_TX_AGGR_BUF_HAS_ROOM(pmadapter, mbuf, mbuf->data_len) && - (pmadapter->mp_wr_bitmap & (1 << pmadapter->curr_wr_port))) - f_precopy_cur_buf = 1; - else - f_send_cur_buf = 1; - } - } else { - /* Last pkt in TX queue */ - PRINTM(MINFO, "host_2_card_mp_aggr: Last packet in Tx Queue.\n"); - - if (MP_TX_AGGR_IN_PROGRESS(pmadapter)) { - /* some packs in Aggr buf already */ - f_send_aggr_buf = 1; - - if (MP_TX_AGGR_BUF_HAS_ROOM(pmadapter, mbuf, mbuf->data_len)) { - f_precopy_cur_buf = 1; - } else { - /* No room in Aggr buf, send it */ - f_send_cur_buf = 1; - } - } else { - f_send_cur_buf = 1; - } - } - - if (f_precopy_cur_buf) { - PRINTM(MINFO, "host_2_card_mp_aggr: Precopy current buffer\n"); - MP_TX_AGGR_BUF_PUT(pmadapter, mbuf, port); - - if (MP_TX_AGGR_PKT_LIMIT_REACHED(pmadapter) || - MP_TX_AGGR_PORT_LIMIT_REACHED(pmadapter)) { - PRINTM(MIF_D, - "host_2_card_mp_aggr: Aggregation Pkt limit reached\n"); - /* No more pkts allowed in Aggr buf, send it */ - f_send_aggr_buf = 1; - } - } - - if (f_send_aggr_buf) { - PRINTM(MINFO, "host_2_card_mp_aggr: Send aggregation buffer." - "%d %d\n", pmadapter->mpa_tx.start_port, - pmadapter->mpa_tx.ports); - - memset(pmadapter, &mbuf_aggr, 0, sizeof(mlan_buffer)); - - mbuf_aggr.pbuf = (t_u8 *) pmadapter->mpa_tx.buf; - mbuf_aggr.data_len = pmadapter->mpa_tx.buf_len; - port_count = bitcount(pmadapter->mpa_tx.ports) - 1; - cmd53_port = - (pmadapter->ioport | SDIO_MPA_ADDR_BASE | (port_count << 8)) - + pmadapter->mpa_tx.start_port; - ret = wlan_write_data_sync(pmadapter, &mbuf_aggr, cmd53_port); - MP_TX_AGGR_BUF_RESET(pmadapter); - } - - tx_curr_single: - if (f_send_cur_buf) { - PRINTM(MINFO, "host_2_card_mp_aggr: writing to port #%d\n", port); - ret = wlan_write_data_sync(pmadapter, mbuf, pmadapter->ioport + port); - } - if (f_postcopy_cur_buf) { - PRINTM(MINFO, "host_2_card_mp_aggr: Postcopy current buffer\n"); - MP_TX_AGGR_BUF_PUT(pmadapter, mbuf, port); - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_s32 f_send_aggr_buf = 0; + t_s32 f_send_cur_buf = 0; + t_s32 f_precopy_cur_buf = 0; + t_s32 f_postcopy_cur_buf = 0; + t_u32 cmd53_port = 0; + t_u32 port_count = 0; + mlan_buffer mbuf_aggr; + + ENTER(); + + PRINTM(MIF_D, "host_2_card_mp_aggr: next_pkt_len: %d curr_port:%d\n", + next_pkt_len, port); + + if (!pmadapter->mpa_tx.enabled) { + PRINTM(MINFO, + "host_2_card_mp_aggr: tx aggregation disabled !\n"); + + f_send_cur_buf = 1; + goto tx_curr_single; + } + + if (next_pkt_len) { + /* More pkt in TX queue */ + PRINTM(MINFO, "host_2_card_mp_aggr: More packets in Queue.\n"); + + if (MP_TX_AGGR_IN_PROGRESS(pmadapter)) { + if (!MP_TX_AGGR_PORT_LIMIT_REACHED(pmadapter) && + MP_TX_AGGR_BUF_HAS_ROOM(pmadapter, mbuf, + mbuf->data_len)) { + f_precopy_cur_buf = 1; + + if (! + (pmadapter-> + mp_wr_bitmap & (1 << pmadapter-> + curr_wr_port)) || + !MP_TX_AGGR_BUF_HAS_ROOM(pmadapter, mbuf, + mbuf->data_len + + next_pkt_len)) { + f_send_aggr_buf = 1; + } + } else { + /* No room in Aggr buf, send it */ + f_send_aggr_buf = 1; + + if (MP_TX_AGGR_PORT_LIMIT_REACHED(pmadapter) || + !(pmadapter-> + mp_wr_bitmap & (1 << pmadapter-> + curr_wr_port))) { + f_send_cur_buf = 1; + } else { + f_postcopy_cur_buf = 1; + } + } + } else { + if (MP_TX_AGGR_BUF_HAS_ROOM + (pmadapter, mbuf, mbuf->data_len) && + (pmadapter-> + mp_wr_bitmap & (1 << pmadapter->curr_wr_port))) + f_precopy_cur_buf = 1; + else + f_send_cur_buf = 1; + } + } else { + /* Last pkt in TX queue */ + PRINTM(MINFO, + "host_2_card_mp_aggr: Last packet in Tx Queue.\n"); + + if (MP_TX_AGGR_IN_PROGRESS(pmadapter)) { + /* some packs in Aggr buf already */ + f_send_aggr_buf = 1; + + if (MP_TX_AGGR_BUF_HAS_ROOM + (pmadapter, mbuf, mbuf->data_len)) { + f_precopy_cur_buf = 1; + } else { + /* No room in Aggr buf, send it */ + f_send_cur_buf = 1; + } + } else { + f_send_cur_buf = 1; + } + } + + if (f_precopy_cur_buf) { + PRINTM(MINFO, "host_2_card_mp_aggr: Precopy current buffer\n"); + MP_TX_AGGR_BUF_PUT(pmadapter, mbuf, port); + + if (MP_TX_AGGR_PKT_LIMIT_REACHED(pmadapter) || + MP_TX_AGGR_PORT_LIMIT_REACHED(pmadapter)) { + PRINTM(MIF_D, + "host_2_card_mp_aggr: Aggregation Pkt limit reached\n"); + /* No more pkts allowed in Aggr buf, send it */ + f_send_aggr_buf = 1; + } + } + + if (f_send_aggr_buf) { + PRINTM(MINFO, "host_2_card_mp_aggr: Send aggregation buffer." + "%d %d\n", pmadapter->mpa_tx.start_port, + pmadapter->mpa_tx.ports); + + memset(pmadapter, &mbuf_aggr, 0, sizeof(mlan_buffer)); + + mbuf_aggr.pbuf = (t_u8 *) pmadapter->mpa_tx.buf; + mbuf_aggr.data_len = pmadapter->mpa_tx.buf_len; + port_count = bitcount(pmadapter->mpa_tx.ports) - 1; + cmd53_port = + (pmadapter-> + ioport | SDIO_MPA_ADDR_BASE | (port_count << 8)) + + pmadapter->mpa_tx.start_port; + ret = wlan_write_data_sync(pmadapter, &mbuf_aggr, cmd53_port); + MP_TX_AGGR_BUF_RESET(pmadapter); + } + +tx_curr_single: + if (f_send_cur_buf) { + PRINTM(MINFO, "host_2_card_mp_aggr: writing to port #%d\n", + port); + ret = wlan_write_data_sync(pmadapter, mbuf, + pmadapter->ioport + port); + } + if (f_postcopy_cur_buf) { + PRINTM(MINFO, "host_2_card_mp_aggr: Postcopy current buffer\n"); + MP_TX_AGGR_BUF_PUT(pmadapter, mbuf, port); + } + + LEAVE(); + return ret; } #endif /* SDIO_MULTI_PORT_TX_AGGR */ @@ -1047,41 +1096,41 @@ wlan_host_to_card_mp_aggr(mlan_adapter * pmadapter, mlan_buffer * mbuf, Global functions ********************************************************/ -/** +/** * @brief This function checks if the interface is ready to download * or not while other download interface is present - * + * * @param pmadapter A pointer to mlan_adapter structure * @param val Winner status (0: winner) * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE - * + * */ mlan_status wlan_check_winner_status(mlan_adapter * pmadapter, t_u32 * val) { - t_u32 winner = 0; - pmlan_callbacks pcb; + t_u32 winner = 0; + pmlan_callbacks pcb; - ENTER(); + ENTER(); - pcb = &pmadapter->callbacks; + pcb = &pmadapter->callbacks; - if (MLAN_STATUS_SUCCESS != - pcb->moal_read_reg(pmadapter->pmoal_handle, CARD_FW_STATUS0_REG, - &winner)) { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - *val = winner; + if (MLAN_STATUS_SUCCESS != + pcb->moal_read_reg(pmadapter->pmoal_handle, CARD_FW_STATUS0_REG, + &winner)) { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + *val = winner; - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function checks if the firmware is ready to accept * command or not. - * + * * @param pmadapter A pointer to mlan_adapter structure * @param pollnum Maximum polling number * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -1089,32 +1138,32 @@ wlan_check_winner_status(mlan_adapter * pmadapter, t_u32 * val) mlan_status wlan_check_fw_status(mlan_adapter * pmadapter, t_u32 pollnum) { - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u16 firmwarestat; - t_u32 tries; - - ENTER(); - - /* Wait for firmware initialization event */ - for (tries = 0; tries < pollnum; tries++) { - if (MLAN_STATUS_SUCCESS != - (ret = wlan_sdio_read_fw_status(pmadapter, &firmwarestat))) - continue; - if (firmwarestat == FIRMWARE_READY) { - ret = MLAN_STATUS_SUCCESS; - break; - } else { - wlan_mdelay(pmadapter, 100); - ret = MLAN_STATUS_FAILURE; - } - } - - if (ret != MLAN_STATUS_SUCCESS) - goto done; - - done: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u16 firmwarestat; + t_u32 tries; + + ENTER(); + + /* Wait for firmware initialization event */ + for (tries = 0; tries < pollnum; tries++) { + if (MLAN_STATUS_SUCCESS != + (ret = wlan_sdio_read_fw_status(pmadapter, &firmwarestat))) + continue; + if (firmwarestat == FIRMWARE_READY) { + ret = MLAN_STATUS_SUCCESS; + break; + } else { + wlan_mdelay(pmadapter, 100); + ret = MLAN_STATUS_FAILURE; + } + } + + if (ret != MLAN_STATUS_SUCCESS) + goto done; + +done: + LEAVE(); + return ret; } /** @@ -1128,323 +1177,347 @@ wlan_check_fw_status(mlan_adapter * pmadapter, t_u32 pollnum) mlan_status wlan_dnld_fw(IN pmlan_adapter pmadapter, IN pmlan_fw_image pmfw) { - mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_status ret = MLAN_STATUS_SUCCESS; - ENTER(); + ENTER(); - /* Download the firmware image via helper */ - ret = wlan_prog_fw_w_helper(pmadapter, pmfw); - if (ret != MLAN_STATUS_SUCCESS) { - LEAVE(); - return MLAN_STATUS_FAILURE; - } + /* Download the firmware image via helper */ + ret = wlan_prog_fw_w_helper(pmadapter, pmfw); + if (ret != MLAN_STATUS_SUCCESS) { + LEAVE(); + return MLAN_STATUS_FAILURE; + } - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief This function probes the driver - * + * * @param pmadapter A pointer to mlan_adapter structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ mlan_status wlan_sdio_probe(pmlan_adapter pmadapter) { - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u32 sdio_ireg = 0; - pmlan_callbacks pcb = &pmadapter->callbacks; - - ENTER(); - /* - * Read the HOST_INT_STATUS_REG for ACK the first interrupt got - * from the bootloader. If we don't do this we get a interrupt - * as soon as we register the irq. - */ - pcb->moal_read_reg(pmadapter->pmoal_handle, HOST_INT_STATUS_REG, - &sdio_ireg); - - /* Disable host interrupt mask register for SDIO */ - ret = wlan_disable_host_int(pmadapter); - if (ret != MLAN_STATUS_SUCCESS) { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - /* Get SDIO ioport */ - ret = wlan_sdio_init_ioport(pmadapter); - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u32 sdio_ireg = 0; + pmlan_callbacks pcb = &pmadapter->callbacks; + + ENTER(); + /* + * Read the HOST_INT_STATUS_REG for ACK the first interrupt got + * from the bootloader. If we don't do this we get a interrupt + * as soon as we register the irq. + */ + pcb->moal_read_reg(pmadapter->pmoal_handle, HOST_INT_STATUS_REG, + &sdio_ireg); + + /* Disable host interrupt mask register for SDIO */ + ret = wlan_disable_host_int(pmadapter); + if (ret != MLAN_STATUS_SUCCESS) { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + /* Get SDIO ioport */ + ret = wlan_sdio_init_ioport(pmadapter); + LEAVE(); + return ret; } -/** +/** * @brief This function gets interrupt status. - * + * * @param pmadapter A pointer to mlan_adapter structure * @return N/A */ t_void wlan_interrupt(pmlan_adapter pmadapter) { - pmlan_callbacks pcb = &pmadapter->callbacks; - mlan_buffer mbuf; - t_u32 sdio_ireg = 0; - - ENTER(); - memset(pmadapter, &mbuf, 0, sizeof(mlan_buffer)); - mbuf.pbuf = pmadapter->mp_regs; - mbuf.data_len = MAX_MP_REGS; - - if (MLAN_STATUS_SUCCESS != - pcb->moal_read_data_sync(pmadapter->pmoal_handle, &mbuf, - REG_PORT | MLAN_SDIO_BYTE_MODE_MASK, 0)) { - PRINTM(MERROR, "moal_read_data_sync: read registers failed\n"); - pmadapter->dbg.num_int_read_failure++; - goto done; - } - - DBG_HEXDUMP(MIF_D, "SDIO MP Registers", pmadapter->mp_regs, MAX_MP_REGS); - sdio_ireg = pmadapter->mp_regs[HOST_INT_STATUS_REG]; - pmadapter->dbg.last_int_status = pmadapter->sdio_ireg | sdio_ireg; - if (sdio_ireg) { - /* - * DN_LD_HOST_INT_STATUS and/or UP_LD_HOST_INT_STATUS - * DN_LD_CMD_PORT_HOST_INT_STATUS and/or - * UP_LD_CMD_PORT_HOST_INT_STATUS - * Clear the interrupt status register - */ - PRINTM(MINTR, "wlan_interrupt: sdio_ireg = 0x%x\n", sdio_ireg); - pcb->moal_spin_lock(pmadapter->pmoal_handle, pmadapter->pint_lock); - pmadapter->sdio_ireg |= sdio_ireg; - pcb->moal_spin_unlock(pmadapter->pmoal_handle, pmadapter->pint_lock); - } else { - PRINTM(MMSG, "wlan_interrupt: sdio_ireg = 0x%x\n", sdio_ireg); - } - done: - LEAVE(); + pmlan_callbacks pcb = &pmadapter->callbacks; + mlan_buffer mbuf; + t_u32 sdio_ireg = 0; + + ENTER(); + if (pmadapter->hs_activated == MTRUE && + pmadapter->pm_wakeup_card_req && !pmadapter->pm_wakeup_fw_try) { + PRINTM(MINTR, "Recv INTR in hs_actived, Wake up card first\n"); + wlan_pm_wakeup_card(pmadapter); + pmadapter->pm_wakeup_fw_try = MTRUE; + } + memset(pmadapter, &mbuf, 0, sizeof(mlan_buffer)); + mbuf.pbuf = pmadapter->mp_regs; + mbuf.data_len = MAX_MP_REGS; + + if (MLAN_STATUS_SUCCESS != + pcb->moal_read_data_sync(pmadapter->pmoal_handle, &mbuf, + REG_PORT | MLAN_SDIO_BYTE_MODE_MASK, 0)) { + PRINTM(MERROR, "moal_read_data_sync: read registers failed\n"); + pmadapter->dbg.num_int_read_failure++; + goto done; + } + + DBG_HEXDUMP(MIF_D, "SDIO MP Registers", pmadapter->mp_regs, + MAX_MP_REGS); + sdio_ireg = pmadapter->mp_regs[HOST_INT_STATUS_REG]; + pmadapter->dbg.last_int_status = pmadapter->sdio_ireg | sdio_ireg; + if (sdio_ireg) { + /* + * DN_LD_HOST_INT_STATUS and/or UP_LD_HOST_INT_STATUS + * DN_LD_CMD_PORT_HOST_INT_STATUS and/or + * UP_LD_CMD_PORT_HOST_INT_STATUS + * Clear the interrupt status register + */ + PRINTM(MINTR, "wlan_interrupt: sdio_ireg = 0x%x\n", sdio_ireg); + pcb->moal_spin_lock(pmadapter->pmoal_handle, + pmadapter->pint_lock); + pmadapter->sdio_ireg |= sdio_ireg; + pcb->moal_spin_unlock(pmadapter->pmoal_handle, + pmadapter->pint_lock); + } else { + PRINTM(MMSG, "wlan_interrupt: sdio_ireg = 0x%x\n", sdio_ireg); + } +done: + LEAVE(); } -/** +/** * @brief This function enables the host interrupts. - * + * * @param pmadapter A pointer to mlan_adapter structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ mlan_status wlan_enable_host_int(pmlan_adapter pmadapter) { - mlan_status ret; + mlan_status ret; - ENTER(); - ret = wlan_sdio_enable_host_int_mask(pmadapter, HIM_ENABLE); - LEAVE(); - return ret; + ENTER(); + ret = wlan_sdio_enable_host_int_mask(pmadapter, HIM_ENABLE); + LEAVE(); + return ret; } -/** +/** * @brief This function checks the interrupt status and handle it accordingly. - * + * * @param pmadapter A pointer to mlan_adapter structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ mlan_status wlan_process_int_status(mlan_adapter * pmadapter) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_callbacks pcb = &pmadapter->callbacks; - t_u8 sdio_ireg; - mlan_buffer *pmbuf = MNULL; - t_u8 port = 0; - t_u32 len_reg_l, len_reg_u; - t_u32 rx_blocks; - t_u32 ps_state = pmadapter->ps_state; - t_u16 rx_len; - t_u32 upld_typ = 0; - t_u32 cr = 0; - - ENTER(); - - pcb->moal_spin_lock(pmadapter->pmoal_handle, pmadapter->pint_lock); - sdio_ireg = pmadapter->sdio_ireg; - pmadapter->sdio_ireg = 0; - pcb->moal_spin_unlock(pmadapter->pmoal_handle, pmadapter->pint_lock); - - if (!sdio_ireg) - goto done; - /* check the command port */ - if (sdio_ireg & DN_LD_CMD_PORT_HOST_INT_STATUS) { - if (pmadapter->cmd_sent) - pmadapter->cmd_sent = MFALSE; - PRINTM(MINFO, "cmd_sent=%d\n", pmadapter->cmd_sent); - } - - if (sdio_ireg & UP_LD_CMD_PORT_HOST_INT_STATUS) { - /* read the len of control packet */ - rx_len = ((t_u16) pmadapter->mp_regs[CMD_RD_LEN_1]) << 8; - rx_len |= (t_u16) pmadapter->mp_regs[CMD_RD_LEN_0]; - PRINTM(MINFO, "RX: cmd port rx_len=%u\n", rx_len); - rx_blocks = (rx_len + MLAN_SDIO_BLOCK_SIZE - 1) / MLAN_SDIO_BLOCK_SIZE; - if (rx_len <= INTF_HEADER_LEN || - (rx_blocks * MLAN_SDIO_BLOCK_SIZE) > ALLOC_BUF_SIZE) { - PRINTM(MERROR, "invalid rx_len=%d\n", rx_len); - ret = MLAN_STATUS_FAILURE; - goto done; - } - rx_len = (t_u16) (rx_blocks * MLAN_SDIO_BLOCK_SIZE); - pmbuf = - wlan_alloc_mlan_buffer(pmadapter, rx_len, 0, MOAL_MALLOC_BUFFER); - if (pmbuf == MNULL) { - PRINTM(MERROR, "Failed to allocate 'mlan_buffer'\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - PRINTM(MINFO, "cmd rx buffer rx_len = %d\n", rx_len); - - /* Transfer data from card */ - if (MLAN_STATUS_SUCCESS != wlan_sdio_card_to_host(pmadapter, &upld_typ, - (t_u32 *) & - pmadapter->upld_len, - pmbuf, rx_len, - pmadapter-> - ioport | - CMD_PORT_SLCT)) { - pmadapter->dbg.num_cmdevt_card_to_host_failure++; - PRINTM(MERROR, "Card-to-host cmd failed: int status=0x%x\n", - sdio_ireg); - wlan_free_mlan_buffer(pmadapter, pmbuf); - ret = MLAN_STATUS_FAILURE; - goto term_cmd53; - } - - if ((upld_typ != MLAN_TYPE_CMD) && (upld_typ != MLAN_TYPE_EVENT)) - PRINTM(MERROR, "receive a wrong packet from CMD PORT. type =0x%d\n", - upld_typ); - - wlan_decode_rx_packet(pmadapter, pmbuf, upld_typ); - - /* We might receive data/sleep_cfm at the same time */ - /* reset data_receive flag to avoid ps_state change */ - if ((ps_state == PS_STATE_SLEEP_CFM) && - (pmadapter->ps_state == PS_STATE_SLEEP)) - pmadapter->data_received = MFALSE; - } - - if (sdio_ireg & DN_LD_HOST_INT_STATUS) { - pmadapter->mp_wr_bitmap = (t_u32) pmadapter->mp_regs[WR_BITMAP_L]; - pmadapter->mp_wr_bitmap |= - ((t_u32) pmadapter->mp_regs[WR_BITMAP_U]) << 8; - pmadapter->mp_wr_bitmap |= - ((t_u32) pmadapter->mp_regs[WR_BITMAP_1L]) << 16; - pmadapter->mp_wr_bitmap |= - ((t_u32) pmadapter->mp_regs[WR_BITMAP_1U]) << 24; - PRINTM(MINTR, "DNLD: wr_bitmap=0x%08x\n", pmadapter->mp_wr_bitmap); - if (pmadapter->data_sent && - (pmadapter->mp_wr_bitmap & pmadapter->mp_data_port_mask)) { - PRINTM(MINFO, " <--- Tx DONE Interrupt --->\n"); - pmadapter->data_sent = MFALSE; - } - } - - if (sdio_ireg & UP_LD_HOST_INT_STATUS) { - pmadapter->mp_rd_bitmap = (t_u32) pmadapter->mp_regs[RD_BITMAP_L]; - pmadapter->mp_rd_bitmap |= - ((t_u32) pmadapter->mp_regs[RD_BITMAP_U]) << 8; - pmadapter->mp_rd_bitmap |= - ((t_u32) pmadapter->mp_regs[RD_BITMAP_1L]) << 16; - pmadapter->mp_rd_bitmap |= - ((t_u32) pmadapter->mp_regs[RD_BITMAP_1U]) << 24; - PRINTM(MINTR, "UPLD: rd_bitmap=0x%08x\n", pmadapter->mp_rd_bitmap); - - while (MTRUE) { - ret = wlan_get_rd_port(pmadapter, &port); - if (ret != MLAN_STATUS_SUCCESS) { - PRINTM(MINFO, "no more rd_port to be handled\n"); - break; - } - len_reg_l = RD_LEN_P0_L + (port << 1); - len_reg_u = RD_LEN_P0_U + (port << 1); - rx_len = ((t_u16) pmadapter->mp_regs[len_reg_u]) << 8; - rx_len |= (t_u16) pmadapter->mp_regs[len_reg_l]; - PRINTM(MINFO, "RX: port=%d rx_len=%u\n", port, rx_len); - rx_blocks = - (rx_len + MLAN_SDIO_BLOCK_SIZE - 1) / MLAN_SDIO_BLOCK_SIZE; - if (rx_len <= INTF_HEADER_LEN || - (rx_blocks * MLAN_SDIO_BLOCK_SIZE) > ALLOC_BUF_SIZE) { - PRINTM(MERROR, "invalid rx_len=%d\n", rx_len); - ret = MLAN_STATUS_FAILURE; - goto done; - } - rx_len = (t_u16) (rx_blocks * MLAN_SDIO_BLOCK_SIZE); - pmbuf = - wlan_alloc_mlan_buffer(pmadapter, rx_len, MLAN_RX_HEADER_LEN, - MOAL_ALLOC_MLAN_BUFFER); - if (pmbuf == MNULL) { - PRINTM(MERROR, "Failed to allocate 'mlan_buffer'\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - PRINTM(MINFO, "rx_len = %d\n", rx_len); + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_callbacks pcb = &pmadapter->callbacks; + t_u8 sdio_ireg; + mlan_buffer *pmbuf = MNULL; + t_u8 port = 0; + t_u32 len_reg_l, len_reg_u; + t_u32 rx_blocks; + t_u32 ps_state = pmadapter->ps_state; + t_u16 rx_len; + t_u32 upld_typ = 0; + t_u32 cr = 0; + + ENTER(); + + pcb->moal_spin_lock(pmadapter->pmoal_handle, pmadapter->pint_lock); + sdio_ireg = pmadapter->sdio_ireg; + pmadapter->sdio_ireg = 0; + pcb->moal_spin_unlock(pmadapter->pmoal_handle, pmadapter->pint_lock); + + if (!sdio_ireg) + goto done; + /* check the command port */ + if (sdio_ireg & DN_LD_CMD_PORT_HOST_INT_STATUS) { + if (pmadapter->cmd_sent) + pmadapter->cmd_sent = MFALSE; + PRINTM(MINFO, "cmd_sent=%d\n", pmadapter->cmd_sent); + } + + if (sdio_ireg & UP_LD_CMD_PORT_HOST_INT_STATUS) { + /* read the len of control packet */ + rx_len = ((t_u16) pmadapter->mp_regs[CMD_RD_LEN_1]) << 8; + rx_len |= (t_u16) pmadapter->mp_regs[CMD_RD_LEN_0]; + PRINTM(MINFO, "RX: cmd port rx_len=%u\n", rx_len); + rx_blocks = + (rx_len + MLAN_SDIO_BLOCK_SIZE - + 1) / MLAN_SDIO_BLOCK_SIZE; + if (rx_len <= INTF_HEADER_LEN || + (rx_blocks * MLAN_SDIO_BLOCK_SIZE) > ALLOC_BUF_SIZE) { + PRINTM(MERROR, "invalid rx_len=%d\n", rx_len); + ret = MLAN_STATUS_FAILURE; + goto done; + } + rx_len = (t_u16) (rx_blocks * MLAN_SDIO_BLOCK_SIZE); + pmbuf = wlan_alloc_mlan_buffer(pmadapter, rx_len, 0, + MOAL_MALLOC_BUFFER); + if (pmbuf == MNULL) { + PRINTM(MERROR, "Failed to allocate 'mlan_buffer'\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + PRINTM(MINFO, "cmd rx buffer rx_len = %d\n", rx_len); + + /* Transfer data from card */ + if (MLAN_STATUS_SUCCESS != + wlan_sdio_card_to_host(pmadapter, &upld_typ, + (t_u32 *) & pmadapter->upld_len, + pmbuf, rx_len, + pmadapter->ioport | CMD_PORT_SLCT)) { + pmadapter->dbg.num_cmdevt_card_to_host_failure++; + PRINTM(MERROR, + "Card-to-host cmd failed: int status=0x%x\n", + sdio_ireg); + wlan_free_mlan_buffer(pmadapter, pmbuf); + ret = MLAN_STATUS_FAILURE; + goto term_cmd53; + } + + if ((upld_typ != MLAN_TYPE_CMD) && + (upld_typ != MLAN_TYPE_EVENT)) + PRINTM(MERROR, + "receive a wrong packet from CMD PORT. type =0x%d\n", + upld_typ); + + wlan_decode_rx_packet(pmadapter, pmbuf, upld_typ); + + /* We might receive data/sleep_cfm at the same time */ + /* reset data_receive flag to avoid ps_state change */ + if ((ps_state == PS_STATE_SLEEP_CFM) && + (pmadapter->ps_state == PS_STATE_SLEEP)) + pmadapter->data_received = MFALSE; + } + + if (sdio_ireg & DN_LD_HOST_INT_STATUS) { + pmadapter->mp_wr_bitmap = + (t_u32) pmadapter->mp_regs[WR_BITMAP_L]; + pmadapter->mp_wr_bitmap |= + ((t_u32) pmadapter->mp_regs[WR_BITMAP_U]) << 8; + pmadapter->mp_wr_bitmap |= + ((t_u32) pmadapter->mp_regs[WR_BITMAP_1L]) << 16; + pmadapter->mp_wr_bitmap |= + ((t_u32) pmadapter->mp_regs[WR_BITMAP_1U]) << 24; + PRINTM(MINTR, "DNLD: wr_bitmap=0x%08x\n", + pmadapter->mp_wr_bitmap); + if (pmadapter->data_sent && + (pmadapter->mp_wr_bitmap & pmadapter->mp_data_port_mask)) { + PRINTM(MINFO, " <--- Tx DONE Interrupt --->\n"); + pmadapter->data_sent = MFALSE; + } + } + + if (sdio_ireg & UP_LD_HOST_INT_STATUS) { + pmadapter->mp_rd_bitmap = + (t_u32) pmadapter->mp_regs[RD_BITMAP_L]; + pmadapter->mp_rd_bitmap |= + ((t_u32) pmadapter->mp_regs[RD_BITMAP_U]) << 8; + pmadapter->mp_rd_bitmap |= + ((t_u32) pmadapter->mp_regs[RD_BITMAP_1L]) << 16; + pmadapter->mp_rd_bitmap |= + ((t_u32) pmadapter->mp_regs[RD_BITMAP_1U]) << 24; + PRINTM(MINTR, "UPLD: rd_bitmap=0x%08x\n", + pmadapter->mp_rd_bitmap); + + while (MTRUE) { + ret = wlan_get_rd_port(pmadapter, &port); + if (ret != MLAN_STATUS_SUCCESS) { + PRINTM(MINFO, + "no more rd_port to be handled\n"); + break; + } + len_reg_l = RD_LEN_P0_L + (port << 1); + len_reg_u = RD_LEN_P0_U + (port << 1); + rx_len = ((t_u16) pmadapter->mp_regs[len_reg_u]) << 8; + rx_len |= (t_u16) pmadapter->mp_regs[len_reg_l]; + PRINTM(MINFO, "RX: port=%d rx_len=%u\n", port, rx_len); + rx_blocks = + (rx_len + MLAN_SDIO_BLOCK_SIZE - + 1) / MLAN_SDIO_BLOCK_SIZE; + if (rx_len <= INTF_HEADER_LEN || + (rx_blocks * MLAN_SDIO_BLOCK_SIZE) > + ALLOC_BUF_SIZE) { + PRINTM(MERROR, "invalid rx_len=%d\n", rx_len); + ret = MLAN_STATUS_FAILURE; + goto done; + } + rx_len = (t_u16) (rx_blocks * MLAN_SDIO_BLOCK_SIZE); + pmbuf = wlan_alloc_mlan_buffer(pmadapter, rx_len, + MLAN_RX_HEADER_LEN, + MOAL_ALLOC_MLAN_BUFFER); + if (pmbuf == MNULL) { + PRINTM(MERROR, + "Failed to allocate 'mlan_buffer'\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + PRINTM(MINFO, "rx_len = %d\n", rx_len); #ifdef SDIO_MULTI_PORT_RX_AGGR - if (MLAN_STATUS_SUCCESS != - wlan_sdio_card_to_host_mp_aggr(pmadapter, pmbuf, port, - rx_len)) { + if (MLAN_STATUS_SUCCESS != + wlan_sdio_card_to_host_mp_aggr(pmadapter, pmbuf, + port, rx_len)) { #else - /* Transfer data from card */ - if (MLAN_STATUS_SUCCESS != - wlan_sdio_card_to_host(pmadapter, &upld_typ, - (t_u32 *) & pmadapter->upld_len, pmbuf, - rx_len, pmadapter->ioport + port)) { + /* Transfer data from card */ + if (MLAN_STATUS_SUCCESS != + wlan_sdio_card_to_host(pmadapter, &upld_typ, + (t_u32 *) & pmadapter-> + upld_len, pmbuf, rx_len, + pmadapter->ioport + port)) { #endif /* SDIO_MULTI_PORT_RX_AGGR */ - pmadapter->dbg.num_rx_card_to_host_failure++; + pmadapter->dbg.num_rx_card_to_host_failure++; - PRINTM(MERROR, "Card to host failed: int status=0x%x\n", - sdio_ireg); + PRINTM(MERROR, + "Card to host failed: int status=0x%x\n", + sdio_ireg); #ifndef SDIO_MULTI_PORT_RX_AGGR - wlan_free_mlan_buffer(pmadapter, pmbuf); + wlan_free_mlan_buffer(pmadapter, pmbuf); #endif - ret = MLAN_STATUS_FAILURE; - goto term_cmd53; - } + ret = MLAN_STATUS_FAILURE; + goto term_cmd53; + } #ifndef SDIO_MULTI_PORT_RX_AGGR - wlan_decode_rx_packet(pmadapter, pmbuf, upld_typ); + wlan_decode_rx_packet(pmadapter, pmbuf, upld_typ); #endif - } - /* We might receive data/sleep_cfm at the same time */ - /* reset data_receive flag to avoid ps_state change */ - if ((ps_state == PS_STATE_SLEEP_CFM) && - (pmadapter->ps_state == PS_STATE_SLEEP)) - pmadapter->data_received = MFALSE; - } - - ret = MLAN_STATUS_SUCCESS; - goto done; - - term_cmd53: - /* terminate cmd53 */ - if (MLAN_STATUS_SUCCESS != pcb->moal_read_reg(pmadapter->pmoal_handle, - HOST_TO_CARD_EVENT_REG, &cr)) - PRINTM(MERROR, "read CFG reg failed\n"); - PRINTM(MINFO, "Config Reg val = %d\n", cr); - if (MLAN_STATUS_SUCCESS != pcb->moal_write_reg(pmadapter->pmoal_handle, - HOST_TO_CARD_EVENT_REG, - (cr | HOST_TERM_CMD53))) - PRINTM(MERROR, "write CFG reg failed\n"); - PRINTM(MINFO, "write success\n"); - if (MLAN_STATUS_SUCCESS != pcb->moal_read_reg(pmadapter->pmoal_handle, - HOST_TO_CARD_EVENT_REG, &cr)) - PRINTM(MERROR, "read CFG reg failed\n"); - PRINTM(MINFO, "Config reg val =%x\n", cr); - - done: - LEAVE(); - return ret; + } + /* We might receive data/sleep_cfm at the same time */ + /* reset data_receive flag to avoid ps_state change */ + if ((ps_state == PS_STATE_SLEEP_CFM) && + (pmadapter->ps_state == PS_STATE_SLEEP)) + pmadapter->data_received = MFALSE; + } + + ret = MLAN_STATUS_SUCCESS; + goto done; + +term_cmd53: + /* terminate cmd53 */ + if (MLAN_STATUS_SUCCESS != pcb->moal_read_reg(pmadapter->pmoal_handle, + HOST_TO_CARD_EVENT_REG, + &cr)) + PRINTM(MERROR, "read CFG reg failed\n"); + PRINTM(MINFO, "Config Reg val = %d\n", cr); + if (MLAN_STATUS_SUCCESS != pcb->moal_write_reg(pmadapter->pmoal_handle, + HOST_TO_CARD_EVENT_REG, + (cr | HOST_TERM_CMD53))) + PRINTM(MERROR, "write CFG reg failed\n"); + PRINTM(MINFO, "write success\n"); + if (MLAN_STATUS_SUCCESS != pcb->moal_read_reg(pmadapter->pmoal_handle, + HOST_TO_CARD_EVENT_REG, + &cr)) + PRINTM(MERROR, "read CFG reg failed\n"); + PRINTM(MINFO, "Config reg val =%x\n", cr); + +done: + LEAVE(); + return ret; } -/** +/** * @brief This function sends data to the card. - * + * * @param pmadapter A pointer to mlan_adapter structure * @param type data or command * @param pmbuf A pointer to mlan_buffer (pmbuf->data_len should include SDIO header) @@ -1453,87 +1526,91 @@ wlan_process_int_status(mlan_adapter * pmadapter) */ mlan_status wlan_sdio_host_to_card(mlan_adapter * pmadapter, t_u8 type, mlan_buffer * pmbuf, - mlan_tx_param * tx_param) + mlan_tx_param * tx_param) { - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u32 buf_block_len; - t_u32 blksz; - t_u8 port = 0; - t_u32 cmd53_port = 0; - t_u8 *payload = pmbuf->pbuf + pmbuf->data_offset; - - ENTER(); - - /* Allocate buffer and copy payload */ - blksz = MLAN_SDIO_BLOCK_SIZE; - buf_block_len = (pmbuf->data_len + blksz - 1) / blksz; - *(t_u16 *) & payload[0] = wlan_cpu_to_le16((t_u16) pmbuf->data_len); - *(t_u16 *) & payload[2] = wlan_cpu_to_le16(type); - - /* - * This is SDIO specific header - * t_u16 length, - * t_u16 type (MLAN_TYPE_DATA = 0, MLAN_TYPE_CMD = 1, MLAN_TYPE_EVENT = 3) - */ - if (type == MLAN_TYPE_DATA) { - ret = wlan_get_wr_port_data(pmadapter, &port); - if (ret != MLAN_STATUS_SUCCESS) { - PRINTM(MERROR, "no wr_port available: %d\n", ret); - goto exit; - } - /* Transfer data to card */ - pmbuf->data_len = buf_block_len * blksz; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u32 buf_block_len; + t_u32 blksz; + t_u8 port = 0; + t_u32 cmd53_port = 0; + t_u8 *payload = pmbuf->pbuf + pmbuf->data_offset; + + ENTER(); + + /* Allocate buffer and copy payload */ + blksz = MLAN_SDIO_BLOCK_SIZE; + buf_block_len = (pmbuf->data_len + blksz - 1) / blksz; + *(t_u16 *) & payload[0] = wlan_cpu_to_le16((t_u16) pmbuf->data_len); + *(t_u16 *) & payload[2] = wlan_cpu_to_le16(type); + + /* + * This is SDIO specific header + * t_u16 length, + * t_u16 type (MLAN_TYPE_DATA = 0, MLAN_TYPE_CMD = 1, MLAN_TYPE_EVENT = 3) + */ + if (type == MLAN_TYPE_DATA) { + ret = wlan_get_wr_port_data(pmadapter, &port); + if (ret != MLAN_STATUS_SUCCESS) { + PRINTM(MERROR, "no wr_port available: %d\n", ret); + goto exit; + } + /* Transfer data to card */ + pmbuf->data_len = buf_block_len * blksz; #ifdef SDIO_MULTI_PORT_TX_AGGR - if (tx_param) - ret = - wlan_host_to_card_mp_aggr(pmadapter, pmbuf, port, - tx_param->next_pkt_len); - else - ret = wlan_host_to_card_mp_aggr(pmadapter, pmbuf, port, 0); + if (tx_param) + ret = wlan_host_to_card_mp_aggr(pmadapter, pmbuf, port, + tx_param->next_pkt_len); + else + ret = wlan_host_to_card_mp_aggr(pmadapter, pmbuf, port, + 0); #else - ret = wlan_write_data_sync(pmadapter, pmbuf, pmadapter->ioport + port); + ret = wlan_write_data_sync(pmadapter, pmbuf, + pmadapter->ioport + port); #endif /* SDIO_MULTI_PORT_TX_AGGR */ - } else { - /* Type must be MLAN_TYPE_CMD */ - pmadapter->cmd_sent = MTRUE; - if (pmbuf->data_len <= INTF_HEADER_LEN || - pmbuf->data_len > WLAN_UPLD_SIZE) - PRINTM(MWARN, - "wlan_sdio_host_to_card(): Error: payload=%p, nb=%d\n", - payload, pmbuf->data_len); - /* Transfer data to card */ - pmbuf->data_len = buf_block_len * blksz; - cmd53_port = (pmadapter->ioport) | CMD_PORT_SLCT; - ret = wlan_write_data_sync(pmadapter, pmbuf, cmd53_port); - } - - if (ret != MLAN_STATUS_SUCCESS) { - if (type == MLAN_TYPE_CMD) - pmadapter->cmd_sent = MFALSE; - if (type == MLAN_TYPE_DATA) - pmadapter->data_sent = MFALSE; - } else { - if (type == MLAN_TYPE_DATA) { - if (!(pmadapter->mp_wr_bitmap & (1 << pmadapter->curr_wr_port))) - pmadapter->data_sent = MTRUE; - else - pmadapter->data_sent = MFALSE; - } - DBG_HEXDUMP(MIF_D, "SDIO Blk Wr", pmbuf->pbuf + pmbuf->data_offset, - MIN(pmbuf->data_len, MAX_DATA_DUMP_LEN)); - } - exit: - LEAVE(); - return ret; + } else { + /* Type must be MLAN_TYPE_CMD */ + pmadapter->cmd_sent = MTRUE; + if (pmbuf->data_len <= INTF_HEADER_LEN || + pmbuf->data_len > WLAN_UPLD_SIZE) + PRINTM(MWARN, + "wlan_sdio_host_to_card(): Error: payload=%p, nb=%d\n", + payload, pmbuf->data_len); + /* Transfer data to card */ + pmbuf->data_len = buf_block_len * blksz; + cmd53_port = (pmadapter->ioport) | CMD_PORT_SLCT; + ret = wlan_write_data_sync(pmadapter, pmbuf, cmd53_port); + } + + if (ret != MLAN_STATUS_SUCCESS) { + if (type == MLAN_TYPE_CMD) + pmadapter->cmd_sent = MFALSE; + if (type == MLAN_TYPE_DATA) + pmadapter->data_sent = MFALSE; + } else { + if (type == MLAN_TYPE_DATA) { + if (! + (pmadapter-> + mp_wr_bitmap & (1 << pmadapter->curr_wr_port))) + pmadapter->data_sent = MTRUE; + else + pmadapter->data_sent = MFALSE; + } + DBG_HEXDUMP(MIF_D, "SDIO Blk Wr", + pmbuf->pbuf + pmbuf->data_offset, + MIN(pmbuf->data_len, MAX_DATA_DUMP_LEN)); + } +exit: + LEAVE(); + return ret; } #if defined(SDIO_MULTI_PORT_TX_AGGR) || defined(SDIO_MULTI_PORT_RX_AGGR) -/** - * @brief This function allocates buffer for the SDIO aggregation buffer - * related members of adapter structure - * +/** + * @brief This function allocates buffer for the SDIO aggregation buffer + * related members of adapter structure + * * @param pmadapter A pointer to mlan_adapter structure * @param mpa_tx_buf_size Tx buffer size to allocate * @param mpa_rx_buf_size Rx buffer size to allocate @@ -1542,56 +1619,56 @@ wlan_sdio_host_to_card(mlan_adapter * pmadapter, t_u8 type, mlan_buffer * pmbuf, */ mlan_status wlan_alloc_sdio_mpa_buffers(IN mlan_adapter * pmadapter, - t_u32 mpa_tx_buf_size, t_u32 mpa_rx_buf_size) + t_u32 mpa_tx_buf_size, t_u32 mpa_rx_buf_size) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_callbacks pcb = &pmadapter->callbacks; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_callbacks pcb = &pmadapter->callbacks; - ENTER(); + ENTER(); #ifdef SDIO_MULTI_PORT_TX_AGGR - ret = - pcb->moal_malloc(pmadapter->pmoal_handle, - mpa_tx_buf_size + DMA_ALIGNMENT, - MLAN_MEM_DEF | MLAN_MEM_DMA, - (t_u8 **) & pmadapter->mpa_tx.head_ptr); - if (ret != MLAN_STATUS_SUCCESS || !pmadapter->mpa_tx.head_ptr) { - PRINTM(MERROR, "Could not allocate buffer for SDIO MP TX aggr\n"); - ret = MLAN_STATUS_FAILURE; - goto error; - } - pmadapter->mpa_tx.buf = - (t_u8 *) ALIGN_ADDR(pmadapter->mpa_tx.head_ptr, DMA_ALIGNMENT); - pmadapter->mpa_tx.buf_size = mpa_tx_buf_size; + ret = pcb->moal_malloc(pmadapter->pmoal_handle, + mpa_tx_buf_size + DMA_ALIGNMENT, + MLAN_MEM_DEF | MLAN_MEM_DMA, + (t_u8 **) & pmadapter->mpa_tx.head_ptr); + if (ret != MLAN_STATUS_SUCCESS || !pmadapter->mpa_tx.head_ptr) { + PRINTM(MERROR, + "Could not allocate buffer for SDIO MP TX aggr\n"); + ret = MLAN_STATUS_FAILURE; + goto error; + } + pmadapter->mpa_tx.buf = + (t_u8 *) ALIGN_ADDR(pmadapter->mpa_tx.head_ptr, DMA_ALIGNMENT); + pmadapter->mpa_tx.buf_size = mpa_tx_buf_size; #endif /* SDIO_MULTI_PORT_TX_AGGR */ #ifdef SDIO_MULTI_PORT_RX_AGGR - ret = - pcb->moal_malloc(pmadapter->pmoal_handle, - mpa_rx_buf_size + DMA_ALIGNMENT, - MLAN_MEM_DEF | MLAN_MEM_DMA, - (t_u8 **) & pmadapter->mpa_rx.head_ptr); - if (ret != MLAN_STATUS_SUCCESS || !pmadapter->mpa_rx.head_ptr) { - PRINTM(MERROR, "Could not allocate buffer for SDIO MP RX aggr\n"); - ret = MLAN_STATUS_FAILURE; - goto error; - } - pmadapter->mpa_rx.buf = - (t_u8 *) ALIGN_ADDR(pmadapter->mpa_rx.head_ptr, DMA_ALIGNMENT); - pmadapter->mpa_rx.buf_size = mpa_rx_buf_size; + ret = pcb->moal_malloc(pmadapter->pmoal_handle, + mpa_rx_buf_size + DMA_ALIGNMENT, + MLAN_MEM_DEF | MLAN_MEM_DMA, + (t_u8 **) & pmadapter->mpa_rx.head_ptr); + if (ret != MLAN_STATUS_SUCCESS || !pmadapter->mpa_rx.head_ptr) { + PRINTM(MERROR, + "Could not allocate buffer for SDIO MP RX aggr\n"); + ret = MLAN_STATUS_FAILURE; + goto error; + } + pmadapter->mpa_rx.buf = + (t_u8 *) ALIGN_ADDR(pmadapter->mpa_rx.head_ptr, DMA_ALIGNMENT); + pmadapter->mpa_rx.buf_size = mpa_rx_buf_size; #endif /* SDIO_MULTI_PORT_RX_AGGR */ - error: - if (ret != MLAN_STATUS_SUCCESS) { - wlan_free_sdio_mpa_buffers(pmadapter); - } +error: + if (ret != MLAN_STATUS_SUCCESS) { + wlan_free_sdio_mpa_buffers(pmadapter); + } - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief This function frees buffers for the SDIO aggregation - * + * * @param pmadapter A pointer to mlan_adapter structure * * @return MLAN_STATUS_SUCCESS @@ -1599,32 +1676,32 @@ wlan_alloc_sdio_mpa_buffers(IN mlan_adapter * pmadapter, mlan_status wlan_free_sdio_mpa_buffers(IN mlan_adapter * pmadapter) { - pmlan_callbacks pcb = &pmadapter->callbacks; + pmlan_callbacks pcb = &pmadapter->callbacks; - ENTER(); + ENTER(); #ifdef SDIO_MULTI_PORT_TX_AGGR - if (pmadapter->mpa_tx.buf) { - pcb->moal_mfree(pmadapter->pmoal_handle, - (t_u8 *) pmadapter->mpa_tx.head_ptr); - pmadapter->mpa_tx.head_ptr = MNULL; - pmadapter->mpa_tx.buf = MNULL; - pmadapter->mpa_tx.buf_size = 0; - } + if (pmadapter->mpa_tx.buf) { + pcb->moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pmadapter->mpa_tx.head_ptr); + pmadapter->mpa_tx.head_ptr = MNULL; + pmadapter->mpa_tx.buf = MNULL; + pmadapter->mpa_tx.buf_size = 0; + } #endif /* SDIO_MULTI_PORT_TX_AGGR */ #ifdef SDIO_MULTI_PORT_RX_AGGR - if (pmadapter->mpa_rx.buf) { - pcb->moal_mfree(pmadapter->pmoal_handle, - (t_u8 *) pmadapter->mpa_rx.head_ptr); - pmadapter->mpa_rx.head_ptr = MNULL; - pmadapter->mpa_rx.buf = MNULL; - pmadapter->mpa_rx.buf_size = 0; - } + if (pmadapter->mpa_rx.buf) { + pcb->moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pmadapter->mpa_rx.head_ptr); + pmadapter->mpa_rx.head_ptr = MNULL; + pmadapter->mpa_rx.buf = MNULL; + pmadapter->mpa_rx.buf_size = 0; + } #endif /* SDIO_MULTI_PORT_RX_AGGR */ - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } #endif /* SDIO_MULTI_PORT_TX_AGGR || SDIO_MULTI_PORT_RX_AGGR */ @@ -1638,36 +1715,38 @@ wlan_free_sdio_mpa_buffers(IN mlan_adapter * pmadapter) mlan_status wlan_set_sdio_gpio_int(IN pmlan_private priv) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_adapter pmadapter = priv->adapter; - HostCmd_DS_SDIO_GPIO_INT_CONFIG sdio_int_cfg; - - ENTER(); - - if (pmadapter->int_mode == INT_MODE_GPIO) { - PRINTM(MINFO, "SDIO_GPIO_INT_CONFIG: interrupt mode is GPIO\n"); - sdio_int_cfg.action = HostCmd_ACT_GEN_SET; - sdio_int_cfg.gpio_pin = pmadapter->gpio_pin; - sdio_int_cfg.gpio_int_edge = INT_FALLING_EDGE; - sdio_int_cfg.gpio_pulse_width = DELAY_1_US; - ret = wlan_prepare_cmd(priv, HostCmd_CMD_SDIO_GPIO_INT_CONFIG, - HostCmd_ACT_GEN_SET, 0, MNULL, &sdio_int_cfg); - - if (ret) { - PRINTM(MERROR, "SDIO_GPIO_INT_CONFIG: send command fail\n"); - ret = MLAN_STATUS_FAILURE; - } - } else { - PRINTM(MINFO, "SDIO_GPIO_INT_CONFIG: interrupt mode is SDIO\n"); - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_adapter pmadapter = priv->adapter; + HostCmd_DS_SDIO_GPIO_INT_CONFIG sdio_int_cfg; + + ENTER(); + + if (pmadapter->int_mode == INT_MODE_GPIO) { + PRINTM(MINFO, "SDIO_GPIO_INT_CONFIG: interrupt mode is GPIO\n"); + sdio_int_cfg.action = HostCmd_ACT_GEN_SET; + sdio_int_cfg.gpio_pin = pmadapter->gpio_pin; + sdio_int_cfg.gpio_int_edge = INT_FALLING_EDGE; + sdio_int_cfg.gpio_pulse_width = DELAY_1_US; + ret = wlan_prepare_cmd(priv, HostCmd_CMD_SDIO_GPIO_INT_CONFIG, + HostCmd_ACT_GEN_SET, 0, MNULL, + &sdio_int_cfg); + + if (ret) { + PRINTM(MERROR, + "SDIO_GPIO_INT_CONFIG: send command fail\n"); + ret = MLAN_STATUS_FAILURE; + } + } else { + PRINTM(MINFO, "SDIO_GPIO_INT_CONFIG: interrupt mode is SDIO\n"); + } + + LEAVE(); + return ret; } /** * @brief This function prepares command of SDIO GPIO interrupt - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -1676,31 +1755,34 @@ wlan_set_sdio_gpio_int(IN pmlan_private priv) */ mlan_status wlan_cmd_sdio_gpio_int(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - HostCmd_DS_SDIO_GPIO_INT_CONFIG *psdio_gpio_int = - &cmd->params.sdio_gpio_int; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_SDIO_GPIO_INT_CONFIG); - cmd->size = - wlan_cpu_to_le16((sizeof(HostCmd_DS_SDIO_GPIO_INT_CONFIG)) + S_DS_GEN); - - memset(pmpriv->adapter, psdio_gpio_int, 0, - sizeof(HostCmd_DS_SDIO_GPIO_INT_CONFIG)); - if (cmd_action == HostCmd_ACT_GEN_SET) { - memcpy(pmpriv->adapter, psdio_gpio_int, pdata_buf, - sizeof(HostCmd_DS_SDIO_GPIO_INT_CONFIG)); - psdio_gpio_int->action = wlan_cpu_to_le16(psdio_gpio_int->action); - psdio_gpio_int->gpio_pin = wlan_cpu_to_le16(psdio_gpio_int->gpio_pin); - psdio_gpio_int->gpio_int_edge = - wlan_cpu_to_le16(psdio_gpio_int->gpio_int_edge); - psdio_gpio_int->gpio_pulse_width = - wlan_cpu_to_le16(psdio_gpio_int->gpio_pulse_width); - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_SDIO_GPIO_INT_CONFIG *psdio_gpio_int = + &cmd->params.sdio_gpio_int; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_SDIO_GPIO_INT_CONFIG); + cmd->size = + wlan_cpu_to_le16((sizeof(HostCmd_DS_SDIO_GPIO_INT_CONFIG)) + + S_DS_GEN); + + memset(pmpriv->adapter, psdio_gpio_int, 0, + sizeof(HostCmd_DS_SDIO_GPIO_INT_CONFIG)); + if (cmd_action == HostCmd_ACT_GEN_SET) { + memcpy(pmpriv->adapter, psdio_gpio_int, pdata_buf, + sizeof(HostCmd_DS_SDIO_GPIO_INT_CONFIG)); + psdio_gpio_int->action = + wlan_cpu_to_le16(psdio_gpio_int->action); + psdio_gpio_int->gpio_pin = + wlan_cpu_to_le16(psdio_gpio_int->gpio_pin); + psdio_gpio_int->gpio_int_edge = + wlan_cpu_to_le16(psdio_gpio_int->gpio_int_edge); + psdio_gpio_int->gpio_pulse_width = + wlan_cpu_to_le16(psdio_gpio_int->gpio_pulse_width); + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_sdio.h b/drivers/net/wireless/sd8897/mlan/mlan_sdio.h index 5c81373055e9..f557d308a4d0 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_sdio.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_sdio.h @@ -1,21 +1,21 @@ /** @file mlan_sdio.h - * + * * @brief This file contains definitions for SDIO interface. - * driver. + * driver. + * + * Copyright (C) 2008-2011, Marvell International Ltd. * - * Copyright (C) 2008-2011, Marvell International Ltd. - * - * This software file (the "File") is distributed by Marvell International - * Ltd. under the terms of the GNU General Public License Version 2, June 1991 - * (the "License"). You may use, redistribute and/or modify this File in - * accordance with the terms and conditions of the License, a copy of which + * This software file (the "File") is distributed by Marvell International + * Ltd. under the terms of the GNU General Public License Version 2, June 1991 + * (the "License"). You may use, redistribute and/or modify this File in + * accordance with the terms and conditions of the License, a copy of which * is available by writing to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. * - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about + * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE + * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE + * ARE EXPRESSLY DISCLAIMED. The License provides additional details about * this warranty disclaimer. * */ @@ -291,7 +291,7 @@ Change log: /** SDIO Tx aggregation port limit ? */ /** this is for test only, because port 0 is reserved for control port */ //#define MP_TX_AGGR_PORT_LIMIT_REACHED(a) (a->curr_wr_port == 1) -/* tx packets aggregated until a half of mp_end_port is reached +/* tx packets aggregated until a half of mp_end_port is reached * This port limination may be relaxed */ /* hw tx wraps round only after port 31 */ #define MP_TX_AGGR_PORT_LIMIT_REACHED(a) \ @@ -333,7 +333,8 @@ Change log: #define MP_RX_AGGR_IN_PROGRESS(a) (a->mpa_rx.pkt_cnt>0) /** SDIO Rx aggregation buffer room for next packet ? */ -#define MP_RX_AGGR_BUF_HAS_ROOM(a,rx_len) ((a->mpa_rx.buf_len+rx_len)<=a->mpa_rx.buf_size) +#define MP_RX_AGGR_BUF_HAS_ROOM(a,rx_len) \ + ((a->mpa_rx.buf_len+rx_len)<=a->mpa_rx.buf_size) /** Prepare to copy current packet from card to SDIO Rx aggregation buffer */ #define MP_RX_AGGR_SETUP(a, mbuf, port, rx_len) do{ \ @@ -371,10 +372,10 @@ t_void wlan_interrupt(pmlan_adapter pmadapter); mlan_status wlan_process_int_status(mlan_adapter * pmadapter); /** Transfer data to card */ mlan_status wlan_sdio_host_to_card(mlan_adapter * pmadapter, t_u8 type, - mlan_buffer * mbuf, - mlan_tx_param * tx_param); + mlan_buffer * mbuf, + mlan_tx_param * tx_param); mlan_status wlan_set_sdio_gpio_int(IN pmlan_private priv); mlan_status wlan_cmd_sdio_gpio_int(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf); + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf); #endif /* _MLAN_SDIO_H */ diff --git a/drivers/net/wireless/sd8897/mlan/mlan_shim.c b/drivers/net/wireless/sd8897/mlan/mlan_shim.c index 267cffc71432..e7481e726fda 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_shim.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_shim.c @@ -1,8 +1,8 @@ /** @file mlan_shim.c - * + * * @brief This file contains APIs to MOAL module. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -46,54 +46,54 @@ Change log: ********************************************************/ #ifdef STA_SUPPORT mlan_operations mlan_sta_ops = { - /* init cmd handler */ - wlan_ops_sta_init_cmd, - /* ioctl handler */ - wlan_ops_sta_ioctl, - /* cmd handler */ - wlan_ops_sta_prepare_cmd, - /* cmdresp handler */ - wlan_ops_sta_process_cmdresp, - /* rx handler */ - wlan_ops_sta_process_rx_packet, - /* Event handler */ - wlan_ops_sta_process_event, - /* txpd handler */ - wlan_ops_sta_process_txpd, - /* BSS role: STA */ - MLAN_BSS_ROLE_STA, + /* init cmd handler */ + wlan_ops_sta_init_cmd, + /* ioctl handler */ + wlan_ops_sta_ioctl, + /* cmd handler */ + wlan_ops_sta_prepare_cmd, + /* cmdresp handler */ + wlan_ops_sta_process_cmdresp, + /* rx handler */ + wlan_ops_sta_process_rx_packet, + /* Event handler */ + wlan_ops_sta_process_event, + /* txpd handler */ + wlan_ops_sta_process_txpd, + /* BSS role: STA */ + MLAN_BSS_ROLE_STA, }; #endif #ifdef UAP_SUPPORT mlan_operations mlan_uap_ops = { - /* init cmd handler */ - wlan_ops_uap_init_cmd, - /* ioctl handler */ - wlan_ops_uap_ioctl, - /* cmd handler */ - wlan_ops_uap_prepare_cmd, - /* cmdresp handler */ - wlan_ops_uap_process_cmdresp, - /* rx handler */ - wlan_ops_uap_process_rx_packet, - /* Event handler */ - wlan_ops_uap_process_event, - /* txpd handler */ - wlan_ops_uap_process_txpd, - /* BSS role: uAP */ - MLAN_BSS_ROLE_UAP, + /* init cmd handler */ + wlan_ops_uap_init_cmd, + /* ioctl handler */ + wlan_ops_uap_ioctl, + /* cmd handler */ + wlan_ops_uap_prepare_cmd, + /* cmdresp handler */ + wlan_ops_uap_process_cmdresp, + /* rx handler */ + wlan_ops_uap_process_rx_packet, + /* Event handler */ + wlan_ops_uap_process_event, + /* txpd handler */ + wlan_ops_uap_process_txpd, + /* BSS role: uAP */ + MLAN_BSS_ROLE_UAP, }; #endif /** mlan function table */ mlan_operations *mlan_ops[] = { #ifdef STA_SUPPORT - &mlan_sta_ops, + &mlan_sta_ops, #endif #ifdef UAP_SUPPORT - &mlan_uap_ops, + &mlan_uap_ops, #endif - MNULL, + MNULL, }; /** Global moal_assert callback */ @@ -107,12 +107,12 @@ t_void(*assert_callback) (IN t_void * pmoal_handle, IN t_u32 cond) = MNULL; /** Global moal_print callback */ t_void(*print_callback) (IN t_void * pmoal_handle, - IN t_u32 level, IN char *pformat, IN ...) = MNULL; + IN t_u32 level, IN char *pformat, IN ...) = MNULL; /** Global moal_get_system_time callback */ mlan_status(*get_sys_time_callback) (IN t_void * pmoal_handle, - OUT t_u32 * psec, - OUT t_u32 * pusec) = MNULL; + OUT t_u32 * psec, + OUT t_u32 * pusec) = MNULL; /** Global driver debug mit masks */ t_u32 mlan_drvdbg = DEFAULT_DEBUG_MASK; @@ -128,7 +128,7 @@ t_u32 mlan_drvdbg = DEFAULT_DEBUG_MASK; /** * @brief This function registers MOAL to MLAN module. - * + * * @param pmdevice A pointer to a mlan_device structure * allocated in MOAL * @param ppmlan_adapter A pointer to a t_void pointer to store @@ -156,232 +156,245 @@ t_u32 mlan_drvdbg = DEFAULT_DEBUG_MASK; mlan_status mlan_register(IN pmlan_device pmdevice, OUT t_void ** ppmlan_adapter) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_adapter pmadapter = MNULL; - pmlan_callbacks pcb = MNULL; - t_u8 i = 0; - t_u32 j = 0; - - MASSERT(pmdevice); - MASSERT(ppmlan_adapter); - MASSERT(pmdevice->callbacks.moal_print); + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_adapter pmadapter = MNULL; + pmlan_callbacks pcb = MNULL; + t_u8 i = 0; + t_u32 j = 0; + + MASSERT(pmdevice); + MASSERT(ppmlan_adapter); + MASSERT(pmdevice->callbacks.moal_print); #ifdef DEBUG_LEVEL1 - print_callback = pmdevice->callbacks.moal_print; - get_sys_time_callback = pmdevice->callbacks.moal_get_system_time; + print_callback = pmdevice->callbacks.moal_print; + get_sys_time_callback = pmdevice->callbacks.moal_get_system_time; #endif - assert_callback = pmdevice->callbacks.moal_assert; - - ENTER(); - - MASSERT(pmdevice->callbacks.moal_malloc); - MASSERT(pmdevice->callbacks.moal_memset); - MASSERT(pmdevice->callbacks.moal_memmove); - - /* Allocate memory for adapter structure */ - if (pmdevice->callbacks.moal_vmalloc && pmdevice->callbacks.moal_vfree) - ret = pmdevice->callbacks.moal_vmalloc(pmdevice->pmoal_handle, - sizeof(mlan_adapter), - (t_u8 **) & pmadapter); - else - ret = pmdevice->callbacks.moal_malloc(pmdevice->pmoal_handle, - sizeof(mlan_adapter), - MLAN_MEM_DEF, - (t_u8 **) & pmadapter); - if ((ret != MLAN_STATUS_SUCCESS) || !pmadapter) { - ret = MLAN_STATUS_FAILURE; - goto exit_register; - } - - pmdevice->callbacks.moal_memset(pmdevice->pmoal_handle, pmadapter, - 0, sizeof(mlan_adapter)); - - pcb = &pmadapter->callbacks; - - /* Save callback functions */ - pmdevice->callbacks.moal_memmove(pmadapter->pmoal_handle, pcb, - &pmdevice->callbacks, - sizeof(mlan_callbacks)); - - /* Assertion for all callback functions */ - MASSERT(pcb->moal_init_fw_complete); - MASSERT(pcb->moal_shutdown_fw_complete); - MASSERT(pcb->moal_send_packet_complete); - MASSERT(pcb->moal_recv_packet); - MASSERT(pcb->moal_recv_event); - MASSERT(pcb->moal_ioctl_complete); - - MASSERT(pcb->moal_write_reg); - MASSERT(pcb->moal_read_reg); - MASSERT(pcb->moal_alloc_mlan_buffer); - MASSERT(pcb->moal_free_mlan_buffer); - MASSERT(pcb->moal_write_data_sync); - MASSERT(pcb->moal_read_data_sync); - MASSERT(pcb->moal_mfree); - MASSERT(pcb->moal_memcpy); - MASSERT(pcb->moal_memcmp); - MASSERT(pcb->moal_get_system_time); - MASSERT(pcb->moal_init_timer); - MASSERT(pcb->moal_free_timer); - MASSERT(pcb->moal_start_timer); - MASSERT(pcb->moal_stop_timer); - MASSERT(pcb->moal_init_lock); - MASSERT(pcb->moal_free_lock); - MASSERT(pcb->moal_spin_lock); - MASSERT(pcb->moal_spin_unlock); - - /* Save pmoal_handle */ - pmadapter->pmoal_handle = pmdevice->pmoal_handle; - - if ((pmdevice->int_mode == INT_MODE_GPIO) && (pmdevice->gpio_pin == 0)) { - PRINTM(MERROR, "SDIO_GPIO_INT_CONFIG: Invalid GPIO Pin\n"); - ret = MLAN_STATUS_FAILURE; - goto error; - } - pmadapter->init_para.int_mode = pmdevice->int_mode; - pmadapter->init_para.gpio_pin = pmdevice->gpio_pin; - /* card specific probing has been deferred until now .. */ - if (MLAN_STATUS_SUCCESS != (ret = wlan_sdio_probe(pmadapter))) { - ret = MLAN_STATUS_FAILURE; - goto error; - } + assert_callback = pmdevice->callbacks.moal_assert; + + ENTER(); + + MASSERT(pmdevice->callbacks.moal_malloc); + MASSERT(pmdevice->callbacks.moal_memset); + MASSERT(pmdevice->callbacks.moal_memmove); + + /* Allocate memory for adapter structure */ + if (pmdevice->callbacks.moal_vmalloc && pmdevice->callbacks.moal_vfree) + ret = pmdevice->callbacks.moal_vmalloc(pmdevice->pmoal_handle, + sizeof(mlan_adapter), + (t_u8 **) & pmadapter); + else + ret = pmdevice->callbacks.moal_malloc(pmdevice->pmoal_handle, + sizeof(mlan_adapter), + MLAN_MEM_DEF, + (t_u8 **) & pmadapter); + if ((ret != MLAN_STATUS_SUCCESS) || !pmadapter) { + ret = MLAN_STATUS_FAILURE; + goto exit_register; + } + + pmdevice->callbacks.moal_memset(pmdevice->pmoal_handle, pmadapter, + 0, sizeof(mlan_adapter)); + + pcb = &pmadapter->callbacks; + + /* Save callback functions */ + pmdevice->callbacks.moal_memmove(pmadapter->pmoal_handle, pcb, + &pmdevice->callbacks, + sizeof(mlan_callbacks)); + + /* Assertion for all callback functions */ + MASSERT(pcb->moal_init_fw_complete); + MASSERT(pcb->moal_shutdown_fw_complete); + MASSERT(pcb->moal_send_packet_complete); + MASSERT(pcb->moal_recv_packet); + MASSERT(pcb->moal_recv_event); + MASSERT(pcb->moal_ioctl_complete); + + MASSERT(pcb->moal_write_reg); + MASSERT(pcb->moal_read_reg); + MASSERT(pcb->moal_alloc_mlan_buffer); + MASSERT(pcb->moal_free_mlan_buffer); + MASSERT(pcb->moal_write_data_sync); + MASSERT(pcb->moal_read_data_sync); + MASSERT(pcb->moal_mfree); + MASSERT(pcb->moal_memcpy); + MASSERT(pcb->moal_memcmp); + MASSERT(pcb->moal_get_system_time); + MASSERT(pcb->moal_init_timer); + MASSERT(pcb->moal_free_timer); + MASSERT(pcb->moal_start_timer); + MASSERT(pcb->moal_stop_timer); + MASSERT(pcb->moal_init_lock); + MASSERT(pcb->moal_free_lock); + MASSERT(pcb->moal_spin_lock); + MASSERT(pcb->moal_spin_unlock); + + /* Save pmoal_handle */ + pmadapter->pmoal_handle = pmdevice->pmoal_handle; + + if ((pmdevice->int_mode == INT_MODE_GPIO) && (pmdevice->gpio_pin == 0)) { + PRINTM(MERROR, "SDIO_GPIO_INT_CONFIG: Invalid GPIO Pin\n"); + ret = MLAN_STATUS_FAILURE; + goto error; + } + pmadapter->init_para.int_mode = pmdevice->int_mode; + pmadapter->init_para.gpio_pin = pmdevice->gpio_pin; + /* card specific probing has been deferred until now .. */ + if (MLAN_STATUS_SUCCESS != (ret = wlan_sdio_probe(pmadapter))) { + ret = MLAN_STATUS_FAILURE; + goto error; + } #ifdef DEBUG_LEVEL1 - mlan_drvdbg = pmdevice->drvdbg; + mlan_drvdbg = pmdevice->drvdbg; #endif #ifdef MFG_CMD_SUPPORT - pmadapter->init_para.mfg_mode = pmdevice->mfg_mode; + pmadapter->init_para.mfg_mode = pmdevice->mfg_mode; #endif #ifdef SDIO_MULTI_PORT_TX_AGGR - pmadapter->init_para.mpa_tx_cfg = pmdevice->mpa_tx_cfg; + pmadapter->init_para.mpa_tx_cfg = pmdevice->mpa_tx_cfg; #endif #ifdef SDIO_MULTI_PORT_RX_AGGR - pmadapter->init_para.mpa_rx_cfg = pmdevice->mpa_rx_cfg; + pmadapter->init_para.mpa_rx_cfg = pmdevice->mpa_rx_cfg; #endif - pmadapter->init_para.auto_ds = pmdevice->auto_ds; - pmadapter->init_para.ps_mode = pmdevice->ps_mode; - if (pmdevice->max_tx_buf == MLAN_TX_DATA_BUF_SIZE_2K || - pmdevice->max_tx_buf == MLAN_TX_DATA_BUF_SIZE_4K || - pmdevice->max_tx_buf == MLAN_TX_DATA_BUF_SIZE_12K || - pmdevice->max_tx_buf == MLAN_TX_DATA_BUF_SIZE_8K) - pmadapter->init_para.max_tx_buf = pmdevice->max_tx_buf; + pmadapter->init_para.auto_ds = pmdevice->auto_ds; + pmadapter->init_para.ps_mode = pmdevice->ps_mode; + if (pmdevice->max_tx_buf == MLAN_TX_DATA_BUF_SIZE_2K || + pmdevice->max_tx_buf == MLAN_TX_DATA_BUF_SIZE_4K || + pmdevice->max_tx_buf == MLAN_TX_DATA_BUF_SIZE_12K || + pmdevice->max_tx_buf == MLAN_TX_DATA_BUF_SIZE_8K) + pmadapter->init_para.max_tx_buf = pmdevice->max_tx_buf; #ifdef STA_SUPPORT - pmadapter->init_para.cfg_11d = pmdevice->cfg_11d; + pmadapter->init_para.cfg_11d = pmdevice->cfg_11d; #else - pmadapter->init_para.cfg_11d = 0; + pmadapter->init_para.cfg_11d = 0; #endif - pmadapter->init_para.dfs_master_radar_det_en = DFS_MASTER_RADAR_DETECT_EN; - pmadapter->init_para.dfs_slave_radar_det_en = DFS_SLAVE_RADAR_DETECT_EN; - - pmadapter->priv_num = 0; - for (i = 0; i < MLAN_MAX_BSS_NUM; i++) { - pmadapter->priv[i] = MNULL; - if (pmdevice->bss_attr[i].active == MTRUE) { - /* For valid bss_attr, allocate memory for private structure */ - if (pcb->moal_vmalloc && pcb->moal_vfree) - ret = - pcb->moal_vmalloc(pmadapter->pmoal_handle, - sizeof(mlan_private), - (t_u8 **) & pmadapter->priv[i]); - else - ret = - pcb->moal_malloc(pmadapter->pmoal_handle, - sizeof(mlan_private), MLAN_MEM_DEF, - (t_u8 **) & pmadapter->priv[i]); - if (ret != MLAN_STATUS_SUCCESS || !pmadapter->priv[i]) { - ret = MLAN_STATUS_FAILURE; - goto error; - } - - pmadapter->priv_num++; - memset(pmadapter, pmadapter->priv[i], 0, sizeof(mlan_private)); - - pmadapter->priv[i]->adapter = pmadapter; - - /* Save bss_type, frame_type & bss_priority */ - pmadapter->priv[i]->bss_type = - (t_u8) pmdevice->bss_attr[i].bss_type; - pmadapter->priv[i]->frame_type = - (t_u8) pmdevice->bss_attr[i].frame_type; - pmadapter->priv[i]->bss_priority = - (t_u8) pmdevice->bss_attr[i].bss_priority; - if (pmdevice->bss_attr[i].bss_type == MLAN_BSS_TYPE_STA) - pmadapter->priv[i]->bss_role = MLAN_BSS_ROLE_STA; - else if (pmdevice->bss_attr[i].bss_type == MLAN_BSS_TYPE_UAP) - pmadapter->priv[i]->bss_role = MLAN_BSS_ROLE_UAP; + pmadapter->init_para.dfs_master_radar_det_en = + DFS_MASTER_RADAR_DETECT_EN; + pmadapter->init_para.dfs_slave_radar_det_en = DFS_SLAVE_RADAR_DETECT_EN; + + pmadapter->priv_num = 0; + for (i = 0; i < MLAN_MAX_BSS_NUM; i++) { + pmadapter->priv[i] = MNULL; + if (pmdevice->bss_attr[i].active == MTRUE) { + /* For valid bss_attr, allocate memory for private + structure */ + if (pcb->moal_vmalloc && pcb->moal_vfree) + ret = pcb->moal_vmalloc(pmadapter->pmoal_handle, + sizeof(mlan_private), + (t_u8 **) & pmadapter-> + priv[i]); + else + ret = pcb->moal_malloc(pmadapter->pmoal_handle, + sizeof(mlan_private), + MLAN_MEM_DEF, + (t_u8 **) & pmadapter-> + priv[i]); + if (ret != MLAN_STATUS_SUCCESS || !pmadapter->priv[i]) { + ret = MLAN_STATUS_FAILURE; + goto error; + } + + pmadapter->priv_num++; + memset(pmadapter, pmadapter->priv[i], 0, + sizeof(mlan_private)); + + pmadapter->priv[i]->adapter = pmadapter; + + /* Save bss_type, frame_type & bss_priority */ + pmadapter->priv[i]->bss_type = + (t_u8) pmdevice->bss_attr[i].bss_type; + pmadapter->priv[i]->frame_type = + (t_u8) pmdevice->bss_attr[i].frame_type; + pmadapter->priv[i]->bss_priority = + (t_u8) pmdevice->bss_attr[i].bss_priority; + if (pmdevice->bss_attr[i].bss_type == MLAN_BSS_TYPE_STA) + pmadapter->priv[i]->bss_role = + MLAN_BSS_ROLE_STA; + else if (pmdevice->bss_attr[i].bss_type == + MLAN_BSS_TYPE_UAP) + pmadapter->priv[i]->bss_role = + MLAN_BSS_ROLE_UAP; #ifdef WIFI_DIRECT_SUPPORT - else if (pmdevice->bss_attr[i].bss_type == MLAN_BSS_TYPE_WIFIDIRECT) { - pmadapter->priv[i]->bss_role = MLAN_BSS_ROLE_STA; - if (pmdevice->bss_attr[i].bss_virtual) - pmadapter->priv[i]->bss_virtual = MTRUE; - } + else if (pmdevice->bss_attr[i].bss_type == + MLAN_BSS_TYPE_WIFIDIRECT) { + pmadapter->priv[i]->bss_role = + MLAN_BSS_ROLE_STA; + if (pmdevice->bss_attr[i].bss_virtual) + pmadapter->priv[i]->bss_virtual = MTRUE; + } #endif - /* Save bss_index and bss_num */ - pmadapter->priv[i]->bss_index = i; - pmadapter->priv[i]->bss_num = (t_u8) pmdevice->bss_attr[i].bss_num; - - /* init function table */ - for (j = 0; mlan_ops[j]; j++) { - if (mlan_ops[j]->bss_role == GET_BSS_ROLE(pmadapter->priv[i])) { - memcpy(pmadapter, &pmadapter->priv[i]->ops, mlan_ops[j], - sizeof(mlan_operations)); - } - } - } - } - - /* Initialize lock variables */ - if (wlan_init_lock_list(pmadapter) != MLAN_STATUS_SUCCESS) { - ret = MLAN_STATUS_FAILURE; - goto error; - } - - /* Allocate memory for member of adapter structure */ - if (wlan_allocate_adapter(pmadapter)) { - ret = MLAN_STATUS_FAILURE; - goto error; - } - - /* Initialize timers */ - if (wlan_init_timer(pmadapter) != MLAN_STATUS_SUCCESS) { - ret = MLAN_STATUS_FAILURE; - goto error; - } - /* Return pointer of mlan_adapter to MOAL */ - *ppmlan_adapter = pmadapter; - - goto exit_register; - - error: - PRINTM(MINFO, "Leave mlan_register with error\n"); - /* Free timers */ - wlan_free_timer(pmadapter); - /* Free adapter structure */ - wlan_free_adapter(pmadapter); - /* Free lock variables */ - wlan_free_lock_list(pmadapter); - for (i = 0; i < MLAN_MAX_BSS_NUM; i++) { - if (pmadapter->priv[i]) { - if (pcb->moal_vmalloc && pcb->moal_vfree) - pcb->moal_vfree(pmadapter->pmoal_handle, - (t_u8 *) pmadapter->priv[i]); - else - pcb->moal_mfree(pmadapter->pmoal_handle, - (t_u8 *) pmadapter->priv[i]); - } - } - if (pcb->moal_vmalloc && pcb->moal_vfree) - pcb->moal_vfree(pmadapter->pmoal_handle, (t_u8 *) pmadapter); - else - pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) pmadapter); - - exit_register: - LEAVE(); - return ret; + /* Save bss_index and bss_num */ + pmadapter->priv[i]->bss_index = i; + pmadapter->priv[i]->bss_num = + (t_u8) pmdevice->bss_attr[i].bss_num; + + /* init function table */ + for (j = 0; mlan_ops[j]; j++) { + if (mlan_ops[j]->bss_role == + GET_BSS_ROLE(pmadapter->priv[i])) { + memcpy(pmadapter, + &pmadapter->priv[i]->ops, + mlan_ops[j], + sizeof(mlan_operations)); + } + } + } + } + + /* Initialize lock variables */ + if (wlan_init_lock_list(pmadapter) != MLAN_STATUS_SUCCESS) { + ret = MLAN_STATUS_FAILURE; + goto error; + } + + /* Allocate memory for member of adapter structure */ + if (wlan_allocate_adapter(pmadapter)) { + ret = MLAN_STATUS_FAILURE; + goto error; + } + + /* Initialize timers */ + if (wlan_init_timer(pmadapter) != MLAN_STATUS_SUCCESS) { + ret = MLAN_STATUS_FAILURE; + goto error; + } + /* Return pointer of mlan_adapter to MOAL */ + *ppmlan_adapter = pmadapter; + + goto exit_register; + +error: + PRINTM(MINFO, "Leave mlan_register with error\n"); + /* Free timers */ + wlan_free_timer(pmadapter); + /* Free adapter structure */ + wlan_free_adapter(pmadapter); + /* Free lock variables */ + wlan_free_lock_list(pmadapter); + for (i = 0; i < MLAN_MAX_BSS_NUM; i++) { + if (pmadapter->priv[i]) { + if (pcb->moal_vmalloc && pcb->moal_vfree) + pcb->moal_vfree(pmadapter->pmoal_handle, + (t_u8 *) pmadapter->priv[i]); + else + pcb->moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pmadapter->priv[i]); + } + } + if (pcb->moal_vmalloc && pcb->moal_vfree) + pcb->moal_vfree(pmadapter->pmoal_handle, (t_u8 *) pmadapter); + else + pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) pmadapter); + +exit_register: + LEAVE(); + return ret; } /** * @brief This function unregisters MOAL from MLAN module. - * + * * @param pmlan_adapter A pointer to a mlan_device structure * allocated in MOAL * @@ -391,51 +404,51 @@ mlan_register(IN pmlan_device pmdevice, OUT t_void ** ppmlan_adapter) mlan_status mlan_unregister(IN t_void * pmlan_adapter) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; - pmlan_callbacks pcb; - t_s32 i = 0; - - MASSERT(pmlan_adapter); - - ENTER(); - - pcb = &pmadapter->callbacks; - - /* Free adapter structure */ - wlan_free_adapter(pmadapter); - - /* Free timers */ - wlan_free_timer(pmadapter); - - /* Free lock variables */ - wlan_free_lock_list(pmadapter); - - /* Free private structures */ - for (i = 0; i < pmadapter->priv_num; i++) { - if (pmadapter->priv[i]) { - if (pcb->moal_vmalloc && pcb->moal_vfree) - pcb->moal_vfree(pmadapter->pmoal_handle, - (t_u8 *) pmadapter->priv[i]); - else - pcb->moal_mfree(pmadapter->pmoal_handle, - (t_u8 *) pmadapter->priv[i]); - } - } - - /* Free mlan_adapter */ - if (pcb->moal_vmalloc && pcb->moal_vfree) - pcb->moal_vfree(pmadapter->pmoal_handle, (t_u8 *) pmadapter); - else - pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) pmadapter); - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; + pmlan_callbacks pcb; + t_s32 i = 0; + + MASSERT(pmlan_adapter); + + ENTER(); + + pcb = &pmadapter->callbacks; + + /* Free adapter structure */ + wlan_free_adapter(pmadapter); + + /* Free timers */ + wlan_free_timer(pmadapter); + + /* Free lock variables */ + wlan_free_lock_list(pmadapter); + + /* Free private structures */ + for (i = 0; i < pmadapter->priv_num; i++) { + if (pmadapter->priv[i]) { + if (pcb->moal_vmalloc && pcb->moal_vfree) + pcb->moal_vfree(pmadapter->pmoal_handle, + (t_u8 *) pmadapter->priv[i]); + else + pcb->moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) pmadapter->priv[i]); + } + } + + /* Free mlan_adapter */ + if (pcb->moal_vmalloc && pcb->moal_vfree) + pcb->moal_vfree(pmadapter->pmoal_handle, (t_u8 *) pmadapter); + else + pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) pmadapter); + + LEAVE(); + return ret; } /** * @brief This function downloads the firmware - * + * * @param pmlan_adapter A pointer to a t_void pointer to store * mlan_adapter structure pointer * @param pmfw A pointer to firmware image @@ -448,69 +461,70 @@ mlan_unregister(IN t_void * pmlan_adapter) mlan_status mlan_dnld_fw(IN t_void * pmlan_adapter, IN pmlan_fw_image pmfw) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; - t_u32 poll_num = 1; - t_u32 winner = 0; - - ENTER(); - MASSERT(pmlan_adapter); - - /* Card specific probing */ - ret = wlan_sdio_probe(pmadapter); - if (ret == MLAN_STATUS_FAILURE) { - PRINTM(MERROR, "WLAN SDIO probe failed\n", ret); - LEAVE(); - return ret; - } - - /* Check if firmware is already running */ - ret = wlan_check_fw_status(pmadapter, poll_num); - if (ret == MLAN_STATUS_SUCCESS) { - PRINTM(MMSG, "WLAN FW already running! Skip FW download\n"); - goto done; - } - poll_num = MAX_FIRMWARE_POLL_TRIES; - - /* Check if other interface is downloading */ - ret = wlan_check_winner_status(pmadapter, &winner); - if (ret == MLAN_STATUS_FAILURE) { - PRINTM(MFATAL, "WLAN read winner status failed!\n"); - goto done; - } - if (winner) { - PRINTM(MMSG, "WLAN is not the winner (0x%x). Skip FW download\n", - winner); - poll_num = MAX_MULTI_INTERFACE_POLL_TRIES; - goto poll_fw; - } - - if (pmfw) { - /* Download helper/firmware */ - ret = wlan_dnld_fw(pmadapter, pmfw); - if (ret != MLAN_STATUS_SUCCESS) { - PRINTM(MERROR, "wlan_dnld_fw fail ret=0x%x\n", ret); - LEAVE(); - return ret; - } - } - - poll_fw: - /* Check if the firmware is downloaded successfully or not */ - ret = wlan_check_fw_status(pmadapter, poll_num); - if (ret != MLAN_STATUS_SUCCESS) { - PRINTM(MFATAL, "FW failed to be active in time!\n"); - ret = MLAN_STATUS_FAILURE; - LEAVE(); - return ret; - } - done: - - /* re-enable host interrupt for mlan after fw dnld is successful */ - wlan_enable_host_int(pmadapter); - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; + t_u32 poll_num = 1; + t_u32 winner = 0; + + ENTER(); + MASSERT(pmlan_adapter); + + /* Card specific probing */ + ret = wlan_sdio_probe(pmadapter); + if (ret == MLAN_STATUS_FAILURE) { + PRINTM(MERROR, "WLAN SDIO probe failed\n", ret); + LEAVE(); + return ret; + } + + /* Check if firmware is already running */ + ret = wlan_check_fw_status(pmadapter, poll_num); + if (ret == MLAN_STATUS_SUCCESS) { + PRINTM(MMSG, "WLAN FW already running! Skip FW download\n"); + goto done; + } + poll_num = MAX_FIRMWARE_POLL_TRIES; + + /* Check if other interface is downloading */ + ret = wlan_check_winner_status(pmadapter, &winner); + if (ret == MLAN_STATUS_FAILURE) { + PRINTM(MFATAL, "WLAN read winner status failed!\n"); + goto done; + } + if (winner) { + PRINTM(MMSG, + "WLAN is not the winner (0x%x). Skip FW download\n", + winner); + poll_num = MAX_MULTI_INTERFACE_POLL_TRIES; + goto poll_fw; + } + + if (pmfw) { + /* Download helper/firmware */ + ret = wlan_dnld_fw(pmadapter, pmfw); + if (ret != MLAN_STATUS_SUCCESS) { + PRINTM(MERROR, "wlan_dnld_fw fail ret=0x%x\n", ret); + LEAVE(); + return ret; + } + } + +poll_fw: + /* Check if the firmware is downloaded successfully or not */ + ret = wlan_check_fw_status(pmadapter, poll_num); + if (ret != MLAN_STATUS_SUCCESS) { + PRINTM(MFATAL, "FW failed to be active in time!\n"); + ret = MLAN_STATUS_FAILURE; + LEAVE(); + return ret; + } +done: + + /* re-enable host interrupt for mlan after fw dnld is successful */ + wlan_enable_host_int(pmadapter); + + LEAVE(); + return ret; } /** @@ -526,25 +540,25 @@ mlan_dnld_fw(IN t_void * pmlan_adapter, IN pmlan_fw_image pmfw) mlan_status mlan_set_init_param(IN t_void * pmlan_adapter, IN pmlan_init_param pparam) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; - ENTER(); - MASSERT(pmlan_adapter); + ENTER(); + MASSERT(pmlan_adapter); /** Save cal data in MLAN */ - if ((pparam->pcal_data_buf) && (pparam->cal_data_len > 0)) { - pmadapter->pcal_data = pparam->pcal_data_buf; - pmadapter->cal_data_len = pparam->cal_data_len; - } + if ((pparam->pcal_data_buf) && (pparam->cal_data_len > 0)) { + pmadapter->pcal_data = pparam->pcal_data_buf; + pmadapter->cal_data_len = pparam->cal_data_len; + } - LEAVE(); - return ret; + LEAVE(); + return ret; } /** * @brief This function initializes the firmware - * + * * @param pmlan_adapter A pointer to a t_void pointer to store * mlan_adapter structure pointer * @@ -558,20 +572,20 @@ mlan_set_init_param(IN t_void * pmlan_adapter, IN pmlan_init_param pparam) mlan_status mlan_init_fw(IN t_void * pmlan_adapter) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; - ENTER(); - MASSERT(pmlan_adapter); + ENTER(); + MASSERT(pmlan_adapter); - pmadapter->hw_status = WlanHardwareStatusInitializing; + pmadapter->hw_status = WlanHardwareStatusInitializing; - /* Initialize firmware, may return PENDING */ - ret = wlan_init_fw(pmadapter); - PRINTM(MINFO, "wlan_init_fw returned ret=0x%x\n", ret); + /* Initialize firmware, may return PENDING */ + ret = wlan_init_fw(pmadapter); + PRINTM(MINFO, "wlan_init_fw returned ret=0x%x\n", ret); - LEAVE(); - return ret; + LEAVE(); + return ret; } /** @@ -589,48 +603,48 @@ mlan_init_fw(IN t_void * pmlan_adapter) mlan_status mlan_shutdown_fw(IN t_void * pmlan_adapter) { - mlan_status ret = MLAN_STATUS_PENDING; - mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; - pmlan_callbacks pcb; - t_s32 i = 0; - - ENTER(); - - MASSERT(pmlan_adapter); - /* MLAN already shutdown */ - if (pmadapter->hw_status == WlanHardwareStatusNotReady) { - LEAVE(); - return MLAN_STATUS_SUCCESS; - } - - pmadapter->hw_status = WlanHardwareStatusClosing; - /* Wait for mlan_process to complete */ - if (pmadapter->mlan_processing) { - PRINTM(MWARN, "MLAN main processing is still running\n"); - LEAVE(); - return ret; - } - - /* Shut down MLAN */ - PRINTM(MINFO, "Shutdown MLAN...\n"); - - /* Cancel all pending commands and complete ioctls */ - wlan_cancel_all_pending_cmd(pmadapter); - - /* Clean up priv structures */ - for (i = 0; i < pmadapter->priv_num; i++) { - if (pmadapter->priv[i]) { - wlan_free_priv(pmadapter->priv[i]); - } - } - - pcb = &pmadapter->callbacks; - - /* Notify completion */ - ret = wlan_shutdown_fw_complete(pmadapter); - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_PENDING; + mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; + pmlan_callbacks pcb; + t_s32 i = 0; + + ENTER(); + + MASSERT(pmlan_adapter); + /* MLAN already shutdown */ + if (pmadapter->hw_status == WlanHardwareStatusNotReady) { + LEAVE(); + return MLAN_STATUS_SUCCESS; + } + + pmadapter->hw_status = WlanHardwareStatusClosing; + /* Wait for mlan_process to complete */ + if (pmadapter->mlan_processing) { + PRINTM(MWARN, "MLAN main processing is still running\n"); + LEAVE(); + return ret; + } + + /* Shut down MLAN */ + PRINTM(MINFO, "Shutdown MLAN...\n"); + + /* Cancel all pending commands and complete ioctls */ + wlan_cancel_all_pending_cmd(pmadapter); + + /* Clean up priv structures */ + for (i = 0; i < pmadapter->priv_num; i++) { + if (pmadapter->priv[i]) { + wlan_free_priv(pmadapter->priv[i]); + } + } + + pcb = &pmadapter->callbacks; + + /* Notify completion */ + ret = wlan_shutdown_fw_complete(pmadapter); + + LEAVE(); + return ret; } /** @@ -643,198 +657,209 @@ mlan_shutdown_fw(IN t_void * pmlan_adapter) mlan_status mlan_main_process(IN t_void * pmlan_adapter) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; - pmlan_callbacks pcb; - - ENTER(); - - MASSERT(pmlan_adapter); - - pcb = &pmadapter->callbacks; - - pcb->moal_spin_lock(pmadapter->pmoal_handle, pmadapter->pmain_proc_lock); - - /* Check if already processing */ - if (pmadapter->mlan_processing) { - pmadapter->more_task_flag = MTRUE; - pcb->moal_spin_unlock(pmadapter->pmoal_handle, - pmadapter->pmain_proc_lock); - goto exit_main_proc; - } else { - pmadapter->mlan_processing = MTRUE; - pcb->moal_spin_unlock(pmadapter->pmoal_handle, - pmadapter->pmain_proc_lock); - } - process_start: - do { - pcb->moal_spin_lock(pmadapter->pmoal_handle, - pmadapter->pmain_proc_lock); - pmadapter->more_task_flag = MFALSE; - pcb->moal_spin_unlock(pmadapter->pmoal_handle, - pmadapter->pmain_proc_lock); - /* Is MLAN shutting down or not ready? */ - if ((pmadapter->hw_status == WlanHardwareStatusClosing) || - (pmadapter->hw_status == WlanHardwareStatusNotReady)) - break; - - /* Handle pending SDIO interrupts if any */ - if (pmadapter->sdio_ireg) { - if (pmadapter->hs_activated == MTRUE) - wlan_process_hs_config(pmadapter); - wlan_process_int_status(pmadapter); - } - - /* Need to wake up the card ? */ - if ((pmadapter->ps_state == PS_STATE_SLEEP) && - (pmadapter->pm_wakeup_card_req && - !pmadapter->pm_wakeup_fw_try) && - (util_peek_list - (pmadapter->pmoal_handle, &pmadapter->cmd_pending_q, - pcb->moal_spin_lock, pcb->moal_spin_unlock) - || !wlan_bypass_tx_list_empty(pmadapter) - || !wlan_wmm_lists_empty(pmadapter) - )) { - pmadapter->pm_wakeup_fw_try = MTRUE; - wlan_pm_wakeup_card(pmadapter); - continue; - } - if (IS_CARD_RX_RCVD(pmadapter)) { - pmadapter->data_received = MFALSE; - if (pmadapter->hs_activated == MTRUE) { - pmadapter->is_hs_configured = MFALSE; - wlan_host_sleep_activated_event(wlan_get_priv - (pmadapter, MLAN_BSS_ROLE_ANY), - MFALSE); - } - pmadapter->pm_wakeup_fw_try = MFALSE; - if (pmadapter->ps_state == PS_STATE_SLEEP) - pmadapter->ps_state = PS_STATE_AWAKE; - } else { - /* We have tried to wakeup the card already */ - if (pmadapter->pm_wakeup_fw_try) - break; - if (pmadapter->ps_state != PS_STATE_AWAKE || - (pmadapter->tx_lock_flag == MTRUE)) - break; - - if (pmadapter->scan_processing - || pmadapter->data_sent - || (wlan_bypass_tx_list_empty(pmadapter) && - wlan_wmm_lists_empty(pmadapter)) - || wlan_11h_radar_detected_tx_blocked(pmadapter) - ) { - if (pmadapter->cmd_sent || pmadapter->curr_cmd || - (!util_peek_list - (pmadapter->pmoal_handle, &pmadapter->cmd_pending_q, - pcb->moal_spin_lock, pcb->moal_spin_unlock))) { - break; - } - } - } - - /* Check for Cmd Resp */ - if (pmadapter->cmd_resp_received) { - pmadapter->cmd_resp_received = MFALSE; - wlan_process_cmdresp(pmadapter); - - /* call moal back when init_fw is done */ - if (pmadapter->hw_status == WlanHardwareStatusInitdone) { - pmadapter->hw_status = WlanHardwareStatusReady; - wlan_init_fw_complete(pmadapter); - } - } - - /* Check for event */ - if (pmadapter->event_received) { - pmadapter->event_received = MFALSE; - wlan_process_event(pmadapter); - } - - /* Check if we need to confirm Sleep Request received previously */ - if (pmadapter->ps_state == PS_STATE_PRE_SLEEP) { - if (!pmadapter->cmd_sent && !pmadapter->curr_cmd) { - wlan_check_ps_cond(pmadapter); - } - } - - /* - * The ps_state may have been changed during processing of - * Sleep Request event. - */ - if ((pmadapter->ps_state == PS_STATE_SLEEP) - || (pmadapter->ps_state == PS_STATE_PRE_SLEEP) - || (pmadapter->ps_state == PS_STATE_SLEEP_CFM) - || (pmadapter->tx_lock_flag == MTRUE) - ) - continue; - - if (!pmadapter->cmd_sent && !pmadapter->curr_cmd) { - if (wlan_exec_next_cmd(pmadapter) == MLAN_STATUS_FAILURE) { - ret = MLAN_STATUS_FAILURE; - break; - } - } - - if (!pmadapter->scan_processing - && !pmadapter->data_sent && - !wlan_11h_radar_detected_tx_blocked(pmadapter) && - !wlan_bypass_tx_list_empty(pmadapter)) { - PRINTM(MINFO, "mlan_send_pkt(): deq(bybass_txq)\n"); - wlan_process_bypass_tx(pmadapter); - if (pmadapter->hs_activated == MTRUE) { - pmadapter->is_hs_configured = MFALSE; - wlan_host_sleep_activated_event(wlan_get_priv - (pmadapter, MLAN_BSS_ROLE_ANY), - MFALSE); - } - } - - if (!pmadapter->scan_processing - && !pmadapter->data_sent && !wlan_wmm_lists_empty(pmadapter) - && !wlan_11h_radar_detected_tx_blocked(pmadapter) - ) { - wlan_wmm_process_tx(pmadapter); - if (pmadapter->hs_activated == MTRUE) { - pmadapter->is_hs_configured = MFALSE; - wlan_host_sleep_activated_event(wlan_get_priv - (pmadapter, MLAN_BSS_ROLE_ANY), - MFALSE); - } - } + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; + pmlan_callbacks pcb; + + ENTER(); + + MASSERT(pmlan_adapter); + + pcb = &pmadapter->callbacks; + + pcb->moal_spin_lock(pmadapter->pmoal_handle, + pmadapter->pmain_proc_lock); + + /* Check if already processing */ + if (pmadapter->mlan_processing) { + pmadapter->more_task_flag = MTRUE; + pcb->moal_spin_unlock(pmadapter->pmoal_handle, + pmadapter->pmain_proc_lock); + goto exit_main_proc; + } else { + pmadapter->mlan_processing = MTRUE; + pcb->moal_spin_unlock(pmadapter->pmoal_handle, + pmadapter->pmain_proc_lock); + } +process_start: + do { + pcb->moal_spin_lock(pmadapter->pmoal_handle, + pmadapter->pmain_proc_lock); + pmadapter->more_task_flag = MFALSE; + pcb->moal_spin_unlock(pmadapter->pmoal_handle, + pmadapter->pmain_proc_lock); + /* Is MLAN shutting down or not ready? */ + if ((pmadapter->hw_status == WlanHardwareStatusClosing) || + (pmadapter->hw_status == WlanHardwareStatusNotReady)) + break; + + /* Handle pending SDIO interrupts if any */ + if (pmadapter->sdio_ireg) { + if (pmadapter->hs_activated == MTRUE) + wlan_process_hs_config(pmadapter); + wlan_process_int_status(pmadapter); + } + + /* Need to wake up the card ? */ + if ((pmadapter->ps_state == PS_STATE_SLEEP) && + (pmadapter->pm_wakeup_card_req && + !pmadapter->pm_wakeup_fw_try) && + (util_peek_list + (pmadapter->pmoal_handle, &pmadapter->cmd_pending_q, + pcb->moal_spin_lock, pcb->moal_spin_unlock) + || !wlan_bypass_tx_list_empty(pmadapter) + || !wlan_wmm_lists_empty(pmadapter) + )) { + pmadapter->pm_wakeup_fw_try = MTRUE; + wlan_pm_wakeup_card(pmadapter); + continue; + } + if (IS_CARD_RX_RCVD(pmadapter)) { + pmadapter->data_received = MFALSE; + if (pmadapter->hs_activated == MTRUE) { + pmadapter->is_hs_configured = MFALSE; + wlan_host_sleep_activated_event(wlan_get_priv + (pmadapter, + MLAN_BSS_ROLE_ANY), + MFALSE); + } + pmadapter->pm_wakeup_fw_try = MFALSE; + if (pmadapter->ps_state == PS_STATE_SLEEP) + pmadapter->ps_state = PS_STATE_AWAKE; + } else { + /* We have tried to wakeup the card already */ + if (pmadapter->pm_wakeup_fw_try) + break; + if (pmadapter->ps_state != PS_STATE_AWAKE || + (pmadapter->tx_lock_flag == MTRUE)) + break; + + if (pmadapter->scan_processing + || pmadapter->data_sent + || (wlan_bypass_tx_list_empty(pmadapter) && + wlan_wmm_lists_empty(pmadapter)) + || wlan_11h_radar_detected_tx_blocked(pmadapter) + ) { + if (pmadapter->cmd_sent || pmadapter->curr_cmd + || + (!util_peek_list + (pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + pcb->moal_spin_lock, + pcb->moal_spin_unlock))) { + break; + } + } + } + + /* Check for Cmd Resp */ + if (pmadapter->cmd_resp_received) { + pmadapter->cmd_resp_received = MFALSE; + wlan_process_cmdresp(pmadapter); + + /* call moal back when init_fw is done */ + if (pmadapter->hw_status == WlanHardwareStatusInitdone) { + pmadapter->hw_status = WlanHardwareStatusReady; + wlan_init_fw_complete(pmadapter); + } + } + + /* Check for event */ + if (pmadapter->event_received) { + pmadapter->event_received = MFALSE; + wlan_process_event(pmadapter); + } + + /* Check if we need to confirm Sleep Request received + previously */ + if (pmadapter->ps_state == PS_STATE_PRE_SLEEP) { + if (!pmadapter->cmd_sent && !pmadapter->curr_cmd) { + wlan_check_ps_cond(pmadapter); + } + } + + /* + * The ps_state may have been changed during processing of + * Sleep Request event. + */ + if ((pmadapter->ps_state == PS_STATE_SLEEP) + || (pmadapter->ps_state == PS_STATE_PRE_SLEEP) + || (pmadapter->ps_state == PS_STATE_SLEEP_CFM) + || (pmadapter->tx_lock_flag == MTRUE) + ) + continue; + + if (!pmadapter->cmd_sent && !pmadapter->curr_cmd) { + if (wlan_exec_next_cmd(pmadapter) == + MLAN_STATUS_FAILURE) { + ret = MLAN_STATUS_FAILURE; + break; + } + } + + if (!pmadapter->scan_processing + && !pmadapter->data_sent && + !wlan_11h_radar_detected_tx_blocked(pmadapter) && + !wlan_bypass_tx_list_empty(pmadapter)) { + PRINTM(MINFO, "mlan_send_pkt(): deq(bybass_txq)\n"); + wlan_process_bypass_tx(pmadapter); + if (pmadapter->hs_activated == MTRUE) { + pmadapter->is_hs_configured = MFALSE; + wlan_host_sleep_activated_event(wlan_get_priv + (pmadapter, + MLAN_BSS_ROLE_ANY), + MFALSE); + } + } + + if (!pmadapter->scan_processing + && !pmadapter->data_sent && !wlan_wmm_lists_empty(pmadapter) + && !wlan_11h_radar_detected_tx_blocked(pmadapter) + ) { + wlan_wmm_process_tx(pmadapter); + if (pmadapter->hs_activated == MTRUE) { + pmadapter->is_hs_configured = MFALSE; + wlan_host_sleep_activated_event(wlan_get_priv + (pmadapter, + MLAN_BSS_ROLE_ANY), + MFALSE); + } + } #ifdef STA_SUPPORT - if (pmadapter->delay_null_pkt && !pmadapter->cmd_sent && - !pmadapter->curr_cmd && !IS_COMMAND_PENDING(pmadapter) && - wlan_bypass_tx_list_empty(pmadapter) && - wlan_wmm_lists_empty(pmadapter)) { - if (wlan_send_null_packet - (wlan_get_priv(pmadapter, MLAN_BSS_ROLE_STA), - MRVDRV_TxPD_POWER_MGMT_NULL_PACKET | - MRVDRV_TxPD_POWER_MGMT_LAST_PACKET) - == MLAN_STATUS_SUCCESS) { - pmadapter->delay_null_pkt = MFALSE; - } - break; - } + if (pmadapter->delay_null_pkt && !pmadapter->cmd_sent && + !pmadapter->curr_cmd && !IS_COMMAND_PENDING(pmadapter) && + wlan_bypass_tx_list_empty(pmadapter) && + wlan_wmm_lists_empty(pmadapter)) { + if (wlan_send_null_packet + (wlan_get_priv(pmadapter, MLAN_BSS_ROLE_STA), + MRVDRV_TxPD_POWER_MGMT_NULL_PACKET | + MRVDRV_TxPD_POWER_MGMT_LAST_PACKET) + == MLAN_STATUS_SUCCESS) { + pmadapter->delay_null_pkt = MFALSE; + } + break; + } #endif - } while (MTRUE); - - pcb->moal_spin_lock(pmadapter->pmoal_handle, pmadapter->pmain_proc_lock); - if (pmadapter->more_task_flag == MTRUE) { - pcb->moal_spin_unlock(pmadapter->pmoal_handle, - pmadapter->pmain_proc_lock); - goto process_start; - } - pmadapter->mlan_processing = MFALSE; - pcb->moal_spin_unlock(pmadapter->pmoal_handle, pmadapter->pmain_proc_lock); - - exit_main_proc: - if (pmadapter->hw_status == WlanHardwareStatusClosing) - mlan_shutdown_fw(pmadapter); - LEAVE(); - return ret; + } while (MTRUE); + + pcb->moal_spin_lock(pmadapter->pmoal_handle, + pmadapter->pmain_proc_lock); + if (pmadapter->more_task_flag == MTRUE) { + pcb->moal_spin_unlock(pmadapter->pmoal_handle, + pmadapter->pmain_proc_lock); + goto process_start; + } + pmadapter->mlan_processing = MFALSE; + pcb->moal_spin_unlock(pmadapter->pmoal_handle, + pmadapter->pmain_proc_lock); + +exit_main_proc: + if (pmadapter->hw_status == WlanHardwareStatusClosing) + mlan_shutdown_fw(pmadapter); + LEAVE(); + return ret; } /** @@ -848,40 +873,40 @@ mlan_main_process(IN t_void * pmlan_adapter) mlan_status mlan_send_packet(IN t_void * pmlan_adapter, IN pmlan_buffer pmbuf) { - mlan_status ret = MLAN_STATUS_PENDING; - mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; - - ENTER(); - MASSERT(pmlan_adapter && pmbuf); - - MASSERT(pmbuf->bss_index < pmadapter->priv_num); - pmbuf->flags = MLAN_BUF_FLAG_MOAL_TX_BUF; - - if (((pmadapter->priv[pmbuf->bss_index]->port_ctrl_mode == MTRUE) && - ((mlan_ntohs(*(t_u16 *) & pmbuf->pbuf[pmbuf->data_offset + - MLAN_ETHER_PKT_TYPE_OFFSET]) == - MLAN_ETHER_PKT_TYPE_EAPOL) - || - (mlan_ntohs - (*(t_u16 *) & pmbuf-> - pbuf[pmbuf->data_offset + MLAN_ETHER_PKT_TYPE_OFFSET]) == - MLAN_ETHER_PKT_TYPE_WAPI) - )) - || (pmbuf->buf_type == MLAN_BUF_TYPE_RAW_DATA) - - ) { - PRINTM(MINFO, "mlan_send_pkt(): enq(bybass_txq)\n"); - wlan_add_buf_bypass_txqueue(pmadapter, pmbuf); - } else { - /* Transmit the packet */ - wlan_wmm_add_buf_txqueue(pmadapter, pmbuf); - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_PENDING; + mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; + + ENTER(); + MASSERT(pmlan_adapter && pmbuf); + + MASSERT(pmbuf->bss_index < pmadapter->priv_num); + pmbuf->flags = MLAN_BUF_FLAG_MOAL_TX_BUF; + + if (((pmadapter->priv[pmbuf->bss_index]->port_ctrl_mode == MTRUE) && + ((mlan_ntohs(*(t_u16 *) & pmbuf->pbuf[pmbuf->data_offset + + MLAN_ETHER_PKT_TYPE_OFFSET]) + == MLAN_ETHER_PKT_TYPE_EAPOL) + || + (mlan_ntohs + (*(t_u16 *) & pmbuf-> + pbuf[pmbuf->data_offset + MLAN_ETHER_PKT_TYPE_OFFSET]) == + MLAN_ETHER_PKT_TYPE_WAPI) + )) + || (pmbuf->buf_type == MLAN_BUF_TYPE_RAW_DATA) + + ) { + PRINTM(MINFO, "mlan_send_pkt(): enq(bybass_txq)\n"); + wlan_add_buf_bypass_txqueue(pmadapter, pmbuf); + } else { + /* Transmit the packet */ + wlan_wmm_add_buf_txqueue(pmadapter, pmbuf); + } + + LEAVE(); + return ret; } -/** +/** * @brief MLAN ioctl handler * * @param adapter A pointer to mlan_adapter structure @@ -892,27 +917,27 @@ mlan_send_packet(IN t_void * pmlan_adapter, IN pmlan_buffer pmbuf) mlan_status mlan_ioctl(IN t_void * adapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_adapter pmadapter = (pmlan_adapter) adapter; - pmlan_private pmpriv = MNULL; - - ENTER(); - - if (pioctl_req == MNULL) { - PRINTM(MERROR, "MLAN IOCTL information buffer is NULL\n"); - ret = MLAN_STATUS_FAILURE; - goto exit; - } - if (pioctl_req->action == MLAN_ACT_CANCEL) { - wlan_cancel_pending_ioctl(pmadapter, pioctl_req); - ret = MLAN_STATUS_SUCCESS; - goto exit; - } - pmpriv = pmadapter->priv[pioctl_req->bss_index]; - ret = pmpriv->ops.ioctl(adapter, pioctl_req); - exit: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_adapter pmadapter = (pmlan_adapter) adapter; + pmlan_private pmpriv = MNULL; + + ENTER(); + + if (pioctl_req == MNULL) { + PRINTM(MERROR, "MLAN IOCTL information buffer is NULL\n"); + ret = MLAN_STATUS_FAILURE; + goto exit; + } + if (pioctl_req->action == MLAN_ACT_CANCEL) { + wlan_cancel_pending_ioctl(pmadapter, pioctl_req); + ret = MLAN_STATUS_SUCCESS; + goto exit; + } + pmpriv = pmadapter->priv[pioctl_req->bss_index]; + ret = pmpriv->ops.ioctl(adapter, pioctl_req); +exit: + LEAVE(); + return ret; } /** @@ -926,14 +951,14 @@ mlan_ioctl(IN t_void * adapter, IN pmlan_ioctl_req pioctl_req) */ mlan_status mlan_recv_packet_complete(IN t_void * pmlan_adapter, - IN pmlan_buffer pmbuf, IN mlan_status status) + IN pmlan_buffer pmbuf, IN mlan_status status) { - mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; + mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; - ENTER(); - wlan_recv_packet_complete(pmadapter, pmbuf, status); - LEAVE(); - return MLAN_STATUS_SUCCESS; + ENTER(); + wlan_recv_packet_complete(pmadapter, pmbuf, status); + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -948,31 +973,31 @@ mlan_recv_packet_complete(IN t_void * pmlan_adapter, t_u8 mlan_select_wmm_queue(IN t_void * pmlan_adapter, IN t_u8 bss_num, IN t_u8 tid) { - mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; - pmlan_private pmpriv = pmadapter->priv[bss_num]; - t_u8 ret; - ENTER(); - ret = wlan_wmm_select_queue(pmpriv, tid); - LEAVE(); - return ret; + mlan_adapter *pmadapter = (mlan_adapter *) pmlan_adapter; + pmlan_private pmpriv = pmadapter->priv[bss_num]; + t_u8 ret; + ENTER(); + ret = wlan_wmm_select_queue(pmpriv, tid); + LEAVE(); + return ret; } -/** +/** * @brief This function gets interrupt status. - * + * * @param adapter A pointer to mlan_adapter structure * @return N/A */ t_void mlan_interrupt(IN t_void * adapter) { - mlan_adapter *pmadapter = (mlan_adapter *) adapter; - - ENTER(); - if (!pmadapter->pps_uapsd_mode && pmadapter->ps_state == PS_STATE_SLEEP) { - pmadapter->pm_wakeup_fw_try = MFALSE; - pmadapter->ps_state = PS_STATE_AWAKE; - } - wlan_interrupt(pmadapter); - LEAVE(); + mlan_adapter *pmadapter = (mlan_adapter *) adapter; + + ENTER(); + if (!pmadapter->pps_uapsd_mode && pmadapter->ps_state == PS_STATE_SLEEP) { + pmadapter->pm_wakeup_fw_try = MFALSE; + pmadapter->ps_state = PS_STATE_AWAKE; + } + wlan_interrupt(pmadapter); + LEAVE(); } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_sta_cmd.c b/drivers/net/wireless/sd8897/mlan/mlan_sta_cmd.c index fcec2e4189cb..7972bdb9bfe4 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_sta_cmd.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_sta_cmd.c @@ -4,7 +4,7 @@ * it prepares command and sends it to firmware when * it is ready. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -50,9 +50,9 @@ Change log: Local Functions ********************************************************/ -/** +/** * @brief This function prepares command of RSSI info. - * + * * @param pmpriv A pointer to mlan_private structure * @param pcmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action Command action @@ -61,34 +61,36 @@ Change log: */ static mlan_status wlan_cmd_802_11_rssi_info(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * pcmd, IN t_u16 cmd_action) + IN HostCmd_DS_COMMAND * pcmd, IN t_u16 cmd_action) { - ENTER(); - - pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_RSSI_INFO); - pcmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_RSSI_INFO) + S_DS_GEN); - pcmd->params.rssi_info.action = wlan_cpu_to_le16(cmd_action); - pcmd->params.rssi_info.ndata = wlan_cpu_to_le16(pmpriv->data_avg_factor); - pcmd->params.rssi_info.nbcn = wlan_cpu_to_le16(pmpriv->bcn_avg_factor); - - /* Reset SNR/NF/RSSI values in private structure */ - pmpriv->data_rssi_last = 0; - pmpriv->data_nf_last = 0; - pmpriv->data_rssi_avg = 0; - pmpriv->data_nf_avg = 0; - pmpriv->bcn_rssi_last = 0; - pmpriv->bcn_nf_last = 0; - pmpriv->bcn_rssi_avg = 0; - pmpriv->bcn_nf_avg = 0; - - LEAVE(); - return MLAN_STATUS_SUCCESS; + ENTER(); + + pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_RSSI_INFO); + pcmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_RSSI_INFO) + + S_DS_GEN); + pcmd->params.rssi_info.action = wlan_cpu_to_le16(cmd_action); + pcmd->params.rssi_info.ndata = + wlan_cpu_to_le16(pmpriv->data_avg_factor); + pcmd->params.rssi_info.nbcn = wlan_cpu_to_le16(pmpriv->bcn_avg_factor); + + /* Reset SNR/NF/RSSI values in private structure */ + pmpriv->data_rssi_last = 0; + pmpriv->data_nf_last = 0; + pmpriv->data_rssi_avg = 0; + pmpriv->data_nf_avg = 0; + pmpriv->bcn_rssi_last = 0; + pmpriv->bcn_nf_last = 0; + pmpriv->bcn_rssi_avg = 0; + pmpriv->bcn_nf_avg = 0; + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command of snmp_mib. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -99,113 +101,127 @@ wlan_cmd_802_11_rssi_info(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_802_11_snmp_mib(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, - IN t_u32 cmd_oid, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, + IN t_u32 cmd_oid, IN t_void * pdata_buf) { - HostCmd_DS_802_11_SNMP_MIB *psnmp_mib = &cmd->params.smib; - t_u32 ul_temp; - - ENTER(); - PRINTM(MINFO, "SNMP_CMD: cmd_oid = 0x%x\n", cmd_oid); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_SNMP_MIB); - cmd->size = sizeof(HostCmd_DS_802_11_SNMP_MIB) - 1 + S_DS_GEN; - - if (cmd_action == HostCmd_ACT_GEN_GET) { - psnmp_mib->query_type = wlan_cpu_to_le16(HostCmd_ACT_GEN_GET); - psnmp_mib->buf_size = wlan_cpu_to_le16(MAX_SNMP_BUF_SIZE); - cmd->size += MAX_SNMP_BUF_SIZE; - } - - switch (cmd_oid) { - case DtimPeriod_i: - psnmp_mib->oid = wlan_cpu_to_le16((t_u16) DtimPeriod_i); - if (cmd_action == HostCmd_ACT_GEN_SET) { - psnmp_mib->query_type = wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); - psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u8)); - ul_temp = *((t_u32 *) pdata_buf); - psnmp_mib->value[0] = (t_u8) ul_temp; - cmd->size += sizeof(t_u8); - } - break; - case FragThresh_i: - psnmp_mib->oid = wlan_cpu_to_le16((t_u16) FragThresh_i); - if (cmd_action == HostCmd_ACT_GEN_SET) { - psnmp_mib->query_type = wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); - psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u16)); - ul_temp = *((t_u32 *) pdata_buf); - *((t_u16 *) (psnmp_mib->value)) = wlan_cpu_to_le16((t_u16) ul_temp); - cmd->size += sizeof(t_u16); - } - break; - case RtsThresh_i: - psnmp_mib->oid = wlan_cpu_to_le16((t_u16) RtsThresh_i); - if (cmd_action == HostCmd_ACT_GEN_SET) { - psnmp_mib->query_type = wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); - psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u16)); - ul_temp = *((t_u32 *) pdata_buf); - *(t_u16 *) (psnmp_mib->value) = wlan_cpu_to_le16((t_u16) ul_temp); - cmd->size += sizeof(t_u16); - } - break; - - case ShortRetryLim_i: - psnmp_mib->oid = wlan_cpu_to_le16((t_u16) ShortRetryLim_i); - if (cmd_action == HostCmd_ACT_GEN_SET) { - psnmp_mib->query_type = wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); - psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u16)); - ul_temp = (*(t_u32 *) pdata_buf); - *((t_u16 *) (psnmp_mib->value)) = wlan_cpu_to_le16((t_u16) ul_temp); - cmd->size += sizeof(t_u16); - } - break; - case Dot11D_i: - psnmp_mib->oid = wlan_cpu_to_le16((t_u16) Dot11D_i); - if (cmd_action == HostCmd_ACT_GEN_SET) { - psnmp_mib->query_type = wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); - psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u16)); - ul_temp = *(t_u32 *) pdata_buf; - *((t_u16 *) (psnmp_mib->value)) = wlan_cpu_to_le16((t_u16) ul_temp); - cmd->size += sizeof(t_u16); - } - break; - case Dot11H_i: - psnmp_mib->oid = wlan_cpu_to_le16((t_u16) Dot11H_i); - if (cmd_action == HostCmd_ACT_GEN_SET) { - psnmp_mib->query_type = wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); - psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u16)); - ul_temp = *(t_u32 *) pdata_buf; - *((t_u16 *) (psnmp_mib->value)) = wlan_cpu_to_le16((t_u16) ul_temp); - cmd->size += sizeof(t_u16); - } - break; - case WwsMode_i: - psnmp_mib->oid = wlan_cpu_to_le16((t_u16) WwsMode_i); - if (cmd_action == HostCmd_ACT_GEN_SET) { - psnmp_mib->query_type = wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); - psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u16)); - ul_temp = *((t_u32 *) pdata_buf); - *((t_u16 *) (psnmp_mib->value)) = wlan_cpu_to_le16((t_u16) ul_temp); - cmd->size += sizeof(t_u16); - } - break; - case Thermal_i: - psnmp_mib->oid = wlan_cpu_to_le16((t_u16) Thermal_i); - break; - default: - break; - } - cmd->size = wlan_cpu_to_le16(cmd->size); - PRINTM(MINFO, "SNMP_CMD: Action=0x%x, OID=0x%x, OIDSize=0x%x, Value=0x%x\n", - cmd_action, cmd_oid, wlan_le16_to_cpu(psnmp_mib->buf_size), - wlan_le16_to_cpu(*(t_u16 *) psnmp_mib->value)); - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_SNMP_MIB *psnmp_mib = &cmd->params.smib; + t_u32 ul_temp; + + ENTER(); + PRINTM(MINFO, "SNMP_CMD: cmd_oid = 0x%x\n", cmd_oid); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_SNMP_MIB); + cmd->size = sizeof(HostCmd_DS_802_11_SNMP_MIB) - 1 + S_DS_GEN; + + if (cmd_action == HostCmd_ACT_GEN_GET) { + psnmp_mib->query_type = wlan_cpu_to_le16(HostCmd_ACT_GEN_GET); + psnmp_mib->buf_size = wlan_cpu_to_le16(MAX_SNMP_BUF_SIZE); + cmd->size += MAX_SNMP_BUF_SIZE; + } + + switch (cmd_oid) { + case DtimPeriod_i: + psnmp_mib->oid = wlan_cpu_to_le16((t_u16) DtimPeriod_i); + if (cmd_action == HostCmd_ACT_GEN_SET) { + psnmp_mib->query_type = + wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); + psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u8)); + ul_temp = *((t_u32 *) pdata_buf); + psnmp_mib->value[0] = (t_u8) ul_temp; + cmd->size += sizeof(t_u8); + } + break; + case FragThresh_i: + psnmp_mib->oid = wlan_cpu_to_le16((t_u16) FragThresh_i); + if (cmd_action == HostCmd_ACT_GEN_SET) { + psnmp_mib->query_type = + wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); + psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u16)); + ul_temp = *((t_u32 *) pdata_buf); + *((t_u16 *) (psnmp_mib->value)) = + wlan_cpu_to_le16((t_u16) ul_temp); + cmd->size += sizeof(t_u16); + } + break; + case RtsThresh_i: + psnmp_mib->oid = wlan_cpu_to_le16((t_u16) RtsThresh_i); + if (cmd_action == HostCmd_ACT_GEN_SET) { + psnmp_mib->query_type = + wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); + psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u16)); + ul_temp = *((t_u32 *) pdata_buf); + *(t_u16 *) (psnmp_mib->value) = + wlan_cpu_to_le16((t_u16) ul_temp); + cmd->size += sizeof(t_u16); + } + break; + + case ShortRetryLim_i: + psnmp_mib->oid = wlan_cpu_to_le16((t_u16) ShortRetryLim_i); + if (cmd_action == HostCmd_ACT_GEN_SET) { + psnmp_mib->query_type = + wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); + psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u16)); + ul_temp = (*(t_u32 *) pdata_buf); + *((t_u16 *) (psnmp_mib->value)) = + wlan_cpu_to_le16((t_u16) ul_temp); + cmd->size += sizeof(t_u16); + } + break; + case Dot11D_i: + psnmp_mib->oid = wlan_cpu_to_le16((t_u16) Dot11D_i); + if (cmd_action == HostCmd_ACT_GEN_SET) { + psnmp_mib->query_type = + wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); + psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u16)); + ul_temp = *(t_u32 *) pdata_buf; + *((t_u16 *) (psnmp_mib->value)) = + wlan_cpu_to_le16((t_u16) ul_temp); + cmd->size += sizeof(t_u16); + } + break; + case Dot11H_i: + psnmp_mib->oid = wlan_cpu_to_le16((t_u16) Dot11H_i); + if (cmd_action == HostCmd_ACT_GEN_SET) { + psnmp_mib->query_type = + wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); + psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u16)); + ul_temp = *(t_u32 *) pdata_buf; + *((t_u16 *) (psnmp_mib->value)) = + wlan_cpu_to_le16((t_u16) ul_temp); + cmd->size += sizeof(t_u16); + } + break; + case WwsMode_i: + psnmp_mib->oid = wlan_cpu_to_le16((t_u16) WwsMode_i); + if (cmd_action == HostCmd_ACT_GEN_SET) { + psnmp_mib->query_type = + wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); + psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u16)); + ul_temp = *((t_u32 *) pdata_buf); + *((t_u16 *) (psnmp_mib->value)) = + wlan_cpu_to_le16((t_u16) ul_temp); + cmd->size += sizeof(t_u16); + } + break; + case Thermal_i: + psnmp_mib->oid = wlan_cpu_to_le16((t_u16) Thermal_i); + break; + default: + break; + } + cmd->size = wlan_cpu_to_le16(cmd->size); + PRINTM(MINFO, + "SNMP_CMD: Action=0x%x, OID=0x%x, OIDSize=0x%x, Value=0x%x\n", + cmd_action, cmd_oid, wlan_le16_to_cpu(psnmp_mib->buf_size), + wlan_le16_to_cpu(*(t_u16 *) psnmp_mib->value)); + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command of get_log. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @@ -214,16 +230,17 @@ wlan_cmd_802_11_snmp_mib(IN pmlan_private pmpriv, static mlan_status wlan_cmd_802_11_get_log(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND * cmd) { - ENTER(); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_GET_LOG); - cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_GET_LOG) + S_DS_GEN); - LEAVE(); - return MLAN_STATUS_SUCCESS; + ENTER(); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_GET_LOG); + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_GET_LOG) + S_DS_GEN); + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command of tx_power_cfg. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -233,56 +250,60 @@ wlan_cmd_802_11_get_log(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND * cmd) */ static mlan_status wlan_cmd_tx_power_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - MrvlTypes_Power_Group_t *ppg_tlv = MNULL; - HostCmd_DS_TXPWR_CFG *ptxp = MNULL; - HostCmd_DS_TXPWR_CFG *ptxp_cfg = &cmd->params.txp_cfg; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_TXPWR_CFG); - cmd->size = wlan_cpu_to_le16(S_DS_GEN + sizeof(HostCmd_DS_TXPWR_CFG)); - switch (cmd_action) { - case HostCmd_ACT_GEN_SET: - ptxp = (HostCmd_DS_TXPWR_CFG *) pdata_buf; - if (ptxp->mode) { - ppg_tlv = - (MrvlTypes_Power_Group_t *) ((t_u8 *) pdata_buf + - sizeof(HostCmd_DS_TXPWR_CFG)); - memmove(pmpriv->adapter, ptxp_cfg, pdata_buf, - sizeof(HostCmd_DS_TXPWR_CFG) + - sizeof(MrvlTypes_Power_Group_t) + ppg_tlv->length); - - ppg_tlv = (MrvlTypes_Power_Group_t *) ((t_u8 *) ptxp_cfg + - sizeof - (HostCmd_DS_TXPWR_CFG)); - cmd->size += - wlan_cpu_to_le16(sizeof(MrvlTypes_Power_Group_t) + - ppg_tlv->length); - ppg_tlv->type = wlan_cpu_to_le16(ppg_tlv->type); - ppg_tlv->length = wlan_cpu_to_le16(ppg_tlv->length); - } else { - memmove(pmpriv->adapter, ptxp_cfg, pdata_buf, - sizeof(HostCmd_DS_TXPWR_CFG)); - } - ptxp_cfg->action = wlan_cpu_to_le16(cmd_action); - ptxp_cfg->cfg_index = wlan_cpu_to_le16(ptxp_cfg->cfg_index); - ptxp_cfg->mode = wlan_cpu_to_le32(ptxp_cfg->mode); - break; - case HostCmd_ACT_GEN_GET: - ptxp_cfg->action = wlan_cpu_to_le16(cmd_action); - break; - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + MrvlTypes_Power_Group_t *ppg_tlv = MNULL; + HostCmd_DS_TXPWR_CFG *ptxp = MNULL; + HostCmd_DS_TXPWR_CFG *ptxp_cfg = &cmd->params.txp_cfg; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_TXPWR_CFG); + cmd->size = wlan_cpu_to_le16(S_DS_GEN + sizeof(HostCmd_DS_TXPWR_CFG)); + switch (cmd_action) { + case HostCmd_ACT_GEN_SET: + ptxp = (HostCmd_DS_TXPWR_CFG *) pdata_buf; + if (ptxp->mode) { + ppg_tlv = + (MrvlTypes_Power_Group_t *) ((t_u8 *) pdata_buf + + + sizeof + (HostCmd_DS_TXPWR_CFG)); + memmove(pmpriv->adapter, ptxp_cfg, pdata_buf, + sizeof(HostCmd_DS_TXPWR_CFG) + + sizeof(MrvlTypes_Power_Group_t) + + ppg_tlv->length); + + ppg_tlv = + (MrvlTypes_Power_Group_t *) ((t_u8 *) ptxp_cfg + + sizeof + (HostCmd_DS_TXPWR_CFG)); + cmd->size += + wlan_cpu_to_le16(sizeof(MrvlTypes_Power_Group_t) + + ppg_tlv->length); + ppg_tlv->type = wlan_cpu_to_le16(ppg_tlv->type); + ppg_tlv->length = wlan_cpu_to_le16(ppg_tlv->length); + } else { + memmove(pmpriv->adapter, ptxp_cfg, pdata_buf, + sizeof(HostCmd_DS_TXPWR_CFG)); + } + ptxp_cfg->action = wlan_cpu_to_le16(cmd_action); + ptxp_cfg->cfg_index = wlan_cpu_to_le16(ptxp_cfg->cfg_index); + ptxp_cfg->mode = wlan_cpu_to_le32(ptxp_cfg->mode); + break; + case HostCmd_ACT_GEN_GET: + ptxp_cfg->action = wlan_cpu_to_le16(cmd_action); + break; + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command of rf_tx_power. - * + * * @param pmpriv A pointer to wlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action the action: GET or SET @@ -291,35 +312,35 @@ wlan_cmd_tx_power_cfg(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_802_11_rf_tx_power(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - HostCmd_DS_802_11_RF_TX_POWER *prtp = &cmd->params.txp; + HostCmd_DS_802_11_RF_TX_POWER *prtp = &cmd->params.txp; - ENTER(); + ENTER(); - cmd->size = wlan_cpu_to_le16((sizeof(HostCmd_DS_802_11_RF_TX_POWER)) - + S_DS_GEN); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_RF_TX_POWER); - prtp->action = cmd_action; + cmd->size = wlan_cpu_to_le16((sizeof(HostCmd_DS_802_11_RF_TX_POWER)) + + S_DS_GEN); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_RF_TX_POWER); + prtp->action = cmd_action; - PRINTM(MINFO, "RF_TX_POWER_CMD: Size:%d Cmd:0x%x Act:%d\n", - cmd->size, cmd->command, prtp->action); + PRINTM(MINFO, "RF_TX_POWER_CMD: Size:%d Cmd:0x%x Act:%d\n", + cmd->size, cmd->command, prtp->action); - switch (cmd_action) { - case HostCmd_ACT_GEN_GET: - prtp->action = wlan_cpu_to_le16(HostCmd_ACT_GEN_GET); - prtp->current_level = 0; - break; + switch (cmd_action) { + case HostCmd_ACT_GEN_GET: + prtp->action = wlan_cpu_to_le16(HostCmd_ACT_GEN_GET); + prtp->current_level = 0; + break; - case HostCmd_ACT_GEN_SET: - prtp->action = wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); - prtp->current_level = wlan_cpu_to_le16(*((t_s16 *) pdata_buf)); - break; - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + case HostCmd_ACT_GEN_SET: + prtp->action = wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); + prtp->current_level = wlan_cpu_to_le16(*((t_s16 *) pdata_buf)); + break; + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } #ifdef WIFI_DIRECT_SUPPORT @@ -333,33 +354,33 @@ wlan_cmd_802_11_rf_tx_power(IN pmlan_private pmpriv, static t_u8 wlan_is_p2p_connected(IN pmlan_adapter pmadapter) { - int j; - pmlan_private priv; - ENTER(); - for (j = 0; j < pmadapter->priv_num; ++j) { - if ((priv = pmadapter->priv[j])) { - if (priv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT) { - if ((priv->bss_role == MLAN_BSS_ROLE_STA) && - (priv->media_connected == MTRUE)) { - LEAVE(); - return MTRUE; - } - if ((priv->bss_role == MLAN_BSS_ROLE_UAP) && - (priv->uap_bss_started == MTRUE)) { - LEAVE(); - return MTRUE; - } - } - } - } - LEAVE(); - return MFALSE; + int j; + pmlan_private priv; + ENTER(); + for (j = 0; j < pmadapter->priv_num; ++j) { + if ((priv = pmadapter->priv[j])) { + if (priv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT) { + if ((priv->bss_role == MLAN_BSS_ROLE_STA) && + (priv->media_connected == MTRUE)) { + LEAVE(); + return MTRUE; + } + if ((priv->bss_role == MLAN_BSS_ROLE_UAP) && + (priv->uap_bss_started == MTRUE)) { + LEAVE(); + return MTRUE; + } + } + } + } + LEAVE(); + return MFALSE; } #endif -/** +/** * @brief This function prepares command of hs_cfg. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -369,84 +390,89 @@ wlan_is_p2p_connected(IN pmlan_adapter pmadapter) */ static mlan_status wlan_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN hs_config_param * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN hs_config_param * pdata_buf) { - pmlan_adapter pmadapter = pmpriv->adapter; - HostCmd_DS_802_11_HS_CFG_ENH *phs_cfg = &cmd->params.opt_hs_cfg; - t_u16 hs_activate = MFALSE; - t_u8 *tlv = (t_u8 *) phs_cfg + sizeof(HostCmd_DS_802_11_HS_CFG_ENH); - MrvlIEtypes_HsWakeHoldoff_t *holdoff_tlv = MNULL; - - ENTER(); - - if (pdata_buf == MNULL) { - /* New Activate command */ - hs_activate = MTRUE; - } - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_HS_CFG_ENH); - - if (!hs_activate && (pdata_buf->conditions != HOST_SLEEP_CFG_CANCEL) - && ((pmadapter->arp_filter_size > 0) - && (pmadapter->arp_filter_size <= ARP_FILTER_MAX_BUF_SIZE))) { - PRINTM(MINFO, "Attach %d bytes ArpFilter to HSCfg cmd\n", - pmadapter->arp_filter_size); - memcpy(pmpriv->adapter, - ((t_u8 *) phs_cfg) + sizeof(HostCmd_DS_802_11_HS_CFG_ENH), - pmadapter->arp_filter, pmadapter->arp_filter_size); - cmd->size = - pmadapter->arp_filter_size + sizeof(HostCmd_DS_802_11_HS_CFG_ENH) + - S_DS_GEN; - tlv = - (t_u8 *) phs_cfg + sizeof(HostCmd_DS_802_11_HS_CFG_ENH) + - pmadapter->arp_filter_size; - } else - cmd->size = S_DS_GEN + sizeof(HostCmd_DS_802_11_HS_CFG_ENH); - - if (hs_activate) { - cmd->size = wlan_cpu_to_le16(cmd->size); - phs_cfg->action = wlan_cpu_to_le16(HS_ACTIVATE); - phs_cfg->params.hs_activate.resp_ctrl = wlan_cpu_to_le16(RESP_NEEDED); - } else { - phs_cfg->action = wlan_cpu_to_le16(HS_CONFIGURE); + pmlan_adapter pmadapter = pmpriv->adapter; + HostCmd_DS_802_11_HS_CFG_ENH *phs_cfg = &cmd->params.opt_hs_cfg; + t_u16 hs_activate = MFALSE; + t_u8 *tlv = (t_u8 *) phs_cfg + sizeof(HostCmd_DS_802_11_HS_CFG_ENH); + MrvlIEtypes_HsWakeHoldoff_t *holdoff_tlv = MNULL; + + ENTER(); + + if (pdata_buf == MNULL) { + /* New Activate command */ + hs_activate = MTRUE; + } + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_HS_CFG_ENH); + + if (!hs_activate && (pdata_buf->conditions != HOST_SLEEP_CFG_CANCEL) + && ((pmadapter->arp_filter_size > 0) + && (pmadapter->arp_filter_size <= ARP_FILTER_MAX_BUF_SIZE))) { + PRINTM(MINFO, "Attach %d bytes ArpFilter to HSCfg cmd\n", + pmadapter->arp_filter_size); + memcpy(pmpriv->adapter, + ((t_u8 *) phs_cfg) + + sizeof(HostCmd_DS_802_11_HS_CFG_ENH), + pmadapter->arp_filter, pmadapter->arp_filter_size); + cmd->size = + pmadapter->arp_filter_size + + sizeof(HostCmd_DS_802_11_HS_CFG_ENH) + S_DS_GEN; + tlv = (t_u8 *) phs_cfg + sizeof(HostCmd_DS_802_11_HS_CFG_ENH) + + pmadapter->arp_filter_size; + } else + cmd->size = S_DS_GEN + sizeof(HostCmd_DS_802_11_HS_CFG_ENH); + + if (hs_activate) { + cmd->size = wlan_cpu_to_le16(cmd->size); + phs_cfg->action = wlan_cpu_to_le16(HS_ACTIVATE); + phs_cfg->params.hs_activate.resp_ctrl = + wlan_cpu_to_le16(RESP_NEEDED); + } else { + phs_cfg->action = wlan_cpu_to_le16(HS_CONFIGURE); #ifdef WIFI_DIRECT_SUPPORT - if (wlan_is_p2p_connected(pmadapter)) - phs_cfg->params.hs_config.conditions = - wlan_cpu_to_le32(pdata_buf-> - conditions | HOST_SLEEP_COND_MULTICAST_DATA); - else + if (wlan_is_p2p_connected(pmadapter)) + phs_cfg->params.hs_config.conditions = + wlan_cpu_to_le32(pdata_buf-> + conditions | + HOST_SLEEP_COND_MULTICAST_DATA); + else #endif - phs_cfg->params.hs_config.conditions = - wlan_cpu_to_le32(pdata_buf->conditions); - phs_cfg->params.hs_config.gpio = pdata_buf->gpio; - phs_cfg->params.hs_config.gap = pdata_buf->gap; - if (pmadapter->min_wake_holdoff) { - cmd->size += sizeof(MrvlIEtypes_HsWakeHoldoff_t); - holdoff_tlv = (MrvlIEtypes_HsWakeHoldoff_t *) tlv; - holdoff_tlv->header.type = - wlan_cpu_to_le16(TLV_TYPE_HS_WAKE_HOLDOFF); - holdoff_tlv->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_HsWakeHoldoff_t) - - sizeof(MrvlIEtypesHeader_t)); - holdoff_tlv->min_wake_holdoff = - wlan_cpu_to_le16(pmadapter->min_wake_holdoff); - PRINTM(MCMND, "min_wake_holdoff=%d\n", pmadapter->min_wake_holdoff); - } - cmd->size = wlan_cpu_to_le16(cmd->size); - PRINTM(MCMND, - "HS_CFG_CMD: condition:0x%x gpio:0x%x gap:0x%x holdoff=%d\n", - phs_cfg->params.hs_config.conditions, - phs_cfg->params.hs_config.gpio, phs_cfg->params.hs_config.gap, - pmadapter->min_wake_holdoff); - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + phs_cfg->params.hs_config.conditions = + wlan_cpu_to_le32(pdata_buf->conditions); + phs_cfg->params.hs_config.gpio = pdata_buf->gpio; + phs_cfg->params.hs_config.gap = pdata_buf->gap; + if (pmadapter->min_wake_holdoff) { + cmd->size += sizeof(MrvlIEtypes_HsWakeHoldoff_t); + holdoff_tlv = (MrvlIEtypes_HsWakeHoldoff_t *) tlv; + holdoff_tlv->header.type = + wlan_cpu_to_le16(TLV_TYPE_HS_WAKE_HOLDOFF); + holdoff_tlv->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_HsWakeHoldoff_t) - + sizeof(MrvlIEtypesHeader_t)); + holdoff_tlv->min_wake_holdoff = + wlan_cpu_to_le16(pmadapter->min_wake_holdoff); + PRINTM(MCMND, "min_wake_holdoff=%d\n", + pmadapter->min_wake_holdoff); + } + cmd->size = wlan_cpu_to_le16(cmd->size); + PRINTM(MCMND, + "HS_CFG_CMD: condition:0x%x gpio:0x%x gap:0x%x holdoff=%d\n", + phs_cfg->params.hs_config.conditions, + phs_cfg->params.hs_config.gpio, + phs_cfg->params.hs_config.gap, + pmadapter->min_wake_holdoff); + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command of mac_address. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -455,23 +481,23 @@ wlan_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_802_11_mac_address(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, IN t_u16 cmd_action) + IN HostCmd_DS_COMMAND * cmd, IN t_u16 cmd_action) { - ENTER(); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_MAC_ADDRESS); - cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_MAC_ADDRESS) + - S_DS_GEN); - cmd->result = 0; - - cmd->params.mac_addr.action = wlan_cpu_to_le16(cmd_action); - - if (cmd_action == HostCmd_ACT_GEN_SET) { - memcpy(pmpriv->adapter, cmd->params.mac_addr.mac_addr, - pmpriv->curr_addr, MLAN_MAC_ADDR_LENGTH); - // HEXDUMP("SET_CMD: MAC ADDRESS-", priv->CurrentAddr, 6); - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + ENTER(); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_MAC_ADDRESS); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_MAC_ADDRESS) + + S_DS_GEN); + cmd->result = 0; + + cmd->params.mac_addr.action = wlan_cpu_to_le16(cmd_action); + + if (cmd_action == HostCmd_ACT_GEN_SET) { + memcpy(pmpriv->adapter, cmd->params.mac_addr.mac_addr, + pmpriv->curr_addr, MLAN_MAC_ADDR_LENGTH); + // HEXDUMP("SET_CMD: MAC ADDRESS-", priv->CurrentAddr, 6); + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -486,23 +512,25 @@ wlan_cmd_802_11_mac_address(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_802_11_sleep_period(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_u16 * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_u16 * pdata_buf) { - HostCmd_DS_802_11_SLEEP_PERIOD *pcmd_sleep_pd = &cmd->params.sleep_pd; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_SLEEP_PERIOD); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_SLEEP_PERIOD) + S_DS_GEN); - if (cmd_action == HostCmd_ACT_GEN_SET) { - pcmd_sleep_pd->sleep_pd = wlan_cpu_to_le16(*(t_u16 *) pdata_buf); - } - pcmd_sleep_pd->action = wlan_cpu_to_le16(cmd_action); - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_SLEEP_PERIOD *pcmd_sleep_pd = &cmd->params.sleep_pd; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_SLEEP_PERIOD); + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_SLEEP_PERIOD) + + S_DS_GEN); + if (cmd_action == HostCmd_ACT_GEN_SET) { + pcmd_sleep_pd->sleep_pd = + wlan_cpu_to_le16(*(t_u16 *) pdata_buf); + } + pcmd_sleep_pd->action = wlan_cpu_to_le16(cmd_action); + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -517,39 +545,40 @@ wlan_cmd_802_11_sleep_period(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_802_11_sleep_params(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_u16 * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_u16 * pdata_buf) { - HostCmd_DS_802_11_SLEEP_PARAMS *pcmd_sp = &cmd->params.sleep_param; - mlan_ds_sleep_params *psp = (mlan_ds_sleep_params *) pdata_buf; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_SLEEP_PARAMS); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_SLEEP_PARAMS) + S_DS_GEN); - if (cmd_action == HostCmd_ACT_GEN_SET) { - pcmd_sp->reserved = (t_u16) psp->reserved; - pcmd_sp->error = (t_u16) psp->error; - pcmd_sp->offset = (t_u16) psp->offset; - pcmd_sp->stable_time = (t_u16) psp->stable_time; - pcmd_sp->cal_control = (t_u8) psp->cal_control; - pcmd_sp->external_sleep_clk = (t_u8) psp->ext_sleep_clk; - - pcmd_sp->reserved = wlan_cpu_to_le16(pcmd_sp->reserved); - pcmd_sp->error = wlan_cpu_to_le16(pcmd_sp->error); - pcmd_sp->offset = wlan_cpu_to_le16(pcmd_sp->offset); - pcmd_sp->stable_time = wlan_cpu_to_le16(pcmd_sp->stable_time); - } - pcmd_sp->action = wlan_cpu_to_le16(cmd_action); - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_SLEEP_PARAMS *pcmd_sp = &cmd->params.sleep_param; + mlan_ds_sleep_params *psp = (mlan_ds_sleep_params *) pdata_buf; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_SLEEP_PARAMS); + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_SLEEP_PARAMS) + + S_DS_GEN); + if (cmd_action == HostCmd_ACT_GEN_SET) { + pcmd_sp->reserved = (t_u16) psp->reserved; + pcmd_sp->error = (t_u16) psp->error; + pcmd_sp->offset = (t_u16) psp->offset; + pcmd_sp->stable_time = (t_u16) psp->stable_time; + pcmd_sp->cal_control = (t_u8) psp->cal_control; + pcmd_sp->external_sleep_clk = (t_u8) psp->ext_sleep_clk; + + pcmd_sp->reserved = wlan_cpu_to_le16(pcmd_sp->reserved); + pcmd_sp->error = wlan_cpu_to_le16(pcmd_sp->error); + pcmd_sp->offset = wlan_cpu_to_le16(pcmd_sp->offset); + pcmd_sp->stable_time = wlan_cpu_to_le16(pcmd_sp->stable_time); + } + pcmd_sp->action = wlan_cpu_to_le16(cmd_action); + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command of mac_multicast_adr. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -559,25 +588,26 @@ wlan_cmd_802_11_sleep_params(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_mac_multicast_adr(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - mlan_multicast_list *pmcast_list = (mlan_multicast_list *) pdata_buf; - HostCmd_DS_MAC_MULTICAST_ADR *pmc_addr = &cmd->params.mc_addr; - - ENTER(); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_MAC_MULTICAST_ADR) + S_DS_GEN); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_MAC_MULTICAST_ADR); - - pmc_addr->action = wlan_cpu_to_le16(cmd_action); - pmc_addr->num_of_adrs = - wlan_cpu_to_le16((t_u16) pmcast_list->num_multicast_addr); - memcpy(pmpriv->adapter, pmc_addr->mac_list, pmcast_list->mac_list, - pmcast_list->num_multicast_addr * MLAN_MAC_ADDR_LENGTH); - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_multicast_list *pmcast_list = (mlan_multicast_list *) pdata_buf; + HostCmd_DS_MAC_MULTICAST_ADR *pmc_addr = &cmd->params.mc_addr; + + ENTER(); + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_MAC_MULTICAST_ADR) + + S_DS_GEN); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_MAC_MULTICAST_ADR); + + pmc_addr->action = wlan_cpu_to_le16(cmd_action); + pmc_addr->num_of_adrs = + wlan_cpu_to_le16((t_u16) pmcast_list->num_multicast_addr); + memcpy(pmpriv->adapter, pmc_addr->mac_list, pmcast_list->mac_list, + pmcast_list->num_multicast_addr * MLAN_MAC_ADDR_LENGTH); + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -591,35 +621,38 @@ wlan_cmd_mac_multicast_adr(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_802_11_deauthenticate(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_void * pdata_buf) { - HostCmd_DS_802_11_DEAUTHENTICATE *pdeauth = &cmd->params.deauth; + HostCmd_DS_802_11_DEAUTHENTICATE *pdeauth = &cmd->params.deauth; - ENTER(); + ENTER(); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_DEAUTHENTICATE); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_DEAUTHENTICATE) + S_DS_GEN); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_DEAUTHENTICATE); + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_DEAUTHENTICATE) + + S_DS_GEN); - /* Set AP MAC address */ - memcpy(pmpriv->adapter, pdeauth->mac_addr, (t_u8 *) pdata_buf, - MLAN_MAC_ADDR_LENGTH); + /* Set AP MAC address */ + memcpy(pmpriv->adapter, pdeauth->mac_addr, (t_u8 *) pdata_buf, + MLAN_MAC_ADDR_LENGTH); - PRINTM(MCMND, "Deauth: " MACSTR "\n", MAC2STR(pdeauth->mac_addr)); + PRINTM(MCMND, "Deauth: " MACSTR "\n", MAC2STR(pdeauth->mac_addr)); - if (pmpriv->adapter->state_11h.recvd_chanswann_event) { + if (pmpriv->adapter->state_11h.recvd_chanswann_event) { /** Reason code 36 = Requested from peer station as it is leaving the BSS */ #define REASON_CODE_PEER_STA_LEAVING 36 - pdeauth->reason_code = wlan_cpu_to_le16(REASON_CODE_PEER_STA_LEAVING); - } else { + pdeauth->reason_code = + wlan_cpu_to_le16(REASON_CODE_PEER_STA_LEAVING); + } else { /** Reason code 3 = Station is leaving */ #define REASON_CODE_STA_LEAVING 3 - pdeauth->reason_code = wlan_cpu_to_le16(REASON_CODE_STA_LEAVING); - } + pdeauth->reason_code = + wlan_cpu_to_le16(REASON_CODE_STA_LEAVING); + } - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -632,23 +665,23 @@ wlan_cmd_802_11_deauthenticate(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_802_11_ad_hoc_stop(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd) + IN HostCmd_DS_COMMAND * cmd) { - ENTER(); + ENTER(); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_AD_HOC_STOP); - cmd->size = wlan_cpu_to_le16(S_DS_GEN); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_AD_HOC_STOP); + cmd->size = wlan_cpu_to_le16(S_DS_GEN); - if (wlan_11h_is_active(pmpriv)) - wlan_11h_activate(pmpriv, MNULL, MFALSE); + if (wlan_11h_is_active(pmpriv)) + wlan_11h_activate(pmpriv, MNULL, MFALSE); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function sets WEP key(s) to key_param_set TLV(s). - * + * * @param priv A pointer to mlan_private structure * @param key_param_set A pointer to MrvlIEtype_KeyParamSet_t structure * @param key_param_len A pointer to the length variable @@ -657,66 +690,75 @@ wlan_cmd_802_11_ad_hoc_stop(IN pmlan_private pmpriv, */ static mlan_status wlan_set_keyparamset_wep(mlan_private * priv, - MrvlIEtype_KeyParamSet_t * key_param_set, - t_u16 * key_param_len) + MrvlIEtype_KeyParamSet_t * key_param_set, + t_u16 * key_param_len) { - int cur_key_param_len = 0; - t_u8 i; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - /* Multi-key_param_set TLV is supported */ - for (i = 0; i < MRVL_NUM_WEP_KEY; i++) { - if ((priv->wep_key[i].key_length == WEP_40_BIT_LEN) || - (priv->wep_key[i].key_length == WEP_104_BIT_LEN)) { - key_param_set->type = wlan_cpu_to_le16(TLV_TYPE_KEY_MATERIAL); + int cur_key_param_len = 0; + t_u8 i; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + /* Multi-key_param_set TLV is supported */ + for (i = 0; i < MRVL_NUM_WEP_KEY; i++) { + if ((priv->wep_key[i].key_length == WEP_40_BIT_LEN) || + (priv->wep_key[i].key_length == WEP_104_BIT_LEN)) { + key_param_set->type = + wlan_cpu_to_le16(TLV_TYPE_KEY_MATERIAL); /** Key_param_set WEP fixed length */ #define KEYPARAMSET_WEP_FIXED_LEN 8 - key_param_set->length = - wlan_cpu_to_le16((t_u16) - (priv->wep_key[i].key_length + - KEYPARAMSET_WEP_FIXED_LEN)); - key_param_set->key_type_id = wlan_cpu_to_le16(KEY_TYPE_ID_WEP); - key_param_set->key_info = wlan_cpu_to_le16 - (KEY_INFO_WEP_ENABLED | KEY_INFO_WEP_UNICAST | - KEY_INFO_WEP_MCAST); - key_param_set->key_len = - (t_u16) wlan_cpu_to_le16(priv->wep_key[i].key_length); - /* Set WEP key index */ - key_param_set->key[0] = i; - /* Set default Tx key flag */ - if (i == (priv->wep_key_curr_index & HostCmd_WEP_KEY_INDEX_MASK)) - key_param_set->key[1] = 1; - else - key_param_set->key[1] = 0; - memmove(priv->adapter, &key_param_set->key[2], - priv->wep_key[i].key_material, priv->wep_key[i].key_length); - - cur_key_param_len = priv->wep_key[i].key_length + - KEYPARAMSET_WEP_FIXED_LEN + sizeof(MrvlIEtypesHeader_t); - *key_param_len += (t_u16) cur_key_param_len; - key_param_set = - (MrvlIEtype_KeyParamSet_t *) ((t_u8 *) key_param_set + - cur_key_param_len); - } else if (!priv->wep_key[i].key_length) { - continue; - } else { - PRINTM(MERROR, "key%d Length = %d is incorrect\n", (i + 1), - priv->wep_key[i].key_length); - ret = MLAN_STATUS_FAILURE; - goto done; - } - } - - done: - LEAVE(); - return ret; + key_param_set->length = + wlan_cpu_to_le16((t_u16) + (priv->wep_key[i].key_length + + KEYPARAMSET_WEP_FIXED_LEN)); + key_param_set->key_type_id = + wlan_cpu_to_le16(KEY_TYPE_ID_WEP); + key_param_set->key_info = + wlan_cpu_to_le16(KEY_INFO_WEP_ENABLED | + KEY_INFO_WEP_UNICAST | + KEY_INFO_WEP_MCAST); + key_param_set->key_len = + (t_u16) wlan_cpu_to_le16(priv->wep_key[i]. + key_length); + /* Set WEP key index */ + key_param_set->key[0] = i; + /* Set default Tx key flag */ + if (i == + (priv-> + wep_key_curr_index & HostCmd_WEP_KEY_INDEX_MASK)) + key_param_set->key[1] = 1; + else + key_param_set->key[1] = 0; + memmove(priv->adapter, &key_param_set->key[2], + priv->wep_key[i].key_material, + priv->wep_key[i].key_length); + + cur_key_param_len = priv->wep_key[i].key_length + + KEYPARAMSET_WEP_FIXED_LEN + + sizeof(MrvlIEtypesHeader_t); + *key_param_len += (t_u16) cur_key_param_len; + key_param_set = + (MrvlIEtype_KeyParamSet_t *) ((t_u8 *) + key_param_set + + cur_key_param_len); + } else if (!priv->wep_key[i].key_length) { + continue; + } else { + PRINTM(MERROR, "key%d Length = %d is incorrect\n", + (i + 1), priv->wep_key[i].key_length); + ret = MLAN_STATUS_FAILURE; + goto done; + } + } + +done: + LEAVE(); + return ret; } -/** +/** * @brief This function prepares command of key_material. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -727,201 +769,219 @@ wlan_set_keyparamset_wep(mlan_private * priv, */ static mlan_status wlan_cmd_802_11_key_material(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, - IN t_u32 cmd_oid, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, + IN t_u32 cmd_oid, IN t_void * pdata_buf) { - HostCmd_DS_802_11_KEY_MATERIAL *pkey_material = &cmd->params.key_material; - mlan_ds_encrypt_key *pkey = (mlan_ds_encrypt_key *) pdata_buf; - t_u16 key_param_len = 0; - mlan_status ret = MLAN_STATUS_SUCCESS; - const t_u8 bc_mac[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_KEY_MATERIAL); - pkey_material->action = wlan_cpu_to_le16(cmd_action); - - if (cmd_action == HostCmd_ACT_GEN_GET) { - cmd->size = - wlan_cpu_to_le16(sizeof(pkey_material->action) + S_DS_GEN + - KEYPARAMSET_FIXED_LEN + - sizeof(MrvlIEtypesHeader_t)); - memset(pmpriv->adapter, &pkey_material->key_param_set, 0, - sizeof(MrvlIEtype_KeyParamSet_t)); - pkey_material->key_param_set.type = - wlan_cpu_to_le16(TLV_TYPE_KEY_MATERIAL); - pkey_material->key_param_set.length = - wlan_cpu_to_le16(KEYPARAMSET_FIXED_LEN); - if (pkey->key_flags & KEY_FLAG_GROUP_KEY) - pkey_material->key_param_set.key_info |= KEY_INFO_MCAST_KEY; - else - pkey_material->key_param_set.key_info |= KEY_INFO_UCAST_KEY; - if (pkey->key_flags & KEY_FLAG_AES_MCAST_IGTK) - pkey_material->key_param_set.key_info = KEY_INFO_AES_MCAST_IGTK; - pkey_material->key_param_set.key_info = - wlan_cpu_to_le16(pkey_material->key_param_set.key_info); - goto done; - } - - if (!pkey) { - memset(pmpriv->adapter, &pkey_material->key_param_set, 0, - (MRVL_NUM_WEP_KEY * sizeof(MrvlIEtype_KeyParamSet_t))); - ret = - wlan_set_keyparamset_wep(pmpriv, &pkey_material->key_param_set, - &key_param_len); - cmd->size = - wlan_cpu_to_le16(key_param_len + sizeof(pkey_material->action) + - S_DS_GEN); - goto done; - } else - memset(pmpriv->adapter, &pkey_material->key_param_set, 0, - sizeof(MrvlIEtype_KeyParamSet_t)); - if (pkey->is_wapi_key) { - PRINTM(MINFO, "Set WAPI Key\n"); - pkey_material->key_param_set.key_type_id = - wlan_cpu_to_le16(KEY_TYPE_ID_WAPI); - if (cmd_oid == KEY_INFO_ENABLED) - pkey_material->key_param_set.key_info = - wlan_cpu_to_le16(KEY_INFO_WAPI_ENABLED); - else - pkey_material->key_param_set.key_info = - !(wlan_cpu_to_le16(KEY_INFO_WAPI_ENABLED)); - - pkey_material->key_param_set.key[0] = (t_u8) pkey->key_index; - if (!pmpriv->sec_info.wapi_key_on) - pkey_material->key_param_set.key[1] = 1; - else - pkey_material->key_param_set.key[1] = 0; /* set 0 when re-key */ - - if (0 != memcmp(pmpriv->adapter, pkey->mac_addr, bc_mac, sizeof(bc_mac))) /* WAPI - pairwise - key: - unicast - */ - pkey_material->key_param_set.key_info |= - wlan_cpu_to_le16(KEY_INFO_WAPI_UNICAST); - else { /* WAPI group key: multicast */ - pkey_material->key_param_set.key_info |= - wlan_cpu_to_le16(KEY_INFO_WAPI_MCAST); - pmpriv->sec_info.wapi_key_on = MTRUE; - } - - pkey_material->key_param_set.type = - wlan_cpu_to_le16(TLV_TYPE_KEY_MATERIAL); - pkey_material->key_param_set.key_len = wlan_cpu_to_le16(WAPI_KEY_LEN); - memcpy(pmpriv->adapter, &pkey_material->key_param_set.key[2], - pkey->key_material, pkey->key_len); - memcpy(pmpriv->adapter, - &pkey_material->key_param_set.key[2 + pkey->key_len], pkey->pn, - PN_SIZE); - pkey_material->key_param_set.length = - wlan_cpu_to_le16(WAPI_KEY_LEN + KEYPARAMSET_FIXED_LEN); - - key_param_len = - (WAPI_KEY_LEN + KEYPARAMSET_FIXED_LEN) + - sizeof(MrvlIEtypesHeader_t); - cmd->size = - wlan_cpu_to_le16(key_param_len + sizeof(pkey_material->action) + - S_DS_GEN); - goto done; - } - /* IGTK key length is the same as AES key length */ - if (pkey->key_len == WPA_AES_KEY_LEN && - !(pkey->key_flags & KEY_FLAG_AES_MCAST_IGTK)) { - PRINTM(MCMND, "WPA_AES\n"); - pkey_material->key_param_set.key_type_id = - wlan_cpu_to_le16(KEY_TYPE_ID_AES); - if (cmd_oid == KEY_INFO_ENABLED) - pkey_material->key_param_set.key_info = - wlan_cpu_to_le16(KEY_INFO_AES_ENABLED); - else - pkey_material->key_param_set.key_info = - !(wlan_cpu_to_le16(KEY_INFO_AES_ENABLED)); - - if (pkey->key_index & MLAN_KEY_INDEX_UNICAST) /* AES pairwise key: - unicast */ - pkey_material->key_param_set.key_info |= - wlan_cpu_to_le16(KEY_INFO_AES_UNICAST); - else { /* AES group key: multicast */ - - pkey_material->key_param_set.key_info |= - wlan_cpu_to_le16(KEY_INFO_AES_MCAST); - } - } else if ((pkey->key_flags & KEY_FLAG_AES_MCAST_IGTK) && - pkey->key_len == WPA_IGTK_KEY_LEN) { - PRINTM(MCMND, "WPA_AES_CMAC\n"); - pkey_material->key_param_set.key_type_id = - wlan_cpu_to_le16(KEY_TYPE_ID_AES_CMAC); - if (cmd_oid == KEY_INFO_ENABLED) - pkey_material->key_param_set.key_info = - wlan_cpu_to_le16(KEY_INFO_AES_ENABLED); - else - pkey_material->key_param_set.key_info = - !(wlan_cpu_to_le16(KEY_INFO_AES_ENABLED)); - - pkey_material->key_param_set.key_info |= - wlan_cpu_to_le16(KEY_INFO_AES_MCAST_IGTK); - } else if (pkey->key_len == WPA_TKIP_KEY_LEN) { - PRINTM(MCMND, "WPA_TKIP\n"); - pkey_material->key_param_set.key_type_id = - wlan_cpu_to_le16(KEY_TYPE_ID_TKIP); - pkey_material->key_param_set.key_info = - wlan_cpu_to_le16(KEY_INFO_TKIP_ENABLED); - - if (pkey->key_index & MLAN_KEY_INDEX_UNICAST) /* TKIP pairwise key: - unicast */ - pkey_material->key_param_set.key_info |= - wlan_cpu_to_le16(KEY_INFO_TKIP_UNICAST); - else /* TKIP group key: multicast */ - pkey_material->key_param_set.key_info |= - wlan_cpu_to_le16(KEY_INFO_TKIP_MCAST); - } - - if (pkey_material->key_param_set.key_type_id) { - pkey_material->key_param_set.type = - wlan_cpu_to_le16(TLV_TYPE_KEY_MATERIAL); - pkey_material->key_param_set.key_len = - wlan_cpu_to_le16((t_u16) pkey->key_len); - memcpy(pmpriv->adapter, pkey_material->key_param_set.key, - pkey->key_material, pkey->key_len); - pkey_material->key_param_set.length = - wlan_cpu_to_le16((t_u16) pkey->key_len + KEYPARAMSET_FIXED_LEN); - key_param_len = - (t_u16) (pkey->key_len + KEYPARAMSET_FIXED_LEN) + - sizeof(MrvlIEtypesHeader_t); - - /* key format with pn field is defined in Key Material V1 */ - if (pkey_material->key_param_set.key_type_id == - wlan_cpu_to_le16(KEY_TYPE_ID_AES_CMAC)) { - cmac_param *param; - param = (cmac_param *) pkey_material->key_param_set.key; - memcpy(pmpriv->adapter, param->ipn, pkey->pn, SEQ_MAX_SIZE); - memcpy(pmpriv->adapter, param->key, pkey->key_material, - pkey->key_len); - - pkey_material->key_param_set.key_len = - wlan_cpu_to_le16((t_u16) sizeof(cmac_param)); - pkey_material->key_param_set.length = - wlan_cpu_to_le16((t_u16) sizeof(cmac_param) + - KEYPARAMSET_FIXED_LEN); - key_param_len = - (t_u16) (sizeof(cmac_param) + KEYPARAMSET_FIXED_LEN) + - sizeof(MrvlIEtypesHeader_t); - } - - cmd->size = - wlan_cpu_to_le16(key_param_len + sizeof(pkey_material->action) + - S_DS_GEN); - } - done: - LEAVE(); - return ret; + HostCmd_DS_802_11_KEY_MATERIAL *pkey_material = + &cmd->params.key_material; + mlan_ds_encrypt_key *pkey = (mlan_ds_encrypt_key *) pdata_buf; + t_u16 key_param_len = 0; + mlan_status ret = MLAN_STATUS_SUCCESS; + const t_u8 bc_mac[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_KEY_MATERIAL); + pkey_material->action = wlan_cpu_to_le16(cmd_action); + + if (cmd_action == HostCmd_ACT_GEN_GET) { + cmd->size = + wlan_cpu_to_le16(sizeof(pkey_material->action) + + S_DS_GEN + KEYPARAMSET_FIXED_LEN + + sizeof(MrvlIEtypesHeader_t)); + memset(pmpriv->adapter, &pkey_material->key_param_set, 0, + sizeof(MrvlIEtype_KeyParamSet_t)); + pkey_material->key_param_set.type = + wlan_cpu_to_le16(TLV_TYPE_KEY_MATERIAL); + pkey_material->key_param_set.length = + wlan_cpu_to_le16(KEYPARAMSET_FIXED_LEN); + if (pkey->key_flags & KEY_FLAG_GROUP_KEY) + pkey_material->key_param_set.key_info |= + KEY_INFO_MCAST_KEY; + else + pkey_material->key_param_set.key_info |= + KEY_INFO_UCAST_KEY; + if (pkey->key_flags & KEY_FLAG_AES_MCAST_IGTK) + pkey_material->key_param_set.key_info = + KEY_INFO_AES_MCAST_IGTK; + pkey_material->key_param_set.key_info = + wlan_cpu_to_le16(pkey_material->key_param_set.key_info); + goto done; + } + + if (!pkey) { + memset(pmpriv->adapter, &pkey_material->key_param_set, 0, + (MRVL_NUM_WEP_KEY * sizeof(MrvlIEtype_KeyParamSet_t))); + ret = wlan_set_keyparamset_wep(pmpriv, + &pkey_material->key_param_set, + &key_param_len); + cmd->size = + wlan_cpu_to_le16(key_param_len + + sizeof(pkey_material->action) + + S_DS_GEN); + goto done; + } else + memset(pmpriv->adapter, &pkey_material->key_param_set, 0, + sizeof(MrvlIEtype_KeyParamSet_t)); + if (pkey->is_wapi_key) { + PRINTM(MINFO, "Set WAPI Key\n"); + pkey_material->key_param_set.key_type_id = + wlan_cpu_to_le16(KEY_TYPE_ID_WAPI); + if (cmd_oid == KEY_INFO_ENABLED) + pkey_material->key_param_set.key_info = + wlan_cpu_to_le16(KEY_INFO_WAPI_ENABLED); + else + pkey_material->key_param_set.key_info = + !(wlan_cpu_to_le16(KEY_INFO_WAPI_ENABLED)); + + pkey_material->key_param_set.key[0] = (t_u8) pkey->key_index; + if (!pmpriv->sec_info.wapi_key_on) + pkey_material->key_param_set.key[1] = 1; + else + pkey_material->key_param_set.key[1] = 0; /* set + 0 + when + re-key + */ + + if (0 != memcmp(pmpriv->adapter, pkey->mac_addr, bc_mac, sizeof(bc_mac))) /* WAPI + pairwise + key: + unicast + */ + pkey_material->key_param_set.key_info |= + wlan_cpu_to_le16(KEY_INFO_WAPI_UNICAST); + else { /* WAPI group key: multicast */ + pkey_material->key_param_set.key_info |= + wlan_cpu_to_le16(KEY_INFO_WAPI_MCAST); + pmpriv->sec_info.wapi_key_on = MTRUE; + } + + pkey_material->key_param_set.type = + wlan_cpu_to_le16(TLV_TYPE_KEY_MATERIAL); + pkey_material->key_param_set.key_len = + wlan_cpu_to_le16(WAPI_KEY_LEN); + memcpy(pmpriv->adapter, &pkey_material->key_param_set.key[2], + pkey->key_material, pkey->key_len); + memcpy(pmpriv->adapter, + &pkey_material->key_param_set.key[2 + pkey->key_len], + pkey->pn, PN_SIZE); + pkey_material->key_param_set.length = + wlan_cpu_to_le16(WAPI_KEY_LEN + KEYPARAMSET_FIXED_LEN); + + key_param_len = + (WAPI_KEY_LEN + KEYPARAMSET_FIXED_LEN) + + sizeof(MrvlIEtypesHeader_t); + cmd->size = + wlan_cpu_to_le16(key_param_len + + sizeof(pkey_material->action) + + S_DS_GEN); + goto done; + } + /* IGTK key length is the same as AES key length */ + if (pkey->key_len == WPA_AES_KEY_LEN && + !(pkey->key_flags & KEY_FLAG_AES_MCAST_IGTK)) { + PRINTM(MCMND, "WPA_AES\n"); + pkey_material->key_param_set.key_type_id = + wlan_cpu_to_le16(KEY_TYPE_ID_AES); + if (cmd_oid == KEY_INFO_ENABLED) + pkey_material->key_param_set.key_info = + wlan_cpu_to_le16(KEY_INFO_AES_ENABLED); + else + pkey_material->key_param_set.key_info = + !(wlan_cpu_to_le16(KEY_INFO_AES_ENABLED)); + + if (pkey->key_index & MLAN_KEY_INDEX_UNICAST) /* AES pairwise + key: unicast + */ + pkey_material->key_param_set.key_info |= + wlan_cpu_to_le16(KEY_INFO_AES_UNICAST); + else { /* AES group key: multicast */ + + pkey_material->key_param_set.key_info |= + wlan_cpu_to_le16(KEY_INFO_AES_MCAST); + } + } else if ((pkey->key_flags & KEY_FLAG_AES_MCAST_IGTK) && + pkey->key_len == WPA_IGTK_KEY_LEN) { + PRINTM(MCMND, "WPA_AES_CMAC\n"); + pkey_material->key_param_set.key_type_id = + wlan_cpu_to_le16(KEY_TYPE_ID_AES_CMAC); + if (cmd_oid == KEY_INFO_ENABLED) + pkey_material->key_param_set.key_info = + wlan_cpu_to_le16(KEY_INFO_AES_ENABLED); + else + pkey_material->key_param_set.key_info = + !(wlan_cpu_to_le16(KEY_INFO_AES_ENABLED)); + + pkey_material->key_param_set.key_info |= + wlan_cpu_to_le16(KEY_INFO_AES_MCAST_IGTK); + } else if (pkey->key_len == WPA_TKIP_KEY_LEN) { + PRINTM(MCMND, "WPA_TKIP\n"); + pkey_material->key_param_set.key_type_id = + wlan_cpu_to_le16(KEY_TYPE_ID_TKIP); + pkey_material->key_param_set.key_info = + wlan_cpu_to_le16(KEY_INFO_TKIP_ENABLED); + + if (pkey->key_index & MLAN_KEY_INDEX_UNICAST) /* TKIP + pairwise + key: unicast + */ + pkey_material->key_param_set.key_info |= + wlan_cpu_to_le16(KEY_INFO_TKIP_UNICAST); + else /* TKIP group key: multicast */ + pkey_material->key_param_set.key_info |= + wlan_cpu_to_le16(KEY_INFO_TKIP_MCAST); + } + + if (pkey_material->key_param_set.key_type_id) { + pkey_material->key_param_set.type = + wlan_cpu_to_le16(TLV_TYPE_KEY_MATERIAL); + pkey_material->key_param_set.key_len = + wlan_cpu_to_le16((t_u16) pkey->key_len); + memcpy(pmpriv->adapter, pkey_material->key_param_set.key, + pkey->key_material, pkey->key_len); + pkey_material->key_param_set.length = + wlan_cpu_to_le16((t_u16) pkey->key_len + + KEYPARAMSET_FIXED_LEN); + key_param_len = + (t_u16) (pkey->key_len + KEYPARAMSET_FIXED_LEN) + + sizeof(MrvlIEtypesHeader_t); + + /* key format with pn field is defined in Key Material V1 */ + if (pkey_material->key_param_set.key_type_id == + wlan_cpu_to_le16(KEY_TYPE_ID_AES_CMAC)) { + cmac_param *param; + param = (cmac_param *) pkey_material->key_param_set.key; + memcpy(pmpriv->adapter, param->ipn, pkey->pn, + SEQ_MAX_SIZE); + memcpy(pmpriv->adapter, param->key, pkey->key_material, + pkey->key_len); + + pkey_material->key_param_set.key_len = + wlan_cpu_to_le16((t_u16) sizeof(cmac_param)); + pkey_material->key_param_set.length = + wlan_cpu_to_le16((t_u16) sizeof(cmac_param) + + KEYPARAMSET_FIXED_LEN); + key_param_len = + (t_u16) (sizeof(cmac_param) + + KEYPARAMSET_FIXED_LEN) + + sizeof(MrvlIEtypesHeader_t); + } + + cmd->size = + wlan_cpu_to_le16(key_param_len + + sizeof(pkey_material->action) + + S_DS_GEN); + } +done: + LEAVE(); + return ret; } -/** +/** * @brief This function prepares command of supplicant pmk - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -931,108 +991,119 @@ wlan_cmd_802_11_key_material(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_802_11_supplicant_pmk(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - MrvlIEtypes_PMK_t *ppmk_tlv = MNULL; - MrvlIEtypes_Passphrase_t *ppassphrase_tlv = MNULL; - MrvlIEtypes_SsIdParamSet_t *pssid_tlv = MNULL; - MrvlIEtypes_Bssid_t *pbssid_tlv = MNULL; - HostCmd_DS_802_11_SUPPLICANT_PMK *pesupplicant_psk = - &cmd->params.esupplicant_psk; - t_u8 *ptlv_buffer = (t_u8 *) pesupplicant_psk->tlv_buffer; - mlan_ds_passphrase *psk = (mlan_ds_passphrase *) pdata_buf; - t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; - - ENTER(); - /* - * Parse the rest of the buf here - * 1) <ssid="valid ssid"> - This will get the passphrase, AKMP - * for specified ssid, if none specified then it will get all. - * Eg: iwpriv <mlanX> passphrase 0:ssid=marvell - * 2) <psk="psk">:<passphrase="passphare">:<bssid="00:50:43:ef:23:f3"> - * <ssid="valid ssid"> - passphrase and psk cannot be provided to - * the same SSID, Takes one SSID at a time, If ssid= is present - * the it should contain a passphrase or psk. If no arguments are - * provided then AKMP=802.1x, and passphrase should be provided - * after association. - * End of each parameter should be followed by a ':'(except for the - * last parameter) as the delimiter. If ':' has to be used in - * an SSID then a '/' should be preceded to ':' as a escape. - * Eg:iwpriv <mlanX> passphrase - * "1:ssid=mrvl AP:psk=abcdefgh:bssid=00:50:43:ef:23:f3" - * iwpriv <mlanX> passphrase - * "1:ssid=mrvl/: AP:psk=abcdefgd:bssid=00:50:43:ef:23:f3" - * iwpriv <mlanX> passphrase "1:ssid=mrvlAP:psk=abcdefgd" - * 3) <ssid="valid ssid"> - This will clear the passphrase - * for specified ssid, if none specified then it will clear all. - * Eg: iwpriv <mlanX> passphrase 2:ssid=marvell - */ - - /* -1 is for t_u8 TlvBuffer[1] as this should not be included */ - cmd->size = sizeof(HostCmd_DS_802_11_SUPPLICANT_PMK) + S_DS_GEN - 1; - if (psk->ssid.ssid_len) { - pssid_tlv = (MrvlIEtypes_SsIdParamSet_t *) ptlv_buffer; - pssid_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_SSID); - pssid_tlv->header.len = - (t_u16) MIN(MLAN_MAX_SSID_LENGTH, psk->ssid.ssid_len); - memcpy(pmpriv->adapter, (char *) pssid_tlv->ssid, psk->ssid.ssid, - MIN(MLAN_MAX_SSID_LENGTH, psk->ssid.ssid_len)); - ptlv_buffer += (pssid_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); - cmd->size += (pssid_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); - pssid_tlv->header.len = wlan_cpu_to_le16(pssid_tlv->header.len); - } - if (memcmp - (pmpriv->adapter, (t_u8 *) & psk->bssid, zero_mac, sizeof(zero_mac))) { - pbssid_tlv = (MrvlIEtypes_Bssid_t *) ptlv_buffer; - pbssid_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_BSSID); - pbssid_tlv->header.len = MLAN_MAC_ADDR_LENGTH; - memcpy(pmpriv->adapter, pbssid_tlv->bssid, (t_u8 *) & psk->bssid, - MLAN_MAC_ADDR_LENGTH); - ptlv_buffer += (pbssid_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); - cmd->size += (pbssid_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); - pbssid_tlv->header.len = wlan_cpu_to_le16(pbssid_tlv->header.len); - } - if (psk->psk_type == MLAN_PSK_PASSPHRASE) { - ppassphrase_tlv = (MrvlIEtypes_Passphrase_t *) ptlv_buffer; - ppassphrase_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_PASSPHRASE); - ppassphrase_tlv->header.len = - (t_u16) MIN(MLAN_MAX_PASSPHRASE_LENGTH, - psk->psk.passphrase.passphrase_len); - memcpy(pmpriv->adapter, ppassphrase_tlv->passphrase, - psk->psk.passphrase.passphrase, MIN(MLAN_MAX_PASSPHRASE_LENGTH, - psk->psk.passphrase. - passphrase_len)); - ptlv_buffer += - (ppassphrase_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); - cmd->size += - (ppassphrase_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); - ppassphrase_tlv->header.len = - wlan_cpu_to_le16(ppassphrase_tlv->header.len); - } - if (psk->psk_type == MLAN_PSK_PMK) { - ppmk_tlv = (MrvlIEtypes_PMK_t *) ptlv_buffer; - ppmk_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_PMK); - ppmk_tlv->header.len = MLAN_MAX_KEY_LENGTH; - memcpy(pmpriv->adapter, ppmk_tlv->pmk, psk->psk.pmk.pmk, - MLAN_MAX_KEY_LENGTH); - ptlv_buffer += (ppmk_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); - cmd->size += (ppmk_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); - ppmk_tlv->header.len = wlan_cpu_to_le16(ppmk_tlv->header.len); - } - if ((cmd_action == HostCmd_ACT_GEN_SET) && - ((pssid_tlv || pbssid_tlv) && (!ppmk_tlv && !ppassphrase_tlv))) { - PRINTM(MERROR, - "Invalid case,ssid/bssid present without pmk or passphrase\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_SUPPLICANT_PMK); - pesupplicant_psk->action = wlan_cpu_to_le16(cmd_action); - pesupplicant_psk->cache_result = 0; - cmd->size = wlan_cpu_to_le16(cmd->size); - LEAVE(); - return MLAN_STATUS_SUCCESS; + MrvlIEtypes_PMK_t *ppmk_tlv = MNULL; + MrvlIEtypes_Passphrase_t *ppassphrase_tlv = MNULL; + MrvlIEtypes_SsIdParamSet_t *pssid_tlv = MNULL; + MrvlIEtypes_Bssid_t *pbssid_tlv = MNULL; + HostCmd_DS_802_11_SUPPLICANT_PMK *pesupplicant_psk = + &cmd->params.esupplicant_psk; + t_u8 *ptlv_buffer = (t_u8 *) pesupplicant_psk->tlv_buffer; + mlan_ds_passphrase *psk = (mlan_ds_passphrase *) pdata_buf; + t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; + + ENTER(); + /* + * Parse the rest of the buf here + * 1) <ssid="valid ssid"> - This will get the passphrase, AKMP + * for specified ssid, if none specified then it will get all. + * Eg: iwpriv <mlanX> passphrase 0:ssid=marvell + * 2) <psk="psk">:<passphrase="passphare">:<bssid="00:50:43:ef:23:f3"> + * <ssid="valid ssid"> - passphrase and psk cannot be provided to + * the same SSID, Takes one SSID at a time, If ssid= is present + * the it should contain a passphrase or psk. If no arguments are + * provided then AKMP=802.1x, and passphrase should be provided + * after association. + * End of each parameter should be followed by a ':'(except for the + * last parameter) as the delimiter. If ':' has to be used in + * an SSID then a '/' should be preceded to ':' as a escape. + * Eg:iwpriv <mlanX> passphrase + * "1:ssid=mrvl AP:psk=abcdefgh:bssid=00:50:43:ef:23:f3" + * iwpriv <mlanX> passphrase + * "1:ssid=mrvl/: AP:psk=abcdefgd:bssid=00:50:43:ef:23:f3" + * iwpriv <mlanX> passphrase "1:ssid=mrvlAP:psk=abcdefgd" + * 3) <ssid="valid ssid"> - This will clear the passphrase + * for specified ssid, if none specified then it will clear all. + * Eg: iwpriv <mlanX> passphrase 2:ssid=marvell + */ + + /* -1 is for t_u8 TlvBuffer[1] as this should not be included */ + cmd->size = sizeof(HostCmd_DS_802_11_SUPPLICANT_PMK) + S_DS_GEN - 1; + if (psk->ssid.ssid_len) { + pssid_tlv = (MrvlIEtypes_SsIdParamSet_t *) ptlv_buffer; + pssid_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_SSID); + pssid_tlv->header.len = + (t_u16) MIN(MLAN_MAX_SSID_LENGTH, psk->ssid.ssid_len); + memcpy(pmpriv->adapter, (char *)pssid_tlv->ssid, psk->ssid.ssid, + MIN(MLAN_MAX_SSID_LENGTH, psk->ssid.ssid_len)); + ptlv_buffer += + (pssid_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); + cmd->size += + (pssid_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); + pssid_tlv->header.len = wlan_cpu_to_le16(pssid_tlv->header.len); + } + if (memcmp + (pmpriv->adapter, (t_u8 *) & psk->bssid, zero_mac, + sizeof(zero_mac))) { + pbssid_tlv = (MrvlIEtypes_Bssid_t *) ptlv_buffer; + pbssid_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_BSSID); + pbssid_tlv->header.len = MLAN_MAC_ADDR_LENGTH; + memcpy(pmpriv->adapter, pbssid_tlv->bssid, + (t_u8 *) & psk->bssid, MLAN_MAC_ADDR_LENGTH); + ptlv_buffer += + (pbssid_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); + cmd->size += + (pbssid_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); + pbssid_tlv->header.len = + wlan_cpu_to_le16(pbssid_tlv->header.len); + } + if (psk->psk_type == MLAN_PSK_PASSPHRASE) { + ppassphrase_tlv = (MrvlIEtypes_Passphrase_t *) ptlv_buffer; + ppassphrase_tlv->header.type = + wlan_cpu_to_le16(TLV_TYPE_PASSPHRASE); + ppassphrase_tlv->header.len = + (t_u16) MIN(MLAN_MAX_PASSPHRASE_LENGTH, + psk->psk.passphrase.passphrase_len); + memcpy(pmpriv->adapter, ppassphrase_tlv->passphrase, + psk->psk.passphrase.passphrase, + MIN(MLAN_MAX_PASSPHRASE_LENGTH, + psk->psk.passphrase.passphrase_len)); + ptlv_buffer += + (ppassphrase_tlv->header.len + + sizeof(MrvlIEtypesHeader_t)); + cmd->size += + (ppassphrase_tlv->header.len + + sizeof(MrvlIEtypesHeader_t)); + ppassphrase_tlv->header.len = + wlan_cpu_to_le16(ppassphrase_tlv->header.len); + } + if (psk->psk_type == MLAN_PSK_PMK) { + ppmk_tlv = (MrvlIEtypes_PMK_t *) ptlv_buffer; + ppmk_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_PMK); + ppmk_tlv->header.len = MLAN_MAX_KEY_LENGTH; + memcpy(pmpriv->adapter, ppmk_tlv->pmk, psk->psk.pmk.pmk, + MLAN_MAX_KEY_LENGTH); + ptlv_buffer += + (ppmk_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); + cmd->size += + (ppmk_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); + ppmk_tlv->header.len = wlan_cpu_to_le16(ppmk_tlv->header.len); + } + if ((cmd_action == HostCmd_ACT_GEN_SET) && + ((pssid_tlv || pbssid_tlv) && (!ppmk_tlv && !ppassphrase_tlv))) { + PRINTM(MERROR, + "Invalid case,ssid/bssid present without pmk or passphrase\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_SUPPLICANT_PMK); + pesupplicant_psk->action = wlan_cpu_to_le16(cmd_action); + pesupplicant_psk->cache_result = 0; + cmd->size = wlan_cpu_to_le16(cmd->size); + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -1046,69 +1117,78 @@ wlan_cmd_802_11_supplicant_pmk(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_802_11_supplicant_profile(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - HostCmd_DS_802_11_SUPPLICANT_PROFILE *sup_profile = - (HostCmd_DS_802_11_SUPPLICANT_PROFILE *) & (cmd->params. - esupplicant_profile); - MrvlIEtypes_EncrProto_t *encr_proto_tlv = MNULL; - MrvlIEtypes_Cipher_t *pcipher_tlv = MNULL; - t_u8 *ptlv_buffer = (t_u8 *) sup_profile->tlv_buf; - mlan_ds_esupp_mode *esupp = MNULL; - - ENTER(); - - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_SUPPLICANT_PROFILE) + - S_DS_GEN - 1); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_SUPPLICANT_PROFILE); - sup_profile->action = wlan_cpu_to_le16(cmd_action); - if ((cmd_action == HostCmd_ACT_GEN_SET) && pdata_buf) { - esupp = (mlan_ds_esupp_mode *) pdata_buf; - if (esupp->rsn_mode) { - encr_proto_tlv = (MrvlIEtypes_EncrProto_t *) ptlv_buffer; - encr_proto_tlv->header.type = - wlan_cpu_to_le16(TLV_TYPE_ENCRYPTION_PROTO); - encr_proto_tlv->header.len = - (t_u16) sizeof(encr_proto_tlv->rsn_mode); - encr_proto_tlv->rsn_mode = wlan_cpu_to_le16(esupp->rsn_mode); - ptlv_buffer += - (encr_proto_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); - cmd->size += - (encr_proto_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); - encr_proto_tlv->header.len = - wlan_cpu_to_le16(encr_proto_tlv->header.len); - } - if (esupp->act_paircipher || esupp->act_groupcipher) { - pcipher_tlv = (MrvlIEtypes_Cipher_t *) ptlv_buffer; - pcipher_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_CIPHER); - pcipher_tlv->header.len = - (t_u16) (sizeof(pcipher_tlv->pair_cipher) + - sizeof(pcipher_tlv->group_cipher)); - if (esupp->act_paircipher) { - pcipher_tlv->pair_cipher = - wlan_cpu_to_le16(esupp->act_paircipher); - } - if (esupp->act_groupcipher) { - pcipher_tlv->group_cipher = - wlan_cpu_to_le16(esupp->act_groupcipher); - } - ptlv_buffer += - (pcipher_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); - cmd->size += - (pcipher_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); - pcipher_tlv->header.len = wlan_cpu_to_le16(pcipher_tlv->header.len); - } - } - cmd->size = wlan_cpu_to_le16(cmd->size); - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_SUPPLICANT_PROFILE *sup_profile = + (HostCmd_DS_802_11_SUPPLICANT_PROFILE *) & (cmd->params. + esupplicant_profile); + MrvlIEtypes_EncrProto_t *encr_proto_tlv = MNULL; + MrvlIEtypes_Cipher_t *pcipher_tlv = MNULL; + t_u8 *ptlv_buffer = (t_u8 *) sup_profile->tlv_buf; + mlan_ds_esupp_mode *esupp = MNULL; + + ENTER(); + + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_SUPPLICANT_PROFILE) + + S_DS_GEN - 1); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_SUPPLICANT_PROFILE); + sup_profile->action = wlan_cpu_to_le16(cmd_action); + if ((cmd_action == HostCmd_ACT_GEN_SET) && pdata_buf) { + esupp = (mlan_ds_esupp_mode *) pdata_buf; + if (esupp->rsn_mode) { + encr_proto_tlv = + (MrvlIEtypes_EncrProto_t *) ptlv_buffer; + encr_proto_tlv->header.type = + wlan_cpu_to_le16(TLV_TYPE_ENCRYPTION_PROTO); + encr_proto_tlv->header.len = + (t_u16) sizeof(encr_proto_tlv->rsn_mode); + encr_proto_tlv->rsn_mode = + wlan_cpu_to_le16(esupp->rsn_mode); + ptlv_buffer += + (encr_proto_tlv->header.len + + sizeof(MrvlIEtypesHeader_t)); + cmd->size += + (encr_proto_tlv->header.len + + sizeof(MrvlIEtypesHeader_t)); + encr_proto_tlv->header.len = + wlan_cpu_to_le16(encr_proto_tlv->header.len); + } + if (esupp->act_paircipher || esupp->act_groupcipher) { + pcipher_tlv = (MrvlIEtypes_Cipher_t *) ptlv_buffer; + pcipher_tlv->header.type = + wlan_cpu_to_le16(TLV_TYPE_CIPHER); + pcipher_tlv->header.len = + (t_u16) (sizeof(pcipher_tlv->pair_cipher) + + sizeof(pcipher_tlv->group_cipher)); + if (esupp->act_paircipher) { + pcipher_tlv->pair_cipher = + wlan_cpu_to_le16(esupp->act_paircipher); + } + if (esupp->act_groupcipher) { + pcipher_tlv->group_cipher = + wlan_cpu_to_le16(esupp-> + act_groupcipher); + } + ptlv_buffer += + (pcipher_tlv->header.len + + sizeof(MrvlIEtypesHeader_t)); + cmd->size += + (pcipher_tlv->header.len + + sizeof(MrvlIEtypesHeader_t)); + pcipher_tlv->header.len = + wlan_cpu_to_le16(pcipher_tlv->header.len); + } + } + cmd->size = wlan_cpu_to_le16(cmd->size); + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command of rf_channel. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -1118,34 +1198,36 @@ wlan_cmd_802_11_supplicant_profile(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_802_11_rf_channel(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - HostCmd_DS_802_11_RF_CHANNEL *prf_chan = &cmd->params.rf_channel; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_RF_CHANNEL); - cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_RF_CHANNEL) - + S_DS_GEN); - - if (cmd_action == HostCmd_ACT_GEN_SET) { - if ((pmpriv->adapter->adhoc_start_band & BAND_A) - || (pmpriv->adapter->adhoc_start_band & BAND_AN) - ) - prf_chan->rf_type = HostCmd_SCAN_RADIO_TYPE_A; - SET_SECONDARYCHAN(prf_chan->rf_type, pmpriv->adapter->chan_bandwidth); - prf_chan->rf_type = wlan_cpu_to_le16(prf_chan->rf_type); - prf_chan->current_channel = wlan_cpu_to_le16(*((t_u16 *) pdata_buf)); - } - prf_chan->action = wlan_cpu_to_le16(cmd_action); - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_RF_CHANNEL *prf_chan = &cmd->params.rf_channel; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_RF_CHANNEL); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_RF_CHANNEL) + + S_DS_GEN); + + if (cmd_action == HostCmd_ACT_GEN_SET) { + if ((pmpriv->adapter->adhoc_start_band & BAND_A) + || (pmpriv->adapter->adhoc_start_band & BAND_AN) + ) + prf_chan->rf_type = HostCmd_SCAN_RADIO_TYPE_A; + SET_SECONDARYCHAN(prf_chan->rf_type, + pmpriv->adapter->chan_bandwidth); + prf_chan->rf_type = wlan_cpu_to_le16(prf_chan->rf_type); + prf_chan->current_channel = + wlan_cpu_to_le16(*((t_u16 *) pdata_buf)); + } + prf_chan->action = wlan_cpu_to_le16(cmd_action); + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command of ibss_coalescing_status. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -1155,40 +1237,43 @@ wlan_cmd_802_11_rf_channel(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_ibss_coalescing_status(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - HostCmd_DS_802_11_IBSS_STATUS *pibss_coal = &(cmd->params.ibss_coalescing); - t_u16 enable = 0; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_IBSS_COALESCING_STATUS); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_IBSS_STATUS) + S_DS_GEN); - cmd->result = 0; - pibss_coal->action = wlan_cpu_to_le16(cmd_action); - - switch (cmd_action) { - case HostCmd_ACT_GEN_SET: - if (pdata_buf != MNULL) - enable = *(t_u16 *) pdata_buf; - pibss_coal->enable = wlan_cpu_to_le16(enable); - break; - - /* In other case.. Nothing to do */ - case HostCmd_ACT_GEN_GET: - default: - break; - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_IBSS_STATUS *pibss_coal = + &(cmd->params.ibss_coalescing); + t_u16 enable = 0; + + ENTER(); + + cmd->command = + wlan_cpu_to_le16(HostCmd_CMD_802_11_IBSS_COALESCING_STATUS); + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_IBSS_STATUS) + + S_DS_GEN); + cmd->result = 0; + pibss_coal->action = wlan_cpu_to_le16(cmd_action); + + switch (cmd_action) { + case HostCmd_ACT_GEN_SET: + if (pdata_buf != MNULL) + enable = *(t_u16 *) pdata_buf; + pibss_coal->enable = wlan_cpu_to_le16(enable); + break; + + /* In other case.. Nothing to do */ + case HostCmd_ACT_GEN_GET: + default: + break; + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command of mgmt IE list. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -1198,60 +1283,68 @@ wlan_cmd_ibss_coalescing_status(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_mgmt_ie_list(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - t_u16 req_len = 0, travel_len = 0; - custom_ie *cptr = MNULL; - mlan_ds_misc_custom_ie *cust_ie = MNULL; - HostCmd_DS_MGMT_IE_LIST_CFG *pmgmt_ie_list = &(cmd->params.mgmt_ie_list); - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_MGMT_IE_LIST); - cmd->size = sizeof(HostCmd_DS_MGMT_IE_LIST_CFG) + S_DS_GEN; - cmd->result = 0; - pmgmt_ie_list->action = wlan_cpu_to_le16(cmd_action); - - cust_ie = (mlan_ds_misc_custom_ie *) pdata_buf; - pmgmt_ie_list->ds_mgmt_ie.type = wlan_cpu_to_le16(cust_ie->type); - pmgmt_ie_list->ds_mgmt_ie.len = wlan_cpu_to_le16(cust_ie->len); - - if (pmgmt_ie_list->ds_mgmt_ie.ie_data_list && cust_ie->ie_data_list) { - req_len = cust_ie->len; - travel_len = 0; - /* conversion for index, mask, len */ - if (req_len == sizeof(t_u16)) - cust_ie->ie_data_list[0].ie_index = - wlan_cpu_to_le16(cust_ie->ie_data_list[0].ie_index); - - while (req_len > sizeof(t_u16)) { - cptr = - (custom_ie *) (((t_u8 *) cust_ie->ie_data_list) + travel_len); - travel_len += cptr->ie_length + sizeof(custom_ie) - MAX_IE_SIZE; - req_len -= cptr->ie_length + sizeof(custom_ie) - MAX_IE_SIZE; - cptr->ie_index = wlan_cpu_to_le16(cptr->ie_index); - cptr->mgmt_subtype_mask = wlan_cpu_to_le16(cptr->mgmt_subtype_mask); - cptr->ie_length = wlan_cpu_to_le16(cptr->ie_length); - } - if (cust_ie->len) - memcpy(pmpriv->adapter, pmgmt_ie_list->ds_mgmt_ie.ie_data_list, - cust_ie->ie_data_list, cust_ie->len); - } - - cmd->size -= - (MAX_MGMT_IE_INDEX_TO_FW * sizeof(custom_ie)) + - sizeof(tlvbuf_max_mgmt_ie); - cmd->size += cust_ie->len; - cmd->size = wlan_cpu_to_le16(cmd->size); - - LEAVE(); - return MLAN_STATUS_SUCCESS; + t_u16 req_len = 0, travel_len = 0; + custom_ie *cptr = MNULL; + mlan_ds_misc_custom_ie *cust_ie = MNULL; + HostCmd_DS_MGMT_IE_LIST_CFG *pmgmt_ie_list = + &(cmd->params.mgmt_ie_list); + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_MGMT_IE_LIST); + cmd->size = sizeof(HostCmd_DS_MGMT_IE_LIST_CFG) + S_DS_GEN; + cmd->result = 0; + pmgmt_ie_list->action = wlan_cpu_to_le16(cmd_action); + + cust_ie = (mlan_ds_misc_custom_ie *) pdata_buf; + pmgmt_ie_list->ds_mgmt_ie.type = wlan_cpu_to_le16(cust_ie->type); + pmgmt_ie_list->ds_mgmt_ie.len = wlan_cpu_to_le16(cust_ie->len); + + if (pmgmt_ie_list->ds_mgmt_ie.ie_data_list && cust_ie->ie_data_list) { + req_len = cust_ie->len; + travel_len = 0; + /* conversion for index, mask, len */ + if (req_len == sizeof(t_u16)) + cust_ie->ie_data_list[0].ie_index = + wlan_cpu_to_le16(cust_ie->ie_data_list[0]. + ie_index); + + while (req_len > sizeof(t_u16)) { + cptr = (custom_ie *) (((t_u8 *) cust_ie->ie_data_list) + + travel_len); + travel_len += + cptr->ie_length + sizeof(custom_ie) - + MAX_IE_SIZE; + req_len -= + cptr->ie_length + sizeof(custom_ie) - + MAX_IE_SIZE; + cptr->ie_index = wlan_cpu_to_le16(cptr->ie_index); + cptr->mgmt_subtype_mask = + wlan_cpu_to_le16(cptr->mgmt_subtype_mask); + cptr->ie_length = wlan_cpu_to_le16(cptr->ie_length); + } + if (cust_ie->len) + memcpy(pmpriv->adapter, + pmgmt_ie_list->ds_mgmt_ie.ie_data_list, + cust_ie->ie_data_list, cust_ie->len); + } + + cmd->size -= + (MAX_MGMT_IE_INDEX_TO_FW * sizeof(custom_ie)) + + sizeof(tlvbuf_max_mgmt_ie); + cmd->size += cust_ie->len; + cmd->size = wlan_cpu_to_le16(cmd->size); + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares system clock cfg command - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -1260,33 +1353,35 @@ wlan_cmd_mgmt_ie_list(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_sysclock_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - HostCmd_DS_ECL_SYSTEM_CLOCK_CONFIG *cfg = &cmd->params.sys_clock_cfg; - mlan_ds_misc_sys_clock *clk_cfg = (mlan_ds_misc_sys_clock *) pdata_buf; - int i = 0; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_ECL_SYSTEM_CLOCK_CONFIG); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_ECL_SYSTEM_CLOCK_CONFIG) + S_DS_GEN); - - cfg->action = wlan_cpu_to_le16(cmd_action); - cfg->cur_sys_clk = wlan_cpu_to_le16(clk_cfg->cur_sys_clk); - cfg->sys_clk_type = wlan_cpu_to_le16(clk_cfg->sys_clk_type); - cfg->sys_clk_len = wlan_cpu_to_le16(clk_cfg->sys_clk_num) * sizeof(t_u16); - for (i = 0; i < clk_cfg->sys_clk_num; i++) - cfg->sys_clk[i] = wlan_cpu_to_le16(clk_cfg->sys_clk[i]); - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_ECL_SYSTEM_CLOCK_CONFIG *cfg = &cmd->params.sys_clock_cfg; + mlan_ds_misc_sys_clock *clk_cfg = (mlan_ds_misc_sys_clock *) pdata_buf; + int i = 0; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_ECL_SYSTEM_CLOCK_CONFIG); + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_ECL_SYSTEM_CLOCK_CONFIG) + + S_DS_GEN); + + cfg->action = wlan_cpu_to_le16(cmd_action); + cfg->cur_sys_clk = wlan_cpu_to_le16(clk_cfg->cur_sys_clk); + cfg->sys_clk_type = wlan_cpu_to_le16(clk_cfg->sys_clk_type); + cfg->sys_clk_len = + wlan_cpu_to_le16(clk_cfg->sys_clk_num) * sizeof(t_u16); + for (i = 0; i < clk_cfg->sys_clk_num; i++) + cfg->sys_clk[i] = wlan_cpu_to_le16(clk_cfg->sys_clk[i]); + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command of subscribe event. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action the action: GET or SET @@ -1295,185 +1390,201 @@ wlan_cmd_sysclock_cfg(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_subscribe_event(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - mlan_ds_subscribe_evt *sub_evt = (mlan_ds_subscribe_evt *) pdata_buf; - HostCmd_DS_SUBSCRIBE_EVENT *evt = - (HostCmd_DS_SUBSCRIBE_EVENT *) & cmd->params.subscribe_event; - t_u16 cmd_size = 0; - t_u8 *tlv = MNULL; - MrvlIEtypes_BeaconLowRssiThreshold_t *rssi_low = MNULL; - MrvlIEtypes_BeaconLowSnrThreshold_t *snr_low = MNULL; - MrvlIEtypes_FailureCount_t *fail_count = MNULL; - MrvlIEtypes_BeaconsMissed_t *beacon_missed = MNULL; - MrvlIEtypes_BeaconHighRssiThreshold_t *rssi_high = MNULL; - MrvlIEtypes_BeaconHighSnrThreshold_t *snr_high = MNULL; - MrvlIEtypes_DataLowRssiThreshold_t *data_rssi_low = MNULL; - MrvlIEtypes_DataLowSnrThreshold_t *data_snr_low = MNULL; - MrvlIEtypes_DataHighRssiThreshold_t *data_rssi_high = MNULL; - MrvlIEtypes_DataHighSnrThreshold_t *data_snr_high = MNULL; - MrvlIEtypes_LinkQualityThreshold_t *link_quality = MNULL; - MrvlIETypes_PreBeaconMissed_t *pre_bcn_missed = MNULL; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_SUBSCRIBE_EVENT); - evt->action = wlan_cpu_to_le16(cmd_action); - cmd_size = sizeof(HostCmd_DS_SUBSCRIBE_EVENT) + S_DS_GEN; - if (cmd_action == HostCmd_ACT_GEN_GET) - goto done; - evt->action = wlan_cpu_to_le16(sub_evt->evt_action); - evt->event_bitmap = wlan_cpu_to_le16(sub_evt->evt_bitmap); - tlv = (t_u8 *) cmd + cmd_size; - if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_RSSI_LOW) { - rssi_low = (MrvlIEtypes_BeaconLowRssiThreshold_t *) tlv; - rssi_low->header.type = wlan_cpu_to_le16(TLV_TYPE_RSSI_LOW); - rssi_low->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_BeaconLowRssiThreshold_t) - - sizeof(MrvlIEtypesHeader_t)); - rssi_low->value = sub_evt->low_rssi; - rssi_low->frequency = sub_evt->low_rssi_freq; - tlv += sizeof(MrvlIEtypes_BeaconLowRssiThreshold_t); - cmd_size += sizeof(MrvlIEtypes_BeaconLowRssiThreshold_t); - } - if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_SNR_LOW) { - snr_low = (MrvlIEtypes_BeaconLowSnrThreshold_t *) tlv; - snr_low->header.type = wlan_cpu_to_le16(TLV_TYPE_SNR_LOW); - snr_low->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_BeaconLowSnrThreshold_t) - - sizeof(MrvlIEtypesHeader_t)); - snr_low->value = sub_evt->low_snr; - snr_low->frequency = sub_evt->low_snr_freq; - tlv += sizeof(MrvlIEtypes_BeaconLowSnrThreshold_t); - cmd_size += sizeof(MrvlIEtypes_BeaconLowSnrThreshold_t); - } - if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_MAX_FAIL) { - fail_count = (MrvlIEtypes_FailureCount_t *) tlv; - fail_count->header.type = wlan_cpu_to_le16(TLV_TYPE_FAILCOUNT); - fail_count->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_FailureCount_t) - - sizeof(MrvlIEtypesHeader_t)); - fail_count->value = sub_evt->failure_count; - fail_count->frequency = sub_evt->failure_count_freq; - tlv += sizeof(MrvlIEtypes_FailureCount_t); - cmd_size += sizeof(MrvlIEtypes_FailureCount_t); - } - if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_BEACON_MISSED) { - beacon_missed = (MrvlIEtypes_BeaconsMissed_t *) tlv; - beacon_missed->header.type = wlan_cpu_to_le16(TLV_TYPE_BCNMISS); - beacon_missed->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_BeaconsMissed_t) - - sizeof(MrvlIEtypesHeader_t)); - beacon_missed->value = sub_evt->beacon_miss; - beacon_missed->frequency = sub_evt->beacon_miss_freq; - tlv += sizeof(MrvlIEtypes_BeaconsMissed_t); - cmd_size += sizeof(MrvlIEtypes_BeaconsMissed_t); - } - if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_RSSI_HIGH) { - rssi_high = (MrvlIEtypes_BeaconHighRssiThreshold_t *) tlv; - rssi_high->header.type = wlan_cpu_to_le16(TLV_TYPE_RSSI_HIGH); - rssi_high->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_BeaconHighRssiThreshold_t) - - sizeof(MrvlIEtypesHeader_t)); - rssi_high->value = sub_evt->high_rssi; - rssi_high->frequency = sub_evt->high_rssi_freq; - tlv += sizeof(MrvlIEtypes_BeaconHighRssiThreshold_t); - cmd_size += sizeof(MrvlIEtypes_BeaconHighRssiThreshold_t); - } - if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_SNR_HIGH) { - snr_high = (MrvlIEtypes_BeaconHighSnrThreshold_t *) tlv; - snr_high->header.type = wlan_cpu_to_le16(TLV_TYPE_SNR_HIGH); - snr_high->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_BeaconHighSnrThreshold_t) - - sizeof(MrvlIEtypesHeader_t)); - snr_high->value = sub_evt->high_snr; - snr_high->frequency = sub_evt->high_snr_freq; - tlv += sizeof(MrvlIEtypes_BeaconHighSnrThreshold_t); - cmd_size += sizeof(MrvlIEtypes_BeaconHighSnrThreshold_t); - } - if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_DATA_RSSI_LOW) { - data_rssi_low = (MrvlIEtypes_DataLowRssiThreshold_t *) tlv; - data_rssi_low->header.type = wlan_cpu_to_le16(TLV_TYPE_RSSI_LOW_DATA); - data_rssi_low->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_DataLowRssiThreshold_t) - - sizeof(MrvlIEtypesHeader_t)); - data_rssi_low->value = sub_evt->data_low_rssi; - data_rssi_low->frequency = sub_evt->data_low_rssi_freq; - tlv += sizeof(MrvlIEtypes_DataLowRssiThreshold_t); - cmd_size += sizeof(MrvlIEtypes_DataLowRssiThreshold_t); - } - if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_DATA_SNR_LOW) { - data_snr_low = (MrvlIEtypes_DataLowSnrThreshold_t *) tlv; - data_snr_low->header.type = wlan_cpu_to_le16(TLV_TYPE_SNR_LOW_DATA); - data_snr_low->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_DataLowSnrThreshold_t) - - sizeof(MrvlIEtypesHeader_t)); - data_snr_low->value = sub_evt->data_low_snr; - data_snr_low->frequency = sub_evt->data_low_snr_freq; - tlv += sizeof(MrvlIEtypes_DataLowSnrThreshold_t); - cmd_size += sizeof(MrvlIEtypes_DataLowSnrThreshold_t); - } - if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_DATA_RSSI_HIGH) { - data_rssi_high = (MrvlIEtypes_DataHighRssiThreshold_t *) tlv; - data_rssi_high->header.type = wlan_cpu_to_le16(TLV_TYPE_RSSI_HIGH_DATA); - data_rssi_high->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_DataHighRssiThreshold_t) - - sizeof(MrvlIEtypesHeader_t)); - data_rssi_high->value = sub_evt->data_high_rssi; - data_rssi_high->frequency = sub_evt->data_high_rssi_freq; - tlv += sizeof(MrvlIEtypes_DataHighRssiThreshold_t); - cmd_size += sizeof(MrvlIEtypes_DataHighRssiThreshold_t); - } - if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_DATA_SNR_HIGH) { - data_snr_high = (MrvlIEtypes_DataHighSnrThreshold_t *) tlv; - data_snr_high->header.type = wlan_cpu_to_le16(TLV_TYPE_SNR_HIGH_DATA); - data_snr_high->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_DataHighSnrThreshold_t) - - sizeof(MrvlIEtypesHeader_t)); - data_snr_high->value = sub_evt->data_high_snr; - data_snr_high->frequency = sub_evt->data_high_snr_freq; - tlv += sizeof(MrvlIEtypes_DataHighSnrThreshold_t); - cmd_size += sizeof(MrvlIEtypes_DataHighSnrThreshold_t); - } - if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_LINK_QUALITY) { - link_quality = (MrvlIEtypes_LinkQualityThreshold_t *) tlv; - link_quality->header.type = wlan_cpu_to_le16(TLV_TYPE_LINK_QUALITY); - link_quality->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_LinkQualityThreshold_t) - - sizeof(MrvlIEtypesHeader_t)); - link_quality->link_snr = wlan_cpu_to_le16(sub_evt->link_snr); - link_quality->link_snr_freq = wlan_cpu_to_le16(sub_evt->link_snr_freq); - link_quality->link_rate = wlan_cpu_to_le16(sub_evt->link_rate); - link_quality->link_rate_freq = - wlan_cpu_to_le16(sub_evt->link_rate_freq); - link_quality->link_tx_latency = - wlan_cpu_to_le16(sub_evt->link_tx_latency); - link_quality->link_tx_lantency_freq = - wlan_cpu_to_le16(sub_evt->link_tx_lantency_freq); - tlv += sizeof(MrvlIEtypes_LinkQualityThreshold_t); - cmd_size += sizeof(MrvlIEtypes_LinkQualityThreshold_t); - } - if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_PRE_BEACON_LOST) { - pre_bcn_missed = (MrvlIETypes_PreBeaconMissed_t *) tlv; - pre_bcn_missed->header.type = wlan_cpu_to_le16(TLV_TYPE_PRE_BCNMISS); - pre_bcn_missed->header.len = - wlan_cpu_to_le16(sizeof(MrvlIETypes_PreBeaconMissed_t) - - sizeof(MrvlIEtypesHeader_t)); - pre_bcn_missed->value = sub_evt->pre_beacon_miss; - pre_bcn_missed->frequency = 0; - tlv += sizeof(MrvlIETypes_PreBeaconMissed_t); - cmd_size += sizeof(MrvlIETypes_PreBeaconMissed_t); - } - done: - cmd->size = wlan_cpu_to_le16(cmd_size); - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_subscribe_evt *sub_evt = (mlan_ds_subscribe_evt *) pdata_buf; + HostCmd_DS_SUBSCRIBE_EVENT *evt = + (HostCmd_DS_SUBSCRIBE_EVENT *) & cmd->params.subscribe_event; + t_u16 cmd_size = 0; + t_u8 *tlv = MNULL; + MrvlIEtypes_BeaconLowRssiThreshold_t *rssi_low = MNULL; + MrvlIEtypes_BeaconLowSnrThreshold_t *snr_low = MNULL; + MrvlIEtypes_FailureCount_t *fail_count = MNULL; + MrvlIEtypes_BeaconsMissed_t *beacon_missed = MNULL; + MrvlIEtypes_BeaconHighRssiThreshold_t *rssi_high = MNULL; + MrvlIEtypes_BeaconHighSnrThreshold_t *snr_high = MNULL; + MrvlIEtypes_DataLowRssiThreshold_t *data_rssi_low = MNULL; + MrvlIEtypes_DataLowSnrThreshold_t *data_snr_low = MNULL; + MrvlIEtypes_DataHighRssiThreshold_t *data_rssi_high = MNULL; + MrvlIEtypes_DataHighSnrThreshold_t *data_snr_high = MNULL; + MrvlIEtypes_LinkQualityThreshold_t *link_quality = MNULL; + MrvlIETypes_PreBeaconMissed_t *pre_bcn_missed = MNULL; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_SUBSCRIBE_EVENT); + evt->action = wlan_cpu_to_le16(cmd_action); + cmd_size = sizeof(HostCmd_DS_SUBSCRIBE_EVENT) + S_DS_GEN; + if (cmd_action == HostCmd_ACT_GEN_GET) + goto done; + evt->action = wlan_cpu_to_le16(sub_evt->evt_action); + evt->event_bitmap = wlan_cpu_to_le16(sub_evt->evt_bitmap); + tlv = (t_u8 *) cmd + cmd_size; + if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_RSSI_LOW) { + rssi_low = (MrvlIEtypes_BeaconLowRssiThreshold_t *) tlv; + rssi_low->header.type = wlan_cpu_to_le16(TLV_TYPE_RSSI_LOW); + rssi_low->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_BeaconLowRssiThreshold_t) + - sizeof(MrvlIEtypesHeader_t)); + rssi_low->value = sub_evt->low_rssi; + rssi_low->frequency = sub_evt->low_rssi_freq; + tlv += sizeof(MrvlIEtypes_BeaconLowRssiThreshold_t); + cmd_size += sizeof(MrvlIEtypes_BeaconLowRssiThreshold_t); + } + if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_SNR_LOW) { + snr_low = (MrvlIEtypes_BeaconLowSnrThreshold_t *) tlv; + snr_low->header.type = wlan_cpu_to_le16(TLV_TYPE_SNR_LOW); + snr_low->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_BeaconLowSnrThreshold_t) - + sizeof(MrvlIEtypesHeader_t)); + snr_low->value = sub_evt->low_snr; + snr_low->frequency = sub_evt->low_snr_freq; + tlv += sizeof(MrvlIEtypes_BeaconLowSnrThreshold_t); + cmd_size += sizeof(MrvlIEtypes_BeaconLowSnrThreshold_t); + } + if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_MAX_FAIL) { + fail_count = (MrvlIEtypes_FailureCount_t *) tlv; + fail_count->header.type = wlan_cpu_to_le16(TLV_TYPE_FAILCOUNT); + fail_count->header.len = + wlan_cpu_to_le16(sizeof(MrvlIEtypes_FailureCount_t) - + sizeof(MrvlIEtypesHeader_t)); + fail_count->value = sub_evt->failure_count; + fail_count->frequency = sub_evt->failure_count_freq; + tlv += sizeof(MrvlIEtypes_FailureCount_t); + cmd_size += sizeof(MrvlIEtypes_FailureCount_t); + } + if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_BEACON_MISSED) { + beacon_missed = (MrvlIEtypes_BeaconsMissed_t *) tlv; + beacon_missed->header.type = wlan_cpu_to_le16(TLV_TYPE_BCNMISS); + beacon_missed->header.len = + wlan_cpu_to_le16(sizeof(MrvlIEtypes_BeaconsMissed_t) - + sizeof(MrvlIEtypesHeader_t)); + beacon_missed->value = sub_evt->beacon_miss; + beacon_missed->frequency = sub_evt->beacon_miss_freq; + tlv += sizeof(MrvlIEtypes_BeaconsMissed_t); + cmd_size += sizeof(MrvlIEtypes_BeaconsMissed_t); + } + if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_RSSI_HIGH) { + rssi_high = (MrvlIEtypes_BeaconHighRssiThreshold_t *) tlv; + rssi_high->header.type = wlan_cpu_to_le16(TLV_TYPE_RSSI_HIGH); + rssi_high->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_BeaconHighRssiThreshold_t) + - sizeof(MrvlIEtypesHeader_t)); + rssi_high->value = sub_evt->high_rssi; + rssi_high->frequency = sub_evt->high_rssi_freq; + tlv += sizeof(MrvlIEtypes_BeaconHighRssiThreshold_t); + cmd_size += sizeof(MrvlIEtypes_BeaconHighRssiThreshold_t); + } + if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_SNR_HIGH) { + snr_high = (MrvlIEtypes_BeaconHighSnrThreshold_t *) tlv; + snr_high->header.type = wlan_cpu_to_le16(TLV_TYPE_SNR_HIGH); + snr_high->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_BeaconHighSnrThreshold_t) + - sizeof(MrvlIEtypesHeader_t)); + snr_high->value = sub_evt->high_snr; + snr_high->frequency = sub_evt->high_snr_freq; + tlv += sizeof(MrvlIEtypes_BeaconHighSnrThreshold_t); + cmd_size += sizeof(MrvlIEtypes_BeaconHighSnrThreshold_t); + } + if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_DATA_RSSI_LOW) { + data_rssi_low = (MrvlIEtypes_DataLowRssiThreshold_t *) tlv; + data_rssi_low->header.type = + wlan_cpu_to_le16(TLV_TYPE_RSSI_LOW_DATA); + data_rssi_low->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_DataLowRssiThreshold_t) - + sizeof(MrvlIEtypesHeader_t)); + data_rssi_low->value = sub_evt->data_low_rssi; + data_rssi_low->frequency = sub_evt->data_low_rssi_freq; + tlv += sizeof(MrvlIEtypes_DataLowRssiThreshold_t); + cmd_size += sizeof(MrvlIEtypes_DataLowRssiThreshold_t); + } + if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_DATA_SNR_LOW) { + data_snr_low = (MrvlIEtypes_DataLowSnrThreshold_t *) tlv; + data_snr_low->header.type = + wlan_cpu_to_le16(TLV_TYPE_SNR_LOW_DATA); + data_snr_low->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_DataLowSnrThreshold_t) - + sizeof(MrvlIEtypesHeader_t)); + data_snr_low->value = sub_evt->data_low_snr; + data_snr_low->frequency = sub_evt->data_low_snr_freq; + tlv += sizeof(MrvlIEtypes_DataLowSnrThreshold_t); + cmd_size += sizeof(MrvlIEtypes_DataLowSnrThreshold_t); + } + if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_DATA_RSSI_HIGH) { + data_rssi_high = (MrvlIEtypes_DataHighRssiThreshold_t *) tlv; + data_rssi_high->header.type = + wlan_cpu_to_le16(TLV_TYPE_RSSI_HIGH_DATA); + data_rssi_high->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_DataHighRssiThreshold_t) - + sizeof(MrvlIEtypesHeader_t)); + data_rssi_high->value = sub_evt->data_high_rssi; + data_rssi_high->frequency = sub_evt->data_high_rssi_freq; + tlv += sizeof(MrvlIEtypes_DataHighRssiThreshold_t); + cmd_size += sizeof(MrvlIEtypes_DataHighRssiThreshold_t); + } + if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_DATA_SNR_HIGH) { + data_snr_high = (MrvlIEtypes_DataHighSnrThreshold_t *) tlv; + data_snr_high->header.type = + wlan_cpu_to_le16(TLV_TYPE_SNR_HIGH_DATA); + data_snr_high->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_DataHighSnrThreshold_t) - + sizeof(MrvlIEtypesHeader_t)); + data_snr_high->value = sub_evt->data_high_snr; + data_snr_high->frequency = sub_evt->data_high_snr_freq; + tlv += sizeof(MrvlIEtypes_DataHighSnrThreshold_t); + cmd_size += sizeof(MrvlIEtypes_DataHighSnrThreshold_t); + } + if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_LINK_QUALITY) { + link_quality = (MrvlIEtypes_LinkQualityThreshold_t *) tlv; + link_quality->header.type = + wlan_cpu_to_le16(TLV_TYPE_LINK_QUALITY); + link_quality->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_LinkQualityThreshold_t) - + sizeof(MrvlIEtypesHeader_t)); + link_quality->link_snr = wlan_cpu_to_le16(sub_evt->link_snr); + link_quality->link_snr_freq = + wlan_cpu_to_le16(sub_evt->link_snr_freq); + link_quality->link_rate = wlan_cpu_to_le16(sub_evt->link_rate); + link_quality->link_rate_freq = + wlan_cpu_to_le16(sub_evt->link_rate_freq); + link_quality->link_tx_latency = + wlan_cpu_to_le16(sub_evt->link_tx_latency); + link_quality->link_tx_lantency_freq = + wlan_cpu_to_le16(sub_evt->link_tx_lantency_freq); + tlv += sizeof(MrvlIEtypes_LinkQualityThreshold_t); + cmd_size += sizeof(MrvlIEtypes_LinkQualityThreshold_t); + } + if (sub_evt->evt_bitmap & SUBSCRIBE_EVT_PRE_BEACON_LOST) { + pre_bcn_missed = (MrvlIETypes_PreBeaconMissed_t *) tlv; + pre_bcn_missed->header.type = + wlan_cpu_to_le16(TLV_TYPE_PRE_BCNMISS); + pre_bcn_missed->header.len = + wlan_cpu_to_le16(sizeof(MrvlIETypes_PreBeaconMissed_t) - + sizeof(MrvlIEtypesHeader_t)); + pre_bcn_missed->value = sub_evt->pre_beacon_miss; + pre_bcn_missed->frequency = 0; + tlv += sizeof(MrvlIETypes_PreBeaconMissed_t); + cmd_size += sizeof(MrvlIETypes_PreBeaconMissed_t); + } +done: + cmd->size = wlan_cpu_to_le16(cmd_size); + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function prepares command of OTP user data. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action the action: GET or SET @@ -1482,34 +1593,34 @@ wlan_cmd_subscribe_event(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_otp_user_data(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - mlan_ds_misc_otp_user_data *user_data = - (mlan_ds_misc_otp_user_data *) pdata_buf; - HostCmd_DS_OTP_USER_DATA *cmd_user_data = - (HostCmd_DS_OTP_USER_DATA *) & cmd->params.otp_user_data; - t_u16 cmd_size = 0; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_OTP_READ_USER_DATA); - cmd_size = sizeof(HostCmd_DS_OTP_USER_DATA) + S_DS_GEN - 1; - - cmd_user_data->action = wlan_cpu_to_le16(cmd_action); - cmd_user_data->reserved = 0; - cmd_user_data->user_data_length = - wlan_cpu_to_le16(user_data->user_data_length); - cmd_size += user_data->user_data_length; - cmd->size = wlan_cpu_to_le16(cmd_size); - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_misc_otp_user_data *user_data = + (mlan_ds_misc_otp_user_data *) pdata_buf; + HostCmd_DS_OTP_USER_DATA *cmd_user_data = + (HostCmd_DS_OTP_USER_DATA *) & cmd->params.otp_user_data; + t_u16 cmd_size = 0; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_OTP_READ_USER_DATA); + cmd_size = sizeof(HostCmd_DS_OTP_USER_DATA) + S_DS_GEN - 1; + + cmd_user_data->action = wlan_cpu_to_le16(cmd_action); + cmd_user_data->reserved = 0; + cmd_user_data->user_data_length = + wlan_cpu_to_le16(user_data->user_data_length); + cmd_size += user_data->user_data_length; + cmd->size = wlan_cpu_to_le16(cmd_size); + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** * @brief This function prepares inactivity timeout command - * + * * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action the action: GET or SET * @param pdata_buf A pointer to data buffer @@ -1517,41 +1628,43 @@ wlan_cmd_otp_user_data(IN pmlan_private pmpriv, */ static mlan_status wlan_cmd_inactivity_timeout(IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN t_u16 cmd_action, IN t_void * pdata_buf) { - pmlan_ds_inactivity_to inac_to; - HostCmd_DS_INACTIVITY_TIMEOUT_EXT *cmd_inac_to = &cmd->params.inactivity_to; - - ENTER(); - - inac_to = (mlan_ds_inactivity_to *) pdata_buf; - - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_INACTIVITY_TIMEOUT_EXT) + S_DS_GEN); - cmd->command = wlan_cpu_to_le16(cmd->command); - cmd_inac_to->action = wlan_cpu_to_le16(cmd_action); - if (cmd_action == HostCmd_ACT_GEN_SET) { - cmd_inac_to->timeout_unit = - wlan_cpu_to_le16((t_u16) inac_to->timeout_unit); - cmd_inac_to->unicast_timeout = - wlan_cpu_to_le16((t_u16) inac_to->unicast_timeout); - cmd_inac_to->mcast_timeout = - wlan_cpu_to_le16((t_u16) inac_to->mcast_timeout); - cmd_inac_to->ps_entry_timeout = - wlan_cpu_to_le16((t_u16) inac_to->ps_entry_timeout); - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + pmlan_ds_inactivity_to inac_to; + HostCmd_DS_INACTIVITY_TIMEOUT_EXT *cmd_inac_to = + &cmd->params.inactivity_to; + + ENTER(); + + inac_to = (mlan_ds_inactivity_to *) pdata_buf; + + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_INACTIVITY_TIMEOUT_EXT) + + S_DS_GEN); + cmd->command = wlan_cpu_to_le16(cmd->command); + cmd_inac_to->action = wlan_cpu_to_le16(cmd_action); + if (cmd_action == HostCmd_ACT_GEN_SET) { + cmd_inac_to->timeout_unit = + wlan_cpu_to_le16((t_u16) inac_to->timeout_unit); + cmd_inac_to->unicast_timeout = + wlan_cpu_to_le16((t_u16) inac_to->unicast_timeout); + cmd_inac_to->mcast_timeout = + wlan_cpu_to_le16((t_u16) inac_to->mcast_timeout); + cmd_inac_to->ps_entry_timeout = + wlan_cpu_to_le16((t_u16) inac_to->ps_entry_timeout); + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /******************************************************** Global Functions ********************************************************/ -/** +/** * @brief This function prepare the command before sending to firmware. - * + * * @param priv A pointer to mlan_private structure * @param cmd_no Command number * @param cmd_action Command action: GET or SET @@ -1564,303 +1677,325 @@ wlan_cmd_inactivity_timeout(IN HostCmd_DS_COMMAND * cmd, */ mlan_status wlan_ops_sta_prepare_cmd(IN t_void * priv, - IN t_u16 cmd_no, - IN t_u16 cmd_action, - IN t_u32 cmd_oid, - IN t_void * pioctl_buf, - IN t_void * pdata_buf, IN t_void * pcmd_buf) + IN t_u16 cmd_no, + IN t_u16 cmd_action, + IN t_u32 cmd_oid, + IN t_void * pioctl_buf, + IN t_void * pdata_buf, IN t_void * pcmd_buf) { - HostCmd_DS_COMMAND *cmd_ptr = (HostCmd_DS_COMMAND *) pcmd_buf; - mlan_private *pmpriv = (mlan_private *) priv; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - /* Prepare command */ - switch (cmd_no) { - case HostCmd_CMD_GET_HW_SPEC: - ret = wlan_cmd_get_hw_spec(pmpriv, cmd_ptr); - break; - case HostCmd_CMD_CFG_DATA: - ret = wlan_cmd_cfg_data(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_MAC_CONTROL: - ret = wlan_cmd_mac_control(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_802_11_MAC_ADDRESS: - ret = wlan_cmd_802_11_mac_address(pmpriv, cmd_ptr, cmd_action); - break; - case HostCmd_CMD_MAC_MULTICAST_ADR: - ret = - wlan_cmd_mac_multicast_adr(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_TX_RATE_CFG: - ret = wlan_cmd_tx_rate_cfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_802_11_RF_ANTENNA: - ret = - wlan_cmd_802_11_rf_antenna(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_TXPWR_CFG: - ret = wlan_cmd_tx_power_cfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_802_11_RF_TX_POWER: - ret = wlan_cmd_802_11_rf_tx_power(pmpriv, cmd_ptr, - cmd_action, pdata_buf); - break; - case HostCmd_CMD_802_11_PS_MODE_ENH: - ret = - wlan_cmd_enh_power_mode(pmpriv, cmd_ptr, cmd_action, - (t_u16) cmd_oid, pdata_buf); - break; - case HostCmd_CMD_802_11_HS_CFG_ENH: - ret = - wlan_cmd_802_11_hs_cfg(pmpriv, cmd_ptr, cmd_action, - (hs_config_param *) pdata_buf); - break; - case HostCmd_CMD_802_11_SLEEP_PERIOD: - ret = wlan_cmd_802_11_sleep_period(pmpriv, cmd_ptr, - cmd_action, (t_u16 *) pdata_buf); - break; - case HostCmd_CMD_802_11_SLEEP_PARAMS: - ret = wlan_cmd_802_11_sleep_params(pmpriv, cmd_ptr, - cmd_action, (t_u16 *) pdata_buf); - break; - case HostCmd_CMD_802_11_SCAN: - ret = wlan_cmd_802_11_scan(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_802_11_BG_SCAN_CONFIG: - ret = wlan_cmd_bgscan_config(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_802_11_BG_SCAN_QUERY: - ret = wlan_cmd_802_11_bg_scan_query(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_802_11_ASSOCIATE: - ret = wlan_cmd_802_11_associate(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_802_11_DEAUTHENTICATE: - ret = wlan_cmd_802_11_deauthenticate(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_802_11_AD_HOC_START: - ret = wlan_cmd_802_11_ad_hoc_start(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_802_11_AD_HOC_JOIN: - ret = wlan_cmd_802_11_ad_hoc_join(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_802_11_AD_HOC_STOP: - ret = wlan_cmd_802_11_ad_hoc_stop(pmpriv, cmd_ptr); - break; - case HostCmd_CMD_802_11_GET_LOG: - ret = wlan_cmd_802_11_get_log(pmpriv, cmd_ptr); - break; - case HostCmd_CMD_RSSI_INFO: - ret = wlan_cmd_802_11_rssi_info(pmpriv, cmd_ptr, cmd_action); - break; - case HostCmd_CMD_802_11_SNMP_MIB: - ret = - wlan_cmd_802_11_snmp_mib(pmpriv, cmd_ptr, cmd_action, cmd_oid, - pdata_buf); - break; - case HostCmd_CMD_802_11_RADIO_CONTROL: - ret = - wlan_cmd_802_11_radio_control(pmpriv, cmd_ptr, cmd_action, - pdata_buf); - break; - case HostCmd_CMD_802_11_TX_RATE_QUERY: - cmd_ptr->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_TX_RATE_QUERY); - cmd_ptr->size = - wlan_cpu_to_le16(sizeof(HostCmd_TX_RATE_QUERY) + S_DS_GEN); - pmpriv->tx_rate = 0; - ret = MLAN_STATUS_SUCCESS; - break; - case HostCmd_CMD_VERSION_EXT: - cmd_ptr->command = wlan_cpu_to_le16(cmd_no); - cmd_ptr->params.verext.version_str_sel = - (t_u8) (*((t_u32 *) pdata_buf)); - cmd_ptr->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_VERSION_EXT) + S_DS_GEN); - ret = MLAN_STATUS_SUCCESS; - break; - case HostCmd_CMD_RX_MGMT_IND: - cmd_ptr->command = wlan_cpu_to_le16(cmd_no); - cmd_ptr->params.rx_mgmt_ind.action = wlan_cpu_to_le16(cmd_action); - cmd_ptr->params.rx_mgmt_ind.mgmt_subtype_mask = - wlan_cpu_to_le32((t_u32) (*((t_u32 *) pdata_buf))); - cmd_ptr->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_RX_MGMT_IND) + S_DS_GEN); - break; - case HostCmd_CMD_802_11_RF_CHANNEL: - ret = - wlan_cmd_802_11_rf_channel(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_FUNC_INIT: - if (pmpriv->adapter->hw_status == WlanHardwareStatusReset) - pmpriv->adapter->hw_status = WlanHardwareStatusInitializing; - cmd_ptr->command = wlan_cpu_to_le16(cmd_no); - cmd_ptr->size = wlan_cpu_to_le16(S_DS_GEN); - break; - case HostCmd_CMD_FUNC_SHUTDOWN: - pmpriv->adapter->hw_status = WlanHardwareStatusReset; - cmd_ptr->command = wlan_cpu_to_le16(cmd_no); - cmd_ptr->size = wlan_cpu_to_le16(S_DS_GEN); - break; - case HostCmd_CMD_SOFT_RESET: - cmd_ptr->command = wlan_cpu_to_le16(cmd_no); - cmd_ptr->size = wlan_cpu_to_le16(S_DS_GEN); - break; - case HostCmd_CMD_11N_ADDBA_REQ: - ret = wlan_cmd_11n_addba_req(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_11N_DELBA: - ret = wlan_cmd_11n_delba(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_11N_ADDBA_RSP: - ret = wlan_cmd_11n_addba_rspgen(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_802_11_KEY_MATERIAL: - ret = - wlan_cmd_802_11_key_material(pmpriv, cmd_ptr, cmd_action, cmd_oid, - pdata_buf); - break; - - case HostCmd_CMD_SUPPLICANT_PMK: - ret = wlan_cmd_802_11_supplicant_pmk(pmpriv, cmd_ptr, cmd_action, - pdata_buf); - break; - case HostCmd_CMD_SUPPLICANT_PROFILE: - ret = wlan_cmd_802_11_supplicant_profile(pmpriv, cmd_ptr, cmd_action, - pdata_buf); - break; - - case HostCmd_CMD_802_11D_DOMAIN_INFO: - ret = wlan_cmd_802_11d_domain_info(pmpriv, cmd_ptr, cmd_action); - break; - case HostCmd_CMD_802_11_TPC_ADAPT_REQ: - case HostCmd_CMD_802_11_TPC_INFO: - case HostCmd_CMD_802_11_CHAN_SW_ANN: - case HostCmd_CMD_CHAN_REPORT_REQUEST: - ret = wlan_11h_cmd_process(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_RECONFIGURE_TX_BUFF: - ret = wlan_cmd_recfg_tx_buf(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_AMSDU_AGGR_CTRL: - ret = wlan_cmd_amsdu_aggr_ctrl(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_11N_CFG: - ret = wlan_cmd_11n_cfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_11AC_CFG: - ret = wlan_cmd_11ac_cfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; + HostCmd_DS_COMMAND *cmd_ptr = (HostCmd_DS_COMMAND *) pcmd_buf; + mlan_private *pmpriv = (mlan_private *) priv; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + /* Prepare command */ + switch (cmd_no) { + case HostCmd_CMD_GET_HW_SPEC: + ret = wlan_cmd_get_hw_spec(pmpriv, cmd_ptr); + break; + case HostCmd_CMD_CFG_DATA: + ret = wlan_cmd_cfg_data(pmpriv, cmd_ptr, cmd_action, pdata_buf); + break; + case HostCmd_CMD_MAC_CONTROL: + ret = wlan_cmd_mac_control(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_802_11_MAC_ADDRESS: + ret = wlan_cmd_802_11_mac_address(pmpriv, cmd_ptr, cmd_action); + break; + case HostCmd_CMD_MAC_MULTICAST_ADR: + ret = wlan_cmd_mac_multicast_adr(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_TX_RATE_CFG: + ret = wlan_cmd_tx_rate_cfg(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_802_11_RF_ANTENNA: + ret = wlan_cmd_802_11_rf_antenna(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_TXPWR_CFG: + ret = wlan_cmd_tx_power_cfg(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_802_11_RF_TX_POWER: + ret = wlan_cmd_802_11_rf_tx_power(pmpriv, cmd_ptr, + cmd_action, pdata_buf); + break; + case HostCmd_CMD_802_11_PS_MODE_ENH: + ret = wlan_cmd_enh_power_mode(pmpriv, cmd_ptr, cmd_action, + (t_u16) cmd_oid, pdata_buf); + break; + case HostCmd_CMD_802_11_HS_CFG_ENH: + ret = wlan_cmd_802_11_hs_cfg(pmpriv, cmd_ptr, cmd_action, + (hs_config_param *) pdata_buf); + break; + case HostCmd_CMD_802_11_SLEEP_PERIOD: + ret = wlan_cmd_802_11_sleep_period(pmpriv, cmd_ptr, + cmd_action, + (t_u16 *) pdata_buf); + break; + case HostCmd_CMD_802_11_SLEEP_PARAMS: + ret = wlan_cmd_802_11_sleep_params(pmpriv, cmd_ptr, + cmd_action, + (t_u16 *) pdata_buf); + break; + case HostCmd_CMD_802_11_SCAN: + ret = wlan_cmd_802_11_scan(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_802_11_BG_SCAN_CONFIG: + ret = wlan_cmd_bgscan_config(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_802_11_BG_SCAN_QUERY: + ret = wlan_cmd_802_11_bg_scan_query(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_802_11_ASSOCIATE: + ret = wlan_cmd_802_11_associate(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_802_11_DEAUTHENTICATE: + ret = wlan_cmd_802_11_deauthenticate(pmpriv, cmd_ptr, + pdata_buf); + break; + case HostCmd_CMD_802_11_AD_HOC_START: + ret = wlan_cmd_802_11_ad_hoc_start(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_802_11_AD_HOC_JOIN: + ret = wlan_cmd_802_11_ad_hoc_join(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_802_11_AD_HOC_STOP: + ret = wlan_cmd_802_11_ad_hoc_stop(pmpriv, cmd_ptr); + break; + case HostCmd_CMD_802_11_GET_LOG: + ret = wlan_cmd_802_11_get_log(pmpriv, cmd_ptr); + break; + case HostCmd_CMD_RSSI_INFO: + ret = wlan_cmd_802_11_rssi_info(pmpriv, cmd_ptr, cmd_action); + break; + case HostCmd_CMD_802_11_SNMP_MIB: + ret = wlan_cmd_802_11_snmp_mib(pmpriv, cmd_ptr, cmd_action, + cmd_oid, pdata_buf); + break; + case HostCmd_CMD_802_11_RADIO_CONTROL: + ret = wlan_cmd_802_11_radio_control(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_802_11_TX_RATE_QUERY: + cmd_ptr->command = + wlan_cpu_to_le16(HostCmd_CMD_802_11_TX_RATE_QUERY); + cmd_ptr->size = + wlan_cpu_to_le16(sizeof(HostCmd_TX_RATE_QUERY) + + S_DS_GEN); + pmpriv->tx_rate = 0; + ret = MLAN_STATUS_SUCCESS; + break; + case HostCmd_CMD_VERSION_EXT: + cmd_ptr->command = wlan_cpu_to_le16(cmd_no); + cmd_ptr->params.verext.version_str_sel = + (t_u8) (*((t_u32 *) pdata_buf)); + cmd_ptr->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_VERSION_EXT) + + S_DS_GEN); + ret = MLAN_STATUS_SUCCESS; + break; + case HostCmd_CMD_RX_MGMT_IND: + cmd_ptr->command = wlan_cpu_to_le16(cmd_no); + cmd_ptr->params.rx_mgmt_ind.action = + wlan_cpu_to_le16(cmd_action); + cmd_ptr->params.rx_mgmt_ind.mgmt_subtype_mask = + wlan_cpu_to_le32((t_u32) (*((t_u32 *) pdata_buf))); + cmd_ptr->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_RX_MGMT_IND) + + S_DS_GEN); + break; + case HostCmd_CMD_802_11_RF_CHANNEL: + ret = wlan_cmd_802_11_rf_channel(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_FUNC_INIT: + if (pmpriv->adapter->hw_status == WlanHardwareStatusReset) + pmpriv->adapter->hw_status = + WlanHardwareStatusInitializing; + cmd_ptr->command = wlan_cpu_to_le16(cmd_no); + cmd_ptr->size = wlan_cpu_to_le16(S_DS_GEN); + break; + case HostCmd_CMD_FUNC_SHUTDOWN: + pmpriv->adapter->hw_status = WlanHardwareStatusReset; + cmd_ptr->command = wlan_cpu_to_le16(cmd_no); + cmd_ptr->size = wlan_cpu_to_le16(S_DS_GEN); + break; + case HostCmd_CMD_SOFT_RESET: + cmd_ptr->command = wlan_cpu_to_le16(cmd_no); + cmd_ptr->size = wlan_cpu_to_le16(S_DS_GEN); + break; + case HostCmd_CMD_11N_ADDBA_REQ: + ret = wlan_cmd_11n_addba_req(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_11N_DELBA: + ret = wlan_cmd_11n_delba(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_11N_ADDBA_RSP: + ret = wlan_cmd_11n_addba_rspgen(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_802_11_KEY_MATERIAL: + ret = wlan_cmd_802_11_key_material(pmpriv, cmd_ptr, cmd_action, + cmd_oid, pdata_buf); + break; + + case HostCmd_CMD_SUPPLICANT_PMK: + ret = wlan_cmd_802_11_supplicant_pmk(pmpriv, cmd_ptr, + cmd_action, pdata_buf); + break; + case HostCmd_CMD_SUPPLICANT_PROFILE: + ret = wlan_cmd_802_11_supplicant_profile(pmpriv, cmd_ptr, + cmd_action, pdata_buf); + break; + + case HostCmd_CMD_802_11D_DOMAIN_INFO: + ret = wlan_cmd_802_11d_domain_info(pmpriv, cmd_ptr, cmd_action); + break; + case HostCmd_CMD_802_11_TPC_ADAPT_REQ: + case HostCmd_CMD_802_11_TPC_INFO: + case HostCmd_CMD_802_11_CHAN_SW_ANN: + case HostCmd_CMD_CHAN_REPORT_REQUEST: + ret = wlan_11h_cmd_process(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_RECONFIGURE_TX_BUFF: + ret = wlan_cmd_recfg_tx_buf(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_AMSDU_AGGR_CTRL: + ret = wlan_cmd_amsdu_aggr_ctrl(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_11N_CFG: + ret = wlan_cmd_11n_cfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); + break; + case HostCmd_CMD_11AC_CFG: + ret = wlan_cmd_11ac_cfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); + break; #if 0 - case HostCmd_CMD_RECONFIGURE_TX_BUFF: - ret = wlan_cmd_recfg_tx_buf(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; + case HostCmd_CMD_RECONFIGURE_TX_BUFF: + ret = wlan_cmd_recfg_tx_buf(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; #endif - case HostCmd_CMD_TX_BF_CFG: - ret = wlan_cmd_tx_bf_cfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_WMM_GET_STATUS: - PRINTM(MINFO, "WMM: WMM_GET_STATUS cmd sent\n"); - cmd_ptr->command = wlan_cpu_to_le16(HostCmd_CMD_WMM_GET_STATUS); - cmd_ptr->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_WMM_GET_STATUS) + S_DS_GEN); - ret = MLAN_STATUS_SUCCESS; - break; - case HostCmd_CMD_WMM_ADDTS_REQ: - ret = wlan_cmd_wmm_addts_req(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_WMM_DELTS_REQ: - ret = wlan_cmd_wmm_delts_req(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_WMM_QUEUE_CONFIG: - ret = wlan_cmd_wmm_queue_config(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_WMM_QUEUE_STATS: - ret = wlan_cmd_wmm_queue_stats(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_WMM_TS_STATUS: - ret = wlan_cmd_wmm_ts_status(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_802_11_IBSS_COALESCING_STATUS: - ret = - wlan_cmd_ibss_coalescing_status(pmpriv, cmd_ptr, cmd_action, - pdata_buf); - break; - case HostCmd_CMD_MGMT_IE_LIST: - ret = wlan_cmd_mgmt_ie_list(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_802_11_SCAN_EXT: - ret = wlan_cmd_802_11_scan_ext(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_ECL_SYSTEM_CLOCK_CONFIG: - ret = wlan_cmd_sysclock_cfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_MAC_REG_ACCESS: - case HostCmd_CMD_BBP_REG_ACCESS: - case HostCmd_CMD_RF_REG_ACCESS: - case HostCmd_CMD_CAU_REG_ACCESS: - case HostCmd_CMD_802_11_EEPROM_ACCESS: - ret = wlan_cmd_reg_access(cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_MEM_ACCESS: - ret = wlan_cmd_mem_access(cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_INACTIVITY_TIMEOUT_EXT: - ret = wlan_cmd_inactivity_timeout(cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_SDIO_GPIO_INT_CONFIG: - ret = wlan_cmd_sdio_gpio_int(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_SET_BSS_MODE: - cmd_ptr->command = wlan_cpu_to_le16(cmd_no); + case HostCmd_CMD_TX_BF_CFG: + ret = wlan_cmd_tx_bf_cfg(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_WMM_GET_STATUS: + PRINTM(MINFO, "WMM: WMM_GET_STATUS cmd sent\n"); + cmd_ptr->command = wlan_cpu_to_le16(HostCmd_CMD_WMM_GET_STATUS); + cmd_ptr->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_WMM_GET_STATUS) + + S_DS_GEN); + ret = MLAN_STATUS_SUCCESS; + break; + case HostCmd_CMD_WMM_ADDTS_REQ: + ret = wlan_cmd_wmm_addts_req(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_WMM_DELTS_REQ: + ret = wlan_cmd_wmm_delts_req(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_WMM_QUEUE_CONFIG: + ret = wlan_cmd_wmm_queue_config(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_WMM_QUEUE_STATS: + ret = wlan_cmd_wmm_queue_stats(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_WMM_TS_STATUS: + ret = wlan_cmd_wmm_ts_status(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_802_11_IBSS_COALESCING_STATUS: + ret = wlan_cmd_ibss_coalescing_status(pmpriv, cmd_ptr, + cmd_action, pdata_buf); + break; + case HostCmd_CMD_MGMT_IE_LIST: + ret = wlan_cmd_mgmt_ie_list(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_802_11_SCAN_EXT: + ret = wlan_cmd_802_11_scan_ext(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_ECL_SYSTEM_CLOCK_CONFIG: + ret = wlan_cmd_sysclock_cfg(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_MAC_REG_ACCESS: + case HostCmd_CMD_BBP_REG_ACCESS: + case HostCmd_CMD_RF_REG_ACCESS: + case HostCmd_CMD_CAU_REG_ACCESS: + case HostCmd_CMD_802_11_EEPROM_ACCESS: + ret = wlan_cmd_reg_access(cmd_ptr, cmd_action, pdata_buf); + break; + case HostCmd_CMD_MEM_ACCESS: + ret = wlan_cmd_mem_access(cmd_ptr, cmd_action, pdata_buf); + break; + case HostCmd_CMD_INACTIVITY_TIMEOUT_EXT: + ret = wlan_cmd_inactivity_timeout(cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_SDIO_GPIO_INT_CONFIG: + ret = wlan_cmd_sdio_gpio_int(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_SET_BSS_MODE: + cmd_ptr->command = wlan_cpu_to_le16(cmd_no); #ifdef WIFI_DIRECT_SUPPORT - if (pdata_buf) { - cmd_ptr->params.bss_mode.con_type = *(t_u8 *) pdata_buf; - } else + if (pdata_buf) { + cmd_ptr->params.bss_mode.con_type = *(t_u8 *) pdata_buf; + } else #endif - if (pmpriv->bss_mode == MLAN_BSS_MODE_IBSS) - cmd_ptr->params.bss_mode.con_type = CONNECTION_TYPE_ADHOC; - else if (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) - cmd_ptr->params.bss_mode.con_type = CONNECTION_TYPE_INFRA; - cmd_ptr->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_SET_BSS_MODE) + S_DS_GEN); - ret = MLAN_STATUS_SUCCESS; - break; - case HostCmd_CMD_MEASUREMENT_REQUEST: - case HostCmd_CMD_MEASUREMENT_REPORT: - ret = wlan_meas_cmd_process(pmpriv, cmd_ptr, pdata_buf); - break; + if (pmpriv->bss_mode == MLAN_BSS_MODE_IBSS) + cmd_ptr->params.bss_mode.con_type = + CONNECTION_TYPE_ADHOC; + else if (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) + cmd_ptr->params.bss_mode.con_type = + CONNECTION_TYPE_INFRA; + cmd_ptr->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_SET_BSS_MODE) + + S_DS_GEN); + ret = MLAN_STATUS_SUCCESS; + break; + case HostCmd_CMD_MEASUREMENT_REQUEST: + case HostCmd_CMD_MEASUREMENT_REPORT: + ret = wlan_meas_cmd_process(pmpriv, cmd_ptr, pdata_buf); + break; #ifdef WIFI_DIRECT_SUPPORT - case HostCmd_CMD_802_11_REMAIN_ON_CHANNEL: - ret = - wlan_cmd_remain_on_channel(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HOST_CMD_WIFI_DIRECT_MODE_CONFIG: - ret = wlan_cmd_wifi_direct_mode(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; + case HostCmd_CMD_802_11_REMAIN_ON_CHANNEL: + ret = wlan_cmd_remain_on_channel(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HOST_CMD_WIFI_DIRECT_MODE_CONFIG: + ret = wlan_cmd_wifi_direct_mode(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; #endif - case HostCmd_CMD_802_11_SUBSCRIBE_EVENT: - ret = wlan_cmd_subscribe_event(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_OTP_READ_USER_DATA: - ret = wlan_cmd_otp_user_data(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_HS_WAKEUP_REASON: - ret = wlan_cmd_hs_wakeup_reason(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_REJECT_ADDBA_REQ: - ret = wlan_cmd_reject_addba_req(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - default: - PRINTM(MERROR, "PREP_CMD: unknown command- %#x\n", cmd_no); - ret = MLAN_STATUS_FAILURE; - break; - } - - LEAVE(); - return ret; + case HostCmd_CMD_802_11_SUBSCRIBE_EVENT: + ret = wlan_cmd_subscribe_event(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_OTP_READ_USER_DATA: + ret = wlan_cmd_otp_user_data(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_HS_WAKEUP_REASON: + ret = wlan_cmd_hs_wakeup_reason(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_REJECT_ADDBA_REQ: + ret = wlan_cmd_reject_addba_req(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + default: + PRINTM(MERROR, "PREP_CMD: unknown command- %#x\n", cmd_no); + ret = MLAN_STATUS_FAILURE; + break; + } + + LEAVE(); + return ret; } /** @@ -1874,82 +2009,83 @@ wlan_ops_sta_prepare_cmd(IN t_void * priv, mlan_status wlan_ops_sta_init_cmd(IN t_void * priv, IN t_u8 first_bss) { - pmlan_private pmpriv = (pmlan_private) priv; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u16 enable = MTRUE; - mlan_ds_11n_amsdu_aggr_ctrl amsdu_aggr_ctrl; - - ENTER(); - - if (first_bss == MTRUE) { - ret = wlan_adapter_init_cmd(pmpriv->adapter); - if (ret == MLAN_STATUS_FAILURE) - goto done; - } - - /* get tx rate */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_TX_RATE_CFG, - HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); - if (ret) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - pmpriv->data_rate = 0; - - /* get tx power */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_RF_TX_POWER, - HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); - if (ret) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - /* set ibss coalescing_status */ - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_IBSS_COALESCING_STATUS, - HostCmd_ACT_GEN_SET, 0, MNULL, &enable); - if (ret) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - memset(pmpriv->adapter, &amsdu_aggr_ctrl, 0, sizeof(amsdu_aggr_ctrl)); - amsdu_aggr_ctrl.enable = MLAN_ACT_ENABLE; - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_AMSDU_AGGR_CTRL, - HostCmd_ACT_GEN_SET, 0, MNULL, - (t_void *) & amsdu_aggr_ctrl); - if (ret) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - /* MAC Control must be the last command in init_fw */ - /* set MAC Control */ - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_MAC_CONTROL, - HostCmd_ACT_GEN_SET, 0, MNULL, - &pmpriv->curr_pkt_filter); - if (ret) { - ret = MLAN_STATUS_FAILURE; - goto done; - } + pmlan_private pmpriv = (pmlan_private) priv; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u16 enable = MTRUE; + mlan_ds_11n_amsdu_aggr_ctrl amsdu_aggr_ctrl; + + ENTER(); + + if (first_bss == MTRUE) { + ret = wlan_adapter_init_cmd(pmpriv->adapter); + if (ret == MLAN_STATUS_FAILURE) + goto done; + } + + /* get tx rate */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_TX_RATE_CFG, + HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); + if (ret) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + pmpriv->data_rate = 0; + + /* get tx power */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_RF_TX_POWER, + HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); + if (ret) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + /* set ibss coalescing_status */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_IBSS_COALESCING_STATUS, + HostCmd_ACT_GEN_SET, 0, MNULL, &enable); + if (ret) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + memset(pmpriv->adapter, &amsdu_aggr_ctrl, 0, sizeof(amsdu_aggr_ctrl)); + amsdu_aggr_ctrl.enable = MLAN_ACT_ENABLE; + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_AMSDU_AGGR_CTRL, + HostCmd_ACT_GEN_SET, 0, MNULL, + (t_void *) & amsdu_aggr_ctrl); + if (ret) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + /* MAC Control must be the last command in init_fw */ + /* set MAC Control */ + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_MAC_CONTROL, + HostCmd_ACT_GEN_SET, 0, MNULL, + &pmpriv->curr_pkt_filter); + if (ret) { + ret = MLAN_STATUS_FAILURE; + goto done; + } /** set last_init_cmd */ - pmpriv->adapter->last_init_cmd = HostCmd_CMD_MAC_CONTROL; - - if (first_bss == MFALSE) { - /* Get MAC address */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_MAC_ADDRESS, - HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); - if (ret) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - pmpriv->adapter->last_init_cmd = HostCmd_CMD_802_11_MAC_ADDRESS; - } - - ret = MLAN_STATUS_PENDING; - done: - LEAVE(); - return ret; + pmpriv->adapter->last_init_cmd = HostCmd_CMD_MAC_CONTROL; + + if (first_bss == MFALSE) { + /* Get MAC address */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_MAC_ADDRESS, + HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); + if (ret) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + pmpriv->adapter->last_init_cmd = HostCmd_CMD_802_11_MAC_ADDRESS; + } + + ret = MLAN_STATUS_PENDING; +done: + LEAVE(); + return ret; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_sta_cmdresp.c b/drivers/net/wireless/sd8897/mlan/mlan_sta_cmdresp.c index 60cbdc885386..1056bbc58047 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_sta_cmdresp.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_sta_cmdresp.c @@ -3,7 +3,7 @@ * @brief This file contains the handling of command * responses generated by firmware. * - * Copyright (C) 2008-2012, Marvell International Ltd. + * Copyright (C) 2008-2012, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -47,9 +47,9 @@ Change log: /******************************************************** Local Functions ********************************************************/ -/** +/** * @brief This function handles the command response error - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to command buffer @@ -58,65 +58,67 @@ Change log: */ static void wlan_process_cmdresp_error(mlan_private * pmpriv, HostCmd_DS_COMMAND * resp, - mlan_ioctl_req * pioctl_buf) + mlan_ioctl_req * pioctl_buf) { - mlan_adapter *pmadapter = pmpriv->adapter; - - ENTER(); - - PRINTM(MERROR, "CMD_RESP: cmd %#x error, result=%#x\n", - resp->command, resp->result); - if (pioctl_buf) - pioctl_buf->status_code = MLAN_ERROR_FW_CMDRESP; - - switch (resp->command) { - case HostCmd_CMD_802_11_PS_MODE_ENH: - { - HostCmd_DS_802_11_PS_MODE_ENH *pm = &resp->params.psmode_enh; - PRINTM(MERROR, - "PS_MODE_ENH command failed: result=0x%x action=0x%X\n", - resp->result, wlan_le16_to_cpu(pm->action)); - /* - * We do not re-try enter-ps command in ad-hoc mode. - */ - if (wlan_le16_to_cpu(pm->action) == EN_AUTO_PS && - (wlan_le16_to_cpu(pm->params.auto_ps.ps_bitmap) & BITMAP_STA_PS) - && pmpriv->bss_mode == MLAN_BSS_MODE_IBSS) - pmadapter->ps_mode = Wlan802_11PowerModeCAM; - } - break; - case HostCmd_CMD_802_11_SCAN_EXT: - case HostCmd_CMD_802_11_SCAN: - /* Cancel all pending scan command */ - wlan_flush_scan_queue(pmadapter); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_SCAN_REPORT, MNULL); - break; - - case HostCmd_CMD_MAC_CONTROL: - break; - - case HostCmd_CMD_802_11_ASSOCIATE: - wlan_reset_connect_state(pmpriv, MTRUE); - break; - default: - break; - } - /* - * Handling errors here - */ - wlan_insert_cmd_to_free_q(pmadapter, pmadapter->curr_cmd); - - wlan_request_cmd_lock(pmadapter); - pmadapter->curr_cmd = MNULL; - wlan_release_cmd_lock(pmadapter); - - LEAVE(); - return; + mlan_adapter *pmadapter = pmpriv->adapter; + + ENTER(); + + PRINTM(MERROR, "CMD_RESP: cmd %#x error, result=%#x\n", + resp->command, resp->result); + if (pioctl_buf) + pioctl_buf->status_code = MLAN_ERROR_FW_CMDRESP; + + switch (resp->command) { + case HostCmd_CMD_802_11_PS_MODE_ENH: + { + HostCmd_DS_802_11_PS_MODE_ENH *pm = + &resp->params.psmode_enh; + PRINTM(MERROR, + "PS_MODE_ENH command failed: result=0x%x action=0x%X\n", + resp->result, wlan_le16_to_cpu(pm->action)); + /* + * We do not re-try enter-ps command in ad-hoc mode. + */ + if (wlan_le16_to_cpu(pm->action) == EN_AUTO_PS && + (wlan_le16_to_cpu(pm->params.auto_ps.ps_bitmap) & + BITMAP_STA_PS) && + pmpriv->bss_mode == MLAN_BSS_MODE_IBSS) + pmadapter->ps_mode = Wlan802_11PowerModeCAM; + } + break; + case HostCmd_CMD_802_11_SCAN_EXT: + case HostCmd_CMD_802_11_SCAN: + /* Cancel all pending scan command */ + wlan_flush_scan_queue(pmadapter); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_SCAN_REPORT, MNULL); + break; + + case HostCmd_CMD_MAC_CONTROL: + break; + + case HostCmd_CMD_802_11_ASSOCIATE: + wlan_reset_connect_state(pmpriv, MTRUE); + break; + default: + break; + } + /* + * Handling errors here + */ + wlan_insert_cmd_to_free_q(pmadapter, pmadapter->curr_cmd); + + wlan_request_cmd_lock(pmadapter); + pmadapter->curr_cmd = MNULL; + wlan_release_cmd_lock(pmadapter); + + LEAVE(); + return; } -/** +/** * @brief This function handles the command response of RSSI info - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -125,80 +127,82 @@ wlan_process_cmdresp_error(mlan_private * pmpriv, HostCmd_DS_COMMAND * resp, */ static mlan_status wlan_ret_802_11_rssi_info(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_802_11_RSSI_INFO_RSP *prssi_info_rsp = - &resp->params.rssi_info_rsp; - mlan_ds_get_info *pget_info = MNULL; - BSSDescriptor_t *pbss_desc; - t_s32 tbl_idx = 0; - - ENTER(); - - pmpriv->data_rssi_last = wlan_le16_to_cpu(prssi_info_rsp->data_rssi_last); - pmpriv->data_nf_last = wlan_le16_to_cpu(prssi_info_rsp->data_nf_last); - - pmpriv->data_rssi_avg = wlan_le16_to_cpu(prssi_info_rsp->data_rssi_avg); - pmpriv->data_nf_avg = wlan_le16_to_cpu(prssi_info_rsp->data_nf_avg); - - pmpriv->bcn_rssi_last = wlan_le16_to_cpu(prssi_info_rsp->bcn_rssi_last); - pmpriv->bcn_nf_last = wlan_le16_to_cpu(prssi_info_rsp->bcn_nf_last); - - pmpriv->bcn_rssi_avg = wlan_le16_to_cpu(prssi_info_rsp->bcn_rssi_avg); - pmpriv->bcn_nf_avg = wlan_le16_to_cpu(prssi_info_rsp->bcn_nf_avg); - - /* Get current BSS info */ - pbss_desc = &pmpriv->curr_bss_params.bss_descriptor; - tbl_idx = - wlan_find_ssid_in_list(pmpriv, &pbss_desc->ssid, pbss_desc->mac_address, - pmpriv->bss_mode); - if (tbl_idx >= 0) { - pbss_desc = &pmpriv->adapter->pscan_table[tbl_idx]; - pbss_desc->rssi = -pmpriv->bcn_rssi_avg; - } - - /* Need to indicate IOCTL complete */ - if (pioctl_buf != MNULL) { - pget_info = (mlan_ds_get_info *) pioctl_buf->pbuf; - - memset(pmpriv->adapter, &pget_info->param.signal, 0, - sizeof(mlan_ds_get_signal)); - - pget_info->param.signal.selector = ALL_RSSI_INFO_MASK; - - /* RSSI */ - pget_info->param.signal.bcn_rssi_last = pmpriv->bcn_rssi_last; - pget_info->param.signal.bcn_rssi_avg = pmpriv->bcn_rssi_avg; - pget_info->param.signal.data_rssi_last = pmpriv->data_rssi_last; - pget_info->param.signal.data_rssi_avg = pmpriv->data_rssi_avg; - - /* SNR */ - pget_info->param.signal.bcn_snr_last = - CAL_SNR(pmpriv->bcn_rssi_last, pmpriv->bcn_nf_last); - pget_info->param.signal.bcn_snr_avg = - CAL_SNR(pmpriv->bcn_rssi_avg, pmpriv->bcn_nf_avg); - pget_info->param.signal.data_snr_last = - CAL_SNR(pmpriv->data_rssi_last, pmpriv->data_nf_last); - pget_info->param.signal.data_snr_avg = - CAL_SNR(pmpriv->data_rssi_avg, pmpriv->data_nf_avg); - - /* NF */ - pget_info->param.signal.bcn_nf_last = pmpriv->bcn_nf_last; - pget_info->param.signal.bcn_nf_avg = pmpriv->bcn_nf_avg; - pget_info->param.signal.data_nf_last = pmpriv->data_nf_last; - pget_info->param.signal.data_nf_avg = pmpriv->data_nf_avg; - - pioctl_buf->data_read_written = sizeof(mlan_ds_get_info); - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_RSSI_INFO_RSP *prssi_info_rsp = + &resp->params.rssi_info_rsp; + mlan_ds_get_info *pget_info = MNULL; + BSSDescriptor_t *pbss_desc; + t_s32 tbl_idx = 0; + + ENTER(); + + pmpriv->data_rssi_last = + wlan_le16_to_cpu(prssi_info_rsp->data_rssi_last); + pmpriv->data_nf_last = wlan_le16_to_cpu(prssi_info_rsp->data_nf_last); + + pmpriv->data_rssi_avg = wlan_le16_to_cpu(prssi_info_rsp->data_rssi_avg); + pmpriv->data_nf_avg = wlan_le16_to_cpu(prssi_info_rsp->data_nf_avg); + + pmpriv->bcn_rssi_last = wlan_le16_to_cpu(prssi_info_rsp->bcn_rssi_last); + pmpriv->bcn_nf_last = wlan_le16_to_cpu(prssi_info_rsp->bcn_nf_last); + + pmpriv->bcn_rssi_avg = wlan_le16_to_cpu(prssi_info_rsp->bcn_rssi_avg); + pmpriv->bcn_nf_avg = wlan_le16_to_cpu(prssi_info_rsp->bcn_nf_avg); + + /* Get current BSS info */ + pbss_desc = &pmpriv->curr_bss_params.bss_descriptor; + tbl_idx = + wlan_find_ssid_in_list(pmpriv, &pbss_desc->ssid, + pbss_desc->mac_address, + pmpriv->bss_mode); + if (tbl_idx >= 0) { + pbss_desc = &pmpriv->adapter->pscan_table[tbl_idx]; + pbss_desc->rssi = -pmpriv->bcn_rssi_avg; + } + + /* Need to indicate IOCTL complete */ + if (pioctl_buf != MNULL) { + pget_info = (mlan_ds_get_info *) pioctl_buf->pbuf; + + memset(pmpriv->adapter, &pget_info->param.signal, 0, + sizeof(mlan_ds_get_signal)); + + pget_info->param.signal.selector = ALL_RSSI_INFO_MASK; + + /* RSSI */ + pget_info->param.signal.bcn_rssi_last = pmpriv->bcn_rssi_last; + pget_info->param.signal.bcn_rssi_avg = pmpriv->bcn_rssi_avg; + pget_info->param.signal.data_rssi_last = pmpriv->data_rssi_last; + pget_info->param.signal.data_rssi_avg = pmpriv->data_rssi_avg; + + /* SNR */ + pget_info->param.signal.bcn_snr_last = + CAL_SNR(pmpriv->bcn_rssi_last, pmpriv->bcn_nf_last); + pget_info->param.signal.bcn_snr_avg = + CAL_SNR(pmpriv->bcn_rssi_avg, pmpriv->bcn_nf_avg); + pget_info->param.signal.data_snr_last = + CAL_SNR(pmpriv->data_rssi_last, pmpriv->data_nf_last); + pget_info->param.signal.data_snr_avg = + CAL_SNR(pmpriv->data_rssi_avg, pmpriv->data_nf_avg); + + /* NF */ + pget_info->param.signal.bcn_nf_last = pmpriv->bcn_nf_last; + pget_info->param.signal.bcn_nf_avg = pmpriv->bcn_nf_avg; + pget_info->param.signal.data_nf_last = pmpriv->data_nf_last; + pget_info->param.signal.data_nf_avg = pmpriv->data_nf_avg; + + pioctl_buf->data_read_written = sizeof(mlan_ds_get_info); + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of snmp_mib - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -207,105 +211,109 @@ wlan_ret_802_11_rssi_info(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_802_11_snmp_mib(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_802_11_SNMP_MIB *psmib = &resp->params.smib; - t_u16 oid = wlan_le16_to_cpu(psmib->oid); - t_u16 query_type = wlan_le16_to_cpu(psmib->query_type); - t_u32 ul_temp; - mlan_ds_snmp_mib *mib = MNULL; - - ENTER(); - - if (pioctl_buf) - mib = (mlan_ds_snmp_mib *) pioctl_buf->pbuf; - - PRINTM(MINFO, "SNMP_RESP: value of the oid = 0x%x, query_type=0x%x\n", oid, - query_type); - PRINTM(MINFO, "SNMP_RESP: Buf size = 0x%x\n", - wlan_le16_to_cpu(psmib->buf_size)); - if (query_type == HostCmd_ACT_GEN_GET) { - switch (oid) { - case DtimPeriod_i: - ul_temp = psmib->value[0]; - PRINTM(MINFO, "SNMP_RESP: DTIM Period =%u\n", ul_temp); - if (mib) - mib->param.dtim_period = ul_temp; - break; - case FragThresh_i: - ul_temp = wlan_le16_to_cpu(*((t_u16 *) (psmib->value))); - PRINTM(MINFO, "SNMP_RESP: FragThsd =%u\n", ul_temp); - if (mib) - mib->param.frag_threshold = ul_temp; - break; - - case RtsThresh_i: - ul_temp = wlan_le16_to_cpu(*((t_u16 *) (psmib->value))); - PRINTM(MINFO, "SNMP_RESP: RTSThsd =%u\n", ul_temp); - if (mib) - mib->param.rts_threshold = ul_temp; - break; - - case ShortRetryLim_i: - ul_temp = wlan_le16_to_cpu(*((t_u16 *) (psmib->value))); - PRINTM(MINFO, "SNMP_RESP: TxRetryCount=%u\n", ul_temp); - if (mib) - mib->param.retry_count = ul_temp; - break; - case WwsMode_i: - ul_temp = wlan_le16_to_cpu(*((t_u16 *) (psmib->value))); - PRINTM(MINFO, "SNMP_RESP: WWSCfg =%u\n", ul_temp); - if (pioctl_buf) - ((mlan_ds_misc_cfg *) pioctl_buf->pbuf)->param.wws_cfg = - ul_temp; - break; - case Thermal_i: - ul_temp = wlan_le32_to_cpu(*((t_u32 *) (psmib->value))); - PRINTM(MINFO, "SNMP_RESP: Thermal =%u\n", ul_temp); - if (pioctl_buf) - ((mlan_ds_misc_cfg *) pioctl_buf->pbuf)->param.thermal = - ul_temp; - break; - - default: - break; - } - } else { /* (query_type == HostCmd_ACT_GEN_SET) */ - /* Update state for 11d */ - if (oid == Dot11D_i) { - ul_temp = wlan_le16_to_cpu(*((t_u16 *) (psmib->value))); - /* Set 11d state to private */ - pmpriv->state_11d.enable_11d = ul_temp; - /* Set user enable flag if called from ioctl */ - if (pioctl_buf) - pmpriv->state_11d.user_enable_11d = ul_temp; - } - /* Update state for 11h */ - if (oid == Dot11H_i) { - ul_temp = wlan_le16_to_cpu(*((t_u16 *) (psmib->value))); - /* Set 11h state to priv */ - pmpriv->intf_state_11h.is_11h_active = (ul_temp & ENABLE_11H_MASK); - /* Set radar_det state to adapter */ - pmpriv->adapter->state_11h.is_master_radar_det_active - = (ul_temp & MASTER_RADAR_DET_MASK) ? MTRUE : MFALSE; - pmpriv->adapter->state_11h.is_slave_radar_det_active - = (ul_temp & SLAVE_RADAR_DET_MASK) ? MTRUE : MFALSE; - } - } - - if (pioctl_buf) { - /* Indicate ioctl complete */ - pioctl_buf->data_read_written = sizeof(mlan_ds_snmp_mib); - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_SNMP_MIB *psmib = &resp->params.smib; + t_u16 oid = wlan_le16_to_cpu(psmib->oid); + t_u16 query_type = wlan_le16_to_cpu(psmib->query_type); + t_u32 ul_temp; + mlan_ds_snmp_mib *mib = MNULL; + + ENTER(); + + if (pioctl_buf) + mib = (mlan_ds_snmp_mib *) pioctl_buf->pbuf; + + PRINTM(MINFO, "SNMP_RESP: value of the oid = 0x%x, query_type=0x%x\n", + oid, query_type); + PRINTM(MINFO, "SNMP_RESP: Buf size = 0x%x\n", + wlan_le16_to_cpu(psmib->buf_size)); + if (query_type == HostCmd_ACT_GEN_GET) { + switch (oid) { + case DtimPeriod_i: + ul_temp = psmib->value[0]; + PRINTM(MINFO, "SNMP_RESP: DTIM Period =%u\n", ul_temp); + if (mib) + mib->param.dtim_period = ul_temp; + break; + case FragThresh_i: + ul_temp = wlan_le16_to_cpu(*((t_u16 *) (psmib->value))); + PRINTM(MINFO, "SNMP_RESP: FragThsd =%u\n", ul_temp); + if (mib) + mib->param.frag_threshold = ul_temp; + break; + + case RtsThresh_i: + ul_temp = wlan_le16_to_cpu(*((t_u16 *) (psmib->value))); + PRINTM(MINFO, "SNMP_RESP: RTSThsd =%u\n", ul_temp); + if (mib) + mib->param.rts_threshold = ul_temp; + break; + + case ShortRetryLim_i: + ul_temp = wlan_le16_to_cpu(*((t_u16 *) (psmib->value))); + PRINTM(MINFO, "SNMP_RESP: TxRetryCount=%u\n", ul_temp); + if (mib) + mib->param.retry_count = ul_temp; + break; + case WwsMode_i: + ul_temp = wlan_le16_to_cpu(*((t_u16 *) (psmib->value))); + PRINTM(MINFO, "SNMP_RESP: WWSCfg =%u\n", ul_temp); + if (pioctl_buf) + ((mlan_ds_misc_cfg *) pioctl_buf->pbuf)->param. + wws_cfg = ul_temp; + break; + case Thermal_i: + ul_temp = wlan_le32_to_cpu(*((t_u32 *) (psmib->value))); + PRINTM(MINFO, "SNMP_RESP: Thermal =%u\n", ul_temp); + if (pioctl_buf) + ((mlan_ds_misc_cfg *) pioctl_buf->pbuf)->param. + thermal = ul_temp; + break; + + default: + break; + } + } else { /* (query_type == HostCmd_ACT_GEN_SET) */ + /* Update state for 11d */ + if (oid == Dot11D_i) { + ul_temp = wlan_le16_to_cpu(*((t_u16 *) (psmib->value))); + /* Set 11d state to private */ + pmpriv->state_11d.enable_11d = ul_temp; + /* Set user enable flag if called from ioctl */ + if (pioctl_buf) + pmpriv->state_11d.user_enable_11d = ul_temp; + } + /* Update state for 11h */ + if (oid == Dot11H_i) { + ul_temp = wlan_le16_to_cpu(*((t_u16 *) (psmib->value))); + /* Set 11h state to priv */ + pmpriv->intf_state_11h.is_11h_active = + (ul_temp & ENABLE_11H_MASK); + /* Set radar_det state to adapter */ + pmpriv->adapter->state_11h.is_master_radar_det_active + = + (ul_temp & MASTER_RADAR_DET_MASK) ? MTRUE : + MFALSE; + pmpriv->adapter->state_11h.is_slave_radar_det_active = + (ul_temp & SLAVE_RADAR_DET_MASK) ? MTRUE : + MFALSE; + } + } + + if (pioctl_buf) { + /* Indicate ioctl complete */ + pioctl_buf->data_read_written = sizeof(mlan_ds_snmp_mib); + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of get_log - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -314,111 +322,116 @@ wlan_ret_802_11_snmp_mib(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_get_log(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_802_11_GET_LOG *pget_log = - (HostCmd_DS_802_11_GET_LOG *) & resp->params.get_log; - mlan_ds_get_info *pget_info = MNULL; - - ENTER(); - - if (pioctl_buf) { - pget_info = (mlan_ds_get_info *) pioctl_buf->pbuf; - pget_info->param.stats.mcast_tx_frame = - wlan_le32_to_cpu(pget_log->mcast_tx_frame); - pget_info->param.stats.failed = wlan_le32_to_cpu(pget_log->failed); - pget_info->param.stats.retry = wlan_le32_to_cpu(pget_log->retry); - pget_info->param.stats.multi_retry = - wlan_le32_to_cpu(pget_log->multiretry); - pget_info->param.stats.frame_dup = - wlan_le32_to_cpu(pget_log->frame_dup); - pget_info->param.stats.rts_success = - wlan_le32_to_cpu(pget_log->rts_success); - pget_info->param.stats.rts_failure = - wlan_le32_to_cpu(pget_log->rts_failure); - pget_info->param.stats.ack_failure = - wlan_le32_to_cpu(pget_log->ack_failure); - pget_info->param.stats.rx_frag = wlan_le32_to_cpu(pget_log->rx_frag); - pget_info->param.stats.mcast_rx_frame = - wlan_le32_to_cpu(pget_log->mcast_rx_frame); - pget_info->param.stats.fcs_error = - wlan_le32_to_cpu(pget_log->fcs_error); - pget_info->param.stats.tx_frame = wlan_le32_to_cpu(pget_log->tx_frame); - pget_info->param.stats.wep_icv_error[0] = - wlan_le32_to_cpu(pget_log->wep_icv_err_cnt[0]); - pget_info->param.stats.wep_icv_error[1] = - wlan_le32_to_cpu(pget_log->wep_icv_err_cnt[1]); - pget_info->param.stats.wep_icv_error[2] = - wlan_le32_to_cpu(pget_log->wep_icv_err_cnt[2]); - pget_info->param.stats.wep_icv_error[3] = - wlan_le32_to_cpu(pget_log->wep_icv_err_cnt[3]); - pget_info->param.stats.bcn_rcv_cnt = - wlan_le32_to_cpu(pget_log->bcn_rcv_cnt); - pget_info->param.stats.bcn_miss_cnt = - wlan_le32_to_cpu(pget_log->bcn_miss_cnt); - /* Indicate ioctl complete */ - pioctl_buf->data_read_written = sizeof(mlan_ds_get_info); - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_GET_LOG *pget_log = + (HostCmd_DS_802_11_GET_LOG *) & resp->params.get_log; + mlan_ds_get_info *pget_info = MNULL; + + ENTER(); + + if (pioctl_buf) { + pget_info = (mlan_ds_get_info *) pioctl_buf->pbuf; + pget_info->param.stats.mcast_tx_frame = + wlan_le32_to_cpu(pget_log->mcast_tx_frame); + pget_info->param.stats.failed = + wlan_le32_to_cpu(pget_log->failed); + pget_info->param.stats.retry = + wlan_le32_to_cpu(pget_log->retry); + pget_info->param.stats.multi_retry = + wlan_le32_to_cpu(pget_log->multiretry); + pget_info->param.stats.frame_dup = + wlan_le32_to_cpu(pget_log->frame_dup); + pget_info->param.stats.rts_success = + wlan_le32_to_cpu(pget_log->rts_success); + pget_info->param.stats.rts_failure = + wlan_le32_to_cpu(pget_log->rts_failure); + pget_info->param.stats.ack_failure = + wlan_le32_to_cpu(pget_log->ack_failure); + pget_info->param.stats.rx_frag = + wlan_le32_to_cpu(pget_log->rx_frag); + pget_info->param.stats.mcast_rx_frame = + wlan_le32_to_cpu(pget_log->mcast_rx_frame); + pget_info->param.stats.fcs_error = + wlan_le32_to_cpu(pget_log->fcs_error); + pget_info->param.stats.tx_frame = + wlan_le32_to_cpu(pget_log->tx_frame); + pget_info->param.stats.wep_icv_error[0] = + wlan_le32_to_cpu(pget_log->wep_icv_err_cnt[0]); + pget_info->param.stats.wep_icv_error[1] = + wlan_le32_to_cpu(pget_log->wep_icv_err_cnt[1]); + pget_info->param.stats.wep_icv_error[2] = + wlan_le32_to_cpu(pget_log->wep_icv_err_cnt[2]); + pget_info->param.stats.wep_icv_error[3] = + wlan_le32_to_cpu(pget_log->wep_icv_err_cnt[3]); + pget_info->param.stats.bcn_rcv_cnt = + wlan_le32_to_cpu(pget_log->bcn_rcv_cnt); + pget_info->param.stats.bcn_miss_cnt = + wlan_le32_to_cpu(pget_log->bcn_miss_cnt); + /* Indicate ioctl complete */ + pioctl_buf->data_read_written = sizeof(mlan_ds_get_info); + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief Get power level and rate index * * @param pmpriv A pointer to mlan_private structure * @param pdata_buf Pointer to the data buffer - * + * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ static mlan_status wlan_get_power_level(pmlan_private pmpriv, void *pdata_buf) { - t_u16 length = 0; - t_s8 max_power = -1, min_power = -1; - MrvlTypes_Power_Group_t *ppg_tlv = MNULL; - Power_Group_t *pg = MNULL; - - ENTER(); - - if (pdata_buf) { - ppg_tlv = - (MrvlTypes_Power_Group_t *) ((t_u8 *) pdata_buf + - sizeof(HostCmd_DS_TXPWR_CFG)); - pg = (Power_Group_t *) ((t_u8 *) ppg_tlv + - sizeof(MrvlTypes_Power_Group_t)); - length = ppg_tlv->length; - if (length > 0) { - max_power = pg->power_max; - min_power = pg->power_min; - length -= sizeof(Power_Group_t); - } - while (length) { - pg++; - if (max_power < pg->power_max) { - max_power = pg->power_max; - } - if (min_power > pg->power_min) { - min_power = pg->power_min; - } - length -= sizeof(Power_Group_t); - } - if (ppg_tlv->length > 0) { - pmpriv->min_tx_power_level = min_power; - pmpriv->max_tx_power_level = max_power; - } - } else { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + t_u16 length = 0; + t_s8 max_power = -1, min_power = -1; + MrvlTypes_Power_Group_t *ppg_tlv = MNULL; + Power_Group_t *pg = MNULL; + + ENTER(); + + if (pdata_buf) { + ppg_tlv = + (MrvlTypes_Power_Group_t *) ((t_u8 *) pdata_buf + + sizeof + (HostCmd_DS_TXPWR_CFG)); + pg = (Power_Group_t *) ((t_u8 *) ppg_tlv + + sizeof(MrvlTypes_Power_Group_t)); + length = ppg_tlv->length; + if (length > 0) { + max_power = pg->power_max; + min_power = pg->power_min; + length -= sizeof(Power_Group_t); + } + while (length) { + pg++; + if (max_power < pg->power_max) { + max_power = pg->power_max; + } + if (min_power > pg->power_min) { + min_power = pg->power_min; + } + length -= sizeof(Power_Group_t); + } + if (ppg_tlv->length > 0) { + pmpriv->min_tx_power_level = min_power; + pmpriv->max_tx_power_level = max_power; + } + } else { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of tx_power_cfg - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -427,111 +440,146 @@ wlan_get_power_level(pmlan_private pmpriv, void *pdata_buf) */ static mlan_status wlan_ret_tx_power_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_TXPWR_CFG *ptxp_cfg = &resp->params.txp_cfg; - MrvlTypes_Power_Group_t *ppg_tlv = MNULL; - Power_Group_t *pg = MNULL; - t_u16 action = wlan_le16_to_cpu(ptxp_cfg->action); - mlan_ds_power_cfg *power = MNULL; - mlan_power_group *pwr_grp = MNULL; - t_u8 i = 0; - - ENTER(); - - ppg_tlv = (MrvlTypes_Power_Group_t *) ((t_u8 *) ptxp_cfg - + sizeof(HostCmd_DS_TXPWR_CFG)); - pg = (Power_Group_t *) ((t_u8 *) ppg_tlv + sizeof(MrvlTypes_Power_Group_t)); - - switch (action) { - case HostCmd_ACT_GEN_GET: - ppg_tlv->length = wlan_le16_to_cpu(ppg_tlv->length); - if (pmpriv->adapter->hw_status == WlanHardwareStatusInitializing) - wlan_get_power_level(pmpriv, ptxp_cfg); - pmpriv->tx_power_level = (t_s16) pg->power_min; - break; - - case HostCmd_ACT_GEN_SET: - if (wlan_le32_to_cpu(ptxp_cfg->mode)) { - if (pg->power_max == pg->power_min) - pmpriv->tx_power_level = (t_s16) pg->power_min; - } - break; - - default: - PRINTM(MERROR, "CMD_RESP: unknown command action %d\n", action); - LEAVE(); - return MLAN_STATUS_SUCCESS; - } - - PRINTM(MINFO, "Current TxPower Level = %d,Max Power=%d, Min Power=%d\n", - pmpriv->tx_power_level, - pmpriv->max_tx_power_level, pmpriv->min_tx_power_level); - - if (pioctl_buf) { - power = (mlan_ds_power_cfg *) pioctl_buf->pbuf; - if (action == HostCmd_ACT_GEN_GET) { - if (power->sub_command == MLAN_OID_POWER_CFG) { - pioctl_buf->data_read_written - = sizeof(mlan_power_cfg_t) + MLAN_SUB_COMMAND_SIZE; - power->param.power_cfg.power_level = pmpriv->tx_power_level; - if (wlan_le32_to_cpu(ptxp_cfg->mode)) - power->param.power_cfg.is_power_auto = 0; - else - power->param.power_cfg.is_power_auto = 1; - } else { - power->param.power_ext.num_pwr_grp = 0; - i = 0; - while ((ppg_tlv->length) && (i < MAX_POWER_GROUP)) { - pwr_grp = - (mlan_power_group *) & power->param.power_ext. - power_group[i]; - pwr_grp->first_rate_ind = 0; - pwr_grp->last_rate_ind = 0; - if (pg->modulation_class == MOD_CLASS_HR_DSSS) { - pwr_grp->rate_format = MLAN_RATE_FORMAT_LG; - pwr_grp->first_rate_ind = pg->first_rate_code; - pwr_grp->last_rate_ind = pg->last_rate_code; - } else if (pg->modulation_class == MOD_CLASS_OFDM) { - pwr_grp->rate_format = MLAN_RATE_FORMAT_LG; - pwr_grp->first_rate_ind = MLAN_RATE_INDEX_OFDM0 + - pg->first_rate_code; - pwr_grp->last_rate_ind = MLAN_RATE_INDEX_OFDM0 + - pg->last_rate_code; - } else if (pg->modulation_class == MOD_CLASS_HT) { - pwr_grp->rate_format = MLAN_RATE_FORMAT_HT; - pwr_grp->first_rate_ind = pg->first_rate_code; - pwr_grp->last_rate_ind = pg->last_rate_code; - } else if (pg->modulation_class == MOD_CLASS_VHT) { - pwr_grp->rate_format = MLAN_RATE_FORMAT_VHT; - pwr_grp->first_rate_ind = (pg->first_rate_code) & 0xF; - pwr_grp->last_rate_ind = (pg->last_rate_code) & 0xF; - pwr_grp->nss = 1 + (pg->first_rate_code >> 4); - pwr_grp->nss = 1 + (pg->last_rate_code >> 4); - } - pwr_grp->bandwidth = pg->ht_bandwidth; - pwr_grp->power_min = pg->power_min; - pwr_grp->power_max = pg->power_max; - pwr_grp->power_step = pg->power_step; - ppg_tlv->length -= sizeof(Power_Group_t); - pg++; - i++; - } - power->param.power_ext.num_pwr_grp = i; - pioctl_buf->data_read_written - = sizeof(mlan_power_cfg_ext) + MLAN_SUB_COMMAND_SIZE; - } - } - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_TXPWR_CFG *ptxp_cfg = &resp->params.txp_cfg; + MrvlTypes_Power_Group_t *ppg_tlv = MNULL; + Power_Group_t *pg = MNULL; + t_u16 action = wlan_le16_to_cpu(ptxp_cfg->action); + mlan_ds_power_cfg *power = MNULL; + mlan_power_group *pwr_grp = MNULL; + t_u8 i = 0; + + ENTER(); + + ppg_tlv = (MrvlTypes_Power_Group_t *) ((t_u8 *) ptxp_cfg + + sizeof(HostCmd_DS_TXPWR_CFG)); + pg = (Power_Group_t *) ((t_u8 *) ppg_tlv + + sizeof(MrvlTypes_Power_Group_t)); + + switch (action) { + case HostCmd_ACT_GEN_GET: + ppg_tlv->length = wlan_le16_to_cpu(ppg_tlv->length); + if (pmpriv->adapter->hw_status == + WlanHardwareStatusInitializing) + wlan_get_power_level(pmpriv, ptxp_cfg); + pmpriv->tx_power_level = (t_s16) pg->power_min; + break; + + case HostCmd_ACT_GEN_SET: + if (wlan_le32_to_cpu(ptxp_cfg->mode)) { + if (pg->power_max == pg->power_min) + pmpriv->tx_power_level = (t_s16) pg->power_min; + } + break; + + default: + PRINTM(MERROR, "CMD_RESP: unknown command action %d\n", action); + LEAVE(); + return MLAN_STATUS_SUCCESS; + } + + PRINTM(MINFO, "Current TxPower Level = %d,Max Power=%d, Min Power=%d\n", + pmpriv->tx_power_level, + pmpriv->max_tx_power_level, pmpriv->min_tx_power_level); + + if (pioctl_buf) { + power = (mlan_ds_power_cfg *) pioctl_buf->pbuf; + if (action == HostCmd_ACT_GEN_GET) { + if (power->sub_command == MLAN_OID_POWER_CFG) { + pioctl_buf->data_read_written + = + sizeof(mlan_power_cfg_t) + + MLAN_SUB_COMMAND_SIZE; + power->param.power_cfg.power_level = + pmpriv->tx_power_level; + if (wlan_le32_to_cpu(ptxp_cfg->mode)) + power->param.power_cfg.is_power_auto = + 0; + else + power->param.power_cfg.is_power_auto = + 1; + } else { + power->param.power_ext.num_pwr_grp = 0; + i = 0; + while ((ppg_tlv->length) && + (i < MAX_POWER_GROUP)) { + pwr_grp = + (mlan_power_group *) & power-> + param.power_ext.power_group[i]; + pwr_grp->first_rate_ind = 0; + pwr_grp->last_rate_ind = 0; + if (pg->modulation_class == + MOD_CLASS_HR_DSSS) { + pwr_grp->rate_format = + MLAN_RATE_FORMAT_LG; + pwr_grp->first_rate_ind = + pg->first_rate_code; + pwr_grp->last_rate_ind = + pg->last_rate_code; + } else if (pg->modulation_class == + MOD_CLASS_OFDM) { + pwr_grp->rate_format = + MLAN_RATE_FORMAT_LG; + pwr_grp->first_rate_ind = + MLAN_RATE_INDEX_OFDM0 + + pg->first_rate_code; + pwr_grp->last_rate_ind = + MLAN_RATE_INDEX_OFDM0 + + pg->last_rate_code; + } else if (pg->modulation_class == + MOD_CLASS_HT) { + pwr_grp->rate_format = + MLAN_RATE_FORMAT_HT; + pwr_grp->first_rate_ind = + pg->first_rate_code; + pwr_grp->last_rate_ind = + pg->last_rate_code; + } else if (pg->modulation_class == + MOD_CLASS_VHT) { + pwr_grp->rate_format = + MLAN_RATE_FORMAT_VHT; + pwr_grp->first_rate_ind = + (pg-> + first_rate_code) & 0xF; + pwr_grp->last_rate_ind = + (pg-> + last_rate_code) & 0xF; + pwr_grp->nss = + 1 + + (pg-> + first_rate_code >> 4); + pwr_grp->nss = + 1 + + (pg-> + last_rate_code >> 4); + } + pwr_grp->bandwidth = pg->ht_bandwidth; + pwr_grp->power_min = pg->power_min; + pwr_grp->power_max = pg->power_max; + pwr_grp->power_step = pg->power_step; + ppg_tlv->length -= + sizeof(Power_Group_t); + pg++; + i++; + } + power->param.power_ext.num_pwr_grp = i; + pioctl_buf->data_read_written + = + sizeof(mlan_power_cfg_ext) + + MLAN_SUB_COMMAND_SIZE; + } + } + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of rf_tx_power - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -539,41 +587,44 @@ wlan_ret_tx_power_cfg(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_802_11_rf_tx_power(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_802_11_RF_TX_POWER *rtp = &resp->params.txp; - t_u16 action = wlan_le16_to_cpu(rtp->action); - mlan_ds_power_cfg *power = MNULL; - - ENTER(); - - pmpriv->tx_power_level = wlan_le16_to_cpu(rtp->current_level); - - if (action == HostCmd_ACT_GEN_GET) { - pmpriv->max_tx_power_level = rtp->max_power; - pmpriv->min_tx_power_level = rtp->min_power; - if (pioctl_buf) { - power = (mlan_ds_power_cfg *) pioctl_buf->pbuf; - if (power->sub_command == MLAN_OID_POWER_CFG) { - pioctl_buf->data_read_written - = sizeof(mlan_power_cfg_t) + MLAN_SUB_COMMAND_SIZE; - power->param.power_cfg.power_level = pmpriv->tx_power_level; - } - } - } - - PRINTM(MINFO, "Current TxPower Level = %d,Max Power=%d, Min Power=%d\n", - pmpriv->tx_power_level, - pmpriv->max_tx_power_level, pmpriv->min_tx_power_level); - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_RF_TX_POWER *rtp = &resp->params.txp; + t_u16 action = wlan_le16_to_cpu(rtp->action); + mlan_ds_power_cfg *power = MNULL; + + ENTER(); + + pmpriv->tx_power_level = wlan_le16_to_cpu(rtp->current_level); + + if (action == HostCmd_ACT_GEN_GET) { + pmpriv->max_tx_power_level = rtp->max_power; + pmpriv->min_tx_power_level = rtp->min_power; + if (pioctl_buf) { + power = (mlan_ds_power_cfg *) pioctl_buf->pbuf; + if (power->sub_command == MLAN_OID_POWER_CFG) { + pioctl_buf->data_read_written + = + sizeof(mlan_power_cfg_t) + + MLAN_SUB_COMMAND_SIZE; + power->param.power_cfg.power_level = + pmpriv->tx_power_level; + } + } + } + + PRINTM(MINFO, "Current TxPower Level = %d,Max Power=%d, Min Power=%d\n", + pmpriv->tx_power_level, + pmpriv->max_tx_power_level, pmpriv->min_tx_power_level); + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of sleep_period - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -581,40 +632,42 @@ wlan_ret_802_11_rf_tx_power(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_802_11_sleep_period(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_802_11_SLEEP_PERIOD *pcmd_sleep_pd = &resp->params.sleep_pd; - mlan_ds_pm_cfg *pm_cfg = MNULL; - t_u16 sleep_pd = 0; - - ENTER(); - - sleep_pd = wlan_le16_to_cpu(pcmd_sleep_pd->sleep_pd); - if (pioctl_buf) { - pm_cfg = (mlan_ds_pm_cfg *) pioctl_buf->pbuf; - pm_cfg->param.sleep_period = (t_u32) sleep_pd; - pioctl_buf->data_read_written = sizeof(pm_cfg->param.sleep_period) - + MLAN_SUB_COMMAND_SIZE; - } - pmpriv->adapter->sleep_period.period = sleep_pd; - - pmpriv->adapter->pps_uapsd_mode = MFALSE; - if ((pmpriv->adapter->sleep_period.period != 0) && - (pmpriv->adapter->sleep_period.period != SLEEP_PERIOD_RESERVED_FF)) { - pmpriv->adapter->gen_null_pkt = MTRUE; - } else { - pmpriv->adapter->delay_null_pkt = MFALSE; - pmpriv->adapter->gen_null_pkt = MFALSE; - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_SLEEP_PERIOD *pcmd_sleep_pd = &resp->params.sleep_pd; + mlan_ds_pm_cfg *pm_cfg = MNULL; + t_u16 sleep_pd = 0; + + ENTER(); + + sleep_pd = wlan_le16_to_cpu(pcmd_sleep_pd->sleep_pd); + if (pioctl_buf) { + pm_cfg = (mlan_ds_pm_cfg *) pioctl_buf->pbuf; + pm_cfg->param.sleep_period = (t_u32) sleep_pd; + pioctl_buf->data_read_written = + sizeof(pm_cfg->param.sleep_period) + + MLAN_SUB_COMMAND_SIZE; + } + pmpriv->adapter->sleep_period.period = sleep_pd; + + pmpriv->adapter->pps_uapsd_mode = MFALSE; + if ((pmpriv->adapter->sleep_period.period != 0) && + (pmpriv->adapter->sleep_period.period != + SLEEP_PERIOD_RESERVED_FF)) { + pmpriv->adapter->gen_null_pkt = MTRUE; + } else { + pmpriv->adapter->delay_null_pkt = MFALSE; + pmpriv->adapter->gen_null_pkt = MFALSE; + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of sleep_params - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -622,45 +675,46 @@ wlan_ret_802_11_sleep_period(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_802_11_sleep_params(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_802_11_SLEEP_PARAMS *presp_sp = &resp->params.sleep_param; - mlan_ds_pm_cfg *pm_cfg = MNULL; - mlan_ds_sleep_params *psp = MNULL; - sleep_params_t *psleep_params = &pmpriv->adapter->sleep_params; - - ENTER(); - - psleep_params->sp_reserved = wlan_le16_to_cpu(presp_sp->reserved); - psleep_params->sp_error = wlan_le16_to_cpu(presp_sp->error); - psleep_params->sp_offset = wlan_le16_to_cpu(presp_sp->offset); - psleep_params->sp_stable_time = wlan_le16_to_cpu(presp_sp->stable_time); - psleep_params->sp_cal_control = presp_sp->cal_control; - psleep_params->sp_ext_sleep_clk = presp_sp->external_sleep_clk; - - if (pioctl_buf) { - pm_cfg = (mlan_ds_pm_cfg *) pioctl_buf->pbuf; - psp = (mlan_ds_sleep_params *) & pm_cfg->param.sleep_params; - - psp->error = (t_u32) psleep_params->sp_error; - psp->offset = (t_u32) psleep_params->sp_offset; - psp->stable_time = (t_u32) psleep_params->sp_stable_time; - psp->cal_control = (t_u32) psleep_params->sp_cal_control; - psp->ext_sleep_clk = (t_u32) psleep_params->sp_ext_sleep_clk; - psp->reserved = (t_u32) psleep_params->sp_reserved; - - pioctl_buf->data_read_written = sizeof(pm_cfg->param.sleep_params) - + MLAN_SUB_COMMAND_SIZE; - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_SLEEP_PARAMS *presp_sp = &resp->params.sleep_param; + mlan_ds_pm_cfg *pm_cfg = MNULL; + mlan_ds_sleep_params *psp = MNULL; + sleep_params_t *psleep_params = &pmpriv->adapter->sleep_params; + + ENTER(); + + psleep_params->sp_reserved = wlan_le16_to_cpu(presp_sp->reserved); + psleep_params->sp_error = wlan_le16_to_cpu(presp_sp->error); + psleep_params->sp_offset = wlan_le16_to_cpu(presp_sp->offset); + psleep_params->sp_stable_time = wlan_le16_to_cpu(presp_sp->stable_time); + psleep_params->sp_cal_control = presp_sp->cal_control; + psleep_params->sp_ext_sleep_clk = presp_sp->external_sleep_clk; + + if (pioctl_buf) { + pm_cfg = (mlan_ds_pm_cfg *) pioctl_buf->pbuf; + psp = (mlan_ds_sleep_params *) & pm_cfg->param.sleep_params; + + psp->error = (t_u32) psleep_params->sp_error; + psp->offset = (t_u32) psleep_params->sp_offset; + psp->stable_time = (t_u32) psleep_params->sp_stable_time; + psp->cal_control = (t_u32) psleep_params->sp_cal_control; + psp->ext_sleep_clk = (t_u32) psleep_params->sp_ext_sleep_clk; + psp->reserved = (t_u32) psleep_params->sp_reserved; + + pioctl_buf->data_read_written = + sizeof(pm_cfg->param.sleep_params) + + MLAN_SUB_COMMAND_SIZE; + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of mac_address - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -669,32 +723,32 @@ wlan_ret_802_11_sleep_params(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_802_11_mac_address(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_802_11_MAC_ADDRESS *pmac_addr = &resp->params.mac_addr; - mlan_ds_bss *bss = MNULL; - - ENTER(); - - memcpy(pmpriv->adapter, pmpriv->curr_addr, pmac_addr->mac_addr, - MLAN_MAC_ADDR_LENGTH); - - PRINTM(MINFO, "MAC address: " MACSTR "\n", MAC2STR(pmpriv->curr_addr)); - if (pioctl_buf) { - bss = (mlan_ds_bss *) pioctl_buf->pbuf; - memcpy(pmpriv->adapter, &bss->param.mac_addr, pmpriv->curr_addr, - MLAN_MAC_ADDR_LENGTH); - pioctl_buf->data_read_written = - MLAN_MAC_ADDR_LENGTH + MLAN_SUB_COMMAND_SIZE; - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_MAC_ADDRESS *pmac_addr = &resp->params.mac_addr; + mlan_ds_bss *bss = MNULL; + + ENTER(); + + memcpy(pmpriv->adapter, pmpriv->curr_addr, pmac_addr->mac_addr, + MLAN_MAC_ADDR_LENGTH); + + PRINTM(MINFO, "MAC address: " MACSTR "\n", MAC2STR(pmpriv->curr_addr)); + if (pioctl_buf) { + bss = (mlan_ds_bss *) pioctl_buf->pbuf; + memcpy(pmpriv->adapter, &bss->param.mac_addr, pmpriv->curr_addr, + MLAN_MAC_ADDR_LENGTH); + pioctl_buf->data_read_written = + MLAN_MAC_ADDR_LENGTH + MLAN_SUB_COMMAND_SIZE; + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of multicast_address - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -703,16 +757,16 @@ wlan_ret_802_11_mac_address(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_mac_multicast_adr(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - ENTER(); - if (pioctl_buf) { - pioctl_buf->data_read_written = - sizeof(mlan_multicast_list) + MLAN_SUB_COMMAND_SIZE; - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + ENTER(); + if (pioctl_buf) { + pioctl_buf->data_read_written = + sizeof(mlan_multicast_list) + MLAN_SUB_COMMAND_SIZE; + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -726,24 +780,24 @@ wlan_ret_mac_multicast_adr(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_802_11_deauthenticate(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - mlan_adapter *pmadapter = pmpriv->adapter; - ENTER(); + mlan_adapter *pmadapter = pmpriv->adapter; + ENTER(); - pmadapter->dbg.num_cmd_deauth++; + pmadapter->dbg.num_cmd_deauth++; - if (!memcmp(pmadapter, resp->params.deauth.mac_addr, - &pmpriv->curr_bss_params.bss_descriptor.mac_address, - sizeof(resp->params.deauth.mac_addr))) { - wlan_reset_connect_state(pmpriv, MTRUE); + if (!memcmp(pmadapter, resp->params.deauth.mac_addr, + &pmpriv->curr_bss_params.bss_descriptor.mac_address, + sizeof(resp->params.deauth.mac_addr))) { + wlan_reset_connect_state(pmpriv, MTRUE); - } - if (pmpriv->adapter->state_rdh.stage == RDH_STOP_INTFS) - wlan_11h_radar_detected_callback((t_void *) pmpriv); - LEAVE(); - return MLAN_STATUS_SUCCESS; + } + if (pmpriv->adapter->state_rdh.stage == RDH_STOP_INTFS) + wlan_11h_radar_detected_callback((t_void *) pmpriv); + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -757,21 +811,21 @@ wlan_ret_802_11_deauthenticate(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_802_11_ad_hoc_stop(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - ENTER(); + ENTER(); - wlan_reset_connect_state(pmpriv, MTRUE); - if (pmpriv->adapter->state_rdh.stage == RDH_STOP_INTFS) - wlan_11h_radar_detected_callback((t_void *) pmpriv); - LEAVE(); - return MLAN_STATUS_SUCCESS; + wlan_reset_connect_state(pmpriv, MTRUE); + if (pmpriv->adapter->state_rdh.stage == RDH_STOP_INTFS) + wlan_11h_radar_detected_callback((t_void *) pmpriv); + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of key_material - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -780,73 +834,91 @@ wlan_ret_802_11_ad_hoc_stop(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_802_11_key_material(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_802_11_KEY_MATERIAL *pkey = &resp->params.key_material; - mlan_ds_sec_cfg *sec = MNULL; - - ENTER(); - - if (wlan_le16_to_cpu(pkey->action) == HostCmd_ACT_GEN_SET) { - if ((wlan_le16_to_cpu(pkey->key_param_set.key_info) & - KEY_INFO_TKIP_MCAST)) { - PRINTM(MINFO, "key: GTK is set\n"); - pmpriv->wpa_is_gtk_set = MTRUE; - if (pmpriv->port_ctrl_mode == MTRUE) { - /* GTK is set, open the port */ - PRINTM(MINFO, "GTK_SET: Open port for WPA/WPA2 h-supp mode\n"); - pmpriv->port_open = MTRUE; - } - pmpriv->adapter->scan_block = MFALSE; - } - } else { - if (pioctl_buf && - (wlan_le16_to_cpu(pkey->key_param_set.type) == - TLV_TYPE_KEY_MATERIAL)) { - PRINTM(MIOCTL, "key_type_id=%d, key_len=%d, key_info=0x%x\n", - wlan_le16_to_cpu(pkey->key_param_set.key_type_id), - wlan_le16_to_cpu(pkey->key_param_set.key_len), - wlan_le16_to_cpu(pkey->key_param_set.key_info)); - sec = (mlan_ds_sec_cfg *) pioctl_buf->pbuf; + HostCmd_DS_802_11_KEY_MATERIAL *pkey = &resp->params.key_material; + mlan_ds_sec_cfg *sec = MNULL; + + ENTER(); + + if (wlan_le16_to_cpu(pkey->action) == HostCmd_ACT_GEN_SET) { + if ((wlan_le16_to_cpu(pkey->key_param_set.key_info) & + KEY_INFO_TKIP_MCAST)) { + PRINTM(MINFO, "key: GTK is set\n"); + pmpriv->wpa_is_gtk_set = MTRUE; + if (pmpriv->port_ctrl_mode == MTRUE) { + /* GTK is set, open the port */ + PRINTM(MINFO, + "GTK_SET: Open port for WPA/WPA2 h-supp mode\n"); + pmpriv->port_open = MTRUE; + } + pmpriv->adapter->scan_block = MFALSE; + } + } else { + if (pioctl_buf && + (wlan_le16_to_cpu(pkey->key_param_set.type) == + TLV_TYPE_KEY_MATERIAL)) { + PRINTM(MIOCTL, + "key_type_id=%d, key_len=%d, key_info=0x%x\n", + wlan_le16_to_cpu(pkey->key_param_set. + key_type_id), + wlan_le16_to_cpu(pkey->key_param_set.key_len), + wlan_le16_to_cpu(pkey->key_param_set.key_info)); + sec = (mlan_ds_sec_cfg *) pioctl_buf->pbuf; #define WAPI_KEY_SIZE 32 - switch (wlan_le16_to_cpu(pkey->key_param_set.key_type_id)) { - case KEY_TYPE_ID_WEP: - sec->param.encrypt_key.key_index = pkey->key_param_set.key[0]; - sec->param.encrypt_key.key_len = - wlan_le16_to_cpu(pkey->key_param_set.key_len); - memcpy(pmpriv->adapter, sec->param.encrypt_key.key_material, - &pkey->key_param_set.key[2], - sec->param.encrypt_key.key_len); - break; - case KEY_TYPE_ID_TKIP: - sec->param.encrypt_key.key_len = - wlan_le16_to_cpu(pkey->key_param_set.key_len); - memcpy(pmpriv->adapter, sec->param.encrypt_key.key_material, - pkey->key_param_set.key, sec->param.encrypt_key.key_len); - break; - case KEY_TYPE_ID_AES: - case KEY_TYPE_ID_AES_CMAC: - sec->param.encrypt_key.key_len = - wlan_le16_to_cpu(pkey->key_param_set.key_len); - memcpy(pmpriv->adapter, sec->param.encrypt_key.key_material, - pkey->key_param_set.key, sec->param.encrypt_key.key_len); - break; - case KEY_TYPE_ID_WAPI: - sec->param.encrypt_key.is_wapi_key = MTRUE; - sec->param.encrypt_key.key_index = pkey->key_param_set.key[0]; - sec->param.encrypt_key.key_len = WAPI_KEY_SIZE; - memcpy(pmpriv->adapter, sec->param.encrypt_key.key_material, - &pkey->key_param_set.key[2], - sec->param.encrypt_key.key_len); - memcpy(pmpriv->adapter, sec->param.encrypt_key.pn, - &pkey->key_param_set.key[2 + WAPI_KEY_SIZE], PN_SIZE); - break; - } - } - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + switch (wlan_le16_to_cpu + (pkey->key_param_set.key_type_id)) { + case KEY_TYPE_ID_WEP: + sec->param.encrypt_key.key_index = + pkey->key_param_set.key[0]; + sec->param.encrypt_key.key_len = + wlan_le16_to_cpu(pkey->key_param_set. + key_len); + memcpy(pmpriv->adapter, + sec->param.encrypt_key.key_material, + &pkey->key_param_set.key[2], + sec->param.encrypt_key.key_len); + break; + case KEY_TYPE_ID_TKIP: + sec->param.encrypt_key.key_len = + wlan_le16_to_cpu(pkey->key_param_set. + key_len); + memcpy(pmpriv->adapter, + sec->param.encrypt_key.key_material, + pkey->key_param_set.key, + sec->param.encrypt_key.key_len); + break; + case KEY_TYPE_ID_AES: + case KEY_TYPE_ID_AES_CMAC: + sec->param.encrypt_key.key_len = + wlan_le16_to_cpu(pkey->key_param_set. + key_len); + memcpy(pmpriv->adapter, + sec->param.encrypt_key.key_material, + pkey->key_param_set.key, + sec->param.encrypt_key.key_len); + break; + case KEY_TYPE_ID_WAPI: + sec->param.encrypt_key.is_wapi_key = MTRUE; + sec->param.encrypt_key.key_index = + pkey->key_param_set.key[0]; + sec->param.encrypt_key.key_len = WAPI_KEY_SIZE; + memcpy(pmpriv->adapter, + sec->param.encrypt_key.key_material, + &pkey->key_param_set.key[2], + sec->param.encrypt_key.key_len); + memcpy(pmpriv->adapter, + sec->param.encrypt_key.pn, + &pkey->key_param_set.key[2 + + WAPI_KEY_SIZE], + PN_SIZE); + break; + } + } + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -860,113 +932,142 @@ wlan_ret_802_11_key_material(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_802_11_supplicant_pmk(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_802_11_SUPPLICANT_PMK *supplicant_pmk_resp = - &resp->params.esupplicant_psk; - mlan_ds_sec_cfg sec_buf; - mlan_ds_sec_cfg *sec = MNULL; - MrvlIEtypes_PMK_t *ppmk_tlv = MNULL; - MrvlIEtypes_Passphrase_t *passphrase_tlv = MNULL; - MrvlIEtypes_SsIdParamSet_t *pssid_tlv = MNULL; - MrvlIEtypes_Bssid_t *pbssid_tlv = MNULL; - t_u8 *tlv_buf = (t_u8 *) supplicant_pmk_resp->tlv_buffer; - t_u16 action = wlan_le16_to_cpu(supplicant_pmk_resp->action); - int tlv_buf_len = 0; - t_u16 tlv; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - tlv_buf_len = resp->size - (sizeof(HostCmd_DS_802_11_SUPPLICANT_PMK) + - S_DS_GEN - 1); - if (pioctl_buf) { - if (((mlan_ds_bss *) pioctl_buf->pbuf)->sub_command == - MLAN_OID_BSS_FIND_BSS) - sec = &sec_buf; - else - sec = (mlan_ds_sec_cfg *) pioctl_buf->pbuf; - if (action == HostCmd_ACT_GEN_GET) { - while (tlv_buf_len > 0) { - tlv = (*tlv_buf) | (*(tlv_buf + 1) << 8); - if ((tlv != TLV_TYPE_SSID) && (tlv != TLV_TYPE_BSSID) && - (tlv != TLV_TYPE_PASSPHRASE) - && (tlv != TLV_TYPE_PMK)) - break; - switch (tlv) { - case TLV_TYPE_SSID: - pssid_tlv = (MrvlIEtypes_SsIdParamSet_t *) tlv_buf; - pssid_tlv->header.len = - wlan_le16_to_cpu(pssid_tlv->header.len); - memcpy(pmpriv->adapter, sec->param.passphrase.ssid.ssid, - pssid_tlv->ssid, MIN(MLAN_MAX_SSID_LENGTH, - pssid_tlv->header.len)); - sec->param.passphrase.ssid.ssid_len = - MIN(MLAN_MAX_SSID_LENGTH, pssid_tlv->header.len); - tlv_buf += - pssid_tlv->header.len + sizeof(MrvlIEtypesHeader_t); - tlv_buf_len -= - (pssid_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); - break; - case TLV_TYPE_BSSID: - pbssid_tlv = (MrvlIEtypes_Bssid_t *) tlv_buf; - pbssid_tlv->header.len = - wlan_le16_to_cpu(pbssid_tlv->header.len); - memcpy(pmpriv->adapter, &sec->param.passphrase.bssid, - pbssid_tlv->bssid, MLAN_MAC_ADDR_LENGTH); - tlv_buf += - pbssid_tlv->header.len + sizeof(MrvlIEtypesHeader_t); - tlv_buf_len -= - (pbssid_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); - break; - case TLV_TYPE_PASSPHRASE: - passphrase_tlv = (MrvlIEtypes_Passphrase_t *) tlv_buf; - passphrase_tlv->header.len = - wlan_le16_to_cpu(passphrase_tlv->header.len); - sec->param.passphrase.psk_type = MLAN_PSK_PASSPHRASE; - sec->param.passphrase.psk.passphrase.passphrase_len = - passphrase_tlv->header.len; - memcpy(pmpriv->adapter, - sec->param.passphrase.psk.passphrase.passphrase, - passphrase_tlv->passphrase, - MIN(MLAN_MAX_PASSPHRASE_LENGTH, - passphrase_tlv->header.len)); - tlv_buf += - passphrase_tlv->header.len + - sizeof(MrvlIEtypesHeader_t); - tlv_buf_len -= - (passphrase_tlv->header.len + - sizeof(MrvlIEtypesHeader_t)); - break; - case TLV_TYPE_PMK: - ppmk_tlv = (MrvlIEtypes_PMK_t *) tlv_buf; - ppmk_tlv->header.len = - wlan_le16_to_cpu(ppmk_tlv->header.len); - sec->param.passphrase.psk_type = MLAN_PSK_PMK; - memcpy(pmpriv->adapter, sec->param.passphrase.psk.pmk.pmk, - ppmk_tlv->pmk, MIN(MLAN_MAX_KEY_LENGTH, - ppmk_tlv->header.len)); - tlv_buf += - ppmk_tlv->header.len + sizeof(MrvlIEtypesHeader_t); - tlv_buf_len -= - (ppmk_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); - break; - - } - } - if (((mlan_ds_bss *) pioctl_buf->pbuf)->sub_command == - MLAN_OID_BSS_FIND_BSS) { - wlan_set_ewpa_mode(pmpriv, &sec->param.passphrase); - ret = wlan_find_bss(pmpriv, pioctl_buf); - } - } else if (action == HostCmd_ACT_GEN_SET) { - PRINTM(MINFO, "Esupp PMK set: enable ewpa query\n"); - pmpriv->ewpa_query = MTRUE; - } - } - - LEAVE(); - return ret; + HostCmd_DS_802_11_SUPPLICANT_PMK *supplicant_pmk_resp = + &resp->params.esupplicant_psk; + mlan_ds_sec_cfg sec_buf; + mlan_ds_sec_cfg *sec = MNULL; + MrvlIEtypes_PMK_t *ppmk_tlv = MNULL; + MrvlIEtypes_Passphrase_t *passphrase_tlv = MNULL; + MrvlIEtypes_SsIdParamSet_t *pssid_tlv = MNULL; + MrvlIEtypes_Bssid_t *pbssid_tlv = MNULL; + t_u8 *tlv_buf = (t_u8 *) supplicant_pmk_resp->tlv_buffer; + t_u16 action = wlan_le16_to_cpu(supplicant_pmk_resp->action); + int tlv_buf_len = 0; + t_u16 tlv; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + tlv_buf_len = resp->size - (sizeof(HostCmd_DS_802_11_SUPPLICANT_PMK) + + S_DS_GEN - 1); + if (pioctl_buf) { + if (((mlan_ds_bss *) pioctl_buf->pbuf)->sub_command == + MLAN_OID_BSS_FIND_BSS) + sec = &sec_buf; + else + sec = (mlan_ds_sec_cfg *) pioctl_buf->pbuf; + if (action == HostCmd_ACT_GEN_GET) { + while (tlv_buf_len > 0) { + tlv = (*tlv_buf) | (*(tlv_buf + 1) << 8); + if ((tlv != TLV_TYPE_SSID) && + (tlv != TLV_TYPE_BSSID) && + (tlv != TLV_TYPE_PASSPHRASE) + && (tlv != TLV_TYPE_PMK)) + break; + switch (tlv) { + case TLV_TYPE_SSID: + pssid_tlv = + (MrvlIEtypes_SsIdParamSet_t *) + tlv_buf; + pssid_tlv->header.len = + wlan_le16_to_cpu(pssid_tlv-> + header.len); + memcpy(pmpriv->adapter, + sec->param.passphrase.ssid.ssid, + pssid_tlv->ssid, + MIN(MLAN_MAX_SSID_LENGTH, + pssid_tlv->header.len)); + sec->param.passphrase.ssid.ssid_len = + MIN(MLAN_MAX_SSID_LENGTH, + pssid_tlv->header.len); + tlv_buf += + pssid_tlv->header.len + + sizeof(MrvlIEtypesHeader_t); + tlv_buf_len -= + (pssid_tlv->header.len + + sizeof(MrvlIEtypesHeader_t)); + break; + case TLV_TYPE_BSSID: + pbssid_tlv = + (MrvlIEtypes_Bssid_t *) tlv_buf; + pbssid_tlv->header.len = + wlan_le16_to_cpu(pbssid_tlv-> + header.len); + memcpy(pmpriv->adapter, + &sec->param.passphrase.bssid, + pbssid_tlv->bssid, + MLAN_MAC_ADDR_LENGTH); + tlv_buf += + pbssid_tlv->header.len + + sizeof(MrvlIEtypesHeader_t); + tlv_buf_len -= + (pbssid_tlv->header.len + + sizeof(MrvlIEtypesHeader_t)); + break; + case TLV_TYPE_PASSPHRASE: + passphrase_tlv = + (MrvlIEtypes_Passphrase_t *) + tlv_buf; + passphrase_tlv->header.len = + wlan_le16_to_cpu + (passphrase_tlv->header.len); + sec->param.passphrase.psk_type = + MLAN_PSK_PASSPHRASE; + sec->param.passphrase.psk.passphrase. + passphrase_len = + passphrase_tlv->header.len; + memcpy(pmpriv->adapter, + sec->param.passphrase.psk. + passphrase.passphrase, + passphrase_tlv->passphrase, + MIN(MLAN_MAX_PASSPHRASE_LENGTH, + passphrase_tlv->header.len)); + tlv_buf += + passphrase_tlv->header.len + + sizeof(MrvlIEtypesHeader_t); + tlv_buf_len -= + (passphrase_tlv->header.len + + sizeof(MrvlIEtypesHeader_t)); + break; + case TLV_TYPE_PMK: + ppmk_tlv = + (MrvlIEtypes_PMK_t *) tlv_buf; + ppmk_tlv->header.len = + wlan_le16_to_cpu(ppmk_tlv-> + header.len); + sec->param.passphrase.psk_type = + MLAN_PSK_PMK; + memcpy(pmpriv->adapter, + sec->param.passphrase.psk.pmk. + pmk, ppmk_tlv->pmk, + MIN(MLAN_MAX_KEY_LENGTH, + ppmk_tlv->header.len)); + tlv_buf += + ppmk_tlv->header.len + + sizeof(MrvlIEtypesHeader_t); + tlv_buf_len -= + (ppmk_tlv->header.len + + sizeof(MrvlIEtypesHeader_t)); + break; + + } + } + if (((mlan_ds_bss *) pioctl_buf->pbuf)->sub_command == + MLAN_OID_BSS_FIND_BSS) { + wlan_set_ewpa_mode(pmpriv, + &sec->param.passphrase); + ret = wlan_find_bss(pmpriv, pioctl_buf); + } + } else if (action == HostCmd_ACT_GEN_SET) { + PRINTM(MINFO, "Esupp PMK set: enable ewpa query\n"); + pmpriv->ewpa_query = MTRUE; + } + } + + LEAVE(); + return ret; } /** @@ -980,58 +1081,62 @@ wlan_ret_802_11_supplicant_pmk(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_802_11_supplicant_profile(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_802_11_SUPPLICANT_PROFILE *psup_profile = - &resp->params.esupplicant_profile; - MrvlIEtypesHeader_t *head; - MrvlIEtypes_EncrProto_t *encr_proto_tlv = MNULL; - MrvlIEtypes_Cipher_t *pcipher_tlv = MNULL; - mlan_ds_sec_cfg *sec = MNULL; - t_u8 *tlv; - int len; - - ENTER(); - - len = resp->size - S_DS_GEN - sizeof(t_u16); - tlv = psup_profile->tlv_buf; - if (pioctl_buf) { - sec = (mlan_ds_sec_cfg *) pioctl_buf->pbuf; - while (len > 0) { - head = (MrvlIEtypesHeader_t *) tlv; - head->type = wlan_le16_to_cpu(head->type); - head->len = wlan_le16_to_cpu(head->len); - switch (head->type) { - case TLV_TYPE_ENCRYPTION_PROTO: - encr_proto_tlv = (MrvlIEtypes_EncrProto_t *) head; - sec->param.esupp_mode.rsn_mode = - wlan_le16_to_cpu(encr_proto_tlv->rsn_mode); - PRINTM(MINFO, "rsn_mode=0x%x\n", - sec->param.esupp_mode.rsn_mode); - break; - case TLV_TYPE_CIPHER: - pcipher_tlv = (MrvlIEtypes_Cipher_t *) head; - sec->param.esupp_mode.act_paircipher = pcipher_tlv->pair_cipher; - sec->param.esupp_mode.act_groupcipher = - pcipher_tlv->group_cipher; - PRINTM(MINFO, "paircipher=0x%x, groupcipher=0x%x\n", - sec->param.esupp_mode.act_paircipher, - sec->param.esupp_mode.act_groupcipher); - break; - } - len -= (head->len - sizeof(MrvlIEtypesHeader_t)); - tlv = tlv + (head->len + sizeof(MrvlIEtypesHeader_t)); - } - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_SUPPLICANT_PROFILE *psup_profile = + &resp->params.esupplicant_profile; + MrvlIEtypesHeader_t *head; + MrvlIEtypes_EncrProto_t *encr_proto_tlv = MNULL; + MrvlIEtypes_Cipher_t *pcipher_tlv = MNULL; + mlan_ds_sec_cfg *sec = MNULL; + t_u8 *tlv; + int len; + + ENTER(); + + len = resp->size - S_DS_GEN - sizeof(t_u16); + tlv = psup_profile->tlv_buf; + if (pioctl_buf) { + sec = (mlan_ds_sec_cfg *) pioctl_buf->pbuf; + while (len > 0) { + head = (MrvlIEtypesHeader_t *) tlv; + head->type = wlan_le16_to_cpu(head->type); + head->len = wlan_le16_to_cpu(head->len); + switch (head->type) { + case TLV_TYPE_ENCRYPTION_PROTO: + encr_proto_tlv = + (MrvlIEtypes_EncrProto_t *) head; + sec->param.esupp_mode.rsn_mode = + wlan_le16_to_cpu(encr_proto_tlv-> + rsn_mode); + PRINTM(MINFO, "rsn_mode=0x%x\n", + sec->param.esupp_mode.rsn_mode); + break; + case TLV_TYPE_CIPHER: + pcipher_tlv = (MrvlIEtypes_Cipher_t *) head; + sec->param.esupp_mode.act_paircipher = + pcipher_tlv->pair_cipher; + sec->param.esupp_mode.act_groupcipher = + pcipher_tlv->group_cipher; + PRINTM(MINFO, + "paircipher=0x%x, groupcipher=0x%x\n", + sec->param.esupp_mode.act_paircipher, + sec->param.esupp_mode.act_groupcipher); + break; + } + len -= (head->len - sizeof(MrvlIEtypesHeader_t)); + tlv = tlv + (head->len + sizeof(MrvlIEtypesHeader_t)); + } + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of rf_channel - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -1040,25 +1145,26 @@ wlan_ret_802_11_supplicant_profile(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_802_11_rf_channel(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_802_11_RF_CHANNEL *prf_channel = &resp->params.rf_channel; - t_u16 new_channel = wlan_le16_to_cpu(prf_channel->current_channel); - mlan_ds_bss *bss = MNULL; - ENTER(); - if (pmpriv->curr_bss_params.bss_descriptor.channel != new_channel) { - PRINTM(MINFO, "Channel Switch: %d to %d\n", - pmpriv->curr_bss_params.bss_descriptor.channel, new_channel); - /* Update the channel again */ - pmpriv->curr_bss_params.bss_descriptor.channel = new_channel; - } - if (pioctl_buf) { - bss = (mlan_ds_bss *) pioctl_buf->pbuf; - bss->param.bss_chan.channel = new_channel; - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_RF_CHANNEL *prf_channel = &resp->params.rf_channel; + t_u16 new_channel = wlan_le16_to_cpu(prf_channel->current_channel); + mlan_ds_bss *bss = MNULL; + ENTER(); + if (pmpriv->curr_bss_params.bss_descriptor.channel != new_channel) { + PRINTM(MINFO, "Channel Switch: %d to %d\n", + pmpriv->curr_bss_params.bss_descriptor.channel, + new_channel); + /* Update the channel again */ + pmpriv->curr_bss_params.bss_descriptor.channel = new_channel; + } + if (pioctl_buf) { + bss = (mlan_ds_bss *) pioctl_buf->pbuf; + bss->param.bss_chan.channel = new_channel; + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -1071,142 +1177,160 @@ wlan_ret_802_11_rf_channel(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_ibss_coalescing_status(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp) + IN HostCmd_DS_COMMAND * resp) { - HostCmd_DS_802_11_IBSS_STATUS *pibss_coal_resp = - &(resp->params.ibss_coalescing); - t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0, 0, 0, 0, 0, 0 }; - - ENTER(); - - if (wlan_le16_to_cpu(pibss_coal_resp->action) == HostCmd_ACT_GEN_SET) { - LEAVE(); - return MLAN_STATUS_SUCCESS; - } - - PRINTM(MINFO, "New BSSID " MACSTR "\n", MAC2STR(pibss_coal_resp->bssid)); - - /* If rsp has MNULL BSSID, Just return..... No Action */ - if (!memcmp - (pmpriv->adapter, pibss_coal_resp->bssid, zero_mac, - MLAN_MAC_ADDR_LENGTH)) { - PRINTM(MMSG, "New BSSID is MNULL\n"); - LEAVE(); - return MLAN_STATUS_SUCCESS; - } - - /* If BSSID is diff, modify current BSS parameters */ - if (memcmp - (pmpriv->adapter, pmpriv->curr_bss_params.bss_descriptor.mac_address, - pibss_coal_resp->bssid, MLAN_MAC_ADDR_LENGTH)) { - /* BSSID */ - memcpy(pmpriv->adapter, - pmpriv->curr_bss_params.bss_descriptor.mac_address, - pibss_coal_resp->bssid, MLAN_MAC_ADDR_LENGTH); - - /* Beacon Interval and ATIM window */ - pmpriv->curr_bss_params.bss_descriptor.beacon_period - = wlan_le16_to_cpu(pibss_coal_resp->beacon_interval); - pmpriv->curr_bss_params.bss_descriptor.atim_window - = wlan_le16_to_cpu(pibss_coal_resp->atim_window); - - /* ERP Information */ - pmpriv->curr_bss_params.bss_descriptor.erp_flags - = (t_u8) wlan_le16_to_cpu(pibss_coal_resp->use_g_rate_protect); - - pmpriv->adhoc_state = ADHOC_COALESCED; - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_IBSS_STATUS *pibss_coal_resp = + &(resp->params.ibss_coalescing); + t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0, 0, 0, 0, 0, 0 }; + + ENTER(); + + if (wlan_le16_to_cpu(pibss_coal_resp->action) == HostCmd_ACT_GEN_SET) { + LEAVE(); + return MLAN_STATUS_SUCCESS; + } + + PRINTM(MINFO, "New BSSID " MACSTR "\n", + MAC2STR(pibss_coal_resp->bssid)); + + /* If rsp has MNULL BSSID, Just return..... No Action */ + if (!memcmp + (pmpriv->adapter, pibss_coal_resp->bssid, zero_mac, + MLAN_MAC_ADDR_LENGTH)) { + PRINTM(MMSG, "New BSSID is MNULL\n"); + LEAVE(); + return MLAN_STATUS_SUCCESS; + } + + /* If BSSID is diff, modify current BSS parameters */ + if (memcmp + (pmpriv->adapter, + pmpriv->curr_bss_params.bss_descriptor.mac_address, + pibss_coal_resp->bssid, MLAN_MAC_ADDR_LENGTH)) { + /* BSSID */ + memcpy(pmpriv->adapter, + pmpriv->curr_bss_params.bss_descriptor.mac_address, + pibss_coal_resp->bssid, MLAN_MAC_ADDR_LENGTH); + + /* Beacon Interval and ATIM window */ + pmpriv->curr_bss_params.bss_descriptor.beacon_period + = wlan_le16_to_cpu(pibss_coal_resp->beacon_interval); + pmpriv->curr_bss_params.bss_descriptor.atim_window + = wlan_le16_to_cpu(pibss_coal_resp->atim_window); + + /* ERP Information */ + pmpriv->curr_bss_params.bss_descriptor.erp_flags + = + (t_u8) wlan_le16_to_cpu(pibss_coal_resp-> + use_g_rate_protect); + + pmpriv->adhoc_state = ADHOC_COALESCED; + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of MGMT_IE_LIST * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure - * + * * @return MLAN_STATUS_SUCCESS */ static mlan_status wlan_ret_mgmt_ie_list(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - OUT mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + OUT mlan_ioctl_req * pioctl_buf) { - t_u16 resp_len = 0, travel_len = 0; - int i = 0; - mlan_ds_misc_cfg *misc = MNULL; - mlan_ds_misc_custom_ie *cust_ie = MNULL; - custom_ie *cptr; - tlvbuf_max_mgmt_ie *max_mgmt_ie = MNULL; - HostCmd_DS_MGMT_IE_LIST_CFG *pmgmt_ie_list = &(resp->params.mgmt_ie_list); - - ENTER(); - - if (wlan_le16_to_cpu(pmgmt_ie_list->action) == HostCmd_ACT_GEN_SET) { - if ((pmpriv->adapter->state_rdh.stage == RDH_SET_CUSTOM_IE) || - (pmpriv->adapter->state_rdh.stage == RDH_REM_CUSTOM_IE)) - wlan_11h_radar_detected_callback((t_void *) pmpriv); - LEAVE(); - return MLAN_STATUS_SUCCESS; - } - - misc = (mlan_ds_misc_cfg *) pioctl_buf->pbuf; - cust_ie = (mlan_ds_misc_custom_ie *) & pmgmt_ie_list->ds_mgmt_ie; - max_mgmt_ie = - (tlvbuf_max_mgmt_ie *) ((t_u8 *) cust_ie + cust_ie->len + - sizeof(MrvlIEtypesHeader_t)); - if (cust_ie) { - cust_ie->type = wlan_le16_to_cpu(cust_ie->type); - resp_len = cust_ie->len = wlan_le16_to_cpu(cust_ie->len); - travel_len = 0; - /* conversion for index, mask, len */ - if (resp_len == sizeof(t_u16)) - cust_ie->ie_data_list[0].ie_index = - wlan_cpu_to_le16(cust_ie->ie_data_list[0].ie_index); - - while (resp_len > sizeof(t_u16)) { - cptr = - (custom_ie *) (((t_u8 *) cust_ie->ie_data_list) + travel_len); - cptr->ie_index = wlan_le16_to_cpu(cptr->ie_index); - cptr->mgmt_subtype_mask = wlan_le16_to_cpu(cptr->mgmt_subtype_mask); - cptr->ie_length = wlan_le16_to_cpu(cptr->ie_length); - travel_len += cptr->ie_length + sizeof(custom_ie) - MAX_IE_SIZE; - resp_len -= cptr->ie_length + sizeof(custom_ie) - MAX_IE_SIZE; - } - memcpy(pmpriv->adapter, &misc->param.cust_ie, cust_ie, - (cust_ie->len + sizeof(MrvlIEtypesHeader_t))); - if (max_mgmt_ie) { - max_mgmt_ie->type = wlan_le16_to_cpu(max_mgmt_ie->type); - if (max_mgmt_ie->type == TLV_TYPE_MAX_MGMT_IE) { - max_mgmt_ie->len = wlan_le16_to_cpu(max_mgmt_ie->len); - max_mgmt_ie->count = wlan_le16_to_cpu(max_mgmt_ie->count); - for (i = 0; i < max_mgmt_ie->count; i++) { - max_mgmt_ie->info[i].buf_size = - wlan_le16_to_cpu(max_mgmt_ie->info[i].buf_size); - max_mgmt_ie->info[i].buf_count = - wlan_le16_to_cpu(max_mgmt_ie->info[i].buf_count); - } - /* Append max_mgmt_ie TLV after custom_ie */ - memcpy(pmpriv->adapter, - (t_u8 *) & misc->param.cust_ie + (cust_ie->len + - sizeof - (MrvlIEtypesHeader_t)), - max_mgmt_ie, - max_mgmt_ie->len + sizeof(MrvlIEtypesHeader_t)); - } - } - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + t_u16 resp_len = 0, travel_len = 0; + int i = 0; + mlan_ds_misc_cfg *misc = MNULL; + mlan_ds_misc_custom_ie *cust_ie = MNULL; + custom_ie *cptr; + tlvbuf_max_mgmt_ie *max_mgmt_ie = MNULL; + HostCmd_DS_MGMT_IE_LIST_CFG *pmgmt_ie_list = + &(resp->params.mgmt_ie_list); + + ENTER(); + + if (wlan_le16_to_cpu(pmgmt_ie_list->action) == HostCmd_ACT_GEN_SET) { + if ((pmpriv->adapter->state_rdh.stage == RDH_SET_CUSTOM_IE) || + (pmpriv->adapter->state_rdh.stage == RDH_REM_CUSTOM_IE)) + wlan_11h_radar_detected_callback((t_void *) pmpriv); + LEAVE(); + return MLAN_STATUS_SUCCESS; + } + + misc = (mlan_ds_misc_cfg *) pioctl_buf->pbuf; + cust_ie = (mlan_ds_misc_custom_ie *) & pmgmt_ie_list->ds_mgmt_ie; + max_mgmt_ie = + (tlvbuf_max_mgmt_ie *) ((t_u8 *) cust_ie + cust_ie->len + + sizeof(MrvlIEtypesHeader_t)); + if (cust_ie) { + cust_ie->type = wlan_le16_to_cpu(cust_ie->type); + resp_len = cust_ie->len = wlan_le16_to_cpu(cust_ie->len); + travel_len = 0; + /* conversion for index, mask, len */ + if (resp_len == sizeof(t_u16)) + cust_ie->ie_data_list[0].ie_index = + wlan_cpu_to_le16(cust_ie->ie_data_list[0]. + ie_index); + + while (resp_len > sizeof(t_u16)) { + cptr = (custom_ie *) (((t_u8 *) cust_ie->ie_data_list) + + travel_len); + cptr->ie_index = wlan_le16_to_cpu(cptr->ie_index); + cptr->mgmt_subtype_mask = + wlan_le16_to_cpu(cptr->mgmt_subtype_mask); + cptr->ie_length = wlan_le16_to_cpu(cptr->ie_length); + travel_len += + cptr->ie_length + sizeof(custom_ie) - + MAX_IE_SIZE; + resp_len -= + cptr->ie_length + sizeof(custom_ie) - + MAX_IE_SIZE; + } + memcpy(pmpriv->adapter, &misc->param.cust_ie, cust_ie, + (cust_ie->len + sizeof(MrvlIEtypesHeader_t))); + if (max_mgmt_ie) { + max_mgmt_ie->type = wlan_le16_to_cpu(max_mgmt_ie->type); + if (max_mgmt_ie->type == TLV_TYPE_MAX_MGMT_IE) { + max_mgmt_ie->len = + wlan_le16_to_cpu(max_mgmt_ie->len); + max_mgmt_ie->count = + wlan_le16_to_cpu(max_mgmt_ie->count); + for (i = 0; i < max_mgmt_ie->count; i++) { + max_mgmt_ie->info[i].buf_size = + wlan_le16_to_cpu(max_mgmt_ie-> + info[i]. + buf_size); + max_mgmt_ie->info[i].buf_count = + wlan_le16_to_cpu(max_mgmt_ie-> + info[i]. + buf_count); + } + /* Append max_mgmt_ie TLV after custom_ie */ + memcpy(pmpriv->adapter, + (t_u8 *) & misc->param.cust_ie + + (cust_ie->len + + sizeof(MrvlIEtypesHeader_t)), + max_mgmt_ie, + max_mgmt_ie->len + + sizeof(MrvlIEtypesHeader_t)); + } + } + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of sysclock - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to mlan_ioctl_req structure @@ -1215,35 +1339,36 @@ wlan_ret_mgmt_ie_list(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_sysclock_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - mlan_ds_misc_cfg *mis_ccfg = MNULL; - HostCmd_DS_ECL_SYSTEM_CLOCK_CONFIG *clk_cfg = &resp->params.sys_clock_cfg; - int i = 0; - - ENTER(); - - if (pioctl_buf) { - mis_ccfg = (mlan_ds_misc_cfg *) pioctl_buf->pbuf; - mis_ccfg->param.sys_clock.cur_sys_clk = - wlan_le16_to_cpu(clk_cfg->cur_sys_clk); - mis_ccfg->param.sys_clock.sys_clk_type = - wlan_le16_to_cpu(clk_cfg->sys_clk_type); - mis_ccfg->param.sys_clock.sys_clk_num = - wlan_le16_to_cpu(clk_cfg->sys_clk_len) / sizeof(t_u16); - for (i = 0; i < mis_ccfg->param.sys_clock.sys_clk_num; i++) - mis_ccfg->param.sys_clock.sys_clk[i] = - wlan_le16_to_cpu(clk_cfg->sys_clk[i]); - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_misc_cfg *mis_ccfg = MNULL; + HostCmd_DS_ECL_SYSTEM_CLOCK_CONFIG *clk_cfg = + &resp->params.sys_clock_cfg; + int i = 0; + + ENTER(); + + if (pioctl_buf) { + mis_ccfg = (mlan_ds_misc_cfg *) pioctl_buf->pbuf; + mis_ccfg->param.sys_clock.cur_sys_clk = + wlan_le16_to_cpu(clk_cfg->cur_sys_clk); + mis_ccfg->param.sys_clock.sys_clk_type = + wlan_le16_to_cpu(clk_cfg->sys_clk_type); + mis_ccfg->param.sys_clock.sys_clk_num = + wlan_le16_to_cpu(clk_cfg->sys_clk_len) / sizeof(t_u16); + for (i = 0; i < mis_ccfg->param.sys_clock.sys_clk_num; i++) + mis_ccfg->param.sys_clock.sys_clk[i] = + wlan_le16_to_cpu(clk_cfg->sys_clk[i]); + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of inactivity timeout - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to command buffer @@ -1252,35 +1377,38 @@ wlan_ret_sysclock_cfg(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_inactivity_timeout(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - mlan_ds_pm_cfg *pmcfg = MNULL; - mlan_ds_inactivity_to *inac_to = MNULL; - HostCmd_DS_INACTIVITY_TIMEOUT_EXT *cmd_inac_to = - (HostCmd_DS_INACTIVITY_TIMEOUT_EXT *) & resp->params.inactivity_to; - - ENTER(); - - if (pioctl_buf) { - pmcfg = (mlan_ds_pm_cfg *) pioctl_buf->pbuf; - inac_to = &pmcfg->param.inactivity_to; - inac_to->timeout_unit = wlan_le16_to_cpu(cmd_inac_to->timeout_unit); - inac_to->unicast_timeout = - wlan_le16_to_cpu(cmd_inac_to->unicast_timeout); - inac_to->mcast_timeout = wlan_le16_to_cpu(cmd_inac_to->mcast_timeout); - inac_to->ps_entry_timeout = - wlan_le16_to_cpu(cmd_inac_to->ps_entry_timeout); - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_pm_cfg *pmcfg = MNULL; + mlan_ds_inactivity_to *inac_to = MNULL; + HostCmd_DS_INACTIVITY_TIMEOUT_EXT *cmd_inac_to = + (HostCmd_DS_INACTIVITY_TIMEOUT_EXT *) & resp->params. + inactivity_to; + + ENTER(); + + if (pioctl_buf) { + pmcfg = (mlan_ds_pm_cfg *) pioctl_buf->pbuf; + inac_to = &pmcfg->param.inactivity_to; + inac_to->timeout_unit = + wlan_le16_to_cpu(cmd_inac_to->timeout_unit); + inac_to->unicast_timeout = + wlan_le16_to_cpu(cmd_inac_to->unicast_timeout); + inac_to->mcast_timeout = + wlan_le16_to_cpu(cmd_inac_to->mcast_timeout); + inac_to->ps_entry_timeout = + wlan_le16_to_cpu(cmd_inac_to->ps_entry_timeout); + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of * subscribe event - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to command buffer @@ -1289,30 +1417,30 @@ wlan_ret_inactivity_timeout(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_subscribe_event(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_SUBSCRIBE_EVENT *evt = - (HostCmd_DS_SUBSCRIBE_EVENT *) & resp->params.subscribe_event; - mlan_ds_subscribe_evt *sub_evt = MNULL; - mlan_ds_misc_cfg *misc = MNULL; - - ENTER(); - if (pioctl_buf && (pioctl_buf->action == MLAN_ACT_GET)) { - misc = (mlan_ds_misc_cfg *) pioctl_buf->pbuf; - sub_evt = &misc->param.subscribe_event; - sub_evt->evt_bitmap = wlan_le16_to_cpu(evt->event_bitmap); - pioctl_buf->data_read_written = sizeof(mlan_ds_misc_cfg); - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_SUBSCRIBE_EVENT *evt = + (HostCmd_DS_SUBSCRIBE_EVENT *) & resp->params.subscribe_event; + mlan_ds_subscribe_evt *sub_evt = MNULL; + mlan_ds_misc_cfg *misc = MNULL; + + ENTER(); + if (pioctl_buf && (pioctl_buf->action == MLAN_ACT_GET)) { + misc = (mlan_ds_misc_cfg *) pioctl_buf->pbuf; + sub_evt = &misc->param.subscribe_event; + sub_evt->evt_bitmap = wlan_le16_to_cpu(evt->event_bitmap); + pioctl_buf->data_read_written = sizeof(mlan_ds_misc_cfg); + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of * OTP user data - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to command buffer @@ -1321,36 +1449,38 @@ wlan_ret_subscribe_event(IN pmlan_private pmpriv, */ static mlan_status wlan_ret_otp_user_data(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_OTP_USER_DATA *cmd_user_data = - (HostCmd_DS_OTP_USER_DATA *) & resp->params.otp_user_data; - mlan_ds_misc_otp_user_data *user_data = MNULL; - - ENTER(); - if (pioctl_buf && (pioctl_buf->action == MLAN_ACT_GET)) { - user_data = (mlan_ds_misc_otp_user_data *) pioctl_buf->pbuf; - user_data->user_data_length = MIN(MAX_OTP_USER_DATA_LEN, - wlan_le16_to_cpu(cmd_user_data-> - user_data_length)); - memcpy(pmpriv->adapter, user_data->user_data, cmd_user_data->user_data, - user_data->user_data_length); - pioctl_buf->data_read_written = - sizeof(mlan_ds_misc_otp_user_data) + user_data->user_data_length; - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_OTP_USER_DATA *cmd_user_data = + (HostCmd_DS_OTP_USER_DATA *) & resp->params.otp_user_data; + mlan_ds_misc_otp_user_data *user_data = MNULL; + + ENTER(); + if (pioctl_buf && (pioctl_buf->action == MLAN_ACT_GET)) { + user_data = (mlan_ds_misc_otp_user_data *) pioctl_buf->pbuf; + user_data->user_data_length = MIN(MAX_OTP_USER_DATA_LEN, + wlan_le16_to_cpu + (cmd_user_data-> + user_data_length)); + memcpy(pmpriv->adapter, user_data->user_data, + cmd_user_data->user_data, user_data->user_data_length); + pioctl_buf->data_read_written = + sizeof(mlan_ds_misc_otp_user_data) + + user_data->user_data_length; + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } /******************************************************** Global Functions ********************************************************/ -/** +/** * @brief This function handles the station command response - * + * * @param priv A pointer to mlan_private structure * @param cmdresp_no cmd no * @param pcmd_buf cmdresp buf @@ -1360,268 +1490,270 @@ wlan_ret_otp_user_data(IN pmlan_private pmpriv, */ mlan_status wlan_ops_sta_process_cmdresp(IN t_void * priv, - IN t_u16 cmdresp_no, - IN t_void * pcmd_buf, IN t_void * pioctl) + IN t_u16 cmdresp_no, + IN t_void * pcmd_buf, IN t_void * pioctl) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = (mlan_private *) priv; - HostCmd_DS_COMMAND *resp = (HostCmd_DS_COMMAND *) pcmd_buf; - mlan_ioctl_req *pioctl_buf = (mlan_ioctl_req *) pioctl; - - mlan_adapter *pmadapter = pmpriv->adapter; - - ENTER(); - - /* If the command is not successful, cleanup and return failure */ - if ((resp->result != HostCmd_RESULT_OK) - ) { - wlan_process_cmdresp_error(pmpriv, resp, pioctl_buf); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - /* Command successful, handle response */ - switch (cmdresp_no) { - case HostCmd_CMD_GET_HW_SPEC: - ret = wlan_ret_get_hw_spec(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_CFG_DATA: - ret = wlan_ret_cfg_data(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_MAC_CONTROL: - ret = wlan_ret_mac_control(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_MAC_ADDRESS: - ret = wlan_ret_802_11_mac_address(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_MAC_MULTICAST_ADR: - ret = wlan_ret_mac_multicast_adr(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_TX_RATE_CFG: - ret = wlan_ret_tx_rate_cfg(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_SCAN: - ret = wlan_ret_802_11_scan(pmpriv, resp, pioctl_buf); - pioctl_buf = MNULL; - pmadapter->curr_cmd->pioctl_buf = MNULL; - break; - case HostCmd_CMD_802_11_SCAN_EXT: - ret = wlan_ret_802_11_scan_ext(pmpriv, resp, pioctl_buf); - pioctl_buf = MNULL; - pmadapter->curr_cmd->pioctl_buf = MNULL; - break; - case HostCmd_CMD_802_11_BG_SCAN_CONFIG: - ret = wlan_ret_bgscan_config(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_BG_SCAN_QUERY: - ret = wlan_ret_802_11_bgscan_query(pmpriv, resp, pioctl_buf); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_BGSCAN_RESULT, MNULL); - PRINTM(MINFO, "CMD_RESP: BG_SCAN result is ready!\n"); - break; - case HostCmd_CMD_TXPWR_CFG: - ret = wlan_ret_tx_power_cfg(pmpriv, resp, pioctl_buf); - break; - - case HostCmd_CMD_802_11_RF_TX_POWER: - ret = wlan_ret_802_11_rf_tx_power(pmpriv, resp, pioctl_buf); - break; - - case HostCmd_CMD_802_11_PS_MODE_ENH: - ret = wlan_ret_enh_power_mode(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_HS_CFG_ENH: - ret = wlan_ret_802_11_hs_cfg(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_SLEEP_PERIOD: - ret = wlan_ret_802_11_sleep_period(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_SLEEP_PARAMS: - ret = wlan_ret_802_11_sleep_params(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_ASSOCIATE: - ret = wlan_ret_802_11_associate(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_DEAUTHENTICATE: - ret = wlan_ret_802_11_deauthenticate(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_AD_HOC_START: - case HostCmd_CMD_802_11_AD_HOC_JOIN: - ret = wlan_ret_802_11_ad_hoc(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_AD_HOC_STOP: - ret = wlan_ret_802_11_ad_hoc_stop(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_GET_LOG: - ret = wlan_ret_get_log(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_RSSI_INFO: - ret = wlan_ret_802_11_rssi_info(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_SNMP_MIB: - ret = wlan_ret_802_11_snmp_mib(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_RADIO_CONTROL: - ret = wlan_ret_802_11_radio_control(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_TX_RATE_QUERY: - ret = wlan_ret_802_11_tx_rate_query(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_RF_CHANNEL: - ret = wlan_ret_802_11_rf_channel(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_RF_ANTENNA: - ret = wlan_ret_802_11_rf_antenna(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_VERSION_EXT: - ret = wlan_ret_ver_ext(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_RX_MGMT_IND: - ret = wlan_ret_rx_mgmt_ind(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_FUNC_INIT: - case HostCmd_CMD_FUNC_SHUTDOWN: - break; - case HostCmd_CMD_802_11_KEY_MATERIAL: - ret = wlan_ret_802_11_key_material(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_SUPPLICANT_PMK: - ret = wlan_ret_802_11_supplicant_pmk(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_SUPPLICANT_PROFILE: - ret = wlan_ret_802_11_supplicant_profile(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11D_DOMAIN_INFO: - ret = wlan_ret_802_11d_domain_info(pmpriv, resp); - break; - case HostCmd_CMD_802_11_TPC_ADAPT_REQ: - case HostCmd_CMD_802_11_TPC_INFO: - case HostCmd_CMD_802_11_CHAN_SW_ANN: - case HostCmd_CMD_CHAN_REPORT_REQUEST: - ret = wlan_11h_cmdresp_process(pmpriv, resp); - break; - case HostCmd_CMD_11N_ADDBA_REQ: - ret = wlan_ret_11n_addba_req(pmpriv, resp); - break; - case HostCmd_CMD_11N_DELBA: - ret = wlan_ret_11n_delba(pmpriv, resp); - break; - case HostCmd_CMD_11N_ADDBA_RSP: - ret = wlan_ret_11n_addba_resp(pmpriv, resp); - break; - case HostCmd_CMD_RECONFIGURE_TX_BUFF: - pmadapter->tx_buf_size = - (t_u16) wlan_le16_to_cpu(resp->params.tx_buf.buff_size); - pmadapter->tx_buf_size = - (pmadapter->tx_buf_size / MLAN_SDIO_BLOCK_SIZE) * - MLAN_SDIO_BLOCK_SIZE; - pmadapter->curr_tx_buf_size = pmadapter->tx_buf_size; - pmadapter->mp_end_port = - wlan_le16_to_cpu(resp->params.tx_buf.mp_end_port); - pmadapter->mp_data_port_mask = DATA_PORT_MASK; - - /* hw tx wraps round only after port 31 */ - pmadapter->curr_wr_port = 0; - PRINTM(MCMND, "end port %d, data port mask %x\n", - wlan_le16_to_cpu(resp->params.tx_buf.mp_end_port), - pmadapter->mp_data_port_mask); - PRINTM(MCMND, "max_tx_buf_size=%d, tx_buf_size=%d\n", - pmadapter->max_tx_buf_size, pmadapter->tx_buf_size); - break; - case HostCmd_CMD_AMSDU_AGGR_CTRL: - ret = wlan_ret_amsdu_aggr_ctrl(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_WMM_GET_STATUS: - ret = wlan_ret_wmm_get_status(pmpriv, - resp->params.get_wmm_status. - queue_status_tlv, resp->size - S_DS_GEN); - break; - case HostCmd_CMD_WMM_ADDTS_REQ: - ret = wlan_ret_wmm_addts_req(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_WMM_DELTS_REQ: - ret = wlan_ret_wmm_delts_req(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_WMM_QUEUE_CONFIG: - ret = wlan_ret_wmm_queue_config(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_WMM_QUEUE_STATS: - ret = wlan_ret_wmm_queue_stats(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_WMM_TS_STATUS: - ret = wlan_ret_wmm_ts_status(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_IBSS_COALESCING_STATUS: - ret = wlan_ret_ibss_coalescing_status(pmpriv, resp); - break; - case HostCmd_CMD_MGMT_IE_LIST: - ret = wlan_ret_mgmt_ie_list(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_11N_CFG: - ret = wlan_ret_11n_cfg(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_11AC_CFG: - ret = wlan_ret_11ac_cfg(pmpriv, resp, pioctl_buf); - break; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = (mlan_private *) priv; + HostCmd_DS_COMMAND *resp = (HostCmd_DS_COMMAND *) pcmd_buf; + mlan_ioctl_req *pioctl_buf = (mlan_ioctl_req *) pioctl; + + mlan_adapter *pmadapter = pmpriv->adapter; + + ENTER(); + + /* If the command is not successful, cleanup and return failure */ + if ((resp->result != HostCmd_RESULT_OK) + ) { + wlan_process_cmdresp_error(pmpriv, resp, pioctl_buf); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + /* Command successful, handle response */ + switch (cmdresp_no) { + case HostCmd_CMD_GET_HW_SPEC: + ret = wlan_ret_get_hw_spec(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_CFG_DATA: + ret = wlan_ret_cfg_data(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_MAC_CONTROL: + ret = wlan_ret_mac_control(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_MAC_ADDRESS: + ret = wlan_ret_802_11_mac_address(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_MAC_MULTICAST_ADR: + ret = wlan_ret_mac_multicast_adr(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_TX_RATE_CFG: + ret = wlan_ret_tx_rate_cfg(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_SCAN: + ret = wlan_ret_802_11_scan(pmpriv, resp, pioctl_buf); + pioctl_buf = MNULL; + pmadapter->curr_cmd->pioctl_buf = MNULL; + break; + case HostCmd_CMD_802_11_SCAN_EXT: + ret = wlan_ret_802_11_scan_ext(pmpriv, resp, pioctl_buf); + pioctl_buf = MNULL; + pmadapter->curr_cmd->pioctl_buf = MNULL; + break; + case HostCmd_CMD_802_11_BG_SCAN_CONFIG: + ret = wlan_ret_bgscan_config(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_BG_SCAN_QUERY: + ret = wlan_ret_802_11_bgscan_query(pmpriv, resp, pioctl_buf); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_BGSCAN_RESULT, MNULL); + PRINTM(MINFO, "CMD_RESP: BG_SCAN result is ready!\n"); + break; + case HostCmd_CMD_TXPWR_CFG: + ret = wlan_ret_tx_power_cfg(pmpriv, resp, pioctl_buf); + break; + + case HostCmd_CMD_802_11_RF_TX_POWER: + ret = wlan_ret_802_11_rf_tx_power(pmpriv, resp, pioctl_buf); + break; + + case HostCmd_CMD_802_11_PS_MODE_ENH: + ret = wlan_ret_enh_power_mode(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_HS_CFG_ENH: + ret = wlan_ret_802_11_hs_cfg(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_SLEEP_PERIOD: + ret = wlan_ret_802_11_sleep_period(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_SLEEP_PARAMS: + ret = wlan_ret_802_11_sleep_params(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_ASSOCIATE: + ret = wlan_ret_802_11_associate(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_DEAUTHENTICATE: + ret = wlan_ret_802_11_deauthenticate(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_AD_HOC_START: + case HostCmd_CMD_802_11_AD_HOC_JOIN: + ret = wlan_ret_802_11_ad_hoc(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_AD_HOC_STOP: + ret = wlan_ret_802_11_ad_hoc_stop(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_GET_LOG: + ret = wlan_ret_get_log(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_RSSI_INFO: + ret = wlan_ret_802_11_rssi_info(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_SNMP_MIB: + ret = wlan_ret_802_11_snmp_mib(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_RADIO_CONTROL: + ret = wlan_ret_802_11_radio_control(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_TX_RATE_QUERY: + ret = wlan_ret_802_11_tx_rate_query(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_RF_CHANNEL: + ret = wlan_ret_802_11_rf_channel(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_RF_ANTENNA: + ret = wlan_ret_802_11_rf_antenna(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_VERSION_EXT: + ret = wlan_ret_ver_ext(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_RX_MGMT_IND: + ret = wlan_ret_rx_mgmt_ind(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_FUNC_INIT: + case HostCmd_CMD_FUNC_SHUTDOWN: + break; + case HostCmd_CMD_802_11_KEY_MATERIAL: + ret = wlan_ret_802_11_key_material(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_SUPPLICANT_PMK: + ret = wlan_ret_802_11_supplicant_pmk(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_SUPPLICANT_PROFILE: + ret = wlan_ret_802_11_supplicant_profile(pmpriv, resp, + pioctl_buf); + break; + case HostCmd_CMD_802_11D_DOMAIN_INFO: + ret = wlan_ret_802_11d_domain_info(pmpriv, resp); + break; + case HostCmd_CMD_802_11_TPC_ADAPT_REQ: + case HostCmd_CMD_802_11_TPC_INFO: + case HostCmd_CMD_802_11_CHAN_SW_ANN: + case HostCmd_CMD_CHAN_REPORT_REQUEST: + ret = wlan_11h_cmdresp_process(pmpriv, resp); + break; + case HostCmd_CMD_11N_ADDBA_REQ: + ret = wlan_ret_11n_addba_req(pmpriv, resp); + break; + case HostCmd_CMD_11N_DELBA: + ret = wlan_ret_11n_delba(pmpriv, resp); + break; + case HostCmd_CMD_11N_ADDBA_RSP: + ret = wlan_ret_11n_addba_resp(pmpriv, resp); + break; + case HostCmd_CMD_RECONFIGURE_TX_BUFF: + pmadapter->tx_buf_size = + (t_u16) wlan_le16_to_cpu(resp->params.tx_buf.buff_size); + pmadapter->tx_buf_size = + (pmadapter->tx_buf_size / MLAN_SDIO_BLOCK_SIZE) * + MLAN_SDIO_BLOCK_SIZE; + pmadapter->curr_tx_buf_size = pmadapter->tx_buf_size; + pmadapter->mp_end_port = + wlan_le16_to_cpu(resp->params.tx_buf.mp_end_port); + pmadapter->mp_data_port_mask = DATA_PORT_MASK; + + /* hw tx wraps round only after port 31 */ + pmadapter->curr_wr_port = 0; + PRINTM(MCMND, "end port %d, data port mask %x\n", + wlan_le16_to_cpu(resp->params.tx_buf.mp_end_port), + pmadapter->mp_data_port_mask); + PRINTM(MCMND, "max_tx_buf_size=%d, tx_buf_size=%d\n", + pmadapter->max_tx_buf_size, pmadapter->tx_buf_size); + break; + case HostCmd_CMD_AMSDU_AGGR_CTRL: + ret = wlan_ret_amsdu_aggr_ctrl(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_WMM_GET_STATUS: + ret = wlan_ret_wmm_get_status(pmpriv, + resp->params.get_wmm_status. + queue_status_tlv, + resp->size - S_DS_GEN); + break; + case HostCmd_CMD_WMM_ADDTS_REQ: + ret = wlan_ret_wmm_addts_req(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_WMM_DELTS_REQ: + ret = wlan_ret_wmm_delts_req(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_WMM_QUEUE_CONFIG: + ret = wlan_ret_wmm_queue_config(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_WMM_QUEUE_STATS: + ret = wlan_ret_wmm_queue_stats(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_WMM_TS_STATUS: + ret = wlan_ret_wmm_ts_status(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_IBSS_COALESCING_STATUS: + ret = wlan_ret_ibss_coalescing_status(pmpriv, resp); + break; + case HostCmd_CMD_MGMT_IE_LIST: + ret = wlan_ret_mgmt_ie_list(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_11N_CFG: + ret = wlan_ret_11n_cfg(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_11AC_CFG: + ret = wlan_ret_11ac_cfg(pmpriv, resp, pioctl_buf); + break; #if 0 - case HostCmd_CMD_RECONFIGURE_TX_BUFF: - pmadapter->tx_buf_size = - (t_u16) wlan_le16_to_cpu(resp->params.tx_buf.buff_size); - break; + case HostCmd_CMD_RECONFIGURE_TX_BUFF: + pmadapter->tx_buf_size = + (t_u16) wlan_le16_to_cpu(resp->params.tx_buf.buff_size); + break; #endif - case HostCmd_CMD_TX_BF_CFG: - ret = wlan_ret_tx_bf_cfg(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_ECL_SYSTEM_CLOCK_CONFIG: - ret = wlan_ret_sysclock_cfg(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_MAC_REG_ACCESS: - case HostCmd_CMD_BBP_REG_ACCESS: - case HostCmd_CMD_RF_REG_ACCESS: - case HostCmd_CMD_CAU_REG_ACCESS: - case HostCmd_CMD_802_11_EEPROM_ACCESS: - ret = - wlan_ret_reg_access(pmpriv->adapter, cmdresp_no, resp, pioctl_buf); - break; - case HostCmd_CMD_MEM_ACCESS: - ret = wlan_ret_mem_access(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_INACTIVITY_TIMEOUT_EXT: - ret = wlan_ret_inactivity_timeout(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_SDIO_GPIO_INT_CONFIG: - break; - case HostCmd_CMD_SET_BSS_MODE: - break; - case HostCmd_CMD_MEASUREMENT_REQUEST: - case HostCmd_CMD_MEASUREMENT_REPORT: - ret = wlan_meas_cmdresp_process(pmpriv, resp); - break; + case HostCmd_CMD_TX_BF_CFG: + ret = wlan_ret_tx_bf_cfg(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_ECL_SYSTEM_CLOCK_CONFIG: + ret = wlan_ret_sysclock_cfg(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_MAC_REG_ACCESS: + case HostCmd_CMD_BBP_REG_ACCESS: + case HostCmd_CMD_RF_REG_ACCESS: + case HostCmd_CMD_CAU_REG_ACCESS: + case HostCmd_CMD_802_11_EEPROM_ACCESS: + ret = wlan_ret_reg_access(pmpriv->adapter, cmdresp_no, resp, + pioctl_buf); + break; + case HostCmd_CMD_MEM_ACCESS: + ret = wlan_ret_mem_access(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_INACTIVITY_TIMEOUT_EXT: + ret = wlan_ret_inactivity_timeout(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_SDIO_GPIO_INT_CONFIG: + break; + case HostCmd_CMD_SET_BSS_MODE: + break; + case HostCmd_CMD_MEASUREMENT_REQUEST: + case HostCmd_CMD_MEASUREMENT_REPORT: + ret = wlan_meas_cmdresp_process(pmpriv, resp); + break; #ifdef WIFI_DIRECT_SUPPORT - case HostCmd_CMD_802_11_REMAIN_ON_CHANNEL: - ret = wlan_ret_remain_on_channel(pmpriv, resp, pioctl_buf); - break; - case HOST_CMD_WIFI_DIRECT_MODE_CONFIG: - ret = wlan_ret_wifi_direct_mode(pmpriv, resp, pioctl_buf); - break; + case HostCmd_CMD_802_11_REMAIN_ON_CHANNEL: + ret = wlan_ret_remain_on_channel(pmpriv, resp, pioctl_buf); + break; + case HOST_CMD_WIFI_DIRECT_MODE_CONFIG: + ret = wlan_ret_wifi_direct_mode(pmpriv, resp, pioctl_buf); + break; #endif - case HostCmd_CMD_802_11_SUBSCRIBE_EVENT: - ret = wlan_ret_subscribe_event(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_OTP_READ_USER_DATA: - ret = wlan_ret_otp_user_data(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_HS_WAKEUP_REASON: - ret = wlan_ret_hs_wakeup_reason(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_REJECT_ADDBA_REQ: - ret = wlan_ret_reject_addba_req(pmpriv, resp, pioctl_buf); - break; - - default: - PRINTM(MERROR, "CMD_RESP: Unknown command response %#x\n", - resp->command); - break; - } - - LEAVE(); - return ret; + case HostCmd_CMD_802_11_SUBSCRIBE_EVENT: + ret = wlan_ret_subscribe_event(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_OTP_READ_USER_DATA: + ret = wlan_ret_otp_user_data(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_HS_WAKEUP_REASON: + ret = wlan_ret_hs_wakeup_reason(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_REJECT_ADDBA_REQ: + ret = wlan_ret_reject_addba_req(pmpriv, resp, pioctl_buf); + break; + + default: + PRINTM(MERROR, "CMD_RESP: Unknown command response %#x\n", + resp->command); + break; + } + + LEAVE(); + return ret; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_sta_event.c b/drivers/net/wireless/sd8897/mlan/mlan_sta_event.c index 25eda1102606..75be2eab4984 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_sta_event.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_sta_event.c @@ -2,7 +2,7 @@ * * @brief This file contains MLAN event handling. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -40,33 +40,33 @@ Change log: Local Functions ********************************************************/ -/** +/** * @brief This function handles link lost, deauth and * disassoc events. - * + * * @param pmpriv A pointer to mlan_private structure * @return N/A */ static t_void wlan_handle_disconnect_event(pmlan_private pmpriv) { - ENTER(); + ENTER(); - if (pmpriv->media_connected == MTRUE) { - wlan_reset_connect_state(pmpriv, MTRUE); - } + if (pmpriv->media_connected == MTRUE) { + wlan_reset_connect_state(pmpriv, MTRUE); + } - LEAVE(); + LEAVE(); } /******************************************************** Global Functions ********************************************************/ -/** +/** * @brief This function handles disconnect event, reports disconnect * to upper layer, cleans tx/rx packets, * resets link state etc. - * + * * @param priv A pointer to mlan_private structure * @param drv_disconnect Flag indicating the driver should disconnect * and flush pending packets. @@ -76,103 +76,105 @@ wlan_handle_disconnect_event(pmlan_private pmpriv) t_void wlan_reset_connect_state(pmlan_private priv, t_u8 drv_disconnect) { - mlan_adapter *pmadapter = priv->adapter; - mlan_status ret = MLAN_STATUS_SUCCESS; - state_11d_t enable; - - ENTER(); - - PRINTM(MINFO, "Handles disconnect event.\n"); - - if (drv_disconnect) { - priv->media_connected = MFALSE; - wlan_11h_check_update_radar_det_state(priv); - } - - if (priv->port_ctrl_mode == MTRUE) { - /* Close the port on Disconnect */ - PRINTM(MINFO, "DISC: port_status = CLOSED\n"); - priv->port_open = MFALSE; - } - pmadapter->scan_block = MFALSE; - - /* Reset SNR/NF/RSSI values */ - priv->data_rssi_last = 0; - priv->data_nf_last = 0; - priv->data_rssi_avg = 0; - priv->data_nf_avg = 0; - priv->bcn_rssi_last = 0; - priv->bcn_nf_last = 0; - priv->bcn_rssi_avg = 0; - priv->bcn_nf_avg = 0; - priv->rxpd_rate = 0; - priv->rxpd_rate_info = 0; - priv->max_amsdu = 0; - - priv->sec_info.ewpa_enabled = MFALSE; - priv->sec_info.wpa_enabled = MFALSE; - priv->sec_info.wpa2_enabled = MFALSE; - priv->wpa_ie_len = 0; - - priv->sec_info.wapi_enabled = MFALSE; - priv->wapi_ie_len = 0; - priv->sec_info.wapi_key_on = MFALSE; - - priv->wps.session_enable = MFALSE; - memset(priv->adapter, (t_u8 *) & priv->wps.wps_ie, 0x00, - sizeof(priv->wps.wps_ie)); - - priv->sec_info.encryption_mode = MLAN_ENCRYPTION_MODE_NONE; - - /* Enable auto data rate */ - priv->is_data_rate_auto = MTRUE; - priv->data_rate = 0; - - if (priv->bss_mode == MLAN_BSS_MODE_IBSS) { - priv->adhoc_state = ADHOC_IDLE; - priv->adhoc_is_link_sensed = MFALSE; - priv->intf_state_11h.adhoc_auto_sel_chan = MTRUE; - } - - if (drv_disconnect) { - /* Free Tx and Rx packets, report disconnect to upper layer */ - wlan_clean_txrx(priv); - - /* Need to erase the current SSID and BSSID info */ - memset(pmadapter, - &priv->curr_bss_params, 0x00, sizeof(priv->curr_bss_params)); - } - pmadapter->tx_lock_flag = MFALSE; - pmadapter->pps_uapsd_mode = MFALSE; - pmadapter->delay_null_pkt = MFALSE; - - if ((wlan_11d_is_enabled(priv)) && - (priv->state_11d.user_enable_11d == DISABLE_11D)) { - - priv->state_11d.enable_11d = DISABLE_11D; - enable = DISABLE_11D; - - /* Send cmd to FW to enable/disable 11D function */ - ret = wlan_prepare_cmd(priv, - HostCmd_CMD_802_11_SNMP_MIB, - HostCmd_ACT_GEN_SET, Dot11D_i, MNULL, &enable); - if (ret) - PRINTM(MERROR, "11D: Failed to enable 11D\n"); - } - if (pmadapter->num_cmd_timeout && pmadapter->curr_cmd && - (pmadapter->cmd_timer_is_set == MFALSE)) { - LEAVE(); - return; - } - - wlan_recv_event(priv, MLAN_EVENT_ID_FW_DISCONNECTED, MNULL); - - LEAVE(); + mlan_adapter *pmadapter = priv->adapter; + mlan_status ret = MLAN_STATUS_SUCCESS; + state_11d_t enable; + + ENTER(); + + PRINTM(MINFO, "Handles disconnect event.\n"); + + if (drv_disconnect) { + priv->media_connected = MFALSE; + wlan_11h_check_update_radar_det_state(priv); + } + + if (priv->port_ctrl_mode == MTRUE) { + /* Close the port on Disconnect */ + PRINTM(MINFO, "DISC: port_status = CLOSED\n"); + priv->port_open = MFALSE; + } + pmadapter->scan_block = MFALSE; + + /* Reset SNR/NF/RSSI values */ + priv->data_rssi_last = 0; + priv->data_nf_last = 0; + priv->data_rssi_avg = 0; + priv->data_nf_avg = 0; + priv->bcn_rssi_last = 0; + priv->bcn_nf_last = 0; + priv->bcn_rssi_avg = 0; + priv->bcn_nf_avg = 0; + priv->rxpd_rate = 0; + priv->rxpd_rate_info = 0; + priv->max_amsdu = 0; + + priv->sec_info.ewpa_enabled = MFALSE; + priv->sec_info.wpa_enabled = MFALSE; + priv->sec_info.wpa2_enabled = MFALSE; + priv->wpa_ie_len = 0; + + priv->sec_info.wapi_enabled = MFALSE; + priv->wapi_ie_len = 0; + priv->sec_info.wapi_key_on = MFALSE; + + priv->wps.session_enable = MFALSE; + memset(priv->adapter, (t_u8 *) & priv->wps.wps_ie, 0x00, + sizeof(priv->wps.wps_ie)); + + priv->sec_info.encryption_mode = MLAN_ENCRYPTION_MODE_NONE; + + /* Enable auto data rate */ + priv->is_data_rate_auto = MTRUE; + priv->data_rate = 0; + + if (priv->bss_mode == MLAN_BSS_MODE_IBSS) { + priv->adhoc_state = ADHOC_IDLE; + priv->adhoc_is_link_sensed = MFALSE; + priv->intf_state_11h.adhoc_auto_sel_chan = MTRUE; + } + + if (drv_disconnect) { + /* Free Tx and Rx packets, report disconnect to upper layer */ + wlan_clean_txrx(priv); + + /* Need to erase the current SSID and BSSID info */ + memset(pmadapter, + &priv->curr_bss_params, 0x00, + sizeof(priv->curr_bss_params)); + } + pmadapter->tx_lock_flag = MFALSE; + pmadapter->pps_uapsd_mode = MFALSE; + pmadapter->delay_null_pkt = MFALSE; + + if ((wlan_11d_is_enabled(priv)) && + (priv->state_11d.user_enable_11d == DISABLE_11D)) { + + priv->state_11d.enable_11d = DISABLE_11D; + enable = DISABLE_11D; + + /* Send cmd to FW to enable/disable 11D function */ + ret = wlan_prepare_cmd(priv, + HostCmd_CMD_802_11_SNMP_MIB, + HostCmd_ACT_GEN_SET, + Dot11D_i, MNULL, &enable); + if (ret) + PRINTM(MERROR, "11D: Failed to enable 11D\n"); + } + if (pmadapter->num_cmd_timeout && pmadapter->curr_cmd && + (pmadapter->cmd_timer_is_set == MFALSE)) { + LEAVE(); + return; + } + + wlan_recv_event(priv, MLAN_EVENT_ID_FW_DISCONNECTED, MNULL); + + LEAVE(); } -/** +/** * @brief This function sends the OBSS scan parameters to the application - * + * * @param pmpriv A pointer to mlan_private structure * * @return N/A @@ -180,34 +182,35 @@ wlan_reset_connect_state(pmlan_private priv, t_u8 drv_disconnect) t_void wlan_2040_coex_event(pmlan_private pmpriv) { - t_u8 event_buf[100]; - mlan_event *pevent = (mlan_event *) event_buf; - t_u8 ele_len; - - ENTER(); - - if (pmpriv->curr_bss_params.bss_descriptor.poverlap_bss_scan_param && - pmpriv->curr_bss_params.bss_descriptor.poverlap_bss_scan_param-> - ieee_hdr.element_id == OVERLAPBSSSCANPARAM) { - ele_len = - pmpriv->curr_bss_params.bss_descriptor.poverlap_bss_scan_param-> - ieee_hdr.len; - pevent->bss_index = pmpriv->bss_index; - pevent->event_id = MLAN_EVENT_ID_DRV_OBSS_SCAN_PARAM; - /* Copy OBSS scan parameters */ - memcpy(pmpriv->adapter, (t_u8 *) pevent->event_buf, - (t_u8 *) & pmpriv->curr_bss_params.bss_descriptor. - poverlap_bss_scan_param->obss_scan_param, ele_len); - pevent->event_len = ele_len; - wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_OBSS_SCAN_PARAM, pevent); - } - - LEAVE(); + t_u8 event_buf[100]; + mlan_event *pevent = (mlan_event *) event_buf; + t_u8 ele_len; + + ENTER(); + + if (pmpriv->curr_bss_params.bss_descriptor.poverlap_bss_scan_param && + pmpriv->curr_bss_params.bss_descriptor.poverlap_bss_scan_param-> + ieee_hdr.element_id == OVERLAPBSSSCANPARAM) { + ele_len = + pmpriv->curr_bss_params.bss_descriptor. + poverlap_bss_scan_param->ieee_hdr.len; + pevent->bss_index = pmpriv->bss_index; + pevent->event_id = MLAN_EVENT_ID_DRV_OBSS_SCAN_PARAM; + /* Copy OBSS scan parameters */ + memcpy(pmpriv->adapter, (t_u8 *) pevent->event_buf, + (t_u8 *) & pmpriv->curr_bss_params.bss_descriptor. + poverlap_bss_scan_param->obss_scan_param, ele_len); + pevent->event_len = ele_len; + wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_OBSS_SCAN_PARAM, + pevent); + } + + LEAVE(); } -/** +/** * @brief This function handles events generated by firmware - * + * * @param priv A pointer to mlan_private structure * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -215,451 +218,477 @@ wlan_2040_coex_event(pmlan_private pmpriv) mlan_status wlan_ops_sta_process_event(IN t_void * priv) { - pmlan_private pmpriv = (pmlan_private) priv; - pmlan_adapter pmadapter = pmpriv->adapter; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u32 eventcause = pmadapter->event_cause; - t_u8 event_buf[100]; - t_u8 *evt_buf = MNULL; - pmlan_buffer pmbuf = pmadapter->pmlan_buffer_event; - t_u16 reason_code; - pmlan_callbacks pcb = &pmadapter->callbacks; - mlan_event *pevent = (mlan_event *) event_buf; - - ENTER(); - - /* Event length check */ - if ((pmbuf->data_len - sizeof(eventcause)) > MAX_EVENT_SIZE) { - pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - if (eventcause != EVENT_PS_SLEEP && eventcause != EVENT_PS_AWAKE && - pmbuf->data_len > sizeof(eventcause)) - DBG_HEXDUMP(MEVT_D, "EVENT", pmbuf->pbuf + pmbuf->data_offset, - pmbuf->data_len); - - switch (eventcause) { - case EVENT_DUMMY_HOST_WAKEUP_SIGNAL: - PRINTM(MERROR, - "Invalid EVENT: DUMMY_HOST_WAKEUP_SIGNAL, ignoring it\n"); - break; - case EVENT_LINK_SENSED: - PRINTM(MEVENT, "EVENT: LINK_SENSED\n"); - pmpriv->adhoc_is_link_sensed = MTRUE; - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_ADHOC_LINK_SENSED, MNULL); - break; - - case EVENT_DEAUTHENTICATED: - reason_code = - *(t_u16 *) (pmbuf->pbuf + pmbuf->data_offset + sizeof(eventcause)); - PRINTM(MMSG, "wlan: EVENT: Deauthenticated (reason 0x%x)\n", - reason_code); - pmadapter->dbg.num_event_deauth++; - wlan_handle_disconnect_event(pmpriv); - - break; - - case EVENT_DISASSOCIATED: - reason_code = - *(t_u16 *) (pmbuf->pbuf + pmbuf->data_offset + sizeof(eventcause)); - PRINTM(MMSG, "wlan: EVENT: Disassociated (reason 0x%x)\n", reason_code); - pmadapter->dbg.num_event_disassoc++; - wlan_handle_disconnect_event(pmpriv); - break; - - case EVENT_LINK_LOST: - reason_code = - *(t_u16 *) (pmbuf->pbuf + pmbuf->data_offset + sizeof(eventcause)); - PRINTM(MMSG, "wlan: EVENT: Link lost (reason 0x%x)\n", reason_code); - pmadapter->dbg.num_event_link_lost++; - wlan_handle_disconnect_event(pmpriv); - break; - - case EVENT_PS_SLEEP: - PRINTM(MINFO, "EVENT: SLEEP\n"); - PRINTM(MEVENT, "_"); - - /* Handle unexpected PS SLEEP event */ - if (pmadapter->ps_state == PS_STATE_SLEEP_CFM) - break; - pmadapter->ps_state = PS_STATE_PRE_SLEEP; - - wlan_check_ps_cond(pmadapter); - break; - - case EVENT_PS_AWAKE: - PRINTM(MINFO, "EVENT: AWAKE \n"); - PRINTM(MEVENT, "|"); - if (!pmadapter->pps_uapsd_mode && - pmpriv->media_connected && - (pmpriv->port_open || !pmpriv->port_ctrl_mode) && - pmadapter->sleep_period.period) { - pmadapter->pps_uapsd_mode = MTRUE; - PRINTM(MEVENT, "PPS/UAPSD mode activated\n"); - } - /* Handle unexpected PS AWAKE event */ - if (pmadapter->ps_state == PS_STATE_SLEEP_CFM) - break; - pmadapter->tx_lock_flag = MFALSE; - if (pmadapter->pps_uapsd_mode && pmadapter->gen_null_pkt) { - if (MTRUE == wlan_check_last_packet_indication(pmpriv)) { - if (!pmadapter->data_sent) { - if (wlan_send_null_packet(pmpriv, - MRVDRV_TxPD_POWER_MGMT_NULL_PACKET - | - MRVDRV_TxPD_POWER_MGMT_LAST_PACKET) - == MLAN_STATUS_SUCCESS) { - LEAVE(); - return MLAN_STATUS_SUCCESS; - } - } - } - } - pmadapter->ps_state = PS_STATE_AWAKE; - pmadapter->pm_wakeup_card_req = MFALSE; - pmadapter->pm_wakeup_fw_try = MFALSE; - break; - - case EVENT_HS_ACT_REQ: - PRINTM(MEVENT, "EVENT: HS_ACT_REQ\n"); - ret = wlan_prepare_cmd(priv, - HostCmd_CMD_802_11_HS_CFG_ENH, - 0, 0, MNULL, MNULL); - break; - - case EVENT_MIC_ERR_UNICAST: - PRINTM(MEVENT, "EVENT: UNICAST MIC ERROR\n"); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_MIC_ERR_UNI, MNULL); - break; - - case EVENT_MIC_ERR_MULTICAST: - PRINTM(MEVENT, "EVENT: MULTICAST MIC ERROR\n"); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_MIC_ERR_MUL, MNULL); - break; - case EVENT_MIB_CHANGED: - case EVENT_INIT_DONE: - break; - - case EVENT_ADHOC_BCN_LOST: - PRINTM(MEVENT, "EVENT: ADHOC_BCN_LOST\n"); - pmpriv->adhoc_is_link_sensed = MFALSE; - wlan_clean_txrx(pmpriv); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_ADHOC_LINK_LOST, MNULL); - break; - - case EVENT_FW_DEBUG_INFO: - /* Allocate memory for event buffer */ - ret = pcb->moal_malloc(pmadapter->pmoal_handle, - MAX_EVENT_SIZE, MLAN_MEM_DEF, &evt_buf); - if ((ret == MLAN_STATUS_SUCCESS) && evt_buf) { - pevent = (pmlan_event) evt_buf; - pevent->bss_index = pmpriv->bss_index; - PRINTM(MEVENT, "EVENT: FW Debug Info\n"); - pevent->event_id = MLAN_EVENT_ID_FW_DEBUG_INFO; - pevent->event_len = pmbuf->data_len - sizeof(eventcause); - memcpy(pmadapter, - (t_u8 *) pevent->event_buf, - pmbuf->pbuf + pmbuf->data_offset + sizeof(eventcause), - pevent->event_len); - wlan_recv_event(pmpriv, pevent->event_id, pevent); - pcb->moal_mfree(pmadapter->pmoal_handle, evt_buf); - } - break; - - case EVENT_BG_SCAN_REPORT: - PRINTM(MEVENT, "EVENT: BGS_REPORT\n"); - pmadapter->bgscan_reported = MTRUE; - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_BG_SCAN, MNULL); - break; - case EVENT_BG_SCAN_STOPPED: - PRINTM(MEVENT, "EVENT: BGS_STOPPED\n"); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_BG_SCAN_STOPPED, MNULL); - break; - - case EVENT_PORT_RELEASE: - PRINTM(MEVENT, "EVENT: PORT RELEASE\n"); - /* Open the port for e-supp mode */ - if (pmpriv->port_ctrl_mode == MTRUE) { - PRINTM(MINFO, "PORT_REL: port_status = OPEN\n"); - pmpriv->port_open = MTRUE; - } - pmadapter->scan_block = MFALSE; - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_PORT_RELEASE, MNULL); - break; - - case EVENT_STOP_TX: - PRINTM(MEVENT, "EVENT: Stop Tx (%#x)\n", eventcause); - wlan_11h_tx_disable(pmpriv); // this fn will send event up to MOAL - break; - case EVENT_START_TX: - PRINTM(MEVENT, "EVENT: Start Tx (%#x)\n", eventcause); - wlan_11h_tx_enable(pmpriv); // this fn will send event up to MOAL - break; - case EVENT_CHANNEL_SWITCH: - PRINTM(MEVENT, "EVENT: Channel Switch (%#x)\n", eventcause); - /* To be handled for 'chanswann' private command */ - break; - case EVENT_CHANNEL_SWITCH_ANN: - PRINTM(MEVENT, "EVENT: Channel Switch Announcement\n"); - /* Here, pass up event first, as handling will send deauth */ - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_CHANNEL_SWITCH_ANN, MNULL); - wlan_11h_handle_event_chanswann(pmpriv); - break; - case EVENT_RADAR_DETECTED: - PRINTM(MEVENT, "EVENT: Radar Detected\n"); - - /* Send as passthru first, this event can cause other events */ - memset(pmadapter, pevent, 0x00, sizeof(event_buf)); - pevent->bss_index = pmpriv->bss_index; - pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; - pevent->event_len = pmbuf->data_len; - memcpy(pmadapter, (t_u8 *) pevent->event_buf, - pmbuf->pbuf + pmbuf->data_offset, pevent->event_len); - wlan_recv_event(pmpriv, pevent->event_id, pevent); - - if (pmadapter->state_rdh.stage == RDH_OFF) { - pmadapter->state_rdh.stage = RDH_CHK_INTFS; - wlan_11h_radar_detected_handling(pmadapter); - } else { - PRINTM(MEVENT, "Ignore Event Radar Detected - handling" - " already in progress.\n"); - } - - break; - - case EVENT_CHANNEL_REPORT_RDY: - PRINTM(MEVENT, "EVENT: Channel Report Ready\n"); - /* Allocate memory for event buffer */ - ret = pcb->moal_malloc(pmadapter->pmoal_handle, - MAX_EVENT_SIZE, MLAN_MEM_DEF, &evt_buf); - if ((ret == MLAN_STATUS_SUCCESS) && evt_buf) { - memset(pmadapter, evt_buf, 0x00, MAX_EVENT_SIZE); - /* Setup event buffer */ - pevent = (pmlan_event) evt_buf; - pevent->bss_index = pmpriv->bss_index; - pevent->event_id = MLAN_EVENT_ID_FW_CHANNEL_REPORT_RDY; - pevent->event_len = pmbuf->data_len - sizeof(eventcause); - /* Copy event data */ - memcpy(pmadapter, (t_u8 *) pevent->event_buf, - pmbuf->pbuf + pmbuf->data_offset + sizeof(eventcause), - pevent->event_len); - /* Handle / pass event data */ - ret = wlan_11h_handle_event_chanrpt_ready(pmpriv, pevent); - - /* Also send this event as passthru */ - pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; - pevent->event_len = pmbuf->data_len; - memcpy(pmadapter, (t_u8 *) pevent->event_buf, - pmbuf->pbuf + pmbuf->data_offset, pevent->event_len); - wlan_recv_event(pmpriv, pevent->event_id, pevent); - /* Now done with buffer */ - pcb->moal_mfree(pmadapter->pmoal_handle, evt_buf); - } - /* Send up this Event to unblock MOAL waitqueue */ - wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_MEAS_REPORT, MNULL); - break; - case EVENT_EXT_SCAN_REPORT: - PRINTM(MEVENT, "EVENT: EXT_SCAN Report (%#x)\n", eventcause); - if (pmadapter->pext_scan_ioctl_req) - ret = wlan_handle_event_ext_scan_report(priv, pmbuf); - break; - case EVENT_MEAS_REPORT_RDY: - PRINTM(MEVENT, "EVENT: Measurement Report Ready (%#x)\n", eventcause); - ret = wlan_prepare_cmd(priv, HostCmd_CMD_MEASUREMENT_REPORT, - HostCmd_ACT_GEN_SET, 0, 0, MNULL); - break; - case EVENT_WMM_STATUS_CHANGE: - if (pmbuf && pmbuf->data_len - > sizeof(eventcause) + sizeof(MrvlIEtypesHeader_t)) { - PRINTM(MEVENT, "EVENT: WMM status changed: %d\n", pmbuf->data_len); - - evt_buf = (pmbuf->pbuf + pmbuf->data_offset + sizeof(eventcause)); - - wlan_ret_wmm_get_status(pmpriv, - evt_buf, - pmbuf->data_len - sizeof(eventcause)); - } else { - PRINTM(MEVENT, "EVENT: WMM status changed\n"); - ret = wlan_cmd_wmm_status_change(pmpriv); - } - break; - - case EVENT_RSSI_LOW: - PRINTM(MEVENT, "EVENT: Beacon RSSI_LOW\n"); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_BCN_RSSI_LOW, MNULL); - break; - case EVENT_SNR_LOW: - PRINTM(MEVENT, "EVENT: Beacon SNR_LOW\n"); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_BCN_SNR_LOW, MNULL); - break; - case EVENT_MAX_FAIL: - PRINTM(MEVENT, "EVENT: MAX_FAIL\n"); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_MAX_FAIL, MNULL); - break; - case EVENT_RSSI_HIGH: - PRINTM(MEVENT, "EVENT: Beacon RSSI_HIGH\n"); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_BCN_RSSI_HIGH, MNULL); - break; - case EVENT_SNR_HIGH: - PRINTM(MEVENT, "EVENT: Beacon SNR_HIGH\n"); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_BCN_SNR_HIGH, MNULL); - break; - case EVENT_DATA_RSSI_LOW: - PRINTM(MEVENT, "EVENT: Data RSSI_LOW\n"); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_DATA_RSSI_LOW, MNULL); - break; - case EVENT_DATA_SNR_LOW: - PRINTM(MEVENT, "EVENT: Data SNR_LOW\n"); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_DATA_SNR_LOW, MNULL); - break; - case EVENT_DATA_RSSI_HIGH: - PRINTM(MEVENT, "EVENT: Data RSSI_HIGH\n"); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_DATA_RSSI_HIGH, MNULL); - break; - case EVENT_DATA_SNR_HIGH: - PRINTM(MEVENT, "EVENT: Data SNR_HIGH\n"); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_DATA_SNR_HIGH, MNULL); - break; - case EVENT_LINK_QUALITY: - PRINTM(MEVENT, "EVENT: Link Quality\n"); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_LINK_QUALITY, MNULL); - break; - case EVENT_PRE_BEACON_LOST: - PRINTM(MEVENT, "EVENT: Pre-Beacon Lost\n"); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_PRE_BCN_LOST, MNULL); - break; - case EVENT_IBSS_COALESCED: - PRINTM(MEVENT, "EVENT: IBSS_COALESCED\n"); - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_IBSS_COALESCING_STATUS, - HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); - break; - case EVENT_ADDBA: - PRINTM(MEVENT, "EVENT: ADDBA Request\n"); - if (pmpriv->media_connected == MTRUE) - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_11N_ADDBA_RSP, - HostCmd_ACT_GEN_SET, 0, MNULL, - pmadapter->event_body); - else - PRINTM(MERROR, - "Ignore ADDBA Request event in disconnected state\n"); - break; - case EVENT_DELBA: - PRINTM(MEVENT, "EVENT: DELBA Request\n"); - if (pmpriv->media_connected == MTRUE) - wlan_11n_delete_bastream(pmpriv, pmadapter->event_body); - else - PRINTM(MERROR, - "Ignore DELBA Request event in disconnected state\n"); - break; - case EVENT_BA_STREAM_TIMEOUT: - PRINTM(MEVENT, "EVENT: BA Stream timeout\n"); - if (pmpriv->media_connected == MTRUE) - wlan_11n_ba_stream_timeout(pmpriv, - (HostCmd_DS_11N_BATIMEOUT *) pmadapter-> - event_body); - else - PRINTM(MERROR, - "Ignore BA Stream timeout event in disconnected state\n"); - break; - case EVENT_RXBA_SYNC: - PRINTM(MEVENT, "EVENT: RXBA_SYNC\n"); - wlan_11n_rxba_sync_event(pmpriv, pmadapter->event_body, - pmbuf->data_len - sizeof(eventcause)); - break; - case EVENT_AMSDU_AGGR_CTRL: - PRINTM(MEVENT, "EVENT: AMSDU_AGGR_CTRL %d\n", - *(t_u16 *) pmadapter->event_body); - pmadapter->tx_buf_size = - MIN(pmadapter->curr_tx_buf_size, - wlan_le16_to_cpu(*(t_u16 *) pmadapter->event_body)); - PRINTM(MEVENT, "tx_buf_size %d\n", pmadapter->tx_buf_size); - break; - - case EVENT_WEP_ICV_ERR: - PRINTM(MEVENT, "EVENT: WEP ICV error\n"); - pevent->bss_index = pmpriv->bss_index; - pevent->event_id = MLAN_EVENT_ID_FW_WEP_ICV_ERR; - pevent->event_len = sizeof(Event_WEP_ICV_ERR); - memcpy(pmadapter, (t_u8 *) pevent->event_buf, pmadapter->event_body, - pevent->event_len); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_WEP_ICV_ERR, pevent); - break; - - case EVENT_BW_CHANGE: - PRINTM(MEVENT, "EVENT: BW Change\n"); - pevent->bss_index = pmpriv->bss_index; - pevent->event_id = MLAN_EVENT_ID_FW_BW_CHANGED; - pevent->event_len = sizeof(t_u8); - /* Copy event body from the event buffer */ - memcpy(pmadapter, (t_u8 *) pevent->event_buf, pmadapter->event_body, - pevent->event_len); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_BW_CHANGED, pevent); - break; + pmlan_private pmpriv = (pmlan_private) priv; + pmlan_adapter pmadapter = pmpriv->adapter; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u32 eventcause = pmadapter->event_cause; + t_u8 event_buf[100]; + t_u8 *evt_buf = MNULL; + pmlan_buffer pmbuf = pmadapter->pmlan_buffer_event; + t_u16 reason_code; + pmlan_callbacks pcb = &pmadapter->callbacks; + mlan_event *pevent = (mlan_event *) event_buf; + + ENTER(); + + /* Event length check */ + if ((pmbuf->data_len - sizeof(eventcause)) > MAX_EVENT_SIZE) { + pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + if (eventcause != EVENT_PS_SLEEP && eventcause != EVENT_PS_AWAKE && + pmbuf->data_len > sizeof(eventcause)) + DBG_HEXDUMP(MEVT_D, "EVENT", pmbuf->pbuf + pmbuf->data_offset, + pmbuf->data_len); + + switch (eventcause) { + case EVENT_DUMMY_HOST_WAKEUP_SIGNAL: + PRINTM(MERROR, + "Invalid EVENT: DUMMY_HOST_WAKEUP_SIGNAL, ignoring it\n"); + break; + case EVENT_LINK_SENSED: + PRINTM(MEVENT, "EVENT: LINK_SENSED\n"); + pmpriv->adhoc_is_link_sensed = MTRUE; + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_ADHOC_LINK_SENSED, + MNULL); + break; + + case EVENT_DEAUTHENTICATED: + reason_code = + *(t_u16 *) (pmbuf->pbuf + pmbuf->data_offset + + sizeof(eventcause)); + PRINTM(MMSG, "wlan: EVENT: Deauthenticated (reason 0x%x)\n", + reason_code); + pmadapter->dbg.num_event_deauth++; + wlan_handle_disconnect_event(pmpriv); + + break; + + case EVENT_DISASSOCIATED: + reason_code = + *(t_u16 *) (pmbuf->pbuf + pmbuf->data_offset + + sizeof(eventcause)); + PRINTM(MMSG, "wlan: EVENT: Disassociated (reason 0x%x)\n", + reason_code); + pmadapter->dbg.num_event_disassoc++; + wlan_handle_disconnect_event(pmpriv); + break; + + case EVENT_LINK_LOST: + reason_code = + *(t_u16 *) (pmbuf->pbuf + pmbuf->data_offset + + sizeof(eventcause)); + PRINTM(MMSG, "wlan: EVENT: Link lost (reason 0x%x)\n", + reason_code); + pmadapter->dbg.num_event_link_lost++; + wlan_handle_disconnect_event(pmpriv); + break; + + case EVENT_PS_SLEEP: + PRINTM(MINFO, "EVENT: SLEEP\n"); + PRINTM(MEVENT, "_"); + + /* Handle unexpected PS SLEEP event */ + if (pmadapter->ps_state == PS_STATE_SLEEP_CFM) + break; + pmadapter->ps_state = PS_STATE_PRE_SLEEP; + + wlan_check_ps_cond(pmadapter); + break; + + case EVENT_PS_AWAKE: + PRINTM(MINFO, "EVENT: AWAKE \n"); + PRINTM(MEVENT, "|"); + if (!pmadapter->pps_uapsd_mode && + pmpriv->media_connected && + (pmpriv->port_open || !pmpriv->port_ctrl_mode) && + pmadapter->sleep_period.period) { + pmadapter->pps_uapsd_mode = MTRUE; + PRINTM(MEVENT, "PPS/UAPSD mode activated\n"); + } + /* Handle unexpected PS AWAKE event */ + if (pmadapter->ps_state == PS_STATE_SLEEP_CFM) + break; + pmadapter->tx_lock_flag = MFALSE; + if (pmadapter->pps_uapsd_mode && pmadapter->gen_null_pkt) { + if (MTRUE == wlan_check_last_packet_indication(pmpriv)) { + if (!pmadapter->data_sent) { + if (wlan_send_null_packet(pmpriv, + MRVDRV_TxPD_POWER_MGMT_NULL_PACKET + | + MRVDRV_TxPD_POWER_MGMT_LAST_PACKET) + == MLAN_STATUS_SUCCESS) { + LEAVE(); + return MLAN_STATUS_SUCCESS; + } + } + } + } + pmadapter->ps_state = PS_STATE_AWAKE; + pmadapter->pm_wakeup_card_req = MFALSE; + pmadapter->pm_wakeup_fw_try = MFALSE; + break; + + case EVENT_HS_ACT_REQ: + PRINTM(MEVENT, "EVENT: HS_ACT_REQ\n"); + ret = wlan_prepare_cmd(priv, + HostCmd_CMD_802_11_HS_CFG_ENH, + 0, 0, MNULL, MNULL); + break; + + case EVENT_MIC_ERR_UNICAST: + PRINTM(MEVENT, "EVENT: UNICAST MIC ERROR\n"); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_MIC_ERR_UNI, MNULL); + break; + + case EVENT_MIC_ERR_MULTICAST: + PRINTM(MEVENT, "EVENT: MULTICAST MIC ERROR\n"); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_MIC_ERR_MUL, MNULL); + break; + case EVENT_MIB_CHANGED: + case EVENT_INIT_DONE: + break; + + case EVENT_ADHOC_BCN_LOST: + PRINTM(MEVENT, "EVENT: ADHOC_BCN_LOST\n"); + pmpriv->adhoc_is_link_sensed = MFALSE; + wlan_clean_txrx(pmpriv); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_ADHOC_LINK_LOST, + MNULL); + break; + + case EVENT_FW_DEBUG_INFO: + /* Allocate memory for event buffer */ + ret = pcb->moal_malloc(pmadapter->pmoal_handle, + MAX_EVENT_SIZE, MLAN_MEM_DEF, &evt_buf); + if ((ret == MLAN_STATUS_SUCCESS) && evt_buf) { + pevent = (pmlan_event) evt_buf; + pevent->bss_index = pmpriv->bss_index; + PRINTM(MEVENT, "EVENT: FW Debug Info\n"); + pevent->event_id = MLAN_EVENT_ID_FW_DEBUG_INFO; + pevent->event_len = + pmbuf->data_len - sizeof(eventcause); + memcpy(pmadapter, (t_u8 *) pevent->event_buf, + pmbuf->pbuf + pmbuf->data_offset + + sizeof(eventcause), pevent->event_len); + wlan_recv_event(pmpriv, pevent->event_id, pevent); + pcb->moal_mfree(pmadapter->pmoal_handle, evt_buf); + } + break; + + case EVENT_BG_SCAN_REPORT: + PRINTM(MEVENT, "EVENT: BGS_REPORT\n"); + pmadapter->bgscan_reported = MTRUE; + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_BG_SCAN, MNULL); + break; + case EVENT_BG_SCAN_STOPPED: + PRINTM(MEVENT, "EVENT: BGS_STOPPED\n"); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_BG_SCAN_STOPPED, + MNULL); + break; + + case EVENT_PORT_RELEASE: + PRINTM(MEVENT, "EVENT: PORT RELEASE\n"); + /* Open the port for e-supp mode */ + if (pmpriv->port_ctrl_mode == MTRUE) { + PRINTM(MINFO, "PORT_REL: port_status = OPEN\n"); + pmpriv->port_open = MTRUE; + } + pmadapter->scan_block = MFALSE; + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_PORT_RELEASE, MNULL); + break; + + case EVENT_STOP_TX: + PRINTM(MEVENT, "EVENT: Stop Tx (%#x)\n", eventcause); + wlan_11h_tx_disable(pmpriv); // this fn will send event up + // to MOAL + break; + case EVENT_START_TX: + PRINTM(MEVENT, "EVENT: Start Tx (%#x)\n", eventcause); + wlan_11h_tx_enable(pmpriv); // this fn will send event up + // to MOAL + break; + case EVENT_CHANNEL_SWITCH: + PRINTM(MEVENT, "EVENT: Channel Switch (%#x)\n", eventcause); + /* To be handled for 'chanswann' private command */ + break; + case EVENT_CHANNEL_SWITCH_ANN: + PRINTM(MEVENT, "EVENT: Channel Switch Announcement\n"); + /* Here, pass up event first, as handling will send deauth */ + wlan_recv_event(pmpriv, + MLAN_EVENT_ID_FW_CHANNEL_SWITCH_ANN, MNULL); + wlan_11h_handle_event_chanswann(pmpriv); + break; + case EVENT_RADAR_DETECTED: + PRINTM(MEVENT, "EVENT: Radar Detected\n"); + + /* Send as passthru first, this event can cause other events */ + memset(pmadapter, pevent, 0x00, sizeof(event_buf)); + pevent->bss_index = pmpriv->bss_index; + pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; + pevent->event_len = pmbuf->data_len; + memcpy(pmadapter, (t_u8 *) pevent->event_buf, + pmbuf->pbuf + pmbuf->data_offset, pevent->event_len); + wlan_recv_event(pmpriv, pevent->event_id, pevent); + + if (pmadapter->state_rdh.stage == RDH_OFF) { + pmadapter->state_rdh.stage = RDH_CHK_INTFS; + wlan_11h_radar_detected_handling(pmadapter); + } else { + PRINTM(MEVENT, "Ignore Event Radar Detected - handling" + " already in progress.\n"); + } + + break; + + case EVENT_CHANNEL_REPORT_RDY: + PRINTM(MEVENT, "EVENT: Channel Report Ready\n"); + /* Allocate memory for event buffer */ + ret = pcb->moal_malloc(pmadapter->pmoal_handle, + MAX_EVENT_SIZE, MLAN_MEM_DEF, &evt_buf); + if ((ret == MLAN_STATUS_SUCCESS) && evt_buf) { + memset(pmadapter, evt_buf, 0x00, MAX_EVENT_SIZE); + /* Setup event buffer */ + pevent = (pmlan_event) evt_buf; + pevent->bss_index = pmpriv->bss_index; + pevent->event_id = MLAN_EVENT_ID_FW_CHANNEL_REPORT_RDY; + pevent->event_len = + pmbuf->data_len - sizeof(eventcause); + /* Copy event data */ + memcpy(pmadapter, (t_u8 *) pevent->event_buf, + pmbuf->pbuf + pmbuf->data_offset + + sizeof(eventcause), pevent->event_len); + /* Handle / pass event data */ + ret = wlan_11h_handle_event_chanrpt_ready(pmpriv, + pevent); + + /* Also send this event as passthru */ + pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; + pevent->event_len = pmbuf->data_len; + memcpy(pmadapter, (t_u8 *) pevent->event_buf, + pmbuf->pbuf + pmbuf->data_offset, + pevent->event_len); + wlan_recv_event(pmpriv, pevent->event_id, pevent); + /* Now done with buffer */ + pcb->moal_mfree(pmadapter->pmoal_handle, evt_buf); + } + /* Send up this Event to unblock MOAL waitqueue */ + wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_MEAS_REPORT, MNULL); + break; + case EVENT_EXT_SCAN_REPORT: + PRINTM(MEVENT, "EVENT: EXT_SCAN Report (%#x)\n", eventcause); + if (pmadapter->pext_scan_ioctl_req) + ret = wlan_handle_event_ext_scan_report(priv, pmbuf); + break; + case EVENT_MEAS_REPORT_RDY: + PRINTM(MEVENT, "EVENT: Measurement Report Ready (%#x)\n", + eventcause); + ret = wlan_prepare_cmd(priv, HostCmd_CMD_MEASUREMENT_REPORT, + HostCmd_ACT_GEN_SET, 0, 0, MNULL); + break; + case EVENT_WMM_STATUS_CHANGE: + if (pmbuf && pmbuf->data_len + > sizeof(eventcause) + sizeof(MrvlIEtypesHeader_t)) { + PRINTM(MEVENT, "EVENT: WMM status changed: %d\n", + pmbuf->data_len); + + evt_buf = (pmbuf->pbuf + + pmbuf->data_offset + sizeof(eventcause)); + + wlan_ret_wmm_get_status(pmpriv, + evt_buf, + pmbuf->data_len - + sizeof(eventcause)); + } else { + PRINTM(MEVENT, "EVENT: WMM status changed\n"); + ret = wlan_cmd_wmm_status_change(pmpriv); + } + break; + + case EVENT_RSSI_LOW: + PRINTM(MEVENT, "EVENT: Beacon RSSI_LOW\n"); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_BCN_RSSI_LOW, MNULL); + break; + case EVENT_SNR_LOW: + PRINTM(MEVENT, "EVENT: Beacon SNR_LOW\n"); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_BCN_SNR_LOW, MNULL); + break; + case EVENT_MAX_FAIL: + PRINTM(MEVENT, "EVENT: MAX_FAIL\n"); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_MAX_FAIL, MNULL); + break; + case EVENT_RSSI_HIGH: + PRINTM(MEVENT, "EVENT: Beacon RSSI_HIGH\n"); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_BCN_RSSI_HIGH, MNULL); + break; + case EVENT_SNR_HIGH: + PRINTM(MEVENT, "EVENT: Beacon SNR_HIGH\n"); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_BCN_SNR_HIGH, MNULL); + break; + case EVENT_DATA_RSSI_LOW: + PRINTM(MEVENT, "EVENT: Data RSSI_LOW\n"); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_DATA_RSSI_LOW, MNULL); + break; + case EVENT_DATA_SNR_LOW: + PRINTM(MEVENT, "EVENT: Data SNR_LOW\n"); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_DATA_SNR_LOW, MNULL); + break; + case EVENT_DATA_RSSI_HIGH: + PRINTM(MEVENT, "EVENT: Data RSSI_HIGH\n"); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_DATA_RSSI_HIGH, MNULL); + break; + case EVENT_DATA_SNR_HIGH: + PRINTM(MEVENT, "EVENT: Data SNR_HIGH\n"); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_DATA_SNR_HIGH, MNULL); + break; + case EVENT_LINK_QUALITY: + PRINTM(MEVENT, "EVENT: Link Quality\n"); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_LINK_QUALITY, MNULL); + break; + case EVENT_PRE_BEACON_LOST: + PRINTM(MEVENT, "EVENT: Pre-Beacon Lost\n"); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_PRE_BCN_LOST, MNULL); + break; + case EVENT_IBSS_COALESCED: + PRINTM(MEVENT, "EVENT: IBSS_COALESCED\n"); + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_IBSS_COALESCING_STATUS, + HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); + break; + case EVENT_ADDBA: + PRINTM(MEVENT, "EVENT: ADDBA Request\n"); + if (pmpriv->media_connected == MTRUE) + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_11N_ADDBA_RSP, + HostCmd_ACT_GEN_SET, 0, MNULL, + pmadapter->event_body); + else + PRINTM(MERROR, + "Ignore ADDBA Request event in disconnected state\n"); + break; + case EVENT_DELBA: + PRINTM(MEVENT, "EVENT: DELBA Request\n"); + if (pmpriv->media_connected == MTRUE) + wlan_11n_delete_bastream(pmpriv, pmadapter->event_body); + else + PRINTM(MERROR, + "Ignore DELBA Request event in disconnected state\n"); + break; + case EVENT_BA_STREAM_TIMEOUT: + PRINTM(MEVENT, "EVENT: BA Stream timeout\n"); + if (pmpriv->media_connected == MTRUE) + wlan_11n_ba_stream_timeout(pmpriv, + (HostCmd_DS_11N_BATIMEOUT *) + pmadapter->event_body); + else + PRINTM(MERROR, + "Ignore BA Stream timeout event in disconnected state\n"); + break; + case EVENT_RXBA_SYNC: + PRINTM(MEVENT, "EVENT: RXBA_SYNC\n"); + wlan_11n_rxba_sync_event(pmpriv, pmadapter->event_body, + pmbuf->data_len - sizeof(eventcause)); + break; + case EVENT_AMSDU_AGGR_CTRL: + PRINTM(MEVENT, "EVENT: AMSDU_AGGR_CTRL %d\n", + *(t_u16 *) pmadapter->event_body); + pmadapter->tx_buf_size = + MIN(pmadapter->curr_tx_buf_size, + wlan_le16_to_cpu(*(t_u16 *) pmadapter->event_body)); + PRINTM(MEVENT, "tx_buf_size %d\n", pmadapter->tx_buf_size); + break; + + case EVENT_WEP_ICV_ERR: + PRINTM(MEVENT, "EVENT: WEP ICV error\n"); + pevent->bss_index = pmpriv->bss_index; + pevent->event_id = MLAN_EVENT_ID_FW_WEP_ICV_ERR; + pevent->event_len = sizeof(Event_WEP_ICV_ERR); + memcpy(pmadapter, (t_u8 *) pevent->event_buf, + pmadapter->event_body, pevent->event_len); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_WEP_ICV_ERR, pevent); + break; + + case EVENT_BW_CHANGE: + PRINTM(MEVENT, "EVENT: BW Change\n"); + pevent->bss_index = pmpriv->bss_index; + pevent->event_id = MLAN_EVENT_ID_FW_BW_CHANGED; + pevent->event_len = sizeof(t_u8); + /* Copy event body from the event buffer */ + memcpy(pmadapter, (t_u8 *) pevent->event_buf, + pmadapter->event_body, pevent->event_len); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_BW_CHANGED, pevent); + break; #ifdef WIFI_DIRECT_SUPPORT - case EVENT_WIFIDIRECT_GENERIC_EVENT: - PRINTM(MEVENT, "EVENT: WIFIDIRECT event %d\n", eventcause); - /* Allocate memory for event buffer */ - ret = - pcb->moal_malloc(pmadapter->pmoal_handle, MAX_EVENT_SIZE, - MLAN_MEM_DEF, &evt_buf); - if ((ret == MLAN_STATUS_SUCCESS) && evt_buf) { - pevent = (pmlan_event) evt_buf; - pevent->bss_index = pmpriv->bss_index; - pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; - pevent->event_len = pmbuf->data_len; - memcpy(pmadapter, (t_u8 *) pevent->event_buf, - pmbuf->pbuf + pmbuf->data_offset, pevent->event_len); - wlan_recv_event(pmpriv, pevent->event_id, pevent); - pcb->moal_mfree(pmadapter->pmoal_handle, evt_buf); - } - break; - case EVENT_WIFIDIRECT_SERVICE_DISCOVERY: - PRINTM(MEVENT, "EVENT: WIFIDIRECT service discovery event %d\n", - eventcause); - /* Allocate large memory for service discovery */ - if (pmbuf->data_len < MAX_EVENT_SIZE) - ret = pcb->moal_malloc(pmadapter->pmoal_handle, MAX_EVENT_SIZE, - MLAN_MEM_DEF, &evt_buf); - else - ret = pcb->moal_malloc(pmadapter->pmoal_handle, MAX_EVENT_SIZE * 2, - MLAN_MEM_DEF, &evt_buf); - if ((ret == MLAN_STATUS_SUCCESS) && evt_buf) { - pevent = (pmlan_event) evt_buf; - pevent->bss_index = pmpriv->bss_index; - pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; - pevent->event_len = pmbuf->data_len; - memcpy(pmadapter, (t_u8 *) pevent->event_buf, - pmbuf->pbuf + pmbuf->data_offset, pevent->event_len); - wlan_recv_event(pmpriv, pevent->event_id, pevent); - pcb->moal_mfree(pmadapter->pmoal_handle, evt_buf); - } - break; - case EVENT_REMAIN_ON_CHANNEL_EXPIRED: - PRINTM(MEVENT, "EVENT: REMAIN_ON_CHANNEL_EXPIRED reason=%d\n", - *(t_u16 *) pmadapter->event_body); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_REMAIN_ON_CHAN_EXPIRED, MNULL); - break; + case EVENT_WIFIDIRECT_GENERIC_EVENT: + PRINTM(MEVENT, "EVENT: WIFIDIRECT event %d\n", eventcause); + /* Allocate memory for event buffer */ + ret = pcb->moal_malloc(pmadapter->pmoal_handle, MAX_EVENT_SIZE, + MLAN_MEM_DEF, &evt_buf); + if ((ret == MLAN_STATUS_SUCCESS) && evt_buf) { + pevent = (pmlan_event) evt_buf; + pevent->bss_index = pmpriv->bss_index; + pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; + pevent->event_len = pmbuf->data_len; + memcpy(pmadapter, (t_u8 *) pevent->event_buf, + pmbuf->pbuf + pmbuf->data_offset, + pevent->event_len); + wlan_recv_event(pmpriv, pevent->event_id, pevent); + pcb->moal_mfree(pmadapter->pmoal_handle, evt_buf); + } + break; + case EVENT_WIFIDIRECT_SERVICE_DISCOVERY: + PRINTM(MEVENT, "EVENT: WIFIDIRECT service discovery event %d\n", + eventcause); + /* Allocate large memory for service discovery */ + if (pmbuf->data_len < MAX_EVENT_SIZE) + ret = pcb->moal_malloc(pmadapter->pmoal_handle, + MAX_EVENT_SIZE, MLAN_MEM_DEF, + &evt_buf); + else + ret = pcb->moal_malloc(pmadapter->pmoal_handle, + MAX_EVENT_SIZE * 2, MLAN_MEM_DEF, + &evt_buf); + if ((ret == MLAN_STATUS_SUCCESS) && evt_buf) { + pevent = (pmlan_event) evt_buf; + pevent->bss_index = pmpriv->bss_index; + pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; + pevent->event_len = pmbuf->data_len; + memcpy(pmadapter, (t_u8 *) pevent->event_buf, + pmbuf->pbuf + pmbuf->data_offset, + pevent->event_len); + wlan_recv_event(pmpriv, pevent->event_id, pevent); + pcb->moal_mfree(pmadapter->pmoal_handle, evt_buf); + } + break; + case EVENT_REMAIN_ON_CHANNEL_EXPIRED: + PRINTM(MEVENT, "EVENT: REMAIN_ON_CHANNEL_EXPIRED reason=%d\n", + *(t_u16 *) pmadapter->event_body); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_REMAIN_ON_CHAN_EXPIRED, + MNULL); + break; #endif /* WIFI_DIRECT_SUPPORT */ - case EVENT_SAD_REPORT: - { - t_u8 *pEvtDat = pmbuf->pbuf + pmbuf->data_offset + sizeof(t_u32); - PRINTM(MEVENT, "EVENT: Antenna Diversity %d (%d, %d, %d, %d)\n", - eventcause, pEvtDat[0] + 1, pEvtDat[1] + 1, pEvtDat[2], - pEvtDat[3]); - } - break; - - default: - PRINTM(MEVENT, "EVENT: unknown event id: %#x\n", eventcause); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_UNKNOWN, MNULL); - break; - } - - LEAVE(); - return ret; + case EVENT_SAD_REPORT: + { + t_u8 *pEvtDat = + pmbuf->pbuf + pmbuf->data_offset + + sizeof(t_u32); + PRINTM(MEVENT, + "EVENT: Antenna Diversity %d (%d, %d, %d, %d)\n", + eventcause, pEvtDat[0] + 1, pEvtDat[1] + 1, + pEvtDat[2], pEvtDat[3]); + } + break; + + default: + PRINTM(MEVENT, "EVENT: unknown event id: %#x\n", eventcause); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_UNKNOWN, MNULL); + break; + } + + LEAVE(); + return ret; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_sta_ioctl.c b/drivers/net/wireless/sd8897/mlan/mlan_sta_ioctl.c index 3e6d3014ab35..19dd212246f1 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_sta_ioctl.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_sta_ioctl.c @@ -1,8 +1,8 @@ /** @file mlan_sta_ioctl.c - * + * * @brief This file contains the functions for station ioctl. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -45,8 +45,8 @@ Change log: /******************************************************** Local Functions ********************************************************/ -/** - * @brief enable adhoc aes key +/** + * @brief enable adhoc aes key * * @param pmpriv A pointer to mlan_private structure * @@ -55,33 +55,33 @@ Change log: static void wlan_enable_aes_key(pmlan_private pmpriv) { - mlan_ds_encrypt_key encrypt_key; - - ENTER(); - - if (pmpriv->aes_key.key_param_set.key_len != WPA_AES_KEY_LEN) { - LEAVE(); - return; - } - - memset(pmpriv->adapter, &encrypt_key, 0, sizeof(mlan_ds_encrypt_key)); - encrypt_key.key_len = WPA_AES_KEY_LEN; - encrypt_key.key_index = MLAN_KEY_INDEX_UNICAST; - memcpy(pmpriv->adapter, encrypt_key.key_material, - pmpriv->aes_key.key_param_set.key, encrypt_key.key_len); - wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_KEY_MATERIAL, - HostCmd_ACT_GEN_SET, KEY_INFO_ENABLED, MNULL, - &encrypt_key); - encrypt_key.key_index &= ~MLAN_KEY_INDEX_UNICAST; - wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_KEY_MATERIAL, - HostCmd_ACT_GEN_SET, - KEY_INFO_ENABLED, MNULL, &encrypt_key); - - LEAVE(); - return; + mlan_ds_encrypt_key encrypt_key; + + ENTER(); + + if (pmpriv->aes_key.key_param_set.key_len != WPA_AES_KEY_LEN) { + LEAVE(); + return; + } + + memset(pmpriv->adapter, &encrypt_key, 0, sizeof(mlan_ds_encrypt_key)); + encrypt_key.key_len = WPA_AES_KEY_LEN; + encrypt_key.key_index = MLAN_KEY_INDEX_UNICAST; + memcpy(pmpriv->adapter, encrypt_key.key_material, + pmpriv->aes_key.key_param_set.key, encrypt_key.key_len); + wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_KEY_MATERIAL, + HostCmd_ACT_GEN_SET, KEY_INFO_ENABLED, MNULL, + &encrypt_key); + encrypt_key.key_index &= ~MLAN_KEY_INDEX_UNICAST; + wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_KEY_MATERIAL, + HostCmd_ACT_GEN_SET, + KEY_INFO_ENABLED, MNULL, &encrypt_key); + + LEAVE(); + return; } -/** +/** * @brief Get signal information * * @param pmadapter A pointer to mlan_adapter structure @@ -92,52 +92,53 @@ wlan_enable_aes_key(pmlan_private pmpriv) static mlan_status wlan_get_info_signal(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - if (pioctl_req != MNULL) { - pmpriv = pmadapter->priv[pioctl_req->bss_index]; - } else { - PRINTM(MERROR, "MLAN IOCTL information is not present\n"); - ret = MLAN_STATUS_FAILURE; - goto exit; - } - - /* Check information buffer length of MLAN IOCTL */ - if (pioctl_req->buf_len < sizeof(mlan_ds_get_signal)) { - PRINTM(MWARN, "MLAN IOCTL information buffer length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_get_signal); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_RESOURCE; - goto exit; - } - - /* Signal info can be obtained only if connected */ - if (pmpriv->media_connected == MFALSE) { - PRINTM(MINFO, "Can not get signal in disconnected state\n"); - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_RSSI_INFO, - HostCmd_ACT_GEN_GET, - 0, (t_void *) pioctl_req, MNULL); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - exit: - LEAVE(); - return ret; + pmlan_private pmpriv = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + if (pioctl_req != MNULL) { + pmpriv = pmadapter->priv[pioctl_req->bss_index]; + } else { + PRINTM(MERROR, "MLAN IOCTL information is not present\n"); + ret = MLAN_STATUS_FAILURE; + goto exit; + } + + /* Check information buffer length of MLAN IOCTL */ + if (pioctl_req->buf_len < sizeof(mlan_ds_get_signal)) { + PRINTM(MWARN, + "MLAN IOCTL information buffer length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_get_signal); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_RESOURCE; + goto exit; + } + + /* Signal info can be obtained only if connected */ + if (pmpriv->media_connected == MFALSE) { + PRINTM(MINFO, "Can not get signal in disconnected state\n"); + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_RSSI_INFO, + HostCmd_ACT_GEN_GET, + 0, (t_void *) pioctl_req, MNULL); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +exit: + LEAVE(); + return ret; } -/** +/** * @brief Get statistics information * * @param pmadapter A pointer to mlan_adapter structure @@ -148,44 +149,45 @@ wlan_get_info_signal(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) static mlan_status wlan_get_info_stats(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - if (pioctl_req != MNULL) { - pmpriv = pmadapter->priv[pioctl_req->bss_index]; - } else { - PRINTM(MERROR, "MLAN IOCTL information is not present\n"); - ret = MLAN_STATUS_FAILURE; - goto exit; - } - - /* Check information buffer length of MLAN IOCTL */ - if (pioctl_req->buf_len < sizeof(mlan_ds_get_stats)) { - PRINTM(MWARN, "MLAN IOCTL information buffer length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_get_stats); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_RESOURCE; - goto exit; - } - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_GET_LOG, - HostCmd_ACT_GEN_GET, - 0, (t_void *) pioctl_req, MNULL); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - exit: - LEAVE(); - return ret; + pmlan_private pmpriv = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + if (pioctl_req != MNULL) { + pmpriv = pmadapter->priv[pioctl_req->bss_index]; + } else { + PRINTM(MERROR, "MLAN IOCTL information is not present\n"); + ret = MLAN_STATUS_FAILURE; + goto exit; + } + + /* Check information buffer length of MLAN IOCTL */ + if (pioctl_req->buf_len < sizeof(mlan_ds_get_stats)) { + PRINTM(MWARN, + "MLAN IOCTL information buffer length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_get_stats); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_RESOURCE; + goto exit; + } + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_GET_LOG, + HostCmd_ACT_GEN_GET, + 0, (t_void *) pioctl_req, MNULL); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +exit: + LEAVE(); + return ret; } -/** +/** * @brief Get BSS information * * @param pmadapter A pointer to mlan_adapter structure @@ -195,110 +197,113 @@ wlan_get_info_stats(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_get_info_bss_info(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_get_info *info; - BSSDescriptor_t *pbss_desc; - t_s32 tbl_idx = 0; - - ENTER(); - - /* Get current BSS info */ - pbss_desc = &pmpriv->curr_bss_params.bss_descriptor; - info = (mlan_ds_get_info *) pioctl_req->pbuf; - - /* BSS mode */ - info->param.bss_info.bss_mode = pmpriv->bss_mode; - - /* SSID */ - memcpy(pmadapter, &info->param.bss_info.ssid, &pbss_desc->ssid, - sizeof(mlan_802_11_ssid)); - - /* BSSID */ - memcpy(pmadapter, &info->param.bss_info.bssid, &pbss_desc->mac_address, - MLAN_MAC_ADDR_LENGTH); - - /* Channel */ - info->param.bss_info.bss_chan = pbss_desc->channel; - - /* Beacon interval */ - info->param.bss_info.beacon_interval = pbss_desc->beacon_period; - - /* Band */ - info->param.bss_info.bss_band = (t_u8) pbss_desc->bss_band; - - /* Region code */ - info->param.bss_info.region_code = pmadapter->region_code; - - /* Scan table index if connected */ - info->param.bss_info.scan_table_idx = 0; - info->param.bss_info.scan_block = pmadapter->scan_block; - if (pmpriv->media_connected == MTRUE) { - tbl_idx = - wlan_find_ssid_in_list(pmpriv, &pbss_desc->ssid, - pbss_desc->mac_address, pmpriv->bss_mode); - if (tbl_idx >= 0) - info->param.bss_info.scan_table_idx = tbl_idx; - } - - /* Connection status */ - info->param.bss_info.media_connected = pmpriv->media_connected; - - /* Radio status */ - info->param.bss_info.radio_on = pmadapter->radio_on; - - /* Tx power information */ - info->param.bss_info.max_power_level = pmpriv->max_tx_power_level; - info->param.bss_info.min_power_level = pmpriv->min_tx_power_level; - - /* AdHoc state */ - info->param.bss_info.adhoc_state = pmpriv->adhoc_state; - - /* Last beacon NF */ - info->param.bss_info.bcn_nf_last = pmpriv->bcn_nf_last; - - /* wep status */ - if (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled) - info->param.bss_info.wep_status = MTRUE; - else - info->param.bss_info.wep_status = MFALSE; - - info->param.bss_info.is_hs_configured = pmadapter->is_hs_configured; - info->param.bss_info.is_deep_sleep = pmadapter->is_deep_sleep; - - /* Capability Info */ - info->param.bss_info.capability_info = 0; - memcpy(pmadapter, &info->param.bss_info.capability_info, - &pbss_desc->cap_info, sizeof(info->param.bss_info.capability_info)); - - /* Listen Interval */ - info->param.bss_info.listen_interval = pmpriv->listen_interval; - - /* Association ID */ - if (pmpriv->assoc_rsp_buf) - info->param.bss_info.assoc_id = - (t_u16) ((IEEEtypes_AssocRsp_t *) pmpriv->assoc_rsp_buf)->a_id; - else - info->param.bss_info.assoc_id = 0; - - /* AP/Peer supported rates */ - memset(pmadapter, info->param.bss_info.peer_supp_rates, 0, - sizeof(info->param.bss_info.peer_supp_rates)); - memcpy(pmadapter, info->param.bss_info.peer_supp_rates, - pbss_desc->supported_rates, - MIN(sizeof(info->param.bss_info.peer_supp_rates), - sizeof(pbss_desc->supported_rates))); - - pioctl_req->data_read_written = - sizeof(mlan_bss_info) + MLAN_SUB_COMMAND_SIZE; - - LEAVE(); - return ret; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_get_info *info; + BSSDescriptor_t *pbss_desc; + t_s32 tbl_idx = 0; + + ENTER(); + + /* Get current BSS info */ + pbss_desc = &pmpriv->curr_bss_params.bss_descriptor; + info = (mlan_ds_get_info *) pioctl_req->pbuf; + + /* BSS mode */ + info->param.bss_info.bss_mode = pmpriv->bss_mode; + + /* SSID */ + memcpy(pmadapter, &info->param.bss_info.ssid, &pbss_desc->ssid, + sizeof(mlan_802_11_ssid)); + + /* BSSID */ + memcpy(pmadapter, &info->param.bss_info.bssid, &pbss_desc->mac_address, + MLAN_MAC_ADDR_LENGTH); + + /* Channel */ + info->param.bss_info.bss_chan = pbss_desc->channel; + + /* Beacon interval */ + info->param.bss_info.beacon_interval = pbss_desc->beacon_period; + + /* Band */ + info->param.bss_info.bss_band = (t_u8) pbss_desc->bss_band; + + /* Region code */ + info->param.bss_info.region_code = pmadapter->region_code; + + /* Scan table index if connected */ + info->param.bss_info.scan_table_idx = 0; + info->param.bss_info.scan_block = pmadapter->scan_block; + if (pmpriv->media_connected == MTRUE) { + tbl_idx = + wlan_find_ssid_in_list(pmpriv, &pbss_desc->ssid, + pbss_desc->mac_address, + pmpriv->bss_mode); + if (tbl_idx >= 0) + info->param.bss_info.scan_table_idx = tbl_idx; + } + + /* Connection status */ + info->param.bss_info.media_connected = pmpriv->media_connected; + + /* Radio status */ + info->param.bss_info.radio_on = pmadapter->radio_on; + + /* Tx power information */ + info->param.bss_info.max_power_level = pmpriv->max_tx_power_level; + info->param.bss_info.min_power_level = pmpriv->min_tx_power_level; + + /* AdHoc state */ + info->param.bss_info.adhoc_state = pmpriv->adhoc_state; + + /* Last beacon NF */ + info->param.bss_info.bcn_nf_last = pmpriv->bcn_nf_last; + + /* wep status */ + if (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled) + info->param.bss_info.wep_status = MTRUE; + else + info->param.bss_info.wep_status = MFALSE; + + info->param.bss_info.is_hs_configured = pmadapter->is_hs_configured; + info->param.bss_info.is_deep_sleep = pmadapter->is_deep_sleep; + + /* Capability Info */ + info->param.bss_info.capability_info = 0; + memcpy(pmadapter, &info->param.bss_info.capability_info, + &pbss_desc->cap_info, + sizeof(info->param.bss_info.capability_info)); + + /* Listen Interval */ + info->param.bss_info.listen_interval = pmpriv->listen_interval; + + /* Association ID */ + if (pmpriv->assoc_rsp_buf) + info->param.bss_info.assoc_id = + (t_u16) ((IEEEtypes_AssocRsp_t *) pmpriv-> + assoc_rsp_buf)->a_id; + else + info->param.bss_info.assoc_id = 0; + + /* AP/Peer supported rates */ + memset(pmadapter, info->param.bss_info.peer_supp_rates, 0, + sizeof(info->param.bss_info.peer_supp_rates)); + memcpy(pmadapter, info->param.bss_info.peer_supp_rates, + pbss_desc->supported_rates, + MIN(sizeof(info->param.bss_info.peer_supp_rates), + sizeof(pbss_desc->supported_rates))); + + pioctl_req->data_read_written = + sizeof(mlan_bss_info) + MLAN_SUB_COMMAND_SIZE; + + LEAVE(); + return ret; } -/** +/** * @brief Get information handler * * @param pmadapter A pointer to mlan_adapter structure @@ -309,52 +314,52 @@ wlan_get_info_bss_info(IN pmlan_adapter pmadapter, static mlan_status wlan_get_info_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_get_info *pget_info = MNULL; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - - ENTER(); - - pget_info = (mlan_ds_get_info *) pioctl_req->pbuf; - - switch (pget_info->sub_command) { - case MLAN_OID_GET_STATS: - status = wlan_get_info_stats(pmadapter, pioctl_req); - break; - case MLAN_OID_GET_SIGNAL: - status = wlan_get_info_signal(pmadapter, pioctl_req); - break; - case MLAN_OID_GET_FW_INFO: - pioctl_req->data_read_written = - sizeof(mlan_fw_info) + MLAN_SUB_COMMAND_SIZE; - pget_info->param.fw_info.fw_ver = pmadapter->fw_release_number; - memcpy(pmadapter, &pget_info->param.fw_info.mac_addr, pmpriv->curr_addr, - MLAN_MAC_ADDR_LENGTH); - pget_info->param.fw_info.fw_bands = pmadapter->fw_bands; - pget_info->param.fw_info.region_code = pmadapter->region_code; - pget_info->param.fw_info.hw_dev_mcs_support = - pmadapter->hw_dev_mcs_support; - break; - case MLAN_OID_GET_BSS_INFO: - status = wlan_get_info_bss_info(pmadapter, pioctl_req); - break; - case MLAN_OID_GET_DEBUG_INFO: - status = wlan_get_info_debug_info(pmadapter, pioctl_req); - break; - case MLAN_OID_GET_VER_EXT: - status = wlan_get_info_ver_ext(pmadapter, pioctl_req); - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - - LEAVE(); - return status; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_get_info *pget_info = MNULL; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + + ENTER(); + + pget_info = (mlan_ds_get_info *) pioctl_req->pbuf; + + switch (pget_info->sub_command) { + case MLAN_OID_GET_STATS: + status = wlan_get_info_stats(pmadapter, pioctl_req); + break; + case MLAN_OID_GET_SIGNAL: + status = wlan_get_info_signal(pmadapter, pioctl_req); + break; + case MLAN_OID_GET_FW_INFO: + pioctl_req->data_read_written = + sizeof(mlan_fw_info) + MLAN_SUB_COMMAND_SIZE; + pget_info->param.fw_info.fw_ver = pmadapter->fw_release_number; + memcpy(pmadapter, &pget_info->param.fw_info.mac_addr, + pmpriv->curr_addr, MLAN_MAC_ADDR_LENGTH); + pget_info->param.fw_info.fw_bands = pmadapter->fw_bands; + pget_info->param.fw_info.region_code = pmadapter->region_code; + pget_info->param.fw_info.hw_dev_mcs_support = + pmadapter->hw_dev_mcs_support; + break; + case MLAN_OID_GET_BSS_INFO: + status = wlan_get_info_bss_info(pmadapter, pioctl_req); + break; + case MLAN_OID_GET_DEBUG_INFO: + status = wlan_get_info_debug_info(pmadapter, pioctl_req); + break; + case MLAN_OID_GET_VER_EXT: + status = wlan_get_info_ver_ext(pmadapter, pioctl_req); + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + + LEAVE(); + return status; } -/** +/** * @brief Set/Get SNMP MIB handler * * @param pmadapter A pointer to mlan_adapter structure @@ -365,63 +370,65 @@ wlan_get_info_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) static mlan_status wlan_snmp_mib_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u16 cmd_action = 0; - t_u16 cmd_oid = 0; - mlan_ds_snmp_mib *mib = MNULL; - t_u32 value = 0; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_snmp_mib)) { - PRINTM(MWARN, "MLAN IOCTL information buffer length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_snmp_mib); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_RESOURCE; - goto exit; - } - - mib = (mlan_ds_snmp_mib *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) - cmd_action = HostCmd_ACT_GEN_SET; - else - cmd_action = HostCmd_ACT_GEN_GET; - - switch (mib->sub_command) { - case MLAN_OID_SNMP_MIB_RTS_THRESHOLD: - value = mib->param.rts_threshold; - cmd_oid = RtsThresh_i; - break; - case MLAN_OID_SNMP_MIB_FRAG_THRESHOLD: - value = mib->param.frag_threshold; - cmd_oid = FragThresh_i; - break; - case MLAN_OID_SNMP_MIB_RETRY_COUNT: - value = mib->param.retry_count; - cmd_oid = ShortRetryLim_i; - break; - case MLAN_OID_SNMP_MIB_DTIM_PERIOD: - value = mib->param.dtim_period; - cmd_oid = DtimPeriod_i; - break; - } - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_SNMP_MIB, - cmd_action, cmd_oid, (t_void *) pioctl_req, &value); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - exit: - LEAVE(); - return ret; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u16 cmd_action = 0; + t_u16 cmd_oid = 0; + mlan_ds_snmp_mib *mib = MNULL; + t_u32 value = 0; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_snmp_mib)) { + PRINTM(MWARN, + "MLAN IOCTL information buffer length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_snmp_mib); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_RESOURCE; + goto exit; + } + + mib = (mlan_ds_snmp_mib *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) + cmd_action = HostCmd_ACT_GEN_SET; + else + cmd_action = HostCmd_ACT_GEN_GET; + + switch (mib->sub_command) { + case MLAN_OID_SNMP_MIB_RTS_THRESHOLD: + value = mib->param.rts_threshold; + cmd_oid = RtsThresh_i; + break; + case MLAN_OID_SNMP_MIB_FRAG_THRESHOLD: + value = mib->param.frag_threshold; + cmd_oid = FragThresh_i; + break; + case MLAN_OID_SNMP_MIB_RETRY_COUNT: + value = mib->param.retry_count; + cmd_oid = ShortRetryLim_i; + break; + case MLAN_OID_SNMP_MIB_DTIM_PERIOD: + value = mib->param.dtim_period; + cmd_oid = DtimPeriod_i; + break; + } + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_SNMP_MIB, + cmd_action, + cmd_oid, (t_void *) pioctl_req, &value); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +exit: + LEAVE(); + return ret; } -/** +/** * @brief Set/Get Infra/Ad-hoc band configuration * * @param pmadapter A pointer to mlan_adapter structure @@ -431,141 +438,151 @@ wlan_snmp_mib_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_radio_ioctl_band_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - t_u8 i, global_band = 0; - t_u8 chan_offset; - t_u8 infra_band = 0; - t_u8 adhoc_band = 0; - t_u32 adhoc_channel = 0; - mlan_ds_radio_cfg *radio_cfg = MNULL; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - - ENTER(); - - radio_cfg = (mlan_ds_radio_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) { - infra_band = (t_u8) radio_cfg->param.band_cfg.config_bands; - adhoc_band = (t_u8) radio_cfg->param.band_cfg.adhoc_start_band; - adhoc_channel = radio_cfg->param.band_cfg.adhoc_channel; - - /* SET Infra band */ - if ((infra_band | pmadapter->fw_bands) & ~pmadapter->fw_bands) { - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - /* SET Ad-hoc Band */ - if ((adhoc_band | pmadapter->fw_bands) & ~pmadapter->fw_bands) { - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - if (!adhoc_band) - adhoc_band = pmadapter->adhoc_start_band; - - for (i = 0; i < pmadapter->priv_num; i++) { - if (pmadapter->priv[i] && pmadapter->priv[i] != pmpriv && - GET_BSS_ROLE(pmadapter->priv[i]) == MLAN_BSS_ROLE_STA) - global_band |= pmadapter->priv[i]->config_bands; - } - global_band |= infra_band; - - if (wlan_set_regiontable - (pmpriv, (t_u8) pmadapter->region_code, global_band | adhoc_band)) { - pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - if (wlan_11d_set_universaltable(pmpriv, global_band | adhoc_band)) { - pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - pmpriv->config_bands = infra_band; - pmadapter->config_bands = global_band; - - pmadapter->adhoc_start_band = adhoc_band; - pmpriv->intf_state_11h.adhoc_auto_sel_chan = MFALSE; - pmadapter->chan_bandwidth = - (t_u8) radio_cfg->param.band_cfg.adhoc_chan_bandwidth; - /* - * If no adhoc_channel is supplied verify if the existing adhoc channel - * compiles with new adhoc_band - */ - if (!adhoc_channel) { - if (!wlan_find_cfp_by_band_and_channel - (pmadapter, pmadapter->adhoc_start_band, - pmpriv->adhoc_channel)) { - /* Pass back the default channel */ - radio_cfg->param.band_cfg.adhoc_channel = - DEFAULT_AD_HOC_CHANNEL; - if ((pmadapter->adhoc_start_band & BAND_A) - || (pmadapter->adhoc_start_band & BAND_AN) - ) { - radio_cfg->param.band_cfg.adhoc_channel = - DEFAULT_AD_HOC_CHANNEL_A; - } - } - } else { /* Return error if adhoc_band and adhoc_channel - combination is invalid */ - if (!wlan_find_cfp_by_band_and_channel - (pmadapter, pmadapter->adhoc_start_band, - (t_u16) adhoc_channel)) { - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - pmpriv->adhoc_channel = (t_u8) adhoc_channel; - } - - /* validate the channel offset */ - chan_offset = wlan_validate_chan_offset(pmpriv, - pmadapter->adhoc_start_band, - pmpriv->adhoc_channel, - pmadapter->chan_bandwidth); - - if (chan_offset != SEC_CHAN_NONE) { - if (chan_offset == SEC_CHANNEL_ABOVE) - pmadapter->chan_bandwidth = CHANNEL_BW_40MHZ_ABOVE; - else - pmadapter->chan_bandwidth = CHANNEL_BW_40MHZ_BELOW; - } - if ((adhoc_band & BAND_GN) - || (adhoc_band & BAND_AN) - ) { - pmadapter->adhoc_11n_enabled = MTRUE; - } else { - pmadapter->adhoc_11n_enabled = MFALSE; - } - } else { - radio_cfg->param.band_cfg.config_bands = pmpriv->config_bands; /* Infra - Bands - */ - radio_cfg->param.band_cfg.adhoc_start_band = pmadapter->adhoc_start_band; /* Adhoc - Band - */ - radio_cfg->param.band_cfg.adhoc_channel = pmpriv->adhoc_channel; /* Adhoc - Channel - */ - radio_cfg->param.band_cfg.fw_bands = pmadapter->fw_bands; /* FW - support - Bands - */ - PRINTM(MINFO, "Global config band = %d\n", pmadapter->config_bands); - radio_cfg->param.band_cfg.adhoc_chan_bandwidth = pmadapter->chan_bandwidth; /* adhoc - channel - bandwidth - */ - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + t_u8 i, global_band = 0; + t_u8 chan_offset; + t_u8 infra_band = 0; + t_u8 adhoc_band = 0; + t_u32 adhoc_channel = 0; + mlan_ds_radio_cfg *radio_cfg = MNULL; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + + ENTER(); + + radio_cfg = (mlan_ds_radio_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) { + infra_band = (t_u8) radio_cfg->param.band_cfg.config_bands; + adhoc_band = (t_u8) radio_cfg->param.band_cfg.adhoc_start_band; + adhoc_channel = radio_cfg->param.band_cfg.adhoc_channel; + + /* SET Infra band */ + if ((infra_band | pmadapter->fw_bands) & ~pmadapter->fw_bands) { + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + /* SET Ad-hoc Band */ + if ((adhoc_band | pmadapter->fw_bands) & ~pmadapter->fw_bands) { + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + if (!adhoc_band) + adhoc_band = pmadapter->adhoc_start_band; + + for (i = 0; i < pmadapter->priv_num; i++) { + if (pmadapter->priv[i] && pmadapter->priv[i] != pmpriv + && GET_BSS_ROLE(pmadapter->priv[i]) == + MLAN_BSS_ROLE_STA) + global_band |= pmadapter->priv[i]->config_bands; + } + global_band |= infra_band; + + if (wlan_set_regiontable + (pmpriv, (t_u8) pmadapter->region_code, + global_band | adhoc_band)) { + pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + if (wlan_11d_set_universaltable + (pmpriv, global_band | adhoc_band)) { + pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + pmpriv->config_bands = infra_band; + pmadapter->config_bands = global_band; + + pmadapter->adhoc_start_band = adhoc_band; + pmpriv->intf_state_11h.adhoc_auto_sel_chan = MFALSE; + pmadapter->chan_bandwidth = + (t_u8) radio_cfg->param.band_cfg.adhoc_chan_bandwidth; + /* + * If no adhoc_channel is supplied verify if the existing adhoc channel + * compiles with new adhoc_band + */ + if (!adhoc_channel) { + if (!wlan_find_cfp_by_band_and_channel + (pmadapter, pmadapter->adhoc_start_band, + pmpriv->adhoc_channel)) { + /* Pass back the default channel */ + radio_cfg->param.band_cfg.adhoc_channel = + DEFAULT_AD_HOC_CHANNEL; + if ((pmadapter->adhoc_start_band & BAND_A) + || (pmadapter->adhoc_start_band & BAND_AN) + ) { + radio_cfg->param.band_cfg. + adhoc_channel = + DEFAULT_AD_HOC_CHANNEL_A; + } + } + } else { /* Return error if adhoc_band and adhoc_channel + combination is invalid */ + if (!wlan_find_cfp_by_band_and_channel + (pmadapter, pmadapter->adhoc_start_band, + (t_u16) adhoc_channel)) { + pioctl_req->status_code = + MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + pmpriv->adhoc_channel = (t_u8) adhoc_channel; + } + + /* validate the channel offset */ + chan_offset = wlan_validate_chan_offset(pmpriv, + pmadapter-> + adhoc_start_band, + pmpriv->adhoc_channel, + pmadapter-> + chan_bandwidth); + + if (chan_offset != SEC_CHAN_NONE) { + if (chan_offset == SEC_CHANNEL_ABOVE) + pmadapter->chan_bandwidth = + CHANNEL_BW_40MHZ_ABOVE; + else + pmadapter->chan_bandwidth = + CHANNEL_BW_40MHZ_BELOW; + } + if ((adhoc_band & BAND_GN) + || (adhoc_band & BAND_AN) + ) { + pmadapter->adhoc_11n_enabled = MTRUE; + } else { + pmadapter->adhoc_11n_enabled = MFALSE; + } + } else { + radio_cfg->param.band_cfg.config_bands = pmpriv->config_bands; /* Infra + Bands + */ + radio_cfg->param.band_cfg.adhoc_start_band = pmadapter->adhoc_start_band; /* Adhoc + Band + */ + radio_cfg->param.band_cfg.adhoc_channel = pmpriv->adhoc_channel; /* Adhoc + Channel + */ + radio_cfg->param.band_cfg.fw_bands = pmadapter->fw_bands; /* FW + support + Bands + */ + PRINTM(MINFO, "Global config band = %d\n", + pmadapter->config_bands); + radio_cfg->param.band_cfg.adhoc_chan_bandwidth = pmadapter->chan_bandwidth; /* adhoc + channel + bandwidth + */ + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief Radio command handler * * @param pmadapter A pointer to mlan_adapter structure @@ -576,46 +593,48 @@ wlan_radio_ioctl_band_cfg(IN pmlan_adapter pmadapter, static mlan_status wlan_radio_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_radio_cfg *radio_cfg = MNULL; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_radio_cfg)) { - PRINTM(MWARN, "MLAN IOCTL information buffer length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_radio_cfg); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - radio_cfg = (mlan_ds_radio_cfg *) pioctl_req->pbuf; - switch (radio_cfg->sub_command) { - case MLAN_OID_RADIO_CTRL: - status = wlan_radio_ioctl_radio_ctl(pmadapter, pioctl_req); - break; - case MLAN_OID_BAND_CFG: - status = wlan_radio_ioctl_band_cfg(pmadapter, pioctl_req); - break; - case MLAN_OID_ANT_CFG: - status = wlan_radio_ioctl_ant_cfg(pmadapter, pioctl_req); - break; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_radio_cfg *radio_cfg = MNULL; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_radio_cfg)) { + PRINTM(MWARN, + "MLAN IOCTL information buffer length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_radio_cfg); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + radio_cfg = (mlan_ds_radio_cfg *) pioctl_req->pbuf; + switch (radio_cfg->sub_command) { + case MLAN_OID_RADIO_CTRL: + status = wlan_radio_ioctl_radio_ctl(pmadapter, pioctl_req); + break; + case MLAN_OID_BAND_CFG: + status = wlan_radio_ioctl_band_cfg(pmadapter, pioctl_req); + break; + case MLAN_OID_ANT_CFG: + status = wlan_radio_ioctl_ant_cfg(pmadapter, pioctl_req); + break; #ifdef WIFI_DIRECT_SUPPORT - case MLAN_OID_REMAIN_CHAN_CFG: - status = wlan_radio_ioctl_remain_chan_cfg(pmadapter, pioctl_req); - break; + case MLAN_OID_REMAIN_CHAN_CFG: + status = wlan_radio_ioctl_remain_chan_cfg(pmadapter, + pioctl_req); + break; #endif - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - - LEAVE(); - return status; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + + LEAVE(); + return status; } -/** +/** * @brief Set/Get MAC address * * @param pmadapter A pointer to mlan_adapter structure @@ -625,38 +644,38 @@ wlan_radio_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_bss_ioctl_mac_address(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_bss *bss = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - ENTER(); - bss = (mlan_ds_bss *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) { - pioctl_req->data_read_written = - MLAN_MAC_ADDR_LENGTH + MLAN_SUB_COMMAND_SIZE; - memcpy(pmadapter, &bss->param.mac_addr, pmpriv->curr_addr, - MLAN_MAC_ADDR_LENGTH); - ret = MLAN_STATUS_SUCCESS; - goto exit; - } - - memcpy(pmadapter, pmpriv->curr_addr, &bss->param.mac_addr, - MLAN_MAC_ADDR_LENGTH); - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_MAC_ADDRESS, - HostCmd_ACT_GEN_SET, - 0, (t_void *) pioctl_req, MNULL); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - exit: - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_bss *bss = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + ENTER(); + bss = (mlan_ds_bss *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) { + pioctl_req->data_read_written = + MLAN_MAC_ADDR_LENGTH + MLAN_SUB_COMMAND_SIZE; + memcpy(pmadapter, &bss->param.mac_addr, pmpriv->curr_addr, + MLAN_MAC_ADDR_LENGTH); + ret = MLAN_STATUS_SUCCESS; + goto exit; + } + + memcpy(pmadapter, pmpriv->curr_addr, &bss->param.mac_addr, + MLAN_MAC_ADDR_LENGTH); + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_MAC_ADDRESS, + HostCmd_ACT_GEN_SET, + 0, (t_void *) pioctl_req, MNULL); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; +exit: + LEAVE(); + return ret; } -/** +/** * @brief Set multicast list * * @param pmadapter A pointer to mlan_adapter structure @@ -666,79 +685,89 @@ wlan_bss_ioctl_mac_address(IN pmlan_adapter pmadapter, */ static mlan_status wlan_bss_ioctl_set_multicast_list(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_bss *bss = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u16 old_pkt_filter; - - ENTER(); - - old_pkt_filter = pmpriv->curr_pkt_filter; - bss = (mlan_ds_bss *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) { - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - pioctl_req->data_read_written = - sizeof(mlan_multicast_list) + MLAN_SUB_COMMAND_SIZE; - if (bss->param.multicast_list.mode == MLAN_PROMISC_MODE) { - PRINTM(MINFO, "Enable Promiscuous mode\n"); - pmpriv->curr_pkt_filter |= HostCmd_ACT_MAC_PROMISCUOUS_ENABLE; - pmpriv->curr_pkt_filter &= ~HostCmd_ACT_MAC_ALL_MULTICAST_ENABLE; - } else { - /* Multicast */ - pmpriv->curr_pkt_filter &= ~HostCmd_ACT_MAC_PROMISCUOUS_ENABLE; - if (bss->param.multicast_list.mode == MLAN_ALL_MULTI_MODE) { - PRINTM(MINFO, "Enabling All Multicast!\n"); - pmpriv->curr_pkt_filter |= HostCmd_ACT_MAC_ALL_MULTICAST_ENABLE; - } else { - pmpriv->curr_pkt_filter &= ~HostCmd_ACT_MAC_ALL_MULTICAST_ENABLE; - if (bss->param.multicast_list.num_multicast_addr) { - PRINTM(MINFO, "Set multicast list=%d\n", - bss->param.multicast_list.num_multicast_addr); - /* Set multicast addresses to firmware */ - if (old_pkt_filter == pmpriv->curr_pkt_filter) { - /* Send request to firmware */ - ret = - wlan_prepare_cmd(pmpriv, HostCmd_CMD_MAC_MULTICAST_ADR, - HostCmd_ACT_GEN_SET, 0, - (t_void *) pioctl_req, - &bss->param.multicast_list); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - } else { - /* Send request to firmware */ - ret = - wlan_prepare_cmd(pmpriv, HostCmd_CMD_MAC_MULTICAST_ADR, - HostCmd_ACT_GEN_SET, 0, MNULL, - &bss->param.multicast_list); - } - if (ret) - goto exit; - } - } - } - PRINTM(MINFO, "old_pkt_filter=0x%x, curr_pkt_filter=0x%x\n", old_pkt_filter, - pmpriv->curr_pkt_filter); - if (old_pkt_filter != pmpriv->curr_pkt_filter) { - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_MAC_CONTROL, - HostCmd_ACT_GEN_SET, - 0, - (t_void *) pioctl_req, &pmpriv->curr_pkt_filter); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - } - - exit: - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_bss *bss = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u16 old_pkt_filter; + + ENTER(); + + old_pkt_filter = pmpriv->curr_pkt_filter; + bss = (mlan_ds_bss *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) { + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + pioctl_req->data_read_written = + sizeof(mlan_multicast_list) + MLAN_SUB_COMMAND_SIZE; + if (bss->param.multicast_list.mode == MLAN_PROMISC_MODE) { + PRINTM(MINFO, "Enable Promiscuous mode\n"); + pmpriv->curr_pkt_filter |= HostCmd_ACT_MAC_PROMISCUOUS_ENABLE; + pmpriv->curr_pkt_filter &= + ~HostCmd_ACT_MAC_ALL_MULTICAST_ENABLE; + } else { + /* Multicast */ + pmpriv->curr_pkt_filter &= ~HostCmd_ACT_MAC_PROMISCUOUS_ENABLE; + if (bss->param.multicast_list.mode == MLAN_ALL_MULTI_MODE) { + PRINTM(MINFO, "Enabling All Multicast!\n"); + pmpriv->curr_pkt_filter |= + HostCmd_ACT_MAC_ALL_MULTICAST_ENABLE; + } else { + pmpriv->curr_pkt_filter &= + ~HostCmd_ACT_MAC_ALL_MULTICAST_ENABLE; + if (bss->param.multicast_list.num_multicast_addr) { + PRINTM(MINFO, "Set multicast list=%d\n", + bss->param.multicast_list. + num_multicast_addr); + /* Set multicast addresses to firmware */ + if (old_pkt_filter == pmpriv->curr_pkt_filter) { + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_MAC_MULTICAST_ADR, + HostCmd_ACT_GEN_SET, + 0, + (t_void *) + pioctl_req, + &bss->param. + multicast_list); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + } else { + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_MAC_MULTICAST_ADR, + HostCmd_ACT_GEN_SET, + 0, MNULL, + &bss->param. + multicast_list); + } + if (ret) + goto exit; + } + } + } + PRINTM(MINFO, "old_pkt_filter=0x%x, curr_pkt_filter=0x%x\n", + old_pkt_filter, pmpriv->curr_pkt_filter); + if (old_pkt_filter != pmpriv->curr_pkt_filter) { + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_MAC_CONTROL, + HostCmd_ACT_GEN_SET, + 0, + (t_void *) pioctl_req, + &pmpriv->curr_pkt_filter); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + } + +exit: + LEAVE(); + return ret; } -/** +/** * @brief Get channel list * * @param pmadapter A pointer to mlan_adapter structure @@ -748,84 +777,97 @@ wlan_bss_ioctl_set_multicast_list(IN pmlan_adapter pmadapter, */ static mlan_status wlan_bss_ioctl_get_channel_list(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_bss *bss = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - chan_freq_power_t *cfp; - t_u32 i, j; - - ENTER(); - - bss = (mlan_ds_bss *) pioctl_req->pbuf; - if (pioctl_req->action != MLAN_ACT_GET) { - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - if ((wlan_11d_is_enabled(pmpriv) && - pmpriv->media_connected == MTRUE) && - ((pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) || - (pmpriv->bss_mode == MLAN_BSS_MODE_IBSS && - pmpriv->adhoc_state != ADHOC_STARTED)) - ) { - t_u8 chan_no; - t_u8 band; - - parsed_region_chan_11d_t *parsed_region_chan = MNULL; - parsed_region_chan_11d_t region_chan; - - BSSDescriptor_t *pbss_desc = &pmpriv->curr_bss_params.bss_descriptor; - - memset(pmadapter, ®ion_chan, 0, sizeof(parsed_region_chan_11d_t)); - - /* If country IE is present in the associated AP then return the - channel list from country IE else return it from the learning table */ - - if (wlan_11d_parse_domain_info(pmadapter, &pbss_desc->country_info, - (t_u8) pbss_desc->bss_band, - ®ion_chan) == MLAN_STATUS_SUCCESS) { - - parsed_region_chan = ®ion_chan; - } else { - parsed_region_chan = &pmadapter->parsed_region_chan; - } - - PRINTM(MINFO, "no_of_chan=%d\n", parsed_region_chan->no_of_chan); - - for (i = 0; (bss->param.chanlist.num_of_chan < MLAN_MAX_CHANNEL_NUM) - && (i < parsed_region_chan->no_of_chan); i++) { - chan_no = parsed_region_chan->chan_pwr[i].chan; - band = parsed_region_chan->chan_pwr[i].band; - PRINTM(MINFO, "band=%d, chan_no=%d\n", band, chan_no); - bss->param.chanlist.cf[bss->param.chanlist.num_of_chan].channel = - (t_u32) chan_no; - bss->param.chanlist.cf[bss->param.chanlist.num_of_chan].freq = - (t_u32) wlan_11d_chan_2_freq(pmadapter, chan_no, band); - bss->param.chanlist.num_of_chan++; - } - } else { - for (j = 0; (bss->param.chanlist.num_of_chan < MLAN_MAX_CHANNEL_NUM) - && (j < MAX_REGION_CHANNEL_NUM); j++) { - cfp = pmadapter->region_channel[j].pcfp; - for (i = 0; (bss->param.chanlist.num_of_chan < MLAN_MAX_CHANNEL_NUM) - && pmadapter->region_channel[j].valid - && cfp && (i < pmadapter->region_channel[j].num_cfp); i++) { - bss->param.chanlist.cf[bss->param.chanlist.num_of_chan]. - channel = (t_u32) cfp->channel; - bss->param.chanlist.cf[bss->param.chanlist.num_of_chan].freq = - (t_u32) cfp->freq; - bss->param.chanlist.num_of_chan++; - cfp++; - } - } - } - - PRINTM(MINFO, "num of channel=%d\n", bss->param.chanlist.num_of_chan); - - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_bss *bss = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + chan_freq_power_t *cfp; + t_u32 i, j; + + ENTER(); + + bss = (mlan_ds_bss *) pioctl_req->pbuf; + if (pioctl_req->action != MLAN_ACT_GET) { + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + if ((wlan_11d_is_enabled(pmpriv) && + pmpriv->media_connected == MTRUE) && + ((pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) || + (pmpriv->bss_mode == MLAN_BSS_MODE_IBSS && + pmpriv->adhoc_state != ADHOC_STARTED)) + ) { + t_u8 chan_no; + t_u8 band; + + parsed_region_chan_11d_t *parsed_region_chan = MNULL; + parsed_region_chan_11d_t region_chan; + + BSSDescriptor_t *pbss_desc = + &pmpriv->curr_bss_params.bss_descriptor; + + memset(pmadapter, ®ion_chan, 0, + sizeof(parsed_region_chan_11d_t)); + + /* If country IE is present in the associated AP then return + the channel list from country IE else return it from the + learning table */ + + if (wlan_11d_parse_domain_info + (pmadapter, &pbss_desc->country_info, + (t_u8) pbss_desc->bss_band, + ®ion_chan) == MLAN_STATUS_SUCCESS) { + + parsed_region_chan = ®ion_chan; + } else { + parsed_region_chan = &pmadapter->parsed_region_chan; + } + + PRINTM(MINFO, "no_of_chan=%d\n", + parsed_region_chan->no_of_chan); + + for (i = 0; + (bss->param.chanlist.num_of_chan < MLAN_MAX_CHANNEL_NUM) + && (i < parsed_region_chan->no_of_chan); i++) { + chan_no = parsed_region_chan->chan_pwr[i].chan; + band = parsed_region_chan->chan_pwr[i].band; + PRINTM(MINFO, "band=%d, chan_no=%d\n", band, chan_no); + bss->param.chanlist.cf[bss->param.chanlist.num_of_chan]. + channel = (t_u32) chan_no; + bss->param.chanlist.cf[bss->param.chanlist.num_of_chan]. + freq = + (t_u32) wlan_11d_chan_2_freq(pmadapter, chan_no, + band); + bss->param.chanlist.num_of_chan++; + } + } else { + for (j = 0; + (bss->param.chanlist.num_of_chan < MLAN_MAX_CHANNEL_NUM) + && (j < MAX_REGION_CHANNEL_NUM); j++) { + cfp = pmadapter->region_channel[j].pcfp; + for (i = 0; + (bss->param.chanlist.num_of_chan < + MLAN_MAX_CHANNEL_NUM) + && pmadapter->region_channel[j].valid && cfp && + (i < pmadapter->region_channel[j].num_cfp); i++) { + bss->param.chanlist.cf[bss->param.chanlist. + num_of_chan].channel = + (t_u32) cfp->channel; + bss->param.chanlist.cf[bss->param.chanlist. + num_of_chan].freq = + (t_u32) cfp->freq; + bss->param.chanlist.num_of_chan++; + cfp++; + } + } + } + + PRINTM(MINFO, "num of channel=%d\n", bss->param.chanlist.num_of_chan); + + LEAVE(); + return ret; } /** Highest channel used in 2.4GHz band */ @@ -834,7 +876,7 @@ wlan_bss_ioctl_get_channel_list(IN pmlan_adapter pmadapter, /** Highest frequency used in 2.4GHz band */ #define MAX_FREQUENCY_BAND_B (2484) -/** +/** * @brief Set/Get BSS channel * * @param pmadapter A pointer to mlan_adapter structure @@ -844,100 +886,106 @@ wlan_bss_ioctl_get_channel_list(IN pmlan_adapter pmadapter, */ static mlan_status wlan_bss_ioctl_channel(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = MNULL; - mlan_ds_bss *bss = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - chan_freq_power_t *cfp = MNULL; - ENTER(); - - if ((pioctl_req == MNULL) || (pioctl_req->pbuf == MNULL)) { - PRINTM(MERROR, "Request buffer not found!\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - pmpriv = pmadapter->priv[pioctl_req->bss_index]; - bss = (mlan_ds_bss *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) { - cfp = wlan_find_cfp_by_band_and_channel(pmadapter, - pmpriv->curr_bss_params.band, - (t_u16) pmpriv->curr_bss_params. - bss_descriptor.channel); - if (cfp) { - bss->param.bss_chan.channel = cfp->channel; - bss->param.bss_chan.freq = cfp->freq; - } else { - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - } - pioctl_req->data_read_written = - sizeof(chan_freq) + MLAN_SUB_COMMAND_SIZE; - LEAVE(); - return ret; - } - if (!bss->param.bss_chan.channel && !bss->param.bss_chan.freq) { - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - if (pmadapter->adhoc_start_band & BAND_AN) - pmadapter->adhoc_start_band = BAND_G | BAND_B | BAND_GN; - else if (pmadapter->adhoc_start_band & BAND_A) - pmadapter->adhoc_start_band = BAND_G | BAND_B; - if (bss->param.bss_chan.channel) { - if (bss->param.bss_chan.channel <= MAX_CHANNEL_BAND_B) - cfp = - wlan_find_cfp_by_band_and_channel(pmadapter, BAND_B, - (t_u16) bss->param.bss_chan. - channel); - if (!cfp) { - cfp = - wlan_find_cfp_by_band_and_channel(pmadapter, BAND_A, - (t_u16) bss->param.bss_chan. - channel); - if (cfp) { - if (pmadapter->adhoc_11n_enabled) - pmadapter->adhoc_start_band = BAND_A | BAND_AN; - else - pmadapter->adhoc_start_band = BAND_A; - } - } - } else { - if (bss->param.bss_chan.freq <= MAX_FREQUENCY_BAND_B) - cfp = - wlan_find_cfp_by_band_and_freq(pmadapter, BAND_B, - bss->param.bss_chan.freq); - if (!cfp) { - cfp = - wlan_find_cfp_by_band_and_freq(pmadapter, BAND_A, - bss->param.bss_chan.freq); - if (cfp) { - if (pmadapter->adhoc_11n_enabled) - pmadapter->adhoc_start_band = BAND_A | BAND_AN; - else - pmadapter->adhoc_start_band = BAND_A; - } - } - } - if (!cfp || !cfp->channel) { - PRINTM(MERROR, "Invalid channel/freq\n"); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_FAILURE; - - } - pmpriv->adhoc_channel = (t_u8) cfp->channel; - pmpriv->intf_state_11h.adhoc_auto_sel_chan = MFALSE; - bss->param.bss_chan.channel = cfp->channel; - bss->param.bss_chan.freq = cfp->freq; - - LEAVE(); - return ret; + mlan_private *pmpriv = MNULL; + mlan_ds_bss *bss = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + chan_freq_power_t *cfp = MNULL; + ENTER(); + + if ((pioctl_req == MNULL) || (pioctl_req->pbuf == MNULL)) { + PRINTM(MERROR, "Request buffer not found!\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + pmpriv = pmadapter->priv[pioctl_req->bss_index]; + bss = (mlan_ds_bss *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) { + cfp = wlan_find_cfp_by_band_and_channel(pmadapter, + pmpriv->curr_bss_params. + band, + (t_u16) pmpriv-> + curr_bss_params. + bss_descriptor.channel); + if (cfp) { + bss->param.bss_chan.channel = cfp->channel; + bss->param.bss_chan.freq = cfp->freq; + } else { + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + } + pioctl_req->data_read_written = + sizeof(chan_freq) + MLAN_SUB_COMMAND_SIZE; + LEAVE(); + return ret; + } + if (!bss->param.bss_chan.channel && !bss->param.bss_chan.freq) { + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + if (pmadapter->adhoc_start_band & BAND_AN) + pmadapter->adhoc_start_band = BAND_G | BAND_B | BAND_GN; + else if (pmadapter->adhoc_start_band & BAND_A) + pmadapter->adhoc_start_band = BAND_G | BAND_B; + if (bss->param.bss_chan.channel) { + if (bss->param.bss_chan.channel <= MAX_CHANNEL_BAND_B) + cfp = wlan_find_cfp_by_band_and_channel(pmadapter, + BAND_B, + (t_u16) bss-> + param.bss_chan. + channel); + if (!cfp) { + cfp = wlan_find_cfp_by_band_and_channel(pmadapter, + BAND_A, + (t_u16) bss-> + param.bss_chan. + channel); + if (cfp) { + if (pmadapter->adhoc_11n_enabled) + pmadapter->adhoc_start_band = + BAND_A | BAND_AN; + else + pmadapter->adhoc_start_band = BAND_A; + } + } + } else { + if (bss->param.bss_chan.freq <= MAX_FREQUENCY_BAND_B) + cfp = wlan_find_cfp_by_band_and_freq(pmadapter, BAND_B, + bss->param. + bss_chan.freq); + if (!cfp) { + cfp = wlan_find_cfp_by_band_and_freq(pmadapter, BAND_A, + bss->param. + bss_chan.freq); + if (cfp) { + if (pmadapter->adhoc_11n_enabled) + pmadapter->adhoc_start_band = + BAND_A | BAND_AN; + else + pmadapter->adhoc_start_band = BAND_A; + } + } + } + if (!cfp || !cfp->channel) { + PRINTM(MERROR, "Invalid channel/freq\n"); + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_FAILURE; + + } + pmpriv->adhoc_channel = (t_u8) cfp->channel; + pmpriv->intf_state_11h.adhoc_auto_sel_chan = MFALSE; + bss->param.bss_chan.channel = cfp->channel; + bss->param.bss_chan.freq = cfp->freq; + + LEAVE(); + return ret; } -/** +/** * @brief Set/Get BSS mode * * @param pmadapter A pointer to mlan_adapter structure @@ -948,55 +996,56 @@ wlan_bss_ioctl_channel(IN pmlan_adapter pmadapter, static mlan_status wlan_bss_ioctl_mode(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_bss *bss = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - bss = (mlan_ds_bss *) pioctl_req->pbuf; - - ENTER(); - - if (pioctl_req->action == MLAN_ACT_GET) { - bss->param.bss_mode = pmpriv->bss_mode; - pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; - goto exit; - } - - if ((pmpriv->bss_mode == bss->param.bss_mode) || - (bss->param.bss_mode == MLAN_BSS_MODE_AUTO)) { - PRINTM(MINFO, "Already set to required mode! No change!\n"); - pmpriv->bss_mode = bss->param.bss_mode; - goto exit; - } - - if (pmpriv->bss_mode != MLAN_BSS_MODE_AUTO) - ret = wlan_disconnect(pmpriv, MNULL, MNULL); - else - ret = wlan_disconnect(pmpriv, pioctl_req, MNULL); - - if (pmpriv->sec_info.authentication_mode != MLAN_AUTH_MODE_AUTO) - pmpriv->sec_info.authentication_mode = MLAN_AUTH_MODE_OPEN; - pmpriv->bss_mode = bss->param.bss_mode; - - if (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) - pmpriv->port_ctrl_mode = MTRUE; - else - pmpriv->port_ctrl_mode = MFALSE; - - if ((pmpriv->bss_mode != MLAN_BSS_MODE_AUTO) - ) { - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_SET_BSS_MODE, - HostCmd_ACT_GEN_SET, - 0, (t_void *) pioctl_req, MNULL); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - } - exit: - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_bss *bss = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + bss = (mlan_ds_bss *) pioctl_req->pbuf; + + ENTER(); + + if (pioctl_req->action == MLAN_ACT_GET) { + bss->param.bss_mode = pmpriv->bss_mode; + pioctl_req->data_read_written = + sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; + goto exit; + } + + if ((pmpriv->bss_mode == bss->param.bss_mode) || + (bss->param.bss_mode == MLAN_BSS_MODE_AUTO)) { + PRINTM(MINFO, "Already set to required mode! No change!\n"); + pmpriv->bss_mode = bss->param.bss_mode; + goto exit; + } + + if (pmpriv->bss_mode != MLAN_BSS_MODE_AUTO) + ret = wlan_disconnect(pmpriv, MNULL, MNULL); + else + ret = wlan_disconnect(pmpriv, pioctl_req, MNULL); + + if (pmpriv->sec_info.authentication_mode != MLAN_AUTH_MODE_AUTO) + pmpriv->sec_info.authentication_mode = MLAN_AUTH_MODE_OPEN; + pmpriv->bss_mode = bss->param.bss_mode; + + if (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) + pmpriv->port_ctrl_mode = MTRUE; + else + pmpriv->port_ctrl_mode = MFALSE; + + if ((pmpriv->bss_mode != MLAN_BSS_MODE_AUTO) + ) { + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_SET_BSS_MODE, + HostCmd_ACT_GEN_SET, + 0, (t_void *) pioctl_req, MNULL); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + } +exit: + LEAVE(); + return ret; } -/** +/** * @brief Start BSS * * @param pmadapter A pointer to mlan_adapter structure @@ -1007,148 +1056,167 @@ wlan_bss_ioctl_mode(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) static mlan_status wlan_bss_ioctl_start(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_bss *bss = (mlan_ds_bss *) pioctl_req->pbuf; - t_s32 i = -1; - t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; - - ENTER(); - - /* Before ASSOC REQ, If "port ctrl" mode is enabled, move the port to - CLOSED state */ - if (pmpriv->port_ctrl_mode == MTRUE) { - PRINTM(MINFO, "bss_ioctl_start(): port_state=CLOSED\n"); - pmpriv->prior_port_status = pmpriv->port_open; - pmpriv->port_open = MFALSE; - } - pmadapter->scan_block = MFALSE; - - if (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) { - if (!bss->param.ssid_bssid.idx || - bss->param.ssid_bssid.idx > pmadapter->num_in_scan_table) { - /* Search for the requested SSID in the scan table */ - if (bss->param.ssid_bssid.ssid.ssid_len) { - if (memcmp - (pmadapter, &bss->param.ssid_bssid.bssid, zero_mac, - sizeof(zero_mac))) - i = wlan_find_ssid_in_list(pmpriv, - &bss->param.ssid_bssid.ssid, - (t_u8 *) & bss->param.ssid_bssid. - bssid, MLAN_BSS_MODE_INFRA); - else - i = wlan_find_ssid_in_list(pmpriv, - &bss->param.ssid_bssid.ssid, - MNULL, MLAN_BSS_MODE_INFRA); - } else { - i = wlan_find_bssid_in_list(pmpriv, - (t_u8 *) & bss->param.ssid_bssid. - bssid, MLAN_BSS_MODE_INFRA); - } - } else { - /* use bsslist index number to assoicate */ - i = wlan_is_network_compatible(pmpriv, - bss->param.ssid_bssid.idx - 1, - pmpriv->bss_mode); - } - if (i >= 0) { - /* block if upper-layer tries to reconnect before new scan */ - if (wlan_11h_get_csa_closed_channel(pmpriv) == - (t_u8) pmadapter->pscan_table[i].channel) { - PRINTM(MINFO, "Attempt to reconnect on csa_closed_chan(%d)\n", - pmadapter->pscan_table[i].channel); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto start_ssid_done; - } - PRINTM(MINFO, "SSID found in scan list ... associating...\n"); - - /* Clear any past association response stored for application - retrieval */ - pmpriv->assoc_rsp_size = 0; - ret = wlan_associate(pmpriv, pioctl_req, - &pmadapter->pscan_table[i]); - if (ret) - goto start_ssid_done; - } else { /* i >= 0 */ - PRINTM(MERROR, - "SSID not found in scan list: ssid=%s, " MACSTR ", idx=%d\n", - bss->param.ssid_bssid.ssid.ssid, - MAC2STR(bss->param.ssid_bssid.bssid), - (int) bss->param.ssid_bssid.idx); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto start_ssid_done; - } - } else { - /* Adhoc mode */ - /* If the requested SSID matches current SSID, return */ - if (bss->param.ssid_bssid.ssid.ssid_len && - (!wlan_ssid_cmp - (pmadapter, &pmpriv->curr_bss_params.bss_descriptor.ssid, - &bss->param.ssid_bssid.ssid))) { - ret = MLAN_STATUS_SUCCESS; - goto start_ssid_done; - } - - /* Exit Adhoc mode first */ - PRINTM(MINFO, "Sending Adhoc Stop\n"); - ret = wlan_disconnect(pmpriv, MNULL, MNULL); - if (ret) - goto start_ssid_done; - - pmpriv->adhoc_is_link_sensed = MFALSE; - - if (!bss->param.ssid_bssid.idx || - bss->param.ssid_bssid.idx > pmadapter->num_in_scan_table) { - /* Search for the requested network in the scan table */ - if (bss->param.ssid_bssid.ssid.ssid_len) { - i = wlan_find_ssid_in_list(pmpriv, - &bss->param.ssid_bssid.ssid, - MNULL, MLAN_BSS_MODE_IBSS); - } else { - i = wlan_find_bssid_in_list(pmpriv, - (t_u8 *) & bss->param.ssid_bssid. - bssid, MLAN_BSS_MODE_IBSS); - } - } else { - /* use bsslist index number to assoicate */ - i = wlan_is_network_compatible(pmpriv, - bss->param.ssid_bssid.idx - 1, - pmpriv->bss_mode); - } - - if (i >= 0) { - PRINTM(MINFO, "Network found in scan list ... joining ...\n"); - ret = - wlan_adhoc_join(pmpriv, pioctl_req, &pmadapter->pscan_table[i]); - if (ret) - goto start_ssid_done; - if (pmpriv->adhoc_aes_enabled) - wlan_enable_aes_key(pmpriv); - } else { /* i >= 0 */ - PRINTM(MINFO, "Network not found in the list, " - "creating adhoc with ssid = %s\n", - bss->param.ssid_bssid.ssid.ssid); - ret = - wlan_adhoc_start(pmpriv, pioctl_req, - &bss->param.ssid_bssid.ssid); - if (ret) - goto start_ssid_done; - if (pmpriv->adhoc_aes_enabled) - wlan_enable_aes_key(pmpriv); - } - } - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - start_ssid_done: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_bss *bss = (mlan_ds_bss *) pioctl_req->pbuf; + t_s32 i = -1; + t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; + + ENTER(); + + /* Before ASSOC REQ, If "port ctrl" mode is enabled, move the port to + CLOSED state */ + if (pmpriv->port_ctrl_mode == MTRUE) { + PRINTM(MINFO, "bss_ioctl_start(): port_state=CLOSED\n"); + pmpriv->prior_port_status = pmpriv->port_open; + pmpriv->port_open = MFALSE; + } + pmadapter->scan_block = MFALSE; + + if (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) { + if (!bss->param.ssid_bssid.idx || + bss->param.ssid_bssid.idx > pmadapter->num_in_scan_table) { + /* Search for the requested SSID in the scan table */ + if (bss->param.ssid_bssid.ssid.ssid_len) { + if (memcmp + (pmadapter, &bss->param.ssid_bssid.bssid, + zero_mac, sizeof(zero_mac))) + i = wlan_find_ssid_in_list(pmpriv, + &bss->param. + ssid_bssid. + ssid, + (t_u8 *) & + bss->param. + ssid_bssid. + bssid, + MLAN_BSS_MODE_INFRA); + else + i = wlan_find_ssid_in_list(pmpriv, + &bss->param. + ssid_bssid. + ssid, MNULL, + MLAN_BSS_MODE_INFRA); + } else { + i = wlan_find_bssid_in_list(pmpriv, + (t_u8 *) & bss-> + param.ssid_bssid. + bssid, + MLAN_BSS_MODE_INFRA); + } + } else { + /* use bsslist index number to assoicate */ + i = wlan_is_network_compatible(pmpriv, + bss->param.ssid_bssid. + idx - 1, + pmpriv->bss_mode); + } + if (i >= 0) { + /* block if upper-layer tries to reconnect before new + scan */ + if (wlan_11h_get_csa_closed_channel(pmpriv) == + (t_u8) pmadapter->pscan_table[i].channel) { + PRINTM(MINFO, + "Attempt to reconnect on csa_closed_chan(%d)\n", + pmadapter->pscan_table[i].channel); + pioctl_req->status_code = + MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto start_ssid_done; + } + PRINTM(MINFO, + "SSID found in scan list ... associating...\n"); + + /* Clear any past association response stored for + application retrieval */ + pmpriv->assoc_rsp_size = 0; + ret = wlan_associate(pmpriv, pioctl_req, + &pmadapter->pscan_table[i]); + if (ret) + goto start_ssid_done; + } else { /* i >= 0 */ + PRINTM(MERROR, + "SSID not found in scan list: ssid=%s, " MACSTR + ", idx=%d\n", bss->param.ssid_bssid.ssid.ssid, + MAC2STR(bss->param.ssid_bssid.bssid), + (int)bss->param.ssid_bssid.idx); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto start_ssid_done; + } + } else { + /* Adhoc mode */ + /* If the requested SSID matches current SSID, return */ + if (bss->param.ssid_bssid.ssid.ssid_len && + (!wlan_ssid_cmp + (pmadapter, &pmpriv->curr_bss_params.bss_descriptor.ssid, + &bss->param.ssid_bssid.ssid))) { + ret = MLAN_STATUS_SUCCESS; + goto start_ssid_done; + } + + /* Exit Adhoc mode first */ + PRINTM(MINFO, "Sending Adhoc Stop\n"); + ret = wlan_disconnect(pmpriv, MNULL, MNULL); + if (ret) + goto start_ssid_done; + + pmpriv->adhoc_is_link_sensed = MFALSE; + + if (!bss->param.ssid_bssid.idx || + bss->param.ssid_bssid.idx > pmadapter->num_in_scan_table) { + /* Search for the requested network in the scan table */ + if (bss->param.ssid_bssid.ssid.ssid_len) { + i = wlan_find_ssid_in_list(pmpriv, + &bss->param. + ssid_bssid.ssid, + MNULL, + MLAN_BSS_MODE_IBSS); + } else { + i = wlan_find_bssid_in_list(pmpriv, + (t_u8 *) & bss-> + param.ssid_bssid. + bssid, + MLAN_BSS_MODE_IBSS); + } + } else { + /* use bsslist index number to assoicate */ + i = wlan_is_network_compatible(pmpriv, + bss->param.ssid_bssid. + idx - 1, + pmpriv->bss_mode); + } + + if (i >= 0) { + PRINTM(MINFO, + "Network found in scan list ... joining ...\n"); + ret = wlan_adhoc_join(pmpriv, pioctl_req, + &pmadapter->pscan_table[i]); + if (ret) + goto start_ssid_done; + if (pmpriv->adhoc_aes_enabled) + wlan_enable_aes_key(pmpriv); + } else { /* i >= 0 */ + PRINTM(MINFO, "Network not found in the list, " + "creating adhoc with ssid = %s\n", + bss->param.ssid_bssid.ssid.ssid); + ret = wlan_adhoc_start(pmpriv, pioctl_req, + &bss->param.ssid_bssid.ssid); + if (ret) + goto start_ssid_done; + if (pmpriv->adhoc_aes_enabled) + wlan_enable_aes_key(pmpriv); + } + } + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +start_ssid_done: + LEAVE(); + return ret; } -/** +/** * @brief Stop BSS * * @param pmadapter A pointer to mlan_adapter structure @@ -1159,19 +1227,19 @@ wlan_bss_ioctl_start(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) static mlan_status wlan_bss_ioctl_stop(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_bss *bss = (mlan_ds_bss *) pioctl_req->pbuf; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_bss *bss = (mlan_ds_bss *) pioctl_req->pbuf; - ENTER(); + ENTER(); - ret = wlan_disconnect(pmpriv, pioctl_req, &bss->param.bssid); + ret = wlan_disconnect(pmpriv, pioctl_req, &bss->param.bssid); - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief Set/Get IBSS channel * * @param pmadapter A pointer to mlan_adapter structure @@ -1181,43 +1249,44 @@ wlan_bss_ioctl_stop(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_bss_ioctl_ibss_channel(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_bss *bss = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u16 cmd_action; - - ENTER(); - - bss = (mlan_ds_bss *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) { - if (pmpriv->media_connected == MFALSE) { - bss->param.bss_chan.channel = pmpriv->adhoc_channel; - goto exit; - } - cmd_action = HostCmd_ACT_GEN_GET; - } else { - cmd_action = HostCmd_ACT_GEN_SET; - pmpriv->adhoc_channel = (t_u8) bss->param.bss_chan.channel; - pmpriv->intf_state_11h.adhoc_auto_sel_chan = MFALSE; - } - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_RF_CHANNEL, - cmd_action, - 0, - (t_void *) pioctl_req, &bss->param.bss_chan.channel); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - exit: - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_bss *bss = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u16 cmd_action; + + ENTER(); + + bss = (mlan_ds_bss *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) { + if (pmpriv->media_connected == MFALSE) { + bss->param.bss_chan.channel = pmpriv->adhoc_channel; + goto exit; + } + cmd_action = HostCmd_ACT_GEN_GET; + } else { + cmd_action = HostCmd_ACT_GEN_SET; + pmpriv->adhoc_channel = (t_u8) bss->param.bss_chan.channel; + pmpriv->intf_state_11h.adhoc_auto_sel_chan = MFALSE; + } + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_RF_CHANNEL, + cmd_action, + 0, + (t_void *) pioctl_req, + &bss->param.bss_chan.channel); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +exit: + LEAVE(); + return ret; } -/** +/** * @brief Set/Get Listen Interval * * @param pmadapter A pointer to mlan_adapter structure @@ -1227,21 +1296,21 @@ wlan_bss_ioctl_ibss_channel(IN pmlan_adapter pmadapter, */ static mlan_status wlan_bss_ioctl_listen_interval(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_bss *bss = MNULL; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_bss *bss = MNULL; - ENTER(); + ENTER(); - bss = (mlan_ds_bss *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) - bss->param.listen_interval = pmpriv->listen_interval; - else - pmpriv->listen_interval = bss->param.listen_interval; + bss = (mlan_ds_bss *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) + bss->param.listen_interval = pmpriv->listen_interval; + else + pmpriv->listen_interval = bss->param.listen_interval; - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } /* @@ -1254,26 +1323,27 @@ wlan_bss_ioctl_listen_interval(IN pmlan_adapter pmadapter, */ static mlan_status wlan_bss_ioctl_beacon_interval(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_bss *bss = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - ENTER(); - bss = (mlan_ds_bss *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) { - bss->param.bcn_interval = pmpriv->beacon_period; - if (pmpriv->media_connected == MTRUE) - bss->param.bcn_interval = - pmpriv->curr_bss_params.bss_descriptor.beacon_period; - } else - pmpriv->beacon_period = (t_u16) bss->param.bcn_interval; - pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_bss *bss = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + ENTER(); + bss = (mlan_ds_bss *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) { + bss->param.bcn_interval = pmpriv->beacon_period; + if (pmpriv->media_connected == MTRUE) + bss->param.bcn_interval = + pmpriv->curr_bss_params.bss_descriptor. + beacon_period; + } else + pmpriv->beacon_period = (t_u16) bss->param.bcn_interval; + pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; + LEAVE(); + return ret; } -/** +/** * @brief Set/Get ATIM window * * @param pmadapter A pointer to mlan_adapter structure @@ -1283,78 +1353,79 @@ wlan_bss_ioctl_beacon_interval(IN pmlan_adapter pmadapter, */ static mlan_status wlan_bss_ioctl_atim_window(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_bss *bss = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - ENTER(); - bss = (mlan_ds_bss *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) { - bss->param.atim_window = pmpriv->atim_window; - if (pmpriv->media_connected == MTRUE) - bss->param.atim_window = - pmpriv->curr_bss_params.bss_descriptor.atim_window; - } else - pmpriv->atim_window = (t_u16) bss->param.atim_window; - - pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_bss *bss = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + ENTER(); + bss = (mlan_ds_bss *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) { + bss->param.atim_window = pmpriv->atim_window; + if (pmpriv->media_connected == MTRUE) + bss->param.atim_window = + pmpriv->curr_bss_params.bss_descriptor. + atim_window; + } else + pmpriv->atim_window = (t_u16) bss->param.atim_window; + + pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; + LEAVE(); + return ret; } -/** +/** * @brief Query embe * * @param priv A pointer to mlan_private structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ static mlan_status wlan_query_passphrase(mlan_private * priv, pmlan_ioctl_req pioctl_req) { - mlan_adapter *pmadapter = priv->adapter; - mlan_ds_bss *bss = MNULL; - mlan_ssid_bssid *ssid_bssid = MNULL; - mlan_ds_passphrase sec_pp; - int i = 0; - BSSDescriptor_t *pbss_desc; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - bss = (mlan_ds_bss *) pioctl_req->pbuf; - ssid_bssid = &bss->param.ssid_bssid; - - memset(pmadapter, &sec_pp, 0, sizeof(mlan_ds_passphrase)); - sec_pp.psk_type = MLAN_PSK_QUERY; - if (ssid_bssid->ssid.ssid_len == 0) { - i = wlan_find_bssid_in_list(priv, (t_u8 *) & ssid_bssid->bssid, - MLAN_BSS_MODE_AUTO); - if (i >= 0) { - pbss_desc = &pmadapter->pscan_table[i]; - memcpy(pmadapter, &sec_pp.ssid, &pbss_desc->ssid, - sizeof(mlan_802_11_ssid)); - } else - memcpy(pmadapter, &sec_pp.bssid, &ssid_bssid->bssid, - MLAN_MAC_ADDR_LENGTH); - } else { - memcpy(pmadapter, &sec_pp.ssid, &ssid_bssid->ssid, - sizeof(mlan_802_11_ssid)); - } - - /* Send request to firmware */ - ret = wlan_prepare_cmd(priv, - HostCmd_CMD_SUPPLICANT_PMK, - HostCmd_ACT_GEN_GET, - 0, (t_void *) pioctl_req, &sec_pp); - - LEAVE(); - return ret; + mlan_adapter *pmadapter = priv->adapter; + mlan_ds_bss *bss = MNULL; + mlan_ssid_bssid *ssid_bssid = MNULL; + mlan_ds_passphrase sec_pp; + int i = 0; + BSSDescriptor_t *pbss_desc; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + bss = (mlan_ds_bss *) pioctl_req->pbuf; + ssid_bssid = &bss->param.ssid_bssid; + + memset(pmadapter, &sec_pp, 0, sizeof(mlan_ds_passphrase)); + sec_pp.psk_type = MLAN_PSK_QUERY; + if (ssid_bssid->ssid.ssid_len == 0) { + i = wlan_find_bssid_in_list(priv, (t_u8 *) & ssid_bssid->bssid, + MLAN_BSS_MODE_AUTO); + if (i >= 0) { + pbss_desc = &pmadapter->pscan_table[i]; + memcpy(pmadapter, &sec_pp.ssid, &pbss_desc->ssid, + sizeof(mlan_802_11_ssid)); + } else + memcpy(pmadapter, &sec_pp.bssid, &ssid_bssid->bssid, + MLAN_MAC_ADDR_LENGTH); + } else { + memcpy(pmadapter, &sec_pp.ssid, &ssid_bssid->ssid, + sizeof(mlan_802_11_ssid)); + } + + /* Send request to firmware */ + ret = wlan_prepare_cmd(priv, + HostCmd_CMD_SUPPLICANT_PMK, + HostCmd_ACT_GEN_GET, + 0, (t_void *) pioctl_req, &sec_pp); + + LEAVE(); + return ret; } -/** +/** * @brief Search for a BSS * * @param pmadapter A pointer to mlan_adapter structure @@ -1364,27 +1435,28 @@ wlan_query_passphrase(mlan_private * priv, pmlan_ioctl_req pioctl_req) */ mlan_status wlan_bss_ioctl_find_bss(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - if (pmpriv->ewpa_query) { - if (wlan_query_passphrase(pmpriv, pioctl_req) == MLAN_STATUS_SUCCESS) { - PRINTM(MINFO, "Find BSS ioctl: query passphrase\n"); - LEAVE(); - return MLAN_STATUS_PENDING; - } - } - ret = wlan_find_bss(pmpriv, pioctl_req); - - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + if (pmpriv->ewpa_query) { + if (wlan_query_passphrase(pmpriv, pioctl_req) == + MLAN_STATUS_SUCCESS) { + PRINTM(MINFO, "Find BSS ioctl: query passphrase\n"); + LEAVE(); + return MLAN_STATUS_PENDING; + } + } + ret = wlan_find_bss(pmpriv, pioctl_req); + + LEAVE(); + return ret; } -/** +/** * @brief BSS command handler * * @param pmadapter A pointer to mlan_adapter structure @@ -1395,82 +1467,83 @@ wlan_bss_ioctl_find_bss(IN pmlan_adapter pmadapter, static mlan_status wlan_bss_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_bss *bss = MNULL; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_bss)) { - PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_bss); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - - bss = (mlan_ds_bss *) pioctl_req->pbuf; - - switch (bss->sub_command) { - case MLAN_OID_BSS_START: - status = wlan_bss_ioctl_start(pmadapter, pioctl_req); - break; - case MLAN_OID_BSS_STOP: - status = wlan_bss_ioctl_stop(pmadapter, pioctl_req); - break; - case MLAN_OID_BSS_MODE: - status = wlan_bss_ioctl_mode(pmadapter, pioctl_req); - break; - case MLAN_OID_BSS_CHANNEL: - status = wlan_bss_ioctl_channel(pmadapter, pioctl_req); - break; - case MLAN_OID_BSS_CHANNEL_LIST: - status = wlan_bss_ioctl_get_channel_list(pmadapter, pioctl_req); - break; - case MLAN_OID_BSS_MAC_ADDR: - status = wlan_bss_ioctl_mac_address(pmadapter, pioctl_req); - break; - case MLAN_OID_BSS_MULTICAST_LIST: - status = wlan_bss_ioctl_set_multicast_list(pmadapter, pioctl_req); - break; - case MLAN_OID_BSS_FIND_BSS: - status = wlan_bss_ioctl_find_bss(pmadapter, pioctl_req); - break; - case MLAN_OID_IBSS_BCN_INTERVAL: - status = wlan_bss_ioctl_beacon_interval(pmadapter, pioctl_req); - break; - case MLAN_OID_IBSS_ATIM_WINDOW: - status = wlan_bss_ioctl_atim_window(pmadapter, pioctl_req); - break; - case MLAN_OID_IBSS_CHANNEL: - status = wlan_bss_ioctl_ibss_channel(pmadapter, pioctl_req); - break; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_bss *bss = MNULL; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_bss)) { + PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_bss); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + + bss = (mlan_ds_bss *) pioctl_req->pbuf; + + switch (bss->sub_command) { + case MLAN_OID_BSS_START: + status = wlan_bss_ioctl_start(pmadapter, pioctl_req); + break; + case MLAN_OID_BSS_STOP: + status = wlan_bss_ioctl_stop(pmadapter, pioctl_req); + break; + case MLAN_OID_BSS_MODE: + status = wlan_bss_ioctl_mode(pmadapter, pioctl_req); + break; + case MLAN_OID_BSS_CHANNEL: + status = wlan_bss_ioctl_channel(pmadapter, pioctl_req); + break; + case MLAN_OID_BSS_CHANNEL_LIST: + status = wlan_bss_ioctl_get_channel_list(pmadapter, pioctl_req); + break; + case MLAN_OID_BSS_MAC_ADDR: + status = wlan_bss_ioctl_mac_address(pmadapter, pioctl_req); + break; + case MLAN_OID_BSS_MULTICAST_LIST: + status = wlan_bss_ioctl_set_multicast_list(pmadapter, + pioctl_req); + break; + case MLAN_OID_BSS_FIND_BSS: + status = wlan_bss_ioctl_find_bss(pmadapter, pioctl_req); + break; + case MLAN_OID_IBSS_BCN_INTERVAL: + status = wlan_bss_ioctl_beacon_interval(pmadapter, pioctl_req); + break; + case MLAN_OID_IBSS_ATIM_WINDOW: + status = wlan_bss_ioctl_atim_window(pmadapter, pioctl_req); + break; + case MLAN_OID_IBSS_CHANNEL: + status = wlan_bss_ioctl_ibss_channel(pmadapter, pioctl_req); + break; #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) - case MLAN_OID_BSS_ROLE: - status = wlan_bss_ioctl_bss_role(pmadapter, pioctl_req); - break; + case MLAN_OID_BSS_ROLE: + status = wlan_bss_ioctl_bss_role(pmadapter, pioctl_req); + break; #endif #ifdef WIFI_DIRECT_SUPPORT - case MLAN_OID_WIFI_DIRECT_MODE: - status = wlan_bss_ioctl_wifi_direct_mode(pmadapter, pioctl_req); - break; + case MLAN_OID_WIFI_DIRECT_MODE: + status = wlan_bss_ioctl_wifi_direct_mode(pmadapter, pioctl_req); + break; #endif - case MLAN_OID_BSS_LISTEN_INTERVAL: - status = wlan_bss_ioctl_listen_interval(pmadapter, pioctl_req); - break; - case MLAN_OID_BSS_REMOVE: - status = wlan_bss_ioctl_bss_remove(pmadapter, pioctl_req); - break; - default: - status = MLAN_STATUS_FAILURE; - break; - } - - LEAVE(); - return status; + case MLAN_OID_BSS_LISTEN_INTERVAL: + status = wlan_bss_ioctl_listen_interval(pmadapter, pioctl_req); + break; + case MLAN_OID_BSS_REMOVE: + status = wlan_bss_ioctl_bss_remove(pmadapter, pioctl_req); + break; + default: + status = MLAN_STATUS_FAILURE; + break; + } + + LEAVE(); + return status; } -/** +/** * @brief Get supported rates * * @param pmadapter A pointer to mlan_adapter structure @@ -1480,36 +1553,38 @@ wlan_bss_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_rate_ioctl_get_supported_rate(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_rate *rate = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - if (pioctl_req->action != MLAN_ACT_GET) { - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - rate = (mlan_ds_rate *) pioctl_req->pbuf; - if (rate->param.rate_band_cfg.config_bands && - rate->param.rate_band_cfg.bss_mode) - wlan_get_active_data_rates(pmpriv, rate->param.rate_band_cfg.bss_mode, - rate->param.rate_band_cfg.config_bands, - rate->param.rates); - else - wlan_get_active_data_rates(pmpriv, pmpriv->bss_mode, - (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) ? - pmpriv->config_bands : pmadapter-> - adhoc_start_band, rate->param.rates); - pioctl_req->data_read_written = - MLAN_SUPPORTED_RATES + MLAN_SUB_COMMAND_SIZE; - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_rate *rate = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + if (pioctl_req->action != MLAN_ACT_GET) { + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + rate = (mlan_ds_rate *) pioctl_req->pbuf; + if (rate->param.rate_band_cfg.config_bands && + rate->param.rate_band_cfg.bss_mode) + wlan_get_active_data_rates(pmpriv, + rate->param.rate_band_cfg.bss_mode, + rate->param.rate_band_cfg. + config_bands, rate->param.rates); + else + wlan_get_active_data_rates(pmpriv, pmpriv->bss_mode, + (pmpriv->bss_mode == + MLAN_BSS_MODE_INFRA) ? pmpriv-> + config_bands : pmadapter-> + adhoc_start_band, rate->param.rates); + pioctl_req->data_read_written = + MLAN_SUPPORTED_RATES + MLAN_SUB_COMMAND_SIZE; + LEAVE(); + return ret; } -/** +/** * @brief Rate command handler * * @param pmadapter A pointer to mlan_adapter structure @@ -1520,40 +1595,41 @@ wlan_rate_ioctl_get_supported_rate(IN pmlan_adapter pmadapter, static mlan_status wlan_rate_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_rate *rate = MNULL; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_rate)) { - PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_rate); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - rate = (mlan_ds_rate *) pioctl_req->pbuf; - switch (rate->sub_command) { - case MLAN_OID_RATE_CFG: - status = wlan_rate_ioctl_cfg(pmadapter, pioctl_req); - break; - case MLAN_OID_GET_DATA_RATE: - status = wlan_rate_ioctl_get_data_rate(pmadapter, pioctl_req); - break; - case MLAN_OID_SUPPORTED_RATES: - status = wlan_rate_ioctl_get_supported_rate(pmadapter, pioctl_req); - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - LEAVE(); - return status; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_rate *rate = MNULL; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_rate)) { + PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_rate); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + rate = (mlan_ds_rate *) pioctl_req->pbuf; + switch (rate->sub_command) { + case MLAN_OID_RATE_CFG: + status = wlan_rate_ioctl_cfg(pmadapter, pioctl_req); + break; + case MLAN_OID_GET_DATA_RATE: + status = wlan_rate_ioctl_get_data_rate(pmadapter, pioctl_req); + break; + case MLAN_OID_SUPPORTED_RATES: + status = wlan_rate_ioctl_get_supported_rate(pmadapter, + pioctl_req); + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + LEAVE(); + return status; } -/** +/** * @brief Get Tx power configuration * * @param pmadapter A pointer to mlan_adapter structure @@ -1564,27 +1640,27 @@ wlan_rate_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_power_ioctl_get_power(IN pmlan_adapter pmadapter, - IN t_u16 cmd_no, IN pmlan_ioctl_req pioctl_req) + IN t_u16 cmd_no, IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - ENTER(); + ENTER(); - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - cmd_no, - HostCmd_ACT_GEN_GET, - 0, (t_void *) pioctl_req, MNULL); + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + cmd_no, + HostCmd_ACT_GEN_GET, + 0, (t_void *) pioctl_req, MNULL); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief Set Tx power configuration * * @param pmadapter A pointer to mlan_adapter structure @@ -1594,106 +1670,110 @@ wlan_power_ioctl_get_power(IN pmlan_adapter pmadapter, */ static mlan_status wlan_power_ioctl_set_power(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_ds_power_cfg *power = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - - HostCmd_DS_TXPWR_CFG *txp_cfg = MNULL; - MrvlTypes_Power_Group_t *pg_tlv = MNULL; - Power_Group_t *pg = MNULL; - pmlan_callbacks pcb = &pmadapter->callbacks; - t_u8 *buf = MNULL; - t_s8 dbm = 0; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - - ENTER(); - - power = (mlan_ds_power_cfg *) pioctl_req->pbuf; - if (!power->param.power_cfg.is_power_auto) { - dbm = (t_s8) power->param.power_cfg.power_level; - if ((dbm < pmpriv->min_tx_power_level) || - (dbm > pmpriv->max_tx_power_level)) { - PRINTM(MERROR, - "The set txpower value %d dBm is out of range (%d dBm-%d dBm)!\n", - dbm, pmpriv->min_tx_power_level, pmpriv->max_tx_power_level); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - } - - ret = pcb->moal_malloc(pmadapter->pmoal_handle, - MRVDRV_SIZE_OF_CMD_BUFFER, MLAN_MEM_DEF, &buf); - if (ret != MLAN_STATUS_SUCCESS || buf == MNULL) { - PRINTM(MERROR, "ALLOC_CMD_BUF: Failed to allocate command buffer\n"); - pioctl_req->status_code = MLAN_ERROR_NO_MEM; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - memset(pmadapter, buf, 0, MRVDRV_SIZE_OF_CMD_BUFFER); - txp_cfg = (HostCmd_DS_TXPWR_CFG *) buf; - txp_cfg->action = HostCmd_ACT_GEN_SET; - if (!power->param.power_cfg.is_power_auto) { - txp_cfg->mode = 1; - pg_tlv = (MrvlTypes_Power_Group_t *) (buf + - sizeof(HostCmd_DS_TXPWR_CFG)); - pg_tlv->type = TLV_TYPE_POWER_GROUP; - pg_tlv->length = 4 * sizeof(Power_Group_t); - pg = (Power_Group_t *) (buf + sizeof(HostCmd_DS_TXPWR_CFG) + - sizeof(MrvlTypes_Power_Group_t)); - /* Power group for modulation class HR/DSSS */ - pg->first_rate_code = 0x00; - pg->last_rate_code = 0x03; - pg->modulation_class = MOD_CLASS_HR_DSSS; - pg->power_step = 0; - pg->power_min = (t_s8) dbm; - pg->power_max = (t_s8) dbm; - pg++; - /* Power group for modulation class OFDM */ - pg->first_rate_code = 0x00; - pg->last_rate_code = 0x07; - pg->modulation_class = MOD_CLASS_OFDM; - pg->power_step = 0; - pg->power_min = (t_s8) dbm; - pg->power_max = (t_s8) dbm; - pg++; - /* Power group for modulation class HTBW20 */ - pg->first_rate_code = 0x00; - pg->last_rate_code = 0x20; - pg->modulation_class = MOD_CLASS_HT; - pg->power_step = 0; - pg->power_min = (t_s8) dbm; - pg->power_max = (t_s8) dbm; - pg->ht_bandwidth = HT_BW_20; - pg++; - /* Power group for modulation class HTBW40 */ - pg->first_rate_code = 0x00; - pg->last_rate_code = 0x20; - pg->modulation_class = MOD_CLASS_HT; - pg->power_step = 0; - pg->power_min = (t_s8) dbm; - pg->power_max = (t_s8) dbm; - pg->ht_bandwidth = HT_BW_40; - } - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_TXPWR_CFG, - HostCmd_ACT_GEN_SET, 0, (t_void *) pioctl_req, buf); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - if (buf) - pcb->moal_mfree(pmadapter->pmoal_handle, buf); - - exit: - LEAVE(); - return ret; + mlan_ds_power_cfg *power = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + + HostCmd_DS_TXPWR_CFG *txp_cfg = MNULL; + MrvlTypes_Power_Group_t *pg_tlv = MNULL; + Power_Group_t *pg = MNULL; + pmlan_callbacks pcb = &pmadapter->callbacks; + t_u8 *buf = MNULL; + t_s8 dbm = 0; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + + ENTER(); + + power = (mlan_ds_power_cfg *) pioctl_req->pbuf; + if (!power->param.power_cfg.is_power_auto) { + dbm = (t_s8) power->param.power_cfg.power_level; + if ((dbm < pmpriv->min_tx_power_level) || + (dbm > pmpriv->max_tx_power_level)) { + PRINTM(MERROR, + "The set txpower value %d dBm is out of range (%d dBm-%d dBm)!\n", + dbm, pmpriv->min_tx_power_level, + pmpriv->max_tx_power_level); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + } + + ret = pcb->moal_malloc(pmadapter->pmoal_handle, + MRVDRV_SIZE_OF_CMD_BUFFER, MLAN_MEM_DEF, &buf); + if (ret != MLAN_STATUS_SUCCESS || buf == MNULL) { + PRINTM(MERROR, + "ALLOC_CMD_BUF: Failed to allocate command buffer\n"); + pioctl_req->status_code = MLAN_ERROR_NO_MEM; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + memset(pmadapter, buf, 0, MRVDRV_SIZE_OF_CMD_BUFFER); + txp_cfg = (HostCmd_DS_TXPWR_CFG *) buf; + txp_cfg->action = HostCmd_ACT_GEN_SET; + if (!power->param.power_cfg.is_power_auto) { + txp_cfg->mode = 1; + pg_tlv = (MrvlTypes_Power_Group_t *) (buf + + sizeof + (HostCmd_DS_TXPWR_CFG)); + pg_tlv->type = TLV_TYPE_POWER_GROUP; + pg_tlv->length = 4 * sizeof(Power_Group_t); + pg = (Power_Group_t *) (buf + sizeof(HostCmd_DS_TXPWR_CFG) + + sizeof(MrvlTypes_Power_Group_t)); + /* Power group for modulation class HR/DSSS */ + pg->first_rate_code = 0x00; + pg->last_rate_code = 0x03; + pg->modulation_class = MOD_CLASS_HR_DSSS; + pg->power_step = 0; + pg->power_min = (t_s8) dbm; + pg->power_max = (t_s8) dbm; + pg++; + /* Power group for modulation class OFDM */ + pg->first_rate_code = 0x00; + pg->last_rate_code = 0x07; + pg->modulation_class = MOD_CLASS_OFDM; + pg->power_step = 0; + pg->power_min = (t_s8) dbm; + pg->power_max = (t_s8) dbm; + pg++; + /* Power group for modulation class HTBW20 */ + pg->first_rate_code = 0x00; + pg->last_rate_code = 0x20; + pg->modulation_class = MOD_CLASS_HT; + pg->power_step = 0; + pg->power_min = (t_s8) dbm; + pg->power_max = (t_s8) dbm; + pg->ht_bandwidth = HT_BW_20; + pg++; + /* Power group for modulation class HTBW40 */ + pg->first_rate_code = 0x00; + pg->last_rate_code = 0x20; + pg->modulation_class = MOD_CLASS_HT; + pg->power_step = 0; + pg->power_min = (t_s8) dbm; + pg->power_max = (t_s8) dbm; + pg->ht_bandwidth = HT_BW_40; + } + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_TXPWR_CFG, + HostCmd_ACT_GEN_SET, + 0, (t_void *) pioctl_req, buf); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + if (buf) + pcb->moal_mfree(pmadapter->pmoal_handle, buf); + +exit: + LEAVE(); + return ret; } -/** +/** * @brief Set extended power configuration * * @param pmadapter A pointer to mlan_adapter structure @@ -1703,96 +1783,104 @@ wlan_power_ioctl_set_power(IN pmlan_adapter pmadapter, */ static mlan_status wlan_power_ioctl_set_power_ext(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_power_cfg *power = MNULL; - pmlan_callbacks pcb = &pmadapter->callbacks; - t_u8 *buf = MNULL; - HostCmd_DS_TXPWR_CFG *txp_cfg = MNULL; - MrvlTypes_Power_Group_t *pg_tlv = MNULL; - Power_Group_t *pg = MNULL; - mlan_power_group *pwr_grp = MNULL; - - ENTER(); - - power = (mlan_ds_power_cfg *) pioctl_req->pbuf; - ret = - pcb->moal_malloc(pmadapter->pmoal_handle, MRVDRV_SIZE_OF_CMD_BUFFER, - MLAN_MEM_DEF, &buf); - if (ret != MLAN_STATUS_SUCCESS || buf == MNULL) { - PRINTM(MERROR, "ALLOC_CMD_BUF: Failed to allocate command buffer\n"); - pioctl_req->status_code = MLAN_ERROR_NO_MEM; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - memset(pmadapter, buf, 0, MRVDRV_SIZE_OF_CMD_BUFFER); - txp_cfg = (HostCmd_DS_TXPWR_CFG *) buf; - txp_cfg->action = HostCmd_ACT_GEN_SET; - pwr_grp = &power->param.power_ext.power_group[0]; - if (pwr_grp->rate_format == TX_PWR_CFG_AUTO_CTRL_OFF) - txp_cfg->mode = 0; - else { - txp_cfg->mode = 1; - - pg_tlv = - (MrvlTypes_Power_Group_t *) (buf + sizeof(HostCmd_DS_TXPWR_CFG)); - pg_tlv->type = TLV_TYPE_POWER_GROUP; - pg_tlv->length = sizeof(Power_Group_t); - pg = (Power_Group_t *) (buf + sizeof(HostCmd_DS_TXPWR_CFG) + - sizeof(MrvlTypes_Power_Group_t)); - pg->ht_bandwidth = pwr_grp->bandwidth; - pg->power_min = (t_s8) pwr_grp->power_min; - pg->power_max = (t_s8) pwr_grp->power_max; - pg->power_step = (t_s8) pwr_grp->power_step; - - if (pwr_grp->rate_format == MLAN_RATE_FORMAT_LG) { - if (pwr_grp->first_rate_ind <= MLAN_RATE_INDEX_HRDSSS3) { - pg->modulation_class = MOD_CLASS_HR_DSSS; - } else { - pg->modulation_class = MOD_CLASS_OFDM; - pwr_grp->first_rate_ind -= MLAN_RATE_INDEX_OFDM0; - pwr_grp->last_rate_ind -= MLAN_RATE_INDEX_OFDM0; - } - pg->first_rate_code = (t_u8) pwr_grp->first_rate_ind; - pg->last_rate_code = (t_u8) pwr_grp->last_rate_ind; - } else if (pwr_grp->rate_format == MLAN_RATE_FORMAT_HT) { - pg->modulation_class = MOD_CLASS_HT; - pg->first_rate_code = (t_u8) pwr_grp->first_rate_ind; - pg->last_rate_code = (t_u8) pwr_grp->last_rate_ind; - } else if (pwr_grp->rate_format == MLAN_RATE_FORMAT_VHT) { - pg->modulation_class = MOD_CLASS_VHT; - pg->first_rate_code = (t_u8) ((pwr_grp->first_rate_ind & 0xF) | - ((pwr_grp->nss - 1) << 4)); - pg->last_rate_code = (t_u8) ((pwr_grp->last_rate_ind & 0xF) | - ((pwr_grp->nss - 1) << 4)); - } else { - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - } - } - if (ret == MLAN_STATUS_FAILURE) { - if (buf) - pcb->moal_mfree(pmadapter->pmoal_handle, buf); - goto exit; - } - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_TXPWR_CFG, - HostCmd_ACT_GEN_SET, 0, (t_void *) pioctl_req, buf); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - if (buf) - pcb->moal_mfree(pmadapter->pmoal_handle, buf); - - exit: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_power_cfg *power = MNULL; + pmlan_callbacks pcb = &pmadapter->callbacks; + t_u8 *buf = MNULL; + HostCmd_DS_TXPWR_CFG *txp_cfg = MNULL; + MrvlTypes_Power_Group_t *pg_tlv = MNULL; + Power_Group_t *pg = MNULL; + mlan_power_group *pwr_grp = MNULL; + + ENTER(); + + power = (mlan_ds_power_cfg *) pioctl_req->pbuf; + ret = pcb->moal_malloc(pmadapter->pmoal_handle, + MRVDRV_SIZE_OF_CMD_BUFFER, MLAN_MEM_DEF, &buf); + if (ret != MLAN_STATUS_SUCCESS || buf == MNULL) { + PRINTM(MERROR, + "ALLOC_CMD_BUF: Failed to allocate command buffer\n"); + pioctl_req->status_code = MLAN_ERROR_NO_MEM; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + memset(pmadapter, buf, 0, MRVDRV_SIZE_OF_CMD_BUFFER); + txp_cfg = (HostCmd_DS_TXPWR_CFG *) buf; + txp_cfg->action = HostCmd_ACT_GEN_SET; + pwr_grp = &power->param.power_ext.power_group[0]; + if (pwr_grp->rate_format == TX_PWR_CFG_AUTO_CTRL_OFF) + txp_cfg->mode = 0; + else { + txp_cfg->mode = 1; + + pg_tlv = (MrvlTypes_Power_Group_t *) (buf + + sizeof + (HostCmd_DS_TXPWR_CFG)); + pg_tlv->type = TLV_TYPE_POWER_GROUP; + pg_tlv->length = sizeof(Power_Group_t); + pg = (Power_Group_t *) (buf + sizeof(HostCmd_DS_TXPWR_CFG) + + sizeof(MrvlTypes_Power_Group_t)); + pg->ht_bandwidth = pwr_grp->bandwidth; + pg->power_min = (t_s8) pwr_grp->power_min; + pg->power_max = (t_s8) pwr_grp->power_max; + pg->power_step = (t_s8) pwr_grp->power_step; + + if (pwr_grp->rate_format == MLAN_RATE_FORMAT_LG) { + if (pwr_grp->first_rate_ind <= MLAN_RATE_INDEX_HRDSSS3) { + pg->modulation_class = MOD_CLASS_HR_DSSS; + } else { + pg->modulation_class = MOD_CLASS_OFDM; + pwr_grp->first_rate_ind -= + MLAN_RATE_INDEX_OFDM0; + pwr_grp->last_rate_ind -= MLAN_RATE_INDEX_OFDM0; + } + pg->first_rate_code = (t_u8) pwr_grp->first_rate_ind; + pg->last_rate_code = (t_u8) pwr_grp->last_rate_ind; + } else if (pwr_grp->rate_format == MLAN_RATE_FORMAT_HT) { + pg->modulation_class = MOD_CLASS_HT; + pg->first_rate_code = (t_u8) pwr_grp->first_rate_ind; + pg->last_rate_code = (t_u8) pwr_grp->last_rate_ind; + } else if (pwr_grp->rate_format == MLAN_RATE_FORMAT_VHT) { + pg->modulation_class = MOD_CLASS_VHT; + pg->first_rate_code = + (t_u8) ((pwr_grp-> + first_rate_ind & 0xF) | ((pwr_grp-> + nss - + 1) << 4)); + pg->last_rate_code = + (t_u8) ((pwr_grp-> + last_rate_ind & 0xF) | ((pwr_grp->nss - + 1) << 4)); + } else { + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + } + } + if (ret == MLAN_STATUS_FAILURE) { + if (buf) + pcb->moal_mfree(pmadapter->pmoal_handle, buf); + goto exit; + } + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_TXPWR_CFG, + HostCmd_ACT_GEN_SET, + 0, (t_void *) pioctl_req, buf); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + if (buf) + pcb->moal_mfree(pmadapter->pmoal_handle, buf); + +exit: + LEAVE(); + return ret; } -/** +/** * @brief Power configuration command handler * * @param pmadapter A pointer to mlan_adapter structure @@ -1803,48 +1891,50 @@ wlan_power_ioctl_set_power_ext(IN pmlan_adapter pmadapter, static mlan_status wlan_power_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_power_cfg *power = MNULL; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_power_cfg)) { - PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_power_cfg); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - power = (mlan_ds_power_cfg *) pioctl_req->pbuf; - switch (power->sub_command) { - case MLAN_OID_POWER_CFG: - if (pioctl_req->action == MLAN_ACT_GET) - status = wlan_power_ioctl_get_power(pmadapter, - HostCmd_CMD_TXPWR_CFG, - pioctl_req); - else - status = wlan_power_ioctl_set_power(pmadapter, pioctl_req); - break; - - case MLAN_OID_POWER_CFG_EXT: - if (pioctl_req->action == MLAN_ACT_GET) - status = wlan_power_ioctl_get_power(pmadapter, - HostCmd_CMD_TXPWR_CFG, - pioctl_req); - else - status = wlan_power_ioctl_set_power_ext(pmadapter, pioctl_req); - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - LEAVE(); - return status; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_power_cfg *power = MNULL; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_power_cfg)) { + PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_power_cfg); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + power = (mlan_ds_power_cfg *) pioctl_req->pbuf; + switch (power->sub_command) { + case MLAN_OID_POWER_CFG: + if (pioctl_req->action == MLAN_ACT_GET) + status = wlan_power_ioctl_get_power(pmadapter, + HostCmd_CMD_TXPWR_CFG, + pioctl_req); + else + status = wlan_power_ioctl_set_power(pmadapter, + pioctl_req); + break; + + case MLAN_OID_POWER_CFG_EXT: + if (pioctl_req->action == MLAN_ACT_GET) + status = wlan_power_ioctl_get_power(pmadapter, + HostCmd_CMD_TXPWR_CFG, + pioctl_req); + else + status = wlan_power_ioctl_set_power_ext(pmadapter, + pioctl_req); + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + LEAVE(); + return status; } -/** +/** * @brief Set power save configurations * * @param pmadapter A pointer to mlan_adapter structure @@ -1855,39 +1945,40 @@ wlan_power_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_pm_ioctl_ps_mode(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req, IN t_u16 ps_mode) + IN pmlan_ioctl_req pioctl_req, IN t_u16 ps_mode) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - t_u16 sub_cmd; - - ENTER(); - - if (pioctl_req->action == MLAN_ACT_SET) { - sub_cmd = (pmadapter->ps_mode == Wlan802_11PowerModePSP) ? - EN_AUTO_PS : DIS_AUTO_PS; - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_PS_MODE_ENH, sub_cmd, - BITMAP_STA_PS, (t_void *) pioctl_req, MNULL); - if ((ret == MLAN_STATUS_SUCCESS) && (sub_cmd == DIS_AUTO_PS)) { - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_PS_MODE_ENH, GET_PS, - 0, MNULL, MNULL); - } - } else { - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_PS_MODE_ENH, GET_PS, - 0, (t_void *) pioctl_req, MNULL); - } - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + t_u16 sub_cmd; + + ENTER(); + + if (pioctl_req->action == MLAN_ACT_SET) { + sub_cmd = (pmadapter->ps_mode == Wlan802_11PowerModePSP) ? + EN_AUTO_PS : DIS_AUTO_PS; + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_PS_MODE_ENH, sub_cmd, + BITMAP_STA_PS, (t_void *) pioctl_req, + MNULL); + if ((ret == MLAN_STATUS_SUCCESS) && (sub_cmd == DIS_AUTO_PS)) { + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_PS_MODE_ENH, + GET_PS, 0, MNULL, MNULL); + } + } else { + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_PS_MODE_ENH, GET_PS, + 0, (t_void *) pioctl_req, MNULL); + } + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } -/** +/** * @brief Set/Get Inactivity timeout extend * * @param pmadapter A pointer to mlan_adapter structure @@ -1897,37 +1988,37 @@ wlan_pm_ioctl_ps_mode(IN pmlan_adapter pmadapter, */ static mlan_status wlan_pm_ioctl_inactivity_timeout(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_pm_cfg *pmcfg = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u16 cmd_action = 0; - - ENTER(); - - pmcfg = (mlan_ds_pm_cfg *) pioctl_req->pbuf; - cmd_action = HostCmd_ACT_GEN_GET; - if (pioctl_req->action == MLAN_ACT_SET) { - cmd_action = HostCmd_ACT_GEN_SET; - } - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_INACTIVITY_TIMEOUT_EXT, - cmd_action, 0, (t_void *) pioctl_req, - (t_void *) & pmcfg->param.inactivity_to); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_pm_cfg *pmcfg = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u16 cmd_action = 0; + + ENTER(); + + pmcfg = (mlan_ds_pm_cfg *) pioctl_req->pbuf; + cmd_action = HostCmd_ACT_GEN_GET; + if (pioctl_req->action == MLAN_ACT_SET) { + cmd_action = HostCmd_ACT_GEN_SET; + } + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_INACTIVITY_TIMEOUT_EXT, + cmd_action, 0, (t_void *) pioctl_req, + (t_void *) & pmcfg->param.inactivity_to); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } -/** +/** * @brief Enable/Disable Auto Deep Sleep - * + * * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * @@ -1935,48 +2026,49 @@ wlan_pm_ioctl_inactivity_timeout(IN pmlan_adapter pmadapter, */ static mlan_status wlan_set_auto_deep_sleep(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = - (pmlan_private) pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_auto_ds auto_ds; - t_u32 mode; - - ENTER(); - - if (((mlan_ds_pm_cfg *) pioctl_req->pbuf)->param.auto_deep_sleep.auto_ds == - DEEP_SLEEP_ON) { - auto_ds.auto_ds = DEEP_SLEEP_ON; - PRINTM(MINFO, "Auto Deep Sleep: on\n"); - mode = EN_AUTO_PS; - } else { - auto_ds.auto_ds = DEEP_SLEEP_OFF; - PRINTM(MINFO, "Auto Deep Sleep: off\n"); - mode = DIS_AUTO_PS; - } - if (((mlan_ds_pm_cfg *) pioctl_req->pbuf)->param.auto_deep_sleep.idletime) - auto_ds.idletime = - ((mlan_ds_pm_cfg *) pioctl_req->pbuf)->param.auto_deep_sleep. - idletime; - else - auto_ds.idletime = pmadapter->idle_time; - /* note: the command could be queued and executed later if there is - command in progress. */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_PS_MODE_ENH, - (t_u16) mode, - BITMAP_AUTO_DS, (t_void *) pioctl_req, &auto_ds); - if (ret) { - LEAVE(); - return ret; - } - ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = + (pmlan_private) pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_auto_ds auto_ds; + t_u32 mode; + + ENTER(); + + if (((mlan_ds_pm_cfg *) pioctl_req->pbuf)->param.auto_deep_sleep. + auto_ds == DEEP_SLEEP_ON) { + auto_ds.auto_ds = DEEP_SLEEP_ON; + PRINTM(MINFO, "Auto Deep Sleep: on\n"); + mode = EN_AUTO_PS; + } else { + auto_ds.auto_ds = DEEP_SLEEP_OFF; + PRINTM(MINFO, "Auto Deep Sleep: off\n"); + mode = DIS_AUTO_PS; + } + if (((mlan_ds_pm_cfg *) pioctl_req->pbuf)->param.auto_deep_sleep. + idletime) + auto_ds.idletime = + ((mlan_ds_pm_cfg *) pioctl_req->pbuf)->param. + auto_deep_sleep.idletime; + else + auto_ds.idletime = pmadapter->idle_time; + /* note: the command could be queued and executed later if there is + command in progress. */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_PS_MODE_ENH, + (t_u16) mode, + BITMAP_AUTO_DS, (t_void *) pioctl_req, &auto_ds); + if (ret) { + LEAVE(); + return ret; + } + ret = MLAN_STATUS_PENDING; + LEAVE(); + return ret; } -/** +/** * @brief Set/Get sleep period * * @param pmadapter A pointer to mlan_adapter structure @@ -1987,31 +2079,31 @@ wlan_set_auto_deep_sleep(IN pmlan_adapter pmadapter, static mlan_status wlan_set_get_sleep_pd(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_pm_cfg *pm_cfg = MNULL; - t_u16 cmd_action = 0, sleep_pd = 0; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_pm_cfg *pm_cfg = MNULL; + t_u16 cmd_action = 0, sleep_pd = 0; - ENTER(); + ENTER(); - pm_cfg = (mlan_ds_pm_cfg *) pioctl_req->pbuf; - cmd_action = HostCmd_ACT_GEN_GET; - if (pioctl_req->action == MLAN_ACT_SET) { - cmd_action = HostCmd_ACT_GEN_SET; - sleep_pd = (t_u16) pm_cfg->param.sleep_period; - } + pm_cfg = (mlan_ds_pm_cfg *) pioctl_req->pbuf; + cmd_action = HostCmd_ACT_GEN_GET; + if (pioctl_req->action == MLAN_ACT_SET) { + cmd_action = HostCmd_ACT_GEN_SET; + sleep_pd = (t_u16) pm_cfg->param.sleep_period; + } - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_SLEEP_PERIOD, - cmd_action, 0, (t_void *) pioctl_req, &sleep_pd); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_SLEEP_PERIOD, + cmd_action, 0, (t_void *) pioctl_req, &sleep_pd); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief Set/Get PS configuration parameter * * @param pmadapter A pointer to mlan_adapter structure @@ -2022,71 +2114,78 @@ wlan_set_get_sleep_pd(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) static mlan_status wlan_set_get_ps_cfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_ds_pm_cfg *pm_cfg = MNULL; - - ENTER(); - - pm_cfg = (mlan_ds_pm_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) { - pm_cfg->param.ps_cfg.ps_null_interval = - (t_u32) pmadapter->null_pkt_interval; - pm_cfg->param.ps_cfg.multiple_dtim_interval = - (t_u32) pmadapter->multiple_dtim; - pm_cfg->param.ps_cfg.listen_interval = - (t_u32) pmadapter->local_listen_interval; - pm_cfg->param.ps_cfg.adhoc_awake_period = - (t_u32) pmadapter->adhoc_awake_period; - pm_cfg->param.ps_cfg.bcn_miss_timeout = - (t_u32) pmadapter->bcn_miss_time_out; - pm_cfg->param.ps_cfg.delay_to_ps = (t_u32) pmadapter->delay_to_ps; - pm_cfg->param.ps_cfg.ps_mode = (t_u32) pmadapter->enhanced_ps_mode; - } else { - if (pm_cfg->param.ps_cfg.ps_null_interval) - pmadapter->null_pkt_interval = - (t_u16) pm_cfg->param.ps_cfg.ps_null_interval; - else - pm_cfg->param.ps_cfg.ps_null_interval = - (t_u32) pmadapter->null_pkt_interval; - if (pm_cfg->param.ps_cfg.multiple_dtim_interval) - pmadapter->multiple_dtim = - (t_u16) pm_cfg->param.ps_cfg.multiple_dtim_interval; - else - pm_cfg->param.ps_cfg.multiple_dtim_interval = - (t_u32) pmadapter->multiple_dtim; - if (((t_s32) pm_cfg->param.ps_cfg.listen_interval) == - MRVDRV_LISTEN_INTERVAL_DISABLE) - pmadapter->local_listen_interval = 0; - else if (pm_cfg->param.ps_cfg.listen_interval) - pmadapter->local_listen_interval = - (t_u16) pm_cfg->param.ps_cfg.listen_interval; - else - pm_cfg->param.ps_cfg.listen_interval = - (t_u32) pmadapter->local_listen_interval; - if (pm_cfg->param.ps_cfg.adhoc_awake_period) - pmadapter->adhoc_awake_period = - (t_u16) pm_cfg->param.ps_cfg.adhoc_awake_period; - else - pm_cfg->param.ps_cfg.adhoc_awake_period = - (t_u32) pmadapter->adhoc_awake_period; - if (pm_cfg->param.ps_cfg.bcn_miss_timeout) - pmadapter->bcn_miss_time_out = - (t_u16) pm_cfg->param.ps_cfg.bcn_miss_timeout; - else - pm_cfg->param.ps_cfg.bcn_miss_timeout = - (t_u32) pmadapter->bcn_miss_time_out; - if (pm_cfg->param.ps_cfg.delay_to_ps != DELAY_TO_PS_UNCHANGED) - pmadapter->delay_to_ps = (t_u16) pm_cfg->param.ps_cfg.delay_to_ps; - else - pm_cfg->param.ps_cfg.delay_to_ps = (t_u32) pmadapter->delay_to_ps; - if (pm_cfg->param.ps_cfg.ps_mode) - pmadapter->enhanced_ps_mode = (t_u16) pm_cfg->param.ps_cfg.ps_mode; - else - pm_cfg->param.ps_cfg.ps_mode = (t_u32) pmadapter->enhanced_ps_mode; - } - pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_pm_cfg *pm_cfg = MNULL; + + ENTER(); + + pm_cfg = (mlan_ds_pm_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) { + pm_cfg->param.ps_cfg.ps_null_interval = + (t_u32) pmadapter->null_pkt_interval; + pm_cfg->param.ps_cfg.multiple_dtim_interval = + (t_u32) pmadapter->multiple_dtim; + pm_cfg->param.ps_cfg.listen_interval = + (t_u32) pmadapter->local_listen_interval; + pm_cfg->param.ps_cfg.adhoc_awake_period = + (t_u32) pmadapter->adhoc_awake_period; + pm_cfg->param.ps_cfg.bcn_miss_timeout = + (t_u32) pmadapter->bcn_miss_time_out; + pm_cfg->param.ps_cfg.delay_to_ps = + (t_u32) pmadapter->delay_to_ps; + pm_cfg->param.ps_cfg.ps_mode = + (t_u32) pmadapter->enhanced_ps_mode; + } else { + if (pm_cfg->param.ps_cfg.ps_null_interval) + pmadapter->null_pkt_interval = + (t_u16) pm_cfg->param.ps_cfg.ps_null_interval; + else + pm_cfg->param.ps_cfg.ps_null_interval = + (t_u32) pmadapter->null_pkt_interval; + if (pm_cfg->param.ps_cfg.multiple_dtim_interval) + pmadapter->multiple_dtim = + (t_u16) pm_cfg->param.ps_cfg. + multiple_dtim_interval; + else + pm_cfg->param.ps_cfg.multiple_dtim_interval = + (t_u32) pmadapter->multiple_dtim; + if (((t_s32) pm_cfg->param.ps_cfg.listen_interval) == + MRVDRV_LISTEN_INTERVAL_DISABLE) + pmadapter->local_listen_interval = 0; + else if (pm_cfg->param.ps_cfg.listen_interval) + pmadapter->local_listen_interval = + (t_u16) pm_cfg->param.ps_cfg.listen_interval; + else + pm_cfg->param.ps_cfg.listen_interval = + (t_u32) pmadapter->local_listen_interval; + if (pm_cfg->param.ps_cfg.adhoc_awake_period) + pmadapter->adhoc_awake_period = + (t_u16) pm_cfg->param.ps_cfg.adhoc_awake_period; + else + pm_cfg->param.ps_cfg.adhoc_awake_period = + (t_u32) pmadapter->adhoc_awake_period; + if (pm_cfg->param.ps_cfg.bcn_miss_timeout) + pmadapter->bcn_miss_time_out = + (t_u16) pm_cfg->param.ps_cfg.bcn_miss_timeout; + else + pm_cfg->param.ps_cfg.bcn_miss_timeout = + (t_u32) pmadapter->bcn_miss_time_out; + if (pm_cfg->param.ps_cfg.delay_to_ps != DELAY_TO_PS_UNCHANGED) + pmadapter->delay_to_ps = + (t_u16) pm_cfg->param.ps_cfg.delay_to_ps; + else + pm_cfg->param.ps_cfg.delay_to_ps = + (t_u32) pmadapter->delay_to_ps; + if (pm_cfg->param.ps_cfg.ps_mode) + pmadapter->enhanced_ps_mode = + (t_u16) pm_cfg->param.ps_cfg.ps_mode; + else + pm_cfg->param.ps_cfg.ps_mode = + (t_u32) pmadapter->enhanced_ps_mode; + } + pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -2099,34 +2198,34 @@ wlan_set_get_ps_cfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_set_get_sleep_params(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_pm_cfg *pm_cfg = MNULL; - t_u16 cmd_action = 0; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_pm_cfg *pm_cfg = MNULL; + t_u16 cmd_action = 0; - ENTER(); + ENTER(); - pm_cfg = (mlan_ds_pm_cfg *) pioctl_req->pbuf; - cmd_action = HostCmd_ACT_GEN_GET; - if (pioctl_req->action == MLAN_ACT_SET) { - cmd_action = HostCmd_ACT_GEN_SET; - } + pm_cfg = (mlan_ds_pm_cfg *) pioctl_req->pbuf; + cmd_action = HostCmd_ACT_GEN_GET; + if (pioctl_req->action == MLAN_ACT_SET) { + cmd_action = HostCmd_ACT_GEN_SET; + } - /* Send command to firmware */ - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_SLEEP_PARAMS, - cmd_action, 0, (t_void *) pioctl_req, - &pm_cfg->param.sleep_params); + /* Send command to firmware */ + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_SLEEP_PARAMS, + cmd_action, 0, (t_void *) pioctl_req, + &pm_cfg->param.sleep_params); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief Power save command handler * * @param pmadapter A pointer to mlan_adapter structure @@ -2137,104 +2236,110 @@ wlan_set_get_sleep_params(IN pmlan_adapter pmadapter, static mlan_status wlan_pm_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_pm_cfg *pm = MNULL; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_pm_cfg)) { - PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_pm_cfg); - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - pm = (mlan_ds_pm_cfg *) pioctl_req->pbuf; - switch (pm->sub_command) { - case MLAN_OID_PM_CFG_IEEE_PS: - switch (pioctl_req->action) { - case MLAN_ACT_SET: - if (pm->param.ps_mode) - pmadapter->ps_mode = Wlan802_11PowerModePSP; - else - pmadapter->ps_mode = Wlan802_11PowerModeCAM; - status = - wlan_pm_ioctl_ps_mode(pmadapter, pioctl_req, - pmadapter->ps_mode); - break; - case MLAN_ACT_GET: - status = - wlan_pm_ioctl_ps_mode(pmadapter, pioctl_req, - pmadapter->ps_mode); - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - break; - case MLAN_OID_PM_CFG_HS_CFG: - status = wlan_pm_ioctl_hscfg(pmadapter, pioctl_req); - break; - case MLAN_OID_PM_CFG_INACTIVITY_TO: - status = wlan_pm_ioctl_inactivity_timeout(pmadapter, pioctl_req); - break; - case MLAN_OID_PM_CFG_DEEP_SLEEP: - switch (pioctl_req->action) { - case MLAN_ACT_SET: - if (pmadapter->is_deep_sleep && - pm->param.auto_deep_sleep.auto_ds == DEEP_SLEEP_ON) { - PRINTM(MMSG, "Station already in enhanced deep sleep mode\n"); - status = MLAN_STATUS_FAILURE; - break; - } else if (!pmadapter->is_deep_sleep && - pm->param.auto_deep_sleep.auto_ds == DEEP_SLEEP_OFF) { - PRINTM(MMSG, - "Station already not in enhanced deep sleep mode\n"); - status = MLAN_STATUS_FAILURE; - break; - } - status = wlan_set_auto_deep_sleep(pmadapter, pioctl_req); - break; - case MLAN_ACT_GET: - if (pmadapter->is_deep_sleep) { - pm->param.auto_deep_sleep.auto_ds = DEEP_SLEEP_ON; - pm->param.auto_deep_sleep.idletime = pmadapter->idle_time; - } else - pm->param.auto_deep_sleep.auto_ds = DEEP_SLEEP_OFF; - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - break; - case MLAN_OID_PM_CFG_PS_CFG: - status = wlan_set_get_ps_cfg(pmadapter, pioctl_req); - break; - case MLAN_OID_PM_CFG_SLEEP_PD: - status = wlan_set_get_sleep_pd(pmadapter, pioctl_req); - break; - case MLAN_OID_PM_CFG_SLEEP_PARAMS: - status = wlan_set_get_sleep_params(pmadapter, pioctl_req); - break; - case MLAN_OID_PM_INFO: - status = wlan_get_pm_info(pmadapter, pioctl_req); - break; - case MLAN_OID_PM_HS_WAKEUP_REASON: - status = wlan_get_hs_wakeup_reason(pmadapter, pioctl_req); - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - LEAVE(); - return status; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_pm_cfg *pm = MNULL; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_pm_cfg)) { + PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_pm_cfg); + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + pm = (mlan_ds_pm_cfg *) pioctl_req->pbuf; + switch (pm->sub_command) { + case MLAN_OID_PM_CFG_IEEE_PS: + switch (pioctl_req->action) { + case MLAN_ACT_SET: + if (pm->param.ps_mode) + pmadapter->ps_mode = Wlan802_11PowerModePSP; + else + pmadapter->ps_mode = Wlan802_11PowerModeCAM; + status = wlan_pm_ioctl_ps_mode(pmadapter, pioctl_req, + pmadapter->ps_mode); + break; + case MLAN_ACT_GET: + status = wlan_pm_ioctl_ps_mode(pmadapter, pioctl_req, + pmadapter->ps_mode); + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + break; + case MLAN_OID_PM_CFG_HS_CFG: + status = wlan_pm_ioctl_hscfg(pmadapter, pioctl_req); + break; + case MLAN_OID_PM_CFG_INACTIVITY_TO: + status = wlan_pm_ioctl_inactivity_timeout(pmadapter, + pioctl_req); + break; + case MLAN_OID_PM_CFG_DEEP_SLEEP: + switch (pioctl_req->action) { + case MLAN_ACT_SET: + if (pmadapter->is_deep_sleep && + pm->param.auto_deep_sleep.auto_ds == + DEEP_SLEEP_ON) { + PRINTM(MMSG, + "Station already in enhanced deep sleep mode\n"); + status = MLAN_STATUS_FAILURE; + break; + } else if (!pmadapter->is_deep_sleep && + pm->param.auto_deep_sleep.auto_ds == + DEEP_SLEEP_OFF) { + PRINTM(MMSG, + "Station already not in enhanced deep sleep mode\n"); + status = MLAN_STATUS_FAILURE; + break; + } + status = wlan_set_auto_deep_sleep(pmadapter, + pioctl_req); + break; + case MLAN_ACT_GET: + if (pmadapter->is_deep_sleep) { + pm->param.auto_deep_sleep.auto_ds = + DEEP_SLEEP_ON; + pm->param.auto_deep_sleep.idletime = + pmadapter->idle_time; + } else + pm->param.auto_deep_sleep.auto_ds = + DEEP_SLEEP_OFF; + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + break; + case MLAN_OID_PM_CFG_PS_CFG: + status = wlan_set_get_ps_cfg(pmadapter, pioctl_req); + break; + case MLAN_OID_PM_CFG_SLEEP_PD: + status = wlan_set_get_sleep_pd(pmadapter, pioctl_req); + break; + case MLAN_OID_PM_CFG_SLEEP_PARAMS: + status = wlan_set_get_sleep_params(pmadapter, pioctl_req); + break; + case MLAN_OID_PM_INFO: + status = wlan_get_pm_info(pmadapter, pioctl_req); + break; + case MLAN_OID_PM_HS_WAKEUP_REASON: + status = wlan_get_hs_wakeup_reason(pmadapter, pioctl_req); + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + LEAVE(); + return status; } -/** - * @brief Set/Get WPA IE +/** + * @brief Set/Get WPA IE * * @param priv A pointer to mlan_private structure * @param ie_data_ptr A pointer to IE @@ -2245,42 +2350,42 @@ wlan_pm_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) static mlan_status wlan_set_wpa_ie_helper(mlan_private * priv, t_u8 * ie_data_ptr, t_u16 ie_len) { - ENTER(); - - if (ie_len) { - if (ie_len > sizeof(priv->wpa_ie)) { - PRINTM(MERROR, "failed to copy, WPA IE is too big \n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - memcpy(priv->adapter, priv->wpa_ie, ie_data_ptr, ie_len); - priv->wpa_ie_len = (t_u8) ie_len; - PRINTM(MIOCTL, "Set Wpa_ie_len=%d IE=%#x\n", priv->wpa_ie_len, - priv->wpa_ie[0]); - DBG_HEXDUMP(MCMD_D, "Wpa_ie", priv->wpa_ie, priv->wpa_ie_len); - if (priv->wpa_ie[0] == WPA_IE) { - priv->sec_info.wpa_enabled = MTRUE; - } else if (priv->wpa_ie[0] == RSN_IE) { - priv->sec_info.wpa2_enabled = MTRUE; - } else { - priv->sec_info.wpa_enabled = MFALSE; - priv->sec_info.wpa2_enabled = MFALSE; - } - } else { - memset(priv->adapter, priv->wpa_ie, 0, sizeof(priv->wpa_ie)); - priv->wpa_ie_len = 0; - PRINTM(MINFO, "Reset Wpa_ie_len=%d IE=%#x\n", priv->wpa_ie_len, - priv->wpa_ie[0]); - priv->sec_info.wpa_enabled = MFALSE; - priv->sec_info.wpa2_enabled = MFALSE; - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + ENTER(); + + if (ie_len) { + if (ie_len > sizeof(priv->wpa_ie)) { + PRINTM(MERROR, "failed to copy, WPA IE is too big \n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + memcpy(priv->adapter, priv->wpa_ie, ie_data_ptr, ie_len); + priv->wpa_ie_len = (t_u8) ie_len; + PRINTM(MIOCTL, "Set Wpa_ie_len=%d IE=%#x\n", priv->wpa_ie_len, + priv->wpa_ie[0]); + DBG_HEXDUMP(MCMD_D, "Wpa_ie", priv->wpa_ie, priv->wpa_ie_len); + if (priv->wpa_ie[0] == WPA_IE) { + priv->sec_info.wpa_enabled = MTRUE; + } else if (priv->wpa_ie[0] == RSN_IE) { + priv->sec_info.wpa2_enabled = MTRUE; + } else { + priv->sec_info.wpa_enabled = MFALSE; + priv->sec_info.wpa2_enabled = MFALSE; + } + } else { + memset(priv->adapter, priv->wpa_ie, 0, sizeof(priv->wpa_ie)); + priv->wpa_ie_len = 0; + PRINTM(MINFO, "Reset Wpa_ie_len=%d IE=%#x\n", priv->wpa_ie_len, + priv->wpa_ie[0]); + priv->sec_info.wpa_enabled = MFALSE; + priv->sec_info.wpa2_enabled = MFALSE; + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** - * @brief Set WAPI IE +/** + * @brief Set WAPI IE * * @param priv A pointer to mlan_private structure * @param ie_data_ptr A pointer to IE @@ -2291,32 +2396,33 @@ wlan_set_wpa_ie_helper(mlan_private * priv, t_u8 * ie_data_ptr, t_u16 ie_len) static mlan_status wlan_set_wapi_ie(mlan_private * priv, t_u8 * ie_data_ptr, t_u16 ie_len) { - ENTER(); - if (ie_len) { - if (ie_len > sizeof(priv->wapi_ie)) { - PRINTM(MWARN, "failed to copy, WAPI IE is too big \n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - memcpy(priv->adapter, priv->wapi_ie, ie_data_ptr, ie_len); - priv->wapi_ie_len = (t_u8) ie_len; - PRINTM(MIOCTL, "Set wapi_ie_len=%d IE=%#x\n", priv->wapi_ie_len, - priv->wapi_ie[0]); - DBG_HEXDUMP(MCMD_D, "wapi_ie", priv->wapi_ie, priv->wapi_ie_len); - if (priv->wapi_ie[0] == WAPI_IE) - priv->sec_info.wapi_enabled = MTRUE; - } else { - memset(priv->adapter, priv->wapi_ie, 0, sizeof(priv->wapi_ie)); - priv->wapi_ie_len = (t_u8) ie_len; - PRINTM(MINFO, "Reset wapi_ie_len=%d IE=%#x\n", priv->wapi_ie_len, - priv->wapi_ie[0]); - priv->sec_info.wapi_enabled = MFALSE; - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + ENTER(); + if (ie_len) { + if (ie_len > sizeof(priv->wapi_ie)) { + PRINTM(MWARN, "failed to copy, WAPI IE is too big \n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + memcpy(priv->adapter, priv->wapi_ie, ie_data_ptr, ie_len); + priv->wapi_ie_len = (t_u8) ie_len; + PRINTM(MIOCTL, "Set wapi_ie_len=%d IE=%#x\n", priv->wapi_ie_len, + priv->wapi_ie[0]); + DBG_HEXDUMP(MCMD_D, "wapi_ie", priv->wapi_ie, + priv->wapi_ie_len); + if (priv->wapi_ie[0] == WAPI_IE) + priv->sec_info.wapi_enabled = MTRUE; + } else { + memset(priv->adapter, priv->wapi_ie, 0, sizeof(priv->wapi_ie)); + priv->wapi_ie_len = (t_u8) ie_len; + PRINTM(MINFO, "Reset wapi_ie_len=%d IE=%#x\n", + priv->wapi_ie_len, priv->wapi_ie[0]); + priv->sec_info.wapi_enabled = MFALSE; + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief Set/Get WAPI status * * @param pmadapter A pointer to mlan_adapter structure @@ -2326,29 +2432,29 @@ wlan_set_wapi_ie(mlan_private * priv, t_u8 * ie_data_ptr, t_u16 ie_len) */ static mlan_status wlan_sec_ioctl_wapi_enable(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_sec_cfg *sec = MNULL; - ENTER(); - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) { - if (pmpriv->wapi_ie_len) - sec->param.wapi_enabled = MTRUE; - else - sec->param.wapi_enabled = MFALSE; - } else { - if (sec->param.wapi_enabled == MFALSE) { - wlan_set_wapi_ie(pmpriv, MNULL, 0); - } - } - pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_sec_cfg *sec = MNULL; + ENTER(); + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) { + if (pmpriv->wapi_ie_len) + sec->param.wapi_enabled = MTRUE; + else + sec->param.wapi_enabled = MFALSE; + } else { + if (sec->param.wapi_enabled == MFALSE) { + wlan_set_wapi_ie(pmpriv, MNULL, 0); + } + } + pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; + LEAVE(); + return ret; } -/** +/** * @brief Set WAPI key * * @param pmadapter A pointer to mlan_adapter structure @@ -2358,27 +2464,27 @@ wlan_sec_ioctl_wapi_enable(IN pmlan_adapter pmadapter, */ static mlan_status wlan_sec_ioctl_set_wapi_key(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_sec_cfg *sec = MNULL; - ENTER(); - - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_KEY_MATERIAL, - HostCmd_ACT_GEN_SET, - KEY_INFO_ENABLED, - (t_void *) pioctl_req, &sec->param.encrypt_key); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_sec_cfg *sec = MNULL; + ENTER(); + + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_KEY_MATERIAL, + HostCmd_ACT_GEN_SET, + KEY_INFO_ENABLED, + (t_void *) pioctl_req, &sec->param.encrypt_key); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } -/** +/** * @brief Set/Get Port Control status * * @param pmadapter A pointer to mlan_adapter structure @@ -2388,40 +2494,40 @@ wlan_sec_ioctl_set_wapi_key(IN pmlan_adapter pmadapter, */ static mlan_status wlan_sec_ioctl_port_ctrl_enable(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_sec_cfg *sec = MNULL; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - - ENTER(); - - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) { - if (pmpriv->port_ctrl_mode) - sec->param.port_ctrl_enabled = MTRUE; - else - sec->param.port_ctrl_enabled = MFALSE; - } else { - if (sec->param.port_ctrl_enabled) { - pmpriv->port_ctrl_mode = MTRUE; - pmpriv->port_open = MFALSE; - } else { - if (pmpriv->port_ctrl_mode == MTRUE) { - pmpriv->port_ctrl_mode = MFALSE; - /* Cleanup the bypass TX queue */ - wlan_cleanup_bypass_txq(pmpriv); - } - } - } - PRINTM(MINFO, "port_ctrl: port_ctrl_mode=%d port_open=%d\n", - pmpriv->port_ctrl_mode, pmpriv->port_open); - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_sec_cfg *sec = MNULL; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + + ENTER(); + + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) { + if (pmpriv->port_ctrl_mode) + sec->param.port_ctrl_enabled = MTRUE; + else + sec->param.port_ctrl_enabled = MFALSE; + } else { + if (sec->param.port_ctrl_enabled) { + pmpriv->port_ctrl_mode = MTRUE; + pmpriv->port_open = MFALSE; + } else { + if (pmpriv->port_ctrl_mode == MTRUE) { + pmpriv->port_ctrl_mode = MFALSE; + /* Cleanup the bypass TX queue */ + wlan_cleanup_bypass_txq(pmpriv); + } + } + } + PRINTM(MINFO, "port_ctrl: port_ctrl_mode=%d port_open=%d\n", + pmpriv->port_ctrl_mode, pmpriv->port_open); + + LEAVE(); + return ret; } -/** +/** * @brief Set/Get authentication mode * * @param pmadapter A pointer to mlan_adapter structure @@ -2431,26 +2537,27 @@ wlan_sec_ioctl_port_ctrl_enable(IN pmlan_adapter pmadapter, */ static mlan_status wlan_sec_ioctl_auth_mode(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_sec_cfg *sec = MNULL; - ENTER(); - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) - sec->param.auth_mode = pmpriv->sec_info.authentication_mode; - else { - pmpriv->sec_info.authentication_mode = sec->param.auth_mode; - if (pmpriv->sec_info.authentication_mode == MLAN_AUTH_MODE_NETWORKEAP) - wlan_set_wpa_ie_helper(pmpriv, MNULL, 0); - } - pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_sec_cfg *sec = MNULL; + ENTER(); + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) + sec->param.auth_mode = pmpriv->sec_info.authentication_mode; + else { + pmpriv->sec_info.authentication_mode = sec->param.auth_mode; + if (pmpriv->sec_info.authentication_mode == + MLAN_AUTH_MODE_NETWORKEAP) + wlan_set_wpa_ie_helper(pmpriv, MNULL, 0); + } + pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; + LEAVE(); + return ret; } -/** +/** * @brief Set/Get encryption mode * * @param pmadapter A pointer to mlan_adapter structure @@ -2460,24 +2567,24 @@ wlan_sec_ioctl_auth_mode(IN pmlan_adapter pmadapter, */ static mlan_status wlan_sec_ioctl_encrypt_mode(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_sec_cfg *sec = MNULL; - ENTER(); - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) - sec->param.encrypt_mode = pmpriv->sec_info.encryption_mode; - else { - pmpriv->sec_info.encryption_mode = sec->param.encrypt_mode; - } - pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_sec_cfg *sec = MNULL; + ENTER(); + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) + sec->param.encrypt_mode = pmpriv->sec_info.encryption_mode; + else { + pmpriv->sec_info.encryption_mode = sec->param.encrypt_mode; + } + pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; + LEAVE(); + return ret; } -/** +/** * @brief Get Random charactor * * @param pmadapter A pointer to mlan_adapter structure @@ -2487,21 +2594,21 @@ wlan_sec_ioctl_encrypt_mode(IN pmlan_adapter pmadapter, t_u8 wlan_get_random_charactor(pmlan_adapter pmadapter) { - t_u32 sec, usec; - t_u8 ch = 0; - - ENTER(); - - pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, &sec, - &usec); - sec = (sec & 0xFFFF) + (sec >> 16); - usec = (usec & 0xFFFF) + (usec >> 16); - ch = (((sec << 16) + usec) % 26) + 'a'; - LEAVE(); - return ch; + t_u32 sec, usec; + t_u8 ch = 0; + + ENTER(); + + pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, &sec, + &usec); + sec = (sec & 0xFFFF) + (sec >> 16); + usec = (usec & 0xFFFF) + (usec >> 16); + ch = (((sec << 16) + usec) % 26) + 'a'; + LEAVE(); + return ch; } -/** +/** * @brief Set/Get WPA status * * @param pmadapter A pointer to mlan_adapter structure @@ -2511,32 +2618,32 @@ wlan_get_random_charactor(pmlan_adapter pmadapter) */ static mlan_status wlan_sec_ioctl_wpa_enable(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_sec_cfg *sec = MNULL; - ENTER(); - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) { - if (pmpriv->wpa_ie_len) - sec->param.wpa_enabled = MTRUE; - else - sec->param.wpa_enabled = MFALSE; - } else { - if (sec->param.wpa_enabled == MFALSE) { - wlan_set_wpa_ie_helper(pmpriv, MNULL, 0); - } - /** clear adhoc aes flag, when WPA enabled */ - pmpriv->adhoc_aes_enabled = MFALSE; - pmpriv->aes_key.key_param_set.key_len = 0; - } - pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_sec_cfg *sec = MNULL; + ENTER(); + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) { + if (pmpriv->wpa_ie_len) + sec->param.wpa_enabled = MTRUE; + else + sec->param.wpa_enabled = MFALSE; + } else { + if (sec->param.wpa_enabled == MFALSE) { + wlan_set_wpa_ie_helper(pmpriv, MNULL, 0); + } + /** clear adhoc aes flag, when WPA enabled */ + pmpriv->adhoc_aes_enabled = MFALSE; + pmpriv->aes_key.key_param_set.key_len = 0; + } + pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; + LEAVE(); + return ret; } -/** +/** * @brief Set WEP keys * * @param pmadapter A pointer to mlan_adapter structure @@ -2546,139 +2653,152 @@ wlan_sec_ioctl_wpa_enable(IN pmlan_adapter pmadapter, */ static mlan_status wlan_sec_ioctl_set_wep_key(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_sec_cfg *sec = MNULL; - mrvl_wep_key_t *pwep_key = MNULL; - int index; - int i = 0; - - ENTER(); - - if (pmpriv->wep_key_curr_index >= MRVL_NUM_WEP_KEY) - pmpriv->wep_key_curr_index = 0; - pwep_key = &pmpriv->wep_key[pmpriv->wep_key_curr_index]; - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - if (sec->param.encrypt_key.key_index == MLAN_KEY_INDEX_DEFAULT) { - index = pmpriv->wep_key_curr_index; - } else { - if (sec->param.encrypt_key.key_index >= MRVL_NUM_WEP_KEY) { - PRINTM(MERROR, "Key_index is invalid\n"); - ret = MLAN_STATUS_FAILURE; - goto exit; - } - index = sec->param.encrypt_key.key_index; - } - - if ((sec->param.encrypt_key.key_disable == MTRUE) || - (sec->param.encrypt_key.key_remove == MTRUE)) { - pmpriv->sec_info.wep_status = Wlan802_11WEPDisabled; - /* remove key */ - if (sec->param.encrypt_key.key_remove == MTRUE) { - memset(pmadapter, &pmpriv->wep_key[index], 0, - sizeof(mrvl_wep_key_t)); - } - } else { - if (sec->param.encrypt_key.key_len) { - if ((sec->param.encrypt_key.key_len != WEP_104_BIT_LEN) && - (sec->param.encrypt_key.key_len != WEP_40_BIT_LEN)) { - PRINTM(MERROR, "Invalid wep key len=%d\n", - sec->param.encrypt_key.key_len); - /* We will use random key to clear the key buffer in FW */ - if (sec->param.encrypt_key.key_len < WEP_40_BIT_LEN) - sec->param.encrypt_key.key_len = WEP_40_BIT_LEN; - else - sec->param.encrypt_key.key_len = WEP_104_BIT_LEN; - for (i = 0; i < sec->param.encrypt_key.key_len; i++) - sec->param.encrypt_key.key_material[i] = - wlan_get_random_charactor(pmadapter); - } - pwep_key = &pmpriv->wep_key[index]; - /* Cleanup */ - memset(pmadapter, pwep_key, 0, sizeof(mrvl_wep_key_t)); - /* Copy the key in the driver */ - - memcpy(pmadapter, pwep_key->key_material, - sec->param.encrypt_key.key_material, - sec->param.encrypt_key.key_len); - pwep_key->key_index = index; - pwep_key->key_length = sec->param.encrypt_key.key_len; - if (pmpriv->sec_info.wep_status != Wlan802_11WEPEnabled) { - /* - * The status is set as Key Absent - * so as to make sure we display the - * keys when iwlist mlanX key is used - */ - pmpriv->sec_info.wep_status = Wlan802_11WEPKeyAbsent; - } - } - if (sec->param.encrypt_key.is_current_wep_key == MTRUE) { - /* Copy the required key as the current key */ - pwep_key = &pmpriv->wep_key[index]; - if (!pwep_key->key_length) { - if (0 - || &pmpriv->sec_info.wpa_enabled - || &pmpriv->sec_info.wpa2_enabled - || &pmpriv->sec_info.wapi_enabled) { - ret = MLAN_STATUS_SUCCESS; - goto exit; - } - PRINTM(MERROR, "Key %d not set,so cannot enable it\n", index); - pioctl_req->status_code = MLAN_ERROR_CMD_RESP_FAIL; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - pmpriv->wep_key_curr_index = (t_u16) index; - pmpriv->sec_info.wep_status = Wlan802_11WEPEnabled; - } - if (sec->param.encrypt_key.key_flags && pwep_key->key_length) { - pmpriv->wep_key_curr_index = (t_u16) index; - pmpriv->sec_info.wep_status = Wlan802_11WEPEnabled; - } - } - if (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled) - pmpriv->curr_pkt_filter |= HostCmd_ACT_MAC_WEP_ENABLE; - else - pmpriv->curr_pkt_filter &= ~HostCmd_ACT_MAC_WEP_ENABLE; - - /* Send request to firmware */ - if (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled - && pwep_key->key_length) { - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_MAC_CONTROL, - HostCmd_ACT_GEN_SET, - 0, MNULL, &pmpriv->curr_pkt_filter); - if (ret) - goto exit; - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_KEY_MATERIAL, - HostCmd_ACT_GEN_SET, - 0, (t_void *) pioctl_req, MNULL); - } else { - if (pwep_key->key_length) { - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_KEY_MATERIAL, - HostCmd_ACT_GEN_SET, 0, MNULL, MNULL); - if (ret) - goto exit; - } - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_MAC_CONTROL, - HostCmd_ACT_GEN_SET, - 0, - (t_void *) pioctl_req, &pmpriv->curr_pkt_filter); - } - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - exit: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_sec_cfg *sec = MNULL; + mrvl_wep_key_t *pwep_key = MNULL; + int index; + int i = 0; + + ENTER(); + + if (pmpriv->wep_key_curr_index >= MRVL_NUM_WEP_KEY) + pmpriv->wep_key_curr_index = 0; + pwep_key = &pmpriv->wep_key[pmpriv->wep_key_curr_index]; + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + if (sec->param.encrypt_key.key_index == MLAN_KEY_INDEX_DEFAULT) { + index = pmpriv->wep_key_curr_index; + } else { + if (sec->param.encrypt_key.key_index >= MRVL_NUM_WEP_KEY) { + PRINTM(MERROR, "Key_index is invalid\n"); + ret = MLAN_STATUS_FAILURE; + goto exit; + } + index = sec->param.encrypt_key.key_index; + } + + if ((sec->param.encrypt_key.key_disable == MTRUE) || + (sec->param.encrypt_key.key_remove == MTRUE)) { + pmpriv->sec_info.wep_status = Wlan802_11WEPDisabled; + /* remove key */ + if (sec->param.encrypt_key.key_remove == MTRUE) { + memset(pmadapter, &pmpriv->wep_key[index], 0, + sizeof(mrvl_wep_key_t)); + } + } else { + if (sec->param.encrypt_key.key_len) { + if ((sec->param.encrypt_key.key_len != WEP_104_BIT_LEN) + && (sec->param.encrypt_key.key_len != + WEP_40_BIT_LEN)) { + PRINTM(MERROR, "Invalid wep key len=%d\n", + sec->param.encrypt_key.key_len); + /* We will use random key to clear the key + buffer in FW */ + if (sec->param.encrypt_key.key_len < + WEP_40_BIT_LEN) + sec->param.encrypt_key.key_len = + WEP_40_BIT_LEN; + else + sec->param.encrypt_key.key_len = + WEP_104_BIT_LEN; + for (i = 0; i < sec->param.encrypt_key.key_len; + i++) + sec->param.encrypt_key.key_material[i] = + wlan_get_random_charactor + (pmadapter); + } + pwep_key = &pmpriv->wep_key[index]; + /* Cleanup */ + memset(pmadapter, pwep_key, 0, sizeof(mrvl_wep_key_t)); + /* Copy the key in the driver */ + + memcpy(pmadapter, pwep_key->key_material, + sec->param.encrypt_key.key_material, + sec->param.encrypt_key.key_len); + pwep_key->key_index = index; + pwep_key->key_length = sec->param.encrypt_key.key_len; + if (pmpriv->sec_info.wep_status != Wlan802_11WEPEnabled) { + /* + * The status is set as Key Absent + * so as to make sure we display the + * keys when iwlist mlanX key is used + */ + pmpriv->sec_info.wep_status = + Wlan802_11WEPKeyAbsent; + } + } + if (sec->param.encrypt_key.is_current_wep_key == MTRUE) { + /* Copy the required key as the current key */ + pwep_key = &pmpriv->wep_key[index]; + if (!pwep_key->key_length) { + if (0 + || &pmpriv->sec_info.wpa_enabled + || &pmpriv->sec_info.wpa2_enabled + || &pmpriv->sec_info.wapi_enabled) { + ret = MLAN_STATUS_SUCCESS; + goto exit; + } + PRINTM(MERROR, + "Key %d not set,so cannot enable it\n", + index); + pioctl_req->status_code = + MLAN_ERROR_CMD_RESP_FAIL; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + pmpriv->wep_key_curr_index = (t_u16) index; + pmpriv->sec_info.wep_status = Wlan802_11WEPEnabled; + } + if (sec->param.encrypt_key.key_flags && pwep_key->key_length) { + pmpriv->wep_key_curr_index = (t_u16) index; + pmpriv->sec_info.wep_status = Wlan802_11WEPEnabled; + } + } + if (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled) + pmpriv->curr_pkt_filter |= HostCmd_ACT_MAC_WEP_ENABLE; + else + pmpriv->curr_pkt_filter &= ~HostCmd_ACT_MAC_WEP_ENABLE; + + /* Send request to firmware */ + if (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled + && pwep_key->key_length) { + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_MAC_CONTROL, + HostCmd_ACT_GEN_SET, + 0, MNULL, &pmpriv->curr_pkt_filter); + if (ret) + goto exit; + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_KEY_MATERIAL, + HostCmd_ACT_GEN_SET, + 0, (t_void *) pioctl_req, MNULL); + } else { + if (pwep_key->key_length) { + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_KEY_MATERIAL, + HostCmd_ACT_GEN_SET, + 0, MNULL, MNULL); + if (ret) + goto exit; + } + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_MAC_CONTROL, + HostCmd_ACT_GEN_SET, + 0, + (t_void *) pioctl_req, + &pmpriv->curr_pkt_filter); + } + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +exit: + LEAVE(); + return ret; } -/** +/** * @brief Set WPA key * * @param pmadapter A pointer to mlan_adapter structure @@ -2688,105 +2808,109 @@ wlan_sec_ioctl_set_wep_key(IN pmlan_adapter pmadapter, */ static mlan_status wlan_sec_ioctl_set_wpa_key(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_sec_cfg *sec = MNULL; - t_u8 broadcast_mac_addr[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; - t_u8 remove_key = MFALSE; - - ENTER(); - - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - /* Current driver only supports key length of up to 32 bytes */ - if (sec->param.encrypt_key.key_len > MLAN_MAX_KEY_LENGTH) { - PRINTM(MERROR, "Key length is incorrect\n"); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - if ((pmpriv->bss_mode == MLAN_BSS_MODE_IBSS) && - pmpriv->sec_info.wpa_enabled) { - /* - * IBSS/WPA-None uses only one key (Group) for both receiving and - * sending unicast and multicast packets. - */ - /* Send the key as PTK to firmware */ - sec->param.encrypt_key.key_index = MLAN_KEY_INDEX_UNICAST; - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_KEY_MATERIAL, - HostCmd_ACT_GEN_SET, - KEY_INFO_ENABLED, - MNULL, &sec->param.encrypt_key); - if (ret) - goto exit; - - /* Send the key as GTK to firmware */ - sec->param.encrypt_key.key_index = ~MLAN_KEY_INDEX_UNICAST; - } - - if (sec->param.encrypt_key.key_len == WPA_AES_KEY_LEN) { - /** back up adhoc AES key */ - memset(pmpriv->adapter, pmpriv->aes_key.key_param_set.key, 0, - sizeof(pmpriv->aes_key.key_param_set.key)); - pmpriv->aes_key.key_param_set.key_len = sec->param.encrypt_key.key_len; - memcpy(pmpriv->adapter, pmpriv->aes_key.key_param_set.key, - sec->param.encrypt_key.key_material, - pmpriv->aes_key.key_param_set.key_len); - } + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_sec_cfg *sec = MNULL; + t_u8 broadcast_mac_addr[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + t_u8 remove_key = MFALSE; + + ENTER(); + + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + /* Current driver only supports key length of up to 32 bytes */ + if (sec->param.encrypt_key.key_len > MLAN_MAX_KEY_LENGTH) { + PRINTM(MERROR, "Key length is incorrect\n"); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + if ((pmpriv->bss_mode == MLAN_BSS_MODE_IBSS) && + pmpriv->sec_info.wpa_enabled) { + /* + * IBSS/WPA-None uses only one key (Group) for both receiving and + * sending unicast and multicast packets. + */ + /* Send the key as PTK to firmware */ + sec->param.encrypt_key.key_index = MLAN_KEY_INDEX_UNICAST; + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_KEY_MATERIAL, + HostCmd_ACT_GEN_SET, + KEY_INFO_ENABLED, + MNULL, &sec->param.encrypt_key); + if (ret) + goto exit; + + /* Send the key as GTK to firmware */ + sec->param.encrypt_key.key_index = ~MLAN_KEY_INDEX_UNICAST; + } + + if (sec->param.encrypt_key.key_len == WPA_AES_KEY_LEN) { + /** back up adhoc AES key */ + memset(pmpriv->adapter, pmpriv->aes_key.key_param_set.key, 0, + sizeof(pmpriv->aes_key.key_param_set.key)); + pmpriv->aes_key.key_param_set.key_len = + sec->param.encrypt_key.key_len; + memcpy(pmpriv->adapter, pmpriv->aes_key.key_param_set.key, + sec->param.encrypt_key.key_material, + pmpriv->aes_key.key_param_set.key_len); + } /** only adhoc aes key_index = MLAN_KEY_INDEX_UNICAST */ - if (pmpriv->bss_mode == MLAN_BSS_MODE_IBSS && - sec->param.encrypt_key.key_len == WPA_AES_KEY_LEN - && sec->param.encrypt_key.key_index & MLAN_KEY_INDEX_UNICAST) { - t_u8 zero_key_material[WPA_AES_KEY_LEN]; - memset(pmadapter, zero_key_material, 0, sizeof(zero_key_material)); - if (memcmp - (pmadapter, sec->param.encrypt_key.key_material, zero_key_material, - WPA_AES_KEY_LEN)) { - PRINTM(MINFO, "Adhoc AES Enabled.\n"); - pmpriv->adhoc_aes_enabled = MTRUE; - remove_key = MFALSE; - } else { - PRINTM(MINFO, "Adhoc AES Disabled.\n"); - pmpriv->adhoc_aes_enabled = MFALSE; - /** clear adhoc AES key */ - remove_key = MTRUE; - pmpriv->aes_key.key_param_set.key_len = 0; - } - } - - if (memcmp - (pmadapter, sec->param.encrypt_key.mac_addr, broadcast_mac_addr, - MLAN_MAC_ADDR_LENGTH)) - sec->param.encrypt_key.key_index = MLAN_KEY_INDEX_UNICAST; - - if (remove_key == MTRUE) { - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_KEY_MATERIAL, - HostCmd_ACT_GEN_SET, - !(KEY_INFO_ENABLED), - (t_void *) pioctl_req, &sec->param.encrypt_key); - } else { - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_KEY_MATERIAL, - HostCmd_ACT_GEN_SET, - KEY_INFO_ENABLED, - (t_void *) pioctl_req, &sec->param.encrypt_key); - } - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - exit: - LEAVE(); - return ret; + if (pmpriv->bss_mode == MLAN_BSS_MODE_IBSS && + sec->param.encrypt_key.key_len == WPA_AES_KEY_LEN + && sec->param.encrypt_key.key_index & MLAN_KEY_INDEX_UNICAST) { + t_u8 zero_key_material[WPA_AES_KEY_LEN]; + memset(pmadapter, zero_key_material, 0, + sizeof(zero_key_material)); + if (memcmp + (pmadapter, sec->param.encrypt_key.key_material, + zero_key_material, WPA_AES_KEY_LEN)) { + PRINTM(MINFO, "Adhoc AES Enabled.\n"); + pmpriv->adhoc_aes_enabled = MTRUE; + remove_key = MFALSE; + } else { + PRINTM(MINFO, "Adhoc AES Disabled.\n"); + pmpriv->adhoc_aes_enabled = MFALSE; + /** clear adhoc AES key */ + remove_key = MTRUE; + pmpriv->aes_key.key_param_set.key_len = 0; + } + } + + if (memcmp + (pmadapter, sec->param.encrypt_key.mac_addr, broadcast_mac_addr, + MLAN_MAC_ADDR_LENGTH)) + sec->param.encrypt_key.key_index = MLAN_KEY_INDEX_UNICAST; + + if (remove_key == MTRUE) { + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_KEY_MATERIAL, + HostCmd_ACT_GEN_SET, + !(KEY_INFO_ENABLED), + (t_void *) pioctl_req, + &sec->param.encrypt_key); + } else { + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_KEY_MATERIAL, + HostCmd_ACT_GEN_SET, + KEY_INFO_ENABLED, + (t_void *) pioctl_req, + &sec->param.encrypt_key); + } + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +exit: + LEAVE(); + return ret; } -/** +/** * @brief Get security keys * * @param pmadapter A pointer to mlan_adapter structure @@ -2796,105 +2920,110 @@ wlan_sec_ioctl_set_wpa_key(IN pmlan_adapter pmadapter, */ static mlan_status wlan_sec_ioctl_get_key(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_sec_cfg *sec = MNULL; - int index; - ENTER(); - - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - - if ((sec->param.encrypt_key.key_index == MLAN_KEY_INDEX_UNICAST) && - (sec->param.encrypt_key.key_len == WPA_AES_KEY_LEN)) { - if (pmpriv->adhoc_aes_enabled == MTRUE && - (pmpriv->aes_key.key_param_set.key_len == WPA_AES_KEY_LEN)) { - HEXDUMP("Get ADHOCAES Key", pmpriv->aes_key.key_param_set.key, - WPA_AES_KEY_LEN); - memcpy(pmadapter, sec->param.encrypt_key.key_material, - pmpriv->aes_key.key_param_set.key, WPA_AES_KEY_LEN); - LEAVE(); - return ret; - } else { - PRINTM(MERROR, " ADHOCAES key is not set yet!\n"); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - LEAVE(); - return ret; - } - } - if (pmpriv->wep_key_curr_index >= MRVL_NUM_WEP_KEY) - pmpriv->wep_key_curr_index = 0; - - if ((pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled) - || (pmpriv->sec_info.wep_status == Wlan802_11WEPKeyAbsent) - || pmpriv->sec_info.ewpa_enabled - || pmpriv->sec_info.wpa_enabled - || pmpriv->sec_info.wpa2_enabled || pmpriv->adhoc_aes_enabled) { - sec->param.encrypt_key.key_disable = MFALSE; - } else { - sec->param.encrypt_key.key_disable = MTRUE; - } - if (sec->param.encrypt_key.key_index == MLAN_KEY_INDEX_DEFAULT) { - if ((pmpriv->wep_key[pmpriv->wep_key_curr_index].key_length) && - (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled)) { - index = pmpriv->wep_key_curr_index; - sec->param.encrypt_key.key_index = pmpriv->wep_key[index].key_index; - memcpy(pmadapter, sec->param.encrypt_key.key_material, - pmpriv->wep_key[index].key_material, MIN(MLAN_MAX_KEY_LENGTH, - pmpriv-> - wep_key[index]. - key_length)); - sec->param.encrypt_key.key_len = - MIN(MLAN_MAX_KEY_LENGTH, pmpriv->wep_key[index].key_length); - } else if ((pmpriv->sec_info.wpa_enabled) - || (pmpriv->sec_info.ewpa_enabled) - || (pmpriv->sec_info.wpa2_enabled) - || (pmpriv->sec_info.wapi_enabled) - || (pmpriv->adhoc_aes_enabled) - ) { - /* Return WPA enabled */ - sec->param.encrypt_key.key_disable = MFALSE; - memcpy(pmadapter, sec->param.encrypt_key.key_material, - pmpriv->aes_key.key_param_set.key, MIN(MLAN_MAX_KEY_LENGTH, - pmpriv->aes_key. - key_param_set. - key_len)); - sec->param.encrypt_key.key_len = - MIN(MLAN_MAX_KEY_LENGTH, pmpriv->aes_key.key_param_set.key_len); - } else { - sec->param.encrypt_key.key_disable = MTRUE; - } - } else { - index = sec->param.encrypt_key.key_index; - if (pmpriv->wep_key[index].key_length) { - sec->param.encrypt_key.key_index = pmpriv->wep_key[index].key_index; - memcpy(pmadapter, sec->param.encrypt_key.key_material, - pmpriv->wep_key[index].key_material, MIN(MLAN_MAX_KEY_LENGTH, - pmpriv-> - wep_key[index]. - key_length)); - sec->param.encrypt_key.key_len = - MIN(MLAN_MAX_KEY_LENGTH, pmpriv->wep_key[index].key_length); - } else if ((pmpriv->sec_info.wpa_enabled) - || (pmpriv->sec_info.ewpa_enabled) - || (pmpriv->sec_info.wpa2_enabled) - || (pmpriv->sec_info.wapi_enabled) - || (pmpriv->adhoc_aes_enabled) - ) { - /* Return WPA enabled */ - sec->param.encrypt_key.key_disable = MFALSE; - } else { - sec->param.encrypt_key.key_disable = MTRUE; - } - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_sec_cfg *sec = MNULL; + int index; + ENTER(); + + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + + if ((sec->param.encrypt_key.key_index == MLAN_KEY_INDEX_UNICAST) && + (sec->param.encrypt_key.key_len == WPA_AES_KEY_LEN)) { + if (pmpriv->adhoc_aes_enabled == MTRUE && + (pmpriv->aes_key.key_param_set.key_len == + WPA_AES_KEY_LEN)) { + HEXDUMP("Get ADHOCAES Key", + pmpriv->aes_key.key_param_set.key, + WPA_AES_KEY_LEN); + memcpy(pmadapter, sec->param.encrypt_key.key_material, + pmpriv->aes_key.key_param_set.key, + WPA_AES_KEY_LEN); + LEAVE(); + return ret; + } else { + PRINTM(MERROR, " ADHOCAES key is not set yet!\n"); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + LEAVE(); + return ret; + } + } + if (pmpriv->wep_key_curr_index >= MRVL_NUM_WEP_KEY) + pmpriv->wep_key_curr_index = 0; + + if ((pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled) + || (pmpriv->sec_info.wep_status == Wlan802_11WEPKeyAbsent) + || pmpriv->sec_info.ewpa_enabled + || pmpriv->sec_info.wpa_enabled + || pmpriv->sec_info.wpa2_enabled || pmpriv->adhoc_aes_enabled) { + sec->param.encrypt_key.key_disable = MFALSE; + } else { + sec->param.encrypt_key.key_disable = MTRUE; + } + if (sec->param.encrypt_key.key_index == MLAN_KEY_INDEX_DEFAULT) { + if ((pmpriv->wep_key[pmpriv->wep_key_curr_index].key_length) && + (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled)) { + index = pmpriv->wep_key_curr_index; + sec->param.encrypt_key.key_index = + pmpriv->wep_key[index].key_index; + memcpy(pmadapter, sec->param.encrypt_key.key_material, + pmpriv->wep_key[index].key_material, + MIN(MLAN_MAX_KEY_LENGTH, + pmpriv->wep_key[index].key_length)); + sec->param.encrypt_key.key_len = + MIN(MLAN_MAX_KEY_LENGTH, + pmpriv->wep_key[index].key_length); + } else if ((pmpriv->sec_info.wpa_enabled) + || (pmpriv->sec_info.ewpa_enabled) + || (pmpriv->sec_info.wpa2_enabled) + || (pmpriv->sec_info.wapi_enabled) + || (pmpriv->adhoc_aes_enabled) + ) { + /* Return WPA enabled */ + sec->param.encrypt_key.key_disable = MFALSE; + memcpy(pmadapter, sec->param.encrypt_key.key_material, + pmpriv->aes_key.key_param_set.key, + MIN(MLAN_MAX_KEY_LENGTH, + pmpriv->aes_key.key_param_set.key_len)); + sec->param.encrypt_key.key_len = + MIN(MLAN_MAX_KEY_LENGTH, + pmpriv->aes_key.key_param_set.key_len); + } else { + sec->param.encrypt_key.key_disable = MTRUE; + } + } else { + index = sec->param.encrypt_key.key_index; + if (pmpriv->wep_key[index].key_length) { + sec->param.encrypt_key.key_index = + pmpriv->wep_key[index].key_index; + memcpy(pmadapter, sec->param.encrypt_key.key_material, + pmpriv->wep_key[index].key_material, + MIN(MLAN_MAX_KEY_LENGTH, + pmpriv->wep_key[index].key_length)); + sec->param.encrypt_key.key_len = + MIN(MLAN_MAX_KEY_LENGTH, + pmpriv->wep_key[index].key_length); + } else if ((pmpriv->sec_info.wpa_enabled) + || (pmpriv->sec_info.ewpa_enabled) + || (pmpriv->sec_info.wpa2_enabled) + || (pmpriv->sec_info.wapi_enabled) + || (pmpriv->adhoc_aes_enabled) + ) { + /* Return WPA enabled */ + sec->param.encrypt_key.key_disable = MFALSE; + } else { + sec->param.encrypt_key.key_disable = MTRUE; + } + } + + LEAVE(); + return ret; } -/** +/** * @brief Set security key(s) * * @param pmadapter A pointer to mlan_adapter structure @@ -2904,27 +3033,30 @@ wlan_sec_ioctl_get_key(IN pmlan_adapter pmadapter, */ static mlan_status wlan_sec_ioctl_encrypt_key(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_sec_cfg *sec = MNULL; - ENTER(); - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) { - if (sec->param.encrypt_key.is_wapi_key) - status = wlan_sec_ioctl_set_wapi_key(pmadapter, pioctl_req); - else if (sec->param.encrypt_key.key_len > MAX_WEP_KEY_SIZE) - status = wlan_sec_ioctl_set_wpa_key(pmadapter, pioctl_req); - else - status = wlan_sec_ioctl_set_wep_key(pmadapter, pioctl_req); - } else { - status = wlan_sec_ioctl_get_key(pmadapter, pioctl_req); - } - LEAVE(); - return status; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_sec_cfg *sec = MNULL; + ENTER(); + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) { + if (sec->param.encrypt_key.is_wapi_key) + status = wlan_sec_ioctl_set_wapi_key(pmadapter, + pioctl_req); + else if (sec->param.encrypt_key.key_len > MAX_WEP_KEY_SIZE) + status = wlan_sec_ioctl_set_wpa_key(pmadapter, + pioctl_req); + else + status = wlan_sec_ioctl_set_wep_key(pmadapter, + pioctl_req); + } else { + status = wlan_sec_ioctl_get_key(pmadapter, pioctl_req); + } + LEAVE(); + return status; } -/** +/** * @brief Set/Get WPA passphrase for esupplicant * * @param pmadapter A pointer to mlan_adapter structure @@ -2934,58 +3066,65 @@ wlan_sec_ioctl_encrypt_key(IN pmlan_adapter pmadapter, */ static mlan_status wlan_sec_ioctl_passphrase(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_sec_cfg *sec = MNULL; - t_u16 cmd_action = 0; - BSSDescriptor_t *pbss_desc; - int i = 0; - - ENTER(); - - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) { - if (sec->param.passphrase.psk_type == MLAN_PSK_CLEAR) - cmd_action = HostCmd_ACT_GEN_REMOVE; - else - cmd_action = HostCmd_ACT_GEN_SET; - } else { - if (sec->param.passphrase.psk_type == MLAN_PSK_QUERY) { - if (sec->param.passphrase.ssid.ssid_len == 0) { - i = wlan_find_bssid_in_list(pmpriv, - (t_u8 *) & sec->param.passphrase. - bssid, MLAN_BSS_MODE_AUTO); - if (i >= 0) { - pbss_desc = &pmadapter->pscan_table[i]; - memcpy(pmadapter, &sec->param.passphrase.ssid, - &pbss_desc->ssid, sizeof(mlan_802_11_ssid)); - memset(pmadapter, &sec->param.passphrase.bssid, 0, - MLAN_MAC_ADDR_LENGTH); - PRINTM(MINFO, "PSK_QUERY: found ssid=%s\n", - sec->param.passphrase.ssid.ssid); - } - } else - memset(pmadapter, &sec->param.passphrase.bssid, 0, - MLAN_MAC_ADDR_LENGTH); - } - cmd_action = HostCmd_ACT_GEN_GET; - } - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_SUPPLICANT_PMK, - cmd_action, - 0, (t_void *) pioctl_req, &sec->param.passphrase); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_sec_cfg *sec = MNULL; + t_u16 cmd_action = 0; + BSSDescriptor_t *pbss_desc; + int i = 0; + + ENTER(); + + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) { + if (sec->param.passphrase.psk_type == MLAN_PSK_CLEAR) + cmd_action = HostCmd_ACT_GEN_REMOVE; + else + cmd_action = HostCmd_ACT_GEN_SET; + } else { + if (sec->param.passphrase.psk_type == MLAN_PSK_QUERY) { + if (sec->param.passphrase.ssid.ssid_len == 0) { + i = wlan_find_bssid_in_list(pmpriv, + (t_u8 *) & sec-> + param.passphrase. + bssid, + MLAN_BSS_MODE_AUTO); + if (i >= 0) { + pbss_desc = &pmadapter->pscan_table[i]; + memcpy(pmadapter, + &sec->param.passphrase.ssid, + &pbss_desc->ssid, + sizeof(mlan_802_11_ssid)); + memset(pmadapter, + &sec->param.passphrase.bssid, 0, + MLAN_MAC_ADDR_LENGTH); + PRINTM(MINFO, + "PSK_QUERY: found ssid=%s\n", + sec->param.passphrase.ssid.ssid); + } + } else + memset(pmadapter, &sec->param.passphrase.bssid, + 0, MLAN_MAC_ADDR_LENGTH); + } + cmd_action = HostCmd_ACT_GEN_GET; + } + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_SUPPLICANT_PMK, + cmd_action, + 0, + (t_void *) pioctl_req, &sec->param.passphrase); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } -/** +/** * @brief Set/Get esupplicant status * * @param pmadapter A pointer to mlan_adapter structure @@ -2995,26 +3134,26 @@ wlan_sec_ioctl_passphrase(IN pmlan_adapter pmadapter, */ static mlan_status wlan_sec_ioctl_ewpa_enable(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_sec_cfg *sec = MNULL; - ENTER(); - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) { - sec->param.ewpa_enabled = pmpriv->sec_info.ewpa_enabled; - } else { - pmpriv->sec_info.ewpa_enabled = (t_u8) sec->param.ewpa_enabled; - PRINTM(MINFO, "Set: ewpa_enabled = %d\n", - (int) pmpriv->sec_info.ewpa_enabled); - } - pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_sec_cfg *sec = MNULL; + ENTER(); + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) { + sec->param.ewpa_enabled = pmpriv->sec_info.ewpa_enabled; + } else { + pmpriv->sec_info.ewpa_enabled = (t_u8) sec->param.ewpa_enabled; + PRINTM(MINFO, "Set: ewpa_enabled = %d\n", + (int)pmpriv->sec_info.ewpa_enabled); + } + pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; + LEAVE(); + return ret; } -/** +/** * @brief Get esupplicant mode * * @param pmadapter A pointer to mlan_adapter structure @@ -3024,74 +3163,78 @@ wlan_sec_ioctl_ewpa_enable(IN pmlan_adapter pmadapter, */ static mlan_status wlan_sec_ioctl_esupp_mode(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - t_u16 cmd_action = 0; - mlan_ds_sec_cfg *sec = MNULL; - - ENTER(); - - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) { - cmd_action = HostCmd_ACT_GEN_SET; - if (pmpriv->media_connected == MTRUE) { - PRINTM(MERROR, - "Cannot set esupplicant mode configuration while connected.\n"); - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - if (!sec->param.esupp_mode.rsn_mode || - (sec->param.esupp_mode.rsn_mode & RSN_TYPE_VALID_BITS) - != sec->param.esupp_mode.rsn_mode) { - PRINTM(MERROR, "Invalid RSN mode\n"); - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - if (!sec->param.esupp_mode.act_paircipher || - (sec->param.esupp_mode.act_paircipher & EMBED_CIPHER_VALID_BITS) - != sec->param.esupp_mode.act_paircipher) { - PRINTM(MERROR, "Invalid pairwise cipher\n"); - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - if (!sec->param.esupp_mode.act_groupcipher || - (sec->param.esupp_mode.act_groupcipher & EMBED_CIPHER_VALID_BITS) - != sec->param.esupp_mode.act_groupcipher) { - PRINTM(MERROR, "Invalid group cipher\n"); - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - } else { - cmd_action = HostCmd_ACT_GEN_GET_CURRENT; - } - - /* Send request to firmware */ - if (sec) { - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_SUPPLICANT_PROFILE, - cmd_action, - 0, - (t_void *) pioctl_req, &sec->param.esupp_mode); - } else { - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_SUPPLICANT_PROFILE, - cmd_action, 0, (t_void *) pioctl_req, MNULL); - } - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - exit: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + t_u16 cmd_action = 0; + mlan_ds_sec_cfg *sec = MNULL; + + ENTER(); + + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) { + cmd_action = HostCmd_ACT_GEN_SET; + if (pmpriv->media_connected == MTRUE) { + PRINTM(MERROR, + "Cannot set esupplicant mode configuration while connected.\n"); + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + if (!sec->param.esupp_mode.rsn_mode || + (sec->param.esupp_mode.rsn_mode & RSN_TYPE_VALID_BITS) + != sec->param.esupp_mode.rsn_mode) { + PRINTM(MERROR, "Invalid RSN mode\n"); + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + if (!sec->param.esupp_mode.act_paircipher || + (sec->param.esupp_mode. + act_paircipher & EMBED_CIPHER_VALID_BITS) + != sec->param.esupp_mode.act_paircipher) { + PRINTM(MERROR, "Invalid pairwise cipher\n"); + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + if (!sec->param.esupp_mode.act_groupcipher || + (sec->param.esupp_mode. + act_groupcipher & EMBED_CIPHER_VALID_BITS) + != sec->param.esupp_mode.act_groupcipher) { + PRINTM(MERROR, "Invalid group cipher\n"); + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + } else { + cmd_action = HostCmd_ACT_GEN_GET_CURRENT; + } + + /* Send request to firmware */ + if (sec) { + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_SUPPLICANT_PROFILE, + cmd_action, + 0, + (t_void *) pioctl_req, + &sec->param.esupp_mode); + } else { + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_SUPPLICANT_PROFILE, + cmd_action, + 0, (t_void *) pioctl_req, MNULL); + } + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +exit: + LEAVE(); + return ret; } -/** +/** * @brief Security configuration handler * * @param pmadapter A pointer to mlan_adapter structure @@ -3102,63 +3245,63 @@ wlan_sec_ioctl_esupp_mode(IN pmlan_adapter pmadapter, static mlan_status wlan_sec_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_sec_cfg *sec = MNULL; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_sec_cfg)) { - PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_sec_cfg); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - switch (sec->sub_command) { - case MLAN_OID_SEC_CFG_AUTH_MODE: - status = wlan_sec_ioctl_auth_mode(pmadapter, pioctl_req); - break; - case MLAN_OID_SEC_CFG_ENCRYPT_MODE: - status = wlan_sec_ioctl_encrypt_mode(pmadapter, pioctl_req); - break; - case MLAN_OID_SEC_CFG_WPA_ENABLED: - status = wlan_sec_ioctl_wpa_enable(pmadapter, pioctl_req); - break; - case MLAN_OID_SEC_CFG_WAPI_ENABLED: - status = wlan_sec_ioctl_wapi_enable(pmadapter, pioctl_req); - break; - case MLAN_OID_SEC_CFG_PORT_CTRL_ENABLED: - status = wlan_sec_ioctl_port_ctrl_enable(pmadapter, pioctl_req); - break; - case MLAN_OID_SEC_CFG_ENCRYPT_KEY: - status = wlan_sec_ioctl_encrypt_key(pmadapter, pioctl_req); - break; - case MLAN_OID_SEC_CFG_PASSPHRASE: - status = wlan_sec_ioctl_passphrase(pmadapter, pioctl_req); - break; - case MLAN_OID_SEC_CFG_EWPA_ENABLED: - status = wlan_sec_ioctl_ewpa_enable(pmadapter, pioctl_req); - break; - case MLAN_OID_SEC_CFG_ESUPP_MODE: - status = wlan_sec_ioctl_esupp_mode(pmadapter, pioctl_req); - break; - - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - LEAVE(); - return status; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_sec_cfg *sec = MNULL; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_sec_cfg)) { + PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_sec_cfg); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + switch (sec->sub_command) { + case MLAN_OID_SEC_CFG_AUTH_MODE: + status = wlan_sec_ioctl_auth_mode(pmadapter, pioctl_req); + break; + case MLAN_OID_SEC_CFG_ENCRYPT_MODE: + status = wlan_sec_ioctl_encrypt_mode(pmadapter, pioctl_req); + break; + case MLAN_OID_SEC_CFG_WPA_ENABLED: + status = wlan_sec_ioctl_wpa_enable(pmadapter, pioctl_req); + break; + case MLAN_OID_SEC_CFG_WAPI_ENABLED: + status = wlan_sec_ioctl_wapi_enable(pmadapter, pioctl_req); + break; + case MLAN_OID_SEC_CFG_PORT_CTRL_ENABLED: + status = wlan_sec_ioctl_port_ctrl_enable(pmadapter, pioctl_req); + break; + case MLAN_OID_SEC_CFG_ENCRYPT_KEY: + status = wlan_sec_ioctl_encrypt_key(pmadapter, pioctl_req); + break; + case MLAN_OID_SEC_CFG_PASSPHRASE: + status = wlan_sec_ioctl_passphrase(pmadapter, pioctl_req); + break; + case MLAN_OID_SEC_CFG_EWPA_ENABLED: + status = wlan_sec_ioctl_ewpa_enable(pmadapter, pioctl_req); + break; + case MLAN_OID_SEC_CFG_ESUPP_MODE: + status = wlan_sec_ioctl_esupp_mode(pmadapter, pioctl_req); + break; + + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + LEAVE(); + return status; } -/** - * @brief Append/Reset IE buffer. - * - * Pass an opaque block of data, expected to be IEEE IEs, to the driver - * for eventual passthrough to the firmware in an associate/join +/** + * @brief Append/Reset IE buffer. + * + * Pass an opaque block of data, expected to be IEEE IEs, to the driver + * for eventual passthrough to the firmware in an associate/join * (and potentially start) command. This function is the main body * for both wlan_set_gen_ie_ioctl and wlan_set_gen_ie * @@ -3175,96 +3318,106 @@ wlan_sec_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) static int wlan_set_gen_ie_helper(mlan_private * priv, t_u8 * ie_data_ptr, t_u16 ie_len) { - mlan_status ret = MLAN_STATUS_SUCCESS; - IEEEtypes_VendorHeader_t *pvendor_ie; - const t_u8 wpa_oui[] = { 0x00, 0x50, 0xf2, 0x01 }; - const t_u8 wps_oui[] = { 0x00, 0x50, 0xf2, 0x04 }; - - ENTER(); - - /* If the passed length is zero, reset the buffer */ - if (!ie_len) { - priv->gen_ie_buf_len = 0; - priv->wps.session_enable = MFALSE; - wlan_set_wpa_ie_helper(priv, MNULL, 0); - wlan_set_wapi_ie(priv, MNULL, 0); - } else if (!ie_data_ptr) { - /* MNULL check */ - ret = MLAN_STATUS_FAILURE; - } else { - - pvendor_ie = (IEEEtypes_VendorHeader_t *) ie_data_ptr; - /* Test to see if it is a WPA IE, if not, then it is a gen IE */ - if (((pvendor_ie->element_id == WPA_IE) - && - (!memcmp - (priv->adapter, pvendor_ie->oui, wpa_oui, sizeof(wpa_oui)))) - || (pvendor_ie->element_id == RSN_IE) - ) { - - /* IE is a WPA/WPA2 IE so call set_wpa function */ - ret = wlan_set_wpa_ie_helper(priv, ie_data_ptr, ie_len); - priv->wps.session_enable = MFALSE; - } else if (pvendor_ie->element_id == WAPI_IE) { - /* IE is a WAPI IE so call set_wapi function */ - ret = wlan_set_wapi_ie(priv, ie_data_ptr, ie_len); - } else - if ((pvendor_ie->element_id == WPS_IE) && - (priv->wps.session_enable == MFALSE) && - (!memcmp - (priv->adapter, pvendor_ie->oui, wps_oui, sizeof(wps_oui)))) { - /* - * Discard first two byte (Element ID and Length) - * because they are not needed in the case of setting WPS_IE - */ - if (pvendor_ie->len > 4) { - memcpy(priv->adapter, (t_u8 *) & priv->wps.wps_ie, ie_data_ptr, - ie_len); - HEXDUMP("wps_ie", (t_u8 *) & priv->wps.wps_ie, - priv->wps.wps_ie.vend_hdr.len + 2); - } else { - /* Only wps oui exist, reset driver wps buffer */ - memset(priv->adapter, (t_u8 *) & priv->wps.wps_ie, 0x00, - sizeof(priv->wps.wps_ie)); - PRINTM(MINFO, "wps_ie cleared\n"); - } - } else { - /* - * Verify that the passed length is not larger than the available - * space remaining in the buffer - */ - if (ie_len < (sizeof(priv->gen_ie_buf) - priv->gen_ie_buf_len)) { - - /* Test to see if it is a WPS IE, if so, enable wps session - flag */ - pvendor_ie = (IEEEtypes_VendorHeader_t *) ie_data_ptr; - if ((pvendor_ie->element_id == WPS_IE) - && - (!memcmp - (priv->adapter, pvendor_ie->oui, wps_oui, - sizeof(wps_oui)))) { - priv->wps.session_enable = MTRUE; - PRINTM(MINFO, "WPS Session Enabled.\n"); - } - - /* Append the passed data to the end of the genIeBuffer */ - memcpy(priv->adapter, priv->gen_ie_buf + priv->gen_ie_buf_len, - ie_data_ptr, ie_len); - /* Increment the stored buffer length by the size passed */ - priv->gen_ie_buf_len += ie_len; - } else { - /* Passed data does not fit in the remaining buffer space */ - ret = MLAN_STATUS_FAILURE; - } - } - } - - /* Return MLAN_STATUS_SUCCESS, or MLAN_STATUS_FAILURE for error case */ - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + IEEEtypes_VendorHeader_t *pvendor_ie; + const t_u8 wpa_oui[] = { 0x00, 0x50, 0xf2, 0x01 }; + const t_u8 wps_oui[] = { 0x00, 0x50, 0xf2, 0x04 }; + + ENTER(); + + /* If the passed length is zero, reset the buffer */ + if (!ie_len) { + priv->gen_ie_buf_len = 0; + priv->wps.session_enable = MFALSE; + wlan_set_wpa_ie_helper(priv, MNULL, 0); + wlan_set_wapi_ie(priv, MNULL, 0); + } else if (!ie_data_ptr) { + /* MNULL check */ + ret = MLAN_STATUS_FAILURE; + } else { + + pvendor_ie = (IEEEtypes_VendorHeader_t *) ie_data_ptr; + /* Test to see if it is a WPA IE, if not, then it is a gen IE */ + if (((pvendor_ie->element_id == WPA_IE) + && + (!memcmp + (priv->adapter, pvendor_ie->oui, wpa_oui, + sizeof(wpa_oui)))) + || (pvendor_ie->element_id == RSN_IE) + ) { + + /* IE is a WPA/WPA2 IE so call set_wpa function */ + ret = wlan_set_wpa_ie_helper(priv, ie_data_ptr, ie_len); + priv->wps.session_enable = MFALSE; + } else if (pvendor_ie->element_id == WAPI_IE) { + /* IE is a WAPI IE so call set_wapi function */ + ret = wlan_set_wapi_ie(priv, ie_data_ptr, ie_len); + } else if ((pvendor_ie->element_id == WPS_IE) && + (priv->wps.session_enable == MFALSE) && + (!memcmp + (priv->adapter, pvendor_ie->oui, wps_oui, + sizeof(wps_oui)))) { + /* + * Discard first two byte (Element ID and Length) + * because they are not needed in the case of setting WPS_IE + */ + if (pvendor_ie->len > 4) { + memcpy(priv->adapter, + (t_u8 *) & priv->wps.wps_ie, ie_data_ptr, + ie_len); + HEXDUMP("wps_ie", (t_u8 *) & priv->wps.wps_ie, + priv->wps.wps_ie.vend_hdr.len + 2); + } else { + /* Only wps oui exist, reset driver wps buffer */ + memset(priv->adapter, + (t_u8 *) & priv->wps.wps_ie, 0x00, + sizeof(priv->wps.wps_ie)); + PRINTM(MINFO, "wps_ie cleared\n"); + } + } else { + /* + * Verify that the passed length is not larger than the available + * space remaining in the buffer + */ + if (ie_len < + (sizeof(priv->gen_ie_buf) - priv->gen_ie_buf_len)) { + + /* Test to see if it is a WPS IE, if so, enable + wps session flag */ + pvendor_ie = + (IEEEtypes_VendorHeader_t *) + ie_data_ptr; + if ((pvendor_ie->element_id == WPS_IE) + && + (!memcmp + (priv->adapter, pvendor_ie->oui, wps_oui, + sizeof(wps_oui)))) { + priv->wps.session_enable = MTRUE; + PRINTM(MINFO, "WPS Session Enabled.\n"); + } + + /* Append the passed data to the end of the + genIeBuffer */ + memcpy(priv->adapter, + priv->gen_ie_buf + priv->gen_ie_buf_len, + ie_data_ptr, ie_len); + /* Increment the stored buffer length by the + size passed */ + priv->gen_ie_buf_len += ie_len; + } else { + /* Passed data does not fit in the remaining + buffer space */ + ret = MLAN_STATUS_FAILURE; + } + } + } + + /* Return MLAN_STATUS_SUCCESS, or MLAN_STATUS_FAILURE for error case */ + LEAVE(); + return ret; } -/** +/** * @brief Set/Get WWS mode * * @param pmadapter A pointer to mlan_adapter structure @@ -3274,49 +3427,50 @@ wlan_set_gen_ie_helper(mlan_private * priv, t_u8 * ie_data_ptr, t_u16 ie_len) */ static mlan_status wlan_misc_ioctl_wws_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_misc_cfg *misc_cfg = MNULL; - t_u16 cmd_action = 0; - t_u32 enable = 0; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_misc_cfg)) { - PRINTM(MWARN, "MLAN IOCTL information buffer length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_misc_cfg); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_RESOURCE; - goto exit; - } - - misc_cfg = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) - cmd_action = HostCmd_ACT_GEN_SET; - else - cmd_action = HostCmd_ACT_GEN_GET; - - enable = misc_cfg->param.wws_cfg; - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_SNMP_MIB, - cmd_action, - WwsMode_i, (t_void *) pioctl_req, &enable); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - exit: - LEAVE(); - return ret; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_misc_cfg *misc_cfg = MNULL; + t_u16 cmd_action = 0; + t_u32 enable = 0; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_misc_cfg)) { + PRINTM(MWARN, + "MLAN IOCTL information buffer length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_misc_cfg); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_RESOURCE; + goto exit; + } + + misc_cfg = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) + cmd_action = HostCmd_ACT_GEN_SET; + else + cmd_action = HostCmd_ACT_GEN_GET; + + enable = misc_cfg->param.wws_cfg; + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_SNMP_MIB, + cmd_action, + WwsMode_i, (t_void *) pioctl_req, &enable); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +exit: + LEAVE(); + return ret; } -/** +/** * @brief Set/Get 11D status * * @param pmadapter A pointer to mlan_adapter structure @@ -3326,48 +3480,54 @@ wlan_misc_ioctl_wws_cfg(IN pmlan_adapter pmadapter, */ static mlan_status wlan_11d_cfg_ioctl_enable(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_11d_cfg *pcfg_11d = MNULL; - - ENTER(); - - pcfg_11d = (mlan_ds_11d_cfg *) pioctl_req->pbuf; - - if (pioctl_req->action == MLAN_ACT_SET) { - if (pmpriv->media_connected == MTRUE) { - PRINTM(MIOCTL, - "11D setting cannot be changed while interface is active.\n"); - ret = MLAN_STATUS_FAILURE; - goto done; - } - - PRINTM(MINFO, "11D: 11dcfg SET=%d\n", pcfg_11d->param.enable_11d); - - /* Compare with current settings */ - if (pmpriv->state_11d.user_enable_11d != pcfg_11d->param.enable_11d) { - ret = - wlan_11d_enable(pmpriv, pioctl_req, - (state_11d_t) pcfg_11d->param.enable_11d); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - } else { - PRINTM(MINFO, "11D: same as current setting, do nothing\n"); - } - } else { - pcfg_11d->param.enable_11d = (t_u32) pmpriv->state_11d.user_enable_11d; - pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; - PRINTM(MINFO, "11D: 11dcfg GET=%d\n", pcfg_11d->param.enable_11d); - } - - done: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_11d_cfg *pcfg_11d = MNULL; + + ENTER(); + + pcfg_11d = (mlan_ds_11d_cfg *) pioctl_req->pbuf; + + if (pioctl_req->action == MLAN_ACT_SET) { + if (pmpriv->media_connected == MTRUE) { + PRINTM(MIOCTL, + "11D setting cannot be changed while interface is active.\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } + + PRINTM(MINFO, "11D: 11dcfg SET=%d\n", + pcfg_11d->param.enable_11d); + + /* Compare with current settings */ + if (pmpriv->state_11d.user_enable_11d != + pcfg_11d->param.enable_11d) { + ret = wlan_11d_enable(pmpriv, pioctl_req, + (state_11d_t) pcfg_11d->param. + enable_11d); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + } else { + PRINTM(MINFO, + "11D: same as current setting, do nothing\n"); + } + } else { + pcfg_11d->param.enable_11d = + (t_u32) pmpriv->state_11d.user_enable_11d; + pioctl_req->data_read_written = + sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; + PRINTM(MINFO, "11D: 11dcfg GET=%d\n", + pcfg_11d->param.enable_11d); + } + +done: + LEAVE(); + return ret; } -/** +/** * @brief Clear 11D chan table * * @param pmadapter A pointer to mlan_adapter structure @@ -3377,27 +3537,27 @@ wlan_11d_cfg_ioctl_enable(IN pmlan_adapter pmadapter, */ static mlan_status wlan_11d_clr_chan_table(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - ENTER(); + ENTER(); - if (pioctl_req->action == MLAN_ACT_SET) { - PRINTM(MINFO, "11D: 11dclrtbl SET\n"); + if (pioctl_req->action == MLAN_ACT_SET) { + PRINTM(MINFO, "11D: 11dclrtbl SET\n"); - if (wlan_11d_clear_parsedtable(pmpriv) == MLAN_STATUS_SUCCESS) - PRINTM(MINFO, - "11D: cleared parsed_region_chan (now no_of_chan=%d)\n", - pmadapter->parsed_region_chan.no_of_chan); - } + if (wlan_11d_clear_parsedtable(pmpriv) == MLAN_STATUS_SUCCESS) + PRINTM(MINFO, + "11D: cleared parsed_region_chan (now no_of_chan=%d)\n", + pmadapter->parsed_region_chan.no_of_chan); + } - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief 11D configuration handler * * @param pmadapter A pointer to mlan_adapter structure @@ -3408,43 +3568,43 @@ wlan_11d_clr_chan_table(IN pmlan_adapter pmadapter, static mlan_status wlan_11d_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_11d_cfg *pcfg_11d = MNULL; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_11d_cfg)) { - PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_11d_cfg); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - status = MLAN_STATUS_RESOURCE; - goto exit; - } - - pcfg_11d = (mlan_ds_11d_cfg *) pioctl_req->pbuf; - switch (pcfg_11d->sub_command) { - case MLAN_OID_11D_CFG_ENABLE: - status = wlan_11d_cfg_ioctl_enable(pmadapter, pioctl_req); - break; - case MLAN_OID_11D_CLR_CHAN_TABLE: - status = wlan_11d_clr_chan_table(pmadapter, pioctl_req); - break; - case MLAN_OID_11D_DOMAIN_INFO: - status = wlan_11d_cfg_domain_info(pmadapter, pioctl_req); - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - - exit: - LEAVE(); - return status; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_11d_cfg *pcfg_11d = MNULL; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_11d_cfg)) { + PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_11d_cfg); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + status = MLAN_STATUS_RESOURCE; + goto exit; + } + + pcfg_11d = (mlan_ds_11d_cfg *) pioctl_req->pbuf; + switch (pcfg_11d->sub_command) { + case MLAN_OID_11D_CFG_ENABLE: + status = wlan_11d_cfg_ioctl_enable(pmadapter, pioctl_req); + break; + case MLAN_OID_11D_CLR_CHAN_TABLE: + status = wlan_11d_clr_chan_table(pmadapter, pioctl_req); + break; + case MLAN_OID_11D_DOMAIN_INFO: + status = wlan_11d_cfg_domain_info(pmadapter, pioctl_req); + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + +exit: + LEAVE(); + return status; } -/** +/** * @brief WPS configuration handler * * @param pmadapter A pointer to mlan_adapter structure @@ -3455,46 +3615,49 @@ wlan_11d_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) static mlan_status wlan_wps_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_wps_cfg *pwps = MNULL; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_wps_cfg)) { - PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_wps_cfg); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - - pwps = (mlan_ds_wps_cfg *) pioctl_req->pbuf; - switch (pwps->sub_command) { - case MLAN_OID_WPS_CFG_SESSION: - if (pioctl_req->action == MLAN_ACT_SET) { - if (pwps->param.wps_session == MLAN_WPS_CFG_SESSION_START) - pmpriv->wps.session_enable = MTRUE; - else - pmpriv->wps.session_enable = MFALSE; - } else { - pwps->param.wps_session = (t_u32) pmpriv->wps.session_enable; - pioctl_req->data_read_written = sizeof(t_u32); - PRINTM(MINFO, "wpscfg GET=%d\n", pwps->param.wps_session); - } - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - - LEAVE(); - return status; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_wps_cfg *pwps = MNULL; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_wps_cfg)) { + PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_wps_cfg); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + + pwps = (mlan_ds_wps_cfg *) pioctl_req->pbuf; + switch (pwps->sub_command) { + case MLAN_OID_WPS_CFG_SESSION: + if (pioctl_req->action == MLAN_ACT_SET) { + if (pwps->param.wps_session == + MLAN_WPS_CFG_SESSION_START) + pmpriv->wps.session_enable = MTRUE; + else + pmpriv->wps.session_enable = MFALSE; + } else { + pwps->param.wps_session = + (t_u32) pmpriv->wps.session_enable; + pioctl_req->data_read_written = sizeof(t_u32); + PRINTM(MINFO, "wpscfg GET=%d\n", + pwps->param.wps_session); + } + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + + LEAVE(); + return status; } -/** +/** * @brief register memory access handler * * @param pmadapter A pointer to mlan_adapter structure @@ -3505,40 +3668,40 @@ wlan_wps_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) static mlan_status wlan_reg_mem_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_reg_mem *reg_mem = MNULL; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_reg_mem)) { - PRINTM(MWARN, "MLAN REG_MEM IOCTL length is too short\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_reg_mem); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - reg_mem = (mlan_ds_reg_mem *) pioctl_req->pbuf; - switch (reg_mem->sub_command) { - case MLAN_OID_REG_RW: - status = wlan_reg_mem_ioctl_reg_rw(pmadapter, pioctl_req); - break; - case MLAN_OID_EEPROM_RD: - status = wlan_reg_mem_ioctl_read_eeprom(pmadapter, pioctl_req); - break; - case MLAN_OID_MEM_RW: - status = wlan_reg_mem_ioctl_mem_rw(pmadapter, pioctl_req); - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - LEAVE(); - return status; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_reg_mem *reg_mem = MNULL; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_reg_mem)) { + PRINTM(MWARN, "MLAN REG_MEM IOCTL length is too short\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_reg_mem); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + reg_mem = (mlan_ds_reg_mem *) pioctl_req->pbuf; + switch (reg_mem->sub_command) { + case MLAN_OID_REG_RW: + status = wlan_reg_mem_ioctl_reg_rw(pmadapter, pioctl_req); + break; + case MLAN_OID_EEPROM_RD: + status = wlan_reg_mem_ioctl_read_eeprom(pmadapter, pioctl_req); + break; + case MLAN_OID_MEM_RW: + status = wlan_reg_mem_ioctl_mem_rw(pmadapter, pioctl_req); + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + LEAVE(); + return status; } -/** +/** * @brief 802.11h ad-hoc start channel check * * @param pmadapter A pointer to mlan_adapter structure @@ -3548,58 +3711,62 @@ wlan_reg_mem_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_11h_channel_check_req(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = MNULL; - mlan_status ret = MLAN_STATUS_FAILURE; - - ENTER(); - - if (pioctl_req != MNULL) { - pmpriv = pmadapter->priv[pioctl_req->bss_index]; - } else { - PRINTM(MERROR, "MLAN IOCTL information is not present\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - pmpriv->adhoc_state = ADHOC_STARTING; - - if ((pmadapter->adhoc_start_band & BAND_A) - || (pmadapter->adhoc_start_band & BAND_AN) - ) { - if (pmpriv->intf_state_11h.adhoc_auto_sel_chan) - pmpriv->adhoc_channel = wlan_11h_get_adhoc_start_channel(pmpriv); - - /* - * Check if the region and channel requires a channel availability - * check. - */ - if (wlan_11h_radar_detect_required(pmpriv, pmpriv->adhoc_channel) - && !wlan_11h_is_channel_under_nop(pmadapter, pmpriv->adhoc_channel) - ) { - /* - * Radar detection is required for this channel, make sure - * 11h is activated in the firmware - */ - ret = wlan_11h_activate(pmpriv, MNULL, MTRUE); - ret = wlan_11h_config_master_radar_det(pmpriv, MTRUE); - ret = wlan_11h_check_update_radar_det_state(pmpriv); - - /* Check for radar on the channel */ - ret = wlan_11h_issue_radar_detect(pmpriv, pioctl_req, - pmpriv->adhoc_channel); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - } - } - - LEAVE(); - return ret; + pmlan_private pmpriv = MNULL; + mlan_status ret = MLAN_STATUS_FAILURE; + + ENTER(); + + if (pioctl_req != MNULL) { + pmpriv = pmadapter->priv[pioctl_req->bss_index]; + } else { + PRINTM(MERROR, "MLAN IOCTL information is not present\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + pmpriv->adhoc_state = ADHOC_STARTING; + + if ((pmadapter->adhoc_start_band & BAND_A) + || (pmadapter->adhoc_start_band & BAND_AN) + ) { + if (pmpriv->intf_state_11h.adhoc_auto_sel_chan) + pmpriv->adhoc_channel = + wlan_11h_get_adhoc_start_channel(pmpriv); + + /* + * Check if the region and channel requires a channel availability + * check. + */ + if (wlan_11h_radar_detect_required + (pmpriv, pmpriv->adhoc_channel) + && !wlan_11h_is_channel_under_nop(pmadapter, + pmpriv->adhoc_channel) + ) { + /* + * Radar detection is required for this channel, make sure + * 11h is activated in the firmware + */ + ret = wlan_11h_activate(pmpriv, MNULL, MTRUE); + ret = wlan_11h_config_master_radar_det(pmpriv, MTRUE); + ret = wlan_11h_check_update_radar_det_state(pmpriv); + + /* Check for radar on the channel */ + ret = wlan_11h_issue_radar_detect(pmpriv, pioctl_req, + pmpriv-> + adhoc_channel); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + } + } + + LEAVE(); + return ret; } -/** - * @brief 802.11h set/get local power constraint +/** + * @brief 802.11h set/get local power constraint * * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer @@ -3608,25 +3775,25 @@ wlan_11h_channel_check_req(IN pmlan_adapter pmadapter, */ static mlan_status wlan_11h_ioctl_local_power_constraint(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_ds_11h_cfg *ds_11hcfg = MNULL; - t_s8 *plocalpower = &pmadapter->state_11h.usr_def_power_constraint; + mlan_ds_11h_cfg *ds_11hcfg = MNULL; + t_s8 *plocalpower = &pmadapter->state_11h.usr_def_power_constraint; - ENTER(); + ENTER(); - ds_11hcfg = (mlan_ds_11h_cfg *) pioctl_req->pbuf; + ds_11hcfg = (mlan_ds_11h_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) - ds_11hcfg->param.usr_local_power_constraint = *plocalpower; - else - *plocalpower = ds_11hcfg->param.usr_local_power_constraint; + if (pioctl_req->action == MLAN_ACT_GET) + ds_11hcfg->param.usr_local_power_constraint = *plocalpower; + else + *plocalpower = ds_11hcfg->param.usr_local_power_constraint; - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief 11h configuration handler * * @param pmadapter A pointer to mlan_adapter structure @@ -3637,44 +3804,45 @@ wlan_11h_ioctl_local_power_constraint(IN pmlan_adapter pmadapter, static mlan_status wlan_11h_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_11h_cfg *ds_11hcfg = MNULL; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_11h_cfg)) { - PRINTM(MWARN, "MLAN 11H IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_11h_cfg); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - ds_11hcfg = (mlan_ds_11h_cfg *) pioctl_req->pbuf; - - switch (ds_11hcfg->sub_command) { - case MLAN_OID_11H_CHANNEL_CHECK: - status = wlan_11h_channel_check_req(pmadapter, pioctl_req); - break; - case MLAN_OID_11H_LOCAL_POWER_CONSTRAINT: - status = wlan_11h_ioctl_local_power_constraint(pmadapter, pioctl_req); - break; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_11h_cfg *ds_11hcfg = MNULL; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_11h_cfg)) { + PRINTM(MWARN, "MLAN 11H IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_11h_cfg); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + ds_11hcfg = (mlan_ds_11h_cfg *) pioctl_req->pbuf; + + switch (ds_11hcfg->sub_command) { + case MLAN_OID_11H_CHANNEL_CHECK: + status = wlan_11h_channel_check_req(pmadapter, pioctl_req); + break; + case MLAN_OID_11H_LOCAL_POWER_CONSTRAINT: + status = wlan_11h_ioctl_local_power_constraint(pmadapter, + pioctl_req); + break; #if defined(DFS_TESTING_SUPPORT) - case MLAN_OID_11H_DFS_TESTING: - status = wlan_11h_ioctl_dfs_testing(pmadapter, pioctl_req); - break; + case MLAN_OID_11H_DFS_TESTING: + status = wlan_11h_ioctl_dfs_testing(pmadapter, pioctl_req); + break; #endif - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - - LEAVE(); - return status; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + + LEAVE(); + return status; } -/** +/** * @brief Set/Get generic IE * * @param pmadapter A pointer to mlan_adapter structure @@ -3684,57 +3852,60 @@ wlan_11h_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_misc_ioctl_gen_ie(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_misc_cfg *misc = MNULL; - - ENTER(); - - misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - switch (misc->param.gen_ie.type) { - case MLAN_IE_TYPE_GEN_IE: - if (pioctl_req->action == MLAN_ACT_GET) { - misc->param.gen_ie.len = pmpriv->wpa_ie_len; - memcpy(pmadapter, misc->param.gen_ie.ie_data, pmpriv->wpa_ie, - misc->param.gen_ie.len); - } else { - wlan_set_gen_ie_helper(pmpriv, misc->param.gen_ie.ie_data, - (t_u16) misc->param.gen_ie.len); - } - break; - case MLAN_IE_TYPE_ARP_FILTER: - memset(pmadapter, pmadapter->arp_filter, 0, - sizeof(pmadapter->arp_filter)); - if (misc->param.gen_ie.len > ARP_FILTER_MAX_BUF_SIZE) { - pmadapter->arp_filter_size = 0; - PRINTM(MERROR, "Invalid ARP Filter Size\n"); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - } else if (misc->param.gen_ie.len <= sizeof(MrvlIEtypesHeader_t)) { - pmadapter->arp_filter_size = 0; - PRINTM(MINFO, "Clear ARP filter\n"); - } else { - memcpy(pmadapter, pmadapter->arp_filter, misc->param.gen_ie.ie_data, - misc->param.gen_ie.len); - pmadapter->arp_filter_size = misc->param.gen_ie.len; - HEXDUMP("ArpFilter", pmadapter->arp_filter, - pmadapter->arp_filter_size); - } - break; - default: - PRINTM(MERROR, "Invalid IE type\n"); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - } - pioctl_req->data_read_written = - sizeof(mlan_ds_misc_gen_ie) + MLAN_SUB_COMMAND_SIZE; - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_misc_cfg *misc = MNULL; + + ENTER(); + + misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + switch (misc->param.gen_ie.type) { + case MLAN_IE_TYPE_GEN_IE: + if (pioctl_req->action == MLAN_ACT_GET) { + misc->param.gen_ie.len = pmpriv->wpa_ie_len; + memcpy(pmadapter, misc->param.gen_ie.ie_data, + pmpriv->wpa_ie, misc->param.gen_ie.len); + } else { + wlan_set_gen_ie_helper(pmpriv, + misc->param.gen_ie.ie_data, + (t_u16) misc->param.gen_ie.len); + } + break; + case MLAN_IE_TYPE_ARP_FILTER: + memset(pmadapter, pmadapter->arp_filter, 0, + sizeof(pmadapter->arp_filter)); + if (misc->param.gen_ie.len > ARP_FILTER_MAX_BUF_SIZE) { + pmadapter->arp_filter_size = 0; + PRINTM(MERROR, "Invalid ARP Filter Size\n"); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + } else if (misc->param.gen_ie.len <= + sizeof(MrvlIEtypesHeader_t)) { + pmadapter->arp_filter_size = 0; + PRINTM(MINFO, "Clear ARP filter\n"); + } else { + memcpy(pmadapter, pmadapter->arp_filter, + misc->param.gen_ie.ie_data, + misc->param.gen_ie.len); + pmadapter->arp_filter_size = misc->param.gen_ie.len; + HEXDUMP("ArpFilter", pmadapter->arp_filter, + pmadapter->arp_filter_size); + } + break; + default: + PRINTM(MERROR, "Invalid IE type\n"); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + } + pioctl_req->data_read_written = + sizeof(mlan_ds_misc_gen_ie) + MLAN_SUB_COMMAND_SIZE; + LEAVE(); + return ret; } -/** +/** * @brief Set/Get region code * * @param pmadapter A pointer to mlan_adapter structure @@ -3744,49 +3915,50 @@ wlan_misc_ioctl_gen_ie(IN pmlan_adapter pmadapter, */ static mlan_status wlan_misc_ioctl_region(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_misc_cfg *misc = MNULL; - int i; - - ENTER(); - - misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) { - misc->param.region_code = pmadapter->region_code; - } else { - for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) { - /* Use the region code to search for the index */ - if (misc->param.region_code == region_code_index[i]) { - pmadapter->region_code = (t_u16) misc->param.region_code; - break; - } - } - /* It's unidentified region code */ - if (i >= MRVDRV_MAX_REGION_CODE) { - PRINTM(MERROR, "Region Code not identified\n"); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - pmadapter->cfp_code_bg = misc->param.region_code; - pmadapter->cfp_code_a = misc->param.region_code; - if (wlan_set_regiontable(pmpriv, (t_u8) pmadapter->region_code, - pmadapter->config_bands | pmadapter-> - adhoc_start_band)) { - pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; - ret = MLAN_STATUS_FAILURE; - } - } - pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_misc_cfg *misc = MNULL; + int i; + + ENTER(); + + misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) { + misc->param.region_code = pmadapter->region_code; + } else { + for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) { + /* Use the region code to search for the index */ + if (misc->param.region_code == region_code_index[i]) { + pmadapter->region_code = + (t_u16) misc->param.region_code; + break; + } + } + /* It's unidentified region code */ + if (i >= MRVDRV_MAX_REGION_CODE) { + PRINTM(MERROR, "Region Code not identified\n"); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + pmadapter->cfp_code_bg = misc->param.region_code; + pmadapter->cfp_code_a = misc->param.region_code; + if (wlan_set_regiontable(pmpriv, (t_u8) pmadapter->region_code, + pmadapter->config_bands | pmadapter-> + adhoc_start_band)) { + pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; + ret = MLAN_STATUS_FAILURE; + } + } + pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; + + LEAVE(); + return ret; } -/** +/** * @brief Perform warm reset * * @param pmadapter A pointer to mlan_adapter structure @@ -3796,50 +3968,50 @@ wlan_misc_ioctl_region(IN pmlan_adapter pmadapter, */ static mlan_status wlan_misc_ioctl_warm_reset(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_s32 i = 0; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_s32 i = 0; - ENTER(); + ENTER(); /** Init all the head nodes and free all the locks here */ - for (i = 0; i < pmadapter->priv_num; i++) { - wlan_free_priv(pmadapter->priv[i]); - } - - /* Initialize adapter structure */ - wlan_init_adapter(pmadapter); - - /* Initialize private structures */ - for (i = 0; i < pmadapter->priv_num; i++) { - if (pmadapter->priv[i]) { - wlan_init_priv(pmadapter->priv[i]); - } - } - - /* Restart the firmware */ - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_FUNC_SHUTDOWN, - HostCmd_ACT_GEN_SET, 0, MNULL, MNULL); - if (ret) - goto done; - - /* Issue firmware initialize commands for first BSS, for other interfaces - it will be called after getting the last init command response of - previous interface */ - pmpriv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); - ret = pmpriv->ops.init_cmd(pmpriv, MTRUE); - if (ret == MLAN_STATUS_PENDING) - pmadapter->pwarm_reset_ioctl_req = pioctl_req; - - done: - LEAVE(); - return ret; + for (i = 0; i < pmadapter->priv_num; i++) { + wlan_free_priv(pmadapter->priv[i]); + } + + /* Initialize adapter structure */ + wlan_init_adapter(pmadapter); + + /* Initialize private structures */ + for (i = 0; i < pmadapter->priv_num; i++) { + if (pmadapter->priv[i]) { + wlan_init_priv(pmadapter->priv[i]); + } + } + + /* Restart the firmware */ + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_FUNC_SHUTDOWN, + HostCmd_ACT_GEN_SET, 0, MNULL, MNULL); + if (ret) + goto done; + + /* Issue firmware initialize commands for first BSS, for other + interfaces it will be called after getting the last init command + response of previous interface */ + pmpriv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); + ret = pmpriv->ops.init_cmd(pmpriv, MTRUE); + if (ret == MLAN_STATUS_PENDING) + pmadapter->pwarm_reset_ioctl_req = pioctl_req; + +done: + LEAVE(); + return ret; } #if defined(SDIO_MULTI_PORT_TX_AGGR) || defined(SDIO_MULTI_PORT_RX_AGGR) -/** +/** * @brief Reconfigure SDIO multiport aggregation parameters * * @param pmadapter A pointer to mlan_adapter structure @@ -3849,95 +4021,105 @@ wlan_misc_ioctl_warm_reset(IN pmlan_adapter pmadapter, */ static mlan_status wlan_misc_ioctl_sdio_mpa_ctrl(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - mlan_ds_misc_sdio_mpa_ctrl *mpa_ctrl = MNULL; - - ENTER(); - - mpa_ctrl = &misc->param.mpa_ctrl; - - if (pioctl_req->action == MLAN_ACT_SET) { - - if (pmpriv->media_connected == MTRUE) { - PRINTM(MMSG, "SDIO MPA CTRL: not allowed in connected state\n"); - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - - if (mpa_ctrl->tx_enable > 1) { - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - - if (mpa_ctrl->rx_enable > 1) { - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - - if (mpa_ctrl->tx_max_ports > SDIO_MP_AGGR_DEF_PKT_LIMIT) { - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - - if (mpa_ctrl->rx_max_ports > SDIO_MP_AGGR_DEF_PKT_LIMIT) { - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - - if (mpa_ctrl->tx_buf_size || mpa_ctrl->rx_buf_size) { - - wlan_free_sdio_mpa_buffers(pmadapter); - - if (mpa_ctrl->tx_buf_size > 0) - pmadapter->mpa_tx.buf_size = mpa_ctrl->tx_buf_size; - - if (mpa_ctrl->rx_buf_size > 0) - pmadapter->mpa_rx.buf_size = mpa_ctrl->rx_buf_size; - - if (wlan_alloc_sdio_mpa_buffers(pmadapter, - pmadapter->mpa_tx.buf_size, - pmadapter->mpa_rx.buf_size) != - MLAN_STATUS_SUCCESS) { - PRINTM(MERROR, "Failed to allocate sdio mp-a buffers\n"); - pioctl_req->status_code = MLAN_ERROR_NO_MEM; - ret = MLAN_STATUS_FAILURE; - goto exit; - } - } - - if (mpa_ctrl->tx_max_ports > 0) - pmadapter->mpa_tx.pkt_aggr_limit = mpa_ctrl->tx_max_ports; - if (mpa_ctrl->rx_max_ports > 0) - pmadapter->mpa_rx.pkt_aggr_limit = mpa_ctrl->rx_max_ports; - - pmadapter->mpa_tx.enabled = (t_u8) mpa_ctrl->tx_enable; - pmadapter->mpa_rx.enabled = (t_u8) mpa_ctrl->rx_enable; - - } else { - mpa_ctrl->tx_enable = (t_u16) pmadapter->mpa_tx.enabled; - mpa_ctrl->rx_enable = (t_u16) pmadapter->mpa_rx.enabled; - mpa_ctrl->tx_buf_size = (t_u16) pmadapter->mpa_tx.buf_size; - mpa_ctrl->rx_buf_size = (t_u16) pmadapter->mpa_rx.buf_size; - mpa_ctrl->tx_max_ports = (t_u16) pmadapter->mpa_tx.pkt_aggr_limit; - mpa_ctrl->rx_max_ports = (t_u16) pmadapter->mpa_rx.pkt_aggr_limit; - } - - exit: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + mlan_ds_misc_sdio_mpa_ctrl *mpa_ctrl = MNULL; + + ENTER(); + + mpa_ctrl = &misc->param.mpa_ctrl; + + if (pioctl_req->action == MLAN_ACT_SET) { + + if (pmpriv->media_connected == MTRUE) { + PRINTM(MMSG, + "SDIO MPA CTRL: not allowed in connected state\n"); + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + + if (mpa_ctrl->tx_enable > 1) { + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + + if (mpa_ctrl->rx_enable > 1) { + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + + if (mpa_ctrl->tx_max_ports > SDIO_MP_AGGR_DEF_PKT_LIMIT) { + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + + if (mpa_ctrl->rx_max_ports > SDIO_MP_AGGR_DEF_PKT_LIMIT) { + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + + if (mpa_ctrl->tx_buf_size || mpa_ctrl->rx_buf_size) { + + wlan_free_sdio_mpa_buffers(pmadapter); + + if (mpa_ctrl->tx_buf_size > 0) + pmadapter->mpa_tx.buf_size = + mpa_ctrl->tx_buf_size; + + if (mpa_ctrl->rx_buf_size > 0) + pmadapter->mpa_rx.buf_size = + mpa_ctrl->rx_buf_size; + + if (wlan_alloc_sdio_mpa_buffers(pmadapter, + pmadapter->mpa_tx. + buf_size, + pmadapter->mpa_rx. + buf_size) != + MLAN_STATUS_SUCCESS) { + PRINTM(MERROR, + "Failed to allocate sdio mp-a buffers\n"); + pioctl_req->status_code = MLAN_ERROR_NO_MEM; + ret = MLAN_STATUS_FAILURE; + goto exit; + } + } + + if (mpa_ctrl->tx_max_ports > 0) + pmadapter->mpa_tx.pkt_aggr_limit = + mpa_ctrl->tx_max_ports; + if (mpa_ctrl->rx_max_ports > 0) + pmadapter->mpa_rx.pkt_aggr_limit = + mpa_ctrl->rx_max_ports; + + pmadapter->mpa_tx.enabled = (t_u8) mpa_ctrl->tx_enable; + pmadapter->mpa_rx.enabled = (t_u8) mpa_ctrl->rx_enable; + + } else { + mpa_ctrl->tx_enable = (t_u16) pmadapter->mpa_tx.enabled; + mpa_ctrl->rx_enable = (t_u16) pmadapter->mpa_rx.enabled; + mpa_ctrl->tx_buf_size = (t_u16) pmadapter->mpa_tx.buf_size; + mpa_ctrl->rx_buf_size = (t_u16) pmadapter->mpa_rx.buf_size; + mpa_ctrl->tx_max_ports = + (t_u16) pmadapter->mpa_tx.pkt_aggr_limit; + mpa_ctrl->rx_max_ports = + (t_u16) pmadapter->mpa_rx.pkt_aggr_limit; + } + +exit: + LEAVE(); + return ret; } #endif /* SDIO_MULTI_PORT_TX_AGGR || SDIO_MULTI_PORT_RX_AGGR */ -/** +/** * @brief Set/Get system clock configuration * * @param pmadapter A pointer to mlan_adapter structure @@ -3947,34 +4129,34 @@ wlan_misc_ioctl_sdio_mpa_ctrl(IN pmlan_adapter pmadapter, */ static mlan_status wlan_misc_ioctl_sysclock(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_misc_cfg *misc = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u16 cmd_action = 0; - - ENTER(); - - misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) - cmd_action = HostCmd_ACT_GEN_GET; - else - cmd_action = HostCmd_ACT_GEN_SET; - - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_ECL_SYSTEM_CLOCK_CONFIG, - cmd_action, - 0, - (t_void *) pioctl_req, - (t_void *) & misc->param.sys_clock); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_misc_cfg *misc = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u16 cmd_action = 0; + + ENTER(); + + misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) + cmd_action = HostCmd_ACT_GEN_GET; + else + cmd_action = HostCmd_ACT_GEN_SET; + + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_ECL_SYSTEM_CLOCK_CONFIG, + cmd_action, + 0, + (t_void *) pioctl_req, + (t_void *) & misc->param.sys_clock); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } /** @@ -3987,28 +4169,28 @@ wlan_misc_ioctl_sysclock(IN pmlan_adapter pmadapter, */ static mlan_status wlan_misc_ioctl_get_assoc_rsp(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_ds_misc_cfg *misc = MNULL; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - if ((pioctl_req->action == MLAN_ACT_GET) && pmpriv->assoc_rsp_size) { - memcpy(pmadapter, misc->param.assoc_resp.assoc_resp_buf, - pmpriv->assoc_rsp_buf, MIN(ASSOC_RSP_BUF_SIZE, - pmpriv->assoc_rsp_size)); - misc->param.assoc_resp.assoc_resp_len = - MIN(ASSOC_RSP_BUF_SIZE, pmpriv->assoc_rsp_size); - - /* Reset assoc buffer */ - pmpriv->assoc_rsp_size = 0; - } - - LEAVE(); - return ret; + mlan_ds_misc_cfg *misc = MNULL; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + if ((pioctl_req->action == MLAN_ACT_GET) && pmpriv->assoc_rsp_size) { + memcpy(pmadapter, misc->param.assoc_resp.assoc_resp_buf, + pmpriv->assoc_rsp_buf, MIN(ASSOC_RSP_BUF_SIZE, + pmpriv->assoc_rsp_size)); + misc->param.assoc_resp.assoc_resp_len = + MIN(ASSOC_RSP_BUF_SIZE, pmpriv->assoc_rsp_size); + + /* Reset assoc buffer */ + pmpriv->assoc_rsp_size = 0; + } + + LEAVE(); + return ret; } /** @@ -4021,22 +4203,22 @@ wlan_misc_ioctl_get_assoc_rsp(IN pmlan_adapter pmadapter, */ static mlan_status wlan_misc_ioctl_soft_reset(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - /* Send command to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_SOFT_RESET, - HostCmd_ACT_GEN_SET, - 0, (t_void *) pioctl_req, MNULL); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + /* Send command to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_SOFT_RESET, + HostCmd_ACT_GEN_SET, + 0, (t_void *) pioctl_req, MNULL); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + LEAVE(); + return ret; } /** @@ -4049,43 +4231,45 @@ wlan_misc_ioctl_soft_reset(IN pmlan_adapter pmadapter, */ mlan_status wlan_misc_ioctl_thermal(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_misc_cfg *misc = MNULL; - t_u16 cmd_action = 0; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_misc_cfg)) { - PRINTM(MWARN, "MLAN IOCTL information buffer length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_misc_cfg); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - - misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) { - PRINTM(MERROR, "Thermal reading setting is not allowed!\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } else { - cmd_action = HostCmd_ACT_GEN_GET; - } - - /* Send command to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_SNMP_MIB, - cmd_action, Thermal_i, (t_void *) pioctl_req, MNULL); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_misc_cfg *misc = MNULL; + t_u16 cmd_action = 0; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_misc_cfg)) { + PRINTM(MWARN, + "MLAN IOCTL information buffer length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_misc_cfg); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + + misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) { + PRINTM(MERROR, "Thermal reading setting is not allowed!\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } else { + cmd_action = HostCmd_ACT_GEN_GET; + } + + /* Send command to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_SNMP_MIB, + cmd_action, + Thermal_i, (t_void *) pioctl_req, MNULL); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } /** @@ -4098,38 +4282,39 @@ wlan_misc_ioctl_thermal(IN pmlan_adapter pmadapter, */ mlan_status wlan_misc_ioctl_subscribe_evt(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_misc_cfg *misc = MNULL; - t_u16 cmd_action = 0; - - ENTER(); - - misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) { - cmd_action = HostCmd_ACT_GEN_SET; - } else { - cmd_action = HostCmd_ACT_GEN_GET; - } - - /* Send command to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_SUBSCRIBE_EVENT, - cmd_action, - 0, - (t_void *) pioctl_req, &misc->param.subscribe_event); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_misc_cfg *misc = MNULL; + t_u16 cmd_action = 0; + + ENTER(); + + misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) { + cmd_action = HostCmd_ACT_GEN_SET; + } else { + cmd_action = HostCmd_ACT_GEN_GET; + } + + /* Send command to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_SUBSCRIBE_EVENT, + cmd_action, + 0, + (t_void *) pioctl_req, + &misc->param.subscribe_event); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } /** - * @brief Set ARP filter based on IP address + * @brief Set ARP filter based on IP address * * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer @@ -4139,68 +4324,70 @@ wlan_misc_ioctl_subscribe_evt(IN pmlan_adapter pmadapter, */ mlan_status wlan_ipaddr_arp_filter(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req, IN t_u32 ipv4_addr) + IN pmlan_ioctl_req pioctl_req, IN t_u32 ipv4_addr) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_callbacks pcb = &pmadapter->callbacks; - t_u8 *buf; - arpfilter_header *arpfilter = MNULL; - filter_entry *entry = MNULL; - t_u32 len; - - ENTER(); - - pcb->moal_malloc(pmadapter->pmoal_handle, MRVDRV_SIZE_OF_CMD_BUFFER, - MLAN_MEM_DEF, &buf); - if (!buf) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - /* Construct the ARP filter TLV */ - arpfilter = (arpfilter_header *) buf; - arpfilter->type = wlan_cpu_to_le16(TLV_TYPE_ARP_FILTER); - - if (ipv4_addr) { - arpfilter->len = wlan_cpu_to_le16(sizeof(filter_entry) * 3); - entry = (filter_entry *) (buf + sizeof(arpfilter_header)); - entry->addr_type = wlan_cpu_to_le16(ADDR_TYPE_BROADCAST); - entry->eth_type = wlan_cpu_to_le16(ETHER_TYPE_ARP); - entry->ipv4_addr = wlan_cpu_to_le32(ipv4_addr); - entry++; - entry->addr_type = wlan_cpu_to_le16(ADDR_TYPE_UNICAST); - entry->eth_type = wlan_cpu_to_le16(ETHER_TYPE_ANY); - entry->ipv4_addr = wlan_cpu_to_le32(IPV4_ADDR_ANY); - entry++; - entry->addr_type = wlan_cpu_to_le16(ADDR_TYPE_MULTICAST); - entry->eth_type = wlan_cpu_to_le16(ETHER_TYPE_ANY); - entry->ipv4_addr = wlan_cpu_to_le32(IPV4_ADDR_ANY); - } else - arpfilter->len = 0; - - /* Update the total length */ - len = sizeof(arpfilter_header) + wlan_le16_to_cpu(arpfilter->len); - - memset(pmadapter, pmadapter->arp_filter, 0, sizeof(pmadapter->arp_filter)); - if (len > ARP_FILTER_MAX_BUF_SIZE) { - pmadapter->arp_filter_size = 0; - PRINTM(MERROR, "Invalid ARP Filter Size\n"); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - } else if (len <= sizeof(MrvlIEtypesHeader_t)) { - pmadapter->arp_filter_size = 0; - PRINTM(MINFO, "Clear ARP filter\n"); - } else { - memcpy(pmadapter, pmadapter->arp_filter, buf, len); - pmadapter->arp_filter_size = len; - HEXDUMP("ArpFilter", pmadapter->arp_filter, pmadapter->arp_filter_size); - } - - done: - if (buf) - pcb->moal_mfree(pmadapter->pmoal_handle, buf); - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_callbacks pcb = &pmadapter->callbacks; + t_u8 *buf; + arpfilter_header *arpfilter = MNULL; + filter_entry *entry = MNULL; + t_u32 len; + + ENTER(); + + pcb->moal_malloc(pmadapter->pmoal_handle, MRVDRV_SIZE_OF_CMD_BUFFER, + MLAN_MEM_DEF, &buf); + if (!buf) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + /* Construct the ARP filter TLV */ + arpfilter = (arpfilter_header *) buf; + arpfilter->type = wlan_cpu_to_le16(TLV_TYPE_ARP_FILTER); + + if (ipv4_addr) { + arpfilter->len = wlan_cpu_to_le16(sizeof(filter_entry) * 3); + entry = (filter_entry *) (buf + sizeof(arpfilter_header)); + entry->addr_type = wlan_cpu_to_le16(ADDR_TYPE_BROADCAST); + entry->eth_type = wlan_cpu_to_le16(ETHER_TYPE_ARP); + entry->ipv4_addr = wlan_cpu_to_le32(ipv4_addr); + entry++; + entry->addr_type = wlan_cpu_to_le16(ADDR_TYPE_UNICAST); + entry->eth_type = wlan_cpu_to_le16(ETHER_TYPE_ANY); + entry->ipv4_addr = wlan_cpu_to_le32(IPV4_ADDR_ANY); + entry++; + entry->addr_type = wlan_cpu_to_le16(ADDR_TYPE_MULTICAST); + entry->eth_type = wlan_cpu_to_le16(ETHER_TYPE_ANY); + entry->ipv4_addr = wlan_cpu_to_le32(IPV4_ADDR_ANY); + } else + arpfilter->len = 0; + + /* Update the total length */ + len = sizeof(arpfilter_header) + wlan_le16_to_cpu(arpfilter->len); + + memset(pmadapter, pmadapter->arp_filter, 0, + sizeof(pmadapter->arp_filter)); + if (len > ARP_FILTER_MAX_BUF_SIZE) { + pmadapter->arp_filter_size = 0; + PRINTM(MERROR, "Invalid ARP Filter Size\n"); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + } else if (len <= sizeof(MrvlIEtypesHeader_t)) { + pmadapter->arp_filter_size = 0; + PRINTM(MINFO, "Clear ARP filter\n"); + } else { + memcpy(pmadapter, pmadapter->arp_filter, buf, len); + pmadapter->arp_filter_size = len; + HEXDUMP("ArpFilter", pmadapter->arp_filter, + pmadapter->arp_filter_size); + } + +done: + if (buf) + pcb->moal_mfree(pmadapter->pmoal_handle, buf); + LEAVE(); + return ret; } #define FLTR_BUF_IP_OFFSET 24 @@ -4213,104 +4400,110 @@ wlan_ipaddr_arp_filter(IN pmlan_adapter pmadapter, * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * @param ipv4_addr ipv4 Address + * @param num_ipv4 Number of ipv4 Addresses * * @return MLAN_STATUS_PENDING --success, otherwise fail */ mlan_status wlan_ipaddr_auto_arp_resp(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req, - IN t_u32 * ipv4_addr, IN t_u8 num_ipv4) + IN pmlan_ioctl_req pioctl_req, + IN t_u32 * ipv4_addr, IN t_u8 num_ipv4) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - HostCmd_DS_GEN *hostcmd_hdr; - HostCmd_DS_MEF_CFG *mefcmd; - pmlan_callbacks pcb = &pmadapter->callbacks; - mlan_ds_misc_cmd *hostcmd; - t_u32 buf_len = 0; - t_u8 *buf, *filter; - - t_u8 fltr_buf[] = { 0x01, 0x10, 0x21, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x01, 0x08, 0x06, 0x02, 0x02, 0x14, 0x00, 0x00, - 0x00, 0x01, 0x41, 0x01, 0x00, 0x00, 0x00, 0x01, - 0xc0, 0xa8, 0x01, 0x6d, 0x04, 0x02, 0x2e, 0x00, - 0x00, 0x00, 0x01, 0x41, 0x44 - }; - t_u8 fltr_buf_2_ip[] = { 0x01, 0x10, 0x33, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x01, 0xc0, 0xa8, 0x01, 0x6d, 0x04, 0x02, 0x2e, - 0x00, 0x00, 0x00, 0x01, 0x41, 0x01, 0x00, 0x00, - 0x00, 0x01, 0xc0, 0xa8, 0x02, 0x6d, 0x04, 0x02, - 0x2e, 0x00, 0x00, 0x00, 0x01, 0x41, 0x45, 0x01, - 0x00, 0x00, 0x00, 0x01, 0x08, 0x06, 0x02, 0x02, - 0x14, 0x00, 0x00, 0x00, 0x01, 0x41, 0x44 - }; - - ENTER(); - - ret = pcb->moal_malloc(pmadapter->pmoal_handle, - sizeof(mlan_ds_misc_cmd), - MLAN_MEM_DEF, (t_u8 **) & hostcmd); - - if (ret != MLAN_STATUS_SUCCESS || hostcmd == MNULL) { - PRINTM(MERROR, "Failed to allocate hostcmd buffer\n"); - pioctl_req->status_code = MLAN_ERROR_NO_MEM; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - memset(pmpriv->adapter, hostcmd, 0, sizeof(mlan_ds_misc_cmd)); - buf = hostcmd->cmd; - - /* Prepare hostcmd buffer */ - hostcmd_hdr = (HostCmd_DS_GEN *) (buf); - hostcmd_hdr->command = wlan_cpu_to_le16(HostCmd_CMD_MEF_CFG); - mefcmd = (HostCmd_DS_MEF_CFG *) (buf + S_DS_GEN); - buf_len = S_DS_GEN; - - if (!ipv4_addr) { - PRINTM(MINFO, "Disable Auto ARP Response\n"); - mefcmd->criteria = wlan_cpu_to_le32(0); - mefcmd->nentries = wlan_cpu_to_le16(0); - buf_len += sizeof(HostCmd_DS_MEF_CFG); - } else { - /* Event bit (bit2) of HS conditions should be masked out */ - mefcmd->criteria = - wlan_cpu_to_le32(pmpriv->adapter->hs_cfg.conditions & ~MBIT(2)); - mefcmd->nentries = wlan_cpu_to_le16(1); - buf_len += sizeof(HostCmd_DS_MEF_CFG); - filter = buf + buf_len; - if (num_ipv4 == 1) { - memcpy(pmpriv->adapter, filter, fltr_buf, sizeof(fltr_buf)); - memcpy(pmpriv->adapter, &filter[FLTR_BUF_IP_OFFSET], &ipv4_addr[0], - sizeof(t_u32)); - buf_len += sizeof(fltr_buf); - } else if (num_ipv4 >= 2) { - memcpy(pmpriv->adapter, filter, fltr_buf_2_ip, - sizeof(fltr_buf_2_ip)); - memcpy(pmpriv->adapter, &filter[FLTR_BUF_IP_OFFSET_2_IP_1], - &ipv4_addr[0], sizeof(t_u32)); - memcpy(pmpriv->adapter, &filter[FLTR_BUF_IP_OFFSET_2_IP_2], - &ipv4_addr[1], sizeof(t_u32)); - buf_len += sizeof(fltr_buf_2_ip); - } - } - hostcmd_hdr->size = wlan_cpu_to_le16(buf_len); - hostcmd->len = buf_len; - - /* Send command to firmware */ - ret = wlan_prepare_cmd(pmpriv, - 0, 0, 0, (t_void *) pioctl_req, (t_void *) hostcmd); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) hostcmd); - - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + HostCmd_DS_GEN *hostcmd_hdr; + HostCmd_DS_MEF_CFG *mefcmd; + pmlan_callbacks pcb = &pmadapter->callbacks; + mlan_ds_misc_cmd *hostcmd; + t_u32 buf_len = 0; + t_u8 *buf, *filter; + + t_u8 fltr_buf[] = { 0x01, 0x10, 0x21, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x08, 0x06, 0x02, 0x02, 0x14, 0x00, 0x00, + 0x00, 0x01, 0x41, 0x01, 0x00, 0x00, 0x00, 0x01, + 0xc0, 0xa8, 0x01, 0x6d, 0x04, 0x02, 0x2e, 0x00, + 0x00, 0x00, 0x01, 0x41, 0x44 + }; + t_u8 fltr_buf_2_ip[] = { 0x01, 0x10, 0x33, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0xc0, 0xa8, 0x01, 0x6d, 0x04, 0x02, 0x2e, + 0x00, 0x00, 0x00, 0x01, 0x41, 0x01, 0x00, 0x00, + 0x00, 0x01, 0xc0, 0xa8, 0x02, 0x6d, 0x04, 0x02, + 0x2e, 0x00, 0x00, 0x00, 0x01, 0x41, 0x45, 0x01, + 0x00, 0x00, 0x00, 0x01, 0x08, 0x06, 0x02, 0x02, + 0x14, 0x00, 0x00, 0x00, 0x01, 0x41, 0x44 + }; + + ENTER(); + + ret = pcb->moal_malloc(pmadapter->pmoal_handle, + sizeof(mlan_ds_misc_cmd), + MLAN_MEM_DEF, (t_u8 **) & hostcmd); + + if (ret != MLAN_STATUS_SUCCESS || hostcmd == MNULL) { + PRINTM(MERROR, "Failed to allocate hostcmd buffer\n"); + pioctl_req->status_code = MLAN_ERROR_NO_MEM; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + memset(pmpriv->adapter, hostcmd, 0, sizeof(mlan_ds_misc_cmd)); + buf = hostcmd->cmd; + + /* Prepare hostcmd buffer */ + hostcmd_hdr = (HostCmd_DS_GEN *) (buf); + hostcmd_hdr->command = wlan_cpu_to_le16(HostCmd_CMD_MEF_CFG); + mefcmd = (HostCmd_DS_MEF_CFG *) (buf + S_DS_GEN); + buf_len = S_DS_GEN; + + if (!ipv4_addr) { + PRINTM(MINFO, "Disable Auto ARP Response\n"); + mefcmd->criteria = wlan_cpu_to_le32(0); + mefcmd->nentries = wlan_cpu_to_le16(0); + buf_len += sizeof(HostCmd_DS_MEF_CFG); + } else { + /* Event bit (bit2) of HS conditions should be masked out */ + mefcmd->criteria = + wlan_cpu_to_le32(pmpriv->adapter->hs_cfg. + conditions & ~MBIT(2)); + mefcmd->nentries = wlan_cpu_to_le16(1); + buf_len += sizeof(HostCmd_DS_MEF_CFG); + filter = buf + buf_len; + if (num_ipv4 == 1) { + memcpy(pmpriv->adapter, filter, fltr_buf, + sizeof(fltr_buf)); + memcpy(pmpriv->adapter, &filter[FLTR_BUF_IP_OFFSET], + &ipv4_addr[0], sizeof(t_u32)); + buf_len += sizeof(fltr_buf); + } else if (num_ipv4 >= 2) { + memcpy(pmpriv->adapter, filter, fltr_buf_2_ip, + sizeof(fltr_buf_2_ip)); + memcpy(pmpriv->adapter, + &filter[FLTR_BUF_IP_OFFSET_2_IP_1], + &ipv4_addr[0], sizeof(t_u32)); + memcpy(pmpriv->adapter, + &filter[FLTR_BUF_IP_OFFSET_2_IP_2], + &ipv4_addr[1], sizeof(t_u32)); + buf_len += sizeof(fltr_buf_2_ip); + } + } + hostcmd_hdr->size = wlan_cpu_to_le16(buf_len); + hostcmd->len = buf_len; + + /* Send command to firmware */ + ret = wlan_prepare_cmd(pmpriv, + 0, + 0, 0, (t_void *) pioctl_req, (t_void *) hostcmd); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) hostcmd); + + LEAVE(); + return ret; } /** - * @brief MEF configuration + * @brief MEF configuration * * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer @@ -4319,108 +4512,109 @@ wlan_ipaddr_auto_arp_resp(IN pmlan_adapter pmadapter, */ mlan_status wlan_misc_ioctl_mef_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_misc_mef_cfg *mef_cfg = - &((mlan_ds_misc_cfg *) pioctl_req->pbuf)->param.mef_cfg; - pmlan_callbacks pcb = &pmadapter->callbacks; - HostCmd_DS_GEN *hostcmd_hdr; - HostCmd_DS_MEF_CFG *mefcmd; - mlan_ds_misc_cmd *hostcmd = MNULL; - t_u32 buf_len = 0; - t_u8 *buf, *filter; - t_u8 fltr_buf[] = { 0x02, 0x00, 0x2f, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x01, 0x01, 0x00, 0x5e, 0x03, 0x02, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x41, 0x06, 0x00, 0x00, 0x00, - 0x01, 0xff, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x41, 0x45, 0x01, 0x00, 0x00, 0x00, 0x01, - 0x33, 0x33, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x41, 0x45 - }; - - ENTER(); - - /* GET operation */ - if (pioctl_req->action == MLAN_ACT_GET) { - /* TODO: need to store for get operation */ - goto done; - } - - ret = pcb->moal_malloc(pmadapter->pmoal_handle, - sizeof(mlan_ds_misc_cmd), - MLAN_MEM_DEF, (t_u8 **) & hostcmd); - - if (ret != MLAN_STATUS_SUCCESS || hostcmd == MNULL) { - PRINTM(MERROR, "Failed to allocate hostcmd buffer\n"); - pioctl_req->status_code = MLAN_ERROR_NO_MEM; - ret = MLAN_STATUS_FAILURE; - goto done; - } - - memset(pmpriv->adapter, hostcmd, 0, sizeof(mlan_ds_misc_cmd)); - buf = hostcmd->cmd; - - /* Prepare hostcmd buffer */ - hostcmd_hdr = (HostCmd_DS_GEN *) (buf); - hostcmd_hdr->command = wlan_cpu_to_le16(HostCmd_CMD_MEF_CFG); - mefcmd = (HostCmd_DS_MEF_CFG *) (buf + S_DS_GEN); - buf_len = S_DS_GEN; - - switch (mef_cfg->sub_id) { - case MEF_CFG_DISABLE: - PRINTM(MINFO, "Disable MEF\n"); - mefcmd->criteria = wlan_cpu_to_le32(0); - mefcmd->nentries = wlan_cpu_to_le16(0); - buf_len += sizeof(HostCmd_DS_MEF_CFG); - break; - case MEF_CFG_RX_FILTER_ENABLE: - PRINTM(MINFO, "Enable Rx filter\n"); - mefcmd->criteria = wlan_cpu_to_le32((MBIT(3) | MBIT(0))); - mefcmd->nentries = wlan_cpu_to_le16(1); - buf_len += sizeof(HostCmd_DS_MEF_CFG); - filter = buf + buf_len; - memcpy(pmpriv->adapter, filter, fltr_buf, sizeof(fltr_buf)); - buf_len += sizeof(fltr_buf); - break; - case MEF_CFG_AUTO_ARP_RESP: - PRINTM(MINFO, "Enable auto ARP response\n"); - // TODO - break; - case MEF_CFG_HOSTCMD: - PRINTM(MINFO, "MEF hostcmd from MOAL\n"); - filter = buf + buf_len; - memcpy(pmpriv->adapter, filter, mef_cfg->param.cmd_buf.cmd, - mef_cfg->param.cmd_buf.len); - buf_len += mef_cfg->param.cmd_buf.len; - break; - default: - PRINTM(MERROR, "Invalid sub ID parameter\n"); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto done; - break; - } - hostcmd_hdr->size = wlan_cpu_to_le16(buf_len); - hostcmd->len = buf_len; - - /* Send command to firmware */ - ret = wlan_prepare_cmd(pmpriv, - 0, 0, 0, (t_void *) pioctl_req, (t_void *) hostcmd); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - done: - if (hostcmd) - pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) hostcmd); - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_misc_mef_cfg *mef_cfg = + &((mlan_ds_misc_cfg *) pioctl_req->pbuf)->param.mef_cfg; + pmlan_callbacks pcb = &pmadapter->callbacks; + HostCmd_DS_GEN *hostcmd_hdr; + HostCmd_DS_MEF_CFG *mefcmd; + mlan_ds_misc_cmd *hostcmd = MNULL; + t_u32 buf_len = 0; + t_u8 *buf, *filter; + t_u8 fltr_buf[] = { 0x02, 0x00, 0x2f, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x01, 0x00, 0x5e, 0x03, 0x02, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x41, 0x06, 0x00, 0x00, 0x00, + 0x01, 0xff, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x41, 0x45, 0x01, 0x00, 0x00, 0x00, 0x01, + 0x33, 0x33, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x41, 0x45 + }; + + ENTER(); + + /* GET operation */ + if (pioctl_req->action == MLAN_ACT_GET) { + /* TODO: need to store for get operation */ + goto done; + } + + ret = pcb->moal_malloc(pmadapter->pmoal_handle, + sizeof(mlan_ds_misc_cmd), + MLAN_MEM_DEF, (t_u8 **) & hostcmd); + + if (ret != MLAN_STATUS_SUCCESS || hostcmd == MNULL) { + PRINTM(MERROR, "Failed to allocate hostcmd buffer\n"); + pioctl_req->status_code = MLAN_ERROR_NO_MEM; + ret = MLAN_STATUS_FAILURE; + goto done; + } + + memset(pmpriv->adapter, hostcmd, 0, sizeof(mlan_ds_misc_cmd)); + buf = hostcmd->cmd; + + /* Prepare hostcmd buffer */ + hostcmd_hdr = (HostCmd_DS_GEN *) (buf); + hostcmd_hdr->command = wlan_cpu_to_le16(HostCmd_CMD_MEF_CFG); + mefcmd = (HostCmd_DS_MEF_CFG *) (buf + S_DS_GEN); + buf_len = S_DS_GEN; + + switch (mef_cfg->sub_id) { + case MEF_CFG_DISABLE: + PRINTM(MINFO, "Disable MEF\n"); + mefcmd->criteria = wlan_cpu_to_le32(0); + mefcmd->nentries = wlan_cpu_to_le16(0); + buf_len += sizeof(HostCmd_DS_MEF_CFG); + break; + case MEF_CFG_RX_FILTER_ENABLE: + PRINTM(MINFO, "Enable Rx filter\n"); + mefcmd->criteria = wlan_cpu_to_le32((MBIT(3) | MBIT(0))); + mefcmd->nentries = wlan_cpu_to_le16(1); + buf_len += sizeof(HostCmd_DS_MEF_CFG); + filter = buf + buf_len; + memcpy(pmpriv->adapter, filter, fltr_buf, sizeof(fltr_buf)); + buf_len += sizeof(fltr_buf); + break; + case MEF_CFG_AUTO_ARP_RESP: + PRINTM(MINFO, "Enable auto ARP response\n"); + // TODO + break; + case MEF_CFG_HOSTCMD: + PRINTM(MINFO, "MEF hostcmd from MOAL\n"); + filter = buf + buf_len; + memcpy(pmpriv->adapter, filter, mef_cfg->param.cmd_buf.cmd, + mef_cfg->param.cmd_buf.len); + buf_len += mef_cfg->param.cmd_buf.len; + break; + default: + PRINTM(MERROR, "Invalid sub ID parameter\n"); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto done; + break; + } + hostcmd_hdr->size = wlan_cpu_to_le16(buf_len); + hostcmd->len = buf_len; + + /* Send command to firmware */ + ret = wlan_prepare_cmd(pmpriv, + 0, + 0, 0, (t_void *) pioctl_req, (t_void *) hostcmd); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +done: + if (hostcmd) + pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *) hostcmd); + + LEAVE(); + return ret; } /** - * @brief ipaddr configuration + * @brief ipaddr configuration * * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer @@ -4429,61 +4623,64 @@ wlan_misc_ioctl_mef_cfg(IN pmlan_adapter pmadapter, */ mlan_status wlan_misc_ioctl_ipaddr_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u32 ipv4_addr[MAX_IPADDR]; - int i = 0; - - ENTER(); - - /* GET operation */ - if (pioctl_req->action == MLAN_ACT_GET) { - memcpy(pmadapter, misc->param.ipaddr_cfg.ip_addr, - pmpriv->ip_addr, IPADDR_LEN); - misc->param.ipaddr_cfg.op_code = pmpriv->op_code; - goto done; - } - /* only one IP is supported in current firmware */ - for (i = 0; i < misc->param.ipaddr_cfg.ip_addr_num; i++) { - memcpy(pmadapter, &ipv4_addr[i], misc->param.ipaddr_cfg.ip_addr[i], - sizeof(t_u32)); - } - - if (misc->param.ipaddr_cfg.op_code != MLAN_IPADDR_OP_IP_REMOVE && - !misc->param.ipaddr_cfg.ip_addr_num) { - PRINTM(MERROR, "Invalid IPv4 address\n"); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto done; - } - if (misc->param.ipaddr_cfg.op_code & MLAN_IPADDR_OP_ARP_FILTER) - ret = wlan_ipaddr_arp_filter(pmadapter, pioctl_req, ipv4_addr[0]); - else if (pmpriv->op_code & MLAN_IPADDR_OP_ARP_FILTER) - ret = wlan_ipaddr_arp_filter(pmadapter, pioctl_req, 0); - if (ret == MLAN_STATUS_FAILURE) - goto done; - if (misc->param.ipaddr_cfg.op_code & MLAN_IPADDR_OP_AUTO_ARP_RESP) - ret = wlan_ipaddr_auto_arp_resp(pmadapter, pioctl_req, - ipv4_addr, - misc->param.ipaddr_cfg.ip_addr_num); - else if (pmpriv->op_code & MLAN_IPADDR_OP_AUTO_ARP_RESP) - ret = wlan_ipaddr_auto_arp_resp(pmadapter, pioctl_req, MNULL, 0); - if (ret == MLAN_STATUS_FAILURE) - goto done; - - /* Save the values in MLAN */ - if (pioctl_req->action == MLAN_ACT_SET) { - pmpriv->op_code = misc->param.ipaddr_cfg.op_code; - memcpy(pmadapter, pmpriv->ip_addr, - misc->param.ipaddr_cfg.ip_addr, IPADDR_LEN); - } - - done: - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u32 ipv4_addr[MAX_IPADDR]; + int i = 0; + + ENTER(); + + /* GET operation */ + if (pioctl_req->action == MLAN_ACT_GET) { + memcpy(pmadapter, misc->param.ipaddr_cfg.ip_addr, + pmpriv->ip_addr, IPADDR_LEN); + misc->param.ipaddr_cfg.op_code = pmpriv->op_code; + goto done; + } + /* only one IP is supported in current firmware */ + for (i = 0; i < misc->param.ipaddr_cfg.ip_addr_num; i++) { + memcpy(pmadapter, &ipv4_addr[i], + misc->param.ipaddr_cfg.ip_addr[i], sizeof(t_u32)); + } + + if (misc->param.ipaddr_cfg.op_code != MLAN_IPADDR_OP_IP_REMOVE && + !misc->param.ipaddr_cfg.ip_addr_num) { + PRINTM(MERROR, "Invalid IPv4 address\n"); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto done; + } + if (misc->param.ipaddr_cfg.op_code & MLAN_IPADDR_OP_ARP_FILTER) + ret = wlan_ipaddr_arp_filter(pmadapter, pioctl_req, + ipv4_addr[0]); + else if (pmpriv->op_code & MLAN_IPADDR_OP_ARP_FILTER) + ret = wlan_ipaddr_arp_filter(pmadapter, pioctl_req, 0); + if (ret == MLAN_STATUS_FAILURE) + goto done; + if (misc->param.ipaddr_cfg.op_code & MLAN_IPADDR_OP_AUTO_ARP_RESP) + ret = wlan_ipaddr_auto_arp_resp(pmadapter, pioctl_req, + ipv4_addr, + misc->param.ipaddr_cfg. + ip_addr_num); + else if (pmpriv->op_code & MLAN_IPADDR_OP_AUTO_ARP_RESP) + ret = wlan_ipaddr_auto_arp_resp(pmadapter, pioctl_req, MNULL, + 0); + if (ret == MLAN_STATUS_FAILURE) + goto done; + + /* Save the values in MLAN */ + if (pioctl_req->action == MLAN_ACT_SET) { + pmpriv->op_code = misc->param.ipaddr_cfg.op_code; + memcpy(pmadapter, pmpriv->ip_addr, + misc->param.ipaddr_cfg.ip_addr, IPADDR_LEN); + } + +done: + LEAVE(); + return ret; } /** @@ -4496,74 +4693,76 @@ wlan_misc_ioctl_ipaddr_cfg(IN pmlan_adapter pmadapter, */ mlan_status wlan_misc_ioctl_cfp_code_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - mlan_ds_misc_cfp_code *cfp_code = MNULL; - t_u32 region_bg = 0; - t_u32 region_a = 0; - int i; - - ENTER(); - - cfp_code = &misc->param.cfp_code; - if (pioctl_req->action == MLAN_ACT_SET) { - /* Save the values in MLAN */ - if (!cfp_code->cfp_code_bg) - cfp_code->cfp_code_bg = pmadapter->cfp_code_bg; - for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) { - /* Use the region code to search for the index */ - if (cfp_code->cfp_code_bg == region_code_index[i]) { - region_bg = cfp_code->cfp_code_bg; - break; - } - } - if (!cfp_code->cfp_code_a) - cfp_code->cfp_code_a = pmadapter->cfp_code_a; - for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) { - /* Use the region code to search for the index */ - if (cfp_code->cfp_code_a == region_code_index[i]) { - region_a = cfp_code->cfp_code_a; - break; - } - } - if (!region_a) { - for (i = 0; i < MRVDRV_MAX_CFP_CODE_A; i++) { - /* Use the CFP code to search for the index */ - if (cfp_code->cfp_code_a == cfp_code_index_a[i]) - break; - } - if (i >= MRVDRV_MAX_CFP_CODE_A) { - PRINTM(MERROR, "CFP Code not identified for A\n"); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto done; - } - } - pmadapter->cfp_code_bg = (t_u8) cfp_code->cfp_code_bg; - pmadapter->cfp_code_a = (t_u8) cfp_code->cfp_code_a; - if (region_bg && region_a && (region_bg == region_a)) - pmadapter->region_code = pmadapter->cfp_code_a; - else - pmadapter->region_code = 0; - if (wlan_set_regiontable(pmpriv, (t_u8) pmadapter->region_code, - pmadapter->config_bands | pmadapter-> - adhoc_start_band)) { - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto done; - } - } else { - /* GET operation */ - cfp_code->cfp_code_bg = pmadapter->cfp_code_bg; - cfp_code->cfp_code_a = pmadapter->cfp_code_a; - } - - done: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_misc_cfg *misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + mlan_ds_misc_cfp_code *cfp_code = MNULL; + t_u32 region_bg = 0; + t_u32 region_a = 0; + int i; + + ENTER(); + + cfp_code = &misc->param.cfp_code; + if (pioctl_req->action == MLAN_ACT_SET) { + /* Save the values in MLAN */ + if (!cfp_code->cfp_code_bg) + cfp_code->cfp_code_bg = pmadapter->cfp_code_bg; + for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) { + /* Use the region code to search for the index */ + if (cfp_code->cfp_code_bg == region_code_index[i]) { + region_bg = cfp_code->cfp_code_bg; + break; + } + } + if (!cfp_code->cfp_code_a) + cfp_code->cfp_code_a = pmadapter->cfp_code_a; + for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) { + /* Use the region code to search for the index */ + if (cfp_code->cfp_code_a == region_code_index[i]) { + region_a = cfp_code->cfp_code_a; + break; + } + } + if (!region_a) { + for (i = 0; i < MRVDRV_MAX_CFP_CODE_A; i++) { + /* Use the CFP code to search for the index */ + if (cfp_code->cfp_code_a == cfp_code_index_a[i]) + break; + } + if (i >= MRVDRV_MAX_CFP_CODE_A) { + PRINTM(MERROR, + "CFP Code not identified for A\n"); + pioctl_req->status_code = + MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto done; + } + } + pmadapter->cfp_code_bg = (t_u8) cfp_code->cfp_code_bg; + pmadapter->cfp_code_a = (t_u8) cfp_code->cfp_code_a; + if (region_bg && region_a && (region_bg == region_a)) + pmadapter->region_code = pmadapter->cfp_code_a; + else + pmadapter->region_code = 0; + if (wlan_set_regiontable(pmpriv, (t_u8) pmadapter->region_code, + pmadapter->config_bands | pmadapter-> + adhoc_start_band)) { + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto done; + } + } else { + /* GET operation */ + cfp_code->cfp_code_bg = pmadapter->cfp_code_bg; + cfp_code->cfp_code_a = pmadapter->cfp_code_a; + } + +done: + LEAVE(); + return ret; } /** @@ -4576,53 +4775,54 @@ wlan_misc_ioctl_cfp_code_cfg(IN pmlan_adapter pmadapter, */ mlan_status wlan_misc_ioctl_country_code(IN pmlan_adapter pmadapter, - IN mlan_ioctl_req * pioctl_req) + IN mlan_ioctl_req * pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_misc_country_code *country_code = MNULL; - mlan_ds_misc_cfg *cfg_misc = MNULL; - t_u8 cfp_bg = 0, cfp_a = 0; - - ENTER(); - - cfg_misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - country_code = &cfg_misc->param.country_code; - - if (pioctl_req->action == MLAN_ACT_SET) { - /* Update region code and table based on country code */ - if (wlan_misc_country_2_cfp_table_code(pmadapter, - country_code->country_code, - &cfp_bg, &cfp_a)) { - PRINTM(MERROR, "Country code not found!\n"); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto done; - } - pmadapter->cfp_code_bg = cfp_bg; - pmadapter->cfp_code_a = cfp_a; - if (cfp_bg && cfp_a && (cfp_bg == cfp_a)) - pmadapter->region_code = cfp_a; - else - pmadapter->region_code = 0; - if (wlan_set_regiontable(pmpriv, pmadapter->region_code, - pmadapter->config_bands | pmadapter-> - adhoc_start_band)) { - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - ret = MLAN_STATUS_FAILURE; - goto done; - } - memcpy(pmadapter, pmadapter->country_code, - country_code->country_code, COUNTRY_CODE_LEN); - } else { - /* GET operation */ - memcpy(pmadapter, country_code->country_code, - pmadapter->country_code, COUNTRY_CODE_LEN); - } - - done: - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_misc_country_code *country_code = MNULL; + mlan_ds_misc_cfg *cfg_misc = MNULL; + t_u8 cfp_bg = 0, cfp_a = 0; + + ENTER(); + + cfg_misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + country_code = &cfg_misc->param.country_code; + + if (pioctl_req->action == MLAN_ACT_SET) { + /* Update region code and table based on country code */ + if (wlan_misc_country_2_cfp_table_code(pmadapter, + country_code-> + country_code, &cfp_bg, + &cfp_a)) { + PRINTM(MERROR, "Country code not found!\n"); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto done; + } + pmadapter->cfp_code_bg = cfp_bg; + pmadapter->cfp_code_a = cfp_a; + if (cfp_bg && cfp_a && (cfp_bg == cfp_a)) + pmadapter->region_code = cfp_a; + else + pmadapter->region_code = 0; + if (wlan_set_regiontable(pmpriv, pmadapter->region_code, + pmadapter->config_bands | pmadapter-> + adhoc_start_band)) { + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + ret = MLAN_STATUS_FAILURE; + goto done; + } + memcpy(pmadapter, pmadapter->country_code, + country_code->country_code, COUNTRY_CODE_LEN); + } else { + /* GET operation */ + memcpy(pmadapter, country_code->country_code, + pmadapter->country_code, COUNTRY_CODE_LEN); + } + +done: + LEAVE(); + return ret; } /** @@ -4636,28 +4836,28 @@ wlan_misc_ioctl_country_code(IN pmlan_adapter pmadapter, mlan_status wlan_misc_pmfcfg(IN pmlan_adapter pmadapter, IN mlan_ioctl_req * pioctl_req) { - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_misc_cfg *cfg_misc = MNULL; - mlan_ds_misc_pmfcfg *pmfcfg; - - cfg_misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - pmfcfg = &cfg_misc->param.pmfcfg; - - if (pioctl_req->action == MLAN_ACT_SET) { - pmpriv->pmfcfg.mfpc = pmfcfg->mfpc; - pmpriv->pmfcfg.mfpr = pmfcfg->mfpr; - } else { - /* GET operation */ - pmfcfg->mfpc = pmpriv->pmfcfg.mfpc; - pmfcfg->mfpr = pmpriv->pmfcfg.mfpr; - } - - LEAVE(); - return ret; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_misc_cfg *cfg_misc = MNULL; + mlan_ds_misc_pmfcfg *pmfcfg; + + cfg_misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + pmfcfg = &cfg_misc->param.pmfcfg; + + if (pioctl_req->action == MLAN_ACT_SET) { + pmpriv->pmfcfg.mfpc = pmfcfg->mfpc; + pmpriv->pmfcfg.mfpr = pmfcfg->mfpr; + } else { + /* GET operation */ + pmfcfg->mfpc = pmpriv->pmfcfg.mfpc; + pmfcfg->mfpr = pmpriv->pmfcfg.mfpr; + } + + LEAVE(); + return ret; } -/** +/** * @brief Miscellaneous configuration handler * * @param pmadapter A pointer to mlan_adapter structure @@ -4668,115 +4868,116 @@ wlan_misc_pmfcfg(IN pmlan_adapter pmadapter, IN mlan_ioctl_req * pioctl_req) static mlan_status wlan_misc_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_misc_cfg *misc = MNULL; - - ENTER(); - - if ((pioctl_req == MNULL) || (pioctl_req->pbuf == MNULL)) { - PRINTM(MERROR, "Request buffer not found!\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - if (pioctl_req->buf_len < sizeof(mlan_ds_misc_cfg)) { - PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_misc_cfg); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - switch (misc->sub_command) { - case MLAN_OID_MISC_GEN_IE: - status = wlan_misc_ioctl_gen_ie(pmadapter, pioctl_req); - break; - case MLAN_OID_MISC_REGION: - status = wlan_misc_ioctl_region(pmadapter, pioctl_req); - break; - case MLAN_OID_MISC_WARM_RESET: - status = wlan_misc_ioctl_warm_reset(pmadapter, pioctl_req); - break; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_misc_cfg *misc = MNULL; + + ENTER(); + + if ((pioctl_req == MNULL) || (pioctl_req->pbuf == MNULL)) { + PRINTM(MERROR, "Request buffer not found!\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + if (pioctl_req->buf_len < sizeof(mlan_ds_misc_cfg)) { + PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_misc_cfg); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + switch (misc->sub_command) { + case MLAN_OID_MISC_GEN_IE: + status = wlan_misc_ioctl_gen_ie(pmadapter, pioctl_req); + break; + case MLAN_OID_MISC_REGION: + status = wlan_misc_ioctl_region(pmadapter, pioctl_req); + break; + case MLAN_OID_MISC_WARM_RESET: + status = wlan_misc_ioctl_warm_reset(pmadapter, pioctl_req); + break; #if defined(SDIO_MULTI_PORT_TX_AGGR) || defined(SDIO_MULTI_PORT_RX_AGGR) - case MLAN_OID_MISC_SDIO_MPA_CTRL: - status = wlan_misc_ioctl_sdio_mpa_ctrl(pmadapter, pioctl_req); - break; + case MLAN_OID_MISC_SDIO_MPA_CTRL: + status = wlan_misc_ioctl_sdio_mpa_ctrl(pmadapter, pioctl_req); + break; #endif - case MLAN_OID_MISC_HOST_CMD: - status = wlan_misc_ioctl_host_cmd(pmadapter, pioctl_req); - break; - case MLAN_OID_MISC_SYS_CLOCK: - status = wlan_misc_ioctl_sysclock(pmadapter, pioctl_req); - break; - case MLAN_OID_MISC_WWS: - status = wlan_misc_ioctl_wws_cfg(pmadapter, pioctl_req); - break; - case MLAN_OID_MISC_ASSOC_RSP: - status = wlan_misc_ioctl_get_assoc_rsp(pmadapter, pioctl_req); - break; - case MLAN_OID_MISC_INIT_SHUTDOWN: - status = wlan_misc_ioctl_init_shutdown(pmadapter, pioctl_req); - break; - case MLAN_OID_MISC_SOFT_RESET: - status = wlan_misc_ioctl_soft_reset(pmadapter, pioctl_req); - break; - case MLAN_OID_MISC_CUSTOM_IE: - status = wlan_misc_ioctl_custom_ie_list(pmadapter, pioctl_req, MTRUE); - break; - case MLAN_OID_MISC_MAC_CONTROL: - status = wlan_misc_ioctl_mac_control(pmadapter, pioctl_req); - break; - case MLAN_OID_MISC_MEF_CFG: - status = wlan_misc_ioctl_mef_cfg(pmadapter, pioctl_req); - break; - case MLAN_OID_MISC_RX_MGMT_IND: - status = wlan_reg_rx_mgmt_ind(pmadapter, pioctl_req); - break; + case MLAN_OID_MISC_HOST_CMD: + status = wlan_misc_ioctl_host_cmd(pmadapter, pioctl_req); + break; + case MLAN_OID_MISC_SYS_CLOCK: + status = wlan_misc_ioctl_sysclock(pmadapter, pioctl_req); + break; + case MLAN_OID_MISC_WWS: + status = wlan_misc_ioctl_wws_cfg(pmadapter, pioctl_req); + break; + case MLAN_OID_MISC_ASSOC_RSP: + status = wlan_misc_ioctl_get_assoc_rsp(pmadapter, pioctl_req); + break; + case MLAN_OID_MISC_INIT_SHUTDOWN: + status = wlan_misc_ioctl_init_shutdown(pmadapter, pioctl_req); + break; + case MLAN_OID_MISC_SOFT_RESET: + status = wlan_misc_ioctl_soft_reset(pmadapter, pioctl_req); + break; + case MLAN_OID_MISC_CUSTOM_IE: + status = wlan_misc_ioctl_custom_ie_list(pmadapter, pioctl_req, + MTRUE); + break; + case MLAN_OID_MISC_MAC_CONTROL: + status = wlan_misc_ioctl_mac_control(pmadapter, pioctl_req); + break; + case MLAN_OID_MISC_MEF_CFG: + status = wlan_misc_ioctl_mef_cfg(pmadapter, pioctl_req); + break; + case MLAN_OID_MISC_RX_MGMT_IND: + status = wlan_reg_rx_mgmt_ind(pmadapter, pioctl_req); + break; #ifdef DEBUG_LEVEL1 - case MLAN_OID_MISC_DRVDBG: - status = wlan_set_drvdbg(pmadapter, pioctl_req); - break; + case MLAN_OID_MISC_DRVDBG: + status = wlan_set_drvdbg(pmadapter, pioctl_req); + break; #endif - case MLAN_OID_MISC_IP_ADDR: - status = wlan_misc_ioctl_ipaddr_cfg(pmadapter, pioctl_req); - break; - case MLAN_OID_MISC_CFP_CODE: - status = wlan_misc_ioctl_cfp_code_cfg(pmadapter, pioctl_req); - break; - case MLAN_OID_MISC_COUNTRY_CODE: - status = wlan_misc_ioctl_country_code(pmadapter, pioctl_req); - break; - case MLAN_OID_MISC_THERMAL: - status = wlan_misc_ioctl_thermal(pmadapter, pioctl_req); - break; - case MLAN_OID_MISC_SUBSCRIBE_EVENT: - status = wlan_misc_ioctl_subscribe_evt(pmadapter, pioctl_req); - break; - case MLAN_OID_MISC_OTP_USER_DATA: - status = wlan_misc_otp_user_data(pmadapter, pioctl_req); - break; - case MLAN_OID_MISC_TXCONTROL: - status = wlan_misc_ioctl_txcontrol(pmadapter, pioctl_req); - break; + case MLAN_OID_MISC_IP_ADDR: + status = wlan_misc_ioctl_ipaddr_cfg(pmadapter, pioctl_req); + break; + case MLAN_OID_MISC_CFP_CODE: + status = wlan_misc_ioctl_cfp_code_cfg(pmadapter, pioctl_req); + break; + case MLAN_OID_MISC_COUNTRY_CODE: + status = wlan_misc_ioctl_country_code(pmadapter, pioctl_req); + break; + case MLAN_OID_MISC_THERMAL: + status = wlan_misc_ioctl_thermal(pmadapter, pioctl_req); + break; + case MLAN_OID_MISC_SUBSCRIBE_EVENT: + status = wlan_misc_ioctl_subscribe_evt(pmadapter, pioctl_req); + break; + case MLAN_OID_MISC_OTP_USER_DATA: + status = wlan_misc_otp_user_data(pmadapter, pioctl_req); + break; + case MLAN_OID_MISC_TXCONTROL: + status = wlan_misc_ioctl_txcontrol(pmadapter, pioctl_req); + break; #ifdef STA_SUPPORT - case MLAN_OID_MISC_EXT_CAP_CFG: - status = wlan_misc_ext_capa_cfg(pmadapter, pioctl_req); - break; + case MLAN_OID_MISC_EXT_CAP_CFG: + status = wlan_misc_ext_capa_cfg(pmadapter, pioctl_req); + break; #endif - case MLAN_OID_MISC_PMFCFG: - status = wlan_misc_pmfcfg(pmadapter, pioctl_req); - break; - default: - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - LEAVE(); - return status; + case MLAN_OID_MISC_PMFCFG: + status = wlan_misc_pmfcfg(pmadapter, pioctl_req); + break; + default: + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + LEAVE(); + return status; } -/** +/** * @brief Set/Get scan configuration parameter * * @param pmadapter A pointer to mlan_adapter structure @@ -4787,49 +4988,55 @@ wlan_misc_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_set_get_scan_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req, IN t_u32 action) + IN pmlan_ioctl_req pioctl_req, IN t_u32 action) { - mlan_ds_scan *scan = MNULL; - - ENTER(); - - scan = (mlan_ds_scan *) pioctl_req->pbuf; - if (action == MLAN_ACT_GET) { - scan->param.scan_cfg.scan_type = (t_u32) pmadapter->scan_type; - scan->param.scan_cfg.scan_mode = pmadapter->scan_mode; - scan->param.scan_cfg.scan_probe = (t_u32) pmadapter->scan_probes; - scan->param.scan_cfg.scan_time.specific_scan_time = - (t_u32) pmadapter->specific_scan_time; - scan->param.scan_cfg.scan_time.active_scan_time = - (t_u32) pmadapter->active_scan_time; - scan->param.scan_cfg.scan_time.passive_scan_time = - (t_u32) pmadapter->passive_scan_time; - scan->param.scan_cfg.ext_scan = pmadapter->ext_scan; - } else { - if (scan->param.scan_cfg.scan_type) - pmadapter->scan_type = (t_u8) scan->param.scan_cfg.scan_type; - if (scan->param.scan_cfg.scan_mode) - pmadapter->scan_mode = scan->param.scan_cfg.scan_mode; - if (scan->param.scan_cfg.scan_probe) - pmadapter->scan_probes = (t_u16) scan->param.scan_cfg.scan_probe; - if (scan->param.scan_cfg.scan_time.specific_scan_time) - pmadapter->specific_scan_time = - (t_u16) scan->param.scan_cfg.scan_time.specific_scan_time; - if (scan->param.scan_cfg.scan_time.active_scan_time) - pmadapter->active_scan_time = - (t_u16) scan->param.scan_cfg.scan_time.active_scan_time; - if (scan->param.scan_cfg.scan_time.passive_scan_time) - pmadapter->passive_scan_time = - (t_u16) scan->param.scan_cfg.scan_time.passive_scan_time; - pmadapter->ext_scan = scan->param.scan_cfg.ext_scan; - } - pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_scan *scan = MNULL; + + ENTER(); + + scan = (mlan_ds_scan *) pioctl_req->pbuf; + if (action == MLAN_ACT_GET) { + scan->param.scan_cfg.scan_type = (t_u32) pmadapter->scan_type; + scan->param.scan_cfg.scan_mode = pmadapter->scan_mode; + scan->param.scan_cfg.scan_probe = + (t_u32) pmadapter->scan_probes; + scan->param.scan_cfg.scan_time.specific_scan_time = + (t_u32) pmadapter->specific_scan_time; + scan->param.scan_cfg.scan_time.active_scan_time = + (t_u32) pmadapter->active_scan_time; + scan->param.scan_cfg.scan_time.passive_scan_time = + (t_u32) pmadapter->passive_scan_time; + scan->param.scan_cfg.ext_scan = pmadapter->ext_scan; + } else { + if (scan->param.scan_cfg.scan_type) + pmadapter->scan_type = + (t_u8) scan->param.scan_cfg.scan_type; + if (scan->param.scan_cfg.scan_mode) + pmadapter->scan_mode = scan->param.scan_cfg.scan_mode; + if (scan->param.scan_cfg.scan_probe) + pmadapter->scan_probes = + (t_u16) scan->param.scan_cfg.scan_probe; + if (scan->param.scan_cfg.scan_time.specific_scan_time) + pmadapter->specific_scan_time = + (t_u16) scan->param.scan_cfg.scan_time. + specific_scan_time; + if (scan->param.scan_cfg.scan_time.active_scan_time) + pmadapter->active_scan_time = + (t_u16) scan->param.scan_cfg.scan_time. + active_scan_time; + if (scan->param.scan_cfg.scan_time.passive_scan_time) + pmadapter->passive_scan_time = + (t_u16) scan->param.scan_cfg.scan_time. + passive_scan_time; + pmadapter->ext_scan = scan->param.scan_cfg.ext_scan; + } + pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief Set/Get scan * * @param pmadapter A pointer to mlan_adapter structure @@ -4840,127 +5047,139 @@ wlan_set_get_scan_cfg(IN pmlan_adapter pmadapter, static mlan_status wlan_scan_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_scan *pscan; - - ENTER(); - - pscan = (mlan_ds_scan *) pioctl_req->pbuf; - if (pscan->sub_command == MLAN_OID_SCAN_CONFIG) - goto start_config; - if (pmadapter->scan_processing && pioctl_req->action == MLAN_ACT_SET && - pscan->sub_command != MLAN_OID_SCAN_CANCEL) { - PRINTM(MINFO, "Scan already in process...\n"); - LEAVE(); - return status; - } - - if (pmadapter->scan_block && pioctl_req->action == MLAN_ACT_SET) { - PRINTM(MINFO, "Scan is blocked during association...\n"); - wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_SCAN_REPORT, MNULL); - LEAVE(); - return status; - } - start_config: - /* Set scan */ - if (pioctl_req->action == MLAN_ACT_SET) { - - switch (pscan->sub_command) { - case MLAN_OID_SCAN_NORMAL: - status = wlan_scan_networks(pmpriv, pioctl_req, MNULL); - break; - case MLAN_OID_SCAN_SPECIFIC_SSID: - status = - wlan_scan_specific_ssid(pmpriv, pioctl_req, - &pscan->param.scan_req.scan_ssid); - break; - case MLAN_OID_SCAN_USER_CONFIG: - status = wlan_scan_networks(pmpriv, pioctl_req, - (wlan_user_scan_cfg *) pscan->param. - user_scan.scan_cfg_buf); - break; - case MLAN_OID_SCAN_CONFIG: - status = wlan_set_get_scan_cfg(pmadapter, pioctl_req, MLAN_ACT_SET); - break; - case MLAN_OID_SCAN_CANCEL: - wlan_cancel_pending_scan_cmd(pmadapter); - break; - case MLAN_OID_SCAN_TABLE_FLUSH: - status = wlan_flush_scan_table(pmadapter); - break; - case MLAN_OID_SCAN_BGSCAN_CONFIG: - /* Send request to firmware */ - status = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_BG_SCAN_CONFIG, - HostCmd_ACT_GEN_SET, - 0, - (t_void *) pioctl_req, - pscan->param.user_scan.scan_cfg_buf); - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - - if ((status == MLAN_STATUS_SUCCESS) && - (pscan->sub_command != MLAN_OID_SCAN_TABLE_FLUSH) && - (pscan->sub_command != MLAN_OID_SCAN_CANCEL) && - (pscan->sub_command != MLAN_OID_SCAN_CONFIG)) { - PRINTM(MINFO, "wlan_scan_ioctl: return MLAN_STATUS_PENDING\n"); - status = MLAN_STATUS_PENDING; - } - } - /* Get scan */ - else { - if (pscan->sub_command == MLAN_OID_SCAN_CONFIG) { - status = wlan_set_get_scan_cfg(pmadapter, pioctl_req, MLAN_ACT_GET); - } else if (pscan->sub_command == MLAN_OID_SCAN_GET_CURRENT_BSS) { - pscan->param.scan_resp.num_in_scan_table = - pmadapter->num_in_scan_table; - pscan->param.scan_resp.pscan_table = - (t_u8 *) & pmpriv->curr_bss_params.bss_descriptor; - pioctl_req->data_read_written = - sizeof(mlan_scan_resp) + MLAN_SUB_COMMAND_SIZE; - } else { - if (pmadapter->bgscan_reported) { - pmadapter->bgscan_reported = MFALSE; - /* Clear the previous scan result */ - memset(pmadapter, pmadapter->pscan_table, 0x00, - sizeof(BSSDescriptor_t) * MRVDRV_MAX_BSSID_LIST); - pmadapter->num_in_scan_table = 0; - pmadapter->pbcn_buf_end = pmadapter->bcn_buf; - status = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_BG_SCAN_QUERY, - HostCmd_ACT_GEN_GET, - 0, (t_void *) pioctl_req, MNULL); - if (status == MLAN_STATUS_SUCCESS) { - PRINTM(MINFO, - "wlan_scan_ioctl: return MLAN_STATUS_PENDING\n"); - status = MLAN_STATUS_PENDING; - } - } else { - pscan->param.scan_resp.pscan_table = - (t_u8 *) pmadapter->pscan_table; - pscan->param.scan_resp.num_in_scan_table = - pmadapter->num_in_scan_table; - pscan->param.scan_resp.age_in_secs = pmadapter->age_in_secs; - pioctl_req->data_read_written = sizeof(mlan_scan_resp) + - MLAN_SUB_COMMAND_SIZE; - } - } - } - - LEAVE(); - return status; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_scan *pscan; + + ENTER(); + + pscan = (mlan_ds_scan *) pioctl_req->pbuf; + if (pscan->sub_command == MLAN_OID_SCAN_CONFIG) + goto start_config; + if (pmadapter->scan_processing && pioctl_req->action == MLAN_ACT_SET && + pscan->sub_command != MLAN_OID_SCAN_CANCEL) { + PRINTM(MINFO, "Scan already in process...\n"); + LEAVE(); + return status; + } + + if (pmadapter->scan_block && pioctl_req->action == MLAN_ACT_SET) { + PRINTM(MINFO, "Scan is blocked during association...\n"); + wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_SCAN_REPORT, MNULL); + LEAVE(); + return status; + } +start_config: + /* Set scan */ + if (pioctl_req->action == MLAN_ACT_SET) { + + switch (pscan->sub_command) { + case MLAN_OID_SCAN_NORMAL: + status = wlan_scan_networks(pmpriv, pioctl_req, MNULL); + break; + case MLAN_OID_SCAN_SPECIFIC_SSID: + status = wlan_scan_specific_ssid(pmpriv, pioctl_req, + &pscan->param.scan_req. + scan_ssid); + break; + case MLAN_OID_SCAN_USER_CONFIG: + status = wlan_scan_networks(pmpriv, pioctl_req, + (wlan_user_scan_cfg *) + pscan->param.user_scan. + scan_cfg_buf); + break; + case MLAN_OID_SCAN_CONFIG: + status = wlan_set_get_scan_cfg(pmadapter, + pioctl_req, + MLAN_ACT_SET); + break; + case MLAN_OID_SCAN_CANCEL: + wlan_cancel_pending_scan_cmd(pmadapter); + break; + case MLAN_OID_SCAN_TABLE_FLUSH: + status = wlan_flush_scan_table(pmadapter); + break; + case MLAN_OID_SCAN_BGSCAN_CONFIG: + /* Send request to firmware */ + status = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_BG_SCAN_CONFIG, + HostCmd_ACT_GEN_SET, + 0, + (t_void *) pioctl_req, + pscan->param.user_scan. + scan_cfg_buf); + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + + if ((status == MLAN_STATUS_SUCCESS) && + (pscan->sub_command != MLAN_OID_SCAN_TABLE_FLUSH) && + (pscan->sub_command != MLAN_OID_SCAN_CANCEL) && + (pscan->sub_command != MLAN_OID_SCAN_CONFIG)) { + PRINTM(MINFO, + "wlan_scan_ioctl: return MLAN_STATUS_PENDING\n"); + status = MLAN_STATUS_PENDING; + } + } + /* Get scan */ + else { + if (pscan->sub_command == MLAN_OID_SCAN_CONFIG) { + status = wlan_set_get_scan_cfg(pmadapter, pioctl_req, + MLAN_ACT_GET); + } else if (pscan->sub_command == MLAN_OID_SCAN_GET_CURRENT_BSS) { + pscan->param.scan_resp.num_in_scan_table = + pmadapter->num_in_scan_table; + pscan->param.scan_resp.pscan_table = + (t_u8 *) & pmpriv->curr_bss_params. + bss_descriptor; + pioctl_req->data_read_written = + sizeof(mlan_scan_resp) + MLAN_SUB_COMMAND_SIZE; + } else { + if (pmadapter->bgscan_reported) { + pmadapter->bgscan_reported = MFALSE; + /* Clear the previous scan result */ + memset(pmadapter, pmadapter->pscan_table, 0x00, + sizeof(BSSDescriptor_t) * + MRVDRV_MAX_BSSID_LIST); + pmadapter->num_in_scan_table = 0; + pmadapter->pbcn_buf_end = pmadapter->bcn_buf; + status = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_BG_SCAN_QUERY, + HostCmd_ACT_GEN_GET, + 0, + (t_void *) pioctl_req, + MNULL); + if (status == MLAN_STATUS_SUCCESS) { + PRINTM(MINFO, + "wlan_scan_ioctl: return MLAN_STATUS_PENDING\n"); + status = MLAN_STATUS_PENDING; + } + } else { + pscan->param.scan_resp.pscan_table = + (t_u8 *) pmadapter->pscan_table; + pscan->param.scan_resp.num_in_scan_table = + pmadapter->num_in_scan_table; + pscan->param.scan_resp.age_in_secs = + pmadapter->age_in_secs; + pioctl_req->data_read_written = + sizeof(mlan_scan_resp) + + MLAN_SUB_COMMAND_SIZE; + } + } + } + + LEAVE(); + return status; } /******************************************************** Global Functions ********************************************************/ -/** +/** * @brief Set ewpa mode * * @param priv A pointer to mlan_private structure @@ -4971,22 +5190,22 @@ wlan_scan_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) mlan_status wlan_set_ewpa_mode(mlan_private * priv, mlan_ds_passphrase * psec_pp) { - ENTER(); + ENTER(); - if ((psec_pp->psk_type == MLAN_PSK_PASSPHRASE && - psec_pp->psk.passphrase.passphrase_len > 0) || - (psec_pp->psk_type == MLAN_PSK_PMK)) - priv->sec_info.ewpa_enabled = MTRUE; - else - priv->sec_info.ewpa_enabled = MFALSE; + if ((psec_pp->psk_type == MLAN_PSK_PASSPHRASE && + psec_pp->psk.passphrase.passphrase_len > 0) || + (psec_pp->psk_type == MLAN_PSK_PMK)) + priv->sec_info.ewpa_enabled = MTRUE; + else + priv->sec_info.ewpa_enabled = MFALSE; - PRINTM(MINFO, "Set ewpa mode = %d\n", priv->sec_info.ewpa_enabled); + PRINTM(MINFO, "Set ewpa mode = %d\n", priv->sec_info.ewpa_enabled); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief Search for a BSS * * @param pmpriv A pointer to mlan_private structure @@ -4997,66 +5216,73 @@ wlan_set_ewpa_mode(mlan_private * priv, mlan_ds_passphrase * psec_pp) mlan_status wlan_find_bss(mlan_private * pmpriv, pmlan_ioctl_req pioctl_req) { - mlan_adapter *pmadapter = pmpriv->adapter; - mlan_ds_bss *bss = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; - t_u8 mac[MLAN_MAC_ADDR_LENGTH]; - int i = 0; - BSSDescriptor_t *pbss_desc; - - ENTER(); - - bss = (mlan_ds_bss *) pioctl_req->pbuf; - - if (memcmp - (pmadapter, &bss->param.ssid_bssid.bssid, zero_mac, sizeof(zero_mac))) { - if (bss->param.ssid_bssid.ssid.ssid_len) /* ssid & bssid */ - i = wlan_find_ssid_in_list(pmpriv, &bss->param.ssid_bssid.ssid, - (t_u8 *) & bss->param.ssid_bssid.bssid, - pmpriv->bss_mode); - else - i = wlan_find_bssid_in_list(pmpriv, - (t_u8 *) & bss->param.ssid_bssid.bssid, - pmpriv->bss_mode); - if (i < 0) { - memcpy(pmadapter, mac, &bss->param.ssid_bssid.bssid, sizeof(mac)); - PRINTM(MIOCTL, "Can not find bssid " MACSTR "\n", MAC2STR(mac)); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - pbss_desc = &pmadapter->pscan_table[i]; - memcpy(pmadapter, &bss->param.ssid_bssid.ssid, &pbss_desc->ssid, - sizeof(mlan_802_11_ssid)); - bss->param.ssid_bssid.rssi = pbss_desc->rssi; - /* index in bss list,start from 1 */ - bss->param.ssid_bssid.idx = i + 1; - } else if (bss->param.ssid_bssid.ssid.ssid_len) { - i = wlan_find_ssid_in_list(pmpriv, &bss->param.ssid_bssid.ssid, MNULL, - pmpriv->bss_mode); - if (i < 0) { - PRINTM(MIOCTL, "Can not find ssid %s\n", - bss->param.ssid_bssid.ssid.ssid); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - pbss_desc = &pmadapter->pscan_table[i]; - memcpy(pmadapter, (t_u8 *) & bss->param.ssid_bssid.bssid, - (t_u8 *) & pbss_desc->mac_address, MLAN_MAC_ADDR_LENGTH); - bss->param.ssid_bssid.rssi = pbss_desc->rssi; - /* index in bss list, start from 1 */ - bss->param.ssid_bssid.idx = i + 1; - } else { - ret = wlan_find_best_network(pmpriv, &bss->param.ssid_bssid); - } - - LEAVE(); - return ret; + mlan_adapter *pmadapter = pmpriv->adapter; + mlan_ds_bss *bss = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; + t_u8 mac[MLAN_MAC_ADDR_LENGTH]; + int i = 0; + BSSDescriptor_t *pbss_desc; + + ENTER(); + + bss = (mlan_ds_bss *) pioctl_req->pbuf; + + if (memcmp + (pmadapter, &bss->param.ssid_bssid.bssid, zero_mac, + sizeof(zero_mac))) { + if (bss->param.ssid_bssid.ssid.ssid_len) /* ssid & bssid + */ + i = wlan_find_ssid_in_list(pmpriv, + &bss->param.ssid_bssid.ssid, + (t_u8 *) & bss->param. + ssid_bssid.bssid, + pmpriv->bss_mode); + else + i = wlan_find_bssid_in_list(pmpriv, + (t_u8 *) & bss->param. + ssid_bssid.bssid, + pmpriv->bss_mode); + if (i < 0) { + memcpy(pmadapter, mac, &bss->param.ssid_bssid.bssid, + sizeof(mac)); + PRINTM(MIOCTL, "Can not find bssid " MACSTR "\n", + MAC2STR(mac)); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + pbss_desc = &pmadapter->pscan_table[i]; + memcpy(pmadapter, &bss->param.ssid_bssid.ssid, &pbss_desc->ssid, + sizeof(mlan_802_11_ssid)); + bss->param.ssid_bssid.rssi = pbss_desc->rssi; + /* index in bss list,start from 1 */ + bss->param.ssid_bssid.idx = i + 1; + } else if (bss->param.ssid_bssid.ssid.ssid_len) { + i = wlan_find_ssid_in_list(pmpriv, &bss->param.ssid_bssid.ssid, + MNULL, pmpriv->bss_mode); + if (i < 0) { + PRINTM(MIOCTL, "Can not find ssid %s\n", + bss->param.ssid_bssid.ssid.ssid); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + pbss_desc = &pmadapter->pscan_table[i]; + memcpy(pmadapter, (t_u8 *) & bss->param.ssid_bssid.bssid, + (t_u8 *) & pbss_desc->mac_address, MLAN_MAC_ADDR_LENGTH); + bss->param.ssid_bssid.rssi = pbss_desc->rssi; + /* index in bss list, start from 1 */ + bss->param.ssid_bssid.idx = i + 1; + } else { + ret = wlan_find_best_network(pmpriv, &bss->param.ssid_bssid); + } + + LEAVE(); + return ret; } -/** +/** * @brief MLAN station ioctl handler * * @param adapter A pointer to mlan_adapter structure @@ -5067,68 +5293,68 @@ wlan_find_bss(mlan_private * pmpriv, pmlan_ioctl_req pioctl_req) mlan_status wlan_ops_sta_ioctl(t_void * adapter, pmlan_ioctl_req pioctl_req) { - pmlan_adapter pmadapter = (pmlan_adapter) adapter; - mlan_status status = MLAN_STATUS_SUCCESS; - - ENTER(); - - switch (pioctl_req->req_id) { - case MLAN_IOCTL_SCAN: - status = wlan_scan_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_BSS: - status = wlan_bss_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_RADIO_CFG: - status = wlan_radio_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_SNMP_MIB: - status = wlan_snmp_mib_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_GET_INFO: - status = wlan_get_info_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_SEC_CFG: - status = wlan_sec_cfg_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_RATE: - status = wlan_rate_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_POWER_CFG: - status = wlan_power_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_PM_CFG: - status = wlan_pm_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_WMM_CFG: - status = wlan_wmm_cfg_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_WPS_CFG: - status = wlan_wps_cfg_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_11N_CFG: - status = wlan_11n_cfg_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_11D_CFG: - status = wlan_11d_cfg_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_REG_MEM: - status = wlan_reg_mem_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_MISC_CFG: - status = wlan_misc_cfg_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_11H_CFG: - status = wlan_11h_cfg_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_11AC_CFG: - status = wlan_11ac_cfg_ioctl(pmadapter, pioctl_req); - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - LEAVE(); - return status; + pmlan_adapter pmadapter = (pmlan_adapter) adapter; + mlan_status status = MLAN_STATUS_SUCCESS; + + ENTER(); + + switch (pioctl_req->req_id) { + case MLAN_IOCTL_SCAN: + status = wlan_scan_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_BSS: + status = wlan_bss_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_RADIO_CFG: + status = wlan_radio_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_SNMP_MIB: + status = wlan_snmp_mib_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_GET_INFO: + status = wlan_get_info_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_SEC_CFG: + status = wlan_sec_cfg_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_RATE: + status = wlan_rate_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_POWER_CFG: + status = wlan_power_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_PM_CFG: + status = wlan_pm_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_WMM_CFG: + status = wlan_wmm_cfg_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_WPS_CFG: + status = wlan_wps_cfg_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_11N_CFG: + status = wlan_11n_cfg_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_11D_CFG: + status = wlan_11d_cfg_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_REG_MEM: + status = wlan_reg_mem_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_MISC_CFG: + status = wlan_misc_cfg_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_11H_CFG: + status = wlan_11h_cfg_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_11AC_CFG: + status = wlan_11ac_cfg_ioctl(pmadapter, pioctl_req); + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + LEAVE(); + return status; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_sta_rx.c b/drivers/net/wireless/sd8897/mlan/mlan_sta_rx.c index 98487ab320ff..e33742eb2fba 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_sta_rx.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_sta_rx.c @@ -2,8 +2,8 @@ * * @brief This file contains the handling of RX in MLAN * module. - * - * Copyright (C) 2008-2011, Marvell International Ltd. + * + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -40,11 +40,11 @@ Change log: typedef struct { /** Ethernet II header destination address */ - t_u8 dest_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 dest_addr[MLAN_MAC_ADDR_LENGTH]; /** Ethernet II header source address */ - t_u8 src_addr[MLAN_MAC_ADDR_LENGTH]; + t_u8 src_addr[MLAN_MAC_ADDR_LENGTH]; /** Ethernet II header length */ - t_u16 ethertype; + t_u16 ethertype; } EthII_Hdr_t; @@ -63,7 +63,7 @@ typedef struct /** * @brief This function processes received packet and forwards it * to kernel/upper layer - * + * * @param pmadapter A pointer to mlan_adapter * @param pmbuf A pointer to mlan_buffer which includes the received packet * @@ -72,128 +72,139 @@ typedef struct mlan_status wlan_process_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private priv = pmadapter->priv[pmbuf->bss_index]; - RxPacketHdr_t *prx_pkt; - RxPD *prx_pd; - int hdr_chop; - EthII_Hdr_t *peth_hdr; - t_u8 rfc1042_eth_hdr[MLAN_MAC_ADDR_LENGTH] = - { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; - t_u8 snap_oui_802_h[MLAN_MAC_ADDR_LENGTH] = - { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 }; - t_u8 appletalk_aarp_type[2] = { 0x80, 0xf3 }; - t_u8 ipx_snap_type[2] = { 0x81, 0x37 }; - - ENTER(); - - prx_pd = (RxPD *) (pmbuf->pbuf + pmbuf->data_offset); - prx_pkt = (RxPacketHdr_t *) ((t_u8 *) prx_pd + prx_pd->rx_pkt_offset); + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private priv = pmadapter->priv[pmbuf->bss_index]; + RxPacketHdr_t *prx_pkt; + RxPD *prx_pd; + int hdr_chop; + EthII_Hdr_t *peth_hdr; + t_u8 rfc1042_eth_hdr[MLAN_MAC_ADDR_LENGTH] = + { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; + t_u8 snap_oui_802_h[MLAN_MAC_ADDR_LENGTH] = + { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 }; + t_u8 appletalk_aarp_type[2] = { 0x80, 0xf3 }; + t_u8 ipx_snap_type[2] = { 0x81, 0x37 }; + + ENTER(); + + prx_pd = (RxPD *) (pmbuf->pbuf + pmbuf->data_offset); + prx_pkt = (RxPacketHdr_t *) ((t_u8 *) prx_pd + prx_pd->rx_pkt_offset); /** Small debug type */ #define DBG_TYPE_SMALL 2 /** Size of debugging structure */ #define SIZE_OF_DBG_STRUCT 4 - if (prx_pd->rx_pkt_type == PKT_TYPE_DEBUG) { - t_u8 dbgType; - dbgType = *(t_u8 *) & prx_pkt->eth803_hdr; - if (dbgType == DBG_TYPE_SMALL) { - PRINTM(MFW_D, "\n"); - DBG_HEXDUMP(MFW_D, "FWDBG", - (char *) ((t_u8 *) & prx_pkt->eth803_hdr + - SIZE_OF_DBG_STRUCT), prx_pd->rx_pkt_length); - PRINTM(MFW_D, "FWDBG::\n"); - } - goto done; - } - - PRINTM(MINFO, "RX Data: data_len - prx_pd->rx_pkt_offset = %d - %d = %d\n", - pmbuf->data_len, prx_pd->rx_pkt_offset, - pmbuf->data_len - prx_pd->rx_pkt_offset); - - HEXDUMP("RX Data: Dest", prx_pkt->eth803_hdr.dest_addr, - sizeof(prx_pkt->eth803_hdr.dest_addr)); - HEXDUMP("RX Data: Src", prx_pkt->eth803_hdr.src_addr, - sizeof(prx_pkt->eth803_hdr.src_addr)); - - if ((memcmp(pmadapter, &prx_pkt->rfc1042_hdr, - snap_oui_802_h, sizeof(snap_oui_802_h)) == 0) || - ((memcmp(pmadapter, &prx_pkt->rfc1042_hdr, - rfc1042_eth_hdr, sizeof(rfc1042_eth_hdr)) == 0) && - memcmp(pmadapter, &prx_pkt->rfc1042_hdr.snap_type, - appletalk_aarp_type, sizeof(appletalk_aarp_type)) && - memcmp(pmadapter, &prx_pkt->rfc1042_hdr.snap_type, - ipx_snap_type, sizeof(ipx_snap_type)))) { - /* - * Replace the 803 header and rfc1042 header (llc/snap) with an - * EthernetII header, keep the src/dst and snap_type (ethertype). - * The firmware only passes up SNAP frames converting - * all RX Data from 802.11 to 802.2/LLC/SNAP frames. - * To create the Ethernet II, just move the src, dst address right - * before the snap_type. - */ - peth_hdr = (EthII_Hdr_t *) - ((t_u8 *) & prx_pkt->eth803_hdr - + sizeof(prx_pkt->eth803_hdr) + sizeof(prx_pkt->rfc1042_hdr) - - sizeof(prx_pkt->eth803_hdr.dest_addr) - - sizeof(prx_pkt->eth803_hdr.src_addr) - - sizeof(prx_pkt->rfc1042_hdr.snap_type)); - - memcpy(pmadapter, peth_hdr->src_addr, prx_pkt->eth803_hdr.src_addr, - sizeof(peth_hdr->src_addr)); - memcpy(pmadapter, peth_hdr->dest_addr, prx_pkt->eth803_hdr.dest_addr, - sizeof(peth_hdr->dest_addr)); - - /* Chop off the RxPD + the excess memory from the 802.2/llc/snap header - that was removed. */ - hdr_chop = (t_u32) ((t_ptr) peth_hdr - (t_ptr) prx_pd); - } else { - HEXDUMP("RX Data: LLC/SNAP", - (t_u8 *) & prx_pkt->rfc1042_hdr, sizeof(prx_pkt->rfc1042_hdr)); - - /* Chop off the RxPD */ - hdr_chop = (t_u32) ((t_ptr) & prx_pkt->eth803_hdr - (t_ptr) prx_pd); - } - - /* Chop off the leading header bytes so the it points to the start of - either the reconstructed EthII frame or the 802.2/llc/snap frame */ - pmbuf->data_len -= hdr_chop; - pmbuf->data_offset += hdr_chop; - pmbuf->pparent = MNULL; - - DBG_HEXDUMP(MDAT_D, "RxPD", (t_u8 *) prx_pd, - MIN(sizeof(RxPD), MAX_DATA_DUMP_LEN)); - DBG_HEXDUMP(MDAT_D, "Rx Payload", ((t_u8 *) prx_pd + prx_pd->rx_pkt_offset), - MIN(prx_pd->rx_pkt_length, MAX_DATA_DUMP_LEN)); - - priv->rxpd_rate = prx_pd->rx_rate; - priv->rxpd_rate_info = prx_pd->rate_info; - - pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, - &pmbuf->out_ts_sec, - &pmbuf->out_ts_usec); - PRINTM_NETINTF(MDATA, priv); - PRINTM(MDATA, "%lu.%06lu : Data => kernel seq_num=%d tid=%d\n", - pmbuf->out_ts_sec, pmbuf->out_ts_usec, prx_pd->seq_num, - prx_pd->priority); - - ret = pmadapter->callbacks.moal_recv_packet(pmadapter->pmoal_handle, pmbuf); - if (ret == MLAN_STATUS_FAILURE) { - pmbuf->status_code = MLAN_ERROR_PKT_INVALID; - PRINTM(MERROR, "STA Rx Error: moal_recv_packet returned error\n"); - } - done: - if (ret != MLAN_STATUS_PENDING) { - wlan_free_mlan_buffer(pmadapter, pmbuf); - } - LEAVE(); - - return ret; + if (prx_pd->rx_pkt_type == PKT_TYPE_DEBUG) { + t_u8 dbgType; + dbgType = *(t_u8 *) & prx_pkt->eth803_hdr; + if (dbgType == DBG_TYPE_SMALL) { + PRINTM(MFW_D, "\n"); + DBG_HEXDUMP(MFW_D, "FWDBG", + (char *)((t_u8 *) & prx_pkt->eth803_hdr + + SIZE_OF_DBG_STRUCT), + prx_pd->rx_pkt_length); + PRINTM(MFW_D, "FWDBG::\n"); + } + goto done; + } + + PRINTM(MINFO, + "RX Data: data_len - prx_pd->rx_pkt_offset = %d - %d = %d\n", + pmbuf->data_len, prx_pd->rx_pkt_offset, + pmbuf->data_len - prx_pd->rx_pkt_offset); + + HEXDUMP("RX Data: Dest", prx_pkt->eth803_hdr.dest_addr, + sizeof(prx_pkt->eth803_hdr.dest_addr)); + HEXDUMP("RX Data: Src", prx_pkt->eth803_hdr.src_addr, + sizeof(prx_pkt->eth803_hdr.src_addr)); + + if ((memcmp(pmadapter, &prx_pkt->rfc1042_hdr, + snap_oui_802_h, sizeof(snap_oui_802_h)) == 0) || + ((memcmp(pmadapter, &prx_pkt->rfc1042_hdr, + rfc1042_eth_hdr, sizeof(rfc1042_eth_hdr)) == 0) && + memcmp(pmadapter, &prx_pkt->rfc1042_hdr.snap_type, + appletalk_aarp_type, sizeof(appletalk_aarp_type)) && + memcmp(pmadapter, &prx_pkt->rfc1042_hdr.snap_type, + ipx_snap_type, sizeof(ipx_snap_type)))) { + /* + * Replace the 803 header and rfc1042 header (llc/snap) with an + * EthernetII header, keep the src/dst and snap_type (ethertype). + * The firmware only passes up SNAP frames converting + * all RX Data from 802.11 to 802.2/LLC/SNAP frames. + * To create the Ethernet II, just move the src, dst address right + * before the snap_type. + */ + peth_hdr = (EthII_Hdr_t *) + ((t_u8 *) & prx_pkt->eth803_hdr + + sizeof(prx_pkt->eth803_hdr) + + sizeof(prx_pkt->rfc1042_hdr) + - sizeof(prx_pkt->eth803_hdr.dest_addr) + - sizeof(prx_pkt->eth803_hdr.src_addr) + - sizeof(prx_pkt->rfc1042_hdr.snap_type)); + + memcpy(pmadapter, peth_hdr->src_addr, + prx_pkt->eth803_hdr.src_addr, + sizeof(peth_hdr->src_addr)); + memcpy(pmadapter, peth_hdr->dest_addr, + prx_pkt->eth803_hdr.dest_addr, + sizeof(peth_hdr->dest_addr)); + + /* Chop off the RxPD + the excess memory from the + 802.2/llc/snap header that was removed. */ + hdr_chop = (t_u32) ((t_ptr) peth_hdr - (t_ptr) prx_pd); + } else { + HEXDUMP("RX Data: LLC/SNAP", + (t_u8 *) & prx_pkt->rfc1042_hdr, + sizeof(prx_pkt->rfc1042_hdr)); + + /* Chop off the RxPD */ + hdr_chop = + (t_u32) ((t_ptr) & prx_pkt->eth803_hdr - + (t_ptr) prx_pd); + } + + /* Chop off the leading header bytes so the it points to the start of + either the reconstructed EthII frame or the 802.2/llc/snap frame */ + pmbuf->data_len -= hdr_chop; + pmbuf->data_offset += hdr_chop; + pmbuf->pparent = MNULL; + + DBG_HEXDUMP(MDAT_D, "RxPD", (t_u8 *) prx_pd, + MIN(sizeof(RxPD), MAX_DATA_DUMP_LEN)); + DBG_HEXDUMP(MDAT_D, "Rx Payload", + ((t_u8 *) prx_pd + prx_pd->rx_pkt_offset), + MIN(prx_pd->rx_pkt_length, MAX_DATA_DUMP_LEN)); + + priv->rxpd_rate = prx_pd->rx_rate; + priv->rxpd_rate_info = prx_pd->rate_info; + + pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, + &pmbuf->out_ts_sec, + &pmbuf->out_ts_usec); + PRINTM_NETINTF(MDATA, priv); + PRINTM(MDATA, "%lu.%06lu : Data => kernel seq_num=%d tid=%d\n", + pmbuf->out_ts_sec, pmbuf->out_ts_usec, prx_pd->seq_num, + prx_pd->priority); + + ret = pmadapter->callbacks.moal_recv_packet(pmadapter->pmoal_handle, + pmbuf); + if (ret == MLAN_STATUS_FAILURE) { + pmbuf->status_code = MLAN_ERROR_PKT_INVALID; + PRINTM(MERROR, + "STA Rx Error: moal_recv_packet returned error\n"); + } +done: + if (ret != MLAN_STATUS_PENDING) { + wlan_free_mlan_buffer(pmadapter, pmbuf); + } + LEAVE(); + + return ret; } /** * @brief This function processes the received buffer - * + * * @param adapter A pointer to mlan_adapter * @param pmbuf A pointer to the received buffer * @@ -202,89 +213,96 @@ wlan_process_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) mlan_status wlan_ops_sta_process_rx_packet(IN t_void * adapter, IN pmlan_buffer pmbuf) { - pmlan_adapter pmadapter = (pmlan_adapter) adapter; - mlan_status ret = MLAN_STATUS_SUCCESS; - RxPD *prx_pd; - RxPacketHdr_t *prx_pkt; - pmlan_private priv = pmadapter->priv[pmbuf->bss_index]; - t_u8 ta[MLAN_MAC_ADDR_LENGTH]; - t_u16 rx_pkt_type = 0; - wlan_mgmt_pkt *pmgmt_pkt_hdr = MNULL; - ENTER(); - - prx_pd = (RxPD *) (pmbuf->pbuf + pmbuf->data_offset); - /* Endian conversion */ - endian_convert_RxPD(prx_pd); - rx_pkt_type = prx_pd->rx_pkt_type; - prx_pkt = (RxPacketHdr_t *) ((t_u8 *) prx_pd + prx_pd->rx_pkt_offset); - - if ((prx_pd->rx_pkt_offset + prx_pd->rx_pkt_length) > - (t_u16) pmbuf->data_len) { - PRINTM(MERROR, - "Wrong rx packet: len=%d,rx_pkt_offset=%d," - " rx_pkt_length=%d\n", pmbuf->data_len, prx_pd->rx_pkt_offset, - prx_pd->rx_pkt_length); - pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; - ret = MLAN_STATUS_FAILURE; - wlan_free_mlan_buffer(pmadapter, pmbuf); - goto done; - } - pmbuf->data_len = prx_pd->rx_pkt_offset + prx_pd->rx_pkt_length; - - if (pmadapter->priv[pmbuf->bss_index]->mgmt_frame_passthru_mask && - prx_pd->rx_pkt_type == PKT_TYPE_MGMT_FRAME) { - /* Check if this is mgmt packet and needs to forwarded to app as an - event */ - pmgmt_pkt_hdr = - (wlan_mgmt_pkt *) ((t_u8 *) prx_pd + prx_pd->rx_pkt_offset); - pmgmt_pkt_hdr->frm_len = wlan_le16_to_cpu(pmgmt_pkt_hdr->frm_len); - - if ((pmgmt_pkt_hdr->wlan_header.frm_ctl - & IEEE80211_FC_MGMT_FRAME_TYPE_MASK) == 0) - wlan_process_802dot11_mgmt_pkt(pmadapter->priv[pmbuf->bss_index], - (t_u8 *) & pmgmt_pkt_hdr-> - wlan_header, - pmgmt_pkt_hdr->frm_len + - sizeof(wlan_mgmt_pkt) - - sizeof(pmgmt_pkt_hdr->frm_len)); - wlan_free_mlan_buffer(pmadapter, pmbuf); - goto done; - } - - /* - * If the packet is not an unicast packet then send the packet - * directly to os. Don't pass thru rx reordering - */ - if (!IS_11N_ENABLED(priv) || - memcmp(priv->adapter, priv->curr_addr, prx_pkt->eth803_hdr.dest_addr, - MLAN_MAC_ADDR_LENGTH)) { - wlan_process_rx_packet(pmadapter, pmbuf); - goto done; - } - - if (queuing_ra_based(priv)) { - memcpy(pmadapter, ta, prx_pkt->eth803_hdr.src_addr, - MLAN_MAC_ADDR_LENGTH); - } else { - if ((rx_pkt_type != PKT_TYPE_BAR) && (prx_pd->priority < MAX_NUM_TID)) - priv->rx_seq[prx_pd->priority] = prx_pd->seq_num; - memcpy(pmadapter, ta, - priv->curr_bss_params.bss_descriptor.mac_address, - MLAN_MAC_ADDR_LENGTH); - } - - /* Reorder and send to OS */ - if ((ret = mlan_11n_rxreorder_pkt(priv, prx_pd->seq_num, - prx_pd->priority, ta, - (t_u8) prx_pd->rx_pkt_type, - (void *) pmbuf)) || - (rx_pkt_type == PKT_TYPE_BAR) - ) { - wlan_free_mlan_buffer(pmadapter, pmbuf); - } - - done: - - LEAVE(); - return (ret); + pmlan_adapter pmadapter = (pmlan_adapter) adapter; + mlan_status ret = MLAN_STATUS_SUCCESS; + RxPD *prx_pd; + RxPacketHdr_t *prx_pkt; + pmlan_private priv = pmadapter->priv[pmbuf->bss_index]; + t_u8 ta[MLAN_MAC_ADDR_LENGTH]; + t_u16 rx_pkt_type = 0; + wlan_mgmt_pkt *pmgmt_pkt_hdr = MNULL; + ENTER(); + + prx_pd = (RxPD *) (pmbuf->pbuf + pmbuf->data_offset); + /* Endian conversion */ + endian_convert_RxPD(prx_pd); + rx_pkt_type = prx_pd->rx_pkt_type; + prx_pkt = (RxPacketHdr_t *) ((t_u8 *) prx_pd + prx_pd->rx_pkt_offset); + + if ((prx_pd->rx_pkt_offset + prx_pd->rx_pkt_length) > + (t_u16) pmbuf->data_len) { + PRINTM(MERROR, + "Wrong rx packet: len=%d,rx_pkt_offset=%d," + " rx_pkt_length=%d\n", pmbuf->data_len, + prx_pd->rx_pkt_offset, prx_pd->rx_pkt_length); + pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; + ret = MLAN_STATUS_FAILURE; + wlan_free_mlan_buffer(pmadapter, pmbuf); + goto done; + } + pmbuf->data_len = prx_pd->rx_pkt_offset + prx_pd->rx_pkt_length; + + if (pmadapter->priv[pmbuf->bss_index]->mgmt_frame_passthru_mask && + prx_pd->rx_pkt_type == PKT_TYPE_MGMT_FRAME) { + /* Check if this is mgmt packet and needs to forwarded to app + as an event */ + pmgmt_pkt_hdr = + (wlan_mgmt_pkt *) ((t_u8 *) prx_pd + + prx_pd->rx_pkt_offset); + pmgmt_pkt_hdr->frm_len = + wlan_le16_to_cpu(pmgmt_pkt_hdr->frm_len); + + if ((pmgmt_pkt_hdr->wlan_header.frm_ctl + & IEEE80211_FC_MGMT_FRAME_TYPE_MASK) == 0) + wlan_process_802dot11_mgmt_pkt(pmadapter-> + priv[pmbuf->bss_index], + (t_u8 *) & + pmgmt_pkt_hdr-> + wlan_header, + pmgmt_pkt_hdr->frm_len + + sizeof(wlan_mgmt_pkt) + - + sizeof(pmgmt_pkt_hdr-> + frm_len)); + wlan_free_mlan_buffer(pmadapter, pmbuf); + goto done; + } + + /* + * If the packet is not an unicast packet then send the packet + * directly to os. Don't pass thru rx reordering + */ + if (!IS_11N_ENABLED(priv) || + memcmp(priv->adapter, priv->curr_addr, + prx_pkt->eth803_hdr.dest_addr, MLAN_MAC_ADDR_LENGTH)) { + wlan_process_rx_packet(pmadapter, pmbuf); + goto done; + } + + if (queuing_ra_based(priv)) { + memcpy(pmadapter, ta, prx_pkt->eth803_hdr.src_addr, + MLAN_MAC_ADDR_LENGTH); + } else { + if ((rx_pkt_type != PKT_TYPE_BAR) && + (prx_pd->priority < MAX_NUM_TID)) + priv->rx_seq[prx_pd->priority] = prx_pd->seq_num; + memcpy(pmadapter, ta, + priv->curr_bss_params.bss_descriptor.mac_address, + MLAN_MAC_ADDR_LENGTH); + } + + /* Reorder and send to OS */ + if ((ret = mlan_11n_rxreorder_pkt(priv, prx_pd->seq_num, + prx_pd->priority, ta, + (t_u8) prx_pd->rx_pkt_type, + (void *)pmbuf)) || + (rx_pkt_type == PKT_TYPE_BAR) + ) { + wlan_free_mlan_buffer(pmadapter, pmbuf); + } + +done: + + LEAVE(); + return (ret); } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_sta_tx.c b/drivers/net/wireless/sd8897/mlan/mlan_sta_tx.c index 6191e4edeefc..64ecddc949e3 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_sta_tx.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_sta_tx.c @@ -2,8 +2,8 @@ * * @brief This file contains the handling of data packet * transmission in MLAN module. - * - * Copyright (C) 2008-2011, Marvell International Ltd. + * + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -47,9 +47,9 @@ Change log: /******************************************************** Global functions ********************************************************/ -/** - * @brief This function fill the txpd for tx packet - * +/** + * @brief This function fill the txpd for tx packet + * * @param priv A pointer to mlan_private structure * @param pmbuf A pointer to the mlan_buffer for process * @@ -58,98 +58,105 @@ Change log: t_void * wlan_ops_sta_process_txpd(IN t_void * priv, IN pmlan_buffer pmbuf) { - mlan_private *pmpriv = (mlan_private *) priv; - pmlan_adapter pmadapter = pmpriv->adapter; - TxPD *plocal_tx_pd; - t_u8 *head_ptr = MNULL; - t_u32 pkt_type; - t_u32 tx_control; - - ENTER(); - - if (!pmbuf->data_len) { - PRINTM(MERROR, "STA Tx Error: Invalid packet length: %d\n", - pmbuf->data_len); - pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; - goto done; - } - if (pmbuf->buf_type == MLAN_BUF_TYPE_RAW_DATA) { - memcpy(pmpriv->adapter, &pkt_type, pmbuf->pbuf + pmbuf->data_offset, - sizeof(pkt_type)); - memcpy(pmpriv->adapter, &tx_control, - pmbuf->pbuf + pmbuf->data_offset + sizeof(pkt_type), - sizeof(tx_control)); - pmbuf->data_offset += sizeof(pkt_type) + sizeof(tx_control); - pmbuf->data_len -= sizeof(pkt_type) + sizeof(tx_control); - } - - if (pmbuf->data_offset < (sizeof(TxPD) + INTF_HEADER_LEN + DMA_ALIGNMENT)) { - PRINTM(MERROR, "not enough space for TxPD: %d\n", pmbuf->data_len); - pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; - goto done; - } - - /* head_ptr should be aligned */ - head_ptr = - pmbuf->pbuf + pmbuf->data_offset - sizeof(TxPD) - INTF_HEADER_LEN; - head_ptr = (t_u8 *) ((t_ptr) head_ptr & ~((t_ptr) (DMA_ALIGNMENT - 1))); - - plocal_tx_pd = (TxPD *) (head_ptr + INTF_HEADER_LEN); - memset(pmadapter, plocal_tx_pd, 0, sizeof(TxPD)); - /* Set the BSS number to TxPD */ - plocal_tx_pd->bss_num = GET_BSS_NUM(pmpriv); - plocal_tx_pd->bss_type = pmpriv->bss_type; - - plocal_tx_pd->tx_pkt_length = (t_u16) pmbuf->data_len; - - plocal_tx_pd->priority = (t_u8) pmbuf->priority; - plocal_tx_pd->pkt_delay_2ms = - wlan_wmm_compute_driver_packet_delay(pmpriv, pmbuf); - - if (plocal_tx_pd->priority < NELEMENTS(pmpriv->wmm.user_pri_pkt_tx_ctrl)) - /* - * Set the priority specific tx_control field, setting of 0 will - * cause the default value to be used later in this function - */ - plocal_tx_pd->tx_control - = pmpriv->wmm.user_pri_pkt_tx_ctrl[plocal_tx_pd->priority]; - if (pmadapter->pps_uapsd_mode) { - if (MTRUE == wlan_check_last_packet_indication(pmpriv)) { - pmadapter->tx_lock_flag = MTRUE; - plocal_tx_pd->flags = MRVDRV_TxPD_POWER_MGMT_LAST_PACKET; - } - } - - /* Offset of actual data */ - plocal_tx_pd->tx_pkt_offset = - (t_u16) ((t_ptr) pmbuf->pbuf + pmbuf->data_offset - - (t_ptr) plocal_tx_pd); - - if (!plocal_tx_pd->tx_control) { - /* TxCtrl set by user or default */ - plocal_tx_pd->tx_control = pmpriv->pkt_tx_ctrl; - } - - if (pmbuf->buf_type == MLAN_BUF_TYPE_RAW_DATA) { - plocal_tx_pd->tx_pkt_type = (t_u16) pkt_type; - plocal_tx_pd->tx_control = tx_control; - } - - endian_convert_TxPD(plocal_tx_pd); - - /* Adjust the data offset and length to include TxPD in pmbuf */ - pmbuf->data_len += pmbuf->data_offset; - pmbuf->data_offset = (t_u32) (head_ptr - pmbuf->pbuf); - pmbuf->data_len -= pmbuf->data_offset; - - done: - LEAVE(); - return head_ptr; + mlan_private *pmpriv = (mlan_private *) priv; + pmlan_adapter pmadapter = pmpriv->adapter; + TxPD *plocal_tx_pd; + t_u8 *head_ptr = MNULL; + t_u32 pkt_type; + t_u32 tx_control; + + ENTER(); + + if (!pmbuf->data_len) { + PRINTM(MERROR, "STA Tx Error: Invalid packet length: %d\n", + pmbuf->data_len); + pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; + goto done; + } + if (pmbuf->buf_type == MLAN_BUF_TYPE_RAW_DATA) { + memcpy(pmpriv->adapter, &pkt_type, + pmbuf->pbuf + pmbuf->data_offset, sizeof(pkt_type)); + memcpy(pmpriv->adapter, &tx_control, + pmbuf->pbuf + pmbuf->data_offset + sizeof(pkt_type), + sizeof(tx_control)); + pmbuf->data_offset += sizeof(pkt_type) + sizeof(tx_control); + pmbuf->data_len -= sizeof(pkt_type) + sizeof(tx_control); + } + + if (pmbuf->data_offset < (sizeof(TxPD) + INTF_HEADER_LEN + + DMA_ALIGNMENT)) { + PRINTM(MERROR, "not enough space for TxPD: %d\n", + pmbuf->data_len); + pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; + goto done; + } + + /* head_ptr should be aligned */ + head_ptr = + pmbuf->pbuf + pmbuf->data_offset - sizeof(TxPD) - + INTF_HEADER_LEN; + head_ptr = (t_u8 *) ((t_ptr) head_ptr & ~((t_ptr) (DMA_ALIGNMENT - 1))); + + plocal_tx_pd = (TxPD *) (head_ptr + INTF_HEADER_LEN); + memset(pmadapter, plocal_tx_pd, 0, sizeof(TxPD)); + /* Set the BSS number to TxPD */ + plocal_tx_pd->bss_num = GET_BSS_NUM(pmpriv); + plocal_tx_pd->bss_type = pmpriv->bss_type; + + plocal_tx_pd->tx_pkt_length = (t_u16) pmbuf->data_len; + + plocal_tx_pd->priority = (t_u8) pmbuf->priority; + plocal_tx_pd->pkt_delay_2ms = + wlan_wmm_compute_driver_packet_delay(pmpriv, pmbuf); + + if (plocal_tx_pd->priority < + NELEMENTS(pmpriv->wmm.user_pri_pkt_tx_ctrl)) + /* + * Set the priority specific tx_control field, setting of 0 will + * cause the default value to be used later in this function + */ + plocal_tx_pd->tx_control + = + pmpriv->wmm.user_pri_pkt_tx_ctrl[plocal_tx_pd-> + priority]; + if (pmadapter->pps_uapsd_mode) { + if (MTRUE == wlan_check_last_packet_indication(pmpriv)) { + pmadapter->tx_lock_flag = MTRUE; + plocal_tx_pd->flags = + MRVDRV_TxPD_POWER_MGMT_LAST_PACKET; + } + } + + /* Offset of actual data */ + plocal_tx_pd->tx_pkt_offset = + (t_u16) ((t_ptr) pmbuf->pbuf + pmbuf->data_offset - + (t_ptr) plocal_tx_pd); + + if (!plocal_tx_pd->tx_control) { + /* TxCtrl set by user or default */ + plocal_tx_pd->tx_control = pmpriv->pkt_tx_ctrl; + } + + if (pmbuf->buf_type == MLAN_BUF_TYPE_RAW_DATA) { + plocal_tx_pd->tx_pkt_type = (t_u16) pkt_type; + plocal_tx_pd->tx_control = tx_control; + } + + endian_convert_TxPD(plocal_tx_pd); + + /* Adjust the data offset and length to include TxPD in pmbuf */ + pmbuf->data_len += pmbuf->data_offset; + pmbuf->data_offset = (t_u32) (head_ptr - pmbuf->pbuf); + pmbuf->data_len -= pmbuf->data_offset; + +done: + LEAVE(); + return head_ptr; } -/** +/** * @brief This function tells firmware to send a NULL data packet. - * + * * @param priv A pointer to mlan_private structure * @param flags Transmit Pkt Flags * @@ -158,95 +165,96 @@ wlan_ops_sta_process_txpd(IN t_void * priv, IN pmlan_buffer pmbuf) mlan_status wlan_send_null_packet(pmlan_private priv, t_u8 flags) { - pmlan_adapter pmadapter = priv->adapter; - TxPD *ptx_pd; + pmlan_adapter pmadapter = priv->adapter; + TxPD *ptx_pd; /* sizeof(TxPD) + Interface specific header */ #define NULL_PACKET_HDR 256 - t_u32 data_len = NULL_PACKET_HDR; - pmlan_buffer pmbuf = MNULL; - t_u8 *ptr; - mlan_status ret = MLAN_STATUS_SUCCESS; + t_u32 data_len = NULL_PACKET_HDR; + pmlan_buffer pmbuf = MNULL; + t_u8 *ptr; + mlan_status ret = MLAN_STATUS_SUCCESS; #ifdef DEBUG_LEVEL1 - t_u32 sec, usec; + t_u32 sec, usec; #endif - ENTER(); - - if (pmadapter->surprise_removed == MTRUE) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - if (priv->media_connected == MFALSE) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - if (pmadapter->data_sent == MTRUE) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - - pmbuf = wlan_alloc_mlan_buffer(pmadapter, data_len, 0, MOAL_MALLOC_BUFFER); - if (!pmbuf) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - memset(pmadapter, pmbuf->pbuf, 0, data_len); - pmbuf->bss_index = priv->bss_index; - pmbuf->buf_type = MLAN_BUF_TYPE_DATA; - ptr = pmbuf->pbuf + pmbuf->data_offset; - pmbuf->data_len = sizeof(TxPD) + INTF_HEADER_LEN; - ptx_pd = (TxPD *) (ptr + INTF_HEADER_LEN); - ptx_pd->tx_control = priv->pkt_tx_ctrl; - ptx_pd->flags = flags; - ptx_pd->priority = WMM_HIGHEST_PRIORITY; - ptx_pd->tx_pkt_offset = sizeof(TxPD); - /* Set the BSS number to TxPD */ - ptx_pd->bss_num = GET_BSS_NUM(priv); - ptx_pd->bss_type = priv->bss_type; - - endian_convert_TxPD(ptx_pd); - - ret = wlan_sdio_host_to_card(pmadapter, MLAN_TYPE_DATA, pmbuf, MNULL); - - switch (ret) { - case MLAN_STATUS_RESOURCE: - wlan_free_mlan_buffer(pmadapter, pmbuf); - PRINTM(MERROR, "STA Tx Error: Failed to send NULL packet!\n"); - pmadapter->dbg.num_tx_host_to_card_failure++; - goto done; - case MLAN_STATUS_FAILURE: - pmadapter->data_sent = MFALSE; - wlan_free_mlan_buffer(pmadapter, pmbuf); - PRINTM(MERROR, "STA Tx Error: Failed to send NULL packet!\n"); - pmadapter->dbg.num_tx_host_to_card_failure++; - goto done; - case MLAN_STATUS_SUCCESS: - wlan_free_mlan_buffer(pmadapter, pmbuf); - PRINTM(MINFO, "STA Tx: Successfully send the NULL packet\n"); - pmadapter->tx_lock_flag = MTRUE; - break; - case MLAN_STATUS_PENDING: - pmadapter->data_sent = MFALSE; - pmadapter->tx_lock_flag = MTRUE; - break; - default: - break; - } - - PRINTM_GET_SYS_TIME(MDATA, &sec, &usec); - PRINTM_NETINTF(MDATA, priv); - PRINTM(MDATA, "%lu.%06lu : Null data => FW\n", sec, usec); - DBG_HEXDUMP(MDAT_D, "Null data", ptr, sizeof(TxPD) + INTF_HEADER_LEN); - done: - LEAVE(); - return ret; + ENTER(); + + if (pmadapter->surprise_removed == MTRUE) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + if (priv->media_connected == MFALSE) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + if (pmadapter->data_sent == MTRUE) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + + pmbuf = wlan_alloc_mlan_buffer(pmadapter, data_len, 0, + MOAL_MALLOC_BUFFER); + if (!pmbuf) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + memset(pmadapter, pmbuf->pbuf, 0, data_len); + pmbuf->bss_index = priv->bss_index; + pmbuf->buf_type = MLAN_BUF_TYPE_DATA; + ptr = pmbuf->pbuf + pmbuf->data_offset; + pmbuf->data_len = sizeof(TxPD) + INTF_HEADER_LEN; + ptx_pd = (TxPD *) (ptr + INTF_HEADER_LEN); + ptx_pd->tx_control = priv->pkt_tx_ctrl; + ptx_pd->flags = flags; + ptx_pd->priority = WMM_HIGHEST_PRIORITY; + ptx_pd->tx_pkt_offset = sizeof(TxPD); + /* Set the BSS number to TxPD */ + ptx_pd->bss_num = GET_BSS_NUM(priv); + ptx_pd->bss_type = priv->bss_type; + + endian_convert_TxPD(ptx_pd); + + ret = wlan_sdio_host_to_card(pmadapter, MLAN_TYPE_DATA, pmbuf, MNULL); + + switch (ret) { + case MLAN_STATUS_RESOURCE: + wlan_free_mlan_buffer(pmadapter, pmbuf); + PRINTM(MERROR, "STA Tx Error: Failed to send NULL packet!\n"); + pmadapter->dbg.num_tx_host_to_card_failure++; + goto done; + case MLAN_STATUS_FAILURE: + pmadapter->data_sent = MFALSE; + wlan_free_mlan_buffer(pmadapter, pmbuf); + PRINTM(MERROR, "STA Tx Error: Failed to send NULL packet!\n"); + pmadapter->dbg.num_tx_host_to_card_failure++; + goto done; + case MLAN_STATUS_SUCCESS: + wlan_free_mlan_buffer(pmadapter, pmbuf); + PRINTM(MINFO, "STA Tx: Successfully send the NULL packet\n"); + pmadapter->tx_lock_flag = MTRUE; + break; + case MLAN_STATUS_PENDING: + pmadapter->data_sent = MFALSE; + pmadapter->tx_lock_flag = MTRUE; + break; + default: + break; + } + + PRINTM_GET_SYS_TIME(MDATA, &sec, &usec); + PRINTM_NETINTF(MDATA, priv); + PRINTM(MDATA, "%lu.%06lu : Null data => FW\n", sec, usec); + DBG_HEXDUMP(MDAT_D, "Null data", ptr, sizeof(TxPD) + INTF_HEADER_LEN); +done: + LEAVE(); + return ret; } -/** +/** * @brief This function checks if we need to send last packet indication. - * + * * @param priv A pointer to mlan_private structure * * @return MTRUE or MFALSE @@ -254,30 +262,31 @@ wlan_send_null_packet(pmlan_private priv, t_u8 flags) t_u8 wlan_check_last_packet_indication(pmlan_private priv) { - pmlan_adapter pmadapter = priv->adapter; - t_u8 ret = MFALSE; - t_u8 prop_ps = MTRUE; - - ENTER(); - - if (!pmadapter->sleep_period.period) { - LEAVE(); - return ret; - } - if (wlan_bypass_tx_list_empty(pmadapter) && wlan_wmm_lists_empty(pmadapter)) { - if (((priv->curr_bss_params.wmm_uapsd_enabled == MTRUE) && - priv->wmm_qosinfo) || prop_ps) - - ret = MTRUE; - } - if (ret && !pmadapter->cmd_sent && !pmadapter->curr_cmd - && !IS_COMMAND_PENDING(pmadapter)) { - pmadapter->delay_null_pkt = MFALSE; - ret = MTRUE; - } else { - ret = MFALSE; - pmadapter->delay_null_pkt = MTRUE; - } - LEAVE(); - return ret; + pmlan_adapter pmadapter = priv->adapter; + t_u8 ret = MFALSE; + t_u8 prop_ps = MTRUE; + + ENTER(); + + if (!pmadapter->sleep_period.period) { + LEAVE(); + return ret; + } + if (wlan_bypass_tx_list_empty(pmadapter) && + wlan_wmm_lists_empty(pmadapter)) { + if (((priv->curr_bss_params.wmm_uapsd_enabled == MTRUE) && + priv->wmm_qosinfo) || prop_ps) + + ret = MTRUE; + } + if (ret && !pmadapter->cmd_sent && !pmadapter->curr_cmd + && !IS_COMMAND_PENDING(pmadapter)) { + pmadapter->delay_null_pkt = MFALSE; + ret = MTRUE; + } else { + ret = MFALSE; + pmadapter->delay_null_pkt = MTRUE; + } + LEAVE(); + return ret; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_txrx.c b/drivers/net/wireless/sd8897/mlan/mlan_txrx.c index 57c8ef23d43e..291f97eec781 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_txrx.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_txrx.c @@ -3,7 +3,7 @@ * * @brief This file contains the handling of TX/RX in MLAN * - * Copyright (C) 2009-2011, Marvell International Ltd. + * Copyright (C) 2009-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -12,7 +12,7 @@ * is available by writing to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * + * * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE * ARE EXPRESSLY DISCLAIMED. The License provides additional details about @@ -51,7 +51,7 @@ Change Log: ********************************************************/ /** * @brief This function processes the received buffer - * + * * @param pmadapter A pointer to mlan_adapter * @param pmbuf A pointer to the received buffer * @@ -60,35 +60,34 @@ Change Log: mlan_status wlan_handle_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private priv = MNULL; - RxPD *prx_pd; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private priv = MNULL; + RxPD *prx_pd; #ifdef DEBUG_LEVEL1 - t_u32 sec = 0, usec = 0; + t_u32 sec = 0, usec = 0; #endif - ENTER(); + ENTER(); - prx_pd = (RxPD *) (pmbuf->pbuf + pmbuf->data_offset); - /* Get the BSS number from RxPD, get corresponding priv */ - priv = - wlan_get_priv_by_id(pmadapter, prx_pd->bss_num & BSS_NUM_MASK, - prx_pd->bss_type); - if (!priv) - priv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); - pmbuf->bss_index = priv->bss_index; - PRINTM_GET_SYS_TIME(MDATA, &sec, &usec); - PRINTM_NETINTF(MDATA, priv); - PRINTM(MDATA, "%lu.%06lu : Data <= FW\n", sec, usec); - ret = priv->ops.process_rx_packet(pmadapter, pmbuf); + prx_pd = (RxPD *) (pmbuf->pbuf + pmbuf->data_offset); + /* Get the BSS number from RxPD, get corresponding priv */ + priv = wlan_get_priv_by_id(pmadapter, prx_pd->bss_num & BSS_NUM_MASK, + prx_pd->bss_type); + if (!priv) + priv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); + pmbuf->bss_index = priv->bss_index; + PRINTM_GET_SYS_TIME(MDATA, &sec, &usec); + PRINTM_NETINTF(MDATA, priv); + PRINTM(MDATA, "%lu.%06lu : Data <= FW\n", sec, usec); + ret = priv->ops.process_rx_packet(pmadapter, pmbuf); - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** - * @brief This function checks the conditions and sends packet to device - * +/** + * @brief This function checks the conditions and sends packet to device + * * @param priv A pointer to mlan_private structure * @param pmbuf A pointer to the mlan_buffer for process * @param tx_param A pointer to mlan_tx_param structure @@ -97,71 +96,75 @@ wlan_handle_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) */ mlan_status wlan_process_tx(pmlan_private priv, pmlan_buffer pmbuf, - mlan_tx_param * tx_param) + mlan_tx_param * tx_param) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_adapter pmadapter = priv->adapter; - t_u8 *head_ptr = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_adapter pmadapter = priv->adapter; + t_u8 *head_ptr = MNULL; #ifdef DEBUG_LEVEL1 - t_u32 sec = 0, usec = 0; + t_u32 sec = 0, usec = 0; #endif #ifdef STA_SUPPORT - TxPD *plocal_tx_pd = MNULL; + TxPD *plocal_tx_pd = MNULL; #endif - ENTER(); - head_ptr = (t_u8 *) priv->ops.process_txpd(priv, pmbuf); - if (!head_ptr) { - pmbuf->status_code = MLAN_ERROR_PKT_INVALID; - ret = MLAN_STATUS_FAILURE; - goto done; - } + ENTER(); + head_ptr = (t_u8 *) priv->ops.process_txpd(priv, pmbuf); + if (!head_ptr) { + pmbuf->status_code = MLAN_ERROR_PKT_INVALID; + ret = MLAN_STATUS_FAILURE; + goto done; + } #ifdef STA_SUPPORT - if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) - plocal_tx_pd = (TxPD *) (head_ptr + INTF_HEADER_LEN); + if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) + plocal_tx_pd = (TxPD *) (head_ptr + INTF_HEADER_LEN); #endif - ret = wlan_sdio_host_to_card(pmadapter, MLAN_TYPE_DATA, pmbuf, tx_param); - done: - switch (ret) { - case MLAN_STATUS_RESOURCE: + ret = wlan_sdio_host_to_card(pmadapter, MLAN_TYPE_DATA, pmbuf, + tx_param); +done: + switch (ret) { + case MLAN_STATUS_RESOURCE: #ifdef STA_SUPPORT - if ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) && - pmadapter->pps_uapsd_mode && (pmadapter->tx_lock_flag == MTRUE)) { - pmadapter->tx_lock_flag = MFALSE; - plocal_tx_pd->flags = 0; - } + if ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) && + pmadapter->pps_uapsd_mode && + (pmadapter->tx_lock_flag == MTRUE)) { + pmadapter->tx_lock_flag = MFALSE; + plocal_tx_pd->flags = 0; + } #endif - PRINTM(MINFO, "MLAN_STATUS_RESOURCE is returned\n"); - break; - case MLAN_STATUS_FAILURE: - pmadapter->data_sent = MFALSE; - PRINTM(MERROR, "Error: host_to_card failed: 0x%X\n", ret); - pmadapter->dbg.num_tx_host_to_card_failure++; - pmbuf->status_code = MLAN_ERROR_DATA_TX_FAIL; - wlan_write_data_complete(pmadapter, pmbuf, ret); - break; - case MLAN_STATUS_PENDING: + PRINTM(MINFO, "MLAN_STATUS_RESOURCE is returned\n"); + break; + case MLAN_STATUS_FAILURE: + pmadapter->data_sent = MFALSE; + PRINTM(MERROR, "Error: host_to_card failed: 0x%X\n", ret); + pmadapter->dbg.num_tx_host_to_card_failure++; + pmbuf->status_code = MLAN_ERROR_DATA_TX_FAIL; + wlan_write_data_complete(pmadapter, pmbuf, ret); + break; + case MLAN_STATUS_PENDING: - pmadapter->data_sent = MFALSE; - DBG_HEXDUMP(MDAT_D, "Tx", head_ptr + INTF_HEADER_LEN, - MIN(pmbuf->data_len + sizeof(TxPD), MAX_DATA_DUMP_LEN)); - break; - case MLAN_STATUS_SUCCESS: - DBG_HEXDUMP(MDAT_D, "Tx", head_ptr + INTF_HEADER_LEN, - MIN(pmbuf->data_len + sizeof(TxPD), MAX_DATA_DUMP_LEN)); - wlan_write_data_complete(pmadapter, pmbuf, ret); - break; - default: - break; - } + pmadapter->data_sent = MFALSE; + DBG_HEXDUMP(MDAT_D, "Tx", head_ptr + INTF_HEADER_LEN, + MIN(pmbuf->data_len + sizeof(TxPD), + MAX_DATA_DUMP_LEN)); + break; + case MLAN_STATUS_SUCCESS: + DBG_HEXDUMP(MDAT_D, "Tx", head_ptr + INTF_HEADER_LEN, + MIN(pmbuf->data_len + sizeof(TxPD), + MAX_DATA_DUMP_LEN)); + wlan_write_data_complete(pmadapter, pmbuf, ret); + break; + default: + break; + } - if ((ret == MLAN_STATUS_SUCCESS) || (ret == MLAN_STATUS_PENDING)) { - PRINTM_GET_SYS_TIME(MDATA, &sec, &usec); - PRINTM_NETINTF(MDATA, priv); - PRINTM(MDATA, "%lu.%06lu : Data => FW\n", sec, usec); - } - LEAVE(); - return ret; + if ((ret == MLAN_STATUS_SUCCESS) || (ret == MLAN_STATUS_PENDING)) { + PRINTM_GET_SYS_TIME(MDATA, &sec, &usec); + PRINTM_NETINTF(MDATA, priv); + PRINTM(MDATA, "%lu.%06lu : Data => FW\n", sec, usec); + } + LEAVE(); + return ret; } /** @@ -175,31 +178,31 @@ wlan_process_tx(pmlan_private priv, pmlan_buffer pmbuf, */ mlan_status wlan_write_data_complete(IN pmlan_adapter pmadapter, - IN pmlan_buffer pmbuf, IN mlan_status status) + IN pmlan_buffer pmbuf, IN mlan_status status) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_callbacks pcb; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_callbacks pcb; - ENTER(); + ENTER(); - MASSERT(pmadapter && pmbuf); + MASSERT(pmadapter && pmbuf); - pcb = &pmadapter->callbacks; - if ((pmbuf->buf_type == MLAN_BUF_TYPE_DATA) || - (pmbuf->buf_type == MLAN_BUF_TYPE_RAW_DATA)) { - PRINTM(MINFO, "wlan_write_data_complete: DATA %p\n", pmbuf); - if (pmbuf->flags & MLAN_BUF_FLAG_MOAL_TX_BUF) { - /* pmbuf was allocated by MOAL */ - pcb->moal_send_packet_complete(pmadapter->pmoal_handle, - pmbuf, status); - } else { - /* pmbuf was allocated by MLAN */ - wlan_free_mlan_buffer(pmadapter, pmbuf); - } - } + pcb = &pmadapter->callbacks; + if ((pmbuf->buf_type == MLAN_BUF_TYPE_DATA) || + (pmbuf->buf_type == MLAN_BUF_TYPE_RAW_DATA)) { + PRINTM(MINFO, "wlan_write_data_complete: DATA %p\n", pmbuf); + if (pmbuf->flags & MLAN_BUF_FLAG_MOAL_TX_BUF) { + /* pmbuf was allocated by MOAL */ + pcb->moal_send_packet_complete(pmadapter->pmoal_handle, + pmbuf, status); + } else { + /* pmbuf was allocated by MLAN */ + wlan_free_mlan_buffer(pmadapter, pmbuf); + } + } - LEAVE(); - return ret; + LEAVE(); + return ret; } /** @@ -213,42 +216,44 @@ wlan_write_data_complete(IN pmlan_adapter pmadapter, */ mlan_status wlan_recv_packet_complete(IN pmlan_adapter pmadapter, - IN pmlan_buffer pmbuf, IN mlan_status status) + IN pmlan_buffer pmbuf, IN mlan_status status) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmp; - pmlan_callbacks pcb; - pmlan_buffer pmbuf_parent; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmp; + pmlan_callbacks pcb; + pmlan_buffer pmbuf_parent; - ENTER(); + ENTER(); - MASSERT(pmadapter && pmbuf); - pcb = &pmadapter->callbacks; - MASSERT(pmbuf->bss_index < pmadapter->priv_num); + MASSERT(pmadapter && pmbuf); + pcb = &pmadapter->callbacks; + MASSERT(pmbuf->bss_index < pmadapter->priv_num); - pmp = pmadapter->priv[pmbuf->bss_index]; + pmp = pmadapter->priv[pmbuf->bss_index]; - if (pmbuf->pparent) { - pmbuf_parent = pmbuf->pparent; + if (pmbuf->pparent) { + pmbuf_parent = pmbuf->pparent; - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - pmp->rx_pkt_lock); - --pmbuf_parent->use_count; - if (!pmbuf_parent->use_count) { - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - pmp->rx_pkt_lock); - wlan_free_mlan_buffer(pmadapter, pmbuf_parent); - } else { - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - pmp->rx_pkt_lock); - } - wlan_free_mlan_buffer(pmadapter, pmbuf); - } else { - wlan_free_mlan_buffer(pmadapter, pmbuf); - } + pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, + pmp->rx_pkt_lock); + --pmbuf_parent->use_count; + if (!pmbuf_parent->use_count) { + pmadapter->callbacks.moal_spin_unlock(pmadapter-> + pmoal_handle, + pmp->rx_pkt_lock); + wlan_free_mlan_buffer(pmadapter, pmbuf_parent); + } else { + pmadapter->callbacks.moal_spin_unlock(pmadapter-> + pmoal_handle, + pmp->rx_pkt_lock); + } + wlan_free_mlan_buffer(pmadapter, pmbuf); + } else { + wlan_free_mlan_buffer(pmadapter, pmbuf); + } - LEAVE(); - return ret; + LEAVE(); + return ret; } /** @@ -262,20 +267,20 @@ wlan_recv_packet_complete(IN pmlan_adapter pmadapter, t_void wlan_add_buf_bypass_txqueue(mlan_adapter * pmadapter, pmlan_buffer pmbuf) { - pmlan_private priv = pmadapter->priv[pmbuf->bss_index]; - ENTER(); + pmlan_private priv = pmadapter->priv[pmbuf->bss_index]; + ENTER(); - if (pmbuf->buf_type != MLAN_BUF_TYPE_RAW_DATA) { - pmbuf->buf_type = MLAN_BUF_TYPE_DATA; - } - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - pmadapter->bypass_pkt_count++; - util_enqueue_list_tail(pmadapter->pmoal_handle, &priv->bypass_txq, - (pmlan_linked_list) pmbuf, MNULL, MNULL); - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - LEAVE(); + if (pmbuf->buf_type != MLAN_BUF_TYPE_RAW_DATA) { + pmbuf->buf_type = MLAN_BUF_TYPE_DATA; + } + pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + pmadapter->bypass_pkt_count++; + util_enqueue_list_tail(pmadapter->pmoal_handle, &priv->bypass_txq, + (pmlan_linked_list) pmbuf, MNULL, MNULL); + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + LEAVE(); } /** @@ -288,7 +293,7 @@ wlan_add_buf_bypass_txqueue(mlan_adapter * pmadapter, pmlan_buffer pmbuf) INLINE t_u8 wlan_bypass_tx_list_empty(mlan_adapter * pmadapter) { - return ((pmadapter->bypass_pkt_count) ? MFALSE : MTRUE); + return ((pmadapter->bypass_pkt_count) ? MFALSE : MTRUE); } /** @@ -301,22 +306,23 @@ wlan_bypass_tx_list_empty(mlan_adapter * pmadapter) t_void wlan_cleanup_bypass_txq(mlan_private * priv) { - pmlan_buffer pmbuf; - mlan_adapter *pmadapter = priv->adapter; - ENTER(); - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - while ((pmbuf = - (pmlan_buffer) util_peek_list(pmadapter->pmoal_handle, - &priv->bypass_txq, MNULL, MNULL))) { - util_unlink_list(pmadapter->pmoal_handle, &priv->bypass_txq, - (pmlan_linked_list) pmbuf, MNULL, MNULL); - wlan_write_data_complete(pmadapter, pmbuf, MLAN_STATUS_FAILURE); - pmadapter->bypass_pkt_count--; - } - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - LEAVE(); + pmlan_buffer pmbuf; + mlan_adapter *pmadapter = priv->adapter; + ENTER(); + pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + while ((pmbuf = + (pmlan_buffer) util_peek_list(pmadapter->pmoal_handle, + &priv->bypass_txq, MNULL, + MNULL))) { + util_unlink_list(pmadapter->pmoal_handle, &priv->bypass_txq, + (pmlan_linked_list) pmbuf, MNULL, MNULL); + wlan_write_data_complete(pmadapter, pmbuf, MLAN_STATUS_FAILURE); + pmadapter->bypass_pkt_count--; + } + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + LEAVE(); } /** @@ -329,51 +335,66 @@ wlan_cleanup_bypass_txq(mlan_private * priv) t_void wlan_process_bypass_tx(pmlan_adapter pmadapter) { - pmlan_buffer pmbuf; - mlan_tx_param tx_param; - mlan_status status = MLAN_STATUS_SUCCESS; - pmlan_private priv; - int j = 0; - ENTER(); - for (j = 0; j < pmadapter->priv_num; ++j) { - if ((priv = pmadapter->priv[j])) { - if ((pmbuf = - (pmlan_buffer) util_dequeue_list(pmadapter->pmoal_handle, - &priv->bypass_txq, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock))) { - PRINTM(MINFO, "Dequeuing bypassed packet %p\n", pmbuf); - /* XXX: nex_pkt_len ??? */ - tx_param.next_pkt_len = 0; - status = - wlan_process_tx(pmadapter->priv[pmbuf->bss_index], pmbuf, - &tx_param); + pmlan_buffer pmbuf; + mlan_tx_param tx_param; + mlan_status status = MLAN_STATUS_SUCCESS; + pmlan_private priv; + int j = 0; + ENTER(); + for (j = 0; j < pmadapter->priv_num; ++j) { + if ((priv = pmadapter->priv[j])) { + if ((pmbuf = + (pmlan_buffer) util_dequeue_list(pmadapter-> + pmoal_handle, + &priv->bypass_txq, + pmadapter-> + callbacks. + moal_spin_lock, + pmadapter-> + callbacks. + moal_spin_unlock))) + { + PRINTM(MINFO, "Dequeuing bypassed packet %p\n", + pmbuf); + /* XXX: nex_pkt_len ??? */ + tx_param.next_pkt_len = 0; + status = wlan_process_tx(pmadapter-> + priv[pmbuf->bss_index], + pmbuf, &tx_param); - if (status == MLAN_STATUS_RESOURCE) { - /* Queue the packet again so that it will be TX'ed later */ - util_enqueue_list_head(pmadapter->pmoal_handle, - &priv->bypass_txq, - (pmlan_linked_list) pmbuf, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock); - } else { - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm. - ra_list_spinlock); - pmadapter->bypass_pkt_count--; - pmadapter->callbacks.moal_spin_unlock(pmadapter-> - pmoal_handle, - priv->wmm. - ra_list_spinlock); - } - break; - } else { - PRINTM(MINFO, "Nothing to send\n"); - } - } - } - LEAVE(); + if (status == MLAN_STATUS_RESOURCE) { + /* Queue the packet again so that it + will be TX'ed later */ + util_enqueue_list_head(pmadapter-> + pmoal_handle, + &priv-> + bypass_txq, + (pmlan_linked_list) + pmbuf, + pmadapter-> + callbacks. + moal_spin_lock, + pmadapter-> + callbacks. + moal_spin_unlock); + } else { + pmadapter->callbacks. + moal_spin_lock(pmadapter-> + pmoal_handle, + priv->wmm. + ra_list_spinlock); + pmadapter->bypass_pkt_count--; + pmadapter->callbacks. + moal_spin_unlock(pmadapter-> + pmoal_handle, + priv->wmm. + ra_list_spinlock); + } + break; + } else { + PRINTM(MINFO, "Nothing to send\n"); + } + } + } + LEAVE(); } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_uap.h b/drivers/net/wireless/sd8897/mlan/mlan_uap.h index c2d2800f1a2d..ac27cfb56e1d 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_uap.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_uap.h @@ -3,19 +3,19 @@ * @brief This file contains related macros, enum, and struct * of uap functionalities * - * Copyright (C) 2009-2011, Marvell International Ltd. + * Copyright (C) 2009-2011, Marvell International Ltd. * - * This software file (the "File") is distributed by Marvell International - * Ltd. under the terms of the GNU General Public License Version 2, June 1991 - * (the "License"). You may use, redistribute and/or modify this File in - * accordance with the terms and conditions of the License, a copy of which + * This software file (the "File") is distributed by Marvell International + * Ltd. under the terms of the GNU General Public License Version 2, June 1991 + * (the "License"). You may use, redistribute and/or modify this File in + * accordance with the terms and conditions of the License, a copy of which * is available by writing to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. * - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about + * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE + * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE + * ARE EXPRESSLY DISCLAIMED. The License provides additional details about * this warranty disclaimer. */ @@ -73,27 +73,27 @@ Change log: mlan_status wlan_uap_get_channel(IN pmlan_private pmpriv); mlan_status wlan_uap_set_channel(IN pmlan_private pmpriv, - IN t_u8 uap_band_cfg, IN t_u8 channel); + IN t_u8 uap_band_cfg, IN t_u8 channel); mlan_status wlan_uap_get_beacon_dtim(IN pmlan_private pmpriv); mlan_status wlan_ops_uap_ioctl(t_void * adapter, pmlan_ioctl_req pioctl_req); mlan_status wlan_ops_uap_prepare_cmd(IN t_void * priv, - IN t_u16 cmd_no, - IN t_u16 cmd_action, - IN t_u32 cmd_oid, - IN t_void * pioctl_buf, - IN t_void * pdata_buf, - IN t_void * pcmd_buf); + IN t_u16 cmd_no, + IN t_u16 cmd_action, + IN t_u32 cmd_oid, + IN t_void * pioctl_buf, + IN t_void * pdata_buf, + IN t_void * pcmd_buf); mlan_status wlan_ops_uap_process_cmdresp(IN t_void * priv, - IN t_u16 cmdresp_no, - IN t_void * pcmd_buf, - IN t_void * pioctl); + IN t_u16 cmdresp_no, + IN t_void * pcmd_buf, + IN t_void * pioctl); mlan_status wlan_ops_uap_process_rx_packet(IN t_void * adapter, - IN pmlan_buffer pmbuf); + IN pmlan_buffer pmbuf); mlan_status wlan_ops_uap_process_event(IN t_void * priv); diff --git a/drivers/net/wireless/sd8897/mlan/mlan_uap_cmdevent.c b/drivers/net/wireless/sd8897/mlan/mlan_uap_cmdevent.c index 83ff22130493..800a8483433c 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_uap_cmdevent.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_uap_cmdevent.c @@ -1,20 +1,20 @@ /** @file mlan_uap_cmdevent.c * * @brief This file contains the handling of AP mode command and event - * - * Copyright (C) 2009-2011, Marvell International Ltd. - * - * This software file (the "File") is distributed by Marvell International - * Ltd. under the terms of the GNU General Public License Version 2, June 1991 - * (the "License"). You may use, redistribute and/or modify this File in - * accordance with the terms and conditions of the License, a copy of which + * + * Copyright (C) 2009-2011, Marvell International Ltd. + * + * This software file (the "File") is distributed by Marvell International + * Ltd. under the terms of the GNU General Public License Version 2, June 1991 + * (the "License"). You may use, redistribute and/or modify this File in + * accordance with the terms and conditions of the License, a copy of which * is available by writing to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. * - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about + * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE + * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE + * ARE EXPRESSLY DISCLAIMED. The License provides additional details about * this warranty disclaimer. */ @@ -39,9 +39,9 @@ Change log: /******************************************************** Local Functions ********************************************************/ -/** +/** * @brief This function handles the command response error - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND * @param pioctl_buf A pointer to command buffer @@ -50,33 +50,33 @@ Change log: */ static void uap_process_cmdresp_error(mlan_private * pmpriv, HostCmd_DS_COMMAND * resp, - mlan_ioctl_req * pioctl_buf) + mlan_ioctl_req * pioctl_buf) { - mlan_adapter *pmadapter = pmpriv->adapter; + mlan_adapter *pmadapter = pmpriv->adapter; - ENTER(); + ENTER(); - PRINTM(MERROR, "CMD_RESP: cmd %#x error, result=%#x\n", resp->command, - resp->result); - if (pioctl_buf) - pioctl_buf->status_code = resp->result; - /* - * Handling errors here - */ - wlan_insert_cmd_to_free_q(pmadapter, pmadapter->curr_cmd); + PRINTM(MERROR, "CMD_RESP: cmd %#x error, result=%#x\n", resp->command, + resp->result); + if (pioctl_buf) + pioctl_buf->status_code = resp->result; + /* + * Handling errors here + */ + wlan_insert_cmd_to_free_q(pmadapter, pmadapter->curr_cmd); - wlan_request_cmd_lock(pmadapter); - pmadapter->curr_cmd = MNULL; - wlan_release_cmd_lock(pmadapter); + wlan_request_cmd_lock(pmadapter); + pmadapter->curr_cmd = MNULL; + wlan_release_cmd_lock(pmadapter); - LEAVE(); - return; + LEAVE(); + return; } /** * @brief This function will return the pointer to station entry in station list * table which matches the give mac address - * + * * @param priv A pointer to mlan_private * * @return A pointer to structure sta_node @@ -84,40 +84,40 @@ uap_process_cmdresp_error(mlan_private * pmpriv, HostCmd_DS_COMMAND * resp, void wlan_notify_station_deauth(mlan_private * priv) { - sta_node *sta_ptr; - t_u8 event_buf[100]; - mlan_event *pevent = (mlan_event *) event_buf; - t_u8 *pbuf; - - ENTER(); - if (!(sta_ptr = (sta_node *) util_peek_list(priv->adapter->pmoal_handle, - &priv->sta_list, - priv->adapter->callbacks. - moal_spin_lock, - priv->adapter->callbacks. - moal_spin_unlock))) { - LEAVE(); - return; - } - while (sta_ptr != (sta_node *) & priv->sta_list) { - memset(priv->adapter, event_buf, 0, sizeof(event_buf)); - pevent->bss_index = priv->bss_index; - pevent->event_id = MLAN_EVENT_ID_UAP_FW_STA_DISCONNECT; - pevent->event_len = MLAN_MAC_ADDR_LENGTH + 2; - pbuf = (t_u8 *) pevent->event_buf; - /* reason field set to 0, Unspecified */ - memcpy(priv->adapter, pbuf + 2, sta_ptr->mac_addr, - MLAN_MAC_ADDR_LENGTH); - wlan_recv_event(priv, pevent->event_id, pevent); - sta_ptr = sta_ptr->pnext; - } - LEAVE(); - return; + sta_node *sta_ptr; + t_u8 event_buf[100]; + mlan_event *pevent = (mlan_event *) event_buf; + t_u8 *pbuf; + + ENTER(); + if (!(sta_ptr = (sta_node *) util_peek_list(priv->adapter->pmoal_handle, + &priv->sta_list, + priv->adapter->callbacks. + moal_spin_lock, + priv->adapter->callbacks. + moal_spin_unlock))) { + LEAVE(); + return; + } + while (sta_ptr != (sta_node *) & priv->sta_list) { + memset(priv->adapter, event_buf, 0, sizeof(event_buf)); + pevent->bss_index = priv->bss_index; + pevent->event_id = MLAN_EVENT_ID_UAP_FW_STA_DISCONNECT; + pevent->event_len = MLAN_MAC_ADDR_LENGTH + 2; + pbuf = (t_u8 *) pevent->event_buf; + /* reason field set to 0, Unspecified */ + memcpy(priv->adapter, pbuf + 2, sta_ptr->mac_addr, + MLAN_MAC_ADDR_LENGTH); + wlan_recv_event(priv, pevent->event_id, pevent); + sta_ptr = sta_ptr->pnext; + } + LEAVE(); + return; } -/** +/** * @brief This function prepares command of hs_cfg. - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -127,55 +127,63 @@ wlan_notify_station_deauth(mlan_private * priv) */ static mlan_status wlan_uap_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN hs_config_param * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN hs_config_param * pdata_buf) { - HostCmd_DS_802_11_HS_CFG_ENH *phs_cfg = - (HostCmd_DS_802_11_HS_CFG_ENH *) & (cmd->params.opt_hs_cfg); - t_u8 *tlv = (t_u8 *) phs_cfg + sizeof(HostCmd_DS_802_11_HS_CFG_ENH); - MrvlIEtypes_HsWakeHoldoff_t *holdoff_tlv = MNULL; - - ENTER(); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_HS_CFG_ENH); - cmd->size = - wlan_cpu_to_le16(S_DS_GEN + sizeof(HostCmd_DS_802_11_HS_CFG_ENH)); - - if (pdata_buf == MNULL) { - phs_cfg->action = wlan_cpu_to_le16(HS_ACTIVATE); - phs_cfg->params.hs_activate.resp_ctrl = wlan_cpu_to_le16(RESP_NEEDED); - } else { - phs_cfg->action = wlan_cpu_to_le16(HS_CONFIGURE); - phs_cfg->params.hs_config.conditions = - wlan_cpu_to_le32(pdata_buf->conditions); - phs_cfg->params.hs_config.gpio = pdata_buf->gpio; - phs_cfg->params.hs_config.gap = pdata_buf->gap; - if (pmpriv->adapter->min_wake_holdoff) { - cmd->size = - wlan_cpu_to_le16(S_DS_GEN + - sizeof(HostCmd_DS_802_11_HS_CFG_ENH) + - sizeof(MrvlIEtypes_HsWakeHoldoff_t)); - holdoff_tlv = (MrvlIEtypes_HsWakeHoldoff_t *) tlv; - holdoff_tlv->header.type = - wlan_cpu_to_le16(TLV_TYPE_HS_WAKE_HOLDOFF); - holdoff_tlv->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_HsWakeHoldoff_t) - - sizeof(MrvlIEtypesHeader_t)); - holdoff_tlv->min_wake_holdoff = - wlan_cpu_to_le16(pmpriv->adapter->min_wake_holdoff); - } - PRINTM(MCMND, - "HS_CFG_CMD: condition:0x%x gpio:0x%x gap:0x%x holdoff=%d\n", - phs_cfg->params.hs_config.conditions, - phs_cfg->params.hs_config.gpio, phs_cfg->params.hs_config.gap, - pmpriv->adapter->min_wake_holdoff); - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_802_11_HS_CFG_ENH *phs_cfg = + (HostCmd_DS_802_11_HS_CFG_ENH *) & (cmd->params.opt_hs_cfg); + t_u8 *tlv = (t_u8 *) phs_cfg + sizeof(HostCmd_DS_802_11_HS_CFG_ENH); + MrvlIEtypes_HsWakeHoldoff_t *holdoff_tlv = MNULL; + + ENTER(); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_HS_CFG_ENH); + cmd->size = + wlan_cpu_to_le16(S_DS_GEN + + sizeof(HostCmd_DS_802_11_HS_CFG_ENH)); + + if (pdata_buf == MNULL) { + phs_cfg->action = wlan_cpu_to_le16(HS_ACTIVATE); + phs_cfg->params.hs_activate.resp_ctrl = + wlan_cpu_to_le16(RESP_NEEDED); + } else { + phs_cfg->action = wlan_cpu_to_le16(HS_CONFIGURE); + phs_cfg->params.hs_config.conditions = + wlan_cpu_to_le32(pdata_buf->conditions); + phs_cfg->params.hs_config.gpio = pdata_buf->gpio; + phs_cfg->params.hs_config.gap = pdata_buf->gap; + if (pmpriv->adapter->min_wake_holdoff) { + cmd->size = + wlan_cpu_to_le16(S_DS_GEN + + sizeof + (HostCmd_DS_802_11_HS_CFG_ENH) + + + sizeof + (MrvlIEtypes_HsWakeHoldoff_t)); + holdoff_tlv = (MrvlIEtypes_HsWakeHoldoff_t *) tlv; + holdoff_tlv->header.type = + wlan_cpu_to_le16(TLV_TYPE_HS_WAKE_HOLDOFF); + holdoff_tlv->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_HsWakeHoldoff_t) - + sizeof(MrvlIEtypesHeader_t)); + holdoff_tlv->min_wake_holdoff = + wlan_cpu_to_le16(pmpriv->adapter-> + min_wake_holdoff); + } + PRINTM(MCMND, + "HS_CFG_CMD: condition:0x%x gpio:0x%x gap:0x%x holdoff=%d\n", + phs_cfg->params.hs_config.conditions, + phs_cfg->params.hs_config.gpio, + phs_cfg->params.hs_config.gap, + pmpriv->adapter->min_wake_holdoff); + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** * @brief This function prepares command of Tx data pause - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action the action: GET or SET @@ -184,63 +192,66 @@ wlan_uap_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, */ static mlan_status wlan_uap_cmd_txdatapause(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN t_void * pdata_buf) { - HostCmd_DS_CMD_TX_DATA_PAUSE *pause_cmd = - (HostCmd_DS_CMD_TX_DATA_PAUSE *) & cmd->params.tx_data_pause; - mlan_ds_misc_tx_datapause *data_pause = - (mlan_ds_misc_tx_datapause *) pdata_buf; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_CFG_TX_DATA_PAUSE); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_CMD_TX_DATA_PAUSE) + S_DS_GEN); - pause_cmd->action = wlan_cpu_to_le16(cmd_action); - - if (cmd_action == HostCmd_ACT_GEN_SET) { - pause_cmd->enable_tx_pause = (t_u8) data_pause->tx_pause; - pause_cmd->pause_tx_count = (t_u8) data_pause->tx_buf_cnt; - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_CMD_TX_DATA_PAUSE *pause_cmd = + (HostCmd_DS_CMD_TX_DATA_PAUSE *) & cmd->params.tx_data_pause; + mlan_ds_misc_tx_datapause *data_pause = + (mlan_ds_misc_tx_datapause *) pdata_buf; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_CFG_TX_DATA_PAUSE); + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_CMD_TX_DATA_PAUSE) + + S_DS_GEN); + pause_cmd->action = wlan_cpu_to_le16(cmd_action); + + if (cmd_action == HostCmd_ACT_GEN_SET) { + pause_cmd->enable_tx_pause = (t_u8) data_pause->tx_pause; + pause_cmd->pause_tx_count = (t_u8) data_pause->tx_buf_cnt; + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of Tx data pause - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND - * @param pioctl_buf A pointer to mlan_ioctl_req structure + * @param pioctl_buf A pointer to mlan_ioctl_req structure * * @return MLAN_STATUS_SUCCESS */ static mlan_status wlan_uap_ret_txdatapause(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_CMD_TX_DATA_PAUSE *pause_cmd = - (HostCmd_DS_CMD_TX_DATA_PAUSE *) & resp->params.tx_data_pause; - mlan_ds_misc_cfg *misc_cfg = MNULL; - - ENTER(); - - if (pioctl_buf) { - misc_cfg = (mlan_ds_misc_cfg *) pioctl_buf->pbuf; - misc_cfg->param.tx_datapause.tx_pause = pause_cmd->enable_tx_pause; - misc_cfg->param.tx_datapause.tx_buf_cnt = pause_cmd->pause_tx_count; - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_CMD_TX_DATA_PAUSE *pause_cmd = + (HostCmd_DS_CMD_TX_DATA_PAUSE *) & resp->params.tx_data_pause; + mlan_ds_misc_cfg *misc_cfg = MNULL; + + ENTER(); + + if (pioctl_buf) { + misc_cfg = (mlan_ds_misc_cfg *) pioctl_buf->pbuf; + misc_cfg->param.tx_datapause.tx_pause = + pause_cmd->enable_tx_pause; + misc_cfg->param.tx_datapause.tx_buf_cnt = + pause_cmd->pause_tx_count; + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** * @brief This function will process tx pause event - * - * + * + * * @param priv A pointer to mlan_private * @param pevent A pointer to event buf * @@ -249,1707 +260,1988 @@ wlan_uap_ret_txdatapause(IN pmlan_private pmpriv, static void wlan_process_tx_pause_event(pmlan_private priv, pmlan_buffer pevent) { - t_u16 tlv_type, tlv_len; - int tlv_buf_left = pevent->data_len - sizeof(t_u32); - MrvlIEtypesHeader_t *tlv = - (MrvlIEtypesHeader_t *) (pevent->pbuf + pevent->data_offset + - sizeof(t_u32)); - MrvlIEtypes_tx_pause_t *tx_pause_tlv; - sta_node *sta_ptr = MNULL; - - ENTER(); - - while (tlv_buf_left >= (int) sizeof(MrvlIEtypesHeader_t)) { - tlv_type = wlan_le16_to_cpu(tlv->type); - tlv_len = wlan_le16_to_cpu(tlv->len); - if ((sizeof(MrvlIEtypesHeader_t) + tlv_len) > - (unsigned int) tlv_buf_left) { - PRINTM(MERROR, "wrong tlv: tlvLen=%d, tlvBufLeft=%d\n", tlv_len, - tlv_buf_left); - break; - } - if (tlv_type == TLV_TYPE_TX_PAUSE) { - tx_pause_tlv = (MrvlIEtypes_tx_pause_t *) tlv; - PRINTM(MCMND, "TxPause: " MACSTR " pause=%d, pkts=%d\n", - MAC2STR(tx_pause_tlv->peermac), - tx_pause_tlv->tx_pause, tx_pause_tlv->pkt_cnt); - if ((sta_ptr = wlan_get_station_entry(priv, tx_pause_tlv->peermac))) { - if (sta_ptr->tx_pause != tx_pause_tlv->tx_pause) { - sta_ptr->tx_pause = tx_pause_tlv->tx_pause; - wlan_update_ralist_tx_pause(priv, tx_pause_tlv->peermac, - tx_pause_tlv->tx_pause); - } - } - } - tlv_buf_left -= (sizeof(MrvlIEtypesHeader_t) + tlv_len); - tlv = - (MrvlIEtypesHeader_t *) ((t_u8 *) tlv + tlv_len + - sizeof(MrvlIEtypesHeader_t)); - } - - LEAVE(); - return; + t_u16 tlv_type, tlv_len; + int tlv_buf_left = pevent->data_len - sizeof(t_u32); + MrvlIEtypesHeader_t *tlv = + (MrvlIEtypesHeader_t *) (pevent->pbuf + pevent->data_offset + + sizeof(t_u32)); + MrvlIEtypes_tx_pause_t *tx_pause_tlv; + sta_node *sta_ptr = MNULL; + + ENTER(); + + while (tlv_buf_left >= (int)sizeof(MrvlIEtypesHeader_t)) { + tlv_type = wlan_le16_to_cpu(tlv->type); + tlv_len = wlan_le16_to_cpu(tlv->len); + if ((sizeof(MrvlIEtypesHeader_t) + tlv_len) > + (unsigned int)tlv_buf_left) { + PRINTM(MERROR, "wrong tlv: tlvLen=%d, tlvBufLeft=%d\n", + tlv_len, tlv_buf_left); + break; + } + if (tlv_type == TLV_TYPE_TX_PAUSE) { + tx_pause_tlv = (MrvlIEtypes_tx_pause_t *) tlv; + PRINTM(MCMND, "TxPause: " MACSTR " pause=%d, pkts=%d\n", + MAC2STR(tx_pause_tlv->peermac), + tx_pause_tlv->tx_pause, tx_pause_tlv->pkt_cnt); + if ((sta_ptr = + wlan_get_station_entry(priv, + tx_pause_tlv->peermac))) { + if (sta_ptr->tx_pause != tx_pause_tlv->tx_pause) { + sta_ptr->tx_pause = + tx_pause_tlv->tx_pause; + wlan_update_ralist_tx_pause(priv, + tx_pause_tlv-> + peermac, + tx_pause_tlv-> + tx_pause); + } + } + } + tlv_buf_left -= (sizeof(MrvlIEtypesHeader_t) + tlv_len); + tlv = (MrvlIEtypesHeader_t *) ((t_u8 *) tlv + tlv_len + + sizeof(MrvlIEtypesHeader_t)); + } + + LEAVE(); + return; } /** * @brief This function prepares command for config uap settings - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action the action: GET or SET - * @param pioctl_buf A pointer to mlan_ioctl_req structure + * @param pioctl_buf A pointer to mlan_ioctl_req structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ static mlan_status wlan_uap_cmd_ap_config(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, IN pmlan_ioctl_req pioctl_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, IN pmlan_ioctl_req pioctl_buf) { - mlan_ds_bss *bss = MNULL; - HostCmd_DS_SYS_CONFIG *sys_config = - (HostCmd_DS_SYS_CONFIG *) & cmd->params.sys_config; - t_u8 *tlv = MNULL; - MrvlIEtypes_MacAddr_t *tlv_mac = MNULL; - MrvlIEtypes_SsIdParamSet_t *tlv_ssid = MNULL; - MrvlIEtypes_beacon_period_t *tlv_beacon_period = MNULL; - MrvlIEtypes_dtim_period_t *tlv_dtim_period = MNULL; - MrvlIEtypes_RatesParamSet_t *tlv_rates = MNULL; - MrvlIEtypes_tx_rate_t *tlv_txrate = MNULL; - MrvlIEtypes_mcbc_rate_t *tlv_mcbc_rate = MNULL; - MrvlIEtypes_tx_power_t *tlv_tx_power = MNULL; - MrvlIEtypes_bcast_ssid_t *tlv_bcast_ssid = MNULL; - MrvlIEtypes_antenna_mode_t *tlv_antenna = MNULL; - MrvlIEtypes_pkt_forward_t *tlv_pkt_forward = MNULL; - MrvlIEtypes_max_sta_count_t *tlv_sta_count = MNULL; - MrvlIEtypes_sta_ageout_t *tlv_sta_ageout = MNULL; - MrvlIEtypes_ps_sta_ageout_t *tlv_ps_sta_ageout = MNULL; - MrvlIEtypes_rts_threshold_t *tlv_rts_threshold = MNULL; - MrvlIEtypes_frag_threshold_t *tlv_frag_threshold = MNULL; - MrvlIEtypes_retry_limit_t *tlv_retry_limit = MNULL; - MrvlIEtypes_eapol_pwk_hsk_timeout_t *tlv_pairwise_timeout = MNULL; - MrvlIEtypes_eapol_pwk_hsk_retries_t *tlv_pairwise_retries = MNULL; - MrvlIEtypes_eapol_gwk_hsk_timeout_t *tlv_groupwise_timeout = MNULL; - MrvlIEtypes_eapol_gwk_hsk_retries_t *tlv_groupwise_retries = MNULL; - MrvlIEtypes_mgmt_ie_passthru_t *tlv_mgmt_ie_passthru = MNULL; - MrvlIEtypes_2040_coex_enable_t *tlv_2040_coex_enable = MNULL; - MrvlIEtypes_mac_filter_t *tlv_mac_filter = MNULL; - MrvlIEtypes_channel_band_t *tlv_chan_band = MNULL; - MrvlIEtypes_ChanListParamSet_t *tlv_chan_list = MNULL; - ChanScanParamSet_t *pscan_chan = MNULL; - MrvlIEtypes_auth_type_t *tlv_auth_type = MNULL; - MrvlIEtypes_encrypt_protocol_t *tlv_encrypt_protocol = MNULL; - MrvlIEtypes_akmp_t *tlv_akmp = MNULL; - MrvlIEtypes_pwk_cipher_t *tlv_pwk_cipher = MNULL; - MrvlIEtypes_gwk_cipher_t *tlv_gwk_cipher = MNULL; - MrvlIEtypes_rsn_replay_prot_t *tlv_rsn_prot = MNULL; - MrvlIEtypes_passphrase_t *tlv_passphrase = MNULL; - MrvlIEtypes_group_rekey_time_t *tlv_rekey_time = MNULL; - MrvlIEtypes_wep_key_t *tlv_wep_key = MNULL; - MrvlIETypes_HTCap_t *tlv_htcap = MNULL; - MrvlIEtypes_wmm_parameter_t *tlv_wmm_parameter = MNULL; - t_u32 cmd_size = 0; - t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; - t_u16 i; - t_u16 ac; - - ENTER(); - if (pioctl_buf == MNULL) { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - bss = (mlan_ds_bss *) pioctl_buf->pbuf; - - cmd->command = wlan_cpu_to_le16(HOST_CMD_APCMD_SYS_CONFIGURE); - sys_config->action = wlan_cpu_to_le16(cmd_action); - cmd_size = sizeof(HostCmd_DS_SYS_CONFIG) - 1 + S_DS_GEN; - - tlv = (t_u8 *) sys_config->tlv_buffer; - if (memcmp - (pmpriv->adapter, zero_mac, &bss->param.bss_config.mac_addr, - MLAN_MAC_ADDR_LENGTH)) { - tlv_mac = (MrvlIEtypes_MacAddr_t *) tlv; - tlv_mac->header.type = wlan_cpu_to_le16(TLV_TYPE_UAP_MAC_ADDRESS); - tlv_mac->header.len = wlan_cpu_to_le16(MLAN_MAC_ADDR_LENGTH); - memcpy(pmpriv->adapter, tlv_mac->mac, &bss->param.bss_config.mac_addr, - MLAN_MAC_ADDR_LENGTH); - cmd_size += sizeof(MrvlIEtypes_MacAddr_t); - tlv += sizeof(MrvlIEtypes_MacAddr_t); - } - - if (bss->param.bss_config.ssid.ssid_len) { - tlv_ssid = (MrvlIEtypes_SsIdParamSet_t *) tlv; - tlv_ssid->header.type = wlan_cpu_to_le16(TLV_TYPE_SSID); - tlv_ssid->header.len = - wlan_cpu_to_le16((t_u16) bss->param.bss_config.ssid.ssid_len); - memcpy(pmpriv->adapter, tlv_ssid->ssid, bss->param.bss_config.ssid.ssid, - bss->param.bss_config.ssid.ssid_len); - cmd_size += - sizeof(MrvlIEtypesHeader_t) + bss->param.bss_config.ssid.ssid_len; - tlv += - sizeof(MrvlIEtypesHeader_t) + bss->param.bss_config.ssid.ssid_len; - } - - if ((bss->param.bss_config.beacon_period >= MIN_BEACON_PERIOD) && - (bss->param.bss_config.beacon_period <= MAX_BEACON_PERIOD)) { - tlv_beacon_period = (MrvlIEtypes_beacon_period_t *) tlv; - tlv_beacon_period->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_BEACON_PERIOD); - tlv_beacon_period->header.len = wlan_cpu_to_le16(sizeof(t_u16)); - tlv_beacon_period->beacon_period = - wlan_cpu_to_le16(bss->param.bss_config.beacon_period); - cmd_size += sizeof(MrvlIEtypes_beacon_period_t); - tlv += sizeof(MrvlIEtypes_beacon_period_t); - } - - if ((bss->param.bss_config.dtim_period >= MIN_DTIM_PERIOD) && - (bss->param.bss_config.dtim_period <= MAX_DTIM_PERIOD)) { - tlv_dtim_period = (MrvlIEtypes_dtim_period_t *) tlv; - tlv_dtim_period->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_DTIM_PERIOD); - tlv_dtim_period->header.len = wlan_cpu_to_le16(sizeof(t_u8)); - tlv_dtim_period->dtim_period = bss->param.bss_config.dtim_period; - cmd_size += sizeof(MrvlIEtypes_dtim_period_t); - tlv += sizeof(MrvlIEtypes_dtim_period_t); - } - - if (bss->param.bss_config.rates[0]) { - tlv_rates = (MrvlIEtypes_RatesParamSet_t *) tlv; - tlv_rates->header.type = wlan_cpu_to_le16(TLV_TYPE_RATES); - for (i = 0; i < MAX_DATA_RATES && bss->param.bss_config.rates[i]; i++) { - tlv_rates->rates[i] = bss->param.bss_config.rates[i]; - } - tlv_rates->header.len = wlan_cpu_to_le16(i); - cmd_size += sizeof(MrvlIEtypesHeader_t) + i; - tlv += sizeof(MrvlIEtypesHeader_t) + i; - } - - if (bss->param.bss_config.tx_data_rate <= DATA_RATE_54M) { - tlv_txrate = (MrvlIEtypes_tx_rate_t *) tlv; - tlv_txrate->header.type = wlan_cpu_to_le16(TLV_TYPE_UAP_TX_DATA_RATE); - tlv_txrate->header.len = wlan_cpu_to_le16(sizeof(t_u16)); - tlv_txrate->tx_data_rate = - wlan_cpu_to_le16(bss->param.bss_config.tx_data_rate); - cmd_size += sizeof(MrvlIEtypes_tx_rate_t); - tlv += sizeof(MrvlIEtypes_tx_rate_t); - } - - if (bss->param.bss_config.mcbc_data_rate <= DATA_RATE_54M) { - tlv_mcbc_rate = (MrvlIEtypes_mcbc_rate_t *) tlv; - tlv_mcbc_rate->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_MCBC_DATA_RATE); - tlv_mcbc_rate->header.len = wlan_cpu_to_le16(sizeof(t_u16)); - tlv_mcbc_rate->mcbc_data_rate = - wlan_cpu_to_le16(bss->param.bss_config.mcbc_data_rate); - cmd_size += sizeof(MrvlIEtypes_mcbc_rate_t); - tlv += sizeof(MrvlIEtypes_mcbc_rate_t); - } - - if (bss->param.bss_config.tx_power_level <= MAX_TX_POWER) { - tlv_tx_power = (MrvlIEtypes_tx_power_t *) tlv; - tlv_tx_power->header.type = wlan_cpu_to_le16(TLV_TYPE_UAP_TX_POWER); - tlv_tx_power->header.len = wlan_cpu_to_le16(sizeof(t_u8)); - tlv_tx_power->tx_power = bss->param.bss_config.tx_power_level; - cmd_size += sizeof(MrvlIEtypes_tx_power_t); - tlv += sizeof(MrvlIEtypes_tx_power_t); - } - - if (bss->param.bss_config.bcast_ssid_ctl <= MTRUE) { - tlv_bcast_ssid = (MrvlIEtypes_bcast_ssid_t *) tlv; - tlv_bcast_ssid->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_BCAST_SSID_CTL); - tlv_bcast_ssid->header.len = wlan_cpu_to_le16(sizeof(t_u8)); - tlv_bcast_ssid->bcast_ssid_ctl = bss->param.bss_config.bcast_ssid_ctl; - cmd_size += sizeof(MrvlIEtypes_bcast_ssid_t); - tlv += sizeof(MrvlIEtypes_bcast_ssid_t); - } - - if ((bss->param.bss_config.tx_antenna == ANTENNA_MODE_A) || - (bss->param.bss_config.tx_antenna == ANTENNA_MODE_B)) { - tlv_antenna = (MrvlIEtypes_antenna_mode_t *) tlv; - tlv_antenna->header.type = wlan_cpu_to_le16(TLV_TYPE_UAP_ANTENNA_CTL); - tlv_antenna->header.len = wlan_cpu_to_le16(sizeof(t_u8) + sizeof(t_u8)); - tlv_antenna->which_antenna = TX_ANTENNA; - tlv_antenna->antenna_mode = bss->param.bss_config.tx_antenna; - cmd_size += sizeof(MrvlIEtypes_antenna_mode_t); - tlv += sizeof(MrvlIEtypes_antenna_mode_t); - } - - if ((bss->param.bss_config.rx_antenna == ANTENNA_MODE_A) || - (bss->param.bss_config.rx_antenna == ANTENNA_MODE_B)) { - tlv_antenna = (MrvlIEtypes_antenna_mode_t *) tlv; - tlv_antenna->header.type = wlan_cpu_to_le16(TLV_TYPE_UAP_ANTENNA_CTL); - tlv_antenna->header.len = wlan_cpu_to_le16(sizeof(t_u8) + sizeof(t_u8)); - tlv_antenna->which_antenna = RX_ANTENNA; - tlv_antenna->antenna_mode = bss->param.bss_config.rx_antenna; - cmd_size += sizeof(MrvlIEtypes_antenna_mode_t); - tlv += sizeof(MrvlIEtypes_antenna_mode_t); - } - - if (bss->param.bss_config.pkt_forward_ctl <= MAX_PKT_FWD_CTRL) { - tlv_pkt_forward = (MrvlIEtypes_pkt_forward_t *) tlv; - tlv_pkt_forward->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_PKT_FWD_CTL); - tlv_pkt_forward->header.len = wlan_cpu_to_le16(sizeof(t_u8)); - tlv_pkt_forward->pkt_forward_ctl = - bss->param.bss_config.pkt_forward_ctl; - cmd_size += sizeof(MrvlIEtypes_pkt_forward_t); - tlv += sizeof(MrvlIEtypes_pkt_forward_t); - } - - if (bss->param.bss_config.max_sta_count <= MAX_STA_COUNT) { - tlv_sta_count = (MrvlIEtypes_max_sta_count_t *) tlv; - tlv_sta_count->header.type = wlan_cpu_to_le16(TLV_TYPE_UAP_MAX_STA_CNT); - tlv_sta_count->header.len = wlan_cpu_to_le16(sizeof(t_u16)); - tlv_sta_count->max_sta_count = - wlan_cpu_to_le16(bss->param.bss_config.max_sta_count); - cmd_size += sizeof(MrvlIEtypes_max_sta_count_t); - tlv += sizeof(MrvlIEtypes_max_sta_count_t); - } - - if (((bss->param.bss_config.sta_ageout_timer >= MIN_STAGE_OUT_TIME) && - (bss->param.bss_config.sta_ageout_timer <= MAX_STAGE_OUT_TIME)) || - (bss->param.bss_config.sta_ageout_timer == 0)) { - tlv_sta_ageout = (MrvlIEtypes_sta_ageout_t *) tlv; - tlv_sta_ageout->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_STA_AGEOUT_TIMER); - tlv_sta_ageout->header.len = wlan_cpu_to_le16(sizeof(t_u32)); - tlv_sta_ageout->sta_ageout_timer = - wlan_cpu_to_le32(bss->param.bss_config.sta_ageout_timer); - cmd_size += sizeof(MrvlIEtypes_sta_ageout_t); - tlv += sizeof(MrvlIEtypes_sta_ageout_t); - } - - if (((bss->param.bss_config.ps_sta_ageout_timer >= MIN_STAGE_OUT_TIME) && - (bss->param.bss_config.ps_sta_ageout_timer <= MAX_STAGE_OUT_TIME)) || - (bss->param.bss_config.ps_sta_ageout_timer == 0)) { - tlv_ps_sta_ageout = (MrvlIEtypes_ps_sta_ageout_t *) tlv; - tlv_ps_sta_ageout->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_PS_STA_AGEOUT_TIMER); - tlv_ps_sta_ageout->header.len = wlan_cpu_to_le16(sizeof(t_u32)); - tlv_ps_sta_ageout->ps_sta_ageout_timer = - wlan_cpu_to_le32(bss->param.bss_config.ps_sta_ageout_timer); - cmd_size += sizeof(MrvlIEtypes_ps_sta_ageout_t); - tlv += sizeof(MrvlIEtypes_ps_sta_ageout_t); - } - if (bss->param.bss_config.rts_threshold <= MAX_RTS_THRESHOLD) { - tlv_rts_threshold = (MrvlIEtypes_rts_threshold_t *) tlv; - tlv_rts_threshold->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_RTS_THRESHOLD); - tlv_rts_threshold->header.len = wlan_cpu_to_le16(sizeof(t_u16)); - tlv_rts_threshold->rts_threshold = - wlan_cpu_to_le16(bss->param.bss_config.rts_threshold); - cmd_size += sizeof(MrvlIEtypes_rts_threshold_t); - tlv += sizeof(MrvlIEtypes_rts_threshold_t); - } - - if ((bss->param.bss_config.frag_threshold >= MIN_FRAG_THRESHOLD) && - (bss->param.bss_config.frag_threshold <= MAX_FRAG_THRESHOLD)) { - tlv_frag_threshold = (MrvlIEtypes_frag_threshold_t *) tlv; - tlv_frag_threshold->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_FRAG_THRESHOLD); - tlv_frag_threshold->header.len = wlan_cpu_to_le16(sizeof(t_u16)); - tlv_frag_threshold->frag_threshold = - wlan_cpu_to_le16(bss->param.bss_config.frag_threshold); - cmd_size += sizeof(MrvlIEtypes_frag_threshold_t); - tlv += sizeof(MrvlIEtypes_frag_threshold_t); - } - - if (bss->param.bss_config.retry_limit <= MAX_RETRY_LIMIT) { - tlv_retry_limit = (MrvlIEtypes_retry_limit_t *) tlv; - tlv_retry_limit->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_RETRY_LIMIT); - tlv_retry_limit->header.len = wlan_cpu_to_le16(sizeof(t_u8)); - tlv_retry_limit->retry_limit = (t_u8) bss->param.bss_config.retry_limit; - cmd_size += sizeof(MrvlIEtypes_retry_limit_t); - tlv += sizeof(MrvlIEtypes_retry_limit_t); - } - - if (bss->param.bss_config.pairwise_update_timeout < (MAX_VALID_DWORD)) { - tlv_pairwise_timeout = (MrvlIEtypes_eapol_pwk_hsk_timeout_t *) tlv; - tlv_pairwise_timeout->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_EAPOL_PWK_HSK_TIMEOUT); - tlv_pairwise_timeout->header.len = wlan_cpu_to_le16(sizeof(t_u32)); - tlv_pairwise_timeout->pairwise_update_timeout = - wlan_cpu_to_le32(bss->param.bss_config.pairwise_update_timeout); - cmd_size += sizeof(MrvlIEtypes_eapol_pwk_hsk_timeout_t); - tlv += sizeof(MrvlIEtypes_eapol_pwk_hsk_timeout_t); - } - - if (bss->param.bss_config.pwk_retries < (MAX_VALID_DWORD)) { - tlv_pairwise_retries = (MrvlIEtypes_eapol_pwk_hsk_retries_t *) tlv; - tlv_pairwise_retries->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_EAPOL_PWK_HSK_RETRIES); - tlv_pairwise_retries->header.len = wlan_cpu_to_le16(sizeof(t_u32)); - tlv_pairwise_retries->pwk_retries = - wlan_cpu_to_le32(bss->param.bss_config.pwk_retries); - cmd_size += sizeof(MrvlIEtypes_eapol_pwk_hsk_retries_t); - tlv += sizeof(MrvlIEtypes_eapol_pwk_hsk_retries_t); - } - - if (bss->param.bss_config.groupwise_update_timeout < (MAX_VALID_DWORD)) { - tlv_groupwise_timeout = (MrvlIEtypes_eapol_gwk_hsk_timeout_t *) tlv; - tlv_groupwise_timeout->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_EAPOL_GWK_HSK_TIMEOUT); - tlv_groupwise_timeout->header.len = wlan_cpu_to_le16(sizeof(t_u32)); - tlv_groupwise_timeout->groupwise_update_timeout = - wlan_cpu_to_le32(bss->param.bss_config.groupwise_update_timeout); - cmd_size += sizeof(MrvlIEtypes_eapol_gwk_hsk_timeout_t); - tlv += sizeof(MrvlIEtypes_eapol_gwk_hsk_timeout_t); - } - - if (bss->param.bss_config.gwk_retries < (MAX_VALID_DWORD)) { - tlv_groupwise_retries = (MrvlIEtypes_eapol_gwk_hsk_retries_t *) tlv; - tlv_groupwise_retries->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_EAPOL_GWK_HSK_RETRIES); - tlv_groupwise_retries->header.len = wlan_cpu_to_le16(sizeof(t_u32)); - tlv_groupwise_retries->gwk_retries = - wlan_cpu_to_le32(bss->param.bss_config.gwk_retries); - cmd_size += sizeof(MrvlIEtypes_eapol_gwk_hsk_retries_t); - tlv += sizeof(MrvlIEtypes_eapol_gwk_hsk_retries_t); - } - - if ((bss->param.bss_config.filter.filter_mode <= MAC_FILTER_MODE_BLOCK_MAC) - && (bss->param.bss_config.filter.mac_count <= MAX_MAC_FILTER_NUM)) { - tlv_mac_filter = (MrvlIEtypes_mac_filter_t *) tlv; - tlv_mac_filter->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_STA_MAC_ADDR_FILTER); - tlv_mac_filter->header.len = - wlan_cpu_to_le16(2 + - MLAN_MAC_ADDR_LENGTH * - bss->param.bss_config.filter.mac_count); - tlv_mac_filter->count = (t_u8) bss->param.bss_config.filter.mac_count; - tlv_mac_filter->filter_mode = - (t_u8) bss->param.bss_config.filter.filter_mode; - memcpy(pmpriv->adapter, tlv_mac_filter->mac_address, - (t_u8 *) bss->param.bss_config.filter.mac_list, - MLAN_MAC_ADDR_LENGTH * bss->param.bss_config.filter.mac_count); - cmd_size += - sizeof(MrvlIEtypesHeader_t) + 2 + - MLAN_MAC_ADDR_LENGTH * bss->param.bss_config.filter.mac_count; - tlv += - sizeof(MrvlIEtypesHeader_t) + 2 + - MLAN_MAC_ADDR_LENGTH * bss->param.bss_config.filter.mac_count; - } - - if ((((bss->param.bss_config.band_cfg & BAND_CONFIG_ACS_MODE) == - BAND_CONFIG_MANUAL) && (bss->param.bss_config.channel > 0) && - (bss->param.bss_config.channel <= MLAN_MAX_CHANNEL)) || - (bss->param.bss_config.band_cfg & BAND_CONFIG_ACS_MODE)) { - tlv_chan_band = (MrvlIEtypes_channel_band_t *) tlv; - tlv_chan_band->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_CHAN_BAND_CONFIG); - tlv_chan_band->header.len = - wlan_cpu_to_le16(sizeof(t_u8) + sizeof(t_u8)); - tlv_chan_band->band_config = bss->param.bss_config.band_cfg; - tlv_chan_band->channel = bss->param.bss_config.channel; - cmd_size += sizeof(MrvlIEtypes_channel_band_t); - tlv += sizeof(MrvlIEtypes_channel_band_t); - } - - if ((bss->param.bss_config.num_of_chan) && - (bss->param.bss_config.num_of_chan <= MLAN_MAX_CHANNEL)) { - tlv_chan_list = (MrvlIEtypes_ChanListParamSet_t *) tlv; - tlv_chan_list->header.type = wlan_cpu_to_le16(TLV_TYPE_CHANLIST); - tlv_chan_list->header.len = - wlan_cpu_to_le16((t_u16) - (sizeof(ChanScanParamSet_t) * - bss->param.bss_config.num_of_chan)); - pscan_chan = tlv_chan_list->chan_scan_param; - for (i = 0; i < bss->param.bss_config.num_of_chan; i++) { - pscan_chan->chan_number = - bss->param.bss_config.chan_list[i].chan_number; - pscan_chan->radio_type = - bss->param.bss_config.chan_list[i].band_config_type; - pscan_chan++; - } - cmd_size += sizeof(tlv_chan_list->header) + - (sizeof(ChanScanParamSet_t) * bss->param.bss_config.num_of_chan); - tlv += sizeof(tlv_chan_list->header) + - (sizeof(ChanScanParamSet_t) * bss->param.bss_config.num_of_chan); - } - - if ((bss->param.bss_config.auth_mode <= MLAN_AUTH_MODE_SHARED) || - (bss->param.bss_config.auth_mode == MLAN_AUTH_MODE_AUTO)) { - tlv_auth_type = (MrvlIEtypes_auth_type_t *) tlv; - tlv_auth_type->header.type = wlan_cpu_to_le16(TLV_TYPE_AUTH_TYPE); - tlv_auth_type->header.len = wlan_cpu_to_le16(sizeof(t_u8)); - tlv_auth_type->auth_type = (t_u8) bss->param.bss_config.auth_mode; - cmd_size += sizeof(MrvlIEtypes_auth_type_t); - tlv += sizeof(MrvlIEtypes_auth_type_t); - } - - if (bss->param.bss_config.protocol) { - tlv_encrypt_protocol = (MrvlIEtypes_encrypt_protocol_t *) tlv; - tlv_encrypt_protocol->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_ENCRYPT_PROTOCOL); - tlv_encrypt_protocol->header.len = wlan_cpu_to_le16(sizeof(t_u16)); - tlv_encrypt_protocol->protocol = - wlan_cpu_to_le16(bss->param.bss_config.protocol); - cmd_size += sizeof(MrvlIEtypes_encrypt_protocol_t); - tlv += sizeof(MrvlIEtypes_encrypt_protocol_t); - } - - if ((bss->param.bss_config.protocol & PROTOCOL_WPA) || - (bss->param.bss_config.protocol & PROTOCOL_WPA2) || - (bss->param.bss_config.protocol & PROTOCOL_EAP)) { - tlv_akmp = (MrvlIEtypes_akmp_t *) tlv; - tlv_akmp->header.type = wlan_cpu_to_le16(TLV_TYPE_UAP_AKMP); - tlv_akmp->key_mgmt = wlan_cpu_to_le16(bss->param.bss_config.key_mgmt); - tlv_akmp->header.len = sizeof(t_u16); - tlv_akmp->key_mgmt_operation = - wlan_cpu_to_le16(bss->param.bss_config.key_mgmt_operation); - tlv_akmp->header.len += sizeof(t_u16); - tlv_akmp->header.len = wlan_cpu_to_le16(tlv_akmp->header.len); - cmd_size += sizeof(MrvlIEtypes_akmp_t); - tlv += sizeof(MrvlIEtypes_akmp_t); - - if (bss->param.bss_config.wpa_cfg. - pairwise_cipher_wpa & VALID_CIPHER_BITMAP) { - tlv_pwk_cipher = (MrvlIEtypes_pwk_cipher_t *) tlv; - tlv_pwk_cipher->header.type = wlan_cpu_to_le16(TLV_TYPE_PWK_CIPHER); - tlv_pwk_cipher->header.len = - wlan_cpu_to_le16(sizeof(t_u16) + sizeof(t_u8) + sizeof(t_u8)); - tlv_pwk_cipher->protocol = wlan_cpu_to_le16(PROTOCOL_WPA); - tlv_pwk_cipher->pairwise_cipher = - bss->param.bss_config.wpa_cfg.pairwise_cipher_wpa; - cmd_size += sizeof(MrvlIEtypes_pwk_cipher_t); - tlv += sizeof(MrvlIEtypes_pwk_cipher_t); - } - - if (bss->param.bss_config.wpa_cfg. - pairwise_cipher_wpa2 & VALID_CIPHER_BITMAP) { - tlv_pwk_cipher = (MrvlIEtypes_pwk_cipher_t *) tlv; - tlv_pwk_cipher->header.type = wlan_cpu_to_le16(TLV_TYPE_PWK_CIPHER); - tlv_pwk_cipher->header.len = - wlan_cpu_to_le16(sizeof(t_u16) + sizeof(t_u8) + sizeof(t_u8)); - tlv_pwk_cipher->protocol = wlan_cpu_to_le16(PROTOCOL_WPA2); - tlv_pwk_cipher->pairwise_cipher = - bss->param.bss_config.wpa_cfg.pairwise_cipher_wpa2; - cmd_size += sizeof(MrvlIEtypes_pwk_cipher_t); - tlv += sizeof(MrvlIEtypes_pwk_cipher_t); - } - - if (bss->param.bss_config.wpa_cfg.group_cipher & VALID_CIPHER_BITMAP) { - tlv_gwk_cipher = (MrvlIEtypes_gwk_cipher_t *) tlv; - tlv_gwk_cipher->header.type = wlan_cpu_to_le16(TLV_TYPE_GWK_CIPHER); - tlv_gwk_cipher->header.len = - wlan_cpu_to_le16(sizeof(t_u8) + sizeof(t_u8)); - tlv_gwk_cipher->group_cipher = - bss->param.bss_config.wpa_cfg.group_cipher; - cmd_size += sizeof(MrvlIEtypes_gwk_cipher_t); - tlv += sizeof(MrvlIEtypes_gwk_cipher_t); - } - - if (bss->param.bss_config.wpa_cfg.rsn_protection <= MTRUE) { - tlv_rsn_prot = (MrvlIEtypes_rsn_replay_prot_t *) tlv; - tlv_rsn_prot->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_RSN_REPLAY_PROTECT); - tlv_rsn_prot->header.len = wlan_cpu_to_le16(sizeof(t_u8)); - tlv_rsn_prot->rsn_replay_prot = - bss->param.bss_config.wpa_cfg.rsn_protection; - cmd_size += sizeof(MrvlIEtypes_rsn_replay_prot_t); - tlv += sizeof(MrvlIEtypes_rsn_replay_prot_t); - } - - if (bss->param.bss_config.wpa_cfg.length) { - tlv_passphrase = (MrvlIEtypes_passphrase_t *) tlv; - tlv_passphrase->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_WPA_PASSPHRASE); - tlv_passphrase->header.len = - (t_u16) wlan_cpu_to_le16(bss->param.bss_config.wpa_cfg.length); - memcpy(pmpriv->adapter, tlv_passphrase->passphrase, - bss->param.bss_config.wpa_cfg.passphrase, - bss->param.bss_config.wpa_cfg.length); - cmd_size += - sizeof(MrvlIEtypesHeader_t) + - bss->param.bss_config.wpa_cfg.length; - tlv += - sizeof(MrvlIEtypesHeader_t) + - bss->param.bss_config.wpa_cfg.length; - } - - if (bss->param.bss_config.wpa_cfg.gk_rekey_time < MAX_GRP_TIMER) { - tlv_rekey_time = (MrvlIEtypes_group_rekey_time_t *) tlv; - tlv_rekey_time->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_GRP_REKEY_TIME); - tlv_rekey_time->header.len = wlan_cpu_to_le16(sizeof(t_u32)); - tlv_rekey_time->gk_rekey_time = - wlan_cpu_to_le32(bss->param.bss_config.wpa_cfg.gk_rekey_time); - cmd_size += sizeof(MrvlIEtypes_group_rekey_time_t); - tlv += sizeof(MrvlIEtypes_group_rekey_time_t); - } - } else { - if ((bss->param.bss_config.wep_cfg.key0.length) && - ((bss->param.bss_config.wep_cfg.key0.length == 5) || - (bss->param.bss_config.wep_cfg.key0.length == 10) || - (bss->param.bss_config.wep_cfg.key0.length == 13) || - (bss->param.bss_config.wep_cfg.key0.length == 26))) { - tlv_wep_key = (MrvlIEtypes_wep_key_t *) tlv; - tlv_wep_key->header.type = wlan_cpu_to_le16(TLV_TYPE_UAP_WEP_KEY); - tlv_wep_key->header.len = - wlan_cpu_to_le16(2 + bss->param.bss_config.wep_cfg.key0.length); - tlv_wep_key->key_index = - bss->param.bss_config.wep_cfg.key0.key_index; - tlv_wep_key->is_default = - bss->param.bss_config.wep_cfg.key0.is_default; - memcpy(pmpriv->adapter, tlv_wep_key->key, - bss->param.bss_config.wep_cfg.key0.key, - bss->param.bss_config.wep_cfg.key0.length); - cmd_size += - sizeof(MrvlIEtypesHeader_t) + 2 + - bss->param.bss_config.wep_cfg.key0.length; - tlv += - sizeof(MrvlIEtypesHeader_t) + 2 + - bss->param.bss_config.wep_cfg.key0.length; - } - - if ((bss->param.bss_config.wep_cfg.key1.length) && - ((bss->param.bss_config.wep_cfg.key1.length == 5) || - (bss->param.bss_config.wep_cfg.key1.length == 10) || - (bss->param.bss_config.wep_cfg.key1.length == 13) || - (bss->param.bss_config.wep_cfg.key1.length == 26))) { - tlv_wep_key = (MrvlIEtypes_wep_key_t *) tlv; - tlv_wep_key->header.type = wlan_cpu_to_le16(TLV_TYPE_UAP_WEP_KEY); - tlv_wep_key->header.len = - wlan_cpu_to_le16(2 + bss->param.bss_config.wep_cfg.key1.length); - tlv_wep_key->key_index = - bss->param.bss_config.wep_cfg.key1.key_index; - tlv_wep_key->is_default = - bss->param.bss_config.wep_cfg.key1.is_default; - memcpy(pmpriv->adapter, tlv_wep_key->key, - bss->param.bss_config.wep_cfg.key1.key, - bss->param.bss_config.wep_cfg.key1.length); - cmd_size += - sizeof(MrvlIEtypesHeader_t) + 2 + - bss->param.bss_config.wep_cfg.key1.length; - tlv += - sizeof(MrvlIEtypesHeader_t) + 2 + - bss->param.bss_config.wep_cfg.key1.length; - } - - if ((bss->param.bss_config.wep_cfg.key2.length) && - ((bss->param.bss_config.wep_cfg.key2.length == 5) || - (bss->param.bss_config.wep_cfg.key2.length == 10) || - (bss->param.bss_config.wep_cfg.key2.length == 13) || - (bss->param.bss_config.wep_cfg.key2.length == 26))) { - tlv_wep_key = (MrvlIEtypes_wep_key_t *) tlv; - tlv_wep_key->header.type = wlan_cpu_to_le16(TLV_TYPE_UAP_WEP_KEY); - tlv_wep_key->header.len = - wlan_cpu_to_le16(2 + bss->param.bss_config.wep_cfg.key2.length); - tlv_wep_key->key_index = - bss->param.bss_config.wep_cfg.key2.key_index; - tlv_wep_key->is_default = - bss->param.bss_config.wep_cfg.key2.is_default; - memcpy(pmpriv->adapter, tlv_wep_key->key, - bss->param.bss_config.wep_cfg.key2.key, - bss->param.bss_config.wep_cfg.key2.length); - cmd_size += - sizeof(MrvlIEtypesHeader_t) + 2 + - bss->param.bss_config.wep_cfg.key2.length; - tlv += - sizeof(MrvlIEtypesHeader_t) + 2 + - bss->param.bss_config.wep_cfg.key2.length; - } - - if ((bss->param.bss_config.wep_cfg.key3.length) && - ((bss->param.bss_config.wep_cfg.key3.length == 5) || - (bss->param.bss_config.wep_cfg.key3.length == 10) || - (bss->param.bss_config.wep_cfg.key3.length == 13) || - (bss->param.bss_config.wep_cfg.key3.length == 26))) { - tlv_wep_key = (MrvlIEtypes_wep_key_t *) tlv; - tlv_wep_key->header.type = wlan_cpu_to_le16(TLV_TYPE_UAP_WEP_KEY); - tlv_wep_key->header.len = - wlan_cpu_to_le16(2 + bss->param.bss_config.wep_cfg.key3.length); - tlv_wep_key->key_index = - bss->param.bss_config.wep_cfg.key3.key_index; - tlv_wep_key->is_default = - bss->param.bss_config.wep_cfg.key3.is_default; - memcpy(pmpriv->adapter, tlv_wep_key->key, - bss->param.bss_config.wep_cfg.key3.key, - bss->param.bss_config.wep_cfg.key3.length); - cmd_size += - sizeof(MrvlIEtypesHeader_t) + 2 + - bss->param.bss_config.wep_cfg.key3.length; - tlv += - sizeof(MrvlIEtypesHeader_t) + 2 + - bss->param.bss_config.wep_cfg.key3.length; - } - } - if ((bss->param.bss_config.ht_cap_info) - ) { - tlv_htcap = (MrvlIETypes_HTCap_t *) tlv; - tlv_htcap->header.type = wlan_cpu_to_le16(HT_CAPABILITY); - tlv_htcap->header.len = wlan_cpu_to_le16(sizeof(HTCap_t)); - tlv_htcap->ht_cap.ht_cap_info = - wlan_cpu_to_le16(bss->param.bss_config.ht_cap_info); - tlv_htcap->ht_cap.ampdu_param = bss->param.bss_config.ampdu_param; - memcpy(pmpriv->adapter, tlv_htcap->ht_cap.supported_mcs_set, - bss->param.bss_config.supported_mcs_set, 16); - tlv_htcap->ht_cap.ht_ext_cap = - wlan_cpu_to_le16(bss->param.bss_config.ht_ext_cap); - tlv_htcap->ht_cap.tx_bf_cap = - wlan_cpu_to_le32(bss->param.bss_config.tx_bf_cap); - tlv_htcap->ht_cap.asel = bss->param.bss_config.asel; - cmd_size += sizeof(MrvlIETypes_HTCap_t); - tlv += sizeof(MrvlIETypes_HTCap_t); - } - if (bss->param.bss_config.mgmt_ie_passthru_mask < (MAX_VALID_DWORD)) { - tlv_mgmt_ie_passthru = (MrvlIEtypes_mgmt_ie_passthru_t *) tlv; - tlv_mgmt_ie_passthru->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_MGMT_IE_PASSTHRU_MASK); - tlv_mgmt_ie_passthru->header.len = wlan_cpu_to_le16(sizeof(t_u32)); - /* keep copy in private data */ - pmpriv->mgmt_frame_passthru_mask = - bss->param.bss_config.mgmt_ie_passthru_mask; - tlv_mgmt_ie_passthru->mgmt_ie_mask = - wlan_cpu_to_le32(bss->param.bss_config.mgmt_ie_passthru_mask); - cmd_size += sizeof(MrvlIEtypes_mgmt_ie_passthru_t); - tlv += sizeof(MrvlIEtypes_mgmt_ie_passthru_t); - } - if (((bss->param.bss_config.enable_2040coex == 0) || - (bss->param.bss_config.enable_2040coex == 1)) - ) { - tlv_2040_coex_enable = (MrvlIEtypes_2040_coex_enable_t *) tlv; - tlv_2040_coex_enable->header.type = - wlan_cpu_to_le16(TLV_TYPE_2040_BSS_COEX_CONTROL); - tlv_2040_coex_enable->header.len = wlan_cpu_to_le16(sizeof(t_u8)); - tlv_2040_coex_enable->enable_2040coex = - bss->param.bss_config.enable_2040coex; - cmd_size += sizeof(MrvlIEtypes_2040_coex_enable_t); - tlv += sizeof(MrvlIEtypes_2040_coex_enable_t); - } - if (bss->param.bss_config.wmm_para.qos_info == 0x80 || - bss->param.bss_config.wmm_para.qos_info == 0x00) { - tlv_wmm_parameter = (MrvlIEtypes_wmm_parameter_t *) tlv; - tlv_wmm_parameter->header.type = - wlan_cpu_to_le16(TLV_TYPE_VENDOR_SPECIFIC_IE); - tlv_wmm_parameter->header.len = - wlan_cpu_to_le16(sizeof(bss->param.bss_config.wmm_para)); - memcpy(pmpriv->adapter, tlv_wmm_parameter->wmm_para.ouitype, - bss->param.bss_config.wmm_para.ouitype, - sizeof(tlv_wmm_parameter->wmm_para.ouitype)); - tlv_wmm_parameter->wmm_para.ouisubtype = - bss->param.bss_config.wmm_para.ouisubtype; - tlv_wmm_parameter->wmm_para.version = - bss->param.bss_config.wmm_para.version; - tlv_wmm_parameter->wmm_para.qos_info = - bss->param.bss_config.wmm_para.qos_info; - for (ac = 0; ac < 4; ac++) { - tlv_wmm_parameter->wmm_para.ac_params[ac].aci_aifsn.aifsn = - bss->param.bss_config.wmm_para.ac_params[ac].aci_aifsn.aifsn; - tlv_wmm_parameter->wmm_para.ac_params[ac].aci_aifsn.aci = - bss->param.bss_config.wmm_para.ac_params[ac].aci_aifsn.aci; - tlv_wmm_parameter->wmm_para.ac_params[ac].ecw.ecw_max = - bss->param.bss_config.wmm_para.ac_params[ac].ecw.ecw_max; - tlv_wmm_parameter->wmm_para.ac_params[ac].ecw.ecw_min = - bss->param.bss_config.wmm_para.ac_params[ac].ecw.ecw_min; - tlv_wmm_parameter->wmm_para.ac_params[ac].tx_op_limit = - wlan_cpu_to_le16(bss->param.bss_config.wmm_para.ac_params[ac]. - tx_op_limit); - } - cmd_size += sizeof(MrvlIEtypes_wmm_parameter_t); - tlv += sizeof(MrvlIEtypes_wmm_parameter_t); - } - - cmd->size = (t_u16) wlan_cpu_to_le16(cmd_size); - PRINTM(MCMND, "AP config: cmd_size=%d\n", cmd_size); - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_bss *bss = MNULL; + HostCmd_DS_SYS_CONFIG *sys_config = + (HostCmd_DS_SYS_CONFIG *) & cmd->params.sys_config; + t_u8 *tlv = MNULL; + MrvlIEtypes_MacAddr_t *tlv_mac = MNULL; + MrvlIEtypes_SsIdParamSet_t *tlv_ssid = MNULL; + MrvlIEtypes_beacon_period_t *tlv_beacon_period = MNULL; + MrvlIEtypes_dtim_period_t *tlv_dtim_period = MNULL; + MrvlIEtypes_RatesParamSet_t *tlv_rates = MNULL; + MrvlIEtypes_tx_rate_t *tlv_txrate = MNULL; + MrvlIEtypes_mcbc_rate_t *tlv_mcbc_rate = MNULL; + MrvlIEtypes_tx_power_t *tlv_tx_power = MNULL; + MrvlIEtypes_bcast_ssid_t *tlv_bcast_ssid = MNULL; + MrvlIEtypes_antenna_mode_t *tlv_antenna = MNULL; + MrvlIEtypes_pkt_forward_t *tlv_pkt_forward = MNULL; + MrvlIEtypes_max_sta_count_t *tlv_sta_count = MNULL; + MrvlIEtypes_sta_ageout_t *tlv_sta_ageout = MNULL; + MrvlIEtypes_ps_sta_ageout_t *tlv_ps_sta_ageout = MNULL; + MrvlIEtypes_rts_threshold_t *tlv_rts_threshold = MNULL; + MrvlIEtypes_frag_threshold_t *tlv_frag_threshold = MNULL; + MrvlIEtypes_retry_limit_t *tlv_retry_limit = MNULL; + MrvlIEtypes_eapol_pwk_hsk_timeout_t *tlv_pairwise_timeout = MNULL; + MrvlIEtypes_eapol_pwk_hsk_retries_t *tlv_pairwise_retries = MNULL; + MrvlIEtypes_eapol_gwk_hsk_timeout_t *tlv_groupwise_timeout = MNULL; + MrvlIEtypes_eapol_gwk_hsk_retries_t *tlv_groupwise_retries = MNULL; + MrvlIEtypes_mgmt_ie_passthru_t *tlv_mgmt_ie_passthru = MNULL; + MrvlIEtypes_2040_coex_enable_t *tlv_2040_coex_enable = MNULL; + MrvlIEtypes_mac_filter_t *tlv_mac_filter = MNULL; + MrvlIEtypes_channel_band_t *tlv_chan_band = MNULL; + MrvlIEtypes_ChanListParamSet_t *tlv_chan_list = MNULL; + ChanScanParamSet_t *pscan_chan = MNULL; + MrvlIEtypes_auth_type_t *tlv_auth_type = MNULL; + MrvlIEtypes_encrypt_protocol_t *tlv_encrypt_protocol = MNULL; + MrvlIEtypes_akmp_t *tlv_akmp = MNULL; + MrvlIEtypes_pwk_cipher_t *tlv_pwk_cipher = MNULL; + MrvlIEtypes_gwk_cipher_t *tlv_gwk_cipher = MNULL; + MrvlIEtypes_rsn_replay_prot_t *tlv_rsn_prot = MNULL; + MrvlIEtypes_passphrase_t *tlv_passphrase = MNULL; + MrvlIEtypes_group_rekey_time_t *tlv_rekey_time = MNULL; + MrvlIEtypes_wep_key_t *tlv_wep_key = MNULL; + MrvlIETypes_HTCap_t *tlv_htcap = MNULL; + MrvlIEtypes_wmm_parameter_t *tlv_wmm_parameter = MNULL; + t_u32 cmd_size = 0; + t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; + t_u16 i; + t_u16 ac; + + ENTER(); + if (pioctl_buf == MNULL) { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + bss = (mlan_ds_bss *) pioctl_buf->pbuf; + + cmd->command = wlan_cpu_to_le16(HOST_CMD_APCMD_SYS_CONFIGURE); + sys_config->action = wlan_cpu_to_le16(cmd_action); + cmd_size = sizeof(HostCmd_DS_SYS_CONFIG) - 1 + S_DS_GEN; + + tlv = (t_u8 *) sys_config->tlv_buffer; + if (memcmp + (pmpriv->adapter, zero_mac, &bss->param.bss_config.mac_addr, + MLAN_MAC_ADDR_LENGTH)) { + tlv_mac = (MrvlIEtypes_MacAddr_t *) tlv; + tlv_mac->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_MAC_ADDRESS); + tlv_mac->header.len = wlan_cpu_to_le16(MLAN_MAC_ADDR_LENGTH); + memcpy(pmpriv->adapter, tlv_mac->mac, + &bss->param.bss_config.mac_addr, MLAN_MAC_ADDR_LENGTH); + cmd_size += sizeof(MrvlIEtypes_MacAddr_t); + tlv += sizeof(MrvlIEtypes_MacAddr_t); + } + + if (bss->param.bss_config.ssid.ssid_len) { + tlv_ssid = (MrvlIEtypes_SsIdParamSet_t *) tlv; + tlv_ssid->header.type = wlan_cpu_to_le16(TLV_TYPE_SSID); + tlv_ssid->header.len = + wlan_cpu_to_le16((t_u16) bss->param.bss_config.ssid. + ssid_len); + memcpy(pmpriv->adapter, tlv_ssid->ssid, + bss->param.bss_config.ssid.ssid, + bss->param.bss_config.ssid.ssid_len); + cmd_size += + sizeof(MrvlIEtypesHeader_t) + + bss->param.bss_config.ssid.ssid_len; + tlv += sizeof(MrvlIEtypesHeader_t) + + bss->param.bss_config.ssid.ssid_len; + } + + if ((bss->param.bss_config.beacon_period >= MIN_BEACON_PERIOD) && + (bss->param.bss_config.beacon_period <= MAX_BEACON_PERIOD)) { + tlv_beacon_period = (MrvlIEtypes_beacon_period_t *) tlv; + tlv_beacon_period->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_BEACON_PERIOD); + tlv_beacon_period->header.len = wlan_cpu_to_le16(sizeof(t_u16)); + tlv_beacon_period->beacon_period = + wlan_cpu_to_le16(bss->param.bss_config.beacon_period); + cmd_size += sizeof(MrvlIEtypes_beacon_period_t); + tlv += sizeof(MrvlIEtypes_beacon_period_t); + } + + if ((bss->param.bss_config.dtim_period >= MIN_DTIM_PERIOD) && + (bss->param.bss_config.dtim_period <= MAX_DTIM_PERIOD)) { + tlv_dtim_period = (MrvlIEtypes_dtim_period_t *) tlv; + tlv_dtim_period->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_DTIM_PERIOD); + tlv_dtim_period->header.len = wlan_cpu_to_le16(sizeof(t_u8)); + tlv_dtim_period->dtim_period = + bss->param.bss_config.dtim_period; + cmd_size += sizeof(MrvlIEtypes_dtim_period_t); + tlv += sizeof(MrvlIEtypes_dtim_period_t); + } + + if (bss->param.bss_config.rates[0]) { + tlv_rates = (MrvlIEtypes_RatesParamSet_t *) tlv; + tlv_rates->header.type = wlan_cpu_to_le16(TLV_TYPE_RATES); + for (i = 0; + i < MAX_DATA_RATES && bss->param.bss_config.rates[i]; + i++) { + tlv_rates->rates[i] = bss->param.bss_config.rates[i]; + } + tlv_rates->header.len = wlan_cpu_to_le16(i); + cmd_size += sizeof(MrvlIEtypesHeader_t) + i; + tlv += sizeof(MrvlIEtypesHeader_t) + i; + } + + if (bss->param.bss_config.tx_data_rate <= DATA_RATE_54M) { + tlv_txrate = (MrvlIEtypes_tx_rate_t *) tlv; + tlv_txrate->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_TX_DATA_RATE); + tlv_txrate->header.len = wlan_cpu_to_le16(sizeof(t_u16)); + tlv_txrate->tx_data_rate = + wlan_cpu_to_le16(bss->param.bss_config.tx_data_rate); + cmd_size += sizeof(MrvlIEtypes_tx_rate_t); + tlv += sizeof(MrvlIEtypes_tx_rate_t); + } + + if (bss->param.bss_config.mcbc_data_rate <= DATA_RATE_54M) { + tlv_mcbc_rate = (MrvlIEtypes_mcbc_rate_t *) tlv; + tlv_mcbc_rate->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_MCBC_DATA_RATE); + tlv_mcbc_rate->header.len = wlan_cpu_to_le16(sizeof(t_u16)); + tlv_mcbc_rate->mcbc_data_rate = + wlan_cpu_to_le16(bss->param.bss_config.mcbc_data_rate); + cmd_size += sizeof(MrvlIEtypes_mcbc_rate_t); + tlv += sizeof(MrvlIEtypes_mcbc_rate_t); + } + + if (bss->param.bss_config.tx_power_level <= MAX_TX_POWER) { + tlv_tx_power = (MrvlIEtypes_tx_power_t *) tlv; + tlv_tx_power->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_TX_POWER); + tlv_tx_power->header.len = wlan_cpu_to_le16(sizeof(t_u8)); + tlv_tx_power->tx_power = bss->param.bss_config.tx_power_level; + cmd_size += sizeof(MrvlIEtypes_tx_power_t); + tlv += sizeof(MrvlIEtypes_tx_power_t); + } + + if (bss->param.bss_config.bcast_ssid_ctl <= MTRUE) { + tlv_bcast_ssid = (MrvlIEtypes_bcast_ssid_t *) tlv; + tlv_bcast_ssid->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_BCAST_SSID_CTL); + tlv_bcast_ssid->header.len = wlan_cpu_to_le16(sizeof(t_u8)); + tlv_bcast_ssid->bcast_ssid_ctl = + bss->param.bss_config.bcast_ssid_ctl; + cmd_size += sizeof(MrvlIEtypes_bcast_ssid_t); + tlv += sizeof(MrvlIEtypes_bcast_ssid_t); + } + + if ((bss->param.bss_config.tx_antenna == ANTENNA_MODE_A) || + (bss->param.bss_config.tx_antenna == ANTENNA_MODE_B)) { + tlv_antenna = (MrvlIEtypes_antenna_mode_t *) tlv; + tlv_antenna->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_ANTENNA_CTL); + tlv_antenna->header.len = + wlan_cpu_to_le16(sizeof(t_u8) + sizeof(t_u8)); + tlv_antenna->which_antenna = TX_ANTENNA; + tlv_antenna->antenna_mode = bss->param.bss_config.tx_antenna; + cmd_size += sizeof(MrvlIEtypes_antenna_mode_t); + tlv += sizeof(MrvlIEtypes_antenna_mode_t); + } + + if ((bss->param.bss_config.rx_antenna == ANTENNA_MODE_A) || + (bss->param.bss_config.rx_antenna == ANTENNA_MODE_B)) { + tlv_antenna = (MrvlIEtypes_antenna_mode_t *) tlv; + tlv_antenna->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_ANTENNA_CTL); + tlv_antenna->header.len = + wlan_cpu_to_le16(sizeof(t_u8) + sizeof(t_u8)); + tlv_antenna->which_antenna = RX_ANTENNA; + tlv_antenna->antenna_mode = bss->param.bss_config.rx_antenna; + cmd_size += sizeof(MrvlIEtypes_antenna_mode_t); + tlv += sizeof(MrvlIEtypes_antenna_mode_t); + } + + if (bss->param.bss_config.pkt_forward_ctl <= MAX_PKT_FWD_CTRL) { + tlv_pkt_forward = (MrvlIEtypes_pkt_forward_t *) tlv; + tlv_pkt_forward->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_PKT_FWD_CTL); + tlv_pkt_forward->header.len = wlan_cpu_to_le16(sizeof(t_u8)); + tlv_pkt_forward->pkt_forward_ctl = + bss->param.bss_config.pkt_forward_ctl; + cmd_size += sizeof(MrvlIEtypes_pkt_forward_t); + tlv += sizeof(MrvlIEtypes_pkt_forward_t); + } + + if (bss->param.bss_config.max_sta_count <= MAX_STA_COUNT) { + tlv_sta_count = (MrvlIEtypes_max_sta_count_t *) tlv; + tlv_sta_count->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_MAX_STA_CNT); + tlv_sta_count->header.len = wlan_cpu_to_le16(sizeof(t_u16)); + tlv_sta_count->max_sta_count = + wlan_cpu_to_le16(bss->param.bss_config.max_sta_count); + cmd_size += sizeof(MrvlIEtypes_max_sta_count_t); + tlv += sizeof(MrvlIEtypes_max_sta_count_t); + } + + if (((bss->param.bss_config.sta_ageout_timer >= MIN_STAGE_OUT_TIME) && + (bss->param.bss_config.sta_ageout_timer <= MAX_STAGE_OUT_TIME)) || + (bss->param.bss_config.sta_ageout_timer == 0)) { + tlv_sta_ageout = (MrvlIEtypes_sta_ageout_t *) tlv; + tlv_sta_ageout->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_STA_AGEOUT_TIMER); + tlv_sta_ageout->header.len = wlan_cpu_to_le16(sizeof(t_u32)); + tlv_sta_ageout->sta_ageout_timer = + wlan_cpu_to_le32(bss->param.bss_config. + sta_ageout_timer); + cmd_size += sizeof(MrvlIEtypes_sta_ageout_t); + tlv += sizeof(MrvlIEtypes_sta_ageout_t); + } + + if (((bss->param.bss_config.ps_sta_ageout_timer >= MIN_STAGE_OUT_TIME) + && (bss->param.bss_config.ps_sta_ageout_timer <= + MAX_STAGE_OUT_TIME)) || + (bss->param.bss_config.ps_sta_ageout_timer == 0)) { + tlv_ps_sta_ageout = (MrvlIEtypes_ps_sta_ageout_t *) tlv; + tlv_ps_sta_ageout->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_PS_STA_AGEOUT_TIMER); + tlv_ps_sta_ageout->header.len = wlan_cpu_to_le16(sizeof(t_u32)); + tlv_ps_sta_ageout->ps_sta_ageout_timer = + wlan_cpu_to_le32(bss->param.bss_config. + ps_sta_ageout_timer); + cmd_size += sizeof(MrvlIEtypes_ps_sta_ageout_t); + tlv += sizeof(MrvlIEtypes_ps_sta_ageout_t); + } + if (bss->param.bss_config.rts_threshold <= MAX_RTS_THRESHOLD) { + tlv_rts_threshold = (MrvlIEtypes_rts_threshold_t *) tlv; + tlv_rts_threshold->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_RTS_THRESHOLD); + tlv_rts_threshold->header.len = wlan_cpu_to_le16(sizeof(t_u16)); + tlv_rts_threshold->rts_threshold = + wlan_cpu_to_le16(bss->param.bss_config.rts_threshold); + cmd_size += sizeof(MrvlIEtypes_rts_threshold_t); + tlv += sizeof(MrvlIEtypes_rts_threshold_t); + } + + if ((bss->param.bss_config.frag_threshold >= MIN_FRAG_THRESHOLD) && + (bss->param.bss_config.frag_threshold <= MAX_FRAG_THRESHOLD)) { + tlv_frag_threshold = (MrvlIEtypes_frag_threshold_t *) tlv; + tlv_frag_threshold->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_FRAG_THRESHOLD); + tlv_frag_threshold->header.len = + wlan_cpu_to_le16(sizeof(t_u16)); + tlv_frag_threshold->frag_threshold = + wlan_cpu_to_le16(bss->param.bss_config.frag_threshold); + cmd_size += sizeof(MrvlIEtypes_frag_threshold_t); + tlv += sizeof(MrvlIEtypes_frag_threshold_t); + } + + if (bss->param.bss_config.retry_limit <= MAX_RETRY_LIMIT) { + tlv_retry_limit = (MrvlIEtypes_retry_limit_t *) tlv; + tlv_retry_limit->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_RETRY_LIMIT); + tlv_retry_limit->header.len = wlan_cpu_to_le16(sizeof(t_u8)); + tlv_retry_limit->retry_limit = + (t_u8) bss->param.bss_config.retry_limit; + cmd_size += sizeof(MrvlIEtypes_retry_limit_t); + tlv += sizeof(MrvlIEtypes_retry_limit_t); + } + + if (bss->param.bss_config.pairwise_update_timeout < (MAX_VALID_DWORD)) { + tlv_pairwise_timeout = + (MrvlIEtypes_eapol_pwk_hsk_timeout_t *) tlv; + tlv_pairwise_timeout->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_EAPOL_PWK_HSK_TIMEOUT); + tlv_pairwise_timeout->header.len = + wlan_cpu_to_le16(sizeof(t_u32)); + tlv_pairwise_timeout->pairwise_update_timeout = + wlan_cpu_to_le32(bss->param.bss_config. + pairwise_update_timeout); + cmd_size += sizeof(MrvlIEtypes_eapol_pwk_hsk_timeout_t); + tlv += sizeof(MrvlIEtypes_eapol_pwk_hsk_timeout_t); + } + + if (bss->param.bss_config.pwk_retries < (MAX_VALID_DWORD)) { + tlv_pairwise_retries = + (MrvlIEtypes_eapol_pwk_hsk_retries_t *) tlv; + tlv_pairwise_retries->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_EAPOL_PWK_HSK_RETRIES); + tlv_pairwise_retries->header.len = + wlan_cpu_to_le16(sizeof(t_u32)); + tlv_pairwise_retries->pwk_retries = + wlan_cpu_to_le32(bss->param.bss_config.pwk_retries); + cmd_size += sizeof(MrvlIEtypes_eapol_pwk_hsk_retries_t); + tlv += sizeof(MrvlIEtypes_eapol_pwk_hsk_retries_t); + } + + if (bss->param.bss_config.groupwise_update_timeout < (MAX_VALID_DWORD)) { + tlv_groupwise_timeout = + (MrvlIEtypes_eapol_gwk_hsk_timeout_t *) tlv; + tlv_groupwise_timeout->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_EAPOL_GWK_HSK_TIMEOUT); + tlv_groupwise_timeout->header.len = + wlan_cpu_to_le16(sizeof(t_u32)); + tlv_groupwise_timeout->groupwise_update_timeout = + wlan_cpu_to_le32(bss->param.bss_config. + groupwise_update_timeout); + cmd_size += sizeof(MrvlIEtypes_eapol_gwk_hsk_timeout_t); + tlv += sizeof(MrvlIEtypes_eapol_gwk_hsk_timeout_t); + } + + if (bss->param.bss_config.gwk_retries < (MAX_VALID_DWORD)) { + tlv_groupwise_retries = + (MrvlIEtypes_eapol_gwk_hsk_retries_t *) tlv; + tlv_groupwise_retries->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_EAPOL_GWK_HSK_RETRIES); + tlv_groupwise_retries->header.len = + wlan_cpu_to_le16(sizeof(t_u32)); + tlv_groupwise_retries->gwk_retries = + wlan_cpu_to_le32(bss->param.bss_config.gwk_retries); + cmd_size += sizeof(MrvlIEtypes_eapol_gwk_hsk_retries_t); + tlv += sizeof(MrvlIEtypes_eapol_gwk_hsk_retries_t); + } + + if ((bss->param.bss_config.filter.filter_mode <= + MAC_FILTER_MODE_BLOCK_MAC) + && (bss->param.bss_config.filter.mac_count <= MAX_MAC_FILTER_NUM)) { + tlv_mac_filter = (MrvlIEtypes_mac_filter_t *) tlv; + tlv_mac_filter->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_STA_MAC_ADDR_FILTER); + tlv_mac_filter->header.len = + wlan_cpu_to_le16(2 + + MLAN_MAC_ADDR_LENGTH * + bss->param.bss_config.filter. + mac_count); + tlv_mac_filter->count = + (t_u8) bss->param.bss_config.filter.mac_count; + tlv_mac_filter->filter_mode = + (t_u8) bss->param.bss_config.filter.filter_mode; + memcpy(pmpriv->adapter, tlv_mac_filter->mac_address, + (t_u8 *) bss->param.bss_config.filter.mac_list, + MLAN_MAC_ADDR_LENGTH * + bss->param.bss_config.filter.mac_count); + cmd_size += + sizeof(MrvlIEtypesHeader_t) + 2 + + MLAN_MAC_ADDR_LENGTH * + bss->param.bss_config.filter.mac_count; + tlv += sizeof(MrvlIEtypesHeader_t) + 2 + + MLAN_MAC_ADDR_LENGTH * + bss->param.bss_config.filter.mac_count; + } + + if ((((bss->param.bss_config.band_cfg & BAND_CONFIG_ACS_MODE) == + BAND_CONFIG_MANUAL) && (bss->param.bss_config.channel > 0) && + (bss->param.bss_config.channel <= MLAN_MAX_CHANNEL)) || + (bss->param.bss_config.band_cfg & BAND_CONFIG_ACS_MODE)) { + tlv_chan_band = (MrvlIEtypes_channel_band_t *) tlv; + tlv_chan_band->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_CHAN_BAND_CONFIG); + tlv_chan_band->header.len = + wlan_cpu_to_le16(sizeof(t_u8) + sizeof(t_u8)); + tlv_chan_band->band_config = bss->param.bss_config.band_cfg; + tlv_chan_band->channel = bss->param.bss_config.channel; + cmd_size += sizeof(MrvlIEtypes_channel_band_t); + tlv += sizeof(MrvlIEtypes_channel_band_t); + } + + if ((bss->param.bss_config.num_of_chan) && + (bss->param.bss_config.num_of_chan <= MLAN_MAX_CHANNEL)) { + tlv_chan_list = (MrvlIEtypes_ChanListParamSet_t *) tlv; + tlv_chan_list->header.type = + wlan_cpu_to_le16(TLV_TYPE_CHANLIST); + tlv_chan_list->header.len = + wlan_cpu_to_le16((t_u16) + (sizeof(ChanScanParamSet_t) * + bss->param.bss_config.num_of_chan)); + pscan_chan = tlv_chan_list->chan_scan_param; + for (i = 0; i < bss->param.bss_config.num_of_chan; i++) { + pscan_chan->chan_number = + bss->param.bss_config.chan_list[i].chan_number; + pscan_chan->radio_type = + bss->param.bss_config.chan_list[i]. + band_config_type; + pscan_chan++; + } + cmd_size += sizeof(tlv_chan_list->header) + + (sizeof(ChanScanParamSet_t) * + bss->param.bss_config.num_of_chan); + tlv += sizeof(tlv_chan_list->header) + + (sizeof(ChanScanParamSet_t) * + bss->param.bss_config.num_of_chan); + } + + if ((bss->param.bss_config.auth_mode <= MLAN_AUTH_MODE_SHARED) || + (bss->param.bss_config.auth_mode == MLAN_AUTH_MODE_AUTO)) { + tlv_auth_type = (MrvlIEtypes_auth_type_t *) tlv; + tlv_auth_type->header.type = + wlan_cpu_to_le16(TLV_TYPE_AUTH_TYPE); + tlv_auth_type->header.len = wlan_cpu_to_le16(sizeof(t_u8)); + tlv_auth_type->auth_type = + (t_u8) bss->param.bss_config.auth_mode; + cmd_size += sizeof(MrvlIEtypes_auth_type_t); + tlv += sizeof(MrvlIEtypes_auth_type_t); + } + + if (bss->param.bss_config.protocol) { + tlv_encrypt_protocol = (MrvlIEtypes_encrypt_protocol_t *) tlv; + tlv_encrypt_protocol->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_ENCRYPT_PROTOCOL); + tlv_encrypt_protocol->header.len = + wlan_cpu_to_le16(sizeof(t_u16)); + tlv_encrypt_protocol->protocol = + wlan_cpu_to_le16(bss->param.bss_config.protocol); + cmd_size += sizeof(MrvlIEtypes_encrypt_protocol_t); + tlv += sizeof(MrvlIEtypes_encrypt_protocol_t); + } + + if ((bss->param.bss_config.protocol & PROTOCOL_WPA) || + (bss->param.bss_config.protocol & PROTOCOL_WPA2) || + (bss->param.bss_config.protocol & PROTOCOL_EAP)) { + tlv_akmp = (MrvlIEtypes_akmp_t *) tlv; + tlv_akmp->header.type = wlan_cpu_to_le16(TLV_TYPE_UAP_AKMP); + tlv_akmp->key_mgmt = + wlan_cpu_to_le16(bss->param.bss_config.key_mgmt); + tlv_akmp->header.len = sizeof(t_u16); + tlv_akmp->key_mgmt_operation = + wlan_cpu_to_le16(bss->param.bss_config. + key_mgmt_operation); + tlv_akmp->header.len += sizeof(t_u16); + tlv_akmp->header.len = wlan_cpu_to_le16(tlv_akmp->header.len); + cmd_size += sizeof(MrvlIEtypes_akmp_t); + tlv += sizeof(MrvlIEtypes_akmp_t); + + if (bss->param.bss_config.wpa_cfg. + pairwise_cipher_wpa & VALID_CIPHER_BITMAP) { + tlv_pwk_cipher = (MrvlIEtypes_pwk_cipher_t *) tlv; + tlv_pwk_cipher->header.type = + wlan_cpu_to_le16(TLV_TYPE_PWK_CIPHER); + tlv_pwk_cipher->header.len = + wlan_cpu_to_le16(sizeof(t_u16) + sizeof(t_u8) + + sizeof(t_u8)); + tlv_pwk_cipher->protocol = + wlan_cpu_to_le16(PROTOCOL_WPA); + tlv_pwk_cipher->pairwise_cipher = + bss->param.bss_config.wpa_cfg. + pairwise_cipher_wpa; + cmd_size += sizeof(MrvlIEtypes_pwk_cipher_t); + tlv += sizeof(MrvlIEtypes_pwk_cipher_t); + } + + if (bss->param.bss_config.wpa_cfg. + pairwise_cipher_wpa2 & VALID_CIPHER_BITMAP) { + tlv_pwk_cipher = (MrvlIEtypes_pwk_cipher_t *) tlv; + tlv_pwk_cipher->header.type = + wlan_cpu_to_le16(TLV_TYPE_PWK_CIPHER); + tlv_pwk_cipher->header.len = + wlan_cpu_to_le16(sizeof(t_u16) + sizeof(t_u8) + + sizeof(t_u8)); + tlv_pwk_cipher->protocol = + wlan_cpu_to_le16(PROTOCOL_WPA2); + tlv_pwk_cipher->pairwise_cipher = + bss->param.bss_config.wpa_cfg. + pairwise_cipher_wpa2; + cmd_size += sizeof(MrvlIEtypes_pwk_cipher_t); + tlv += sizeof(MrvlIEtypes_pwk_cipher_t); + } + + if (bss->param.bss_config.wpa_cfg. + group_cipher & VALID_CIPHER_BITMAP) { + tlv_gwk_cipher = (MrvlIEtypes_gwk_cipher_t *) tlv; + tlv_gwk_cipher->header.type = + wlan_cpu_to_le16(TLV_TYPE_GWK_CIPHER); + tlv_gwk_cipher->header.len = + wlan_cpu_to_le16(sizeof(t_u8) + sizeof(t_u8)); + tlv_gwk_cipher->group_cipher = + bss->param.bss_config.wpa_cfg.group_cipher; + cmd_size += sizeof(MrvlIEtypes_gwk_cipher_t); + tlv += sizeof(MrvlIEtypes_gwk_cipher_t); + } + + if (bss->param.bss_config.wpa_cfg.rsn_protection <= MTRUE) { + tlv_rsn_prot = (MrvlIEtypes_rsn_replay_prot_t *) tlv; + tlv_rsn_prot->header.type = + wlan_cpu_to_le16 + (TLV_TYPE_UAP_RSN_REPLAY_PROTECT); + tlv_rsn_prot->header.len = + wlan_cpu_to_le16(sizeof(t_u8)); + tlv_rsn_prot->rsn_replay_prot = + bss->param.bss_config.wpa_cfg.rsn_protection; + cmd_size += sizeof(MrvlIEtypes_rsn_replay_prot_t); + tlv += sizeof(MrvlIEtypes_rsn_replay_prot_t); + } + + if (bss->param.bss_config.wpa_cfg.length) { + tlv_passphrase = (MrvlIEtypes_passphrase_t *) tlv; + tlv_passphrase->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_WPA_PASSPHRASE); + tlv_passphrase->header.len = + (t_u16) wlan_cpu_to_le16(bss->param.bss_config. + wpa_cfg.length); + memcpy(pmpriv->adapter, tlv_passphrase->passphrase, + bss->param.bss_config.wpa_cfg.passphrase, + bss->param.bss_config.wpa_cfg.length); + cmd_size += + sizeof(MrvlIEtypesHeader_t) + + bss->param.bss_config.wpa_cfg.length; + tlv += sizeof(MrvlIEtypesHeader_t) + + bss->param.bss_config.wpa_cfg.length; + } + + if (bss->param.bss_config.wpa_cfg.gk_rekey_time < MAX_GRP_TIMER) { + tlv_rekey_time = (MrvlIEtypes_group_rekey_time_t *) tlv; + tlv_rekey_time->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_GRP_REKEY_TIME); + tlv_rekey_time->header.len = + wlan_cpu_to_le16(sizeof(t_u32)); + tlv_rekey_time->gk_rekey_time = + wlan_cpu_to_le32(bss->param.bss_config.wpa_cfg. + gk_rekey_time); + cmd_size += sizeof(MrvlIEtypes_group_rekey_time_t); + tlv += sizeof(MrvlIEtypes_group_rekey_time_t); + } + } else { + if ((bss->param.bss_config.wep_cfg.key0.length) && + ((bss->param.bss_config.wep_cfg.key0.length == 5) || + (bss->param.bss_config.wep_cfg.key0.length == 10) || + (bss->param.bss_config.wep_cfg.key0.length == 13) || + (bss->param.bss_config.wep_cfg.key0.length == 26))) { + tlv_wep_key = (MrvlIEtypes_wep_key_t *) tlv; + tlv_wep_key->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_WEP_KEY); + tlv_wep_key->header.len = + wlan_cpu_to_le16(2 + + bss->param.bss_config.wep_cfg. + key0.length); + tlv_wep_key->key_index = + bss->param.bss_config.wep_cfg.key0.key_index; + tlv_wep_key->is_default = + bss->param.bss_config.wep_cfg.key0.is_default; + memcpy(pmpriv->adapter, tlv_wep_key->key, + bss->param.bss_config.wep_cfg.key0.key, + bss->param.bss_config.wep_cfg.key0.length); + cmd_size += + sizeof(MrvlIEtypesHeader_t) + 2 + + bss->param.bss_config.wep_cfg.key0.length; + tlv += sizeof(MrvlIEtypesHeader_t) + 2 + + bss->param.bss_config.wep_cfg.key0.length; + } + + if ((bss->param.bss_config.wep_cfg.key1.length) && + ((bss->param.bss_config.wep_cfg.key1.length == 5) || + (bss->param.bss_config.wep_cfg.key1.length == 10) || + (bss->param.bss_config.wep_cfg.key1.length == 13) || + (bss->param.bss_config.wep_cfg.key1.length == 26))) { + tlv_wep_key = (MrvlIEtypes_wep_key_t *) tlv; + tlv_wep_key->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_WEP_KEY); + tlv_wep_key->header.len = + wlan_cpu_to_le16(2 + + bss->param.bss_config.wep_cfg. + key1.length); + tlv_wep_key->key_index = + bss->param.bss_config.wep_cfg.key1.key_index; + tlv_wep_key->is_default = + bss->param.bss_config.wep_cfg.key1.is_default; + memcpy(pmpriv->adapter, tlv_wep_key->key, + bss->param.bss_config.wep_cfg.key1.key, + bss->param.bss_config.wep_cfg.key1.length); + cmd_size += + sizeof(MrvlIEtypesHeader_t) + 2 + + bss->param.bss_config.wep_cfg.key1.length; + tlv += sizeof(MrvlIEtypesHeader_t) + 2 + + bss->param.bss_config.wep_cfg.key1.length; + } + + if ((bss->param.bss_config.wep_cfg.key2.length) && + ((bss->param.bss_config.wep_cfg.key2.length == 5) || + (bss->param.bss_config.wep_cfg.key2.length == 10) || + (bss->param.bss_config.wep_cfg.key2.length == 13) || + (bss->param.bss_config.wep_cfg.key2.length == 26))) { + tlv_wep_key = (MrvlIEtypes_wep_key_t *) tlv; + tlv_wep_key->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_WEP_KEY); + tlv_wep_key->header.len = + wlan_cpu_to_le16(2 + + bss->param.bss_config.wep_cfg. + key2.length); + tlv_wep_key->key_index = + bss->param.bss_config.wep_cfg.key2.key_index; + tlv_wep_key->is_default = + bss->param.bss_config.wep_cfg.key2.is_default; + memcpy(pmpriv->adapter, tlv_wep_key->key, + bss->param.bss_config.wep_cfg.key2.key, + bss->param.bss_config.wep_cfg.key2.length); + cmd_size += + sizeof(MrvlIEtypesHeader_t) + 2 + + bss->param.bss_config.wep_cfg.key2.length; + tlv += sizeof(MrvlIEtypesHeader_t) + 2 + + bss->param.bss_config.wep_cfg.key2.length; + } + + if ((bss->param.bss_config.wep_cfg.key3.length) && + ((bss->param.bss_config.wep_cfg.key3.length == 5) || + (bss->param.bss_config.wep_cfg.key3.length == 10) || + (bss->param.bss_config.wep_cfg.key3.length == 13) || + (bss->param.bss_config.wep_cfg.key3.length == 26))) { + tlv_wep_key = (MrvlIEtypes_wep_key_t *) tlv; + tlv_wep_key->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_WEP_KEY); + tlv_wep_key->header.len = + wlan_cpu_to_le16(2 + + bss->param.bss_config.wep_cfg. + key3.length); + tlv_wep_key->key_index = + bss->param.bss_config.wep_cfg.key3.key_index; + tlv_wep_key->is_default = + bss->param.bss_config.wep_cfg.key3.is_default; + memcpy(pmpriv->adapter, tlv_wep_key->key, + bss->param.bss_config.wep_cfg.key3.key, + bss->param.bss_config.wep_cfg.key3.length); + cmd_size += + sizeof(MrvlIEtypesHeader_t) + 2 + + bss->param.bss_config.wep_cfg.key3.length; + tlv += sizeof(MrvlIEtypesHeader_t) + 2 + + bss->param.bss_config.wep_cfg.key3.length; + } + } + if ((bss->param.bss_config.ht_cap_info) + ) { + tlv_htcap = (MrvlIETypes_HTCap_t *) tlv; + tlv_htcap->header.type = wlan_cpu_to_le16(HT_CAPABILITY); + tlv_htcap->header.len = wlan_cpu_to_le16(sizeof(HTCap_t)); + tlv_htcap->ht_cap.ht_cap_info = + wlan_cpu_to_le16(bss->param.bss_config.ht_cap_info); + tlv_htcap->ht_cap.ampdu_param = + bss->param.bss_config.ampdu_param; + memcpy(pmpriv->adapter, tlv_htcap->ht_cap.supported_mcs_set, + bss->param.bss_config.supported_mcs_set, 16); + tlv_htcap->ht_cap.ht_ext_cap = + wlan_cpu_to_le16(bss->param.bss_config.ht_ext_cap); + tlv_htcap->ht_cap.tx_bf_cap = + wlan_cpu_to_le32(bss->param.bss_config.tx_bf_cap); + tlv_htcap->ht_cap.asel = bss->param.bss_config.asel; + cmd_size += sizeof(MrvlIETypes_HTCap_t); + tlv += sizeof(MrvlIETypes_HTCap_t); + } + if (bss->param.bss_config.mgmt_ie_passthru_mask < (MAX_VALID_DWORD)) { + tlv_mgmt_ie_passthru = (MrvlIEtypes_mgmt_ie_passthru_t *) tlv; + tlv_mgmt_ie_passthru->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_MGMT_IE_PASSTHRU_MASK); + tlv_mgmt_ie_passthru->header.len = + wlan_cpu_to_le16(sizeof(t_u32)); + /* keep copy in private data */ + pmpriv->mgmt_frame_passthru_mask = + bss->param.bss_config.mgmt_ie_passthru_mask; + tlv_mgmt_ie_passthru->mgmt_ie_mask = + wlan_cpu_to_le32(bss->param.bss_config. + mgmt_ie_passthru_mask); + cmd_size += sizeof(MrvlIEtypes_mgmt_ie_passthru_t); + tlv += sizeof(MrvlIEtypes_mgmt_ie_passthru_t); + } + if (((bss->param.bss_config.enable_2040coex == 0) || + (bss->param.bss_config.enable_2040coex == 1)) + ) { + tlv_2040_coex_enable = (MrvlIEtypes_2040_coex_enable_t *) tlv; + tlv_2040_coex_enable->header.type = + wlan_cpu_to_le16(TLV_TYPE_2040_BSS_COEX_CONTROL); + tlv_2040_coex_enable->header.len = + wlan_cpu_to_le16(sizeof(t_u8)); + tlv_2040_coex_enable->enable_2040coex = + bss->param.bss_config.enable_2040coex; + cmd_size += sizeof(MrvlIEtypes_2040_coex_enable_t); + tlv += sizeof(MrvlIEtypes_2040_coex_enable_t); + } + if (bss->param.bss_config.wmm_para.qos_info == 0x80 || + bss->param.bss_config.wmm_para.qos_info == 0x00) { + tlv_wmm_parameter = (MrvlIEtypes_wmm_parameter_t *) tlv; + tlv_wmm_parameter->header.type = + wlan_cpu_to_le16(TLV_TYPE_VENDOR_SPECIFIC_IE); + tlv_wmm_parameter->header.len = + wlan_cpu_to_le16(sizeof + (bss->param.bss_config.wmm_para)); + memcpy(pmpriv->adapter, tlv_wmm_parameter->wmm_para.ouitype, + bss->param.bss_config.wmm_para.ouitype, + sizeof(tlv_wmm_parameter->wmm_para.ouitype)); + tlv_wmm_parameter->wmm_para.ouisubtype = + bss->param.bss_config.wmm_para.ouisubtype; + tlv_wmm_parameter->wmm_para.version = + bss->param.bss_config.wmm_para.version; + tlv_wmm_parameter->wmm_para.qos_info = + bss->param.bss_config.wmm_para.qos_info; + for (ac = 0; ac < 4; ac++) { + tlv_wmm_parameter->wmm_para.ac_params[ac].aci_aifsn. + aifsn = + bss->param.bss_config.wmm_para.ac_params[ac]. + aci_aifsn.aifsn; + tlv_wmm_parameter->wmm_para.ac_params[ac].aci_aifsn. + aci = + bss->param.bss_config.wmm_para.ac_params[ac]. + aci_aifsn.aci; + tlv_wmm_parameter->wmm_para.ac_params[ac].ecw.ecw_max = + bss->param.bss_config.wmm_para.ac_params[ac]. + ecw.ecw_max; + tlv_wmm_parameter->wmm_para.ac_params[ac].ecw.ecw_min = + bss->param.bss_config.wmm_para.ac_params[ac]. + ecw.ecw_min; + tlv_wmm_parameter->wmm_para.ac_params[ac].tx_op_limit = + wlan_cpu_to_le16(bss->param.bss_config.wmm_para. + ac_params[ac].tx_op_limit); + } + cmd_size += sizeof(MrvlIEtypes_wmm_parameter_t); + tlv += sizeof(MrvlIEtypes_wmm_parameter_t); + } + + cmd->size = (t_u16) wlan_cpu_to_le16(cmd_size); + PRINTM(MCMND, "AP config: cmd_size=%d\n", cmd_size); + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** * @brief This function prepares command of sys_config - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action the action: GET or SET - * @param pioctl_buf A pointer to mlan_ioctl_req structure + * @param pioctl_buf A pointer to mlan_ioctl_req structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ static mlan_status wlan_uap_cmd_sys_configure(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, - IN pmlan_ioctl_req pioctl_buf, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, + IN pmlan_ioctl_req pioctl_buf, IN t_void * pdata_buf) { - mlan_ds_bss *bss = MNULL; - HostCmd_DS_SYS_CONFIG *sys_config = - (HostCmd_DS_SYS_CONFIG *) & cmd->params.sys_config; - MrvlIEtypes_MacAddr_t *mac_tlv = MNULL; - MrvlIEtypes_channel_band_t *chan_band_tlv = MNULL, *pdat_tlv_cb = MNULL; - MrvlIEtypes_beacon_period_t *bcn_pd_tlv = MNULL, *pdat_tlv_bcnpd = MNULL; - MrvlIEtypes_dtim_period_t *dtim_pd_tlv = MNULL, *pdat_tlv_dtimpd = MNULL; - mlan_ds_misc_custom_ie *cust_ie = MNULL; - mlan_ds_misc_cfg *misc = MNULL; - MrvlIEtypesHeader_t *ie_header = - (MrvlIEtypesHeader_t *) sys_config->tlv_buffer; - t_u8 *ie = (t_u8 *) sys_config->tlv_buffer + sizeof(MrvlIEtypesHeader_t); - t_u16 req_len = 0, travel_len = 0; - custom_ie *cptr = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HOST_CMD_APCMD_SYS_CONFIGURE); - sys_config->action = wlan_cpu_to_le16(cmd_action); - cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_SYS_CONFIG) - 1 + S_DS_GEN); - if (pioctl_buf == MNULL) { - if (pdata_buf) { - switch (*(t_u16 *) pdata_buf) { - case TLV_TYPE_UAP_CHAN_BAND_CONFIG: - pdat_tlv_cb = (MrvlIEtypes_channel_band_t *) pdata_buf; - chan_band_tlv = - (MrvlIEtypes_channel_band_t *) sys_config->tlv_buffer; - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_SYS_CONFIG) - 1 + - S_DS_GEN + - sizeof(MrvlIEtypes_channel_band_t)); - chan_band_tlv->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_CHAN_BAND_CONFIG); - chan_band_tlv->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_channel_band_t) - - sizeof(MrvlIEtypesHeader_t)); - if (cmd_action) { - chan_band_tlv->band_config = pdat_tlv_cb->band_config; - chan_band_tlv->channel = pdat_tlv_cb->channel; - } - ret = MLAN_STATUS_SUCCESS; - break; - case TLV_TYPE_UAP_BEACON_PERIOD: - pdat_tlv_bcnpd = (MrvlIEtypes_beacon_period_t *) pdata_buf; - bcn_pd_tlv = - (MrvlIEtypes_beacon_period_t *) sys_config->tlv_buffer; - cmd->size = - sizeof(HostCmd_DS_SYS_CONFIG) - 1 + S_DS_GEN + - sizeof(MrvlIEtypes_beacon_period_t); - bcn_pd_tlv->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_BEACON_PERIOD); - bcn_pd_tlv->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_beacon_period_t) - - sizeof(MrvlIEtypesHeader_t)); - if (cmd_action) { - bcn_pd_tlv->beacon_period = - wlan_cpu_to_le16(pdat_tlv_bcnpd->beacon_period); - } - /* Add TLV_UAP_DTIM_PERIOD if it follws in pdata_buf */ - pdat_tlv_dtimpd = - (MrvlIEtypes_dtim_period_t *) (((t_u8 *) pdata_buf) - + - sizeof - (MrvlIEtypes_beacon_period_t)); - if (TLV_TYPE_UAP_DTIM_PERIOD == pdat_tlv_dtimpd->header.type) { - dtim_pd_tlv = - (MrvlIEtypes_dtim_period_t *) (sys_config->tlv_buffer + - sizeof - (MrvlIEtypes_beacon_period_t)); - cmd->size += sizeof(MrvlIEtypes_dtim_period_t); - dtim_pd_tlv->header.type = - wlan_cpu_to_le16(TLV_TYPE_UAP_DTIM_PERIOD); - dtim_pd_tlv->header.len = - wlan_cpu_to_le16(sizeof(MrvlIEtypes_dtim_period_t) - - sizeof(MrvlIEtypesHeader_t)); - if (cmd_action) { - dtim_pd_tlv->dtim_period = pdat_tlv_dtimpd->dtim_period; - } - } - /* Finalize cmd size */ - cmd->size = wlan_cpu_to_le16(cmd->size); - ret = MLAN_STATUS_SUCCESS; - break; - case TLV_TYPE_MGMT_IE: - cust_ie = (mlan_ds_misc_custom_ie *) pdata_buf; - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_SYS_CONFIG) - 1 + - S_DS_GEN + sizeof(MrvlIEtypesHeader_t) + - cust_ie->len); - ie_header->type = wlan_cpu_to_le16(TLV_TYPE_MGMT_IE); - ie_header->len = wlan_cpu_to_le16(cust_ie->len); - - if (ie && cust_ie->ie_data_list) { - req_len = cust_ie->len; - travel_len = 0; - /* conversion for index, mask, len */ - if (req_len == sizeof(t_u16)) - cust_ie->ie_data_list[0].ie_index = - wlan_cpu_to_le16(cust_ie->ie_data_list[0].ie_index); - while (req_len > sizeof(t_u16)) { - cptr = - (custom_ie *) (((t_u8 *) & cust_ie->ie_data_list) + - travel_len); - travel_len += - cptr->ie_length + sizeof(custom_ie) - MAX_IE_SIZE; - req_len -= - cptr->ie_length + sizeof(custom_ie) - MAX_IE_SIZE; - cptr->ie_index = wlan_cpu_to_le16(cptr->ie_index); - cptr->mgmt_subtype_mask = - wlan_cpu_to_le16(cptr->mgmt_subtype_mask); - cptr->ie_length = wlan_cpu_to_le16(cptr->ie_length); - } - memcpy(pmpriv->adapter, ie, cust_ie->ie_data_list, - cust_ie->len); - } - break; - default: - PRINTM(MERROR, - "Wrong data, or missing TLV_TYPE 0x%04x handler.\n", - *(t_u16 *) pdata_buf); - break; - } - goto done; - } else { - mac_tlv = (MrvlIEtypes_MacAddr_t *) sys_config->tlv_buffer; - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_SYS_CONFIG) - 1 + S_DS_GEN + - sizeof(MrvlIEtypes_MacAddr_t)); - mac_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_UAP_MAC_ADDRESS); - mac_tlv->header.len = wlan_cpu_to_le16(MLAN_MAC_ADDR_LENGTH); - ret = MLAN_STATUS_SUCCESS; - goto done; - } - } - if (pioctl_buf->req_id == MLAN_IOCTL_BSS) { - bss = (mlan_ds_bss *) pioctl_buf->pbuf; - if (bss->sub_command == MLAN_OID_BSS_MAC_ADDR) { - mac_tlv = (MrvlIEtypes_MacAddr_t *) sys_config->tlv_buffer; - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_SYS_CONFIG) - 1 + S_DS_GEN + - sizeof(MrvlIEtypes_MacAddr_t)); - mac_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_UAP_MAC_ADDRESS); - mac_tlv->header.len = wlan_cpu_to_le16(MLAN_MAC_ADDR_LENGTH); - if (cmd_action == HostCmd_ACT_GEN_SET) - memcpy(pmpriv->adapter, mac_tlv->mac, &bss->param.mac_addr, - MLAN_MAC_ADDR_LENGTH); - } else if ((bss->sub_command == MLAN_OID_UAP_BSS_CONFIG) && - (cmd_action == HostCmd_ACT_GEN_SET)) { - ret = wlan_uap_cmd_ap_config(pmpriv, cmd, cmd_action, pioctl_buf); - goto done; - } - } else if (pioctl_buf->req_id == MLAN_IOCTL_MISC_CFG) { - misc = (mlan_ds_misc_cfg *) pioctl_buf->pbuf; - if ((misc->sub_command == MLAN_OID_MISC_GEN_IE) && - (misc->param.gen_ie.type == MLAN_IE_TYPE_GEN_IE) - ) { - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_SYS_CONFIG) - 1 + S_DS_GEN + - sizeof(MrvlIEtypesHeader_t) + - misc->param.gen_ie.len); - ie_header->type = wlan_cpu_to_le16(TLV_TYPE_WAPI_IE); - ie_header->len = wlan_cpu_to_le16(misc->param.gen_ie.len); - if (cmd_action == HostCmd_ACT_GEN_SET) - memcpy(pmpriv->adapter, ie, misc->param.gen_ie.ie_data, - misc->param.gen_ie.len); - } - if ((misc->sub_command == MLAN_OID_MISC_CUSTOM_IE) && - (misc->param.cust_ie.type == TLV_TYPE_MGMT_IE)) { - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_SYS_CONFIG) - 1 + S_DS_GEN + - sizeof(MrvlIEtypesHeader_t) + - misc->param.cust_ie.len); - ie_header->type = wlan_cpu_to_le16(TLV_TYPE_MGMT_IE); - ie_header->len = wlan_cpu_to_le16(misc->param.cust_ie.len); - - if (ie && misc->param.cust_ie.ie_data_list) { - req_len = misc->param.cust_ie.len; - travel_len = 0; - /* conversion for index, mask, len */ - if (req_len == sizeof(t_u16)) - misc->param.cust_ie.ie_data_list[0].ie_index = - wlan_cpu_to_le16(misc->param.cust_ie.ie_data_list[0]. - ie_index); - while (req_len > sizeof(t_u16)) { - cptr = - (custom_ie - *) (((t_u8 *) & misc->param.cust_ie.ie_data_list) + - travel_len); - travel_len += - cptr->ie_length + sizeof(custom_ie) - MAX_IE_SIZE; - req_len -= - cptr->ie_length + sizeof(custom_ie) - MAX_IE_SIZE; - cptr->ie_index = wlan_cpu_to_le16(cptr->ie_index); - cptr->mgmt_subtype_mask = - wlan_cpu_to_le16(cptr->mgmt_subtype_mask); - cptr->ie_length = wlan_cpu_to_le16(cptr->ie_length); - } - if (misc->param.cust_ie.len) - memcpy(pmpriv->adapter, ie, - misc->param.cust_ie.ie_data_list, - misc->param.cust_ie.len); - } - } - } - done: - LEAVE(); - return ret; + mlan_ds_bss *bss = MNULL; + HostCmd_DS_SYS_CONFIG *sys_config = + (HostCmd_DS_SYS_CONFIG *) & cmd->params.sys_config; + MrvlIEtypes_MacAddr_t *mac_tlv = MNULL; + MrvlIEtypes_channel_band_t *chan_band_tlv = MNULL, *pdat_tlv_cb = MNULL; + MrvlIEtypes_beacon_period_t *bcn_pd_tlv = MNULL, *pdat_tlv_bcnpd = + MNULL; + MrvlIEtypes_dtim_period_t *dtim_pd_tlv = MNULL, *pdat_tlv_dtimpd = + MNULL; + mlan_ds_misc_custom_ie *cust_ie = MNULL; + mlan_ds_misc_cfg *misc = MNULL; + MrvlIEtypesHeader_t *ie_header = + (MrvlIEtypesHeader_t *) sys_config->tlv_buffer; + t_u8 *ie = + (t_u8 *) sys_config->tlv_buffer + sizeof(MrvlIEtypesHeader_t); + t_u16 req_len = 0, travel_len = 0; + custom_ie *cptr = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HOST_CMD_APCMD_SYS_CONFIGURE); + sys_config->action = wlan_cpu_to_le16(cmd_action); + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_SYS_CONFIG) - 1 + S_DS_GEN); + if (pioctl_buf == MNULL) { + if (pdata_buf) { + switch (*(t_u16 *) pdata_buf) { + case TLV_TYPE_UAP_CHAN_BAND_CONFIG: + pdat_tlv_cb = + (MrvlIEtypes_channel_band_t *) + pdata_buf; + chan_band_tlv = + (MrvlIEtypes_channel_band_t *) + sys_config->tlv_buffer; + cmd->size = + wlan_cpu_to_le16(sizeof + (HostCmd_DS_SYS_CONFIG) + - 1 + S_DS_GEN + + sizeof + (MrvlIEtypes_channel_band_t)); + chan_band_tlv->header.type = + wlan_cpu_to_le16 + (TLV_TYPE_UAP_CHAN_BAND_CONFIG); + chan_band_tlv->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_channel_band_t) + - + sizeof + (MrvlIEtypesHeader_t)); + if (cmd_action) { + chan_band_tlv->band_config = + pdat_tlv_cb->band_config; + chan_band_tlv->channel = + pdat_tlv_cb->channel; + } + ret = MLAN_STATUS_SUCCESS; + break; + case TLV_TYPE_UAP_BEACON_PERIOD: + pdat_tlv_bcnpd = + (MrvlIEtypes_beacon_period_t *) + pdata_buf; + bcn_pd_tlv = + (MrvlIEtypes_beacon_period_t *) + sys_config->tlv_buffer; + cmd->size = + sizeof(HostCmd_DS_SYS_CONFIG) - 1 + + S_DS_GEN + + sizeof(MrvlIEtypes_beacon_period_t); + bcn_pd_tlv->header.type = + wlan_cpu_to_le16 + (TLV_TYPE_UAP_BEACON_PERIOD); + bcn_pd_tlv->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_beacon_period_t) + - + sizeof + (MrvlIEtypesHeader_t)); + if (cmd_action) { + bcn_pd_tlv->beacon_period = + wlan_cpu_to_le16 + (pdat_tlv_bcnpd->beacon_period); + } + /* Add TLV_UAP_DTIM_PERIOD if it follws in + pdata_buf */ + pdat_tlv_dtimpd = + (MrvlIEtypes_dtim_period_t + *) (((t_u8 *) pdata_buf) + + + sizeof + (MrvlIEtypes_beacon_period_t)); + if (TLV_TYPE_UAP_DTIM_PERIOD == + pdat_tlv_dtimpd->header.type) { + dtim_pd_tlv = + (MrvlIEtypes_dtim_period_t + *) (sys_config->tlv_buffer + + sizeof + (MrvlIEtypes_beacon_period_t)); + cmd->size += + sizeof + (MrvlIEtypes_dtim_period_t); + dtim_pd_tlv->header.type = + wlan_cpu_to_le16 + (TLV_TYPE_UAP_DTIM_PERIOD); + dtim_pd_tlv->header.len = + wlan_cpu_to_le16(sizeof + (MrvlIEtypes_dtim_period_t) + - + sizeof + (MrvlIEtypesHeader_t)); + if (cmd_action) { + dtim_pd_tlv->dtim_period = + pdat_tlv_dtimpd-> + dtim_period; + } + } + /* Finalize cmd size */ + cmd->size = wlan_cpu_to_le16(cmd->size); + ret = MLAN_STATUS_SUCCESS; + break; + case TLV_TYPE_MGMT_IE: + cust_ie = (mlan_ds_misc_custom_ie *) pdata_buf; + cmd->size = + wlan_cpu_to_le16(sizeof + (HostCmd_DS_SYS_CONFIG) + - 1 + S_DS_GEN + + sizeof + (MrvlIEtypesHeader_t) + + cust_ie->len); + ie_header->type = + wlan_cpu_to_le16(TLV_TYPE_MGMT_IE); + ie_header->len = wlan_cpu_to_le16(cust_ie->len); + + if (ie && cust_ie->ie_data_list) { + req_len = cust_ie->len; + travel_len = 0; + /* conversion for index, mask, len */ + if (req_len == sizeof(t_u16)) + cust_ie->ie_data_list[0]. + ie_index = + wlan_cpu_to_le16 + (cust_ie-> + ie_data_list[0]. + ie_index); + while (req_len > sizeof(t_u16)) { + cptr = (custom_ie + *) (((t_u8 *) & + cust_ie-> + ie_data_list) + + travel_len); + travel_len += + cptr->ie_length + + sizeof(custom_ie) - + MAX_IE_SIZE; + req_len -= + cptr->ie_length + + sizeof(custom_ie) - + MAX_IE_SIZE; + cptr->ie_index = + wlan_cpu_to_le16(cptr-> + ie_index); + cptr->mgmt_subtype_mask = + wlan_cpu_to_le16(cptr-> + mgmt_subtype_mask); + cptr->ie_length = + wlan_cpu_to_le16(cptr-> + ie_length); + } + memcpy(pmpriv->adapter, ie, + cust_ie->ie_data_list, + cust_ie->len); + } + break; + default: + PRINTM(MERROR, + "Wrong data, or missing TLV_TYPE 0x%04x handler.\n", + *(t_u16 *) pdata_buf); + break; + } + goto done; + } else { + mac_tlv = + (MrvlIEtypes_MacAddr_t *) sys_config-> + tlv_buffer; + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_SYS_CONFIG) - + 1 + S_DS_GEN + + sizeof(MrvlIEtypes_MacAddr_t)); + mac_tlv->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_MAC_ADDRESS); + mac_tlv->header.len = + wlan_cpu_to_le16(MLAN_MAC_ADDR_LENGTH); + ret = MLAN_STATUS_SUCCESS; + goto done; + } + } + if (pioctl_buf->req_id == MLAN_IOCTL_BSS) { + bss = (mlan_ds_bss *) pioctl_buf->pbuf; + if (bss->sub_command == MLAN_OID_BSS_MAC_ADDR) { + mac_tlv = + (MrvlIEtypes_MacAddr_t *) sys_config-> + tlv_buffer; + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_SYS_CONFIG) - + 1 + S_DS_GEN + + sizeof(MrvlIEtypes_MacAddr_t)); + mac_tlv->header.type = + wlan_cpu_to_le16(TLV_TYPE_UAP_MAC_ADDRESS); + mac_tlv->header.len = + wlan_cpu_to_le16(MLAN_MAC_ADDR_LENGTH); + if (cmd_action == HostCmd_ACT_GEN_SET) + memcpy(pmpriv->adapter, mac_tlv->mac, + &bss->param.mac_addr, + MLAN_MAC_ADDR_LENGTH); + } else if ((bss->sub_command == MLAN_OID_UAP_BSS_CONFIG) && + (cmd_action == HostCmd_ACT_GEN_SET)) { + ret = wlan_uap_cmd_ap_config(pmpriv, cmd, cmd_action, + pioctl_buf); + goto done; + } + } else if (pioctl_buf->req_id == MLAN_IOCTL_MISC_CFG) { + misc = (mlan_ds_misc_cfg *) pioctl_buf->pbuf; + if ((misc->sub_command == MLAN_OID_MISC_GEN_IE) && + (misc->param.gen_ie.type == MLAN_IE_TYPE_GEN_IE) + ) { + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_SYS_CONFIG) - + 1 + S_DS_GEN + + sizeof(MrvlIEtypesHeader_t) + + misc->param.gen_ie.len); + ie_header->type = wlan_cpu_to_le16(TLV_TYPE_WAPI_IE); + ie_header->len = + wlan_cpu_to_le16(misc->param.gen_ie.len); + if (cmd_action == HostCmd_ACT_GEN_SET) + memcpy(pmpriv->adapter, ie, + misc->param.gen_ie.ie_data, + misc->param.gen_ie.len); + } + if ((misc->sub_command == MLAN_OID_MISC_CUSTOM_IE) && + (misc->param.cust_ie.type == TLV_TYPE_MGMT_IE)) { + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_SYS_CONFIG) - + 1 + S_DS_GEN + + sizeof(MrvlIEtypesHeader_t) + + misc->param.cust_ie.len); + ie_header->type = wlan_cpu_to_le16(TLV_TYPE_MGMT_IE); + ie_header->len = + wlan_cpu_to_le16(misc->param.cust_ie.len); + + if (ie && misc->param.cust_ie.ie_data_list) { + req_len = misc->param.cust_ie.len; + travel_len = 0; + /* conversion for index, mask, len */ + if (req_len == sizeof(t_u16)) + misc->param.cust_ie.ie_data_list[0]. + ie_index = + wlan_cpu_to_le16(misc->param. + cust_ie. + ie_data_list + [0].ie_index); + while (req_len > sizeof(t_u16)) { + cptr = (custom_ie + *) (((t_u8 *) & misc->param. + cust_ie.ie_data_list) + + travel_len); + travel_len += + cptr->ie_length + + sizeof(custom_ie) - MAX_IE_SIZE; + req_len -= + cptr->ie_length + + sizeof(custom_ie) - MAX_IE_SIZE; + cptr->ie_index = + wlan_cpu_to_le16(cptr-> + ie_index); + cptr->mgmt_subtype_mask = + wlan_cpu_to_le16(cptr-> + mgmt_subtype_mask); + cptr->ie_length = + wlan_cpu_to_le16(cptr-> + ie_length); + } + if (misc->param.cust_ie.len) + memcpy(pmpriv->adapter, ie, + misc->param.cust_ie.ie_data_list, + misc->param.cust_ie.len); + } + } + } +done: + LEAVE(); + return ret; } -/** +/** * @brief This function handles command resp for get uap settings - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND - * @param pioctl_buf A pointer to mlan_ioctl_req structure + * @param pioctl_buf A pointer to mlan_ioctl_req structure * * @return MLAN_STATUS_SUCCESS */ static mlan_status wlan_uap_ret_cmd_ap_config(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_SYS_CONFIG *sys_config = - (HostCmd_DS_SYS_CONFIG *) & resp->params.sys_config; - mlan_ds_bss *bss = MNULL; - MrvlIEtypesHeader_t *tlv = MNULL; - t_u16 tlv_buf_left = 0; - t_u16 tlv_type = 0; - t_u16 tlv_len = 0; - MrvlIEtypes_MacAddr_t *tlv_mac = MNULL; - MrvlIEtypes_SsIdParamSet_t *tlv_ssid = MNULL; - MrvlIEtypes_beacon_period_t *tlv_beacon_period = MNULL; - MrvlIEtypes_dtim_period_t *tlv_dtim_period = MNULL; - MrvlIEtypes_RatesParamSet_t *tlv_rates = MNULL; - MrvlIEtypes_tx_rate_t *tlv_txrate = MNULL; - MrvlIEtypes_mcbc_rate_t *tlv_mcbc_rate = MNULL; - MrvlIEtypes_tx_power_t *tlv_tx_power = MNULL; - MrvlIEtypes_bcast_ssid_t *tlv_bcast_ssid = MNULL; - MrvlIEtypes_antenna_mode_t *tlv_antenna = MNULL; - MrvlIEtypes_pkt_forward_t *tlv_pkt_forward = MNULL; - MrvlIEtypes_max_sta_count_t *tlv_sta_count = MNULL; - MrvlIEtypes_sta_ageout_t *tlv_sta_ageout = MNULL; - MrvlIEtypes_ps_sta_ageout_t *tlv_ps_sta_ageout = MNULL; - MrvlIEtypes_rts_threshold_t *tlv_rts_threshold = MNULL; - MrvlIEtypes_frag_threshold_t *tlv_frag_threshold = MNULL; - MrvlIEtypes_retry_limit_t *tlv_retry_limit = MNULL; - MrvlIEtypes_eapol_pwk_hsk_timeout_t *tlv_pairwise_timeout = MNULL; - MrvlIEtypes_eapol_pwk_hsk_retries_t *tlv_pairwise_retries = MNULL; - MrvlIEtypes_eapol_gwk_hsk_timeout_t *tlv_groupwise_timeout = MNULL; - MrvlIEtypes_eapol_gwk_hsk_retries_t *tlv_groupwise_retries = MNULL; - MrvlIEtypes_mgmt_ie_passthru_t *tlv_mgmt_ie_passthru = MNULL; - MrvlIEtypes_2040_coex_enable_t *tlv_2040_coex_enable = MNULL; - MrvlIEtypes_mac_filter_t *tlv_mac_filter = MNULL; - MrvlIEtypes_channel_band_t *tlv_chan_band = MNULL; - MrvlIEtypes_ChanListParamSet_t *tlv_chan_list = MNULL; - ChanScanParamSet_t *pscan_chan = MNULL; - MrvlIEtypes_auth_type_t *tlv_auth_type = MNULL; - MrvlIEtypes_encrypt_protocol_t *tlv_encrypt_protocol = MNULL; - MrvlIEtypes_akmp_t *tlv_akmp = MNULL; - MrvlIEtypes_pwk_cipher_t *tlv_pwk_cipher = MNULL; - MrvlIEtypes_gwk_cipher_t *tlv_gwk_cipher = MNULL; - MrvlIEtypes_rsn_replay_prot_t *tlv_rsn_prot = MNULL; - MrvlIEtypes_passphrase_t *tlv_passphrase = MNULL; + HostCmd_DS_SYS_CONFIG *sys_config = + (HostCmd_DS_SYS_CONFIG *) & resp->params.sys_config; + mlan_ds_bss *bss = MNULL; + MrvlIEtypesHeader_t *tlv = MNULL; + t_u16 tlv_buf_left = 0; + t_u16 tlv_type = 0; + t_u16 tlv_len = 0; + MrvlIEtypes_MacAddr_t *tlv_mac = MNULL; + MrvlIEtypes_SsIdParamSet_t *tlv_ssid = MNULL; + MrvlIEtypes_beacon_period_t *tlv_beacon_period = MNULL; + MrvlIEtypes_dtim_period_t *tlv_dtim_period = MNULL; + MrvlIEtypes_RatesParamSet_t *tlv_rates = MNULL; + MrvlIEtypes_tx_rate_t *tlv_txrate = MNULL; + MrvlIEtypes_mcbc_rate_t *tlv_mcbc_rate = MNULL; + MrvlIEtypes_tx_power_t *tlv_tx_power = MNULL; + MrvlIEtypes_bcast_ssid_t *tlv_bcast_ssid = MNULL; + MrvlIEtypes_antenna_mode_t *tlv_antenna = MNULL; + MrvlIEtypes_pkt_forward_t *tlv_pkt_forward = MNULL; + MrvlIEtypes_max_sta_count_t *tlv_sta_count = MNULL; + MrvlIEtypes_sta_ageout_t *tlv_sta_ageout = MNULL; + MrvlIEtypes_ps_sta_ageout_t *tlv_ps_sta_ageout = MNULL; + MrvlIEtypes_rts_threshold_t *tlv_rts_threshold = MNULL; + MrvlIEtypes_frag_threshold_t *tlv_frag_threshold = MNULL; + MrvlIEtypes_retry_limit_t *tlv_retry_limit = MNULL; + MrvlIEtypes_eapol_pwk_hsk_timeout_t *tlv_pairwise_timeout = MNULL; + MrvlIEtypes_eapol_pwk_hsk_retries_t *tlv_pairwise_retries = MNULL; + MrvlIEtypes_eapol_gwk_hsk_timeout_t *tlv_groupwise_timeout = MNULL; + MrvlIEtypes_eapol_gwk_hsk_retries_t *tlv_groupwise_retries = MNULL; + MrvlIEtypes_mgmt_ie_passthru_t *tlv_mgmt_ie_passthru = MNULL; + MrvlIEtypes_2040_coex_enable_t *tlv_2040_coex_enable = MNULL; + MrvlIEtypes_mac_filter_t *tlv_mac_filter = MNULL; + MrvlIEtypes_channel_band_t *tlv_chan_band = MNULL; + MrvlIEtypes_ChanListParamSet_t *tlv_chan_list = MNULL; + ChanScanParamSet_t *pscan_chan = MNULL; + MrvlIEtypes_auth_type_t *tlv_auth_type = MNULL; + MrvlIEtypes_encrypt_protocol_t *tlv_encrypt_protocol = MNULL; + MrvlIEtypes_akmp_t *tlv_akmp = MNULL; + MrvlIEtypes_pwk_cipher_t *tlv_pwk_cipher = MNULL; + MrvlIEtypes_gwk_cipher_t *tlv_gwk_cipher = MNULL; + MrvlIEtypes_rsn_replay_prot_t *tlv_rsn_prot = MNULL; + MrvlIEtypes_passphrase_t *tlv_passphrase = MNULL; #ifdef WIFI_DIRECT_SUPPORT - MrvlIEtypes_psk_t *tlv_psk = MNULL; + MrvlIEtypes_psk_t *tlv_psk = MNULL; #endif /* WIFI_DIRECT_SUPPORT */ - MrvlIEtypes_group_rekey_time_t *tlv_rekey_time = MNULL; - MrvlIEtypes_wep_key_t *tlv_wep_key = MNULL; - MrvlIEtypes_preamble_t *tlv_preamble = MNULL; - MrvlIEtypes_bss_status_t *tlv_bss_status = MNULL; - MrvlIETypes_HTCap_t *tlv_htcap = MNULL; - MrvlIEtypes_wmm_parameter_t *tlv_wmm_parameter = MNULL; - - wep_key *pkey = MNULL; - t_u16 i; - t_u16 ac; - - ENTER(); - - bss = (mlan_ds_bss *) pioctl_buf->pbuf; - tlv = (MrvlIEtypesHeader_t *) sys_config->tlv_buffer; - tlv_buf_left = resp->size - (sizeof(HostCmd_DS_SYS_CONFIG) - 1 + S_DS_GEN); - - while (tlv_buf_left >= sizeof(MrvlIEtypesHeader_t)) { - - tlv_type = wlan_le16_to_cpu(tlv->type); - tlv_len = wlan_le16_to_cpu(tlv->len); - - if (tlv_buf_left < (tlv_len + sizeof(MrvlIEtypesHeader_t))) { - PRINTM(MERROR, - "Error processing uAP sys config TLVs, bytes left < TLV length\n"); - break; - } - - switch (tlv_type) { - case TLV_TYPE_UAP_MAC_ADDRESS: - tlv_mac = (MrvlIEtypes_MacAddr_t *) tlv; - memcpy(pmpriv->adapter, &bss->param.bss_config.mac_addr, - tlv_mac->mac, MLAN_MAC_ADDR_LENGTH); - break; - case TLV_TYPE_SSID: - tlv_ssid = (MrvlIEtypes_SsIdParamSet_t *) tlv; - bss->param.bss_config.ssid.ssid_len = - MIN(MLAN_MAX_SSID_LENGTH, tlv_len); - memcpy(pmpriv->adapter, bss->param.bss_config.ssid.ssid, - tlv_ssid->ssid, MIN(MLAN_MAX_SSID_LENGTH, tlv_len)); - break; - case TLV_TYPE_UAP_BEACON_PERIOD: - tlv_beacon_period = (MrvlIEtypes_beacon_period_t *) tlv; - bss->param.bss_config.beacon_period = - wlan_le16_to_cpu(tlv_beacon_period->beacon_period); - pmpriv->uap_state_chan_cb.beacon_period = - wlan_le16_to_cpu(tlv_beacon_period->beacon_period); - break; - case TLV_TYPE_UAP_DTIM_PERIOD: - tlv_dtim_period = (MrvlIEtypes_dtim_period_t *) tlv; - bss->param.bss_config.dtim_period = tlv_dtim_period->dtim_period; - pmpriv->uap_state_chan_cb.dtim_period = - tlv_dtim_period->dtim_period; - break; - case TLV_TYPE_RATES: - tlv_rates = (MrvlIEtypes_RatesParamSet_t *) tlv; - memcpy(pmpriv->adapter, bss->param.bss_config.rates, - tlv_rates->rates, MIN(MAX_DATA_RATES, tlv_len)); - break; - case TLV_TYPE_UAP_TX_DATA_RATE: - tlv_txrate = (MrvlIEtypes_tx_rate_t *) tlv; - bss->param.bss_config.tx_data_rate = - wlan_le16_to_cpu(tlv_txrate->tx_data_rate); - break; - case TLV_TYPE_UAP_MCBC_DATA_RATE: - tlv_mcbc_rate = (MrvlIEtypes_mcbc_rate_t *) tlv; - bss->param.bss_config.mcbc_data_rate = - wlan_le16_to_cpu(tlv_mcbc_rate->mcbc_data_rate); - break; - case TLV_TYPE_UAP_TX_POWER: - tlv_tx_power = (MrvlIEtypes_tx_power_t *) tlv; - bss->param.bss_config.tx_power_level = tlv_tx_power->tx_power; - break; - case TLV_TYPE_UAP_BCAST_SSID_CTL: - tlv_bcast_ssid = (MrvlIEtypes_bcast_ssid_t *) tlv; - bss->param.bss_config.bcast_ssid_ctl = - tlv_bcast_ssid->bcast_ssid_ctl; - break; - case TLV_TYPE_UAP_ANTENNA_CTL: - tlv_antenna = (MrvlIEtypes_antenna_mode_t *) tlv; - if (tlv_antenna->which_antenna == TX_ANTENNA) - bss->param.bss_config.tx_antenna = tlv_antenna->antenna_mode; - else if (tlv_antenna->which_antenna == RX_ANTENNA) - bss->param.bss_config.rx_antenna = tlv_antenna->antenna_mode; - break; - case TLV_TYPE_UAP_PKT_FWD_CTL: - tlv_pkt_forward = (MrvlIEtypes_pkt_forward_t *) tlv; - bss->param.bss_config.pkt_forward_ctl = - tlv_pkt_forward->pkt_forward_ctl; - break; - case TLV_TYPE_UAP_MAX_STA_CNT: - tlv_sta_count = (MrvlIEtypes_max_sta_count_t *) tlv; - bss->param.bss_config.max_sta_count = - wlan_le16_to_cpu(tlv_sta_count->max_sta_count); - break; - case TLV_TYPE_UAP_STA_AGEOUT_TIMER: - tlv_sta_ageout = (MrvlIEtypes_sta_ageout_t *) tlv; - bss->param.bss_config.sta_ageout_timer = - wlan_le32_to_cpu(tlv_sta_ageout->sta_ageout_timer); - break; - case TLV_TYPE_UAP_PS_STA_AGEOUT_TIMER: - tlv_ps_sta_ageout = (MrvlIEtypes_ps_sta_ageout_t *) tlv; - bss->param.bss_config.ps_sta_ageout_timer = - wlan_le32_to_cpu(tlv_ps_sta_ageout->ps_sta_ageout_timer); - break; - case TLV_TYPE_UAP_RTS_THRESHOLD: - tlv_rts_threshold = (MrvlIEtypes_rts_threshold_t *) tlv; - bss->param.bss_config.rts_threshold = - wlan_le16_to_cpu(tlv_rts_threshold->rts_threshold); - break; - case TLV_TYPE_UAP_FRAG_THRESHOLD: - tlv_frag_threshold = (MrvlIEtypes_frag_threshold_t *) tlv; - bss->param.bss_config.frag_threshold = - wlan_le16_to_cpu(tlv_frag_threshold->frag_threshold); - break; - case TLV_TYPE_UAP_RETRY_LIMIT: - tlv_retry_limit = (MrvlIEtypes_retry_limit_t *) tlv; - bss->param.bss_config.retry_limit = tlv_retry_limit->retry_limit; - break; - case TLV_TYPE_UAP_EAPOL_PWK_HSK_TIMEOUT: - tlv_pairwise_timeout = (MrvlIEtypes_eapol_pwk_hsk_timeout_t *) tlv; - bss->param.bss_config.pairwise_update_timeout = - wlan_le32_to_cpu(tlv_pairwise_timeout->pairwise_update_timeout); - break; - case TLV_TYPE_UAP_EAPOL_PWK_HSK_RETRIES: - tlv_pairwise_retries = (MrvlIEtypes_eapol_pwk_hsk_retries_t *) tlv; - bss->param.bss_config.pwk_retries = - wlan_le32_to_cpu(tlv_pairwise_retries->pwk_retries); - break; - case TLV_TYPE_UAP_EAPOL_GWK_HSK_TIMEOUT: - tlv_groupwise_timeout = (MrvlIEtypes_eapol_gwk_hsk_timeout_t *) tlv; - bss->param.bss_config.groupwise_update_timeout = - wlan_le32_to_cpu(tlv_groupwise_timeout-> - groupwise_update_timeout); - break; - case TLV_TYPE_UAP_EAPOL_GWK_HSK_RETRIES: - tlv_groupwise_retries = (MrvlIEtypes_eapol_gwk_hsk_retries_t *) tlv; - bss->param.bss_config.gwk_retries = - wlan_le32_to_cpu(tlv_groupwise_retries->gwk_retries); - break; - case TLV_TYPE_UAP_MGMT_IE_PASSTHRU_MASK: - tlv_mgmt_ie_passthru = (MrvlIEtypes_mgmt_ie_passthru_t *) tlv; - bss->param.bss_config.mgmt_ie_passthru_mask = - wlan_le32_to_cpu(tlv_mgmt_ie_passthru->mgmt_ie_mask); - break; - case TLV_TYPE_2040_BSS_COEX_CONTROL: - tlv_2040_coex_enable = (MrvlIEtypes_2040_coex_enable_t *) tlv; - bss->param.bss_config.enable_2040coex = - tlv_2040_coex_enable->enable_2040coex; - break; - case TLV_TYPE_UAP_STA_MAC_ADDR_FILTER: - tlv_mac_filter = (MrvlIEtypes_mac_filter_t *) tlv; - bss->param.bss_config.filter.mac_count = - MIN(MAX_MAC_FILTER_NUM, tlv_mac_filter->count); - bss->param.bss_config.filter.filter_mode = - tlv_mac_filter->filter_mode; - memcpy(pmpriv->adapter, - (t_u8 *) bss->param.bss_config.filter.mac_list, - tlv_mac_filter->mac_address, - MLAN_MAC_ADDR_LENGTH * - bss->param.bss_config.filter.mac_count); - break; - case TLV_TYPE_UAP_CHAN_BAND_CONFIG: - tlv_chan_band = (MrvlIEtypes_channel_band_t *) tlv; - bss->param.bss_config.band_cfg = tlv_chan_band->band_config; - bss->param.bss_config.channel = tlv_chan_band->channel; - pmpriv->uap_state_chan_cb.band_config = tlv_chan_band->band_config; - pmpriv->uap_state_chan_cb.channel = tlv_chan_band->channel; - break; - case TLV_TYPE_CHANLIST: - tlv_chan_list = (MrvlIEtypes_ChanListParamSet_t *) tlv; - bss->param.bss_config.num_of_chan = - tlv_len / sizeof(ChanScanParamSet_t); - pscan_chan = tlv_chan_list->chan_scan_param; - for (i = 0; i < bss->param.bss_config.num_of_chan; i++) { - bss->param.bss_config.chan_list[i].chan_number = - pscan_chan->chan_number; - bss->param.bss_config.chan_list[i].band_config_type = - pscan_chan->radio_type; - pscan_chan++; - } - break; - case TLV_TYPE_AUTH_TYPE: - tlv_auth_type = (MrvlIEtypes_auth_type_t *) tlv; - bss->param.bss_config.auth_mode = tlv_auth_type->auth_type; - break; - case TLV_TYPE_UAP_ENCRYPT_PROTOCOL: - tlv_encrypt_protocol = (MrvlIEtypes_encrypt_protocol_t *) tlv; - bss->param.bss_config.protocol = - wlan_le16_to_cpu(tlv_encrypt_protocol->protocol); - break; - case TLV_TYPE_UAP_AKMP: - tlv_akmp = (MrvlIEtypes_akmp_t *) tlv; - bss->param.bss_config.key_mgmt = - wlan_le16_to_cpu(tlv_akmp->key_mgmt); - if (tlv_len > sizeof(t_u16)) - bss->param.bss_config.key_mgmt_operation = - wlan_le16_to_cpu(tlv_akmp->key_mgmt_operation); - break; - case TLV_TYPE_PWK_CIPHER: - tlv_pwk_cipher = (MrvlIEtypes_pwk_cipher_t *) tlv; - if (wlan_le16_to_cpu(tlv_pwk_cipher->protocol) & PROTOCOL_WPA) - bss->param.bss_config.wpa_cfg.pairwise_cipher_wpa = - tlv_pwk_cipher->pairwise_cipher; - if (wlan_le16_to_cpu(tlv_pwk_cipher->protocol) & PROTOCOL_WPA2) - bss->param.bss_config.wpa_cfg.pairwise_cipher_wpa2 = - tlv_pwk_cipher->pairwise_cipher; - break; - case TLV_TYPE_GWK_CIPHER: - tlv_gwk_cipher = (MrvlIEtypes_gwk_cipher_t *) tlv; - bss->param.bss_config.wpa_cfg.group_cipher = - tlv_gwk_cipher->group_cipher; - break; - case TLV_TYPE_UAP_RSN_REPLAY_PROTECT: - tlv_rsn_prot = (MrvlIEtypes_rsn_replay_prot_t *) tlv; - bss->param.bss_config.wpa_cfg.rsn_protection = - tlv_rsn_prot->rsn_replay_prot; - break; - case TLV_TYPE_UAP_WPA_PASSPHRASE: - tlv_passphrase = (MrvlIEtypes_passphrase_t *) tlv; - bss->param.bss_config.wpa_cfg.length = - MIN(MLAN_PMK_HEXSTR_LENGTH, tlv_len); - memcpy(pmpriv->adapter, bss->param.bss_config.wpa_cfg.passphrase, - tlv_passphrase->passphrase, - bss->param.bss_config.wpa_cfg.length); - break; + MrvlIEtypes_group_rekey_time_t *tlv_rekey_time = MNULL; + MrvlIEtypes_wep_key_t *tlv_wep_key = MNULL; + MrvlIEtypes_preamble_t *tlv_preamble = MNULL; + MrvlIEtypes_bss_status_t *tlv_bss_status = MNULL; + MrvlIETypes_HTCap_t *tlv_htcap = MNULL; + MrvlIEtypes_wmm_parameter_t *tlv_wmm_parameter = MNULL; + + wep_key *pkey = MNULL; + t_u16 i; + t_u16 ac; + + ENTER(); + + bss = (mlan_ds_bss *) pioctl_buf->pbuf; + tlv = (MrvlIEtypesHeader_t *) sys_config->tlv_buffer; + tlv_buf_left = + resp->size - (sizeof(HostCmd_DS_SYS_CONFIG) - 1 + S_DS_GEN); + + while (tlv_buf_left >= sizeof(MrvlIEtypesHeader_t)) { + + tlv_type = wlan_le16_to_cpu(tlv->type); + tlv_len = wlan_le16_to_cpu(tlv->len); + + if (tlv_buf_left < (tlv_len + sizeof(MrvlIEtypesHeader_t))) { + PRINTM(MERROR, + "Error processing uAP sys config TLVs, bytes left < TLV length\n"); + break; + } + + switch (tlv_type) { + case TLV_TYPE_UAP_MAC_ADDRESS: + tlv_mac = (MrvlIEtypes_MacAddr_t *) tlv; + memcpy(pmpriv->adapter, &bss->param.bss_config.mac_addr, + tlv_mac->mac, MLAN_MAC_ADDR_LENGTH); + break; + case TLV_TYPE_SSID: + tlv_ssid = (MrvlIEtypes_SsIdParamSet_t *) tlv; + bss->param.bss_config.ssid.ssid_len = + MIN(MLAN_MAX_SSID_LENGTH, tlv_len); + memcpy(pmpriv->adapter, bss->param.bss_config.ssid.ssid, + tlv_ssid->ssid, MIN(MLAN_MAX_SSID_LENGTH, + tlv_len)); + break; + case TLV_TYPE_UAP_BEACON_PERIOD: + tlv_beacon_period = (MrvlIEtypes_beacon_period_t *) tlv; + bss->param.bss_config.beacon_period = + wlan_le16_to_cpu(tlv_beacon_period-> + beacon_period); + pmpriv->uap_state_chan_cb.beacon_period = + wlan_le16_to_cpu(tlv_beacon_period-> + beacon_period); + break; + case TLV_TYPE_UAP_DTIM_PERIOD: + tlv_dtim_period = (MrvlIEtypes_dtim_period_t *) tlv; + bss->param.bss_config.dtim_period = + tlv_dtim_period->dtim_period; + pmpriv->uap_state_chan_cb.dtim_period = + tlv_dtim_period->dtim_period; + break; + case TLV_TYPE_RATES: + tlv_rates = (MrvlIEtypes_RatesParamSet_t *) tlv; + memcpy(pmpriv->adapter, bss->param.bss_config.rates, + tlv_rates->rates, MIN(MAX_DATA_RATES, tlv_len)); + break; + case TLV_TYPE_UAP_TX_DATA_RATE: + tlv_txrate = (MrvlIEtypes_tx_rate_t *) tlv; + bss->param.bss_config.tx_data_rate = + wlan_le16_to_cpu(tlv_txrate->tx_data_rate); + break; + case TLV_TYPE_UAP_MCBC_DATA_RATE: + tlv_mcbc_rate = (MrvlIEtypes_mcbc_rate_t *) tlv; + bss->param.bss_config.mcbc_data_rate = + wlan_le16_to_cpu(tlv_mcbc_rate->mcbc_data_rate); + break; + case TLV_TYPE_UAP_TX_POWER: + tlv_tx_power = (MrvlIEtypes_tx_power_t *) tlv; + bss->param.bss_config.tx_power_level = + tlv_tx_power->tx_power; + break; + case TLV_TYPE_UAP_BCAST_SSID_CTL: + tlv_bcast_ssid = (MrvlIEtypes_bcast_ssid_t *) tlv; + bss->param.bss_config.bcast_ssid_ctl = + tlv_bcast_ssid->bcast_ssid_ctl; + break; + case TLV_TYPE_UAP_ANTENNA_CTL: + tlv_antenna = (MrvlIEtypes_antenna_mode_t *) tlv; + if (tlv_antenna->which_antenna == TX_ANTENNA) + bss->param.bss_config.tx_antenna = + tlv_antenna->antenna_mode; + else if (tlv_antenna->which_antenna == RX_ANTENNA) + bss->param.bss_config.rx_antenna = + tlv_antenna->antenna_mode; + break; + case TLV_TYPE_UAP_PKT_FWD_CTL: + tlv_pkt_forward = (MrvlIEtypes_pkt_forward_t *) tlv; + bss->param.bss_config.pkt_forward_ctl = + tlv_pkt_forward->pkt_forward_ctl; + break; + case TLV_TYPE_UAP_MAX_STA_CNT: + tlv_sta_count = (MrvlIEtypes_max_sta_count_t *) tlv; + bss->param.bss_config.max_sta_count = + wlan_le16_to_cpu(tlv_sta_count->max_sta_count); + break; + case TLV_TYPE_UAP_STA_AGEOUT_TIMER: + tlv_sta_ageout = (MrvlIEtypes_sta_ageout_t *) tlv; + bss->param.bss_config.sta_ageout_timer = + wlan_le32_to_cpu(tlv_sta_ageout-> + sta_ageout_timer); + break; + case TLV_TYPE_UAP_PS_STA_AGEOUT_TIMER: + tlv_ps_sta_ageout = (MrvlIEtypes_ps_sta_ageout_t *) tlv; + bss->param.bss_config.ps_sta_ageout_timer = + wlan_le32_to_cpu(tlv_ps_sta_ageout-> + ps_sta_ageout_timer); + break; + case TLV_TYPE_UAP_RTS_THRESHOLD: + tlv_rts_threshold = (MrvlIEtypes_rts_threshold_t *) tlv; + bss->param.bss_config.rts_threshold = + wlan_le16_to_cpu(tlv_rts_threshold-> + rts_threshold); + break; + case TLV_TYPE_UAP_FRAG_THRESHOLD: + tlv_frag_threshold = + (MrvlIEtypes_frag_threshold_t *) tlv; + bss->param.bss_config.frag_threshold = + wlan_le16_to_cpu(tlv_frag_threshold-> + frag_threshold); + break; + case TLV_TYPE_UAP_RETRY_LIMIT: + tlv_retry_limit = (MrvlIEtypes_retry_limit_t *) tlv; + bss->param.bss_config.retry_limit = + tlv_retry_limit->retry_limit; + break; + case TLV_TYPE_UAP_EAPOL_PWK_HSK_TIMEOUT: + tlv_pairwise_timeout = + (MrvlIEtypes_eapol_pwk_hsk_timeout_t *) tlv; + bss->param.bss_config.pairwise_update_timeout = + wlan_le32_to_cpu(tlv_pairwise_timeout-> + pairwise_update_timeout); + break; + case TLV_TYPE_UAP_EAPOL_PWK_HSK_RETRIES: + tlv_pairwise_retries = + (MrvlIEtypes_eapol_pwk_hsk_retries_t *) tlv; + bss->param.bss_config.pwk_retries = + wlan_le32_to_cpu(tlv_pairwise_retries-> + pwk_retries); + break; + case TLV_TYPE_UAP_EAPOL_GWK_HSK_TIMEOUT: + tlv_groupwise_timeout = + (MrvlIEtypes_eapol_gwk_hsk_timeout_t *) tlv; + bss->param.bss_config.groupwise_update_timeout = + wlan_le32_to_cpu(tlv_groupwise_timeout-> + groupwise_update_timeout); + break; + case TLV_TYPE_UAP_EAPOL_GWK_HSK_RETRIES: + tlv_groupwise_retries = + (MrvlIEtypes_eapol_gwk_hsk_retries_t *) tlv; + bss->param.bss_config.gwk_retries = + wlan_le32_to_cpu(tlv_groupwise_retries-> + gwk_retries); + break; + case TLV_TYPE_UAP_MGMT_IE_PASSTHRU_MASK: + tlv_mgmt_ie_passthru = + (MrvlIEtypes_mgmt_ie_passthru_t *) tlv; + bss->param.bss_config.mgmt_ie_passthru_mask = + wlan_le32_to_cpu(tlv_mgmt_ie_passthru-> + mgmt_ie_mask); + break; + case TLV_TYPE_2040_BSS_COEX_CONTROL: + tlv_2040_coex_enable = + (MrvlIEtypes_2040_coex_enable_t *) tlv; + bss->param.bss_config.enable_2040coex = + tlv_2040_coex_enable->enable_2040coex; + break; + case TLV_TYPE_UAP_STA_MAC_ADDR_FILTER: + tlv_mac_filter = (MrvlIEtypes_mac_filter_t *) tlv; + bss->param.bss_config.filter.mac_count = + MIN(MAX_MAC_FILTER_NUM, tlv_mac_filter->count); + bss->param.bss_config.filter.filter_mode = + tlv_mac_filter->filter_mode; + memcpy(pmpriv->adapter, + (t_u8 *) bss->param.bss_config.filter.mac_list, + tlv_mac_filter->mac_address, + MLAN_MAC_ADDR_LENGTH * + bss->param.bss_config.filter.mac_count); + break; + case TLV_TYPE_UAP_CHAN_BAND_CONFIG: + tlv_chan_band = (MrvlIEtypes_channel_band_t *) tlv; + bss->param.bss_config.band_cfg = + tlv_chan_band->band_config; + bss->param.bss_config.channel = tlv_chan_band->channel; + pmpriv->uap_state_chan_cb.band_config = + tlv_chan_band->band_config; + pmpriv->uap_state_chan_cb.channel = + tlv_chan_band->channel; + break; + case TLV_TYPE_CHANLIST: + tlv_chan_list = (MrvlIEtypes_ChanListParamSet_t *) tlv; + bss->param.bss_config.num_of_chan = + tlv_len / sizeof(ChanScanParamSet_t); + pscan_chan = tlv_chan_list->chan_scan_param; + for (i = 0; i < bss->param.bss_config.num_of_chan; i++) { + bss->param.bss_config.chan_list[i].chan_number = + pscan_chan->chan_number; + bss->param.bss_config.chan_list[i]. + band_config_type = + pscan_chan->radio_type; + pscan_chan++; + } + break; + case TLV_TYPE_AUTH_TYPE: + tlv_auth_type = (MrvlIEtypes_auth_type_t *) tlv; + bss->param.bss_config.auth_mode = + tlv_auth_type->auth_type; + break; + case TLV_TYPE_UAP_ENCRYPT_PROTOCOL: + tlv_encrypt_protocol = + (MrvlIEtypes_encrypt_protocol_t *) tlv; + bss->param.bss_config.protocol = + wlan_le16_to_cpu(tlv_encrypt_protocol-> + protocol); + break; + case TLV_TYPE_UAP_AKMP: + tlv_akmp = (MrvlIEtypes_akmp_t *) tlv; + bss->param.bss_config.key_mgmt = + wlan_le16_to_cpu(tlv_akmp->key_mgmt); + if (tlv_len > sizeof(t_u16)) + bss->param.bss_config.key_mgmt_operation = + wlan_le16_to_cpu(tlv_akmp-> + key_mgmt_operation); + break; + case TLV_TYPE_PWK_CIPHER: + tlv_pwk_cipher = (MrvlIEtypes_pwk_cipher_t *) tlv; + if (wlan_le16_to_cpu(tlv_pwk_cipher->protocol) & + PROTOCOL_WPA) + bss->param.bss_config.wpa_cfg. + pairwise_cipher_wpa = + tlv_pwk_cipher->pairwise_cipher; + if (wlan_le16_to_cpu(tlv_pwk_cipher->protocol) & + PROTOCOL_WPA2) + bss->param.bss_config.wpa_cfg. + pairwise_cipher_wpa2 = + tlv_pwk_cipher->pairwise_cipher; + break; + case TLV_TYPE_GWK_CIPHER: + tlv_gwk_cipher = (MrvlIEtypes_gwk_cipher_t *) tlv; + bss->param.bss_config.wpa_cfg.group_cipher = + tlv_gwk_cipher->group_cipher; + break; + case TLV_TYPE_UAP_RSN_REPLAY_PROTECT: + tlv_rsn_prot = (MrvlIEtypes_rsn_replay_prot_t *) tlv; + bss->param.bss_config.wpa_cfg.rsn_protection = + tlv_rsn_prot->rsn_replay_prot; + break; + case TLV_TYPE_UAP_WPA_PASSPHRASE: + tlv_passphrase = (MrvlIEtypes_passphrase_t *) tlv; + bss->param.bss_config.wpa_cfg.length = + MIN(MLAN_PMK_HEXSTR_LENGTH, tlv_len); + memcpy(pmpriv->adapter, + bss->param.bss_config.wpa_cfg.passphrase, + tlv_passphrase->passphrase, + bss->param.bss_config.wpa_cfg.length); + break; #ifdef WIFI_DIRECT_SUPPORT - case TLV_TYPE_UAP_PSK: - tlv_psk = (MrvlIEtypes_psk_t *) tlv; - memcpy(pmpriv->adapter, bss->param.bss_config.psk, tlv_psk->psk, - MIN(MLAN_MAX_KEY_LENGTH, tlv_len)); - break; + case TLV_TYPE_UAP_PSK: + tlv_psk = (MrvlIEtypes_psk_t *) tlv; + memcpy(pmpriv->adapter, bss->param.bss_config.psk, + tlv_psk->psk, MIN(MLAN_MAX_KEY_LENGTH, tlv_len)); + break; #endif /* WIFI_DIRECT_SUPPORT */ - case TLV_TYPE_UAP_GRP_REKEY_TIME: - tlv_rekey_time = (MrvlIEtypes_group_rekey_time_t *) tlv; - bss->param.bss_config.wpa_cfg.gk_rekey_time = - wlan_le32_to_cpu(tlv_rekey_time->gk_rekey_time); - break; - case TLV_TYPE_UAP_WEP_KEY: - tlv_wep_key = (MrvlIEtypes_wep_key_t *) tlv; - pkey = MNULL; - if (tlv_wep_key->key_index == 0) - pkey = &bss->param.bss_config.wep_cfg.key0; - else if (tlv_wep_key->key_index == 1) - pkey = &bss->param.bss_config.wep_cfg.key1; - else if (tlv_wep_key->key_index == 2) - pkey = &bss->param.bss_config.wep_cfg.key2; - else if (tlv_wep_key->key_index == 3) - pkey = &bss->param.bss_config.wep_cfg.key3; - if (pkey) { - pkey->key_index = tlv_wep_key->key_index; - pkey->is_default = tlv_wep_key->is_default; - pkey->length = MIN(MAX_WEP_KEY_SIZE, (tlv_len - 2)); - memcpy(pmpriv->adapter, pkey->key, tlv_wep_key->key, - pkey->length); - } - break; - case TLV_TYPE_UAP_PREAMBLE_CTL: - tlv_preamble = (MrvlIEtypes_preamble_t *) tlv; - bss->param.bss_config.preamble_type = tlv_preamble->preamble_type; - break; - case TLV_TYPE_BSS_STATUS: - tlv_bss_status = (MrvlIEtypes_bss_status_t *) tlv; - bss->param.bss_config.bss_status = - wlan_le16_to_cpu(tlv_bss_status->bss_status); - pmpriv->uap_bss_started = - (bss->param.bss_config.bss_status) ? MTRUE : MFALSE; - break; - case HT_CAPABILITY: - tlv_htcap = (MrvlIETypes_HTCap_t *) tlv; - bss->param.bss_config.ht_cap_info = - wlan_le16_to_cpu(tlv_htcap->ht_cap.ht_cap_info); - bss->param.bss_config.ampdu_param = tlv_htcap->ht_cap.ampdu_param; - memcpy(pmpriv->adapter, bss->param.bss_config.supported_mcs_set, - tlv_htcap->ht_cap.supported_mcs_set, 16); - bss->param.bss_config.ht_ext_cap = - wlan_le16_to_cpu(tlv_htcap->ht_cap.ht_ext_cap); - bss->param.bss_config.tx_bf_cap = - wlan_le32_to_cpu(tlv_htcap->ht_cap.tx_bf_cap); - bss->param.bss_config.asel = tlv_htcap->ht_cap.asel; - break; - case TLV_TYPE_VENDOR_SPECIFIC_IE: - tlv_wmm_parameter = (MrvlIEtypes_wmm_parameter_t *) tlv; - bss->param.bss_config.wmm_para.qos_info = - tlv_wmm_parameter->wmm_para.qos_info; - for (ac = 0; ac < 4; ac++) { - bss->param.bss_config.wmm_para.ac_params[ac].aci_aifsn.aifsn = - tlv_wmm_parameter->wmm_para.ac_params[ac].aci_aifsn.aifsn; - bss->param.bss_config.wmm_para.ac_params[ac].aci_aifsn.aci = - tlv_wmm_parameter->wmm_para.ac_params[ac].aci_aifsn.aci; - bss->param.bss_config.wmm_para.ac_params[ac].ecw.ecw_max = - tlv_wmm_parameter->wmm_para.ac_params[ac].ecw.ecw_max; - bss->param.bss_config.wmm_para.ac_params[ac].ecw.ecw_min = - tlv_wmm_parameter->wmm_para.ac_params[ac].ecw.ecw_min; - bss->param.bss_config.wmm_para.ac_params[ac].tx_op_limit = - wlan_le16_to_cpu(tlv_wmm_parameter->wmm_para.ac_params[ac]. - tx_op_limit); - } - break; - } - - tlv_buf_left -= tlv_len + sizeof(MrvlIEtypesHeader_t); - tlv = - (MrvlIEtypesHeader_t *) ((t_u8 *) tlv + tlv_len + - sizeof(MrvlIEtypesHeader_t)); - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + case TLV_TYPE_UAP_GRP_REKEY_TIME: + tlv_rekey_time = (MrvlIEtypes_group_rekey_time_t *) tlv; + bss->param.bss_config.wpa_cfg.gk_rekey_time = + wlan_le32_to_cpu(tlv_rekey_time->gk_rekey_time); + break; + case TLV_TYPE_UAP_WEP_KEY: + tlv_wep_key = (MrvlIEtypes_wep_key_t *) tlv; + pkey = MNULL; + if (tlv_wep_key->key_index == 0) + pkey = &bss->param.bss_config.wep_cfg.key0; + else if (tlv_wep_key->key_index == 1) + pkey = &bss->param.bss_config.wep_cfg.key1; + else if (tlv_wep_key->key_index == 2) + pkey = &bss->param.bss_config.wep_cfg.key2; + else if (tlv_wep_key->key_index == 3) + pkey = &bss->param.bss_config.wep_cfg.key3; + if (pkey) { + pkey->key_index = tlv_wep_key->key_index; + pkey->is_default = tlv_wep_key->is_default; + pkey->length = + MIN(MAX_WEP_KEY_SIZE, (tlv_len - 2)); + memcpy(pmpriv->adapter, pkey->key, + tlv_wep_key->key, pkey->length); + } + break; + case TLV_TYPE_UAP_PREAMBLE_CTL: + tlv_preamble = (MrvlIEtypes_preamble_t *) tlv; + bss->param.bss_config.preamble_type = + tlv_preamble->preamble_type; + break; + case TLV_TYPE_BSS_STATUS: + tlv_bss_status = (MrvlIEtypes_bss_status_t *) tlv; + bss->param.bss_config.bss_status = + wlan_le16_to_cpu(tlv_bss_status->bss_status); + pmpriv->uap_bss_started = + (bss->param.bss_config. + bss_status) ? MTRUE : MFALSE; + break; + case HT_CAPABILITY: + tlv_htcap = (MrvlIETypes_HTCap_t *) tlv; + bss->param.bss_config.ht_cap_info = + wlan_le16_to_cpu(tlv_htcap->ht_cap.ht_cap_info); + bss->param.bss_config.ampdu_param = + tlv_htcap->ht_cap.ampdu_param; + memcpy(pmpriv->adapter, + bss->param.bss_config.supported_mcs_set, + tlv_htcap->ht_cap.supported_mcs_set, 16); + bss->param.bss_config.ht_ext_cap = + wlan_le16_to_cpu(tlv_htcap->ht_cap.ht_ext_cap); + bss->param.bss_config.tx_bf_cap = + wlan_le32_to_cpu(tlv_htcap->ht_cap.tx_bf_cap); + bss->param.bss_config.asel = tlv_htcap->ht_cap.asel; + break; + case TLV_TYPE_VENDOR_SPECIFIC_IE: + tlv_wmm_parameter = (MrvlIEtypes_wmm_parameter_t *) tlv; + bss->param.bss_config.wmm_para.qos_info = + tlv_wmm_parameter->wmm_para.qos_info; + for (ac = 0; ac < 4; ac++) { + bss->param.bss_config.wmm_para.ac_params[ac]. + aci_aifsn.aifsn = + tlv_wmm_parameter->wmm_para. + ac_params[ac].aci_aifsn.aifsn; + bss->param.bss_config.wmm_para.ac_params[ac]. + aci_aifsn.aci = + tlv_wmm_parameter->wmm_para. + ac_params[ac].aci_aifsn.aci; + bss->param.bss_config.wmm_para.ac_params[ac]. + ecw.ecw_max = + tlv_wmm_parameter->wmm_para. + ac_params[ac].ecw.ecw_max; + bss->param.bss_config.wmm_para.ac_params[ac]. + ecw.ecw_min = + tlv_wmm_parameter->wmm_para. + ac_params[ac].ecw.ecw_min; + bss->param.bss_config.wmm_para.ac_params[ac]. + tx_op_limit = + wlan_le16_to_cpu(tlv_wmm_parameter-> + wmm_para.ac_params[ac]. + tx_op_limit); + } + break; + } + + tlv_buf_left -= tlv_len + sizeof(MrvlIEtypesHeader_t); + tlv = (MrvlIEtypesHeader_t *) ((t_u8 *) tlv + tlv_len + + sizeof(MrvlIEtypesHeader_t)); + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of sys_reset * Clear various private state variables used by DFS. - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND - * @param pioctl_buf A pointer to mlan_ioctl_req structure + * @param pioctl_buf A pointer to mlan_ioctl_req structure * * @return MLAN_STATUS_SUCCESS */ static mlan_status wlan_uap_ret_sys_reset(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - ENTER(); + ENTER(); - pmpriv->uap_state_chan_cb.band_config = 0; - pmpriv->uap_state_chan_cb.channel = 0; - pmpriv->uap_state_chan_cb.beacon_period = 0; - pmpriv->uap_state_chan_cb.dtim_period = 0; + pmpriv->uap_state_chan_cb.band_config = 0; + pmpriv->uap_state_chan_cb.channel = 0; + pmpriv->uap_state_chan_cb.beacon_period = 0; + pmpriv->uap_state_chan_cb.dtim_period = 0; - /* assume default 11d/11h states are off, should check with FW */ - /* currently don't clear domain_info... global, could be from STA */ - wlan_11d_priv_init(pmpriv); - wlan_11h_priv_init(pmpriv); + /* assume default 11d/11h states are off, should check with FW */ + /* currently don't clear domain_info... global, could be from STA */ + wlan_11d_priv_init(pmpriv); + wlan_11h_priv_init(pmpriv); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief This function handles the command response of sys_config - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND - * @param pioctl_buf A pointer to mlan_ioctl_req structure + * @param pioctl_buf A pointer to mlan_ioctl_req structure * * @return MLAN_STATUS_SUCCESS */ static mlan_status wlan_uap_ret_sys_config(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - int resp_len = 0, travel_len = 0; - int i = 0; - custom_ie *cptr; - HostCmd_DS_SYS_CONFIG *sys_config = - (HostCmd_DS_SYS_CONFIG *) & resp->params.sys_config; - mlan_ds_bss *bss = MNULL; - mlan_ds_misc_cfg *misc = MNULL; - MrvlIEtypes_MacAddr_t *tlv = - (MrvlIEtypes_MacAddr_t *) sys_config->tlv_buffer; - mlan_ds_misc_custom_ie *cust_ie = MNULL; - tlvbuf_max_mgmt_ie *max_mgmt_ie = MNULL; - MrvlIEtypes_channel_band_t *tlv_cb = MNULL; - MrvlIEtypes_beacon_period_t *tlv_bcnpd = MNULL; - MrvlIEtypes_dtim_period_t *tlv_dtimpd = MNULL; - - ENTER(); - if (pioctl_buf) { - if (pioctl_buf->req_id == MLAN_IOCTL_BSS) { - bss = (mlan_ds_bss *) pioctl_buf->pbuf; - if (bss->sub_command == MLAN_OID_BSS_MAC_ADDR) { - if (TLV_TYPE_UAP_MAC_ADDRESS == - wlan_le16_to_cpu(tlv->header.type)) { - memcpy(pmpriv->adapter, &bss->param.mac_addr, tlv->mac, - MLAN_MAC_ADDR_LENGTH); - } - } else if ((bss->sub_command == MLAN_OID_UAP_BSS_CONFIG) && - (pioctl_buf->action == MLAN_ACT_GET)) { - wlan_uap_ret_cmd_ap_config(pmpriv, resp, pioctl_buf); - } - } - if (pioctl_buf->req_id == MLAN_IOCTL_MISC_CFG) { - misc = (mlan_ds_misc_cfg *) pioctl_buf->pbuf; - cust_ie = (mlan_ds_misc_custom_ie *) sys_config->tlv_buffer; - max_mgmt_ie = - (tlvbuf_max_mgmt_ie *) (sys_config->tlv_buffer + cust_ie->len + - sizeof(MrvlIEtypesHeader_t)); - if ((pioctl_buf->action == MLAN_ACT_GET) && - (misc->sub_command == MLAN_OID_MISC_CUSTOM_IE)) { - - cust_ie->type = wlan_le16_to_cpu(cust_ie->type); - resp_len = cust_ie->len = wlan_le16_to_cpu(cust_ie->len); - travel_len = 0; - /* conversion for index, mask, len */ - if (resp_len == sizeof(t_u16)) - cust_ie->ie_data_list[0].ie_index = - wlan_cpu_to_le16(cust_ie->ie_data_list[0].ie_index); - - while (resp_len > sizeof(t_u16)) { - cptr = - (custom_ie *) (((t_u8 *) cust_ie->ie_data_list) + - travel_len); - cptr->ie_index = wlan_le16_to_cpu(cptr->ie_index); - cptr->mgmt_subtype_mask = - wlan_le16_to_cpu(cptr->mgmt_subtype_mask); - cptr->ie_length = wlan_le16_to_cpu(cptr->ie_length); - travel_len += - cptr->ie_length + sizeof(custom_ie) - MAX_IE_SIZE; - resp_len -= - cptr->ie_length + sizeof(custom_ie) - MAX_IE_SIZE; - } - memcpy(pmpriv->adapter, &misc->param.cust_ie, cust_ie, - MIN(sizeof(mlan_ds_misc_custom_ie) - - sizeof(tlvbuf_max_mgmt_ie), - (cust_ie->len + sizeof(MrvlIEtypesHeader_t)))); - if (max_mgmt_ie) { - max_mgmt_ie->type = wlan_le16_to_cpu(max_mgmt_ie->type); - if (max_mgmt_ie->type == TLV_TYPE_MAX_MGMT_IE) { - max_mgmt_ie->len = wlan_le16_to_cpu(max_mgmt_ie->len); - max_mgmt_ie->count = - wlan_le16_to_cpu(max_mgmt_ie->count); - for (i = 0; i < max_mgmt_ie->count; i++) { - max_mgmt_ie->info[i].buf_size = - wlan_le16_to_cpu(max_mgmt_ie->info[i].buf_size); - max_mgmt_ie->info[i].buf_count = - wlan_le16_to_cpu(max_mgmt_ie->info[i]. - buf_count); - } - /* Append max_mgmt_ie TLV after custom_ie */ - memcpy(pmpriv->adapter, - (t_u8 *) & misc->param.cust_ie + (cust_ie->len + - sizeof - (MrvlIEtypesHeader_t)), - max_mgmt_ie, MIN(sizeof(tlvbuf_max_mgmt_ie), - max_mgmt_ie->len + - sizeof(MrvlIEtypesHeader_t))); - } - } - } - } - } else { /* no ioctl: driver generated get/set */ - switch (wlan_le16_to_cpu(tlv->header.type)) { - case TLV_TYPE_UAP_MAC_ADDRESS: - memcpy(pmpriv->adapter, pmpriv->curr_addr, tlv->mac, - MLAN_MAC_ADDR_LENGTH); - break; - case TLV_TYPE_UAP_CHAN_BAND_CONFIG: - tlv_cb = (MrvlIEtypes_channel_band_t *) tlv; - pmpriv->uap_state_chan_cb.band_config = tlv_cb->band_config; - pmpriv->uap_state_chan_cb.channel = tlv_cb->channel; - /* call callback waiting for channel info */ - if (pmpriv->uap_state_chan_cb.get_chan_callback) - pmpriv->uap_state_chan_cb.get_chan_callback(pmpriv); - break; - case TLV_TYPE_UAP_BEACON_PERIOD: - tlv_bcnpd = (MrvlIEtypes_beacon_period_t *) tlv; - pmpriv->uap_state_chan_cb.beacon_period = - wlan_le16_to_cpu(tlv_bcnpd->beacon_period); - /* copy dtim_period as well if it follows */ - tlv_dtimpd = - (MrvlIEtypes_dtim_period_t *) (((t_u8 *) tlv) + - sizeof - (MrvlIEtypes_beacon_period_t)); - if (TLV_TYPE_UAP_DTIM_PERIOD == - wlan_le16_to_cpu(tlv_dtimpd->header.type)) - pmpriv->uap_state_chan_cb.dtim_period = tlv_dtimpd->dtim_period; - /* call callback waiting for beacon/dtim info */ - if (pmpriv->uap_state_chan_cb.get_chan_callback) - pmpriv->uap_state_chan_cb.get_chan_callback(pmpriv); - break; - case TLV_TYPE_MGMT_IE: - if ((pmpriv->adapter->state_rdh.stage == RDH_SET_CUSTOM_IE) || - (pmpriv->adapter->state_rdh.stage == RDH_REM_CUSTOM_IE)) - wlan_11h_radar_detected_callback((t_void *) pmpriv); - break; - } - } - LEAVE(); - return MLAN_STATUS_SUCCESS; + int resp_len = 0, travel_len = 0; + int i = 0; + custom_ie *cptr; + HostCmd_DS_SYS_CONFIG *sys_config = + (HostCmd_DS_SYS_CONFIG *) & resp->params.sys_config; + mlan_ds_bss *bss = MNULL; + mlan_ds_misc_cfg *misc = MNULL; + MrvlIEtypes_MacAddr_t *tlv = + (MrvlIEtypes_MacAddr_t *) sys_config->tlv_buffer; + mlan_ds_misc_custom_ie *cust_ie = MNULL; + tlvbuf_max_mgmt_ie *max_mgmt_ie = MNULL; + MrvlIEtypes_channel_band_t *tlv_cb = MNULL; + MrvlIEtypes_beacon_period_t *tlv_bcnpd = MNULL; + MrvlIEtypes_dtim_period_t *tlv_dtimpd = MNULL; + + ENTER(); + if (pioctl_buf) { + if (pioctl_buf->req_id == MLAN_IOCTL_BSS) { + bss = (mlan_ds_bss *) pioctl_buf->pbuf; + if (bss->sub_command == MLAN_OID_BSS_MAC_ADDR) { + if (TLV_TYPE_UAP_MAC_ADDRESS == + wlan_le16_to_cpu(tlv->header.type)) { + memcpy(pmpriv->adapter, + &bss->param.mac_addr, tlv->mac, + MLAN_MAC_ADDR_LENGTH); + } + } else if ((bss->sub_command == MLAN_OID_UAP_BSS_CONFIG) + && (pioctl_buf->action == MLAN_ACT_GET)) { + wlan_uap_ret_cmd_ap_config(pmpriv, resp, + pioctl_buf); + } + } + if (pioctl_buf->req_id == MLAN_IOCTL_MISC_CFG) { + misc = (mlan_ds_misc_cfg *) pioctl_buf->pbuf; + cust_ie = + (mlan_ds_misc_custom_ie *) sys_config-> + tlv_buffer; + max_mgmt_ie = + (tlvbuf_max_mgmt_ie *) (sys_config->tlv_buffer + + cust_ie->len + + sizeof + (MrvlIEtypesHeader_t)); + if ((pioctl_buf->action == MLAN_ACT_GET) && + (misc->sub_command == MLAN_OID_MISC_CUSTOM_IE)) { + + cust_ie->type = wlan_le16_to_cpu(cust_ie->type); + resp_len = cust_ie->len = + wlan_le16_to_cpu(cust_ie->len); + travel_len = 0; + /* conversion for index, mask, len */ + if (resp_len == sizeof(t_u16)) + cust_ie->ie_data_list[0].ie_index = + wlan_cpu_to_le16(cust_ie-> + ie_data_list + [0].ie_index); + + while (resp_len > sizeof(t_u16)) { + cptr = (custom_ie + *) (((t_u8 *) cust_ie-> + ie_data_list) + + travel_len); + cptr->ie_index = + wlan_le16_to_cpu(cptr-> + ie_index); + cptr->mgmt_subtype_mask = + wlan_le16_to_cpu(cptr-> + mgmt_subtype_mask); + cptr->ie_length = + wlan_le16_to_cpu(cptr-> + ie_length); + travel_len += + cptr->ie_length + + sizeof(custom_ie) - MAX_IE_SIZE; + resp_len -= + cptr->ie_length + + sizeof(custom_ie) - MAX_IE_SIZE; + } + memcpy(pmpriv->adapter, &misc->param.cust_ie, + cust_ie, + MIN(sizeof(mlan_ds_misc_custom_ie) - + sizeof(tlvbuf_max_mgmt_ie), + (cust_ie->len + + sizeof(MrvlIEtypesHeader_t)))); + if (max_mgmt_ie) { + max_mgmt_ie->type = + wlan_le16_to_cpu(max_mgmt_ie-> + type); + if (max_mgmt_ie->type == + TLV_TYPE_MAX_MGMT_IE) { + max_mgmt_ie->len = + wlan_le16_to_cpu + (max_mgmt_ie->len); + max_mgmt_ie->count = + wlan_le16_to_cpu + (max_mgmt_ie->count); + for (i = 0; + i < max_mgmt_ie->count; + i++) { + max_mgmt_ie->info[i]. + buf_size = + wlan_le16_to_cpu + (max_mgmt_ie-> + info[i]. + buf_size); + max_mgmt_ie->info[i]. + buf_count = + wlan_le16_to_cpu + (max_mgmt_ie-> + info[i]. + buf_count); + } + /* Append max_mgmt_ie TLV after + custom_ie */ + memcpy(pmpriv->adapter, + (t_u8 *) & misc->param. + cust_ie + (cust_ie->len + + sizeof + (MrvlIEtypesHeader_t)), + max_mgmt_ie, + MIN(sizeof + (tlvbuf_max_mgmt_ie), + max_mgmt_ie->len + + sizeof + (MrvlIEtypesHeader_t))); + } + } + } + } + } else { /* no ioctl: driver generated get/set */ + switch (wlan_le16_to_cpu(tlv->header.type)) { + case TLV_TYPE_UAP_MAC_ADDRESS: + memcpy(pmpriv->adapter, pmpriv->curr_addr, tlv->mac, + MLAN_MAC_ADDR_LENGTH); + break; + case TLV_TYPE_UAP_CHAN_BAND_CONFIG: + tlv_cb = (MrvlIEtypes_channel_band_t *) tlv; + pmpriv->uap_state_chan_cb.band_config = + tlv_cb->band_config; + pmpriv->uap_state_chan_cb.channel = tlv_cb->channel; + /* call callback waiting for channel info */ + if (pmpriv->uap_state_chan_cb.get_chan_callback) + pmpriv->uap_state_chan_cb. + get_chan_callback(pmpriv); + break; + case TLV_TYPE_UAP_BEACON_PERIOD: + tlv_bcnpd = (MrvlIEtypes_beacon_period_t *) tlv; + pmpriv->uap_state_chan_cb.beacon_period = + wlan_le16_to_cpu(tlv_bcnpd->beacon_period); + /* copy dtim_period as well if it follows */ + tlv_dtimpd = + (MrvlIEtypes_dtim_period_t *) (((t_u8 *) tlv) + + sizeof + (MrvlIEtypes_beacon_period_t)); + if (TLV_TYPE_UAP_DTIM_PERIOD == + wlan_le16_to_cpu(tlv_dtimpd->header.type)) + pmpriv->uap_state_chan_cb.dtim_period = + tlv_dtimpd->dtim_period; + /* call callback waiting for beacon/dtim info */ + if (pmpriv->uap_state_chan_cb.get_chan_callback) + pmpriv->uap_state_chan_cb. + get_chan_callback(pmpriv); + break; + case TLV_TYPE_MGMT_IE: + if ((pmpriv->adapter->state_rdh.stage == + RDH_SET_CUSTOM_IE) || + (pmpriv->adapter->state_rdh.stage == + RDH_REM_CUSTOM_IE)) + wlan_11h_radar_detected_callback((t_void *) + pmpriv); + break; + } + } + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** * @brief This function prepares command of snmp_mib - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action the action: GET or SET * @param cmd_oid Cmd oid: treated as sub command - * @param pioctl_buf A pointer to mlan_ioctl_req structure + * @param pioctl_buf A pointer to mlan_ioctl_req structure * @param pdata_buf A pointer to information buffer * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ static mlan_status wlan_uap_cmd_snmp_mib(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, - IN t_u32 cmd_oid, - IN pmlan_ioctl_req pioctl_buf, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, + IN t_u32 cmd_oid, + IN pmlan_ioctl_req pioctl_buf, IN t_void * pdata_buf) { - HostCmd_DS_802_11_SNMP_MIB *psnmp_mib = &cmd->params.smib; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u8 *psnmp_oid = MNULL; - t_u32 ul_temp; - t_u8 i; - - t_u8 snmp_oids[] = { - tkip_mic_failures, - ccmp_decrypt_errors, - wep_undecryptable_count, - wep_icv_error_count, - decrypt_failure_count, - dot11_mcast_tx_count, - dot11_failed_count, - dot11_retry_count, - dot11_multi_retry_count, - dot11_frame_dup_count, - dot11_rts_success_count, - dot11_rts_failure_count, - dot11_ack_failure_count, - dot11_rx_fragment_count, - dot11_mcast_rx_frame_count, - dot11_fcs_error_count, - dot11_tx_frame_count, - dot11_rsna_tkip_cm_invoked, - dot11_rsna_4way_hshk_failures, - }; - - ENTER(); - - if (cmd_action == HostCmd_ACT_GEN_GET) { - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_SNMP_MIB); - psnmp_mib->query_type = wlan_cpu_to_le16(HostCmd_ACT_GEN_GET); - cmd->size = - wlan_cpu_to_le16(sizeof(t_u16) + S_DS_GEN + - sizeof(snmp_oids) * - sizeof(MrvlIEtypes_snmp_oid_t)); - psnmp_oid = (t_u8 *) & psnmp_mib->oid; - for (i = 0; i < sizeof(snmp_oids); i++) { - /* SNMP OID header type */ - *(t_u16 *) psnmp_oid = wlan_cpu_to_le16(snmp_oids[i]); - psnmp_oid += sizeof(t_u16); - /* SNMP OID header length */ - *(t_u16 *) psnmp_oid = wlan_cpu_to_le16(sizeof(t_u32)); - psnmp_oid += sizeof(t_u16) + sizeof(t_u32); - } - } else { /* cmd_action == ACT_SET */ - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_SNMP_MIB); - cmd->size = sizeof(HostCmd_DS_802_11_SNMP_MIB) - 1 + S_DS_GEN; - psnmp_mib->query_type = wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); - - switch (cmd_oid) { - case Dot11D_i: - case Dot11H_i: - psnmp_mib->oid = wlan_cpu_to_le16((t_u16) cmd_oid); - psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u16)); - ul_temp = *(t_u32 *) pdata_buf; - *((t_u16 *) (psnmp_mib->value)) = wlan_cpu_to_le16((t_u16) ul_temp); - cmd->size += sizeof(t_u16); - break; - default: - PRINTM(MERROR, "Unsupported OID.\n"); - ret = MLAN_STATUS_FAILURE; - break; - } - cmd->size = wlan_cpu_to_le16(cmd->size); - } - - LEAVE(); - return ret; + HostCmd_DS_802_11_SNMP_MIB *psnmp_mib = &cmd->params.smib; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u8 *psnmp_oid = MNULL; + t_u32 ul_temp; + t_u8 i; + + t_u8 snmp_oids[] = { + tkip_mic_failures, + ccmp_decrypt_errors, + wep_undecryptable_count, + wep_icv_error_count, + decrypt_failure_count, + dot11_mcast_tx_count, + dot11_failed_count, + dot11_retry_count, + dot11_multi_retry_count, + dot11_frame_dup_count, + dot11_rts_success_count, + dot11_rts_failure_count, + dot11_ack_failure_count, + dot11_rx_fragment_count, + dot11_mcast_rx_frame_count, + dot11_fcs_error_count, + dot11_tx_frame_count, + dot11_rsna_tkip_cm_invoked, + dot11_rsna_4way_hshk_failures, + }; + + ENTER(); + + if (cmd_action == HostCmd_ACT_GEN_GET) { + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_SNMP_MIB); + psnmp_mib->query_type = wlan_cpu_to_le16(HostCmd_ACT_GEN_GET); + cmd->size = + wlan_cpu_to_le16(sizeof(t_u16) + S_DS_GEN + + sizeof(snmp_oids) * + sizeof(MrvlIEtypes_snmp_oid_t)); + psnmp_oid = (t_u8 *) & psnmp_mib->oid; + for (i = 0; i < sizeof(snmp_oids); i++) { + /* SNMP OID header type */ + *(t_u16 *) psnmp_oid = wlan_cpu_to_le16(snmp_oids[i]); + psnmp_oid += sizeof(t_u16); + /* SNMP OID header length */ + *(t_u16 *) psnmp_oid = wlan_cpu_to_le16(sizeof(t_u32)); + psnmp_oid += sizeof(t_u16) + sizeof(t_u32); + } + } else { /* cmd_action == ACT_SET */ + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_SNMP_MIB); + cmd->size = sizeof(HostCmd_DS_802_11_SNMP_MIB) - 1 + S_DS_GEN; + psnmp_mib->query_type = wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); + + switch (cmd_oid) { + case Dot11D_i: + case Dot11H_i: + psnmp_mib->oid = wlan_cpu_to_le16((t_u16) cmd_oid); + psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u16)); + ul_temp = *(t_u32 *) pdata_buf; + *((t_u16 *) (psnmp_mib->value)) = + wlan_cpu_to_le16((t_u16) ul_temp); + cmd->size += sizeof(t_u16); + break; + default: + PRINTM(MERROR, "Unsupported OID.\n"); + ret = MLAN_STATUS_FAILURE; + break; + } + cmd->size = wlan_cpu_to_le16(cmd->size); + } + + LEAVE(); + return ret; } -/** +/** * @brief This function handles the command response of snmp_mib - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND - * @param pioctl_buf A pointer to mlan_ioctl_req structure + * @param pioctl_buf A pointer to mlan_ioctl_req structure * * @return MLAN_STATUS_SUCCESS */ static mlan_status wlan_uap_ret_snmp_mib(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - pmlan_adapter pmadapter = pmpriv->adapter; - HostCmd_DS_802_11_SNMP_MIB *psnmp_mib = - (HostCmd_DS_802_11_SNMP_MIB *) & resp->params.smib; - mlan_ds_get_info *info; - t_u8 *psnmp_oid = MNULL; - t_u32 data; - t_u16 tlv_buf_left = 0; - t_u16 tlv_type = 0; - - ENTER(); - if (psnmp_mib->query_type == HostCmd_ACT_GEN_GET) { - if (!pioctl_buf) { - LEAVE(); - return MLAN_STATUS_SUCCESS; - } - info = (mlan_ds_get_info *) pioctl_buf->pbuf; - tlv_buf_left = resp->size - (sizeof(t_u16) + S_DS_GEN); - psnmp_oid = (t_u8 *) & psnmp_mib->oid; - while (tlv_buf_left >= sizeof(MrvlIEtypes_snmp_oid_t)) { - tlv_type = wlan_le16_to_cpu(*(t_u16 *) psnmp_oid); - psnmp_oid += sizeof(t_u16) + sizeof(t_u16); - memcpy(pmadapter, &data, psnmp_oid, sizeof(t_u32)); - switch (tlv_type) { - case tkip_mic_failures: - info->param.ustats.tkip_mic_failures = wlan_le32_to_cpu(data); - break; - case ccmp_decrypt_errors: - info->param.ustats.ccmp_decrypt_errors = wlan_le32_to_cpu(data); - break; - case wep_undecryptable_count: - info->param.ustats.wep_undecryptable_count = - wlan_le32_to_cpu(data); - break; - case wep_icv_error_count: - info->param.ustats.wep_icv_error_count = wlan_le32_to_cpu(data); - break; - case decrypt_failure_count: - info->param.ustats.decrypt_failure_count = - wlan_le32_to_cpu(data); - break; - case dot11_mcast_tx_count: - info->param.ustats.mcast_tx_count = wlan_le32_to_cpu(data); - break; - case dot11_failed_count: - info->param.ustats.failed_count = wlan_le32_to_cpu(data); - break; - case dot11_retry_count: - info->param.ustats.retry_count = wlan_le32_to_cpu(data); - break; - case dot11_multi_retry_count: - info->param.ustats.multi_retry_count = wlan_le32_to_cpu(data); - break; - case dot11_frame_dup_count: - info->param.ustats.frame_dup_count = wlan_le32_to_cpu(data); - break; - case dot11_rts_success_count: - info->param.ustats.rts_success_count = wlan_le32_to_cpu(data); - break; - case dot11_rts_failure_count: - info->param.ustats.rts_failure_count = wlan_le32_to_cpu(data); - break; - case dot11_ack_failure_count: - info->param.ustats.ack_failure_count = wlan_le32_to_cpu(data); - break; - case dot11_rx_fragment_count: - info->param.ustats.rx_fragment_count = wlan_le32_to_cpu(data); - break; - case dot11_mcast_rx_frame_count: - info->param.ustats.mcast_rx_frame_count = - wlan_le32_to_cpu(data); - break; - case dot11_fcs_error_count: - info->param.ustats.fcs_error_count = wlan_le32_to_cpu(data); - break; - case dot11_tx_frame_count: - info->param.ustats.tx_frame_count = wlan_le32_to_cpu(data); - break; - case dot11_rsna_tkip_cm_invoked: - info->param.ustats.rsna_tkip_cm_invoked = - wlan_le32_to_cpu(data); - break; - case dot11_rsna_4way_hshk_failures: - info->param.ustats.rsna_4way_hshk_failures = - wlan_le32_to_cpu(data); - break; - } - tlv_buf_left -= sizeof(MrvlIEtypes_snmp_oid_t); - psnmp_oid += sizeof(t_u32); - } - } else { /* ACT_SET */ - switch (psnmp_mib->oid) { - case Dot11D_i: - data = wlan_le16_to_cpu(*((t_u16 *) (psnmp_mib->value))); - /* Set 11d state to private */ - pmpriv->state_11d.enable_11d = data; - /* Set user enable flag if called from ioctl */ - if (pioctl_buf) - pmpriv->state_11d.user_enable_11d = data; - break; - case Dot11H_i: - data = wlan_le16_to_cpu(*((t_u16 *) (psnmp_mib->value))); - /* Set 11h state to priv */ - pmpriv->intf_state_11h.is_11h_active = (data & ENABLE_11H_MASK); - /* Set radar_det state to adapter */ - pmpriv->adapter->state_11h.is_master_radar_det_active - = (data & MASTER_RADAR_DET_MASK) ? MTRUE : MFALSE; - pmpriv->adapter->state_11h.is_slave_radar_det_active - = (data & SLAVE_RADAR_DET_MASK) ? MTRUE : MFALSE; - break; - } - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + pmlan_adapter pmadapter = pmpriv->adapter; + HostCmd_DS_802_11_SNMP_MIB *psnmp_mib = + (HostCmd_DS_802_11_SNMP_MIB *) & resp->params.smib; + mlan_ds_get_info *info; + t_u8 *psnmp_oid = MNULL; + t_u32 data; + t_u16 tlv_buf_left = 0; + t_u16 tlv_type = 0; + + ENTER(); + if (psnmp_mib->query_type == HostCmd_ACT_GEN_GET) { + if (!pioctl_buf) { + LEAVE(); + return MLAN_STATUS_SUCCESS; + } + info = (mlan_ds_get_info *) pioctl_buf->pbuf; + tlv_buf_left = resp->size - (sizeof(t_u16) + S_DS_GEN); + psnmp_oid = (t_u8 *) & psnmp_mib->oid; + while (tlv_buf_left >= sizeof(MrvlIEtypes_snmp_oid_t)) { + tlv_type = wlan_le16_to_cpu(*(t_u16 *) psnmp_oid); + psnmp_oid += sizeof(t_u16) + sizeof(t_u16); + memcpy(pmadapter, &data, psnmp_oid, sizeof(t_u32)); + switch (tlv_type) { + case tkip_mic_failures: + info->param.ustats.tkip_mic_failures = + wlan_le32_to_cpu(data); + break; + case ccmp_decrypt_errors: + info->param.ustats.ccmp_decrypt_errors = + wlan_le32_to_cpu(data); + break; + case wep_undecryptable_count: + info->param.ustats.wep_undecryptable_count = + wlan_le32_to_cpu(data); + break; + case wep_icv_error_count: + info->param.ustats.wep_icv_error_count = + wlan_le32_to_cpu(data); + break; + case decrypt_failure_count: + info->param.ustats.decrypt_failure_count = + wlan_le32_to_cpu(data); + break; + case dot11_mcast_tx_count: + info->param.ustats.mcast_tx_count = + wlan_le32_to_cpu(data); + break; + case dot11_failed_count: + info->param.ustats.failed_count = + wlan_le32_to_cpu(data); + break; + case dot11_retry_count: + info->param.ustats.retry_count = + wlan_le32_to_cpu(data); + break; + case dot11_multi_retry_count: + info->param.ustats.multi_retry_count = + wlan_le32_to_cpu(data); + break; + case dot11_frame_dup_count: + info->param.ustats.frame_dup_count = + wlan_le32_to_cpu(data); + break; + case dot11_rts_success_count: + info->param.ustats.rts_success_count = + wlan_le32_to_cpu(data); + break; + case dot11_rts_failure_count: + info->param.ustats.rts_failure_count = + wlan_le32_to_cpu(data); + break; + case dot11_ack_failure_count: + info->param.ustats.ack_failure_count = + wlan_le32_to_cpu(data); + break; + case dot11_rx_fragment_count: + info->param.ustats.rx_fragment_count = + wlan_le32_to_cpu(data); + break; + case dot11_mcast_rx_frame_count: + info->param.ustats.mcast_rx_frame_count = + wlan_le32_to_cpu(data); + break; + case dot11_fcs_error_count: + info->param.ustats.fcs_error_count = + wlan_le32_to_cpu(data); + break; + case dot11_tx_frame_count: + info->param.ustats.tx_frame_count = + wlan_le32_to_cpu(data); + break; + case dot11_rsna_tkip_cm_invoked: + info->param.ustats.rsna_tkip_cm_invoked = + wlan_le32_to_cpu(data); + break; + case dot11_rsna_4way_hshk_failures: + info->param.ustats.rsna_4way_hshk_failures = + wlan_le32_to_cpu(data); + break; + } + tlv_buf_left -= sizeof(MrvlIEtypes_snmp_oid_t); + psnmp_oid += sizeof(t_u32); + } + } else { /* ACT_SET */ + switch (psnmp_mib->oid) { + case Dot11D_i: + data = wlan_le16_to_cpu(* + ((t_u16 *) (psnmp_mib->value))); + /* Set 11d state to private */ + pmpriv->state_11d.enable_11d = data; + /* Set user enable flag if called from ioctl */ + if (pioctl_buf) + pmpriv->state_11d.user_enable_11d = data; + break; + case Dot11H_i: + data = wlan_le16_to_cpu(* + ((t_u16 *) (psnmp_mib->value))); + /* Set 11h state to priv */ + pmpriv->intf_state_11h.is_11h_active = + (data & ENABLE_11H_MASK); + /* Set radar_det state to adapter */ + pmpriv->adapter->state_11h.is_master_radar_det_active + = + (data & MASTER_RADAR_DET_MASK) ? MTRUE : MFALSE; + pmpriv->adapter->state_11h.is_slave_radar_det_active = + (data & SLAVE_RADAR_DET_MASK) ? MTRUE : MFALSE; + break; + } + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** * @brief This function prepares command of deauth station - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param pdata_buf A pointer to data buffer @@ -1957,25 +2249,25 @@ wlan_uap_ret_snmp_mib(IN pmlan_private pmpriv, */ static mlan_status wlan_uap_cmd_sta_deauth(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) { - HostCmd_DS_STA_DEAUTH *pcmd_sta_deauth = - (HostCmd_DS_STA_DEAUTH *) & cmd->params.sta_deauth; - mlan_deauth_param *deauth = (mlan_deauth_param *) pdata_buf; - - ENTER(); - cmd->command = wlan_cpu_to_le16(HOST_CMD_APCMD_STA_DEAUTH); - cmd->size = wlan_cpu_to_le16(S_DS_GEN + sizeof(HostCmd_DS_STA_DEAUTH)); - memcpy(pmpriv->adapter, pcmd_sta_deauth->mac, deauth->mac_addr, - MLAN_MAC_ADDR_LENGTH); - pcmd_sta_deauth->reason = wlan_cpu_to_le16(deauth->reason_code); - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_STA_DEAUTH *pcmd_sta_deauth = + (HostCmd_DS_STA_DEAUTH *) & cmd->params.sta_deauth; + mlan_deauth_param *deauth = (mlan_deauth_param *) pdata_buf; + + ENTER(); + cmd->command = wlan_cpu_to_le16(HOST_CMD_APCMD_STA_DEAUTH); + cmd->size = wlan_cpu_to_le16(S_DS_GEN + sizeof(HostCmd_DS_STA_DEAUTH)); + memcpy(pmpriv->adapter, pcmd_sta_deauth->mac, deauth->mac_addr, + MLAN_MAC_ADDR_LENGTH); + pcmd_sta_deauth->reason = wlan_cpu_to_le16(deauth->reason_code); + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** * @brief This function prepares command of key material - * + * * @param pmpriv A pointer to mlan_private structure * @param cmd A pointer to HostCmd_DS_COMMAND structure * @param cmd_action The action: GET or SET @@ -1985,233 +2277,251 @@ wlan_uap_cmd_sta_deauth(pmlan_private pmpriv, */ static mlan_status wlan_uap_cmd_key_material(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * cmd, - IN t_u16 cmd_action, - IN t_u16 cmd_oid, IN t_void * pdata_buf) + IN HostCmd_DS_COMMAND * cmd, + IN t_u16 cmd_action, + IN t_u16 cmd_oid, IN t_void * pdata_buf) { - HostCmd_DS_802_11_KEY_MATERIAL *pkey_material = &cmd->params.key_material; - mlan_ds_encrypt_key *pkey = (mlan_ds_encrypt_key *) pdata_buf; - MrvlIEtypes_MacAddr_t *tlv = MNULL; - const t_u8 bc_mac[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; - t_u16 key_param_len = 0; - mlan_status ret = MLAN_STATUS_SUCCESS; - sta_node *sta_ptr = MNULL; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_KEY_MATERIAL); - pkey_material->action = wlan_cpu_to_le16(cmd_action); - - if (cmd_action == HostCmd_ACT_GEN_GET) { - cmd->size = wlan_cpu_to_le16(sizeof(pkey_material->action) + S_DS_GEN); - goto done; - } - - memset(pmpriv->adapter, &pkey_material->key_param_set, 0, - sizeof(MrvlIEtype_KeyParamSet_t)); - if (pkey->is_wapi_key) { - PRINTM(MINFO, "Set WAPI Key\n"); - pkey_material->key_param_set.key_type_id = - wlan_cpu_to_le16(KEY_TYPE_ID_WAPI); - if (cmd_oid == KEY_INFO_ENABLED) - pkey_material->key_param_set.key_info = - wlan_cpu_to_le16(KEY_INFO_WAPI_ENABLED); - else - pkey_material->key_param_set.key_info = - !(wlan_cpu_to_le16(KEY_INFO_WAPI_ENABLED)); - - pkey_material->key_param_set.key[0] = pkey->key_index; - if (!pmpriv->sec_info.wapi_key_on) - pkey_material->key_param_set.key[1] = 1; - else - pkey_material->key_param_set.key[1] = 0; /* set 0 when re-key */ - - if (0 != memcmp(pmpriv->adapter, pkey->mac_addr, bc_mac, sizeof(bc_mac))) { /* WAPI - pairwise - key: - unicast - */ - pkey_material->key_param_set.key_info |= - wlan_cpu_to_le16(KEY_INFO_WAPI_UNICAST); - if ((sta_ptr = wlan_add_station_entry(pmpriv, pkey->mac_addr))) { - PRINTM(MCMND, "station: wapi_key_on\n"); - sta_ptr->wapi_key_on = MTRUE; - } - } else { /* WAPI group key: multicast */ - pkey_material->key_param_set.key_info |= - wlan_cpu_to_le16(KEY_INFO_WAPI_MCAST); - pmpriv->sec_info.wapi_key_on = MTRUE; - } - pkey_material->key_param_set.type = - wlan_cpu_to_le16(TLV_TYPE_KEY_MATERIAL); - pkey_material->key_param_set.key_len = wlan_cpu_to_le16(WAPI_KEY_LEN); - memcpy(pmpriv->adapter, &pkey_material->key_param_set.key[2], - pkey->key_material, pkey->key_len); - pkey_material->key_param_set.length = - wlan_cpu_to_le16(WAPI_KEY_LEN + KEYPARAMSET_FIXED_LEN); - - key_param_len = - (WAPI_KEY_LEN + KEYPARAMSET_FIXED_LEN) + - sizeof(MrvlIEtypesHeader_t); - tlv = - (MrvlIEtypes_MacAddr_t *) ((t_u8 *) & pkey_material->key_param_set + - key_param_len); - tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_STA_MAC_ADDRESS); - tlv->header.len = wlan_cpu_to_le16(MLAN_MAC_ADDR_LENGTH); - memcpy(pmpriv->adapter, tlv->mac, pkey->mac_addr, MLAN_MAC_ADDR_LENGTH); - cmd->size = - wlan_cpu_to_le16(key_param_len + sizeof(pkey_material->action) + - S_DS_GEN + sizeof(MrvlIEtypes_MacAddr_t)); - goto done; - } - /* IGTK key length is the same as AES key length */ - if (pkey->key_len == WPA_AES_KEY_LEN && - !(pkey->key_flags & KEY_FLAG_AES_MCAST_IGTK)) { - PRINTM(MCMND, "WPA_AES\n"); - pkey_material->key_param_set.key_type_id = - wlan_cpu_to_le16(KEY_TYPE_ID_AES); - if (cmd_oid == KEY_INFO_ENABLED) - pkey_material->key_param_set.key_info = - wlan_cpu_to_le16(KEY_INFO_AES_ENABLED); - else - pkey_material->key_param_set.key_info = - !(wlan_cpu_to_le16(KEY_INFO_AES_ENABLED)); - - if (memcmp(pmpriv->adapter, pkey->mac_addr, bc_mac, sizeof(bc_mac))) /* AES - pairwise - key: - unicast - */ - pkey_material->key_param_set.key_info |= - wlan_cpu_to_le16(KEY_INFO_AES_UNICAST); - else /* AES group key: multicast */ - pkey_material->key_param_set.key_info |= - wlan_cpu_to_le16(KEY_INFO_AES_MCAST); - } else if ((pkey->key_flags & KEY_FLAG_AES_MCAST_IGTK) && - pkey->key_len == WPA_IGTK_KEY_LEN) { - PRINTM(MCMND, "WPA_AES_CMAC\n"); - pkey_material->key_param_set.key_type_id = - wlan_cpu_to_le16(KEY_TYPE_ID_AES_CMAC); - if (cmd_oid == KEY_INFO_ENABLED) - pkey_material->key_param_set.key_info = - wlan_cpu_to_le16(KEY_INFO_AES_ENABLED); - else - pkey_material->key_param_set.key_info = - !(wlan_cpu_to_le16(KEY_INFO_AES_ENABLED)); - - pkey_material->key_param_set.key_info |= - wlan_cpu_to_le16(KEY_INFO_AES_MCAST_IGTK); - } else if (pkey->key_len == WPA_TKIP_KEY_LEN) { - PRINTM(MCMND, "WPA_TKIP\n"); - pkey_material->key_param_set.key_type_id = - wlan_cpu_to_le16(KEY_TYPE_ID_TKIP); - pkey_material->key_param_set.key_info = - wlan_cpu_to_le16(KEY_INFO_TKIP_ENABLED); - - if (memcmp(pmpriv->adapter, pkey->mac_addr, bc_mac, sizeof(bc_mac))) /* TKIP - pairwise - key: - unicast - */ - pkey_material->key_param_set.key_info |= - wlan_cpu_to_le16(KEY_INFO_TKIP_UNICAST); - else /* TKIP group key: multicast */ - pkey_material->key_param_set.key_info |= - wlan_cpu_to_le16(KEY_INFO_TKIP_MCAST); - } - - if (pkey_material->key_param_set.key_type_id) { - pkey_material->key_param_set.type = - wlan_cpu_to_le16(TLV_TYPE_KEY_MATERIAL); - pkey_material->key_param_set.key_len = wlan_cpu_to_le16(pkey->key_len); - memcpy(pmpriv->adapter, pkey_material->key_param_set.key, - pkey->key_material, pkey->key_len); - pkey_material->key_param_set.length = - wlan_cpu_to_le16((t_u16) pkey->key_len + KEYPARAMSET_FIXED_LEN); - key_param_len = - (pkey->key_len + KEYPARAMSET_FIXED_LEN) + - sizeof(MrvlIEtypesHeader_t); - /* key format with pn field is defined in Key Material V1 */ - if (pkey_material->key_param_set.key_type_id == - wlan_cpu_to_le16(KEY_TYPE_ID_AES_CMAC)) { - cmac_param *param; - param = (cmac_param *) pkey_material->key_param_set.key; - memcpy(pmpriv->adapter, param->ipn, pkey->pn, SEQ_MAX_SIZE); - memcpy(pmpriv->adapter, param->key, pkey->key_material, - pkey->key_len); - - pkey_material->key_param_set.key_len = - wlan_cpu_to_le16((t_u16) sizeof(cmac_param)); - pkey_material->key_param_set.length = - wlan_cpu_to_le16((t_u16) sizeof(cmac_param) + - KEYPARAMSET_FIXED_LEN); - key_param_len = - (t_u16) (sizeof(cmac_param) + KEYPARAMSET_FIXED_LEN) + - sizeof(MrvlIEtypesHeader_t); - } - - tlv = - (MrvlIEtypes_MacAddr_t *) ((t_u8 *) & pkey_material->key_param_set + - key_param_len); - tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_STA_MAC_ADDRESS); - tlv->header.len = wlan_cpu_to_le16(MLAN_MAC_ADDR_LENGTH); - memcpy(pmpriv->adapter, tlv->mac, pkey->mac_addr, MLAN_MAC_ADDR_LENGTH); - cmd->size = - wlan_cpu_to_le16(key_param_len + sizeof(pkey_material->action) + - S_DS_GEN + sizeof(MrvlIEtypes_MacAddr_t)); - } - done: - LEAVE(); - return ret; + HostCmd_DS_802_11_KEY_MATERIAL *pkey_material = + &cmd->params.key_material; + mlan_ds_encrypt_key *pkey = (mlan_ds_encrypt_key *) pdata_buf; + MrvlIEtypes_MacAddr_t *tlv = MNULL; + const t_u8 bc_mac[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + t_u16 key_param_len = 0; + mlan_status ret = MLAN_STATUS_SUCCESS; + sta_node *sta_ptr = MNULL; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_KEY_MATERIAL); + pkey_material->action = wlan_cpu_to_le16(cmd_action); + + if (cmd_action == HostCmd_ACT_GEN_GET) { + cmd->size = + wlan_cpu_to_le16(sizeof(pkey_material->action) + + S_DS_GEN); + goto done; + } + + memset(pmpriv->adapter, &pkey_material->key_param_set, 0, + sizeof(MrvlIEtype_KeyParamSet_t)); + if (pkey->is_wapi_key) { + PRINTM(MINFO, "Set WAPI Key\n"); + pkey_material->key_param_set.key_type_id = + wlan_cpu_to_le16(KEY_TYPE_ID_WAPI); + if (cmd_oid == KEY_INFO_ENABLED) + pkey_material->key_param_set.key_info = + wlan_cpu_to_le16(KEY_INFO_WAPI_ENABLED); + else + pkey_material->key_param_set.key_info = + !(wlan_cpu_to_le16(KEY_INFO_WAPI_ENABLED)); + + pkey_material->key_param_set.key[0] = pkey->key_index; + if (!pmpriv->sec_info.wapi_key_on) + pkey_material->key_param_set.key[1] = 1; + else + pkey_material->key_param_set.key[1] = 0; /* set + 0 + when + re-key + */ + + if (0 != memcmp(pmpriv->adapter, pkey->mac_addr, bc_mac, sizeof(bc_mac))) { /* WAPI + pairwise + key: + unicast + */ + pkey_material->key_param_set.key_info |= + wlan_cpu_to_le16(KEY_INFO_WAPI_UNICAST); + if ((sta_ptr = + wlan_add_station_entry(pmpriv, pkey->mac_addr))) { + PRINTM(MCMND, "station: wapi_key_on\n"); + sta_ptr->wapi_key_on = MTRUE; + } + } else { /* WAPI group key: multicast */ + pkey_material->key_param_set.key_info |= + wlan_cpu_to_le16(KEY_INFO_WAPI_MCAST); + pmpriv->sec_info.wapi_key_on = MTRUE; + } + pkey_material->key_param_set.type = + wlan_cpu_to_le16(TLV_TYPE_KEY_MATERIAL); + pkey_material->key_param_set.key_len = + wlan_cpu_to_le16(WAPI_KEY_LEN); + memcpy(pmpriv->adapter, &pkey_material->key_param_set.key[2], + pkey->key_material, pkey->key_len); + pkey_material->key_param_set.length = + wlan_cpu_to_le16(WAPI_KEY_LEN + KEYPARAMSET_FIXED_LEN); + + key_param_len = + (WAPI_KEY_LEN + KEYPARAMSET_FIXED_LEN) + + sizeof(MrvlIEtypesHeader_t); + tlv = (MrvlIEtypes_MacAddr_t *) ((t_u8 *) & pkey_material-> + key_param_set + key_param_len); + tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_STA_MAC_ADDRESS); + tlv->header.len = wlan_cpu_to_le16(MLAN_MAC_ADDR_LENGTH); + memcpy(pmpriv->adapter, tlv->mac, pkey->mac_addr, + MLAN_MAC_ADDR_LENGTH); + cmd->size = + wlan_cpu_to_le16(key_param_len + + sizeof(pkey_material->action) + + S_DS_GEN + + sizeof(MrvlIEtypes_MacAddr_t)); + goto done; + } + /* IGTK key length is the same as AES key length */ + if (pkey->key_len == WPA_AES_KEY_LEN && + !(pkey->key_flags & KEY_FLAG_AES_MCAST_IGTK)) { + PRINTM(MCMND, "WPA_AES\n"); + pkey_material->key_param_set.key_type_id = + wlan_cpu_to_le16(KEY_TYPE_ID_AES); + if (cmd_oid == KEY_INFO_ENABLED) + pkey_material->key_param_set.key_info = + wlan_cpu_to_le16(KEY_INFO_AES_ENABLED); + else + pkey_material->key_param_set.key_info = + !(wlan_cpu_to_le16(KEY_INFO_AES_ENABLED)); + + if (memcmp(pmpriv->adapter, pkey->mac_addr, bc_mac, sizeof(bc_mac))) /* AES + pairwise + key: + unicast + */ + pkey_material->key_param_set.key_info |= + wlan_cpu_to_le16(KEY_INFO_AES_UNICAST); + else /* AES group key: multicast */ + pkey_material->key_param_set.key_info |= + wlan_cpu_to_le16(KEY_INFO_AES_MCAST); + } else if ((pkey->key_flags & KEY_FLAG_AES_MCAST_IGTK) && + pkey->key_len == WPA_IGTK_KEY_LEN) { + PRINTM(MCMND, "WPA_AES_CMAC\n"); + pkey_material->key_param_set.key_type_id = + wlan_cpu_to_le16(KEY_TYPE_ID_AES_CMAC); + if (cmd_oid == KEY_INFO_ENABLED) + pkey_material->key_param_set.key_info = + wlan_cpu_to_le16(KEY_INFO_AES_ENABLED); + else + pkey_material->key_param_set.key_info = + !(wlan_cpu_to_le16(KEY_INFO_AES_ENABLED)); + + pkey_material->key_param_set.key_info |= + wlan_cpu_to_le16(KEY_INFO_AES_MCAST_IGTK); + } else if (pkey->key_len == WPA_TKIP_KEY_LEN) { + PRINTM(MCMND, "WPA_TKIP\n"); + pkey_material->key_param_set.key_type_id = + wlan_cpu_to_le16(KEY_TYPE_ID_TKIP); + pkey_material->key_param_set.key_info = + wlan_cpu_to_le16(KEY_INFO_TKIP_ENABLED); + + if (memcmp(pmpriv->adapter, pkey->mac_addr, bc_mac, sizeof(bc_mac))) /* TKIP + pairwise + key: + unicast + */ + pkey_material->key_param_set.key_info |= + wlan_cpu_to_le16(KEY_INFO_TKIP_UNICAST); + else /* TKIP group key: multicast */ + pkey_material->key_param_set.key_info |= + wlan_cpu_to_le16(KEY_INFO_TKIP_MCAST); + } + + if (pkey_material->key_param_set.key_type_id) { + pkey_material->key_param_set.type = + wlan_cpu_to_le16(TLV_TYPE_KEY_MATERIAL); + pkey_material->key_param_set.key_len = + wlan_cpu_to_le16(pkey->key_len); + memcpy(pmpriv->adapter, pkey_material->key_param_set.key, + pkey->key_material, pkey->key_len); + pkey_material->key_param_set.length = + wlan_cpu_to_le16((t_u16) pkey->key_len + + KEYPARAMSET_FIXED_LEN); + key_param_len = + (pkey->key_len + KEYPARAMSET_FIXED_LEN) + + sizeof(MrvlIEtypesHeader_t); + /* key format with pn field is defined in Key Material V1 */ + if (pkey_material->key_param_set.key_type_id == + wlan_cpu_to_le16(KEY_TYPE_ID_AES_CMAC)) { + cmac_param *param; + param = (cmac_param *) pkey_material->key_param_set.key; + memcpy(pmpriv->adapter, param->ipn, pkey->pn, + SEQ_MAX_SIZE); + memcpy(pmpriv->adapter, param->key, pkey->key_material, + pkey->key_len); + + pkey_material->key_param_set.key_len = + wlan_cpu_to_le16((t_u16) sizeof(cmac_param)); + pkey_material->key_param_set.length = + wlan_cpu_to_le16((t_u16) sizeof(cmac_param) + + KEYPARAMSET_FIXED_LEN); + key_param_len = + (t_u16) (sizeof(cmac_param) + + KEYPARAMSET_FIXED_LEN) + + sizeof(MrvlIEtypesHeader_t); + } + + tlv = (MrvlIEtypes_MacAddr_t *) ((t_u8 *) & pkey_material-> + key_param_set + key_param_len); + tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_STA_MAC_ADDRESS); + tlv->header.len = wlan_cpu_to_le16(MLAN_MAC_ADDR_LENGTH); + memcpy(pmpriv->adapter, tlv->mac, pkey->mac_addr, + MLAN_MAC_ADDR_LENGTH); + cmd->size = + wlan_cpu_to_le16(key_param_len + + sizeof(pkey_material->action) + + S_DS_GEN + + sizeof(MrvlIEtypes_MacAddr_t)); + } +done: + LEAVE(); + return ret; } -/** +/** * @brief This function handles the command response of sta_list - * + * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND - * @param pioctl_buf A pointer to mlan_ioctl_req structure + * @param pioctl_buf A pointer to mlan_ioctl_req structure * * @return MLAN_STATUS_SUCCESS */ static mlan_status wlan_uap_ret_sta_list(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - IN mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + IN mlan_ioctl_req * pioctl_buf) { - HostCmd_DS_STA_LIST *sta_list = - (HostCmd_DS_STA_LIST *) & resp->params.sta_list; - mlan_ds_get_info *info; - MrvlIEtypes_sta_info_t *tlv = MNULL; - t_u8 i = 0; - - ENTER(); - if (pioctl_buf) { - info = (mlan_ds_get_info *) pioctl_buf->pbuf; - info->param.sta_list.sta_count = wlan_le16_to_cpu(sta_list->sta_count); - tlv = - (MrvlIEtypes_sta_info_t *) ((t_u8 *) sta_list + - sizeof(HostCmd_DS_STA_LIST)); - info->param.sta_list.sta_count = - MIN(info->param.sta_list.sta_count, MAX_NUM_CLIENTS); - for (i = 0; i < info->param.sta_list.sta_count; i++) { - memcpy(pmpriv->adapter, info->param.sta_list.info[i].mac_address, - tlv->mac_address, MLAN_MAC_ADDR_LENGTH); - info->param.sta_list.info[i].power_mfg_status = - tlv->power_mfg_status; - info->param.sta_list.info[i].rssi = tlv->rssi; - tlv++; - } - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + HostCmd_DS_STA_LIST *sta_list = + (HostCmd_DS_STA_LIST *) & resp->params.sta_list; + mlan_ds_get_info *info; + MrvlIEtypes_sta_info_t *tlv = MNULL; + t_u8 i = 0; + + ENTER(); + if (pioctl_buf) { + info = (mlan_ds_get_info *) pioctl_buf->pbuf; + info->param.sta_list.sta_count = + wlan_le16_to_cpu(sta_list->sta_count); + tlv = (MrvlIEtypes_sta_info_t *) ((t_u8 *) sta_list + + sizeof(HostCmd_DS_STA_LIST)); + info->param.sta_list.sta_count = + MIN(info->param.sta_list.sta_count, MAX_NUM_CLIENTS); + for (i = 0; i < info->param.sta_list.sta_count; i++) { + memcpy(pmpriv->adapter, + info->param.sta_list.info[i].mac_address, + tlv->mac_address, MLAN_MAC_ADDR_LENGTH); + info->param.sta_list.info[i].power_mfg_status = + tlv->power_mfg_status; + info->param.sta_list.info[i].rssi = tlv->rssi; + tlv++; + } + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** * @brief This function will search for the specific ie - * - * + * + * * @param priv A pointer to mlan_private * @param pevent A pointer to event buf * @param sta_ptr A pointer to sta_node @@ -2220,97 +2530,118 @@ wlan_uap_ret_sta_list(IN pmlan_private pmpriv, */ static void wlan_check_sta_capability(pmlan_private priv, pmlan_buffer pevent, - sta_node * sta_ptr) + sta_node * sta_ptr) { - t_u16 tlv_type, tlv_len; - t_u16 frame_control, frame_sub_type = 0; - t_u8 *assoc_req_ie = MNULL; - t_u8 ie_len = 0, assoc_ie_len = 0; - IEEEtypes_HTCap_t *pht_cap = MNULL; - IEEEtypes_VHTCap_t *pvht_cap = MNULL; - int tlv_buf_left = pevent->data_len - ASSOC_EVENT_FIX_SIZE; - MrvlIEtypesHeader_t *tlv = (MrvlIEtypesHeader_t *) - (pevent->pbuf + pevent->data_offset + ASSOC_EVENT_FIX_SIZE); - MrvlIETypes_MgmtFrameSet_t *mgmt_tlv = MNULL; - - ENTER(); - while (tlv_buf_left >= (int) sizeof(MrvlIEtypesHeader_t)) { - tlv_type = wlan_le16_to_cpu(tlv->type); - tlv_len = wlan_le16_to_cpu(tlv->len); - if ((sizeof(MrvlIEtypesHeader_t) + tlv_len) > - (unsigned int) tlv_buf_left) { - PRINTM(MERROR, "wrong tlv: tlvLen=%d, tlvBufLeft=%d\n", tlv_len, - tlv_buf_left); - break; - } - if (tlv_type == TLV_TYPE_UAP_MGMT_FRAME) { - mgmt_tlv = (MrvlIETypes_MgmtFrameSet_t *) tlv; - memcpy(priv->adapter, &frame_control, - (t_u8 *) & (mgmt_tlv->frame_control), sizeof(frame_control)); - frame_sub_type = IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE(frame_control); - if ((mgmt_tlv->frame_control.type == 0) && - ((frame_sub_type == SUBTYPE_ASSOC_REQUEST) || - (frame_sub_type == SUBTYPE_REASSOC_REQUEST))) { - - if (frame_sub_type == SUBTYPE_ASSOC_REQUEST) - assoc_ie_len = sizeof(IEEEtypes_AssocRqst_t); - else if (frame_sub_type == SUBTYPE_REASSOC_REQUEST) - assoc_ie_len = sizeof(IEEEtypes_ReAssocRqst_t); - - ie_len = tlv_len - sizeof(IEEEtypes_FrameCtl_t) - assoc_ie_len; - assoc_req_ie = - (t_u8 *) tlv + sizeof(MrvlIETypes_MgmtFrameSet_t) + - assoc_ie_len; - sta_ptr->is_wmm_enabled = - wlan_is_wmm_ie_present(priv->adapter, assoc_req_ie, ie_len); - PRINTM(MCMND, "STA: is_wmm_enabled=%d\n", - sta_ptr->is_wmm_enabled); - pht_cap = - (IEEEtypes_HTCap_t *) wlan_get_specific_ie(priv, - assoc_req_ie, - ie_len, - HT_CAPABILITY); - if (pht_cap) { - PRINTM(MCMND, "STA supports 11n\n"); - sta_ptr->is_11n_enabled = MTRUE; - if (GETHT_MAXAMSDU(pht_cap->ht_cap.ht_cap_info)) - sta_ptr->max_amsdu = MLAN_TX_DATA_BUF_SIZE_8K; - else - sta_ptr->max_amsdu = MLAN_TX_DATA_BUF_SIZE_4K; - } else { - PRINTM(MCMND, "STA doesn't support 11n\n"); - } - pvht_cap = - (IEEEtypes_VHTCap_t *) wlan_get_specific_ie(priv, - assoc_req_ie, - ie_len, - VHT_CAPABILITY); - if (pvht_cap && (priv->is_11ac_enabled == MTRUE)) { - PRINTM(MCMND, "STA supports 11ac\n"); - sta_ptr->is_11ac_enabled = MTRUE; - if (GET_VHTCAP_MAXMPDULEN(pvht_cap->vht_cap.vht_cap_info) == - 2) - sta_ptr->max_amsdu = MLAN_TX_DATA_BUF_SIZE_12K; - else if (GET_VHTCAP_MAXMPDULEN - (pvht_cap->vht_cap.vht_cap_info) - == 1) - sta_ptr->max_amsdu = MLAN_TX_DATA_BUF_SIZE_8K; - else - sta_ptr->max_amsdu = MLAN_TX_DATA_BUF_SIZE_4K; - } else { - PRINTM(MCMND, "STA doesn't support 11ac\n"); - } - break; - } - } - tlv_buf_left -= (sizeof(MrvlIEtypesHeader_t) + tlv_len); - tlv = - (MrvlIEtypesHeader_t *) ((t_u8 *) tlv + tlv_len + - sizeof(MrvlIEtypesHeader_t)); - } - LEAVE(); - - return; + t_u16 tlv_type, tlv_len; + t_u16 frame_control, frame_sub_type = 0; + t_u8 *assoc_req_ie = MNULL; + t_u8 ie_len = 0, assoc_ie_len = 0; + IEEEtypes_HTCap_t *pht_cap = MNULL; + IEEEtypes_VHTCap_t *pvht_cap = MNULL; + int tlv_buf_left = pevent->data_len - ASSOC_EVENT_FIX_SIZE; + MrvlIEtypesHeader_t *tlv = (MrvlIEtypesHeader_t *) + (pevent->pbuf + pevent->data_offset + ASSOC_EVENT_FIX_SIZE); + MrvlIETypes_MgmtFrameSet_t *mgmt_tlv = MNULL; + + ENTER(); + while (tlv_buf_left >= (int)sizeof(MrvlIEtypesHeader_t)) { + tlv_type = wlan_le16_to_cpu(tlv->type); + tlv_len = wlan_le16_to_cpu(tlv->len); + if ((sizeof(MrvlIEtypesHeader_t) + tlv_len) > + (unsigned int)tlv_buf_left) { + PRINTM(MERROR, "wrong tlv: tlvLen=%d, tlvBufLeft=%d\n", + tlv_len, tlv_buf_left); + break; + } + if (tlv_type == TLV_TYPE_UAP_MGMT_FRAME) { + mgmt_tlv = (MrvlIETypes_MgmtFrameSet_t *) tlv; + memcpy(priv->adapter, &frame_control, + (t_u8 *) & (mgmt_tlv->frame_control), + sizeof(frame_control)); + frame_sub_type = + IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE + (frame_control); + if ((mgmt_tlv->frame_control.type == 0) && + ((frame_sub_type == SUBTYPE_ASSOC_REQUEST) || + (frame_sub_type == SUBTYPE_REASSOC_REQUEST))) { + + if (frame_sub_type == SUBTYPE_ASSOC_REQUEST) + assoc_ie_len = + sizeof(IEEEtypes_AssocRqst_t); + else if (frame_sub_type == + SUBTYPE_REASSOC_REQUEST) + assoc_ie_len = + sizeof(IEEEtypes_ReAssocRqst_t); + + ie_len = tlv_len - + sizeof(IEEEtypes_FrameCtl_t) - + assoc_ie_len; + assoc_req_ie = + (t_u8 *) tlv + + sizeof(MrvlIETypes_MgmtFrameSet_t) + + assoc_ie_len; + sta_ptr->is_wmm_enabled = + wlan_is_wmm_ie_present(priv->adapter, + assoc_req_ie, + ie_len); + PRINTM(MCMND, "STA: is_wmm_enabled=%d\n", + sta_ptr->is_wmm_enabled); + pht_cap = + (IEEEtypes_HTCap_t *) + wlan_get_specific_ie(priv, assoc_req_ie, + ie_len, + HT_CAPABILITY); + if (pht_cap) { + PRINTM(MCMND, "STA supports 11n\n"); + sta_ptr->is_11n_enabled = MTRUE; + if (GETHT_MAXAMSDU + (pht_cap->ht_cap.ht_cap_info)) + sta_ptr->max_amsdu = + MLAN_TX_DATA_BUF_SIZE_8K; + else + sta_ptr->max_amsdu = + MLAN_TX_DATA_BUF_SIZE_4K; + } else { + PRINTM(MCMND, + "STA doesn't support 11n\n"); + } + pvht_cap = + (IEEEtypes_VHTCap_t *) + wlan_get_specific_ie(priv, assoc_req_ie, + ie_len, + VHT_CAPABILITY); + if (pvht_cap && + (priv->is_11ac_enabled == MTRUE)) { + PRINTM(MCMND, "STA supports 11ac\n"); + sta_ptr->is_11ac_enabled = MTRUE; + if (GET_VHTCAP_MAXMPDULEN + (pvht_cap->vht_cap.vht_cap_info) == + 2) + sta_ptr->max_amsdu = + MLAN_TX_DATA_BUF_SIZE_12K; + else if (GET_VHTCAP_MAXMPDULEN + (pvht_cap->vht_cap. + vht_cap_info) + == 1) + sta_ptr->max_amsdu = + MLAN_TX_DATA_BUF_SIZE_8K; + else + sta_ptr->max_amsdu = + MLAN_TX_DATA_BUF_SIZE_4K; + } else { + PRINTM(MCMND, + "STA doesn't support 11ac\n"); + } + break; + } + } + tlv_buf_left -= (sizeof(MrvlIEtypesHeader_t) + tlv_len); + tlv = (MrvlIEtypesHeader_t *) ((t_u8 *) tlv + tlv_len + + sizeof(MrvlIEtypesHeader_t)); + } + LEAVE(); + + return; } /** Fixed size of bss start event */ @@ -2318,8 +2649,8 @@ wlan_check_sta_capability(pmlan_private priv, pmlan_buffer pevent, /** * @brief This function will search for the specific ie - * - * + * + * * @param priv A pointer to mlan_private * @param pevent A pointer to event buf * @@ -2328,91 +2659,97 @@ wlan_check_sta_capability(pmlan_private priv, pmlan_buffer pevent, static void wlan_check_uap_capability(pmlan_private priv, pmlan_buffer pevent) { - t_u16 tlv_type, tlv_len; - int tlv_buf_left = pevent->data_len - BSS_START_EVENT_FIX_SIZE; - MrvlIEtypesHeader_t *tlv = - (MrvlIEtypesHeader_t *) (pevent->pbuf + pevent->data_offset + - BSS_START_EVENT_FIX_SIZE); - const t_u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 }; - IEEEtypes_WmmParameter_t WmmParamIe; - MrvlIEtypes_channel_band_t *pChanInfo; - priv->wmm_enabled = MFALSE; - priv->pkt_fwd = MFALSE; - priv->is_11n_enabled = MFALSE; - - ENTER(); - - while (tlv_buf_left >= (int) sizeof(MrvlIEtypesHeader_t)) { - tlv_type = wlan_le16_to_cpu(tlv->type); - tlv_len = wlan_le16_to_cpu(tlv->len); - if ((sizeof(MrvlIEtypesHeader_t) + tlv_len) > - (unsigned int) tlv_buf_left) { - PRINTM(MERROR, "wrong tlv: tlvLen=%d, tlvBufLeft=%d\n", tlv_len, - tlv_buf_left); - break; - } - if (tlv_type == HT_CAPABILITY) { - DBG_HEXDUMP(MCMD_D, "HT_CAP tlv", tlv, - tlv_len + sizeof(MrvlIEtypesHeader_t)); - priv->is_11n_enabled = MTRUE; - } - if (tlv_type == VHT_CAPABILITY) { - DBG_HEXDUMP(MCMD_D, "VHT_CAP tlv", tlv, - tlv_len + sizeof(MrvlIEtypesHeader_t)); - priv->is_11ac_enabled = MTRUE; - } - if (tlv_type == VENDOR_SPECIFIC_221) { - if (!memcmp - (priv->adapter, (t_u8 *) tlv + sizeof(MrvlIEtypesHeader_t), - wmm_oui, sizeof(wmm_oui))) { - DBG_HEXDUMP(MCMD_D, "wmm ie tlv", tlv, - tlv_len + sizeof(MrvlIEtypesHeader_t)); - priv->wmm_enabled = MFALSE; - wlan_wmm_setup_ac_downgrade(priv); - priv->wmm_enabled = MTRUE; - memcpy(priv->adapter, &WmmParamIe, ((t_u8 *) tlv + 2), - sizeof(IEEEtypes_WmmParameter_t)); - WmmParamIe.vend_hdr.len = (t_u8) tlv_len; - WmmParamIe.vend_hdr.element_id = WMM_IE; - wlan_wmm_setup_queue_priorities(priv, &WmmParamIe); - } - } - if (tlv_type == TLV_TYPE_UAP_PKT_FWD_CTL) { - DBG_HEXDUMP(MCMD_D, "pkt_fwd tlv", tlv, - tlv_len + sizeof(MrvlIEtypesHeader_t)); - priv->pkt_fwd = *((t_u8 *) tlv + sizeof(MrvlIEtypesHeader_t)); - PRINTM(MCMND, "pkt_fwd FW: 0x%x\n", priv->pkt_fwd); - if (priv->pkt_fwd & PKT_FWD_FW_BIT) - priv->pkt_fwd = MFALSE; - else - priv->pkt_fwd |= PKT_FWD_ENABLE_BIT; - PRINTM(MCMND, "pkt_fwd DRV: 0x%x\n", priv->pkt_fwd); - } - if (tlv_type == TLV_TYPE_UAP_CHAN_BAND_CONFIG) { - DBG_HEXDUMP(MCMD_D, "chan_band_config tlv", tlv, - tlv_len + sizeof(MrvlIEtypesHeader_t)); - pChanInfo = (MrvlIEtypes_channel_band_t *) tlv; - priv->uap_channel = pChanInfo->channel; - PRINTM(MCMND, "uap_channel FW: 0x%x\n", priv->uap_channel); - } - - tlv_buf_left -= (sizeof(MrvlIEtypesHeader_t) + tlv_len); - tlv = - (MrvlIEtypesHeader_t *) ((t_u8 *) tlv + tlv_len + - sizeof(MrvlIEtypesHeader_t)); - } - if (priv->wmm_enabled == MFALSE) { - /* Since WMM is not enabled, setup the queues with the defaults */ - wlan_wmm_setup_queues(priv); - } - - LEAVE(); + t_u16 tlv_type, tlv_len; + int tlv_buf_left = pevent->data_len - BSS_START_EVENT_FIX_SIZE; + MrvlIEtypesHeader_t *tlv = + (MrvlIEtypesHeader_t *) (pevent->pbuf + pevent->data_offset + + BSS_START_EVENT_FIX_SIZE); + const t_u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 }; + IEEEtypes_WmmParameter_t WmmParamIe; + MrvlIEtypes_channel_band_t *pChanInfo; + priv->wmm_enabled = MFALSE; + priv->pkt_fwd = MFALSE; + priv->is_11n_enabled = MFALSE; + + ENTER(); + + while (tlv_buf_left >= (int)sizeof(MrvlIEtypesHeader_t)) { + tlv_type = wlan_le16_to_cpu(tlv->type); + tlv_len = wlan_le16_to_cpu(tlv->len); + if ((sizeof(MrvlIEtypesHeader_t) + tlv_len) > + (unsigned int)tlv_buf_left) { + PRINTM(MERROR, "wrong tlv: tlvLen=%d, tlvBufLeft=%d\n", + tlv_len, tlv_buf_left); + break; + } + if (tlv_type == HT_CAPABILITY) { + DBG_HEXDUMP(MCMD_D, "HT_CAP tlv", tlv, + tlv_len + sizeof(MrvlIEtypesHeader_t)); + priv->is_11n_enabled = MTRUE; + } + if (tlv_type == VHT_CAPABILITY) { + DBG_HEXDUMP(MCMD_D, "VHT_CAP tlv", tlv, + tlv_len + sizeof(MrvlIEtypesHeader_t)); + priv->is_11ac_enabled = MTRUE; + } + if (tlv_type == VENDOR_SPECIFIC_221) { + if (!memcmp + (priv->adapter, + (t_u8 *) tlv + sizeof(MrvlIEtypesHeader_t), + wmm_oui, sizeof(wmm_oui))) { + DBG_HEXDUMP(MCMD_D, "wmm ie tlv", tlv, + tlv_len + + sizeof(MrvlIEtypesHeader_t)); + priv->wmm_enabled = MFALSE; + wlan_wmm_setup_ac_downgrade(priv); + priv->wmm_enabled = MTRUE; + memcpy(priv->adapter, &WmmParamIe, + ((t_u8 *) tlv + 2), + sizeof(IEEEtypes_WmmParameter_t)); + WmmParamIe.vend_hdr.len = (t_u8) tlv_len; + WmmParamIe.vend_hdr.element_id = WMM_IE; + wlan_wmm_setup_queue_priorities(priv, + &WmmParamIe); + } + } + if (tlv_type == TLV_TYPE_UAP_PKT_FWD_CTL) { + DBG_HEXDUMP(MCMD_D, "pkt_fwd tlv", tlv, + tlv_len + sizeof(MrvlIEtypesHeader_t)); + priv->pkt_fwd = + *((t_u8 *) tlv + sizeof(MrvlIEtypesHeader_t)); + PRINTM(MCMND, "pkt_fwd FW: 0x%x\n", priv->pkt_fwd); + if (priv->pkt_fwd & PKT_FWD_FW_BIT) + priv->pkt_fwd = MFALSE; + else + priv->pkt_fwd |= PKT_FWD_ENABLE_BIT; + PRINTM(MCMND, "pkt_fwd DRV: 0x%x\n", priv->pkt_fwd); + } + if (tlv_type == TLV_TYPE_UAP_CHAN_BAND_CONFIG) { + DBG_HEXDUMP(MCMD_D, "chan_band_config tlv", tlv, + tlv_len + sizeof(MrvlIEtypesHeader_t)); + pChanInfo = (MrvlIEtypes_channel_band_t *) tlv; + priv->uap_channel = pChanInfo->channel; + PRINTM(MCMND, "uap_channel FW: 0x%x\n", + priv->uap_channel); + } + + tlv_buf_left -= (sizeof(MrvlIEtypesHeader_t) + tlv_len); + tlv = (MrvlIEtypesHeader_t *) ((t_u8 *) tlv + tlv_len + + sizeof(MrvlIEtypesHeader_t)); + } + if (priv->wmm_enabled == MFALSE) { + /* Since WMM is not enabled, setup the queues with the defaults + */ + wlan_wmm_setup_queues(priv); + } + + LEAVE(); } /** * @brief This function will update WAPI PN in statation assoc event - * - * + * + * * @param priv A pointer to mlan_private * @param pevent A pointer to event buf * @@ -2421,131 +2758,139 @@ wlan_check_uap_capability(pmlan_private priv, pmlan_buffer pevent) static t_u32 wlan_update_wapi_info_tlv(pmlan_private priv, pmlan_buffer pevent) { - t_u32 ret = MFALSE; - t_u16 tlv_type, tlv_len; - t_u32 tx_pn[4]; - t_u32 i = 0; - int tlv_buf_left = pevent->data_len - ASSOC_EVENT_FIX_SIZE; - MrvlIEtypesHeader_t *tlv = (MrvlIEtypesHeader_t *) - (pevent->pbuf + pevent->data_offset + ASSOC_EVENT_FIX_SIZE); - MrvlIEtypes_wapi_info_t *wapi_tlv = MNULL; - - ENTER(); - while (tlv_buf_left >= (int) sizeof(MrvlIEtypesHeader_t)) { - tlv_type = wlan_le16_to_cpu(tlv->type); - tlv_len = wlan_le16_to_cpu(tlv->len); - if ((sizeof(MrvlIEtypesHeader_t) + tlv_len) > - (unsigned int) tlv_buf_left) { - PRINTM(MERROR, "wrong tlv: tlvLen=%d, tlvBufLeft=%d\n", tlv_len, - tlv_buf_left); - break; - } - if (tlv_type == TLV_TYPE_AP_WAPI_INFO) { - wapi_tlv = (MrvlIEtypes_wapi_info_t *) tlv; - DBG_HEXDUMP(MCMD_D, "Fw:multicast_PN", wapi_tlv->multicast_PN, - PN_SIZE); - memcpy(priv->adapter, (t_u8 *) tx_pn, wapi_tlv->multicast_PN, - PN_SIZE); - for (i = 0; i < 4; i++) - tx_pn[i] = mlan_ntohl(tx_pn[i]); - memcpy(priv->adapter, wapi_tlv->multicast_PN, (t_u8 *) tx_pn, - PN_SIZE); - DBG_HEXDUMP(MCMD_D, "Host:multicast_PN", wapi_tlv->multicast_PN, - PN_SIZE); - break; - } - tlv_buf_left -= (sizeof(MrvlIEtypesHeader_t) + tlv_len); - tlv = - (MrvlIEtypesHeader_t *) ((t_u8 *) tlv + tlv_len + - sizeof(MrvlIEtypesHeader_t)); - } - LEAVE(); - - return ret; + t_u32 ret = MFALSE; + t_u16 tlv_type, tlv_len; + t_u32 tx_pn[4]; + t_u32 i = 0; + int tlv_buf_left = pevent->data_len - ASSOC_EVENT_FIX_SIZE; + MrvlIEtypesHeader_t *tlv = (MrvlIEtypesHeader_t *) + (pevent->pbuf + pevent->data_offset + ASSOC_EVENT_FIX_SIZE); + MrvlIEtypes_wapi_info_t *wapi_tlv = MNULL; + + ENTER(); + while (tlv_buf_left >= (int)sizeof(MrvlIEtypesHeader_t)) { + tlv_type = wlan_le16_to_cpu(tlv->type); + tlv_len = wlan_le16_to_cpu(tlv->len); + if ((sizeof(MrvlIEtypesHeader_t) + tlv_len) > + (unsigned int)tlv_buf_left) { + PRINTM(MERROR, "wrong tlv: tlvLen=%d, tlvBufLeft=%d\n", + tlv_len, tlv_buf_left); + break; + } + if (tlv_type == TLV_TYPE_AP_WAPI_INFO) { + wapi_tlv = (MrvlIEtypes_wapi_info_t *) tlv; + DBG_HEXDUMP(MCMD_D, "Fw:multicast_PN", + wapi_tlv->multicast_PN, PN_SIZE); + memcpy(priv->adapter, (t_u8 *) tx_pn, + wapi_tlv->multicast_PN, PN_SIZE); + for (i = 0; i < 4; i++) + tx_pn[i] = mlan_ntohl(tx_pn[i]); + memcpy(priv->adapter, wapi_tlv->multicast_PN, + (t_u8 *) tx_pn, PN_SIZE); + DBG_HEXDUMP(MCMD_D, "Host:multicast_PN", + wapi_tlv->multicast_PN, PN_SIZE); + break; + } + tlv_buf_left -= (sizeof(MrvlIEtypesHeader_t) + tlv_len); + tlv = (MrvlIEtypesHeader_t *) ((t_u8 *) tlv + tlv_len + + sizeof(MrvlIEtypesHeader_t)); + } + LEAVE(); + + return ret; } /** * @brief This function send sta_assoc_event to moal - * payload with sta mac address and assoc ie. - * + * payload with sta mac address and assoc ie. + * * @param priv A pointer to mlan_private * @param pevent A pointer to mlan_event buffer - * @param pbuf A pointer to mlan_buffer which has event content. + * @param pbuf A pointer to mlan_buffer which has event content. * * @return MFALSE */ static t_u32 wlan_process_sta_assoc_event(pmlan_private priv, mlan_event * pevent, - pmlan_buffer pmbuf) + pmlan_buffer pmbuf) { - t_u32 ret = MFALSE; - t_u16 tlv_type, tlv_len; - t_u16 frame_control, frame_sub_type = 0; - t_u8 *assoc_req_ie = MNULL; - t_u8 ie_len = 0, assoc_ie_len = 0; - int tlv_buf_left = pmbuf->data_len - ASSOC_EVENT_FIX_SIZE; - MrvlIEtypesHeader_t *tlv = (MrvlIEtypesHeader_t *) - (pmbuf->pbuf + pmbuf->data_offset + ASSOC_EVENT_FIX_SIZE); - MrvlIETypes_MgmtFrameSet_t *mgmt_tlv = MNULL; - - ENTER(); - pevent->event_id = MLAN_EVENT_ID_UAP_FW_STA_CONNECT; - pevent->bss_index = priv->bss_index; - pevent->event_len = MLAN_MAC_ADDR_LENGTH; - memcpy(priv->adapter, pevent->event_buf, - pmbuf->pbuf + pmbuf->data_offset + 6, pevent->event_len); - while (tlv_buf_left >= (int) sizeof(MrvlIEtypesHeader_t)) { - tlv_type = wlan_le16_to_cpu(tlv->type); - tlv_len = wlan_le16_to_cpu(tlv->len); - if ((sizeof(MrvlIEtypesHeader_t) + tlv_len) > - (unsigned int) tlv_buf_left) { - PRINTM(MERROR, "wrong tlv: tlvLen=%d, tlvBufLeft=%d\n", tlv_len, - tlv_buf_left); - break; - } - if (tlv_type == TLV_TYPE_UAP_MGMT_FRAME) { - mgmt_tlv = (MrvlIETypes_MgmtFrameSet_t *) tlv; - memcpy(priv->adapter, &frame_control, - (t_u8 *) & (mgmt_tlv->frame_control), sizeof(frame_control)); - frame_sub_type = IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE(frame_control); - if ((mgmt_tlv->frame_control.type == 0) && - ((frame_sub_type == SUBTYPE_ASSOC_REQUEST) || - (frame_sub_type == SUBTYPE_REASSOC_REQUEST))) { - - if (frame_sub_type == SUBTYPE_ASSOC_REQUEST) - assoc_ie_len = sizeof(IEEEtypes_AssocRqst_t); - else if (frame_sub_type == SUBTYPE_REASSOC_REQUEST) - assoc_ie_len = sizeof(IEEEtypes_ReAssocRqst_t); - - ie_len = tlv_len - sizeof(IEEEtypes_FrameCtl_t) - assoc_ie_len; - assoc_req_ie = - (t_u8 *) tlv + sizeof(MrvlIETypes_MgmtFrameSet_t) + - assoc_ie_len; - memcpy(priv->adapter, pevent->event_buf + pevent->event_len, - assoc_req_ie, ie_len); - pevent->event_len += ie_len; - break; - } - } - tlv_buf_left -= (sizeof(MrvlIEtypesHeader_t) + tlv_len); - tlv = - (MrvlIEtypesHeader_t *) ((t_u8 *) tlv + tlv_len + - sizeof(MrvlIEtypesHeader_t)); - } - PRINTM(MEVENT, "STA assoc event len=%d\n", pevent->event_len); - DBG_HEXDUMP(MCMD_D, "STA assoc event", pevent->event_buf, - pevent->event_len); - wlan_recv_event(priv, pevent->event_id, pevent); - LEAVE(); - return ret; + t_u32 ret = MFALSE; + t_u16 tlv_type, tlv_len; + t_u16 frame_control, frame_sub_type = 0; + t_u8 *assoc_req_ie = MNULL; + t_u8 ie_len = 0, assoc_ie_len = 0; + int tlv_buf_left = pmbuf->data_len - ASSOC_EVENT_FIX_SIZE; + MrvlIEtypesHeader_t *tlv = (MrvlIEtypesHeader_t *) + (pmbuf->pbuf + pmbuf->data_offset + ASSOC_EVENT_FIX_SIZE); + MrvlIETypes_MgmtFrameSet_t *mgmt_tlv = MNULL; + + ENTER(); + pevent->event_id = MLAN_EVENT_ID_UAP_FW_STA_CONNECT; + pevent->bss_index = priv->bss_index; + pevent->event_len = MLAN_MAC_ADDR_LENGTH; + memcpy(priv->adapter, pevent->event_buf, + pmbuf->pbuf + pmbuf->data_offset + 6, pevent->event_len); + while (tlv_buf_left >= (int)sizeof(MrvlIEtypesHeader_t)) { + tlv_type = wlan_le16_to_cpu(tlv->type); + tlv_len = wlan_le16_to_cpu(tlv->len); + if ((sizeof(MrvlIEtypesHeader_t) + tlv_len) > + (unsigned int)tlv_buf_left) { + PRINTM(MERROR, "wrong tlv: tlvLen=%d, tlvBufLeft=%d\n", + tlv_len, tlv_buf_left); + break; + } + if (tlv_type == TLV_TYPE_UAP_MGMT_FRAME) { + mgmt_tlv = (MrvlIETypes_MgmtFrameSet_t *) tlv; + memcpy(priv->adapter, &frame_control, + (t_u8 *) & (mgmt_tlv->frame_control), + sizeof(frame_control)); + frame_sub_type = + IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE + (frame_control); + if ((mgmt_tlv->frame_control.type == 0) && + ((frame_sub_type == SUBTYPE_ASSOC_REQUEST) || + (frame_sub_type == SUBTYPE_REASSOC_REQUEST))) { + + if (frame_sub_type == SUBTYPE_ASSOC_REQUEST) + assoc_ie_len = + sizeof(IEEEtypes_AssocRqst_t); + else if (frame_sub_type == + SUBTYPE_REASSOC_REQUEST) + assoc_ie_len = + sizeof(IEEEtypes_ReAssocRqst_t); + + ie_len = tlv_len - + sizeof(IEEEtypes_FrameCtl_t) - + assoc_ie_len; + assoc_req_ie = + (t_u8 *) tlv + + sizeof(MrvlIETypes_MgmtFrameSet_t) + + assoc_ie_len; + memcpy(priv->adapter, + pevent->event_buf + pevent->event_len, + assoc_req_ie, ie_len); + pevent->event_len += ie_len; + break; + } + } + tlv_buf_left -= (sizeof(MrvlIEtypesHeader_t) + tlv_len); + tlv = (MrvlIEtypesHeader_t *) ((t_u8 *) tlv + tlv_len + + sizeof(MrvlIEtypesHeader_t)); + } + PRINTM(MEVENT, "STA assoc event len=%d\n", pevent->event_len); + DBG_HEXDUMP(MCMD_D, "STA assoc event", pevent->event_buf, + pevent->event_len); + wlan_recv_event(priv, pevent->event_id, pevent); + LEAVE(); + return ret; } /******************************************************** Global Functions ********************************************************/ -/** +/** * @brief This function prepare the command before sending to firmware. - * + * * @param priv A pointer to mlan_private structure * @param cmd_no Command number * @param cmd_action Command action: GET or SET @@ -2558,207 +2903,223 @@ wlan_process_sta_assoc_event(pmlan_private priv, mlan_event * pevent, */ mlan_status wlan_ops_uap_prepare_cmd(IN t_void * priv, - IN t_u16 cmd_no, - IN t_u16 cmd_action, - IN t_u32 cmd_oid, - IN t_void * pioctl_buf, - IN t_void * pdata_buf, IN t_void * pcmd_buf) + IN t_u16 cmd_no, + IN t_u16 cmd_action, + IN t_u32 cmd_oid, + IN t_void * pioctl_buf, + IN t_void * pdata_buf, IN t_void * pcmd_buf) { - HostCmd_DS_COMMAND *cmd_ptr = (HostCmd_DS_COMMAND *) pcmd_buf; - mlan_private *pmpriv = (mlan_private *) priv; - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; - - ENTER(); - - /* Prepare command */ - switch (cmd_no) { - case HostCmd_CMD_SOFT_RESET: - case HOST_CMD_APCMD_BSS_STOP: - case HOST_CMD_APCMD_BSS_START: - case HOST_CMD_APCMD_SYS_INFO: - case HOST_CMD_APCMD_SYS_RESET: - case HOST_CMD_APCMD_STA_LIST: - cmd_ptr->command = wlan_cpu_to_le16(cmd_no); - cmd_ptr->size = wlan_cpu_to_le16(S_DS_GEN); - break; - case HOST_CMD_APCMD_SYS_CONFIGURE: - ret = wlan_uap_cmd_sys_configure(pmpriv, cmd_ptr, cmd_action, - (pmlan_ioctl_req) pioctl_buf, - pdata_buf); - break; - case HostCmd_CMD_802_11_PS_MODE_ENH: - ret = - wlan_cmd_enh_power_mode(pmpriv, cmd_ptr, cmd_action, - (t_u16) cmd_oid, pdata_buf); - break; - case HostCmd_CMD_SDIO_GPIO_INT_CONFIG: - ret = wlan_cmd_sdio_gpio_int(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_FUNC_INIT: - if (pmpriv->adapter->hw_status == WlanHardwareStatusReset) - pmpriv->adapter->hw_status = WlanHardwareStatusInitializing; - cmd_ptr->command = wlan_cpu_to_le16(cmd_no); - cmd_ptr->size = wlan_cpu_to_le16(S_DS_GEN); - break; - case HostCmd_CMD_FUNC_SHUTDOWN: - pmpriv->adapter->hw_status = WlanHardwareStatusReset; - cmd_ptr->command = wlan_cpu_to_le16(cmd_no); - cmd_ptr->size = wlan_cpu_to_le16(S_DS_GEN); - break; - case HostCmd_CMD_CFG_DATA: - ret = wlan_cmd_cfg_data(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_MAC_CONTROL: - ret = wlan_cmd_mac_control(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_802_11_SNMP_MIB: - ret = wlan_uap_cmd_snmp_mib(pmpriv, cmd_ptr, cmd_action, cmd_oid, - (pmlan_ioctl_req) pioctl_buf, pdata_buf); - break; - case HostCmd_CMD_802_11D_DOMAIN_INFO: - ret = wlan_cmd_802_11d_domain_info(pmpriv, cmd_ptr, cmd_action); - break; - case HostCmd_CMD_CHAN_REPORT_REQUEST: - ret = wlan_11h_cmd_process(pmpriv, cmd_ptr, pdata_buf); - break; - case HOST_CMD_APCMD_STA_DEAUTH: - ret = wlan_uap_cmd_sta_deauth(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_802_11_KEY_MATERIAL: - ret = - wlan_uap_cmd_key_material(pmpriv, cmd_ptr, cmd_action, cmd_oid, - pdata_buf); - break; - case HostCmd_CMD_GET_HW_SPEC: - ret = wlan_cmd_get_hw_spec(pmpriv, cmd_ptr); - break; - case HostCmd_CMD_802_11_HS_CFG_ENH: - ret = - wlan_uap_cmd_802_11_hs_cfg(pmpriv, cmd_ptr, cmd_action, - (hs_config_param *) pdata_buf); - break; - case HostCmd_CMD_HS_WAKEUP_REASON: - ret = wlan_cmd_hs_wakeup_reason(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_RECONFIGURE_TX_BUFF: - ret = wlan_cmd_recfg_tx_buf(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_AMSDU_AGGR_CTRL: - ret = wlan_cmd_amsdu_aggr_ctrl(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_11N_CFG: - ret = wlan_cmd_11n_cfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_11N_ADDBA_REQ: - ret = wlan_cmd_11n_addba_req(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_11N_DELBA: - ret = wlan_cmd_11n_delba(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_11N_ADDBA_RSP: - ret = wlan_cmd_11n_addba_rspgen(pmpriv, cmd_ptr, pdata_buf); - break; - case HostCmd_CMD_REJECT_ADDBA_REQ: - ret = wlan_cmd_reject_addba_req(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_TX_BF_CFG: - ret = wlan_cmd_tx_bf_cfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; + HostCmd_DS_COMMAND *cmd_ptr = (HostCmd_DS_COMMAND *) pcmd_buf; + mlan_private *pmpriv = (mlan_private *) priv; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_ioctl_req pioctl_req = (mlan_ioctl_req *) pioctl_buf; + + ENTER(); + + /* Prepare command */ + switch (cmd_no) { + case HostCmd_CMD_SOFT_RESET: + case HOST_CMD_APCMD_BSS_STOP: + case HOST_CMD_APCMD_BSS_START: + case HOST_CMD_APCMD_SYS_INFO: + case HOST_CMD_APCMD_SYS_RESET: + case HOST_CMD_APCMD_STA_LIST: + cmd_ptr->command = wlan_cpu_to_le16(cmd_no); + cmd_ptr->size = wlan_cpu_to_le16(S_DS_GEN); + break; + case HOST_CMD_APCMD_SYS_CONFIGURE: + ret = wlan_uap_cmd_sys_configure(pmpriv, cmd_ptr, cmd_action, + (pmlan_ioctl_req) pioctl_buf, + pdata_buf); + break; + case HostCmd_CMD_802_11_PS_MODE_ENH: + ret = wlan_cmd_enh_power_mode(pmpriv, cmd_ptr, cmd_action, + (t_u16) cmd_oid, pdata_buf); + break; + case HostCmd_CMD_SDIO_GPIO_INT_CONFIG: + ret = wlan_cmd_sdio_gpio_int(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_FUNC_INIT: + if (pmpriv->adapter->hw_status == WlanHardwareStatusReset) + pmpriv->adapter->hw_status = + WlanHardwareStatusInitializing; + cmd_ptr->command = wlan_cpu_to_le16(cmd_no); + cmd_ptr->size = wlan_cpu_to_le16(S_DS_GEN); + break; + case HostCmd_CMD_FUNC_SHUTDOWN: + pmpriv->adapter->hw_status = WlanHardwareStatusReset; + cmd_ptr->command = wlan_cpu_to_le16(cmd_no); + cmd_ptr->size = wlan_cpu_to_le16(S_DS_GEN); + break; + case HostCmd_CMD_CFG_DATA: + ret = wlan_cmd_cfg_data(pmpriv, cmd_ptr, cmd_action, pdata_buf); + break; + case HostCmd_CMD_MAC_CONTROL: + ret = wlan_cmd_mac_control(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_802_11_SNMP_MIB: + ret = wlan_uap_cmd_snmp_mib(pmpriv, cmd_ptr, cmd_action, + cmd_oid, + (pmlan_ioctl_req) pioctl_buf, + pdata_buf); + break; + case HostCmd_CMD_802_11D_DOMAIN_INFO: + ret = wlan_cmd_802_11d_domain_info(pmpriv, cmd_ptr, cmd_action); + break; + case HostCmd_CMD_CHAN_REPORT_REQUEST: + ret = wlan_11h_cmd_process(pmpriv, cmd_ptr, pdata_buf); + break; + case HOST_CMD_APCMD_STA_DEAUTH: + ret = wlan_uap_cmd_sta_deauth(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_802_11_KEY_MATERIAL: + ret = wlan_uap_cmd_key_material(pmpriv, cmd_ptr, cmd_action, + cmd_oid, pdata_buf); + break; + case HostCmd_CMD_GET_HW_SPEC: + ret = wlan_cmd_get_hw_spec(pmpriv, cmd_ptr); + break; + case HostCmd_CMD_802_11_HS_CFG_ENH: + ret = wlan_uap_cmd_802_11_hs_cfg(pmpriv, cmd_ptr, cmd_action, + (hs_config_param *) pdata_buf); + break; + case HostCmd_CMD_HS_WAKEUP_REASON: + ret = wlan_cmd_hs_wakeup_reason(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_RECONFIGURE_TX_BUFF: + ret = wlan_cmd_recfg_tx_buf(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_AMSDU_AGGR_CTRL: + ret = wlan_cmd_amsdu_aggr_ctrl(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_11N_CFG: + ret = wlan_cmd_11n_cfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); + break; + case HostCmd_CMD_11N_ADDBA_REQ: + ret = wlan_cmd_11n_addba_req(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_11N_DELBA: + ret = wlan_cmd_11n_delba(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_11N_ADDBA_RSP: + ret = wlan_cmd_11n_addba_rspgen(pmpriv, cmd_ptr, pdata_buf); + break; + case HostCmd_CMD_REJECT_ADDBA_REQ: + ret = wlan_cmd_reject_addba_req(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_TX_BF_CFG: + ret = wlan_cmd_tx_bf_cfg(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; #if defined(WIFI_DIRECT_SUPPORT) - case HostCmd_CMD_SET_BSS_MODE: - cmd_ptr->command = wlan_cpu_to_le16(cmd_no); - if (pdata_buf) - cmd_ptr->params.bss_mode.con_type = *(t_u8 *) pdata_buf; - else - cmd_ptr->params.bss_mode.con_type = BSS_MODE_WIFIDIRECT_GO; - cmd_ptr->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_SET_BSS_MODE) + S_DS_GEN); - ret = MLAN_STATUS_SUCCESS; - break; + case HostCmd_CMD_SET_BSS_MODE: + cmd_ptr->command = wlan_cpu_to_le16(cmd_no); + if (pdata_buf) + cmd_ptr->params.bss_mode.con_type = *(t_u8 *) pdata_buf; + else + cmd_ptr->params.bss_mode.con_type = + BSS_MODE_WIFIDIRECT_GO; + cmd_ptr->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_SET_BSS_MODE) + + S_DS_GEN); + ret = MLAN_STATUS_SUCCESS; + break; #endif - case HostCmd_CMD_VERSION_EXT: - cmd_ptr->command = wlan_cpu_to_le16(cmd_no); - cmd_ptr->params.verext.version_str_sel = - (t_u8) (*((t_u32 *) pdata_buf)); - cmd_ptr->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_VERSION_EXT) + S_DS_GEN); - ret = MLAN_STATUS_SUCCESS; - break; - case HostCmd_CMD_RX_MGMT_IND: - cmd_ptr->command = wlan_cpu_to_le16(cmd_no); - cmd_ptr->params.rx_mgmt_ind.action = wlan_cpu_to_le16(cmd_action); - cmd_ptr->params.rx_mgmt_ind.mgmt_subtype_mask = - (t_u32) (*((t_u32 *) pdata_buf)); - cmd_ptr->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_RX_MGMT_IND) + S_DS_GEN); - break; - case HostCmd_CMD_CFG_TX_DATA_PAUSE: - ret = wlan_uap_cmd_txdatapause(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_802_11_RADIO_CONTROL: - ret = - wlan_cmd_802_11_radio_control(pmpriv, cmd_ptr, cmd_action, - pdata_buf); - break; - case HostCmd_CMD_TX_RATE_CFG: - ret = wlan_cmd_tx_rate_cfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_802_11_TX_RATE_QUERY: - cmd_ptr->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_TX_RATE_QUERY); - cmd_ptr->size = - wlan_cpu_to_le16(sizeof(HostCmd_TX_RATE_QUERY) + S_DS_GEN); - pmpriv->tx_rate = 0; - ret = MLAN_STATUS_SUCCESS; - break; + case HostCmd_CMD_VERSION_EXT: + cmd_ptr->command = wlan_cpu_to_le16(cmd_no); + cmd_ptr->params.verext.version_str_sel = + (t_u8) (*((t_u32 *) pdata_buf)); + cmd_ptr->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_VERSION_EXT) + + S_DS_GEN); + ret = MLAN_STATUS_SUCCESS; + break; + case HostCmd_CMD_RX_MGMT_IND: + cmd_ptr->command = wlan_cpu_to_le16(cmd_no); + cmd_ptr->params.rx_mgmt_ind.action = + wlan_cpu_to_le16(cmd_action); + cmd_ptr->params.rx_mgmt_ind.mgmt_subtype_mask = + (t_u32) (*((t_u32 *) pdata_buf)); + cmd_ptr->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_RX_MGMT_IND) + + S_DS_GEN); + break; + case HostCmd_CMD_CFG_TX_DATA_PAUSE: + ret = wlan_uap_cmd_txdatapause(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_802_11_RADIO_CONTROL: + ret = wlan_cmd_802_11_radio_control(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_TX_RATE_CFG: + ret = wlan_cmd_tx_rate_cfg(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_802_11_TX_RATE_QUERY: + cmd_ptr->command = + wlan_cpu_to_le16(HostCmd_CMD_802_11_TX_RATE_QUERY); + cmd_ptr->size = + wlan_cpu_to_le16(sizeof(HostCmd_TX_RATE_QUERY) + + S_DS_GEN); + pmpriv->tx_rate = 0; + ret = MLAN_STATUS_SUCCESS; + break; #ifdef WIFI_DIRECT_SUPPORT - case HostCmd_CMD_802_11_REMAIN_ON_CHANNEL: - ret = - wlan_cmd_remain_on_channel(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HOST_CMD_WIFI_DIRECT_MODE_CONFIG: - ret = wlan_cmd_wifi_direct_mode(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; + case HostCmd_CMD_802_11_REMAIN_ON_CHANNEL: + ret = wlan_cmd_remain_on_channel(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HOST_CMD_WIFI_DIRECT_MODE_CONFIG: + ret = wlan_cmd_wifi_direct_mode(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; #endif - case HostCmd_CMD_802_11_RF_ANTENNA: - ret = - wlan_cmd_802_11_rf_antenna(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_11AC_CFG: - ret = wlan_cmd_11ac_cfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_MAC_REG_ACCESS: - case HostCmd_CMD_BBP_REG_ACCESS: - case HostCmd_CMD_RF_REG_ACCESS: - case HostCmd_CMD_CAU_REG_ACCESS: - case HostCmd_CMD_802_11_EEPROM_ACCESS: - ret = wlan_cmd_reg_access(cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_MEM_ACCESS: - ret = wlan_cmd_mem_access(cmd_ptr, cmd_action, pdata_buf); - break; - case HostCmd_CMD_WMM_QUEUE_CONFIG: - ret = wlan_cmd_wmm_queue_config(pmpriv, cmd_ptr, pdata_buf); - break; + case HostCmd_CMD_802_11_RF_ANTENNA: + ret = wlan_cmd_802_11_rf_antenna(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; + case HostCmd_CMD_11AC_CFG: + ret = wlan_cmd_11ac_cfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); + break; + case HostCmd_CMD_MAC_REG_ACCESS: + case HostCmd_CMD_BBP_REG_ACCESS: + case HostCmd_CMD_RF_REG_ACCESS: + case HostCmd_CMD_CAU_REG_ACCESS: + case HostCmd_CMD_802_11_EEPROM_ACCESS: + ret = wlan_cmd_reg_access(cmd_ptr, cmd_action, pdata_buf); + break; + case HostCmd_CMD_MEM_ACCESS: + ret = wlan_cmd_mem_access(cmd_ptr, cmd_action, pdata_buf); + break; + case HostCmd_CMD_WMM_QUEUE_CONFIG: + ret = wlan_cmd_wmm_queue_config(pmpriv, cmd_ptr, pdata_buf); + break; #if defined(MUTLI_CHAN_SUPPORT) - case HostCmd_CMD_MULTI_CHAN_CONFIG: - ret = wlan_cmd_multi_chan_cfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); - break; + case HostCmd_CMD_MULTI_CHAN_CONFIG: + ret = wlan_cmd_multi_chan_cfg(pmpriv, cmd_ptr, cmd_action, + pdata_buf); + break; #endif - default: - PRINTM(MERROR, "PREP_CMD: unknown command- %#x\n", cmd_no); - if (pioctl_req) - pioctl_req->status_code = MLAN_ERROR_CMD_INVALID; - ret = MLAN_STATUS_FAILURE; - break; - } - LEAVE(); - return ret; + default: + PRINTM(MERROR, "PREP_CMD: unknown command- %#x\n", cmd_no); + if (pioctl_req) + pioctl_req->status_code = MLAN_ERROR_CMD_INVALID; + ret = MLAN_STATUS_FAILURE; + break; + } + LEAVE(); + return ret; } -/** +/** * @brief This function handles the AP mode command response - * + * * @param priv A pointer to mlan_private structure * @param cmdresp_no cmd no * @param pcmd_buf cmdresp buf @@ -2768,187 +3129,187 @@ wlan_ops_uap_prepare_cmd(IN t_void * priv, */ mlan_status wlan_ops_uap_process_cmdresp(IN t_void * priv, - IN t_u16 cmdresp_no, - IN t_void * pcmd_buf, IN t_void * pioctl) + IN t_u16 cmdresp_no, + IN t_void * pcmd_buf, IN t_void * pioctl) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = (mlan_private *) priv; - HostCmd_DS_COMMAND *resp = (HostCmd_DS_COMMAND *) pcmd_buf; - mlan_ioctl_req *pioctl_buf = (mlan_ioctl_req *) pioctl; - mlan_adapter *pmadapter = pmpriv->adapter; - - ENTER(); - - /* If the command is not successful, cleanup and return failure */ - if (resp->result != HostCmd_RESULT_OK) { - uap_process_cmdresp_error(pmpriv, resp, pioctl_buf); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - /* Command successful, handle response */ - switch (cmdresp_no) { - case HOST_CMD_APCMD_BSS_STOP: - pmpriv->uap_bss_started = MFALSE; - wlan_11h_check_update_radar_det_state(pmpriv); - - if (pmpriv->adapter->state_rdh.stage == RDH_STOP_INTFS) - wlan_11h_radar_detected_callback((t_void *) pmpriv); - break; - case HOST_CMD_APCMD_BSS_START: - if (pmpriv->adapter->state_rdh.stage == RDH_RESTART_INTFS) - wlan_11h_radar_detected_callback((t_void *) pmpriv); - break; - case HOST_CMD_APCMD_SYS_RESET: - pmpriv->uap_bss_started = MFALSE; - ret = wlan_uap_ret_sys_reset(pmpriv, resp, pioctl_buf); - wlan_11h_check_update_radar_det_state(pmpriv); - break; - case HOST_CMD_APCMD_SYS_INFO: - break; - case HOST_CMD_APCMD_SYS_CONFIGURE: - ret = wlan_uap_ret_sys_config(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_PS_MODE_ENH: - ret = wlan_ret_enh_power_mode(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_SDIO_GPIO_INT_CONFIG: - break; - case HostCmd_CMD_FUNC_INIT: - case HostCmd_CMD_FUNC_SHUTDOWN: - break; - case HostCmd_CMD_802_11_SNMP_MIB: - ret = wlan_uap_ret_snmp_mib(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11D_DOMAIN_INFO: - ret = wlan_ret_802_11d_domain_info(pmpriv, resp); - break; - case HostCmd_CMD_CHAN_REPORT_REQUEST: - ret = wlan_11h_cmdresp_process(pmpriv, resp); - break; - case HOST_CMD_APCMD_STA_DEAUTH: - break; - case HostCmd_CMD_802_11_KEY_MATERIAL: - break; - case HOST_CMD_APCMD_STA_LIST: - ret = wlan_uap_ret_sta_list(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_GET_HW_SPEC: - ret = wlan_ret_get_hw_spec(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_CFG_DATA: - ret = wlan_ret_cfg_data(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_MAC_CONTROL: - ret = wlan_ret_mac_control(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_HS_CFG_ENH: - ret = wlan_ret_802_11_hs_cfg(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_HS_WAKEUP_REASON: - ret = wlan_ret_hs_wakeup_reason(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_11N_ADDBA_REQ: - ret = wlan_ret_11n_addba_req(pmpriv, resp); - break; - case HostCmd_CMD_11N_DELBA: - ret = wlan_ret_11n_delba(pmpriv, resp); - break; - case HostCmd_CMD_11N_ADDBA_RSP: - ret = wlan_ret_11n_addba_resp(pmpriv, resp); - break; - case HostCmd_CMD_SET_BSS_MODE: - break; - case HostCmd_CMD_RECONFIGURE_TX_BUFF: - pmadapter->tx_buf_size = - (t_u16) wlan_le16_to_cpu(resp->params.tx_buf.buff_size); - pmadapter->tx_buf_size = - (pmadapter->tx_buf_size / MLAN_SDIO_BLOCK_SIZE) * - MLAN_SDIO_BLOCK_SIZE; - pmadapter->curr_tx_buf_size = pmadapter->tx_buf_size; - pmadapter->mp_end_port = - wlan_le16_to_cpu(resp->params.tx_buf.mp_end_port); - pmadapter->mp_data_port_mask = DATA_PORT_MASK; - /* hw tx wraps round only after port 31 */ - pmadapter->curr_wr_port = 0; - PRINTM(MCMND, "end port %d, data port mask %x\n", - wlan_le16_to_cpu(resp->params.tx_buf.mp_end_port), - pmadapter->mp_data_port_mask); - PRINTM(MCMND, "max_tx_buf_size=%d, tx_buf_size=%d\n", - pmadapter->max_tx_buf_size, pmadapter->tx_buf_size); - break; - case HostCmd_CMD_AMSDU_AGGR_CTRL: - ret = wlan_ret_amsdu_aggr_ctrl(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_11N_CFG: - ret = wlan_ret_11n_cfg(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_REJECT_ADDBA_REQ: - ret = wlan_ret_reject_addba_req(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_TX_BF_CFG: - ret = wlan_ret_tx_bf_cfg(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_VERSION_EXT: - ret = wlan_ret_ver_ext(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_RX_MGMT_IND: - ret = wlan_ret_rx_mgmt_ind(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_CFG_TX_DATA_PAUSE: - ret = wlan_uap_ret_txdatapause(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_RADIO_CONTROL: - ret = wlan_ret_802_11_radio_control(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_TX_RATE_CFG: - ret = wlan_ret_tx_rate_cfg(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_802_11_TX_RATE_QUERY: - ret = wlan_ret_802_11_tx_rate_query(pmpriv, resp, pioctl_buf); - break; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = (mlan_private *) priv; + HostCmd_DS_COMMAND *resp = (HostCmd_DS_COMMAND *) pcmd_buf; + mlan_ioctl_req *pioctl_buf = (mlan_ioctl_req *) pioctl; + mlan_adapter *pmadapter = pmpriv->adapter; + + ENTER(); + + /* If the command is not successful, cleanup and return failure */ + if (resp->result != HostCmd_RESULT_OK) { + uap_process_cmdresp_error(pmpriv, resp, pioctl_buf); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + /* Command successful, handle response */ + switch (cmdresp_no) { + case HOST_CMD_APCMD_BSS_STOP: + pmpriv->uap_bss_started = MFALSE; + wlan_11h_check_update_radar_det_state(pmpriv); + + if (pmpriv->adapter->state_rdh.stage == RDH_STOP_INTFS) + wlan_11h_radar_detected_callback((t_void *) pmpriv); + break; + case HOST_CMD_APCMD_BSS_START: + if (pmpriv->adapter->state_rdh.stage == RDH_RESTART_INTFS) + wlan_11h_radar_detected_callback((t_void *) pmpriv); + break; + case HOST_CMD_APCMD_SYS_RESET: + pmpriv->uap_bss_started = MFALSE; + ret = wlan_uap_ret_sys_reset(pmpriv, resp, pioctl_buf); + wlan_11h_check_update_radar_det_state(pmpriv); + break; + case HOST_CMD_APCMD_SYS_INFO: + break; + case HOST_CMD_APCMD_SYS_CONFIGURE: + ret = wlan_uap_ret_sys_config(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_PS_MODE_ENH: + ret = wlan_ret_enh_power_mode(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_SDIO_GPIO_INT_CONFIG: + break; + case HostCmd_CMD_FUNC_INIT: + case HostCmd_CMD_FUNC_SHUTDOWN: + break; + case HostCmd_CMD_802_11_SNMP_MIB: + ret = wlan_uap_ret_snmp_mib(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11D_DOMAIN_INFO: + ret = wlan_ret_802_11d_domain_info(pmpriv, resp); + break; + case HostCmd_CMD_CHAN_REPORT_REQUEST: + ret = wlan_11h_cmdresp_process(pmpriv, resp); + break; + case HOST_CMD_APCMD_STA_DEAUTH: + break; + case HostCmd_CMD_802_11_KEY_MATERIAL: + break; + case HOST_CMD_APCMD_STA_LIST: + ret = wlan_uap_ret_sta_list(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_GET_HW_SPEC: + ret = wlan_ret_get_hw_spec(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_CFG_DATA: + ret = wlan_ret_cfg_data(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_MAC_CONTROL: + ret = wlan_ret_mac_control(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_HS_CFG_ENH: + ret = wlan_ret_802_11_hs_cfg(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_HS_WAKEUP_REASON: + ret = wlan_ret_hs_wakeup_reason(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_11N_ADDBA_REQ: + ret = wlan_ret_11n_addba_req(pmpriv, resp); + break; + case HostCmd_CMD_11N_DELBA: + ret = wlan_ret_11n_delba(pmpriv, resp); + break; + case HostCmd_CMD_11N_ADDBA_RSP: + ret = wlan_ret_11n_addba_resp(pmpriv, resp); + break; + case HostCmd_CMD_SET_BSS_MODE: + break; + case HostCmd_CMD_RECONFIGURE_TX_BUFF: + pmadapter->tx_buf_size = + (t_u16) wlan_le16_to_cpu(resp->params.tx_buf.buff_size); + pmadapter->tx_buf_size = + (pmadapter->tx_buf_size / MLAN_SDIO_BLOCK_SIZE) * + MLAN_SDIO_BLOCK_SIZE; + pmadapter->curr_tx_buf_size = pmadapter->tx_buf_size; + pmadapter->mp_end_port = + wlan_le16_to_cpu(resp->params.tx_buf.mp_end_port); + pmadapter->mp_data_port_mask = DATA_PORT_MASK; + /* hw tx wraps round only after port 31 */ + pmadapter->curr_wr_port = 0; + PRINTM(MCMND, "end port %d, data port mask %x\n", + wlan_le16_to_cpu(resp->params.tx_buf.mp_end_port), + pmadapter->mp_data_port_mask); + PRINTM(MCMND, "max_tx_buf_size=%d, tx_buf_size=%d\n", + pmadapter->max_tx_buf_size, pmadapter->tx_buf_size); + break; + case HostCmd_CMD_AMSDU_AGGR_CTRL: + ret = wlan_ret_amsdu_aggr_ctrl(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_11N_CFG: + ret = wlan_ret_11n_cfg(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_REJECT_ADDBA_REQ: + ret = wlan_ret_reject_addba_req(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_TX_BF_CFG: + ret = wlan_ret_tx_bf_cfg(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_VERSION_EXT: + ret = wlan_ret_ver_ext(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_RX_MGMT_IND: + ret = wlan_ret_rx_mgmt_ind(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_CFG_TX_DATA_PAUSE: + ret = wlan_uap_ret_txdatapause(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_RADIO_CONTROL: + ret = wlan_ret_802_11_radio_control(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_TX_RATE_CFG: + ret = wlan_ret_tx_rate_cfg(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_802_11_TX_RATE_QUERY: + ret = wlan_ret_802_11_tx_rate_query(pmpriv, resp, pioctl_buf); + break; #ifdef WIFI_DIRECT_SUPPORT - case HostCmd_CMD_802_11_REMAIN_ON_CHANNEL: - ret = wlan_ret_remain_on_channel(pmpriv, resp, pioctl_buf); - break; - case HOST_CMD_WIFI_DIRECT_MODE_CONFIG: - ret = wlan_ret_wifi_direct_mode(pmpriv, resp, pioctl_buf); - break; + case HostCmd_CMD_802_11_REMAIN_ON_CHANNEL: + ret = wlan_ret_remain_on_channel(pmpriv, resp, pioctl_buf); + break; + case HOST_CMD_WIFI_DIRECT_MODE_CONFIG: + ret = wlan_ret_wifi_direct_mode(pmpriv, resp, pioctl_buf); + break; #endif - case HostCmd_CMD_802_11_RF_ANTENNA: - ret = wlan_ret_802_11_rf_antenna(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_11AC_CFG: - ret = wlan_ret_11ac_cfg(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_MAC_REG_ACCESS: - case HostCmd_CMD_BBP_REG_ACCESS: - case HostCmd_CMD_RF_REG_ACCESS: - case HostCmd_CMD_CAU_REG_ACCESS: - case HostCmd_CMD_802_11_EEPROM_ACCESS: - ret = - wlan_ret_reg_access(pmpriv->adapter, cmdresp_no, resp, pioctl_buf); - break; - case HostCmd_CMD_MEM_ACCESS: - ret = wlan_ret_mem_access(pmpriv, resp, pioctl_buf); - break; - case HostCmd_CMD_WMM_QUEUE_CONFIG: - ret = wlan_ret_wmm_queue_config(pmpriv, resp, pioctl_buf); - break; - default: - PRINTM(MERROR, "CMD_RESP: Unknown command response %#x\n", - resp->command); - if (pioctl_buf) - pioctl_buf->status_code = MLAN_ERROR_CMD_RESP_FAIL; - break; - } - LEAVE(); - return ret; + case HostCmd_CMD_802_11_RF_ANTENNA: + ret = wlan_ret_802_11_rf_antenna(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_11AC_CFG: + ret = wlan_ret_11ac_cfg(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_MAC_REG_ACCESS: + case HostCmd_CMD_BBP_REG_ACCESS: + case HostCmd_CMD_RF_REG_ACCESS: + case HostCmd_CMD_CAU_REG_ACCESS: + case HostCmd_CMD_802_11_EEPROM_ACCESS: + ret = wlan_ret_reg_access(pmpriv->adapter, cmdresp_no, resp, + pioctl_buf); + break; + case HostCmd_CMD_MEM_ACCESS: + ret = wlan_ret_mem_access(pmpriv, resp, pioctl_buf); + break; + case HostCmd_CMD_WMM_QUEUE_CONFIG: + ret = wlan_ret_wmm_queue_config(pmpriv, resp, pioctl_buf); + break; + default: + PRINTM(MERROR, "CMD_RESP: Unknown command response %#x\n", + resp->command); + if (pioctl_buf) + pioctl_buf->status_code = MLAN_ERROR_CMD_RESP_FAIL; + break; + } + LEAVE(); + return ret; } -/** +/** * @brief This function handles events generated by firmware - * + * * @param priv A pointer to mlan_private structure * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -2956,257 +3317,268 @@ wlan_ops_uap_process_cmdresp(IN t_void * priv, mlan_status wlan_ops_uap_process_event(IN t_void * priv) { - pmlan_private pmpriv = (pmlan_private) priv; - pmlan_adapter pmadapter = pmpriv->adapter; - pmlan_callbacks pcb = &pmadapter->callbacks; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u32 eventcause = pmadapter->event_cause; - pmlan_buffer pmbuf = pmadapter->pmlan_buffer_event; - t_u8 *event_buf = MNULL; - mlan_event *pevent = MNULL; - t_u8 sta_addr[MLAN_MAC_ADDR_LENGTH]; - sta_node *sta_ptr = MNULL; - t_u8 i = 0; - - ENTER(); - - /* Event length check */ - if ((pmbuf->data_len - sizeof(eventcause)) > MAX_EVENT_SIZE) { - pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - /* Allocate memory for event buffer */ - ret = - pcb->moal_malloc(pmadapter->pmoal_handle, MAX_EVENT_SIZE, MLAN_MEM_DEF, - &event_buf); - if ((ret != MLAN_STATUS_SUCCESS) || !event_buf) { - PRINTM(MERROR, "Could not allocate buffer for event buf\n"); - if (pmbuf) - pmbuf->status_code = MLAN_ERROR_NO_MEM; - goto done; - } - pevent = (pmlan_event) event_buf; - memset(pmadapter, &pevent->event_id, 0, sizeof(pevent->event_id)); - - if (eventcause != EVENT_PS_SLEEP && eventcause != EVENT_PS_AWAKE && - pmbuf->data_len > sizeof(eventcause)) - DBG_HEXDUMP(MEVT_D, "EVENT", pmbuf->pbuf + pmbuf->data_offset, - pmbuf->data_len); - - switch (eventcause) { - case EVENT_MICRO_AP_BSS_START: - PRINTM(MEVENT, "EVENT: MICRO_AP_BSS_START\n"); - pmpriv->uap_bss_started = MTRUE; - memcpy(pmadapter, pmpriv->curr_addr, pmadapter->event_body + 2, - MLAN_MAC_ADDR_LENGTH); - pevent->event_id = MLAN_EVENT_ID_UAP_FW_BSS_START; - wlan_check_uap_capability(pmpriv, pmbuf); - break; - case EVENT_MICRO_AP_BSS_ACTIVE: - PRINTM(MEVENT, "EVENT: MICRO_AP_BSS_ACTIVE\n"); - pmpriv->media_connected = MTRUE; - pevent->event_id = MLAN_EVENT_ID_UAP_FW_BSS_ACTIVE; - break; - case EVENT_MICRO_AP_BSS_IDLE: - PRINTM(MEVENT, "EVENT: MICRO_AP_BSS_IDLE\n"); - pevent->event_id = MLAN_EVENT_ID_UAP_FW_BSS_IDLE; - pmpriv->media_connected = MFALSE; - wlan_clean_txrx(pmpriv); - wlan_notify_station_deauth(pmpriv); - wlan_delete_station_list(pmpriv); - break; - case EVENT_PS_AWAKE: - PRINTM(MINFO, "EVENT: AWAKE \n"); - PRINTM(MEVENT, "||"); - /* Handle unexpected PS AWAKE event */ - if (pmadapter->ps_state == PS_STATE_SLEEP_CFM) - break; - pmadapter->pm_wakeup_card_req = MFALSE; - pmadapter->pm_wakeup_fw_try = MFALSE; - pmadapter->ps_state = PS_STATE_AWAKE; - break; - case EVENT_PS_SLEEP: - PRINTM(MINFO, "EVENT: SLEEP\n"); - PRINTM(MEVENT, "__"); - /* Handle unexpected PS SLEEP event */ - if (pmadapter->ps_state == PS_STATE_SLEEP_CFM) - break; - pmadapter->ps_state = PS_STATE_PRE_SLEEP; - wlan_check_ps_cond(pmadapter); - break; - case EVENT_MICRO_AP_STA_ASSOC: - wlan_process_sta_assoc_event(pmpriv, pevent, pmbuf); - memcpy(pmadapter, sta_addr, pmadapter->event_body + 2, - MLAN_MAC_ADDR_LENGTH); - sta_ptr = wlan_add_station_entry(pmpriv, sta_addr); - PRINTM(MMSG, "wlan: EVENT: MICRO_AP_STA_ASSOC " MACSTR "\n", - MAC2STR(sta_addr)); - if (pmpriv->is_11n_enabled) { - wlan_check_sta_capability(pmpriv, pmbuf, sta_ptr); - for (i = 0; i < MAX_NUM_TID; i++) { - if (sta_ptr->is_11n_enabled) - sta_ptr->ampdu_sta[i] = pmpriv->aggr_prio_tbl[i].ampdu_user; - else - sta_ptr->ampdu_sta[i] = BA_STREAM_NOT_ALLOWED; - } - memset(pmadapter, sta_ptr->rx_seq, 0xff, sizeof(sta_ptr->rx_seq)); - } - if (pmpriv->sec_info.wapi_enabled) - wlan_update_wapi_info_tlv(pmpriv, pmbuf); - pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; - break; - case EVENT_MICRO_AP_STA_DEAUTH: - pevent->event_id = MLAN_EVENT_ID_UAP_FW_STA_DISCONNECT; - pevent->bss_index = pmpriv->bss_index; - pevent->event_len = pmbuf->data_len - 4; - /* skip event length field */ - memcpy(pmadapter, (t_u8 *) pevent->event_buf, - pmbuf->pbuf + pmbuf->data_offset + 4, pevent->event_len); - wlan_recv_event(pmpriv, pevent->event_id, pevent); - memcpy(pmadapter, sta_addr, pmadapter->event_body + 2, - MLAN_MAC_ADDR_LENGTH); - PRINTM(MMSG, "wlan: EVENT: MICRO_AP_STA_DEAUTH " MACSTR "\n", - MAC2STR(sta_addr)); - if (pmpriv->is_11n_enabled) { - wlan_cleanup_reorder_tbl(pmpriv, sta_addr); - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - pmpriv->wmm.ra_list_spinlock); - wlan_11n_cleanup_txbastream_tbl(pmpriv, sta_addr); - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - pmpriv->wmm.ra_list_spinlock); - } - wlan_wmm_delete_peer_ralist(pmpriv, sta_addr); - wlan_delete_station_entry(pmpriv, sta_addr); - pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; - break; - case EVENT_HS_ACT_REQ: - PRINTM(MEVENT, "EVENT: HS_ACT_REQ\n"); - ret = - wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_HS_CFG_ENH, 0, 0, MNULL, - MNULL); - break; - case EVENT_ADDBA: - PRINTM(MEVENT, "EVENT: ADDBA Request\n"); - if (pmpriv->media_connected == MTRUE) - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_11N_ADDBA_RSP, - HostCmd_ACT_GEN_SET, 0, MNULL, - pmadapter->event_body); - else - PRINTM(MERROR, "Ignore ADDBA Request event in BSS idle state\n"); - break; - case EVENT_DELBA: - PRINTM(MEVENT, "EVENT: DELBA Request\n"); - if (pmpriv->media_connected == MTRUE) - wlan_11n_delete_bastream(pmpriv, pmadapter->event_body); - else - PRINTM(MERROR, "Ignore DELBA Request event in BSS idle state\n"); - break; - case EVENT_BA_STREAM_TIMEOUT: - PRINTM(MEVENT, "EVENT: BA Stream timeout\n"); - if (pmpriv->media_connected == MTRUE) - wlan_11n_ba_stream_timeout(pmpriv, - (HostCmd_DS_11N_BATIMEOUT *) pmadapter-> - event_body); - else - PRINTM(MERROR, - "Ignore BA Stream timeout event in BSS idle state\n"); - break; - case EVENT_RXBA_SYNC: - PRINTM(MEVENT, "EVENT: RXBA_SYNC\n"); - wlan_11n_rxba_sync_event(pmpriv, pmadapter->event_body, - pmbuf->data_len - sizeof(eventcause)); - break; - case EVENT_AMSDU_AGGR_CTRL: - PRINTM(MEVENT, "EVENT: AMSDU_AGGR_CTRL %d\n", - *(t_u16 *) pmadapter->event_body); - pmadapter->tx_buf_size = - MIN(pmadapter->curr_tx_buf_size, - wlan_le16_to_cpu(*(t_u16 *) pmadapter->event_body)); - PRINTM(MEVENT, "tx_buf_size %d\n", pmadapter->tx_buf_size); - break; - case EVENT_TX_DATA_PAUSE: - PRINTM(MEVENT, "EVENT: TX_DATA_PAUSE\n"); - wlan_process_tx_pause_event(priv, pmbuf); - break; - case EVENT_RADAR_DETECTED: - PRINTM(MEVENT, "EVENT: Radar Detected\n"); - - /* Send as passthru first, this event can cause other events */ - memset(pmadapter, event_buf, 0x00, MAX_EVENT_SIZE); - pevent->bss_index = pmpriv->bss_index; - pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; - pevent->event_len = pmbuf->data_len; - memcpy(pmadapter, (t_u8 *) pevent->event_buf, - pmbuf->pbuf + pmbuf->data_offset, pevent->event_len); - wlan_recv_event(pmpriv, pevent->event_id, pevent); - pevent->event_id = 0; // clear to avoid resending at end of fcn - - if (pmadapter->state_rdh.stage == RDH_OFF) { - pmadapter->state_rdh.stage = RDH_CHK_INTFS; - wlan_11h_radar_detected_handling(pmadapter); - } else { - PRINTM(MEVENT, "Ignore Event Radar Detected - handling" - " already in progress.\n"); - } - break; - case EVENT_CHANNEL_REPORT_RDY: - PRINTM(MEVENT, "EVENT: Channel Report Ready\n"); - memset(pmadapter, event_buf, 0x00, MAX_EVENT_SIZE); - /* Setup event buffer */ - pevent->bss_index = pmpriv->bss_index; - pevent->event_id = MLAN_EVENT_ID_FW_CHANNEL_REPORT_RDY; - pevent->event_len = pmbuf->data_len - sizeof(eventcause); - /* Copy event data */ - memcpy(pmadapter, (t_u8 *) pevent->event_buf, - pmbuf->pbuf + pmbuf->data_offset + sizeof(eventcause), - pevent->event_len); - /* Handle / pass event data, and free buffer */ - ret = wlan_11h_handle_event_chanrpt_ready(pmpriv, pevent); - - /* Send up this Event to unblock MOAL waitqueue */ - wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_MEAS_REPORT, MNULL); - pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; - break; + pmlan_private pmpriv = (pmlan_private) priv; + pmlan_adapter pmadapter = pmpriv->adapter; + pmlan_callbacks pcb = &pmadapter->callbacks; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u32 eventcause = pmadapter->event_cause; + pmlan_buffer pmbuf = pmadapter->pmlan_buffer_event; + t_u8 *event_buf = MNULL; + mlan_event *pevent = MNULL; + t_u8 sta_addr[MLAN_MAC_ADDR_LENGTH]; + sta_node *sta_ptr = MNULL; + t_u8 i = 0; + + ENTER(); + + /* Event length check */ + if ((pmbuf->data_len - sizeof(eventcause)) > MAX_EVENT_SIZE) { + pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + /* Allocate memory for event buffer */ + ret = pcb->moal_malloc(pmadapter->pmoal_handle, MAX_EVENT_SIZE, + MLAN_MEM_DEF, &event_buf); + if ((ret != MLAN_STATUS_SUCCESS) || !event_buf) { + PRINTM(MERROR, "Could not allocate buffer for event buf\n"); + if (pmbuf) + pmbuf->status_code = MLAN_ERROR_NO_MEM; + goto done; + } + pevent = (pmlan_event) event_buf; + memset(pmadapter, &pevent->event_id, 0, sizeof(pevent->event_id)); + + if (eventcause != EVENT_PS_SLEEP && eventcause != EVENT_PS_AWAKE && + pmbuf->data_len > sizeof(eventcause)) + DBG_HEXDUMP(MEVT_D, "EVENT", pmbuf->pbuf + pmbuf->data_offset, + pmbuf->data_len); + + switch (eventcause) { + case EVENT_MICRO_AP_BSS_START: + PRINTM(MEVENT, "EVENT: MICRO_AP_BSS_START\n"); + pmpriv->uap_bss_started = MTRUE; + memcpy(pmadapter, pmpriv->curr_addr, pmadapter->event_body + 2, + MLAN_MAC_ADDR_LENGTH); + pevent->event_id = MLAN_EVENT_ID_UAP_FW_BSS_START; + wlan_check_uap_capability(pmpriv, pmbuf); + break; + case EVENT_MICRO_AP_BSS_ACTIVE: + PRINTM(MEVENT, "EVENT: MICRO_AP_BSS_ACTIVE\n"); + pmpriv->media_connected = MTRUE; + pevent->event_id = MLAN_EVENT_ID_UAP_FW_BSS_ACTIVE; + break; + case EVENT_MICRO_AP_BSS_IDLE: + PRINTM(MEVENT, "EVENT: MICRO_AP_BSS_IDLE\n"); + pevent->event_id = MLAN_EVENT_ID_UAP_FW_BSS_IDLE; + pmpriv->media_connected = MFALSE; + wlan_clean_txrx(pmpriv); + wlan_notify_station_deauth(pmpriv); + wlan_delete_station_list(pmpriv); + break; + case EVENT_PS_AWAKE: + PRINTM(MINFO, "EVENT: AWAKE \n"); + PRINTM(MEVENT, "||"); + /* Handle unexpected PS AWAKE event */ + if (pmadapter->ps_state == PS_STATE_SLEEP_CFM) + break; + pmadapter->pm_wakeup_card_req = MFALSE; + pmadapter->pm_wakeup_fw_try = MFALSE; + pmadapter->ps_state = PS_STATE_AWAKE; + break; + case EVENT_PS_SLEEP: + PRINTM(MINFO, "EVENT: SLEEP\n"); + PRINTM(MEVENT, "__"); + /* Handle unexpected PS SLEEP event */ + if (pmadapter->ps_state == PS_STATE_SLEEP_CFM) + break; + pmadapter->ps_state = PS_STATE_PRE_SLEEP; + wlan_check_ps_cond(pmadapter); + break; + case EVENT_MICRO_AP_STA_ASSOC: + wlan_process_sta_assoc_event(pmpriv, pevent, pmbuf); + memcpy(pmadapter, sta_addr, pmadapter->event_body + 2, + MLAN_MAC_ADDR_LENGTH); + sta_ptr = wlan_add_station_entry(pmpriv, sta_addr); + PRINTM(MMSG, "wlan: EVENT: MICRO_AP_STA_ASSOC " MACSTR "\n", + MAC2STR(sta_addr)); + if (pmpriv->is_11n_enabled) { + wlan_check_sta_capability(pmpriv, pmbuf, sta_ptr); + for (i = 0; i < MAX_NUM_TID; i++) { + if (sta_ptr->is_11n_enabled) + sta_ptr->ampdu_sta[i] = + pmpriv->aggr_prio_tbl[i]. + ampdu_user; + else + sta_ptr->ampdu_sta[i] = + BA_STREAM_NOT_ALLOWED; + } + memset(pmadapter, sta_ptr->rx_seq, 0xff, + sizeof(sta_ptr->rx_seq)); + } + if (pmpriv->sec_info.wapi_enabled) + wlan_update_wapi_info_tlv(pmpriv, pmbuf); + pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; + break; + case EVENT_MICRO_AP_STA_DEAUTH: + pevent->event_id = MLAN_EVENT_ID_UAP_FW_STA_DISCONNECT; + pevent->bss_index = pmpriv->bss_index; + pevent->event_len = pmbuf->data_len - 4; + /* skip event length field */ + memcpy(pmadapter, (t_u8 *) pevent->event_buf, + pmbuf->pbuf + pmbuf->data_offset + 4, pevent->event_len); + wlan_recv_event(pmpriv, pevent->event_id, pevent); + memcpy(pmadapter, sta_addr, pmadapter->event_body + 2, + MLAN_MAC_ADDR_LENGTH); + PRINTM(MMSG, "wlan: EVENT: MICRO_AP_STA_DEAUTH " MACSTR "\n", + MAC2STR(sta_addr)); + if (pmpriv->is_11n_enabled) { + wlan_cleanup_reorder_tbl(pmpriv, sta_addr); + pmadapter->callbacks.moal_spin_lock(pmadapter-> + pmoal_handle, + pmpriv->wmm. + ra_list_spinlock); + wlan_11n_cleanup_txbastream_tbl(pmpriv, sta_addr); + pmadapter->callbacks.moal_spin_unlock(pmadapter-> + pmoal_handle, + pmpriv->wmm. + ra_list_spinlock); + } + wlan_wmm_delete_peer_ralist(pmpriv, sta_addr); + wlan_delete_station_entry(pmpriv, sta_addr); + pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; + break; + case EVENT_HS_ACT_REQ: + PRINTM(MEVENT, "EVENT: HS_ACT_REQ\n"); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_HS_CFG_ENH, 0, + 0, MNULL, MNULL); + break; + case EVENT_ADDBA: + PRINTM(MEVENT, "EVENT: ADDBA Request\n"); + if (pmpriv->media_connected == MTRUE) + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_11N_ADDBA_RSP, + HostCmd_ACT_GEN_SET, 0, MNULL, + pmadapter->event_body); + else + PRINTM(MERROR, + "Ignore ADDBA Request event in BSS idle state\n"); + break; + case EVENT_DELBA: + PRINTM(MEVENT, "EVENT: DELBA Request\n"); + if (pmpriv->media_connected == MTRUE) + wlan_11n_delete_bastream(pmpriv, pmadapter->event_body); + else + PRINTM(MERROR, + "Ignore DELBA Request event in BSS idle state\n"); + break; + case EVENT_BA_STREAM_TIMEOUT: + PRINTM(MEVENT, "EVENT: BA Stream timeout\n"); + if (pmpriv->media_connected == MTRUE) + wlan_11n_ba_stream_timeout(pmpriv, + (HostCmd_DS_11N_BATIMEOUT *) + pmadapter->event_body); + else + PRINTM(MERROR, + "Ignore BA Stream timeout event in BSS idle state\n"); + break; + case EVENT_RXBA_SYNC: + PRINTM(MEVENT, "EVENT: RXBA_SYNC\n"); + wlan_11n_rxba_sync_event(pmpriv, pmadapter->event_body, + pmbuf->data_len - sizeof(eventcause)); + break; + case EVENT_AMSDU_AGGR_CTRL: + PRINTM(MEVENT, "EVENT: AMSDU_AGGR_CTRL %d\n", + *(t_u16 *) pmadapter->event_body); + pmadapter->tx_buf_size = + MIN(pmadapter->curr_tx_buf_size, + wlan_le16_to_cpu(*(t_u16 *) pmadapter->event_body)); + PRINTM(MEVENT, "tx_buf_size %d\n", pmadapter->tx_buf_size); + break; + case EVENT_TX_DATA_PAUSE: + PRINTM(MEVENT, "EVENT: TX_DATA_PAUSE\n"); + wlan_process_tx_pause_event(priv, pmbuf); + break; + case EVENT_RADAR_DETECTED: + PRINTM(MEVENT, "EVENT: Radar Detected\n"); + + /* Send as passthru first, this event can cause other events */ + memset(pmadapter, event_buf, 0x00, MAX_EVENT_SIZE); + pevent->bss_index = pmpriv->bss_index; + pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; + pevent->event_len = pmbuf->data_len; + memcpy(pmadapter, (t_u8 *) pevent->event_buf, + pmbuf->pbuf + pmbuf->data_offset, pevent->event_len); + wlan_recv_event(pmpriv, pevent->event_id, pevent); + pevent->event_id = 0; // clear to avoid resending at end of + // fcn + + if (pmadapter->state_rdh.stage == RDH_OFF) { + pmadapter->state_rdh.stage = RDH_CHK_INTFS; + wlan_11h_radar_detected_handling(pmadapter); + } else { + PRINTM(MEVENT, "Ignore Event Radar Detected - handling" + " already in progress.\n"); + } + break; + case EVENT_CHANNEL_REPORT_RDY: + PRINTM(MEVENT, "EVENT: Channel Report Ready\n"); + memset(pmadapter, event_buf, 0x00, MAX_EVENT_SIZE); + /* Setup event buffer */ + pevent->bss_index = pmpriv->bss_index; + pevent->event_id = MLAN_EVENT_ID_FW_CHANNEL_REPORT_RDY; + pevent->event_len = pmbuf->data_len - sizeof(eventcause); + /* Copy event data */ + memcpy(pmadapter, (t_u8 *) pevent->event_buf, + pmbuf->pbuf + pmbuf->data_offset + sizeof(eventcause), + pevent->event_len); + /* Handle / pass event data, and free buffer */ + ret = wlan_11h_handle_event_chanrpt_ready(pmpriv, pevent); + + /* Send up this Event to unblock MOAL waitqueue */ + wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_MEAS_REPORT, MNULL); + pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; + break; #ifdef WIFI_DIRECT_SUPPORT - case EVENT_REMAIN_ON_CHANNEL_EXPIRED: - PRINTM(MEVENT, "EVENT: REMAIN_ON_CHANNEL_EXPIRED reason=%d\n", - *(t_u16 *) pmadapter->event_body); - pevent->event_id = MLAN_EVENT_ID_FW_REMAIN_ON_CHAN_EXPIRED; - break; + case EVENT_REMAIN_ON_CHANNEL_EXPIRED: + PRINTM(MEVENT, "EVENT: REMAIN_ON_CHANNEL_EXPIRED reason=%d\n", + *(t_u16 *) pmadapter->event_body); + pevent->event_id = MLAN_EVENT_ID_FW_REMAIN_ON_CHAN_EXPIRED; + break; #endif - case EVENT_FW_DEBUG_INFO: - PRINTM(MERROR, "EVENT: FW Debug Info\n"); - memset(pmadapter, event_buf, 0x00, MAX_EVENT_SIZE); - pevent->bss_index = pmpriv->bss_index; - pevent->event_id = MLAN_EVENT_ID_FW_DEBUG_INFO; - pevent->event_len = pmbuf->data_len - sizeof(eventcause); - memcpy(pmadapter, - (t_u8 *) pevent->event_buf, - pmbuf->pbuf + pmbuf->data_offset + sizeof(eventcause), - pevent->event_len); - wlan_recv_event(pmpriv, pevent->event_id, pevent); - pevent->event_id = 0; // clear to avoid resending at end of fcn - break; - default: - pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; - break; - } - - if (pevent->event_id) { - pevent->bss_index = pmpriv->bss_index; - pevent->event_len = pmbuf->data_len; - memcpy(pmadapter, (t_u8 *) pevent->event_buf, - pmbuf->pbuf + pmbuf->data_offset, pevent->event_len); - wlan_recv_event(pmpriv, pevent->event_id, pevent); - } - done: - if (event_buf) - pcb->moal_mfree(pmadapter->pmoal_handle, event_buf); - LEAVE(); - return ret; + case EVENT_FW_DEBUG_INFO: + PRINTM(MERROR, "EVENT: FW Debug Info\n"); + memset(pmadapter, event_buf, 0x00, MAX_EVENT_SIZE); + pevent->bss_index = pmpriv->bss_index; + pevent->event_id = MLAN_EVENT_ID_FW_DEBUG_INFO; + pevent->event_len = pmbuf->data_len - sizeof(eventcause); + memcpy(pmadapter, + (t_u8 *) pevent->event_buf, + pmbuf->pbuf + pmbuf->data_offset + sizeof(eventcause), + pevent->event_len); + wlan_recv_event(pmpriv, pevent->event_id, pevent); + pevent->event_id = 0; // clear to avoid resending at end of + // fcn + break; + default: + pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; + break; + } + + if (pevent->event_id) { + pevent->bss_index = pmpriv->bss_index; + pevent->event_len = pmbuf->data_len; + memcpy(pmadapter, (t_u8 *) pevent->event_buf, + pmbuf->pbuf + pmbuf->data_offset, pevent->event_len); + wlan_recv_event(pmpriv, pevent->event_id, pevent); + } +done: + if (event_buf) + pcb->moal_mfree(pmadapter->pmoal_handle, event_buf); + LEAVE(); + return ret; } /** @@ -3220,32 +3592,33 @@ wlan_ops_uap_process_event(IN t_void * priv) mlan_status wlan_ops_uap_init_cmd(IN t_void * priv, IN t_u8 first_bss) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = (pmlan_private) priv; - t_u16 last_cmd = 0; - - ENTER(); - - if (first_bss) { - if (wlan_adapter_init_cmd(pmpriv->adapter) == MLAN_STATUS_FAILURE) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - } - - ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_SYS_CONFIGURE, - HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); - if (ret) { - ret = MLAN_STATUS_FAILURE; - goto done; - } - last_cmd = HOST_CMD_APCMD_SYS_CONFIGURE; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = (pmlan_private) priv; + t_u16 last_cmd = 0; + + ENTER(); + + if (first_bss) { + if (wlan_adapter_init_cmd(pmpriv->adapter) == + MLAN_STATUS_FAILURE) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + } + + ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_SYS_CONFIGURE, + HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); + if (ret) { + ret = MLAN_STATUS_FAILURE; + goto done; + } + last_cmd = HOST_CMD_APCMD_SYS_CONFIGURE; /** set last_init_cmd */ - if (last_cmd) { - pmpriv->adapter->last_init_cmd = last_cmd; - ret = MLAN_STATUS_PENDING; - } - done: - LEAVE(); - return ret; + if (last_cmd) { + pmpriv->adapter->last_init_cmd = last_cmd; + ret = MLAN_STATUS_PENDING; + } +done: + LEAVE(); + return ret; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_uap_ioctl.c b/drivers/net/wireless/sd8897/mlan/mlan_uap_ioctl.c index 7f37c3db27a6..48e49e174ca2 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_uap_ioctl.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_uap_ioctl.c @@ -1,20 +1,20 @@ /** @file mlan_uap_ioctl.c * - * @brief This file contains the handling of AP mode ioctls - * - * Copyright (C) 2009-2011, Marvell International Ltd. - * - * This software file (the "File") is distributed by Marvell International - * Ltd. under the terms of the GNU General Public License Version 2, June 1991 - * (the "License"). You may use, redistribute and/or modify this File in - * accordance with the terms and conditions of the License, a copy of which + * @brief This file contains the handling of AP mode ioctls + * + * Copyright (C) 2009-2011, Marvell International Ltd. + * + * This software file (the "File") is distributed by Marvell International + * Ltd. under the terms of the GNU General Public License Version 2, June 1991 + * (the "License"). You may use, redistribute and/or modify this File in + * accordance with the terms and conditions of the License, a copy of which * is available by writing to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. * - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about + * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE + * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE + * ARE EXPRESSLY DISCLAIMED. The License provides additional details about * this warranty disclaimer. */ @@ -45,7 +45,7 @@ extern t_u8 tos_to_tid_inv[]; /******************************************************** Local Functions ********************************************************/ -/** +/** * @brief Stop BSS * * @param pmadapter A pointer to mlan_adapter structure @@ -55,22 +55,22 @@ extern t_u8 tos_to_tid_inv[]; */ static mlan_status wlan_uap_bss_ioctl_stop(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - ENTER(); + ENTER(); - ret = wlan_prepare_cmd(pmpriv, - HOST_CMD_APCMD_BSS_STOP, - HostCmd_ACT_GEN_SET, - 0, (t_void *) pioctl_req, MNULL); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + ret = wlan_prepare_cmd(pmpriv, + HOST_CMD_APCMD_BSS_STOP, + HostCmd_ACT_GEN_SET, + 0, (t_void *) pioctl_req, MNULL); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } /** @@ -85,93 +85,106 @@ wlan_uap_bss_ioctl_stop(IN pmlan_adapter pmadapter, static mlan_status wlan_uap_callback_bss_ioctl_start(IN t_void * priv) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = (mlan_private *) priv; - mlan_callbacks *pcb = (mlan_callbacks *) & pmpriv->adapter->callbacks; - wlan_uap_get_info_cb_t *puap_state_chan_cb = &pmpriv->uap_state_chan_cb; - t_u8 old_channel; - - ENTER(); - /* clear callback now that we're here */ - puap_state_chan_cb->get_chan_callback = MNULL; - - /* - * Check if the region and channel requires we check for radar. - */ - if ((puap_state_chan_cb->band_config & BAND_CONFIG_5GHZ) && - wlan_11h_radar_detect_required(pmpriv, puap_state_chan_cb->channel)) { - /* first check if channel is under NOP */ - if (wlan_11h_is_channel_under_nop(pmpriv->adapter, - puap_state_chan_cb->channel)) { - /* recently we've seen radar on this channel */ - ret = MLAN_STATUS_FAILURE; - } - - /* Check cached radar check on the channel */ - if (ret == MLAN_STATUS_SUCCESS) - ret = - wlan_11h_check_chan_report(pmpriv, puap_state_chan_cb->channel); - - /* Found radar: try to switch to a non-dfs channel */ - if (ret != MLAN_STATUS_SUCCESS) { - old_channel = puap_state_chan_cb->channel; - ret = - wlan_11h_switch_non_dfs_chan(pmpriv, - &puap_state_chan_cb->channel); - - if (ret == MLAN_STATUS_SUCCESS) { - ret = wlan_uap_set_channel(pmpriv, - pmpriv->uap_state_chan_cb. - band_config, - puap_state_chan_cb->channel); - if (ret == MLAN_STATUS_SUCCESS) { - PRINTM(MMSG, "Radar found on channel %d," - "switch to new channel %d.\n", - old_channel, puap_state_chan_cb->channel); - } else { - PRINTM(MMSG, "Radar found on channel %d," - " switch to new channel %d failed.\n", - old_channel, puap_state_chan_cb->channel); - pcb->moal_ioctl_complete(pmpriv->adapter->pmoal_handle, - puap_state_chan_cb-> - pioctl_req_curr, - MLAN_STATUS_FAILURE); - goto done; - } - } else { - PRINTM(MMSG, - "Radar found on channel %d, no switch channel available.\n", - old_channel); - /* No command sent with the ioctl, need manually signal - completion */ - pcb->moal_ioctl_complete(pmpriv->adapter->pmoal_handle, - puap_state_chan_cb->pioctl_req_curr, - MLAN_STATUS_FAILURE); - goto done; - } - } else { - PRINTM(MINFO, "No Radar found on channel %d\n", - puap_state_chan_cb->channel); - } - } - - /* else okay to send command: not DFS channel or no radar */ - ret = wlan_prepare_cmd(pmpriv, - HOST_CMD_APCMD_BSS_START, - HostCmd_ACT_GEN_SET, - 0, - (t_void *) puap_state_chan_cb->pioctl_req_curr, - MNULL); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - done: - puap_state_chan_cb->pioctl_req_curr = MNULL; // prevent re-use - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = (mlan_private *) priv; + mlan_callbacks *pcb = (mlan_callbacks *) & pmpriv->adapter->callbacks; + wlan_uap_get_info_cb_t *puap_state_chan_cb = &pmpriv->uap_state_chan_cb; + t_u8 old_channel; + + ENTER(); + /* clear callback now that we're here */ + puap_state_chan_cb->get_chan_callback = MNULL; + + /* + * Check if the region and channel requires we check for radar. + */ + if ((puap_state_chan_cb->band_config & BAND_CONFIG_5GHZ) && + wlan_11h_radar_detect_required(pmpriv, + puap_state_chan_cb->channel)) { + /* first check if channel is under NOP */ + if (wlan_11h_is_channel_under_nop(pmpriv->adapter, + puap_state_chan_cb-> + channel)) { + /* recently we've seen radar on this channel */ + ret = MLAN_STATUS_FAILURE; + } + + /* Check cached radar check on the channel */ + if (ret == MLAN_STATUS_SUCCESS) + ret = wlan_11h_check_chan_report(pmpriv, + puap_state_chan_cb-> + channel); + + /* Found radar: try to switch to a non-dfs channel */ + if (ret != MLAN_STATUS_SUCCESS) { + old_channel = puap_state_chan_cb->channel; + ret = wlan_11h_switch_non_dfs_chan(pmpriv, + &puap_state_chan_cb-> + channel); + + if (ret == MLAN_STATUS_SUCCESS) { + ret = wlan_uap_set_channel(pmpriv, + pmpriv-> + uap_state_chan_cb. + band_config, + puap_state_chan_cb-> + channel); + if (ret == MLAN_STATUS_SUCCESS) { + PRINTM(MMSG, + "Radar found on channel %d," + "switch to new channel %d.\n", + old_channel, + puap_state_chan_cb->channel); + } else { + PRINTM(MMSG, + "Radar found on channel %d," + " switch to new channel %d failed.\n", + old_channel, + puap_state_chan_cb->channel); + pcb->moal_ioctl_complete(pmpriv-> + adapter-> + pmoal_handle, + puap_state_chan_cb-> + pioctl_req_curr, + MLAN_STATUS_FAILURE); + goto done; + } + } else { + PRINTM(MMSG, + "Radar found on channel %d, no switch channel available.\n", + old_channel); + /* No command sent with the ioctl, need + manually signal completion */ + pcb->moal_ioctl_complete(pmpriv->adapter-> + pmoal_handle, + puap_state_chan_cb-> + pioctl_req_curr, + MLAN_STATUS_FAILURE); + goto done; + } + } else { + PRINTM(MINFO, "No Radar found on channel %d\n", + puap_state_chan_cb->channel); + } + } + + /* else okay to send command: not DFS channel or no radar */ + ret = wlan_prepare_cmd(pmpriv, + HOST_CMD_APCMD_BSS_START, + HostCmd_ACT_GEN_SET, + 0, + (t_void *) puap_state_chan_cb->pioctl_req_curr, + MNULL); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + +done: + puap_state_chan_cb->pioctl_req_curr = MNULL; // prevent re-use + LEAVE(); + return ret; } -/** +/** * @brief Start BSS * * @param pmadapter A pointer to mlan_adapter structure @@ -184,29 +197,29 @@ wlan_uap_callback_bss_ioctl_start(IN t_void * priv) */ static mlan_status wlan_uap_bss_ioctl_start(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - ENTER(); + ENTER(); - /* First check channel report, defer BSS_START CMD to callback. */ - /* store params, issue command to get UAP channel, whose CMD_RESP will - callback remainder of bss_start handling */ - pmpriv->uap_state_chan_cb.pioctl_req_curr = pioctl_req; - pmpriv->uap_state_chan_cb.get_chan_callback = - wlan_uap_callback_bss_ioctl_start; + /* First check channel report, defer BSS_START CMD to callback. */ + /* store params, issue command to get UAP channel, whose CMD_RESP will + callback remainder of bss_start handling */ + pmpriv->uap_state_chan_cb.pioctl_req_curr = pioctl_req; + pmpriv->uap_state_chan_cb.get_chan_callback = + wlan_uap_callback_bss_ioctl_start; - ret = wlan_uap_get_channel(pmpriv); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + ret = wlan_uap_get_channel(pmpriv); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief reset BSS * * @param pmadapter A pointer to mlan_adapter structure @@ -216,48 +229,48 @@ wlan_uap_bss_ioctl_start(IN pmlan_adapter pmadapter, */ static mlan_status wlan_uap_bss_ioctl_reset(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - t_u8 i = 0; - - ENTER(); - - /* - * Reset any uap private parameters here - */ - for (i = 0; i < pmadapter->max_mgmt_ie_index; i++) { - memset(pmadapter, &pmpriv->mgmt_ie[i], 0, sizeof(custom_ie)); - } - pmpriv->add_ba_param.timeout = MLAN_DEFAULT_BLOCK_ACK_TIMEOUT; - pmpriv->add_ba_param.tx_win_size = MLAN_UAP_AMPDU_DEF_TXWINSIZE; - pmpriv->add_ba_param.rx_win_size = MLAN_UAP_AMPDU_DEF_RXWINSIZE; - for (i = 0; i < MAX_NUM_TID; i++) { - pmpriv->aggr_prio_tbl[i].ampdu_user = tos_to_tid_inv[i]; - pmpriv->aggr_prio_tbl[i].amsdu = BA_STREAM_NOT_ALLOWED; - pmpriv->addba_reject[i] = ADDBA_RSP_STATUS_ACCEPT; - } - pmpriv->aggr_prio_tbl[6].ampdu_user = - pmpriv->aggr_prio_tbl[7].ampdu_user = BA_STREAM_NOT_ALLOWED; - - /* hs_configured, hs_activated are reset by main loop */ - pmadapter->hs_cfg.conditions = HOST_SLEEP_DEF_COND; - pmadapter->hs_cfg.gpio = HOST_SLEEP_DEF_GPIO; - pmadapter->hs_cfg.gap = HOST_SLEEP_DEF_GAP; - - ret = wlan_prepare_cmd(pmpriv, - HOST_CMD_APCMD_SYS_RESET, - HostCmd_ACT_GEN_SET, - 0, (t_void *) pioctl_req, MNULL); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + t_u8 i = 0; + + ENTER(); + + /* + * Reset any uap private parameters here + */ + for (i = 0; i < pmadapter->max_mgmt_ie_index; i++) { + memset(pmadapter, &pmpriv->mgmt_ie[i], 0, sizeof(custom_ie)); + } + pmpriv->add_ba_param.timeout = MLAN_DEFAULT_BLOCK_ACK_TIMEOUT; + pmpriv->add_ba_param.tx_win_size = MLAN_UAP_AMPDU_DEF_TXWINSIZE; + pmpriv->add_ba_param.rx_win_size = MLAN_UAP_AMPDU_DEF_RXWINSIZE; + for (i = 0; i < MAX_NUM_TID; i++) { + pmpriv->aggr_prio_tbl[i].ampdu_user = tos_to_tid_inv[i]; + pmpriv->aggr_prio_tbl[i].amsdu = BA_STREAM_NOT_ALLOWED; + pmpriv->addba_reject[i] = ADDBA_RSP_STATUS_ACCEPT; + } + pmpriv->aggr_prio_tbl[6].ampdu_user = + pmpriv->aggr_prio_tbl[7].ampdu_user = BA_STREAM_NOT_ALLOWED; + + /* hs_configured, hs_activated are reset by main loop */ + pmadapter->hs_cfg.conditions = HOST_SLEEP_DEF_COND; + pmadapter->hs_cfg.gpio = HOST_SLEEP_DEF_GPIO; + pmadapter->hs_cfg.gap = HOST_SLEEP_DEF_GAP; + + ret = wlan_prepare_cmd(pmpriv, + HOST_CMD_APCMD_SYS_RESET, + HostCmd_ACT_GEN_SET, + 0, (t_void *) pioctl_req, MNULL); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } -/** +/** * @brief Set/Get MAC address * * @param pmadapter A pointer to mlan_adapter structure @@ -267,34 +280,34 @@ wlan_uap_bss_ioctl_reset(IN pmlan_adapter pmadapter, */ static mlan_status wlan_uap_bss_ioctl_mac_address(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_bss *bss = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u16 cmd_action = 0; - - ENTER(); - - bss = (mlan_ds_bss *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) { - memcpy(pmadapter, pmpriv->curr_addr, &bss->param.mac_addr, - MLAN_MAC_ADDR_LENGTH); - cmd_action = HostCmd_ACT_GEN_SET; - } else - cmd_action = HostCmd_ACT_GEN_GET; - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_SYS_CONFIGURE, - cmd_action, 0, (t_void *) pioctl_req, MNULL); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_bss *bss = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u16 cmd_action = 0; + + ENTER(); + + bss = (mlan_ds_bss *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) { + memcpy(pmadapter, pmpriv->curr_addr, &bss->param.mac_addr, + MLAN_MAC_ADDR_LENGTH); + cmd_action = HostCmd_ACT_GEN_SET; + } else + cmd_action = HostCmd_ACT_GEN_GET; + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_SYS_CONFIGURE, + cmd_action, 0, (t_void *) pioctl_req, MNULL); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } -/** +/** * @brief Get Uap statistics * * @param pmadapter A pointer to mlan_adapter structure @@ -305,23 +318,23 @@ wlan_uap_bss_ioctl_mac_address(IN pmlan_adapter pmadapter, static mlan_status wlan_uap_get_stats(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - ENTER(); + ENTER(); - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_SNMP_MIB, - HostCmd_ACT_GEN_GET, - 0, (t_void *) pioctl_req, MNULL); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_SNMP_MIB, + HostCmd_ACT_GEN_GET, + 0, (t_void *) pioctl_req, MNULL); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief Set/Get AP config * * @param pmadapter A pointer to mlan_adapter structure @@ -331,31 +344,31 @@ wlan_uap_get_stats(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_uap_bss_ioctl_config(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u16 cmd_action = 0; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u16 cmd_action = 0; - ENTER(); + ENTER(); - if (pioctl_req->action == MLAN_ACT_SET) - cmd_action = HostCmd_ACT_GEN_SET; - else - cmd_action = HostCmd_ACT_GEN_GET; + if (pioctl_req->action == MLAN_ACT_SET) + cmd_action = HostCmd_ACT_GEN_SET; + else + cmd_action = HostCmd_ACT_GEN_GET; - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_SYS_CONFIGURE, - cmd_action, 0, (t_void *) pioctl_req, MNULL); + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_SYS_CONFIGURE, + cmd_action, 0, (t_void *) pioctl_req, MNULL); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief deauth sta * * @param pmadapter A pointer to mlan_adapter structure @@ -365,30 +378,30 @@ wlan_uap_bss_ioctl_config(IN pmlan_adapter pmadapter, */ static mlan_status wlan_uap_bss_ioctl_deauth_sta(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_bss *bss = MNULL; - - ENTER(); - - bss = (mlan_ds_bss *) pioctl_req->pbuf; - ret = wlan_prepare_cmd(pmpriv, - HOST_CMD_APCMD_STA_DEAUTH, - HostCmd_ACT_GEN_SET, - 0, - (t_void *) pioctl_req, - (t_void *) & bss->param.deauth_param); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_bss *bss = MNULL; + + ENTER(); + + bss = (mlan_ds_bss *) pioctl_req->pbuf; + ret = wlan_prepare_cmd(pmpriv, + HOST_CMD_APCMD_STA_DEAUTH, + HostCmd_ACT_GEN_SET, + 0, + (t_void *) pioctl_req, + (t_void *) & bss->param.deauth_param); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } -/** - * @brief Get station list +/** + * @brief Get station list * * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer @@ -398,25 +411,25 @@ wlan_uap_bss_ioctl_deauth_sta(IN pmlan_adapter pmadapter, static mlan_status wlan_uap_get_sta_list(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; - ENTER(); + ENTER(); - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HOST_CMD_APCMD_STA_LIST, - HostCmd_ACT_GEN_GET, - 0, (t_void *) pioctl_req, MNULL); + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HOST_CMD_APCMD_STA_LIST, + HostCmd_ACT_GEN_GET, + 0, (t_void *) pioctl_req, MNULL); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief soft_reset * * @param pmadapter A pointer to mlan_adapter structure @@ -426,25 +439,25 @@ wlan_uap_get_sta_list(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_uap_misc_ioctl_soft_reset(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; - ENTER(); + ENTER(); - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_SOFT_RESET, - HostCmd_ACT_GEN_SET, - 0, (t_void *) pioctl_req, MNULL); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_SOFT_RESET, + HostCmd_ACT_GEN_SET, + 0, (t_void *) pioctl_req, MNULL); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief Tx data pause * * @param pmadapter A pointer to mlan_adapter structure @@ -454,32 +467,33 @@ wlan_uap_misc_ioctl_soft_reset(IN pmlan_adapter pmadapter, */ static mlan_status wlan_uap_misc_ioctl_txdatapause(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_misc_cfg *pmisc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u16 cmd_action = 0; - - ENTER(); - - if (pioctl_req->action == MLAN_ACT_SET) - cmd_action = HostCmd_ACT_GEN_SET; - else - cmd_action = HostCmd_ACT_GEN_GET; - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_CFG_TX_DATA_PAUSE, - cmd_action, - 0, - (t_void *) pioctl_req, &(pmisc->param.tx_datapause)); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_misc_cfg *pmisc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u16 cmd_action = 0; + + ENTER(); + + if (pioctl_req->action == MLAN_ACT_SET) + cmd_action = HostCmd_ACT_GEN_SET; + else + cmd_action = HostCmd_ACT_GEN_GET; + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_CFG_TX_DATA_PAUSE, + cmd_action, + 0, + (t_void *) pioctl_req, + &(pmisc->param.tx_datapause)); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } -/** +/** * @brief Set/Get Power mode * * @param pmadapter A pointer to mlan_adapter structure @@ -489,52 +503,53 @@ wlan_uap_misc_ioctl_txdatapause(IN pmlan_adapter pmadapter, */ static mlan_status wlan_uap_pm_ioctl_mode(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_pm_cfg *pm = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - t_u16 cmd_action = 0; - t_u32 cmd_oid = 0; - - ENTER(); - - pm = (mlan_ds_pm_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_SET) { - if (pm->param.ps_mgmt.ps_mode == PS_MODE_INACTIVITY) { - cmd_action = EN_AUTO_PS; - cmd_oid = BITMAP_UAP_INACT_PS; - } else if (pm->param.ps_mgmt.ps_mode == PS_MODE_PERIODIC_DTIM) { - cmd_action = EN_AUTO_PS; - cmd_oid = BITMAP_UAP_DTIM_PS; - } else { - cmd_action = DIS_AUTO_PS; - cmd_oid = BITMAP_UAP_INACT_PS | BITMAP_UAP_DTIM_PS; - } - } else { - cmd_action = GET_PS; - cmd_oid = BITMAP_UAP_INACT_PS | BITMAP_UAP_DTIM_PS; - } - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_PS_MODE_ENH, - cmd_action, cmd_oid, (t_void *) pioctl_req, - (t_void *) & pm->param.ps_mgmt); - if ((ret == MLAN_STATUS_SUCCESS) && - (pioctl_req->action == MLAN_ACT_SET) && (cmd_action == DIS_AUTO_PS)) { - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_PS_MODE_ENH, GET_PS, - 0, MNULL, MNULL); - } - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_pm_cfg *pm = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + t_u16 cmd_action = 0; + t_u32 cmd_oid = 0; + + ENTER(); + + pm = (mlan_ds_pm_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_SET) { + if (pm->param.ps_mgmt.ps_mode == PS_MODE_INACTIVITY) { + cmd_action = EN_AUTO_PS; + cmd_oid = BITMAP_UAP_INACT_PS; + } else if (pm->param.ps_mgmt.ps_mode == PS_MODE_PERIODIC_DTIM) { + cmd_action = EN_AUTO_PS; + cmd_oid = BITMAP_UAP_DTIM_PS; + } else { + cmd_action = DIS_AUTO_PS; + cmd_oid = BITMAP_UAP_INACT_PS | BITMAP_UAP_DTIM_PS; + } + } else { + cmd_action = GET_PS; + cmd_oid = BITMAP_UAP_INACT_PS | BITMAP_UAP_DTIM_PS; + } + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_PS_MODE_ENH, + cmd_action, cmd_oid, (t_void *) pioctl_req, + (t_void *) & pm->param.ps_mgmt); + if ((ret == MLAN_STATUS_SUCCESS) && + (pioctl_req->action == MLAN_ACT_SET) && + (cmd_action == DIS_AUTO_PS)) { + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_PS_MODE_ENH, GET_PS, + 0, MNULL, MNULL); + } + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } -/** - * @brief Set WAPI IE +/** + * @brief Set WAPI IE * * @param priv A pointer to mlan_private structure * @param pioctl_req A pointer to ioctl request buffer @@ -544,47 +559,48 @@ wlan_uap_pm_ioctl_mode(IN pmlan_adapter pmadapter, static mlan_status wlan_uap_set_wapi_ie(mlan_private * priv, pmlan_ioctl_req pioctl_req) { - mlan_ds_misc_cfg *misc = MNULL; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - if (misc->param.gen_ie.len) { - if (misc->param.gen_ie.len > sizeof(priv->wapi_ie)) { - PRINTM(MWARN, "failed to copy WAPI IE, too big \n"); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - memcpy(priv->adapter, priv->wapi_ie, misc->param.gen_ie.ie_data, - misc->param.gen_ie.len); - priv->wapi_ie_len = misc->param.gen_ie.len; - PRINTM(MIOCTL, "Set wapi_ie_len=%d IE=%#x\n", priv->wapi_ie_len, - priv->wapi_ie[0]); - DBG_HEXDUMP(MCMD_D, "wapi_ie", priv->wapi_ie, priv->wapi_ie_len); - if (priv->wapi_ie[0] == WAPI_IE) - priv->sec_info.wapi_enabled = MTRUE; - } else { - memset(priv->adapter, priv->wapi_ie, 0, sizeof(priv->wapi_ie)); - priv->wapi_ie_len = misc->param.gen_ie.len; - PRINTM(MINFO, "Reset wapi_ie_len=%d IE=%#x\n", priv->wapi_ie_len, - priv->wapi_ie[0]); - priv->sec_info.wapi_enabled = MFALSE; - } - - /* Send request to firmware */ - ret = wlan_prepare_cmd(priv, HOST_CMD_APCMD_SYS_CONFIGURE, - HostCmd_ACT_GEN_SET, 0, (t_void *) pioctl_req, - MNULL); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_ds_misc_cfg *misc = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + if (misc->param.gen_ie.len) { + if (misc->param.gen_ie.len > sizeof(priv->wapi_ie)) { + PRINTM(MWARN, "failed to copy WAPI IE, too big \n"); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + memcpy(priv->adapter, priv->wapi_ie, misc->param.gen_ie.ie_data, + misc->param.gen_ie.len); + priv->wapi_ie_len = misc->param.gen_ie.len; + PRINTM(MIOCTL, "Set wapi_ie_len=%d IE=%#x\n", priv->wapi_ie_len, + priv->wapi_ie[0]); + DBG_HEXDUMP(MCMD_D, "wapi_ie", priv->wapi_ie, + priv->wapi_ie_len); + if (priv->wapi_ie[0] == WAPI_IE) + priv->sec_info.wapi_enabled = MTRUE; + } else { + memset(priv->adapter, priv->wapi_ie, 0, sizeof(priv->wapi_ie)); + priv->wapi_ie_len = misc->param.gen_ie.len; + PRINTM(MINFO, "Reset wapi_ie_len=%d IE=%#x\n", + priv->wapi_ie_len, priv->wapi_ie[0]); + priv->sec_info.wapi_enabled = MFALSE; + } + + /* Send request to firmware */ + ret = wlan_prepare_cmd(priv, HOST_CMD_APCMD_SYS_CONFIGURE, + HostCmd_ACT_GEN_SET, 0, (t_void *) pioctl_req, + MNULL); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } -/** +/** * @brief Set generic IE * * @param pmadapter A pointer to mlan_adapter structure @@ -594,36 +610,37 @@ wlan_uap_set_wapi_ie(mlan_private * priv, pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_uap_misc_ioctl_gen_ie(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_misc_cfg *misc = MNULL; - IEEEtypes_VendorHeader_t *pvendor_ie = MNULL; - - ENTER(); - - misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - - if ((misc->param.gen_ie.type == MLAN_IE_TYPE_GEN_IE) && - (pioctl_req->action == MLAN_ACT_SET)) { - if (misc->param.gen_ie.len) { - pvendor_ie = - (IEEEtypes_VendorHeader_t *) misc->param.gen_ie.ie_data; - if (pvendor_ie->element_id == WAPI_IE) { - /* IE is a WAPI IE so call set_wapi function */ - ret = wlan_uap_set_wapi_ie(pmpriv, pioctl_req); - } - } else { - /* clear WAPI IE */ - ret = wlan_uap_set_wapi_ie(pmpriv, pioctl_req); - } - } - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_misc_cfg *misc = MNULL; + IEEEtypes_VendorHeader_t *pvendor_ie = MNULL; + + ENTER(); + + misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + + if ((misc->param.gen_ie.type == MLAN_IE_TYPE_GEN_IE) && + (pioctl_req->action == MLAN_ACT_SET)) { + if (misc->param.gen_ie.len) { + pvendor_ie = + (IEEEtypes_VendorHeader_t *) misc->param.gen_ie. + ie_data; + if (pvendor_ie->element_id == WAPI_IE) { + /* IE is a WAPI IE so call set_wapi function */ + ret = wlan_uap_set_wapi_ie(pmpriv, pioctl_req); + } + } else { + /* clear WAPI IE */ + ret = wlan_uap_set_wapi_ie(pmpriv, pioctl_req); + } + } + LEAVE(); + return ret; } -/** +/** * @brief Set/Get WAPI status * * @param pmadapter A pointer to mlan_adapter structure @@ -633,34 +650,34 @@ wlan_uap_misc_ioctl_gen_ie(IN pmlan_adapter pmadapter, */ static mlan_status wlan_uap_sec_ioctl_wapi_enable(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_sec_cfg *sec = MNULL; - ENTER(); - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) { - if (pmpriv->wapi_ie_len) - sec->param.wapi_enabled = MTRUE; - else - sec->param.wapi_enabled = MFALSE; - } else { - if (sec->param.wapi_enabled == MFALSE) { - memset(pmpriv->adapter, pmpriv->wapi_ie, 0, - sizeof(pmpriv->wapi_ie)); - pmpriv->wapi_ie_len = 0; - PRINTM(MINFO, "Reset wapi_ie_len=%d IE=%#x\n", pmpriv->wapi_ie_len, - pmpriv->wapi_ie[0]); - pmpriv->sec_info.wapi_enabled = MFALSE; - } - } - pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_sec_cfg *sec = MNULL; + ENTER(); + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) { + if (pmpriv->wapi_ie_len) + sec->param.wapi_enabled = MTRUE; + else + sec->param.wapi_enabled = MFALSE; + } else { + if (sec->param.wapi_enabled == MFALSE) { + memset(pmpriv->adapter, pmpriv->wapi_ie, 0, + sizeof(pmpriv->wapi_ie)); + pmpriv->wapi_ie_len = 0; + PRINTM(MINFO, "Reset wapi_ie_len=%d IE=%#x\n", + pmpriv->wapi_ie_len, pmpriv->wapi_ie[0]); + pmpriv->sec_info.wapi_enabled = MFALSE; + } + } + pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; + LEAVE(); + return ret; } -/** +/** * @brief Set encrypt key * * @param pmadapter A pointer to mlan_adapter structure @@ -670,37 +687,37 @@ wlan_uap_sec_ioctl_wapi_enable(IN pmlan_adapter pmadapter, */ static mlan_status wlan_uap_sec_ioctl_set_encrypt_key(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_sec_cfg *sec = MNULL; - - ENTER(); - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - if (pioctl_req->action != MLAN_ACT_SET) { - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - if (!sec->param.encrypt_key.key_len) { - PRINTM(MCMND, "Skip set key with key_len = 0\n"); - LEAVE(); - return ret; - } - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_KEY_MATERIAL, - HostCmd_ACT_GEN_SET, - KEY_INFO_ENABLED, - (t_void *) pioctl_req, &sec->param.encrypt_key); - - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_sec_cfg *sec = MNULL; + + ENTER(); + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + if (pioctl_req->action != MLAN_ACT_SET) { + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + if (!sec->param.encrypt_key.key_len) { + PRINTM(MCMND, "Skip set key with key_len = 0\n"); + LEAVE(); + return ret; + } + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_KEY_MATERIAL, + HostCmd_ACT_GEN_SET, + KEY_INFO_ENABLED, + (t_void *) pioctl_req, &sec->param.encrypt_key); + + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + LEAVE(); + return ret; } -/** +/** * @brief Get BSS information * * @param pmadapter A pointer to mlan_adapter structure @@ -711,31 +728,31 @@ wlan_uap_sec_ioctl_set_encrypt_key(IN pmlan_adapter pmadapter, static mlan_status wlan_uap_get_bss_info(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_ds_get_info *info; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_ds_get_info *info; - ENTER(); + ENTER(); - info = (mlan_ds_get_info *) pioctl_req->pbuf; - /* Connection status */ - info->param.bss_info.media_connected = pmpriv->media_connected; + info = (mlan_ds_get_info *) pioctl_req->pbuf; + /* Connection status */ + info->param.bss_info.media_connected = pmpriv->media_connected; - /* Radio status */ - info->param.bss_info.radio_on = pmadapter->radio_on; + /* Radio status */ + info->param.bss_info.radio_on = pmadapter->radio_on; - /* BSSID */ - memcpy(pmadapter, &info->param.bss_info.bssid, pmpriv->curr_addr, - MLAN_MAC_ADDR_LENGTH); - info->param.bss_info.is_hs_configured = pmadapter->is_hs_configured; - pioctl_req->data_read_written = - sizeof(mlan_bss_info) + MLAN_SUB_COMMAND_SIZE; + /* BSSID */ + memcpy(pmadapter, &info->param.bss_info.bssid, pmpriv->curr_addr, + MLAN_MAC_ADDR_LENGTH); + info->param.bss_info.is_hs_configured = pmadapter->is_hs_configured; + pioctl_req->data_read_written = + sizeof(mlan_bss_info) + MLAN_SUB_COMMAND_SIZE; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief Set Host Sleep configurations * * @param pmadapter A pointer to mlan_adapter structure @@ -745,65 +762,67 @@ wlan_uap_get_bss_info(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_uap_pm_ioctl_deepsleep(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_pm_cfg *pm = MNULL; - mlan_ds_auto_ds auto_ds; - t_u32 mode; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_pm_cfg)) { - PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_pm_cfg); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - pm = (mlan_ds_pm_cfg *) pioctl_req->pbuf; - - if (pioctl_req->action == MLAN_ACT_GET) { - if (pmadapter->is_deep_sleep) { - pm->param.auto_deep_sleep.auto_ds = DEEP_SLEEP_ON; - pm->param.auto_deep_sleep.idletime = pmadapter->idle_time; - } else - pm->param.auto_deep_sleep.auto_ds = DEEP_SLEEP_OFF; - } else { - if (pmadapter->is_deep_sleep && - pm->param.auto_deep_sleep.auto_ds == DEEP_SLEEP_ON) { - PRINTM(MMSG, "uAP already in deep sleep mode\n"); - LEAVE(); - return MLAN_STATUS_FAILURE; - } - if (((mlan_ds_pm_cfg *) pioctl_req->pbuf)->param.auto_deep_sleep. - auto_ds == DEEP_SLEEP_ON) { - auto_ds.auto_ds = DEEP_SLEEP_ON; - mode = EN_AUTO_PS; - PRINTM(MINFO, "Auto Deep Sleep: on\n"); - } else { - mode = DIS_AUTO_PS; - auto_ds.auto_ds = DEEP_SLEEP_OFF; - PRINTM(MINFO, "Auto Deep Sleep: off\n"); - } - if (((mlan_ds_pm_cfg *) pioctl_req->pbuf)->param.auto_deep_sleep. - idletime) - auto_ds.idletime = - ((mlan_ds_pm_cfg *) pioctl_req->pbuf)->param.auto_deep_sleep. - idletime; - else - auto_ds.idletime = pmadapter->idle_time; - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_PS_MODE_ENH, - (t_u16) mode, - BITMAP_AUTO_DS, (t_void *) pioctl_req, &auto_ds); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - } - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_pm_cfg *pm = MNULL; + mlan_ds_auto_ds auto_ds; + t_u32 mode; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_pm_cfg)) { + PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_pm_cfg); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + pm = (mlan_ds_pm_cfg *) pioctl_req->pbuf; + + if (pioctl_req->action == MLAN_ACT_GET) { + if (pmadapter->is_deep_sleep) { + pm->param.auto_deep_sleep.auto_ds = DEEP_SLEEP_ON; + pm->param.auto_deep_sleep.idletime = + pmadapter->idle_time; + } else + pm->param.auto_deep_sleep.auto_ds = DEEP_SLEEP_OFF; + } else { + if (pmadapter->is_deep_sleep && + pm->param.auto_deep_sleep.auto_ds == DEEP_SLEEP_ON) { + PRINTM(MMSG, "uAP already in deep sleep mode\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + if (((mlan_ds_pm_cfg *) pioctl_req->pbuf)->param. + auto_deep_sleep.auto_ds == DEEP_SLEEP_ON) { + auto_ds.auto_ds = DEEP_SLEEP_ON; + mode = EN_AUTO_PS; + PRINTM(MINFO, "Auto Deep Sleep: on\n"); + } else { + mode = DIS_AUTO_PS; + auto_ds.auto_ds = DEEP_SLEEP_OFF; + PRINTM(MINFO, "Auto Deep Sleep: off\n"); + } + if (((mlan_ds_pm_cfg *) pioctl_req->pbuf)->param. + auto_deep_sleep.idletime) + auto_ds.idletime = + ((mlan_ds_pm_cfg *) pioctl_req->pbuf)->param. + auto_deep_sleep.idletime; + else + auto_ds.idletime = pmadapter->idle_time; + ret = wlan_prepare_cmd(pmpriv, + HostCmd_CMD_802_11_PS_MODE_ENH, + (t_u16) mode, + BITMAP_AUTO_DS, + (t_void *) pioctl_req, &auto_ds); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + } + LEAVE(); + return ret; } /** @@ -817,38 +836,38 @@ wlan_uap_pm_ioctl_deepsleep(IN pmlan_adapter pmadapter, static mlan_status wlan_uap_snmp_mib_11d(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_snmp_mib *snmp = MNULL; - state_11d_t flag; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_snmp_mib)) { - PRINTM(MWARN, "MLAN snmp_mib IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_snmp_mib); - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - - if ((pioctl_req->action == MLAN_ACT_SET) && pmpriv->uap_bss_started) { - PRINTM(MIOCTL, - "11D setting cannot be changed while UAP bss is started.\n"); - pioctl_req->data_read_written = 0; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - snmp = (mlan_ds_snmp_mib *) pioctl_req->pbuf; - flag = (snmp->param.oid_value) ? ENABLE_11D : DISABLE_11D; - - ret = wlan_11d_enable(pmpriv, (t_void *) pioctl_req, flag); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_snmp_mib *snmp = MNULL; + state_11d_t flag; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_snmp_mib)) { + PRINTM(MWARN, "MLAN snmp_mib IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_snmp_mib); + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + + if ((pioctl_req->action == MLAN_ACT_SET) && pmpriv->uap_bss_started) { + PRINTM(MIOCTL, + "11D setting cannot be changed while UAP bss is started.\n"); + pioctl_req->data_read_written = 0; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + snmp = (mlan_ds_snmp_mib *) pioctl_req->pbuf; + flag = (snmp->param.oid_value) ? ENABLE_11D : DISABLE_11D; + + ret = wlan_11d_enable(pmpriv, (t_void *) pioctl_req, flag); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } /** @@ -863,42 +882,44 @@ wlan_uap_snmp_mib_11d(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) static mlan_status wlan_uap_callback_domain_info(IN t_void * priv) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = (mlan_private *) priv; - wlan_uap_get_info_cb_t *puap_state_chan_cb = &pmpriv->uap_state_chan_cb; - mlan_ds_11d_cfg *cfg11d; - t_u8 band; - pmlan_adapter pmadapter = pmpriv->adapter; - pmlan_callbacks pcb = &pmadapter->callbacks; - - ENTER(); - /* clear callback now that we're here */ - puap_state_chan_cb->get_chan_callback = MNULL; - - if (!puap_state_chan_cb->pioctl_req_curr) { - PRINTM(MERROR, "pioctl_req_curr is null\n"); - LEAVE(); - return ret; - } - cfg11d = (mlan_ds_11d_cfg *) puap_state_chan_cb->pioctl_req_curr->pbuf; - band = - (puap_state_chan_cb->band_config & BAND_CONFIG_5GHZ) ? BAND_A : BAND_B; - - ret = - wlan_11d_handle_uap_domain_info(pmpriv, band, cfg11d->param.domain_tlv, - puap_state_chan_cb->pioctl_req_curr); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - else { - puap_state_chan_cb->pioctl_req_curr->status_code = MLAN_STATUS_FAILURE; - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, - puap_state_chan_cb->pioctl_req_curr, - MLAN_STATUS_FAILURE); - } - - puap_state_chan_cb->pioctl_req_curr = MNULL; // prevent re-use - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = (mlan_private *) priv; + wlan_uap_get_info_cb_t *puap_state_chan_cb = &pmpriv->uap_state_chan_cb; + mlan_ds_11d_cfg *cfg11d; + t_u8 band; + pmlan_adapter pmadapter = pmpriv->adapter; + pmlan_callbacks pcb = &pmadapter->callbacks; + + ENTER(); + /* clear callback now that we're here */ + puap_state_chan_cb->get_chan_callback = MNULL; + + if (!puap_state_chan_cb->pioctl_req_curr) { + PRINTM(MERROR, "pioctl_req_curr is null\n"); + LEAVE(); + return ret; + } + cfg11d = (mlan_ds_11d_cfg *) puap_state_chan_cb->pioctl_req_curr->pbuf; + band = (puap_state_chan_cb-> + band_config & BAND_CONFIG_5GHZ) ? BAND_A : BAND_B; + + ret = wlan_11d_handle_uap_domain_info(pmpriv, band, + cfg11d->param.domain_tlv, + puap_state_chan_cb-> + pioctl_req_curr); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + else { + puap_state_chan_cb->pioctl_req_curr->status_code = + MLAN_STATUS_FAILURE; + pcb->moal_ioctl_complete(pmadapter->pmoal_handle, + puap_state_chan_cb->pioctl_req_curr, + MLAN_STATUS_FAILURE); + } + + puap_state_chan_cb->pioctl_req_curr = MNULL; // prevent re-use + LEAVE(); + return ret; } /** @@ -913,38 +934,39 @@ wlan_uap_callback_domain_info(IN t_void * priv) static mlan_status wlan_uap_domain_info(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_11d_cfg)) { - PRINTM(MWARN, "MLAN 11d_cfg IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_11d_cfg); - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - - if ((pioctl_req->action == MLAN_ACT_SET) && pmpriv->uap_bss_started) { - PRINTM(MIOCTL, - "Domain_info cannot be changed while UAP bss is started.\n"); - pioctl_req->data_read_written = 0; - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - /* store params, issue command to get UAP channel, whose CMD_RESP will - callback remainder of domain_info handling */ - pmpriv->uap_state_chan_cb.pioctl_req_curr = pioctl_req; - pmpriv->uap_state_chan_cb.get_chan_callback = wlan_uap_callback_domain_info; - - ret = wlan_uap_get_channel(pmpriv); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_11d_cfg)) { + PRINTM(MWARN, "MLAN 11d_cfg IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_11d_cfg); + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + + if ((pioctl_req->action == MLAN_ACT_SET) && pmpriv->uap_bss_started) { + PRINTM(MIOCTL, + "Domain_info cannot be changed while UAP bss is started.\n"); + pioctl_req->data_read_written = 0; + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + /* store params, issue command to get UAP channel, whose CMD_RESP will + callback remainder of domain_info handling */ + pmpriv->uap_state_chan_cb.pioctl_req_curr = pioctl_req; + pmpriv->uap_state_chan_cb.get_chan_callback = + wlan_uap_callback_domain_info; + + ret = wlan_uap_get_channel(pmpriv); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } /** @@ -959,49 +981,51 @@ wlan_uap_domain_info(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) static mlan_status wlan_uap_callback_11h_channel_check_req(IN t_void * priv) { - mlan_status ret = MLAN_STATUS_FAILURE; - mlan_private *pmpriv = (mlan_private *) priv; - mlan_callbacks *pcb = (mlan_callbacks *) & pmpriv->adapter->callbacks; - wlan_uap_get_info_cb_t *puap_state_chan_cb = &pmpriv->uap_state_chan_cb; - /* keep copy as local variable */ - pmlan_ioctl_req pioctl = puap_state_chan_cb->pioctl_req_curr; - - ENTER(); - /* clear callback now that we're here */ - puap_state_chan_cb->get_chan_callback = MNULL; - /* clear early to avoid race condition */ - puap_state_chan_cb->pioctl_req_curr = MNULL; - - /* - * Check if the region and channel requires a channel availability - * check. - */ - if ((puap_state_chan_cb->band_config & BAND_CONFIG_5GHZ) && - wlan_11h_radar_detect_required(pmpriv, puap_state_chan_cb->channel) && - !wlan_11h_is_channel_under_nop(pmpriv->adapter, - puap_state_chan_cb->channel)) { - - /* - * Radar detection is required for this channel, make sure - * 11h is activated in the firmware - */ - ret = wlan_11h_activate(pmpriv, MNULL, MTRUE); - ret = wlan_11h_config_master_radar_det(pmpriv, MTRUE); - ret = wlan_11h_check_update_radar_det_state(pmpriv); - - /* Check for radar on the channel */ - ret = wlan_11h_issue_radar_detect(pmpriv, - pioctl, puap_state_chan_cb->channel); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - } else { - /* No command sent with the ioctl, need manually signal completion */ - pcb->moal_ioctl_complete(pmpriv->adapter->pmoal_handle, - pioctl, MLAN_STATUS_FAILURE); - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_FAILURE; + mlan_private *pmpriv = (mlan_private *) priv; + mlan_callbacks *pcb = (mlan_callbacks *) & pmpriv->adapter->callbacks; + wlan_uap_get_info_cb_t *puap_state_chan_cb = &pmpriv->uap_state_chan_cb; + /* keep copy as local variable */ + pmlan_ioctl_req pioctl = puap_state_chan_cb->pioctl_req_curr; + + ENTER(); + /* clear callback now that we're here */ + puap_state_chan_cb->get_chan_callback = MNULL; + /* clear early to avoid race condition */ + puap_state_chan_cb->pioctl_req_curr = MNULL; + + /* + * Check if the region and channel requires a channel availability + * check. + */ + if ((puap_state_chan_cb->band_config & BAND_CONFIG_5GHZ) && + wlan_11h_radar_detect_required(pmpriv, puap_state_chan_cb->channel) + && !wlan_11h_is_channel_under_nop(pmpriv->adapter, + puap_state_chan_cb->channel)) { + + /* + * Radar detection is required for this channel, make sure + * 11h is activated in the firmware + */ + ret = wlan_11h_activate(pmpriv, MNULL, MTRUE); + ret = wlan_11h_config_master_radar_det(pmpriv, MTRUE); + ret = wlan_11h_check_update_radar_det_state(pmpriv); + + /* Check for radar on the channel */ + ret = wlan_11h_issue_radar_detect(pmpriv, + pioctl, + puap_state_chan_cb->channel); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + } else { + /* No command sent with the ioctl, need manually signal + completion */ + pcb->moal_ioctl_complete(pmpriv->adapter->pmoal_handle, + pioctl, MLAN_STATUS_FAILURE); + } + + LEAVE(); + return ret; } /** @@ -1015,33 +1039,33 @@ wlan_uap_callback_11h_channel_check_req(IN t_void * priv) */ static mlan_status wlan_uap_11h_channel_check_req(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_11h_cfg)) { - PRINTM(MWARN, "MLAN 11h_cfg IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_11h_cfg); - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - - /* store params, issue command to get UAP channel, whose CMD_RESP will - callback remainder of 11H channel check handling */ - pmpriv->uap_state_chan_cb.pioctl_req_curr = pioctl_req; - pmpriv->uap_state_chan_cb.get_chan_callback = - wlan_uap_callback_11h_channel_check_req; - - ret = wlan_uap_get_channel(pmpriv); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_11h_cfg)) { + PRINTM(MWARN, "MLAN 11h_cfg IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_11h_cfg); + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + + /* store params, issue command to get UAP channel, whose CMD_RESP will + callback remainder of 11H channel check handling */ + pmpriv->uap_state_chan_cb.pioctl_req_curr = pioctl_req; + pmpriv->uap_state_chan_cb.get_chan_callback = + wlan_uap_callback_11h_channel_check_req; + + ret = wlan_uap_get_channel(pmpriv); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } /** @@ -1056,39 +1080,39 @@ wlan_uap_11h_channel_check_req(IN pmlan_adapter pmadapter, static mlan_status wlan_uap_callback_snmp_mib_11h(IN t_void * priv) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = (mlan_private *) priv; - wlan_uap_get_info_cb_t *puap_state_chan_cb = &pmpriv->uap_state_chan_cb; - mlan_ds_snmp_mib *snmp; - t_bool enable_11h; - - ENTER(); - /* clear callback now that we're here */ - puap_state_chan_cb->get_chan_callback = MNULL; - - snmp = (mlan_ds_snmp_mib *) puap_state_chan_cb->pioctl_req_curr->pbuf; - enable_11h = (snmp->param.oid_value) ? MTRUE : MFALSE; - - if (enable_11h) { - if ((puap_state_chan_cb->band_config & BAND_CONFIG_5GHZ) && - wlan_11h_radar_detect_required(pmpriv, - puap_state_chan_cb->channel)) { - if (!wlan_11h_is_master_radar_det_active(pmpriv)) - wlan_11h_config_master_radar_det(pmpriv, MTRUE); - } - } - - ret = - wlan_11h_activate(pmpriv, - (t_void *) puap_state_chan_cb->pioctl_req_curr, - enable_11h); - wlan_11h_check_update_radar_det_state(pmpriv); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - puap_state_chan_cb->pioctl_req_curr = MNULL; // prevent re-use - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = (mlan_private *) priv; + wlan_uap_get_info_cb_t *puap_state_chan_cb = &pmpriv->uap_state_chan_cb; + mlan_ds_snmp_mib *snmp; + t_bool enable_11h; + + ENTER(); + /* clear callback now that we're here */ + puap_state_chan_cb->get_chan_callback = MNULL; + + snmp = (mlan_ds_snmp_mib *) puap_state_chan_cb->pioctl_req_curr->pbuf; + enable_11h = (snmp->param.oid_value) ? MTRUE : MFALSE; + + if (enable_11h) { + if ((puap_state_chan_cb->band_config & BAND_CONFIG_5GHZ) && + wlan_11h_radar_detect_required(pmpriv, + puap_state_chan_cb-> + channel)) { + if (!wlan_11h_is_master_radar_det_active(pmpriv)) + wlan_11h_config_master_radar_det(pmpriv, MTRUE); + } + } + + ret = wlan_11h_activate(pmpriv, + (t_void *) puap_state_chan_cb->pioctl_req_curr, + enable_11h); + wlan_11h_check_update_radar_det_state(pmpriv); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + puap_state_chan_cb->pioctl_req_curr = MNULL; // prevent re-use + LEAVE(); + return ret; } /** @@ -1103,48 +1127,48 @@ wlan_uap_callback_snmp_mib_11h(IN t_void * priv) static mlan_status wlan_uap_snmp_mib_11h(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_snmp_mib *snmp = MNULL; - t_bool enable; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_snmp_mib)) { - PRINTM(MWARN, "MLAN snmp_mib IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_snmp_mib); - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - snmp = (mlan_ds_snmp_mib *) pioctl_req->pbuf; - enable = (snmp->param.oid_value) ? MTRUE : MFALSE; - - if (enable) { - /* first enable 11D if it is not enabled */ - if (!wlan_11d_is_enabled(pmpriv)) { - ret = wlan_11d_enable(pmpriv, MNULL, ENABLE_11D); - if (ret != MLAN_STATUS_SUCCESS) { - PRINTM(MERROR, - "Failed to first enable 11D before enabling 11H.\n"); - LEAVE(); - return ret; - } - } - } - - /* store params, issue command to get UAP channel, whose CMD_RESP will - callback remainder of 11H handling (and radar detect if DFS chan) */ - pmpriv->uap_state_chan_cb.pioctl_req_curr = pioctl_req; - pmpriv->uap_state_chan_cb.get_chan_callback = - wlan_uap_callback_snmp_mib_11h; - - ret = wlan_uap_get_channel(pmpriv); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_snmp_mib *snmp = MNULL; + t_bool enable; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_snmp_mib)) { + PRINTM(MWARN, "MLAN snmp_mib IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_snmp_mib); + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + snmp = (mlan_ds_snmp_mib *) pioctl_req->pbuf; + enable = (snmp->param.oid_value) ? MTRUE : MFALSE; + + if (enable) { + /* first enable 11D if it is not enabled */ + if (!wlan_11d_is_enabled(pmpriv)) { + ret = wlan_11d_enable(pmpriv, MNULL, ENABLE_11D); + if (ret != MLAN_STATUS_SUCCESS) { + PRINTM(MERROR, + "Failed to first enable 11D before enabling 11H.\n"); + LEAVE(); + return ret; + } + } + } + + /* store params, issue command to get UAP channel, whose CMD_RESP will + callback remainder of 11H handling (and radar detect if DFS chan) */ + pmpriv->uap_state_chan_cb.pioctl_req_curr = pioctl_req; + pmpriv->uap_state_chan_cb.get_chan_callback = + wlan_uap_callback_snmp_mib_11h; + + ret = wlan_uap_get_channel(pmpriv); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; } /******************************************************** @@ -1161,19 +1185,19 @@ wlan_uap_snmp_mib_11h(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) mlan_status wlan_uap_get_channel(IN pmlan_private pmpriv) { - MrvlIEtypes_channel_band_t tlv_chan_band; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - memset(pmpriv->adapter, &tlv_chan_band, 0, sizeof(tlv_chan_band)); - tlv_chan_band.header.type = TLV_TYPE_UAP_CHAN_BAND_CONFIG; - tlv_chan_band.header.len = sizeof(MrvlIEtypes_channel_band_t) - - sizeof(MrvlIEtypesHeader_t); - - ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_SYS_CONFIGURE, - HostCmd_ACT_GEN_GET, 0, MNULL, &tlv_chan_band); - LEAVE(); - return ret; + MrvlIEtypes_channel_band_t tlv_chan_band; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + memset(pmpriv->adapter, &tlv_chan_band, 0, sizeof(tlv_chan_band)); + tlv_chan_band.header.type = TLV_TYPE_UAP_CHAN_BAND_CONFIG; + tlv_chan_band.header.len = sizeof(MrvlIEtypes_channel_band_t) + - sizeof(MrvlIEtypesHeader_t); + + ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_SYS_CONFIGURE, + HostCmd_ACT_GEN_GET, 0, MNULL, &tlv_chan_band); + LEAVE(); + return ret; } /** @@ -1187,23 +1211,23 @@ wlan_uap_get_channel(IN pmlan_private pmpriv) */ mlan_status wlan_uap_set_channel(IN pmlan_private pmpriv, - IN t_u8 uap_band_cfg, IN t_u8 channel) + IN t_u8 uap_band_cfg, IN t_u8 channel) { - MrvlIEtypes_channel_band_t tlv_chan_band; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - memset(pmpriv->adapter, &tlv_chan_band, 0, sizeof(tlv_chan_band)); - tlv_chan_band.header.type = TLV_TYPE_UAP_CHAN_BAND_CONFIG; - tlv_chan_band.header.len = sizeof(MrvlIEtypes_channel_band_t) - - sizeof(MrvlIEtypesHeader_t); - tlv_chan_band.band_config = uap_band_cfg; - tlv_chan_band.channel = channel; - - ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_SYS_CONFIGURE, - HostCmd_ACT_GEN_SET, 0, MNULL, &tlv_chan_band); - LEAVE(); - return ret; + MrvlIEtypes_channel_band_t tlv_chan_band; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + memset(pmpriv->adapter, &tlv_chan_band, 0, sizeof(tlv_chan_band)); + tlv_chan_band.header.type = TLV_TYPE_UAP_CHAN_BAND_CONFIG; + tlv_chan_band.header.len = sizeof(MrvlIEtypes_channel_band_t) + - sizeof(MrvlIEtypesHeader_t); + tlv_chan_band.band_config = uap_band_cfg; + tlv_chan_band.channel = channel; + + ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_SYS_CONFIGURE, + HostCmd_ACT_GEN_SET, 0, MNULL, &tlv_chan_band); + LEAVE(); + return ret; } /** @@ -1216,35 +1240,35 @@ wlan_uap_set_channel(IN pmlan_private pmpriv, mlan_status wlan_uap_get_beacon_dtim(IN pmlan_private pmpriv) { - t_u8 tlv_buffer[sizeof(MrvlIEtypes_beacon_period_t) + - sizeof(MrvlIEtypes_dtim_period_t)]; - MrvlIEtypes_beacon_period_t *ptlv_beacon_pd; - MrvlIEtypes_dtim_period_t *ptlv_dtim_pd; - mlan_status ret = MLAN_STATUS_SUCCESS; - - ENTER(); - - memset(pmpriv->adapter, &tlv_buffer, 0, sizeof(tlv_buffer)); - ptlv_beacon_pd = (MrvlIEtypes_beacon_period_t *) tlv_buffer; - ptlv_beacon_pd->header.type = TLV_TYPE_UAP_BEACON_PERIOD; - ptlv_beacon_pd->header.len = sizeof(MrvlIEtypes_beacon_period_t) - - sizeof(MrvlIEtypesHeader_t); - - ptlv_dtim_pd = (MrvlIEtypes_dtim_period_t *) (tlv_buffer - + - sizeof - (MrvlIEtypes_beacon_period_t)); - ptlv_dtim_pd->header.type = TLV_TYPE_UAP_DTIM_PERIOD; - ptlv_dtim_pd->header.len = sizeof(MrvlIEtypes_dtim_period_t) - - sizeof(MrvlIEtypesHeader_t); - - ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_SYS_CONFIGURE, - HostCmd_ACT_GEN_GET, 0, MNULL, tlv_buffer); - LEAVE(); - return ret; + t_u8 tlv_buffer[sizeof(MrvlIEtypes_beacon_period_t) + + sizeof(MrvlIEtypes_dtim_period_t)]; + MrvlIEtypes_beacon_period_t *ptlv_beacon_pd; + MrvlIEtypes_dtim_period_t *ptlv_dtim_pd; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + + memset(pmpriv->adapter, &tlv_buffer, 0, sizeof(tlv_buffer)); + ptlv_beacon_pd = (MrvlIEtypes_beacon_period_t *) tlv_buffer; + ptlv_beacon_pd->header.type = TLV_TYPE_UAP_BEACON_PERIOD; + ptlv_beacon_pd->header.len = sizeof(MrvlIEtypes_beacon_period_t) + - sizeof(MrvlIEtypesHeader_t); + + ptlv_dtim_pd = (MrvlIEtypes_dtim_period_t *) (tlv_buffer + + + sizeof + (MrvlIEtypes_beacon_period_t)); + ptlv_dtim_pd->header.type = TLV_TYPE_UAP_DTIM_PERIOD; + ptlv_dtim_pd->header.len = sizeof(MrvlIEtypes_dtim_period_t) + - sizeof(MrvlIEtypesHeader_t); + + ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_SYS_CONFIGURE, + HostCmd_ACT_GEN_GET, 0, MNULL, tlv_buffer); + LEAVE(); + return ret; } -/** +/** * @brief MLAN uap ioctl handler * * @param adapter A pointer to mlan_adapter structure @@ -1255,183 +1279,214 @@ wlan_uap_get_beacon_dtim(IN pmlan_private pmpriv) mlan_status wlan_ops_uap_ioctl(t_void * adapter, pmlan_ioctl_req pioctl_req) { - pmlan_adapter pmadapter = (pmlan_adapter) adapter; - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_bss *bss = MNULL; - mlan_ds_get_info *pget_info = MNULL; - mlan_ds_misc_cfg *misc = MNULL; - mlan_ds_sec_cfg *sec = MNULL; - mlan_ds_pm_cfg *pm = MNULL; - mlan_ds_11d_cfg *cfg11d = MNULL; - mlan_ds_snmp_mib *snmp = MNULL; - mlan_ds_11h_cfg *cfg11h = MNULL; - mlan_ds_radio_cfg *radiocfg = MNULL; - mlan_ds_rate *rate = MNULL; - mlan_ds_reg_mem *reg_mem = MNULL; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - - ENTER(); - - switch (pioctl_req->req_id) { - case MLAN_IOCTL_BSS: - bss = (mlan_ds_bss *) pioctl_req->pbuf; - if (bss->sub_command == MLAN_OID_BSS_MAC_ADDR) - status = wlan_uap_bss_ioctl_mac_address(pmadapter, pioctl_req); - else if (bss->sub_command == MLAN_OID_BSS_STOP) - status = wlan_uap_bss_ioctl_stop(pmadapter, pioctl_req); - else if (bss->sub_command == MLAN_OID_BSS_START) - status = wlan_uap_bss_ioctl_start(pmadapter, pioctl_req); - else if (bss->sub_command == MLAN_OID_UAP_BSS_CONFIG) - status = wlan_uap_bss_ioctl_config(pmadapter, pioctl_req); - else if (bss->sub_command == MLAN_OID_UAP_DEAUTH_STA) - status = wlan_uap_bss_ioctl_deauth_sta(pmadapter, pioctl_req); - else if (bss->sub_command == MLAN_OID_UAP_BSS_RESET) - status = wlan_uap_bss_ioctl_reset(pmadapter, pioctl_req); + pmlan_adapter pmadapter = (pmlan_adapter) adapter; + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_bss *bss = MNULL; + mlan_ds_get_info *pget_info = MNULL; + mlan_ds_misc_cfg *misc = MNULL; + mlan_ds_sec_cfg *sec = MNULL; + mlan_ds_pm_cfg *pm = MNULL; + mlan_ds_11d_cfg *cfg11d = MNULL; + mlan_ds_snmp_mib *snmp = MNULL; + mlan_ds_11h_cfg *cfg11h = MNULL; + mlan_ds_radio_cfg *radiocfg = MNULL; + mlan_ds_rate *rate = MNULL; + mlan_ds_reg_mem *reg_mem = MNULL; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + + ENTER(); + + switch (pioctl_req->req_id) { + case MLAN_IOCTL_BSS: + bss = (mlan_ds_bss *) pioctl_req->pbuf; + if (bss->sub_command == MLAN_OID_BSS_MAC_ADDR) + status = wlan_uap_bss_ioctl_mac_address(pmadapter, + pioctl_req); + else if (bss->sub_command == MLAN_OID_BSS_STOP) + status = wlan_uap_bss_ioctl_stop(pmadapter, pioctl_req); + else if (bss->sub_command == MLAN_OID_BSS_START) + status = wlan_uap_bss_ioctl_start(pmadapter, + pioctl_req); + else if (bss->sub_command == MLAN_OID_UAP_BSS_CONFIG) + status = wlan_uap_bss_ioctl_config(pmadapter, + pioctl_req); + else if (bss->sub_command == MLAN_OID_UAP_DEAUTH_STA) + status = wlan_uap_bss_ioctl_deauth_sta(pmadapter, + pioctl_req); + else if (bss->sub_command == MLAN_OID_UAP_BSS_RESET) + status = wlan_uap_bss_ioctl_reset(pmadapter, + pioctl_req); #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) - else if (bss->sub_command == MLAN_OID_BSS_ROLE) - status = wlan_bss_ioctl_bss_role(pmadapter, pioctl_req); + else if (bss->sub_command == MLAN_OID_BSS_ROLE) + status = wlan_bss_ioctl_bss_role(pmadapter, pioctl_req); #endif #ifdef WIFI_DIRECT_SUPPORT - else if (bss->sub_command == MLAN_OID_WIFI_DIRECT_MODE) - status = wlan_bss_ioctl_wifi_direct_mode(pmadapter, pioctl_req); + else if (bss->sub_command == MLAN_OID_WIFI_DIRECT_MODE) + status = wlan_bss_ioctl_wifi_direct_mode(pmadapter, + pioctl_req); #endif - else if (bss->sub_command == MLAN_OID_BSS_REMOVE) - status = wlan_bss_ioctl_bss_remove(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_GET_INFO: - pget_info = (mlan_ds_get_info *) pioctl_req->pbuf; - if (pget_info->sub_command == MLAN_OID_GET_VER_EXT) - status = wlan_get_info_ver_ext(pmadapter, pioctl_req); - else if (pget_info->sub_command == MLAN_OID_GET_DEBUG_INFO) - status = wlan_get_info_debug_info(pmadapter, pioctl_req); - else if (pget_info->sub_command == MLAN_OID_GET_STATS) - status = wlan_uap_get_stats(pmadapter, pioctl_req); - else if (pget_info->sub_command == MLAN_OID_UAP_STA_LIST) - status = wlan_uap_get_sta_list(pmadapter, pioctl_req); - else if (pget_info->sub_command == MLAN_OID_GET_BSS_INFO) - status = wlan_uap_get_bss_info(pmadapter, pioctl_req); - else if (pget_info->sub_command == MLAN_OID_GET_FW_INFO) { - pioctl_req->data_read_written = - sizeof(mlan_fw_info) + MLAN_SUB_COMMAND_SIZE; - memcpy(pmadapter, &pget_info->param.fw_info.mac_addr, - pmpriv->curr_addr, MLAN_MAC_ADDR_LENGTH); - pget_info->param.fw_info.fw_ver = pmadapter->fw_release_number; - pget_info->param.fw_info.fw_bands = pmadapter->fw_bands; - pget_info->param.fw_info.hw_dev_mcs_support = - pmadapter->hw_dev_mcs_support; - pget_info->param.fw_info.region_code = pmadapter->region_code; - } - break; - case MLAN_IOCTL_MISC_CFG: - misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; - if (misc->sub_command == MLAN_OID_MISC_INIT_SHUTDOWN) - status = wlan_misc_ioctl_init_shutdown(pmadapter, pioctl_req); - if (misc->sub_command == MLAN_OID_MISC_SOFT_RESET) - status = wlan_uap_misc_ioctl_soft_reset(pmadapter, pioctl_req); - if (misc->sub_command == MLAN_OID_MISC_HOST_CMD) - status = wlan_misc_ioctl_host_cmd(pmadapter, pioctl_req); - if (misc->sub_command == MLAN_OID_MISC_GEN_IE) - status = wlan_uap_misc_ioctl_gen_ie(pmadapter, pioctl_req); - if (misc->sub_command == MLAN_OID_MISC_CUSTOM_IE) - status = - wlan_misc_ioctl_custom_ie_list(pmadapter, pioctl_req, MTRUE); - if (misc->sub_command == MLAN_OID_MISC_TX_DATAPAUSE) - status = wlan_uap_misc_ioctl_txdatapause(pmadapter, pioctl_req); - if (misc->sub_command == MLAN_OID_MISC_RX_MGMT_IND) - status = wlan_reg_rx_mgmt_ind(pmadapter, pioctl_req); + else if (bss->sub_command == MLAN_OID_BSS_REMOVE) + status = wlan_bss_ioctl_bss_remove(pmadapter, + pioctl_req); + break; + case MLAN_IOCTL_GET_INFO: + pget_info = (mlan_ds_get_info *) pioctl_req->pbuf; + if (pget_info->sub_command == MLAN_OID_GET_VER_EXT) + status = wlan_get_info_ver_ext(pmadapter, pioctl_req); + else if (pget_info->sub_command == MLAN_OID_GET_DEBUG_INFO) + status = wlan_get_info_debug_info(pmadapter, + pioctl_req); + else if (pget_info->sub_command == MLAN_OID_GET_STATS) + status = wlan_uap_get_stats(pmadapter, pioctl_req); + else if (pget_info->sub_command == MLAN_OID_UAP_STA_LIST) + status = wlan_uap_get_sta_list(pmadapter, pioctl_req); + else if (pget_info->sub_command == MLAN_OID_GET_BSS_INFO) + status = wlan_uap_get_bss_info(pmadapter, pioctl_req); + else if (pget_info->sub_command == MLAN_OID_GET_FW_INFO) { + pioctl_req->data_read_written = + sizeof(mlan_fw_info) + MLAN_SUB_COMMAND_SIZE; + memcpy(pmadapter, &pget_info->param.fw_info.mac_addr, + pmpriv->curr_addr, MLAN_MAC_ADDR_LENGTH); + pget_info->param.fw_info.fw_ver = + pmadapter->fw_release_number; + pget_info->param.fw_info.fw_bands = pmadapter->fw_bands; + pget_info->param.fw_info.hw_dev_mcs_support = + pmadapter->hw_dev_mcs_support; + pget_info->param.fw_info.region_code = + pmadapter->region_code; + } + break; + case MLAN_IOCTL_MISC_CFG: + misc = (mlan_ds_misc_cfg *) pioctl_req->pbuf; + if (misc->sub_command == MLAN_OID_MISC_INIT_SHUTDOWN) + status = wlan_misc_ioctl_init_shutdown(pmadapter, + pioctl_req); + if (misc->sub_command == MLAN_OID_MISC_SOFT_RESET) + status = wlan_uap_misc_ioctl_soft_reset(pmadapter, + pioctl_req); + if (misc->sub_command == MLAN_OID_MISC_HOST_CMD) + status = wlan_misc_ioctl_host_cmd(pmadapter, + pioctl_req); + if (misc->sub_command == MLAN_OID_MISC_GEN_IE) + status = wlan_uap_misc_ioctl_gen_ie(pmadapter, + pioctl_req); + if (misc->sub_command == MLAN_OID_MISC_CUSTOM_IE) + status = wlan_misc_ioctl_custom_ie_list(pmadapter, + pioctl_req, + MTRUE); + if (misc->sub_command == MLAN_OID_MISC_TX_DATAPAUSE) + status = wlan_uap_misc_ioctl_txdatapause(pmadapter, + pioctl_req); + if (misc->sub_command == MLAN_OID_MISC_RX_MGMT_IND) + status = wlan_reg_rx_mgmt_ind(pmadapter, pioctl_req); #ifdef DEBUG_LEVEL1 - if (misc->sub_command == MLAN_OID_MISC_DRVDBG) - status = wlan_set_drvdbg(pmadapter, pioctl_req); + if (misc->sub_command == MLAN_OID_MISC_DRVDBG) + status = wlan_set_drvdbg(pmadapter, pioctl_req); #endif - if (misc->sub_command == MLAN_OID_MISC_TXCONTROL) - status = wlan_misc_ioctl_txcontrol(pmadapter, pioctl_req); - if (misc->sub_command == MLAN_OID_MISC_MAC_CONTROL) - status = wlan_misc_ioctl_mac_control(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_PM_CFG: - pm = (mlan_ds_pm_cfg *) pioctl_req->pbuf; - if (pm->sub_command == MLAN_OID_PM_CFG_PS_MODE) - status = wlan_uap_pm_ioctl_mode(pmadapter, pioctl_req); - if (pm->sub_command == MLAN_OID_PM_CFG_DEEP_SLEEP) - status = wlan_uap_pm_ioctl_deepsleep(pmadapter, pioctl_req); - if (pm->sub_command == MLAN_OID_PM_CFG_HS_CFG) { - status = wlan_pm_ioctl_hscfg(pmadapter, pioctl_req); - } - if (pm->sub_command == MLAN_OID_PM_HS_WAKEUP_REASON) { - status = wlan_get_hs_wakeup_reason(pmadapter, pioctl_req); - } - if (pm->sub_command == MLAN_OID_PM_INFO) { - status = wlan_get_pm_info(pmadapter, pioctl_req); - } - break; - case MLAN_IOCTL_SNMP_MIB: - snmp = (mlan_ds_snmp_mib *) pioctl_req->pbuf; - if (snmp->sub_command == MLAN_OID_SNMP_MIB_DOT11D) - status = wlan_uap_snmp_mib_11d(pmadapter, pioctl_req); - if (snmp->sub_command == MLAN_OID_SNMP_MIB_DOT11H) - status = wlan_uap_snmp_mib_11h(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_SEC_CFG: - sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; - if (sec->sub_command == MLAN_OID_SEC_CFG_ENCRYPT_KEY) - status = wlan_uap_sec_ioctl_set_encrypt_key(pmadapter, pioctl_req); - if (sec->sub_command == MLAN_OID_SEC_CFG_WAPI_ENABLED) - status = wlan_uap_sec_ioctl_wapi_enable(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_11N_CFG: - status = wlan_11n_cfg_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_11D_CFG: - cfg11d = (mlan_ds_11d_cfg *) pioctl_req->pbuf; - if (cfg11d->sub_command == MLAN_OID_11D_DOMAIN_INFO) - status = wlan_uap_domain_info(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_11H_CFG: - cfg11h = (mlan_ds_11h_cfg *) pioctl_req->pbuf; - if (cfg11h->sub_command == MLAN_OID_11H_CHANNEL_CHECK) - status = wlan_uap_11h_channel_check_req(pmadapter, pioctl_req); + if (misc->sub_command == MLAN_OID_MISC_TXCONTROL) + status = wlan_misc_ioctl_txcontrol(pmadapter, + pioctl_req); + if (misc->sub_command == MLAN_OID_MISC_MAC_CONTROL) + status = wlan_misc_ioctl_mac_control(pmadapter, + pioctl_req); + break; + case MLAN_IOCTL_PM_CFG: + pm = (mlan_ds_pm_cfg *) pioctl_req->pbuf; + if (pm->sub_command == MLAN_OID_PM_CFG_PS_MODE) + status = wlan_uap_pm_ioctl_mode(pmadapter, pioctl_req); + if (pm->sub_command == MLAN_OID_PM_CFG_DEEP_SLEEP) + status = wlan_uap_pm_ioctl_deepsleep(pmadapter, + pioctl_req); + if (pm->sub_command == MLAN_OID_PM_CFG_HS_CFG) { + status = wlan_pm_ioctl_hscfg(pmadapter, pioctl_req); + } + if (pm->sub_command == MLAN_OID_PM_HS_WAKEUP_REASON) { + status = wlan_get_hs_wakeup_reason(pmadapter, + pioctl_req); + } + if (pm->sub_command == MLAN_OID_PM_INFO) { + status = wlan_get_pm_info(pmadapter, pioctl_req); + } + break; + case MLAN_IOCTL_SNMP_MIB: + snmp = (mlan_ds_snmp_mib *) pioctl_req->pbuf; + if (snmp->sub_command == MLAN_OID_SNMP_MIB_DOT11D) + status = wlan_uap_snmp_mib_11d(pmadapter, pioctl_req); + if (snmp->sub_command == MLAN_OID_SNMP_MIB_DOT11H) + status = wlan_uap_snmp_mib_11h(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_SEC_CFG: + sec = (mlan_ds_sec_cfg *) pioctl_req->pbuf; + if (sec->sub_command == MLAN_OID_SEC_CFG_ENCRYPT_KEY) + status = wlan_uap_sec_ioctl_set_encrypt_key(pmadapter, + pioctl_req); + if (sec->sub_command == MLAN_OID_SEC_CFG_WAPI_ENABLED) + status = wlan_uap_sec_ioctl_wapi_enable(pmadapter, + pioctl_req); + break; + case MLAN_IOCTL_11N_CFG: + status = wlan_11n_cfg_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_11D_CFG: + cfg11d = (mlan_ds_11d_cfg *) pioctl_req->pbuf; + if (cfg11d->sub_command == MLAN_OID_11D_DOMAIN_INFO) + status = wlan_uap_domain_info(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_11H_CFG: + cfg11h = (mlan_ds_11h_cfg *) pioctl_req->pbuf; + if (cfg11h->sub_command == MLAN_OID_11H_CHANNEL_CHECK) + status = wlan_uap_11h_channel_check_req(pmadapter, + pioctl_req); #if defined(DFS_TESTING_SUPPORT) - if (cfg11h->sub_command == MLAN_OID_11H_DFS_TESTING) - status = wlan_11h_ioctl_dfs_testing(pmadapter, pioctl_req); + if (cfg11h->sub_command == MLAN_OID_11H_DFS_TESTING) + status = wlan_11h_ioctl_dfs_testing(pmadapter, + pioctl_req); #endif - break; - case MLAN_IOCTL_RADIO_CFG: - radiocfg = (mlan_ds_radio_cfg *) pioctl_req->pbuf; - if (radiocfg->sub_command == MLAN_OID_RADIO_CTRL) - status = wlan_radio_ioctl_radio_ctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_RADIO_CFG: + radiocfg = (mlan_ds_radio_cfg *) pioctl_req->pbuf; + if (radiocfg->sub_command == MLAN_OID_RADIO_CTRL) + status = wlan_radio_ioctl_radio_ctl(pmadapter, + pioctl_req); #ifdef WIFI_DIRECT_SUPPORT - if (radiocfg->sub_command == MLAN_OID_REMAIN_CHAN_CFG) - status = wlan_radio_ioctl_remain_chan_cfg(pmadapter, pioctl_req); + if (radiocfg->sub_command == MLAN_OID_REMAIN_CHAN_CFG) + status = wlan_radio_ioctl_remain_chan_cfg(pmadapter, + pioctl_req); #endif - if (radiocfg->sub_command == MLAN_OID_ANT_CFG) - status = wlan_radio_ioctl_ant_cfg(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_RATE: - rate = (mlan_ds_rate *) pioctl_req->pbuf; - if (rate->sub_command == MLAN_OID_RATE_CFG) - status = wlan_rate_ioctl_cfg(pmadapter, pioctl_req); - else if (rate->sub_command == MLAN_OID_GET_DATA_RATE) - status = wlan_rate_ioctl_get_data_rate(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_11AC_CFG: - status = wlan_11ac_cfg_ioctl(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_REG_MEM: - reg_mem = (mlan_ds_reg_mem *) pioctl_req->pbuf; - if (reg_mem->sub_command == MLAN_OID_REG_RW) - status = wlan_reg_mem_ioctl_reg_rw(pmadapter, pioctl_req); - else if (reg_mem->sub_command == MLAN_OID_EEPROM_RD) - status = wlan_reg_mem_ioctl_read_eeprom(pmadapter, pioctl_req); - else if (reg_mem->sub_command == MLAN_OID_MEM_RW) - status = wlan_reg_mem_ioctl_mem_rw(pmadapter, pioctl_req); - break; - case MLAN_IOCTL_WMM_CFG: - status = wlan_wmm_cfg_ioctl(pmadapter, pioctl_req); - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - break; - } - LEAVE(); - return status; + if (radiocfg->sub_command == MLAN_OID_ANT_CFG) + status = wlan_radio_ioctl_ant_cfg(pmadapter, + pioctl_req); + break; + case MLAN_IOCTL_RATE: + rate = (mlan_ds_rate *) pioctl_req->pbuf; + if (rate->sub_command == MLAN_OID_RATE_CFG) + status = wlan_rate_ioctl_cfg(pmadapter, pioctl_req); + else if (rate->sub_command == MLAN_OID_GET_DATA_RATE) + status = wlan_rate_ioctl_get_data_rate(pmadapter, + pioctl_req); + break; + case MLAN_IOCTL_11AC_CFG: + status = wlan_11ac_cfg_ioctl(pmadapter, pioctl_req); + break; + case MLAN_IOCTL_REG_MEM: + reg_mem = (mlan_ds_reg_mem *) pioctl_req->pbuf; + if (reg_mem->sub_command == MLAN_OID_REG_RW) + status = wlan_reg_mem_ioctl_reg_rw(pmadapter, + pioctl_req); + else if (reg_mem->sub_command == MLAN_OID_EEPROM_RD) + status = wlan_reg_mem_ioctl_read_eeprom(pmadapter, + pioctl_req); + else if (reg_mem->sub_command == MLAN_OID_MEM_RW) + status = wlan_reg_mem_ioctl_mem_rw(pmadapter, + pioctl_req); + break; + case MLAN_IOCTL_WMM_CFG: + status = wlan_wmm_cfg_ioctl(pmadapter, pioctl_req); + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + break; + } + LEAVE(); + return status; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_uap_txrx.c b/drivers/net/wireless/sd8897/mlan/mlan_uap_txrx.c index cc72ec119879..a149a6f8930b 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_uap_txrx.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_uap_txrx.c @@ -1,20 +1,20 @@ /** @file mlan_uap_txrx.c * * @brief This file contains AP mode transmit and receive functions - * - * Copyright (C) 2009-2011, Marvell International Ltd. - * - * This software file (the "File") is distributed by Marvell International - * Ltd. under the terms of the GNU General Public License Version 2, June 1991 - * (the "License"). You may use, redistribute and/or modify this File in - * accordance with the terms and conditions of the License, a copy of which + * + * Copyright (C) 2009-2011, Marvell International Ltd. + * + * This software file (the "File") is distributed by Marvell International + * Ltd. under the terms of the GNU General Public License Version 2, June 1991 + * (the "License"). You may use, redistribute and/or modify this File in + * accordance with the terms and conditions of the License, a copy of which * is available by writing to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or on the * worldwide web at http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. * - * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE - * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE - * ARE EXPRESSLY DISCLAIMED. The License provides additional details about + * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE + * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE + * ARE EXPRESSLY DISCLAIMED. The License provides additional details about * this warranty disclaimer. */ @@ -43,7 +43,7 @@ Change log: /** * @brief This function processes received packet and forwards it * to kernel/upper layer - * + * * @param pmadapter A pointer to mlan_adapter * @param pmbuf A pointer to mlan_buffer which includes the received packet * @@ -52,48 +52,50 @@ Change log: static mlan_status wlan_upload_uap_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private priv = pmadapter->priv[pmbuf->bss_index]; - UapRxPD *prx_pd; - ENTER(); - prx_pd = (UapRxPD *) (pmbuf->pbuf + pmbuf->data_offset); - - /* Chop off RxPD */ - pmbuf->data_len -= prx_pd->rx_pkt_offset; - pmbuf->data_offset += prx_pd->rx_pkt_offset; - pmbuf->pparent = MNULL; - - DBG_HEXDUMP(MDAT_D, "uAP RxPD", (t_u8 *) prx_pd, - MIN(sizeof(UapRxPD), MAX_DATA_DUMP_LEN)); - DBG_HEXDUMP(MDAT_D, "uAP Rx Payload", - ((t_u8 *) prx_pd + prx_pd->rx_pkt_offset), - MIN(prx_pd->rx_pkt_length, MAX_DATA_DUMP_LEN)); - - pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, - &pmbuf->out_ts_sec, - &pmbuf->out_ts_usec); - PRINTM_NETINTF(MDATA, priv); - PRINTM(MDATA, "%lu.%06lu : Data => kernel seq_num=%d tid=%d\n", - pmbuf->out_ts_sec, pmbuf->out_ts_usec, prx_pd->seq_num, - prx_pd->priority); - ret = pmadapter->callbacks.moal_recv_packet(pmadapter->pmoal_handle, pmbuf); - if (ret == MLAN_STATUS_FAILURE) { - PRINTM(MERROR, "uAP Rx Error: moal_recv_packet returned error\n"); - pmbuf->status_code = MLAN_ERROR_PKT_INVALID; - } - - if (ret != MLAN_STATUS_PENDING) { - wlan_free_mlan_buffer(pmadapter, pmbuf); - } - LEAVE(); - - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private priv = pmadapter->priv[pmbuf->bss_index]; + UapRxPD *prx_pd; + ENTER(); + prx_pd = (UapRxPD *) (pmbuf->pbuf + pmbuf->data_offset); + + /* Chop off RxPD */ + pmbuf->data_len -= prx_pd->rx_pkt_offset; + pmbuf->data_offset += prx_pd->rx_pkt_offset; + pmbuf->pparent = MNULL; + + DBG_HEXDUMP(MDAT_D, "uAP RxPD", (t_u8 *) prx_pd, + MIN(sizeof(UapRxPD), MAX_DATA_DUMP_LEN)); + DBG_HEXDUMP(MDAT_D, "uAP Rx Payload", + ((t_u8 *) prx_pd + prx_pd->rx_pkt_offset), + MIN(prx_pd->rx_pkt_length, MAX_DATA_DUMP_LEN)); + + pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, + &pmbuf->out_ts_sec, + &pmbuf->out_ts_usec); + PRINTM_NETINTF(MDATA, priv); + PRINTM(MDATA, "%lu.%06lu : Data => kernel seq_num=%d tid=%d\n", + pmbuf->out_ts_sec, pmbuf->out_ts_usec, prx_pd->seq_num, + prx_pd->priority); + ret = pmadapter->callbacks.moal_recv_packet(pmadapter->pmoal_handle, + pmbuf); + if (ret == MLAN_STATUS_FAILURE) { + PRINTM(MERROR, + "uAP Rx Error: moal_recv_packet returned error\n"); + pmbuf->status_code = MLAN_ERROR_PKT_INVALID; + } + + if (ret != MLAN_STATUS_PENDING) { + wlan_free_mlan_buffer(pmadapter, pmbuf); + } + LEAVE(); + + return ret; } /** * @brief This function will check if unicast packet need be dropped - * + * * @param priv A pointer to mlan_private * @param mac mac address to find in station list table * @@ -102,45 +104,46 @@ wlan_upload_uap_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) static mlan_status wlan_check_unicast_packet(mlan_private * priv, t_u8 * mac) { - int j; - sta_node *sta_ptr = MNULL; - pmlan_adapter pmadapter = priv->adapter; - pmlan_private pmpriv = MNULL; - t_u8 pkt_type = 0; - mlan_status ret = MLAN_STATUS_SUCCESS; - ENTER(); - for (j = 0; j < MLAN_MAX_BSS_NUM; ++j) { - if ((pmpriv = pmadapter->priv[j])) { - if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) - continue; - sta_ptr = wlan_get_station_entry(pmpriv, mac); - if (sta_ptr) { - if (pmpriv == priv) - pkt_type = PKT_INTRA_UCAST; - else - pkt_type = PKT_INTER_UCAST; - break; - } - } - } - if ((pkt_type == PKT_INTRA_UCAST) && (priv->pkt_fwd & PKT_FWD_INTRA_UCAST)) { - PRINTM(MDATA, "Drop INTRA_UCAST packet\n"); - ret = MLAN_STATUS_FAILURE; - } else if ((pkt_type == PKT_INTER_UCAST) && - (priv->pkt_fwd & PKT_FWD_INTER_UCAST)) { - PRINTM(MDATA, "Drop INTER_UCAST packet\n"); - ret = MLAN_STATUS_FAILURE; - } - LEAVE(); - return ret; + int j; + sta_node *sta_ptr = MNULL; + pmlan_adapter pmadapter = priv->adapter; + pmlan_private pmpriv = MNULL; + t_u8 pkt_type = 0; + mlan_status ret = MLAN_STATUS_SUCCESS; + ENTER(); + for (j = 0; j < MLAN_MAX_BSS_NUM; ++j) { + if ((pmpriv = pmadapter->priv[j])) { + if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) + continue; + sta_ptr = wlan_get_station_entry(pmpriv, mac); + if (sta_ptr) { + if (pmpriv == priv) + pkt_type = PKT_INTRA_UCAST; + else + pkt_type = PKT_INTER_UCAST; + break; + } + } + } + if ((pkt_type == PKT_INTRA_UCAST) && + (priv->pkt_fwd & PKT_FWD_INTRA_UCAST)) { + PRINTM(MDATA, "Drop INTRA_UCAST packet\n"); + ret = MLAN_STATUS_FAILURE; + } else if ((pkt_type == PKT_INTER_UCAST) && + (priv->pkt_fwd & PKT_FWD_INTER_UCAST)) { + PRINTM(MDATA, "Drop INTER_UCAST packet\n"); + ret = MLAN_STATUS_FAILURE; + } + LEAVE(); + return ret; } /******************************************************** Global Functions ********************************************************/ -/** - * @brief This function fill the txpd for tx packet - * +/** + * @brief This function fill the txpd for tx packet + * * @param priv A pointer to mlan_private structure * @param pmbuf A pointer to the mlan_buffer for process * @@ -149,94 +152,99 @@ wlan_check_unicast_packet(mlan_private * priv, t_u8 * mac) t_void * wlan_ops_uap_process_txpd(IN t_void * priv, IN pmlan_buffer pmbuf) { - pmlan_private pmpriv = (pmlan_private) priv; - UapTxPD *plocal_tx_pd; - t_u8 *head_ptr = MNULL; - t_u32 pkt_type; - t_u32 tx_control; - ENTER(); - - if (!pmbuf->data_len) { - PRINTM(MERROR, "uAP Tx Error: Invalid packet length: %d\n", - pmbuf->data_len); - pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; - goto done; - } - if (pmbuf->buf_type == MLAN_BUF_TYPE_RAW_DATA) { - memcpy(pmpriv->adapter, &pkt_type, pmbuf->pbuf + pmbuf->data_offset, - sizeof(pkt_type)); - memcpy(pmpriv->adapter, &tx_control, - pmbuf->pbuf + pmbuf->data_offset + sizeof(pkt_type), - sizeof(tx_control)); - pmbuf->data_offset += sizeof(pkt_type) + sizeof(tx_control); - pmbuf->data_len -= sizeof(pkt_type) + sizeof(tx_control); - } - if (pmbuf->data_offset < (sizeof(UapTxPD) + INTF_HEADER_LEN + - DMA_ALIGNMENT)) { - PRINTM(MERROR, "not enough space for UapTxPD: len=%d, offset=%d\n", - pmbuf->data_len, pmbuf->data_offset); - DBG_HEXDUMP(MDAT_D, "drop pkt", pmbuf->pbuf + pmbuf->data_offset, - pmbuf->data_len); - pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; - goto done; - } - - /* head_ptr should be aligned */ - head_ptr = - pmbuf->pbuf + pmbuf->data_offset - sizeof(UapTxPD) - INTF_HEADER_LEN; - head_ptr = (t_u8 *) ((t_ptr) head_ptr & ~((t_ptr) (DMA_ALIGNMENT - 1))); - - plocal_tx_pd = (UapTxPD *) (head_ptr + INTF_HEADER_LEN); - memset(pmpriv->adapter, plocal_tx_pd, 0, sizeof(UapTxPD)); - - /* Set the BSS number to TxPD */ - plocal_tx_pd->bss_num = GET_BSS_NUM(pmpriv); - plocal_tx_pd->bss_type = pmpriv->bss_type; - - plocal_tx_pd->tx_pkt_length = (t_u16) pmbuf->data_len; - - plocal_tx_pd->priority = (t_u8) pmbuf->priority; - plocal_tx_pd->pkt_delay_2ms = - wlan_wmm_compute_driver_packet_delay(pmpriv, pmbuf); - - if (plocal_tx_pd->priority < NELEMENTS(pmpriv->wmm.user_pri_pkt_tx_ctrl)) - /* - * Set the priority specific tx_control field, setting of 0 will - * cause the default value to be used later in this function - */ - plocal_tx_pd->tx_control - = pmpriv->wmm.user_pri_pkt_tx_ctrl[plocal_tx_pd->priority]; - - /* Offset of actual data */ - plocal_tx_pd->tx_pkt_offset = - (t_u16) ((t_ptr) pmbuf->pbuf + pmbuf->data_offset - - (t_ptr) plocal_tx_pd); - - if (!plocal_tx_pd->tx_control) { - /* TxCtrl set by user or default */ - plocal_tx_pd->tx_control = pmpriv->pkt_tx_ctrl; - } - - if (pmbuf->buf_type == MLAN_BUF_TYPE_RAW_DATA) { - plocal_tx_pd->tx_pkt_type = (t_u16) pkt_type; - plocal_tx_pd->tx_control = tx_control; - } - uap_endian_convert_TxPD(plocal_tx_pd); - - /* Adjust the data offset and length to include TxPD in pmbuf */ - pmbuf->data_len += pmbuf->data_offset; - pmbuf->data_offset = (t_u32) ((t_ptr) head_ptr - (t_ptr) pmbuf->pbuf); - pmbuf->data_len -= pmbuf->data_offset; - - done: - LEAVE(); - return head_ptr; + pmlan_private pmpriv = (pmlan_private) priv; + UapTxPD *plocal_tx_pd; + t_u8 *head_ptr = MNULL; + t_u32 pkt_type; + t_u32 tx_control; + ENTER(); + + if (!pmbuf->data_len) { + PRINTM(MERROR, "uAP Tx Error: Invalid packet length: %d\n", + pmbuf->data_len); + pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; + goto done; + } + if (pmbuf->buf_type == MLAN_BUF_TYPE_RAW_DATA) { + memcpy(pmpriv->adapter, &pkt_type, + pmbuf->pbuf + pmbuf->data_offset, sizeof(pkt_type)); + memcpy(pmpriv->adapter, &tx_control, + pmbuf->pbuf + pmbuf->data_offset + sizeof(pkt_type), + sizeof(tx_control)); + pmbuf->data_offset += sizeof(pkt_type) + sizeof(tx_control); + pmbuf->data_len -= sizeof(pkt_type) + sizeof(tx_control); + } + if (pmbuf->data_offset < (sizeof(UapTxPD) + INTF_HEADER_LEN + + DMA_ALIGNMENT)) { + PRINTM(MERROR, + "not enough space for UapTxPD: len=%d, offset=%d\n", + pmbuf->data_len, pmbuf->data_offset); + DBG_HEXDUMP(MDAT_D, "drop pkt", + pmbuf->pbuf + pmbuf->data_offset, pmbuf->data_len); + pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; + goto done; + } + + /* head_ptr should be aligned */ + head_ptr = + pmbuf->pbuf + pmbuf->data_offset - sizeof(UapTxPD) - + INTF_HEADER_LEN; + head_ptr = (t_u8 *) ((t_ptr) head_ptr & ~((t_ptr) (DMA_ALIGNMENT - 1))); + + plocal_tx_pd = (UapTxPD *) (head_ptr + INTF_HEADER_LEN); + memset(pmpriv->adapter, plocal_tx_pd, 0, sizeof(UapTxPD)); + + /* Set the BSS number to TxPD */ + plocal_tx_pd->bss_num = GET_BSS_NUM(pmpriv); + plocal_tx_pd->bss_type = pmpriv->bss_type; + + plocal_tx_pd->tx_pkt_length = (t_u16) pmbuf->data_len; + + plocal_tx_pd->priority = (t_u8) pmbuf->priority; + plocal_tx_pd->pkt_delay_2ms = + wlan_wmm_compute_driver_packet_delay(pmpriv, pmbuf); + + if (plocal_tx_pd->priority < + NELEMENTS(pmpriv->wmm.user_pri_pkt_tx_ctrl)) + /* + * Set the priority specific tx_control field, setting of 0 will + * cause the default value to be used later in this function + */ + plocal_tx_pd->tx_control + = + pmpriv->wmm.user_pri_pkt_tx_ctrl[plocal_tx_pd-> + priority]; + + /* Offset of actual data */ + plocal_tx_pd->tx_pkt_offset = + (t_u16) ((t_ptr) pmbuf->pbuf + pmbuf->data_offset - + (t_ptr) plocal_tx_pd); + + if (!plocal_tx_pd->tx_control) { + /* TxCtrl set by user or default */ + plocal_tx_pd->tx_control = pmpriv->pkt_tx_ctrl; + } + + if (pmbuf->buf_type == MLAN_BUF_TYPE_RAW_DATA) { + plocal_tx_pd->tx_pkt_type = (t_u16) pkt_type; + plocal_tx_pd->tx_control = tx_control; + } + uap_endian_convert_TxPD(plocal_tx_pd); + + /* Adjust the data offset and length to include TxPD in pmbuf */ + pmbuf->data_len += pmbuf->data_offset; + pmbuf->data_offset = (t_u32) ((t_ptr) head_ptr - (t_ptr) pmbuf->pbuf); + pmbuf->data_len -= pmbuf->data_offset; + +done: + LEAVE(); + return head_ptr; } /** * @brief This function processes received packet and forwards it * to kernel/upper layer - * + * * @param adapter A pointer to mlan_adapter * @param pmbuf A pointer to mlan_buffer which includes the received packet * @@ -245,97 +253,103 @@ wlan_ops_uap_process_txpd(IN t_void * priv, IN pmlan_buffer pmbuf) mlan_status wlan_ops_uap_process_rx_packet(IN t_void * adapter, IN pmlan_buffer pmbuf) { - pmlan_adapter pmadapter = (pmlan_adapter) adapter; - mlan_status ret = MLAN_STATUS_SUCCESS; - UapRxPD *prx_pd; - wlan_mgmt_pkt *puap_pkt_hdr = MNULL; - - RxPacketHdr_t *prx_pkt; - pmlan_private priv = pmadapter->priv[pmbuf->bss_index]; - t_u8 ta[MLAN_MAC_ADDR_LENGTH]; - t_u16 rx_pkt_type = 0; - sta_node *sta_ptr = MNULL; - - ENTER(); - - prx_pd = (UapRxPD *) (pmbuf->pbuf + pmbuf->data_offset); - /* Endian conversion */ - uap_endian_convert_RxPD(prx_pd); - priv->rxpd_rate = prx_pd->rx_rate; - priv->rxpd_rate_info = prx_pd->rate_info; - rx_pkt_type = prx_pd->rx_pkt_type; - prx_pkt = (RxPacketHdr_t *) ((t_u8 *) prx_pd + prx_pd->rx_pkt_offset); - - PRINTM(MINFO, "RX Data: data_len - prx_pd->rx_pkt_offset = %d - %d = %d\n", - pmbuf->data_len, prx_pd->rx_pkt_offset, - pmbuf->data_len - prx_pd->rx_pkt_offset); - - if ((prx_pd->rx_pkt_offset + prx_pd->rx_pkt_length) > - (t_u16) pmbuf->data_len) { - PRINTM(MERROR, - "Wrong rx packet: len=%d,rx_pkt_offset=%d," - " rx_pkt_length=%d\n", pmbuf->data_len, prx_pd->rx_pkt_offset, - prx_pd->rx_pkt_length); - pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; - ret = MLAN_STATUS_FAILURE; - wlan_free_mlan_buffer(pmadapter, pmbuf); - goto done; - } - pmbuf->data_len = prx_pd->rx_pkt_offset + prx_pd->rx_pkt_length; - - if (pmadapter->priv[pmbuf->bss_index]->mgmt_frame_passthru_mask && - prx_pd->rx_pkt_type == PKT_TYPE_MGMT_FRAME) { - /* Check if this is mgmt packet and needs to forwarded to app as an - event */ - puap_pkt_hdr = - (wlan_mgmt_pkt *) ((t_u8 *) prx_pd + prx_pd->rx_pkt_offset); - puap_pkt_hdr->frm_len = wlan_le16_to_cpu(puap_pkt_hdr->frm_len); - if ((puap_pkt_hdr->wlan_header. - frm_ctl & IEEE80211_FC_MGMT_FRAME_TYPE_MASK) == 0) - wlan_process_802dot11_mgmt_pkt(pmadapter->priv[pmbuf->bss_index], - (t_u8 *) & puap_pkt_hdr->wlan_header, - puap_pkt_hdr->frm_len + - sizeof(wlan_mgmt_pkt) - - sizeof(puap_pkt_hdr->frm_len)); - wlan_free_mlan_buffer(pmadapter, pmbuf); - goto done; - } - - pmbuf->priority = prx_pd->priority; - memcpy(pmadapter, ta, prx_pkt->eth803_hdr.src_addr, MLAN_MAC_ADDR_LENGTH); - if ((rx_pkt_type != PKT_TYPE_BAR) && (prx_pd->priority < MAX_NUM_TID)) { - if ((sta_ptr = wlan_get_station_entry(priv, ta))) - sta_ptr->rx_seq[prx_pd->priority] = prx_pd->seq_num; - } - /* check if UAP enable 11n */ - if (!priv->is_11n_enabled || - (!wlan_11n_get_rxreorder_tbl - ((mlan_private *) priv, prx_pd->priority, ta) - && (prx_pd->rx_pkt_type != PKT_TYPE_AMSDU) - )) { - if (priv->pkt_fwd) - wlan_process_uap_rx_packet(priv, pmbuf); - else - wlan_upload_uap_rx_packet(pmadapter, pmbuf); - goto done; - } - /* Reorder and send to OS */ - if ((ret = mlan_11n_rxreorder_pkt(priv, prx_pd->seq_num, - prx_pd->priority, ta, - (t_u8) prx_pd->rx_pkt_type, - (void *) pmbuf)) - || (rx_pkt_type == PKT_TYPE_BAR)) { - wlan_free_mlan_buffer(pmadapter, pmbuf); - } - done: - LEAVE(); - return ret; + pmlan_adapter pmadapter = (pmlan_adapter) adapter; + mlan_status ret = MLAN_STATUS_SUCCESS; + UapRxPD *prx_pd; + wlan_mgmt_pkt *puap_pkt_hdr = MNULL; + + RxPacketHdr_t *prx_pkt; + pmlan_private priv = pmadapter->priv[pmbuf->bss_index]; + t_u8 ta[MLAN_MAC_ADDR_LENGTH]; + t_u16 rx_pkt_type = 0; + sta_node *sta_ptr = MNULL; + + ENTER(); + + prx_pd = (UapRxPD *) (pmbuf->pbuf + pmbuf->data_offset); + /* Endian conversion */ + uap_endian_convert_RxPD(prx_pd); + priv->rxpd_rate = prx_pd->rx_rate; + priv->rxpd_rate_info = prx_pd->rate_info; + rx_pkt_type = prx_pd->rx_pkt_type; + prx_pkt = (RxPacketHdr_t *) ((t_u8 *) prx_pd + prx_pd->rx_pkt_offset); + + PRINTM(MINFO, + "RX Data: data_len - prx_pd->rx_pkt_offset = %d - %d = %d\n", + pmbuf->data_len, prx_pd->rx_pkt_offset, + pmbuf->data_len - prx_pd->rx_pkt_offset); + + if ((prx_pd->rx_pkt_offset + prx_pd->rx_pkt_length) > + (t_u16) pmbuf->data_len) { + PRINTM(MERROR, + "Wrong rx packet: len=%d,rx_pkt_offset=%d," + " rx_pkt_length=%d\n", pmbuf->data_len, + prx_pd->rx_pkt_offset, prx_pd->rx_pkt_length); + pmbuf->status_code = MLAN_ERROR_PKT_SIZE_INVALID; + ret = MLAN_STATUS_FAILURE; + wlan_free_mlan_buffer(pmadapter, pmbuf); + goto done; + } + pmbuf->data_len = prx_pd->rx_pkt_offset + prx_pd->rx_pkt_length; + + if (pmadapter->priv[pmbuf->bss_index]->mgmt_frame_passthru_mask && + prx_pd->rx_pkt_type == PKT_TYPE_MGMT_FRAME) { + /* Check if this is mgmt packet and needs to forwarded to app + as an event */ + puap_pkt_hdr = + (wlan_mgmt_pkt *) ((t_u8 *) prx_pd + + prx_pd->rx_pkt_offset); + puap_pkt_hdr->frm_len = wlan_le16_to_cpu(puap_pkt_hdr->frm_len); + if ((puap_pkt_hdr->wlan_header. + frm_ctl & IEEE80211_FC_MGMT_FRAME_TYPE_MASK) == 0) + wlan_process_802dot11_mgmt_pkt(pmadapter-> + priv[pmbuf->bss_index], + (t_u8 *) & puap_pkt_hdr-> + wlan_header, + puap_pkt_hdr->frm_len + + sizeof(wlan_mgmt_pkt) - + sizeof(puap_pkt_hdr-> + frm_len)); + wlan_free_mlan_buffer(pmadapter, pmbuf); + goto done; + } + + pmbuf->priority = prx_pd->priority; + memcpy(pmadapter, ta, prx_pkt->eth803_hdr.src_addr, + MLAN_MAC_ADDR_LENGTH); + if ((rx_pkt_type != PKT_TYPE_BAR) && (prx_pd->priority < MAX_NUM_TID)) { + if ((sta_ptr = wlan_get_station_entry(priv, ta))) + sta_ptr->rx_seq[prx_pd->priority] = prx_pd->seq_num; + } + /* check if UAP enable 11n */ + if (!priv->is_11n_enabled || + (!wlan_11n_get_rxreorder_tbl + ((mlan_private *) priv, prx_pd->priority, ta) + && (prx_pd->rx_pkt_type != PKT_TYPE_AMSDU) + )) { + if (priv->pkt_fwd) + wlan_process_uap_rx_packet(priv, pmbuf); + else + wlan_upload_uap_rx_packet(pmadapter, pmbuf); + goto done; + } + /* Reorder and send to OS */ + if ((ret = mlan_11n_rxreorder_pkt(priv, prx_pd->seq_num, + prx_pd->priority, ta, + (t_u8) prx_pd->rx_pkt_type, + (void *)pmbuf)) + || (rx_pkt_type == PKT_TYPE_BAR)) { + wlan_free_mlan_buffer(pmadapter, pmbuf); + } +done: + LEAVE(); + return ret; } /** * @brief This function processes received packet and forwards it - * to kernel/upper layer or send back to firmware - * + * to kernel/upper layer or send back to firmware + * * @param priv A pointer to mlan_private * @param pmbuf A pointer to mlan_buffer which includes the received packet * @@ -344,98 +358,113 @@ wlan_ops_uap_process_rx_packet(IN t_void * adapter, IN pmlan_buffer pmbuf) mlan_status wlan_uap_recv_packet(IN mlan_private * priv, IN pmlan_buffer pmbuf) { - pmlan_adapter pmadapter = priv->adapter; - mlan_status ret = MLAN_STATUS_SUCCESS; - RxPacketHdr_t *prx_pkt; - pmlan_buffer newbuf = MNULL; - - ENTER(); - - prx_pkt = (RxPacketHdr_t *) ((t_u8 *) pmbuf->pbuf + pmbuf->data_offset); - - DBG_HEXDUMP(MDAT_D, "uap_recv_packet", pmbuf->pbuf + pmbuf->data_offset, - MIN(pmbuf->data_len, MAX_DATA_DUMP_LEN)); - - PRINTM(MDATA, "AMSDU dest " MACSTR "\n", - MAC2STR(prx_pkt->eth803_hdr.dest_addr)); - - /* don't do packet forwarding in disconnected state */ - if ((priv->media_connected == MFALSE) || - (pmbuf->data_len > MV_ETH_FRAME_LEN)) - goto upload; - - if (prx_pkt->eth803_hdr.dest_addr[0] & 0x01) { - if (!(priv->pkt_fwd & PKT_FWD_INTRA_BCAST)) { - /* Multicast pkt */ - if ((newbuf = - wlan_alloc_mlan_buffer(pmadapter, MLAN_TX_DATA_BUF_SIZE_2K, 0, - MOAL_MALLOC_BUFFER))) { - newbuf->bss_index = pmbuf->bss_index; - newbuf->buf_type = pmbuf->buf_type; - newbuf->priority = pmbuf->priority; - newbuf->in_ts_sec = pmbuf->in_ts_sec; - newbuf->in_ts_usec = pmbuf->in_ts_usec; - newbuf->data_offset = - (sizeof(UapTxPD) + INTF_HEADER_LEN + DMA_ALIGNMENT); - pmadapter->pending_bridge_pkts++; - newbuf->flags |= MLAN_BUF_FLAG_BRIDGE_BUF; - - /* copy the data */ - memcpy(pmadapter, (t_u8 *) newbuf->pbuf + newbuf->data_offset, - pmbuf->pbuf + pmbuf->data_offset, pmbuf->data_len); - newbuf->data_len = pmbuf->data_len; - wlan_wmm_add_buf_txqueue(pmadapter, newbuf); - if (pmadapter->pending_bridge_pkts > RX_HIGH_THRESHOLD) - wlan_drop_tx_pkts(priv); - } - } - } else { - if ((!(priv->pkt_fwd & PKT_FWD_INTRA_UCAST)) && - (wlan_get_station_entry(priv, prx_pkt->eth803_hdr.dest_addr))) { - /* Intra BSS packet */ - if ((newbuf = - wlan_alloc_mlan_buffer(pmadapter, MLAN_TX_DATA_BUF_SIZE_2K, 0, - MOAL_MALLOC_BUFFER))) { - newbuf->bss_index = pmbuf->bss_index; - newbuf->buf_type = pmbuf->buf_type; - newbuf->priority = pmbuf->priority; - newbuf->in_ts_sec = pmbuf->in_ts_sec; - newbuf->in_ts_usec = pmbuf->in_ts_usec; - newbuf->data_offset = - (sizeof(UapTxPD) + INTF_HEADER_LEN + DMA_ALIGNMENT); - pmadapter->pending_bridge_pkts++; - newbuf->flags |= MLAN_BUF_FLAG_BRIDGE_BUF; - - /* copy the data */ - memcpy(pmadapter, (t_u8 *) newbuf->pbuf + newbuf->data_offset, - pmbuf->pbuf + pmbuf->data_offset, pmbuf->data_len); - newbuf->data_len = pmbuf->data_len; - wlan_wmm_add_buf_txqueue(pmadapter, newbuf); - if (pmadapter->pending_bridge_pkts > RX_HIGH_THRESHOLD) - wlan_drop_tx_pkts(priv); - } - goto done; - } else if (MLAN_STATUS_FAILURE == - wlan_check_unicast_packet(priv, - prx_pkt->eth803_hdr.dest_addr)) { - /* drop packet */ - PRINTM(MDATA, "Drop AMSDU dest " MACSTR "\n", - MAC2STR(prx_pkt->eth803_hdr.dest_addr)); - goto done; - } - } - upload: + pmlan_adapter pmadapter = priv->adapter; + mlan_status ret = MLAN_STATUS_SUCCESS; + RxPacketHdr_t *prx_pkt; + pmlan_buffer newbuf = MNULL; + + ENTER(); + + prx_pkt = (RxPacketHdr_t *) ((t_u8 *) pmbuf->pbuf + pmbuf->data_offset); + + DBG_HEXDUMP(MDAT_D, "uap_recv_packet", pmbuf->pbuf + pmbuf->data_offset, + MIN(pmbuf->data_len, MAX_DATA_DUMP_LEN)); + + PRINTM(MDATA, "AMSDU dest " MACSTR "\n", + MAC2STR(prx_pkt->eth803_hdr.dest_addr)); + + /* don't do packet forwarding in disconnected state */ + if ((priv->media_connected == MFALSE) || + (pmbuf->data_len > MV_ETH_FRAME_LEN)) + goto upload; + + if (prx_pkt->eth803_hdr.dest_addr[0] & 0x01) { + if (!(priv->pkt_fwd & PKT_FWD_INTRA_BCAST)) { + /* Multicast pkt */ + if ((newbuf = + wlan_alloc_mlan_buffer(pmadapter, + MLAN_TX_DATA_BUF_SIZE_2K, 0, + MOAL_MALLOC_BUFFER))) { + newbuf->bss_index = pmbuf->bss_index; + newbuf->buf_type = pmbuf->buf_type; + newbuf->priority = pmbuf->priority; + newbuf->in_ts_sec = pmbuf->in_ts_sec; + newbuf->in_ts_usec = pmbuf->in_ts_usec; + newbuf->data_offset = + (sizeof(UapTxPD) + INTF_HEADER_LEN + + DMA_ALIGNMENT); + pmadapter->pending_bridge_pkts++; + newbuf->flags |= MLAN_BUF_FLAG_BRIDGE_BUF; + + /* copy the data */ + memcpy(pmadapter, + (t_u8 *) newbuf->pbuf + + newbuf->data_offset, + pmbuf->pbuf + pmbuf->data_offset, + pmbuf->data_len); + newbuf->data_len = pmbuf->data_len; + wlan_wmm_add_buf_txqueue(pmadapter, newbuf); + if (pmadapter->pending_bridge_pkts > + RX_HIGH_THRESHOLD) + wlan_drop_tx_pkts(priv); + } + } + } else { + if ((!(priv->pkt_fwd & PKT_FWD_INTRA_UCAST)) && + (wlan_get_station_entry + (priv, prx_pkt->eth803_hdr.dest_addr))) { + /* Intra BSS packet */ + if ((newbuf = + wlan_alloc_mlan_buffer(pmadapter, + MLAN_TX_DATA_BUF_SIZE_2K, 0, + MOAL_MALLOC_BUFFER))) { + newbuf->bss_index = pmbuf->bss_index; + newbuf->buf_type = pmbuf->buf_type; + newbuf->priority = pmbuf->priority; + newbuf->in_ts_sec = pmbuf->in_ts_sec; + newbuf->in_ts_usec = pmbuf->in_ts_usec; + newbuf->data_offset = + (sizeof(UapTxPD) + INTF_HEADER_LEN + + DMA_ALIGNMENT); + pmadapter->pending_bridge_pkts++; + newbuf->flags |= MLAN_BUF_FLAG_BRIDGE_BUF; + + /* copy the data */ + memcpy(pmadapter, + (t_u8 *) newbuf->pbuf + + newbuf->data_offset, + pmbuf->pbuf + pmbuf->data_offset, + pmbuf->data_len); + newbuf->data_len = pmbuf->data_len; + wlan_wmm_add_buf_txqueue(pmadapter, newbuf); + if (pmadapter->pending_bridge_pkts > + RX_HIGH_THRESHOLD) + wlan_drop_tx_pkts(priv); + } + goto done; + } else if (MLAN_STATUS_FAILURE == + wlan_check_unicast_packet(priv, + prx_pkt->eth803_hdr. + dest_addr)) { + /* drop packet */ + PRINTM(MDATA, "Drop AMSDU dest " MACSTR "\n", + MAC2STR(prx_pkt->eth803_hdr.dest_addr)); + goto done; + } + } +upload: /** send packet to moal */ - ret = pmadapter->callbacks.moal_recv_packet(pmadapter->pmoal_handle, pmbuf); - done: - LEAVE(); - return ret; + ret = pmadapter->callbacks.moal_recv_packet(pmadapter->pmoal_handle, + pmbuf); +done: + LEAVE(); + return ret; } /** * @brief This function processes received packet and forwards it - * to kernel/upper layer or send back to firmware - * + * to kernel/upper layer or send back to firmware + * * @param priv A pointer to mlan_private * @param pmbuf A pointer to mlan_buffer which includes the received packet * @@ -444,107 +473,119 @@ wlan_uap_recv_packet(IN mlan_private * priv, IN pmlan_buffer pmbuf) mlan_status wlan_process_uap_rx_packet(IN mlan_private * priv, IN pmlan_buffer pmbuf) { - pmlan_adapter pmadapter = priv->adapter; - mlan_status ret = MLAN_STATUS_SUCCESS; - UapRxPD *prx_pd; - RxPacketHdr_t *prx_pkt; - pmlan_buffer newbuf = MNULL; - - ENTER(); - - prx_pd = (UapRxPD *) (pmbuf->pbuf + pmbuf->data_offset); - prx_pkt = (RxPacketHdr_t *) ((t_u8 *) prx_pd + prx_pd->rx_pkt_offset); - - DBG_HEXDUMP(MDAT_D, "uAP RxPD", prx_pd, - MIN(sizeof(UapRxPD), MAX_DATA_DUMP_LEN)); - DBG_HEXDUMP(MDAT_D, "uAP Rx Payload", - ((t_u8 *) prx_pd + prx_pd->rx_pkt_offset), - MIN(prx_pd->rx_pkt_length, MAX_DATA_DUMP_LEN)); - - PRINTM(MINFO, "RX Data: data_len - prx_pd->rx_pkt_offset = %d - %d = %d\n", - pmbuf->data_len, prx_pd->rx_pkt_offset, - pmbuf->data_len - prx_pd->rx_pkt_offset); - PRINTM(MDATA, "Rx dest " MACSTR "\n", - MAC2STR(prx_pkt->eth803_hdr.dest_addr)); - - /* don't do packet forwarding in disconnected state */ - /* don't do packet forwarding when packet > 1514 */ - if ((priv->media_connected == MFALSE) || - ((pmbuf->data_len - prx_pd->rx_pkt_offset) > MV_ETH_FRAME_LEN)) - goto upload; - - if (prx_pkt->eth803_hdr.dest_addr[0] & 0x01) { - if (!(priv->pkt_fwd & PKT_FWD_INTRA_BCAST)) { - /* Multicast pkt */ - if ((newbuf = - wlan_alloc_mlan_buffer(pmadapter, MLAN_TX_DATA_BUF_SIZE_2K, 0, - MOAL_MALLOC_BUFFER))) { - newbuf->bss_index = pmbuf->bss_index; - newbuf->buf_type = pmbuf->buf_type; - newbuf->priority = pmbuf->priority; - newbuf->in_ts_sec = pmbuf->in_ts_sec; - newbuf->in_ts_usec = pmbuf->in_ts_usec; - newbuf->data_offset = - (sizeof(UapTxPD) + INTF_HEADER_LEN + DMA_ALIGNMENT); - pmadapter->pending_bridge_pkts++; - newbuf->flags |= MLAN_BUF_FLAG_BRIDGE_BUF; - - /* copy the data, skip rxpd */ - memcpy(pmadapter, (t_u8 *) newbuf->pbuf + newbuf->data_offset, - pmbuf->pbuf + pmbuf->data_offset + prx_pd->rx_pkt_offset, - pmbuf->data_len - prx_pd->rx_pkt_offset); - newbuf->data_len = pmbuf->data_len - prx_pd->rx_pkt_offset; - wlan_wmm_add_buf_txqueue(pmadapter, newbuf); - if (pmadapter->pending_bridge_pkts > RX_HIGH_THRESHOLD) - wlan_drop_tx_pkts(priv); - } - } - } else { - if ((!(priv->pkt_fwd & PKT_FWD_INTRA_UCAST)) && - (wlan_get_station_entry(priv, prx_pkt->eth803_hdr.dest_addr))) { - /* Forwarding Intra-BSS packet */ - pmbuf->data_len -= prx_pd->rx_pkt_offset; - pmbuf->data_offset += prx_pd->rx_pkt_offset; - pmbuf->flags |= MLAN_BUF_FLAG_BRIDGE_BUF; - pmadapter->pending_bridge_pkts++; - wlan_wmm_add_buf_txqueue(pmadapter, pmbuf); - if (pmadapter->pending_bridge_pkts > RX_HIGH_THRESHOLD) - wlan_drop_tx_pkts(priv); - goto done; - } else if (MLAN_STATUS_FAILURE == - wlan_check_unicast_packet(priv, - prx_pkt->eth803_hdr.dest_addr)) { - PRINTM(MDATA, "Drop Pkts: Rx dest " MACSTR "\n", - MAC2STR(prx_pkt->eth803_hdr.dest_addr)); - pmbuf->status_code = MLAN_ERROR_PKT_INVALID; - wlan_free_mlan_buffer(pmadapter, pmbuf); - goto done; - } - } - - upload: - /* Chop off RxPD */ - pmbuf->data_len -= prx_pd->rx_pkt_offset; - pmbuf->data_offset += prx_pd->rx_pkt_offset; - pmbuf->pparent = MNULL; - - pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, - &pmbuf->out_ts_sec, - &pmbuf->out_ts_usec); - PRINTM_NETINTF(MDATA, priv); - PRINTM(MDATA, "%lu.%06lu : Data => kernel seq_num=%d tid=%d\n", - pmbuf->out_ts_sec, pmbuf->out_ts_usec, prx_pd->seq_num, - prx_pd->priority); - ret = pmadapter->callbacks.moal_recv_packet(pmadapter->pmoal_handle, pmbuf); - if (ret == MLAN_STATUS_FAILURE) { - PRINTM(MERROR, "uAP Rx Error: moal_recv_packet returned error\n"); - pmbuf->status_code = MLAN_ERROR_PKT_INVALID; - } - - if (ret != MLAN_STATUS_PENDING) { - wlan_free_mlan_buffer(pmadapter, pmbuf); - } - done: - LEAVE(); - return ret; + pmlan_adapter pmadapter = priv->adapter; + mlan_status ret = MLAN_STATUS_SUCCESS; + UapRxPD *prx_pd; + RxPacketHdr_t *prx_pkt; + pmlan_buffer newbuf = MNULL; + + ENTER(); + + prx_pd = (UapRxPD *) (pmbuf->pbuf + pmbuf->data_offset); + prx_pkt = (RxPacketHdr_t *) ((t_u8 *) prx_pd + prx_pd->rx_pkt_offset); + + DBG_HEXDUMP(MDAT_D, "uAP RxPD", prx_pd, + MIN(sizeof(UapRxPD), MAX_DATA_DUMP_LEN)); + DBG_HEXDUMP(MDAT_D, "uAP Rx Payload", + ((t_u8 *) prx_pd + prx_pd->rx_pkt_offset), + MIN(prx_pd->rx_pkt_length, MAX_DATA_DUMP_LEN)); + + PRINTM(MINFO, + "RX Data: data_len - prx_pd->rx_pkt_offset = %d - %d = %d\n", + pmbuf->data_len, prx_pd->rx_pkt_offset, + pmbuf->data_len - prx_pd->rx_pkt_offset); + PRINTM(MDATA, "Rx dest " MACSTR "\n", + MAC2STR(prx_pkt->eth803_hdr.dest_addr)); + + /* don't do packet forwarding in disconnected state */ + /* don't do packet forwarding when packet > 1514 */ + if ((priv->media_connected == MFALSE) || + ((pmbuf->data_len - prx_pd->rx_pkt_offset) > MV_ETH_FRAME_LEN)) + goto upload; + + if (prx_pkt->eth803_hdr.dest_addr[0] & 0x01) { + if (!(priv->pkt_fwd & PKT_FWD_INTRA_BCAST)) { + /* Multicast pkt */ + if ((newbuf = + wlan_alloc_mlan_buffer(pmadapter, + MLAN_TX_DATA_BUF_SIZE_2K, 0, + MOAL_MALLOC_BUFFER))) { + newbuf->bss_index = pmbuf->bss_index; + newbuf->buf_type = pmbuf->buf_type; + newbuf->priority = pmbuf->priority; + newbuf->in_ts_sec = pmbuf->in_ts_sec; + newbuf->in_ts_usec = pmbuf->in_ts_usec; + newbuf->data_offset = + (sizeof(UapTxPD) + INTF_HEADER_LEN + + DMA_ALIGNMENT); + pmadapter->pending_bridge_pkts++; + newbuf->flags |= MLAN_BUF_FLAG_BRIDGE_BUF; + + /* copy the data, skip rxpd */ + memcpy(pmadapter, + (t_u8 *) newbuf->pbuf + + newbuf->data_offset, + pmbuf->pbuf + pmbuf->data_offset + + prx_pd->rx_pkt_offset, + pmbuf->data_len - prx_pd->rx_pkt_offset); + newbuf->data_len = + pmbuf->data_len - prx_pd->rx_pkt_offset; + wlan_wmm_add_buf_txqueue(pmadapter, newbuf); + if (pmadapter->pending_bridge_pkts > + RX_HIGH_THRESHOLD) + wlan_drop_tx_pkts(priv); + } + } + } else { + if ((!(priv->pkt_fwd & PKT_FWD_INTRA_UCAST)) && + (wlan_get_station_entry + (priv, prx_pkt->eth803_hdr.dest_addr))) { + /* Forwarding Intra-BSS packet */ + pmbuf->data_len -= prx_pd->rx_pkt_offset; + pmbuf->data_offset += prx_pd->rx_pkt_offset; + pmbuf->flags |= MLAN_BUF_FLAG_BRIDGE_BUF; + pmadapter->pending_bridge_pkts++; + wlan_wmm_add_buf_txqueue(pmadapter, pmbuf); + if (pmadapter->pending_bridge_pkts > RX_HIGH_THRESHOLD) + wlan_drop_tx_pkts(priv); + goto done; + } else if (MLAN_STATUS_FAILURE == + wlan_check_unicast_packet(priv, + prx_pkt->eth803_hdr. + dest_addr)) { + PRINTM(MDATA, "Drop Pkts: Rx dest " MACSTR "\n", + MAC2STR(prx_pkt->eth803_hdr.dest_addr)); + pmbuf->status_code = MLAN_ERROR_PKT_INVALID; + wlan_free_mlan_buffer(pmadapter, pmbuf); + goto done; + } + } + +upload: + /* Chop off RxPD */ + pmbuf->data_len -= prx_pd->rx_pkt_offset; + pmbuf->data_offset += prx_pd->rx_pkt_offset; + pmbuf->pparent = MNULL; + + pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, + &pmbuf->out_ts_sec, + &pmbuf->out_ts_usec); + PRINTM_NETINTF(MDATA, priv); + PRINTM(MDATA, "%lu.%06lu : Data => kernel seq_num=%d tid=%d\n", + pmbuf->out_ts_sec, pmbuf->out_ts_usec, prx_pd->seq_num, + prx_pd->priority); + ret = pmadapter->callbacks.moal_recv_packet(pmadapter->pmoal_handle, + pmbuf); + if (ret == MLAN_STATUS_FAILURE) { + PRINTM(MERROR, + "uAP Rx Error: moal_recv_packet returned error\n"); + pmbuf->status_code = MLAN_ERROR_PKT_INVALID; + } + + if (ret != MLAN_STATUS_PENDING) { + wlan_free_mlan_buffer(pmadapter, pmbuf); + } +done: + LEAVE(); + return ret; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_util.h b/drivers/net/wireless/sd8897/mlan/mlan_util.h index c5231f6b775e..12ef24c2d00b 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_util.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_util.h @@ -3,7 +3,7 @@ * @brief This file contains wrappers for linked-list, * spinlock and timer defines. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -31,25 +31,25 @@ Change log: typedef struct _mlan_linked_list { /** Pointer to previous node */ - struct _mlan_linked_list *pprev; + struct _mlan_linked_list *pprev; /** Pointer to next node */ - struct _mlan_linked_list *pnext; + struct _mlan_linked_list *pnext; } mlan_linked_list, *pmlan_linked_list; /** List head */ typedef struct _mlan_list_head { /** Pointer to previous node */ - struct _mlan_linked_list *pprev; + struct _mlan_linked_list *pprev; /** Pointer to next node */ - struct _mlan_linked_list *pnext; + struct _mlan_linked_list *pnext; /** Pointer to lock */ - t_void *plock; + t_void *plock; } mlan_list_head, *pmlan_list_head; -/** +/** * @brief This function initializes a list without locking - * + * * @param phead List head * * @return N/A @@ -57,13 +57,13 @@ typedef struct _mlan_list_head static INLINE t_void util_init_list(pmlan_linked_list phead) { - /* Both next and prev point to self */ - phead->pprev = phead->pnext = (pmlan_linked_list) phead; + /* Both next and prev point to self */ + phead->pprev = phead->pnext = (pmlan_linked_list) phead; } -/** +/** * @brief This function initializes a list - * + * * @param phead List head * @param lock_required A flag for spinlock requirement * @param moal_init_lock A pointer to init lock handler @@ -72,22 +72,22 @@ util_init_list(pmlan_linked_list phead) */ static INLINE t_void util_init_list_head(t_void * pmoal_handle, - pmlan_list_head phead, - t_u8 lock_required, - mlan_status(*moal_init_lock) (t_void * handle, - t_void ** pplock)) + pmlan_list_head phead, + t_u8 lock_required, + mlan_status(*moal_init_lock) (t_void * handle, + t_void ** pplock)) { - /* Both next and prev point to self */ - util_init_list((pmlan_linked_list) phead); - if (lock_required) - moal_init_lock(pmoal_handle, &phead->plock); - else - phead->plock = 0; + /* Both next and prev point to self */ + util_init_list((pmlan_linked_list) phead); + if (lock_required) + moal_init_lock(pmoal_handle, &phead->plock); + else + phead->plock = 0; } -/** +/** * @brief This function frees a list - * + * * @param phead List head * @param moal_free_lock A pointer to free lock handler * @@ -95,18 +95,18 @@ util_init_list_head(t_void * pmoal_handle, */ static INLINE t_void util_free_list_head(t_void * pmoal_handle, - pmlan_list_head phead, - mlan_status(*moal_free_lock) (t_void * handle, - t_void * plock)) + pmlan_list_head phead, + mlan_status(*moal_free_lock) (t_void * handle, + t_void * plock)) { - phead->pprev = phead->pnext = 0; - if (phead->plock) - moal_free_lock(pmoal_handle, phead->plock); + phead->pprev = phead->pnext = 0; + if (phead->plock) + moal_free_lock(pmoal_handle, phead->plock); } -/** +/** * @brief This function peeks into a list - * + * * @param phead List head * @param moal_spin_lock A pointer to spin lock handler * @param moal_spin_unlock A pointer to spin unlock handler @@ -115,25 +115,25 @@ util_free_list_head(t_void * pmoal_handle, */ static INLINE pmlan_linked_list util_peek_list(t_void * pmoal_handle, - pmlan_list_head phead, - mlan_status(*moal_spin_lock) (t_void * handle, t_void * plock), - mlan_status(*moal_spin_unlock) (t_void * handle, t_void * plock)) + pmlan_list_head phead, + mlan_status(*moal_spin_lock) (t_void * handle, t_void * plock), + mlan_status(*moal_spin_unlock) (t_void * handle, t_void * plock)) { - pmlan_linked_list pnode = 0; - - if (moal_spin_lock) - moal_spin_lock(pmoal_handle, phead->plock); - if (phead->pnext != (pmlan_linked_list) phead) { - pnode = phead->pnext; - } - if (moal_spin_unlock) - moal_spin_unlock(pmoal_handle, phead->plock); - return pnode; + pmlan_linked_list pnode = 0; + + if (moal_spin_lock) + moal_spin_lock(pmoal_handle, phead->plock); + if (phead->pnext != (pmlan_linked_list) phead) { + pnode = phead->pnext; + } + if (moal_spin_unlock) + moal_spin_unlock(pmoal_handle, phead->plock); + return pnode; } -/** +/** * @brief This function queues a node at the list tail - * + * * @param phead List head * @param pnode List node to queue * @param moal_spin_lock A pointer to spin lock handler @@ -143,29 +143,29 @@ util_peek_list(t_void * pmoal_handle, */ static INLINE t_void util_enqueue_list_tail(t_void * pmoal_handle, - pmlan_list_head phead, - pmlan_linked_list pnode, - mlan_status(*moal_spin_lock) (t_void * handle, - t_void * plock), - mlan_status(*moal_spin_unlock) (t_void * handle, - t_void * plock)) + pmlan_list_head phead, + pmlan_linked_list pnode, + mlan_status(*moal_spin_lock) (t_void * handle, + t_void * plock), + mlan_status(*moal_spin_unlock) (t_void * handle, + t_void * plock)) { - pmlan_linked_list pold_last; + pmlan_linked_list pold_last; - if (moal_spin_lock) - moal_spin_lock(pmoal_handle, phead->plock); - pold_last = phead->pprev; - pnode->pprev = pold_last; - pnode->pnext = (pmlan_linked_list) phead; + if (moal_spin_lock) + moal_spin_lock(pmoal_handle, phead->plock); + pold_last = phead->pprev; + pnode->pprev = pold_last; + pnode->pnext = (pmlan_linked_list) phead; - phead->pprev = pold_last->pnext = pnode; - if (moal_spin_unlock) - moal_spin_unlock(pmoal_handle, phead->plock); + phead->pprev = pold_last->pnext = pnode; + if (moal_spin_unlock) + moal_spin_unlock(pmoal_handle, phead->plock); } -/** +/** * @brief This function adds a node at the list head - * + * * @param phead List head * @param pnode List node to add * @param moal_spin_lock A pointer to spin lock handler @@ -175,29 +175,29 @@ util_enqueue_list_tail(t_void * pmoal_handle, */ static INLINE t_void util_enqueue_list_head(t_void * pmoal_handle, - pmlan_list_head phead, - pmlan_linked_list pnode, - mlan_status(*moal_spin_lock) (t_void * handle, - t_void * plock), - mlan_status(*moal_spin_unlock) (t_void * handle, - t_void * plock)) + pmlan_list_head phead, + pmlan_linked_list pnode, + mlan_status(*moal_spin_lock) (t_void * handle, + t_void * plock), + mlan_status(*moal_spin_unlock) (t_void * handle, + t_void * plock)) { - pmlan_linked_list pold_first; + pmlan_linked_list pold_first; - if (moal_spin_lock) - moal_spin_lock(pmoal_handle, phead->plock); - pold_first = phead->pnext; - pnode->pprev = (pmlan_linked_list) phead; - pnode->pnext = pold_first; + if (moal_spin_lock) + moal_spin_lock(pmoal_handle, phead->plock); + pold_first = phead->pnext; + pnode->pprev = (pmlan_linked_list) phead; + pnode->pnext = pold_first; - phead->pnext = pold_first->pprev = pnode; - if (moal_spin_unlock) - moal_spin_unlock(pmoal_handle, phead->plock); + phead->pnext = pold_first->pprev = pnode; + if (moal_spin_unlock) + moal_spin_unlock(pmoal_handle, phead->plock); } -/** +/** * @brief This function removes a node from the list - * + * * @param phead List head * @param pnode List node to remove * @param moal_spin_lock A pointer to spin lock handler @@ -207,30 +207,30 @@ util_enqueue_list_head(t_void * pmoal_handle, */ static INLINE t_void util_unlink_list(t_void * pmoal_handle, - pmlan_list_head phead, - pmlan_linked_list pnode, - mlan_status(*moal_spin_lock) (t_void * handle, t_void * plock), - mlan_status(*moal_spin_unlock) (t_void * handle, - t_void * plock)) + pmlan_list_head phead, + pmlan_linked_list pnode, + mlan_status(*moal_spin_lock) (t_void * handle, t_void * plock), + mlan_status(*moal_spin_unlock) (t_void * handle, + t_void * plock)) { - pmlan_linked_list pmy_prev; - pmlan_linked_list pmy_next; - - if (moal_spin_lock) - moal_spin_lock(pmoal_handle, phead->plock); - pmy_prev = pnode->pprev; - pmy_next = pnode->pnext; - pmy_next->pprev = pmy_prev; - pmy_prev->pnext = pmy_next; - - pnode->pnext = pnode->pprev = 0; - if (moal_spin_unlock) - moal_spin_unlock(pmoal_handle, phead->plock); + pmlan_linked_list pmy_prev; + pmlan_linked_list pmy_next; + + if (moal_spin_lock) + moal_spin_lock(pmoal_handle, phead->plock); + pmy_prev = pnode->pprev; + pmy_next = pnode->pnext; + pmy_next->pprev = pmy_prev; + pmy_prev->pnext = pmy_next; + + pnode->pnext = pnode->pprev = 0; + if (moal_spin_unlock) + moal_spin_unlock(pmoal_handle, phead->plock); } -/** +/** * @brief This function dequeues a node from the list - * + * * @param phead List head * @param moal_spin_lock A pointer to spin lock handler * @param moal_spin_unlock A pointer to spin unlock handler @@ -239,36 +239,36 @@ util_unlink_list(t_void * pmoal_handle, */ static INLINE pmlan_linked_list util_dequeue_list(t_void * pmoal_handle, - pmlan_list_head phead, - mlan_status(*moal_spin_lock) (t_void * handle, - t_void * plock), - mlan_status(*moal_spin_unlock) (t_void * handle, - t_void * plock)) + pmlan_list_head phead, + mlan_status(*moal_spin_lock) (t_void * handle, + t_void * plock), + mlan_status(*moal_spin_unlock) (t_void * handle, + t_void * plock)) { - pmlan_linked_list pnode; - - if (moal_spin_lock) - moal_spin_lock(pmoal_handle, phead->plock); - pnode = phead->pnext; - if (pnode && (pnode != (pmlan_linked_list) phead)) { - util_unlink_list(pmoal_handle, phead, pnode, 0, 0); - } else { - pnode = 0; - } - if (moal_spin_unlock) - moal_spin_unlock(pmoal_handle, phead->plock); - return pnode; + pmlan_linked_list pnode; + + if (moal_spin_lock) + moal_spin_lock(pmoal_handle, phead->plock); + pnode = phead->pnext; + if (pnode && (pnode != (pmlan_linked_list) phead)) { + util_unlink_list(pmoal_handle, phead, pnode, 0, 0); + } else { + pnode = 0; + } + if (moal_spin_unlock) + moal_spin_unlock(pmoal_handle, phead->plock); + return pnode; } /** Access controlled scalar variable */ typedef struct _mlan_scalar { /** Value */ - t_s32 value; + t_s32 value; /** Pointer to lock */ - t_void *plock; + t_void *plock; /** Control flags */ - t_u32 flags; + t_u32 flags; } mlan_scalar, *pmlan_scalar; /** Flag to scalar lock acquired */ @@ -277,17 +277,17 @@ typedef struct _mlan_scalar /** scalar conditional value list */ typedef enum _MLAN_SCALAR_CONDITIONAL { - MLAN_SCALAR_COND_EQUAL, - MLAN_SCALAR_COND_NOT_EQUAL, - MLAN_SCALAR_COND_GREATER_THAN, - MLAN_SCALAR_COND_GREATER_OR_EQUAL, - MLAN_SCALAR_COND_LESS_THAN, - MLAN_SCALAR_COND_LESS_OR_EQUAL + MLAN_SCALAR_COND_EQUAL, + MLAN_SCALAR_COND_NOT_EQUAL, + MLAN_SCALAR_COND_GREATER_THAN, + MLAN_SCALAR_COND_GREATER_OR_EQUAL, + MLAN_SCALAR_COND_LESS_THAN, + MLAN_SCALAR_COND_LESS_OR_EQUAL } MLAN_SCALAR_CONDITIONAL; -/** +/** * @brief This function initializes a scalar - * + * * @param pscalar Pointer to scalar * @param val Initial scalar value * @param plock_to_use A new lock is created if NULL, else lock to use @@ -297,26 +297,26 @@ typedef enum _MLAN_SCALAR_CONDITIONAL */ static INLINE t_void util_scalar_init(t_void * pmoal_handle, - pmlan_scalar pscalar, - t_s32 val, - t_void * plock_to_use, - mlan_status(*moal_init_lock) (t_void * handle, - t_void ** pplock)) + pmlan_scalar pscalar, + t_s32 val, + t_void * plock_to_use, + mlan_status(*moal_init_lock) (t_void * handle, + t_void ** pplock)) { - pscalar->value = val; - pscalar->flags = 0; - if (plock_to_use) { - pscalar->flags &= ~MLAN_SCALAR_FLAG_UNIQUE_LOCK; - pscalar->plock = plock_to_use; - } else { - pscalar->flags |= MLAN_SCALAR_FLAG_UNIQUE_LOCK; - moal_init_lock(pmoal_handle, &pscalar->plock); - } + pscalar->value = val; + pscalar->flags = 0; + if (plock_to_use) { + pscalar->flags &= ~MLAN_SCALAR_FLAG_UNIQUE_LOCK; + pscalar->plock = plock_to_use; + } else { + pscalar->flags |= MLAN_SCALAR_FLAG_UNIQUE_LOCK; + moal_init_lock(pmoal_handle, &pscalar->plock); + } } -/** +/** * @brief This function frees a scalar - * + * * @param pscalar Pointer to scalar * @param moal_free_lock A pointer to free lock handler * @@ -324,16 +324,16 @@ util_scalar_init(t_void * pmoal_handle, */ static INLINE t_void util_scalar_free(t_void * pmoal_handle, - pmlan_scalar pscalar, - mlan_status(*moal_free_lock) (t_void * handle, t_void * plock)) + pmlan_scalar pscalar, + mlan_status(*moal_free_lock) (t_void * handle, t_void * plock)) { - if (pscalar->flags & MLAN_SCALAR_FLAG_UNIQUE_LOCK) - moal_free_lock(pmoal_handle, &pscalar->plock); + if (pscalar->flags & MLAN_SCALAR_FLAG_UNIQUE_LOCK) + moal_free_lock(pmoal_handle, &pscalar->plock); } -/** +/** * @brief This function reads value from scalar - * + * * @param pscalar Pointer to scalar * @param moal_spin_lock A pointer to spin lock handler * @param moal_spin_unlock A pointer to spin unlock handler @@ -342,25 +342,25 @@ util_scalar_free(t_void * pmoal_handle, */ static INLINE t_s32 util_scalar_read(t_void * pmoal_handle, - pmlan_scalar pscalar, - mlan_status(*moal_spin_lock) (t_void * handle, t_void * plock), - mlan_status(*moal_spin_unlock) (t_void * handle, - t_void * plock)) + pmlan_scalar pscalar, + mlan_status(*moal_spin_lock) (t_void * handle, t_void * plock), + mlan_status(*moal_spin_unlock) (t_void * handle, + t_void * plock)) { - t_s32 val; + t_s32 val; - if (moal_spin_lock) - moal_spin_lock(pmoal_handle, pscalar->plock); - val = pscalar->value; - if (moal_spin_unlock) - moal_spin_unlock(pmoal_handle, pscalar->plock); + if (moal_spin_lock) + moal_spin_lock(pmoal_handle, pscalar->plock); + val = pscalar->value; + if (moal_spin_unlock) + moal_spin_unlock(pmoal_handle, pscalar->plock); - return val; + return val; } -/** +/** * @brief This function writes value to scalar - * + * * @param pscalar Pointer to scalar * @param val Value to write * @param moal_spin_lock A pointer to spin lock handler @@ -370,23 +370,23 @@ util_scalar_read(t_void * pmoal_handle, */ static INLINE t_void util_scalar_write(t_void * pmoal_handle, - pmlan_scalar pscalar, - t_s32 val, - mlan_status(*moal_spin_lock) (t_void * handle, - t_void * plock), - mlan_status(*moal_spin_unlock) (t_void * handle, - t_void * plock)) + pmlan_scalar pscalar, + t_s32 val, + mlan_status(*moal_spin_lock) (t_void * handle, + t_void * plock), + mlan_status(*moal_spin_unlock) (t_void * handle, + t_void * plock)) { - if (moal_spin_lock) - moal_spin_lock(pmoal_handle, pscalar->plock); - pscalar->value = val; - if (moal_spin_unlock) - moal_spin_unlock(pmoal_handle, pscalar->plock); + if (moal_spin_lock) + moal_spin_lock(pmoal_handle, pscalar->plock); + pscalar->value = val; + if (moal_spin_unlock) + moal_spin_unlock(pmoal_handle, pscalar->plock); } -/** +/** * @brief This function increments the value in scalar - * + * * @param pscalar Pointer to scalar * @param moal_spin_lock A pointer to spin lock handler * @param moal_spin_unlock A pointer to spin unlock handler @@ -395,22 +395,22 @@ util_scalar_write(t_void * pmoal_handle, */ static INLINE t_void util_scalar_increment(t_void * pmoal_handle, - pmlan_scalar pscalar, - mlan_status(*moal_spin_lock) (t_void * handle, - t_void * plock), - mlan_status(*moal_spin_unlock) (t_void * handle, - t_void * plock)) + pmlan_scalar pscalar, + mlan_status(*moal_spin_lock) (t_void * handle, + t_void * plock), + mlan_status(*moal_spin_unlock) (t_void * handle, + t_void * plock)) { - if (moal_spin_lock) - moal_spin_lock(pmoal_handle, pscalar->plock); - pscalar->value++; - if (moal_spin_unlock) - moal_spin_unlock(pmoal_handle, pscalar->plock); + if (moal_spin_lock) + moal_spin_lock(pmoal_handle, pscalar->plock); + pscalar->value++; + if (moal_spin_unlock) + moal_spin_unlock(pmoal_handle, pscalar->plock); } -/** +/** * @brief This function decrements the value in scalar - * + * * @param pscalar Pointer to scalar * @param moal_spin_lock A pointer to spin lock handler * @param moal_spin_unlock A pointer to spin unlock handler @@ -419,23 +419,23 @@ util_scalar_increment(t_void * pmoal_handle, */ static INLINE t_void util_scalar_decrement(t_void * pmoal_handle, - pmlan_scalar pscalar, - mlan_status(*moal_spin_lock) (t_void * handle, - t_void * plock), - mlan_status(*moal_spin_unlock) (t_void * handle, - t_void * plock)) + pmlan_scalar pscalar, + mlan_status(*moal_spin_lock) (t_void * handle, + t_void * plock), + mlan_status(*moal_spin_unlock) (t_void * handle, + t_void * plock)) { - if (moal_spin_lock) - moal_spin_lock(pmoal_handle, pscalar->plock); - pscalar->value--; - if (moal_spin_unlock) - moal_spin_unlock(pmoal_handle, pscalar->plock); + if (moal_spin_lock) + moal_spin_lock(pmoal_handle, pscalar->plock); + pscalar->value--; + if (moal_spin_unlock) + moal_spin_unlock(pmoal_handle, pscalar->plock); } -/** +/** * @brief This function adds an offset to the value in scalar, * and returns the new value - * + * * @param pscalar Pointer to scalar * @param offset Offset value (can be negative) * @param moal_spin_lock A pointer to spin lock handler @@ -445,28 +445,28 @@ util_scalar_decrement(t_void * pmoal_handle, */ static INLINE t_s32 util_scalar_offset(t_void * pmoal_handle, - pmlan_scalar pscalar, - t_s32 offset, - mlan_status(*moal_spin_lock) (t_void * handle, - t_void * plock), - mlan_status(*moal_spin_unlock) (t_void * handle, - t_void * plock)) + pmlan_scalar pscalar, + t_s32 offset, + mlan_status(*moal_spin_lock) (t_void * handle, + t_void * plock), + mlan_status(*moal_spin_unlock) (t_void * handle, + t_void * plock)) { - t_s32 newval; + t_s32 newval; - if (moal_spin_lock) - moal_spin_lock(pmoal_handle, pscalar->plock); - newval = (pscalar->value += offset); - if (moal_spin_unlock) - moal_spin_unlock(pmoal_handle, pscalar->plock); + if (moal_spin_lock) + moal_spin_lock(pmoal_handle, pscalar->plock); + newval = (pscalar->value += offset); + if (moal_spin_unlock) + moal_spin_unlock(pmoal_handle, pscalar->plock); - return newval; + return newval; } -/** +/** * @brief This function writes the value to the scalar * if existing value compared with other value is true. - * + * * @param pscalar Pointer to scalar * @param condition Condition to check * @param val_compare Value to compare against current value @@ -479,48 +479,48 @@ util_scalar_offset(t_void * pmoal_handle, */ static INLINE t_u8 util_scalar_conditional_write(t_void * pmoal_handle, - pmlan_scalar pscalar, - MLAN_SCALAR_CONDITIONAL condition, - t_s32 val_compare, - t_s32 val_to_set, - mlan_status(*moal_spin_lock) (t_void * handle, - t_void * plock), - mlan_status(*moal_spin_unlock) (t_void * handle, - t_void * plock)) + pmlan_scalar pscalar, + MLAN_SCALAR_CONDITIONAL condition, + t_s32 val_compare, + t_s32 val_to_set, + mlan_status(*moal_spin_lock) (t_void * handle, + t_void * plock), + mlan_status(*moal_spin_unlock) (t_void * handle, + t_void * plock)) { - t_u8 update; - if (moal_spin_lock) - moal_spin_lock(pmoal_handle, pscalar->plock); - - switch (condition) { - case MLAN_SCALAR_COND_EQUAL: - update = (pscalar->value == val_compare); - break; - case MLAN_SCALAR_COND_NOT_EQUAL: - update = (pscalar->value != val_compare); - break; - case MLAN_SCALAR_COND_GREATER_THAN: - update = (pscalar->value > val_compare); - break; - case MLAN_SCALAR_COND_GREATER_OR_EQUAL: - update = (pscalar->value >= val_compare); - break; - case MLAN_SCALAR_COND_LESS_THAN: - update = (pscalar->value < val_compare); - break; - case MLAN_SCALAR_COND_LESS_OR_EQUAL: - update = (pscalar->value <= val_compare); - break; - default: - update = MFALSE; - break; - } - if (update) - pscalar->value = val_to_set; - - if (moal_spin_unlock) - moal_spin_unlock(pmoal_handle, pscalar->plock); - return (update) ? MTRUE : MFALSE; + t_u8 update; + if (moal_spin_lock) + moal_spin_lock(pmoal_handle, pscalar->plock); + + switch (condition) { + case MLAN_SCALAR_COND_EQUAL: + update = (pscalar->value == val_compare); + break; + case MLAN_SCALAR_COND_NOT_EQUAL: + update = (pscalar->value != val_compare); + break; + case MLAN_SCALAR_COND_GREATER_THAN: + update = (pscalar->value > val_compare); + break; + case MLAN_SCALAR_COND_GREATER_OR_EQUAL: + update = (pscalar->value >= val_compare); + break; + case MLAN_SCALAR_COND_LESS_THAN: + update = (pscalar->value < val_compare); + break; + case MLAN_SCALAR_COND_LESS_OR_EQUAL: + update = (pscalar->value <= val_compare); + break; + default: + update = MFALSE; + break; + } + if (update) + pscalar->value = val_to_set; + + if (moal_spin_unlock) + moal_spin_unlock(pmoal_handle, pscalar->plock); + return (update) ? MTRUE : MFALSE; } #endif /* !_MLAN_UTIL_H_ */ diff --git a/drivers/net/wireless/sd8897/mlan/mlan_wmm.c b/drivers/net/wireless/sd8897/mlan/mlan_wmm.c index 355f6729cc1b..452181014bc1 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_wmm.c +++ b/drivers/net/wireless/sd8897/mlan/mlan_wmm.c @@ -2,7 +2,7 @@ * * @brief This file contains functions for WMM. * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -43,10 +43,10 @@ Change log: /* * Upper and Lower threshold for packet queuing in the driver - + * - When the number of packets queued reaches the upper limit, * the driver will stop the net queue in the app/kernel space. - + * - When the number of packets drops beneath the lower limit after * having reached the upper limit, the driver will restart the net * queue. @@ -69,8 +69,8 @@ Change log: /** WMM information IE */ static const t_u8 wmm_info_ie[] = { WMM_IE, 0x07, - 0x00, 0x50, 0xf2, 0x02, - 0x00, 0x01, 0x00 + 0x00, 0x50, 0xf2, 0x02, + 0x00, 0x01, 0x00 }; /** @@ -79,43 +79,43 @@ static const t_u8 wmm_info_ie[] = { WMM_IE, 0x07, * mapping conversion for wmm AC to priority Queue Index */ static const t_u8 wmm_aci_to_qidx_map[] = { WMM_AC_BE, - WMM_AC_BK, - WMM_AC_VI, - WMM_AC_VO + WMM_AC_BK, + WMM_AC_VI, + WMM_AC_VO }; -/** +/** * This table will be used to store the tid values based on ACs. * It is initialized to default values per TID. */ t_u8 tos_to_tid[] = { - /* TID DSCP_P2 DSCP_P1 DSCP_P0 WMM_AC */ - 0x01, /* 0 1 0 AC_BK */ - 0x02, /* 0 0 0 AC_BK */ - 0x00, /* 0 0 1 AC_BE */ - 0x03, /* 0 1 1 AC_BE */ - 0x04, /* 1 0 0 AC_VI */ - 0x05, /* 1 0 1 AC_VI */ - 0x06, /* 1 1 0 AC_VO */ - 0x07 /* 1 1 1 AC_VO */ + /* TID DSCP_P2 DSCP_P1 DSCP_P0 WMM_AC */ + 0x01, /* 0 1 0 AC_BK */ + 0x02, /* 0 0 0 AC_BK */ + 0x00, /* 0 0 1 AC_BE */ + 0x03, /* 0 1 1 AC_BE */ + 0x04, /* 1 0 0 AC_VI */ + 0x05, /* 1 0 1 AC_VI */ + 0x06, /* 1 1 0 AC_VO */ + 0x07 /* 1 1 1 AC_VO */ }; -/** +/** * This table inverses the tos_to_tid operation to get a priority * which is in sequential order, and can be compared. * Use this to compare the priority of two different TIDs. */ -t_u8 tos_to_tid_inv[] = { 0x02, /* from tos_to_tid[2] = 0 */ - 0x00, /* from tos_to_tid[0] = 1 */ - 0x01, /* from tos_to_tid[1] = 2 */ - 0x03, - 0x04, - 0x05, - 0x06, - 0x07 +t_u8 tos_to_tid_inv[] = { 0x02, /* from tos_to_tid[2] = 0 */ + 0x00, /* from tos_to_tid[0] = 1 */ + 0x01, /* from tos_to_tid[1] = 2 */ + 0x03, + 0x04, + 0x05, + 0x06, + 0x07 }; -/** +/** * This table will provide the tid value for given ac. This table does not * change and will be used to copy back the default values to tos_to_tid in * case of disconnect. @@ -124,17 +124,17 @@ const t_u8 ac_to_tid[4][2] = { {1, 2}, {0, 3}, {4, 5}, {6, 7} }; /* Map of TOS UP values to WMM AC */ static const mlan_wmm_ac_e tos_to_ac[] = { WMM_AC_BE, - WMM_AC_BK, - WMM_AC_BK, - WMM_AC_BE, - WMM_AC_VI, - WMM_AC_VI, - WMM_AC_VO, - WMM_AC_VO + WMM_AC_BK, + WMM_AC_BK, + WMM_AC_BE, + WMM_AC_VI, + WMM_AC_VI, + WMM_AC_VO, + WMM_AC_VO }; raListTbl *wlan_wmm_get_ralist_node(pmlan_private priv, t_u8 tid, - t_u8 * ra_addr); + t_u8 * ra_addr); /******************************************************** Local Functions @@ -150,18 +150,19 @@ raListTbl *wlan_wmm_get_ralist_node(pmlan_private priv, t_u8 tid, static void wlan_wmm_ac_debug_print(const IEEEtypes_WmmAcParameters_t * pac_param) { - const char *ac_str[] = { "BK", "BE", "VI", "VO" }; + const char *ac_str[] = { "BK", "BE", "VI", "VO" }; - ENTER(); + ENTER(); - PRINTM(MINFO, "WMM AC_%s: ACI=%d, ACM=%d, Aifsn=%d, " - "EcwMin=%d, EcwMax=%d, TxopLimit=%d\n", - ac_str[wmm_aci_to_qidx_map[pac_param->aci_aifsn.aci]], - pac_param->aci_aifsn.aci, pac_param->aci_aifsn.acm, - pac_param->aci_aifsn.aifsn, pac_param->ecw.ecw_min, - pac_param->ecw.ecw_max, wlan_le16_to_cpu(pac_param->tx_op_limit)); + PRINTM(MINFO, "WMM AC_%s: ACI=%d, ACM=%d, Aifsn=%d, " + "EcwMin=%d, EcwMax=%d, TxopLimit=%d\n", + ac_str[wmm_aci_to_qidx_map[pac_param->aci_aifsn.aci]], + pac_param->aci_aifsn.aci, pac_param->aci_aifsn.acm, + pac_param->aci_aifsn.aifsn, pac_param->ecw.ecw_min, + pac_param->ecw.ecw_max, + wlan_le16_to_cpu(pac_param->tx_op_limit)); - LEAVE(); + LEAVE(); } /** Print the WMM AC for debug purpose */ @@ -182,33 +183,33 @@ wlan_wmm_ac_debug_print(const IEEEtypes_WmmAcParameters_t * pac_param) static raListTbl * wlan_wmm_allocate_ralist_node(pmlan_adapter pmadapter, t_u8 * ra) { - raListTbl *ra_list = MNULL; - - ENTER(); - - if (pmadapter->callbacks. - moal_malloc(pmadapter->pmoal_handle, sizeof(raListTbl), MLAN_MEM_DEF, - (t_u8 **) & ra_list)) { - PRINTM(MERROR, "Fail to allocate ra_list\n"); - goto done; - } - util_init_list((pmlan_linked_list) ra_list); - util_init_list_head((t_void *) pmadapter->pmoal_handle, - &ra_list->buf_head, MFALSE, - pmadapter->callbacks.moal_init_lock); - - memcpy(pmadapter, ra_list->ra, ra, MLAN_MAC_ADDR_LENGTH); - - ra_list->total_pkts = 0; - ra_list->tx_pause = 0; - PRINTM(MINFO, "RAList: Allocating buffers for TID %p\n", ra_list); - done: - LEAVE(); - return ra_list; + raListTbl *ra_list = MNULL; + + ENTER(); + + if (pmadapter->callbacks. + moal_malloc(pmadapter->pmoal_handle, sizeof(raListTbl), + MLAN_MEM_DEF, (t_u8 **) & ra_list)) { + PRINTM(MERROR, "Fail to allocate ra_list\n"); + goto done; + } + util_init_list((pmlan_linked_list) ra_list); + util_init_list_head((t_void *) pmadapter->pmoal_handle, + &ra_list->buf_head, MFALSE, + pmadapter->callbacks.moal_init_lock); + + memcpy(pmadapter, ra_list->ra, ra, MLAN_MAC_ADDR_LENGTH); + + ra_list->total_pkts = 0; + ra_list->tx_pause = 0; + PRINTM(MINFO, "RAList: Allocating buffers for TID %p\n", ra_list); +done: + LEAVE(); + return ra_list; } /** - * @brief Map ACs to TID + * @brief Map ACs to TID * * @param priv Pointer to the mlan_private driver data struct * @param queue_priority Queue_priority structure @@ -218,28 +219,28 @@ wlan_wmm_allocate_ralist_node(pmlan_adapter pmadapter, t_u8 * ra) static void wlan_wmm_queue_priorities_tid(pmlan_private priv, t_u8 queue_priority[]) { - int i; + int i; - ENTER(); + ENTER(); - for (i = 0; i < 4; ++i) { - tos_to_tid[7 - (i * 2)] = ac_to_tid[queue_priority[i]][1]; - tos_to_tid[6 - (i * 2)] = ac_to_tid[queue_priority[i]][0]; - } + for (i = 0; i < 4; ++i) { + tos_to_tid[7 - (i * 2)] = ac_to_tid[queue_priority[i]][1]; + tos_to_tid[6 - (i * 2)] = ac_to_tid[queue_priority[i]][0]; + } - for (i = 0; i < MAX_NUM_TID; i++) { - tos_to_tid_inv[tos_to_tid[i]] = (t_u8) i; - } + for (i = 0; i < MAX_NUM_TID; i++) { + tos_to_tid_inv[tos_to_tid[i]] = (t_u8) i; + } - /* in case priorities have changed, force highest priority so next packet - will check from top to re-establish the highest */ - util_scalar_write(priv->adapter->pmoal_handle, - &priv->wmm.highest_queued_prio, - HIGH_PRIO_TID, - priv->adapter->callbacks.moal_spin_lock, - priv->adapter->callbacks.moal_spin_unlock); + /* in case priorities have changed, force highest priority so next + packet will check from top to re-establish the highest */ + util_scalar_write(priv->adapter->pmoal_handle, + &priv->wmm.highest_queued_prio, + HIGH_PRIO_TID, + priv->adapter->callbacks.moal_spin_lock, + priv->adapter->callbacks.moal_spin_unlock); - LEAVE(); + LEAVE(); } /** @@ -253,40 +254,41 @@ wlan_wmm_queue_priorities_tid(pmlan_private priv, t_u8 queue_priority[]) static mlan_wmm_ac_e wlan_wmm_eval_downgrade_ac(pmlan_private priv, mlan_wmm_ac_e eval_ac) { - int down_ac; - mlan_wmm_ac_e ret_ac; - WmmAcStatus_t *pac_status; - - ENTER(); - - pac_status = &priv->wmm.ac_status[eval_ac]; - - if (pac_status->disabled == MFALSE) { - LEAVE(); - /* Okay to use this AC, its enabled */ - return eval_ac; - } - - /* Setup a default return value of the lowest priority */ - ret_ac = WMM_AC_BK; - - /* - * Find the highest AC that is enabled and does not require admission - * control. The spec disallows downgrading to an AC, which is enabled - * due to a completed admission control. Unadmitted traffic is not - * to be sent on an AC with admitted traffic. - */ - for (down_ac = WMM_AC_BK; down_ac < eval_ac; down_ac++) { - pac_status = &priv->wmm.ac_status[down_ac]; - - if ((pac_status->disabled == MFALSE) - && (pac_status->flow_required == MFALSE)) - /* AC is enabled and does not require admission control */ - ret_ac = (mlan_wmm_ac_e) down_ac; - } - - LEAVE(); - return ret_ac; + int down_ac; + mlan_wmm_ac_e ret_ac; + WmmAcStatus_t *pac_status; + + ENTER(); + + pac_status = &priv->wmm.ac_status[eval_ac]; + + if (pac_status->disabled == MFALSE) { + LEAVE(); + /* Okay to use this AC, its enabled */ + return eval_ac; + } + + /* Setup a default return value of the lowest priority */ + ret_ac = WMM_AC_BK; + + /* + * Find the highest AC that is enabled and does not require admission + * control. The spec disallows downgrading to an AC, which is enabled + * due to a completed admission control. Unadmitted traffic is not + * to be sent on an AC with admitted traffic. + */ + for (down_ac = WMM_AC_BK; down_ac < eval_ac; down_ac++) { + pac_status = &priv->wmm.ac_status[down_ac]; + + if ((pac_status->disabled == MFALSE) + && (pac_status->flow_required == MFALSE)) + /* AC is enabled and does not require admission control + */ + ret_ac = (mlan_wmm_ac_e) down_ac; + } + + LEAVE(); + return ret_ac; } /** @@ -300,15 +302,15 @@ wlan_wmm_eval_downgrade_ac(pmlan_private priv, mlan_wmm_ac_e eval_ac) static mlan_wmm_ac_e INLINE wlan_wmm_convert_tos_to_ac(pmlan_adapter pmadapter, t_u32 tos) { - ENTER(); + ENTER(); - if (tos >= NELEMENTS(tos_to_ac)) { - LEAVE(); - return WMM_AC_BE; - } + if (tos >= NELEMENTS(tos_to_ac)) { + LEAVE(); + return WMM_AC_BE; + } - LEAVE(); - return tos_to_ac[tos]; + LEAVE(); + return tos_to_ac[tos]; } /** @@ -326,25 +328,25 @@ wlan_wmm_convert_tos_to_ac(pmlan_adapter pmadapter, t_u32 tos) static t_u8 INLINE wlan_wmm_downgrade_tid(pmlan_private priv, t_u32 tid) { - mlan_wmm_ac_e ac_down; - pmlan_adapter pmadapter = priv->adapter; - - ENTER(); - - ac_down = - priv->wmm.ac_down_graded_vals[wlan_wmm_convert_tos_to_ac(pmadapter, - tid)]; - LEAVE(); - /* - * Send the index to tid array, picking from the array will be - * taken care by dequeuing function - */ - if (tid == 1 || tid == 2) - return ac_to_tid[ac_down][(tid + 1) % 2]; - else if (tid >= MAX_NUM_TID) - return ac_to_tid[ac_down][0]; - else - return ac_to_tid[ac_down][tid % 2]; + mlan_wmm_ac_e ac_down; + pmlan_adapter pmadapter = priv->adapter; + + ENTER(); + + ac_down = + priv->wmm. + ac_down_graded_vals[wlan_wmm_convert_tos_to_ac(pmadapter, tid)]; + LEAVE(); + /* + * Send the index to tid array, picking from the array will be + * taken care by dequeuing function + */ + if (tid == 1 || tid == 2) + return ac_to_tid[ac_down][(tid + 1) % 2]; + else if (tid >= MAX_NUM_TID) + return ac_to_tid[ac_down][0]; + else + return ac_to_tid[ac_down][tid % 2]; } /** @@ -358,21 +360,23 @@ wlan_wmm_downgrade_tid(pmlan_private priv, t_u32 tid) static INLINE void wlan_wmm_del_pkts_in_ralist_node(pmlan_private priv, raListTbl * ra_list) { - pmlan_buffer pmbuf; - pmlan_adapter pmadapter = priv->adapter; - - ENTER(); - while ((pmbuf = - (pmlan_buffer) util_peek_list(pmadapter->pmoal_handle, - &ra_list->buf_head, MNULL, MNULL))) { - util_unlink_list(pmadapter->pmoal_handle, &ra_list->buf_head, - (pmlan_linked_list) pmbuf, MNULL, MNULL); - wlan_write_data_complete(pmadapter, pmbuf, MLAN_STATUS_FAILURE); - } - util_free_list_head((t_void *) pmadapter->pmoal_handle, &ra_list->buf_head, - pmadapter->callbacks.moal_free_lock); - - LEAVE(); + pmlan_buffer pmbuf; + pmlan_adapter pmadapter = priv->adapter; + + ENTER(); + while ((pmbuf = + (pmlan_buffer) util_peek_list(pmadapter->pmoal_handle, + &ra_list->buf_head, MNULL, + MNULL))) { + util_unlink_list(pmadapter->pmoal_handle, &ra_list->buf_head, + (pmlan_linked_list) pmbuf, MNULL, MNULL); + wlan_write_data_complete(pmadapter, pmbuf, MLAN_STATUS_FAILURE); + } + util_free_list_head((t_void *) pmadapter->pmoal_handle, + &ra_list->buf_head, + pmadapter->callbacks.moal_free_lock); + + LEAVE(); } /** @@ -386,21 +390,21 @@ wlan_wmm_del_pkts_in_ralist_node(pmlan_private priv, raListTbl * ra_list) static INLINE void wlan_wmm_del_pkts_in_ralist(pmlan_private priv, mlan_list_head * ra_list_head) { - raListTbl *ra_list; + raListTbl *ra_list; - ENTER(); + ENTER(); - ra_list = - (raListTbl *) util_peek_list(priv->adapter->pmoal_handle, ra_list_head, - MNULL, MNULL); + ra_list = + (raListTbl *) util_peek_list(priv->adapter->pmoal_handle, + ra_list_head, MNULL, MNULL); - while (ra_list && ra_list != (raListTbl *) ra_list_head) { - wlan_wmm_del_pkts_in_ralist_node(priv, ra_list); + while (ra_list && ra_list != (raListTbl *) ra_list_head) { + wlan_wmm_del_pkts_in_ralist_node(priv, ra_list); - ra_list = ra_list->pnext; - } + ra_list = ra_list->pnext; + } - LEAVE(); + LEAVE(); } /** @@ -413,21 +417,22 @@ wlan_wmm_del_pkts_in_ralist(pmlan_private priv, mlan_list_head * ra_list_head) static void wlan_wmm_cleanup_queues(pmlan_private priv) { - int i; - - ENTER(); - - for (i = 0; i < MAX_NUM_TID; i++) { - wlan_wmm_del_pkts_in_ralist(priv, &priv->wmm.tid_tbl_ptr[i].ra_list); - priv->wmm.pkts_queued[i] = 0; - } - util_scalar_write(priv->adapter->pmoal_handle, &priv->wmm.tx_pkts_queued, 0, - MNULL, MNULL); - util_scalar_write(priv->adapter->pmoal_handle, - &priv->wmm.highest_queued_prio, HIGH_PRIO_TID, MNULL, - MNULL); - - LEAVE(); + int i; + + ENTER(); + + for (i = 0; i < MAX_NUM_TID; i++) { + wlan_wmm_del_pkts_in_ralist(priv, + &priv->wmm.tid_tbl_ptr[i].ra_list); + priv->wmm.pkts_queued[i] = 0; + } + util_scalar_write(priv->adapter->pmoal_handle, + &priv->wmm.tx_pkts_queued, 0, MNULL, MNULL); + util_scalar_write(priv->adapter->pmoal_handle, + &priv->wmm.highest_queued_prio, HIGH_PRIO_TID, MNULL, + MNULL); + + LEAVE(); } /** @@ -440,72 +445,74 @@ wlan_wmm_cleanup_queues(pmlan_private priv) static void wlan_wmm_delete_all_ralist(pmlan_private priv) { - raListTbl *ra_list; - int i; - pmlan_adapter pmadapter = priv->adapter; - - ENTER(); - - for (i = 0; i < MAX_NUM_TID; ++i) { - PRINTM(MINFO, "RAList: Freeing buffers for TID %d\n", i); - while ((ra_list = (raListTbl *) util_peek_list(pmadapter->pmoal_handle, - &priv->wmm. - tid_tbl_ptr[i].ra_list, - MNULL, MNULL))) { - util_unlink_list(pmadapter->pmoal_handle, - &priv->wmm.tid_tbl_ptr[i].ra_list, - (pmlan_linked_list) ra_list, MNULL, MNULL); - - pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, - (t_u8 *) ra_list); - } - - util_init_list((pmlan_linked_list) - & priv->wmm.tid_tbl_ptr[i].ra_list); - priv->wmm.tid_tbl_ptr[i].ra_list_curr = MNULL; - } - - LEAVE(); + raListTbl *ra_list; + int i; + pmlan_adapter pmadapter = priv->adapter; + + ENTER(); + + for (i = 0; i < MAX_NUM_TID; ++i) { + PRINTM(MINFO, "RAList: Freeing buffers for TID %d\n", i); + while ((ra_list = + (raListTbl *) util_peek_list(pmadapter->pmoal_handle, + &priv->wmm.tid_tbl_ptr[i]. + ra_list, MNULL, MNULL))) { + util_unlink_list(pmadapter->pmoal_handle, + &priv->wmm.tid_tbl_ptr[i].ra_list, + (pmlan_linked_list) ra_list, MNULL, + MNULL); + + pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) ra_list); + } + + util_init_list((pmlan_linked_list) + & priv->wmm.tid_tbl_ptr[i].ra_list); + priv->wmm.tid_tbl_ptr[i].ra_list_curr = MNULL; + } + + LEAVE(); } /** * @brief Get queue RA pointer - * + * * @param priv Pointer to the mlan_private driver data struct * @param tid TID * @param ra_addr Pointer to the route address - * + * * @return ra_list */ static raListTbl * wlan_wmm_get_queue_raptr(pmlan_private priv, t_u8 tid, t_u8 * ra_addr) { - raListTbl *ra_list; + raListTbl *ra_list; #if defined(UAP_SUPPORT) - t_u8 bcast_addr[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + t_u8 bcast_addr[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; #endif - ENTER(); - ra_list = wlan_wmm_get_ralist_node(priv, tid, ra_addr); - if (ra_list) { - LEAVE(); - return ra_list; - } + ENTER(); + ra_list = wlan_wmm_get_ralist_node(priv, tid, ra_addr); + if (ra_list) { + LEAVE(); + return ra_list; + } #if defined(UAP_SUPPORT) - if ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) && - (0 != memcmp(priv->adapter, ra_addr, bcast_addr, sizeof(bcast_addr)))) { - if (MNULL == wlan_get_station_entry(priv, ra_addr)) { - PRINTM(MDATA, "Drop packets to unknown station\n"); - LEAVE(); - return MNULL; - } - } + if ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) && + (0 != + memcmp(priv->adapter, ra_addr, bcast_addr, sizeof(bcast_addr)))) { + if (MNULL == wlan_get_station_entry(priv, ra_addr)) { + PRINTM(MDATA, "Drop packets to unknown station\n"); + LEAVE(); + return MNULL; + } + } #endif - wlan_ralist_add(priv, ra_addr); + wlan_ralist_add(priv, ra_addr); - ra_list = wlan_wmm_get_ralist_node(priv, tid, ra_addr); - LEAVE(); - return ra_list; + ra_list = wlan_wmm_get_ralist_node(priv, tid, ra_addr); + LEAVE(); + return ra_list; } #ifdef STA_SUPPORT @@ -523,64 +530,64 @@ wlan_wmm_get_queue_raptr(pmlan_private priv, t_u8 tid, t_u8 * ra_addr) */ static void wlan_send_wmmac_host_event(pmlan_private priv, - char *typeStr, - t_u8 * srcAddr, t_u8 tid, t_u8 up, t_u8 status) + char *typeStr, + t_u8 * srcAddr, t_u8 tid, t_u8 up, t_u8 status) { - t_u8 event_buf[100]; - mlan_event *pevent; - t_u8 *pOutBuf; + t_u8 event_buf[100]; + mlan_event *pevent; + t_u8 *pOutBuf; - ENTER(); + ENTER(); - /* Format one of the following two output strings: ** - - TSPEC:ADDTS_RSP:[<status code>]:TID=X:UP=Y ** - TSPEC:DELTS_RX:[<reason - code>]:TID=X:UP=Y */ - pevent = (mlan_event *) event_buf; - pOutBuf = pevent->event_buf; + /* Format one of the following two output strings: ** - + TSPEC:ADDTS_RSP:[<status code>]:TID=X:UP=Y ** - + TSPEC:DELTS_RX:[<reason code>]:TID=X:UP=Y */ + pevent = (mlan_event *) event_buf; + pOutBuf = pevent->event_buf; - memcpy(priv->adapter, pOutBuf, (t_u8 *) "TSPEC:", 6); - pOutBuf += 6; + memcpy(priv->adapter, pOutBuf, (t_u8 *) "TSPEC:", 6); + pOutBuf += 6; - memcpy(priv->adapter, pOutBuf, (t_u8 *) typeStr, wlan_strlen(typeStr)); - pOutBuf += wlan_strlen(typeStr); + memcpy(priv->adapter, pOutBuf, (t_u8 *) typeStr, wlan_strlen(typeStr)); + pOutBuf += wlan_strlen(typeStr); - *pOutBuf++ = ':'; - *pOutBuf++ = '['; + *pOutBuf++ = ':'; + *pOutBuf++ = '['; - if (status >= 100) { - *pOutBuf++ = (status / 100) + '0'; - status = (status % 100); - } + if (status >= 100) { + *pOutBuf++ = (status / 100) + '0'; + status = (status % 100); + } - if (status >= 10) { - *pOutBuf++ = (status / 10) + '0'; - status = (status % 10); - } + if (status >= 10) { + *pOutBuf++ = (status / 10) + '0'; + status = (status % 10); + } - *pOutBuf++ = status + '0'; + *pOutBuf++ = status + '0'; - memcpy(priv->adapter, pOutBuf, (t_u8 *) "]:TID", 5); - pOutBuf += 5; - *pOutBuf++ = tid + '0'; + memcpy(priv->adapter, pOutBuf, (t_u8 *) "]:TID", 5); + pOutBuf += 5; + *pOutBuf++ = tid + '0'; - memcpy(priv->adapter, pOutBuf, (t_u8 *) ":UP", 3); - pOutBuf += 3; - *pOutBuf++ = up + '0'; + memcpy(priv->adapter, pOutBuf, (t_u8 *) ":UP", 3); + pOutBuf += 3; + *pOutBuf++ = up + '0'; - *pOutBuf = '\0'; + *pOutBuf = '\0'; - pevent->bss_index = priv->bss_index; - pevent->event_id = MLAN_EVENT_ID_DRV_REPORT_STRING; - pevent->event_len = wlan_strlen((const char *) (pevent->event_buf)); + pevent->bss_index = priv->bss_index; + pevent->event_id = MLAN_EVENT_ID_DRV_REPORT_STRING; + pevent->event_len = wlan_strlen((const char *)(pevent->event_buf)); - wlan_recv_event(priv, MLAN_EVENT_ID_DRV_REPORT_STRING, pevent); - LEAVE(); + wlan_recv_event(priv, MLAN_EVENT_ID_DRV_REPORT_STRING, pevent); + LEAVE(); } #endif /* STA_SUPPORT */ /** * @brief This function gets the highest priority list pointer - * + * * @param pmadapter A pointer to mlan_adapter * @param priv A pointer to mlan_private * @param tid A pointer to return tid @@ -589,130 +596,160 @@ wlan_send_wmmac_host_event(pmlan_private priv, */ static raListTbl * wlan_wmm_get_highest_priolist_ptr(pmlan_adapter pmadapter, - pmlan_private * priv, int *tid) + pmlan_private * priv, int *tid) { - pmlan_private priv_tmp; - raListTbl *ptr, *head; - mlan_bssprio_node *bssprio_node, *bssprio_head; - tid_tbl_t *tid_ptr; - int i, j; - int next_prio = 0; - int next_tid = 0; - ENTER(); - - PRINTM(MDAT_D, "POP\n"); - for (j = pmadapter->priv_num - 1; j >= 0; --j) { - if (!(util_peek_list(pmadapter->pmoal_handle, - &pmadapter->bssprio_tbl[j].bssprio_head, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock))) - continue; - - if (pmadapter->bssprio_tbl[j].bssprio_cur == (mlan_bssprio_node *) - & pmadapter->bssprio_tbl[j].bssprio_head) { - pmadapter->bssprio_tbl[j].bssprio_cur = - pmadapter->bssprio_tbl[j].bssprio_cur->pnext; - } - - bssprio_head = bssprio_node = pmadapter->bssprio_tbl[j].bssprio_cur; - - do { - priv_tmp = bssprio_node->priv; - - if ((priv_tmp->port_ctrl_mode == MTRUE) - && (priv_tmp->port_open == MFALSE)) { - PRINTM(MINFO, "get_highest_prio_ptr(): " - "PORT_CLOSED Ignore pkts from BSS%d\n", - priv_tmp->bss_index); - /* Ignore data pkts from a BSS if port is closed */ - goto next_intf; - } - - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv_tmp->wmm.ra_list_spinlock); - - for (i = util_scalar_read(pmadapter->pmoal_handle, - &priv_tmp->wmm.highest_queued_prio, - MNULL, MNULL); i >= LOW_PRIO_TID; --i) { - - tid_ptr = &(priv_tmp)->wmm.tid_tbl_ptr[tos_to_tid[i]]; - if (!util_peek_list - (pmadapter->pmoal_handle, &tid_ptr->ra_list, MNULL, MNULL)) - continue; - - /* - * Always choose the next ra we transmitted - * last time, this way we pick the ra's in - * round robin fashion. - */ - head = ptr = tid_ptr->ra_list_curr->pnext; - if (ptr == (raListTbl *) & tid_ptr->ra_list) - head = ptr = ptr->pnext; - - do { - if (!ptr->tx_pause && - util_peek_list(pmadapter->pmoal_handle, &ptr->buf_head, - MNULL, MNULL)) { - - /* Because WMM only support BK/BE/VI/VO, we have 8 tid - We should balance the traffic of the same AC */ - if (i % 2) - next_prio = i - 1; - else - next_prio = i + 1; - next_tid = tos_to_tid[next_prio]; - if (priv_tmp->wmm.pkts_queued[next_tid]) - util_scalar_write(pmadapter->pmoal_handle, - &priv_tmp->wmm. - highest_queued_prio, next_prio, - MNULL, MNULL); - else - /* if highest_queued_prio > i, set it to i */ - util_scalar_conditional_write(pmadapter-> - pmoal_handle, - &priv_tmp->wmm. - highest_queued_prio, - MLAN_SCALAR_COND_GREATER_THAN, - i, i, MNULL, MNULL); - *priv = priv_tmp; - *tid = tos_to_tid[i]; - /* hold priv->ra_list_spinlock to maintain ptr */ - PRINTM(MDAT_D, "get highest prio ptr %p, tid %d\n", - ptr, *tid); - LEAVE(); - return ptr; - } - - if ((ptr = ptr->pnext) == (raListTbl *) & tid_ptr->ra_list) - ptr = ptr->pnext; - } while (ptr != head); - } - - /* No packet at any TID for this priv. Mark as such to skip - checking TIDs for this priv (until pkt is added). */ - util_scalar_write(pmadapter->pmoal_handle, - &priv_tmp->wmm.highest_queued_prio, - NO_PKT_PRIO_TID, MNULL, MNULL); - - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv_tmp->wmm. - ra_list_spinlock); - - next_intf: - if ((bssprio_node = bssprio_node->pnext) == (mlan_bssprio_node *) - & pmadapter->bssprio_tbl[j].bssprio_head) - bssprio_node = bssprio_node->pnext; - pmadapter->bssprio_tbl[j].bssprio_cur = bssprio_node; - } while (bssprio_node != bssprio_head); - } - - LEAVE(); - return MNULL; + pmlan_private priv_tmp; + raListTbl *ptr, *head; + mlan_bssprio_node *bssprio_node, *bssprio_head; + tid_tbl_t *tid_ptr; + int i, j; + int next_prio = 0; + int next_tid = 0; + ENTER(); + + PRINTM(MDAT_D, "POP\n"); + for (j = pmadapter->priv_num - 1; j >= 0; --j) { + if (!(util_peek_list(pmadapter->pmoal_handle, + &pmadapter->bssprio_tbl[j].bssprio_head, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock))) + continue; + + if (pmadapter->bssprio_tbl[j].bssprio_cur == + (mlan_bssprio_node *) + & pmadapter->bssprio_tbl[j].bssprio_head) { + pmadapter->bssprio_tbl[j].bssprio_cur = + pmadapter->bssprio_tbl[j].bssprio_cur->pnext; + } + + bssprio_head + = bssprio_node = pmadapter->bssprio_tbl[j].bssprio_cur; + + do { + priv_tmp = bssprio_node->priv; + + if ((priv_tmp->port_ctrl_mode == MTRUE) + && (priv_tmp->port_open == MFALSE)) { + PRINTM(MINFO, "get_highest_prio_ptr(): " + "PORT_CLOSED Ignore pkts from BSS%d\n", + priv_tmp->bss_index); + /* Ignore data pkts from a BSS if port is + closed */ + goto next_intf; + } + + pmadapter->callbacks.moal_spin_lock(pmadapter-> + pmoal_handle, + priv_tmp->wmm. + ra_list_spinlock); + + for (i = util_scalar_read(pmadapter->pmoal_handle, + &priv_tmp->wmm. + highest_queued_prio, MNULL, + MNULL); i >= LOW_PRIO_TID; + --i) { + + tid_ptr = + &(priv_tmp)->wmm. + tid_tbl_ptr[tos_to_tid[i]]; + if (!util_peek_list + (pmadapter->pmoal_handle, &tid_ptr->ra_list, + MNULL, MNULL)) + continue; + + /* + * Always choose the next ra we transmitted + * last time, this way we pick the ra's in + * round robin fashion. + */ + head = ptr = tid_ptr->ra_list_curr->pnext; + if (ptr == (raListTbl *) & tid_ptr->ra_list) + head = ptr = ptr->pnext; + + do { + if (!ptr->tx_pause && + util_peek_list(pmadapter-> + pmoal_handle, + &ptr->buf_head, + MNULL, MNULL)) { + + /* Because WMM only support + BK/BE/VI/VO, we have 8 tid + We should balance the + traffic of the same AC */ + if (i % 2) + next_prio = i - 1; + else + next_prio = i + 1; + next_tid = + tos_to_tid[next_prio]; + if (priv_tmp->wmm. + pkts_queued[next_tid]) + util_scalar_write + (pmadapter-> + pmoal_handle, + &priv_tmp->wmm. + highest_queued_prio, + next_prio, + MNULL, MNULL); + else + /* if + highest_queued_prio + > i, set it to i */ + util_scalar_conditional_write + (pmadapter-> + pmoal_handle, + &priv_tmp->wmm. + highest_queued_prio, + MLAN_SCALAR_COND_GREATER_THAN, + i, i, MNULL, + MNULL); + *priv = priv_tmp; + *tid = tos_to_tid[i]; + /* hold priv->ra_list_spinlock + to maintain ptr */ + PRINTM(MDAT_D, + "get highest prio ptr %p, tid %d\n", + ptr, *tid); + LEAVE(); + return ptr; + } + + if ((ptr = + ptr->pnext) == + (raListTbl *) & tid_ptr->ra_list) + ptr = ptr->pnext; + } while (ptr != head); + } + + /* No packet at any TID for this priv. Mark as such to + skip checking TIDs for this priv (until pkt is + added). */ + util_scalar_write(pmadapter->pmoal_handle, + &priv_tmp->wmm.highest_queued_prio, + NO_PKT_PRIO_TID, MNULL, MNULL); + + pmadapter->callbacks.moal_spin_unlock(pmadapter-> + pmoal_handle, + priv_tmp->wmm. + ra_list_spinlock); + +next_intf: + if ((bssprio_node = bssprio_node->pnext) == + (mlan_bssprio_node *) + & pmadapter->bssprio_tbl[j].bssprio_head) + bssprio_node = bssprio_node->pnext; + pmadapter->bssprio_tbl[j].bssprio_cur = bssprio_node; + } while (bssprio_node != bssprio_head); + } + + LEAVE(); + return MNULL; } /** * @brief This function gets the number of packets in the Tx queue - * + * * @param priv A pointer to mlan_private * @param ptr A pointer to RA list table * @param maxBufSize Maximum buffer size @@ -722,28 +759,28 @@ wlan_wmm_get_highest_priolist_ptr(pmlan_adapter pmadapter, static int wlan_num_pkts_in_txq(mlan_private * priv, raListTbl * ptr, int maxBufSize) { - int count = 0, total_size = 0; - pmlan_buffer pmbuf; + int count = 0, total_size = 0; + pmlan_buffer pmbuf; - ENTER(); + ENTER(); - for (pmbuf = (pmlan_buffer) ptr->buf_head.pnext; - pmbuf != (pmlan_buffer) (&ptr->buf_head); pmbuf = pmbuf->pnext) { + for (pmbuf = (pmlan_buffer) ptr->buf_head.pnext; + pmbuf != (pmlan_buffer) (&ptr->buf_head); pmbuf = pmbuf->pnext) { - total_size += pmbuf->data_len; - if (total_size < maxBufSize) - ++count; - else - break; - } + total_size += pmbuf->data_len; + if (total_size < maxBufSize) + ++count; + else + break; + } - LEAVE(); - return count; + LEAVE(); + return count; } /** * @brief This function sends a single packet - * + * * @param priv A pointer to mlan_private * @param ptr A pointer to RA list table * @param ptrindex ptr's TID index @@ -753,80 +790,101 @@ wlan_num_pkts_in_txq(mlan_private * priv, raListTbl * ptr, int maxBufSize) static void INLINE wlan_send_single_packet(pmlan_private priv, raListTbl * ptr, int ptrindex) { - pmlan_buffer pmbuf; - pmlan_buffer pmbuf_next; - mlan_tx_param tx_param; - pmlan_adapter pmadapter = priv->adapter; - mlan_status status = MLAN_STATUS_SUCCESS; - - ENTER(); - - if ((pmbuf = (pmlan_buffer) util_dequeue_list(pmadapter->pmoal_handle, - &ptr->buf_head, - MNULL, MNULL))) { - PRINTM(MINFO, "Dequeuing the packet %p %p\n", ptr, pmbuf); - priv->wmm.pkts_queued[ptrindex]--; - util_scalar_decrement(pmadapter->pmoal_handle, - &priv->wmm.tx_pkts_queued, MNULL, MNULL); - ptr->total_pkts--; - pmbuf_next = (pmlan_buffer) util_peek_list(pmadapter->pmoal_handle, - &ptr->buf_head, - MNULL, MNULL); - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - - tx_param.next_pkt_len = ((pmbuf_next) - ? pmbuf_next->data_len + sizeof(TxPD) : 0); - status = wlan_process_tx(priv, pmbuf, &tx_param); - - if (status == MLAN_STATUS_RESOURCE) { - /** Queue the packet back at the head */ - PRINTM(MDAT_D, "Queuing pkt back to raList %p %p\n", ptr, pmbuf); - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - - if (!wlan_is_ralist_valid(priv, ptr, ptrindex)) { - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm. - ra_list_spinlock); - wlan_write_data_complete(pmadapter, pmbuf, MLAN_STATUS_FAILURE); - LEAVE(); - return; - } - priv->wmm.pkts_queued[ptrindex]++; - util_scalar_increment(pmadapter->pmoal_handle, - &priv->wmm.tx_pkts_queued, MNULL, MNULL); - util_enqueue_list_head(pmadapter->pmoal_handle, &ptr->buf_head, - (pmlan_linked_list) pmbuf, MNULL, MNULL); - - ptr->total_pkts++; - pmbuf->flags |= MLAN_BUF_FLAG_REQUEUED_PKT; - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - } else { - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - if (wlan_is_ralist_valid(priv, ptr, ptrindex)) { - priv->wmm.packets_out[ptrindex]++; - priv->wmm.tid_tbl_ptr[ptrindex].ra_list_curr = ptr; - } - pmadapter->bssprio_tbl[priv->bss_priority].bssprio_cur = - pmadapter->bssprio_tbl[priv->bss_priority].bssprio_cur->pnext; - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - } - } else { - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - PRINTM(MINFO, "Nothing to send\n"); - } - - LEAVE(); + pmlan_buffer pmbuf; + pmlan_buffer pmbuf_next; + mlan_tx_param tx_param; + pmlan_adapter pmadapter = priv->adapter; + mlan_status status = MLAN_STATUS_SUCCESS; + + ENTER(); + + if ((pmbuf = (pmlan_buffer) util_dequeue_list(pmadapter->pmoal_handle, + &ptr->buf_head, + MNULL, MNULL))) { + PRINTM(MINFO, "Dequeuing the packet %p %p\n", ptr, pmbuf); + priv->wmm.pkts_queued[ptrindex]--; + util_scalar_decrement(pmadapter->pmoal_handle, + &priv->wmm.tx_pkts_queued, MNULL, MNULL); + ptr->total_pkts--; + pmbuf_next = + (pmlan_buffer) util_peek_list(pmadapter->pmoal_handle, + &ptr->buf_head, MNULL, + MNULL); + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm. + ra_list_spinlock); + + tx_param.next_pkt_len = ((pmbuf_next) + ? pmbuf_next->data_len + + sizeof(TxPD) : 0); + status = wlan_process_tx(priv, pmbuf, &tx_param); + + if (status == MLAN_STATUS_RESOURCE) { + /** Queue the packet back at the head */ + PRINTM(MDAT_D, "Queuing pkt back to raList %p %p\n", + ptr, pmbuf); + pmadapter->callbacks.moal_spin_lock(pmadapter-> + pmoal_handle, + priv->wmm. + ra_list_spinlock); + + if (!wlan_is_ralist_valid(priv, ptr, ptrindex)) { + pmadapter->callbacks. + moal_spin_unlock(pmadapter-> + pmoal_handle, + priv->wmm. + ra_list_spinlock); + wlan_write_data_complete(pmadapter, pmbuf, + MLAN_STATUS_FAILURE); + LEAVE(); + return; + } + priv->wmm.pkts_queued[ptrindex]++; + util_scalar_increment(pmadapter->pmoal_handle, + &priv->wmm.tx_pkts_queued, MNULL, + MNULL); + util_enqueue_list_head(pmadapter->pmoal_handle, + &ptr->buf_head, + (pmlan_linked_list) pmbuf, MNULL, + MNULL); + + ptr->total_pkts++; + pmbuf->flags |= MLAN_BUF_FLAG_REQUEUED_PKT; + pmadapter->callbacks.moal_spin_unlock(pmadapter-> + pmoal_handle, + priv->wmm. + ra_list_spinlock); + } else { + pmadapter->callbacks.moal_spin_lock(pmadapter-> + pmoal_handle, + priv->wmm. + ra_list_spinlock); + if (wlan_is_ralist_valid(priv, ptr, ptrindex)) { + priv->wmm.packets_out[ptrindex]++; + priv->wmm.tid_tbl_ptr[ptrindex].ra_list_curr = + ptr; + } + pmadapter->bssprio_tbl[priv->bss_priority].bssprio_cur = + pmadapter->bssprio_tbl[priv->bss_priority]. + bssprio_cur->pnext; + pmadapter->callbacks.moal_spin_unlock(pmadapter-> + pmoal_handle, + priv->wmm. + ra_list_spinlock); + } + } else { + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm. + ra_list_spinlock); + PRINTM(MINFO, "Nothing to send\n"); + } + + LEAVE(); } /** * @brief This function checks if this mlan_buffer is already processed. - * + * * @param priv A pointer to mlan_private * @param ptr A pointer to RA list table * @@ -835,19 +893,20 @@ wlan_send_single_packet(pmlan_private priv, raListTbl * ptr, int ptrindex) static int INLINE wlan_is_ptr_processed(mlan_private * priv, raListTbl * ptr) { - pmlan_buffer pmbuf; + pmlan_buffer pmbuf; - if ((pmbuf = (pmlan_buffer) util_peek_list(priv->adapter->pmoal_handle, - &ptr->buf_head, MNULL, MNULL)) - && (pmbuf->flags & MLAN_BUF_FLAG_REQUEUED_PKT)) - return MTRUE; + if ((pmbuf = (pmlan_buffer) util_peek_list(priv->adapter->pmoal_handle, + &ptr->buf_head, + MNULL, MNULL)) + && (pmbuf->flags & MLAN_BUF_FLAG_REQUEUED_PKT)) + return MTRUE; - return MFALSE; + return MFALSE; } /** * @brief This function sends a single packet that has been processed - * + * * @param priv A pointer to mlan_private * @param ptr A pointer to RA list table * @param ptrindex ptr's TID index @@ -857,83 +916,110 @@ wlan_is_ptr_processed(mlan_private * priv, raListTbl * ptr) static void INLINE wlan_send_processed_packet(pmlan_private priv, raListTbl * ptr, int ptrindex) { - pmlan_buffer pmbuf_next = MNULL; - mlan_tx_param tx_param; - pmlan_buffer pmbuf; - pmlan_adapter pmadapter = priv->adapter; - mlan_status ret = MLAN_STATUS_FAILURE; - - if ((pmbuf = (pmlan_buffer) util_dequeue_list(pmadapter->pmoal_handle, - &ptr->buf_head, - MNULL, MNULL))) { - pmbuf_next = - (pmlan_buffer) util_peek_list(pmadapter->pmoal_handle, - &ptr->buf_head, MNULL, MNULL); - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - tx_param.next_pkt_len = - ((pmbuf_next) ? pmbuf_next->data_len + sizeof(TxPD) : 0); - ret = - wlan_sdio_host_to_card(pmadapter, MLAN_TYPE_DATA, pmbuf, &tx_param); - switch (ret) { - case MLAN_STATUS_RESOURCE: - PRINTM(MINFO, "MLAN_STATUS_RESOURCE is returned\n"); - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - - if (!wlan_is_ralist_valid(priv, ptr, ptrindex)) { - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm. - ra_list_spinlock); - wlan_write_data_complete(pmadapter, pmbuf, MLAN_STATUS_FAILURE); - LEAVE(); - return; - } - util_enqueue_list_head(pmadapter->pmoal_handle, - &ptr->buf_head, - (pmlan_linked_list) pmbuf, MNULL, MNULL); - - pmbuf->flags |= MLAN_BUF_FLAG_REQUEUED_PKT; - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - break; - case MLAN_STATUS_FAILURE: - pmadapter->data_sent = MFALSE; - PRINTM(MERROR, "Error: Failed to write data\n"); - pmadapter->dbg.num_tx_host_to_card_failure++; - pmbuf->status_code = MLAN_ERROR_DATA_TX_FAIL; - wlan_write_data_complete(pmadapter, pmbuf, ret); - break; - case MLAN_STATUS_PENDING: - pmadapter->data_sent = MFALSE; - default: - break; - } - if (ret != MLAN_STATUS_RESOURCE) { - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - if (wlan_is_ralist_valid(priv, ptr, ptrindex)) { - priv->wmm.packets_out[ptrindex]++; - priv->wmm.tid_tbl_ptr[ptrindex].ra_list_curr = ptr; - ptr->total_pkts--; - } - pmadapter->bssprio_tbl[priv->bss_priority].bssprio_cur = - pmadapter->bssprio_tbl[priv->bss_priority].bssprio_cur->pnext; - priv->wmm.pkts_queued[ptrindex]--; - util_scalar_decrement(pmadapter->pmoal_handle, - &priv->wmm.tx_pkts_queued, MNULL, MNULL); - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - } - } else { - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - } + pmlan_buffer pmbuf_next = MNULL; + mlan_tx_param tx_param; + pmlan_buffer pmbuf; + pmlan_adapter pmadapter = priv->adapter; + mlan_status ret = MLAN_STATUS_FAILURE; + + if ((pmbuf = (pmlan_buffer) util_dequeue_list(pmadapter->pmoal_handle, + &ptr->buf_head, + MNULL, MNULL))) { + pmbuf_next = + (pmlan_buffer) util_peek_list(pmadapter->pmoal_handle, + &ptr->buf_head, MNULL, + MNULL); + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm. + ra_list_spinlock); + tx_param.next_pkt_len = + ((pmbuf_next) ? pmbuf_next->data_len + + sizeof(TxPD) : 0); + ret = wlan_sdio_host_to_card(pmadapter, MLAN_TYPE_DATA, pmbuf, + &tx_param); + switch (ret) { + case MLAN_STATUS_RESOURCE: + PRINTM(MINFO, "MLAN_STATUS_RESOURCE is returned\n"); + pmadapter->callbacks.moal_spin_lock(pmadapter-> + pmoal_handle, + priv->wmm. + ra_list_spinlock); + + if (!wlan_is_ralist_valid(priv, ptr, ptrindex)) { + pmadapter->callbacks. + moal_spin_unlock(pmadapter-> + pmoal_handle, + priv->wmm. + ra_list_spinlock); + wlan_write_data_complete(pmadapter, pmbuf, + MLAN_STATUS_FAILURE); + LEAVE(); + return; + } + util_enqueue_list_head(pmadapter->pmoal_handle, + &ptr->buf_head, + (pmlan_linked_list) pmbuf, + MNULL, MNULL); + + pmbuf->flags |= MLAN_BUF_FLAG_REQUEUED_PKT; + pmadapter->callbacks.moal_spin_unlock(pmadapter-> + pmoal_handle, + priv->wmm. + ra_list_spinlock); + break; + case MLAN_STATUS_FAILURE: + pmadapter->data_sent = MFALSE; + PRINTM(MERROR, "Error: Failed to write data\n"); + pmadapter->dbg.num_tx_host_to_card_failure++; + pmbuf->status_code = MLAN_ERROR_DATA_TX_FAIL; + wlan_write_data_complete(pmadapter, pmbuf, ret); + break; + case MLAN_STATUS_PENDING: + pmadapter->data_sent = MFALSE; + break; + case MLAN_STATUS_SUCCESS: + DBG_HEXDUMP(MDAT_D, "Tx", + pmbuf->pbuf + pmbuf->data_offset, + MIN(pmbuf->data_len + sizeof(TxPD), + MAX_DATA_DUMP_LEN)); + wlan_write_data_complete(pmadapter, pmbuf, ret); + break; + default: + break; + } + if (ret != MLAN_STATUS_RESOURCE) { + pmadapter->callbacks.moal_spin_lock(pmadapter-> + pmoal_handle, + priv->wmm. + ra_list_spinlock); + if (wlan_is_ralist_valid(priv, ptr, ptrindex)) { + priv->wmm.packets_out[ptrindex]++; + priv->wmm.tid_tbl_ptr[ptrindex].ra_list_curr = + ptr; + ptr->total_pkts--; + } + pmadapter->bssprio_tbl[priv->bss_priority].bssprio_cur = + pmadapter->bssprio_tbl[priv->bss_priority]. + bssprio_cur->pnext; + priv->wmm.pkts_queued[ptrindex]--; + util_scalar_decrement(pmadapter->pmoal_handle, + &priv->wmm.tx_pkts_queued, + MNULL, MNULL); + pmadapter->callbacks.moal_spin_unlock(pmadapter-> + pmoal_handle, + priv->wmm. + ra_list_spinlock); + } + } else { + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm. + ra_list_spinlock); + } } /** * @brief This function dequeues a packet - * + * * @param pmadapter A pointer to mlan_adapter * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE @@ -941,87 +1027,96 @@ wlan_send_processed_packet(pmlan_private priv, raListTbl * ptr, int ptrindex) static int wlan_dequeue_tx_packet(pmlan_adapter pmadapter) { - raListTbl *ptr; - pmlan_private priv = MNULL; - int ptrindex = 0; - t_u8 ra[MLAN_MAC_ADDR_LENGTH]; - int tid_del = 0; - int tid = 0; - - ENTER(); - - if (!(ptr = wlan_wmm_get_highest_priolist_ptr(pmadapter, &priv, &ptrindex))) { - LEAVE(); - return MLAN_STATUS_FAILURE; - } - - /* Note:- Spinlock is locked in wlan_wmm_get_highest_priolist_ptr when it - returns a pointer (for the priv it returns), and is unlocked in - wlan_send_processed_packet, wlan_send_single_packet or - wlan_11n_aggregate_pkt. The spinlock would be required for some parts - of both of function. But, the the bulk of these function will execute - w/o spinlock. Unlocking the spinlock inside these function will help - us avoid taking the spinlock again, check to see if the ptr is still - valid and then proceed. This is done purely to increase execution time. - */ - - /* Note:- Also, anybody adding code which does not get into - wlan_send_processed_packet, wlan_send_single_packet, or - wlan_11n_aggregate_pkt should make sure ra_list_spinlock is freed. - Otherwise there would be a lock up. */ - - tid = wlan_get_tid(priv->adapter, ptr); - if (tid >= MAX_NUM_TID) - tid = wlan_wmm_downgrade_tid(priv, tid); - - if (wlan_is_ptr_processed(priv, ptr)) { - wlan_send_processed_packet(priv, ptr, ptrindex); - LEAVE(); - return MLAN_STATUS_SUCCESS; - } - - if (!ptr->is_11n_enabled || wlan_is_bastream_setup(priv, ptr, tid) + raListTbl *ptr; + pmlan_private priv = MNULL; + int ptrindex = 0; + t_u8 ra[MLAN_MAC_ADDR_LENGTH]; + int tid_del = 0; + int tid = 0; + + ENTER(); + + if (!(ptr = wlan_wmm_get_highest_priolist_ptr(pmadapter, &priv, + &ptrindex))) { + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + /* Note:- Spinlock is locked in wlan_wmm_get_highest_priolist_ptr when + it returns a pointer (for the priv it returns), and is unlocked in + wlan_send_processed_packet, wlan_send_single_packet or + wlan_11n_aggregate_pkt. The spinlock would be required for some + parts of both of function. But, the the bulk of these function + will execute w/o spinlock. Unlocking the spinlock inside these + function will help us avoid taking the spinlock again, check to see + if the ptr is still valid and then proceed. This is done purely to + increase execution time. */ + + /* Note:- Also, anybody adding code which does not get into + wlan_send_processed_packet, wlan_send_single_packet, or + wlan_11n_aggregate_pkt should make sure ra_list_spinlock is freed. + Otherwise there would be a lock up. */ + + tid = wlan_get_tid(priv->adapter, ptr); + if (tid >= MAX_NUM_TID) + tid = wlan_wmm_downgrade_tid(priv, tid); + + if (wlan_is_ptr_processed(priv, ptr)) { + wlan_send_processed_packet(priv, ptr, ptrindex); + LEAVE(); + return MLAN_STATUS_SUCCESS; + } + + if (!ptr->is_11n_enabled || wlan_is_bastream_setup(priv, ptr, tid) #ifdef STA_SUPPORT - || priv->wps.session_enable + || priv->wps.session_enable #endif /* STA_SUPPORT */ - ) { - if (ptr->is_11n_enabled && wlan_is_bastream_setup(priv, ptr, tid) - && wlan_is_amsdu_in_ampdu_allowed(priv, ptr, tid) - && wlan_is_amsdu_allowed(priv, ptr, tid) - && (wlan_num_pkts_in_txq(priv, ptr, pmadapter->tx_buf_size) >= - MIN_NUM_AMSDU)) { - wlan_11n_aggregate_pkt(priv, ptr, INTF_HEADER_LEN, ptrindex); - } else - wlan_send_single_packet(priv, ptr, ptrindex); - } else { - if (wlan_is_ampdu_allowed(priv, ptr, tid) && - (ptr->packet_count > ptr->ba_packet_threshold)) { - if (wlan_is_bastream_avail(priv)) { - PRINTM(MINFO, "BA setup threshold %d reached. tid=%d\n", - ptr->packet_count, tid); - wlan_11n_create_txbastream_tbl(priv, - ptr->ra, tid, - BA_STREAM_SETUP_INPROGRESS); - wlan_send_addba(priv, tid, ptr->ra); - } else if (wlan_find_stream_to_delete(priv, ptr, tid, &tid_del, ra)) { - PRINTM(MDAT_D, "tid_del=%d tid=%d\n", tid_del, tid); - wlan_11n_create_txbastream_tbl(priv, - ptr->ra, tid, - BA_STREAM_SETUP_INPROGRESS); - wlan_send_delba(priv, MNULL, tid_del, ra, 1); - } - } - if (wlan_is_amsdu_allowed(priv, ptr, tid) && - (wlan_num_pkts_in_txq(priv, ptr, - pmadapter->tx_buf_size) >= MIN_NUM_AMSDU)) { - wlan_11n_aggregate_pkt(priv, ptr, INTF_HEADER_LEN, ptrindex); - } else { - wlan_send_single_packet(priv, ptr, ptrindex); - } - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + ) { + if (ptr->is_11n_enabled && + wlan_is_bastream_setup(priv, ptr, tid) + && wlan_is_amsdu_in_ampdu_allowed(priv, ptr, tid) + && wlan_is_amsdu_allowed(priv, ptr, tid) + && (wlan_num_pkts_in_txq(priv, ptr, pmadapter->tx_buf_size) + >= MIN_NUM_AMSDU)) { + wlan_11n_aggregate_pkt(priv, ptr, INTF_HEADER_LEN, + ptrindex); + } else + wlan_send_single_packet(priv, ptr, ptrindex); + } else { + if (wlan_is_ampdu_allowed(priv, ptr, tid) && + (ptr->packet_count > ptr->ba_packet_threshold)) { + if (wlan_is_bastream_avail(priv)) { + PRINTM(MINFO, + "BA setup threshold %d reached. tid=%d\n", + ptr->packet_count, tid); + wlan_11n_create_txbastream_tbl(priv, ptr->ra, + tid, + BA_STREAM_SETUP_INPROGRESS); + wlan_send_addba(priv, tid, ptr->ra); + } else if (wlan_find_stream_to_delete(priv, ptr, + tid, &tid_del, + ra)) { + PRINTM(MDAT_D, "tid_del=%d tid=%d\n", tid_del, + tid); + wlan_11n_create_txbastream_tbl(priv, ptr->ra, + tid, + BA_STREAM_SETUP_INPROGRESS); + wlan_send_delba(priv, MNULL, tid_del, ra, 1); + } + } + if (wlan_is_amsdu_allowed(priv, ptr, tid) && + (wlan_num_pkts_in_txq(priv, ptr, + pmadapter->tx_buf_size) >= + MIN_NUM_AMSDU)) { + wlan_11n_aggregate_pkt(priv, ptr, INTF_HEADER_LEN, + ptrindex); + } else { + wlan_send_single_packet(priv, ptr, ptrindex); + } + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -1036,40 +1131,40 @@ wlan_dequeue_tx_packet(pmlan_adapter pmadapter) t_void wlan_update_ralist_tx_pause(pmlan_private priv, t_u8 * mac, t_u8 tx_pause) { - raListTbl *ra_list; - int i; - pmlan_adapter pmadapter = priv->adapter; - t_u32 pkt_cnt = 0; - t_u32 tx_pkts_queued = 0; - ENTER(); - - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - for (i = 0; i < MAX_NUM_TID; ++i) { - ra_list = wlan_wmm_get_ralist_node(priv, i, mac); - if (ra_list) { - pkt_cnt += ra_list->total_pkts; - ra_list->tx_pause = tx_pause; - } - } - if (pkt_cnt) { - tx_pkts_queued = util_scalar_read(pmadapter->pmoal_handle, - &priv->wmm.tx_pkts_queued, MNULL, - MNULL); - if (tx_pause) - tx_pkts_queued -= pkt_cnt; - else - tx_pkts_queued += pkt_cnt; - util_scalar_write(priv->adapter->pmoal_handle, - &priv->wmm.tx_pkts_queued, tx_pkts_queued, MNULL, - MNULL); - util_scalar_write(priv->adapter->pmoal_handle, - &priv->wmm.highest_queued_prio, HIGH_PRIO_TID, MNULL, - MNULL); - } - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - LEAVE(); + raListTbl *ra_list; + int i; + pmlan_adapter pmadapter = priv->adapter; + t_u32 pkt_cnt = 0; + t_u32 tx_pkts_queued = 0; + ENTER(); + + pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + for (i = 0; i < MAX_NUM_TID; ++i) { + ra_list = wlan_wmm_get_ralist_node(priv, i, mac); + if (ra_list) { + pkt_cnt += ra_list->total_pkts; + ra_list->tx_pause = tx_pause; + } + } + if (pkt_cnt) { + tx_pkts_queued = util_scalar_read(pmadapter->pmoal_handle, + &priv->wmm.tx_pkts_queued, + MNULL, MNULL); + if (tx_pause) + tx_pkts_queued -= pkt_cnt; + else + tx_pkts_queued += pkt_cnt; + util_scalar_write(priv->adapter->pmoal_handle, + &priv->wmm.tx_pkts_queued, tx_pkts_queued, + MNULL, MNULL); + util_scalar_write(priv->adapter->pmoal_handle, + &priv->wmm.highest_queued_prio, HIGH_PRIO_TID, + MNULL, MNULL); + } + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + LEAVE(); } #ifdef STA_SUPPORT @@ -1088,30 +1183,30 @@ wlan_update_ralist_tx_pause(pmlan_private priv, t_u8 * mac, t_u8 tx_pause) t_u8 wlan_get_random_ba_threshold(pmlan_adapter pmadapter) { - t_u32 sec, usec; - t_u8 ba_threshold = 0; + t_u32 sec, usec; + t_u8 ba_threshold = 0; - ENTER(); + ENTER(); - /* setup ba_packet_threshold here random number between - [BA_SETUP_PACKET_OFFSET, - BA_SETUP_PACKET_OFFSET+BA_SETUP_MAX_PACKET_THRESHOLD-1] */ + /* setup ba_packet_threshold here random number between + [BA_SETUP_PACKET_OFFSET, + BA_SETUP_PACKET_OFFSET+BA_SETUP_MAX_PACKET_THRESHOLD-1] */ #define BA_SETUP_MAX_PACKET_THRESHOLD 16 #define BA_SETUP_PACKET_OFFSET 16 - pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, &sec, - &usec); - sec = (sec & 0xFFFF) + (sec >> 16); - usec = (usec & 0xFFFF) + (usec >> 16); + pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, &sec, + &usec); + sec = (sec & 0xFFFF) + (sec >> 16); + usec = (usec & 0xFFFF) + (usec >> 16); - ba_threshold = - (((sec << 16) + usec) % BA_SETUP_MAX_PACKET_THRESHOLD) + - BA_SETUP_PACKET_OFFSET; - PRINTM(MINFO, "setup BA after %d packets\n", ba_threshold); + ba_threshold = + (((sec << 16) + usec) % BA_SETUP_MAX_PACKET_THRESHOLD) + + BA_SETUP_PACKET_OFFSET; + PRINTM(MINFO, "setup BA after %d packets\n", ba_threshold); - LEAVE(); - return ba_threshold; + LEAVE(); + return ba_threshold; } /** @@ -1124,20 +1219,20 @@ wlan_get_random_ba_threshold(pmlan_adapter pmadapter) t_void wlan_clean_txrx(pmlan_private priv) { - mlan_adapter *pmadapter = priv->adapter; - t_u8 i = 0; + mlan_adapter *pmadapter = priv->adapter; + t_u8 i = 0; - ENTER(); + ENTER(); - wlan_cleanup_bypass_txq(priv); + wlan_cleanup_bypass_txq(priv); - wlan_11n_cleanup_reorder_tbl(priv); + wlan_11n_cleanup_reorder_tbl(priv); - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); + pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); - wlan_wmm_cleanup_queues(priv); - wlan_11n_deleteall_txbastream_tbl(priv); + wlan_wmm_cleanup_queues(priv); + wlan_11n_deleteall_txbastream_tbl(priv); #ifdef SDIO_MULTI_PORT_TX_AGGR /** * Before reset the TX aggregation buffer, check for any pre-copied data. @@ -1148,31 +1243,32 @@ wlan_clean_txrx(pmlan_private priv) * fw doesn't issue tx-done interrupt in this condition. */ - while (pmadapter->mpa_tx.pkt_cnt) { - /* Decrement current write port to the last used port */ - if (pmadapter->curr_wr_port == 0) - pmadapter->curr_wr_port = MAX_PORT; - pmadapter->curr_wr_port--; + while (pmadapter->mpa_tx.pkt_cnt) { + /* Decrement current write port to the last used port */ + if (pmadapter->curr_wr_port == 0) + pmadapter->curr_wr_port = MAX_PORT; + pmadapter->curr_wr_port--; - /* Mark the port as available in write bitmap */ - pmadapter->mp_wr_bitmap |= (t_u16) (1 << pmadapter->curr_wr_port); - pmadapter->mpa_tx.pkt_cnt--; - } + /* Mark the port as available in write bitmap */ + pmadapter->mp_wr_bitmap |= + (t_u16) (1 << pmadapter->curr_wr_port); + pmadapter->mpa_tx.pkt_cnt--; + } - MP_TX_AGGR_BUF_RESET(priv->adapter); + MP_TX_AGGR_BUF_RESET(priv->adapter); #endif - wlan_wmm_delete_all_ralist(priv); - memcpy(pmadapter, tos_to_tid, ac_to_tid, sizeof(tos_to_tid)); - for (i = 0; i < MAX_NUM_TID; i++) { - tos_to_tid_inv[tos_to_tid[i]] = (t_u8) i; - } + wlan_wmm_delete_all_ralist(priv); + memcpy(pmadapter, tos_to_tid, ac_to_tid, sizeof(tos_to_tid)); + for (i = 0; i < MAX_NUM_TID; i++) { + tos_to_tid_inv[tos_to_tid[i]] = (t_u8) i; + } #if defined(UAP_SUPPORT) - priv->num_drop_pkts = 0; + priv->num_drop_pkts = 0; #endif - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); - LEAVE(); + LEAVE(); } /** @@ -1185,15 +1281,15 @@ wlan_clean_txrx(pmlan_private priv) void wlan_wmm_default_queue_priorities(pmlan_private priv) { - ENTER(); + ENTER(); - /* Default queue priorities: VO->VI->BE->BK */ - priv->wmm.queue_priority[0] = WMM_AC_VO; - priv->wmm.queue_priority[1] = WMM_AC_VI; - priv->wmm.queue_priority[2] = WMM_AC_BE; - priv->wmm.queue_priority[3] = WMM_AC_BK; + /* Default queue priorities: VO->VI->BE->BK */ + priv->wmm.queue_priority[0] = WMM_AC_VO; + priv->wmm.queue_priority[1] = WMM_AC_VI; + priv->wmm.queue_priority[2] = WMM_AC_BE; + priv->wmm.queue_priority[3] = WMM_AC_BK; - LEAVE(); + LEAVE(); } /** @@ -1206,71 +1302,74 @@ wlan_wmm_default_queue_priorities(pmlan_private priv) */ void wlan_wmm_setup_queue_priorities(pmlan_private priv, - IEEEtypes_WmmParameter_t * pwmm_ie) + IEEEtypes_WmmParameter_t * pwmm_ie) { - t_u16 cw_min, avg_back_off, tmp[4]; - t_u32 i, j, num_ac; - t_u8 ac_idx; - - ENTER(); - - if (!pwmm_ie || priv->wmm_enabled == MFALSE) { - /* WMM is not enabled, just set the defaults and return */ - wlan_wmm_default_queue_priorities(priv); - LEAVE(); - return; - } - - HEXDUMP("WMM: setup_queue_priorities: param IE", - (t_u8 *) pwmm_ie, sizeof(IEEEtypes_WmmParameter_t)); - - PRINTM(MINFO, "WMM Parameter IE: version=%d, " - "qos_info Parameter Set Count=%d, Reserved=%#x\n", - pwmm_ie->vend_hdr.version, pwmm_ie->qos_info.para_set_count, - pwmm_ie->reserved); - - for (num_ac = 0; num_ac < NELEMENTS(pwmm_ie->ac_params); num_ac++) { - cw_min = (1 << pwmm_ie->ac_params[num_ac].ecw.ecw_min) - 1; - avg_back_off - = (cw_min >> 1) + pwmm_ie->ac_params[num_ac].aci_aifsn.aifsn; - - ac_idx = wmm_aci_to_qidx_map[pwmm_ie->ac_params[num_ac].aci_aifsn.aci]; - priv->wmm.queue_priority[ac_idx] = ac_idx; - tmp[ac_idx] = avg_back_off; - - PRINTM(MCMND, "WMM: CWmax=%d CWmin=%d Avg Back-off=%d\n", - (1 << pwmm_ie->ac_params[num_ac].ecw.ecw_max) - 1, - cw_min, avg_back_off); - PRINTM_AC(&pwmm_ie->ac_params[num_ac]); - } - - HEXDUMP("WMM: avg_back_off", (t_u8 *) tmp, sizeof(tmp)); - HEXDUMP("WMM: queue_priority", priv->wmm.queue_priority, - sizeof(priv->wmm.queue_priority)); - - /* Bubble sort */ - for (i = 0; i < num_ac; i++) { - for (j = 1; j < num_ac - i; j++) { - if (tmp[j - 1] > tmp[j]) { - SWAP_U16(tmp[j - 1], tmp[j]); - SWAP_U8(priv->wmm.queue_priority[j - 1], - priv->wmm.queue_priority[j]); - } else if (tmp[j - 1] == tmp[j]) { - if (priv->wmm.queue_priority[j - 1] - < priv->wmm.queue_priority[j]) { - SWAP_U8(priv->wmm.queue_priority[j - 1], - priv->wmm.queue_priority[j]); - } - } - } - } - - wlan_wmm_queue_priorities_tid(priv, priv->wmm.queue_priority); - - HEXDUMP("WMM: avg_back_off, sort", (t_u8 *) tmp, sizeof(tmp)); - DBG_HEXDUMP(MCMD_D, "WMM: queue_priority, sort", priv->wmm.queue_priority, - sizeof(priv->wmm.queue_priority)); - LEAVE(); + t_u16 cw_min, avg_back_off, tmp[4]; + t_u32 i, j, num_ac; + t_u8 ac_idx; + + ENTER(); + + if (!pwmm_ie || priv->wmm_enabled == MFALSE) { + /* WMM is not enabled, just set the defaults and return */ + wlan_wmm_default_queue_priorities(priv); + LEAVE(); + return; + } + + HEXDUMP("WMM: setup_queue_priorities: param IE", + (t_u8 *) pwmm_ie, sizeof(IEEEtypes_WmmParameter_t)); + + PRINTM(MINFO, "WMM Parameter IE: version=%d, " + "qos_info Parameter Set Count=%d, Reserved=%#x\n", + pwmm_ie->vend_hdr.version, pwmm_ie->qos_info.para_set_count, + pwmm_ie->reserved); + + for (num_ac = 0; num_ac < NELEMENTS(pwmm_ie->ac_params); num_ac++) { + cw_min = (1 << pwmm_ie->ac_params[num_ac].ecw.ecw_min) - 1; + avg_back_off + = + (cw_min >> 1) + + pwmm_ie->ac_params[num_ac].aci_aifsn.aifsn; + + ac_idx = wmm_aci_to_qidx_map[pwmm_ie->ac_params[num_ac]. + aci_aifsn.aci]; + priv->wmm.queue_priority[ac_idx] = ac_idx; + tmp[ac_idx] = avg_back_off; + + PRINTM(MCMND, "WMM: CWmax=%d CWmin=%d Avg Back-off=%d\n", + (1 << pwmm_ie->ac_params[num_ac].ecw.ecw_max) - 1, + cw_min, avg_back_off); + PRINTM_AC(&pwmm_ie->ac_params[num_ac]); + } + + HEXDUMP("WMM: avg_back_off", (t_u8 *) tmp, sizeof(tmp)); + HEXDUMP("WMM: queue_priority", priv->wmm.queue_priority, + sizeof(priv->wmm.queue_priority)); + + /* Bubble sort */ + for (i = 0; i < num_ac; i++) { + for (j = 1; j < num_ac - i; j++) { + if (tmp[j - 1] > tmp[j]) { + SWAP_U16(tmp[j - 1], tmp[j]); + SWAP_U8(priv->wmm.queue_priority[j - 1], + priv->wmm.queue_priority[j]); + } else if (tmp[j - 1] == tmp[j]) { + if (priv->wmm.queue_priority[j - 1] + < priv->wmm.queue_priority[j]) { + SWAP_U8(priv->wmm.queue_priority[j - 1], + priv->wmm.queue_priority[j]); + } + } + } + } + + wlan_wmm_queue_priorities_tid(priv, priv->wmm.queue_priority); + + HEXDUMP("WMM: avg_back_off, sort", (t_u8 *) tmp, sizeof(tmp)); + DBG_HEXDUMP(MCMD_D, "WMM: queue_priority, sort", + priv->wmm.queue_priority, sizeof(priv->wmm.queue_priority)); + LEAVE(); } /** @@ -1283,27 +1382,30 @@ wlan_wmm_setup_queue_priorities(pmlan_private priv, void wlan_wmm_setup_ac_downgrade(pmlan_private priv) { - int ac_val; - - ENTER(); - - PRINTM(MINFO, "WMM: AC Priorities: BK(0), BE(1), VI(2), VO(3)\n"); - - if (priv->wmm_enabled == MFALSE) { - /* WMM is not enabled, default priorities */ - for (ac_val = WMM_AC_BK; ac_val <= WMM_AC_VO; ac_val++) { - priv->wmm.ac_down_graded_vals[ac_val] = (mlan_wmm_ac_e) ac_val; - } - } else { - for (ac_val = WMM_AC_BK; ac_val <= WMM_AC_VO; ac_val++) { - priv->wmm.ac_down_graded_vals[ac_val] - = wlan_wmm_eval_downgrade_ac(priv, (mlan_wmm_ac_e) ac_val); - PRINTM(MINFO, "WMM: AC PRIO %d maps to %d\n", - ac_val, priv->wmm.ac_down_graded_vals[ac_val]); - } - } - - LEAVE(); + int ac_val; + + ENTER(); + + PRINTM(MINFO, "WMM: AC Priorities: BK(0), BE(1), VI(2), VO(3)\n"); + + if (priv->wmm_enabled == MFALSE) { + /* WMM is not enabled, default priorities */ + for (ac_val = WMM_AC_BK; ac_val <= WMM_AC_VO; ac_val++) { + priv->wmm.ac_down_graded_vals[ac_val] = + (mlan_wmm_ac_e) ac_val; + } + } else { + for (ac_val = WMM_AC_BK; ac_val <= WMM_AC_VO; ac_val++) { + priv->wmm.ac_down_graded_vals[ac_val] + = wlan_wmm_eval_downgrade_ac(priv, + (mlan_wmm_ac_e) + ac_val); + PRINTM(MINFO, "WMM: AC PRIO %d maps to %d\n", ac_val, + priv->wmm.ac_down_graded_vals[ac_val]); + } + } + + LEAVE(); } /** @@ -1317,48 +1419,50 @@ wlan_wmm_setup_ac_downgrade(pmlan_private priv) void wlan_ralist_add(mlan_private * priv, t_u8 * ra) { - int i; - raListTbl *ra_list; - pmlan_adapter pmadapter = priv->adapter; - - ENTER(); - - for (i = 0; i < MAX_NUM_TID; ++i) { - ra_list = wlan_wmm_allocate_ralist_node(pmadapter, ra); - PRINTM(MINFO, "Creating RA List %p for tid %d\n", ra_list, i); - if (!ra_list) - break; - ra_list->max_amsdu = 0; - if (queuing_ra_based(priv)) { - ra_list->is_11n_enabled = wlan_is_11n_enabled(priv, ra); - if (ra_list->is_11n_enabled) - ra_list->max_amsdu = get_station_max_amsdu_size(priv, ra); - ra_list->tx_pause = wlan_is_tx_pause(priv, ra); - } else { - ra_list->is_11n_enabled = IS_11N_ENABLED(priv); - if (ra_list->is_11n_enabled) - ra_list->max_amsdu = priv->max_amsdu; - } - - PRINTM_NETINTF(MDATA, priv); - PRINTM(MDATA, "ralist %p: is_11n_enabled=%d max_amsdu=%d\n", - ra_list, ra_list->is_11n_enabled, ra_list->max_amsdu); - - if (ra_list->is_11n_enabled) { - ra_list->packet_count = 0; - ra_list->ba_packet_threshold = - wlan_get_random_ba_threshold(pmadapter); - } - - util_enqueue_list_tail(pmadapter->pmoal_handle, - &priv->wmm.tid_tbl_ptr[i].ra_list, - (pmlan_linked_list) ra_list, MNULL, MNULL); - - if (!priv->wmm.tid_tbl_ptr[i].ra_list_curr) - priv->wmm.tid_tbl_ptr[i].ra_list_curr = ra_list; - } - - LEAVE(); + int i; + raListTbl *ra_list; + pmlan_adapter pmadapter = priv->adapter; + + ENTER(); + + for (i = 0; i < MAX_NUM_TID; ++i) { + ra_list = wlan_wmm_allocate_ralist_node(pmadapter, ra); + PRINTM(MINFO, "Creating RA List %p for tid %d\n", ra_list, i); + if (!ra_list) + break; + ra_list->max_amsdu = 0; + if (queuing_ra_based(priv)) { + ra_list->is_11n_enabled = wlan_is_11n_enabled(priv, ra); + if (ra_list->is_11n_enabled) + ra_list->max_amsdu = + get_station_max_amsdu_size(priv, ra); + ra_list->tx_pause = wlan_is_tx_pause(priv, ra); + } else { + ra_list->is_11n_enabled = IS_11N_ENABLED(priv); + if (ra_list->is_11n_enabled) + ra_list->max_amsdu = priv->max_amsdu; + } + + PRINTM_NETINTF(MDATA, priv); + PRINTM(MDATA, "ralist %p: is_11n_enabled=%d max_amsdu=%d\n", + ra_list, ra_list->is_11n_enabled, ra_list->max_amsdu); + + if (ra_list->is_11n_enabled) { + ra_list->packet_count = 0; + ra_list->ba_packet_threshold = + wlan_get_random_ba_threshold(pmadapter); + } + + util_enqueue_list_tail(pmadapter->pmoal_handle, + &priv->wmm.tid_tbl_ptr[i].ra_list, + (pmlan_linked_list) ra_list, MNULL, + MNULL); + + if (!priv->wmm.tid_tbl_ptr[i].ra_list_curr) + priv->wmm.tid_tbl_ptr[i].ra_list_curr = ra_list; + } + + LEAVE(); } /** @@ -1371,53 +1475,63 @@ wlan_ralist_add(mlan_private * priv, t_u8 * ra) t_void wlan_wmm_init(pmlan_adapter pmadapter) { - int i, j; - pmlan_private priv; - - ENTER(); - - for (j = 0; j < pmadapter->priv_num; ++j) { - if ((priv = pmadapter->priv[j])) { - for (i = 0; i < MAX_NUM_TID; ++i) { - priv->aggr_prio_tbl[i].amsdu = BA_STREAM_NOT_ALLOWED; - priv->aggr_prio_tbl[i].ampdu_ap = - priv->aggr_prio_tbl[i].ampdu_user = tos_to_tid_inv[i]; - priv->wmm.pkts_queued[i] = 0; - priv->wmm.tid_tbl_ptr[i].ra_list_curr = MNULL; - } - priv->wmm.drv_pkt_delay_max = WMM_DRV_DELAY_MAX; - - priv->aggr_prio_tbl[6].ampdu_ap - = priv->aggr_prio_tbl[6].ampdu_user = BA_STREAM_NOT_ALLOWED; - - priv->aggr_prio_tbl[7].ampdu_ap - = priv->aggr_prio_tbl[7].ampdu_user = BA_STREAM_NOT_ALLOWED; - - priv->add_ba_param.timeout = MLAN_DEFAULT_BLOCK_ACK_TIMEOUT; + int i, j; + pmlan_private priv; + + ENTER(); + + for (j = 0; j < pmadapter->priv_num; ++j) { + if ((priv = pmadapter->priv[j])) { + for (i = 0; i < MAX_NUM_TID; ++i) { + priv->aggr_prio_tbl[i].amsdu = + BA_STREAM_NOT_ALLOWED; + priv->aggr_prio_tbl[i].ampdu_ap = + priv->aggr_prio_tbl[i].ampdu_user = + tos_to_tid_inv[i]; + priv->wmm.pkts_queued[i] = 0; + priv->wmm.tid_tbl_ptr[i].ra_list_curr = MNULL; + } + priv->wmm.drv_pkt_delay_max = WMM_DRV_DELAY_MAX; + + priv->aggr_prio_tbl[6].ampdu_ap + = priv->aggr_prio_tbl[6].ampdu_user = + BA_STREAM_NOT_ALLOWED; + + priv->aggr_prio_tbl[7].ampdu_ap + = priv->aggr_prio_tbl[7].ampdu_user = + BA_STREAM_NOT_ALLOWED; + + priv->add_ba_param.timeout = + MLAN_DEFAULT_BLOCK_ACK_TIMEOUT; #ifdef STA_SUPPORT - if (priv->bss_type == MLAN_BSS_TYPE_STA) { - priv->add_ba_param.tx_win_size = MLAN_STA_AMPDU_DEF_TXWINSIZE; - priv->add_ba_param.rx_win_size = MLAN_STA_AMPDU_DEF_RXWINSIZE; - } + if (priv->bss_type == MLAN_BSS_TYPE_STA) { + priv->add_ba_param.tx_win_size = + MLAN_STA_AMPDU_DEF_TXWINSIZE; + priv->add_ba_param.rx_win_size = + MLAN_STA_AMPDU_DEF_RXWINSIZE; + } #endif #ifdef UAP_SUPPORT - if (priv->bss_type == MLAN_BSS_TYPE_UAP + if (priv->bss_type == MLAN_BSS_TYPE_UAP #ifdef WIFI_DIRECT_SUPPORT - || priv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT + || priv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT #endif - ) { - priv->add_ba_param.tx_win_size = MLAN_UAP_AMPDU_DEF_TXWINSIZE; - priv->add_ba_param.rx_win_size = MLAN_UAP_AMPDU_DEF_RXWINSIZE; - } + ) { + priv->add_ba_param.tx_win_size = + MLAN_UAP_AMPDU_DEF_TXWINSIZE; + priv->add_ba_param.rx_win_size = + MLAN_UAP_AMPDU_DEF_RXWINSIZE; + } #endif - priv->add_ba_param.tx_amsdu = MTRUE; - priv->add_ba_param.rx_amsdu = MTRUE; - memset(priv->adapter, priv->rx_seq, 0xff, sizeof(priv->rx_seq)); - wlan_wmm_default_queue_priorities(priv); - } - } - - LEAVE(); + priv->add_ba_param.tx_amsdu = MTRUE; + priv->add_ba_param.rx_amsdu = MTRUE; + memset(priv->adapter, priv->rx_seq, 0xff, + sizeof(priv->rx_seq)); + wlan_wmm_default_queue_priorities(priv); + } + } + + LEAVE(); } /** @@ -1432,10 +1546,10 @@ wlan_wmm_init(pmlan_adapter pmadapter) void wlan_wmm_setup_queues(pmlan_private priv) { - ENTER(); - wlan_wmm_setup_queue_priorities(priv, MNULL); - wlan_wmm_setup_ac_downgrade(priv); - LEAVE(); + ENTER(); + wlan_wmm_setup_queue_priorities(priv, MNULL); + wlan_wmm_setup_ac_downgrade(priv); + LEAVE(); } #ifdef STA_SUPPORT @@ -1449,13 +1563,14 @@ wlan_wmm_setup_queues(pmlan_private priv) mlan_status wlan_cmd_wmm_status_change(pmlan_private priv) { - mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_status ret = MLAN_STATUS_SUCCESS; - ENTER(); + ENTER(); - ret = wlan_prepare_cmd(priv, HostCmd_CMD_WMM_GET_STATUS, 0, 0, 0, MNULL); - LEAVE(); - return ret; + ret = wlan_prepare_cmd(priv, HostCmd_CMD_WMM_GET_STATUS, 0, 0, 0, + MNULL); + LEAVE(); + return ret; } #endif @@ -1469,96 +1584,100 @@ wlan_cmd_wmm_status_change(pmlan_private priv) int wlan_wmm_lists_empty(pmlan_adapter pmadapter) { - int j; - pmlan_private priv; - - ENTER(); - - for (j = 0; j < pmadapter->priv_num; ++j) { - if ((priv = pmadapter->priv[j])) { - if ((priv->port_ctrl_mode == MTRUE) && (priv->port_open == MFALSE)) { - PRINTM(MINFO, - "wmm_lists_empty: PORT_CLOSED Ignore pkts from BSS%d\n", - j); - continue; - } - - if (util_scalar_read(pmadapter->pmoal_handle, - &priv->wmm.tx_pkts_queued, - pmadapter->callbacks.moal_spin_lock, - pmadapter->callbacks.moal_spin_unlock)) { - LEAVE(); - return MFALSE; - } - } - } - - LEAVE(); - return MTRUE; + int j; + pmlan_private priv; + + ENTER(); + + for (j = 0; j < pmadapter->priv_num; ++j) { + if ((priv = pmadapter->priv[j])) { + if ((priv->port_ctrl_mode == MTRUE) && + (priv->port_open == MFALSE)) { + PRINTM(MINFO, + "wmm_lists_empty: PORT_CLOSED Ignore pkts from BSS%d\n", + j); + continue; + } + + if (util_scalar_read(pmadapter->pmoal_handle, + &priv->wmm.tx_pkts_queued, + pmadapter->callbacks. + moal_spin_lock, + pmadapter->callbacks. + moal_spin_unlock)) { + LEAVE(); + return MFALSE; + } + } + } + + LEAVE(); + return MTRUE; } /** * @brief Get ralist node - * + * * @param priv Pointer to the mlan_private driver data struct * @param tid TID * @param ra_addr Pointer to the route address - * + * * @return ra_list or MNULL */ raListTbl * wlan_wmm_get_ralist_node(pmlan_private priv, t_u8 tid, t_u8 * ra_addr) { - raListTbl *ra_list; - ENTER(); - ra_list = - (raListTbl *) util_peek_list(priv->adapter->pmoal_handle, - &priv->wmm.tid_tbl_ptr[tid].ra_list, MNULL, - MNULL); - while (ra_list && (ra_list != (raListTbl *) - & priv->wmm.tid_tbl_ptr[tid].ra_list)) { - if (!memcmp(priv->adapter, ra_list->ra, ra_addr, MLAN_MAC_ADDR_LENGTH)) { - LEAVE(); - return ra_list; - } - ra_list = ra_list->pnext; - } - LEAVE(); - return MNULL; + raListTbl *ra_list; + ENTER(); + ra_list = + (raListTbl *) util_peek_list(priv->adapter->pmoal_handle, + &priv->wmm.tid_tbl_ptr[tid]. + ra_list, MNULL, MNULL); + while (ra_list && (ra_list != (raListTbl *) + & priv->wmm.tid_tbl_ptr[tid].ra_list)) { + if (!memcmp + (priv->adapter, ra_list->ra, ra_addr, + MLAN_MAC_ADDR_LENGTH)) { + LEAVE(); + return ra_list; + } + ra_list = ra_list->pnext; + } + LEAVE(); + return MNULL; } /** * @brief Check if RA list is valid or not - * + * * @param priv Pointer to the mlan_private driver data struct * @param ra_list Pointer to raListTbl * @param ptrindex TID pointer index - * - * @return MTRUE- valid. MFALSE- invalid. + * + * @return MTRUE- valid. MFALSE- invalid. */ int wlan_is_ralist_valid(mlan_private * priv, raListTbl * ra_list, int ptrindex) { - raListTbl *rlist; - - ENTER(); - - rlist = - (raListTbl *) util_peek_list(priv->adapter->pmoal_handle, - &priv->wmm.tid_tbl_ptr[ptrindex].ra_list, - MNULL, MNULL); - - while (rlist && (rlist != (raListTbl *) - & priv->wmm.tid_tbl_ptr[ptrindex].ra_list)) { - if (rlist == ra_list) { - LEAVE(); - return MTRUE; - } - - rlist = rlist->pnext; - } - LEAVE(); - return MFALSE; + raListTbl *rlist; + + ENTER(); + + rlist = (raListTbl *) util_peek_list(priv->adapter->pmoal_handle, + &priv->wmm.tid_tbl_ptr[ptrindex]. + ra_list, MNULL, MNULL); + + while (rlist && (rlist != (raListTbl *) + & priv->wmm.tid_tbl_ptr[ptrindex].ra_list)) { + if (rlist == ra_list) { + LEAVE(); + return MTRUE; + } + + rlist = rlist->pnext; + } + LEAVE(); + return MFALSE; } /** @@ -1573,38 +1692,41 @@ wlan_is_ralist_valid(mlan_private * priv, raListTbl * ra_list, int ptrindex) int wlan_ralist_update(mlan_private * priv, t_u8 * old_ra, t_u8 * new_ra) { - t_u8 tid; - int update_count; - raListTbl *ra_list; + t_u8 tid; + int update_count; + raListTbl *ra_list; - ENTER(); + ENTER(); - update_count = 0; + update_count = 0; - for (tid = 0; tid < MAX_NUM_TID; ++tid) { + for (tid = 0; tid < MAX_NUM_TID; ++tid) { - ra_list = wlan_wmm_get_ralist_node(priv, tid, old_ra); + ra_list = wlan_wmm_get_ralist_node(priv, tid, old_ra); - if (ra_list) { - update_count++; + if (ra_list) { + update_count++; - if (queuing_ra_based(priv)) - ra_list->is_11n_enabled = wlan_is_11n_enabled(priv, new_ra); - else - ra_list->is_11n_enabled = IS_11N_ENABLED(priv); - ra_list->packet_count = 0; - ra_list->ba_packet_threshold = - wlan_get_random_ba_threshold(priv->adapter); - PRINTM(MINFO, "ralist_update: %p, %d, " MACSTR "-->" MACSTR "\n", - ra_list, ra_list->is_11n_enabled, MAC2STR(ra_list->ra), - MAC2STR(new_ra)); + if (queuing_ra_based(priv)) + ra_list->is_11n_enabled = + wlan_is_11n_enabled(priv, new_ra); + else + ra_list->is_11n_enabled = IS_11N_ENABLED(priv); + ra_list->packet_count = 0; + ra_list->ba_packet_threshold = + wlan_get_random_ba_threshold(priv->adapter); + PRINTM(MINFO, + "ralist_update: %p, %d, " MACSTR "-->" MACSTR + "\n", ra_list, ra_list->is_11n_enabled, + MAC2STR(ra_list->ra), MAC2STR(new_ra)); - memcpy(priv->adapter, ra_list->ra, new_ra, MLAN_MAC_ADDR_LENGTH); - } - } + memcpy(priv->adapter, ra_list->ra, new_ra, + MLAN_MAC_ADDR_LENGTH); + } + } - LEAVE(); - return update_count; + LEAVE(); + return update_count; } /** @@ -1618,97 +1740,105 @@ wlan_ralist_update(mlan_private * priv, t_u8 * old_ra, t_u8 * new_ra) t_void wlan_wmm_add_buf_txqueue(pmlan_adapter pmadapter, pmlan_buffer pmbuf) { - pmlan_private priv = pmadapter->priv[pmbuf->bss_index]; - t_u32 tid; - raListTbl *ra_list; - t_u8 ra[MLAN_MAC_ADDR_LENGTH], tid_down; + pmlan_private priv = pmadapter->priv[pmbuf->bss_index]; + t_u32 tid; + raListTbl *ra_list; + t_u8 ra[MLAN_MAC_ADDR_LENGTH], tid_down; #if defined(UAP_SUPPORT) - sta_node *sta_ptr = MNULL; + sta_node *sta_ptr = MNULL; #endif - ENTER(); - - pmbuf->buf_type = MLAN_BUF_TYPE_DATA; - if (!priv->media_connected) { - PRINTM_NETINTF(MWARN, priv); - PRINTM(MWARN, "Drop packet %p in disconnect state\n", pmbuf); - wlan_write_data_complete(pmadapter, pmbuf, MLAN_STATUS_FAILURE); - LEAVE(); - return; - } - tid = pmbuf->priority; - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - tid_down = wlan_wmm_downgrade_tid(priv, tid); - - /* In case of infra as we have already created the list during association - we just don't have to call get_queue_raptr, we will have only 1 raptr - for a tid in case of infra */ - if (!queuing_ra_based(priv)) { - ra_list = (raListTbl *) util_peek_list(pmadapter->pmoal_handle, - &priv->wmm.tid_tbl_ptr[tid_down]. - ra_list, MNULL, MNULL); - } else { - memcpy(pmadapter, ra, pmbuf->pbuf + pmbuf->data_offset, - MLAN_MAC_ADDR_LENGTH); - /** put multicast/broadcast packet in the same ralist */ - if (ra[0] & 0x01) - memset(pmadapter, ra, 0xff, sizeof(ra)); + ENTER(); + + pmbuf->buf_type = MLAN_BUF_TYPE_DATA; + if (!priv->media_connected) { + PRINTM_NETINTF(MWARN, priv); + PRINTM(MWARN, "Drop packet %p in disconnect state\n", pmbuf); + wlan_write_data_complete(pmadapter, pmbuf, MLAN_STATUS_FAILURE); + LEAVE(); + return; + } + tid = pmbuf->priority; + pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + tid_down = wlan_wmm_downgrade_tid(priv, tid); + + /* In case of infra as we have already created the list during + association we just don't have to call get_queue_raptr, we will have + only 1 raptr for a tid in case of infra */ + if (!queuing_ra_based(priv)) { + ra_list = (raListTbl *) util_peek_list(pmadapter->pmoal_handle, + &priv->wmm. + tid_tbl_ptr[tid_down]. + ra_list, MNULL, MNULL); + } else { + memcpy(pmadapter, ra, pmbuf->pbuf + pmbuf->data_offset, + MLAN_MAC_ADDR_LENGTH); + /** put multicast/broadcast packet in the same ralist */ + if (ra[0] & 0x01) + memset(pmadapter, ra, 0xff, sizeof(ra)); #if defined(UAP_SUPPORT) - else if (priv->bss_type == MLAN_BSS_TYPE_UAP) { - if ((sta_ptr = wlan_get_station_entry(priv, ra))) { - if (!sta_ptr->is_wmm_enabled) { - tid_down = wlan_wmm_downgrade_tid(priv, 0xff); - } - } - } + else if (priv->bss_type == MLAN_BSS_TYPE_UAP) { + if ((sta_ptr = wlan_get_station_entry(priv, ra))) { + if (!sta_ptr->is_wmm_enabled) { + tid_down = + wlan_wmm_downgrade_tid(priv, + 0xff); + } + } + } #endif - ra_list = wlan_wmm_get_queue_raptr(priv, tid_down, ra); - } - - if (!ra_list) { - PRINTM_NETINTF(MWARN, priv); - PRINTM(MWARN, "Drop packet %p, ra_list=%p, media_connected=%d\n", - pmbuf, ra_list, priv->media_connected); - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - wlan_write_data_complete(pmadapter, pmbuf, MLAN_STATUS_FAILURE); - LEAVE(); - return; - } - - PRINTM_NETINTF(MDATA, priv); - PRINTM(MDATA, "Adding pkt %p (priority=%d, tid_down=%d) to ra_list %p\n", - pmbuf, pmbuf->priority, tid_down, ra_list); - util_enqueue_list_tail(pmadapter->pmoal_handle, &ra_list->buf_head, - (pmlan_linked_list) pmbuf, MNULL, MNULL); - - ra_list->total_pkts++; - ra_list->packet_count++; - - priv->wmm.pkts_queued[tid_down]++; - if (!ra_list->tx_pause) { - util_scalar_increment(pmadapter->pmoal_handle, - &priv->wmm.tx_pkts_queued, MNULL, MNULL); - /* if highest_queued_prio < prio(tid_down), set it to prio(tid_down) */ - util_scalar_conditional_write(pmadapter->pmoal_handle, - &priv->wmm.highest_queued_prio, - MLAN_SCALAR_COND_LESS_THAN, - tos_to_tid_inv[tid_down], - tos_to_tid_inv[tid_down], MNULL, MNULL); - } - /* Record the current time the packet was queued; used to determine the - amount of time the packet was queued in the driver before it was sent to - the firmware. The delay is then sent along with the packet to the - firmware for aggregate delay calculation for stats and MSDU lifetime - expiry. */ - pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, - &pmbuf->in_ts_sec, - &pmbuf->in_ts_usec); - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - - LEAVE(); + ra_list = wlan_wmm_get_queue_raptr(priv, tid_down, ra); + } + + if (!ra_list) { + PRINTM_NETINTF(MWARN, priv); + PRINTM(MWARN, + "Drop packet %p, ra_list=%p, media_connected=%d\n", + pmbuf, ra_list, priv->media_connected); + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm. + ra_list_spinlock); + wlan_write_data_complete(pmadapter, pmbuf, MLAN_STATUS_FAILURE); + LEAVE(); + return; + } + + PRINTM_NETINTF(MDATA, priv); + PRINTM(MDATA, + "Adding pkt %p (priority=%d, tid_down=%d) to ra_list %p\n", + pmbuf, pmbuf->priority, tid_down, ra_list); + util_enqueue_list_tail(pmadapter->pmoal_handle, &ra_list->buf_head, + (pmlan_linked_list) pmbuf, MNULL, MNULL); + + ra_list->total_pkts++; + ra_list->packet_count++; + + priv->wmm.pkts_queued[tid_down]++; + if (!ra_list->tx_pause) { + util_scalar_increment(pmadapter->pmoal_handle, + &priv->wmm.tx_pkts_queued, MNULL, MNULL); + /* if highest_queued_prio < prio(tid_down), set it to + prio(tid_down) */ + util_scalar_conditional_write(pmadapter->pmoal_handle, + &priv->wmm.highest_queued_prio, + MLAN_SCALAR_COND_LESS_THAN, + tos_to_tid_inv[tid_down], + tos_to_tid_inv[tid_down], + MNULL, MNULL); + } + /* Record the current time the packet was queued; used to determine the + amount of time the packet was queued in the driver before it was + sent to the firmware. The delay is then sent along with the packet + to the firmware for aggregate delay calculation for stats and MSDU + lifetime expiry. */ + pmadapter->callbacks.moal_get_system_time(pmadapter->pmoal_handle, + &pmbuf->in_ts_sec, + &pmbuf->in_ts_usec); + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + + LEAVE(); } #ifdef STA_SUPPORT @@ -1732,123 +1862,153 @@ wlan_wmm_add_buf_txqueue(pmlan_adapter pmadapter, pmlan_buffer pmbuf) mlan_status wlan_ret_wmm_get_status(pmlan_private priv, t_u8 * ptlv, int resp_len) { - t_u8 *pcurrent = ptlv; - t_u32 tlv_len; - t_u8 sendWmmEvent; - MrvlIEtypes_Data_t *pTlvHdr; - MrvlIEtypes_WmmQueueStatus_t *pTlvWmmQStatus; - IEEEtypes_WmmParameter_t *pWmmParamIe = MNULL; - WmmAcStatus_t *pac_status; - - MrvlIETypes_ActionFrame_t *pTlvAction; - IEEEtypes_Action_WMM_AddTsRsp_t *pAddTsRsp; - IEEEtypes_Action_WMM_DelTs_t *pDelTs; - - ENTER(); - - sendWmmEvent = MFALSE; - - PRINTM(MINFO, "WMM: WMM_GET_STATUS cmdresp received: %d\n", resp_len); - HEXDUMP("CMD_RESP: WMM_GET_STATUS", pcurrent, resp_len); - - while (resp_len >= sizeof(pTlvHdr->header)) { - pTlvHdr = (MrvlIEtypes_Data_t *) pcurrent; - tlv_len = wlan_le16_to_cpu(pTlvHdr->header.len); - - switch (wlan_le16_to_cpu(pTlvHdr->header.type)) { - case TLV_TYPE_WMMQSTATUS: - pTlvWmmQStatus = (MrvlIEtypes_WmmQueueStatus_t *) pTlvHdr; - PRINTM(MEVENT, "WMM_STATUS: QSTATUS TLV: %d\n", - pTlvWmmQStatus->queue_index); - - PRINTM(MINFO, - "CMD_RESP: WMM_GET_STATUS: QSTATUS TLV: %d, %d, %d\n", - pTlvWmmQStatus->queue_index, - pTlvWmmQStatus->flow_required, pTlvWmmQStatus->disabled); - - pac_status = &priv->wmm.ac_status[pTlvWmmQStatus->queue_index]; - pac_status->disabled = pTlvWmmQStatus->disabled; - pac_status->flow_required = pTlvWmmQStatus->flow_required; - pac_status->flow_created = pTlvWmmQStatus->flow_created; - break; - - case WMM_IE: - /* - * Point the regular IEEE IE 2 bytes into the Marvell IE - * and setup the IEEE IE type and length byte fields - */ - - PRINTM(MEVENT, "WMM STATUS: WMM IE\n"); - - HEXDUMP("WMM: WMM TLV:", (t_u8 *) pTlvHdr, tlv_len + 4); - - pWmmParamIe = (IEEEtypes_WmmParameter_t *) (pcurrent + 2); - pWmmParamIe->vend_hdr.len = (t_u8) tlv_len; - pWmmParamIe->vend_hdr.element_id = WMM_IE; - - PRINTM(MINFO, "CMD_RESP: WMM_GET_STATUS: WMM Parameter Set: %d\n", - pWmmParamIe->qos_info.para_set_count); - - memcpy(priv->adapter, - (t_u8 *) & priv->curr_bss_params.bss_descriptor.wmm_ie, - pWmmParamIe, MIN(sizeof(IEEEtypes_WmmParameter_t), - (pWmmParamIe->vend_hdr.len + 2))); - sendWmmEvent = MTRUE; - break; - - case TLV_TYPE_IEEE_ACTION_FRAME: - PRINTM(MEVENT, "WMM_STATUS: IEEE Action Frame\n"); - pTlvAction = (MrvlIETypes_ActionFrame_t *) pcurrent; - - if (pTlvAction->actionFrame.wmmAc.tspecAct.category - == IEEE_MGMT_ACTION_CATEGORY_WMM_TSPEC) { - - switch (pTlvAction->actionFrame.wmmAc.tspecAct.action) { - case TSPEC_ACTION_CODE_ADDTS_RSP: - pAddTsRsp = &pTlvAction->actionFrame.wmmAc.addTsRsp; - wlan_send_wmmac_host_event(priv, "ADDTS_RSP", - pTlvAction->srcAddr, - pAddTsRsp->tspecIE.TspecBody. - TSInfo.TID, - pAddTsRsp->tspecIE.TspecBody. - TSInfo.UserPri, - pAddTsRsp->statusCode); - break; - - case TSPEC_ACTION_CODE_DELTS: - pDelTs = &pTlvAction->actionFrame.wmmAc.delTs; - wlan_send_wmmac_host_event(priv, "DELTS_RX", - pTlvAction->srcAddr, - pDelTs->tspecIE.TspecBody.TSInfo. - TID, - pDelTs->tspecIE.TspecBody.TSInfo. - UserPri, pDelTs->reasonCode); - break; - - case TSPEC_ACTION_CODE_ADDTS_REQ: - default: - break; - } - } - break; - - default: - break; - } - - pcurrent += (tlv_len + sizeof(pTlvHdr->header)); - resp_len -= (tlv_len + sizeof(pTlvHdr->header)); - } - - wlan_wmm_setup_queue_priorities(priv, pWmmParamIe); - wlan_wmm_setup_ac_downgrade(priv); - - if (sendWmmEvent) { - wlan_recv_event(priv, MLAN_EVENT_ID_FW_WMM_CONFIG_CHANGE, MNULL); - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + t_u8 *pcurrent = ptlv; + t_u32 tlv_len; + t_u8 sendWmmEvent; + MrvlIEtypes_Data_t *pTlvHdr; + MrvlIEtypes_WmmQueueStatus_t *pTlvWmmQStatus; + IEEEtypes_WmmParameter_t *pWmmParamIe = MNULL; + WmmAcStatus_t *pac_status; + + MrvlIETypes_ActionFrame_t *pTlvAction; + IEEEtypes_Action_WMM_AddTsRsp_t *pAddTsRsp; + IEEEtypes_Action_WMM_DelTs_t *pDelTs; + + ENTER(); + + sendWmmEvent = MFALSE; + + PRINTM(MINFO, "WMM: WMM_GET_STATUS cmdresp received: %d\n", resp_len); + HEXDUMP("CMD_RESP: WMM_GET_STATUS", pcurrent, resp_len); + + while (resp_len >= sizeof(pTlvHdr->header)) { + pTlvHdr = (MrvlIEtypes_Data_t *) pcurrent; + tlv_len = wlan_le16_to_cpu(pTlvHdr->header.len); + + switch (wlan_le16_to_cpu(pTlvHdr->header.type)) { + case TLV_TYPE_WMMQSTATUS: + pTlvWmmQStatus = + (MrvlIEtypes_WmmQueueStatus_t *) pTlvHdr; + PRINTM(MEVENT, "WMM_STATUS: QSTATUS TLV: %d\n", + pTlvWmmQStatus->queue_index); + + PRINTM(MINFO, + "CMD_RESP: WMM_GET_STATUS: QSTATUS TLV: %d, %d, %d\n", + pTlvWmmQStatus->queue_index, + pTlvWmmQStatus->flow_required, + pTlvWmmQStatus->disabled); + + pac_status = + &priv->wmm.ac_status[pTlvWmmQStatus-> + queue_index]; + pac_status->disabled = pTlvWmmQStatus->disabled; + pac_status->flow_required = + pTlvWmmQStatus->flow_required; + pac_status->flow_created = pTlvWmmQStatus->flow_created; + break; + + case WMM_IE: + /* + * Point the regular IEEE IE 2 bytes into the Marvell IE + * and setup the IEEE IE type and length byte fields + */ + + PRINTM(MEVENT, "WMM STATUS: WMM IE\n"); + + HEXDUMP("WMM: WMM TLV:", (t_u8 *) pTlvHdr, tlv_len + 4); + + pWmmParamIe = + (IEEEtypes_WmmParameter_t *) (pcurrent + 2); + pWmmParamIe->vend_hdr.len = (t_u8) tlv_len; + pWmmParamIe->vend_hdr.element_id = WMM_IE; + + PRINTM(MINFO, + "CMD_RESP: WMM_GET_STATUS: WMM Parameter Set: %d\n", + pWmmParamIe->qos_info.para_set_count); + + memcpy(priv->adapter, + (t_u8 *) & priv->curr_bss_params.bss_descriptor. + wmm_ie, pWmmParamIe, + MIN(sizeof(IEEEtypes_WmmParameter_t), + (pWmmParamIe->vend_hdr.len + 2))); + sendWmmEvent = MTRUE; + break; + + case TLV_TYPE_IEEE_ACTION_FRAME: + PRINTM(MEVENT, "WMM_STATUS: IEEE Action Frame\n"); + pTlvAction = (MrvlIETypes_ActionFrame_t *) pcurrent; + + if (pTlvAction->actionFrame.wmmAc.tspecAct.category + == IEEE_MGMT_ACTION_CATEGORY_WMM_TSPEC) { + + switch (pTlvAction->actionFrame.wmmAc.tspecAct. + action) { + case TSPEC_ACTION_CODE_ADDTS_RSP: + pAddTsRsp = + &pTlvAction->actionFrame.wmmAc. + addTsRsp; + wlan_send_wmmac_host_event(priv, + "ADDTS_RSP", + pTlvAction-> + srcAddr, + pAddTsRsp-> + tspecIE. + TspecBody. + TSInfo.TID, + pAddTsRsp-> + tspecIE. + TspecBody. + TSInfo. + UserPri, + pAddTsRsp-> + statusCode); + break; + + case TSPEC_ACTION_CODE_DELTS: + pDelTs = &pTlvAction->actionFrame.wmmAc. + delTs; + wlan_send_wmmac_host_event(priv, + "DELTS_RX", + pTlvAction-> + srcAddr, + pDelTs-> + tspecIE. + TspecBody. + TSInfo.TID, + pDelTs-> + tspecIE. + TspecBody. + TSInfo. + UserPri, + pDelTs-> + reasonCode); + break; + + case TSPEC_ACTION_CODE_ADDTS_REQ: + default: + break; + } + } + break; + + default: + break; + } + + pcurrent += (tlv_len + sizeof(pTlvHdr->header)); + resp_len -= (tlv_len + sizeof(pTlvHdr->header)); + } + + wlan_wmm_setup_queue_priorities(priv, pWmmParamIe); + wlan_wmm_setup_ac_downgrade(priv); + + if (sendWmmEvent) { + wlan_recv_event(priv, MLAN_EVENT_ID_FW_WMM_CONFIG_CHANGE, + MNULL); + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -1868,59 +2028,61 @@ wlan_ret_wmm_get_status(pmlan_private priv, t_u8 * ptlv, int resp_len) */ t_u32 wlan_wmm_process_association_req(pmlan_private priv, - t_u8 ** ppAssocBuf, - IEEEtypes_WmmParameter_t * pWmmIE, - IEEEtypes_HTCap_t * pHTCap) + t_u8 ** ppAssocBuf, + IEEEtypes_WmmParameter_t * pWmmIE, + IEEEtypes_HTCap_t * pHTCap) { - MrvlIEtypes_WmmParamSet_t *pwmm_tlv; - t_u32 ret_len = 0; - - ENTER(); - - /* Null checks */ - if (!ppAssocBuf) { - LEAVE(); - return 0; - } - if (!(*ppAssocBuf)) { - LEAVE(); - return 0; - } - - if (!pWmmIE) { - LEAVE(); - return 0; - } - - PRINTM(MINFO, "WMM: process assoc req: bss->wmmIe=0x%x\n", - pWmmIE->vend_hdr.element_id); - - if ((priv->wmm_required - || (pHTCap && (pHTCap->ieee_hdr.element_id == HT_CAPABILITY) - && (priv->config_bands & BAND_GN || priv->config_bands & BAND_AN)) - ) - && pWmmIE->vend_hdr.element_id == WMM_IE) { - pwmm_tlv = (MrvlIEtypes_WmmParamSet_t *) * ppAssocBuf; - pwmm_tlv->header.type = (t_u16) wmm_info_ie[0]; - pwmm_tlv->header.type = wlan_cpu_to_le16(pwmm_tlv->header.type); - pwmm_tlv->header.len = (t_u16) wmm_info_ie[1]; - memcpy(priv->adapter, pwmm_tlv->wmm_ie, &wmm_info_ie[2], - pwmm_tlv->header.len); - if (pWmmIE->qos_info.qos_uapsd) - memcpy(priv->adapter, - (t_u8 *) (pwmm_tlv->wmm_ie + pwmm_tlv->header.len - - sizeof(priv->wmm_qosinfo)), &priv->wmm_qosinfo, - sizeof(priv->wmm_qosinfo)); - - ret_len = sizeof(pwmm_tlv->header) + pwmm_tlv->header.len; - pwmm_tlv->header.len = wlan_cpu_to_le16(pwmm_tlv->header.len); - - HEXDUMP("ASSOC_CMD: WMM IE", (t_u8 *) pwmm_tlv, ret_len); - *ppAssocBuf += ret_len; - } - - LEAVE(); - return ret_len; + MrvlIEtypes_WmmParamSet_t *pwmm_tlv; + t_u32 ret_len = 0; + + ENTER(); + + /* Null checks */ + if (!ppAssocBuf) { + LEAVE(); + return 0; + } + if (!(*ppAssocBuf)) { + LEAVE(); + return 0; + } + + if (!pWmmIE) { + LEAVE(); + return 0; + } + + PRINTM(MINFO, "WMM: process assoc req: bss->wmmIe=0x%x\n", + pWmmIE->vend_hdr.element_id); + + if ((priv->wmm_required + || (pHTCap && (pHTCap->ieee_hdr.element_id == HT_CAPABILITY) + && (priv->config_bands & BAND_GN + || priv->config_bands & BAND_AN)) + ) + && pWmmIE->vend_hdr.element_id == WMM_IE) { + pwmm_tlv = (MrvlIEtypes_WmmParamSet_t *) * ppAssocBuf; + pwmm_tlv->header.type = (t_u16) wmm_info_ie[0]; + pwmm_tlv->header.type = wlan_cpu_to_le16(pwmm_tlv->header.type); + pwmm_tlv->header.len = (t_u16) wmm_info_ie[1]; + memcpy(priv->adapter, pwmm_tlv->wmm_ie, &wmm_info_ie[2], + pwmm_tlv->header.len); + if (pWmmIE->qos_info.qos_uapsd) + memcpy(priv->adapter, + (t_u8 *) (pwmm_tlv->wmm_ie + + pwmm_tlv->header.len - + sizeof(priv->wmm_qosinfo)), + &priv->wmm_qosinfo, sizeof(priv->wmm_qosinfo)); + + ret_len = sizeof(pwmm_tlv->header) + pwmm_tlv->header.len; + pwmm_tlv->header.len = wlan_cpu_to_le16(pwmm_tlv->header.len); + + HEXDUMP("ASSOC_CMD: WMM IE", (t_u8 *) pwmm_tlv, ret_len); + *ppAssocBuf += ret_len; + } + + LEAVE(); + return ret_len; } #endif /* STA_SUPPORT */ @@ -1939,33 +2101,34 @@ wlan_wmm_process_association_req(pmlan_private priv, */ t_u8 wlan_wmm_compute_driver_packet_delay(pmlan_private priv, - const pmlan_buffer pmbuf) + const pmlan_buffer pmbuf) { - t_u8 ret_val = 0; - t_u32 out_ts_sec, out_ts_usec; - t_s32 queue_delay; + t_u8 ret_val = 0; + t_u32 out_ts_sec, out_ts_usec; + t_s32 queue_delay; - ENTER(); + ENTER(); - priv->adapter->callbacks.moal_get_system_time(priv->adapter->pmoal_handle, - &out_ts_sec, &out_ts_usec); + priv->adapter->callbacks.moal_get_system_time(priv->adapter-> + pmoal_handle, &out_ts_sec, + &out_ts_usec); - queue_delay = (t_s32) (out_ts_sec - pmbuf->in_ts_sec) * 1000; - queue_delay += (t_s32) (out_ts_usec - pmbuf->in_ts_usec) / 1000; + queue_delay = (t_s32) (out_ts_sec - pmbuf->in_ts_sec) * 1000; + queue_delay += (t_s32) (out_ts_usec - pmbuf->in_ts_usec) / 1000; - /* - * Queue delay is passed as a uint8 in units of 2ms (ms shifted - * by 1). Min value (other than 0) is therefore 2ms, max is 510ms. - * - * Pass max value if queue_delay is beyond the uint8 range - */ - ret_val = (t_u8) (MIN(queue_delay, priv->wmm.drv_pkt_delay_max) >> 1); + /* + * Queue delay is passed as a uint8 in units of 2ms (ms shifted + * by 1). Min value (other than 0) is therefore 2ms, max is 510ms. + * + * Pass max value if queue_delay is beyond the uint8 range + */ + ret_val = (t_u8) (MIN(queue_delay, priv->wmm.drv_pkt_delay_max) >> 1); - PRINTM(MINFO, "WMM: Pkt Delay: %d ms, %d ms sent to FW\n", - queue_delay, ret_val); + PRINTM(MINFO, "WMM: Pkt Delay: %d ms, %d ms sent to FW\n", + queue_delay, ret_val); - LEAVE(); - return ret_val; + LEAVE(); + return ret_val; } /** @@ -1978,20 +2141,20 @@ wlan_wmm_compute_driver_packet_delay(pmlan_private priv, void wlan_wmm_process_tx(pmlan_adapter pmadapter) { - ENTER(); + ENTER(); - do { - if (wlan_dequeue_tx_packet(pmadapter)) - break; - /* Check if busy */ - } while (!pmadapter->data_sent && !pmadapter->tx_lock_flag - && !wlan_wmm_lists_empty(pmadapter)); + do { + if (wlan_dequeue_tx_packet(pmadapter)) + break; + /* Check if busy */ + } while (!pmadapter->data_sent && !pmadapter->tx_lock_flag + && !wlan_wmm_lists_empty(pmadapter)); - LEAVE(); - return; + LEAVE(); + return; } -/** +/** * @brief select wmm queue * * @param pmpriv A pointer to mlan_private structure @@ -2002,22 +2165,22 @@ wlan_wmm_process_tx(pmlan_adapter pmadapter) t_u8 wlan_wmm_select_queue(mlan_private * pmpriv, t_u8 tid) { - pmlan_adapter pmadapter = pmpriv->adapter; - t_u8 i; - mlan_wmm_ac_e ac_down = - pmpriv->wmm. - ac_down_graded_vals[wlan_wmm_convert_tos_to_ac(pmadapter, tid)]; - - ENTER(); - - for (i = 0; i < 4; i++) { - if (pmpriv->wmm.queue_priority[i] == ac_down) { - LEAVE(); - return i; - } - } - LEAVE(); - return 0; + pmlan_adapter pmadapter = pmpriv->adapter; + t_u8 i; + mlan_wmm_ac_e ac_down = + pmpriv->wmm. + ac_down_graded_vals[wlan_wmm_convert_tos_to_ac(pmadapter, tid)]; + + ENTER(); + + for (i = 0; i < 4; i++) { + if (pmpriv->wmm.queue_priority[i] == ac_down) { + LEAVE(); + return i; + } + } + LEAVE(); + return 0; } #if defined(UAP_SUPPORT) @@ -2032,44 +2195,52 @@ wlan_wmm_select_queue(mlan_private * pmpriv, t_u8 tid) */ static INLINE t_u8 wlan_del_tx_pkts_in_ralist(pmlan_private priv, - mlan_list_head * ra_list_head, int tid) + mlan_list_head * ra_list_head, int tid) { - raListTbl *ra_list = MNULL; - pmlan_adapter pmadapter = priv->adapter; - pmlan_buffer pmbuf = MNULL; - t_u8 ret = MFALSE; - ENTER(); - ra_list = - (raListTbl *) util_peek_list(priv->adapter->pmoal_handle, ra_list_head, - MNULL, MNULL); - while (ra_list && ra_list != (raListTbl *) ra_list_head) { - if (ra_list->total_pkts && (ra_list->tx_pause || - (ra_list->total_pkts > RX_LOW_THRESHOLD))) { - if ((pmbuf = - (pmlan_buffer) util_dequeue_list(pmadapter->pmoal_handle, - &ra_list->buf_head, MNULL, - MNULL))) { - PRINTM(MDATA, - "Drop pkts: tid=%d tx_pause=%d pkts=%d brd_pkts=%d " - MACSTR "\n", tid, ra_list->tx_pause, ra_list->total_pkts, - pmadapter->pending_bridge_pkts, MAC2STR(ra_list->ra)); - wlan_write_data_complete(pmadapter, pmbuf, MLAN_STATUS_FAILURE); - priv->wmm.pkts_queued[tid]--; - priv->num_drop_pkts++; - ra_list->total_pkts--; - if (!ra_list->tx_pause) - util_scalar_decrement(pmadapter->pmoal_handle, - &priv->wmm.tx_pkts_queued, MNULL, - MNULL); - ret = MTRUE; - break; - } - } - ra_list = ra_list->pnext; - } - - LEAVE(); - return ret; + raListTbl *ra_list = MNULL; + pmlan_adapter pmadapter = priv->adapter; + pmlan_buffer pmbuf = MNULL; + t_u8 ret = MFALSE; + ENTER(); + ra_list = + (raListTbl *) util_peek_list(priv->adapter->pmoal_handle, + ra_list_head, MNULL, MNULL); + while (ra_list && ra_list != (raListTbl *) ra_list_head) { + if (ra_list->total_pkts && (ra_list->tx_pause || + (ra_list->total_pkts > + RX_LOW_THRESHOLD))) { + if ((pmbuf = + (pmlan_buffer) util_dequeue_list(pmadapter-> + pmoal_handle, + &ra_list-> + buf_head, MNULL, + MNULL))) { + PRINTM(MDATA, + "Drop pkts: tid=%d tx_pause=%d pkts=%d brd_pkts=%d " + MACSTR "\n", tid, ra_list->tx_pause, + ra_list->total_pkts, + pmadapter->pending_bridge_pkts, + MAC2STR(ra_list->ra)); + wlan_write_data_complete(pmadapter, pmbuf, + MLAN_STATUS_FAILURE); + priv->wmm.pkts_queued[tid]--; + priv->num_drop_pkts++; + ra_list->total_pkts--; + if (!ra_list->tx_pause) + util_scalar_decrement(pmadapter-> + pmoal_handle, + &priv->wmm. + tx_pkts_queued, + MNULL, MNULL); + ret = MTRUE; + break; + } + } + ra_list = ra_list->pnext; + } + + LEAVE(); + return ret; } /** @@ -2082,23 +2253,23 @@ wlan_del_tx_pkts_in_ralist(pmlan_private priv, t_void wlan_drop_tx_pkts(pmlan_private priv) { - int j; - static int i = 0; - pmlan_adapter pmadapter = priv->adapter; - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - for (j = 0; j < MAX_NUM_TID; j++, i++) { - if (i == MAX_NUM_TID) - i = 0; - if (wlan_del_tx_pkts_in_ralist - (priv, &priv->wmm.tid_tbl_ptr[i].ra_list, i)) { - i++; - break; - } - } - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - return; + int j; + static int i = 0; + pmlan_adapter pmadapter = priv->adapter; + pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + for (j = 0; j < MAX_NUM_TID; j++, i++) { + if (i == MAX_NUM_TID) + i = 0; + if (wlan_del_tx_pkts_in_ralist + (priv, &priv->wmm.tid_tbl_ptr[i].ra_list, i)) { + i++; + break; + } + } + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + return; } /** @@ -2112,48 +2283,50 @@ wlan_drop_tx_pkts(pmlan_private priv) t_void wlan_wmm_delete_peer_ralist(pmlan_private priv, t_u8 * mac) { - raListTbl *ra_list; - int i; - pmlan_adapter pmadapter = priv->adapter; - t_u32 pkt_cnt = 0; - t_u32 tx_pkts_queued = 0; - - ENTER(); - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - for (i = 0; i < MAX_NUM_TID; ++i) { - ra_list = wlan_wmm_get_ralist_node(priv, i, mac); - if (ra_list) { - PRINTM(MINFO, "delete sta ralist %p\n", ra_list); - if (!ra_list->tx_pause) - pkt_cnt += ra_list->total_pkts; - wlan_wmm_del_pkts_in_ralist_node(priv, ra_list); - - util_unlink_list(pmadapter->pmoal_handle, - &priv->wmm.tid_tbl_ptr[i].ra_list, - (pmlan_linked_list) ra_list, MNULL, MNULL); - pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, - (t_u8 *) ra_list); - if (priv->wmm.tid_tbl_ptr[i].ra_list_curr == ra_list) - priv->wmm.tid_tbl_ptr[i].ra_list_curr = - (raListTbl *) & priv->wmm.tid_tbl_ptr[i].ra_list; - } - } - if (pkt_cnt) { - tx_pkts_queued = util_scalar_read(pmadapter->pmoal_handle, - &priv->wmm.tx_pkts_queued, MNULL, - MNULL); - tx_pkts_queued -= pkt_cnt; - util_scalar_write(priv->adapter->pmoal_handle, - &priv->wmm.tx_pkts_queued, tx_pkts_queued, MNULL, - MNULL); - util_scalar_write(priv->adapter->pmoal_handle, - &priv->wmm.highest_queued_prio, HIGH_PRIO_TID, MNULL, - MNULL); - } - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - priv->wmm.ra_list_spinlock); - LEAVE(); + raListTbl *ra_list; + int i; + pmlan_adapter pmadapter = priv->adapter; + t_u32 pkt_cnt = 0; + t_u32 tx_pkts_queued = 0; + + ENTER(); + pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + for (i = 0; i < MAX_NUM_TID; ++i) { + ra_list = wlan_wmm_get_ralist_node(priv, i, mac); + if (ra_list) { + PRINTM(MINFO, "delete sta ralist %p\n", ra_list); + if (!ra_list->tx_pause) + pkt_cnt += ra_list->total_pkts; + wlan_wmm_del_pkts_in_ralist_node(priv, ra_list); + + util_unlink_list(pmadapter->pmoal_handle, + &priv->wmm.tid_tbl_ptr[i].ra_list, + (pmlan_linked_list) ra_list, MNULL, + MNULL); + pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, + (t_u8 *) ra_list); + if (priv->wmm.tid_tbl_ptr[i].ra_list_curr == ra_list) + priv->wmm.tid_tbl_ptr[i].ra_list_curr = + (raListTbl *) & priv->wmm. + tid_tbl_ptr[i].ra_list; + } + } + if (pkt_cnt) { + tx_pkts_queued = util_scalar_read(pmadapter->pmoal_handle, + &priv->wmm.tx_pkts_queued, + MNULL, MNULL); + tx_pkts_queued -= pkt_cnt; + util_scalar_write(priv->adapter->pmoal_handle, + &priv->wmm.tx_pkts_queued, tx_pkts_queued, + MNULL, MNULL); + util_scalar_write(priv->adapter->pmoal_handle, + &priv->wmm.highest_queued_prio, HIGH_PRIO_TID, + MNULL, MNULL); + } + pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); + LEAVE(); } #endif @@ -2169,30 +2342,30 @@ wlan_wmm_delete_peer_ralist(pmlan_private priv, t_u8 * mac) */ mlan_status wlan_cmd_wmm_addts_req(IN pmlan_private pmpriv, - OUT HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) + OUT HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) { - mlan_ds_wmm_addts *paddts = (mlan_ds_wmm_addts *) pdata_buf; - HostCmd_DS_WMM_ADDTS_REQ *pcmd_addts = &cmd->params.add_ts; + mlan_ds_wmm_addts *paddts = (mlan_ds_wmm_addts *) pdata_buf; + HostCmd_DS_WMM_ADDTS_REQ *pcmd_addts = &cmd->params.add_ts; - ENTER(); + ENTER(); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_WMM_ADDTS_REQ); - cmd->size = wlan_cpu_to_le16(sizeof(pcmd_addts->dialog_token) - + sizeof(pcmd_addts->timeout_ms) - + sizeof(pcmd_addts->command_result) - + sizeof(pcmd_addts->ieee_status_code) - + paddts->ie_data_len + S_DS_GEN); - cmd->result = 0; + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_WMM_ADDTS_REQ); + cmd->size = wlan_cpu_to_le16(sizeof(pcmd_addts->dialog_token) + + sizeof(pcmd_addts->timeout_ms) + + sizeof(pcmd_addts->command_result) + + sizeof(pcmd_addts->ieee_status_code) + + paddts->ie_data_len + S_DS_GEN); + cmd->result = 0; - pcmd_addts->timeout_ms = wlan_cpu_to_le32(paddts->timeout); - pcmd_addts->dialog_token = paddts->dialog_tok; - memcpy(pmpriv->adapter, - pcmd_addts->tspec_data, - paddts->ie_data, MIN(WMM_TSPEC_SIZE, paddts->ie_data_len)); + pcmd_addts->timeout_ms = wlan_cpu_to_le32(paddts->timeout); + pcmd_addts->dialog_token = paddts->dialog_tok; + memcpy(pmpriv->adapter, + pcmd_addts->tspec_data, + paddts->ie_data, MIN(WMM_TSPEC_SIZE, paddts->ie_data_len)); - LEAVE(); + LEAVE(); - return MLAN_STATUS_SUCCESS; + return MLAN_STATUS_SUCCESS; } /** @@ -2206,48 +2379,54 @@ wlan_cmd_wmm_addts_req(IN pmlan_private pmpriv, */ mlan_status wlan_ret_wmm_addts_req(IN pmlan_private pmpriv, - const IN HostCmd_DS_COMMAND * resp, - OUT mlan_ioctl_req * pioctl_buf) + const IN HostCmd_DS_COMMAND * resp, + OUT mlan_ioctl_req * pioctl_buf) { - mlan_ds_wmm_cfg *pwmm = MNULL; - mlan_ds_wmm_addts *paddts = MNULL; - const HostCmd_DS_WMM_ADDTS_REQ *presp_addts = &resp->params.add_ts; - - ENTER(); - - if (pioctl_buf) { - pwmm = (mlan_ds_wmm_cfg *) pioctl_buf->pbuf; - paddts = (mlan_ds_wmm_addts *) & pwmm->param.addts; - paddts->result = presp_addts->command_result; - paddts->dialog_tok = presp_addts->dialog_token; - paddts->status_code = (t_u32) presp_addts->ieee_status_code; - - if (presp_addts->command_result == MLAN_CMD_RESULT_SUCCESS) { - /* The tspecData field is potentially variable in size due to extra - IEs that may have been in the ADDTS response action frame. - Calculate the data length from the firmware command response. */ - paddts->ie_data_len - = (t_u8) (resp->size - sizeof(presp_addts->command_result) - - sizeof(presp_addts->timeout_ms) - - sizeof(presp_addts->dialog_token) - - sizeof(presp_addts->ieee_status_code) - - S_DS_GEN); - - /* Copy the TSPEC data include any extra IEs after the TSPEC */ - memcpy(pmpriv->adapter, - paddts->ie_data, - presp_addts->tspec_data, paddts->ie_data_len); - } else { - paddts->ie_data_len = 0; - } - PRINTM(MINFO, "TSPEC: ADDTS ret = %d,%d sz=%d\n", - paddts->result, paddts->status_code, paddts->ie_data_len); - - HEXDUMP("TSPEC: ADDTS data", paddts->ie_data, paddts->ie_data_len); - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_wmm_cfg *pwmm = MNULL; + mlan_ds_wmm_addts *paddts = MNULL; + const HostCmd_DS_WMM_ADDTS_REQ *presp_addts = &resp->params.add_ts; + + ENTER(); + + if (pioctl_buf) { + pwmm = (mlan_ds_wmm_cfg *) pioctl_buf->pbuf; + paddts = (mlan_ds_wmm_addts *) & pwmm->param.addts; + paddts->result = presp_addts->command_result; + paddts->dialog_tok = presp_addts->dialog_token; + paddts->status_code = (t_u32) presp_addts->ieee_status_code; + + if (presp_addts->command_result == MLAN_CMD_RESULT_SUCCESS) { + /* The tspecData field is potentially variable in size + due to extra IEs that may have been in the ADDTS + response action frame. Calculate the data length + from the firmware command response. */ + paddts->ie_data_len + = (t_u8) (resp->size + - sizeof(presp_addts->command_result) + - sizeof(presp_addts->timeout_ms) + - sizeof(presp_addts->dialog_token) + - + sizeof(presp_addts->ieee_status_code) + - S_DS_GEN); + + /* Copy the TSPEC data include any extra IEs after the + TSPEC */ + memcpy(pmpriv->adapter, + paddts->ie_data, + presp_addts->tspec_data, paddts->ie_data_len); + } else { + paddts->ie_data_len = 0; + } + PRINTM(MINFO, "TSPEC: ADDTS ret = %d,%d sz=%d\n", + paddts->result, paddts->status_code, + paddts->ie_data_len); + + HEXDUMP("TSPEC: ADDTS data", + paddts->ie_data, paddts->ie_data_len); + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -2260,27 +2439,27 @@ wlan_ret_wmm_addts_req(IN pmlan_private pmpriv, */ mlan_status wlan_cmd_wmm_delts_req(IN pmlan_private pmpriv, - OUT HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) + OUT HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) { - mlan_ds_wmm_delts *pdelts = (mlan_ds_wmm_delts *) pdata_buf; - HostCmd_DS_WMM_DELTS_REQ *pcmd_delts = &cmd->params.del_ts; + mlan_ds_wmm_delts *pdelts = (mlan_ds_wmm_delts *) pdata_buf; + HostCmd_DS_WMM_DELTS_REQ *pcmd_delts = &cmd->params.del_ts; - ENTER(); + ENTER(); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_WMM_DELTS_REQ); - cmd->size = wlan_cpu_to_le16(sizeof(pcmd_delts->dialog_token) - + sizeof(pcmd_delts->command_result) - + sizeof(pcmd_delts->ieee_reason_code) - + pdelts->ie_data_len + S_DS_GEN); - cmd->result = 0; - pcmd_delts->ieee_reason_code = (t_u8) pdelts->status_code; - memcpy(pmpriv->adapter, - pcmd_delts->tspec_data, - pdelts->ie_data, MIN(WMM_TSPEC_SIZE, pdelts->ie_data_len)); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_WMM_DELTS_REQ); + cmd->size = wlan_cpu_to_le16(sizeof(pcmd_delts->dialog_token) + + sizeof(pcmd_delts->command_result) + + sizeof(pcmd_delts->ieee_reason_code) + + pdelts->ie_data_len + S_DS_GEN); + cmd->result = 0; + pcmd_delts->ieee_reason_code = (t_u8) pdelts->status_code; + memcpy(pmpriv->adapter, + pcmd_delts->tspec_data, + pdelts->ie_data, MIN(WMM_TSPEC_SIZE, pdelts->ie_data_len)); - LEAVE(); + LEAVE(); - return MLAN_STATUS_SUCCESS; + return MLAN_STATUS_SUCCESS; } /** @@ -2294,36 +2473,39 @@ wlan_cmd_wmm_delts_req(IN pmlan_private pmpriv, */ mlan_status wlan_ret_wmm_delts_req(IN pmlan_private pmpriv, - const IN HostCmd_DS_COMMAND * resp, - OUT mlan_ioctl_req * pioctl_buf) + const IN HostCmd_DS_COMMAND * resp, + OUT mlan_ioctl_req * pioctl_buf) { - mlan_ds_wmm_cfg *pwmm; - IEEEtypes_WMM_TSPEC_t *pTspecIE; - const HostCmd_DS_WMM_DELTS_REQ *presp_delts = &resp->params.del_ts; - - ENTER(); - - if (pioctl_buf) { - pwmm = (mlan_ds_wmm_cfg *) pioctl_buf->pbuf; - pwmm->param.delts.result = presp_delts->command_result; - - PRINTM(MINFO, "TSPEC: DELTS result = %d\n", - presp_delts->command_result); - - if (presp_delts->command_result == 0) { - pTspecIE = (IEEEtypes_WMM_TSPEC_t *) presp_delts->tspec_data; - wlan_send_wmmac_host_event(pmpriv, - "DELTS_TX", - MNULL, - pTspecIE->TspecBody.TSInfo.TID, - pTspecIE->TspecBody.TSInfo.UserPri, - presp_delts->ieee_reason_code); - - } - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_wmm_cfg *pwmm; + IEEEtypes_WMM_TSPEC_t *pTspecIE; + const HostCmd_DS_WMM_DELTS_REQ *presp_delts = &resp->params.del_ts; + + ENTER(); + + if (pioctl_buf) { + pwmm = (mlan_ds_wmm_cfg *) pioctl_buf->pbuf; + pwmm->param.delts.result = presp_delts->command_result; + + PRINTM(MINFO, "TSPEC: DELTS result = %d\n", + presp_delts->command_result); + + if (presp_delts->command_result == 0) { + pTspecIE = + (IEEEtypes_WMM_TSPEC_t *) presp_delts-> + tspec_data; + wlan_send_wmmac_host_event(pmpriv, "DELTS_TX", MNULL, + pTspecIE->TspecBody.TSInfo. + TID, + pTspecIE->TspecBody.TSInfo. + UserPri, + presp_delts-> + ieee_reason_code); + + } + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -2336,35 +2518,37 @@ wlan_ret_wmm_delts_req(IN pmlan_private pmpriv, */ mlan_status wlan_cmd_wmm_queue_stats(IN pmlan_private pmpriv, - OUT HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) + OUT HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) { - mlan_ds_wmm_queue_stats *pqstats = (mlan_ds_wmm_queue_stats *) pdata_buf; - HostCmd_DS_WMM_QUEUE_STATS *pcmd_qstats = &cmd->params.queue_stats; - t_u8 id; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_WMM_QUEUE_STATS); - cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_WMM_QUEUE_STATS) - + S_DS_GEN); - cmd->result = 0; - - pcmd_qstats->action = pqstats->action; - pcmd_qstats->select_is_userpri = 1; - pcmd_qstats->select_bin = pqstats->user_priority; - pcmd_qstats->pkt_count = wlan_cpu_to_le16(pqstats->pkt_count); - pcmd_qstats->pkt_loss = wlan_cpu_to_le16(pqstats->pkt_loss); - pcmd_qstats->avg_queue_delay = wlan_cpu_to_le32(pqstats->avg_queue_delay); - pcmd_qstats->avg_tx_delay = wlan_cpu_to_le32(pqstats->avg_tx_delay); - pcmd_qstats->used_time = wlan_cpu_to_le16(pqstats->used_time); - pcmd_qstats->policed_time = wlan_cpu_to_le16(pqstats->policed_time); - for (id = 0; id < MLAN_WMM_STATS_PKTS_HIST_BINS; id++) { - pcmd_qstats->delay_histogram[id] = - wlan_cpu_to_le16(pqstats->delay_histogram[id]); - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_wmm_queue_stats *pqstats = + (mlan_ds_wmm_queue_stats *) pdata_buf; + HostCmd_DS_WMM_QUEUE_STATS *pcmd_qstats = &cmd->params.queue_stats; + t_u8 id; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_WMM_QUEUE_STATS); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_WMM_QUEUE_STATS) + + S_DS_GEN); + cmd->result = 0; + + pcmd_qstats->action = pqstats->action; + pcmd_qstats->select_is_userpri = 1; + pcmd_qstats->select_bin = pqstats->user_priority; + pcmd_qstats->pkt_count = wlan_cpu_to_le16(pqstats->pkt_count); + pcmd_qstats->pkt_loss = wlan_cpu_to_le16(pqstats->pkt_loss); + pcmd_qstats->avg_queue_delay = + wlan_cpu_to_le32(pqstats->avg_queue_delay); + pcmd_qstats->avg_tx_delay = wlan_cpu_to_le32(pqstats->avg_tx_delay); + pcmd_qstats->used_time = wlan_cpu_to_le16(pqstats->used_time); + pcmd_qstats->policed_time = wlan_cpu_to_le16(pqstats->policed_time); + for (id = 0; id < MLAN_WMM_STATS_PKTS_HIST_BINS; id++) { + pcmd_qstats->delay_histogram[id] = + wlan_cpu_to_le16(pqstats->delay_histogram[id]); + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -2378,37 +2562,41 @@ wlan_cmd_wmm_queue_stats(IN pmlan_private pmpriv, */ mlan_status wlan_ret_wmm_queue_stats(IN pmlan_private pmpriv, - const IN HostCmd_DS_COMMAND * resp, - OUT mlan_ioctl_req * pioctl_buf) + const IN HostCmd_DS_COMMAND * resp, + OUT mlan_ioctl_req * pioctl_buf) { - mlan_ds_wmm_cfg *pwmm = MNULL; - mlan_ds_wmm_queue_stats *pqstats = MNULL; - const HostCmd_DS_WMM_QUEUE_STATS *presp_qstats = &resp->params.queue_stats; - t_u8 id; - - ENTER(); - - if (pioctl_buf) { - pwmm = (mlan_ds_wmm_cfg *) pioctl_buf->pbuf; - pqstats = (mlan_ds_wmm_queue_stats *) & pwmm->param.q_stats; - - pqstats->action = presp_qstats->action; - pqstats->user_priority = presp_qstats->select_bin; - pqstats->pkt_count = wlan_le16_to_cpu(presp_qstats->pkt_count); - pqstats->pkt_loss = wlan_le16_to_cpu(presp_qstats->pkt_loss); - pqstats->avg_queue_delay - = wlan_le32_to_cpu(presp_qstats->avg_queue_delay); - pqstats->avg_tx_delay = wlan_le32_to_cpu(presp_qstats->avg_tx_delay); - pqstats->used_time = wlan_le16_to_cpu(presp_qstats->used_time); - pqstats->policed_time = wlan_le16_to_cpu(presp_qstats->policed_time); - for (id = 0; id < MLAN_WMM_STATS_PKTS_HIST_BINS; id++) { - pqstats->delay_histogram[id] - = wlan_le16_to_cpu(presp_qstats->delay_histogram[id]); - } - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_wmm_cfg *pwmm = MNULL; + mlan_ds_wmm_queue_stats *pqstats = MNULL; + const HostCmd_DS_WMM_QUEUE_STATS *presp_qstats = + &resp->params.queue_stats; + t_u8 id; + + ENTER(); + + if (pioctl_buf) { + pwmm = (mlan_ds_wmm_cfg *) pioctl_buf->pbuf; + pqstats = (mlan_ds_wmm_queue_stats *) & pwmm->param.q_stats; + + pqstats->action = presp_qstats->action; + pqstats->user_priority = presp_qstats->select_bin; + pqstats->pkt_count = wlan_le16_to_cpu(presp_qstats->pkt_count); + pqstats->pkt_loss = wlan_le16_to_cpu(presp_qstats->pkt_loss); + pqstats->avg_queue_delay + = wlan_le32_to_cpu(presp_qstats->avg_queue_delay); + pqstats->avg_tx_delay + = wlan_le32_to_cpu(presp_qstats->avg_tx_delay); + pqstats->used_time = wlan_le16_to_cpu(presp_qstats->used_time); + pqstats->policed_time + = wlan_le16_to_cpu(presp_qstats->policed_time); + for (id = 0; id < MLAN_WMM_STATS_PKTS_HIST_BINS; id++) { + pqstats->delay_histogram[id] + = wlan_le16_to_cpu(presp_qstats-> + delay_histogram[id]); + } + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -2421,23 +2609,23 @@ wlan_ret_wmm_queue_stats(IN pmlan_private pmpriv, */ mlan_status wlan_cmd_wmm_ts_status(IN pmlan_private pmpriv, - OUT HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) + OUT HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) { - mlan_ds_wmm_ts_status *pts_status = (mlan_ds_wmm_ts_status *) pdata_buf; - HostCmd_DS_WMM_TS_STATUS *pcmd_ts_status = &cmd->params.ts_status; + mlan_ds_wmm_ts_status *pts_status = (mlan_ds_wmm_ts_status *) pdata_buf; + HostCmd_DS_WMM_TS_STATUS *pcmd_ts_status = &cmd->params.ts_status; - ENTER(); + ENTER(); - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_WMM_TS_STATUS); - cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_WMM_TS_STATUS) - + S_DS_GEN); - cmd->result = 0; + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_WMM_TS_STATUS); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_WMM_TS_STATUS) + + S_DS_GEN); + cmd->result = 0; - memcpy(pmpriv->adapter, (t_void *) pcmd_ts_status, (t_void *) pts_status, - sizeof(HostCmd_DS_WMM_TS_STATUS)); + memcpy(pmpriv->adapter, (t_void *) pcmd_ts_status, + (t_void *) pts_status, sizeof(HostCmd_DS_WMM_TS_STATUS)); - LEAVE(); - return MLAN_STATUS_SUCCESS; + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -2451,28 +2639,29 @@ wlan_cmd_wmm_ts_status(IN pmlan_private pmpriv, */ mlan_status wlan_ret_wmm_ts_status(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - OUT mlan_ioctl_req * pioctl_buf) + IN HostCmd_DS_COMMAND * resp, + OUT mlan_ioctl_req * pioctl_buf) { - mlan_ds_wmm_cfg *pwmm = MNULL; - HostCmd_DS_WMM_TS_STATUS *presp_ts_status = &resp->params.ts_status; - - ENTER(); - - if (pioctl_buf) { - pwmm = (mlan_ds_wmm_cfg *) pioctl_buf->pbuf; - presp_ts_status->medium_time - = wlan_le16_to_cpu(presp_ts_status->medium_time); - memcpy(pmpriv->adapter, - (t_void *) & pwmm->param.ts_status, - (t_void *) presp_ts_status, sizeof(mlan_ds_wmm_ts_status)); - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_wmm_cfg *pwmm = MNULL; + HostCmd_DS_WMM_TS_STATUS *presp_ts_status = &resp->params.ts_status; + + ENTER(); + + if (pioctl_buf) { + pwmm = (mlan_ds_wmm_cfg *) pioctl_buf->pbuf; + presp_ts_status->medium_time + = wlan_le16_to_cpu(presp_ts_status->medium_time); + memcpy(pmpriv->adapter, + (t_void *) & pwmm->param.ts_status, + (t_void *) presp_ts_status, + sizeof(mlan_ds_wmm_ts_status)); + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } -/** +/** * @brief Set/Get WMM status * * @param pmadapter A pointer to mlan_adapter structure @@ -2483,21 +2672,21 @@ wlan_ret_wmm_ts_status(IN pmlan_private pmpriv, static mlan_status wlan_wmm_ioctl_enable(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_wmm_cfg *wmm = MNULL; - ENTER(); - wmm = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) - wmm->param.wmm_enable = (t_u32) pmpriv->wmm_required; - else - pmpriv->wmm_required = (t_u8) wmm->param.wmm_enable; - pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_wmm_cfg *wmm = MNULL; + ENTER(); + wmm = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; + if (pioctl_req->action == MLAN_ACT_GET) + wmm->param.wmm_enable = (t_u32) pmpriv->wmm_required; + else + pmpriv->wmm_required = (t_u8) wmm->param.wmm_enable; + pioctl_req->data_read_written = sizeof(t_u32) + MLAN_SUB_COMMAND_SIZE; + LEAVE(); + return ret; } -/** +/** * @brief Set/Get WMM QoS configuration * * @param pmadapter A pointer to mlan_adapter structure @@ -2508,24 +2697,24 @@ wlan_wmm_ioctl_enable(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) static mlan_status wlan_wmm_ioctl_qos(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_wmm_cfg *wmm = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_wmm_cfg *wmm = MNULL; - ENTER(); + ENTER(); - wmm = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; + wmm = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; - if (pioctl_req->action == MLAN_ACT_GET) - wmm->param.qos_cfg = pmpriv->wmm_qosinfo; - else { - pmpriv->wmm_qosinfo = wmm->param.qos_cfg; - } + if (pioctl_req->action == MLAN_ACT_GET) + wmm->param.qos_cfg = pmpriv->wmm_qosinfo; + else { + pmpriv->wmm_qosinfo = wmm->param.qos_cfg; + } - pioctl_req->data_read_written = sizeof(t_u8) + MLAN_SUB_COMMAND_SIZE; + pioctl_req->data_read_written = sizeof(t_u8) + MLAN_SUB_COMMAND_SIZE; - LEAVE(); - return ret; + LEAVE(); + return ret; } /** @@ -2538,25 +2727,25 @@ wlan_wmm_ioctl_qos(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) */ static mlan_status wlan_wmm_ioctl_addts_req(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_wmm_cfg *cfg = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_wmm_cfg *cfg = MNULL; - ENTER(); - cfg = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; + ENTER(); + cfg = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_WMM_ADDTS_REQ, - 0, 0, (t_void *) pioctl_req, - (t_void *) & cfg->param.addts); + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_WMM_ADDTS_REQ, + 0, 0, (t_void *) pioctl_req, + (t_void *) & cfg->param.addts); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } /** @@ -2569,25 +2758,25 @@ wlan_wmm_ioctl_addts_req(IN pmlan_adapter pmadapter, */ static mlan_status wlan_wmm_ioctl_delts_req(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_wmm_cfg *cfg = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_wmm_cfg *cfg = MNULL; - ENTER(); - cfg = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; + ENTER(); + cfg = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_WMM_DELTS_REQ, - 0, 0, (t_void *) pioctl_req, - (t_void *) & cfg->param.delts); + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_WMM_DELTS_REQ, + 0, 0, (t_void *) pioctl_req, + (t_void *) & cfg->param.delts); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } /** @@ -2600,25 +2789,25 @@ wlan_wmm_ioctl_delts_req(IN pmlan_adapter pmadapter, */ static mlan_status wlan_wmm_ioctl_queue_stats(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_wmm_cfg *cfg = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_wmm_cfg *cfg = MNULL; - ENTER(); - cfg = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; + ENTER(); + cfg = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_WMM_QUEUE_STATS, - 0, 0, (t_void *) pioctl_req, - (t_void *) & cfg->param.q_stats); + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_WMM_QUEUE_STATS, + 0, 0, (t_void *) pioctl_req, + (t_void *) & cfg->param.q_stats); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } /** @@ -2631,34 +2820,36 @@ wlan_wmm_ioctl_queue_stats(IN pmlan_adapter pmadapter, */ static mlan_status wlan_wmm_ioctl_queue_status(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_wmm_cfg *cfg = MNULL; - mlan_ds_wmm_queue_status *pqstatus = MNULL; - WmmAcStatus_t *pac_status = MNULL; - mlan_wmm_ac_e ac_idx; - - ENTER(); - - cfg = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; - pqstatus = (mlan_ds_wmm_queue_status *) & cfg->param.q_status; - - for (ac_idx = WMM_AC_BK; ac_idx <= WMM_AC_VO; ac_idx++) { - pac_status = &pmpriv->wmm.ac_status[ac_idx]; - - /* Firmware status */ - pqstatus->ac_status[ac_idx].flow_required = pac_status->flow_required; - pqstatus->ac_status[ac_idx].flow_created = pac_status->flow_created; - pqstatus->ac_status[ac_idx].disabled = pac_status->disabled; - - /* ACM bit reflected in firmware status (redundant) */ - pqstatus->ac_status[ac_idx].wmm_acm = pac_status->flow_required; - } - - LEAVE(); - return ret; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_wmm_cfg *cfg = MNULL; + mlan_ds_wmm_queue_status *pqstatus = MNULL; + WmmAcStatus_t *pac_status = MNULL; + mlan_wmm_ac_e ac_idx; + + ENTER(); + + cfg = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; + pqstatus = (mlan_ds_wmm_queue_status *) & cfg->param.q_status; + + for (ac_idx = WMM_AC_BK; ac_idx <= WMM_AC_VO; ac_idx++) { + pac_status = &pmpriv->wmm.ac_status[ac_idx]; + + /* Firmware status */ + pqstatus->ac_status[ac_idx].flow_required = + pac_status->flow_required; + pqstatus->ac_status[ac_idx].flow_created = + pac_status->flow_created; + pqstatus->ac_status[ac_idx].disabled = pac_status->disabled; + + /* ACM bit reflected in firmware status (redundant) */ + pqstatus->ac_status[ac_idx].wmm_acm = pac_status->flow_required; + } + + LEAVE(); + return ret; } /** @@ -2671,26 +2862,26 @@ wlan_wmm_ioctl_queue_status(IN pmlan_adapter pmadapter, */ static mlan_status wlan_wmm_ioctl_ts_status(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_wmm_cfg *cfg = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_wmm_cfg *cfg = MNULL; - ENTER(); + ENTER(); - cfg = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; + cfg = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_WMM_TS_STATUS, - 0, 0, (t_void *) pioctl_req, - (t_void *) & cfg->param.ts_status); + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_WMM_TS_STATUS, + 0, 0, (t_void *) pioctl_req, + (t_void *) & cfg->param.ts_status); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } #endif /* STA_SUPPORT */ @@ -2704,27 +2895,28 @@ wlan_wmm_ioctl_ts_status(IN pmlan_adapter pmadapter, */ mlan_status wlan_cmd_wmm_queue_config(IN pmlan_private pmpriv, - OUT HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) + OUT HostCmd_DS_COMMAND * cmd, IN t_void * pdata_buf) { - mlan_ds_wmm_queue_config *pqcfg = (mlan_ds_wmm_queue_config *) pdata_buf; - HostCmd_DS_WMM_QUEUE_CONFIG *pcmd_qcfg = &cmd->params.queue_config; - - ENTER(); - - cmd->command = wlan_cpu_to_le16(HostCmd_CMD_WMM_QUEUE_CONFIG); - cmd->size = wlan_cpu_to_le16(sizeof(pcmd_qcfg->action) - + sizeof(pcmd_qcfg->access_category) - + sizeof(pcmd_qcfg->msdu_lifetime_expiry) - + S_DS_GEN); - cmd->result = 0; - - pcmd_qcfg->action = pqcfg->action; - pcmd_qcfg->access_category = pqcfg->access_category; - pcmd_qcfg->msdu_lifetime_expiry = - wlan_cpu_to_le16(pqcfg->msdu_lifetime_expiry); - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_wmm_queue_config *pqcfg = + (mlan_ds_wmm_queue_config *) pdata_buf; + HostCmd_DS_WMM_QUEUE_CONFIG *pcmd_qcfg = &cmd->params.queue_config; + + ENTER(); + + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_WMM_QUEUE_CONFIG); + cmd->size = wlan_cpu_to_le16(sizeof(pcmd_qcfg->action) + + sizeof(pcmd_qcfg->access_category) + + sizeof(pcmd_qcfg->msdu_lifetime_expiry) + + S_DS_GEN); + cmd->result = 0; + + pcmd_qcfg->action = pqcfg->action; + pcmd_qcfg->access_category = pqcfg->access_category; + pcmd_qcfg->msdu_lifetime_expiry = + wlan_cpu_to_le16(pqcfg->msdu_lifetime_expiry); + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -2738,24 +2930,25 @@ wlan_cmd_wmm_queue_config(IN pmlan_private pmpriv, */ mlan_status wlan_ret_wmm_queue_config(IN pmlan_private pmpriv, - const IN HostCmd_DS_COMMAND * resp, - OUT mlan_ioctl_req * pioctl_buf) + const IN HostCmd_DS_COMMAND * resp, + OUT mlan_ioctl_req * pioctl_buf) { - mlan_ds_wmm_cfg *pwmm = MNULL; - const HostCmd_DS_WMM_QUEUE_CONFIG *presp_qcfg = &resp->params.queue_config; - - ENTER(); - - if (pioctl_buf) { - pwmm = (mlan_ds_wmm_cfg *) pioctl_buf->pbuf; - pwmm->param.q_cfg.action = presp_qcfg->action; - pwmm->param.q_cfg.access_category = presp_qcfg->access_category; - pwmm->param.q_cfg.msdu_lifetime_expiry = - wlan_le16_to_cpu(presp_qcfg->msdu_lifetime_expiry); - } - - LEAVE(); - return MLAN_STATUS_SUCCESS; + mlan_ds_wmm_cfg *pwmm = MNULL; + const HostCmd_DS_WMM_QUEUE_CONFIG *presp_qcfg = + &resp->params.queue_config; + + ENTER(); + + if (pioctl_buf) { + pwmm = (mlan_ds_wmm_cfg *) pioctl_buf->pbuf; + pwmm->param.q_cfg.action = presp_qcfg->action; + pwmm->param.q_cfg.access_category = presp_qcfg->access_category; + pwmm->param.q_cfg.msdu_lifetime_expiry = + wlan_le16_to_cpu(presp_qcfg->msdu_lifetime_expiry); + } + + LEAVE(); + return MLAN_STATUS_SUCCESS; } /** @@ -2768,28 +2961,28 @@ wlan_ret_wmm_queue_config(IN pmlan_private pmpriv, */ static mlan_status wlan_wmm_ioctl_queue_config(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + IN pmlan_ioctl_req pioctl_req) { - mlan_status ret = MLAN_STATUS_SUCCESS; - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; - mlan_ds_wmm_cfg *cfg = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_wmm_cfg *cfg = MNULL; - ENTER(); - cfg = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; + ENTER(); + cfg = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; - /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_WMM_QUEUE_CONFIG, - 0, 0, (t_void *) pioctl_req, - (t_void *) & cfg->param.q_cfg); + /* Send request to firmware */ + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_WMM_QUEUE_CONFIG, + 0, 0, (t_void *) pioctl_req, + (t_void *) & cfg->param.q_cfg); - if (ret == MLAN_STATUS_SUCCESS) - ret = MLAN_STATUS_PENDING; + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; - LEAVE(); - return ret; + LEAVE(); + return ret; } -/** +/** * @brief WMM configuration handler * * @param pmadapter A pointer to mlan_adapter structure @@ -2800,52 +2993,52 @@ wlan_wmm_ioctl_queue_config(IN pmlan_adapter pmadapter, mlan_status wlan_wmm_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) { - mlan_status status = MLAN_STATUS_SUCCESS; - mlan_ds_wmm_cfg *wmm = MNULL; - - ENTER(); - - if (pioctl_req->buf_len < sizeof(mlan_ds_wmm_cfg)) { - PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); - pioctl_req->data_read_written = 0; - pioctl_req->buf_len_needed = sizeof(mlan_ds_wmm_cfg); - pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; - LEAVE(); - return MLAN_STATUS_RESOURCE; - } - wmm = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; - switch (wmm->sub_command) { + mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_wmm_cfg *wmm = MNULL; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_wmm_cfg)) { + PRINTM(MWARN, "MLAN bss IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_wmm_cfg); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + wmm = (mlan_ds_wmm_cfg *) pioctl_req->pbuf; + switch (wmm->sub_command) { #ifdef STA_SUPPORT - case MLAN_OID_WMM_CFG_ENABLE: - status = wlan_wmm_ioctl_enable(pmadapter, pioctl_req); - break; - case MLAN_OID_WMM_CFG_QOS: - status = wlan_wmm_ioctl_qos(pmadapter, pioctl_req); - break; - case MLAN_OID_WMM_CFG_ADDTS: - status = wlan_wmm_ioctl_addts_req(pmadapter, pioctl_req); - break; - case MLAN_OID_WMM_CFG_DELTS: - status = wlan_wmm_ioctl_delts_req(pmadapter, pioctl_req); - break; - case MLAN_OID_WMM_CFG_QUEUE_STATS: - status = wlan_wmm_ioctl_queue_stats(pmadapter, pioctl_req); - break; - case MLAN_OID_WMM_CFG_QUEUE_STATUS: - status = wlan_wmm_ioctl_queue_status(pmadapter, pioctl_req); - break; - case MLAN_OID_WMM_CFG_TS_STATUS: - status = wlan_wmm_ioctl_ts_status(pmadapter, pioctl_req); - break; + case MLAN_OID_WMM_CFG_ENABLE: + status = wlan_wmm_ioctl_enable(pmadapter, pioctl_req); + break; + case MLAN_OID_WMM_CFG_QOS: + status = wlan_wmm_ioctl_qos(pmadapter, pioctl_req); + break; + case MLAN_OID_WMM_CFG_ADDTS: + status = wlan_wmm_ioctl_addts_req(pmadapter, pioctl_req); + break; + case MLAN_OID_WMM_CFG_DELTS: + status = wlan_wmm_ioctl_delts_req(pmadapter, pioctl_req); + break; + case MLAN_OID_WMM_CFG_QUEUE_STATS: + status = wlan_wmm_ioctl_queue_stats(pmadapter, pioctl_req); + break; + case MLAN_OID_WMM_CFG_QUEUE_STATUS: + status = wlan_wmm_ioctl_queue_status(pmadapter, pioctl_req); + break; + case MLAN_OID_WMM_CFG_TS_STATUS: + status = wlan_wmm_ioctl_ts_status(pmadapter, pioctl_req); + break; #endif - case MLAN_OID_WMM_CFG_QUEUE_CONFIG: - status = wlan_wmm_ioctl_queue_config(pmadapter, pioctl_req); - break; - default: - pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; - status = MLAN_STATUS_FAILURE; - break; - } - LEAVE(); - return status; + case MLAN_OID_WMM_CFG_QUEUE_CONFIG: + status = wlan_wmm_ioctl_queue_config(pmadapter, pioctl_req); + break; + default: + pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; + status = MLAN_STATUS_FAILURE; + break; + } + LEAVE(); + return status; } diff --git a/drivers/net/wireless/sd8897/mlan/mlan_wmm.h b/drivers/net/wireless/sd8897/mlan/mlan_wmm.h index e36dea734b6d..c60dd4d1cfde 100644 --- a/drivers/net/wireless/sd8897/mlan/mlan_wmm.h +++ b/drivers/net/wireless/sd8897/mlan/mlan_wmm.h @@ -3,7 +3,7 @@ * @brief This file contains related macros, enum, and struct * of wmm functionalities * - * Copyright (C) 2008-2011, Marvell International Ltd. + * Copyright (C) 2008-2011, Marvell International Ltd. * * This software file (the "File") is distributed by Marvell International * Ltd. under the terms of the GNU General Public License Version 2, June 1991 @@ -29,7 +29,7 @@ Change log: /** * @brief This function gets the TID - * + * * @param pmadapter A pointer to mlan_adapter structure * @param ptr A pointer to RA list table * @@ -38,20 +38,19 @@ Change log: static INLINE int wlan_get_tid(pmlan_adapter pmadapter, raListTbl * ptr) { - pmlan_buffer mbuf; + pmlan_buffer mbuf; - ENTER(); - mbuf = - (pmlan_buffer) util_peek_list(pmadapter->pmoal_handle, &ptr->buf_head, - MNULL, MNULL); - LEAVE(); + ENTER(); + mbuf = (pmlan_buffer) util_peek_list(pmadapter->pmoal_handle, + &ptr->buf_head, MNULL, MNULL); + LEAVE(); - return mbuf->priority; + return mbuf->priority; } /** * @brief This function gets the length of a list - * + * * @param pmadapter A pointer to mlan_adapter structure * @param head A pointer to mlan_list_head * @@ -60,20 +59,20 @@ wlan_get_tid(pmlan_adapter pmadapter, raListTbl * ptr) static INLINE int wlan_wmm_list_len(pmlan_adapter pmadapter, pmlan_list_head head) { - pmlan_linked_list pos; - int count = 0; + pmlan_linked_list pos; + int count = 0; - ENTER(); + ENTER(); - pos = head->pnext; + pos = head->pnext; - while (pos != (pmlan_linked_list) head) { - ++count; - pos = pos->pnext; - } + while (pos != (pmlan_linked_list) head) { + ++count; + pos = pos->pnext; + } - LEAVE(); - return count; + LEAVE(); + return count; } /** Add buffer to WMM Tx queue */ @@ -93,12 +92,12 @@ t_void wlan_wmm_process_tx(pmlan_adapter pmadapter); int wlan_is_ralist_valid(mlan_private * priv, raListTbl * ra_list, int tid); raListTbl *wlan_wmm_get_ralist_node(pmlan_private priv, t_u8 tid, - t_u8 * ra_addr); + t_u8 * ra_addr); t_u8 wlan_get_random_ba_threshold(pmlan_adapter pmadapter); /** Compute driver packet delay */ t_u8 wlan_wmm_compute_driver_packet_delay(pmlan_private priv, - const pmlan_buffer pmbuf); + const pmlan_buffer pmbuf); /** Initialize WMM */ t_void wlan_wmm_init(pmlan_adapter pmadapter); /** Setup WMM queues */ @@ -109,14 +108,14 @@ void wlan_wmm_default_queue_priorities(pmlan_private priv); #ifdef STA_SUPPORT /** Process WMM association request */ extern t_u32 wlan_wmm_process_association_req(pmlan_private priv, - t_u8 ** ppAssocBuf, - IEEEtypes_WmmParameter_t * pWmmIE, - IEEEtypes_HTCap_t * pHTCap); + t_u8 ** ppAssocBuf, + IEEEtypes_WmmParameter_t * pWmmIE, + IEEEtypes_HTCap_t * pHTCap); #endif /* STA_SUPPORT */ /** setup wmm queue priorities */ void wlan_wmm_setup_queue_priorities(pmlan_private priv, - IEEEtypes_WmmParameter_t * wmm_ie); + IEEEtypes_WmmParameter_t * wmm_ie); /** Downgrade WMM priority queue */ void wlan_wmm_setup_ac_downgrade(pmlan_private priv); @@ -127,60 +126,60 @@ t_void wlan_wmm_delete_peer_ralist(pmlan_private priv, t_u8 * mac); #endif #ifdef STA_SUPPORT -/* +/* * Functions used in the cmd handling routine */ /** WMM ADDTS request command handler */ extern mlan_status wlan_cmd_wmm_addts_req(IN pmlan_private pmpriv, - OUT HostCmd_DS_COMMAND * cmd, - IN t_void * pdata_buf); + OUT HostCmd_DS_COMMAND * cmd, + IN t_void * pdata_buf); /** WMM DELTS request command handler */ extern mlan_status wlan_cmd_wmm_delts_req(IN pmlan_private pmpriv, - OUT HostCmd_DS_COMMAND * cmd, - IN t_void * pdata_buf); + OUT HostCmd_DS_COMMAND * cmd, + IN t_void * pdata_buf); /** WMM QUEUE_STATS command handler */ extern mlan_status wlan_cmd_wmm_queue_stats(IN pmlan_private pmpriv, - OUT HostCmd_DS_COMMAND * cmd, - IN t_void * pdata_buf); + OUT HostCmd_DS_COMMAND * cmd, + IN t_void * pdata_buf); /** WMM TS_STATUS command handler */ extern mlan_status wlan_cmd_wmm_ts_status(IN pmlan_private pmpriv, - OUT HostCmd_DS_COMMAND * cmd, - IN t_void * pdata_buf); + OUT HostCmd_DS_COMMAND * cmd, + IN t_void * pdata_buf); -/* +/* * Functions used in the cmdresp handling routine */ /** WMM get status command response handler */ extern mlan_status wlan_ret_wmm_get_status(IN pmlan_private priv, - IN t_u8 * ptlv, IN int resp_len); + IN t_u8 * ptlv, IN int resp_len); /** WMM ADDTS request command response handler */ extern mlan_status wlan_ret_wmm_addts_req(IN pmlan_private pmpriv, - const IN HostCmd_DS_COMMAND * resp, - OUT mlan_ioctl_req * pioctl_buf); + const IN HostCmd_DS_COMMAND * resp, + OUT mlan_ioctl_req * pioctl_buf); /** WMM DELTS request command response handler */ extern mlan_status wlan_ret_wmm_delts_req(IN pmlan_private pmpriv, - const IN HostCmd_DS_COMMAND * resp, - OUT mlan_ioctl_req * pioctl_buf); + const IN HostCmd_DS_COMMAND * resp, + OUT mlan_ioctl_req * pioctl_buf); /** WMM QUEUE_STATS command response handler */ extern mlan_status wlan_ret_wmm_queue_stats(IN pmlan_private pmpriv, - const IN HostCmd_DS_COMMAND * resp, - OUT mlan_ioctl_req * pioctl_buf); + const IN HostCmd_DS_COMMAND * resp, + OUT mlan_ioctl_req * pioctl_buf); /** WMM TS_STATUS command response handler */ extern mlan_status wlan_ret_wmm_ts_status(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND * resp, - OUT mlan_ioctl_req * pioctl_buf); + IN HostCmd_DS_COMMAND * resp, + OUT mlan_ioctl_req * pioctl_buf); #endif /* STA_SUPPORT */ /** WMM QUEUE_CONFIG command handler */ extern mlan_status wlan_cmd_wmm_queue_config(IN pmlan_private pmpriv, - OUT HostCmd_DS_COMMAND * cmd, - IN t_void * pdata_buf); + OUT HostCmd_DS_COMMAND * cmd, + IN t_void * pdata_buf); /** WMM QUEUE_CONFIG command response handler */ extern mlan_status wlan_ret_wmm_queue_config(IN pmlan_private pmpriv, - const IN HostCmd_DS_COMMAND * resp, - OUT mlan_ioctl_req * pioctl_buf); + const IN HostCmd_DS_COMMAND * resp, + OUT mlan_ioctl_req * pioctl_buf); mlan_status wlan_wmm_cfg_ioctl(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); + IN pmlan_ioctl_req pioctl_req); #endif /* !_MLAN_WMM_H_ */ |