From 6b4a83a75fc1dccc9547c3c4a3a85872241033bc Mon Sep 17 00:00:00 2001 From: Fugang Duan Date: Thu, 28 May 2020 17:51:50 +0800 Subject: [PATCH] MLK-24191 net: wireless: nxp: mxm_wifiex: upgrade to mxm4x17175 release The MxM wifi driver upgrade to. ssh://git@bitbucket.sw.nxp.com/wcswrel/ rel-nxp-wifi-fp92-bt-fp85-linux-android-mxm4x17175-mgpl.git The release main changes: - includes previous bugfixs - fix the coverity issues - fix the coding style Reviewed-by: yang.tian Signed-off-by: Fugang Duan --- .../wireless/nxp/mxm_wifiex/wlan_src/Makefile | 1 + .../nxp/mxm_wifiex/wlan_src/mlan/mlan_11ac.c | 509 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_11ac.h | 4 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_11ax.c | 385 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_11ax.h | 21 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_11d.c | 510 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_11h.c | 1508 +++-- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_11h.h | 41 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_11n.c | 749 ++- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_11n.h | 87 +- .../mxm_wifiex/wlan_src/mlan/mlan_11n_aggr.c | 225 +- .../mxm_wifiex/wlan_src/mlan/mlan_11n_aggr.h | 4 +- .../wlan_src/mlan/mlan_11n_rxreorder.c | 604 +- .../wlan_src/mlan/mlan_11n_rxreorder.h | 40 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_cfp.c | 1854 +++--- .../mxm_wifiex/wlan_src/mlan/mlan_cmdevt.c | 3055 +++++----- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_decl.h | 1422 ++--- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_fw.h | 5057 +++++++++-------- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_ieee.h | 1316 ++--- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_init.c | 592 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_init.h | 65 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_ioctl.h | 3566 ++++++------ .../nxp/mxm_wifiex/wlan_src/mlan/mlan_join.c | 945 ++- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_join.h | 4 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_main.h | 2295 ++++---- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_meas.c | 86 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_meas.h | 13 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_misc.c | 1967 +++---- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_pcie.c | 1440 +++-- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_pcie.h | 411 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_scan.c | 3137 +++++----- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_sdio.c | 892 ++- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_sdio.h | 282 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_shim.c | 388 +- .../mxm_wifiex/wlan_src/mlan/mlan_sta_cmd.c | 1039 ++-- .../wlan_src/mlan/mlan_sta_cmdresp.c | 1327 ++--- .../mxm_wifiex/wlan_src/mlan/mlan_sta_event.c | 220 +- .../mxm_wifiex/wlan_src/mlan/mlan_sta_ioctl.c | 1382 ++--- .../mxm_wifiex/wlan_src/mlan/mlan_sta_rx.c | 200 +- .../mxm_wifiex/wlan_src/mlan/mlan_sta_tx.c | 50 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_txrx.c | 140 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_uap.h | 9 +- .../wlan_src/mlan/mlan_uap_cmdevent.c | 2429 ++++---- .../mxm_wifiex/wlan_src/mlan/mlan_uap_ioctl.c | 634 +-- .../mxm_wifiex/wlan_src/mlan/mlan_uap_txrx.c | 390 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_usb.c | 297 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_util.h | 179 +- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_wmm.c | 1209 ++-- .../nxp/mxm_wifiex/wlan_src/mlan/mlan_wmm.h | 18 +- .../mxm_wifiex/wlan_src/mlinux/mlan_decl.h | 1422 ++--- .../mxm_wifiex/wlan_src/mlinux/mlan_ieee.h | 1316 ++--- .../mxm_wifiex/wlan_src/mlinux/mlan_ioctl.h | 3566 ++++++------ .../wlan_src/mlinux/moal_cfg80211.c | 1553 +++-- .../wlan_src/mlinux/moal_cfg80211.h | 286 +- .../wlan_src/mlinux/moal_cfg80211_util.c | 1821 +++--- .../wlan_src/mlinux/moal_cfg80211_util.h | 419 +- .../mxm_wifiex/wlan_src/mlinux/moal_debug.c | 392 +- .../wlan_src/mlinux/moal_eth_ioctl.c | 3348 +++++------ .../wlan_src/mlinux/moal_eth_ioctl.h | 553 +- .../mxm_wifiex/wlan_src/mlinux/moal_init.c | 751 +-- .../mxm_wifiex/wlan_src/mlinux/moal_ioctl.c | 1039 ++-- .../mxm_wifiex/wlan_src/mlinux/moal_main.c | 1793 +++--- .../mxm_wifiex/wlan_src/mlinux/moal_main.h | 1391 ++--- .../mxm_wifiex/wlan_src/mlinux/moal_pcie.c | 513 +- .../mxm_wifiex/wlan_src/mlinux/moal_pcie.h | 135 +- .../mxm_wifiex/wlan_src/mlinux/moal_priv.c | 1004 ++-- .../mxm_wifiex/wlan_src/mlinux/moal_priv.h | 728 +-- .../mxm_wifiex/wlan_src/mlinux/moal_proc.c | 191 +- .../mxm_wifiex/wlan_src/mlinux/moal_sdio.h | 121 +- .../wlan_src/mlinux/moal_sdio_mmc.c | 444 +- .../mxm_wifiex/wlan_src/mlinux/moal_shim.c | 1215 ++-- .../mxm_wifiex/wlan_src/mlinux/moal_shim.h | 129 +- .../wlan_src/mlinux/moal_sta_cfg80211.c | 1945 +++---- .../wlan_src/mlinux/moal_sta_cfg80211.h | 60 +- .../nxp/mxm_wifiex/wlan_src/mlinux/moal_uap.c | 596 +- .../nxp/mxm_wifiex/wlan_src/mlinux/moal_uap.h | 405 +- .../wlan_src/mlinux/moal_uap_cfg80211.c | 777 ++- .../wlan_src/mlinux/moal_uap_cfg80211.h | 42 +- .../wlan_src/mlinux/moal_uap_priv.c | 52 +- .../wlan_src/mlinux/moal_uap_priv.h | 199 +- .../wlan_src/mlinux/moal_uap_wext.c | 523 +- .../nxp/mxm_wifiex/wlan_src/mlinux/moal_usb.c | 436 +- .../nxp/mxm_wifiex/wlan_src/mlinux/moal_usb.h | 171 +- .../mxm_wifiex/wlan_src/mlinux/moal_wext.c | 757 ++- .../mxm_wifiex/wlan_src/mlinux/moal_wext.h | 54 +- 85 files changed, 35367 insertions(+), 37778 deletions(-) diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/Makefile b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/Makefile index 14cbd99e356b..9cb077cc70dc 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/Makefile +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/Makefile @@ -266,6 +266,7 @@ endif ccflags-y += -Wno-stringop-overflow ccflags-y += -Wno-tautological-compare ccflags-y += -Wno-packed-bitfield-compat + ccflags-y += -Wno-stringop-truncation ############################################################################# # Make Targets diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11ac.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11ac.c index 46afcf2dd6a8..45b9225969b7 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11ac.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11ac.c @@ -55,9 +55,8 @@ t_u16 wlan_convert_mcsmap_to_maxrate(mlan_private *priv, t_u16 bands, * @return channel center frequency center, if found; O, otherwise */ -t_u8 -wlan_get_center_freq_idx(IN mlan_private *pmpriv, - IN t_u16 band, IN t_u32 pri_chan, IN t_u8 chan_bw) +t_u8 wlan_get_center_freq_idx(IN mlan_private *pmpriv, IN t_u16 band, + IN t_u32 pri_chan, IN t_u8 chan_bw) { t_u8 center_freq_idx = 0; @@ -141,8 +140,7 @@ wlan_get_center_freq_idx(IN mlan_private *pmpriv, break; } /* fall through */ - - default: /* error. go to the default */ + default: /* error. go to the default */ center_freq_idx = 42; } } @@ -156,8 +154,7 @@ wlan_get_center_freq_idx(IN mlan_private *pmpriv, * * @return The bitmap of supported nss */ -static t_u8 -wlan_get_nss_vht_mcs(t_u16 mcs_map_set) +static t_u8 wlan_get_nss_vht_mcs(t_u16 mcs_map_set) { t_u8 nss, nss_map = 0; for (nss = 1; nss <= 8; nss++) { @@ -175,8 +172,7 @@ wlan_get_nss_vht_mcs(t_u16 mcs_map_set) * * @return The bitmap of supported nss */ -static t_u8 -wlan_get_nss_num_vht_mcs(t_u16 mcs_map_set) +static t_u8 wlan_get_nss_num_vht_mcs(t_u16 mcs_map_set) { t_u8 nss, nss_num = 0; for (nss = 1; nss <= 8; nss++) { @@ -196,8 +192,8 @@ wlan_get_nss_num_vht_mcs(t_u16 mcs_map_set) * * @return N/A */ -static void -wlan_fill_cap_info(mlan_private *priv, VHT_capa_t *vht_cap, t_u8 bands) +static void wlan_fill_cap_info(mlan_private *priv, VHT_capa_t *vht_cap, + t_u8 bands) { t_u32 usr_dot_11ac_dev_cap; @@ -221,9 +217,8 @@ wlan_fill_cap_info(mlan_private *priv, VHT_capa_t *vht_cap, t_u8 bands) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_11ac_ioctl_vhtcfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_11ac_ioctl_vhtcfg(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]; @@ -233,23 +228,23 @@ wlan_11ac_ioctl_vhtcfg(IN pmlan_adapter pmadapter, t_u32 cfg_value = 0; t_u32 hw_value = 0; t_u8 nss = 0; -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(USB9097) || defined(SD9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(USB9097) || defined(SD9097) t_u16 rx_nss = 0; t_u16 tx_nss = 0; #endif 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)) +#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 operation */ + /** validate the user input and correct it if necessary */ if (pmpriv->bss_role == MLAN_BSS_ROLE_STA) { if (cfg->param.vht_cfg.txrx == 3) { PRINTM(MERROR, @@ -265,147 +260,144 @@ wlan_11ac_ioctl_vhtcfg(IN pmlan_adapter pmadapter, return MLAN_STATUS_FAILURE; } } - /** set bit fileds */ + /** 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->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) */ + /** 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) */ + /** 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) */ + /** 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) */ + /** 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 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) */ + /** 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 */ + /** 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 */ + /** update the RX MCS map */ if (cfg->param.vht_cfg.txrx & MLAN_RADIO_RX) { -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) if (IS_CARD9098(pmadapter->card_type) || IS_CARD9097(pmadapter->card_type)) { if (cfg->param.vht_cfg.band == BAND_SELECT_A) { - rx_nss = GET_RXMCSSUPP(pmadapter-> - user_htstream >> - 8); - tx_nss = GET_TXMCSSUPP(pmadapter-> - user_htstream >> - 8) & 0x0f; + rx_nss = GET_RXMCSSUPP( + pmadapter->user_htstream >> 8); + tx_nss = + GET_TXMCSSUPP( + pmadapter->user_htstream >> + 8) & + 0x0f; } else { - rx_nss = GET_RXMCSSUPP(pmadapter-> - user_htstream); - tx_nss = GET_TXMCSSUPP(pmadapter-> - user_htstream) & + rx_nss = GET_RXMCSSUPP( + pmadapter->user_htstream); + tx_nss = + GET_TXMCSSUPP( + pmadapter->user_htstream) & 0x0f; } } #endif /* use the previous user value */ if (cfg->param.vht_cfg.vht_rx_mcs == 0xffffffff) - cfg->param.vht_cfg.vht_rx_mcs = - GET_VHTMCS(pmpriv-> - usr_dot_11ac_mcs_support); + cfg->param.vht_cfg.vht_rx_mcs = GET_VHTMCS( + pmpriv->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 defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) + cfg_value = GET_VHTNSSMCS( + cfg->param.vht_cfg.vht_rx_mcs, nss); + hw_value = GET_DEVNSSRXMCS( + pmadapter->hw_dot_11ac_mcs_support, + nss); +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) if ((rx_nss != 0) && (nss > rx_nss)) cfg_value = NO_NSS_SUPPORT; #endif if ((hw_value == NO_NSS_SUPPORT) || (cfg_value == NO_NSS_SUPPORT)) - SET_VHTNSSMCS(cfg->param.vht_cfg. - vht_rx_mcs, nss, - 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)); + 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(pmpriv-> - usr_dot_11ac_mcs_support >> - 16); + cfg->param.vht_cfg.vht_tx_mcs = GET_VHTMCS( + pmpriv->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 defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) + cfg_value = GET_VHTNSSMCS( + cfg->param.vht_cfg.vht_tx_mcs, nss); + hw_value = GET_DEVNSSTXMCS( + pmadapter->hw_dot_11ac_mcs_support, + nss); +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) if ((rx_nss != 0) && (nss > rx_nss)) cfg_value = NO_NSS_SUPPORT; #endif if ((hw_value == NO_NSS_SUPPORT) || (cfg_value == NO_NSS_SUPPORT)) - SET_VHTNSSMCS(cfg->param.vht_cfg. - vht_tx_mcs, nss, - 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)); + 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); if (!cfg->param.vht_cfg.skip_usr_11ac_mcs_cfg) { - RESET_DEVRXMCSMAP(pmpriv-> - usr_dot_11ac_mcs_support); + RESET_DEVRXMCSMAP( + pmpriv->usr_dot_11ac_mcs_support); + pmpriv->usr_dot_11ac_mcs_support |= GET_VHTMCS( + cfg->param.vht_cfg.vht_rx_mcs); + RESET_DEVTXMCSMAP( + pmpriv->usr_dot_11ac_mcs_support); pmpriv->usr_dot_11ac_mcs_support |= - GET_VHTMCS(cfg->param.vht_cfg. - vht_rx_mcs); - RESET_DEVTXMCSMAP(pmpriv-> - usr_dot_11ac_mcs_support); - pmpriv->usr_dot_11ac_mcs_support |= - (GET_VHTMCS - (cfg->param.vht_cfg.vht_tx_mcs) << 16); + (GET_VHTMCS( + cfg->param.vht_cfg.vht_tx_mcs) + << 16); PRINTM(MINFO, "Set: vht mcs set 0x%08x\n", pmpriv->usr_dot_11ac_mcs_support); } else { @@ -438,7 +430,7 @@ wlan_11ac_ioctl_vhtcfg(IN pmlan_adapter pmadapter, cfg->param.vht_cfg.bwcfg; } else { - /** GET operation */ + /** GET operation */ if (cfg->param.vht_cfg.band == BAND_SELECT_BG) { cfg->param.vht_cfg.vht_cap_info = pmpriv->usr_dot_11ac_dev_cap_bg; @@ -459,32 +451,18 @@ wlan_11ac_ioctl_vhtcfg(IN pmlan_adapter pmadapter, } cfg->param.vht_cfg.bwcfg = pmpriv->usr_dot_11ac_bw; - cfg->param.vht_cfg.vht_rx_mcs = - GET_DEVRXMCSMAP(pmpriv-> - usr_dot_11ac_mcs_support); - cfg->param.vht_cfg.vht_tx_mcs = - GET_DEVTXMCSMAP(pmpriv-> - usr_dot_11ac_mcs_support); + cfg->param.vht_cfg.vht_rx_mcs = GET_DEVRXMCSMAP( + pmpriv->usr_dot_11ac_mcs_support); + cfg->param.vht_cfg.vht_tx_mcs = GET_DEVTXMCSMAP( + pmpriv->usr_dot_11ac_mcs_support); cfg->param.vht_cfg.vht_rx_max_rate = - wlan_convert_mcsmap_to_maxrate(pmpriv, - cfg-> - param. - vht_cfg. - band, - cfg-> - param. - vht_cfg. - vht_rx_mcs); + wlan_convert_mcsmap_to_maxrate( + pmpriv, cfg->param.vht_cfg.band, + cfg->param.vht_cfg.vht_rx_mcs); cfg->param.vht_cfg.vht_tx_max_rate = - wlan_convert_mcsmap_to_maxrate(pmpriv, - cfg-> - param. - vht_cfg. - band, - cfg-> - param. - vht_cfg. - vht_tx_mcs); + wlan_convert_mcsmap_to_maxrate( + pmpriv, cfg->param.vht_cfg.band, + cfg->param.vht_cfg.vht_tx_mcs); } LEAVE(); return ret; @@ -497,10 +475,7 @@ wlan_11ac_ioctl_vhtcfg(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_GET; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_11AC_CFG, - cmd_action, - 0, + 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) @@ -518,9 +493,8 @@ wlan_11ac_ioctl_vhtcfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_11ac_ioctl_opermodecfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_11ac_ioctl_opermodecfg(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_ds_11ac_cfg *cfg = MNULL; mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; @@ -536,10 +510,8 @@ wlan_11ac_ioctl_opermodecfg(IN pmlan_adapter pmadapter, } else if (pioctl_req->action == MLAN_ACT_SET) { hw_bw_160or8080 = GET_VHTCAP_CHWDSET(pmadapter->hw_dot_11ac_dev_cap); - hw_rx_nss = - wlan_get_nss_num_vht_mcs(GET_DEVRXMCSMAP - (pmadapter-> - hw_dot_11ac_mcs_support)); + hw_rx_nss = wlan_get_nss_num_vht_mcs( + GET_DEVRXMCSMAP(pmadapter->hw_dot_11ac_mcs_support)); if ((((cfg->param.opermode_cfg.bw - 1) > BW_80MHZ) && !hw_bw_160or8080) || (cfg->param.opermode_cfg.nss > hw_rx_nss)) { @@ -569,9 +541,9 @@ static mlan_status wlan_11ac_ioctl_supported_mcs_set(IN pmlan_adapter pmadapter, 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(); #if 0 @@ -583,15 +555,15 @@ wlan_11ac_ioctl_supported_mcs_set(IN pmlan_adapter pmadapter, } rx_mcs_supp = GET_11ACRXMCSSUPP(pmadapter->usr_dot_11ac_mcs_support); /* Set MCS */ - memset(pmadapter, (t_u8 *)mcs_set, 0xff, rx_mcs_supp); + 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); + 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); + || ISSUPP_CHANWIDTH80(pmadapter->usr_dot_11ac_dev_cap_a) + ) + SETHT_MCS32(mcs_set); cfg = (mlan_ds_11ac_cfg *)pioctl_req->pbuf; memcpy_ext(pmadapter, cfg->param.supported_mcs_set, mcs_set, @@ -614,8 +586,7 @@ wlan_11ac_ioctl_supported_mcs_set(IN pmlan_adapter pmadapter, * * @return N/A */ -void -wlan_show_dot11acdevcap(pmlan_adapter pmadapter, t_u32 cap) +void wlan_show_dot11acdevcap(pmlan_adapter pmadapter, t_u32 cap) { ENTER(); @@ -643,10 +614,10 @@ wlan_show_dot11acdevcap(pmlan_adapter pmadapter, t_u32 cap) (ISSUPP_11ACVHTTXOPPS(cap) ? "supported" : "not supported")); PRINTM(MINFO, "GET_HW_SPEC: MU RX beamformee %s\n", (ISSUPP_11ACMURXBEAMFORMEE(cap) ? "supported" : - "not supported")); + "not supported")); PRINTM(MINFO, "GET_HW_SPEC: MU TX beamformee %s\n", (ISSUPP_11ACMUTXBEAMFORMEE(cap) ? "supported" : - "not 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", @@ -678,8 +649,7 @@ wlan_show_dot11acdevcap(pmlan_adapter pmadapter, t_u32 cap) * * @return N/A */ -void -wlan_show_dot11acmcssupport(pmlan_adapter pmadapter, t_u32 support) +void wlan_show_dot11acmcssupport(pmlan_adapter pmadapter, t_u32 support) { ENTER(); @@ -700,8 +670,8 @@ wlan_show_dot11acmcssupport(pmlan_adapter pmadapter, t_u32 support) * * @return the max data rate for long GI */ -t_u16 -wlan_convert_mcsmap_to_maxrate(mlan_private *priv, t_u16 bands, t_u16 mcs_map) +t_u16 wlan_convert_mcsmap_to_maxrate(mlan_private *priv, t_u16 bands, + t_u16 mcs_map) { t_u8 i; t_u8 nss; @@ -713,46 +683,46 @@ wlan_convert_mcsmap_to_maxrate(mlan_private *priv, t_u16 bands, t_u16 mcs_map) /* tables of the MCS map to the highest data rate (in Mbps) * supported for long GI */ t_u16 max_rate_lgi_20MHZ[8][3] = { - {0x41, 0x4E, 0x0}, /* NSS = 1 */ - {0x82, 0x9C, 0x0}, /* NSS = 2 */ - {0xC3, 0xEA, 0x104}, /* NSS = 3 */ - {0x104, 0x138, 0x0}, /* NSS = 4 */ - {0x145, 0x186, 0x0}, /* NSS = 5 */ - {0x186, 0x1D4, 0x208}, /* NSS = 6 */ - {0x1C7, 0x222, 0x0}, /* NSS = 7 */ - {0x208, 0x270, 0x0} /* NSS = 8 */ + {0x41, 0x4E, 0x0}, /* NSS = 1 */ + {0x82, 0x9C, 0x0}, /* NSS = 2 */ + {0xC3, 0xEA, 0x104}, /* NSS = 3 */ + {0x104, 0x138, 0x0}, /* NSS = 4 */ + {0x145, 0x186, 0x0}, /* NSS = 5 */ + {0x186, 0x1D4, 0x208}, /* NSS = 6 */ + {0x1C7, 0x222, 0x0}, /* NSS = 7 */ + {0x208, 0x270, 0x0} /* NSS = 8 */ }; t_u16 max_rate_lgi_40MHZ[8][3] = { - {0x87, 0xA2, 0xB4}, /* NSS = 1 */ - {0x10E, 0x144, 0x168}, /* NSS = 2 */ - {0x195, 0x1E6, 0x21C}, /* NSS = 3 */ - {0x21C, 0x288, 0x2D0}, /* NSS = 4 */ - {0x2A3, 0x32A, 0x384}, /* NSS = 5 */ - {0x32A, 0x3CC, 0x438}, /* NSS = 6 */ - {0x3B1, 0x46E, 0x4EC}, /* NSS = 7 */ - {0x438, 0x510, 0x5A0} /* NSS = 8 */ + {0x87, 0xA2, 0xB4}, /* NSS = 1 */ + {0x10E, 0x144, 0x168}, /* NSS = 2 */ + {0x195, 0x1E6, 0x21C}, /* NSS = 3 */ + {0x21C, 0x288, 0x2D0}, /* NSS = 4 */ + {0x2A3, 0x32A, 0x384}, /* NSS = 5 */ + {0x32A, 0x3CC, 0x438}, /* NSS = 6 */ + {0x3B1, 0x46E, 0x4EC}, /* NSS = 7 */ + {0x438, 0x510, 0x5A0} /* NSS = 8 */ }; 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 */ + {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 */ + {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) { @@ -772,7 +742,7 @@ wlan_convert_mcsmap_to_maxrate(mlan_private *priv, t_u16 bands, t_u16 mcs_map) } 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 is 3, nss must be 0 (SS = 1). Thus, max mcs is MCS 9*/ if (max_mcs >= 3) max_mcs = 2; @@ -797,8 +767,8 @@ wlan_convert_mcsmap_to_maxrate(mlan_private *priv, t_u16 bands, t_u16 mcs_map) /* MCS9 is not supported in NSS1/2/4/5/7/8 */ if (max_mcs >= 1 && max_rate == 0) max_rate = - max_rate_lgi_20MHZ[nss][max_mcs - - 1]; + max_rate_lgi_20MHZ[nss] + [max_mcs - 1]; } } } @@ -817,10 +787,8 @@ wlan_convert_mcsmap_to_maxrate(mlan_private *priv, t_u16 bands, t_u16 mcs_map) * @param bw_80p80 TRUE -- enable 80p80 * @return N/A */ -void -wlan_fill_vht_cap_tlv(mlan_private *priv, - MrvlIETypes_VHTCap_t *pvht_cap, t_u16 bands, t_u8 flag, - t_u8 bw_80p80) +void wlan_fill_vht_cap_tlv(mlan_private *priv, MrvlIETypes_VHTCap_t *pvht_cap, + t_u16 bands, t_u8 flag, t_u8 bw_80p80) { t_u16 mcs_map_user = 0; t_u16 mcs_map_resp = 0; @@ -828,7 +796,8 @@ wlan_fill_vht_cap_tlv(mlan_private *priv, t_u16 mcs_user = 0; t_u16 mcs_resp = 0; t_u16 nss; -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) t_u16 rx_nss = 0, tx_nss = 0; #endif ENTER(); @@ -842,26 +811,28 @@ wlan_fill_vht_cap_tlv(mlan_private *priv, 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 */ + /* rx MCS Set, find the minimum of the user rx mcs and ap rx mcs*/ mcs_map_resp = mcs_map_user = GET_DEVRXMCSMAP(priv->usr_dot_11ac_mcs_support); if (flag) mcs_map_resp = wlan_le16_to_cpu(pvht_cap->vht_cap.mcs_sets.rx_mcs_map); -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) if (IS_CARD9098(priv->adapter->card_type) || IS_CARD9097(priv->adapter->card_type)) { if (bands & BAND_A) { - rx_nss = GET_RXMCSSUPP(priv->adapter-> - user_htstream >> 8); - tx_nss = GET_TXMCSSUPP(priv->adapter-> - user_htstream >> 8) & 0x0f; + rx_nss = GET_RXMCSSUPP(priv->adapter->user_htstream >> + 8); + tx_nss = GET_TXMCSSUPP(priv->adapter->user_htstream >> + 8) & + 0x0f; } else { rx_nss = GET_RXMCSSUPP(priv->adapter->user_htstream); - tx_nss = GET_TXMCSSUPP(priv->adapter-> - user_htstream) & 0x0f; + tx_nss = GET_TXMCSSUPP(priv->adapter->user_htstream) & + 0x0f; } - /** force 1x1 when enable 80P80 */ + /** force 1x1 when enable 80P80 */ if (bw_80p80) rx_nss = tx_nss = 1; } @@ -870,7 +841,8 @@ wlan_fill_vht_cap_tlv(mlan_private *priv, for (nss = 1; nss <= 8; nss++) { mcs_user = GET_VHTNSSMCS(mcs_map_user, nss); mcs_resp = GET_VHTNSSMCS(mcs_map_resp, nss); -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) if ((rx_nss != 0) && (nss > rx_nss)) mcs_user = NO_NSS_SUPPORT; #endif @@ -901,7 +873,8 @@ wlan_fill_vht_cap_tlv(mlan_private *priv, for (nss = 1; nss <= 8; nss++) { mcs_user = GET_VHTNSSMCS(mcs_map_user, nss); mcs_resp = GET_VHTNSSMCS(mcs_map_resp, nss); -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) if ((tx_nss != 0) && (nss > tx_nss)) mcs_user = NO_NSS_SUPPORT; #endif @@ -935,9 +908,8 @@ wlan_fill_vht_cap_tlv(mlan_private *priv, * * @return N/A */ -void -wlan_fill_vht_cap_ie(mlan_private *priv, - IEEEtypes_VHTCap_t *pvht_cap, t_u16 bands) +void wlan_fill_vht_cap_ie(mlan_private *priv, IEEEtypes_VHTCap_t *pvht_cap, + t_u16 bands) { ENTER(); @@ -952,19 +924,15 @@ wlan_fill_vht_cap_ie(mlan_private *priv, GET_DEVRXMCSMAP(priv->usr_dot_11ac_mcs_support); /* rx highest rate */ - pvht_cap->vht_cap.mcs_sets.rx_max_rate = - wlan_convert_mcsmap_to_maxrate(priv, bands, - pvht_cap->vht_cap.mcs_sets. - rx_mcs_map); + pvht_cap->vht_cap.mcs_sets.rx_max_rate = wlan_convert_mcsmap_to_maxrate( + priv, bands, pvht_cap->vht_cap.mcs_sets.rx_mcs_map); /* tx MCS map */ pvht_cap->vht_cap.mcs_sets.tx_mcs_map = GET_DEVTXMCSMAP(priv->usr_dot_11ac_mcs_support); /* tx highest rate */ - pvht_cap->vht_cap.mcs_sets.tx_max_rate = - wlan_convert_mcsmap_to_maxrate(priv, bands, - pvht_cap->vht_cap.mcs_sets. - tx_mcs_map); + pvht_cap->vht_cap.mcs_sets.tx_max_rate = wlan_convert_mcsmap_to_maxrate( + priv, bands, pvht_cap->vht_cap.mcs_sets.tx_mcs_map); LEAVE(); return; @@ -978,11 +946,11 @@ wlan_fill_vht_cap_ie(mlan_private *priv, * * @return ret suport 80+80Mhz or not */ -t_u8 -wlan_is_80_80_support(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc) +t_u8 wlan_is_80_80_support(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc) { t_u8 ret = MFALSE; -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) t_u16 rx_nss = 0, tx_nss = 0; IEEEtypes_VHTCap_t *pvht_cap = pbss_desc->pvht_cap; MrvlIEtypes_He_cap_t *phecap = MNULL; @@ -991,30 +959,31 @@ wlan_is_80_80_support(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc) ENTER(); -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) - if (!IS_CARD9098(pmpriv->adapter->card_type) - && !IS_CARD9097(pmpriv->adapter->card_type)) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) + if (!IS_CARD9098(pmpriv->adapter->card_type) && + !IS_CARD9097(pmpriv->adapter->card_type)) return ret; - /** check band A */ + /** check band A */ if (!(pbss_desc->bss_band & BAND_A)) return ret; - /** check band A antenna setting */ + /** check band A antenna setting */ rx_nss = GET_RXMCSSUPP(pmpriv->adapter->user_htstream >> 8); tx_nss = GET_TXMCSSUPP(pmpriv->adapter->user_htstream >> 8) & 0x0f; - /** check if support 2*2 */ + /** check if support 2*2 */ if (rx_nss != 2 || tx_nss != 2) return ret; /** check if AP support AC 80P80 */ - if (ISSUPP_11ACBW8080(pmpriv->usr_dot_11ac_dev_cap_a) - && pvht_cap && ISSUPP_11ACBW8080(pvht_cap->vht_cap.vht_cap_info)) + if (ISSUPP_11ACBW8080(pmpriv->usr_dot_11ac_dev_cap_a) && pvht_cap && + ISSUPP_11ACBW8080(pvht_cap->vht_cap.vht_cap_info)) ret = MTRUE; /** check if AP support AX 80P80 */ if (pbss_desc->phe_cap) { - pBsshecap = (IEEEtypes_HECap_t *) pbss_desc->phe_cap; - phecap = (MrvlIEtypes_He_cap_t *) pmpriv->user_he_cap; - if (ret && (phecap->he_phy_cap[0] & MBIT(4)) - && (pBsshecap->he_phy_cap[0] & MBIT(4))) + pBsshecap = (IEEEtypes_HECap_t *)pbss_desc->phe_cap; + phecap = (MrvlIEtypes_He_cap_t *)pmpriv->user_he_cap; + if (ret && (phecap->he_phy_cap[0] & MBIT(4)) && + (pBsshecap->he_phy_cap[0] & MBIT(4))) ret = MTRUE; else ret = MFALSE; @@ -1033,9 +1002,8 @@ wlan_is_80_80_support(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc) * * @return bytes added to the buffer */ -int -wlan_cmd_append_11ac_tlv(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc, - t_u8 **ppbuffer) +int wlan_cmd_append_11ac_tlv(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc, + t_u8 **ppbuffer) { pmlan_adapter pmadapter = pmpriv->adapter; MrvlIETypes_VHTCap_t *pvht_cap; @@ -1044,7 +1012,8 @@ wlan_cmd_append_11ac_tlv(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc, t_u16 nss; int ret_len = 0; t_u8 bw_80p80 = MFALSE; -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(USB9097) || defined(SD9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(USB9097) || defined(SD9097) t_u16 rx_nss = 0; #endif @@ -1062,8 +1031,8 @@ wlan_cmd_append_11ac_tlv(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc, /* VHT Capabilities IE */ if (pbss_desc->pvht_cap && - wlan_get_nss_vht_mcs(pbss_desc->pvht_cap->vht_cap.mcs_sets. - rx_mcs_map)) { + wlan_get_nss_vht_mcs( + pbss_desc->pvht_cap->vht_cap.mcs_sets.rx_mcs_map)) { 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); @@ -1071,8 +1040,8 @@ wlan_cmd_append_11ac_tlv(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc, memcpy_ext(pmadapter, (t_u8 *)pvht_cap + sizeof(MrvlIEtypesHeader_t), (t_u8 *)pbss_desc->pvht_cap + - sizeof(IEEEtypes_Header_t), pvht_cap->header.len, - sizeof(VHT_capa_t)); + sizeof(IEEEtypes_Header_t), + pvht_cap->header.len, sizeof(VHT_capa_t)); bw_80p80 = wlan_is_80_80_support(pmpriv, pbss_desc); wlan_fill_vht_cap_tlv(pmpriv, pvht_cap, pbss_desc->bss_band, MTRUE, bw_80p80); @@ -1102,34 +1071,36 @@ wlan_cmd_append_11ac_tlv(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc, pmpriv->usr_dot_11ac_opermode_bw - 1; if (pbss_desc->bss_band & BAND_G) { if (!(IS_OPER_MODE_20M(pmrvl_oper_mode->oper_mode))) { - if (pbss_desc->pht_cap->ht_cap. - ht_cap_info & MBIT(1)) - SET_OPER_MODE_40M(pmrvl_oper_mode-> - oper_mode); + if (pbss_desc->pht_cap->ht_cap.ht_cap_info & + MBIT(1)) + SET_OPER_MODE_40M( + pmrvl_oper_mode->oper_mode); else - SET_OPER_MODE_20M(pmrvl_oper_mode-> - oper_mode); + SET_OPER_MODE_20M( + pmrvl_oper_mode->oper_mode); } } } else { - /** set default bandwidth:80M*/ + /** set default bandwidth:80M*/ SET_OPER_MODE_80M(pmrvl_oper_mode->oper_mode); -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) if (IS_CARD9098(pmadapter->card_type) || IS_CARD9097(pmadapter->card_type)) { if (pbss_desc->bss_band & BAND_A) - rx_nss = GET_RXMCSSUPP(pmadapter-> - user_htstream >> 8); + rx_nss = GET_RXMCSSUPP( + pmadapter->user_htstream >> 8); else - rx_nss = GET_RXMCSSUPP(pmadapter-> - user_htstream); + rx_nss = + GET_RXMCSSUPP(pmadapter->user_htstream); } #endif mcs_map_user = GET_DEVRXMCSMAP(pmpriv->usr_dot_11ac_mcs_support); nss = wlan_get_nss_num_vht_mcs(mcs_map_user); -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) if (IS_CARD9098(pmadapter->card_type) || IS_CARD9097(pmadapter->card_type)) { PRINTM(MCMND, "rx_nss=%d nss=%d\n", rx_nss, nss); @@ -1170,8 +1141,8 @@ wlan_cmd_append_11ac_tlv(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_11ac_cfg_ioctl(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) +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; @@ -1216,10 +1187,9 @@ wlan_11ac_cfg_ioctl(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -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) +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) { pmlan_adapter pmadapter = pmpriv->adapter; HostCmd_DS_11AC_CFG *vhtcfg = &cmd->params.vhtcfg; @@ -1230,7 +1200,7 @@ wlan_cmd_11ac_cfg(IN pmlan_private pmpriv, 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; - //block user enable 80MHZ + // block user enable 80MHZ if (IS_FW_SUPPORT_NO_80MHZ(pmadapter)) vht_cfg->bwcfg = 0; @@ -1258,9 +1228,9 @@ wlan_cmd_11ac_cfg(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_11ac_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_11ac_cfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { pmlan_adapter pmadapter = pmpriv->adapter; mlan_ds_11ac_cfg *cfg = MNULL; @@ -1291,33 +1261,29 @@ wlan_ret_11ac_cfg(IN pmlan_private pmpriv, cfg->param.vht_cfg.vht_tx_mcs = wlan_le32_to_cpu(cfg->param.vht_cfg.vht_tx_mcs); cfg->param.vht_cfg.vht_rx_max_rate = - wlan_convert_mcsmap_to_maxrate(pmpriv, - cfg->param.vht_cfg.band, - cfg->param.vht_cfg. - vht_rx_mcs); + wlan_convert_mcsmap_to_maxrate( + pmpriv, cfg->param.vht_cfg.band, + cfg->param.vht_cfg.vht_rx_mcs); cfg->param.vht_cfg.vht_tx_max_rate = - wlan_convert_mcsmap_to_maxrate(pmpriv, - cfg->param.vht_cfg.band, - cfg->param.vht_cfg. - vht_tx_mcs); + wlan_convert_mcsmap_to_maxrate( + pmpriv, cfg->param.vht_cfg.band, + cfg->param.vht_cfg.vht_tx_mcs); } LEAVE(); return MLAN_STATUS_SUCCESS; } -void -wlan_update_11ac_cap(mlan_private *pmpriv) +void wlan_update_11ac_cap(mlan_private *pmpriv) { - mlan_adapter *pmadapter = pmpriv->adapter; pmpriv->usr_dot_11ac_mcs_support = pmadapter->hw_dot_11ac_mcs_support; pmpriv->usr_dot_11ac_dev_cap_bg = - pmadapter-> - hw_dot_11ac_dev_cap & ~DEFALUT_11AC_CAP_BEAMFORMING_RESET_MASK; + pmadapter->hw_dot_11ac_dev_cap & + ~DEFALUT_11AC_CAP_BEAMFORMING_RESET_MASK; pmpriv->usr_dot_11ac_dev_cap_a = - pmadapter-> - hw_dot_11ac_dev_cap & ~DEFALUT_11AC_CAP_BEAMFORMING_RESET_MASK; + pmadapter->hw_dot_11ac_dev_cap & + ~DEFALUT_11AC_CAP_BEAMFORMING_RESET_MASK; pmpriv->usr_dot_11ac_bw = BW_FOLLOW_VHTCAP; } @@ -1329,8 +1295,7 @@ wlan_update_11ac_cap(mlan_private *pmpriv) * * @return 0--not allowed, other value allowed */ -t_u8 -wlan_11ac_bandconfig_allowed(mlan_private *pmpriv, t_u16 bss_band) +t_u8 wlan_11ac_bandconfig_allowed(mlan_private *pmpriv, t_u16 bss_band) { if (pmpriv->bss_mode == MLAN_BSS_MODE_IBSS) { if (bss_band & BAND_G) diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11ac.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11ac.h index 7f203f8a61a8..1f5e693fe579 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11ac.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11ac.h @@ -44,8 +44,8 @@ t_u8 wlan_11ac_bandconfig_allowed(mlan_private *pmpriv, t_u8 bss_band); t_u8 wlan_is_80_80_support(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc); 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, diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11ax.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11ax.c index 3bb17b588f66..20da212213a1 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11ax.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11ax.c @@ -55,8 +55,7 @@ * * @return N/A */ -void -wlan_show_dot11axmaccap(pmlan_adapter pmadapter, t_u32 cap) +void wlan_show_dot11axmaccap(pmlan_adapter pmadapter, t_u32 cap) { ENTER(); @@ -71,8 +70,7 @@ wlan_show_dot11axmaccap(pmlan_adapter pmadapter, t_u32 cap) * * @return MTRUE/MFALSE */ -t_u8 -wlan_check_ap_11ax_twt_supported(BSSDescriptor_t *pbss_desc) +t_u8 wlan_check_ap_11ax_twt_supported(BSSDescriptor_t *pbss_desc) { if (!pbss_desc->phe_cap) return MFALSE; @@ -92,8 +90,8 @@ wlan_check_ap_11ax_twt_supported(BSSDescriptor_t *pbss_desc) * * @return MTRUE/MFALSE */ -t_u8 -wlan_check_11ax_twt_supported(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc) +t_u8 wlan_check_11ax_twt_supported(mlan_private *pmpriv, + BSSDescriptor_t *pbss_desc) { MrvlIEtypes_He_cap_t *phecap = MNULL; MrvlIEtypes_He_cap_t *hw_he_cap = MNULL; @@ -101,19 +99,17 @@ wlan_check_11ax_twt_supported(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc) if (!wlan_check_ap_11ax_twt_supported(pbss_desc)) return MFALSE; if (pbss_desc->bss_band & BAND_A) { - hw_he_cap = - (MrvlIEtypes_He_cap_t *) & pmpriv->adapter->hw_he_cap; - phecap = (MrvlIEtypes_He_cap_t *) & pmpriv->user_he_cap; + hw_he_cap = (MrvlIEtypes_He_cap_t *)&pmpriv->adapter->hw_he_cap; + phecap = (MrvlIEtypes_He_cap_t *)&pmpriv->user_he_cap; } else { hw_he_cap = - (MrvlIEtypes_He_cap_t *) & pmpriv->adapter-> - hw_2g_he_cap; - phecap = (MrvlIEtypes_He_cap_t *) & pmpriv->user_2g_he_cap; + (MrvlIEtypes_He_cap_t *)&pmpriv->adapter->hw_2g_he_cap; + phecap = (MrvlIEtypes_He_cap_t *)&pmpriv->user_2g_he_cap; } if (!(hw_he_cap->he_mac_cap[0] & HE_MAC_CAP_TWT_REQ_SUPPORT)) return MFALSE; - if (phecap->he_mac_cap[0] & HE_MAC_CAP_TWT_REQ_SUPPORT) ; - return MTRUE; + if (phecap->he_mac_cap[0] & HE_MAC_CAP_TWT_REQ_SUPPORT) + return MTRUE; return MFALSE; } @@ -125,8 +121,7 @@ wlan_check_11ax_twt_supported(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc) * * @return N/A */ -void -wlan_show_dot11axphycap(pmlan_adapter pmadapter, t_u32 support) +void wlan_show_dot11axphycap(pmlan_adapter pmadapter, t_u32 support) { ENTER(); @@ -145,9 +140,8 @@ wlan_show_dot11axphycap(pmlan_adapter pmadapter, t_u32 support) * * @return bytes added to the phe_cap */ -t_u16 -wlan_fill_he_cap_tlv(mlan_private *pmpriv, t_u8 band, - MrvlIEtypes_Extension_t * phe_cap, t_u8 flag) +t_u16 wlan_fill_he_cap_tlv(mlan_private *pmpriv, t_u8 band, + MrvlIEtypes_Extension_t *phe_cap, t_u8 flag) { pmlan_adapter pmadapter = pmpriv->adapter; t_u16 len = 0; @@ -183,9 +177,8 @@ wlan_fill_he_cap_tlv(mlan_private *pmpriv, t_u8 band, * * @return bytes added to the buffer */ -int -wlan_cmd_append_11ax_tlv(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc, - t_u8 **ppbuffer) +int wlan_cmd_append_11ax_tlv(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc, + t_u8 **ppbuffer) { pmlan_adapter pmadapter = pmpriv->adapter; MrvlIEtypes_He_cap_t *phecap = MNULL; @@ -203,13 +196,13 @@ wlan_cmd_append_11ax_tlv(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc, LEAVE(); return 0; } - /** check if AP support HE, if not return right away */ + /** check if AP support HE, if not return right away */ if (!pbss_desc->phe_cap) { LEAVE(); return 0; } bw_80p80 = wlan_is_80_80_support(pmpriv, pbss_desc); - phecap = (MrvlIEtypes_He_cap_t *) * ppbuffer; + phecap = (MrvlIEtypes_He_cap_t *)*ppbuffer; if (pbss_desc->bss_band & BAND_A) { memcpy_ext(pmadapter, *ppbuffer, pmpriv->user_he_cap, pmpriv->user_hecap_len, pmpriv->user_hecap_len); @@ -257,11 +250,9 @@ wlan_cmd_append_11ax_tlv(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc, * * @return N/A */ -void -wlan_update_11ax_cap(mlan_adapter *pmadapter, - MrvlIEtypes_Extension_t * hw_he_cap) +void wlan_update_11ax_cap(mlan_adapter *pmadapter, + MrvlIEtypes_Extension_t *hw_he_cap) { - MrvlIEtypes_He_cap_t *phe_cap = MNULL; t_u8 i = 0; t_u8 he_cap_2g = 0; @@ -273,9 +264,9 @@ wlan_update_11ax_cap(mlan_adapter *pmadapter, LEAVE(); return; } - phe_cap = (MrvlIEtypes_He_cap_t *) hw_he_cap; - if (phe_cap-> - he_phy_cap[0] & (AX_2G_40MHZ_SUPPORT | AX_2G_20MHZ_SUPPORT)) { + phe_cap = (MrvlIEtypes_He_cap_t *)hw_he_cap; + if (phe_cap->he_phy_cap[0] & + (AX_2G_40MHZ_SUPPORT | AX_2G_20MHZ_SUPPORT)) { pmadapter->hw_2g_hecap_len = hw_he_cap->len + sizeof(MrvlIEtypesHeader_t); memcpy_ext(pmadapter, pmadapter->hw_2g_he_cap, @@ -311,17 +302,17 @@ wlan_update_11ax_cap(mlan_adapter *pmadapter, pmadapter->priv[i]->user_2g_he_cap, pmadapter->hw_2g_he_cap, pmadapter->hw_2g_hecap_len, - sizeof(pmadapter->priv[i]-> - user_2g_he_cap)); + sizeof(pmadapter->priv[i] + ->user_2g_he_cap)); } else { pmadapter->priv[i]->user_hecap_len = pmadapter->hw_hecap_len; - memcpy_ext(pmadapter, - pmadapter->priv[i]->user_he_cap, - pmadapter->hw_he_cap, - pmadapter->hw_hecap_len, - sizeof(pmadapter->priv[i]-> - user_he_cap)); + memcpy_ext( + pmadapter, + pmadapter->priv[i]->user_he_cap, + pmadapter->hw_he_cap, + pmadapter->hw_hecap_len, + sizeof(pmadapter->priv[i]->user_he_cap)); } } } @@ -337,10 +328,8 @@ wlan_update_11ax_cap(mlan_adapter *pmadapter, * * @return 0--not allowed, other value allowed */ -t_u16 -wlan_11ax_bandconfig_allowed(mlan_private *pmpriv, t_u16 bss_band) +t_u16 wlan_11ax_bandconfig_allowed(mlan_private *pmpriv, t_u16 bss_band) { - if (!IS_FW_SUPPORT_11AX(pmpriv->adapter)) return MFALSE; if (pmpriv->bss_mode == MLAN_BSS_MODE_IBSS) { @@ -365,8 +354,8 @@ wlan_11ax_bandconfig_allowed(mlan_private *pmpriv, t_u16 bss_band) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_11ax_ioctl_hecfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_11ax_ioctl_hecfg(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]; @@ -384,7 +373,7 @@ wlan_11ax_ioctl_hecfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) return MLAN_STATUS_RESOURCE; } - cfg = (mlan_ds_11ax_cfg *) pioctl_req->pbuf; + cfg = (mlan_ds_11ax_cfg *)pioctl_req->pbuf; if ((cfg->param.he_cfg.band & MBIT(0)) && !(pmadapter->fw_bands & BAND_GAX)) { @@ -402,10 +391,7 @@ wlan_11ax_ioctl_hecfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) cmd_action = HostCmd_ACT_GEN_GET; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_11AX_CFG, - cmd_action, - 0, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_11AX_CFG, cmd_action, 0, (t_void *)pioctl_req, (t_void *)&cfg->param.he_cfg); if (ret == MLAN_STATUS_SUCCESS) @@ -423,15 +409,15 @@ wlan_11ax_ioctl_hecfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_11ax_cfg_ioctl(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) +mlan_status wlan_11ax_cfg_ioctl(pmlan_adapter pmadapter, + pmlan_ioctl_req pioctl_req) { mlan_status status = MLAN_STATUS_SUCCESS; mlan_ds_11ax_cfg *cfg = MNULL; ENTER(); - cfg = (mlan_ds_11ax_cfg *) pioctl_req->pbuf; + cfg = (mlan_ds_11ax_cfg *)pioctl_req->pbuf; switch (cfg->sub_command) { case MLAN_OID_11AX_HE_CFG: status = wlan_11ax_ioctl_hecfg(pmadapter, pioctl_req); @@ -439,6 +425,9 @@ wlan_11ax_cfg_ioctl(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) case MLAN_OID_11AX_CMD_CFG: status = wlan_11ax_ioctl_cmd(pmadapter, pioctl_req); break; + case MLAN_OID_11AX_TWT_CFG: + status = wlan_11ax_ioctl_twtcfg(pmadapter, pioctl_req); + break; default: pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; status = MLAN_STATUS_FAILURE; @@ -457,14 +446,13 @@ wlan_11ax_cfg_ioctl(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_11ax_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_11ax_cfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, IN t_u16 cmd_action, + IN t_void *pdata_buf) { pmlan_adapter pmadapter = pmpriv->adapter; HostCmd_DS_11AX_CFG *axcfg = &cmd->params.axcfg; - mlan_ds_11ax_he_cfg *hecfg = (mlan_ds_11ax_he_cfg *) pdata_buf; + mlan_ds_11ax_he_cfg *hecfg = (mlan_ds_11ax_he_cfg *)pdata_buf; MrvlIEtypes_Extension_t *tlv = MNULL; t_u8 *pos = MNULL; @@ -476,13 +464,13 @@ wlan_cmd_11ax_cfg(IN pmlan_private pmpriv, axcfg->band_config = hecfg->band & 0xFF; pos = (t_u8 *)axcfg->val; - /**HE Capability */ + /**HE Capability */ if (hecfg->he_cap.len && (hecfg->he_cap.ext_id == HE_CAPABILITY)) { - tlv = (MrvlIEtypes_Extension_t *) pos; + tlv = (MrvlIEtypes_Extension_t *)pos; tlv->type = wlan_cpu_to_le16(hecfg->he_cap.id); tlv->len = wlan_cpu_to_le16(hecfg->he_cap.len); - memcpy_ext(pmadapter, &tlv->ext_id, - &hecfg->he_cap.ext_id, hecfg->he_cap.len, + memcpy_ext(pmadapter, &tlv->ext_id, &hecfg->he_cap.ext_id, + hecfg->he_cap.len, MRVDRV_SIZE_OF_CMD_BUFFER - cmd->size); cmd->size += hecfg->he_cap.len + sizeof(MrvlIEtypesHeader_t); pos += hecfg->he_cap.len + sizeof(MrvlIEtypesHeader_t); @@ -493,7 +481,6 @@ wlan_cmd_11ax_cfg(IN pmlan_private pmpriv, LEAVE(); return MLAN_STATUS_SUCCESS; } - /** * @brief This function handles the command response of 11axcfg * @@ -503,9 +490,9 @@ wlan_cmd_11ax_cfg(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_11ax_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_11ax_cfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { pmlan_adapter pmadapter = pmpriv->adapter; mlan_ds_11ax_cfg *cfg = MNULL; @@ -519,13 +506,13 @@ wlan_ret_11ax_cfg(IN pmlan_private pmpriv, if (pioctl_buf == MNULL) goto done; - cfg = (mlan_ds_11ax_cfg *) pioctl_buf->pbuf; + cfg = (mlan_ds_11ax_cfg *)pioctl_buf->pbuf; cfg->param.he_cfg.band = axcfg->band_config; - hecap = (mlan_ds_11ax_he_capa *) & cfg->param.he_cfg.he_cap; + hecap = (mlan_ds_11ax_he_capa *)&cfg->param.he_cfg.he_cap; /* TLV parse */ left_len = resp->size - sizeof(HostCmd_DS_11AX_CFG) - S_DS_GEN; - tlv = (MrvlIEtypes_Extension_t *) axcfg->val; + tlv = (MrvlIEtypes_Extension_t *)axcfg->val; pmpriv->user_hecap_len = 0; while (left_len > sizeof(MrvlIEtypesHeader_t)) { @@ -539,34 +526,33 @@ wlan_ret_11ax_cfg(IN pmlan_private pmpriv, memcpy_ext(pmadapter, (t_u8 *)&hecap->ext_id, (t_u8 *)&tlv->ext_id, tlv_len, sizeof(mlan_ds_11ax_he_capa) - - sizeof(MrvlIEtypesHeader_t)); + sizeof(MrvlIEtypesHeader_t)); if (cfg->param.he_cfg.band & MBIT(1)) { - memcpy_ext(pmadapter, - (t_u8 *)&pmpriv->user_he_cap, - (t_u8 *)tlv, - tlv_len + - sizeof(MrvlIEtypesHeader_t), - sizeof(pmpriv->user_he_cap)); - pmpriv->user_hecap_len = - MIN(tlv_len + - sizeof(MrvlIEtypesHeader_t), - sizeof(pmpriv-> - user_he_cap)); + memcpy_ext( + pmadapter, + (t_u8 *)&pmpriv->user_he_cap, + (t_u8 *)tlv, + tlv_len + + sizeof(MrvlIEtypesHeader_t), + sizeof(pmpriv->user_he_cap)); + pmpriv->user_hecap_len = MIN( + tlv_len + + sizeof(MrvlIEtypesHeader_t), + sizeof(pmpriv->user_he_cap)); PRINTM(MCMND, "user_hecap_len=%d\n", pmpriv->user_hecap_len); } else { - memcpy_ext(pmadapter, - (t_u8 *)&pmpriv-> - user_2g_he_cap, (t_u8 *)tlv, - tlv_len + - sizeof(MrvlIEtypesHeader_t), - sizeof(pmpriv-> - user_2g_he_cap)); - pmpriv->user_2g_hecap_len = - MIN(tlv_len + - sizeof(MrvlIEtypesHeader_t), - sizeof(pmpriv-> - user_2g_he_cap)); + memcpy_ext( + pmadapter, + (t_u8 *)&pmpriv->user_2g_he_cap, + (t_u8 *)tlv, + tlv_len + + sizeof(MrvlIEtypesHeader_t), + sizeof(pmpriv->user_2g_he_cap)); + pmpriv->user_2g_hecap_len = MIN( + tlv_len + + sizeof(MrvlIEtypesHeader_t), + sizeof(pmpriv->user_2g_he_cap)); PRINTM(MCMND, "user_2g_hecap_len=%d\n", pmpriv->user_2g_hecap_len); } @@ -577,8 +563,8 @@ wlan_ret_11ax_cfg(IN pmlan_private pmpriv, } left_len -= (sizeof(MrvlIEtypesHeader_t) + tlv_len); - tlv = (MrvlIEtypes_Extension_t *) ((t_u8 *)tlv + tlv_len + - sizeof(MrvlIEtypesHeader_t)); + tlv = (MrvlIEtypes_Extension_t *)((t_u8 *)tlv + tlv_len + + sizeof(MrvlIEtypesHeader_t)); } done: @@ -594,8 +580,8 @@ done: * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_11ax_ioctl_cmd(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) +mlan_status wlan_11ax_ioctl_cmd(pmlan_adapter pmadapter, + pmlan_ioctl_req pioctl_req) { mlan_status status = MLAN_STATUS_SUCCESS; mlan_ds_11ax_cmd_cfg *cfg = MNULL; @@ -612,7 +598,7 @@ wlan_11ax_ioctl_cmd(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) LEAVE(); return MLAN_STATUS_RESOURCE; } - cfg = (mlan_ds_11ax_cmd_cfg *) pioctl_req->pbuf; + cfg = (mlan_ds_11ax_cmd_cfg *)pioctl_req->pbuf; if (pioctl_req->action == MLAN_ACT_SET) cmd_action = HostCmd_ACT_GEN_SET; @@ -620,10 +606,8 @@ wlan_11ax_ioctl_cmd(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) cmd_action = HostCmd_ACT_GEN_GET; /* Send request to firmware */ - status = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_11AX_CMD, - cmd_action, - 0, (t_void *)pioctl_req, (t_void *)cfg); + status = wlan_prepare_cmd(pmpriv, HostCmd_CMD_11AX_CMD, cmd_action, 0, + (t_void *)pioctl_req, (t_void *)cfg); if (status == MLAN_STATUS_SUCCESS) status = MLAN_STATUS_PENDING; @@ -640,20 +624,25 @@ wlan_11ax_ioctl_cmd(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_11ax_cmd(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_11ax_cmd(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, IN t_u16 cmd_action, + IN t_void *pdata_buf) { pmlan_adapter pmadapter = pmpriv->adapter; HostCmd_DS_11AX_CMD_CFG *axcmd = &cmd->params.axcmd; - mlan_ds_11ax_cmd_cfg *ds_11ax_cmd = (mlan_ds_11ax_cmd_cfg *) pdata_buf; + mlan_ds_11ax_cmd_cfg *ds_11ax_cmd = (mlan_ds_11ax_cmd_cfg *)pdata_buf; mlan_ds_11ax_sr_cmd *sr_cmd = - (mlan_ds_11ax_sr_cmd *) & ds_11ax_cmd->param; + (mlan_ds_11ax_sr_cmd *)&ds_11ax_cmd->param; mlan_ds_11ax_beam_cmd *beam_cmd = - (mlan_ds_11ax_beam_cmd *) & ds_11ax_cmd->param; + (mlan_ds_11ax_beam_cmd *)&ds_11ax_cmd->param; mlan_ds_11ax_htc_cmd *htc_cmd = - (mlan_ds_11ax_htc_cmd *) & ds_11ax_cmd->param; + (mlan_ds_11ax_htc_cmd *)&ds_11ax_cmd->param; + mlan_ds_11ax_txop_cmd *txop_cmd = + (mlan_ds_11ax_txop_cmd *)&ds_11ax_cmd->param; + mlan_ds_11ax_txomi_cmd *txomi_cmd = + (mlan_ds_11ax_txomi_cmd *)&ds_11ax_cmd->param; + mlan_ds_11ax_toltime_cmd *toltime_cmd = + (mlan_ds_11ax_toltime_cmd *)&ds_11ax_cmd->param; MrvlIEtypes_Data_t *tlv = MNULL; ENTER(); @@ -670,7 +659,7 @@ wlan_cmd_11ax_cmd(IN pmlan_private pmpriv, memcpy_ext(pmadapter, tlv->data, &sr_cmd->param.obss_pd_offset.offset, sr_cmd->len, sr_cmd->len); - cmd->size += +sizeof(MrvlIEtypesHeader_t) + sr_cmd->len; + cmd->size += sizeof(MrvlIEtypesHeader_t) + sr_cmd->len; break; case MLAN_11AXCMD_BEAM_SUBID: axcmd->val[0] = beam_cmd->value; @@ -680,6 +669,21 @@ wlan_cmd_11ax_cmd(IN pmlan_private pmpriv, axcmd->val[0] = htc_cmd->value; cmd->size += sizeof(t_u8); break; + case MLAN_11AXCMD_TXOPRTS_SUBID: + memcpy_ext(pmadapter, axcmd->val, &txop_cmd->rts_thres, + sizeof(t_u16), sizeof(t_u16)); + cmd->size += sizeof(t_u16); + break; + case MLAN_11AXCMD_TXOMI_SUBID: + memcpy_ext(pmadapter, axcmd->val, &txomi_cmd->omi, + sizeof(t_u16), sizeof(t_u16)); + cmd->size += sizeof(t_u16); + break; + case MLAN_11AXCMD_OBSS_TOLTIME_SUBID: + memcpy_ext(pmadapter, axcmd->val, &toltime_cmd->tol_time, + sizeof(t_u32), sizeof(t_u32)); + cmd->size += sizeof(t_u32); + break; default: PRINTM(MERROR, "Unknown subcmd %x\n", ds_11ax_cmd->sub_id); break; @@ -700,9 +704,9 @@ wlan_cmd_11ax_cmd(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_11ax_cmd(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_11ax_cmd(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { pmlan_adapter pmadapter = pmpriv->adapter; mlan_ds_11ax_cmd_cfg *cfg = MNULL; @@ -716,7 +720,7 @@ wlan_ret_11ax_cmd(IN pmlan_private pmpriv, if (pioctl_buf == MNULL) goto done; - cfg = (mlan_ds_11ax_cmd_cfg *) pioctl_buf->pbuf; + cfg = (mlan_ds_11ax_cmd_cfg *)pioctl_buf->pbuf; cfg->sub_id = wlan_le16_to_cpu(axcmd->sub_id); switch (axcmd->sub_id) { @@ -724,18 +728,19 @@ wlan_ret_11ax_cmd(IN pmlan_private pmpriv, /* TLV parse */ left_len = resp->size - sizeof(HostCmd_DS_11AX_CMD_CFG) - S_DS_GEN; - //tlv = (MrvlIEtypes_Extension_t *)axcfg->val; + // tlv = (MrvlIEtypes_Extension_t *)axcfg->val; tlv = (MrvlIEtypes_Data_t *)axcmd->val; while (left_len > sizeof(MrvlIEtypesHeader_t)) { tlv_type = wlan_le16_to_cpu(tlv->header.type); tlv_len = wlan_le16_to_cpu(tlv->header.len); - memcpy_ext(pmadapter, - cfg->param.sr_cfg.param.obss_pd_offset. - offset, tlv->data, tlv_len, tlv_len); + memcpy_ext( + pmadapter, + cfg->param.sr_cfg.param.obss_pd_offset.offset, + tlv->data, tlv_len, tlv_len); left_len -= (sizeof(MrvlIEtypesHeader_t) + tlv_len); - tlv = (MrvlIEtypes_Data_t *)((t_u8 *)tlv + tlv_len + - sizeof - (MrvlIEtypesHeader_t)); + tlv = (MrvlIEtypes_Data_t + *)((t_u8 *)tlv + tlv_len + + sizeof(MrvlIEtypesHeader_t)); } break; case MLAN_11AXCMD_BEAM_SUBID: @@ -744,6 +749,18 @@ wlan_ret_11ax_cmd(IN pmlan_private pmpriv, case MLAN_11AXCMD_HTC_SUBID: cfg->param.htc_cfg.value = *axcmd->val; break; + case MLAN_11AXCMD_TXOPRTS_SUBID: + memcpy_ext(pmadapter, &cfg->param.txop_cfg.rts_thres, + axcmd->val, sizeof(t_u16), sizeof(t_u16)); + break; + case MLAN_11AXCMD_TXOMI_SUBID: + memcpy_ext(pmadapter, &cfg->param.txomi_cfg.omi, axcmd->val, + sizeof(t_u16), sizeof(t_u16)); + break; + case MLAN_11AXCMD_OBSS_TOLTIME_SUBID: + memcpy_ext(pmadapter, &cfg->param.toltime_cfg.tol_time, + axcmd->val, sizeof(t_u32), sizeof(t_u32)); + break; default: PRINTM(MERROR, "Unknown subcmd %x\n", axcmd->sub_id); break; @@ -753,3 +770,129 @@ done: LEAVE(); return MLAN_STATUS_SUCCESS; } + +/** + * @brief This function prepares TWT cfg command to configure + * setup/teardown + * + * @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 pdata_buf A pointer to data buffer + * @return Status returned + */ +mlan_status wlan_cmd_twt_cfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, IN t_u16 cmd_action, + IN t_void *pdata_buf) +{ + pmlan_adapter pmadapter = pmpriv->adapter; + HostCmd_DS_TWT_CFG *hostcmd_twtcfg = + (HostCmd_DS_TWT_CFG *)&cmd->params.twtcfg; + mlan_ds_twtcfg *ds_twtcfg = (mlan_ds_twtcfg *)pdata_buf; + hostcmd_twt_setup *twt_setup_params = MNULL; + hostcmd_twt_teardown *twt_teardown_params = MNULL; + mlan_status ret = MLAN_STATUS_SUCCESS; + + ENTER(); + cmd->command = wlan_cpu_to_le16(HostCmd_CMD_TWT_CFG); + + hostcmd_twtcfg->action = wlan_cpu_to_le16(cmd_action); + hostcmd_twtcfg->sub_id = wlan_cpu_to_le16(ds_twtcfg->sub_id); + + cmd->size = S_DS_GEN + sizeof(hostcmd_twtcfg->action) + + sizeof(hostcmd_twtcfg->sub_id); + + switch (hostcmd_twtcfg->sub_id) { + case MLAN_11AX_TWT_SETUP_SUBID: + twt_setup_params = &hostcmd_twtcfg->param.twt_setup; + memset(pmadapter, twt_setup_params, 0x00, + sizeof(hostcmd_twtcfg->param.twt_setup)); + twt_setup_params->implicit = + ds_twtcfg->param.twt_setup.implicit; + twt_setup_params->announced = + ds_twtcfg->param.twt_setup.announced; + twt_setup_params->trigger_enabled = + ds_twtcfg->param.twt_setup.trigger_enabled; + twt_setup_params->twt_info_disabled = + ds_twtcfg->param.twt_setup.twt_info_disabled; + twt_setup_params->negotiation_type = + ds_twtcfg->param.twt_setup.negotiation_type; + twt_setup_params->twt_wakeup_duration = + ds_twtcfg->param.twt_setup.twt_wakeup_duration; + twt_setup_params->flow_identifier = + ds_twtcfg->param.twt_setup.flow_identifier; + twt_setup_params->hard_constraint = + ds_twtcfg->param.twt_setup.hard_constraint; + twt_setup_params->twt_exponent = + ds_twtcfg->param.twt_setup.twt_exponent; + twt_setup_params->twt_mantissa = wlan_cpu_to_le16( + ds_twtcfg->param.twt_setup.twt_mantissa); + cmd->size += sizeof(hostcmd_twtcfg->param.twt_setup); + break; + case MLAN_11AX_TWT_TEARDOWN_SUBID: + twt_teardown_params = &hostcmd_twtcfg->param.twt_teardown; + memset(pmadapter, twt_teardown_params, 0x00, + sizeof(hostcmd_twtcfg->param.twt_teardown)); + twt_teardown_params->flow_identifier = + ds_twtcfg->param.twt_teardown.flow_identifier; + twt_teardown_params->negotiation_type = + ds_twtcfg->param.twt_teardown.negotiation_type; + twt_teardown_params->teardown_all_twt = + ds_twtcfg->param.twt_teardown.teardown_all_twt; + cmd->size += sizeof(hostcmd_twtcfg->param.twt_teardown); + break; + default: + PRINTM(MERROR, "Unknown subcmd %x\n", ds_twtcfg->sub_id); + ret = MLAN_STATUS_FAILURE; + break; + } + + cmd->size = wlan_cpu_to_le16(cmd->size); + + LEAVE(); + return ret; +} + +/** + * @brief TWT config command handler + * + * @param pmadapter A pointer to mlan_adapter structure + * @param pioctl_req A pointer to ioctl request buffer + * + * @return MLAN_STATUS_SUCCESS --success, otherwise fail + */ +mlan_status wlan_11ax_ioctl_twtcfg(pmlan_adapter pmadapter, + pmlan_ioctl_req pioctl_req) +{ + mlan_status ret = MLAN_STATUS_SUCCESS; + mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; + mlan_ds_twtcfg *cfg = MNULL; + t_u16 cmd_action = 0; + + ENTER(); + + if (pioctl_req->buf_len < sizeof(mlan_ds_twtcfg)) { + PRINTM(MERROR, "MLAN bss IOCTL length is too short.\n"); + pioctl_req->data_read_written = 0; + pioctl_req->buf_len_needed = sizeof(mlan_ds_twtcfg); + pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; + LEAVE(); + return MLAN_STATUS_RESOURCE; + } + + cfg = (mlan_ds_twtcfg *)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_TWT_CFG, cmd_action, 0, + (t_void *)pioctl_req, (t_void *)cfg); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + + LEAVE(); + return ret; +} diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11ax.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11ax.h index e885ffee793a..30c0d0835a01 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11ax.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11ax.h @@ -24,16 +24,21 @@ #define _MLAN_11AX_H_ /** device support 2.4G 40MHZ*/ -#define AX_2G_40MHZ_SUPPORT MBIT(1) +#define AX_2G_40MHZ_SUPPORT MBIT(1) /** device support 2.4G 242 tone RUs */ -#define AX_2G_20MHZ_SUPPORT MBIT(5) +#define AX_2G_20MHZ_SUPPORT MBIT(5) t_u8 wlan_check_11ax_twt_supported(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc); +mlan_status wlan_11ax_ioctl_twtcfg(pmlan_adapter pmadapter, + pmlan_ioctl_req pioctl_req); +mlan_status wlan_cmd_twt_cfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, IN t_u16 cmd_action, + IN t_void *pdata_buf); t_u16 wlan_fill_he_cap_tlv(mlan_private *pmpriv, t_u8 band, - MrvlIEtypes_Extension_t * phe_cap, t_u8 flag); + MrvlIEtypes_Extension_t *phe_cap, t_u8 flag); void wlan_update_11ax_cap(mlan_adapter *pmadapter, - MrvlIEtypes_Extension_t * hw_he_cap); + MrvlIEtypes_Extension_t *hw_he_cap); int wlan_cmd_append_11ax_tlv(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc, t_u8 **ppbuffer); t_u16 wlan_11ax_bandconfig_allowed(mlan_private *pmpriv, t_u16 bss_band); @@ -43,14 +48,14 @@ mlan_status wlan_11ax_ioctl_cmd(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req); mlan_status wlan_cmd_11ax_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_11ax_cfg(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf); mlan_status wlan_cmd_11ax_cmd(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_11ax_cmd(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11d.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11d.c index edb495d9d52d..d14b6382942d 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11d.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11d.c @@ -38,92 +38,69 @@ Change log: #ifdef STA_SUPPORT /** Region code mapping */ typedef struct _region_code_mapping { - /** Region */ + /** Region */ t_u8 region[COUNTRY_CODE_LEN]; - /** Code */ + /** 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 */ }; /** Universal region code */ -#define UNIVERSAL_REGION_CODE 0xff +#define UNIVERSAL_REGION_CODE 0xff #endif /** Default Tx power */ -#define TX_PWR_DEFAULT 10 +#define TX_PWR_DEFAULT 10 /* 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}, + {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}, - {252, 4980, TX_PWR_DEFAULT}, -channels for 11J JP 10M channel gap */ + /* {240, 4920, TX_PWR_DEFAULT}, + {244, 4940, TX_PWR_DEFAULT}, + {248, 4960, TX_PWR_DEFAULT}, + {252, 4980, TX_PWR_DEFAULT}, + channels for 11J JP 10M channel gap */ }; /******************************************************** @@ -142,8 +119,7 @@ channels for 11J JP 10M channel gap */ * * @return Region string */ -static t_u8 * -wlan_11d_code_2_region(pmlan_adapter pmadapter, t_u8 code) +static t_u8 *wlan_11d_code_2_region(pmlan_adapter pmadapter, t_u8 code) { t_u8 i; @@ -172,10 +148,9 @@ wlan_11d_code_2_region(pmlan_adapter pmadapter, t_u8 code) * * @return MTRUE or MFALSE */ -static t_u8 -wlan_11d_channel_known(pmlan_adapter pmadapter, - t_u8 band, - t_u8 chan, parsed_region_chan_11d_t *parsed_region_chan) +static t_u8 wlan_11d_channel_known(pmlan_adapter pmadapter, 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; @@ -196,12 +171,12 @@ wlan_11d_channel_known(pmlan_adapter pmadapter, ret = MTRUE; if (band & BAND_A) { - /* If chan is a DFS channel, we need to see an AP on it */ + /* 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)) { + 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); @@ -229,11 +204,9 @@ wlan_11d_channel_known(pmlan_adapter pmadapter, * * @return N/A */ -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) +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) { chan_freq_power_t *cfp; t_u8 i; @@ -350,7 +323,7 @@ wlan_11d_generate_domain_info(pmlan_adapter pmadapter, 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); + sizeof(IEEEtypes_SubbandSet_t) * no_of_sub_band); LEAVE(); return MLAN_STATUS_SUCCESS; } @@ -364,8 +337,8 @@ wlan_11d_generate_domain_info(pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_11d_update_chan_pwr_table(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc) +static mlan_status wlan_11d_update_chan_pwr_table(mlan_private *pmpriv, + BSSDescriptor_t *pbss_desc) { mlan_adapter *pmadapter = pmpriv->adapter; parsed_region_chan_11d_t *parsed_region_chan = @@ -388,16 +361,16 @@ wlan_11d_update_chan_pwr_table(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc) /* 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) { + 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].pwr = MIN( + parsed_region_chan->chan_pwr[i].pwr, tx_power); parsed_region_chan->chan_pwr[i].ap_seen = MTRUE; break; } @@ -429,9 +402,8 @@ wlan_11d_update_chan_pwr_table(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc) * * @return MTRUE or MFALSE */ -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) +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) { chan_freq_power_t *cfp = MNULL; t_u8 i; @@ -479,8 +451,8 @@ wlan_11d_get_chan(pmlan_adapter pmadapter, t_u8 band, t_u8 first_chan, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_11d_process_country_info(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc) +static mlan_status wlan_11d_process_country_info(mlan_private *pmpriv, + BSSDescriptor_t *pbss_desc) { mlan_adapter *pmadapter = pmpriv->adapter; parsed_region_chan_11d_t region_chan; @@ -507,18 +479,20 @@ wlan_11d_process_country_info(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc) */ 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++) { + 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 && + 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] + .band) { parsed_region_chan->chan_pwr[j].pwr = region_chan.chan_pwr[i].pwr; break; @@ -532,34 +506,33 @@ wlan_11d_process_country_info(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc) * 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; + 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_ext(pmadapter, parsed_region_chan, - ®ion_chan, + memcpy_ext(pmadapter, parsed_region_chan, ®ion_chan, sizeof(parsed_region_chan_11d_t), sizeof(parsed_region_chan_11d_t)); } @@ -576,8 +549,8 @@ wlan_11d_process_country_info(mlan_private *pmpriv, BSSDescriptor_t *pbss_desc) * * @return N/A */ -static t_void -wlan_11d_copy_chan_power(chan_power_11d_t *chan_dst, chan_power_11d_t *chan_src) +static t_void wlan_11d_copy_chan_power(chan_power_11d_t *chan_dst, + chan_power_11d_t *chan_src) { ENTER(); @@ -636,18 +609,17 @@ wlan_11d_sort_parsed_region_chan(parsed_region_chan_11d_t *parsed_region_chan) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_11d_send_domain_info(mlan_private *pmpriv, t_void *pioctl_buf) +static mlan_status wlan_11d_send_domain_info(mlan_private *pmpriv, + t_void *pioctl_buf) { mlan_status ret = MLAN_STATUS_SUCCESS; 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); + 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"); @@ -667,10 +639,8 @@ wlan_11d_send_domain_info(mlan_private *pmpriv, t_void *pioctl_buf) * @return MLAN_STATUS_SUCCESS */ 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, +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) { mlan_adapter *pmadapter = pmpriv->adapter; @@ -703,8 +673,7 @@ wlan_11d_set_domain_info(mlan_private *pmpriv, * * @return MTRUE or MFALSE */ -t_bool -wlan_is_station(mlan_private *pmpriv) +t_bool wlan_is_station(mlan_private *pmpriv) { ENTER(); LEAVE(); @@ -718,14 +687,14 @@ wlan_is_station(mlan_private *pmpriv) * * @return MTRUE or MFALSE */ -t_bool -wlan_11d_is_enabled(mlan_private *pmpriv) +t_bool wlan_11d_is_enabled(mlan_private *pmpriv) { ENTER(); LEAVE(); return (pmpriv->state_11d.enable_11d == ENABLE_11D && - pmpriv->state_11d.user_enable_11d == - ENABLE_11D) ? MTRUE : MFALSE; + pmpriv->state_11d.user_enable_11d == ENABLE_11D) ? + MTRUE : + MFALSE; } /** @@ -735,8 +704,7 @@ wlan_11d_is_enabled(mlan_private *pmpriv) * * @return MTRUE or MFALSE */ -t_bool -wlan_fw_11d_is_enabled(mlan_private *pmpriv) +t_bool wlan_fw_11d_is_enabled(mlan_private *pmpriv) { ENTER(); LEAVE(); @@ -750,8 +718,7 @@ wlan_fw_11d_is_enabled(mlan_private *pmpriv) * * @return N/A */ -t_void -wlan_11d_priv_init(mlan_private *pmpriv) +t_void wlan_11d_priv_init(mlan_private *pmpriv) { wlan_802_11d_state_t *state = &pmpriv->state_11d; @@ -762,9 +729,10 @@ wlan_11d_priv_init(mlan_private *pmpriv) 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; + state->user_enable_11d = (pmpriv->adapter->init_para.cfg_11d == + MLAN_INIT_PARA_DISABLED) ? + DISABLE_11D : + ENABLE_11D; LEAVE(); return; @@ -777,8 +745,7 @@ wlan_11d_priv_init(mlan_private *pmpriv) * * @return N/A */ -t_void -wlan_11d_init(mlan_adapter *pmadapter) +t_void wlan_11d_init(mlan_adapter *pmadapter) { ENTER(); @@ -804,8 +771,8 @@ wlan_11d_init(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11d_enable(mlan_private *pmpriv, t_void *pioctl_buf, state_11d_t flag) +mlan_status wlan_11d_enable(mlan_private *pmpriv, t_void *pioctl_buf, + state_11d_t flag) { #ifdef STA_SUPPORT mlan_adapter *pmadapter = pmpriv->adapter; @@ -816,10 +783,9 @@ wlan_11d_enable(mlan_private *pmpriv, t_void *pioctl_buf, state_11d_t flag) 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); + 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", @@ -847,9 +813,9 @@ wlan_11d_enable(mlan_private *pmpriv, t_void *pioctl_buf, state_11d_t flag) * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_802_11d_domain_info(mlan_private *pmpriv, - HostCmd_DS_COMMAND *pcmd, t_u16 cmd_action) +mlan_status wlan_cmd_802_11d_domain_info(mlan_private *pmpriv, + HostCmd_DS_COMMAND *pcmd, + t_u16 cmd_action) { mlan_adapter *pmadapter = pmpriv->adapter; HostCmd_DS_802_11D_DOMAIN_INFO *pdomain_info = @@ -875,9 +841,8 @@ wlan_cmd_802_11d_domain_info(mlan_private *pmpriv, 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); + 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(); @@ -899,16 +864,14 @@ wlan_cmd_802_11d_domain_info(mlan_private *pmpriv, pmadapter->domain_reg.sub_band, no_of_sub_band * sizeof(IEEEtypes_SubbandSet_t), MRVDRV_MAX_SUBBAND_802_11D * - sizeof(IEEEtypes_SubbandSet_t)); + sizeof(IEEEtypes_SubbandSet_t)); - pcmd->size = wlan_cpu_to_le16(sizeof(pdomain_info->action) + - domain->header.len + - sizeof(MrvlIEtypesHeader_t) + - S_DS_GEN); + 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); + pcmd->size = wlan_cpu_to_le16(sizeof(pdomain_info->action) + + S_DS_GEN); } domain->header.len = wlan_cpu_to_le16(domain->header.len); @@ -927,8 +890,8 @@ wlan_cmd_802_11d_domain_info(mlan_private *pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ret_802_11d_domain_info(mlan_private *pmpriv, HostCmd_DS_COMMAND *resp) +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 = @@ -942,9 +905,9 @@ wlan_ret_802_11d_domain_info(mlan_private *pmpriv, HostCmd_DS_COMMAND *resp) /* 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)); + 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); @@ -957,7 +920,7 @@ wlan_ret_802_11d_domain_info(mlan_private *pmpriv, HostCmd_DS_COMMAND *resp) } switch (action) { - case HostCmd_ACT_GEN_SET: /* Proc Set Action */ + case HostCmd_ACT_GEN_SET: /* Proc Set Action */ break; case HostCmd_ACT_GEN_GET: break; @@ -980,8 +943,7 @@ wlan_ret_802_11d_domain_info(mlan_private *pmpriv, HostCmd_DS_COMMAND *resp) * * @return Channel frequency */ -t_u32 -wlan_11d_chan_2_freq(pmlan_adapter pmadapter, t_u8 chan, t_u8 band) +t_u32 wlan_11d_chan_2_freq(pmlan_adapter pmadapter, t_u8 chan, t_u8 band) { chan_freq_power_t *cf; t_u16 cnt; @@ -1020,11 +982,9 @@ wlan_11d_chan_2_freq(pmlan_adapter pmadapter, t_u8 chan, t_u8 band) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) +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) { t_u8 no_of_sub_band, no_of_chan; t_u8 last_chan, first_chan, cur_chan = 0; @@ -1054,12 +1014,12 @@ wlan_11d_parse_domain_info(pmlan_adapter pmadapter, } no_of_sub_band = (country_info->len - COUNTRY_CODE_LEN) / - sizeof(IEEEtypes_SubbandSet_t); + 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 */ + /* 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; @@ -1070,9 +1030,8 @@ wlan_11d_parse_domain_info(pmlan_adapter pmadapter, 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) { + 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", @@ -1113,8 +1072,7 @@ wlan_11d_parse_domain_info(pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_11d_set_universaltable(mlan_private *pmpriv, t_u8 band) +mlan_status wlan_11d_set_universaltable(mlan_private *pmpriv, t_u8 band) { mlan_adapter *pmadapter = pmpriv->adapter; t_u16 i = 0; @@ -1125,7 +1083,7 @@ wlan_11d_set_universaltable(mlan_private *pmpriv, t_u8 band) sizeof(pmadapter->universal_channel)); if (band & (BAND_B | BAND_G | BAND_GN)) - /* If band B, G or N */ + /* If band B, G or N */ { /* Set channel-frequency-power */ pmadapter->universal_channel[i].num_cfp = @@ -1184,10 +1142,8 @@ wlan_11d_set_universaltable(mlan_private *pmpriv, t_u8 band) * @return PASSIVE if chan is unknown; ACTIVE * if chan is known */ -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 wlan_11d_get_scan_type(pmlan_adapter pmadapter, t_u8 band, t_u8 chan, + parsed_region_chan_11d_t *parsed_region_chan) { t_u8 scan_type = MLAN_SCAN_TYPE_PASSIVE; @@ -1212,8 +1168,7 @@ wlan_11d_get_scan_type(pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11d_clear_parsedtable(mlan_private *pmpriv) +mlan_status wlan_11d_clear_parsedtable(mlan_private *pmpriv) { mlan_adapter *pmadapter = pmpriv->adapter; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1239,8 +1194,7 @@ wlan_11d_clear_parsedtable(mlan_private *pmpriv) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11d_create_dnld_countryinfo(mlan_private *pmpriv, t_u8 band) +mlan_status wlan_11d_create_dnld_countryinfo(mlan_private *pmpriv, t_u8 band) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_adapter *pmadapter = pmpriv->adapter; @@ -1252,7 +1206,6 @@ wlan_11d_create_dnld_countryinfo(mlan_private *pmpriv, t_u8 band) /* 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 */ @@ -1338,9 +1291,8 @@ wlan_11d_create_dnld_countryinfo(mlan_private *pmpriv, t_u8 band) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11d_parse_dnld_countryinfo(mlan_private *pmpriv, - BSSDescriptor_t *pbss_desc) +mlan_status wlan_11d_parse_dnld_countryinfo(mlan_private *pmpriv, + BSSDescriptor_t *pbss_desc) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_adapter *pmadapter = pmpriv->adapter; @@ -1352,7 +1304,6 @@ wlan_11d_parse_dnld_countryinfo(mlan_private *pmpriv, /* 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, @@ -1365,44 +1316,46 @@ wlan_11d_parse_dnld_countryinfo(mlan_private *pmpriv, 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); + 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++) { - + ((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++) { + ((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 + * 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); + 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; } } @@ -1433,8 +1386,7 @@ wlan_11d_parse_dnld_countryinfo(mlan_private *pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11d_prepare_dnld_domain_info_cmd(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; @@ -1449,30 +1401,26 @@ wlan_11d_prepare_dnld_domain_info_cmd(mlan_private *pmpriv) pcountry_full = &pmadapter->pscan_table[idx].country_info; - ret = wlan_11d_update_chan_pwr_table(pmpriv, - &pmadapter-> - pscan_table[idx]); + 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]); + 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); + 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); + ret = wlan_11d_parse_dnld_countryinfo( + pmpriv, + &pmpriv->curr_bss_params.bss_descriptor); } else { ret = wlan_11d_parse_dnld_countryinfo(pmpriv, MNULL); } @@ -1491,12 +1439,12 @@ wlan_11d_prepare_dnld_domain_info_cmd(mlan_private *pmpriv) * * @return Pointer to the mapped country code string */ -static t_u8 * -wlan_11d_map_country_code(IN pmlan_adapter pmadapter, IN t_u8 *pcountry_code) +static t_u8 *wlan_11d_map_country_code(IN pmlan_adapter pmadapter, + IN t_u8 *pcountry_code) { - /* Since firmware can only recognize EU as ETSI domain and there is no memory left - * for some devices to convert it in firmware, driver need to convert it before - * passing country code to firmware through tlv + /* Since firmware can only recognize EU as ETSI domain and there is no + * memory left for some devices to convert it in firmware, driver need + * to convert it before passing country code to firmware through tlv */ if (wlan_is_etsi_country(pmadapter, pcountry_code)) @@ -1513,9 +1461,8 @@ wlan_11d_map_country_code(IN pmlan_adapter pmadapter, IN t_u8 *pcountry_code) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11d_cfg_domain_info(IN pmlan_adapter pmadapter, - IN mlan_ioctl_req *pioctl_req) +mlan_status wlan_11d_cfg_domain_info(IN pmlan_adapter pmadapter, + IN mlan_ioctl_req *pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; @@ -1539,22 +1486,19 @@ wlan_11d_cfg_domain_info(IN pmlan_adapter pmadapter, memcpy_ext(pmadapter, pmadapter->country_code, domain_info->country_code, COUNTRY_CODE_LEN, COUNTRY_CODE_LEN); - wlan_11d_set_domain_info(pmpriv, domain_info->band, - wlan_11d_map_country_code(pmadapter, - domain_info-> - country_code), - domain_info->no_of_sub_band, - (IEEEtypes_SubbandSet_t *)domain_info-> - sub_band); + wlan_11d_set_domain_info( + pmpriv, domain_info->band, + wlan_11d_map_country_code(pmadapter, 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)) { + 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]); @@ -1569,8 +1513,8 @@ wlan_11d_cfg_domain_info(IN pmlan_adapter pmadapter, else pmadapter->region_code = 0; if (wlan_set_regiontable(pmpriv, pmadapter->region_code, - pmadapter->config_bands | pmadapter-> - adhoc_start_band)) { + pmadapter->config_bands | + pmadapter->adhoc_start_band)) { PRINTM(MIOCTL, "Fail to set regiontabl\n"); goto done; } @@ -1591,9 +1535,9 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11d_handle_uap_domain_info(mlan_private *pmpriv, - t_u8 band, t_u8 *domain_tlv, t_void *pioctl_buf) +mlan_status wlan_11d_handle_uap_domain_info(mlan_private *pmpriv, t_u8 band, + t_u8 *domain_tlv, + t_void *pioctl_buf) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_adapter *pmadapter = pmpriv->adapter; @@ -1606,10 +1550,9 @@ wlan_11d_handle_uap_domain_info(mlan_private *pmpriv, 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) { + 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_a) @@ -1619,8 +1562,8 @@ wlan_11d_handle_uap_domain_info(mlan_private *pmpriv, else pmadapter->region_code = 0; if (wlan_set_regiontable(pmpriv, pmadapter->region_code, - pmadapter->config_bands | pmadapter-> - adhoc_start_band)) { + pmadapter->config_bands | + pmadapter->adhoc_start_band)) { ret = MLAN_STATUS_FAILURE; goto done; } @@ -1629,9 +1572,8 @@ wlan_11d_handle_uap_domain_info(mlan_private *pmpriv, memcpy_ext(pmadapter, pmadapter->country_code, pdomain_tlv->country_code, COUNTRY_CODE_LEN, COUNTRY_CODE_LEN); - num_sub_band = - ((pdomain_tlv->header.len - - COUNTRY_CODE_LEN) / sizeof(IEEEtypes_SubbandSet_t)); + 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 diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11h.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11h.c index 66dbb58560fd..a415113da807 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11h.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11h.c @@ -42,85 +42,80 @@ Change Log: ********************************************************/ /** Default IBSS DFS recovery interval (in TBTTs); used for adhoc start */ -#define WLAN_11H_DEFAULT_DFS_RECOVERY_INTERVAL 100 +#define WLAN_11H_DEFAULT_DFS_RECOVERY_INTERVAL 100 /** Default 11h power constraint used to offset the maximum transmit power */ -#define WLAN_11H_TPC_POWERCONSTRAINT 0 +#define WLAN_11H_TPC_POWERCONSTRAINT 0 /** 11h TPC Power capability minimum setting, sent in TPC_INFO command to fw */ -#define WLAN_11H_TPC_POWERCAPABILITY_MIN 5 +#define WLAN_11H_TPC_POWERCAPABILITY_MIN 5 /** 11h TPC Power capability maximum setting, sent in TPC_INFO command to fw */ -#define WLAN_11H_TPC_POWERCAPABILITY_MAX 20 +#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 (400) /* 4 beacons @ 100ms */ +#define MIN_RDH_CHAN_SW_IE_PERIOD_MSEC (400) /* 4 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) +#define MAX_RANDOM_CHANNEL_RETRIES (20) /** Maximum retries on selecting new random non-dfs channel */ -#define MAX_SWITCH_CHANNEL_RETRIES (30) +#define MAX_SWITCH_CHANNEL_RETRIES (30) /** Value for undetermined priv_curr_idx on first entry to new RDH stage */ -#define RDH_STAGE_FIRST_ENTRY_PRIV_IDX (0xff) +#define RDH_STAGE_FIRST_ENTRY_PRIV_IDX (0xff) /** Region codes 0x10, 0x20: channels 1 thru 11 supported */ -static const -IEEEtypes_SupportChan_Subband_t wlan_11h_2_4G_region_FCC = { 1, 11 }; +static const 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 }; +static const 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 }; +static const 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 }; +static const 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 }; +static const 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 }; +static const 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 }; +static const 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 }; +static const 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,8 +132,7 @@ typedef struct { * @param pmadapter Pointer to mlan_adapter * @return random integer */ -static t_u32 -wlan_11h_get_random_num(pmlan_adapter pmadapter) +static t_u32 wlan_11h_get_random_num(pmlan_adapter pmadapter) { t_u32 sec, usec; @@ -162,9 +156,9 @@ wlan_11h_get_random_num(pmlan_adapter pmadapter) * * @return Number of bytes output to pout_buf parameter return */ -static t_u32 -wlan_11h_convert_ieee_to_mrvl_ie(mlan_adapter *pmadapter, - t_u8 *pout_buf, const t_u8 *pin_ie) +static t_u32 wlan_11h_convert_ieee_to_mrvl_ie(mlan_adapter *pmadapter, + t_u8 *pout_buf, + const t_u8 *pin_ie) { MrvlIEtypesHeader_t mrvl_ie_hdr; t_u8 *ptmp_buf = pout_buf; @@ -187,7 +181,8 @@ wlan_11h_convert_ieee_to_mrvl_ie(mlan_adapter *pmadapter, /* 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 */ + /* Append the data section of the IE; length given by the IEEE IE length + */ memcpy_ext(pmadapter, ptmp_buf, pin_ie + 2, pin_ie[1], pin_ie[1]); LEAVE(); @@ -216,8 +211,8 @@ wlan_11h_convert_ieee_to_mrvl_ie(mlan_adapter *pmadapter, * - Length of the returned element in pdfs output parameter * - 0 if returned element is not setup */ -static t_u32 -wlan_11h_set_ibss_dfs_ie(mlan_private *priv, IEEEtypes_IBSS_DFS_t *pdfs) +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; @@ -240,8 +235,9 @@ wlan_11h_set_ibss_dfs_ie(mlan_private *priv, IEEEtypes_IBSS_DFS_t *pdfs) sizeof(pdfs->dfs_owner), 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++) { + 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; @@ -260,10 +256,9 @@ wlan_11h_set_ibss_dfs_ie(mlan_private *priv, IEEEtypes_IBSS_DFS_t *pdfs) num_chans); pdfs->element_id = IBSS_DFS; - pdfs->len = - (sizeof(pdfs->dfs_owner) + - sizeof(pdfs->dfs_recovery_interval) - + num_chans * sizeof(IEEEtypes_ChannelMap_t)); + 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); @@ -294,10 +289,8 @@ wlan_11h_set_ibss_dfs_ie(mlan_private *priv, IEEEtypes_IBSS_DFS_t *pdfs) * - Length of the returned element in psup_chan output parameter * - 0 if returned element is not setup */ -static - t_u16 -wlan_11h_set_supp_channels_ie(mlan_private *priv, - t_u8 band, +static t_u16 +wlan_11h_set_supp_channels_ie(mlan_private *priv, t_u8 band, IEEEtypes_SupportedChannels_t *psup_chan) { t_u16 num_subbands = 0; @@ -320,23 +313,23 @@ wlan_11h_set_supp_channels_ie(mlan_private *priv, * Channels are contiguous in 2.4GHz, usually only one subband. */ switch (cfp_bg) { - case 0x10: /* USA FCC */ - case 0x20: /* Canada IC */ + 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 0x41: /* Japan */ - case 0x50: /* China */ + case 0x30: /* Europe ETSI */ + case 0x41: /* Japan */ + case 0x50: /* China */ psup_chan->subband[num_subbands++] = wlan_11h_2_4G_region_EU; break; - case 0x40: /* Japan */ + case 0x40: /* Japan */ psup_chan->subband[num_subbands++] = wlan_11h_2_4G_region_JPN40; break; - case 0xff: /* Japan special */ + case 0xff: /* Japan special */ psup_chan->subband[num_subbands++] = wlan_11h_2_4G_region_EU; psup_chan->subband[num_subbands++] = @@ -350,9 +343,9 @@ wlan_11h_set_supp_channels_ie(mlan_private *priv, * element. */ switch (cfp_a) { - case 0x10: /* USA FCC */ - case 0x20: /* Canada IC */ - case 0x30: /* Europe ETSI */ + case 0x10: /* USA FCC */ + case 0x20: /* Canada IC */ + case 0x30: /* Europe ETSI */ default: psup_chan->subband[num_subbands++] = wlan_11h_unii_lower_band; @@ -363,7 +356,7 @@ wlan_11h_set_supp_channels_ie(mlan_private *priv, psup_chan->subband[num_subbands++] = wlan_11h_unii_upper_band; break; - case 0x50: /* China */ + case 0x50: /* China */ psup_chan->subband[num_subbands++] = wlan_11h_unii_lower_band; psup_chan->subband[num_subbands++] = @@ -371,9 +364,9 @@ wlan_11h_set_supp_channels_ie(mlan_private *priv, psup_chan->subband[num_subbands++] = wlan_11h_unii_upper_band; break; - case 0x40: /* Japan */ - case 0x41: /* Japan */ - case 0xff: /* Japan special */ + 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++] = @@ -383,29 +376,32 @@ wlan_11h_set_supp_channels_ie(mlan_private *priv, psup_chan->subband[num_subbands++] = wlan_11h_unii_mid_upper_band; break; - case 0x1: /* Low band (5150-5250 MHz) channels */ + 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 */ + 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 */ + 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 */ + 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 */ + 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; - case 0x6: /* Low band (5150-5250 MHz) and Lower middle band (5250-5350 MHz) and High band (5725-5850 MHz) channels */ + case 0x6: /* Low band (5150-5250 MHz) and Lower middle band + (5250-5350 MHz) and High band (5725-5850 MHz) + channels */ psup_chan->subband[num_subbands++] = wlan_11h_unii_lower_band; psup_chan->subband[num_subbands++] = @@ -425,8 +421,7 @@ wlan_11h_set_supp_channels_ie(mlan_private *priv, psup_chan->len = num_subbands * sizeof(IEEEtypes_SupportChan_Subband_t); - ret_len = (t_u16)(psup_chan->len - + sizeof(psup_chan->len) + + 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); @@ -446,9 +441,9 @@ wlan_11h_set_supp_channels_ie(mlan_private *priv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_11h_cmd_tpc_request(mlan_private *priv, - HostCmd_DS_COMMAND *pcmd_ptr, const t_void *pinfo_buf) +static mlan_status wlan_11h_cmd_tpc_request(mlan_private *priv, + HostCmd_DS_COMMAND *pcmd_ptr, + const t_void *pinfo_buf) { ENTER(); @@ -479,9 +474,9 @@ wlan_11h_cmd_tpc_request(mlan_private *priv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_11h_cmd_tpc_info(mlan_private *priv, - HostCmd_DS_COMMAND *pcmd_ptr, const t_void *pinfo_buf) +static mlan_status wlan_11h_cmd_tpc_info(mlan_private *priv, + 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 = @@ -523,9 +518,9 @@ wlan_11h_cmd_tpc_info(mlan_private *priv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_11h_cmd_chan_sw_ann(mlan_private *priv, - HostCmd_DS_COMMAND *pcmd_ptr, const t_void *pinfo_buf) +static mlan_status wlan_11h_cmd_chan_sw_ann(mlan_private *priv, + 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; @@ -560,15 +555,17 @@ wlan_11h_cmd_chan_sw_ann(mlan_private *priv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_PENDING */ -static mlan_status -wlan_11h_cmd_chan_rpt_req(mlan_private *priv, - HostCmd_DS_COMMAND *pcmd_ptr, const t_void *pinfo_buf) +static mlan_status wlan_11h_cmd_chan_rpt_req(mlan_private *priv, + HostCmd_DS_COMMAND *pcmd_ptr, + const t_void *pinfo_buf) { 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; t_bool is_cancel_req = MFALSE; + t_u8 dfs53cfg = priv->adapter->dfs53cfg; + MrvlIEtypes_DfsW53Cfg_t *ptlv_dfs53cfg; ENTER(); @@ -600,9 +597,8 @@ wlan_11h_cmd_chan_rpt_req(mlan_private *priv, wlan_cpu_to_le32(pchan_rpt_req->millisec_dwell_time); /* if DFS channel, add BASIC report TLV, and set radar bit */ - if (!is_cancel_req && - wlan_11h_radar_detect_required(priv, - pchan_rpt_req->chan_desc.chanNum)) { + if (!is_cancel_req && wlan_11h_radar_detect_required( + priv, pchan_rpt_req->chan_desc.chanNum)) { ptlv_basic = (MrvlIEtypes_ChanRpt11hBasic_t *)(((t_u8 *)(pcmd_ptr)) + pcmd_ptr->size); @@ -615,6 +611,20 @@ wlan_11h_cmd_chan_rpt_req(mlan_private *priv, ptlv_basic->map.radar = 1; pcmd_ptr->size += sizeof(MrvlIEtypes_ChanRpt11hBasic_t); } + + if ((priv->adapter->region_code == COUNTRY_CODE_JP_40 || + priv->adapter->region_code == COUNTRY_CODE_JP_FF) && + (dfs53cfg != DFS_W53_DEFAULT_FW)) { + ptlv_dfs53cfg = + (MrvlIEtypes_DfsW53Cfg_t *)(((t_u8 *)(pcmd_ptr)) + + pcmd_ptr->size); + ptlv_dfs53cfg->Header.type = + wlan_cpu_to_le16(TLV_TYPE_DFS_W53_CFG); + ptlv_dfs53cfg->Header.len = wlan_cpu_to_le16(sizeof(t_u8)); + ptlv_dfs53cfg->dfs53cfg = dfs53cfg; + pcmd_ptr->size += sizeof(MrvlIEtypes_DfsW53Cfg_t); + } + pcmd_ptr->size = wlan_cpu_to_le16(pcmd_ptr->size); /* update dfs sturcture. @@ -642,12 +652,9 @@ wlan_11h_cmd_chan_rpt_req(mlan_private *priv, * * @return The len increased */ -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) +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) { MrvlIEtypes_PowerCapability_t *pcap; MrvlIEtypes_LocalPowerConstraint_t *pconstraint; @@ -700,11 +707,9 @@ wlan_11h_set_local_power_constraint_tlv(t_u8 **ppbuffer, * @return Integer number of bytes appended to the TLV output * buffer (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) +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) { MrvlIEtypesHeader_t ie_header; IEEEtypes_SupportedChannels_t sup_chan_ie; @@ -719,17 +724,11 @@ wlan_11h_process_infra_join(mlan_private *priv, 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); + 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); @@ -785,10 +784,9 @@ wlan_11h_process_infra_join(mlan_private *priv, * @return Integer number of bytes appended to the TLV output * buffer (ppbuffer) */ -static t_u32 -wlan_11h_process_adhoc(mlan_private *priv, - t_u8 **ppbuffer, - t_u32 channel, wlan_11h_bss_info_t *p11h_bss_info) +static t_u32 wlan_11h_process_adhoc(mlan_private *priv, t_u8 **ppbuffer, + t_u32 channel, + wlan_11h_bss_info_t *p11h_bss_info) { IEEEtypes_IBSS_DFS_t dfs_elem; t_u32 size_appended; @@ -817,9 +815,8 @@ wlan_11h_process_adhoc(mlan_private *priv, } /* 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); + 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; @@ -835,14 +832,9 @@ wlan_11h_process_adhoc(mlan_private *priv, * 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); + 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; @@ -856,14 +848,9 @@ wlan_11h_process_adhoc(mlan_private *priv, * 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); + 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; @@ -874,15 +861,10 @@ wlan_11h_process_adhoc(mlan_private *priv, 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); + 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(); @@ -901,8 +883,7 @@ wlan_11h_process_adhoc(mlan_private *priv, * - MTRUE if 11h is enabled * - MFALSE otherwise */ -static t_bool -wlan_11h_is_enabled(mlan_private *priv) +static t_bool wlan_11h_is_enabled(mlan_private *priv) { ENTER(); LEAVE(); @@ -918,14 +899,12 @@ wlan_11h_is_enabled(mlan_private *priv) * - MTRUE if slave radar detection is enabled in firmware * - MFALSE otherwise */ -static t_bool -wlan_11h_is_slave_radar_det_active(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; } - /** * @brief Return whether the slave interface is active, and on DFS channel. * priv is assumed to already be a dfs slave interface, doesn't check this. @@ -936,17 +915,15 @@ wlan_11h_is_slave_radar_det_active(mlan_private *priv) * - MTRUE if priv is slave, and meets both conditions * - MFALSE otherwise */ -static t_bool -wlan_11h_is_slave_active_on_dfs_chan(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)) + wlan_11h_radar_detect_required( + priv, priv->curr_bss_params.bss_descriptor.channel)) ret = MTRUE; LEAVE(); @@ -963,16 +940,15 @@ wlan_11h_is_slave_active_on_dfs_chan(mlan_private *priv) * - MTRUE if priv is master, and meets both conditions * - MFALSE otherwise */ -static t_bool -wlan_11h_is_master_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)) && + 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; @@ -981,9 +957,8 @@ wlan_11h_is_master_active_on_dfs_chan(mlan_private *priv) #ifdef UAP_SUPPORT if ((priv->uap_bss_started == MTRUE) && (priv->uap_state_chan_cb.bandcfg.chanBand == BAND_5GHZ) && - wlan_11h_radar_detect_required(priv, - priv->uap_state_chan_cb. - channel)) + wlan_11h_radar_detect_required( + priv, priv->uap_state_chan_cb.channel)) ret = MTRUE; #endif } @@ -998,8 +973,7 @@ wlan_11h_is_master_active_on_dfs_chan(mlan_private *priv) * * @return MTRUE or MFALSE */ -static t_bool -wlan_11h_is_dfs_master(mlan_private *priv) +static t_bool wlan_11h_is_dfs_master(mlan_private *priv) { t_bool ret = MFALSE; @@ -1029,8 +1003,7 @@ wlan_11h_is_dfs_master(mlan_private *priv) * @return MTRUE or MFALSE */ -static t_bool -wlan_11h_is_dfs_slave(mlan_private *priv) +static t_bool wlan_11h_is_dfs_slave(mlan_private *priv) { t_bool ret = MFALSE; ENTER(); @@ -1046,8 +1019,7 @@ wlan_11h_is_dfs_slave(mlan_private *priv) * * @return MTRUE or MFALSE */ -t_bool -wlan_is_intf_active(mlan_private *pmpriv) +t_bool wlan_is_intf_active(mlan_private *pmpriv) { t_bool ret = MFALSE; ENTER(); @@ -1062,7 +1034,7 @@ wlan_is_intf_active(mlan_private *pmpriv) ret = pmpriv->uap_bss_started; else #endif - if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) + if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) ret = pmpriv->media_connected; LEAVE(); @@ -1076,8 +1048,7 @@ wlan_is_intf_active(mlan_private *pmpriv) * * @return 11H MIB setting for radar detect */ -static t_u32 -wlan_11h_get_current_radar_detect_flags(mlan_adapter *pmadapter) +static t_u32 wlan_11h_get_current_radar_detect_flags(mlan_adapter *pmadapter) { t_u32 radar_det_flags = 0; @@ -1087,8 +1058,8 @@ wlan_11h_get_current_radar_detect_flags(mlan_adapter *pmadapter) 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", - __func__, radar_det_flags); + PRINTM(MINFO, "%s: radar_det_state_curr=0x%x\n", __func__, + radar_det_flags); LEAVE(); return radar_det_flags; @@ -1102,16 +1073,17 @@ wlan_11h_get_current_radar_detect_flags(mlan_adapter *pmadapter) * * @return MTRUE (need update) or MFALSE (no change in flags) */ -static t_bool -wlan_11h_check_radar_det_state(mlan_adapter *pmadapter, OUT t_u32 *pnew_state) +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", __func__, - pmadapter->state_11h.master_radar_det_enable_pending, + PRINTM(MINFO, + "%s: master_radar_det_pending=%d, " + " slave_radar_det_pending=%d\n", + __func__, 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 */ @@ -1126,12 +1098,14 @@ wlan_11h_check_radar_det_state(mlan_adapter *pmadapter, OUT t_u32 *pnew_state) wlan_11h_is_dfs_slave) > 0)) radar_det_state_new |= SLAVE_RADAR_DET_MASK; - PRINTM(MINFO, "%s: radar_det_state_new=0x%x\n", - __func__, radar_det_state_new); + PRINTM(MINFO, "%s: radar_det_state_new=0x%x\n", __func__, + 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; + ret = (wlan_11h_get_current_radar_detect_flags(pmadapter) != + radar_det_state_new) ? + MTRUE : + MFALSE; if (ret) *pnew_state = radar_det_state_new; @@ -1146,11 +1120,10 @@ wlan_11h_check_radar_det_state(mlan_adapter *pmadapter, OUT t_u32 *pnew_state) * * @return frenquency index */ -static t_u8 -wlan_11h_get_channel_freq_idx(IN t_u8 channel_num) +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 center_freq[] = {42, 58, 106, 122, 138, 155}; t_u8 chan_idx, ret = 0; chan_idx = channel_num - 100; @@ -1167,12 +1140,15 @@ wlan_11h_get_channel_freq_idx(IN t_u8 channel_num) } /** - * @brief Prepare ioctl for add/remove CHAN_SW IE - RADAR_DETECTED event handling + * @brief Prepare ioctl for add/remove CHAN_SW IE - RADAR_DETECTED event + * handling * * @param pmadapter Pointer to mlan_adapter - * @param pioctl_req Pointer to completed mlan_ioctl_req (allocated inside) + * @param pioctl_req Pointer to completed mlan_ioctl_req (allocated + * inside) * @param ppcust_chansw_ie Poniter to customer ie - * @param is_adding_ie CHAN_SW IE is to be added (MTRUE), or removed (MFALSE) + * @param is_adding_ie CHAN_SW IE is to be added (MTRUE), or removed + * (MFALSE) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ @@ -1201,11 +1177,10 @@ wlan_11h_prepare_custom_ie_chansw(IN mlan_adapter *pmadapter, /* 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); + 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", __func__); @@ -1231,18 +1206,20 @@ wlan_11h_prepare_custom_ie_chansw(IN mlan_adapter *pmadapter, /* 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_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 */ + 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->chan_switch_mode = 1; /* STA should not transmit */ pchansw_ie->new_channel_num = pmadapter->state_rdh.new_channel; pchansw_ie->chan_switch_count = pmadapter->dfs_cs_count; @@ -1251,52 +1228,48 @@ wlan_11h_prepare_custom_ie_chansw(IN mlan_adapter *pmadapter, for (index = 0; index < pmadapter->state_rdh.priv_list_count; index++) { pmpriv = pmadapter->state_rdh.priv_list[index]; - /*find the first AP interface */ + /*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)); + (IEEEtypes_Header_t + *)((t_u8 *)pchansw_ie + + sizeof(IEEEtypes_ChanSwitchAnn_t)); pChanSwWrap_ie->element_id = EXT_POWER_CONSTR; - /*will have multiple sub IEs */ + /*will have multiple sub IEs*/ pChanSwWrap_ie->len = 0; /* prepare the Wide Bandwidth Channel Switch IE * Channel Switch IE */ pbwchansw_ie = (IEEEtypes_WideBWChanSwitch_t - *)((t_u8 *)pChanSwWrap_ie + - sizeof(IEEEtypes_Header_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); - /*fix 80MHZ now */ + /*fix 80MHZ now*/ pbwchansw_ie->new_channel_width = VHT_OPER_CHWD_80MHZ; pbwchansw_ie->new_channel_center_freq0 = - wlan_11h_get_channel_freq_idx - (pmadapter->state_rdh.new_channel); + 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); + 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 */ + /*prepare the VHT Transmit Power Envelope IE*/ pvhttpcEnv_ie = - (IEEEtypes_VhtTpcEnvelope_t *)((t_u8 *) - pChanSwWrap_ie - + - sizeof - (IEEEtypes_Header_t) - + - sizeof - (IEEEtypes_WideBWChanSwitch_t)); + (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 = @@ -1312,9 +1285,9 @@ wlan_11h_prepare_custom_ie_chansw(IN mlan_adapter *pmadapter, sizeof(IEEEtypes_VhtTpcEnvelope_t); pcust_chansw_ie->ie_length += - sizeof(IEEEtypes_WideBWChanSwitch_t) - + sizeof(IEEEtypes_VhtTpcEnvelope_t) - + sizeof(IEEEtypes_Header_t); + sizeof(IEEEtypes_WideBWChanSwitch_t) + + sizeof(IEEEtypes_VhtTpcEnvelope_t) + + sizeof(IEEEtypes_Header_t); PRINTM(MINFO, "Append Wide Bandwidth Channel Switch IE\n"); @@ -1342,14 +1315,13 @@ wlan_11h_prepare_custom_ie_chansw(IN mlan_adapter *pmadapter, * previous uAP channel's band config * * @param start_chn Random Start channel choosen after radar detection - * @param uap_band_cfg Private driver uAP band configuration information structure + * @param uap_band_cfg Private driver uAP band configuration information + * structure * * @return MFALSE if the channel is not allowed in given band */ -static t_bool -wlan_11h_is_band_valid(t_u8 start_chn, Band_Config_t uap_band_cfg) +static t_bool wlan_11h_is_band_valid(t_u8 start_chn, Band_Config_t uap_band_cfg) { - /* if band width is not 20MHZ (either 40 or 80MHz) * return MFALSE, 165 is not allowed in bands other than 20MHZ */ @@ -1370,8 +1342,8 @@ wlan_11h_is_band_valid(t_u8 start_chn, Band_Config_t uap_band_cfg) * * @return Starting channel */ -static t_u8 -wlan_11h_get_uap_start_channel(mlan_private *priv, Band_Config_t uap_band_cfg) +static t_u8 wlan_11h_get_uap_start_channel(mlan_private *priv, + Band_Config_t uap_band_cfg) { t_u8 start_chn; mlan_adapter *adapter = priv->adapter; @@ -1417,47 +1389,49 @@ wlan_11h_get_uap_start_channel(mlan_private *priv, Band_Config_t uap_band_cfg) 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) { + /* 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). */ - rand_entry = - wlan_11h_get_random_num(adapter) - % chn_tbl->num_cfp; + rand_entry = wlan_11h_get_random_num( + adapter) % + chn_tbl->num_cfp; start_chn = - (t_u8)chn_tbl->pcfp[rand_entry]. - channel; - /* Loop until a non-dfs channel is found with compatible band - * bounded by chn_tbl->num_cfp entries in the channel table + (t_u8)chn_tbl->pcfp[rand_entry] + .channel; + /* Loop until a non-dfs channel is found + * with compatible band bounded by + * chn_tbl->num_cfp entries in the + * channel table */ - while (((chn_tbl->pcfp[rand_entry]. - dynamic. - flags & NXP_CHANNEL_DISABLED) - || - (wlan_11h_is_channel_under_nop - (adapter, start_chn) || + while (((chn_tbl->pcfp[rand_entry] + .dynamic.flags & + NXP_CHANNEL_DISABLED) || + (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)) || - !(wlan_11h_is_band_valid - (start_chn, uap_band_cfg)))) - && (++rand_tries < - chn_tbl->num_cfp)) { + wlan_11h_radar_detect_required( + priv, start_chn)) || + !(wlan_11h_is_band_valid( + start_chn, + uap_band_cfg)))) && + (++rand_tries < + chn_tbl->num_cfp)) { rand_entry++; - rand_entry = - rand_entry % - chn_tbl->num_cfp; + rand_entry = rand_entry % + chn_tbl->num_cfp; start_chn = - (t_u8)chn_tbl-> - pcfp[rand_entry]. - channel; + (t_u8)chn_tbl + ->pcfp[rand_entry] + .channel; PRINTM(MINFO, "start chan=%d rand_entry=%d\n", start_chn, rand_entry); @@ -1480,10 +1454,7 @@ wlan_11h_get_uap_start_channel(mlan_private *priv, Band_Config_t uap_band_cfg) #endif /* UAP_SUPPORT */ #ifdef DEBUG_LEVEL1 -static const char *DFS_TS_REPR_STRINGS[] = { "", - "NOP_start", - "CAC_completed" -}; +static const char *DFS_TS_REPR_STRINGS[] = {"", "NOP_start", "CAC_completed"}; #endif /** @@ -1502,18 +1473,18 @@ 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); + 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) { + 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); + " 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; @@ -1532,9 +1503,8 @@ wlan_11h_find_dfs_timestamp(mlan_adapter *pmadapter, t_u8 channel) * @param pmadapter Pointer to mlan_adapter * @param pdfs_ts Pointer to dfs_timestamp to remove */ -static t_void -wlan_11h_remove_dfs_timestamp(mlan_adapter *pmadapter, - wlan_dfs_timestamp_t *pdfs_ts) +static t_void wlan_11h_remove_dfs_timestamp(mlan_adapter *pmadapter, + wlan_dfs_timestamp_t *pdfs_ts) { ENTER(); /* dequeue and delete timestamp */ @@ -1558,8 +1528,8 @@ wlan_11h_remove_dfs_timestamp(mlan_adapter *pmadapter, * * @return Pointer to timestamp if found, or MNULL */ -static mlan_status -wlan_11h_add_dfs_timestamp(mlan_adapter *pmadapter, t_u8 repr, t_u8 channel) +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; @@ -1569,11 +1539,9 @@ wlan_11h_add_dfs_timestamp(mlan_adapter *pmadapter, t_u8 repr, t_u8 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); + 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", __func__); @@ -1593,15 +1561,16 @@ wlan_11h_add_dfs_timestamp(mlan_adapter *pmadapter, t_u8 repr, t_u8 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); + 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); + 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; @@ -1620,8 +1589,7 @@ wlan_11h_add_dfs_timestamp(mlan_adapter *pmadapter, t_u8 repr, t_u8 channel) * - MTRUE if master radar detection is enabled in firmware * - MFALSE otherwise */ -t_bool -wlan_11h_is_master_radar_det_active(mlan_private *priv) +t_bool wlan_11h_is_master_radar_det_active(mlan_private *priv) { ENTER(); LEAVE(); @@ -1640,8 +1608,7 @@ wlan_11h_is_master_radar_det_active(mlan_private *priv) * * @sa wlan_11h_check_update_radar_det_state */ -mlan_status -wlan_11h_config_master_radar_det(mlan_private *priv, t_bool enable) +mlan_status wlan_11h_config_master_radar_det(mlan_private *priv, t_bool enable) { mlan_status ret = MLAN_STATUS_FAILURE; @@ -1673,8 +1640,7 @@ wlan_11h_config_master_radar_det(mlan_private *priv, t_bool enable) * * @sa wlan_11h_check_update_radar_det_state */ -mlan_status -wlan_11h_config_slave_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; @@ -1705,8 +1671,7 @@ wlan_11h_config_slave_radar_det(mlan_private *priv, t_bool enable) * * @sa wlan_11h_check_radar_det_state */ -mlan_status -wlan_11h_check_update_radar_det_state(mlan_private *pmpriv) +mlan_status wlan_11h_check_update_radar_det_state(mlan_private *pmpriv) { t_u32 new_radar_det_state = 0; t_u32 mib_11h = 0; @@ -1725,10 +1690,9 @@ wlan_11h_check_update_radar_det_state(mlan_private *pmpriv) 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); + 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; } @@ -1754,8 +1718,7 @@ wlan_11h_check_update_radar_det_state(mlan_private *pmpriv) * * @sa wlan_11h_activate */ -t_bool -wlan_11h_is_active(mlan_private *priv) +t_bool wlan_11h_is_active(mlan_private *priv) { ENTER(); LEAVE(); @@ -1769,8 +1732,7 @@ wlan_11h_is_active(mlan_private *priv) * * @return N/A */ -t_void -wlan_11h_tx_enable(mlan_private *priv) +t_void wlan_11h_tx_enable(mlan_private *priv) { ENTER(); if (priv->intf_state_11h.tx_disabled) { @@ -1789,8 +1751,7 @@ wlan_11h_tx_enable(mlan_private *priv) * * @return N/A */ -t_void -wlan_11h_tx_disable(mlan_private *priv) +t_void wlan_11h_tx_disable(mlan_private *priv) { ENTER(); if (!priv->intf_state_11h.tx_disabled) { @@ -1811,8 +1772,8 @@ wlan_11h_tx_disable(mlan_private *priv) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11h_activate(mlan_private *priv, t_void *pioctl_buf, t_bool flag) +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; @@ -1832,10 +1793,9 @@ wlan_11h_activate(mlan_private *priv, t_void *pioctl_buf, t_bool flag) /* * 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); + 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 @@ -1855,8 +1815,7 @@ wlan_11h_activate(mlan_private *priv, t_void *pioctl_buf, t_bool flag) * * @return N/A */ -t_void -wlan_11h_init(mlan_adapter *adapter) +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; @@ -1877,13 +1836,12 @@ wlan_11h_init(mlan_adapter *adapter) pstate_11h->is_master_radar_det_active = MFALSE; pstate_11h->is_slave_radar_det_active = MFALSE; - /*Initialize quiet_ie */ + /*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)); + (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; @@ -1913,6 +1871,7 @@ wlan_11h_init(mlan_adapter *adapter) pdfs_test->user_nop_period_sec = 0; pdfs_test->no_channel_change_on_radar = MFALSE; pdfs_test->fixed_new_channel_on_radar = 0; + adapter->dfs53cfg = adapter->init_para.dfs53cfg; LEAVE(); } @@ -1924,8 +1883,7 @@ wlan_11h_init(mlan_adapter *adapter) * * @return N/A */ -t_void -wlan_11h_cleanup(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; @@ -1933,10 +1891,8 @@ wlan_11h_cleanup(mlan_adapter *adapter) ENTER(); /* cleanup dfs_timestamp list */ - pdfs_ts = (wlan_dfs_timestamp_t *)util_peek_list(adapter->pmoal_handle, - &pstate_dfs-> - dfs_ts_head, MNULL, - MNULL); + 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, @@ -1944,12 +1900,9 @@ wlan_11h_cleanup(mlan_adapter *adapter) 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); + pdfs_ts = (wlan_dfs_timestamp_t *)util_peek_list( + adapter->pmoal_handle, &pstate_dfs->dfs_ts_head, MNULL, + MNULL); } LEAVE(); @@ -1962,8 +1915,7 @@ wlan_11h_cleanup(mlan_adapter *adapter) * * @return N/A */ -t_void -wlan_11h_priv_init(mlan_private *pmpriv) +t_void wlan_11h_priv_init(mlan_private *pmpriv) { wlan_11h_interface_state_t *pistate_11h = &pmpriv->intf_state_11h; @@ -1990,8 +1942,7 @@ wlan_11h_priv_init(mlan_private *pmpriv) * * @return Starting channel */ -t_u8 -wlan_11h_get_adhoc_start_channel(mlan_private *priv) +t_u8 wlan_11h_get_adhoc_start_channel(mlan_private *priv) { t_u8 start_chn; mlan_adapter *adapter = priv->adapter; @@ -2011,8 +1962,7 @@ wlan_11h_get_adhoc_start_channel(mlan_private *priv) /* * Check that we are looking for a channel in the A Band */ - if ((adapter->adhoc_start_band & BAND_A) - ) { + if ((adapter->adhoc_start_band & BAND_A)) { /* * Set default to the A Band default. * Used if random selection fails @@ -2032,10 +1982,11 @@ wlan_11h_get_adhoc_start_channel(mlan_private *priv) 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) { + /* 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 @@ -2044,21 +1995,22 @@ wlan_11h_get_adhoc_start_channel(mlan_private *priv) */ do { rand_entry = - wlan_11h_get_random_num - (adapter) % + 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)); + (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)); } } } @@ -2082,8 +2034,7 @@ wlan_11h_get_adhoc_start_channel(mlan_private *priv) * * @return Closed channel, else 0 */ -t_u8 -wlan_11h_get_csa_closed_channel(mlan_private *priv) +t_u8 wlan_11h_get_csa_closed_channel(mlan_private *priv) { t_u32 sec, usec; @@ -2095,11 +2046,11 @@ wlan_11h_get_csa_closed_channel(mlan_private *priv) } /* have csa channel, check if expired or not */ - priv->adapter->callbacks.moal_get_system_time(priv->adapter-> - pmoal_handle, &sec, - &usec); + 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 */ + /* 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); @@ -2129,8 +2080,7 @@ wlan_11h_get_csa_closed_channel(mlan_private *priv) */ /** @sa wlan_11h_issue_radar_detect */ -t_bool -wlan_11h_radar_detect_required(mlan_private *priv, t_u8 channel) +t_bool wlan_11h_radar_detect_required(mlan_private *priv, t_u8 channel) { t_bool required = MFALSE; @@ -2144,24 +2094,25 @@ wlan_11h_radar_detect_required(mlan_private *priv, t_u8 channel) required = wlan_get_cfp_radar_detect(priv, channel); if (!priv->adapter->region_code) { - PRINTM(MINFO, "11h: Radar detection in CFP code BG:%#x " + 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, + priv->adapter->cfp_code_bg, priv->adapter->cfp_code_a, (required ? "" : "not "), channel); } else - PRINTM(MINFO, "11h: Radar detection in region %#02x " + 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) { + 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"); + "Already operating on the channel\n"); } LEAVE(); @@ -2190,10 +2141,9 @@ wlan_11h_radar_detect_required(mlan_private *priv, t_u8 channel) * * @sa wlan_11h_radar_detect_required */ -t_s32 -wlan_11h_issue_radar_detect(mlan_private *priv, - pmlan_ioctl_req pioctl_req, - t_u8 channel, Band_Config_t bandcfg) +t_s32 wlan_11h_issue_radar_detect(mlan_private *priv, + pmlan_ioctl_req pioctl_req, t_u8 channel, + Band_Config_t bandcfg) { t_s32 ret; HostCmd_DS_CHAN_RPT_REQ chan_rpt_req; @@ -2223,15 +2173,15 @@ wlan_11h_issue_radar_detect(mlan_private *priv, /* ETSI new requirement for ch 120, 124 and 128 */ if (wlan_is_etsi_country(pmadapter, pmadapter->country_code)) { - if (channel == 120 || channel == 124 || channel == 128) { + if (channel == 120 || channel == 124 || + channel == 128) { chan_rpt_req.millisec_dwell_time = WLAN_11H_CHANNEL_AVAIL_CHECK_DURATION * 10; } if (channel == 116 && - ((bandcfg.chanWidth == CHAN_BW_40MHZ) - || (bandcfg.chanWidth == CHAN_BW_80MHZ) - )) { + ((bandcfg.chanWidth == CHAN_BW_40MHZ) || + (bandcfg.chanWidth == CHAN_BW_80MHZ))) { chan_rpt_req.millisec_dwell_time = WLAN_11H_CHANNEL_AVAIL_CHECK_DURATION * 10; @@ -2242,8 +2192,8 @@ wlan_11h_issue_radar_detect(mlan_private *priv, if (pioctl_req) { ds_11hcfg = (mlan_ds_11h_cfg *)pioctl_req->pbuf; if (!ds_11hcfg->param.chan_rpt_req.host_based) { - ds_11hcfg->param.chan_rpt_req. - millisec_dwell_time = + ds_11hcfg->param.chan_rpt_req + .millisec_dwell_time = chan_rpt_req.millisec_dwell_time; } } @@ -2251,15 +2201,17 @@ wlan_11h_issue_radar_detect(mlan_private *priv, 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); + priv->adapter->dfs_test_params + .user_cac_period_msec); chan_rpt_req.millisec_dwell_time = - priv->adapter->dfs_test_params. - user_cac_period_msec; + priv->adapter->dfs_test_params + .user_cac_period_msec; } - 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, @@ -2288,8 +2240,7 @@ wlan_11h_issue_radar_detect(mlan_private *priv, * @sa wlan_11h_issue_radar_detect * @sa wlan_11h_process_start */ -mlan_status -wlan_11h_check_chan_report(mlan_private *priv, t_u8 chan) +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; @@ -2298,13 +2249,12 @@ wlan_11h_check_chan_report(mlan_private *priv, t_u8 chan) ENTER(); /* check report we hold is valid or not */ - priv->adapter->callbacks.moal_get_system_time(priv->adapter-> - pmoal_handle, &sec, - &usec); + priv->adapter->callbacks.moal_get_system_time( + priv->adapter->pmoal_handle, &sec, &usec); PRINTM(MINFO, "11h: %s()\n", __func__); - PRINTM(MINFO, "- sec_now=%d, sec_report=%d.\n", - sec, pstate_dfs->dfs_report_time_sec); + 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); @@ -2319,8 +2269,8 @@ wlan_11h_check_chan_report(mlan_private *priv, t_u8 chan) ret = MLAN_STATUS_FAILURE; } } else { - /* When Cache is not valid. This is required during extending cache - * validity during bss_stop + /* When Cache is not valid. This is required during extending + * cache validity during bss_stop */ pstate_dfs->dfs_check_channel = 0; @@ -2355,28 +2305,23 @@ wlan_11h_check_chan_report(mlan_private *priv, t_u8 chan) * - Integer number of bytes appended to the TLV output buffer (ppbuffer) * - < 0 for error (e.g. radar detected on channel) */ -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_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) { 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) - ) - ) { + if (wlan_11h_is_enabled(priv) && + ((adapter->adhoc_start_band & BAND_A))) { if (!wlan_fw_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 } @@ -2402,7 +2347,8 @@ wlan_11h_process_start(mlan_private *priv, /* 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 */ + /* check last channel report, if this channel is free of + * radar */ if (ret == MLAN_STATUS_SUCCESS) ret = wlan_11h_check_chan_report(priv, channel); } @@ -2447,12 +2393,9 @@ wlan_11h_process_start(mlan_private *priv, * buffer (ppbuffer), MLAN_STATUS_FAILURE (-1), * or MLAN_STATUS_SUCCESS (0) */ -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_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_s32 ret = 0; @@ -2461,9 +2404,9 @@ wlan_11h_process_join(mlan_private *priv, 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 + * 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; @@ -2481,9 +2424,8 @@ wlan_11h_process_join(mlan_private *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 } /* @@ -2507,9 +2449,8 @@ wlan_11h_process_join(mlan_private *priv, p11h_bss_info); } else { PRINTM(MINFO, "11h: Infra join: Sensed\n"); - ret = wlan_11h_process_infra_join(priv, ppbuffer, band, - channel, - p11h_bss_info); + ret = wlan_11h_process_infra_join( + priv, ppbuffer, band, channel, p11h_bss_info); } } else { /* Deactivate 11h functions in the firmware */ @@ -2551,9 +2492,9 @@ wlan_11h_process_join(mlan_private *priv, */ /** @sa wlan_11h_cmd_chan_report_req */ -mlan_status -wlan_11h_cmd_process(mlan_private *priv, - HostCmd_DS_COMMAND *pcmd_ptr, const t_void *pinfo_buf) +mlan_status wlan_11h_cmd_process(mlan_private *priv, + HostCmd_DS_COMMAND *pcmd_ptr, + const t_void *pinfo_buf) { mlan_status ret = MLAN_STATUS_SUCCESS; @@ -2601,8 +2542,8 @@ wlan_11h_cmd_process(mlan_private *priv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11h_cmdresp_process(mlan_private *priv, const HostCmd_DS_COMMAND *resp) +mlan_status wlan_11h_cmdresp_process(mlan_private *priv, + const HostCmd_DS_COMMAND *resp) { mlan_status ret = MLAN_STATUS_SUCCESS; @@ -2664,10 +2605,9 @@ wlan_11h_cmdresp_process(mlan_private *priv, const HostCmd_DS_COMMAND *resp) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11h_process_bss_elem(mlan_adapter *pmadapter, - wlan_11h_bss_info_t *p11h_bss_info, - const t_u8 *pelement) +mlan_status wlan_11h_process_bss_elem(mlan_adapter *pmadapter, + 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); @@ -2681,8 +2621,8 @@ wlan_11h_process_bss_elem(mlan_adapter *pmadapter, pelement, 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))); + MIN(element_len, (sizeof(IEEEtypes_PowerConstraint_t) - + sizeof(IEEEtypes_Header_t))); break; case POWER_CAPABILITY: @@ -2692,8 +2632,8 @@ wlan_11h_process_bss_elem(mlan_adapter *pmadapter, pelement, 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))); + MIN(element_len, (sizeof(IEEEtypes_PowerCapability_t) - + sizeof(IEEEtypes_Header_t))); break; case TPC_REPORT: @@ -2703,8 +2643,8 @@ wlan_11h_process_bss_elem(mlan_adapter *pmadapter, 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))); + MIN(element_len, (sizeof(IEEEtypes_TPCReport_t) - + sizeof(IEEEtypes_Header_t))); break; case CHANNEL_SWITCH_ANN: @@ -2714,8 +2654,8 @@ wlan_11h_process_bss_elem(mlan_adapter *pmadapter, 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))); + MIN(element_len, (sizeof(IEEEtypes_ChanSwitchAnn_t) - + sizeof(IEEEtypes_Header_t))); break; case QUIET: @@ -2725,8 +2665,8 @@ wlan_11h_process_bss_elem(mlan_adapter *pmadapter, 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))); + MIN(element_len, (sizeof(IEEEtypes_Quiet_t) - + sizeof(IEEEtypes_Header_t))); break; case IBSS_DFS: @@ -2736,8 +2676,8 @@ wlan_11h_process_bss_elem(mlan_adapter *pmadapter, 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))); + MIN(element_len, (sizeof(IEEEtypes_IBSS_DFS_t) - + sizeof(IEEEtypes_Header_t))); break; case SUPPORTED_CHANNELS: @@ -2763,25 +2703,29 @@ wlan_11h_process_bss_elem(mlan_adapter *pmadapter, * * @return MLAN_STATUS_SUCCESS, MLAN_STATUS_FAILURE or MLAN_STATUS_PENDING */ -mlan_status -wlan_11h_handle_event_chanswann(mlan_private *priv) +mlan_status wlan_11h_handle_event_chanswann(mlan_private *priv) { mlan_status ret = MLAN_STATUS_SUCCESS; #ifdef STA_SUPPORT mlan_deauth_param deauth_param; #endif t_u32 sec, usec; +#ifdef UAP_SUPPORT mlan_adapter *pmadapter = priv->adapter; int i; t_u8 radar_detected = MFALSE; mlan_private *pmpriv = MNULL; +#endif ENTER(); +#ifdef UAP_SUPPORT if (priv->adapter->state_11h.is_master_radar_det_active) { - for (i = 0; i < MIN(pmadapter->priv_num, MLAN_MAX_BSS_NUM); i++) { + for (i = 0; i < MIN(pmadapter->priv_num, MLAN_MAX_BSS_NUM); + i++) { if (pmadapter->priv[i] && - (pmadapter->priv[i]->bss_role == MLAN_BSS_ROLE_UAP) - && pmadapter->priv[i]->uap_bss_started && + (pmadapter->priv[i]->bss_role == + MLAN_BSS_ROLE_UAP) && + pmadapter->priv[i]->uap_bss_started && (priv->curr_bss_params.bss_descriptor.channel == pmadapter->priv[i]->uap_channel)) { PRINTM(MCMND, @@ -2797,38 +2741,40 @@ wlan_11h_handle_event_chanswann(mlan_private *priv) if (pmadapter->state_rdh.stage == RDH_OFF) { pmadapter->state_rdh.stage = RDH_CHK_INTFS; - wlan_11h_radar_detected_handling - (pmadapter, pmpriv); + wlan_11h_radar_detected_handling( + pmadapter, pmpriv); if (pmpriv->uap_host_based) - wlan_recv_event(pmpriv, - MLAN_EVENT_ID_FW_RADAR_DETECTED, - MNULL); + wlan_recv_event( + pmpriv, + MLAN_EVENT_ID_FW_RADAR_DETECTED, + MNULL); } else { PRINTM(MEVENT, "Ignore Event Radar Detected - handling already in progress.\n"); } } else { - if (pmpriv->adapter->dfs_test_params. - no_channel_change_on_radar || - pmpriv->adapter->dfs_test_params. - fixed_new_channel_on_radar) { + if (pmpriv->adapter->dfs_test_params + .no_channel_change_on_radar || + pmpriv->adapter->dfs_test_params + .fixed_new_channel_on_radar) { if (pmadapter->state_rdh.stage == - RDH_OFF || + RDH_OFF || pmadapter->state_rdh.stage == - RDH_SET_CUSTOM_IE) { + RDH_SET_CUSTOM_IE) { pmadapter->state_rdh.stage = RDH_CHK_INTFS; - wlan_11h_radar_detected_handling - (pmadapter, pmpriv); + wlan_11h_radar_detected_handling( + pmadapter, pmpriv); } else PRINTM(MEVENT, "Ignore Event Radar Detected - handling already in progress.\n"); } else { pmpriv->intf_state_11h.tx_disabled = MTRUE; - wlan_recv_event(pmpriv, - MLAN_EVENT_ID_FW_RADAR_DETECTED, - MNULL); + wlan_recv_event( + pmpriv, + MLAN_EVENT_ID_FW_RADAR_DETECTED, + MNULL); } } } @@ -2840,6 +2786,7 @@ wlan_11h_handle_event_chanswann(mlan_private *priv) LEAVE(); return ret; } +#endif priv->adapter->state_11h.recvd_chanswann_event = MTRUE; /* unlikely: clean up previous csa if still on-going */ @@ -2852,14 +2799,14 @@ wlan_11h_handle_event_chanswann(mlan_private *priv) /* 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->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 */ + /* do directed deauth. recvd_chanswann_event flag will cause different + * reason code */ PRINTM(MINFO, "11h: handle_event_chanswann() - sending deauth\n"); memcpy_ext(priv->adapter, deauth_param.mac_addr, &priv->curr_bss_params.bss_descriptor.mac_address, @@ -2891,8 +2838,8 @@ wlan_11h_handle_event_chanswann(mlan_private *priv) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11h_ioctl_dfs_testing(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) +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; @@ -2938,11 +2885,10 @@ wlan_11h_ioctl_dfs_testing(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11h_ioctl_get_channel_nop_info(pmlan_adapter pmadapter, - pmlan_ioctl_req pioctl_req) +mlan_status wlan_11h_ioctl_get_channel_nop_info(pmlan_adapter pmadapter, + pmlan_ioctl_req pioctl_req) { - pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; + pmlan_private pmpriv = MNULL; mlan_ds_11h_cfg *ds_11hcfg = MNULL; t_s32 ret = MLAN_STATUS_FAILURE; mlan_ds_11h_chan_nop_info *ch_nop_info = MNULL; @@ -2950,35 +2896,29 @@ wlan_11h_ioctl_get_channel_nop_info(pmlan_adapter pmadapter, ENTER(); if (pioctl_req) { + pmpriv = pmadapter->priv[pioctl_req->bss_index]; ds_11hcfg = (mlan_ds_11h_cfg *)pioctl_req->pbuf; ch_nop_info = &ds_11hcfg->param.ch_nop_info; if (pioctl_req->action == MLAN_ACT_GET) { ch_nop_info->chan_under_nop = - wlan_11h_is_channel_under_nop(pmadapter, - ch_nop_info-> - curr_chan); + wlan_11h_is_channel_under_nop( + pmadapter, ch_nop_info->curr_chan); if (ch_nop_info->chan_under_nop) { - wlan_11h_switch_non_dfs_chan(pmpriv, - &ch_nop_info-> - new_chan.channel); + wlan_11h_switch_non_dfs_chan( + pmpriv, &ch_nop_info->new_chan.channel); if (ch_nop_info->chan_width == CHAN_BW_80MHZ || ch_nop_info->chan_width == CHAN_BW_40MHZ) - wlan_11h_update_bandcfg(&ch_nop_info-> - new_chan. - bandcfg, - ch_nop_info-> - new_chan. - channel); + wlan_11h_update_bandcfg( + &ch_nop_info->new_chan.bandcfg, + ch_nop_info->new_chan.channel); if (ch_nop_info->chan_width == CHAN_BW_80MHZ) ch_nop_info->new_chan.center_chan = - wlan_get_center_freq_idx(pmpriv, - BAND_AAC, - ch_nop_info-> - new_chan. - channel, - ch_nop_info-> - chan_width); + wlan_get_center_freq_idx( + pmpriv, BAND_AAC, + ch_nop_info->new_chan + .channel, + ch_nop_info->chan_width); } } ret = MLAN_STATUS_SUCCESS; @@ -2996,9 +2936,8 @@ wlan_11h_ioctl_get_channel_nop_info(pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11h_ioctl_chan_switch_count(pmlan_adapter pmadapter, - pmlan_ioctl_req pioctl_req) +mlan_status wlan_11h_ioctl_chan_switch_count(pmlan_adapter pmadapter, + pmlan_ioctl_req pioctl_req) { mlan_ds_11h_cfg *ds_11hcfg = MNULL; t_s32 ret = MLAN_STATUS_FAILURE; @@ -3028,9 +2967,8 @@ wlan_11h_ioctl_chan_switch_count(pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11h_ioctl_dfs_cancel_chan_report(mlan_private *priv, - pmlan_ioctl_req pioctl_req) +mlan_status wlan_11h_ioctl_dfs_cancel_chan_report(mlan_private *priv, + pmlan_ioctl_req pioctl_req) { mlan_ds_11h_cfg *ds_11hcfg = MNULL; HostCmd_DS_CHAN_RPT_REQ *chan_rpt_req = MNULL; @@ -3044,8 +2982,8 @@ wlan_11h_ioctl_dfs_cancel_chan_report(mlan_private *priv, (HostCmd_DS_CHAN_RPT_REQ *)&ds_11hcfg->param.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); + HostCmd_ACT_GEN_SET, 0, (t_void *)pioctl_req, + (t_void *)chan_rpt_req); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -3053,7 +2991,6 @@ wlan_11h_ioctl_dfs_cancel_chan_report(mlan_private *priv, LEAVE(); return ret; } - /** * @brief Check if channel is under NOP (Non-Occupancy Period) * If so, the channel should not be used until the period expires. @@ -3063,8 +3000,7 @@ wlan_11h_ioctl_dfs_cancel_chan_report(mlan_private *priv, * * @return MTRUE or MFALSE */ -t_bool -wlan_11h_is_channel_under_nop(mlan_adapter *pmadapter, t_u8 channel) +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; @@ -3073,12 +3009,11 @@ wlan_11h_is_channel_under_nop(mlan_adapter *pmadapter, t_u8 channel) 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)) { + 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); + pmadapter->callbacks.moal_get_system_time( + pmadapter->pmoal_handle, &now_sec, &now_usec); if (pmadapter->dfs_test_params.user_nop_period_sec) { PRINTM(MCMD_D, "dfs_testing - user NOP period=%d (sec)\n", @@ -3115,9 +3050,9 @@ wlan_11h_is_channel_under_nop(mlan_adapter *pmadapter, t_u8 channel) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11h_handle_event_chanrpt_ready(mlan_private *priv, - mlan_event *pevent, t_u8 *radar_chan) +mlan_status wlan_11h_handle_event_chanrpt_ready(mlan_private *priv, + mlan_event *pevent, + t_u8 *radar_chan) { mlan_status ret = MLAN_STATUS_SUCCESS; HostCmd_DS_CHAN_RPT_RSP *pchan_rpt_rsp; @@ -3140,9 +3075,8 @@ wlan_11h_handle_event_chanrpt_ready(mlan_private *priv, MLAN_CMD_RESULT_SUCCESS) { pbuffer = (t_u8 *)&pchan_rpt_rsp->tlv_buffer; evt_len = pevent->event_len; - evt_len -= - sizeof(HostCmd_DS_CHAN_RPT_RSP) - - sizeof(pchan_rpt_rsp->tlv_buffer); + evt_len -= sizeof(HostCmd_DS_CHAN_RPT_RSP) - + sizeof(pchan_rpt_rsp->tlv_buffer); while (evt_len >= sizeof(MrvlIEtypesHeader_t)) { ptlv = (MrvlIEtypes_Data_t *)pbuffer; @@ -3176,9 +3110,8 @@ wlan_11h_handle_event_chanrpt_ready(mlan_private *priv, *radar_chan = dfs_check_channel; pstate_dfs->dfs_radar_found = dfs_radar_found; /* Update DFS structure. */ - priv->adapter->callbacks.moal_get_system_time(priv->adapter-> - pmoal_handle, &sec, - &usec); + 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; pstate_dfs->dfs_check_priv = MNULL; @@ -3197,9 +3130,9 @@ wlan_11h_handle_event_chanrpt_ready(mlan_private *priv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11h_print_event_radar_detected(mlan_private *priv, - mlan_event *pevent, t_u8 *radar_chan) +mlan_status wlan_11h_print_event_radar_detected(mlan_private *priv, + mlan_event *pevent, + t_u8 *radar_chan) { wlan_dfs_device_state_t *pstate_dfs = &priv->adapter->state_dfs; ENTER(); @@ -3215,8 +3148,7 @@ wlan_11h_print_event_radar_detected(mlan_private *priv, * * @return MTRUE or MFALSE */ -t_bool -wlan_11h_radar_detected_tx_blocked(mlan_adapter *pmadapter) +t_bool wlan_11h_radar_detected_tx_blocked(mlan_adapter *pmadapter) { if (pmadapter->state_rdh.tx_block) return MTRUE; @@ -3236,17 +3168,17 @@ wlan_11h_radar_detected_tx_blocked(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11h_radar_detected_callback(t_void *priv) +mlan_status wlan_11h_radar_detected_callback(t_void *priv) { mlan_status ret; ENTER(); - ret = wlan_11h_radar_detected_handling(((mlan_private *)(priv))-> - adapter, (mlan_private *)priv); + ret = wlan_11h_radar_detected_handling( + ((mlan_private *)(priv))->adapter, (mlan_private *)priv); LEAVE(); return ret; } +#ifdef UAP_SUPPORT /** * @brief Function for handling sta disconnect event in dfs_repeater mode * @@ -3254,8 +3186,7 @@ wlan_11h_radar_detected_callback(t_void *priv) * * @return NONE */ -void -wlan_dfs_rep_disconnect(mlan_adapter *pmadapter) +void wlan_dfs_rep_disconnect(mlan_adapter *pmadapter) { mlan_private *priv_list[MLAN_MAX_BSS_NUM]; mlan_private *pmpriv = MNULL; @@ -3287,8 +3218,7 @@ wlan_dfs_rep_disconnect(mlan_adapter *pmadapter) * * @return NONE */ -void -wlan_dfs_rep_bw_change(mlan_adapter *pmadapter) +void wlan_dfs_rep_bw_change(mlan_adapter *pmadapter) { mlan_private *priv_list[MLAN_MAX_BSS_NUM]; mlan_private *pmpriv = MNULL; @@ -3300,7 +3230,8 @@ wlan_dfs_rep_bw_change(mlan_adapter *pmadapter) if (pcount == 1) { pmpriv = priv_list[0]; if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) { - PRINTM(MMSG, "dfs-repeater: BW change detected\n" + PRINTM(MMSG, + "dfs-repeater: BW change detected\n" "no active priv's, skip event handling.\n"); return; } @@ -3311,13 +3242,11 @@ wlan_dfs_rep_bw_change(mlan_adapter *pmadapter) pmpriv = priv_list[i]; if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) { - /* Check if uAPs running on non-dfs channel. If they do * then there is no need to restart the uAPs */ - if (!wlan_11h_radar_detect_required(pmpriv, - pmadapter-> - dfsr_channel)) + if (!wlan_11h_radar_detect_required( + pmpriv, pmadapter->dfsr_channel)) return; wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_BSS_STOP, @@ -3335,6 +3264,7 @@ wlan_dfs_rep_bw_change(mlan_adapter *pmadapter) } } } +#endif /** * @brief Update band config for the new channel @@ -3344,8 +3274,8 @@ wlan_dfs_rep_bw_change(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE or MLAN_STATUS_PENDING */ -void -wlan_11h_update_bandcfg(IN Band_Config_t *uap_band_cfg, IN t_u8 new_channel) +void wlan_11h_update_bandcfg(IN Band_Config_t *uap_band_cfg, + IN t_u8 new_channel) { t_u8 chan_offset; ENTER(); @@ -3357,7 +3287,7 @@ wlan_11h_update_bandcfg(IN Band_Config_t *uap_band_cfg, IN t_u8 new_channel) chan_offset = wlan_get_second_channel_offset(new_channel); uap_band_cfg->chan2Offset = chan_offset; - if (!chan_offset) { /* 40MHz/80MHz */ + if (!chan_offset) { /* 40MHz/80MHz */ PRINTM(MCMD_D, "20MHz channel, clear channel bandwidth\n"); uap_band_cfg->chanWidth = CHAN_BW_20MHZ; } @@ -3365,23 +3295,24 @@ wlan_11h_update_bandcfg(IN Band_Config_t *uap_band_cfg, IN t_u8 new_channel) } /** - * @brief Get priv current index -- this is used to enter correct rdh_state during radar handling + * @brief Get priv current index -- this is used to enter correct rdh_state + * during radar handling * * @param pmpriv Pointer to mlan_private * @param pstate_rdh Pointer to radar detected state handler * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_11h_get_priv_curr_idx(mlan_private *pmpriv, - wlan_radar_det_hndlg_state_t *pstate_rdh) +mlan_status wlan_11h_get_priv_curr_idx(mlan_private *pmpriv, + wlan_radar_det_hndlg_state_t *pstate_rdh) { t_bool found = MFALSE; ENTER(); PRINTM(MINFO, "%s:pmpriv =%p\n", __func__, pmpriv); while ((++pstate_rdh->priv_curr_idx) < pstate_rdh->priv_list_count) { - if (pmpriv == pstate_rdh->priv_list[pstate_rdh->priv_curr_idx]) { + if (pmpriv == + pstate_rdh->priv_list[pstate_rdh->priv_curr_idx]) { PRINTM(MINFO, "found matching priv: priv_idx=%d\n", pstate_rdh->priv_curr_idx); found = MTRUE; @@ -3399,8 +3330,8 @@ wlan_11h_get_priv_curr_idx(mlan_private *pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE or MLAN_STATUS_PENDING */ -mlan_status -wlan_11h_remove_custom_ie(mlan_adapter *pmadapter, mlan_private *pmpriv) +mlan_status wlan_11h_remove_custom_ie(mlan_adapter *pmadapter, + mlan_private *pmpriv) { mlan_status ret = MLAN_STATUS_SUCCESS; wlan_radar_det_hndlg_state_t *pstate_rdh = &pmadapter->state_rdh; @@ -3412,13 +3343,12 @@ wlan_11h_remove_custom_ie(mlan_adapter *pmadapter, mlan_private *pmpriv) PRINTM(MMSG, "Removing CHAN_SW IE from interfaces.\n"); while ((++pstate_rdh->priv_curr_idx) < pstate_rdh->priv_list_count) { - pmpriv = pstate_rdh->priv_list[pstate_rdh-> - priv_curr_idx]; + pmpriv = + pstate_rdh->priv_list[pstate_rdh->priv_curr_idx]; if (!wlan_11h_is_dfs_master(pmpriv)) continue; - ret = wlan_11h_prepare_custom_ie_chansw(pmadapter, - &pioctl_req, - MFALSE); + ret = wlan_11h_prepare_custom_ie_chansw( + pmadapter, &pioctl_req, MFALSE); if ((ret != MLAN_STATUS_SUCCESS) || !pioctl_req) { PRINTM(MERROR, "%s(): Error in preparing CHAN_SW IE.\n", @@ -3427,15 +3357,15 @@ wlan_11h_remove_custom_ie(mlan_adapter *pmadapter, mlan_private *pmpriv) } pioctl_req->bss_index = pmpriv->bss_index; - ret = wlan_misc_ioctl_custom_ie_list(pmadapter, - pioctl_req, - MFALSE); + 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 remove IE for priv=%p [priv_bss_idx=%d]!\n", __func__, pmpriv, pmpriv->bss_index); - /* TODO: hiow to handle this error case?? ignore & continue? */ + /* TODO: hiow to handle this error case?? + * ignore & continue? */ } /* free ioctl buffer memory before we leave */ pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, @@ -3455,23 +3385,21 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE or MLAN_STATUS_PENDING */ -mlan_status -wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) +mlan_status wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, + mlan_private *pmpriv) { #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; @@ -3488,32 +3416,29 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) switch (pstate_rdh->stage) { case RDH_CHK_INTFS: - PRINTM(MCMD_D, "%s(): stage(%d)=%s\n", - __func__, pstate_rdh->stage, - rdh_stage_str[pstate_rdh->stage]); + PRINTM(MCMD_D, "%s(): stage(%d)=%s\n", __func__, + 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); + 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", __func__, pstate_rdh->priv_list_count); for (i = 0; i < pstate_rdh->priv_list_count; i++) - PRINTM(MINFO, "%s(): priv_list[%d] = %p\n", - __func__, i, pstate_rdh->priv_list[i]); + PRINTM(MINFO, "%s(): priv_list[%d] = %p\n", __func__, + 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"); + " skip event handling.\n"); pstate_rdh->stage = RDH_OFF; PRINTM(MCMD_D, "%s(): finished - stage(%d)=%s\n", __func__, pstate_rdh->stage, rdh_stage_str[pstate_rdh->stage]); - break; /* EXIT CASE */ + break; /* EXIT CASE */ } /* else: start handling */ @@ -3527,9 +3452,8 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) /* fall through */ case RDH_STOP_TRAFFIC: - PRINTM(MCMD_D, "%s(): stage(%d)=%s\n", - __func__, pstate_rdh->stage, - rdh_stage_str[pstate_rdh->stage]); + PRINTM(MCMD_D, "%s(): stage(%d)=%s\n", __func__, + pstate_rdh->stage, rdh_stage_str[pstate_rdh->stage]); PRINTM(MMSG, "11h: Radar Detected - stopping host tx traffic.\n"); @@ -3541,13 +3465,13 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) /* fall through */ case RDH_GET_INFO_CHANNEL: - PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", - __func__, pstate_rdh->stage, - rdh_stage_str[pstate_rdh->stage], + PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", __func__, + 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 (pstate_rdh->priv_curr_idx == + RDH_STAGE_FIRST_ENTRY_PRIV_IDX) { #ifdef UAP_SUPPORT if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) { ret = wlan_11h_get_priv_curr_idx(pmpriv, @@ -3555,7 +3479,7 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) if (ret != MLAN_STATUS_SUCCESS) { PRINTM(MERROR, "Unable to locate pmpriv in current active priv_list\n"); - break; /* EXIT CASE */ + break; /* EXIT CASE */ } /* send cmd to get first UAP's info */ @@ -3564,11 +3488,12 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) pmpriv->uap_state_chan_cb.get_chan_callback = wlan_11h_radar_detected_callback; ret = wlan_uap_get_channel(pmpriv); - break; /* EXIT CASE */ + break; /* EXIT CASE */ } else #endif { - /* Assume all STAs on same channel, find first STA */ + /* 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++) { @@ -3579,8 +3504,8 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) } /* STA info kept in driver, just copy */ pstate_rdh->curr_channel = - pmpriv->curr_bss_params.bss_descriptor. - channel; + pmpriv->curr_bss_params.bss_descriptor + .channel; } } #ifdef UAP_SUPPORT @@ -3607,19 +3532,21 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) #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. - bandcfg); + wlan_11h_get_uap_start_channel( + pmpriv, + pmpriv->uap_state_chan_cb.bandcfg); else #endif pstate_rdh->new_channel = wlan_11h_get_adhoc_start_channel(pmpriv); - if (!pstate_rdh->new_channel || (pstate_rdh->new_channel == pstate_rdh->curr_channel)) { /* report error */ + if (!pstate_rdh->new_channel || + (pstate_rdh->new_channel == + pstate_rdh->curr_channel)) { /* report error */ PRINTM(MERROR, "%s(): ERROR - Failed to choose new_chan" - " (!= curr_chan) !!\n", __func__); + " (!= curr_chan) !!\n", + __func__); #ifdef UAP_SUPPORT if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) { ret = wlan_prepare_cmd(pmpriv, @@ -3629,35 +3556,33 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) PRINTM(MERROR, "STOP UAP and exit radar handling...\n"); pstate_rdh->stage = RDH_OFF; - break; /* leads to exit case */ + break; /* leads to exit case */ } #endif } if (!pmadapter->dfs_test_params.no_channel_change_on_radar && 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); + pmadapter->dfs_test_params + .fixed_new_channel_on_radar); pstate_rdh->new_channel = - pmadapter->dfs_test_params. - fixed_new_channel_on_radar; + pmadapter->dfs_test_params + .fixed_new_channel_on_radar; } /* applies to DFS with ECSA support */ if (pmadapter->dfs_test_params.no_channel_change_on_radar) { pstate_rdh->new_channel = pstate_rdh->curr_channel; } - PRINTM(MCMD_D, "%s(): curr_chan=%d, new_chan=%d\n", - __func__, pstate_rdh->curr_channel, - pstate_rdh->new_channel); + PRINTM(MCMD_D, "%s(): curr_chan=%d, new_chan=%d\n", __func__, + 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 */ case RDH_GET_INFO_BEACON_DTIM: - PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", - __func__, pstate_rdh->stage, - rdh_stage_str[pstate_rdh->stage], + PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", __func__, + pstate_rdh->stage, rdh_stage_str[pstate_rdh->stage], pstate_rdh->priv_curr_idx); #ifdef UAP_SUPPORT @@ -3665,8 +3590,8 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) /* 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]; + pmpriv = + pstate_rdh->priv_list[pstate_rdh->priv_curr_idx]; PRINTM(MCMD_D, "%s(): uap.bcn_pd=%d, uap.dtim_pd=%d\n", __func__, pmpriv->uap_state_chan_cb.beacon_period, @@ -3682,8 +3607,8 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) /* check next intf */ while ((++pstate_rdh->priv_curr_idx) < pstate_rdh->priv_list_count) { - pmpriv = pstate_rdh->priv_list[pstate_rdh-> - priv_curr_idx]; + pmpriv = + pstate_rdh->priv_list[pstate_rdh->priv_curr_idx]; #ifdef UAP_SUPPORT if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_UAP) { @@ -3692,10 +3617,10 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) 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 */ + break; /* leads to exit case */ } else #endif - { /* get STA info from driver and compare here */ + { /* 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; @@ -3704,11 +3629,13 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) if (wlan_11h_is_dfs_master(pmpriv)) { 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 */ + 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", @@ -3721,57 +3648,57 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) } if (pstate_rdh->priv_curr_idx < pstate_rdh->priv_list_count) - break; /* EXIT CASE (for UAP) */ + 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 */ case RDH_SET_CUSTOM_IE: - PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", - __func__, pstate_rdh->stage, - rdh_stage_str[pstate_rdh->stage], + PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", __func__, + pstate_rdh->stage, rdh_stage_str[pstate_rdh->stage], pstate_rdh->priv_curr_idx); /* add CHAN_SW IE - Need apply on each interface */ - if (pstate_rdh->priv_curr_idx == RDH_STAGE_FIRST_ENTRY_PRIV_IDX) { + if (pstate_rdh->priv_curr_idx == + RDH_STAGE_FIRST_ENTRY_PRIV_IDX) { mlan_ioctl_req *pioctl_req = MNULL; PRINTM(MMSG, "11h: Radar Detected - adding CHAN_SW IE to interfaces.\n"); while ((++pstate_rdh->priv_curr_idx) < pstate_rdh->priv_list_count) { - pmpriv = pstate_rdh->priv_list[pstate_rdh-> - priv_curr_idx]; + pmpriv = pstate_rdh->priv_list + [pstate_rdh->priv_curr_idx]; if (!wlan_11h_is_dfs_master(pmpriv)) continue; - ret = wlan_11h_prepare_custom_ie_chansw - (pmadapter, &pioctl_req, MTRUE); - if ((ret != MLAN_STATUS_SUCCESS) || !pioctl_req) { + ret = wlan_11h_prepare_custom_ie_chansw( + pmadapter, &pioctl_req, MTRUE); + if ((ret != MLAN_STATUS_SUCCESS) || + !pioctl_req) { PRINTM(MERROR, "%s(): Error in preparing CHAN_SW IE.\n", __func__); - break; /* EXIT CASE */ + break; /* EXIT CASE */ } pioctl_req->bss_index = pmpriv->bss_index; - ret = wlan_misc_ioctl_custom_ie_list(pmadapter, - pioctl_req, - MFALSE); + 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", __func__, pmpriv, pmpriv->bss_index); - /* TODO: how to handle this error case?? ignore & continue? */ + /* 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); + pmadapter->callbacks.moal_mfree( + pmadapter->pmoal_handle, + (t_u8 *)pioctl_req); } - break; /* EXIT CASE */ + break; /* EXIT CASE */ } /* else */ pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; @@ -3779,64 +3706,66 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) /* fall through */ case RDH_REM_CUSTOM_IE: - PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", - __func__, pstate_rdh->stage, - rdh_stage_str[pstate_rdh->stage], + PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", __func__, + pstate_rdh->stage, rdh_stage_str[pstate_rdh->stage], pstate_rdh->priv_curr_idx); /* remove CHAN_SW IE - Need apply on each interface */ - if (pstate_rdh->priv_curr_idx == RDH_STAGE_FIRST_ENTRY_PRIV_IDX) { + 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). + * 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((4 * - pstate_rdh->max_bcn_dtim_ms), - MAX_RDH_CHAN_SW_IE_PERIOD_MSEC)); + t_u16 delay_ms = + MAX(MIN_RDH_CHAN_SW_IE_PERIOD_MSEC, + MIN((4 * 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); + " 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"); while ((++pstate_rdh->priv_curr_idx) < pstate_rdh->priv_list_count) { - pmpriv = pstate_rdh->priv_list[pstate_rdh-> - priv_curr_idx]; + pmpriv = pstate_rdh->priv_list + [pstate_rdh->priv_curr_idx]; if (!wlan_11h_is_dfs_master(pmpriv)) continue; - ret = wlan_11h_prepare_custom_ie_chansw - (pmadapter, &pioctl_req, MFALSE); - if ((ret != MLAN_STATUS_SUCCESS) || !pioctl_req) { + ret = wlan_11h_prepare_custom_ie_chansw( + pmadapter, &pioctl_req, MFALSE); + if ((ret != MLAN_STATUS_SUCCESS) || + !pioctl_req) { PRINTM(MERROR, "%s(): Error in preparing CHAN_SW IE.\n", __func__); - break; /* EXIT CASE */ + break; /* EXIT CASE */ } pioctl_req->bss_index = pmpriv->bss_index; - ret = wlan_misc_ioctl_custom_ie_list(pmadapter, - pioctl_req, - MFALSE); + 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 remove IE for priv=%p [priv_bss_idx=%d]!\n", __func__, pmpriv, pmpriv->bss_index); - /* TODO: hiow to handle this error case?? ignore & continue? */ + /* 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); + pmadapter->callbacks.moal_mfree( + pmadapter->pmoal_handle, + (t_u8 *)pioctl_req); } - break; /* EXIT CASE */ + break; /* EXIT CASE */ } /* else */ pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; @@ -3844,35 +3773,35 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) /* fall through */ case RDH_STOP_INTFS: - PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", - __func__, pstate_rdh->stage, - rdh_stage_str[pstate_rdh->stage], + PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", __func__, + 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]; + 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 */ + 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 */ + /* 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 */ + break; /* leads to exit case */ } } #endif @@ -3880,7 +3809,7 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) if (pstate_rdh->priv_curr_idx < pstate_rdh->priv_list_count || ret == MLAN_STATUS_FAILURE) - break; /* EXIT CASE */ + break; /* EXIT CASE */ /* else */ pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; pstate_rdh->stage = RDH_SET_NEW_CHANNEL; @@ -3893,88 +3822,82 @@ wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, mlan_private *pmpriv) pstate_rdh->priv_curr_idx = RDH_STAGE_FIRST_ENTRY_PRIV_IDX; pstate_rdh->stage = RDH_RESTART_INTFS; - goto rdh_restart_intfs; /* skip next stage */ + goto rdh_restart_intfs; /* skip next stage */ } /* fall through */ case RDH_SET_NEW_CHANNEL: - PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", - __func__, pstate_rdh->stage, - rdh_stage_str[pstate_rdh->stage], + PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", __func__, + 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]; + 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; /* DFS only in 5GHz */ - wlan_11h_update_bandcfg(&pstate_rdh-> - uap_band_cfg, - pstate_rdh-> - new_channel); + wlan_11h_update_bandcfg( + &pstate_rdh->uap_band_cfg, + pstate_rdh->new_channel); PRINTM(MCMD_D, "RDH_SET_NEW_CHANNEL: uAP band config = 0x%x channel=%d\n", pstate_rdh->uap_band_cfg, pstate_rdh->new_channel); - ret = wlan_uap_set_channel(pmpriv, - pstate_rdh-> - uap_band_cfg, - pstate_rdh-> - new_channel); - break; /* leads to exit case */ + 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) */ + 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 */ case RDH_RESTART_INTFS: -rdh_restart_intfs: - PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", - __func__, pstate_rdh->stage, - rdh_stage_str[pstate_rdh->stage], + rdh_restart_intfs: + PRINTM(MCMD_D, "%s(): stage(%d)=%s, priv_idx=%d\n", __func__, + 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]; + 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 */ + 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_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 */ + break; /* leads to exit case */ } #endif #ifdef STA_SUPPORT @@ -3991,36 +3914,41 @@ rdh_restart_intfs: /* 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 (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); + ret = wlan_11h_config_master_radar_det( + pmpriv, MTRUE); if (ret) break; - ret = wlan_11h_check_update_radar_det_state(pmpriv); + 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 */ + 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: + /* 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 + * 2. wpa_supplicant, or other user-space + * app */ } #endif @@ -4028,16 +3956,15 @@ rdh_restart_intfs: if (pstate_rdh->priv_curr_idx < pstate_rdh->priv_list_count || ret == MLAN_STATUS_FAILURE) - break; /* EXIT CASE (for UAP) */ + 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 */ case RDH_RESTART_TRAFFIC: - PRINTM(MCMD_D, "%s(): stage(%d)=%s\n", - __func__, pstate_rdh->stage, - rdh_stage_str[pstate_rdh->stage]); + PRINTM(MCMD_D, "%s(): stage(%d)=%s\n", __func__, + pstate_rdh->stage, rdh_stage_str[pstate_rdh->stage]); /* remove custome ie */ if (pmadapter->ecsa_enable) { mlan_ioctl_req *pioctl_req = MNULL; @@ -4045,37 +3972,37 @@ rdh_restart_intfs: RDH_STAGE_FIRST_ENTRY_PRIV_IDX; while ((++pstate_rdh->priv_curr_idx) < pstate_rdh->priv_list_count) { - pmpriv = pstate_rdh->priv_list[pstate_rdh-> - priv_curr_idx]; + pmpriv = pstate_rdh->priv_list + [pstate_rdh->priv_curr_idx]; if (!wlan_11h_is_dfs_master(pmpriv)) continue; - ret = wlan_11h_prepare_custom_ie_chansw - (pmadapter, &pioctl_req, MFALSE); - if ((ret != MLAN_STATUS_SUCCESS) || !pioctl_req) { + ret = wlan_11h_prepare_custom_ie_chansw( + pmadapter, &pioctl_req, MFALSE); + if ((ret != MLAN_STATUS_SUCCESS) || + !pioctl_req) { PRINTM(MERROR, "%s(): Error in preparing CHAN_SW IE.\n", __func__); - break; /* EXIT CASE */ + break; /* EXIT CASE */ } pioctl_req->bss_index = pmpriv->bss_index; - ret = wlan_misc_ioctl_custom_ie_list(pmadapter, - pioctl_req, - MFALSE); + 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 remove IE for priv=%p [priv_bss_idx=%d]!\n", __func__, pmpriv, pmpriv->bss_index); - /* TODO: hiow to handle this error case?? ignore & continue? */ + /* 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); + pmadapter->callbacks.moal_mfree( + pmadapter->pmoal_handle, + (t_u8 *)pioctl_req); } } /* continue traffic for reactivated interfaces */ @@ -4084,15 +4011,15 @@ rdh_restart_intfs: 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", - __func__, pstate_rdh->stage, - rdh_stage_str[pstate_rdh->stage]); + pstate_rdh->stage = RDH_OFF; /* DONE! */ + PRINTM(MCMD_D, "%s(): finished - stage(%d)=%s\n", __func__, + pstate_rdh->stage, rdh_stage_str[pstate_rdh->stage]); break; default: - pstate_rdh->stage = RDH_OFF; /* cancel RDH to unblock Tx packets */ + pstate_rdh->stage = RDH_OFF; /* cancel RDH to unblock Tx packets + */ break; } @@ -4113,8 +4040,7 @@ rdh_restart_intfs: * @return MLAN_STATUS_SUCCESS (update successful) * or MLAN_STATUS_FAILURE (no change) */ -mlan_status -wlan_11h_dfs_event_preprocessing(mlan_adapter *pmadapter) +mlan_status wlan_11h_dfs_event_preprocessing(mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_FAILURE; mlan_private *pmpriv = MNULL; @@ -4124,23 +4050,22 @@ wlan_11h_dfs_event_preprocessing(mlan_adapter *pmadapter) 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)) { + 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", __func__, 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)) { + } 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", - __func__, pmpriv); + PRINTM(MINFO, "%s: found dfs_slave priv=%p\n", __func__, + pmpriv); } else if (pmadapter->state_dfs.dfs_check_pending) { - pmpriv = (mlan_private *)(pmadapter->state_dfs. - dfs_check_priv); + pmpriv = (mlan_private *)(pmadapter->state_dfs + .dfs_check_priv); PRINTM(MINFO, "%s: found dfs priv=%p\n", __func__, pmpriv); } @@ -4181,8 +4106,7 @@ wlan_11h_dfs_event_preprocessing(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE or MLAN_STATUS_PENDING */ -mlan_status -wlan_11h_switch_non_dfs_chan(mlan_private *priv, t_u8 *chan) +mlan_status wlan_11h_switch_non_dfs_chan(mlan_private *priv, t_u8 *chan) { mlan_status ret = MLAN_STATUS_FAILURE; t_u32 i; @@ -4204,10 +4128,10 @@ wlan_11h_switch_non_dfs_chan(mlan_private *priv, t_u8 *chan) return MLAN_STATUS_SUCCESS; } - /*get the channel table first */ + /*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) { + if (pmadapter->region_channel[i].band == BAND_A && + pmadapter->region_channel[i].valid) { chn_tbl = &pmadapter->region_channel[i]; break; } @@ -4223,16 +4147,17 @@ wlan_11h_switch_non_dfs_chan(mlan_private *priv, t_u8 *chan) 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)); + 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)) { + 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; } @@ -4257,8 +4182,7 @@ done: * * @return N/A */ -void -wlan_11h_set_dfs_check_chan(mlan_private *priv, t_u8 chan) +void wlan_11h_set_dfs_check_chan(mlan_private *priv, t_u8 chan) { wlan_dfs_device_state_t *pstate_dfs = &priv->adapter->state_dfs; ENTER(); @@ -4266,3 +4190,33 @@ wlan_11h_set_dfs_check_chan(mlan_private *priv, t_u8 chan) PRINTM(MCMND, "Set dfs_check_channel=%d\n", chan); LEAVE(); } + +/** + * @brief 802.11h DFS W53 configuration + * + * @param pmadapter Pointer to mlan_adapter + * @param pioctl_req Pointer to mlan_ioctl_req + * + * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE + */ +mlan_status wlan_11h_ioctl_dfs_w53_cfg(pmlan_adapter pmadapter, + pmlan_ioctl_req pioctl_req) +{ + mlan_ds_11h_cfg *ds_11hcfg = MNULL; + mlan_ds_11h_dfs_w53_cfg *dfs_w53_cfg = MNULL; + + ENTER(); + + ds_11hcfg = (mlan_ds_11h_cfg *)pioctl_req->pbuf; + dfs_w53_cfg = &ds_11hcfg->param.dfs_w53_cfg; + + if (pioctl_req->action == MLAN_ACT_GET) { + dfs_w53_cfg->dfs53cfg = pmadapter->dfs53cfg; + } else { + pmadapter->dfs53cfg = dfs_w53_cfg->dfs53cfg; + } + + LEAVE(); + + return MLAN_STATUS_SUCCESS; +} diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11h.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11h.h index 2c8bd6f8c0c6..59fd979f4675 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11h.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11h.h @@ -30,17 +30,17 @@ Change Log: #define _MLAN_11H_ /** 11H OID bitmasks */ -#define ENABLE_11H_MASK MBIT(0) -#define MASTER_RADAR_DET_MASK MBIT(1) -#define SLAVE_RADAR_DET_MASK MBIT(2) +#define ENABLE_11H_MASK MBIT(0) +#define MASTER_RADAR_DET_MASK MBIT(1) +#define SLAVE_RADAR_DET_MASK MBIT(2) /** DFS Master Radar Detect global enable */ -#define DFS_MASTER_RADAR_DETECT_EN (MTRUE) +#define DFS_MASTER_RADAR_DETECT_EN (MTRUE) /** DFS Slave Radar Detect global enable */ -#define DFS_SLAVE_RADAR_DETECT_EN (MFALSE) +#define DFS_SLAVE_RADAR_DETECT_EN (MFALSE) -#define CHANNEL_OFFSET_MASK 0x30 -#define CHANNEL_BANDWIDTH_MASK 0x0C +#define CHANNEL_OFFSET_MASK 0x30 +#define CHANNEL_BANDWIDTH_MASK 0x0C /** * 11H APIs @@ -104,17 +104,14 @@ extern t_s32 wlan_11h_issue_radar_detect(mlan_private *priv, 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, +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); /** 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, +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); @@ -148,17 +145,19 @@ mlan_status wlan_11h_print_event_radar_detected(mlan_private *priv, /** Handler for DFS_TESTING IOCTL */ extern mlan_status wlan_11h_ioctl_dfs_testing(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req); -extern mlan_status wlan_11h_ioctl_get_channel_nop_info(pmlan_adapter pmadapter, - pmlan_ioctl_req - pioctl_req); +extern mlan_status +wlan_11h_ioctl_get_channel_nop_info(pmlan_adapter pmadapter, + pmlan_ioctl_req pioctl_req); extern mlan_status - wlan_11h_ioctl_dfs_cancel_chan_report(mlan_private *priv, pmlan_ioctl_req pioctl_req); -extern -mlan_status wlan_11h_ioctl_chan_switch_count(pmlan_adapter pmadapter, - pmlan_ioctl_req pioctl_req); +extern mlan_status wlan_11h_ioctl_chan_switch_count(pmlan_adapter pmadapter, + pmlan_ioctl_req pioctl_req); + +/** get/set dfs w53 cfg */ +mlan_status wlan_11h_ioctl_dfs_w53_cfg(pmlan_adapter pmadapter, + pmlan_ioctl_req pioctl_req); /** Check if channel is under a NOP duration (should not be used) */ extern t_bool wlan_11h_is_channel_under_nop(mlan_adapter *pmadapter, @@ -172,11 +171,13 @@ extern mlan_status wlan_11h_radar_detected_callback(t_void *priv); /** set dfs check channel */ void wlan_11h_set_dfs_check_chan(mlan_private *priv, t_u8 chan); +#ifdef UAP_SUPPORT /** BW_change event Handler for dfs_repeater */ void wlan_dfs_rep_bw_change(mlan_adapter *pmadapter); /** disconnect event Handler for dfs_repeater */ void wlan_dfs_rep_disconnect(mlan_adapter *pmadapter); +#endif /** Handler for RADAR_DETECTED */ extern mlan_status wlan_11h_radar_detected_handling(mlan_adapter *pmadapter, diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n.c index 7458270fa413..fe43cbf09e27 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n.c @@ -53,11 +53,11 @@ Change log: * @param pmadapter A pointer to mlan_adapter 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_11n_ioctl_max_tx_buf_size(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_11n_ioctl_max_tx_buf_size(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_11n_cfg *cfg = MNULL; @@ -77,11 +77,11 @@ wlan_11n_ioctl_max_tx_buf_size(IN pmlan_adapter pmadapter, * @param pmadapter A pointer to mlan_adapter 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_11n_ioctl_htusrcfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_11n_ioctl_htusrcfg(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]; @@ -93,8 +93,8 @@ wlan_11n_ioctl_htusrcfg(IN pmlan_adapter pmadapter, 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)) { + 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 { @@ -157,9 +157,8 @@ wlan_11n_ioctl_htusrcfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_11n_ioctl_amsdu_aggr_ctrl(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_11n_ioctl_amsdu_aggr_ctrl(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]; @@ -175,11 +174,8 @@ wlan_11n_ioctl_amsdu_aggr_ctrl(IN pmlan_adapter pmadapter, 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, + 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; @@ -196,9 +192,8 @@ wlan_11n_ioctl_amsdu_aggr_ctrl(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_11n_ioctl_httxcfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_11n_ioctl_httxcfg(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]; @@ -214,10 +209,7 @@ wlan_11n_ioctl_httxcfg(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_GET; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_11N_CFG, - cmd_action, - 0, + 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) @@ -235,9 +227,8 @@ wlan_11n_ioctl_httxcfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_11n_ioctl_tx_bf_cap(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_11n_ioctl_tx_bf_cap(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]; @@ -263,9 +254,8 @@ wlan_11n_ioctl_tx_bf_cap(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_11n_ioctl_tx_bf_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_11n_ioctl_tx_bf_cfg(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]; @@ -281,10 +271,7 @@ wlan_11n_ioctl_tx_bf_cfg(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_GET; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_TX_BF_CFG, - cmd_action, - 0, + 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) @@ -302,9 +289,8 @@ wlan_11n_ioctl_tx_bf_cfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_11n_ioctl_stream_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_11n_ioctl_stream_cfg(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_11n_cfg *cfg = MNULL; @@ -318,7 +304,8 @@ wlan_11n_ioctl_stream_cfg(IN pmlan_adapter pmadapter, } 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) { + if (pmadapter->hw_dev_mcs_support == + HT_STREAM_MODE_1X1) { PRINTM(MERROR, "HW does not support this mode\n"); ret = MLAN_STATUS_FAILURE; @@ -349,9 +336,8 @@ wlan_11n_ioctl_stream_cfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_11n_ioctl_coex_rx_winsize(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_11n_ioctl_coex_rx_winsize(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_11n_cfg *cfg = MNULL; @@ -376,10 +362,8 @@ wlan_11n_ioctl_coex_rx_winsize(IN pmlan_adapter pmadapter, * * @return N/A */ -static void -wlan_11n_update_addba_request(mlan_private *priv) +static void wlan_11n_update_addba_request(mlan_private *priv) { - TxBAStreamTbl *ptx_tbl; ENTER(); @@ -413,9 +397,8 @@ wlan_11n_update_addba_request(mlan_private *priv) * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_11n_ioctl_addba_param(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_11n_ioctl_addba_param(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]; @@ -459,20 +442,16 @@ wlan_11n_ioctl_addba_param(IN pmlan_adapter pmadapter, * @param tid tid * @return N/A */ -void -wlan_11n_delba(mlan_private *priv, int tid) +void wlan_11n_delba(mlan_private *priv, int tid) { 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); + 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; @@ -502,9 +481,8 @@ wlan_11n_delba(mlan_private *priv, int tid) * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_11n_ioctl_addba_reject(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_11n_ioctl_addba_reject(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { int i = 0; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -582,7 +560,7 @@ wlan_11n_ioctl_ibss_ampdu_param(IN pmlan_adapter pmadapter, } } else { for (i = 0; i < MAX_NUM_TID; i++) { - /* For AMPDU RX */ + /* For AMPDU RX*/ if (cfg->param.ibss_ampdu.addba_reject[i] > ADDBA_RSP_STATUS_REJECT) { pioctl_req->status_code = @@ -592,7 +570,7 @@ wlan_11n_ioctl_ibss_ampdu_param(IN pmlan_adapter pmadapter, } pmpriv->ibss_addba_reject[i] = cfg->param.ibss_ampdu.addba_reject[i]; - /* For AMPDU TX */ + /* For AMPDU TX*/ if ((cfg->param.ibss_ampdu.ampdu[i] > HIGH_PRIO_TID) && (cfg->param.ibss_ampdu.ampdu[i] != BA_STREAM_NOT_ALLOWED)) { @@ -659,15 +637,13 @@ wlan_11n_ioctl_min_ba_threshold_cfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_PENDING */ -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) +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_adapter pmadapter = priv->adapter; TxBAStreamTbl *tx_ba_stream_tbl_ptr; - t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0 }; + t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = {0}; mlan_status ret = MLAN_STATUS_SUCCESS; ENTER(); @@ -685,29 +661,27 @@ wlan_send_delba_to_entry_in_txbastream_tbl(pmlan_private priv, 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 (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, 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); + 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); + 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; @@ -730,26 +704,21 @@ wlan_send_delba_to_entry_in_txbastream_tbl(pmlan_private priv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_PENDING */ -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) +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_adapter pmadapter = priv->adapter; RxReorderTbl *rx_reor_tbl_ptr; - t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0 }; + 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); + 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; @@ -759,25 +728,22 @@ wlan_send_delba_to_entry_in_reorder_tbl(pmlan_private priv, 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, 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); + 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); + 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; @@ -795,15 +761,15 @@ wlan_send_delba_to_entry_in_reorder_tbl(pmlan_private priv, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_11n_ioctl_delba(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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 zero_mac[MLAN_MAC_ADDR_LENGTH] = {0}; t_u8 tid, *peer_address; ENTER(); @@ -816,14 +782,10 @@ wlan_11n_ioctl_delba(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) 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); + 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 != @@ -832,9 +794,9 @@ wlan_11n_ioctl_delba(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) 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, + zero_mac, + MLAN_MAC_ADDR_LENGTH) || !memcmp(pmadapter, peer_address, rx_reor_tbl_ptr->ta, MLAN_MAC_ADDR_LENGTH))) { @@ -851,11 +813,9 @@ wlan_11n_ioctl_delba(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) if ((last_rx_ba_to_delete == MNULL) && (cfg->param.del_ba.direction & DELBA_TX)) { wlan_request_ralist_lock(pmpriv); - tx_ba_stream_tbl_ptr = - (TxBAStreamTbl *)util_peek_list(pmadapter->pmoal_handle, - &pmpriv-> - tx_ba_stream_tbl_ptr, - MNULL, MNULL); + tx_ba_stream_tbl_ptr = (TxBAStreamTbl *)util_peek_list( + pmadapter->pmoal_handle, &pmpriv->tx_ba_stream_tbl_ptr, + MNULL, MNULL); if (tx_ba_stream_tbl_ptr) { while (tx_ba_stream_tbl_ptr != @@ -863,11 +823,11 @@ wlan_11n_ioctl_delba(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) 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) || + (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))) { @@ -885,23 +845,17 @@ wlan_11n_ioctl_delba(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) 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); + 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); + 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); + ret = wlan_send_delba_to_entry_in_reorder_tbl( + pmpriv, pioctl_req, tid, peer_address, + last_rx_ba_to_delete); } LEAVE(); @@ -916,9 +870,8 @@ wlan_11n_ioctl_delba(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_11n_ioctl_rejectaddbareq(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) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; @@ -934,11 +887,8 @@ wlan_11n_ioctl_rejectaddbareq(IN pmlan_adapter pmadapter, 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, + 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) @@ -957,8 +907,7 @@ wlan_11n_ioctl_rejectaddbareq(IN pmlan_adapter pmadapter, * * @return N/A */ -static void -wlan_send_delba_txbastream_tbl(pmlan_private priv, t_u8 tid) +static void wlan_send_delba_txbastream_tbl(pmlan_private priv, t_u8 tid) { pmlan_adapter pmadapter = priv->adapter; TxBAStreamTbl *tx_ba_stream_tbl_ptr; @@ -978,7 +927,8 @@ wlan_send_delba_txbastream_tbl(pmlan_private priv, t_u8 tid) 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 (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", @@ -1007,8 +957,7 @@ wlan_send_delba_txbastream_tbl(pmlan_private priv, t_u8 tid) * * @return N/A */ -void -wlan_update_all_stations_ampdu(mlan_private *priv) +void wlan_update_all_stations_ampdu(mlan_private *priv) { sta_node *sta_ptr; mlan_adapter *pmadapter = priv->adapter; @@ -1020,9 +969,8 @@ wlan_update_all_stations_ampdu(mlan_private *priv) sta_ptr = (sta_node *)util_peek_list(pmadapter->pmoal_handle, &priv->sta_list, MNULL, MNULL); if (!sta_ptr) { - 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(); return; } @@ -1048,9 +996,8 @@ wlan_update_all_stations_ampdu(mlan_private *priv) * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_11n_ioctl_aggr_prio_tbl(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_11n_ioctl_aggr_prio_tbl(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { int i = 0; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1072,9 +1019,9 @@ wlan_11n_ioctl_aggr_prio_tbl(IN pmlan_adapter pmadapter, 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)) { + 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; @@ -1083,12 +1030,13 @@ wlan_11n_ioctl_aggr_prio_tbl(IN pmlan_adapter pmadapter, pmpriv->aggr_prio_tbl[i].ampdu_ap = pmpriv->aggr_prio_tbl[i].ampdu_user = - cfg->param.aggr_prio_tbl.ampdu[i]; + 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)) { + 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; @@ -1128,8 +1076,7 @@ wlan_11n_ioctl_aggr_prio_tbl(IN pmlan_adapter pmadapter, * * @return N/A */ -void -wlan_update_ampdu_txwinsize(pmlan_adapter pmadapter) +void wlan_update_ampdu_txwinsize(pmlan_adapter pmadapter) { t_u8 i; t_u32 tx_win_size = 0; @@ -1164,11 +1111,12 @@ wlan_update_ampdu_txwinsize(pmlan_adapter pmadapter) if (tx_win_size != priv->add_ba_param.tx_win_size) { if (priv->media_connected == MTRUE) { for (i = 0; i < MAX_NUM_TID; i++) - wlan_send_delba_txbastream_tbl - (priv, i); - wlan_recv_event(priv, - MLAN_EVENT_ID_DRV_DEFER_HANDLING, - MNULL); + wlan_send_delba_txbastream_tbl( + priv, i); + wlan_recv_event( + priv, + MLAN_EVENT_ID_DRV_DEFER_HANDLING, + MNULL); } } } @@ -1203,16 +1151,16 @@ wlan_11n_ioctl_supported_mcs_set(IN pmlan_adapter pmadapter, return MLAN_STATUS_FAILURE; } rx_mcs_supp = GET_RXMCSSUPP(pmpriv->usr_dev_mcs_support); - /* Set MCS for 1x1/2x2 */ + /* 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(pmpriv->usr_dot_11n_dev_cap_bg) - || ISSUPP_CHANWIDTH40(pmpriv->usr_dot_11n_dev_cap_a) - ) && !(pmpriv->curr_chan_flags & CHAN_FLAGS_NO_HT40PLUS - && pmpriv->curr_chan_flags & CHAN_FLAGS_NO_HT40MINUS)) + if ((ISSUPP_CHANWIDTH40(pmpriv->usr_dot_11n_dev_cap_bg) || + ISSUPP_CHANWIDTH40(pmpriv->usr_dot_11n_dev_cap_a)) && + !(pmpriv->curr_chan_flags & CHAN_FLAGS_NO_HT40PLUS && + pmpriv->curr_chan_flags & CHAN_FLAGS_NO_HT40MINUS)) SETHT_MCS32(mcs_set); cfg = (mlan_ds_11n_cfg *)pioctl_req->pbuf; @@ -1232,8 +1180,8 @@ wlan_11n_ioctl_supported_mcs_set(IN pmlan_adapter pmadapter, * * @return MTRUE or MFALSE */ -static int -wlan_is_txbastreamptr_valid(mlan_private *priv, TxBAStreamTbl *ptxtblptr) +static int wlan_is_txbastreamptr_valid(mlan_private *priv, + TxBAStreamTbl *ptxtblptr) { TxBAStreamTbl *ptx_tbl; @@ -1268,8 +1216,8 @@ wlan_is_txbastreamptr_valid(mlan_private *priv, TxBAStreamTbl *ptxtblptr) * @return A pointer to first entry matching status in BA stream * NULL if not found */ -static TxBAStreamTbl * -wlan_11n_get_txbastream_status(mlan_private *priv, baStatus_e ba_status) +static TxBAStreamTbl *wlan_11n_get_txbastream_status(mlan_private *priv, + baStatus_e ba_status) { TxBAStreamTbl *ptx_tbl; @@ -1309,8 +1257,7 @@ wlan_11n_get_txbastream_status(mlan_private *priv, baStatus_e ba_status) * * @return N/A */ -static void -wlan_fill_cap_info(mlan_private *priv, HTCap_t *ht_cap, t_u8 bands) +static void wlan_fill_cap_info(mlan_private *priv, HTCap_t *ht_cap, t_u8 bands) { t_u32 usr_dot_11n_dev_cap; @@ -1376,9 +1323,9 @@ wlan_fill_cap_info(mlan_private *priv, HTCap_t *ht_cap, t_u8 bands) RESETHT_MAXAMSDU(ht_cap->ht_cap_info); /* SM power save */ if (ISSUPP_MIMOPS(priv->adapter->hw_dot_11n_dev_cap)) - RESETHT_SM_POWERSAVE(ht_cap->ht_cap_info); /* Enable HT SMPS */ + RESETHT_SM_POWERSAVE(ht_cap->ht_cap_info); /* Enable HT SMPS*/ else - SETHT_STATIC_SMPS(ht_cap->ht_cap_info); /* Disable HT SMPS */ + SETHT_STATIC_SMPS(ht_cap->ht_cap_info); /* Disable HT SMPS */ LEAVE(); } @@ -1392,8 +1339,7 @@ wlan_fill_cap_info(mlan_private *priv, HTCap_t *ht_cap, t_u8 bands) * * @return N/A */ -static void -wlan_reset_cap_info(mlan_private *priv, HTCap_t *ht_cap, t_u8 bands) +static void wlan_reset_cap_info(mlan_private *priv, HTCap_t *ht_cap, t_u8 bands) { t_u32 usr_dot_11n_dev_cap; @@ -1443,7 +1389,7 @@ wlan_reset_cap_info(mlan_private *priv, HTCap_t *ht_cap, t_u8 bands) RESETHT_MAXAMSDU(ht_cap->ht_cap_info); /* SM power save */ if (!ISSUPP_MIMOPS(priv->adapter->hw_dot_11n_dev_cap)) - SETHT_STATIC_SMPS(ht_cap->ht_cap_info); /* Disable HT SMPS */ + SETHT_STATIC_SMPS(ht_cap->ht_cap_info); /* Disable HT SMPS */ LEAVE(); } @@ -1458,9 +1404,8 @@ wlan_reset_cap_info(mlan_private *priv, HTCap_t *ht_cap, t_u8 bands) * * @return N/A */ -void -wlan_fill_ht_cap_tlv(mlan_private *priv, - MrvlIETypes_HTCap_t *pht_cap, t_u16 bands, t_u8 fill) +void wlan_fill_ht_cap_tlv(mlan_private *priv, MrvlIETypes_HTCap_t *pht_cap, + t_u16 bands, t_u8 fill) { mlan_adapter *pmadapter = priv->adapter; int rx_mcs_supp; @@ -1487,14 +1432,14 @@ wlan_fill_ht_cap_tlv(mlan_private *priv, SETAMPDU_SPACING(pht_cap->ht_cap.ampdu_param, 0); rx_mcs_supp = GET_RXMCSSUPP(priv->usr_dev_mcs_support); -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) if (IS_CARD9098(pmadapter->card_type) || IS_CARD9097(pmadapter->card_type)) { if (bands & BAND_A) - rx_mcs_supp = - MIN(rx_mcs_supp, - GET_RXMCSSUPP(pmadapter-> - user_htstream >> 8)); + rx_mcs_supp = MIN( + rx_mcs_supp, + GET_RXMCSSUPP(pmadapter->user_htstream >> 8)); else rx_mcs_supp = MIN(rx_mcs_supp, @@ -1503,15 +1448,17 @@ wlan_fill_ht_cap_tlv(mlan_private *priv, #endif memset(pmadapter, (t_u8 *)pht_cap->ht_cap.supported_mcs_set, 0xff, rx_mcs_supp); - /* Clear all the other values to get the minimum mcs set btw STA and AP */ + /* 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 current channel only support 20MHz, we should not set 40Mz supprot */ + /* if current channel only support 20MHz, we should not set 40Mz + * supprot*/ if (ISSUPP_CHANWIDTH40(usr_dot_11n_dev_cap) && - !(priv->curr_chan_flags & CHAN_FLAGS_NO_HT40PLUS - && priv->curr_chan_flags & CHAN_FLAGS_NO_HT40MINUS)) + !(priv->curr_chan_flags & CHAN_FLAGS_NO_HT40PLUS && + priv->curr_chan_flags & CHAN_FLAGS_NO_HT40MINUS)) SETHT_MCS32(pht_cap->ht_cap.supported_mcs_set); /* Clear RD responder bit */ @@ -1535,8 +1482,8 @@ wlan_fill_ht_cap_tlv(mlan_private *priv, * * @return N/A */ -void -wlan_fill_ht_cap_ie(mlan_private *priv, IEEEtypes_HTCap_t *pht_cap, t_u16 bands) +void wlan_fill_ht_cap_ie(mlan_private *priv, IEEEtypes_HTCap_t *pht_cap, + t_u16 bands) { mlan_adapter *pmadapter = priv->adapter; int rx_mcs_supp; @@ -1559,14 +1506,14 @@ wlan_fill_ht_cap_ie(mlan_private *priv, IEEEtypes_HTCap_t *pht_cap, t_u16 bands) SETAMPDU_SPACING(pht_cap->ht_cap.ampdu_param, 0); rx_mcs_supp = GET_RXMCSSUPP(priv->usr_dev_mcs_support); -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) if (IS_CARD9098(pmadapter->card_type) || IS_CARD9097(pmadapter->card_type)) { if (bands & BAND_A) - rx_mcs_supp = - MIN(rx_mcs_supp, - GET_RXMCSSUPP(pmadapter-> - user_htstream >> 8)); + rx_mcs_supp = MIN( + rx_mcs_supp, + GET_RXMCSSUPP(pmadapter->user_htstream >> 8)); else rx_mcs_supp = MIN(rx_mcs_supp, @@ -1575,15 +1522,17 @@ wlan_fill_ht_cap_ie(mlan_private *priv, IEEEtypes_HTCap_t *pht_cap, t_u16 bands) #endif memset(pmadapter, (t_u8 *)pht_cap->ht_cap.supported_mcs_set, 0xff, rx_mcs_supp); - /* Clear all the other values to get the minimum mcs set btw STA and AP */ + /* 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 current channel only support 20MHz, we should not set 40Mz supprot */ + /* if current channel only support 20MHz, we should not set 40Mz + * supprot*/ if (ISSUPP_CHANWIDTH40(usr_dot_11n_dev_cap) && - !(priv->curr_chan_flags & CHAN_FLAGS_NO_HT40PLUS - && priv->curr_chan_flags & CHAN_FLAGS_NO_HT40MINUS)) + !(priv->curr_chan_flags & CHAN_FLAGS_NO_HT40PLUS && + priv->curr_chan_flags & CHAN_FLAGS_NO_HT40MINUS)) SETHT_MCS32(pht_cap->ht_cap.supported_mcs_set); /* Clear RD responder bit */ @@ -1605,8 +1554,7 @@ wlan_fill_ht_cap_ie(mlan_private *priv, IEEEtypes_HTCap_t *pht_cap, t_u16 bands) * * @return N/A */ -void -wlan_show_dot11ndevcap(pmlan_adapter pmadapter, t_u32 cap) +void wlan_show_dot11ndevcap(pmlan_adapter pmadapter, t_u32 cap) { ENTER(); @@ -1669,8 +1617,7 @@ wlan_show_dot11ndevcap(pmlan_adapter pmadapter, t_u32 cap) * * @return N/A */ -void -wlan_show_devmcssupport(pmlan_adapter pmadapter, t_u8 support) +void wlan_show_devmcssupport(pmlan_adapter pmadapter, t_u8 support) { ENTER(); @@ -1690,8 +1637,7 @@ wlan_show_devmcssupport(pmlan_adapter pmadapter, t_u8 support) * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_11n_delba(mlan_private *priv, HostCmd_DS_COMMAND *resp) +mlan_status wlan_ret_11n_delba(mlan_private *priv, HostCmd_DS_COMMAND *resp) { int tid; TxBAStreamTbl *ptx_ba_tbl; @@ -1705,43 +1651,35 @@ wlan_ret_11n_delba(mlan_private *priv, HostCmd_DS_COMMAND *resp) 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), - 0); + mlan_11n_delete_bastream_tbl( + priv, tid, pdel_ba->peer_mac_addr, TYPE_DELBA_SENT, + INITIATOR_BIT(pdel_ba->del_ba_param_set), 0); wlan_request_ralist_lock(priv); - ptx_ba_tbl = wlan_11n_get_txbastream_status(priv, - BA_STREAM_SETUP_INPROGRESS); + ptx_ba_tbl = wlan_11n_get_txbastream_status( + priv, BA_STREAM_SETUP_INPROGRESS); wlan_release_ralist_lock(priv); 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 - */ + } 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_request_ralist_lock(priv); - if (!wlan_11n_get_txbastream_tbl - (priv, tid, pdel_ba->peer_mac_addr, MFALSE)) - 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 (!wlan_11n_get_txbastream_tbl( + priv, tid, pdel_ba->peer_mac_addr, MFALSE)) + 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); wlan_release_ralist_lock(priv); if (ptx_ba_tbl) { - mlan_11n_delete_bastream_tbl(priv, - ptx_ba_tbl->tid, - ptx_ba_tbl->ra, - TYPE_DELBA_SENT, - MTRUE, 0); + mlan_11n_delete_bastream_tbl( + priv, ptx_ba_tbl->tid, ptx_ba_tbl->ra, + TYPE_DELBA_SENT, MTRUE, 0); } - } } @@ -1758,8 +1696,7 @@ wlan_ret_11n_delba(mlan_private *priv, HostCmd_DS_COMMAND *resp) * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_11n_addba_req(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 = @@ -1777,32 +1714,27 @@ wlan_ret_11n_addba_req(mlan_private *priv, HostCmd_DS_COMMAND *resp) 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; + tid = (padd_ba_rsp->block_ack_param_set & BLOCKACKPARAM_TID_MASK) >> + BLOCKACKPARAM_TID_POS; tid_down = wlan_get_wmm_tid_down(priv, tid); - ra_list = - wlan_wmm_get_ralist_node(priv, tid_down, - padd_ba_rsp->peer_mac_addr); + ra_list = wlan_wmm_get_ralist_node(priv, tid_down, + padd_ba_rsp->peer_mac_addr); 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, MTRUE); + ptx_ba_tbl = wlan_11n_get_txbastream_tbl( + priv, tid, padd_ba_rsp->peer_mac_addr, MTRUE); 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 & + ((padd_ba_rsp->block_ack_param_set & BLOCKACKPARAM_WINSIZE_MASK) >> BLOCKACKPARAM_WINSIZE_POS), - padd_ba_rsp-> - block_ack_param_set & - BLOCKACKPARAM_AMSDU_SUPP_MASK); + 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 & + if ((padd_ba_rsp->block_ack_param_set & BLOCKACKPARAM_AMSDU_SUPP_MASK) && priv->add_ba_param.tx_amsdu && (priv->aggr_prio_tbl[tid].amsdu != @@ -1821,7 +1753,6 @@ wlan_ret_11n_addba_req(mlan_private *priv, HostCmd_DS_COMMAND *resp) if (ra_list) { ra_list->amsdu_in_ampdu = MFALSE; ra_list->ba_status = BA_STREAM_NOT_SETUP; - } mlan_11n_delete_bastream_tbl(priv, tid, padd_ba_rsp->peer_mac_addr, @@ -1829,20 +1760,18 @@ wlan_ret_11n_addba_req(mlan_private *priv, HostCmd_DS_COMMAND *resp) 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); + 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 { - if (ra_list) { ra_list->packet_count = 0; ra_list->ba_packet_threshold = - wlan_get_random_ba_threshold(priv-> - adapter); + wlan_get_random_ba_threshold( + priv->adapter); } } } @@ -1859,8 +1788,7 @@ wlan_ret_11n_addba_req(mlan_private *priv, HostCmd_DS_COMMAND *resp) * * @return N/A */ -void -wlan_set_tx_pause_flag(mlan_private *priv, t_u8 flag) +void wlan_set_tx_pause_flag(mlan_private *priv, t_u8 flag) { mlan_private *pmpriv = MNULL; t_u8 i; @@ -1881,9 +1809,8 @@ wlan_set_tx_pause_flag(mlan_private *priv, t_u8 flag) * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_recfg_tx_buf(mlan_private *priv, - HostCmd_DS_COMMAND *cmd, int cmd_action, void *pdata_buf) +mlan_status wlan_cmd_recfg_tx_buf(mlan_private *priv, 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; @@ -1891,8 +1818,7 @@ wlan_cmd_recfg_tx_buf(mlan_private *priv, 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); + 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: @@ -1920,21 +1846,20 @@ wlan_cmd_recfg_tx_buf(mlan_private *priv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_amsdu_aggr_ctrl(mlan_private *priv, - HostCmd_DS_COMMAND *cmd, - int cmd_action, void *pdata_buf) +mlan_status wlan_cmd_amsdu_aggr_ctrl(mlan_private *priv, + 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; + 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); + 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: @@ -1959,10 +1884,9 @@ wlan_cmd_amsdu_aggr_ctrl(mlan_private *priv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_amsdu_aggr_ctrl(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_amsdu_aggr_ctrl(IN pmlan_private pmpriv, + 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; @@ -1989,10 +1913,9 @@ wlan_ret_amsdu_aggr_ctrl(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -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) +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) { HostCmd_DS_11N_CFG *htcfg = &cmd->params.htcfg; mlan_ds_11n_tx_cfg *txcfg = (mlan_ds_11n_tx_cfg *)pdata_buf; @@ -2017,9 +1940,9 @@ wlan_cmd_11n_cfg(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_11n_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_11n_cfg(IN pmlan_private pmpriv, + 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; @@ -2047,10 +1970,9 @@ wlan_ret_11n_cfg(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -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) +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) { HostCmd_DS_REJECT_ADDBA_REQ *preject_addba_req = &cmd->params.rejectaddbareq; @@ -2059,9 +1981,8 @@ wlan_cmd_reject_addba_req(IN pmlan_private pmpriv, 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); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_REJECT_ADDBA_REQ) + + S_DS_GEN); preject_addba_req->action = wlan_cpu_to_le16(cmd_action); preject_addba_req->conditions = wlan_cpu_to_le32(prejaddbareq->conditions); @@ -2078,19 +1999,17 @@ wlan_cmd_reject_addba_req(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_reject_addba_req(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_reject_addba_req(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { mlan_ds_11n_cfg *cfg = MNULL; HostCmd_DS_REJECT_ADDBA_REQ *preject_addba_req = &resp->params.rejectaddbareq; ENTER(); - if (pioctl_buf && - (wlan_le16_to_cpu(preject_addba_req->action) == - HostCmd_ACT_GEN_GET)) { + if (pioctl_buf && (wlan_le16_to_cpu(preject_addba_req->action) == + HostCmd_ACT_GEN_GET)) { cfg = (mlan_ds_11n_cfg *)pioctl_buf->pbuf; cfg->param.reject_addba_req.conditions = wlan_le32_to_cpu(preject_addba_req->conditions); @@ -2108,10 +2027,9 @@ wlan_ret_reject_addba_req(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) +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) { pmlan_adapter pmadapter = pmpriv->adapter; HostCmd_DS_TX_BF_CFG *txbfcfg = &cmd->params.tx_bf_cfg; @@ -2141,8 +2059,8 @@ wlan_cmd_tx_bf_cfg(IN pmlan_private pmpriv, 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); + 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; @@ -2154,8 +2072,8 @@ wlan_cmd_tx_bf_cfg(IN pmlan_private pmpriv, break; case SET_GET_BF_PERIODICITY: txbfcfg->body.bf_periodicity.interval = - wlan_cpu_to_le16(txbf->body.bf_periodicity-> - interval); + wlan_cpu_to_le16( + txbf->body.bf_periodicity->interval); break; case TX_BF_FOR_PEER_ENBL: memcpy_ext(pmadapter, txbfcfg->body.tx_bf_peer.peer_mac, @@ -2194,9 +2112,9 @@ wlan_cmd_tx_bf_cfg(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ret_tx_bf_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_tx_bf_cfg(IN pmlan_private pmpriv, + 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; @@ -2223,8 +2141,8 @@ wlan_ret_tx_bf_cfg(IN pmlan_private pmpriv, 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); + 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; @@ -2240,15 +2158,13 @@ wlan_ret_tx_bf_cfg(IN pmlan_private pmpriv, txbf->body.bf_periodicity->peer_mac, txbfcfg->body.bf_periodicity.peer_mac, MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); - txbf->body.bf_periodicity->interval = - wlan_le16_to_cpu(txbfcfg->body.bf_periodicity. - interval); + 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)); + tx_bf_peer = (bf_peer_args *)((t_u8 *)&txbfcfg->body + + sizeof(t_u8)); for (i = 0; i < txbf->no_of_peers; i++) { memcpy_ext(pmadapter, txbf->body.tx_bf_peer[i].peer_mac, @@ -2294,8 +2210,7 @@ wlan_ret_tx_bf_cfg(IN pmlan_private pmpriv, * @param chan channel num * @return second channel offset */ -t_u8 -wlan_get_second_channel_offset(int chan) +t_u8 wlan_get_second_channel_offset(int chan) { t_u8 chan2Offset = SEC_CHAN_NONE; @@ -2348,9 +2263,8 @@ wlan_get_second_channel_offset(int chan) * @return channel offset (NO_SEC_CHANNEL, SEC_CHANNEL_ABOVE, * SEC_CHANNEL_BELOW) */ -t_u8 -wlan_validate_chan_offset(IN mlan_private *pmpriv, - IN t_u16 band, IN t_u32 chan, IN t_u8 chan_bw) +t_u8 wlan_validate_chan_offset(IN mlan_private *pmpriv, IN t_u16 band, + IN t_u32 chan, IN t_u8 chan_bw) { t_u8 chan_offset; pmlan_adapter pmadapter = pmpriv->adapter; @@ -2368,13 +2282,13 @@ wlan_validate_chan_offset(IN mlan_private *pmpriv, if ((chan == 1) || (chan == 2) || (chan == 3) || (chan == 4)) chan_offset = SEC_CHAN_ABOVE; - else if ((chan == 10) || (chan == 11) || - (chan == 12) || (chan == 13)) + 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 (!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) @@ -2391,9 +2305,8 @@ wlan_validate_chan_offset(IN mlan_private *pmpriv, * * @return MTRUE/MFALSE */ -static int -wlan_check_chan_width_ht40_by_region(IN mlan_private *pmpriv, - IN BSSDescriptor_t *pbss_desc) +static int wlan_check_chan_width_ht40_by_region(IN mlan_private *pmpriv, + IN BSSDescriptor_t *pbss_desc) { pmlan_adapter pmadapter = pmpriv->adapter; int i = 0; @@ -2435,7 +2348,7 @@ wlan_check_chan_width_ht40_by_region(IN mlan_private *pmpriv, num_cfp = pmadapter->region_channel[0].num_cfp; if ((pbss_desc->bss_band & (BAND_B | BAND_G)) && - pmadapter->region_channel && pmadapter->region_channel[0].valid) { + pmadapter->region_channel[0].valid) { for (i = 0; i < num_cfp; i++) { if (pri_chan == pmadapter->region_channel[0].pcfp[i].channel) { @@ -2471,9 +2384,8 @@ wlan_check_chan_width_ht40_by_region(IN mlan_private *pmpriv, * * @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) +int wlan_cmd_append_11n_tlv(IN mlan_private *pmpriv, + IN BSSDescriptor_t *pbss_desc, OUT t_u8 **ppbuffer) { pmlan_adapter pmadapter = pmpriv->adapter; MrvlIETypes_HTCap_t *pht_cap; @@ -2532,8 +2444,8 @@ wlan_cmd_append_11n_tlv(IN mlan_private *pmpriv, memcpy_ext(pmadapter, (t_u8 *)pht_cap + sizeof(MrvlIEtypesHeader_t), (t_u8 *)pbss_desc->pht_cap + - sizeof(IEEEtypes_Header_t), pht_cap->header.len, - pht_cap->header.len); + sizeof(IEEEtypes_Header_t), + pht_cap->header.len, pht_cap->header.len); pht_cap->ht_cap.ht_cap_info = wlan_le16_to_cpu(pht_cap->ht_cap.ht_cap_info); @@ -2543,7 +2455,7 @@ wlan_cmd_append_11n_tlv(IN mlan_private *pmpriv, MTRUE); /** check if need support 80+80MHZ */ - /** reset the 2 spatial stream rate for 80 + 80 Mhz */ + /** reset the 2 spatial stream rate for 80 + 80 Mhz */ if (wlan_is_80_80_support(pmpriv, pbss_desc)) pht_cap->ht_cap.supported_mcs_set[1] = 0; HEXDUMP("HT_CAPABILITIES IE", (t_u8 *)pht_cap, @@ -2552,13 +2464,12 @@ wlan_cmd_append_11n_tlv(IN mlan_private *pmpriv, ret_len += sizeof(MrvlIETypes_HTCap_t); pht_cap->header.len = wlan_cpu_to_le16(pht_cap->header.len); } else { - //AP don't support 11N + // AP don't support 11N LEAVE(); return 0; } if (pbss_desc->pht_info) { - pchan_list = (MrvlIEtypes_ChanListParamSet_t *)*ppbuffer; memset(pmadapter, pchan_list, 0, sizeof(MrvlIEtypes_ChanListParamSet_t)); @@ -2570,7 +2481,8 @@ wlan_cmd_append_11n_tlv(IN mlan_private *pmpriv, pbss_desc->pht_info->ht_info.pri_chan; pchan_list->chan_scan_param[0].bandcfg.chanBand = wlan_band_to_radio_type((t_u8)pbss_desc->bss_band); - /* support the VHT if the network to be join has the VHT operation */ + /* support the VHT if the network to be join has the VHT + * operation */ if (ISSUPP_11ACENABLED(pmadapter->fw_cap_info) && (usr_dot_11ac_bw == BW_FOLLOW_VHTCAP) && (!(pmpriv->curr_chan_flags & CHAN_FLAGS_NO_80MHZ)) && @@ -2580,17 +2492,17 @@ wlan_cmd_append_11n_tlv(IN mlan_private *pmpriv, pchan_list->chan_scan_param[0].bandcfg.chanWidth = CHAN_BW_80MHZ; pchan_list->chan_scan_param[0].bandcfg.chan2Offset = - GET_SECONDARYCHAN(pbss_desc->pht_info->ht_info. - field2); + GET_SECONDARYCHAN( + pbss_desc->pht_info->ht_info.field2); pbss_desc->curr_bandwidth = BW_80MHZ; } else if (ISSUPP_CHANWIDTH40(usr_dot_11n_dev_cap) && - ISALLOWED_CHANWIDTH40(pbss_desc->pht_info->ht_info. - field2) && + ISALLOWED_CHANWIDTH40( + pbss_desc->pht_info->ht_info.field2) && wlan_check_chan_width_ht40_by_region(pmpriv, pbss_desc)) { pchan_list->chan_scan_param[0].bandcfg.chan2Offset = - GET_SECONDARYCHAN(pbss_desc->pht_info->ht_info. - field2); + GET_SECONDARYCHAN( + pbss_desc->pht_info->ht_info.field2); pbss_desc->curr_bandwidth = BW_40MHZ; pchan_list->chan_scan_param[0].bandcfg.chanWidth = CHAN_BW_40MHZ; @@ -2617,8 +2529,8 @@ wlan_cmd_append_11n_tlv(IN mlan_private *pmpriv, memcpy_ext(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, - p2040_bss_co->header.len); + sizeof(IEEEtypes_Header_t), + p2040_bss_co->header.len, p2040_bss_co->header.len); HEXDUMP("20/40 BSS Coexistence IE", (t_u8 *)p2040_bss_co, sizeof(MrvlIETypes_2040BSSCo_t)); @@ -2649,8 +2561,7 @@ wlan_cmd_append_11n_tlv(IN mlan_private *pmpriv, 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) - ) { + (pmpriv->config_bands & BAND_AAC)) { wlan_add_ext_capa_info_ie(pmpriv, pbss_desc, ppbuffer); ret_len += sizeof(MrvlIETypes_ExtCap_t); } @@ -2672,8 +2583,8 @@ wlan_cmd_append_11n_tlv(IN mlan_private *pmpriv, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_11n_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -2718,8 +2629,8 @@ wlan_11n_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) 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); + 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); @@ -2757,8 +2668,8 @@ wlan_11n_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return N/A */ -void -wlan_11n_delete_txbastream_tbl_entry(mlan_private *priv, TxBAStreamTbl *ptx_tbl) +void wlan_11n_delete_txbastream_tbl_entry(mlan_private *priv, + TxBAStreamTbl *ptx_tbl) { pmlan_adapter pmadapter = priv->adapter; @@ -2782,8 +2693,7 @@ exit: * * @return N/A */ -void -wlan_11n_deleteall_txbastream_tbl(mlan_private *priv) +void wlan_11n_deleteall_txbastream_tbl(mlan_private *priv) { int i; TxBAStreamTbl *del_tbl_ptr = MNULL; @@ -2791,9 +2701,9 @@ wlan_11n_deleteall_txbastream_tbl(mlan_private *priv) ENTER(); wlan_request_ralist_lock(priv); - while ((del_tbl_ptr = (TxBAStreamTbl *) - util_peek_list(priv->adapter->pmoal_handle, - &priv->tx_ba_stream_tbl_ptr, MNULL, MNULL))) { + while ((del_tbl_ptr = (TxBAStreamTbl *)util_peek_list( + priv->adapter->pmoal_handle, + &priv->tx_ba_stream_tbl_ptr, MNULL, MNULL))) { wlan_11n_delete_txbastream_tbl_entry(priv, del_tbl_ptr); } @@ -2819,8 +2729,8 @@ wlan_11n_deleteall_txbastream_tbl(mlan_private *priv) * @return A pointer to first entry matching RA/TID in BA stream * NULL if not found */ -TxBAStreamTbl * -wlan_11n_get_txbastream_tbl(mlan_private *priv, int tid, t_u8 *ra, int lock) +TxBAStreamTbl *wlan_11n_get_txbastream_tbl(mlan_private *priv, int tid, + t_u8 *ra, int lock) { TxBAStreamTbl *ptx_tbl; pmlan_adapter pmadapter = priv->adapter; @@ -2840,12 +2750,12 @@ wlan_11n_get_txbastream_tbl(mlan_private *priv, int tid, t_u8 *ra, int lock) } 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)) { + if ((!memcmp(pmadapter, ptx_tbl->ra, ra, + MLAN_MAC_ADDR_LENGTH)) && + (ptx_tbl->tid == tid)) { if (lock) wlan_release_ralist_lock(priv); LEAVE(); @@ -2871,9 +2781,8 @@ wlan_11n_get_txbastream_tbl(mlan_private *priv, int tid, t_u8 *ra, int lock) * * @return N/A */ -void -wlan_11n_create_txbastream_tbl(mlan_private *priv, - t_u8 *ra, int tid, baStatus_e ba_status) +void wlan_11n_create_txbastream_tbl(mlan_private *priv, t_u8 *ra, int tid, + baStatus_e ba_status) { TxBAStreamTbl *new_node = MNULL; pmlan_adapter pmadapter = priv->adapter; @@ -2885,9 +2794,9 @@ wlan_11n_create_txbastream_tbl(mlan_private *priv, PRINTM(MDAT_D, "create_txbastream_tbl TID %d\n", tid); DBG_HEXDUMP(MDAT_D, "RA", ra, MLAN_MAC_ADDR_LENGTH); - if (pmadapter->callbacks. - moal_malloc(pmadapter->pmoal_handle, sizeof(TxBAStreamTbl), - MLAN_MEM_DEF, (t_u8 **)&new_node)) { + if (pmadapter->callbacks.moal_malloc( + pmadapter->pmoal_handle, sizeof(TxBAStreamTbl), + MLAN_MEM_DEF, (t_u8 **)&new_node)) { PRINTM(MERROR, "wlan_11n_create_txbastream_tbl Failed to allocate new_node\n"); LEAVE(); @@ -2922,8 +2831,7 @@ wlan_11n_create_txbastream_tbl(mlan_private *priv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -int -wlan_send_addba(mlan_private *priv, int tid, t_u8 *peer_mac) +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; @@ -2934,12 +2842,11 @@ wlan_send_addba(mlan_private *priv, int tid, t_u8 *peer_mac) 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); - /** enable AMSDU inside AMPDU */ + 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; @@ -2955,8 +2862,8 @@ wlan_send_addba(mlan_private *priv, int tid, t_u8 *peer_mac) MLAN_MAC_ADDR_LENGTH, 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); + ret = wlan_prepare_cmd(priv, HostCmd_CMD_11N_ADDBA_REQ, 0, 0, MNULL, + &add_ba_req); LEAVE(); return ret; @@ -2973,9 +2880,8 @@ wlan_send_addba(mlan_private *priv, int tid, t_u8 *peer_mac) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -int -wlan_send_delba(mlan_private *priv, pmlan_ioctl_req pioctl_req, int tid, - t_u8 *peer_mac, int initiator) +int wlan_send_delba(mlan_private *priv, pmlan_ioctl_req pioctl_req, int tid, + t_u8 *peer_mac, int initiator) { HostCmd_DS_11N_DELBA delba; mlan_status ret; @@ -2993,9 +2899,8 @@ wlan_send_delba(mlan_private *priv, pmlan_ioctl_req pioctl_req, int tid, memcpy_ext(priv->adapter, &delba.peer_mac_addr, peer_mac, MLAN_MAC_ADDR_LENGTH, 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; @@ -3013,8 +2918,7 @@ wlan_send_delba(mlan_private *priv, pmlan_ioctl_req pioctl_req, int tid, * * @return N/A */ -void -wlan_11n_delete_bastream(mlan_private *priv, t_u8 *del_ba) +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; @@ -3042,8 +2946,7 @@ wlan_11n_delete_bastream(mlan_private *priv, t_u8 *del_ba) * @param buf A pointer to rx_reorder_tbl structure * @return number of rx reorder table entry */ -int -wlan_get_rxreorder_tbl(mlan_private *priv, rx_reorder_tbl *buf) +int wlan_get_rxreorder_tbl(mlan_private *priv, rx_reorder_tbl *buf) { int i; rx_reorder_tbl *ptbl = buf; @@ -3057,15 +2960,14 @@ wlan_get_rxreorder_tbl(mlan_private *priv, rx_reorder_tbl *buf) &priv->rx_reorder_tbl_ptr, MNULL, MNULL); if (!rx_reorder_tbl_ptr) { - priv->adapter->callbacks.moal_spin_unlock(priv->adapter-> - pmoal_handle, - priv-> - rx_reorder_tbl_ptr. - plock); + priv->adapter->callbacks.moal_spin_unlock( + priv->adapter->pmoal_handle, + priv->rx_reorder_tbl_ptr.plock); LEAVE(); return count; } - while (rx_reorder_tbl_ptr != (RxReorderTbl *)&priv->rx_reorder_tbl_ptr) { + while (rx_reorder_tbl_ptr != + (RxReorderTbl *)&priv->rx_reorder_tbl_ptr) { ptbl->tid = (t_u16)rx_reorder_tbl_ptr->tid; memcpy_ext(priv->adapter, ptbl->ta, rx_reorder_tbl_ptr->ta, MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); @@ -3084,9 +2986,8 @@ wlan_get_rxreorder_tbl(mlan_private *priv, rx_reorder_tbl *buf) if (count >= MLAN_MAX_RX_BASTREAM_SUPPORTED) break; } - priv->adapter->callbacks.moal_spin_unlock(priv->adapter->pmoal_handle, - priv->rx_reorder_tbl_ptr. - plock); + priv->adapter->callbacks.moal_spin_unlock( + priv->adapter->pmoal_handle, priv->rx_reorder_tbl_ptr.plock); LEAVE(); return count; } @@ -3098,8 +2999,7 @@ wlan_get_rxreorder_tbl(mlan_private *priv, rx_reorder_tbl *buf) * @param buf A pointer to tx_ba_stream_tbl structure * @return number of ba stream table entry */ -int -wlan_get_txbastream_tbl(mlan_private *priv, tx_ba_stream_tbl *buf) +int wlan_get_txbastream_tbl(mlan_private *priv, tx_ba_stream_tbl *buf) { TxBAStreamTbl *ptxtbl; tx_ba_stream_tbl *ptbl = buf; @@ -3146,8 +3046,7 @@ wlan_get_txbastream_tbl(mlan_private *priv, tx_ba_stream_tbl *buf) * * @return 0--not allowed, other value allowed */ -t_u8 -wlan_11n_bandconfig_allowed(mlan_private *pmpriv, t_u8 bss_band) +t_u8 wlan_11n_bandconfig_allowed(mlan_private *pmpriv, t_u8 bss_band) { if (pmpriv->bss_mode == MLAN_BSS_MODE_IBSS) { if (bss_band & BAND_G) @@ -3170,8 +3069,7 @@ wlan_11n_bandconfig_allowed(mlan_private *pmpriv, t_u8 bss_band) * @param ra RA to find in txbastream_tbl * @return N/A */ -void -wlan_11n_cleanup_txbastream_tbl(mlan_private *priv, t_u8 *ra) +void wlan_11n_cleanup_txbastream_tbl(mlan_private *priv, t_u8 *ra) { TxBAStreamTbl *ptx_tbl = MNULL; t_u8 i; @@ -3188,8 +3086,7 @@ wlan_11n_cleanup_txbastream_tbl(mlan_private *priv, t_u8 *ra) return; } -void -wlan_update_11n_cap(mlan_private *pmpriv) +void wlan_update_11n_cap(mlan_private *pmpriv) { mlan_adapter *pmadapter = pmpriv->adapter; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n.h index 2e2bf74152dd..747caf4590e0 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n.h @@ -63,8 +63,8 @@ mlan_status wlan_ret_reject_addba_req(IN pmlan_private pmpriv, 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, @@ -118,16 +118,15 @@ mlan_status wlan_ret_amsdu_aggr_ctrl(pmlan_private pmpriv, mlan_ioctl_req *pioctl_buf); void wlan_set_tx_pause_flag(mlan_private *priv, t_u8 flag); /** reconfigure tx buf size */ -mlan_status wlan_cmd_recfg_tx_buf(mlan_private *priv, - HostCmd_DS_COMMAND *cmd, +mlan_status wlan_cmd_recfg_tx_buf(mlan_private *priv, 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_u16 band, IN t_u32 chan, IN t_u8 chan_bw); +t_u8 wlan_validate_chan_offset(IN mlan_private *pmpriv, IN t_u16 band, + IN t_u32 chan, IN t_u8 chan_bw); /** get channel offset */ t_u8 wlan_get_second_channel_offset(int chan); @@ -142,8 +141,7 @@ void wlan_11n_cleanup_txbastream_tbl(mlan_private *priv, t_u8 *ra); * @param mac station mac address * @return MTRUE or MFALSE */ -static INLINE t_u8 -is_station_11n_enabled(mlan_private *priv, t_u8 *mac) +static INLINE t_u8 is_station_11n_enabled(mlan_private *priv, t_u8 *mac) { sta_node *sta_ptr = MNULL; sta_ptr = wlan_get_station_entry(priv, mac); @@ -159,8 +157,7 @@ is_station_11n_enabled(mlan_private *priv, t_u8 *mac) * @param mac station mac address * @return max amsdu size statio supported */ -static INLINE t_u16 -get_station_max_amsdu_size(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; sta_ptr = wlan_get_station_entry(priv, mac); @@ -177,8 +174,8 @@ get_station_max_amsdu_size(mlan_private *priv, t_u8 *mac) * @param tid TID value for ptr * @return MTRUE or MFALSE */ -static INLINE t_u8 -is_station_ampdu_allowed(mlan_private *priv, raListTbl *ptr, int tid) +static INLINE t_u8 is_station_ampdu_allowed(mlan_private *priv, raListTbl *ptr, + int tid) { sta_node *sta_ptr = MNULL; sta_ptr = wlan_get_station_entry(priv, ptr->ra); @@ -188,8 +185,9 @@ is_station_ampdu_allowed(mlan_private *priv, raListTbl *ptr, int tid) !sta_ptr->wapi_key_on) return MFALSE; } - return (sta_ptr->ampdu_sta[tid] != BA_STREAM_NOT_ALLOWED) - ? MTRUE : MFALSE; + return (sta_ptr->ampdu_sta[tid] != BA_STREAM_NOT_ALLOWED) ? + MTRUE : + MFALSE; } return MFALSE; } @@ -202,8 +200,7 @@ is_station_ampdu_allowed(mlan_private *priv, raListTbl *ptr, int tid) * @param ra station mac address * @return N/A */ -static INLINE void -disable_station_ampdu(mlan_private *priv, t_u8 tid, t_u8 *ra) +static INLINE void disable_station_ampdu(mlan_private *priv, t_u8 tid, t_u8 *ra) { sta_node *sta_ptr = MNULL; sta_ptr = wlan_get_station_entry(priv, ra); @@ -220,8 +217,7 @@ disable_station_ampdu(mlan_private *priv, t_u8 tid, t_u8 *ra) * @param ra station mac address * @return N/A */ -static INLINE void -reset_station_ampdu(mlan_private *priv, t_u8 tid, t_u8 *ra) +static INLINE void reset_station_ampdu(mlan_private *priv, t_u8 tid, t_u8 *ra) { sta_node *sta_ptr = MNULL; sta_ptr = wlan_get_station_entry(priv, ra); @@ -240,10 +236,9 @@ reset_station_ampdu(mlan_private *priv, t_u8 tid, t_u8 *ra) * * @return MTRUE or MFALSE */ -static INLINE t_u8 -wlan_is_ampdu_allowed(mlan_private *priv, raListTbl *ptr, int tid) +static INLINE t_u8 wlan_is_ampdu_allowed(mlan_private *priv, raListTbl *ptr, + int tid) { - if ((!priv->is_data_rate_auto) && IS_BG_RATE) return MFALSE; #ifdef UAP_SUPPORT @@ -252,14 +247,15 @@ wlan_is_ampdu_allowed(mlan_private *priv, raListTbl *ptr, int tid) #endif /* UAP_SUPPORT */ 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; } -#define BA_RSSI_HIGH_THRESHOLD -70 +#define BA_RSSI_HIGH_THRESHOLD -70 -static INLINE void -wlan_update_station_del_ba_count(mlan_private *priv, raListTbl *ptr) +static INLINE void wlan_update_station_del_ba_count(mlan_private *priv, + raListTbl *ptr) { sta_node *sta_ptr = MNULL; t_s8 rssi; @@ -272,8 +268,7 @@ wlan_update_station_del_ba_count(mlan_private *priv, raListTbl *ptr) return; } -static INLINE void -wlan_update_del_ba_count(mlan_private *priv, raListTbl *ptr) +static INLINE void wlan_update_del_ba_count(mlan_private *priv, raListTbl *ptr) { t_s8 rssi; #ifdef UAP_802_11N @@ -296,8 +291,8 @@ wlan_update_del_ba_count(mlan_private *priv, raListTbl *ptr) * * @return MTRUE or MFALSE */ -static INLINE t_u8 -wlan_is_amsdu_allowed(mlan_private *priv, raListTbl *ptr, int tid) +static INLINE t_u8 wlan_is_amsdu_allowed(mlan_private *priv, raListTbl *ptr, + int tid) { #ifdef UAP_SUPPORT sta_node *sta_ptr = MNULL; @@ -315,11 +310,12 @@ wlan_is_amsdu_allowed(mlan_private *priv, raListTbl *ptr, int tid) } #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) - || IS_BG_RATE))) ? 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) || + IS_BG_RATE))) ? + MTRUE : + MFALSE; } /** @@ -329,8 +325,7 @@ wlan_is_amsdu_allowed(mlan_private *priv, raListTbl *ptr, int tid) * * @return MTRUE or MFALSE */ -static INLINE t_u8 -wlan_is_bastream_avail(mlan_private *priv) +static INLINE t_u8 wlan_is_bastream_avail(mlan_private *priv) { mlan_private *pmpriv = MNULL; t_u8 i = 0; @@ -339,9 +334,8 @@ wlan_is_bastream_avail(mlan_private *priv) for (i = 0; i < priv->adapter->priv_num; i++) { pmpriv = priv->adapter->priv[i]; if (pmpriv) - bastream_num += - wlan_wmm_list_len((pmlan_list_head)&pmpriv-> - tx_ba_stream_tbl_ptr); + bastream_num += wlan_wmm_list_len( + (pmlan_list_head)&pmpriv->tx_ba_stream_tbl_ptr); } bastream_max = ISSUPP_GETTXBASTREAM(priv->adapter->hw_dot_11n_dev_cap); if (bastream_max == 0) @@ -360,9 +354,9 @@ wlan_is_bastream_avail(mlan_private *priv) * * @return MTRUE or MFALSE */ -static INLINE t_u8 -wlan_find_stream_to_delete(mlan_private *priv, - raListTbl *ptr, int ptr_tid, int *ptid, t_u8 *ra) +static INLINE t_u8 wlan_find_stream_to_delete(mlan_private *priv, + raListTbl *ptr, int ptr_tid, + int *ptid, t_u8 *ra) { int tid; t_u8 ret = MFALSE; @@ -403,8 +397,7 @@ wlan_find_stream_to_delete(mlan_private *priv, * * @return MTRUE or MFALSE */ -static INLINE int -wlan_is_11n_enabled(mlan_private *priv, t_u8 *ra) +static INLINE int wlan_is_11n_enabled(mlan_private *priv, t_u8 *ra) { int ret = MFALSE; ENTER(); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n_aggr.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n_aggr.c index dc73054cf147..1997523afb5d 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n_aggr.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n_aggr.c @@ -56,37 +56,33 @@ Change log: * * @return Final packet size */ -static int -wlan_11n_form_amsdu_pkt(pmlan_adapter pmadapter, t_u8 *amsdu_buf, t_u8 *data, - int pkt_len, int *pad) +static int wlan_11n_form_amsdu_pkt(pmlan_adapter pmadapter, t_u8 *amsdu_buf, + t_u8 *data, 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 - */ + 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_ext(pmadapter, amsdu_buf, data, (MLAN_MAC_ADDR_LENGTH) * 2, - (MLAN_MAC_ADDR_LENGTH) * 2); - dt_offset = amsdu_buf_offset = (MLAN_MAC_ADDR_LENGTH) * 2; + memcpy_ext(pmadapter, amsdu_buf, data, (MLAN_MAC_ADDR_LENGTH)*2, + (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))); + *(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_ext(pmadapter, amsdu_buf + amsdu_buf_offset, &snap, LLC_SNAP_LEN, LLC_SNAP_LEN); @@ -94,9 +90,9 @@ wlan_11n_form_amsdu_pkt(pmlan_adapter pmadapter, t_u8 *amsdu_buf, t_u8 *data, memcpy_ext(pmadapter, amsdu_buf + amsdu_buf_offset, data + dt_offset, pkt_len - dt_offset, pkt_len - dt_offset); - *pad = (((pkt_len + LLC_SNAP_LEN) & 3)) ? (4 - - (((pkt_len + - LLC_SNAP_LEN)) & 3)) : 0; + *pad = (((pkt_len + LLC_SNAP_LEN) & 3)) ? + (4 - (((pkt_len + LLC_SNAP_LEN)) & 3)) : + 0; LEAVE(); return pkt_len + LLC_SNAP_LEN + *pad; @@ -110,8 +106,7 @@ wlan_11n_form_amsdu_pkt(pmlan_adapter pmadapter, t_u8 *amsdu_buf, t_u8 *data, * * @return N/A */ -static void -wlan_11n_form_amsdu_txpd(mlan_private *priv, mlan_buffer *mbuf) +static void wlan_11n_form_amsdu_txpd(mlan_private *priv, mlan_buffer *mbuf) { TxPD *ptx_pd; mlan_adapter *pmadapter = priv->adapter; @@ -150,8 +145,8 @@ wlan_11n_form_amsdu_txpd(mlan_private *priv, mlan_buffer *mbuf) * * @return N/A */ -static INLINE void -wlan_11n_update_pktlen_amsdu_txpd(mlan_private *priv, pmlan_buffer mbuf) +static INLINE void wlan_11n_update_pktlen_amsdu_txpd(mlan_private *priv, + pmlan_buffer mbuf) { TxPD *ptx_pd; ENTER(); @@ -179,8 +174,7 @@ wlan_11n_update_pktlen_amsdu_txpd(mlan_private *priv, pmlan_buffer mbuf) * * @return Number of packets */ -static int -wlan_11n_get_num_aggrpkts(t_u8 *data, int total_pkt_len) +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); @@ -188,15 +182,16 @@ wlan_11n_get_num_aggrpkts(t_u8 *data, int total_pkt_len) 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)))); + 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; + (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; @@ -217,8 +212,7 @@ wlan_11n_get_num_aggrpkts(t_u8 *data, int total_pkt_len) * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_11n_deaggregate_pkt(mlan_private *priv, pmlan_buffer pmbuf) +mlan_status wlan_11n_deaggregate_pkt(mlan_private *priv, pmlan_buffer pmbuf) { t_u16 pkt_len; int total_pkt_len; @@ -229,11 +223,10 @@ wlan_11n_deaggregate_pkt(mlan_private *priv, pmlan_buffer pmbuf) mlan_status ret = MLAN_STATUS_FAILURE; RxPacketHdr_t *prx_pkt; mlan_buffer *daggr_mbuf = MNULL; - t_u8 rfc1042_eth_hdr[MLAN_MAC_ADDR_LENGTH] = { 0xaa, 0xaa, 0x03, - 0x00, 0x00, 0x00 - }; + t_u8 rfc1042_eth_hdr[MLAN_MAC_ADDR_LENGTH] = {0xaa, 0xaa, 0x03, + 0x00, 0x00, 0x00}; t_u8 hdr_len = sizeof(Eth803Hdr_t); - t_u8 eapol_type[2] = { 0x88, 0x8e }; + t_u8 eapol_type[2] = {0x88, 0x8e}; ENTER(); @@ -250,16 +243,18 @@ wlan_11n_deaggregate_pkt(mlan_private *priv, pmlan_buffer pmbuf) MLAN_USB_AGGR_MODE_NUM) { max_rx_data_size *= MAX(MLAN_USB_MAX_PKT_SIZE, - pmadapter->pcard_usb->usb_rx_deaggr. - aggr_ctrl.aggr_align); + pmadapter->pcard_usb->usb_rx_deaggr + .aggr_ctrl.aggr_align); max_rx_data_size = MAX(max_rx_data_size, MLAN_RX_DATA_BUF_SIZE); } } #endif if (total_pkt_len > max_rx_data_size) { - PRINTM(MERROR, "Total packet length greater than tx buffer" - " size %d\n", total_pkt_len); + PRINTM(MERROR, + "Total packet length greater than tx buffer" + " size %d\n", + total_pkt_len); goto done; } @@ -268,8 +263,8 @@ wlan_11n_deaggregate_pkt(mlan_private *priv, pmlan_buffer pmbuf) 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)))); + 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", @@ -279,25 +274,25 @@ wlan_11n_deaggregate_pkt(mlan_private *priv, pmlan_buffer pmbuf) } pad = (((pkt_len + sizeof(Eth803Hdr_t)) & 3)) ? - (4 - ((pkt_len + sizeof(Eth803Hdr_t)) & 3)) : 0; + (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)); + 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; + *(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 + MLAN_NET_IP_ALIGN, 0, - MOAL_ALLOC_MLAN_BUFFER); + daggr_mbuf = wlan_alloc_mlan_buffer(pmadapter, + pkt_len + MLAN_NET_IP_ALIGN, + 0, MOAL_ALLOC_MLAN_BUFFER); if (daggr_mbuf == MNULL) { PRINTM(MERROR, "Error allocating daggr mlan_buffer\n"); ret = MLAN_STATUS_FAILURE; @@ -320,28 +315,28 @@ wlan_11n_deaggregate_pkt(mlan_private *priv, pmlan_buffer pmbuf) ret = wlan_uap_recv_packet(priv, daggr_mbuf); } else { #endif /* UAP_SUPPORT */ - /** send EAPOL from AMSDU pkt to firmware */ + /** send EAPOL from AMSDU pkt to firmware */ if (priv->sec_info.ewpa_enabled && - (!memcmp - (pmadapter, - daggr_mbuf->pbuf + daggr_mbuf->data_offset + - MLAN_ETHER_PKT_TYPE_OFFSET, eapol_type, - sizeof(eapol_type)))) { - ret = wlan_prepare_cmd(priv, - HostCmd_CMD_802_11_EAPOL_PKT, - 0, 0, MNULL, daggr_mbuf); + (!memcmp(pmadapter, + daggr_mbuf->pbuf + + daggr_mbuf->data_offset + + MLAN_ETHER_PKT_TYPE_OFFSET, + eapol_type, sizeof(eapol_type)))) { + ret = wlan_prepare_cmd( + priv, HostCmd_CMD_802_11_EAPOL_PKT, 0, + 0, MNULL, daggr_mbuf); if (ret == MLAN_STATUS_SUCCESS) - wlan_recv_event(priv, - MLAN_EVENT_ID_DRV_DEFER_HANDLING, - MNULL); + wlan_recv_event( + priv, + MLAN_EVENT_ID_DRV_DEFER_HANDLING, + MNULL); wlan_free_mlan_buffer(pmadapter, daggr_mbuf); data += pkt_len + pad; continue; } - 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 */ @@ -365,7 +360,7 @@ wlan_11n_deaggregate_pkt(mlan_private *priv, pmlan_buffer pmbuf) done: priv->msdu_in_rx_amsdu_cnt += pmbuf->use_count; priv->amsdu_rx_cnt++; - /** we should free the aggr buffer after deaggr */ + /** we should free the aggr buffer after deaggr */ pmadapter->ops.data_complete(pmadapter, pmbuf, ret); LEAVE(); return ret; @@ -383,9 +378,8 @@ done: * * @return Final packet size or MLAN_STATUS_FAILURE */ -int -wlan_11n_aggregate_pkt(mlan_private *priv, raListTbl *pra_list, - int headroom, int ptrindex) +int wlan_11n_aggregate_pkt(mlan_private *priv, raListTbl *pra_list, + int headroom, int ptrindex) { int pkt_size = 0; pmlan_adapter pmadapter = priv->adapter; @@ -405,19 +399,17 @@ wlan_11n_aggregate_pkt(mlan_private *priv, raListTbl *pra_list, PRINTM(MDAT_D, "Handling Aggr packet\n"); - pmbuf_src = - (pmlan_buffer)util_peek_list(pmadapter->pmoal_handle, - &pra_list->buf_head, MNULL, MNULL); + 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); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); LEAVE(); return MLAN_STATUS_FAILURE; } @@ -442,18 +434,17 @@ wlan_11n_aggregate_pkt(mlan_private *priv, raListTbl *pra_list, #endif priv->msdu_in_tx_amsdu_cnt++; } else { - 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); 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); + 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--; @@ -462,18 +453,14 @@ wlan_11n_aggregate_pkt(mlan_private *priv, raListTbl *pra_list, 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); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, priv->wmm.ra_list_spinlock); if (pmbuf_src) { - pkt_size += wlan_11n_form_amsdu_pkt(pmadapter, - (data + pkt_size), - pmbuf_src->pbuf + - pmbuf_src-> - data_offset, - pmbuf_src->data_len, - &pad); + 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)); @@ -485,10 +472,9 @@ wlan_11n_aggregate_pkt(mlan_private *priv, raListTbl *pra_list, 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); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); LEAVE(); return MLAN_STATUS_FAILURE; } @@ -509,11 +495,11 @@ wlan_11n_aggregate_pkt(mlan_private *priv, raListTbl *pra_list, 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); + tx_param.next_pkt_len = + ((pmbuf_src) ? pmbuf_src->data_len + sizeof(TxPD) : 0); - ret = pmadapter->ops.host_to_card(priv, MLAN_TYPE_DATA, - pmbuf_aggr, &tx_param); + ret = pmadapter->ops.host_to_card(priv, MLAN_TYPE_DATA, pmbuf_aggr, + &tx_param); switch (ret) { #ifdef USB case MLAN_STATUS_PRESOURCE: @@ -525,10 +511,9 @@ wlan_11n_aggregate_pkt(mlan_private *priv, raListTbl *pra_list, 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); + 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); @@ -557,9 +542,8 @@ wlan_11n_aggregate_pkt(mlan_private *priv, raListTbl *pra_list, 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); + 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; @@ -584,11 +568,10 @@ wlan_11n_aggregate_pkt(mlan_private *priv, raListTbl *pra_list, 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); + 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); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n_aggr.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n_aggr.h index a510065fbc48..96a278312ac2 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n_aggr.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n_aggr.h @@ -32,7 +32,7 @@ Change log: /** Aggregate 11N packets */ 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 wlan_11n_aggregate_pkt(mlan_private *priv, raListTbl *ptr, int headroom, + int ptrindex); #endif /* !_MLAN_11N_AGGR_H_ */ diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n_rxreorder.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n_rxreorder.c index 8618b8c8f557..68dbd07d9f68 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n_rxreorder.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n_rxreorder.c @@ -55,8 +55,8 @@ Change log: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_11n_dispatch_amsdu_pkt(mlan_private *priv, pmlan_buffer pmbuf) +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); @@ -82,8 +82,7 @@ wlan_11n_dispatch_amsdu_pkt(mlan_private *priv, pmlan_buffer pmbuf) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_11n_dispatch_pkt(t_void *priv, t_void *payload) +static mlan_status wlan_11n_dispatch_pkt(t_void *priv, t_void *payload) { mlan_status ret = MLAN_STATUS_SUCCESS; #ifdef STA_SUPPORT @@ -129,9 +128,8 @@ wlan_11n_dispatch_pkt(t_void *priv, t_void *payload) * * @return N/A */ -static void -mlan_11n_rxreorder_timer_restart(pmlan_adapter pmadapter, - RxReorderTbl *rx_reor_tbl_ptr) +static void mlan_11n_rxreorder_timer_restart(pmlan_adapter pmadapter, + RxReorderTbl *rx_reor_tbl_ptr) { t_u16 min_flush_time = 0; ENTER(); @@ -142,15 +140,13 @@ mlan_11n_rxreorder_timer_restart(pmlan_adapter pmadapter, min_flush_time = MIN_FLUSH_TIMER_MS; 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_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_time)); + pmadapter->callbacks.moal_start_timer( + pmadapter->pmoal_handle, rx_reor_tbl_ptr->timer_context.timer, + MFALSE, (rx_reor_tbl_ptr->win_size * min_flush_time)); rx_reor_tbl_ptr->timer_context.timer_is_set = MTRUE; LEAVE(); @@ -166,10 +162,8 @@ mlan_11n_rxreorder_timer_restart(pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_11n_dispatch_pkt_until_start_win(t_void *priv, - RxReorderTbl *rx_reor_tbl_ptr, - int start_win) +static mlan_status wlan_11n_dispatch_pkt_until_start_win( + t_void *priv, RxReorderTbl *rx_reor_tbl_ptr, int start_win) { int no_pkt_to_send, i, xchg; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -179,22 +173,20 @@ wlan_11n_dispatch_pkt_until_start_win(t_void *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; + 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); + 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); + 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); } @@ -213,9 +205,8 @@ wlan_11n_dispatch_pkt_until_start_win(t_void *priv, } rx_reor_tbl_ptr->start_win = start_win; - pmpriv->adapter->callbacks.moal_spin_unlock(pmpriv->adapter-> - pmoal_handle, - pmpriv->rx_pkt_lock); + pmpriv->adapter->callbacks.moal_spin_unlock( + pmpriv->adapter->pmoal_handle, pmpriv->rx_pkt_lock); LEAVE(); return ret; @@ -229,8 +220,8 @@ wlan_11n_dispatch_pkt_until_start_win(t_void *priv, * * @return N/A */ -static t_void -wlan_11n_display_tbl_ptr(pmlan_adapter pmadapter, RxReorderTbl *rx_reor_tbl_ptr) +static t_void wlan_11n_display_tbl_ptr(pmlan_adapter pmadapter, + RxReorderTbl *rx_reor_tbl_ptr) { ENTER(); @@ -250,8 +241,8 @@ wlan_11n_display_tbl_ptr(pmlan_adapter pmadapter, RxReorderTbl *rx_reor_tbl_ptr) * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_11n_scan_and_dispatch(t_void *priv, RxReorderTbl *rx_reor_tbl_ptr) +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; @@ -261,23 +252,18 @@ wlan_11n_scan_and_dispatch(t_void *priv, RxReorderTbl *rx_reor_tbl_ptr) 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); + 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); + 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); + pmpriv->adapter->callbacks.moal_spin_unlock( + pmpriv->adapter->pmoal_handle, pmpriv->rx_pkt_lock); wlan_11n_dispatch_pkt(priv, rx_tmp_ptr); } @@ -296,12 +282,11 @@ wlan_11n_scan_and_dispatch(t_void *priv, RxReorderTbl *rx_reor_tbl_ptr) } } - rx_reor_tbl_ptr->start_win = (rx_reor_tbl_ptr->start_win + i) - & (MAX_TID_VALUE - 1); + 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); + pmpriv->adapter->callbacks.moal_spin_unlock( + pmpriv->adapter->pmoal_handle, pmpriv->rx_pkt_lock); LEAVE(); return ret; } @@ -315,9 +300,8 @@ wlan_11n_scan_and_dispatch(t_void *priv, RxReorderTbl *rx_reor_tbl_ptr) * * @return N/A */ -static t_void -wlan_11n_delete_rxreorder_tbl_entry(mlan_private *priv, - RxReorderTbl *rx_reor_tbl_ptr) +static t_void wlan_11n_delete_rxreorder_tbl_entry(mlan_private *priv, + RxReorderTbl *rx_reor_tbl_ptr) { pmlan_adapter pmadapter = priv->adapter; @@ -329,36 +313,33 @@ wlan_11n_delete_rxreorder_tbl_entry(mlan_private *priv, } mlan_block_rx_process(pmadapter, MTRUE); - 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)); + 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_stop_timer( + pmadapter->pmoal_handle, + rx_reor_tbl_ptr->timer_context.timer); rx_reor_tbl_ptr->timer_context.timer_is_set = MFALSE; } - priv->adapter->callbacks.moal_free_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); rx_reor_tbl_ptr->timer_context.timer = MNULL; } 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, + 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->rx_reorder_ptr); pmadapter->callbacks.moal_mfree(pmadapter->pmoal_handle, (t_u8 *)rx_reor_tbl_ptr); mlan_block_rx_process(pmadapter, MFALSE); @@ -373,8 +354,7 @@ wlan_11n_delete_rxreorder_tbl_entry(mlan_private *priv, * * @return Last used sequence number */ -static int -wlan_11n_find_last_seqnum(RxReorderTbl *rx_reorder_tbl_ptr) +static int wlan_11n_find_last_seqnum(RxReorderTbl *rx_reorder_tbl_ptr) { int i; @@ -397,10 +377,9 @@ wlan_11n_find_last_seqnum(RxReorderTbl *rx_reorder_tbl_ptr) * * @return N/A */ -static t_void -wlan_start_flush_data(mlan_private *priv, RxReorderTbl *rx_reor_tbl_ptr) +static t_void wlan_start_flush_data(mlan_private *priv, + RxReorderTbl *rx_reor_tbl_ptr) { - int startWin; ENTER(); @@ -409,11 +388,10 @@ wlan_start_flush_data(mlan_private *priv, RxReorderTbl *rx_reor_tbl_ptr) startWin = wlan_11n_find_last_seqnum(rx_reor_tbl_ptr); if (startWin >= 0) { PRINTM(MINFO, "Flush data %d\n", startWin); - wlan_11n_dispatch_pkt_until_start_win(priv, rx_reor_tbl_ptr, - ((rx_reor_tbl_ptr-> - start_win + startWin + - 1) & (MAX_TID_VALUE - - 1))); + wlan_11n_dispatch_pkt_until_start_win( + priv, rx_reor_tbl_ptr, + ((rx_reor_tbl_ptr->start_win + startWin + 1) & + (MAX_TID_VALUE - 1))); } wlan_11n_display_tbl_ptr(priv->adapter, rx_reor_tbl_ptr); LEAVE(); @@ -426,8 +404,7 @@ wlan_start_flush_data(mlan_private *priv, RxReorderTbl *rx_reor_tbl_ptr) * * @return N/A */ -static t_void -wlan_flush_data(t_void *context) +static t_void wlan_flush_data(t_void *context) { reorder_tmr_cnxt_t *reorder_cnxt = (reorder_tmr_cnxt_t *)context; ENTER(); @@ -452,9 +429,8 @@ wlan_flush_data(t_void *context) * * @return N/A */ -static t_void -wlan_11n_create_rxreorder_tbl(mlan_private *priv, t_u8 *ta, int tid, - int win_size, int seq_num) +static t_void wlan_11n_create_rxreorder_tbl(mlan_private *priv, t_u8 *ta, + int tid, int win_size, int seq_num) { int i; pmlan_adapter pmadapter = priv->adapter; @@ -476,12 +452,11 @@ wlan_11n_create_rxreorder_tbl(mlan_private *priv, t_u8 *ta, int tid, wlan_11n_delete_rxreorder_tbl_entry(priv, rx_reor_tbl_ptr); } mlan_block_rx_process(pmadapter, MTRUE); - PRINTM(MCMND, "%s: seq_num %d, tid %d, ta " MACSTR - ", win_size %d\n", __func__, - 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(MCMND, "%s: seq_num %d, tid %d, ta " MACSTR ", win_size %d\n", + __func__, 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"); mlan_block_rx_process(pmadapter, MFALSE); LEAVE(); @@ -489,10 +464,11 @@ wlan_11n_create_rxreorder_tbl(mlan_private *priv, t_u8 *ta, int tid, } util_init_list((pmlan_linked_list)new_node); - 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"); + if (pmadapter->callbacks.moal_malloc( + pmadapter->pmoal_handle, sizeof(pmlan_buffer) * 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); mlan_block_rx_process(pmadapter, MFALSE); @@ -554,8 +530,7 @@ wlan_11n_create_rxreorder_tbl(mlan_private *priv, t_u8 *ta, int tid, * * @return A pointer to structure RxReorderTbl */ -RxReorderTbl * -wlan_11n_get_rxreorder_tbl(mlan_private *priv, int tid, t_u8 *ta) +RxReorderTbl *wlan_11n_get_rxreorder_tbl(mlan_private *priv, int tid, t_u8 *ta) { RxReorderTbl *rx_reor_tbl_ptr; @@ -571,9 +546,9 @@ wlan_11n_get_rxreorder_tbl(mlan_private *priv, int tid, t_u8 *ta) } 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)) { + 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; } @@ -586,26 +561,25 @@ wlan_11n_get_rxreorder_tbl(mlan_private *priv, int tid, t_u8 *ta) } /** - * @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 - * - * @return MLAN_STATUS_SUCCESS - */ -mlan_status -wlan_cmd_11n_addba_req(mlan_private *priv, - HostCmd_DS_COMMAND *cmd, t_void *pdata_buf) + * @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 + * + * @return MLAN_STATUS_SUCCESS + */ +mlan_status wlan_cmd_11n_addba_req(mlan_private *priv, 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; + 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); + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_11N_ADDBA_REQ) + S_DS_GEN); memcpy_ext(priv->adapter, padd_ba_req, pdata_buf, sizeof(HostCmd_DS_11N_ADDBA_REQ), @@ -622,37 +596,34 @@ wlan_cmd_11n_addba_req(mlan_private *priv, } /** - * @brief This function check if AMPDU Rx allowed - * - * @param priv A pointer to mlan_private structure - * @param tid TID - * - * @return MTRUE/MFALSE - */ -t_u8 -wlan_is_addba_reject(mlan_private *priv, t_u8 tid) + * @brief This function check if AMPDU Rx allowed + * + * @param priv A pointer to mlan_private structure + * @param tid TID + * + * @return MTRUE/MFALSE + */ +t_u8 wlan_is_addba_reject(mlan_private *priv, t_u8 tid) { #ifdef STA_SUPPORT #endif return priv->addba_reject[tid]; } - /** - * @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 - * - * @return MLAN_STATUS_SUCCESS - */ -mlan_status -wlan_cmd_11n_addba_rspgen(mlan_private *priv, - HostCmd_DS_COMMAND *cmd, void *pdata_buf) + * @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 + * + * @return MLAN_STATUS_SUCCESS + */ +mlan_status wlan_cmd_11n_addba_rspgen(mlan_private *priv, + 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_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; @@ -680,22 +651,22 @@ wlan_cmd_11n_addba_rspgen(mlan_private *priv, 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; + tid = (padd_ba_rsp->block_ack_param_set & BLOCKACKPARAM_TID_MASK) >> + BLOCKACKPARAM_TID_POS; if (wlan_is_addba_reject(priv, tid) #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) - && (util_scalar_read(priv->adapter->pmoal_handle, - &priv->adapter->pending_bridge_pkts, - priv->adapter->callbacks.moal_spin_lock, - priv->adapter->callbacks. - moal_spin_unlock) > RX_LOW_THRESHOLD)) + || ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) && + (util_scalar_read(priv->adapter->pmoal_handle, + &priv->adapter->pending_bridge_pkts, + priv->adapter->callbacks.moal_spin_lock, + priv->adapter->callbacks.moal_spin_unlock) > + RX_LOW_THRESHOLD)) #endif - ) + ) padd_ba_rsp->status_code = wlan_cpu_to_le16(ADDBA_RSP_STATUS_DECLINED); else @@ -707,11 +678,11 @@ wlan_cmd_11n_addba_rspgen(mlan_private *priv, 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; + 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 = @@ -731,20 +702,20 @@ wlan_cmd_11n_addba_rspgen(mlan_private *priv, } /** - * @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 - * - * @return MLAN_STATUS_SUCCESS - */ -mlan_status -wlan_cmd_11n_delba(mlan_private *priv, HostCmd_DS_COMMAND *cmd, void *pdata_buf) + * @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 + * + * @return MLAN_STATUS_SUCCESS + */ +mlan_status wlan_cmd_11n_delba(mlan_private *priv, 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(); @@ -774,9 +745,8 @@ wlan_cmd_11n_delba(mlan_private *priv, HostCmd_DS_COMMAND *cmd, void *pdata_buf) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -mlan_11n_rxreorder_pkt(void *priv, t_u16 seq_num, t_u16 tid, - t_u8 *ta, t_u8 pkt_type, void *payload) +mlan_status mlan_11n_rxreorder_pkt(void *priv, t_u16 seq_num, t_u16 tid, + t_u8 *ta, t_u8 pkt_type, void *payload) { RxReorderTbl *rx_reor_tbl_ptr; int prev_start_win, start_win, end_win, win_size; @@ -821,12 +791,13 @@ mlan_11n_rxreorder_pkt(void *priv, t_u16 seq_num, t_u16 tid, /** drop duplicate packet */ ret = MLAN_STATUS_FAILURE; } else { - /** forward the packet to kernel */ + /** forward the packet to kernel + */ rx_reor_tbl_ptr->last_seq = seq_num; if (pkt_type != PKT_TYPE_BAR) - wlan_11n_dispatch_pkt - (priv, payload); + wlan_11n_dispatch_pkt( + priv, payload); } LEAVE(); return ret; @@ -835,16 +806,16 @@ mlan_11n_rxreorder_pkt(void *priv, t_u16 seq_num, t_u16 tid, 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); + 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)) || + 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 >= @@ -853,40 +824,38 @@ mlan_11n_rxreorder_pkt(void *priv, t_u16 seq_num, t_u16 tid, 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->last_seq, + rx_reor_tbl_ptr + ->start_win, + seq_num); rx_reor_tbl_ptr->start_win = - rx_reor_tbl_ptr-> - last_seq + 1; + 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)) { + 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->last_seq, + rx_reor_tbl_ptr + ->start_win, + seq_num); rx_reor_tbl_ptr->start_win = - rx_reor_tbl_ptr-> - last_seq + 1; + 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)); + 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, @@ -938,63 +907,58 @@ mlan_11n_rxreorder_pkt(void *priv, t_u16 seq_num, t_u16 tid, * WinStart = seq_num */ if (pkt_type == PKT_TYPE_BAR) - seq_num = - ((seq_num + win_size) - 1) & (MAX_TID_VALUE - - 1); + 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)))) { - + 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; - ret = wlan_11n_dispatch_pkt_until_start_win(priv, - rx_reor_tbl_ptr, - start_win); + start_win = + (MAX_TID_VALUE - (win_size - seq_num)) + + 1; + ret = wlan_11n_dispatch_pkt_until_start_win( + priv, rx_reor_tbl_ptr, start_win); if (ret) 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); + 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]) - { + 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] = + 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]) - { + } 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; + rx_reor_tbl_ptr + ->rx_reorder_ptr[(seq_num + + (MAX_TID_VALUE)) - + start_win] = payload; } } @@ -1012,7 +976,6 @@ mlan_11n_rxreorder_pkt(void *priv, t_u16 seq_num, t_u16 tid, 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); } @@ -1033,10 +996,8 @@ done: * * @return N/A */ -void -mlan_11n_delete_bastream_tbl(mlan_private *priv, int tid, - t_u8 *peer_mac, t_u8 type, int initiator, - t_u16 reason_code) +void mlan_11n_delete_bastream_tbl(mlan_private *priv, int tid, t_u8 *peer_mac, + t_u8 type, int initiator, t_u16 reason_code) { RxReorderTbl *rx_reor_tbl_ptr; TxBAStreamTbl *ptxtbl; @@ -1051,9 +1012,10 @@ mlan_11n_delete_bastream_tbl(mlan_private *priv, int tid, else cleanup_rx_reorder_tbl = (initiator) ? MFALSE : MTRUE; - PRINTM(MEVENT, "delete_bastream_tbl: " MACSTR " tid=%d, type=%d" - "initiator=%d reason=%d\n", MAC2STR(peer_mac), tid, type, - initiator, reason_code); + PRINTM(MEVENT, + "delete_bastream_tbl: " MACSTR " tid=%d, type=%d" + "initiator=%d reason=%d\n", + MAC2STR(peer_mac), tid, type, initiator, reason_code); if (cleanup_rx_reorder_tbl) { rx_reor_tbl_ptr = @@ -1088,11 +1050,11 @@ mlan_11n_delete_bastream_tbl(mlan_private *priv, int tid, ra_list->del_ba_count++; ra_list->packet_count = 0; /** after delba, we will try to set up BA again after sending 1k packets*/ -#define MIN_BA_SETUP_PACKET_REQIRED 1024 +#define MIN_BA_SETUP_PACKET_REQIRED 1024 ra_list->ba_packet_threshold = MIN_BA_SETUP_PACKET_REQIRED + - wlan_get_random_ba_threshold(priv-> - adapter); + wlan_get_random_ba_threshold( + priv->adapter); } } } @@ -1109,11 +1071,11 @@ mlan_11n_delete_bastream_tbl(mlan_private *priv, int tid, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_11n_addba_resp(mlan_private *priv, HostCmd_DS_COMMAND *resp) +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; + 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; @@ -1126,8 +1088,8 @@ wlan_ret_11n_addba_resp(mlan_private *priv, HostCmd_DS_COMMAND *resp) 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; + 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 */ @@ -1137,19 +1099,17 @@ wlan_ret_11n_addba_resp(mlan_private *priv, HostCmd_DS_COMMAND *resp) " 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); + ((padd_ba_rsp->block_ack_param_set & + BLOCKACKPARAM_WINSIZE_MASK) >> + BLOCKACKPARAM_WINSIZE_POS), + padd_ba_rsp->block_ack_param_set & + BLOCKACKPARAM_AMSDU_SUPP_MASK); - rx_reor_tbl_ptr = - wlan_11n_get_rxreorder_tbl(priv, tid, - padd_ba_rsp->peer_mac_addr); + rx_reor_tbl_ptr = wlan_11n_get_rxreorder_tbl( + priv, tid, padd_ba_rsp->peer_mac_addr); if (rx_reor_tbl_ptr) { rx_reor_tbl_ptr->ba_status = BA_STREAM_SETUP_COMPLETE; - if ((padd_ba_rsp-> - block_ack_param_set & + if ((padd_ba_rsp->block_ack_param_set & BLOCKACKPARAM_AMSDU_SUPP_MASK) && priv->add_ba_param.rx_amsdu) rx_reor_tbl_ptr->amsdu = MTRUE; @@ -1159,9 +1119,8 @@ wlan_ret_11n_addba_resp(mlan_private *priv, HostCmd_DS_COMMAND *resp) } else { PRINTM(MCMND, "ADDBA RSP: Failed(" MACSTR " tid=%d)\n", MAC2STR(padd_ba_rsp->peer_mac_addr), tid); - rx_reor_tbl_ptr = wlan_11n_get_rxreorder_tbl(priv, tid, - padd_ba_rsp-> - peer_mac_addr); + rx_reor_tbl_ptr = wlan_11n_get_rxreorder_tbl( + priv, tid, padd_ba_rsp->peer_mac_addr); if (rx_reor_tbl_ptr) wlan_11n_delete_rxreorder_tbl_entry(priv, rx_reor_tbl_ptr); @@ -1179,8 +1138,8 @@ wlan_ret_11n_addba_resp(mlan_private *priv, HostCmd_DS_COMMAND *resp) * * @return N/A */ -void -wlan_11n_ba_stream_timeout(mlan_private *priv, HostCmd_DS_11N_BATIMEOUT *event) +void wlan_11n_ba_stream_timeout(mlan_private *priv, + HostCmd_DS_11N_BATIMEOUT *event) { HostCmd_DS_11N_DELBA delba; @@ -1193,8 +1152,8 @@ wlan_11n_ba_stream_timeout(mlan_private *priv, HostCmd_DS_11N_BATIMEOUT *event) MLAN_MAC_ADDR_LENGTH, 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.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); @@ -1209,18 +1168,16 @@ wlan_11n_ba_stream_timeout(mlan_private *priv, HostCmd_DS_11N_BATIMEOUT *event) * * @return N/A */ -void -wlan_11n_cleanup_reorder_tbl(mlan_private *priv) +void wlan_11n_cleanup_reorder_tbl(mlan_private *priv) { RxReorderTbl *del_tbl_ptr; 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))) { + 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); } @@ -1238,8 +1195,7 @@ wlan_11n_cleanup_reorder_tbl(mlan_private *priv) * @param len event_buf length * @return N/A */ -void -wlan_11n_rxba_sync_event(mlan_private *priv, t_u8 *event_buf, t_u16 len) +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; @@ -1262,9 +1218,8 @@ wlan_11n_rxba_sync_event(mlan_private *priv, t_u8 *event_buf, t_u16 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); + 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; @@ -1276,24 +1231,21 @@ wlan_11n_rxba_sync_event(mlan_private *priv, t_u8 *event_buf, t_u16 len) 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); + 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)) - { + 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); @@ -1318,8 +1270,7 @@ done: * @param ta ta to find in reordering table * @return N/A */ -void -wlan_cleanup_reorder_tbl(mlan_private *priv, t_u8 *ta) +void wlan_cleanup_reorder_tbl(mlan_private *priv, t_u8 *ta) { RxReorderTbl *rx_reor_tbl_ptr = MNULL; t_u8 i; @@ -1342,20 +1293,16 @@ wlan_cleanup_reorder_tbl(mlan_private *priv, t_u8 *ta) * * @return N/A */ -void -wlan_set_rxreorder_tbl_no_drop_flag(mlan_private *priv, t_u8 flag) +void wlan_set_rxreorder_tbl_no_drop_flag(mlan_private *priv, t_u8 flag) { 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); + 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; @@ -1377,8 +1324,7 @@ wlan_set_rxreorder_tbl_no_drop_flag(mlan_private *priv, t_u8 flag) * @param flag MTRUE/MFALSE * @return N/A */ -void -wlan_update_rxreorder_tbl(pmlan_adapter pmadapter, t_u8 flag) +void wlan_update_rxreorder_tbl(pmlan_adapter pmadapter, t_u8 flag) { t_u8 i; pmlan_private priv = MNULL; @@ -1399,20 +1345,16 @@ wlan_update_rxreorder_tbl(pmlan_adapter pmadapter, t_u8 flag) * * @return N/A */ -void -wlan_flush_priv_rxreorder_tbl(mlan_private *priv) +void wlan_flush_priv_rxreorder_tbl(mlan_private *priv) { 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); + 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; @@ -1436,8 +1378,7 @@ wlan_flush_priv_rxreorder_tbl(mlan_private *priv) * @param pmadapter A pointer to mlan_adapter * @return N/A */ -void -wlan_flush_rxreorder_tbl(pmlan_adapter pmadapter) +void wlan_flush_rxreorder_tbl(pmlan_adapter pmadapter) { t_u8 i; pmlan_private priv = MNULL; @@ -1458,8 +1399,7 @@ wlan_flush_rxreorder_tbl(pmlan_adapter pmadapter) * * @return N/A */ -void -wlan_update_ampdu_rxwinsize(pmlan_adapter pmadapter, t_u8 coex_flag) +void wlan_update_ampdu_rxwinsize(pmlan_adapter pmadapter, t_u8 coex_flag) { t_u8 i; t_u32 rx_win_size = 0; @@ -1504,9 +1444,10 @@ wlan_update_ampdu_rxwinsize(pmlan_adapter pmadapter, t_u8 coex_flag) if (priv->media_connected == MTRUE) { for (i = 0; i < MAX_NUM_TID; i++) wlan_11n_delba(priv, i); - wlan_recv_event(priv, - MLAN_EVENT_ID_DRV_DEFER_HANDLING, - MNULL); + wlan_recv_event( + priv, + MLAN_EVENT_ID_DRV_DEFER_HANDLING, + MNULL); } } } @@ -1522,8 +1463,7 @@ wlan_update_ampdu_rxwinsize(pmlan_adapter pmadapter, t_u8 coex_flag) * * @return N/A */ -void -wlan_coex_ampdu_rxwinsize(pmlan_adapter pmadapter) +void wlan_coex_ampdu_rxwinsize(pmlan_adapter pmadapter) { t_u8 i; pmlan_private priv = MNULL; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n_rxreorder.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n_rxreorder.h index b4b53c03fd93..7cab4350b1be 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n_rxreorder.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_11n_rxreorder.h @@ -30,52 +30,52 @@ Change log: #define _MLAN_11N_RXREORDER_H_ /** Max value a TID can take = 2^12 = 4096 */ -#define MAX_TID_VALUE (2 << 11) +#define MAX_TID_VALUE (2 << 11) /** 2^11 = 2048 */ -#define TWOPOW11 (2 << 10) +#define TWOPOW11 (2 << 10) /** Tid Mask used for extracting TID from BlockAckParamSet */ -#define BLOCKACKPARAM_TID_MASK 0x3C +#define BLOCKACKPARAM_TID_MASK 0x3C /** Tid position in BlockAckParamSet */ -#define BLOCKACKPARAM_TID_POS 2 +#define BLOCKACKPARAM_TID_POS 2 /** WinSize Mask used for extracting WinSize from BlockAckParamSet */ -#define BLOCKACKPARAM_WINSIZE_MASK 0xffc0 +#define BLOCKACKPARAM_WINSIZE_MASK 0xffc0 /** WinSize Mask used for extracting WinSize from BlockAckParamSet */ -#define BLOCKACKPARAM_AMSDU_SUPP_MASK 0x1 +#define BLOCKACKPARAM_AMSDU_SUPP_MASK 0x1 /** WinSize position in BlockAckParamSet */ -#define BLOCKACKPARAM_WINSIZE_POS 6 +#define BLOCKACKPARAM_WINSIZE_POS 6 /** Position of TID in DelBA Param set */ -#define DELBA_TID_POS 12 +#define DELBA_TID_POS 12 /** Position of INITIATOR in DelBA Param set */ -#define DELBA_INITIATOR_POS 11 +#define DELBA_INITIATOR_POS 11 /** Reason code: Requested from peer STA as it does not want to - * use the mechanism */ -#define REASON_CODE_STA_DONT_WANT 37 + * use the mechanism */ +#define REASON_CODE_STA_DONT_WANT 37 /** Reason code: Requested from peer STA due to timeout*/ -#define REASON_CODE_STA_TIMEOUT 39 +#define REASON_CODE_STA_TIMEOUT 39 /** Type: send delba command */ -#define TYPE_DELBA_SENT 1 +#define TYPE_DELBA_SENT 1 /** Type: recieve delba command */ -#define TYPE_DELBA_RECEIVE 2 +#define TYPE_DELBA_RECEIVE 2 /** Set Initiator Bit */ -#define DELBA_INITIATOR(paramset) (paramset = (paramset | (1 << 11))) +#define DELBA_INITIATOR(paramset) (paramset = (paramset | (1 << 11))) /** Reset Initiator Bit for recipient */ -#define DELBA_RECIPIENT(paramset) (paramset = (paramset & ~(1 << 11))) +#define DELBA_RECIPIENT(paramset) (paramset = (paramset & ~(1 << 11))) /** Immediate block ack */ -#define IMMEDIATE_BLOCK_ACK 0x2 +#define IMMEDIATE_BLOCK_ACK 0x2 /** The request has been declined */ -#define ADDBA_RSP_STATUS_DECLINED 37 +#define ADDBA_RSP_STATUS_DECLINED 37 /** ADDBA response status : Reject */ #define ADDBA_RSP_STATUS_REJECT 1 /** ADDBA response status : Accept */ #define ADDBA_RSP_STATUS_ACCEPT 0 /** DEFAULT SEQ NUM */ -#define DEFAULT_SEQ_NUM 0xffff +#define DEFAULT_SEQ_NUM 0xffff /** Indicate packet has been dropped in FW */ -#define RX_PKT_DROPPED_IN_FW 0xffffffff +#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); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_cfp.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_cfp.c index f84a1522c66c..995176b30070 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_cfp.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_cfp.c @@ -23,9 +23,9 @@ */ /************************************************************* -Change Log: - 04/16/2009: initial version -************************************************************/ + * Change Log: + * 04/16/2009: initial version + ************************************************************/ #include "mlan.h" #include "mlan_util.h" @@ -34,88 +34,86 @@ Change Log: #include "mlan_main.h" /******************************************************** - Local Variables -********************************************************/ + * Local Variables + ********************************************************/ /** 100mW */ -#define WLAN_TX_PWR_DEFAULT 20 +#define WLAN_TX_PWR_DEFAULT 20 /** 100mW */ -#define WLAN_TX_PWR_00_DEFAULT 20 +#define WLAN_TX_PWR_00_DEFAULT 20 /** 100mW */ -#define WLAN_TX_PWR_US_DEFAULT 20 +#define WLAN_TX_PWR_US_DEFAULT 20 /** 100mW */ -#define WLAN_TX_PWR_JP_BG_DEFAULT 20 +#define WLAN_TX_PWR_JP_BG_DEFAULT 20 /** 200mW */ -#define WLAN_TX_PWR_JP_A_DEFAULT 23 +#define WLAN_TX_PWR_JP_A_DEFAULT 23 /** 100mW */ -#define WLAN_TX_PWR_FR_100MW 20 +#define WLAN_TX_PWR_FR_100MW 20 /** 10mW */ -#define WLAN_TX_PWR_FR_10MW 10 +#define WLAN_TX_PWR_FR_10MW 10 /** 100mW */ -#define WLAN_TX_PWR_EMEA_DEFAULT 20 +#define WLAN_TX_PWR_EMEA_DEFAULT 20 /** 2000mW */ -#define WLAN_TX_PWR_CN_2000MW 33 +#define WLAN_TX_PWR_CN_2000MW 33 /** 200mW */ -#define WLAN_TX_PWR_200MW 23 +#define WLAN_TX_PWR_200MW 23 /** 1000mW */ -#define WLAN_TX_PWR_1000MW 30 +#define WLAN_TX_PWR_1000MW 30 /** 30mW */ -#define WLAN_TX_PWR_SP_30MW 14 +#define WLAN_TX_PWR_SP_30MW 14 /** 60mW */ -#define WLAN_TX_PWR_SP_60MW 17 +#define WLAN_TX_PWR_SP_60MW 17 /** 25mW */ -#define WLAN_TX_PWR_25MW 14 +#define WLAN_TX_PWR_25MW 14 /** 250mW */ -#define WLAN_TX_PWR_250MW 24 +#define WLAN_TX_PWR_250MW 24 /** Region code mapping */ typedef struct _country_code_mapping { - /** Region */ + /** Region */ t_u8 country_code[COUNTRY_CODE_LEN]; - /** Code for B/G CFP table */ + /** Code for B/G CFP table */ t_u8 cfp_code_bg; - /** Code for A CFP table */ + /** Code for A CFP table */ t_u8 cfp_code_a; } country_code_mapping_t; -#define EU_CFP_CODE_BG 0x30 -#define EU_CFP_CODE_A 0x30 +#define EU_CFP_CODE_BG 0x30 +#define EU_CFP_CODE_A 0x30 /** Region code mapping table */ static country_code_mapping_t country_code_mapping[] = { - {"WW", 0x00, 0x00}, /* World */ - {"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 */ - {"JP", 0xFF, 0x40}, /* Japan */ - {"CN", 0x30, 0x50}, /* China */ - {"BR", 0x01, 0x09}, /* Brazil */ - {"RU", 0x30, 0x0f}, /* Russia */ - {"IN", 0x10, 0x06}, /* India */ - {"MY", 0x30, 0x06}, /* Malaysia */ + {"WW", 0x00, 0x00}, /* World */ + {"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 */ + {"JP", 0xFF, 0x40}, /* Japan */ + {"CN", 0x30, 0x50}, /* China */ + {"BR", 0x01, 0x09}, /* Brazil */ + {"RU", 0x30, 0x0f}, /* Russia */ + {"IN", 0x10, 0x06}, /* India */ + {"MY", 0x30, 0x06}, /* Malaysia */ }; /** Country code for ETSI */ static t_u8 eu_country_code_table[][COUNTRY_CODE_LEN] = { - "AL", "AD", "AT", "AU", "BY", "BE", "BA", "BG", "HR", "CY", - "CZ", "DK", "EE", "FI", "FR", "MK", "DE", "GR", "HU", "IS", - "IE", "IT", "KR", "LV", "LI", "LT", "LU", "MT", "MD", "MC", - "ME", "NL", "NO", "PL", "RO", "RU", "SM", "RS", "SI", "SK", - "ES", "SE", "CH", "TR", "UA", "UK", "GB" -}; + "AL", "AD", "AT", "AU", "BY", "BE", "BA", "BG", "HR", "CY", "CZ", "DK", + "EE", "FI", "FR", "MK", "DE", "GR", "HU", "IS", "IE", "IT", "KR", "LV", + "LI", "LT", "LU", "MT", "MD", "MC", "ME", "NL", "NO", "PL", "RO", "RU", + "SM", "RS", "SI", "SK", "ES", "SE", "CH", "TR", "UA", "UK", "GB"}; /** * The structure for Channel-Frequency-Power table */ typedef struct _cfp_table { - /** Region or Code */ + /** Region or Code */ t_u8 code; - /** Frequency/Power */ + /** Frequency/Power */ chan_freq_power_t *cfp; - /** No of CFP flag */ + /** No of CFP flag */ int cfp_no; } cfp_table_t; @@ -132,8 +130,7 @@ static chan_freq_power_t channel_freq_power_00_BG[] = { {8, 2447, WLAN_TX_PWR_00_DEFAULT, MFALSE}, {9, 2452, WLAN_TX_PWR_00_DEFAULT, MFALSE}, {10, 2457, WLAN_TX_PWR_00_DEFAULT, MFALSE}, - {11, 2462, WLAN_TX_PWR_00_DEFAULT, MFALSE} -}; + {11, 2462, WLAN_TX_PWR_00_DEFAULT, MFALSE}}; /* Format { Channel, Frequency (MHz), MaxTxPower } */ /** Band: 'B/G', Region: USA FCC/Canada IC */ @@ -148,8 +145,7 @@ static chan_freq_power_t channel_freq_power_US_BG[] = { {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} -}; + {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[] = { @@ -165,8 +161,7 @@ static chan_freq_power_t channel_freq_power_EU_BG[] = { {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} -}; + {13, 2472, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}}; /** Band: 'B/G', Region: Japan */ static chan_freq_power_t channel_freq_power_JPN41_BG[] = { @@ -182,13 +177,11 @@ static chan_freq_power_t channel_freq_power_JPN41_BG[] = { {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} -}; + {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[] = { @@ -204,8 +197,7 @@ static chan_freq_power_t channel_freq_power_JPNFE_BG[] = { {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} -}; + {13, 2472, WLAN_TX_PWR_JP_BG_DEFAULT, MTRUE}}; /** Band : 'B/G', Region: Brazil */ static chan_freq_power_t channel_freq_power_BR_BG[] = { @@ -239,60 +231,67 @@ static chan_freq_power_t channel_freq_power_SPECIAL_BG[] = { {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} -}; + {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, - NELEMENTS(channel_freq_power_BR_BG), - }, - {0x00, /* World FCC */ - channel_freq_power_00_BG, - NELEMENTS(channel_freq_power_00_BG), - }, - {0x10, /* US FCC */ - channel_freq_power_US_BG, - NELEMENTS(channel_freq_power_US_BG), - }, - {0x20, /* CANADA IC */ - channel_freq_power_US_BG, - NELEMENTS(channel_freq_power_US_BG), - }, - {0x30, /* EU */ - channel_freq_power_EU_BG, - NELEMENTS(channel_freq_power_EU_BG), - }, - {0x40, /* JAPAN */ - channel_freq_power_JPN40_BG, - NELEMENTS(channel_freq_power_JPN40_BG), - }, - {0x41, /* JAPAN */ - channel_freq_power_JPN41_BG, - NELEMENTS(channel_freq_power_JPN41_BG), - }, - {0x50, /* China */ - channel_freq_power_EU_BG, - NELEMENTS(channel_freq_power_EU_BG), - }, + 0x01, /* Brazil */ + channel_freq_power_BR_BG, + NELEMENTS(channel_freq_power_BR_BG), + }, { - 0xfe, /* JAPAN */ - channel_freq_power_JPNFE_BG, - NELEMENTS(channel_freq_power_JPNFE_BG), - }, - {0xff, /* Special */ - channel_freq_power_SPECIAL_BG, - NELEMENTS(channel_freq_power_SPECIAL_BG), - }, -/* Add new region here */ + 0x00, /* World FCC */ + channel_freq_power_00_BG, + NELEMENTS(channel_freq_power_00_BG), + }, + { + 0x10, /* US FCC */ + channel_freq_power_US_BG, + NELEMENTS(channel_freq_power_US_BG), + }, + { + 0x20, /* CANADA IC */ + channel_freq_power_US_BG, + NELEMENTS(channel_freq_power_US_BG), + }, + { + 0x30, /* EU */ + channel_freq_power_EU_BG, + NELEMENTS(channel_freq_power_EU_BG), + }, + { + 0x40, /* JAPAN */ + channel_freq_power_JPN40_BG, + NELEMENTS(channel_freq_power_JPN40_BG), + }, + { + 0x41, /* JAPAN */ + channel_freq_power_JPN41_BG, + NELEMENTS(channel_freq_power_JPN41_BG), + }, + { + 0x50, /* China */ + channel_freq_power_EU_BG, + NELEMENTS(channel_freq_power_EU_BG), + }, + { + 0xfe, /* JAPAN */ + channel_freq_power_JPNFE_BG, + NELEMENTS(channel_freq_power_JPNFE_BG), + }, + { + 0xff, /* Special */ + channel_freq_power_SPECIAL_BG, + NELEMENTS(channel_freq_power_SPECIAL_BG), + }, + /* Add new region here */ }; /** Number of the CFP tables for 2.4GHz */ -#define MLAN_CFP_TABLE_SIZE_BG (NELEMENTS(cfp_table_BG)) +#define MLAN_CFP_TABLE_SIZE_BG (NELEMENTS(cfp_table_BG)) /* Format { Channel, Frequency (MHz), MaxTxPower, DFS } */ /** Band: 'A', Region: World FCC */ @@ -318,8 +317,7 @@ static chan_freq_power_t channel_freq_power_00_A[] = { {153, 5765, WLAN_TX_PWR_00_DEFAULT, MFALSE}, {157, 5785, WLAN_TX_PWR_00_DEFAULT, MFALSE}, {161, 5805, WLAN_TX_PWR_00_DEFAULT, MFALSE}, - {165, 5825, WLAN_TX_PWR_00_DEFAULT, MFALSE} -}; + {165, 5825, WLAN_TX_PWR_00_DEFAULT, MFALSE}}; /* Format { Channel, Frequency (MHz), MaxTxPower, DFS } */ /** Band: 'A', Region: USA FCC */ @@ -348,8 +346,7 @@ static chan_freq_power_t channel_freq_power_A[] = { {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} -}; + {165, 5825, WLAN_TX_PWR_US_DEFAULT, MFALSE}}; /** Band: 'A', Region: Canada IC */ static chan_freq_power_t channel_freq_power_CAN_A[] = { @@ -374,8 +371,7 @@ static chan_freq_power_t channel_freq_power_CAN_A[] = { {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} -}; + {165, 5825, WLAN_TX_PWR_US_DEFAULT, MFALSE}}; /** Band: 'A', Region: Europe ETSI */ static chan_freq_power_t channel_freq_power_EU_A[] = { @@ -402,8 +398,7 @@ static chan_freq_power_t channel_freq_power_EU_A[] = { {153, 5765, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, {157, 5785, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, {161, 5805, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}, - {165, 5825, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE} -}; + {165, 5825, WLAN_TX_PWR_EMEA_DEFAULT, MFALSE}}; /** Band: 'A', Region: Japan */ static chan_freq_power_t channel_freq_power_JPN_A[] = { @@ -425,8 +420,7 @@ static chan_freq_power_t channel_freq_power_JPN_A[] = { {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} -}; + {140, 5700, WLAN_TX_PWR_JP_A_DEFAULT, MTRUE}}; /** Band: 'A', Region: China */ static chan_freq_power_t channel_freq_power_CN_A[] = { @@ -442,12 +436,10 @@ static chan_freq_power_t channel_freq_power_CN_A[] = { {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} -}; + {165, 5825, WLAN_TX_PWR_CN_2000MW, MFALSE}}; /** Band: 'A', NULL */ -static chan_freq_power_t channel_freq_power_NULL_A[] = { -}; +static chan_freq_power_t channel_freq_power_NULL_A[] = {}; /** Band: 'A', Region: Spain/Austria/Brazil */ static chan_freq_power_t channel_freq_power_SPN2_A[] = { @@ -482,8 +474,7 @@ static chan_freq_power_t channel_freq_power_BR2_A[] = { {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} -}; + {165, 5825, WLAN_TX_PWR_1000MW, MFALSE}}; /** Band: 'A', Region: Russia */ static chan_freq_power_t channel_freq_power_RU_A[] = { @@ -541,11 +532,11 @@ static chan_freq_power_t channel_freq_power_high_band[] = { {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} -}; + {165, 5825, WLAN_TX_PWR_DEFAULT, MFALSE}}; /** Band: 'A', Code: 5, Low band (5150-5250 MHz) and - * High band (5725-5850 MHz) channels */ + * 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}, @@ -555,11 +546,11 @@ static chan_freq_power_t channel_freq_power_low_high_band[] = { {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} -}; + {165, 5825, WLAN_TX_PWR_DEFAULT, MFALSE}}; /** Band: 'A', Code: 6, Low band (5150-5250 MHz) and - * mid low (5260-5320) and High band (5725-5850 MHz) channels */ + * mid low (5260-5320) and High band (5725-5850 MHz) channels + */ static chan_freq_power_t channel_freq_power_low_middle_high_band[] = { {36, 5180, WLAN_TX_PWR_DEFAULT, MFALSE}, {40, 5200, WLAN_TX_PWR_DEFAULT, MFALSE}, @@ -573,140 +564,148 @@ static chan_freq_power_t channel_freq_power_low_middle_high_band[] = { {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} -}; + {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, - NELEMENTS(channel_freq_power_low_band) - }, - {0x2, /* Lower middle band (5250-5350 MHz) channels */ + {0x1, /* Low band (5150-5250 MHz) channels */ + channel_freq_power_low_band, NELEMENTS(channel_freq_power_low_band)}, + {0x2, /* Lower middle band (5250-5350 MHz) channels */ channel_freq_power_lower_middle_band, - NELEMENTS(channel_freq_power_lower_middle_band) - }, - {0x3, /* Upper middle band (5470-5725 MHz) channels */ + NELEMENTS(channel_freq_power_lower_middle_band)}, + {0x3, /* Upper middle band (5470-5725 MHz) channels */ channel_freq_power_upper_middle_band, - NELEMENTS(channel_freq_power_upper_middle_band) - }, - {0x4, /* High band (5725-5850 MHz) channels */ - channel_freq_power_high_band, - NELEMENTS(channel_freq_power_high_band) - }, - {0x5, /* Low band (5150-5250 MHz) and - High band (5725-5850 MHz) channels */ + NELEMENTS(channel_freq_power_upper_middle_band)}, + {0x4, /* High band (5725-5850 MHz) channels */ + channel_freq_power_high_band, NELEMENTS(channel_freq_power_high_band)}, + {0x5, /* Low band (5150-5250 MHz) and + * High band (5725-5850 MHz) channels + */ channel_freq_power_low_high_band, - NELEMENTS(channel_freq_power_low_high_band) - }, - {0x6, /* Low band (5150-5250 MHz) - Mid band (5260-5320) and - High band (5725-5850 MHz) channels */ + NELEMENTS(channel_freq_power_low_high_band)}, + {0x6, /* Low band (5150-5250 MHz) + * Mid band (5260-5320) and + * High band (5725-5850 MHz) channels + */ channel_freq_power_low_middle_high_band, - NELEMENTS(channel_freq_power_low_middle_high_band) - }, - {0x09, /* SPAIN/Austria/Brazil */ - channel_freq_power_SPN2_A, - NELEMENTS(channel_freq_power_SPN2_A), - }, - {0x0c, /* Brazil */ - channel_freq_power_BR1_A, - NELEMENTS(channel_freq_power_BR1_A), - }, - {0x0e, /* Brazil */ - channel_freq_power_BR2_A, - NELEMENTS(channel_freq_power_BR2_A), - }, - {0x0f, /* Russia */ - channel_freq_power_RU_A, - NELEMENTS(channel_freq_power_RU_A), - }, - {0x00, /* World */ - channel_freq_power_00_A, - NELEMENTS(channel_freq_power_00_A), - }, - {0x10, /* US FCC */ - channel_freq_power_A, - NELEMENTS(channel_freq_power_A), - }, - {0x20, /* CANADA IC */ - channel_freq_power_CAN_A, - NELEMENTS(channel_freq_power_CAN_A), - }, - {0x30, /* EU */ - channel_freq_power_EU_A, - NELEMENTS(channel_freq_power_EU_A), - }, - {0x40, /* JAPAN */ - channel_freq_power_JPN_A, - NELEMENTS(channel_freq_power_JPN_A), - }, - {0x41, /* JAPAN */ - channel_freq_power_JPN_A, - NELEMENTS(channel_freq_power_JPN_A), - }, - {0x50, /* China */ - channel_freq_power_CN_A, - NELEMENTS(channel_freq_power_CN_A), - }, - {0xfe, /* JAPAN */ - channel_freq_power_NULL_A, - NELEMENTS(channel_freq_power_NULL_A), - }, - {0xff, /* Special */ - channel_freq_power_JPN_A, - NELEMENTS(channel_freq_power_JPN_A), - }, -/* Add new region here */ + NELEMENTS(channel_freq_power_low_middle_high_band)}, + { + 0x09, /* SPAIN/Austria/Brazil */ + channel_freq_power_SPN2_A, + NELEMENTS(channel_freq_power_SPN2_A), + }, + { + 0x0c, /* Brazil */ + channel_freq_power_BR1_A, + NELEMENTS(channel_freq_power_BR1_A), + }, + { + 0x0e, /* Brazil */ + channel_freq_power_BR2_A, + NELEMENTS(channel_freq_power_BR2_A), + }, + { + 0x0f, /* Russia */ + channel_freq_power_RU_A, + NELEMENTS(channel_freq_power_RU_A), + }, + { + 0x00, /* World */ + channel_freq_power_00_A, + NELEMENTS(channel_freq_power_00_A), + }, + { + 0x10, /* US FCC */ + channel_freq_power_A, + NELEMENTS(channel_freq_power_A), + }, + { + 0x20, /* CANADA IC */ + channel_freq_power_CAN_A, + NELEMENTS(channel_freq_power_CAN_A), + }, + { + 0x30, /* EU */ + channel_freq_power_EU_A, + NELEMENTS(channel_freq_power_EU_A), + }, + { + 0x40, /* JAPAN */ + channel_freq_power_JPN_A, + NELEMENTS(channel_freq_power_JPN_A), + }, + { + 0x41, /* JAPAN */ + channel_freq_power_JPN_A, + NELEMENTS(channel_freq_power_JPN_A), + }, + { + 0x50, /* China */ + channel_freq_power_CN_A, + NELEMENTS(channel_freq_power_CN_A), + }, + { + 0xfe, /* JAPAN */ + channel_freq_power_NULL_A, + NELEMENTS(channel_freq_power_NULL_A), + }, + { + 0xff, /* Special */ + channel_freq_power_JPN_A, + NELEMENTS(channel_freq_power_JPN_A), + }, + /* Add new region here */ }; - /** Number of the CFP tables for 5GHz */ -#define MLAN_CFP_TABLE_SIZE_A (NELEMENTS(cfp_table_A)) +#define MLAN_CFP_TABLE_SIZE_A (NELEMENTS(cfp_table_A)) -enum { - RATEID_DBPSK1Mbps, //(0) - RATEID_DQPSK2Mbps, //(1) - RATEID_CCK5_5Mbps, //(2) - RATEID_CCK11Mbps, //(3) - RATEID_CCK22Mbps, //(4) - RATEID_OFDM6Mbps, //(5) - RATEID_OFDM9Mbps, //(6) - RATEID_OFDM12Mbps, //(7) - RATEID_OFDM18Mbps, //(8) - RATEID_OFDM24Mbps, //(9) - RATEID_OFDM36Mbps, //(10) - RATEID_OFDM48Mbps, //(11) - RATEID_OFDM54Mbps, //(12) - RATEID_OFDM72Mbps, //(13) +enum { RATEID_DBPSK1Mbps, //(0) + RATEID_DQPSK2Mbps, //(1) + RATEID_CCK5_5Mbps, //(2) + RATEID_CCK11Mbps, //(3) + RATEID_CCK22Mbps, //(4) + RATEID_OFDM6Mbps, //(5) + RATEID_OFDM9Mbps, //(6) + RATEID_OFDM12Mbps, //(7) + RATEID_OFDM18Mbps, //(8) + RATEID_OFDM24Mbps, //(9) + RATEID_OFDM36Mbps, //(10) + RATEID_OFDM48Mbps, //(11) + RATEID_OFDM54Mbps, //(12) + RATEID_OFDM72Mbps, //(13) }; static const t_u8 rateUnit_500Kbps[] = { - (10 / 5), /* 1Mbps */ - (20 / 5), /* 2Mbps */ + (10 / 5), /* 1Mbps */ + (20 / 5), /* 2Mbps */ - (55 / 5), /* 5.5Mbps */ - (110 / 5), /* 11Mbps */ - (10 / 5), /* 22Mbps, intentionally set to 1Mbps because it's not available */ + (55 / 5), /* 5.5Mbps */ + (110 / 5), /* 11Mbps */ + (10 / 5), /* 22Mbps, intentionally set to 1Mbps + * because it's not available + */ - (60 / 5), /* 6Mbps */ - (90 / 5), /* 9Mbps */ - (120 / 5), /* 12Mbps */ - (180 / 5), /* 18Mbps */ - (240 / 5), /* 24Mbps */ - (360 / 5), /* 36Mbps */ - (480 / 5), /* 48Mbps */ - (540 / 5), /* 54Mbps */ - (60 / 5), /* 72Mbps intentionally set to 6Mbps because it's not available */ + (60 / 5), /* 6Mbps */ + (90 / 5), /* 9Mbps */ + (120 / 5), /* 12Mbps */ + (180 / 5), /* 18Mbps */ + (240 / 5), /* 24Mbps */ + (360 / 5), /* 36Mbps */ + (480 / 5), /* 48Mbps */ + (540 / 5), /* 54Mbps */ + (60 / 5), /* 72Mbps, intentionally set to 6Mbps + * because it's not available + */ }; typedef struct _rate_map { - /** Rate, in 0.5Mbps */ + /** Rate, in 0.5Mbps */ t_u32 rate; - /** Mrvl rate id, refer to RATEID_XXX in FW */ + /** Mrvl rate id, refer to RATEID_XXX in FW */ t_u32 id; - /** nss: 0-nss1, 1-nss2 */ + /** nss: 0-nss1, 1-nss2 */ t_u8 nss; } rate_map; @@ -715,367 +714,408 @@ typedef struct _rate_map { */ const rate_map rate_map_table_2x2[] = { /* LG <--> Mrvl rate idx */ - {2, 0, 0}, //RATEID_DBPSK1Mbps - {4, 1, 0}, //RATEID_DQPSK2Mbps - {11, 2, 0}, //RATEID_CCK5_5Mbps - {22, 3, 0}, //RATEID_CCK11Mbps - {44, 4, 0}, //RATEID_CCK22Mbps - {12, 5, 0}, //RATEID_OFDM6Mbps - {18, 6, 0}, //RATEID_OFDM9Mbps - {24, 7, 0}, //RATEID_OFDM12Mbps - {36, 8, 0}, //RATEID_OFDM18Mbps - {48, 9, 0}, //RATEID_OFDM24Mbps - {72, 10, 0}, //RATEID_OFDM36Mbps - {96, 11, 0}, //RATEID_OFDM48Mbps - {108, 12, 0}, //RATEID_OFDM54Mbps - {144, 13, 0}, //RATEID_OFDM72Mbps + {2, 0, 0}, // RATEID_DBPSK1Mbps + {4, 1, 0}, // RATEID_DQPSK2Mbps + {11, 2, 0}, // RATEID_CCK5_5Mbps + {22, 3, 0}, // RATEID_CCK11Mbps + {44, 4, 0}, // RATEID_CCK22Mbps + {12, 5, 0}, // RATEID_OFDM6Mbps + {18, 6, 0}, // RATEID_OFDM9Mbps + {24, 7, 0}, // RATEID_OFDM12Mbps + {36, 8, 0}, // RATEID_OFDM18Mbps + {48, 9, 0}, // RATEID_OFDM24Mbps + {72, 10, 0}, // RATEID_OFDM36Mbps + {96, 11, 0}, // RATEID_OFDM48Mbps + {108, 12, 0}, // RATEID_OFDM54Mbps + {144, 13, 0}, // RATEID_OFDM72Mbps /* HT bw20 <--> Mrvl rate idx - nss2 */ - {26, 22, 1}, //RATEID_MCS8_13Mbps - {52, 23, 1}, //RATEID_MCS9_26Mbps - {78, 24, 1}, //RATEID_MCS10_39Mbps - {104, 25, 1}, //RATEID_MCS11_52Mbps - {156, 26, 1}, //RATEID_MCS12_78Mbps - {208, 27, 1}, //RATEID_MCS13_104Mbps - {234, 28, 1}, //RATEID_MCS14_117Mbps - {260, 29, 1}, //RATEID_MCS15_130Mbps + {26, 22, 1}, // RATEID_MCS8_13Mbps + {52, 23, 1}, // RATEID_MCS9_26Mbps + {78, 24, 1}, // RATEID_MCS10_39Mbps + {104, 25, 1}, // RATEID_MCS11_52Mbps + {156, 26, 1}, // RATEID_MCS12_78Mbps + {208, 27, 1}, // RATEID_MCS13_104Mbps + {234, 28, 1}, // RATEID_MCS14_117Mbps + {260, 29, 1}, // RATEID_MCS15_130Mbps /* HT bw20 <--> Mrvl rate idx - nss1 */ - {13, 14, 0}, //RATEID_MCS0_6d5Mbps - {26, 15, 0}, //RATEID_MCS1_13Mbps - {39, 16, 0}, //RATEID_MCS2_19d5Mbps - {52, 17, 0}, //RATEID_MCS3_26Mbps - {78, 18, 0}, //RATEID_MCS4_39Mbps - {104, 19, 0}, //RATEID_MCS5_52Mbps - {117, 20, 0}, //RATEID_MCS6_58d5Mbps - {130, 21, 0}, //RATEID_MCS7_65Mbps + {13, 14, 0}, // RATEID_MCS0_6d5Mbps + {26, 15, 0}, // RATEID_MCS1_13Mbps + {39, 16, 0}, // RATEID_MCS2_19d5Mbps + {52, 17, 0}, // RATEID_MCS3_26Mbps + {78, 18, 0}, // RATEID_MCS4_39Mbps + {104, 19, 0}, // RATEID_MCS5_52Mbps + {117, 20, 0}, // RATEID_MCS6_58d5Mbps + {130, 21, 0}, // RATEID_MCS7_65Mbps /* HT bw40<--> Mrvl rate idx - nss2 */ - {54, 39, 1}, //RATEID_MCS8BW40_27Mbps - {108, 40, 1}, //RATEID_MCS9BW40_54Mbps - {162, 41, 1}, //RATEID_MCS10BW40_81Mbps - {216, 42, 1}, //RATEID_MCS11BW40_108Mbps - {324, 43, 1}, //RATEID_MCS12BW40_162Mbps - {432, 44, 1}, //RATEID_MCS13BW40_216Mbps - {486, 45, 1}, //RATEID_MCS14BW40_243Mbps - {540, 46, 1}, //RATEID_MCS15BW40_270Mbps + {54, 39, 1}, // RATEID_MCS8BW40_27Mbps + {108, 40, 1}, // RATEID_MCS9BW40_54Mbps + {162, 41, 1}, // RATEID_MCS10BW40_81Mbps + {216, 42, 1}, // RATEID_MCS11BW40_108Mbps + {324, 43, 1}, // RATEID_MCS12BW40_162Mbps + {432, 44, 1}, // RATEID_MCS13BW40_216Mbps + {486, 45, 1}, // RATEID_MCS14BW40_243Mbps + {540, 46, 1}, // RATEID_MCS15BW40_270Mbps /* HT bw40<--> Mrvl rate idx - nss1 */ - {12, 30, 0}, //RATEID_MCS32BW40_6Mbps - {27, 31, 0}, //RATEID_MCS0BW40_13d5Mbps - {54, 32, 0}, //RATEID_MCS1BW40_27Mbps - {81, 33, 0}, //RATEID_MCS2BW40_40d5Mbps - {108, 34, 0}, //RATEID_MCS3BW40_54Mbps - {162, 35, 0}, //RATEID_MCS4BW40_81Mbps - {216, 36, 0}, //RATEID_MCS5BW40_108Mbps - {243, 37, 0}, //RATEID_MCS6BW40_121d5Mbps - {270, 38, 0}, //RATEID_MCS7BW40_135Mbps + {12, 30, 0}, // RATEID_MCS32BW40_6Mbps + {27, 31, 0}, // RATEID_MCS0BW40_13d5Mbps + {54, 32, 0}, // RATEID_MCS1BW40_27Mbps + {81, 33, 0}, // RATEID_MCS2BW40_40d5Mbps + {108, 34, 0}, // RATEID_MCS3BW40_54Mbps + {162, 35, 0}, // RATEID_MCS4BW40_81Mbps + {216, 36, 0}, // RATEID_MCS5BW40_108Mbps + {243, 37, 0}, // RATEID_MCS6BW40_121d5Mbps + {270, 38, 0}, // RATEID_MCS7BW40_135Mbps /* VHT bw20<--> Mrvl rate idx - nss2 */ - {26, 57, 1}, //RATEID_VHT_MCS0_2SS_BW20 13 Mbps - {52, 58, 1}, //RATEID_VHT_MCS1_2SS_BW20 26 Mbps - {78, 59, 1}, //RATEID_VHT_MCS2_2SS_BW20 39 Mbps - {104, 60, 1}, //RATEID_VHT_MCS3_2SS_BW20 52 Mbps - {156, 61, 1}, //RATEID_VHT_MCS4_2SS_BW20 78 Mbps - {208, 62, 1}, //RATEID_VHT_MCS5_2SS_BW20 104 Mbps - {234, 63, 1}, //RATEID_VHT_MCS6_2SS_BW20 117 Mbps - {260, 64, 1}, //RATEID_VHT_MCS7_2SS_BW20 130 Mbps - {312, 65, 1}, //RATEID_VHT_MCS8_2SS_BW20 156 Mbps - {0, 66, 1}, //RATEID_VHT_MCS9_2SS_BW20 173.3 Mbps(INVALID) + {26, 57, 1}, // RATEID_VHT_MCS0_2SS_BW20 13 Mbps + {52, 58, 1}, // RATEID_VHT_MCS1_2SS_BW20 26 Mbps + {78, 59, 1}, // RATEID_VHT_MCS2_2SS_BW20 39 Mbps + {104, 60, 1}, // RATEID_VHT_MCS3_2SS_BW20 52 Mbps + {156, 61, 1}, // RATEID_VHT_MCS4_2SS_BW20 78 Mbps + {208, 62, 1}, // RATEID_VHT_MCS5_2SS_BW20 104 Mbps + {234, 63, 1}, // RATEID_VHT_MCS6_2SS_BW20 117 Mbps + {260, 64, 1}, // RATEID_VHT_MCS7_2SS_BW20 130 Mbps + {312, 65, 1}, // RATEID_VHT_MCS8_2SS_BW20 156 Mbps + {0, 66, 1}, // RATEID_VHT_MCS9_2SS_BW20 173.3 Mbps(INVALID) /* VHT bw20<--> Mrvl rate idx - nss1 */ - {13, 47, 0}, //RATEID_VHT_MCS0_1SS_BW20 6.5 Mbps - {26, 48, 0}, //RATEID_VHT_MCS1_1SS_BW20 13 Mbps - {39, 49, 0}, //RATEID_VHT_MCS2_1SS_BW20 19.5 Mbps - {52, 50, 0}, //RATEID_VHT_MCS3_1SS_BW20 26 Mbps - {78, 51, 0}, //RATEID_VHT_MCS4_1SS_BW20 39 Mbps - {104, 52, 0}, //RATEID_VHT_MCS5_1SS_BW20 52 Mbps - {117, 53, 0}, //RATEID_VHT_MCS6_1SS_BW20 58.5 Mbps - {130, 54, 0}, //RATEID_VHT_MCS7_1SS_BW20 65 Mbps - {156, 55, 0}, //RATEID_VHT_MCS8_1SS_BW20 78 Mbps - {0, 56, 0}, //RATEID_VHT_MCS9_1SS_BW20 86.7 Mbps(INVALID) + {13, 47, 0}, // RATEID_VHT_MCS0_1SS_BW20 6.5 Mbps + {26, 48, 0}, // RATEID_VHT_MCS1_1SS_BW20 13 Mbps + {39, 49, 0}, // RATEID_VHT_MCS2_1SS_BW20 19.5 Mbps + {52, 50, 0}, // RATEID_VHT_MCS3_1SS_BW20 26 Mbps + {78, 51, 0}, // RATEID_VHT_MCS4_1SS_BW20 39 Mbps + {104, 52, 0}, // RATEID_VHT_MCS5_1SS_BW20 52 Mbps + {117, 53, 0}, // RATEID_VHT_MCS6_1SS_BW20 58.5 Mbps + {130, 54, 0}, // RATEID_VHT_MCS7_1SS_BW20 65 Mbps + {156, 55, 0}, // RATEID_VHT_MCS8_1SS_BW20 78 Mbps + {0, 56, 0}, // RATEID_VHT_MCS9_1SS_BW20 86.7 Mbps(INVALID) /* VHT bw40<--> Mrvl rate idx - nss2 */ - {54, 77, 1}, //RATEID_VHT_MCS0_2SS_BW40 27 Mbps - {108, 78, 1}, //RATEID_VHT_MCS1_2SS_BW40 54 Mbps - {162, 79, 1}, //RATEID_VHT_MCS2_2SS_BW40 81 Mbps - {216, 80, 1}, //RATEID_VHT_MCS3_2SS_BW40 108 Mbps - {324, 81, 1}, //RATEID_VHT_MCS4_2SS_BW40 162 Mbps - {432, 82, 1}, //RATEID_VHT_MCS5_2SS_BW40 216 Mbps - {486, 83, 1}, //RATEID_VHT_MCS6_2SS_BW40 243 Mbps - {540, 84, 1}, //RATEID_VHT_MCS7_2SS_BW40 270 Mbps - {648, 85, 1}, //RATEID_VHT_MCS8_2SS_BW40 324 Mbps - {720, 86, 1}, //RATEID_VHT_MCS9_2SS_BW40 360 Mbps + {54, 77, 1}, // RATEID_VHT_MCS0_2SS_BW40 27 Mbps + {108, 78, 1}, // RATEID_VHT_MCS1_2SS_BW40 54 Mbps + {162, 79, 1}, // RATEID_VHT_MCS2_2SS_BW40 81 Mbps + {216, 80, 1}, // RATEID_VHT_MCS3_2SS_BW40 108 Mbps + {324, 81, 1}, // RATEID_VHT_MCS4_2SS_BW40 162 Mbps + {432, 82, 1}, // RATEID_VHT_MCS5_2SS_BW40 216 Mbps + {486, 83, 1}, // RATEID_VHT_MCS6_2SS_BW40 243 Mbps + {540, 84, 1}, // RATEID_VHT_MCS7_2SS_BW40 270 Mbps + {648, 85, 1}, // RATEID_VHT_MCS8_2SS_BW40 324 Mbps + {720, 86, 1}, // RATEID_VHT_MCS9_2SS_BW40 360 Mbps /* VHT bw40<--> Mrvl rate idx - nss1 */ - {27, 67, 0}, //RATEID_VHT_MCS0_1SS_BW40 13.5 Mbps - {54, 68, 0}, //RATEID_VHT_MCS1_1SS_BW40 27 Mbps - {81, 69, 0}, //RATEID_VHT_MCS2_1SS_BW40 40.5 Mbps - {108, 70, 0}, //RATEID_VHT_MCS3_1SS_BW40 54 Mbps - {162, 71, 0}, //RATEID_VHT_MCS4_1SS_BW40 81 Mbps - {216, 72, 0}, //RATEID_VHT_MCS5_1SS_BW40 108 Mbps - {243, 73, 0}, //RATEID_VHT_MCS6_1SS_BW40 121.5 Mbps - {270, 74, 0}, //RATEID_VHT_MCS7_1SS_BW40 135 Mbps - {324, 75, 0}, //RATEID_VHT_MCS8_1SS_BW40 162 Mbps - {360, 76, 0}, //RATEID_VHT_MCS9_1SS_BW40 180 Mbps + {27, 67, 0}, // RATEID_VHT_MCS0_1SS_BW40 13.5 Mbps + {54, 68, 0}, // RATEID_VHT_MCS1_1SS_BW40 27 Mbps + {81, 69, 0}, // RATEID_VHT_MCS2_1SS_BW40 40.5 Mbps + {108, 70, 0}, // RATEID_VHT_MCS3_1SS_BW40 54 Mbps + {162, 71, 0}, // RATEID_VHT_MCS4_1SS_BW40 81 Mbps + {216, 72, 0}, // RATEID_VHT_MCS5_1SS_BW40 108 Mbps + {243, 73, 0}, // RATEID_VHT_MCS6_1SS_BW40 121.5 Mbps + {270, 74, 0}, // RATEID_VHT_MCS7_1SS_BW40 135 Mbps + {324, 75, 0}, // RATEID_VHT_MCS8_1SS_BW40 162 Mbps + {360, 76, 0}, // RATEID_VHT_MCS9_1SS_BW40 180 Mbps /* VHT bw80<--> Mrvl rate idx - nss2 */ - {117, 97, 1}, //RATEID_VHT_MCS0_2SS_BW80 58.5 Mbps - {234, 98, 1}, //RATEID_VHT_MCS1_2SS_BW80 117 Mbps - {350, 99, 1}, //RATEID_VHT_MCS2_2SS_BW80 175 Mbps - {468, 100, 1}, //RATEID_VHT_MCS3_2SS_BW80 234 Mbps - {702, 101, 1}, //RATEID_VHT_MCS4_2SS_BW80 351 Mbps - {936, 102, 1}, //RATEID_VHT_MCS5_2SS_BW80 468 Mbps - {1053, 103, 1}, //RATEID_VHT_MCS6_2SS_BW80 526.5 Mbps - {1170, 104, 1}, //RATEID_VHT_MCS7_2SS_BW80 585 Mbps - {1404, 105, 1}, //RATEID_VHT_MCS8_2SS_BW80 702 Mbps - {1560, 106, 1}, //RATEID_VHT_MCS9_2SS_BW80 780 Mbps + {117, 97, 1}, // RATEID_VHT_MCS0_2SS_BW80 58.5 Mbps + {234, 98, 1}, // RATEID_VHT_MCS1_2SS_BW80 117 Mbps + {350, 99, 1}, // RATEID_VHT_MCS2_2SS_BW80 175 Mbps + {468, 100, 1}, // RATEID_VHT_MCS3_2SS_BW80 234 Mbps + {702, 101, 1}, // RATEID_VHT_MCS4_2SS_BW80 351 Mbps + {936, 102, 1}, // RATEID_VHT_MCS5_2SS_BW80 468 Mbps + {1053, 103, 1}, // RATEID_VHT_MCS6_2SS_BW80 526.5 Mbps + {1170, 104, 1}, // RATEID_VHT_MCS7_2SS_BW80 585 Mbps + {1404, 105, 1}, // RATEID_VHT_MCS8_2SS_BW80 702 Mbps + {1560, 106, 1}, // RATEID_VHT_MCS9_2SS_BW80 780 Mbps /* VHT bw80<--> Mrvl rate idx - nss1 */ - {58, 87, 0}, //RATEID_VHT_MCS0_1SS_BW80 29.3 Mbps, 29.3x2 could correspond to 58 - {59, 87, 0}, //RATEID_VHT_MCS0_1SS_BW80 29.3 Mbps, 29.3*2 could correspond to 59 too - {117, 88, 0}, //RATEID_VHT_MCS1_1SS_BW80 58.5 Mbps - {175, 89, 0}, //RATEID_VHT_MCS2_1SS_BW80 87.8 Mbps, 87.8x2 could correspond to 175 - {176, 89, 0}, //RATEID_VHT_MCS2_1SS_BW80 87.8 Mbps, 87.8x2 could correspond to 176 too - {234, 90, 0}, //RATEID_VHT_MCS3_1SS_BW80 117 Mbps - {351, 91, 0}, //RATEID_VHT_MCS4_1SS_BW80 175.5 Mbps - {468, 92, 0}, //RATEID_VHT_MCS5_1SS_BW80 234 Mbps - {526, 93, 0}, //RATEID_VHT_MCS6_1SS_BW80 263.3 Mbps, 263.3x2 could correspond to 526 - {527, 93, 0}, //RATEID_VHT_MCS6_1SS_BW80 263.3 Mbps, 263.3x2 could correspond to 527 too - {585, 94, 0}, //RATEID_VHT_MCS7_1SS_BW80 292.5 Mbps - {702, 95, 0}, //RATEID_VHT_MCS8_1SS_BW80 351 Mbps - {780, 96, 0}, //RATEID_VHT_MCS9_1SS_BW80 390 Mbps + {58, 87, 0}, // RATEID_VHT_MCS0_1SS_BW80 29.3 Mbps, 29.3x2 could + // correspond to 58 + {59, 87, 0}, // RATEID_VHT_MCS0_1SS_BW80 29.3 Mbps, 29.3*2 could + // correspond to 59 too + {117, 88, 0}, // RATEID_VHT_MCS1_1SS_BW80 58.5 Mbps + {175, 89, 0}, // RATEID_VHT_MCS2_1SS_BW80 87.8 Mbps, 87.8x2 could + // correspond to 175 + {176, 89, 0}, // RATEID_VHT_MCS2_1SS_BW80 87.8 Mbps, 87.8x2 could + // correspond to 176 too + {234, 90, 0}, // RATEID_VHT_MCS3_1SS_BW80 117 Mbps + {351, 91, 0}, // RATEID_VHT_MCS4_1SS_BW80 175.5 Mbps + {468, 92, 0}, // RATEID_VHT_MCS5_1SS_BW80 234 Mbps + {526, 93, 0}, // RATEID_VHT_MCS6_1SS_BW80 263.3 Mbps, 263.3x2 could + // correspond to 526 + {527, 93, 0}, // RATEID_VHT_MCS6_1SS_BW80 263.3 Mbps, 263.3x2 could + // correspond to 527 too + {585, 94, 0}, // RATEID_VHT_MCS7_1SS_BW80 292.5 Mbps + {702, 95, 0}, // RATEID_VHT_MCS8_1SS_BW80 351 Mbps + {780, 96, 0}, // RATEID_VHT_MCS9_1SS_BW80 390 Mbps }; /** rate_map_table_1x1 is based on rate_map_table_2x2 and remove nss2 part. - * For the chip who only support 1x1, Mrvl rate idx define is different with 2x2 in FW - * We need redefine a bitrate to Mrvl rate idx table for 1x1 chip. - */ + * For the chip who only support 1x1, Mrvl rate idx define is different with 2x2 + * in FW We need redefine a bitrate to Mrvl rate idx table for 1x1 chip. + */ const rate_map rate_map_table_1x1[] = { /* LG <--> Mrvl rate idx */ - {2, 0, 0}, //RATEID_DBPSK1Mbps - {4, 1, 0}, //RATEID_DQPSK2Mbps - {11, 2, 0}, //RATEID_CCK5_5Mbps - {22, 3, 0}, //RATEID_CCK11Mbps - {44, 4, 0}, //RATEID_CCK22Mbps - {12, 5, 0}, //RATEID_OFDM6Mbps - {18, 6, 0}, //RATEID_OFDM9Mbps - {24, 7, 0}, //RATEID_OFDM12Mbps - {36, 8, 0}, //RATEID_OFDM18Mbps - {48, 9, 0}, //RATEID_OFDM24Mbps - {72, 10, 0}, //RATEID_OFDM36Mbps - {96, 11, 0}, //RATEID_OFDM48Mbps - {108, 12, 0}, //RATEID_OFDM54Mbps - {144, 13, 0}, //RATEID_OFDM72Mbps + {2, 0, 0}, // RATEID_DBPSK1Mbps + {4, 1, 0}, // RATEID_DQPSK2Mbps + {11, 2, 0}, // RATEID_CCK5_5Mbps + {22, 3, 0}, // RATEID_CCK11Mbps + {44, 4, 0}, // RATEID_CCK22Mbps + {12, 5, 0}, // RATEID_OFDM6Mbps + {18, 6, 0}, // RATEID_OFDM9Mbps + {24, 7, 0}, // RATEID_OFDM12Mbps + {36, 8, 0}, // RATEID_OFDM18Mbps + {48, 9, 0}, // RATEID_OFDM24Mbps + {72, 10, 0}, // RATEID_OFDM36Mbps + {96, 11, 0}, // RATEID_OFDM48Mbps + {108, 12, 0}, // RATEID_OFDM54Mbps + {144, 13, 0}, // RATEID_OFDM72Mbps /* HT bw20 <--> Mrvl rate idx */ - {13, 14, 0}, //RATEID_MCS0_6d5Mbps - {26, 15, 0}, //RATEID_MCS1_13Mbps - {39, 16, 0}, //RATEID_MCS2_19d5Mbps - {52, 17, 0}, //RATEID_MCS3_26Mbps - {78, 18, 0}, //RATEID_MCS4_39Mbps - {104, 19, 0}, //RATEID_MCS5_52Mbps - {117, 20, 0}, //RATEID_MCS6_58d5Mbps - {130, 21, 0}, //RATEID_MCS7_65Mbps + {13, 14, 0}, // RATEID_MCS0_6d5Mbps + {26, 15, 0}, // RATEID_MCS1_13Mbps + {39, 16, 0}, // RATEID_MCS2_19d5Mbps + {52, 17, 0}, // RATEID_MCS3_26Mbps + {78, 18, 0}, // RATEID_MCS4_39Mbps + {104, 19, 0}, // RATEID_MCS5_52Mbps + {117, 20, 0}, // RATEID_MCS6_58d5Mbps + {130, 21, 0}, // RATEID_MCS7_65Mbps /* HT bw40<--> Mrvl rate idx */ - {12, 22, 0}, //RATEID_MCS32BW40_6Mbps, for 1x1 start from 22 - {27, 23, 0}, //RATEID_MCS0BW40_13d5Mbps - {54, 24, 0}, //RATEID_MCS1BW40_27Mbps - {81, 25, 0}, //RATEID_MCS2BW40_40d5Mbps - {108, 26, 0}, //RATEID_MCS3BW40_54Mbps - {162, 27, 0}, //RATEID_MCS4BW40_81Mbps - {216, 28, 0}, //RATEID_MCS5BW40_108Mbps - {243, 29, 0}, //RATEID_MCS6BW40_121d5Mbps - {270, 30, 0}, //RATEID_MCS7BW40_135Mbps + {12, 22, 0}, // RATEID_MCS32BW40_6Mbps, for 1x1 start from 22 + {27, 23, 0}, // RATEID_MCS0BW40_13d5Mbps + {54, 24, 0}, // RATEID_MCS1BW40_27Mbps + {81, 25, 0}, // RATEID_MCS2BW40_40d5Mbps + {108, 26, 0}, // RATEID_MCS3BW40_54Mbps + {162, 27, 0}, // RATEID_MCS4BW40_81Mbps + {216, 28, 0}, // RATEID_MCS5BW40_108Mbps + {243, 29, 0}, // RATEID_MCS6BW40_121d5Mbps + {270, 30, 0}, // RATEID_MCS7BW40_135Mbps /* VHT bw20<--> Mrvl rate idx */ - {13, 31, 0}, //RATEID_VHT_MCS0_1SS_BW20 6.5 Mbps - {26, 32, 0}, //RATEID_VHT_MCS1_1SS_BW20 13 Mbps - {39, 33, 0}, //RATEID_VHT_MCS2_1SS_BW20 19.5 Mbps - {52, 34, 0}, //RATEID_VHT_MCS3_1SS_BW20 26 Mbps - {78, 35, 0}, //RATEID_VHT_MCS4_1SS_BW20 39 Mbps - {104, 36, 0}, //RATEID_VHT_MCS5_1SS_BW20 52 Mbps - {117, 37, 0}, //RATEID_VHT_MCS6_1SS_BW20 58.5 Mbps - {130, 38, 0}, //RATEID_VHT_MCS7_1SS_BW20 65 Mbps - {156, 39, 0}, //RATEID_VHT_MCS8_1SS_BW20 78 Mbps - {0, 40, 0}, //RATEID_VHT_MCS9_1SS_BW20 86.7 Mbps(INVALID) + {13, 31, 0}, // RATEID_VHT_MCS0_1SS_BW20 6.5 Mbps + {26, 32, 0}, // RATEID_VHT_MCS1_1SS_BW20 13 Mbps + {39, 33, 0}, // RATEID_VHT_MCS2_1SS_BW20 19.5 Mbps + {52, 34, 0}, // RATEID_VHT_MCS3_1SS_BW20 26 Mbps + {78, 35, 0}, // RATEID_VHT_MCS4_1SS_BW20 39 Mbps + {104, 36, 0}, // RATEID_VHT_MCS5_1SS_BW20 52 Mbps + {117, 37, 0}, // RATEID_VHT_MCS6_1SS_BW20 58.5 Mbps + {130, 38, 0}, // RATEID_VHT_MCS7_1SS_BW20 65 Mbps + {156, 39, 0}, // RATEID_VHT_MCS8_1SS_BW20 78 Mbps + {0, 40, 0}, // RATEID_VHT_MCS9_1SS_BW20 86.7 Mbps(INVALID) /* VHT bw40<--> Mrvl rate idx */ - {27, 41, 0}, //RATEID_VHT_MCS0_1SS_BW40 13.5 Mbps - {54, 42, 0}, //RATEID_VHT_MCS1_1SS_BW40 27 Mbps - {81, 43, 0}, //RATEID_VHT_MCS2_1SS_BW40 40.5 Mbps - {108, 44, 0}, //RATEID_VHT_MCS3_1SS_BW40 54 Mbps - {162, 45, 0}, //RATEID_VHT_MCS4_1SS_BW40 81 Mbps - {216, 46, 0}, //RATEID_VHT_MCS5_1SS_BW40 108 Mbps - {243, 47, 0}, //RATEID_VHT_MCS6_1SS_BW40 121.5 Mbps - {270, 48, 0}, //RATEID_VHT_MCS7_1SS_BW40 135 Mbps - {324, 49, 0}, //RATEID_VHT_MCS8_1SS_BW40 162 Mbps - {360, 50, 0}, //RATEID_VHT_MCS9_1SS_BW40 180 Mbps + {27, 41, 0}, // RATEID_VHT_MCS0_1SS_BW40 13.5 Mbps + {54, 42, 0}, // RATEID_VHT_MCS1_1SS_BW40 27 Mbps + {81, 43, 0}, // RATEID_VHT_MCS2_1SS_BW40 40.5 Mbps + {108, 44, 0}, // RATEID_VHT_MCS3_1SS_BW40 54 Mbps + {162, 45, 0}, // RATEID_VHT_MCS4_1SS_BW40 81 Mbps + {216, 46, 0}, // RATEID_VHT_MCS5_1SS_BW40 108 Mbps + {243, 47, 0}, // RATEID_VHT_MCS6_1SS_BW40 121.5 Mbps + {270, 48, 0}, // RATEID_VHT_MCS7_1SS_BW40 135 Mbps + {324, 49, 0}, // RATEID_VHT_MCS8_1SS_BW40 162 Mbps + {360, 50, 0}, // RATEID_VHT_MCS9_1SS_BW40 180 Mbps /* VHT bw80<--> Mrvl rate idx */ - {58, 51, 0}, //RATEID_VHT_MCS0_1SS_BW80 29.3 Mbps, 29.3x2 could correspond to 58 - {59, 51, 0}, //RATEID_VHT_MCS0_1SS_BW80 29.3 Mbps, 29.3x2 could correspond to 59 too - {117, 52, 0}, //RATEID_VHT_MCS1_1SS_BW80 58.5 Mbps - {175, 53, 0}, //RATEID_VHT_MCS2_1SS_BW80 87.8 Mbps, 87.8x2 could correspond to 175 - {176, 53, 0}, //RATEID_VHT_MCS2_1SS_BW80 87.8 Mbps, 87.8x2 could correspond to 176 too - {234, 54, 0}, //RATEID_VHT_MCS3_1SS_BW80 117 Mbps - {351, 55, 0}, //RATEID_VHT_MCS4_1SS_BW80 175.5 Mbps - {468, 56, 0}, //RATEID_VHT_MCS5_1SS_BW80 234 Mbps - {526, 57, 0}, //RATEID_VHT_MCS6_1SS_BW80 263.3 Mbps, 263.3x2 could correspond to 526 - {527, 57, 0}, //RATEID_VHT_MCS6_1SS_BW80 263.3 Mbps, 263.3x2 could correspond to 527 too - {585, 58, 0}, //RATEID_VHT_MCS7_1SS_BW80 292.5 Mbps - {702, 59, 0}, //RATEID_VHT_MCS8_1SS_BW80 351 Mbps - {780, 60, 0}, //RATEID_VHT_MCS9_1SS_BW80 390 Mbps + {58, 51, 0}, // RATEID_VHT_MCS0_1SS_BW80 29.3 Mbps, 29.3x2 could + // correspond to 58 + {59, 51, 0}, // RATEID_VHT_MCS0_1SS_BW80 29.3 Mbps, 29.3x2 could + // correspond to 59 too + {117, 52, 0}, // RATEID_VHT_MCS1_1SS_BW80 58.5 Mbps + {175, 53, 0}, // RATEID_VHT_MCS2_1SS_BW80 87.8 Mbps, 87.8x2 could + // correspond to 175 + {176, 53, 0}, // RATEID_VHT_MCS2_1SS_BW80 87.8 Mbps, 87.8x2 could + // correspond to 176 too + {234, 54, 0}, // RATEID_VHT_MCS3_1SS_BW80 117 Mbps + {351, 55, 0}, // RATEID_VHT_MCS4_1SS_BW80 175.5 Mbps + {468, 56, 0}, // RATEID_VHT_MCS5_1SS_BW80 234 Mbps + {526, 57, 0}, // RATEID_VHT_MCS6_1SS_BW80 263.3 Mbps, 263.3x2 could + // correspond to 526 + {527, 57, 0}, // RATEID_VHT_MCS6_1SS_BW80 263.3 Mbps, 263.3x2 could + // correspond to 527 too + {585, 58, 0}, // RATEID_VHT_MCS7_1SS_BW80 292.5 Mbps + {702, 59, 0}, // RATEID_VHT_MCS8_1SS_BW80 351 Mbps + {780, 60, 0}, // RATEID_VHT_MCS9_1SS_BW80 390 Mbps }; /******************************************************** - Global Variables -********************************************************/ + * Global Variables + ********************************************************/ /** * The table to keep region code */ -t_u16 region_code_index[MRVDRV_MAX_REGION_CODE] = { - 0x00, 0x10, 0x20, 0x30, 0x40, 0x41, 0x50, 0xfe, 0xff -}; +t_u16 region_code_index[MRVDRV_MAX_REGION_CODE] = {0x00, 0x10, 0x20, 0x30, 0x40, + 0x41, 0x50, 0xfe, 0xff}; /** The table to keep CFP code for BG */ -t_u16 cfp_code_index_bg[MRVDRV_MAX_CFP_CODE_BG] = { }; - +t_u16 cfp_code_index_bg[MRVDRV_MAX_CFP_CODE_BG] = {}; /** The table to keep CFP code for A */ -t_u16 cfp_code_index_a[MRVDRV_MAX_CFP_CODE_A] = { 0x1, 0x2, 0x3, 0x4, 0x5 }; +t_u16 cfp_code_index_a[MRVDRV_MAX_CFP_CODE_A] = {0x1, 0x2, 0x3, 0x4, 0x5}; /** * The rates supported for ad-hoc B mode */ -t_u8 AdhocRates_B[B_SUPPORTED_RATES] = { 0x82, 0x84, 0x8b, 0x96, 0 }; +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, 0x00 -}; +t_u8 AdhocRates_G[G_SUPPORTED_RATES] = {0x8c, 0x12, 0x98, 0x24, 0xb0, + 0x48, 0x60, 0x6c, 0x00}; /** * 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, 0x00 -}; +t_u8 AdhocRates_BG[BG_SUPPORTED_RATES] = {0x82, 0x84, 0x8b, 0x96, 0x0c, + 0x12, 0x18, 0x24, 0x30, 0x48, + 0x60, 0x6c, 0x00}; /** * The rates supported in A mode for ad-hoc */ -t_u8 AdhocRates_A[A_SUPPORTED_RATES] = { - 0x8c, 0x12, 0x98, 0x24, 0xb0, 0x48, 0x60, 0x6c, 0x00 -}; +t_u8 AdhocRates_A[A_SUPPORTED_RATES] = {0x8c, 0x12, 0x98, 0x24, 0xb0, + 0x48, 0x60, 0x6c, 0x00}; /** * 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, 0x00 -}; +t_u8 SupportedRates_A[A_SUPPORTED_RATES] = {0x0c, 0x12, 0x18, 0x24, 0xb0, + 0x48, 0x60, 0x6c, 0x00}; /** * 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}; /** * The rates supported in B mode */ -t_u8 SupportedRates_B[B_SUPPORTED_RATES] = { - 0x02, 0x04, 0x0b, 0x16, 0x00 -}; +t_u8 SupportedRates_B[B_SUPPORTED_RATES] = {0x02, 0x04, 0x0b, 0x16, 0x00}; /** * 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, 0x00 -}; +t_u8 SupportedRates_G[G_SUPPORTED_RATES] = {0x0c, 0x12, 0x18, 0x24, 0x30, + 0x48, 0x60, 0x6c, 0x00}; /** * 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, 0x00 -}; +t_u8 SupportedRates_BG[BG_SUPPORTED_RATES] = {0x02, 0x04, 0x0b, 0x0c, 0x12, + 0x16, 0x18, 0x24, 0x30, 0x48, + 0x60, 0x6c, 0x00}; /** * The rates supported in N mode */ -t_u8 SupportedRates_N[N_SUPPORTED_RATES] = { 0x02, 0x04, 0 }; +t_u8 SupportedRates_N[N_SUPPORTED_RATES] = {0x02, 0x04, 0}; -#define MCS_NUM_AX 12 - //for MCS0/MCS1/MCS3/MCS4 have 4 additional DCM=1 value - //note: the value in the table is 2 multiplier of the actual rate +#define MCS_NUM_AX 12 +// for MCS0/MCS1/MCS3/MCS4 have 4 additional DCM=1 value +// note: the value in the table is 2 multiplier of the actual rate t_u16 ax_mcs_rate_nss1[12][MCS_NUM_AX + 4] = { - {0x90, 0x48, 0x120, 0x90, 0x1B0, 0x240, 0x120, 0x360, 0x1B0, 0x481, 0x511, 0x5A1, 0x6C1, 0x781, 0x871, 0x962}, /*SG 160M */ - {0x88, 0x44, 0x110, 0x88, 0x198, 0x220, 0x110, 0x330, 0x198, 0x440, 0x4C9, 0x551, 0x661, 0x716, 0x7F9, 0x8DC}, /*MG 160M */ - {0x7A, 0x3D, 0xF5, 0x7A, 0x16F, 0x1EA, 0xF5, 0x2DF, 0x16F, 0x3D4, 0x44E, 0x4C9, 0x5BE, 0x661, 0x72D, 0x7F9}, /*LG 160M */ - {0x48, 0x24, 0x90, 0x48, 0xD8, 0x120, 0x90, 0x1B0, 0xD8, 0x240, 0x288, 0x2D0, 0x360, 0x3C0, 0x438, 0x4B0}, /*SG 80M */ - {0x44, 0x22, 0x88, 0x44, 0xCC, 0x110, 0x88, 0x198, 0xCC, 0x220, 0x264, 0x2A8, 0x330, 0x38B, 0x3FC, 0x46E}, /*MG 80M */ - {0x3D, 0x1E, 0x7A, 0x3D, 0xB7, 0xF5, 0x7A, 0x16F, 0xB7, 0x1EA, 0x227, 0x264, 0x2DF, 0x330, 0x396, 0x3FC}, /*LG 80M */ - {0x22, 0x11, 0x44, 0x22, 0x67, 0x89, 0x44, 0xCE, 0x67, 0x113, 0x135, 0x158, 0x19D, 0x1CA, 0x204, 0x23D}, /*SG 40M */ - {0x20, 0x10, 0x41, 0x20, 0x61, 0x82, 0x41, 0xC3, 0x61, 0x104, 0x124, 0x145, 0x186, 0x1B1, 0x1E7, 0x21D}, /*MG 40M */ - {0x1D, 0xE, 0x3A, 0x1D, 0x57, 0x75, 0x3A, 0xAF, 0x57, 0xEA, 0x107, 0x124, 0x15F, 0x186, 0x1B6, 0x1E7}, /*LG 40M */ - {0x11, 0x8, 0x22, 0x11, 0x33, 0x44, 0x22, 0x67, 0x33, 0x89, 0x9A, 0xAC, 0xCE, 0xE5, 0x102, 0x11E}, /*SG 20M */ - {0x10, 0x8, 0x20, 0x10, 0x30, 0x41, 0x20, 0x61, 0x30, 0x82, 0x92, 0xA2, 0xC3, 0xD8, 0xF3, 0x10E}, /*MG 20M */ - {0xE, 0x7, 0x1D, 0xE, 0x2B, 0x3A, 0x1D, 0x57, 0x2B, 0x75, 0x83, 0x92, 0xAF, 0xC3, 0xDB, 0xF3} /*LG 20M */ + {0x90, 0x48, 0x120, 0x90, 0x1B0, 0x240, 0x120, 0x360, 0x1B0, 0x481, + 0x511, 0x5A1, 0x6C1, 0x781, 0x871, 0x962}, /*SG 160M*/ + {0x88, 0x44, 0x110, 0x88, 0x198, 0x220, 0x110, 0x330, 0x198, 0x440, + 0x4C9, 0x551, 0x661, 0x716, 0x7F9, 0x8DC}, /*MG 160M*/ + {0x7A, 0x3D, 0xF5, 0x7A, 0x16F, 0x1EA, 0xF5, 0x2DF, 0x16F, 0x3D4, 0x44E, + 0x4C9, 0x5BE, 0x661, 0x72D, 0x7F9}, /*LG 160M*/ + {0x48, 0x24, 0x90, 0x48, 0xD8, 0x120, 0x90, 0x1B0, 0xD8, 0x240, 0x288, + 0x2D0, 0x360, 0x3C0, 0x438, 0x4B0}, /*SG 80M*/ + {0x44, 0x22, 0x88, 0x44, 0xCC, 0x110, 0x88, 0x198, 0xCC, 0x220, 0x264, + 0x2A8, 0x330, 0x38B, 0x3FC, 0x46E}, /*MG 80M*/ + {0x3D, 0x1E, 0x7A, 0x3D, 0xB7, 0xF5, 0x7A, 0x16F, 0xB7, 0x1EA, 0x227, + 0x264, 0x2DF, 0x330, 0x396, 0x3FC}, /*LG 80M*/ + {0x22, 0x11, 0x44, 0x22, 0x67, 0x89, 0x44, 0xCE, 0x67, 0x113, 0x135, + 0x158, 0x19D, 0x1CA, 0x204, 0x23D}, /*SG 40M*/ + {0x20, 0x10, 0x41, 0x20, 0x61, 0x82, 0x41, 0xC3, 0x61, 0x104, 0x124, + 0x145, 0x186, 0x1B1, 0x1E7, 0x21D}, /*MG 40M*/ + {0x1D, 0xE, 0x3A, 0x1D, 0x57, 0x75, 0x3A, 0xAF, 0x57, 0xEA, 0x107, + 0x124, 0x15F, 0x186, 0x1B6, 0x1E7}, /*LG 40M*/ + {0x11, 0x8, 0x22, 0x11, 0x33, 0x44, 0x22, 0x67, 0x33, 0x89, 0x9A, 0xAC, + 0xCE, 0xE5, 0x102, 0x11E}, /*SG 20M*/ + {0x10, 0x8, 0x20, 0x10, 0x30, 0x41, 0x20, 0x61, 0x30, 0x82, 0x92, 0xA2, + 0xC3, 0xD8, 0xF3, 0x10E}, /*MG 20M*/ + {0xE, 0x7, 0x1D, 0xE, 0x2B, 0x3A, 0x1D, 0x57, 0x2B, 0x75, 0x83, 0x92, + 0xAF, 0xC3, 0xDB, 0xF3} /*LG 20M*/ }; - //note: the value in the table is 2 multiplier of the actual rate +// note: the value in the table is 2 multiplier of the actual rate t_u16 ax_tone_ru_rate_nss1[9][MCS_NUM_AX + 4] = { - {0x8, 0x4, 0xF, 0x8, 0x17, 0x1E, 0xF, 0x2D, 0x17, 0x3C, 0x44, 0x4B, 0x5A, 0x64, 0x71, 0x7D}, /*SG 106-tone */ - {0x7, 0x4, 0xF, 0x7, 0x16, 0x1D, 0xF, 0x2B, 0x16, 0x39, 0x40, 0x47, 0x55, 0x5F, 0x6B, 0x76}, /*MG 106-tone */ - {0x7, 0x3, 0xD, 0x6, 0x14, 0x1A, 0xD, 0x27, 0x14, 0x33, 0x3A, 0x40, 0x4D, 0x55, 0x60, 0x6B}, /*LG 106-tone */ - {0x4, 0x2, 0x7, 0x4, 0xB, 0xF, 0x7, 0x16, 0xB, 0x1D, 0x20, 0x22, 0x2B, 0x2F, 0x35, 0x3B}, /*SG 52-tone */ - {0x4, 0x2, 0x7, 0x4, 0xA, 0xE, 0x7, 0x14, 0xA, 0x1B, 0x1E, 0x22, 0x28, 0x2D, 0x32, 0x38}, /*MG 52-tone */ - {0x3, 0x2, 0x6, 0x3, 0x9, 0xC, 0x6, 0x12, 0x9, 0x18, 0x1B, 0x1E, 0x24, 0x28, 0x2D, 0x32}, /*LG 52-tone */ - {0x2, 0x1, 0x4, 0x2, 0x6, 0x7, 0x4, 0xB, 0x5, 0xE, 0x10, 0x12, 0x15, 0x18, 0x1A, 0x1D}, /*SG 26-tone */ - {0x2, 0x1, 0x4, 0x2, 0x5, 0x6, 0x4, 0xA, 0x5, 0xD, 0xF, 0x11, 0x14, 0x16, 0x19, 0x1C}, /*MG 26-tone */ - {0x2, 0x1, 0x3, 0x2, 0x5, 0x6, 0x3, 0x9, 0x4, 0xC, 0xE, 0xF, 0x12, 0x14, 0x17, 0x19} /*LG 26-tone */ + {0x8, 0x4, 0xF, 0x8, 0x17, 0x1E, 0xF, 0x2D, 0x17, 0x3C, 0x44, 0x4B, + 0x5A, 0x64, 0x71, 0x7D}, /*SG 106-tone*/ + {0x7, 0x4, 0xF, 0x7, 0x16, 0x1D, 0xF, 0x2B, 0x16, 0x39, 0x40, 0x47, + 0x55, 0x5F, 0x6B, 0x76}, /*MG 106-tone*/ + {0x7, 0x3, 0xD, 0x6, 0x14, 0x1A, 0xD, 0x27, 0x14, 0x33, 0x3A, 0x40, + 0x4D, 0x55, 0x60, 0x6B}, /*LG 106-tone*/ + {0x4, 0x2, 0x7, 0x4, 0xB, 0xF, 0x7, 0x16, 0xB, 0x1D, 0x20, 0x22, 0x2B, + 0x2F, 0x35, 0x3B}, /*SG 52-tone*/ + {0x4, 0x2, 0x7, 0x4, 0xA, 0xE, 0x7, 0x14, 0xA, 0x1B, 0x1E, 0x22, 0x28, + 0x2D, 0x32, 0x38}, /*MG 52-tone*/ + {0x3, 0x2, 0x6, 0x3, 0x9, 0xC, 0x6, 0x12, 0x9, 0x18, 0x1B, 0x1E, 0x24, + 0x28, 0x2D, 0x32}, /*LG 52-tone*/ + {0x2, 0x1, 0x4, 0x2, 0x6, 0x7, 0x4, 0xB, 0x5, 0xE, 0x10, 0x12, 0x15, + 0x18, 0x1A, 0x1D}, /*SG 26-tone*/ + {0x2, 0x1, 0x4, 0x2, 0x5, 0x6, 0x4, 0xA, 0x5, 0xD, 0xF, 0x11, 0x14, + 0x16, 0x19, 0x1C}, /*MG 26-tone*/ + {0x2, 0x1, 0x3, 0x2, 0x5, 0x6, 0x3, 0x9, 0x4, 0xC, 0xE, 0xF, 0x12, 0x14, + 0x17, 0x19} /*LG 26-tone*/ }; - //note: the value in the table is 2 multiplier of the actual rate +// note: the value in the table is 2 multiplier of the actual rate t_u16 ax_mcs_rate_nss2[12][MCS_NUM_AX + 4] = { - {0x120, 0x90, 0x240, 0x120, 0x360, 0x481, 0x240, 0x61C, 0x360, 0x901, 0xA22, 0xB42, 0xD82, 0xF03, 0x10E3, 0x12C3}, /*SG 160M */ - {0x110, 0x88, 0x220, 0x110, 0x330, 0x440, 0x220, 0x661, 0x330, 0x881, 0x992, 0xAA2, 0xCAC, 0xE2D, 0xFF3, 0x11B9}, /*MG 160M */ - {0xF5, 0x7A, 0x1EA, 0xF5, 0x2DF, 0x3D4, 0x1EA, 0x5BE, 0x2DF, 0x7A8, 0x1134, 0x992, 0xB7C, 0xCC2, 0xE5B, 0xFF3}, /*LG 160M */ - {0x90, 0x48, 0x120, 0x90, 0x1B0, 0x240, 0x120, 0x360, 0x1B0, 0x481, 0x511, 0x5A1, 0x6C1, 0x781, 0x871, 0x962}, /*SG 80M */ - {0x88, 0x44, 0x110, 0x88, 0x198, 0x220, 0x110, 0x330, 0x198, 0x440, 0x4C9, 0x551, 0x661, 0x716, 0x7F9, 0x8DC}, /*MG 80M */ - {0x7A, 0x3D, 0xF5, 0x7A, 0x16F, 0x1EA, 0xF5, 0x2DF, 0x16F, 0x3D4, 0x44E, 0x4C9, 0x5BE, 0x661, 0x72D, 0x7F9}, /*LG 80M */ - {0x44, 0x22, 0x89, 0x44, 0xCE, 0x113, 0x89, 0x19D, 0xCE, 0x226, 0x26B, 0x2B0, 0x339, 0x395, 0x408, 0x47B}, /*SG 40M */ - {0x41, 0x20, 0x82, 0x41, 0xC3, 0x104, 0x82, 0x186, 0xC3, 0x208, 0x249, 0x28A, 0x30C, 0x362, 0x3CE, 0x43B}, /*MG 40M */ - {0x3A, 0x1D, 0x75, 0x3A, 0xAF, 0xEA, 0x75, 0x15F, 0xAF, 0x1D4, 0x20E, 0x249, 0x2BE, 0x30C, 0x36D, 0x3CF}, /*LG 40M */ - {0x22, 0x11, 0x44, 0x22, 0x67, 0x89, 0x44, 0xCE, 0x67, 0x113, 0x135, 0x158, 0x19D, 0x1CA, 0x204, 0x23D}, /*SG 20M */ - {0x20, 0x10, 0x41, 0x20, 0x61, 0x82, 0x41, 0xC3, 0x61, 0x104, 0x124, 0x145, 0x186, 0x1B1, 0x1E7, 0x21D}, /*MG 20M */ - {0x1D, 0xE, 0x3A, 0x1D, 0x57, 0x75, 0x3A, 0xAF, 0x57, 0xEA, 0x107, 0x124, 0x15F, 0x186, 0x1B6, 0x1E7} /*LG 20M */ + {0x120, 0x90, 0x240, 0x120, 0x360, 0x481, 0x240, 0x61C, 0x360, 0x901, + 0xA22, 0xB42, 0xD82, 0xF03, 0x10E3, 0x12C3}, /*SG 160M*/ + {0x110, 0x88, 0x220, 0x110, 0x330, 0x440, 0x220, 0x661, 0x330, 0x881, + 0x992, 0xAA2, 0xCAC, 0xE2D, 0xFF3, 0x11B9}, /*MG 160M*/ + {0xF5, 0x7A, 0x1EA, 0xF5, 0x2DF, 0x3D4, 0x1EA, 0x5BE, 0x2DF, 0x7A8, + 0x1134, 0x992, 0xB7C, 0xCC2, 0xE5B, 0xFF3}, /*LG 160M*/ + {0x90, 0x48, 0x120, 0x90, 0x1B0, 0x240, 0x120, 0x360, 0x1B0, 0x481, + 0x511, 0x5A1, 0x6C1, 0x781, 0x871, 0x962}, /*SG 80M*/ + {0x88, 0x44, 0x110, 0x88, 0x198, 0x220, 0x110, 0x330, 0x198, 0x440, + 0x4C9, 0x551, 0x661, 0x716, 0x7F9, 0x8DC}, /*MG 80M*/ + {0x7A, 0x3D, 0xF5, 0x7A, 0x16F, 0x1EA, 0xF5, 0x2DF, 0x16F, 0x3D4, 0x44E, + 0x4C9, 0x5BE, 0x661, 0x72D, 0x7F9}, /*LG 80M*/ + {0x44, 0x22, 0x89, 0x44, 0xCE, 0x113, 0x89, 0x19D, 0xCE, 0x226, 0x26B, + 0x2B0, 0x339, 0x395, 0x408, 0x47B}, /*SG 40M*/ + {0x41, 0x20, 0x82, 0x41, 0xC3, 0x104, 0x82, 0x186, 0xC3, 0x208, 0x249, + 0x28A, 0x30C, 0x362, 0x3CE, 0x43B}, /*MG 40M*/ + {0x3A, 0x1D, 0x75, 0x3A, 0xAF, 0xEA, 0x75, 0x15F, 0xAF, 0x1D4, 0x20E, + 0x249, 0x2BE, 0x30C, 0x36D, 0x3CF}, /*LG 40M*/ + {0x22, 0x11, 0x44, 0x22, 0x67, 0x89, 0x44, 0xCE, 0x67, 0x113, 0x135, + 0x158, 0x19D, 0x1CA, 0x204, 0x23D}, /*SG 20M*/ + {0x20, 0x10, 0x41, 0x20, 0x61, 0x82, 0x41, 0xC3, 0x61, 0x104, 0x124, + 0x145, 0x186, 0x1B1, 0x1E7, 0x21D}, /*MG 20M*/ + {0x1D, 0xE, 0x3A, 0x1D, 0x57, 0x75, 0x3A, 0xAF, 0x57, 0xEA, 0x107, + 0x124, 0x15F, 0x186, 0x1B6, 0x1E7} /*LG 20M*/ }; - //note: the value in the table is 2 multiplier of the actual rate +// note: the value in the table is 2 multiplier of the actual rate t_u16 ax_tone_ru_rate_nss2[9][MCS_NUM_AX + 4] = { - {0xF, 0x8, 0x1E, 0xF, 0x2D, 0x3C, 0x1E, 0x5A, 0x2D, 0x78, 0x87, 0x96, 0xB4, 0xC8, 0xE1, 0xFA}, /*SG 106-tone */ - {0xE, 0x7, 0x1D, 0xE, 0x2B, 0x39, 0x1D, 0x55, 0x2B, 0x72, 0x80, 0x8E, 0xAA, 0xBD, 0xD5, 0xED}, /*MG 106-tone */ - {0xD, 0x7, 0x1A, 0xD, 0x27, 0x33, 0x1A, 0x4D, 0x27, 0x66, 0x73, 0x80, 0x99, 0xAA, 0xC0, 0xD5}, /*LG 106-tone */ - {0x7, 0x4, 0xF, 0x7, 0x16, 0x1D, 0xF, 0x2A, 0x16, 0x39, 0x40, 0x47, 0x55, 0x5F, 0x6A, 0x76}, /*SG 52-tone */ - {0x7, 0x4, 0xE, 0x7, 0x14, 0x1B, 0xE, 0x28, 0x14, 0x36, 0x3C, 0x43, 0x50, 0x59, 0x64, 0x70}, /*MG 52-tone */ - {0x6, 0x3, 0xC, 0x6, 0x12, 0x18, 0xC, 0x24, 0x12, 0x30, 0x36, 0x3C, 0x48, 0x50, 0x5A, 0x64}, /*LG 52-tone */ - {0x4, 0x2, 0x7, 0x4, 0xB, 0xF, 0x7, 0x16, 0xB, 0x1D, 0x20, 0x22, 0x2B, 0x2F, 0x35, 0x3B}, /*SG 26-tone */ - {0x4, 0x2, 0x7, 0x4, 0xA, 0xE, 0x7, 0x14, 0xA, 0x1B, 0x1E, 0x22, 0x28, 0x2D, 0x32, 0x38}, /*MG 26-tone */ - {0x3, 0x2, 0x6, 0x3, 0x9, 0xC, 0x6, 0x12, 0x9, 0x18, 0x1B, 0x1E, 0x24, 0x28, 0x2D, 0x32} /*LG 26-tone */ + {0xF, 0x8, 0x1E, 0xF, 0x2D, 0x3C, 0x1E, 0x5A, 0x2D, 0x78, 0x87, 0x96, + 0xB4, 0xC8, 0xE1, 0xFA}, /*SG 106-tone*/ + {0xE, 0x7, 0x1D, 0xE, 0x2B, 0x39, 0x1D, 0x55, 0x2B, 0x72, 0x80, 0x8E, + 0xAA, 0xBD, 0xD5, 0xED}, /*MG 106-tone*/ + {0xD, 0x7, 0x1A, 0xD, 0x27, 0x33, 0x1A, 0x4D, 0x27, 0x66, 0x73, 0x80, + 0x99, 0xAA, 0xC0, 0xD5}, /*LG 106-tone*/ + {0x7, 0x4, 0xF, 0x7, 0x16, 0x1D, 0xF, 0x2A, 0x16, 0x39, 0x40, 0x47, + 0x55, 0x5F, 0x6A, 0x76}, /*SG 52-tone*/ + {0x7, 0x4, 0xE, 0x7, 0x14, 0x1B, 0xE, 0x28, 0x14, 0x36, 0x3C, 0x43, + 0x50, 0x59, 0x64, 0x70}, /*MG 52-tone*/ + {0x6, 0x3, 0xC, 0x6, 0x12, 0x18, 0xC, 0x24, 0x12, 0x30, 0x36, 0x3C, + 0x48, 0x50, 0x5A, 0x64}, /*LG 52-tone*/ + {0x4, 0x2, 0x7, 0x4, 0xB, 0xF, 0x7, 0x16, 0xB, 0x1D, 0x20, 0x22, 0x2B, + 0x2F, 0x35, 0x3B}, /*SG 26-tone*/ + {0x4, 0x2, 0x7, 0x4, 0xA, 0xE, 0x7, 0x14, 0xA, 0x1B, 0x1E, 0x22, 0x28, + 0x2D, 0x32, 0x38}, /*MG 26-tone*/ + {0x3, 0x2, 0x6, 0x3, 0x9, 0xC, 0x6, 0x12, 0x9, 0x18, 0x1B, 0x1E, 0x24, + 0x28, 0x2D, 0x32} /*LG 26-tone*/ }; /******************************************************** - Local Functions -********************************************************/ + * Local Functions + ********************************************************/ /** * @brief Find a character in a string. * @@ -1084,10 +1124,10 @@ t_u16 ax_tone_ru_rate_nss2[9][MCS_NUM_AX + 4] = { * @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. + * @return A pointer to the first occurrence of c in string, or MNULL if + * c is not found. */ -static void * -wlan_memchr(pmlan_adapter pmadapter, void *s, int c, int n) +static void *wlan_memchr(pmlan_adapter pmadapter, void *s, int c, int n) { const t_u8 *p = (t_u8 *)s; @@ -1115,9 +1155,9 @@ wlan_memchr(pmlan_adapter pmadapter, void *s, int c, int n) * * @return A pointer to CFP */ -static chan_freq_power_t * -wlan_get_region_cfp_table(pmlan_adapter pmadapter, t_u8 region, t_u8 band, - int *cfp_no) +static chan_freq_power_t *wlan_get_region_cfp_table(pmlan_adapter pmadapter, + t_u8 region, t_u8 band, + int *cfp_no) { t_u32 i; t_u8 cfp_bg, cfp_a; @@ -1132,9 +1172,10 @@ wlan_get_region_cfp_table(pmlan_adapter pmadapter, t_u8 region, t_u8 band, } if (band & (BAND_B | BAND_G | BAND_GN | BAND_GAC)) { - /* Return the FW cfp table for requested region code, if available. - * If region is not forced and the requested region code is different, - * simply return the corresponding pre-defined table. + /* Return the FW cfp table for requested region code, if + * available. If region is not forced and the requested region + * code is different, simply return the corresponding + * pre-defined table. */ if (pmadapter->otp_region && pmadapter->cfp_otp_bg) { if (pmadapter->otp_region->force_reg || @@ -1202,12 +1243,13 @@ wlan_get_region_cfp_table(pmlan_adapter pmadapter, t_u8 region, t_u8 band, * @param cfp_src Source table * @param num_cfp_src Number of elements in source table */ -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) +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) { int i, j; + ENTER(); if (cfp == cfp_src) { @@ -1238,8 +1280,8 @@ wlan_cfp_copy_dynamic(pmlan_adapter pmadapter, } /******************************************************** - Global Functions -********************************************************/ + * Global Functions + ********************************************************/ /** * @brief This function converts region string to integer code * @@ -1250,9 +1292,9 @@ wlan_cfp_copy_dynamic(pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_misc_country_2_cfp_table_code(pmlan_adapter pmadapter, t_u8 *country_code, - t_u8 *cfp_bg, t_u8 *cfp_a) +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 i; @@ -1271,8 +1313,8 @@ wlan_misc_country_2_cfp_table_code(pmlan_adapter pmadapter, t_u8 *country_code, /* If still not found, look for code in EU country code table */ for (i = 0; i < NELEMENTS(eu_country_code_table); i++) { - if (!memcmp(pmadapter, eu_country_code_table[i], - country_code, COUNTRY_CODE_LEN - 1)) { + if (!memcmp(pmadapter, eu_country_code_table[i], country_code, + COUNTRY_CODE_LEN - 1)) { *cfp_bg = EU_CFP_CODE_BG; *cfp_a = EU_CFP_CODE_A; LEAVE(); @@ -1292,18 +1334,16 @@ wlan_misc_country_2_cfp_table_code(pmlan_adapter pmadapter, t_u8 *country_code, * * @return MTRUE or MFALSE */ -t_bool -wlan_is_etsi_country(pmlan_adapter pmadapter, t_u8 *country_code) +t_bool wlan_is_etsi_country(pmlan_adapter pmadapter, t_u8 *country_code) { - t_u8 i; ENTER(); /* Look for code in EU country code table */ for (i = 0; i < NELEMENTS(eu_country_code_table); i++) { - if (!memcmp(pmadapter, eu_country_code_table[i], - country_code, COUNTRY_CODE_LEN - 1)) { + if (!memcmp(pmadapter, eu_country_code_table[i], country_code, + COUNTRY_CODE_LEN - 1)) { LEAVE(); return MTRUE; } @@ -1313,21 +1353,20 @@ wlan_is_etsi_country(pmlan_adapter pmadapter, t_u8 *country_code) return MFALSE; } -#define BAND_MASK_5G 0x03 -#define ANTENNA_OFFSET 2 +#define BAND_MASK_5G 0x03 +#define ANTENNA_OFFSET 2 /** * @brief This function adjust the antenna index * * V16_FW_API: Bit0: ant A, Bit 1:ant B, Bit0 & Bit 1: A+B * 8887: case1: 0 - 2.4G ant A, 1- 2.4G antB, 2-- 5G ant C * case2: 0 - 2.4G ant A, 1- 2.4G antB, 0x80- 5G antA, 0x81-5G ant B - * @param priv A pointer to mlan_private structure - * @param prx_pd A pointer to the RxPD structure + * @param priv A pointer to mlan_private structure + * @param prx_pd A pointer to the RxPD structure * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -t_u8 -wlan_adjust_antenna(pmlan_private priv, RxPD *prx_pd) +t_u8 wlan_adjust_antenna(pmlan_private priv, RxPD *prx_pd) { t_u8 antenna = prx_pd->antenna; #if defined(SD8887) || defined(SD8987) @@ -1343,6 +1382,7 @@ wlan_adjust_antenna(pmlan_private priv, RxPD *prx_pd) else if (antenna & MBIT(0)) antenna = 0; } + #if defined(SD8887) || defined(SD8987) if (MFALSE #ifdef SD8887 @@ -1351,10 +1391,10 @@ wlan_adjust_antenna(pmlan_private priv, RxPD *prx_pd) #ifdef SD8987 || IS_SD8987(priv->adapter->card_type) #endif - ) { + ) { if ((priv->adapter->antinfo & ANT_DIVERSITY_2G) && (priv->adapter->antinfo & ANT_DIVERSITY_5G)) { -#define MAX_2G_CHAN 14 +#define MAX_2G_CHAN 14 if (rx_channel > MAX_2G_CHAN) antenna += ANTENNA_OFFSET; } @@ -1372,44 +1412,42 @@ wlan_adjust_antenna(pmlan_private priv, RxPD *prx_pd) * @param rate_info rate info * @return rate index */ -t_u16 -wlan_adjust_data_rate(mlan_private *priv, t_u8 rx_rate, t_u8 rate_info) +t_u16 wlan_adjust_data_rate(mlan_private *priv, t_u8 rx_rate, t_u8 rate_info) { t_u16 rate_index = 0; t_u8 bw = 0; t_u8 nss = 0; t_bool sgi_enable = 0; t_u8 gi = 0; -#define MAX_MCS_NUM_AX 12 +#define MAX_MCS_NUM_AX 12 -#define MAX_MCS_NUM_SUPP 16 -#define MAX_MCS_NUM_AC 10 -#define RATE_INDEX_MCS0 12 +#define MAX_MCS_NUM_SUPP 16 +#define MAX_MCS_NUM_AC 10 +#define RATE_INDEX_MCS0 12 bw = (rate_info & 0xC) >> 2; sgi_enable = (rate_info & 0x10) >> 4; if ((rate_info & 0x3) == 0) { - rate_index = - (rx_rate > - MLAN_RATE_INDEX_OFDM0) ? rx_rate - 1 : rx_rate; + rate_index = (rx_rate > MLAN_RATE_INDEX_OFDM0) ? rx_rate - 1 : + rx_rate; } else if ((rate_info & 0x03) == 1) { rate_index = RATE_INDEX_MCS0 + - MAX_MCS_NUM_SUPP * 2 * sgi_enable + - MAX_MCS_NUM_SUPP * bw + rx_rate; + MAX_MCS_NUM_SUPP * 2 * sgi_enable + + MAX_MCS_NUM_SUPP * bw + rx_rate; } else if ((rate_info & 0x3) == 2) { if (IS_STREAM_2X2(priv->adapter->feature_control)) - nss = rx_rate >> 4; //0:NSS1, 1:NSS2 + nss = rx_rate >> 4; // 0:NSS1, 1:NSS2 rate_index = RATE_INDEX_MCS0 + MAX_MCS_NUM_SUPP * 4 + - MAX_MCS_NUM_AC * 6 * sgi_enable + - MAX_MCS_NUM_AC * 2 * bw + MAX_MCS_NUM_AC * nss + - (rx_rate & 0x0f); + MAX_MCS_NUM_AC * 6 * sgi_enable + + MAX_MCS_NUM_AC * 2 * bw + MAX_MCS_NUM_AC * nss + + (rx_rate & 0x0f); } else if ((rate_info & 0x3) == 3) { gi = (rate_info & 0x10) >> 4 | (rate_info & 0x80) >> 6; if (IS_STREAM_2X2(priv->adapter->feature_control)) - nss = rx_rate >> 4; //0:NSS1, 1:NSS2 + nss = rx_rate >> 4; // 0:NSS1, 1:NSS2 rate_index = RATE_INDEX_MCS0 + MAX_MCS_NUM_SUPP * 4 + - MAX_MCS_NUM_AC * 12 + - MAX_MCS_NUM_AX * 6 * gi + MAX_MCS_NUM_AX * 2 * bw + - MAX_MCS_NUM_AX * nss + (rx_rate & 0x0f); + MAX_MCS_NUM_AC * 12 + MAX_MCS_NUM_AX * 6 * gi + + MAX_MCS_NUM_AX * 2 * bw + MAX_MCS_NUM_AX * nss + + (rx_rate & 0x0f); } return rate_index; } @@ -1427,44 +1465,63 @@ wlan_adjust_data_rate(mlan_private *priv, t_u8 rx_rate, t_u8 rate_info) * * @return Data rate or 0 */ -t_u32 -wlan_index_to_data_rate(pmlan_adapter pmadapter, t_u8 index, t_u8 tx_rate_info, - t_u8 ext_rate_info) +t_u32 wlan_index_to_data_rate(pmlan_adapter pmadapter, t_u8 index, + t_u8 tx_rate_info, t_u8 ext_rate_info) { -#define MCS_NUM_SUPP 16 +#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 */ + {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 */ + 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 +#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 */ + {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 */ + /* 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 */ + {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 */ + {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; @@ -1475,6 +1532,7 @@ wlan_index_to_data_rate(pmlan_adapter pmadapter, t_u8 index, t_u8 tx_rate_info, t_u8 bw = 0; t_u8 gi = 0; + ENTER(); PRINTM(MINFO, "%s:index=%d, tx_rate_info=%d, ext_rate_info=%d\n", @@ -1498,7 +1556,8 @@ wlan_index_to_data_rate(pmlan_adapter pmadapter, t_u8 index, t_u8 tx_rate_info, /* NSS = 1 */ rate = ac_mcs_rate_nss1[2 * (3 - bw) + gi][mcs_index]; } else - if ((tx_rate_info & 0x3) == MLAN_RATE_FORMAT_HE) { + + if ((tx_rate_info & 0x3) == MLAN_RATE_FORMAT_HE) { /* VHT rate */ mcs_index = index & 0xF; he_dcm = ext_rate_info & MBIT(0); @@ -1508,9 +1567,11 @@ wlan_index_to_data_rate(pmlan_adapter pmadapter, t_u8 index, t_u8 tx_rate_info, /* 20M: bw=0, 40M: bw=1, 80M: bw=2, 160M: bw=3 */ bw = (tx_rate_info & (MBIT(3) | MBIT(2))) >> 2; - /* BIT7:BIT4 0:0= 0.8us,0:1= 0.8us, 1:0=1.6us, 1:1=3.2us or 0.8us */ - gi = (tx_rate_info & MBIT(4)) >> 4 | (tx_rate_info & MBIT(7)) >> - 6; + /* BIT7:BIT4 0:0= 0.8us,0:1= 0.8us, 1:0=1.6us, 1:1=3.2us or + * 0.8us + */ + gi = (tx_rate_info & MBIT(4)) >> 4 | + (tx_rate_info & MBIT(7)) >> 6; /* STBC: BIT5 in tx rate info */ stbc = (tx_rate_info & MBIT(5)) >> 5; @@ -1524,137 +1585,117 @@ wlan_index_to_data_rate(pmlan_adapter pmadapter, t_u8 index, t_u8 tx_rate_info, stbc = 0; he_dcm = 0; } - /* map to gi 0:0.8us,1:1.6us 2:3.2us */ + /* map to gi 0:0.8us,1:1.6us 2:3.2us*/ if (gi > 0) gi = gi - 1; he_tone = (ext_rate_info & 0xE) >> 1; - //TODO: hardcode he_tone here, wait for FW value ready. + // TODO: hardcode he_tone here, wait for FW value ready. he_tone = 4; if ((index >> 4) == 1) { switch (mcs_index) { case 0: case 1: - if (he_tone < 3) { - rate = ax_tone_ru_rate_nss2[3 * - (2 - - he_tone) + - gi] - [mcs_index * 2 + he_dcm]; - } else { - rate = ax_mcs_rate_nss2[3 * (3 - bw) + - gi][mcs_index * - 2 + he_dcm]; - } + // #if 0 + // if (he_tone < 3) { + // rate = + //ax_tone_ru_rate_nss2[3*(2-he_tone)+gi][mcs_index*2 + //+ he_dcm]; + // } else { + // #endif + rate = ax_mcs_rate_nss2[3 * (3 - bw) + gi] + [mcs_index * 2 + he_dcm]; break; case 2: - if (he_tone < 3) { - rate = ax_tone_ru_rate_nss2[3 * - (2 - - he_tone) + - gi] - [mcs_index * 2]; - } else { - rate = ax_mcs_rate_nss2[3 * (3 - bw) + - gi][mcs_index * - 2]; - } + // #if 0 + // if (he_tone < 3) { + // rate = + //ax_tone_ru_rate_nss2[3*(2-he_tone)+gi][mcs_index*2]; + // } else { + // #endif + rate = ax_mcs_rate_nss2[3 * (3 - bw) + gi] + [mcs_index * 2]; break; case 3: case 4: - if (he_tone < 3) { - rate = ax_tone_ru_rate_nss2[3 * - (2 - - he_tone) + - gi] - [mcs_index * 2 - 1 + he_dcm]; - } else { - rate = ax_mcs_rate_nss2[3 * (3 - bw) + - gi][mcs_index * - 2 - 1 + - he_dcm]; - } + // #if 0 + // if (he_tone < 3) { + // rate = + //ax_tone_ru_rate_nss2[3*(2-he_tone)+gi][mcs_index*2 + //- 1 + he_dcm]; + // } else { + // #endif + rate = ax_mcs_rate_nss2[3 * (3 - bw) + gi] + [mcs_index * 2 - 1 + + he_dcm]; break; default: - if (he_tone < 3) { - rate = ax_tone_ru_rate_nss2[3 * - (2 - - he_tone) + - gi] - [mcs_index + 4]; - } else { - rate = ax_mcs_rate_nss2[3 * (3 - bw) + - gi][mcs_index + - 4]; - } + // #if 0 + // if (he_tone < 3) { + // rate = + //ax_tone_ru_rate_nss2[3*(2-he_tone)+gi][mcs_index + //+ 4]; + // } else { + // #endif + rate = ax_mcs_rate_nss2[3 * (3 - bw) + gi] + [mcs_index + 4]; break; } } else { switch (mcs_index) { case 0: case 1: - if (he_tone < 3) { - rate = ax_tone_ru_rate_nss1[3 * - (2 - - he_tone) + - gi] - [mcs_index * 2 + he_dcm]; - } else { - rate = ax_mcs_rate_nss1[3 * (3 - bw) + - gi][mcs_index * - 2 + he_dcm]; - } + // #if 0 + // if (he_tone < 3) { + // rate = + //ax_tone_ru_rate_nss1[3*(2-he_tone)+gi][mcs_index*2 + //+ he_dcm]; + // } else { + // #endif + rate = ax_mcs_rate_nss1[3 * (3 - bw) + gi] + [mcs_index * 2 + he_dcm]; break; case 2: - if (he_tone < 3) { - rate = ax_tone_ru_rate_nss1[3 * - (2 - - he_tone) + - gi] - [mcs_index * 2]; - } else { - rate = ax_mcs_rate_nss1[3 * (3 - bw) + - gi][mcs_index * - 2]; - } + // #if 0 + // if (he_tone < 3) { + // rate = + //ax_tone_ru_rate_nss1[3*(2-he_tone)+gi][mcs_index*2]; + // } else { + // #endif + rate = ax_mcs_rate_nss1[3 * (3 - bw) + gi] + [mcs_index * 2]; break; case 3: case 4: - if (he_tone < 3) { - rate = ax_tone_ru_rate_nss1[3 * - (2 - - he_tone) + - gi] - [mcs_index * 2 - 1 + he_dcm]; - - } else { - rate = ax_mcs_rate_nss1[3 * (3 - bw) + - gi][mcs_index * - 2 - 1 + - he_dcm]; - } + // #if 0 + // if (he_tone < 3) { + // rate = + //ax_tone_ru_rate_nss1[3*(2-he_tone)+gi][mcs_index*2 + //- 1 + he_dcm]; + // } else { + // #endif + rate = ax_mcs_rate_nss1[3 * (3 - bw) + gi] + [mcs_index * 2 - 1 + + he_dcm]; break; default: - if (he_tone < 3) { - rate = ax_tone_ru_rate_nss1[3 * - (2 - - he_tone) + - gi] - [mcs_index + 4]; - } else { - rate = ax_mcs_rate_nss1[3 * (3 - bw) + - gi][mcs_index + - 4]; - } + // #if 0 + // if (he_tone < 3) { + // rate = + //ax_tone_ru_rate_nss1[3*(2-he_tone)+gi][mcs_index + //+ 4]; + // } else { + // #endif + rate = ax_mcs_rate_nss1[3 * (3 - bw) + gi] + [mcs_index + 4]; break; } } - } else - if ((tx_rate_info & 0x3) == MLAN_RATE_FORMAT_HT) { + } else if ((tx_rate_info & 0x3) == MLAN_RATE_FORMAT_HT) { /* HT rate */ /* 20M: bw=0, 40M: bw=1 */ bw = (tx_rate_info & 0xC) >> 2; @@ -1662,9 +1703,9 @@ wlan_index_to_data_rate(pmlan_adapter pmadapter, t_u8 index, t_u8 tx_rate_info, gi = (tx_rate_info & 0x10) >> 4; if (index == MLAN_RATE_BITMAP_MCS0) { if (gi == 1) - rate = 0x0D; /* MCS 32 SGI rate */ + rate = 0x0D; /* MCS 32 SGI rate */ else - rate = 0x0C; /* MCS 32 LGI rate */ + rate = 0x0C; /* MCS 32 LGI rate */ } else if (index < MCS_NUM_SUPP) { if (bw <= 1) rate = mcs_rate[2 * (1 - bw) + gi][index]; @@ -1690,8 +1731,7 @@ wlan_index_to_data_rate(pmlan_adapter pmadapter, t_u8 index, t_u8 tx_rate_info, * * @return Index or 0 */ -t_u8 -wlan_data_rate_to_index(pmlan_adapter pmadapter, t_u32 rate) +t_u8 wlan_data_rate_to_index(pmlan_adapter pmadapter, t_u32 rate) { t_u16 *ptr; @@ -1718,9 +1758,8 @@ wlan_data_rate_to_index(pmlan_adapter pmadapter, t_u32 rate) * * @return The number of Rates */ -t_u32 -wlan_get_active_data_rates(mlan_private *pmpriv, t_u32 bss_mode, - t_u16 config_bands, WLAN_802_11_RATES rates) +t_u32 wlan_get_active_data_rates(mlan_private *pmpriv, t_u32 bss_mode, + t_u16 config_bands, WLAN_802_11_RATES rates) { t_u32 k; @@ -1741,8 +1780,8 @@ wlan_get_active_data_rates(mlan_private *pmpriv, t_u32 bss_mode, #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 @@ -1750,8 +1789,7 @@ wlan_get_active_data_rates(mlan_private *pmpriv, t_u32 bss_mode, * * @return The Tx power */ -t_u8 -wlan_get_txpwr_of_chan_from_cfp(mlan_private *pmpriv, t_u8 channel) +t_u8 wlan_get_txpwr_of_chan_from_cfp(mlan_private *pmpriv, t_u8 channel) { t_u8 i = 0; t_u8 j = 0; @@ -1771,9 +1809,8 @@ wlan_get_txpwr_of_chan_from_cfp(mlan_private *pmpriv, t_u8 channel) 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); + tx_power = MIN(tx_power, + (cfp + j)->max_tx_power); else tx_power = (t_u8)(cfp + j)->max_tx_power; @@ -1793,9 +1830,8 @@ wlan_get_txpwr_of_chan_from_cfp(mlan_private *pmpriv, t_u8 channel) MIN(tx_power, (cfp_a + j)->max_tx_power); else - tx_power = - (t_u8)((cfp_a + - j)->max_tx_power); + tx_power = (t_u8)( + (cfp_a + j)->max_tx_power); break; } } @@ -1813,12 +1849,12 @@ wlan_get_txpwr_of_chan_from_cfp(mlan_private *pmpriv, t_u8 channel) * @param channel The channel to search for * @param region_channel A pointer to region_chan_t structure * - * @return A pointer to chan_freq_power_t structure or MNULL if not found. + * @return A pointer to chan_freq_power_t structure or + * MNULL if not found. */ chan_freq_power_t * -wlan_get_cfp_by_band_and_channel(pmlan_adapter pmadapter, - t_u8 band, +wlan_get_cfp_by_band_and_channel(pmlan_adapter pmadapter, t_u8 band, t_u16 channel, region_chan_t *region_channel) { region_chan_t *rc; @@ -1838,7 +1874,8 @@ wlan_get_cfp_by_band_and_channel(pmlan_adapter pmadapter, case BAND_AN: case BAND_A | BAND_AN: case BAND_A | BAND_AN | BAND_AAC: - case BAND_A: /* Matching BAND_A */ + /* Fall Through */ + case BAND_A: /* Matching BAND_A */ break; default: @@ -1855,8 +1892,11 @@ wlan_get_cfp_by_band_and_channel(pmlan_adapter pmadapter, 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 */ + /* Fall Through */ + case BAND_B: /* Matching BAND_B/G */ + /* Fall Through */ case BAND_G: + /* Fall Through */ case 0: break; default: @@ -1879,8 +1919,8 @@ wlan_get_cfp_by_band_and_channel(pmlan_adapter pmadapter, } if (!cfp && channel) - PRINTM(MCMND, "wlan_get_cfp_by_band_and_channel(): cannot find " - "cfp by band %d & channel %d\n", band, channel); + PRINTM(MCMND, "%s: can not find cfp by band %d & channel %d\n", + __func__, band, channel); LEAVE(); return cfp; @@ -1893,11 +1933,11 @@ wlan_get_cfp_by_band_and_channel(pmlan_adapter pmadapter, * @param band It can be BAND_A, BAND_G or BAND_B * @param channel The channel to search for * - * @return A pointer to chan_freq_power_t structure or MNULL if not found. + * @return A pointer to chan_freq_power_t structure or MNULL if not + * found. */ -chan_freq_power_t * -wlan_find_cfp_by_band_and_channel(mlan_adapter *pmadapter, - t_u8 band, t_u16 channel) +chan_freq_power_t *wlan_find_cfp_by_band_and_channel(mlan_adapter *pmadapter, + t_u8 band, t_u16 channel) { chan_freq_power_t *cfp = MNULL; @@ -1906,13 +1946,11 @@ wlan_find_cfp_by_band_and_channel(mlan_adapter *pmadapter, /* 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); + 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); + cfp = wlan_get_cfp_by_band_and_channel( + pmadapter, band, channel, pmadapter->region_channel); LEAVE(); return cfp; @@ -1927,8 +1965,8 @@ wlan_find_cfp_by_band_and_channel(mlan_adapter *pmadapter, * * @return Pointer to chan_freq_power_t structure; MNULL if not found */ -chan_freq_power_t * -wlan_find_cfp_by_band_and_freq(mlan_adapter *pmadapter, t_u8 band, t_u32 freq) +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; @@ -1952,7 +1990,8 @@ wlan_find_cfp_by_band_and_freq(mlan_adapter *pmadapter, t_u8 band, t_u32 freq) case BAND_AN: case BAND_A | BAND_AN: case BAND_A | BAND_AN | BAND_AAC: - case BAND_A: /* Matching BAND_A */ + /* Fall Through */ + case BAND_A: /* Matching BAND_A */ break; default: continue; @@ -1968,8 +2007,11 @@ wlan_find_cfp_by_band_and_freq(mlan_adapter *pmadapter, t_u8 band, t_u32 freq) case BAND_B | BAND_G | BAND_GN | BAND_GAC: case BAND_G | BAND_GN | BAND_GAC: case BAND_B | BAND_G: + /* Fall Through */ case BAND_B: + /* Fall Through */ case BAND_G: + /* Fall Through */ case 0: break; default: @@ -1988,9 +2030,8 @@ wlan_find_cfp_by_band_and_freq(mlan_adapter *pmadapter, t_u8 band, t_u32 freq) } if (!cfp && freq) - PRINTM(MERROR, - "wlan_find_cfp_by_band_and_freq(): cannot find cfp by " - "band %d & freq %d\n", band, freq); + PRINTM(MERROR, "%s: cannot find cfp by band %d & freq %d\n", + __func__, band, freq); LEAVE(); return cfp; @@ -2004,8 +2045,7 @@ wlan_find_cfp_by_band_and_freq(mlan_adapter *pmadapter, t_u8 band, t_u32 freq) * * @return MTRUE or MFALSE */ -t_u8 -wlan_is_rate_auto(mlan_private *pmpriv) +t_u8 wlan_is_rate_auto(mlan_private *pmpriv) { t_u32 i; int rate_num = 0; @@ -2032,8 +2072,7 @@ wlan_is_rate_auto(mlan_private *pmpriv) * * @return Rate index */ -int -wlan_get_rate_index(pmlan_adapter pmadapter, t_u16 *rate_bitmap, int size) +int wlan_get_rate_index(pmlan_adapter pmadapter, t_u16 *rate_bitmap, int size) { int i; @@ -2060,9 +2099,8 @@ wlan_get_rate_index(pmlan_adapter pmadapter, t_u16 *rate_bitmap, int size) * * @return The number of Rates */ -t_u32 -wlan_get_supported_rates(mlan_private *pmpriv, t_u32 bss_mode, - t_u16 config_bands, WLAN_802_11_RATES rates) +t_u32 wlan_get_supported_rates(mlan_private *pmpriv, t_u32 bss_mode, + t_u16 config_bands, WLAN_802_11_RATES rates) { t_u32 k = 0; @@ -2091,9 +2129,12 @@ wlan_get_supported_rates(mlan_private *pmpriv, t_u32 bss_mode, 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_A | BAND_B | BAND_G | BAND_GN | BAND_AN | BAND_AAC | BAND_AAX: - case BAND_A | BAND_B | BAND_G | BAND_GN | BAND_AN | BAND_AAC | BAND_GAC | BAND_AAX | BAND_GAX: + case BAND_A | BAND_B | BAND_G | BAND_GN | BAND_AN | BAND_AAC | + BAND_GAC: + case BAND_A | BAND_B | BAND_G | BAND_GN | BAND_AN | BAND_AAC | + BAND_AAX: + case BAND_A | BAND_B | BAND_G | BAND_GN | BAND_AN | BAND_AAC | + BAND_GAC | BAND_AAX | BAND_GAX: case BAND_B | BAND_G | BAND_GN: case BAND_B | BAND_G | BAND_GN | BAND_GAC: case BAND_B | BAND_G | BAND_GN | BAND_GAC | BAND_GAX: @@ -2177,23 +2218,25 @@ wlan_get_supported_rates(mlan_private *pmpriv, t_u32 bss_mode, #define COUNTRY_ID_CN 2 #define COUNTRY_ID_EU 3 typedef struct _oper_bw_chan { - /*non-global operating class */ + /*non-global operating class*/ t_u8 oper_class; - /*global operating class */ + /*global operating class*/ t_u8 global_oper_class; - /*bandwidth 0-20M 1-40M 2-80M 3-160M */ + /*bandwidth 0-20M 1-40M 2-80M 3-160M*/ t_u8 bandwidth; - /*channel list */ + /*channel list*/ t_u8 channel_list[13]; } oper_bw_chan; /** oper class table for US*/ static oper_bw_chan oper_bw_chan_us[] = { - /** non-Global oper class, global oper class, bandwidth, channel list*/ + /** non-Global oper class, global oper class, bandwidth, channel list*/ {1, 115, 0, {36, 40, 44, 48}}, {2, 118, 0, {52, 56, 60, 64}}, {3, 124, 0, {149, 153, 157, 161}}, - {4, 121, 0, + {4, + 121, + 0, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 144}}, {5, 125, 0, {149, 153, 157, 161, 165}}, {12, 81, 0, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}}, @@ -2213,10 +2256,9 @@ static oper_bw_chan oper_bw_chan_us[] = { {129, 129, 3, {50, 114}}, {130, 130, 2, {42, 58, 106, 122, 138, 155}}, }; - /** oper class table for EU*/ static oper_bw_chan oper_bw_chan_eu[] = { - /** non-global oper class,global oper class, bandwidth, channel list*/ + /** non-global oper class,global oper class, bandwidth, channel list*/ {1, 115, 0, {36, 40, 44, 48}}, {2, 118, 0, {52, 56, 60, 64}}, {3, 121, 0, {100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140}}, @@ -2234,10 +2276,9 @@ static oper_bw_chan oper_bw_chan_eu[] = { {129, 129, 3, {50, 114}}, {130, 130, 2, {42, 58, 106, 122, 138, 155}}, }; - /** oper class table for Japan*/ static oper_bw_chan oper_bw_chan_jp[] = { - /** non-Global oper class,global oper class, bandwidth, channel list*/ + /** non-Global oper class,global oper class, bandwidth, channel list*/ {1, 115, 0, {34, 38, 42, 46, 36, 40, 44, 48}}, {30, 81, 0, {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}}, {31, 82, 0, {14}}, @@ -2262,10 +2303,9 @@ static oper_bw_chan oper_bw_chan_jp[] = { {129, 129, 3, {50, 114}}, {130, 130, 2, {42, 58, 106, 122, 138, 155}}, }; - /** oper class table for China*/ static oper_bw_chan oper_bw_chan_cn[] = { - /** non-Global oper class,global oper class, bandwidth, channel list*/ + /** non-Global oper class,global oper class, bandwidth, channel list*/ {1, 115, 0, {36, 40, 44, 48}}, {2, 118, 0, {52, 56, 60, 64}}, {3, 125, 0, {149, 153, 157, 161, 165}}, @@ -2288,26 +2328,24 @@ static oper_bw_chan oper_bw_chan_cn[] = { * * @return A pointer to oper_bw_chan */ -oper_bw_chan * -wlan_get_nonglobal_operclass_table(mlan_private *pmpriv, int *arraysize) +oper_bw_chan *wlan_get_nonglobal_operclass_table(mlan_private *pmpriv, + int *arraysize) { - t_u8 country_code[][COUNTRY_CODE_LEN] = { "US", "JP", "CN" }; + t_u8 country_code[][COUNTRY_CODE_LEN] = {"US", "JP", "CN"}; int country_id = 0; oper_bw_chan *poper_bw_chan = MNULL; ENTER(); for (country_id = 0; country_id < 3; country_id++) - if (!memcmp - (pmpriv->adapter, pmpriv->adapter->country_code, - country_code[country_id], COUNTRY_CODE_LEN - 1)) + if (!memcmp(pmpriv->adapter, pmpriv->adapter->country_code, + country_code[country_id], COUNTRY_CODE_LEN - 1)) break; if (country_id >= 3) - country_id = COUNTRY_ID_US; /*Set default to US */ - if (wlan_is_etsi_country - (pmpriv->adapter, pmpriv->adapter->country_code)) - country_id = COUNTRY_ID_EU; - /** Country in EU */ + country_id = COUNTRY_ID_US; /*Set default to US*/ + if (wlan_is_etsi_country(pmpriv->adapter, + pmpriv->adapter->country_code)) + country_id = COUNTRY_ID_EU; /** Country in EU */ switch (country_id) { case COUNTRY_ID_US: @@ -2344,14 +2382,13 @@ wlan_get_nonglobal_operclass_table(mlan_private *pmpriv, int *arraysize) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_check_operclass_validation(mlan_private *pmpriv, t_u8 channel, - t_u8 oper_class) +mlan_status wlan_check_operclass_validation(mlan_private *pmpriv, t_u8 channel, + t_u8 oper_class) { int arraysize = 0, i = 0, channum = 0; oper_bw_chan *poper_bw_chan = MNULL; t_u8 center_freq_idx = 0; - t_u8 center_freqs[] = { 42, 50, 58, 106, 114, 122, 138, 155 }; + t_u8 center_freqs[] = {42, 50, 58, 106, 114, 122, 138, 155}; ENTER(); @@ -2368,9 +2405,8 @@ wlan_check_operclass_validation(mlan_private *pmpriv, t_u8 channel, return MLAN_STATUS_FAILURE; } if (oper_class >= 128) { - center_freq_idx = - wlan_get_center_freq_idx(pmpriv, BAND_AAC, channel, - CHANNEL_BW_80MHZ); + center_freq_idx = wlan_get_center_freq_idx( + pmpriv, BAND_AAC, channel, CHANNEL_BW_80MHZ); channel = center_freq_idx; } poper_bw_chan = wlan_get_nonglobal_operclass_table(pmpriv, &arraysize); @@ -2389,7 +2425,7 @@ wlan_check_operclass_validation(mlan_private *pmpriv, t_u8 channel, channum++) { if (poper_bw_chan[i].channel_list[channum] && poper_bw_chan[i].channel_list[channum] == - channel) { + channel) { LEAVE(); return MLAN_STATUS_SUCCESS; } @@ -2413,13 +2449,12 @@ wlan_check_operclass_validation(mlan_private *pmpriv, t_u8 channel, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_get_curr_oper_class(mlan_private *pmpriv, t_u8 channel, t_u8 bw, - t_u8 *oper_class) +mlan_status wlan_get_curr_oper_class(mlan_private *pmpriv, t_u8 channel, + t_u8 bw, t_u8 *oper_class) { oper_bw_chan *poper_bw_chan = MNULL; t_u8 center_freq_idx = 0; - t_u8 center_freqs[] = { 42, 50, 58, 106, 114, 122, 138, 155 }; + t_u8 center_freqs[] = {42, 50, 58, 106, 114, 122, 138, 155}; int i = 0, arraysize = 0, channum = 0; ENTER(); @@ -2439,9 +2474,8 @@ wlan_get_curr_oper_class(mlan_private *pmpriv, t_u8 channel, t_u8 bw, } } if (bw == BW_80MHZ) { - center_freq_idx = - wlan_get_center_freq_idx(pmpriv, BAND_AAC, channel, - CHANNEL_BW_80MHZ); + center_freq_idx = wlan_get_center_freq_idx( + pmpriv, BAND_AAC, channel, CHANNEL_BW_80MHZ); channel = center_freq_idx; } @@ -2452,7 +2486,7 @@ wlan_get_curr_oper_class(mlan_private *pmpriv, t_u8 channel, t_u8 bw, channum++) { if (poper_bw_chan[i].channel_list[channum] && poper_bw_chan[i].channel_list[channum] == - channel) { + channel) { *oper_class = poper_bw_chan[i].oper_class; return MLAN_STATUS_SUCCESS; @@ -2475,42 +2509,33 @@ wlan_get_curr_oper_class(mlan_private *pmpriv, t_u8 channel, t_u8 bw, * * @return Length */ -int -wlan_add_supported_oper_class_ie(IN mlan_private *pmpriv, OUT t_u8 **pptlv_out, - t_u8 curr_oper_class) +int wlan_add_supported_oper_class_ie(IN mlan_private *pmpriv, + OUT t_u8 **pptlv_out, t_u8 curr_oper_class) { - - t_u8 oper_class_us[] = - { 1, 2, 3, 4, 5, 12, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 128, 129, 130 - }; - t_u8 oper_class_eu[] = - { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 17, 128, 129, 130 - }; - t_u8 oper_class_jp[] = - { 1, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 56, 57, 58, 128, 129, 130 - }; - t_u8 oper_class_cn[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 128, 129, 130 - }; - t_u8 country_code[][COUNTRY_CODE_LEN] = { "US", "JP", "CN" }; + t_u8 oper_class_us[] = {1, 2, 3, 4, 5, 12, 22, 23, 24, 25, 26, + 27, 28, 29, 30, 31, 32, 33, 128, 129, 130}; + t_u8 oper_class_eu[] = {1, 2, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 17, 128, 129, 130}; + t_u8 oper_class_jp[] = {1, 30, 31, 32, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, 43, 44, + 45, 56, 57, 58, 128, 129, 130}; + t_u8 oper_class_cn[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 128, 129, 130}; + t_u8 country_code[][COUNTRY_CODE_LEN] = {"US", "JP", "CN"}; int country_id = 0, ret = 0; MrvlIETypes_SuppOperClass_t *poper_class = MNULL; ENTER(); for (country_id = 0; country_id < 3; country_id++) - if (!memcmp - (pmpriv->adapter, pmpriv->adapter->country_code, - country_code[country_id], COUNTRY_CODE_LEN - 1)) + if (!memcmp(pmpriv->adapter, pmpriv->adapter->country_code, + country_code[country_id], COUNTRY_CODE_LEN - 1)) break; if (country_id >= 3) - country_id = COUNTRY_ID_US; /*Set default to US */ - if (wlan_is_etsi_country - (pmpriv->adapter, pmpriv->adapter->country_code)) - country_id = COUNTRY_ID_EU; - /** Country in EU */ - poper_class = (MrvlIETypes_SuppOperClass_t *) * pptlv_out; + country_id = COUNTRY_ID_US; /*Set default to US*/ + if (wlan_is_etsi_country(pmpriv->adapter, + pmpriv->adapter->country_code)) + country_id = COUNTRY_ID_EU; /** Country in EU */ + poper_class = (MrvlIETypes_SuppOperClass_t *)*pptlv_out; memset(pmpriv->adapter, poper_class, 0, sizeof(MrvlIETypes_SuppOperClass_t)); poper_class->header.type = wlan_cpu_to_le16(REGULATORY_CLASS); @@ -2556,8 +2581,7 @@ wlan_add_supported_oper_class_ie(IN mlan_private *pmpriv, OUT t_u8 **pptlv_out, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_set_regiontable(mlan_private *pmpriv, t_u8 region, t_u8 band) +mlan_status wlan_set_regiontable(mlan_private *pmpriv, t_u8 region, t_u8 band) { mlan_adapter *pmadapter = pmpriv->adapter; int i = 0, j; @@ -2577,7 +2601,7 @@ wlan_set_regiontable(mlan_private *pmpriv, t_u8 region, t_u8 band) if (band & (BAND_B | BAND_G | BAND_GN)) { if (pmadapter->cfp_code_bg) cfp_code_bg = pmadapter->cfp_code_bg; - PRINTM(MCMND, "wlan_set_regiontable 2.4G 0x%x\n", cfp_code_bg); + PRINTM(MCMND, "%s: 2.4G 0x%x\n", __func__, cfp_code_bg); cfp = wlan_get_region_cfp_table(pmadapter, cfp_code_bg, BAND_G | BAND_B | BAND_GN, &cfp_no); @@ -2614,7 +2638,7 @@ wlan_set_regiontable(mlan_private *pmpriv, t_u8 region, t_u8 band) if (band & (BAND_A | BAND_AN | BAND_AAC)) { if (pmadapter->cfp_code_bg) cfp_code_a = pmadapter->cfp_code_a; - PRINTM(MCMND, "wlan_set_regiontable 5G 0x%x\n", cfp_code_a); + PRINTM(MCMND, "%s: 5G 0x%x\n", __func__, cfp_code_a); cfp = wlan_get_region_cfp_table(pmadapter, cfp_code_a, BAND_A, &cfp_no); if (cfp) { @@ -2655,8 +2679,7 @@ wlan_set_regiontable(mlan_private *pmpriv, t_u8 region, t_u8 band) * - MTRUE if radar detection is required * - MFALSE otherwise */ -t_bool -wlan_get_cfp_radar_detect(mlan_private *priv, t_u8 chnl) +t_bool wlan_get_cfp_radar_detect(mlan_private *priv, t_u8 chnl) { int i, j; t_bool required = MFALSE; @@ -2664,7 +2687,7 @@ wlan_get_cfp_radar_detect(mlan_private *priv, t_u8 chnl) ENTER(); - /*get the cfp table first */ + /*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; @@ -2673,12 +2696,13 @@ wlan_get_cfp_radar_detect(mlan_private *priv, t_u8 chnl) } if (!pcfp) { - /*This means operation in BAND-A is not support, we can - just return false here, it's harmless */ + /* 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 */ + /*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; @@ -2702,8 +2726,7 @@ done: * - MFALSE otherwise */ -t_bool -wlan_bg_scan_type_is_passive(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; @@ -2711,7 +2734,7 @@ wlan_bg_scan_type_is_passive(mlan_private *priv, t_u8 chnl) ENTER(); - /*get the cfp table first */ + /*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; @@ -2720,12 +2743,13 @@ wlan_bg_scan_type_is_passive(mlan_private *priv, t_u8 chnl) } if (!pcfp) { - /*This means operation in BAND-B or BAND_G is not support, we can - * just return false here*/ + /*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 */ + /*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; @@ -2750,8 +2774,7 @@ done: * - MFALSE otherwise */ -t_bool -wlan_is_chan_passive(mlan_private *priv, t_u8 band, t_u8 chan) +t_bool wlan_is_chan_passive(mlan_private *priv, t_u8 band, t_u8 chan) { int i, j; t_bool passive = MFALSE; @@ -2794,8 +2817,7 @@ wlan_is_chan_passive(mlan_private *priv, t_u8 band, t_u8 chan) * - MFALSE otherwise */ -t_bool -wlan_is_chan_disabled(mlan_private *priv, t_u8 band, t_u8 chan) +t_bool wlan_is_chan_disabled(mlan_private *priv, t_u8 band, t_u8 chan) { int i, j; t_bool disabled = MFALSE; @@ -2815,8 +2837,8 @@ wlan_is_chan_disabled(mlan_private *priv, t_u8 band, t_u8 chan) /* check table according to chan num */ for (j = 0; j < priv->adapter->region_channel[i].num_cfp; j++) { if (pcfp[j].channel == chan) { - if (pcfp[j].dynamic. - flags & NXP_CHANNEL_DISABLED) + if (pcfp[j].dynamic.flags & + NXP_CHANNEL_DISABLED) disabled = MTRUE; break; } @@ -2839,8 +2861,7 @@ wlan_is_chan_disabled(mlan_private *priv, t_u8 band, t_u8 chan) * - MFALSE otherwise */ -t_bool -wlan_is_chan_blacklisted(mlan_private *priv, t_u8 band, t_u8 chan) +t_bool wlan_is_chan_blacklisted(mlan_private *priv, t_u8 band, t_u8 chan) { int i, j; t_bool blacklist = MFALSE; @@ -2848,7 +2869,7 @@ wlan_is_chan_blacklisted(mlan_private *priv, t_u8 band, t_u8 chan) ENTER(); - /*get the cfp table first */ + /*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; @@ -2857,7 +2878,7 @@ wlan_is_chan_blacklisted(mlan_private *priv, t_u8 band, t_u8 chan) } if (pcfp) { - /*check table according to chan num */ + /*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; @@ -2883,8 +2904,8 @@ wlan_is_chan_blacklisted(mlan_private *priv, t_u8 band, t_u8 chan) * - MFALSE otherwise */ -t_bool -wlan_set_chan_blacklist(mlan_private *priv, t_u8 band, t_u8 chan, t_bool bl) +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; @@ -2892,7 +2913,7 @@ wlan_set_chan_blacklist(mlan_private *priv, t_u8 band, t_u8 chan, t_bool bl) ENTER(); - /*get the cfp table first */ + /*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; @@ -2901,7 +2922,7 @@ wlan_set_chan_blacklist(mlan_private *priv, t_u8 band, t_u8 chan, t_bool bl) } if (pcfp) { - /*check table according to chan num */ + /*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; @@ -2925,9 +2946,8 @@ wlan_set_chan_blacklist(mlan_private *priv, t_u8 band, t_u8 chan, t_bool bl) * @return * Rate ID in terms of MRVL format */ -t_u8 -wlan_ieee_rateid_to_mrvl_rateid(mlan_private *priv, t_u16 IeeeMacRate, - t_u8 *dst_mac) +t_u8 wlan_ieee_rateid_to_mrvl_rateid(mlan_private *priv, t_u16 IeeeMacRate, + t_u8 *dst_mac) { /* Set default rate ID to RATEID_DBPSK1Mbps */ t_u8 mrvlRATEID = 0; @@ -2947,27 +2967,24 @@ wlan_ieee_rateid_to_mrvl_rateid(mlan_private *priv, t_u16 IeeeMacRate, rate_tbl = rate_map_table_2x2; cnt = sizeof(rate_map_table_2x2) / sizeof(rate_map); } + #ifdef UAP_SUPPORT if (priv->bss_role == MLAN_BSS_ROLE_UAP) { if (!dst_mac) { LEAVE(); return mrvlRATEID; } - 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); + 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); if (!sta_ptr) { LEAVE(); return mrvlRATEID; } while (sta_ptr != (sta_node *)&priv->sta_list) { - if (memcmp - (priv->adapter, dst_mac, sta_ptr->mac_addr, - MLAN_MAC_ADDR_LENGTH)) { + if (memcmp(priv->adapter, dst_mac, sta_ptr->mac_addr, + MLAN_MAC_ADDR_LENGTH)) { htcap = &(sta_ptr->HTcap); break; } @@ -2976,9 +2993,8 @@ wlan_ieee_rateid_to_mrvl_rateid(mlan_private *priv, t_u16 IeeeMacRate, } #endif #ifdef STA_SUPPORT - if (priv->bss_role == MLAN_BSS_ROLE_STA) { + if (priv->bss_role == MLAN_BSS_ROLE_STA) htcap = priv->curr_bss_params.bss_descriptor.pht_cap; - } #endif if (htcap) { /* If user configure tx to 2x2 and peer device rx is 2x2 */ @@ -3006,8 +3022,7 @@ wlan_ieee_rateid_to_mrvl_rateid(mlan_private *priv, t_u16 IeeeMacRate, * @return * Rate ID in terms of IEEE format */ -t_u8 -wlan_mrvl_rateid_to_ieee_rateid(t_u8 rate) +t_u8 wlan_mrvl_rateid_to_ieee_rateid(t_u8 rate) { return rateUnit_500Kbps[rate]; } @@ -3023,8 +3038,7 @@ wlan_mrvl_rateid_to_ieee_rateid(t_u8 rate) * @return * None */ -void -wlan_add_fw_cfp_tables(pmlan_private pmpriv, t_u8 *buf, t_u16 buf_left) +void wlan_add_fw_cfp_tables(pmlan_private pmpriv, t_u8 *buf, t_u16 buf_left) { mlan_adapter *pmadapter = pmpriv->adapter; mlan_callbacks *pcb = (mlan_callbacks *)&pmadapter->callbacks; @@ -3082,39 +3096,38 @@ wlan_add_fw_cfp_tables(pmlan_private pmpriv, t_u8 *buf, t_u16 buf_left) if (ret != MLAN_STATUS_SUCCESS || !pmadapter->otp_region) { PRINTM(MERROR, - "Memory allocation for the otp region" - " info struct failed!\n"); + "Memory allocation for the otp region info struct failed!\n"); break; } /* Save region info values from OTP in the otp_region * structure */ memcpy_ext(pmadapter, pmadapter->otp_region, data, - sizeof(pmadapter->otp_region), + sizeof(otp_region_info_t), sizeof(otp_region_info_t)); data += sizeof(otp_region_info_t); - /* Get pre-defined cfp tables corresponding to the region code - * in OTP + /* Get pre-defined cfp tables corresponding to the + * region code in OTP */ for (i = 0; i < MLAN_CFP_TABLE_SIZE_BG; i++) { if (cfp_table_BG[i].code == pmadapter->otp_region->region_code) { - max_tx_pwr_bg = - (cfp_table_BG[i].cfp)-> - max_tx_power; + max_tx_pwr_bg = (cfp_table_BG[i].cfp) + ->max_tx_power; break; } } for (i = 0; i < MLAN_CFP_TABLE_SIZE_A; i++) { if (cfp_table_A[i].code == pmadapter->otp_region->region_code) { - max_tx_pwr_a = - (cfp_table_A[i].cfp)-> - max_tx_power; + max_tx_pwr_a = (cfp_table_A[i].cfp) + ->max_tx_power; break; } } - /* Update the region code and the country code in pmadapter */ + /* Update the region code and the country code in + * pmadapter + */ pmadapter->region_code = pmadapter->otp_region->region_code; pmadapter->country_code[0] = @@ -3142,23 +3155,23 @@ wlan_add_fw_cfp_tables(pmlan_private pmpriv, t_u8 *buf, t_u16 buf_left) break; } - ret = pcb->moal_malloc(pmadapter->pmoal_handle, - pmadapter-> - tx_power_table_bg_rows * - sizeof(chan_freq_power_t), - MLAN_MEM_DEF, - (t_u8 **)&pmadapter->cfp_otp_bg); + ret = pcb->moal_malloc( + pmadapter->pmoal_handle, + pmadapter->tx_power_table_bg_rows * + sizeof(chan_freq_power_t), + MLAN_MEM_DEF, (t_u8 **)&pmadapter->cfp_otp_bg); if (ret != MLAN_STATUS_SUCCESS || !pmadapter->cfp_otp_bg) { PRINTM(MERROR, - "Memory allocation for storing otp bg" - " table data failed!\n"); + "Memory allocation for storing otp bg table data failed!\n"); break; } - /* Save channel usability flags from OTP data in the fw cfp bg - * table and set frequency and max_tx_power values + /* Save channel usability flags from OTP data in the fw + * cfp bg table and set frequency and max_tx_power + * values */ - for (i = 0; i < pmadapter->tx_power_table_bg_rows; i++) { + for (i = 0; i < pmadapter->tx_power_table_bg_rows; + i++) { (pmadapter->cfp_otp_bg + i)->channel = *data; if (*data == 14) (pmadapter->cfp_otp_bg + i)->freq = @@ -3172,25 +3185,24 @@ wlan_add_fw_cfp_tables(pmlan_private pmpriv, t_u8 *buf, t_u16 buf_left) (pmadapter->cfp_otp_bg + i)->dynamic.flags = *data; if (*data & NXP_CHANNEL_DFS) - (pmadapter->cfp_otp_bg + - i)->passive_scan_or_radar_detect = - MTRUE; + (pmadapter->cfp_otp_bg + i) + ->passive_scan_or_radar_detect = + MTRUE; data++; } - ret = pcb->moal_malloc(pmadapter->pmoal_handle, - pmadapter-> - tx_power_table_a_rows * - sizeof(chan_freq_power_t), - MLAN_MEM_DEF, - (t_u8 **)&pmadapter->cfp_otp_a); - if (ret != MLAN_STATUS_SUCCESS || !pmadapter->cfp_otp_a) { + ret = pcb->moal_malloc( + pmadapter->pmoal_handle, + pmadapter->tx_power_table_a_rows * + sizeof(chan_freq_power_t), + MLAN_MEM_DEF, (t_u8 **)&pmadapter->cfp_otp_a); + if (ret != MLAN_STATUS_SUCCESS || + !pmadapter->cfp_otp_a) { PRINTM(MERROR, - "Memory allocation for storing otp a" - " table data failed!\n"); + "Memory allocation for storing otp a table data failed!\n"); break; } - /* Save channel usability flags from OTP data in the fw cfp a - * table and set frequency and max_tx_power values + /* Save channel usability flags from OTP data in the fw + * cfp a table and set frequency and max_tx_power values */ for (i = 0; i < pmadapter->tx_power_table_a_rows; i++) { (pmadapter->cfp_otp_a + i)->channel = *data; @@ -3208,15 +3220,16 @@ wlan_add_fw_cfp_tables(pmlan_private pmpriv, t_u8 *buf, t_u16 buf_left) (pmadapter->cfp_otp_a + i)->dynamic.flags = *data; if (*data & NXP_CHANNEL_DFS) - (pmadapter->cfp_otp_a + - i)->passive_scan_or_radar_detect = - MTRUE; + (pmadapter->cfp_otp_a + i) + ->passive_scan_or_radar_detect = + MTRUE; data++; } break; case TLV_TYPE_POWER_TABLE: - /* Skip adding fw power tables if this TLV has no data or - * if they already exists but force reg rule is set in the otp + /* Skip adding fw power tables if this TLV has no data + * or if they already exists but force reg rule is set + * in the otp */ if (*data == 0) break; @@ -3225,25 +3238,26 @@ wlan_add_fw_cfp_tables(pmlan_private pmpriv, t_u8 *buf, t_u16 buf_left) pmadapter->tx_power_table_bg) break; - /* Save the tlv data in power tables for band BG and A */ + /* Save the tlv data in power tables for band BG and A + */ tmp = data; i = 0; - while ((i < pmadapter->tx_power_table_bg_rows * - pmadapter->tx_power_table_bg_cols) - && (i < tlv_buf_len) && (*tmp != 36)) { + while ((i < + pmadapter->tx_power_table_bg_rows * + pmadapter->tx_power_table_bg_cols) && + (i < tlv_buf_len) && (*tmp != 36)) { i++; tmp++; } if (!pmadapter->tx_power_table_bg) { - ret = pcb->moal_malloc(pmadapter->pmoal_handle, - i, MLAN_MEM_DEF, - (t_u8 **)&pmadapter-> - tx_power_table_bg); + ret = pcb->moal_malloc( + pmadapter->pmoal_handle, i, + MLAN_MEM_DEF, + (t_u8 **)&pmadapter->tx_power_table_bg); if (ret != MLAN_STATUS_SUCCESS || !pmadapter->tx_power_table_bg) { PRINTM(MERROR, - "Memory allocation for the BG-band" - " power table falied!\n"); + "Memory allocation for the BG-band power table failed!\n"); break; } } @@ -3252,24 +3266,21 @@ wlan_add_fw_cfp_tables(pmlan_private pmpriv, t_u8 *buf, t_u16 buf_left) pmadapter->tx_power_table_bg_size = i; data += i; i = 0; - while ((i < - pmadapter->tx_power_table_a_rows * - pmadapter->tx_power_table_a_cols) - && (i < - (tlv_buf_len - - pmadapter->tx_power_table_bg_size))) { + while ((i < pmadapter->tx_power_table_a_rows * + pmadapter->tx_power_table_a_cols) && + (i < (tlv_buf_len - + pmadapter->tx_power_table_bg_size))) { i++; } if (!pmadapter->tx_power_table_a) { - ret = pcb->moal_malloc(pmadapter->pmoal_handle, - i, MLAN_MEM_DEF, - (t_u8 **)&pmadapter-> - tx_power_table_a); + ret = pcb->moal_malloc( + pmadapter->pmoal_handle, i, + MLAN_MEM_DEF, + (t_u8 **)&pmadapter->tx_power_table_a); if (ret != MLAN_STATUS_SUCCESS || !pmadapter->tx_power_table_a) { PRINTM(MERROR, - "Memory allocation for the A-band" - " power table failed!\n"); + "Memory allocation for the A-band power table failed!\n"); break; } } @@ -3279,13 +3290,13 @@ wlan_add_fw_cfp_tables(pmlan_private pmpriv, t_u8 *buf, t_u16 buf_left) break; case TLV_TYPE_POWER_TABLE_ATTR: pmadapter->tx_power_table_bg_rows = - ((power_table_attr_t *) data)->rows_2g; + ((power_table_attr_t *)data)->rows_2g; pmadapter->tx_power_table_bg_cols = - ((power_table_attr_t *) data)->cols_2g; + ((power_table_attr_t *)data)->cols_2g; pmadapter->tx_power_table_a_rows = - ((power_table_attr_t *) data)->rows_5g; + ((power_table_attr_t *)data)->rows_5g; pmadapter->tx_power_table_a_cols = - ((power_table_attr_t *) data)->cols_5g; + ((power_table_attr_t *)data)->cols_5g; break; default: break; @@ -3326,8 +3337,7 @@ out: * * @param pmadapter A pointer to mlan_adapter structure */ -void -wlan_free_fw_cfp_tables(mlan_adapter *pmadapter) +void wlan_free_fw_cfp_tables(mlan_adapter *pmadapter) { pmlan_callbacks pcb; @@ -3369,8 +3379,8 @@ wlan_free_fw_cfp_tables(mlan_adapter *pmadapter) * @return success, otherwise fail * */ -mlan_status -wlan_get_cfpinfo(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_get_cfpinfo(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { chan_freq_power_t *cfp_bg = MNULL; t_u32 cfp_no_bg = 0; @@ -3480,7 +3490,7 @@ wlan_get_cfpinfo(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) /* No. of cols */ size = pmadapter->tx_power_table_bg_size / - pmadapter->tx_power_table_bg_rows; + pmadapter->tx_power_table_bg_rows; memcpy_ext(pmadapter, req_buf + len, tmp, sizeof(size), sizeof(size)); len += sizeof(size); memcpy_ext(pmadapter, req_buf + len, pmadapter->tx_power_table_bg, @@ -3500,7 +3510,7 @@ wlan_get_cfpinfo(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) /* No. of cols */ size = pmadapter->tx_power_table_a_size / - pmadapter->tx_power_table_a_rows; + pmadapter->tx_power_table_a_rows; memcpy_ext(pmadapter, req_buf + len, tmp, sizeof(size), sizeof(size)); len += sizeof(size); memcpy_ext(pmadapter, req_buf + len, pmadapter->tx_power_table_a, diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_cmdevt.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_cmdevt.c index ee39ecdfb8e1..21164f0f954d 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_cmdevt.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_cmdevt.c @@ -64,8 +64,8 @@ Change Log: * @param pcmd_node A pointer to cmd_ctrl_node structure * @return N/A */ -static t_void -wlan_queue_scan_cmd(IN mlan_private *pmpriv, IN cmd_ctrl_node *pcmd_node) +static t_void wlan_queue_scan_cmd(IN mlan_private *pmpriv, + IN cmd_ctrl_node *pcmd_node) { mlan_adapter *pmadapter = pmpriv->adapter; @@ -90,16 +90,14 @@ done: * * @return N/A */ -void -wlan_check_scan_queue(IN pmlan_adapter pmadapter) +void wlan_check_scan_queue(IN pmlan_adapter pmadapter) { cmd_ctrl_node *pcmd_node = MNULL; t_u16 num = 0; - pcmd_node = - (cmd_ctrl_node *)util_peek_list(pmadapter->pmoal_handle, - &pmadapter->scan_pending_q, - MNULL, MNULL); + pcmd_node = (cmd_ctrl_node *)util_peek_list(pmadapter->pmoal_handle, + &pmadapter->scan_pending_q, + MNULL, MNULL); if (!pcmd_node) { PRINTM(MERROR, "No pending scan command\n"); return; @@ -119,18 +117,16 @@ wlan_check_scan_queue(IN pmlan_adapter pmadapter) * * @return N/A */ -static void -wlan_dump_pending_commands(pmlan_adapter pmadapter) +static void wlan_dump_pending_commands(pmlan_adapter pmadapter) { cmd_ctrl_node *pcmd_node = MNULL; HostCmd_DS_COMMAND *pcmd; ENTER(); wlan_request_cmd_lock(pmadapter); - pcmd_node = - (cmd_ctrl_node *)util_peek_list(pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, - MNULL, MNULL); + pcmd_node = (cmd_ctrl_node *)util_peek_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + MNULL, MNULL); if (!pcmd_node) { wlan_release_cmd_lock(pmadapter); LEAVE(); @@ -151,17 +147,16 @@ wlan_dump_pending_commands(pmlan_adapter pmadapter) return; } -#define REASON_CODE_NO_CMD_NODE 1 -#define REASON_CODE_CMD_TIMEOUT 2 +#define REASON_CODE_NO_CMD_NODE 1 +#define REASON_CODE_CMD_TIMEOUT 2 #define REASON_CODE_CMD_TO_CARD_FAILURE 3 -#define REASON_CODE_EXT_SCAN_TIMEOUT 4 +#define REASON_CODE_EXT_SCAN_TIMEOUT 4 /** * @brief This function dump debug info * * @return N/A */ -t_void -wlan_dump_info(mlan_adapter *pmadapter, t_u8 reason) +t_void wlan_dump_info(mlan_adapter *pmadapter, t_u8 reason) { cmd_ctrl_node *pcmd_node = MNULL; #ifdef DEBUG_LEVEL1 @@ -198,8 +193,8 @@ wlan_dump_info(mlan_adapter *pmadapter, t_u8 reason) if ((reason == REASON_CODE_NO_CMD_NODE) && (pmadapter->dbg.num_no_cmd_node > 1)) { if (pmadapter->dbg.num_no_cmd_node >= 5) - wlan_recv_event(wlan_get_priv - (pmadapter, MLAN_BSS_ROLE_ANY), + wlan_recv_event(wlan_get_priv(pmadapter, + MLAN_BSS_ROLE_ANY), MLAN_EVENT_ID_DRV_DBG_DUMP, MNULL); LEAVE(); return; @@ -210,22 +205,21 @@ wlan_dump_info(mlan_adapter *pmadapter, t_u8 reason) 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]; + 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 defined(SDIO) || defined(PCIE) - if (!IS_USB(pmadapter->card_type) && pcmd_node->cmdbuf) { + if (!IS_USB(pmadapter->card_type) && + pcmd_node->cmdbuf) { t_u8 *pcmd_buf; - pcmd_buf = - pcmd_node->cmdbuf->pbuf + - pcmd_node->cmdbuf->data_offset + - pmadapter->ops.intf_header_len; + pcmd_buf = pcmd_node->cmdbuf->pbuf + + pcmd_node->cmdbuf->data_offset + + pmadapter->ops.intf_header_len; for (i = 0; i < 16; i++) PRINTM(MERROR, "%02x ", *pcmd_buf++); PRINTM(MERROR, "\n"); @@ -346,10 +340,8 @@ wlan_dump_info(mlan_adapter *pmadapter, t_u8 reason) pmadapter->pcard_sd->last_curr_wr_port[i]); for (j = 0; j < mp_aggr_pkt_limit; j++) { PRINTM(MERROR, "0x%02x ", - pmadapter->pcard_sd->last_mp_wr_info[i * - mp_aggr_pkt_limit - + - j]); + pmadapter->pcard_sd->last_mp_wr_info + [i * mp_aggr_pkt_limit + j]); } PRINTM(MERROR, "\n"); } @@ -367,8 +359,8 @@ wlan_dump_info(mlan_adapter *pmadapter, t_u8 reason) pmadapter->pcard_pcie->evtbd_rdptr, pmadapter->pcard_pcie->evtbd_wrptr); PRINTM(MERROR, "last_wr_index:%d\n", - pmadapter->pcard_pcie->txbd_wrptr & (MLAN_MAX_TXRX_BD - - 1)); + pmadapter->pcard_pcie->txbd_wrptr & + (MLAN_MAX_TXRX_BD - 1)); PRINTM(MERROR, "Tx pkt size:\n"); for (i = 0; i < MLAN_MAX_TXRX_BD; i++) { PRINTM(MERROR, "%04d ", @@ -383,20 +375,19 @@ wlan_dump_info(mlan_adapter *pmadapter, t_u8 reason) wlan_dump_ralist(pmadapter->priv[i]); } if (reason != REASON_CODE_CMD_TIMEOUT) { - if ((pmadapter->dbg.num_no_cmd_node >= 5) - || (pmadapter->pm_wakeup_card_req && - pmadapter->pm_wakeup_fw_try) - || (reason == REASON_CODE_EXT_SCAN_TIMEOUT) - ) { + if ((pmadapter->dbg.num_no_cmd_node >= 5) || + (pmadapter->pm_wakeup_card_req && + pmadapter->pm_wakeup_fw_try) || + (reason == REASON_CODE_EXT_SCAN_TIMEOUT)) { 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); + 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); @@ -411,8 +402,7 @@ wlan_dump_info(mlan_adapter *pmadapter, t_u8 reason) * * @return The converted hex if chr is a valid hex, else 0 */ -static t_u32 -wlan_hexval(t_u8 chr) +static t_u32 wlan_hexval(t_u8 chr) { if (chr >= '0' && chr <= '9') return chr - '0'; @@ -429,10 +419,10 @@ wlan_hexval(t_u8 chr) * * @param a A pointer to string to be converted * - * @return The converted hex value if param a is a valid hex, else 0 + * @return The converted hex value if param a is a valid hex, else + * 0 */ -int -wlan_atox(t_u8 *a) +int wlan_atox(t_u8 *a) { int i = 0; @@ -454,8 +444,7 @@ wlan_atox(t_u8 *a) * * @return The parsed hex data length */ -static t_u32 -wlan_parse_cal_cfg(t_u8 *src, t_size len, t_u8 *dst) +static t_u32 wlan_parse_cal_cfg(t_u8 *src, t_size len, t_u8 *dst) { t_u8 *ptr; t_u8 *dptr; @@ -490,8 +479,7 @@ wlan_parse_cal_cfg(t_u8 *src, t_size len, t_u8 *dst) * @return Location of the first occurrence of the char * if found, else NULL */ -t_u8 * -wlan_strchr(t_u8 *s, int c) +t_u8 *wlan_strchr(t_u8 *s, int c) { t_u8 *pos = s; while (*pos != '\0') { @@ -502,8 +490,8 @@ wlan_strchr(t_u8 *s, int c) return MNULL; } -#define CFG_TYPE_HOSTCMD 0 -#define CFG_TYPE_DPDFILE 1 +#define CFG_TYPE_HOSTCMD 0 +#define CFG_TYPE_DPDFILE 1 /** * @brief WOAL parse ASCII format raw data to hex format @@ -514,9 +502,9 @@ wlan_strchr(t_u8 *s, int c) * @param size data length * @return MLAN_STATUS_SUCCESS--success, otherwise--fail */ -static t_u32 -wlan_process_hostcmd_cfg(IN pmlan_private pmpriv, IN t_u16 cfg_type, - IN t_u8 *data, IN t_size size) +static t_u32 wlan_process_hostcmd_cfg(IN pmlan_private pmpriv, + IN t_u16 cfg_type, IN t_u8 *data, + IN t_size size) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u8 *pos = data; @@ -552,15 +540,15 @@ wlan_process_hostcmd_cfg(IN pmlan_private pmpriv, IN t_u16 cfg_type, while ((pos - data) < size) { while (*pos == ' ' || *pos == '\t') pos++; - if (*pos == '#') { /* Line comment */ + if (*pos == '#') { /* Line comment */ while (*pos != '\n') pos++; pos++; } - if ((*pos == '\r' && *(pos + 1) == '\n') || - *pos == '\n' || *pos == '\0') { + if ((*pos == '\r' && *(pos + 1) == '\n') || *pos == '\n' || + *pos == '\0') { pos++; - continue; /* Needn't process this line */ + continue; /* Needn't process this line */ } if (*pos == '}') { @@ -570,18 +558,14 @@ wlan_process_hostcmd_cfg(IN pmlan_private pmpriv, IN t_u16 cfg_type, pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_CFG_DATA); pcmd->size = wlan_cpu_to_le16(hostcmd->len); - pcfg_cmd = - (HostCmd_DS_802_11_CFG_DATA *)((t_u8 *) - pcmd + - S_DS_GEN); + pcfg_cmd = (HostCmd_DS_802_11_CFG_DATA + *)((t_u8 *)pcmd + S_DS_GEN); pcfg_cmd->action = wlan_cpu_to_le16(HostCmd_ACT_GEN_SET); pcfg_cmd->type = wlan_cpu_to_le16(OID_TYPE_DPD); - pcfg_cmd->data_len = - wlan_cpu_to_le16(hostcmd->len - - S_DS_GEN - - sizeof - (HostCmd_DS_802_11_CFG_DATA)); + pcfg_cmd->data_len = wlan_cpu_to_le16( + hostcmd->len - S_DS_GEN - + sizeof(HostCmd_DS_802_11_CFG_DATA)); pcmd = MNULL; pcfg_cmd = MNULL; } else { @@ -612,8 +596,7 @@ wlan_process_hostcmd_cfg(IN pmlan_private pmpriv, IN t_u16 cfg_type, if (cfg_type == CFG_TYPE_DPDFILE) { pcmd = (HostCmd_DS_GEN *)ptr; ptr += S_DS_GEN + - sizeof - (HostCmd_DS_802_11_CFG_DATA); + sizeof(HostCmd_DS_802_11_CFG_DATA); } continue; } @@ -648,10 +631,9 @@ wlan_process_hostcmd_cfg(IN pmlan_private pmpriv, IN t_u16 cfg_type, * * @return N/A */ -static void -wlan_init_cmd_node(IN pmlan_private pmpriv, - IN cmd_ctrl_node *pcmd_node, - IN t_u32 cmd_no, IN t_void *pioctl_buf, IN t_void *pdata_buf) +static void wlan_init_cmd_node(IN pmlan_private pmpriv, + IN cmd_ctrl_node *pcmd_node, IN t_u32 cmd_no, + IN t_void *pioctl_buf, IN t_void *pdata_buf) { mlan_adapter *pmadapter = pmpriv->adapter; @@ -668,10 +650,10 @@ wlan_init_cmd_node(IN pmlan_private pmpriv, #ifdef USB if (IS_USB(pmadapter->card_type)) { - pcmd_node->cmdbuf = wlan_alloc_mlan_buffer(pmadapter, - MRVDRV_SIZE_OF_CMD_BUFFER, - 0, - MOAL_MALLOC_BUFFER); + pcmd_node->cmdbuf = + wlan_alloc_mlan_buffer(pmadapter, + MRVDRV_SIZE_OF_CMD_BUFFER, 0, + MOAL_MALLOC_BUFFER); if (!pcmd_node->cmdbuf) { PRINTM(MERROR, "Failed to allocate cmd_buffer\n"); LEAVE(); @@ -712,8 +694,7 @@ wlan_init_cmd_node(IN pmlan_private pmpriv, * * @return cmd_ctrl_node A pointer to cmd_ctrl_node structure or MNULL */ -static cmd_ctrl_node * -wlan_get_cmd_node(mlan_adapter *pmadapter) +static cmd_ctrl_node *wlan_get_cmd_node(mlan_adapter *pmadapter) { cmd_ctrl_node *pcmd_node; @@ -726,12 +707,9 @@ wlan_get_cmd_node(mlan_adapter *pmadapter) wlan_request_cmd_lock(pmadapter); if (util_peek_list(pmadapter->pmoal_handle, &pmadapter->cmd_free_q, MNULL, MNULL)) { - pcmd_node = - (cmd_ctrl_node *)util_dequeue_list(pmadapter-> - pmoal_handle, - &pmadapter-> - cmd_free_q, MNULL, - MNULL); + pcmd_node = (cmd_ctrl_node *)util_dequeue_list( + pmadapter->pmoal_handle, &pmadapter->cmd_free_q, MNULL, + MNULL); } else { PRINTM(MERROR, "GET_CMD_NODE: cmd_ctrl_node is not available\n"); @@ -750,8 +728,8 @@ wlan_get_cmd_node(mlan_adapter *pmadapter) * * @return N/A */ -static t_void -wlan_clean_cmd_node(pmlan_adapter pmadapter, cmd_ctrl_node *pcmd_node) +static t_void wlan_clean_cmd_node(pmlan_adapter pmadapter, + cmd_ctrl_node *pcmd_node) { ENTER(); @@ -790,17 +768,15 @@ wlan_clean_cmd_node(pmlan_adapter pmadapter, cmd_ctrl_node *pcmd_node) * * @return A pointer to first entry match pioctl_req */ -static cmd_ctrl_node * -wlan_get_pending_scan_cmd(pmlan_adapter pmadapter) +static cmd_ctrl_node *wlan_get_pending_scan_cmd(pmlan_adapter pmadapter) { cmd_ctrl_node *pcmd_node = MNULL; ENTER(); - pcmd_node = - (cmd_ctrl_node *)util_peek_list(pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, - MNULL, MNULL); + pcmd_node = (cmd_ctrl_node *)util_peek_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + MNULL, MNULL); if (!pcmd_node) { LEAVE(); return MNULL; @@ -826,17 +802,16 @@ wlan_get_pending_scan_cmd(pmlan_adapter pmadapter) * * @return A pointer to first entry match pioctl_req */ -static cmd_ctrl_node * -wlan_get_pending_ioctl_cmd(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) +static cmd_ctrl_node *wlan_get_pending_ioctl_cmd(pmlan_adapter pmadapter, + pmlan_ioctl_req pioctl_req) { cmd_ctrl_node *pcmd_node = MNULL; ENTER(); - pcmd_node = - (cmd_ctrl_node *)util_peek_list(pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, - MNULL, MNULL); + pcmd_node = (cmd_ctrl_node *)util_peek_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + MNULL, MNULL); if (!pcmd_node) { LEAVE(); return MNULL; @@ -862,17 +837,16 @@ wlan_get_pending_ioctl_cmd(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) * * @return A pointer to first entry match pioctl_req */ -static cmd_ctrl_node * -wlan_get_bss_pending_ioctl_cmd(pmlan_adapter pmadapter, t_u32 bss_index) +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(); - pcmd_node = - (cmd_ctrl_node *)util_peek_list(pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, - MNULL, MNULL); + pcmd_node = (cmd_ctrl_node *)util_peek_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + MNULL, MNULL); if (!pcmd_node) { LEAVE(); return MNULL; @@ -900,9 +874,9 @@ wlan_get_bss_pending_ioctl_cmd(pmlan_adapter pmadapter, t_u32 bss_index) * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_host_cmd(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_host_cmd(IN pmlan_private pmpriv, + 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); @@ -930,9 +904,9 @@ wlan_ret_host_cmd(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_cmd_host_cmd(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, IN t_void *pdata_buf) +static mlan_status wlan_cmd_host_cmd(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_void *pdata_buf) { mlan_ds_misc_cmd *pcmd_ptr = (mlan_ds_misc_cmd *)pdata_buf; @@ -953,8 +927,7 @@ wlan_cmd_host_cmd(IN pmlan_private pmpriv, * * @return timeout value for this command */ -static t_u16 -wlan_get_cmd_timeout(t_u16 cmd_id) +static t_u16 wlan_get_cmd_timeout(t_u16 cmd_id) { t_u16 timeout; ENTER(); @@ -1001,10 +974,9 @@ wlan_get_cmd_timeout(t_u16 cmd_id) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_dnld_cmd_to_fw(IN mlan_private *pmpriv, IN cmd_ctrl_node *pcmd_node) +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; @@ -1052,10 +1024,9 @@ wlan_dnld_cmd_to_fw(IN mlan_private *pmpriv, IN cmd_ctrl_node *pcmd_node) /* 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)); + 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)); cmd_code = wlan_le16_to_cpu(pcmd->command); pcmd_node->cmd_no = cmd_code; timeout = wlan_get_cmd_timeout(cmd_code); @@ -1159,8 +1130,8 @@ wlan_dnld_cmd_to_fw(IN mlan_private *pmpriv, IN cmd_ctrl_node *pcmd_node) cmd_code &= HostCmd_CMD_ID_MASK; /* For the command who has no command response, we should return here */ - if (cmd_code == HostCmd_CMD_FW_DUMP_EVENT - || cmd_code == HostCmd_CMD_SOFT_RESET) { + if (cmd_code == HostCmd_CMD_FW_DUMP_EVENT || + cmd_code == HostCmd_CMD_SOFT_RESET) { if (pcmd_node->pioctl_buf) { PRINTM(MMSG, "CMD(0x%x) has no cmd resp: free curr_cmd and do ioctl_complete\n", @@ -1195,8 +1166,7 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_dnld_sleep_confirm_cmd(mlan_adapter *pmadapter) +static mlan_status wlan_dnld_sleep_confirm_cmd(mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; static t_u32 i; @@ -1205,8 +1175,7 @@ wlan_dnld_sleep_confirm_cmd(mlan_adapter *pmadapter) #endif opt_sleep_confirm_buffer *sleep_cfm_buf = (opt_sleep_confirm_buffer *)(pmadapter->psleep_cfm->pbuf + - pmadapter->psleep_cfm-> - data_offset); + pmadapter->psleep_cfm->data_offset); mlan_buffer *pmbuf = MNULL; mlan_private *pmpriv = MNULL; @@ -1225,9 +1194,8 @@ wlan_dnld_sleep_confirm_cmd(mlan_adapter *pmadapter) #endif pmadapter->seq_num++; sleep_cfm_buf->ps_cfm_sleep.seq_num = - wlan_cpu_to_le16(HostCmd_SET_SEQ_NO_BSS_INFO - (pmadapter->seq_num, pmpriv->bss_num, - pmpriv->bss_type)); + wlan_cpu_to_le16(HostCmd_SET_SEQ_NO_BSS_INFO( + pmadapter->seq_num, pmpriv->bss_num, pmpriv->bss_type)); DBG_HEXDUMP(MCMD_D, "SLEEP_CFM", &sleep_cfm_buf->ps_cfm_sleep, sizeof(OPT_Confirm_Sleep)); @@ -1248,7 +1216,7 @@ wlan_dnld_sleep_confirm_cmd(mlan_adapter *pmadapter) pmbuf->data_len = pmadapter->psleep_cfm->data_len; memcpy_ext(pmadapter, pmbuf->pbuf + pmbuf->data_offset, pmadapter->psleep_cfm->pbuf + - pmadapter->psleep_cfm->data_offset, + pmadapter->psleep_cfm->data_offset, pmadapter->psleep_cfm->data_len, pmbuf->data_len); } #endif /* USB */ @@ -1258,7 +1226,10 @@ wlan_dnld_sleep_confirm_cmd(mlan_adapter *pmadapter) pmadapter->psleep_cfm->data_len = cmd_len + pmadapter->ops.intf_header_len; #endif - ret = pmadapter->ops.host_to_card(pmpriv, MLAN_TYPE_CMD, pmbuf, MNULL); + + if (pmbuf) + ret = pmadapter->ops.host_to_card(pmpriv, MLAN_TYPE_CMD, pmbuf, + MNULL); #ifdef USB if (IS_USB(pmadapter->card_type) && (ret != MLAN_STATUS_PENDING)) @@ -1274,26 +1245,27 @@ wlan_dnld_sleep_confirm_cmd(mlan_adapter *pmadapter) #ifdef STA_SUPPORT if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) { if (!sleep_cfm_buf->ps_cfm_sleep.sleep_cfm.resp_ctrl) { - /* Response is not needed for sleep confirm command */ + /* 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)) { + 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); + wlan_host_sleep_activated_event( + wlan_get_priv(pmadapter, + MLAN_BSS_ROLE_STA), + MTRUE); } } #endif /* STA_SUPPORT */ PRINTM_NETINTF(MEVENT, pmpriv); -#define NUM_SC_PER_LINE 16 +#define NUM_SC_PER_LINE 16 if (++i % NUM_SC_PER_LINE == 0) PRINTM(MEVENT, "+\n"); else @@ -1318,8 +1290,8 @@ done: * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_recv_event(pmlan_private priv, mlan_event_id event_id, t_void *pmevent) +mlan_status wlan_recv_event(pmlan_private priv, mlan_event_id event_id, + t_void *pmevent) { pmlan_callbacks pcb = MNULL; @@ -1358,8 +1330,7 @@ wlan_recv_event(pmlan_private priv, mlan_event_id event_id, t_void *pmevent) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_alloc_cmd_buffer(IN mlan_adapter *pmadapter) +mlan_status wlan_alloc_cmd_buffer(IN mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_callbacks *pcb = (mlan_callbacks *)&pmadapter->callbacks; @@ -1388,10 +1359,9 @@ wlan_alloc_cmd_buffer(IN mlan_adapter *pmadapter) if (!IS_USB(pmadapter->card_type)) { /* Allocate and initialize command buffers */ for (i = 0; i < MRVDRV_NUM_OF_CMD_BUFFER; i++) { - pcmd_array[i].pmbuf = wlan_alloc_mlan_buffer(pmadapter, - MRVDRV_SIZE_OF_CMD_BUFFER, - 0, - MOAL_MALLOC_BUFFER); + pcmd_array[i].pmbuf = wlan_alloc_mlan_buffer( + pmadapter, MRVDRV_SIZE_OF_CMD_BUFFER, 0, + MOAL_MALLOC_BUFFER); if (!pcmd_array[i].pmbuf) { PRINTM(MERROR, "ALLOC_CMD_BUF: Failed to allocate command buffer\n"); @@ -1418,8 +1388,7 @@ done: * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_free_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; @@ -1442,7 +1411,6 @@ wlan_free_cmd_buffer(IN mlan_adapter *pmadapter) PRINTM(MINFO, "Free all the USB command buffer.\n"); wlan_free_mlan_buffer(pmadapter, pcmd_array[i].cmdbuf); pcmd_array[i].cmdbuf = MNULL; - } #endif #if defined(SDIO) || defined(PCIE) @@ -1455,13 +1423,11 @@ wlan_free_cmd_buffer(IN mlan_adapter *pmadapter) if (pcmd_array[i].respbuf) { #ifdef USB if (IS_USB(pmadapter->card_type)) - pmadapter->callbacks. - moal_recv_complete(pmadapter-> - pmoal_handle, - pcmd_array[i]. - respbuf, - pmadapter->rx_cmd_ep, - MLAN_STATUS_SUCCESS); + pmadapter->callbacks.moal_recv_complete( + pmadapter->pmoal_handle, + pcmd_array[i].respbuf, + pmadapter->rx_cmd_ep, + MLAN_STATUS_SUCCESS); #endif #if defined(SDIO) || defined(PCIE) if (!IS_USB(pmadapter->card_type)) @@ -1491,8 +1457,7 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_process_event(pmlan_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); @@ -1516,11 +1481,9 @@ wlan_process_event(pmlan_adapter pmadapter) pmbuf->pbuf + pmbuf->data_offset, sizeof(eventcause), sizeof(eventcause)); } else { - priv = wlan_get_priv_by_id(pmadapter, - EVENT_GET_BSS_NUM - (eventcause), - EVENT_GET_BSS_TYPE - (eventcause)); + priv = wlan_get_priv_by_id( + pmadapter, EVENT_GET_BSS_NUM(eventcause), + EVENT_GET_BSS_TYPE(eventcause)); if (priv) PRINTM_NETINTF(MEVENT, priv); PRINTM(MERROR, "Error processing DFS Event: 0x%x\n", @@ -1575,8 +1538,7 @@ done: * * @return N/A */ -t_void -wlan_request_cmd_lock(IN mlan_adapter *pmadapter) +t_void wlan_request_cmd_lock(IN mlan_adapter *pmadapter) { mlan_callbacks *pcb = (mlan_callbacks *)&pmadapter->callbacks; @@ -1596,8 +1558,7 @@ wlan_request_cmd_lock(IN mlan_adapter *pmadapter) * * @return N/A */ -t_void -wlan_release_cmd_lock(IN mlan_adapter *pmadapter) +t_void wlan_release_cmd_lock(IN mlan_adapter *pmadapter) { mlan_callbacks *pcb = (mlan_callbacks *)&pmadapter->callbacks; @@ -1623,11 +1584,9 @@ wlan_release_cmd_lock(IN mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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 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 = MNULL; @@ -1657,7 +1616,7 @@ wlan_prepare_cmd(IN mlan_private *pmpriv, #ifdef PCIE && (cmd_no != HostCmd_CMD_PCIE_HOST_BUF_DETAILS) #endif - ) { + ) { PRINTM(MERROR, "PREP_CMD: FW is in reset state\n"); if (pioctl_req) pioctl_req->status_code = @@ -1678,7 +1637,7 @@ wlan_prepare_cmd(IN mlan_private *pmpriv, ret = MLAN_STATUS_FAILURE; goto done; } - /** reset num no cmd node */ + /** reset num no cmd node */ pmadapter->dbg.num_no_cmd_node = 0; /* Initialize the command node */ @@ -1692,9 +1651,8 @@ wlan_prepare_cmd(IN mlan_private *pmpriv, goto done; } - cmd_ptr = - (HostCmd_DS_COMMAND *)(pcmd_node->cmdbuf->pbuf + - pcmd_node->cmdbuf->data_offset); + cmd_ptr = (HostCmd_DS_COMMAND *)(pcmd_node->cmdbuf->pbuf + + pcmd_node->cmdbuf->data_offset); cmd_ptr->command = cmd_no; cmd_ptr->result = 0; @@ -1725,11 +1683,11 @@ wlan_prepare_cmd(IN mlan_private *pmpriv, wlan_request_cmd_lock(pmadapter); /* Send command */ #ifdef STA_SUPPORT - if (cmd_no == HostCmd_CMD_802_11_SCAN - || cmd_no == HostCmd_CMD_802_11_SCAN_EXT) { + if (cmd_no == HostCmd_CMD_802_11_SCAN || + cmd_no == HostCmd_CMD_802_11_SCAN_EXT) { if (cmd_no == HostCmd_CMD_802_11_SCAN_EXT && - pmadapter->ext_scan && pmadapter->ext_scan_enh - && pmadapter->ext_scan_type == EXT_SCAN_ENHANCE) { + pmadapter->ext_scan && pmadapter->ext_scan_enh && + pmadapter->ext_scan_type == EXT_SCAN_ENHANCE) { wlan_insert_cmd_to_pending_q(pmadapter, pcmd_node, MFALSE); } else @@ -1762,9 +1720,8 @@ done: * * @return N/A */ -t_void -wlan_insert_cmd_to_free_q(IN mlan_adapter *pmadapter, - IN cmd_ctrl_node *pcmd_node) +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; @@ -1798,13 +1755,14 @@ done: * * @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 + * @param add_tail Specify if the cmd needs to be queued in the header or + * tail * * @return N/A */ -t_void -wlan_insert_cmd_to_pending_q(IN mlan_adapter *pmadapter, - IN cmd_ctrl_node *pcmd_node, IN t_u32 add_tail) +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; @@ -1833,13 +1791,13 @@ wlan_insert_cmd_to_pending_q(IN mlan_adapter *pmadapter, if (add_tail) { util_enqueue_list_tail(pmadapter->pmoal_handle, &pmadapter->cmd_pending_q, - (pmlan_linked_list)pcmd_node, - MNULL, MNULL); + (pmlan_linked_list)pcmd_node, MNULL, + MNULL); } else { util_enqueue_list_head(pmadapter->pmoal_handle, &pmadapter->cmd_pending_q, - (pmlan_linked_list)pcmd_node, - MNULL, MNULL); + (pmlan_linked_list)pcmd_node, MNULL, + MNULL); } PRINTM_NETINTF(MCMND, pcmd_node->priv); @@ -1859,8 +1817,7 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_exec_next_cmd(mlan_adapter *pmadapter) +mlan_status wlan_exec_next_cmd(mlan_adapter *pmadapter) { mlan_private *priv = MNULL; cmd_ctrl_node *pcmd_node = MNULL; @@ -1885,10 +1842,9 @@ wlan_exec_next_cmd(mlan_adapter *pmadapter) 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, - MNULL, MNULL); + pcmd_node = (cmd_ctrl_node *)util_peek_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + MNULL, MNULL); if (pcmd_node) { pcmd = (HostCmd_DS_COMMAND *)(pcmd_node->cmdbuf->pbuf + @@ -1908,11 +1864,12 @@ wlan_exec_next_cmd(mlan_adapter *pmadapter) 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))) { + /* 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); @@ -1935,8 +1892,7 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_process_cmdresp(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); @@ -1956,9 +1912,8 @@ wlan_process_cmdresp(mlan_adapter *pmadapter) if (pmadapter->curr_cmd) if (pmadapter->curr_cmd->pioctl_buf != MNULL) { - pioctl_buf = - (mlan_ioctl_req *)pmadapter->curr_cmd-> - pioctl_buf; + pioctl_buf = (mlan_ioctl_req *) + pmadapter->curr_cmd->pioctl_buf; } if (!pmadapter->curr_cmd || !pmadapter->curr_cmd->respbuf) { @@ -1973,12 +1928,11 @@ wlan_process_cmdresp(mlan_adapter *pmadapter) DBG_HEXDUMP(MCMD_D, "CMD_RESP", pmadapter->curr_cmd->respbuf->pbuf + - pmadapter->curr_cmd->respbuf->data_offset, + 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); + pmadapter->curr_cmd->respbuf->data_offset); orig_cmdresp_no = wlan_le16_to_cpu(resp->command); cmdresp_no = (orig_cmdresp_no & HostCmd_CMD_ID_MASK); if (pmadapter->curr_cmd->cmd_no != cmdresp_no) { @@ -2064,8 +2018,8 @@ wlan_process_cmdresp(mlan_adapter *pmadapter) 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)) + 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 */ @@ -2082,11 +2036,10 @@ wlan_process_cmdresp(mlan_adapter *pmadapter) /* 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); + pcb->moal_ioctl_complete( + pmadapter->pmoal_handle, + pmadapter->pwarm_reset_ioctl_req, + MLAN_STATUS_FAILURE); pmadapter->pwarm_reset_ioctl_req = MNULL; goto done; } @@ -2107,7 +2060,6 @@ wlan_process_cmdresp(mlan_adapter *pmadapter) if (pmadapter->pcard_pcie->reg->use_adma) #endif wlan_pcie_init_fw(pmadapter); - } #endif #endif @@ -2133,20 +2085,18 @@ wlan_process_cmdresp(mlan_adapter *pmadapter) (pmadapter->last_init_cmd == cmdresp_no)) { i = pmpriv->bss_index + 1; while (i < pmadapter->priv_num && - (!(pmpriv_next = pmadapter->priv[i]) - || pmpriv_next->bss_virtual)) + (!(pmpriv_next = pmadapter->priv[i]) || + pmpriv_next->bss_virtual)) i++; if (!pmpriv_next || i >= pmadapter->priv_num) { - #ifdef 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); + pcb->moal_ioctl_complete( + pmadapter->pmoal_handle, + pmadapter->pwarm_reset_ioctl_req, + MLAN_STATUS_SUCCESS); pmadapter->pwarm_reset_ioctl_req = MNULL; goto done; } @@ -2172,8 +2122,7 @@ done: * @param function_context A pointer to function_context * @return N/A */ -t_void -wlan_cmd_timeout_func(t_void *function_context) +t_void wlan_cmd_timeout_func(t_void *function_context) { mlan_adapter *pmadapter = (mlan_adapter *)function_context; cmd_ctrl_node *pcmd_node = MNULL; @@ -2218,10 +2167,9 @@ wlan_cmd_timeout_func(t_void *function_context) #if defined(SDIO) || defined(PCIE) if (!IS_USB(pmadapter->card_type) && pcmd_node->cmdbuf) { t_u8 *pcmd_buf; - pcmd_buf = - pcmd_node->cmdbuf->pbuf + - pcmd_node->cmdbuf->data_offset + - pmadapter->ops.intf_header_len; + pcmd_buf = pcmd_node->cmdbuf->pbuf + + pcmd_node->cmdbuf->data_offset + + pmadapter->ops.intf_header_len; for (i = 0; i < 16; i++) PRINTM(MERROR, "%02x ", *pcmd_buf++); PRINTM(MERROR, "\n"); @@ -2246,8 +2194,8 @@ wlan_cmd_timeout_func(t_void *function_context) wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_DBG_DUMP, MNULL); } else { - wlan_recv_event(wlan_get_priv - (pmadapter, MLAN_BSS_ROLE_ANY), + wlan_recv_event(wlan_get_priv(pmadapter, + MLAN_BSS_ROLE_ANY), MLAN_EVENT_ID_DRV_DBG_DUMP, MNULL); } } @@ -2265,19 +2213,16 @@ exit: * * @return N/A */ -t_void -wlan_flush_scan_queue(IN pmlan_adapter pmadapter) +t_void wlan_flush_scan_queue(IN pmlan_adapter pmadapter) { - cmd_ctrl_node *pcmd_node = MNULL; ENTER(); wlan_request_cmd_lock(pmadapter); - while ((pcmd_node = - (cmd_ctrl_node *)util_peek_list(pmadapter->pmoal_handle, - &pmadapter->scan_pending_q, - MNULL, MNULL))) { + while ((pcmd_node = (cmd_ctrl_node *)util_peek_list( + pmadapter->pmoal_handle, &pmadapter->scan_pending_q, + MNULL, MNULL))) { util_unlink_list(pmadapter->pmoal_handle, &pmadapter->scan_pending_q, (pmlan_linked_list)pcmd_node, MNULL, MNULL); @@ -2299,9 +2244,8 @@ wlan_flush_scan_queue(IN pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING */ -mlan_status -wlan_cancel_pending_scan_cmd(pmlan_adapter pmadapter, - pmlan_ioctl_req pioctl_req) +mlan_status wlan_cancel_pending_scan_cmd(pmlan_adapter pmadapter, + pmlan_ioctl_req pioctl_req) { pmlan_callbacks pcb = &pmadapter->callbacks; cmd_ctrl_node *pcmd_node = MNULL; @@ -2312,7 +2256,8 @@ wlan_cancel_pending_scan_cmd(pmlan_adapter pmadapter, PRINTM(MIOCTL, "Cancel scan command\n"); wlan_request_cmd_lock(pmadapter); - /* IOCTL will be completed, avoid calling IOCTL complete again from EVENT/CMDRESP */ + /* IOCTL will be completed, avoid calling IOCTL complete again from + * EVENT/CMDRESP */ if (pmadapter->pscan_ioctl_req) { pioctl_buf = pmadapter->pscan_ioctl_req; priv = pmadapter->priv[pioctl_buf->bss_index]; @@ -2347,9 +2292,11 @@ wlan_cancel_pending_scan_cmd(pmlan_adapter pmadapter, if (pmadapter->scan_processing && pmadapter->ext_scan_type == EXT_SCAN_ENHANCE) { if (priv) { - wlan_prepare_cmd(priv, HostCmd_CMD_802_11_SCAN_EXT, - HostCmd_ACT_GEN_SET, 0, pioctl_req, - MNULL); + if (MLAN_STATUS_FAILURE == + wlan_prepare_cmd(priv, HostCmd_CMD_802_11_SCAN_EXT, + HostCmd_ACT_GEN_SET, 0, pioctl_req, + MNULL)) + PRINTM(MERROR, "Failed to prepare command"); wlan_recv_event(priv, MLAN_EVENT_ID_DRV_DEFER_HANDLING, MNULL); status = MLAN_STATUS_PENDING; @@ -2369,8 +2316,7 @@ wlan_cancel_pending_scan_cmd(pmlan_adapter pmadapter, * * @return N/A */ -t_void -wlan_cancel_all_pending_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; @@ -2382,7 +2328,8 @@ wlan_cancel_all_pending_cmd(pmlan_adapter pmadapter) /* Cancel current cmd */ wlan_request_cmd_lock(pmadapter); #ifdef STA_SUPPORT - /* IOCTL will be completed, avoid calling IOCTL complete again from EVENT/CMDRESP */ + /* IOCTL will be completed, avoid calling IOCTL complete again from + * EVENT/CMDRESP */ if (pmadapter->pscan_ioctl_req) { pioctl_buf = pmadapter->pscan_ioctl_req; priv = pmadapter->priv[pioctl_buf->bss_index]; @@ -2407,10 +2354,9 @@ wlan_cancel_all_pending_cmd(pmlan_adapter pmadapter) } /* Cancel all pending command */ - while ((pcmd_node = - (cmd_ctrl_node *)util_peek_list(pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, - MNULL, MNULL))) { + while ((pcmd_node = (cmd_ctrl_node *)util_peek_list( + pmadapter->pmoal_handle, &pmadapter->cmd_pending_q, + MNULL, MNULL))) { util_unlink_list(pmadapter->pmoal_handle, &pmadapter->cmd_pending_q, (pmlan_linked_list)pcmd_node, MNULL, MNULL); @@ -2429,8 +2375,11 @@ wlan_cancel_all_pending_cmd(pmlan_adapter pmadapter) if (pmadapter->scan_processing && pmadapter->ext_scan_type == EXT_SCAN_ENHANCE) { if (priv) { - wlan_prepare_cmd(priv, HostCmd_CMD_802_11_SCAN_EXT, - HostCmd_ACT_GEN_SET, 0, MNULL, MNULL); + if (MLAN_STATUS_FAILURE == + wlan_prepare_cmd(priv, HostCmd_CMD_802_11_SCAN_EXT, + HostCmd_ACT_GEN_SET, 0, MNULL, + MNULL)) + PRINTM(MERROR, "Failed to prepare command"); wlan_recv_event(priv, MLAN_EVENT_ID_DRV_DEFER_HANDLING, MNULL); } @@ -2449,8 +2398,7 @@ wlan_cancel_all_pending_cmd(pmlan_adapter pmadapter) * * @return N/A */ -t_void -wlan_cancel_bss_pending_cmd(pmlan_adapter pmadapter, t_u32 bss_index) +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; @@ -2468,7 +2416,8 @@ wlan_cancel_bss_pending_cmd(pmlan_adapter pmadapter, t_u32 bss_index) #ifdef STA_SUPPORT if (pmadapter->pscan_ioctl_req && (pmadapter->pscan_ioctl_req->bss_index == bss_index)) { - /* IOCTL will be completed, avoid calling IOCTL complete again from EVENT/CMDRESP */ + /* IOCTL will be completed, avoid calling IOCTL complete again + * from EVENT/CMDRESP */ flash_scan = MTRUE; pioctl_buf = pmadapter->pscan_ioctl_req; priv = pmadapter->priv[pioctl_buf->bss_index]; @@ -2494,9 +2443,8 @@ wlan_cancel_bss_pending_cmd(pmlan_adapter pmadapter, t_u32 bss_index) MLAN_STATUS_FAILURE); } } - while ((pcmd_node = - wlan_get_bss_pending_ioctl_cmd(pmadapter, - bss_index)) != MNULL) { + 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, MNULL, MNULL); @@ -2517,13 +2465,16 @@ wlan_cancel_bss_pending_cmd(pmlan_adapter pmadapter, t_u32 bss_index) if (pmadapter->scan_processing && pmadapter->ext_scan_type == EXT_SCAN_ENHANCE) { if (priv) { - wlan_prepare_cmd(priv, - HostCmd_CMD_802_11_SCAN_EXT, - HostCmd_ACT_GEN_SET, 0, MNULL, - MNULL); - wlan_recv_event(priv, - MLAN_EVENT_ID_DRV_DEFER_HANDLING, - MNULL); + if (MLAN_STATUS_FAILURE == + wlan_prepare_cmd( + priv, HostCmd_CMD_802_11_SCAN_EXT, + HostCmd_ACT_GEN_SET, 0, MNULL, + MNULL)) + PRINTM(MERROR, + "failed to prepare command"); + wlan_recv_event( + priv, MLAN_EVENT_ID_DRV_DEFER_HANDLING, + MNULL); } } else /* Cancel all pending scan command */ @@ -2542,8 +2493,8 @@ wlan_cancel_bss_pending_cmd(pmlan_adapter pmadapter, t_u32 bss_index) * * @return N/A */ -t_void -wlan_cancel_pending_ioctl(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) +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; @@ -2560,7 +2511,8 @@ wlan_cancel_pending_ioctl(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) wlan_request_cmd_lock(pmadapter); #ifdef STA_SUPPORT - /* IOCTL will be completed, avoid calling IOCTL complete again from EVENT/CMDRESP */ + /* IOCTL will be completed, avoid calling IOCTL complete again from + * EVENT/CMDRESP */ if (pmadapter->pscan_ioctl_req == pioctl_req) { priv = pmadapter->priv[pioctl_req->bss_index]; pmadapter->pscan_ioctl_req = MNULL; @@ -2575,8 +2527,8 @@ wlan_cancel_pending_ioctl(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) find = MTRUE; } - while ((pcmd_node = - wlan_get_pending_ioctl_cmd(pmadapter, pioctl_req)) != MNULL) { + 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, MNULL, MNULL); @@ -2590,13 +2542,16 @@ wlan_cancel_pending_ioctl(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) if (pmadapter->scan_processing && pmadapter->ext_scan_type == EXT_SCAN_ENHANCE) { if (priv) { - wlan_prepare_cmd(priv, - HostCmd_CMD_802_11_SCAN_EXT, - HostCmd_ACT_GEN_SET, 0, MNULL, - MNULL); - wlan_recv_event(priv, - MLAN_EVENT_ID_DRV_DEFER_HANDLING, - MNULL); + if (MLAN_STATUS_FAILURE == + wlan_prepare_cmd( + priv, HostCmd_CMD_802_11_SCAN_EXT, + HostCmd_ACT_GEN_SET, 0, MNULL, + MNULL)) + PRINTM(MERROR, + "Failed to prepare command"); + wlan_recv_event( + priv, MLAN_EVENT_ID_DRV_DEFER_HANDLING, + MNULL); } } else /* Cancel all pending scan command */ @@ -2622,9 +2577,9 @@ wlan_cancel_pending_ioctl(pmlan_adapter pmadapter, pmlan_ioctl_req pioctl_req) * * @return N/A */ -t_void -wlan_fill_hal_wifi_rate(IN pmlan_private pmpriv, - IN mlan_wifi_rate * pmlan_rate, OUT wifi_rate * prate) +t_void wlan_fill_hal_wifi_rate(IN pmlan_private pmpriv, + IN mlan_wifi_rate *pmlan_rate, + OUT wifi_rate *prate) { t_u8 index = 0; t_u8 rate_info = 0; @@ -2649,14 +2604,16 @@ wlan_fill_hal_wifi_rate(IN pmlan_private pmpriv, rate_info = MLAN_RATE_FORMAT_LG; rate_info |= prate->bw << 2; PRINTM(MCMND, "index=0x%x rate_info=0x%x\n", index, rate_info); - /** For rateMcsIdx, OFDM/CCK rate code would be as per ieee std in the units of 0.5mbps. HT/VHT it would be mcs index */ - /** For bitrate, in 100kbps */ + /** For rateMcsIdx, OFDM/CCK rate code would be as per ieee std + * in the units of 0.5mbps. HT/VHT it would be mcs index */ + /** For bitrate, in 100kbps */ if (rate_info == MLAN_RATE_FORMAT_LG) prate->bitrate = prate->rateMcsIdx * 5; else prate->bitrate = wlan_index_to_data_rate(pmpriv->adapter, index, - rate_info, 0) * 5; + rate_info, 0) * + 5; PRINTM(MCMND, "bitrate(in 100kbps)=%d\n", prate->bitrate); } @@ -2672,9 +2629,9 @@ wlan_fill_hal_wifi_rate(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_ver_ext(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_ver_ext(IN pmlan_private pmpriv, + 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; @@ -2699,18 +2656,17 @@ wlan_ret_ver_ext(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_rx_mgmt_ind(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_rx_mgmt_ind(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { 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); + misc->param.mgmt_subtype_mask = wlan_le32_to_cpu( + resp->params.rx_mgmt_ind.mgmt_subtype_mask); } LEAVE(); @@ -2725,15 +2681,13 @@ wlan_ret_rx_mgmt_ind(IN pmlan_private pmpriv, * * @return N/A */ -t_void -wlan_check_ps_cond(mlan_adapter *pmadapter) +t_void wlan_check_ps_cond(mlan_adapter *pmadapter) { ENTER(); - if (!pmadapter->cmd_sent && - !pmadapter->curr_cmd && - !pmadapter->keep_wakeup && - !wlan_is_tx_pending(pmadapter) && !IS_CARD_RX_RCVD(pmadapter)) { + if (!pmadapter->cmd_sent && !pmadapter->curr_cmd && + !pmadapter->keep_wakeup && !wlan_is_tx_pending(pmadapter) && + !IS_CARD_RX_RCVD(pmadapter)) { wlan_dnld_sleep_confirm_cmd(pmadapter); } else { PRINTM(MCMND, "Delay Sleep Confirm (%s%s%s%s)\n", @@ -2754,8 +2708,7 @@ wlan_check_ps_cond(mlan_adapter *pmadapter) * * @return N/A */ -t_void -wlan_host_sleep_activated_event(pmlan_private priv, t_u8 activated) +t_void wlan_host_sleep_activated_event(pmlan_private priv, t_u8 activated) { ENTER(); @@ -2790,8 +2743,7 @@ wlan_host_sleep_activated_event(pmlan_private priv, t_u8 activated) * * @return N/A */ -t_void -wlan_host_sleep_wakeup_event(pmlan_private priv) +t_void wlan_host_sleep_wakeup_event(pmlan_private priv) { ENTER(); @@ -2812,10 +2764,9 @@ wlan_host_sleep_wakeup_event(pmlan_private priv) * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_802_11_hs_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +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; @@ -2825,14 +2776,15 @@ wlan_ret_802_11_hs_cfg(IN pmlan_private pmpriv, phs_cfg->params.hs_config.conditions = wlan_le32_to_cpu(phs_cfg->params.hs_config.conditions); phs_cfg->action = wlan_le16_to_cpu(phs_cfg->action); - PRINTM(MCMND, "CMD_RESP: HS_CFG cmd reply result=%#x," + PRINTM(MCMND, + "CMD_RESP: HS_CFG cmd reply result=%#x," " action=0x%x conditions=0x%x gpio=0x%x gap=0x%x\n", resp->result, phs_cfg->action, phs_cfg->params.hs_config.conditions, phs_cfg->params.hs_config.gpio, phs_cfg->params.hs_config.gap); if ((phs_cfg->action == HS_ACTIVATE && - !pmadapter->pcard_info->supp_ps_handshake) - || pmadapter->pcard_info->supp_ps_handshake) { + !pmadapter->pcard_info->supp_ps_handshake) || + pmadapter->pcard_info->supp_ps_handshake) { /* clean up curr_cmd to allow suspend */ if (pioctl_buf) pioctl_buf->status_code = MLAN_ERROR_NO_ERROR; @@ -2867,8 +2819,7 @@ done: * @param pmadapter A pointer to the adapter structure * @return N/A */ -t_void -wlan_process_hs_config(pmlan_adapter pmadapter) +t_void wlan_process_hs_config(pmlan_adapter pmadapter) { ENTER(); PRINTM(MINFO, "Recevie interrupt/data in HS mode\n"); @@ -2886,9 +2837,8 @@ wlan_process_hs_config(pmlan_adapter pmadapter) * @param upld_len Command response buffer length * @return N/A */ -void -wlan_process_sleep_confirm_resp(pmlan_adapter pmadapter, t_u8 *pbuf, - t_u32 upld_len) +void wlan_process_sleep_confirm_resp(pmlan_adapter pmadapter, t_u8 *pbuf, + t_u32 upld_len) { HostCmd_DS_COMMAND *cmd; pmlan_private pmpriv; @@ -2905,9 +2855,9 @@ wlan_process_sleep_confirm_resp(pmlan_adapter pmadapter, t_u8 *pbuf, cmd->command = wlan_le16_to_cpu(cmd->command); cmd->seq_num = wlan_le16_to_cpu(cmd->seq_num); - pmpriv = wlan_get_priv_by_id(pmadapter, - HostCmd_GET_BSS_NO(cmd->seq_num), - HostCmd_GET_BSS_TYPE(cmd->seq_num)); + pmpriv = + wlan_get_priv_by_id(pmadapter, HostCmd_GET_BSS_NO(cmd->seq_num), + HostCmd_GET_BSS_TYPE(cmd->seq_num)); /* Update sequence number */ cmd->seq_num = HostCmd_GET_SEQ_NO(cmd->seq_num); /* Clear RET_BIT from HostCmd */ @@ -2933,9 +2883,8 @@ wlan_process_sleep_confirm_resp(pmlan_adapter pmadapter, t_u8 *pbuf, 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); + wlan_host_sleep_activated_event( + wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY), MTRUE); } pmadapter->ps_state = PS_STATE_SLEEP; LEAVE(); @@ -2951,11 +2900,10 @@ wlan_process_sleep_confirm_resp(pmlan_adapter pmadapter, t_u8 *pbuf, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -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) +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; @@ -2988,9 +2936,9 @@ wlan_cmd_enh_power_mode(pmlan_private pmpriv, 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)); + 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 = @@ -2999,9 +2947,8 @@ wlan_cmd_enh_power_mode(pmlan_private pmpriv, 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->local_listen_interval = wlan_cpu_to_le16( + pmadapter->local_listen_interval); ps_mode->delay_to_ps = wlan_cpu_to_le16(pmadapter->delay_to_ps); ps_mode->mode = @@ -3009,15 +2956,14 @@ wlan_cmd_enh_power_mode(pmlan_private pmpriv, } if (ps_bitmap & BITMAP_BCN_TMO) { MrvlIEtypes_bcn_timeout_t *bcn_tmo_tlv = - (MrvlIEtypes_bcn_timeout_t *) tlv; + (MrvlIEtypes_bcn_timeout_t *)tlv; mlan_ds_bcn_timeout *bcn_tmo = - (mlan_ds_bcn_timeout *) pdata_buf; + (mlan_ds_bcn_timeout *)pdata_buf; bcn_tmo_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_BCN_TIMEOUT); - bcn_tmo_tlv->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_bcn_timeout_t) - - sizeof(MrvlIEtypesHeader_t)); + bcn_tmo_tlv->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_bcn_timeout_t) - + sizeof(MrvlIEtypesHeader_t)); bcn_tmo_tlv->bcn_miss_tmo_window = wlan_cpu_to_le16(bcn_tmo->bcn_miss_tmo_window); bcn_tmo_tlv->bcn_miss_tmo_period = @@ -3029,9 +2975,9 @@ wlan_cmd_enh_power_mode(pmlan_private pmpriv, cmd_size += sizeof(MrvlIEtypes_bcn_timeout_t); tlv += sizeof(MrvlIEtypes_bcn_timeout_t); - psmode_enh->params.auto_ps.ps_bitmap = - wlan_cpu_to_le16((ps_bitmap & (~BITMAP_BCN_TMO)) - | BITMAP_STA_PS); + psmode_enh->params.auto_ps.ps_bitmap = wlan_cpu_to_le16( + (ps_bitmap & (~BITMAP_BCN_TMO)) | + BITMAP_STA_PS); } if (ps_bitmap & BITMAP_AUTO_DS) { MrvlIEtypes_auto_ds_param_t *auto_ps_tlv = @@ -3040,16 +2986,14 @@ wlan_cmd_enh_power_mode(pmlan_private pmpriv, 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)); + 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; + ((mlan_ds_auto_ds *)pdata_buf)->idletime; auto_ds->deep_sleep_timeout = wlan_cpu_to_le16(idletime); } @@ -3061,48 +3005,34 @@ wlan_cmd_enh_power_mode(pmlan_private pmpriv, 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); + 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); + 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); @@ -3125,10 +3055,9 @@ wlan_cmd_enh_power_mode(pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_enh_power_mode(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +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; @@ -3146,24 +3075,20 @@ wlan_ret_enh_power_mode(IN pmlan_private pmpriv, 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); + 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)); + (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); + 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"); @@ -3173,8 +3098,8 @@ wlan_ret_enh_power_mode(IN pmlan_private pmpriv, } } #if defined(UAP_SUPPORT) - if (ps_mode->params.auto_ps. - ps_bitmap & (BITMAP_UAP_INACT_PS | BITMAP_UAP_DTIM_PS)) { + 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"); } @@ -3195,8 +3120,8 @@ wlan_ret_enh_power_mode(IN pmlan_private pmpriv, } } #if defined(UAP_SUPPORT) - if (ps_mode->params. - ps_bitmap & (BITMAP_UAP_INACT_PS | BITMAP_UAP_DTIM_PS)) { + 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"); } @@ -3204,9 +3129,8 @@ wlan_ret_enh_power_mode(IN pmlan_private pmpriv, } 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)) + 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; @@ -3215,8 +3139,8 @@ wlan_ret_enh_power_mode(IN pmlan_private pmpriv, 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) + if (ps_mode->params.auto_ps.ps_bitmap & + BITMAP_STA_PS) pm_cfg->param.ps_mode = 1; else pm_cfg->param.ps_mode = 0; @@ -3231,20 +3155,19 @@ wlan_ret_enh_power_mode(IN pmlan_private pmpriv, 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) + 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) + 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_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 >= @@ -3255,54 +3178,49 @@ wlan_ret_enh_power_mode(IN pmlan_private pmpriv, case TLV_TYPE_AP_SLEEP_PARAM: sleep_tlv = (MrvlIEtypes_sleep_param_t - *)tlv; + *)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); + 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; + *)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); + 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)); + tlv = (MrvlIEtypesHeader_t + *)((t_u8 *)tlv + + tlv_len + + sizeof(MrvlIEtypesHeader_t)); } } #endif @@ -3322,10 +3240,9 @@ wlan_ret_enh_power_mode(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -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_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; @@ -3340,12 +3257,10 @@ wlan_ret_802_11_tx_rate_query(IN pmlan_private pmpriv, pmpriv->ext_tx_rate_info = 0; if (!pmpriv->is_data_rate_auto) { - pmpriv->data_rate = wlan_index_to_data_rate(pmadapter, - pmpriv->tx_rate, - pmpriv-> - tx_rate_info, - pmpriv-> - ext_tx_rate_info); + pmpriv->data_rate = + wlan_index_to_data_rate(pmadapter, pmpriv->tx_rate, + pmpriv->tx_rate_info, + pmpriv->ext_tx_rate_info); } if (pioctl_buf) { @@ -3353,10 +3268,9 @@ wlan_ret_802_11_tx_rate_query(IN pmlan_private pmpriv, 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 || + MLAN_RATE_FORMAT_VHT || ((pmpriv->tx_rate_info & 0x3) == - MLAN_RATE_FORMAT_HE) - ) + MLAN_RATE_FORMAT_HE)) /* VHT rate */ rate->param.rate_cfg.rate = @@ -3376,23 +3290,22 @@ wlan_ret_802_11_tx_rate_query(IN pmlan_private pmpriv, rate->param.rate_cfg.rate = (pmpriv->tx_rate > MLAN_RATE_INDEX_OFDM0) ? - pmpriv->tx_rate - - 1 : pmpriv->tx_rate; + 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, - pmpriv-> - ext_tx_rate_info); + wlan_index_to_data_rate( + pmadapter, pmpriv->tx_rate, + pmpriv->tx_rate_info, + pmpriv->ext_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 - || (pmpriv->tx_rate_info & 0x3) == - MLAN_RATE_FORMAT_HE) { + if ((pmpriv->tx_rate_info & 0x3) == + MLAN_RATE_FORMAT_VHT || + (pmpriv->tx_rate_info & 0x3) == + MLAN_RATE_FORMAT_HE) { /* AX/VHT rate */ rate->param.data_rate.tx_rate_format = pmpriv->tx_rate_info & 0x3; @@ -3401,27 +3314,28 @@ wlan_ret_802_11_tx_rate_query(IN pmlan_private pmpriv, if ((pmpriv->tx_rate_info & 0x3) == MLAN_RATE_FORMAT_HE) rate->param.data_rate.tx_ht_gi = - (pmpriv-> - tx_rate_info & 0x10) >> 4 | - (pmpriv-> - tx_rate_info & 0x80) >> 6; + (pmpriv->tx_rate_info & 0x10) >> + 4 | + (pmpriv->tx_rate_info & 0x80) >> + 6; else rate->param.data_rate.tx_ht_gi = - (pmpriv-> - tx_rate_info & 0x10) >> 4; + (pmpriv->tx_rate_info & 0x10) >> + 4; rate->param.data_rate.tx_nss = ((pmpriv->tx_rate) >> 4) & 0x03; rate->param.data_rate.tx_mcs_index = (pmpriv->tx_rate) & 0xF; if ((pmpriv->tx_rate_info & 0x3) == - MLAN_RATE_FORMAT_VHT || + MLAN_RATE_FORMAT_VHT || (pmpriv->tx_rate_info & 0x3) == - MLAN_RATE_FORMAT_HE) + MLAN_RATE_FORMAT_HE) rate->param.data_rate.tx_data_rate = - wlan_index_to_data_rate - (pmadapter, pmpriv->tx_rate, - pmpriv->tx_rate_info, - pmpriv->ext_tx_rate_info); + wlan_index_to_data_rate( + pmadapter, + pmpriv->tx_rate, + pmpriv->tx_rate_info, + pmpriv->ext_tx_rate_info); } else if ((pmpriv->tx_rate_info & 0x3) == MLAN_RATE_FORMAT_HT) { /* HT rate */ @@ -3435,12 +3349,10 @@ wlan_ret_802_11_tx_rate_query(IN pmlan_private pmpriv, 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, - pmpriv-> - ext_tx_rate_info); + wlan_index_to_data_rate( + pmadapter, pmpriv->tx_rate, + pmpriv->tx_rate_info, + pmpriv->ext_tx_rate_info); } else { /* LG rate */ rate->param.data_rate.tx_rate_format = @@ -3451,15 +3363,16 @@ wlan_ret_802_11_tx_rate_query(IN pmlan_private pmpriv, * 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; + MLAN_RATE_INDEX_OFDM0) ? + pmpriv->tx_rate - 1 : + pmpriv->tx_rate; } /* Rx rate info */ if ((pmpriv->rxpd_rate_info & 0x3) == - MLAN_RATE_FORMAT_VHT || + MLAN_RATE_FORMAT_VHT || (pmpriv->rxpd_rate_info & 0x3) == - MLAN_RATE_FORMAT_HE) { + MLAN_RATE_FORMAT_HE) { /* VHT rate */ rate->param.data_rate.rx_rate_format = pmpriv->rxpd_rate_info & 0x3; @@ -3468,27 +3381,31 @@ wlan_ret_802_11_tx_rate_query(IN pmlan_private pmpriv, if ((pmpriv->rxpd_rate_info & 0x3) == MLAN_RATE_FORMAT_HE) rate->param.data_rate.rx_ht_gi = - (pmpriv-> - rxpd_rate_info & 0x10) >> 4 | - (pmpriv-> - rxpd_rate_info & 0x80) >> 6; + (pmpriv->rxpd_rate_info & + 0x10) >> + 4 | + (pmpriv->rxpd_rate_info & + 0x80) >> + 6; else rate->param.data_rate.rx_ht_gi = - (pmpriv-> - rxpd_rate_info & 0x10) >> 4; + (pmpriv->rxpd_rate_info & + 0x10) >> + 4; rate->param.data_rate.rx_nss = ((pmpriv->rxpd_rate) >> 4) & 0x3; rate->param.data_rate.rx_mcs_index = (pmpriv->rxpd_rate) & 0xF; if ((pmpriv->rxpd_rate_info & 0x3) == - MLAN_RATE_FORMAT_VHT || + MLAN_RATE_FORMAT_VHT || (pmpriv->rxpd_rate_info & 0x3) == - MLAN_RATE_FORMAT_HE) + MLAN_RATE_FORMAT_HE) rate->param.data_rate.rx_data_rate = - wlan_index_to_data_rate - (pmadapter, pmpriv->rxpd_rate, - pmpriv->rxpd_rate_info, - pmpriv->rxpd_rx_info); + wlan_index_to_data_rate( + pmadapter, + pmpriv->rxpd_rate, + pmpriv->rxpd_rate_info, + pmpriv->rxpd_rx_info); } else if ((pmpriv->rxpd_rate_info & 0x3) == MLAN_RATE_FORMAT_HT) { /* HT rate */ @@ -3501,12 +3418,9 @@ wlan_ret_802_11_tx_rate_query(IN pmlan_private pmpriv, 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, - 0); + wlan_index_to_data_rate( + pmadapter, pmpriv->rxpd_rate, + pmpriv->rxpd_rate_info, 0); } else { /* LG rate */ rate->param.data_rate.rx_rate_format = @@ -3517,12 +3431,13 @@ wlan_ret_802_11_tx_rate_query(IN pmlan_private pmpriv, * 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; + MLAN_RATE_INDEX_OFDM0) ? + pmpriv->rxpd_rate - 1 : + pmpriv->rxpd_rate; } } - pioctl_buf->data_read_written = sizeof(mlan_data_rate) + - MLAN_SUB_COMMAND_SIZE; + pioctl_buf->data_read_written = + sizeof(mlan_data_rate) + MLAN_SUB_COMMAND_SIZE; } LEAVE(); return MLAN_STATUS_SUCCESS; @@ -3538,17 +3453,14 @@ wlan_ret_802_11_tx_rate_query(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_robustcoex(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_u16 *pdata_buf) +mlan_status wlan_cmd_robustcoex(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, IN t_u16 cmd_action, + IN t_u16 *pdata_buf) { HostCmd_DS_802_11_ROBUSTCOEX *rbstcx = &cmd->params.robustcoexparams; mlan_ds_misc_robustcoex_params *robustcoex_params = MNULL; MrvlIEtypes_RobustcoexSourceGPIO_t *tlv = - (MrvlIEtypes_RobustcoexSourceGPIO_t *) ((t_u8 *)rbstcx + - sizeof - (HostCmd_DS_802_11_ROBUSTCOEX)); + (MrvlIEtypes_RobustcoexSourceGPIO_t *)(rbstcx->tlv_buf); ENTER(); @@ -3557,16 +3469,14 @@ wlan_cmd_robustcoex(IN pmlan_private pmpriv, rbstcx->action = wlan_cpu_to_le16(cmd_action); switch (cmd_action) { case HostCmd_ACT_GEN_SET: - robustcoex_params = - (mlan_ds_misc_robustcoex_params *) pdata_buf; + robustcoex_params = (mlan_ds_misc_robustcoex_params *)pdata_buf; if (robustcoex_params->method == ROBUSTCOEX_GPIO_CFG) { cmd->size += sizeof(MrvlIEtypes_RobustcoexSourceGPIO_t); tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_ROBUSTCOEX); - tlv->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_RobustcoexSourceGPIO_t) - - sizeof(MrvlIEtypesHeader_t)); + tlv->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_RobustcoexSourceGPIO_t) - + sizeof(MrvlIEtypesHeader_t)); tlv->enable = (t_u8)robustcoex_params->enable; tlv->gpio_num = (t_u8)robustcoex_params->gpio_num; tlv->gpio_polarity = @@ -3593,10 +3503,8 @@ wlan_cmd_robustcoex(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_ssu(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_u16 *pdata_buf) +mlan_status wlan_cmd_ssu(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, IN t_u16 *pdata_buf) { HostCmd_DS_SSU_CFG *ssu_cfg_cmd = &cmd->params.ssu_params; mlan_ds_ssu_params *ssu_params = MNULL; @@ -3611,7 +3519,7 @@ wlan_cmd_ssu(IN pmlan_private pmpriv, switch (cmd_action) { case HostCmd_ACT_GEN_SET: case HostCmd_ACT_GEN_SET_DEFAULT: - ssu_params = (mlan_ds_ssu_params *) pdata_buf; + ssu_params = (mlan_ds_ssu_params *)pdata_buf; ssu_cfg_cmd->nskip = wlan_cpu_to_le32(ssu_params->nskip); ssu_cfg_cmd->nsel = wlan_cpu_to_le32(ssu_params->nsel); ssu_cfg_cmd->adcdownsample = @@ -3636,10 +3544,8 @@ wlan_cmd_ssu(IN pmlan_private pmpriv, } ssu_cfg_cmd->buffer_base_addr[0] = wlan_cpu_to_le32((t_u32)pmadapter->ssu_buf->buf_pa); - ssu_cfg_cmd->buffer_base_addr[1] = - wlan_cpu_to_le32((t_u32) - ((t_u64) - (pmadapter->ssu_buf->buf_pa >> 32))); + ssu_cfg_cmd->buffer_base_addr[1] = wlan_cpu_to_le32( + (t_u32)((t_u64)(pmadapter->ssu_buf->buf_pa >> 32))); ssu_cfg_cmd->buffer_pool_size = wlan_cpu_to_le32(MLAN_SSU_BUF_SIZE); break; @@ -3663,21 +3569,20 @@ wlan_cmd_ssu(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_dmcs_config(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_dmcs_config(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, IN t_void *pdata_buf) { HostCmd_DS_DMCS_CFG *dmcs = &cmd->params.dmcs; mlan_ds_misc_mapping_policy *dmcs_params = MNULL; - t_u8 *mapping_policy = (t_u8 *)dmcs + sizeof(HostCmd_DS_DMCS_CFG); + t_u8 *mapping_policy = (t_u8 *)dmcs->tlv_buf; ENTER(); cmd->command = wlan_cpu_to_le16(HostCmd_CMD_DMCS_CONFIG); cmd->size = sizeof(HostCmd_DS_DMCS_CFG) + S_DS_GEN; dmcs->action = wlan_cpu_to_le16(cmd_action); - dmcs_params = (mlan_ds_misc_mapping_policy *) pdata_buf; + dmcs_params = (mlan_ds_misc_mapping_policy *)pdata_buf; dmcs->subcmd = wlan_cpu_to_le16(dmcs_params->subcmd); switch (dmcs->subcmd) { case 0: @@ -3702,9 +3607,9 @@ wlan_cmd_dmcs_config(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ret_dmcs_config(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_dmcs_config(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { mlan_status ret = MLAN_STATUS_SUCCESS; HostCmd_DS_DMCS_CFG *dmcs = &resp->params.dmcs; @@ -3734,29 +3639,29 @@ wlan_ret_dmcs_config(IN pmlan_private pmpriv, } switch (tlv_type) { case TLV_TYPE_DMCS_STATUS: - dmcs_status = (MrvlIEtypes_DmcsStatus_t *) tlv; + dmcs_status = (MrvlIEtypes_DmcsStatus_t *)tlv; cfg->param.dmcs_status.mapping_policy = dmcs_status->mapping_policy; memset(pmpriv->adapter, &cfg->param.dmcs_status.radio_status, 0, sizeof(dmcsStatus_t)); for (i = 0; i < MAX_NUM_MAC; i++) { - memcpy_ext(pmpriv->adapter, - &cfg->param.dmcs_status. - radio_status[i], - &dmcs_status-> - radio_status[i], - sizeof(dmcsStatus_t), - sizeof(dmcsStatus_t)); + memcpy_ext( + pmpriv->adapter, + &cfg->param.dmcs_status + .radio_status[i], + &dmcs_status->radio_status[i], + sizeof(dmcsStatus_t), + sizeof(dmcsStatus_t)); } break; default: break; } tlv_buf_left -= tlv_len + sizeof(MrvlIEtypesHeader_t); - tlv = (MrvlIEtypesHeader_t *)((t_u8 *)tlv + tlv_len + - sizeof - (MrvlIEtypesHeader_t)); + tlv = (MrvlIEtypesHeader_t + *)((t_u8 *)tlv + tlv_len + + sizeof(MrvlIEtypesHeader_t)); } pioctl_buf->data_read_written = sizeof(mlan_ds_misc_dmcs_status); @@ -3776,11 +3681,10 @@ wlan_ret_dmcs_config(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -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 mlan_ioctl_req *pioctl_buf) +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 mlan_ioctl_req *pioctl_buf) { HostCmd_DS_TX_RATE_CFG *rate_cfg = (HostCmd_DS_TX_RATE_CFG *)&(cmd->params.tx_rate_cfg); @@ -3798,8 +3702,7 @@ wlan_cmd_tx_rate_cfg(IN pmlan_private pmpriv, 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 = (MrvlRateScope_t *)rate_cfg->tlv_buf; rate_scope->type = wlan_cpu_to_le16(TLV_TYPE_RATE_SCOPE); rate_scope->length = wlan_cpu_to_le16(sizeof(MrvlRateScope_t) - sizeof(MrvlIEtypesHeader_t)); @@ -3812,30 +3715,31 @@ wlan_cmd_tx_rate_cfg(IN pmlan_private pmpriv, rate_scope->ht_mcs_rate_bitmap[i] = wlan_cpu_to_le16(pbitmap_rates[2 + i]); for (i = 0; i < NELEMENTS(rate_scope->vht_mcs_rate_bitmap); i++) - rate_scope->vht_mcs_rate_bitmap[i] = - wlan_cpu_to_le16(pbitmap_rates - [2 + - NELEMENTS(rate_scope-> - ht_mcs_rate_bitmap) - + i]); + rate_scope->vht_mcs_rate_bitmap[i] = wlan_cpu_to_le16( + pbitmap_rates + [2 + + NELEMENTS( + rate_scope->ht_mcs_rate_bitmap) + + i]); if (IS_FW_SUPPORT_11AX(pmpriv->adapter)) { for (i = 0; i < NELEMENTS(rate_scope->he_mcs_rate_bitmap); i++) - rate_scope->he_mcs_rate_bitmap[i] = - wlan_cpu_to_le16(pbitmap_rates - [2 + - NELEMENTS(rate_scope-> - ht_mcs_rate_bitmap) - + - NELEMENTS(rate_scope-> - vht_mcs_rate_bitmap) - + i]); + rate_scope->he_mcs_rate_bitmap + [i] = wlan_cpu_to_le16( + pbitmap_rates + [2 + + NELEMENTS( + rate_scope + ->ht_mcs_rate_bitmap) + + NELEMENTS( + rate_scope + ->vht_mcs_rate_bitmap) + + i]); } else { - rate_scope->length = - wlan_cpu_to_le16(sizeof(MrvlRateScope_t) - - sizeof(rate_scope-> - he_mcs_rate_bitmap) - - sizeof(MrvlIEtypesHeader_t)); + rate_scope->length = wlan_cpu_to_le16( + sizeof(MrvlRateScope_t) - + sizeof(rate_scope->he_mcs_rate_bitmap) - + sizeof(MrvlIEtypesHeader_t)); } } else { rate_scope->hr_dsss_rate_bitmap = @@ -3846,71 +3750,64 @@ wlan_cmd_tx_rate_cfg(IN pmlan_private pmpriv, rate_scope->ht_mcs_rate_bitmap[i] = wlan_cpu_to_le16(pmpriv->bitmap_rates[2 + i]); for (i = 0; i < NELEMENTS(rate_scope->vht_mcs_rate_bitmap); i++) - rate_scope->vht_mcs_rate_bitmap[i] = - wlan_cpu_to_le16(pmpriv-> - bitmap_rates[2 + - NELEMENTS - (rate_scope-> - ht_mcs_rate_bitmap) - + i]); + rate_scope->vht_mcs_rate_bitmap[i] = wlan_cpu_to_le16( + pmpriv->bitmap_rates + [2 + + NELEMENTS( + rate_scope->ht_mcs_rate_bitmap) + + i]); if (IS_FW_SUPPORT_11AX(pmpriv->adapter)) { for (i = 0; i < NELEMENTS(rate_scope->vht_mcs_rate_bitmap); i++) - rate_scope->he_mcs_rate_bitmap[i] = - wlan_cpu_to_le16(pmpriv-> - bitmap_rates[2 + - NELEMENTS - (rate_scope-> - ht_mcs_rate_bitmap) - + - NELEMENTS - (rate_scope-> - vht_mcs_rate_bitmap) - + i]); + rate_scope->he_mcs_rate_bitmap + [i] = wlan_cpu_to_le16( + pmpriv->bitmap_rates + [2 + + NELEMENTS( + rate_scope + ->ht_mcs_rate_bitmap) + + NELEMENTS( + rate_scope + ->vht_mcs_rate_bitmap) + + i]); } else { - rate_scope->length = - wlan_cpu_to_le16(sizeof(MrvlRateScope_t) - - sizeof(rate_scope-> - he_mcs_rate_bitmap) - - sizeof(MrvlIEtypesHeader_t)); + rate_scope->length = wlan_cpu_to_le16( + sizeof(MrvlRateScope_t) - + sizeof(rate_scope->he_mcs_rate_bitmap) - + sizeof(MrvlIEtypesHeader_t)); } } - rate_drop = (MrvlRateDropPattern_t *)((t_u8 *)rate_scope + - wlan_le16_to_cpu(rate_scope-> - length) + - sizeof(MrvlIEtypesHeader_t)); + rate_drop = + (MrvlRateDropPattern_t *)((t_u8 *)rate_scope + + wlan_le16_to_cpu(rate_scope->length) + + sizeof(MrvlIEtypesHeader_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) + - rate_scope->length + - sizeof(MrvlIEtypesHeader_t) + - sizeof(MrvlRateDropPattern_t)); + cmd->size = wlan_cpu_to_le16( + S_DS_GEN + sizeof(HostCmd_DS_TX_RATE_CFG) + rate_scope->length + + sizeof(MrvlIEtypesHeader_t) + sizeof(MrvlRateDropPattern_t)); if (pioctl_buf && pmpriv->adapter->pcard_info->v17_fw_api) { ds_rate = (mlan_ds_rate *)pioctl_buf->pbuf; - rate_setting_tlv = - (MrvlIETypes_rate_setting_t *) ((t_u8 *)rate_drop + - sizeof - (MrvlRateDropPattern_t)); + rate_setting_tlv = (MrvlIETypes_rate_setting_t + *)((t_u8 *)rate_drop + + sizeof(MrvlRateDropPattern_t)); rate_setting_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_TX_RATE_CFG); - rate_setting_tlv->header.len = - wlan_cpu_to_le16(sizeof - (rate_setting_tlv->rate_setting)); + rate_setting_tlv->header.len = wlan_cpu_to_le16( + sizeof(rate_setting_tlv->rate_setting)); rate_setting_tlv->rate_setting = wlan_cpu_to_le16(ds_rate->param.rate_cfg.rate_setting); PRINTM(MCMND, "he rate setting = %d\n", rate_setting_tlv->rate_setting); - cmd->size = - wlan_cpu_to_le16(S_DS_GEN + - sizeof(HostCmd_DS_TX_RATE_CFG) + - rate_scope->length + - sizeof(MrvlIEtypesHeader_t) + - sizeof(MrvlRateDropPattern_t) + - sizeof(MrvlIETypes_rate_setting_t)); + cmd->size = wlan_cpu_to_le16( + S_DS_GEN + sizeof(HostCmd_DS_TX_RATE_CFG) + + rate_scope->length + sizeof(MrvlIEtypesHeader_t) + + sizeof(MrvlRateDropPattern_t) + + sizeof(MrvlIETypes_rate_setting_t)); } LEAVE(); return MLAN_STATUS_SUCCESS; @@ -3925,9 +3822,9 @@ wlan_cmd_tx_rate_cfg(IN pmlan_private pmpriv, * * @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_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; @@ -3950,11 +3847,10 @@ wlan_ret_tx_rate_cfg(IN pmlan_private pmpriv, } 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); + tlv_buf = (t_u8 *)prate_cfg->tlv_buf; if (tlv_buf) { - tlv_buf_len = - resp->size - (sizeof(HostCmd_DS_TX_RATE_CFG) + - S_DS_GEN); + tlv_buf_len = resp->size - + (sizeof(HostCmd_DS_TX_RATE_CFG) + S_DS_GEN); tlv_buf_len = wlan_le16_to_cpu(tlv_buf_len); } @@ -3965,50 +3861,49 @@ wlan_ret_tx_rate_cfg(IN pmlan_private pmpriv, 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[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 < NELEMENTS(prate_scope->ht_mcs_rate_bitmap); i++) - pmpriv->bitmap_rates[2 + i] = - wlan_le16_to_cpu(prate_scope-> - ht_mcs_rate_bitmap[i]); + pmpriv->bitmap_rates[2 + i] = wlan_le16_to_cpu( + prate_scope->ht_mcs_rate_bitmap[i]); for (i = 0; i < NELEMENTS(prate_scope->vht_mcs_rate_bitmap); 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]); + 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]); if (IS_FW_SUPPORT_11AX(pmadapter)) { for (i = 0; i < NELEMENTS(prate_scope->he_mcs_rate_bitmap); i++) - pmpriv->bitmap_rates[2 + - sizeof - (prate_scope-> - ht_mcs_rate_bitmap) - / sizeof(t_u16) + - sizeof - (prate_scope-> - vht_mcs_rate_bitmap) - / sizeof(t_u16) + - i] = - wlan_le16_to_cpu(prate_scope-> - he_mcs_rate_bitmap - [i]); + pmpriv->bitmap_rates + [2 + + sizeof(prate_scope + ->ht_mcs_rate_bitmap) / + sizeof(t_u16) + + sizeof(prate_scope + ->vht_mcs_rate_bitmap) / + sizeof(t_u16) + + i] = + wlan_le16_to_cpu( + prate_scope + ->he_mcs_rate_bitmap + [i]); } break; case TLV_TYPE_TX_RATE_CFG: rate_setting_tlv = - (MrvlIETypes_rate_setting_t *) tlv_buf; + (MrvlIETypes_rate_setting_t *)tlv_buf; rate_setting = rate_setting_tlv->rate_setting; break; /* Add RATE_DROP tlv here */ @@ -4025,10 +3920,8 @@ wlan_ret_tx_rate_cfg(IN pmlan_private pmpriv, if (pmpriv->is_data_rate_auto) { pmpriv->data_rate = 0; } else { - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_TX_RATE_QUERY, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_TX_RATE_QUERY, HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); - } if (pioctl_buf) { @@ -4045,9 +3938,8 @@ wlan_ret_tx_rate_cfg(IN pmlan_private pmpriv, } 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); + 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)) @@ -4058,18 +3950,16 @@ wlan_ret_tx_rate_cfg(IN pmlan_private pmpriv, ds_rate->param.rate_cfg.rate = index; } /* check the HT rate */ - index = wlan_get_rate_index(pmadapter, - &pmpriv->bitmap_rates[2], - 16); + 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); + 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; @@ -4079,10 +3969,9 @@ wlan_ret_tx_rate_cfg(IN pmlan_private pmpriv, } /* check the HE rate */ if (IS_FW_SUPPORT_11AX(pmadapter)) { - index = wlan_get_rate_index(pmadapter, - &pmpriv-> - bitmap_rates[18], - 16); + index = wlan_get_rate_index( + pmadapter, &pmpriv->bitmap_rates[18], + 16); if (index != -1) { ds_rate->param.rate_cfg.rate_format = MLAN_RATE_FORMAT_HE; @@ -4102,7 +3991,6 @@ wlan_ret_tx_rate_cfg(IN pmlan_private pmpriv, ds_rate->param.rate_cfg.bitmap_rates[i] = pmpriv->bitmap_rates[i]; } - } LEAVE(); @@ -4117,8 +4005,7 @@ wlan_ret_tx_rate_cfg(IN pmlan_private pmpriv, * * @return MLAN_STATUS_PENDING or MLAN_STATUS_FAILURE */ -mlan_status -wlan_adapter_get_hw_spec(IN pmlan_adapter pmadapter) +mlan_status wlan_adapter_get_hw_spec(IN pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_private priv = wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY); @@ -4142,13 +4029,13 @@ wlan_adapter_get_hw_spec(IN pmlan_adapter pmadapter) } #endif - ret = wlan_prepare_cmd(priv, HostCmd_CMD_FUNC_INIT, - HostCmd_ACT_GEN_SET, 0, MNULL, MNULL); + ret = wlan_prepare_cmd(priv, HostCmd_CMD_FUNC_INIT, HostCmd_ACT_GEN_SET, + 0, MNULL, MNULL); if (ret) { ret = MLAN_STATUS_FAILURE; goto done; } - /** DPD data dnld cmd prepare */ + /** DPD data dnld cmd prepare */ if ((pmadapter->pdpd_data) && (pmadapter->dpd_data_len > 0)) { ret = wlan_process_hostcmd_cfg(priv, CFG_TYPE_DPDFILE, pmadapter->pdpd_data, @@ -4171,7 +4058,7 @@ wlan_adapter_get_hw_spec(IN pmlan_adapter pmadapter) pmadapter->ptxpwr_data = MNULL; pmadapter->txpwr_data_len = 0; } - /** Cal data dnld cmd prepare */ + /** Cal data dnld cmd prepare */ if ((pmadapter->pcal_data) && (pmadapter->cal_data_len > 0)) { ret = wlan_prepare_cmd(priv, HostCmd_CMD_CFG_DATA, HostCmd_ACT_GEN_SET, OID_TYPE_CAL, MNULL, @@ -4215,8 +4102,7 @@ done: * * @return MLAN_STATUS_PENDING or MLAN_STATUS_FAILURE */ -mlan_status -wlan_adapter_init_cmd(IN pmlan_adapter pmadapter) +mlan_status wlan_adapter_init_cmd(IN pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_private pmpriv = MNULL; @@ -4242,14 +4128,13 @@ wlan_adapter_init_cmd(IN pmlan_adapter pmadapter) ret = MLAN_STATUS_FAILURE; goto done; } + #if defined(STA_SUPPORT) - if (pmpriv_sta && (pmpriv_sta->state_11d.user_enable_11d == ENABLE_11D)) { + 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, + 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; @@ -4309,8 +4194,7 @@ wlan_adapter_init_cmd(IN pmlan_adapter pmadapter) } } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_RF_ANTENNA, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_RF_ANTENNA, HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); if (ret) { ret = MLAN_STATUS_FAILURE; @@ -4323,12 +4207,11 @@ done: } #ifdef RX_PACKET_COALESCE -mlan_status -wlan_cmd_rx_pkt_coalesce_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_rx_pkt_coalesce_cfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, + IN t_void *pdata_buf) { - mlan_ds_misc_rx_packet_coalesce *rx_pkt_cfg = (mlan_ds_misc_rx_packet_coalesce *)pdata_buf; HostCmd_DS_RX_PKT_COAL_CFG *prx_coal_cfg = @@ -4346,16 +4229,14 @@ wlan_cmd_rx_pkt_coalesce_cfg(IN pmlan_private pmpriv, PRINTM(MCMND, "Set RX coal config: packet threshold=%d delay=%d\n", rx_pkt_cfg->packet_threshold, rx_pkt_cfg->delay); - cmd->size = - wlan_cpu_to_le16(S_DS_GEN + - sizeof(HostCmd_DS_RX_PKT_COAL_CFG)); + cmd->size = wlan_cpu_to_le16( + S_DS_GEN + sizeof(HostCmd_DS_RX_PKT_COAL_CFG)); } else { cmd->size = wlan_cpu_to_le16(S_DS_GEN + sizeof(cmd_action)); } LEAVE(); return MLAN_STATUS_SUCCESS; - } /** @@ -4367,10 +4248,9 @@ wlan_cmd_rx_pkt_coalesce_cfg(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_rx_pkt_coalesce_cfg(IN pmlan_private pmpriv, - const IN HostCmd_DS_COMMAND *resp, - OUT mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_rx_pkt_coalesce_cfg(IN pmlan_private pmpriv, + const IN HostCmd_DS_COMMAND *resp, + OUT mlan_ioctl_req *pioctl_buf) { mlan_ds_misc_cfg *pcfg = MNULL; const HostCmd_DS_RX_PKT_COAL_CFG *presp_cfg = @@ -4406,8 +4286,8 @@ wlan_ret_rx_pkt_coalesce_cfg(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_download_vdll_block(mlan_adapter *pmadapter, t_u8 *block, t_u16 block_len) +mlan_status wlan_download_vdll_block(mlan_adapter *pmadapter, t_u8 *block, + t_u16 block_len) { mlan_status status = MLAN_STATUS_FAILURE; mlan_status ret = MLAN_STATUS_PENDING; @@ -4454,8 +4334,8 @@ wlan_download_vdll_block(mlan_adapter *pmadapter, t_u8 *block, t_u16 block_len) pmadapter->callbacks.moal_memcpy_ext(pmadapter->pmoal_handle, pmbuf->pbuf + pmbuf->data_offset + - sizeof(HostCmd_DS_GEN), block, - block_len, block_len); + sizeof(HostCmd_DS_GEN), + block, block_len, block_len); pmbuf->data_len = msg_len; @@ -4501,8 +4381,7 @@ done: * @return MLAN_STATUS_SUCCESS * */ -static mlan_status -wlan_get_vdll_image(pmlan_adapter pmadapter, t_u32 vdll_len) +static mlan_status wlan_get_vdll_image(pmlan_adapter pmadapter, t_u32 vdll_len) { mlan_status status = MLAN_STATUS_SUCCESS; vdll_dnld_ctrl *ctrl = &pmadapter->vdll_ctrl; @@ -4543,7 +4422,7 @@ wlan_get_vdll_image(pmlan_adapter pmadapter, t_u32 vdll_len) ctrl->vdll_len = 0; goto done; } - /*allocate a memory to store all VDLL images */ + /*allocate a memory to store all VDLL images*/ ctrl->vdll_len = vdll_len; PRINTM(MMSG, "VDLL image: len=%d\n", ctrl->vdll_len); done: @@ -4559,8 +4438,8 @@ done: * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_process_vdll_event(IN pmlan_private pmpriv, pmlan_buffer pevent) +mlan_status wlan_process_vdll_event(IN pmlan_private pmpriv, + pmlan_buffer pevent) { mlan_status status = MLAN_STATUS_SUCCESS; vdll_ind *ind = MNULL; @@ -4570,8 +4449,8 @@ wlan_process_vdll_event(IN pmlan_private pmpriv, pmlan_buffer pevent) vdll_dnld_ctrl *ctrl = &pmadapter->vdll_ctrl; ENTER(); - ind = (vdll_ind *) (pevent->pbuf + pevent->data_offset + - sizeof(mlan_event_id)); + ind = (vdll_ind *)(pevent->pbuf + pevent->data_offset + + sizeof(mlan_event_id)); switch (wlan_le16_to_cpu(ind->type)) { case VDLL_IND_TYPE_REQ: offset = wlan_le32_to_cpu(ind->offset); @@ -4581,11 +4460,9 @@ wlan_process_vdll_event(IN pmlan_private pmpriv, pmlan_buffer pevent) if (offset <= ctrl->vdll_len) { block_len = MIN(block_len, ctrl->vdll_len - offset); if (!pmadapter->cmd_sent) { - status = wlan_download_vdll_block(pmadapter, - ctrl-> - vdll_mem + - offset, - block_len); + status = wlan_download_vdll_block( + pmadapter, ctrl->vdll_mem + offset, + block_len); if (status) PRINTM(MERROR, "Fail to download VDLL block\n"); @@ -4623,8 +4500,8 @@ wlan_process_vdll_event(IN pmlan_private pmpriv, pmlan_buffer pevent) * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_get_hw_spec(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *pcmd) +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; @@ -4650,16 +4527,14 @@ wlan_cmd_get_hw_spec(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *pcmd) * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_sdio_rx_aggr_cfg(IN HostCmd_DS_COMMAND *pcmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_sdio_rx_aggr_cfg(IN HostCmd_DS_COMMAND *pcmd, + IN t_u16 cmd_action, IN t_void *pdata_buf) { HostCmd_DS_SDIO_SP_RX_AGGR_CFG *cfg = &pcmd->params.sdio_rx_aggr; pcmd->command = wlan_cpu_to_le16(HostCmd_CMD_SDIO_SP_RX_AGGR_CFG); - pcmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_SDIO_SP_RX_AGGR_CFG) + - S_DS_GEN); + pcmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_SDIO_SP_RX_AGGR_CFG) + + S_DS_GEN); cfg->action = cmd_action; if (cmd_action == HostCmd_ACT_GEN_SET) cfg->enable = *(t_u8 *)pdata_buf; @@ -4674,8 +4549,8 @@ wlan_cmd_sdio_rx_aggr_cfg(IN HostCmd_DS_COMMAND *pcmd, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ret_sdio_rx_aggr_cfg(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *resp) +mlan_status wlan_ret_sdio_rx_aggr_cfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp) { mlan_adapter *pmadapter = pmpriv->adapter; HostCmd_DS_SDIO_SP_RX_AGGR_CFG *cfg = &resp->params.sdio_rx_aggr; @@ -4705,10 +4580,9 @@ wlan_ret_sdio_rx_aggr_cfg(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *resp) * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_cfg_data(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *pcmd, - IN t_u16 cmd_action, IN t_u32 cmd_oid, IN t_void *pdata_buf) +mlan_status wlan_cmd_cfg_data(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *pcmd, IN t_u16 cmd_action, + IN t_u32 cmd_oid, IN t_void *pdata_buf) { mlan_status ret = MLAN_STATUS_SUCCESS; HostCmd_DS_802_11_CFG_DATA *pcfg_data = &(pcmd->params.cfg_data); @@ -4759,9 +4633,9 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ret_cfg_data(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN t_void *pioctl_buf) +mlan_status wlan_ret_cfg_data(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN t_void *pioctl_buf) { mlan_status ret = MLAN_STATUS_SUCCESS; @@ -4785,10 +4659,9 @@ wlan_ret_cfg_data(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) +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) { HostCmd_DS_MAC_CONTROL *pmac = &pcmd->params.mac_ctrl; t_u32 action = *((t_u32 *)pdata_buf); @@ -4819,9 +4692,9 @@ wlan_cmd_mac_control(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_mac_control(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_mac_control(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { ENTER(); LEAVE(); @@ -4837,9 +4710,9 @@ wlan_ret_mac_control(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ret_get_hw_spec(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN t_void *pioctl_buf) +mlan_status wlan_ret_get_hw_spec(IN pmlan_private pmpriv, + 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; @@ -4949,9 +4822,11 @@ wlan_ret_get_hw_spec(IN pmlan_private pmpriv, wlan_show_dot11ndevcap(pmadapter, pmadapter->hw_dot_11n_dev_cap); wlan_show_devmcssupport(pmadapter, pmadapter->hw_dev_mcs_support); -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) pmadapter->user_htstream = pmadapter->hw_dev_mcs_support; - /** separate stream config for 2.4G and 5G, will be changed according to antenna cfg*/ + /** separate stream config for 2.4G and 5G, will be changed according to + * antenna cfg*/ if (pmadapter->fw_bands & BAND_A) pmadapter->user_htstream |= (pmadapter->user_htstream << 8); PRINTM(MCMND, "user_htstream=0x%x\n", pmadapter->user_htstream); @@ -4962,8 +4837,8 @@ wlan_ret_get_hw_spec(IN pmlan_private pmpriv, for (i = 0; i < pmadapter->priv_num; i++) { if (pmadapter->priv[i]) pmadapter->priv[i]->tx_bf_cap = - pmadapter->pcard_info-> - default_11n_tx_bf_cap; + pmadapter->pcard_info + ->default_11n_tx_bf_cap; } } pmadapter->hw_dot_11ac_dev_cap = @@ -4983,9 +4858,8 @@ wlan_ret_get_hw_spec(IN pmlan_private pmpriv, pmadapter->pcard_sd->mp_end_port = wlan_le16_to_cpu(hw_spec->mp_end_port); - for (i = 1; - i <= - (unsigned)(MAX_PORT - pmadapter->pcard_sd->mp_end_port); + for (i = 1; i <= (unsigned)(MAX_PORT - + pmadapter->pcard_sd->mp_end_port); i++) pmadapter->pcard_sd->mp_data_port_mask &= ~(1 << (MAX_PORT - i)); @@ -5083,7 +4957,7 @@ wlan_ret_get_hw_spec(IN pmlan_private pmpriv, tlv_len = wlan_le16_to_cpu(tlv->len); switch (tlv_type) { case TLV_TYPE_FW_VER_INFO: - api_rev = (MrvlIEtypes_fw_ver_info_t *) tlv; + api_rev = (MrvlIEtypes_fw_ver_info_t *)tlv; api_id = wlan_le16_to_cpu(api_rev->api_id); switch (api_id) { case FW_API_VER_ID: @@ -5108,7 +4982,7 @@ wlan_ret_get_hw_spec(IN pmlan_private pmpriv, } break; case TLV_TYPE_MAX_CONN: - tlv_max_conn = (MrvlIEtypes_Max_Conn_t *) tlv; + tlv_max_conn = (MrvlIEtypes_Max_Conn_t *)tlv; PRINTM(MMSG, "max_p2p_conn = %d, max_sta_conn = %d\n", tlv_max_conn->max_p2p_conn, tlv_max_conn->max_sta_conn); @@ -5127,18 +5001,18 @@ wlan_ret_get_hw_spec(IN pmlan_private pmpriv, pmadapter->max_sta_conn = 0; break; case TLV_TYPE_EXTENSION_ID: - ext_tlv = (MrvlIEtypes_Extension_t *) tlv; + ext_tlv = (MrvlIEtypes_Extension_t *)tlv; if (ext_tlv->ext_id == HE_CAPABILITY) { ext_tlv->type = tlv_type; ext_tlv->len = tlv_len; - wlan_update_11ax_cap(pmadapter, - (MrvlIEtypes_Extension_t *) - ext_tlv); + wlan_update_11ax_cap( + pmadapter, + (MrvlIEtypes_Extension_t *)ext_tlv); } break; case TLV_TYPE_FW_CAP_INFO: - fw_cap_tlv = (MrvlIEtypes_fw_cap_info_t *) tlv; + fw_cap_tlv = (MrvlIEtypes_fw_cap_info_t *)tlv; pmadapter->fw_cap_info = wlan_le32_to_cpu(fw_cap_tlv->fw_cap_info); pmadapter->fw_cap_ext = @@ -5168,16 +5042,16 @@ done: * * @return MLAN_STATUS_SUCCESS */ -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) +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->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_ext(pmpriv->adapter, &radio_ctl, pdata_buf, sizeof(t_u32), @@ -5196,10 +5070,9 @@ wlan_cmd_802_11_radio_control(IN pmlan_private pmpriv, * * @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) +mlan_status wlan_ret_802_11_radio_control(IN pmlan_private pmpriv, + 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; @@ -5227,17 +5100,17 @@ wlan_ret_802_11_radio_control(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -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) +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->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) { @@ -5265,10 +5138,9 @@ wlan_cmd_remain_on_channel(IN pmlan_private pmpriv, * * @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) +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; @@ -5299,16 +5171,15 @@ wlan_ret_remain_on_channel(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -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) +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) { 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->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) @@ -5327,10 +5198,9 @@ wlan_cmd_wifi_direct_mode(IN pmlan_private pmpriv, * * @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) +mlan_status wlan_ret_wifi_direct_mode(IN pmlan_private pmpriv, + 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; @@ -5355,10 +5225,10 @@ wlan_ret_wifi_direct_mode(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_p2p_params_config(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_p2p_params_config(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, + IN t_void *pdata_buf) { HostCmd_DS_WIFI_DIRECT_PARAM_CONFIG *p2p_config = &cmd->params.p2p_params_config; @@ -5373,16 +5243,14 @@ wlan_cmd_p2p_params_config(IN pmlan_private pmpriv, cmd->command = wlan_cpu_to_le16(HOST_CMD_P2P_PARAMS_CONFIG); p2p_config->action = wlan_cpu_to_le16(cmd_action); if (cmd_action == HostCmd_ACT_GEN_SET) { - tlv = (t_u8 *)p2p_config + - sizeof(HostCmd_DS_WIFI_DIRECT_PARAM_CONFIG); + tlv = (t_u8 *)p2p_config->tlv_buf; if (cfg->flags & WIFI_DIRECT_NOA) { pnoa_tlv = (MrvlIEtypes_NoA_setting_t *)tlv; pnoa_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_WIFI_DIRECT_NOA); - pnoa_tlv->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_NoA_setting_t) - - sizeof(MrvlIEtypesHeader_t)); + pnoa_tlv->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_NoA_setting_t) - + sizeof(MrvlIEtypesHeader_t)); pnoa_tlv->enable = cfg->noa_enable; pnoa_tlv->index = wlan_cpu_to_le16(cfg->index); pnoa_tlv->noa_count = cfg->noa_count; @@ -5401,10 +5269,9 @@ wlan_cmd_p2p_params_config(IN pmlan_private pmpriv, popp_ps_tlv = (MrvlIEtypes_OPP_PS_setting_t *)tlv; popp_ps_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_WIFI_DIRECT_OPP_PS); - popp_ps_tlv->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_OPP_PS_setting_t) - - sizeof(MrvlIEtypesHeader_t)); + popp_ps_tlv->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_OPP_PS_setting_t) - + sizeof(MrvlIEtypesHeader_t)); popp_ps_tlv->enable = cfg->ct_window; popp_ps_tlv->enable |= cfg->opp_ps_enable << 7; @@ -5413,16 +5280,14 @@ wlan_cmd_p2p_params_config(IN pmlan_private pmpriv, cfg->opp_ps_enable, cfg->ct_window); } } else if (cmd_action == HostCmd_ACT_GEN_GET) { - tlv = (t_u8 *)p2p_config + - sizeof(HostCmd_DS_WIFI_DIRECT_PARAM_CONFIG); + tlv = (t_u8 *)p2p_config->tlv_buf; if (cfg->flags & WIFI_DIRECT_NOA) { pnoa_tlv = (MrvlIEtypes_NoA_setting_t *)tlv; pnoa_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_WIFI_DIRECT_NOA); - pnoa_tlv->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_NoA_setting_t) - - sizeof(MrvlIEtypesHeader_t)); + pnoa_tlv->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_NoA_setting_t) - + sizeof(MrvlIEtypesHeader_t)); cmd->size += sizeof(MrvlIEtypes_NoA_setting_t); tlv += sizeof(MrvlIEtypes_NoA_setting_t); } @@ -5431,10 +5296,9 @@ wlan_cmd_p2p_params_config(IN pmlan_private pmpriv, popp_ps_tlv = (MrvlIEtypes_OPP_PS_setting_t *)tlv; popp_ps_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_WIFI_DIRECT_OPP_PS); - popp_ps_tlv->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_OPP_PS_setting_t) - - sizeof(MrvlIEtypesHeader_t)); + popp_ps_tlv->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_OPP_PS_setting_t) - + sizeof(MrvlIEtypesHeader_t)); cmd->size += sizeof(MrvlIEtypes_OPP_PS_setting_t); } } @@ -5452,10 +5316,9 @@ wlan_cmd_p2p_params_config(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_p2p_params_config(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_p2p_params_config(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCmd_DS_WIFI_DIRECT_PARAM_CONFIG *p2p_config = &resp->params.p2p_params_config; @@ -5471,9 +5334,7 @@ wlan_ret_p2p_params_config(IN pmlan_private pmpriv, if (wlan_le16_to_cpu(p2p_config->action) == HostCmd_ACT_GEN_GET) { if (pioctl_buf) { cfg = (mlan_ds_misc_cfg *)pioctl_buf->pbuf; - tlv = (MrvlIEtypesHeader_t *)((t_u8 *)p2p_config + - sizeof - (HostCmd_DS_WIFI_DIRECT_PARAM_CONFIG)); + tlv = (MrvlIEtypesHeader_t *)(p2p_config->tlv_buf); tlv_buf_left = resp->size - (sizeof(HostCmd_DS_WIFI_DIRECT_PARAM_CONFIG) + @@ -5489,49 +5350,48 @@ wlan_ret_p2p_params_config(IN pmlan_private pmpriv, } switch (tlv_type) { case TLV_TYPE_WIFI_DIRECT_NOA: - pnoa_tlv = - (MrvlIEtypes_NoA_setting_t *) + pnoa_tlv = (MrvlIEtypes_NoA_setting_t *) tlv; cfg->param.p2p_config.flags |= WIFI_DIRECT_NOA; cfg->param.p2p_config.noa_enable = pnoa_tlv->enable; cfg->param.p2p_config.index = - wlan_le16_to_cpu(pnoa_tlv-> - index); + wlan_le16_to_cpu( + pnoa_tlv->index); cfg->param.p2p_config.noa_count = pnoa_tlv->noa_count; cfg->param.p2p_config.noa_duration = - wlan_le32_to_cpu(pnoa_tlv-> - noa_duration); + wlan_le32_to_cpu( + pnoa_tlv->noa_duration); cfg->param.p2p_config.noa_interval = - wlan_le32_to_cpu(pnoa_tlv-> - noa_interval); + wlan_le32_to_cpu( + pnoa_tlv->noa_interval); PRINTM(MCMND, "Get NOA: enable=%d index=%d, count=%d, duration=%d interval=%d\n", cfg->param.p2p_config.noa_enable, cfg->param.p2p_config.index, cfg->param.p2p_config.noa_count, - (int)cfg->param.p2p_config. - noa_duration, - (int)cfg->param.p2p_config. - noa_interval); + (int)cfg->param.p2p_config + .noa_duration, + (int)cfg->param.p2p_config + .noa_interval); break; case TLV_TYPE_WIFI_DIRECT_OPP_PS: popp_ps_tlv = (MrvlIEtypes_OPP_PS_setting_t *) - tlv; + tlv; cfg->param.p2p_config.flags |= WIFI_DIRECT_OPP_PS; cfg->param.p2p_config.opp_ps_enable = - (popp_ps_tlv-> - enable & 0x80) >> 7; + (popp_ps_tlv->enable & 0x80) >> + 7; cfg->param.p2p_config.ct_window = popp_ps_tlv->enable & 0x7f; PRINTM(MCMND, "Get OPP_PS: enable=%d ct_win=%d\n", - cfg->param.p2p_config. - opp_ps_enable, + cfg->param.p2p_config + .opp_ps_enable, cfg->param.p2p_config.ct_window); break; default: @@ -5539,10 +5399,9 @@ wlan_ret_p2p_params_config(IN pmlan_private pmpriv, } tlv_buf_left -= tlv_len + sizeof(MrvlIEtypesHeader_t); - tlv = (MrvlIEtypesHeader_t *)((t_u8 *)tlv + - tlv_len + - sizeof - (MrvlIEtypesHeader_t)); + tlv = (MrvlIEtypesHeader_t + *)((t_u8 *)tlv + tlv_len + + sizeof(MrvlIEtypesHeader_t)); } pioctl_buf->data_read_written = sizeof(mlan_ds_wifi_direct_config); @@ -5561,12 +5420,12 @@ wlan_ret_p2p_params_config(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_802_11_mimo_switch(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, IN t_void *pdata_buf) +mlan_status wlan_cmd_802_11_mimo_switch(pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_void *pdata_buf) { HostCmd_DS_MIMO_SWITCH *mimo_switch_cmd = &cmd->params.mimo_switch; - mlan_ds_mimo_switch *pmimo_switch = (mlan_ds_mimo_switch *) pdata_buf; + mlan_ds_mimo_switch *pmimo_switch = (mlan_ds_mimo_switch *)pdata_buf; ENTER(); @@ -5588,16 +5447,15 @@ wlan_cmd_802_11_mimo_switch(pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_hs_wakeup_reason(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, IN t_void *pdata_buf) +mlan_status wlan_cmd_hs_wakeup_reason(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_void *pdata_buf) { 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->size = wlan_cpu_to_le16((sizeof(HostCmd_DS_HS_WAKEUP_REASON)) + + S_DS_GEN); LEAVE(); return MLAN_STATUS_SUCCESS; @@ -5613,10 +5471,9 @@ wlan_cmd_hs_wakeup_reason(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_hs_wakeup_reason(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_hs_wakeup_reason(IN pmlan_private pmpriv, + 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; @@ -5642,15 +5499,15 @@ wlan_ret_hs_wakeup_reason(IN pmlan_private pmpriv, * @param pdata_buf A pointer to information buffer * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_cmd_tx_rx_pkt_stats(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN pmlan_ioctl_req pioctl_buf, IN t_void *pdata_buf) +mlan_status wlan_cmd_tx_rx_pkt_stats(pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN pmlan_ioctl_req pioctl_buf, + IN t_void *pdata_buf) { HostCmd_DS_TX_RX_HISTOGRAM *ptx_rx_histogram = &cmd->params.tx_rx_histogram; mlan_ds_misc_tx_rx_histogram *ptx_rx_pkt_stats = - (mlan_ds_misc_tx_rx_histogram *) pdata_buf; + (mlan_ds_misc_tx_rx_histogram *)pdata_buf; mlan_status ret = MLAN_STATUS_SUCCESS; ENTER(); @@ -5669,7 +5526,6 @@ done: LEAVE(); return ret; } - /** * @brief This function handles the command response of tx_rx_pkt_stats * @@ -5679,10 +5535,9 @@ done: * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_tx_rx_pkt_stats(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_tx_rx_pkt_stats(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCmd_DS_TX_RX_HISTOGRAM *ptx_rx_histogram = &resp->params.tx_rx_histogram; @@ -5696,15 +5551,15 @@ wlan_ret_tx_rx_pkt_stats(IN pmlan_private pmpriv, ptx_rx_histogram->action = wlan_le16_to_cpu(ptx_rx_histogram->action); info = (mlan_ds_misc_cfg *)pioctl_buf->pbuf; - length = cmdsize - S_DS_GEN - - sizeof(HostCmd_DS_TX_RX_HISTOGRAM); + length = + cmdsize - S_DS_GEN - sizeof(HostCmd_DS_TX_RX_HISTOGRAM); if (length > 0) { info->param.tx_rx_histogram.size = length; memcpy_ext(pmpriv->adapter, info->param.tx_rx_histogram.value, (t_u8 *)ptx_rx_histogram + - sizeof(HostCmd_DS_TX_RX_HISTOGRAM), length, - info->param.tx_rx_histogram.size); + sizeof(HostCmd_DS_TX_RX_HISTOGRAM), + length, info->param.tx_rx_histogram.size); pos = (t_u32 *)info->param.tx_rx_histogram.value; while (length - 4 * count) { *pos = wlan_le32_to_cpu(*pos); @@ -5728,16 +5583,15 @@ wlan_ret_tx_rx_pkt_stats(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_cw_mode_ctrl(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_cw_mode_ctrl(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, IN t_void *pdata_buf) { HostCmd_DS_CW_MODE_CTRL *cwmode_ctrl = &cmd->params.cwmode; - mlan_ds_cw_mode_ctrl *cw_mode = (mlan_ds_cw_mode_ctrl *) pdata_buf; + mlan_ds_cw_mode_ctrl *cw_mode = (mlan_ds_cw_mode_ctrl *)pdata_buf; ENTER(); - cmd->size = wlan_cpu_to_le16((sizeof(HostCmd_DS_CW_MODE_CTRL)) - + S_DS_GEN); + cmd->size = + wlan_cpu_to_le16((sizeof(HostCmd_DS_CW_MODE_CTRL)) + S_DS_GEN); cmd->command = wlan_cpu_to_le16(HostCmd_CMD_CW_MODE_CTRL); cwmode_ctrl->action = wlan_cpu_to_le16(cmd_action); @@ -5762,10 +5616,9 @@ wlan_cmd_cw_mode_ctrl(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_cw_mode_ctrl(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_cw_mode_ctrl(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCmd_DS_CW_MODE_CTRL *cwmode_resp = &resp->params.cwmode; mlan_ds_misc_cfg *misc = MNULL; @@ -5779,9 +5632,11 @@ wlan_ret_cw_mode_ctrl(IN pmlan_private pmpriv, misc->param.cwmode.txPower = wlan_le16_to_cpu(cwmode_resp->txPower); misc->param.cwmode.rateInfo = - wlan_le32_to_cpu(cwmode_resp->rateInfo);; + wlan_le32_to_cpu(cwmode_resp->rateInfo); + ; misc->param.cwmode.pktLength = - wlan_le16_to_cpu(cwmode_resp->pktLength);; + wlan_le16_to_cpu(cwmode_resp->pktLength); + ; pioctl_buf->data_read_written = sizeof(mlan_ds_misc_cfg); } LEAVE(); @@ -5798,38 +5653,35 @@ wlan_ret_cw_mode_ctrl(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -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) +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; typedef struct _HostCmd_DS_802_11_RF_ANTENNA_1X1 { - /** Action */ + /** Action */ t_u16 action; - /** Antenna or 0xffff (diversity) */ + /** Antenna or 0xffff (diversity) */ t_u16 antenna_mode; - /** Evaluate time */ + /** Evaluate time */ t_u16 evaluate_time; - /** Current antenna */ + /** Current antenna */ t_u16 current_antenna; } HostCmd_DS_802_11_RF_ANTENNA_1X1; HostCmd_DS_802_11_RF_ANTENNA_1X1 *pantenna_1x1 = (HostCmd_DS_802_11_RF_ANTENNA_1X1 *)&cmd->params.antenna; - mlan_ds_ant_cfg_1x1 *ant_cfg_1x1 = (mlan_ds_ant_cfg_1x1 *) pdata_buf; + mlan_ds_ant_cfg_1x1 *ant_cfg_1x1 = (mlan_ds_ant_cfg_1x1 *)pdata_buf; ENTER(); cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_RF_ANTENNA); if (!IS_STREAM_2X2(pmpriv->adapter->feature_control)) - cmd->size = - wlan_cpu_to_le16(sizeof - (HostCmd_DS_802_11_RF_ANTENNA_1X1) + - S_DS_GEN); + cmd->size = wlan_cpu_to_le16( + sizeof(HostCmd_DS_802_11_RF_ANTENNA_1X1) + S_DS_GEN); else - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_RF_ANTENNA) + - S_DS_GEN); + cmd->size = wlan_cpu_to_le16( + sizeof(HostCmd_DS_802_11_RF_ANTENNA) + S_DS_GEN); if (cmd_action == HostCmd_ACT_GEN_SET) { if (IS_STREAM_2X2(pmpriv->adapter->feature_control)) { @@ -5846,9 +5698,8 @@ wlan_cmd_802_11_rf_antenna(IN pmlan_private pmpriv, wlan_cpu_to_le16(HostCmd_ACT_SET_BOTH); pantenna_1x1->antenna_mode = wlan_cpu_to_le16((t_u16)ant_cfg_1x1->antenna); - pantenna_1x1->evaluate_time = - wlan_cpu_to_le16((t_u16)ant_cfg_1x1-> - evaluate_time); + pantenna_1x1->evaluate_time = wlan_cpu_to_le16( + (t_u16)ant_cfg_1x1->evaluate_time); } } else { if (IS_STREAM_2X2(pmpriv->adapter->feature_control)) { @@ -5874,25 +5725,25 @@ wlan_cmd_802_11_rf_antenna(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_802_11_rf_antenna(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_802_11_rf_antenna(IN pmlan_private pmpriv, + 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); -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) mlan_adapter *pmadapter = pmpriv->adapter; #endif typedef struct _HostCmd_DS_802_11_RF_ANTENNA_1X1 { - /** Action */ + /** Action */ t_u16 action; - /** Antenna or 0xffff (diversity) */ + /** Antenna or 0xffff (diversity) */ t_u16 antenna_mode; - /** Evaluate time */ + /** Evaluate time */ t_u16 evaluate_time; - /** Current antenna */ + /** Current antenna */ t_u16 current_antenna; } HostCmd_DS_802_11_RF_ANTENNA_1X1; HostCmd_DS_802_11_RF_ANTENNA_1X1 *pantenna_1x1 = @@ -5905,16 +5756,18 @@ wlan_ret_802_11_rf_antenna(IN pmlan_private pmpriv, ENTER(); if (IS_STREAM_2X2(pmpriv->adapter->feature_control)) { - PRINTM(MCMND, "RF_ANT_RESP: Tx action = 0x%x, Tx Mode = 0x%04x" + PRINTM(MCMND, + "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 defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) if (IS_CARD9098(pmadapter->card_type) || IS_CARD9097(pmadapter->card_type)) { tx_ant_mode &= 0x0303; rx_ant_mode &= 0x0303; - /** 2G antcfg TX */ + /** 2G antcfg TX */ if (tx_ant_mode & 0x00FF) { pmadapter->user_htstream &= ~0xF0; pmadapter->user_htstream |= @@ -5976,13 +5829,13 @@ wlan_ret_802_11_rf_antenna(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_cmd_reg_access(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_reg_access(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, IN t_u16 cmd_action, + IN t_void *pdata_buf) { mlan_ds_reg_rw *reg_rw; -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(USB9097) || defined(SD9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(USB9097) || defined(SD9097) MrvlIEtypes_Reg_type_t *tlv; mlan_adapter *pmadapter = pmpriv->adapter; #endif @@ -5991,170 +5844,125 @@ wlan_cmd_reg_access(IN pmlan_private pmpriv, 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); -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(USB9097) || defined(SD9097) - if ((reg_rw->type == MLAN_REG_MAC2) && - (IS_CARD9098(pmadapter->card_type) || - IS_CARD9097(pmadapter->card_type))) { - tlv = (MrvlIEtypes_Reg_type_t *) ((t_u8 *)cmd + - sizeof - (HostCmd_DS_MAC_REG_ACCESS) - + S_DS_GEN); - tlv->header.type = - wlan_cpu_to_le16 - (TLV_TYPE_REG_ACCESS_CTRL); - tlv->header.len = - wlan_cpu_to_le16(sizeof(t_u8)); - tlv->type = MLAN_REG_MAC2; - cmd->size = - wlan_cpu_to_le16(sizeof - (HostCmd_DS_MAC_REG_ACCESS) - + S_DS_GEN + - sizeof - (MrvlIEtypes_Reg_type_t)); - } + 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); +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(USB9097) || defined(SD9097) + if ((reg_rw->type == MLAN_REG_MAC2) && + (IS_CARD9098(pmadapter->card_type) || + IS_CARD9097(pmadapter->card_type))) { + tlv = (MrvlIEtypes_Reg_type_t + *)((t_u8 *)cmd + + sizeof(HostCmd_DS_MAC_REG_ACCESS) + + S_DS_GEN); + tlv->header.type = + wlan_cpu_to_le16(TLV_TYPE_REG_ACCESS_CTRL); + tlv->header.len = wlan_cpu_to_le16(sizeof(t_u8)); + tlv->type = MLAN_REG_MAC2; + cmd->size = wlan_cpu_to_le16( + sizeof(HostCmd_DS_MAC_REG_ACCESS) + S_DS_GEN + + sizeof(MrvlIEtypes_Reg_type_t)); + } #endif - break; + 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; +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(USB9097) || defined(SD9097) + if ((reg_rw->type == MLAN_REG_BBP2) && + (IS_CARD9098(pmadapter->card_type) || + IS_CARD9097(pmadapter->card_type))) { + tlv = (MrvlIEtypes_Reg_type_t + *)((t_u8 *)cmd + + sizeof(HostCmd_DS_BBP_REG_ACCESS) + + S_DS_GEN); + tlv->header.type = + wlan_cpu_to_le16(TLV_TYPE_REG_ACCESS_CTRL); + tlv->header.len = wlan_cpu_to_le16(sizeof(t_u8)); + tlv->type = MLAN_REG_BBP2; + cmd->size = wlan_cpu_to_le16( + sizeof(HostCmd_DS_BBP_REG_ACCESS) + S_DS_GEN + + sizeof(MrvlIEtypes_Reg_type_t)); } - 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; -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(USB9097) || defined(SD9097) - if ((reg_rw->type == MLAN_REG_BBP2) && - (IS_CARD9098(pmadapter->card_type) || - IS_CARD9097(pmadapter->card_type))) { - tlv = (MrvlIEtypes_Reg_type_t *) ((t_u8 *)cmd + - sizeof - (HostCmd_DS_BBP_REG_ACCESS) - + S_DS_GEN); - tlv->header.type = - wlan_cpu_to_le16 - (TLV_TYPE_REG_ACCESS_CTRL); - tlv->header.len = - wlan_cpu_to_le16(sizeof(t_u8)); - tlv->type = MLAN_REG_BBP2; - cmd->size = - wlan_cpu_to_le16(sizeof - (HostCmd_DS_BBP_REG_ACCESS) - + S_DS_GEN + - sizeof - (MrvlIEtypes_Reg_type_t)); - } #endif - break; + 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; +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(USB9097) || defined(SD9097) + if ((reg_rw->type == MLAN_REG_RF2) && + (IS_CARD9098(pmadapter->card_type) || + IS_CARD9097(pmadapter->card_type))) { + tlv = (MrvlIEtypes_Reg_type_t + *)((t_u8 *)cmd + + sizeof(HostCmd_DS_RF_REG_ACCESS) + + S_DS_GEN); + tlv->header.type = + wlan_cpu_to_le16(TLV_TYPE_REG_ACCESS_CTRL); + tlv->header.len = wlan_cpu_to_le16(sizeof(t_u8)); + tlv->type = MLAN_REG_RF2; + cmd->size = wlan_cpu_to_le16( + sizeof(HostCmd_DS_RF_REG_ACCESS) + S_DS_GEN + + sizeof(MrvlIEtypes_Reg_type_t)); } - 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; -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(USB9097) || defined(SD9097) - if ((reg_rw->type == MLAN_REG_RF2) && - (IS_CARD9098(pmadapter->card_type) || - IS_CARD9097(pmadapter->card_type))) { - tlv = (MrvlIEtypes_Reg_type_t *) ((t_u8 *)cmd + - sizeof - (HostCmd_DS_RF_REG_ACCESS) - + S_DS_GEN); - tlv->header.type = - wlan_cpu_to_le16 - (TLV_TYPE_REG_ACCESS_CTRL); - tlv->header.len = - wlan_cpu_to_le16(sizeof(t_u8)); - tlv->type = MLAN_REG_RF2; - cmd->size = - wlan_cpu_to_le16(sizeof - (HostCmd_DS_RF_REG_ACCESS) - + S_DS_GEN + - sizeof - (MrvlIEtypes_Reg_type_t)); - } #endif - 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_TARGET_ACCESS: - { - HostCmd_DS_TARGET_ACCESS *target; - cmd->size = - wlan_cpu_to_le16(sizeof - (HostCmd_DS_TARGET_ACCESS) + - S_DS_GEN); - target = (HostCmd_DS_TARGET_ACCESS *)&cmd->params. - target; - target->action = wlan_cpu_to_le16(cmd_action); - target->csu_target = - wlan_cpu_to_le16(MLAN_CSU_TARGET_PSU); - target->address = - wlan_cpu_to_le16((t_u16)reg_rw->offset); - target->data = (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; - } + 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_TARGET_ACCESS: { + HostCmd_DS_TARGET_ACCESS *target; + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_TARGET_ACCESS) + + S_DS_GEN); + target = (HostCmd_DS_TARGET_ACCESS *)&cmd->params.target; + target->action = wlan_cpu_to_le16(cmd_action); + target->csu_target = wlan_cpu_to_le16(MLAN_CSU_TARGET_PSU); + target->address = wlan_cpu_to_le16((t_u16)reg_rw->offset); + target->data = (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; @@ -6175,10 +5983,9 @@ wlan_cmd_reg_access(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ret_reg_access(mlan_adapter *pmadapter, - t_u16 type, - 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) { mlan_ds_reg_mem *reg_mem = MNULL; mlan_ds_reg_rw *reg_rw = MNULL; @@ -6189,93 +5996,72 @@ wlan_ret_reg_access(mlan_adapter *pmadapter, 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_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_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_TARGET_ACCESS: { + HostCmd_DS_TARGET_ACCESS *reg; + reg = (HostCmd_DS_TARGET_ACCESS *)&resp->params.target; + reg_rw->offset = (t_u32)wlan_le16_to_cpu(reg->address); + reg_rw->value = (t_u32)reg->data; + 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; } - 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_TARGET_ACCESS: - { - HostCmd_DS_TARGET_ACCESS *reg; - reg = (HostCmd_DS_TARGET_ACCESS *)&resp->params. - target; - reg_rw->offset = - (t_u32)wlan_le16_to_cpu(reg->address); - reg_rw->value = (t_u32)reg->data; - 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_ext(pmadapter, &eeprom->value, - &cmd_eeprom->value, - eeprom->byte_count, - MAX_EEPROM_DATA); - HEXDUMP("EEPROM", - (char *)&eeprom->value, - MIN(MAX_EEPROM_DATA, - eeprom->byte_count)); - } - break; + eeprom->offset = wlan_le16_to_cpu(cmd_eeprom->offset); + eeprom->byte_count = cmd_eeprom->byte_count; + if (eeprom->byte_count > 0) { + memcpy_ext(pmadapter, &eeprom->value, + &cmd_eeprom->value, + eeprom->byte_count, MAX_EEPROM_DATA); + HEXDUMP("EEPROM", (char *)&eeprom->value, + MIN(MAX_EEPROM_DATA, + eeprom->byte_count)); } + break; + } default: pioctl_buf->status_code = MLAN_ERROR_CMD_RESP_FAIL; LEAVE(); @@ -6295,9 +6081,8 @@ wlan_ret_reg_access(mlan_adapter *pmadapter, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_mem_access(IN HostCmd_DS_COMMAND *cmd, - 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) { mlan_ds_mem_rw *mem_rw = (mlan_ds_mem_rw *)pdata_buf; HostCmd_DS_MEM_ACCESS *mem_access = @@ -6325,9 +6110,9 @@ wlan_cmd_mem_access(IN HostCmd_DS_COMMAND *cmd, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_mem_access(IN pmlan_private pmpriv, - 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) { mlan_ds_reg_mem *reg_mem = MNULL; mlan_ds_mem_rw *mem_rw = MNULL; @@ -6348,16 +6133,16 @@ wlan_ret_mem_access(IN pmlan_private pmpriv, } /** -* -* @brief This function handles coex events generated by firmware -* -* @param priv A pointer to mlan_private structure -* @param pevent A pointer to event buf -* -* @return N/A -*/ -void -wlan_bt_coex_wlan_param_update_event(pmlan_private priv, pmlan_buffer pevent) + * + * @brief This function handles coex events generated by firmware + * + * @param priv A pointer to mlan_private structure + * @param pevent A pointer to event buf + * + * @return N/A + */ +void wlan_bt_coex_wlan_param_update_event(pmlan_private priv, + pmlan_buffer pevent) { pmlan_adapter pmadapter = priv->adapter; MrvlIEtypesHeader_t *tlv = MNULL; @@ -6377,7 +6162,7 @@ wlan_bt_coex_wlan_param_update_event(pmlan_private priv, pmlan_buffer pevent) break; switch (tlv_type) { case TLV_BTCOEX_WL_AGGR_WINSIZE: - pCoexWinsize = (MrvlIETypes_BtCoexAggrWinSize_t *) tlv; + pCoexWinsize = (MrvlIETypes_BtCoexAggrWinSize_t *)tlv; pmadapter->coex_win_size = pCoexWinsize->coex_win_size; pmadapter->coex_tx_win_size = pCoexWinsize->tx_win_size; pmadapter->coex_rx_win_size = pCoexWinsize->rx_win_size; @@ -6385,7 +6170,7 @@ wlan_bt_coex_wlan_param_update_event(pmlan_private priv, pmlan_buffer pevent) wlan_update_ampdu_txwinsize(pmadapter); break; case TLV_BTCOEX_WL_SCANTIME: - pScantlv = (MrvlIEtypes_BtCoexScanTime_t *) tlv; + pScantlv = (MrvlIEtypes_BtCoexScanTime_t *)tlv; pmadapter->coex_scan = pScantlv->coex_scan; pmadapter->coex_min_scan_time = wlan_le16_to_cpu(pScantlv->min_scan_time); @@ -6417,10 +6202,10 @@ wlan_bt_coex_wlan_param_update_event(pmlan_private priv, pmlan_buffer pevent) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) +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) { MrvlIEtypes_PMK_t *ppmk_tlv = MNULL; MrvlIEtypes_Passphrase_t *ppassphrase_tlv = MNULL; @@ -6432,7 +6217,7 @@ wlan_cmd_802_11_supplicant_pmk(IN pmlan_private pmpriv, t_u8 *ptlv_buffer = (t_u8 *)pesupplicant_psk->tlv_buffer; mlan_ds_sec_cfg *sec = (mlan_ds_sec_cfg *)pdata_buf; mlan_ds_passphrase *psk = MNULL; - t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; + t_u8 zero_mac[] = {0, 0, 0, 0, 0, 0}; t_u8 ssid_flag = 0, bssid_flag = 0, pmk_flag = 0, passphrase_flag = 0; t_u8 sae_password_flag = 0; @@ -6465,9 +6250,8 @@ wlan_cmd_802_11_supplicant_pmk(IN pmlan_private pmpriv, /* -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 && - memcmp(pmpriv->adapter, (t_u8 *)&psk->bssid, zero_mac, - sizeof(zero_mac))) { + if (psk && 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; @@ -6521,18 +6305,16 @@ wlan_cmd_802_11_supplicant_pmk(IN pmlan_private pmpriv, psk->psk.passphrase.passphrase, psk->psk.passphrase.passphrase_len, MLAN_MAX_PASSPHRASE_LENGTH); - ptlv_buffer += - (ppassphrase_tlv->header.len + - sizeof(MrvlIEtypesHeader_t)); - cmd->size += - (ppassphrase_tlv->header.len + - sizeof(MrvlIEtypesHeader_t)); + 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); passphrase_flag = 1; } if (psk->psk_type == MLAN_PSK_SAE_PASSWORD) { - psae_password_tlv = (MrvlIEtypes_SAE_Password_t *) ptlv_buffer; + psae_password_tlv = (MrvlIEtypes_SAE_Password_t *)ptlv_buffer; psae_password_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_SAE_PASSWORD); psae_password_tlv->header.len = @@ -6542,20 +6324,17 @@ wlan_cmd_802_11_supplicant_pmk(IN pmlan_private pmpriv, psk->psk.sae_password.sae_password, psk->psk.sae_password.sae_password_len, MLAN_MAX_SAE_PASSWORD_LENGTH); - ptlv_buffer += - (psae_password_tlv->header.len + - sizeof(MrvlIEtypesHeader_t)); - cmd->size += - (psae_password_tlv->header.len + - sizeof(MrvlIEtypesHeader_t)); + ptlv_buffer += (psae_password_tlv->header.len + + sizeof(MrvlIEtypesHeader_t)); + cmd->size += (psae_password_tlv->header.len + + sizeof(MrvlIEtypesHeader_t)); psae_password_tlv->header.len = wlan_cpu_to_le16(psae_password_tlv->header.len); sae_password_flag = 1; } if ((cmd_action == HostCmd_ACT_GEN_SET) && - ((ssid_flag || bssid_flag) && (!pmk_flag && !passphrase_flag) - && (!pmk_flag && !sae_password_flag) - )) { + ((ssid_flag || bssid_flag) && (!pmk_flag && !passphrase_flag) && + (!pmk_flag && !sae_password_flag))) { PRINTM(MERROR, "Invalid case,ssid/bssid present without pmk, passphrase or sae password\n"); LEAVE(); @@ -6578,10 +6357,9 @@ wlan_cmd_802_11_supplicant_pmk(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS MLAN_STATUS_FAILURE */ -mlan_status -wlan_ret_802_11_supplicant_pmk(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_802_11_supplicant_pmk(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCmd_DS_802_11_SUPPLICANT_PMK *supplicant_pmk_resp = &resp->params.esupplicant_psk; @@ -6601,8 +6379,8 @@ wlan_ret_802_11_supplicant_pmk(IN pmlan_private pmpriv, mlan_status ret = MLAN_STATUS_SUCCESS; ENTER(); - tlv_buf_len = resp->size - (sizeof(HostCmd_DS_802_11_SUPPLICANT_PMK) + - S_DS_GEN - 1); + 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 == @@ -6624,28 +6402,32 @@ wlan_ret_802_11_supplicant_pmk(IN pmlan_private pmpriv, tlv = (*tlv_buf) | (*(tlv_buf + 1) << 8); if ((tlv != TLV_TYPE_SSID) && (tlv != TLV_TYPE_BSSID) && - (tlv != TLV_TYPE_PASSPHRASE) - && (tlv != TLV_TYPE_PMK)) + (tlv != TLV_TYPE_PASSPHRASE) && + (tlv != TLV_TYPE_PMK) +#ifdef WAP3_SAE + && (tlv != TLV_TYPE_SAE_PASSWORD) +#endif + ) break; switch (tlv) { case TLV_TYPE_SSID: pssid_tlv = (MrvlIEtypes_SsIdParamSet_t *) - tlv_buf; + tlv_buf; pssid_tlv->header.len = - wlan_le16_to_cpu(pssid_tlv-> - header.len); - memcpy_ext(pmpriv->adapter, - sec->param.passphrase.ssid. - ssid, pssid_tlv->ssid, - pssid_tlv->header.len, - MLAN_MAX_SSID_LENGTH); + wlan_le16_to_cpu( + pssid_tlv->header.len); + memcpy_ext( + pmpriv->adapter, + sec->param.passphrase.ssid.ssid, + pssid_tlv->ssid, + pssid_tlv->header.len, + MLAN_MAX_SSID_LENGTH); 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 += pssid_tlv->header.len + + sizeof(MrvlIEtypesHeader_t); tlv_buf_len -= (pssid_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); @@ -6654,16 +6436,15 @@ wlan_ret_802_11_supplicant_pmk(IN pmlan_private pmpriv, pbssid_tlv = (MrvlIEtypes_Bssid_t *)tlv_buf; pbssid_tlv->header.len = - wlan_le16_to_cpu(pbssid_tlv-> - header.len); + wlan_le16_to_cpu( + pbssid_tlv->header.len); memcpy_ext(pmpriv->adapter, &sec->param.passphrase.bssid, pbssid_tlv->bssid, MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); - tlv_buf += - pbssid_tlv->header.len + - sizeof(MrvlIEtypesHeader_t); + tlv_buf += pbssid_tlv->header.len + + sizeof(MrvlIEtypesHeader_t); tlv_buf_len -= (pbssid_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); @@ -6671,24 +6452,24 @@ wlan_ret_802_11_supplicant_pmk(IN pmlan_private pmpriv, case TLV_TYPE_PASSPHRASE: passphrase_tlv = (MrvlIEtypes_Passphrase_t *) - tlv_buf; - passphrase_tlv->header.len = - wlan_le16_to_cpu - (passphrase_tlv->header.len); + 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 = + sec->param.passphrase.psk.passphrase + .passphrase_len = passphrase_tlv->header.len; - memcpy_ext(pmpriv->adapter, - sec->param.passphrase.psk. - passphrase.passphrase, - passphrase_tlv->passphrase, - passphrase_tlv->header.len, - MLAN_MAX_PASSPHRASE_LENGTH); - tlv_buf += - passphrase_tlv->header.len + - sizeof(MrvlIEtypesHeader_t); + memcpy_ext( + pmpriv->adapter, + sec->param.passphrase.psk + .passphrase.passphrase, + passphrase_tlv->passphrase, + passphrase_tlv->header.len, + MLAN_MAX_PASSPHRASE_LENGTH); + tlv_buf += passphrase_tlv->header.len + + sizeof(MrvlIEtypesHeader_t); tlv_buf_len -= (passphrase_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); @@ -6696,23 +6477,23 @@ wlan_ret_802_11_supplicant_pmk(IN pmlan_private pmpriv, case TLV_TYPE_SAE_PASSWORD: psae_password_tlv = (MrvlIEtypes_SAE_Password_t *) - tlv_buf; - psae_password_tlv->header.len = - wlan_le16_to_cpu - (psae_password_tlv->header.len); + tlv_buf; + psae_password_tlv->header + .len = wlan_le16_to_cpu( + psae_password_tlv->header.len); sec->param.passphrase.psk_type = MLAN_PSK_SAE_PASSWORD; - sec->param.passphrase.psk.sae_password. - sae_password_len = + sec->param.passphrase.psk.sae_password + .sae_password_len = psae_password_tlv->header.len; - memcpy_ext(pmpriv->adapter, - sec->param.passphrase.psk. - sae_password.sae_password, - psae_password_tlv-> - sae_password, - psae_password_tlv->header. - len, - MLAN_MAX_SAE_PASSWORD_LENGTH); + memcpy_ext( + pmpriv->adapter, + sec->param.passphrase.psk + .sae_password + .sae_password, + psae_password_tlv->sae_password, + psae_password_tlv->header.len, + MLAN_MAX_SAE_PASSWORD_LENGTH); tlv_buf += psae_password_tlv->header.len + sizeof(MrvlIEtypesHeader_t); @@ -6722,30 +6503,28 @@ wlan_ret_802_11_supplicant_pmk(IN pmlan_private pmpriv, break; case TLV_TYPE_PMK: ppmk_tlv = (MrvlIEtypes_PMK_t *)tlv_buf; - ppmk_tlv->header.len = - wlan_le16_to_cpu(ppmk_tlv-> - header.len); + ppmk_tlv->header.len = wlan_le16_to_cpu( + ppmk_tlv->header.len); sec->param.passphrase.psk_type = MLAN_PSK_PMK; memcpy_ext(pmpriv->adapter, - sec->param.passphrase.psk. - pmk.pmk, ppmk_tlv->pmk, + sec->param.passphrase.psk.pmk + .pmk, + ppmk_tlv->pmk, ppmk_tlv->header.len, MLAN_MAX_KEY_LENGTH); - tlv_buf += - ppmk_tlv->header.len + - sizeof(MrvlIEtypesHeader_t); + tlv_buf += ppmk_tlv->header.len + + sizeof(MrvlIEtypesHeader_t); tlv_buf_len -= (ppmk_tlv->header.len + sizeof(MrvlIEtypesHeader_t)); break; - } } #ifdef STA_SUPPORT if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA && ((mlan_ds_bss *)pioctl_buf->pbuf)->sub_command == - MLAN_OID_BSS_FIND_BSS) { + MLAN_OID_BSS_FIND_BSS) { wlan_set_ewpa_mode(pmpriv, &sec->param.passphrase); ret = wlan_find_bss(pmpriv, pioctl_buf); @@ -6773,20 +6552,18 @@ wlan_ret_802_11_supplicant_pmk(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_ind_rst_cfg(IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_ind_rst_cfg(IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, IN t_void *pdata_buf) { - mlan_ds_ind_rst_cfg *pdata_ind_rst = (mlan_ds_ind_rst_cfg *) pdata_buf; + mlan_ds_ind_rst_cfg *pdata_ind_rst = (mlan_ds_ind_rst_cfg *)pdata_buf; HostCmd_DS_INDEPENDENT_RESET_CFG *ind_rst_cfg = - (HostCmd_DS_INDEPENDENT_RESET_CFG *) & cmd->params.ind_rst_cfg; + (HostCmd_DS_INDEPENDENT_RESET_CFG *)&cmd->params.ind_rst_cfg; ENTER(); cmd->command = wlan_cpu_to_le16(HostCmd_CMD_INDEPENDENT_RESET_CFG); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_INDEPENDENT_RESET_CFG) + - S_DS_GEN); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_INDEPENDENT_RESET_CFG) + + S_DS_GEN); ind_rst_cfg->action = wlan_cpu_to_le16(cmd_action); if (cmd_action == HostCmd_ACT_GEN_SET) { @@ -6807,13 +6584,13 @@ wlan_cmd_ind_rst_cfg(IN HostCmd_DS_COMMAND *cmd, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_ind_rst_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_ind_rst_cfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { mlan_ds_misc_cfg *misc = MNULL; const HostCmd_DS_INDEPENDENT_RESET_CFG *ind_rst_cfg = - (HostCmd_DS_INDEPENDENT_RESET_CFG *) & resp->params.ind_rst_cfg; + (HostCmd_DS_INDEPENDENT_RESET_CFG *)&resp->params.ind_rst_cfg; ENTER(); @@ -6841,23 +6618,22 @@ wlan_ret_ind_rst_cfg(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_ps_inactivity_timeout(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_ps_inactivity_timeout(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, + IN t_void *pdata_buf) { t_u16 timeout = *((t_u16 *)pdata_buf); HostCmd_DS_802_11_PS_INACTIVITY_TIMEOUT *ps_inact_tmo = - (HostCmd_DS_802_11_PS_INACTIVITY_TIMEOUT *) & cmd->params. - ps_inact_tmo; + (HostCmd_DS_802_11_PS_INACTIVITY_TIMEOUT *)&cmd->params + .ps_inact_tmo; ENTER(); cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_PS_INACTIVITY_TIMEOUT); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_PS_INACTIVITY_TIMEOUT) - + S_DS_GEN); + cmd->size = wlan_cpu_to_le16( + sizeof(HostCmd_DS_802_11_PS_INACTIVITY_TIMEOUT) + S_DS_GEN); ps_inact_tmo->action = wlan_cpu_to_le16(cmd_action); if (cmd_action == HostCmd_ACT_GEN_SET) @@ -6875,9 +6651,8 @@ wlan_cmd_ps_inactivity_timeout(IN pmlan_private pmpriv, * @param cmd_action The action: GET * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_get_tsf(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, IN t_u16 cmd_action) +mlan_status wlan_cmd_get_tsf(pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action) { ENTER(); @@ -6897,12 +6672,12 @@ wlan_cmd_get_tsf(pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_get_tsf(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_get_tsf(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { mlan_ds_misc_cfg *misc_cfg = MNULL; - HostCmd_DS_TSF *tsf_pointer = (HostCmd_DS_TSF *) & resp->params.tsf; + HostCmd_DS_TSF *tsf_pointer = (HostCmd_DS_TSF *)&resp->params.tsf; ENTER(); if (pioctl_buf) { @@ -6923,10 +6698,9 @@ wlan_ret_get_tsf(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_chan_region_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_chan_region_cfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { mlan_adapter *pmadapter = pmpriv->adapter; t_u16 action; @@ -6939,7 +6713,7 @@ wlan_ret_chan_region_cfg(IN pmlan_private pmpriv, ENTER(); - reg = (HostCmd_DS_CHAN_REGION_CFG *) & resp->params.reg_cfg; + reg = (HostCmd_DS_CHAN_REGION_CFG *)&resp->params.reg_cfg; if (!reg) { ret = MLAN_STATUS_FAILURE; goto done; @@ -6968,8 +6742,8 @@ wlan_ret_chan_region_cfg(IN pmlan_private pmpriv, misc_cfg = (mlan_ds_misc_cfg *)pioctl_buf->pbuf; if (misc_cfg->sub_command == MLAN_OID_MISC_GET_REGIONPWR_CFG) { - cfg = (mlan_ds_misc_chnrgpwr_cfg *) & (misc_cfg->param. - rgchnpwr_cfg); + cfg = (mlan_ds_misc_chnrgpwr_cfg *)&( + misc_cfg->param.rgchnpwr_cfg); cfg->length = wlan_le16_to_cpu(resp->size); memcpy_ext(pmpriv->adapter, cfg->chnrgpwr_buf, (t_u8 *)resp, cfg->length, sizeof(cfg->chnrgpwr_buf)); @@ -6986,26 +6760,27 @@ wlan_ret_chan_region_cfg(IN pmlan_private pmpriv, misc_cfg->param.custom_reg_domain.num_bg_chan = pmadapter->tx_power_table_bg_rows; memcpy_ext(pmpriv->adapter, - (t_u8 *)misc_cfg->param.custom_reg_domain. - cfp_tbl, (t_u8 *)pmadapter->cfp_otp_bg, + (t_u8 *)misc_cfg->param.custom_reg_domain + .cfp_tbl, + (t_u8 *)pmadapter->cfp_otp_bg, pmadapter->tx_power_table_bg_rows * - sizeof(chan_freq_power_t), + sizeof(chan_freq_power_t), pmadapter->tx_power_table_bg_rows * - sizeof(chan_freq_power_t)); + sizeof(chan_freq_power_t)); } if (pmadapter->cfp_otp_a) { misc_cfg->param.custom_reg_domain.num_a_chan = pmadapter->tx_power_table_a_rows; memcpy_ext(pmpriv->adapter, - (t_u8 *)misc_cfg->param.custom_reg_domain. - cfp_tbl + - pmadapter->tx_power_table_bg_rows * - sizeof(chan_freq_power_t), + (t_u8 *)misc_cfg->param.custom_reg_domain + .cfp_tbl + + pmadapter->tx_power_table_bg_rows * + sizeof(chan_freq_power_t), (t_u8 *)pmadapter->cfp_otp_a, pmadapter->tx_power_table_a_rows * - sizeof(chan_freq_power_t), + sizeof(chan_freq_power_t), pmadapter->tx_power_table_a_rows * - sizeof(chan_freq_power_t)); + sizeof(chan_freq_power_t)); } } done: @@ -7022,21 +6797,19 @@ done: * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_cmd_packet_aggr_ctrl(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_packet_aggr_ctrl(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, IN t_void *pdata_buf) { HostCmd_DS_PACKET_AGGR_CTRL *aggr_ctrl = &cmd->params.aggr_ctrl; - mlan_ds_misc_aggr_ctrl *aggr = (mlan_ds_misc_aggr_ctrl *) pdata_buf; + mlan_ds_misc_aggr_ctrl *aggr = (mlan_ds_misc_aggr_ctrl *)pdata_buf; ENTER(); cmd->command = wlan_cpu_to_le16(HostCmd_CMD_PACKET_AGGR_CTRL); aggr_ctrl->action = wlan_cpu_to_le16(cmd_action); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_PACKET_AGGR_CTRL) + - S_DS_GEN); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_PACKET_AGGR_CTRL) + + S_DS_GEN); aggr_ctrl->aggr_enable = 0; if (aggr->tx.enable) @@ -7057,10 +6830,9 @@ wlan_cmd_packet_aggr_ctrl(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_packet_aggr_ctrl(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_packet_aggr_ctrl(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { mlan_ds_misc_cfg *misc = MNULL; HostCmd_DS_PACKET_AGGR_CTRL *aggr_ctrl = &resp->params.aggr_ctrl; @@ -7086,18 +6858,18 @@ wlan_ret_packet_aggr_ctrl(IN pmlan_private pmpriv, #if defined(USB) if (IS_USB(pmadapter->card_type)) { if (aggr_ctrl->aggr_enable & MBIT(0)) { - if (!pmadapter->pcard_usb->usb_tx_aggr[0].aggr_ctrl. - enable) { - pmadapter->pcard_usb->usb_tx_aggr[0].aggr_ctrl. - enable = MTRUE; + if (!pmadapter->pcard_usb->usb_tx_aggr[0] + .aggr_ctrl.enable) { + pmadapter->pcard_usb->usb_tx_aggr[0] + .aggr_ctrl.enable = MTRUE; change = MTRUE; } } else { - if (pmadapter->pcard_usb->usb_tx_aggr[0].aggr_ctrl. - enable) { - pmadapter->pcard_usb->usb_tx_aggr[0].aggr_ctrl. - enable = MFALSE; + if (pmadapter->pcard_usb->usb_tx_aggr[0] + .aggr_ctrl.enable) { + pmadapter->pcard_usb->usb_tx_aggr[0] + .aggr_ctrl.enable = MFALSE; change = MTRUE; } } @@ -7114,18 +6886,17 @@ wlan_ret_packet_aggr_ctrl(IN pmlan_private pmpriv, for (i = 0; i < pmadapter->priv_num; ++i) { if (pmadapter->priv[i]) { pusb_tx_aggr = - wlan_get_usb_tx_aggr_params - (pmadapter, - pmadapter->priv[i]->port); + wlan_get_usb_tx_aggr_params( + pmadapter, + pmadapter->priv[i] + ->port); if (pusb_tx_aggr && pusb_tx_aggr->aggr_ctrl.aggr_mode == - MLAN_USB_AGGR_MODE_LEN_V2) - pmadapter->priv[i]-> - intf_hr_len = + MLAN_USB_AGGR_MODE_LEN_V2) + pmadapter->priv[i]->intf_hr_len = MLAN_USB_TX_AGGR_HEADER; else - pmadapter->priv[i]-> - intf_hr_len = + pmadapter->priv[i]->intf_hr_len = USB_INTF_HEADER_LEN; } } @@ -7134,7 +6905,7 @@ wlan_ret_packet_aggr_ctrl(IN pmlan_private pmpriv, #endif if (pioctl_buf) { misc = (mlan_ds_misc_cfg *)pioctl_buf->pbuf; - aggr = (mlan_ds_misc_aggr_ctrl *) & (misc->param.aggr_params); + aggr = (mlan_ds_misc_aggr_ctrl *)&(misc->param.aggr_params); if (aggr_ctrl->aggr_enable & MBIT(0)) aggr->tx.enable = MTRUE; else @@ -7144,9 +6915,8 @@ wlan_ret_packet_aggr_ctrl(IN pmlan_private pmpriv, aggr->tx.aggr_max_num = aggr_ctrl->tx_aggr_max_num; #if defined(USB) if (IS_USB(pmadapter->card_type)) - aggr->tx.aggr_tmo = - pmadapter->pcard_usb->usb_tx_aggr[0].aggr_ctrl. - aggr_tmo; + aggr->tx.aggr_tmo = pmadapter->pcard_usb->usb_tx_aggr[0] + .aggr_ctrl.aggr_tmo; #endif } LEAVE(); @@ -7162,10 +6932,9 @@ wlan_ret_packet_aggr_ctrl(IN pmlan_private pmpriv, * @param pdata_buf A void pointer to information buffer * @return N/A */ -mlan_status -wlan_cmd_fw_dump_event(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_fw_dump_event(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, IN t_void *pdata_buf) { ENTER(); @@ -7188,11 +6957,10 @@ wlan_cmd_fw_dump_event(IN pmlan_private pmpriv, * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE * */ -mlan_status -wlan_cmd_802_11_link_statistic(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_cmd_802_11_link_statistic(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, + IN mlan_ioctl_req *pioctl_buf) { mlan_ds_get_info *info = (mlan_ds_get_info *)(pioctl_buf->pbuf); HostCmd_DS_802_11_LINK_STATISTIC *ll_stat = @@ -7202,23 +6970,21 @@ wlan_cmd_802_11_link_statistic(IN pmlan_private pmpriv, ENTER(); cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_LINK_STATS); - cmd->size = - wlan_cpu_to_le16(S_DS_GEN + - sizeof(HostCmd_DS_802_11_LINK_STATISTIC)); + cmd->size = wlan_cpu_to_le16(S_DS_GEN + + sizeof(HostCmd_DS_802_11_LINK_STATISTIC)); ll_stat->action = wlan_cpu_to_le16(cmd_action); switch (cmd_action) { case HostCmd_ACT_GEN_SET: ll_params = - (wifi_link_layer_params *) info->param.link_statistic; + (wifi_link_layer_params *)info->param.link_statistic; ll_stat->mpdu_size_threshold = wlan_cpu_to_le32(ll_params->mpdu_size_threshold); - ll_stat->aggressive_statistics_gathering = - wlan_cpu_to_le32(ll_params-> - aggressive_statistics_gathering); + ll_stat->aggressive_statistics_gathering = wlan_cpu_to_le32( + ll_params->aggressive_statistics_gathering); break; case HostCmd_ACT_GEN_GET: - /** ll_stat->stat_type = wlan_cpu_to_le16(stat_type); */ + /** ll_stat->stat_type = wlan_cpu_to_le16(stat_type); */ break; default: break; @@ -7231,15 +6997,17 @@ wlan_cmd_802_11_link_statistic(IN pmlan_private pmpriv, /** * @brief This function fill link layer statistic from firmware * - * @param priv A pointer to mlan_private structure + * @param priv A pointer to + * mlan_private structure * @param link_statistic_ioctl_buf, A pointer to fill ioctl buffer - * @param resp A pointer to HostCmd_DS_COMMAND + * @param resp A pointer to + * HostCmd_DS_COMMAND * * @return MLAN_STATUS_SUCCESS */ -static void -wlan_fill_link_statistic(mlan_private *priv, char *link_statistic_ioctl_buf, - HostCmd_DS_COMMAND *resp) +static void wlan_fill_link_statistic(mlan_private *priv, + char *link_statistic_ioctl_buf, + HostCmd_DS_COMMAND *resp) { char *link_statistic = link_statistic_ioctl_buf; wifi_radio_stat *radio_stat = MNULL; @@ -7251,31 +7019,27 @@ wlan_fill_link_statistic(mlan_private *priv, char *link_statistic_ioctl_buf, t_u16 left_len = 0, tlv_type = 0, tlv_len = 0; MrvlIEtypesHeader_t *tlv = MNULL; HostCmd_DS_802_11_LINK_STATISTIC *plink_stat = - (HostCmd_DS_802_11_LINK_STATISTIC *) & resp->params. - get_link_statistic; + (HostCmd_DS_802_11_LINK_STATISTIC *)&resp->params + .get_link_statistic; /* TLV parse */ - left_len = - resp->size - sizeof(HostCmd_DS_802_11_LINK_STATISTIC) - - S_DS_GEN; - tlv = (MrvlIEtypesHeader_t *)((t_u8 *)plink_stat + - sizeof(HostCmd_DS_802_11_LINK_STATISTIC)); + left_len = resp->size - sizeof(HostCmd_DS_802_11_LINK_STATISTIC) - + S_DS_GEN; + tlv = (MrvlIEtypesHeader_t *)(plink_stat->value); DBG_HEXDUMP(MCMD_D, "tlv:", (void *)tlv, 1024); while (left_len > 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_LL_STAT_IFACE: - fw_ifaceStat = - (mlan_wifi_iface_stat *) ((t_u8 *)tlv + - sizeof - (MrvlIEtypesHeader_t)); + fw_ifaceStat = (mlan_wifi_iface_stat + *)((t_u8 *)tlv + + sizeof(MrvlIEtypesHeader_t)); break; case TLV_TYPE_LL_STAT_RADIO: - fw_radioStat = - (mlan_wifi_radio_stat *) ((t_u8 *)tlv + - sizeof - (MrvlIEtypesHeader_t)); + fw_radioStat = (mlan_wifi_radio_stat + *)((t_u8 *)tlv + + sizeof(MrvlIEtypesHeader_t)); num_radio = MAX_RADIO; break; default: @@ -7294,9 +7058,9 @@ wlan_fill_link_statistic(mlan_private *priv, char *link_statistic_ioctl_buf, *((t_u32 *)link_statistic) = num_radio; link_statistic += sizeof(num_radio); - /* Fill radio stats array */ + /* Fill radio stats array*/ for (i = 0; i < num_radio; i++) { - radio_stat = (wifi_radio_stat *) link_statistic; + radio_stat = (wifi_radio_stat *)link_statistic; link_statistic += sizeof(wifi_radio_stat); radio_stat->radio = wlan_le32_to_cpu(fw_radioStat[i].radio); @@ -7332,34 +7096,34 @@ wlan_fill_link_statistic(mlan_private *priv, char *link_statistic_ioctl_buf, break; } radio_stat->channels[chan_idx].channel.width = - wlan_le32_to_cpu(fw_radioStat[i]. - channels[chan_idx].channel. - width); + wlan_le32_to_cpu(fw_radioStat[i] + .channels[chan_idx] + .channel.width); radio_stat->channels[chan_idx].channel.center_freq = - wlan_le32_to_cpu(fw_radioStat[i]. - channels[chan_idx].channel. - center_freq); + wlan_le32_to_cpu(fw_radioStat[i] + .channels[chan_idx] + .channel.center_freq); radio_stat->channels[chan_idx].channel.center_freq0 = - wlan_le32_to_cpu(fw_radioStat[i]. - channels[chan_idx].channel. - center_freq0); + wlan_le32_to_cpu(fw_radioStat[i] + .channels[chan_idx] + .channel.center_freq0); radio_stat->channels[chan_idx].channel.center_freq1 = - wlan_le32_to_cpu(fw_radioStat[i]. - channels[chan_idx].channel. - center_freq1); + wlan_le32_to_cpu(fw_radioStat[i] + .channels[chan_idx] + .channel.center_freq1); - radio_stat->channels[chan_idx].on_time = - wlan_le32_to_cpu(fw_radioStat[i]. - channels[chan_idx].on_time); + radio_stat->channels[chan_idx] + .on_time = wlan_le32_to_cpu( + fw_radioStat[i].channels[chan_idx].on_time); radio_stat->channels[chan_idx].cca_busy_time = - wlan_le32_to_cpu(fw_radioStat[i]. - channels[chan_idx]. - cca_busy_time); + wlan_le32_to_cpu(fw_radioStat[i] + .channels[chan_idx] + .cca_busy_time); } } - /* Fill iface stats */ - iface_stat = (wifi_iface_stat *) link_statistic; + /* Fill iface stats*/ + iface_stat = (wifi_iface_stat *)link_statistic; /* get wifi_interface_link_layer_info in driver, not in firmware */ if (priv->bss_role == MLAN_BSS_ROLE_STA) { @@ -7432,21 +7196,17 @@ wlan_fill_link_statistic(mlan_private *priv, char *link_statistic_ioctl_buf, wlan_le32_to_cpu(fw_ifaceStat->ac[i].retries_short); iface_stat->ac[i].retries_long = wlan_le32_to_cpu(fw_ifaceStat->ac[i].retries_long); - iface_stat->ac[i].contention_time_min = - wlan_le32_to_cpu(fw_ifaceStat->ac[i]. - contention_time_min); - iface_stat->ac[i].contention_time_max = - wlan_le32_to_cpu(fw_ifaceStat->ac[i]. - contention_time_max); - iface_stat->ac[i].contention_time_avg = - wlan_le32_to_cpu(fw_ifaceStat->ac[i]. - contention_time_avg); - iface_stat->ac[i].contention_num_samples = - wlan_le32_to_cpu(fw_ifaceStat->ac[i]. - contention_num_samples); + iface_stat->ac[i].contention_time_min = wlan_le32_to_cpu( + fw_ifaceStat->ac[i].contention_time_min); + iface_stat->ac[i].contention_time_max = wlan_le32_to_cpu( + fw_ifaceStat->ac[i].contention_time_max); + iface_stat->ac[i].contention_time_avg = wlan_le32_to_cpu( + fw_ifaceStat->ac[i].contention_time_avg); + iface_stat->ac[i].contention_num_samples = wlan_le32_to_cpu( + fw_ifaceStat->ac[i].contention_num_samples); } - /* LL_STAT V3: STA-solution: support maxium 1 peers for AP */ + /* LL_STAT V3: STA-solution: support maxium 1 peers for AP*/ iface_stat->num_peers = wlan_le32_to_cpu(fw_ifaceStat->num_peers); for (peerIdx = 0; peerIdx < iface_stat->num_peers; peerIdx++) { iface_stat->peer_info[peerIdx].type = @@ -7455,12 +7215,10 @@ wlan_fill_link_statistic(mlan_private *priv, char *link_statistic_ioctl_buf, iface_stat->peer_info[peerIdx].peer_mac_address, fw_ifaceStat->peer_info[peerIdx].peer_mac_address, MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); - iface_stat->peer_info[peerIdx].capabilities = - wlan_le32_to_cpu(fw_ifaceStat->peer_info[peerIdx]. - capabilities); - iface_stat->peer_info[peerIdx].num_rate = - wlan_le32_to_cpu(fw_ifaceStat->peer_info[peerIdx]. - num_rate); + iface_stat->peer_info[peerIdx].capabilities = wlan_le32_to_cpu( + fw_ifaceStat->peer_info[peerIdx].capabilities); + iface_stat->peer_info[peerIdx].num_rate = wlan_le32_to_cpu( + fw_ifaceStat->peer_info[peerIdx].num_rate); PRINTM(MINFO, "bitrate tx_mpdu rx_mpdu mpdu_lost retries retries_short retries_long\n"); @@ -7468,61 +7226,73 @@ wlan_fill_link_statistic(mlan_private *priv, char *link_statistic_ioctl_buf, rate_idx < iface_stat->peer_info[peerIdx].num_rate; rate_idx++) { wlan_fill_hal_wifi_rate(priv, - &fw_ifaceStat-> - peer_info[peerIdx]. - rate_stats[rate_idx].rate, - &iface_stat->peer_info[peerIdx]. - rate_stats[rate_idx].rate); + &fw_ifaceStat + ->peer_info[peerIdx] + .rate_stats[rate_idx] + .rate, + &iface_stat->peer_info[peerIdx] + .rate_stats[rate_idx] + .rate); - iface_stat->peer_info[peerIdx].rate_stats[rate_idx]. - tx_mpdu = - wlan_le32_to_cpu(fw_ifaceStat-> - peer_info[peerIdx]. - rate_stats[rate_idx].tx_mpdu); - iface_stat->peer_info[peerIdx].rate_stats[rate_idx]. - rx_mpdu = - wlan_le32_to_cpu(fw_ifaceStat-> - peer_info[peerIdx]. - rate_stats[rate_idx].rx_mpdu); - iface_stat->peer_info[peerIdx].rate_stats[rate_idx]. - mpdu_lost = - wlan_le32_to_cpu(fw_ifaceStat-> - peer_info[peerIdx]. - rate_stats[rate_idx]. - mpdu_lost); - iface_stat->peer_info[peerIdx].rate_stats[rate_idx]. - retries = - wlan_le32_to_cpu(fw_ifaceStat-> - peer_info[peerIdx]. - rate_stats[rate_idx].retries); - iface_stat->peer_info[peerIdx].rate_stats[rate_idx]. - retries_short = - wlan_le32_to_cpu(fw_ifaceStat-> - peer_info[peerIdx]. - rate_stats[rate_idx]. - retries_short); - iface_stat->peer_info[peerIdx].rate_stats[rate_idx]. - retries_long = - wlan_le32_to_cpu(fw_ifaceStat-> - peer_info[peerIdx]. - rate_stats[rate_idx]. - retries_long); + iface_stat->peer_info[peerIdx] + .rate_stats[rate_idx] + .tx_mpdu = wlan_le32_to_cpu( + fw_ifaceStat->peer_info[peerIdx] + .rate_stats[rate_idx] + .tx_mpdu); + iface_stat->peer_info[peerIdx] + .rate_stats[rate_idx] + .rx_mpdu = wlan_le32_to_cpu( + fw_ifaceStat->peer_info[peerIdx] + .rate_stats[rate_idx] + .rx_mpdu); + iface_stat->peer_info[peerIdx] + .rate_stats[rate_idx] + .mpdu_lost = wlan_le32_to_cpu( + fw_ifaceStat->peer_info[peerIdx] + .rate_stats[rate_idx] + .mpdu_lost); + iface_stat->peer_info[peerIdx] + .rate_stats[rate_idx] + .retries = wlan_le32_to_cpu( + fw_ifaceStat->peer_info[peerIdx] + .rate_stats[rate_idx] + .retries); + iface_stat->peer_info[peerIdx] + .rate_stats[rate_idx] + .retries_short = wlan_le32_to_cpu( + fw_ifaceStat->peer_info[peerIdx] + .rate_stats[rate_idx] + .retries_short); + iface_stat->peer_info[peerIdx] + .rate_stats[rate_idx] + .retries_long = wlan_le32_to_cpu( + fw_ifaceStat->peer_info[peerIdx] + .rate_stats[rate_idx] + .retries_long); PRINTM(MCMND, "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", - iface_stat->peer_info[peerIdx]. - rate_stats[rate_idx].rate.bitrate, - iface_stat->peer_info[peerIdx]. - rate_stats[rate_idx].tx_mpdu, - iface_stat->peer_info[peerIdx]. - rate_stats[rate_idx].rx_mpdu, - iface_stat->peer_info[peerIdx]. - rate_stats[rate_idx].mpdu_lost, - iface_stat->peer_info[peerIdx]. - rate_stats[rate_idx].retries, - iface_stat->peer_info[peerIdx]. - rate_stats[rate_idx].retries_short, - iface_stat->peer_info[peerIdx]. - rate_stats[rate_idx].retries_long); + iface_stat->peer_info[peerIdx] + .rate_stats[rate_idx] + .rate.bitrate, + iface_stat->peer_info[peerIdx] + .rate_stats[rate_idx] + .tx_mpdu, + iface_stat->peer_info[peerIdx] + .rate_stats[rate_idx] + .rx_mpdu, + iface_stat->peer_info[peerIdx] + .rate_stats[rate_idx] + .mpdu_lost, + iface_stat->peer_info[peerIdx] + .rate_stats[rate_idx] + .retries, + iface_stat->peer_info[peerIdx] + .rate_stats[rate_idx] + .retries_short, + iface_stat->peer_info[peerIdx] + .rate_stats[rate_idx] + .retries_long); } } } @@ -7536,10 +7306,9 @@ wlan_fill_link_statistic(mlan_private *priv, char *link_statistic_ioctl_buf, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_get_link_statistic(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_get_link_statistic(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { mlan_ds_get_info *info; t_u8 *link_statistic = MNULL; @@ -7580,10 +7349,9 @@ wlan_ret_get_link_statistic(IN pmlan_private pmpriv, * @param pdata_buf A void pointer to information buffer * @return MLAN_STATUS_SUCCESS/ MLAN_STATUS_FAILURE */ -mlan_status -wlan_cmd_boot_sleep(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_boot_sleep(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, IN t_u16 cmd_action, + IN t_void *pdata_buf) { HostCmd_DS_BOOT_SLEEP *boot_sleep = MNULL; t_u16 enable = *(t_u16 *)pdata_buf; @@ -7610,9 +7378,9 @@ wlan_cmd_boot_sleep(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_boot_sleep(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_boot_sleep(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCmd_DS_BOOT_SLEEP *boot_sleep = &resp->params.boot_sleep; mlan_ds_misc_cfg *cfg = (mlan_ds_misc_cfg *)pioctl_buf->pbuf; @@ -7638,13 +7406,11 @@ wlan_ret_boot_sleep(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_crypto(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_u16 *pdata_buf) +mlan_status wlan_cmd_crypto(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, IN t_u16 *pdata_buf) { HostCmd_DS_CRYPTO *cry_cmd = &cmd->params.crypto_cmd; - mlan_ds_sup_cfg *cfg = (mlan_ds_sup_cfg *) pdata_buf; + mlan_ds_sup_cfg *cfg = (mlan_ds_sup_cfg *)pdata_buf; #if defined(DRV_EMBEDDED_AUTHENTICATOR) || defined(DRV_EMBEDDED_SUPPLICANT) subcmd_prf_hmac_sha1_t *prf_hmac_sha1 = MNULL; subcmd_hmac_sha1_t *hmac_sha1 = MNULL; @@ -7668,22 +7434,21 @@ wlan_cmd_crypto(IN pmlan_private pmpriv, switch (cfg->sub_command) { #if defined(DRV_EMBEDDED_AUTHENTICATOR) || defined(DRV_EMBEDDED_SUPPLICANT) case HostCmd_CMD_CRYPTO_SUBCMD_PRF_HMAC_SHA1: - tlv_bitmap = - BIT_TLV_TYPE_CRYPTO_KEY | BIT_TLV_TYPE_CRYPTO_KEY_PREFIX - | BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; + tlv_bitmap = BIT_TLV_TYPE_CRYPTO_KEY | + BIT_TLV_TYPE_CRYPTO_KEY_PREFIX | + BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; /* set subcmd start */ - prf_hmac_sha1 = (subcmd_prf_hmac_sha1_t *) cry_cmd->subCmd; + prf_hmac_sha1 = (subcmd_prf_hmac_sha1_t *)cry_cmd->subCmd; prf_hmac_sha1->output_len = cfg->output_len; /* set tlv start */ ptlv = prf_hmac_sha1->tlv; cmd->size += sizeof(subcmd_prf_hmac_sha1_t); break; case HostCmd_CMD_CRYPTO_SUBCMD_HMAC_SHA1: - tlv_bitmap = - BIT_TLV_TYPE_CRYPTO_KEY | - BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; + tlv_bitmap = BIT_TLV_TYPE_CRYPTO_KEY | + BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; /* set subcmd start */ - hmac_sha1 = (subcmd_hmac_sha1_t *) cry_cmd->subCmd; + hmac_sha1 = (subcmd_hmac_sha1_t *)cry_cmd->subCmd; hmac_sha1->output_len = cfg->output_len; hmac_sha1->data_blks_nr = cfg->data_blks_nr; /* set tlv start */ @@ -7691,11 +7456,10 @@ wlan_cmd_crypto(IN pmlan_private pmpriv, cmd->size += sizeof(subcmd_hmac_sha1_t); break; case HostCmd_CMD_CRYPTO_SUBCMD_HMAC_SHA256: - tlv_bitmap = - BIT_TLV_TYPE_CRYPTO_KEY | - BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; + tlv_bitmap = BIT_TLV_TYPE_CRYPTO_KEY | + BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; /* set subcmd start */ - hmac_sha256 = (subcmd_hmac_sha256_t *) cry_cmd->subCmd; + hmac_sha256 = (subcmd_hmac_sha256_t *)cry_cmd->subCmd; hmac_sha256->output_len = cfg->output_len; hmac_sha256->data_blks_nr = cfg->data_blks_nr; /* set tlv start */ @@ -7705,7 +7469,7 @@ wlan_cmd_crypto(IN pmlan_private pmpriv, case HostCmd_CMD_CRYPTO_SUBCMD_SHA256: tlv_bitmap = BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; /* set subcmd start */ - sha256 = (subcmd_sha256_t *) cry_cmd->subCmd; + sha256 = (subcmd_sha256_t *)cry_cmd->subCmd; sha256->output_len = cfg->output_len; sha256->data_blks_nr = cfg->data_blks_nr; /* set tlv start */ @@ -7713,11 +7477,10 @@ wlan_cmd_crypto(IN pmlan_private pmpriv, cmd->size += sizeof(subcmd_sha256_t); break; case HostCmd_CMD_CRYPTO_SUBCMD_RIJNDAEL: - tlv_bitmap = - BIT_TLV_TYPE_CRYPTO_KEY | - BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; + tlv_bitmap = BIT_TLV_TYPE_CRYPTO_KEY | + BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; /* set subcmd start */ - rijndael = (subcmd_rijndael_t *) cry_cmd->subCmd; + rijndael = (subcmd_rijndael_t *)cry_cmd->subCmd; rijndael->sub_action_code = cfg->sub_action_code; rijndael->output_len = cfg->output_len; /* set tlv start */ @@ -7725,11 +7488,11 @@ wlan_cmd_crypto(IN pmlan_private pmpriv, cmd->size += sizeof(subcmd_rijndael_t); break; case HostCmd_CMD_CRYPTO_SUBCMD_RC4: - tlv_bitmap = - BIT_TLV_TYPE_CRYPTO_KEY | BIT_TLV_TYPE_CRYPTO_KEY_IV | - BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; + tlv_bitmap = BIT_TLV_TYPE_CRYPTO_KEY | + BIT_TLV_TYPE_CRYPTO_KEY_IV | + BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; /* set subcmd start */ - rc4 = (subcmd_rc4_t *) cry_cmd->subCmd; + rc4 = (subcmd_rc4_t *)cry_cmd->subCmd; rc4->skip_bytes = cfg->skip_bytes; rc4->output_len = cfg->output_len; /* set tlv start */ @@ -7737,22 +7500,20 @@ wlan_cmd_crypto(IN pmlan_private pmpriv, cmd->size += sizeof(subcmd_rc4_t); break; case HostCmd_CMD_CRYPTO_SUBCMD_MD5: - tlv_bitmap = - BIT_TLV_TYPE_CRYPTO_KEY | - BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; + tlv_bitmap = BIT_TLV_TYPE_CRYPTO_KEY | + BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; /* set subcmd start */ - md5 = (subcmd_md5_t *) cry_cmd->subCmd; + md5 = (subcmd_md5_t *)cry_cmd->subCmd; md5->output_len = cfg->output_len; /* set tlv start */ ptlv = md5->tlv; cmd->size += sizeof(subcmd_md5_t); break; case HostCmd_CMD_CRYPTO_SUBCMD_MRVL_F: - tlv_bitmap = - BIT_TLV_TYPE_CRYPTO_KEY | - BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; + tlv_bitmap = BIT_TLV_TYPE_CRYPTO_KEY | + BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; /* set subcmd start */ - mrvl_f = (subcmd_mrvl_f_t *) cry_cmd->subCmd; + mrvl_f = (subcmd_mrvl_f_t *)cry_cmd->subCmd; mrvl_f->iterations = cfg->iteration; mrvl_f->count = cfg->count; mrvl_f->output_len = cfg->output_len; @@ -7761,11 +7522,11 @@ wlan_cmd_crypto(IN pmlan_private pmpriv, cmd->size += sizeof(subcmd_mrvl_f_t); break; case HostCmd_CMD_CRYPTO_SUBCMD_SHA256_KDF: - tlv_bitmap = - BIT_TLV_TYPE_CRYPTO_KEY | BIT_TLV_TYPE_CRYPTO_KEY_PREFIX - | BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; + tlv_bitmap = BIT_TLV_TYPE_CRYPTO_KEY | + BIT_TLV_TYPE_CRYPTO_KEY_PREFIX | + BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK; /* set subcmd start */ - sha256_kdf = (subcmd_sha256_kdf_t *) cry_cmd->subCmd; + sha256_kdf = (subcmd_sha256_kdf_t *)cry_cmd->subCmd; sha256_kdf->output_len = cfg->output_len; /* set tlv start */ ptlv = sha256_kdf->tlv; @@ -7846,15 +7607,15 @@ wlan_cmd_crypto(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_crypto(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_crypto(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCmd_DS_CRYPTO *crypto_cmd = &resp->params.crypto_cmd; #if defined(DRV_EMBEDDED_AUTHENTICATOR) || defined(DRV_EMBEDDED_SUPPLICANT) mlan_adapter *pmadapter = pmpriv->adapter; mlan_callbacks *pcb = (pmlan_callbacks)&pmadapter->callbacks; - mlan_ds_sup_cfg *cfg = (mlan_ds_sup_cfg *) pioctl_buf->pbuf; + mlan_ds_sup_cfg *cfg = (mlan_ds_sup_cfg *)pioctl_buf->pbuf; #endif ENTER(); @@ -7867,8 +7628,8 @@ wlan_ret_crypto(IN pmlan_private pmpriv, /* copy the result */ memcpy_ext(pmpriv->adapter, cfg->output, (t_u8 *)crypto_cmd + sizeof(HostCmd_DS_CRYPTO) + - sizeof(cfg->output_len), cfg->output_len, - cfg->output_len); + sizeof(cfg->output_len), + cfg->output_len, cfg->output_len); } /* Prevent the ioctl from completing when the cmd is freed */ @@ -7894,9 +7655,9 @@ done: * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_802_11_mac_address(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, IN t_u16 cmd_action) +mlan_status wlan_cmd_802_11_mac_address(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action) { ENTER(); cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_MAC_ADDRESS); @@ -7925,10 +7686,9 @@ wlan_cmd_802_11_mac_address(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_802_11_mac_address(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_802_11_mac_address(IN pmlan_private pmpriv, + 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; @@ -7960,22 +7720,19 @@ wlan_ret_802_11_mac_address(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_rxabortcfg(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_rxabortcfg(pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, IN t_u16 cmd_action, + IN t_void *pdata_buf) { HostCmd_DS_CMD_RX_ABORT_CFG *cfg_cmd = - (HostCmd_DS_CMD_RX_ABORT_CFG *) & cmd->params.rx_abort_cfg; - mlan_ds_misc_rx_abort_cfg *cfg = - (mlan_ds_misc_rx_abort_cfg *) pdata_buf; + (HostCmd_DS_CMD_RX_ABORT_CFG *)&cmd->params.rx_abort_cfg; + mlan_ds_misc_rx_abort_cfg *cfg = (mlan_ds_misc_rx_abort_cfg *)pdata_buf; ENTER(); cmd->command = wlan_cpu_to_le16(HostCmd_CMD_RX_ABORT_CFG); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_CMD_RX_ABORT_CFG) + - S_DS_GEN); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_CMD_RX_ABORT_CFG) + + S_DS_GEN); cfg_cmd->action = wlan_cpu_to_le16(cmd_action); if (cmd_action == HostCmd_ACT_GEN_SET) { @@ -7996,12 +7753,12 @@ wlan_cmd_rxabortcfg(pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_rxabortcfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_rxabortcfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCmd_DS_CMD_RX_ABORT_CFG *cfg_cmd = - (HostCmd_DS_CMD_RX_ABORT_CFG *) & resp->params.rx_abort_cfg; + (HostCmd_DS_CMD_RX_ABORT_CFG *)&resp->params.rx_abort_cfg; mlan_ds_misc_cfg *misc_cfg = MNULL; ENTER(); @@ -8025,16 +7782,14 @@ wlan_ret_rxabortcfg(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_rxabortcfg_ext(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_rxabortcfg_ext(pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, IN t_void *pdata_buf) { HostCmd_DS_CMD_RX_ABORT_CFG_EXT *cfg_cmd = - (HostCmd_DS_CMD_RX_ABORT_CFG_EXT *) - & cmd->params.rx_abort_cfg_ext; + (HostCmd_DS_CMD_RX_ABORT_CFG_EXT *)&cmd->params.rx_abort_cfg_ext; mlan_ds_misc_rx_abort_cfg_ext *cfg = - (mlan_ds_misc_rx_abort_cfg_ext *) pdata_buf; + (mlan_ds_misc_rx_abort_cfg_ext *)pdata_buf; ENTER(); @@ -8062,14 +7817,13 @@ wlan_cmd_rxabortcfg_ext(pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_rxabortcfg_ext(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_rxabortcfg_ext(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCmd_DS_CMD_RX_ABORT_CFG_EXT *cfg_cmd = - (HostCmd_DS_CMD_RX_ABORT_CFG_EXT *) - & resp->params.rx_abort_cfg_ext; + (HostCmd_DS_CMD_RX_ABORT_CFG_EXT *)&resp->params + .rx_abort_cfg_ext; mlan_ds_misc_cfg *misc_cfg = MNULL; ENTER(); @@ -8095,16 +7849,16 @@ wlan_ret_rxabortcfg_ext(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_tx_ampdu_prot_mode(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_tx_ampdu_prot_mode(pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, + IN t_void *pdata_buf) { HostCmd_DS_CMD_TX_AMPDU_PROT_MODE *cfg_cmd = - (HostCmd_DS_CMD_TX_AMPDU_PROT_MODE *) - & cmd->params.tx_ampdu_prot_mode; + (HostCmd_DS_CMD_TX_AMPDU_PROT_MODE *)&cmd->params + .tx_ampdu_prot_mode; mlan_ds_misc_tx_ampdu_prot_mode *cfg = - (mlan_ds_misc_tx_ampdu_prot_mode *) pdata_buf; + (mlan_ds_misc_tx_ampdu_prot_mode *)pdata_buf; ENTER(); @@ -8130,14 +7884,13 @@ wlan_cmd_tx_ampdu_prot_mode(pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_tx_ampdu_prot_mode(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_tx_ampdu_prot_mode(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCmd_DS_CMD_TX_AMPDU_PROT_MODE *cfg_cmd = - (HostCmd_DS_CMD_TX_AMPDU_PROT_MODE *) - & resp->params.tx_ampdu_prot_mode; + (HostCmd_DS_CMD_TX_AMPDU_PROT_MODE *)&resp->params + .tx_ampdu_prot_mode; mlan_ds_misc_cfg *misc_cfg = MNULL; ENTER(); @@ -8160,15 +7913,14 @@ wlan_ret_tx_ampdu_prot_mode(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_rate_adapt_cfg(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_rate_adapt_cfg(pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, IN t_void *pdata_buf) { HostCmd_DS_CMD_RATE_ADAPT_CFG *cfg_cmd = - (HostCmd_DS_CMD_RATE_ADAPT_CFG *) & cmd->params.rate_adapt_cfg; + (HostCmd_DS_CMD_RATE_ADAPT_CFG *)&cmd->params.rate_adapt_cfg; mlan_ds_misc_rate_adapt_cfg *cfg = - (mlan_ds_misc_rate_adapt_cfg *) pdata_buf; + (mlan_ds_misc_rate_adapt_cfg *)pdata_buf; ENTER(); @@ -8197,13 +7949,12 @@ wlan_cmd_rate_adapt_cfg(pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_rate_adapt_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_rate_adapt_cfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCmd_DS_CMD_RATE_ADAPT_CFG *cfg_cmd = - (HostCmd_DS_CMD_RATE_ADAPT_CFG *) & resp->params.rate_adapt_cfg; + (HostCmd_DS_CMD_RATE_ADAPT_CFG *)&resp->params.rate_adapt_cfg; mlan_ds_misc_cfg *misc_cfg = MNULL; ENTER(); @@ -8232,16 +7983,14 @@ wlan_ret_rate_adapt_cfg(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_cck_desense_cfg(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_cck_desense_cfg(pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, IN t_void *pdata_buf) { HostCmd_DS_CMD_CCK_DESENSE_CFG *cfg_cmd = - (HostCmd_DS_CMD_CCK_DESENSE_CFG *) & cmd->params. - cck_desense_cfg; + (HostCmd_DS_CMD_CCK_DESENSE_CFG *)&cmd->params.cck_desense_cfg; mlan_ds_misc_cck_desense_cfg *cfg = - (mlan_ds_misc_cck_desense_cfg *) pdata_buf; + (mlan_ds_misc_cck_desense_cfg *)pdata_buf; ENTER(); @@ -8271,14 +8020,12 @@ wlan_cmd_cck_desense_cfg(pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_cck_desense_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_cck_desense_cfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCmd_DS_CMD_CCK_DESENSE_CFG *cfg_cmd = - (HostCmd_DS_CMD_CCK_DESENSE_CFG *) - & resp->params.cck_desense_cfg; + (HostCmd_DS_CMD_CCK_DESENSE_CFG *)&resp->params.cck_desense_cfg; mlan_ds_misc_cfg *misc_cfg = MNULL; ENTER(); @@ -8308,10 +8055,9 @@ wlan_ret_cck_desense_cfg(IN pmlan_private pmpriv, * @param pdata_buf A void pointer to information buffer * @return N/A */ -mlan_status -wlan_cmd_config_dyn_bw(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_config_dyn_bw(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, IN t_void *pdata_buf) { HostCmd_DS_DYN_BW *dyn_bw_cmd = &cmd->params.dyn_bw; @@ -8336,9 +8082,9 @@ wlan_cmd_config_dyn_bw(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_dyn_bw(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_dyn_bw(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { mlan_ds_misc_cfg *cfg = MNULL; HostCmd_DS_DYN_BW *dyn_bw = &resp->params.dyn_bw; @@ -8364,27 +8110,25 @@ wlan_ret_dyn_bw(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_cmd_get_chan_trpc_config(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_get_chan_trpc_config(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, + IN t_void *pdata_buf) { HostCmd_DS_CHANNEL_TRPC_CONFIG *trpc_cfg = &cmd->params.ch_trpc_config; mlan_ds_misc_chan_trpc_cfg *cfg = - (mlan_ds_misc_chan_trpc_cfg *) pdata_buf; + (mlan_ds_misc_chan_trpc_cfg *)pdata_buf; ENTER(); cmd->command = wlan_cpu_to_le16(HostCmd_CHANNEL_TRPC_CONFIG); trpc_cfg->action = wlan_cpu_to_le16(cmd_action); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_CHANNEL_TRPC_CONFIG) + - S_DS_GEN); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_CHANNEL_TRPC_CONFIG) + + S_DS_GEN); trpc_cfg->sub_band = wlan_cpu_to_le16(cfg->sub_band); LEAVE(); return MLAN_STATUS_SUCCESS; } - /** * @brief This function prepares command of LOW_POWER_MODE_CFG * @@ -8394,10 +8138,10 @@ wlan_cmd_get_chan_trpc_config(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_cmd_set_get_low_power_mode_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_set_get_low_power_mode_cfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, + IN t_void *pdata_buf) { HostCmd_DS_LOW_POWER_MODE_CFG *lpm_cfg = &cmd->params.lpm_cfg; t_u16 lpm = *(t_u16 *)pdata_buf; @@ -8426,10 +8170,9 @@ wlan_cmd_set_get_low_power_mode_cfg(IN pmlan_private pmpriv, * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_set_get_low_power_mode_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_set_get_low_power_mode_cfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { mlan_ds_power_cfg *cfg = MNULL; HostCmd_DS_LOW_POWER_MODE_CFG *lpm_cfg = &resp->params.lpm_cfg; @@ -8446,7 +8189,6 @@ wlan_ret_set_get_low_power_mode_cfg(IN pmlan_private pmpriv, LEAVE(); return MLAN_STATUS_SUCCESS; } - /** * @brief This function handles the command response of * packet aggregation @@ -8457,10 +8199,9 @@ wlan_ret_set_get_low_power_mode_cfg(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_get_chan_trpc_config(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_get_chan_trpc_config(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { mlan_ds_misc_cfg *misc = MNULL; HostCmd_DS_CHANNEL_TRPC_CONFIG *trpc_cfg = &resp->params.ch_trpc_config; @@ -8470,7 +8211,7 @@ wlan_ret_get_chan_trpc_config(IN pmlan_private pmpriv, ENTER(); if (pioctl_buf) { misc = (mlan_ds_misc_cfg *)pioctl_buf->pbuf; - cfg = (mlan_ds_misc_chan_trpc_cfg *) & (misc->param.trpc_cfg); + cfg = (mlan_ds_misc_chan_trpc_cfg *)&(misc->param.trpc_cfg); cfg->sub_band = wlan_le16_to_cpu(trpc_cfg->sub_band); cfg->length = wlan_le16_to_cpu(resp->size); memcpy_ext(pmadapter, cfg->trpc_buf, (t_u8 *)resp, cfg->length, diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_decl.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_decl.h index 1ed0c9eb1f47..b3ae85b45217 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_decl.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_decl.h @@ -24,7 +24,7 @@ #define _MLAN_DECL_H_ /** MLAN release version */ -#define MLAN_RELEASE_VERSION "169" +#define MLAN_RELEASE_VERSION "175" /** Re-define generic data types for MLAN/MOAL */ /** Signed char (1-byte) */ @@ -68,7 +68,7 @@ typedef t_s32 t_sval; /** Structure packing begins */ #define MLAN_PACK_START /** Structure packeing end */ -#define MLAN_PACK_END __attribute__((packed)) +#define MLAN_PACK_END __attribute__((packed)) #else /* !__GNUC__ */ #ifdef PRAGMA_PACK /** Structure packing begins */ @@ -77,7 +77,7 @@ typedef t_s32 t_sval; #define MLAN_PACK_END #else /* !PRAGMA_PACK */ /** Structure packing begins */ -#define MLAN_PACK_START __packed +#define MLAN_PACK_START __packed /** Structure packing end */ #define MLAN_PACK_END #endif /* PRAGMA_PACK */ @@ -86,17 +86,17 @@ typedef t_s32 t_sval; #ifndef INLINE #ifdef __GNUC__ /** inline directive */ -#define INLINE inline +#define INLINE inline #else /** inline directive */ -#define INLINE __inline +#define INLINE __inline #endif #endif /** MLAN TRUE */ -#define MTRUE (1) +#define MTRUE (1) /** MLAN FALSE */ -#define MFALSE (0) +#define MFALSE (0) #ifndef MACSTR /** MAC address security format */ @@ -116,110 +116,109 @@ typedef t_s32 t_sval; #endif /** Macros for Data Alignment : size */ -#define ALIGN_SZ(p, a) \ - (((p) + ((a) - 1)) & ~((a) - 1)) +#define ALIGN_SZ(p, a) (((p) + ((a)-1)) & ~((a)-1)) /** Macros for Data Alignment : address */ -#define ALIGN_ADDR(p, a) \ +#define ALIGN_ADDR(p, a) \ ((((t_ptr)(p)) + (((t_ptr)(a)) - 1)) & ~(((t_ptr)(a)) - 1)) /** Return the byte offset of a field in the given structure */ -#define MLAN_FIELD_OFFSET(type, field) ((t_u32)(t_ptr)&(((type *)0)->field)) +#define MLAN_FIELD_OFFSET(type, field) ((t_u32)(t_ptr) & (((type *)0)->field)) /** Return aligned offset */ #define OFFSET_ALIGN_ADDR(p, a) (t_u32)(ALIGN_ADDR(p, a) - (t_ptr)p) #if defined(WIFI_DIRECT_SUPPORT) /** Maximum BSS numbers */ -#define MLAN_MAX_BSS_NUM (16) +#define MLAN_MAX_BSS_NUM (16) #else /** Maximum BSS numbers */ -#define MLAN_MAX_BSS_NUM (2) +#define MLAN_MAX_BSS_NUM (2) #endif /** NET IP alignment */ -#define MLAN_NET_IP_ALIGN 2 +#define MLAN_NET_IP_ALIGN 2 /** DMA alignment */ /* SDIO3.0 Inrevium Adapter require 32 bit DMA alignment */ -#define DMA_ALIGNMENT 32 +#define DMA_ALIGNMENT 32 /** max size of TxPD */ -#define MAX_TXPD_SIZE 32 +#define MAX_TXPD_SIZE 32 /** Minimum data header length */ -#define MLAN_MIN_DATA_HEADER_LEN (DMA_ALIGNMENT+MAX_TXPD_SIZE) +#define MLAN_MIN_DATA_HEADER_LEN (DMA_ALIGNMENT + MAX_TXPD_SIZE) /** rx data header length */ -#define MLAN_RX_HEADER_LEN MLAN_MIN_DATA_HEADER_LEN +#define MLAN_RX_HEADER_LEN MLAN_MIN_DATA_HEADER_LEN /** This is current limit on Maximum Tx AMPDU allowed */ -#define MLAN_MAX_TX_BASTREAM_SUPPORTED 16 -#define MLAN_MAX_TX_BASTREAM_DEFAULT 2 +#define MLAN_MAX_TX_BASTREAM_SUPPORTED 16 +#define MLAN_MAX_TX_BASTREAM_DEFAULT 2 /** This is current limit on Maximum Rx AMPDU allowed */ -#define MLAN_MAX_RX_BASTREAM_SUPPORTED 16 +#define MLAN_MAX_RX_BASTREAM_SUPPORTED 16 #ifdef STA_SUPPORT /** Default Win size attached during ADDBA request */ -#define MLAN_STA_AMPDU_DEF_TXWINSIZE 64 +#define MLAN_STA_AMPDU_DEF_TXWINSIZE 64 /** Default Win size attached during ADDBA response */ -#define MLAN_STA_AMPDU_DEF_RXWINSIZE 64 +#define MLAN_STA_AMPDU_DEF_RXWINSIZE 64 /** RX winsize for COEX */ -#define MLAN_STA_COEX_AMPDU_DEF_RXWINSIZE 16 +#define MLAN_STA_COEX_AMPDU_DEF_RXWINSIZE 16 #endif /* STA_SUPPORT */ #ifdef UAP_SUPPORT /** Default Win size attached during ADDBA request */ -#define MLAN_UAP_AMPDU_DEF_TXWINSIZE 64 +#define MLAN_UAP_AMPDU_DEF_TXWINSIZE 64 /** Default Win size attached during ADDBA response */ -#define MLAN_UAP_AMPDU_DEF_RXWINSIZE 64 +#define MLAN_UAP_AMPDU_DEF_RXWINSIZE 64 /** RX winsize for COEX */ -#define MLAN_UAP_COEX_AMPDU_DEF_RXWINSIZE 16 +#define MLAN_UAP_COEX_AMPDU_DEF_RXWINSIZE 16 #endif /* UAP_SUPPORT */ #ifdef WIFI_DIRECT_SUPPORT /** WFD use the same window size for tx/rx */ -#define MLAN_WFD_AMPDU_DEF_TXRXWINSIZE 64 +#define MLAN_WFD_AMPDU_DEF_TXRXWINSIZE 64 /** RX winsize for COEX */ -#define MLAN_WFD_COEX_AMPDU_DEF_RXWINSIZE 16 +#define MLAN_WFD_COEX_AMPDU_DEF_RXWINSIZE 16 #endif /** Block ack timeout value */ -#define MLAN_DEFAULT_BLOCK_ACK_TIMEOUT 0xffff +#define MLAN_DEFAULT_BLOCK_ACK_TIMEOUT 0xffff /** Maximum Tx Win size configured for ADDBA request [10 bits] */ -#define MLAN_AMPDU_MAX_TXWINSIZE 0x3ff +#define MLAN_AMPDU_MAX_TXWINSIZE 0x3ff /** Maximum Rx Win size configured for ADDBA request [10 bits] */ -#define MLAN_AMPDU_MAX_RXWINSIZE 0x3ff +#define MLAN_AMPDU_MAX_RXWINSIZE 0x3ff /** Rate index for HR/DSSS 0 */ #define MLAN_RATE_INDEX_HRDSSS0 0 /** Rate index for HR/DSSS 3 */ #define MLAN_RATE_INDEX_HRDSSS3 3 /** Rate index for OFDM 0 */ -#define MLAN_RATE_INDEX_OFDM0 4 +#define MLAN_RATE_INDEX_OFDM0 4 /** Rate index for OFDM 7 */ -#define MLAN_RATE_INDEX_OFDM7 11 +#define MLAN_RATE_INDEX_OFDM7 11 /** Rate index for MCS 0 */ -#define MLAN_RATE_INDEX_MCS0 0 +#define MLAN_RATE_INDEX_MCS0 0 /** Rate index for MCS 7 */ -#define MLAN_RATE_INDEX_MCS7 7 +#define MLAN_RATE_INDEX_MCS7 7 /** Rate index for MCS 9 */ -#define MLAN_RATE_INDEX_MCS9 9 +#define MLAN_RATE_INDEX_MCS9 9 /** Rate index for MCS11 */ -#define MLAN_RATE_INDEX_MCS11 11 +#define MLAN_RATE_INDEX_MCS11 11 /** Rate index for MCS15 */ -#define MLAN_RATE_INDEX_MCS15 15 +#define MLAN_RATE_INDEX_MCS15 15 /** Rate index for MCS 32 */ -#define MLAN_RATE_INDEX_MCS32 32 +#define MLAN_RATE_INDEX_MCS32 32 /** Rate index for MCS 127 */ -#define MLAN_RATE_INDEX_MCS127 127 -#define MLAN_RATE_NSS1 1 -#define MLAN_RATE_NSS2 2 +#define MLAN_RATE_INDEX_MCS127 127 +#define MLAN_RATE_NSS1 1 +#define MLAN_RATE_NSS2 2 /** Rate bitmap for OFDM 0 */ -#define MLAN_RATE_BITMAP_OFDM0 16 +#define MLAN_RATE_BITMAP_OFDM0 16 /** Rate bitmap for OFDM 7 */ -#define MLAN_RATE_BITMAP_OFDM7 23 +#define MLAN_RATE_BITMAP_OFDM7 23 /** Rate bitmap for MCS 0 */ -#define MLAN_RATE_BITMAP_MCS0 32 +#define MLAN_RATE_BITMAP_MCS0 32 /** Rate bitmap for MCS 127 */ #define MLAN_RATE_BITMAP_MCS127 159 #define MLAN_RATE_BITMAP_NSS1_MCS0 160 @@ -228,18 +227,18 @@ typedef t_s32 t_sval; #define MLAN_RATE_BITMAP_NSS2_MCS9 185 /** MU beamformer */ -#define DEFALUT_11AC_CAP_BEAMFORMING_RESET_MASK (MBIT(19)) +#define DEFALUT_11AC_CAP_BEAMFORMING_RESET_MASK (MBIT(19)) /** Size of rx data buffer 4096+256 */ -#define MLAN_RX_DATA_BUF_SIZE 4352 +#define MLAN_RX_DATA_BUF_SIZE 4352 /** Size of command buffer */ /** because cal_data_size 2.4 k */ -#define MRVDRV_SIZE_OF_CMD_BUFFER (3 * 1024) +#define MRVDRV_SIZE_OF_CMD_BUFFER (3 * 1024) /** Size of rx command buffer */ -#define MLAN_RX_CMD_BUF_SIZE MRVDRV_SIZE_OF_CMD_BUFFER +#define MLAN_RX_CMD_BUF_SIZE MRVDRV_SIZE_OF_CMD_BUFFER /** Upload size */ -#define WLAN_UPLD_SIZE MRVDRV_SIZE_OF_CMD_BUFFER +#define WLAN_UPLD_SIZE MRVDRV_SIZE_OF_CMD_BUFFER #if defined(PCIE) #define MLAN_SSU_MAX_PKT_SIZE (283 * 4) @@ -248,15 +247,15 @@ typedef t_s32 t_sval; * Size of DMA buffer to collect 10ms SSU data: * 2500 spectral packets, plus header */ -#define MLAN_SSU_BUF_SIZE_1MS MLAN_SSU_MAX_PKT_SIZE * 250 -#define MLAN_SSU_BUF_SIZE (MLAN_SSU_HEADER_SIZE + MLAN_SSU_BUF_SIZE_1MS * 10) +#define MLAN_SSU_BUF_SIZE_1MS (MLAN_SSU_MAX_PKT_SIZE * 250) +#define MLAN_SSU_BUF_SIZE (MLAN_SSU_HEADER_SIZE + MLAN_SSU_BUF_SIZE_1MS * 10) #define MLAN_SSU_BUF_SIZE_HOST (MLAN_SSU_BUF_SIZE) #endif /** driver initial the fw reset */ -#define FW_RELOAD_SDIO_INBAND_RESET 1 +#define FW_RELOAD_SDIO_INBAND_RESET 1 /** out band reset trigger reset, no interface re-emulation */ -#define FW_RELOAD_NO_EMULATION 2 +#define FW_RELOAD_NO_EMULATION 2 /** out band reset with interface re-emulation */ #define FW_RELOAD_WITH_EMULATION 3 #ifdef PCIE @@ -265,128 +264,130 @@ typedef t_s32 t_sval; #endif #ifdef USB -#define MLAN_USB_BLOCK_SIZE (512) -#define MLAN_USB_AGGR_MODE_NUM (0) -#define MLAN_USB_AGGR_MODE_LEN (1) -#define MLAN_USB_AGGR_MODE_LEN_V2 (2) -#define MLAN_USB_TX_AGGR_MAX_LEN (16000) -#define MLAN_USB_TX_AGGR_MAX_NUM 10 -#define MLAN_USB_TX_AGGR_V2_ALIGN 4 -#define MLAN_USB_TX_AGGR_HEADER 4 -#define MLAN_USB_MAX_PKT_SIZE (MLAN_USB_BLOCK_SIZE * 4) +#define MLAN_USB_BLOCK_SIZE (512) +#define MLAN_USB_AGGR_MODE_NUM (0) +#define MLAN_USB_AGGR_MODE_LEN (1) +#define MLAN_USB_AGGR_MODE_LEN_V2 (2) +#define MLAN_USB_TX_AGGR_MAX_LEN (16000) +#define MLAN_USB_TX_AGGR_MAX_NUM 10 +#define MLAN_USB_TX_AGGR_V2_ALIGN 4 +#define MLAN_USB_TX_AGGR_HEADER 4 +#define MLAN_USB_MAX_PKT_SIZE (MLAN_USB_BLOCK_SIZE * 4) -#define MLAN_USB_RX_ALIGN_SIZE MLAN_USB_BLOCK_SIZE -#define MLAN_USB_RX_MAX_AGGR_NUM (8) +#define MLAN_USB_RX_ALIGN_SIZE MLAN_USB_BLOCK_SIZE +#define MLAN_USB_RX_MAX_AGGR_NUM (8) #define MLAN_USB_RX_DEAGGR_TIMEOUT_USEC (200) -#define MLAN_USB_TX_AGGR_ALIGN (MLAN_USB_BLOCK_SIZE * 4) -#define MLAN_USB_TX_MAX_AGGR_NUM (8) -#define MLAN_USB_TX_MAX_AGGR_SIZE (MLAN_USB_BLOCK_SIZE * 4 * MLAN_USB_TX_MAX_AGGR_NUM) -#define MLAN_USB_TX_MIN_AGGR_TIMEOUT (1) -#define MLAN_USB_TX_MAX_AGGR_TIMEOUT (4) -#define MLAN_USB_TX_AGGR_TIMEOUT_MSEC MLAN_USB_TX_MIN_AGGR_TIMEOUT -#define MLAN_USB_TX_AGGR_TIMEOUT_DYN (0xFFFF) +#define MLAN_USB_TX_AGGR_ALIGN (MLAN_USB_BLOCK_SIZE * 4) +#define MLAN_USB_TX_MAX_AGGR_NUM (8) +#define MLAN_USB_TX_MAX_AGGR_SIZE \ + (MLAN_USB_BLOCK_SIZE * 4 * MLAN_USB_TX_MAX_AGGR_NUM) +#define MLAN_USB_TX_MIN_AGGR_TIMEOUT (1) +#define MLAN_USB_TX_MAX_AGGR_TIMEOUT (4) +#define MLAN_USB_TX_AGGR_TIMEOUT_MSEC MLAN_USB_TX_MIN_AGGR_TIMEOUT +#define MLAN_USB_TX_AGGR_TIMEOUT_DYN (0xFFFF) #endif /*USB*/ + /** MLAN MAC Address Length */ -#define MLAN_MAC_ADDR_LENGTH (6) +#define MLAN_MAC_ADDR_LENGTH (6) /** MLAN 802.11 MAC Address */ - typedef t_u8 mlan_802_11_mac_addr[MLAN_MAC_ADDR_LENGTH]; +typedef t_u8 mlan_802_11_mac_addr[MLAN_MAC_ADDR_LENGTH]; /** MLAN Maximum SSID Length */ -#define MLAN_MAX_SSID_LENGTH (32) +#define MLAN_MAX_SSID_LENGTH (32) /** RTS/FRAG related defines */ /** Minimum RTS value */ -#define MLAN_RTS_MIN_VALUE (0) +#define MLAN_RTS_MIN_VALUE (0) /** Maximum RTS value */ -#define MLAN_RTS_MAX_VALUE (2347) +#define MLAN_RTS_MAX_VALUE (2347) /** Minimum FRAG value */ -#define MLAN_FRAG_MIN_VALUE (256) +#define MLAN_FRAG_MIN_VALUE (256) /** Maximum FRAG value */ -#define MLAN_FRAG_MAX_VALUE (2346) +#define MLAN_FRAG_MAX_VALUE (2346) /** Minimum tx retry count */ -#define MLAN_TX_RETRY_MIN (0) +#define MLAN_TX_RETRY_MIN (0) /** Maximum tx retry count */ -#define MLAN_TX_RETRY_MAX (14) +#define MLAN_TX_RETRY_MAX (14) /** max Wmm AC queues */ -#define MAX_AC_QUEUES 4 +#define MAX_AC_QUEUES 4 #ifdef SDIO /** define SDIO block size for data Tx/Rx */ /* We support up to 480-byte block size due to FW buffer limitation. */ -#define MLAN_SDIO_BLOCK_SIZE 256 +#define MLAN_SDIO_BLOCK_SIZE 256 /** define SDIO block size for firmware download */ -#define MLAN_SDIO_BLOCK_SIZE_FW_DNLD MLAN_SDIO_BLOCK_SIZE +#define MLAN_SDIO_BLOCK_SIZE_FW_DNLD MLAN_SDIO_BLOCK_SIZE /** define allocated buffer size */ -#define ALLOC_BUF_SIZE MLAN_RX_DATA_BUF_SIZE +#define ALLOC_BUF_SIZE MLAN_RX_DATA_BUF_SIZE /** SDIO MP aggr pkt limit */ -#define SDIO_MP_AGGR_DEF_PKT_LIMIT (16) +#define SDIO_MP_AGGR_DEF_PKT_LIMIT (16) /** max SDIO MP aggr pkt limit */ -#define SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX (16) +#define SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX (16) /** SDIO IO Port mask */ -#define MLAN_SDIO_IO_PORT_MASK 0xfffff +#define MLAN_SDIO_IO_PORT_MASK 0xfffff /** SDIO Block/Byte mode mask */ -#define MLAN_SDIO_BYTE_MODE_MASK 0x80000000 +#define MLAN_SDIO_BYTE_MODE_MASK 0x80000000 #endif /* SDIO */ /** SD Interface */ -#define INTF_SD MBIT(0) -#define IS_SD(ct) (ct & (INTF_SD << 8)) +#define INTF_SD MBIT(0) +#define IS_SD(ct) (ct & (INTF_SD << 8)) /** PCIE Interface */ -#define INTF_PCIE MBIT(1) +#define INTF_PCIE MBIT(1) #define IS_PCIE(ct) (ct & (INTF_PCIE << 8)) /** USB Interface */ -#define INTF_USB MBIT(2) -#define IS_USB(ct) (ct & (INTF_USB << 8)) +#define INTF_USB MBIT(2) +#define IS_USB(ct) (ct & (INTF_USB << 8)) /** 8887 card type */ -#define CARD_TYPE_8887 0x01 +#define CARD_TYPE_8887 0x01 /** 8897 card type */ -#define CARD_TYPE_8897 0x02 +#define CARD_TYPE_8897 0x02 /** 8977 card type */ -#define CARD_TYPE_8977 0x03 +#define CARD_TYPE_8977 0x03 /** 8997 card type */ -#define CARD_TYPE_8997 0x04 +#define CARD_TYPE_8997 0x04 /** 8987 card type */ -#define CARD_TYPE_8987 0x05 +#define CARD_TYPE_8987 0x05 /** 9098 card type */ -#define CARD_TYPE_9098 0x06 +#define CARD_TYPE_9098 0x06 /** 9097 card type */ -#define CARD_TYPE_9097 0x07 +#define CARD_TYPE_9097 0x07 /** 8978 card type */ -#define CARD_TYPE_8978 0x08 +#define CARD_TYPE_8978 0x08 /** 9098 A0 reverion num */ -#define CHIP_9098_REV_A0 1 -#define CHIP_9098_REV_A1 2 +#define CHIP_9098_REV_A0 1 +#define CHIP_9098_REV_A1 2 /** 9097 CHIP REV */ -#define CHIP_9097_REV_B0 1 +#define CHIP_9097_REV_B0 1 #define INTF_MASK 0xff #define CARD_TYPE_MASK 0xff #ifdef SDIO /** SD8887 card type */ -#define CARD_TYPE_SD8887 (CARD_TYPE_8887 | (INTF_SD << 8)) +#define CARD_TYPE_SD8887 (CARD_TYPE_8887 | (INTF_SD << 8)) /** SD8897 card type */ -#define CARD_TYPE_SD8897 (CARD_TYPE_8897 | (INTF_SD << 8)) +#define CARD_TYPE_SD8897 (CARD_TYPE_8897 | (INTF_SD << 8)) /** SD8977 card type */ -#define CARD_TYPE_SD8977 (CARD_TYPE_8977 | (INTF_SD << 8)) +#define CARD_TYPE_SD8977 (CARD_TYPE_8977 | (INTF_SD << 8)) /** SD8978 card type */ -#define CARD_TYPE_SD8978 (CARD_TYPE_8978 | (INTF_SD << 8)) +#define CARD_TYPE_SD8978 (CARD_TYPE_8978 | (INTF_SD << 8)) /** SD8997 card type */ -#define CARD_TYPE_SD8997 (CARD_TYPE_8997 | (INTF_SD << 8)) +#define CARD_TYPE_SD8997 (CARD_TYPE_8997 | (INTF_SD << 8)) /** SD8987 card type */ -#define CARD_TYPE_SD8987 (CARD_TYPE_8987 | (INTF_SD << 8)) +#define CARD_TYPE_SD8987 (CARD_TYPE_8987 | (INTF_SD << 8)) /** SD9097 card type */ -#define CARD_TYPE_SD9097 (CARD_TYPE_9097 | (INTF_SD << 8)) +#define CARD_TYPE_SD9097 (CARD_TYPE_9097 | (INTF_SD << 8)) /** SD9098 card type */ -#define CARD_TYPE_SD9098 (CARD_TYPE_9098 | (INTF_SD << 8)) +#define CARD_TYPE_SD9098 (CARD_TYPE_9098 | (INTF_SD << 8)) #define IS_SD8887(ct) (CARD_TYPE_SD8887 == (ct)) #define IS_SD8897(ct) (CARD_TYPE_SD8897 == (ct)) @@ -398,32 +399,32 @@ typedef t_s32 t_sval; #define IS_SD9098(ct) (CARD_TYPE_SD9098 == (ct)) /** SD8887 Card */ -#define CARD_SD8887 "SD8887" +#define CARD_SD8887 "SD8887" /** SD8897 Card */ -#define CARD_SD8897 "SD8897" +#define CARD_SD8897 "SD8897" /** SD8977 Card */ -#define CARD_SD8977 "SD8977" +#define CARD_SD8977 "SD8977" /** SD8978 Card */ -#define CARD_SD8978 "SD8978" +#define CARD_SD8978 "SD8978" /** SD8997 Card */ -#define CARD_SD8997 "SD8997" +#define CARD_SD8997 "SD8997" /** SD8987 Card */ -#define CARD_SD8987 "SD8987" +#define CARD_SD8987 "SD8987" /** SD9097 Card */ -#define CARD_SD9097 "SD9097" +#define CARD_SD9097 "SD9097" /** SD9098 Card */ -#define CARD_SD9098 "SD9098" +#define CARD_SD9098 "SD9098" #endif #ifdef PCIE /** PCIE8897 card type */ -#define CARD_TYPE_PCIE8897 (CARD_TYPE_8897 | (INTF_PCIE << 8)) +#define CARD_TYPE_PCIE8897 (CARD_TYPE_8897 | (INTF_PCIE << 8)) /** PCIE8997 card type */ -#define CARD_TYPE_PCIE8997 (CARD_TYPE_8997 | (INTF_PCIE << 8)) +#define CARD_TYPE_PCIE8997 (CARD_TYPE_8997 | (INTF_PCIE << 8)) /** PCIE9097 card type */ -#define CARD_TYPE_PCIE9097 (CARD_TYPE_9097 | (INTF_PCIE << 8)) +#define CARD_TYPE_PCIE9097 (CARD_TYPE_9097 | (INTF_PCIE << 8)) /** PCIE9098 card type */ -#define CARD_TYPE_PCIE9098 (CARD_TYPE_9098 | (INTF_PCIE << 8)) +#define CARD_TYPE_PCIE9098 (CARD_TYPE_9098 | (INTF_PCIE << 8)) #define IS_PCIE8897(ct) (CARD_TYPE_PCIE8897 == (ct)) #define IS_PCIE8997(ct) (CARD_TYPE_PCIE8997 == (ct)) @@ -431,28 +432,28 @@ typedef t_s32 t_sval; #define IS_PCIE9098(ct) (CARD_TYPE_PCIE9098 == (ct)) /** PCIE8897 Card */ -#define CARD_PCIE8897 "PCIE8897" +#define CARD_PCIE8897 "PCIE8897" /** PCIE8997 Card */ -#define CARD_PCIE8997 "PCIE8997" +#define CARD_PCIE8997 "PCIE8997" /** PCIE9097 Card */ -#define CARD_PCIE9097 "PCIE9097" +#define CARD_PCIE9097 "PCIE9097" /** PCIE9000S Card */ -#define CARD_PCIE9000S "PCIE9000S" +#define CARD_PCIE9000S "PCIE9000S" /** PCIE9098 Card */ -#define CARD_PCIE9098 "PCIE9098" +#define CARD_PCIE9098 "PCIE9098" #endif #ifdef USB /** USB8897 card type */ -#define CARD_TYPE_USB8897 (CARD_TYPE_8897 | (INTF_USB << 8)) +#define CARD_TYPE_USB8897 (CARD_TYPE_8897 | (INTF_USB << 8)) /** USB8997 card type */ -#define CARD_TYPE_USB8997 (CARD_TYPE_8997 | (INTF_USB << 8)) +#define CARD_TYPE_USB8997 (CARD_TYPE_8997 | (INTF_USB << 8)) /** USB8978 card type */ -#define CARD_TYPE_USB8978 (CARD_TYPE_8978 | (INTF_USB << 8)) +#define CARD_TYPE_USB8978 (CARD_TYPE_8978 | (INTF_USB << 8)) /** USB9098 card type */ -#define CARD_TYPE_USB9098 (CARD_TYPE_9098 | (INTF_USB << 8)) +#define CARD_TYPE_USB9098 (CARD_TYPE_9098 | (INTF_USB << 8)) /** USB9097 card type */ -#define CARD_TYPE_USB9097 (CARD_TYPE_9097 | (INTF_USB << 8)) +#define CARD_TYPE_USB9097 (CARD_TYPE_9097 | (INTF_USB << 8)) #define IS_USB8897(ct) (CARD_TYPE_USB8897 == (ct)) #define IS_USB8997(ct) (CARD_TYPE_USB8997 == (ct)) @@ -461,24 +462,24 @@ typedef t_s32 t_sval; #define IS_USB9097(ct) (CARD_TYPE_USB9097 == (ct)) /** USB8897 Card */ -#define CARD_USB8897 "USB8897" +#define CARD_USB8897 "USB8897" /** USB8997 Card */ -#define CARD_USB8997 "USB8997" +#define CARD_USB8997 "USB8997" /** USB8978 Card */ -#define CARD_USB8978 "USB8978" +#define CARD_USB8978 "USB8978" /** USB9098 Card */ -#define CARD_USB9098 "USB9098" +#define CARD_USB9098 "USB9098" /** USB9097 Card */ -#define CARD_USB9097 "USB9097" +#define CARD_USB9097 "USB9097" #endif -#define IS_CARD8887(ct) (CARD_TYPE_8887 == ((ct) & 0xf)) -#define IS_CARD8897(ct) (CARD_TYPE_8897 == ((ct) & 0xf)) -#define IS_CARD8977(ct) (CARD_TYPE_8977 == ((ct) & 0xf)) -#define IS_CARD8997(ct) (CARD_TYPE_8997 == ((ct) & 0xf)) -#define IS_CARD8987(ct) (CARD_TYPE_8987 == ((ct) & 0xf)) -#define IS_CARD9098(ct) (CARD_TYPE_9098 == ((ct) & 0xf)) -#define IS_CARD9097(ct) (CARD_TYPE_9097 == ((ct) & 0xf)) +#define IS_CARD8887(ct) (CARD_TYPE_8887 == ((ct)&0xf)) +#define IS_CARD8897(ct) (CARD_TYPE_8897 == ((ct)&0xf)) +#define IS_CARD8977(ct) (CARD_TYPE_8977 == ((ct)&0xf)) +#define IS_CARD8997(ct) (CARD_TYPE_8997 == ((ct)&0xf)) +#define IS_CARD8987(ct) (CARD_TYPE_8987 == ((ct)&0xf)) +#define IS_CARD9098(ct) (CARD_TYPE_9098 == ((ct)&0xf)) +#define IS_CARD9097(ct) (CARD_TYPE_9097 == ((ct)&0xf)) typedef struct _card_type_entry { t_u16 card_type; @@ -488,7 +489,7 @@ typedef struct _card_type_entry { #if defined(SDIO) || defined(PCIE) /** Max retry number of IO write */ -#define MAX_WRITE_IOMEM_RETRY 2 +#define MAX_WRITE_IOMEM_RETRY 2 #endif /* SDIO || PCIE */ #ifdef PCIE @@ -506,73 +507,73 @@ typedef enum { #define OUT /** BIT value */ -#define MBIT(x) (((t_u32)1) << (x)) +#define MBIT(x) (((t_u32)1) << (x)) /** Buffer flag for requeued packet */ -#define MLAN_BUF_FLAG_REQUEUED_PKT MBIT(0) +#define MLAN_BUF_FLAG_REQUEUED_PKT MBIT(0) /** Buffer flag for transmit buf from moal */ -#define MLAN_BUF_FLAG_MOAL_TX_BUF MBIT(1) +#define MLAN_BUF_FLAG_MOAL_TX_BUF MBIT(1) /** Buffer flag for malloc mlan_buffer */ -#define MLAN_BUF_FLAG_MALLOC_BUF MBIT(2) +#define MLAN_BUF_FLAG_MALLOC_BUF MBIT(2) /** Buffer flag for bridge packet */ -#define MLAN_BUF_FLAG_BRIDGE_BUF MBIT(3) +#define MLAN_BUF_FLAG_BRIDGE_BUF MBIT(3) #ifdef USB /** Buffer flag for deaggregated rx packet */ -#define MLAN_BUF_FLAG_RX_DEAGGR MBIT(5) +#define MLAN_BUF_FLAG_RX_DEAGGR MBIT(5) /** Buffer flag for sleep confirm resp packet */ -#define MLAN_BUF_FLAG_SLEEPCFM_RESP MBIT(6) +#define MLAN_BUF_FLAG_SLEEPCFM_RESP MBIT(6) /** Buffer flag for USB TX AGGR */ -#define MLAN_BUF_FLAG_USB_TX_AGGR MBIT(7) +#define MLAN_BUF_FLAG_USB_TX_AGGR MBIT(7) #endif /** Buffer flag for TCP_ACK */ -#define MLAN_BUF_FLAG_TCP_ACK MBIT(9) +#define MLAN_BUF_FLAG_TCP_ACK MBIT(9) /** Buffer flag for TX_STATUS */ -#define MLAN_BUF_FLAG_TX_STATUS MBIT(10) +#define MLAN_BUF_FLAG_TX_STATUS MBIT(10) /** Buffer flag for NULL data packet */ -#define MLAN_BUF_FLAG_NULL_PKT MBIT(12) +#define MLAN_BUF_FLAG_NULL_PKT MBIT(12) /** Buffer flag for Diag pkt */ -#define MLAN_BUF_FLAG_DIAG_BUF MBIT(13) +#define MLAN_BUF_FLAG_DIAG_BUF MBIT(13) -#define MLAN_BUF_FLAG_TX_CTRL MBIT(14) +#define MLAN_BUF_FLAG_TX_CTRL MBIT(14) #ifdef DEBUG_LEVEL1 /** Debug level bit definition */ -#define MMSG MBIT(0) -#define MFATAL MBIT(1) -#define MERROR MBIT(2) -#define MDATA MBIT(3) -#define MCMND MBIT(4) -#define MEVENT MBIT(5) -#define MINTR MBIT(6) -#define MIOCTL MBIT(7) +#define MMSG MBIT(0) +#define MFATAL MBIT(1) +#define MERROR MBIT(2) +#define MDATA MBIT(3) +#define MCMND MBIT(4) +#define MEVENT MBIT(5) +#define MINTR MBIT(6) +#define MIOCTL MBIT(7) -#define MREG_D MBIT(9) +#define MREG_D MBIT(9) -#define MMPA_D MBIT(15) -#define MDAT_D MBIT(16) -#define MCMD_D MBIT(17) -#define MEVT_D MBIT(18) -#define MFW_D MBIT(19) -#define MIF_D MBIT(20) +#define MMPA_D MBIT(15) +#define MDAT_D MBIT(16) +#define MCMD_D MBIT(17) +#define MEVT_D MBIT(18) +#define MFW_D MBIT(19) +#define MIF_D MBIT(20) -#define MENTRY MBIT(28) -#define MWARN MBIT(29) -#define MINFO MBIT(30) -#define MHEX_DUMP MBIT(31) +#define MENTRY MBIT(28) +#define MWARN MBIT(29) +#define MINFO MBIT(30) +#define MHEX_DUMP MBIT(31) #endif /* DEBUG_LEVEL1 */ /** Memory allocation type: DMA */ -#define MLAN_MEM_DMA MBIT(0) +#define MLAN_MEM_DMA MBIT(0) /** Default memory allocation flag */ -#define MLAN_MEM_DEF 0 +#define MLAN_MEM_DEF 0 /** mlan_status */ typedef enum _mlan_status { @@ -590,15 +591,15 @@ typedef enum _mlan_status { /** mlan_error_code */ typedef enum _mlan_error_code { - /** No error */ + /** No error */ MLAN_ERROR_NO_ERROR = 0, - /** Firmware/device errors below (MSB=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, - /** Driver errors below (MSB=1) */ + /** Driver errors below (MSB=1) */ MLAN_ERROR_PKT_SIZE_INVALID = 0x80000001, MLAN_ERROR_PKT_TIMEOUT = 0x80000002, MLAN_ERROR_PKT_INVALID = 0x80000003, @@ -614,7 +615,7 @@ typedef enum _mlan_error_code { MLAN_ERROR_EVENT_UNKNOWN = 0x8000000D, MLAN_ERROR_INVALID_PARAMETER = 0x8000000E, MLAN_ERROR_NO_MEM = 0x8000000F, - /** More to add */ + /** More to add */ } mlan_error_code; /** mlan_buf_type */ @@ -641,7 +642,7 @@ typedef enum _mlan_usb_ep { } mlan_usb_ep; /** Timeout in milliseconds for usb_bulk_msg function */ -#define MLAN_USB_BULK_MSG_TIMEOUT 100 +#define MLAN_USB_BULK_MSG_TIMEOUT 100 #endif /* USB */ /** MLAN BSS type */ @@ -662,10 +663,10 @@ typedef enum _mlan_bss_role { } mlan_bss_role; /** BSS role mask */ -#define BSS_ROLE_MASK (MBIT(0) |MBIT(1)) +#define BSS_ROLE_MASK (MBIT(0) | MBIT(1)) /** Get BSS role */ -#define GET_BSS_ROLE(priv) ((priv)->bss_role & BSS_ROLE_MASK) +#define GET_BSS_ROLE(priv) ((priv)->bss_role & BSS_ROLE_MASK) /** mlan_data_frame_type */ typedef enum _mlan_data_frame_type { @@ -753,48 +754,48 @@ typedef enum _mlan_event_id { /** Data Structures */ /** mlan_image data structure */ typedef struct _mlan_fw_image { - /** Firmware image buffer pointer */ + /** Firmware image buffer pointer */ t_u8 *pfw_buf; - /** Firmware image length */ + /** Firmware image length */ t_u32 fw_len; - /** Firmware reload flag */ + /** Firmware reload flag */ t_u8 fw_reload; } mlan_fw_image, *pmlan_fw_image; /** MrvlIEtypesHeader_t */ typedef MLAN_PACK_START struct _MrvlIEtypesHeader { - /** Header type */ + /** Header type */ t_u16 type; - /** Header length */ + /** Header length */ t_u16 len; } MLAN_PACK_END MrvlIEtypesHeader_t; /** MrvlIEtypes_Data_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_Data_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Data */ + /** Data */ t_u8 data[1]; } MLAN_PACK_END MrvlIEtypes_Data_t; -#define OID_TYPE_CAL 0x2 -#define OID_TYPE_DPD 0xa +#define OID_TYPE_CAL 0x2 +#define OID_TYPE_DPD 0xa /** Custom data structure */ typedef struct _mlan_init_param { - /** DPD data buffer pointer */ + /** DPD data buffer pointer */ t_u8 *pdpd_data_buf; - /** DPD data length */ + /** DPD data length */ t_u32 dpd_data_len; - /** region txpowerlimit cfg data buffer pointer */ + /** region txpowerlimit cfg data buffer pointer */ t_u8 *ptxpwr_data_buf; - /** region txpowerlimit cfg data length */ + /** region txpowerlimit cfg data length */ t_u32 txpwr_data_len; - /** Cal data buffer pointer */ + /** Cal data buffer pointer */ t_u8 *pcal_data_buf; - /** Cal data length */ + /** Cal data length */ t_u32 cal_data_len; - /** Other custom data */ + /** Other custom data */ } mlan_init_param, *pmlan_init_param; /** channel type */ @@ -807,63 +808,67 @@ enum mlan_channel_type { }; /** channel band */ -enum { - BAND_2GHZ = 0, - BAND_5GHZ = 1, - BAND_4GHZ = 2, +enum { BAND_2GHZ = 0, + BAND_5GHZ = 1, + BAND_4GHZ = 2, }; /** channel offset */ -enum { - SEC_CHAN_NONE = 0, - SEC_CHAN_ABOVE = 1, - SEC_CHAN_5MHZ = 2, - SEC_CHAN_BELOW = 3 -}; +enum { SEC_CHAN_NONE = 0, + SEC_CHAN_ABOVE = 1, + SEC_CHAN_5MHZ = 2, + SEC_CHAN_BELOW = 3 }; /** channel bandwidth */ -enum { - CHAN_BW_20MHZ = 0, - CHAN_BW_10MHZ, - CHAN_BW_40MHZ, - CHAN_BW_80MHZ, +enum { CHAN_BW_20MHZ = 0, + CHAN_BW_10MHZ, + CHAN_BW_40MHZ, + CHAN_BW_80MHZ, }; /** scan mode */ -enum { - SCAN_MODE_MANUAL = 0, - SCAN_MODE_ACS, - SCAN_MODE_USER, +enum { SCAN_MODE_MANUAL = 0, + SCAN_MODE_ACS, + SCAN_MODE_USER, }; +typedef enum _dfs_w53_cfg_t { + /** DFS W53 Default Fw Value */ + DFS_W53_DEFAULT_FW = 0, + /** DFS W53 New W53 Rules/Standard */ + DFS_W53_NEW = 1, + /** DFS W53 Old W53 Rules/Standard */ + DFS_W53_OLD = 2 +} dfs_w53_cfg_t; + /** Band_Config_t */ typedef MLAN_PACK_START struct _Band_Config_t { #ifdef BIG_ENDIAN_SUPPORT - /** Channel Selection Mode - (00)=manual, (01)=ACS, (02)=user*/ - t_u8 scanMode:2; - /** Secondary Channel Offset - (00)=None, (01)=Above, (11)=Below */ - t_u8 chan2Offset:2; - /** Channel Width - (00)=20MHz, (10)=40MHz, (11)=80MHz */ - t_u8 chanWidth:2; - /** Band Info - (00)=2.4GHz, (01)=5GHz */ - t_u8 chanBand:2; + /** Channel Selection Mode - (00)=manual, (01)=ACS, (02)=user*/ + t_u8 scanMode : 2; + /** Secondary Channel Offset - (00)=None, (01)=Above, (11)=Below */ + t_u8 chan2Offset : 2; + /** Channel Width - (00)=20MHz, (10)=40MHz, (11)=80MHz */ + t_u8 chanWidth : 2; + /** Band Info - (00)=2.4GHz, (01)=5GHz */ + t_u8 chanBand : 2; #else - /** Band Info - (00)=2.4GHz, (01)=5GHz */ - t_u8 chanBand:2; - /** Channel Width - (00)=20MHz, (10)=40MHz, (11)=80MHz */ - t_u8 chanWidth:2; - /** Secondary Channel Offset - (00)=None, (01)=Above, (11)=Below */ - t_u8 chan2Offset:2; - /** Channel Selection Mode - (00)=manual, (01)=ACS, (02)=Adoption mode*/ - t_u8 scanMode:2; + /** Band Info - (00)=2.4GHz, (01)=5GHz */ + t_u8 chanBand : 2; + /** Channel Width - (00)=20MHz, (10)=40MHz, (11)=80MHz */ + t_u8 chanWidth : 2; + /** Secondary Channel Offset - (00)=None, (01)=Above, (11)=Below */ + t_u8 chan2Offset : 2; + /** Channel Selection Mode - (00)=manual, (01)=ACS, (02)=Adoption mode*/ + t_u8 scanMode : 2; #endif } MLAN_PACK_END Band_Config_t; /** channel_band_t */ typedef MLAN_PACK_START struct _chan_band_info { - /** Band Configuration */ + /** Band Configuration */ Band_Config_t bandcfg; - /** channel */ + /** channel */ t_u8 channel; /** 11n flag */ t_u8 is_11n_enabled; @@ -874,15 +879,15 @@ typedef MLAN_PACK_START struct _chan_band_info { } MLAN_PACK_END chan_band_info; /** Channel usability flags */ -#define NXP_CHANNEL_NO_OFDM MBIT(9) -#define NXP_CHANNEL_NO_CCK MBIT(8) -#define NXP_CHANNEL_DISABLED MBIT(7) +#define NXP_CHANNEL_NO_OFDM MBIT(9) +#define NXP_CHANNEL_NO_CCK MBIT(8) +#define NXP_CHANNEL_DISABLED MBIT(7) /* BIT 5/6 resevered for FW */ -#define NXP_CHANNEL_NOHT160 MBIT(4) -#define NXP_CHANNEL_NOHT80 MBIT(3) -#define NXP_CHANNEL_NOHT40 MBIT(2) -#define NXP_CHANNEL_DFS MBIT(1) -#define NXP_CHANNEL_PASSIVE MBIT(0) +#define NXP_CHANNEL_NOHT160 MBIT(4) +#define NXP_CHANNEL_NOHT80 MBIT(3) +#define NXP_CHANNEL_NOHT40 MBIT(2) +#define NXP_CHANNEL_DFS MBIT(1) +#define NXP_CHANNEL_PASSIVE MBIT(0) /** CFP dynamic (non-const) elements */ typedef struct _cfp_dyn_t { @@ -898,34 +903,35 @@ typedef struct _cfp_dyn_t { * bit 0 : if set, channel is passive */ t_u16 flags; - /** TRUE: Channel is blacklisted (do not use) */ + /** TRUE: Channel is blacklisted (do not use) */ t_bool blacklist; } cfp_dyn_t; /** Chan-Freq-TxPower mapping table*/ typedef struct _chan_freq_power_t { - /** Channel Number */ + /** Channel Number */ t_u16 channel; - /** Frequency of this Channel */ + /** Frequency of this Channel */ t_u32 freq; - /** Max allowed Tx power level */ + /** Max allowed Tx power level */ 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*/ + /** 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; - /** Elements associated to cfp that change at run-time */ + /** Elements associated to cfp that change at run-time */ cfp_dyn_t dynamic; } chan_freq_power_t; /** mlan_event data structure */ typedef struct _mlan_event { - /** BSS index number for multiple BSS support */ + /** BSS index number for multiple BSS support */ t_u32 bss_index; - /** Event ID */ + /** Event ID */ mlan_event_id event_id; - /** Event length */ + /** Event length */ t_u32 event_len; - /** Event buffer */ + /** Event buffer */ t_u8 event_buf[]; } mlan_event, *pmlan_event; @@ -933,127 +939,127 @@ typedef struct _mlan_event { /** mlan_ioctl_req data structure */ typedef struct _mlan_ioctl_req { - /** Pointer to previous mlan_ioctl_req */ + /** Pointer to previous mlan_ioctl_req */ struct _mlan_ioctl_req *pprev; - /** Pointer to next mlan_ioctl_req */ + /** Pointer to next mlan_ioctl_req */ struct _mlan_ioctl_req *pnext; - /** Status code from firmware/driver */ + /** Status code from firmware/driver */ t_u32 status_code; - /** BSS index number for multiple BSS support */ + /** BSS index number for multiple BSS support */ t_u32 bss_index; - /** Request id */ + /** Request id */ t_u32 req_id; - /** Action: set or get */ + /** Action: set or get */ t_u32 action; - /** Pointer to buffer */ + /** Pointer to buffer */ t_u8 *pbuf; - /** Length of buffer */ + /** Length of buffer */ t_u32 buf_len; - /** Length of the data read/written in buffer */ + /** Length of the data read/written in buffer */ t_u32 data_read_written; - /** Length of buffer needed */ + /** Length of buffer needed */ t_u32 buf_len_needed; - /** Reserved for MOAL module */ + /** Reserved for MOAL module */ t_ptr reserved_1; } mlan_ioctl_req, *pmlan_ioctl_req; /** txpower structure */ typedef MLAN_PACK_START struct { #ifdef BIG_ENDIAN_SUPPORT - /** Host tx power ctrl: - 0x0: use fw setting for TX power - 0x1: value specified in bit[6] and bit[5:0] are valid */ - t_u8 hostctl:1; - /** Sign of the power specified in bit[5:0] */ - t_u8 sign:1; - /** Power to be used for transmission(in dBm) */ - t_u8 abs_val:6; + /** Host tx power ctrl: + 0x0: use fw setting for TX power + 0x1: value specified in bit[6] and bit[5:0] are valid */ + t_u8 hostctl : 1; + /** Sign of the power specified in bit[5:0] */ + t_u8 sign : 1; + /** Power to be used for transmission(in dBm) */ + t_u8 abs_val : 6; #else - /** Power to be used for transmission(in dBm) */ - t_u8 abs_val:6; - /** Sign of the power specified in bit[5:0] */ - t_u8 sign:1; - /** Host tx power ctrl: - 0x0: use fw setting for TX power - 0x1: value specified in bit[6] and bit[5:0] are valid */ - t_u8 hostctl:1; + /** Power to be used for transmission(in dBm) */ + t_u8 abs_val : 6; + /** Sign of the power specified in bit[5:0] */ + t_u8 sign : 1; + /** Host tx power ctrl: + 0x0: use fw setting for TX power + 0x1: value specified in bit[6] and bit[5:0] are valid */ + t_u8 hostctl : 1; #endif } MLAN_PACK_END tx_power_t; /* pkt_txctrl */ typedef MLAN_PACK_START struct _pkt_txctrl { - /**Data rate in unit of 0.5Mbps */ + /**Data rate in unit of 0.5Mbps */ t_u16 data_rate; /*Channel number to transmit the frame */ t_u8 channel; - /** Bandwidth to transmit the frame*/ + /** Bandwidth to transmit the frame*/ t_u8 bw; - /** Power to be used for transmission*/ + /** Power to be used for transmission*/ union { tx_power_t tp; t_u8 val; } tx_power; - /** Retry time of tx transmission*/ + /** Retry time of tx transmission*/ t_u8 retry_limit; } MLAN_PACK_END pkt_txctrl, *ppkt_txctrl; /** pkt_rxinfo */ typedef MLAN_PACK_START struct _pkt_rxinfo { - /** Data rate of received paccket*/ + /** Data rate of received paccket*/ t_u16 data_rate; - /** Channel on which packet was received*/ + /** Channel on which packet was received*/ t_u8 channel; - /** Rx antenna*/ + /** Rx antenna*/ t_u8 antenna; - /** Rx Rssi*/ + /** Rx Rssi*/ t_u8 rssi; } MLAN_PACK_END pkt_rxinfo, *ppkt_rxinfo; /** mlan_buffer data structure */ typedef struct _mlan_buffer { - /** Pointer to previous mlan_buffer */ + /** Pointer to previous mlan_buffer */ struct _mlan_buffer *pprev; - /** Pointer to next mlan_buffer */ + /** Pointer to next mlan_buffer */ struct _mlan_buffer *pnext; - /** Status code from firmware/driver */ + /** Status code from firmware/driver */ t_u32 status_code; - /** Flags for this buffer */ + /** Flags for this buffer */ t_u32 flags; - /** BSS index number for multiple BSS support */ + /** BSS index number for multiple BSS support */ t_u32 bss_index; - /** Buffer descriptor, e.g. skb in Linux */ + /** Buffer descriptor, e.g. skb in Linux */ t_void *pdesc; - /** Pointer to buffer */ + /** Pointer to buffer */ t_u8 *pbuf; #ifdef PCIE - /** Physical address of the pbuf pointer */ + /** Physical address of the pbuf pointer */ t_u64 buf_pa; t_u32 total_pcie_buf_len; #endif - /** Offset to data */ + /** Offset to data */ t_u32 data_offset; - /** Data length */ + /** Data length */ t_u32 data_len; - /** Buffer type: data, cmd, event etc. */ + /** Buffer type: data, cmd, event etc. */ mlan_buf_type buf_type; - /** Fields below are valid for data packet only */ - /** QoS priority */ + /** Fields below are valid for data packet only */ + /** QoS priority */ t_u32 priority; - /** Time stamp when packet is received (seconds) */ + /** Time stamp when packet is received (seconds) */ t_u32 in_ts_sec; - /** Time stamp when packet is received (micro seconds) */ + /** Time stamp when packet is received (micro seconds) */ t_u32 in_ts_usec; - /** Time stamp when packet is processed (seconds) */ + /** Time stamp when packet is processed (seconds) */ t_u32 out_ts_sec; - /** Time stamp when packet is processed (micro seconds) */ + /** Time stamp when packet is processed (micro seconds) */ t_u32 out_ts_usec; - /** tx_seq_num */ + /** tx_seq_num */ t_u32 tx_seq_num; - /** Fields below are valid for MLAN module only */ - /** Pointer to parent mlan_buffer */ + /** Fields below are valid for MLAN module only */ + /** Pointer to parent mlan_buffer */ struct _mlan_buffer *pparent; - /** Use count for this buffer */ + /** Use count for this buffer */ t_u32 use_count; union { pkt_txctrl tx_info; @@ -1068,23 +1074,23 @@ typedef struct _mlan_hw_info { /** mlan_bss_attr data structure */ typedef struct _mlan_bss_attr { - /** BSS type */ + /** BSS type */ t_u32 bss_type; - /** Data frame type: Ethernet II, 802.11, etc. */ + /** Data frame type: Ethernet II, 802.11, etc. */ t_u32 frame_type; - /** The BSS is active (non-0) or not (0). */ + /** The BSS is active (non-0) or not (0). */ t_u32 active; - /** BSS Priority */ + /** BSS Priority */ t_u32 bss_priority; - /** BSS number */ + /** BSS number */ t_u32 bss_num; - /** The BSS is virtual */ + /** The BSS is virtual */ t_u32 bss_virtual; } mlan_bss_attr, *pmlan_bss_attr; /** bss tbl data structure */ typedef struct _mlan_bss_tbl { - /** BSS Attributes */ + /** BSS Attributes */ mlan_bss_attr bss_attr[MLAN_MAX_BSS_NUM]; } mlan_bss_tbl, *pmlan_bss_tbl; @@ -1121,8 +1127,8 @@ 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_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; @@ -1131,73 +1137,74 @@ typedef MLAN_PACK_START enum _mlan_wmm_queue_stats_action_e { * */ typedef MLAN_PACK_START struct { - /** TSID: Range: 0->7 */ + /** TSID: Range: 0->7 */ t_u8 tid; - /** TSID specified is valid */ + /** TSID specified is valid */ t_u8 valid; - /** AC TSID is active on */ + /** AC TSID is active on */ t_u8 access_category; - /** UP specified for the TSID */ + /** UP specified for the TSID */ t_u8 user_priority; - /** Power save mode for TSID: 0 (legacy), 1 (UAPSD) */ + /** Power save mode for TSID: 0 (legacy), 1 (UAPSD) */ t_u8 psb; - /** Upstream(0), Downlink(1), Bidirectional(3) */ + /** Upstream(0), Downlink(1), Bidirectional(3) */ t_u8 flow_dir; - /** Medium time granted for the TSID */ + /** Medium time granted for the TSID */ 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; + /** 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; /** Max Ie length */ -#define MAX_IE_SIZE 256 +#define MAX_IE_SIZE 256 /** custom IE */ typedef MLAN_PACK_START struct _custom_ie { - /** IE Index */ + /** IE Index */ t_u16 ie_index; - /** Mgmt Subtype Mask */ + /** Mgmt Subtype Mask */ t_u16 mgmt_subtype_mask; - /** IE Length */ + /** IE Length */ t_u16 ie_length; - /** IE buffer */ + /** IE buffer */ t_u8 ie_buffer[MAX_IE_SIZE]; } MLAN_PACK_END custom_ie; /** Max IE index to FW */ -#define MAX_MGMT_IE_INDEX_TO_FW 4 +#define MAX_MGMT_IE_INDEX_TO_FW 4 /** Max IE index per BSS */ -#define MAX_MGMT_IE_INDEX 26 +#define MAX_MGMT_IE_INDEX 26 /** custom IE info */ typedef MLAN_PACK_START struct _custom_ie_info { - /** size of buffer */ + /** size of buffer */ t_u16 buf_size; - /** no of buffers of buf_size */ + /** no of buffers of buf_size */ 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 */ + /** Type */ t_u16 type; - /** Length */ + /** Length */ t_u16 len; - /** No of tuples */ + /** No of tuples */ t_u16 count; - /** custom IE info tuples */ + /** custom IE info tuples */ 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 */ + /** Type */ t_u16 type; - /** Length */ + /** Length */ t_u16 len; - /** IE data */ + /** IE data */ custom_ie ie_data_list[MAX_MGMT_IE_INDEX_TO_FW]; - /** Max mgmt IE TLV */ + /** Max mgmt IE TLV */ tlvbuf_max_mgmt_ie max_mgmt_ie; } MLAN_PACK_END mlan_ds_misc_custom_ie; @@ -1215,30 +1222,31 @@ typedef enum wifi_channel_width { /** channel information */ typedef struct { - /** channel width (20, 40, 80, 80+80, 160) */ + /** channel width (20, 40, 80, 80+80, 160) */ wifi_channel_width_t width; - /** primary 20 MHz channel */ + /** primary 20 MHz channel */ int center_freq; - /** center frequency (MHz) first segment */ + /** center frequency (MHz) first segment */ int center_freq0; - /** center frequency (MHz) second segment */ + /** center frequency (MHz) second segment */ int center_freq1; } wifi_channel_info; /** wifi rate */ typedef struct { - /** 0: OFDM, 1:CCK, 2:HT 3:VHT 4..7 reserved */ - t_u32 preamble:3; - /** 0:1x1, 1:2x2, 3:3x3, 4:4x4 */ - t_u32 nss:2; - /** 0:20MHz, 1:40Mhz, 2:80Mhz, 3:160Mhz */ - t_u32 bw:3; - /** OFDM/CCK rate code would be as per ieee std in the units of 0.5mbps */ - /** HT/VHT it would be mcs index */ - t_u32 rateMcsIdx:8; - /** reserved */ - t_u32 reserved:16; - /** units of 100 Kbps */ + /** 0: OFDM, 1:CCK, 2:HT 3:VHT 4..7 reserved */ + t_u32 preamble : 3; + /** 0:1x1, 1:2x2, 3:3x3, 4:4x4 */ + t_u32 nss : 2; + /** 0:20MHz, 1:40Mhz, 2:80Mhz, 3:160Mhz */ + t_u32 bw : 3; + /** OFDM/CCK rate code would be as per ieee std in the units of 0.5mbps + */ + /** HT/VHT it would be mcs index */ + t_u32 rateMcsIdx : 8; + /** reserved */ + t_u32 reserved : 16; + /** units of 100 Kbps */ t_u32 bitrate; } wifi_rate; @@ -1253,7 +1261,7 @@ typedef enum { #define MAX_RADIO 2 #define MAX_NUM_CHAN 1 #define VHT_NUM_SUPPORT_MCS 10 -#define MCS_NUM_SUPP 16 +#define MCS_NUM_SUPP 16 #define BUF_MAXLEN 4096 /** connection state */ @@ -1262,9 +1270,9 @@ typedef enum { WIFI_AUTHENTICATING = 1, WIFI_ASSOCIATING = 2, WIFI_ASSOCIATED = 3, - /** if done by firmware/driver */ + /** if done by firmware/driver */ WIFI_EAPOL_STARTED = 4, - /** if done by firmware/driver */ + /** if done by firmware/driver */ WIFI_EAPOL_COMPLETED = 5, } wifi_connection_state; /** roam state */ @@ -1284,37 +1292,38 @@ typedef enum { } wifi_interface_mode; /** set for QOS association */ -#define WIFI_CAPABILITY_QOS 0x00000001 -/** set for protected association (802.11 beacon frame control protected bit set) */ -#define WIFI_CAPABILITY_PROTECTED 0x00000002 +#define WIFI_CAPABILITY_QOS 0x00000001 +/** set for protected association (802.11 beacon frame control protected bit + * set) */ +#define WIFI_CAPABILITY_PROTECTED 0x00000002 /** set if 802.11 Extended Capabilities element interworking bit is set */ #define WIFI_CAPABILITY_INTERWORKING 0x00000004 /** set for HS20 association */ -#define WIFI_CAPABILITY_HS20 0x00000008 +#define WIFI_CAPABILITY_HS20 0x00000008 /** set is 802.11 Extended Capabilities element UTF-8 SSID bit is set */ -#define WIFI_CAPABILITY_SSID_UTF8 0x00000010 +#define WIFI_CAPABILITY_SSID_UTF8 0x00000010 /** set is 802.11 Country Element is present */ -#define WIFI_CAPABILITY_COUNTRY 0x00000020 +#define WIFI_CAPABILITY_COUNTRY 0x00000020 /** link layer status */ typedef struct { - /** interface mode */ + /** interface mode */ wifi_interface_mode mode; - /** interface mac address (self) */ + /** interface mac address (self) */ t_u8 mac_addr[6]; - /** connection state (valid for STA, CLI only) */ + /** connection state (valid for STA, CLI only) */ wifi_connection_state state; - /** roaming state */ + /** roaming state */ wifi_roam_state roaming; - /** WIFI_CAPABILITY_XXX (self) */ + /** WIFI_CAPABILITY_XXX (self) */ t_u32 capabilities; - /** null terminated SSID */ + /** null terminated SSID */ t_u8 ssid[33]; - /** bssid */ + /** bssid */ t_u8 bssid[6]; - /** country string advertised by AP */ + /** country string advertised by AP */ t_u8 ap_country_str[3]; - /** country string for this association */ + /** country string for this association */ t_u8 country_str[3]; } wifi_interface_link_layer_info; @@ -1322,73 +1331,88 @@ typedef wifi_interface_link_layer_info *wifi_interface_handle; /** channel statistics */ typedef struct { - /** channel */ + /** channel */ wifi_channel_info channel; - /** msecs the radio is awake (32 bits number accruing over time) */ + /** msecs the radio is awake (32 bits number accruing over time) */ t_u32 on_time; - /** msecs the CCA register is busy (32 bits number accruing over time) */ + /** msecs the CCA register is busy (32 bits number accruing over time) + */ t_u32 cca_busy_time; } wifi_channel_stat; /** timeval */ typedef struct { - /** Time (seconds) */ + /** Time (seconds) */ t_u32 time_sec; - /** Time (micro seconds) */ + /** Time (micro seconds) */ t_u32 time_usec; } wifi_timeval; -#define timeval_to_msec(timeval) (t_u64)((t_u64)(timeval.time_sec)*1000 + (t_u64)(timeval.time_usec)/1000) -#define timeval_to_usec(timeval) (t_u64)((t_u64)(timeval.time_sec)*1000*1000 + (t_u64)(timeval.time_usec)) -#define is_zero_timeval(timeval) ((timeval.time_sec == 0) && (timeval.time_usec == 0)) +#define timeval_to_msec(timeval) \ + (t_u64)((t_u64)(timeval.time_sec) * 1000 + \ + (t_u64)(timeval.time_usec) / 1000) +#define timeval_to_usec(timeval) \ + (t_u64)((t_u64)(timeval.time_sec) * 1000 * 1000 + \ + (t_u64)(timeval.time_usec)) +#define is_zero_timeval(timeval) \ + ((timeval.time_sec == 0) && (timeval.time_usec == 0)) /** radio statistics */ typedef struct { - /** wifi radio (if multiple radio supported) */ + /** wifi radio (if multiple radio supported) */ int radio; - /** msecs the radio is awake (32 bits number accruing over time) */ + /** msecs the radio is awake (32 bits number accruing over time) */ t_u32 on_time; - /** msecs the radio is transmitting (32 bits number accruing over time) */ + /** msecs the radio is transmitting (32 bits number accruing over time) + */ t_u32 tx_time; - /** TBD: num_tx_levels: number of radio transmit power levels */ + /** TBD: num_tx_levels: number of radio transmit power levels */ t_u32 reserved0; - /** TBD: tx_time_per_levels: pointer to an array of radio transmit per power levels in msecs accured over time */ - /* t_u32 *reserved1; */ - /** msecs the radio is in active receive (32 bits number accruing over time) */ + /** TBD: tx_time_per_levels: pointer to an array of radio transmit per + * power levels in msecs accured over time */ + /* t_u32 *reserved1;*/ + /** msecs the radio is in active receive (32 bits number accruing over + * time) */ t_u32 rx_time; - /** msecs the radio is awake due to all scan (32 bits number accruing over time) */ + /** msecs the radio is awake due to all scan (32 bits number accruing + * over time) */ t_u32 on_time_scan; - /** msecs the radio is awake due to NAN (32 bits number accruing over time) */ + /** msecs the radio is awake due to NAN (32 bits number accruing over + * time) */ t_u32 on_time_nbd; - /** msecs the radio is awake due to G?scan (32 bits number accruing over time) */ + /** msecs the radio is awake due to G?scan (32 bits number accruing over + * time) */ t_u32 on_time_gscan; - /** msecs the radio is awake due to roam?scan (32 bits number accruing over time) */ + /** msecs the radio is awake due to roam?scan (32 bits number accruing + * over time) */ t_u32 on_time_roam_scan; - /** msecs the radio is awake due to PNO scan (32 bits number accruing over time) */ + /** msecs the radio is awake due to PNO scan (32 bits number accruing + * over time) */ t_u32 on_time_pno_scan; - /** msecs the radio is awake due to HS2.0 scans and GAS exchange (32 bits number accruing over time) */ + /** msecs the radio is awake due to HS2.0 scans and GAS exchange (32 + * bits number accruing over time) */ t_u32 on_time_hs20; - /** number of channels */ + /** number of channels */ t_u32 num_channels; - /** channel statistics */ + /** channel statistics */ wifi_channel_stat channels[MAX_NUM_CHAN]; } wifi_radio_stat; /** per rate statistics */ typedef struct { - /** rate information */ + /** rate information */ wifi_rate rate; - /** number of successfully transmitted data pkts (ACK rcvd) */ + /** number of successfully transmitted data pkts (ACK rcvd) */ t_u32 tx_mpdu; - /** number of received data pkts */ + /** number of received data pkts */ t_u32 rx_mpdu; - /** number of data packet losses (no ACK) */ + /** number of data packet losses (no ACK) */ t_u32 mpdu_lost; - /** total number of data pkt retries */ + /** total number of data pkt retries */ t_u32 retries; - /** number of short data pkt retries */ + /** number of short data pkt retries */ t_u32 retries_short; - /** number of long data pkt retries */ + /** number of long data pkt retries */ t_u32 retries_long; } wifi_rate_stat; @@ -1405,113 +1429,126 @@ typedef enum { /** per peer statistics */ typedef struct { - /** peer type (AP, TDLS, GO etc.) */ + /** peer type (AP, TDLS, GO etc.) */ wifi_peer_type type; - /** mac address */ + /** mac address */ t_u8 peer_mac_address[6]; - /** peer WIFI_CAPABILITY_XXX */ + /** peer WIFI_CAPABILITY_XXX */ t_u32 capabilities; - /** number of rates */ + /** number of rates */ t_u32 num_rate; - /** per rate statistics, number of entries = num_rate */ + /** per rate statistics, number of entries = num_rate */ wifi_rate_stat rate_stats[]; } wifi_peer_info; /** per access category statistics */ typedef struct { - /** access category (VI, VO, BE, BK) */ + /** access category (VI, VO, BE, BK) */ mlan_wmm_ac_e ac; - /** number of successfully transmitted unicast data pkts (ACK rcvd) */ + /** number of successfully transmitted unicast data pkts (ACK rcvd) */ t_u32 tx_mpdu; - /** number of received unicast mpdus */ + /** number of received unicast mpdus */ t_u32 rx_mpdu; - /** number of succesfully transmitted multicast data packets */ - /** STA case: implies ACK received from AP for the unicast packet in which mcast pkt was sent */ + /** number of succesfully transmitted multicast data packets */ + /** STA case: implies ACK received from AP for the unicast packet in + * which mcast pkt was sent */ t_u32 tx_mcast; - /** number of received multicast data packets */ + /** number of received multicast data packets */ t_u32 rx_mcast; - /** number of received unicast a-mpdus */ + /** number of received unicast a-mpdus */ t_u32 rx_ampdu; - /** number of transmitted unicast a-mpdus */ + /** number of transmitted unicast a-mpdus */ t_u32 tx_ampdu; - /** number of data pkt losses (no ACK) */ + /** number of data pkt losses (no ACK) */ t_u32 mpdu_lost; - /** total number of data pkt retries */ + /** total number of data pkt retries */ t_u32 retries; - /** number of short data pkt retries */ + /** number of short data pkt retries */ t_u32 retries_short; - /** number of long data pkt retries */ + /** number of long data pkt retries */ t_u32 retries_long; - /** data pkt min contention time (usecs) */ + /** data pkt min contention time (usecs) */ t_u32 contention_time_min; - /** data pkt max contention time (usecs) */ + /** data pkt max contention time (usecs) */ t_u32 contention_time_max; - /** data pkt avg contention time (usecs) */ + /** data pkt avg contention time (usecs) */ t_u32 contention_time_avg; - /** num of data pkts used for contention statistics */ + /** num of data pkts used for contention statistics */ t_u32 contention_num_samples; } wifi_wmm_ac_stat; /** interface statistics */ typedef struct { - /** wifi interface */ - /* wifi_interface_handle iface; */ - /** current state of the interface */ + /** wifi interface */ + /* wifi_interface_handle iface;*/ + /** current state of the interface */ wifi_interface_link_layer_info info; - /** access point beacon received count from connected AP */ + /** access point beacon received count from connected AP */ t_u32 beacon_rx; - /** Average beacon offset encountered (beacon_TSF - TBTT) - * the average_tsf_offset field is used so as to calculate the - * typical beacon contention time on the channel as well may be - * used to debug beacon synchronization and related power consumption issue - */ + /** Average beacon offset encountered (beacon_TSF - TBTT) + * the average_tsf_offset field is used so as to calculate the + * typical beacon contention time on the channel as well may be + * used to debug beacon synchronization and related power consumption + * issue + */ t_u64 average_tsf_offset; - /** indicate that this AP typically leaks packets beyond the driver guard time */ + /** indicate that this AP typically leaks packets beyond the driver + * guard time */ t_u32 leaky_ap_detected; - /** average number of frame leaked by AP after frame with PM bit set was ACK'ed by AP */ + /** average number of frame leaked by AP after frame with PM bit set was + * ACK'ed by AP */ t_u32 leaky_ap_avg_num_frames_leaked; - /** Guard time currently in force (when implementing IEEE power management based on - * frame control PM bit), How long driver waits before shutting down the radio and - * after receiving an ACK for a data frame with PM bit set) - */ + /** Guard time currently in force (when implementing IEEE power + * management based on frame control PM bit), How long driver waits + * before shutting down the radio and after receiving an ACK for a data + * frame with PM bit set) + */ t_u32 leaky_ap_guard_time; - /** access point mgmt frames received count from connected AP (including Beacon) */ + /** access point mgmt frames received count from connected AP (including + * Beacon) */ t_u32 mgmt_rx; - /** action frames received count */ + /** action frames received count */ t_u32 mgmt_action_rx; - /** action frames transmit count */ + /** action frames transmit count */ t_u32 mgmt_action_tx; - /** access Point Beacon and Management frames RSSI (averaged) */ + /** access Point Beacon and Management frames RSSI (averaged) */ t_s32 rssi_mgmt; - /** access Point Data Frames RSSI (averaged) from connected AP */ + /** access Point Data Frames RSSI (averaged) from connected AP */ t_s32 rssi_data; - /** access Point ACK RSSI (averaged) from connected AP */ + /** access Point ACK RSSI (averaged) from connected AP */ t_s32 rssi_ack; - /** per ac data packet statistics */ + /** per ac data packet statistics */ wifi_wmm_ac_stat ac[MAX_AC_QUEUES]; - /** number of peers */ + /** number of peers */ t_u32 num_peers; - /** per peer statistics */ + /** per peer statistics */ wifi_peer_info peer_info[]; } wifi_iface_stat; /** link layer stat configuration params */ typedef struct { - /** threshold to classify the pkts as short or long */ + /** threshold to classify the pkts as short or long */ t_u32 mpdu_size_threshold; - /** wifi statistics bitmap */ + /** wifi statistics bitmap */ t_u32 aggressive_statistics_gathering; } wifi_link_layer_params; /** wifi statistics bitmap */ -#define WIFI_STATS_RADIO 0x00000001 /** all radio statistics */ -#define WIFI_STATS_RADIO_CCA 0x00000002 /** cca_busy_time (within radio statistics) */ -#define WIFI_STATS_RADIO_CHANNELS 0x00000004 /** all channel statistics (within radio statistics) */ -#define WIFI_STATS_RADIO_SCAN 0x00000008 /** all scan statistics (within radio statistics) */ -#define WIFI_STATS_IFACE 0x00000010 /** all interface statistics */ -#define WIFI_STATS_IFACE_TXRATE 0x00000020 /** all tx rate statistics (within interface statistics) */ -#define WIFI_STATS_IFACE_AC 0x00000040 /** all ac statistics (within interface statistics) */ -#define WIFI_STATS_IFACE_CONTENTION 0x00000080 /** all contention (min, max, avg) statistics (within ac statisctics) */ +#define WIFI_STATS_RADIO 0x00000001 /** all radio statistics */ +#define WIFI_STATS_RADIO_CCA \ + 0x00000002 /** cca_busy_time (within radio statistics) */ +#define WIFI_STATS_RADIO_CHANNELS \ + 0x00000004 /** all channel statistics (within radio statistics) */ +#define WIFI_STATS_RADIO_SCAN \ + 0x00000008 /** all scan statistics (within radio statistics) */ +#define WIFI_STATS_IFACE 0x00000010 /** all interface statistics */ +#define WIFI_STATS_IFACE_TXRATE \ + 0x00000020 /** all tx rate statistics (within interface statistics) */ +#define WIFI_STATS_IFACE_AC \ + 0x00000040 /** all ac statistics (within interface statistics) */ +#define WIFI_STATS_IFACE_CONTENTION \ + 0x00000080 /** all contention (min, max, avg) statistics (within ac \ + statisctics) */ /** station stats */ typedef struct _sta_stats { @@ -1524,223 +1561,212 @@ typedef struct _sta_stats { /** mlan_callbacks data structure */ 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_vdll_data) (IN t_void *pmoal_handle, - IN t_u32 len, OUT t_u8 *pbuf); - /** moal_get_hw_spec_complete */ - mlan_status (*moal_get_hw_spec_complete) (IN t_void *pmoal_handle, - IN mlan_status status, - IN mlan_hw_info * phw, - IN pmlan_bss_tbl ptbl); - /** moal_init_fw_complete */ - 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); - /** moal_send_packet_complete */ - 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, + /** 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_vdll_data)(IN t_void *pmoal_handle, IN t_u32 len, + OUT t_u8 *pbuf); + /** moal_get_hw_spec_complete */ + mlan_status (*moal_get_hw_spec_complete)(IN t_void *pmoal_handle, + IN mlan_status status, + IN mlan_hw_info *phw, + IN pmlan_bss_tbl ptbl); + /** moal_init_fw_complete */ + 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); + /** moal_send_packet_complete */ + 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); + /** moal_recv_packet */ + 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); + /** moal_ioctl_complete */ + mlan_status (*moal_ioctl_complete)(IN t_void *pmoal_handle, + IN pmlan_ioctl_req pioctl_req, IN mlan_status status); - /** moal_recv_packet */ - 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); - /** moal_ioctl_complete */ - 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); - /** moal_free_mlan_buffer */ - mlan_status (*moal_free_mlan_buffer) (IN t_void *pmoal_handle, - IN pmlan_buffer pmbuf); + /** moal_alloc_mlan_buffer */ + 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); #ifdef USB - /** moal_write_data_async */ - mlan_status (*moal_write_data_async) (IN t_void *pmoal_handle, - IN pmlan_buffer pmbuf, - IN t_u32 port); -#endif /* USB */ -#if defined(SDIO) || defined(PCIE) - /** moal_write_reg */ - 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); -#endif /* SDIO || PCIE */ - /** moal_write_data_sync */ - mlan_status (*moal_write_data_sync) (IN t_void *pmoal_handle, + /** moal_write_data_async */ + mlan_status (*moal_write_data_async)(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); +#endif /* USB */ +#if defined(SDIO) || defined(PCIE) + /** moal_write_reg */ + 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); +#endif /* SDIO || PCIE */ + /** 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); - /** moal_malloc */ - 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); - /** moal_vmalloc */ - 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); + /** 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); + /** moal_malloc */ + 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); + /** moal_vmalloc */ + 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); #ifdef PCIE - /** moal_malloc_consistent */ - mlan_status (*moal_malloc_consistent) (IN t_void *pmoal_handle, - IN t_u32 size, - OUT t_u8 **ppbuf, - OUT t_u64 *pbuf_pa); - /** moal_mfree_consistent */ - mlan_status (*moal_mfree_consistent) (IN t_void *pmoal_handle, - IN t_u32 size, - IN t_u8 *pbuf, IN t_u64 buf_pa); - /** moal_map_memory */ - mlan_status (*moal_map_memory) (IN t_void *pmoal_handle, - IN t_u8 *pbuf, - OUT t_u64 *pbuf_pa, - IN t_u32 size, IN t_u32 flag); - /** moal_unmap_memory */ - mlan_status (*moal_unmap_memory) (IN t_void *pmoal_handle, - IN t_u8 *pbuf, - IN t_u64 buf_pa, - IN t_u32 size, IN t_u32 flag); -#endif /* PCIE */ - /** moal_memset */ - 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, + /** moal_malloc_consistent */ + mlan_status (*moal_malloc_consistent)(IN t_void *pmoal_handle, + IN t_u32 size, OUT t_u8 **ppbuf, + OUT t_u64 *pbuf_pa); + /** moal_mfree_consistent */ + mlan_status (*moal_mfree_consistent)(IN t_void *pmoal_handle, + IN t_u32 size, IN t_u8 *pbuf, + IN t_u64 buf_pa); + /** moal_map_memory */ + mlan_status (*moal_map_memory)(IN t_void *pmoal_handle, IN t_u8 *pbuf, + OUT t_u64 *pbuf_pa, IN t_u32 size, + IN t_u32 flag); + /** moal_unmap_memory */ + mlan_status (*moal_unmap_memory)(IN t_void *pmoal_handle, IN t_u8 *pbuf, + IN t_u64 buf_pa, IN t_u32 size, + IN t_u32 flag); +#endif /* PCIE */ + /** moal_memset */ + 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); + /** moal_memcpy_ext */ + t_void *(*moal_memcpy_ext)(IN t_void *pmoal_handle, IN t_void *pdest, + IN const t_void *psrc, IN t_u32 num, + IN t_u32 dest_size); + /** moal_memmove */ + t_void *(*moal_memmove)(IN t_void *pmoal_handle, IN t_void *pdest, IN const t_void *psrc, IN t_u32 num); - /** moal_memcpy_ext */ - t_void *(*moal_memcpy_ext) (IN t_void *pmoal_handle, - IN t_void *pdest, - IN const t_void *psrc, - IN t_u32 num, IN t_u32 dest_size); - /** moal_memmove */ - 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); - /** moal_udelay */ - t_void (*moal_udelay) (IN t_void *pmoal_handle, IN t_u32 udelay); - /** moal_get_boot_ktime */ - mlan_status (*moal_get_boot_ktime) (IN t_void *pmoal_handle, - OUT t_u64 *pnsec); - /** moal_get_system_time */ - 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); - /** moal_free_timer */ - 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); - /** moal_stop_timer*/ - 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); - /** moal_free_lock */ - 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); - /** moal_spin_unlock */ - 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 ... - ); - /** moal_print_netintf */ - 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); + /** 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); + /** moal_udelay */ + t_void (*moal_udelay)(IN t_void *pmoal_handle, IN t_u32 udelay); + /** moal_get_boot_ktime */ + mlan_status (*moal_get_boot_ktime)(IN t_void *pmoal_handle, + OUT t_u64 *pnsec); + /** moal_get_system_time */ + 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); + /** moal_free_timer */ + 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); + /** moal_stop_timer*/ + 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); + /** moal_free_lock */ + 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); + /** moal_spin_unlock */ + 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...); + /** moal_print_netintf */ + 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); - /** moal_hist_data_add */ - t_void (*moal_hist_data_add) (IN t_void *pmoal_handle, - IN t_u32 bss_index, - IN t_u16 rx_rate, - IN t_s8 snr, - IN t_s8 nflr, IN t_u8 antenna); + /** moal_hist_data_add */ + t_void (*moal_hist_data_add)(IN t_void *pmoal_handle, + IN t_u32 bss_index, IN t_u16 rx_rate, + IN t_s8 snr, IN t_s8 nflr, + IN t_u8 antenna); #if defined(DRV_EMBEDDED_AUTHENTICATOR) || defined(DRV_EMBEDDED_SUPPLICANT) - mlan_status (*moal_wait_hostcmd_complete) (IN t_void *pmoal_handle, - IN t_u32 bss_index); - mlan_status (*moal_notify_hostcmd_complete) (IN t_void *pmoal_handle, - IN t_u32 bss_index); + mlan_status (*moal_wait_hostcmd_complete)(IN t_void *pmoal_handle, + IN t_u32 bss_index); + mlan_status (*moal_notify_hostcmd_complete)(IN t_void *pmoal_handle, + IN t_u32 bss_index); #endif } mlan_callbacks, *pmlan_callbacks; /** Parameter unchanged, use MLAN default setting */ -#define ROBUSTCOEX_GPIO_UNCHANGED 0 +#define ROBUSTCOEX_GPIO_UNCHANGED 0 /** Parameter enabled, override MLAN default setting */ -#define ROBUSTCOEX_GPIO_CFG 1 +#define ROBUSTCOEX_GPIO_CFG 1 #if defined(SDIO) /** Interrupt Mode SDIO */ -#define INT_MODE_SDIO 0 +#define INT_MODE_SDIO 0 /** Interrupt Mode GPIO */ -#define INT_MODE_GPIO 1 -/** New mode: GPIO-1 as a duplicated signal of interrupt as appear of SDIO_DAT1 */ -#define GPIO_INT_NEW_MODE 255 +#define INT_MODE_GPIO 1 +/** New mode: GPIO-1 as a duplicated signal of interrupt as appear of SDIO_DAT1 + */ +#define GPIO_INT_NEW_MODE 255 #endif /** Parameter unchanged, use MLAN default setting */ -#define MLAN_INIT_PARA_UNCHANGED 0 +#define MLAN_INIT_PARA_UNCHANGED 0 /** Parameter enabled, override MLAN default setting */ -#define MLAN_INIT_PARA_ENABLED 1 +#define MLAN_INIT_PARA_ENABLED 1 /** Parameter disabled, override MLAN default setting */ -#define MLAN_INIT_PARA_DISABLED 2 +#define MLAN_INIT_PARA_DISABLED 2 /** Control bit for stream 2X2 */ -#define FEATURE_CTRL_STREAM_2X2 MBIT(0) +#define FEATURE_CTRL_STREAM_2X2 MBIT(0) /** Control bit for DFS support */ -#define FEATURE_CTRL_DFS_SUPPORT MBIT(1) +#define FEATURE_CTRL_DFS_SUPPORT MBIT(1) #ifdef USB /** Control bit for winner check & not wait for FW ready event */ -#define FEATURE_CTRL_USB_NEW_INIT MBIT(2) +#define FEATURE_CTRL_USB_NEW_INIT MBIT(2) #endif /** Default feature control */ -#define FEATURE_CTRL_DEFAULT 0xffffffff +#define FEATURE_CTRL_DEFAULT 0xffffffff /** Check if stream 2X2 enabled */ -#define IS_STREAM_2X2(x) ((x) & FEATURE_CTRL_STREAM_2X2) +#define IS_STREAM_2X2(x) ((x)&FEATURE_CTRL_STREAM_2X2) /** Check if DFS support enabled */ -#define IS_DFS_SUPPORT(x) ((x) & FEATURE_CTRL_DFS_SUPPORT) +#define IS_DFS_SUPPORT(x) ((x)&FEATURE_CTRL_DFS_SUPPORT) #ifdef USB /** Check if winner check & not wait for FW ready event */ -#define IS_USB_NEW_INIT(x) ((x) & FEATURE_CTRL_USB_NEW_INIT) +#define IS_USB_NEW_INIT(x) ((x)&FEATURE_CTRL_USB_NEW_INIT) #endif /* @@ -1748,35 +1774,35 @@ typedef struct _mlan_callbacks { #define DRV_MODE_11P MBIT(5) #define DRV_MODE_MAC80211 MBIT(6) #define DRV_MODE_DFS MBIT(7)*/ -#define DRV_MODE_MASK (MBIT(4)|MBIT(5)|MBIT(6)|MBIT(7)) +#define DRV_MODE_MASK (MBIT(4) | MBIT(5) | MBIT(6) | MBIT(7)) /** mlan_device data structure */ typedef struct _mlan_device { - /** MOAL Handle */ + /** MOAL Handle */ t_void *pmoal_handle; - /** BSS Attributes */ + /** BSS Attributes */ mlan_bss_attr bss_attr[MLAN_MAX_BSS_NUM]; - /** Callbacks */ + /** Callbacks */ mlan_callbacks callbacks; #ifdef MFG_CMD_SUPPORT - /** MFG mode */ + /** MFG mode */ t_u32 mfg_mode; #endif #if defined(SDIO) - /** SDIO interrupt mode (0: INT_MODE_SDIO, 1: INT_MODE_GPIO) */ + /** SDIO interrupt mode (0: INT_MODE_SDIO, 1: INT_MODE_GPIO) */ t_u32 int_mode; - /** GPIO interrupt pin number */ + /** GPIO interrupt pin number */ t_u32 gpio_pin; #endif #ifdef DEBUG_LEVEL1 - /** Driver debug bit masks */ + /** Driver debug bit masks */ t_u32 drvdbg; #endif - /** allocate fixed buffer size for scan beacon buffer*/ + /** allocate fixed buffer size for scan beacon buffer*/ t_u32 fixed_beacon_buffer; - /** SDIO MPA Tx */ + /** SDIO MPA Tx */ t_u32 mpa_tx_cfg; - /** SDIO MPA Rx */ + /** SDIO MPA Rx */ t_u32 mpa_rx_cfg; #ifdef SDIO /** SDIO Single port rx aggr */ @@ -1786,57 +1812,59 @@ typedef struct _mlan_device { /* see blk_queue_max_segments */ t_u16 max_segs; #endif - /** Auto deep sleep */ + /** Auto deep sleep */ t_u32 auto_ds; - /** IEEE PS mode */ + /** IEEE PS mode */ t_u32 ps_mode; - /** Max Tx buffer size */ + /** Max Tx buffer size */ t_u32 max_tx_buf; #if defined(STA_SUPPORT) - /** 802.11d configuration */ + /** 802.11d configuration */ t_u32 cfg_11d; #endif - /** Feature control bitmask */ + /** Feature control bitmask */ t_u32 feature_control; - /** enable/disable rx work */ + /** enable/disable rx work */ t_u8 rx_work; - /** dev cap mask */ + /** dev cap mask */ t_u32 dev_cap_mask; - /** oob independent reset */ + /** oob independent reset */ t_u32 indrstcfg; - /** dtim interval */ + /** dtim interval */ t_u16 multi_dtim; - /** IEEE ps inactivity timeout value */ + /** IEEE ps inactivity timeout value */ t_u16 inact_tmo; /** card type */ t_u16 card_type; - /** card rev */ + /** card rev */ t_u8 card_rev; - /** Host sleep wakeup interval */ + /** Host sleep wakeup interval */ t_u32 hs_wake_interval; - /** GPIO to indicate wakeup source */ + /** GPIO to indicate wakeup source */ t_u8 indication_gpio; - /** Dynamic MIMO-SISO switch for hscfg*/ + /** Dynamic MIMO-SISO switch for hscfg*/ t_u8 hs_mimo_switch; #ifdef USB - /** Tx CMD endpoint address */ + /** Tx CMD endpoint address */ t_u8 tx_cmd_ep; - /** Rx CMD/EVT endpoint address */ + /** Rx CMD/EVT endpoint address */ t_u8 rx_cmd_ep; - /** Rx data endpoint address */ + /** Rx data endpoint address */ t_u8 rx_data_ep; - /** Tx data endpoint address */ + /** Tx data endpoint address */ t_u8 tx_data_ep; #endif - /** fw region */ + /** fw region */ t_bool fw_region; - /** passive to active scan */ + /** passive to active scan */ t_u8 passive_to_active_scan; - /** uap max supported station per chip */ + /** uap max supported station per chip */ t_u8 uap_max_sta; - /** drv mode */ + /** drv mode */ t_u32 drv_mode; + /** dfs w53 cfg */ + t_u8 dfs53cfg; } mlan_device, *pmlan_device; /** MLAN API function prototype */ @@ -1847,8 +1875,7 @@ MLAN_API mlan_status mlan_register(IN pmlan_device pmdevice, OUT t_void **ppmlan_adapter); /** Un-registration */ -MLAN_API mlan_status mlan_unregister(IN t_void *pmlan_adapter - ); +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, @@ -1859,16 +1886,13 @@ MLAN_API mlan_status mlan_set_init_param(IN t_void *pmlan_adapter, IN pmlan_init_param pparam); /** Firmware Initialization */ -MLAN_API mlan_status mlan_init_fw(IN t_void *pmlan_adapter - ); +MLAN_API mlan_status mlan_init_fw(IN t_void *pmlan_adapter); /** Firmware Shutdown */ -MLAN_API mlan_status mlan_shutdown_fw(IN t_void *pmlan_adapter - ); +MLAN_API mlan_status mlan_shutdown_fw(IN t_void *pmlan_adapter); /** Main Process */ -MLAN_API mlan_status mlan_main_process(IN t_void *pmlan_adapter - ); +MLAN_API mlan_status mlan_main_process(IN t_void *pmlan_adapter); /** Rx process */ mlan_status mlan_rx_process(IN t_void *pmlan_adapter, IN t_u8 *rx_pkts); @@ -1885,8 +1909,8 @@ MLAN_API mlan_status mlan_write_data_async_complete(IN t_void *pmlan_adapter, IN mlan_status status); /** Packet Reception */ -MLAN_API mlan_status mlan_recv(IN t_void *pmlan_adapter, - IN pmlan_buffer pmbuf, IN t_u32 port); +MLAN_API mlan_status mlan_recv(IN t_void *pmlan_adapter, IN pmlan_buffer pmbuf, + IN t_u32 port); #endif /* USB */ /** Packet Reception complete callback */ @@ -1916,7 +1940,7 @@ MLAN_API t_void mlan_set_int_mode(IN t_void *adapter, IN t_u32 int_mode, MLAN_API mlan_status mlan_ioctl(IN t_void *pmlan_adapter, 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); +MLAN_API t_u8 mlan_select_wmm_queue(IN t_void *pmlan_adapter, IN t_u8 bss_num, + IN t_u8 tid); #endif /* !_MLAN_DECL_H_ */ diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_fw.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_fw.h index caf4b09d83fb..063933d81a73 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_fw.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_fw.h @@ -32,13 +32,13 @@ Change log: /** Interface header length */ #ifdef USB -#define USB_INTF_HEADER_LEN 0 +#define USB_INTF_HEADER_LEN 0 #endif /* USB */ #ifdef SDIO -#define SDIO_INTF_HEADER_LEN 4 +#define SDIO_INTF_HEADER_LEN 4 #endif /* SDIO */ #ifdef PCIE -#define PCIE_INTF_HEADER_LEN 4 +#define PCIE_INTF_HEADER_LEN 4 #endif /* PCIE */ #ifdef PRAGMA_PACK @@ -51,95 +51,99 @@ Change log: /** Ethernet header */ typedef MLAN_PACK_START struct { - /** Ethernet header destination address */ + /** Ethernet header destination address */ t_u8 dest_addr[MLAN_MAC_ADDR_LENGTH]; - /** Ethernet header source address */ + /** Ethernet header source address */ t_u8 src_addr[MLAN_MAC_ADDR_LENGTH]; - /** Ethernet header length */ + /** Ethernet header length */ t_u16 h803_len; } MLAN_PACK_END Eth803Hdr_t; /** RFC 1042 header */ typedef MLAN_PACK_START struct { - /** LLC DSAP */ + /** LLC DSAP */ t_u8 llc_dsap; - /** LLC SSAP */ + /** LLC SSAP */ t_u8 llc_ssap; - /** LLC CTRL */ + /** LLC CTRL */ t_u8 llc_ctrl; - /** SNAP OUI */ + /** SNAP OUI */ t_u8 snap_oui[3]; - /** SNAP type */ + /** SNAP type */ t_u16 snap_type; } MLAN_PACK_END Rfc1042Hdr_t; /** Rx packet header */ typedef MLAN_PACK_START struct { - /** Etherner header */ + /** Etherner header */ Eth803Hdr_t eth803_hdr; - /** RFC 1042 header */ + /** RFC 1042 header */ Rfc1042Hdr_t rfc1042_hdr; } MLAN_PACK_END RxPacketHdr_t; /** Rates supported in band B */ -#define B_SUPPORTED_RATES 5 +#define B_SUPPORTED_RATES 5 /** Rates supported in band G */ -#define G_SUPPORTED_RATES 9 +#define G_SUPPORTED_RATES 9 /** Rates supported in band BG */ -#define BG_SUPPORTED_RATES 13 +#define BG_SUPPORTED_RATES 13 /** Setup the number of rates passed in the driver/firmware API */ -#define A_SUPPORTED_RATES 9 +#define A_SUPPORTED_RATES 9 /** CapInfo Short Slot Time Disabled */ -/* #define SHORT_SLOT_TIME_DISABLED(CapInfo) ((IEEEtypes_CapInfo_t)(CapInfo).short_slot_time = 0) */ +/* #define SHORT_SLOT_TIME_DISABLED(CapInfo) + * ((IEEEtypes_CapInfo_t)(CapInfo).short_slot_time = 0) */ #define SHORT_SLOT_TIME_DISABLED(CapInfo) (CapInfo &= ~MBIT(10)) /** CapInfo Short Slot Time Enabled */ -#define SHORT_SLOT_TIME_ENABLED(CapInfo) (CapInfo |= MBIT(10)) +#define SHORT_SLOT_TIME_ENABLED(CapInfo) (CapInfo |= MBIT(10)) /** CapInfo Spectrum Mgmt Disabled */ #define SPECTRUM_MGMT_DISABLED(CapInfo) (CapInfo &= ~MBIT(8)) /** CapInfo Spectrum Mgmt Enabled */ -#define SPECTRUM_MGMT_ENABLED(CapInfo) ( CapInfo |= MBIT(8)) +#define SPECTRUM_MGMT_ENABLED(CapInfo) (CapInfo |= MBIT(8)) /** CapInfo Radio Measurement Disabled */ #define RADIO_MEASUREMENT_DISABLED(CapInfo) (CapInfo &= ~MBIT(12)) /** CapInfo Radio Measurement Enabled */ -#define RADIO_MEASUREMENT_ENABLED(CapInfo) ( CapInfo |= MBIT(12)) +#define RADIO_MEASUREMENT_ENABLED(CapInfo) (CapInfo |= MBIT(12)) /** Setup the number of rates passed in the driver/firmware API */ -#define HOSTCMD_SUPPORTED_RATES 14 +#define HOSTCMD_SUPPORTED_RATES 14 /** Rates supported in band N */ -#define N_SUPPORTED_RATES 3 +#define N_SUPPORTED_RATES 3 #ifdef STA_SUPPORT /** All bands (B, G, N, AAC, GAC) */ -#define ALL_802_11_BANDS (BAND_A | BAND_B | BAND_G | BAND_GN | BAND_AAC | BAND_GAC) +#define ALL_802_11_BANDS \ + (BAND_A | BAND_B | BAND_G | BAND_GN | BAND_AAC | BAND_GAC) #else /** All bands (B, G, A) */ -#define ALL_802_11_BANDS (BAND_B | BAND_G | BAND_A) +#define ALL_802_11_BANDS (BAND_B | BAND_G | BAND_A) #endif /* STA_SUPPORT */ #ifdef STA_SUPPORT /** Firmware multiple bands support */ -#define FW_MULTI_BANDS_SUPPORT (MBIT(8) | MBIT(9) | MBIT(10) | MBIT(11) | \ - MBIT(12) | MBIT(13)) +#define FW_MULTI_BANDS_SUPPORT \ + (MBIT(8) | MBIT(9) | MBIT(10) | MBIT(11) | MBIT(12) | MBIT(13)) #else /** Firmware multiple bands support */ -#define FW_MULTI_BANDS_SUPPORT (MBIT(8) | MBIT(9) | MBIT(10)) +#define FW_MULTI_BANDS_SUPPORT (MBIT(8) | MBIT(9) | MBIT(10)) #endif /* STA_SUPPORT */ /** Check if multiple bands support is enabled in firmware */ -#define IS_SUPPORT_MULTI_BANDS(_adapter) \ +#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 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 */ -#define GET_FW_DEFAULT_BANDS(_adapter) \ - (((((_adapter->fw_cap_info & 0x3000) << 1) | \ - (_adapter->fw_cap_info & ~0xF000)) >> 8) & ALL_802_11_BANDS) +/* 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 */ +#define GET_FW_DEFAULT_BANDS(_adapter) \ + (((((_adapter->fw_cap_info & 0x3000) << 1) | \ + (_adapter->fw_cap_info & ~0xF000)) >> \ + 8) & \ + ALL_802_11_BANDS) extern t_u8 SupportedRates_B[B_SUPPORTED_RATES]; extern t_u8 SupportedRates_G[G_SUPPORTED_RATES]; @@ -152,41 +156,41 @@ extern t_u8 AdhocRates_BG[BG_SUPPORTED_RATES]; extern t_u8 AdhocRates_A[A_SUPPORTED_RATES]; /** Default auto deep sleep mode */ -#define DEFAULT_AUTO_DS_MODE MTRUE +#define DEFAULT_AUTO_DS_MODE MTRUE /** Default power save mode */ -#define DEFAULT_PS_MODE Wlan802_11PowerModePSP +#define DEFAULT_PS_MODE Wlan802_11PowerModePSP /** WEP Key index mask */ -#define HostCmd_WEP_KEY_INDEX_MASK 0x3fff +#define HostCmd_WEP_KEY_INDEX_MASK 0x3fff /** Length of WEP 40 bit key */ -#define WEP_40_BIT_LEN 5 +#define WEP_40_BIT_LEN 5 /** Length of WEP 104 bit key */ #define WEP_104_BIT_LEN 13 /** Key information enabled */ -#define KEY_INFO_ENABLED 0x01 +#define KEY_INFO_ENABLED 0x01 /** KEY_TYPE_ID */ typedef enum _KEY_TYPE_ID { - /** Key type : WEP */ + /** Key type : WEP */ KEY_TYPE_ID_WEP = 0, - /** Key type : TKIP */ + /** Key type : TKIP */ KEY_TYPE_ID_TKIP = 1, - /** Key type : AES */ + /** Key type : AES */ KEY_TYPE_ID_AES = 2, KEY_TYPE_ID_WAPI = 3, KEY_TYPE_ID_AES_CMAC = 4, - /** Key type : GCMP */ + /** Key type : GCMP */ KEY_TYPE_ID_GCMP = 5, - /** Key type : GCMP_256 */ + /** Key type : GCMP_256 */ KEY_TYPE_ID_GCMP_256 = 6, - /** Key type : CCMP_256 */ + /** Key type : CCMP_256 */ KEY_TYPE_ID_CCMP_256 = 7, } KEY_TYPE_ID; /** Key Info flag for multicast key */ -#define KEY_INFO_MCAST_KEY 0x01 +#define KEY_INFO_MCAST_KEY 0x01 /** Key Info flag for unicast key */ -#define KEY_INFO_UCAST_KEY 0x02 +#define KEY_INFO_UCAST_KEY 0x02 /** KEY_INFO_WEP*/ typedef enum _KEY_INFO_WEP { @@ -211,16 +215,16 @@ typedef enum _KEY_INFO_AES { } KEY_INFO_AES; /** WPA AES key length */ -#define WPA_AES_KEY_LEN 16 +#define WPA_AES_KEY_LEN 16 /** WPA TKIP key length */ -#define WPA_TKIP_KEY_LEN 32 +#define WPA_TKIP_KEY_LEN 32 /** WPA AES IGTK key length */ -#define CMAC_AES_KEY_LEN 16 +#define CMAC_AES_KEY_LEN 16 /** IGTK key length */ -#define WPA_IGTK_KEY_LEN 16 +#define WPA_IGTK_KEY_LEN 16 /** WAPI key length */ -#define WAPI_KEY_LEN 50 +#define WAPI_KEY_LEN 50 /** KEY_INFO_WAPI*/ typedef enum _KEY_INFO_WAPI { KEY_INFO_WAPI_MCAST = 0x01, @@ -229,45 +233,44 @@ typedef enum _KEY_INFO_WAPI { } KEY_INFO_WAPI; /** Maximum ethernet frame length sans FCS */ -#define MV_ETH_FRAME_LEN 1514 +#define MV_ETH_FRAME_LEN 1514 #if defined(SDIO) || defined(PCIE) /** Length of SNAP header */ -#define MRVDRV_SNAP_HEADER_LEN 8 +#define MRVDRV_SNAP_HEADER_LEN 8 /** The number of times to try when polling for status bits */ -#define MAX_POLL_TRIES 100 +#define MAX_POLL_TRIES 100 /** 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 150 +#define MAX_MULTI_INTERFACE_POLL_TRIES 150 /** The number of times to try when waiting for downloaded firmware to become active. (polling the scratch register). */ -#define MAX_FIRMWARE_POLL_TRIES 100 +#define MAX_FIRMWARE_POLL_TRIES 100 /** FW fill in rx_len with extra 204 bytes */ -#define EXTRA_LEN 256 +#define EXTRA_LEN 256 /** Buffer size for ethernet Tx packets */ -#define MRVDRV_ETH_TX_PACKET_BUFFER_SIZE \ +#define MRVDRV_ETH_TX_PACKET_BUFFER_SIZE \ (MV_ETH_FRAME_LEN + sizeof(TxPD) + EXTRA_LEN) /** Buffer size for ethernet Rx packets */ -#define MRVDRV_ETH_RX_PACKET_BUFFER_SIZE \ - (MV_ETH_FRAME_LEN + sizeof(RxPD) \ - + MRVDRV_SNAP_HEADER_LEN + EXTRA_LEN) +#define MRVDRV_ETH_RX_PACKET_BUFFER_SIZE \ + (MV_ETH_FRAME_LEN + sizeof(RxPD) + MRVDRV_SNAP_HEADER_LEN + EXTRA_LEN) #endif /* SDIO || PCIE */ #ifdef SDIO /* Macros in interface module */ /** Firmware ready */ -#define SDIO_FIRMWARE_READY 0xfedc +#define SDIO_FIRMWARE_READY 0xfedc #endif /* SDIO */ #ifdef PCIE /* Macros in interface module */ /** Firmware ready */ -#define PCIE_FIRMWARE_READY 0xfedcba00 +#define PCIE_FIRMWARE_READY 0xfedcba00 #endif /** Enumeration definition*/ @@ -286,271 +289,287 @@ typedef enum _WLAN_802_11_WEP_STATUS { } WLAN_802_11_WEP_STATUS; /** SNR calculation */ -#define CAL_SNR(RSSI, NF) ((t_s16)((t_s16)(RSSI) - (t_s16)(NF))) +#define CAL_SNR(RSSI, NF) ((t_s16)((t_s16)(RSSI) - (t_s16)(NF))) /** 2K buf size */ -#define MLAN_TX_DATA_BUF_SIZE_2K 2048 +#define MLAN_TX_DATA_BUF_SIZE_2K 2048 /** Terminating TLV Type */ -#define MRVL_TERMINATE_TLV_ID 0xffff +#define MRVL_TERMINATE_TLV_ID 0xffff /** TLV type : SSID */ -#define TLV_TYPE_SSID 0x0000 +#define TLV_TYPE_SSID 0x0000 /** TLV type : Rates */ -#define TLV_TYPE_RATES 0x0001 +#define TLV_TYPE_RATES 0x0001 /** TLV type : PHY FH */ -#define TLV_TYPE_PHY_FH 0x0002 +#define TLV_TYPE_PHY_FH 0x0002 /** TLV type : PHY DS */ -#define TLV_TYPE_PHY_DS 0x0003 +#define TLV_TYPE_PHY_DS 0x0003 /** TLV type : CF */ -#define TLV_TYPE_CF 0x0004 +#define TLV_TYPE_CF 0x0004 /** TLV type : IBSS */ -#define TLV_TYPE_IBSS 0x0006 +#define TLV_TYPE_IBSS 0x0006 /** TLV type : Domain */ -#define TLV_TYPE_DOMAIN 0x0007 +#define TLV_TYPE_DOMAIN 0x0007 /** TLV type : Power constraint */ -#define TLV_TYPE_POWER_CONSTRAINT 0x0020 +#define TLV_TYPE_POWER_CONSTRAINT 0x0020 /** TLV type : Power capability */ -#define TLV_TYPE_POWER_CAPABILITY 0x0021 +#define TLV_TYPE_POWER_CAPABILITY 0x0021 -#define TLV_TYPE_HT_CAPABILITY 0x002d +#define TLV_TYPE_HT_CAPABILITY 0x002d -#define TLV_TYPE_EXTENSION_ID 0x00ff +#define TLV_TYPE_EXTENSION_ID 0x00ff /**TLV type : Host MLME Flag*/ -#define TLV_TYPE_HOST_MLME (PROPRIETARY_TLV_BASE_ID + 307) +#define TLV_TYPE_HOST_MLME (PROPRIETARY_TLV_BASE_ID + 307) /** TLV type : Vendor Specific IE */ -#define TLV_TYPE_VENDOR_SPECIFIC_IE 0x00dd +#define TLV_TYPE_VENDOR_SPECIFIC_IE 0x00dd /** 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 : 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 : SAE Password */ -#define TLV_TYPE_SAE_PASSWORD (PROPRIETARY_TLV_BASE_ID + 0x141) /* 0x0241 */ +#define TLV_TYPE_SAE_PASSWORD (PROPRIETARY_TLV_BASE_ID + 0x141) /* 0x0241 */ /** 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: key param v2 */ -#define TLV_TYPE_KEY_PARAM_V2 (PROPRIETARY_TLV_BASE_ID + 0x9C) /* 0x019C */ +#define TLV_TYPE_KEY_PARAM_V2 (PROPRIETARY_TLV_BASE_ID + 0x9C) /* 0x019C */ /** TLV type: ps params in hs */ -#define TLV_TYPE_PS_PARAMS_IN_HS (PROPRIETARY_TLV_BASE_ID + 0xB5) /* 0x01b5 */ +#define TLV_TYPE_PS_PARAMS_IN_HS (PROPRIETARY_TLV_BASE_ID + 0xB5) /* 0x01b5 */ /** 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: wake up source */ -#define TLV_TYPE_HS_WAKEUP_SOURCE_GPIO (PROPRIETARY_TLV_BASE_ID + 0x105) /* 0x0205 */ +#define TLV_TYPE_HS_WAKEUP_SOURCE_GPIO \ + (PROPRIETARY_TLV_BASE_ID + 0x105) /* 0x0205 */ /** TLV type: management filter */ -#define TLV_TYPE_MGMT_FRAME_WAKEUP (PROPRIETARY_TLV_BASE_ID + 0x116) /* 0x0216 */ +#define TLV_TYPE_MGMT_FRAME_WAKEUP \ + (PROPRIETARY_TLV_BASE_ID + 0x116) /* 0x0216 */ /** TLV type: extend wakeup source */ -#define TLV_TYPE_WAKEUP_EXTEND (PROPRIETARY_TLV_BASE_ID + 0x118) /* 0x0218 */ +#define TLV_TYPE_WAKEUP_EXTEND (PROPRIETARY_TLV_BASE_ID + 0x118) /* 0x0218 */ /** TLV type: HS antenna mode */ -#define TLV_TYPE_HS_ANTMODE (PROPRIETARY_TLV_BASE_ID + 0x119) /* 0x0219 */ +#define TLV_TYPE_HS_ANTMODE (PROPRIETARY_TLV_BASE_ID + 0x119) /* 0x0219 */ /** TLV type: robustcoex mode */ -#define TLV_TYPE_ROBUSTCOEX (PROPRIETARY_TLV_BASE_ID + 0x11B) /* 0x021B */ +#define TLV_TYPE_ROBUSTCOEX (PROPRIETARY_TLV_BASE_ID + 0x11B) /* 0x021B */ -#define TLV_TYPE_DMCS_STATUS (PROPRIETARY_TLV_BASE_ID + 0x13A) /* 0x023A */ +#define TLV_TYPE_DMCS_STATUS (PROPRIETARY_TLV_BASE_ID + 0x13A) /* 0x023A */ /** 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 ID : Management Frame */ -#define TLV_TYPE_MGMT_FRAME (PROPRIETARY_TLV_BASE_ID + 0x68) /* 0x0168 */ +#define TLV_TYPE_MGMT_FRAME (PROPRIETARY_TLV_BASE_ID + 0x68) /* 0x0168 */ /** 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 */ #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 */ /** TLV type : p2p NOA */ -#define TLV_TYPE_WIFI_DIRECT_NOA (PROPRIETARY_TLV_BASE_ID + 0x83) +#define TLV_TYPE_WIFI_DIRECT_NOA (PROPRIETARY_TLV_BASE_ID + 0x83) /** TLV type : p2p opp ps */ -#define TLV_TYPE_WIFI_DIRECT_OPP_PS (PROPRIETARY_TLV_BASE_ID + 0x84) +#define TLV_TYPE_WIFI_DIRECT_OPP_PS (PROPRIETARY_TLV_BASE_ID + 0x84) #endif /* WIFI_DIRECT_SUPPORT */ /** 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 : aggr win size */ -#define TLV_BTCOEX_WL_AGGR_WINSIZE (PROPRIETARY_TLV_BASE_ID + 0xca) +#define TLV_BTCOEX_WL_AGGR_WINSIZE (PROPRIETARY_TLV_BASE_ID + 0xca) /** TLV type : scan time */ -#define TLV_BTCOEX_WL_SCANTIME (PROPRIETARY_TLV_BASE_ID + 0Xcb) +#define TLV_BTCOEX_WL_SCANTIME (PROPRIETARY_TLV_BASE_ID + 0Xcb) /** TLV type : Ewpa_eapol_pkt */ -#define TLV_TYPE_EAPOL_PKT (PROPRIETARY_TLV_BASE_ID + 0xcf) +#define TLV_TYPE_EAPOL_PKT (PROPRIETARY_TLV_BASE_ID + 0xcf) -#define TLV_TYPE_COALESCE_RULE (PROPRIETARY_TLV_BASE_ID + 0x9a) +#define TLV_TYPE_COALESCE_RULE (PROPRIETARY_TLV_BASE_ID + 0x9a) /** TLV type : EES Configuration */ -#define TLV_TYPE_EES_CFG (PROPRIETARY_TLV_BASE_ID + 0xda) +#define TLV_TYPE_EES_CFG (PROPRIETARY_TLV_BASE_ID + 0xda) /** TLV type : EES Network Configuration */ -#define TLV_TYPE_EES_NET_CFG (PROPRIETARY_TLV_BASE_ID + 0xdb) +#define TLV_TYPE_EES_NET_CFG (PROPRIETARY_TLV_BASE_ID + 0xdb) -#define TLV_TYPE_LL_STAT_IFACE (PROPRIETARY_TLV_BASE_ID + 300) -#define TLV_TYPE_LL_STAT_RADIO (PROPRIETARY_TLV_BASE_ID + 301) +#define TLV_TYPE_LL_STAT_IFACE (PROPRIETARY_TLV_BASE_ID + 300) +#define TLV_TYPE_LL_STAT_RADIO (PROPRIETARY_TLV_BASE_ID + 301) /** TLV type: fw cap info */ -#define TLV_TYPE_FW_CAP_INFO (PROPRIETARY_TLV_BASE_ID + 318) +#define TLV_TYPE_FW_CAP_INFO (PROPRIETARY_TLV_BASE_ID + 318) /** ADDBA TID mask */ -#define ADDBA_TID_MASK (MBIT(2) | MBIT(3) | MBIT(4) | MBIT(5)) +#define ADDBA_TID_MASK (MBIT(2) | MBIT(3) | MBIT(4) | MBIT(5)) /** DELBA TID mask */ -#define DELBA_TID_MASK (MBIT(12) | MBIT(13) | MBIT(14) | MBIT(15)) +#define DELBA_TID_MASK (MBIT(12) | MBIT(13) | MBIT(14) | MBIT(15)) /** ADDBA Starting Sequence Number Mask */ -#define SSN_MASK 0xfff0 +#define SSN_MASK 0xfff0 /** Block Ack result status */ /** Block Ack Result : Success */ -#define BA_RESULT_SUCCESS 0x0 +#define BA_RESULT_SUCCESS 0x0 /** Block Ack Result : Execution failure */ -#define BA_RESULT_FAILURE 0x1 +#define BA_RESULT_FAILURE 0x1 /** Block Ack Result : Timeout */ -#define BA_RESULT_TIMEOUT 0x2 +#define BA_RESULT_TIMEOUT 0x2 /** Block Ack Result : Data invalid */ -#define BA_RESULT_DATA_INVALID 0x3 +#define BA_RESULT_DATA_INVALID 0x3 /** Get the baStatus (NOT_SETUP, COMPLETE, IN_PROGRESS) * in Tx BA stream table */ -#define IS_BASTREAM_SETUP(ptr) (ptr->ba_status) +#define IS_BASTREAM_SETUP(ptr) (ptr->ba_status) /** An AMPDU/AMSDU could be disallowed for certain TID. 0xff means * no aggregation is enabled for the assigned TID */ -#define BA_STREAM_NOT_ALLOWED 0xff +#define BA_STREAM_NOT_ALLOWED 0xff #ifdef STA_SUPPORT #endif /** Test if 11n is enabled by checking the HTCap IE */ -#define IS_11N_ENABLED(priv) ((priv->config_bands & BAND_GN || priv->config_bands & BAND_AN) \ - && priv->curr_bss_params.bss_descriptor.pht_cap && !priv->curr_bss_params.bss_descriptor.disable_11n) +#define IS_11N_ENABLED(priv) \ + ((priv->config_bands & BAND_GN || priv->config_bands & BAND_AN) && \ + priv->curr_bss_params.bss_descriptor.pht_cap && \ + !priv->curr_bss_params.bss_descriptor.disable_11n) /** Find out if we are the initiator or not */ -#define INITIATOR_BIT(DelBAParamSet) (((DelBAParamSet) & \ - MBIT(DELBA_INITIATOR_POS)) >> DELBA_INITIATOR_POS) +#define INITIATOR_BIT(DelBAParamSet) \ + (((DelBAParamSet)&MBIT(DELBA_INITIATOR_POS)) >> DELBA_INITIATOR_POS) /** 4K buf size */ -#define MLAN_TX_DATA_BUF_SIZE_4K 4096 +#define MLAN_TX_DATA_BUF_SIZE_4K 4096 /** 8K buf size */ -#define MLAN_TX_DATA_BUF_SIZE_8K 8192 +#define MLAN_TX_DATA_BUF_SIZE_8K 8192 /** 12K buf size */ -#define MLAN_TX_DATA_BUF_SIZE_12K 12288 +#define MLAN_TX_DATA_BUF_SIZE_12K 12288 /** Max Rx AMPDU Size */ -#define MAX_RX_AMPDU_SIZE_64K 0x03 +#define MAX_RX_AMPDU_SIZE_64K 0x03 /** Non green field station */ -#define NON_GREENFIELD_STAS 0x04 +#define NON_GREENFIELD_STAS 0x04 /** Greenfield support */ -#define HWSPEC_GREENFIELD_SUPP MBIT(29) +#define HWSPEC_GREENFIELD_SUPP MBIT(29) /** RX STBC support */ -#define HWSPEC_RXSTBC_SUPP MBIT(26) +#define HWSPEC_RXSTBC_SUPP MBIT(26) /** ShortGI @ 40Mhz support */ -#define HWSPEC_SHORTGI40_SUPP MBIT(24) +#define HWSPEC_SHORTGI40_SUPP MBIT(24) /** ShortGI @ 20Mhz support */ -#define HWSPEC_SHORTGI20_SUPP MBIT(23) +#define HWSPEC_SHORTGI20_SUPP MBIT(23) /** RX LDPC support */ -#define HWSPEC_LDPC_SUPP MBIT(22) +#define HWSPEC_LDPC_SUPP MBIT(22) /** Channel width 40Mhz support */ -#define HWSPEC_CHANBW40_SUPP MBIT(17) +#define HWSPEC_CHANBW40_SUPP MBIT(17) /** 40Mhz intolarent enable */ #define CAPINFO_40MHZ_INTOLARENT MBIT(8) /** Default 11n capability mask for 2.4GHz */ -#define DEFAULT_11N_CAP_MASK_BG (HWSPEC_SHORTGI20_SUPP | HWSPEC_RXSTBC_SUPP | HWSPEC_LDPC_SUPP) +#define DEFAULT_11N_CAP_MASK_BG \ + (HWSPEC_SHORTGI20_SUPP | HWSPEC_RXSTBC_SUPP | HWSPEC_LDPC_SUPP) /** Default 11n capability mask for 5GHz */ -#define DEFAULT_11N_CAP_MASK_A (HWSPEC_CHANBW40_SUPP | HWSPEC_SHORTGI20_SUPP | \ - HWSPEC_SHORTGI40_SUPP | HWSPEC_RXSTBC_SUPP | HWSPEC_LDPC_SUPP) +#define DEFAULT_11N_CAP_MASK_A \ + (HWSPEC_CHANBW40_SUPP | HWSPEC_SHORTGI20_SUPP | \ + HWSPEC_SHORTGI40_SUPP | HWSPEC_RXSTBC_SUPP | HWSPEC_LDPC_SUPP) /** Default 11n TX BF capability 2X2 chip **/ -#define DEFAULT_11N_TX_BF_CAP_2X2 0x19E74618 +#define DEFAULT_11N_TX_BF_CAP_2X2 0x19E74618 /** Default 11n TX BF capability 1X1 chip **/ -#define DEFAULT_11N_TX_BF_CAP_1X1 0x19E74608 +#define DEFAULT_11N_TX_BF_CAP_1X1 0x19E74608 /** Bits to ignore in hw_dev_cap as these bits are set in get_hw_spec */ -#define IGN_HW_DEV_CAP (CAPINFO_40MHZ_INTOLARENT) +#define IGN_HW_DEV_CAP (CAPINFO_40MHZ_INTOLARENT) /** HW_SPEC FwCapInfo */ #define ISSUPP_11NENABLED(FwCapInfo) (FwCapInfo & MBIT(11)) @@ -691,19 +710,20 @@ typedef enum _WLAN_802_11_WEP_STATUS { /** Set mcs set defined bit */ #define SETHT_MCS_SET_DEFINED(x) (x[12] |= 1) /** Set the highest Rx data rate */ -#define SETHT_RX_HIGHEST_DT_SUPP(x, y) ((*(t_u16 *) (x + 10)) = y) +#define SETHT_RX_HIGHEST_DT_SUPP(x, y) ((*(t_u16 *)(x + 10)) = y) /** AMPDU factor size */ -#define AMPDU_FACTOR_64K 0x03 +#define AMPDU_FACTOR_64K 0x03 /** Set AMPDU size in A-MPDU paramter field */ -#define SETAMPDU_SIZE(x, y) do { \ - x = x & ~0x03; \ - x |= y & 0x03; \ -} while (0) \ -/** Set AMPDU spacing in A-MPDU paramter field */ -#define SETAMPDU_SPACING(x, y) do { \ - x = x & ~0x1c; \ - x |= (y & 0x07) << 2; \ -} while (0) \ +#define SETAMPDU_SIZE(x, y) \ + do { \ + x = x & ~0x03; \ + x |= y & 0x03; \ + } while (0) /** Set AMPDU spacing in A-MPDU paramter field */ +#define SETAMPDU_SPACING(x, y) \ + do { \ + x = x & ~0x1c; \ + x |= (y & 0x07) << 2; \ + } while (0) /** RadioType : Support for Band A */ #define ISSUPP_BANDA(FwCapInfo) (FwCapInfo & MBIT(10)) @@ -740,7 +760,8 @@ typedef enum _WLAN_802_11_WEP_STATUS { /** ExtCap : Set support TDLS CHANNEL SWITCH */ #define SET_EXTCAP_TDLS_CHAN_SWITCH(ext_cap) (ext_cap.TDLSChannelSwitching = 1) /** ExtCap : Reset support TDLS CHANNEL SWITCH */ -#define RESET_EXTCAP_TDLS_CHAN_SWITCH(ext_cap) (ext_cap.TDLSChannelSwitching = 0) +#define RESET_EXTCAP_TDLS_CHAN_SWITCH(ext_cap) \ + (ext_cap.TDLSChannelSwitching = 0) /** ExtCap : Set support Multi BSSID */ #define SET_EXTCAP_MULTI_BSSID(ext_cap) (ext_cap.MultipleBSSID = 1) /** ExtCap : Support for Interworking */ @@ -773,14 +794,16 @@ typedef enum _WLAN_802_11_WEP_STATUS { /** ExtCap : Set support TDLS wider bandwidth */ #define SET_EXTCAP_TDLS_WIDER_BANDWIDTH(ext_cap) (ext_cap.TDLSWildBandwidth = 1) /** ExtCap : Reset support TDLS wider bandwidth */ -#define RESET_EXTCAP_TDLS_WIDER_BANDWIDTH(ext_cap) (ext_cap.TDLSWildBandwidth = 0) +#define RESET_EXTCAP_TDLS_WIDER_BANDWIDTH(ext_cap) \ + (ext_cap.TDLSWildBandwidth = 0) /** ExtCap : Support for extend channel switch */ #define ISSUPP_EXTCAP_EXT_CHANNEL_SWITCH(ext_cap) (ext_cap.ExtChanSwitching) /** ExtCap : Set support Ext Channel Switch */ #define SET_EXTCAP_EXT_CHANNEL_SWITCH(ext_cap) (ext_cap.ExtChanSwitching = 1) /** ExtCap: Set Timing Measurement */ -#define SET_EXTCAP_EXT_TIMING_MEASUREMENT(ext_cap) (ext_cap.TimingMeasurement = 1) +#define SET_EXTCAP_EXT_TIMING_MEASUREMENT(ext_cap) \ + (ext_cap.TimingMeasurement = 1) /** ExtCap : Reset support Ext Channel Switch */ #define RESET_EXTCAP_EXT_CHANNEL_SWITCH(ext_cap) (ext_cap.ExtChanSwitching = 0) @@ -792,18 +815,18 @@ typedef enum _WLAN_802_11_WEP_STATUS { #define RESET_EXTCAP_TWT_REQ(ext_cap) (ext_cap.TWTReq = 0) /** LLC/SNAP header len */ -#define LLC_SNAP_LEN 8 +#define LLC_SNAP_LEN 8 /** bandwidth following HTCAP */ -#define BW_FOLLOW_HTCAP 0 +#define BW_FOLLOW_HTCAP 0 /** bandwidth following VHTCAP */ -#define BW_FOLLOW_VHTCAP 1 +#define BW_FOLLOW_VHTCAP 1 /** HW_SPEC FwCapInfo */ -#define HWSPEC_11ACSGI80_SUPP MBIT(5) -#define HWSPEC_11ACRXSTBC_SUPP MBIT(8) +#define HWSPEC_11ACSGI80_SUPP MBIT(5) +#define HWSPEC_11ACRXSTBC_SUPP MBIT(8) -#define ISSUPP_11ACENABLED(FwCapInfo) (FwCapInfo & (MBIT(12)|MBIT(13))) +#define ISSUPP_11ACENABLED(FwCapInfo) (FwCapInfo & (MBIT(12) | MBIT(13))) #define ISSUPP_11AC2GENABLED(FwCapInfo) (FwCapInfo & MBIT(12)) #define ISSUPP_11AC5GENABLED(FwCapInfo) (FwCapInfo & MBIT(13)) @@ -838,17 +861,23 @@ typedef enum _WLAN_802_11_WEP_STATUS { /** Set VHT Cap Info: Max MPDU length */ #define SET_VHTCAP_MAXMPDULEN(VHTCapInfo, value) (VHTCapInfo |= (value & 0x03)) /** SET VHT CapInfo: Supported Channel Width SET (2 bits)*/ -#define SET_VHTCAP_CHWDSET(VHTCapInfo, value) (VHTCapInfo |= ((value & 0x3) << 2)) +#define SET_VHTCAP_CHWDSET(VHTCapInfo, value) \ + (VHTCapInfo |= ((value & 0x3) << 2)) /** SET VHT CapInfo: Rx STBC (3 bits) */ -#define SET_VHTCAP_RXSTBC(VHTCapInfo, value) (VHTCapInfo |= ((value & 0x7) << 8)) +#define SET_VHTCAP_RXSTBC(VHTCapInfo, value) \ + (VHTCapInfo |= ((value & 0x7) << 8)) /** SET VHT CapInfo: Commpressed Steering Num of BFer Ant Supported (3 bits) */ -#define SET_VHTCAP_SNBFERANT(VHTCapInfo, value) (VHTCapInfo |= ((value & 0x7) << 13)) +#define SET_VHTCAP_SNBFERANT(VHTCapInfo, value) \ + (VHTCapInfo |= ((value & 0x7) << 13)) /** SET VHT CapInfo: Num of Sounding Dimensions (3 bits) */ -#define SET_VHTCAP_NUMSNDDM(VHTCapInfo, value) (VHTCapInfo |= ((value & 0x7) << 16)) +#define SET_VHTCAP_NUMSNDDM(VHTCapInfo, value) \ + (VHTCapInfo |= ((value & 0x7) << 16)) /** SET VHT CapInfo: Max AMPDU Length Exponent (3 bits) */ -#define SET_VHTCAP_MAXAMPDULENEXP(VHTCapInfo, value) (VHTCapInfo |= ((value & 0x7) << 23)) +#define SET_VHTCAP_MAXAMPDULENEXP(VHTCapInfo, value) \ + (VHTCapInfo |= ((value & 0x7) << 23)) /** SET VHT CapInfo: VHT Link Adaptation Capable (2 bits) */ -#define SET_VHTCAP_LINKADPCAP(VHTCapInfo, value) (VHTCapInfo |= ((value & 0x3) << 26)) +#define SET_VHTCAP_LINKADPCAP(VHTCapInfo, value) \ + (VHTCapInfo |= ((value & 0x3) << 26)) /** HW_SPEC Dot11acDevCap : ReSet VHT Link Adapation Capable */ #define RESET_11ACVHTLINKCAPA(Dot11acDevCap, value) (Dot11acDevCap &= ~(0x03)) @@ -865,7 +894,7 @@ typedef enum _WLAN_802_11_WEP_STATUS { /** HW_SPEC Dot11acDevCap : ReSet Number of Sounding Dimensions */ #define RESET_11ACSOUNDINGNUM(Dot11acDevCap) (Dot11acDevCap &= ~((0x07) << 16)) /** HW_SPEC Dot11acDevCap : ReSet Compressed Steering Number - * of Beamformer Antenna */ + * of Beamformer Antenna */ #define RESET_11ACBFANTNUM(Dot11acDevCap) (Dot11acDevCap &= ~((0x07) << 13)) /** HW_SPEC Dot11acDevCap : ReSet support of SU Beamformee */ #define RESET_11ACSUBEAMFORMEE(Dot11acDevCap) (Dot11acDevCap &= ~MBIT(12)) @@ -882,609 +911,644 @@ typedef enum _WLAN_802_11_WEP_STATUS { /** HW_SPEC Dot11acDevCap : ReSet support of LDPC coding */ #define RESET_11ACLDPC(Dot11acDevCap) (Dot11acDevCap &= ~MBIT(4)) /** HW_SPEC Dot11acDevCap : ReSet support of - * Channel BW 20/40/80/160/80+80 MHz */ + * Channel BW 20/40/80/160/80+80 MHz */ #define RESET_11ACBW8080(Dot11acDevCap) (Dot11acDevCap &= ~MBIT(3)) /** HW_SPEC Dot11acDevCap : ReSet support of - * Channel BW 20/40/80/160 MHz */ + * Channel BW 20/40/80/160 MHz */ #define RESET_11ACBW160(Dot11acDevCap) (Dot11acDevCap &= ~MBIT(2)) /** HW_SPEC Dot11acDevCap : ReSet Max MPDU length */ #define RESET_11ACMAXMPDULEN(Dot11acDevCap) (Dot11acDevCap &= ~(0x03)) /** Default 11ac capability mask for 2.4GHz */ -#define DEFAULT_11AC_CAP_MASK_BG (HWSPEC_11ACSGI80_SUPP | HWSPEC_11ACRXSTBC_SUPP) +#define DEFAULT_11AC_CAP_MASK_BG \ + (HWSPEC_11ACSGI80_SUPP | HWSPEC_11ACRXSTBC_SUPP) /** Default 11ac capability mask for 5GHz */ -#define DEFAULT_11AC_CAP_MASK_A (HWSPEC_11ACSGI80_SUPP | HWSPEC_11ACRXSTBC_SUPP) +#define DEFAULT_11AC_CAP_MASK_A (HWSPEC_11ACSGI80_SUPP | HWSPEC_11ACRXSTBC_SUPP) /** GET VHT CapInfo : MAX MPDU Length */ #define GET_VHTCAP_MAXMPDULEN(VHTCapInfo) (VHTCapInfo & 0x3) /** GET VHT CapInfo: Supported Channel Width SET (2 bits)*/ -#define GET_VHTCAP_CHWDSET(VHTCapInfo) ((VHTCapInfo >> 2) & 0x3) +#define GET_VHTCAP_CHWDSET(VHTCapInfo) ((VHTCapInfo >> 2) & 0x3) /** GET VHT CapInfo: Rx STBC (3 bits) */ -#define GET_VHTCAP_RXSTBC(VHTCapInfo) ((VHTCapInfo >> 8) & 0x7) +#define GET_VHTCAP_RXSTBC(VHTCapInfo) ((VHTCapInfo >> 8) & 0x7) /** GET VHT CapInfo: Compressed Steering Num of BFer Ant Supported (3 bits) */ -#define GET_VHTCAP_SNBFERANT(VHTCapInfo) ((VHTCapInfo >> 13) & 0x7) +#define GET_VHTCAP_SNBFERANT(VHTCapInfo) ((VHTCapInfo >> 13) & 0x7) /** GET VHT CapInfo: Num of Sounding Dimensions (3 bits) */ -#define GET_VHTCAP_NUMSNDDM(VHTCapInfo) ((VHTCapInfo >> 16) & 0x7) +#define GET_VHTCAP_NUMSNDDM(VHTCapInfo) ((VHTCapInfo >> 16) & 0x7) /** GET VHT CapInfo: Max AMPDU Length Exponent (3 bits) */ -#define GET_VHTCAP_MAXAMPDULENEXP(VHTCapInfo) ((VHTCapInfo >> 23) & 0x7) +#define GET_VHTCAP_MAXAMPDULENEXP(VHTCapInfo) ((VHTCapInfo >> 23) & 0x7) /** GET VHT CapInfo: VHT Link Adaptation Capable (2 bits) */ -#define GET_VHTCAP_LINKADPCAP(VHTCapInfo) ((VHTCapInfo >> 26) & 0x3) +#define GET_VHTCAP_LINKADPCAP(VHTCapInfo) ((VHTCapInfo >> 26) & 0x3) /**SET OPERATING MODE:Channel Width:80M*/ -#define SET_OPER_MODE_80M(oper_mode) (oper_mode = (oper_mode & ~MBIT(0))| MBIT(1)) +#define SET_OPER_MODE_80M(oper_mode) \ + (oper_mode = (oper_mode & ~MBIT(0)) | MBIT(1)) /**SET OPERATING MODE:Channel Width:40M*/ -#define SET_OPER_MODE_40M(oper_mode) (oper_mode = (oper_mode & ~MBIT(1))| MBIT(0)) +#define SET_OPER_MODE_40M(oper_mode) \ + (oper_mode = (oper_mode & ~MBIT(1)) | MBIT(0)) /**SET OPERATING MODE:Channel Width:20M*/ -#define SET_OPER_MODE_20M(oper_mode) (oper_mode &= ~(0x03)) +#define SET_OPER_MODE_20M(oper_mode) (oper_mode &= ~(0x03)) #define IS_OPER_MODE_20M(oper_mode) (((oper_mode) & (MBIT(0) | MBIT(1))) == 0) /**SET OPERATING MODE:Rx NSS:2*/ -#define SET_OPER_MODE_2NSS(oper_mode) (oper_mode = (oper_mode &~(MBIT(5)|MBIT(6)))| MBIT(4)) +#define SET_OPER_MODE_2NSS(oper_mode) \ + (oper_mode = (oper_mode & ~(MBIT(5) | MBIT(6))) | MBIT(4)) /**SET OPERATING MODE:Rx NSS:1*/ -#define SET_OPER_MODE_1NSS(oper_mode) (oper_mode &= ~(MBIT(4)|MBIT(5)|MBIT(6))) +#define SET_OPER_MODE_1NSS(oper_mode) \ + (oper_mode &= ~(MBIT(4) | MBIT(5) | MBIT(6))) -#define GET_VHTMCS(MCSMapSet) (MCSMapSet & 0xFFFF) -#define GET_VHTNSSMCS(MCSMapSet, nss) ((MCSMapSet >> (2*(nss-1)))&0x3) -#define RET_VHTNSSMCS(MCSMapSet, nss) ((MCSMapSet >> (2*(nss-1)))&0x3) -#define SET_VHTNSSMCS(MCSMapSet, nss, value) \ - (MCSMapSet |= (value & 0x3) << (2 * (nss - 1))) +#define GET_VHTMCS(MCSMapSet) (MCSMapSet & 0xFFFF) +#define GET_VHTNSSMCS(MCSMapSet, nss) ((MCSMapSet >> (2 * (nss - 1))) & 0x3) +#define RET_VHTNSSMCS(MCSMapSet, nss) ((MCSMapSet >> (2 * (nss - 1))) & 0x3) +#define SET_VHTNSSMCS(MCSMapSet, nss, value) \ + (MCSMapSet |= (value & 0x3) << (2 * (nss - 1))) /** DevMCSSupported : Tx MCS supported */ -#define GET_DEVTXMCSMAP(DevMCSMap) (DevMCSMap >> 16) -#define GET_DEVNSSTXMCS(DevMCSMap, nss) ((DevMCSMap >> (2*(nss-1)+16))&0x3) -#define SET_DEVNSSTXMCS(DevMCSMap, nss, value) \ - (DevMCSMap |= (value & 0x3) << (2 * (nss - 1) + 16)) -#define RESET_DEVTXMCSMAP(DevMCSMap) (DevMCSMap &= 0xFFFF) +#define GET_DEVTXMCSMAP(DevMCSMap) (DevMCSMap >> 16) +#define GET_DEVNSSTXMCS(DevMCSMap, nss) \ + ((DevMCSMap >> (2 * (nss - 1) + 16)) & 0x3) +#define SET_DEVNSSTXMCS(DevMCSMap, nss, value) \ + (DevMCSMap |= (value & 0x3) << (2 * (nss - 1) + 16)) +#define RESET_DEVTXMCSMAP(DevMCSMap) (DevMCSMap &= 0xFFFF) /** DevMCSSupported : Rx MCS supported */ -#define GET_DEVRXMCSMAP(DevMCSMap) (DevMCSMap & 0xFFFF) -#define GET_DEVNSSRXMCS(DevMCSMap, nss) ((DevMCSMap >> (2*(nss-1)))&0x3) -#define SET_DEVNSSRXMCS(DevMCSMap, nss, value) \ - (DevMCSMap |= (value & 0x3) << (2 * (nss - 1))) -#define RESET_DEVRXMCSMAP(DevMCSMap) (DevMCSMap &= 0xFFFF0000) +#define GET_DEVRXMCSMAP(DevMCSMap) (DevMCSMap & 0xFFFF) +#define GET_DEVNSSRXMCS(DevMCSMap, nss) ((DevMCSMap >> (2 * (nss - 1))) & 0x3) +#define SET_DEVNSSRXMCS(DevMCSMap, nss, value) \ + (DevMCSMap |= (value & 0x3) << (2 * (nss - 1))) +#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 +#define MOD_CLASS_HR_DSSS 0x03 /** Modulation class for OFDM Rates */ -#define MOD_CLASS_OFDM 0x07 +#define MOD_CLASS_OFDM 0x07 /** Modulation class for HT Rates */ -#define MOD_CLASS_HT 0x08 +#define MOD_CLASS_HT 0x08 /** Modulation class for VHT Rates */ -#define MOD_CLASS_VHT 0x09 +#define MOD_CLASS_VHT 0x09 /** HT bandwidth 20 MHz */ -#define HT_BW_20 0 +#define HT_BW_20 0 /** HT bandwidth 40 MHz */ -#define HT_BW_40 1 +#define HT_BW_40 1 /** HT bandwidth 80 MHz */ -#define HT_BW_80 2 +#define HT_BW_80 2 -/** TLV type : TX RATE CFG, rename from TLV_TYPE_GI_LTF_SIZE to include CMD and HE ER SU settings to this tlv */ -#define TLV_TYPE_TX_RATE_CFG (PROPRIETARY_TLV_BASE_ID + 319) /* 0x023f */ +/** TLV type : TX RATE CFG, rename from TLV_TYPE_GI_LTF_SIZE to include CMD and + * HE ER SU settings to this tlv */ +#define TLV_TYPE_TX_RATE_CFG (PROPRIETARY_TLV_BASE_ID + 319) /* 0x023f */ /** 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 : DFS W53 Configuration */ +#define TLV_TYPE_DFS_W53_CFG (PROPRIETARY_TLV_BASE_ID + 0x145) // + 325 #ifdef OPCHAN /** TLV type : OpChannel control */ -#define TLV_TYPE_OPCHAN_CONTROL_DESC (PROPRIETARY_TLV_BASE_ID + 0x79) /* 0x0179 */ +#define TLV_TYPE_OPCHAN_CONTROL_DESC \ + (PROPRIETARY_TLV_BASE_ID + 0x79) /* 0x0179 */ /** TLV type : OpChannel channel group control */ -#define TLV_TYPE_OPCHAN_CHANGRP_CTRL (PROPRIETARY_TLV_BASE_ID + 0x7a) /* 0x017a */ +#define TLV_TYPE_OPCHAN_CHANGRP_CTRL \ + (PROPRIETARY_TLV_BASE_ID + 0x7a) /* 0x017a */ #endif /** 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 \ + */ /** TLV type : SCAN channel gap */ -#define TLV_TYPE_SCAN_CHANNEL_GAP (PROPRIETARY_TLV_BASE_ID + 0xc5) /* 0x01c5 */ +#define TLV_TYPE_SCAN_CHANNEL_GAP \ + (PROPRIETARY_TLV_BASE_ID + 0xc5) /* 0x01c5 \ + */ /** TLV type : Channel statistics */ -#define TLV_TYPE_CHANNEL_STATS (PROPRIETARY_TLV_BASE_ID + 0xc6) /* 0x01c6 */ +#define TLV_TYPE_CHANNEL_STATS (PROPRIETARY_TLV_BASE_ID + 0xc6) /* 0x01c6 */ /** TLV type : BSS_MODE */ -#define TLV_TYPE_BSS_MODE (PROPRIETARY_TLV_BASE_ID + 0xce) /* 0x01ce */ +#define TLV_TYPE_BSS_MODE (PROPRIETARY_TLV_BASE_ID + 0xce) /* 0x01ce */ /** Firmware Host Command ID Constants */ /** Host Command ID : Get hardware specifications */ -#define HostCmd_CMD_GET_HW_SPEC 0x0003 +#define HostCmd_CMD_GET_HW_SPEC 0x0003 /** Host Command ID : 802.11 scan */ -#define HostCmd_CMD_802_11_SCAN 0x0006 +#define HostCmd_CMD_802_11_SCAN 0x0006 /** Host Command ID : 802.11 get log */ -#define HostCmd_CMD_802_11_GET_LOG 0x000b +#define HostCmd_CMD_802_11_GET_LOG 0x000b /** Host Command id: GET_TX_RX_PKT_STATS */ -#define HOST_CMD_TX_RX_PKT_STATS 0x008d +#define HOST_CMD_TX_RX_PKT_STATS 0x008d /** Host Command ID : 802.11 get/set link layer statistic */ -#define HostCmd_CMD_802_11_LINK_STATS 0x0256 +#define HostCmd_CMD_802_11_LINK_STATS 0x0256 /** Host Command ID : MAC multicast address */ -#define HostCmd_CMD_MAC_MULTICAST_ADR 0x0010 +#define HostCmd_CMD_MAC_MULTICAST_ADR 0x0010 /** Host Command ID : 802.11 EEPROM access */ -#define HostCmd_CMD_802_11_EEPROM_ACCESS 0x0059 +#define HostCmd_CMD_802_11_EEPROM_ACCESS 0x0059 /** Host Command ID : 802.11 associate */ -#define HostCmd_CMD_802_11_ASSOCIATE 0x0012 +#define HostCmd_CMD_802_11_ASSOCIATE 0x0012 /** Host Command ID : 802.11 SNMP MIB */ -#define HostCmd_CMD_802_11_SNMP_MIB 0x0016 +#define HostCmd_CMD_802_11_SNMP_MIB 0x0016 /** Host Command ID : MAC register access */ -#define HostCmd_CMD_MAC_REG_ACCESS 0x0019 +#define HostCmd_CMD_MAC_REG_ACCESS 0x0019 /** Host Command ID : BBP register access */ -#define HostCmd_CMD_BBP_REG_ACCESS 0x001a +#define HostCmd_CMD_BBP_REG_ACCESS 0x001a /** Host Command ID : RF register access */ -#define HostCmd_CMD_RF_REG_ACCESS 0x001b +#define HostCmd_CMD_RF_REG_ACCESS 0x001b /** Host Command ID : 802.11 radio control */ -#define HostCmd_CMD_802_11_RADIO_CONTROL 0x001c +#define HostCmd_CMD_802_11_RADIO_CONTROL 0x001c /** Host Command ID : 802.11 RF channel */ -#define HostCmd_CMD_802_11_RF_CHANNEL 0x001d +#define HostCmd_CMD_802_11_RF_CHANNEL 0x001d /** Host Command ID : 802.11 RF Tx power */ -#define HostCmd_CMD_802_11_RF_TX_POWER 0x001e +#define HostCmd_CMD_802_11_RF_TX_POWER 0x001e /** Host Command ID : 802.11 RF antenna */ -#define HostCmd_CMD_802_11_RF_ANTENNA 0x0020 +#define HostCmd_CMD_802_11_RF_ANTENNA 0x0020 /** Host Command ID : 802.11 deauthenticate */ -#define HostCmd_CMD_802_11_DEAUTHENTICATE 0x0024 +#define HostCmd_CMD_802_11_DEAUTHENTICATE 0x0024 /** Host Command ID: 802.11 disassoicate */ -#define HostCmd_CMD_802_11_DISASSOCIATE 0x0026 +#define HostCmd_CMD_802_11_DISASSOCIATE 0x0026 /** Host Command ID : MAC control */ -#define HostCmd_CMD_MAC_CONTROL 0x0028 +#define HostCmd_CMD_MAC_CONTROL 0x0028 /** Host Command ID : 802.11 Ad-Hoc start */ -#define HostCmd_CMD_802_11_AD_HOC_START 0x002b +#define HostCmd_CMD_802_11_AD_HOC_START 0x002b /** Host Command ID : 802.11 Ad-Hoc join */ -#define HostCmd_CMD_802_11_AD_HOC_JOIN 0x002c +#define HostCmd_CMD_802_11_AD_HOC_JOIN 0x002c /** Host Command ID: CW Mode */ -#define HostCmd_CMD_CW_MODE_CTRL 0x0239 +#define HostCmd_CMD_CW_MODE_CTRL 0x0239 /** Host Command ID : 802.11 key material */ -#define HostCmd_CMD_802_11_KEY_MATERIAL 0x005e +#define HostCmd_CMD_802_11_KEY_MATERIAL 0x005e /** Host Command ID : 802.11 Ad-Hoc stop */ -#define HostCmd_CMD_802_11_AD_HOC_STOP 0x0040 +#define HostCmd_CMD_802_11_AD_HOC_STOP 0x0040 /** Host Command ID : 802.22 MAC address */ -#define HostCmd_CMD_802_11_MAC_ADDRESS 0x004D +#define HostCmd_CMD_802_11_MAC_ADDRESS 0x004D /** Host Command ID : WMM Traffic Stream Status */ -#define HostCmd_CMD_WMM_TS_STATUS 0x005d +#define HostCmd_CMD_WMM_TS_STATUS 0x005d /** Host Command ID : 802.11 D domain information */ -#define HostCmd_CMD_802_11D_DOMAIN_INFO 0x005b +#define HostCmd_CMD_802_11D_DOMAIN_INFO 0x005b -/*This command gets/sets the Transmit Rate-based Power Control (TRPC) channel configuration.*/ -#define HostCmd_CHANNEL_TRPC_CONFIG 0x00fb +/*This command gets/sets the Transmit Rate-based Power Control (TRPC) channel + * configuration.*/ +#define HostCmd_CHANNEL_TRPC_CONFIG 0x00fb /** Host Command ID : 802.11 TPC information */ -#define HostCmd_CMD_802_11_TPC_INFO 0x005f +#define HostCmd_CMD_802_11_TPC_INFO 0x005f /** Host Command ID : 802.11 TPC adapt req */ -#define HostCmd_CMD_802_11_TPC_ADAPT_REQ 0x0060 +#define HostCmd_CMD_802_11_TPC_ADAPT_REQ 0x0060 /** Host Command ID : 802.11 channel SW ann */ -#define HostCmd_CMD_802_11_CHAN_SW_ANN 0x0061 +#define HostCmd_CMD_802_11_CHAN_SW_ANN 0x0061 /** Host Command ID : Measurement request */ -#define HostCmd_CMD_MEASUREMENT_REQUEST 0x0062 +#define HostCmd_CMD_MEASUREMENT_REQUEST 0x0062 /** Host Command ID : Measurement report */ -#define HostCmd_CMD_MEASUREMENT_REPORT 0x0063 +#define HostCmd_CMD_MEASUREMENT_REPORT 0x0063 /** Host Command ID : 802.11 sleep parameters */ -#define HostCmd_CMD_802_11_SLEEP_PARAMS 0x0066 +#define HostCmd_CMD_802_11_SLEEP_PARAMS 0x0066 /** Host Command ID : 802.11 ps inactivity timeout */ #define HostCmd_CMD_802_11_PS_INACTIVITY_TIMEOUT 0x0067 /** Host Command ID : 802.11 sleep period */ -#define HostCmd_CMD_802_11_SLEEP_PERIOD 0x0068 +#define HostCmd_CMD_802_11_SLEEP_PERIOD 0x0068 /** Host Command ID: 802.11 BG scan config */ -#define HostCmd_CMD_802_11_BG_SCAN_CONFIG 0x006b +#define HostCmd_CMD_802_11_BG_SCAN_CONFIG 0x006b /** Host Command ID : 802.11 BG scan query */ -#define HostCmd_CMD_802_11_BG_SCAN_QUERY 0x006c +#define HostCmd_CMD_802_11_BG_SCAN_QUERY 0x006c /** Host Command ID : WMM ADDTS req */ -#define HostCmd_CMD_WMM_ADDTS_REQ 0x006E +#define HostCmd_CMD_WMM_ADDTS_REQ 0x006E /** Host Command ID : WMM DELTS req */ -#define HostCmd_CMD_WMM_DELTS_REQ 0x006F +#define HostCmd_CMD_WMM_DELTS_REQ 0x006F /** Host Command ID : WMM queue configuration */ -#define HostCmd_CMD_WMM_QUEUE_CONFIG 0x0070 +#define HostCmd_CMD_WMM_QUEUE_CONFIG 0x0070 /** Host Command ID : 802.11 get status */ -#define HostCmd_CMD_WMM_GET_STATUS 0x0071 +#define HostCmd_CMD_WMM_GET_STATUS 0x0071 /** Host Command ID : 802.11 subscribe event */ -#define HostCmd_CMD_802_11_SUBSCRIBE_EVENT 0x0075 +#define HostCmd_CMD_802_11_SUBSCRIBE_EVENT 0x0075 /** Host Command ID : 802.11 Tx rate query */ -#define HostCmd_CMD_802_11_TX_RATE_QUERY 0x007f +#define HostCmd_CMD_802_11_TX_RATE_QUERY 0x007f /** Host Command ID :Get timestamp value */ -#define HostCmd_CMD_GET_TSF 0x0080 +#define HostCmd_CMD_GET_TSF 0x0080 /** Host Command ID : WMM queue stats */ -#define HostCmd_CMD_WMM_QUEUE_STATS 0x0081 +#define HostCmd_CMD_WMM_QUEUE_STATS 0x0081 /** Host Command ID : KEEP ALIVE command */ -#define HostCmd_CMD_AUTO_TX 0x0082 +#define HostCmd_CMD_AUTO_TX 0x0082 /** Host Command ID : 802.11 IBSS coalescing status */ #define HostCmd_CMD_802_11_IBSS_COALESCING_STATUS 0x0083 /** Host Command ID : Memory access */ -#define HostCmd_CMD_MEM_ACCESS 0x0086 +#define HostCmd_CMD_MEM_ACCESS 0x0086 #if defined(SDIO) /** Host Command ID : SDIO GPIO interrupt configuration */ -#define HostCmd_CMD_SDIO_GPIO_INT_CONFIG 0x0088 +#define HostCmd_CMD_SDIO_GPIO_INT_CONFIG 0x0088 #endif #ifdef MFG_CMD_SUPPORT /** Host Command ID : Mfg command */ -#define HostCmd_CMD_MFG_COMMAND 0x0089 +#define HostCmd_CMD_MFG_COMMAND 0x0089 #endif /** Host Command ID : Inactivity timeout ext */ -#define HostCmd_CMD_INACTIVITY_TIMEOUT_EXT 0x008a +#define HostCmd_CMD_INACTIVITY_TIMEOUT_EXT 0x008a /** Host Command ID : DBGS configuration */ -#define HostCmd_CMD_DBGS_CFG 0x008b +#define HostCmd_CMD_DBGS_CFG 0x008b /** Host Command ID : Get memory */ -#define HostCmd_CMD_GET_MEM 0x008c +#define HostCmd_CMD_GET_MEM 0x008c /** Host Command ID : Cal data dnld */ -#define HostCmd_CMD_CFG_DATA 0x008f +#define HostCmd_CMD_CFG_DATA 0x008f /** Host Command ID : SDIO pull control */ -#define HostCmd_CMD_SDIO_PULL_CTRL 0x0093 +#define HostCmd_CMD_SDIO_PULL_CTRL 0x0093 /** Host Command ID : ECL system clock configuration */ -#define HostCmd_CMD_ECL_SYSTEM_CLOCK_CONFIG 0x0094 +#define HostCmd_CMD_ECL_SYSTEM_CLOCK_CONFIG 0x0094 /** Host Command ID : Extended version */ -#define HostCmd_CMD_VERSION_EXT 0x0097 +#define HostCmd_CMD_VERSION_EXT 0x0097 /** Host Command ID : MEF configuration */ -#define HostCmd_CMD_MEF_CFG 0x009a +#define HostCmd_CMD_MEF_CFG 0x009a /** Host Command ID : 802.11 RSSI INFO*/ -#define HostCmd_CMD_RSSI_INFO 0x00a4 +#define HostCmd_CMD_RSSI_INFO 0x00a4 /** Host Command ID : Function initialization */ -#define HostCmd_CMD_FUNC_INIT 0x00a9 +#define HostCmd_CMD_FUNC_INIT 0x00a9 /** Host Command ID : Function shutdown */ -#define HostCmd_CMD_FUNC_SHUTDOWN 0x00aa +#define HostCmd_CMD_FUNC_SHUTDOWN 0x00aa /** Host Command ID : Robustcoex */ -#define HostCmd_CMD_802_11_ROBUSTCOEX 0x00e0 +#define HostCmd_CMD_802_11_ROBUSTCOEX 0x00e0 /** Host Command ID :EAPOL PKT */ -#define HostCmd_CMD_802_11_EAPOL_PKT 0x012e +#define HostCmd_CMD_802_11_EAPOL_PKT 0x012e /** Host Command ID :MIMO SWITCH **/ -#define HostCmd_CMD_802_11_MIMO_SWITCH 0x0235 +#define HostCmd_CMD_802_11_MIMO_SWITCH 0x0235 /** Host Command ID : 802.11 RSSI INFO EXT*/ -#define HostCmd_CMD_RSSI_INFO_EXT 0x0237 +#define HostCmd_CMD_RSSI_INFO_EXT 0x0237 #ifdef RX_PACKET_COALESCE /** TLV ID for RX pkt coalesce config */ -#define TLV_TYPE_RX_PKT_COAL_CONFIG (PROPRIETARY_TLV_BASE_ID + 0xC9) +#define TLV_TYPE_RX_PKT_COAL_CONFIG (PROPRIETARY_TLV_BASE_ID + 0xC9) #endif /** Host Command ID : Channel report request */ -#define HostCmd_CMD_CHAN_REPORT_REQUEST 0x00dd +#define HostCmd_CMD_CHAN_REPORT_REQUEST 0x00dd /** Host Command ID: SUPPLICANT_PMK */ -#define HostCmd_CMD_SUPPLICANT_PMK 0x00c4 +#define HostCmd_CMD_SUPPLICANT_PMK 0x00c4 /** Host Command ID: SUPPLICANT_PROFILE */ -#define HostCmd_CMD_SUPPLICANT_PROFILE 0x00c5 +#define HostCmd_CMD_SUPPLICANT_PROFILE 0x00c5 /** Host Command ID : Add Block Ack Request */ -#define HostCmd_CMD_11N_ADDBA_REQ 0x00ce +#define HostCmd_CMD_11N_ADDBA_REQ 0x00ce /** Host Command ID : Delete a Block Ack Request */ -#define HostCmd_CMD_11N_CFG 0x00cd +#define HostCmd_CMD_11N_CFG 0x00cd /** Host Command ID : Add Block Ack Response */ -#define HostCmd_CMD_11N_ADDBA_RSP 0x00cf +#define HostCmd_CMD_11N_ADDBA_RSP 0x00cf /** Host Command ID : Delete a Block Ack Request */ -#define HostCmd_CMD_11N_DELBA 0x00d0 +#define HostCmd_CMD_11N_DELBA 0x00d0 /** Host Command ID: Configure Tx Buf size */ -#define HostCmd_CMD_RECONFIGURE_TX_BUFF 0x00d9 +#define HostCmd_CMD_RECONFIGURE_TX_BUFF 0x00d9 /** Host Command ID: AMSDU Aggr Ctrl */ -#define HostCmd_CMD_AMSDU_AGGR_CTRL 0x00df +#define HostCmd_CMD_AMSDU_AGGR_CTRL 0x00df /** Host Command ID: 11AC config */ -#define HostCmd_CMD_11AC_CFG 0x0112 +#define HostCmd_CMD_11AC_CFG 0x0112 /** Host Command ID: Configure TX Beamforming capability */ -#define HostCmd_CMD_TX_BF_CFG 0x0104 +#define HostCmd_CMD_TX_BF_CFG 0x0104 /** Host Command ID : 802.11 TX power configuration */ -#define HostCmd_CMD_TXPWR_CFG 0x00d1 +#define HostCmd_CMD_TXPWR_CFG 0x00d1 /** Host Command ID : Soft Reset */ -#define HostCmd_CMD_SOFT_RESET 0x00d5 +#define HostCmd_CMD_SOFT_RESET 0x00d5 /** Host Command ID : 802.11 b/g/n rate configration */ -#define HostCmd_CMD_TX_RATE_CFG 0x00d6 +#define HostCmd_CMD_TX_RATE_CFG 0x00d6 /** Host Command ID : Enhanced PS mode */ -#define HostCmd_CMD_802_11_PS_MODE_ENH 0x00e4 +#define HostCmd_CMD_802_11_PS_MODE_ENH 0x00e4 /** Host command action : Host sleep configuration */ -#define HostCmd_CMD_802_11_HS_CFG_ENH 0x00e5 +#define HostCmd_CMD_802_11_HS_CFG_ENH 0x00e5 /** Host Command ID : CAU register access */ -#define HostCmd_CMD_CAU_REG_ACCESS 0x00ed +#define HostCmd_CMD_CAU_REG_ACCESS 0x00ed /** Host Command ID : mgmt IE list */ -#define HostCmd_CMD_MGMT_IE_LIST 0x00f2 +#define HostCmd_CMD_MGMT_IE_LIST 0x00f2 -#define HostCmd_CMD_802_11_BAND_STEERING 0x026f +#define HostCmd_CMD_802_11_BAND_STEERING 0x026f #ifdef SDIO /** Host Command ID : SDIO single port RX aggr */ -#define HostCmd_CMD_SDIO_SP_RX_AGGR_CFG 0x0223 +#define HostCmd_CMD_SDIO_SP_RX_AGGR_CFG 0x0223 /** fw_cap_info bit16 for sdio sp rx aggr flag*/ -#define SDIO_SP_RX_AGGR_ENABLE MBIT(16) +#define SDIO_SP_RX_AGGR_ENABLE MBIT(16) #endif /* fw_cap_info bit18 for ecsa support*/ -#define FW_CAPINFO_ECSA MBIT(18) +#define FW_CAPINFO_ECSA MBIT(18) /* fw_cap_info bit20 for get log*/ -#define FW_CAPINFO_GET_LOG MBIT(20) +#define FW_CAPINFO_GET_LOG MBIT(20) /** fw_cap_info bit22 for embedded supplicant support*/ -#define FW_CAPINFO_SUPPLICANT_SUPPORT MBIT(21) +#define FW_CAPINFO_SUPPLICANT_SUPPORT MBIT(21) /** fw_cap_info bit23 for embedded authenticator support*/ -#define FW_CAPINFO_AUTH_SUPPORT MBIT(22) +#define FW_CAPINFO_AUTH_SUPPORT MBIT(22) /** fw_cap_info bit25 for adhoc support*/ -#define FW_CAPINFO_ADHOC_SUPPORT MBIT(25) +#define FW_CAPINFO_ADHOC_SUPPORT MBIT(25) /** Check if adhoc is supported by firmware */ -#define IS_FW_SUPPORT_ADHOC(_adapter) (_adapter->fw_cap_info & FW_CAPINFO_ADHOC_SUPPORT) +#define IS_FW_SUPPORT_ADHOC(_adapter) \ + (_adapter->fw_cap_info & FW_CAPINFO_ADHOC_SUPPORT) /** Check if supplicant is supported by firmware */ -#define IS_FW_SUPPORT_SUPPLICANT(_adapter) (_adapter->fw_cap_info & FW_CAPINFO_SUPPLICANT_SUPPORT) +#define IS_FW_SUPPORT_SUPPLICANT(_adapter) \ + (_adapter->fw_cap_info & FW_CAPINFO_SUPPLICANT_SUPPORT) /** Check if authenticator is supported by firmware */ -#define IS_FW_SUPPORT_AUTHENTICATOR(_adapter) (_adapter->fw_cap_info & FW_CAPINFO_AUTH_SUPPORT) +#define IS_FW_SUPPORT_AUTHENTICATOR(_adapter) \ + (_adapter->fw_cap_info & FW_CAPINFO_AUTH_SUPPORT) /** Ext fw cap info bit0 only 1x1 5G is available */ -#define FW_CAPINFO_EXT_5G_1X1_ONLY MBIT(0) +#define FW_CAPINFO_EXT_5G_1X1_ONLY MBIT(0) /** Ext fw cap info bit1 1x1 5G is not available */ -#define FW_CAPINFO_EXT_NO_5G_1X1 MBIT(1) +#define FW_CAPINFO_EXT_NO_5G_1X1 MBIT(1) /** Ext fw cap info bit 2 only 1x1 2G is available */ -#define FW_CAPINFO_EXT_2G_1X1_ONLY MBIT(2) +#define FW_CAPINFO_EXT_2G_1X1_ONLY MBIT(2) /**Ext fw cap info bit3 1x1 2G is not available */ -#define FW_CAPINFO_EXT_NO_2G_1X1 MBIT(3) +#define FW_CAPINFO_EXT_NO_2G_1X1 MBIT(3) /** Ext fw cap info bit4 1x1 + 1x1 5G mode is unavailable */ -#define FW_CAPINFO_EXT_NO_5G_1X1_PLUS_1X1 MBIT(4) +#define FW_CAPINFO_EXT_NO_5G_1X1_PLUS_1X1 MBIT(4) /** Ext fw cap info bit5 80 + 80 MHz capability disabled */ -#define FW_CAPINFO_EXT_NO_80MHz_PLUS_80MHz MBIT(5) +#define FW_CAPINFO_EXT_NO_80MHz_PLUS_80MHz MBIT(5) /** Ext fw cap info bit6 1024 QAM is disabled */ -#define FW_CAPINFO_EXT_NO_1024_QAM MBIT(6) +#define FW_CAPINFO_EXT_NO_1024_QAM MBIT(6) /** FW cap info bit 7 11AX */ -#define FW_CAPINFO_EXT_802_11AX MBIT(7) +#define FW_CAPINFO_EXT_802_11AX MBIT(7) /** FW cap info bit 8: 80MHZ disabled */ -#define FW_CAPINFO_EXT_NO_80MHZ MBIT(8) +#define FW_CAPINFO_EXT_NO_80MHZ MBIT(8) /** Check if 5G 1x1 only is supported by firmware */ -#define IS_FW_SUPPORT_5G_1X1_ONLY(_adapter) (_adapter->fw_cap_ext & FW_CAPINFO_EXT_5G_1X1_ONLY) +#define IS_FW_SUPPORT_5G_1X1_ONLY(_adapter) \ + (_adapter->fw_cap_ext & FW_CAPINFO_EXT_5G_1X1_ONLY) /** Check if 5G 1x1 is unavailable in firmware */ -#define IS_FW_SUPPORT_NO_5G_1X1(_adapter) (_adapter->fw_cap_ext & FW_CAPINFO_EXT_NO_5G_1X1) +#define IS_FW_SUPPORT_NO_5G_1X1(_adapter) \ + (_adapter->fw_cap_ext & FW_CAPINFO_EXT_NO_5G_1X1) /** Check if 2G 1x1 only is supported by firmware */ -#define IS_FW_SUPPORT_2G_1X1_ONLY(_adapter) (_adapter->fw_cap_ext & FW_CAPINFO_EXT_2G_1X1_ONLY) +#define IS_FW_SUPPORT_2G_1X1_ONLY(_adapter) \ + (_adapter->fw_cap_ext & FW_CAPINFO_EXT_2G_1X1_ONLY) /** Check if 2G 1x1 is unavailable in firmware */ -#define IS_FW_SUPPORT_NO_2G_1X1(_adapter) (_adapter->fw_cap_ext & FW_CAPINFO_EXT_NO_2G_1X1) +#define IS_FW_SUPPORT_NO_2G_1X1(_adapter) \ + (_adapter->fw_cap_ext & FW_CAPINFO_EXT_NO_2G_1X1) /** Check if 5G 1x1 + 1x1 mode is disabled in firmware */ -#define IS_FW_SUPPORT_NO_5G_1X1_PLUS_1X1(_adapter) (_adapter->fw_cap_ext & FW_CAPINFO_EXT_NO_5G_1X1_PLUS_1X1) +#define IS_FW_SUPPORT_NO_5G_1X1_PLUS_1X1(_adapter) \ + (_adapter->fw_cap_ext & FW_CAPINFO_EXT_NO_5G_1X1_PLUS_1X1) /** Check if 80 + 80MHz is disabled in firmware */ -#define IS_FW_SUPPORT_NO_80MHz_PLUS_80MHz(_adapter) (_adapter->fw_cap_ext & FW_CAPINFO_EXT_NO_80MHz_PLUS_80MHz) +#define IS_FW_SUPPORT_NO_80MHz_PLUS_80MHz(_adapter) \ + (_adapter->fw_cap_ext & FW_CAPINFO_EXT_NO_80MHz_PLUS_80MHz) /** Check if 1024 QAM disabled in firmware */ -#define IS_FW_SUPPORT_NO_1024_QAM(_adapter) (_adapter->fw_cap_ext & FW_CAPINFO_EXT_NO_1024_QAM) +#define IS_FW_SUPPORT_NO_1024_QAM(_adapter) \ + (_adapter->fw_cap_ext & FW_CAPINFO_EXT_NO_1024_QAM) /** Check if 80MHZ disabled in firmware */ -#define IS_FW_SUPPORT_NO_80MHZ(_adapter) (_adapter->fw_cap_ext & FW_CAPINFO_EXT_NO_80MHZ) +#define IS_FW_SUPPORT_NO_80MHZ(_adapter) \ + (_adapter->fw_cap_ext & FW_CAPINFO_EXT_NO_80MHZ) /** FW cap info TLV */ typedef MLAN_PACK_START struct _MrvlIEtypes_fw_cap_info_t { - /** Header type */ + /** Header type */ t_u16 type; - /** Header length */ + /** Header length */ t_u16 len; - /** Fw cap info bitmap */ + /** Fw cap info bitmap */ t_u32 fw_cap_info; - /** Extended fw cap info bitmap */ + /** Extended fw cap info bitmap */ t_u32 fw_cap_ext; } MLAN_PACK_END MrvlIEtypes_fw_cap_info_t, *pMrvlIEtypes_fw_cap_info_t; /** Check if 11AX is supported by firmware */ -#define IS_FW_SUPPORT_11AX(_adapter) (_adapter->fw_cap_ext & FW_CAPINFO_EXT_802_11AX) +#define IS_FW_SUPPORT_11AX(_adapter) \ + (_adapter->fw_cap_ext & FW_CAPINFO_EXT_802_11AX) typedef MLAN_PACK_START struct _MrvlIEtypes_Extension_t { - /** Header type */ + /** Header type */ t_u16 type; - /** Header length */ + /** Header length */ t_u16 len; - /** Element id extension */ + /** Element id extension */ t_u8 ext_id; - /** payload */ + /** payload */ t_u8 data[]; } MLAN_PACK_END MrvlIEtypes_Extension_t, *pMrvlIEtypes_Extension_t; /* HE MAC Capabilities Information field BIT 1 for TWT Req */ -#define HE_MAC_CAP_TWT_REQ_SUPPORT MBIT(1) +#define HE_MAC_CAP_TWT_REQ_SUPPORT MBIT(1) /* HE MAC Capabilities Information field BIT 2 for TWT Resp*/ -#define HE_MAC_CAP_TWT_RESP_SUPPORT MBIT(2) +#define HE_MAC_CAP_TWT_RESP_SUPPORT MBIT(2) typedef MLAN_PACK_START struct _MrvlIEtypes_He_cap_t { - /** Header type */ + /** Header type */ t_u16 type; - /** Header length */ + /** Header length */ t_u16 len; - /** Element id extension */ + /** Element id extension */ t_u8 ext_id; - /** he mac capability info */ + /** he mac capability info */ t_u8 he_mac_cap[6]; - /** he phy capability info */ + /** he phy capability info */ t_u8 he_phy_cap[11]; - /** he txrx mcs support , size would be 4 or 8 or 12 */ + /** he txrx mcs support , size would be 4 or 8 or 12 */ t_u8 he_txrx_mcs_support[4]; /** 160Mhz tx rx mcs support*/ t_u8 he160_txrx_mcs_support[4]; /** 80+80 Mhz tx rx mcs suport */ t_u8 he8080_txrx_mcs_support[4]; - /** PPE Thresholds (optional) */ + /** PPE Thresholds (optional) */ t_u8 val[20]; } MLAN_PACK_END MrvlIEtypes_He_cap_t, *pMrvlIEtypes_he_cap_t; #ifdef RX_PACKET_COALESCE /** Host Command ID : Rx packet coalescing configuration */ -#define HostCmd_CMD_RX_PKT_COALESCE_CFG 0x012c +#define HostCmd_CMD_RX_PKT_COALESCE_CFG 0x012c #endif /** Host Command ID : Extended scan support */ -#define HostCmd_CMD_802_11_SCAN_EXT 0x0107 +#define HostCmd_CMD_802_11_SCAN_EXT 0x0107 /** Host Command ID : Forward mgmt frame */ -#define HostCmd_CMD_RX_MGMT_IND 0x010c +#define HostCmd_CMD_RX_MGMT_IND 0x010c #ifdef PCIE /** Host Command ID: Host buffer description */ -#define HostCmd_CMD_PCIE_HOST_BUF_DETAILS 0x00fa +#define HostCmd_CMD_PCIE_HOST_BUF_DETAILS 0x00fa #endif /** Host Command ID : Set BSS_MODE */ -#define HostCmd_CMD_SET_BSS_MODE 0x00f7 +#define HostCmd_CMD_SET_BSS_MODE 0x00f7 #ifdef UAP_SUPPORT /** Host Command id: SYS_INFO */ -#define HOST_CMD_APCMD_SYS_INFO 0x00ae +#define HOST_CMD_APCMD_SYS_INFO 0x00ae /** Host Command id: sys_reset */ -#define HOST_CMD_APCMD_SYS_RESET 0x00af +#define HOST_CMD_APCMD_SYS_RESET 0x00af /** Host Command id: SYS_CONFIGURE */ -#define HOST_CMD_APCMD_SYS_CONFIGURE 0x00b0 +#define HOST_CMD_APCMD_SYS_CONFIGURE 0x00b0 /** Host Command id: BSS_START */ -#define HOST_CMD_APCMD_BSS_START 0x00b1 +#define HOST_CMD_APCMD_BSS_START 0x00b1 /** Host Command id: BSS_STOP */ -#define HOST_CMD_APCMD_BSS_STOP 0x00b2 +#define HOST_CMD_APCMD_BSS_STOP 0x00b2 /** Host Command id: sta_list */ -#define HOST_CMD_APCMD_STA_LIST 0x00b3 +#define HOST_CMD_APCMD_STA_LIST 0x00b3 /** Host Command id: STA_DEAUTH */ -#define HOST_CMD_APCMD_STA_DEAUTH 0x00b5 +#define HOST_CMD_APCMD_STA_DEAUTH 0x00b5 /** Host Command id: REPORT_MIC */ -#define HOST_CMD_APCMD_REPORT_MIC 0x00ee +#define HOST_CMD_APCMD_REPORT_MIC 0x00ee /** Host Command id: UAP_OPER_CTRL */ -#define HOST_CMD_APCMD_OPER_CTRL 0x0233 +#define HOST_CMD_APCMD_OPER_CTRL 0x0233 #endif /* UAP_SUPPORT */ /** Host Command id: PMIC CONFIGURE*/ -#define HOST_CMD_PMIC_CONFIGURE 0x23E +#define HOST_CMD_PMIC_CONFIGURE 0x23E /** Host Command ID: Tx data pause */ -#define HostCmd_CMD_CFG_TX_DATA_PAUSE 0x0103 +#define HostCmd_CMD_CFG_TX_DATA_PAUSE 0x0103 #ifdef WIFI_DIRECT_SUPPORT /** Host Command ID: P2P PARAMS CONFIG */ -#define HOST_CMD_P2P_PARAMS_CONFIG 0x00ea +#define HOST_CMD_P2P_PARAMS_CONFIG 0x00ea /** Host Command ID: WIFI_DIRECT_MODE_CONFIG */ -#define HOST_CMD_WIFI_DIRECT_MODE_CONFIG 0x00eb +#define HOST_CMD_WIFI_DIRECT_MODE_CONFIG 0x00eb #endif /** Host Command ID: Remain On Channel */ -#define HostCmd_CMD_802_11_REMAIN_ON_CHANNEL 0x010d +#define HostCmd_CMD_802_11_REMAIN_ON_CHANNEL 0x010d -#define HostCmd_CMD_COALESCE_CFG 0x010a +#define HostCmd_CMD_COALESCE_CFG 0x010a /** Host Command ID: GTK REKEY OFFLOAD CFG */ -#define HostCmd_CMD_GTK_REKEY_OFFLOAD_CFG 0x010f +#define HostCmd_CMD_GTK_REKEY_OFFLOAD_CFG 0x010f /** Host Command ID : OTP user data */ -#define HostCmd_CMD_OTP_READ_USER_DATA 0x0114 +#define HostCmd_CMD_OTP_READ_USER_DATA 0x0114 /** Host Command ID: HS wakeup reason */ -#define HostCmd_CMD_HS_WAKEUP_REASON 0x0116 +#define HostCmd_CMD_HS_WAKEUP_REASON 0x0116 /** Host Command ID: reject addba request */ -#define HostCmd_CMD_REJECT_ADDBA_REQ 0x0119 +#define HostCmd_CMD_REJECT_ADDBA_REQ 0x0119 -#define HostCmd_CMD_FW_DUMP_EVENT 0x0125 +#define HostCmd_CMD_FW_DUMP_EVENT 0x0125 -#define HostCMD_CONFIG_LOW_POWER_MODE 0x0128 +#define HostCMD_CONFIG_LOW_POWER_MODE 0x0128 /** Host Command ID : Target device access */ -#define HostCmd_CMD_TARGET_ACCESS 0x012a +#define HostCmd_CMD_TARGET_ACCESS 0x012a /** Host Command ID: DFS repeater mode */ -#define HostCmd_DFS_REPEATER_MODE 0x012b +#define HostCmd_DFS_REPEATER_MODE 0x012b /** Host Command ID: ACS scan */ -#define HostCMD_APCMD_ACS_SCAN 0x0224 +#define HostCMD_APCMD_ACS_SCAN 0x0224 /** Host Command ID: Get sensor temp*/ -#define HostCmd_DS_GET_SENSOR_TEMP 0x0227 +#define HostCmd_DS_GET_SENSOR_TEMP 0x0227 /** Host Command ID : Configure ADHOC_OVER_IP parameters */ -#define HostCmd_CMD_WMM_PARAM_CONFIG 0x023a +#define HostCmd_CMD_WMM_PARAM_CONFIG 0x023a #ifdef STA_SUPPORT /** Host Command ID : set/get sta configure */ -#define HostCmd_CMD_STA_CONFIGURE 0x023f +#define HostCmd_CMD_STA_CONFIGURE 0x023f #endif /** Host Command ID : GPIO independent reset configure */ -#define HostCmd_CMD_INDEPENDENT_RESET_CFG 0x0243 +#define HostCmd_CMD_INDEPENDENT_RESET_CFG 0x0243 -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(USB9097) || defined(SD9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(USB9097) || defined(SD9097) /* TLV type: reg type */ -#define TLV_TYPE_REG_ACCESS_CTRL (PROPRIETARY_TLV_BASE_ID + 0x13C) /* 0x023c */ +#define TLV_TYPE_REG_ACCESS_CTRL (PROPRIETARY_TLV_BASE_ID + 0x13C) /* 0x023c*/ /** MrvlIEtypes_Reg_type_t*/ typedef MLAN_PACK_START struct _MrvlIEtypes_Reg_type_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** type: 0x81/0x82/0x83 */ + /** type: 0x81/0x82/0x83 */ t_u8 type; } MLAN_PACK_END MrvlIEtypes_Reg_type_t; #endif -#define HostCmd_CMD_CHAN_REGION_CFG 0x0242 +#define HostCmd_CMD_CHAN_REGION_CFG 0x0242 /* mod_grp */ typedef enum _mod_grp { - MOD_CCK, //0 - MOD_OFDM_PSK, //1 - MOD_OFDM_QAM16, //2 - MOD_OFDM_QAM64, //3 - MOD_HT_20_PSK, //4 - MOD_HT_20_QAM16, //5 - MOD_HT_20_QAM64, //6 - MOD_HT_40_PSK, //7 - MOD_HT_40_QAM16, //8 - MOD_HT_40_QAM64, //9 + MOD_CCK, // 0 + MOD_OFDM_PSK, // 1 + MOD_OFDM_QAM16, // 2 + MOD_OFDM_QAM64, // 3 + MOD_HT_20_PSK, // 4 + MOD_HT_20_QAM16, // 5 + MOD_HT_20_QAM64, // 6 + MOD_HT_40_PSK, // 7 + MOD_HT_40_QAM16, // 8 + MOD_HT_40_QAM64, // 9 #ifdef STREAM_2x2 - MOD_HT2_20_PSK, //10 - MOD_HT2_20_QAM16, //11 - MOD_HT2_20_QAM64, //12 - MOD_HT2_40_PSK, //13 - MOD_HT2_40_QAM16, //14 - MOD_HT2_40_QAM64, //15 + MOD_HT2_20_PSK, // 10 + MOD_HT2_20_QAM16, // 11 + MOD_HT2_20_QAM64, // 12 + MOD_HT2_40_PSK, // 13 + MOD_HT2_40_QAM16, // 14 + MOD_HT2_40_QAM64, // 15 #endif - MOD_VHT_20_QAM256, //16 - MOD_VHT_40_QAM256, //17 - MOD_VHT_80_PSK, //18 - MOD_VHT_80_QAM16, //19 - MOD_VHT_80_QAM64, //20 - MOD_VHT_80_QAM256, //21 + MOD_VHT_20_QAM256, // 16 + MOD_VHT_40_QAM256, // 17 + MOD_VHT_80_PSK, // 18 + MOD_VHT_80_QAM16, // 19 + MOD_VHT_80_QAM64, // 20 + MOD_VHT_80_QAM256, // 21 #ifdef STREAM_2x2 - MOD_VHT2_20_QAM256, //22 - MOD_VHT2_40_QAM256, //23 - MOD_VHT2_80_PSK, //24 - MOD_VHT2_80_QAM16, //25 - MOD_VHT2_80_QAM64, //26 - MOD_VHT2_80_QAM256, //27 + MOD_VHT2_20_QAM256, // 22 + MOD_VHT2_40_QAM256, // 23 + MOD_VHT2_80_PSK, // 24 + MOD_VHT2_80_QAM16, // 25 + MOD_VHT2_80_QAM64, // 26 + MOD_VHT2_80_QAM256, // 27 #endif } mod_grp; @@ -1495,35 +1559,37 @@ typedef MLAN_PACK_START struct _power_table_attr { t_u8 cols_5g; } MLAN_PACK_END power_table_attr_t; -#define FW_CFP_TABLE_MAX_ROWS_BG 14 -#define FW_CFP_TABLE_MAX_COLS_BG 17 +#define FW_CFP_TABLE_MAX_ROWS_BG 14 +#define FW_CFP_TABLE_MAX_COLS_BG 17 -#define FW_CFP_TABLE_MAX_ROWS_A 39 -#define FW_CFP_TABLE_MAX_COLS_A 29 +#define FW_CFP_TABLE_MAX_ROWS_A 39 +#define FW_CFP_TABLE_MAX_COLS_A 29 -#define HostCmd_CMD_DYN_BW 0x0252 +#define HostCmd_CMD_DYN_BW 0x0252 -#define HostCmd_CMD_BOOT_SLEEP 0x0258 +#define HostCmd_CMD_BOOT_SLEEP 0x0258 -#define HostCmd_CMD_RX_ABORT_CFG 0x0261 -#define HostCmd_CMD_RX_ABORT_CFG_EXT 0x0262 -#define HostCmd_CMD_TX_AMPDU_PROT_MODE 0x0263 -#define HostCmd_CMD_RATE_ADAPT_CFG 0x0264 -#define HostCmd_CMD_CCK_DESENSE_CFG 0x0265 +#define HostCmd_CMD_RX_ABORT_CFG 0x0261 +#define HostCmd_CMD_RX_ABORT_CFG_EXT 0x0262 +#define HostCmd_CMD_TX_AMPDU_PROT_MODE 0x0263 +#define HostCmd_CMD_RATE_ADAPT_CFG 0x0264 +#define HostCmd_CMD_CCK_DESENSE_CFG 0x0265 -#define HostCmd_CMD_VDLL 0x0240 +#define HostCmd_CMD_VDLL 0x0240 #if defined(PCIE) -#define HostCmd_CMD_SSU 0x0259 +#define HostCmd_CMD_SSU 0x0259 #endif -#define HostCmd_CMD_DMCS_CONFIG 0x0260 +#define HostCmd_CMD_DMCS_CONFIG 0x0260 /** Host Command ID: 11AX config */ -#define HostCmd_CMD_11AX_CFG 0x0266 +#define HostCmd_CMD_11AX_CFG 0x0266 /** Host Command ID: 11AX command */ -#define HostCmd_CMD_11AX_CMD 0x026d +#define HostCmd_CMD_11AX_CMD 0x026d +/** Host Command ID: TWT cfg command */ +#define HostCmd_CMD_TWT_CFG 0x0270 -#define HostCmd_CMD_LOW_POWER_MODE_CFG 0x026e +#define HostCmd_CMD_LOW_POWER_MODE_CFG 0x026e /** Enhanced PS modes */ typedef enum _ENH_PS_MODES { @@ -1534,356 +1600,349 @@ typedef enum _ENH_PS_MODES { } ENH_PS_MODES; /** Command RET code, MSB is set to 1 */ -#define HostCmd_RET_BIT 0x8000 +#define HostCmd_RET_BIT 0x8000 /** General purpose action : Get */ -#define HostCmd_ACT_GEN_GET 0x0000 +#define HostCmd_ACT_GEN_GET 0x0000 /** General purpose action : Set */ -#define HostCmd_ACT_GEN_SET 0x0001 +#define HostCmd_ACT_GEN_SET 0x0001 /** General purpose action : Set Default */ -#define HostCmd_ACT_GEN_SET_DEFAULT 0x0002 +#define HostCmd_ACT_GEN_SET_DEFAULT 0x0002 /** General purpose action : Get_Current */ -#define HostCmd_ACT_GEN_GET_CURRENT 0x0003 +#define HostCmd_ACT_GEN_GET_CURRENT 0x0003 /** General purpose action : Remove */ -#define HostCmd_ACT_GEN_REMOVE 0x0004 +#define HostCmd_ACT_GEN_REMOVE 0x0004 /** General purpose action : Reset */ -#define HostCmd_ACT_GEN_RESET 0x0005 +#define HostCmd_ACT_GEN_RESET 0x0005 /** Host command action : Set Rx */ -#define HostCmd_ACT_SET_RX 0x0001 +#define HostCmd_ACT_SET_RX 0x0001 /** Host command action : Set Tx */ -#define HostCmd_ACT_SET_TX 0x0002 +#define HostCmd_ACT_SET_TX 0x0002 /** Host command action : Set both Rx and Tx */ -#define HostCmd_ACT_SET_BOTH 0x0003 +#define HostCmd_ACT_SET_BOTH 0x0003 /** Host command action : Get Rx */ -#define HostCmd_ACT_GET_RX 0x0004 +#define HostCmd_ACT_GET_RX 0x0004 /** Host command action : Get Tx */ -#define HostCmd_ACT_GET_TX 0x0008 +#define HostCmd_ACT_GET_TX 0x0008 /** Host command action : Get both Rx and Tx */ -#define HostCmd_ACT_GET_BOTH 0x000c +#define HostCmd_ACT_GET_BOTH 0x000c /** General Result Code*/ /** General result code OK */ -#define HostCmd_RESULT_OK 0x0000 +#define HostCmd_RESULT_OK 0x0000 /** Genenral error */ -#define HostCmd_RESULT_ERROR 0x0001 +#define HostCmd_RESULT_ERROR 0x0001 /** Command is not valid */ -#define HostCmd_RESULT_NOT_SUPPORT 0x0002 +#define HostCmd_RESULT_NOT_SUPPORT 0x0002 /** Command is pending */ -#define HostCmd_RESULT_PENDING 0x0003 +#define HostCmd_RESULT_PENDING 0x0003 /** System is busy (command ignored) */ -#define HostCmd_RESULT_BUSY 0x0004 +#define HostCmd_RESULT_BUSY 0x0004 /** Data buffer is not big enough */ -#define HostCmd_RESULT_PARTIAL_DATA 0x0005 +#define HostCmd_RESULT_PARTIAL_DATA 0x0005 /* Define action or option for HostCmd_CMD_MAC_CONTROL */ /** MAC action : Rx on */ -#define HostCmd_ACT_MAC_RX_ON 0x0001 +#define HostCmd_ACT_MAC_RX_ON 0x0001 /** MAC action : Tx on */ -#define HostCmd_ACT_MAC_TX_ON 0x0002 +#define HostCmd_ACT_MAC_TX_ON 0x0002 /** MAC action : WEP enable */ -#define HostCmd_ACT_MAC_WEP_ENABLE 0x0008 +#define HostCmd_ACT_MAC_WEP_ENABLE 0x0008 /** MAC action : EthernetII enable */ -#define HostCmd_ACT_MAC_ETHERNETII_ENABLE 0x0010 +#define HostCmd_ACT_MAC_ETHERNETII_ENABLE 0x0010 /** MAC action : Promiscous mode enable */ -#define HostCmd_ACT_MAC_PROMISCUOUS_ENABLE 0x0080 +#define HostCmd_ACT_MAC_PROMISCUOUS_ENABLE 0x0080 /** MAC action : All multicast enable */ -#define HostCmd_ACT_MAC_ALL_MULTICAST_ENABLE 0x0100 +#define HostCmd_ACT_MAC_ALL_MULTICAST_ENABLE 0x0100 /** MAC action : RTS/CTS enable */ -#define HostCmd_ACT_MAC_RTS_CTS_ENABLE 0x0200 +#define HostCmd_ACT_MAC_RTS_CTS_ENABLE 0x0200 /** MAC action : Strict protection enable */ -#define HostCmd_ACT_MAC_STRICT_PROTECTION_ENABLE 0x0400 +#define HostCmd_ACT_MAC_STRICT_PROTECTION_ENABLE 0x0400 /** MAC action : Force 11n protection disable */ -#define HostCmd_ACT_MAC_FORCE_11N_PROTECTION_OFF 0x0800 +#define HostCmd_ACT_MAC_FORCE_11N_PROTECTION_OFF 0x0800 /** MAC action : Ad-Hoc G protection on */ -#define HostCmd_ACT_MAC_ADHOC_G_PROTECTION_ON 0x2000 +#define HostCmd_ACT_MAC_ADHOC_G_PROTECTION_ON 0x2000 /** MAC action : Static-Dynamic BW enable */ -#define HostCmd_ACT_MAC_STATIC_DYNAMIC_BW_ENABLE MBIT(16) +#define HostCmd_ACT_MAC_STATIC_DYNAMIC_BW_ENABLE MBIT(16) /** MAC action : Dynamic BW */ -#define HostCmd_ACT_MAC_DYNAMIC_BW MBIT(17) +#define HostCmd_ACT_MAC_DYNAMIC_BW MBIT(17) /* Define action or option for HostCmd_CMD_802_11_SCAN */ /** Scan type : BSS */ -#define HostCmd_BSS_MODE_BSS 0x0001 +#define HostCmd_BSS_MODE_BSS 0x0001 /** Scan type : IBSS */ -#define HostCmd_BSS_MODE_IBSS 0x0002 +#define HostCmd_BSS_MODE_IBSS 0x0002 /** Scan type : Any */ -#define HostCmd_BSS_MODE_ANY 0x0003 +#define HostCmd_BSS_MODE_ANY 0x0003 /** Define bitmap conditions for HOST_SLEEP_CFG : GPIO FF */ -#define HOST_SLEEP_CFG_GPIO_FF 0xff +#define HOST_SLEEP_CFG_GPIO_FF 0xff /** Define bitmap conditions for HOST_SLEEP_CFG : GAP FF */ -#define HOST_SLEEP_CFG_GAP_FF 0xff +#define HOST_SLEEP_CFG_GAP_FF 0xff /** Buffer Constants */ /** Number of command buffers */ -#define MRVDRV_NUM_OF_CMD_BUFFER 30 +#define MRVDRV_NUM_OF_CMD_BUFFER 30 /** Maximum number of BSS Descriptors */ -#define MRVDRV_MAX_BSSID_LIST 200 +#define MRVDRV_MAX_BSSID_LIST 200 /** Host command flag in command */ -#define CMD_F_HOSTCMD (1 << 0) +#define CMD_F_HOSTCMD (1 << 0) /** command cancel flag in command */ -#define CMD_F_CANCELED (1 << 1) +#define CMD_F_CANCELED (1 << 1) /** scan command flag */ -#define CMD_F_SCAN (1 << 2) +#define CMD_F_SCAN (1 << 2) /** Host Command ID bit mask (bit 11:0) */ -#define HostCmd_CMD_ID_MASK 0x0fff +#define HostCmd_CMD_ID_MASK 0x0fff /** Host Command Sequence number mask (bit 7:0) */ -#define HostCmd_SEQ_NUM_MASK 0x00ff +#define HostCmd_SEQ_NUM_MASK 0x00ff /** Host Command BSS number mask (bit 11:8) */ -#define HostCmd_BSS_NUM_MASK 0x0f00 +#define HostCmd_BSS_NUM_MASK 0x0f00 /** Host Command BSS type mask (bit 15:12) */ -#define HostCmd_BSS_TYPE_MASK 0xf000 +#define HostCmd_BSS_TYPE_MASK 0xf000 /** Set BSS information to Host Command */ -#define HostCmd_SET_SEQ_NO_BSS_INFO(seq, num, type) \ - ((((seq) & 0x00ff) | \ - (((num) & 0x000f) << 8)) | \ - (((type) & 0x000f) << 12)) +#define HostCmd_SET_SEQ_NO_BSS_INFO(seq, num, type) \ + ((((seq)&0x00ff) | (((num)&0x000f) << 8)) | (((type)&0x000f) << 12)) /** Get Sequence Number from Host Command (bit 7:0) */ -#define HostCmd_GET_SEQ_NO(seq) \ - ((seq) & HostCmd_SEQ_NUM_MASK) +#define HostCmd_GET_SEQ_NO(seq) ((seq)&HostCmd_SEQ_NUM_MASK) /** Get BSS number from Host Command (bit 11:8) */ -#define HostCmd_GET_BSS_NO(seq) \ - (((seq) & HostCmd_BSS_NUM_MASK) >> 8) +#define HostCmd_GET_BSS_NO(seq) (((seq)&HostCmd_BSS_NUM_MASK) >> 8) /** Get BSS type from Host Command (bit 15:12) */ -#define HostCmd_GET_BSS_TYPE(seq) \ - (((seq) & HostCmd_BSS_TYPE_MASK) >> 12) +#define HostCmd_GET_BSS_TYPE(seq) (((seq)&HostCmd_BSS_TYPE_MASK) >> 12) /** Card Event definition : Dummy host wakeup signal */ -#define EVENT_DUMMY_HOST_WAKEUP_SIGNAL 0x00000001 +#define EVENT_DUMMY_HOST_WAKEUP_SIGNAL 0x00000001 /** Card Event definition : Link lost */ -#define EVENT_LINK_LOST 0x00000003 +#define EVENT_LINK_LOST 0x00000003 /** Card Event definition : Link sensed */ -#define EVENT_LINK_SENSED 0x00000004 +#define EVENT_LINK_SENSED 0x00000004 /** Card Event definition : MIB changed */ -#define EVENT_MIB_CHANGED 0x00000006 +#define EVENT_MIB_CHANGED 0x00000006 /** Card Event definition : Init done */ -#define EVENT_INIT_DONE 0x00000007 +#define EVENT_INIT_DONE 0x00000007 /** Card Event definition : Deauthenticated */ -#define EVENT_DEAUTHENTICATED 0x00000008 +#define EVENT_DEAUTHENTICATED 0x00000008 /** Card Event definition : Disassociated */ -#define EVENT_DISASSOCIATED 0x00000009 +#define EVENT_DISASSOCIATED 0x00000009 /** Card Event definition : Power save awake */ -#define EVENT_PS_AWAKE 0x0000000a +#define EVENT_PS_AWAKE 0x0000000a /** Card Event definition : Power save sleep */ -#define EVENT_PS_SLEEP 0x0000000b +#define EVENT_PS_SLEEP 0x0000000b /** Card Event definition : MIC error multicast */ -#define EVENT_MIC_ERR_MULTICAST 0x0000000d +#define EVENT_MIC_ERR_MULTICAST 0x0000000d /** Card Event definition : MIC error unicast */ -#define EVENT_MIC_ERR_UNICAST 0x0000000e +#define EVENT_MIC_ERR_UNICAST 0x0000000e /** Card Event definition : Ad-Hoc BCN lost */ -#define EVENT_ADHOC_BCN_LOST 0x00000011 +#define EVENT_ADHOC_BCN_LOST 0x00000011 /** Card Event definition : Stop Tx */ -#define EVENT_STOP_TX 0x00000013 +#define EVENT_STOP_TX 0x00000013 /** Card Event definition : Start Tx */ -#define EVENT_START_TX 0x00000014 +#define EVENT_START_TX 0x00000014 /** Card Event definition : Channel switch */ -#define EVENT_CHANNEL_SWITCH 0x00000015 +#define EVENT_CHANNEL_SWITCH 0x00000015 /** Card Event definition : MEAS report ready */ -#define EVENT_MEAS_REPORT_RDY 0x00000016 +#define EVENT_MEAS_REPORT_RDY 0x00000016 /** Card Event definition : WMM status change */ -#define EVENT_WMM_STATUS_CHANGE 0x00000017 +#define EVENT_WMM_STATUS_CHANGE 0x00000017 /** Card Event definition : BG scan report */ -#define EVENT_BG_SCAN_REPORT 0x00000018 +#define EVENT_BG_SCAN_REPORT 0x00000018 /** Card Event definition : BG scan stopped */ -#define EVENT_BG_SCAN_STOPPED 0x00000065 +#define EVENT_BG_SCAN_STOPPED 0x00000065 /** Card Event definition : Beacon RSSI low */ -#define EVENT_RSSI_LOW 0x00000019 +#define EVENT_RSSI_LOW 0x00000019 /** Card Event definition : Beacon SNR low */ -#define EVENT_SNR_LOW 0x0000001a +#define EVENT_SNR_LOW 0x0000001a /** Card Event definition : Maximum fail */ -#define EVENT_MAX_FAIL 0x0000001b +#define EVENT_MAX_FAIL 0x0000001b /** Card Event definition : Beacon RSSI high */ -#define EVENT_RSSI_HIGH 0x0000001c +#define EVENT_RSSI_HIGH 0x0000001c /** Card Event definition : Beacon SNR high */ -#define EVENT_SNR_HIGH 0x0000001d +#define EVENT_SNR_HIGH 0x0000001d /** Card Event definition : IBSS coalsced */ -#define EVENT_IBSS_COALESCED 0x0000001e +#define EVENT_IBSS_COALESCED 0x0000001e /** Event definition : IBSS station connected */ -#define EVENT_IBSS_STATION_CONNECT 0x00000020 +#define EVENT_IBSS_STATION_CONNECT 0x00000020 /** Event definition : IBSS station dis-connected */ -#define EVENT_IBSS_STATION_DISCONNECT 0x00000021 +#define EVENT_IBSS_STATION_DISCONNECT 0x00000021 /** Card Event definition : Data RSSI low */ -#define EVENT_DATA_RSSI_LOW 0x00000024 +#define EVENT_DATA_RSSI_LOW 0x00000024 /** Card Event definition : Data SNR low */ -#define EVENT_DATA_SNR_LOW 0x00000025 +#define EVENT_DATA_SNR_LOW 0x00000025 /** Card Event definition : Data RSSI high */ -#define EVENT_DATA_RSSI_HIGH 0x00000026 +#define EVENT_DATA_RSSI_HIGH 0x00000026 /** Card Event definition : Data SNR high */ -#define EVENT_DATA_SNR_HIGH 0x00000027 +#define EVENT_DATA_SNR_HIGH 0x00000027 /** Card Event definition : Link Quality */ -#define EVENT_LINK_QUALITY 0x00000028 +#define EVENT_LINK_QUALITY 0x00000028 /** Card Event definition : Port release event */ -#define EVENT_PORT_RELEASE 0x0000002b +#define EVENT_PORT_RELEASE 0x0000002b /** Card Event definition : Pre-Beacon Lost */ -#define EVENT_PRE_BEACON_LOST 0x00000031 +#define EVENT_PRE_BEACON_LOST 0x00000031 /** Card Event definition : Add BA event */ -#define EVENT_ADDBA 0x00000033 +#define EVENT_ADDBA 0x00000033 /** Card Event definition : Del BA event */ -#define EVENT_DELBA 0x00000034 +#define EVENT_DELBA 0x00000034 /** Card Event definition: BA stream timeout*/ -#define EVENT_BA_STREAM_TIMEOUT 0x00000037 +#define EVENT_BA_STREAM_TIMEOUT 0x00000037 /** Card Event definition : AMSDU aggr control */ -#define EVENT_AMSDU_AGGR_CTRL 0x00000042 +#define EVENT_AMSDU_AGGR_CTRL 0x00000042 /** Card Event definition: WEP ICV error */ -#define EVENT_WEP_ICV_ERR 0x00000046 +#define EVENT_WEP_ICV_ERR 0x00000046 /** Card Event definition : Host sleep enable */ -#define EVENT_HS_ACT_REQ 0x00000047 +#define EVENT_HS_ACT_REQ 0x00000047 /** Card Event definition : BW changed */ -#define EVENT_BW_CHANGE 0x00000048 +#define EVENT_BW_CHANGE 0x00000048 #ifdef WIFI_DIRECT_SUPPORT /** WIFIDIRECT generic event */ -#define EVENT_WIFIDIRECT_GENERIC_EVENT 0x00000049 +#define EVENT_WIFIDIRECT_GENERIC_EVENT 0x00000049 /** WIFIDIRECT service discovery event */ -#define EVENT_WIFIDIRECT_SERVICE_DISCOVERY 0x0000004a +#define EVENT_WIFIDIRECT_SERVICE_DISCOVERY 0x0000004a #endif /** Remain on Channel expired event */ -#define EVENT_REMAIN_ON_CHANNEL_EXPIRED 0x0000005f +#define EVENT_REMAIN_ON_CHANNEL_EXPIRED 0x0000005f -#define EVENT_MEF_HOST_WAKEUP 0x0000004f +#define EVENT_MEF_HOST_WAKEUP 0x0000004f /** Card Event definition: Channel switch pending announcment */ -#define EVENT_CHANNEL_SWITCH_ANN 0x00000050 +#define EVENT_CHANNEL_SWITCH_ANN 0x00000050 /** Event definition: Radar Detected by card */ -#define EVENT_RADAR_DETECTED 0x00000053 +#define EVENT_RADAR_DETECTED 0x00000053 /** Event definition: Radar Detected by card */ -#define EVENT_CHANNEL_REPORT_RDY 0x00000054 +#define EVENT_CHANNEL_REPORT_RDY 0x00000054 /** Event definition: Scan results through event */ -#define EVENT_EXT_SCAN_REPORT 0x00000058 +#define EVENT_EXT_SCAN_REPORT 0x00000058 /** Enhance ext scan done event */ -#define EVENT_EXT_SCAN_STATUS_REPORT 0x0000007f +#define EVENT_EXT_SCAN_STATUS_REPORT 0x0000007f /** Event definition : FW debug information */ -#define EVENT_FW_DEBUG_INFO 0x00000063 +#define EVENT_FW_DEBUG_INFO 0x00000063 /** Event definition: RXBA_SYNC */ -#define EVENT_RXBA_SYNC 0x00000059 +#define EVENT_RXBA_SYNC 0x00000059 #ifdef UAP_SUPPORT /** Event ID: STA deauth */ -#define EVENT_MICRO_AP_STA_DEAUTH 0x0000002c +#define EVENT_MICRO_AP_STA_DEAUTH 0x0000002c /** Event ID: STA assoicated */ -#define EVENT_MICRO_AP_STA_ASSOC 0x0000002d +#define EVENT_MICRO_AP_STA_ASSOC 0x0000002d /** Event ID: BSS started */ -#define EVENT_MICRO_AP_BSS_START 0x0000002e +#define EVENT_MICRO_AP_BSS_START 0x0000002e /** Event ID: BSS idle event */ -#define EVENT_MICRO_AP_BSS_IDLE 0x00000043 +#define EVENT_MICRO_AP_BSS_IDLE 0x00000043 /** Event ID: BSS active event */ -#define EVENT_MICRO_AP_BSS_ACTIVE 0x00000044 +#define EVENT_MICRO_AP_BSS_ACTIVE 0x00000044 /** Event ID: MIC countermeasures event */ -#define EVENT_MICRO_AP_MIC_COUNTERMEASURES 0x0000004c +#define EVENT_MICRO_AP_MIC_COUNTERMEASURES 0x0000004c #endif /* UAP_SUPPORT */ /** Event ID: TX data pause event */ -#define EVENT_TX_DATA_PAUSE 0x00000055 +#define EVENT_TX_DATA_PAUSE 0x00000055 /** Event ID: SAD Report */ -#define EVENT_SAD_REPORT 0x00000066 +#define EVENT_SAD_REPORT 0x00000066 /** Event ID: Tx status */ -#define EVENT_TX_STATUS_REPORT 0x00000074 +#define EVENT_TX_STATUS_REPORT 0x00000074 -#define EVENT_BT_COEX_WLAN_PARA_CHANGE 0x00000076 +#define EVENT_BT_COEX_WLAN_PARA_CHANGE 0x00000076 #if defined(PCIE) -#define EVENT_SSU_DUMP_DMA 0x0000008C +#define EVENT_SSU_DUMP_DMA 0x0000008C #endif -#define EVENT_VDLL_IND 0x00000081 -#define EVENT_EXCEED_MAX_P2P_CONN 0x00000089 +#define EVENT_VDLL_IND 0x00000081 +#define EVENT_EXCEED_MAX_P2P_CONN 0x00000089 -#define EVENT_FW_HANG_REPORT 0x0000008F +#define EVENT_FW_HANG_REPORT 0x0000008F -#define EVENT_FW_DUMP_INFO 0x00000073 +#define EVENT_FW_DUMP_INFO 0x00000073 /** Event ID mask */ -#define EVENT_ID_MASK 0xffff +#define EVENT_ID_MASK 0xffff /** BSS number mask */ -#define BSS_NUM_MASK 0xf +#define BSS_NUM_MASK 0xf /** Get BSS number from event cause (bit 23:16) */ -#define EVENT_GET_BSS_NUM(event_cause) \ - (((event_cause) >> 16) & BSS_NUM_MASK) +#define EVENT_GET_BSS_NUM(event_cause) (((event_cause) >> 16) & BSS_NUM_MASK) /** Get BSS type from event cause (bit 31:24) */ -#define EVENT_GET_BSS_TYPE(event_cause) \ - (((event_cause) >> 24) & 0x00ff) +#define EVENT_GET_BSS_TYPE(event_cause) (((event_cause) >> 24) & 0x00ff) /** Event_WEP_ICV_ERR structure */ typedef MLAN_PACK_START struct _Event_WEP_ICV_ERR { - /** Reason code */ + /** Reason code */ t_u16 reason_code; - /** Source MAC address */ + /** Source MAC address */ t_u8 src_mac_addr[MLAN_MAC_ADDR_LENGTH]; - /** WEP decryption used key */ + /** WEP decryption used key */ t_u8 wep_key_index; - /** WEP key length */ + /** WEP key length */ t_u8 wep_key_length; - /** WEP key */ + /** WEP key */ 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 */ + /** Timestamp */ t_u8 time_stamp[8]; - /** Beacon interval */ + /** Beacon interval */ t_u16 beacon_interval; - /** Capabilities*/ + /** 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 */ + /** Element ID */ t_u8 element_id; - /** Length */ + /** Length */ t_u8 length; - /** IE data */ + /** IE data */ t_u8 data[1]; } MLAN_PACK_END WLAN_802_11_VARIABLE_IEs; /** TLV related data structures*/ #if defined(STA_SUPPORT) /** Pairwise Cipher Suite length */ -#define PAIRWISE_CIPHER_SUITE_LEN 4 +#define PAIRWISE_CIPHER_SUITE_LEN 4 /** AKM Suite length */ -#define AKM_SUITE_LEN 4 +#define AKM_SUITE_LEN 4 /** MFPC bit in RSN capability */ -#define MFPC_BIT 7 +#define MFPC_BIT 7 /** MFPR bit in RSN capability */ -#define MFPR_BIT 6 +#define MFPR_BIT 6 #endif /** Bit mask for TxPD status field for null packet */ #define MRVDRV_TxPD_POWER_MGMT_NULL_PACKET 0x01 @@ -1891,163 +1950,163 @@ typedef MLAN_PACK_START struct _WLAN_802_11_VARIABLE_IEs { #define MRVDRV_TxPD_POWER_MGMT_LAST_PACKET 0x08 /** Bit mask for TxPD flags field for Tx status report */ -#define MRVDRV_TxPD_FLAGS_TX_PACKET_STATUS MBIT(5) +#define MRVDRV_TxPD_FLAGS_TX_PACKET_STATUS MBIT(5) /** Packet type: 802.11 */ -#define PKT_TYPE_802DOT11 0x05 +#define PKT_TYPE_802DOT11 0x05 #define PKT_TYPE_MGMT_FRAME 0xE5 /** Packet type: AMSDU */ -#define PKT_TYPE_AMSDU 0xE6 +#define PKT_TYPE_AMSDU 0xE6 /** Packet type: BAR */ -#define PKT_TYPE_BAR 0xE7 +#define PKT_TYPE_BAR 0xE7 /** Packet type: debugging */ -#define PKT_TYPE_DEBUG 0xEF +#define PKT_TYPE_DEBUG 0xEF /** channel number at bit 5-13 */ -#define RXPD_CHAN_MASK 0x3FE0 +#define RXPD_CHAN_MASK 0x3FE0 /** Rate control mask 15-23 */ -#define TXPD_RATE_MASK 0xff8000 +#define TXPD_RATE_MASK 0xff8000 /** enable bw ctrl in TxPD */ -#define TXPD_BW_ENABLE MBIT(20) +#define TXPD_BW_ENABLE MBIT(20) /** enable tx power ctrl in TxPD */ -#define TXPD_TXPW_ENABLE MBIT(7) +#define TXPD_TXPW_ENABLE MBIT(7) /** sign of power */ -#define TXPD_TXPW_NEGATIVE MBIT(6) +#define TXPD_TXPW_NEGATIVE MBIT(6) /** Enable Rate ctrl in TxPD */ -#define TXPD_TXRATE_ENABLE MBIT(15) +#define TXPD_TXRATE_ENABLE MBIT(15) /** enable retry limit in TxPD */ -#define TXPD_RETRY_ENABLE MBIT(12) +#define TXPD_RETRY_ENABLE MBIT(12) /** TxPD descriptor */ typedef MLAN_PACK_START struct _TxPD { - /** BSS type */ + /** BSS type */ t_u8 bss_type; - /** BSS number */ + /** BSS number */ t_u8 bss_num; - /** Tx packet length */ + /** Tx packet length */ t_u16 tx_pkt_length; - /** Tx packet offset */ + /** Tx packet offset */ t_u16 tx_pkt_offset; - /** Tx packet type */ + /** Tx packet type */ t_u16 tx_pkt_type; - /** Tx Control */ + /** Tx Control */ t_u32 tx_control; - /** Pkt Priority */ + /** Pkt Priority */ t_u8 priority; - /** Transmit Pkt Flags*/ + /** Transmit Pkt Flags*/ t_u8 flags; - /** Amount of time the packet has been queued - * in the driver (units = 2ms)*/ + /** Amount of time the packet has been queued + * in the driver (units = 2ms)*/ t_u8 pkt_delay_2ms; - /** reserved */ + /** reserved */ t_u8 reserved; - /** Tx Control */ + /** Tx Control */ t_u32 tx_control_1; } MLAN_PACK_END TxPD, *PTxPD; /** RxPD Descriptor */ typedef MLAN_PACK_START struct _RxPD { - /** BSS type */ + /** BSS type */ t_u8 bss_type; - /** BSS number */ + /** BSS number */ t_u8 bss_num; - /** Rx Packet Length */ + /** Rx Packet Length */ t_u16 rx_pkt_length; - /** Rx Pkt offset */ + /** Rx Pkt offset */ t_u16 rx_pkt_offset; - /** Rx packet type */ + /** Rx packet type */ t_u16 rx_pkt_type; - /** Sequence number */ + /** Sequence number */ t_u16 seq_num; - /** Packet Priority */ + /** Packet Priority */ t_u8 priority; - /** Rx Packet Rate */ + /** Rx Packet Rate */ t_u8 rx_rate; - /** SNR */ + /** SNR */ t_s8 snr; - /** Noise Floor */ + /** Noise Floor */ 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 5] STBC support Enabled = 1 - * [Bit 6] LDPC support Enabled = 1 - * [Bit 7] [Bit4, Bit7] AX Guard interval, 00, 01, 10 */ + /** [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 5] STBC + * support Enabled = 1 [Bit 6] LDPC support Enabled = 1 [Bit 7] [Bit4, + * Bit7] AX Guard interval, 00, 01, 10 */ t_u8 rate_info; - /** Reserved */ + /** Reserved */ t_u8 reserved[3]; - /** TDLS flags, bit 0: 0=InfraLink, 1=DirectLink */ + /** TDLS flags, bit 0: 0=InfraLink, 1=DirectLink */ t_u8 flags; - /**For SD8887 antenna info: 0 = 2.4G antenna a; 1 = 2.4G antenna b; 3 = 5G antenna; 0xff = invalid value */ + /**For SD8887 antenna info: 0 = 2.4G antenna a; 1 = 2.4G antenna b; 3 = + * 5G antenna; 0xff = invalid value */ t_u8 antenna; - /* [31:0] ToA of the rx packet, [63:32] ToD of the ack for the rx packet Both ToA and ToD are in nanoseconds */ + /* [31:0] ToA of the rx packet, [63:32] ToD of the ack for the rx packet + * Both ToA and ToD are in nanoseconds */ t_u64 toa_tod_tstamps; - /** rx info */ + /** rx info */ t_u32 rx_info; } MLAN_PACK_END RxPD, *PRxPD; /** IEEEtypes_FrameCtl_t*/ #ifdef BIG_ENDIAN_SUPPORT typedef MLAN_PACK_START struct _IEEEtypes_FrameCtl_t { - - /** Order */ - t_u8 order:1; - /** Wep */ - t_u8 wep:1; - /** More Data */ - t_u8 more_data:1; - /** Power Mgmt */ - t_u8 pwr_mgmt:1; - /** Retry */ - t_u8 retry:1; - /** More Frag */ - t_u8 more_frag:1; - /** From DS */ - t_u8 from_ds:1; - /** To DS */ - t_u8 to_ds:1; - /** Sub Type */ - t_u8 sub_type:4; - /** Type */ - t_u8 type:2; - /** Protocol Version */ - t_u8 protocol_version:2; + /** Order */ + t_u8 order : 1; + /** Wep */ + t_u8 wep : 1; + /** More Data */ + t_u8 more_data : 1; + /** Power Mgmt */ + t_u8 pwr_mgmt : 1; + /** Retry */ + t_u8 retry : 1; + /** More Frag */ + t_u8 more_frag : 1; + /** From DS */ + t_u8 from_ds : 1; + /** To DS */ + t_u8 to_ds : 1; + /** Sub Type */ + t_u8 sub_type : 4; + /** Type */ + t_u8 type : 2; + /** Protocol Version */ + 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; - /** Type */ - t_u8 type:2; - /** Sub Type */ - t_u8 sub_type:4; - /** To DS */ - t_u8 to_ds:1; - /** From DS */ - t_u8 from_ds:1; - /** More Frag */ - t_u8 more_frag:1; - /** Retry */ - t_u8 retry:1; - /** Power Mgmt */ - t_u8 pwr_mgmt:1; - /** More Data */ - t_u8 more_data:1; - /** Wep */ - t_u8 wep:1; - /** Order */ - t_u8 order:1; + /** Protocol Version */ + t_u8 protocol_version : 2; + /** Type */ + t_u8 type : 2; + /** Sub Type */ + t_u8 sub_type : 4; + /** To DS */ + t_u8 to_ds : 1; + /** From DS */ + t_u8 from_ds : 1; + /** More Frag */ + t_u8 more_frag : 1; + /** Retry */ + t_u8 retry : 1; + /** Power Mgmt */ + t_u8 pwr_mgmt : 1; + /** More Data */ + t_u8 more_data : 1; + /** Wep */ + t_u8 wep : 1; + /** Order */ + t_u8 order : 1; } MLAN_PACK_END IEEEtypes_FrameCtl_t; #endif /** MrvlIETypes_MgmtFrameSet_t */ typedef MLAN_PACK_START struct _MrvlIETypes_MgmtFrameSet_t { - /** Type */ + /** Type */ t_u16 type; - /** Length */ + /** Length */ t_u16 len; - /** Frame Control */ + /** Frame Control */ IEEEtypes_FrameCtl_t frame_control; /* t_u8 frame_contents[]; */ } MLAN_PACK_END MrvlIETypes_MgmtFrameSet_t; @@ -2063,35 +2122,35 @@ typedef MLAN_PACK_START struct _IEEEtypes_Beacon_t { } MLAN_PACK_END IEEEtypes_Beacon_t; /** Fixed size of station association event */ -#define ASSOC_EVENT_FIX_SIZE 12 +#define ASSOC_EVENT_FIX_SIZE 12 /** MrvlIEtypes_channel_band_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_channel_band_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Band Configuration */ + /** Band Configuration */ Band_Config_t bandcfg; - /** channel */ + /** channel */ t_u8 channel; } MLAN_PACK_END MrvlIEtypes_channel_band_t; #ifdef UAP_SUPPORT /** IEEEtypes_AssocRqst_t */ typedef MLAN_PACK_START struct _IEEEtypes_AssocRqst_t { - /** Capability Info */ + /** Capability Info */ t_u16 cap_info; - /** Listen Interval */ + /** Listen Interval */ t_u16 listen_interval; /* t_u8 ie_buffer[]; */ } MLAN_PACK_END IEEEtypes_AssocRqst_t; /** IEEEtypes_ReAssocRqst_t */ typedef MLAN_PACK_START struct _IEEEtypes_ReAssocRqst_t { - /** Capability Info */ + /** Capability Info */ t_u16 cap_info; - /** Listen Interval */ + /** Listen Interval */ t_u16 listen_interval; - /** Current AP Address */ + /** Current AP Address */ t_u8 current_ap_addr[MLAN_MAC_ADDR_LENGTH]; /* t_u8 ie_buffer[]; */ } MLAN_PACK_END IEEEtypes_ReAssocRqst_t; @@ -2099,51 +2158,51 @@ typedef MLAN_PACK_START struct _IEEEtypes_ReAssocRqst_t { /** wlan_802_11_header */ typedef MLAN_PACK_START struct _wlan_802_11_header { - /** Frame Control */ + /** Frame Control */ t_u16 frm_ctl; - /** Duration ID */ + /** Duration ID */ t_u16 duration_id; - /** Address1 */ + /** Address1 */ mlan_802_11_mac_addr addr1; - /** Address2 */ + /** Address2 */ mlan_802_11_mac_addr addr2; - /** Address3 */ + /** Address3 */ mlan_802_11_mac_addr addr3; - /** Sequence Control */ + /** Sequence Control */ t_u16 seq_ctl; - /** Address4 */ + /** Address4 */ 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 */ + /** Packet Length */ t_u16 frm_len; - /** wlan_802_11_header */ + /** wlan_802_11_header */ wlan_802_11_header wlan_header; } MLAN_PACK_END wlan_mgmt_pkt; #ifdef STA_SUPPORT /** (Beaconsize(256)-5(IEId,len,contrystr(3))/3(FirstChan,NoOfChan,MaxPwr) */ -#define MAX_NO_OF_CHAN 40 +#define MAX_NO_OF_CHAN 40 /** Channel-power table entries */ typedef MLAN_PACK_START struct _chan_power_11d { - /** 11D channel */ + /** 11D channel */ t_u8 chan; - /** Band for channel */ + /** Band for channel */ t_u8 band; - /** 11D channel power */ + /** 11D channel power */ t_u8 pwr; - /** AP seen on channel */ + /** AP seen on channel */ 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 */ + /** 11D channel power per channel */ chan_power_11d_t chan_pwr[MAX_NO_OF_CHAN]; - /** 11D number of channels */ + /** 11D number of channels */ t_u8 no_of_chan; } MLAN_PACK_END parsed_region_chan_11d_t; #endif /* STA_SUPPORT */ @@ -2151,232 +2210,233 @@ typedef MLAN_PACK_START struct _parsed_region_chan_11d { /** ChanScanMode_t */ typedef MLAN_PACK_START struct _ChanScanMode_t { #ifdef BIG_ENDIAN_SUPPORT - /** Reserved */ - t_u8 reserved_7:1; - /** First passive scan then active scan */ - t_u8 passive_to_active_scan:1; - /** First channel in scan */ - t_u8 first_chan:1; - /** Enable hidden ssid report */ - t_u8 hidden_ssid_report:1; - /** Enable probe response timeout */ - t_u8 rsp_timeout_en:1; - /** Multidomain scan mode */ - t_u8 multidomain_scan:1; - /** Disble channel filtering flag */ - t_u8 disable_chan_filt:1; - /** Channel scan mode passive flag */ - t_u8 passive_scan:1; + /** Reserved */ + t_u8 reserved_7 : 1; + /** First passive scan then active scan */ + t_u8 passive_to_active_scan : 1; + /** First channel in scan */ + t_u8 first_chan : 1; + /** Enable hidden ssid report */ + t_u8 hidden_ssid_report : 1; + /** Enable probe response timeout */ + t_u8 rsp_timeout_en : 1; + /** Multidomain scan mode */ + t_u8 multidomain_scan : 1; + /** Disble channel filtering flag */ + t_u8 disable_chan_filt : 1; + /** Channel scan mode passive flag */ + t_u8 passive_scan : 1; #else - /** Channel scan mode passive flag */ - t_u8 passive_scan:1; - /** Disble channel filtering flag */ - t_u8 disable_chan_filt:1; - /** Multidomain scan mode */ - t_u8 multidomain_scan:1; - /** Enable probe response timeout */ - t_u8 rsp_timeout_en:1; - /** Enable hidden ssid report */ - t_u8 hidden_ssid_report:1; - /** First channel in scan */ - t_u8 first_chan:1; - /** First passive scan then active scan */ - t_u8 passive_to_active_scan:1; - /** Reserved */ - t_u8 reserved_7:1; + /** Channel scan mode passive flag */ + t_u8 passive_scan : 1; + /** Disble channel filtering flag */ + t_u8 disable_chan_filt : 1; + /** Multidomain scan mode */ + t_u8 multidomain_scan : 1; + /** Enable probe response timeout */ + t_u8 rsp_timeout_en : 1; + /** Enable hidden ssid report */ + t_u8 hidden_ssid_report : 1; + /** First channel in scan */ + t_u8 first_chan : 1; + /** First passive scan then active scan */ + t_u8 passive_to_active_scan : 1; + /** Reserved */ + t_u8 reserved_7 : 1; #endif } MLAN_PACK_END ChanScanMode_t; /** ChanScanParamSet_t */ typedef MLAN_PACK_START struct _ChanScanParamSet_t { - /** Channel scan parameter : band config */ + /** Channel scan parameter : band config */ Band_Config_t bandcfg; - /** Channel scan parameter : Channel number */ + /** Channel scan parameter : Channel number */ t_u8 chan_number; - /** Channel scan parameter : Channel scan mode */ + /** Channel scan parameter : Channel scan mode */ ChanScanMode_t chan_scan_mode; - /** Channel scan parameter : Minimum scan time */ + /** Channel scan parameter : Minimum scan time */ t_u16 min_scan_time; - /** Channel scan parameter : Maximum scan time */ + /** Channel scan parameter : Maximum scan time */ t_u16 max_scan_time; } MLAN_PACK_END ChanScanParamSet_t; /** MrvlIEtypes_ChanListParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_ChanListParamSet_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Channel scan parameters */ + /** Channel scan parameters */ ChanScanParamSet_t chan_scan_param[1]; } MLAN_PACK_END MrvlIEtypes_ChanListParamSet_t; /** MrvlIEtypes_EESParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_EESParamSet_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** EES scan mode */ + /** EES scan mode */ t_u16 ees_mode; - /** EES report condition */ + /** EES report condition */ t_u16 report_cond; - /** EES High Period scan interval */ + /** EES High Period scan interval */ t_u16 high_period; - /** EES High Period scan count */ + /** EES High Period scan count */ t_u16 high_period_count; - /** EES Medium Period scan interval */ + /** EES Medium Period scan interval */ t_u16 mid_period; - /** EES Medium Period scan count */ + /** EES Medium Period scan count */ t_u16 mid_period_count; - /** EES Low Period scan interval */ + /** EES Low Period scan interval */ t_u16 low_period; - /** EES Low Period scan count */ + /** EES Low Period scan count */ t_u16 low_period_count; } MLAN_PACK_END MrvlIEtypes_EESParamSet_t; /** MrvlIEtype_EESNetworkCfg_t */ typedef MLAN_PACK_START struct _MrvlIEtype_EESNetworkCfg_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Number of networks in the list */ + /** Number of networks in the list */ t_u8 network_count; - /** Maximum number of connection */ + /** Maximum number of connection */ t_u8 max_conn_count; - /** Black List Exp */ + /** Black List Exp */ t_u8 black_list_exp; } MLAN_PACK_END MrvlIEtype_EESNetworkCfg_t; /** ChanBandParamSet_t */ typedef struct _ChanBandParamSet_t { - /** Channel scan parameter : band config */ + /** Channel scan parameter : band config */ Band_Config_t bandcfg; - /** Channel number */ + /** Channel number */ t_u8 chan_number; } ChanBandParamSet_t; /** MrvlIEtypes_ChanBandListParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_ChanBandListParamSet_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Channel Band parameters */ + /** Channel Band parameters */ ChanBandParamSet_t chan_band_param[1]; } MLAN_PACK_END MrvlIEtypes_ChanBandListParamSet_t; /** MrvlIEtypes_RatesParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_RatesParamSet_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Rates */ + /** Rates */ t_u8 rates[1]; } MLAN_PACK_END MrvlIEtypes_RatesParamSet_t; /** _MrvlIEtypes_Bssid_List_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_Bssid_List_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** BSSID */ + /** BSSID */ t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; } MLAN_PACK_END MrvlIEtypes_Bssid_List_t; /** MrvlIEtypes_SsIdParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_SsIdParamSet_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** SSID */ + /** SSID */ t_u8 ssid[1]; } MLAN_PACK_END MrvlIEtypes_SsIdParamSet_t; - /**MrvlIEtypes_AssocType_t */ +/**MrvlIEtypes_AssocType_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_HostMlme_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Authentication type */ + /** Authentication type */ t_u8 host_mlme; } MLAN_PACK_END MrvlIEtypes_HostMlme_t; /** MrvlIEtypes_NumProbes_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_NumProbes_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Number of probes */ + /** Number of probes */ t_u16 num_probes; } MLAN_PACK_END MrvlIEtypes_NumProbes_t; /** MrvlIEtypes_WildCardSsIdParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_WildCardSsIdParamSet_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Maximum SSID length */ + /** Maximum SSID length */ t_u8 max_ssid_length; - /** SSID */ + /** SSID */ t_u8 ssid[1]; } MLAN_PACK_END MrvlIEtypes_WildCardSsIdParamSet_t; /**TSF data size */ -#define TSF_DATA_SIZE 8 +#define TSF_DATA_SIZE 8 /** Table of TSF values returned in the scan result */ typedef MLAN_PACK_START struct _MrvlIEtypes_TsfTimestamp_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** the length of each TSF data is 8 bytes, could be multiple TSF here */ + /** the length of each TSF data is 8 bytes, could be multiple TSF here + */ t_u8 tsf_data[1]; } MLAN_PACK_END MrvlIEtypes_TsfTimestamp_t; /** CfParamSet_t */ typedef MLAN_PACK_START struct _CfParamSet_t { - /** CF parameter : Count */ + /** CF parameter : Count */ t_u8 cfp_cnt; - /** CF parameter : Period */ + /** CF parameter : Period */ t_u8 cfp_period; - /** CF parameter : Duration */ + /** CF parameter : Duration */ t_u16 cfp_max_duration; - /** CF parameter : Duration remaining */ + /** CF parameter : Duration remaining */ t_u16 cfp_duration_remaining; } MLAN_PACK_END CfParamSet_t; /** IbssParamSet_t */ typedef MLAN_PACK_START struct _IbssParamSet_t { - /** ATIM window value */ + /** ATIM window value */ t_u16 atim_window; } MLAN_PACK_END IbssParamSet_t; /** MrvlIEtypes_SsParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_SsParamSet_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** CF/IBSS parameters sets */ + /** CF/IBSS parameters sets */ union { - /** CF parameter set */ + /** CF parameter set */ CfParamSet_t cf_param_set[1]; - /** IBSS parameter set */ + /** 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 */ + /** FH parameter : Dwell time */ t_u16 dwell_time; - /** FH parameter : Hop set */ + /** FH parameter : Hop set */ t_u8 hop_set; - /** FH parameter : Hop pattern */ + /** FH parameter : Hop pattern */ t_u8 hop_pattern; - /** FH parameter : Hop index */ + /** FH parameter : Hop index */ t_u8 hop_index; } MLAN_PACK_END FhParamSet_t; /** DsParamSet_t */ typedef MLAN_PACK_START struct _DsParamSet_t { - /** Current channel number */ + /** Current channel number */ t_u8 current_chan; } MLAN_PACK_END DsParamSet_t; /** MrvlIEtypes_PhyParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_PhyParamSet_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** FH/DS parameters */ + /** FH/DS parameters */ union { - /** FH parameter set */ + /** FH parameter set */ FhParamSet_t fh_param_set[1]; - /** DS parameter set */ + /** DS parameter set */ DsParamSet_t ds_param_set[1]; } fh_ds; } MLAN_PACK_END MrvlIEtypes_PhyParamSet_t; @@ -2384,24 +2444,24 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_PhyParamSet_t { /* Auth type to be used in the Authentication portion of an Assoc seq */ /** MrvlIEtypes_AuthType_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_AuthType_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Authentication type */ + /** Authentication type */ t_u16 auth_type; } MLAN_PACK_END MrvlIEtypes_AuthType_t; /** MrvlIEtypes_ScanChanGap_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_ScanChanGap_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Time gap in units to TUs to be used between - * two consecutive channels scan */ + /** Time gap in units to TUs to be used between + * two consecutive channels scan */ t_u16 gap; } MLAN_PACK_END MrvlIEtypes_ScanChanGap_t; /** channel statictics */ typedef MLAN_PACK_START struct _chan_statistics_t { - /** channle number */ + /** channle number */ t_u8 chan_num; /** band info */ Band_Config_t bandcfg; @@ -2419,16 +2479,15 @@ typedef MLAN_PACK_START struct _chan_statistics_t { /** channel statictics tlv */ typedef MLAN_PACK_START struct _MrvlIEtypes_ChannelStats_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** channel statictics */ + /** channel statictics */ chan_statistics_t chanStat[]; } MLAN_PACK_END MrvlIEtypes_ChannelStats_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]; @@ -2439,373 +2498,374 @@ typedef MLAN_PACK_START struct { /** MrvlIEtypes_RxBaSync_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_RxBaSync_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** mac address */ + /** mac address */ t_u8 mac[MLAN_MAC_ADDR_LENGTH]; - /** tid */ + /** tid */ t_u8 tid; - /** reserved field */ + /** reserved field */ t_u8 reserved; - /** start seq num */ + /** start seq num */ t_u16 seq_num; - /** bitmap len */ + /** bitmap len */ t_u16 bitmap_len; - /** bitmap */ + /** bitmap */ t_u8 bitmap[1]; } MLAN_PACK_END MrvlIEtypes_RxBaSync_t; /** MrvlIEtypes_RsnParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_RsnParamSet_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** RSN IE */ + /** RSN IE */ t_u8 rsn_ie[]; } MLAN_PACK_END MrvlIEtypes_RsnParamSet_t; /** Key Info flag for multicast key */ -#define KEY_INFO_MCAST_KEY 0x01 +#define KEY_INFO_MCAST_KEY 0x01 /** Key Info flag for unicast key */ -#define KEY_INFO_UCAST_KEY 0x02 +#define KEY_INFO_UCAST_KEY 0x02 /** Key Info flag for enable key */ -#define KEY_INFO_ENABLE_KEY 0x04 +#define KEY_INFO_ENABLE_KEY 0x04 /** Key Info flag for default key */ -#define KEY_INFO_DEFAULT_KEY 0x08 +#define KEY_INFO_DEFAULT_KEY 0x08 /** Key Info flag for TX key */ -#define KEY_INFO_TX_KEY 0x10 +#define KEY_INFO_TX_KEY 0x10 /** Key Info flag for RX key */ -#define KEY_INFO_RX_KEY 0x20 -#define KEY_INFO_CMAC_AES_KEY 0x400 +#define KEY_INFO_RX_KEY 0x20 +#define KEY_INFO_CMAC_AES_KEY 0x400 /** PN size for WPA/WPA2 */ -#define WPA_PN_SIZE 8 +#define WPA_PN_SIZE 8 /** PN size for PMF IGTK */ -#define IGTK_PN_SIZE 8 +#define IGTK_PN_SIZE 8 /** WAPI KEY size */ -#define WAPI_KEY_SIZE 32 +#define WAPI_KEY_SIZE 32 /** key params fix size */ -#define KEY_PARAMS_FIXED_LEN 10 +#define KEY_PARAMS_FIXED_LEN 10 /** key index mask */ -#define KEY_INDEX_MASK 0xf +#define KEY_INDEX_MASK 0xf /** wep_param */ typedef MLAN_PACK_START struct _wep_param_t { - /** key_len */ + /** key_len */ t_u16 key_len; - /** wep key */ + /** wep key */ t_u8 key[MAX_WEP_KEY_SIZE]; } MLAN_PACK_END wep_param_t; /** tkip_param */ typedef MLAN_PACK_START struct _tkip_param { - /** Rx packet num */ + /** Rx packet num */ t_u8 pn[WPA_PN_SIZE]; - /** key_len */ + /** key_len */ t_u16 key_len; - /** tkip key */ + /** tkip key */ t_u8 key[WPA_TKIP_KEY_LEN]; } MLAN_PACK_END tkip_param; /** aes_param */ typedef MLAN_PACK_START struct _aes_param { - /** Rx packet num */ + /** Rx packet num */ t_u8 pn[WPA_PN_SIZE]; - /** key_len */ + /** key_len */ t_u16 key_len; - /** aes key */ + /** aes key */ t_u8 key[WPA_AES_KEY_LEN]; } MLAN_PACK_END aes_param; /** wapi_param */ typedef MLAN_PACK_START struct _wapi_param { - /** Rx packet num */ + /** Rx packet num */ t_u8 pn[PN_SIZE]; - /** key_len */ + /** key_len */ t_u16 key_len; - /** wapi key */ + /** wapi key */ t_u8 key[WAPI_KEY_SIZE]; } MLAN_PACK_END wapi_param; /** cmac_aes_param */ typedef MLAN_PACK_START struct _cmac_aes_param { - /** IGTK pn */ + /** IGTK pn */ t_u8 ipn[IGTK_PN_SIZE]; - /** key_len */ + /** key_len */ t_u16 key_len; - /** aes key */ + /** aes key */ t_u8 key[CMAC_AES_KEY_LEN]; } MLAN_PACK_END cmac_aes_param; /** gmac_param */ typedef MLAN_PACK_START struct _gcmp_param { - /** GCMP pn */ + /** GCMP pn */ t_u8 pn[WPA_PN_SIZE]; - /** key_len */ + /** key_len */ t_u16 key_len; - /** aes key */ + /** aes key */ t_u8 key[WPA_GCMP_KEY_LEN]; } MLAN_PACK_END gcmp_param; /** ccmp256_param */ typedef MLAN_PACK_START struct _ccmp256_param { - /** CCMP pn */ + /** CCMP pn */ t_u8 pn[WPA_PN_SIZE]; - /** key_len */ + /** key_len */ t_u16 key_len; - /** ccmp256 key */ + /** ccmp256 key */ t_u8 key[WPA_CCMP_256_KEY_LEN]; } MLAN_PACK_END ccmp_256_param; /** MrvlIEtype_KeyParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtype_KeyParamSetV2_t { - /** Type ID */ + /** Type ID */ t_u16 type; - /** Length of Payload */ + /** Length of Payload */ t_u16 length; - /** mac address */ + /** mac address */ t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; - /** key index */ + /** key index */ t_u8 key_idx; - /** Type of Key: WEP=0, TKIP=1, AES=2, WAPI=3 AES_CMAC=4 */ + /** Type of Key: WEP=0, TKIP=1, AES=2, WAPI=3 AES_CMAC=4 */ t_u8 key_type; - /** Key Control Info specific to a key_type_id */ + /** Key Control Info specific to a key_type_id */ t_u16 key_info; union { - /** wep key param */ + /** wep key param */ wep_param_t wep; - /** tkip key param */ + /** tkip key param */ tkip_param tkip; - /** aes key param */ + /** aes key param */ aes_param aes; - /** wapi key param */ + /** wapi key param */ wapi_param wapi; - /** IGTK key param */ + /** IGTK key param */ cmac_aes_param cmac_aes; - /** gcmp key param */ + /** gcmp key param */ gcmp_param gcmp; - /** ccmp 256 key parameters */ + /** ccmp 256 key parameters */ ccmp_256_param ccmp256; } key_params; } MLAN_PACK_END MrvlIEtype_KeyParamSetV2_t; /** HostCmd_DS_802_11_KEY_MATERIAL */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_KEY_MATERIAL { - /** Action */ + /** Action */ t_u16 action; - /** Key parameter set */ + /** Key parameter set */ MrvlIEtype_KeyParamSetV2_t key_param_set; } MLAN_PACK_END HostCmd_DS_802_11_KEY_MATERIAL; /** HostCmd_DS_GTK_REKEY_PARAMS */ typedef MLAN_PACK_START struct _HostCmd_DS_GTK_REKEY_PARAMS { - /** Action */ + /** Action */ t_u16 action; - /** Key confirmation key */ + /** Key confirmation key */ t_u8 kck[MLAN_KCK_LEN]; - /** Key encryption key */ + /** Key encryption key */ t_u8 kek[MLAN_KEK_LEN]; - /** Replay counter low 32 bit */ + /** Replay counter low 32 bit */ t_u32 replay_ctr_low; - /** Replay counter high 32 bit */ + /** Replay counter high 32 bit */ t_u32 replay_ctr_high; } MLAN_PACK_END HostCmd_DS_GTK_REKEY_PARAMS; /** Data structure of WMM QoS information */ typedef MLAN_PACK_START struct _WmmQosInfo_t { #ifdef BIG_ENDIAN_SUPPORT - /** QoS UAPSD */ - t_u8 qos_uapsd:1; - /** Reserved */ - t_u8 reserved:3; - /** Parameter set count */ - t_u8 para_set_count:4; + /** QoS UAPSD */ + t_u8 qos_uapsd : 1; + /** Reserved */ + t_u8 reserved : 3; + /** Parameter set count */ + t_u8 para_set_count : 4; #else - /** Parameter set count */ - t_u8 para_set_count:4; - /** Reserved */ - t_u8 reserved:3; - /** QoS UAPSD */ - t_u8 qos_uapsd:1; -#endif /* BIG_ENDIAN_SUPPORT */ + /** Parameter set count */ + t_u8 para_set_count : 4; + /** Reserved */ + t_u8 reserved : 3; + /** QoS UAPSD */ + t_u8 qos_uapsd : 1; +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END WmmQosInfo_t, *pWmmQosInfo_t; /** Data structure of WMM ECW */ typedef MLAN_PACK_START struct _WmmEcw_t { #ifdef BIG_ENDIAN_SUPPORT - /** Maximum Ecw */ - t_u8 ecw_max:4; - /** Minimum Ecw */ - t_u8 ecw_min:4; + /** Maximum Ecw */ + t_u8 ecw_max : 4; + /** Minimum Ecw */ + t_u8 ecw_min : 4; #else - /** Minimum Ecw */ - t_u8 ecw_min:4; - /** Maximum Ecw */ - t_u8 ecw_max:4; -#endif /* BIG_ENDIAN_SUPPORT */ + /** Minimum Ecw */ + t_u8 ecw_min : 4; + /** Maximum Ecw */ + t_u8 ecw_max : 4; +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END WmmEcw_t, *pWmmEcw_t; /** Data structure of WMM Aci/Aifsn */ typedef MLAN_PACK_START struct _WmmAciAifsn_t { #ifdef BIG_ENDIAN_SUPPORT - /** Reserved */ - t_u8 reserved:1; - /** Aci */ - t_u8 aci:2; - /** Acm */ - t_u8 acm:1; - /** Aifsn */ - t_u8 aifsn:4; + /** Reserved */ + t_u8 reserved : 1; + /** Aci */ + t_u8 aci : 2; + /** Acm */ + t_u8 acm : 1; + /** Aifsn */ + t_u8 aifsn : 4; #else - /** Aifsn */ - t_u8 aifsn:4; - /** Acm */ - t_u8 acm:1; - /** Aci */ - t_u8 aci:2; - /** Reserved */ - t_u8 reserved:1; -#endif /* BIG_ENDIAN_SUPPORT */ + /** Aifsn */ + t_u8 aifsn : 4; + /** Acm */ + t_u8 acm : 1; + /** Aci */ + t_u8 aci : 2; + /** Reserved */ + 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 */ + /** OuiType: 00:50:f2:02 */ t_u8 ouitype[4]; - /** Oui subtype: 01 */ + /** Oui subtype: 01 */ t_u8 ouisubtype; - /** version: 01 */ + /** version: 01 */ t_u8 version; - /** QoS information */ + /** QoS information */ t_u8 qos_info; - /** Reserved */ + /** Reserved */ t_u8 reserved; - /** AC Parameters Record WMM_AC_BE, WMM_AC_BK, WMM_AC_VI, WMM_AC_VO */ + /** AC Parameters Record WMM_AC_BE, WMM_AC_BK, WMM_AC_VI, WMM_AC_VO */ WmmAcParameters_t ac_params[MAX_AC_QUEUES]; } MLAN_PACK_END WmmParameter_t, *pWmmParameter_t; /** Data structure of Host command WMM_PARAM_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_WMM_PARAM_CONFIG { - /** action */ + /** action */ t_u16 action; - /** AC Parameters Record WMM_AC_BE, WMM_AC_BK, WMM_AC_VI, WMM_AC_VO */ + /** AC Parameters Record WMM_AC_BE, WMM_AC_BK, WMM_AC_VI, WMM_AC_VO */ WmmAcParameters_t ac_params[MAX_AC_QUEUES]; } MLAN_PACK_END HostCmd_DS_WMM_PARAM_CONFIG; /* Definition of firmware host command */ /** HostCmd_DS_GEN */ typedef MLAN_PACK_START struct _HostCmd_DS_GEN { - /** Command */ + /** Command */ t_u16 command; - /** Size */ + /** Size */ t_u16 size; - /** Sequence number */ + /** Sequence number */ t_u16 seq_num; - /** Result */ + /** Result */ t_u16 result; } MLAN_PACK_END HostCmd_DS_GEN -; + + ; /** Size of HostCmd_DS_GEN */ -#define S_DS_GEN sizeof(HostCmd_DS_GEN) +#define S_DS_GEN sizeof(HostCmd_DS_GEN) /** mod_group_setting */ typedef MLAN_PACK_START struct _mod_group_setting { - /** modulation group */ + /** modulation group */ t_u8 mod_group; - /** power */ + /** power */ t_u8 power; } MLAN_PACK_END mod_group_setting; /** MrvlIETypes_ChanTRPCConfig_t */ typedef MLAN_PACK_START struct _MrvlIETypes_ChanTRPCConfig_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** start freq */ + /** start freq */ t_u16 start_freq; /* channel width */ t_u8 width; - /** channel number */ + /** channel number */ t_u8 chan_num; - /** mode groups */ + /** mode groups */ mod_group_setting mod_group[]; } MLAN_PACK_END MrvlIETypes_ChanTRPCConfig_t; /* HostCmd_DS_CHANNEL_TRPC_CONFIG */ typedef MLAN_PACK_START struct _HostCmd_DS_CHANNEL_TRPC_CONFIG { - /** action */ + /** action */ t_u16 action; - /** 0/1/2/3 */ + /** 0/1/2/3 */ t_u16 sub_band; - /** chan TRPC config */ + /** chan TRPC config */ MrvlIETypes_ChanTRPCConfig_t tlv[]; } MLAN_PACK_END HostCmd_DS_CHANNEL_TRPC_CONFIG; typedef MLAN_PACK_START struct _HostCmd_DS_MEF_CFG { - /** Criteria */ + /** Criteria */ t_u32 criteria; - /** Number of entries */ + /** Number of entries */ t_u16 nentries; } MLAN_PACK_END HostCmd_DS_MEF_CFG; -#define MAX_NUM_STACK_BYTES 100 +#define MAX_NUM_STACK_BYTES 100 /** mef stack struct*/ typedef MLAN_PACK_START struct _mef_stack { - /** length of byte*/ + /** length of byte*/ t_u16 sp; - /** data of filter items*/ + /** data of filter items*/ t_u8 byte[MAX_NUM_STACK_BYTES]; } MLAN_PACK_END mef_stack; /** mef entry struct */ typedef MLAN_PACK_START struct _mef_entry_header { - /**mode:1->hostsleep;2->non hostsleep mode*/ + /**mode:1->hostsleep;2->non hostsleep mode*/ t_u8 mode; - /**action=0->discard and not wake host - * action=1->discard and wake host - * action=3->allow and wake host*/ + /**action=0->discard and not wake host + * action=1->discard and wake host + * action=3->allow and wake host*/ t_u8 action; } MLAN_PACK_END mef_entry_header; /** mef op struct is to help to generate mef data*/ typedef MLAN_PACK_START struct _mef_op { - /** operand_type*/ + /** operand_type*/ t_u8 operand_type; - /** reserved*/ + /** reserved*/ t_u8 rsvd[3]; - /** data */ + /** data */ t_u8 val[MAX_NUM_BYTE_SEQ + 1]; } MLAN_PACK_END mef_op; /* HostCmd_DS_802_11_SLEEP_PERIOD */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SLEEP_PERIOD { - /** ACT_GET/ACT_SET */ + /** ACT_GET/ACT_SET */ t_u16 action; - /** Sleep Period in msec */ + /** Sleep Period in msec */ 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 */ + /** ACT_GET/ACT_SET */ t_u16 action; - /** Sleep clock error in ppm */ + /** Sleep clock error in ppm */ t_u16 error; - /** Wakeup offset in usec */ + /** Wakeup offset in usec */ t_u16 offset; - /** Clock stabilization time in usec */ + /** Clock stabilization time in usec */ t_u16 stable_time; - /** Control periodic calibration */ + /** Control periodic calibration */ t_u8 cal_control; - /** Control the use of external sleep clock */ + /** Control the use of external sleep clock */ t_u8 external_sleep_clk; - /** Reserved field, should be set to zero */ + /** Reserved field, should be set to zero */ t_u16 reserved; } MLAN_PACK_END HostCmd_DS_802_11_SLEEP_PARAMS; @@ -2817,49 +2877,50 @@ typedef enum _sleep_resp_ctrl { /** Structure definition for the new ieee power save parameters*/ typedef MLAN_PACK_START struct __ps_param { - /** Null packet interval */ + /** Null packet interval */ t_u16 null_pkt_interval; - /** Num dtims */ + /** Num dtims */ t_u16 multiple_dtims; - /** becaon miss interval */ + /** becaon miss interval */ t_u16 bcn_miss_timeout; - /** local listen interval */ + /** local listen interval */ t_u16 local_listen_interval; - /** Adhoc awake period */ + /** Adhoc awake period */ t_u16 adhoc_wake_period; - /** mode - (0x01 - firmware to automatically choose PS_POLL or NULL mode, - * 0x02 - PS_POLL, 0x03 - NULL mode ) - */ + /** mode - (0x01 - firmware to automatically choose PS_POLL or NULL + * mode, 0x02 - PS_POLL, 0x03 - NULL mode ) + */ t_u16 mode; - /** Delay to PS in milliseconds */ + /** Delay to PS in milliseconds */ 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 */ + /** Deep sleep inactivity 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 */ + /** response control 0x00 - response not needed, 0x01 - response needed + */ t_u16 resp_ctrl; } MLAN_PACK_END sleep_confirm_param; /** bitmap for get auto deepsleep */ -#define BITMAP_AUTO_DS 0x01 +#define BITMAP_AUTO_DS 0x01 /** bitmap for sta power save */ -#define BITMAP_STA_PS 0x10 +#define BITMAP_STA_PS 0x10 /** bitmap for beacon timeout */ -#define BITMAP_BCN_TMO 0x20 +#define BITMAP_BCN_TMO 0x20 /** bitmap for uap inactivity based PS */ -#define BITMAP_UAP_INACT_PS 0x100 +#define BITMAP_UAP_INACT_PS 0x100 /** bitmap for uap DTIM PS */ -#define BITMAP_UAP_DTIM_PS 0x200 +#define BITMAP_UAP_DTIM_PS 0x200 /** Structure definition for the new ieee power save parameters*/ typedef MLAN_PACK_START struct _auto_ps_param { - /** bitmap for enable power save mode */ + /** bitmap for enable power save mode */ t_u16 ps_bitmap; /* auto deep sleep parameter, * sta power save parameter @@ -2868,98 +2929,99 @@ typedef MLAN_PACK_START struct _auto_ps_param { } MLAN_PACK_END auto_ps_param; /** fix size for auto ps */ -#define AUTO_PS_FIX_SIZE 4 +#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 */ /** TLV type : beacon timeout */ -#define TLV_TYPE_BCN_TIMEOUT (PROPRIETARY_TLV_BASE_ID + 0x11F) /* 0x011F */ +#define TLV_TYPE_BCN_TIMEOUT (PROPRIETARY_TLV_BASE_ID + 0x11F) /* 0x011F */ /** MrvlIEtypes_auto_ds_param_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_auto_ds_param_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** auto ds param */ + /** auto ds 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** ps param */ + /** ps param */ ps_param param; } MLAN_PACK_END MrvlIEtypes_ps_param_t; /** MrvlIEtypes_bcn_timeout_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_bcn_timeout_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Beacon miss timeout period window */ + /** Beacon miss timeout period window */ t_u16 bcn_miss_tmo_window; - /** Beacon miss timeout period */ + /** Beacon miss timeout period */ t_u16 bcn_miss_tmo_period; - /** Beacon reacquire timeout period window */ + /** Beacon reacquire timeout period window */ t_u16 bcn_rq_tmo_window; - /** Beacon reacquire timeout period */ + /** Beacon reacquire timeout period */ t_u16 bcn_rq_tmo_period; } MLAN_PACK_END MrvlIEtypes_bcn_timeout_t; /** Structure definition for low power mode cfg command */ typedef MLAN_PACK_START struct _HostCmd_DS_LOW_POWER_MODE_CFG { - /** Action */ + /** Action */ t_u16 action; - /** Low power mode */ + /** Low power mode */ t_u16 lpm; } MLAN_PACK_END HostCmd_DS_LOW_POWER_MODE_CFG; /** Structure definition for new power save command */ typedef MLAN_PACK_START struct _HostCmd_DS_PS_MODE_ENH { - /** Action */ + /** Action */ t_u16 action; - /** Data speciifc to 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 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 */ + /* UINT16 Deep sleep inactivity timeout*/ /* For PS sleep confirm - * UINT16 responeCtrl - 0x00 - reponse from fw not needed, 0x01 - response from fw is needed */ + * UINT16 responeCtrl - 0x00 - reponse from fw not needed, 0x01 - + * response from fw is needed */ union { - /** PS param definition */ + /** PS param definition */ ps_param opt_ps; - /** Auto ds param definition */ + /** Auto ds param definition */ auto_ds_param auto_ds; - /** Sleep comfirm param definition */ + /** Sleep comfirm param definition */ sleep_confirm_param sleep_cfm; - /** bitmap for get PS info and Disable PS mode */ + /** bitmap for get PS info and Disable PS mode */ t_u16 ps_bitmap; - /** auto ps param */ + /** auto ps param */ auto_ps_param auto_ps; } params; } MLAN_PACK_END HostCmd_DS_802_11_PS_MODE_ENH; /** FW VERSION tlv */ -#define TLV_TYPE_FW_VER_INFO (PROPRIETARY_TLV_BASE_ID + 0xC7) /* 0x1C7 */ +#define TLV_TYPE_FW_VER_INFO (PROPRIETARY_TLV_BASE_ID + 0xC7) /* 0x1C7 */ /** MrvlIEtypes_fw_ver_info_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_fw_ver_info_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** API id */ + /** API id */ t_u16 api_id; - /** major version */ + /** major version */ t_u8 major_ver; - /** minor version */ + /** minor version */ t_u8 minor_ver; } MLAN_PACK_END MrvlIEtypes_fw_ver_info_t; @@ -2972,62 +3034,62 @@ enum API_VER_ID { }; /** FW AP V15 */ -#define HOST_API_VERSION_V15 15 +#define HOST_API_VERSION_V15 15 /** FW minor version 1 */ -#define FW_MINOR_VERSION_1 1 +#define FW_MINOR_VERSION_1 1 /** UAP FW version 2 */ -#define UAP_FW_VERSION_2 0x2 +#define UAP_FW_VERSION_2 0x2 /** HostCMD_DS_APCMD_ACS_SCAN */ typedef MLAN_PACK_START struct _HostCMD_DS_APCMD_ACS_SCAN { - /** band */ + /** band */ Band_Config_t bandcfg; - /** channel */ + /** channel */ t_u8 chan; } MLAN_PACK_END HostCMD_DS_APCMD_ACS_SCAN; /** HostCmd_DS_GET_HW_SPEC */ typedef MLAN_PACK_START struct _HostCmd_DS_GET_HW_SPEC { - /** HW Interface version number */ + /** HW Interface version number */ t_u16 hw_if_version; - /** HW version number */ + /** HW version number */ t_u16 version; - /** Reserved field */ + /** Reserved field */ t_u16 reserved; - /** Max no of Multicast address */ + /** Max no of Multicast address */ t_u16 num_of_mcast_adr; - /** MAC address */ + /** MAC address */ t_u8 permanent_addr[MLAN_MAC_ADDR_LENGTH]; - /** Region Code */ + /** Region Code */ t_u16 region_code; - /** Number of antenna used */ + /** Number of antenna used */ t_u16 number_of_antenna; - /** FW release number, example 0x1234=1.2.3.4 */ + /** FW release number, example 0x1234=1.2.3.4 */ t_u32 fw_release_number; - /** Reserved field */ + /** Reserved field */ t_u32 reserved_1; - /** Reserved field */ + /** Reserved field */ t_u32 reserved_2; - /** Reserved field */ + /** Reserved field */ t_u32 reserved_3; - /** FW/HW Capability */ + /** FW/HW Capability */ t_u32 fw_cap_info; - /** 802.11n Device Capabilities */ + /** 802.11n Device Capabilities */ t_u32 dot_11n_dev_cap; - /** MIMO abstraction of MCSs supported by device */ + /** MIMO abstraction of MCSs supported by device */ t_u8 dev_mcs_support; - /** Valid end port at init */ + /** Valid end port at init */ t_u16 mp_end_port; - /** mgmt IE buffer count */ + /** mgmt IE buffer count */ t_u16 mgmt_buf_count; - /** Reserved */ + /** Reserved */ t_u32 reserved_8; - /** Reserved */ + /** Reserved */ t_u32 reserved_9; - /** 802.11ac Device Capabilities */ + /** 802.11ac Device Capabilities */ t_u32 Dot11acDevCap; - /** MCSs supported by 802.11ac device */ + /** MCSs supported by 802.11ac device */ t_u32 Dot11acMcsSupport; } MLAN_PACK_END HostCmd_DS_GET_HW_SPEC; @@ -3042,249 +3104,249 @@ typedef MLAN_PACK_START struct _HostCmd_DS_SDIO_SP_RX_AGGR_CFG { /** HostCmd_DS_802_11_CFG_DATA */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_CFG_DATA { - /** Action */ + /** Action */ t_u16 action; - /** Type */ + /** Type */ t_u16 type; - /** Data length */ + /** Data length */ t_u16 data_len; - /** Data */ + /** Data */ } MLAN_PACK_END HostCmd_DS_802_11_CFG_DATA; /** HostCmd_DS_CMD_802_11_RSSI_INFO_EXT */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_RSSI_INFO_EXT { - /** Action */ + /** Action */ t_u16 action; - /** Parameter used for exponential averaging for Data */ + /** Parameter used for exponential averaging for Data */ t_u16 ndata; - /** Parameter used for exponential averaging for Beacon */ + /** Parameter used for exponential averaging for Beacon */ t_u16 nbcn; - /** Last RSSI beacon TSF(only for Get action) */ + /** Last RSSI beacon TSF(only for Get action) */ t_u64 tsfbcn; - /** TLV info**/ + /** TLV info**/ t_u8 *tlv_buf[]; } MLAN_PACK_END HostCmd_DS_802_11_RSSI_INFO_EXT; /** TLV rssi info */ -#define TLV_TYPE_RSSI_INFO (PROPRIETARY_TLV_BASE_ID + 0xe5) /* 0x01E5 */ +#define TLV_TYPE_RSSI_INFO (PROPRIETARY_TLV_BASE_ID + 0xe5) /* 0x01E5 */ /** MrvlIEtypes_eapol_pkt_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_RSSI_EXT_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; /** Path ID - [Bit1:Bit0] = [0:1]: path A - [Bit1:Bit0] = [1:0]: path B - [Bit1:Bit0] = [1:1]: combined signal of path A and path B - [Bit7:Bit2] : Reserved + [Bit1:Bit0] = [0:1]: path A + [Bit1:Bit0] = [1:0]: path B + [Bit1:Bit0] = [1:1]: combined signal of path A and path B + [Bit7:Bit2] : Reserved **/ t_u16 path_id; - /** Last Data RSSI in dBm */ + /** Last Data RSSI in dBm */ t_s16 data_rssi_last; - /** Last Data NF in dBm */ + /** Last Data NF in dBm */ t_s16 data_nf_last; - /** AVG DATA RSSI in dBm */ + /** AVG DATA RSSI in dBm */ t_s16 data_rssi_avg; - /** AVG DATA NF in dBm */ + /** AVG DATA NF in dBm */ t_s16 data_nf_avg; - /** Last BEACON RSSI in dBm */ + /** Last BEACON RSSI in dBm */ t_s16 bcn_rssi_last; - /** Last BEACON NF in dBm */ + /** Last BEACON NF in dBm */ t_s16 bcn_nf_last; - /** AVG BEACON RSSI in dBm */ + /** AVG BEACON RSSI in dBm */ t_s16 bcn_rssi_avg; - /** AVG BEACON NF in dBm */ + /** AVG BEACON NF in dBm */ t_s16 bcn_nf_avg; } MLAN_PACK_END MrvlIEtypes_RSSI_EXT_t; /** HostCmd_DS_CMD_802_11_RSSI_INFO */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_RSSI_INFO { - /** Action */ + /** Action */ t_u16 action; - /** Parameter used for exponential averaging for Data */ + /** Parameter used for exponential averaging for Data */ t_u16 ndata; - /** Parameter used for exponential averaging for Beacon */ + /** Parameter used for exponential averaging for Beacon */ t_u16 nbcn; - /** Reserved field 0 */ + /** Reserved field 0 */ t_u16 reserved[9]; - /** Reserved field 1 */ + /** Reserved field 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 */ + /** Action */ t_u16 action; - /** Parameter used for exponential averaging for Data */ + /** Parameter used for exponential averaging for Data */ t_u16 ndata; - /** Parameter used for exponential averaging for beacon */ + /** Parameter used for exponential averaging for beacon */ t_u16 nbcn; - /** Last Data RSSI in dBm */ + /** Last Data RSSI in dBm */ t_s16 data_rssi_last; - /** Last Data NF in dBm */ + /** Last Data NF in dBm */ t_s16 data_nf_last; - /** AVG DATA RSSI in dBm */ + /** AVG DATA RSSI in dBm */ t_s16 data_rssi_avg; - /** AVG DATA NF in dBm */ + /** AVG DATA NF in dBm */ t_s16 data_nf_avg; - /** Last BEACON RSSI in dBm */ + /** Last BEACON RSSI in dBm */ t_s16 bcn_rssi_last; - /** Last BEACON NF in dBm */ + /** Last BEACON NF in dBm */ t_s16 bcn_nf_last; - /** AVG BEACON RSSI in dBm */ + /** AVG BEACON RSSI in dBm */ t_s16 bcn_rssi_avg; - /** AVG BEACON NF in dBm */ + /** AVG BEACON NF in dBm */ t_s16 bcn_nf_avg; - /** Last RSSI Beacon TSF */ + /** Last RSSI Beacon TSF */ 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 */ + /** Action */ t_u16 action; - /** MAC address */ + /** MAC address */ 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 */ + /** 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 */ + /** Action */ t_u16 action; - /** Enable/disable Tx data pause */ + /** Enable/disable Tx data pause */ t_u8 enable_tx_pause; - /** Max number of TX buffers allowed for all PS clients*/ + /** Max number of TX buffers allowed for all PS clients*/ 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** peer mac address */ + /** peer mac address */ t_u8 peermac[MLAN_MAC_ADDR_LENGTH]; - /** Tx pause state, 1--pause, 0--free flowing */ + /** Tx pause state, 1--pause, 0--free flowing */ t_u8 tx_pause; - /** total packets queued for the client */ + /** total packets queued for the client */ 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 */ + /** Action */ t_u16 action; - /** Number of addresses */ + /** Number of addresses */ t_u16 num_of_adrs; - /** List of MAC */ + /** List of MAC */ 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 */ + /** MAC address */ t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; - /** Deauthentication resaon code */ + /** Deauthentication resaon 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 */ + /** Peer STA address */ t_u8 peer_sta_addr[MLAN_MAC_ADDR_LENGTH]; - /** Capability information */ + /** Capability information */ IEEEtypes_CapInfo_t cap_info; - /** Listen interval */ + /** Listen interval */ t_u16 listen_interval; - /** Beacon period */ + /** Beacon period */ t_u16 beacon_period; - /** DTIM period */ + /** DTIM period */ t_u8 dtim_period; - /** - * MrvlIEtypes_SsIdParamSet_t SsIdParamSet; - * MrvlIEtypes_PhyParamSet_t PhyParamSet; - * MrvlIEtypes_SsParamSet_t SsParamSet; - * MrvlIEtypes_RatesParamSet_t RatesParamSet; - */ + /** + * MrvlIEtypes_SsIdParamSet_t SsIdParamSet; + * MrvlIEtypes_PhyParamSet_t PhyParamSet; + * MrvlIEtypes_SsParamSet_t SsParamSet; + * MrvlIEtypes_RatesParamSet_t RatesParamSet; + */ } MLAN_PACK_END HostCmd_DS_802_11_ASSOCIATE; /** HostCmd_CMD_802_11_ASSOCIATE response */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_ASSOCIATE_RSP { - /** Association response structure */ + /** Association response structure */ 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 */ + /** AdHoc SSID */ t_u8 ssid[MLAN_MAX_SSID_LENGTH]; - /** BSS mode */ + /** BSS mode */ t_u8 bss_mode; - /** Beacon period */ + /** Beacon period */ t_u16 beacon_period; - /** DTIM period */ + /** DTIM period */ t_u8 dtim_period; - /** SS parameter set */ + /** SS parameter set */ IEEEtypes_SsParamSet_t ss_param_set; - /** PHY parameter set */ + /** PHY parameter set */ IEEEtypes_PhyParamSet_t phy_param_set; - /** Reserved field */ + /** Reserved field */ t_u16 reserved1; - /** Capability information */ + /** Capability information */ IEEEtypes_CapInfo_t cap; - /** Supported data rates */ + /** Supported data 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 */ + /** Padding */ t_u8 pad[3]; - /** AdHoc BSSID */ + /** AdHoc BSSID */ t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; - /** Padding to sync with FW structure*/ + /** Padding to sync with FW structure*/ t_u8 pad2[2]; - /** Result */ + /** 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 */ + /** 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 */ + /** BSSID */ t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; - /** SSID */ + /** SSID */ t_u8 ssid[MLAN_MAX_SSID_LENGTH]; - /** BSS mode */ + /** BSS mode */ t_u8 bss_mode; - /** Beacon period */ + /** Beacon period */ t_u16 beacon_period; - /** DTIM period */ + /** DTIM period */ t_u8 dtim_period; - /** Timestamp */ + /** Timestamp */ t_u8 time_stamp[8]; - /** Local time */ + /** Local time */ t_u8 local_time[8]; - /** PHY parameter set */ + /** PHY parameter set */ IEEEtypes_PhyParamSet_t phy_param_set; - /** SS parameter set */ + /** SS parameter set */ IEEEtypes_SsParamSet_t ss_param_set; - /** Capability information */ + /** Capability information */ IEEEtypes_CapInfo_t cap; - /** Supported data rates */ + /** Supported data rates */ t_u8 data_rates[HOSTCMD_SUPPORTED_RATES]; /* @@ -3296,402 +3358,415 @@ typedef MLAN_PACK_START struct _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 BSS descriptor */ AdHoc_BssDesc_t bss_descriptor; - /** Reserved field */ + /** Reserved field */ t_u16 reserved1; - /** Reserved field */ + /** Reserved field */ t_u16 reserved2; } MLAN_PACK_END HostCmd_DS_802_11_AD_HOC_JOIN; #if defined(SDIO) /** Interrupt Raising Edge */ -#define INT_RASING_EDGE 0 +#define INT_RASING_EDGE 0 /** Interrupt Falling Edge */ -#define INT_FALLING_EDGE 1 +#define INT_FALLING_EDGE 1 /** Delay 1 usec */ -#define DELAY_1_US 1 +#define DELAY_1_US 1 typedef MLAN_PACK_START struct _HostCmd_DS_SDIO_GPIO_INT_CONFIG { - /** Action */ + /** Action */ t_u16 action; - /** GPIO interrupt pin */ + /** GPIO interrupt pin */ t_u16 gpio_pin; - /** GPIO interrupt edge, 1: failing edge; 0: raising edge */ + /** GPIO interrupt edge, 1: failing edge; 0: raising edge */ t_u16 gpio_int_edge; - /** GPIO interrupt pulse widthin usec units */ + /** GPIO interrupt pulse widthin usec units */ t_u16 gpio_pulse_width; } MLAN_PACK_END HostCmd_DS_SDIO_GPIO_INT_CONFIG; #endif /* GPIO_SDIO_INT_CTRL */ typedef MLAN_PACK_START struct _HostCmd_DS_SDIO_PULL_CTRL { - /** Action */ + /** Action */ t_u16 action; - /** The delay of pulling up in us */ + /** The delay of pulling up in us */ t_u16 pull_up; - /** The delay of pulling down in us */ + /** The delay of pulling down in us */ 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 */ + /** Number of multicast transmitted frames */ t_u32 mcast_tx_frame; - /** Number of failures */ + /** Number of failures */ t_u32 failed; - /** Number of retries */ + /** Number of retries */ t_u32 retry; - /** Number of multiretries */ + /** Number of multiretries */ t_u32 multiretry; - /** Number of duplicate frames */ + /** Number of duplicate frames */ t_u32 frame_dup; - /** Number of RTS success */ + /** Number of RTS success */ t_u32 rts_success; - /** Number of RTS failure */ + /** Number of RTS failure */ t_u32 rts_failure; - /** Number of acknowledgement failure */ + /** Number of acknowledgement failure */ t_u32 ack_failure; - /** Number of fragmented packets received */ + /** Number of fragmented packets received */ t_u32 rx_frag; - /** Number of multicast frames received */ + /** Number of multicast frames received */ t_u32 mcast_rx_frame; - /** FCS error */ + /** FCS error */ t_u32 fcs_error; - /** Number of transmitted frames */ + /** Number of transmitted frames */ t_u32 tx_frame; - /** Reserved field */ + /** Reserved field */ t_u32 reserved; - /** Number of WEP icv error for each key */ + /** Number of WEP icv error for each key */ t_u32 wep_icv_err_cnt[4]; - /** Beacon received count */ + /** Beacon received count */ t_u32 bcn_rcv_cnt; - /** Beacon missed count */ + /** Beacon missed count */ t_u32 bcn_miss_cnt; - /** Tx frag count */ + /** Tx frag count */ t_u32 tx_frag_cnt; - /** Qos Tx frag count */ + /** Qos Tx frag count */ t_u32 qos_tx_frag_cnt[8]; - /** Qos failed count */ + /** Qos failed count */ t_u32 qos_failed_cnt[8]; - /** Qos retry count */ + /** Qos retry count */ t_u32 qos_retry_cnt[8]; - /** Qos multi retry count */ + /** Qos multi retry count */ t_u32 qos_multi_retry_cnt[8]; - /** Qos frame dup count */ + /** Qos frame dup count */ t_u32 qos_frm_dup_cnt[8]; - /** Qos rts success count */ + /** Qos rts success count */ t_u32 qos_rts_suc_cnt[8]; - /** Qos rts failure count */ + /** Qos rts failure count */ t_u32 qos_rts_failure_cnt[8]; - /** Qos ack failure count */ + /** Qos ack failure count */ t_u32 qos_ack_failure_cnt[8]; - /** Qos Rx frag count */ + /** Qos Rx frag count */ t_u32 qos_rx_frag_cnt[8]; - /** Qos Tx frame count */ + /** Qos Tx frame count */ t_u32 qos_tx_frm_cnt[8]; - /** Qos discarded frame count */ + /** Qos discarded frame count */ t_u32 qos_discarded_frm_cnt[8]; - /** Qos mpdus Rx count */ + /** Qos mpdus Rx count */ t_u32 qos_mpdus_rx_cnt[8]; - /** Qos retry rx count */ + /** Qos retry rx count */ t_u32 qos_retries_rx_cnt[8]; - /** CMAC ICV errors count */ + /** CMAC ICV errors count */ t_u32 cmacicv_errors; - /** CMAC replays count */ + /** CMAC replays count */ t_u32 cmac_replays; - /** mgmt CCMP replays count */ + /** mgmt CCMP replays count */ t_u32 mgmt_ccmp_replays; - /** TKIP ICV errors count */ + /** TKIP ICV errors count */ t_u32 tkipicv_errors; - /** TKIP replays count */ + /** TKIP replays count */ t_u32 tkip_replays; - /** CCMP decrypt errors count */ + /** CCMP decrypt errors count */ t_u32 ccmp_decrypt_errors; - /** CCMP replays count */ + /** CCMP replays count */ t_u32 ccmp_replays; - /** Tx amsdu count */ + /** Tx amsdu count */ t_u32 tx_amsdu_cnt; - /** failed amsdu count */ + /** failed amsdu count */ t_u32 failed_amsdu_cnt; - /** retry amsdu count */ + /** retry amsdu count */ t_u32 retry_amsdu_cnt; - /** multi-retry amsdu count */ + /** multi-retry amsdu count */ t_u32 multi_retry_amsdu_cnt; - /** Tx octets in amsdu count */ + /** Tx octets in amsdu count */ t_u64 tx_octets_in_amsdu_cnt; - /** amsdu ack failure count */ + /** amsdu ack failure count */ t_u32 amsdu_ack_failure_cnt; - /** Rx amsdu count */ + /** Rx amsdu count */ t_u32 rx_amsdu_cnt; - /** Rx octets in amsdu count */ + /** Rx octets in amsdu count */ t_u64 rx_octets_in_amsdu_cnt; - /** Tx ampdu count */ + /** Tx ampdu count */ t_u32 tx_ampdu_cnt; - /** tx mpdus in ampdu count */ + /** tx mpdus in ampdu count */ t_u32 tx_mpdus_in_ampdu_cnt; - /** tx octets in ampdu count */ + /** tx octets in ampdu count */ t_u64 tx_octets_in_ampdu_cnt; - /** ampdu Rx count */ + /** ampdu Rx count */ t_u32 ampdu_rx_cnt; - /** mpdu in Rx ampdu count */ + /** mpdu in Rx ampdu count */ t_u32 mpdu_in_rx_ampdu_cnt; - /** Rx octets ampdu count */ + /** Rx octets ampdu count */ t_u64 rx_octets_in_ampdu_cnt; - /** ampdu delimiter CRC error count */ + /** ampdu delimiter CRC error count */ t_u32 ampdu_delimiter_crc_error_cnt; } MLAN_PACK_END HostCmd_DS_802_11_GET_LOG; /* maln wifi rate */ typedef MLAN_PACK_START struct _mlan_wifi_rate { - /** 0: OFDM, 1:CCK, 2:HT 3:VHT 4..7 reserved */ + /** 0: OFDM, 1:CCK, 2:HT 3:VHT 4..7 reserved */ t_u8 preamble; - /** 0:1x1, 1:2x2, 3:3x3, 4:4x4 */ + /** 0:1x1, 1:2x2, 3:3x3, 4:4x4 */ t_u8 nss; - /** 0:20MHz, 1:40Mhz, 2:80Mhz, 3:160Mhz */ + /** 0:20MHz, 1:40Mhz, 2:80Mhz, 3:160Mhz */ t_u8 bw; - /** OFDM/CCK rate code would be as per ieee std in the units of 0.5mbps */ - /** HT/VHT it would be mcs index */ + /** OFDM/CCK rate code would be as per ieee std in the units of 0.5mbps + */ + /** HT/VHT it would be mcs index */ t_u8 rateMcsIdx; - /** units of 100 Kbps */ + /** units of 100 Kbps */ t_u32 bitrate; } MLAN_PACK_START mlan_wifi_rate; /** channel information */ typedef MLAN_PACK_START struct { - /** channel width (20, 40, 80, 80+80, 160) */ + /** channel width (20, 40, 80, 80+80, 160) */ t_u32 width; - /** primary 20 MHz channel */ + /** primary 20 MHz channel */ t_u32 center_freq; - /** center frequency (MHz) first segment */ + /** center frequency (MHz) first segment */ t_u32 center_freq0; - /** center frequency (MHz) second segment */ + /** center frequency (MHz) second segment */ t_u32 center_freq1; } MLAN_PACK_END mlan_wifi_channel_info; /** channel statistics */ typedef MLAN_PACK_START struct { - /** channel */ + /** channel */ mlan_wifi_channel_info channel; - /** msecs the radio is awake (32 bits number accruing over time) */ + /** msecs the radio is awake (32 bits number accruing over time) */ t_u32 on_time; - /** msecs the CCA register is busy (32 bits number accruing over time) */ + /** msecs the CCA register is busy (32 bits number accruing over time) + */ t_u32 cca_busy_time; } MLAN_PACK_END mlan_wifi_channel_stat; /** radio statistics */ typedef MLAN_PACK_START struct { - /** supported wifi in case of multi radio */ + /** supported wifi in case of multi radio */ t_u32 radio; - /** msecs the radio is awake */ + /** msecs the radio is awake */ t_u32 on_time; - /** msecs the radio is transmitting */ + /** msecs the radio is transmitting */ t_u32 tx_time; - /** TBD: num_tx_levels: number of radio transmit power levels */ + /** TBD: num_tx_levels: number of radio transmit power levels */ t_u32 reserved0; - /** TBD: tx_time_per_levels: pointer to an array of radio transmit per power levels in msecs accured over time */ + /** TBD: tx_time_per_levels: pointer to an array of radio transmit per + * power levels in msecs accured over time */ t_u32 reserved1; - /** msecs the radio is in active receive */ + /** msecs the radio is in active receive */ t_u32 rx_time; - /** msecs the radio is awake due to all scan */ + /** msecs the radio is awake due to all scan */ t_u32 on_time_scan; - /** msecs the radio is awake due to NAN */ + /** msecs the radio is awake due to NAN */ t_u32 on_time_nbd; - /** msecs the radio is awake due to G?scan */ + /** msecs the radio is awake due to G?scan */ t_u32 on_time_gscan; - /** msecs the radio is awake due to roam?scan */ + /** msecs the radio is awake due to roam?scan */ t_u32 on_time_roam_scan; - /** msecs the radio is awake due to PNO scan */ + /** msecs the radio is awake due to PNO scan */ t_u32 on_time_pno_scan; - /** msecs the radio is awake due to HS2.0 scans and GAS exchange */ + /** msecs the radio is awake due to HS2.0 scans and GAS exchange */ t_u32 on_time_hs20; - /** number of channels */ + /** number of channels */ t_u32 num_channels; - /** channel statistics */ - mlan_wifi_channel_stat channels[MAX_NUM_CHAN]; // support only 1 channel, so keep it. + /** channel statistics */ + mlan_wifi_channel_stat channels[MAX_NUM_CHAN]; // support only 1 + // channel, so keep it. } MLAN_PACK_END mlan_wifi_radio_stat; /** per rate statistics */ typedef MLAN_PACK_START struct { - /** rate information */ + /** rate information */ mlan_wifi_rate rate; - /** number of successfully transmitted data pkts (ACK rcvd) */ + /** number of successfully transmitted data pkts (ACK rcvd) */ t_u32 tx_mpdu; - /** number of received data pkts */ + /** number of received data pkts */ t_u32 rx_mpdu; - /** number of data packet losses (no ACK) */ + /** number of data packet losses (no ACK) */ t_u32 mpdu_lost; - /** total number of data pkt retries */ + /** total number of data pkt retries */ t_u32 retries; - /** number of short data pkt retries */ + /** number of short data pkt retries */ t_u32 retries_short; - /** number of long data pkt retries */ + /** number of long data pkt retries */ t_u32 retries_long; } MLAN_PACK_END mlan_wifi_rate_stat; /** per peer statistics */ typedef MLAN_PACK_START struct { - /** peer type (AP, TDLS, GO etc.) */ + /** peer type (AP, TDLS, GO etc.) */ t_u8 type; - /** mac address */ + /** mac address */ t_u8 peer_mac_address[6]; - /** peer WIFI_CAPABILITY_XXX */ + /** peer WIFI_CAPABILITY_XXX */ t_u32 capabilities; - /** number of rates */ + /** number of rates */ t_u32 num_rate; - /** per rate statistics, number of entries = num_rate */ + /** per rate statistics, number of entries = num_rate */ mlan_wifi_rate_stat rate_stats[]; } MLAN_PACK_END mlan_wifi_peer_info; /* per access category statistics */ typedef MLAN_PACK_START struct { - /** access category (VI, VO, BE, BK) */ + /** access category (VI, VO, BE, BK) */ t_u32 ac; - /** number of successfully transmitted unicast data pkts (ACK rcvd) */ + /** number of successfully transmitted unicast data pkts (ACK rcvd) */ t_u32 tx_mpdu; - /** number of received unicast mpdus */ + /** number of received unicast mpdus */ t_u32 rx_mpdu; - /** number of succesfully transmitted multicast data packets */ - /** STA case: implies ACK received from AP for the unicast packet in which mcast pkt was sent */ + /** number of succesfully transmitted multicast data packets */ + /** STA case: implies ACK received from AP for the unicast packet in + * which mcast pkt was sent */ t_u32 tx_mcast; - /** number of received multicast data packets */ + /** number of received multicast data packets */ t_u32 rx_mcast; - /** number of received unicast a-mpdus */ + /** number of received unicast a-mpdus */ t_u32 rx_ampdu; - /** number of transmitted unicast a-mpdus */ + /** number of transmitted unicast a-mpdus */ t_u32 tx_ampdu; - /** number of data pkt losses (no ACK) */ + /** number of data pkt losses (no ACK) */ t_u32 mpdu_lost; - /** total number of data pkt retries */ + /** total number of data pkt retries */ t_u32 retries; - /** number of short data pkt retries */ + /** number of short data pkt retries */ t_u32 retries_short; - /** number of long data pkt retries */ + /** number of long data pkt retries */ t_u32 retries_long; - /** data pkt min contention time (usecs) */ + /** data pkt min contention time (usecs) */ t_u32 contention_time_min; - /** data pkt max contention time (usecs) */ + /** data pkt max contention time (usecs) */ t_u32 contention_time_max; - /** data pkt avg contention time (usecs) */ + /** data pkt avg contention time (usecs) */ t_u32 contention_time_avg; - /** num of data pkts used for contention statistics */ + /** num of data pkts used for contention statistics */ t_u32 contention_num_samples; } MLAN_PACK_END mlan_wifi_wmm_ac_stat; /** interface statistics */ typedef MLAN_PACK_START struct { - /** access point beacon received count from connected AP */ + /** access point beacon received count from connected AP */ t_u32 beacon_rx; - /** Average beacon offset encountered (beacon_TSF - TBTT) - * the average_tsf_offset field is used so as to calculate the - * typical beacon contention time on the channel as well may be - * used to debug beacon synchronization and related power consumption issue - */ + /** Average beacon offset encountered (beacon_TSF - TBTT) + * the average_tsf_offset field is used so as to calculate the + * typical beacon contention time on the channel as well may be + * used to debug beacon synchronization and related power consumption + * issue + */ t_u64 average_tsf_offset; - /** indicate that this AP typically leaks packets beyond the driver guard time */ + /** indicate that this AP typically leaks packets beyond the driver + * guard time */ t_u32 leaky_ap_detected; - /** average number of frame leaked by AP after frame with PM bit set was ACK'ed by AP */ + /** average number of frame leaked by AP after frame with PM bit set was + * ACK'ed by AP */ t_u32 leaky_ap_avg_num_frames_leaked; - /** Guard time currently in force (when implementing IEEE power management based on - * frame control PM bit), How long driver waits before shutting down the radio and - * after receiving an ACK for a data frame with PM bit set) - */ + /** Guard time currently in force (when implementing IEEE power + * management based on frame control PM bit), How long driver waits + * before shutting down the radio and after receiving an ACK for a data + * frame with PM bit set) + */ t_u32 leaky_ap_guard_time; - /** access point mgmt frames received count from connected AP (including Beacon) */ + /** access point mgmt frames received count from connected AP (including + * Beacon) */ t_u32 mgmt_rx; - /** action frames received count */ + /** action frames received count */ t_u32 mgmt_action_rx; - /** action frames transmit count */ + /** action frames transmit count */ t_u32 mgmt_action_tx; - /** access Point Beacon and Management frames RSSI (averaged) */ + /** access Point Beacon and Management frames RSSI (averaged) */ t_u32 rssi_mgmt; - /** access Point Data Frames RSSI (averaged) from connected AP */ + /** access Point Data Frames RSSI (averaged) from connected AP */ t_u32 rssi_data; - /** access Point ACK RSSI (averaged) from connected AP */ + /** access Point ACK RSSI (averaged) from connected AP */ t_u32 rssi_ack; - /** per ac data packet statistics */ + /** per ac data packet statistics */ mlan_wifi_wmm_ac_stat ac[MAX_AC_QUEUES]; - /** number of peers */ + /** number of peers */ t_u32 num_peers; - /** per peer statistics */ + /** per peer statistics */ mlan_wifi_peer_info peer_info[]; } MLAN_PACK_END mlan_wifi_iface_stat; /** MrvlIETypes_llStatIface_t */ typedef MLAN_PACK_START struct _MrvlIETypes_llStatIface_t { - /** Type */ + /** Type */ t_u16 type; - /** Length */ + /** Length */ t_u16 len; - /** Frame Control */ + /** Frame Control */ mlan_wifi_iface_stat ifaceStat; /* t_u8 frame_contents[]; */ } MLAN_PACK_END MrvlIETypes_llStatIface_t; /** MrvlIETypes_llStatRadio_t */ typedef MLAN_PACK_START struct _MrvlIETypes_llStatRadio_t { - /** Type */ + /** Type */ t_u16 type; - /** Length */ + /** Length */ t_u16 len; - /** Frame Control */ + /** Frame Control */ mlan_wifi_radio_stat radioStat[MAX_RADIO]; /* t_u8 frame_contents[]; */ } MLAN_PACK_END MrvlIETypes_llStatRadio_t; -#define TYPE_IFACE_STAT MBIT(0) -#define TYPE_RADIO_STAT MBIT(1) -#define TYPE_PEER_INFO MBIT(2) +#define TYPE_IFACE_STAT MBIT(0) +#define TYPE_RADIO_STAT MBIT(1) +#define TYPE_PEER_INFO MBIT(2) /** HostCmd_DS_802_11_LINK_STATISTIC */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_LINK_STATISTIC { - /** Action : HostCmd_ACT_GEN_GET/SET/REMOVE */ + /** Action : HostCmd_ACT_GEN_GET/SET/REMOVE */ t_u16 action; - /** statistic which would be get in action HostCmd_ACT_GEN_GET : TYPE_IFACE_STAT/RADIO_STAT/PEER_INFO */ + /** statistic which would be get in action HostCmd_ACT_GEN_GET : + * TYPE_IFACE_STAT/RADIO_STAT/PEER_INFO */ t_u16 stat_type; - /* threshold to classify the pkts as short or long, packet size < mpdu_size_threshold => short */ + /* threshold to classify the pkts as short or long, packet size < + * mpdu_size_threshold => short */ t_u32 mpdu_size_threshold; - /* set for field debug mode. Driver should collect all statistics regardless of performance impact. */ + /* set for field debug mode. Driver should collect all statistics + * regardless of performance impact. */ t_u32 aggressive_statistics_gathering; - /** Value */ + /** Value */ t_u8 value[]; } MLAN_PACK_END HostCmd_DS_802_11_LINK_STATISTIC; /**_HostCmd_TX_RATE_QUERY */ typedef MLAN_PACK_START struct _HostCmd_TX_RATE_QUERY { - /** Tx rate */ + /** Tx rate */ t_u8 tx_rate; - /** Tx Rate Info: - * [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 - * [Bit4,Bit7] AX Guard Interval: 00, 01, 02 */ + /** Tx Rate Info: + * [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 + * [Bit4,Bit7] AX Guard Interval: 00, 01, 02 */ t_u8 tx_rate_info; /** - * BIT0: DCM - * BIT3-BIT1: tone mode - ** 000: 26 tone - ** 001: 52 tone - ** 010: 106 tone - ** 011: 242 tone - ** 100: 484 tone - ** 101: 996 tone - * BIT7-BIT4: resvd - **/ + * BIT0: DCM + * BIT3-BIT1: tone mode + ** 000: 26 tone + ** 001: 52 tone + ** 010: 106 tone + ** 011: 242 tone + ** 100: 484 tone + ** 101: 996 tone + * BIT7-BIT4: resvd + **/ t_u8 ext_tx_rate_info; } MLAN_PACK_END HostCmd_TX_RATE_QUERY; typedef MLAN_PACK_START struct _hs_config_param { - /** bit0=1: broadcast data - * bit1=1: unicast data - * bit2=1: mac events - * bit3=1: multicast data - */ + /** bit0=1: broadcast data + * bit1=1: unicast data + * bit2=1: mac events + * bit3=1: multicast data + */ t_u32 conditions; - /** GPIO pin or 0xff for interface */ + /** GPIO pin or 0xff for interface */ t_u8 gpio; - /** gap in milliseconds or or 0xff for special setting when - * GPIO is used to wakeup host - */ + /** gap in milliseconds or or 0xff for special setting when + * GPIO is used to wakeup host + */ t_u8 gap; } MLAN_PACK_END hs_config_param; @@ -3705,75 +3780,78 @@ typedef enum _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 */ + /** response control 0x00 - response not needed, 0x01 - response needed + */ 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 - */ + /** Action 0x0001 - Configure enhanced host sleep mode, + * 0x0002 - Activate enhanced host sleep mode + */ t_u16 action; union { - /** Configure enhanced hs */ + /** Configure enhanced hs */ hs_config_param hs_config; - /** Activate enhanced hs */ + /** Activate enhanced hs */ hs_activate_param hs_activate; } params; } MLAN_PACK_END HostCmd_DS_802_11_HS_CFG_ENH; /** HostCmd_CMD_802_11_ROBUSTCOEX */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_ROBUSTCOEX { - /** Action */ + /** Action */ t_u16 action; - /** RSVD */ + /** RSVD */ t_u16 rsvd; + t_u8 tlv_buf[]; } MLAN_PACK_END HostCmd_DS_802_11_ROBUSTCOEX; /** HostCmd_CMD_DMCS_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_DMCS_CFG { - /** Action */ + /** Action */ t_u16 action; - /** SubCmd of DMCS */ + /** SubCmd of DMCS */ t_u16 subcmd; + t_u8 tlv_buf[]; } MLAN_PACK_END HostCmd_DS_DMCS_CFG; #if defined(PCIE) /** HostCmd_CMD_SSU */ typedef MLAN_PACK_START struct _HostCmd_DS_SSU_CFG { - /** Action */ + /** Action */ t_u16 action; - /** # of FFT sample to skip */ + /** # of FFT sample to skip */ t_u32 nskip; - /** # of FFT sample selected to dump */ + /** # of FFT sample selected to dump */ t_u32 nsel; - /** Down sample ADC input for buffering */ + /** Down sample ADC input for buffering */ t_u32 adcdownsample; - /** Mask Out ADC Data From Spectral Packet */ + /** Mask Out ADC Data From Spectral Packet */ t_u32 mask_adc_pkt; - /** Enable 16-Bit FFT Output Data Precision in Spectral Packet */ + /** Enable 16-Bit FFT Output Data Precision in Spectral Packet */ t_u32 out_16bits; - /** Enable power spectrum in dB for spectral packet */ + /** Enable power spectrum in dB for spectral packet */ t_u32 spec_pwr_enable; - /** Enable Spectral Packet Rate Reduction in dB output format */ + /** Enable Spectral Packet Rate Reduction in dB output format */ t_u32 rate_deduction; - /** # of Spectral packets over which spectral data to be averaged */ + /** # of Spectral packets over which spectral data to be averaged */ t_u32 n_pkt_avg; - /** ret: Calculated fft length in dw */ + /** ret: Calculated fft length in dw */ t_u32 fft_len; - /** ret: Calculated adc length in dw */ + /** ret: Calculated adc length in dw */ t_u32 adc_len; - /** ret: Calculated record length in dw */ + /** ret: Calculated record length in dw */ t_u32 rec_len; - /** Mapped address of DMA buffer */ + /** Mapped address of DMA buffer */ t_u32 buffer_base_addr[2]; - /** Total size of allocated buffer for SSU DMA */ + /** Total size of allocated buffer for SSU DMA */ t_u32 buffer_pool_size; - /** ret: Calculated buffer numbers */ + /** ret: Calculated buffer numbers */ t_u32 number_of_buffers; - /** ret: Calculated buffer size in byte for each descriptor */ + /** ret: Calculated buffer size in byte for each descriptor */ t_u32 buffer_size; } MLAN_PACK_END HostCmd_DS_SSU_CFG; #endif @@ -3797,44 +3875,54 @@ typedef enum _SNMP_MIB_INDEX { } SNMP_MIB_INDEX; /** max SNMP buf size */ -#define MAX_SNMP_BUF_SIZE 128 +#define MAX_SNMP_BUF_SIZE 128 + +#ifdef UAP_SUPPORT +/** HostCmd_CMD_802_11_SNMP_MIB */ +typedef MLAN_PACK_START struct _HostCmd_DS_UAP_802_11_SNMP_MIB { + /** SNMP query type */ + t_u16 query_type; + /** snmp oid buf */ + t_u8 snmp_data[]; +} MLAN_PACK_END HostCmd_DS_UAP_802_11_SNMP_MIB; +#endif /** HostCmd_CMD_802_11_SNMP_MIB */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SNMP_MIB { - /** SNMP query type */ + /** SNMP query type */ t_u16 query_type; - /** SNMP object ID */ + /** SNMP object ID */ t_u16 oid; - /** SNMP buffer size */ + /** SNMP buffer size */ t_u16 buf_size; - /** Value */ + /** Value */ t_u8 value[1]; } MLAN_PACK_END HostCmd_DS_802_11_SNMP_MIB; /** Radio on */ -#define RADIO_ON 0x01 +#define RADIO_ON 0x01 /** Radio off */ -#define RADIO_OFF 0x00 +#define RADIO_OFF 0x00 /** HostCmd_CMD_802_11_RADIO_CONTROL */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_RADIO_CONTROL { - /** Action */ + /** Action */ t_u16 action; - /** Control */ + /** Control */ t_u16 control; } MLAN_PACK_END HostCmd_DS_802_11_RADIO_CONTROL; /** MrvlRateScope_t */ typedef MLAN_PACK_START struct _MrvlRateScope_t { - /** Header Type */ + /** Header Type */ t_u16 type; - /** Header Length */ + /** Header Length */ t_u16 length; - /** Bitmap of HR/DSSS rates */ + /** Bitmap of HR/DSSS rates */ t_u16 hr_dsss_rate_bitmap; - /** Bitmap of OFDM rates */ + /** Bitmap of OFDM rates */ t_u16 ofdm_rate_bitmap; - /** Bitmap of HT-MCSs allowed for initial rate */ + /** Bitmap of HT-MCSs allowed for initial rate */ t_u16 ht_mcs_rate_bitmap[8]; t_u16 vht_mcs_rate_bitmap[8]; t_u16 he_mcs_rate_bitmap[8]; @@ -3842,172 +3930,175 @@ typedef MLAN_PACK_START struct _MrvlRateScope_t { /** MrvlRateDropPattern_t */ typedef MLAN_PACK_START struct _MrvlRateDropPattern_t { - /** Header Type */ + /** Header Type */ t_u16 type; - /** Header Length */ + /** Header Length */ t_u16 length; - /** Rate Drop Mode */ + /** Rate Drop Mode */ t_u32 rate_drop_mode; /* MrvlRateDropControl_t RateDropControl[]; */ } MLAN_PACK_END MrvlRateDropPattern_t; typedef MLAN_PACK_START struct _MrvlIETypes_rate_setting_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Rate Setting */ + /** Rate Setting */ t_u16 rate_setting; } MLAN_PACK_END MrvlIETypes_rate_setting_t; /** HostCmd_DS_TX_RATE_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_TX_RATE_CFG { - /** Action */ + /** Action */ t_u16 action; t_u16 reserved_1; /* MrvlRateScope_t RateScope; * MrvlRateDropPattern_t RateDrop; */ + t_u8 tlv_buf[]; } MLAN_PACK_END HostCmd_DS_TX_RATE_CFG; /** Power_Group_t */ typedef MLAN_PACK_START struct _Power_Group_t { - /** Modulation Class */ + /** Modulation Class */ t_u8 modulation_class; - /** MCS Code or Legacy RateID */ + /** MCS Code or Legacy RateID */ t_u8 first_rate_code; - /** MCS Code or Legacy RateID */ + /** MCS Code or Legacy RateID */ t_u8 last_rate_code; - /** Power Adjustment Step */ + /** Power Adjustment Step */ t_s8 power_step; - /** Minimal Tx Power Level [dBm] */ + /** Minimal Tx Power Level [dBm] */ t_s8 power_min; - /** Maximal Tx Power Level [dBm] */ + /** Maximal Tx Power Level [dBm] */ t_s8 power_max; - /** 0: HTBW20, 1: HTBW40 */ + /** 0: HTBW20, 1: HTBW40 */ t_u8 ht_bandwidth; - /** Reserved */ + /** 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 */ + /** Header Type */ t_u16 type; - /** Header Length */ + /** Header Length */ 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 */ + /** Action */ t_u16 action; - /** Power group configuration index */ + /** Power group configuration index */ t_u16 cfg_index; - /** Power group configuration mode */ + /** Power group configuration mode */ t_u32 mode; - /* MrvlTypes_Power_Group_t PowerGrpCfg[] */ + /* MrvlTypes_Power_Group_t PowerGrpCfg[]*/ + t_u8 tlv_buf[]; } 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 */ + /** Action */ t_u16 action; - /** Current power level */ + /** Current power level */ t_s16 current_level; - /** Maximum power */ + /** Maximum power */ t_s8 max_power; - /** Minimum power */ + /** Minimum power */ t_s8 min_power; } MLAN_PACK_END HostCmd_DS_802_11_RF_TX_POWER; /** Connection type infra */ -#define CONNECTION_TYPE_INFRA 0 +#define CONNECTION_TYPE_INFRA 0 /** Connection type adhoc */ -#define CONNECTION_TYPE_ADHOC 1 +#define CONNECTION_TYPE_ADHOC 1 #ifdef WIFI_DIRECT_SUPPORT /** BSS Mode: WIFIDIRECT Client */ -#define BSS_MODE_WIFIDIRECT_CLIENT 0 +#define BSS_MODE_WIFIDIRECT_CLIENT 0 /** BSS Mode: WIFIDIRECT GO */ -#define BSS_MODE_WIFIDIRECT_GO 2 +#define BSS_MODE_WIFIDIRECT_GO 2 #endif /** HostCmd_DS_SET_BSS_MODE */ typedef MLAN_PACK_START struct _HostCmd_DS_SET_BSS_MODE { - /** connection type */ + /** connection type */ t_u8 con_type; } MLAN_PACK_END HostCmd_DS_SET_BSS_MODE; /** HT Capabilities element */ typedef MLAN_PACK_START struct _MrvlIETypes_HTCap_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** HTCap struct */ + /** HTCap struct */ HTCap_t ht_cap; } MLAN_PACK_END MrvlIETypes_HTCap_t; /** VHT Capabilities element */ typedef MLAN_PACK_START struct _MrvlIETypes_VHTCap_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** VHTCap struct */ + /** VHTCap struct */ VHT_capa_t vht_cap; } MLAN_PACK_END MrvlIETypes_VHTCap_t; /** HostCmd_DS_REMAIN_ON_CHANNEL */ typedef MLAN_PACK_START struct _HostCmd_DS_REMAIN_ON_CHANNEL { - /** Action 0-GET, 1-SET, 4 CLEAR*/ + /** Action 0-GET, 1-SET, 4 CLEAR*/ t_u16 action; - /** Not used set to zero */ + /** Not used set to zero */ t_u8 status; - /** Not used set to zero */ + /** Not used set to zero */ t_u8 reserved; - /** Band cfg */ + /** Band cfg */ Band_Config_t bandcfg; - /** channel */ + /** channel */ t_u8 channel; - /** remain time: Unit ms*/ + /** remain time: Unit ms*/ t_u32 remain_period; } MLAN_PACK_END HostCmd_DS_REMAIN_ON_CHANNEL; #ifdef WIFI_DIRECT_SUPPORT /** HostCmd_DS_WIFI_DIRECT_MODE */ typedef MLAN_PACK_START struct _HostCmd_DS_WIFI_DIRECT_MODE { - /** Action 0-GET, 1-SET*/ + /** Action 0-GET, 1-SET*/ t_u16 action; - /**0:disable 1:listen 2:GO 3:p2p client 4:find 5:stop find*/ + /**0:disable 1:listen 2:GO 3:p2p client 4:find 5:stop find*/ t_u16 mode; } MLAN_PACK_END HostCmd_DS_WIFI_DIRECT_MODE; /** MrvlIEtypes_NoA_setting_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_NoA_setting_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** enable/disable */ + /** enable/disable */ t_u8 enable; - /** index */ + /** index */ t_u16 index; - /** NoA count */ + /** NoA count */ t_u8 noa_count; - /** NoA duration */ + /** NoA duration */ t_u32 noa_duration; - /** NoA interval */ + /** NoA interval */ t_u32 noa_interval; } MLAN_PACK_END MrvlIEtypes_NoA_setting_t; /** MrvlIEtypes_NoA_setting_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_OPP_PS_setting_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** enable/disable && ct_window */ + /** enable/disable && ct_window */ t_u8 enable; } MLAN_PACK_END MrvlIEtypes_OPP_PS_setting_t; /** HostCmd_DS_WIFI_DIRECT_PARAM_CONFIG */ typedef MLAN_PACK_START struct _HostCmd_DS_WIFI_DIRECT_PARAM_CONFIG { - /** Action 0-GET, 1-SET */ + /** Action 0-GET, 1-SET */ t_u16 action; - /** MrvlIEtypes_NoA_setting_t - * MrvlIEtypes_OPP_PS_setting_t - */ + /** MrvlIEtypes_NoA_setting_t + * MrvlIEtypes_OPP_PS_setting_t + */ + t_u8 tlv_buf[]; } MLAN_PACK_END HostCmd_DS_WIFI_DIRECT_PARAM_CONFIG; #endif @@ -4028,33 +4119,33 @@ MLAN_PACK_START struct coalesce_receive_filt_rule { /** HostCmd_DS_COALESCE_CONFIG */ typedef MLAN_PACK_START struct _HostCmd_DS_COALESCE_CONFIG { - /** Action 0-GET, 1-SET */ + /** Action 0-GET, 1-SET */ t_u16 action; t_u16 num_of_rules; struct coalesce_receive_filt_rule rule[]; } MLAN_PACK_END HostCmd_DS_COALESCE_CONFIG; /** TLV type : FW support max connection TLV */ -#define TLV_TYPE_MAX_CONN (PROPRIETARY_TLV_BASE_ID + 0x117) /* 0x0217 */ +#define TLV_TYPE_MAX_CONN (PROPRIETARY_TLV_BASE_ID + 0x117) /* 0x0217 */ /** MrvlIEtypes_Max_Conn_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_Max_Conn_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** FW support max P2P connection */ + /** FW support max P2P connection */ t_u8 max_p2p_conn; - /** FW support max STA connection */ + /** FW support max STA connection */ t_u8 max_sta_conn; } MLAN_PACK_END MrvlIEtypes_Max_Conn_t; /** exceed max p2p connection event */ typedef MLAN_PACK_START struct _event_exceed_max_p2p_conn { - /** Event ID */ + /** Event ID */ t_u16 event_id; - /** BSS index number for multiple BSS support */ + /** BSS index number for multiple BSS support */ t_u8 bss_index; - /** BSS type */ + /** BSS type */ t_u8 bss_type; - /** When exceed max, the mac address who request p2p connect */ + /** When exceed max, the mac address who request p2p connect */ t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; } MLAN_PACK_END event_exceed_max_p2p_conn; @@ -4070,50 +4161,50 @@ typedef MLAN_PACK_START struct _event_exceed_max_p2p_conn { * */ typedef MLAN_PACK_START struct _wlan_scan_cmd_config { - /** - * BSS Type to be sent in the firmware command - * - * Field can be used to restrict the types of networks returned in the - * scan. Valid settings are: - * - * - MLAN_SCAN_MODE_BSS (infrastructure) - * - MLAN_SCAN_MODE_IBSS (adhoc) - * - MLAN_SCAN_MODE_ANY (unrestricted, adhoc and infrastructure) - */ + /** + * BSS Type to be sent in the firmware command + * + * Field can be used to restrict the types of networks returned in the + * scan. Valid settings are: + * + * - MLAN_SCAN_MODE_BSS (infrastructure) + * - MLAN_SCAN_MODE_IBSS (adhoc) + * - MLAN_SCAN_MODE_ANY (unrestricted, adhoc and infrastructure) + */ t_u8 bss_mode; - /** - * Specific BSSID used to filter scan results in the firmware - */ + /** + * Specific BSSID used to filter scan results in the firmware + */ t_u8 specific_bssid[MLAN_MAC_ADDR_LENGTH]; - /** - * Length of TLVs sent in command starting at tlvBuffer - */ + /** + * Length of TLVs sent in command starting at tlvBuffer + */ t_u32 tlv_buf_len; - /** - * SSID TLV(s) and ChanList TLVs to be sent in the firmware command - * - * 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 */ + /** + * SSID TLV(s) and ChanList TLVs to be sent in the firmware command + * + * 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 */ } MLAN_PACK_END wlan_scan_cmd_config; /** * Sructure to retrieve the scan table */ typedef MLAN_PACK_START struct { - /** - * - Zero based scan entry to start retrieval in command request - * - Number of scans entries returned in command response - */ + /** + * - Zero based scan entry to start retrieval in command request + * - Number of scans entries returned in command response + */ 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. - */ + /** + * 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]; } MLAN_PACK_END wlan_get_scan_table_info; @@ -4134,51 +4225,51 @@ typedef MLAN_PACK_START struct { */ /** HostCmd_DS_802_11_SCAN */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SCAN { - /** BSS mode */ + /** BSS mode */ t_u8 bss_mode; - /** BSSID */ + /** BSSID */ t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; - /** TLV buffer */ + /** TLV buffer */ t_u8 tlv_buffer[1]; - /** MrvlIEtypes_SsIdParamSet_t SsIdParamSet; - * MrvlIEtypes_ChanListParamSet_t ChanListParamSet; - * MrvlIEtypes_RatesParamSet_t OpRateSet; - */ + /** MrvlIEtypes_SsIdParamSet_t SsIdParamSet; + * MrvlIEtypes_ChanListParamSet_t ChanListParamSet; + * MrvlIEtypes_RatesParamSet_t OpRateSet; + */ } MLAN_PACK_END HostCmd_DS_802_11_SCAN; /** fw_cap_info bit to indicate enhance ext scan type */ #define ENHANCE_EXT_SCAN_ENABLE MBIT(19) /** mlan_event_scan_result data structure */ typedef MLAN_PACK_START struct _mlan_event_scan_result { - /** Event ID */ + /** Event ID */ t_u16 event_id; - /** BSS index number for multiple BSS support */ + /** BSS index number for multiple BSS support */ t_u8 bss_index; - /** BSS type */ + /** BSS type */ t_u8 bss_type; - /** More event available or not */ + /** More event available or not */ t_u8 more_event; - /** Reserved */ + /** Reserved */ t_u8 reserved[3]; - /** Size of the response buffer */ + /** Size of the response buffer */ t_u16 buf_size; - /** Number of BSS in scan response */ + /** Number of BSS in scan response */ t_u8 num_of_set; } MLAN_PACK_END mlan_event_scan_result, *pmlan_event_scan_result; /** ext scan status report event */ typedef MLAN_PACK_START struct _mlan_event_scan_status { - /** Event ID */ + /** Event ID */ t_u16 event_id; - /** BSS index number for multiple BSS support */ + /** BSS index number for multiple BSS support */ t_u8 bss_index; - /** BSS type */ + /** BSS type */ t_u8 bss_type; - /** scan status */ + /** scan status */ t_u8 scan_status; - /** result */ + /** result */ t_u16 buf_len; - /** event buf */ + /** event buf */ t_u8 event_buf[]; } MLAN_PACK_END mlan_event_scan_status, *pmlan_event_scan_status; @@ -4188,29 +4279,29 @@ typedef MLAN_PACK_START struct _mlan_event_scan_status { */ /** HostCmd_DS_802_11_SCAN_EXT */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SCAN_EXT { - /** Scan type for ext scan - * 0: default type: cmd resp after ext scan report event - * 1: enhanced type: cmd resp before ext scan report event - * 2: scan cancelled: cancel scan during scan processing - */ + /** Scan type for ext scan + * 0: default type: cmd resp after ext scan report event + * 1: enhanced type: cmd resp before ext scan report event + * 2: scan cancelled: cancel scan during scan processing + */ t_u8 ext_scan_type; - /** Reserved */ + /** Reserved */ t_u8 reserved[3]; - /** TLV buffer */ + /** TLV buffer */ t_u8 tlv_buffer[1]; - /** MrvlIEtypes_Bssid_List_t BssIdList; - * MrvlIEtypes_SsIdParamSet_t SSIDParamSet; - * MrvlIEtypes_ChanListParamSet_t ChanListParamSet; - * MrvlIEtypes_RatesParamSet_t OpRateSet; - * MrvlIEtypes_NumProbes_t NumProbes; - * MrvlIEtypes_WildCardSsIdParamSet_t WildCardSSIDParamSet; - * MrvlIEtypes_BssMode_t BssMode; - */ + /** MrvlIEtypes_Bssid_List_t BssIdList; + * MrvlIEtypes_SsIdParamSet_t SSIDParamSet; + * MrvlIEtypes_ChanListParamSet_t ChanListParamSet; + * MrvlIEtypes_RatesParamSet_t OpRateSet; + * MrvlIEtypes_NumProbes_t NumProbes; + * MrvlIEtypes_WildCardSsIdParamSet_t WildCardSSIDParamSet; + * MrvlIEtypes_BssMode_t BssMode; + */ } MLAN_PACK_END HostCmd_DS_802_11_SCAN_EXT; /** MrvlIEtypes_BssMode */ typedef MLAN_PACK_START struct _MrvlIEtypes_BssMode_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; /* INFRA/IBSS/AUTO */ t_u8 bss_mode; @@ -4218,100 +4309,101 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_BssMode_t { /** BSS scan Rsp */ typedef MLAN_PACK_START struct _MrvlIEtypes_Bss_Scan_Rsp_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** BSSID of the BSS descriptor */ + /** BSSID of the BSS descriptor */ t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; - /** Beacon/Probe response buffer */ + /** Beacon/Probe response buffer */ t_u8 frame_body[1]; } MLAN_PACK_END MrvlIEtypes_Bss_Scan_Rsp_t; typedef MLAN_PACK_START struct _MrvlIEtypes_Bss_Scan_Info_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** RSSI for scan entry */ + /** RSSI for scan entry */ t_s16 rssi; - /** Channel ANPI */ + /** Channel ANPI */ t_s16 anpi; - /** Channel load (parts per 255) */ + /** Channel load (parts per 255) */ t_u8 cca_busy_fraction; - /** Band */ + /** Band */ Band_Config_t bandcfg; - /** Channel */ + /** Channel */ t_u8 channel; - /** Reserved */ + /** Reserved */ t_u8 reserved; - /** TSF data */ + /** TSF data */ 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 */ + /** Action */ t_u16 action; - /** Mgmt frame subtype mask */ + /** Mgmt frame 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 */ + /** Size of BSS descriptor */ t_u16 bss_descript_size; - /** Numner of sets */ + /** Numner of sets */ t_u8 number_of_sets; - /** BSS descriptor and TLV buffer */ + /** BSS descriptor and TLV buffer */ 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 */ + /** action */ t_u16 action; - /** 0: disable, 1: enable */ + /** 0: disable, 1: enable */ t_u8 enable; - /** bss type */ + /** bss type */ t_u8 bss_type; - /** num of channel per scan */ + /** num of channel per scan */ t_u8 chan_per_scan; - /** reserved field */ + /** reserved field */ t_u8 reserved; - /** reserved field */ + /** reserved field */ t_u16 reserved1; - /** interval between consecutive scans */ + /** interval between consecutive scans */ t_u32 scan_interval; - /** reserved field */ + /** reserved field */ t_u32 reserved2; - /** condition to trigger report to host */ + /** condition to trigger report to host */ t_u32 report_condition; - /** reserved field */ + /** reserved field */ 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 */ + /** 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 */ + /** Report condition */ t_u32 report_condition; - /** Scan response */ + /** Scan response */ 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /* 0 - BGScan start immediately, 1 - BGScan will start later after "Scan Interval" */ + /* 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 */ + /** Header */ MrvlIEtypesHeader_t header; /* Repeat count */ t_u16 repeat_count; @@ -4319,230 +4411,294 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_RepeatCount_t { /** MrvlIEtypes_DomainParamSet_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_DomainParamSet { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Country code */ + /** Country code */ t_u8 country_code[COUNTRY_CODE_LEN]; - /** Set of subbands */ + /** Set of subbands */ 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 */ + /** Action */ t_u16 action; - /** Domain parameter set */ + /** Domain parameter set */ 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 */ + /** Action */ t_u16 action; - /** Domain parameter set */ + /** Domain parameter set */ 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 */ + /** Result of the ADDBA Request Operation */ t_u8 add_req_result; - /** Peer MAC address */ + /** Peer MAC address */ t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; - /** Dialog Token */ + /** Dialog Token */ t_u8 dialog_token; - /** Block Ack Parameter Set */ + /** Block Ack Parameter Set */ t_u16 block_ack_param_set; - /** Block Act Timeout Value */ + /** Block Act Timeout Value */ t_u16 block_ack_tmo; - /** Starting Sequence Number */ + /** Starting Sequence Number */ 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 */ + /** Result of the ADDBA Response Operation */ t_u8 add_rsp_result; - /** Peer MAC address */ + /** Peer MAC address */ t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; - /** Dialog Token */ + /** Dialog Token */ t_u8 dialog_token; - /** Status Code */ + /** Status Code */ t_u16 status_code; - /** Block Ack Parameter Set */ + /** Block Ack Parameter Set */ t_u16 block_ack_param_set; - /** Block Act Timeout Value */ + /** Block Act Timeout Value */ t_u16 block_ack_tmo; - /** Starting Sequence Number */ + /** Starting Sequence Number */ 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 */ + /** Result of the ADDBA Request Operation */ t_u8 del_result; - /** Peer MAC address */ + /** Peer MAC address */ t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; - /** Delete Block Ack Parameter Set */ + /** Delete Block Ack Parameter Set */ t_u16 del_ba_param_set; - /** Reason Code sent for DELBA */ + /** Reason Code sent for DELBA */ t_u16 reason_code; - /** Reserved */ + /** 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 */ + /** TID */ t_u8 tid; - /** Peer MAC address */ + /** Peer MAC address */ t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; - /** Delete Block Ack Parameter Set */ + /** Delete Block Ack Parameter Set */ t_u8 origninator; } MLAN_PACK_END HostCmd_DS_11N_BATIMEOUT; /** HostCmd_DS_11N_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_11N_CFG { - /** Action */ + /** Action */ t_u16 action; - /** HTTxCap */ + /** HTTxCap */ t_u16 ht_tx_cap; - /** HTTxInfo */ + /** HTTxInfo */ t_u16 ht_tx_info; - /** Misc configuration */ + /** Misc configuration */ 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 */ + /** Action */ t_u16 action; - /** Bit0 : host sleep activated - * Bit1 : auto reconnect enabled - * Others : reserved - */ + /** Bit0 : host sleep activated + * Bit1 : auto reconnect enabled + * Others : reserved + */ 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 */ + /** Action */ t_u16 action; - /** Buffer Size */ + /** Buffer Size */ t_u16 buff_size; - /** End Port_for Multiport */ + /** End Port_for Multiport */ t_u16 mp_end_port; - /** Reserved */ + /** Reserved */ 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 */ + /** Action */ t_u16 action; - /** Enable */ + /** Enable */ t_u16 enable; - /** Get the current Buffer Size valid */ + /** Get the current Buffer Size valid */ 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 */ + /** Action */ t_u16 action; - /** BandConfig */ + /** BandConfig */ t_u8 band_config; - /** Misc Configuration */ + /** Misc Configuration */ t_u8 misc_config; - /** VHT Capability Info */ + /** VHT Capability Info */ t_u32 vht_cap_info; - /** VHT Support MCS Set */ + /** VHT Support MCS Set */ 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 */ + /** Action */ t_u16 action; - /** Buffer Size */ + /** Buffer Size */ t_u16 buff_size; - /** End Port_for Multiport */ + /** End Port_for Multiport */ t_u16 mp_end_port; - /** Reserved */ + /** Reserved */ t_u16 reserved3; } MLAN_PACK_END HostCmd_DS_11ACTXBUF_CFG; /** HostCmd_DS_11AX_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_11AX_CFG { - /** Action */ + /** Action */ t_u16 action; - /** BandConfig */ + /** BandConfig */ t_u8 band_config; - /** TLV for HE capability or HE operation */ + /** TLV for HE capability or HE operation */ t_u8 val[]; } MLAN_PACK_END HostCmd_DS_11AX_CFG; /** HostCmd_DS_11AX_CMD_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_11AX_CMD_CFG { - /** Action */ + /** Action */ t_u16 action; - /** CMD_SUBID */ + /** CMD_SUBID */ t_u16 sub_id; - /** TLV or value for cmd */ + /** TLV or value for cmd */ t_u8 val[]; } MLAN_PACK_END HostCmd_DS_11AX_CMD_CFG; +/** Type definition of hostcmd_twt_setup */ +typedef struct MLAN_PACK_START _hostcmd_twt_setup { + /** Implicit, 0: TWT session is explicit, 1: Session is implicit */ + t_u8 implicit; + /** Announced, 0: Unannounced, 1: Announced TWT */ + t_u8 announced; + /** Trigger Enabled, 0: Non-Trigger enabled, 1: Trigger enabled TWT */ + t_u8 trigger_enabled; + /** TWT Information Disabled, 0: TWT info enabled, 1: TWT info disabled + */ + t_u8 twt_info_disabled; + /** Negotiation Type, 0: Future Individual TWT SP start time, 1: Next + * Wake TBTT time */ + t_u8 negotiation_type; + /** TWT Wakeup Duration, time after which the TWT requesting STA can + * transition to doze state */ + t_u8 twt_wakeup_duration; + /** Flow Identifier. Range: [0-7]*/ + t_u8 flow_identifier; + /** Hard Constraint, 0: FW can tweak the TWT setup parameters if it is + *rejected by AP. + ** 1: Firmware should not tweak any parameters. */ + t_u8 hard_constraint; + /** TWT Exponent, Range: [0-63] */ + t_u8 twt_exponent; + /** TWT Mantissa Range: [0-sizeof(UINT16)] */ + t_u16 twt_mantissa; + /** TWT Setup State. Set to 0 by driver, filled by FW in response*/ + t_u8 twt_setup_state; + /** Reserved, set to 0. */ + t_u8 reserved[3]; +} MLAN_PACK_END hostcmd_twt_setup, *phostcmd_twt_setup; + +/** Type definition of hostcmd_twt_teardown */ +typedef struct MLAN_PACK_START _hostcmd_twt_teardown { + /** TWT Flow Identifier. Range: [0-7] */ + t_u8 flow_identifier; + /** Negotiation Type. 0: Future Individual TWT SP start time, 1: Next + * Wake TBTT time */ + t_u8 negotiation_type; + /** Tear down all TWT. 1: To teardown all TWT, 0 otherwise */ + t_u8 teardown_all_twt; + /** TWT Teardown State. Set to 0 by driver, filled by FW in response */ + t_u8 twt_teardown_state; + /** Reserved, set to 0. */ + t_u8 reserved[3]; +} MLAN_PACK_END hostcmd_twt_teardown, *phostcmd_twt_teardown; + +/** HostCmd_DS_TWT_CFG */ +typedef MLAN_PACK_START struct _HostCmd_DS_TWT_CFG { + /** Action */ + t_u16 action; + /** CMD_SUBID */ + t_u16 sub_id; + /** TWT Setup/Teardown configuration parameters */ + union { + /** TWT Setup config for Sub ID: MLAN_11AX_TWT_SETUP_SUBID */ + hostcmd_twt_setup twt_setup; + /** TWT Teardown config for Sub ID: MLAN_11AX_TWT_TEARDOWN_SUBID + */ + hostcmd_twt_teardown twt_teardown; + } param; +} MLAN_PACK_END HostCmd_DS_TWT_CFG; + /** HostCmd_DS_ECL_SYSTEM_CLOCK_CONFIG */ typedef MLAN_PACK_START struct _HostCmd_DS_ECL_SYSTEM_CLOCK_CONFIG { - /** Action */ + /** Action */ t_u16 action; - /** Current system clock */ + /** Current system clock */ t_u16 cur_sys_clk; - /** Clock type */ + /** Clock type */ t_u16 sys_clk_type; - /** Length of clocks */ + /** Length of clocks */ t_u16 sys_clk_len; - /** System clocks */ + /** System clocks */ 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** WMM IE */ + /** WMM IE */ t_u8 wmm_ie[1]; } MLAN_PACK_END MrvlIEtypes_WmmParamSet_t; /** MrvlIEtypes_WmmQueueStatus_t */ typedef MLAN_PACK_START struct { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Queue index */ + /** Queue index */ t_u8 queue_index; - /** Disabled flag */ + /** Disabled flag */ t_u8 disabled; - /** Medium time allocation in 32us units*/ + /** Medium time allocation in 32us units*/ t_u16 medium_time; - /** Flow required flag */ + /** Flow required flag */ t_u8 flow_required; - /** Flow created flag */ + /** Flow created flag */ t_u8 flow_created; - /** Reserved */ + /** Reserved */ t_u32 reserved; } MLAN_PACK_END MrvlIEtypes_WmmQueueStatus_t; /** Size of a TSPEC. Used to allocate necessary buffer space in commands */ -#define WMM_TSPEC_SIZE 63 +#define WMM_TSPEC_SIZE 63 /** Extra IE bytes allocated in messages for appended IEs after a TSPEC */ -#define WMM_ADDTS_EXTRA_IE_BYTES 256 +#define WMM_ADDTS_EXTRA_IE_BYTES 256 /** Extra TLV bytes allocated in messages for configuring WMM Queues */ #define WMM_QUEUE_CONFIG_EXTRA_TLV_BYTES 64 /** Number of bins in the histogram for the HostCmd_DS_WMM_QUEUE_STATS */ -#define WMM_STATS_PKTS_HIST_BINS 7 +#define WMM_STATS_PKTS_HIST_BINS 7 /** * @brief Firmware command structure to retrieve the firmware WMM status. @@ -4559,10 +4715,10 @@ typedef MLAN_PACK_START struct { * 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]; - /** WMM parameter TLV */ + /** Queue status TLV */ + 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]; } MLAN_PACK_END HostCmd_DS_WMM_GET_STATUS; @@ -4570,24 +4726,23 @@ typedef MLAN_PACK_START struct { * @brief Command structure for the HostCmd_CMD_WMM_ADDTS_REQ firmware command */ 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 */ + 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 */ + t_u8 addts_extra_ie_buf[WMM_ADDTS_EXTRA_IE_BYTES]; /**< Extra IE buffer + */ } MLAN_PACK_END HostCmd_DS_WMM_ADDTS_REQ; /** * @brief Command structure for the HostCmd_CMD_WMM_DELTS_REQ firmware command */ 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; /** @@ -4596,17 +4751,15 @@ typedef MLAN_PACK_START struct { * Set/Get/Default the Queue parameters for a specific AC in the firmware. */ 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) */ - /** @brief MSDU lifetime expiry per 802.11e - * - * - Ignored if 0 on a set command - * - Set to the 802.11e specified 500 TUs when defaulted - */ + 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 + * - 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_u8 tlv_buffer[WMM_QUEUE_CONFIG_EXTRA_TLV_BYTES]; /**< Not supported */ } MLAN_PACK_END HostCmd_DS_WMM_QUEUE_CONFIG; /** @@ -4616,36 +4769,35 @@ typedef MLAN_PACK_START struct { * accumulated stats for an AC and clear them in the firmware. */ 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_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 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 - * [1] - 5ms <= delay < 10ms - * [2] - 10ms <= delay < 20ms - * [3] - 20ms <= delay < 30ms - * [4] - 30ms <= delay < 40ms - * [5] - 40ms <= delay < 50ms - * [6] - 50ms <= delay < msduLifetime (TUs) - */ + /** @brief Queue Delay Histogram; number of packets per queue delay + * range + * + * [0] - 0ms <= delay < 5ms + * [1] - 5ms <= delay < 10ms + * [2] - 10ms <= delay < 20ms + * [3] - 20ms <= delay < 30ms + * [4] - 30ms <= delay < 40ms + * [5] - 40ms <= delay < 50ms + * [6] - 50ms <= delay < msduLifetime (TUs) + */ t_u16 delay_histogram[WMM_STATS_PKTS_HIST_BINS]; - /** Reserved */ + /** Reserved */ t_u16 reserved_1; } MLAN_PACK_END HostCmd_DS_WMM_QUEUE_STATS; @@ -4655,128 +4807,128 @@ typedef MLAN_PACK_START struct { * Query the firmware to get the status of the WMM Traffic Streams */ typedef MLAN_PACK_START struct { - /** TSID: Range: 0->7 */ + /** TSID: Range: 0->7 */ t_u8 tid; - /** TSID specified is valid */ + /** TSID specified is valid */ t_u8 valid; - /** AC TSID is active on */ + /** AC TSID is active on */ t_u8 access_category; - /** UP specified for the TSID */ + /** UP specified for the TSID */ t_u8 user_priority; - /** Power save mode for TSID: 0 (legacy), 1 (UAPSD) */ + /** Power save mode for TSID: 0 (legacy), 1 (UAPSD) */ t_u8 psb; - /** Uplink(1), Downlink(2), Bidirectional(3) */ + /** Uplink(1), Downlink(2), Bidirectional(3) */ t_u8 flow_dir; - /** Medium time granted for the TSID */ + /** Medium time granted for the TSID */ 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 */ + /** Disabled flag */ t_u8 disabled; - /** Flow required flag */ + /** Flow required flag */ t_u8 flow_required; - /** Flow created flag */ + /** Flow created flag */ t_u8 flow_created; } MLAN_PACK_END WmmAcStatus_t; /** Local Power Capability */ typedef MLAN_PACK_START struct _MrvlIEtypes_PowerCapability_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Minmum power */ + /** Minmum power */ t_s8 min_power; - /** Maximum power */ + /** Maximum power */ t_s8 max_power; } MLAN_PACK_END MrvlIEtypes_PowerCapability_t; /** HT Information element */ typedef MLAN_PACK_START struct _MrvlIETypes_HTInfo_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** HTInfo struct */ + /** HTInfo struct */ HTInfo_t ht_info; } MLAN_PACK_END MrvlIETypes_HTInfo_t; /** 20/40 BSS Coexistence element */ typedef MLAN_PACK_START struct _MrvlIETypes_2040BSSCo_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** BSSCo2040_t struct */ + /** BSSCo2040_t struct */ BSSCo2040_t bss_co_2040; } MLAN_PACK_END MrvlIETypes_2040BSSCo_t; /** Extended Capabilities element */ typedef MLAN_PACK_START struct _MrvlIETypes_ExtCap_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** ExtCap_t struct */ + /** ExtCap_t struct */ ExtCap_t ext_cap; } MLAN_PACK_END MrvlIETypes_ExtCap_t; /** Supported operating classes element */ typedef MLAN_PACK_START struct _MrvlIETypes_SuppOperClass_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Current operationg class **/ + /** Current operationg class **/ t_u8 current_oper_class; - /** Operating class list */ + /** Operating class list */ t_u8 oper_class[1]; } MLAN_PACK_END MrvlIETypes_SuppOperClass_t; /** Oper_class channel bandwidth element */ typedef MLAN_PACK_START struct _MrvlIEtypes_chan_bw_oper_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** channel oper bandwidth*/ + /** channel oper bandwidth*/ mlan_ds_bw_chan_oper ds_chan_bw_oper; } MLAN_PACK_END MrvlIEtypes_chan_bw_oper_t; /** Qos Info */ typedef MLAN_PACK_START struct _MrvlIETypes_qosinfo_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** qos_info*/ + /** qos_info*/ t_u8 qos_info; } MLAN_PACK_END MrvlIETypes_qosinfo_t; /** Overlapping BSS Scan Parameters element */ typedef MLAN_PACK_START struct _MrvlIETypes_OverlapBSSScanParam_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** OBSSScanParam_t struct */ + /** OBSSScanParam_t struct */ 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** Bitmap indicating MCSs that STA desires to use within the BSS */ + /** Bitmap indicating MCSs that STA desires to use within the BSS */ t_u8 ht_operational_mcs_bitmap[16]; } MLAN_PACK_END MrvlIETypes_HTOperationalMCSSet_t; /** VHT Operations IE */ typedef MLAN_PACK_START struct _MrvlIETypes_VHTOprat_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; 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 */ + /** Basic MCS set map, each 2 bits stands for a Nss */ 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 */ + /** Header */ MrvlIEtypesHeader_t header; t_u8 max_tx_power; @@ -4786,18 +4938,18 @@ typedef MLAN_PACK_START struct _MrvlIETypes_VHTtxpower_t { /** Extended Power Constraint IE */ typedef MLAN_PACK_START struct _MrvlIETypes_ExtPwerCons_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** channel width */ + /** channel width */ t_u8 chan_width; - /** local power constraint */ + /** local power constraint */ t_u8 local_power_cons; } MLAN_PACK_END MrvlIETypes_ExtPwerCons_t; /** Extended BSS Load IE */ typedef MLAN_PACK_START struct _MrvlIETypes_ExtBSSload_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; t_u8 MU_MIMO_capa_count; @@ -4809,7 +4961,7 @@ typedef MLAN_PACK_START struct _MrvlIETypes_ExtBSSload_t { /** Quiet Channel IE */ typedef MLAN_PACK_START struct _MrvlIETypes_QuietChan_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; t_u8 AP_quiet_mode; @@ -4821,7 +4973,7 @@ typedef MLAN_PACK_START struct _MrvlIETypes_QuietChan_t { /** Wide Bandwidth Channel Switch IE */ typedef MLAN_PACK_START struct _MrvlIETypes_BWSwitch_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; t_u8 new_chan_width; @@ -4831,77 +4983,77 @@ typedef MLAN_PACK_START struct _MrvlIETypes_BWSwitch_t { /** AID IE */ typedef MLAN_PACK_START struct _MrvlIETypes_AID_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** AID number */ + /** AID number */ t_u16 AID; } MLAN_PACK_END MrvlIETypes_AID_t; /** Operating Mode Notification IE */ typedef MLAN_PACK_START struct _MrvlIETypes_OperModeNtf_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** operating mdoe */ + /** operating mdoe */ 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 */ + /** Global enable/disable bf */ t_u8 bf_enbl; - /** Global enable/disable sounding */ + /** Global enable/disable sounding */ t_u8 sounding_enbl; - /** FB Type */ + /** FB Type */ t_u8 fb_type; - /** SNR Threshold */ + /** SNR Threshold */ t_u8 snr_threshold; - /** Sounding interval */ + /** Sounding interval */ t_u16 sounding_interval; - /** BF mode */ + /** BF mode */ t_u8 bf_mode; - /** Reserved */ + /** 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 */ + /** Peer MAC address */ t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; - /** Status */ + /** 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 */ + /** Peer MAC address */ t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; - /** Current Tx BF Interval */ + /** Current Tx BF Interval */ t_u16 interval; - /** Status */ + /** 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 */ + /** Peer MAC address */ t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; - /** Reserved */ + /** Reserved */ t_u16 reserved; - /** Enable/Disable Beamforming */ + /** Enable/Disable Beamforming */ t_u8 bf_enbl; - /** Enable/Disable sounding */ + /** Enable/Disable sounding */ t_u8 sounding_enbl; - /** FB Type */ + /** 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 */ + /** Peer MAC address */ t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; - /** SNR */ + /** SNR */ t_u8 snr; } MLAN_PACK_END bf_snr_thr_t; @@ -4909,7 +5061,7 @@ typedef MLAN_PACK_START struct _bf_snr_thr_t { typedef MLAN_PACK_START struct _HostCmd_DS_TX_BF_CFG { /* Beamforming action */ t_u16 bf_action; - /* action - SET/GET */ + /* action - SET/GET*/ t_u16 action; MLAN_PACK_START union { @@ -4924,34 +5076,34 @@ typedef MLAN_PACK_START struct _HostCmd_DS_TX_BF_CFG { #ifdef WIFI_DIRECT_SUPPORT /** MrvlIEtypes_psk_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_psk_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** PSK */ + /** PSK */ t_u8 psk[MLAN_MAX_KEY_LENGTH]; } MLAN_PACK_END MrvlIEtypes_psk_t; #endif /* WIFI_DIRECT_SUPPORT */ /** MrvlIEtypes_PMK_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_PMK_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** PMK */ + /** PMK */ t_u8 pmk[1]; } MLAN_PACK_END MrvlIEtypes_PMK_t; /** MrvlIEtypes_Passphrase_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_Passphrase_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Passphrase */ + /** Passphrase */ char passphrase[1]; } MLAN_PACK_END MrvlIEtypes_Passphrase_t; /** MrvlIEtypes_SAE_Password_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_SAE_Password_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** SAE Password */ + /** SAE Password */ char sae_password[1]; } MLAN_PACK_END MrvlIEtypes_SAE_Password_t; @@ -4966,17 +5118,17 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_SAE_Password_t { */ /** MrvlIEtypes_EncrProto_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_EncrProto_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** EncrProto */ + /** EncrProto */ t_u16 rsn_mode; } MLAN_PACK_END MrvlIEtypes_EncrProto_t; /** MrvlIEtypes_Bssid_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_Bssid_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Bssid */ + /** Bssid */ t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; } MLAN_PACK_END MrvlIEtypes_Bssid_t; @@ -4987,17 +5139,17 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_Bssid_t { */ /** HostCmd_DS_802_11_SUPPLICANT_PMK */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SUPPLICANT_PMK { - /** CMD Action GET/SET/CLEAR */ + /** CMD Action GET/SET/CLEAR */ t_u16 action; - /** CacheResult initialized to 0 */ + /** CacheResult initialized to 0 */ t_u16 cache_result; - /** TLV Buffer */ + /** TLV Buffer */ t_u8 tlv_buffer[1]; - /** MrvlIEtypes_SsidParamSet_t SsidParamSet; - * MrvlIEtypes_PMK_t Pmk; - * MrvlIEtypes_Passphrase_t Passphrase; - * MrvlIEtypes_Bssid_t Bssid; - **/ + /** MrvlIEtypes_SsidParamSet_t SsidParamSet; + * MrvlIEtypes_PMK_t Pmk; + * MrvlIEtypes_Passphrase_t Passphrase; + * MrvlIEtypes_Bssid_t Bssid; + **/ } MLAN_PACK_END HostCmd_DS_802_11_SUPPLICANT_PMK; /* @@ -5007,11 +5159,11 @@ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SUPPLICANT_PMK { * Define data structure for HostCmd_CMD_802_11_SUPPLICANT_PROFILE */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SUPPLICANT_PROFILE { - /** GET/SET/GET_CURRENT */ + /** GET/SET/GET_CURRENT */ t_u16 action; - /** Reserved */ + /** Reserved */ t_u16 reserved; - /** TLVBuffer */ + /** TLVBuffer */ t_u8 tlv_buf[1]; /* MrvlIEtypes_EncrProto_t */ } MLAN_PACK_END HostCmd_DS_802_11_SUPPLICANT_PROFILE; @@ -5031,144 +5183,145 @@ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_SUPPLICANT_PROFILE { */ /** MrvlIEtypes_Cipher_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_Cipher_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** PairCipher */ + /** PairCipher */ t_u8 pair_cipher; - /** GroupCipher */ + /** GroupCipher */ t_u8 group_cipher; } MLAN_PACK_END MrvlIEtypes_Cipher_t; /** RFType */ typedef MLAN_PACK_START struct _RFType_t { - /** band info */ + /** band info */ Band_Config_t bandcfg; - /** reserved */ + /** reserved */ t_u8 reserved; } MLAN_PACK_END RFType_t; /** HostCmd_CMD_802_11_RF_CHANNEL */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_RF_CHANNEL { - /** Action */ + /** Action */ t_u16 action; - /** Current channel */ + /** Current channel */ t_u16 current_channel; - /** RF type */ + /** RF type */ RFType_t rf_type; - /** Reserved field */ + /** Reserved field */ t_u16 reserved; #ifdef STA_SUPPORT - /** Reserved */ + /** Reserved */ t_u8 reserved_1[32]; -#else /* STA_SUPPORT */ - /** List of channels */ +#else /* STA_SUPPORT */ + /** List of channels */ t_u8 channel_list[32]; -#endif /* !STA_SUPPORT */ +#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 */ + /** Selected version string */ t_u8 version_str_sel; - /** Version string */ + /** Version string */ char version_str[128]; } MLAN_PACK_END HostCmd_DS_VERSION_EXT; -#define TLV_TYPE_CHAN_ATTR_CFG (PROPRIETARY_TLV_BASE_ID + 237) -#define TLV_TYPE_REGION_INFO (PROPRIETARY_TLV_BASE_ID + 238) -#define TLV_TYPE_POWER_TABLE (PROPRIETARY_TLV_BASE_ID + 262) -#define TLV_TYPE_POWER_TABLE_ATTR (PROPRIETARY_TLV_BASE_ID + 317) +#define TLV_TYPE_CHAN_ATTR_CFG (PROPRIETARY_TLV_BASE_ID + 237) +#define TLV_TYPE_REGION_INFO (PROPRIETARY_TLV_BASE_ID + 238) +#define TLV_TYPE_POWER_TABLE (PROPRIETARY_TLV_BASE_ID + 262) +#define TLV_TYPE_POWER_TABLE_ATTR (PROPRIETARY_TLV_BASE_ID + 317) /** HostCmd_DS_CHAN_REGION_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_CHAN_REGION_CFG { - /** Action */ + /** Action */ t_u16 action; } MLAN_PACK_END HostCmd_DS_CHAN_REGION_CFG; /** HostCmd_CMD_CW_MODE_CTRL */ typedef MLAN_PACK_START struct _HostCmd_DS_CW_MODE_CTRL { - /** Action for CW Tone Control */ + /** Action for CW Tone Control */ t_u16 action; - /** Mode of Operation 0: Disbale 1: Tx Continuous Packet 2: Tx Continuous Wave */ + /** Mode of Operation 0: Disbale 1: Tx Continuous Packet 2: Tx + * Continuous Wave */ t_u8 mode; - /** channel */ + /** channel */ t_u8 channel; - /** channel info*/ + /** channel info*/ t_u8 chanInfo; - /** Tx Power level in dBm */ + /** Tx Power level in dBm */ t_u16 txPower; - /** Packet Length */ + /** Packet Length */ t_u16 pktLength; - /** bit rate Info */ + /** bit rate Info */ t_u32 rateInfo; } MLAN_PACK_END HostCmd_DS_CW_MODE_CTRL; /** HostCmd_CMD_802_11_RF_ANTENNA */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_RF_ANTENNA { - /** Action for Tx antenna */ + /** Action for Tx antenna */ t_u16 action_tx; - /** Tx antenna mode Bit0:1, Bit1:2, Bit0-1:1+2, 0xffff: diversity */ + /** Tx antenna mode Bit0:1, Bit1:2, Bit0-1:1+2, 0xffff: diversity */ t_u16 tx_antenna_mode; - /** Action for Rx antenna */ + /** Action for Rx antenna */ t_u16 action_rx; - /** Rx antenna mode Bit0:1, Bit1:2, Bit0-1:1+2, 0xffff: diversity */ + /** Rx antenna mode Bit0:1, Bit1:2, Bit0-1:1+2, 0xffff: diversity */ 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 */ + /** Action */ t_u16 action; - /** Enable */ + /** Enable */ t_u16 enable; - /** BSSID */ + /** BSSID */ t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; - /** Beacon interval */ + /** Beacon interval */ t_u16 beacon_interval; - /** ATIM window interval */ + /** ATIM window interval */ t_u16 atim_window; - /** User G rate protection */ + /** User G rate protection */ 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 */ + /** Action */ t_u16 action; - /** Get/Set mgmt IE */ + /** Get/Set 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 */ + /** Action */ t_u16 action; - /** MAC register offset */ + /** MAC register offset */ t_u16 offset; - /** MAC register value */ + /** MAC register 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 */ + /** Acion */ t_u16 action; - /** BBP register offset */ + /** BBP register offset */ t_u16 offset; - /** BBP register value */ + /** BBP register value */ t_u8 value; - /** Reserved field */ + /** Reserved field */ 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 */ + /** Action */ t_u16 action; - /** RF register offset */ + /** RF register offset */ t_u16 offset; - /** RF register value */ + /** RF register value */ t_u8 value; - /** Reserved field */ + /** Reserved field */ t_u8 reserved[3]; } MLAN_PACK_END HostCmd_DS_RF_REG_ACCESS; @@ -5211,9 +5364,9 @@ typedef MLAN_PACK_START struct _HostCmd_DS_TARGET_ACCESS { /** HostCmd_DS_SUBSCRIBE_EVENT */ typedef MLAN_PACK_START struct _HostCmd_DS_SUBSCRIBE_EVENT { - /** Action */ + /** Action */ t_u16 action; - /** Bitmap of subscribed events */ + /** Bitmap of subscribed events */ t_u16 event_bitmap; } MLAN_PACK_END HostCmd_DS_SUBSCRIBE_EVENT; @@ -5231,617 +5384,609 @@ typedef MLAN_PACK_START struct _HostCmd_DS_OTP_USER_DATA { /** HostCmd_CMD_HS_WAKEUP_REASON */ typedef MLAN_PACK_START struct _HostCmd_DS_HS_WAKEUP_REASON { - /** wakeupReason: - * 0: unknown - * 1: Broadcast data matched - * 2: Multicast data matched - * 3: Unicast data matched - * 4: Maskable event matched - * 5. Non-maskable event matched - * 6: Non-maskable condition matched (EAPoL rekey) - * 7: Magic pattern matched - * Others: reserved. (set to 0) */ + /** wakeupReason: + * 0: unknown + * 1: Broadcast data matched + * 2: Multicast data matched + * 3: Unicast data matched + * 4: Maskable event matched + * 5. Non-maskable event matched + * 6: Non-maskable condition matched (EAPoL rekey) + * 7: Magic pattern matched + * Others: reserved. (set to 0) */ t_u16 wakeup_reason; } MLAN_PACK_END HostCmd_DS_HS_WAKEUP_REASON; /** MrvlIEtypes_HsWakeHoldoff_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_HsWakeHoldoff_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Minimum delay between HsActive and HostWake (in msec) */ + /** Minimum delay between HsActive and HostWake (in msec) */ t_u16 min_wake_holdoff; } MLAN_PACK_END MrvlIEtypes_HsWakeHoldoff_t; /** MrvlIEtypes_PsParamsInHs_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_PsParamsInHs_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Host sleep wake interval(in msec) */ + /** Host sleep wake interval(in msec) */ t_u32 hs_wake_interval; - /** Host sleep inactivity timeout (in msec) */ + /** Host sleep inactivity timeout (in msec) */ t_u32 hs_inactivity_timeout; } MLAN_PACK_END MrvlIEtypes_PsParamsInHs_t; /** MrvlIEtypes_WakeupSourceGPIO_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_WakeupSourceGPIO_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** GPIO for indication of wakeup source */ + /** GPIO for indication of wakeup source */ t_u8 ind_gpio; - /** Level on ind_gpio for normal wakeup source */ + /** Level on ind_gpio for normal wakeup source */ t_u8 level; } MLAN_PACK_END MrvlIEtypes_WakeupSourceGPIO_t; /** MrvlIEtypes_RobustcoexSourceGPIO_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_RobustcoexSourceGPIO_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** GPIO cfg for external bt request */ + /** GPIO cfg for external bt request */ t_u8 enable; - /** GPIO number */ + /** GPIO number */ t_u8 gpio_num; - /** GPIO Polarity */ + /** GPIO Polarity */ t_u8 gpio_polarity; } MLAN_PACK_END MrvlIEtypes_RobustcoexSourceGPIO_t; -#define MAX_NUM_MAC 2 +#define MAX_NUM_MAC 2 typedef MLAN_PACK_START struct _dmcs_chan_status { - /** Channel number */ + /** Channel number */ t_u8 channel; - /** Number of AP on this channel */ + /** Number of AP on this channel */ t_u8 ap_count; - /** Number of STA on this channel*/ + /** Number of STA on this channel*/ t_u8 sta_count; } MLAN_PACK_END dmcs_chan_status; typedef MLAN_PACK_START struct _dmcs_status { - /** radio ID */ + /** radio ID */ t_u8 radio_id; - /** Running mode - ** 0 - Idle - ** 1 - DBC - ** 2 - DRCS - */ + /** Running mode + ** 0 - Idle + ** 1 - DBC + ** 2 - DRCS + */ t_u8 running_mode; - /** Channel status of this radio */ + /** Channel status of this radio */ dmcs_chan_status chan_status[2]; } MLAN_PACK_END dmcs_status; /** MrvlIEtypes_DmcsConfig_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_DmcsConfig_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Mapping policy */ + /** Mapping policy */ t_u8 mapping_policy; - /** Radio status of DMCS */ + /** Radio status of DMCS */ dmcs_status radio_status[MAX_NUM_MAC]; } MLAN_PACK_END MrvlIEtypes_DmcsStatus_t; #define ANTMODE_FW_DECISION 0xff /** MrvlIEtypes_HS_Antmode_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_HS_Antmode_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Tx Path antenna mode*/ + /** Tx Path antenna mode*/ t_u8 txpath_antmode; - /** Rx Path antenna mode */ + /** Rx Path antenna mode */ t_u8 rxpath_antmode; } MLAN_PACK_END MrvlIEtypes_HS_Antmode_t; typedef MLAN_PACK_START struct _MrvlIEtypes_WakeupExtend_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Events that will be forced ignore **/ + /** Events that will be forced ignore **/ t_u32 event_force_ignore; - /** Events that will use extend gap to inform host*/ + /** Events that will use extend gap to inform host*/ t_u32 event_use_ext_gap; - /** Extend gap*/ + /** Extend gap*/ t_u8 ext_gap; - /** GPIO wave level*/ + /** GPIO wave level*/ t_u8 gpio_wave; } MLAN_PACK_END MrvlIEtypes_WakeupExtend_t; #define EVENT_MANAGEMENT_FRAME_WAKEUP 136 typedef MLAN_PACK_START struct _mgmt_frame_filter { - /** action - bitmap - ** On matching rx'd pkt and filter during NON_HOSTSLEEP mode: - ** Action[1]=0 Discard - ** Action[1]=1 Allow - ** Note that default action on non-match is "Allow". - ** - ** On matching rx'd pkt and filter during HOSTSLEEP mode: - ** Action[1:0]=00 Discard and Not Wake host - ** Action[1:0]=01 Discard and Wake host - ** Action[1:0]=10 Invalid - ** Note that default action on non-match is "Discard and Not Wake host". - **/ + /** action - bitmap + ** On matching rx'd pkt and filter during NON_HOSTSLEEP mode: + ** Action[1]=0 Discard + ** Action[1]=1 Allow + ** Note that default action on non-match is "Allow". + ** + ** On matching rx'd pkt and filter during HOSTSLEEP mode: + ** Action[1:0]=00 Discard and Not Wake host + ** Action[1:0]=01 Discard and Wake host + ** Action[1:0]=10 Invalid + ** Note that default action on non-match is "Discard and Not Wake + *host". + **/ t_u8 action; - /** Frame type(p2p...) - ** type=0: invalid - ** type=1: p2p - ** type=0xff: management frames(assoc req/rsp, probe req/rsp,...) - ** type=others: reserved - **/ + /** Frame type(p2p...) + ** type=0: invalid + ** type=1: p2p + ** type=0xff: management frames(assoc req/rsp, probe req/rsp,...) + ** type=others: reserved + **/ t_u8 type; - /** Frame mask according to each type - ** When type=1 for p2p, frame-mask have following define: - ** Bit Frame - ** 0 GO Negotiation Request - ** 1 GO Negotiation Response - ** 2 GO Negotiation Confirmation - ** 3 P2P Invitation Request - ** 4 P2P Invitation Response - ** 5 Device Discoverability Request - ** 6 Device Discoverability Response - ** 7 Provision Discovery Request - ** 8 Provision Discovery Response - ** 9 Notice of Absence - ** 10 P2P Presence Request - ** 11 P2P Presence Response - ** 12 GO Discoverability Request - ** 13-31 Reserved - ** - ** When type=others, frame-mask is reserved. - **/ + /** Frame mask according to each type + ** When type=1 for p2p, frame-mask have following define: + ** Bit Frame + ** 0 GO Negotiation Request + ** 1 GO Negotiation Response + ** 2 GO Negotiation Confirmation + ** 3 P2P Invitation Request + ** 4 P2P Invitation Response + ** 5 Device Discoverability Request + ** 6 Device Discoverability Response + ** 7 Provision Discovery Request + ** 8 Provision Discovery Response + ** 9 Notice of Absence + ** 10 P2P Presence Request + ** 11 P2P Presence Response + ** 12 GO Discoverability Request + ** 13-31 Reserved + ** + ** When type=others, frame-mask is reserved. + **/ t_u32 frame_mask; } MLAN_PACK_END mgmt_frame_filter; #define MAX_MGMT_FRAME_FILTER 2 /** MrvlIEtypes_MgmtFrameFilter_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_MgmtFrameFilter_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** management frame filters */ + /** management frame filters */ mgmt_frame_filter filter[MAX_MGMT_FRAME_FILTER]; } MLAN_PACK_END MrvlIEtypes_MgmtFrameFilter_t; /** HostCmd_DS_INACTIVITY_TIMEOUT_EXT */ typedef MLAN_PACK_START struct _HostCmd_DS_INACTIVITY_TIMEOUT_EXT { - /** ACT_GET/ACT_SET */ + /** ACT_GET/ACT_SET */ t_u16 action; - /** uS, 0 means 1000uS(1ms) */ + /** uS, 0 means 1000uS(1ms) */ t_u16 timeout_unit; - /** Inactivity timeout for unicast data */ + /** Inactivity timeout for unicast data */ t_u16 unicast_timeout; - /** Inactivity timeout for multicast data */ + /** Inactivity timeout for multicast data */ t_u16 mcast_timeout; - /** Timeout for additional RX traffic after Null PM1 packet exchange */ + /** Timeout for additional RX traffic after Null PM1 packet exchange */ t_u16 ps_entry_timeout; - /** Reserved to further expansion */ + /** Reserved to further expansion */ t_u16 reserved; } MLAN_PACK_END HostCmd_DS_INACTIVITY_TIMEOUT_EXT; /** HostCmd_DS_INDEPENDENT_RESET_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_INDEPENDENT_RESET_CFG { - /** ACT_GET/ACT_SET */ + /** ACT_GET/ACT_SET */ t_u16 action; - /** out band independent reset */ + /** out band independent reset */ t_u8 ir_mode; - /** gpio pin */ + /** gpio pin */ t_u8 gpio_pin; } MLAN_PACK_END HostCmd_DS_INDEPENDENT_RESET_CFG; /** HostCmd_DS_802_11_PS_INACTIVITY_TIMEOUT */ typedef MLAN_PACK_START struct _HostCmd_DS_802_11_PS_INACTIVITY_TIMEOUT { - /** ACT_GET/ACT_SET */ + /** ACT_GET/ACT_SET */ t_u16 action; - /** ps inactivity timeout value */ + /** ps inactivity timeout value */ t_u16 inact_tmo; } MLAN_PACK_END HostCmd_DS_802_11_PS_INACTIVITY_TIMEOUT; /** 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 */ -#define TLV_TYPE_RANDOM_MAC (PROPRIETARY_TLV_BASE_ID + 0xEC) /*0x01EC */ +#define TLV_TYPE_RANDOM_MAC (PROPRIETARY_TLV_BASE_ID + 0xEC) /*0x01EC*/ /** MrvlIEtypes_MacAddr_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_MacAddr_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** mac address */ + /** mac address */ t_u8 mac[MLAN_MAC_ADDR_LENGTH]; } MLAN_PACK_END MrvlIEtypes_MacAddr_t; /** Assoc Request */ -#define SUBTYPE_ASSOC_REQUEST 0 +#define SUBTYPE_ASSOC_REQUEST 0 /** ReAssoc Request */ -#define SUBTYPE_REASSOC_REQUEST 2 +#define SUBTYPE_REASSOC_REQUEST 2 /** Probe Resp */ -#define SUBTYPE_PROBE_RESP 5 +#define SUBTYPE_PROBE_RESP 5 /** Disassoc Request */ -#define SUBTYPE_DISASSOC 10 +#define SUBTYPE_DISASSOC 10 /** Auth Request */ -#define SUBTYPE_AUTH 11 +#define SUBTYPE_AUTH 11 /** Deauth Request */ -#define SUBTYPE_DEAUTH 12 +#define SUBTYPE_DEAUTH 12 /** Action frame */ -#define SUBTYPE_ACTION 13 +#define SUBTYPE_ACTION 13 /** beacon */ -#define SUBTYPE_BEACON 8 +#define SUBTYPE_BEACON 8 #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 Max Station number per chip */ -#define TLV_TYPE_UAP_MAX_STA_CNT_PER_CHIP\ - (PROPRIETARY_TLV_BASE_ID + 0x140) /* 0x0240 */ +#define TLV_TYPE_UAP_MAX_STA_CNT_PER_CHIP \ + (PROPRIETARY_TLV_BASE_ID + 0x140) /* 0x0240 */ /**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 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 */ /**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 */ /** TLV type : AP WMM params */ -#define TLV_TYPE_AP_WMM_PARAM\ - (PROPRIETARY_TLV_BASE_ID + 0xd0) /* 0x01d0 */ +#define TLV_TYPE_AP_WMM_PARAM (PROPRIETARY_TLV_BASE_ID + 0xd0) /* 0x01d0 */ /** TLV type : AP Tx beacon rate */ -#define TLV_TYPE_UAP_TX_BEACON_RATE\ - (PROPRIETARY_TLV_BASE_ID + 288) /* 0x0220 */ +#define TLV_TYPE_UAP_TX_BEACON_RATE \ + (PROPRIETARY_TLV_BASE_ID + 288) /* 0x0220 \ + */ /** MrvlIEtypes_beacon_period_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_beacon_period_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** beacon period */ + /** 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** DTIM period */ + /** 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** tx data rate */ + /** 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** mcbc data rate */ + /** 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** tx power */ + /** 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** bcast ssid control*/ + /** bcast ssid control*/ 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** which antenna */ + /** which antenna */ t_u8 which_antenna; - /** antenna mode*/ + /** 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** pkt foward control */ + /** pkt foward control */ 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** max station count */ + /** max station count */ t_u16 max_sta_count; } MLAN_PACK_END MrvlIEtypes_max_sta_count_t; /** MrvlIEtypes_uap_max_sta_cnt */ typedef MLAN_PACK_START struct _MrvlIEtypes_uap_max_sta_cnt_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** max station count */ + /** max station count */ t_u16 uap_max_sta; } MLAN_PACK_END MrvlIEtypes_uap_max_sta_cnt_t; /** MrvlIEtypes_sta_ageout_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_sta_ageout_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** station age out timer */ + /** station age out 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** rts threshold */ + /** 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** frag threshold */ + /** 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** retry limit */ + /** 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** pairwise update timeout in milliseconds */ + /** pairwise update timeout in milliseconds */ 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** pairwise handshake retries */ + /** pairwise handshake 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** groupwise update timeout in milliseconds */ + /** groupwise update timeout in milliseconds */ 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** groupwise handshake retries */ + /** groupwise handshake retries */ t_u32 gwk_retries; } MLAN_PACK_END MrvlIEtypes_eapol_gwk_hsk_retries_t; /** MrvlIEtypes_mgmt_ie_passthru_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_mgmt_ie_passthru_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** mgmt IE mask value */ + /** mgmt IE mask value */ t_u32 mgmt_ie_mask; } MLAN_PACK_END MrvlIEtypes_mgmt_ie_passthru_t; /** MrvlIEtypes_mac_filter_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_mac_filter_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Filter mode */ + /** Filter mode */ t_u8 filter_mode; - /** Number of STA MACs */ + /** Number of STA MACs */ t_u8 count; - /** STA MAC addresses buffer */ + /** STA MAC addresses buffer */ t_u8 mac_address[1]; } MLAN_PACK_END MrvlIEtypes_mac_filter_t; /** MrvlIEtypes_auth_type_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_auth_type_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Authentication type */ + /** Authentication 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** encryption protocol */ + /** encryption 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** protocol */ + /** protocol */ t_u16 protocol; - /** pairwise cipher */ + /** pairwise cipher */ t_u8 pairwise_cipher; - /** reserved */ + /** 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** group cipher */ + /** group cipher */ t_u8 group_cipher; - /** reserved */ + /** reserved */ t_u8 reserved; } MLAN_PACK_END MrvlIEtypes_gwk_cipher_t; /** MrvlIEtypes_akmp_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_akmp_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** key management */ + /** key management */ t_u16 key_mgmt; - /** key management operation */ + /** key management operation */ t_u16 key_mgmt_operation; } MLAN_PACK_END MrvlIEtypes_akmp_t; /** MrvlIEtypes_passphrase_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_passphrase_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** passphrase */ + /** passphrase */ 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** rsn replay proection */ + /** rsn replay proection */ 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** group key rekey time */ + /** group key 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** key index */ + /** key index */ t_u8 key_index; - /** is default */ + /** is default */ t_u8 is_default; - /** key data */ + /** key data */ 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** BSS status, READ only */ + /** BSS status, READ only */ t_u16 bss_status; } MLAN_PACK_END MrvlIEtypes_bss_status_t; /** MrvlIEtypes_preamble_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_preamble_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** preamble type, READ only */ + /** preamble type, READ only */ t_u8 preamble_type; } MLAN_PACK_END MrvlIEtypes_preamble_t; /** MrvlIEtypes_wmm_parameter_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_wmm_parameter_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** WMM parameter */ + /** WMM parameter */ WmmParameter_t wmm_para; } MLAN_PACK_END MrvlIEtypes_wmm_parameter_t; @@ -5870,9 +6015,9 @@ typedef enum _SNMP_MIB_UAP_INDEX { /** MrvlIEtypes_snmp_oid_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_snmp_oid_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** data */ + /** data */ t_u32 data; } MLAN_PACK_END MrvlIEtypes_snmp_oid_t; @@ -5886,103 +6031,94 @@ typedef MLAN_PACK_START struct _HostCmd_DS_SYS_CONFIG { /** HostCmd_SYS_CONFIG */ typedef MLAN_PACK_START struct _HostCmd_DS_SYS_INFO { - /** sys info */ + /** sys info */ 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 */ + /** mac address */ t_u8 mac[MLAN_MAC_ADDR_LENGTH]; - /** reason code */ + /** reason code */ t_u16 reason; } MLAN_PACK_END HostCmd_DS_STA_DEAUTH; /** HostCmd_DS_REPORT_MIC */ typedef MLAN_PACK_START struct _HostCmd_DS_REPORT_MIC { - /** mac address */ + /** mac address */ t_u8 mac[MLAN_MAC_ADDR_LENGTH]; } MLAN_PACK_END HostCmd_DS_REPORT_MIC; /** HostCmd_UAP_OPER_CTRL */ typedef MLAN_PACK_START struct _HostCmd_DS_UAP_OPER_CTRL { - /** CMD Action GET/SET*/ + /** CMD Action GET/SET*/ t_u16 action; - /** control*/ + /** control*/ t_u16 ctrl; - /**channel operation*/ + /**channel operation*/ t_u16 chan_opt; - /**channel band tlv*/ + /**channel band tlv*/ MrvlIEtypes_channel_band_t channel_band; } MLAN_PACK_END HostCmd_DS_UAP_OPER_CTRL; -/** HostCmd_DS_TX_RX_HISTOGRAM */ -typedef MLAN_PACK_START struct _HostCmd_DS_TX_RX_HISTOGRAM { - /** Enable or disable */ - t_u8 enable; - /** Choose to get TX, RX or both */ - t_u16 action; -} MLAN_PACK_END HostCmd_DS_TX_RX_HISTOGRAM; - /** Host Command id: POWER_MGMT */ -#define HOST_CMD_POWER_MGMT_EXT 0x00ef +#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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** control bitmap */ + /** control bitmap */ t_u32 ctrl_bitmap; - /** min_sleep */ + /** min_sleep */ t_u32 min_sleep; - /** max_sleep */ + /** 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** inactivity timeout */ + /** inactivity timeout */ t_u32 inactivity_to; - /** min_awake */ + /** min_awake */ t_u32 min_awake; - /** max_awake */ + /** 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*/ + /** CMD Action Get/Set*/ t_u16 action; - /** power mode */ + /** 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** station age out timer */ + /** station age out 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** STA MAC address */ + /** STA MAC address */ t_u8 mac_address[MLAN_MAC_ADDR_LENGTH]; - /** Power Mgmt status */ + /** Power Mgmt status */ t_u8 power_mgmt_status; - /** RSSI */ + /** RSSI */ t_s8 rssi; /** ie_buf */ t_u8 ie_buf[]; @@ -5990,64 +6126,73 @@ typedef MLAN_PACK_START struct _MrvlIEtypes_sta_info_t { /** HostCmd_DS_STA_LIST */ typedef MLAN_PACK_START struct _HostCmd_DS_STA_LIST { - /** Number of STAs */ + /** Number of STAs */ t_u16 sta_count; /* MrvlIEtypes_sta_info_t sta_info[]; */ + t_u8 tlv_buf[]; } 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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** Multicast PN */ + /** Multicast PN */ t_u8 multicast_PN[16]; } MLAN_PACK_END MrvlIEtypes_wapi_info_t; #endif /* UAP_SUPPORT */ +/** HostCmd_DS_TX_RX_HISTOGRAM */ +typedef MLAN_PACK_START struct _HostCmd_DS_TX_RX_HISTOGRAM { + /** Enable or disable */ + t_u8 enable; + /** Choose to get TX, RX or both */ + t_u16 action; +} MLAN_PACK_END HostCmd_DS_TX_RX_HISTOGRAM; + /** TLV buffer : 2040 coex config */ typedef MLAN_PACK_START struct _MrvlIEtypes_2040_coex_enable_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Enable */ + /** Enable */ t_u8 enable_2040coex; } MLAN_PACK_END MrvlIEtypes_2040_coex_enable_t; /**BT coexit scan time setting*/ typedef MLAN_PACK_START struct _MrvlIEtypes_BtCoexScanTime_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /**coex scan state 0: disable 1: enable*/ + /**coex scan state 0: disable 1: enable*/ t_u8 coex_scan; - /**reserved*/ + /**reserved*/ t_u8 reserved; - /**min scan time*/ + /**min scan time*/ t_u16 min_scan_time; - /**max scan time*/ + /**max scan time*/ t_u16 max_scan_time; } MLAN_PACK_END MrvlIEtypes_BtCoexScanTime_t; /**BT coexit aggr win size */ typedef MLAN_PACK_START struct _MrvlIETypes_BtCoexAggrWinSize_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /**winsize 0: restore default winsize, 1: use below winsize */ + /**winsize 0: restore default winsize, 1: use below winsize */ t_u8 coex_win_size; - /**tx win size*/ + /**tx win size*/ t_u8 tx_win_size; - /**rx win size*/ + /**rx win size*/ t_u8 rx_win_size; - /**reserved*/ + /**reserved*/ t_u8 reserved; } MLAN_PACK_END MrvlIETypes_BtCoexAggrWinSize_t; /** MrvlIEtypes_eapol_pkt_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_eapol_pkt_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** eapol pkt buf */ + /** eapol pkt buf */ t_u8 pkt_buf[]; } MLAN_PACK_END MrvlIEtypes_eapol_pkt_t; @@ -6087,75 +6232,78 @@ typedef MLAN_PACK_START struct _HostCmd_DS_DYN_BW { } MLAN_PACK_END HostCmd_DS_DYN_BW; /** Host Command ID : Packet aggregation CTRL */ -#define HostCmd_CMD_PACKET_AGGR_CTRL 0x0251 +#define HostCmd_CMD_PACKET_AGGR_CTRL 0x0251 /** HostCmd_DS_PACKET_AGGR_CTRL */ typedef MLAN_PACK_START struct _HostCmd_DS_PACKET_AGGR_AGGR_CTRL { - /** ACT_GET/ACT_SET */ + /** ACT_GET/ACT_SET */ t_u16 action; - /** enable aggregation, BIT(0) TX, BIT(1)RX */ + /** enable aggregation, BIT(0) TX, BIT(1)RX */ t_u16 aggr_enable; - /** Tx aggregation alignment */ + /** Tx aggregation alignment */ t_u16 tx_aggr_max_size; - /** Tx aggregation max packet number */ + /** Tx aggregation max packet number */ t_u16 tx_aggr_max_num; - /** Tx aggregation alignment */ + /** Tx aggregation alignment */ t_u16 tx_aggr_align; } MLAN_PACK_END HostCmd_DS_PACKET_AGGR_CTRL; #ifdef USB /** Host Command ID : Packet aggregation over host interface */ -#define HostCmd_CMD_PACKET_AGGR_OVER_HOST_INTERFACE 0x0117 +#define HostCmd_CMD_PACKET_AGGR_OVER_HOST_INTERFACE 0x0117 /** TLV ID : USB Aggregation parameters */ -#define MRVL_USB_AGGR_PARAM_TLV_ID (PROPRIETARY_TLV_BASE_ID + 0xB1) /* 0x1B1 */ +#define MRVL_USB_AGGR_PARAM_TLV_ID \ + (PROPRIETARY_TLV_BASE_ID + 0xB1) /* 0x1B1 \ + */ /** TLV size : USB Aggregation parameters, except header */ -#define MRVL_USB_AGGR_PARAM_TLV_LEN (14) +#define MRVL_USB_AGGR_PARAM_TLV_LEN (14) /** VHT Operations IE */ typedef MLAN_PACK_START struct _MrvlIETypes_USBAggrParam_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Enable */ + /** Enable */ t_u16 enable; - /** Rx aggregation mode */ + /** Rx aggregation mode */ t_u16 rx_aggr_mode; - /** Rx aggregation alignment */ + /** Rx aggregation alignment */ t_u16 rx_aggr_align; - /** Rx aggregation max packet/size */ + /** Rx aggregation max packet/size */ t_u16 rx_aggr_max; - /** Rx aggrgation timeout, in microseconds */ + /** Rx aggrgation timeout, in microseconds */ t_u16 rx_aggr_tmo; - /** Tx aggregation mode */ + /** Tx aggregation mode */ t_u16 tx_aggr_mode; - /** Tx aggregation alignment */ + /** Tx aggregation alignment */ t_u16 tx_aggr_align; } MLAN_PACK_END MrvlIETypes_USBAggrParam_t; /** HostCmd_DS_PACKET_AGGR_OVER_HOST_INTERFACE */ typedef MLAN_PACK_START struct _HostCmd_DS_PACKET_AGGR_OVER_HOST_INTERFACE { - /** ACT_GET/ACT_SET */ + /** ACT_GET/ACT_SET */ t_u16 action; - /** - * Host interface aggregation control TLV(s) to be sent in the firmware command - * - * TLV_USB_AGGR_PARAM, MrvlIETypes_USBAggrParam_t - */ + /** + * Host interface aggregation control TLV(s) to be sent in the firmware + * command + * + * TLV_USB_AGGR_PARAM, MrvlIETypes_USBAggrParam_t + */ t_u8 tlv_buf[1]; } MLAN_PACK_END HostCmd_DS_PACKET_AGGR_OVER_HOST_INTERFACE; #endif /* USB */ /** HostCmd_CONFIG_LOW_PWR_MODE */ typedef MLAN_PACK_START struct _HostCmd_CONFIG_LOW_PWR_MODE { - /** Enable LPM */ + /** Enable LPM */ t_u8 enable; } MLAN_PACK_END HostCmd_CONFIG_LOW_PWR_MODE; /** HostCmd_CMD_GET_TSF */ typedef MLAN_PACK_START struct _HostCmd_DS_TSF { - /** tsf value*/ + /** tsf value*/ t_u64 tsf; } MLAN_PACK_END HostCmd_DS_TSF; /* WLAN_GET_TSF*/ @@ -6169,9 +6317,9 @@ typedef struct _HostCmd_DS_DFS_REPEATER_MODE { /** HostCmd_DS_BOOT_SLEEP */ typedef MLAN_PACK_START struct _HostCmd_DS_BOOT_SLEEP { - /** Set or Get */ + /** Set or Get */ t_u16 action; - /** 1 on or 0 off */ + /** 1 on or 0 off */ t_u16 enable; } MLAN_PACK_END HostCmd_DS_BOOT_SLEEP; @@ -6179,13 +6327,12 @@ typedef MLAN_PACK_START struct _HostCmd_DS_BOOT_SLEEP { * @brief 802.11h Local Power Constraint NXP extended TLV */ typedef MLAN_PACK_START struct { - MrvlIEtypesHeader_t header; - /**< NXP TLV header: ID/Len */ - t_u8 chan; /**< Channel local constraint applies to */ + MrvlIEtypesHeader_t header; /**< NXP 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 - */ + /** Power constraint included in beacons + * and used by fw to offset 11d info + */ t_u8 constraint; } MLAN_PACK_END MrvlIEtypes_LocalPowerConstraint_t; @@ -6198,9 +6345,9 @@ typedef MLAN_PACK_START struct { /** TPC Info structure sent in CMD_802_11_TPC_INFO command to firmware */ typedef MLAN_PACK_START struct { - /**< Local constraint */ + /**< Local constraint */ MrvlIEtypes_LocalPowerConstraint_t local_constraint; - /**< Power Capability */ + /**< Power Capability */ MrvlIEtypes_PowerCapability_t power_cap; } MLAN_PACK_END HostCmd_DS_802_11_TPC_INFO; @@ -6209,9 +6356,9 @@ typedef MLAN_PACK_START struct { * 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; @@ -6219,12 +6366,11 @@ typedef MLAN_PACK_START struct { * CMD_802_11_TPC_ADAPT_REQ command */ typedef MLAN_PACK_START struct { - t_u8 tpc_ret_code; - /**< Firmware command result status code */ + 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_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; @@ -6232,20 +6378,16 @@ typedef MLAN_PACK_START struct { * 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; /** @@ -6253,9 +6395,9 @@ typedef MLAN_PACK_START struct { * 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; @@ -6264,32 +6406,32 @@ typedef MLAN_PACK_START enum _MeasType_t { */ typedef MLAN_PACK_START struct { #ifdef BIG_ENDIAN_SUPPORT - /**< Reserved */ - t_u8 rsvd5_7:3; - /**< 11k: duration spec. for meas. is mandatory */ - t_u8 duration_mandatory:1; - /**< 11h: en/disable report rcpt. of spec. type */ - t_u8 report:1; - /**< 11h: en/disable requests of specified type */ - t_u8 request:1; - /**< 11h: enable report/request bits */ - t_u8 enable:1; - /**< 11k: series or parallel with previous meas */ - t_u8 parallel:1; + /**< Reserved */ + t_u8 rsvd5_7 : 3; + /**< 11k: duration spec. for meas. is mandatory */ + t_u8 duration_mandatory : 1; + /**< 11h: en/disable report rcpt. of spec. type */ + t_u8 report : 1; + /**< 11h: en/disable requests of specified type */ + t_u8 request : 1; + /**< 11h: enable report/request bits */ + t_u8 enable : 1; + /**< 11k: series or parallel with previous meas */ + t_u8 parallel : 1; #else - /**< 11k: series or parallel with previous meas */ - t_u8 parallel:1; - /**< 11h: enable report/request bits */ - t_u8 enable:1; - /**< 11h: en/disable requests of specified type */ - t_u8 request:1; - /**< 11h: en/disable report rcpt. of spec. type */ - t_u8 report:1; - /**< 11k: duration spec. for meas. is mandatory */ - t_u8 duration_mandatory:1; - /**< Reserved */ - t_u8 rsvd5_7:3; -#endif /* BIG_ENDIAN_SUPPORT */ + /**< 11k: series or parallel with previous meas */ + t_u8 parallel : 1; + /**< 11h: enable report/request bits */ + t_u8 enable : 1; + /**< 11h: en/disable requests of specified type */ + t_u8 request : 1; + /**< 11h: en/disable report rcpt. of spec. type */ + t_u8 report : 1; + /**< 11k: duration spec. for meas. is mandatory */ + t_u8 duration_mandatory : 1; + /**< Reserved */ + t_u8 rsvd5_7 : 3; +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END MeasReqMode_t; @@ -6297,10 +6439,10 @@ typedef MLAN_PACK_START struct { * @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; @@ -6324,8 +6466,7 @@ typedef MeasReqCommonFormat_t MeasReqRPI_t; * driver/firmware interface. */ typedef union { - MeasReqBasic_t basic; - /**< Basic measurement request */ + MeasReqBasic_t basic; /**< Basic measurement request */ MeasReqCCA_t cca; /**< CCA measurement request */ MeasReqRPI_t rpi; /**< RPI measurement request */ @@ -6336,16 +6477,16 @@ typedef union { */ 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; @@ -6353,9 +6494,9 @@ typedef MLAN_PACK_START struct { * @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 */ + 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; @@ -6364,9 +6505,9 @@ typedef MLAN_PACK_START struct { * @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 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; @@ -6375,10 +6516,10 @@ typedef MLAN_PACK_START struct { * @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; @@ -6387,9 +6528,9 @@ typedef MLAN_PACK_START struct { * 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; @@ -6397,11 +6538,11 @@ typedef union { * @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; @@ -6410,11 +6551,11 @@ typedef MLAN_PACK_START struct { * 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; @@ -6427,8 +6568,7 @@ typedef MLAN_PACK_START struct { #ifdef OPCHAN typedef MLAN_PACK_START struct { - MrvlIEtypesHeader_t header; - /**< Header */ + MrvlIEtypesHeader_t header; /**< Header */ MrvlChannelDesc_t chanDesc; @@ -6443,8 +6583,7 @@ typedef MLAN_PACK_START struct { } MLAN_PACK_END MrvlIEtypes_ChanControlDesc_t; typedef MLAN_PACK_START struct { - MrvlIEtypesHeader_t header; - /**< Header */ + MrvlIEtypesHeader_t header; /**< Header */ t_u16 chanGroupBitmap; ChanScanMode_t scanMode; @@ -6455,70 +6594,72 @@ typedef MLAN_PACK_START struct { } MLAN_PACK_END MrvlIEtypes_ChanGroupControl_t; typedef MLAN_PACK_START struct { - t_u16 action; /**< CMD Action Get/Set*/ + t_u16 action; /**< CMD Action Get/Set*/ t_u8 tlv_buffer[1]; } MLAN_PACK_END HostCmd_DS_OPCHAN_CONFIG; typedef MLAN_PACK_START struct { - t_u16 action; /**< CMD Action Get/Set*/ + t_u16 action; /**< CMD Action Get/Set*/ t_u8 tlv_buffer[1]; } MLAN_PACK_END HostCmd_DS_OPCHAN_CHANGROUP_CONFIG; -#define HostCmd_CMD_OPCHAN_CONFIG 0x00f8 -#define HostCmd_CMD_OPCHAN_CHANGROUP_CONFIG 0x00f9 +#define HostCmd_CMD_OPCHAN_CONFIG 0x00f8 +#define HostCmd_CMD_OPCHAN_CHANGROUP_CONFIG 0x00f9 #endif 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; +/* MrvlIEtypes_DfsW53Cfg_t*/ typedef MLAN_PACK_START struct { - MrvlChannelDesc_t chan_desc; - /**< Channel band, number */ - t_u32 millisec_dwell_time; - /**< Channel dwell time in milliseconds */ + /* header */ + MrvlIEtypesHeader_t Header; + /** df53cfg vlue*/ + t_u8 dfs53cfg; +} MLAN_PACK_END MrvlIEtypes_DfsW53Cfg_t; + +typedef MLAN_PACK_START struct { + 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_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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** value */ + /** value */ t_u8 value; - /** reporting frequency */ + /** reporting 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_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 */ + /** Header */ MrvlIEtypesHeader_t header; - /** Link SNR threshold (dB) */ + /** Link SNR threshold (dB) */ t_u16 link_snr; - /** Link SNR frequency */ + /** Link SNR frequency */ t_u16 link_snr_freq; /* Second minimum rate value as per the rate table below */ t_u16 link_rate; @@ -6533,42 +6674,42 @@ typedef MLAN_PACK_START struct { #ifdef PCIE /** PCIE dual descriptor for data/event */ typedef MLAN_PACK_START struct _dual_desc_buf { - /** buf size */ + /** buf size */ t_u16 len; - /** buffer descriptor flags */ + /** buffer descriptor flags */ t_u16 flags; - /** pkt size */ + /** pkt size */ t_u16 pkt_size; - /** reserved */ + /** reserved */ t_u16 reserved; - /** Physical address of the buffer */ + /** Physical address of the buffer */ t_u64 paddr; } MLAN_PACK_END adma_dual_desc_buf; #if defined(PCIE8997) || defined(PCIE8897) /** PCIE ring buffer description for DATA */ typedef MLAN_PACK_START struct _mlan_pcie_data_buf { - /** Buffer descriptor flags */ + /** Buffer descriptor flags */ t_u16 flags; - /** Offset of fragment/pkt to start of ip header */ + /** Offset of fragment/pkt to start of ip header */ t_u16 offset; - /** Fragment length of the buffer */ + /** Fragment length of the buffer */ t_u16 frag_len; - /** Length of the buffer */ + /** Length of the buffer */ t_u16 len; - /** Physical address of the buffer */ + /** Physical address of the buffer */ t_u64 paddr; - /** Reserved */ + /** Reserved */ t_u32 reserved; } MLAN_PACK_END mlan_pcie_data_buf; /** PCIE ring buffer description for EVENT */ typedef MLAN_PACK_START struct _mlan_pcie_evt_buf { - /** Physical address of the buffer */ + /** Physical address of the buffer */ t_u64 paddr; - /** Length of the buffer */ + /** Length of the buffer */ t_u16 len; - /** Buffer descriptor flags */ + /** Buffer descriptor flags */ t_u16 flags; } MLAN_PACK_END mlan_pcie_evt_buf; @@ -6601,153 +6742,156 @@ typedef MLAN_PACK_START struct _HostCmd_DS_SENSOR_TEMP { #ifdef STA_SUPPORT typedef MLAN_PACK_START struct _HostCmd_DS_STA_CONFIGURE { - /** Action Set or get */ + /** Action Set or get */ t_u16 action; - /** Tlv buffer */ + /** Tlv buffer */ t_u8 tlv_buffer[]; - /**MrvlIEtypes_channel_band_t band_channel; */ + /**MrvlIEtypes_channel_band_t band_channel; */ } MLAN_PACK_END HostCmd_DS_STA_CONFIGURE; #endif /** HostCmd_DS_AUTO_TX structure */ typedef MLAN_PACK_START struct _HostCmd_DS_AUTO_TX { - /** Action Set or get */ + /** Action Set or get */ t_u16 action; - /** Tlv buffer */ + /** Tlv buffer */ t_u8 tlv_buffer[]; } MLAN_PACK_END HostCmd_DS_AUTO_TX; -#define OID_CLOUD_KEEP_ALIVE 0 -#define EVENT_CLOUD_KEEP_ALIVE_RETRY_FAIL 133 +#define OID_CLOUD_KEEP_ALIVE 0 +#define EVENT_CLOUD_KEEP_ALIVE_RETRY_FAIL 133 /** TLV for cloud keep alive control info */ -#define TLV_TYPE_CLOUD_KEEP_ALIVE (PROPRIETARY_TLV_BASE_ID + 0x102) /* 0x0100 + 258 */ +#define TLV_TYPE_CLOUD_KEEP_ALIVE \ + (PROPRIETARY_TLV_BASE_ID + 0x102) /* 0x0100 + 258 */ typedef MLAN_PACK_START struct _MrvlIEtypes_Cloud_Keep_Alive_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** ID for cloud keep alive */ + /** ID for cloud keep alive */ t_u8 keep_alive_id; - /** Enable/disable for this ID */ + /** Enable/disable for this ID */ t_u8 enable; - /** TLV buffer */ + /** TLV buffer */ t_u8 tlv[]; } MLAN_PACK_END MrvlIEtypes_Cloud_Keep_Alive_t; /** TLV for cloud keep alive control info */ -#define TLV_TYPE_KEEP_ALIVE_CTRL (PROPRIETARY_TLV_BASE_ID + 0x103) /* 0x0100 + 259 */ +#define TLV_TYPE_KEEP_ALIVE_CTRL \ + (PROPRIETARY_TLV_BASE_ID + 0x103) /* 0x0100 + 259 */ typedef MLAN_PACK_START struct _MrvlIEtypes_Keep_Alive_Ctrl_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** period to send keep alive packet */ + /** period to send keep alive packet */ t_u32 snd_interval; - /** period to send retry packet */ + /** period to send retry packet */ t_u16 retry_interval; - /** count to send retry packet */ + /** count to send retry packet */ t_u16 retry_count; } MLAN_PACK_END MrvlIEtypes_Keep_Alive_Ctrl_t; /** TLV for cloud keep alive packet */ -#define TLV_TYPE_KEEP_ALIVE_PKT (PROPRIETARY_TLV_BASE_ID + 0x104) /* 0x0100 + 260 */ +#define TLV_TYPE_KEEP_ALIVE_PKT \ + (PROPRIETARY_TLV_BASE_ID + 0x104) /* 0x0100 + 260 */ typedef MLAN_PACK_START struct _MrvlIEtypes_Keep_Alive_Pkt_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Ethernet Header */ + /** Ethernet Header */ Eth803Hdr_t eth_header; - /** packet buffer*/ + /** packet buffer*/ t_u8 ip_packet[]; } MLAN_PACK_END MrvlIEtypes_Keep_Alive_Pkt_t; /** TLV to indicate firmware only keep probe response while scan */ -#define TLV_TYPE_ONLYPROBERESP (PROPRIETARY_TLV_BASE_ID + 0xE9) /* 0x01E9 */ +#define TLV_TYPE_ONLYPROBERESP (PROPRIETARY_TLV_BASE_ID + 0xE9) /* 0x01E9 */ typedef MLAN_PACK_START struct _MrvlIEtypes_OnlyProberesp_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** only keep probe response */ + /** only keep probe response */ t_u8 proberesp_only; } MLAN_PACK_END MrvlIEtypes_OnlyProberesp_t; #if defined(DRV_EMBEDDED_AUTHENTICATOR) || defined(DRV_EMBEDDED_SUPPLICANT) -#define HostCmd_CMD_CRYPTO 0x025e +#define HostCmd_CMD_CRYPTO 0x025e -#define HostCmd_CMD_CRYPTO_SUBCMD_PRF_HMAC_SHA1 (0x1) -#define HostCmd_CMD_CRYPTO_SUBCMD_HMAC_SHA1 (0x2) -#define HostCmd_CMD_CRYPTO_SUBCMD_HMAC_SHA256 (0x3) -#define HostCmd_CMD_CRYPTO_SUBCMD_SHA256 (0x4) -#define HostCmd_CMD_CRYPTO_SUBCMD_RIJNDAEL (0x5) -#define HostCmd_CMD_CRYPTO_SUBCMD_RC4 (0x6) -#define HostCmd_CMD_CRYPTO_SUBCMD_MD5 (0x7) -#define HostCmd_CMD_CRYPTO_SUBCMD_MRVL_F (0x8) -#define HostCmd_CMD_CRYPTO_SUBCMD_SHA256_KDF (0x9) +#define HostCmd_CMD_CRYPTO_SUBCMD_PRF_HMAC_SHA1 (0x1) +#define HostCmd_CMD_CRYPTO_SUBCMD_HMAC_SHA1 (0x2) +#define HostCmd_CMD_CRYPTO_SUBCMD_HMAC_SHA256 (0x3) +#define HostCmd_CMD_CRYPTO_SUBCMD_SHA256 (0x4) +#define HostCmd_CMD_CRYPTO_SUBCMD_RIJNDAEL (0x5) +#define HostCmd_CMD_CRYPTO_SUBCMD_RC4 (0x6) +#define HostCmd_CMD_CRYPTO_SUBCMD_MD5 (0x7) +#define HostCmd_CMD_CRYPTO_SUBCMD_MRVL_F (0x8) +#define HostCmd_CMD_CRYPTO_SUBCMD_SHA256_KDF (0x9) -#define TLV_TYPE_CRYPTO_KEY (PROPRIETARY_TLV_BASE_ID + 308) -#define TLV_TYPE_CRYPTO_KEY_IV (PROPRIETARY_TLV_BASE_ID + 309) -#define TLV_TYPE_CRYPTO_KEY_PREFIX (PROPRIETARY_TLV_BASE_ID + 310) -#define TLV_TYPE_CRYPTO_KEY_DATA_BLK (PROPRIETARY_TLV_BASE_ID + 311) +#define TLV_TYPE_CRYPTO_KEY (PROPRIETARY_TLV_BASE_ID + 308) +#define TLV_TYPE_CRYPTO_KEY_IV (PROPRIETARY_TLV_BASE_ID + 309) +#define TLV_TYPE_CRYPTO_KEY_PREFIX (PROPRIETARY_TLV_BASE_ID + 310) +#define TLV_TYPE_CRYPTO_KEY_DATA_BLK (PROPRIETARY_TLV_BASE_ID + 311) /** MrvlIEParamSet_t */ typedef MLAN_PACK_START struct { - /** Type */ + /** Type */ t_u16 Type; - /** Length */ + /** Length */ t_u16 Length; } MLAN_PACK_END MrvlIEParamSet_t; /** HostCmd_DS_CRYPTO */ typedef MLAN_PACK_START struct _HostCmd_DS_CRYPTO { - /** action */ + /** action */ t_u16 action; - /** subCmdCode */ + /** subCmdCode */ t_u8 subCmdCode; - /** subCmd start */ + /** subCmd start */ t_u8 subCmd[]; } MLAN_PACK_END HostCmd_DS_CRYPTO; /** subcmd_prf_hmac_sha1 used by prf_hmac_sha1, md5 and sha256_kdf */ typedef MLAN_PACK_START struct _subcmd_prf_hmac_sha1 { - /** output_len */ + /** output_len */ t_u16 output_len; - /** tlv start */ + /** tlv start */ t_u8 tlv[]; } MLAN_PACK_END subcmd_prf_hmac_sha1_t, subcmd_md5_t, subcmd_sha256_kdf_t; /** subcmd_hmac_sha1 used by hmac_sha1, hmac_sha256, sha256 */ typedef MLAN_PACK_START struct _subcmd_hmac_sha1 { - /** output_len */ + /** output_len */ t_u16 output_len; - /** number of data blocks */ + /** number of data blocks */ t_u16 data_blks_nr; - /** tlv start */ + /** tlv start */ t_u8 tlv[]; } MLAN_PACK_END subcmd_hmac_sha1_t, subcmd_hmac_sha256_t, subcmd_sha256_t; /** subcmd_rijndael, used by rijndael */ typedef MLAN_PACK_START struct _subcmd_rijndael { - /** output_len */ + /** output_len */ t_u16 output_len; - /** sub action code */ + /** sub action code */ t_u8 sub_action_code; - /** tlv start */ + /** tlv start */ t_u8 tlv[]; } MLAN_PACK_END subcmd_rijndael_t; /** subcmd_rc4, used by rc4 */ typedef MLAN_PACK_START struct _subcmd_rc4 { - /** output_len */ + /** output_len */ t_u16 output_len; - /** skip bytes */ + /** skip bytes */ t_u16 skip_bytes; - /** tlv start */ + /** tlv start */ t_u8 tlv[]; } MLAN_PACK_END subcmd_rc4_t; /** subcmd_mrvf_f, used by mrvl_f*/ typedef MLAN_PACK_START struct _subcmd_mrvf_f { - /** output_len */ + /** output_len */ t_u16 output_len; - /** iterations */ + /** iterations */ t_u32 iterations; - /** count */ + /** count */ t_u32 count; - /** tlv start */ + /** tlv start */ t_u8 tlv[]; } MLAN_PACK_END subcmd_mrvl_f_t; @@ -6755,175 +6899,179 @@ typedef MLAN_PACK_START struct _subcmd_mrvf_f { #ifdef UAP_SUPPORT /** action add station */ -#define HostCmd_ACT_ADD_STA 0x1 +#define HostCmd_ACT_ADD_STA 0x1 /** remove station */ -#define HostCmd_ACT_REMOVE_STA 0x0 +#define HostCmd_ACT_REMOVE_STA 0x0 /** HostCmd_DS_ADD_STATION */ typedef MLAN_PACK_START struct _HostCmd_DS_ADD_STATION { - /** 1 -add, 0 --delete */ + /** 1 -add, 0 --delete */ t_u16 action; - /** aid */ + /** aid */ t_u16 aid; - /** peer_mac */ + /** peer_mac */ t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; - /** Listen Interval */ + /** Listen Interval */ int listen_interval; - /** Capability Info */ + /** Capability Info */ t_u16 cap_info; - /** tlv start */ + /** tlv start */ t_u8 tlv[]; } MLAN_PACK_END HostCmd_DS_ADD_STATION; /** Host Command ID : Add New Station */ -#define HostCmd_CMD_ADD_NEW_STATION 0x025f +#define HostCmd_CMD_ADD_NEW_STATION 0x025f /** TLV id: station flag */ -#define TLV_TYPE_UAP_STA_FLAGS (PROPRIETARY_TLV_BASE_ID + 313) - /**MrvlIEtypes_Sta_Flag_t */ +#define TLV_TYPE_UAP_STA_FLAGS (PROPRIETARY_TLV_BASE_ID + 313) +/**MrvlIEtypes_Sta_Flag_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_StaFlag_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** station flag */ + /** station flag */ t_u32 sta_flags; } MLAN_PACK_END MrvlIEtypes_StaFlag_t; #endif /** Host Command ID : _HostCmd_DS_BAND_STEERING */ typedef MLAN_PACK_START struct _HostCmd_DS_BAND_STEERING { - /** ACT_GET/ACT_SET */ + /** ACT_GET/ACT_SET */ t_u8 action; - /** State */ + /** State */ t_u8 state; - /** probe requests to be blocked on 2g */ + /** probe requests to be blocked on 2g */ t_u8 block_2g_prb_req; - /** limit the btm request sent to STA at */ + /** limit the btm request sent to STA at */ t_u8 max_btm_req_allowed; } MLAN_PACK_END HostCmd_DS_BAND_STEERING; /** HostCmd_CMD_RX_ABORT_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_CMD_RX_ABORT_CFG { - /** Action */ + /** Action */ t_u16 action; - /** Enable/disable rx abort on weak pkt rssi */ + /** Enable/disable rx abort on weak pkt rssi */ t_u8 enable; - /** rx weak rssi pkt threshold */ + /** rx weak rssi pkt threshold */ t_s8 rssi_threshold; } MLAN_PACK_END HostCmd_DS_CMD_RX_ABORT_CFG; /** HostCmd_CMD_RX_ABORT_CFG_EXT */ typedef MLAN_PACK_START struct _HostCmd_DS_CMD_RX_ABORT_CFG_EXT { - /** Action */ + /** Action */ t_u16 action; - /** Enable/disable dyn rx abort on weak pkt rssi */ + /** Enable/disable dyn rx abort on weak pkt rssi */ t_u8 enable; - /** specify rssi margin */ + /** specify rssi margin */ t_s8 rssi_margin; - /** specify ceil rssi threshold */ + /** specify ceil rssi threshold */ t_s8 ceil_rssi_threshold; } MLAN_PACK_END HostCmd_DS_CMD_RX_ABORT_CFG_EXT; /** HostCmd_DS_CMD_TX_AMPDU_PROT_MODE */ typedef MLAN_PACK_START struct _HostCmd_DS_CMD_TX_AMPDU_PROT_MODE { - /** Action */ + /** Action */ t_u16 action; - /** Prot mode */ + /** Prot mode */ t_u16 mode; } MLAN_PACK_END HostCmd_DS_CMD_TX_AMPDU_PROT_MODE; /** HostCmd_CMD_RATE_ADAPT_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_CMD_RATE_ADAPT_CFG { - /** Action */ + /** Action */ t_u16 action; - /** SR Rateadapt*/ + /** SR Rateadapt*/ t_u8 sr_rateadapt; - /** set low threshold */ + /** set low threshold */ t_u8 ra_low_thresh; - /** set high threshold */ + /** set high threshold */ t_u8 ra_high_thresh; - /** set interval */ + /** set interval */ t_u16 ra_interval; } MLAN_PACK_END HostCmd_DS_CMD_RATE_ADAPT_CFG; /** HostCmd_CMD_CCK_DESENSE_CFG */ typedef MLAN_PACK_START struct _HostCmd_DS_CMD_CCK_DESENSE_CFG { - /** Action */ + /** Action */ t_u16 action; - /** cck desense mode: 0:disable 1:normal 2:dynamic */ + /** cck desense mode: 0:disable 1:normal 2:dynamic */ t_u16 mode; - /** specify rssi margin */ + /** specify rssi margin */ t_s8 margin; - /** specify ceil rssi threshold */ + /** specify ceil rssi threshold */ t_s8 ceil_thresh; - /** cck desense "on" interval count */ + /** cck desense "on" interval count */ t_u8 num_on_intervals; - /** cck desense "off" interval count */ + /** cck desense "off" interval count */ t_u8 num_off_intervals; } MLAN_PACK_END HostCmd_DS_CMD_CCK_DESENSE_CFG; /** HostCmd_DS_COMMAND */ typedef struct MLAN_PACK_START _HostCmd_DS_COMMAND { - /** Command Header : Command */ + /** Command Header : Command */ t_u16 command; - /** Command Header : Size */ + /** Command Header : Size */ t_u16 size; - /** Command Header : Sequence number */ + /** Command Header : Sequence number */ t_u16 seq_num; - /** Command Header : Result */ + /** Command Header : Result */ t_u16 result; - /** Command Body */ + /** Command Body */ union { - /** Hardware specifications */ + /** Hardware specifications */ HostCmd_DS_GET_HW_SPEC hw_spec; #ifdef SDIO HostCmd_DS_SDIO_SP_RX_AGGR_CFG sdio_rx_aggr; #endif - /** Cfg data */ + /** Cfg data */ HostCmd_DS_802_11_CFG_DATA cfg_data; - /** MAC control */ + /** MAC control */ HostCmd_DS_MAC_CONTROL mac_ctrl; - /** MAC address */ + /** MAC address */ HostCmd_DS_802_11_MAC_ADDRESS mac_addr; - /** MAC muticast address */ + /** MAC muticast address */ HostCmd_DS_MAC_MULTICAST_ADR mc_addr; - /** Get log */ + /** Get log */ HostCmd_DS_802_11_GET_LOG get_log; - /** Get link layer statistic */ + /** Get link layer statistic */ HostCmd_DS_802_11_LINK_STATISTIC get_link_statistic; - /** RSSI information */ + /** RSSI information */ HostCmd_DS_802_11_RSSI_INFO_EXT rssi_info_ext; - /** RSSI information */ + /** RSSI information */ HostCmd_DS_802_11_RSSI_INFO rssi_info; - /** RSSI information response */ + /** RSSI information response */ HostCmd_DS_802_11_RSSI_INFO_RSP rssi_info_rsp; - /** SNMP MIB */ + /** SNMP MIB */ HostCmd_DS_802_11_SNMP_MIB smib; - /** Radio control */ +#ifdef UAP_SUPPORT + /** UAP SNMP MIB */ + HostCmd_DS_UAP_802_11_SNMP_MIB uap_smib; +#endif + /** Radio control */ HostCmd_DS_802_11_RADIO_CONTROL radio; - /** RF channel */ + /** RF channel */ HostCmd_DS_802_11_RF_CHANNEL rf_channel; - /** Tx rate query */ + /** Tx rate query */ HostCmd_TX_RATE_QUERY tx_rate; - /** Tx rate configuration */ + /** Tx rate configuration */ HostCmd_DS_TX_RATE_CFG tx_rate_cfg; - /** Tx power configuration */ + /** Tx power configuration */ HostCmd_DS_TXPWR_CFG txp_cfg; - /** RF Tx power configuration */ + /** RF Tx power configuration */ HostCmd_DS_802_11_RF_TX_POWER txp; - /** RF antenna */ + /** RF antenna */ HostCmd_DS_802_11_RF_ANTENNA antenna; - /** CW Mode: Tx CW Level control */ + /** CW Mode: Tx CW Level control */ HostCmd_DS_CW_MODE_CTRL cwmode; - /** Enhanced power save command */ + /** Enhanced power save command */ HostCmd_DS_802_11_PS_MODE_ENH psmode_enh; HostCmd_DS_802_11_HS_CFG_ENH opt_hs_cfg; - /** Scan */ + /** Scan */ HostCmd_DS_802_11_SCAN scan; - /** Extended Scan */ + /** Extended Scan */ HostCmd_DS_802_11_SCAN_EXT ext_scan; - /** Mgmt frame subtype mask */ + /** Mgmt frame subtype mask */ HostCmd_DS_RX_MGMT_IND rx_mgmt_ind; - /** Scan response */ + /** Scan response */ HostCmd_DS_802_11_SCAN_RSP scan_resp; HostCmd_DS_802_11_BG_SCAN_CONFIG bg_scan_config; @@ -6931,24 +7079,24 @@ typedef struct MLAN_PACK_START _HostCmd_DS_COMMAND { 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 */ + /** Associate */ HostCmd_DS_802_11_ASSOCIATE associate; - /** Associate response */ + /** Associate response */ HostCmd_DS_802_11_ASSOCIATE_RSP associate_rsp; - /** Deauthenticate */ + /** Deauthenticate */ HostCmd_DS_802_11_DEAUTHENTICATE deauth; - /** Ad-Hoc start */ + /** Ad-Hoc start */ HostCmd_DS_802_11_AD_HOC_START adhoc_start; - /** Ad-Hoc start result */ + /** Ad-Hoc start result */ HostCmd_DS_802_11_AD_HOC_START_RESULT adhoc_start_result; - /** Ad-Hoc join result */ + /** Ad-Hoc join result */ HostCmd_DS_802_11_AD_HOC_JOIN_RESULT adhoc_join_result; - /** Ad-Hoc join */ + /** Ad-Hoc join */ HostCmd_DS_802_11_AD_HOC_JOIN adhoc_join; - /** Domain information */ + /** Domain information */ HostCmd_DS_802_11D_DOMAIN_INFO domain_info; - /** Domain information response */ + /** 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; @@ -6956,71 +7104,71 @@ typedef struct MLAN_PACK_START _HostCmd_DS_COMMAND { HostCmd_DS_CHAN_RPT_REQ chan_rpt_req; HostCmd_DS_MEASUREMENT_REQUEST meas_req; HostCmd_DS_MEASUREMENT_REPORT meas_rpt; - /** Add BA request */ + /** Add BA request */ HostCmd_DS_11N_ADDBA_REQ add_ba_req; - /** Add BA response */ + /** Add BA response */ HostCmd_DS_11N_ADDBA_RSP add_ba_rsp; - /** Delete BA entry */ + /** Delete BA entry */ HostCmd_DS_11N_DELBA del_ba; - /** Tx buffer configuration */ + /** Tx buffer configuration */ HostCmd_DS_TXBUF_CFG tx_buf; - /** AMSDU Aggr Ctrl configuration */ + /** AMSDU Aggr Ctrl configuration */ HostCmd_DS_AMSDU_AGGR_CTRL amsdu_aggr_ctrl; - /** 11n configuration */ + /** 11n configuration */ HostCmd_DS_11N_CFG htcfg; - /** reject addba req conditions configuration */ + /** reject addba req conditions configuration */ HostCmd_DS_REJECT_ADDBA_REQ rejectaddbareq; /* RANDYTODO need add more */ - /** HostCmd_DS_11AC_CFG */ + /** HostCmd_DS_11AC_CFG */ HostCmd_DS_11AC_CFG vhtcfg; - /** HostCmd_DS_11ACTXBUF_CFG*/ + /** HostCmd_DS_11ACTXBUF_CFG*/ HostCmd_DS_11ACTXBUF_CFG ac_tx_buf; - /** 11n configuration */ + /** 11n configuration */ HostCmd_DS_TX_BF_CFG tx_bf_cfg; - /** WMM status get */ + /** WMM status get */ HostCmd_DS_WMM_GET_STATUS get_wmm_status; - /** WMM ADDTS */ + /** WMM ADDTS */ HostCmd_DS_WMM_ADDTS_REQ add_ts; - /** WMM DELTS */ + /** WMM DELTS */ HostCmd_DS_WMM_DELTS_REQ del_ts; - /** WMM set/get queue config */ + /** WMM set/get queue config */ HostCmd_DS_WMM_QUEUE_CONFIG queue_config; - /** WMM param config*/ + /** WMM param config*/ HostCmd_DS_WMM_PARAM_CONFIG param_config; - /** WMM on/of/get queue statistics */ + /** WMM on/of/get queue statistics */ HostCmd_DS_WMM_QUEUE_STATS queue_stats; - /** WMM get traffic stream status */ + /** WMM get traffic stream status */ HostCmd_DS_WMM_TS_STATUS ts_status; - /** Key material */ + /** Key material */ HostCmd_DS_802_11_KEY_MATERIAL key_material; - /** GTK Rekey parameters */ + /** GTK Rekey parameters */ HostCmd_DS_GTK_REKEY_PARAMS gtk_rekey; - /** E-Supplicant PSK */ + /** E-Supplicant PSK */ HostCmd_DS_802_11_SUPPLICANT_PMK esupplicant_psk; - /** E-Supplicant profile */ + /** E-Supplicant profile */ HostCmd_DS_802_11_SUPPLICANT_PROFILE esupplicant_profile; - /** Extended version */ + /** Extended version */ HostCmd_DS_VERSION_EXT verext; - /** Adhoc Coalescing */ + /** Adhoc Coalescing */ HostCmd_DS_802_11_IBSS_STATUS ibss_coalescing; - /** Mgmt IE list configuration */ + /** Mgmt IE list configuration */ HostCmd_DS_MGMT_IE_LIST_CFG mgmt_ie_list; - /** System clock configuration */ + /** System clock configuration */ HostCmd_DS_ECL_SYSTEM_CLOCK_CONFIG sys_clock_cfg; - /** MAC register access */ + /** MAC register access */ HostCmd_DS_MAC_REG_ACCESS mac_reg; - /** BBP register access */ + /** BBP register access */ HostCmd_DS_BBP_REG_ACCESS bbp_reg; - /** RF register access */ + /** RF register access */ HostCmd_DS_RF_REG_ACCESS rf_reg; - /** EEPROM register access */ + /** EEPROM register access */ HostCmd_DS_802_11_EEPROM_ACCESS eeprom; - /** Memory access */ + /** Memory access */ HostCmd_DS_MEM_ACCESS mem; - /** Target device access */ + /** Target device access */ HostCmd_DS_TARGET_ACCESS target; - /** Inactivity timeout extend */ + /** Inactivity timeout extend */ HostCmd_DS_INACTIVITY_TIMEOUT_EXT inactivity_to; #ifdef UAP_SUPPORT HostCmd_DS_SYS_CONFIG sys_config; @@ -7030,15 +7178,16 @@ typedef struct MLAN_PACK_START _HostCmd_DS_COMMAND { HostCmd_DS_POWER_MGMT_EXT pm_cfg; HostCmd_DS_REPORT_MIC report_mic; HostCmd_DS_UAP_OPER_CTRL uap_oper_ctrl; +#endif /* UAP_SUPPORT */ HostCmd_DS_TX_RX_HISTOGRAM tx_rx_histogram; -#endif /* UAP_SUPPORT */ - /** Sleep period command */ + + /** Sleep period command */ HostCmd_DS_802_11_SLEEP_PERIOD sleep_pd; - /** Sleep params command */ + /** Sleep params command */ HostCmd_DS_802_11_SLEEP_PARAMS sleep_param; #ifdef SDIO - /** SDIO GPIO interrupt config command */ + /** SDIO GPIO interrupt config command */ HostCmd_DS_SDIO_GPIO_INT_CONFIG sdio_gpio_int; HostCmd_DS_SDIO_PULL_CTRL sdio_pull_ctl; #endif @@ -7073,7 +7222,7 @@ typedef struct MLAN_PACK_START _HostCmd_DS_COMMAND { #ifdef STA_SUPPORT HostCmd_DS_STA_CONFIGURE sta_cfg; #endif - /** GPIO Independent reset configure */ + /** GPIO Independent reset configure */ HostCmd_DS_INDEPENDENT_RESET_CFG ind_rst_cfg; HostCmd_DS_802_11_PS_INACTIVITY_TIMEOUT ps_inact_tmo; HostCmd_DS_CHAN_REGION_CFG reg_cfg; @@ -7084,27 +7233,29 @@ typedef struct MLAN_PACK_START _HostCmd_DS_COMMAND { #if defined(PCIE) HostCmd_DS_SSU_CFG ssu_params; #endif - /** boot sleep configure */ + /** boot sleep configure */ HostCmd_DS_BOOT_SLEEP boot_sleep; #if defined(DRV_EMBEDDED_AUTHENTICATOR) || defined(DRV_EMBEDDED_SUPPLICANT) - /** crypto cmd */ + /** crypto cmd */ HostCmd_DS_CRYPTO crypto_cmd; #endif #ifdef UAP_SUPPORT - /** Add station cmd */ + /** Add station cmd */ HostCmd_DS_ADD_STATION sta_info; #endif - /** HostCmd_DS_11AX_CFG */ + /** HostCmd_DS_11AX_CFG */ HostCmd_DS_11AX_CFG axcfg; - /** HostCmd_DS_11AX_CMD_CFG */ + /** HostCmd_DS_11AX_CMD_CFG */ HostCmd_DS_11AX_CMD_CFG axcmd; + /** HostCmd_DS_TWT_CFG */ + HostCmd_DS_TWT_CFG twtcfg; HostCmd_DS_CMD_RX_ABORT_CFG rx_abort_cfg; HostCmd_DS_CMD_RX_ABORT_CFG_EXT rx_abort_cfg_ext; HostCmd_DS_CMD_TX_AMPDU_PROT_MODE tx_ampdu_prot_mode; HostCmd_DS_CMD_RATE_ADAPT_CFG rate_adapt_cfg; HostCmd_DS_CMD_CCK_DESENSE_CFG cck_desense_cfg; - /** trpc_config */ + /** trpc_config */ HostCmd_DS_CHANNEL_TRPC_CONFIG ch_trpc_config; HostCmd_DS_LOW_POWER_MODE_CFG lpm_cfg; HostCmd_DS_BAND_STEERING band_steer_info; @@ -7113,42 +7264,42 @@ typedef struct MLAN_PACK_START _HostCmd_DS_COMMAND { /** PS_CMD_ConfirmSleep */ typedef MLAN_PACK_START struct _OPT_Confirm_Sleep { - /** Command */ + /** Command */ t_u16 command; - /** Size */ + /** Size */ t_u16 size; - /** Sequence number */ + /** Sequence number */ t_u16 seq_num; - /** Result */ + /** Result */ t_u16 result; - /** Action */ + /** Action */ t_u16 action; - /** Sleep comfirm param definition */ + /** Sleep comfirm param definition */ sleep_confirm_param sleep_cfm; } MLAN_PACK_END OPT_Confirm_Sleep; typedef struct MLAN_PACK_START _opt_sleep_confirm_buffer { - /** Header for interface */ + /** Header for interface */ t_u32 hdr; - /** New power save command used to send - * sleep confirmation to the firmware */ + /** New power save command used to send + * sleep confirmation to the firmware */ OPT_Confirm_Sleep ps_cfm_sleep; } MLAN_PACK_END opt_sleep_confirm_buffer; /** req host side download vdll block */ -#define VDLL_IND_TYPE_REQ 0 +#define VDLL_IND_TYPE_REQ 0 /** notify vdll start offset in firmware image */ -#define VDLL_IND_TYPE_OFFSET 1 +#define VDLL_IND_TYPE_OFFSET 1 /** vdll indicate event structure */ typedef MLAN_PACK_START struct _vdll_ind { - /*VDLL ind type */ + /*VDLL ind type*/ t_u16 type; - /*reserved */ + /*reserved*/ t_u16 reserved; - /*indicate the offset downloaded so far */ + /*indicate the offset downloaded so far*/ t_u32 offset; - /*VDLL block size */ + /*VDLL block size*/ t_u16 block_len; } MLAN_PACK_END vdll_ind, *pvdll_ind; #ifdef PRAGMA_PACK diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_ieee.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_ieee.h index c4518c8b3bda..03b5fd4ffc92 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_ieee.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_ieee.h @@ -30,32 +30,32 @@ Change log: #define _MLAN_IEEE_H_ /** FIX IES size in beacon buffer */ -#define WLAN_802_11_FIXED_IE_SIZE 12 +#define WLAN_802_11_FIXED_IE_SIZE 12 /** WLAN supported rates */ -#define WLAN_SUPPORTED_RATES 14 +#define WLAN_SUPPORTED_RATES 14 /** WLAN supported rates extension */ -#define WLAN_SUPPORTED_RATES_EXT 60 +#define WLAN_SUPPORTED_RATES_EXT 60 /** Enumeration definition*/ /** WLAN_802_11_NETWORK_TYPE */ typedef enum _WLAN_802_11_NETWORK_TYPE { Wlan802_11FH, Wlan802_11DS, - /* Defined as upper bound */ + /* Defined as upper bound*/ Wlan802_11NetworkTypeMax } WLAN_802_11_NETWORK_TYPE; #ifdef BIG_ENDIAN_SUPPORT /** Frame control: Type Mgmt frame */ -#define IEEE80211_FC_MGMT_FRAME_TYPE_MASK 0x3000 +#define IEEE80211_FC_MGMT_FRAME_TYPE_MASK 0x3000 /** Frame control: SubType Mgmt frame */ -#define IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE(fc) (((fc) & 0xF000) >> 12) +#define IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE(fc) (((fc)&0xF000) >> 12) #else /** Frame control: Type Mgmt frame */ -#define IEEE80211_FC_MGMT_FRAME_TYPE_MASK 0x000C +#define IEEE80211_FC_MGMT_FRAME_TYPE_MASK 0x000C /** Frame control: SubType Mgmt frame */ -#define IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE(fc) (((fc) & 0x00F0) >> 4) +#define IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE(fc) (((fc)&0x00F0) >> 4) #endif #ifdef PRAGMA_PACK @@ -63,7 +63,7 @@ typedef enum _WLAN_802_11_NETWORK_TYPE { #endif /* Reason codes */ -#define IEEE_80211_REASONCODE_UNSPECIFIED 1 +#define IEEE_80211_REASONCODE_UNSPECIFIED 1 typedef enum _IEEEtypes_Ext_ElementId_e { HE_CAPABILITY = 35, @@ -100,7 +100,7 @@ typedef MLAN_PACK_START enum _IEEEtypes_ElementId_e { NONTX_BSSID_CAP = 83, MBSSID_INDEX = 85, EXT_CAPABILITY = 127, - /*IEEE802.11r */ + /*IEEE802.11r*/ MOBILITY_DOMAIN = 54, FAST_BSS_TRANSITION = 55, TIMEOUT_INTERVAL = 56, @@ -136,70 +136,70 @@ typedef MLAN_PACK_START enum _IEEEtypes_ElementId_e { /** IEEE IE header */ typedef MLAN_PACK_START struct _IEEEtypes_Header_t { - /** Element ID */ + /** Element ID */ t_u8 element_id; - /** Length */ + /** Length */ 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 */ + /** Element ID */ t_u8 element_id; - /** Length */ + /** Length */ t_u8 len; - /** OUI */ + /** OUI */ t_u8 oui[3]; - /** OUI type */ + /** OUI type */ t_u8 oui_type; - /** OUI subtype */ + /** OUI subtype */ t_u8 oui_subtype; - /** Version */ + /** 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 */ + /** Vendor specific IE header */ IEEEtypes_VendorHeader_t vend_hdr; - /** IE Max - size of previous fields */ + /** IE Max - size of previous fields */ t_u8 data[IEEE_MAX_IE_SIZE - sizeof(IEEEtypes_VendorHeader_t)]; } MLAN_PACK_END IEEEtypes_VendorSpecific_t, *pIEEEtypes_VendorSpecific_t; /** IEEE IE */ typedef MLAN_PACK_START struct _IEEEtypes_Generic_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** IE Max - size of previous fields */ + /** IE Max - size of previous fields */ t_u8 data[IEEE_MAX_IE_SIZE - sizeof(IEEEtypes_Header_t)]; } MLAN_PACK_END IEEEtypes_Generic_t, *pIEEEtypes_Generic_t; /**ft capability policy*/ typedef MLAN_PACK_START struct _IEEEtypes_FtCapPolicy_t { #ifdef BIG_ENDIAN_SUPPORT - /** Reserved */ - t_u8 reserved:6; - /** RIC support */ - t_u8 ric:1; - /** FT over the DS capable */ - t_u8 ft_over_ds:1; + /** Reserved */ + t_u8 reserved : 6; + /** RIC support */ + t_u8 ric : 1; + /** FT over the DS capable */ + t_u8 ft_over_ds : 1; #else - /** FT over the DS capable */ - t_u8 ft_over_ds:1; - /** RIC support */ - t_u8 ric:1; - /** Reserved */ - t_u8 reserved:6; + /** FT over the DS capable */ + t_u8 ft_over_ds : 1; + /** RIC support */ + t_u8 ric : 1; + /** Reserved */ + t_u8 reserved : 6; #endif } MLAN_PACK_END IEEEtypes_FtCapPolicy_t; /** Mobility domain IE */ typedef MLAN_PACK_START struct _IEEEtypes_MobilityDomain_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** Mobility Domain ID */ + /** Mobility Domain ID */ t_u16 mdid; - /** FT Capability policy */ + /** FT Capability policy */ t_u8 ft_cap; } MLAN_PACK_END IEEEtypes_MobilityDomain_t; @@ -212,11 +212,11 @@ typedef MLAN_PACK_START struct _IEEEtypes_FT_MICControl_t { } MLAN_PACK_END IEEEtypes_FT_MICControl_t; /** FTIE MIC LEN */ -#define FTIE_MIC_LEN 16 +#define FTIE_MIC_LEN 16 /**FT IE*/ typedef MLAN_PACK_START struct _IEEEtypes_FastBssTransElement_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; /** mic control */ IEEEtypes_FT_MICControl_t mic_control; @@ -239,43 +239,43 @@ typedef MLAN_PACK_START struct _IEEEtypes_FastBssTransElement_t { /*FT response and FT ack*/ typedef MLAN_PACK_START struct { - /** category */ + /** category */ t_u8 category; - /** action */ + /** action */ t_u8 action; - /** sta address */ + /** sta address */ t_u8 sta_addr[MLAN_MAC_ADDR_LENGTH]; - /** target ap address */ + /** target ap address */ t_u8 target_ap_addr[MLAN_MAC_ADDR_LENGTH]; - /** status code */ + /** status code */ t_u16 status_code; - /** varible */ + /** varible */ t_u8 variable[]; } MLAN_PACK_END IEEEtypes_Ft_action_response; /**FT request */ typedef MLAN_PACK_START struct { - /** category */ + /** category */ t_u8 category; - /** action */ + /** action */ t_u8 action; - /** sta address */ + /** sta address */ t_u8 sta_addr[MLAN_MAC_ADDR_LENGTH]; - /** target ap address */ + /** target ap address */ t_u8 target_ap_addr[MLAN_MAC_ADDR_LENGTH]; - /** varible */ + /** varible */ t_u8 variable[]; } MLAN_PACK_END IEEEtypes_Ft_action_request; /** auth frame body*/ typedef MLAN_PACK_START struct { - /** auth alg */ + /** auth alg */ t_u16 auth_alg; - /** auth transaction */ + /** auth transaction */ t_u16 auth_transaction; - /** status code */ + /** status code */ t_u16 status_code; - /** variable */ + /** variable */ t_u8 variable[]; } MLAN_PACK_END IEEEtypes_Auth_framebody; @@ -283,25 +283,25 @@ typedef MLAN_PACK_START struct { typedef MLAN_PACK_START struct { t_u16 capab_info; t_u16 listen_interval; - /** followed by SSID and Supported rates */ + /** followed by SSID and Supported rates */ t_u8 variablep[]; } MLAN_PACK_END IEEEtypes_assoc_req; /*Mgmt frame*/ typedef MLAN_PACK_START struct { - /** frame control */ + /** frame control */ t_u16 frame_control; - /** duration */ + /** duration */ t_u16 duration; - /** dest address */ + /** dest address */ t_u8 da[MLAN_MAC_ADDR_LENGTH]; - /** source address */ + /** source address */ t_u8 sa[MLAN_MAC_ADDR_LENGTH]; - /** bssid */ + /** bssid */ t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; - /** seq control */ + /** seq control */ t_u16 seq_ctrl; - /** address 4 */ + /** address 4 */ t_u8 addr4[MLAN_MAC_ADDR_LENGTH]; union { IEEEtypes_Auth_framebody auth; @@ -313,75 +313,74 @@ typedef MLAN_PACK_START struct { /** TLV header */ typedef MLAN_PACK_START struct _TLV_Generic_t { - /** Type */ + /** Type */ t_u16 type; - /** Length */ + /** Length */ t_u16 len; } MLAN_PACK_END TLV_Generic_t, *pTLV_Generic_t; /** Capability information mask */ -#define CAPINFO_MASK \ -(~(MBIT(15) | MBIT(14) | MBIT(11) | MBIT(9))) +#define CAPINFO_MASK (~(MBIT(15) | MBIT(14) | MBIT(11) | MBIT(9))) /** Capability Bit Map*/ #ifdef BIG_ENDIAN_SUPPORT typedef MLAN_PACK_START struct _IEEEtypes_CapInfo_t { - t_u8 rsrvd1:2; - t_u8 dsss_ofdm:1; - t_u8 radio_measurement:1; - t_u8 rsvrd2:1; - 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 radio_measurement : 1; + t_u8 rsvrd2 : 1; + 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; - /** Capability Bit Map : IBSS */ - t_u8 ibss:1; - /** Capability Bit Map : CF pollable */ - t_u8 cf_pollable:1; - /** Capability Bit Map : CF poll request */ - t_u8 cf_poll_rqst:1; - /** Capability Bit Map : privacy */ - t_u8 privacy:1; - /** Capability Bit Map : Short preamble */ - t_u8 short_preamble:1; - /** Capability Bit Map : PBCC */ - t_u8 pbcc:1; - /** Capability Bit Map : Channel agility */ - t_u8 chan_agility:1; - /** Capability Bit Map : Spectrum management */ - t_u8 spectrum_mgmt:1; - /** Capability Bit Map : Reserved */ - t_u8 rsrvd3:1; - /** Capability Bit Map : Short slot time */ - t_u8 short_slot_time:1; - /** Capability Bit Map : APSD */ - t_u8 Apsd:1; - /** Capability Bit Map : Reserved */ - t_u8 rsvrd2:1; - /** Capability Bit Map : DSS OFDM */ - t_u8 dsss_ofdm:1; - /** Capability Bit Map : Reserved */ - t_u8 rsrvd1:2; + /** Capability Bit Map : ESS */ + t_u8 ess : 1; + /** Capability Bit Map : IBSS */ + t_u8 ibss : 1; + /** Capability Bit Map : CF pollable */ + t_u8 cf_pollable : 1; + /** Capability Bit Map : CF poll request */ + t_u8 cf_poll_rqst : 1; + /** Capability Bit Map : privacy */ + t_u8 privacy : 1; + /** Capability Bit Map : Short preamble */ + t_u8 short_preamble : 1; + /** Capability Bit Map : PBCC */ + t_u8 pbcc : 1; + /** Capability Bit Map : Channel agility */ + t_u8 chan_agility : 1; + /** Capability Bit Map : Spectrum management */ + t_u8 spectrum_mgmt : 1; + /** Capability Bit Map : Reserved */ + t_u8 rsrvd3 : 1; + /** Capability Bit Map : Short slot time */ + t_u8 short_slot_time : 1; + /** Capability Bit Map : APSD */ + t_u8 Apsd : 1; + /** Capability Bit Map : Reserved */ + t_u8 rsvrd2 : 1; + /** Capability Bit Map : DSS OFDM */ + t_u8 dsss_ofdm : 1; + /** Capability Bit Map : Reserved */ + t_u8 rsrvd1 : 2; } MLAN_PACK_END IEEEtypes_CapInfo_t, *pIEEEtypes_CapInfo_t; #endif /* BIG_ENDIAN_SUPPORT */ /** IEEEtypes_Ssid_t */ typedef MLAN_PACK_START struct _IEEEtypes_Ssid_t { - /** SSID: Element ID */ + /** SSID: Element ID */ t_u8 element_id; - /** SSID : Length */ + /** SSID : Length */ t_u8 len; /** ssid */ t_u8 ssid[MLAN_MAX_SSID_LENGTH]; @@ -389,79 +388,79 @@ typedef MLAN_PACK_START struct _IEEEtypes_Ssid_t { /** IEEEtypes_CfParamSet_t */ typedef MLAN_PACK_START struct _IEEEtypes_CfParamSet_t { - /** CF peremeter : Element ID */ + /** CF peremeter : Element ID */ t_u8 element_id; - /** CF peremeter : Length */ + /** CF peremeter : Length */ t_u8 len; - /** CF peremeter : Count */ + /** CF peremeter : Count */ t_u8 cfp_cnt; - /** CF peremeter : Period */ + /** CF peremeter : Period */ t_u8 cfp_period; - /** CF peremeter : Maximum duration */ + /** CF peremeter : Maximum duration */ t_u16 cfp_max_duration; - /** CF peremeter : Remaining duration */ + /** CF peremeter : Remaining duration */ 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 */ + /** Element ID */ t_u8 element_id; - /** Length */ + /** Length */ t_u8 len; - /** ATIM window value in milliseconds */ + /** ATIM window value in milliseconds */ 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 */ + /** SS parameter : CF parameter set */ IEEEtypes_CfParamSet_t cf_param_set; - /** SS parameter : IBSS parameter set */ + /** SS parameter : IBSS parameter 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 */ + /** FH parameter : Element ID */ t_u8 element_id; - /** FH parameter : Length */ + /** FH parameter : Length */ t_u8 len; - /** FH parameter : Dwell time in milliseconds */ + /** FH parameter : Dwell time in milliseconds */ t_u16 dwell_time; - /** FH parameter : Hop set */ + /** FH parameter : Hop set */ t_u8 hop_set; - /** FH parameter : Hop pattern */ + /** FH parameter : Hop pattern */ t_u8 hop_pattern; - /** FH parameter : Hop index */ + /** FH parameter : 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 */ + /** DS parameter : Element ID */ t_u8 element_id; - /** DS parameter : Length */ + /** DS parameter : Length */ t_u8 len; - /** DS parameter : Current channel */ + /** DS parameter : Current channel */ 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 */ + /** FH parameter set */ IEEEtypes_FhParamSet_t fh_param_set; - /** DS parameter set */ + /** DS parameter 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 */ + /** Element ID */ t_u8 element_id; - /** Length */ + /** Length */ t_u8 len; - /** ERP flags */ + /** ERP flags */ t_u8 erp_flags; } MLAN_PACK_END IEEEtypes_ERPInfo_t, *pIEEEtypes_ERPInfo_t; @@ -472,41 +471,41 @@ typedef t_u16 IEEEtypes_AId_t; typedef t_u16 IEEEtypes_StatusCode_t; /** Fixed size in assoc_resp */ -#define ASSOC_RESP_FIXED_SIZE 6 +#define ASSOC_RESP_FIXED_SIZE 6 /** IEEEtypes_SeqCtl_t */ typedef MLAN_PACK_START struct _IEEEtypes_SeqCtl_t { -/** Fragment Number */ - t_u16 FragNum:4; -/** Sequence Number */ - t_u16 SeqNum:12; + /** Fragment Number */ + t_u16 FragNum : 4; + /** Sequence Number */ + t_u16 SeqNum : 12; } MLAN_PACK_END IEEEtypes_SeqCtl_t; /** IEEEtypes_MgmtHdr_t */ typedef MLAN_PACK_START struct _IEEEtypes_MgmtHdr_t { -/** FrmCtl*/ + /** FrmCtl*/ t_u16 FrmCtl; -/** Duration*/ + /** Duration*/ t_u16 Duration; -/** Destination Addr*/ + /** Destination Addr*/ t_u8 DestAddr[6]; -/** Source Addr*/ + /** Source Addr*/ t_u8 SrcAddr[6]; -/** BSSID */ + /** BSSID */ t_u8 BssId[6]; -/** IEEEtypes_SeqCtl_t */ + /** IEEEtypes_SeqCtl_t */ IEEEtypes_SeqCtl_t SeqCtl; } MLAN_PACK_END IEEEtypes_MgmtHdr_t; /** IEEEtypes_AssocRsp_t */ typedef MLAN_PACK_START struct _IEEEtypes_AssocRsp_t { - /** Capability information */ + /** Capability information */ IEEEtypes_CapInfo_t capability; - /** Association response status code */ + /** Association response status code */ IEEEtypes_StatusCode_t status_code; - /** Association ID */ + /** Association ID */ IEEEtypes_AId_t a_id; - /** IE data buffer */ + /** IE data buffer */ t_u8 ie_buffer[1]; } MLAN_PACK_END IEEEtypes_AssocRsp_t, *pIEEEtypes_AssocRsp_t; @@ -514,39 +513,39 @@ typedef MLAN_PACK_START struct _IEEEtypes_AssocRsp_t { typedef t_u8 WLAN_802_11_RATES[WLAN_SUPPORTED_RATES]; /** cipher TKIP */ -#define WPA_CIPHER_TKIP 2 +#define WPA_CIPHER_TKIP 2 /** cipher AES */ -#define WPA_CIPHER_AES_CCM 4 +#define WPA_CIPHER_AES_CCM 4 /** AKM: 8021x */ -#define RSN_AKM_8021X 1 +#define RSN_AKM_8021X 1 /** AKM: PSK */ -#define RSN_AKM_PSK 2 +#define RSN_AKM_PSK 2 /** AKM: PSK SHA256 */ -#define RSN_AKM_PSK_SHA256 6 +#define RSN_AKM_PSK_SHA256 6 /** AKM: PSK SHA256 */ -#define RSN_AKM_SAE 8 +#define RSN_AKM_SAE 8 /** AKM: PSK SHA256 */ -#define RSN_AKM_OWE 18 +#define RSN_AKM_OWE 18 #if defined(STA_SUPPORT) /** Pairwise Cipher Suite length */ -#define PAIRWISE_CIPHER_SUITE_LEN 4 +#define PAIRWISE_CIPHER_SUITE_LEN 4 /** AKM Suite length */ -#define AKM_SUITE_LEN 4 +#define AKM_SUITE_LEN 4 /** MFPC bit in RSN capability */ -#define MFPC_BIT 7 +#define MFPC_BIT 7 /** MFPR bit in RSN capability */ -#define MFPR_BIT 6 +#define MFPR_BIT 6 /** PMF ORing mask */ -#define PMF_MASK 0x00c0 +#define PMF_MASK 0x00c0 #endif /** wpa_suite_t */ typedef MLAN_PACK_START struct _wpa_suite_t { - /** OUI */ + /** OUI */ t_u8 oui[3]; - /** tyep */ + /** tyep */ t_u8 type; } MLAN_PACK_END wpa_suite, wpa_suite_mcast_t; @@ -554,142 +553,141 @@ typedef MLAN_PACK_START struct _wpa_suite_t { typedef MLAN_PACK_START struct { /* count */ t_u16 count; - /** wpa_suite list */ + /** wpa_suite list */ 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 */ + /** Rsn : Element ID */ t_u8 element_id; - /** Rsn : Length */ + /** Rsn : Length */ t_u8 len; - /** Rsn : version */ + /** Rsn : version */ t_u16 version; - /** Rsn : group cipher */ + /** Rsn : group cipher */ wpa_suite_mcast_t group_cipher; - /** Rsn : pairwise cipher */ + /** Rsn : 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 */ + /** Wpa : Element ID */ t_u8 element_id; - /** Wpa : Length */ + /** Wpa : Length */ t_u8 len; - /** Wpa : oui */ + /** Wpa : oui */ t_u8 oui[4]; - /** version */ + /** version */ t_u16 version; - /** Wpa : group cipher */ + /** Wpa : group cipher */ wpa_suite_mcast_t group_cipher; - /** Wpa : pairwise cipher */ + /** Wpa : pairwise cipher */ wpa_suite_ucast_t pairwise_cipher; } MLAN_PACK_END IEEEtypes_Wpa_t, *pIEEEtypes_Wpa_t; /** Data structure of WMM QoS information */ typedef MLAN_PACK_START struct _IEEEtypes_WmmQosInfo_t { #ifdef BIG_ENDIAN_SUPPORT - /** QoS UAPSD */ - t_u8 qos_uapsd:1; - /** Reserved */ - t_u8 reserved:3; - /** Parameter set count */ - t_u8 para_set_count:4; + /** QoS UAPSD */ + t_u8 qos_uapsd : 1; + /** Reserved */ + t_u8 reserved : 3; + /** Parameter set count */ + t_u8 para_set_count : 4; #else - /** Parameter set count */ - t_u8 para_set_count:4; - /** Reserved */ - t_u8 reserved:3; - /** QoS UAPSD */ - t_u8 qos_uapsd:1; -#endif /* BIG_ENDIAN_SUPPORT */ + /** Parameter set count */ + t_u8 para_set_count : 4; + /** Reserved */ + t_u8 reserved : 3; + /** QoS UAPSD */ + t_u8 qos_uapsd : 1; +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END IEEEtypes_WmmQosInfo_t, *pIEEEtypes_WmmQosInfo_t; /** Data structure of WMM Aci/Aifsn */ typedef MLAN_PACK_START struct _IEEEtypes_WmmAciAifsn_t { #ifdef BIG_ENDIAN_SUPPORT - /** Reserved */ - t_u8 reserved:1; - /** Aci */ - t_u8 aci:2; - /** Acm */ - t_u8 acm:1; - /** Aifsn */ - t_u8 aifsn:4; + /** Reserved */ + t_u8 reserved : 1; + /** Aci */ + t_u8 aci : 2; + /** Acm */ + t_u8 acm : 1; + /** Aifsn */ + t_u8 aifsn : 4; #else - /** Aifsn */ - t_u8 aifsn:4; - /** Acm */ - t_u8 acm:1; - /** Aci */ - t_u8 aci:2; - /** Reserved */ - t_u8 reserved:1; -#endif /* BIG_ENDIAN_SUPPORT */ + /** Aifsn */ + t_u8 aifsn : 4; + /** Acm */ + t_u8 acm : 1; + /** Aci */ + t_u8 aci : 2; + /** Reserved */ + t_u8 reserved : 1; +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END IEEEtypes_WmmAciAifsn_t, *pIEEEtypes_WmmAciAifsn_t; /** Data structure of WMM ECW */ typedef MLAN_PACK_START struct _IEEEtypes_WmmEcw_t { #ifdef BIG_ENDIAN_SUPPORT - /** Maximum Ecw */ - t_u8 ecw_max:4; - /** Minimum Ecw */ - t_u8 ecw_min:4; + /** Maximum Ecw */ + t_u8 ecw_max : 4; + /** Minimum Ecw */ + t_u8 ecw_min : 4; #else - /** Minimum Ecw */ - t_u8 ecw_min:4; - /** Maximum Ecw */ - t_u8 ecw_max:4; -#endif /* BIG_ENDIAN_SUPPORT */ + /** Minimum Ecw */ + t_u8 ecw_min : 4; + /** Maximum Ecw */ + 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 */ typedef MLAN_PACK_START struct _IEEEtypes_WmmInfo_t { - - /** - * WMM Info IE - Vendor Specific Header: - * element_id [221/0xdd] - * Len [7] - * Oui [00:50:f2] - * OuiType [2] - * OuiSubType [0] - * Version [1] - */ + /** + * WMM Info IE - Vendor Specific Header: + * element_id [221/0xdd] + * Len [7] + * Oui [00:50:f2] + * OuiType [2] + * OuiSubType [0] + * Version [1] + */ IEEEtypes_VendorHeader_t vend_hdr; - /** QoS information */ + /** QoS information */ IEEEtypes_WmmQosInfo_t qos_info; } MLAN_PACK_END IEEEtypes_WmmInfo_t, *pIEEEtypes_WmmInfo_t; /** Data structure of WMM parameter IE */ typedef MLAN_PACK_START struct _IEEEtypes_WmmParameter_t { - /** - * WMM Parameter IE - Vendor Specific Header: - * element_id [221/0xdd] - * Len [24] - * Oui [00:50:f2] - * OuiType [2] - * OuiSubType [1] - * Version [1] - */ + /** + * WMM Parameter IE - Vendor Specific Header: + * element_id [221/0xdd] + * Len [24] + * Oui [00:50:f2] + * OuiType [2] + * OuiSubType [1] + * Version [1] + */ IEEEtypes_VendorHeader_t vend_hdr; - /** QoS information */ + /** QoS information */ IEEEtypes_WmmQosInfo_t qos_info; - /** Reserved */ + /** Reserved */ t_u8 reserved; - /** AC Parameters Record WMM_AC_BE, WMM_AC_BK, WMM_AC_VI, WMM_AC_VO */ + /** AC Parameters Record WMM_AC_BE, WMM_AC_BK, WMM_AC_VI, WMM_AC_VO */ IEEEtypes_WmmAcParameters_t ac_params[MAX_AC_QUEUES]; } MLAN_PACK_END IEEEtypes_WmmParameter_t, *pIEEEtypes_WmmParameter_t; @@ -732,57 +730,62 @@ typedef MLAN_PACK_START enum _IEEEtypes_WMM_TSPEC_TS_TRAFFIC_TYPE_e { /** Data structure of WMM TSPEC information */ 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; /** Data structure of WMM TSPEC Nominal Size */ 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; /** Data structure of WMM TSPEC SBWA */ 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; /** Data structure of WMM TSPEC Body */ typedef MLAN_PACK_START struct { - IEEEtypes_WMM_TSPEC_TS_Info_t TSInfo; IEEEtypes_WMM_TSPEC_NomMSDUSize_t NomMSDUSize; t_u16 MaximumMSDUSize; @@ -805,8 +808,8 @@ typedef MLAN_PACK_START struct { 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 OuiType[4]; /* 00:50:f2:02 */ + t_u8 OuiSubType; /* 01 */ t_u8 Version; IEEEtypes_WMM_TSPEC_Body_t TspecBody; @@ -829,6 +832,7 @@ typedef MLAN_PACK_START enum _IEEEtypes_ActionCategory_e { IEEE_MGMT_ACTION_CATEGORY_UNPROTECT_WNM = 11, IEEE_MGMT_ACTION_CATEGORY_WMM_TSPEC = 17 + } MLAN_PACK_END IEEEtypes_ActionCategory_e; /** WMM TSPEC operations */ @@ -842,7 +846,6 @@ typedef MLAN_PACK_START enum _IEEEtypes_WMM_Tspec_Action_e { /** WMM TSPEC Category Action Base */ typedef MLAN_PACK_START struct { - IEEEtypes_ActionCategory_e category; IEEEtypes_WMM_Tspec_Action_e action; t_u8 dialogToken; @@ -851,7 +854,6 @@ typedef MLAN_PACK_START struct { /** WMM TSPEC AddTS request structure */ typedef MLAN_PACK_START struct { - IEEEtypes_WMM_Tspec_Action_Base_Tspec_t tspecAct; t_u8 statusCode; IEEEtypes_WMM_TSPEC_t tspecIE; @@ -900,36 +902,36 @@ typedef MLAN_PACK_START union { /** Data structure for subband set */ typedef MLAN_PACK_START struct _IEEEtypes_SubbandSet_t { - /** First channel */ + /** First channel */ t_u8 first_chan; - /** Number of channels */ + /** Number of channels */ t_u8 no_of_chan; - /** Maximum Tx power in dBm */ + /** Maximum Tx power in dBm */ t_u8 max_tx_pwr; } MLAN_PACK_END IEEEtypes_SubbandSet_t, *pIEEEtypes_SubbandSet_t; #ifdef STA_SUPPORT /** Data structure for Country IE */ typedef MLAN_PACK_START struct _IEEEtypes_CountryInfoSet_t { - /** Element ID */ + /** Element ID */ t_u8 element_id; - /** Length */ + /** Length */ t_u8 len; - /** Country code */ + /** Country code */ t_u8 country_code[COUNTRY_CODE_LEN]; - /** Set of subbands */ + /** Set of subbands */ 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 */ + /** Element ID */ t_u8 element_id; - /** Length */ + /** Length */ t_u8 len; - /** Country code */ + /** Country code */ t_u8 country_code[COUNTRY_CODE_LEN]; - /** Set of subbands */ + /** Set of subbands */ IEEEtypes_SubbandSet_t sub_band[MRVDRV_MAX_SUBBAND_802_11D]; } MLAN_PACK_END IEEEtypes_CountryInfoFullSet_t, *pIEEEtypes_CountryInfoFullSet_t; @@ -938,46 +940,46 @@ typedef MLAN_PACK_START struct _IEEEtypes_CountryInfoFullSet_t { /** HT Capabilities Data */ typedef struct MLAN_PACK_START _HTCap_t { - /** HT Capabilities Info field */ + /** HT Capabilities Info field */ t_u16 ht_cap_info; - /** A-MPDU Parameters field */ + /** A-MPDU Parameters field */ t_u8 ampdu_param; - /** Supported MCS Set field */ + /** Supported MCS Set field */ t_u8 supported_mcs_set[16]; - /** HT Extended Capabilities field */ + /** HT Extended Capabilities field */ t_u16 ht_ext_cap; - /** Transmit Beamforming Capabilities field */ + /** Transmit Beamforming Capabilities field */ t_u32 tx_bf_cap; - /** Antenna Selection Capability field */ + /** Antenna Selection Capability field */ t_u8 asel; } MLAN_PACK_END HTCap_t, *pHTCap_t; /** HT Information Data */ typedef struct MLAN_PACK_START _HTInfo_t { - /** Primary channel */ + /** Primary channel */ t_u8 pri_chan; - /** Field 2 */ + /** Field 2 */ t_u8 field2; - /** Field 3 */ + /** Field 3 */ t_u16 field3; - /** Field 4 */ + /** Field 4 */ t_u16 field4; - /** Bitmap indicating MCSs supported by all HT STAs in the BSS */ + /** Bitmap indicating MCSs supported by all HT STAs in the BSS */ 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 */ + /** 20/40 BSS Coexistence value */ t_u8 bss_co_2040_value; } MLAN_PACK_END BSSCo2040_t, *pBSSCo2040_t; -#define MAX_DSCP_EXCEPTION_NUM 21 +#define MAX_DSCP_EXCEPTION_NUM 21 /** DSCP Range */ typedef struct MLAN_PACK_START _DSCP_Exception_t { /* DSCP value 0 to 63 or ff */ t_u8 dscp_value; - /* user priority 0-7 */ + /* user priority 0-7*/ t_u8 user_priority; } MLAN_PACK_END DSCP_Exception_t, *pDSCP_Exception_t; @@ -991,59 +993,59 @@ typedef struct MLAN_PACK_START _DSCP_Range_t { /** Overlapping BSS Scan Parameters Data */ typedef struct MLAN_PACK_START _OverlapBSSScanParam_t { - /** OBSS Scan Passive Dwell in milliseconds */ + /** OBSS Scan Passive Dwell in milliseconds */ t_u16 obss_scan_passive_dwell; - /** OBSS Scan Active Dwell in milliseconds */ + /** OBSS Scan Active Dwell in milliseconds */ t_u16 obss_scan_active_dwell; - /** BSS Channel Width Trigger Scan Interval in seconds */ + /** BSS Channel Width Trigger Scan Interval in seconds */ t_u16 bss_chan_width_trigger_scan_int; - /** OBSS Scan Passive Total Per Channel */ + /** OBSS Scan Passive Total Per Channel */ t_u16 obss_scan_passive_total; - /** OBSS Scan Active Total Per Channel */ + /** OBSS Scan Active Total Per Channel */ t_u16 obss_scan_active_total; - /** BSS Width Channel Transition Delay Factor */ + /** BSS Width Channel Transition Delay Factor */ t_u16 bss_width_chan_trans_delay; - /** OBSS Scan Activity Threshold */ + /** OBSS Scan Activity 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 */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** HTCap struct */ + /** HTCap struct */ 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 */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** HTInfo struct */ + /** HTInfo struct */ 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 */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** BSSCo2040_t struct */ + /** BSSCo2040_t struct */ 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 */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** ExtCap_t struct */ + /** ExtCap_t struct */ 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 */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** OBSSScanParam_t struct */ + /** OBSSScanParam_t struct */ OBSSScanParam_t obss_scan_param; } MLAN_PACK_END IEEEtypes_OverlapBSSScanParam_t, *pIEEEtypes_OverlapBSSScanParam_t; @@ -1051,53 +1053,53 @@ typedef MLAN_PACK_START struct _IEEEtypes_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 rx_max_rate; /* bit 29-31 reserved */ t_u16 tx_mcs_map; - t_u16 tx_max_rate; /* bit 61-63 reserved */ + 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 */ 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; @@ -1105,34 +1107,34 @@ typedef MLAN_PACK_START struct _VHT_capa { /** VHT Capabilities IE */ typedef MLAN_PACK_START struct _IEEEtypes_VHTCap_t { - /** Generic IE header */ + /** Generic IE header */ 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 -#define VHT_CAP_CHWD_160MHZ 1 -#define VHT_CAP_CHWD_80_80MHZ 2 +#define VHT_CAP_CHWD_80MHZ 0 +#define VHT_CAP_CHWD_160MHZ 1 +#define VHT_CAP_CHWD_80_80MHZ 2 /** VHT Operations IE */ typedef MLAN_PACK_START struct _IEEEtypes_VHTOprat_t { - /** Generic IE header */ + /** Generic IE header */ 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 */ + /** Basic MCS set map, each 2 bits stands for a Nss */ t_u16 basic_MCS_map; } MLAN_PACK_END IEEEtypes_VHTOprat_t, *pIEEEtypes_VHTOprat_t; -#define VHT_OPER_CHWD_20_40MHZ 0 -#define VHT_OPER_CHWD_80MHZ 1 -#define VHT_OPER_CHWD_160MHZ 2 -#define VHT_OPER_CHWD_80_80MHZ 3 +#define VHT_OPER_CHWD_20_40MHZ 0 +#define VHT_OPER_CHWD_80MHZ 1 +#define VHT_OPER_CHWD_160MHZ 2 +#define VHT_OPER_CHWD_80_80MHZ 3 /** VHT Transmit Power Envelope IE */ typedef MLAN_PACK_START struct _IEEEtypes_VHTtxpower_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; t_u8 max_tx_power; t_u8 chan_center_freq; @@ -1141,17 +1143,17 @@ typedef MLAN_PACK_START struct _IEEEtypes_VHTtxpower_t { /** Extended Power Constraint IE */ typedef MLAN_PACK_START struct _IEEEtypes_ExtPwerCons_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** channel width */ + /** channel width */ t_u8 chan_width; - /** local power constraint */ + /** local power constraint */ 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 */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; t_u8 MU_MIMO_capa_count; t_u8 stream_underutilization; @@ -1162,7 +1164,7 @@ typedef MLAN_PACK_START struct _IEEEtypes_ExtBSSload_t { /** Quiet Channel IE */ typedef MLAN_PACK_START struct _IEEEtypes_QuietChan_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; t_u8 AP_quiet_mode; t_u8 quiet_count; @@ -1173,7 +1175,7 @@ typedef MLAN_PACK_START struct _IEEEtypes_QuietChan_t { /** Wide Bandwidth Channel Switch IE */ typedef MLAN_PACK_START struct _IEEEtypes_BWSwitch_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; t_u8 new_chan_width; t_u8 new_chan_center_freq_1; @@ -1182,75 +1184,72 @@ typedef MLAN_PACK_START struct _IEEEtypes_BWSwitch_t { /** AID IE */ typedef MLAN_PACK_START struct _IEEEtypes_AID_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** AID number */ + /** AID number */ 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 */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** Operating Mode */ + /** Operating Mode */ t_u8 oper_mode; } MLAN_PACK_END IEEEtypes_OperModeNtf_t, *pIEEEtypes_OperModeNtf_t; typedef MLAN_PACK_START struct _IEEEtypes_Extension_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** Element id extension */ + /** Element id extension */ t_u8 ext_id; - /** payload */ + /** payload */ t_u8 data[]; } MLAN_PACK_END IEEEtypes_Extension_t, *pIEEEtypes_Extension_t; typedef MLAN_PACK_START struct _IEEEtypes_HECap_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** Element id extension */ + /** Element id extension */ t_u8 ext_id; - /** he mac capability info */ + /** he mac capability info */ t_u8 he_mac_cap[6]; - /** he phy capability info */ + /** he phy capability info */ t_u8 he_phy_cap[11]; - /** he txrx mcs support , size would be 4 or 8 or 12 */ + /** he txrx mcs support , size would be 4 or 8 or 12 */ t_u8 he_txrx_mcs_support[4]; - /** PPE Thresholds (optional) */ + /** PPE Thresholds (optional) */ } MLAN_PACK_END IEEEtypes_HECap_t, *pIEEEtypes_HECap_t; /** Maximum number of subbands in the IEEEtypes_SupportedChannels_t structure */ -#define WLAN_11H_MAX_SUBBANDS 5 +#define WLAN_11H_MAX_SUBBANDS 5 /** Maximum number of DFS channels configured in IEEEtypes_IBSS_DFS_t */ #define WLAN_11H_MAX_IBSS_DFS_CHANNELS 25 /** 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) */ @@ -1258,8 +1257,8 @@ typedef MLAN_PACK_START struct { * 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; @@ -1269,16 +1268,16 @@ typedef MLAN_PACK_START struct { * of channels supported in each subband */ 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 */ + /** Configured sub-bands information in the element */ IEEEtypes_SupportChan_Subband_t subband[WLAN_11H_MAX_SUBBANDS]; } MLAN_PACK_END IEEEtypes_SupportedChannels_t; /** default channel switch count */ -#define DEF_CHAN_SWITCH_COUNT 5 +#define DEF_CHAN_SWITCH_COUNT 5 /* IEEE Channel Switch Announcement Element (7.3.2.20) */ /** @@ -1287,27 +1286,27 @@ typedef MLAN_PACK_START struct { * 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; /** data structure for extended channel switch */ typedef MLAN_PACK_START struct { - /** IEEE element ID = 60 */ + /** IEEE element ID = 60 */ t_u8 element_id; - /** Element length after id and len, set to 4 */ + /** Element length after id and len, set to 4 */ t_u8 len; - /** STA should not transmit any frames if 1 */ + /** STA should not transmit any frames if 1 */ t_u8 chan_switch_mode; - /** Operate class # that AP/IBSS is moving to */ + /** Operate class # that AP/IBSS is moving to */ t_u8 new_oper_class; - /** Channel # that AP/IBSS is moving to */ + /** Channel # that AP/IBSS is moving to */ t_u8 new_channel_num; - /** of TBTTs before channel switch */ + /** of TBTTs before channel switch */ t_u8 chan_switch_count; } MLAN_PACK_END IEEEtypes_ExtChanSwitchAnn_t; @@ -1319,7 +1318,7 @@ typedef MLAN_PACK_START struct { * switch element. */ typedef MLAN_PACK_START struct { - /** Generic IE header IEEE Element ID = 194*/ + /** Generic IE header IEEE Element ID = 194*/ IEEEtypes_Header_t ieee_hdr; t_u8 new_channel_width; t_u8 new_channel_center_freq0; @@ -1333,12 +1332,12 @@ typedef MLAN_PACK_START struct { * Wrapper IE. */ typedef MLAN_PACK_START struct { - /** Generic IE header IEEE Element ID = 195*/ + /** 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>*/ + 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) */ @@ -1348,13 +1347,15 @@ typedef MLAN_PACK_START struct { * 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; @@ -1363,32 +1364,32 @@ typedef MLAN_PACK_START struct { **/ typedef MLAN_PACK_START struct { #ifdef BIG_ENDIAN_SUPPORT - /**< Reserved */ - t_u8 rsvd5_7:3; - /**< Channel is unmeasured */ - t_u8 unmeasured:1; - /**< Radar detected on channel */ - t_u8 radar:1; - /**< Unidentified signal found on channel */ - t_u8 unidentified_sig:1; - /**< OFDM preamble detected on channel */ - t_u8 ofdm_preamble:1; - /**< At least one valid MPDU received on channel */ - t_u8 bss:1; + /**< Reserved */ + t_u8 rsvd5_7 : 3; + /**< Channel is unmeasured */ + t_u8 unmeasured : 1; + /**< Radar detected on channel */ + t_u8 radar : 1; + /**< Unidentified signal found on channel */ + t_u8 unidentified_sig : 1; + /**< OFDM preamble detected on channel */ + t_u8 ofdm_preamble : 1; + /**< At least one valid MPDU received on channel */ + t_u8 bss : 1; #else - /**< At least one valid MPDU received on channel */ - t_u8 bss:1; - /**< OFDM preamble detected on channel */ - t_u8 ofdm_preamble:1; - /**< Unidentified signal found on channel */ - t_u8 unidentified_sig:1; - /**< Radar detected on channel */ - t_u8 radar:1; - /**< Channel is unmeasured */ - t_u8 unmeasured:1; - /**< Reserved */ - t_u8 rsvd5_7:3; -#endif /* BIG_ENDIAN_SUPPORT */ + /**< At least one valid MPDU received on channel */ + t_u8 bss : 1; + /**< OFDM preamble detected on channel */ + t_u8 ofdm_preamble : 1; + /**< Unidentified signal found on channel */ + t_u8 unidentified_sig : 1; + /**< Radar detected on channel */ + t_u8 radar : 1; + /**< Channel is unmeasured */ + t_u8 unmeasured : 1; + /**< Reserved */ + t_u8 rsvd5_7 : 3; +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END MeasRptBasicMap_t; @@ -1399,9 +1400,9 @@ typedef MLAN_PACK_START struct { * 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; @@ -1412,13 +1413,13 @@ typedef MLAN_PACK_START struct { * 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 */ + /** Variable length map field, one Map entry for each supported channel + */ IEEEtypes_ChannelMap_t channel_map[WLAN_11H_MAX_IBSS_DFS_CHANNELS]; } MLAN_PACK_END IEEEtypes_IBSS_DFS_t; @@ -1429,17 +1430,17 @@ typedef MLAN_PACK_START struct { * 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; @@ -1451,15 +1452,15 @@ typedef struct { #define MAX_SCAN_RSP_BUF (16 * 1024) /** Maximum number of channels that can be sent in user scan config */ -#define WLAN_USER_SCAN_CHAN_MAX 50 +#define WLAN_USER_SCAN_CHAN_MAX 50 /** Maximum length of SSID list */ -#define MRVDRV_MAX_SSID_LIST_LENGTH 10 +#define MRVDRV_MAX_SSID_LIST_LENGTH 10 /** Maximum length of BSSID list */ -#define MAX_BSSID_FILTER_LIST 5 +#define MAX_BSSID_FILTER_LIST 5 /** Scan all the channels in specified band */ -#define BAND_SPECIFIED 0x80 +#define BAND_SPECIFIED 0x80 /** * IOCTL SSID List sub-structure sent in wlan_ioctl_user_scan_cfg @@ -1468,9 +1469,9 @@ typedef struct { * filters for scan result processing in firmware. */ typedef MLAN_PACK_START struct _wlan_user_scan_ssid { - /** SSID */ + /** SSID */ t_u8 ssid[MLAN_MAX_SSID_LENGTH + 1]; - /** Maximum length of SSID */ + /** Maximum length of SSID */ t_u8 max_len; } MLAN_PACK_END wlan_user_scan_ssid; @@ -1481,21 +1482,21 @@ typedef MLAN_PACK_START struct _wlan_user_scan_ssid { * to configure a instance of a scan on the specific channel. */ typedef MLAN_PACK_START struct _wlan_user_scan_chan { - /** Channel Number to scan */ + /** Channel Number to scan */ t_u8 chan_number; - /** Radio type: 'B/G' Band = 0, 'A' Band = 1 */ + /** Radio type: 'B/G' Band = 0, 'A' Band = 1 */ t_u8 radio_type; - /** Scan type: Active = 1, Passive = 2 */ + /** Scan type: Active = 1, Passive = 2 */ t_u8 scan_type; - /** Reserved */ + /** Reserved */ t_u8 reserved; - /** Scan duration in milliseconds; if 0 default used */ + /** Scan duration in milliseconds; if 0 default used */ t_u32 scan_time; } MLAN_PACK_END wlan_user_scan_chan; /** channel statictics */ typedef MLAN_PACK_START struct _ChanStatistics_t { - /** channle number */ + /** channle number */ t_u8 chan_num; /** band info */ Band_Config_t bandcfg; @@ -1509,9 +1510,9 @@ typedef MLAN_PACK_START struct _ChanStatistics_t { t_u16 cca_scan_duration; /** busy duration */ t_u16 cca_busy_duration; - /** min rss */ + /** min rss */ t_u8 min_rss; - /** max rssi */ + /** max rssi */ t_u8 max_rss; } MLAN_PACK_END ChanStatistics_t; @@ -1530,54 +1531,55 @@ typedef enum _MLAN_EXT_SCAN_TYPE { * desired. */ typedef MLAN_PACK_START struct { - /** - * Flag set to keep the previous scan table intact - * - * If set, the scan results will accumulate, replacing any previous - * matched entries for a BSS with the new scan data - */ + /** + * Flag set to keep the previous scan table intact + * + * 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; - /** - * BSS mode to be sent in the firmware command - * - * Field can be used to restrict the types of networks returned in the - * scan. Valid settings are: - * - * - MLAN_SCAN_MODE_BSS (infrastructure) - * - MLAN_SCAN_MODE_IBSS (adhoc) - * - MLAN_SCAN_MODE_ANY (unrestricted, adhoc and infrastructure) - */ + /** + * BSS mode to be sent in the firmware command + * + * Field can be used to restrict the types of networks returned in the + * scan. Valid settings are: + * + * - MLAN_SCAN_MODE_BSS (infrastructure) + * - MLAN_SCAN_MODE_IBSS (adhoc) + * - MLAN_SCAN_MODE_ANY (unrestricted, adhoc and infrastructure) + */ t_u8 bss_mode; - /** - * Configure the number of probe requests for active chan scans - */ + /** + * Configure the number of probe requests for active chan scans + */ t_u8 num_probes; - /** - * @brief ssid filter flag - */ + /** + * @brief ssid filter flag + */ t_u8 ssid_filter; - /** - * @brief BSSID filter sent in the firmware command to limit the results - */ + /** + * @brief BSSID filter sent in the firmware command to limit the + * results + */ t_u8 specific_bssid[MLAN_MAC_ADDR_LENGTH]; - /** - * SSID filter list used in the to limit the scan results - */ + /** + * SSID filter list used in the to limit the scan results + */ wlan_user_scan_ssid ssid_list[MRVDRV_MAX_SSID_LIST_LENGTH]; - /** - * Variable number (fixed maximum) of channels to scan up - */ + /** + * Variable number (fixed maximum) of channels to scan up + */ wlan_user_scan_chan chan_list[WLAN_USER_SCAN_CHAN_MAX]; - /** scan channel gap */ + /** scan channel gap */ t_u16 scan_chan_gap; - /** scan type: 0 legacy, 1: enhance scan*/ + /** scan type: 0 legacy, 1: enhance scan*/ t_u8 ext_scan_type; - /** flag to filer only probe response */ + /** flag to filer only probe response */ t_u8 proberesp_only; t_u8 random_mac[MLAN_MAC_ADDR_LENGTH]; - /** Number of BSSIDs to be filtered */ + /** Number of BSSIDs to be filtered */ t_u8 bssid_num; - /** BSSID filter list used in the to limit the scan results */ + /** BSSID filter list used in the to limit the scan results */ mlan_802_11_mac_addr bssid_list[MAX_BSSID_FILTER_LIST]; } MLAN_PACK_END wlan_user_scan_cfg; @@ -1585,36 +1587,36 @@ typedef MLAN_PACK_START struct { #define DEFAULT_BGSCAN_INTERVAL 30000 /** action get all, except pps/uapsd config */ -#define BG_SCAN_ACT_GET 0x0000 +#define BG_SCAN_ACT_GET 0x0000 /** action set all, except pps/uapsd config */ -#define BG_SCAN_ACT_SET 0x0001 +#define BG_SCAN_ACT_SET 0x0001 /** action get pps/uapsd config */ -#define BG_SCAN_ACT_GET_PPS_UAPSD 0x0100 +#define BG_SCAN_ACT_GET_PPS_UAPSD 0x0100 /** action set pps/uapsd config */ -#define BG_SCAN_ACT_SET_PPS_UAPSD 0x0101 +#define BG_SCAN_ACT_SET_PPS_UAPSD 0x0101 /** action set all */ -#define BG_SCAN_ACT_SET_ALL 0xff01 +#define BG_SCAN_ACT_SET_ALL 0xff01 /** ssid match */ -#define BG_SCAN_SSID_MATCH 0x0001 +#define BG_SCAN_SSID_MATCH 0x0001 /** ssid match and RSSI exceeded */ -#define BG_SCAN_SSID_RSSI_MATCH 0x0004 +#define BG_SCAN_SSID_RSSI_MATCH 0x0004 /**wait for all channel scan to complete to report scan result*/ -#define BG_SCAN_WAIT_ALL_CHAN_DONE 0x80000000 +#define BG_SCAN_WAIT_ALL_CHAN_DONE 0x80000000 /** Maximum number of channels that can be sent in bg scan config */ -#define WLAN_BG_SCAN_CHAN_MAX 38 +#define WLAN_BG_SCAN_CHAN_MAX 38 /** Enumeration definition */ /** EES MODE */ typedef enum { - /** EES MODE: LOW */ + /** EES MODE: LOW */ EES_MODE_LOW = 0, - /** EES MODE: MID */ + /** EES MODE: MID */ EES_MODE_MID, - /** EES MODE: HIGH */ + /** EES MODE: HIGH */ EES_MODE_HIGH, - /** EES MODE: OFF */ + /** EES MODE: OFF */ EES_MODE_OFF, - /** EES MODE: LOOP */ + /** EES MODE: LOOP */ EES_MODE_LOOP = 15, } ees_modes; @@ -1623,13 +1625,13 @@ typedef enum { /** ees_ssid_config */ typedef MLAN_PACK_START struct { - /** SSID */ + /** SSID */ t_u8 ssid[MLAN_MAX_SSID_LENGTH + 1]; - /** Maximum length of SSID */ + /** Maximum length of SSID */ t_u8 max_len; - /** PairCipher */ + /** PairCipher */ t_u8 pair_cipher; - /** GroupCipher */ + /** GroupCipher */ t_u8 group_cipher; } MLAN_PACK_END ees_ssid_config; @@ -1637,66 +1639,66 @@ typedef MLAN_PACK_START struct { * Input structure to configure bs scan cmd to firmware */ typedef MLAN_PACK_START struct { - /** action */ + /** action */ t_u16 action; - /** enable/disable */ + /** enable/disable */ t_u8 enable; - /** BSS type: - * MLAN_SCAN_MODE_BSS (infrastructure) - * MLAN_SCAN_MODE_IBSS (adhoc) - * MLAN_SCAN_MODE_ANY (unrestricted, adhoc and infrastructure) - */ + /** BSS type: + * MLAN_SCAN_MODE_BSS (infrastructure) + * MLAN_SCAN_MODE_IBSS (adhoc) + * MLAN_SCAN_MODE_ANY (unrestricted, adhoc and infrastructure) + */ t_u8 bss_type; - /** number of channel scanned during each scan */ + /** number of channel scanned during each scan */ t_u8 chan_per_scan; - /** interval between consecutive scan */ + /** interval between consecutive scan */ 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 - */ + /** 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; - /** RSSI threshold */ + /** RSSI threshold */ t_u8 rssi_threshold; - /** SNR threshold */ + /** SNR threshold */ t_u8 snr_threshold; - /** repeat count */ + /** repeat count */ t_u16 repeat_count; - /** start later flag */ + /** start later flag */ t_u16 start_later; - /** SSID filter list used in the to limit the scan results */ + /** SSID filter list used in the to limit the scan results */ wlan_user_scan_ssid ssid_list[MRVDRV_MAX_SSID_LIST_LENGTH]; - /** Variable number (fixed maximum) of channels to scan up */ + /** Variable number (fixed maximum) of channels to scan up */ wlan_user_scan_chan chan_list[WLAN_BG_SCAN_CHAN_MAX]; - /** scan channel gap */ + /** scan channel gap */ t_u16 scan_chan_gap; - /** Enable EES configuration */ + /** Enable EES configuration */ t_u8 config_ees; - /** EES scan mode */ + /** EES scan mode */ t_u16 ees_mode; - /** EES report condition */ + /** EES report condition */ t_u16 report_cond; - /** EES High Period scan interval */ + /** EES High Period scan interval */ t_u16 high_period; - /** EES High Period scan count */ + /** EES High Period scan count */ t_u16 high_period_count; - /** EES Medium Period scan interval */ + /** EES Medium Period scan interval */ t_u16 mid_period; - /** EES Medium Period scan count */ + /** EES Medium Period scan count */ t_u16 mid_period_count; - /** EES Low Period scan interval */ + /** EES Low Period scan interval */ t_u16 low_period; - /** EES Low Period scan count */ + /** EES Low Period scan count */ t_u16 low_period_count; - /** Number of networks in the list */ + /** Number of networks in the list */ t_u8 network_count; - /** Maximum number of connection count */ + /** Maximum number of connection count */ t_u8 max_conn_count; - /** Black List Exp */ + /** Black List Exp */ t_u8 black_list_exp; - /** Array of ees config struct */ + /** Array of ees config struct */ ees_ssid_config ees_ssid_cfg[EES_MAX_SSIDS]; t_u8 random_mac[MLAN_MAC_ADDR_LENGTH]; } MLAN_PACK_END wlan_bgscan_cfg; @@ -1710,175 +1712,175 @@ typedef MLAN_PACK_START struct { * Structure used to store information for beacon/probe response */ typedef struct _BSSDescriptor_t { - /** MAC address */ + /** MAC address */ mlan_802_11_mac_addr mac_address; - /** SSID */ + /** SSID */ mlan_802_11_ssid ssid; - /** WEP encryption requirement */ + /** WEP encryption requirement */ t_u32 privacy; - /** Receive signal strength in dBm */ + /** Receive signal strength in dBm */ t_s32 rssi; - /** channel load */ + /** channel load */ t_u8 chan_load; - /** Channel */ + /** Channel */ t_u32 channel; - /** Freq */ + /** Freq */ t_u32 freq; - /** Beacon period */ + /** Beacon period */ t_u16 beacon_period; - /** ATIM window */ + /** ATIM window */ t_u32 atim_window; - /** ERP flags */ + /** ERP flags */ t_u8 erp_flags; - /** Type of network in use */ + /** Type of network in use */ WLAN_802_11_NETWORK_TYPE network_type_use; - /** Network infrastructure mode */ + /** Network infrastructure mode */ t_u32 bss_mode; - /** Network supported rates */ + /** Network supported rates */ WLAN_802_11_RATES supported_rates; - /** Supported data rates */ + /** Supported data rates */ t_u8 data_rates[WLAN_SUPPORTED_RATES]; - /** Current channel bandwidth - * 0 : 20MHZ - * 1 : 40MHZ - * 2 : 80MHZ - * 3 : 160MHZ - */ + /** Current channel bandwidth + * 0 : 20MHZ + * 1 : 40MHZ + * 2 : 80MHZ + * 3 : 160MHZ + */ t_u8 curr_bandwidth; - /** Network band. - * BAND_B(0x01): 'b' band - * BAND_G(0x02): 'g' band - * BAND_A(0X04): 'a' band - */ + /** Network band. + * BAND_B(0x01): 'b' band + * BAND_G(0x02): 'g' band + * BAND_A(0X04): 'a' band + */ t_u16 bss_band; - /** TSF timestamp from the current firmware TSF */ + /** TSF timestamp from the current firmware TSF */ t_u64 network_tsf; - /** TSF value included in the beacon/probe response */ + /** TSF value included in the beacon/probe response */ t_u8 time_stamp[8]; - /** PHY parameter set */ + /** PHY parameter set */ IEEEtypes_PhyParamSet_t phy_param_set; - /** SS parameter set */ + /** SS parameter set */ IEEEtypes_SsParamSet_t ss_param_set; - /** Capability information */ + /** Capability information */ IEEEtypes_CapInfo_t cap_info; - /** WMM IE */ + /** WMM IE */ IEEEtypes_WmmParameter_t wmm_ie; - /** 802.11h BSS information */ + /** 802.11h BSS information */ wlan_11h_bss_info_t wlan_11h_bss_info; - /** Indicate disabling 11n when associate with AP */ + /** Indicate disabling 11n when associate with AP */ t_u8 disable_11n; - /** 802.11n BSS information */ - /** HT Capabilities IE */ + /** 802.11n BSS information */ + /** HT Capabilities IE */ IEEEtypes_HTCap_t *pht_cap; - /** HT Capabilities Offset */ + /** HT Capabilities Offset */ t_u16 ht_cap_offset; - /** HT Information IE */ + /** HT Information IE */ IEEEtypes_HTInfo_t *pht_info; - /** HT Information Offset */ + /** HT Information Offset */ t_u16 ht_info_offset; - /** 20/40 BSS Coexistence IE */ + /** 20/40 BSS Coexistence IE */ IEEEtypes_2040BSSCo_t *pbss_co_2040; - /** 20/40 BSS Coexistence Offset */ + /** 20/40 BSS Coexistence Offset */ t_u16 bss_co_2040_offset; - /** Extended Capabilities IE */ + /** Extended Capabilities IE */ IEEEtypes_ExtCap_t *pext_cap; - /** Extended Capabilities Offset */ + /** Extended Capabilities Offset */ t_u16 ext_cap_offset; - /** Overlapping BSS Scan Parameters IE */ + /** Overlapping BSS Scan Parameters IE */ IEEEtypes_OverlapBSSScanParam_t *poverlap_bss_scan_param; - /** Overlapping BSS Scan Parameters Offset */ + /** Overlapping BSS Scan Parameters Offset */ t_u16 overlap_bss_offset; - /** VHT Capabilities IE */ + /** VHT Capabilities IE */ IEEEtypes_VHTCap_t *pvht_cap; - /** VHT Capabilities IE offset */ + /** VHT Capabilities IE offset */ t_u16 vht_cap_offset; - /** VHT Operations IE */ + /** VHT Operations IE */ IEEEtypes_VHTOprat_t *pvht_oprat; - /** VHT Operations IE offset */ + /** VHT Operations IE offset */ t_u16 vht_oprat_offset; - /** VHT Transmit Power Envelope IE */ + /** VHT Transmit Power Envelope IE */ IEEEtypes_VHTtxpower_t *pvht_txpower; - /** VHT Transmit Power Envelope IE offset */ + /** VHT Transmit Power Envelope IE offset */ t_u16 vht_txpower_offset; - /** Extended Power Constraint IE */ + /** Extended Power Constraint IE */ IEEEtypes_ExtPwerCons_t *pext_pwer; - /** Extended Power Constraint IE offset */ + /** Extended Power Constraint IE offset */ t_u16 ext_pwer_offset; - /** Extended BSS Load IE */ + /** Extended BSS Load IE */ IEEEtypes_ExtBSSload_t *pext_bssload; - /** Extended BSS Load IE offset */ + /** Extended BSS Load IE offset */ t_u16 ext_bssload_offset; - /** Quiet Channel IE */ + /** Quiet Channel IE */ IEEEtypes_QuietChan_t *pquiet_chan; - /** Quiet Channel IE offset */ + /** Quiet Channel IE offset */ t_u16 quiet_chan_offset; - /** Operating Mode Notification IE */ + /** Operating Mode Notification IE */ IEEEtypes_OperModeNtf_t *poper_mode; - /** Operating Mode Notification IE offset */ + /** Operating Mode Notification IE offset */ t_u16 oper_mode_offset; - /** HE Capability IE */ + /** HE Capability IE */ IEEEtypes_HECap_t *phe_cap; - /** HE Capability IE offset */ + /** HE Capability IE offset */ t_u16 he_cap_offset; - /** HE operation IE */ + /** HE operation IE */ IEEEtypes_Extension_t *phe_oprat; - /** HE operation IE offset */ + /** HE operation IE offset */ t_u16 he_oprat_offset; #ifdef STA_SUPPORT - /** Country information set */ + /** Country information set */ IEEEtypes_CountryInfoFullSet_t country_info; -#endif /* STA_SUPPORT */ +#endif /* STA_SUPPORT */ - /** WPA IE */ + /** WPA IE */ IEEEtypes_VendorSpecific_t *pwpa_ie; - /** WPA IE offset in the beacon buffer */ + /** WPA IE offset in the beacon buffer */ t_u16 wpa_offset; - /** RSN IE */ + /** RSN IE */ IEEEtypes_Generic_t *prsn_ie; - /** RSN IE offset in the beacon buffer */ + /** RSN IE offset in the beacon buffer */ t_u16 rsn_offset; #ifdef STA_SUPPORT - /** WAPI IE */ + /** WAPI IE */ IEEEtypes_Generic_t *pwapi_ie; - /** WAPI IE offset in the beacon buffer */ + /** WAPI IE offset in the beacon buffer */ t_u16 wapi_offset; #endif - /* Hotspot 2.0 OSEN AKM IE */ + /* Hotspot 2.0 OSEN AKM IE*/ IEEEtypes_Generic_t *posen_ie; - /** osen IE offset in the beacon buffer */ + /** osen IE offset in the beacon buffer */ t_u16 osen_offset; /* Mobility domain IE */ IEEEtypes_MobilityDomain_t *pmd_ie; /** Mobility domain IE offset in the beacon buffer */ t_u16 md_offset; - /** Pointer to the returned scan response */ + /** Pointer to the returned scan response */ t_u8 *pbeacon_buf; - /** Length of the stored scan response */ + /** Length of the stored scan response */ t_u32 beacon_buf_size; - /** Max allocated size for updated scan response */ + /** Max allocated size for updated scan response */ t_u32 beacon_buf_size_max; } BSSDescriptor_t, *pBSSDescriptor_t; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_init.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_init.c index 0affb781a95a..cccf90e01283 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_init.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_init.c @@ -65,8 +65,7 @@ extern mlan_operations *mlan_ops[]; * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_add_bsspriotbl(pmlan_private priv) +static mlan_status wlan_add_bsspriotbl(pmlan_private priv) { pmlan_adapter pmadapter = priv->adapter; mlan_bssprio_node *pbssprio = MNULL; @@ -89,14 +88,15 @@ wlan_add_bsspriotbl(pmlan_private 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; + 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); + 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; @@ -109,13 +109,12 @@ wlan_add_bsspriotbl(pmlan_private priv) * * @return N/A */ -static t_void -wlan_delete_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; + mlan_bssprio_node *pbssprio_node = MNULL, *ptmp_node = MNULL, + **ppcur = MNULL; pmlan_list_head phead; ENTER(); @@ -127,16 +126,10 @@ wlan_delete_bsspriotbl(pmlan_private priv) "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); + 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; @@ -144,19 +137,16 @@ wlan_delete_bsspriotbl(pmlan_private 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); + 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; } @@ -175,8 +165,7 @@ wlan_delete_bsspriotbl(pmlan_private priv) * @return MLAN_STATUS_SUCCESS * */ -static mlan_status -vdll_init(pmlan_adapter pmadapter) +static mlan_status vdll_init(pmlan_adapter pmadapter) { mlan_status status = MLAN_STATUS_SUCCESS; vdll_dnld_ctrl *ctrl = &pmadapter->vdll_ctrl; @@ -199,7 +188,6 @@ vdll_init(pmlan_adapter pmadapter) LEAVE(); return status; } - /** * @brief The function handles VDLL deinit * @@ -208,8 +196,7 @@ vdll_init(pmlan_adapter pmadapter) * @return MLAN_STATUS_SUCCESS * */ -static t_void -vdll_deinit(pmlan_adapter pmadapter) +static t_void vdll_deinit(pmlan_adapter pmadapter) { pmlan_callbacks pcb = &pmadapter->callbacks; ENTER(); @@ -245,21 +232,17 @@ vdll_deinit(pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_allocate_adapter(pmlan_adapter pmadapter) +mlan_status wlan_allocate_adapter(pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; #ifdef STA_SUPPORT t_u32 beacon_buffer_size; t_u32 buf_size; BSSDescriptor_t *ptemp_scan_table = MNULL; - t_u8 chan_2g[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }; - t_u8 chan_5g[] = { - 12, 16, 34, 38, 42, 46, 36, 40, 44, - 48, 52, 56, 60, 64, 100, 104, 108, - 112, 116, 120, 124, 128, 132, 136, - 140, 144, 149, 153, 157, 161, 165 - }; + t_u8 chan_2g[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}; + t_u8 chan_5g[] = {12, 16, 34, 38, 42, 46, 36, 40, 44, 48, 52, + 56, 60, 64, 100, 104, 108, 112, 116, 120, 124, 128, + 132, 136, 140, 144, 149, 153, 157, 161, 165}; #endif #ifdef SDIO t_u32 max_mp_regs = 0; @@ -282,15 +265,13 @@ wlan_allocate_adapter(pmlan_adapter pmadapter) 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); + 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); + 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(); @@ -317,15 +298,13 @@ wlan_allocate_adapter(pmlan_adapter pmadapter) buf_size = sizeof(ChanStatistics_t) * pmadapter->num_in_chan_stats; if (pmadapter->callbacks.moal_vmalloc && pmadapter->callbacks.moal_vfree) - ret = pmadapter->callbacks.moal_vmalloc(pmadapter->pmoal_handle, - buf_size, - (t_u8 **)&pmadapter-> - pchan_stats); + ret = pmadapter->callbacks.moal_vmalloc( + pmadapter->pmoal_handle, buf_size, + (t_u8 **)&pmadapter->pchan_stats); else - ret = pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, - buf_size, MLAN_MEM_DEF, - (t_u8 **)&pmadapter-> - pchan_stats); + ret = pmadapter->callbacks.moal_malloc( + pmadapter->pmoal_handle, buf_size, MLAN_MEM_DEF, + (t_u8 **)&pmadapter->pchan_stats); if (ret != MLAN_STATUS_SUCCESS || !pmadapter->pchan_stats) { PRINTM(MERROR, "Failed to allocate channel statistics\n"); LEAVE(); @@ -340,31 +319,26 @@ wlan_allocate_adapter(pmlan_adapter pmadapter) LEAVE(); return MLAN_STATUS_FAILURE; } + #ifdef SDIO if (IS_SD(pmadapter->card_type)) { - ret = pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, - max_mp_regs + - DMA_ALIGNMENT, - MLAN_MEM_DEF | - MLAN_MEM_DMA, - (t_u8 **)&pmadapter-> - pcard_sd->mp_regs_buf); + ret = pmadapter->callbacks.moal_malloc( + pmadapter->pmoal_handle, max_mp_regs + DMA_ALIGNMENT, + MLAN_MEM_DEF | MLAN_MEM_DMA, + (t_u8 **)&pmadapter->pcard_sd->mp_regs_buf); if (ret != MLAN_STATUS_SUCCESS || !pmadapter->pcard_sd->mp_regs_buf) { PRINTM(MERROR, "Failed to allocate mp_regs_buf\n"); LEAVE(); return MLAN_STATUS_FAILURE; } - pmadapter->pcard_sd->mp_regs = - (t_u8 *)ALIGN_ADDR(pmadapter->pcard_sd->mp_regs_buf, - DMA_ALIGNMENT); + pmadapter->pcard_sd->mp_regs = (t_u8 *)ALIGN_ADDR( + pmadapter->pcard_sd->mp_regs_buf, DMA_ALIGNMENT); - ret = pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, - MAX_SUPPORT_AMSDU_SIZE, - MLAN_MEM_DEF | - MLAN_MEM_DMA, - (t_u8 **)&pmadapter-> - pcard_sd->rx_buffer); + ret = pmadapter->callbacks.moal_malloc( + pmadapter->pmoal_handle, MAX_SUPPORT_AMSDU_SIZE, + MLAN_MEM_DEF | MLAN_MEM_DMA, + (t_u8 **)&pmadapter->pcard_sd->rx_buffer); if (ret != MLAN_STATUS_SUCCESS || !pmadapter->pcard_sd->rx_buffer) { @@ -372,15 +346,13 @@ wlan_allocate_adapter(pmlan_adapter pmadapter) LEAVE(); return MLAN_STATUS_FAILURE; } - pmadapter->pcard_sd->rx_buf = - (t_u8 *)ALIGN_ADDR(pmadapter->pcard_sd->rx_buffer, - DMA_ALIGNMENT); + pmadapter->pcard_sd->rx_buf = (t_u8 *)ALIGN_ADDR( + pmadapter->pcard_sd->rx_buffer, DMA_ALIGNMENT); pmadapter->pcard_sd->max_sp_tx_size = MAX_SUPPORT_AMSDU_SIZE; pmadapter->pcard_sd->max_sp_rx_size = MAX_SUPPORT_AMSDU_SIZE; - ret = wlan_alloc_sdio_mpa_buffers(pmadapter, - mp_tx_aggr_buf_size, - mp_rx_aggr_buf_size); + ret = wlan_alloc_sdio_mpa_buffers( + pmadapter, mp_tx_aggr_buf_size, mp_rx_aggr_buf_size); if (ret != MLAN_STATUS_SUCCESS) { PRINTM(MERROR, "Failed to allocate sdio mp-a buffers\n"); @@ -394,19 +366,16 @@ wlan_allocate_adapter(pmlan_adapter pmadapter) MLAN_SDIO_BLOCK_SIZE; if (pmadapter->callbacks.moal_vmalloc && pmadapter->callbacks.moal_vfree) - ret = pmadapter->callbacks. - moal_vmalloc(pmadapter->pmoal_handle, - pmadapter->pcard_sd-> - mpa_buf_size, - (t_u8 **)&pmadapter-> - pcard_sd->mpa_buf); + ret = pmadapter->callbacks.moal_vmalloc( + pmadapter->pmoal_handle, + pmadapter->pcard_sd->mpa_buf_size, + (t_u8 **)&pmadapter->pcard_sd->mpa_buf); else - ret = pmadapter->callbacks. - moal_malloc(pmadapter->pmoal_handle, - pmadapter->pcard_sd-> - mpa_buf_size, MLAN_MEM_DEF, - (t_u8 **)&pmadapter-> - pcard_sd->mpa_buf); + ret = pmadapter->callbacks.moal_malloc( + pmadapter->pmoal_handle, + pmadapter->pcard_sd->mpa_buf_size, + MLAN_MEM_DEF, + (t_u8 **)&pmadapter->pcard_sd->mpa_buf); if (ret != MLAN_STATUS_SUCCESS || !pmadapter->pcard_sd->mpa_buf) { PRINTM(MERROR, "Failed to allocate mpa buf\n"); @@ -449,8 +418,7 @@ wlan_allocate_adapter(pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_init_priv(pmlan_private priv) +mlan_status wlan_init_priv(pmlan_private priv) { t_u32 i; pmlan_adapter pmadapter = priv->adapter; @@ -467,7 +435,7 @@ wlan_init_priv(pmlan_private priv) #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->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; @@ -479,11 +447,10 @@ wlan_init_priv(pmlan_private priv) memset(pmadapter, &priv->wep_key[i], 0, sizeof(mrvl_wep_key_t)); priv->wep_key_curr_index = 0; priv->ewpa_query = MFALSE; - priv->curr_pkt_filter = - HostCmd_ACT_MAC_STATIC_DYNAMIC_BW_ENABLE | - HostCmd_ACT_MAC_RTS_CTS_ENABLE | - HostCmd_ACT_MAC_RX_ON | HostCmd_ACT_MAC_TX_ON | - HostCmd_ACT_MAC_ETHERNETII_ENABLE; + priv->curr_pkt_filter = HostCmd_ACT_MAC_STATIC_DYNAMIC_BW_ENABLE | + HostCmd_ACT_MAC_RTS_CTS_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; @@ -591,7 +558,7 @@ wlan_init_priv(pmlan_private priv) priv->add_ba_param.rx_win_size = MLAN_UAP_AMPDU_DEF_RXWINSIZE; priv->aggr_prio_tbl[6].ampdu_user = priv->aggr_prio_tbl[7].ampdu_user = - BA_STREAM_NOT_ALLOWED; + BA_STREAM_NOT_ALLOWED; } #endif priv->user_rxwinsize = priv->add_ba_param.rx_win_size; @@ -604,9 +571,8 @@ wlan_init_priv(pmlan_private priv) if (IS_USB(pmadapter->card_type)) { pusb_tx_aggr = wlan_get_usb_tx_aggr_params(pmadapter, priv->port); - if (pusb_tx_aggr && - pusb_tx_aggr->aggr_ctrl.aggr_mode == - MLAN_USB_AGGR_MODE_LEN_V2) { + if (pusb_tx_aggr && pusb_tx_aggr->aggr_ctrl.aggr_mode == + MLAN_USB_AGGR_MODE_LEN_V2) { priv->intf_hr_len = MLAN_USB_TX_AGGR_HEADER; } priv->port = pmadapter->tx_data_ep; @@ -629,8 +595,7 @@ wlan_init_priv(pmlan_private priv) * * @return N/A */ -t_void -wlan_init_adapter(pmlan_adapter pmadapter) +t_void wlan_init_adapter(pmlan_adapter pmadapter) { opt_sleep_confirm_buffer *sleep_cfm_buf = MNULL; #ifdef USB @@ -639,11 +604,9 @@ wlan_init_adapter(pmlan_adapter pmadapter) ENTER(); if (pmadapter->psleep_cfm) { - 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) @@ -754,7 +717,8 @@ wlan_init_adapter(pmlan_adapter pmadapter) if (!pmadapter->multiple_dtim) pmadapter->multiple_dtim = MRVDRV_DEFAULT_MULTIPLE_DTIM; - pmadapter->local_listen_interval = 0; /* default value in firmware will be used */ + pmadapter->local_listen_interval = 0; /* default value in firmware will + be used */ #endif /* STA_SUPPORT */ pmadapter->is_deep_sleep = MFALSE; @@ -770,8 +734,10 @@ wlan_init_adapter(pmlan_adapter pmadapter) 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->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; @@ -791,14 +757,16 @@ wlan_init_adapter(pmlan_adapter pmadapter) for (i = 0; i < MAX_USB_TX_PORT_NUM; i++) { pmadapter->pcard_usb->usb_tx_aggr[i].aggr_ctrl.enable = MFALSE; - pmadapter->pcard_usb->usb_tx_aggr[i].aggr_ctrl. - aggr_mode = MLAN_USB_AGGR_MODE_LEN_V2; - pmadapter->pcard_usb->usb_tx_aggr[i].aggr_ctrl. - aggr_align = MLAN_USB_TX_AGGR_V2_ALIGN; - pmadapter->pcard_usb->usb_tx_aggr[i].aggr_ctrl. - aggr_max = MLAN_USB_TX_AGGR_MAX_LEN; - pmadapter->pcard_usb->usb_tx_aggr[i].aggr_ctrl. - aggr_tmo = MLAN_USB_TX_AGGR_TIMEOUT_MSEC * 1000; + pmadapter->pcard_usb->usb_tx_aggr[i] + .aggr_ctrl.aggr_mode = + MLAN_USB_AGGR_MODE_LEN_V2; + pmadapter->pcard_usb->usb_tx_aggr[i] + .aggr_ctrl.aggr_align = + MLAN_USB_TX_AGGR_V2_ALIGN; + pmadapter->pcard_usb->usb_tx_aggr[i].aggr_ctrl.aggr_max = + MLAN_USB_TX_AGGR_MAX_LEN; + pmadapter->pcard_usb->usb_tx_aggr[i].aggr_ctrl.aggr_tmo = + MLAN_USB_TX_AGGR_TIMEOUT_MSEC * 1000; pmadapter->pcard_usb->usb_tx_aggr[i].pmbuf_aggr = MNULL; pmadapter->pcard_usb->usb_tx_aggr[i].aggr_len = 0; @@ -908,8 +876,8 @@ wlan_init_adapter(pmlan_adapter pmadapter) #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { pmadapter->pcard_pcie->rxbd_wrptr = - pmadapter->pcard_pcie->reg-> - txrx_rw_ptr_rollover_ind; + pmadapter->pcard_pcie->reg + ->txrx_rw_ptr_rollover_ind; pmadapter->pcard_pcie->evtbd_wrptr = EVT_RW_PTR_ROLLOVER_IND; } @@ -937,8 +905,8 @@ wlan_init_adapter(pmlan_adapter pmadapter) * otherwise MLAN_STATUS_FAILURE * */ -mlan_status -wlan_init_priv_lock_list(IN pmlan_adapter pmadapter, t_u8 start_index) +mlan_status wlan_init_priv_lock_list(IN pmlan_adapter pmadapter, + t_u8 start_index) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_private priv = MNULL; @@ -948,25 +916,22 @@ wlan_init_priv_lock_list(IN pmlan_adapter pmadapter, t_u8 start_index) for (i = start_index; 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) { + 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) { + 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) { + if (pcb->moal_init_lock(pmadapter->pmoal_handle, + &priv->curr_bcn_buf_lock) != + MLAN_STATUS_SUCCESS) { ret = MLAN_STATUS_FAILURE; goto error; } @@ -984,21 +949,20 @@ wlan_init_priv_lock_list(IN pmlan_adapter pmadapter, t_u8 start_index) 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->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_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, @@ -1008,15 +972,15 @@ wlan_init_priv_lock_list(IN pmlan_adapter pmadapter, t_u8 start_index) 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); + 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); + util_init_list_head( + (t_void *)pmadapter->pmoal_handle, + &priv->bypass_txq, MTRUE, + pmadapter->callbacks.moal_init_lock); } } error: @@ -1034,8 +998,7 @@ error: * otherwise MLAN_STATUS_FAILURE * */ -mlan_status -wlan_init_lock_list(IN pmlan_adapter pmadapter) +mlan_status wlan_init_lock_list(IN pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -1044,48 +1007,48 @@ wlan_init_lock_list(IN pmlan_adapter pmadapter) #endif ENTER(); - if (pcb->moal_init_lock(pmadapter->pmoal_handle, &pmadapter->pmlan_lock) - != MLAN_STATUS_SUCCESS) { + if (pcb->moal_init_lock(pmadapter->pmoal_handle, + &pmadapter->pmlan_lock) != + MLAN_STATUS_SUCCESS) { ret = MLAN_STATUS_FAILURE; goto error; } #if defined(SDIO) || defined(PCIE) if (!IS_USB(pmadapter->card_type)) { - if (pcb-> - moal_init_lock(pmadapter->pmoal_handle, - &pmadapter->pint_lock) - != MLAN_STATUS_SUCCESS) { + if (pcb->moal_init_lock(pmadapter->pmoal_handle, + &pmadapter->pint_lock) != + MLAN_STATUS_SUCCESS) { ret = MLAN_STATUS_FAILURE; goto error; } } #endif - if (pcb-> - moal_init_lock(pmadapter->pmoal_handle, &pmadapter->pmain_proc_lock) - != MLAN_STATUS_SUCCESS) { + 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->prx_proc_lock) - != MLAN_STATUS_SUCCESS) { + if (pcb->moal_init_lock(pmadapter->pmoal_handle, + &pmadapter->prx_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) { + if (pcb->moal_init_lock(pmadapter->pmoal_handle, + &pmadapter->pmlan_cmd_lock) != + MLAN_STATUS_SUCCESS) { ret = MLAN_STATUS_FAILURE; goto error; } #if defined(USB) if (IS_USB(pmadapter->card_type)) { for (i = 0; i < MAX_USB_TX_PORT_NUM; i++) { - if (pcb-> - moal_init_lock(pmadapter->pmoal_handle, - &pmadapter->pcard_usb-> - usb_tx_aggr[i].paggr_lock) - != MLAN_STATUS_SUCCESS) { + if (pcb->moal_init_lock(pmadapter->pmoal_handle, + &pmadapter->pcard_usb + ->usb_tx_aggr[i] + .paggr_lock) != + MLAN_STATUS_SUCCESS) { ret = MLAN_STATUS_FAILURE; goto error; } @@ -1097,8 +1060,8 @@ wlan_init_lock_list(IN pmlan_adapter pmadapter) &pmadapter->rx_data_queue, MTRUE, pmadapter->callbacks.moal_init_lock); util_scalar_init((t_void *)pmadapter->pmoal_handle, - &pmadapter->pending_bridge_pkts, 0, - MNULL, pmadapter->callbacks.moal_init_lock); + &pmadapter->pending_bridge_pkts, 0, MNULL, + pmadapter->callbacks.moal_init_lock); /* Initialize cmd_free_q */ util_init_list_head((t_void *)pmadapter->pmoal_handle, &pmadapter->cmd_free_q, MTRUE, @@ -1130,8 +1093,7 @@ error: * @return None * */ -t_void -wlan_free_lock_list(IN pmlan_adapter pmadapter) +t_void wlan_free_lock_list(IN pmlan_adapter pmadapter) { pmlan_private priv = MNULL; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -1162,8 +1124,9 @@ wlan_free_lock_list(IN pmlan_adapter pmadapter) for (i = 0; i < MAX_USB_TX_PORT_NUM; i++) { if (pmadapter->pcard_usb->usb_tx_aggr[i].paggr_lock) pcb->moal_free_lock(pmadapter->pmoal_handle, - pmadapter->pcard_usb-> - usb_tx_aggr[i].paggr_lock); + pmadapter->pcard_usb + ->usb_tx_aggr[i] + .paggr_lock); } } #endif @@ -1215,39 +1178,35 @@ wlan_free_lock_list(IN pmlan_adapter pmadapter) 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); + 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); + 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); } } @@ -1264,8 +1223,7 @@ wlan_free_lock_list(IN pmlan_adapter pmadapter) * otherwise MLAN_STATUS_FAILURE * */ -mlan_status -wlan_init_timer(IN pmlan_adapter pmadapter) +mlan_status wlan_init_timer(IN pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -1274,36 +1232,32 @@ wlan_init_timer(IN pmlan_adapter pmadapter) #endif ENTER(); - if (pcb-> - moal_init_timer(pmadapter->pmoal_handle, - &pmadapter->pmlan_cmd_timer, wlan_cmd_timeout_func, - pmadapter) - != MLAN_STATUS_SUCCESS) { + 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; } #if defined(USB) if (IS_USB(pmadapter->card_type)) { for (i = 0; i < MAX_USB_TX_PORT_NUM; i++) { - if (pcb-> - moal_init_timer(pmadapter->pmoal_handle, - &pmadapter->pcard_usb-> - usb_tx_aggr[i].paggr_hold_timer, - wlan_usb_tx_aggr_timeout_func, - &pmadapter->pcard_usb-> - usb_tx_aggr[i]) - != MLAN_STATUS_SUCCESS) { + if (pcb->moal_init_timer( + pmadapter->pmoal_handle, + &pmadapter->pcard_usb->usb_tx_aggr[i] + .paggr_hold_timer, + wlan_usb_tx_aggr_timeout_func, + &pmadapter->pcard_usb->usb_tx_aggr[i]) != + MLAN_STATUS_SUCCESS) { ret = MLAN_STATUS_FAILURE; goto error; } } } #endif - if (pcb-> - moal_init_timer(pmadapter->pmoal_handle, - &pmadapter->pwakeup_fw_timer, - wlan_wakeup_card_timeout_func, pmadapter) - != MLAN_STATUS_SUCCESS) { + if (pcb->moal_init_timer(pmadapter->pmoal_handle, + &pmadapter->pwakeup_fw_timer, + wlan_wakeup_card_timeout_func, + pmadapter) != MLAN_STATUS_SUCCESS) { ret = MLAN_STATUS_FAILURE; goto error; } @@ -1321,8 +1275,7 @@ error: * @return None * */ -t_void -wlan_free_timer(IN pmlan_adapter pmadapter) +t_void wlan_free_timer(IN pmlan_adapter pmadapter) { pmlan_callbacks pcb = &pmadapter->callbacks; #if defined(USB) @@ -1336,12 +1289,12 @@ wlan_free_timer(IN pmlan_adapter pmadapter) #if defined(USB) if (IS_USB(pmadapter->card_type)) { for (i = 0; i < MAX_USB_TX_PORT_NUM; i++) { - if (pmadapter->pcard_usb->usb_tx_aggr[i]. - paggr_hold_timer) + if (pmadapter->pcard_usb->usb_tx_aggr[i] + .paggr_hold_timer) pcb->moal_free_timer(pmadapter->pmoal_handle, - pmadapter->pcard_usb-> - usb_tx_aggr[i]. - paggr_hold_timer); + pmadapter->pcard_usb + ->usb_tx_aggr[i] + .paggr_hold_timer); } } #endif @@ -1359,10 +1312,10 @@ wlan_free_timer(IN pmlan_adapter pmadapter) * * @param pmadapter A pointer to mlan_adapter * - * @return MLAN_STATUS_SUCCESS, MLAN_STATUS_PENDING or MLAN_STATUS_FAILURE + * @return MLAN_STATUS_SUCCESS, MLAN_STATUS_PENDING or + * MLAN_STATUS_FAILURE */ -mlan_status -wlan_init_fw(IN pmlan_adapter pmadapter) +mlan_status wlan_init_fw(IN pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; #ifdef PCIE @@ -1416,10 +1369,10 @@ done: * * @param pmadapter A pointer to mlan_adapter * - * @return MLAN_STATUS_SUCCESS, MLAN_STATUS_PENDING or MLAN_STATUS_FAILURE + * @return MLAN_STATUS_SUCCESS, MLAN_STATUS_PENDING or + * MLAN_STATUS_FAILURE */ -void -wlan_update_hw_spec(IN pmlan_adapter pmadapter) +void wlan_update_hw_spec(IN pmlan_adapter pmadapter) { t_u32 i; @@ -1497,8 +1450,8 @@ wlan_update_hw_spec(IN pmlan_adapter pmadapter) for (i = 0; i < pmadapter->priv_num; i++) { if (pmadapter->priv[i]) pmadapter->priv[i]->tx_bf_cap = - pmadapter->pcard_info-> - default_11n_tx_bf_cap; + pmadapter->pcard_info + ->default_11n_tx_bf_cap; } } for (i = 0; i < pmadapter->priv_num; i++) { @@ -1524,16 +1477,16 @@ wlan_update_hw_spec(IN pmlan_adapter pmadapter) pmadapter->priv[i]->user_2g_he_cap, pmadapter->hw_2g_he_cap, pmadapter->hw_2g_hecap_len, - sizeof(pmadapter->priv[i]-> - user_2g_he_cap)); + sizeof(pmadapter->priv[i] + ->user_2g_he_cap)); pmadapter->priv[i]->user_hecap_len = pmadapter->hw_hecap_len; - memcpy_ext(pmadapter, - pmadapter->priv[i]->user_he_cap, - pmadapter->hw_he_cap, - pmadapter->hw_hecap_len, - sizeof(pmadapter->priv[i]-> - user_he_cap)); + memcpy_ext( + pmadapter, + pmadapter->priv[i]->user_he_cap, + pmadapter->hw_he_cap, + pmadapter->hw_hecap_len, + sizeof(pmadapter->priv[i]->user_he_cap)); } } } @@ -1546,10 +1499,10 @@ wlan_update_hw_spec(IN pmlan_adapter pmadapter) * * @param pmadapter A pointer to mlan_adapter * - * @return MLAN_STATUS_SUCCESS, MLAN_STATUS_PENDING or MLAN_STATUS_FAILURE + * @return MLAN_STATUS_SUCCESS, MLAN_STATUS_PENDING or + * MLAN_STATUS_FAILURE */ -mlan_status -wlan_init_priv_fw(IN pmlan_adapter pmadapter) +mlan_status wlan_init_priv_fw(IN pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_private priv = MNULL; @@ -1618,8 +1571,7 @@ done: * * @return N/A */ -t_void -wlan_free_adapter(pmlan_adapter pmadapter) +t_void wlan_free_adapter(pmlan_adapter pmadapter) { mlan_callbacks *pcb = (mlan_callbacks *)&pmadapter->callbacks; #if defined(USB) @@ -1647,15 +1599,15 @@ wlan_free_adapter(pmlan_adapter pmadapter) #if defined(USB) if (IS_USB(pmadapter->card_type)) { for (i = 0; i < MAX_USB_TX_PORT_NUM; i++) { - if (pmadapter->pcard_usb->usb_tx_aggr[i]. - aggr_hold_timer_is_set) { + if (pmadapter->pcard_usb->usb_tx_aggr[i] + .aggr_hold_timer_is_set) { /* Cancel usb_tx_aggregation timeout timer */ pcb->moal_stop_timer(pmadapter->pmoal_handle, - pmadapter->pcard_usb-> - usb_tx_aggr[i]. - paggr_hold_timer); - pmadapter->pcard_usb->usb_tx_aggr[i]. - aggr_hold_timer_is_set = MFALSE; + pmadapter->pcard_usb + ->usb_tx_aggr[i] + .paggr_hold_timer); + pmadapter->pcard_usb->usb_tx_aggr[i] + .aggr_hold_timer_is_set = MFALSE; } } } @@ -1699,9 +1651,9 @@ wlan_free_adapter(pmlan_adapter pmadapter) #ifdef SDIO if (IS_SD(pmadapter->card_type)) { if (pmadapter->pcard_sd->mp_regs_buf) { - pcb->moal_mfree(pmadapter->pmoal_handle, - (t_u8 *)pmadapter->pcard_sd-> - mp_regs_buf); + pcb->moal_mfree( + pmadapter->pmoal_handle, + (t_u8 *)pmadapter->pcard_sd->mp_regs_buf); pmadapter->pcard_sd->mp_regs_buf = MNULL; pmadapter->pcard_sd->mp_regs = MNULL; } @@ -1715,13 +1667,13 @@ wlan_free_adapter(pmlan_adapter pmadapter) #ifdef DEBUG_LEVEL1 if (pmadapter->pcard_sd->mpa_buf) { if (pcb->moal_vmalloc && pcb->moal_vfree) - pcb->moal_vfree(pmadapter->pmoal_handle, - (t_u8 *)pmadapter->pcard_sd-> - mpa_buf); + pcb->moal_vfree( + pmadapter->pmoal_handle, + (t_u8 *)pmadapter->pcard_sd->mpa_buf); else - pcb->moal_mfree(pmadapter->pmoal_handle, - (t_u8 *)pmadapter->pcard_sd-> - mpa_buf); + pcb->moal_mfree( + pmadapter->pmoal_handle, + (t_u8 *)pmadapter->pcard_sd->mpa_buf); pmadapter->pcard_sd->mpa_buf = MNULL; pmadapter->pcard_sd->mpa_buf_size = 0; } @@ -1781,8 +1733,7 @@ wlan_free_adapter(pmlan_adapter pmadapter) * * @return N/A */ -t_void -wlan_free_priv(mlan_private *pmpriv) +t_void wlan_free_priv(mlan_private *pmpriv) { ENTER(); wlan_clean_txrx(pmpriv); @@ -1794,7 +1745,7 @@ wlan_free_priv(mlan_private *pmpriv) #if defined(DRV_EMBEDDED_AUTHENTICATOR) || defined(DRV_EMBEDDED_SUPPLICANT) hostsa_cleanup(pmpriv); -#endif /*EMBEDDED AUTHENTICATOR */ +#endif /*EMBEDDED AUTHENTICATOR*/ wlan_delete_station_list(pmpriv); LEAVE(); @@ -1807,8 +1758,7 @@ wlan_free_priv(mlan_private *pmpriv) * * @return N/A */ -mlan_status -wlan_init_interface(IN pmlan_adapter pmadapter) +mlan_status wlan_init_interface(IN pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = MNULL; @@ -1821,24 +1771,19 @@ wlan_init_interface(IN pmlan_adapter pmadapter) for (i = 0; i < MLAN_MAX_BSS_NUM; i++) { if (pmadapter->bss_attr[i].active == MTRUE) { if (!pmadapter->priv[i]) { - /* For valid bss_attr, allocate memory for private structure */ + /* 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]); + 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]); + 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; @@ -1894,7 +1839,7 @@ wlan_init_interface(IN pmlan_adapter pmadapter) } } } - /*wmm init */ + /*wmm init*/ wlan_wmm_init(pmadapter); /* Initialize firmware, may return PENDING */ ret = wlan_init_priv_fw(pmadapter); @@ -1912,8 +1857,7 @@ error: * @return MLAN_STATUS_SUCCESS * The firmware initialization callback succeeded. */ -mlan_status -wlan_get_hw_spec_complete(IN pmlan_adapter pmadapter) +mlan_status wlan_get_hw_spec_complete(IN pmlan_adapter pmadapter) { mlan_status status = MLAN_STATUS_SUCCESS; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1964,8 +1908,7 @@ wlan_get_hw_spec_complete(IN pmlan_adapter pmadapter) * @return MLAN_STATUS_SUCCESS * The firmware initialization callback succeeded. */ -mlan_status -wlan_init_fw_complete(IN pmlan_adapter pmadapter) +mlan_status wlan_init_fw_complete(IN pmlan_adapter pmadapter) { mlan_status status = MLAN_STATUS_SUCCESS; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1977,12 +1920,12 @@ wlan_init_fw_complete(IN pmlan_adapter pmadapter) if (pmadapter->hw_status != WlanHardwareStatusReady) status = MLAN_STATUS_FAILURE; - /* Reconfigure wmm parameter */ + /* Reconfigure wmm parameter*/ if (status == MLAN_STATUS_SUCCESS) { - wlan_prepare_cmd(wlan_get_priv(pmadapter, MLAN_BSS_ROLE_STA), - HostCmd_CMD_WMM_PARAM_CONFIG, - HostCmd_ACT_GEN_SET, 0, MNULL, - &pmadapter->ac_params); + status = wlan_prepare_cmd( + wlan_get_priv(pmadapter, MLAN_BSS_ROLE_STA), + HostCmd_CMD_WMM_PARAM_CONFIG, HostCmd_ACT_GEN_SET, 0, + MNULL, &pmadapter->ac_params); } /* Invoke callback */ ret = pcb->moal_init_fw_complete(pmadapter->pmoal_handle, status); @@ -1999,8 +1942,7 @@ wlan_init_fw_complete(IN pmlan_adapter pmadapter) * @return MLAN_STATUS_SUCCESS * The firmware shutdown callback succeeded. */ -mlan_status -wlan_shutdown_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; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_init.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_init.h index eaa3b973e32f..f32731b6c788 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_init.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_init.h @@ -30,77 +30,77 @@ Change log: #define _MLAN_INIT_H_ /** Tx buffer size for firmware download*/ -#define FW_DNLD_TX_BUF_SIZE 2312 +#define FW_DNLD_TX_BUF_SIZE 2312 /** Rx buffer size for firmware download*/ -#define FW_DNLD_RX_BUF_SIZE 2048 +#define FW_DNLD_RX_BUF_SIZE 2048 /** Max firmware retry */ -#define MAX_FW_RETRY 3 +#define MAX_FW_RETRY 3 /** Firmware has last block */ -#define FW_HAS_LAST_BLOCK 0x00000004 +#define FW_HAS_LAST_BLOCK 0x00000004 /** CMD id for CMD4 */ -#define FW_CMD_4 0x00000004 +#define FW_CMD_4 0x00000004 /** CMD id for CMD6 */ -#define FW_CMD_6 0x00000006 +#define FW_CMD_6 0x00000006 /** CMD id for CMD7 */ -#define FW_CMD_7 0x00000007 +#define FW_CMD_7 0x00000007 /** CMD id for CMD10 */ -#define FW_CMD_10 0x0000000a +#define FW_CMD_10 0x0000000a /** Firmware data transmit size */ #define FW_DATA_XMIT_SIZE (sizeof(FWHeader) + DataLength + sizeof(t_u32)) /** FWHeader */ typedef MLAN_PACK_START struct _FWHeader { - /** FW download command */ + /** FW download command */ t_u32 dnld_cmd; - /** FW base address */ + /** FW base address */ t_u32 base_addr; - /** FW data length */ + /** FW data length */ t_u32 data_length; - /** FW CRC */ + /** FW CRC */ t_u32 crc; } MLAN_PACK_END FWHeader; /** FWData */ typedef MLAN_PACK_START struct _FWData { - /** FW data header */ + /** FW data header */ FWHeader fw_header; - /** FW data sequence number */ + /** FW data sequence number */ t_u32 seq_num; - /** FW data buffer */ + /** FW data buffer */ t_u8 data[1]; } MLAN_PACK_END FWData; /** FWSyncHeader */ typedef MLAN_PACK_START struct _FWSyncHeader { - /** FW sync header command */ + /** FW sync header command */ t_u32 cmd; - /** FW sync header sequence number */ + /** FW sync header sequence number */ t_u32 seq_num; - /** Extended header */ + /** Extended header */ t_u32 magic; - /** Chip rev */ + /** Chip rev */ t_u32 chip_rev; - /** Strap */ + /** Strap */ t_u32 strap; - /** Status */ + /** Status */ t_u32 status; - /** Offset */ + /** Offset */ t_u32 offset; } MLAN_PACK_END FWSyncHeader; /** FW Sync pkt */ typedef MLAN_PACK_START struct _FWSyncPkt { - /** pkt type */ + /** pkt type */ t_u32 pkt_type; - /** FW sync header command */ + /** FW sync header command */ t_u32 cmd; - /** FW sync header sequence number */ + /** FW sync header sequence number */ t_u32 seq_num; - /** chip rev */ + /** chip rev */ t_u32 chip_rev; - /** fw status */ + /** fw status */ t_u32 fw_ready; } MLAN_PACK_END FWSyncPkt; @@ -108,11 +108,12 @@ typedef MLAN_PACK_START struct _FWSyncPkt { /** Convert sequence number and command fields * of fwheader to correct endian format */ -#define endian_convert_syncfwheader(x) { \ - (x)->cmd = wlan_le32_to_cpu((x)->cmd); \ - (x)->seq_num = wlan_le32_to_cpu((x)->seq_num); \ - (x)->status = wlan_le32_to_cpu((x)->status); \ - (x)->offset = wlan_le32_to_cpu((x)->offset); \ +#define endian_convert_syncfwheader(x) \ + { \ + (x)->cmd = wlan_le32_to_cpu((x)->cmd); \ + (x)->seq_num = wlan_le32_to_cpu((x)->seq_num); \ + (x)->status = wlan_le32_to_cpu((x)->status); \ + (x)->offset = wlan_le32_to_cpu((x)->offset); \ } #else /** Convert sequence number and command fields diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_ioctl.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_ioctl.h index 1bd134cbf240..9aba784de4b3 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_ioctl.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_ioctl.h @@ -228,6 +228,7 @@ enum _mlan_ioctl_req_id { MLAN_OID_11H_CHAN_REPORT_REQUEST = 0x00110004, MLAN_OID_11H_CHAN_SWITCH_COUNT = 0x00110005, MLAN_OID_11H_CHAN_NOP_INFO = 0x00110006, + MLAN_OID_11H_DFS_W53_CFG = 0x00110008, /* 802.11n Configuration Group RANDYTODO for value assign */ MLAN_IOCTL_11AC_CFG = 0x00120000, @@ -239,6 +240,7 @@ enum _mlan_ioctl_req_id { MLAN_IOCTL_11AX_CFG = 0x00170000, MLAN_OID_11AX_HE_CFG = 0x00170001, MLAN_OID_11AX_CMD_CFG = 0x00170002, + MLAN_OID_11AX_TWT_CFG = 0x00170003, /* Miscellaneous Configuration Group */ MLAN_IOCTL_MISC_CFG = 0x00200000, @@ -324,7 +326,7 @@ enum _mlan_ioctl_req_id { }; /** Sub command size */ -#define MLAN_SUB_COMMAND_SIZE 4 +#define MLAN_SUB_COMMAND_SIZE 4 /** Enumeration for the action of IOCTL request */ enum _mlan_act_ioctl { @@ -337,10 +339,7 @@ enum _mlan_act_ioctl { }; /** Enumeration for generic enable/disable */ -enum _mlan_act_generic { - MLAN_ACT_DISABLE = 0, - MLAN_ACT_ENABLE = 1 -}; +enum _mlan_act_generic { MLAN_ACT_DISABLE = 0, MLAN_ACT_ENABLE = 1 }; /** Enumeration for scan mode */ enum _mlan_scan_mode { @@ -366,27 +365,27 @@ enum _mlan_pass_to_act_scan { }; /** Max number of supported rates */ -#define MLAN_SUPPORTED_RATES 32 +#define MLAN_SUPPORTED_RATES 32 /** Mrvl Proprietary Tlv base */ -#define PROPRIETARY_TLV_BASE_ID 0x100 +#define PROPRIETARY_TLV_BASE_ID 0x100 /** RSSI scan */ -#define SCAN_RSSI(RSSI) (0x100 - ((t_u8)(RSSI))) +#define SCAN_RSSI(RSSI) (0x100 - ((t_u8)(RSSI))) /** Max passive scan time for each channel in milliseconds */ -#define MRVDRV_MAX_PASSIVE_SCAN_CHAN_TIME 2000 +#define MRVDRV_MAX_PASSIVE_SCAN_CHAN_TIME 2000 /** Max active scan time for each channel in milliseconds */ -#define MRVDRV_MAX_ACTIVE_SCAN_CHAN_TIME 500 +#define MRVDRV_MAX_ACTIVE_SCAN_CHAN_TIME 500 /** Max gap time between 2 scan in milliseconds */ -#define MRVDRV_MAX_SCAN_CHAN_GAP_TIME 500 +#define MRVDRV_MAX_SCAN_CHAN_GAP_TIME 500 /** Maximum number of probes to send on each channel */ -#define MAX_PROBES 5 +#define MAX_PROBES 5 /** Default number of probes to send on each channel */ -#define DEFAULT_PROBES 4 +#define DEFAULT_PROBES 4 /** * @brief Sub-structure passed in wlan_ioctl_get_scan_table_entry for each BSS @@ -395,32 +394,32 @@ enum _mlan_pass_to_act_scan { * response. */ typedef struct _wlan_get_scan_table_fixed { - /** BSSID of this network */ + /** BSSID of this network */ t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; - /** Channel this beacon/probe response was detected */ + /** Channel this beacon/probe response was detected */ t_u8 channel; - /** RSSI for the received packet */ + /** RSSI for the received packet */ t_u8 rssi; - /** channel load */ + /** channel load */ t_u8 chan_load; - /** TSF value in microseconds from the firmware at packet reception */ + /** TSF value in microseconds from the firmware at packet reception */ t_u64 network_tsf; } wlan_get_scan_table_fixed; /** mlan_802_11_ssid data structure */ typedef struct _mlan_802_11_ssid { - /** SSID Length */ + /** SSID Length */ t_u32 ssid_len; - /** SSID information field */ + /** SSID information field */ t_u8 ssid[MLAN_MAX_SSID_LENGTH]; } mlan_802_11_ssid, *pmlan_802_11_ssid; typedef MLAN_PACK_START struct _tx_status_event { - /** packet type */ + /** packet type */ t_u8 packet_type; - /** tx_token_id */ + /** tx_token_id */ t_u8 tx_token_id; - /** 0--success, 1--fail, 2--watchdogtimeout */ + /** 0--success, 1--fail, 2--watchdogtimeout */ t_u8 status; } MLAN_PACK_END tx_status_event; @@ -428,15 +427,15 @@ typedef MLAN_PACK_START struct _tx_status_event { * Sructure to retrieve the scan table */ typedef struct { - /** - * - Zero based scan entry to start retrieval in command request - * - Number of scans entries returned in command response - */ + /** + * - Zero based scan entry to start retrieval in command request + * - Number of scans entries returned in command response + */ 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. - */ + /** + * 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]; } wlan_ioctl_get_scan_table_info; @@ -445,24 +444,25 @@ typedef struct { * BSS returned in the WLAN_GET_SCAN_RESP IOCTL */ typedef struct _wlan_ioctl_get_scan_table_entry { - /** - * Fixed field length included in the response. - * - * Length value is included so future fixed fields can be added to the - * response without breaking backwards compatibility. Use the length - * to find the offset for the bssInfoLength field, not a sizeof() calc. - */ + /** + * Fixed field length included in the response. + * + * Length value is included so future fixed fields can be added to the + * 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; - /** - * Length of the BSS Information (probe resp or beacon) that - * follows after the fixed_field_length - */ + /** + * Length of the BSS Information (probe resp or beacon) that + * follows after the fixed_field_length + */ t_u32 bss_info_length; - /** - * Always present, fixed length data fields for the BSS - */ + /** + * Always present, fixed length data fields for the BSS + */ wlan_get_scan_table_fixed fixed_fields; /* @@ -480,64 +480,64 @@ typedef struct _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 */ + /** Scan channel time for specific scan in milliseconds */ t_u32 specific_scan_time; - /** Scan channel time for active scan in milliseconds */ + /** Scan channel time for active scan in milliseconds */ t_u32 active_scan_time; - /** Scan channel time for passive scan in milliseconds */ + /** Scan channel time for passive scan in milliseconds */ 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 */ + /** Length of scan_cfg_buf */ t_u32 scan_cfg_len; - /** Buffer of scan config */ + /** Buffer of scan config */ 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 */ + /** BSS mode for scanning */ t_u32 scan_mode; - /** Scan type */ + /** Scan type */ t_u32 scan_type; - /** SSID */ + /** SSID */ mlan_802_11_ssid scan_ssid; - /** Scan time parameters */ + /** Scan time parameters */ mlan_scan_time_params scan_time; - /** Scan config parameters in user scan */ + /** Scan config parameters in 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 */ + /** Number of scan result */ t_u32 num_in_scan_table; - /** Scan table */ + /** Scan table */ t_u8 *pscan_table; /* Age in seconds */ t_u32 age_in_secs; - /** channel statstics */ + /** channel statstics */ t_u8 *pchan_stats; - /** Number of records in the chan_stats */ + /** Number of records in the chan_stats */ t_u32 num_in_chan_stats; } mlan_scan_resp, *pmlan_scan_resp; -#define EXT_SCAN_TYPE_ENH 2 +#define EXT_SCAN_TYPE_ENH 2 /** Type definition of mlan_scan_cfg */ typedef struct _mlan_scan_cfg { - /** Scan type */ + /** Scan type */ t_u32 scan_type; - /** BSS mode for scanning */ + /** BSS mode for scanning */ t_u32 scan_mode; - /** Scan probe */ + /** Scan probe */ t_u32 scan_probe; - /** Scan time parameters */ + /** Scan time parameters */ mlan_scan_time_params scan_time; - /** First passive scan then active scan */ + /** First passive scan then active scan */ t_u8 passive_to_active_scan; - /** Ext_scan: 0 disable, 1: enable, 2: enhance scan*/ + /** Ext_scan: 0 disable, 1: enable, 2: enhance scan*/ t_u32 ext_scan; /** scan channel gap */ t_u32 scan_chan_gap; @@ -545,17 +545,17 @@ typedef struct _mlan_scan_cfg { /** Type defnition of mlan_ds_scan for MLAN_IOCTL_SCAN */ typedef struct _mlan_ds_scan { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** Scan request/response */ + /** Scan request/response */ union { - /** Scan request */ + /** Scan request */ mlan_scan_req scan_req; - /** Scan response */ + /** Scan response */ mlan_scan_resp scan_resp; - /** Scan config parameters in user scan */ + /** Scan config parameters in user scan */ mlan_user_scan user_scan; - /** Scan config parameters */ + /** Scan config parameters */ mlan_scan_cfg scan_cfg; } param; } mlan_ds_scan, *pmlan_ds_scan; @@ -571,97 +571,98 @@ enum _mlan_bss_mode { }; /** Maximum key length */ -#define MLAN_MAX_KEY_LENGTH 32 +#define MLAN_MAX_KEY_LENGTH 32 /** Maximum atim window in milliseconds */ -#define MLAN_MAX_ATIM_WINDOW 50 +#define MLAN_MAX_ATIM_WINDOW 50 /** Minimum beacon interval */ -#define MLAN_MIN_BEACON_INTERVAL 20 +#define MLAN_MIN_BEACON_INTERVAL 20 /** Maximum beacon interval */ -#define MLAN_MAX_BEACON_INTERVAL 1000 +#define MLAN_MAX_BEACON_INTERVAL 1000 /** Default beacon interval */ -#define MLAN_BEACON_INTERVAL 100 +#define MLAN_BEACON_INTERVAL 100 /** Receive all packets */ -#define MLAN_PROMISC_MODE 1 +#define MLAN_PROMISC_MODE 1 /** Receive multicast packets in multicast list */ -#define MLAN_MULTICAST_MODE 2 +#define MLAN_MULTICAST_MODE 2 /** Receive all multicast packets */ -#define MLAN_ALL_MULTI_MODE 4 +#define MLAN_ALL_MULTI_MODE 4 /** Maximum size of multicast list */ -#define MLAN_MAX_MULTICAST_LIST_SIZE 32 +#define MLAN_MAX_MULTICAST_LIST_SIZE 32 /** mlan_multicast_list data structure for MLAN_OID_BSS_MULTICAST_LIST */ typedef struct _mlan_multicast_list { - /** Multicast mode */ + /** Multicast mode */ t_u32 mode; - /** Number of multicast addresses in the list */ + /** Number of multicast addresses in the list */ t_u32 num_multicast_addr; - /** Multicast address list */ + /** Multicast address list */ mlan_802_11_mac_addr mac_list[MLAN_MAX_MULTICAST_LIST_SIZE]; } mlan_multicast_list, *pmlan_multicast_list; /** Max channel */ -#define MLAN_MAX_CHANNEL 165 +#define MLAN_MAX_CHANNEL 165 /** Maximum number of channels in table */ -#define MLAN_MAX_CHANNEL_NUM 128 +#define MLAN_MAX_CHANNEL_NUM 128 /** Channel/frequence for MLAN_OID_BSS_CHANNEL */ typedef struct _chan_freq { - /** Channel Number */ + /** Channel Number */ t_u32 channel; - /** Frequency of this Channel */ + /** Frequency of this Channel */ t_u32 freq; } chan_freq; /** mlan_chan_list data structure for MLAN_OID_BSS_CHANNEL_LIST */ typedef struct _mlan_chan_list { - /** Number of channel */ + /** Number of channel */ t_u32 num_of_chan; - /** Channel-Frequency table */ + /** Channel-Frequency table */ chan_freq cf[MLAN_MAX_CHANNEL_NUM]; } mlan_chan_list; /* This channel is disabled.*/ -#define CHAN_FLAGS_DISABLED MBIT(0) -/* do not initiate radiation, this includes sending probe requests or beaconing */ -#define CHAN_FLAGS_NO_IR MBIT(1) +#define CHAN_FLAGS_DISABLED MBIT(0) +/* do not initiate radiation, this includes sending probe requests or beaconing + */ +#define CHAN_FLAGS_NO_IR MBIT(1) /* Radar detection is required on this channel */ -#define CHAN_FLAGS_RADAR MBIT(3) +#define CHAN_FLAGS_RADAR MBIT(3) /* extension channel above this channel is not permitted */ -#define CHAN_FLAGS_NO_HT40PLUS MBIT(4) +#define CHAN_FLAGS_NO_HT40PLUS MBIT(4) /* extension channel below this channel is not permitted */ -#define CHAN_FLAGS_NO_HT40MINUS MBIT(5) +#define CHAN_FLAGS_NO_HT40MINUS MBIT(5) /* OFDM is not allowed on this channel */ -#define CHAN_FLAGS_NO_OFDM MBIT(6) +#define CHAN_FLAGS_NO_OFDM MBIT(6) /** 80Mhz can not used on this channel */ -#define CHAN_FLAGS_NO_80MHZ MBIT(7) +#define CHAN_FLAGS_NO_80MHZ MBIT(7) /** 180Mhz can not used on this channel */ -#define CHAN_FLAGS_NO_160MHZ MBIT(8) +#define CHAN_FLAGS_NO_160MHZ MBIT(8) /* Only indoor use is permitted on this channel */ -#define CHAN_FLAGS_INDOOR_ONLY MBIT(9) +#define CHAN_FLAGS_INDOOR_ONLY MBIT(9) /* IR operation is allowed on this channel if it's * connected concurrently to a BSS on the same channel on * the 2 GHz band or to a channel in the same UNII band (on the 5 GHz * band), and IEEE80211_CHAN_RADAR is not set */ -#define CHAN_FLAGS_IR_CONCURRENT MBIT(10) +#define CHAN_FLAGS_IR_CONCURRENT MBIT(10) /* 20 MHz operation is not allowed on this channel */ -#define CHAN_FLAGS_20MHZ MBIT(11) +#define CHAN_FLAGS_20MHZ MBIT(11) /* 10 MHz operation is not allowed on this channel */ -#define CHAN_FLAGS_NO_10MHZ MBIT(12) +#define CHAN_FLAGS_NO_10MHZ MBIT(12) /** This channel's flag is valid */ -#define CHAN_FLAGS_MAX MBIT(31) +#define CHAN_FLAGS_MAX MBIT(31) /** Maximum response buffer length */ #define ASSOC_RSP_BUF_SIZE 500 /** Type definition of mlan_ds_misc_assoc_rsp for MLAN_OID_MISC_ASSOC_RSP */ typedef struct _mlan_ds_misc_assoc_rsp { - /** Associate response buffer */ + /** Associate response buffer */ t_u8 assoc_resp_buf[ASSOC_RSP_BUF_SIZE]; - /** Response buffer length */ + /** Response buffer length */ t_u32 assoc_resp_len; } mlan_ds_misc_assoc_rsp; @@ -669,88 +670,88 @@ typedef struct _mlan_ds_misc_assoc_rsp { * MLAN_OID_BSS_START and MLAN_OID_BSS_FIND_BSS */ typedef struct _mlan_ssid_bssid { - /** SSID */ + /** SSID */ mlan_802_11_ssid ssid; - /** BSSID */ + /** BSSID */ mlan_802_11_mac_addr bssid; - /** index in BSSID list, start from 1 */ + /** index in BSSID list, start from 1 */ t_u32 idx; - /** Receive signal strength in dBm */ + /** Receive signal strength in dBm */ t_s32 rssi; - /**channel*/ + /**channel*/ t_u16 channel; - /**mobility domain value*/ + /**mobility domain value*/ t_u16 ft_md; - /**ft capability*/ + /**ft capability*/ t_u8 ft_cap; - /**band*/ + /**band*/ t_u16 bss_band; - /** channel flag */ + /** channel flag */ t_u32 channel_flags; - /** host mlme flag*/ + /** host mlme flag*/ t_u8 host_mlme; -/** assoicate resp frame/ie from firmware */ + /** assoicate resp frame/ie from firmware */ mlan_ds_misc_assoc_rsp assoc_rsp; } mlan_ssid_bssid; /** Data structure of WMM ECW */ typedef struct _wmm_ecw_t { #ifdef BIG_ENDIAN_SUPPORT - /** Maximum Ecw */ - t_u8 ecw_max:4; - /** Minimum Ecw */ - t_u8 ecw_min:4; + /** Maximum Ecw */ + t_u8 ecw_max : 4; + /** Minimum Ecw */ + t_u8 ecw_min : 4; #else - /** Minimum Ecw */ - t_u8 ecw_min:4; - /** Maximum Ecw */ - t_u8 ecw_max:4; -#endif /* BIG_ENDIAN_SUPPORT */ + /** Minimum Ecw */ + t_u8 ecw_min : 4; + /** Maximum Ecw */ + t_u8 ecw_max : 4; +#endif /* BIG_ENDIAN_SUPPORT */ } wmm_ecw_t, *pwmm_ecw_t; /** Data structure of WMM Aci/Aifsn */ typedef struct _wmm_aci_aifsn_t { #ifdef BIG_ENDIAN_SUPPORT - /** Reserved */ - t_u8 reserved:1; - /** Aci */ - t_u8 aci:2; - /** Acm */ - t_u8 acm:1; - /** Aifsn */ - t_u8 aifsn:4; + /** Reserved */ + t_u8 reserved : 1; + /** Aci */ + t_u8 aci : 2; + /** Acm */ + t_u8 acm : 1; + /** Aifsn */ + t_u8 aifsn : 4; #else - /** Aifsn */ - t_u8 aifsn:4; - /** Acm */ - t_u8 acm:1; - /** Aci */ - t_u8 aci:2; - /** Reserved */ - t_u8 reserved:1; -#endif /* BIG_ENDIAN_SUPPORT */ + /** Aifsn */ + t_u8 aifsn : 4; + /** Acm */ + t_u8 acm : 1; + /** Aci */ + t_u8 aci : 2; + /** Reserved */ + 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; /** mlan_deauth_param */ typedef struct _mlan_deauth_param { - /** STA mac addr */ + /** STA mac addr */ t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; - /** deauth reason */ + /** deauth reason */ t_u16 reason_code; } mlan_deauth_param; #ifdef UAP_SUPPORT /** UAP FLAG: Host based */ -#define UAP_FLAG_HOST_BASED MBIT(0) +#define UAP_FLAG_HOST_BASED MBIT(0) /** UAP FLAG: Host mlme */ -#define UAP_FLAG_HOST_MLME MBIT(1) +#define UAP_FLAG_HOST_MLME MBIT(1) /** Maximum packet forward control value */ #define MAX_PKT_FWD_CTRL 15 @@ -763,103 +764,103 @@ typedef struct _mlan_deauth_param { /** Minimum DTIM period */ #define MIN_DTIM_PERIOD 1 /** Maximum TX Power Limit */ -#define MAX_TX_POWER 20 +#define MAX_TX_POWER 20 /** Minimum TX Power Limit */ -#define MIN_TX_POWER 0 +#define MIN_TX_POWER 0 /** MAX station count */ -#define MAX_STA_COUNT 64 +#define MAX_STA_COUNT 64 /** Maximum RTS threshold */ -#define MAX_RTS_THRESHOLD 2347 +#define MAX_RTS_THRESHOLD 2347 /** Maximum fragmentation threshold */ #define MAX_FRAG_THRESHOLD 2346 /** Minimum fragmentation threshold */ #define MIN_FRAG_THRESHOLD 256 /** data rate 54 M */ -#define DATA_RATE_54M 108 +#define DATA_RATE_54M 108 /** Maximum value of bcast_ssid_ctl */ -#define MAX_BCAST_SSID_CTL 2 +#define MAX_BCAST_SSID_CTL 2 /** antenna A */ -#define ANTENNA_MODE_A 0 +#define ANTENNA_MODE_A 0 /** antenna B */ -#define ANTENNA_MODE_B 1 +#define ANTENNA_MODE_B 1 /** transmit antenna */ -#define TX_ANTENNA 1 +#define TX_ANTENNA 1 /** receive antenna */ -#define RX_ANTENNA 0 +#define RX_ANTENNA 0 /** Maximum stage out time */ -#define MAX_STAGE_OUT_TIME 864000 +#define MAX_STAGE_OUT_TIME 864000 /** Minimum stage out time */ -#define MIN_STAGE_OUT_TIME 50 +#define MIN_STAGE_OUT_TIME 50 /** Maximum Retry Limit */ -#define MAX_RETRY_LIMIT 14 +#define MAX_RETRY_LIMIT 14 /** Maximum group key timer in seconds */ -#define MAX_GRP_TIMER 86400 +#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 */ /** default UAP BAND 2.4G */ -#define DEFAULT_UAP_BAND 0 +#define DEFAULT_UAP_BAND 0 /** default UAP channel 6 */ -#define DEFAULT_UAP_CHANNEL 6 +#define DEFAULT_UAP_CHANNEL 6 /** Maximum data rates */ -#define MAX_DATA_RATES 14 +#define MAX_DATA_RATES 14 /** auto data rate */ -#define DATA_RATE_AUTO 0 +#define DATA_RATE_AUTO 0 /**filter mode: disable */ -#define MAC_FILTER_MODE_DISABLE 0 +#define MAC_FILTER_MODE_DISABLE 0 /**filter mode: block mac address */ -#define MAC_FILTER_MODE_ALLOW_MAC 1 +#define MAC_FILTER_MODE_ALLOW_MAC 1 /**filter mode: block mac address */ -#define MAC_FILTER_MODE_BLOCK_MAC 2 +#define MAC_FILTER_MODE_BLOCK_MAC 2 /** Maximum mac filter num */ -#define MAX_MAC_FILTER_NUM 64 +#define MAX_MAC_FILTER_NUM 64 /* Bitmap for protocol to use */ /** No security */ -#define PROTOCOL_NO_SECURITY 0x01 +#define PROTOCOL_NO_SECURITY 0x01 /** Static WEP */ -#define PROTOCOL_STATIC_WEP 0x02 +#define PROTOCOL_STATIC_WEP 0x02 /** WPA */ -#define PROTOCOL_WPA 0x08 +#define PROTOCOL_WPA 0x08 /** WPA2 */ -#define PROTOCOL_WPA2 0x20 +#define PROTOCOL_WPA2 0x20 /** WP2 Mixed */ -#define PROTOCOL_WPA2_MIXED 0x28 +#define PROTOCOL_WPA2_MIXED 0x28 /** EAP */ -#define PROTOCOL_EAP 0x40 +#define PROTOCOL_EAP 0x40 /** WAPI */ -#define PROTOCOL_WAPI 0x80 +#define PROTOCOL_WAPI 0x80 /** WPA3 SAE */ -#define PROTOCOL_WPA3_SAE 0x100 +#define PROTOCOL_WPA3_SAE 0x100 /** Key_mgmt_psk */ -#define KEY_MGMT_NONE 0x04 +#define KEY_MGMT_NONE 0x04 /** Key_mgmt_none */ -#define KEY_MGMT_PSK 0x02 +#define KEY_MGMT_PSK 0x02 /** Key_mgmt_eap */ -#define KEY_MGMT_EAP 0x01 +#define KEY_MGMT_EAP 0x01 /** Key_mgmt_psk_sha256 */ -#define KEY_MGMT_PSK_SHA256 0x100 +#define KEY_MGMT_PSK_SHA256 0x100 /** Key_mgmt_sae */ -#define KEY_MGMT_SAE 0x400 +#define KEY_MGMT_SAE 0x400 /** Key_mgmt_owe */ -#define KEY_MGMT_OWE 0x200 +#define KEY_MGMT_OWE 0x200 /** TKIP */ -#define CIPHER_TKIP 0x04 +#define CIPHER_TKIP 0x04 /** AES CCMP */ -#define CIPHER_AES_CCMP 0x08 +#define CIPHER_AES_CCMP 0x08 /** Valid cipher bitmap */ -#define VALID_CIPHER_BITMAP 0x0c +#define VALID_CIPHER_BITMAP 0x0c /** Packet forwarding to be done by FW or host */ -#define PKT_FWD_FW_BIT 0x01 +#define PKT_FWD_FW_BIT 0x01 /** Intra-BSS broadcast packet forwarding allow bit */ #define PKT_FWD_INTRA_BCAST 0x02 /** Intra-BSS unicast packet forwarding allow bit */ @@ -867,104 +868,104 @@ typedef struct _mlan_deauth_param { /** Inter-BSS unicast packet forwarding allow bit */ #define PKT_FWD_INTER_UCAST 0x08 /** Intra-BSS unicast packet */ -#define PKT_INTRA_UCAST 0x01 +#define PKT_INTRA_UCAST 0x01 /** Inter-BSS unicast packet */ -#define PKT_INTER_UCAST 0x02 +#define PKT_INTER_UCAST 0x02 /** Enable Host PKT forwarding */ -#define PKT_FWD_ENABLE_BIT 0x01 +#define PKT_FWD_ENABLE_BIT 0x01 /** Channel List Entry */ typedef struct _channel_list { - /** Channel Number */ + /** Channel Number */ t_u8 chan_number; - /** Band Config */ + /** Band Config */ Band_Config_t bandcfg; } scan_chan_list; /** mac_filter data structure */ typedef struct _mac_filter { - /** mac filter mode */ + /** mac filter mode */ t_u16 filter_mode; - /** mac adress count */ + /** mac adress count */ t_u16 mac_count; - /** mac address list */ + /** mac address list */ mlan_802_11_mac_addr mac_list[MAX_MAC_FILTER_NUM]; } mac_filter; /** wpa parameter */ typedef struct _wpa_param { - /** Pairwise cipher WPA */ + /** Pairwise cipher WPA */ t_u8 pairwise_cipher_wpa; - /** Pairwise cipher WPA2 */ + /** Pairwise cipher WPA2 */ t_u8 pairwise_cipher_wpa2; - /** group cipher */ + /** group cipher */ t_u8 group_cipher; - /** RSN replay protection */ + /** RSN replay protection */ t_u8 rsn_protection; - /** passphrase length */ + /** passphrase length */ t_u32 length; - /** passphrase */ + /** passphrase */ t_u8 passphrase[64]; - /**group key rekey time in seconds */ + /**group key rekey time in seconds */ t_u32 gk_rekey_time; } wpa_param; /** wep key */ typedef struct _wep_key { - /** key index 0-3 */ + /** key index 0-3 */ t_u8 key_index; - /** is default */ + /** is default */ t_u8 is_default; - /** length */ + /** length */ t_u16 length; - /** key data */ + /** key data */ t_u8 key[26]; } wep_key; /** wep param */ typedef struct _wep_param { - /** key 0 */ + /** key 0 */ wep_key key0; - /** key 1 */ + /** key 1 */ wep_key key1; - /** key 2 */ + /** key 2 */ wep_key key2; - /** key 3 */ + /** key 3 */ wep_key key3; } wep_param; /** Data structure of WMM QoS information */ typedef struct _wmm_qos_info_t { #ifdef BIG_ENDIAN_SUPPORT - /** QoS UAPSD */ - t_u8 qos_uapsd:1; - /** Reserved */ - t_u8 reserved:3; - /** Parameter set count */ - t_u8 para_set_count:4; + /** QoS UAPSD */ + t_u8 qos_uapsd : 1; + /** Reserved */ + t_u8 reserved : 3; + /** Parameter set count */ + t_u8 para_set_count : 4; #else - /** Parameter set count */ - t_u8 para_set_count:4; - /** Reserved */ - t_u8 reserved:3; - /** QoS UAPSD */ - t_u8 qos_uapsd:1; -#endif /* BIG_ENDIAN_SUPPORT */ + /** Parameter set count */ + t_u8 para_set_count : 4; + /** Reserved */ + t_u8 reserved : 3; + /** QoS UAPSD */ + t_u8 qos_uapsd : 1; +#endif /* BIG_ENDIAN_SUPPORT */ } wmm_qos_info_t, *pwmm_qos_info_t; /** Data structure of WMM parameter IE */ typedef struct _wmm_parameter_t { - /** OuiType: 00:50:f2:02 */ + /** OuiType: 00:50:f2:02 */ t_u8 ouitype[4]; - /** Oui subtype: 01 */ + /** Oui subtype: 01 */ t_u8 ouisubtype; - /** version: 01 */ + /** version: 01 */ t_u8 version; - /** QoS information */ + /** QoS information */ t_u8 qos_info; - /** Reserved */ + /** Reserved */ t_u8 reserved; - /** AC Parameters Record WMM_AC_BE, WMM_AC_BK, WMM_AC_VI, WMM_AC_VO */ + /** 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_parameter_t, *pwmm_parameter_t; @@ -977,255 +978,258 @@ typedef struct _wmm_parameter_t { * added to that command. */ typedef struct _mlan_uap_bss_param { - /** AP mac addr */ + /** AP mac addr */ mlan_802_11_mac_addr mac_addr; - /** SSID */ + /** SSID */ mlan_802_11_ssid ssid; - /** Broadcast ssid control */ + /** Broadcast ssid control */ t_u8 bcast_ssid_ctl; - /** Radio control: on/off */ + /** Radio control: on/off */ t_u8 radio_ctl; - /** dtim period */ + /** dtim period */ t_u8 dtim_period; - /** beacon period */ + /** beacon period */ t_u16 beacon_period; - /** rates */ + /** rates */ t_u8 rates[MAX_DATA_RATES]; - /** Tx data rate */ + /** Tx data rate */ t_u16 tx_data_rate; - /** Tx beacon rate */ + /** Tx beacon rate */ t_u16 tx_beacon_rate; - /** multicast/broadcast data rate */ + /** multicast/broadcast data rate */ t_u16 mcbc_data_rate; - /** Tx power level in dBm */ + /** Tx power level in dBm */ t_u8 tx_power_level; - /** Tx antenna */ + /** Tx antenna */ t_u8 tx_antenna; - /** Rx antenna */ + /** Rx antenna */ t_u8 rx_antenna; - /** packet forward control */ + /** packet forward control */ t_u8 pkt_forward_ctl; - /** max station count */ + /** max station count */ t_u16 max_sta_count; - /** mac filter */ + /** mac filter */ mac_filter filter; - /** station ageout timer in unit of 100ms */ + /** station ageout timer in unit of 100ms */ t_u32 sta_ageout_timer; - /** PS station ageout timer in unit of 100ms */ + /** PS station ageout timer in unit of 100ms */ t_u32 ps_sta_ageout_timer; - /** RTS threshold */ + /** RTS threshold */ t_u16 rts_threshold; - /** fragmentation threshold */ + /** fragmentation threshold */ t_u16 frag_threshold; - /** retry_limit */ + /** retry_limit */ t_u16 retry_limit; - /** pairwise update timeout in milliseconds */ + /** pairwise update timeout in milliseconds */ t_u32 pairwise_update_timeout; - /** pairwise handshake retries */ + /** pairwise handshake retries */ t_u32 pwk_retries; - /** groupwise update timeout in milliseconds */ + /** groupwise update timeout in milliseconds */ t_u32 groupwise_update_timeout; - /** groupwise handshake retries */ + /** groupwise handshake retries */ t_u32 gwk_retries; - /** preamble type */ + /** preamble type */ t_u8 preamble_type; - /** band cfg */ + /** band cfg */ Band_Config_t bandcfg; - /** channel */ + /** channel */ t_u8 channel; - /** auth mode */ + /** auth mode */ t_u16 auth_mode; - /** encryption protocol */ + /** encryption protocol */ t_u16 protocol; - /** key managment type */ + /** key managment type */ t_u16 key_mgmt; - /** wep param */ + /** wep param */ wep_param wep_cfg; - /** wpa param */ + /** wpa param */ wpa_param wpa_cfg; - /** Mgmt IE passthru mask */ + /** Mgmt IE passthru mask */ t_u32 mgmt_ie_passthru_mask; /* * 11n HT Cap HTCap_t ht_cap */ - /** HT Capabilities Info field */ + /** HT Capabilities Info field */ t_u16 ht_cap_info; - /** A-MPDU Parameters field */ + /** A-MPDU Parameters field */ t_u8 ampdu_param; - /** Supported MCS Set field */ + /** Supported MCS Set field */ t_u8 supported_mcs_set[16]; - /** HT Extended Capabilities field */ + /** HT Extended Capabilities field */ t_u16 ht_ext_cap; - /** Transmit Beamforming Capabilities field */ + /** Transmit Beamforming Capabilities field */ t_u32 tx_bf_cap; - /** Antenna Selection Capability field */ + /** Antenna Selection Capability field */ t_u8 asel; - /** Enable 2040 Coex */ + /** Enable 2040 Coex */ t_u8 enable_2040coex; - /** key management operation */ + /** key management operation */ t_u16 key_mgmt_operation; - /** BSS status */ + /** BSS status */ t_u16 bss_status; #ifdef WIFI_DIRECT_SUPPORT /* pre shared key */ t_u8 psk[MLAN_MAX_KEY_LENGTH]; -#endif /* WIFI_DIRECT_SUPPORT */ - /** Number of channels in scan_channel_list */ +#endif /* WIFI_DIRECT_SUPPORT */ + /** Number of channels in scan_channel_list */ t_u32 num_of_chan; - /** scan channel list in ACS mode */ + /** scan channel list in ACS mode */ scan_chan_list chan_list[MLAN_MAX_CHANNEL]; - /** Wmm parameters */ + /** Wmm parameters */ wmm_parameter_t wmm_para; + /** uap host based config */ + t_u32 uap_host_based_config; } mlan_uap_bss_param; /** mlan_uap_scan_channels */ typedef struct _mlan_uap_scan_channels { - /** flag for remove nop channel*/ + /** flag for remove nop channel*/ t_u8 remove_nop_channel; /** num of removed channel */ t_u8 num_remvoed_channel; - /** Number of channels in scan_channel_list */ + /** Number of channels in scan_channel_list */ t_u32 num_of_chan; - /** scan channel list in ACS mode */ + /** scan channel list in ACS mode */ scan_chan_list chan_list[MLAN_MAX_CHANNEL]; } mlan_uap_scan_channels; /** mlan_uap_oper_ctrl */ typedef struct _mlan_uap_oper_ctrl { - /** control value - * 0: do nothing, - * 2: uap stops and restarts automaticaly - */ + /** control value + * 0: do nothing, + * 2: uap stops and restarts automaticaly + */ t_u16 ctrl_value; - /** channel opt - * 1: uap restart on default 2.4G/channel 6 - * 2: uap restart on the band/channel configured by driver previously - * 3: uap restart on the band/channel specified by band_cfg and channel - */ + /** channel opt + * 1: uap restart on default 2.4G/channel 6 + * 2: uap restart on the band/channel configured by driver previously + * 3: uap restart on the band/channel specified by band_cfg and channel + */ t_u16 chan_opt; - /** band cfg 0 - * 0: 20Mhz 2: 40 Mhz 3: 80Mhz - */ + /** band cfg 0 + * 0: 20Mhz 2: 40 Mhz 3: 80Mhz + */ t_u8 band_cfg; - /** channel */ + /** channel */ t_u8 channel; } mlan_uap_oper_ctrl; /** mlan_uap_acs_scan */ typedef struct _mlan_uap_acs_scan { - /** band */ + /** band */ Band_Config_t bandcfg; - /** channel */ + /** channel */ t_u8 chan; } mlan_uap_acs_scan; /** station is authorized (802.1X) */ -#define STA_FLAG_AUTHORIZED MBIT(1) +#define STA_FLAG_AUTHORIZED MBIT(1) /** Station is capable of receiving frames with short barker preamble */ #define STA_FLAG_SHORT_PREAMBLE MBIT(2) /** station is WME/QoS capable */ -#define STA_FLAG_WME MBIT(3) +#define STA_FLAG_WME MBIT(3) /** station uses management frame protection */ -#define STA_FLAG_MFP MBIT(4) +#define STA_FLAG_MFP MBIT(4) /** station is authenticated */ -#define STA_FLAG_AUTHENTICATED MBIT(5) +#define STA_FLAG_AUTHENTICATED MBIT(5) /** station is a TDLS peer */ -#define STA_FLAG_TDLS_PEER MBIT(6) +#define STA_FLAG_TDLS_PEER MBIT(6) /** station is associated */ -#define STA_FLAG_ASSOCIATED MBIT(7) +#define STA_FLAG_ASSOCIATED MBIT(7) /** mlan_ds_sta_info */ typedef struct _mlan_ds_sta_info { - /** aid */ + /** aid */ t_u16 aid; - /** peer_mac */ + /** peer_mac */ t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; - /** Listen Interval */ + /** Listen Interval */ int listen_interval; - /** Capability Info */ + /** Capability Info */ t_u16 cap_info; - /** station flag */ + /** station flag */ t_u32 sta_flags; - /** tlv len */ + /** tlv len */ t_u16 tlv_len; - /** tlv start */ + /** tlv start */ t_u8 tlv[]; } mlan_ds_sta_info; #endif #ifdef WIFI_DIRECT_SUPPORT /** mode: disable wifi direct */ -#define WIFI_DIRECT_MODE_DISABLE 0 +#define WIFI_DIRECT_MODE_DISABLE 0 /** mode: listen */ -#define WIFI_DIRECT_MODE_LISTEN 1 +#define WIFI_DIRECT_MODE_LISTEN 1 /** mode: GO */ -#define WIFI_DIRECT_MODE_GO 2 +#define WIFI_DIRECT_MODE_GO 2 /** mode: client */ -#define WIFI_DIRECT_MODE_CLIENT 3 +#define WIFI_DIRECT_MODE_CLIENT 3 /** mode: find */ -#define WIFI_DIRECT_MODE_FIND 4 +#define WIFI_DIRECT_MODE_FIND 4 /** mode: stop find */ -#define WIFI_DIRECT_MODE_STOP_FIND 5 +#define WIFI_DIRECT_MODE_STOP_FIND 5 #endif /** Type definition of mlan_ds_bss for MLAN_IOCTL_BSS */ typedef struct _mlan_ds_bss { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** BSS parameter */ + /** BSS parameter */ union { - /** SSID-BSSID for MLAN_OID_BSS_START */ + /** SSID-BSSID for MLAN_OID_BSS_START */ mlan_ssid_bssid ssid_bssid; - /** BSSID for MLAN_OID_BSS_STOP */ + /** BSSID for MLAN_OID_BSS_STOP */ mlan_802_11_mac_addr bssid; - /** BSS mode for MLAN_OID_BSS_MODE */ + /** BSS mode for MLAN_OID_BSS_MODE */ t_u32 bss_mode; - /** BSS channel/frequency for MLAN_OID_BSS_CHANNEL */ + /** BSS channel/frequency for MLAN_OID_BSS_CHANNEL */ chan_freq bss_chan; - /** BSS channel list for MLAN_OID_BSS_CHANNEL_LIST */ + /** BSS channel list for MLAN_OID_BSS_CHANNEL_LIST */ mlan_chan_list chanlist; - /** MAC address for MLAN_OID_BSS_MAC_ADDR */ + /** MAC address for MLAN_OID_BSS_MAC_ADDR */ mlan_802_11_mac_addr mac_addr; - /** Multicast list for MLAN_OID_BSS_MULTICAST_LIST */ + /** Multicast list for MLAN_OID_BSS_MULTICAST_LIST */ mlan_multicast_list multicast_list; - /** Beacon interval for MLAN_OID_IBSS_BCN_INTERVAL */ + /** Beacon interval for MLAN_OID_IBSS_BCN_INTERVAL */ t_u32 bcn_interval; - /** ATIM window for MLAN_OID_IBSS_ATIM_WINDOW */ + /** ATIM window for MLAN_OID_IBSS_ATIM_WINDOW */ t_u32 atim_window; - /** deauth param for MLAN_OID_BSS_STOP & MLAN_OID_UAP_DEAUTH_STA */ + /** deauth param for MLAN_OID_BSS_STOP & MLAN_OID_UAP_DEAUTH_STA + */ mlan_deauth_param deauth_param; #ifdef UAP_SUPPORT - /** host based flag for MLAN_OID_BSS_START */ + /** host based flag for MLAN_OID_BSS_START */ t_u8 host_based; - /** BSS param for AP mode for MLAN_OID_UAP_BSS_CONFIG */ + /** BSS param for AP mode for MLAN_OID_UAP_BSS_CONFIG */ mlan_uap_bss_param bss_config; - /** AP Wmm parameters for MLAN_OID_UAP_CFG_WMM_PARAM */ + /** AP Wmm parameters for MLAN_OID_UAP_CFG_WMM_PARAM */ wmm_parameter_t ap_wmm_para; - /** ap scan channels for MLAN_OID_UAP_SCAN_CHANNELS*/ + /** ap scan channels for MLAN_OID_UAP_SCAN_CHANNELS*/ mlan_uap_scan_channels ap_scan_channels; - /** ap channel for MLAN_OID_UAP_CHANNEL*/ + /** ap channel for MLAN_OID_UAP_CHANNEL*/ chan_band_info ap_channel; - /** ap operation control for MLAN_OID_UAP_OPER_CTRL*/ + /** ap operation control for MLAN_OID_UAP_OPER_CTRL*/ mlan_uap_oper_ctrl ap_oper_ctrl; - /** AP acs scan MLAN_OID_UAP_ACS_SCAN */ + /** AP acs scan MLAN_OID_UAP_ACS_SCAN */ mlan_uap_acs_scan ap_acs_scan; #endif #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) - /** BSS role for MLAN_OID_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 */ + /** 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 */ + /** Listen interval for MLAN_OID_BSS_LISTEN_INTERVAL */ t_u16 listen_interval; - /** STA channel info for MLAN_OID_BSS_CHAN_INFO */ + /** STA channel info for MLAN_OID_BSS_CHAN_INFO */ chan_band_info sta_channel; #endif #ifdef UAP_SUPPORT - /** STA info for MLAN_OID_UAP_ADD_STATION */ + /** STA info for MLAN_OID_UAP_ADD_STATION */ mlan_ds_sta_info sta_info; #endif } param; @@ -1236,18 +1240,18 @@ typedef MLAN_PACK_START struct _otp_region_info { t_u8 country_code[2]; t_u8 region_code; t_u8 environment; - t_u16 force_reg:1; - t_u16 reserved:15; + t_u16 force_reg : 1; + t_u16 reserved : 15; } MLAN_PACK_END otp_region_info_t; /** Type definition of mlan_ds_custom_reg_domain */ typedef struct _mlan_ds_custom_reg_domain { otp_region_info_t region; - /** num of 2g channels in custom_reg_domain */ + /** num of 2g channels in custom_reg_domain */ t_u8 num_bg_chan; - /** num of 5g channels in custom_reg_domain */ + /** num of 5g channels in custom_reg_domain */ t_u8 num_a_chan; - /** cfp table */ + /** cfp table */ chan_freq_power_t cfp_tbl[]; } mlan_ds_custom_reg_domain; /*-----------------------------------------------------------------*/ @@ -1268,85 +1272,85 @@ enum _mlan_band_def { }; /** Channel bandwidth */ -#define CHANNEL_BW_20MHZ 0 -#define CHANNEL_BW_40MHZ_ABOVE 1 -#define CHANNEL_BW_40MHZ_BELOW 3 +#define CHANNEL_BW_20MHZ 0 +#define CHANNEL_BW_40MHZ_ABOVE 1 +#define CHANNEL_BW_40MHZ_BELOW 3 /** secondary channel is 80Mhz bandwidth for 11ac */ -#define CHANNEL_BW_80MHZ 4 -#define CHANNEL_BW_160MHZ 5 +#define CHANNEL_BW_80MHZ 4 +#define CHANNEL_BW_160MHZ 5 /** RF antenna selection */ -#define RF_ANTENNA_MASK(n) ((1<<(n))-1) +#define RF_ANTENNA_MASK(n) ((1 << (n)) - 1) /** RF antenna auto select */ -#define RF_ANTENNA_AUTO 0xFFFF +#define RF_ANTENNA_AUTO 0xFFFF /** Type definition of mlan_ds_band_cfg for MLAN_OID_BAND_CFG */ typedef struct _mlan_ds_band_cfg { - /** Infra band */ + /** Infra band */ t_u32 config_bands; - /** Ad-hoc start band */ + /** Ad-hoc start band */ t_u32 adhoc_start_band; - /** Ad-hoc start channel */ + /** Ad-hoc start channel */ t_u32 adhoc_channel; - /** fw supported band */ + /** fw supported band */ 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 */ + /** Tx antenna mode */ t_u32 tx_antenna; - /** Rx antenna mode */ + /** Rx antenna mode */ t_u32 rx_antenna; } mlan_ds_ant_cfg, *pmlan_ds_ant_cfg; /** Type definition of mlan_ds_mimo_switch for MLAN_OID_MIMO_SWITCH */ typedef struct _mlan_ds_mimo_switch { - /** Tx antenna mode */ + /** Tx antenna mode */ t_u8 txpath_antmode; - /** Rx antenna mode */ + /** Rx antenna mode */ t_u8 rxpath_antmode; } mlan_ds_mimo_switch, *pmlan_ds_mimo_switch; /** Type definition of mlan_ds_ant_cfg_1x1 for MLAN_OID_ANT_CFG */ typedef struct _mlan_ds_ant_cfg_1x1 { - /** Antenna mode */ + /** Antenna mode */ t_u32 antenna; - /** Evaluate time */ + /** Evaluate time */ t_u16 evaluate_time; - /** Current antenna */ + /** Current antenna */ t_u16 current_antenna; } mlan_ds_ant_cfg_1x1, *pmlan_ds_ant_cfg_1x1; /** Type definition of mlan_ds_remain_chan for MLAN_OID_REMAIN_CHAN_CFG */ typedef struct _mlan_ds_remain_chan { - /** remove flag */ + /** remove flag */ t_u16 remove; - /** status */ + /** status */ t_u8 status; - /** Band cfg */ + /** Band cfg */ Band_Config_t bandcfg; - /** channel */ + /** channel */ t_u8 channel; - /** remain time: Unit ms*/ + /** remain time: Unit ms*/ t_u32 remain_period; } mlan_ds_remain_chan, *pmlan_ds_remain_chan; /** Type definition of mlan_ds_radio_cfg for MLAN_IOCTL_RADIO_CFG */ typedef struct _mlan_ds_radio_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** Radio control parameter */ + /** Radio control parameter */ union { - /** Radio on/off for MLAN_OID_RADIO_CTRL */ + /** Radio on/off for MLAN_OID_RADIO_CTRL */ t_u32 radio_on_off; - /** Band info for MLAN_OID_BAND_CFG */ + /** Band info for MLAN_OID_BAND_CFG */ mlan_ds_band_cfg band_cfg; - /** Antenna info for MLAN_OID_ANT_CFG */ + /** Antenna info for MLAN_OID_ANT_CFG */ mlan_ds_ant_cfg ant_cfg; - /** Antenna mode for MLAN_OID_MIMO_SWITCH */ + /** Antenna mode for MLAN_OID_MIMO_SWITCH */ mlan_ds_mimo_switch mimo_switch_cfg; - /** Antenna info for MLAN_OID_ANT_CFG */ + /** Antenna info for MLAN_OID_ANT_CFG */ mlan_ds_ant_cfg_1x1 ant_cfg_1x1; - /** remain on channel for MLAN_OID_REMAIN_CHAN_CFG */ + /** remain on channel for MLAN_OID_REMAIN_CHAN_CFG */ mlan_ds_remain_chan remain_chan; } param; } mlan_ds_radio_cfg, *pmlan_ds_radio_cfg; @@ -1362,12 +1366,12 @@ enum COALESCE_PACKET_TYPE { PACKET_TYPE_BROADCAST = 3 }; -#define COALESCE_MAX_RULES 8 -#define COALESCE_MAX_BYTESEQ 4 /* non-adjustable */ -#define COALESCE_MAX_FILTERS 4 -#define MAX_COALESCING_DELAY 100 /* in msecs */ -#define MAX_PATTERN_LEN 20 -#define MAX_OFFSET_LEN 100 +#define COALESCE_MAX_RULES 8 +#define COALESCE_MAX_BYTESEQ 4 /* non-adjustable */ +#define COALESCE_MAX_FILTERS 4 +#define MAX_COALESCING_DELAY 100 /* in msecs */ +#define MAX_PATTERN_LEN 20 +#define MAX_OFFSET_LEN 100 struct filt_field_param { t_u8 operation; @@ -1393,23 +1397,23 @@ typedef struct _mlan_ds_coalesce_cfg { /*-----------------------------------------------------------------*/ /** Type definition of mlan_ds_snmp_mib for MLAN_IOCTL_SNMP_MIB */ typedef struct _mlan_ds_snmp_mib { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** SNMP MIB parameter */ + /** SNMP MIB parameter */ union { - /** RTS threshold for MLAN_OID_SNMP_MIB_RTS_THRESHOLD */ + /** RTS threshold for MLAN_OID_SNMP_MIB_RTS_THRESHOLD */ t_u32 rts_threshold; - /** Fragment threshold for MLAN_OID_SNMP_MIB_FRAG_THRESHOLD */ + /** Fragment threshold for MLAN_OID_SNMP_MIB_FRAG_THRESHOLD */ t_u32 frag_threshold; - /** Retry count for MLAN_OID_SNMP_MIB_RETRY_COUNT */ + /** Retry count for MLAN_OID_SNMP_MIB_RETRY_COUNT */ t_u32 retry_count; - /** OID value for MLAN_OID_SNMP_MIB_DOT11D/H */ + /** OID value for MLAN_OID_SNMP_MIB_DOT11D/H */ t_u32 oid_value; - /** DTIM period for MLAN_OID_SNMP_MIB_DTIM_PERIOD */ + /** DTIM period for MLAN_OID_SNMP_MIB_DTIM_PERIOD */ t_u32 dtim_period; - /** Singal_ext Enable for MLAN_OID_SNMP_MIB_SIGNALEXT_ENABLE */ + /** Singal_ext Enable for MLAN_OID_SNMP_MIB_SIGNALEXT_ENABLE */ t_u8 signalext_enable; - /** Control deauth when uap switch channel */ + /** Control deauth when uap switch channel */ t_u8 deauthctrl; } param; } mlan_ds_snmp_mib, *pmlan_ds_snmp_mib; @@ -1422,247 +1426,248 @@ enum _mlan_adhoc_status { ADHOC_IDLE, ADHOC_STARTED, ADHOC_JOINED, - ADHOC_COALESCED, ADHOC_STARTING + ADHOC_COALESCED, + ADHOC_STARTING }; typedef struct _mlan_ds_get_stats_org { - /** Statistics counter */ - /** Multicast transmitted frame count */ + /** Statistics counter */ + /** Multicast transmitted frame count */ t_u32 mcast_tx_frame; - /** Failure count */ + /** Failure count */ t_u32 failed; - /** Retry count */ + /** Retry count */ t_u32 retry; - /** Multi entry count */ + /** Multi entry count */ t_u32 multi_retry; - /** Duplicate frame count */ + /** Duplicate frame count */ t_u32 frame_dup; - /** RTS success count */ + /** RTS success count */ t_u32 rts_success; - /** RTS failure count */ + /** RTS failure count */ t_u32 rts_failure; - /** Ack failure count */ + /** Ack failure count */ t_u32 ack_failure; - /** Rx fragmentation count */ + /** Rx fragmentation count */ t_u32 rx_frag; - /** Multicast Tx frame count */ + /** Multicast Tx frame count */ t_u32 mcast_rx_frame; - /** FCS error count */ + /** FCS error count */ t_u32 fcs_error; - /** Tx frame count */ + /** Tx frame count */ t_u32 tx_frame; - /** WEP ICV error count */ + /** WEP ICV error count */ t_u32 wep_icv_error[4]; - /** beacon recv count */ + /** beacon recv count */ t_u32 bcn_rcv_cnt; - /** beacon miss count */ + /** beacon miss count */ t_u32 bcn_miss_cnt; - /** received amsdu count*/ + /** received amsdu count*/ t_u32 amsdu_rx_cnt; - /** received msdu count in amsdu*/ + /** received msdu count in amsdu*/ t_u32 msdu_in_rx_amsdu_cnt; - /** tx amsdu count*/ + /** tx amsdu count*/ t_u32 amsdu_tx_cnt; - /** tx msdu count in amsdu*/ + /** tx msdu count in amsdu*/ t_u32 msdu_in_tx_amsdu_cnt; } mlan_ds_get_stats_org; /** Type definition of mlan_ds_get_stats for MLAN_OID_GET_STATS */ typedef struct _mlan_ds_get_stats { - /** Statistics counter */ - /** Multicast transmitted frame count */ + /** Statistics counter */ + /** Multicast transmitted frame count */ t_u32 mcast_tx_frame; - /** Failure count */ + /** Failure count */ t_u32 failed; - /** Retry count */ + /** Retry count */ t_u32 retry; - /** Multi entry count */ + /** Multi entry count */ t_u32 multi_retry; - /** Duplicate frame count */ + /** Duplicate frame count */ t_u32 frame_dup; - /** RTS success count */ + /** RTS success count */ t_u32 rts_success; - /** RTS failure count */ + /** RTS failure count */ t_u32 rts_failure; - /** Ack failure count */ + /** Ack failure count */ t_u32 ack_failure; - /** Rx fragmentation count */ + /** Rx fragmentation count */ t_u32 rx_frag; - /** Multicast Tx frame count */ + /** Multicast Tx frame count */ t_u32 mcast_rx_frame; - /** FCS error count */ + /** FCS error count */ t_u32 fcs_error; - /** Tx frame count */ + /** Tx frame count */ t_u32 tx_frame; - /** WEP ICV error count */ + /** WEP ICV error count */ t_u32 wep_icv_error[4]; - /** beacon recv count */ + /** beacon recv count */ t_u32 bcn_rcv_cnt; - /** beacon miss count */ + /** beacon miss count */ t_u32 bcn_miss_cnt; - /** received amsdu count*/ + /** received amsdu count*/ t_u32 amsdu_rx_cnt; - /** received msdu count in amsdu*/ + /** received msdu count in amsdu*/ t_u32 msdu_in_rx_amsdu_cnt; - /** tx amsdu count*/ + /** tx amsdu count*/ t_u32 amsdu_tx_cnt; - /** tx msdu count in amsdu*/ + /** tx msdu count in amsdu*/ t_u32 msdu_in_tx_amsdu_cnt; - /** Tx frag count */ + /** Tx frag count */ t_u32 tx_frag_cnt; - /** Qos Tx frag count */ + /** Qos Tx frag count */ t_u32 qos_tx_frag_cnt[8]; - /** Qos failed count */ + /** Qos failed count */ t_u32 qos_failed_cnt[8]; - /** Qos retry count */ + /** Qos retry count */ t_u32 qos_retry_cnt[8]; - /** Qos multi retry count */ + /** Qos multi retry count */ t_u32 qos_multi_retry_cnt[8]; - /** Qos frame dup count */ + /** Qos frame dup count */ t_u32 qos_frm_dup_cnt[8]; - /** Qos rts success count */ + /** Qos rts success count */ t_u32 qos_rts_suc_cnt[8]; - /** Qos rts failure count */ + /** Qos rts failure count */ t_u32 qos_rts_failure_cnt[8]; - /** Qos ack failure count */ + /** Qos ack failure count */ t_u32 qos_ack_failure_cnt[8]; - /** Qos Rx frag count */ + /** Qos Rx frag count */ t_u32 qos_rx_frag_cnt[8]; - /** Qos Tx frame count */ + /** Qos Tx frame count */ t_u32 qos_tx_frm_cnt[8]; - /** Qos discarded frame count */ + /** Qos discarded frame count */ t_u32 qos_discarded_frm_cnt[8]; - /** Qos mpdus Rx count */ + /** Qos mpdus Rx count */ t_u32 qos_mpdus_rx_cnt[8]; - /** Qos retry rx count */ + /** Qos retry rx count */ t_u32 qos_retries_rx_cnt[8]; - /** CMAC ICV errors count */ + /** CMAC ICV errors count */ t_u32 cmacicv_errors; - /** CMAC replays count */ + /** CMAC replays count */ t_u32 cmac_replays; - /** mgmt CCMP replays count */ + /** mgmt CCMP replays count */ t_u32 mgmt_ccmp_replays; - /** TKIP ICV errors count */ + /** TKIP ICV errors count */ t_u32 tkipicv_errors; - /** TKIP replays count */ + /** TKIP replays count */ t_u32 tkip_replays; - /** CCMP decrypt errors count */ + /** CCMP decrypt errors count */ t_u32 ccmp_decrypt_errors; - /** CCMP replays count */ + /** CCMP replays count */ t_u32 ccmp_replays; - /** Tx amsdu count */ + /** Tx amsdu count */ t_u32 tx_amsdu_cnt; - /** failed amsdu count */ + /** failed amsdu count */ t_u32 failed_amsdu_cnt; - /** retry amsdu count */ + /** retry amsdu count */ t_u32 retry_amsdu_cnt; - /** multi-retry amsdu count */ + /** multi-retry amsdu count */ t_u32 multi_retry_amsdu_cnt; - /** Tx octets in amsdu count */ + /** Tx octets in amsdu count */ t_u64 tx_octets_in_amsdu_cnt; - /** amsdu ack failure count */ + /** amsdu ack failure count */ t_u32 amsdu_ack_failure_cnt; - /** Rx amsdu count */ + /** Rx amsdu count */ t_u32 rx_amsdu_cnt; - /** Rx octets in amsdu count */ + /** Rx octets in amsdu count */ t_u64 rx_octets_in_amsdu_cnt; - /** Tx ampdu count */ + /** Tx ampdu count */ t_u32 tx_ampdu_cnt; - /** tx mpdus in ampdu count */ + /** tx mpdus in ampdu count */ t_u32 tx_mpdus_in_ampdu_cnt; - /** tx octets in ampdu count */ + /** tx octets in ampdu count */ t_u64 tx_octets_in_ampdu_cnt; - /** ampdu Rx count */ + /** ampdu Rx count */ t_u32 ampdu_rx_cnt; - /** mpdu in Rx ampdu count */ + /** mpdu in Rx ampdu count */ t_u32 mpdu_in_rx_ampdu_cnt; - /** Rx octets ampdu count */ + /** Rx octets ampdu count */ t_u64 rx_octets_in_ampdu_cnt; - /** ampdu delimiter CRC error count */ + /** ampdu delimiter CRC error count */ t_u32 ampdu_delimiter_crc_error_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 */ + /** tkip mic failures */ t_u32 tkip_mic_failures; - /** ccmp decrypt errors */ + /** ccmp decrypt errors */ t_u32 ccmp_decrypt_errors; - /** wep undecryptable count */ + /** wep undecryptable count */ t_u32 wep_undecryptable_count; - /** wep icv error count */ + /** wep icv error count */ t_u32 wep_icv_error_count; - /** decrypt failure count */ + /** decrypt failure count */ t_u32 decrypt_failure_count; - /** dot11 multicast tx count */ + /** dot11 multicast tx count */ t_u32 mcast_tx_count; - /** dot11 failed count */ + /** dot11 failed count */ t_u32 failed_count; - /** dot11 retry count */ + /** dot11 retry count */ t_u32 retry_count; - /** dot11 multi retry count */ + /** dot11 multi retry count */ t_u32 multi_retry_count; - /** dot11 frame duplicate count */ + /** dot11 frame duplicate count */ t_u32 frame_dup_count; - /** dot11 rts success count */ + /** dot11 rts success count */ t_u32 rts_success_count; - /** dot11 rts failure count */ + /** dot11 rts failure count */ t_u32 rts_failure_count; - /** dot11 ack failure count */ + /** dot11 ack failure count */ t_u32 ack_failure_count; - /** dot11 rx ragment count */ + /** dot11 rx ragment count */ t_u32 rx_fragment_count; - /** dot11 mcast rx frame count */ + /** dot11 mcast rx frame count */ t_u32 mcast_rx_frame_count; - /** dot11 fcs error count */ + /** dot11 fcs error count */ t_u32 fcs_error_count; - /** dot11 tx frame count */ + /** dot11 tx frame count */ t_u32 tx_frame_count; - /** dot11 rsna tkip cm invoked */ + /** dot11 rsna tkip cm invoked */ t_u32 rsna_tkip_cm_invoked; - /** dot11 rsna 4way handshake failures */ + /** dot11 rsna 4way handshake failures */ t_u32 rsna_4way_hshk_failures; } mlan_ds_uap_stats, *pmlan_ds_uap_stats; /** Mask of last beacon RSSI */ -#define BCN_RSSI_LAST_MASK 0x00000001 +#define BCN_RSSI_LAST_MASK 0x00000001 /** Mask of average beacon RSSI */ -#define BCN_RSSI_AVG_MASK 0x00000002 +#define BCN_RSSI_AVG_MASK 0x00000002 /** Mask of last data RSSI */ -#define DATA_RSSI_LAST_MASK 0x00000004 +#define DATA_RSSI_LAST_MASK 0x00000004 /** Mask of average data RSSI */ -#define DATA_RSSI_AVG_MASK 0x00000008 +#define DATA_RSSI_AVG_MASK 0x00000008 /** Mask of last beacon SNR */ -#define BCN_SNR_LAST_MASK 0x00000010 +#define BCN_SNR_LAST_MASK 0x00000010 /** Mask of average beacon SNR */ -#define BCN_SNR_AVG_MASK 0x00000020 +#define BCN_SNR_AVG_MASK 0x00000020 /** Mask of last data SNR */ -#define DATA_SNR_LAST_MASK 0x00000040 +#define DATA_SNR_LAST_MASK 0x00000040 /** Mask of average data SNR */ -#define DATA_SNR_AVG_MASK 0x00000080 +#define DATA_SNR_AVG_MASK 0x00000080 /** Mask of last beacon NF */ -#define BCN_NF_LAST_MASK 0x00000100 +#define BCN_NF_LAST_MASK 0x00000100 /** Mask of average beacon NF */ -#define BCN_NF_AVG_MASK 0x00000200 +#define BCN_NF_AVG_MASK 0x00000200 /** Mask of last data NF */ -#define DATA_NF_LAST_MASK 0x00000400 +#define DATA_NF_LAST_MASK 0x00000400 /** Mask of average data NF */ -#define DATA_NF_AVG_MASK 0x00000800 +#define DATA_NF_AVG_MASK 0x00000800 /** Mask of all RSSI_INFO */ -#define ALL_RSSI_INFO_MASK 0x00000fff -#define MAX_PATH_NUM 3 +#define ALL_RSSI_INFO_MASK 0x00000fff +#define MAX_PATH_NUM 3 /** path A */ -#define PATH_A 0x01 +#define PATH_A 0x01 /** path B */ -#define PATH_B 0x02 +#define PATH_B 0x02 /** path AB */ -#define PATH_AB 0x03 +#define PATH_AB 0x03 /** ALL the path */ -#define PATH_ALL 0 +#define PATH_ALL 0 /** Type definition of mlan_ds_get_signal for MLAN_OID_GET_SIGNAL */ typedef struct _mlan_ds_get_signal { - /** Selector of get operation */ + /** Selector of get operation */ /* * Bit0: Last Beacon RSSI, Bit1: Average Beacon RSSI, * Bit2: Last Data RSSI, Bit3: Average Data RSSI, @@ -1676,268 +1681,268 @@ typedef struct _mlan_ds_get_signal { */ t_u16 selector; - /** RSSI */ - /** RSSI of last beacon */ + /** RSSI */ + /** RSSI of last beacon */ t_s16 bcn_rssi_last; - /** RSSI of beacon average */ + /** RSSI of beacon average */ t_s16 bcn_rssi_avg; - /** RSSI of last data packet */ + /** RSSI of last data packet */ t_s16 data_rssi_last; - /** RSSI of data packet average */ + /** RSSI of data packet average */ t_s16 data_rssi_avg; - /** SNR */ - /** SNR of last beacon */ + /** SNR */ + /** SNR of last beacon */ t_s16 bcn_snr_last; - /** SNR of beacon average */ + /** SNR of beacon average */ t_s16 bcn_snr_avg; - /** SNR of last data packet */ + /** SNR of last data packet */ t_s16 data_snr_last; - /** SNR of data packet average */ + /** SNR of data packet average */ t_s16 data_snr_avg; - /** NF */ - /** NF of last beacon */ + /** NF */ + /** NF of last beacon */ t_s16 bcn_nf_last; - /** NF of beacon average */ + /** NF of beacon average */ t_s16 bcn_nf_avg; - /** NF of last data packet */ + /** NF of last data packet */ t_s16 data_nf_last; - /** NF of data packet average */ + /** NF of data packet average */ t_s16 data_nf_avg; } mlan_ds_get_signal, *pmlan_ds_get_signal; /** bit for 2.4 G antenna diversity */ -#define ANT_DIVERSITY_2G MBIT(3) +#define ANT_DIVERSITY_2G MBIT(3) /** bit for 5 G antenna diversity */ -#define ANT_DIVERSITY_5G MBIT(7) +#define ANT_DIVERSITY_5G MBIT(7) /** mlan_fw_info data structure for MLAN_OID_GET_FW_INFO */ typedef struct _mlan_fw_info { - /** Firmware version */ + /** Firmware version */ t_u32 fw_ver; - /** MAC address */ + /** MAC address */ mlan_802_11_mac_addr mac_addr; - /** 802.11n device capabilities */ + /** 802.11n device capabilities */ t_u32 hw_dot_11n_dev_cap; - /** Device support for MIMO abstraction of MCSs */ + /** Device support for MIMO abstraction of MCSs */ t_u8 hw_dev_mcs_support; - /** user's MCS setting */ + /** user's MCS setting */ t_u8 usr_dev_mcs_support; - /** 802.11ac device capabilities */ + /** 802.11ac device capabilities */ t_u32 hw_dot_11ac_dev_cap; - /** 802.11ac device Capabilities for 2.4GHz */ + /** 802.11ac device Capabilities for 2.4GHz */ t_u32 usr_dot_11ac_dev_cap_bg; - /** 802.11ac device Capabilities for 5GHz */ + /** 802.11ac device Capabilities for 5GHz */ t_u32 usr_dot_11ac_dev_cap_a; - /** length of hw he capability */ + /** length of hw he capability */ t_u8 hw_hecap_len; - /** 802.11ax HE capability */ + /** 802.11ax HE capability */ t_u8 hw_he_cap[54]; - /** length of hw 2.4G he capability */ + /** length of hw 2.4G he capability */ t_u8 hw_2g_hecap_len; - /** 802.11ax 2.4G HE capability */ + /** 802.11ax 2.4G HE capability */ t_u8 hw_2g_he_cap[54]; - /** 802.11ac device support for MIMO abstraction of MCSs */ + /** 802.11ac device support for MIMO abstraction of MCSs */ t_u32 hw_dot_11ac_mcs_support; - /** User conf 802.11ac device support for MIMO abstraction of MCSs */ + /** User conf 802.11ac device support for MIMO abstraction of MCSs */ t_u32 usr_dot_11ac_mcs_support; /** fw supported band */ t_u16 fw_bands; /** region code */ t_u16 region_code; - /** ECSA support */ + /** ECSA support */ t_u8 ecsa_enable; - /** Get log support */ + /** Get log support */ t_u8 getlog_enable; - /** FW support for embedded supplicant */ + /** FW support for embedded supplicant */ t_u8 fw_supplicant_support; - /** ant info */ + /** ant info */ t_u8 antinfo; - /** max AP associated sta count supported by fw */ + /** max AP associated sta count supported by fw */ t_u8 max_ap_assoc_sta; - /** Bandwidth not support 80Mhz */ + /** Bandwidth not support 80Mhz */ t_u8 prohibit_80mhz; } mlan_fw_info, *pmlan_fw_info; /** Version string buffer length */ -#define MLAN_MAX_VER_STR_LEN 128 +#define MLAN_MAX_VER_STR_LEN 128 /** mlan_ver_ext data structure for MLAN_OID_GET_VER_EXT */ typedef struct _mlan_ver_ext { - /** Selected version string */ + /** Selected version string */ t_u32 version_str_sel; - /** Version string */ + /** Version string */ char version_str[MLAN_MAX_VER_STR_LEN]; } mlan_ver_ext, *pmlan_ver_ext; #ifdef BIG_ENDIAN_SUPPORT /** Extended Capabilities Data */ typedef struct MLAN_PACK_START _ExtCap_t { - /** Extended Capabilities value */ - t_u8 rsvdBit79:1; /* bit 79 */ - t_u8 TWTResp:1; /* bit 78 */ - t_u8 TWTReq:1; /* bit 77 */ - t_u8 rsvdBit76:1; /* bit 76 */ - t_u8 rsvdBit75:1; /* bit 75 */ - t_u8 rsvdBit74:1; /* bit 74 */ - t_u8 rsvdBit73:1; /* bit 73 */ - t_u8 FILS:1; /* bit 72 */ - t_u8 FTMI:1; /* bit 71 */ - t_u8 FTMR:1; /* bit 70 */ - t_u8 CAQ:1; /* bit 69 */ - t_u8 rsvdBit68:1; /* bit 68 */ - t_u8 NCC:1; /* bit 67 */ - t_u8 rsvdBit66:1; /* bit 66 */ - t_u8 chanSchedMgnt:1; /* bit 65 */ - t_u8 MaxAMSDU:2; /* bit 63-bit 64 */ - 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 */ + /** Extended Capabilities value */ + t_u8 rsvdBit79 : 1; /* bit 79 */ + t_u8 TWTResp : 1; /* bit 78 */ + t_u8 TWTReq : 1; /* bit 77 */ + t_u8 rsvdBit76 : 1; /* bit 76 */ + t_u8 rsvdBit75 : 1; /* bit 75 */ + t_u8 rsvdBit74 : 1; /* bit 74 */ + t_u8 rsvdBit73 : 1; /* bit 73 */ + t_u8 FILS : 1; /* bit 72 */ + t_u8 FTMI : 1; /* bit 71 */ + t_u8 FTMR : 1; /* bit 70 */ + t_u8 CAQ : 1; /* bit 69 */ + t_u8 rsvdBit68 : 1; /* bit 68 */ + t_u8 NCC : 1; /* bit 67 */ + t_u8 rsvdBit66 : 1; /* bit 66 */ + t_u8 chanSchedMgnt : 1; /* bit 65 */ + t_u8 MaxAMSDU : 2; /* bit 63-bit 64 */ + 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 MaxAMSDU:2; /* bit 63-bit 64 */ - t_u8 chanSchedMgnt:1; /* bit 65 */ - t_u8 rsvdBit66:1; /* bit 66 */ - t_u8 NCC:1; /* bit 67 */ - t_u8 rsvdBit68:1; /* bit 68 */ - t_u8 CAQ:1; /* bit 69 */ - t_u8 FTMR:1; /* bit 70 */ - t_u8 FTMI:1; /* bit 71 */ - t_u8 FILS:1; /* bit 72 */ - t_u8 rsvdBit73:1; /* bit 73 */ - t_u8 rsvdBit74:1; /* bit 74 */ - t_u8 rsvdBit75:1; /* bit 75 */ - t_u8 rsvdBit76:1; /* bit 76 */ - t_u8 TWTReq:1; /* bit 77 */ - t_u8 TWTResp:1; /* bit 78 */ - t_u8 rsvdBit79:1; /* bit 79 */ + /** 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 MaxAMSDU : 2; /* bit 63-bit 64 */ + t_u8 chanSchedMgnt : 1; /* bit 65 */ + t_u8 rsvdBit66 : 1; /* bit 66 */ + t_u8 NCC : 1; /* bit 67 */ + t_u8 rsvdBit68 : 1; /* bit 68 */ + t_u8 CAQ : 1; /* bit 69 */ + t_u8 FTMR : 1; /* bit 70 */ + t_u8 FTMI : 1; /* bit 71 */ + t_u8 FILS : 1; /* bit 72 */ + t_u8 rsvdBit73 : 1; /* bit 73 */ + t_u8 rsvdBit74 : 1; /* bit 74 */ + t_u8 rsvdBit75 : 1; /* bit 75 */ + t_u8 rsvdBit76 : 1; /* bit 76 */ + t_u8 TWTReq : 1; /* bit 77 */ + t_u8 TWTResp : 1; /* bit 78 */ + t_u8 rsvdBit79 : 1; /* bit 79 */ } MLAN_PACK_END ExtCap_t, *pExtCap_t; #endif @@ -1948,120 +1953,120 @@ typedef struct MLAN_PACK_START _ExtCap_t { /** mlan_bss_info data structure for MLAN_OID_GET_BSS_INFO */ typedef struct _mlan_bss_info { - /** BSS mode */ + /** BSS mode */ t_u32 bss_mode; - /** SSID */ + /** SSID */ mlan_802_11_ssid ssid; - /** Table index */ + /** Table index */ t_u32 scan_table_idx; - /** Channel */ + /** Channel */ t_u32 bss_chan; - /** Band */ + /** Band */ t_u8 bss_band; - /** Region code */ + /** Region code */ t_u32 region_code; - /** Connection status */ + /** Connection status */ t_u32 media_connected; - /** Radio on */ + /** Radio on */ t_u32 radio_on; - /** Max power level in dBm */ + /** Max power level in dBm */ t_s32 max_power_level; - /** Min power level in dBm */ + /** Min power level in dBm */ t_s32 min_power_level; - /** Adhoc state */ + /** Adhoc state */ t_u32 adhoc_state; - /** NF of last beacon */ + /** NF of last beacon */ t_s32 bcn_nf_last; - /** wep status */ + /** wep status */ t_u32 wep_status; - /** scan block status */ + /** scan block status */ t_u8 scan_block; - /** Host Sleep configured flag */ + /** Host Sleep configured flag */ t_u32 is_hs_configured; - /** Deep Sleep flag */ + /** Deep Sleep flag */ t_u32 is_deep_sleep; - /** BSSID */ + /** BSSID */ mlan_802_11_mac_addr bssid; #ifdef STA_SUPPORT - /** Capability Info */ + /** Capability Info */ t_u16 capability_info; - /** Beacon Interval */ + /** Beacon Interval */ t_u16 beacon_interval; - /** Listen Interval */ + /** Listen Interval */ t_u16 listen_interval; - /** Association Id */ + /** Association Id */ t_u16 assoc_id; - /** AP/Peer supported rates */ + /** AP/Peer supported rates */ t_u8 peer_supp_rates[MLAN_SUPPORTED_RATES]; - /** extend capability for AP */ + /** extend capability for AP */ ExtCap_t ext_cap; -#endif /* STA_SUPPORT */ - /** Mobility Domain ID */ +#endif /* STA_SUPPORT */ + /** Mobility Domain ID */ t_u16 mdid; - /** FT Capability policy */ + /** FT Capability policy */ t_u8 ft_cap; - /** 11h active */ + /** 11h active */ t_bool is_11h_active; - /** dfs check channel */ + /** dfs check channel */ t_u8 dfs_check_channel; } mlan_bss_info, *pmlan_bss_info; /** MAXIMUM number of TID */ -#define MAX_NUM_TID 8 +#define MAX_NUM_TID 8 /** Max RX Win size */ -#define MAX_RX_WINSIZE 64 +#define MAX_RX_WINSIZE 64 /** rx_reorder_tbl */ typedef struct { - /** TID */ + /** TID */ t_u16 tid; - /** TA */ + /** TA */ t_u8 ta[MLAN_MAC_ADDR_LENGTH]; - /** Start window */ + /** Start window */ t_u32 start_win; - /** Window size */ + /** Window size */ t_u32 win_size; - /** amsdu flag */ + /** amsdu flag */ t_u8 amsdu; - /** buffer status */ + /** buffer status */ t_u32 buffer[MAX_RX_WINSIZE]; } rx_reorder_tbl; /** tx_ba_stream_tbl */ typedef struct { - /** TID */ + /** TID */ t_u16 tid; - /** RA */ + /** RA */ t_u8 ra[MLAN_MAC_ADDR_LENGTH]; - /** amsdu flag */ + /** amsdu flag */ t_u8 amsdu; } tx_ba_stream_tbl; /** Debug command number */ -#define DBG_CMD_NUM 10 +#define DBG_CMD_NUM 10 #ifdef SDIO /** sdio mp debug number */ -#define SDIO_MP_DBG_NUM 10 +#define SDIO_MP_DBG_NUM 10 #endif #ifdef PCIE -#define MLAN_MAX_TXRX_BD 0x20 +#define MLAN_MAX_TXRX_BD 0x20 #endif /** Maximum size of IEEE Information Elements */ -#define IEEE_MAX_IE_SIZE 256 +#define IEEE_MAX_IE_SIZE 256 /** max ralist num */ -#define MLAN_MAX_RALIST_NUM 8 +#define MLAN_MAX_RALIST_NUM 8 /** ralist info */ typedef struct _ralist_info { - /** RA list buffer */ + /** RA list buffer */ t_u8 ra[MLAN_MAC_ADDR_LENGTH]; - /** total packets in RA list */ + /** total packets in RA list */ t_u16 total_pkts; - /** tid num */ + /** tid num */ t_u8 tid; /** tx_pause flag */ t_u8 tx_pause; @@ -2077,248 +2082,248 @@ typedef struct _mlan_debug_info { t_u32 wmm_ac_vi; /* WMM AC_VO count */ t_u32 wmm_ac_vo; - /** Corresponds to max_tx_buf_size member of mlan_adapter*/ + /** Corresponds to max_tx_buf_size member of mlan_adapter*/ t_u32 max_tx_buf_size; - /** Corresponds to tx_buf_size member of mlan_adapter*/ + /** Corresponds to tx_buf_size member of mlan_adapter*/ t_u32 tx_buf_size; - /** Corresponds to curr_tx_buf_size member of mlan_adapter*/ + /** Corresponds to curr_tx_buf_size member of mlan_adapter*/ t_u32 curr_tx_buf_size; - /** Tx table num */ + /** Tx table num */ t_u32 tx_tbl_num; - /** Tx ba stream table */ + /** Tx ba stream table */ tx_ba_stream_tbl tx_tbl[MLAN_MAX_TX_BASTREAM_SUPPORTED]; - /** Rx table num */ + /** Rx table num */ t_u32 rx_tbl_num; - /** Rx reorder table*/ + /** Rx reorder table*/ rx_reorder_tbl rx_tbl[MLAN_MAX_RX_BASTREAM_SUPPORTED]; - /** ralist num */ + /** ralist num */ t_u32 ralist_num; - /** ralist info */ + /** ralist info */ ralist_info ralist[MLAN_MAX_RALIST_NUM]; - /** Corresponds to ps_mode member of mlan_adapter */ + /** Corresponds to ps_mode member of mlan_adapter */ t_u16 ps_mode; - /** Corresponds to ps_state member of mlan_adapter */ + /** Corresponds to ps_state member of mlan_adapter */ t_u32 ps_state; #ifdef STA_SUPPORT - /** Corresponds to is_deep_sleep member of mlan_adapter */ + /** Corresponds to is_deep_sleep member of mlan_adapter */ t_u8 is_deep_sleep; #endif /** STA_SUPPORT */ - /** Corresponds to pm_wakeup_card_req member of mlan_adapter */ + /** Corresponds to pm_wakeup_card_req member of mlan_adapter */ t_u8 pm_wakeup_card_req; - /** Corresponds to pm_wakeup_fw_try member of mlan_adapter */ + /** Corresponds to pm_wakeup_fw_try member of mlan_adapter */ t_u32 pm_wakeup_fw_try; - /** time stamp when host try to wake up firmware */ + /** time stamp when host try to wake up firmware */ t_u32 pm_wakeup_in_secs; /** wake up timeout happened */ t_u32 pm_wakeup_timeout; - /** Corresponds to is_hs_configured member of mlan_adapter */ + /** Corresponds to is_hs_configured member of mlan_adapter */ t_u8 is_hs_configured; - /** Corresponds to hs_activated member of mlan_adapter */ + /** Corresponds to hs_activated member of mlan_adapter */ t_u8 hs_activated; - /** Corresponds to pps_uapsd_mode member of mlan_adapter */ + /** Corresponds to pps_uapsd_mode member of mlan_adapter */ t_u16 pps_uapsd_mode; - /** Corresponds to sleep_period.period member of mlan_adapter */ + /** Corresponds to sleep_period.period member of mlan_adapter */ t_u16 sleep_pd; - /** Corresponds to wmm_qosinfo member of mlan_private */ + /** Corresponds to wmm_qosinfo member of mlan_private */ t_u8 qos_cfg; - /** Corresponds to tx_lock_flag member of mlan_adapter */ + /** Corresponds to tx_lock_flag member of mlan_adapter */ t_u8 tx_lock_flag; - /** Corresponds to port_open member of mlan_private */ + /** Corresponds to port_open member of mlan_private */ t_u8 port_open; - /** bypass pkt count */ + /** bypass pkt count */ t_u16 bypass_pkt_count; - /** Corresponds to scan_processing member of mlan_adapter */ + /** Corresponds to scan_processing member of mlan_adapter */ t_u32 scan_processing; - /** Corresponds to mlan_processing member of mlan_adapter */ + /** Corresponds to mlan_processing member of mlan_adapter */ t_u32 mlan_processing; - /** Corresponds to main_lock_flag member of mlan_adapter */ + /** Corresponds to main_lock_flag member of mlan_adapter */ t_u32 main_lock_flag; - /** Corresponds to main_process_cnt member of mlan_adapter */ + /** Corresponds to main_process_cnt member of mlan_adapter */ t_u32 main_process_cnt; /** Corresponds to delay_task_flag member of mlan_adapter */ t_u32 delay_task_flag; - /** mlan_rx_processing */ + /** mlan_rx_processing */ t_u32 mlan_rx_processing; - /** rx pkts queued */ + /** rx pkts queued */ t_u32 rx_pkts_queued; - /** Number of host to card command failures */ + /** Number of host to card command failures */ t_u32 num_cmd_host_to_card_failure; - /** Number of host to card sleep confirm failures */ + /** Number of host to card sleep confirm failures */ t_u32 num_cmd_sleep_cfm_host_to_card_failure; - /** Number of host to card Tx failures */ + /** Number of host to card Tx failures */ t_u32 num_tx_host_to_card_failure; - /** Number of allocate buffer failure */ + /** Number of allocate buffer failure */ t_u32 num_alloc_buffer_failure; - /** Number of pkt dropped */ + /** Number of pkt dropped */ t_u32 num_pkt_dropped; #ifdef SDIO - /** Number of card to host command/event failures */ + /** Number of card to host command/event failures */ t_u32 num_cmdevt_card_to_host_failure; - /** Number of card to host Rx failures */ + /** Number of card to host Rx failures */ t_u32 num_rx_card_to_host_failure; - /** Number of interrupt read failures */ + /** Number of interrupt read failures */ t_u32 num_int_read_failure; - /** Last interrupt status */ + /** Last interrupt status */ t_u32 last_int_status; - /** number of interrupt receive */ + /** number of interrupt receive */ t_u32 num_of_irq; - /** flag for sdio rx aggr */ + /** flag for sdio rx aggr */ t_u8 sdio_rx_aggr; - /** FW update port number */ + /** FW update port number */ t_u32 mp_update[SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX * 2]; /** Invalid port update count */ t_u32 mp_invalid_update; - /** Number of packets tx aggr */ + /** Number of packets tx aggr */ t_u32 mpa_tx_count[SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX]; - /** no more packets count*/ + /** no more packets count*/ t_u32 mpa_sent_last_pkt; - /** no write_ports count */ + /** no write_ports count */ t_u32 mpa_sent_no_ports; /** last recv wr_bitmap */ t_u32 last_recv_wr_bitmap; - /** last mp_wr_bitmap */ + /** last mp_wr_bitmap */ t_u32 last_mp_wr_bitmap[SDIO_MP_DBG_NUM]; - /** last ports for cmd53 write data */ + /** last ports for cmd53 write data */ t_u32 last_mp_wr_ports[SDIO_MP_DBG_NUM]; /** last len for cmd53 write data */ t_u32 last_mp_wr_len[SDIO_MP_DBG_NUM]; - /** last curr_wr_port */ + /** last curr_wr_port */ t_u8 last_curr_wr_port[SDIO_MP_DBG_NUM]; - /** length info for cmd53 write data */ + /** length info for cmd53 write data */ t_u16 last_mp_wr_info[SDIO_MP_DBG_NUM * SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX]; - /** last mp_index */ + /** last mp_index */ t_u8 last_mp_index; - /** buffer for mp debug */ + /** buffer for mp debug */ t_u8 *mpa_buf; - /** length info for mp buf size */ + /** length info for mp buf size */ t_u32 mpa_buf_size; - /** Number of packets rx aggr */ + /** Number of packets rx aggr */ t_u32 mpa_rx_count[SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX]; /** mp aggr_pkt limit */ t_u8 mp_aggr_pkt_limit; #endif - /** Number of deauthentication events */ + /** Number of deauthentication events */ t_u32 num_event_deauth; - /** Number of disassosiation events */ + /** Number of disassosiation events */ t_u32 num_event_disassoc; - /** Number of link lost events */ + /** Number of link lost events */ t_u32 num_event_link_lost; - /** Number of deauthentication commands */ + /** Number of deauthentication commands */ t_u32 num_cmd_deauth; - /** Number of association comamnd successes */ + /** Number of association comamnd successes */ t_u32 num_cmd_assoc_success; - /** Number of association command failures */ + /** Number of association command failures */ t_u32 num_cmd_assoc_failure; - /** Number of consecutive association failures */ + /** Number of consecutive association failures */ t_u32 num_cons_assoc_failure; - /** Number of command timeouts */ + /** Number of command timeouts */ t_u32 num_cmd_timeout; - /** Timeout command ID */ + /** Timeout command ID */ t_u16 timeout_cmd_id; - /** Timeout command action */ + /** Timeout command action */ t_u16 timeout_cmd_act; - /** List of last command IDs */ + /** List of last command IDs */ t_u16 last_cmd_id[DBG_CMD_NUM]; - /** List of last command actions */ + /** List of last command actions */ t_u16 last_cmd_act[DBG_CMD_NUM]; - /** Last command index */ + /** Last command index */ t_u16 last_cmd_index; - /** List of last command response IDs */ + /** List of last command response IDs */ t_u16 last_cmd_resp_id[DBG_CMD_NUM]; - /** Last command response index */ + /** Last command response index */ t_u16 last_cmd_resp_index; - /** List of last events */ + /** List of last events */ t_u16 last_event[DBG_CMD_NUM]; - /** Last event index */ + /** Last event index */ t_u16 last_event_index; - /** Number of no free command node */ + /** Number of no free command node */ t_u16 num_no_cmd_node; - /** pending command id */ + /** pending command id */ t_u16 pending_cmd; - /** time stamp for dnld last cmd */ + /** time stamp for dnld last cmd */ t_u32 dnld_cmd_in_secs; - /** Corresponds to data_sent member of mlan_adapter */ + /** Corresponds to data_sent member of mlan_adapter */ t_u8 data_sent; - /** Corresponds to cmd_sent member of mlan_adapter */ + /** Corresponds to cmd_sent member of mlan_adapter */ t_u8 cmd_sent; - /** SDIO multiple port read bitmap */ + /** SDIO multiple port read bitmap */ t_u32 mp_rd_bitmap; - /** SDIO multiple port write bitmap */ + /** SDIO multiple port write bitmap */ t_u32 mp_wr_bitmap; - /** Current available port for read */ + /** Current available port for read */ t_u8 curr_rd_port; - /** Current available port for write */ + /** Current available port for write */ t_u8 curr_wr_port; #ifdef PCIE - /** PCIE txbd read pointer */ + /** PCIE txbd read pointer */ t_u32 txbd_rdptr; - /** PCIE txbd write pointer */ + /** PCIE txbd write pointer */ t_u32 txbd_wrptr; - /** PCIE rxbd read pointer */ + /** PCIE rxbd read pointer */ t_u32 rxbd_rdptr; - /** PCIE rxbd write pointer */ + /** PCIE rxbd write pointer */ t_u32 rxbd_wrptr; - /** PCIE eventbd read pointer */ + /** PCIE eventbd read pointer */ t_u32 eventbd_rdptr; - /** PCIE eventbd write pointer */ + /** PCIE eventbd write pointer */ t_u32 eventbd_wrptr; - /** Last pkt size in transmit */ + /** Last pkt size in transmit */ t_u32 last_tx_pkt_size[MLAN_MAX_TXRX_BD]; - /** txbd ring vbase */ + /** txbd ring vbase */ t_u8 *txbd_ring_vbase; - /** txbd ring size */ + /** txbd ring size */ t_u32 txbd_ring_size; - /** rxbd ring vbase */ + /** rxbd ring vbase */ t_u8 *rxbd_ring_vbase; - /** rxbd ring size */ + /** rxbd ring size */ t_u32 rxbd_ring_size; - /** evtbd ring vbase */ + /** evtbd ring vbase */ t_u8 *evtbd_ring_vbase; - /** evtbd ring size */ + /** evtbd ring size */ t_u32 evtbd_ring_size; #endif - /** Corresponds to cmdresp_received member of mlan_adapter */ + /** Corresponds to cmdresp_received member of mlan_adapter */ t_u8 cmd_resp_received; - /** Corresponds to event_received member of mlan_adapter */ + /** Corresponds to event_received member of mlan_adapter */ t_u8 event_received; - /** pendig tx pkts */ + /** pendig tx pkts */ t_u32 tx_pkts_queued; #ifdef UAP_SUPPORT - /** pending bridge pkts */ + /** pending bridge pkts */ t_u16 num_bridge_pkts; - /** dropped pkts */ + /** dropped pkts */ t_u32 num_drop_pkts; #endif - /** FW hang report */ + /** FW hang report */ t_u8 fw_hang_report; - /** mlan_adapter pointer */ + /** mlan_adapter pointer */ t_void *mlan_adapter; - /** mlan_adapter_size */ + /** mlan_adapter_size */ t_u32 mlan_adapter_size; - /** mlan_priv vector */ + /** mlan_priv vector */ t_void *mlan_priv[MLAN_MAX_BSS_NUM]; - /** mlan_priv_size */ + /** mlan_priv_size */ t_u32 mlan_priv_size[MLAN_MAX_BSS_NUM]; - /** mlan_priv_num */ + /** mlan_priv_num */ t_u8 mlan_priv_num; } mlan_debug_info, *pmlan_debug_info; #ifdef UAP_SUPPORT /** Maximum number of clients supported by AP */ -#define MAX_NUM_CLIENTS MAX_STA_COUNT +#define MAX_NUM_CLIENTS MAX_STA_COUNT /** station info */ typedef struct _sta_info { - /** STA MAC address */ + /** STA MAC address */ t_u8 mac_address[MLAN_MAC_ADDR_LENGTH]; - /** Power mgmt status */ + /** Power mgmt status */ t_u8 power_mgmt_status; - /** RSSI */ + /** RSSI */ t_s8 rssi; - /** station bandmode */ + /** station bandmode */ t_u16 bandmode; - /** station stats */ + /** station stats */ sta_stats stats; /** ie length */ t_u16 ie_len; @@ -2328,42 +2333,42 @@ typedef struct _sta_info { /** mlan_ds_sta_list structure for MLAN_OID_UAP_STA_LIST */ typedef struct _mlan_ds_sta_list { - /** station count */ + /** station count */ t_u16 sta_count; - /** station list */ + /** station list */ sta_info info[MAX_NUM_CLIENTS]; } mlan_ds_sta_list, *pmlan_ds_sta_list; #endif /** Type definition of mlan_ds_get_info for MLAN_IOCTL_GET_INFO */ typedef struct _mlan_ds_get_info { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** Status information parameter */ + /** Status information parameter */ union { - /** Signal information for MLAN_OID_GET_SIGNAL */ + /** Signal information for MLAN_OID_GET_SIGNAL */ mlan_ds_get_signal signal; /** Signal path id for MLAN_OID_GET_SIGNAL_EXT */ t_u16 path_id; - /** Signal information for MLAN_OID_GET_SIGNAL_EXT */ + /** Signal information for MLAN_OID_GET_SIGNAL_EXT */ mlan_ds_get_signal signal_ext[MAX_PATH_NUM]; - /** Statistics information for MLAN_OID_GET_STATS */ + /** Statistics information for MLAN_OID_GET_STATS */ mlan_ds_get_stats stats; - /** Statistics information for MLAN_OID_LINK_STATS*/ + /** Statistics information for MLAN_OID_LINK_STATS*/ t_u8 link_statistic[1]; - /** Firmware information for MLAN_OID_GET_FW_INFO */ + /** Firmware information for MLAN_OID_GET_FW_INFO */ mlan_fw_info fw_info; - /** Extended version information for MLAN_OID_GET_VER_EXT */ + /** Extended version information for MLAN_OID_GET_VER_EXT */ mlan_ver_ext ver_ext; - /** BSS information for MLAN_OID_GET_BSS_INFO */ + /** BSS information for MLAN_OID_GET_BSS_INFO */ mlan_bss_info bss_info; - /** Debug information for MLAN_OID_GET_DEBUG_INFO */ + /** Debug information for MLAN_OID_GET_DEBUG_INFO */ t_u8 debug_info[1]; #ifdef UAP_SUPPORT - /** UAP Statistics information for MLAN_OID_GET_STATS */ + /** UAP Statistics information for MLAN_OID_GET_STATS */ mlan_ds_uap_stats ustats; - /** UAP station list for MLAN_OID_UAP_STA_LIST */ + /** UAP station list for MLAN_OID_UAP_STA_LIST */ mlan_ds_sta_list sta_list; #endif } param; @@ -2415,174 +2420,175 @@ enum _mlan_psk_type { }; /** The bit to indicate the key is for unicast */ -#define MLAN_KEY_INDEX_UNICAST 0x40000000 +#define MLAN_KEY_INDEX_UNICAST 0x40000000 /** The key index to indicate default key */ -#define MLAN_KEY_INDEX_DEFAULT 0x000000ff +#define MLAN_KEY_INDEX_DEFAULT 0x000000ff /** Maximum key length */ /* #define MLAN_MAX_KEY_LENGTH 32 */ /** Minimum passphrase length */ -#define MLAN_MIN_PASSPHRASE_LENGTH 8 +#define MLAN_MIN_PASSPHRASE_LENGTH 8 /** Maximum passphrase length */ -#define MLAN_MAX_PASSPHRASE_LENGTH 63 +#define MLAN_MAX_PASSPHRASE_LENGTH 63 /** Minimum sae_password length */ -#define MLAN_MIN_SAE_PASSWORD_LENGTH 8 +#define MLAN_MIN_SAE_PASSWORD_LENGTH 8 /** Maximum sae_password length */ -#define MLAN_MAX_SAE_PASSWORD_LENGTH 255 +#define MLAN_MAX_SAE_PASSWORD_LENGTH 255 /** PMK length */ -#define MLAN_PMK_HEXSTR_LENGTH 64 +#define MLAN_PMK_HEXSTR_LENGTH 64 /* A few details needed for WEP (Wireless Equivalent Privacy) */ /** 104 bits */ -#define MAX_WEP_KEY_SIZE 13 +#define MAX_WEP_KEY_SIZE 13 /** 40 bits RC4 - WEP */ -#define MIN_WEP_KEY_SIZE 5 +#define MIN_WEP_KEY_SIZE 5 /** packet number size */ -#define PN_SIZE 16 +#define PN_SIZE 16 /** max seq size of wpa/wpa2 key */ -#define SEQ_MAX_SIZE 8 +#define SEQ_MAX_SIZE 8 /** key flag for tx_seq */ -#define KEY_FLAG_TX_SEQ_VALID 0x00000001 +#define KEY_FLAG_TX_SEQ_VALID 0x00000001 /** key flag for rx_seq */ -#define KEY_FLAG_RX_SEQ_VALID 0x00000002 +#define KEY_FLAG_RX_SEQ_VALID 0x00000002 /** key flag for group key */ -#define KEY_FLAG_GROUP_KEY 0x00000004 +#define KEY_FLAG_GROUP_KEY 0x00000004 /** key flag for tx */ -#define KEY_FLAG_SET_TX_KEY 0x00000008 +#define KEY_FLAG_SET_TX_KEY 0x00000008 /** key flag for mcast IGTK */ #define KEY_FLAG_AES_MCAST_IGTK 0x00000010 /** key flag for remove key */ -#define KEY_FLAG_REMOVE_KEY 0x80000000 +#define KEY_FLAG_REMOVE_KEY 0x80000000 /** key flag for GCMP */ -#define KEY_FLAG_GCMP 0x00000020 +#define KEY_FLAG_GCMP 0x00000020 /** key flag for GCMP_256 */ -#define KEY_FLAG_GCMP_256 0x00000040 +#define KEY_FLAG_GCMP_256 0x00000040 /** key flag for ccmp 256 */ -#define KEY_FLAG_CCMP_256 0x00000080 +#define KEY_FLAG_CCMP_256 0x00000080 /** Type definition of mlan_ds_encrypt_key for MLAN_OID_SEC_CFG_ENCRYPT_KEY */ typedef struct _mlan_ds_encrypt_key { - /** Key disabled, all other fields will be - * ignore when this flag set to MTRUE - */ + /** Key disabled, all other fields will be + * ignore when this flag set to MTRUE + */ t_u32 key_disable; - /** key removed flag, when this flag is set - * to MTRUE, only key_index will be check - */ + /** key removed flag, when this flag is set + * to MTRUE, only key_index will be check + */ t_u32 key_remove; - /** Key index, used as current tx key index - * when is_current_wep_key is set to MTRUE - */ + /** Key index, used as current tx key index + * when is_current_wep_key is set to MTRUE + */ t_u32 key_index; - /** Current Tx key flag */ + /** Current Tx key flag */ t_u32 is_current_wep_key; - /** Key length */ + /** Key length */ t_u32 key_len; - /** Key */ + /** Key */ t_u8 key_material[MLAN_MAX_KEY_LENGTH]; - /** mac address */ + /** mac address */ t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; - /** wapi key flag */ + /** wapi key flag */ t_u32 is_wapi_key; - /** Initial packet number */ + /** Initial packet number */ t_u8 pn[PN_SIZE]; - /** key flags */ + /** 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 */ + /** Length of passphrase */ t_u32 passphrase_len; - /** Passphrase */ + /** Passphrase */ t_u8 passphrase[MLAN_MAX_PASSPHRASE_LENGTH]; } mlan_passphrase_t; /** Type definition of mlan_sae_password_t */ typedef struct _mlan_sae_password_t { - /** Length of SAE Password */ + /** Length of SAE Password */ t_u32 sae_password_len; - /** SAE Password */ + /** SAE Password */ t_u8 sae_password[MLAN_MAX_SAE_PASSWORD_LENGTH]; } mlan_sae_password_t; /** Type defnition of mlan_pmk_t */ typedef struct _mlan_pmk_t { - /** PMK */ + /** PMK */ t_u8 pmk[MLAN_MAX_KEY_LENGTH]; } mlan_pmk_t; /** Embedded supplicant RSN type: No RSN */ -#define RSN_TYPE_NO_RSN MBIT(0) +#define RSN_TYPE_NO_RSN MBIT(0) /** Embedded supplicant RSN type: WPA */ -#define RSN_TYPE_WPA MBIT(3) +#define RSN_TYPE_WPA MBIT(3) /** Embedded supplicant RSN type: WPA-NONE */ -#define RSN_TYPE_WPANONE MBIT(4) +#define RSN_TYPE_WPANONE MBIT(4) /** Embedded supplicant RSN type: WPA2 */ -#define RSN_TYPE_WPA2 MBIT(5) +#define RSN_TYPE_WPA2 MBIT(5) /** Embedded supplicant RSN type: RFU */ -#define RSN_TYPE_VALID_BITS (RSN_TYPE_NO_RSN | RSN_TYPE_WPA | RSN_TYPE_WPANONE | RSN_TYPE_WPA2) +#define RSN_TYPE_VALID_BITS \ + (RSN_TYPE_NO_RSN | RSN_TYPE_WPA | RSN_TYPE_WPANONE | RSN_TYPE_WPA2) /** Embedded supplicant cipher type: TKIP */ -#define EMBED_CIPHER_TKIP MBIT(2) +#define EMBED_CIPHER_TKIP MBIT(2) /** Embedded supplicant cipher type: AES */ -#define EMBED_CIPHER_AES MBIT(3) +#define EMBED_CIPHER_AES MBIT(3) /** Embedded supplicant cipher type: RFU */ #define EMBED_CIPHER_VALID_BITS (EMBED_CIPHER_TKIP | EMBED_CIPHER_AES) /** Type definition of mlan_ds_passphrase for MLAN_OID_SEC_CFG_PASSPHRASE */ typedef struct _mlan_ds_passphrase { - /** SSID may be used */ + /** SSID may be used */ mlan_802_11_ssid ssid; - /** BSSID may be used */ + /** BSSID may be used */ mlan_802_11_mac_addr bssid; - /** Flag for passphrase or pmk used */ + /** Flag for passphrase or pmk used */ t_u16 psk_type; - /** Passphrase or PMK */ + /** Passphrase or PMK */ union { - /** Passphrase */ + /** Passphrase */ mlan_passphrase_t passphrase; - /** SAE Password */ + /** SAE Password */ mlan_sae_password_t sae_password; - /** PMK */ + /** 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 */ + /** RSN mode */ t_u32 rsn_mode; - /** Active pairwise cipher */ + /** Active pairwise cipher */ t_u32 act_paircipher; - /** Active pairwise cipher */ + /** Active pairwise cipher */ 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 */ + /** Sub-command */ t_u32 sub_command; - /** Security configuration parameter */ + /** Security configuration parameter */ union { - /** Authentication mode for MLAN_OID_SEC_CFG_AUTH_MODE */ + /** Authentication mode for MLAN_OID_SEC_CFG_AUTH_MODE */ t_u32 auth_mode; - /** Encryption mode for MLAN_OID_SEC_CFG_ENCRYPT_MODE */ + /** Encryption mode for MLAN_OID_SEC_CFG_ENCRYPT_MODE */ t_u32 encrypt_mode; - /** WPA enabled flag for MLAN_OID_SEC_CFG_WPA_ENABLED */ + /** WPA enabled flag for MLAN_OID_SEC_CFG_WPA_ENABLED */ t_u32 wpa_enabled; - /** WAPI enabled flag for MLAN_OID_SEC_CFG_WAPI_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 */ + /** 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 */ + /** Encryption key for MLAN_OID_SEC_CFG_ENCRYPT_KEY */ mlan_ds_encrypt_key encrypt_key; - /** Passphrase for MLAN_OID_SEC_CFG_PASSPHRASE */ + /** 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 */ + /** Embedded supplicant mode for MLAN_OID_SEC_CFG_ESUPP_MODE */ mlan_ds_esupp_mode esupp_mode; #ifdef UAP_SUPPORT t_u8 sta_mac[MLAN_MAC_ADDR_LENGTH]; @@ -2591,46 +2597,46 @@ typedef struct _mlan_ds_sec_cfg { } mlan_ds_sec_cfg, *pmlan_ds_sec_cfg; #if defined(DRV_EMBEDDED_AUTHENTICATOR) || defined(DRV_EMBEDDED_SUPPLICANT) -#define BIT_TLV_TYPE_CRYPTO_KEY (1<<0) -#define BIT_TLV_TYPE_CRYPTO_KEY_IV (1<<1) -#define BIT_TLV_TYPE_CRYPTO_KEY_PREFIX (1<<2) -#define BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK (1<<3) +#define BIT_TLV_TYPE_CRYPTO_KEY (1 << 0) +#define BIT_TLV_TYPE_CRYPTO_KEY_IV (1 << 1) +#define BIT_TLV_TYPE_CRYPTO_KEY_PREFIX (1 << 2) +#define BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK (1 << 3) /** Type definition of mlan_ds_sup_cfg */ typedef struct _mlan_ds_sup_cfg { - /** Sub-command */ + /** Sub-command */ t_u8 sub_command; - /** output length */ + /** output length */ t_u16 output_len; - /** number of data blks */ + /** number of data blks */ t_u16 data_blks_nr; - /** sub action code */ + /** sub action code */ t_u8 sub_action_code; - /** skip bytes */ + /** skip bytes */ t_u16 skip_bytes; - /** iteration */ + /** iteration */ t_u32 iteration; - /** count */ + /** count */ t_u32 count; - /** pointer to output */ + /** pointer to output */ t_u8 *output; - /** key length */ + /** key length */ t_u16 key_len; - /** pointer to key */ + /** pointer to key */ t_u8 *key; - /** key iv length */ + /** key iv length */ t_u16 key_iv_len; - /** pointer to key iv */ + /** pointer to key iv */ t_u8 *key_iv; - /** key prefix length */ + /** key prefix length */ t_u16 key_prefix_len; - /** pointer to key prefix */ + /** pointer to key prefix */ t_u8 *key_prefix; - /** pointer to data blk length array */ + /** pointer to data blk length array */ t_u32 *key_data_blk_len; - /** pointer to key data blk pointer array */ + /** pointer to key data blk pointer array */ t_u8 **key_data_blk; - /** callback */ + /** callback */ t_u8 call_back; } mlan_ds_sup_cfg, *pmlan_ds_sup_cfg; #endif @@ -2639,11 +2645,7 @@ typedef struct _mlan_ds_sup_cfg { /** Rate Configuration Group */ /*-----------------------------------------------------------------*/ /** Enumeration for rate type */ -enum _mlan_rate_type { - MLAN_RATE_INDEX, - MLAN_RATE_VALUE, - MLAN_RATE_BITMAP -}; +enum _mlan_rate_type { MLAN_RATE_INDEX, MLAN_RATE_VALUE, MLAN_RATE_BITMAP }; /** Enumeration for rate format */ enum _mlan_rate_format { @@ -2655,23 +2657,23 @@ enum _mlan_rate_format { }; /** Max bitmap rates size */ -#define MAX_BITMAP_RATES_SIZE 26 +#define MAX_BITMAP_RATES_SIZE 26 /** Type definition of mlan_rate_cfg_t for MLAN_OID_RATE_CFG */ typedef struct _mlan_rate_cfg_t { - /** Fixed rate: 0, auto rate: 1 */ + /** Fixed rate: 0, auto rate: 1 */ t_u32 is_rate_auto; - /** Rate type. 0: index; 1: value; 2: bitmap */ + /** Rate type. 0: index; 1: value; 2: bitmap */ t_u32 rate_type; - /** Rate/MCS index or rate value if fixed rate */ + /** Rate/MCS index or rate value if fixed rate */ t_u32 rate; - /** Rate Bitmap */ + /** Rate Bitmap */ t_u16 bitmap_rates[MAX_BITMAP_RATES_SIZE]; - /** NSS */ + /** NSS */ t_u32 nss; /* LG rate: 0, HT rate: 1, VHT rate: 2 */ t_u32 rate_format; - /** Rate Setting */ + /** Rate Setting */ t_u16 rate_setting; } mlan_rate_cfg_t; @@ -2679,7 +2681,7 @@ typedef struct _mlan_rate_cfg_t { typedef enum _mlan_ht_bw { MLAN_HT_BW20, MLAN_HT_BW40, -/** VHT channel bandwidth */ + /** VHT channel bandwidth */ MLAN_VHT_BW80, MLAN_VHT_BW160, } mlan_ht_bw; @@ -2702,31 +2704,31 @@ typedef enum _mlan_vht_ldpc { /** Band and BSS mode */ typedef struct _mlan_band_data_rate { - /** Band configuration */ + /** Band configuration */ t_u8 config_bands; - /** BSS mode (Infra or IBSS) */ + /** BSS mode (Infra or IBSS) */ 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 */ + /** Tx data rate */ t_u32 tx_data_rate; - /** Rx data rate */ + /** Rx data rate */ t_u32 rx_data_rate; - /** Tx channel bandwidth */ + /** Tx channel bandwidth */ t_u32 tx_ht_bw; - /** Tx guard interval */ + /** Tx guard interval */ t_u32 tx_ht_gi; - /** Rx channel bandwidth */ + /** Rx channel bandwidth */ t_u32 rx_ht_bw; - /** Rx guard interval */ + /** Rx guard interval */ t_u32 rx_ht_gi; - /** MCS index */ + /** MCS index */ t_u32 tx_mcs_index; t_u32 rx_mcs_index; - /** NSS */ + /** NSS */ t_u32 tx_nss; t_u32 rx_nss; /* LG rate: 0, HT rate: 1, VHT rate: 2 */ @@ -2736,17 +2738,17 @@ typedef struct _mlan_data_rate { /** Type definition of mlan_ds_rate for MLAN_IOCTL_RATE */ typedef struct _mlan_ds_rate { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** Rate configuration parameter */ + /** Rate configuration parameter */ union { - /** Rate configuration for MLAN_OID_RATE_CFG */ + /** Rate configuration for MLAN_OID_RATE_CFG */ mlan_rate_cfg_t rate_cfg; - /** Data rate for MLAN_OID_GET_DATA_RATE */ + /** Data rate for MLAN_OID_GET_DATA_RATE */ mlan_data_rate data_rate; - /** Supported rates for MLAN_OID_SUPPORTED_RATES */ + /** Supported rates for MLAN_OID_SUPPORTED_RATES */ t_u8 rates[MLAN_SUPPORTED_RATES]; - /** Band/BSS mode for getting supported rates */ + /** Band/BSS mode for getting supported rates */ mlan_band_data_rate rate_band_cfg; } param; } mlan_ds_rate, *pmlan_ds_rate; @@ -2757,69 +2759,70 @@ typedef struct _mlan_ds_rate { /** Type definition of mlan_power_cfg_t for MLAN_OID_POWER_CFG */ typedef struct _mlan_power_cfg_t { - /** Is power auto */ + /** Is power auto */ t_u32 is_power_auto; - /** Power level in dBm */ + /** Power level in dBm */ t_s32 power_level; } mlan_power_cfg_t; /** max power table size */ -#define MAX_POWER_TABLE_SIZE 128 -#define TX_PWR_CFG_AUTO_CTRL_OFF 0xFF -#define MAX_POWER_GROUP 64 +#define MAX_POWER_TABLE_SIZE 128 +#define TX_PWR_CFG_AUTO_CTRL_OFF 0xFF +#define MAX_POWER_GROUP 64 /** Type definition of mlan_power group info */ typedef struct mlan_power_group { - - /** rate format (LG: 0, HT: 1, VHT: 2, no auto ctrl: 0xFF) */ + /** rate format (LG: 0, HT: 1, VHT: 2, no auto ctrl: 0xFF) */ t_u32 rate_format; - /** bandwidth (LG: 20 MHz, HT: 20/40 MHz, VHT: 80/160/80+80 MHz) */ + /** bandwidth (LG: 20 MHz, HT: 20/40 MHz, VHT: 80/160/80+80 MHz) */ t_u8 bandwidth; - /** NSS */ + /** NSS */ t_u32 nss; - /** LG: first rate index, HT/VHT: first MCS */ + /** LG: first rate index, HT/VHT: first MCS */ t_u8 first_rate_ind; - /** LG: last rate index, HT/VHT: last MCS */ + /** LG: last rate index, HT/VHT: last MCS */ t_u8 last_rate_ind; - /** minmum tx power (dBm) */ + /** minmum tx power (dBm) */ t_s8 power_min; - /** maximum tx power (dBm) */ + /** maximum tx power (dBm) */ t_s8 power_max; - /** tx power step (dB) */ + /** tx power step (dB) */ t_s8 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 */ + /** number of power_groups */ t_u32 num_pwr_grp; - /** array of power groups */ + /** array of power groups */ 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 */ + /** Sub-command */ t_u32 sub_command; - /** Power configuration parameter */ + /** Power configuration parameter */ union { - /** Power configuration for MLAN_OID_POWER_CFG */ + /** Power configuration for MLAN_OID_POWER_CFG */ mlan_power_cfg_t power_cfg; - /** Extended power configuration for MLAN_OID_POWER_CFG_EXT */ + /** Extended power configuration for MLAN_OID_POWER_CFG_EXT */ mlan_power_cfg_ext power_ext; - /** Low power mode for MLAN_OID_POWER_LOW_POWER_MODE */ + /** Low power mode for MLAN_OID_POWER_LOW_POWER_MODE */ t_u16 lpm; } param; } mlan_ds_power_cfg, *pmlan_ds_power_cfg; /** Type definition of mlan_ds_band_steer_cfg for MLAN_IOCTL_POWER_CFG */ typedef struct _mlan_ds_band_steer_cfg { - /** Set/Get */ + /** Set/Get */ t_u8 action; - /** enable/disable band steering*/ + /** enable/disable band steering*/ t_u8 state; - /** Probe Response will be blocked to 2G channel for first block_2g_prb_req probe requests*/ + /** Probe Response will be blocked to 2G channel for first + * block_2g_prb_req probe requests*/ t_u8 block_2g_prb_req; - /** When band steering is enabled, limit the btm request sent to STA at */ + /** When band steering is enabled, limit the btm request sent to STA at + * */ t_u8 max_btm_req_allowed; } mlan_ds_band_steer_cfg, *pmlan_ds_band_steer_cfg; @@ -2827,26 +2830,28 @@ typedef struct _mlan_ds_band_steer_cfg { /** Power Management Configuration Group */ /*-----------------------------------------------------------------*/ /** Host sleep config conditions : Cancel */ -#define HOST_SLEEP_CFG_CANCEL 0xffffffff +#define HOST_SLEEP_CFG_CANCEL 0xffffffff /** Host sleep config condition: broadcast data */ -#define HOST_SLEEP_COND_BROADCAST_DATA MBIT(0) +#define HOST_SLEEP_COND_BROADCAST_DATA MBIT(0) /** Host sleep config condition: unicast data */ -#define HOST_SLEEP_COND_UNICAST_DATA MBIT(1) +#define HOST_SLEEP_COND_UNICAST_DATA MBIT(1) /** Host sleep config condition: mac event */ -#define HOST_SLEEP_COND_MAC_EVENT MBIT(2) +#define HOST_SLEEP_COND_MAC_EVENT MBIT(2) /** Host sleep config condition: multicast data */ -#define HOST_SLEEP_COND_MULTICAST_DATA MBIT(3) +#define HOST_SLEEP_COND_MULTICAST_DATA MBIT(3) /** Host sleep config condition: IPV6 packet */ -#define HOST_SLEEP_COND_IPV6_PACKET MBIT(31) +#define HOST_SLEEP_COND_IPV6_PACKET MBIT(31) /** 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) +#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 0xff /** Host sleep config gap : Default */ -#define HOST_SLEEP_DEF_GAP 200 +#define HOST_SLEEP_DEF_GAP 200 /** Host sleep config min wake holdoff */ #define HOST_SLEEP_DEF_WAKE_HOLDOFF 0; /** Host sleep config inactivity timeout */ @@ -2854,97 +2859,98 @@ typedef struct _mlan_ds_band_steer_cfg { /** 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 */ + /** MTRUE to invoke the HostCmd, MFALSE otherwise */ t_u32 is_invoke_hostcmd; - /** Host sleep config condition */ - /** Bit0: broadcast data - * Bit1: unicast data - * Bit2: mac event - * Bit3: multicast data - */ + /** Host sleep config condition */ + /** Bit0: broadcast data + * Bit1: unicast data + * Bit2: mac event + * Bit3: multicast data + */ t_u32 conditions; - /** GPIO pin or 0xff for interface */ + /** GPIO pin or 0xff for interface */ t_u32 gpio; - /** Gap in milliseconds or or 0xff for special - * setting when GPIO is used to wakeup host - */ + /** Gap in milliseconds or or 0xff for special + * setting when GPIO is used to wakeup host + */ t_u32 gap; - /** Host sleep wake interval */ + /** Host sleep wake interval */ t_u32 hs_wake_interval; - /** Parameter type for indication gpio*/ + /** Parameter type for indication gpio*/ t_u8 param_type_ind; - /** GPIO pin for indication wakeup source */ + /** GPIO pin for indication wakeup source */ t_u32 ind_gpio; - /** Level on ind_gpio pin for indication normal wakeup source */ + /** Level on ind_gpio pin for indication normal wakeup source */ t_u32 level; - /** Parameter type for extend hscfg*/ + /** Parameter type for extend hscfg*/ t_u8 param_type_ext; - /** Events that will be forced ignore*/ + /** Events that will be forced ignore*/ t_u32 event_force_ignore; - /** Events that will use extend gap to inform host*/ + /** Events that will use extend gap to inform host*/ t_u32 event_use_ext_gap; - /** Ext gap*/ + /** Ext gap*/ t_u8 ext_gap; - /** GPIO wave level for extend hscfg*/ + /** GPIO wave level for extend hscfg*/ t_u8 gpio_wave; } mlan_ds_hs_cfg, *pmlan_ds_hs_cfg; #define MAX_MGMT_FRAME_FILTER 2 typedef struct _mlan_mgmt_frame_wakeup { - /** action - bitmap - ** On matching rx'd pkt and filter during NON_HOSTSLEEP mode: - ** Action[1]=0 Discard - ** Action[1]=1 Allow - ** Note that default action on non-match is "Allow". - ** - ** On matching rx'd pkt and filter during HOSTSLEEP mode: - ** Action[1:0]=00 Discard and Not Wake host - ** Action[1:0]=01 Discard and Wake host - ** Action[1:0]=10 Invalid - ** Note that default action on non-match is "Discard and Not Wake host". - **/ + /** action - bitmap + ** On matching rx'd pkt and filter during NON_HOSTSLEEP mode: + ** Action[1]=0 Discard + ** Action[1]=1 Allow + ** Note that default action on non-match is "Allow". + ** + ** On matching rx'd pkt and filter during HOSTSLEEP mode: + ** Action[1:0]=00 Discard and Not Wake host + ** Action[1:0]=01 Discard and Wake host + ** Action[1:0]=10 Invalid + ** Note that default action on non-match is "Discard and Not Wake + *host". + **/ t_u32 action; - /** Frame type(p2p, tdls...) - ** type=0: invalid - ** type=1: p2p - ** type=others: reserved - **/ + /** Frame type(p2p, tdls...) + ** type=0: invalid + ** type=1: p2p + ** type=others: reserved + **/ t_u32 type; - /** Frame mask according to each type - ** When type=1 for p2p, frame-mask have following define: - ** Bit Frame - ** 0 GO Negotiation Request - ** 1 GO Negotiation Response - ** 2 GO Negotiation Confirmation - ** 3 P2P Invitation Request - ** 4 P2P Invitation Response - ** 5 Device Discoverability Request - ** 6 Device Discoverability Response - ** 7 Provision Discovery Request - ** 8 Provision Discovery Response - ** 9 Notice of Absence - ** 10 P2P Presence Request - ** 11 P2P Presence Response - ** 12 GO Discoverability Request - ** 13-31 Reserved - ** - ** When type=others, frame-mask is reserved. - **/ + /** Frame mask according to each type + ** When type=1 for p2p, frame-mask have following define: + ** Bit Frame + ** 0 GO Negotiation Request + ** 1 GO Negotiation Response + ** 2 GO Negotiation Confirmation + ** 3 P2P Invitation Request + ** 4 P2P Invitation Response + ** 5 Device Discoverability Request + ** 6 Device Discoverability Response + ** 7 Provision Discovery Request + ** 8 Provision Discovery Response + ** 9 Notice of Absence + ** 10 P2P Presence Request + ** 11 P2P Presence Response + ** 12 GO Discoverability Request + ** 13-31 Reserved + ** + ** When type=others, frame-mask is reserved. + **/ t_u32 frame_mask; } mlan_mgmt_frame_wakeup, *pmlan_mgmt_frame_wakeup; /** Enable deep sleep mode */ -#define DEEP_SLEEP_ON 1 +#define DEEP_SLEEP_ON 1 /** Disable deep sleep mode */ #define DEEP_SLEEP_OFF 0 /** Default idle time in milliseconds for auto deep sleep */ -#define DEEP_SLEEP_IDLE_TIME 100 +#define DEEP_SLEEP_IDLE_TIME 100 typedef struct _mlan_ds_auto_ds { - /** auto ds mode, 0 - disable, 1 - enable */ + /** auto ds mode, 0 - disable, 1 - enable */ t_u16 auto_ds; - /** auto ds idle time in milliseconds */ + /** auto ds idle time in milliseconds */ t_u16 idletime; } mlan_ds_auto_ds; @@ -2952,154 +2958,154 @@ typedef struct _mlan_ds_auto_ds { * for MLAN_OID_PM_CFG_INACTIVITY_TO */ typedef struct _mlan_ds_inactivity_to { - /** Timeout unit in microsecond, 0 means 1000us (1ms) */ + /** Timeout unit in microsecond, 0 means 1000us (1ms) */ t_u32 timeout_unit; - /** Inactivity timeout for unicast data */ + /** Inactivity timeout for unicast data */ t_u32 unicast_timeout; - /** Inactivity timeout for multicast data */ + /** Inactivity timeout for multicast data */ t_u32 mcast_timeout; - /** Timeout for additional Rx traffic after Null PM1 packet exchange */ + /** Timeout for additional Rx traffic after Null PM1 packet exchange */ t_u32 ps_entry_timeout; } mlan_ds_inactivity_to, *pmlan_ds_inactivity_to; /** Minimum sleep period in milliseconds */ -#define MIN_SLEEP_PERIOD 10 +#define MIN_SLEEP_PERIOD 10 /** Maximum sleep period in milliseconds */ -#define MAX_SLEEP_PERIOD 60 +#define MAX_SLEEP_PERIOD 60 /** Special setting for UPSD certification tests */ -#define SLEEP_PERIOD_RESERVED_FF 0xFF +#define SLEEP_PERIOD_RESERVED_FF 0xFF /** PS null interval disable */ -#define PS_NULL_DISABLE (-1) +#define PS_NULL_DISABLE (-1) /** Local listen interval disable */ -#define MRVDRV_LISTEN_INTERVAL_DISABLE (-1) +#define MRVDRV_LISTEN_INTERVAL_DISABLE (-1) /** Minimum listen interval */ -#define MRVDRV_MIN_LISTEN_INTERVAL 0 +#define MRVDRV_MIN_LISTEN_INTERVAL 0 /** Minimum multiple DTIM */ -#define MRVDRV_MIN_MULTIPLE_DTIM 0 +#define MRVDRV_MIN_MULTIPLE_DTIM 0 /** Maximum multiple DTIM */ -#define MRVDRV_MAX_MULTIPLE_DTIM 5 +#define MRVDRV_MAX_MULTIPLE_DTIM 5 /** Ignore multiple DTIM */ -#define MRVDRV_IGNORE_MULTIPLE_DTIM 0xfffe +#define MRVDRV_IGNORE_MULTIPLE_DTIM 0xfffe /** Match listen interval to closest DTIM */ -#define MRVDRV_MATCH_CLOSEST_DTIM 0xfffd +#define MRVDRV_MATCH_CLOSEST_DTIM 0xfffd /** Minimum beacon miss timeout in milliseconds */ -#define MIN_BCN_MISS_TO 0 +#define MIN_BCN_MISS_TO 0 /** Maximum beacon miss timeout in milliseconds */ -#define MAX_BCN_MISS_TO 50 +#define MAX_BCN_MISS_TO 50 /** Disable beacon miss timeout */ -#define DISABLE_BCN_MISS_TO 65535 +#define DISABLE_BCN_MISS_TO 65535 /** Minimum delay to PS in milliseconds */ -#define MIN_DELAY_TO_PS 0 +#define MIN_DELAY_TO_PS 0 /** Maximum delay to PS in milliseconds */ -#define MAX_DELAY_TO_PS 65535 +#define MAX_DELAY_TO_PS 65535 /** Delay to PS unchanged */ -#define DELAY_TO_PS_UNCHANGED (-1) +#define DELAY_TO_PS_UNCHANGED (-1) /** Default delay to PS in milliseconds */ -#define DELAY_TO_PS_DEFAULT 1000 +#define DELAY_TO_PS_DEFAULT 1000 /** PS mode: Unchanged */ -#define PS_MODE_UNCHANGED 0 +#define PS_MODE_UNCHANGED 0 /** PS mode: Auto */ -#define PS_MODE_AUTO 1 +#define PS_MODE_AUTO 1 /** PS mode: Poll */ -#define PS_MODE_POLL 2 +#define PS_MODE_POLL 2 /** PS mode: Null */ -#define PS_MODE_NULL 3 +#define PS_MODE_NULL 3 /** Type definition of mlan_ds_ps_cfg for MLAN_OID_PM_CFG_PS_CFG */ typedef struct _mlan_ds_ps_cfg { - /** PS null interval in seconds */ + /** PS null interval in seconds */ t_u32 ps_null_interval; - /** Multiple DTIM interval */ + /** Multiple DTIM interval */ t_u32 multiple_dtim_interval; - /** Listen interval */ + /** Listen interval */ t_u32 listen_interval; - /** Beacon miss timeout in milliseconds */ + /** Beacon miss timeout in milliseconds */ t_u32 bcn_miss_timeout; - /** Delay to PS in milliseconds */ + /** Delay to PS in milliseconds */ t_s32 delay_to_ps; - /** PS mode */ + /** 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 */ + /** Error */ t_u32 error; - /** Offset in microseconds */ + /** Offset in microseconds */ t_u32 offset; - /** Stable time in microseconds */ + /** Stable time in microseconds */ t_u32 stable_time; - /** Calibration control */ + /** Calibration control */ t_u32 cal_control; - /** External sleep clock */ + /** External sleep clock */ t_u32 ext_sleep_clk; - /** Reserved */ + /** Reserved */ t_u32 reserved; } mlan_ds_sleep_params, *pmlan_ds_sleep_params; /** sleep_param */ typedef struct _ps_sleep_param { - /** control bitmap */ + /** control bitmap */ t_u32 ctrl_bitmap; - /** minimum sleep period (micro second) */ + /** minimum sleep period (micro second) */ t_u32 min_sleep; - /** maximum sleep period (micro second) */ + /** maximum sleep period (micro second) */ t_u32 max_sleep; } ps_sleep_param; /** inactivity sleep_param */ typedef struct _inact_sleep_param { - /** inactivity timeout (micro second) */ + /** inactivity timeout (micro second) */ t_u32 inactivity_to; - /** miniumu awake period (micro second) */ + /** miniumu awake period (micro second) */ t_u32 min_awake; - /** maximum awake period (micro second) */ + /** maximum awake period (micro second) */ t_u32 max_awake; } inact_sleep_param; /** flag for ps mode */ -#define PS_FLAG_PS_MODE 1 +#define PS_FLAG_PS_MODE 1 /** flag for sleep param */ -#define PS_FLAG_SLEEP_PARAM 2 +#define PS_FLAG_SLEEP_PARAM 2 /** flag for inactivity sleep param */ -#define PS_FLAG_INACT_SLEEP_PARAM 4 +#define PS_FLAG_INACT_SLEEP_PARAM 4 /** Enable Robust Coex mode */ -#define ROBUSTCOEX_GPIOCFG_ENABLE 1 +#define ROBUSTCOEX_GPIOCFG_ENABLE 1 /** Disable Robust Coex mode */ -#define ROBUSTCOEX_GPIOCFG_DISABLE 0 +#define ROBUSTCOEX_GPIOCFG_DISABLE 0 /** Disable power mode */ -#define PS_MODE_DISABLE 0 +#define PS_MODE_DISABLE 0 /** Enable periodic dtim ps */ -#define PS_MODE_PERIODIC_DTIM 1 +#define PS_MODE_PERIODIC_DTIM 1 /** Enable inactivity ps */ -#define PS_MODE_INACTIVITY 2 +#define PS_MODE_INACTIVITY 2 /** FW wake up method interface */ -#define FW_WAKEUP_METHOD_INTERFACE 1 +#define FW_WAKEUP_METHOD_INTERFACE 1 /** FW wake up method gpio */ -#define FW_WAKEUP_METHOD_GPIO 2 +#define FW_WAKEUP_METHOD_GPIO 2 /** mlan_ds_ps_mgmt */ typedef struct _mlan_ds_ps_mgmt { - /** flags for valid field */ + /** flags for valid field */ t_u16 flags; - /** power mode */ + /** power mode */ t_u16 ps_mode; - /** sleep param */ + /** sleep param */ ps_sleep_param sleep_param; - /** inactivity sleep param */ + /** inactivity sleep param */ inact_sleep_param inact_param; } mlan_ds_ps_mgmt; /** mlan_ds_ps_info */ typedef struct _mlan_ds_ps_info { - /** suspend allowed flag */ + /** suspend allowed flag */ t_u32 is_suspend_allowed; } mlan_ds_ps_info; @@ -3110,45 +3116,46 @@ typedef struct _mlan_ds_hs_wakeup_reason { /** Type definition of mlan_ds_ps_cfg for MLAN_OID_PM_CFG_PS_CFG */ typedef struct _mlan_ds_bcn_timeout { - /** Beacon miss timeout period window */ + /** Beacon miss timeout period window */ t_u16 bcn_miss_tmo_window; - /** Beacon miss timeout period */ + /** Beacon miss timeout period */ t_u16 bcn_miss_tmo_period; - /** Beacon reacquire timeout period window */ + /** Beacon reacquire timeout period window */ t_u16 bcn_rq_tmo_window; - /** Beacon reacquire timeout period */ + /** Beacon reacquire timeout period */ t_u16 bcn_rq_tmo_period; } mlan_ds_bcn_timeout, *pmlan_ds_bcn_timeout; /** Type definition of mlan_ds_pm_cfg for MLAN_IOCTL_PM_CFG */ typedef struct _mlan_ds_pm_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** Power management parameter */ + /** Power management parameter */ union { - /** Power saving mode for MLAN_OID_PM_CFG_IEEE_PS */ + /** Power saving mode for MLAN_OID_PM_CFG_IEEE_PS */ t_u32 ps_mode; - /** Host Sleep configuration for MLAN_OID_PM_CFG_HS_CFG */ + /** 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 */ + /** 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 */ + /** Inactivity timeout for MLAN_OID_PM_CFG_INACTIVITY_TO */ mlan_ds_inactivity_to inactivity_to; - /** Sleep period for MLAN_OID_PM_CFG_SLEEP_PD */ + /** Sleep period for MLAN_OID_PM_CFG_SLEEP_PD */ t_u32 sleep_period; - /** PS configuration parameters for MLAN_OID_PM_CFG_PS_CFG */ + /** 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 */ + /** 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 */ + /** PS configuration parameters for MLAN_OID_PM_CFG_PS_MODE */ mlan_ds_ps_mgmt ps_mgmt; - /** power info for MLAN_OID_PM_INFO */ + /** power info for MLAN_OID_PM_INFO */ mlan_ds_ps_info ps_info; - /** hs wakeup reason for MLAN_OID_PM_HS_WAKEUP_REASON */ + /** hs wakeup reason for MLAN_OID_PM_HS_WAKEUP_REASON */ mlan_ds_hs_wakeup_reason wakeup_reason; - /** config manamgement frame for hs wakeup */ + /** config manamgement frame for hs wakeup */ mlan_mgmt_frame_wakeup mgmt_filter[MAX_MGMT_FRAME_FILTER]; - /** Beacon timout parameters for MLAN_OID_PM_CFG_BCN_TIMEOUT */ + /** Beacon timout parameters for MLAN_OID_PM_CFG_BCN_TIMEOUT */ mlan_ds_bcn_timeout bcn_timeout; } param; } mlan_ds_pm_cfg, *pmlan_ds_pm_cfg; @@ -3157,10 +3164,8 @@ typedef struct _mlan_ds_pm_cfg { typedef struct { mlan_cmd_result_e cmd_result; /**< Firmware execution result */ - t_u32 pkt_threshold; - /** Packet threshold */ - t_u16 delay; - /** Timeout value in milliseconds */ + t_u32 pkt_threshold; /** Packet threshold */ + t_u16 delay; /** Timeout value in milliseconds */ } wlan_ioctl_rx_pkt_coalesce_config_t; #endif @@ -3169,13 +3174,13 @@ typedef struct { /*-----------------------------------------------------------------*/ /** WMM TSpec size */ -#define MLAN_WMM_TSPEC_SIZE 63 +#define MLAN_WMM_TSPEC_SIZE 63 /** WMM Add TS extra IE bytes */ -#define MLAN_WMM_ADDTS_EXTRA_IE_BYTES 256 +#define MLAN_WMM_ADDTS_EXTRA_IE_BYTES 256 /** WMM statistics for packets hist bins */ -#define MLAN_WMM_STATS_PKTS_HIST_BINS 7 +#define MLAN_WMM_STATS_PKTS_HIST_BINS 7 /** Maximum number of AC QOS queues available */ -#define MLAN_WMM_MAX_AC_QUEUES 4 +#define MLAN_WMM_MAX_AC_QUEUES 4 /** * @brief IOCTL structure to send an ADDTS request and retrieve the response. @@ -3189,14 +3194,12 @@ typedef struct { typedef struct { 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; /** @@ -3208,12 +3211,10 @@ typedef struct { * @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; /** @@ -3227,10 +3228,10 @@ typedef struct { * @sa woal_wmm_queue_config_ioctl */ 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; /** @@ -3243,50 +3244,50 @@ typedef struct { * @sa woal_wmm_queue_stats_ioctl */ typedef struct { - /** Action of Queue Config : Start, Stop, or Get */ + /** Action of Queue Config : Start, Stop, or Get */ mlan_wmm_queue_stats_action_e action; - /** User Priority */ + /** User Priority */ t_u8 user_priority; - /** Number of successful packets transmitted */ + /** Number of successful packets transmitted */ t_u16 pkt_count; - /** Packets lost; not included in pkt_count */ + /** Packets lost; not included in pkt_count */ t_u16 pkt_loss; - /** Average Queue delay in microseconds */ + /** Average Queue delay in microseconds */ t_u32 avg_queue_delay; - /** Average Transmission delay in microseconds */ + /** Average Transmission delay in microseconds */ t_u32 avg_tx_delay; - /** Calculated used time in units of 32 microseconds */ + /** Calculated used time in units of 32 microseconds */ t_u16 used_time; - /** Calculated policed time in units of 32 microseconds */ + /** Calculated policed time in units of 32 microseconds */ t_u16 policed_time; - /** Queue Delay Histogram; number of packets per queue delay range - * - * [0] - 0ms <= delay < 5ms - * [1] - 5ms <= delay < 10ms - * [2] - 10ms <= delay < 20ms - * [3] - 20ms <= delay < 30ms - * [4] - 30ms <= delay < 40ms - * [5] - 40ms <= delay < 50ms - * [6] - 50ms <= delay < msduLifetime (TUs) - */ + /** Queue Delay Histogram; number of packets per queue delay range + * + * [0] - 0ms <= delay < 5ms + * [1] - 5ms <= delay < 10ms + * [2] - 10ms <= delay < 20ms + * [3] - 20ms <= delay < 30ms + * [4] - 30ms <= delay < 40ms + * [5] - 40ms <= delay < 50ms + * [6] - 50ms <= delay < msduLifetime (TUs) + */ 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; + /** 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; /** * @brief IOCTL sub structure for a specific WMM AC Status */ typedef struct { - /** WMM Acm */ + /** WMM Acm */ t_u8 wmm_acm; - /** Flow required flag */ + /** Flow required flag */ t_u8 flow_required; - /** Flow created flag */ + /** Flow created flag */ t_u8 flow_created; - /** Disabled flag */ + /** Disabled flag */ t_u8 disabled; } wlan_ioctl_wmm_queue_status_ac_t; @@ -3300,39 +3301,39 @@ typedef struct { * @sa woal_wmm_queue_status_ioctl */ typedef struct { - /** WMM AC queue status */ + /** WMM AC queue status */ 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; + /** 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; /** Type definition of mlan_ds_wmm_addts for MLAN_OID_WMM_CFG_ADDTS */ typedef struct _mlan_ds_wmm_addts { - /** Result of ADDTS request */ + /** Result of ADDTS request */ mlan_cmd_result_e result; - /** Timeout value in milliseconds */ + /** Timeout value in milliseconds */ t_u32 timeout; - /** IEEE status code */ + /** IEEE status code */ t_u32 status_code; - /** Dialog token */ + /** Dialog token */ t_u8 dialog_tok; - /** TSPEC data length */ + /** TSPEC data length */ t_u32 ie_data_len; - /** TSPEC to send in the ADDTS + buffering for any extra IEs */ + /** 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]; } 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 */ + /** Result of DELTS request */ mlan_cmd_result_e result; - /** IEEE status code */ + /** IEEE status code */ t_u32 status_code; - /** TSPEC data length */ + /** TSPEC data length */ t_u8 ie_data_len; - /** TSPEC to send in the DELTS */ + /** TSPEC to send in the DELTS */ t_u8 ie_data[MLAN_WMM_TSPEC_SIZE]; } mlan_ds_wmm_delts, *pmlan_ds_wmm_delts; @@ -3340,39 +3341,40 @@ typedef struct _mlan_ds_wmm_delts { * for MLAN_OID_WMM_CFG_QUEUE_CONFIG */ typedef struct _mlan_ds_wmm_queue_config { - /** Action of Queue Config : Set, Get, or Default */ + /** Action of Queue Config : Set, Get, or Default */ mlan_wmm_queue_config_action_e action; - /** WMM Access Category: WMM_AC_BK(0) to WMM_AC_VO(3) */ + /** WMM Access Category: WMM_AC_BK(0) to WMM_AC_VO(3) */ mlan_wmm_ac_e access_category; - /** Lifetime expiry in TUs */ + /** Lifetime expiry in TUs */ t_u16 msdu_lifetime_expiry; - /** Reserve for future use */ + /** Reserve for future use */ 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 */ + /** Sub-command */ t_u32 sub_command; - /** WMM configuration parameter */ + /** WMM configuration parameter */ union { - /** WMM enable for MLAN_OID_WMM_CFG_ENABLE */ + /** WMM enable for MLAN_OID_WMM_CFG_ENABLE */ t_u32 wmm_enable; - /** QoS configuration for MLAN_OID_WMM_CFG_QOS */ + /** QoS configuration for MLAN_OID_WMM_CFG_QOS */ t_u8 qos_cfg; - /** WMM add TS for MLAN_OID_WMM_CFG_ADDTS */ + /** WMM add TS for MLAN_OID_WMM_CFG_ADDTS */ mlan_ds_wmm_addts addts; - /** WMM delete TS for MLAN_OID_WMM_CFG_DELTS */ + /** WMM delete TS for MLAN_OID_WMM_CFG_DELTS */ mlan_ds_wmm_delts delts; - /** WMM queue configuration for MLAN_OID_WMM_CFG_QUEUE_CONFIG */ + /** WMM queue configuration for MLAN_OID_WMM_CFG_QUEUE_CONFIG */ mlan_ds_wmm_queue_config q_cfg; - /** AC Parameters Record WMM_AC_BE, WMM_AC_BK, WMM_AC_VI, WMM_AC_VO */ + /** 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 queue status for MLAN_OID_WMM_CFG_QUEUE_STATS */ + /** 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 */ + /** 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 */ + /** 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; @@ -3388,11 +3390,11 @@ enum _mlan_wps_status { /** Type definition of mlan_ds_wps_cfg for MLAN_IOCTL_WPS_CFG */ typedef struct _mlan_ds_wps_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** WPS configuration parameter */ + /** WPS configuration parameter */ union { - /** WPS session for MLAN_OID_WPS_CFG_SESSION */ + /** WPS session for MLAN_OID_WPS_CFG_SESSION */ t_u32 wps_session; } param; } mlan_ds_wps_cfg, *pmlan_ds_wps_cfg; @@ -3401,26 +3403,26 @@ typedef struct _mlan_ds_wps_cfg { /** 802.11n Configuration Group */ /*-----------------------------------------------------------------*/ /** Maximum MCS */ -#define NUM_MCS_FIELD 16 +#define NUM_MCS_FIELD 16 /** Supported stream modes */ -#define HT_STREAM_MODE_1X1 0x11 -#define HT_STREAM_MODE_2X2 0x22 +#define HT_STREAM_MODE_1X1 0x11 +#define HT_STREAM_MODE_2X2 0x22 /* Both 2.4G and 5G band selected */ -#define BAND_SELECT_BOTH 0 +#define BAND_SELECT_BOTH 0 /* Band 2.4G selected */ -#define BAND_SELECT_BG 1 +#define BAND_SELECT_BG 1 /* Band 5G selected */ -#define BAND_SELECT_A 2 +#define BAND_SELECT_A 2 /** Type definition of mlan_ds_11n_htcap_cfg for MLAN_OID_11N_HTCAP_CFG */ typedef struct _mlan_ds_11n_htcap_cfg { - /** HT Capability information */ + /** HT Capability information */ t_u32 htcap; - /** Band selection */ + /** Band selection */ t_u32 misc_cfg; - /** Hardware HT cap information required */ + /** Hardware HT cap information required */ t_u32 hw_cap_req; } mlan_ds_11n_htcap_cfg, *pmlan_ds_11n_htcap_cfg; @@ -3428,111 +3430,111 @@ typedef struct _mlan_ds_11n_htcap_cfg { * for MLAN_OID_11N_CFG_ADDBA_PARAM */ typedef struct _mlan_ds_11n_addba_param { - /** Timeout */ + /** Timeout */ t_u32 timeout; - /** Buffer size for ADDBA request */ + /** Buffer size for ADDBA request */ t_u32 txwinsize; - /** Buffer size for ADDBA response */ + /** Buffer size for ADDBA response */ t_u32 rxwinsize; - /** amsdu for ADDBA request */ + /** amsdu for ADDBA request */ t_u8 txamsdu; - /** amsdu for ADDBA response */ + /** amsdu for ADDBA response */ 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 */ + /** HTTxCap */ t_u16 httxcap; - /** HTTxInfo */ + /** HTTxInfo */ t_u16 httxinfo; - /** Band selection */ + /** Band selection */ t_u32 misc_cfg; } mlan_ds_11n_tx_cfg, *pmlan_ds_11n_tx_cfg; /** BF Global Configuration */ -#define BF_GLOBAL_CONFIGURATION 0x00 +#define BF_GLOBAL_CONFIGURATION 0x00 /** Performs NDP sounding for PEER specified */ -#define TRIGGER_SOUNDING_FOR_PEER 0x01 +#define TRIGGER_SOUNDING_FOR_PEER 0x01 /** TX BF interval for channel sounding */ -#define SET_GET_BF_PERIODICITY 0x02 +#define SET_GET_BF_PERIODICITY 0x02 /** Tell FW not to perform any sounding for peer */ -#define TX_BF_FOR_PEER_ENBL 0x03 +#define TX_BF_FOR_PEER_ENBL 0x03 /** TX BF SNR threshold for peer */ -#define SET_SNR_THR_PEER 0x04 +#define SET_SNR_THR_PEER 0x04 /** TX Sounding*/ -#define TX_SOUNDING_CFG 0x05 +#define TX_SOUNDING_CFG 0x05 /* Maximum number of peer MAC and status/SNR tuples */ -#define MAX_PEER_MAC_TUPLES 10 +#define MAX_PEER_MAC_TUPLES 10 /** Any new subcommand structure should be declare here */ /** bf global cfg args */ typedef struct _mlan_bf_global_cfg_args { - /** Global enable/disable bf */ + /** Global enable/disable bf */ t_u8 bf_enbl; - /** Global enable/disable sounding */ + /** Global enable/disable sounding */ t_u8 sounding_enbl; - /** FB Type */ + /** FB Type */ t_u8 fb_type; - /** SNR Threshold */ + /** SNR Threshold */ t_u8 snr_threshold; - /** Sounding interval in milliseconds */ + /** Sounding interval in milliseconds */ t_u16 sounding_interval; - /** BF mode */ + /** BF mode */ t_u8 bf_mode; - /** Reserved */ + /** Reserved */ t_u8 reserved; } mlan_bf_global_cfg_args; /** trigger sounding args */ typedef struct _mlan_trigger_sound_args { - /** Peer MAC address */ + /** Peer MAC address */ t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; - /** Status */ + /** Status */ t_u8 status; } mlan_trigger_sound_args; /** bf periodicity args */ typedef struct _mlan_bf_periodicity_args { - /** Peer MAC address */ + /** Peer MAC address */ t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; - /** Current Tx BF Interval in milliseconds */ + /** Current Tx BF Interval in milliseconds */ t_u16 interval; - /** Status */ + /** Status */ t_u8 status; } mlan_bf_periodicity_args; /** tx bf peer args */ typedef struct _mlan_tx_bf_peer_args { - /** Peer MAC address */ + /** Peer MAC address */ t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; - /** Reserved */ + /** Reserved */ t_u16 reserved; - /** Enable/Disable Beamforming */ + /** Enable/Disable Beamforming */ t_u8 bf_enbl; - /** Enable/Disable sounding */ + /** Enable/Disable sounding */ t_u8 sounding_enbl; - /** FB Type */ + /** FB Type */ t_u8 fb_type; } mlan_tx_bf_peer_args; /** SNR threshold args */ typedef struct _mlan_snr_thr_args { - /** Peer MAC address */ + /** Peer MAC address */ t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; - /** SNR for peer */ + /** SNR for peer */ 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 */ + /** BF Action */ t_u16 bf_action; - /** Action */ + /** Action */ t_u16 action; - /** Number of peers */ + /** Number of peers */ t_u32 no_of_peers; union { mlan_bf_global_cfg_args bf_global_cfg; @@ -3546,9 +3548,9 @@ typedef struct _mlan_ds_11n_tx_bf_cfg { /** 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 */ + /** Enable/Disable */ t_u16 enable; - /** Current AMSDU size valid */ + /** Current AMSDU size valid */ t_u16 curr_buf_size; } mlan_ds_11n_amsdu_aggr_ctrl, *pmlan_ds_11n_amsdu_aggr_ctrl; @@ -3556,231 +3558,242 @@ typedef struct _mlan_ds_11n_amsdu_aggr_ctrl { * for MLAN_OID_11N_CFG_AGGR_PRIO_TBL */ typedef struct _mlan_ds_11n_aggr_prio_tbl { - /** ampdu priority table */ + /** ampdu priority table */ t_u8 ampdu[MAX_NUM_TID]; - /** amsdu priority table */ + /** amsdu priority table */ t_u8 amsdu[MAX_NUM_TID]; } mlan_ds_11n_aggr_prio_tbl, *pmlan_ds_11n_aggr_prio_tbl; /** DelBA All TIDs */ -#define DELBA_ALL_TIDS 0xff +#define DELBA_ALL_TIDS 0xff /** DelBA Tx */ -#define DELBA_TX MBIT(0) +#define DELBA_TX MBIT(0) /** DelBA Rx */ -#define DELBA_RX MBIT(1) +#define DELBA_RX MBIT(1) /** Type definition of mlan_ds_11n_delba for MLAN_OID_11N_CFG_DELBA */ typedef struct _mlan_ds_11n_delba { - /** TID */ + /** TID */ t_u8 tid; - /** Peer MAC address */ + /** Peer MAC address */ t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; - /** Direction (Tx: bit 0, Rx: bit 1) */ + /** Direction (Tx: bit 0, Rx: bit 1) */ 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 */ typedef struct _mlan_ds_reject_addba_req { - /** Bit0 : host sleep activated - * Bit1 : auto reconnect enabled - * Others : reserved - */ + /** Bit0 : host sleep activated + * Bit1 : auto reconnect enabled + * Others : reserved + */ t_u32 conditions; } mlan_ds_reject_addba_req, *pmlan_ds_reject_addba_req; /** Type definition of mlan_ds_ibss_ampdu_param */ typedef struct _mlan_ds_ibss_ampdu_param { - /** ampdu priority table */ + /** ampdu priority table */ t_u8 ampdu[MAX_NUM_TID]; - /** rx amdpdu setting */ + /** rx amdpdu setting */ t_u8 addba_reject[MAX_NUM_TID]; } mlan_ds_ibss_ampdu_param, *pmlan_ds_ibss_ampdu_param; /** Type definition of mlan_ds_11n_cfg for MLAN_IOCTL_11N_CFG */ typedef struct _mlan_ds_11n_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** 802.11n configuration parameter */ + /** 802.11n configuration parameter */ union { - /** Tx param for 11n for MLAN_OID_11N_CFG_TX */ + /** 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 */ + /** 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 */ + /** 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 */ + /** 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 */ + /** 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 */ + /** 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 */ + /** Tx param for 11n for MLAN_OID_11N_AMSDU_AGGR_CTRL */ mlan_ds_11n_amsdu_aggr_ctrl amsdu_aggr_ctrl; - /** Supported MCS Set field */ + /** Supported MCS Set field */ t_u8 supported_mcs_set[NUM_MCS_FIELD]; - /** Transmit Beamforming Capabilities field */ + /** Transmit Beamforming Capabilities field */ t_u32 tx_bf_cap; - /** Transmit Beamforming configuration */ + /** Transmit Beamforming configuration */ mlan_ds_11n_tx_bf_cfg tx_bf; - /** HT stream configuration */ + /** HT stream configuration */ t_u32 stream_cfg; - /** DelBA for MLAN_OID_11N_CFG_DELBA */ + /** DelBA for MLAN_OID_11N_CFG_DELBA */ mlan_ds_11n_delba del_ba; - /** Reject Addba Req for MLAN_OID_11N_CFG_REJECT_ADDBA_REQ */ + /** Reject Addba Req for MLAN_OID_11N_CFG_REJECT_ADDBA_REQ */ mlan_ds_reject_addba_req reject_addba_req; - /** Control coex RX window size configuration */ + /** Control coex RX window size configuration */ t_u32 coex_rx_winsize; - /** aggrprirotity table for MLAN_OID_11N_CFG_IBSS_AMPDU_PARAM */ + /** aggrprirotity table for MLAN_OID_11N_CFG_IBSS_AMPDU_PARAM */ mlan_ds_ibss_ampdu_param ibss_ampdu; - /** Minimum BA Threshold for MLAN_OID_11N_CFG_MIN_BA_THRESHOLD */ + /** Minimum BA Threshold for MLAN_OID_11N_CFG_MIN_BA_THRESHOLD + */ t_u8 min_ba_threshold; } param; } mlan_ds_11n_cfg, *pmlan_ds_11n_cfg; -#define NUM_MCS_SUPP 20 -#define VHT_MCS_SET_LEN 8 +#define NUM_MCS_SUPP 20 +#define VHT_MCS_SET_LEN 8 /** Type definition of mlan_ds_11ac_vhtcap_cfg for MLAN_OID_11AC_VHTCAP_CFG */ typedef struct _mlan_ds_11ac_vhtcap_cfg { - /** HT Capability information */ + /** HT Capability information */ t_u32 vhtcap; - /** Band selection */ + /** Band selection */ t_u32 misc_cfg; - /** Hardware HT cap information required */ + /** Hardware HT cap information required */ 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 */ + /** Band selection */ t_u8 band_cfg; - /** misc configuration */ + /** misc configuration */ t_u8 misc_cfg; - /** HTTxCap */ + /** HTTxCap */ t_u16 vhttxcap; - /** HTTxInfo */ + /** HTTxInfo */ t_u16 vhttxinfo; } mlan_ds_11ac_tx_cfg, *pmlan_ds_11ac_tx_cfg; /** Tx */ -#define MLAN_RADIO_TX MBIT(0) +#define MLAN_RADIO_TX MBIT(0) /** Rx */ -#define MLAN_RADIO_RX MBIT(1) +#define MLAN_RADIO_RX MBIT(1) /** Tx & Rx */ -#define MLAN_RADIO_TXRX (MLAN_RADIO_TX | MLAN_RADIO_RX) +#define MLAN_RADIO_TXRX (MLAN_RADIO_TX | MLAN_RADIO_RX) /** Type definition of mlan_ds_11ac_tx_cfg for MLAN_OID_11AC_CFG */ typedef struct _mlan_ds_11ac_vht_cfg { - /** Band selection (1: 2.4G, 2: 5 G, 3: both 2.4G and 5G) */ + /** Band selection (1: 2.4G, 2: 5 G, 3: both 2.4G and 5G) */ t_u32 band; - /** TxRx (1: Tx, 2: Rx, 3: both Tx and Rx) */ + /** TxRx (1: Tx, 2: Rx, 3: both Tx and Rx) */ t_u32 txrx; - /** BW CFG (0: 11N CFG, 1: vhtcap) */ + /** BW CFG (0: 11N CFG, 1: vhtcap) */ t_u32 bwcfg; - /** VHT capabilities. */ + /** VHT capabilities. */ t_u32 vht_cap_info; - /** VHT Tx mcs */ + /** VHT Tx mcs */ t_u32 vht_tx_mcs; - /** VHT Rx mcs */ + /** VHT Rx mcs */ t_u32 vht_rx_mcs; - /** VHT rx max rate */ + /** VHT rx max rate */ t_u16 vht_rx_max_rate; - /** VHT max tx rate */ + /** VHT max tx rate */ t_u16 vht_tx_max_rate; - /** Skip usr 11ac mcs cfg */ + /** Skip usr 11ac mcs cfg */ t_bool skip_usr_11ac_mcs_cfg; } mlan_ds_11ac_vht_cfg, *pmlan_ds_11ac_vht_cfg; /** Type definition of mlan_ds_11ac_tx_cfg for MLAN_OID_11AC_CFG */ typedef struct _mlan_ds_11ac_opermode_cfg { - /** channel width: 1-20MHz, 2-40MHz, 3-80MHz, 4-160MHz or 80+80MHz */ + /** channel width: 1-20MHz, 2-40MHz, 3-80MHz, 4-160MHz or 80+80MHz */ t_u8 bw; - /** Rx NSS */ + /** Rx NSS */ t_u8 nss; } mlan_ds_11ac_opermode_cfg, *pmlan_ds_11ac_opermode_cfg; /** Type definition of mlan_ds_11ac_cfg for MLAN_IOCTL_11AC_CFG */ typedef struct _mlan_ds_11ac_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** 802.11n configuration parameter */ + /** 802.11n configuration parameter */ union { - /** VHT configuration for MLAN_OID_11AC_VHT_CFG */ + /** VHT configuration for MLAN_OID_11AC_VHT_CFG */ mlan_ds_11ac_vht_cfg vht_cfg; - /** Supported MCS Set field */ + /** Supported MCS Set field */ t_u8 supported_mcs_set[NUM_MCS_SUPP]; - /** Oper mode configuration for MLAN_OID_11AC_OPERMODE_CFG */ + /** Oper mode configuration for MLAN_OID_11AC_OPERMODE_CFG */ mlan_ds_11ac_opermode_cfg opermode_cfg; } param; } mlan_ds_11ac_cfg, *pmlan_ds_11ac_cfg; /** Type definition of mlan_ds_11ax_he_capa for MLAN_OID_11AX_HE_CFG */ typedef MLAN_PACK_START struct _mlan_ds_11ax_he_capa { - /** tlv id of he capability */ + /** tlv id of he capability */ t_u16 id; - /** length of the payload */ + /** length of the payload */ t_u16 len; - /** extension id */ + /** extension id */ t_u8 ext_id; - /** he mac capability info */ + /** he mac capability info */ t_u8 he_mac_cap[6]; - /** he phy capability info */ + /** he phy capability info */ t_u8 he_phy_cap[11]; - /** he txrx mcs support for 80MHz */ + /** he txrx mcs support for 80MHz */ t_u8 he_txrx_mcs_support[4]; - /** val for txrx mcs 160Mhz or 80+80, and PPE thresholds */ + /** val for txrx mcs 160Mhz or 80+80, and PPE thresholds */ t_u8 val[28]; } MLAN_PACK_END mlan_ds_11ax_he_capa, *pmlan_ds_11ax_he_capa; /** Type definition of mlan_ds_11ax_he_cfg for MLAN_OID_11AX_HE_CFG */ typedef struct _mlan_ds_11ax_he_cfg { - /** band, BIT0:2.4G, BIT1:5G*/ + /** band, BIT0:2.4G, BIT1:5G*/ t_u8 band; - /** mlan_ds_11ax_he_capa */ + /** mlan_ds_11ax_he_capa */ mlan_ds_11ax_he_capa he_cap; } mlan_ds_11ax_he_cfg, *pmlan_ds_11ax_he_cfg; /** Type definition of mlan_ds_11as_cfg for MLAN_IOCTL_11AX_CFG */ typedef struct _mlan_ds_11ax_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** 802.11n configuration parameter */ + /** 802.11n configuration parameter */ union { - /** HE configuration for MLAN_OID_11AX_HE_CFG */ + /** HE configuration for MLAN_OID_11AX_HE_CFG */ mlan_ds_11ax_he_cfg he_cfg; } param; } mlan_ds_11ax_cfg, *pmlan_ds_11ax_cfg; -#define MLAN_11AXCMD_CFG_ID_SR_OBSS_PD_OFFSET 1 -#define MLAN_11AXCMD_CFG_ID_SR_ENABLE 2 -#define MLAN_11AXCMD_CFG_ID_BEAM_CHANGE 3 -#define MLAN_11AXCMD_CFG_ID_HTC_ENABLE 4 +#define MLAN_11AXCMD_CFG_ID_SR_OBSS_PD_OFFSET 1 +#define MLAN_11AXCMD_CFG_ID_SR_ENABLE 2 +#define MLAN_11AXCMD_CFG_ID_BEAM_CHANGE 3 +#define MLAN_11AXCMD_CFG_ID_HTC_ENABLE 4 +#define MLAN_11AXCMD_CFG_ID_TXOP_RTS 5 +#define MLAN_11AXCMD_CFG_ID_TX_OMI 6 +#define MLAN_11AXCMD_CFG_ID_OBSSNBRU_TOLTIME 7 -#define MLAN_11AXCMD_SR_SUBID 0x102 -#define MLAN_11AXCMD_BEAM_SUBID 0x103 -#define MLAN_11AXCMD_HTC_SUBID 0x104 +#define MLAN_11AXCMD_SR_SUBID 0x102 +#define MLAN_11AXCMD_BEAM_SUBID 0x103 +#define MLAN_11AXCMD_HTC_SUBID 0x104 +#define MLAN_11AXCMD_TXOMI_SUBID 0x105 +#define MLAN_11AXCMD_OBSS_TOLTIME_SUBID 0x106 +#define MLAN_11AXCMD_TXOPRTS_SUBID 0x108 -#define MRVL_DOT11AX_ENABLE_SR_TLV_ID (PROPRIETARY_TLV_BASE_ID + 322) -#define MRVL_DOT11AX_OBSS_PD_OFFSET_TLV_ID (PROPRIETARY_TLV_BASE_ID + 323) +#define MLAN_11AX_TWT_SETUP_SUBID 0x114 +#define MLAN_11AX_TWT_TEARDOWN_SUBID 0x115 -/** Type definition of mlan_11axcmdcfg_obss_pd_offset for MLAN_OID_11AX_CMD_CFG */ +#define MRVL_DOT11AX_ENABLE_SR_TLV_ID (PROPRIETARY_TLV_BASE_ID + 322) +#define MRVL_DOT11AX_OBSS_PD_OFFSET_TLV_ID (PROPRIETARY_TLV_BASE_ID + 323) + +/** Type definition of mlan_11axcmdcfg_obss_pd_offset for MLAN_OID_11AX_CMD_CFG + */ typedef struct MLAN_PACK_START _mlan_11axcmdcfg_obss_pd_offset { - /** */ + /** */ t_u8 offset[2]; } MLAN_PACK_END mlan_11axcmdcfg_obss_pd_offset; /** Type definition of mlan_11axcmdcfg_sr_control for MLAN_OID_11AX_CMD_CFG */ typedef struct MLAN_PACK_START _mlan_11axcmdcfg_sr_control { - /** 1 enable, 0 disable */ + /** 1 enable, 0 disable */ t_u8 control; } MLAN_PACK_END mlan_11axcmdcfg_sr_control; /** Type definition of mlan_ds_11ax_sr_cmd for MLAN_OID_11AX_CMD_CFG */ typedef struct MLAN_PACK_START _mlan_ds_11ax_sr_cmd { - /** type*/ + /** type*/ t_u16 type; - /** length of TLV */ + /** length of TLV */ t_u16 len; - /** value */ + /** value */ union { mlan_11axcmdcfg_obss_pd_offset obss_pd_offset; mlan_11axcmdcfg_sr_control sr_control; @@ -3789,80 +3802,162 @@ typedef struct MLAN_PACK_START _mlan_ds_11ax_sr_cmd { /** Type definition of mlan_ds_11ax_beam_cmd for MLAN_OID_11AX_CMD_CFG */ typedef struct _mlan_ds_11ax_beam_cmd { - /** command value: 1 is disable, 0 is enable*/ + /** command value: 1 is disable, 0 is enable*/ t_u8 value; } mlan_ds_11ax_beam_cmd, *pmlan_ds_11ax_beam_cmd; /** Type definition of mlan_ds_11ax_htc_cmd for MLAN_OID_11AX_CMD_CFG */ typedef struct _mlan_ds_11ax_htc_cmd { - /** command value: 1 is enable, 0 is disable*/ + /** command value: 1 is enable, 0 is disable*/ t_u8 value; } mlan_ds_11ax_htc_cmd, *pmlan_ds_11ax_htc_cmd; +/** Type definition of mlan_ds_11ax_htc_cmd for MLAN_OID_11AX_CMD_CFG */ +typedef struct _mlan_ds_11ax_txop_cmd { + /** Two byte rts threshold value of which only 10 bits, bit 0 to bit 9 + * are valid */ + t_u16 rts_thres; +} mlan_ds_11ax_txop_cmd, *pmlan_ds_11ax_txop_cmd; + +/** Type definition of mlan_ds_11ax_htc_cmd for MLAN_OID_11AX_CMD_CFG */ +typedef struct _mlan_ds_11ax_txomi_cmd { + /* 11ax spec 9.2.4.6a.2 OM Control 12 bits. Bit 0 to bit 11 */ + t_u16 omi; +} mlan_ds_11ax_txomi_cmd, *pmlan_ds_11ax_txomi_cmd; + +/** Type definition of mlan_ds_11ax_toltime_cmd for MLAN_OID_11AX_CMD_CFG */ +typedef struct _mlan_ds_11ax_toltime_cmd { + /* OBSS Narrow Bandwidth RU Tolerance Time */ + t_u32 tol_time; +} mlan_ds_11ax_toltime_cmd, *pmlan_ds_11ax_toltime_cmd; + /** Type definition of mlan_ds_11ax_cmd_cfg for MLAN_OID_11AX_CMD_CFG */ typedef struct _mlan_ds_11ax_cmd_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** Sub-id */ + /** Sub-id */ t_u32 sub_id; - /** 802.11n configuration parameter */ + /** 802.11n configuration parameter */ union { - /** SR configuration for MLAN_11AXCMD_SR_SUBID */ + /** SR configuration for MLAN_11AXCMD_SR_SUBID */ mlan_ds_11ax_sr_cmd sr_cfg; - /** Beam configuration for MLAN_11AXCMD_BEAM_SUBID */ + /** Beam configuration for MLAN_11AXCMD_BEAM_SUBID */ mlan_ds_11ax_beam_cmd beam_cfg; - /** HTC configuration for MLAN_11AXCMD_HTC_SUBID */ + /** HTC configuration for MLAN_11AXCMD_HTC_SUBID */ mlan_ds_11ax_htc_cmd htc_cfg; + /** txop RTS configuration for MLAN_11AXCMD_TXOPRTS_SUBID */ + mlan_ds_11ax_txop_cmd txop_cfg; + /** tx omi configuration for MLAN_11AXCMD_TXOMI_SUBID */ + mlan_ds_11ax_txomi_cmd txomi_cfg; + /** OBSS tolerance time configuration for + * MLAN_11AXCMD_TOLTIME_SUBID */ + mlan_ds_11ax_toltime_cmd toltime_cfg; } param; } mlan_ds_11ax_cmd_cfg, *pmlan_ds_11ax_cmd_cfg; +/** Type definition of mlan_ds_twt_setup for MLAN_OID_11AX_TWT_CFG */ +typedef struct MLAN_PACK_START _mlan_ds_twt_setup { + /** Implicit, 0: TWT session is explicit, 1: Session is implicit */ + t_u8 implicit; + /** Announced, 0: Unannounced, 1: Announced TWT */ + t_u8 announced; + /** Trigger Enabled, 0: Non-Trigger enabled, 1: Trigger enabled TWT */ + t_u8 trigger_enabled; + /** TWT Information Disabled, 0: TWT info enabled, 1: TWT info disabled + */ + t_u8 twt_info_disabled; + /** Negotiation Type, 0: Future Individual TWT SP start time, 1: Next + * Wake TBTT time */ + t_u8 negotiation_type; + /** TWT Wakeup Duration, time after which the TWT requesting STA can + * transition to doze state */ + t_u8 twt_wakeup_duration; + /** Flow Identifier. Range: [0-7]*/ + t_u8 flow_identifier; + /** Hard Constraint, 0: FW can tweak the TWT setup parameters if it is + *rejected by AP. + ** 1: Firmware should not tweak any parameters. */ + t_u8 hard_constraint; + /** TWT Exponent, Range: [0-63] */ + t_u8 twt_exponent; + /** TWT Mantissa Range: [0-sizeof(UINT16)] */ + t_u16 twt_mantissa; +} MLAN_PACK_END mlan_ds_twt_setup, *pmlan_ds_twt_setup; + +/** Type definition of mlan_ds_twt_teardown for MLAN_OID_11AX_TWT_CFG */ +typedef struct MLAN_PACK_START _mlan_ds_twt_teardown { + /** TWT Flow Identifier. Range: [0-7] */ + t_u8 flow_identifier; + /** Negotiation Type. 0: Future Individual TWT SP start time, 1: Next + * Wake TBTT time */ + t_u8 negotiation_type; + /** Tear down all TWT. 1: To teardown all TWT, 0 otherwise */ + t_u8 teardown_all_twt; +} MLAN_PACK_END mlan_ds_twt_teardown, *pmlan_ds_twt_teardown; + +/** Type definition of mlan_ds_twtcfg for MLAN_OID_11AX_TWT_CFG */ +typedef struct MLAN_PACK_START _mlan_ds_twtcfg { + /** Sub-command */ + t_u32 sub_command; + /** Sub-id */ + t_u32 sub_id; + /** TWT Setup/Teardown configuration parameter */ + union { + /** TWT Setup config for Sub ID: MLAN_11AX_TWT_SETUP_SUBID */ + mlan_ds_twt_setup twt_setup; + /** TWT Teardown config for Sub ID: MLAN_11AX_TWT_TEARDOWN_SUBID + */ + mlan_ds_twt_teardown twt_teardown; + } param; +} MLAN_PACK_END mlan_ds_twtcfg, *pmlan_ds_twtcfg; + /** Country code length */ -#define COUNTRY_CODE_LEN 3 +#define COUNTRY_CODE_LEN 3 /*-----------------------------------------------------------------*/ /** 802.11d Configuration Group */ /*-----------------------------------------------------------------*/ /** Maximum subbands for 11d */ -#define MRVDRV_MAX_SUBBAND_802_11D 83 +#define MRVDRV_MAX_SUBBAND_802_11D 83 /** Data structure for subband set */ typedef struct _mlan_ds_subband_set_t { - /** First channel */ + /** First channel */ t_u8 first_chan; - /** Number of channels */ + /** Number of channels */ t_u8 no_of_chan; - /** Maximum Tx power in dBm */ + /** Maximum Tx power in dBm */ t_u8 max_tx_pwr; } mlan_ds_subband_set_t; /** Domain regulatory information */ typedef struct _mlan_ds_11d_domain_info { - /** Country Code */ + /** Country Code */ t_u8 country_code[COUNTRY_CODE_LEN]; - /** Band that channels in sub_band belong to */ + /** Band that channels in sub_band belong to */ t_u8 band; - /** No. of subband in below */ + /** No. of subband in below */ t_u8 no_of_sub_band; - /** Subband data to send/last sent */ + /** Subband data to send/last sent */ mlan_ds_subband_set_t sub_band[MRVDRV_MAX_SUBBAND_802_11D]; } mlan_ds_11d_domain_info; /** Type definition of mlan_ds_11d_cfg for MLAN_IOCTL_11D_CFG */ typedef struct _mlan_ds_11d_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** 802.11d configuration parameter */ + /** 802.11d configuration parameter */ union { #ifdef STA_SUPPORT - /** Enable for MLAN_OID_11D_CFG_ENABLE */ + /** Enable for MLAN_OID_11D_CFG_ENABLE */ t_u32 enable_11d; -#endif /* STA_SUPPORT */ - /** Domain info for MLAN_OID_11D_DOMAIN_INFO_EXT */ +#endif /* STA_SUPPORT */ + /** Domain info for MLAN_OID_11D_DOMAIN_INFO_EXT */ mlan_ds_11d_domain_info domain_info; #ifdef UAP_SUPPORT - /** tlv data for MLAN_OID_11D_DOMAIN_INFO */ + /** tlv data for MLAN_OID_11D_DOMAIN_INFO */ t_u8 domain_tlv[MAX_IE_SIZE]; -#endif /* UAP_SUPPORT */ +#endif /* UAP_SUPPORT */ } param; } mlan_ds_11d_cfg, *pmlan_ds_11d_cfg; @@ -3882,7 +3977,8 @@ enum _mlan_reg_type { MLAN_REG_RF, MLAN_REG_CAU = 5, MLAN_REG_PSU = 6, -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(USB9097) || defined(SD9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(USB9097) || defined(SD9097) MLAN_REG_MAC2 = 0x81, MLAN_REG_BBP2 = 0x82, MLAN_REG_RF2 = 0x83 @@ -3891,11 +3987,11 @@ enum _mlan_reg_type { /** Type definition of mlan_ds_reg_rw for MLAN_OID_REG_RW */ typedef struct _mlan_ds_reg_rw { - /** Register type */ + /** Register type */ t_u32 type; - /** Offset */ + /** Offset */ t_u32 offset; - /** Value */ + /** Value */ t_u32 value; } mlan_ds_reg_rw; @@ -3904,33 +4000,33 @@ typedef struct _mlan_ds_reg_rw { /** Type definition of mlan_ds_read_eeprom for MLAN_OID_EEPROM_RD */ typedef struct _mlan_ds_read_eeprom { - /** Multiples of 4 */ + /** Multiples of 4 */ t_u16 offset; - /** Number of bytes */ + /** Number of bytes */ t_u16 byte_count; - /** Value */ + /** Value */ 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 */ + /** Address */ t_u32 addr; - /** Value */ + /** 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 */ + /** Sub-command */ t_u32 sub_command; - /** Register memory access parameter */ + /** Register memory access parameter */ union { - /** Register access for MLAN_OID_REG_RW */ + /** Register access for MLAN_OID_REG_RW */ mlan_ds_reg_rw reg_rw; - /** EEPROM access for MLAN_OID_EEPROM_RD */ + /** EEPROM access for MLAN_OID_EEPROM_RD */ mlan_ds_read_eeprom rd_eeprom; - /** Memory access for MLAN_OID_MEM_RW */ + /** Memory access for MLAN_OID_MEM_RW */ mlan_ds_mem_rw mem_rw; } param; } mlan_ds_reg_mem, *pmlan_ds_reg_mem; @@ -3943,25 +4039,26 @@ typedef struct _mlan_ds_reg_mem { /*-----------------------------------------------------------------*/ /** Type definition of mlan_ds_11h_dfs_testing for MLAN_OID_11H_DFS_TESTING */ typedef struct _mlan_ds_11h_dfs_testing { - /** User-configured CAC period in milliseconds, 0 to use default */ + /** User-configured CAC period in milliseconds, 0 to use default */ t_u32 usr_cac_period_msec; - /** User-configured NOP period in seconds, 0 to use default */ + /** User-configured NOP period in seconds, 0 to use default */ t_u16 usr_nop_period_sec; - /** User-configured skip channel change, 0 to disable */ + /** User-configured skip channel change, 0 to disable */ t_u8 usr_no_chan_change; - /** User-configured fixed channel to change to, 0 to use random channel */ + /** User-configured fixed channel to change to, 0 to use random channel + */ t_u8 usr_fixed_new_chan; } mlan_ds_11h_dfs_testing, *pmlan_ds_11h_dfs_testing; /** Type definition of mlan_ds_11h_dfs_testing for MLAN_OID_11H_CHAN_NOP_INFO */ typedef struct _mlan_ds_11h_chan_nop_info { - /** current channel */ + /** current channel */ t_u8 curr_chan; - /** channel_width */ + /** channel_width */ t_u8 chan_width; - /** flag for chan under nop */ + /** flag for chan under nop */ t_bool chan_under_nop; - /** chan_ban_info for new channel */ + /** chan_ban_info for new channel */ chan_band_info new_chan; } mlan_ds_11h_chan_nop_info; @@ -3969,26 +4066,32 @@ typedef struct _mlan_ds_11h_chan_rep_req { t_u16 startFreq; Band_Config_t bandcfg; t_u8 chanNum; - t_u32 millisec_dwell_time; - /**< Channel dwell time in milliseconds */ + t_u32 millisec_dwell_time; /**< Channel dwell time in milliseconds */ t_u8 host_based; } mlan_ds_11h_chan_rep_req; +typedef struct _mlan_ds_11h_dfs_w53_cfg { + /** dfs w53 cfg */ + t_u8 dfs53cfg; +} mlan_ds_11h_dfs_w53_cfg; + /** Type definition of mlan_ds_11h_cfg for MLAN_IOCTL_11H_CFG */ typedef struct _mlan_ds_11h_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; union { - /** Local power constraint for MLAN_OID_11H_LOCAL_POWER_CONSTRAINT */ + /** Local power constraint for + * MLAN_OID_11H_LOCAL_POWER_CONSTRAINT */ t_s8 usr_local_power_constraint; - /** User-configuation for MLAN_OID_11H_DFS_TESTING */ + /** User-configuation for MLAN_OID_11H_DFS_TESTING */ mlan_ds_11h_dfs_testing dfs_testing; - /** channel NOP information for MLAN_OID_11H_CHAN_NOP_INFO */ + /** channel NOP information for MLAN_OID_11H_CHAN_NOP_INFO */ mlan_ds_11h_chan_nop_info ch_nop_info; - /** channel report req for MLAN_OID_11H_CHAN_REPORT_REQUEST */ + /** channel report req for MLAN_OID_11H_CHAN_REPORT_REQUEST */ mlan_ds_11h_chan_rep_req chan_rpt_req; - /** channel switch count for MLAN_OID_11H_CHAN_SWITCH_COUNT*/ + /** channel switch count for MLAN_OID_11H_CHAN_SWITCH_COUNT*/ t_s8 cs_count; + mlan_ds_11h_dfs_w53_cfg dfs_w53_cfg; } param; } mlan_ds_11h_cfg, *pmlan_ds_11h_cfg; @@ -4000,9 +4103,9 @@ typedef struct _mlan_ds_11h_cfg { #define MLAN_SIZE_OF_CMD_BUFFER (3 * 1024) /** LDO Internal */ -#define LDO_INTERNAL 0 +#define LDO_INTERNAL 0 /** LDO External */ -#define LDO_EXTERNAL 1 +#define LDO_EXTERNAL 1 /** Enumeration for IE type */ enum _mlan_ie_type { @@ -4011,11 +4114,11 @@ enum _mlan_ie_type { /** Type definition of mlan_ds_misc_gen_ie for MLAN_OID_MISC_GEN_IE */ typedef struct _mlan_ds_misc_gen_ie { - /** IE type */ + /** IE type */ t_u32 type; - /** IE length */ + /** IE length */ t_u32 len; - /** IE buffer */ + /** IE buffer */ t_u8 ie_data[MAX_IE_SIZE]; } mlan_ds_misc_gen_ie; @@ -4024,46 +4127,46 @@ typedef struct _mlan_ds_misc_gen_ie { * for MLAN_OID_MISC_SDIO_MPA_CTRL */ typedef struct _mlan_ds_misc_sdio_mpa_ctrl { - /** SDIO MP-A TX enable/disable */ + /** SDIO MP-A TX enable/disable */ t_u16 tx_enable; - /** SDIO MP-A RX enable/disable */ + /** SDIO MP-A RX enable/disable */ t_u16 rx_enable; - /** SDIO MP-A TX buf size */ + /** SDIO MP-A TX buf size */ t_u16 tx_buf_size; - /** SDIO MP-A RX buf size */ + /** SDIO MP-A RX buf size */ t_u16 rx_buf_size; - /** SDIO MP-A TX Max Ports */ + /** SDIO MP-A TX Max Ports */ t_u16 tx_max_ports; - /** SDIO MP-A RX Max Ports */ + /** SDIO MP-A RX Max Ports */ t_u16 rx_max_ports; } mlan_ds_misc_sdio_mpa_ctrl; #endif /** Type definition of mlan_ds_misc_cmd for MLAN_OID_MISC_HOST_CMD */ typedef struct _mlan_ds_misc_cmd { - /** Command length */ + /** Command length */ t_u32 len; - /** Command buffer */ + /** Command buffer */ t_u8 cmd[MLAN_SIZE_OF_CMD_BUFFER]; } mlan_ds_misc_cmd; /** Maximum number of system clocks */ -#define MLAN_MAX_CLK_NUM 16 +#define MLAN_MAX_CLK_NUM 16 /** Clock type : Configurable */ -#define MLAN_CLK_CONFIGURABLE 0 +#define MLAN_CLK_CONFIGURABLE 0 /** Clock type : Supported */ -#define MLAN_CLK_SUPPORTED 1 +#define MLAN_CLK_SUPPORTED 1 /** Type definition of mlan_ds_misc_sys_clock for MLAN_OID_MISC_SYS_CLOCK */ typedef struct _mlan_ds_misc_sys_clock { - /** Current system clock */ + /** Current system clock */ t_u16 cur_sys_clk; - /** Clock type */ + /** Clock type */ t_u16 sys_clk_type; - /** Number of clocks */ + /** Number of clocks */ t_u16 sys_clk_num; - /** System clocks */ + /** System clocks */ t_u16 sys_clk[MLAN_MAX_CLK_NUM]; } mlan_ds_misc_sys_clock; @@ -4077,9 +4180,9 @@ enum _mlan_func_cmd { * for MLAN_OID_MISC_TX_DATAPAUSE */ typedef struct _mlan_ds_misc_tx_datapause { - /** Tx data pause flag */ + /** Tx data pause flag */ t_u16 tx_pause; - /** Max number of Tx buffers for all PS clients */ + /** Max number of Tx buffers for all PS clients */ t_u16 tx_buf_cnt; } mlan_ds_misc_tx_datapause; @@ -4087,9 +4190,9 @@ typedef struct _mlan_ds_misc_tx_datapause { * for MLAN_OID_MISC_RX_ABORT_CFG */ typedef struct _mlan_ds_misc_rx_abort_cfg { - /** enable/disable rx abort */ + /** enable/disable rx abort */ t_u8 enable; - /** Rx weak RSSI pkt threshold */ + /** Rx weak RSSI pkt threshold */ t_s8 rssi_threshold; } mlan_ds_misc_rx_abort_cfg; @@ -4097,11 +4200,11 @@ typedef struct _mlan_ds_misc_rx_abort_cfg { * for MLAN_OID_MISC_RX_ABORT_CFG_EXT */ typedef struct _mlan_ds_misc_rx_abort_cfg_ext { - /** enable/disable dynamic rx abort */ + /** enable/disable dynamic rx abort */ t_u8 enable; - /** rssi margin */ + /** rssi margin */ t_s8 rssi_margin; - /** specify ceil rssi threshold */ + /** specify ceil rssi threshold */ t_s8 ceil_rssi_threshold; } mlan_ds_misc_rx_abort_cfg_ext; @@ -4109,7 +4212,7 @@ typedef struct _mlan_ds_misc_rx_abort_cfg_ext { * for MLAN_OID_MISC_TX_AMDPU_PROT_MODE */ typedef struct _mlan_ds_misc_tx_ampdu_prot_mode { - /** set prot mode */ + /** set prot mode */ t_u16 mode; } mlan_ds_misc_tx_ampdu_prot_mode; @@ -4120,13 +4223,13 @@ typedef struct _mlan_ds_misc_tx_ampdu_prot_mode { * for MLAN_OID_MISC_RATE_ADAPT_CFG */ typedef struct _mlan_ds_misc_rate_adapt_cfg { - /** SR Rateadapt */ + /** SR Rateadapt */ t_u8 sr_rateadapt; - /** set low threshold */ + /** set low threshold */ t_u8 ra_low_thresh; - /** set high threshold */ + /** set high threshold */ t_u8 ra_high_thresh; - /** set interval */ + /** set interval */ t_u16 ra_interval; } mlan_ds_misc_rate_adapt_cfg; @@ -4134,68 +4237,68 @@ typedef struct _mlan_ds_misc_rate_adapt_cfg { * for MLAN_OID_MISC_CCK_DESENSE_CFG */ typedef struct _mlan_ds_misc_cck_desense_cfg { - /** cck desense mode: 0:disable 1:normal 2:dynamic */ + /** cck desense mode: 0:disable 1:normal 2:dynamic */ t_u16 mode; - /** specify rssi margin */ + /** specify rssi margin */ t_s8 margin; - /** specify ceil rssi threshold */ + /** specify ceil rssi threshold */ t_s8 ceil_thresh; - /** cck desense "on" interval count */ + /** cck desense "on" interval count */ t_u8 num_on_intervals; - /** cck desense "off" interval count */ + /** cck desense "off" interval count */ t_u8 num_off_intervals; } mlan_ds_misc_cck_desense_cfg; /** IP address length */ -#define IPADDR_LEN (16) +#define IPADDR_LEN (16) /** Max number of ip */ -#define MAX_IPADDR (4) +#define MAX_IPADDR (4) /** IP address type - NONE*/ -#define IPADDR_TYPE_NONE (0) +#define IPADDR_TYPE_NONE (0) /** IP address type - IPv4*/ -#define IPADDR_TYPE_IPV4 (1) +#define IPADDR_TYPE_IPV4 (1) /** IP operation remove */ -#define MLAN_IPADDR_OP_IP_REMOVE (0) +#define MLAN_IPADDR_OP_IP_REMOVE (0) /** IP operation ARP response */ -#define MLAN_IPADDR_OP_AUTO_ARP_RESP MBIT(1) +#define MLAN_IPADDR_OP_AUTO_ARP_RESP MBIT(1) /** Type definition of mlan_ds_misc_ipaddr_cfg for MLAN_OID_MISC_IP_ADDR */ typedef struct _mlan_ds_misc_ipaddr_cfg { - /** Operation code */ + /** Operation code */ t_u32 op_code; - /** IP address type */ + /** IP address type */ t_u32 ip_addr_type; - /** Number of IP */ + /** Number of IP */ t_u32 ip_addr_num; - /** IP address */ + /** IP address */ t_u8 ip_addr[MAX_IPADDR][IPADDR_LEN]; } mlan_ds_misc_ipaddr_cfg; /* MEF configuration disable */ -#define MEF_CFG_DISABLE 0 +#define MEF_CFG_DISABLE 0 /* MEF configuration Rx filter enable */ -#define MEF_CFG_RX_FILTER_ENABLE 1 +#define MEF_CFG_RX_FILTER_ENABLE 1 /* MEF configuration auto ARP response */ -#define MEF_CFG_AUTO_ARP_RESP 2 +#define MEF_CFG_AUTO_ARP_RESP 2 /* MEF configuration host command */ -#define MEF_CFG_HOSTCMD 0xFFFF +#define MEF_CFG_HOSTCMD 0xFFFF /** Type definition of mlan_ds_misc_mef_cfg for MLAN_OID_MISC_MEF_CFG */ typedef struct _mlan_ds_misc_mef_cfg { - /** Sub-ID for operation */ + /** Sub-ID for operation */ t_u32 sub_id; - /** Parameter according to sub-ID */ + /** Parameter according to sub-ID */ union { - /** MEF command buffer for MEF_CFG_HOSTCMD */ + /** 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 */ + /** CFP table code for 2.4GHz */ t_u32 cfp_code_bg; - /** CFP table code for 5GHz */ + /** CFP table code for 5GHz */ t_u32 cfp_code_a; } mlan_ds_misc_cfp_code; @@ -4203,108 +4306,108 @@ typedef struct _mlan_ds_misc_cfp_code { * for MLAN_OID_MISC_COUNTRY_CODE */ typedef struct _mlan_ds_misc_country_code { - /** Country Code */ + /** Country Code */ t_u8 country_code[COUNTRY_CODE_LEN]; } mlan_ds_misc_country_code; /** action for set */ -#define SUBSCRIBE_EVT_ACT_BITWISE_SET 0x0002 +#define SUBSCRIBE_EVT_ACT_BITWISE_SET 0x0002 /** action for clear */ -#define SUBSCRIBE_EVT_ACT_BITWISE_CLR 0x0003 +#define SUBSCRIBE_EVT_ACT_BITWISE_CLR 0x0003 /** BITMAP for subscribe event rssi low */ -#define SUBSCRIBE_EVT_RSSI_LOW MBIT(0) +#define SUBSCRIBE_EVT_RSSI_LOW MBIT(0) /** BITMAP for subscribe event snr low */ -#define SUBSCRIBE_EVT_SNR_LOW MBIT(1) +#define SUBSCRIBE_EVT_SNR_LOW MBIT(1) /** BITMAP for subscribe event max fail */ -#define SUBSCRIBE_EVT_MAX_FAIL MBIT(2) +#define SUBSCRIBE_EVT_MAX_FAIL MBIT(2) /** BITMAP for subscribe event beacon missed */ -#define SUBSCRIBE_EVT_BEACON_MISSED MBIT(3) +#define SUBSCRIBE_EVT_BEACON_MISSED MBIT(3) /** BITMAP for subscribe event rssi high */ -#define SUBSCRIBE_EVT_RSSI_HIGH MBIT(4) +#define SUBSCRIBE_EVT_RSSI_HIGH MBIT(4) /** BITMAP for subscribe event snr high */ -#define SUBSCRIBE_EVT_SNR_HIGH MBIT(5) +#define SUBSCRIBE_EVT_SNR_HIGH MBIT(5) /** BITMAP for subscribe event data rssi low */ -#define SUBSCRIBE_EVT_DATA_RSSI_LOW MBIT(6) +#define SUBSCRIBE_EVT_DATA_RSSI_LOW MBIT(6) /** BITMAP for subscribe event data snr low */ -#define SUBSCRIBE_EVT_DATA_SNR_LOW MBIT(7) +#define SUBSCRIBE_EVT_DATA_SNR_LOW MBIT(7) /** BITMAP for subscribe event data rssi high */ -#define SUBSCRIBE_EVT_DATA_RSSI_HIGH MBIT(8) +#define SUBSCRIBE_EVT_DATA_RSSI_HIGH MBIT(8) /** BITMAP for subscribe event data snr high */ -#define SUBSCRIBE_EVT_DATA_SNR_HIGH MBIT(9) +#define SUBSCRIBE_EVT_DATA_SNR_HIGH MBIT(9) /** BITMAP for subscribe event link quality */ -#define SUBSCRIBE_EVT_LINK_QUALITY MBIT(10) +#define SUBSCRIBE_EVT_LINK_QUALITY MBIT(10) /** BITMAP for subscribe event pre_beacon_lost */ -#define SUBSCRIBE_EVT_PRE_BEACON_LOST MBIT(11) +#define SUBSCRIBE_EVT_PRE_BEACON_LOST MBIT(11) /** default PRE_BEACON_MISS_COUNT */ -#define DEFAULT_PRE_BEACON_MISS 30 +#define DEFAULT_PRE_BEACON_MISS 30 /** Type definition of mlan_ds_subscribe_evt for MLAN_OID_MISC_CFP_CODE */ typedef struct _mlan_ds_subscribe_evt { - /** evt action */ + /** evt action */ t_u16 evt_action; - /** bitmap for subscribe event */ + /** bitmap for subscribe event */ t_u16 evt_bitmap; - /** Absolute value of RSSI threshold value (dBm) */ + /** Absolute value of RSSI threshold value (dBm) */ t_u8 low_rssi; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 low_rssi_freq; - /** SNR threshold value (dB) */ + /** SNR threshold value (dB) */ t_u8 low_snr; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 low_snr_freq; - /** Failure count threshold */ + /** Failure count threshold */ t_u8 failure_count; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 failure_count_freq; - /** num of missed beacons */ + /** num of missed beacons */ t_u8 beacon_miss; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 beacon_miss_freq; - /** Absolute value of RSSI threshold value (dBm) */ + /** Absolute value of RSSI threshold value (dBm) */ t_u8 high_rssi; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 high_rssi_freq; - /** SNR threshold value (dB) */ + /** SNR threshold value (dB) */ t_u8 high_snr; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 high_snr_freq; - /** Absolute value of data RSSI threshold value (dBm) */ + /** Absolute value of data RSSI threshold value (dBm) */ t_u8 data_low_rssi; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 data_low_rssi_freq; - /** Absolute value of data SNR threshold value (dBm) */ + /** Absolute value of data SNR threshold value (dBm) */ t_u8 data_low_snr; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 data_low_snr_freq; - /** Absolute value of data RSSI threshold value (dBm) */ + /** Absolute value of data RSSI threshold value (dBm) */ t_u8 data_high_rssi; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 data_high_rssi_freq; - /** Absolute value of data SNR threshold value (dBm) */ + /** Absolute value of data SNR threshold value (dBm) */ t_u8 data_high_snr; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 data_high_snr_freq; - /* Link SNR threshold (dB) */ + /* Link SNR threshold (dB)*/ t_u16 link_snr; /* Link SNR frequency */ t_u16 link_snr_freq; @@ -4321,30 +4424,30 @@ typedef struct _mlan_ds_subscribe_evt { } mlan_ds_subscribe_evt; /** Max OTP user data length */ -#define MAX_OTP_USER_DATA_LEN 252 +#define MAX_OTP_USER_DATA_LEN 252 /** Type definition of mlan_ds_misc_otp_user_data * for MLAN_OID_MISC_OTP_USER_DATA */ typedef struct _mlan_ds_misc_otp_user_data { - /** Reserved */ + /** Reserved */ t_u16 reserved; - /** OTP user data length */ + /** OTP user data length */ t_u16 user_data_length; - /** User data buffer */ + /** User data buffer */ t_u8 user_data[MAX_OTP_USER_DATA_LEN]; } mlan_ds_misc_otp_user_data; typedef struct _aggr_ctrl { - /** Enable */ + /** Enable */ t_u16 enable; - /** Aggregation alignment */ + /** Aggregation alignment */ t_u16 aggr_align; - /** Aggregation max size */ + /** Aggregation max size */ t_u16 aggr_max_size; - /** Aggregation max packet number */ + /** Aggregation max packet number */ t_u16 aggr_max_num; - /** Aggrgation timeout, in microseconds */ + /** Aggrgation timeout, in microseconds */ t_u16 aggr_tmo; } aggr_ctrl; @@ -4352,21 +4455,21 @@ typedef struct _aggr_ctrl { * for MLAN_OID_MISC_AGGR_CTRL */ typedef struct _mlan_ds_misc_aggr_ctrl { - /** Tx aggregation control */ + /** Tx aggregation control */ aggr_ctrl tx; } mlan_ds_misc_aggr_ctrl; #ifdef USB typedef struct _usb_aggr_ctrl { - /** Enable */ + /** Enable */ t_u16 enable; - /** Aggregation mode */ + /** Aggregation mode */ t_u16 aggr_mode; - /** Aggregation alignment */ + /** Aggregation alignment */ t_u16 aggr_align; - /** Aggregation max packet/size */ + /** Aggregation max packet/size */ t_u16 aggr_max; - /** Aggrgation timeout, in microseconds */ + /** Aggrgation timeout, in microseconds */ t_u16 aggr_tmo; } usb_aggr_ctrl; @@ -4374,46 +4477,46 @@ typedef struct _usb_aggr_ctrl { * for MLAN_OID_MISC_USB_AGGR_CTRL */ typedef struct _mlan_ds_misc_usb_aggr_ctrl { - /** Tx aggregation control */ + /** Tx aggregation control */ usb_aggr_ctrl tx_aggr_ctrl; - /** Rx deaggregation control */ + /** Rx deaggregation control */ usb_aggr_ctrl rx_deaggr_ctrl; } mlan_ds_misc_usb_aggr_ctrl; #endif #ifdef WIFI_DIRECT_SUPPORT /** flag for NOA */ -#define WIFI_DIRECT_NOA 1 +#define WIFI_DIRECT_NOA 1 /** flag for OPP_PS */ -#define WIFI_DIRECT_OPP_PS 2 +#define WIFI_DIRECT_OPP_PS 2 /** Type definition of mlan_ds_wifi_direct_config * for MLAN_OID_MISC_WIFI_DIRECT_CONFIG */ typedef struct _mlan_ds_wifi_direct_config { - /** flags for NOA/OPP_PS */ + /** flags for NOA/OPP_PS */ t_u8 flags; - /** NoA enable/disable */ + /** NoA enable/disable */ t_u8 noa_enable; - /** index */ + /** index */ t_u16 index; - /** NoA count */ + /** NoA count */ t_u8 noa_count; - /** NoA duration */ + /** NoA duration */ t_u32 noa_duration; - /** NoA interval */ + /** NoA interval */ t_u32 noa_interval; - /** opp ps enable/disable */ + /** opp ps enable/disable */ t_u8 opp_ps_enable; - /** CT window value */ + /** CT window value */ t_u8 ct_window; } mlan_ds_wifi_direct_config; #endif #if defined(STA_SUPPORT) typedef struct _mlan_ds_misc_pmfcfg { - /** Management Frame Protection Capable */ + /** Management Frame Protection Capable */ t_u8 mfpc; - /** Management Frame Protection Required */ + /** Management Frame Protection Required */ t_u8 mfpr; } mlan_ds_misc_pmfcfg; #endif @@ -4437,52 +4540,52 @@ typedef struct _mlan_ds_misc_dfs_repeater { t_u16 mode; } mlan_ds_misc_dfs_repeater; -#define WOWLAN_MAX_PATTERN_LEN 20 -#define WOWLAN_MAX_OFFSET_LEN 50 -#define MAX_NUM_FILTERS 10 -#define MEF_MODE_HOST_SLEEP (1<<0) -#define MEF_MODE_NON_HOST_SLEEP (1<<1) -#define MEF_ACTION_WAKE (1<<0) -#define MEF_ACTION_ALLOW (1<<1) -#define MEF_ACTION_ALLOW_AND_WAKEUP_HOST 3 -#define MEF_AUTO_ARP 0x10 -#define MEF_AUTO_PING 0x20 -#define MEF_NS_RESP 0x40 -#define MEF_MAGIC_PKT 0x80 -#define CRITERIA_BROADCAST BIT(0) -#define CRITERIA_UNICAST BIT(1) -#define CRITERIA_MULTICAST BIT(3) +#define WOWLAN_MAX_PATTERN_LEN 20 +#define WOWLAN_MAX_OFFSET_LEN 50 +#define MAX_NUM_FILTERS 10 +#define MEF_MODE_HOST_SLEEP (1 << 0) +#define MEF_MODE_NON_HOST_SLEEP (1 << 1) +#define MEF_ACTION_WAKE (1 << 0) +#define MEF_ACTION_ALLOW (1 << 1) +#define MEF_ACTION_ALLOW_AND_WAKEUP_HOST 3 +#define MEF_AUTO_ARP 0x10 +#define MEF_AUTO_PING 0x20 +#define MEF_NS_RESP 0x40 +#define MEF_MAGIC_PKT 0x80 +#define CRITERIA_BROADCAST BIT(0) +#define CRITERIA_UNICAST BIT(1) +#define CRITERIA_MULTICAST BIT(3) -#define MAX_NUM_ENTRIES 8 -#define MAX_NUM_BYTE_SEQ 6 -#define MAX_NUM_MASK_SEQ 6 +#define MAX_NUM_ENTRIES 8 +#define MAX_NUM_BYTE_SEQ 6 +#define MAX_NUM_MASK_SEQ 6 -#define OPERAND_DNUM 1 -#define OPERAND_BYTE_SEQ 2 +#define OPERAND_DNUM 1 +#define OPERAND_BYTE_SEQ 2 -#define MAX_OPERAND 0x40 -#define TYPE_BYTE_EQ (MAX_OPERAND + 1) -#define TYPE_DNUM_EQ (MAX_OPERAND + 2) -#define TYPE_BIT_EQ (MAX_OPERAND + 3) +#define MAX_OPERAND 0x40 +#define TYPE_BYTE_EQ (MAX_OPERAND + 1) +#define TYPE_DNUM_EQ (MAX_OPERAND + 2) +#define TYPE_BIT_EQ (MAX_OPERAND + 3) -#define RPN_TYPE_AND (MAX_OPERAND + 4) -#define RPN_TYPE_OR (MAX_OPERAND + 5) +#define RPN_TYPE_AND (MAX_OPERAND + 4) +#define RPN_TYPE_OR (MAX_OPERAND + 5) -#define ICMP_OF_IP_PROTOCOL 0x01 -#define TCP_OF_IP_PROTOCOL 0x06 -#define UDP_OF_IP_PROTOCOL 0x11 +#define ICMP_OF_IP_PROTOCOL 0x01 +#define TCP_OF_IP_PROTOCOL 0x06 +#define UDP_OF_IP_PROTOCOL 0x11 -#define IPV4_PKT_OFFSET 20 -#define IP_PROTOCOL_OFFSET 31 -#define PORT_PROTOCOL_OFFSET 44 +#define IPV4_PKT_OFFSET 20 +#define IP_PROTOCOL_OFFSET 31 +#define PORT_PROTOCOL_OFFSET 44 -#define FILLING_TYPE MBIT(0) -#define FILLING_PATTERN MBIT(1) -#define FILLING_OFFSET MBIT(2) -#define FILLING_NUM_BYTES MBIT(3) -#define FILLING_REPEAT MBIT(4) -#define FILLING_BYTE_SEQ MBIT(5) -#define FILLING_MASK_SEQ MBIT(6) +#define FILLING_TYPE MBIT(0) +#define FILLING_PATTERN MBIT(1) +#define FILLING_OFFSET MBIT(2) +#define FILLING_NUM_BYTES MBIT(3) +#define FILLING_REPEAT MBIT(4) +#define FILLING_BYTE_SEQ MBIT(5) +#define FILLING_MASK_SEQ MBIT(6) /** Type definition of filter_item * Support three match methods: @@ -4491,40 +4594,40 @@ typedef struct _mlan_ds_misc_dfs_repeater { * <3>Bit comparison type=0x43 */ typedef struct _mef_filter_t { - /** flag*/ + /** flag*/ t_u32 fill_flag; - /** BYTE 0X41; Decimal 0X42; Bit 0x43*/ + /** BYTE 0X41; Decimal 0X42; Bit 0x43*/ t_u16 type; - /** value*/ + /** value*/ t_u32 pattern; - /** offset*/ + /** offset*/ t_u16 offset; - /** number of bytes*/ + /** number of bytes*/ t_u16 num_bytes; - /** repeat*/ + /** repeat*/ t_u16 repeat; - /** byte number*/ + /** byte number*/ t_u8 num_byte_seq; - /** array*/ + /** array*/ t_u8 byte_seq[MAX_NUM_BYTE_SEQ]; - /** mask numbers*/ + /** mask numbers*/ t_u8 num_mask_seq; - /** array*/ + /** array*/ t_u8 mask_seq[MAX_NUM_MASK_SEQ]; } mef_filter_t; typedef struct _mef_entry_t { - /** mode: bit0--hostsleep mode; bit1--non hostsleep mode */ + /** mode: bit0--hostsleep mode; bit1--non hostsleep mode */ t_u8 mode; - /** action: 0--discard and not wake host; - 1--discard and wake host; - 3--allow and wake host;*/ + /** action: 0--discard and not wake host; + 1--discard and wake host; + 3--allow and wake host;*/ t_u8 action; - /** filter number */ + /** filter number */ t_u8 filter_num; - /** filter array*/ + /** filter array*/ mef_filter_t filter_item[MAX_NUM_FILTERS]; - /** rpn array*/ + /** rpn array*/ t_u8 rpn[MAX_NUM_FILTERS]; } mef_entry_t; @@ -4532,11 +4635,11 @@ typedef struct _mef_entry_t { *for MLAN_OID_MISC_MEF_FLT_CFG */ typedef struct _mlan_ds_misc_mef_flt_cfg { - /** Type of action*/ + /** Type of action*/ int mef_act_type; - /** NV Filter Criteria*/ + /** NV Filter Criteria*/ t_u32 criteria; - /** NV MEF entry*/ + /** NV MEF entry*/ mef_entry_t mef_entry; } mlan_ds_misc_mef_flt_cfg; @@ -4555,20 +4658,20 @@ typedef struct _mlan_ds_sensor_temp { t_u32 temperature; } mlan_ds_sensor_temp; -#define MLAN_KCK_LEN 16 -#define MLAN_KEK_LEN 16 +#define MLAN_KCK_LEN 16 +#define MLAN_KEK_LEN 16 #define MLAN_REPLAY_CTR_LEN 8 /** mlan_ds_misc_gtk_rekey_data */ typedef struct _mlan_ds_misc_gtk_rekey_data { - /** key encryption key */ + /** key encryption key */ t_u8 kek[MLAN_KEK_LEN]; - /** key confirmation key */ + /** key confirmation key */ t_u8 kck[MLAN_KCK_LEN]; - /** replay counter */ + /** replay counter */ t_u8 replay_ctr[MLAN_REPLAY_CTR_LEN]; } mlan_ds_misc_gtk_rekey_data; typedef struct _mlan_ds_bw_chan_oper { - /* bandwidth 20:20M 40:40M 80:80M */ + /* bandwidth 20:20M 40:40M 80:80M*/ t_u8 bandwidth; /* channel number */ t_u8 channel; @@ -4581,17 +4684,17 @@ typedef struct _mlan_ds_ind_rst_cfg { t_u16 action; /** oob mode enable/ disable */ t_u8 ir_mode; - /** gpio pin */ + /** gpio pin */ t_u8 gpio_pin; } mlan_ds_ind_rst_cfg; -#define MKEEP_ALIVE_IP_PKT_MAX 256 +#define MKEEP_ALIVE_IP_PKT_MAX 256 typedef struct _mlan_ds_misc_keep_alive { t_u8 mkeep_alive_id; t_u8 enable; - /** enable/disable tcp reset*/ + /** enable/disable tcp reset*/ t_u8 reset; - /**True means saved in driver, false means not saved or download*/ + /**True means saved in driver, false means not saved or download*/ t_u8 cached; t_u32 send_interval; t_u16 retry_interval; @@ -4600,60 +4703,61 @@ typedef struct _mlan_ds_misc_keep_alive { t_u8 src_mac[MLAN_MAC_ADDR_LENGTH]; t_u16 pkt_len; t_u8 packet[MKEEP_ALIVE_IP_PKT_MAX]; - /** Ethernet type */ + /** Ethernet type */ t_u16 ether_type; } mlan_ds_misc_keep_alive; /** TX and RX histogram statistic parameters*/ typedef MLAN_PACK_START struct _mlan_ds_misc_tx_rx_histogram { - /** Enable or disable get tx/rx histogram statistic */ + /** Enable or disable get tx/rx histogram statistic */ t_u8 enable; - /** Choose to get TX, RX or both histogram statistic */ + /** Choose to get TX, RX or both histogram statistic */ t_u16 action; - /** Size of Tx/Rx info */ + /** Size of Tx/Rx info */ t_u16 size; - /** Store Tx/Rx info */ + /** Store Tx/Rx info */ t_u8 value[1]; } MLAN_PACK_END mlan_ds_misc_tx_rx_histogram; typedef MLAN_PACK_START struct _mlan_ds_cw_mode_ctrl { - /** Mode of Operation 0: Disable 1: Tx Continuous Packet 2: Tx Continuous Wave */ + /** Mode of Operation 0: Disable 1: Tx Continuous Packet 2: Tx + * Continuous Wave */ t_u8 mode; - /*channel */ + /*channel*/ t_u8 channel; - /* channel info */ + /* channel info*/ t_u8 chanInfo; - /** Tx Power level in dBm */ + /** Tx Power level in dBm */ t_u16 txPower; - /** Packet Length */ + /** Packet Length */ t_u16 pktLength; - /** bit rate Info */ + /** bit rate Info */ t_u32 rateInfo; } MLAN_PACK_END mlan_ds_cw_mode_ctrl; #define RX_PKT_INFO MBIT(1) /** Struct for per-packet configuration */ typedef struct _mlan_per_pkt_cfg { - /** Type ID*/ + /** Type ID*/ t_u16 type; - /** Length of payload*/ + /** Length of payload*/ t_u16 len; - /** Tx/Rx per-packet control */ + /** Tx/Rx per-packet control */ t_u8 tx_rx_control; - /** Number of ethernet types in ether_type array */ + /** Number of ethernet types in ether_type array */ t_u8 proto_type_num; - /** Array of ether_type for per-packet control */ + /** Array of ether_type for per-packet control */ t_u16 ether_type[]; } mlan_per_pkt_cfg; /** Type definition of mlan_ds_misc_robustcoex_params for MLAN_IOCTL_MISC_CFG */ typedef struct _mlan_ds_misc_robustcoex_params { t_u16 method; - /** enable/disable robustcoex gpio cfg */ + /** enable/disable robustcoex gpio cfg */ t_u8 enable; - /** Number of GPIO */ + /** Number of GPIO */ t_u8 gpio_num; - /** Polarity of GPIO */ + /** Polarity of GPIO */ t_u8 gpio_polarity; } mlan_ds_misc_robustcoex_params; @@ -4670,34 +4774,34 @@ typedef struct _mlan_ds_ssu_params { } mlan_ds_ssu_params; #endif -#define MAX_NUM_MAC 2 +#define MAX_NUM_MAC 2 /** Type definition of mlan_ds_misc_mapping_policy */ typedef struct _mlan_ds_misc_mapping_policy { - /** Enable/disable dynamic mapping */ + /** Enable/disable dynamic mapping */ t_u16 subcmd; - /** Mapping policy */ + /** Mapping policy */ t_u8 mapping_policy; } mlan_ds_misc_mapping_policy, *pmlan_ds_misc_mapping_policy; typedef struct _dmcsChanStatus_t { - /** Channel number */ + /** Channel number */ t_u8 channel; - /** Number of ap on this channel */ + /** Number of ap on this channel */ t_u8 ap_count; - /** Number of sta on this channel */ + /** Number of sta on this channel */ t_u8 sta_count; } dmcsChanStatus_t, *pdmcsChanStatus_t; typedef struct _dmcsStatus_t { - /** Radio ID */ + /** Radio ID */ t_u8 radio_id; - /** Running mode - ** 0 - Idle - ** 1 - DBC - ** 2 - DRCS - */ + /** Running mode + ** 0 - Idle + ** 1 - DBC + ** 2 - DRCS + */ t_u8 running_mode; - /** Current channel status */ + /** Current channel status */ dmcsChanStatus_t chan_status[2]; } dmcsStatus_t, *pdmcsStatus_t; @@ -4707,84 +4811,86 @@ typedef struct _mlan_ds_misc_dmcs_status { dmcsStatus_t radio_status[MAX_NUM_MAC]; } mlan_ds_misc_dmcs_status, *pmlan_ds_misc_dmcs_status; -/** Type definition of mlan_ds_misc_chan_trpc_cfg for MLAN_OID_MISC_GET_CHAN_TRPC_CFG */ +/** Type definition of mlan_ds_misc_chan_trpc_cfg for + * MLAN_OID_MISC_GET_CHAN_TRPC_CFG */ typedef struct _mlan_ds_misc_chan_trpc_cfg { - /** sub_band */ + /** sub_band */ t_u16 sub_band; - /** length */ + /** length */ t_u16 length; - /** buf */ + /** buf */ t_u8 trpc_buf[2048]; } mlan_ds_misc_chan_trpc_cfg; typedef struct _mlan_ds_misc_chnrgpwr_cfg { - /** length */ + /** length */ t_u16 length; - /** chnrgpwr buf */ + /** chnrgpwr buf */ t_u8 chnrgpwr_buf[2048]; } mlan_ds_misc_chnrgpwr_cfg; /** Type definition of mlan_ds_misc_cfg for MLAN_IOCTL_MISC_CFG */ typedef struct _mlan_ds_misc_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** Miscellaneous configuration parameter */ + /** Miscellaneous configuration parameter */ union { - /** Generic IE for MLAN_OID_MISC_GEN_IE */ + /** Generic IE for MLAN_OID_MISC_GEN_IE */ mlan_ds_misc_gen_ie gen_ie; - /** Region code for MLAN_OID_MISC_REGION */ + /** Region code for MLAN_OID_MISC_REGION */ t_u32 region_code; #ifdef SDIO - /** SDIO MP-A Ctrl command for MLAN_OID_MISC_SDIO_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 */ + /** Hostcmd for MLAN_OID_MISC_HOST_CMD */ mlan_ds_misc_cmd hostcmd; - /** System clock for MLAN_OID_MISC_SYS_CLOCK */ + /** System clock for MLAN_OID_MISC_SYS_CLOCK */ mlan_ds_misc_sys_clock sys_clock; - /** WWS set/get for MLAN_OID_MISC_WWS */ + /** WWS set/get for MLAN_OID_MISC_WWS */ t_u32 wws_cfg; - /** Get associate response for MLAN_OID_MISC_ASSOC_RSP */ + /** 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 */ + /** Function init/shutdown for MLAN_OID_MISC_INIT_SHUTDOWN */ t_u32 func_init_shutdown; - /** Custom IE for MLAN_OID_MISC_CUSTOM_IE */ + /** Custom IE for MLAN_OID_MISC_CUSTOM_IE */ mlan_ds_misc_custom_ie cust_ie; - /** Config dynamic bandwidth*/ + /** Config dynamic bandwidth*/ t_u16 dyn_bw; - /** Tx data pause for MLAN_OID_MISC_TX_DATAPAUSE */ + /** Tx data pause for MLAN_OID_MISC_TX_DATAPAUSE */ mlan_ds_misc_tx_datapause tx_datapause; - /** IP address configuration */ + /** IP address configuration */ mlan_ds_misc_ipaddr_cfg ipaddr_cfg; - /** MAC control for MLAN_OID_MISC_MAC_CONTROL */ + /** MAC control for MLAN_OID_MISC_MAC_CONTROL */ t_u32 mac_ctrl; - /** MEF configuration for MLAN_OID_MISC_MEF_CFG */ + /** MEF configuration for MLAN_OID_MISC_MEF_CFG */ mlan_ds_misc_mef_cfg mef_cfg; - /** CFP code for MLAN_OID_MISC_CFP_CODE */ + /** CFP code for MLAN_OID_MISC_CFP_CODE */ mlan_ds_misc_cfp_code cfp_code; - /** Country code for MLAN_OID_MISC_COUNTRY_CODE */ + /** Country code for MLAN_OID_MISC_COUNTRY_CODE */ mlan_ds_misc_country_code country_code; - /** Thermal reading for MLAN_OID_MISC_THERMAL */ + /** Thermal reading for MLAN_OID_MISC_THERMAL */ t_u32 thermal; - /** Mgmt subtype mask for MLAN_OID_MISC_RX_MGMT_IND */ + /** Mgmt subtype mask for MLAN_OID_MISC_RX_MGMT_IND */ t_u32 mgmt_subtype_mask; - /** subscribe event for MLAN_OID_MISC_SUBSCRIBE_EVENT */ + /** subscribe event for MLAN_OID_MISC_SUBSCRIBE_EVENT */ mlan_ds_subscribe_evt subscribe_event; #ifdef DEBUG_LEVEL1 - /** Driver debug bit masks */ + /** Driver debug bit masks */ t_u32 drvdbg; #endif - /** Hotspot config param set */ + /** Hotspot config param set */ t_u32 hotspot_cfg; #ifdef STA_SUPPORT ExtCap_t ext_cap; #endif mlan_ds_misc_otp_user_data otp_user_data; #ifdef USB - /** USB aggregation parameters for MLAN_OID_MISC_USB_AGGR_CTRL */ + /** USB aggregation parameters for MLAN_OID_MISC_USB_AGGR_CTRL + */ mlan_ds_misc_usb_aggr_ctrl usb_aggr_params; #endif mlan_ds_misc_aggr_ctrl aggr_params; - /** Tx control */ + /** Tx control */ t_u32 tx_control; #if defined(STA_SUPPORT) mlan_ds_misc_pmfcfg pmfcfg; @@ -4794,16 +4900,16 @@ typedef struct _mlan_ds_misc_cfg { #endif mlan_ds_coalesce_cfg coalesce_cfg; t_u8 low_pwr_mode; - /** MEF-FLT-CONFIG for MLAN_OID_MISC_NV_FLT_CFG */ + /** MEF-FLT-CONFIG for MLAN_OID_MISC_NV_FLT_CFG */ mlan_ds_misc_mef_flt_cfg mef_flt_cfg; mlan_ds_misc_dfs_repeater dfs_repeater; #ifdef RX_PACKET_COALESCE mlan_ds_misc_rx_packet_coalesce rx_coalesce; #endif - /** FW reload flag */ + /** FW reload flag */ t_u8 fw_reload; mlan_ds_sensor_temp sensor_temp; - /** GTK rekey data */ + /** GTK rekey data */ mlan_ds_misc_gtk_rekey_data gtk_rekey; mlan_ds_bw_chan_oper bw_chan_oper; mlan_ds_ind_rst_cfg ind_rst_cfg; @@ -4812,15 +4918,15 @@ typedef struct _mlan_ds_misc_cfg { mlan_ds_misc_keep_alive keep_alive; mlan_ds_misc_tx_rx_histogram tx_rx_histogram; mlan_ds_cw_mode_ctrl cwmode; - /** Tx/Rx per-packet control */ + /** Tx/Rx per-packet control */ t_u8 txrx_pkt_ctrl; mlan_ds_misc_robustcoex_params robustcoexparams; #if defined(PCIE) mlan_ds_ssu_params ssu_params; #endif - /** boot sleep enable or disable */ + /** boot sleep enable or disable */ t_u16 boot_sleep; - /** Mapping Policy */ + /** Mapping Policy */ mlan_ds_misc_mapping_policy dmcs_policy; mlan_ds_misc_dmcs_status dmcs_status; mlan_ds_misc_rx_abort_cfg rx_abort_cfg; @@ -4836,21 +4942,21 @@ typedef struct _mlan_ds_misc_cfg { } mlan_ds_misc_cfg, *pmlan_ds_misc_cfg; /** Hotspot status enable */ -#define HOTSPOT_ENABLED MBIT(0) +#define HOTSPOT_ENABLED MBIT(0) /** Hotspot status disable */ -#define HOTSPOT_DISABLED MFALSE +#define HOTSPOT_DISABLED MFALSE /** Keep Hotspot2.0 compatible in mwu and wpa_supplicant */ -#define HOTSPOT_BY_SUPPLICANT MBIT(1) +#define HOTSPOT_BY_SUPPLICANT MBIT(1) /** Reason codes */ -#define MLAN_REASON_UNSPECIFIED 1 -#define MLAN_REASON_PREV_AUTH_NOT_VALID 2 -#define MLAN_REASON_DEAUTH_LEAVING 3 -#define MLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4 -#define MLAN_REASON_DISASSOC_AP_BUSY 5 -#define MLAN_REASON_CLASS2_FRAME_FROM_NOAUTH_STA 6 +#define MLAN_REASON_UNSPECIFIED 1 +#define MLAN_REASON_PREV_AUTH_NOT_VALID 2 +#define MLAN_REASON_DEAUTH_LEAVING 3 +#define MLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4 +#define MLAN_REASON_DISASSOC_AP_BUSY 5 +#define MLAN_REASON_CLASS2_FRAME_FROM_NOAUTH_STA 6 #define MLAN_REASON_CLASS3_FRAME_FROM_NOASSOC_STA 7 -#define MLAN_REASON_DISASSOC_STA_HAS_LEFT 8 -#define MLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9 +#define MLAN_REASON_DISASSOC_STA_HAS_LEFT 8 +#define MLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9 #endif /* !_MLAN_IOCTL_H_ */ diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_join.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_join.c index 48562f07b1f4..4fd2170b95b2 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_join.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_join.c @@ -69,8 +69,7 @@ Change log: * * @return bytes added to the buffer */ -static int -wlan_cmd_append_generic_ie(mlan_private *priv, t_u8 **ppbuffer) +static int wlan_cmd_append_generic_ie(mlan_private *priv, t_u8 **ppbuffer) { int ret_len = 0; MrvlIEtypesHeader_t ie_header; @@ -101,15 +100,18 @@ wlan_cmd_append_generic_ie(mlan_private *priv, t_u8 **ppbuffer) memcpy_ext(priv->adapter, *ppbuffer, &ie_header, sizeof(ie_header), sizeof(ie_header)); - /* Increment the return size and the return buffer pointer param */ + /* 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 */ + /* Copy the generic IE buffer to the output buffer, advance + * pointer */ memcpy_ext(priv->adapter, *ppbuffer, priv->gen_ie_buf, priv->gen_ie_buf_len, priv->gen_ie_buf_len); - /* Increment the return size and the return buffer pointer param */ + /* Increment the return size and the return buffer pointer param + */ *ppbuffer += priv->gen_ie_buf_len; ret_len += priv->gen_ie_buf_len; @@ -133,9 +135,9 @@ wlan_cmd_append_generic_ie(mlan_private *priv, t_u8 **ppbuffer) * * @return bytes added to the buffer */ -static int -wlan_cmd_append_pass_through_ie(mlan_private *priv, IEEEtypes_Generic_t *ie, - t_u8 **ppbuffer) +static int wlan_cmd_append_pass_through_ie(mlan_private *priv, + IEEEtypes_Generic_t *ie, + t_u8 **ppbuffer) { int ret_len = 0; MrvlIEtypesHeader_t ie_header; @@ -157,22 +159,24 @@ wlan_cmd_append_pass_through_ie(mlan_private *priv, IEEEtypes_Generic_t *ie, /* 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(ie->ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + ie_header.len = wlan_cpu_to_le16(ie->ieee_hdr.len + + sizeof(IEEEtypes_Header_t)); memcpy_ext(priv->adapter, *ppbuffer, &ie_header, sizeof(ie_header), sizeof(ie_header)); - /* Increment the return size and the return buffer pointer param */ + /* 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 */ + /* Copy the generic IE buffer to the output buffer, advance + * pointer */ memcpy_ext(priv->adapter, *ppbuffer, ie, ie->ieee_hdr.len + sizeof(IEEEtypes_Header_t), ie->ieee_hdr.len + sizeof(IEEEtypes_Header_t)); - /* Increment the return size and the return buffer pointer param */ + /* Increment the return size and the return buffer pointer param + */ *ppbuffer += ie->ieee_hdr.len + sizeof(IEEEtypes_Header_t); ret_len += ie->ieee_hdr.len + sizeof(IEEEtypes_Header_t); } @@ -182,27 +186,26 @@ wlan_cmd_append_pass_through_ie(mlan_private *priv, IEEEtypes_Generic_t *ie, } /** - * @brief Append TSF tracking info from the scan table for the target AP - * - * 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) + * @brief Append TSF tracking info from the scan table for the target AP + * + * 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) { MrvlIEtypes_TsfTimestamp_t tsf_tlv; t_u64 tsf_val; @@ -229,7 +232,8 @@ wlan_cmd_append_tsf_tlv(mlan_private *pmriv, t_u8 **ppbuffer, sizeof(tsf_tlv.header)); *ppbuffer += sizeof(tsf_tlv.header); - /* TSF timestamp from the firmware TSF when the bcn/prb rsp was received */ + /* TSF timestamp from the firmware TSF when the bcn/prb rsp was received + */ tsf_val = wlan_cpu_to_le64(pbss_desc->network_tsf); memcpy_ext(pmriv->adapter, *ppbuffer, &tsf_val, sizeof(tsf_val), sizeof(tsf_val)); @@ -238,8 +242,8 @@ wlan_cmd_append_tsf_tlv(mlan_private *pmriv, t_u8 **ppbuffer, memcpy_ext(pmriv->adapter, &tsf_val, pbss_desc->time_stamp, sizeof(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_ext(pmriv->adapter, *ppbuffer, &tsf_val, sizeof(tsf_val), sizeof(tsf_val)); @@ -265,10 +269,9 @@ wlan_cmd_append_tsf_tlv(mlan_private *pmriv, t_u8 **ppbuffer, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) +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) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_callbacks *pcb = (mlan_callbacks *)&pmpriv->adapter->callbacks; @@ -313,8 +316,10 @@ wlan_get_common_rates(IN mlan_private *pmpriv, } ptr++; } - PRINTM(MMSG, "Previously set fixed data rate %#x is not " - "compatible with the network\n", pmpriv->data_rate); + PRINTM(MMSG, + "Previously set fixed data rate %#x is not " + "compatible with the network\n", + pmpriv->data_rate); ret = MLAN_STATUS_FAILURE; goto done; @@ -341,10 +346,10 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) +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) { t_u8 card_rates[WLAN_SUPPORTED_RATES]; t_u32 card_rates_size = 0; @@ -354,12 +359,11 @@ wlan_setup_rates_from_bssdesc(IN mlan_private *pmpriv, WLAN_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); + 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 = @@ -391,9 +395,8 @@ wlan_setup_rates_from_bssdesc(IN mlan_private *pmpriv, * * @return N/A */ -static t_void -wlan_update_tsf_timestamps(IN mlan_private *pmpriv, - IN BSSDescriptor_t *pnew_bss_desc) +static t_void wlan_update_tsf_timestamps(IN mlan_private *pmpriv, + IN BSSDescriptor_t *pnew_bss_desc) { mlan_adapter *pmadapter = pmpriv->adapter; t_u32 table_idx; @@ -430,8 +433,7 @@ wlan_update_tsf_timestamps(IN mlan_private *pmpriv, * * @return bytes added to the buffer */ -static int -wlan_cmd_append_wapi_ie(mlan_private *priv, t_u8 **ppbuffer) +static int wlan_cmd_append_wapi_ie(mlan_private *priv, t_u8 **ppbuffer) { int retlen = 0; MrvlIEtypesHeader_t ie_header; @@ -462,18 +464,20 @@ wlan_cmd_append_wapi_ie(mlan_private *priv, t_u8 **ppbuffer) memcpy_ext(priv->adapter, *ppbuffer, &ie_header, sizeof(ie_header), sizeof(ie_header)); - /* Increment the return size and the return buffer pointer param */ + /* 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 */ + /* Copy the wapi IE buffer to the output buffer, advance pointer + */ memcpy_ext(priv->adapter, *ppbuffer, priv->wapi_ie, priv->wapi_ie_len, priv->wapi_ie_len); - /* Increment the return size and the return buffer pointer param */ + /* 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(); @@ -492,8 +496,7 @@ wlan_cmd_append_wapi_ie(mlan_private *priv, t_u8 **ppbuffer) * * @return bytes added to the buffer */ -static int -wlan_cmd_append_osen_ie(mlan_private *priv, t_u8 **ppbuffer) +static int wlan_cmd_append_osen_ie(mlan_private *priv, t_u8 **ppbuffer) { int retlen = 0; MrvlIEtypesHeader_t ie_header; @@ -524,18 +527,20 @@ wlan_cmd_append_osen_ie(mlan_private *priv, t_u8 **ppbuffer) memcpy_ext(priv->adapter, *ppbuffer, &ie_header, sizeof(ie_header), sizeof(ie_header)); - /* Increment the return size and the return buffer pointer param */ + /* Increment the return size and the return buffer pointer param + */ *ppbuffer += sizeof(ie_header); retlen += sizeof(ie_header); - /* Copy the osen IE buffer to the output buffer, advance pointer */ + /* Copy the osen IE buffer to the output buffer, advance pointer + */ memcpy_ext(priv->adapter, *ppbuffer, &priv->osen_ie[2], priv->osen_ie[1], priv->osen_ie[1]); - /* Increment the return size and the return buffer pointer param */ + /* Increment the return size and the return buffer pointer param + */ *ppbuffer += priv->osen_ie[1]; retlen += priv->osen_ie[1]; - } /* return the length appended to the buffer */ LEAVE(); @@ -552,8 +557,8 @@ wlan_cmd_append_osen_ie(mlan_private *priv, t_u8 **ppbuffer) * * @param ptlv_rsn_ie A pointer to rsn_ie TLV */ -int -wlan_update_rsn_ie(mlan_private *pmpriv, MrvlIEtypes_RsnParamSet_t *ptlv_rsn_ie) +int wlan_update_rsn_ie(mlan_private *pmpriv, + MrvlIEtypes_RsnParamSet_t *ptlv_rsn_ie) { t_u16 *prsn_cap; t_u16 *ptr; @@ -564,45 +569,45 @@ wlan_update_rsn_ie(mlan_private *pmpriv, MrvlIEtypes_RsnParamSet_t *ptlv_rsn_ie) t_u16 akm_suite_count = 0; t_u16 temp_akm_suite_count = 0; int found = 0; - t_u8 sha_256_oui[4] = { 0x00, 0x0f, 0xac, 0x06 }; - t_u8 sae_oui[4] = { 0x00, 0x0f, 0xac, 0x08 }; + t_u8 sha_256_oui[4] = {0x00, 0x0f, 0xac, 0x06}; + t_u8 sae_oui[4] = {0x00, 0x0f, 0xac, 0x08}; mlan_adapter *pmadapter = pmpriv->adapter; int ap_mfpc = 0, ap_mfpr = 0, ret = MLAN_STATUS_SUCCESS; - 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 + 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 = wlan_le16_to_cpu(*ptr); - ptr = (t_u16 *)(ptlv_rsn_ie->rsn_ie + sizeof(t_u16) + 4 * sizeof(t_u8) - + sizeof(t_u16) + + 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 = wlan_le16_to_cpu(*ptr); akm_suite_count = wlan_le16_to_cpu(*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); + 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 (pmpriv->sec_info.authentication_mode == MLAN_AUTH_MODE_SAE) { - if (!memcmp - (pmadapter, temp, sae_oui, AKM_SUITE_LEN)) { + if (!memcmp(pmadapter, temp, sae_oui, + AKM_SUITE_LEN)) { found = 1; break; } - } else if (!memcmp - (pmadapter, temp, sha_256_oui, - AKM_SUITE_LEN)) { + } else if (!memcmp(pmadapter, temp, sha_256_oui, + AKM_SUITE_LEN)) { found = 1; break; } @@ -612,50 +617,45 @@ wlan_update_rsn_ie(mlan_private *pmpriv, MrvlIEtypes_RsnParamSet_t *ptlv_rsn_ie) if (found) { /* Copy SHA256 as AKM suite */ memcpy_ext(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)), + 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)), temp, AKM_SUITE_LEN, 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->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; + 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) + + 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; @@ -663,15 +663,15 @@ wlan_update_rsn_ie(mlan_private *pmpriv, MrvlIEtypes_RsnParamSet_t *ptlv_rsn_ie) ap_mfpc = ((*prsn_cap & (0x1 << MFPC_BIT)) == (0x1 << MFPC_BIT)); ap_mfpr = ((*prsn_cap & (0x1 << MFPR_BIT)) == (0x1 << MFPR_BIT)); - if ((!ap_mfpc && !ap_mfpr && pmpriv->pmfcfg.mfpr) - || ((!ap_mfpc) && ap_mfpr) - || (ap_mfpc && ap_mfpr && (!pmpriv->pmfcfg.mfpc)) - ) { + if ((!ap_mfpc && !ap_mfpr && pmpriv->pmfcfg.mfpr) || + ((!ap_mfpc) && ap_mfpr) || + (ap_mfpc && ap_mfpr && (!pmpriv->pmfcfg.mfpc))) { PRINTM(MERROR, "Mismatch in PMF config of STA and AP, can't associate to AP\n"); return MLAN_STATUS_FAILURE; } - if ((pmpriv->pmfcfg.mfpr && pmpriv->pmfcfg.mfpc) || pmpriv->pmfcfg.mfpc) { + if ((pmpriv->pmfcfg.mfpr && pmpriv->pmfcfg.mfpc) || + pmpriv->pmfcfg.mfpc) { *prsn_cap |= PMF_MASK; *prsn_cap &= pmf_mask; } @@ -687,17 +687,16 @@ wlan_update_rsn_ie(mlan_private *pmpriv, MrvlIEtypes_RsnParamSet_t *ptlv_rsn_ie) * @param rsn_ie A pointer to rsn_ie * */ -t_u8 -wlan_ft_akm_is_used(mlan_private *pmpriv, t_u8 *rsn_ie) +t_u8 wlan_ft_akm_is_used(mlan_private *pmpriv, t_u8 *rsn_ie) { t_u8 *temp; t_u16 count; t_u16 pairwise_cipher_count = 0; t_u16 akm_suite_count = 0; t_u8 found = 0; - t_u8 rsn_ft_1x_oui[4] = { 0x00, 0x0f, 0xac, 0x03 }; - t_u8 rsn_ft_psk_oui[4] = { 0x00, 0x0f, 0xac, 0x04 }; - t_u8 rsn_ft_sae_oui[4] = { 0x00, 0x0f, 0xac, 0x09 }; + t_u8 rsn_ft_1x_oui[4] = {0x00, 0x0f, 0xac, 0x03}; + t_u8 rsn_ft_psk_oui[4] = {0x00, 0x0f, 0xac, 0x04}; + t_u8 rsn_ft_sae_oui[4] = {0x00, 0x0f, 0xac, 0x09}; mlan_adapter *pmadapter = pmpriv->adapter; ENTER(); @@ -709,21 +708,22 @@ wlan_ft_akm_is_used(mlan_private *pmpriv, t_u8 *rsn_ie) goto done; /* 2 bytes header + 2 bytes version + 4 bytes group_cipher_suite + - * 2 bytes pairwise_cipher_count + pairwise_cipher_count * PAIRWISE_CIPHER_SUITE_LEN (4) + - * 2 bytes akm_suite_count + akm_suite_count * AKM_SUITE_LEN (4) + * 2 bytes pairwise_cipher_count + pairwise_cipher_count * + * PAIRWISE_CIPHER_SUITE_LEN (4) + 2 bytes akm_suite_count + + * akm_suite_count * AKM_SUITE_LEN (4) */ count = *(t_u16 *)(rsn_ie + 2 + 2 + 4 * sizeof(t_u8)); pairwise_cipher_count = wlan_le16_to_cpu(count); - count = *(t_u16 *)(rsn_ie + 2 + 2 + 4 * sizeof(t_u8) - + sizeof(t_u16) + pairwise_cipher_count * 4); + count = *(t_u16 *)(rsn_ie + 2 + 2 + 4 * sizeof(t_u8) + sizeof(t_u16) + + pairwise_cipher_count * 4); akm_suite_count = wlan_le16_to_cpu(count); - temp = (t_u8 *)(rsn_ie + 2 + sizeof(t_u16) + 4 * sizeof(t_u8) - + sizeof(t_u16) + pairwise_cipher_count - * 4 + sizeof(t_u16)); + temp = (t_u8 *)(rsn_ie + 2 + sizeof(t_u16) + 4 * sizeof(t_u8) + + sizeof(t_u16) + pairwise_cipher_count * 4 + + sizeof(t_u16)); while (akm_suite_count) { - if (!memcmp - (pmadapter, temp, rsn_ft_1x_oui, sizeof(rsn_ft_1x_oui)) || + if (!memcmp(pmadapter, temp, rsn_ft_1x_oui, + sizeof(rsn_ft_1x_oui)) || !memcmp(pmadapter, temp, rsn_ft_psk_oui, sizeof(rsn_ft_psk_oui)) || !memcmp(pmadapter, temp, rsn_ft_sae_oui, @@ -749,8 +749,7 @@ done: * * @return MFALSE if not found; MTURE if found */ -t_u8 -wlan_find_ie(t_u8 *ie, t_u8 ie_len, t_u8 ie_type) +t_u8 wlan_find_ie(t_u8 *ie, t_u8 ie_len, t_u8 ie_type) { IEEEtypes_Header_t *pheader = MNULL; t_u8 *pos = MNULL; @@ -790,9 +789,9 @@ wlan_find_ie(t_u8 *ie, t_u8 ie_len, t_u8 ie_type) * * @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) +mlan_status wlan_cmd_802_11_associate(IN mlan_private *pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_void *pdata_buf) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_adapter *pmadapter = pmpriv->adapter; @@ -829,8 +828,8 @@ wlan_cmd_802_11_associate(IN mlan_private *pmpriv, /* clear assoc_rsp_size */ pmpriv->assoc_rsp_size = 0; - memcpy_ext(pmadapter, passo->peer_sta_addr, - pbss_desc->mac_address, sizeof(pbss_desc->mac_address), + memcpy_ext(pmadapter, passo->peer_sta_addr, pbss_desc->mac_address, + sizeof(pbss_desc->mac_address), sizeof(passo->peer_sta_addr)); pos += sizeof(passo->peer_sta_addr); @@ -869,8 +868,8 @@ wlan_cmd_802_11_associate(IN mlan_private *pmpriv, 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)) { + if (wlan_setup_rates_from_bssdesc(pmpriv, pbss_desc, rates, + &rates_size)) { ret = MLAN_STATUS_FAILURE; goto done; } @@ -889,17 +888,15 @@ wlan_cmd_802_11_associate(IN mlan_private *pmpriv, 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) - ) { + 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); + 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 if (pmpriv->sec_info.authentication_mode == MLAN_AUTH_MODE_FT) pauth_tlv->auth_type = @@ -915,16 +912,15 @@ wlan_cmd_802_11_associate(IN mlan_private *pmpriv, 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 */ + 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 = @@ -969,12 +965,12 @@ wlan_cmd_802_11_associate(IN mlan_private *pmpriv, } HEXDUMP("ASSOC_CMD: RSN IE", (t_u8 *)prsn_ie_tlv, sizeof(prsn_ie_tlv->header) + - prsn_ie_tlv->header.len); + prsn_ie_tlv->header.len); pos += sizeof(prsn_ie_tlv->header) + - prsn_ie_tlv->header.len; + prsn_ie_tlv->header.len; prsn_ie_tlv->header.len = wlan_cpu_to_le16(prsn_ie_tlv->header.len); - /** parse rsn ie to find whether ft akm is used*/ + /** parse rsn ie to find whether ft akm is used*/ ft_akm = wlan_ft_akm_is_used(pmpriv, pmpriv->wpa_ie); } #ifdef DRV_EMBEDDED_SUPPLICANT @@ -986,33 +982,31 @@ wlan_cmd_802_11_associate(IN mlan_private *pmpriv, else if (pbss_desc->pwpa_ie) rsn_wpa_ie_tmp = pbss_desc->pwpa_ie; prsn_ie_tlv = (MrvlIEtypes_RsnParamSet_t *)pos; - pos += supplicantFormatRsnWpaTlv(pmpriv->psapriv, - rsn_wpa_ie_tmp, - prsn_ie_tlv); + pos += supplicantFormatRsnWpaTlv( + pmpriv->psapriv, rsn_wpa_ie_tmp, prsn_ie_tlv); } #endif 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; + (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.type = wlan_cpu_to_le16( + prsn_ie_tlv->header.type); prsn_ie_tlv->header.len = - (t_u16)(*(pbss_desc->pwpa_ie)).vend_hdr. - 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_ext(pmadapter, prsn_ie_tlv->rsn_ie, - &((*(pbss_desc->pwpa_ie)). - vend_hdr.oui[0]), + &((*(pbss_desc->pwpa_ie)) + .vend_hdr.oui[0]), prsn_ie_tlv->header.len, prsn_ie_tlv->header.len); } else { @@ -1023,35 +1017,33 @@ wlan_cmd_802_11_associate(IN mlan_private *pmpriv, HEXDUMP("ASSOC_CMD: RSN IE", (t_u8 *)prsn_ie_tlv, sizeof(prsn_ie_tlv->header) + - prsn_ie_tlv->header.len); + 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); + 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; + (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.type = wlan_cpu_to_le16( + prsn_ie_tlv->header.type); prsn_ie_tlv->header.len = - (t_u16)(*(pbss_desc->prsn_ie)).ieee_hdr. - 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_ext(pmadapter, prsn_ie_tlv->rsn_ie, - &((*(pbss_desc->prsn_ie)). - data[0]) - , prsn_ie_tlv->header.len, + &((*(pbss_desc->prsn_ie)) + .data[0]), + prsn_ie_tlv->header.len, prsn_ie_tlv->header.len); ret = wlan_update_rsn_ie(pmpriv, prsn_ie_tlv); @@ -1066,19 +1058,18 @@ wlan_cmd_802_11_associate(IN mlan_private *pmpriv, HEXDUMP("ASSOC_CMD: RSN IE", (t_u8 *)prsn_ie_tlv, sizeof(prsn_ie_tlv->header) + - prsn_ie_tlv->header.len); + 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); + 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) - && wlan_11n_bandconfig_allowed(pmpriv, pbss_desc->bss_band)) + if (ISSUPP_11NENABLED(pmadapter->fw_cap_info) && + (!pbss_desc->disable_11n) && + wlan_11n_bandconfig_allowed(pmpriv, pbss_desc->bss_band)) wlan_cmd_append_11n_tlv(pmpriv, pbss_desc, &pos); else if ((pmpriv->hotspot_cfg & HOTSPOT_ENABLED) && !(pmpriv->hotspot_cfg & HOTSPOT_BY_SUPPLICANT)) @@ -1089,23 +1080,22 @@ wlan_cmd_802_11_associate(IN mlan_private *pmpriv, REGULATORY_CLASS); if (!oper_class_flag) { if (MLAN_STATUS_SUCCESS == - wlan_get_curr_oper_class(pmpriv, - pbss_desc->phy_param_set. - ds_param_set.current_chan, - pbss_desc->curr_bandwidth, - &oper_class)) + wlan_get_curr_oper_class( + pmpriv, + pbss_desc->phy_param_set.ds_param_set + .current_chan, + pbss_desc->curr_bandwidth, &oper_class)) wlan_add_supported_oper_class_ie(pmpriv, &pos, oper_class); } } - if (ISSUPP_11ACENABLED(pmadapter->fw_cap_info) - && (!pbss_desc->disable_11n) - && wlan_11ac_bandconfig_allowed(pmpriv, pbss_desc->bss_band)) + if (ISSUPP_11ACENABLED(pmadapter->fw_cap_info) && + (!pbss_desc->disable_11n) && + wlan_11ac_bandconfig_allowed(pmpriv, pbss_desc->bss_band)) wlan_cmd_append_11ac_tlv(pmpriv, pbss_desc, &pos); - if ((IS_FW_SUPPORT_11AX(pmadapter)) - && (!pbss_desc->disable_11n) - && wlan_11ax_bandconfig_allowed(pmpriv, pbss_desc->bss_band)) + if ((IS_FW_SUPPORT_11AX(pmadapter)) && (!pbss_desc->disable_11n) && + wlan_11ax_bandconfig_allowed(pmpriv, pbss_desc->bss_band)) wlan_cmd_append_11ax_tlv(pmpriv, pbss_desc, &pos); wlan_wmm_process_association_req(pmpriv, &pos, &pbss_desc->wmm_ie, @@ -1119,29 +1109,29 @@ wlan_cmd_802_11_associate(IN mlan_private *pmpriv, wlan_cmd_append_generic_ie(pmpriv, &pos); if (ft_akm && pbss_desc->pmd_ie) - wlan_cmd_append_pass_through_ie(pmpriv, - (IEEEtypes_Generic_t *) - pbss_desc->pmd_ie, &pos); + wlan_cmd_append_pass_through_ie( + pmpriv, (IEEEtypes_Generic_t *)pbss_desc->pmd_ie, &pos); wlan_cmd_append_tsf_tlv(pmpriv, &pos, pbss_desc); if (pmpriv->curr_bss_params.host_mlme) { - host_mlme_tlv = (MrvlIEtypes_HostMlme_t *) pos; + host_mlme_tlv = (MrvlIEtypes_HostMlme_t *)pos; host_mlme_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_HOST_MLME); host_mlme_tlv->header.len = wlan_cpu_to_le16(sizeof(host_mlme_tlv->host_mlme)); host_mlme_tlv->host_mlme = MTRUE; pos += sizeof(host_mlme_tlv->header) + - host_mlme_tlv->header.len; + host_mlme_tlv->header.len; } - if (wlan_11d_create_dnld_countryinfo(pmpriv, (t_u8)pbss_desc->bss_band)) { + 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)) { + if (wlan_11d_parse_dnld_countryinfo(pmpriv, + pmpriv->pattempted_bss_desc)) { ret = MLAN_STATUS_FAILURE; goto done; } @@ -1150,10 +1140,10 @@ wlan_cmd_802_11_associate(IN mlan_private *pmpriv, * 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); + 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); @@ -1165,8 +1155,8 @@ wlan_cmd_802_11_associate(IN mlan_private *pmpriv, 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); + PRINTM(MINFO, "ASSOC_CMD: tmp_cap=%4X CAPINFO_MASK=%4lX\n", tmp_cap, + CAPINFO_MASK); tmp_cap = wlan_cpu_to_le16(tmp_cap); memcpy_ext(pmadapter, &passo->cap_info, &tmp_cap, sizeof(tmp_cap), sizeof(passo->cap_info)); @@ -1252,9 +1242,9 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ret_802_11_associate(IN mlan_private *pmpriv, - IN HostCmd_DS_COMMAND *resp, IN t_void *pioctl_buf) +mlan_status wlan_ret_802_11_associate(IN mlan_private *pmpriv, + 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; @@ -1286,8 +1276,8 @@ wlan_ret_802_11_associate(IN mlan_private *pmpriv, 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)); + pmpriv->assoc_rsp_size = + MIN(resp->size - S_DS_GEN, sizeof(pmpriv->assoc_rsp_buf)); memcpy_ext(pmpriv->adapter, pmpriv->assoc_rsp_buf, &resp->params, pmpriv->assoc_rsp_size, pmpriv->assoc_rsp_size); @@ -1305,20 +1295,21 @@ wlan_ret_802_11_associate(IN mlan_private *pmpriv, 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)) + 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); + 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++; pmpriv->adapter->dbg.num_cons_assoc_failure++; - PRINTM(MERROR, "ASSOC_RESP: Association Failed, " + PRINTM(MERROR, + "ASSOC_RESP: Association Failed, " "status code = %d, error = 0x%x, a_id = 0x%x\n", passoc_rsp->status_code, wlan_le16_to_cpu(*(t_u16 *)&passoc_rsp->capability), @@ -1357,8 +1348,8 @@ wlan_ret_802_11_associate(IN mlan_private *pmpriv, pbss_desc, sizeof(BSSDescriptor_t), 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.bss_descriptor.channel = + pbss_desc->phy_param_set.ds_param_set.current_chan; pmpriv->curr_bss_params.band = (t_u8)pbss_desc->bss_band; @@ -1380,10 +1371,10 @@ wlan_ret_802_11_associate(IN mlan_private *pmpriv, 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) + 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; @@ -1391,18 +1382,20 @@ wlan_ret_802_11_associate(IN mlan_private *pmpriv, 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; + 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 */ + /* 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 */ + /* Since WMM is not enabled, setup the queues with the defaults + */ wlan_wmm_setup_queues(pmpriv); if (enable_data) @@ -1419,17 +1412,18 @@ wlan_ret_802_11_associate(IN mlan_private *pmpriv, pmpriv->bcn_nf_avg = 0; pmpriv->rxpd_rate = 0; pmpriv->rxpd_rate_info = 0; - /* Reset mib statistics */ + /* Reset mib statistics*/ pmpriv->amsdu_rx_cnt = 0; pmpriv->amsdu_tx_cnt = 0; pmpriv->msdu_in_rx_amsdu_cnt = 0; pmpriv->msdu_in_tx_amsdu_cnt = 0; if (pbss_desc->pvht_cap && pbss_desc->pht_cap) { - if (GET_VHTCAP_MAXMPDULEN - (pbss_desc->pvht_cap->vht_cap.vht_cap_info) == 2) + 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) + 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; @@ -1452,23 +1446,24 @@ wlan_ret_802_11_associate(IN mlan_private *pmpriv, (t_u8 *)pmpriv->curr_bss_params.bss_descriptor.mac_address, MLAN_MAC_ADDR_LENGTH, pevent->event_len); - /* Add the ra_list here for infra mode as there will be only 1 ra always */ + /* 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 */ + /** 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_update( + pmpriv, cur_mac, + pmpriv->curr_bss_params.bss_descriptor.mac_address)) wlan_ralist_add(pmpriv, - pmpriv->curr_bss_params.bss_descriptor. - mac_address); + pmpriv->curr_bss_params.bss_descriptor + .mac_address); wlan_11n_cleanup_reorder_tbl(pmpriv); wlan_11n_deleteall_txbastream_tbl(pmpriv); } else - wlan_ralist_add(pmpriv, - pmpriv->curr_bss_params.bss_descriptor. - mac_address); + wlan_ralist_add( + pmpriv, + pmpriv->curr_bss_params.bss_descriptor.mac_address); wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_CONNECTED, pevent); @@ -1476,40 +1471,35 @@ wlan_ret_802_11_associate(IN mlan_private *pmpriv, wlan_2040_coex_event(pmpriv); wlan_coex_ampdu_rxwinsize(pmpriv->adapter); - 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->sec_info.osen_enabled + 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->sec_info.osen_enabled #ifdef DRV_EMBEDDED_SUPPLICANT && !supplicantIsEnabled(pmpriv->psapriv) #endif - ) { + ) { /* 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->sec_info.osen_enabled + 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->sec_info.osen_enabled #ifdef DRV_EMBEDDED_SUPPLICANT || (supplicantIsEnabled(pmpriv->psapriv)) #endif - ) + ) pmpriv->adapter->scan_block = MTRUE; #ifdef DRV_EMBEDDED_SUPPLICANT - supplicantInitSession(pmpriv->psapriv, - (t_u8 *)&pmpriv->curr_bss_params.bss_descriptor. - ssid.ssid, - pmpriv->curr_bss_params.bss_descriptor.ssid. - ssid_len, - (t_u8 *)&pmpriv->curr_bss_params.bss_descriptor. - mac_address, (t_u8 *)&pmpriv->curr_addr); + supplicantInitSession( + pmpriv->psapriv, + (t_u8 *)&pmpriv->curr_bss_params.bss_descriptor.ssid.ssid, + pmpriv->curr_bss_params.bss_descriptor.ssid.ssid_len, + (t_u8 *)&pmpriv->curr_bss_params.bss_descriptor.mac_address, + (t_u8 *)&pmpriv->curr_addr); #endif pevent = (mlan_event *)event_buf; @@ -1517,7 +1507,7 @@ wlan_ret_802_11_associate(IN mlan_private *pmpriv, pevent->bss_index = pmpriv->bss_index; pevent->event_id = MLAN_EVENT_ID_DRV_ASSOC_SUCC_LOGGER; pevent->event_len = sizeof(assoc_logger_data); - assoc_succ = (assoc_logger_data *) pevent->event_buf; + assoc_succ = (assoc_logger_data *)pevent->event_buf; memcpy_ext(pmpriv->adapter, (t_u8 *)assoc_succ->bssid, pbss_desc->mac_address, MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); @@ -1537,9 +1527,9 @@ done: 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(*(t_u16 *)&passoc_rsp + ->capability) + << 16) + passoc_rsp->status_code; else pioctl_req->status_code = @@ -1562,9 +1552,9 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_cmd_802_11_ad_hoc_start(IN mlan_private *pmpriv, - IN HostCmd_DS_COMMAND *cmd, IN t_void *pdata_buf) +mlan_status wlan_cmd_802_11_ad_hoc_start(IN mlan_private *pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_void *pdata_buf) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_adapter *pmadapter = pmpriv->adapter; @@ -1577,11 +1567,10 @@ wlan_cmd_802_11_ad_hoc_start(IN mlan_private *pmpriv, MrvlIEtypes_RsnParamSet_t *prsn_ie_tlv; /* 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 - }; + 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); @@ -1635,24 +1624,20 @@ wlan_cmd_802_11_ad_hoc_start(IN mlan_private *pmpriv, /* Set Physical param set */ /** Parameter IE Id */ -#define DS_PARA_IE_ID 3 +#define DS_PARA_IE_ID 3 /** Parameter IE length */ -#define DS_PARA_IE_LEN 1 +#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; - 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); + 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; } @@ -1678,18 +1663,17 @@ wlan_cmd_802_11_ad_hoc_start(IN mlan_private *pmpriv, /* Set IBSS param set */ /** IBSS parameter IE Id */ -#define IBSS_PARA_IE_ID 6 +#define IBSS_PARA_IE_ID 6 /** IBSS parameter IE length */ -#define IBSS_PARA_IE_LEN 2 +#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); + 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_ext(pmadapter, &pbss_desc->ss_param_set, - &padhoc_start->ss_param_set, - sizeof(IEEEtypes_SsParamSet_t), + &padhoc_start->ss_param_set, sizeof(IEEEtypes_SsParamSet_t), sizeof(IEEEtypes_SsParamSet_t)); /* Set Capability info */ @@ -1698,16 +1682,16 @@ wlan_cmd_802_11_ad_hoc_start(IN mlan_private *pmpriv, pbss_desc->cap_info.ibss = 1; /* Set up privacy in pbss_desc */ - if (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled - || pmpriv->sec_info.wpa_enabled || pmpriv->sec_info.ewpa_enabled) { + if (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled || + pmpriv->sec_info.wpa_enabled || pmpriv->sec_info.ewpa_enabled) { /** Ad-Hoc capability privacy on */ -#define AD_HOC_CAP_PRIVACY_ON 1 +#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"); + "Privacy to ACCEPT ALL\n"); pbss_desc->privacy = Wlan802_11PrivFilterAcceptAll; } @@ -1715,10 +1699,10 @@ wlan_cmd_802_11_ad_hoc_start(IN mlan_private *pmpriv, 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); + 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, @@ -1727,10 +1711,9 @@ wlan_cmd_802_11_ad_hoc_start(IN mlan_private *pmpriv, 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); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_MAC_CONTROL, + HostCmd_ACT_GEN_SET, 0, MNULL, + &pmpriv->curr_pkt_filter); if (ret) { PRINTM(MERROR, @@ -1740,8 +1723,9 @@ wlan_cmd_802_11_ad_hoc_start(IN mlan_private *pmpriv, } } /* Find the last non zero */ - for (i = 0; i < sizeof(padhoc_start->DataRate) - && padhoc_start->DataRate[i]; i++) + for (i = 0; + i < sizeof(padhoc_start->DataRate) && padhoc_start->DataRate[i]; + i++) /* XXX Do not delete no-operation line */ ; @@ -1773,8 +1757,8 @@ wlan_cmd_802_11_ad_hoc_start(IN mlan_private *pmpriv, PRINTM(MINFO, "ADHOC_S_CMD: TLV Chan = %d\n", pchan_tlv->chan_scan_param[0].chan_number); - pchan_tlv->chan_scan_param[0].bandcfg.chanBand - = wlan_band_to_radio_type(pmpriv->curr_bss_params.band); + pchan_tlv->chan_scan_param[0].bandcfg.chanBand = + wlan_band_to_radio_type(pmpriv->curr_bss_params.band); PRINTM(MINFO, "ADHOC_S_CMD: TLV Bandcfg = %x\n", pchan_tlv->chan_scan_param[0].bandcfg); pos += sizeof(pchan_tlv->header) + sizeof(ChanScanParamSet_t); @@ -1782,8 +1766,8 @@ wlan_cmd_802_11_ad_hoc_start(IN mlan_private *pmpriv, sizeof(pchan_tlv->header) + sizeof(ChanScanParamSet_t); } - if (wlan_11d_create_dnld_countryinfo - (pmpriv, pmpriv->curr_bss_params.band)) { + 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; @@ -1829,7 +1813,7 @@ wlan_cmd_802_11_ad_hoc_start(IN mlan_private *pmpriv, DBG_HEXDUMP(MCMD_D, "ADHOC_S_CMD: RSN IE", (t_u8 *)prsn_ie_tlv, sizeof(prsn_ie_tlv->header) + - prsn_ie_tlv->header.len); + 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; @@ -1837,10 +1821,9 @@ wlan_cmd_802_11_ad_hoc_start(IN mlan_private *pmpriv, wlan_cpu_to_le16(prsn_ie_tlv->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)); + 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_ext(pmadapter, &tmp_cap, &padhoc_start->cap, sizeof(t_u16), sizeof(tmp_cap)); @@ -1870,9 +1853,9 @@ done: * * @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) +mlan_status wlan_cmd_802_11_ad_hoc_join(IN mlan_private *pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_void *pdata_buf) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_adapter *pmadapter = pmpriv->adapter; @@ -1889,16 +1872,14 @@ wlan_cmd_802_11_ad_hoc_join(IN mlan_private *pmpriv, ENTER(); /** Use G protection */ -#define USE_G_PROTECTION 0x02 +#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; + 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); + 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"); @@ -1913,50 +1894,45 @@ wlan_cmd_802_11_ad_hoc_join(IN mlan_private *pmpriv, padhoc_join->bss_descriptor.bss_mode = HostCmd_BSS_MODE_IBSS; - padhoc_join->bss_descriptor.beacon_period - = wlan_cpu_to_le16(pbss_desc->beacon_period); + padhoc_join->bss_descriptor.beacon_period = + wlan_cpu_to_le16(pbss_desc->beacon_period); memcpy_ext(pmadapter, &padhoc_join->bss_descriptor.bssid, - &pbss_desc->mac_address, - MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); + &pbss_desc->mac_address, MLAN_MAC_ADDR_LENGTH, + MLAN_MAC_ADDR_LENGTH); memcpy_ext(pmadapter, &padhoc_join->bss_descriptor.ssid, - &pbss_desc->ssid.ssid, - pbss_desc->ssid.ssid_len, MLAN_MAX_SSID_LENGTH); + &pbss_desc->ssid.ssid, pbss_desc->ssid.ssid_len, + MLAN_MAX_SSID_LENGTH); memcpy_ext(pmadapter, &padhoc_join->bss_descriptor.phy_param_set, - &pbss_desc->phy_param_set, - sizeof(IEEEtypes_PhyParamSet_t), + &pbss_desc->phy_param_set, sizeof(IEEEtypes_PhyParamSet_t), sizeof(IEEEtypes_PhyParamSet_t)); - padhoc_join->bss_descriptor.phy_param_set.fh_param_set.dwell_time - = - wlan_cpu_to_le16(padhoc_join->bss_descriptor.phy_param_set. - fh_param_set.dwell_time); + padhoc_join->bss_descriptor.phy_param_set.fh_param_set.dwell_time = + wlan_cpu_to_le16(padhoc_join->bss_descriptor.phy_param_set + .fh_param_set.dwell_time); memcpy_ext(pmadapter, &padhoc_join->bss_descriptor.ss_param_set, - &pbss_desc->ss_param_set, - sizeof(IEEEtypes_SsParamSet_t), + &pbss_desc->ss_param_set, sizeof(IEEEtypes_SsParamSet_t), sizeof(IEEEtypes_SsParamSet_t)); padhoc_join->bss_descriptor.ss_param_set.ibss_param_set.atim_window = 0; - padhoc_join->bss_descriptor.ss_param_set.ibss_param_set.atim_window - = - wlan_cpu_to_le16(padhoc_join->bss_descriptor.ss_param_set. - ibss_param_set.atim_window); + padhoc_join->bss_descriptor.ss_param_set.ibss_param_set.atim_window = + wlan_cpu_to_le16(padhoc_join->bss_descriptor.ss_param_set + .ibss_param_set.atim_window); memcpy_ext(pmadapter, &tmp_cap, &pbss_desc->cap_info, sizeof(IEEEtypes_CapInfo_t), sizeof(IEEEtypes_CapInfo_t)); tmp_cap &= CAPINFO_MASK; - PRINTM(MINFO, "ADHOC_J_CMD: tmp_cap=%4X CAPINFO_MASK=%4lX\n", - tmp_cap, CAPINFO_MASK); + PRINTM(MINFO, "ADHOC_J_CMD: tmp_cap=%4X CAPINFO_MASK=%4lX\n", tmp_cap, + CAPINFO_MASK); memcpy_ext(pmadapter, &padhoc_join->bss_descriptor.cap, &tmp_cap, sizeof(IEEEtypes_CapInfo_t), sizeof(IEEEtypes_CapInfo_t)); /* Information on BSSID descriptor passed to FW */ - PRINTM(MINFO, - "ADHOC_J_CMD: BSSID = " MACSTR ", SSID = %s\n", + PRINTM(MINFO, "ADHOC_J_CMD: BSSID = " MACSTR ", SSID = %s\n", MAC2STR(padhoc_join->bss_descriptor.bssid), padhoc_join->bss_descriptor.ssid); @@ -1986,8 +1962,8 @@ wlan_cmd_802_11_ad_hoc_join(IN mlan_private *pmpriv, 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->sec_info.wpa_enabled || pmpriv->sec_info.ewpa_enabled) + if (pmpriv->sec_info.wep_status == Wlan802_11WEPEnabled || + 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)) { @@ -2004,8 +1980,8 @@ wlan_cmd_802_11_ad_hoc_join(IN mlan_private *pmpriv, PRINTM(MINFO, "ADHOC_J_CMD: TLV Chan = %d\n", pchan_tlv->chan_scan_param[0].chan_number); - pchan_tlv->chan_scan_param[0].bandcfg.chanBand - = wlan_band_to_radio_type((t_u8)pbss_desc->bss_band); + pchan_tlv->chan_scan_param[0].bandcfg.chanBand = + wlan_band_to_radio_type((t_u8)pbss_desc->bss_band); PRINTM(MINFO, "ADHOC_J_CMD: TLV Bandcfg = %x\n", pchan_tlv->chan_scan_param[0].bandcfg); @@ -2014,13 +1990,14 @@ wlan_cmd_802_11_ad_hoc_join(IN mlan_private *pmpriv, sizeof(pchan_tlv->header) + sizeof(ChanScanParamSet_t); } - if (wlan_11d_create_dnld_countryinfo(pmpriv, (t_u8)pbss_desc->bss_band)) { + 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)) { + if (wlan_11d_parse_dnld_countryinfo(pmpriv, + pmpriv->pattempted_bss_desc)) { ret = MLAN_STATUS_FAILURE; goto done; } @@ -2030,11 +2007,10 @@ wlan_cmd_802_11_ad_hoc_join(IN mlan_private *pmpriv, * 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); + 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; @@ -2065,8 +2041,8 @@ wlan_cmd_802_11_ad_hoc_join(IN mlan_private *pmpriv, 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; + (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 = @@ -2075,10 +2051,12 @@ wlan_cmd_802_11_ad_hoc_join(IN mlan_private *pmpriv, (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))) { + if (prsn_ie_tlv->header.len <= + (sizeof(pmpriv->wpa_ie))) { memcpy_ext(pmadapter, prsn_ie_tlv->rsn_ie, - &((*(pbss_desc->pwpa_ie)).vend_hdr. - oui[0]), prsn_ie_tlv->header.len, + &((*(pbss_desc->pwpa_ie)) + .vend_hdr.oui[0]), + prsn_ie_tlv->header.len, prsn_ie_tlv->header.len); } else { ret = MLAN_STATUS_FAILURE; @@ -2087,20 +2065,19 @@ wlan_cmd_802_11_ad_hoc_join(IN mlan_private *pmpriv, HEXDUMP("ADHOC_JOIN: RSN IE", (t_u8 *)prsn_ie_tlv, sizeof(prsn_ie_tlv->header) + - prsn_ie_tlv->header.len); + 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; + 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; + (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 = @@ -2109,10 +2086,11 @@ wlan_cmd_802_11_ad_hoc_join(IN mlan_private *pmpriv, (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))) { + if (prsn_ie_tlv->header.len <= + (sizeof(pmpriv->wpa_ie))) { memcpy_ext(pmadapter, prsn_ie_tlv->rsn_ie, - &((*(pbss_desc->prsn_ie)).data[0]) - , prsn_ie_tlv->header.len, + &((*(pbss_desc->prsn_ie)).data[0]), + prsn_ie_tlv->header.len, prsn_ie_tlv->header.len); } else { ret = MLAN_STATUS_FAILURE; @@ -2121,28 +2099,25 @@ wlan_cmd_802_11_ad_hoc_join(IN mlan_private *pmpriv, HEXDUMP("ADHOC_JOIN: RSN IE", (t_u8 *)prsn_ie_tlv, sizeof(prsn_ie_tlv->header) + - prsn_ie_tlv->header.len); + 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; + 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); } } - cmd->size = - (t_u16) - wlan_cpu_to_le16((t_u16)(sizeof(HostCmd_DS_802_11_AD_HOC_JOIN) - + S_DS_GEN + cmd_append_size)); + 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_ext(pmadapter, &tmp_cap, &padhoc_join->bss_descriptor.cap, sizeof(IEEEtypes_CapInfo_t), sizeof(IEEEtypes_CapInfo_t)); tmp_cap = wlan_cpu_to_le16(tmp_cap); - memcpy_ext(pmadapter, &padhoc_join->bss_descriptor.cap, - &tmp_cap, + memcpy_ext(pmadapter, &padhoc_join->bss_descriptor.cap, &tmp_cap, sizeof(IEEEtypes_CapInfo_t), sizeof(IEEEtypes_CapInfo_t)); done: @@ -2160,9 +2135,9 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ret_802_11_ad_hoc(IN mlan_private *pmpriv, - IN HostCmd_DS_COMMAND *resp, IN t_void *pioctl_buf) +mlan_status wlan_ret_802_11_ad_hoc(IN mlan_private *pmpriv, + 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; @@ -2178,7 +2153,7 @@ wlan_ret_802_11_ad_hoc(IN mlan_private *pmpriv, int ie_len = 0; IEEEtypes_WmmParameter_t *pwmm_param_ie = MNULL; mlan_adapter *pmadapter = pmpriv->adapter; - const t_u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 }; + const t_u8 wmm_oui[4] = {0x00, 0x50, 0xf2, 0x02}; ENTER(); @@ -2186,23 +2161,23 @@ wlan_ret_802_11_ad_hoc(IN mlan_private *pmpriv, if (command == HostCmd_CMD_802_11_AD_HOC_START) { result = padhoc_start_result->result; ie_len = resp->size - - (sizeof(HostCmd_DS_802_11_AD_HOC_START_RESULT) + - S_DS_GEN); + (sizeof(HostCmd_DS_802_11_AD_HOC_START_RESULT) + + S_DS_GEN); pwmm_param_ie = - (IEEEtypes_WmmParameter_t *)((t_u8 *)resp + - (sizeof - (HostCmd_DS_802_11_AD_HOC_START_RESULT) - + S_DS_GEN)); + (IEEEtypes_WmmParameter_t + *)((t_u8 *)resp + + (sizeof(HostCmd_DS_802_11_AD_HOC_START_RESULT) + + S_DS_GEN)); } else { result = padhoc_join_result->result; ie_len = resp->size - - (sizeof(HostCmd_DS_802_11_AD_HOC_JOIN_RESULT) + - S_DS_GEN); + (sizeof(HostCmd_DS_802_11_AD_HOC_JOIN_RESULT) + + S_DS_GEN); pwmm_param_ie = - (IEEEtypes_WmmParameter_t *)((t_u8 *)resp + - (sizeof - (HostCmd_DS_802_11_AD_HOC_JOIN_RESULT) - + S_DS_GEN)); + (IEEEtypes_WmmParameter_t + *)((t_u8 *)resp + + (sizeof(HostCmd_DS_802_11_AD_HOC_JOIN_RESULT) + + S_DS_GEN)); } pbss_desc = pmpriv->pattempted_bss_desc; @@ -2232,8 +2207,8 @@ wlan_ret_802_11_ad_hoc(IN mlan_private *pmpriv, /* Update the created network descriptor with the new BSSID */ memcpy_ext(pmpriv->adapter, pbss_desc->mac_address, - padhoc_start_result->bssid, - MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); + padhoc_start_result->bssid, MLAN_MAC_ADDR_LENGTH, + MLAN_MAC_ADDR_LENGTH); pmpriv->adhoc_state = ADHOC_STARTED; if (pmpriv->adapter->state_rdh.stage == RDH_RESTART_INTFS) @@ -2257,17 +2232,19 @@ wlan_ret_802_11_ad_hoc(IN mlan_private *pmpriv, pmpriv->adhoc_state = ADHOC_JOINED; } - /** process wmm ie */ + /** process wmm ie */ if (ie_len >= sizeof(IEEEtypes_VendorHeader_t)) { - if ((pwmm_param_ie->vend_hdr.element_id == VENDOR_SPECIFIC_221) - && !memcmp(pmadapter, pwmm_param_ie->vend_hdr.oui, wmm_oui, - sizeof(wmm_oui)) && + if ((pwmm_param_ie->vend_hdr.element_id == + VENDOR_SPECIFIC_221) && + !memcmp(pmadapter, pwmm_param_ie->vend_hdr.oui, wmm_oui, + sizeof(wmm_oui)) && (pwmm_param_ie->vend_hdr.len + 2 == ie_len)) { DBG_HEXDUMP(MCMD_D, "WMM Param", (t_u8 *)pwmm_param_ie, ie_len); memcpy_ext(pmpriv->adapter, - (t_u8 *)&pmpriv->curr_bss_params. - bss_descriptor.wmm_ie, pwmm_param_ie, + (t_u8 *)&pmpriv->curr_bss_params + .bss_descriptor.wmm_ie, + pwmm_param_ie, (pwmm_param_ie->vend_hdr.len + 2), sizeof(IEEEtypes_WmmParameter_t)); pmpriv->wmm_enabled = MTRUE; @@ -2314,9 +2291,8 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_associate(IN mlan_private *pmpriv, - IN t_void *pioctl_buf, IN BSSDescriptor_t *pbss_desc) +mlan_status wlan_associate(IN mlan_private *pmpriv, IN t_void *pioctl_buf, + IN BSSDescriptor_t *pbss_desc) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u8 current_bssid[MLAN_MAC_ADDR_LENGTH]; @@ -2338,11 +2314,11 @@ wlan_associate(IN mlan_private *pmpriv, &pmpriv->curr_bss_params.bss_descriptor.mac_address, sizeof(current_bssid), sizeof(current_bssid)); - /* Clear any past association response stored for application retrieval */ + /* Clear any past association response stored for application retrieval + */ pmpriv->assoc_rsp_size = 0; - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_ASSOCIATE, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_ASSOCIATE, HostCmd_ACT_GEN_SET, 0, pioctl_buf, pbss_desc); LEAVE(); @@ -2358,9 +2334,8 @@ wlan_associate(IN mlan_private *pmpriv, * * @return MLAN_STATUS_SUCCESS--success, MLAN_STATUS_FAILURE--fail */ -mlan_status -wlan_adhoc_start(IN mlan_private *pmpriv, - IN t_void *pioctl_buf, IN mlan_802_11_ssid *padhoc_ssid) +mlan_status wlan_adhoc_start(IN mlan_private *pmpriv, 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; @@ -2374,8 +2349,9 @@ wlan_adhoc_start(IN mlan_private *pmpriv, * 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; + radar = pmeas_state->meas_rpt_returned.rpt.basic.map.radar ? + MTRUE : + MFALSE; } if (radar) { @@ -2392,8 +2368,7 @@ wlan_adhoc_start(IN mlan_private *pmpriv, 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, + 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) @@ -2411,14 +2386,13 @@ wlan_adhoc_start(IN mlan_private *pmpriv, * * @param pmpriv A pointer to mlan_private structure * @param pioctl_buf A pointer to MLAN IOCTL Request buffer - * @param pbss_desc A pointer to the BSS descriptor found in a previous scan - * to attempt to join + * @param pbss_desc A pointer to the BSS descriptor found in a previous + * scan to attempt to join * * @return MLAN_STATUS_SUCCESS--success, MLAN_STATUS_FAILURE--fail */ -mlan_status -wlan_adhoc_join(IN mlan_private *pmpriv, - IN t_void *pioctl_buf, IN BSSDescriptor_t *pbss_desc) +mlan_status wlan_adhoc_join(IN mlan_private *pmpriv, IN t_void *pioctl_buf, + IN BSSDescriptor_t *pbss_desc) { pmlan_adapter pmadapter = pmpriv->adapter; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -2440,7 +2414,6 @@ wlan_adhoc_join(IN mlan_private *pmpriv, &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"); @@ -2456,8 +2429,7 @@ wlan_adhoc_join(IN mlan_private *pmpriv, 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, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_AD_HOC_JOIN, HostCmd_ACT_GEN_SET, 0, pioctl_buf, pbss_desc); LEAVE(); @@ -2465,25 +2437,24 @@ wlan_adhoc_join(IN mlan_private *pmpriv, } /** - * @brief Send Deauthentication Request or Stop the AdHoc network depending on mode + * @brief Send Deauthentication Request or Stop the AdHoc network depending on + * mode * * @param pmpriv A pointer to mlan_private structure * @param pioctl_req A pointer to mlan_ioctl_req structure * @param deauth_param A pointer to mlan_deauth_param structure * - * @return MLAN_STATUS_SUCCESS--success, MLAN_STATUS_FAILURE--fail, MLAN_STATUS_PENDING--pending + * @return MLAN_STATUS_SUCCESS--success, MLAN_STATUS_FAILURE--fail, + * MLAN_STATUS_PENDING--pending */ -mlan_status -wlan_disconnect(IN mlan_private *pmpriv, - IN mlan_ioctl_req *pioctl_req, - IN mlan_deauth_param *deauth_param) +mlan_status wlan_disconnect(IN mlan_private *pmpriv, + IN mlan_ioctl_req *pioctl_req, + IN mlan_deauth_param *deauth_param) { mlan_status ret = MLAN_STATUS_SUCCESS; - mlan_deauth_param local_param = { - .mac_addr = {0, 0, 0, 0, 0, 0}, - .reason_code = DEF_DEAUTH_REASON_CODE - }; - t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; + mlan_deauth_param local_param = {.mac_addr = {0, 0, 0, 0, 0, 0}, + .reason_code = DEF_DEAUTH_REASON_CODE}; + t_u8 zero_mac[] = {0, 0, 0, 0, 0, 0}; ENTER(); @@ -2497,26 +2468,23 @@ wlan_disconnect(IN mlan_private *pmpriv, zero_mac, sizeof(zero_mac))) memcpy_ext(pmpriv->adapter, local_param.mac_addr, - (t_u8 *)&pmpriv->curr_bss_params. - bss_descriptor.mac_address, + (t_u8 *)&pmpriv->curr_bss_params + .bss_descriptor.mac_address, MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); #ifdef WIFI_DIRECT_SUPPORT if (pmpriv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT) - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_DISASSOCIATE, - HostCmd_ACT_GEN_SET, - 0, - (t_void *)pioctl_req, - &local_param); + ret = wlan_prepare_cmd( + pmpriv, HostCmd_CMD_802_11_DISASSOCIATE, + HostCmd_ACT_GEN_SET, 0, + (t_void *)pioctl_req, &local_param); else #endif - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_DEAUTHENTICATE, - HostCmd_ACT_GEN_SET, - 0, - (t_void *)pioctl_req, - &local_param); + ret = wlan_prepare_cmd( + pmpriv, + HostCmd_CMD_802_11_DEAUTHENTICATE, + HostCmd_ACT_GEN_SET, 0, + (t_void *)pioctl_req, &local_param); if (ret == MLAN_STATUS_SUCCESS && pioctl_req) ret = MLAN_STATUS_PENDING; @@ -2524,8 +2492,8 @@ wlan_disconnect(IN mlan_private *pmpriv, } 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); + HostCmd_ACT_GEN_SET, 0, + (t_void *)pioctl_req, MNULL); if (ret == MLAN_STATUS_SUCCESS && pioctl_req) ret = MLAN_STATUS_PENDING; @@ -2543,8 +2511,7 @@ wlan_disconnect(IN mlan_private *pmpriv, * * @return Radio type designator for use in a channel TLV */ -t_u8 -wlan_band_to_radio_type(IN t_u8 band) +t_u8 wlan_band_to_radio_type(IN t_u8 band) { t_u8 ret_radio_type; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_join.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_join.h index 7c777b13d6ff..99d6027c59d5 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_join.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_join.h @@ -34,9 +34,9 @@ Change log: #define _MLAN_JOIN_H_ /** Size of buffer allocated to store the association response from firmware */ -#define MRVDRV_ASSOC_RSP_BUF_SIZE 500 +#define MRVDRV_ASSOC_RSP_BUF_SIZE 500 /** Size of buffer allocated to store IEs passed to firmware in the assoc req */ -#define MRVDRV_GENIE_BUF_SIZE 256 +#define MRVDRV_GENIE_BUF_SIZE 256 #endif /* _MLAN_JOIN_H_ */ diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_main.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_main.h index d9bd23b1dae3..1a977263e581 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_main.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_main.h @@ -31,146 +31,178 @@ Change log: #define _MLAN_MAIN_H_ #ifdef DEBUG_LEVEL1 -extern t_void (*print_callback) (IN t_void *pmoal_handle, - IN t_u32 level, IN char *pformat, IN ... - ); +extern t_void (*print_callback)(IN t_void *pmoal_handle, 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); +extern mlan_status (*get_sys_time_callback)(IN t_void *pmoal_handle, + OUT t_u32 *psec, OUT t_u32 *pusec); extern t_u32 mlan_drvdbg; -#ifdef DEBUG_LEVEL2 -#define PRINTM_MINFO(msg...) do { \ - if ((mlan_drvdbg & MINFO) && (print_callback)) \ - print_callback(MNULL, MINFO, msg); \ +#ifdef DEBUG_LEVEL2 +#define PRINTM_MINFO(msg...) \ + do { \ + if ((mlan_drvdbg & MINFO) && (print_callback)) \ + print_callback(MNULL, MINFO, msg); \ } while (0) -#define PRINTM_MWARN(msg...) do { \ - if ((mlan_drvdbg & MWARN) && (print_callback)) \ - print_callback(MNULL, MWARN, msg); \ +#define PRINTM_MWARN(msg...) \ + do { \ + if ((mlan_drvdbg & MWARN) && (print_callback)) \ + print_callback(MNULL, MWARN, msg); \ + } while (0) +#define PRINTM_MENTRY(msg...) \ + do { \ + if ((mlan_drvdbg & MENTRY) && (print_callback)) \ + print_callback(MNULL, MENTRY, msg); \ + } while (0) +#define PRINTM_GET_SYS_TIME(level, psec, pusec) \ + do { \ + if ((level & mlan_drvdbg) && (get_sys_time_callback)) \ + get_sys_time_callback(MNULL, psec, pusec); \ } while (0) -#define PRINTM_MENTRY(msg...) do { \ - if ((mlan_drvdbg & MENTRY) && (print_callback)) \ - print_callback(MNULL, MENTRY, msg); \ -} while (0) -#define PRINTM_GET_SYS_TIME(level, psec, pusec) \ -do { \ - if ((level & mlan_drvdbg) && (get_sys_time_callback))\ - get_sys_time_callback(MNULL, psec, pusec); \ -} while (0) /** Hexdump for level-2 debugging */ -#define HEXDUMP(x, y, z) \ -do { \ - if ((mlan_drvdbg & (MHEX_DUMP | MINFO)) && (print_callback)) \ - print_callback(MNULL, MHEX_DUMP | MINFO, x, y, z); \ -} while (0) +#define HEXDUMP(x, y, z) \ + do { \ + if ((mlan_drvdbg & (MHEX_DUMP | MINFO)) && (print_callback)) \ + print_callback(MNULL, MHEX_DUMP | MINFO, x, y, z); \ + } while (0) #else -#define PRINTM_MINFO(msg...) do {} while (0) -#define PRINTM_MWARN(msg...) do {} while (0) -#define PRINTM_MENTRY(msg...) do {} while (0) +#define PRINTM_MINFO(msg...) \ + do { \ + } while (0) +#define PRINTM_MWARN(msg...) \ + do { \ + } while (0) +#define PRINTM_MENTRY(msg...) \ + do { \ + } while (0) -#define PRINTM_GET_SYS_TIME(level, psec, pusec) \ -do { \ - if ((level & mlan_drvdbg) && (get_sys_time_callback) \ - && (level != MINFO) && (level != MWARN)) \ - get_sys_time_callback(MNULL, psec, pusec); \ -} while (0) +#define PRINTM_GET_SYS_TIME(level, psec, pusec) \ + do { \ + if ((level & mlan_drvdbg) && (get_sys_time_callback) && \ + (level != MINFO) && (level != MWARN)) \ + get_sys_time_callback(MNULL, psec, pusec); \ + } while (0) /** Hexdump for debugging */ -#define HEXDUMP(x, y, z) do {} while (0) +#define HEXDUMP(x, y, z) \ + do { \ + } while (0) #endif /* DEBUG_LEVEL2 */ -#define PRINTM_MFW_D(msg...) do { \ - if ((mlan_drvdbg & MFW_D) && (print_callback)) \ - print_callback(MNULL, MFW_D, msg); \ +#define PRINTM_MFW_D(msg...) \ + do { \ + if ((mlan_drvdbg & MFW_D) && (print_callback)) \ + print_callback(MNULL, MFW_D, msg); \ } while (0) -#define PRINTM_MCMD_D(msg...) do { \ - if ((mlan_drvdbg & MCMD_D) && (print_callback)) \ - print_callback(MNULL, MCMD_D, msg); \ +#define PRINTM_MCMD_D(msg...) \ + do { \ + if ((mlan_drvdbg & MCMD_D) && (print_callback)) \ + print_callback(MNULL, MCMD_D, msg); \ } while (0) -#define PRINTM_MDAT_D(msg...) do { \ - if ((mlan_drvdbg & MDAT_D) && (print_callback)) \ - print_callback(MNULL, MDAT_D, msg); \ +#define PRINTM_MDAT_D(msg...) \ + do { \ + if ((mlan_drvdbg & MDAT_D) && (print_callback)) \ + print_callback(MNULL, MDAT_D, msg); \ } while (0) -#define PRINTM_MIF_D(msg...) do { \ - if ((mlan_drvdbg & MIF_D) && (print_callback)) \ - print_callback(MNULL, MIF_D, msg); \ +#define PRINTM_MIF_D(msg...) \ + do { \ + if ((mlan_drvdbg & MIF_D) && (print_callback)) \ + print_callback(MNULL, MIF_D, msg); \ } while (0) -#define PRINTM_MIOCTL(msg...) do { \ - if ((mlan_drvdbg & MIOCTL) && (print_callback)) \ - print_callback(MNULL, MIOCTL, msg); \ +#define PRINTM_MIOCTL(msg...) \ + do { \ + if ((mlan_drvdbg & MIOCTL) && (print_callback)) \ + print_callback(MNULL, MIOCTL, msg); \ } while (0) -#define PRINTM_MINTR(msg...) do { \ - if ((mlan_drvdbg & MINTR) && (print_callback)) \ - print_callback(MNULL, MINTR, msg); \ +#define PRINTM_MINTR(msg...) \ + do { \ + if ((mlan_drvdbg & MINTR) && (print_callback)) \ + print_callback(MNULL, MINTR, msg); \ } while (0) -#define PRINTM_MEVENT(msg...) do { \ - if ((mlan_drvdbg & MEVENT) && (print_callback)) \ - print_callback(MNULL, MEVENT, msg); \ +#define PRINTM_MEVENT(msg...) \ + do { \ + if ((mlan_drvdbg & MEVENT) && (print_callback)) \ + print_callback(MNULL, MEVENT, msg); \ } while (0) -#define PRINTM_MCMND(msg...) do { \ - if ((mlan_drvdbg & MCMND) && (print_callback)) \ - print_callback(MNULL, MCMND, msg); \ +#define PRINTM_MCMND(msg...) \ + do { \ + if ((mlan_drvdbg & MCMND) && (print_callback)) \ + print_callback(MNULL, MCMND, msg); \ } while (0) -#define PRINTM_MDATA(msg...) do { \ - if ((mlan_drvdbg & MDATA) && (print_callback)) \ - print_callback(MNULL, MDATA, msg); \ +#define PRINTM_MDATA(msg...) \ + do { \ + if ((mlan_drvdbg & MDATA) && (print_callback)) \ + print_callback(MNULL, MDATA, msg); \ } while (0) -#define PRINTM_MERROR(msg...) do { \ - if ((mlan_drvdbg & MERROR) && (print_callback)) \ - print_callback(MNULL, MERROR, msg); \ +#define PRINTM_MERROR(msg...) \ + do { \ + if ((mlan_drvdbg & MERROR) && (print_callback)) \ + print_callback(MNULL, MERROR, msg); \ } while (0) -#define PRINTM_MFATAL(msg...) do { \ - if ((mlan_drvdbg & MFATAL) && (print_callback)) \ - print_callback(MNULL, MFATAL, msg); \ +#define PRINTM_MFATAL(msg...) \ + do { \ + if ((mlan_drvdbg & MFATAL) && (print_callback)) \ + print_callback(MNULL, MFATAL, msg); \ } while (0) -#define PRINTM_MMSG(msg...) do { \ - if ((mlan_drvdbg & MMSG) && (print_callback)) \ - print_callback(MNULL, MMSG, msg); \ +#define PRINTM_MMSG(msg...) \ + do { \ + if ((mlan_drvdbg & MMSG) && (print_callback)) \ + print_callback(MNULL, MMSG, msg); \ } while (0) -#define PRINTM(level, msg...) PRINTM_##level((char *)msg) +#define PRINTM(level, msg...) PRINTM_##level((char *)msg) /** Log debug message */ #ifdef __GNUC__ -#define PRINTM_NETINTF(level, pmpriv) \ -do { \ - if ((mlan_drvdbg & level) && pmpriv \ - && pmpriv->adapter->callbacks.moal_print_netintf) \ - pmpriv->adapter->callbacks.moal_print_netintf( \ - pmpriv->adapter->pmoal_handle, \ - pmpriv->bss_index, level); \ -} while (0) +#define PRINTM_NETINTF(level, pmpriv) \ + do { \ + if ((mlan_drvdbg & level) && pmpriv && \ + pmpriv->adapter->callbacks.moal_print_netintf) \ + pmpriv->adapter->callbacks.moal_print_netintf( \ + pmpriv->adapter->pmoal_handle, \ + pmpriv->bss_index, level); \ + } while (0) #endif /* __GNUC__ */ /** Max hex dump data length */ -#define MAX_DATA_DUMP_LEN 64 +#define MAX_DATA_DUMP_LEN 64 /** Debug hexdump for level-1 debugging */ -#define DBG_HEXDUMP(level, x, y, z) \ -do { \ - if ((mlan_drvdbg & level) && print_callback) \ - print_callback(MNULL, MHEX_DUMP | level, x, y, z); \ -} while (0) +#define DBG_HEXDUMP(level, x, y, z) \ + do { \ + if ((mlan_drvdbg & level) && print_callback) \ + print_callback(MNULL, MHEX_DUMP | level, x, y, z); \ + } while (0) #else /* DEBUG_LEVEL1 */ -#define PRINTM(level, msg...) do {} while (0) +#define PRINTM(level, msg...) \ + do { \ + } while (0) -#define PRINTM_NETINTF(level, pmpriv) do {} while (0) +#define PRINTM_NETINTF(level, pmpriv) \ + do { \ + } while (0) /** Debug hexdump for level-1 debugging */ -#define DBG_HEXDUMP(level, x, y, z) do {} while (0) +#define DBG_HEXDUMP(level, x, y, z) \ + do { \ + } while (0) /** Hexdump for debugging */ -#define HEXDUMP(x, y, z) do {} while (0) +#define HEXDUMP(x, y, z) \ + do { \ + } while (0) -#define PRINTM_GET_SYS_TIME(level, psec, pusec) do { } while (0) +#define PRINTM_GET_SYS_TIME(level, psec, pusec) \ + do { \ + } while (0) #endif /* DEBUG_LEVEL1 */ @@ -178,94 +210,106 @@ do { \ #define DEF_DEAUTH_REASON_CODE (0x3) /** Log entry point for debugging */ -#define ENTER() \ -do { \ - PRINTM(MENTRY, "Enter: %s\n", __func__); \ -} while (0) +#define ENTER() \ + do { \ + PRINTM(MENTRY, "Enter: %s\n", __func__); \ + } while (0) /** Log exit point for debugging */ -#define LEAVE() \ -do { \ - PRINTM(MENTRY, "Leave: %s\n", __func__); \ -} while (0) +#define LEAVE() \ + do { \ + PRINTM(MENTRY, "Leave: %s\n", __func__); \ + } while (0) /** Find minimum */ #ifndef MIN -#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define MIN(a, b) ((a) < (b) ? (a) : (b)) #endif /** Find maximum */ #ifndef MAX -#define MAX(a, b) ((a) > (b) ? (a) : (b)) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) #endif #ifdef memset #undef memset #endif /** Memset routine */ -#define memset(adapter, s, c, len) \ +#define memset(adapter, s, c, len) \ (adapter->callbacks.moal_memset(adapter->pmoal_handle, s, c, len)) #ifdef memmove #undef memmove #endif /** Memmove routine */ -#define memmove(adapter, dest, src, len) \ +#define memmove(adapter, dest, src, len) \ (adapter->callbacks.moal_memmove(adapter->pmoal_handle, dest, src, len)) #ifdef memcpy #undef memcpy #endif /** Memcpy routine */ -#define memcpy(adapter, to, from, len) \ +#define memcpy(adapter, to, from, len) \ (adapter->callbacks.moal_memcpy(adapter->pmoal_handle, to, from, len)) /* memcpy_ext rountine */ -#define memcpy_ext(adapter, to, from, len, size) \ - (adapter->callbacks.moal_memcpy_ext(adapter->pmoal_handle, to, from, len,size)) +#define memcpy_ext(adapter, to, from, len, size) \ + (adapter->callbacks.moal_memcpy_ext(adapter->pmoal_handle, to, from, \ + len, size)) #ifdef memcmp #undef memcmp #endif /** Memcmp routine */ -#define memcmp(adapter, s1, s2, len) \ +#define memcmp(adapter, s1, s2, len) \ (adapter->callbacks.moal_memcmp(adapter->pmoal_handle, s1, s2, len)) /** Find number of elements */ #ifndef NELEMENTS -#define NELEMENTS(x) (sizeof(x)/sizeof(x[0])) +#define NELEMENTS(x) (sizeof(x) / sizeof(x[0])) #endif /** SWAP: swap t_u8 */ -#define SWAP_U8(a, b) {t_u8 t; t = a; a = b; b = t; } +#define SWAP_U8(a, b) \ + { \ + t_u8 t; \ + t = a; \ + a = b; \ + b = t; \ + } /** SWAP: swap t_u8 */ -#define SWAP_U16(a, b) {t_u16 t; t = a; a = b; b = t; } +#define SWAP_U16(a, b) \ + { \ + t_u16 t; \ + t = a; \ + a = b; \ + b = t; \ + } /** MLAN MNULL pointer */ -#define MNULL (0) +#define MNULL (0) /** 16 bits byte swap */ -#define swap_byte_16(x) \ -((t_u16)((((t_u16)(x) & 0x00ffU) << 8) | \ - (((t_u16)(x) & 0xff00U) >> 8))) +#define swap_byte_16(x) \ + ((t_u16)((((t_u16)(x)&0x00ffU) << 8) | (((t_u16)(x)&0xff00U) >> 8))) /** 32 bits byte swap */ -#define swap_byte_32(x) \ -((t_u32)((((t_u32)(x) & 0x000000ffUL) << 24) | \ - (((t_u32)(x) & 0x0000ff00UL) << 8) | \ - (((t_u32)(x) & 0x00ff0000UL) >> 8) | \ - (((t_u32)(x) & 0xff000000UL) >> 24))) +#define swap_byte_32(x) \ + ((t_u32)((((t_u32)(x)&0x000000ffUL) << 24) | \ + (((t_u32)(x)&0x0000ff00UL) << 8) | \ + (((t_u32)(x)&0x00ff0000UL) >> 8) | \ + (((t_u32)(x)&0xff000000UL) >> 24))) /** 64 bits byte swap */ -#define swap_byte_64(x) \ -((t_u64)((t_u64)(((t_u64)(x) & 0x00000000000000ffULL) << 56) | \ - (t_u64)(((t_u64)(x) & 0x000000000000ff00ULL) << 40) | \ - (t_u64)(((t_u64)(x) & 0x0000000000ff0000ULL) << 24) | \ - (t_u64)(((t_u64)(x) & 0x00000000ff000000ULL) << 8) | \ - (t_u64)(((t_u64)(x) & 0x000000ff00000000ULL) >> 8) | \ - (t_u64)(((t_u64)(x) & 0x0000ff0000000000ULL) >> 24) | \ - (t_u64)(((t_u64)(x) & 0x00ff000000000000ULL) >> 40) | \ - (t_u64)(((t_u64)(x) & 0xff00000000000000ULL) >> 56))) +#define swap_byte_64(x) \ + ((t_u64)((t_u64)(((t_u64)(x)&0x00000000000000ffULL) << 56) | \ + (t_u64)(((t_u64)(x)&0x000000000000ff00ULL) << 40) | \ + (t_u64)(((t_u64)(x)&0x0000000000ff0000ULL) << 24) | \ + (t_u64)(((t_u64)(x)&0x00000000ff000000ULL) << 8) | \ + (t_u64)(((t_u64)(x)&0x000000ff00000000ULL) >> 8) | \ + (t_u64)(((t_u64)(x)&0x0000ff0000000000ULL) >> 24) | \ + (t_u64)(((t_u64)(x)&0x00ff000000000000ULL) >> 40) | \ + (t_u64)(((t_u64)(x)&0xff00000000000000ULL) >> 56))) #ifdef BIG_ENDIAN_SUPPORT /** Convert ulong n/w to host */ @@ -273,9 +317,9 @@ do { \ /** Convert host ulong to n/w */ #define mlan_htonl(x) x /** Convert n/w to host */ -#define mlan_ntohs(x) x +#define mlan_ntohs(x) x /** Convert host to n/w */ -#define mlan_htons(x) x +#define mlan_htons(x) x /** Convert from 16 bit little endian format to CPU format */ #define wlan_le16_to_cpu(x) swap_byte_16(x) /** Convert from 32 bit little endian format to CPU format */ @@ -290,22 +334,22 @@ do { \ #define wlan_cpu_to_le64(x) swap_byte_64(x) /** Convert TxPD to little endian format from CPU format */ -#define endian_convert_TxPD(x) \ - { \ - (x)->tx_pkt_length = wlan_cpu_to_le16((x)->tx_pkt_length); \ - (x)->tx_pkt_offset = wlan_cpu_to_le16((x)->tx_pkt_offset); \ - (x)->tx_pkt_type = wlan_cpu_to_le16((x)->tx_pkt_type); \ - (x)->tx_control = wlan_cpu_to_le32((x)->tx_control); \ - (x)->tx_control_1 = wlan_cpu_to_le32((x)->tx_control_1); \ +#define endian_convert_TxPD(x) \ + { \ + (x)->tx_pkt_length = wlan_cpu_to_le16((x)->tx_pkt_length); \ + (x)->tx_pkt_offset = wlan_cpu_to_le16((x)->tx_pkt_offset); \ + (x)->tx_pkt_type = wlan_cpu_to_le16((x)->tx_pkt_type); \ + (x)->tx_control = wlan_cpu_to_le32((x)->tx_control); \ + (x)->tx_control_1 = wlan_cpu_to_le32((x)->tx_control_1); \ } /** Convert RxPD from little endian format to CPU format */ -#define endian_convert_RxPD(x) \ - { \ - (x)->rx_pkt_length = wlan_le16_to_cpu((x)->rx_pkt_length); \ - (x)->rx_pkt_offset = wlan_le16_to_cpu((x)->rx_pkt_offset); \ - (x)->rx_pkt_type = wlan_le16_to_cpu((x)->rx_pkt_type); \ - (x)->seq_num = wlan_le16_to_cpu((x)->seq_num); \ - (x)->rx_info = wlan_le32_to_cpu((x)->rx_info); \ +#define endian_convert_RxPD(x) \ + { \ + (x)->rx_pkt_length = wlan_le16_to_cpu((x)->rx_pkt_length); \ + (x)->rx_pkt_offset = wlan_le16_to_cpu((x)->rx_pkt_offset); \ + (x)->rx_pkt_type = wlan_le16_to_cpu((x)->rx_pkt_type); \ + (x)->seq_num = wlan_le16_to_cpu((x)->seq_num); \ + (x)->rx_info = wlan_le32_to_cpu((x)->rx_info); \ } #else @@ -331,104 +375,110 @@ do { \ #define wlan_cpu_to_le64(x) x /** Convert TxPD to little endian format from CPU format */ -#define endian_convert_TxPD(x) do {} while (0) +#define endian_convert_TxPD(x) \ + do { \ + } while (0) /** Convert RxPD from little endian format to CPU format */ -#define endian_convert_RxPD(x) do {} while (0) +#define endian_convert_RxPD(x) \ + do { \ + } while (0) #endif /* BIG_ENDIAN_SUPPORT */ /** Global moal_assert_callback */ -extern t_void (*assert_callback) (IN t_void *pmoal_handle, IN t_u32 cond); +extern t_void (*assert_callback)(IN t_void *pmoal_handle, IN t_u32 cond); /** Assertion */ -#define MASSERT(cond) \ -do { \ - if (!(cond)) { \ - PRINTM(MFATAL, "ASSERT: %s: %i\n", __func__, __LINE__); \ - if (assert_callback) { \ - assert_callback(MNULL, (t_ptr)(cond)); \ - } else { \ - do {} while (1); \ - } \ - } \ -} while (0) +#define MASSERT(cond) \ + do { \ + if (!(cond)) { \ + PRINTM(MFATAL, "ASSERT: %s: %i\n", __func__, \ + __LINE__); \ + if (assert_callback) { \ + assert_callback(MNULL, (t_ptr)(cond)); \ + } else { \ + do { \ + } while (1); \ + } \ + } \ + } while (0) /** Maximum event buffer size */ -#define MAX_EVENT_SIZE (3 * 1024) +#define MAX_EVENT_SIZE (3 * 1024) /** 60 seconds */ -#define MRVDRV_TIMER_60S 60000 +#define MRVDRV_TIMER_60S 60000 /** 10 seconds */ -#define MRVDRV_TIMER_10S 10000 +#define MRVDRV_TIMER_10S 10000 /** 5 seconds */ -#define MRVDRV_TIMER_5S 5000 +#define MRVDRV_TIMER_5S 5000 /** 3 seconds */ -#define MRVDRV_TIMER_3S 3000 +#define MRVDRV_TIMER_3S 3000 /** 1 second */ -#define MRVDRV_TIMER_1S 1000 +#define MRVDRV_TIMER_1S 1000 /** Maximum size of multicast list */ -#define MRVDRV_MAX_MULTICAST_LIST_SIZE 32 +#define MRVDRV_MAX_MULTICAST_LIST_SIZE 32 /** Maximum size of channel */ -#define MRVDRV_MAX_CHANNEL_SIZE 14 +#define MRVDRV_MAX_CHANNEL_SIZE 14 /** Maximum length of SSID */ -#define MRVDRV_MAX_SSID_LENGTH 32 +#define MRVDRV_MAX_SSID_LENGTH 32 /** WEP list macros & data structures */ /** Size of key buffer in bytes */ -#define MRVL_KEY_BUFFER_SIZE_IN_BYTE 16 +#define MRVL_KEY_BUFFER_SIZE_IN_BYTE 16 /** Maximum length of WPA key */ -#define MRVL_MAX_KEY_WPA_KEY_LENGTH 32 +#define MRVL_MAX_KEY_WPA_KEY_LENGTH 32 /** Default listen interval */ -#define MLAN_DEFAULT_LISTEN_INTERVAL 20 +#define MLAN_DEFAULT_LISTEN_INTERVAL 20 /** Maximum number of region codes */ -#define MRVDRV_MAX_REGION_CODE 9 +#define MRVDRV_MAX_REGION_CODE 9 /** Maximum number of CFP codes for BG */ -#define MRVDRV_MAX_CFP_CODE_BG 0 +#define MRVDRV_MAX_CFP_CODE_BG 0 /** Maximum number of CFP codes for A */ -#define MRVDRV_MAX_CFP_CODE_A 5 +#define MRVDRV_MAX_CFP_CODE_A 5 /** high rx pending packets */ -#define HIGH_RX_PENDING 100 +#define HIGH_RX_PENDING 100 /** low rx pending packets */ -#define LOW_RX_PENDING 80 +#define LOW_RX_PENDING 80 /** Default region code */ -#define MRVDRV_DEFAULT_REGION_CODE 0x10 +#define MRVDRV_DEFAULT_REGION_CODE 0x10 /** Default country code */ -#define MRVDRV_DEFAULT_COUNTRY_CODE "US" +#define MRVDRV_DEFAULT_COUNTRY_CODE "US" /** Japan country code */ -#define COUNTRY_CODE_JP_40 0x40 +#define COUNTRY_CODE_JP_40 0x40 /** Japan special country code */ -#define COUNTRY_CODE_JP_FF 0xFF +#define COUNTRY_CODE_JP_FF 0xFF /** Default factor for calculating beacon average */ -#define DEFAULT_BCN_AVG_FACTOR 8 +#define DEFAULT_BCN_AVG_FACTOR 8 /** Default factor for calculating data average */ -#define DEFAULT_DATA_AVG_FACTOR 8 +#define DEFAULT_DATA_AVG_FACTOR 8 /** The first valid channel for use */ -#define FIRST_VALID_CHANNEL 0xff +#define FIRST_VALID_CHANNEL 0xff /** Default Ad-Hoc channel */ -#define DEFAULT_AD_HOC_CHANNEL 6 +#define DEFAULT_AD_HOC_CHANNEL 6 /** Default Ad-Hoc channel A */ -#define DEFAULT_AD_HOC_CHANNEL_A 36 +#define DEFAULT_AD_HOC_CHANNEL_A 36 /** Number of WEP keys */ -#define MRVL_NUM_WEP_KEY (4) +#define MRVL_NUM_WEP_KEY (4) /** Default multiple DTIM */ -#define MRVDRV_DEFAULT_MULTIPLE_DTIM 1 +#define MRVDRV_DEFAULT_MULTIPLE_DTIM 1 /** Default beacon missing timeout */ -#define DEFAULT_BCN_MISS_TIMEOUT 10 +#define DEFAULT_BCN_MISS_TIMEOUT 10 /** Maximum buffer space for beacons retrieved from scan responses */ -#define MAX_SCAN_BEACON_BUFFER 49152 +#define MAX_SCAN_BEACON_BUFFER 49152 /** Default buffer space for beacons retrieved from scan responses */ -#define DEFAULT_SCAN_BEACON_BUFFER 4096 +#define DEFAULT_SCAN_BEACON_BUFFER 4096 /** * @brief Buffer pad space for newly allocated beacons/probe responses @@ -438,28 +488,28 @@ do { \ * allow easy expansion to store a beacon in the same memory a probe response * previously contained */ -#define SCAN_BEACON_ENTRY_PAD 6 +#define SCAN_BEACON_ENTRY_PAD 6 /** Scan time specified in the channel TLV * for each channel for passive scans */ -#define MRVDRV_PASSIVE_SCAN_CHAN_TIME 200 +#define MRVDRV_PASSIVE_SCAN_CHAN_TIME 200 /** Scan time specified in the channel TLV * for each channel for active scans */ -#define MRVDRV_ACTIVE_SCAN_CHAN_TIME 200 +#define MRVDRV_ACTIVE_SCAN_CHAN_TIME 200 /** Scan time specified in the channel TLV * for each channel for specific scans */ -#define MRVDRV_SPECIFIC_SCAN_CHAN_TIME 110 +#define MRVDRV_SPECIFIC_SCAN_CHAN_TIME 110 /** * Max total scan time in milliseconds * The total scan time should be less than scan command timeout value (20s) */ -#define MRVDRV_MAX_TOTAL_SCAN_TIME (MRVDRV_TIMER_10S * 2 - MRVDRV_TIMER_1S) +#define MRVDRV_MAX_TOTAL_SCAN_TIME (MRVDRV_TIMER_10S * 2 - MRVDRV_TIMER_1S) /** Offset for GTK as it has version to skip past for GTK */ #define RSN_GTK_OUI_OFFSET 2 @@ -470,125 +520,127 @@ do { \ #define MLAN_OUI_PRESENT 1 /** Is cmd_resp, event or data packet received? */ -#define IS_CARD_RX_RCVD(adapter) (adapter->cmd_resp_received || \ - adapter->event_received || \ - adapter->data_received) +#define IS_CARD_RX_RCVD(adapter) \ + (adapter->cmd_resp_received || adapter->event_received || \ + adapter->data_received) #ifdef USB /** Type length */ -#define MLAN_TYPE_LEN 4 +#define MLAN_TYPE_LEN 4 /** Type Command */ -#define MLAN_USB_TYPE_CMD 0xF00DFACE +#define MLAN_USB_TYPE_CMD 0xF00DFACE /** Type VDLL */ -#define MLAN_USB_TYPE_VDLL 0xF00DC0DE +#define MLAN_USB_TYPE_VDLL 0xF00DC0DE /** Type Data */ -#define MLAN_USB_TYPE_DATA 0xBEADC0DE +#define MLAN_USB_TYPE_DATA 0xBEADC0DE /** Type Event */ -#define MLAN_USB_TYPE_EVENT 0xBEEFFACE +#define MLAN_USB_TYPE_EVENT 0xBEEFFACE #endif /* USB */ /** Type command */ -#define MLAN_TYPE_CMD 1 +#define MLAN_TYPE_CMD 1 /** Type data */ -#define MLAN_TYPE_DATA 0 +#define MLAN_TYPE_DATA 0 /** Type event */ -#define MLAN_TYPE_EVENT 3 +#define MLAN_TYPE_EVENT 3 /** Type vdll */ -#define MLAN_TYPE_VDLL 4 +#define MLAN_TYPE_VDLL 4 #ifdef SDIO /** Type single port aggr data */ -#define MLAN_TYPE_SPA_DATA 10 +#define MLAN_TYPE_SPA_DATA 10 /** OFFSET of 512 block number */ -#define OFFSET_OF_BLOCK_NUMBER 15 +#define OFFSET_OF_BLOCK_NUMBER 15 /** OFFSET of SDIO Header */ -#define OFFSET_OF_SDIO_HEADER 28 +#define OFFSET_OF_SDIO_HEADER 28 /** sdio max rx size for cmd53, 255 * 256, reserve 1 block for DMA alignment */ -#define SDIO_CMD53_MAX_SIZE 65280 -#define MAX_SUPPORT_AMSDU_SIZE 4096 +#define SDIO_CMD53_MAX_SIZE 65280 +#define MAX_SUPPORT_AMSDU_SIZE 4096 /** Maximum numbfer of registers to read for multiple port */ -#if defined(SD8887) || defined(SD8997) || defined(SD8977) || defined(SD8987) || defined(SD9098) || defined(SD9097) || defined(SD8978) -#define MAX_MP_REGS 196 +#if defined(SD8887) || defined(SD8997) || defined(SD8977) || \ + defined(SD8987) || defined(SD9098) || defined(SD9097) || \ + defined(SD8978) +#define MAX_MP_REGS 196 #else /* upto 0xB7 */ -#define MAX_MP_REGS 184 +#define MAX_MP_REGS 184 #endif /** Maximum port */ -#define MAX_PORT 32 +#define MAX_PORT 32 /** max MP REGS */ -#define MAX_MP_REGS_MAX (196) +#define MAX_MP_REGS_MAX (196) /** Multi port TX aggregation buffer size */ -#define SDIO_MP_TX_AGGR_DEF_BUF_SIZE (65280) /* 64K - 256 */ +#define SDIO_MP_TX_AGGR_DEF_BUF_SIZE (65280) /* 64K - 256 */ /** Multi port RX aggregation buffer size */ -#define SDIO_MP_RX_AGGR_DEF_BUF_SIZE (65280) /* 64K - 256 */ +#define SDIO_MP_RX_AGGR_DEF_BUF_SIZE (65280) /* 64K - 256 */ #endif /* SDIO */ /** Minimum BA threshold */ -#define MIN_BA_THRESHOLD 16 +#define MIN_BA_THRESHOLD 16 /** High threshold at which to start drop packets */ -#define RX_HIGH_THRESHOLD 1024 +#define RX_HIGH_THRESHOLD 1024 /** Low threshold to allow Rx BA */ -#define RX_LOW_THRESHOLD 128 +#define RX_LOW_THRESHOLD 128 /** Debug command number */ -#define DBG_CMD_NUM 10 +#define DBG_CMD_NUM 10 /** Info for debug purpose */ typedef struct _wlan_dbg { - /** Number of host to card command failures */ + /** Number of host to card command failures */ t_u32 num_cmd_host_to_card_failure; - /** Number of host to card sleep confirm failures */ + /** Number of host to card sleep confirm failures */ t_u32 num_cmd_sleep_cfm_host_to_card_failure; - /** Number of host to card Tx failures */ + /** Number of host to card Tx failures */ t_u32 num_tx_host_to_card_failure; - /** Number of card to host command/event failures */ + /** Number of card to host command/event failures */ t_u32 num_cmdevt_card_to_host_failure; - /** Number of card to host Rx failures */ + /** Number of card to host Rx failures */ t_u32 num_rx_card_to_host_failure; - /** Number of interrupt read failures */ + /** Number of interrupt read failures */ t_u32 num_int_read_failure; - /** Last interrupt status */ + /** Last interrupt status */ t_u32 last_int_status; - /** Number of allocate buffer failure */ + /** Number of allocate buffer failure */ t_u32 num_alloc_buffer_failure; - /** Number of pkt dropped */ + /** Number of pkt dropped */ t_u32 num_pkt_dropped; - /** Number of deauthentication events */ + /** Number of deauthentication events */ t_u32 num_event_deauth; - /** Number of disassosiation events */ + /** Number of disassosiation events */ t_u32 num_event_disassoc; - /** Number of link lost events */ + /** Number of link lost events */ t_u32 num_event_link_lost; - /** Number of deauthentication commands */ + /** Number of deauthentication commands */ t_u32 num_cmd_deauth; - /** Number of association comamnd successes */ + /** Number of association comamnd successes */ t_u32 num_cmd_assoc_success; - /** Number of association command failures */ + /** Number of association command failures */ t_u32 num_cmd_assoc_failure; - /** Number of consecutive association command failures */ + /** Number of consecutive association command failures */ t_u32 num_cons_assoc_failure; - /** Timeout command ID */ + /** Timeout command ID */ t_u16 timeout_cmd_id; - /** Timeout command action */ + /** Timeout command action */ t_u16 timeout_cmd_act; - /** List of last command IDs */ + /** List of last command IDs */ t_u16 last_cmd_id[DBG_CMD_NUM]; - /** List of last command actions */ + /** List of last command actions */ t_u16 last_cmd_act[DBG_CMD_NUM]; - /** Last command index */ + /** Last command index */ t_u16 last_cmd_index; - /** List of last command response IDs */ + /** List of last command response IDs */ t_u16 last_cmd_resp_id[DBG_CMD_NUM]; - /** Last command response index */ + /** Last command response index */ t_u16 last_cmd_resp_index; - /** List of last events */ + /** List of last events */ t_u16 last_event[DBG_CMD_NUM]; - /** Last event index */ + /** Last event index */ t_u16 last_event_index; - /** Number of no free command node */ + /** Number of no free command node */ t_u16 num_no_cmd_node; } wlan_dbg; @@ -612,7 +664,7 @@ typedef enum _WLAN_802_11_POWER_MODE { /** tx param */ typedef struct _mlan_tx_param { - /** next packet length */ + /** next packet length */ t_u32 next_pkt_len; } mlan_tx_param; @@ -634,30 +686,30 @@ typedef struct _TxBAStreamTbl TxBAStreamTbl; /** Add BA parameter data structure */ typedef struct { - /** Window size for initiator */ + /** Window size for initiator */ t_u32 tx_win_size; - /** Window size for receiver */ + /** Window size for receiver */ t_u32 rx_win_size; - /** Block ack timeout */ + /** Block ack timeout */ t_u32 timeout; - /** amsdu support for ADDBA request */ + /** amsdu support for ADDBA request */ t_u8 tx_amsdu; - /** amsdu support for ADDBA response */ + /** amsdu support for ADDBA response */ t_u8 rx_amsdu; } add_ba_param_t; /** Tx aggregation data structure */ typedef struct _txAggr_t { - /** AMPDU user */ + /** AMPDU user */ t_u8 ampdu_user; - /** AMPDU AP */ + /** AMPDU AP */ t_u8 ampdu_ap; - /** AMSDU */ + /** AMSDU */ t_u8 amsdu; } tx_aggr_t; /** del ba threshold */ -#define DEL_BA_THRESHOLD 10 +#define DEL_BA_THRESHOLD 10 /** BA stream status */ typedef enum _baStatus_e { BA_STREAM_NOT_SETUP = 0, @@ -670,15 +722,15 @@ typedef struct _raListTbl raListTbl; /** RA list table */ struct _raListTbl { - /** Pointer to previous node */ + /** Pointer to previous node */ raListTbl *pprev; - /** Pointer to next node */ + /** Pointer to next node */ raListTbl *pnext; - /** Buffer list head */ + /** Buffer list head */ mlan_list_head buf_head; - /** RA list buffer */ + /** RA list buffer */ t_u8 ra[MLAN_MAC_ADDR_LENGTH]; - /** total packets in RA list */ + /** total packets in RA list */ t_u16 total_pkts; /** packets received */ t_u16 packet_count; @@ -688,11 +740,11 @@ struct _raListTbl { t_u8 is_11n_enabled; /** max amsdu size */ t_u16 max_amsdu; - /** BA stream status */ + /** BA stream status */ baStatus_e ba_status; - /** del ba count */ + /** del ba count */ t_u8 del_ba_count; - /** amsdu in ampdu flag */ + /** amsdu in ampdu flag */ t_u8 amsdu_in_ampdu; /** tx_pause flag */ t_u8 tx_pause; @@ -700,146 +752,146 @@ struct _raListTbl { /** TID table */ typedef struct _tidTbl { - /** RA list head */ + /** RA list head */ mlan_list_head ra_list; - /** Current RA list */ + /** Current RA list */ raListTbl *ra_list_curr; } tid_tbl_t; /** Highest priority setting for a packet (uses voice AC) */ -#define WMM_HIGHEST_PRIORITY 7 +#define WMM_HIGHEST_PRIORITY 7 /** Highest priority TID */ -#define HIGH_PRIO_TID 7 +#define HIGH_PRIO_TID 7 /** Lowest priority TID */ -#define LOW_PRIO_TID 0 +#define LOW_PRIO_TID 0 /** No packet priority (< lowest) */ -#define NO_PKT_PRIO_TID -1 +#define NO_PKT_PRIO_TID -1 /** Max driver packet delay in msec */ -#define WMM_DRV_DELAY_MAX 510 +#define WMM_DRV_DELAY_MAX 510 /** Struct of WMM DESC */ typedef struct _wmm_desc { - /** TID table */ + /** TID table */ tid_tbl_t tid_tbl_ptr[MAX_NUM_TID]; - /** Packets out */ + /** Packets out */ t_u32 packets_out[MAX_NUM_TID]; - /** Packets queued */ + /** Packets queued */ t_u32 pkts_queued[MAX_NUM_TID]; - /** Packets paused */ + /** Packets paused */ t_u32 pkts_paused[MAX_NUM_TID]; - /** Spin lock to protect ra_list */ + /** Spin lock to protect ra_list */ t_void *ra_list_spinlock; - /** AC status */ + /** AC status */ WmmAcStatus_t ac_status[MAX_AC_QUEUES]; - /** AC downgraded values */ + /** AC downgraded values */ mlan_wmm_ac_e ac_down_graded_vals[MAX_AC_QUEUES]; - /** Max driver packet delay sent to the firmware for expiry eval */ + /** Max driver packet delay sent to the firmware for expiry eval */ t_u32 drv_pkt_delay_max; - /** WMM queue priority table */ + /** WMM queue priority table */ 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 */ + /** User priority packet transmission control */ + t_u32 user_pri_pkt_tx_ctrl[WMM_HIGHEST_PRIORITY + 1]; /* UP: 0 to 7 */ - /** Number of transmit packets queued */ + /** Number of transmit packets queued */ mlan_scalar tx_pkts_queued; - /** Tracks highest priority with a packet queued */ + /** Tracks highest priority with a packet queued */ mlan_scalar highest_queued_prio; } wmm_desc_t; /** Security structure */ typedef struct _wlan_802_11_security_t { - /** WPA enabled flag */ + /** WPA enabled flag */ t_u8 wpa_enabled; - /** E-Supplicant enabled flag */ + /** E-Supplicant enabled flag */ t_u8 ewpa_enabled; - /** WPA2 enabled flag */ + /** WPA2 enabled flag */ t_u8 wpa2_enabled; - /** WAPI enabled flag */ + /** WAPI enabled flag */ t_u8 wapi_enabled; - /** WAPI key on flag */ + /** WAPI key on flag */ t_u8 wapi_key_on; - /** WEP status */ + /** WEP status */ WLAN_802_11_WEP_STATUS wep_status; - /** Authentication mode */ + /** Authentication mode */ t_u32 authentication_mode; - /** Encryption mode */ + /** Encryption mode */ t_u32 encryption_mode; - /** Hotspot OSEN enabled */ + /** Hotspot OSEN enabled */ t_u8 osen_enabled; } wlan_802_11_security_t; /** Current Basic Service Set State Structure */ typedef struct { - /** BSS descriptor */ + /** BSS descriptor */ BSSDescriptor_t bss_descriptor; - /** WMM enable? */ + /** WMM enable? */ t_u8 wmm_enabled; - /** Uapsd enable?*/ + /** Uapsd enable?*/ t_u8 wmm_uapsd_enabled; - /** Band */ + /** Band */ t_u8 band; - /** Number of rates supported */ + /** Number of rates supported */ t_u32 num_of_rates; - /** Supported rates*/ + /** Supported rates*/ t_u8 data_rates[WLAN_SUPPORTED_RATES]; - /** Host MLME flag*/ + /** Host MLME flag*/ t_u8 host_mlme; } current_bss_params_t; /** Sleep_params */ typedef struct _sleep_params_t { - /** Sleep parameter error */ + /** Sleep parameter error */ t_u16 sp_error; - /** Sleep parameter offset */ + /** Sleep parameter offset */ t_u16 sp_offset; - /** Sleep parameter stable time */ + /** Sleep parameter stable time */ t_u16 sp_stable_time; - /** Sleep parameter calibration control */ + /** Sleep parameter calibration control */ t_u8 sp_cal_control; - /** Sleep parameter external sleep clock */ + /** Sleep parameter external sleep clock */ t_u8 sp_ext_sleep_clk; - /** Sleep parameter reserved */ + /** Sleep parameter reserved */ t_u16 sp_reserved; } sleep_params_t; /** Sleep_period */ typedef struct sleep_period_t { - /** Sleep period */ + /** Sleep period */ t_u16 period; - /** Reserved */ + /** Reserved */ t_u16 reserved; } sleep_period_t; /** mrvl_wep_key_t */ typedef struct _mrvl_wep_key_t { - /** Length */ + /** Length */ t_u32 length; - /** WEP key index */ + /** WEP key index */ t_u32 key_index; - /** WEP key length */ + /** WEP key length */ t_u32 key_length; - /** WEP keys */ + /** WEP keys */ t_u8 key_material[MRVL_KEY_BUFFER_SIZE_IN_BYTE]; } mrvl_wep_key_t; /** Maximum number of region channel */ -#define MAX_REGION_CHANNEL_NUM 2 +#define MAX_REGION_CHANNEL_NUM 2 /** Region-band mapping table */ typedef struct _region_chan_t { - /** TRUE if this entry is valid */ + /** TRUE if this entry is valid */ t_u8 valid; - /** Region code for US, Japan ... */ + /** Region code for US, Japan ... */ t_u8 region; - /** Band B/G/A, used for BAND_CONFIG cmd */ + /** Band B/G/A, used for BAND_CONFIG cmd */ t_u8 band; - /** Actual No. of elements in the array below */ + /** Actual No. of elements in the array below */ t_u8 num_cfp; - /** chan-freq-txpower mapping table */ + /** chan-freq-txpower mapping table */ chan_freq_power_t *pcfp; } region_chan_t; @@ -849,411 +901,409 @@ typedef enum _state_11d_t { ENABLE_11D = 1, } state_11d_t; -#define DEFAULT_11D_STATE DISABLE_11D +#define DEFAULT_11D_STATE DISABLE_11D /** Domain regulatory information */ typedef struct _wlan_802_11d_domain_reg { - /** Country Code */ + /** Country Code */ t_u8 country_code[COUNTRY_CODE_LEN]; - /** band that channels in sub_band belong to */ + /** band that channels in sub_band belong to */ t_u8 band; - /** No. of subband in below */ + /** No. of subband in below */ t_u8 no_of_sub_band; - /** Subband data to send/last sent */ + /** Subband data to send/last sent */ 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 */ + /** True for enabling 11D */ state_11d_t enable_11d; - /** True for user enabling 11D */ + /** True for user enabling 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 { - /** Indicate 11h is enabled from host */ + /** Indicate 11h is enabled from host */ t_bool is_11h_host; - /** Indicates whether 11h is enabled in the driver */ + /** Indicates whether 11h is enabled in the driver */ t_bool is_11h_enabled; - /** Indicates whether 11h is active in the firmware */ + /** Indicates whether 11h is active in the firmware */ t_bool is_11h_active; - /** Master device using automatic channel select */ + /** Master device using automatic channel select */ t_bool adhoc_auto_sel_chan; - /** Set when driver receives a STOP TX event from fw */ + /** Set when driver receives a STOP TX event from fw */ t_bool tx_disabled; - /** Channel that ChanSwAnn was received for, non-zero = active */ + /** Channel that ChanSwAnn was received for, non-zero = active */ t_u8 dfs_slave_csa_chan; - /** Expiry for above variable, seconds in system time */ + /** Expiry for above variable, seconds in system time */ t_u32 dfs_slave_csa_expire_at_sec; } wlan_11h_interface_state_t; #if defined(UAP_SUPPORT) /** UAP get info callback state kept in the 'mlan_private' driver structure */ typedef struct { - /** UAP internal callback after wlan_uap_get_channel */ - /** (parameter is really pointer to mlan_private) */ - mlan_status (*get_chan_callback) (t_void *); - /** current ioctl_req (to be completed in callback) */ + /** UAP internal callback after wlan_uap_get_channel */ + /** (parameter is really pointer to mlan_private) */ + mlan_status (*get_chan_callback)(t_void *); + /** current ioctl_req (to be completed in callback) */ pmlan_ioctl_req pioctl_req_curr; - /** band config from MrvlIEtypes_channel_band_t */ + /** band config from MrvlIEtypes_channel_band_t */ Band_Config_t bandcfg; - /** channel from MrvlIEtypes_channel_band_t */ + /** channel from MrvlIEtypes_channel_band_t */ t_u8 channel; - /** beacon period (in msec) from MrvlIEtypes_beacon_period_t */ + /** beacon period (in msec) from MrvlIEtypes_beacon_period_t */ t_u16 beacon_period; - /** dtim period (no unit) from MrvlIEtypes_dtim_period_t */ + /** dtim period (no unit) from MrvlIEtypes_dtim_period_t */ t_u8 dtim_period; } wlan_uap_get_info_cb_t; #endif /** Data structure for WPS information */ typedef struct { - /** WPS IE */ + /** WPS IE */ IEEEtypes_VendorSpecific_t wps_ie; - /** Session enable flag */ + /** Session enable flag */ 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); - /** ioctl handler */ - 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); - /** cmdresp handler */ - 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); - /** event handler */ - mlan_status (*process_event) (IN t_void *priv); - /** txpd handler */ - t_void *(*process_txpd) (IN t_void *priv, IN pmlan_buffer pmbuf); - /** BSS role */ + /** cmd init handler */ + 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); + /** 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); + /** cmdresp handler */ + 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); + /** event handler */ + mlan_status (*process_event)(IN t_void *priv); + /** txpd handler */ + t_void *(*process_txpd)(IN t_void *priv, IN pmlan_buffer pmbuf); + /** BSS role */ mlan_bss_role bss_role; } mlan_operations; /** Private structure for MLAN */ typedef struct _mlan_private { - /** Pointer to mlan_adapter */ + /** Pointer to mlan_adapter */ struct _mlan_adapter *adapter; - /** BSS index */ + /** BSS index */ t_u8 bss_index; - /** BSS type */ + /** BSS type */ t_u8 bss_type; - /** BSS role */ + /** BSS role */ t_u8 bss_role; - /** BSS virtual flag */ + /** BSS virtual flag */ t_u8 bss_virtual; - /** BSS Priority */ + /** BSS Priority */ t_u8 bss_priority; - /** BSS number */ + /** BSS number */ t_u8 bss_num; - /** Frame type */ + /** Frame type */ t_u8 frame_type; - /** MAC address information */ + /** MAC address information */ t_u8 curr_addr[MLAN_MAC_ADDR_LENGTH]; - /** Media connection status */ + /** Media connection status */ t_bool media_connected; - /** Current packet filter */ + /** Current packet filter */ t_u32 curr_pkt_filter; - /** Infrastructure mode */ + /** Infrastructure mode */ t_u32 bss_mode; - /** Tx packet control */ + /** Tx packet control */ t_u32 pkt_tx_ctrl; - /** Tx power level */ + /** Tx power level */ t_s16 tx_power_level; - /** Maximum Tx power level */ + /** Maximum Tx power level */ t_s8 max_tx_power_level; - /** Minimum Tx power level */ + /** Minimum Tx power level */ t_s8 min_tx_power_level; - /** Tx rate */ + /** Tx rate */ t_u8 tx_rate; t_u8 tx_rate_info; - /*HE tx tone mode and DCM info */ + /*HE tx tone mode and DCM info*/ t_u8 ext_tx_rate_info; - /*HE rx tone mode and DCM info */ + /*HE rx tone mode and DCM info*/ t_u8 rxpd_rx_info; - /** rxpd_htinfo */ + /** rxpd_htinfo */ t_u8 rxpd_rate_info; - /** max amsdu size */ + /** max amsdu size */ t_u16 max_amsdu; - /** amsdu disable flag */ + /** amsdu disable flag */ t_u8 amsdu_disable; - /** 802.11n Device Capabilities for 2.4GHz */ + /** 802.11n Device Capabilities for 2.4GHz */ t_u32 usr_dot_11n_dev_cap_bg; - /** 802.11n Device Capabilities for 5GHz */ + /** 802.11n Device Capabilities for 5GHz */ t_u32 usr_dot_11n_dev_cap_a; - /** MIMO abstraction of MCSs supported by device */ + /** MIMO abstraction of MCSs supported by device */ t_u8 usr_dev_mcs_support; #ifdef UAP_SUPPORT - /** UAP 11n flag */ + /** UAP 11n flag */ t_u8 is_11n_enabled; -#endif /* UAP_SUPPORT */ - /** UAP 11ac flag */ +#endif /* UAP_SUPPORT */ + /** UAP 11ac flag */ t_u8 is_11ac_enabled; - /** UAP 11ax flag */ + /** UAP 11ax flag */ t_u8 is_11ax_enabled; - /** tx vht_info */ + /** tx vht_info */ t_u8 tx_vhtinfo; - /** rxpd_vhtinfo */ + /** rxpd_vhtinfo */ t_u8 rxpd_vhtinfo; - /** 802.11ac Device Capabilities for 2.4GHz */ + /** 802.11ac Device Capabilities for 2.4GHz */ t_u32 usr_dot_11ac_dev_cap_bg; - /** 802.11ac Device Capabilities for 5GHz */ + /** 802.11ac Device Capabilities for 5GHz */ t_u32 usr_dot_11ac_dev_cap_a; - /** MIMO abstraction of MCSs supported by device */ + /** MIMO abstraction of MCSs supported by device */ t_u32 usr_dot_11ac_mcs_support; - /** user dot 11ac_BW */ + /** user dot 11ac_BW */ t_u8 usr_dot_11ac_bw; - /** user dot 11ac_opermode_BW */ + /** user dot 11ac_opermode_BW */ t_u8 usr_dot_11ac_opermode_bw; - /** user dot 11ac_opermode_nss */ + /** user dot 11ac_opermode_nss */ t_u8 usr_dot_11ac_opermode_nss; - /** length of hw he capability */ + /** length of hw he capability */ t_u8 user_hecap_len; - /** user configured 802.11ax HE capability */ + /** user configured 802.11ax HE capability */ t_u8 user_he_cap[54]; - /** length of hw he capability */ + /** length of hw he capability */ t_u8 user_2g_hecap_len; - /** user configured 802.11ax HE capability */ + /** user configured 802.11ax HE capability */ t_u8 user_2g_he_cap[54]; - /** dropped pkts */ + /** dropped pkts */ t_u32 num_drop_pkts; #ifdef UAP_SUPPORT - /** packet forward control */ + /** packet forward control */ t_u8 pkt_fwd; #endif - /** TX beamforming capability */ + /** TX beamforming capability */ t_u32 tx_bf_cap; - /** Rx PD rate */ + /** Rx PD rate */ t_u8 rxpd_rate; - /** Bitmap rates */ + /** Bitmap rates */ t_u16 bitmap_rates[MAX_BITMAP_RATES_SIZE]; - /** Data rate */ + /** Data rate */ t_u32 data_rate; - /** Automatic data rate flag */ + /** Automatic data rate flag */ t_u8 is_data_rate_auto; - /** Factor for calculating beacon average */ + /** Factor for calculating beacon average */ t_u16 bcn_avg_factor; - /** Factor for calculating data average */ + /** Factor for calculating data average */ t_u16 data_avg_factor; - /** SNR */ + /** SNR */ t_s8 snr; - /** Noise Floor */ + /** Noise Floor */ t_s8 nf; - /** Last data RSSI */ + /** Last data RSSI */ t_s16 data_rssi_last; - /** Last data Noise Floor */ + /** Last data Noise Floor */ t_s16 data_nf_last; - /** Average data RSSI */ + /** Average data RSSI */ t_s16 data_rssi_avg; - /** Averag data Noise Floor */ + /** Averag data Noise Floor */ t_s16 data_nf_avg; - /** Last beacon RSSI */ + /** Last beacon RSSI */ t_s16 bcn_rssi_last; - /** Last beacon Noise Floor */ + /** Last beacon Noise Floor */ t_s16 bcn_nf_last; - /** Average beacon RSSI */ + /** Average beacon RSSI */ t_s16 bcn_rssi_avg; - /** Average beacon Noise Floor */ + /** Average beacon Noise Floor */ t_s16 bcn_nf_avg; - /** Attempted BSS descriptor */ + /** Attempted BSS descriptor */ BSSDescriptor_t *pattempted_bss_desc; - /** GTK rekey data*/ + /** GTK rekey data*/ mlan_ds_misc_gtk_rekey_data gtk_rekey; - /** Current SSID/BSSID related parameters*/ + /** Current SSID/BSSID related parameters*/ current_bss_params_t curr_bss_params; - /** current channel flags */ + /** current channel flags */ t_u32 curr_chan_flags; - /** User selected bands */ + /** User selected bands */ t_u16 config_bands; - /** Beacon period */ + /** Beacon period */ t_u16 beacon_period; - /** Listen interval */ + /** Listen interval */ t_u16 listen_interval; - /** ATIM window */ + /** ATIM window */ t_u16 atim_window; - /** AdHoc channel */ + /** AdHoc channel */ t_u8 adhoc_channel; - /** AdHoc link sensed flag */ + /** AdHoc link sensed flag */ t_u8 adhoc_is_link_sensed; - /** AdHoc operating state */ + /** AdHoc operating state */ t_u8 adhoc_state; #if defined(STA_SUPPORT) - /** AdHoc operating state backup */ + /** AdHoc operating state backup */ t_u8 adhoc_state_prev; - /** AdHoc previous ssid used for Start */ + /** AdHoc previous ssid used for Start */ mlan_802_11_ssid adhoc_last_start_ssid; #endif - /** FSM variable for 11d support */ + /** FSM variable for 11d support */ wlan_802_11d_state_t state_11d; - /** FSM variable for 11h support */ + /** FSM variable for 11h support */ wlan_11h_interface_state_t intf_state_11h; #ifdef UAP_SUPPORT - /** Whether UAP interface has started */ + /** Whether UAP interface has started */ t_bool uap_bss_started; - /** Whether UAP interface start from hostapd */ + /** Whether UAP interface start from hostapd */ t_bool uap_host_based; - /**UAP operating channel*/ + /**UAP operating channel*/ t_u8 uap_channel; - /** state variable for UAP Get Info callback */ + /** state variable for UAP Get Info callback */ wlan_uap_get_info_cb_t uap_state_chan_cb; -#endif /* UAP_SUPPORT */ +#endif /* UAP_SUPPORT */ - /** Security related */ - /** Encryption parameter */ + /** Security related */ + /** Encryption parameter */ wlan_802_11_security_t sec_info; - /** WEP keys */ + /** WEP keys */ mrvl_wep_key_t wep_key[MRVL_NUM_WEP_KEY]; - /** Current WEP key index */ + /** Current WEP key index */ t_u16 wep_key_curr_index; - /** EWPA query 0: disable, 1: enable */ + /** EWPA query 0: disable, 1: enable */ t_u8 ewpa_query; - /** Encryption Key*/ + /** Encryption Key*/ t_u8 wpa_ie[256]; - /** WPA IE length */ + /** WPA IE length */ t_u8 wpa_ie_len; - /** GTK set flag */ + /** GTK set flag */ t_u8 wpa_is_gtk_set; - /** AES key material */ + /** AES key material */ mlan_ds_encrypt_key aes_key; #if defined(STA_SUPPORT) /* Mgmt Frame Protection config */ mlan_ds_misc_pmfcfg pmfcfg; #endif - /** WAPI IE */ + /** WAPI IE */ t_u8 wapi_ie[256]; - /** WAPI IE length */ + /** WAPI IE length */ t_u8 wapi_ie_len; - /** OSEN IE */ + /** OSEN IE */ t_u8 osen_ie[256]; - /** OSEN IE length */ + /** OSEN IE length */ t_u8 osen_ie_len; - /** Pointer to the station table */ + /** Pointer to the station table */ mlan_list_head sta_list; - /** MGMT IE */ + /** MGMT IE */ custom_ie mgmt_ie[MAX_MGMT_IE_INDEX]; - /** mgmt frame passthru mask */ + /** mgmt frame passthru mask */ t_u32 mgmt_frame_passthru_mask; - /** WMM required */ + /** WMM required */ t_u8 wmm_required; - /** WMM enabled */ + /** WMM enabled */ t_u8 wmm_enabled; - /** WMM qos info */ + /** WMM qos info */ t_u8 wmm_qosinfo; - /** WMM related variable*/ + /** WMM related variable*/ wmm_desc_t wmm; - /** Pointer to the Transmit BA stream table*/ + /** Pointer to the Transmit BA stream table*/ mlan_list_head tx_ba_stream_tbl_ptr; - /** Pointer to the priorities for AMSDU/AMPDU table*/ + /** Pointer to the priorities for AMSDU/AMPDU table*/ tx_aggr_t aggr_prio_tbl[MAX_NUM_TID]; - /** Pointer to the priorities for AMSDU/AMPDU table*/ + /** Pointer to the priorities for AMSDU/AMPDU table*/ t_u8 addba_reject[MAX_NUM_TID]; - /** Pointer to the priorities for AMSDU/AMPDU table*/ + /** Pointer to the priorities for AMSDU/AMPDU table*/ t_u8 ibss_ampdu[MAX_NUM_TID]; - /** Pointer to the priorities for AMSDU/AMPDU table*/ + /** Pointer to the priorities for AMSDU/AMPDU table*/ t_u8 ibss_addba_reject[MAX_NUM_TID]; - /** Struct to store ADDBA parameters */ + /** Struct to store ADDBA parameters */ add_ba_param_t add_ba_param; - /** user rx_win_size */ + /** user rx_win_size */ t_u32 user_rxwinsize; - /** last rx_seq */ + /** last rx_seq */ t_u16 rx_seq[MAX_NUM_TID]; - /** Pointer to the Receive Reordering table*/ + /** Pointer to the Receive Reordering table*/ mlan_list_head rx_reorder_tbl_ptr; - /** Lock for Rx packets */ + /** Lock for Rx packets */ t_void *rx_pkt_lock; #ifdef STA_SUPPORT - /** Buffer to store the association response for application retrieval */ + /** Buffer to store the association response for application retrieval + */ t_u8 assoc_rsp_buf[MRVDRV_ASSOC_RSP_BUF_SIZE]; - /** Length of the data stored in assoc_rsp_buf */ + /** Length of the data stored in assoc_rsp_buf */ t_u32 assoc_rsp_size; - /** Generic IEEE IEs passed from the application to be inserted into the - * association request to firmware - */ + /** Generic IEEE IEs passed from the application to be inserted into the + * association request to firmware + */ t_u8 gen_ie_buf[MRVDRV_GENIE_BUF_SIZE]; - /** Length of the data stored in gen_ie_buf */ + /** Length of the data stored in gen_ie_buf */ t_u8 gen_ie_buf_len; - /** disconnect reason code*/ + /** disconnect reason code*/ t_u16 disconnect_reason_code; t_u8 *pcurr_bcn_buf; t_u32 curr_bcn_size; t_void *curr_bcn_buf_lock; - /** WPS */ + /** WPS */ wps_t wps; -#endif /* STA_SUPPORT */ +#endif /* STA_SUPPORT */ - /** function table */ + /** function table */ mlan_operations ops; - /** tx pause flag */ + /** tx pause flag */ t_u8 tx_pause; - /** Port Control mode */ + /** Port Control mode */ t_u8 port_ctrl_mode; - /** Port open flag */ + /** Port open flag */ t_u8 port_open; - /** Port open flag state at time of association attempt */ + /** Port open flag state at time of association attempt */ t_u8 prior_port_status; - /** Bypass TX queue */ + /** Bypass TX queue */ mlan_list_head bypass_txq; - /** IP address operation */ + /** IP address operation */ t_u32 op_code; - /** IP address */ + /** IP address */ t_u8 ip_addr[IPADDR_LEN]; t_u32 hotspot_cfg; #ifdef STA_SUPPORT ExtCap_t ext_cap; ExtCap_t def_ext_cap; #endif - /** interface header len */ + /** interface header len */ t_u8 intf_hr_len; #ifdef USB - /** USB data port */ + /** USB data port */ t_u32 port; #endif #if defined(DRV_EMBEDDED_AUTHENTICATOR) || defined(DRV_EMBEDDED_SUPPLICANT) t_void *psapriv; #endif - /** rx per packet info */ + /** rx per packet info */ t_u8 rx_pkt_info; - /** received amsdu count*/ + /** received amsdu count*/ t_u32 amsdu_rx_cnt; - /** received msdu count in amsdu*/ + /** received msdu count in amsdu*/ t_u32 msdu_in_rx_amsdu_cnt; - /** tx amsdu count*/ + /** tx amsdu count*/ t_u32 amsdu_tx_cnt; - /** tx msdu count in amsdu*/ + /** tx msdu count in amsdu*/ t_u32 msdu_in_tx_amsdu_cnt; } mlan_private, *pmlan_private; typedef struct _assoc_logger { - /** vendor specific */ + /** vendor specific */ t_u8 oui[3]; t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; t_u8 ssid[MLAN_MAX_SSID_LENGTH]; @@ -1263,15 +1313,15 @@ typedef struct _assoc_logger { /** Tx BA stream table */ struct _TxBAStreamTbl { - /** TxBAStreamTbl previous node */ + /** TxBAStreamTbl previous node */ TxBAStreamTbl *pprev; - /** TxBAStreamTbl next node */ + /** TxBAStreamTbl next node */ TxBAStreamTbl *pnext; - /** TID */ + /** TID */ int tid; - /** RA */ + /** RA */ t_u8 ra[MLAN_MAC_ADDR_LENGTH]; - /** BA stream status */ + /** BA stream status */ baStatus_e ba_status; t_u8 amsdu; }; @@ -1280,46 +1330,46 @@ struct _TxBAStreamTbl { typedef struct _RxReorderTbl RxReorderTbl; typedef struct { - /** Timer for flushing */ + /** Timer for flushing */ t_void *timer; - /** Timer set flag */ + /** Timer set flag */ t_u8 timer_is_set; - /** RxReorderTbl ptr */ + /** RxReorderTbl ptr */ RxReorderTbl *ptr; - /** Priv pointer */ + /** Priv pointer */ mlan_private *priv; } reorder_tmr_cnxt_t; /** RX reorder table */ struct _RxReorderTbl { - /** RxReorderTbl previous node */ + /** RxReorderTbl previous node */ RxReorderTbl *pprev; - /** RxReorderTbl next node */ + /** RxReorderTbl next node */ RxReorderTbl *pnext; - /** TID */ + /** TID */ int tid; - /** TA */ + /** TA */ t_u8 ta[MLAN_MAC_ADDR_LENGTH]; - /** Start window */ + /** Start window */ int start_win; - /** last_seq */ + /** last_seq */ int last_seq; - /** Window size */ + /** Window size */ int win_size; - /** Pointer to pointer to RxReorderTbl */ + /** Pointer to pointer to RxReorderTbl */ t_void **rx_reorder_ptr; - /** Timer context */ + /** Timer context */ reorder_tmr_cnxt_t timer_context; - /** BA stream status */ + /** BA stream status */ baStatus_e ba_status; t_u8 amsdu; - /** no packet drop flag for rx_reorder_tbl */ + /** no packet drop flag for rx_reorder_tbl */ t_u8 force_no_drop; - /** flag for check start win */ + /** flag for check start win */ t_u8 check_start_win; /** pkt receive after BA setup */ t_u8 pkt_count; - /** flush data flag */ + /** flush data flag */ t_u8 flush_data; }; @@ -1328,11 +1378,11 @@ typedef struct _mlan_bssprio_node mlan_bssprio_node; /** BSS priority node */ struct _mlan_bssprio_node { - /** Pointer to previous node */ + /** Pointer to previous node */ mlan_bssprio_node *pprev; - /** Pointer to next node */ + /** Pointer to next node */ mlan_bssprio_node *pnext; - /** Pointer to priv */ + /** Pointer to priv */ pmlan_private priv; }; @@ -1341,9 +1391,9 @@ typedef struct _mlan_bssprio_tbl mlan_bssprio_tbl; /** BSS priority table */ struct _mlan_bssprio_tbl { - /** BSS priority list head */ + /** BSS priority list head */ mlan_list_head bssprio_head; - /** Current priority node */ + /** Current priority node */ mlan_bssprio_node *bssprio_cur; }; @@ -1352,26 +1402,26 @@ typedef struct _cmd_ctrl_node cmd_ctrl_node; /** _cmd_ctrl_node */ struct _cmd_ctrl_node { - /** Pointer to previous node */ + /** Pointer to previous node */ cmd_ctrl_node *pprev; - /** Pointer to next node */ + /** Pointer to next node */ cmd_ctrl_node *pnext; - /** Pointer to priv */ + /** Pointer to priv */ pmlan_private priv; - /** Command number */ + /** Command number */ t_u32 cmd_no; - /** Command flag */ + /** Command flag */ t_u32 cmd_flag; - /** Pointer to mlan_buffer */ + /** Pointer to mlan_buffer */ mlan_buffer *cmdbuf; - /** Pointer to mlan_buffer */ + /** Pointer to mlan_buffer */ mlan_buffer *respbuf; - /** Command parameter */ + /** Command parameter */ t_void *pdata_buf; - /** Pointer to mlan_ioctl_req if command is from IOCTL */ + /** Pointer to mlan_ioctl_req if command is from IOCTL */ t_void *pioctl_buf; #if defined(PCIE) || defined(SDIO) - /** pre_allocated mlan_buffer for cmd */ + /** pre_allocated mlan_buffer for cmd */ mlan_buffer *pmbuf; #endif }; @@ -1381,39 +1431,39 @@ typedef struct _sta_node sta_node; /** station node*/ struct _sta_node { - /** previous node */ + /** previous node */ sta_node *pprev; - /** next node */ + /** next node */ sta_node *pnext; - /** station mac address */ + /** station mac address */ t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; - /** wmm flag */ + /** wmm flag */ t_u8 is_wmm_enabled; - /** 11n flag */ + /** 11n flag */ t_u8 is_11n_enabled; - /** AMPDU STA */ + /** AMPDU STA */ t_u8 ampdu_sta[MAX_NUM_TID]; - /** last rx_seq */ + /** last rx_seq */ t_u16 rx_seq[MAX_NUM_TID]; - /** max amsdu size */ + /** max amsdu size */ t_u16 max_amsdu; - /** HT cap */ + /** HT cap */ IEEEtypes_HTCap_t HTcap; - /** 11ac flag */ + /** 11ac flag */ t_u8 is_11ac_enabled; - /** UAP 11ax flag */ + /** UAP 11ax flag */ t_u8 is_11ax_enabled; - /** SNR */ + /** SNR */ t_s8 snr; - /** Noise Floor */ + /** Noise Floor */ t_s8 nf; - /** peer capability */ + /** peer capability */ t_u16 capability; - /** wapi key on off flag */ + /** wapi key on off flag */ t_u8 wapi_key_on; - /** tx pause status */ + /** tx pause status */ t_u8 tx_pause; - /** station band mode */ + /** station band mode */ t_u16 bandmode; #if defined(DRV_EMBEDDED_AUTHENTICATOR) || defined(DRV_EMBEDDED_SUPPLICANT) t_void *cm_connectioninfo; @@ -1423,33 +1473,36 @@ struct _sta_node { /** 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 */ + /** Min TX Power capability sent to FW for 11h use and fw power control + */ t_s8 min_tx_power_capability; - /** Max TX Power capability sent to FW for 11h use and fw power control */ + /** Max TX Power capability sent to FW for 11h use and fw power control + */ t_s8 max_tx_power_capability; - /** User provisioned local power constraint sent in association requests */ + /** User provisioned local power constraint sent in association requests + */ t_s8 usr_def_power_constraint; - /** Received CHANNEL_SWITCH_ANN event */ + /** Received CHANNEL_SWITCH_ANN event */ t_bool recvd_chanswann_event; - /** Indicates an interface wants to enable master radar detection */ + /** Indicates an interface wants to enable master radar detection */ t_bool master_radar_det_enable_pending; - /** Indicates an interface wants to enable slave radar detection */ + /** Indicates an interface wants to enable slave radar detection */ t_bool slave_radar_det_enable_pending; - /** Indicates whether master radar detection active in the firmware */ + /** Indicates whether master radar detection active in the firmware */ t_bool is_master_radar_det_active; - /** Indicates whether slave radar detection active in the firmware */ + /** Indicates whether slave radar detection active in the firmware */ t_bool is_slave_radar_det_active; - /** Quiet IE */ + /** 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 */ + /** Ignore entry */ DFS_TS_REPR_NOT_IN_USE = 0, - /** NOP (Non-Occupancy Period) start time */ + /** NOP (Non-Occupancy Period) start time */ DFS_TS_REPR_NOP_START = 1, - /** CAC (Channel Availability Check) completion time */ + /** CAC (Channel Availability Check) completion time */ DFS_TS_REPR_CAC_COMPLETION }; @@ -1458,37 +1511,37 @@ typedef struct _wlan_dfs_timestamp_t wlan_dfs_timestamp_t; /** DFS Timestamp type used for marking NOP/CAC events */ struct _wlan_dfs_timestamp_t { - /** Pointer to previous node */ + /** Pointer to previous node */ wlan_dfs_timestamp_t *pprev; - /** Pointer to next node */ + /** Pointer to next node */ wlan_dfs_timestamp_t *pnext; - /** WLAN Channel number */ + /** WLAN Channel number */ t_u8 channel; - /** What this timestamp represents */ + /** What this timestamp represents */ t_u8 represents; - /** reserved field */ + /** reserved field */ t_u16 reserved; - /** timestamp - seconds */ + /** timestamp - seconds */ t_u32 ts_sec; - /** timestamp - microseconds */ + /** timestamp - microseconds */ 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 */ + /** Indicates whether DFS channel check is occurring in firmware */ t_bool dfs_check_pending; - /** Indicates whether DFS channel check found radar */ + /** Indicates whether DFS channel check found radar */ t_bool dfs_radar_found; - /** Channel radar is being checked on. BAND_A is assumed. */ + /** Channel radar is being checked on. BAND_A is assumed. */ t_u8 dfs_check_channel; - /** point to the priv which start the DFS check */ + /** point to the priv which start the DFS check */ t_void *dfs_check_priv; - /** Timestamp when we got last report, - * to determine if data is old or not. - */ + /** Timestamp when we got last report, + * to determine if data is old or not. + */ t_u32 dfs_report_time_sec; - /** List for holding dfs_timestamps for NOP/CAC events */ + /** List for holding dfs_timestamps for NOP/CAC events */ mlan_list_head dfs_ts_head; } wlan_dfs_device_state_t; @@ -1509,35 +1562,35 @@ enum _mlan_ds_11h_rdh_stages { /** State info for Radar Detected Handling kept in 'mlan_adapter' */ typedef struct { - /** Stage (of Operation) */ + /** Stage (of Operation) */ t_u8 stage; - /** Number of interfaces to handle */ + /** Number of interfaces to handle */ t_u8 priv_list_count; - /** Index of interface in process (used by some stages) */ + /** Index of interface in process (used by some stages) */ t_u8 priv_curr_idx; - /** Current Channel (to leave) */ + /** Current Channel (to leave) */ t_u8 curr_channel; - /** New Channel (to switch to) */ + /** New Channel (to switch to) */ t_u8 new_channel; - /** UAP band_config */ + /** UAP band_config */ Band_Config_t uap_band_cfg; - /** BEACON*DTIM period (in msec; max of STA/UAP) */ + /** BEACON*DTIM period (in msec; max of STA/UAP) */ t_u16 max_bcn_dtim_ms; - /** tx block flag */ + /** tx block flag */ t_u8 tx_block; - /** List of interfaces to handle */ + /** List of interfaces to handle */ mlan_private *priv_list[MLAN_MAX_BSS_NUM]; } wlan_radar_det_hndlg_state_t; /** DFS/RDH testing exception settings kept in 'mlan_adapter' */ typedef struct { - /** user-configured CAC period (in msec) */ + /** user-configured CAC period (in msec) */ t_u32 user_cac_period_msec; - /** user-configured NOP period (in sec) */ + /** user-configured NOP period (in sec) */ t_u16 user_nop_period_sec; - /** user-configured skip channel change on radar */ + /** user-configured skip channel change on radar */ t_bool no_channel_change_on_radar; - /** user-configured new channel to change to on radar */ + /** user-configured new channel to change to on radar */ t_u8 fixed_new_channel_on_radar; } wlan_dfs_testing_settings_t; @@ -1548,15 +1601,15 @@ typedef struct { * the result (received measurement report). */ typedef struct { - /** - * Dialog token of a pending measurement request/report. Used to - * block execution while waiting for the specific dialog token - */ + /** + * 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; - /** - * Measurement report received from the firmware that we were pending on - */ + /** + * Measurement report received from the firmware that we were pending on + */ HostCmd_DS_MEASUREMENT_REPORT meas_rpt_returned; } wlan_meas_state_t; @@ -1568,8 +1621,8 @@ typedef struct { * @param pmbuf_aggr Pointer to aggregation buffer * @param pmbuf Pointer to buffer to copy */ -static inline t_void -wlan_link_buf_to_aggr(pmlan_buffer pmbuf_aggr, pmlan_buffer pmbuf) +static inline t_void wlan_link_buf_to_aggr(pmlan_buffer pmbuf_aggr, + pmlan_buffer pmbuf) { /* link new buf at end of list */ pmbuf->pnext = pmbuf_aggr; @@ -1638,75 +1691,75 @@ typedef struct _sdio_mpa_rx { #ifdef USB /** data structure for USB Rx Deaggregation */ typedef struct _usb_rx_deaggr_params { - /** Rx aggregation control */ + /** Rx aggregation control */ usb_aggr_ctrl aggr_ctrl; } usb_rx_deaggr_params; -#define MAX_USB_TX_PORT_NUM 1 +#define MAX_USB_TX_PORT_NUM 1 /** data structure for USB Tx Aggregation */ typedef struct _usb_tx_aggr_params { - /** Tx aggregation control */ + /** Tx aggregation control */ usb_aggr_ctrl aggr_ctrl; - /** allocated pmbuf for tx aggreation */ + /** allocated pmbuf for tx aggreation */ pmlan_buffer pmbuf_aggr; - /** packet len used in pmbuf_aggr */ + /** packet len used in pmbuf_aggr */ t_u32 aggr_len; - /** usb_tx_aggr timer */ + /** usb_tx_aggr timer */ t_void *paggr_hold_timer; - /** usb_tx_aggr timer set flag */ + /** usb_tx_aggr timer set flag */ t_u8 aggr_hold_timer_is_set; - /** Timeout duration in milliseconds to wait for aggregation */ + /** Timeout duration in milliseconds to wait for aggregation */ t_u32 hold_timeout_msec; - /** lock for transmission */ + /** lock for transmission */ t_void *paggr_lock; - /** port for data transmission */ + /** port for data transmission */ t_u32 port; - /** pointer to moal_adatper structure */ + /** pointer to moal_adatper structure */ t_void *phandle; } usb_tx_aggr_params, *pusb_tx_aggr_params; #endif /** Type definition of mef_entry*/ typedef struct _mef_cfg { - /** criteria*/ + /** criteria*/ t_u32 criteria; - /** entry num*/ + /** entry num*/ t_u16 entry_num; - /** entry pointer*/ + /** entry pointer*/ mef_entry_t *pentry; } mef_cfg; /** Type definition of mef_entry*/ typedef struct _mef_entry { - /** Num for wowlan entry*/ + /** Num for wowlan entry*/ int num_wowlan_entry; - /** Num for IPv6 neighbor solicitation message offload */ + /** Num for IPv6 neighbor solicitation message offload */ int num_ipv6_ns_offload; - /** criteria*/ + /** criteria*/ t_u32 criteria; - /** MEF CFG Array to store etted_entry_bitmap; - * Caution: 0-3 is for NVIDIA WHITE/BLACK list entries - * Caution: 4 is for NVIDIA ping entry - * Caution: 5 is for Auto Arp Entry - * Caution: 6 is for wowlan Entry - * Caution: 7 is for IPv6 Neighbor Solicitation offload Entry - */ + /** MEF CFG Array to store etted_entry_bitmap; + * Caution: 0-3 is for NVIDIA WHITE/BLACK list entries + * Caution: 4 is for NVIDIA ping entry + * Caution: 5 is for Auto Arp Entry + * Caution: 6 is for wowlan Entry + * Caution: 7 is for IPv6 Neighbor Solicitation offload Entry + */ mef_entry_t entry[MAX_NUM_ENTRIES]; } mef_entry; /** vdll_dnld_ctrl structure */ typedef struct _vdll_dnld_ctrl { - /** pending VDLL block */ + /** pending VDLL block */ t_u8 *pending_block; /* pending VDLL block len */ t_u16 pending_block_len; - /** memory for VDLL fw image */ + /** memory for VDLL fw image */ t_u8 *vdll_mem; /** VDLL fw image len */ t_u32 vdll_len; #if defined(SDIO) || defined(PCIE) - /** mlan_buffer for VDLL download */ + /** mlan_buffer for VDLL download */ mlan_buffer *cmd_buf; #endif } vdll_dnld_ctrl, *pvdll_dnld_ctrl; @@ -1714,41 +1767,43 @@ typedef struct _vdll_dnld_ctrl { /** mlan_init_para structure */ typedef struct _mlan_init_para { #ifdef MFG_CMD_SUPPORT - /** MFG mode */ + /** MFG mode */ t_u32 mfg_mode; #endif #ifdef SDIO - /** SDIO interrupt mode (0: INT_MODE_SDIO, 1: INT_MODE_GPIO) */ + /** SDIO interrupt mode (0: INT_MODE_SDIO, 1: INT_MODE_GPIO) */ t_u32 int_mode; - /** GPIO interrupt pin number */ + /** GPIO interrupt pin number */ t_u32 gpio_pin; - /** SDIO MPA Tx */ + /** SDIO MPA Tx */ t_u32 mpa_tx_cfg; - /** SDIO MPA Rx */ + /** SDIO MPA Rx */ t_u32 mpa_rx_cfg; #endif - /** Auto deep sleep */ + /** Auto deep sleep */ t_u32 auto_ds; - /** IEEE PS mode */ + /** IEEE PS mode */ t_u32 ps_mode; - /** Max Tx buffer size */ + /** Max Tx buffer size */ t_u32 max_tx_buf; - /** 802.11d configuration */ + /** 802.11d configuration */ t_u32 cfg_11d; - /** 802.11H DFS Master Radar Detect */ + /** 802.11H DFS Master Radar Detect */ t_u32 dfs_master_radar_det_en; - /** 802.11H DFS Slave Radar Detect */ + /** 802.11H DFS Slave Radar Detect */ t_u32 dfs_slave_radar_det_en; - /** dev cap mask */ + /** dev cap mask */ t_u32 dev_cap_mask; - /** oob independent reset mode */ + /** oob independent reset mode */ t_u32 indrstcfg; - /** fw region */ + /** fw region */ t_bool fw_region; - /** passive to active scan */ + /** passive to active scan */ t_u8 passive_to_active_scan; - /** uap max sta */ + /** uap max sta */ t_u8 uap_max_sta; + /** dfs w53 cfg */ + t_u8 dfs53cfg; } mlan_init_para, *pmlan_init_para; #ifdef SDIO @@ -1819,96 +1874,96 @@ typedef struct _mlan_sdio_card_reg { typedef struct _mlan_sdio_card { const mlan_sdio_card_reg *reg; - /** IO port */ + /** IO port */ t_u32 ioport; - /** number of interrupt receive */ + /** number of interrupt receive */ t_u32 num_of_irq; - /** max SDIO single port tx size */ + /** max SDIO single port tx size */ t_u16 max_sp_tx_size; - /** max SDIO single port rx size */ + /** max SDIO single port rx size */ t_u16 max_sp_rx_size; - /** SDIO multiple port read bitmap */ + /** SDIO multiple port read bitmap */ t_u32 mp_rd_bitmap; - /** SDIO multiple port write bitmap */ + /** SDIO multiple port write bitmap */ t_u32 mp_wr_bitmap; - /** SDIO end port from txbufcfg */ + /** SDIO end port from txbufcfg */ t_u16 mp_end_port; - /** SDIO port mask calculated based on txbufcfg end port */ + /** SDIO port mask calculated based on txbufcfg end port */ t_u32 mp_data_port_mask; - /** Current available port for read */ + /** Current available port for read */ t_u8 curr_rd_port; - /** Current available port for write */ + /** Current available port for write */ t_u8 curr_wr_port; - /** FW update port number */ + /** FW update port number */ t_u32 mp_update[SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX * 2]; - /** Invalid port update count */ + /** Invalid port update count */ t_u32 mp_invalid_update; - /** Array to store values of SDIO multiple port group registers */ + /** Array to store values of SDIO multiple port group registers */ t_u8 *mp_regs; - /** allocated buf to read SDIO multiple port group registers */ + /** allocated buf to read SDIO multiple port group registers */ t_u8 *mp_regs_buf; - /** buffer to handle receive packet */ + /** buffer to handle receive packet */ t_u8 *rx_buf; - /** allocated buf for receive */ + /** allocated buf for receive */ t_u8 *rx_buffer; /* see blk_queue_max_segment_size */ t_u32 max_seg_size; /* see blk_queue_max_segments */ t_u16 max_segs; - /** data structure for SDIO MPA TX */ + /** data structure for SDIO MPA TX */ sdio_mpa_tx mpa_tx; - /** packet number for tx aggr */ + /** packet number for tx aggr */ t_u32 mpa_tx_count[SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX]; - /** no more packets count*/ + /** no more packets count*/ t_u32 mpa_sent_last_pkt; - /** no write_ports count */ + /** no write_ports count */ t_u32 mpa_sent_no_ports; - /** last wr_bitmap from FW */ + /** last wr_bitmap from FW */ t_u32 last_recv_wr_bitmap; - /** last mp_wr_bitmap */ + /** last mp_wr_bitmap */ t_u32 last_mp_wr_bitmap[SDIO_MP_DBG_NUM]; - /** last ports for cmd53 write data */ + /** last ports for cmd53 write data */ t_u32 last_mp_wr_ports[SDIO_MP_DBG_NUM]; - /** last length for cmd53 write data */ + /** last length for cmd53 write data */ t_u32 last_mp_wr_len[SDIO_MP_DBG_NUM]; - /** length info for cmd53 write data */ + /** length info for cmd53 write data */ t_u16 last_mp_wr_info[SDIO_MP_DBG_NUM * SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX]; - /** last curr_wr_port */ + /** last curr_wr_port */ t_u8 last_curr_wr_port[SDIO_MP_DBG_NUM]; - /** buffer for mp debug */ + /** buffer for mp debug */ t_u8 *mpa_buf; - /** length info for mp buf size */ + /** length info for mp buf size */ t_u32 mpa_buf_size; - /** last mp_index */ + /** last mp_index */ t_u8 last_mp_index; - /** data structure for SDIO MPA RX */ + /** data structure for SDIO MPA RX */ sdio_mpa_rx mpa_rx; - /** packet number for tx aggr */ + /** packet number for tx aggr */ t_u32 mpa_rx_count[SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX]; - /** SDIO interrupt mode (0: INT_MODE_SDIO, 1: INT_MODE_GPIO) */ + /** SDIO interrupt mode (0: INT_MODE_SDIO, 1: INT_MODE_GPIO) */ t_u32 int_mode; - /** GPIO interrupt pin number */ + /** GPIO interrupt pin number */ t_u32 gpio_pin; - /** flag for sdio rx aggr */ + /** flag for sdio rx aggr */ t_bool sdio_rx_aggr_enable; - /** fw rx block size */ + /** fw rx block size */ t_u16 sdio_rx_block_size; } mlan_sdio_card, *pmlan_sdio_card; #endif #ifdef PCIE /** 8 Event buffer ring */ -#define MLAN_MAX_EVT_BD 0x08 +#define MLAN_MAX_EVT_BD 0x08 /** 32 entry will mapping to 5*/ -#define TX_RX_NUM_DESC 5 +#define TX_RX_NUM_DESC 5 /** 8 entry will mapping to 3 */ -#define EVT_NUM_DESC 3 +#define EVT_NUM_DESC 3 typedef struct _mlan_pcie_card_reg { /* TX buffer description rd pointer */ t_u32 reg_txbd_rdptr; @@ -1918,49 +1973,49 @@ typedef struct _mlan_pcie_card_reg { t_u32 reg_rxbd_rdptr; /* RX buffer description wr pointer */ t_u32 reg_rxbd_wrptr; - /** evtbd rdptr register */ + /** evtbd rdptr register */ t_u32 reg_evtbd_rdptr; - /** evtbd wrptr register */ + /** evtbd wrptr register */ t_u32 reg_evtbd_wrptr; - /** host int mask register */ + /** host int mask register */ t_u16 reg_host_int_mask; - /** host int status mask register*/ + /** host int status mask register*/ t_u16 reg_host_int_status_mask; - /** host int status register */ + /** host int status register */ t_u16 reg_host_int_status; - /** host int status clr selection */ + /** host int status clr selection */ t_u32 reg_host_int_clr_sel; /** cpu int event register */ t_u16 reg_cpu_int_event; - /** ip revision register */ + /** ip revision register */ t_u16 reg_ip_rev; - /** revision id register */ + /** revision id register */ t_u32 reg_rev_id; - /** driver ready register */ + /** driver ready register */ t_u16 reg_drv_ready; - /** cpu int status register */ + /** cpu int status register */ t_u16 reg_cpu_int_status; - /** scratch 0 register */ + /** scratch 0 register */ t_u16 reg_scratch_0; - /** scratch 1 register */ + /** scratch 1 register */ t_u16 reg_scratch_1; - /** scratch 2 register */ + /** scratch 2 register */ t_u16 reg_scratch_2; - /** scratch 3 register */ + /** scratch 3 register */ t_u16 reg_scratch_3; - /** scratch 6 register */ + /** scratch 6 register */ t_u16 reg_scratch_6; - /** scratch 7 register */ + /** scratch 7 register */ t_u16 reg_scratch_7; - /** host interrupt mask*/ + /** host interrupt mask*/ t_u32 host_intr_mask; - /** data send interrupt for host*/ + /** data send interrupt for host*/ t_u32 host_intr_dnld_done; - /** Data receive interrupt for host */ + /** Data receive interrupt for host */ t_u32 host_intr_upld_rdy; - /** Command sent interrupt for host */ + /** Command sent interrupt for host */ t_u32 host_intr_cmd_done; - /** Event ready interrupt for host */ + /** Event ready interrupt for host */ t_u32 host_intr_event_rdy; t_u32 host_intr_cmd_dnld; /* TX/RX buffer description mask */ @@ -1969,7 +2024,7 @@ typedef struct _mlan_pcie_card_reg { t_u32 txrx_rw_ptr_wrap_mask; /* TX/RX buffer description indication */ t_u32 txrx_rw_ptr_rollover_ind; - /** ADMA feature */ + /** ADMA feature */ t_u8 use_adma; /** write to clear interrupt status flag */ t_u8 msi_int_wr_clr; @@ -1977,81 +2032,81 @@ typedef struct _mlan_pcie_card_reg { typedef struct _mlan_pcie_card { const mlan_pcie_card_reg *reg; - /** PCIE interrupt modes 0: Legacy, 1: MSI, 2:MSI-X */ + /** PCIE interrupt modes 0: Legacy, 1: MSI, 2:MSI-X */ t_u32 pcie_int_mode; - /** PCIE function number */ + /** PCIE function number */ t_u8 func_num; - /** pending num of tx ring buffer in firmware */ + /** pending num of tx ring buffer in firmware */ t_u8 txbd_pending; - /** Write pointer for TXBD ring */ + /** Write pointer for TXBD ring */ t_u32 txbd_wrptr; - /** Shadow copy of TXBD read pointer */ + /** Shadow copy of TXBD read pointer */ t_u32 txbd_rdptr; - /** TXBD ring size */ + /** TXBD ring size */ t_u32 txbd_ring_size; - /** Lock for protecting the TX ring */ + /** Lock for protecting the TX ring */ t_void *tx_ring_lock; - /** Virtual base address of txbd_ring */ + /** Virtual base address of txbd_ring */ t_u8 *txbd_ring_vbase; - /** Physical base address of txbd_ring */ + /** Physical base address of txbd_ring */ t_u64 txbd_ring_pbase; - /** Ring of buffer descriptors for TX */ + /** Ring of buffer descriptors for TX */ t_void *txbd_ring[MLAN_MAX_TXRX_BD]; - /** A list of mlan_buffer objects used for data tx */ + /** A list of mlan_buffer objects used for data tx */ mlan_buffer *tx_buf_list[MLAN_MAX_TXRX_BD]; - /** Flush indicator for txbd_ring */ + /** Flush indicator for txbd_ring */ t_bool txbd_flush; - /** Shadow copy of RXBD write pointer */ + /** Shadow copy of RXBD write pointer */ t_u32 rxbd_wrptr; - /** RxBD read pointer */ + /** RxBD read pointer */ t_u32 rxbd_rdptr; - /** RXBD ring size */ + /** RXBD ring size */ t_u32 rxbd_ring_size; - /** A spinlock for rxbd_ring */ + /** A spinlock for rxbd_ring */ t_void *rx_ring_lock; - /** Virtual base address of rxbd_ring */ + /** Virtual base address of rxbd_ring */ t_u8 *rxbd_ring_vbase; - /** Physical base address of rxbd_ring */ + /** Physical base address of rxbd_ring */ t_u64 rxbd_ring_pbase; - /** Ring of buffer descriptors for RX */ + /** Ring of buffer descriptors for RX */ t_void *rxbd_ring[MLAN_MAX_TXRX_BD]; - /** A list of mlan_buffer objects used for data rx */ + /** A list of mlan_buffer objects used for data rx */ mlan_buffer *rx_buf_list[MLAN_MAX_TXRX_BD]; - /** Shadow copy of cmdrsp/evt write pointer */ + /** Shadow copy of cmdrsp/evt write pointer */ t_u32 evtbd_wrptr; - /** Read pointer for cmdrsp/evt ring */ + /** Read pointer for cmdrsp/evt ring */ t_u32 evtbd_rdptr; - /** Size of the cmdrsp/evt ring */ + /** Size of the cmdrsp/evt ring */ t_u32 evtbd_ring_size; - /** Virtual base address of evtbd_bd_ring */ + /** Virtual base address of evtbd_bd_ring */ t_u8 *evtbd_ring_vbase; - /** Physical base address of evtbd_bd_ring */ + /** Physical base address of evtbd_bd_ring */ t_u64 evtbd_ring_pbase; - /** Ring of buffer descriptors for EVENT */ + /** Ring of buffer descriptors for EVENT */ t_void *evtbd_ring[MLAN_MAX_EVT_BD]; - /** A list of mlan_buffer objects used for EVENT */ + /** A list of mlan_buffer objects used for EVENT */ mlan_buffer *evt_buf_list[MLAN_MAX_EVT_BD]; - /** Command buffer */ + /** Command buffer */ mlan_buffer *cmd_buf; - /** Command response buffer */ + /** Command response buffer */ mlan_buffer *cmdrsp_buf; - /** Command buffer */ + /** Command buffer */ mlan_buffer *vdll_cmd_buf; - /** last tx_pkt_size */ + /** last tx_pkt_size */ t_u32 last_tx_pkt_size[MLAN_MAX_TXRX_BD]; } mlan_pcie_card, *pmlan_pcie_card; #endif #ifdef USB typedef struct _mlan_usb_card { - /** data structure for USB Rx Deaggregation */ + /** data structure for USB Rx Deaggregation */ usb_rx_deaggr_params usb_rx_deaggr; - /** data structure for USB Tx Aggregation */ + /** data structure for USB Tx Aggregation */ usb_tx_aggr_params usb_tx_aggr[MAX_USB_TX_PORT_NUM]; - /** USB sggregation supported by FW */ + /** USB sggregation supported by FW */ t_u8 fw_usb_aggr; } mlan_usb_card, *pmlan_usb_card; @@ -2059,15 +2114,15 @@ typedef struct _mlan_usb_card { #endif typedef struct _mlan_card_info { - /** Max Tx buffer size */ + /** Max Tx buffer size */ t_u32 max_tx_buf_size; - /** support V16_FW_API */ + /** support V16_FW_API */ t_u8 v16_fw_api; - /** support V17_FW_API */ + /** support V17_FW_API */ t_u8 v17_fw_api; - /** suppress PS handshake */ + /** suppress PS handshake */ t_u8 supp_ps_handshake; - /** DEFAULT_11N_TX_BF_CAP */ + /** DEFAULT_11N_TX_BF_CAP */ t_u32 default_11n_tx_bf_cap; } mlan_card_info, *pmlan_card_info; @@ -2075,133 +2130,135 @@ typedef struct _mlan_adapter mlan_adapter, *pmlan_adapter; /**Adapter_operations data structure*/ typedef struct _adapter_operations { - /**firmware download handler*/ - mlan_status (*dnld_fw) (pmlan_adapter pmadapter, pmlan_fw_image pmfw); - /**interrupt handler*/ - mlan_status (*interrupt) (t_u16 msg_id, pmlan_adapter pmadapter); - /**INT process handler*/ - mlan_status (*process_int_status) (pmlan_adapter pmadapter); - /**host to card handler*/ - mlan_status (*host_to_card) (pmlan_private pmpriv, t_u8 type, - mlan_buffer *pmbuf, - mlan_tx_param *tx_param); - /*wakeup card */ - mlan_status (*wakeup_card) (pmlan_adapter pmadapter, t_u8 timeout); - /*reset the PM setting of card */ - mlan_status (*reset_card) (pmlan_adapter adapter); - /** Handle event/cmd complete*/ - mlan_status (*event_complete) (mlan_adapter *pmlan_adapter, - pmlan_buffer pmbuf, mlan_status status); - /** Handle complete receiving data */ - mlan_status (*data_complete) (mlan_adapter *pmlan_adapter, + /**firmware download handler*/ + mlan_status (*dnld_fw)(pmlan_adapter pmadapter, pmlan_fw_image pmfw); + /**interrupt handler*/ + mlan_status (*interrupt)(t_u16 msg_id, pmlan_adapter pmadapter); + /**INT process handler*/ + mlan_status (*process_int_status)(pmlan_adapter pmadapter); + /**host to card handler*/ + mlan_status (*host_to_card)(pmlan_private pmpriv, t_u8 type, + mlan_buffer *pmbuf, + mlan_tx_param *tx_param); + /*wakeup card*/ + mlan_status (*wakeup_card)(pmlan_adapter pmadapter, t_u8 timeout); + /*reset the PM setting of card*/ + mlan_status (*reset_card)(pmlan_adapter adapter); + /** Handle event/cmd complete*/ + mlan_status (*event_complete)(mlan_adapter *pmlan_adapter, pmlan_buffer pmbuf, mlan_status status); - /** Handle command response complete */ - mlan_status (*cmdrsp_complete) (mlan_adapter *pmlan_adapter, - pmlan_buffer pmbuf, mlan_status status); - /** Handle rx packet */ - mlan_status (*handle_rx_packet) (mlan_adapter *pmadapter, - pmlan_buffer pmbuf); - /** handle dump interface specific info */ - mlan_status (*debug_dump) (mlan_adapter *pmadapter); - /**Interface header length*/ + /** Handle complete receiving data */ + mlan_status (*data_complete)(mlan_adapter *pmlan_adapter, + pmlan_buffer pmbuf, mlan_status status); + /** Handle command response complete */ + mlan_status (*cmdrsp_complete)(mlan_adapter *pmlan_adapter, + pmlan_buffer pmbuf, mlan_status status); + /** Handle rx packet */ + mlan_status (*handle_rx_packet)(mlan_adapter *pmadapter, + pmlan_buffer pmbuf); + /** handle dump interface specific info */ + mlan_status (*debug_dump)(mlan_adapter *pmadapter); + /**Interface header length*/ t_u32 intf_header_len; } mlan_adapter_operations; /** Adapter data structure for MLAN */ typedef struct _mlan_adapter { - /** MOAL handle structure */ + /** MOAL handle structure */ t_void *pmoal_handle; - /** BSS Attributes */ + /** BSS Attributes */ mlan_bss_attr bss_attr[MLAN_MAX_BSS_NUM]; - /** Private pointer */ + /** Private pointer */ pmlan_private priv[MLAN_MAX_BSS_NUM]; - /** Total number of Priv number */ + /** Total number of Priv number */ t_u8 priv_num; - /** Priority table for bss */ + /** Priority table for bss */ mlan_bssprio_tbl bssprio_tbl[MLAN_MAX_BSS_NUM]; - /** Callback table */ + /** Callback table */ mlan_callbacks callbacks; - /** Init parameters */ + /** Init parameters */ mlan_init_para init_para; - /** mlan_lock for init/shutdown */ + /** mlan_lock for init/shutdown */ t_void *pmlan_lock; - /** main_proc_lock for main_process */ + /** main_proc_lock for main_process */ t_void *pmain_proc_lock; - /** mlan_processing */ + /** mlan_processing */ t_u32 mlan_processing; - /** main_process_cnt */ + /** main_process_cnt */ t_u32 main_process_cnt; - /** mlan_rx_processing */ + /** mlan_rx_processing */ t_u32 mlan_rx_processing; - /** rx_proc_lock for main_rx_process */ + /** rx_proc_lock for main_rx_process */ t_void *prx_proc_lock; - /** more_rx_task_flag */ + /** more_rx_task_flag */ t_u32 more_rx_task_flag; - /** rx work enable flag */ + /** rx work enable flag */ t_u8 rx_work_flag; /* number of rx pkts queued */ t_u16 rx_pkts_queued; - /** more task flag */ + /** more task flag */ t_u32 more_task_flag; - /** delay task flag */ + /** delay task flag */ t_u32 delay_task_flag; - /** Max tx buf size */ + /** Max tx buf size */ t_u16 max_tx_buf_size; - /** Tx buf size */ + /** Tx buf size */ t_u16 tx_buf_size; - /** current tx buf size in fw */ + /** current tx buf size in fw */ t_u16 curr_tx_buf_size; - /** flush data flag */ + /** flush data flag */ t_u8 flush_data; - /** STATUS variables */ + /** STATUS variables */ WLAN_HARDWARE_STATUS hw_status; - /** PnP SUPPORT */ + /** PnP SUPPORT */ t_u8 surprise_removed; - /** FW hang report */ + /** FW hang report */ t_u8 fw_hang_report; - /** ECSA support */ + /** ECSA support */ t_u8 ecsa_enable; - /** Get log support */ + /** Get log support */ t_u8 getlog_enable; - /** Radio on flag */ + /** Radio on flag */ t_u16 radio_on; - /** Firmware release number */ + /** Firmware release number */ t_u32 fw_release_number; - /** firmware version */ + /** firmware version */ t_u8 fw_ver; - /** firmware minor version */ + /** firmware minor version */ t_u8 fw_min_ver; - /** uap firmware version */ + /** uap firmware version */ t_u8 uap_fw_ver; - /** mac address retrun from get_hw_spec */ + /** mac address retrun from get_hw_spec */ t_u8 permanent_addr[MLAN_MAC_ADDR_LENGTH]; - /** Number of antenna used */ + /** Number of antenna used */ t_u16 number_of_antenna; - /** antenna info */ + /** antenna info */ t_u8 antinfo; - /** Firmware capability information */ + /** Firmware capability information */ t_u32 fw_cap_info; - /** Extended firmware capability information */ + /** Extended firmware capability information */ t_u32 fw_cap_ext; -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) - /** High byte for 5G, low byte for 2G, like 0x2211 0x22 for 5G, 0x11 for 2G */ +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) + /** High byte for 5G, low byte for 2G, like 0x2211 0x22 for 5G, 0x11 for + * 2G */ t_u16 user_htstream; #endif /** vdll ctrl */ vdll_dnld_ctrl vdll_ctrl; #if defined(SDIO) || defined(PCIE) - /** pint_lock for interrupt handling */ + /** pint_lock for interrupt handling */ t_void *pint_lock; - /** Interrupt status */ + /** Interrupt status */ t_u32 ireg; #endif - /** card type */ + /** card type */ t_u16 card_type; - /** card rev */ + /** card rev */ t_u8 card_rev; const mlan_card_info *pcard_info; #ifdef SDIO @@ -2214,355 +2271,357 @@ typedef struct _mlan_adapter { mlan_usb_card *pcard_usb; #endif - /** Event cause */ + /** Event cause */ t_u32 event_cause; - /** Event buffer */ + /** Event buffer */ pmlan_buffer pmlan_buffer_event; - /** Upload length */ + /** Upload length */ t_u32 upld_len; - /** Upload buffer*/ + /** Upload buffer*/ 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 - */ + /** 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: - * TRUE - CMD is sent to fw, no CMD Done received - * FALSE - CMD done received for previous CMD - */ + /** 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: - * TRUE - CMD is response is received from fw, and yet to process - * FALSE - No cmd response to process - */ + /** 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: - * TRUE - Event received from fw, and yet to process - * FALSE - No events to process - */ + /** Event received: + * TRUE - Event received from fw, and yet to process + * FALSE - No events to process + */ t_u8 event_received; - /** Data received: - * TRUE - Data received from fw - * FALSE - No Data received - */ + /** Data received: + * TRUE - Data received from fw + * FALSE - No Data received + */ t_u8 data_received; - /** Command-related variables */ - /** Command sequence number */ + /** Command-related variables */ + /** Command sequence number */ t_u16 seq_num; - /** Command controller nodes */ + /** Command controller nodes */ cmd_ctrl_node *cmd_pool; - /** Current Command */ + /** Current Command */ cmd_ctrl_node *curr_cmd; - /** mlan_lock for command */ + /** mlan_lock for command */ t_void *pmlan_cmd_lock; - /** Number of command timeouts */ + /** Number of command timeouts */ t_u32 num_cmd_timeout; - /** Last init fw command id */ + /** Last init fw command id */ t_u16 last_init_cmd; - /** Command timer */ + /** Command timer */ t_void *pmlan_cmd_timer; - /** Command timer set flag */ + /** Command timer set flag */ t_u8 cmd_timer_is_set; - /** time stamp for command dnld */ + /** time stamp for command dnld */ t_u32 dnld_cmd_in_secs; - /** Command Queues */ - /** Free command buffers */ + /** Command Queues */ + /** Free command buffers */ mlan_list_head cmd_free_q; - /** Pending command buffers */ + /** Pending command buffers */ mlan_list_head cmd_pending_q; - /** Command queue for scanning */ + /** Command queue for scanning */ mlan_list_head scan_pending_q; - /** ioctl pending queue */ + /** ioctl pending queue */ mlan_list_head ioctl_pending_q; - /** pending_ioctl flag */ + /** pending_ioctl flag */ t_u8 pending_ioctl; pmlan_private pending_disconnect_priv; - /** mlan_processing */ + /** mlan_processing */ t_u32 scan_processing; - /** ext_scan enh support flag */ + /** ext_scan enh support flag */ t_u8 ext_scan_enh; - /** scan type: 0 legacy, 1: enhance scan*/ + /** scan type: 0 legacy, 1: enhance scan*/ t_u8 ext_scan_type; - /** ext scan timeout */ + /** ext scan timeout */ t_u8 ext_scan_timeout; - /** coex scan flag */ + /** coex scan flag */ t_u8 coex_scan; - /** coex min scan time */ + /** coex min scan time */ t_u8 coex_min_scan_time; - /** coex max scan time */ + /** coex max scan time */ t_u8 coex_max_scan_time; - /** coex win size flag */ + /** coex win size flag */ t_u8 coex_win_size; - /** coex amdpdu tx win size */ + /** coex amdpdu tx win size */ t_u8 coex_tx_win_size; - /** coex ampdu rx win size */ + /** coex ampdu rx win size */ t_u8 coex_rx_win_size; - /** Region code */ + /** Region code */ t_u16 region_code; - /** Region Channel data */ + /** Region Channel data */ region_chan_t region_channel[MAX_REGION_CHANNEL_NUM]; - /** CFP table code for 2.4GHz */ + /** CFP table code for 2.4GHz */ t_u8 cfp_code_bg; - /** CFP table code for 5GHz */ + /** CFP table code for 5GHz */ t_u8 cfp_code_a; wmm_ac_parameters_t ac_params[MAX_AC_QUEUES]; - /** Minimum BA Threshold */ + /** Minimum BA Threshold */ t_u8 min_ba_threshold; #ifdef STA_SUPPORT - /** Universal Channel data */ + /** Universal Channel data */ region_chan_t universal_channel[MAX_REGION_CHANNEL_NUM]; - /** Parsed region channel */ + /** Parsed region channel */ parsed_region_chan_11d_t parsed_region_chan; -#endif /* STA_SUPPORT */ - /** 11D and Domain Regulatory Data */ +#endif /* STA_SUPPORT */ + /** 11D and Domain Regulatory Data */ wlan_802_11d_domain_reg_t domain_reg; - /** Country Code */ + /** Country Code */ t_u8 country_code[COUNTRY_CODE_LEN]; - /** FSM variable for 11h support */ + /** FSM variable for 11h support */ wlan_11h_device_state_t state_11h; - /** FSM variable for DFS support */ + /** FSM variable for DFS support */ wlan_dfs_device_state_t state_dfs; - /** FSM variable for RDH support */ + /** FSM variable for RDH support */ wlan_radar_det_hndlg_state_t state_rdh; - /** variable to configure dfs channel switch count */ + /** variable to configure dfs channel switch count */ t_s8 dfs_cs_count; - /** User configured settings for DFS testing */ + /** User configured settings for DFS testing */ wlan_dfs_testing_settings_t dfs_test_params; - /** FSM variable for MEAS support */ + /** dfs w53 cfg */ + t_u8 dfs53cfg; + /** FSM variable for MEAS support */ wlan_meas_state_t state_meas; - /** Scan table */ + /** Scan table */ BSSDescriptor_t *pscan_table; - /** scan age in secs */ + /** scan age in secs */ t_u32 age_in_secs; - /** Active scan for hidden ssid triggered */ + /** Active scan for hidden ssid triggered */ t_u8 active_scan_triggered; - /** channel statstics */ + /** channel statstics */ ChanStatistics_t *pchan_stats; - /** Number of records in the chan_stats */ + /** Number of records in the chan_stats */ t_u32 num_in_chan_stats; - /** index of chan stats */ + /** index of chan stats */ t_u32 idx_chan_stats; t_u8 bgscan_reported; - /** Number of records in the scan table */ + /** Number of records in the scan table */ t_u32 num_in_scan_table; - /** Scan probes */ + /** Scan probes */ t_u16 scan_probes; - /** Scan type */ + /** Scan type */ t_u8 scan_type; - /** Scan mode */ + /** Scan mode */ t_u32 scan_mode; - /** Specific scan time */ + /** Specific scan time */ t_u16 specific_scan_time; - /** Active scan time */ + /** Active scan time */ t_u16 active_scan_time; - /** Passive scan time */ + /** Passive scan time */ t_u16 passive_scan_time; - /** Passive scan to active scan */ + /** Passive scan to active scan */ t_u8 passive_to_active_scan; - /** scan channel gap time */ + /** scan channel gap time */ t_u16 scan_chan_gap; - /** Scan block flag */ + /** Scan block flag */ t_u8 scan_block; - /** Extended scan or legacy scan */ + /** Extended scan or legacy scan */ t_u8 ext_scan; t_u16 bcn_buf_size; - /** Beacon buffer */ + /** Beacon buffer */ t_u8 *bcn_buf; - /** Pointer to valid beacon buffer end */ + /** Pointer to valid beacon buffer end */ t_u8 *pbcn_buf_end; - /** allocate fixed scan beacon buffer size*/ + /** allocate fixed scan beacon buffer size*/ t_u32 fixed_beacon_buffer; - /** F/W supported bands */ + /** F/W supported bands */ t_u16 fw_bands; - /** User selected band to start adhoc network */ + /** User selected band to start adhoc network */ t_u16 adhoc_start_band; - /** User selected bands */ + /** User selected bands */ t_u16 config_bands; - /** Pointer to channel list last sent to the firmware for scanning */ + /** Pointer to channel list last sent to the firmware for scanning */ ChanScanParamSet_t *pscan_channels; - /** Tx lock flag */ + /** Tx lock flag */ t_u8 tx_lock_flag; - /** Rx lock flag */ + /** Rx lock flag */ t_u8 rx_lock_flag; - /** main lock flag */ + /** main lock flag */ t_u8 main_lock_flag; #ifdef USB - /** Tx CMD endpoint address */ + /** Tx CMD endpoint address */ t_u8 tx_cmd_ep; - /** Rx CMD/EVT endpoint address */ + /** Rx CMD/EVT endpoint address */ t_u8 rx_cmd_ep; - /** Rx data endpoint address */ + /** Rx data endpoint address */ t_u8 rx_data_ep; - /** Tx data endpoint address */ + /** Tx data endpoint address */ t_u8 tx_data_ep; #endif - /** sleep_params_t */ + /** sleep_params_t */ sleep_params_t sleep_params; - /** sleep_period_t (Enhanced Power Save) */ + /** sleep_period_t (Enhanced Power Save) */ sleep_period_t sleep_period; - /** Power Save mode */ - /** - * Wlan802_11PowerModeCAM = disable - * Wlan802_11PowerModePSP = enable - */ + /** Power Save mode */ + /** + * Wlan802_11PowerModeCAM = disable + * Wlan802_11PowerModePSP = enable + */ t_u16 ps_mode; - /** Power Save state */ + /** Power Save state */ t_u32 ps_state; - /** Need to wakeup flag */ + /** Need to wakeup flag */ t_u8 need_to_wakeup; - /** keep_wakeup */ + /** keep_wakeup */ t_u8 keep_wakeup; - /** Multiple DTIM */ + /** Multiple DTIM */ t_u16 multiple_dtim; - /** Local listen interval */ + /** Local listen interval */ t_u16 local_listen_interval; - /** Null packet interval */ + /** Null packet interval */ t_u16 null_pkt_interval; - /** IEEE ps inactivity timout value */ + /** IEEE ps inactivity timout value */ t_u16 inact_tmo; - /** Power save confirm sleep command buffer */ + /** Power save confirm sleep command buffer */ pmlan_buffer psleep_cfm; - /** Beacon miss timeout */ + /** Beacon miss timeout */ t_u16 bcn_miss_time_out; - /** Deep Sleep flag */ + /** Deep Sleep flag */ t_u8 is_deep_sleep; - /** Idle time */ + /** Idle time */ t_u16 idle_time; - /** Auto Deep Sleep enabled at init time */ + /** Auto Deep Sleep enabled at init time */ t_u8 init_auto_ds; - /** delay null pkt flag */ + /** delay null pkt flag */ t_u8 delay_null_pkt; - /** Delay to PS in milliseconds */ + /** Delay to PS in milliseconds */ t_u16 delay_to_ps; - /** Enhanced PS mode */ + /** Enhanced PS mode */ t_u16 enhanced_ps_mode; - /** Device wakeup required flag */ + /** Device wakeup required flag */ t_u8 pm_wakeup_card_req; - /** Gen NULL pkg */ + /** Gen NULL pkg */ t_u16 gen_null_pkt; - /** PPS/UAPSD mode flag */ + /** PPS/UAPSD mode flag */ t_u16 pps_uapsd_mode; - /** Number of wakeup tries */ + /** Number of wakeup tries */ t_u32 pm_wakeup_fw_try; - /** time stamp when host try to wake up firmware */ + /** time stamp when host try to wake up firmware */ t_u32 pm_wakeup_in_secs; - /** Card wakeup timer */ + /** Card wakeup timer */ t_void *pwakeup_fw_timer; - /** Card wakeup timer */ + /** Card wakeup timer */ t_u8 wakeup_fw_timer_is_set; - /** Number of wake up timeouts */ + /** Number of wake up timeouts */ t_u32 pm_wakeup_timeout; - /** Host Sleep configured flag */ + /** Host Sleep configured flag */ t_u8 is_hs_configured; - /** Host Sleep configuration */ + /** Host Sleep configuration */ hs_config_param hs_cfg; - /** Host Sleep activated flag */ + /** Host Sleep activated flag */ t_u8 hs_activated; - /** mef_flt_cfg_mef configuration */ + /** mef_flt_cfg_mef configuration */ mef_entry entry_cfg; - /** Event body */ + /** Event body */ t_u8 event_body[MAX_EVENT_SIZE]; - /** 802.11n device capabilities */ + /** 802.11n device capabilities */ t_u32 hw_dot_11n_dev_cap; - /** Device support for MIMO abstraction of MCSs */ + /** Device support for MIMO abstraction of MCSs */ t_u8 hw_dev_mcs_support; #ifdef STA_SUPPORT - /** Adhoc Secondary Channel Bandwidth */ + /** Adhoc Secondary Channel Bandwidth */ t_u8 chan_bandwidth; -#endif /* STA_SUPPORT */ +#endif /* STA_SUPPORT */ - /** 802.11ac device capabilities */ + /** 802.11ac device capabilities */ t_u32 hw_dot_11ac_dev_cap; - /** 802.11ac device support for MIMO abstraction of MCSs */ + /** 802.11ac device support for MIMO abstraction of MCSs */ t_u32 hw_dot_11ac_mcs_support; - /** length of hw he capability */ + /** length of hw he capability */ t_u8 hw_hecap_len; - /** 802.11ax HE capability */ + /** 802.11ax HE capability */ t_u8 hw_he_cap[54]; - /** length of hw 2.4G he capability */ + /** length of hw 2.4G he capability */ t_u8 hw_2g_hecap_len; - /** 802.11ax 2.4G HE capability */ + /** 802.11ax 2.4G HE capability */ t_u8 hw_2g_he_cap[54]; - /** max mgmt IE index in device */ + /** max mgmt IE index in device */ t_u16 max_mgmt_ie_index; - /** Head of Rx data queue */ + /** Head of Rx data queue */ mlan_list_head rx_data_queue; #ifdef MFG_CMD_SUPPORT t_u32 mfg_mode; #endif - /** Debug */ + /** Debug */ wlan_dbg dbg; - /** RX pending for forwarding packets */ + /** RX pending for forwarding packets */ mlan_scalar pending_bridge_pkts; - /** Minimum delay between HsActive and HostWake (in msec) */ + /** Minimum delay between HsActive and HostWake (in msec) */ t_u16 min_wake_holdoff; - /** Host sleep wake interval(in msec) */ + /** Host sleep wake interval(in msec) */ t_u32 hs_wake_interval; - /** Host sleep inactivity timeout (in msec) */ + /** Host sleep inactivity timeout (in msec) */ t_u32 hs_inactivity_timeout; - /** Parameter type for indication gpio*/ + /** Parameter type for indication gpio*/ t_u8 param_type_ind; - /** GPIO pin for indication wakeup source */ + /** GPIO pin for indication wakeup source */ t_u32 ind_gpio; - /** Level on ind_gpio pin for indication normal wakeup source */ + /** Level on ind_gpio pin for indication normal wakeup source */ t_u32 level; - /** Parameter type for extend hscfg*/ + /** Parameter type for extend hscfg*/ t_u8 param_type_ext; - /** Events that will be forced ignore */ + /** Events that will be forced ignore */ t_u32 event_force_ignore; - /** Events that will use extend gap to inform host*/ + /** Events that will use extend gap to inform host*/ t_u32 event_use_ext_gap; - /** Extend gap*/ + /** Extend gap*/ t_u8 ext_gap; - /** GPIO wave level for extend hscfg */ + /** GPIO wave level for extend hscfg */ t_u8 gpio_wave; - /** Dynamic MIMO-SISO switch for hscfg*/ + /** Dynamic MIMO-SISO switch for hscfg*/ t_u8 hs_mimo_switch; - /** management frame wakeup filter config */ + /** management frame wakeup filter config */ mlan_mgmt_frame_wakeup mgmt_filter[MAX_MGMT_FRAME_FILTER]; - /** Bypass TX queue pkt count */ + /** Bypass TX queue pkt count */ t_u16 bypass_pkt_count; #ifdef STA_SUPPORT - /** warm-reset IOCTL request buffer pointer */ + /** warm-reset IOCTL request buffer pointer */ pmlan_ioctl_req pwarm_reset_ioctl_req; #endif - /** SCAN IOCTL request buffer pointer */ + /** SCAN IOCTL request buffer pointer */ pmlan_ioctl_req pscan_ioctl_req; - /** DPD data pointer */ + /** DPD data pointer */ t_u8 *pdpd_data; - /** DPD data length */ + /** DPD data length */ t_u32 dpd_data_len; - /** region txpowerlimit cfg data buf pointer */ + /** region txpowerlimit cfg data buf pointer */ t_u8 *ptxpwr_data; - /** region txpowerlimit cfg data len */ + /** region txpowerlimit cfg data len */ t_u32 txpwr_data_len; - /** Cal data pointer */ + /** Cal data pointer */ t_u8 *pcal_data; - /** Cal data length */ + /** Cal data length */ t_u32 cal_data_len; - /** Feature control bitmask */ + /** Feature control bitmask */ t_u32 feature_control; - /** Control coex RX window size configuration */ + /** Control coex RX window size configuration */ t_u8 coex_rx_winsize; t_bool dfs_repeater; t_u32 dfsr_channel; @@ -2570,7 +2629,7 @@ typedef struct _mlan_adapter { #if defined(PCIE) mlan_buffer *ssu_buf; #endif - /** maximum sta connection */ + /** maximum sta connection */ t_u8 max_sta_conn; otp_region_info_t *otp_region; chan_freq_power_t *cfp_otp_bg; @@ -2583,29 +2642,29 @@ typedef struct _mlan_adapter { t_u32 tx_power_table_a_size; t_u8 tx_power_table_a_rows; t_u8 tx_power_table_a_cols; - /**mlan adapter operations*/ + /**mlan adapter operations*/ mlan_adapter_operations ops; #ifdef DRV_EMBEDDED_AUTHENTICATOR - /** authenticator_priv */ + /** authenticator_priv */ pmlan_private authenticator_priv; #endif } mlan_adapter, *pmlan_adapter; /** Check if stream 2X2 enabled */ -#define IS_STREAM_2X2(x) ((x) & FEATURE_CTRL_STREAM_2X2) +#define IS_STREAM_2X2(x) ((x)&FEATURE_CTRL_STREAM_2X2) /** Check if DFS support enabled */ -#define IS_DFS_SUPPORT(x) ((x) & FEATURE_CTRL_DFS_SUPPORT) +#define IS_DFS_SUPPORT(x) ((x)&FEATURE_CTRL_DFS_SUPPORT) #ifdef USB /** Check if winner check & not wait for FW ready event */ -#define IS_USB_NEW_INIT(x) ((x) & FEATURE_CTRL_USB_NEW_INIT) +#define IS_USB_NEW_INIT(x) ((x)&FEATURE_CTRL_USB_NEW_INIT) #endif /** Ethernet packet type for EAPOL */ -#define MLAN_ETHER_PKT_TYPE_EAPOL (0x888E) +#define MLAN_ETHER_PKT_TYPE_EAPOL (0x888E) /** Ethernet packet type for WAPI */ -#define MLAN_ETHER_PKT_TYPE_WAPI (0x88B4) +#define MLAN_ETHER_PKT_TYPE_WAPI (0x88B4) /** Ethernet packet type offset */ -#define MLAN_ETHER_PKT_TYPE_OFFSET (12) +#define MLAN_ETHER_PKT_TYPE_OFFSET (12) mlan_status wlan_init_lock_list(IN pmlan_adapter pmadapter); mlan_status wlan_init_priv_lock_list(IN pmlan_adapter pmadapter, @@ -2628,8 +2687,8 @@ mlan_status wlan_init_fw_complete(IN pmlan_adapter pmadapter); 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_status wlan_recv_event(pmlan_private priv, mlan_event_id event_id, + t_void *pmevent); /** Initialize mlan_adapter structure */ t_void wlan_init_adapter(IN pmlan_adapter pmadapter); @@ -2637,18 +2696,16 @@ t_void wlan_init_adapter(IN pmlan_adapter pmadapter); /** Initialize mlan_private structure */ mlan_status wlan_init_priv(IN pmlan_private priv); -mlan_status wlan_download_vdll_block(mlan_adapter *pmadapter, - t_u8 *block, t_u16 block_len); +mlan_status wlan_download_vdll_block(mlan_adapter *pmadapter, t_u8 *block, + t_u16 block_len); mlan_status wlan_process_vdll_event(IN pmlan_private pmpriv, pmlan_buffer pevent); /** Process event */ 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, +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); /** cmd timeout handler */ @@ -2660,8 +2717,7 @@ t_void wlan_cmd_timeout_func(t_void *function_context); * @param pmadapter Pointer to mlan_adapter * @return MTRUE/MFALSE; */ -static inline t_u8 -wlan_is_tx_pending(mlan_adapter *pmadapter) +static inline t_u8 wlan_is_tx_pending(mlan_adapter *pmadapter) { #ifdef PCIE if (IS_PCIE(pmadapter->card_type) && @@ -2773,32 +2829,35 @@ mlan_status wlan_usb_deaggr_rx_pkt(IN pmlan_adapter pmadapter, * * @return N/A */ -static INLINE t_void -wlan_reset_usb_tx_aggr(IN pmlan_adapter pmadapter) +static INLINE t_void wlan_reset_usb_tx_aggr(IN pmlan_adapter pmadapter) { t_s32 i = 0; pmlan_callbacks pcb = &pmadapter->callbacks; ENTER(); for (i = 0; i < MAX_USB_TX_PORT_NUM; i++) { - pcb->moal_spin_lock(pmadapter->pmoal_handle, - pmadapter->pcard_usb->usb_tx_aggr[i]. - paggr_lock); + pcb->moal_spin_lock( + pmadapter->pmoal_handle, + pmadapter->pcard_usb->usb_tx_aggr[i].paggr_lock); if (pmadapter->pcard_usb->usb_tx_aggr[i].aggr_hold_timer_is_set) { pcb->moal_stop_timer(pmadapter->pmoal_handle, - pmadapter->pcard_usb-> - usb_tx_aggr[i].paggr_hold_timer); - pmadapter->pcard_usb->usb_tx_aggr[i]. - aggr_hold_timer_is_set = MFALSE; + pmadapter->pcard_usb + ->usb_tx_aggr[i] + .paggr_hold_timer); + pmadapter->pcard_usb->usb_tx_aggr[i] + .aggr_hold_timer_is_set = MFALSE; } if (pmadapter->pcard_usb->usb_tx_aggr[i].aggr_ctrl.enable && pmadapter->pcard_usb->usb_tx_aggr[i].pmbuf_aggr != MNULL) { - wlan_write_data_complete(pmadapter, pmadapter->pcard_usb->usb_tx_aggr[i].pmbuf_aggr, MLAN_STATUS_FAILURE); /* did not get sent */ + wlan_write_data_complete( + pmadapter, + pmadapter->pcard_usb->usb_tx_aggr[i].pmbuf_aggr, + MLAN_STATUS_FAILURE); /* did not get sent */ pmadapter->pcard_usb->usb_tx_aggr[i].pmbuf_aggr = MNULL; pmadapter->pcard_usb->usb_tx_aggr[i].aggr_len = 0; } - pcb->moal_spin_unlock(pmadapter->pmoal_handle, - pmadapter->pcard_usb->usb_tx_aggr[i]. - paggr_lock); + pcb->moal_spin_unlock( + pmadapter->pmoal_handle, + pmadapter->pcard_usb->usb_tx_aggr[i].paggr_lock); } LEAVE(); } @@ -2846,15 +2905,15 @@ t_u8 wlan_bypass_tx_list_empty(mlan_adapter *pmadapter); /** Check if this is the last packet */ t_u8 wlan_check_last_packet_indication(pmlan_private priv); -#define MOAL_ALLOC_MLAN_BUFFER (0) -#define MOAL_MALLOC_BUFFER (1) +#define MOAL_ALLOC_MLAN_BUFFER (0) +#define MOAL_MALLOC_BUFFER (1) #ifdef PCIE /* This defines the direction arg to the DMA mapping routines. */ -#define PCI_DMA_BIDIRECTIONAL 0 -#define PCI_DMA_TODEVICE 1 -#define PCI_DMA_FROMDEVICE 2 -#define PCI_DMA_NONE 3 +#define PCI_DMA_BIDIRECTIONAL 0 +#define PCI_DMA_TODEVICE 1 +#define PCI_DMA_FROMDEVICE 2 +#define PCI_DMA_NONE 3 #endif /** function to allocate a mlan_buffer */ @@ -2877,8 +2936,8 @@ 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 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, @@ -2886,8 +2945,7 @@ mlan_status wlan_ret_enh_power_mode(IN pmlan_private pmpriv, /** 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 HostCmd_DS_COMMAND *pcmd, IN t_u16 cmd_action, IN t_u32 cmd_oid, IN t_void *pdata_buf); /** handle command resp for cfg data */ mlan_status wlan_ret_cfg_data(IN pmlan_private pmpriv, @@ -2992,8 +3050,7 @@ mlan_status wlan_radio_ioctl_ant_cfg(IN pmlan_adapter pmadapter, 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 t_u16 cmd_action, IN t_void *pdata_buf, IN mlan_ioctl_req *pioctl_buf); mlan_status wlan_ret_tx_rate_cfg(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *resp, @@ -3018,8 +3075,8 @@ t_void wlan_host_sleep_wakeup_event(pmlan_private priv); /** Prepares command of robustcoex */ mlan_status wlan_cmd_robustcoex(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); /** Set Robustcoex gpiocfg */ mlan_status wlan_misc_robustcoex(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req); @@ -3037,8 +3094,7 @@ mlan_status wlan_ret_dmcs_config(IN pmlan_private pmpriv, IN mlan_ioctl_req *pioctl_buf); #if defined(PCIE) -mlan_status wlan_cmd_ssu(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, +mlan_status wlan_cmd_ssu(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd, IN t_u16 cmd_action, IN t_u16 *pdata_buf); #endif @@ -3070,16 +3126,13 @@ mlan_status wlan_process_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf); 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, +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); /** cmdresp handler for station mode */ -mlan_status wlan_ops_sta_process_cmdresp(IN t_void *priv, - IN t_u16 cmdresp_no, +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); @@ -3100,8 +3153,7 @@ mlan_status wlan_ops_sta_init_cmd(IN t_void *priv, IN t_u8 first_bss); 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, +mlan_status wlan_scan_networks(IN mlan_private *pmpriv, IN t_void *pioctl_buf, IN wlan_user_scan_cfg *puser_scan_in); /** Scan for specific SSID */ @@ -3134,29 +3186,28 @@ mlan_status wlan_handle_event_ext_scan_status(IN mlan_private *pmpriv, 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); +t_s32 wlan_is_network_compatible(IN mlan_private *pmpriv, 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, +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); /** 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); +t_s32 wlan_find_bssid_in_list(IN mlan_private *pmpriv, 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); /** Compare two SSIDs */ -t_s32 wlan_ssid_cmp(IN pmlan_adapter pmadapter, - IN mlan_802_11_ssid *ssid1, IN mlan_802_11_ssid *ssid2); +t_s32 wlan_ssid_cmp(IN pmlan_adapter pmadapter, 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); +mlan_status wlan_associate(IN mlan_private *pmpriv, IN t_void *pioctl_buf, + IN BSSDescriptor_t *pBSSDesc); /** Associate command handler */ mlan_status wlan_cmd_802_11_associate(IN mlan_private *pmpriv, @@ -3184,13 +3235,11 @@ mlan_status wlan_disconnect(IN mlan_private *pmpriv, IN mlan_deauth_param *deauth_param); /** Ad-Hoc start */ -mlan_status wlan_adhoc_start(IN mlan_private *pmpriv, - IN t_void *pioctl_buf, +mlan_status wlan_adhoc_start(IN mlan_private *pmpriv, 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, +mlan_status wlan_adhoc_join(IN mlan_private *pmpriv, IN t_void *pioctl_buf, IN BSSDescriptor_t *pBSSDesc); /** Ad-Hoc start command handler */ @@ -3225,10 +3274,9 @@ mlan_status wlan_ret_802_11_bgscan_query(IN mlan_private *pmpriv, 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); +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); /** 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); @@ -3264,8 +3312,8 @@ t_u8 wlan_is_rate_auto(mlan_private *pmpriv); /** Get rate index */ int wlan_get_rate_index(pmlan_adapter pmadapter, t_u16 *rateBitmap, int size); mlan_status wlan_cmd_rxabortcfg(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_rxabortcfg(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf); @@ -3369,16 +3417,13 @@ mlan_status wlan_11d_parse_dnld_countryinfo(mlan_private *pmpriv, /** 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); +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); #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, +mlan_status wlan_11d_handle_uap_domain_info(mlan_private *pmpriv, t_u8 band, t_u8 *domain_tlv, t_void *pioctl_buf); #endif @@ -3422,8 +3467,7 @@ t_u8 wlan_is_wmm_ie_present(pmlan_adapter pmadapter, t_u8 *pbuf, t_u16 buf_len); * * @return MTRUE or MFALSE */ -static INLINE int -wlan_is_tx_pause(mlan_private *priv, t_u8 *ra) +static INLINE int wlan_is_tx_pause(mlan_private *priv, t_u8 *ra) { sta_node *sta_ptr = MNULL; sta_ptr = wlan_get_station_entry(priv, ra); @@ -3431,7 +3475,6 @@ wlan_is_tx_pause(mlan_private *priv, t_u8 *ra) return sta_ptr->tx_pause; return MFALSE; } - t_u16 wlan_update_ralist_tx_pause(pmlan_private priv, t_u8 *mac, t_u8 tx_pause); #ifdef UAP_SUPPORT @@ -3494,8 +3537,7 @@ mlan_status wlan_ret_802_11_rf_antenna(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf); -mlan_status wlan_ret_reg_access(mlan_adapter *pmadapter, - t_u16 type, +mlan_status wlan_ret_reg_access(mlan_adapter *pmadapter, t_u16 type, IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf); mlan_status wlan_ret_mem_access(IN pmlan_private pmpriv, @@ -3509,10 +3551,10 @@ mlan_status 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); mlan_status wlan_cmd_reg_access(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - 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 HostCmd_DS_COMMAND *cmd, 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); mlan_status wlan_cmd_802_11_mac_address(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd, IN t_u16 cmd_action); @@ -3559,16 +3601,15 @@ void wlan_add_ext_capa_info_ie(IN mlan_private *pmpriv, #endif mlan_status wlan_cmd_boot_sleep(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_boot_sleep(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf); #if defined(DRV_EMBEDDED_AUTHENTICATOR) || defined(DRV_EMBEDDED_SUPPLICANT) -mlan_status wlan_cmd_crypto(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, +mlan_status wlan_cmd_crypto(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd, IN t_u16 cmd_action, IN t_u16 *pdata_buf); mlan_status wlan_ret_crypto(IN pmlan_private pmpriv, @@ -3576,9 +3617,9 @@ mlan_status wlan_ret_crypto(IN pmlan_private pmpriv, IN mlan_ioctl_req *pioctl_buf); #endif -#define BW_20MHZ 0 -#define BW_40MHZ 1 -#define BW_80MHZ 2 +#define BW_20MHZ 0 +#define BW_40MHZ 1 +#define BW_80MHZ 2 #define BW_160MHZ 3 int wlan_add_supported_oper_class_ie(IN mlan_private *pmpriv, OUT t_u8 **pptlv_out, @@ -3603,10 +3644,8 @@ mlan_status wlan_misc_ioctl_usb_aggr_ctrl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req); #endif -mlan_status - -wlan_misc_ioctl_aggr_ctrl(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req); +mlan_status wlan_misc_ioctl_aggr_ctrl(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req); mlan_status wlan_cmd_packet_aggr_ctrl(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd, IN t_u16 cmd_action, @@ -3622,7 +3661,6 @@ mlan_status wlan_misc_ioctl_region(IN pmlan_adapter pmadapter, #ifdef RX_PACKET_COALESCE mlan_status - wlan_misc_ioctl_rx_pkt_coalesce_config(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req); #endif @@ -3686,8 +3724,8 @@ mlan_status wlan_misc_chan_reg_cfg(IN pmlan_adapter pmadapter, mlan_status wlan_get_cfpinfo(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req); -mlan_status wlan_cmd_get_tsf(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, IN t_u16 cmd_action); +mlan_status wlan_cmd_get_tsf(pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action); mlan_status wlan_ret_get_tsf(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf); @@ -3715,8 +3753,7 @@ t_u8 wlan_ieee_rateid_to_mrvl_rateid(IN mlan_private *priv, IN t_u16 IeeeMacRate, IN t_u8 *dst_mac); t_u8 wlan_mrvl_rateid_to_ieee_rateid(IN t_u8 rate); -t_u8 wlan_get_center_freq_idx(IN mlan_private *pmpriv, - IN t_u16 band, +t_u8 wlan_get_center_freq_idx(IN mlan_private *pmpriv, IN t_u16 band, IN t_u32 pri_chan, IN t_u8 chan_bw); mlan_status wlan_ret_chan_region_cfg(IN pmlan_private pmpriv, @@ -3758,8 +3795,7 @@ mlan_status wlan_ret_set_get_low_power_mode_cfg(IN pmlan_private pmpriv, * * @return MTRUE or MFALSE */ -static INLINE t_u8 -queuing_ra_based(pmlan_private priv) +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 @@ -3782,8 +3818,7 @@ queuing_ra_based(pmlan_private priv) * * @return Number of Rates copied */ -static INLINE t_u32 -wlan_copy_rates(t_u8 *dest, t_u32 pos, t_u8 *src, int len) +static INLINE t_u32 wlan_copy_rates(t_u8 *dest, t_u32 pos, t_u8 *src, int len) { int i; @@ -3803,12 +3838,12 @@ wlan_copy_rates(t_u8 *dest, t_u32 pos, t_u8 *src, int len) * * @return Length of string */ -static INLINE t_u32 -wlan_strlen(const char *str) +static INLINE t_u32 wlan_strlen(const char *str) { t_u32 i; - for (i = 0; str[i] != 0; i++) ; + for (i = 0; str[i] != 0; i++) + ; return i; } @@ -3820,11 +3855,10 @@ wlan_strlen(const char *str) * * @return Non zero if chr is a hex, else 0 */ -static INLINE t_u32 -wlan_isxdigit(t_u8 chr) +static INLINE t_u32 wlan_isxdigit(t_u8 chr) { return (chr <= 'f' && chr >= 'a') || (chr <= 'F' && chr >= 'A') || - (chr <= '9' && chr >= '0'); + (chr <= '9' && chr >= '0'); } /** @@ -3834,8 +3868,7 @@ wlan_isxdigit(t_u8 chr) * * @return Non zero if chr is space etc, else 0 */ -static INLINE t_u32 -wlan_isspace(t_u8 chr) +static INLINE t_u32 wlan_isspace(t_u8 chr) { return chr <= ' ' && (chr == ' ' || (chr <= 13 && chr >= 9)); } @@ -3851,11 +3884,11 @@ typedef enum _delay_unit { t_void wlan_delay_func(mlan_adapter *pmadapter, t_u32 delay, t_delay_unit u); /** delay function wrapper */ -#define wlan_delay(p, n) wlan_delay_func(p, n, SEC) +#define wlan_delay(p, n) wlan_delay_func(p, n, SEC) /** delay function wrapper */ -#define wlan_mdelay(p, n) wlan_delay_func(p, n, MSEC) +#define wlan_mdelay(p, n) wlan_delay_func(p, n, MSEC) /** delay function wrapper */ -#define wlan_udelay(p, n) wlan_delay_func(p, n, USEC) +#define wlan_udelay(p, n) wlan_delay_func(p, n, USEC) /** * @brief This function check if there are pending cmd @@ -3866,16 +3899,14 @@ t_void wlan_delay_func(mlan_adapter *pmadapter, t_u32 delay, t_delay_unit u); * @return MTRUE -- cmd pending * MFALSE -- no pending cmd */ -static INLINE int -wlan_is_cmd_pending(mlan_adapter *pmadapter) +static INLINE int wlan_is_cmd_pending(mlan_adapter *pmadapter) { int ret; cmd_ctrl_node *pcmd_node = MNULL; wlan_request_cmd_lock(pmadapter); - pcmd_node = - (cmd_ctrl_node *)util_peek_list(pmadapter->pmoal_handle, - &pmadapter->cmd_pending_q, - MNULL, MNULL); + pcmd_node = (cmd_ctrl_node *)util_peek_list(pmadapter->pmoal_handle, + &pmadapter->cmd_pending_q, + MNULL, MNULL); if (pcmd_node) ret = MTRUE; else @@ -3885,7 +3916,7 @@ wlan_is_cmd_pending(mlan_adapter *pmadapter) } /** Get BSS number from priv */ -#define GET_BSS_NUM(priv) ((priv)->bss_num) +#define GET_BSS_NUM(priv) ((priv)->bss_num) /** * @brief This function returns priv based on the BSS num and BSS type @@ -3896,8 +3927,8 @@ wlan_is_cmd_pending(mlan_adapter *pmadapter) * * @return Pointer to mlan_private */ -static INLINE mlan_private * -wlan_get_priv_by_id(mlan_adapter *pmadapter, t_u32 bss_num, t_u32 bss_type) +static INLINE mlan_private *wlan_get_priv_by_id(mlan_adapter *pmadapter, + t_u32 bss_num, t_u32 bss_type) { int i; @@ -3920,8 +3951,8 @@ wlan_get_priv_by_id(mlan_adapter *pmadapter, t_u32 bss_num, t_u32 bss_type) * * @return Pointer to mlan_private */ -static INLINE mlan_private * -wlan_get_priv(mlan_adapter *pmadapter, mlan_bss_role bss_role) +static INLINE mlan_private *wlan_get_priv(mlan_adapter *pmadapter, + mlan_bss_role bss_role) { int i; @@ -3949,8 +3980,8 @@ wlan_get_priv(mlan_adapter *pmadapter, mlan_bss_role bss_role) */ static INLINE int 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; @@ -3986,8 +4017,8 @@ wlan_count_priv_cond(mlan_adapter *pmadapter, */ static INLINE int 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; @@ -4028,7 +4059,7 @@ wlan_do_task_on_privs(mlan_adapter *pmadapter, */ static INLINE int wlan_get_privs_by_cond(mlan_adapter *pmadapter, - t_bool (*check_cond) (IN pmlan_private pmpriv), + t_bool (*check_cond)(IN pmlan_private pmpriv), mlan_private **ppriv_list) { pmlan_private pmpriv; @@ -4061,9 +4092,9 @@ wlan_get_privs_by_cond(mlan_adapter *pmadapter, * @param check_cond_2 Function pointer to second condition to check. * @param and_conditions If MTRUE, both conditions must be met (AND), * else either condition can be met (OR). - * @param ppriv_list Output param. Externally supplied array of mlan_private* - * to hold priv's that test positive with check_cond. - * Array size should be at least pmadapter->priv_num. + * @param ppriv_list Output param. Externally supplied array of + * mlan_private* to hold priv's that test positive with check_cond. Array size + * should be at least pmadapter->priv_num. * * @return Number of privs in ppriv_list * @@ -4071,8 +4102,8 @@ wlan_get_privs_by_cond(mlan_adapter *pmadapter, */ static INLINE int 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 (*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; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_meas.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_meas.c index a3c578b11fe5..38d16af57732 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_meas.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_meas.c @@ -43,7 +43,7 @@ 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 */ @@ -63,8 +63,7 @@ static const char *meas_type_str[WLAN_MEAS_NUM_TYPES] = { * * @return Constant string representing measurement type */ -static const char * -wlan_meas_get_meas_type_str(MeasType_t meas_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]; @@ -80,8 +79,7 @@ wlan_meas_get_meas_type_str(MeasType_t meas_type) * * @return N/A */ -static - void +static void wlan_meas_dump_meas_req(const HostCmd_DS_MEASUREMENT_REQUEST *pmeas_req) { ENTER(); @@ -106,7 +104,8 @@ wlan_meas_dump_meas_req(const HostCmd_DS_MEASUREMENT_REQUEST *pmeas_req) switch (pmeas_req->meas_type) { case WLAN_MEAS_BASIC: - /* Lazy cheat, fields of bas, cca, rpi union match on the request */ + /* 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", @@ -130,8 +129,7 @@ wlan_meas_dump_meas_req(const HostCmd_DS_MEASUREMENT_REQUEST *pmeas_req) * * @return N/A */ -static - void +static void wlan_meas_dump_meas_rpt(const HostCmd_DS_MEASUREMENT_REPORT *pmeas_rpt) { MeasType_t type; @@ -197,17 +195,16 @@ wlan_meas_dump_meas_rpt(const HostCmd_DS_MEASUREMENT_REPORT *pmeas_rpt) * * @return MLAN_STATUS_SUCCESS */ -static int -wlan_meas_cmdresp_get_report(mlan_private *pmpriv, - const HostCmd_DS_COMMAND *resp) +static int wlan_meas_cmdresp_get_report(mlan_private *pmpriv, + const HostCmd_DS_COMMAND *resp) { mlan_adapter *pmadapter = pmpriv->adapter; const HostCmd_DS_MEASUREMENT_REPORT *pmeas_rpt = &resp->params.meas_rpt; 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); @@ -216,16 +213,16 @@ wlan_meas_cmdresp_get_report(mlan_private *pmpriv, * 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) { + 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; - /* Copy the received report into the measurement state for retrieval */ + /* Copy the received report into the measurement state for + * retrieval */ memcpy_ext(pmadapter, &pmadapter->state_meas.meas_rpt_returned, pmeas_rpt, sizeof(pmadapter->state_meas.meas_rpt_returned), @@ -252,9 +249,9 @@ wlan_meas_cmdresp_get_report(mlan_private *pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static int -wlan_meas_cmd_request(mlan_private *pmpriv, - HostCmd_DS_COMMAND *pcmd_ptr, const void *pinfo_buf) +static int wlan_meas_cmd_request(mlan_private *pmpriv, + HostCmd_DS_COMMAND *pcmd_ptr, + const void *pinfo_buf) { const HostCmd_DS_MEASUREMENT_REQUEST *pmeas_req = (HostCmd_DS_MEASUREMENT_REQUEST *)pinfo_buf; @@ -268,9 +265,8 @@ wlan_meas_cmd_request(mlan_private *pmpriv, sizeof(pcmd_ptr->params.meas_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); @@ -293,8 +289,8 @@ wlan_meas_cmd_request(mlan_private *pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static int -wlan_meas_cmd_get_report(mlan_private *pmpriv, HostCmd_DS_COMMAND *pcmd_ptr) +static int wlan_meas_cmd_get_report(mlan_private *pmpriv, + HostCmd_DS_COMMAND *pcmd_ptr) { ENTER(); @@ -348,11 +344,11 @@ wlan_meas_cmd_get_report(mlan_private *pmpriv, HostCmd_DS_COMMAND *pcmd_ptr) * the timeout expires * - Error return from wlan_prepare_cmd routine otherwise */ -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) +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) { static t_u8 auto_dialog_tok; wlan_meas_state_t *pmeas_state = &pmpriv->adapter->state_meas; @@ -361,18 +357,19 @@ wlan_meas_util_send_req(mlan_private *pmpriv, 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); + 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); + 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 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; @@ -382,8 +379,8 @@ wlan_meas_util_send_req(mlan_private *pmpriv, /* 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); + HostCmd_ACT_GEN_SET, 0, (t_void *)pioctl_req, + (void *)pmeas_req); LEAVE(); return ret; @@ -407,9 +404,8 @@ wlan_meas_util_send_req(mlan_private *pmpriv, * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE * */ -int -wlan_meas_cmd_process(mlan_private *pmpriv, - HostCmd_DS_COMMAND *pcmd_ptr, const void *pinfo_buf) +int wlan_meas_cmd_process(mlan_private *pmpriv, HostCmd_DS_COMMAND *pcmd_ptr, + const void *pinfo_buf) { int ret = MLAN_STATUS_SUCCESS; @@ -446,8 +442,8 @@ wlan_meas_cmd_process(mlan_private *pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -int -wlan_meas_cmdresp_process(mlan_private *pmpriv, const HostCmd_DS_COMMAND *resp) +int wlan_meas_cmdresp_process(mlan_private *pmpriv, + const HostCmd_DS_COMMAND *resp) { int ret = MLAN_STATUS_SUCCESS; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_meas.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_meas.h index 9bd8075d5923..34262cfe22d0 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_meas.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_meas.h @@ -34,15 +34,14 @@ Change Log: #ifndef _MLAN_MEAS_H_ #define _MLAN_MEAS_H_ -#include "mlan_fw.h" +#include "mlan_fw.h" /* 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); +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); /* Setup a measurement command before it is sent to the firmware */ extern int wlan_meas_cmd_process(mlan_private *pmpriv, diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_misc.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_misc.c index e8c36f0d2bf3..4dde4f6ddf8a 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_misc.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_misc.c @@ -65,8 +65,7 @@ extern t_u8 ac_to_tid[4][2]; * * @return MTRUE/MFALSE; */ -t_u8 -wlan_pending_interrupt(pmlan_adapter pmadapter) +t_u8 wlan_pending_interrupt(pmlan_adapter pmadapter) { if (!IS_USB(pmadapter->card_type) && pmadapter->ireg) return MTRUE; @@ -75,13 +74,13 @@ wlan_pending_interrupt(pmlan_adapter pmadapter) #endif /** Custom IE auto index and mask */ -#define MLAN_CUSTOM_IE_AUTO_IDX_MASK 0xffff +#define MLAN_CUSTOM_IE_AUTO_IDX_MASK 0xffff /** Custom IE mask for delete operation */ -#define MLAN_CUSTOM_IE_DELETE_MASK 0 +#define MLAN_CUSTOM_IE_DELETE_MASK 0 /** Custom IE mask for create new index */ -#define MLAN_CUSTOM_IE_NEW_MASK 0x8000 +#define MLAN_CUSTOM_IE_NEW_MASK 0x8000 /** Custom IE header size */ -#define MLAN_CUSTOM_IE_HDR_SIZE (sizeof(custom_ie)-MAX_IE_SIZE) +#define MLAN_CUSTOM_IE_HDR_SIZE (sizeof(custom_ie) - MAX_IE_SIZE) /** * @brief Check if current custom IE index is used on other interfaces. @@ -91,8 +90,8 @@ wlan_pending_interrupt(pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS --unused, otherwise used. */ -static mlan_status -wlan_is_custom_ie_index_unused(IN pmlan_private pmpriv, IN t_u16 idx) +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; @@ -103,7 +102,6 @@ wlan_is_custom_ie_index_unused(IN pmlan_private pmpriv, IN t_u16 idx) 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 */ @@ -127,11 +125,11 @@ wlan_is_custom_ie_index_unused(IN pmlan_private pmpriv, IN t_u16 idx) * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -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) +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) { t_u16 index = 0, insert = MFALSE; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -139,9 +137,8 @@ wlan_custom_ioctl_get_autoidx(IN pmlan_private pmpriv, ENTER(); /* Determine the index where the IE needs to be inserted */ while (!insert) { - while (index < - MIN(pmpriv->adapter->max_mgmt_ie_index, - MAX_MGMT_IE_INDEX)) { + while (index < MIN(pmpriv->adapter->max_mgmt_ie_index, + MAX_MGMT_IE_INDEX)) { if (pmpriv->mgmt_ie[index].mgmt_subtype_mask == MLAN_CUSTOM_IE_AUTO_IDX_MASK) { index++; @@ -150,12 +147,12 @@ wlan_custom_ioctl_get_autoidx(IN pmlan_private pmpriv, 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)) { + 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); @@ -165,7 +162,8 @@ wlan_custom_ioctl_get_autoidx(IN pmlan_private pmpriv, } /* Check if enough space is available */ if (pmpriv->mgmt_ie[index].ie_length + - ie_data->ie_length > MAX_IE_SIZE) { + ie_data->ie_length > + MAX_IE_SIZE) { index++; continue; } @@ -177,7 +175,8 @@ wlan_custom_ioctl_get_autoidx(IN pmlan_private pmpriv, if (!insert) { for (index = 0; index < MIN(pmpriv->adapter->max_mgmt_ie_index, - MAX_MGMT_IE_INDEX); index++) { + MAX_MGMT_IE_INDEX); + index++) { if (pmpriv->mgmt_ie[index].ie_length == 0) { /* * Check if this index is in use @@ -185,8 +184,8 @@ wlan_custom_ioctl_get_autoidx(IN pmlan_private pmpriv, * move ahead to next index */ if (MLAN_STATUS_SUCCESS == - wlan_is_custom_ie_index_unused - (pmpriv, index)) { + wlan_is_custom_ie_index_unused( + pmpriv, index)) { insert = MTRUE; break; } else { @@ -223,10 +222,10 @@ done: * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -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) +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) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_adapter pmadapter = pmpriv->adapter; @@ -260,27 +259,28 @@ wlan_custom_ioctl_auto_delete(IN pmlan_private pmpriv, cnt, MAX_IE_SIZE); if (pmpriv->mgmt_ie[index].ie_length > (cnt + del_len)) - memcpy_ext(pmpriv->adapter, &ie[cnt], - &pmpriv->mgmt_ie[index]. - ie_buffer[MIN - ((MAX_IE_SIZE - 1), + memcpy_ext( + pmpriv->adapter, &ie[cnt], + &pmpriv->mgmt_ie[index].ie_buffer + [MIN((MAX_IE_SIZE - 1), (cnt + del_len))], - (pmpriv->mgmt_ie[index]. - ie_length - (cnt + - del_len)), - MAX_IE_SIZE - cnt); + (pmpriv->mgmt_ie[index] + .ie_length - + (cnt + del_len)), + MAX_IE_SIZE - cnt); memset(pmpriv->adapter, &pmpriv->mgmt_ie[index].ie_buffer, 0, - sizeof(pmpriv->mgmt_ie[index]. - ie_buffer)); + sizeof(pmpriv->mgmt_ie[index].ie_buffer)); memcpy_ext(pmpriv->adapter, &pmpriv->mgmt_ie[index].ie_buffer, ie, pmpriv->mgmt_ie[index].ie_length - - del_len, MAX_IE_SIZE); + del_len, + MAX_IE_SIZE); pmpriv->mgmt_ie[index].ie_length -= del_len; if (MLAN_CUSTOM_IE_AUTO_IDX_MASK == idx) - /* set a bit to indicate caller about update */ + /* set a bit to indicate caller about + * update */ ie_data->ie_index |= (((t_u16)1) << index); insert = MTRUE; @@ -318,9 +318,8 @@ wlan_custom_ioctl_auto_delete(IN pmlan_private pmpriv, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_host_cmd(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_host_cmd(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]; @@ -331,11 +330,7 @@ wlan_misc_ioctl_host_cmd(IN pmlan_adapter pmadapter, misc = (mlan_ds_misc_cfg *)pioctl_req->pbuf; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - 0, - 0, - 0, - (t_void *)pioctl_req, + 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; @@ -352,9 +347,8 @@ wlan_misc_ioctl_host_cmd(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_init_shutdown(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_init_shutdown(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -376,10 +370,8 @@ wlan_misc_ioctl_init_shutdown(IN pmlan_adapter pmadapter, } /* Send command to firmware */ - ret = wlan_prepare_cmd(pmpriv, - cmd, - HostCmd_ACT_GEN_SET, - 0, (t_void *)pioctl_req, MNULL); + 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; @@ -397,9 +389,8 @@ exit: * * @return MLAN_STATUS_SUCCESS --success */ -mlan_status -wlan_get_info_debug_info(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_get_info_debug_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; @@ -415,21 +406,17 @@ wlan_get_info_debug_info(IN pmlan_adapter pmadapter, if (pioctl_req->action == MLAN_ACT_GET) { ptid = ac_to_tid[WMM_AC_BK]; - debug_info->wmm_ac_bk = - pmpriv->wmm.packets_out[ptid[0]] + - pmpriv->wmm.packets_out[ptid[1]]; + debug_info->wmm_ac_bk = pmpriv->wmm.packets_out[ptid[0]] + + pmpriv->wmm.packets_out[ptid[1]]; ptid = ac_to_tid[WMM_AC_BE]; - debug_info->wmm_ac_be = - pmpriv->wmm.packets_out[ptid[0]] + - pmpriv->wmm.packets_out[ptid[1]]; + debug_info->wmm_ac_be = pmpriv->wmm.packets_out[ptid[0]] + + pmpriv->wmm.packets_out[ptid[1]]; ptid = ac_to_tid[WMM_AC_VI]; - debug_info->wmm_ac_vi = - pmpriv->wmm.packets_out[ptid[0]] + - pmpriv->wmm.packets_out[ptid[1]]; + debug_info->wmm_ac_vi = pmpriv->wmm.packets_out[ptid[0]] + + pmpriv->wmm.packets_out[ptid[1]]; ptid = ac_to_tid[WMM_AC_VO]; - debug_info->wmm_ac_vo = - pmpriv->wmm.packets_out[ptid[0]] + - pmpriv->wmm.packets_out[ptid[1]]; + debug_info->wmm_ac_vo = pmpriv->wmm.packets_out[ptid[0]] + + pmpriv->wmm.packets_out[ptid[1]]; debug_info->max_tx_buf_size = (t_u32)pmadapter->max_tx_buf_size; debug_info->tx_buf_size = (t_u32)pmadapter->tx_buf_size; debug_info->curr_tx_buf_size = @@ -462,12 +449,12 @@ wlan_get_info_debug_info(IN pmlan_adapter pmadapter, debug_info->main_lock_flag = pmadapter->main_lock_flag; debug_info->main_process_cnt = pmadapter->main_process_cnt; debug_info->delay_task_flag = pmadapter->delay_task_flag; - debug_info->num_cmd_host_to_card_failure - = pmadapter->dbg.num_cmd_host_to_card_failure; - debug_info->num_cmd_sleep_cfm_host_to_card_failure - = pmadapter->dbg.num_cmd_sleep_cfm_host_to_card_failure; - debug_info->num_tx_host_to_card_failure - = pmadapter->dbg.num_tx_host_to_card_failure; + debug_info->num_cmd_host_to_card_failure = + pmadapter->dbg.num_cmd_host_to_card_failure; + debug_info->num_cmd_sleep_cfm_host_to_card_failure = + pmadapter->dbg.num_cmd_sleep_cfm_host_to_card_failure; + debug_info->num_tx_host_to_card_failure = + pmadapter->dbg.num_tx_host_to_card_failure; debug_info->num_alloc_buffer_failure = pmadapter->dbg.num_alloc_buffer_failure; debug_info->num_pkt_dropped = pmadapter->dbg.num_pkt_dropped; @@ -507,13 +494,14 @@ wlan_get_info_debug_info(IN pmlan_adapter pmadapter, debug_info->last_event_index = pmadapter->dbg.last_event_index; debug_info->num_no_cmd_node = pmadapter->dbg.num_no_cmd_node; debug_info->pending_cmd = - (pmadapter->curr_cmd) ? pmadapter->dbg. - last_cmd_id[pmadapter->dbg.last_cmd_index] : 0; + (pmadapter->curr_cmd) ? + pmadapter->dbg.last_cmd_id + [pmadapter->dbg.last_cmd_index] : + 0; debug_info->dnld_cmd_in_secs = pmadapter->dnld_cmd_in_secs; #ifdef SDIO if (IS_SD(pmadapter->card_type)) { - debug_info->num_cmdevt_card_to_host_failure - = + debug_info->num_cmdevt_card_to_host_failure = pmadapter->dbg.num_cmdevt_card_to_host_failure; debug_info->num_rx_card_to_host_failure = pmadapter->dbg.num_rx_card_to_host_failure; @@ -549,16 +537,16 @@ wlan_get_info_debug_info(IN pmlan_adapter pmadapter, pmadapter->pcard_sd->last_recv_wr_bitmap; debug_info->last_mp_index = pmadapter->pcard_sd->last_mp_index; - memcpy_ext(pmadapter, debug_info->last_mp_wr_bitmap, - pmadapter->pcard_sd->last_mp_wr_bitmap, - sizeof(pmadapter->pcard_sd-> - last_mp_wr_bitmap), - sizeof(debug_info->last_mp_wr_bitmap)); - memcpy_ext(pmadapter, debug_info->last_mp_wr_ports, - pmadapter->pcard_sd->last_mp_wr_ports, - sizeof(pmadapter->pcard_sd-> - last_mp_wr_ports), - sizeof(debug_info->last_mp_wr_ports)); + memcpy_ext( + pmadapter, debug_info->last_mp_wr_bitmap, + pmadapter->pcard_sd->last_mp_wr_bitmap, + sizeof(pmadapter->pcard_sd->last_mp_wr_bitmap), + sizeof(debug_info->last_mp_wr_bitmap)); + memcpy_ext( + pmadapter, debug_info->last_mp_wr_ports, + pmadapter->pcard_sd->last_mp_wr_ports, + sizeof(pmadapter->pcard_sd->last_mp_wr_ports), + sizeof(debug_info->last_mp_wr_ports)); memcpy_ext(pmadapter, debug_info->last_mp_wr_len, pmadapter->pcard_sd->last_mp_wr_len, sizeof(pmadapter->pcard_sd->last_mp_wr_len), @@ -567,11 +555,11 @@ wlan_get_info_debug_info(IN pmlan_adapter pmadapter, pmadapter->pcard_sd->last_mp_wr_info, sizeof(pmadapter->pcard_sd->last_mp_wr_info), sizeof(debug_info->last_mp_wr_info)); - memcpy_ext(pmadapter, debug_info->last_curr_wr_port, - pmadapter->pcard_sd->last_curr_wr_port, - sizeof(pmadapter->pcard_sd-> - last_curr_wr_port), - sizeof(debug_info->last_curr_wr_port)); + memcpy_ext( + pmadapter, debug_info->last_curr_wr_port, + pmadapter->pcard_sd->last_curr_wr_port, + sizeof(pmadapter->pcard_sd->last_curr_wr_port), + sizeof(debug_info->last_curr_wr_port)); debug_info->mpa_buf = pmadapter->pcard_sd->mpa_buf; debug_info->mpa_buf_size = pmadapter->pcard_sd->mpa_buf_size; @@ -611,11 +599,11 @@ wlan_get_info_debug_info(IN pmlan_adapter pmadapter, pmadapter->pcard_pcie->evtbd_ring_vbase; debug_info->evtbd_ring_size = pmadapter->pcard_pcie->evtbd_ring_size; - memcpy_ext(pmadapter, debug_info->last_tx_pkt_size, - pmadapter->pcard_pcie->last_tx_pkt_size, - sizeof(pmadapter->pcard_pcie-> - last_tx_pkt_size), - sizeof(debug_info->last_tx_pkt_size)); + memcpy_ext( + pmadapter, debug_info->last_tx_pkt_size, + pmadapter->pcard_pcie->last_tx_pkt_size, + sizeof(pmadapter->pcard_pcie->last_tx_pkt_size), + sizeof(debug_info->last_tx_pkt_size)); } #endif debug_info->data_sent = pmadapter->data_sent; @@ -661,9 +649,8 @@ wlan_get_info_debug_info(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING -- success, otherwise fail */ -mlan_status -wlan_misc_ioctl_mac_control(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_mac_control(IN pmlan_adapter pmadapter, + 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; @@ -681,10 +668,8 @@ wlan_misc_ioctl_mac_control(IN pmlan_adapter pmadapter, 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, + 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) @@ -701,8 +686,7 @@ wlan_misc_ioctl_mac_control(IN pmlan_adapter pmadapter, * @param function_context A pointer to function_context * @return N/A */ -t_void -wlan_wakeup_card_timeout_func(void *function_context) +t_void wlan_wakeup_card_timeout_func(void *function_context) { pmlan_adapter pmadapter = (pmlan_adapter)function_context; @@ -726,10 +710,11 @@ wlan_wakeup_card_timeout_func(void *function_context) * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -mlan_status -wlan_pm_ioctl_hscfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -764,18 +749,17 @@ wlan_pm_ioctl_hscfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) pm->param.hs_cfg.conditions; } else if (pmadapter->hs_cfg.conditions == HOST_SLEEP_CFG_CANCEL) { - /* Return failure if no parameters for HS enable */ + /* 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)); + 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 == @@ -836,10 +820,11 @@ wlan_pm_ioctl_hscfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -mlan_status -wlan_misc_robustcoex(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_robustcoex(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -854,11 +839,8 @@ wlan_misc_robustcoex(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) else cmd_action = HostCmd_ACT_GEN_GET; - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_ROBUSTCOEX, - cmd_action, - 0, - (t_void *)pioctl_req, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_ROBUSTCOEX, + cmd_action, 0, (t_void *)pioctl_req, &robust_coex_cfg->param.robustcoexparams); if (ret == MLAN_STATUS_SUCCESS) @@ -875,8 +857,8 @@ wlan_misc_robustcoex(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_dmcs_config(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_dmcs_config(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -890,10 +872,7 @@ wlan_misc_dmcs_config(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) else cmd_action = HostCmd_ACT_GEN_GET; - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_DMCS_CONFIG, - cmd_action, - 0, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_DMCS_CONFIG, cmd_action, 0, (t_void *)pioctl_req, &dmcs_cfg->param.dmcs_policy); @@ -910,10 +889,11 @@ wlan_misc_dmcs_config(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -mlan_status -wlan_misc_ssu(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ssu(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -929,10 +909,7 @@ wlan_misc_ssu(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) else if (pioctl_req->action == MLAN_ACT_GET) cmd_action = HostCmd_ACT_GEN_GET; - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_SSU, - cmd_action, - 0, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_SSU, cmd_action, 0, (t_void *)pioctl_req, &ssu_cfg->param.ssu_params); @@ -952,9 +929,8 @@ wlan_misc_ssu(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * @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) +pmlan_buffer wlan_alloc_mlan_buffer(mlan_adapter *pmadapter, t_u32 data_len, + t_u32 head_room, t_u32 malloc_flag) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_buffer pmbuf = MNULL; @@ -967,9 +943,8 @@ wlan_alloc_mlan_buffer(mlan_adapter *pmadapter, t_u32 data_len, t_u32 head_room, #ifdef SDIO /* make sure that the data length is at least SDIO block size */ if (IS_SD(pmadapter->card_type)) - data_len = - (data_len + MLAN_SDIO_BLOCK_SIZE - - 1) / MLAN_SDIO_BLOCK_SIZE * MLAN_SDIO_BLOCK_SIZE; + data_len = (data_len + MLAN_SDIO_BLOCK_SIZE - 1) / + MLAN_SDIO_BLOCK_SIZE * MLAN_SDIO_BLOCK_SIZE; #endif /* head_room is not implemented for malloc mlan buffer */ @@ -988,9 +963,8 @@ wlan_alloc_mlan_buffer(mlan_adapter *pmadapter, t_u32 data_len, t_u32 head_room, pmbuf->pdesc = MNULL; /* Align address */ - pmbuf->pbuf = - (t_u8 *)ALIGN_ADDR((t_u8 *)pmbuf + sizeof(mlan_buffer), - DMA_ALIGNMENT); + 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; @@ -998,17 +972,16 @@ wlan_alloc_mlan_buffer(mlan_adapter *pmadapter, t_u32 data_len, t_u32 head_room, 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); + 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); + 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; @@ -1029,20 +1002,18 @@ exit: * * @return N/A */ -t_void -wlan_free_mlan_buffer(mlan_adapter *pmadapter, pmlan_buffer pmbuf) +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) - util_scalar_decrement(pmadapter->pmoal_handle, - &pmadapter->pending_bridge_pkts, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock); + util_scalar_decrement( + pmadapter->pmoal_handle, + &pmadapter->pending_bridge_pkts, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); if (pmbuf->flags & MLAN_BUF_FLAG_MALLOC_BUF) pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *)pmbuf); else @@ -1063,8 +1034,7 @@ wlan_free_mlan_buffer(mlan_adapter *pmadapter, pmlan_buffer pmbuf) * * @return N/A */ -t_void -wlan_delay_func(mlan_adapter *pmadapter, t_u32 delay, t_delay_unit u) +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; @@ -1079,7 +1049,6 @@ wlan_delay_func(mlan_adapter *pmadapter, t_u32 delay, t_delay_unit u) delay *= 1000; pcb->moal_udelay(pmadapter->pmoal_handle, delay); } else { - pcb->moal_get_system_time(pmadapter->pmoal_handle, &upto_tv_sec, &upto_tv_usec); @@ -1124,9 +1093,8 @@ wlan_delay_func(mlan_adapter *pmadapter, t_u32 delay, t_delay_unit u) * * @return MLAN_STATUS_PENDING --success, MLAN_STATUS_FAILURE */ -mlan_status -wlan_bss_ioctl_bss_remove(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_bss_ioctl_bss_remove(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { ENTER(); wlan_cancel_bss_pending_cmd(pmadapter, pioctl_req->bss_index); @@ -1143,9 +1111,8 @@ wlan_bss_ioctl_bss_remove(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, MLAN_STATUS_FAILURE */ -mlan_status -wlan_bss_ioctl_bss_role(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_bss_ioctl_bss_role(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_bss *bss = MNULL; @@ -1177,16 +1144,11 @@ wlan_bss_ioctl_bss_role(IN pmlan_adapter pmadapter, #ifdef USB if (IS_USB(pmadapter->card_type)) { - while ((pmbuf = - (pmlan_buffer)util_dequeue_list(pmadapter-> - pmoal_handle, - &pmadapter-> - rx_data_queue, - pcb-> - moal_spin_lock, - pcb-> - moal_spin_unlock))) - { + while ((pmbuf = (pmlan_buffer)util_dequeue_list( + pmadapter->pmoal_handle, + &pmadapter->rx_data_queue, + pcb->moal_spin_lock, + pcb->moal_spin_unlock))) { pcb->moal_recv_complete(pmadapter->pmoal_handle, pmbuf, pmadapter->rx_data_ep, @@ -1214,22 +1176,24 @@ wlan_bss_ioctl_bss_role(IN pmlan_adapter pmadapter, for (i = 0; i < pmadapter->priv_num; i++) { if (pmadapter->priv[i] && GET_BSS_ROLE(pmadapter->priv[i]) == - MLAN_BSS_ROLE_STA) + 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)) { + 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)) { + 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; @@ -1278,10 +1242,9 @@ done: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_custom_ie_list(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req, - IN t_bool send_ioctl) +mlan_status wlan_misc_ioctl_custom_ie_list(IN pmlan_adapter pmadapter, + 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; @@ -1309,8 +1272,8 @@ wlan_misc_ioctl_custom_ie_list(IN pmlan_adapter pmadapter, misc->param.cust_ie.len = 0; while (ioctl_len > 0) { - ie_data = (custom_ie *)(((t_u8 *)&misc->param.cust_ie) - + app_data_len); + 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 += @@ -1323,99 +1286,78 @@ wlan_misc_ioctl_custom_ie_list(IN pmlan_adapter pmadapter, if (MLAN_CUSTOM_IE_AUTO_IDX_MASK == index) { /* Automatic Deletion */ if (mask == MLAN_CUSTOM_IE_DELETE_MASK) { - ret = wlan_custom_ioctl_auto_delete - (pmpriv, pioctl_req, ie_data, - index); - /* if IE to delete is not found, return error */ + 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); + 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 */ + /* Check if index is updated + * before sending to FW */ if (index & ((t_u16)1) << i) { - memcpy_ext(pmadapter, - (t_u8 *) - ie_data + - len, &i, - sizeof - (ie_data-> - ie_index), - sizeof - (ie_data-> - ie_index)); - len += sizeof(ie_data-> - ie_index); - memcpy_ext(pmadapter, - (t_u8 *) - ie_data + - len, - &pmpriv-> - mgmt_ie[i]. - mgmt_subtype_mask, - sizeof - (ie_data-> - mgmt_subtype_mask), - sizeof - (ie_data-> - mgmt_subtype_mask)); - len += sizeof(ie_data-> - mgmt_subtype_mask); - memcpy_ext(pmadapter, - (t_u8 *) - ie_data + - len, - &pmpriv-> - mgmt_ie[i]. - ie_length, - sizeof - (ie_data-> - ie_length), - sizeof - (ie_data-> - ie_length)); - len += sizeof(ie_data-> - ie_length); - if (pmpriv->mgmt_ie[i]. - ie_length) { - memcpy_ext - (pmadapter, - (t_u8 - *) - ie_data - + len, - &pmpriv-> - mgmt_ie - [i]. - ie_buffer, - pmpriv-> - mgmt_ie - [i]. - ie_length, - pmpriv-> - mgmt_ie - [i]. - ie_length); - len += pmpriv-> - mgmt_ie - [i]. - ie_length; + memcpy_ext( + pmadapter, + (t_u8 *)ie_data + + len, + &i, + sizeof(ie_data->ie_index), + sizeof(ie_data->ie_index)); + len += sizeof( + ie_data->ie_index); + memcpy_ext( + pmadapter, + (t_u8 *)ie_data + + len, + &pmpriv->mgmt_ie[i] + .mgmt_subtype_mask, + sizeof(ie_data->mgmt_subtype_mask), + sizeof(ie_data->mgmt_subtype_mask)); + len += sizeof( + ie_data->mgmt_subtype_mask); + memcpy_ext( + pmadapter, + (t_u8 *)ie_data + + len, + &pmpriv->mgmt_ie[i] + .ie_length, + sizeof(ie_data->ie_length), + sizeof(ie_data->ie_length)); + len += sizeof( + ie_data->ie_length); + if (pmpriv->mgmt_ie[i] + .ie_length) { + memcpy_ext( + pmadapter, + (t_u8 *)ie_data + + len, + &pmpriv->mgmt_ie[i] + .ie_buffer, + pmpriv->mgmt_ie[i] + .ie_length, + 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 */ + } else { /* Automatic Addition */ if (MLAN_STATUS_FAILURE == - wlan_custom_ioctl_get_autoidx - (pmpriv, pioctl_req, mask, ie_data, - &index)) { + 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; @@ -1423,41 +1365,40 @@ wlan_misc_ioctl_custom_ie_list(IN pmlan_adapter pmadapter, } mask &= ~MLAN_CUSTOM_IE_NEW_MASK; if (MLAN_CUSTOM_IE_AUTO_IDX_MASK == - index || + index || index >= MAX_MGMT_IE_INDEX) { ret = MLAN_STATUS_SUCCESS; goto done; } - tmp_ie = (t_u8 *)&pmpriv-> - mgmt_ie[index].ie_buffer; - memcpy_ext(pmadapter, - tmp_ie + - pmpriv->mgmt_ie[index]. - ie_length, - &ie_data->ie_buffer, - ie_data->ie_length, - ie_data->ie_length); + tmp_ie = (t_u8 *)&pmpriv->mgmt_ie[index] + .ie_buffer; + memcpy_ext( + pmadapter, + tmp_ie + pmpriv->mgmt_ie[index] + .ie_length, + &ie_data->ie_buffer, + ie_data->ie_length, + 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; + 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_ext(pmadapter, - &ie_data->ie_buffer, - &pmpriv->mgmt_ie[index]. - ie_buffer, - pmpriv->mgmt_ie[index]. - ie_length, MAX_IE_SIZE); + pmpriv->mgmt_ie[index].ie_length; + memcpy_ext( + pmadapter, &ie_data->ie_buffer, + &pmpriv->mgmt_ie[index] + .ie_buffer, + pmpriv->mgmt_ie[index].ie_length, + MAX_IE_SIZE); misc->param.cust_ie.len += - pmpriv->mgmt_ie[index]. - ie_length + + pmpriv->mgmt_ie[index] + .ie_length + MLAN_CUSTOM_IE_HDR_SIZE; } } else { @@ -1471,34 +1412,34 @@ wlan_misc_ioctl_custom_ie_list(IN pmlan_adapter pmadapter, } /* Set/Clear the IE and save it */ if (ie_data->mgmt_subtype_mask == - MLAN_CUSTOM_IE_DELETE_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 */ + 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_ext(pmadapter, (t_u8 *)ie_data, - &pmpriv->mgmt_ie[index], - pmpriv->mgmt_ie[index]. - ie_length + - MLAN_CUSTOM_IE_HDR_SIZE, - pmpriv->mgmt_ie[index]. - ie_length + - MLAN_CUSTOM_IE_HDR_SIZE); + MAX_MGMT_IE_INDEX_TO_FW); + memcpy_ext( + pmadapter, (t_u8 *)ie_data, + &pmpriv->mgmt_ie[index], + pmpriv->mgmt_ie[index].ie_length + + MLAN_CUSTOM_IE_HDR_SIZE, + 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); + ret = wlan_is_custom_ie_index_unused( + pmpriv, index); if (ret == MLAN_STATUS_FAILURE) { PRINTM(MERROR, "IE index is used by other interface.\n"); @@ -1514,33 +1455,37 @@ wlan_misc_ioctl_custom_ie_list(IN pmlan_adapter pmadapter, 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) && + 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, + pmpriv->mgmt_ie[index] + .ie_buffer, ie_data->ie_buffer, - ie_data-> - ie_length)) { + ie_data->ie_length)) { PRINTM(MIOCTL, "same custom ie already configured!\n"); if (ioctl_len <= 0 && - misc->param.cust_ie. - len == 0) { + misc->param.cust_ie + .len == + 0) { goto done; } else { - /* remove matching IE from app buffer */ + /* remove + * matching IE + * from app + * buffer */ app_data_len -= - ie_data-> - ie_length - + + 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); + memmove(pmadapter, + (t_u8 *)ie_data, + ie_data->ie_buffer + + ie_data->ie_length, + ioctl_len); continue; } } @@ -1565,23 +1510,17 @@ wlan_misc_ioctl_custom_ie_list(IN pmlan_adapter pmadapter, /* 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); + 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); + 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) @@ -1599,9 +1538,8 @@ done: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_reg_mem_ioctl_reg_rw(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_reg_mem_ioctl_reg_rw(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_reg_mem *reg_mem = MNULL; @@ -1618,19 +1556,22 @@ wlan_reg_mem_ioctl_reg_rw(IN pmlan_adapter pmadapter, switch (reg_mem->param.reg_rw.type) { case MLAN_REG_MAC: -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(USB9097) || defined(SD9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(USB9097) || defined(SD9097) case MLAN_REG_MAC2: #endif cmd_no = HostCmd_CMD_MAC_REG_ACCESS; break; case MLAN_REG_BBP: -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(USB9097) || defined(SD9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(USB9097) || defined(SD9097) case MLAN_REG_BBP2: #endif cmd_no = HostCmd_CMD_BBP_REG_ACCESS; break; case MLAN_REG_RF: -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(USB9097) || defined(SD9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(USB9097) || defined(SD9097) case MLAN_REG_RF2: #endif cmd_no = HostCmd_CMD_RF_REG_ACCESS; @@ -1648,8 +1589,8 @@ wlan_reg_mem_ioctl_reg_rw(IN pmlan_adapter pmadapter, } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, cmd_no, cmd_action, - 0, (t_void *)pioctl_req, + ret = wlan_prepare_cmd(pmpriv, cmd_no, cmd_action, 0, + (t_void *)pioctl_req, (t_void *)®_mem->param.reg_rw); if (ret == MLAN_STATUS_SUCCESS) @@ -1668,9 +1609,8 @@ exit: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_reg_mem_ioctl_read_eeprom(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_reg_mem_ioctl_read_eeprom(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_reg_mem *reg_mem = MNULL; @@ -1684,8 +1624,7 @@ wlan_reg_mem_ioctl_read_eeprom(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_GET; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_EEPROM_ACCESS, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_EEPROM_ACCESS, cmd_action, 0, (t_void *)pioctl_req, (t_void *)®_mem->param.rd_eeprom); @@ -1704,9 +1643,8 @@ wlan_reg_mem_ioctl_read_eeprom(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_reg_mem_ioctl_mem_rw(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_reg_mem_ioctl_mem_rw(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_reg_mem *reg_mem = MNULL; @@ -1722,9 +1660,7 @@ wlan_reg_mem_ioctl_mem_rw(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_SET; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_MEM_ACCESS, - cmd_action, 0, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_MEM_ACCESS, cmd_action, 0, (t_void *)pioctl_req, (t_void *)®_mem->param.mem_rw); @@ -1742,12 +1678,10 @@ wlan_reg_mem_ioctl_mem_rw(IN pmlan_adapter pmadapter, * * @return MFALSE/MTRUE */ -t_u8 -wlan_is_station_list_empty(mlan_private *priv) +t_u8 wlan_is_station_list_empty(mlan_private *priv) { ENTER(); - if (!(util_peek_list(priv->adapter->pmoal_handle, - &priv->sta_list, + if (!(util_peek_list(priv->adapter->pmoal_handle, &priv->sta_list, priv->adapter->callbacks.moal_spin_lock, priv->adapter->callbacks.moal_spin_unlock))) { LEAVE(); @@ -1758,16 +1692,15 @@ wlan_is_station_list_empty(mlan_private *priv) } /** - * @brief This function will return the pointer to station entry in station list - * table which matches the give mac address + * @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 * * @return A pointer to structure sta_node */ -sta_node * -wlan_get_station_entry(mlan_private *priv, t_u8 *mac) +sta_node *wlan_get_station_entry(mlan_private *priv, t_u8 *mac) { sta_node *sta_ptr; @@ -1777,17 +1710,14 @@ wlan_get_station_entry(mlan_private *priv, t_u8 *mac) LEAVE(); return MNULL; } - 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); + 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); while (sta_ptr && (sta_ptr != (sta_node *)&priv->sta_list)) { - if (!memcmp - (priv->adapter, sta_ptr->mac_addr, mac, - MLAN_MAC_ADDR_LENGTH)) { + if (!memcmp(priv->adapter, sta_ptr->mac_addr, mac, + MLAN_MAC_ADDR_LENGTH)) { LEAVE(); return sta_ptr; } @@ -1806,8 +1736,7 @@ wlan_get_station_entry(mlan_private *priv, t_u8 *mac) * * @return A pointer to structure sta_node */ -sta_node * -wlan_add_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; @@ -1819,13 +1748,12 @@ wlan_add_station_entry(mlan_private *priv, t_u8 *mac) 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)) { + 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"); - 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(); return MNULL; } @@ -1858,8 +1786,7 @@ done: * * @return N/A */ -t_void -wlan_delete_station_entry(mlan_private *priv, t_u8 *mac) +t_void wlan_delete_station_entry(mlan_private *priv, t_u8 *mac) { sta_node *sta_ptr = MNULL; mlan_adapter *pmadapter = priv->adapter; @@ -1894,19 +1821,15 @@ wlan_delete_station_entry(mlan_private *priv, t_u8 *mac) * * @return N/A */ -t_void -wlan_delete_station_list(pmlan_private priv) +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))) { + 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))) { #ifdef DRV_EMBEDDED_AUTHENTICATOR if ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) && IsAuthenticatorEnabled(priv->psapriv)) @@ -1928,9 +1851,8 @@ wlan_delete_station_list(pmlan_private priv) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_radio_ioctl_mimo_switch_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_radio_ioctl_mimo_switch_cfg(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_radio_cfg *radio_cfg = (mlan_ds_radio_cfg *)pioctl_req->pbuf; @@ -1939,10 +1861,7 @@ wlan_radio_ioctl_mimo_switch_cfg(IN pmlan_adapter pmadapter, ENTER(); /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_MIMO_SWITCH, - 0, - 0, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_MIMO_SWITCH, 0, 0, (t_void *)pioctl_req, &(radio_cfg->param.mimo_switch_cfg)); @@ -1961,8 +1880,8 @@ wlan_radio_ioctl_mimo_switch_cfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_get_info_ver_ext(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -1971,11 +1890,8 @@ wlan_get_info_ver_ext(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) ENTER(); /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_VERSION_EXT, - HostCmd_ACT_GEN_GET, - 0, - (t_void *)pioctl_req, + 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) @@ -1994,10 +1910,9 @@ wlan_get_info_ver_ext(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return N/A */ -t_void -wlan_fill_hal_wifi_rate_in_host(IN pmlan_private pmpriv, - OUT wifi_rate_stat rateStats[], - OUT t_u32 *pnumRate) +t_void wlan_fill_hal_wifi_rate_in_host(IN pmlan_private pmpriv, + OUT wifi_rate_stat rateStats[], + OUT t_u32 *pnumRate) { t_u32 total_num_rate = 0; t_u32 mcs_idx = 0; @@ -2014,12 +1929,12 @@ wlan_fill_hal_wifi_rate_in_host(IN pmlan_private pmpriv, rateStats[total_num_rate].rate.bw = 0; rateStats[total_num_rate].rate.rateMcsIdx = mcs_idx; index = rateStats[total_num_rate].rate.rateMcsIdx; - rate_info = - MLAN_RATE_FORMAT_HT | (rateStats[total_num_rate].rate. - bw << 2); + rate_info = MLAN_RATE_FORMAT_HT | + (rateStats[total_num_rate].rate.bw << 2); rateStats[total_num_rate].rate.bitrate = wlan_index_to_data_rate(pmpriv->adapter, index, - rate_info, 0) * 5; + rate_info, 0) * + 5; PRINTM(MINFO, "HT[%d] index=0x%x rate_info=0x%x bitrate=0x%x\n", total_num_rate, index, rate_info, rateStats[total_num_rate].rate.bitrate / 5); @@ -2047,14 +1962,14 @@ wlan_fill_hal_wifi_rate_in_host(IN pmlan_private pmpriv, rateStats[total_num_rate].rate.bw = 0; rateStats[total_num_rate].rate.rateMcsIdx = mcs_idx; /* nss 2 ? bw 20MHZ ? */ - index = rateStats[total_num_rate].rate. - rateMcsIdx | (rateStats[total_num_rate].rate.nss << 4); - rate_info = - MLAN_RATE_FORMAT_VHT | (rateStats[total_num_rate].rate. - bw << 2); + index = rateStats[total_num_rate].rate.rateMcsIdx | + (rateStats[total_num_rate].rate.nss << 4); + rate_info = MLAN_RATE_FORMAT_VHT | + (rateStats[total_num_rate].rate.bw << 2); rateStats[total_num_rate].rate.bitrate = wlan_index_to_data_rate(pmpriv->adapter, index, - rate_info, 0) * 5; + rate_info, 0) * + 5; PRINTM(MINFO, "VHT[%d] index=0x%x rate_info=0x%x bitrate=0x%x\n", total_num_rate, index, rate_info, @@ -2080,14 +1995,14 @@ wlan_fill_hal_wifi_rate_in_host(IN pmlan_private pmpriv, /** * @brief This function fill link layer statistic from firmware * - * @param priv A pointer to mlan_private structure + * @param priv A pointer to + * mlan_private structure * @param link_statistic_ioctl_buf, A pointer to fill ioctl buffer * * @return MLAN_STATUS_SUCCESS */ -static void -wlan_fill_link_statistic_in_host(mlan_private *priv, - char *link_statistic_ioctl_buf) +static void wlan_fill_link_statistic_in_host(mlan_private *priv, + char *link_statistic_ioctl_buf) { char *link_statistic = link_statistic_ioctl_buf; wifi_radio_stat *radio_stat = MNULL; @@ -2107,7 +2022,7 @@ wlan_fill_link_statistic_in_host(mlan_private *priv, /* Fill radio stats array */ for (i = 0; i < num_radio; i++) { - radio_stat = (wifi_radio_stat *) link_statistic; + radio_stat = (wifi_radio_stat *)link_statistic; link_statistic += sizeof(wifi_radio_stat); radio_stat->radio = 0xF0; @@ -2136,46 +2051,44 @@ wlan_fill_link_statistic_in_host(mlan_private *priv, if (priv->bss_role == MLAN_BSS_ROLE_STA) { if (priv->media_connected) { - radio_stat->channels[chan_idx].channel. - width = - priv->curr_bss_params. - bss_descriptor.curr_bandwidth; - radio_stat->channels[chan_idx].channel. - center_freq = - priv->curr_bss_params. - bss_descriptor.freq; - radio_stat->channels[chan_idx].channel. - center_freq0 = 0; - radio_stat->channels[chan_idx].channel. - center_freq1 = 0; + radio_stat->channels[chan_idx] + .channel.width = + priv->curr_bss_params + .bss_descriptor + .curr_bandwidth; + radio_stat->channels[chan_idx] + .channel.center_freq = + priv->curr_bss_params + .bss_descriptor.freq; + radio_stat->channels[chan_idx] + .channel.center_freq0 = 0; + radio_stat->channels[chan_idx] + .channel.center_freq1 = 0; } } else { radio_stat->channels[chan_idx].channel.width = - priv->uap_state_chan_cb.bandcfg. - chanWidth; - radio_stat->channels[chan_idx].channel. - center_freq = - wlan_11d_chan_2_freq(priv->adapter, - priv-> - uap_state_chan_cb. - channel, - (priv-> - uap_state_chan_cb. - channel > - 14) ? BAND_A : - BAND_G); - radio_stat->channels[chan_idx].channel. - center_freq0 = 0; - radio_stat->channels[chan_idx].channel. - center_freq1 = 0; + priv->uap_state_chan_cb.bandcfg + .chanWidth; + radio_stat->channels[chan_idx] + .channel + .center_freq = wlan_11d_chan_2_freq( + priv->adapter, + priv->uap_state_chan_cb.channel, + (priv->uap_state_chan_cb.channel > 14) ? + BAND_A : + BAND_G); + radio_stat->channels[chan_idx] + .channel.center_freq0 = 0; + radio_stat->channels[chan_idx] + .channel.center_freq1 = 0; } radio_stat->channels[chan_idx].on_time = 0xE3; radio_stat->channels[chan_idx].cca_busy_time = 0xE4; } } - /* Fill iface stats */ - iface_stat = (wifi_iface_stat *) link_statistic; + /* Fill iface stats*/ + iface_stat = (wifi_iface_stat *)link_statistic; /* get wifi_interface_link_layer_info in driver, not in firmware */ if (priv->bss_role == MLAN_BSS_ROLE_STA) { @@ -2224,9 +2137,8 @@ wlan_fill_link_statistic_in_host(mlan_private *priv, for (i = WMM_AC_BK; i <= WMM_AC_VO; i++) { iface_stat->ac[i].ac = i; ptid = ac_to_tid[i]; - iface_stat->ac[i].tx_mpdu = - priv->wmm.packets_out[ptid[0]] + - priv->wmm.packets_out[ptid[1]]; + iface_stat->ac[i].tx_mpdu = priv->wmm.packets_out[ptid[0]] + + priv->wmm.packets_out[ptid[1]]; iface_stat->ac[i].rx_mpdu = 0; iface_stat->ac[i].tx_mcast = 0; iface_stat->ac[i].rx_mcast = 0; @@ -2246,49 +2158,41 @@ wlan_fill_link_statistic_in_host(mlan_private *priv, if (priv->bss_role == MLAN_BSS_ROLE_STA) { if (priv->media_connected) { iface_stat->peer_info[0].type = WIFI_PEER_AP; - memcpy_ext(priv->adapter, - iface_stat->peer_info[0].peer_mac_address, - priv->curr_bss_params.bss_descriptor. - mac_address, MLAN_MAC_ADDR_LENGTH, - MLAN_MAC_ADDR_LENGTH); + memcpy_ext( + priv->adapter, + iface_stat->peer_info[0].peer_mac_address, + priv->curr_bss_params.bss_descriptor.mac_address, + MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); iface_stat->peer_info[0].capabilities = WIFI_CAPABILITY_QOS; - wlan_fill_hal_wifi_rate_in_host(priv, - iface_stat-> - peer_info[0].rate_stats, - &(iface_stat-> - peer_info[0]. - num_rate)); + wlan_fill_hal_wifi_rate_in_host( + priv, iface_stat->peer_info[0].rate_stats, + &(iface_stat->peer_info[0].num_rate)); num_peers = 1; } } else { - 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); + 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); if (sta_ptr) { while (sta_ptr != (sta_node *)&priv->sta_list) { iface_stat->peer_info[num_peers].type = WIFI_PEER_STA; memcpy_ext(priv->adapter, - iface_stat->peer_info[num_peers]. - peer_mac_address, sta_ptr->mac_addr, + iface_stat->peer_info[num_peers] + .peer_mac_address, + sta_ptr->mac_addr, MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); iface_stat->peer_info[num_peers].capabilities = WIFI_CAPABILITY_QOS; - wlan_fill_hal_wifi_rate_in_host(priv, - iface_stat-> - peer_info - [num_peers]. - rate_stats, - &(iface_stat-> - peer_info - [num_peers]. - num_rate)); + wlan_fill_hal_wifi_rate_in_host( + priv, + iface_stat->peer_info[num_peers] + .rate_stats, + &(iface_stat->peer_info[num_peers] + .num_rate)); num_peers++; sta_ptr = sta_ptr->pnext; @@ -2308,9 +2212,8 @@ wlan_fill_link_statistic_in_host(mlan_private *priv, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_ioctl_link_statistic(IN mlan_private *pmpriv, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_ioctl_link_statistic(IN mlan_private *pmpriv, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_get_info *info = MNULL; @@ -2329,15 +2232,16 @@ wlan_ioctl_link_statistic(IN mlan_private *pmpriv, goto exit; } - /** We will not send HostCmd_CMD_802_11_LINK_STATS to FW */ + /** We will not send HostCmd_CMD_802_11_LINK_STATS to FW */ if (pioctl_req->action == MLAN_ACT_GET) { info = (mlan_ds_get_info *)pioctl_req->pbuf; link_statistic = info->param.link_statistic; - /** Get the LL STATS from driver */ + /** Get the LL STATS from driver */ wlan_fill_link_statistic_in_host(pmpriv, link_statistic); - DBG_HEXDUMP(MCMD_D, - "wlan_ioctl_link_statistic() link_statistic in host", - (t_u8 *)link_statistic, 800); + DBG_HEXDUMP( + MCMD_D, + "wlan_ioctl_link_statistic() link_statistic in host", + (t_u8 *)link_statistic, 800); } ret = MLAN_STATUS_SUCCESS; @@ -2354,9 +2258,8 @@ exit: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_get_tx_rx_histogram(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_get_tx_rx_histogram(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_misc_cfg *pmisc = (mlan_ds_misc_cfg *)pioctl_req->pbuf; @@ -2365,11 +2268,8 @@ wlan_get_tx_rx_histogram(IN pmlan_adapter pmadapter, ENTER(); /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HOST_CMD_TX_RX_PKT_STATS, - HostCmd_ACT_GEN_GET, - 0, - (t_void *)pioctl_req, + ret = wlan_prepare_cmd(pmpriv, HOST_CMD_TX_RX_PKT_STATS, + HostCmd_ACT_GEN_GET, 0, (t_void *)pioctl_req, &(pmisc->param.tx_rx_histogram)); if (ret == MLAN_STATUS_SUCCESS) @@ -2388,8 +2288,8 @@ wlan_get_tx_rx_histogram(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_set_drvdbg(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; @@ -2412,8 +2312,8 @@ wlan_set_drvdbg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_reg_rx_mgmt_ind(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; @@ -2425,11 +2325,8 @@ wlan_reg_rx_mgmt_ind(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) 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, + 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) @@ -2450,10 +2347,10 @@ wlan_reg_rx_mgmt_ind(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_process_802dot11_mgmt_pkt(IN mlan_private *priv, - IN t_u8 *payload, - IN t_u32 payload_len, IN RxPD *prx_pd) +mlan_status wlan_process_802dot11_mgmt_pkt(IN mlan_private *priv, + IN t_u8 *payload, + IN t_u32 payload_len, + IN RxPD *prx_pd) { pmlan_adapter pmadapter = priv->adapter; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -2463,13 +2360,15 @@ wlan_process_802dot11_mgmt_pkt(IN mlan_private *priv, t_u8 *event_buf = MNULL; mlan_event *pevent = MNULL; t_u8 unicast = 0; - t_u8 broadcast[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + t_u8 broadcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; IEEE80211_MGMT *mgmt = MNULL; t_u8 category = 0; t_u8 action_code = 0; +#ifdef UAP_SUPPORT sta_node *sta_ptr = MNULL; MrvlIETypes_MgmtFrameSet_t *tlv; pmlan_buffer pmbuf; +#endif ENTER(); if (payload_len > (MAX_EVENT_SIZE - sizeof(mlan_event))) { @@ -2491,83 +2390,72 @@ wlan_process_802dot11_mgmt_pkt(IN mlan_private *priv, switch (sub_type) { case SUBTYPE_ASSOC_REQUEST: case SUBTYPE_REASSOC_REQUEST: +#ifdef UAP_SUPPORT if (priv->uap_host_based & UAP_FLAG_HOST_MLME) { PRINTM_NETINTF(MMSG, priv); - if (!memcmp - (pmadapter, pieee_pkt_hdr->addr3, priv->curr_addr, - MLAN_MAC_ADDR_LENGTH)) { + if (!memcmp(pmadapter, pieee_pkt_hdr->addr3, + priv->curr_addr, MLAN_MAC_ADDR_LENGTH)) { PRINTM(MMSG, - "wlan: HostMlme MICRO_AP_STA_ASSOC " - MACSTR "\n", + "wlan: HostMlme MICRO_AP_STA_ASSOC " MACSTR + "\n", MAC2STR(pieee_pkt_hdr->addr2)); mgmt = (IEEE80211_MGMT *)payload; - sta_ptr = - wlan_add_station_entry(priv, - pieee_pkt_hdr-> - addr2); + sta_ptr = wlan_add_station_entry( + priv, pieee_pkt_hdr->addr2); if (sta_ptr) { - sta_ptr->capability = - wlan_le16_to_cpu(mgmt->u. - assoc_req. - capab_info); - pmbuf = wlan_alloc_mlan_buffer - (pmadapter, payload_len, 0, - MOAL_MALLOC_BUFFER); + sta_ptr->capability = wlan_le16_to_cpu( + mgmt->u.assoc_req.capab_info); + pmbuf = wlan_alloc_mlan_buffer( + pmadapter, payload_len, 0, + MOAL_MALLOC_BUFFER); if (pmbuf) { PRINTM(MCMND, "check sta capability\n"); pmbuf->data_len = ASSOC_EVENT_FIX_SIZE; - tlv = (MrvlIETypes_MgmtFrameSet_t *)(pmbuf->pbuf + pmbuf->data_offset + pmbuf->data_len); - tlv->type = - wlan_cpu_to_le16 - (TLV_TYPE_MGMT_FRAME); - tlv->len = - sizeof - (IEEEtypes_FrameCtl_t); - memcpy_ext(pmadapter, - (t_u8 *)&tlv-> - frame_control, - &pieee_pkt_hdr-> - frm_ctl, - sizeof - (IEEEtypes_FrameCtl_t), - sizeof - (IEEEtypes_FrameCtl_t)); - pmbuf->data_len += - sizeof - (MrvlIETypes_MgmtFrameSet_t); - memcpy_ext(pmadapter, - pmbuf->pbuf + - pmbuf->data_offset + - pmbuf->data_len, - payload + - sizeof - (wlan_802_11_header), - payload_len - - sizeof - (wlan_802_11_header), - payload_len - - sizeof - (wlan_802_11_header)); + tlv = (MrvlIETypes_MgmtFrameSet_t + *)(pmbuf->pbuf + + pmbuf->data_offset + + pmbuf->data_len); + tlv->type = wlan_cpu_to_le16( + TLV_TYPE_MGMT_FRAME); + tlv->len = sizeof( + IEEEtypes_FrameCtl_t); + memcpy_ext( + pmadapter, + (t_u8 *)&tlv + ->frame_control, + &pieee_pkt_hdr->frm_ctl, + sizeof(IEEEtypes_FrameCtl_t), + sizeof(IEEEtypes_FrameCtl_t)); + pmbuf->data_len += sizeof( + MrvlIETypes_MgmtFrameSet_t); + memcpy_ext( + pmadapter, + pmbuf->pbuf + + pmbuf->data_offset + + pmbuf->data_len, + payload + + sizeof(wlan_802_11_header), + payload_len - + sizeof(wlan_802_11_header), + payload_len - + sizeof(wlan_802_11_header)); pmbuf->data_len += payload_len - - sizeof - (wlan_802_11_header); + sizeof(wlan_802_11_header); tlv->len += payload_len - - sizeof - (wlan_802_11_header); - tlv->len = - wlan_cpu_to_le16(tlv-> - len); - DBG_HEXDUMP(MCMD_D, "assoc_req", - pmbuf->pbuf + - pmbuf->data_offset, - pmbuf->data_len); - wlan_check_sta_capability(priv, - pmbuf, - sta_ptr); + sizeof(wlan_802_11_header); + tlv->len = wlan_cpu_to_le16( + tlv->len); + DBG_HEXDUMP( + MCMD_D, "assoc_req", + pmbuf->pbuf + + pmbuf->data_offset, + pmbuf->data_len); + wlan_check_sta_capability( + priv, pmbuf, sta_ptr); wlan_free_mlan_buffer(pmadapter, pmbuf); } @@ -2582,6 +2470,7 @@ wlan_process_802dot11_mgmt_pkt(IN mlan_private *priv, } unicast = MTRUE; break; +#endif case SUBTYPE_AUTH: unicast = MTRUE; PRINTM_NETINTF(MMSG, priv); @@ -2593,31 +2482,31 @@ wlan_process_802dot11_mgmt_pkt(IN mlan_private *priv, break; case SUBTYPE_DISASSOC: case SUBTYPE_DEAUTH: - if (memcmp - (pmadapter, pieee_pkt_hdr->addr1, broadcast, - MLAN_MAC_ADDR_LENGTH)) + if (memcmp(pmadapter, pieee_pkt_hdr->addr1, broadcast, + MLAN_MAC_ADDR_LENGTH)) unicast = MTRUE; +#ifdef UAP_SUPPORT if (priv->uap_host_based & UAP_FLAG_HOST_MLME) { - if (!memcmp - (pmadapter, pieee_pkt_hdr->addr3, priv->curr_addr, - MLAN_MAC_ADDR_LENGTH)) { + if (!memcmp(pmadapter, pieee_pkt_hdr->addr3, + priv->curr_addr, MLAN_MAC_ADDR_LENGTH)) { PRINTM_NETINTF(MMSG, priv); PRINTM(MMSG, - "wlan: HostMlme Deauth Receive from " - MACSTR "\n", + "wlan: HostMlme Deauth Receive from " MACSTR + "\n", MAC2STR(pieee_pkt_hdr->addr2)); } } +#endif if (priv->bss_role == MLAN_BSS_ROLE_STA) { if (priv->curr_bss_params.host_mlme) { - if (memcmp - (pmadapter, pieee_pkt_hdr->addr2, - (t_u8 *)priv->curr_bss_params. - bss_descriptor.mac_address, - MLAN_MAC_ADDR_LENGTH)) { + if (memcmp(pmadapter, pieee_pkt_hdr->addr2, + (t_u8 *)priv->curr_bss_params + .bss_descriptor.mac_address, + MLAN_MAC_ADDR_LENGTH)) { PRINTM(MINFO, - "Dropping mgmt frame from others: type=%d " - MACSTR "\n", sub_type, + "Dropping mgmt frame from others: type=%d " MACSTR + "\n", + sub_type, MAC2STR(pieee_pkt_hdr->addr2)); LEAVE(); return ret; @@ -2627,9 +2516,9 @@ wlan_process_802dot11_mgmt_pkt(IN mlan_private *priv, "wlan: HostMlme Disconnected: sub_type=%d\n", sub_type); pmadapter->pending_disconnect_priv = priv; - wlan_recv_event(priv, - MLAN_EVENT_ID_DRV_DEFER_HANDLING, - MNULL); + wlan_recv_event( + priv, MLAN_EVENT_ID_DRV_DEFER_HANDLING, + MNULL); } } break; @@ -2650,21 +2539,20 @@ wlan_process_802dot11_mgmt_pkt(IN mlan_private *priv, LEAVE(); return ret; } - if (memcmp - (pmadapter, pieee_pkt_hdr->addr1, broadcast, - MLAN_MAC_ADDR_LENGTH)) + if (memcmp(pmadapter, pieee_pkt_hdr->addr1, broadcast, + MLAN_MAC_ADDR_LENGTH)) unicast = MTRUE; break; default: break; } if (unicast == MTRUE) { - if (memcmp - (pmadapter, pieee_pkt_hdr->addr1, priv->curr_addr, - MLAN_MAC_ADDR_LENGTH)) { + 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)); + "\n", + sub_type, MAC2STR(pieee_pkt_hdr->addr1)); LEAVE(); return ret; } @@ -2680,13 +2568,12 @@ wlan_process_802dot11_mgmt_pkt(IN mlan_private *priv, pevent = (pmlan_event)event_buf; pevent->bss_index = priv->bss_index; mgmt = (IEEE80211_MGMT *)payload; - if (!priv->curr_bss_params.host_mlme && - sub_type == SUBTYPE_ACTION && + if (!priv->curr_bss_params.host_mlme && sub_type == SUBTYPE_ACTION && mgmt->u.ft_resp.category == FT_CATEGORY && mgmt->u.ft_resp.action == FT_ACTION_RESPONSE && mgmt->u.ft_resp.status_code == 0) { PRINTM(MCMND, "FT Action response received\n"); -#define FT_ACTION_HEAD_LEN (24 + 6 +16) +#define FT_ACTION_HEAD_LEN (24 + 6 + 16) pevent->event_id = MLAN_EVENT_ID_DRV_FT_RESPONSE; pevent->event_len = payload_len + MLAN_MAC_ADDR_LENGTH - FT_ACTION_HEAD_LEN; @@ -2698,12 +2585,13 @@ wlan_process_802dot11_mgmt_pkt(IN mlan_private *priv, payload + FT_ACTION_HEAD_LEN, payload_len - FT_ACTION_HEAD_LEN, pevent->event_len - MLAN_MAC_ADDR_LENGTH); - } else if (!priv->curr_bss_params.host_mlme && sub_type == SUBTYPE_AUTH - && mgmt->u.auth.auth_alg == MLAN_AUTH_MODE_FT && + } else if (!priv->curr_bss_params.host_mlme && + sub_type == SUBTYPE_AUTH && + mgmt->u.auth.auth_alg == MLAN_AUTH_MODE_FT && mgmt->u.auth.auth_transaction == 2 && mgmt->u.auth.status_code == 0) { PRINTM(MCMND, "FT auth response received \n"); -#define AUTH_PACKET_LEN (24 + 6 +6) +#define AUTH_PACKET_LEN (24 + 6 + 6) pevent->event_id = MLAN_EVENT_ID_DRV_FT_RESPONSE; pevent->event_len = payload_len + MLAN_MAC_ADDR_LENGTH - AUTH_PACKET_LEN; @@ -2720,10 +2608,10 @@ wlan_process_802dot11_mgmt_pkt(IN mlan_private *priv, memcpy_ext(pmadapter, (t_u8 *)pevent->event_buf, (t_u8 *)&pevent->event_id, sizeof(pevent->event_id), pevent->event_len); - memcpy_ext(pmadapter, - (t_u8 *)(pevent->event_buf + - sizeof(pevent->event_id)), payload, - payload_len, payload_len); + memcpy_ext( + pmadapter, + (t_u8 *)(pevent->event_buf + sizeof(pevent->event_id)), + payload, payload_len, payload_len); } wlan_recv_event(priv, pevent->event_id, pevent); if (event_buf) @@ -2741,9 +2629,8 @@ wlan_process_802dot11_mgmt_pkt(IN mlan_private *priv, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_ext_capa_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ext_capa_cfg(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; @@ -2778,17 +2665,15 @@ wlan_misc_ext_capa_cfg(IN pmlan_adapter pmadapter, * * @return MTRUE or MFALSE; */ -t_u32 -wlan_is_ext_capa_support(mlan_private *pmpriv) +t_u32 wlan_is_ext_capa_support(mlan_private *pmpriv) { ENTER(); - if (ISSUPP_EXTCAP_TDLS(pmpriv->ext_cap) - || ISSUPP_EXTCAP_INTERWORKING(pmpriv->ext_cap) - || ISSUPP_EXTCAP_BSS_TRANSITION(pmpriv->ext_cap) - || ISSUPP_EXTCAP_QOS_MAP(pmpriv->ext_cap) - || ISSUPP_EXTCAP_OPERMODENTF(pmpriv->ext_cap) - ) { + if (ISSUPP_EXTCAP_TDLS(pmpriv->ext_cap) || + ISSUPP_EXTCAP_INTERWORKING(pmpriv->ext_cap) || + ISSUPP_EXTCAP_BSS_TRANSITION(pmpriv->ext_cap) || + ISSUPP_EXTCAP_QOS_MAP(pmpriv->ext_cap) || + ISSUPP_EXTCAP_OPERMODENTF(pmpriv->ext_cap)) { LEAVE(); return MTRUE; } else { @@ -2806,8 +2691,8 @@ wlan_is_ext_capa_support(mlan_private *pmpriv) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_hotspot_cfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_hotspot_cfg(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; @@ -2834,9 +2719,9 @@ wlan_misc_hotspot_cfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return N/A */ -void -wlan_add_ext_capa_info_ie(IN mlan_private *pmpriv, - IN BSSDescriptor_t *pbss_desc, OUT t_u8 **pptlv_out) +void wlan_add_ext_capa_info_ie(IN mlan_private *pmpriv, + IN BSSDescriptor_t *pbss_desc, + OUT t_u8 **pptlv_out) { MrvlIETypes_ExtCap_t *pext_cap = MNULL; @@ -2868,9 +2753,8 @@ wlan_add_ext_capa_info_ie(IN mlan_private *pmpriv, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_otp_user_data(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_otp_user_data(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; @@ -2878,18 +2762,16 @@ wlan_misc_otp_user_data(IN pmlan_adapter pmadapter, ENTER(); - if (misc->param.otp_user_data.user_data_length > MAX_OTP_USER_DATA_LEN) { + 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, + 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) @@ -2908,9 +2790,8 @@ wlan_misc_otp_user_data(IN pmlan_adapter pmadapter, * * @return N/A */ -void -wlan_check_sta_capability(pmlan_private priv, pmlan_buffer pevent, - sta_node *sta_ptr) +void wlan_check_sta_capability(pmlan_private priv, pmlan_buffer pevent, + sta_node *sta_ptr) { t_u16 tlv_type, tlv_len; t_u16 frame_control, frame_sub_type = 0; @@ -2924,8 +2805,9 @@ wlan_check_sta_capability(pmlan_private priv, pmlan_buffer pevent, #endif 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); + MrvlIEtypesHeader_t *tlv = + (MrvlIEtypesHeader_t *)(pevent->pbuf + pevent->data_offset + + ASSOC_EVENT_FIX_SIZE); MrvlIETypes_MgmtFrameSet_t *mgmt_tlv = MNULL; ENTER(); @@ -2944,16 +2826,15 @@ wlan_check_sta_capability(pmlan_private priv, pmlan_buffer pevent, (t_u8 *)&(mgmt_tlv->frame_control), sizeof(frame_control), sizeof(frame_control)); - frame_sub_type = - IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE - (frame_control); + frame_sub_type = IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE( + frame_control); if ((mgmt_tlv->frame_control.type == 0) && ((frame_sub_type == SUBTYPE_BEACON) #ifdef UAP_SUPPORT - || (frame_sub_type == SUBTYPE_ASSOC_REQUEST) - || (frame_sub_type == SUBTYPE_REASSOC_REQUEST) + || (frame_sub_type == SUBTYPE_ASSOC_REQUEST) || + (frame_sub_type == SUBTYPE_REASSOC_REQUEST) #endif - )) { + )) { if (frame_sub_type == SUBTYPE_BEACON) assoc_ie_len = sizeof(IEEEtypes_Beacon_t); @@ -2968,8 +2849,8 @@ wlan_check_sta_capability(pmlan_private priv, pmlan_buffer pevent, sizeof(IEEEtypes_ReAssocRqst_t); #endif ie_len = tlv_len - - sizeof(IEEEtypes_FrameCtl_t) - - assoc_ie_len; + sizeof(IEEEtypes_FrameCtl_t) - + assoc_ie_len; assoc_req_ie = (t_u8 *)tlv + sizeof(MrvlIETypes_MgmtFrameSet_t) + @@ -2980,8 +2861,7 @@ wlan_check_sta_capability(pmlan_private priv, pmlan_buffer pevent, ie_len); PRINTM(MCMND, "STA: is_wmm_enabled=%d\n", sta_ptr->is_wmm_enabled); - pht_cap = - (IEEEtypes_HTCap_t *) + pht_cap = (IEEEtypes_HTCap_t *) wlan_get_specific_ie(priv, assoc_req_ie, ie_len, HT_CAPABILITY, 0); @@ -2993,9 +2873,9 @@ wlan_check_sta_capability(pmlan_private priv, pmlan_buffer pevent, pht_cap, sizeof(IEEEtypes_HTCap_t), sizeof(IEEEtypes_HTCap_t)); - if (GETHT_MAXAMSDU - (wlan_le16_to_cpu - (pht_cap->ht_cap.ht_cap_info))) + if (GETHT_MAXAMSDU(wlan_le16_to_cpu( + pht_cap->ht_cap + .ht_cap_info))) sta_ptr->max_amsdu = MLAN_TX_DATA_BUF_SIZE_8K; else @@ -3005,8 +2885,7 @@ wlan_check_sta_capability(pmlan_private priv, pmlan_buffer pevent, PRINTM(MCMND, "STA doesn't support 11n\n"); } - pvht_cap = - (IEEEtypes_VHTCap_t *) + pvht_cap = (IEEEtypes_VHTCap_t *) wlan_get_specific_ie(priv, assoc_req_ie, ie_len, VHT_CAPABILITY, 0); @@ -3014,17 +2893,16 @@ wlan_check_sta_capability(pmlan_private priv, pmlan_buffer pevent, (priv->is_11ac_enabled == MTRUE)) { PRINTM(MCMND, "STA supports 11ac\n"); sta_ptr->is_11ac_enabled = MTRUE; - if (GET_VHTCAP_MAXMPDULEN - (wlan_le32_to_cpu - (pvht_cap->vht_cap. - vht_cap_info)) == 2) + if (GET_VHTCAP_MAXMPDULEN(wlan_le32_to_cpu( + pvht_cap->vht_cap + .vht_cap_info)) == + 2) sta_ptr->max_amsdu = MLAN_TX_DATA_BUF_SIZE_12K; - else if (GET_VHTCAP_MAXMPDULEN - (wlan_le32_to_cpu - (pvht_cap->vht_cap. - vht_cap_info)) - == 1) + else if (GET_VHTCAP_MAXMPDULEN(wlan_le32_to_cpu( + pvht_cap->vht_cap + .vht_cap_info)) == + 1) sta_ptr->max_amsdu = MLAN_TX_DATA_BUF_SIZE_8K; else @@ -3034,12 +2912,12 @@ wlan_check_sta_capability(pmlan_private priv, pmlan_buffer pevent, PRINTM(MCMND, "STA doesn't support 11ac\n"); } - phe_cap = - (IEEEtypes_Extension_t *) + phe_cap = (IEEEtypes_Extension_t *) wlan_get_specific_ie(priv, assoc_req_ie, ie_len, EXTENSION, HE_CAPABILITY); - if (phe_cap && (priv->is_11ax_enabled == MTRUE)) { + if (phe_cap && + (priv->is_11ax_enabled == MTRUE)) { PRINTM(MCMND, "STA supports 11ax\n"); sta_ptr->is_11ax_enabled = MTRUE; } else { @@ -3048,11 +2926,9 @@ wlan_check_sta_capability(pmlan_private priv, pmlan_buffer pevent, } #ifdef UAP_SUPPORT /* Note: iphone6 does not have ERP_INFO */ - ext_rate = - wlan_get_specific_ie(priv, assoc_req_ie, - ie_len, - EXTENDED_SUPPORTED_RATES, - 0); + ext_rate = wlan_get_specific_ie( + priv, assoc_req_ie, ie_len, + EXTENDED_SUPPORTED_RATES, 0); erp = wlan_get_specific_ie(priv, assoc_req_ie, ie_len, ERP_INFO, 0); if (!ext_rate) @@ -3086,10 +2962,10 @@ wlan_check_sta_capability(pmlan_private priv, pmlan_buffer pevent, #endif #ifdef DRV_EMBEDDED_AUTHENTICATOR if (IsAuthenticatorEnabled(priv->psapriv)) - authenticator_get_sta_security_info - (priv->psapriv, - sta_ptr->cm_connectioninfo, - assoc_req_ie, ie_len); + authenticator_get_sta_security_info( + priv->psapriv, + sta_ptr->cm_connectioninfo, + assoc_req_ie, ie_len); #endif break; } @@ -3112,8 +2988,7 @@ wlan_check_sta_capability(pmlan_private priv, pmlan_buffer pevent, * * @return MTRUE/MFALSE */ -t_u8 -wlan_is_wmm_ie_present(pmlan_adapter pmadapter, t_u8 *pbuf, t_u16 buf_len) +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; @@ -3121,7 +2996,7 @@ wlan_is_wmm_ie_present(pmlan_adapter pmadapter, t_u8 *pbuf, t_u16 buf_len) t_u8 element_len; t_u16 total_ie_len; IEEEtypes_VendorSpecific_t *pvendor_ie; - const t_u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 }; + const t_u8 wmm_oui[4] = {0x00, 0x50, 0xf2, 0x02}; t_u8 find_wmm_ie = MFALSE; ENTER(); @@ -3134,16 +3009,15 @@ wlan_is_wmm_ie_present(pmlan_adapter pmadapter, t_u8 *pbuf, t_u16 buf_len) if (bytes_left < total_ie_len) { PRINTM(MERROR, "InterpretIE: Error in processing IE, " - "bytes left < IE length\n"); + "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))) { + if (!memcmp(pmadapter, pvendor_ie->vend_hdr.oui, + wmm_oui, sizeof(wmm_oui))) { find_wmm_ie = MTRUE; PRINTM(MINFO, "find WMM IE\n"); } @@ -3174,9 +3048,8 @@ wlan_is_wmm_ie_present(pmlan_adapter pmadapter, t_u8 *pbuf, t_u16 buf_len) * * @return ie's poiner or MNULL */ -t_u8 * -wlan_get_specific_ie(pmlan_private priv, t_u8 *ie_buf, t_u8 ie_len, - IEEEtypes_ElementId_e id, t_u8 ext_id) +t_u8 *wlan_get_specific_ie(pmlan_private priv, t_u8 *ie_buf, t_u8 ie_len, + IEEEtypes_ElementId_e id, t_u8 ext_id) { t_u32 bytes_left = ie_len; t_u8 *pcurrent_ptr = ie_buf; @@ -3196,7 +3069,7 @@ wlan_get_specific_ie(pmlan_private priv, t_u8 *ie_buf, t_u8 ie_len, 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 < IE length\n"); break; } if ((!ext_id && element_id == id) || @@ -3225,8 +3098,8 @@ wlan_get_specific_ie(pmlan_private priv, t_u8 *ie_buf, t_u8 ie_len, * * @return MLAN_STATUS_SUCCESS --success */ -mlan_status -wlan_get_pm_info(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -3237,13 +3110,13 @@ wlan_get_pm_info(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) pm_cfg->param.ps_info.is_suspend_allowed = MTRUE; wlan_request_cmd_lock(pmadapter); if (util_peek_list(pmadapter->pmoal_handle, &pmadapter->cmd_pending_q, - MNULL, MNULL) || pmadapter->curr_cmd - || !wlan_bypass_tx_list_empty(pmadapter) - || !wlan_wmm_lists_empty(pmadapter) + MNULL, MNULL) || + pmadapter->curr_cmd || !wlan_bypass_tx_list_empty(pmadapter) || + !wlan_wmm_lists_empty(pmadapter) #if defined(SDIO) || defined(PCIE) || wlan_pending_interrupt(pmadapter) #endif - ) { + ) { pm_cfg->param.ps_info.is_suspend_allowed = MFALSE; #if defined(SDIO) || defined(PCIE) PRINTM(MIOCTL, @@ -3275,9 +3148,8 @@ wlan_get_pm_info(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_SUCCESS --success */ -mlan_status -wlan_get_hs_wakeup_reason(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) { pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; pmlan_ds_pm_cfg pm_cfg = MNULL; @@ -3288,11 +3160,8 @@ wlan_get_hs_wakeup_reason(IN pmlan_adapter pmadapter, 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, + 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) @@ -3300,7 +3169,6 @@ wlan_get_hs_wakeup_reason(IN pmlan_adapter pmadapter, LEAVE(); return ret; - } /** @@ -3311,9 +3179,8 @@ wlan_get_hs_wakeup_reason(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_radio_ioctl_radio_ctl(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_radio_ioctl_radio_ctl(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_radio_cfg *radio_cfg = MNULL; @@ -3338,11 +3205,8 @@ wlan_radio_ioctl_radio_ctl(IN pmlan_adapter pmadapter, 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, + 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) @@ -3361,9 +3225,8 @@ exit: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_radio_ioctl_ant_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_radio_ioctl_ant_cfg(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]; @@ -3381,41 +3244,41 @@ wlan_radio_ioctl_ant_cfg(IN pmlan_adapter pmadapter, if (pioctl_req->action == MLAN_ACT_SET) { /* User input validation */ if (IS_STREAM_2X2(pmadapter->feature_control)) { -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) if (IS_CARD9098(pmadapter->card_type) || IS_CARD9097(pmadapter->card_type)) { ant_cfg->tx_antenna &= 0x0303; ant_cfg->rx_antenna &= 0x0303; - /** 2G antcfg TX */ + /** 2G antcfg TX */ if (ant_cfg->tx_antenna & 0x00FF) { pmadapter->user_htstream &= ~0xF0; pmadapter->user_htstream |= - (bitcount - (ant_cfg-> - tx_antenna & 0x00FF) << 4); + (bitcount(ant_cfg->tx_antenna & + 0x00FF) + << 4); } /* 5G antcfg tx */ if (ant_cfg->tx_antenna & 0xFF00) { pmadapter->user_htstream &= ~0xF000; pmadapter->user_htstream |= - (bitcount - (ant_cfg-> - tx_antenna & 0xFF00) << 12); + (bitcount(ant_cfg->tx_antenna & + 0xFF00) + << 12); } /* 2G antcfg RX */ if (ant_cfg->rx_antenna & 0x00FF) { pmadapter->user_htstream &= ~0xF; - pmadapter->user_htstream |= - bitcount(ant_cfg-> - rx_antenna & 0x00FF); + pmadapter->user_htstream |= bitcount( + ant_cfg->rx_antenna & 0x00FF); } /* 5G antcfg RX */ if (ant_cfg->rx_antenna & 0xFF00) { pmadapter->user_htstream &= ~0xF00; pmadapter->user_htstream |= - (bitcount - (ant_cfg-> - rx_antenna & 0xFF00) << 8); + (bitcount(ant_cfg->rx_antenna & + 0xFF00) + << 8); } PRINTM(MCMND, "user_htstream=0x%x, tx_antenna=0x%x >rx_antenna=0x%x\n", @@ -3427,14 +3290,15 @@ wlan_radio_ioctl_ant_cfg(IN pmlan_adapter pmadapter, ant_cfg->tx_antenna &= 0x0003; ant_cfg->rx_antenna &= 0x0003; -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) } #endif if (!ant_cfg->tx_antenna || bitcount(ant_cfg->tx_antenna & 0x00FF) > - pmadapter->number_of_antenna || + pmadapter->number_of_antenna || bitcount(ant_cfg->tx_antenna & 0xFF00) > - pmadapter->number_of_antenna) { + pmadapter->number_of_antenna) { PRINTM(MERROR, "Invalid TX antenna setting: 0x%x\n", ant_cfg->tx_antenna); @@ -3445,9 +3309,9 @@ wlan_radio_ioctl_ant_cfg(IN pmlan_adapter pmadapter, } if (ant_cfg->rx_antenna) { if (bitcount(ant_cfg->rx_antenna & 0x00FF) > - pmadapter->number_of_antenna || + pmadapter->number_of_antenna || bitcount(ant_cfg->rx_antenna & 0xFF00) > - pmadapter->number_of_antenna) { + pmadapter->number_of_antenna) { PRINTM(MERROR, "Invalid RX antenna setting: 0x%x\n", ant_cfg->rx_antenna); @@ -3471,18 +3335,17 @@ wlan_radio_ioctl_ant_cfg(IN pmlan_adapter pmadapter, } else cmd_action = HostCmd_ACT_GEN_GET; - /* Cast it to t_u16, antenna mode for command HostCmd_CMD_802_11_RF_ANTENNA requires 2 bytes */ + /* Cast it to t_u16, antenna mode for command + * HostCmd_CMD_802_11_RF_ANTENNA requires 2 bytes */ if (!IS_STREAM_2X2(pmadapter->feature_control)) ant_cfg_1x1 = &radio_cfg->param.ant_cfg_1x1; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_RF_ANTENNA, - cmd_action, - 0, - (t_void *)pioctl_req, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_RF_ANTENNA, + cmd_action, 0, (t_void *)pioctl_req, (IS_STREAM_2X2(pmadapter->feature_control)) ? - (t_void *)ant_cfg : (t_void *)ant_cfg_1x1); + (t_void *)ant_cfg : + (t_void *)ant_cfg_1x1); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -3510,10 +3373,9 @@ wlan_rate_ioctl_get_rate_bitmap(IN pmlan_adapter pmadapter, 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); + 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; @@ -3543,25 +3405,22 @@ wlan_rate_ioctl_set_rate_bitmap(IN pmlan_adapter pmadapter, 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" + 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], + 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); + 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; @@ -3575,11 +3434,11 @@ wlan_rate_ioctl_set_rate_bitmap(IN pmlan_adapter pmadapter, * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -static mlan_status -wlan_rate_ioctl_get_rate_value(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_rate_ioctl_get_rate_value(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_ds_rate *rate = MNULL; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -3619,10 +3478,9 @@ wlan_rate_ioctl_get_rate_value(IN pmlan_adapter pmadapter, } 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); + 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; } @@ -3639,9 +3497,8 @@ wlan_rate_ioctl_get_rate_value(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_rate_ioctl_set_rate_value(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_rate_ioctl_set_rate_value(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_ds_rate *ds_rate = MNULL; WLAN_802_11_RATES rates; @@ -3669,14 +3526,15 @@ wlan_rate_ioctl_set_rate_value(IN pmlan_adapter pmadapter, 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 */ + 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); + 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], @@ -3688,35 +3546,33 @@ wlan_rate_ioctl_set_rate_value(IN pmlan_adapter pmadapter, if ((i < WLAN_SUPPORTED_RATES && !rate[i]) || (i == WLAN_SUPPORTED_RATES)) { PRINTM(MERROR, - "The fixed data rate 0x%X is out " "of range\n", + "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); + 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 */ + 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); + 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); + 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; @@ -3733,9 +3589,8 @@ exit: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_rate_ioctl_get_rate_index(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_rate_ioctl_get_rate_index(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]; @@ -3743,10 +3598,9 @@ wlan_rate_ioctl_get_rate_index(IN pmlan_adapter pmadapter, 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); + 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; @@ -3762,9 +3616,8 @@ wlan_rate_ioctl_get_rate_index(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_rate_ioctl_set_rate_index(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_rate_ioctl_set_rate_index(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { t_u32 rate_index; t_u32 rate_format; @@ -3797,7 +3650,7 @@ wlan_rate_ioctl_set_rate_index(IN pmlan_adapter pmadapter, /* [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 */ + bitmap_rates[i] = 0x03FF; /* 10 Bits valid */ /* Set to 0 as default value for all other NSSs */ for (i = 12; i < 17; i++) bitmap_rates[i] = 0x0; @@ -3829,9 +3682,8 @@ wlan_rate_ioctl_set_rate_index(IN pmlan_adapter pmadapter, /* 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); + bitmap_rates[1] = 1 << (rate_index - + MLAN_RATE_INDEX_OFDM0); ret = MLAN_STATUS_SUCCESS; } } else if (rate_format == MLAN_RATE_FORMAT_HT) { @@ -3855,8 +3707,7 @@ wlan_rate_ioctl_set_rate_index(IN pmlan_adapter pmadapter, if ((rate_index <= MLAN_RATE_INDEX_MCS11) && (MLAN_RATE_NSS1 <= nss) && (nss <= MLAN_RATE_NSS2)) { - bitmap_rates[18 + nss - - MLAN_RATE_NSS1] = + bitmap_rates[18 + nss - MLAN_RATE_NSS1] = (1 << rate_index); ret = MLAN_STATUS_SUCCESS; } @@ -3876,25 +3727,22 @@ wlan_rate_ioctl_set_rate_index(IN pmlan_adapter pmadapter, } } - PRINTM(MINFO, "RateBitmap=%04x%04x%04x%04x%04x%04x%04x%04x" + 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], + 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); + 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; @@ -3908,10 +3756,11 @@ wlan_rate_ioctl_set_rate_index(IN pmlan_adapter pmadapter, * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -mlan_status -wlan_rate_ioctl_cfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -3954,9 +3803,8 @@ wlan_rate_ioctl_cfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_rate_ioctl_get_data_rate(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) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -3969,10 +3817,9 @@ wlan_rate_ioctl_get_data_rate(IN pmlan_adapter pmadapter, } /* 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); + 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; @@ -3989,9 +3836,8 @@ exit: * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_radio_ioctl_remain_chan_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_radio_ioctl_remain_chan_cfg(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_radio_cfg *radio_cfg = MNULL; @@ -4007,11 +3853,8 @@ wlan_radio_ioctl_remain_chan_cfg(IN pmlan_adapter pmadapter, 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, + 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) @@ -4030,9 +3873,8 @@ wlan_radio_ioctl_remain_chan_cfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_bss_ioctl_wifi_direct_mode(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_bss_ioctl_wifi_direct_mode(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_bss *bss = MNULL; @@ -4050,10 +3892,9 @@ wlan_bss_ioctl_wifi_direct_mode(IN pmlan_adapter pmadapter, 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); + 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; @@ -4070,8 +3911,8 @@ wlan_bss_ioctl_wifi_direct_mode(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_misc_p2p_config(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_p2p_config(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cfg *misc_cfg = MNULL; @@ -4087,11 +3928,8 @@ wlan_misc_p2p_config(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) cmd_action = HostCmd_ACT_GEN_GET; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HOST_CMD_P2P_PARAMS_CONFIG, - cmd_action, - 0, - (t_void *)pioctl_req, + ret = wlan_prepare_cmd(pmpriv, HOST_CMD_P2P_PARAMS_CONFIG, cmd_action, + 0, (t_void *)pioctl_req, &misc_cfg->param.p2p_config); if (ret == MLAN_STATUS_SUCCESS) @@ -4110,9 +3948,8 @@ wlan_misc_p2p_config(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_coalesce_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_coalesce_cfg(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cfg *misc_cfg = MNULL; @@ -4128,10 +3965,7 @@ wlan_misc_ioctl_coalesce_cfg(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_GET; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_COALESCE_CFG, - cmd_action, - 0, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_COALESCE_CFG, cmd_action, 0, (t_void *)pioctl_req, &misc_cfg->param.coalesce_cfg); @@ -4150,9 +3984,8 @@ wlan_misc_ioctl_coalesce_cfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_aggr_ctrl(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_aggr_ctrl(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cfg *misc = MNULL; @@ -4168,11 +4001,9 @@ wlan_misc_ioctl_aggr_ctrl(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_GET; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_PACKET_AGGR_CTRL, - cmd_action, - 0, - (t_void *)pioctl_req, &misc->param.aggr_params); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_PACKET_AGGR_CTRL, cmd_action, + 0, (t_void *)pioctl_req, + &misc->param.aggr_params); if (ret == MLAN_STATUS_SUCCESS) { ret = MLAN_STATUS_PENDING; @@ -4191,9 +4022,8 @@ wlan_misc_ioctl_aggr_ctrl(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_usb_aggr_ctrl(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_usb_aggr_ctrl(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cfg *misc = MNULL; @@ -4218,9 +4048,7 @@ wlan_misc_ioctl_usb_aggr_ctrl(IN pmlan_adapter pmadapter, /* Send request to firmware */ ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_PACKET_AGGR_OVER_HOST_INTERFACE, - cmd_action, - 0, - (t_void *)pioctl_req, + cmd_action, 0, (t_void *)pioctl_req, &misc->param.usb_aggr_params); if (ret == MLAN_STATUS_SUCCESS) { @@ -4240,9 +4068,8 @@ wlan_misc_ioctl_usb_aggr_ctrl(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_misc_ioctl_txcontrol(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_txcontrol(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cfg *misc = MNULL; @@ -4288,11 +4115,9 @@ wlan_misc_ioctl_rx_pkt_coalesce_config(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_GET; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_RX_PKT_COALESCE_CFG, - cmd_action, - 0, - (t_void *)pioctl_req, &misc->param.rx_coalesce); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_RX_PKT_COALESCE_CFG, + cmd_action, 0, (t_void *)pioctl_req, + &misc->param.rx_coalesce); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -4309,8 +4134,7 @@ wlan_misc_ioctl_rx_pkt_coalesce_config(IN pmlan_adapter pmadapter, * * @return MTRUE/MFALSE */ -t_bool -wlan_check_interface_active(mlan_adapter *pmadapter) +t_bool wlan_check_interface_active(mlan_adapter *pmadapter) { t_bool ret = MFALSE; pmlan_private pmpriv; @@ -4327,7 +4151,7 @@ wlan_check_interface_active(mlan_adapter *pmadapter) ret = pmpriv->uap_bss_started; else #endif - if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) + if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA) ret = pmpriv->media_connected; } if (ret) @@ -4345,9 +4169,8 @@ wlan_check_interface_active(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_misc_ioctl_dfs_repeater_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_dfs_repeater_cfg(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cfg *misc = MNULL; @@ -4364,7 +4187,7 @@ wlan_misc_ioctl_dfs_repeater_cfg(IN pmlan_adapter pmadapter, */ if (wlan_check_interface_active(pmadapter)) { PRINTM(MMSG, "DFS-Repeater active priv found," - " skip enabling the mode.\n"); + " skip enabling the mode.\n"); ret = MLAN_STATUS_FAILURE; goto done; } @@ -4394,9 +4217,8 @@ done: * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_misc_ioctl_low_pwr_mode(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_low_pwr_mode(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cfg *misc = MNULL; @@ -4407,11 +4229,9 @@ wlan_misc_ioctl_low_pwr_mode(IN pmlan_adapter pmadapter, misc = (mlan_ds_misc_cfg *)pioctl_req->pbuf; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCMD_CONFIG_LOW_POWER_MODE, - HostCmd_ACT_GEN_SET, - 0, - (t_void *)pioctl_req, &misc->param.low_pwr_mode); + ret = wlan_prepare_cmd(pmpriv, HostCMD_CONFIG_LOW_POWER_MODE, + HostCmd_ACT_GEN_SET, 0, (t_void *)pioctl_req, + &misc->param.low_pwr_mode); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -4428,9 +4248,8 @@ wlan_misc_ioctl_low_pwr_mode(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_misc_ioctl_pmic_configure(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_pmic_configure(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]; @@ -4438,10 +4257,9 @@ wlan_misc_ioctl_pmic_configure(IN pmlan_adapter pmadapter, ENTER(); /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HOST_CMD_PMIC_CONFIGURE, - HostCmd_ACT_GEN_SET, - 0, (t_void *)pioctl_req, MNULL); + ret = wlan_prepare_cmd(pmpriv, HOST_CMD_PMIC_CONFIGURE, + HostCmd_ACT_GEN_SET, 0, (t_void *)pioctl_req, + MNULL); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -4457,9 +4275,8 @@ wlan_misc_ioctl_pmic_configure(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_misc_ioctl_cwmode_ctrl(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_cwmode_ctrl(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cfg *misc = MNULL; @@ -4476,10 +4293,8 @@ wlan_misc_ioctl_cwmode_ctrl(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_GET; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_CW_MODE_CTRL, - cmd_action, - 0, (t_void *)pioctl_req, &misc->param.cwmode); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_CW_MODE_CTRL, cmd_action, 0, + (t_void *)pioctl_req, &misc->param.cwmode); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -4498,8 +4313,8 @@ wlan_misc_ioctl_cwmode_ctrl(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS or FAIL */ -inline mlan_status -push_n(pmlan_adapter pmadapter, mef_stack *s, t_u8 len, t_u8 *val) +inline mlan_status push_n(pmlan_adapter pmadapter, mef_stack *s, t_u8 len, + t_u8 *val) { if ((s->sp + len) <= MAX_NUM_STACK_BYTES) { memcpy_ext(pmadapter, s->byte + s->sp, val, len, @@ -4521,8 +4336,7 @@ push_n(pmlan_adapter pmadapter, mef_stack *s, t_u8 len, t_u8 *val) * * @return MLAN_STATUS_SUCCESS or FAIL */ -inline mlan_status -mef_push(pmlan_adapter pmadapter, mef_stack *s, mef_op *op) +inline mlan_status mef_push(pmlan_adapter pmadapter, mef_stack *s, mef_op *op) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u8 nbytes; @@ -4537,10 +4351,10 @@ mef_push(pmlan_adapter pmadapter, mef_stack *s, mef_op *op) case OPERAND_BYTE_SEQ: nbytes = op->val[0]; if (MLAN_STATUS_SUCCESS == - push_n(pmadapter, s, nbytes, op->val + 1) && + push_n(pmadapter, s, nbytes, op->val + 1) && MLAN_STATUS_SUCCESS == push_n(pmadapter, s, 1, op->val) && - MLAN_STATUS_SUCCESS == push_n(pmadapter, s, 1, - &op->operand_type)) + MLAN_STATUS_SUCCESS == + push_n(pmadapter, s, 1, &op->operand_type)) ret = MLAN_STATUS_SUCCESS; else ret = MLAN_STATUS_FAILURE; @@ -4561,8 +4375,8 @@ mef_push(pmlan_adapter pmadapter, mef_stack *s, mef_op *op) * * @return MLAN_STATUS_SUCCESS or FAIL */ -mlan_status -push_filter_dnum_eq(pmlan_adapter pmadapter, mef_stack *s, mef_filter_t *filter) +mlan_status push_filter_dnum_eq(pmlan_adapter pmadapter, mef_stack *s, + mef_filter_t *filter) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 dnum; @@ -4582,8 +4396,8 @@ push_filter_dnum_eq(pmlan_adapter pmadapter, mef_stack *s, mef_filter_t *filter) } /* Format of decimal num: - * | 5 bytes | 5 bytes | 5 bytes | 1 byte | - * | pattern | offset | num of bytes | type (TYPE_DNUM_EQ) | + * | 5 bytes | 5 bytes | 5 bytes | 1 byte | | + * pattern | offset | num of bytes | type (TYPE_DNUM_EQ) | */ /* push pattern */ @@ -4632,8 +4446,8 @@ done: * * @return MLAN_STATUS_SUCCESS or FAIL */ -mlan_status -push_filter_byte_eq(pmlan_adapter pmadapter, mef_stack *s, mef_filter_t *filter) +mlan_status push_filter_byte_eq(pmlan_adapter pmadapter, mef_stack *s, + mef_filter_t *filter) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 dnum; @@ -4653,8 +4467,8 @@ push_filter_byte_eq(pmlan_adapter pmadapter, mef_stack *s, mef_filter_t *filter) } /* Format of decimal num: - * | 5 bytes | val | 5 bytes | 1 byte | - * | repeat | bytes seq | offset | type (TYPE_BYTE_EQ) | + * | 5 bytes | val | 5 bytes | 1 byte | | + * repeat | bytes seq | offset | type (TYPE_BYTE_EQ) | */ /* push repeat */ @@ -4704,8 +4518,8 @@ done: * * @return MLAN_STATUS_SUCCESS or FAIL */ -mlan_status -push_filter_bit_eq(pmlan_adapter pmadapter, mef_stack *s, mef_filter_t *filter) +mlan_status push_filter_bit_eq(pmlan_adapter pmadapter, mef_stack *s, + mef_filter_t *filter) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 dnum; @@ -4725,8 +4539,8 @@ push_filter_bit_eq(pmlan_adapter pmadapter, mef_stack *s, mef_filter_t *filter) } /* Format of decimal num: - * | val | 5 bytes | val | 1 byte | - * | bytes seq | offset | mask seq | type (TYPE_BIT_EQ) | + * | val | 5 bytes | val | 1 byte | | + * bytes seq | offset | mask seq | type (TYPE_BIT_EQ) | */ /* push bytes seq */ @@ -4777,8 +4591,8 @@ done: * * @return MLAN_STATUS_SUCCESS or FAIL */ -mlan_status -wlan_push_filter(pmlan_adapter pmadapter, mef_stack *s, mef_filter_t *filter) +mlan_status wlan_push_filter(pmlan_adapter pmadapter, mef_stack *s, + mef_filter_t *filter) { mlan_status ret = MLAN_STATUS_SUCCESS; @@ -4809,9 +4623,8 @@ wlan_push_filter(pmlan_adapter pmadapter, mef_stack *s, mef_filter_t *filter) * * @return MLAN_STATUS_SUCCESS or FAIL */ -mlan_status -wlan_generate_mef_filter_stack(pmlan_adapter pmadapter, mef_stack *s, - mef_entry_t *entry) +mlan_status wlan_generate_mef_filter_stack(pmlan_adapter pmadapter, + mef_stack *s, mef_entry_t *entry) { mlan_status ret = MLAN_STATUS_SUCCESS; mef_op op; @@ -4848,10 +4661,9 @@ done: * @param pmef A pointer to mef_cfg structure * * @return MLAN_STATUS_SUCCESS or FAIL -*/ -mlan_status -wlan_set_mef_entry(IN mlan_private *pmpriv, - IN pmlan_adapter pmadapter, IN mef_cfg *pmef) + */ +mlan_status wlan_set_mef_entry(IN mlan_private *pmpriv, + IN pmlan_adapter pmadapter, IN mef_cfg *pmef) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cmd *hostcmd; @@ -4881,28 +4693,28 @@ wlan_set_mef_entry(IN mlan_private *pmpriv, goto err_handle; } - /** Fill the cmd header data*/ + /** Fill the cmd header data*/ memset(pmadapter, hostcmd, 0, sizeof(mlan_ds_misc_cmd)); buf = hostcmd->cmd; hostcmd_hdr = (HostCmd_DS_GEN *)buf; hostcmd_hdr->command = wlan_cpu_to_le16(HostCmd_CMD_MEF_CFG); buf_len = S_DS_GEN; - /** Fill HostCmd_DS_MEF_CFG*/ + /** Fill HostCmd_DS_MEF_CFG*/ mef_hdr = (HostCmd_DS_MEF_CFG *)(buf + buf_len); mef_hdr->criteria = wlan_cpu_to_le32(pmef->criteria); mef_hdr->nentries = wlan_cpu_to_le16(pmef->entry_num); buf_len += sizeof(HostCmd_DS_MEF_CFG); - /** generate mef entry data*/ + /** generate mef entry data*/ for (i = 0, pentry = pmef->pentry; i < pmef->entry_num; i++, pentry++) { - /** Fill entry header data*/ + /** Fill entry header data*/ entry_hdr = (mef_entry_header *)(buf + buf_len); entry_hdr->mode = pentry->mode; entry_hdr->action = pentry->action; buf_len += sizeof(mef_entry_header); - /** Fill Stack data*/ + /** Fill Stack data*/ stack = (mef_stack *)(buf + buf_len); ret = wlan_generate_mef_filter_stack(pmadapter, stack, pentry); if (ret != MLAN_STATUS_SUCCESS) { @@ -4916,7 +4728,7 @@ wlan_set_mef_entry(IN mlan_private *pmpriv, DBG_HEXDUMP(MCMD_D, "MEF DATA", (t_u8 *)hostcmd, buf_len + 4); - /** Send command to firmware*/ + /** Send command to firmware*/ ret = wlan_prepare_cmd(pmpriv, 0, 0, 0, (t_void *)MNULL, (t_void *)hostcmd); @@ -4936,8 +4748,8 @@ done: * * @return MLAN_STATUS_SUCCESS or FAIL */ -mlan_status -wlan_process_mef_cfg_cmd(IN mlan_private *pmpriv, IN pmlan_adapter pmadapter) +mlan_status wlan_process_mef_cfg_cmd(IN mlan_private *pmpriv, + IN pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb; @@ -4950,7 +4762,7 @@ wlan_process_mef_cfg_cmd(IN mlan_private *pmpriv, IN pmlan_adapter pmadapter) pcb = &pmadapter->callbacks; - /** check how many entries in adapter*/ + /** check how many entries in adapter*/ pmef = &pmadapter->entry_cfg; entry_num += pmef->num_wowlan_entry; entry_num += pmef->num_ipv6_ns_offload; @@ -4967,24 +4779,24 @@ wlan_process_mef_cfg_cmd(IN mlan_private *pmpriv, IN pmlan_adapter pmadapter) ret = MLAN_STATUS_FAILURE; goto err_handle; } - /** Fill mef_cfg structure*/ + /** Fill mef_cfg structure*/ mef.criteria = pmef->criteria; mef.entry_num = entry_num; memset(pmadapter, mef.pentry, 0, sizeof(mef_entry_t) * entry_num); pentry = mef.pentry; - /** Fill mef_entry_t structure*/ - /** Copy wowlan entry*/ + /** Fill mef_entry_t structure*/ + /** Copy wowlan entry*/ if (pmef->num_wowlan_entry) { memcpy_ext(pmadapter, pentry, &pmef->entry[6], sizeof(mef_entry_t), sizeof(mef_entry_t)); pentry += pmef->num_wowlan_entry; } - /** Copy IPv6 NS message offload entry */ + /** Copy IPv6 NS message offload entry */ if (pmef->num_ipv6_ns_offload) memcpy_ext(pmadapter, pentry, &pmef->entry[7], sizeof(mef_entry_t), sizeof(mef_entry_t)); - /** Set Entries to firmware*/ + /** Set Entries to firmware*/ ret = wlan_set_mef_entry(pmpriv, pmadapter, &mef); if (ret != MLAN_STATUS_SUCCESS) PRINTM(MERROR, "Set MEF entries error\n"); @@ -5004,9 +4816,8 @@ done: * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_misc_ioctl_mef_flt_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_mef_flt_cfg(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cfg *misc_cfg = MNULL; @@ -5059,9 +4870,8 @@ wlan_misc_ioctl_mef_flt_cfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_sec_ioctl_passphrase(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_sec_ioctl_passphrase(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]; @@ -5078,9 +4888,9 @@ wlan_sec_ioctl_passphrase(IN pmlan_adapter pmadapter, if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA && !IS_FW_SUPPORT_SUPPLICANT(pmpriv->adapter)) { if (sec->param.passphrase.psk_type == MLAN_PSK_QUERY) - SupplicantQueryPassphrase(pmpriv->psapriv, - (void *)&sec->param. - passphrase); + SupplicantQueryPassphrase( + pmpriv->psapriv, + (void *)&sec->param.passphrase); else if (sec->param.passphrase.psk_type == MLAN_PSK_CLEAR) SupplicantClearPMK(pmpriv->psapriv, (void *)&sec->param.passphrase); @@ -5110,10 +4920,10 @@ wlan_sec_ioctl_passphrase(IN pmlan_adapter pmadapter, #ifdef STA_SUPPORT if (GET_BSS_ROLE(pmpriv) == MLAN_BSS_ROLE_STA && sec->param.passphrase.ssid.ssid_len == 0) { - i = wlan_find_bssid_in_list(pmpriv, - (t_u8 *)&sec->param. - passphrase.bssid, - MLAN_BSS_MODE_AUTO); + 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_ext(pmadapter, @@ -5137,9 +4947,7 @@ wlan_sec_ioctl_passphrase(IN pmlan_adapter pmadapter, } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_SUPPLICANT_PMK, - cmd_action, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_SUPPLICANT_PMK, cmd_action, 0, (t_void *)pioctl_req, (t_void *)sec); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -5156,8 +4964,8 @@ wlan_sec_ioctl_passphrase(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_misc_per_pkt_cfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_per_pkt_cfg(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]; @@ -5182,9 +4990,8 @@ wlan_misc_per_pkt_cfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_region(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_region(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]; @@ -5222,8 +5029,8 @@ wlan_misc_ioctl_region(IN pmlan_adapter pmadapter, 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)) { + pmadapter->config_bands | + pmadapter->adhoc_start_band)) { pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; ret = MLAN_STATUS_FAILURE; } @@ -5242,9 +5049,8 @@ wlan_misc_ioctl_region(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_ind_rst_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_ind_rst_cfg(IN pmlan_adapter pmadapter, + 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; @@ -5259,10 +5065,8 @@ wlan_misc_ioctl_ind_rst_cfg(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_SET; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_INDEPENDENT_RESET_CFG, - cmd_action, 0, - (t_void *)pioctl_req, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_INDEPENDENT_RESET_CFG, + cmd_action, 0, (t_void *)pioctl_req, (t_void *)&misc->param.ind_rst_cfg); if (ret == MLAN_STATUS_SUCCESS) @@ -5280,9 +5084,8 @@ wlan_misc_ioctl_ind_rst_cfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_get_tsf(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_get_tsf(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -5298,9 +5101,8 @@ wlan_misc_ioctl_get_tsf(IN pmlan_adapter pmadapter, } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_GET_TSF, - cmd_action, 0, (t_void *)pioctl_req, MNULL); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_GET_TSF, cmd_action, 0, + (t_void *)pioctl_req, MNULL); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -5317,9 +5119,8 @@ wlan_misc_ioctl_get_tsf(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_chan_reg_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_chan_reg_cfg(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -5335,9 +5136,8 @@ wlan_misc_chan_reg_cfg(IN pmlan_adapter pmadapter, } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_CHAN_REGION_CFG, - cmd_action, 0, (t_void *)pioctl_req, MNULL); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_CHAN_REGION_CFG, cmd_action, + 0, (t_void *)pioctl_req, MNULL); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -5354,9 +5154,8 @@ wlan_misc_chan_reg_cfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_misc_ioctl_operclass_validation(IN pmlan_adapter pmadapter, - IN mlan_ioctl_req *pioctl_req) +mlan_status wlan_misc_ioctl_operclass_validation(IN pmlan_adapter pmadapter, + IN mlan_ioctl_req *pioctl_req) { pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_misc_cfg *misc = MNULL; @@ -5389,8 +5188,8 @@ wlan_misc_ioctl_operclass_validation(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_get_rgchnpwr_cfg(IN pmlan_adapter pmadapter, IN mlan_ioctl_req *pioctl_req) +mlan_status wlan_get_rgchnpwr_cfg(IN pmlan_adapter pmadapter, + IN mlan_ioctl_req *pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -5403,16 +5202,14 @@ wlan_get_rgchnpwr_cfg(IN pmlan_adapter pmadapter, IN mlan_ioctl_req *pioctl_req) cmd_action = HostCmd_ACT_GEN_GET; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_CHAN_REGION_CFG, - cmd_action, 0, (t_void *)pioctl_req, MNULL); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_CHAN_REGION_CFG, cmd_action, + 0, (t_void *)pioctl_req, MNULL); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; LEAVE(); return ret; - } /** @@ -5423,9 +5220,8 @@ wlan_get_rgchnpwr_cfg(IN pmlan_adapter pmadapter, IN mlan_ioctl_req *pioctl_req) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_get_chan_trpc_cfg(IN pmlan_adapter pmadapter, - IN mlan_ioctl_req *pioctl_req) +mlan_status wlan_get_chan_trpc_cfg(IN pmlan_adapter pmadapter, + IN mlan_ioctl_req *pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -5438,10 +5234,8 @@ wlan_get_chan_trpc_cfg(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_GET; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CHANNEL_TRPC_CONFIG, - cmd_action, 0, - (t_void *)pioctl_req, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CHANNEL_TRPC_CONFIG, cmd_action, + 0, (t_void *)pioctl_req, (t_void *)&misc->param.trpc_cfg); if (ret == MLAN_STATUS_SUCCESS) @@ -5449,7 +5243,6 @@ wlan_get_chan_trpc_cfg(IN pmlan_adapter pmadapter, LEAVE(); return ret; - } /** @@ -5460,9 +5253,8 @@ wlan_get_chan_trpc_cfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_misc_ioctl_oper_class(IN pmlan_adapter pmadapter, - IN mlan_ioctl_req *pioctl_req) +mlan_status wlan_misc_ioctl_oper_class(IN pmlan_adapter pmadapter, + IN mlan_ioctl_req *pioctl_req) { pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_misc_cfg *misc = MNULL; @@ -5510,9 +5302,8 @@ wlan_misc_ioctl_oper_class(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_misc_ioctl_fw_dump_event(IN pmlan_adapter pmadapter, - IN mlan_ioctl_req *pioctl_req) +mlan_status wlan_misc_ioctl_fw_dump_event(IN pmlan_adapter pmadapter, + IN mlan_ioctl_req *pioctl_req) { pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_misc_cfg *misc = MNULL; @@ -5534,9 +5325,8 @@ wlan_misc_ioctl_fw_dump_event(IN pmlan_adapter pmadapter, } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_FW_DUMP_EVENT, - cmd_action, 0, (t_void *)pioctl_req, MNULL); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_FW_DUMP_EVENT, cmd_action, 0, + (t_void *)pioctl_req, MNULL); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -5553,8 +5343,8 @@ wlan_misc_ioctl_fw_dump_event(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_misc_bootsleep(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_bootsleep(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_misc_cfg *misc = MNULL; @@ -5577,10 +5367,7 @@ wlan_misc_bootsleep(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_BOOT_SLEEP, - cmd_action, - 0, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_BOOT_SLEEP, cmd_action, 0, (t_void *)pioctl_req, &misc->param.boot_sleep); if (ret == MLAN_STATUS_SUCCESS) @@ -5598,9 +5385,8 @@ wlan_misc_bootsleep(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_radio_ioctl_band_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_radio_ioctl_band_cfg(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { t_u32 i, global_band = 0; t_u32 infra_band = 0; @@ -5634,24 +5420,24 @@ wlan_radio_ioctl_band_cfg(IN pmlan_adapter pmadapter, 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) + if (pmadapter->priv[i] && + pmadapter->priv[i] != pmpriv && + GET_BSS_ROLE(pmadapter->priv[i]) == + MLAN_BSS_ROLE_STA) global_band |= (t_u32)pmadapter->priv[i]->config_bands; } global_band |= infra_band; - if (wlan_set_regiontable(pmpriv, - (t_u8)pmadapter->region_code, + 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; } #ifdef STA_SUPPORT - if (wlan_11d_set_universaltable - (pmpriv, global_band | adhoc_band)) { + if (wlan_11d_set_universaltable(pmpriv, + global_band | adhoc_band)) { pioctl_req->status_code = MLAN_ERROR_IOCTL_FAIL; LEAVE(); return MLAN_STATUS_FAILURE; @@ -5669,18 +5455,14 @@ wlan_radio_ioctl_band_cfg(IN pmlan_adapter pmadapter, * 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)) { + 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) - ) { - radio_cfg->param.band_cfg. - adhoc_channel = + if ((pmadapter->adhoc_start_band & BAND_A)) { + radio_cfg->param.band_cfg.adhoc_channel = DEFAULT_AD_HOC_CHANNEL_A; } } @@ -5688,11 +5470,9 @@ wlan_radio_ioctl_band_cfg(IN pmlan_adapter pmadapter, /* 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)) { + 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(); @@ -5731,9 +5511,8 @@ wlan_radio_ioctl_band_cfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_rxabortcfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_rxabortcfg(IN pmlan_adapter pmadapter, + 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; @@ -5746,10 +5525,7 @@ wlan_misc_ioctl_rxabortcfg(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_SET; else cmd_action = HostCmd_ACT_GEN_GET; - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_RX_ABORT_CFG, - cmd_action, - 0, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_RX_ABORT_CFG, cmd_action, 0, (t_void *)pioctl_req, &(pmisc->param.rx_abort_cfg)); if (ret == MLAN_STATUS_SUCCESS) @@ -5758,7 +5534,6 @@ wlan_misc_ioctl_rxabortcfg(IN pmlan_adapter pmadapter, LEAVE(); return ret; } - /** * @brief Rx Abort Cfg ext * @@ -5767,9 +5542,8 @@ wlan_misc_ioctl_rxabortcfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_rxabortcfg_ext(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_rxabortcfg_ext(IN pmlan_adapter pmadapter, + 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; @@ -5782,11 +5556,8 @@ wlan_misc_ioctl_rxabortcfg_ext(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_SET; else cmd_action = HostCmd_ACT_GEN_GET; - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_RX_ABORT_CFG_EXT, - cmd_action, - 0, - (t_void *)pioctl_req, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_RX_ABORT_CFG_EXT, cmd_action, + 0, (t_void *)pioctl_req, &(pmisc->param.rx_abort_cfg_ext)); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -5803,9 +5574,8 @@ wlan_misc_ioctl_rxabortcfg_ext(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_tx_ampdu_prot_mode(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_tx_ampdu_prot_mode(IN pmlan_adapter pmadapter, + 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; @@ -5818,11 +5588,8 @@ wlan_misc_ioctl_tx_ampdu_prot_mode(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_SET; else cmd_action = HostCmd_ACT_GEN_GET; - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_TX_AMPDU_PROT_MODE, - cmd_action, - 0, - (t_void *)pioctl_req, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_TX_AMPDU_PROT_MODE, + cmd_action, 0, (t_void *)pioctl_req, &(pmisc->param.tx_ampdu_prot_mode)); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -5839,9 +5606,8 @@ wlan_misc_ioctl_tx_ampdu_prot_mode(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_rate_adapt_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_rate_adapt_cfg(IN pmlan_adapter pmadapter, + 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; @@ -5854,11 +5620,8 @@ wlan_misc_ioctl_rate_adapt_cfg(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_SET; else cmd_action = HostCmd_ACT_GEN_GET; - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_RATE_ADAPT_CFG, - cmd_action, - 0, - (t_void *)pioctl_req, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_RATE_ADAPT_CFG, cmd_action, + 0, (t_void *)pioctl_req, &(pmisc->param.rate_adapt_cfg)); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -5875,9 +5638,8 @@ wlan_misc_ioctl_rate_adapt_cfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_cck_desense_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_cck_desense_cfg(IN pmlan_adapter pmadapter, + 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; @@ -5890,11 +5652,8 @@ wlan_misc_ioctl_cck_desense_cfg(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_SET; else cmd_action = HostCmd_ACT_GEN_GET; - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_CCK_DESENSE_CFG, - cmd_action, - 0, - (t_void *)pioctl_req, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_CCK_DESENSE_CFG, cmd_action, + 0, (t_void *)pioctl_req, &(pmisc->param.cck_desense_cfg)); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -5911,9 +5670,8 @@ wlan_misc_ioctl_cck_desense_cfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_misc_ioctl_dyn_bw(IN pmlan_adapter pmadapter, - IN mlan_ioctl_req *pioctl_req) +mlan_status wlan_misc_ioctl_dyn_bw(IN pmlan_adapter pmadapter, + IN mlan_ioctl_req *pioctl_req) { pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_misc_cfg *misc = MNULL; @@ -5935,10 +5693,8 @@ wlan_misc_ioctl_dyn_bw(IN pmlan_adapter pmadapter, } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_DYN_BW, - cmd_action, - 0, (t_void *)pioctl_req, &misc->param.dyn_bw); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_DYN_BW, cmd_action, 0, + (t_void *)pioctl_req, &misc->param.dyn_bw); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -5955,9 +5711,8 @@ wlan_misc_ioctl_dyn_bw(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success */ -mlan_status -wlan_power_ioctl_set_get_lpm(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_power_ioctl_set_get_lpm(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]; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_pcie.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_pcie.c index fd727c06dac9..107c18827090 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_pcie.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_pcie.c @@ -64,9 +64,8 @@ static mlan_status wlan_pcie_delete_rxbd_ring(mlan_adapter *pmadapter); * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_init_adma(mlan_adapter *pmadapter, t_u8 type, t_u64 pbase, t_u16 size, - t_u8 init) +static mlan_status wlan_init_adma(mlan_adapter *pmadapter, t_u8 type, + t_u64 pbase, t_u16 size, t_u8 init) { t_u32 dma_cfg, dma_cfg2, int_mapping; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -128,10 +127,9 @@ wlan_init_adma(mlan_adapter *pmadapter, t_u8 type, t_u64 pbase, t_u16 size, int_mapping = 0; } /* set INT_MAPPING register */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - q_addr + ADMA_INT_MAPPING, - (t_u32)int_mapping)) { + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + q_addr + ADMA_INT_MAPPING, + (t_u32)int_mapping)) { PRINTM(MERROR, "Failed to write ADMA_INT_MAPPING register.\n"); ret = MLAN_STATUS_FAILURE; @@ -139,20 +137,18 @@ wlan_init_adma(mlan_adapter *pmadapter, t_u8 type, t_u64 pbase, t_u16 size, } /* Read the dma_cfg2 register */ - if (pcb-> - moal_read_reg(pmadapter->pmoal_handle, - q_addr + ADMA_DMA_CFG2, &dma_cfg2)) { + if (pcb->moal_read_reg(pmadapter->pmoal_handle, + q_addr + ADMA_DMA_CFG2, &dma_cfg2)) { PRINTM(MERROR, "Fail to read DMA CFG2 register\n"); ret = MLAN_STATUS_FAILURE; goto done; } - dma_cfg2 &= - ~(ADMA_SRC_DMA_DONE_INT_BYPASS_EN | - ADMA_DST_DMA_DONE_INT_BYPASS_EN | - ADMA_MSI_LEGACY_SRC_DMA_DONE_INT_BYPASS_EN | - ADMA_MSI_LEGACY_DST_DMA_DONE_INT_BYPASS_EN | - ADMA_MSI_LEGACY_ENABLE | ADMA_MSIX_ENABLE | - ADMA_MSIX_INT_SRC_DST_SEL); + dma_cfg2 &= ~(ADMA_SRC_DMA_DONE_INT_BYPASS_EN | + ADMA_DST_DMA_DONE_INT_BYPASS_EN | + ADMA_MSI_LEGACY_SRC_DMA_DONE_INT_BYPASS_EN | + ADMA_MSI_LEGACY_DST_DMA_DONE_INT_BYPASS_EN | + ADMA_MSI_LEGACY_ENABLE | ADMA_MSIX_ENABLE | + ADMA_MSIX_INT_SRC_DST_SEL); if (dma_mode == DMA_MODE_DUAL_DESC) { if (direction == ADMA_HOST_TO_DEVICE) { @@ -175,11 +171,11 @@ wlan_init_adma(mlan_adapter *pmadapter, t_u8 type, t_u64 pbase, t_u16 size, dma_cfg2 |= ADMA_DST_ADDR_IS_HOST; } - if (pmadapter->pcard_pcie->pcie_int_mode == PCIE_INT_MODE_MSIX) { - if (pcb-> - moal_read_reg(pmadapter->pmoal_handle, - q_addr + ADMA_MSIX_DOORBELL_DATA, - &msix_data)) { + if (pmadapter->pcard_pcie->pcie_int_mode == + PCIE_INT_MODE_MSIX) { + if (pcb->moal_read_reg(pmadapter->pmoal_handle, + q_addr + ADMA_MSIX_DOORBELL_DATA, + &msix_data)) { PRINTM(MERROR, "Fail to read DMA MSIX data register\n"); ret = MLAN_STATUS_FAILURE; @@ -188,14 +184,13 @@ wlan_init_adma(mlan_adapter *pmadapter, t_u8 type, t_u64 pbase, t_u16 size, msix_data &= ~ADMA_MSIX_VECTOR_MASK; msix_data &= ~ADMA_MSIX_PF_MASK; msix_data |= msix_vector; - msix_data |= - pmadapter->pcard_pcie-> - func_num << ADMA_MSIX_PF_BIT; + msix_data |= pmadapter->pcard_pcie->func_num + << ADMA_MSIX_PF_BIT; PRINTM(MCMND, "msix_data=0x%x\n", msix_data); - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - q_addr + ADMA_MSIX_DOORBELL_DATA, - (t_u32)msix_data)) { + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + q_addr + + ADMA_MSIX_DOORBELL_DATA, + (t_u32)msix_data)) { PRINTM(MERROR, "Failed to write DMA DOORBELL_DATA.\n"); ret = MLAN_STATUS_FAILURE; @@ -207,55 +202,53 @@ wlan_init_adma(mlan_adapter *pmadapter, t_u8 type, t_u64 pbase, t_u16 size, PRINTM(MCMND, "dma_cfg2=0x%x\n", dma_cfg2); /* enable INT_BYPASS_EN in the dma_cfg2 register */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - q_addr + ADMA_DMA_CFG2, (t_u32)dma_cfg2)) { + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + q_addr + ADMA_DMA_CFG2, + (t_u32)dma_cfg2)) { PRINTM(MERROR, "Failed to write DMA CFG2.\n"); ret = MLAN_STATUS_FAILURE; goto done; } } /* Read the TX ring read pointer set by firmware */ - if (pcb-> - moal_read_reg(pmadapter->pmoal_handle, q_addr + ADMA_DMA_CFG, - &dma_cfg)) { + if (pcb->moal_read_reg(pmadapter->pmoal_handle, q_addr + ADMA_DMA_CFG, + &dma_cfg)) { PRINTM(MERROR, "Fail to read DMA CFG register\n"); ret = MLAN_STATUS_FAILURE; goto done; } if (direction == ADMA_HOST_TO_DEVICE) { - /* Write the lower 32bits of the physical address to ADMA_SRC_LOW */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - q_addr + ADMA_SRC_LOW, (t_u32)pbase)) { + /* Write the lower 32bits of the physical address to + * ADMA_SRC_LOW */ + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + q_addr + ADMA_SRC_LOW, (t_u32)pbase)) { PRINTM(MERROR, "Failed to write ADMA_SRC_LOW.\n"); ret = MLAN_STATUS_FAILURE; goto done; } - /* Write the upper 32bits of the physical address to ADMA_SRC_HIGH */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - q_addr + ADMA_SRC_HIGH, - (t_u32)((t_u64)pbase >> 32))) { + /* Write the upper 32bits of the physical address to + * ADMA_SRC_HIGH */ + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + q_addr + ADMA_SRC_HIGH, + (t_u32)((t_u64)pbase >> 32))) { PRINTM(MERROR, "Failed to write ADMA_SRC_HIGH.\n"); ret = MLAN_STATUS_FAILURE; goto done; } if (init) { - /** Enable DMA done interrupt */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - q_addr + ADMA_SRC_INT_STATUS_MASK, - DEF_ADMA_INT_MASK)) { + /** Enable DMA done interrupt */ + if (pcb->moal_write_reg( + pmadapter->pmoal_handle, + q_addr + ADMA_SRC_INT_STATUS_MASK, + DEF_ADMA_INT_MASK)) { PRINTM(MERROR, "Failed to write ADMA_SRC_INT_STATUS_MASK.\n"); ret = MLAN_STATUS_FAILURE; goto done; } - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - q_addr + ADMA_SRC_INT_MASK, - DEF_ADMA_INT_MASK)) { + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + q_addr + ADMA_SRC_INT_MASK, + DEF_ADMA_INT_MASK)) { PRINTM(MERROR, "Failed to write ADMA_SRC_INT_MASK.\n"); ret = MLAN_STATUS_FAILURE; @@ -263,51 +256,48 @@ wlan_init_adma(mlan_adapter *pmadapter, t_u8 type, t_u64 pbase, t_u16 size, } } if (dma_mode == DMA_MODE_DUAL_DESC) { - dma_cfg &= - ~(DESC_MODE_MASK | DMA_MODE_MASK | - SRC_NUM_DESC_MASK | DMA_SIZE_MASK); + dma_cfg &= ~(DESC_MODE_MASK | DMA_MODE_MASK | + SRC_NUM_DESC_MASK | DMA_SIZE_MASK); dma_cfg |= (t_u32)size << SRC_NUM_DESC_BIT; dma_cfg |= DESC_MODE_RING << 2; } else { - dma_cfg &= - ~(DESC_MODE_MASK | DMA_MODE_MASK | - SRC_NUM_DESC_MASK | DST_NUM_DESC_MASK | - DMA_SIZE_MASK); + dma_cfg &= ~(DESC_MODE_MASK | DMA_MODE_MASK | + SRC_NUM_DESC_MASK | DST_NUM_DESC_MASK | + DMA_SIZE_MASK); dma_cfg |= (t_u32)size << DMA_SIZE_BIT; } } else { - /* Write the lower 32bits of the physical address to ADMA_DST_LOW */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - q_addr + ADMA_DST_LOW, (t_u32)pbase)) { + /* Write the lower 32bits of the physical address to + * ADMA_DST_LOW */ + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + q_addr + ADMA_DST_LOW, (t_u32)pbase)) { PRINTM(MERROR, "Failed to write ADMA_DST_LOW.\n"); ret = MLAN_STATUS_FAILURE; goto done; } - /* Write the upper 32bits of the physical address to ADMA_DST_HIGH */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - q_addr + ADMA_DST_HIGH, - (t_u32)((t_u64)pbase >> 32))) { + /* Write the upper 32bits of the physical address to + * ADMA_DST_HIGH */ + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + q_addr + ADMA_DST_HIGH, + (t_u32)((t_u64)pbase >> 32))) { PRINTM(MERROR, "Failed to write ADMA_DST_HIGH.\n"); ret = MLAN_STATUS_FAILURE; goto done; } if (init && (dma_mode == DMA_MODE_DUAL_DESC)) { - /** Enable DMA done interrupt */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - q_addr + ADMA_DST_INT_STATUS_MASK, - DEF_ADMA_INT_MASK)) { + /** Enable DMA done interrupt */ + if (pcb->moal_write_reg( + pmadapter->pmoal_handle, + q_addr + ADMA_DST_INT_STATUS_MASK, + DEF_ADMA_INT_MASK)) { PRINTM(MERROR, "Failed to write ADMA_SRC_INT_STATUS_MASK.\n"); ret = MLAN_STATUS_FAILURE; goto done; } - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - q_addr + ADMA_DST_INT_MASK, - DEF_ADMA_INT_MASK)) { + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + q_addr + ADMA_DST_INT_MASK, + DEF_ADMA_INT_MASK)) { PRINTM(MERROR, "Failed to write ADMA_SRC_INT_MASK.\n"); ret = MLAN_STATUS_FAILURE; @@ -315,30 +305,26 @@ wlan_init_adma(mlan_adapter *pmadapter, t_u8 type, t_u64 pbase, t_u16 size, } } if (dma_mode == DMA_MODE_DUAL_DESC) { - dma_cfg &= - ~(DESC_MODE_MASK | DMA_MODE_MASK | - DST_NUM_DESC_MASK | DMA_SIZE_MASK); + dma_cfg &= ~(DESC_MODE_MASK | DMA_MODE_MASK | + DST_NUM_DESC_MASK | DMA_SIZE_MASK); dma_cfg |= (t_u32)size << DST_NUM_DESC_BIT; dma_cfg |= DESC_MODE_RING << 2; } else { - dma_cfg &= - ~(DESC_MODE_MASK | DMA_MODE_MASK | - SRC_NUM_DESC_MASK | DST_NUM_DESC_MASK); + dma_cfg &= ~(DESC_MODE_MASK | DMA_MODE_MASK | + SRC_NUM_DESC_MASK | DST_NUM_DESC_MASK); } } dma_cfg |= (t_u32)dma_mode; - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, q_addr + ADMA_DMA_CFG, - dma_cfg)) { + if (pcb->moal_write_reg(pmadapter->pmoal_handle, q_addr + ADMA_DMA_CFG, + dma_cfg)) { PRINTM(MERROR, "Fail to set DMA CFG register\n"); LEAVE(); return MLAN_STATUS_FAILURE; } if (type == ADMA_CMD && !init) { /* Write 1 to src_wr_ptr to trigger direct dma */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - q_addr + ADMA_SRC_RW_PTR, 1)) { + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + q_addr + ADMA_SRC_RW_PTR, 1)) { PRINTM(MERROR, "Failed to write ADMA_SRC_HIGH.\n"); ret = MLAN_STATUS_FAILURE; goto done; @@ -359,8 +345,8 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_set_host_int_select_mask(mlan_adapter *pmadapter, t_u8 enable) +static mlan_status wlan_pcie_set_host_int_select_mask(mlan_adapter *pmadapter, + t_u8 enable) { pmlan_callbacks pcb = &pmadapter->callbacks; t_u32 int_sel_mask = 0; @@ -381,12 +367,11 @@ wlan_pcie_set_host_int_select_mask(mlan_adapter *pmadapter, t_u8 enable) } if (pmadapter->pcard_pcie->pcie_int_mode == PCIE_INT_MODE_MSI) { if (!pmadapter->pcard_pcie->reg->msi_int_wr_clr) { - /** enable read to clear interrupt */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg-> - reg_host_int_clr_sel, - int_clr_mask)) { + /** enable read to clear interrupt */ + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg + ->reg_host_int_clr_sel, + int_clr_mask)) { PRINTM(MWARN, "enable read to clear interrupt failed\n"); LEAVE(); @@ -408,19 +393,19 @@ wlan_pcie_set_host_int_select_mask(mlan_adapter *pmadapter, t_u8 enable) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_send_vdll_complete(mlan_adapter *pmadapter) +static mlan_status wlan_pcie_send_vdll_complete(mlan_adapter *pmadapter) { mlan_buffer *pcmdbuf; pmlan_callbacks pcb = &pmadapter->callbacks; ENTER(); - /*unmap the cmd pmbuf, so the cpu can not access the memory in the command node */ + /*unmap the cmd pmbuf, so the cpu can not access the memory in the + * command node*/ pcmdbuf = pmadapter->pcard_pcie->vdll_cmd_buf; if (pcmdbuf) { pcb->moal_unmap_memory(pmadapter->pmoal_handle, pcmdbuf->pbuf + pcmdbuf->data_offset, - pcmdbuf->buf_pa, - pcmdbuf->data_len, PCI_DMA_TODEVICE); + pcmdbuf->buf_pa, pcmdbuf->data_len, + PCI_DMA_TODEVICE); pmadapter->pcard_pcie->vdll_cmd_buf = MNULL; } LEAVE(); @@ -435,8 +420,8 @@ wlan_pcie_send_vdll_complete(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_send_vdll(mlan_adapter *pmadapter, mlan_buffer *pmbuf) +static mlan_status wlan_pcie_send_vdll(mlan_adapter *pmadapter, + mlan_buffer *pmbuf) { mlan_status ret = MLAN_STATUS_PENDING; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -452,12 +437,10 @@ wlan_pcie_send_vdll(mlan_adapter *pmadapter, mlan_buffer *pmbuf) tmp = (t_u16 *)&payload[2]; *tmp = wlan_cpu_to_le16(MLAN_TYPE_VDLL); - if (MLAN_STATUS_FAILURE == pcb->moal_map_memory(pmadapter->pmoal_handle, - pmbuf->pbuf + - pmbuf->data_offset, - &pmbuf->buf_pa, - pmbuf->data_len, - PCI_DMA_TODEVICE)) { + if (MLAN_STATUS_FAILURE == + pcb->moal_map_memory( + pmadapter->pmoal_handle, pmbuf->pbuf + pmbuf->data_offset, + &pmbuf->buf_pa, pmbuf->data_len, PCI_DMA_TODEVICE)) { PRINTM(MERROR, "PCIE - Download VDLL block: moal_map_memory failed\n"); ret = MLAN_STATUS_FAILURE; @@ -486,16 +469,14 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_disable_host_int_mask(mlan_adapter *pmadapter) +static mlan_status wlan_pcie_disable_host_int_mask(mlan_adapter *pmadapter) { pmlan_callbacks pcb = &pmadapter->callbacks; ENTER(); - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg->reg_host_int_mask, - 0x00000000)) { + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_host_int_mask, + 0x00000000)) { PRINTM(MWARN, "Disable host interrupt failed\n"); LEAVE(); return MLAN_STATUS_FAILURE; @@ -511,16 +492,14 @@ wlan_pcie_disable_host_int_mask(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_enable_host_int_mask(mlan_adapter *pmadapter) +static mlan_status wlan_pcie_enable_host_int_mask(mlan_adapter *pmadapter) { pmlan_callbacks pcb = &pmadapter->callbacks; ENTER(); /* Simply write the mask to the register */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg->reg_host_int_mask, - pmadapter->pcard_pcie->reg->host_intr_mask)) { + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_host_int_mask, + pmadapter->pcard_pcie->reg->host_intr_mask)) { PRINTM(MWARN, "Enable host interrupt failed\n"); LEAVE(); return MLAN_STATUS_FAILURE; @@ -547,10 +526,10 @@ wlan_pcie_enable_host_int_status_mask(mlan_adapter *pmadapter, t_u8 enable) host_int_status_mask = pmadapter->pcard_pcie->reg->host_intr_mask; /* Enable host int status mask */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg->reg_host_int_status_mask, - host_int_status_mask)) { + if (pcb->moal_write_reg( + pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_host_int_status_mask, + host_int_status_mask)) { PRINTM(MWARN, "Enable host interrupt status mask failed\n"); LEAVE(); return MLAN_STATUS_FAILURE; @@ -566,8 +545,7 @@ wlan_pcie_enable_host_int_status_mask(mlan_adapter *pmadapter, t_u8 enable) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_disable_pcie_host_int(mlan_adapter *pmadapter) +mlan_status wlan_disable_pcie_host_int(mlan_adapter *pmadapter) { mlan_status ret; @@ -578,8 +556,8 @@ wlan_disable_pcie_host_int(mlan_adapter *pmadapter) return ret; } #if defined(PCIE9098) || defined(PCIE9097) - if ((pmadapter->card_type == CARD_TYPE_PCIE9098) - || (pmadapter->card_type == CARD_TYPE_PCIE9097)) { + if ((pmadapter->card_type == CARD_TYPE_PCIE9098) || + (pmadapter->card_type == CARD_TYPE_PCIE9097)) { ret = wlan_pcie_set_host_int_select_mask(pmadapter, MFALSE); if (ret) { LEAVE(); @@ -600,8 +578,7 @@ wlan_disable_pcie_host_int(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_clear_pending_int_status(mlan_adapter *pmadapter) +mlan_status wlan_clear_pending_int_status(mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 pcie_ireg = 0; @@ -611,10 +588,9 @@ wlan_clear_pending_int_status(mlan_adapter *pmadapter) if (pmadapter->pcard_pcie->pcie_int_mode == PCIE_INT_MODE_MSIX) goto done; - if (pcb-> - moal_read_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg->reg_host_int_status, - &pcie_ireg)) { + if (pcb->moal_read_reg(pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_host_int_status, + &pcie_ireg)) { PRINTM(MERROR, "Read host int status register failed\n"); ret = MLAN_STATUS_FAILURE; goto done; @@ -623,8 +599,8 @@ wlan_clear_pending_int_status(mlan_adapter *pmadapter) PRINTM(MMSG, "pcie_ireg=0x%x\n", pcie_ireg); if (pmadapter->pcard_pcie->reg->msi_int_wr_clr) { if (pcb->moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg-> - reg_host_int_status, + pmadapter->pcard_pcie->reg + ->reg_host_int_status, ~pcie_ireg)) { PRINTM(MERROR, "Write host int status register failed\n"); @@ -645,8 +621,7 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_enable_pcie_host_int(mlan_adapter *pmadapter) +mlan_status wlan_enable_pcie_host_int(mlan_adapter *pmadapter) { mlan_status ret; @@ -658,8 +633,8 @@ wlan_enable_pcie_host_int(mlan_adapter *pmadapter) return ret; } #if defined(PCIE9098) || defined(PCIE9097) - if ((pmadapter->card_type == CARD_TYPE_PCIE9098) - || (pmadapter->card_type == CARD_TYPE_PCIE9097)) { + if ((pmadapter->card_type == CARD_TYPE_PCIE9098) || + (pmadapter->card_type == CARD_TYPE_PCIE9097)) { ret = wlan_pcie_set_host_int_select_mask(pmadapter, MTRUE); if (ret) { LEAVE(); @@ -679,8 +654,7 @@ wlan_enable_pcie_host_int(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_create_txbd_ring(mlan_adapter *pmadapter) +static mlan_status wlan_pcie_create_txbd_ring(mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -717,12 +691,10 @@ wlan_pcie_create_txbd_ring(mlan_adapter *pmadapter) PRINTM(MINFO, "TX ring: allocating %d bytes\n", pmadapter->pcard_pcie->txbd_ring_size); - ret = pcb->moal_malloc_consistent(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->txbd_ring_size, - &pmadapter->pcard_pcie-> - txbd_ring_vbase, - &pmadapter->pcard_pcie-> - txbd_ring_pbase); + ret = pcb->moal_malloc_consistent( + pmadapter->pmoal_handle, pmadapter->pcard_pcie->txbd_ring_size, + &pmadapter->pcard_pcie->txbd_ring_vbase, + &pmadapter->pcard_pcie->txbd_ring_pbase); if (ret != MLAN_STATUS_SUCCESS) { PRINTM(MERROR, "%s: No free moal_malloc_consistent\n", @@ -731,8 +703,10 @@ wlan_pcie_create_txbd_ring(mlan_adapter *pmadapter) return MLAN_STATUS_FAILURE; } - PRINTM(MINFO, "TX ring: - base: %p, pbase: %#x:%x," - "len: %x\n", pmadapter->pcard_pcie->txbd_ring_vbase, + PRINTM(MINFO, + "TX ring: - base: %p, pbase: %#x:%x," + "len: %x\n", + pmadapter->pcard_pcie->txbd_ring_vbase, (t_u32)((t_u64)pmadapter->pcard_pcie->txbd_ring_pbase >> 32), (t_u32)pmadapter->pcard_pcie->txbd_ring_pbase, pmadapter->pcard_pcie->txbd_ring_size); @@ -742,11 +716,10 @@ wlan_pcie_create_txbd_ring(mlan_adapter *pmadapter) #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { padma_bd_buf = - (adma_dual_desc_buf *) (pmadapter->pcard_pcie-> - txbd_ring_vbase + - (sizeof - (adma_dual_desc_buf) * - i)); + (adma_dual_desc_buf + *)(pmadapter->pcard_pcie + ->txbd_ring_vbase + + (sizeof(adma_dual_desc_buf) * i)); pmadapter->pcard_pcie->txbd_ring[i] = (t_void *)padma_bd_buf; padma_bd_buf->paddr = 0; @@ -762,11 +735,10 @@ wlan_pcie_create_txbd_ring(mlan_adapter *pmadapter) #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { ptx_bd_buf = - (mlan_pcie_data_buf *)(pmadapter->pcard_pcie-> - txbd_ring_vbase + - (sizeof - (mlan_pcie_data_buf) * - i)); + (mlan_pcie_data_buf + *)(pmadapter->pcard_pcie + ->txbd_ring_vbase + + (sizeof(mlan_pcie_data_buf) * i)); pmadapter->pcard_pcie->txbd_ring[i] = (t_void *)ptx_bd_buf; ptx_bd_buf->paddr = 0; @@ -788,8 +760,7 @@ wlan_pcie_create_txbd_ring(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_delete_txbd_ring(mlan_adapter *pmadapter) +static mlan_status wlan_pcie_delete_txbd_ring(mlan_adapter *pmadapter) { t_u32 i; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -818,8 +789,8 @@ wlan_pcie_delete_txbd_ring(mlan_adapter *pmadapter) #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { ptx_bd_buf = - (mlan_pcie_data_buf *)pmadapter->pcard_pcie-> - txbd_ring[i]; + (mlan_pcie_data_buf *) + pmadapter->pcard_pcie->txbd_ring[i]; if (ptx_bd_buf) { ptx_bd_buf->paddr = 0; @@ -834,8 +805,8 @@ wlan_pcie_delete_txbd_ring(mlan_adapter *pmadapter) #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { padma_bd_buf = - (adma_dual_desc_buf *) pmadapter->pcard_pcie-> - txbd_ring[i]; + (adma_dual_desc_buf *) + pmadapter->pcard_pcie->txbd_ring[i]; if (padma_bd_buf) { padma_bd_buf->paddr = 0; @@ -850,17 +821,11 @@ wlan_pcie_delete_txbd_ring(mlan_adapter *pmadapter) } if (pmadapter->pcard_pcie->txbd_ring_vbase) { - pmadapter->callbacks.moal_mfree_consistent(pmadapter-> - pmoal_handle, - pmadapter-> - pcard_pcie-> - txbd_ring_size, - pmadapter-> - pcard_pcie-> - txbd_ring_vbase, - pmadapter-> - pcard_pcie-> - txbd_ring_pbase); + pmadapter->callbacks.moal_mfree_consistent( + pmadapter->pmoal_handle, + pmadapter->pcard_pcie->txbd_ring_size, + pmadapter->pcard_pcie->txbd_ring_vbase, + pmadapter->pcard_pcie->txbd_ring_pbase); } pmadapter->pcard_pcie->txbd_pending = 0; pmadapter->pcard_pcie->txbd_ring_size = 0; @@ -880,8 +845,7 @@ wlan_pcie_delete_txbd_ring(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_create_rxbd_ring(mlan_adapter *pmadapter) +static mlan_status wlan_pcie_create_rxbd_ring(mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -906,8 +870,8 @@ wlan_pcie_create_rxbd_ring(mlan_adapter *pmadapter) if (!pmadapter->pcard_pcie->reg->use_adma) { pmadapter->pcard_pcie->rxbd_wrptr = pmadapter->pcard_pcie->reg->txrx_rw_ptr_rollover_ind; - /* allocate shared memory for the BD ring and divide the same in to - several descriptors */ + /* allocate shared memory for the BD ring and divide the same in + to several descriptors */ pmadapter->pcard_pcie->rxbd_ring_size = sizeof(mlan_pcie_data_buf) * MLAN_MAX_TXRX_BD; } @@ -929,12 +893,10 @@ wlan_pcie_create_rxbd_ring(mlan_adapter *pmadapter) PRINTM(MINFO, "RX ring: allocating %d bytes\n", pmadapter->pcard_pcie->rxbd_ring_size); - ret = pcb->moal_malloc_consistent(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->rxbd_ring_size, - &pmadapter->pcard_pcie-> - rxbd_ring_vbase, - &pmadapter->pcard_pcie-> - rxbd_ring_pbase); + ret = pcb->moal_malloc_consistent( + pmadapter->pmoal_handle, pmadapter->pcard_pcie->rxbd_ring_size, + &pmadapter->pcard_pcie->rxbd_ring_vbase, + &pmadapter->pcard_pcie->rxbd_ring_pbase); if (ret != MLAN_STATUS_SUCCESS) { PRINTM(MERROR, "%s: No free moal_malloc_consistent\n", @@ -943,14 +905,15 @@ wlan_pcie_create_rxbd_ring(mlan_adapter *pmadapter) return MLAN_STATUS_FAILURE; } - PRINTM(MINFO, "RX ring: - base: %p, pbase: %#x:%x," - "len: %#x\n", pmadapter->pcard_pcie->rxbd_ring_vbase, + PRINTM(MINFO, + "RX ring: - base: %p, pbase: %#x:%x," + "len: %#x\n", + pmadapter->pcard_pcie->rxbd_ring_vbase, (t_u32)((t_u64)pmadapter->pcard_pcie->rxbd_ring_pbase >> 32), (t_u32)pmadapter->pcard_pcie->rxbd_ring_pbase, pmadapter->pcard_pcie->rxbd_ring_size); for (i = 0; i < MLAN_MAX_TXRX_BD; i++) { - /* Allocate buffer here so that firmware can DMA data on it */ pmbuf = wlan_alloc_mlan_buffer(pmadapter, MLAN_RX_DATA_BUF_SIZE, MLAN_RX_HEADER_LEN, @@ -977,17 +940,20 @@ wlan_pcie_create_rxbd_ring(mlan_adapter *pmadapter) return MLAN_STATUS_FAILURE; } - PRINTM(MINFO, "RX ring: add new mlan_buffer base: %p, " + PRINTM(MINFO, + "RX ring: add new mlan_buffer base: %p, " "buf_base: %p, buf_pbase: %#x:%x, " - "buf_len: %#x\n", pmbuf, pmbuf->pbuf, - (t_u32)((t_u64)pmbuf->buf_pa >> 32), + "buf_len: %#x\n", + pmbuf, pmbuf->pbuf, (t_u32)((t_u64)pmbuf->buf_pa >> 32), (t_u32)pmbuf->buf_pa, pmbuf->data_len); #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { - prxbd_buf = (mlan_pcie_data_buf *) - (pmadapter->pcard_pcie->rxbd_ring_vbase + - (sizeof(mlan_pcie_data_buf) * i)); + prxbd_buf = + (mlan_pcie_data_buf + *)(pmadapter->pcard_pcie + ->rxbd_ring_vbase + + (sizeof(mlan_pcie_data_buf) * i)); pmadapter->pcard_pcie->rxbd_ring[i] = (t_void *)prxbd_buf; prxbd_buf->paddr = pmbuf->buf_pa; @@ -1000,9 +966,11 @@ wlan_pcie_create_rxbd_ring(mlan_adapter *pmadapter) #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { - padma_bd_buf = (adma_dual_desc_buf *) - (pmadapter->pcard_pcie->rxbd_ring_vbase + - (sizeof(adma_dual_desc_buf) * i)); + padma_bd_buf = + (adma_dual_desc_buf + *)(pmadapter->pcard_pcie + ->rxbd_ring_vbase + + (sizeof(adma_dual_desc_buf) * i)); pmadapter->pcard_pcie->rxbd_ring[i] = (t_void *)padma_bd_buf; padma_bd_buf->paddr = pmbuf->buf_pa; @@ -1027,8 +995,7 @@ wlan_pcie_create_rxbd_ring(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_delete_rxbd_ring(mlan_adapter *pmadapter) +static mlan_status wlan_pcie_delete_rxbd_ring(mlan_adapter *pmadapter) { t_u32 i; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -1049,16 +1016,15 @@ wlan_pcie_delete_rxbd_ring(mlan_adapter *pmadapter) pmbuf->buf_pa, MLAN_RX_DATA_BUF_SIZE, PCI_DMA_FROMDEVICE); - wlan_free_mlan_buffer(pmadapter, - pmadapter->pcard_pcie-> - rx_buf_list[i]); + wlan_free_mlan_buffer( + pmadapter, + pmadapter->pcard_pcie->rx_buf_list[i]); } pmadapter->pcard_pcie->rx_buf_list[i] = MNULL; #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { - prxbd_buf = - (mlan_pcie_data_buf *)pmadapter->pcard_pcie-> - rxbd_ring[i]; + prxbd_buf = (mlan_pcie_data_buf *) + pmadapter->pcard_pcie->rxbd_ring[i]; if (prxbd_buf) { prxbd_buf->paddr = 0; @@ -1071,8 +1037,8 @@ wlan_pcie_delete_rxbd_ring(mlan_adapter *pmadapter) #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { padma_bd_buf = - (adma_dual_desc_buf *) pmadapter->pcard_pcie-> - rxbd_ring[i]; + (adma_dual_desc_buf *) + pmadapter->pcard_pcie->rxbd_ring[i]; if (padma_bd_buf) { padma_bd_buf->paddr = 0; @@ -1087,17 +1053,11 @@ wlan_pcie_delete_rxbd_ring(mlan_adapter *pmadapter) } if (pmadapter->pcard_pcie->rxbd_ring_vbase) - pmadapter->callbacks.moal_mfree_consistent(pmadapter-> - pmoal_handle, - pmadapter-> - pcard_pcie-> - rxbd_ring_size, - pmadapter-> - pcard_pcie-> - rxbd_ring_vbase, - pmadapter-> - pcard_pcie-> - rxbd_ring_pbase); + pmadapter->callbacks.moal_mfree_consistent( + pmadapter->pmoal_handle, + pmadapter->pcard_pcie->rxbd_ring_size, + pmadapter->pcard_pcie->rxbd_ring_vbase, + pmadapter->pcard_pcie->rxbd_ring_pbase); pmadapter->pcard_pcie->rxbd_ring_size = 0; pmadapter->pcard_pcie->rxbd_rdptr = 0; pmadapter->pcard_pcie->rxbd_wrptr = 0; @@ -1115,8 +1075,7 @@ wlan_pcie_delete_rxbd_ring(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_create_evtbd_ring(mlan_adapter *pmadapter) +static mlan_status wlan_pcie_create_evtbd_ring(mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -1155,13 +1114,10 @@ wlan_pcie_create_evtbd_ring(mlan_adapter *pmadapter) PRINTM(MINFO, "Evt ring: allocating %d bytes\n", pmadapter->pcard_pcie->evtbd_ring_size); - ret = pcb->moal_malloc_consistent(pmadapter->pmoal_handle, - pmadapter->pcard_pcie-> - evtbd_ring_size, - &pmadapter->pcard_pcie-> - evtbd_ring_vbase, - &pmadapter->pcard_pcie-> - evtbd_ring_pbase); + ret = pcb->moal_malloc_consistent( + pmadapter->pmoal_handle, pmadapter->pcard_pcie->evtbd_ring_size, + &pmadapter->pcard_pcie->evtbd_ring_vbase, + &pmadapter->pcard_pcie->evtbd_ring_pbase); if (ret != MLAN_STATUS_SUCCESS) { PRINTM(MERROR, "%s: No free moal_malloc_consistent\n", @@ -1169,14 +1125,15 @@ wlan_pcie_create_evtbd_ring(mlan_adapter *pmadapter) LEAVE(); return MLAN_STATUS_FAILURE; } - PRINTM(MINFO, "Evt ring: - base: %p, pbase: %#x:%x," - "len: %#x\n", pmadapter->pcard_pcie->evtbd_ring_vbase, + PRINTM(MINFO, + "Evt ring: - base: %p, pbase: %#x:%x," + "len: %#x\n", + pmadapter->pcard_pcie->evtbd_ring_vbase, (t_u32)((t_u64)pmadapter->pcard_pcie->evtbd_ring_pbase >> 32), (t_u32)pmadapter->pcard_pcie->evtbd_ring_pbase, pmadapter->pcard_pcie->evtbd_ring_size); for (i = 0; i < MLAN_MAX_EVT_BD; i++) { - /* Allocate buffer here so that firmware can DMA data on it */ pmbuf = wlan_alloc_mlan_buffer(pmadapter, MAX_EVENT_SIZE, MLAN_RX_HEADER_LEN, @@ -1202,11 +1159,14 @@ wlan_pcie_create_evtbd_ring(mlan_adapter *pmadapter) LEAVE(); return MLAN_STATUS_FAILURE; } + #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { - pevtbd_buf = (mlan_pcie_evt_buf *) - (pmadapter->pcard_pcie->evtbd_ring_vbase + - (sizeof(mlan_pcie_evt_buf) * i)); + pevtbd_buf = + (mlan_pcie_evt_buf + *)(pmadapter->pcard_pcie + ->evtbd_ring_vbase + + (sizeof(mlan_pcie_evt_buf) * i)); pmadapter->pcard_pcie->evtbd_ring[i] = (t_void *)pevtbd_buf; pevtbd_buf->paddr = pmbuf->buf_pa; @@ -1217,9 +1177,11 @@ wlan_pcie_create_evtbd_ring(mlan_adapter *pmadapter) #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { - padma_bd_buf = (adma_dual_desc_buf *) - (pmadapter->pcard_pcie->evtbd_ring_vbase + - (sizeof(adma_dual_desc_buf) * i)); + padma_bd_buf = + (adma_dual_desc_buf + *)(pmadapter->pcard_pcie + ->evtbd_ring_vbase + + (sizeof(adma_dual_desc_buf) * i)); pmadapter->pcard_pcie->evtbd_ring[i] = (t_void *)padma_bd_buf; padma_bd_buf->paddr = pmbuf->buf_pa; @@ -1244,8 +1206,7 @@ wlan_pcie_create_evtbd_ring(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_delete_evtbd_ring(mlan_adapter *pmadapter) +static mlan_status wlan_pcie_delete_evtbd_ring(mlan_adapter *pmadapter) { t_u32 i; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -1259,13 +1220,11 @@ wlan_pcie_delete_evtbd_ring(mlan_adapter *pmadapter) ENTER(); for (i = 0; i < MLAN_MAX_EVT_BD; i++) { - if (pmadapter->pcard_pcie->evt_buf_list[i]) { pmbuf = pmadapter->pcard_pcie->evt_buf_list[i]; pcb->moal_unmap_memory(pmadapter->pmoal_handle, pmbuf->pbuf + pmbuf->data_offset, - pmbuf->buf_pa, - MAX_EVENT_SIZE, + pmbuf->buf_pa, MAX_EVENT_SIZE, PCI_DMA_FROMDEVICE); wlan_free_mlan_buffer(pmadapter, pmbuf); } @@ -1274,8 +1233,8 @@ wlan_pcie_delete_evtbd_ring(mlan_adapter *pmadapter) #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { pevtbd_buf = - (mlan_pcie_evt_buf *)pmadapter->pcard_pcie-> - evtbd_ring[i]; + (mlan_pcie_evt_buf *) + pmadapter->pcard_pcie->evtbd_ring[i]; if (pevtbd_buf) { pevtbd_buf->paddr = 0; @@ -1288,8 +1247,8 @@ wlan_pcie_delete_evtbd_ring(mlan_adapter *pmadapter) #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { padma_bd_buf = - (adma_dual_desc_buf *) pmadapter->pcard_pcie-> - evtbd_ring[i]; + (adma_dual_desc_buf *) + pmadapter->pcard_pcie->evtbd_ring[i]; if (padma_bd_buf) { padma_bd_buf->paddr = 0; @@ -1304,17 +1263,11 @@ wlan_pcie_delete_evtbd_ring(mlan_adapter *pmadapter) } if (pmadapter->pcard_pcie->evtbd_ring_vbase) - pmadapter->callbacks.moal_mfree_consistent(pmadapter-> - pmoal_handle, - pmadapter-> - pcard_pcie-> - evtbd_ring_size, - pmadapter-> - pcard_pcie-> - evtbd_ring_vbase, - pmadapter-> - pcard_pcie-> - evtbd_ring_pbase); + pmadapter->callbacks.moal_mfree_consistent( + pmadapter->pmoal_handle, + pmadapter->pcard_pcie->evtbd_ring_size, + pmadapter->pcard_pcie->evtbd_ring_vbase, + pmadapter->pcard_pcie->evtbd_ring_pbase); pmadapter->pcard_pcie->evtbd_rdptr = 0; pmadapter->pcard_pcie->evtbd_wrptr = 0; @@ -1333,15 +1286,14 @@ wlan_pcie_delete_evtbd_ring(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_alloc_cmdrsp_buf(mlan_adapter *pmadapter) +static mlan_status wlan_pcie_alloc_cmdrsp_buf(mlan_adapter *pmadapter) { mlan_buffer *pmbuf = MNULL; pmlan_callbacks pcb = &pmadapter->callbacks; mlan_status ret = MLAN_STATUS_SUCCESS; - /** Virtual base address of command response */ + /** Virtual base address of command response */ t_u8 *cmdrsp_vbase; - /** Physical base address of command response */ + /** Physical base address of command response */ t_u64 cmdrsp_pbase = 0; ENTER(); @@ -1384,8 +1336,7 @@ wlan_pcie_alloc_cmdrsp_buf(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_delete_cmdrsp_buf(mlan_adapter *pmadapter) +static mlan_status wlan_pcie_delete_cmdrsp_buf(mlan_adapter *pmadapter) { mlan_buffer *pmbuf = MNULL; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -1403,12 +1354,10 @@ wlan_pcie_delete_cmdrsp_buf(mlan_adapter *pmadapter) cmdrsp_vbase = pmbuf->pbuf; cmdrsp_pbase = pmbuf->buf_pa; if (cmdrsp_vbase) - pmadapter->callbacks.moal_mfree_consistent(pmadapter-> - pmoal_handle, - pmbuf-> - total_pcie_buf_len, - cmdrsp_vbase, - cmdrsp_pbase); + pmadapter->callbacks.moal_mfree_consistent( + pmadapter->pmoal_handle, + pmbuf->total_pcie_buf_len, cmdrsp_vbase, + cmdrsp_pbase); wlan_free_mlan_buffer(pmadapter, pmbuf); pmadapter->pcard_pcie->cmdrsp_buf = MNULL; } @@ -1416,8 +1365,7 @@ wlan_pcie_delete_cmdrsp_buf(mlan_adapter *pmadapter) pmbuf = pmadapter->pcard_pcie->cmd_buf; pcb->moal_unmap_memory(pmadapter->pmoal_handle, pmbuf->pbuf + pmbuf->data_offset, - pmbuf->buf_pa, - MLAN_SIZE_OF_CMD_BUFFER, + pmbuf->buf_pa, MLAN_SIZE_OF_CMD_BUFFER, PCI_DMA_TODEVICE); } @@ -1426,10 +1374,9 @@ wlan_pcie_delete_cmdrsp_buf(mlan_adapter *pmadapter) } #if defined(PCIE8997) || defined(PCIE8897) -#define PCIE_TXBD_EMPTY(wrptr, rdptr, mask, rollover_ind) \ - (((wrptr & mask) == (rdptr & mask)) \ - && ((wrptr & rollover_ind) == \ - (rdptr & rollover_ind))) +#define PCIE_TXBD_EMPTY(wrptr, rdptr, mask, rollover_ind) \ + (((wrptr & mask) == (rdptr & mask)) && \ + ((wrptr & rollover_ind) == (rdptr & rollover_ind))) /** * @brief This function flushes the TX buffer descriptor ring @@ -1438,8 +1385,7 @@ wlan_pcie_delete_cmdrsp_buf(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_flush_txbd_ring(mlan_adapter *pmadapter) +static mlan_status wlan_pcie_flush_txbd_ring(mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -1449,17 +1395,16 @@ wlan_pcie_flush_txbd_ring(mlan_adapter *pmadapter) ENTER(); - if (!PCIE_TXBD_EMPTY - (pmadapter->pcard_pcie->txbd_wrptr, - pmadapter->pcard_pcie->txbd_rdptr, txrx_rw_ptr_mask, - txrx_rw_ptr_rollover_ind)) { + if (!PCIE_TXBD_EMPTY(pmadapter->pcard_pcie->txbd_wrptr, + pmadapter->pcard_pcie->txbd_rdptr, + txrx_rw_ptr_mask, txrx_rw_ptr_rollover_ind)) { pmadapter->pcard_pcie->txbd_flush = MTRUE; /* write pointer already set at last send */ /* send dnld-rdy intr again, wait for completion */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg-> - reg_cpu_int_event, CPU_INTR_DNLD_RDY)) { + if (pcb->moal_write_reg( + pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_cpu_int_event, + CPU_INTR_DNLD_RDY)) { PRINTM(MERROR, "SEND DATA (FLUSH): failed to assert dnld-rdy interrupt.\n"); ret = MLAN_STATUS_FAILURE; @@ -1479,19 +1424,18 @@ wlan_pcie_flush_txbd_ring(mlan_adapter *pmadapter) * * @return MTRUE/MFALSE; */ -static t_u8 -wlan_check_tx_pending_buffer(mlan_adapter *pmadapter, t_u32 rdptr) +static t_u8 wlan_check_tx_pending_buffer(mlan_adapter *pmadapter, t_u32 rdptr) { #if defined(PCIE8997) || defined(PCIE8897) t_u32 txrx_rw_ptr_mask = pmadapter->pcard_pcie->reg->txrx_rw_ptr_mask; t_u32 txrx_rw_ptr_rollover_ind = pmadapter->pcard_pcie->reg->txrx_rw_ptr_rollover_ind; if (!pmadapter->pcard_pcie->reg->use_adma) { - if (((pmadapter->pcard_pcie->txbd_rdptr & txrx_rw_ptr_mask) - != (rdptr & txrx_rw_ptr_mask)) || - ((pmadapter->pcard_pcie-> - txbd_rdptr & txrx_rw_ptr_rollover_ind) - != (rdptr & txrx_rw_ptr_rollover_ind))) + if (((pmadapter->pcard_pcie->txbd_rdptr & txrx_rw_ptr_mask) != + (rdptr & txrx_rw_ptr_mask)) || + ((pmadapter->pcard_pcie->txbd_rdptr & + txrx_rw_ptr_rollover_ind) != + (rdptr & txrx_rw_ptr_rollover_ind))) return MTRUE; else return MFALSE; @@ -1499,8 +1443,8 @@ wlan_check_tx_pending_buffer(mlan_adapter *pmadapter, t_u32 rdptr) #endif #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { - if ((pmadapter->pcard_pcie->txbd_rdptr & ADMA_RW_PTR_WRAP_MASK) - != (rdptr & ADMA_RW_PTR_WRAP_MASK)) + if ((pmadapter->pcard_pcie->txbd_rdptr & + ADMA_RW_PTR_WRAP_MASK) != (rdptr & ADMA_RW_PTR_WRAP_MASK)) return MTRUE; else return MFALSE; @@ -1516,8 +1460,7 @@ wlan_check_tx_pending_buffer(mlan_adapter *pmadapter, t_u32 rdptr) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_send_data_complete(mlan_adapter *pmadapter) +static mlan_status wlan_pcie_send_data_complete(mlan_adapter *pmadapter) { const t_u32 num_tx_buffs = MLAN_MAX_TXRX_BD; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1540,9 +1483,9 @@ wlan_pcie_send_data_complete(mlan_adapter *pmadapter) ENTER(); /* Read the TX ring read pointer set by firmware */ - if (pcb-> - moal_read_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg->reg_txbd_rdptr, &rdptr)) { + if (pcb->moal_read_reg(pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_txbd_rdptr, + &rdptr)) { PRINTM(MERROR, "SEND DATA COMP: failed to read REG_TXBD_RDPTR\n"); ret = MLAN_STATUS_FAILURE; @@ -1568,7 +1511,6 @@ wlan_pcie_send_data_complete(mlan_adapter *pmadapter) /* free from previous txbd_rdptr to current txbd_rdptr */ while (wlan_check_tx_pending_buffer(pmadapter, rdptr)) { - wrdoneidx = pmadapter->pcard_pcie->txbd_rdptr & (num_tx_buffs - 1); pmbuf = pmadapter->pcard_pcie->tx_buf_list[wrdoneidx]; @@ -1577,12 +1519,10 @@ wlan_pcie_send_data_complete(mlan_adapter *pmadapter) "SEND DATA COMP: Detach pmbuf %p at tx_ring[%d], pmadapter->txbd_rdptr=0x%x\n", pmbuf, wrdoneidx, pmadapter->pcard_pcie->txbd_rdptr); - ret = pcb->moal_unmap_memory(pmadapter->pmoal_handle, - pmbuf->pbuf + - pmbuf->data_offset, - pmbuf->buf_pa, - pmbuf->data_len, - PCI_DMA_TODEVICE); + ret = pcb->moal_unmap_memory( + pmadapter->pmoal_handle, + pmbuf->pbuf + pmbuf->data_offset, pmbuf->buf_pa, + pmbuf->data_len, PCI_DMA_TODEVICE); if (ret == MLAN_STATUS_FAILURE) { PRINTM(MERROR, "%s: moal_unmap_memory failed\n", __FUNCTION__); @@ -1603,28 +1543,27 @@ wlan_pcie_send_data_complete(mlan_adapter *pmadapter) pmadapter->pcard_pcie->tx_buf_list[wrdoneidx] = MNULL; #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { - ptx_bd_buf = - (mlan_pcie_data_buf *)pmadapter->pcard_pcie-> - txbd_ring[wrdoneidx]; + ptx_bd_buf = (mlan_pcie_data_buf *)pmadapter->pcard_pcie + ->txbd_ring[wrdoneidx]; ptx_bd_buf->paddr = 0; ptx_bd_buf->len = 0; ptx_bd_buf->flags = 0; ptx_bd_buf->frag_len = 0; ptx_bd_buf->offset = 0; pmadapter->pcard_pcie->txbd_rdptr++; - if ((pmadapter->pcard_pcie-> - txbd_rdptr & txrx_rw_ptr_mask) == num_tx_buffs) + if ((pmadapter->pcard_pcie->txbd_rdptr & + txrx_rw_ptr_mask) == num_tx_buffs) pmadapter->pcard_pcie->txbd_rdptr = - ((pmadapter->pcard_pcie-> - txbd_rdptr & txrx_rw_ptr_rollover_ind) - ^ txrx_rw_ptr_rollover_ind); + ((pmadapter->pcard_pcie->txbd_rdptr & + txrx_rw_ptr_rollover_ind) ^ + txrx_rw_ptr_rollover_ind); } #endif #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { padma_bd_buf = - (adma_dual_desc_buf *) pmadapter->pcard_pcie-> - txbd_ring[wrdoneidx]; + (adma_dual_desc_buf *)pmadapter->pcard_pcie + ->txbd_ring[wrdoneidx]; padma_bd_buf->paddr = 0; padma_bd_buf->len = 0; padma_bd_buf->flags = 0; @@ -1641,10 +1580,9 @@ wlan_pcie_send_data_complete(mlan_adapter *pmadapter) pmadapter->data_sent = MFALSE; #if defined(PCIE8997) || defined(PCIE8897) if (pmadapter->pcard_pcie->txbd_flush) { - if (PCIE_TXBD_EMPTY - (pmadapter->pcard_pcie->txbd_wrptr, - pmadapter->pcard_pcie->txbd_rdptr, txrx_rw_ptr_mask, - txrx_rw_ptr_rollover_ind)) + if (PCIE_TXBD_EMPTY(pmadapter->pcard_pcie->txbd_wrptr, + pmadapter->pcard_pcie->txbd_rdptr, + txrx_rw_ptr_mask, txrx_rw_ptr_rollover_ind)) pmadapter->pcard_pcie->txbd_flush = MFALSE; else wlan_pcie_flush_txbd_ring(pmadapter); @@ -1656,30 +1594,29 @@ done: } #if defined(PCIE8997) || defined(PCIE8897) -#define PCIE_TXBD_NOT_FULL(wrptr, rdptr, mask, rollover_ind) \ - (((wrptr & mask) != (rdptr & mask)) \ - || ((wrptr & rollover_ind) == \ - (rdptr & rollover_ind))) +#define PCIE_TXBD_NOT_FULL(wrptr, rdptr, mask, rollover_ind) \ + (((wrptr & mask) != (rdptr & mask)) || \ + ((wrptr & rollover_ind) == (rdptr & rollover_ind))) #endif #if defined(PCIE9098) || defined(PCIE9097) -#define ADMA_TXBD_IS_FULL(wrptr, rdptr) \ - (((wrptr & TXRX_RW_PTR_MASK) == (rdptr & TXRX_RW_PTR_MASK)) \ - && ((wrptr & TXRX_RW_PTR_ROLLOVER_IND) != (rdptr & TXRX_RW_PTR_ROLLOVER_IND))) +#define ADMA_TXBD_IS_FULL(wrptr, rdptr) \ + (((wrptr & TXRX_RW_PTR_MASK) == (rdptr & TXRX_RW_PTR_MASK)) && \ + ((wrptr & TXRX_RW_PTR_ROLLOVER_IND) != \ + (rdptr & TXRX_RW_PTR_ROLLOVER_IND))) #endif -static t_u8 -wlan_check_txbd_not_full(mlan_adapter *pmadapter) +static t_u8 wlan_check_txbd_not_full(mlan_adapter *pmadapter) { #if defined(PCIE8997) || defined(PCIE8897) t_u32 txrx_rw_ptr_mask = pmadapter->pcard_pcie->reg->txrx_rw_ptr_mask; t_u32 txrx_rw_ptr_rollover_ind = pmadapter->pcard_pcie->reg->txrx_rw_ptr_rollover_ind; if (!pmadapter->pcard_pcie->reg->use_adma) { - if (PCIE_TXBD_NOT_FULL - (pmadapter->pcard_pcie->txbd_wrptr, - pmadapter->pcard_pcie->txbd_rdptr, txrx_rw_ptr_mask, - txrx_rw_ptr_rollover_ind)) + if (PCIE_TXBD_NOT_FULL(pmadapter->pcard_pcie->txbd_wrptr, + pmadapter->pcard_pcie->txbd_rdptr, + txrx_rw_ptr_mask, + txrx_rw_ptr_rollover_ind)) return MTRUE; else return MFALSE; @@ -1687,9 +1624,8 @@ wlan_check_txbd_not_full(mlan_adapter *pmadapter) #endif #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { - if (!ADMA_TXBD_IS_FULL - (pmadapter->pcard_pcie->txbd_wrptr, - pmadapter->pcard_pcie->txbd_rdptr)) + if (!ADMA_TXBD_IS_FULL(pmadapter->pcard_pcie->txbd_wrptr, + pmadapter->pcard_pcie->txbd_rdptr)) return MTRUE; else return MFALSE; @@ -1703,14 +1639,15 @@ wlan_check_txbd_not_full(mlan_adapter *pmadapter) * * @param pmadapter A pointer to mlan_adapter structure * @param type packet type - * @param pmbuf A pointer to mlan_buffer (pmbuf->data_len should include PCIE header) + * @param pmbuf A pointer to mlan_buffer (pmbuf->data_len should include + * PCIE header) * @param tx_param A pointer to mlan_tx_param * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_send_data(mlan_adapter *pmadapter, t_u8 type, - mlan_buffer *pmbuf, mlan_tx_param *tx_param) +static mlan_status wlan_pcie_send_data(mlan_adapter *pmadapter, t_u8 type, + mlan_buffer *pmbuf, + mlan_tx_param *tx_param) { t_u32 reg_txbd_wrptr = pmadapter->pcard_pcie->reg->reg_txbd_wrptr; #if defined(PCIE8997) || defined(PCIE8897) @@ -1739,8 +1676,8 @@ wlan_pcie_send_data(mlan_adapter *pmadapter, t_u8 type, goto done; } if (!(pmbuf->pbuf && pmbuf->data_len)) { - PRINTM(MERROR, "Invalid parameter <%p, %#x>\n", - pmbuf->pbuf, pmbuf->data_len); + PRINTM(MERROR, "Invalid parameter <%p, %#x>\n", pmbuf->pbuf, + pmbuf->data_len); ret = MLAN_STATUS_FAILURE; goto done; } @@ -1777,9 +1714,8 @@ wlan_pcie_send_data(mlan_adapter *pmadapter, t_u8 type, #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { wr_ptr_start = TXBD_RW_PTR_START; - ptx_bd_buf = - (mlan_pcie_data_buf *)pmadapter->pcard_pcie-> - txbd_ring[wrindx]; + ptx_bd_buf = (mlan_pcie_data_buf *)pmadapter->pcard_pcie + ->txbd_ring[wrindx]; ptx_bd_buf->paddr = pmbuf->buf_pa; ptx_bd_buf->len = (t_u16)pmbuf->data_len; ptx_bd_buf->flags = MLAN_BD_FLAG_SOP | MLAN_BD_FLAG_EOP; @@ -1788,24 +1724,23 @@ wlan_pcie_send_data(mlan_adapter *pmadapter, t_u8 type, pmadapter->pcard_pcie->last_tx_pkt_size[wrindx] = pmbuf->data_len; pmadapter->pcard_pcie->txbd_wrptr++; - if ((pmadapter->pcard_pcie-> - txbd_wrptr & txrx_rw_ptr_mask) == num_tx_buffs) + if ((pmadapter->pcard_pcie->txbd_wrptr & + txrx_rw_ptr_mask) == num_tx_buffs) pmadapter->pcard_pcie->txbd_wrptr = - ((pmadapter->pcard_pcie-> - txbd_wrptr & txrx_rw_ptr_rollover_ind) - ^ txrx_rw_ptr_rollover_ind); - rxbd_val = - pmadapter->pcard_pcie->rxbd_wrptr & pmadapter-> - pcard_pcie->reg->txrx_rw_ptr_wrap_mask; + ((pmadapter->pcard_pcie->txbd_wrptr & + txrx_rw_ptr_rollover_ind) ^ + txrx_rw_ptr_rollover_ind); + rxbd_val = pmadapter->pcard_pcie->rxbd_wrptr & + pmadapter->pcard_pcie->reg + ->txrx_rw_ptr_wrap_mask; } #endif #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { wr_ptr_start = ADMA_WPTR_START; - padma_bd_buf = - (adma_dual_desc_buf *) pmadapter->pcard_pcie-> - txbd_ring[wrindx]; + padma_bd_buf = (adma_dual_desc_buf *)pmadapter + ->pcard_pcie->txbd_ring[wrindx]; padma_bd_buf->paddr = pmbuf->buf_pa; padma_bd_buf->len = ALIGN_SZ(pmbuf->data_len, ADMA_ALIGN_SIZE); @@ -1823,15 +1758,14 @@ wlan_pcie_send_data(mlan_adapter *pmadapter, t_u8 type, } #endif pmadapter->pcard_pcie->txbd_pending++; - PRINTM(MINFO, "REG_TXBD_WRPT(0x%x) = 0x%x\n", - reg_txbd_wrptr, - ((pmadapter->pcard_pcie-> - txbd_wrptr << wr_ptr_start) | rxbd_val)); + PRINTM(MINFO, "REG_TXBD_WRPT(0x%x) = 0x%x\n", reg_txbd_wrptr, + ((pmadapter->pcard_pcie->txbd_wrptr << wr_ptr_start) | + rxbd_val)); /* Write the TX ring write pointer in to REG_TXBD_WRPTR */ if (pcb->moal_write_reg(pmadapter->pmoal_handle, reg_txbd_wrptr, - (pmadapter->pcard_pcie-> - txbd_wrptr << wr_ptr_start) | - rxbd_val)) { + (pmadapter->pcard_pcie->txbd_wrptr + << wr_ptr_start) | + rxbd_val)) { PRINTM(MERROR, "SEND DATA: failed to write REG_TXBD_WRPTR\n"); ret = MLAN_STATUS_FAILURE; @@ -1855,11 +1789,10 @@ wlan_pcie_send_data(mlan_adapter *pmadapter, t_u8 type, #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { /* Send the TX ready interrupt */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg-> - reg_cpu_int_event, - CPU_INTR_DNLD_RDY)) + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg + ->reg_cpu_int_event, + CPU_INTR_DNLD_RDY)) PRINTM(MERROR, "SEND DATA (FULL): failed to assert dnld-rdy interrupt\n"); } @@ -1873,10 +1806,9 @@ wlan_pcie_send_data(mlan_adapter *pmadapter, t_u8 type, done_unmap: if (MLAN_STATUS_FAILURE == - pcb->moal_unmap_memory(pmadapter->pmoal_handle, - pmbuf->pbuf + pmbuf->data_offset, - pmbuf->buf_pa, pmbuf->data_len, - PCI_DMA_TODEVICE)) { + pcb->moal_unmap_memory( + pmadapter->pmoal_handle, pmbuf->pbuf + pmbuf->data_offset, + pmbuf->buf_pa, pmbuf->data_len, PCI_DMA_TODEVICE)) { PRINTM(MERROR, "SEND DATA: failed to moal_unmap_memory\n"); ret = MLAN_STATUS_FAILURE; } @@ -1913,8 +1845,7 @@ done: * * @return MTRUE/MFALSE; */ -static t_u8 -wlan_check_rx_pending_buffer(mlan_adapter *pmadapter, t_u32 rdptr) +static t_u8 wlan_check_rx_pending_buffer(mlan_adapter *pmadapter, t_u32 rdptr) { #if defined(PCIE8997) || defined(PCIE8897) t_u32 txrx_rw_ptr_mask = pmadapter->pcard_pcie->reg->txrx_rw_ptr_mask; @@ -1922,10 +1853,10 @@ wlan_check_rx_pending_buffer(mlan_adapter *pmadapter, t_u32 rdptr) pmadapter->pcard_pcie->reg->txrx_rw_ptr_rollover_ind; if (!pmadapter->pcard_pcie->reg->use_adma) { if (((rdptr & txrx_rw_ptr_mask) != - (pmadapter->pcard_pcie->rxbd_rdptr & txrx_rw_ptr_mask)) - || ((rdptr & txrx_rw_ptr_rollover_ind) != - (pmadapter->pcard_pcie-> - rxbd_rdptr & txrx_rw_ptr_rollover_ind))) + (pmadapter->pcard_pcie->rxbd_rdptr & txrx_rw_ptr_mask)) || + ((rdptr & txrx_rw_ptr_rollover_ind) != + (pmadapter->pcard_pcie->rxbd_rdptr & + txrx_rw_ptr_rollover_ind))) return MTRUE; else return MFALSE; @@ -1934,8 +1865,8 @@ wlan_check_rx_pending_buffer(mlan_adapter *pmadapter, t_u32 rdptr) #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { - if ((pmadapter->pcard_pcie->rxbd_rdptr & ADMA_RW_PTR_WRAP_MASK) - != (rdptr & ADMA_RW_PTR_WRAP_MASK)) + if ((pmadapter->pcard_pcie->rxbd_rdptr & + ADMA_RW_PTR_WRAP_MASK) != (rdptr & ADMA_RW_PTR_WRAP_MASK)) return MTRUE; else return MFALSE; @@ -1952,8 +1883,7 @@ wlan_check_rx_pending_buffer(mlan_adapter *pmadapter, t_u32 rdptr) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_process_recv_data(mlan_adapter *pmadapter) +static mlan_status wlan_pcie_process_recv_data(mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -1976,7 +1906,8 @@ wlan_pcie_process_recv_data(mlan_adapter *pmadapter) ENTER(); /* Read the RX ring Read pointer set by firmware */ - if (pcb->moal_read_reg(pmadapter->pmoal_handle, reg_rxbd_rdptr, &rdptr)) { + if (pcb->moal_read_reg(pmadapter->pmoal_handle, reg_rxbd_rdptr, + &rdptr)) { PRINTM(MERROR, "RECV DATA: failed to read REG_RXBD_RDPTR\n"); ret = MLAN_STATUS_FAILURE; goto done; @@ -2030,21 +1961,17 @@ wlan_pcie_process_recv_data(mlan_adapter *pmadapter) pmbuf->data_offset += PCIE_INTF_HEADER_LEN; PRINTM(MINFO, "RECV DATA: Received packet from FW successfully\n"); - pmadapter->callbacks.moal_spin_lock(pmadapter-> - pmoal_handle, - pmadapter-> - rx_data_queue. - plock); + pmadapter->callbacks.moal_spin_lock( + pmadapter->pmoal_handle, + pmadapter->rx_data_queue.plock); util_enqueue_list_tail(pmadapter->pmoal_handle, &pmadapter->rx_data_queue, (pmlan_linked_list)pmbuf, MNULL, MNULL); pmadapter->rx_pkts_queued++; - pmadapter->callbacks.moal_spin_unlock(pmadapter-> - pmoal_handle, - pmadapter-> - rx_data_queue. - plock); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, + pmadapter->rx_data_queue.plock); pmadapter->data_received = MTRUE; /* Create new buffer and attach it to Rx Ring */ @@ -2080,9 +2007,8 @@ wlan_pcie_process_recv_data(mlan_adapter *pmadapter) pmadapter->pcard_pcie->rx_buf_list[rd_index] = pmbuf; #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { - prxbd_buf = - (mlan_pcie_data_buf *)pmadapter->pcard_pcie-> - rxbd_ring[rd_index]; + prxbd_buf = (mlan_pcie_data_buf *)pmadapter->pcard_pcie + ->rxbd_ring[rd_index]; prxbd_buf->paddr = pmbuf->buf_pa; prxbd_buf->len = (t_u16)pmbuf->data_len; prxbd_buf->flags = MLAN_BD_FLAG_SOP | MLAN_BD_FLAG_EOP; @@ -2090,35 +2016,33 @@ wlan_pcie_process_recv_data(mlan_adapter *pmadapter) prxbd_buf->frag_len = (t_u16)pmbuf->data_len; /* update rxbd's rdptrs */ - if ((++pmadapter->pcard_pcie-> - rxbd_rdptr & txrx_rw_ptr_mask) == - MLAN_MAX_TXRX_BD) { + if ((++pmadapter->pcard_pcie->rxbd_rdptr & + txrx_rw_ptr_mask) == MLAN_MAX_TXRX_BD) { pmadapter->pcard_pcie->rxbd_rdptr = - ((pmadapter->pcard_pcie-> - rxbd_rdptr & txrx_rw_ptr_rollover_ind) - ^ txrx_rw_ptr_rollover_ind); + ((pmadapter->pcard_pcie->rxbd_rdptr & + txrx_rw_ptr_rollover_ind) ^ + txrx_rw_ptr_rollover_ind); } /* update rxbd's wrptrs */ - if ((++pmadapter->pcard_pcie-> - rxbd_wrptr & txrx_rw_ptr_mask) == - MLAN_MAX_TXRX_BD) { + if ((++pmadapter->pcard_pcie->rxbd_wrptr & + txrx_rw_ptr_mask) == MLAN_MAX_TXRX_BD) { pmadapter->pcard_pcie->rxbd_wrptr = - ((pmadapter->pcard_pcie-> - rxbd_wrptr & txrx_rw_ptr_rollover_ind) - ^ txrx_rw_ptr_rollover_ind); + ((pmadapter->pcard_pcie->rxbd_wrptr & + txrx_rw_ptr_rollover_ind) ^ + txrx_rw_ptr_rollover_ind); } - txbd_val = - pmadapter->pcard_pcie->txbd_wrptr & pmadapter-> - pcard_pcie->reg->txrx_rw_ptr_wrap_mask; + txbd_val = pmadapter->pcard_pcie->txbd_wrptr & + pmadapter->pcard_pcie->reg + ->txrx_rw_ptr_wrap_mask; txbd_val = txbd_val << TXBD_RW_PTR_START; } #endif #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { padma_bd_buf = - (adma_dual_desc_buf *) pmadapter->pcard_pcie-> - rxbd_ring[rd_index]; + (adma_dual_desc_buf *)pmadapter->pcard_pcie + ->rxbd_ring[rd_index]; padma_bd_buf->paddr = pmbuf->buf_pa; padma_bd_buf->len = ALIGN_SZ(pmbuf->data_len, ADMA_ALIGN_SIZE); @@ -2138,11 +2062,10 @@ wlan_pcie_process_recv_data(mlan_adapter *pmadapter) pmadapter->pcard_pcie->rxbd_wrptr, rdptr); /* Write the RX ring write pointer in to REG_RXBD_WRPTR */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg->reg_rxbd_wrptr, - pmadapter->pcard_pcie-> - rxbd_wrptr | txbd_val)) { + if (pcb->moal_write_reg( + pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_rxbd_wrptr, + pmadapter->pcard_pcie->rxbd_wrptr | txbd_val)) { PRINTM(MERROR, "RECV DATA: failed to write REG_RXBD_WRPTR\n"); ret = MLAN_STATUS_FAILURE; @@ -2150,9 +2073,8 @@ wlan_pcie_process_recv_data(mlan_adapter *pmadapter) } /* Read the RX ring read pointer set by firmware */ - if (pcb-> - moal_read_reg(pmadapter->pmoal_handle, reg_rxbd_rdptr, - &rdptr)) { + if (pcb->moal_read_reg(pmadapter->pmoal_handle, reg_rxbd_rdptr, + &rdptr)) { PRINTM(MERROR, "RECV DATA: failed to read REG_RXBD_RDPTR\n"); ret = MLAN_STATUS_FAILURE; @@ -2173,12 +2095,13 @@ done: * @brief This function downloads command to the card. * * @param pmadapter A pointer to mlan_adapter structure - * @param pmbuf A pointer to mlan_buffer (pmbuf->data_len should include PCIE header) + * @param pmbuf A pointer to mlan_buffer (pmbuf->data_len should include + * PCIE header) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_send_cmd(mlan_adapter *pmadapter, mlan_buffer *pmbuf) +static mlan_status wlan_pcie_send_cmd(mlan_adapter *pmadapter, + mlan_buffer *pmbuf) { mlan_status ret = MLAN_STATUS_PENDING; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -2191,8 +2114,8 @@ wlan_pcie_send_cmd(mlan_adapter *pmadapter, mlan_buffer *pmbuf) goto done; } if (!(pmbuf->pbuf && pmbuf->data_len)) { - PRINTM(MERROR, "Invalid parameter <%p, %#x>\n", - pmbuf->pbuf, pmbuf->data_len); + PRINTM(MERROR, "Invalid parameter <%p, %#x>\n", pmbuf->pbuf, + pmbuf->data_len); ret = MLAN_STATUS_FAILURE; goto done; } @@ -2210,12 +2133,10 @@ wlan_pcie_send_cmd(mlan_adapter *pmadapter, mlan_buffer *pmbuf) *(t_u16 *)&payload[0] = wlan_cpu_to_le16((t_u16)pmbuf->data_len); *(t_u16 *)&payload[2] = wlan_cpu_to_le16(MLAN_TYPE_CMD); - if (MLAN_STATUS_FAILURE == pcb->moal_map_memory(pmadapter->pmoal_handle, - pmbuf->pbuf + - pmbuf->data_offset, - &pmbuf->buf_pa, - MLAN_RX_CMD_BUF_SIZE, - PCI_DMA_TODEVICE)) { + if (MLAN_STATUS_FAILURE == + pcb->moal_map_memory( + pmadapter->pmoal_handle, pmbuf->pbuf + pmbuf->data_offset, + &pmbuf->buf_pa, MLAN_RX_CMD_BUF_SIZE, PCI_DMA_TODEVICE)) { PRINTM(MERROR, "Command buffer : moal_map_memory failed\n"); LEAVE(); return MLAN_STATUS_FAILURE; @@ -2225,36 +2146,34 @@ wlan_pcie_send_cmd(mlan_adapter *pmadapter, mlan_buffer *pmbuf) #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { /* To send a command, the driver will: - 1. Write the 64bit physical address of the data buffer to - SCRATCH1 + SCRATCH0 - 2. Ring the door bell (i.e. set the door bell interrupt) + 1. Write the 64bit physical address of the data buffer to + SCRATCH1 + SCRATCH0 + 2. Ring the door bell (i.e. set the door bell interrupt) - In response to door bell interrupt, the firmware will perform - the DMA of the command packet (first header to obtain the total - length and then rest of the command). - */ + In response to door bell interrupt, the firmware will + perform the DMA of the command packet (first header to obtain + the total length and then rest of the command). + */ if (pmadapter->pcard_pcie->cmdrsp_buf) { /* Write the lower 32bits of the cmdrsp buffer physical address */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - REG_CMDRSP_ADDR_LO, - (t_u32)pmadapter->pcard_pcie-> - cmdrsp_buf->buf_pa)) { + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + REG_CMDRSP_ADDR_LO, + (t_u32)pmadapter->pcard_pcie + ->cmdrsp_buf->buf_pa)) { PRINTM(MERROR, "Failed to write download command to boot code.\n"); ret = MLAN_STATUS_FAILURE; goto done; } /* Write the upper 32bits of the cmdrsp buffer physical - address */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - REG_CMDRSP_ADDR_HI, - (t_u32)((t_u64)pmadapter-> - pcard_pcie->cmdrsp_buf-> - buf_pa >> 32))) { + address */ + if (pcb->moal_write_reg( + pmadapter->pmoal_handle, REG_CMDRSP_ADDR_HI, + (t_u32)((t_u64)pmadapter->pcard_pcie + ->cmdrsp_buf->buf_pa >> + 32))) { PRINTM(MERROR, "Failed to write download command to boot code.\n"); ret = MLAN_STATUS_FAILURE; @@ -2262,21 +2181,23 @@ wlan_pcie_send_cmd(mlan_adapter *pmadapter, mlan_buffer *pmbuf) } } - /* Write the lower 32bits of the physical address to REG_CMD_ADDR_LO */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, REG_CMD_ADDR_LO, - (t_u32)pmadapter->pcard_pcie->cmd_buf-> - buf_pa)) { + /* Write the lower 32bits of the physical address to + * REG_CMD_ADDR_LO */ + if (pcb->moal_write_reg( + pmadapter->pmoal_handle, REG_CMD_ADDR_LO, + (t_u32)pmadapter->pcard_pcie->cmd_buf->buf_pa)) { PRINTM(MERROR, "Failed to write download command to boot code.\n"); ret = MLAN_STATUS_FAILURE; goto done; } - /* Write the upper 32bits of the physical address to REG_CMD_ADDR_HI */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, REG_CMD_ADDR_HI, - (t_u32)((t_u64)pmadapter->pcard_pcie-> - cmd_buf->buf_pa >> 32))) { + /* Write the upper 32bits of the physical address to + * REG_CMD_ADDR_HI */ + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + REG_CMD_ADDR_HI, + (t_u32)((t_u64)pmadapter->pcard_pcie + ->cmd_buf->buf_pa >> + 32))) { PRINTM(MERROR, "Failed to write download command to boot code.\n"); ret = MLAN_STATUS_FAILURE; @@ -2284,9 +2205,9 @@ wlan_pcie_send_cmd(mlan_adapter *pmadapter, mlan_buffer *pmbuf) } /* Write the command length to REG_CMD_SIZE */ - if (pcb->moal_write_reg(pmadapter->pmoal_handle, REG_CMD_SIZE, - pmadapter->pcard_pcie->cmd_buf-> - data_len)) { + if (pcb->moal_write_reg( + pmadapter->pmoal_handle, REG_CMD_SIZE, + pmadapter->pcard_pcie->cmd_buf->data_len)) { PRINTM(MERROR, "Failed to write command length to REG_CMD_SIZE\n"); ret = MLAN_STATUS_FAILURE; @@ -2294,10 +2215,10 @@ wlan_pcie_send_cmd(mlan_adapter *pmadapter, mlan_buffer *pmbuf) } /* Ring the door bell */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg-> - reg_cpu_int_event, CPU_INTR_DOOR_BELL)) { + if (pcb->moal_write_reg( + pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_cpu_int_event, + CPU_INTR_DOOR_BELL)) { PRINTM(MERROR, "Failed to assert door-bell interrupt.\n"); ret = MLAN_STATUS_FAILURE; @@ -2309,11 +2230,12 @@ wlan_pcie_send_cmd(mlan_adapter *pmadapter, mlan_buffer *pmbuf) if (pmadapter->pcard_pcie->reg->use_adma) { /* To send a command, the driver will: 1. driver prepare the cmdrep buffer for adma - 2. driver programs dma_mode field to direct programming mode and programs dma_size - field to define DMA data transfer size. - 3. driver programs src_base_addr register to define source location of DMA data + 2. driver programs dma_mode field to direct programming mode + and programs dma_size field to define DMA data transfer size. + 3. driver programs src_base_addr register to define source + location of DMA data 4. driver sets src_wptr to 1 to initiate DMA operation - */ + */ wlan_init_adma(pmadapter, ADMA_CMDRESP, pmadapter->pcard_pcie->cmdrsp_buf->buf_pa, MRVDRV_SIZE_OF_CMD_BUFFER, MFALSE); @@ -2335,8 +2257,8 @@ done: #define MLAN_SLEEP_COOKIE_DEF 0xBEEFBEEF #define MAX_DELAY_LOOP_COUNT 100 -static void -mlan_delay_for_sleep_cookie(mlan_adapter *pmadapter, t_u32 max_delay_loop_cnt) +static void mlan_delay_for_sleep_cookie(mlan_adapter *pmadapter, + t_u32 max_delay_loop_cnt) { t_u8 *buffer; t_u32 sleep_cookie = 0; @@ -2344,7 +2266,6 @@ mlan_delay_for_sleep_cookie(mlan_adapter *pmadapter, t_u32 max_delay_loop_cnt) pmlan_buffer pmbuf = pmadapter->pcard_pcie->cmdrsp_buf; for (count = 0; count < max_delay_loop_cnt; count++) { - buffer = pmbuf->pbuf; sleep_cookie = *(t_u32 *)buffer; @@ -2368,8 +2289,7 @@ mlan_delay_for_sleep_cookie(mlan_adapter *pmadapter, t_u32 max_delay_loop_cnt) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_process_cmd_resp(mlan_adapter *pmadapter) +static mlan_status wlan_pcie_process_cmd_resp(mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -2396,28 +2316,30 @@ wlan_pcie_process_cmd_resp(mlan_adapter *pmadapter) if (!pmadapter->curr_cmd) { if (pmadapter->ps_state == PS_STATE_SLEEP_CFM) { - wlan_process_sleep_confirm_resp(pmadapter, pmbuf->pbuf + - pmbuf->data_offset + - PCIE_INTF_HEADER_LEN, - pmadapter->upld_len); - /* We are sending sleep confirm done interrupt in the middle of - * sleep handshake. There is a corner case when Tx done interrupt - * is received from firmware during sleep handshake due to which - * host and firmware power states go out of sync causing Tx data - * timeout problem. - * Hence sleep confirm done interrupt is sent at the end of sleep - * handshake to fix the problem + wlan_process_sleep_confirm_resp( + pmadapter, + pmbuf->pbuf + pmbuf->data_offset + + PCIE_INTF_HEADER_LEN, + pmadapter->upld_len); + /* We are sending sleep confirm done interrupt in the + * middle of sleep handshake. There is a corner case + * when Tx done interrupt is received from firmware + * during sleep handshake due to which host and firmware + * power states go out of sync causing Tx data timeout + * problem. Hence sleep confirm done interrupt is sent + * at the end of sleep handshake to fix the problem * - * Host could be reading the interrupt during polling (while loop) or - * to address a FW interrupt. In either case, after clearing the interrupt - * driver needs to send a sleep confirm event at the end of processing - * command response right here. This marks the end of the sleep handshake - * with firmware. + * Host could be reading the interrupt during polling + * (while loop) or to address a FW interrupt. In either + * case, after clearing the interrupt driver needs to + * send a sleep confirm event at the end of processing + * command response right here. This marks the end of + * the sleep handshake with firmware. */ wlan_pcie_enable_host_int_mask(pmadapter); if (pcb->moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg-> - reg_cpu_int_event, + pmadapter->pcard_pcie->reg + ->reg_cpu_int_event, CPU_INTR_SLEEP_CFM_DONE)) { PRINTM(MERROR, "Write register failed\n"); LEAVE(); @@ -2428,8 +2350,9 @@ wlan_pcie_process_cmd_resp(mlan_adapter *pmadapter) MAX_DELAY_LOOP_COUNT); #endif } - memcpy_ext(pmadapter, pmadapter->upld_buf, pmbuf->pbuf + - pmbuf->data_offset + PCIE_INTF_HEADER_LEN, + memcpy_ext(pmadapter, pmadapter->upld_buf, + pmbuf->pbuf + pmbuf->data_offset + + PCIE_INTF_HEADER_LEN, pmadapter->upld_len, MLAN_SIZE_OF_CMD_BUFFER); } else { @@ -2443,22 +2366,20 @@ wlan_pcie_process_cmd_resp(mlan_adapter *pmadapter) pmadapter->pcard_pcie->cmdrsp_buf = MNULL; #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { - /* Clear the cmd-rsp buffer address in scratch registers. This - will prevent firmware from writing to the same response - buffer again. */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - REG_CMDRSP_ADDR_LO, 0)) { + /* Clear the cmd-rsp buffer address in scratch + registers. This will prevent firmware from writing to + the same response buffer again. */ + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + REG_CMDRSP_ADDR_LO, 0)) { PRINTM(MERROR, "Rx CMD: failed to clear cmd_rsp address.\n"); ret = MLAN_STATUS_FAILURE; goto done; } /* Write the upper 32bits of the cmdrsp buffer physical - address */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - REG_CMDRSP_ADDR_HI, 0)) { + address */ + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + REG_CMDRSP_ADDR_HI, 0)) { PRINTM(MERROR, "Rx CMD: failed to clear cmd_rsp address.\n"); ret = MLAN_STATUS_FAILURE; @@ -2468,11 +2389,11 @@ wlan_pcie_process_cmd_resp(mlan_adapter *pmadapter) #endif #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { - /* Clear the cmd-rsp buffer address in adma registers. This - will prevent firmware from writing to the same response - buffer again. */ - if (wlan_init_adma - (pmadapter, ADMA_CMDRESP, 0, 0, MFALSE)) { + /* Clear the cmd-rsp buffer address in adma registers. + This will prevent firmware from writing to the same + response buffer again. */ + if (wlan_init_adma(pmadapter, ADMA_CMDRESP, 0, 0, + MFALSE)) { PRINTM(MERROR, "Rx CMD: failed to clear cmd_rsp address.\n"); ret = MLAN_STATUS_FAILURE; @@ -2495,30 +2416,30 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_pcie_cmdrsp_complete(mlan_adapter *pmadapter, - mlan_buffer *pmbuf, mlan_status status) +mlan_status wlan_pcie_cmdrsp_complete(mlan_adapter *pmadapter, + mlan_buffer *pmbuf, mlan_status status) { mlan_buffer *pcmdmbuf; pmlan_callbacks pcb = &pmadapter->callbacks; ENTER(); - /*return the cmd response pmbuf */ + /*return the cmd response pmbuf*/ if (pmbuf) { pmbuf->data_len = MRVDRV_SIZE_OF_CMD_BUFFER; pmbuf->data_offset -= PCIE_INTF_HEADER_LEN; pmadapter->pcard_pcie->cmdrsp_buf = pmbuf; } - /*unmap the cmd pmbuf, so the cpu can not access the memory in the command node */ + /*unmap the cmd pmbuf, so the cpu can not access the memory in the + * command node*/ pcmdmbuf = pmadapter->pcard_pcie->cmd_buf; if (pcmdmbuf) { pcb->moal_unmap_memory(pmadapter->pmoal_handle, pcmdmbuf->pbuf + pcmdmbuf->data_offset, - pcmdmbuf->buf_pa, - WLAN_UPLD_SIZE, PCI_DMA_TODEVICE); + pcmdmbuf->buf_pa, WLAN_UPLD_SIZE, + PCI_DMA_TODEVICE); pmadapter->pcard_pcie->cmd_buf = MNULL; } @@ -2534,16 +2455,15 @@ wlan_pcie_cmdrsp_complete(mlan_adapter *pmadapter, * * @return MTRUE/MFALSE; */ -static t_u8 -wlan_check_evt_buffer(mlan_adapter *pmadapter, t_u32 rdptr) +static t_u8 wlan_check_evt_buffer(mlan_adapter *pmadapter, t_u32 rdptr) { #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { if (((rdptr & EVT_RW_PTR_MASK) != (pmadapter->pcard_pcie->evtbd_rdptr & EVT_RW_PTR_MASK)) || ((rdptr & EVT_RW_PTR_ROLLOVER_IND) != - (pmadapter->pcard_pcie-> - evtbd_rdptr & EVT_RW_PTR_ROLLOVER_IND))) + (pmadapter->pcard_pcie->evtbd_rdptr & + EVT_RW_PTR_ROLLOVER_IND))) return MTRUE; else return MFALSE; @@ -2551,8 +2471,8 @@ wlan_check_evt_buffer(mlan_adapter *pmadapter, t_u32 rdptr) #endif #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { - if ((pmadapter->pcard_pcie->evtbd_rdptr & ADMA_RW_PTR_WRAP_MASK) - != (rdptr & ADMA_RW_PTR_WRAP_MASK)) + if ((pmadapter->pcard_pcie->evtbd_rdptr & + ADMA_RW_PTR_WRAP_MASK) != (rdptr & ADMA_RW_PTR_WRAP_MASK)) return MTRUE; else return MFALSE; @@ -2568,8 +2488,7 @@ wlan_check_evt_buffer(mlan_adapter *pmadapter, t_u32 rdptr) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_process_event_ready(mlan_adapter *pmadapter) +static mlan_status wlan_pcie_process_event_ready(mlan_adapter *pmadapter) { t_u32 rd_index = pmadapter->pcard_pcie->evtbd_rdptr & (MLAN_MAX_EVT_BD - 1); @@ -2585,7 +2504,7 @@ wlan_pcie_process_event_ready(mlan_adapter *pmadapter) if (pmadapter->event_received) { PRINTM(MINFO, "Event being processed, do not " - "process this interrupt just yet\n"); + "process this interrupt just yet\n"); LEAVE(); return MLAN_STATUS_SUCCESS; } @@ -2597,10 +2516,9 @@ wlan_pcie_process_event_ready(mlan_adapter *pmadapter) } /* Read the event ring read pointer set by firmware */ - if (pcb-> - moal_read_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg->reg_evtbd_rdptr, - &rdptr)) { + if (pcb->moal_read_reg(pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_evtbd_rdptr, + &rdptr)) { PRINTM(MERROR, "EvtRdy: failed to read REG_EVTBD_RDPTR\n"); LEAVE(); return MLAN_STATUS_FAILURE; @@ -2618,19 +2536,18 @@ wlan_pcie_process_event_ready(mlan_adapter *pmadapter) PRINTM(MINFO, "EvtRdy: Read Index: %d\n", rd_index); pmbuf_evt = pmadapter->pcard_pcie->evt_buf_list[rd_index]; - /*unmap the pmbuf for CPU Access */ + /*unmap the pmbuf for CPU Access*/ pcb->moal_unmap_memory(pmadapter->pmoal_handle, pmbuf_evt->pbuf + pmbuf_evt->data_offset, - pmbuf_evt->buf_pa, - MAX_EVENT_SIZE, PCI_DMA_FROMDEVICE); + pmbuf_evt->buf_pa, MAX_EVENT_SIZE, + PCI_DMA_FROMDEVICE); /* Take the pointer and set it to event pointer in adapter and will return back after event handling callback */ #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { - pevtbd_buf = - (mlan_pcie_evt_buf *)pmadapter->pcard_pcie-> - evtbd_ring[rd_index]; + pevtbd_buf = (mlan_pcie_evt_buf *)pmadapter->pcard_pcie + ->evtbd_ring[rd_index]; pevtbd_buf->paddr = 0; pevtbd_buf->len = 0; pevtbd_buf->flags = 0; @@ -2640,8 +2557,8 @@ wlan_pcie_process_event_ready(mlan_adapter *pmadapter) #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { padma_bd_buf = - (adma_dual_desc_buf *) pmadapter->pcard_pcie-> - evtbd_ring[rd_index]; + (adma_dual_desc_buf *)pmadapter->pcard_pcie + ->evtbd_ring[rd_index]; padma_bd_buf->paddr = 0; padma_bd_buf->len = 0; padma_bd_buf->flags = 0; @@ -2651,8 +2568,8 @@ wlan_pcie_process_event_ready(mlan_adapter *pmadapter) #endif pmadapter->pcard_pcie->evt_buf_list[rd_index] = MNULL; - event = *((t_u32 *)&pmbuf_evt-> - pbuf[pmbuf_evt->data_offset + PCIE_INTF_HEADER_LEN]); + event = *((t_u32 *)&pmbuf_evt->pbuf[pmbuf_evt->data_offset + + PCIE_INTF_HEADER_LEN]); pmadapter->event_cause = wlan_le32_to_cpu(event); /* The first 4bytes will be the event transfer header len is 2 bytes followed by type which is 2 bytes */ @@ -2663,7 +2580,7 @@ wlan_pcie_process_event_ready(mlan_adapter *pmadapter) (evt_len - MLAN_EVENT_HEADER_LEN < MAX_EVENT_SIZE)) memcpy_ext(pmadapter, pmadapter->event_body, pmbuf_evt->pbuf + pmbuf_evt->data_offset + - MLAN_EVENT_HEADER_LEN, + MLAN_EVENT_HEADER_LEN, evt_len - MLAN_EVENT_HEADER_LEN, sizeof(pmadapter->event_body)); @@ -2676,13 +2593,12 @@ wlan_pcie_process_event_ready(mlan_adapter *pmadapter) pmadapter->pcard_pcie->evtbd_rdptr++; #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { - if ((pmadapter->pcard_pcie-> - evtbd_rdptr & EVT_RW_PTR_MASK) == - MLAN_MAX_EVT_BD) { + if ((pmadapter->pcard_pcie->evtbd_rdptr & + EVT_RW_PTR_MASK) == MLAN_MAX_EVT_BD) { pmadapter->pcard_pcie->evtbd_rdptr = - ((pmadapter->pcard_pcie-> - evtbd_rdptr & EVT_RW_PTR_ROLLOVER_IND) - ^ EVT_RW_PTR_ROLLOVER_IND); + ((pmadapter->pcard_pcie->evtbd_rdptr & + EVT_RW_PTR_ROLLOVER_IND) ^ + EVT_RW_PTR_ROLLOVER_IND); } } #endif @@ -2696,13 +2612,13 @@ wlan_pcie_process_event_ready(mlan_adapter *pmadapter) /* Do not update the event write pointer here, wait till the buffer is released. This is just to make things simpler, we need to find a better method of managing these buffers. - */ + */ } else { PRINTM(MINTR, "------>EVENT DONE\n"); - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg-> - reg_cpu_int_event, CPU_INTR_EVENT_DONE)) { + if (pcb->moal_write_reg( + pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_cpu_int_event, + CPU_INTR_EVENT_DONE)) { PRINTM(MERROR, "Failed to asset event done interrupt\n"); return MLAN_STATUS_FAILURE; @@ -2720,9 +2636,8 @@ wlan_pcie_process_event_ready(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_pcie_event_complete(mlan_adapter *pmadapter, - mlan_buffer *pmbuf, mlan_status status) +mlan_status wlan_pcie_event_complete(mlan_adapter *pmadapter, + mlan_buffer *pmbuf, mlan_status status) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -2749,10 +2664,9 @@ wlan_pcie_event_complete(mlan_adapter *pmadapter, } /* Read the event ring read pointer set by firmware */ - if (pcb-> - moal_read_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg->reg_evtbd_rdptr, - &rdptr)) { + if (pcb->moal_read_reg(pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_evtbd_rdptr, + &rdptr)) { PRINTM(MERROR, "EvtCom: failed to read REG_EVTBD_RDPTR\n"); ret = MLAN_STATUS_FAILURE; goto done; @@ -2779,9 +2693,8 @@ wlan_pcie_event_complete(mlan_adapter *pmadapter, pmadapter->pcard_pcie->evt_buf_list[wrptr] = pmbuf; #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { - pevtbd_buf = - (mlan_pcie_evt_buf *)pmadapter->pcard_pcie-> - evtbd_ring[wrptr]; + pevtbd_buf = (mlan_pcie_evt_buf *)pmadapter->pcard_pcie + ->evtbd_ring[wrptr]; pevtbd_buf->paddr = pmbuf->buf_pa; pevtbd_buf->len = (t_u16)pmbuf->data_len; pevtbd_buf->flags = 0; @@ -2790,9 +2703,8 @@ wlan_pcie_event_complete(mlan_adapter *pmadapter, #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { - padma_bd_buf = - (adma_dual_desc_buf *) pmadapter->pcard_pcie-> - evtbd_ring[wrptr]; + padma_bd_buf = (adma_dual_desc_buf *)pmadapter + ->pcard_pcie->evtbd_ring[wrptr]; padma_bd_buf->paddr = pmbuf->buf_pa; padma_bd_buf->len = ALIGN_SZ(pmbuf->data_len, ADMA_ALIGN_SIZE); @@ -2805,9 +2717,11 @@ wlan_pcie_event_complete(mlan_adapter *pmadapter, #endif pmbuf = MNULL; } else { - PRINTM(MINFO, "EvtCom: ERROR: Buffer is still valid at " - "index %d, <%p, %p>\n", wrptr, - pmadapter->pcard_pcie->evt_buf_list[wrptr], pmbuf); + PRINTM(MINFO, + "EvtCom: ERROR: Buffer is still valid at " + "index %d, <%p, %p>\n", + wrptr, pmadapter->pcard_pcie->evt_buf_list[wrptr], + pmbuf); } pmadapter->pcard_pcie->evtbd_wrptr++; @@ -2817,8 +2731,8 @@ wlan_pcie_event_complete(mlan_adapter *pmadapter, if ((pmadapter->pcard_pcie->evtbd_wrptr & EVT_RW_PTR_MASK) == MLAN_MAX_EVT_BD) { pmadapter->pcard_pcie->evtbd_wrptr = - ((pmadapter->pcard_pcie-> - evtbd_wrptr & EVT_RW_PTR_ROLLOVER_IND) ^ + ((pmadapter->pcard_pcie->evtbd_wrptr & + EVT_RW_PTR_ROLLOVER_IND) ^ EVT_RW_PTR_ROLLOVER_IND); } } @@ -2831,10 +2745,9 @@ wlan_pcie_event_complete(mlan_adapter *pmadapter, pmadapter->pcard_pcie->evtbd_wrptr, rdptr); /* Write the event ring write pointer in to REG_EVTBD_WRPTR */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg->reg_evtbd_wrptr, - pmadapter->pcard_pcie->evtbd_wrptr)) { + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_evtbd_wrptr, + pmadapter->pcard_pcie->evtbd_wrptr)) { PRINTM(MERROR, "EvtCom: failed to write REG_EVTBD_WRPTR\n"); ret = MLAN_STATUS_FAILURE; goto done; @@ -2860,8 +2773,8 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_send_boot_cmd(mlan_adapter *pmadapter, mlan_buffer *pmbuf) +static mlan_status wlan_pcie_send_boot_cmd(mlan_adapter *pmadapter, + mlan_buffer *pmbuf) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -2874,12 +2787,10 @@ wlan_pcie_send_boot_cmd(mlan_adapter *pmadapter, mlan_buffer *pmbuf) return MLAN_STATUS_FAILURE; } - if (MLAN_STATUS_FAILURE == pcb->moal_map_memory(pmadapter->pmoal_handle, - pmbuf->pbuf + - pmbuf->data_offset, - &pmbuf->buf_pa, - WLAN_UPLD_SIZE, - PCI_DMA_TODEVICE)) { + if (MLAN_STATUS_FAILURE == + pcb->moal_map_memory( + pmadapter->pmoal_handle, pmbuf->pbuf + pmbuf->data_offset, + &pmbuf->buf_pa, WLAN_UPLD_SIZE, PCI_DMA_TODEVICE)) { PRINTM(MERROR, "BootCmd: failed to moal_map_memory\n"); LEAVE(); return MLAN_STATUS_FAILURE; @@ -2907,10 +2818,9 @@ wlan_pcie_send_boot_cmd(mlan_adapter *pmadapter, mlan_buffer *pmbuf) /* Write the upper 32bits of the physical address to scratch * register 1 */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg->reg_scratch_1, - (t_u32)((t_u64)pmbuf->buf_pa >> 32))) { + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_scratch_1, + (t_u32)((t_u64)pmbuf->buf_pa >> 32))) { PRINTM(MERROR, "Failed to write download command to boot code\n"); ret = MLAN_STATUS_FAILURE; @@ -2928,10 +2838,9 @@ wlan_pcie_send_boot_cmd(mlan_adapter *pmadapter, mlan_buffer *pmbuf) } /* Ring the door bell */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg->reg_cpu_int_event, - CPU_INTR_DOOR_BELL)) { + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_cpu_int_event, + CPU_INTR_DOOR_BELL)) { PRINTM(MERROR, "Failed to assert door-bell interrupt\n"); ret = MLAN_STATUS_FAILURE; goto done; @@ -2942,10 +2851,9 @@ wlan_pcie_send_boot_cmd(mlan_adapter *pmadapter, mlan_buffer *pmbuf) done: if (MLAN_STATUS_FAILURE == - pcb->moal_unmap_memory(pmadapter->pmoal_handle, - pmbuf->pbuf + pmbuf->data_offset, - pmbuf->buf_pa, WLAN_UPLD_SIZE, - PCI_DMA_TODEVICE)) + pcb->moal_unmap_memory( + pmadapter->pmoal_handle, pmbuf->pbuf + pmbuf->data_offset, + pmbuf->buf_pa, WLAN_UPLD_SIZE, PCI_DMA_TODEVICE)) PRINTM(MERROR, "BootCmd: failed to moal_unmap_memory\n"); LEAVE(); return ret; @@ -2958,34 +2866,30 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_pcie_init_fw(IN pmlan_adapter pmadapter) +mlan_status wlan_pcie_init_fw(IN pmlan_adapter pmadapter) { pmlan_callbacks pcb = &pmadapter->callbacks; t_u32 txbd_val = 0; mlan_status ret = MLAN_STATUS_SUCCESS; #if defined(PCIE8997) || defined(PCIE8897) if (!pmadapter->pcard_pcie->reg->use_adma) { - txbd_val = - pmadapter->pcard_pcie->txbd_wrptr & pmadapter-> - pcard_pcie->reg->txrx_rw_ptr_wrap_mask; + txbd_val = pmadapter->pcard_pcie->txbd_wrptr & + pmadapter->pcard_pcie->reg->txrx_rw_ptr_wrap_mask; txbd_val = txbd_val << TXBD_RW_PTR_START; } #endif /* Write the RX ring write pointer in to REG_RXBD_WRPTR */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg->reg_rxbd_wrptr, - pmadapter->pcard_pcie->rxbd_wrptr | txbd_val)) { + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_rxbd_wrptr, + pmadapter->pcard_pcie->rxbd_wrptr | txbd_val)) { PRINTM(MERROR, "Init FW: failed to write REG_RXBD_WRPTR\n"); ret = MLAN_STATUS_FAILURE; goto done; } /* Write the event ring write pointer in to REG_EVTBD_WRPTR */ - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg->reg_evtbd_wrptr, - pmadapter->pcard_pcie->evtbd_wrptr)) { + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_evtbd_wrptr, + pmadapter->pcard_pcie->evtbd_wrptr)) { PRINTM(MERROR, "Init FW: failed to write REG_EVTBD_WRPTR\n"); ret = MLAN_STATUS_FAILURE; } @@ -3001,8 +2905,8 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_pcie_prog_fw_w_helper(IN mlan_adapter *pmadapter, IN mlan_fw_image *fw) +static mlan_status wlan_pcie_prog_fw_w_helper(IN mlan_adapter *pmadapter, + IN mlan_fw_image *fw) { mlan_status ret = MLAN_STATUS_FAILURE; t_u8 *firmware = fw->pfw_buf; @@ -3077,9 +2981,10 @@ wlan_pcie_prog_fw_w_helper(IN mlan_adapter *pmadapter, IN mlan_fw_image *fw) break; for (tries = 0; tries < MAX_POLL_TRIES; tries++) { - ret = pcb->moal_read_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg-> - reg_scratch_2, &len); + ret = pcb->moal_read_reg( + pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_scratch_2, + &len); if (ret) { PRINTM(MWARN, "Failed reading length from boot code\n"); @@ -3104,23 +3009,24 @@ wlan_pcie_prog_fw_w_helper(IN mlan_adapter *pmadapter, IN mlan_fw_image *fw) if (len & MBIT(0)) { if (check_fw_status) { /* Get offset from fw dnld offset Register */ - ret = pcb->moal_read_reg(pmadapter-> - pmoal_handle, - pmadapter->pcard_pcie-> - reg->reg_scratch_6, - &fw_dnld_offset); + ret = pcb->moal_read_reg( + pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg + ->reg_scratch_6, + &fw_dnld_offset); if (ret != MLAN_STATUS_SUCCESS) { PRINTM(MERROR, "FW download failure @ %d, reading fw dnld offset failed\n", offset); goto done; } - /* Get CRC MIC error from fw dnld status Register */ - ret = pcb->moal_read_reg(pmadapter-> - pmoal_handle, - pmadapter->pcard_pcie-> - reg->reg_scratch_7, - &fw_dnld_status); + /* Get CRC MIC error from fw dnld status + * Register */ + ret = pcb->moal_read_reg( + pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg + ->reg_scratch_7, + &fw_dnld_status); if (ret != MLAN_STATUS_SUCCESS) { PRINTM(MERROR, "FW download failure @ %d, reading fw dnld status failed\n", @@ -3135,12 +3041,14 @@ wlan_pcie_prog_fw_w_helper(IN mlan_adapter *pmadapter, IN mlan_fw_image *fw) if (block_retry_cnt > MAX_WRITE_IOMEM_RETRY) { PRINTM(MERROR, "FW download failure @ %d, over max " - "retry count\n", offset); + "retry count\n", + offset); goto done; } - PRINTM(MERROR, "FW CRC error indicated by the " - "helper: len = 0x%04X, txlen = %d\n", len, - txlen); + PRINTM(MERROR, + "FW CRC error indicated by the " + "helper: len = 0x%04X, txlen = %d\n", + len, txlen); len &= ~MBIT(0); /* Setting this to 0 to resend from same offset */ txlen = 0; @@ -3150,20 +3058,22 @@ wlan_pcie_prog_fw_w_helper(IN mlan_adapter *pmadapter, IN mlan_fw_image *fw) if (mic_retry > MAX_FW_RETRY) { PRINTM(MERROR, "FW download failure @ %d, over max " - "mic retry count\n", offset); + "mic retry count\n", + offset); goto done; } } } else { block_retry_cnt = 0; - /* Set blocksize to transfer - checking for last block */ + /* Set blocksize to transfer - checking for last block + */ if (firmware_len - offset < txlen) txlen = firmware_len - offset; PRINTM(MINFO, "."); tx_blocks = (txlen + MLAN_PCIE_BLOCK_SIZE_FW_DNLD - 1) / - MLAN_PCIE_BLOCK_SIZE_FW_DNLD; + MLAN_PCIE_BLOCK_SIZE_FW_DNLD; /* Copy payload to buffer */ memmove(pmadapter, pmbuf->pbuf + pmbuf->data_offset, @@ -3182,23 +3092,24 @@ wlan_pcie_prog_fw_w_helper(IN mlan_adapter *pmadapter, IN mlan_fw_image *fw) if (read_retry_cnt > MAX_READ_REG_RETRY) { PRINTM(MERROR, "prog_fw: Failed to get command done interrupt " - "retry count = %d\n", read_retry_cnt); + "retry count = %d\n", + read_retry_cnt); goto done; } - if (pcb-> - moal_read_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg-> - reg_cpu_int_status, &ireg_intr)) { + if (pcb->moal_read_reg(pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg + ->reg_cpu_int_status, + &ireg_intr)) { PRINTM(MERROR, "prog_fw: Failed to read " "interrupt status during fw dnld\n"); - /* buffer was mapped in send_boot_cmd, unmap first */ - pcb->moal_unmap_memory(pmadapter->pmoal_handle, - pmbuf->pbuf + - pmbuf->data_offset, - pmbuf->buf_pa, - WLAN_UPLD_SIZE, - PCI_DMA_TODEVICE); + /* buffer was mapped in send_boot_cmd, unmap + * first */ + pcb->moal_unmap_memory( + pmadapter->pmoal_handle, + pmbuf->pbuf + pmbuf->data_offset, + pmbuf->buf_pa, WLAN_UPLD_SIZE, + PCI_DMA_TODEVICE); goto done; } read_retry_cnt++; @@ -3237,8 +3148,7 @@ done: * @param pmadapter A pointer to mlan_adapter structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_get_pcie_device(pmlan_adapter pmadapter) +mlan_status wlan_get_pcie_device(pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u16 card_type = pmadapter->card_type; @@ -3297,16 +3207,15 @@ wlan_get_pcie_device(pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_pcie_wakeup(mlan_adapter *pmadapter) +mlan_status wlan_pcie_wakeup(mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 data = 0; ENTER(); /* Enable interrupts or any chip access will wakeup device */ - ret = pmadapter->callbacks.moal_read_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg-> - reg_ip_rev, &data); + ret = pmadapter->callbacks.moal_read_reg( + pmadapter->pmoal_handle, pmadapter->pcard_pcie->reg->reg_ip_rev, + &data); if (ret == MLAN_STATUS_SUCCESS) { PRINTM(MINFO, @@ -3328,8 +3237,7 @@ wlan_pcie_wakeup(mlan_adapter *pmadapter) * @param pmadapter A pointer to mlan_adapter structure * @return MLAN_STATUS_FAILURE -- if the intererupt is not for us */ -mlan_status -wlan_pcie_interrupt(t_u16 msg_id, pmlan_adapter pmadapter) +mlan_status wlan_pcie_interrupt(t_u16 msg_id, pmlan_adapter pmadapter) { t_u32 pcie_ireg; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -3344,9 +3252,8 @@ wlan_pcie_interrupt(t_u16 msg_id, pmlan_adapter pmadapter) pmadapter->ireg = 1; pcb->moal_spin_unlock(pmoal_handle, pint_lock); } else if (pmadapter->pcard_pcie->pcie_int_mode == PCIE_INT_MODE_MSIX) { - pcie_ireg = - (1 << msg_id) & pmadapter->pcard_pcie->reg-> - host_intr_mask; + pcie_ireg = (1 << msg_id) & + pmadapter->pcard_pcie->reg->host_intr_mask; if (pcie_ireg) { if (!pmadapter->pps_uapsd_mode && (pmadapter->ps_state == PS_STATE_SLEEP)) { @@ -3362,10 +3269,10 @@ wlan_pcie_interrupt(t_u16 msg_id, pmlan_adapter pmadapter) PRINTM(MINTR, "ireg: 0x%08x\n", pcie_ireg); } else { wlan_pcie_disable_host_int_mask(pmadapter); - if (pcb-> - moal_read_reg(pmoal_handle, - pmadapter->pcard_pcie->reg-> - reg_host_int_status, &pcie_ireg)) { + if (pcb->moal_read_reg( + pmoal_handle, + pmadapter->pcard_pcie->reg->reg_host_int_status, + &pcie_ireg)) { PRINTM(MWARN, "Read register failed\n"); LEAVE(); return MLAN_STATUS_FAILURE; @@ -3386,10 +3293,10 @@ wlan_pcie_interrupt(t_u16 msg_id, pmlan_adapter pmadapter) pcb->moal_spin_unlock(pmoal_handle, pint_lock); /* Clear the pending interrupts */ - if (pcb-> - moal_write_reg(pmoal_handle, - pmadapter->pcard_pcie->reg-> - reg_host_int_status, ~pcie_ireg)) { + if (pcb->moal_write_reg(pmoal_handle, + pmadapter->pcard_pcie->reg + ->reg_host_int_status, + ~pcie_ireg)) { PRINTM(MWARN, "Write register failed\n"); LEAVE(); return ret; @@ -3413,8 +3320,7 @@ wlan_pcie_interrupt(t_u16 msg_id, pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_process_msix_int(mlan_adapter *pmadapter) +mlan_status wlan_process_msix_int(mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 pcie_ireg = 0; @@ -3481,8 +3387,7 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_process_pcie_int_status(mlan_adapter *pmadapter) +mlan_status wlan_process_pcie_int_status(mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 pcie_ireg = 0; @@ -3500,10 +3405,10 @@ wlan_process_pcie_int_status(mlan_adapter *pmadapter) pmadapter->ireg = 0; pcb->moal_spin_unlock(pmadapter->pmoal_handle, pmadapter->pint_lock); if (pmadapter->pcard_pcie->pcie_int_mode == PCIE_INT_MODE_MSI) { - if (pcb-> - moal_read_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg-> - reg_host_int_status, &pcie_ireg)) { + if (pcb->moal_read_reg( + pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_host_int_status, + &pcie_ireg)) { PRINTM(MWARN, "Read register failed\n"); ret = MLAN_STATUS_FAILURE; goto done; @@ -3512,11 +3417,11 @@ wlan_process_pcie_int_status(mlan_adapter *pmadapter) if ((pcie_ireg != 0xFFFFFFFF) && (pcie_ireg)) { PRINTM(MINTR, "pcie_ireg=0x%x\n", pcie_ireg); if (pmadapter->pcard_pcie->reg->msi_int_wr_clr) { - if (pcb->moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie-> - reg-> - reg_host_int_status, - ~pcie_ireg)) { + if (pcb->moal_write_reg( + pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg + ->reg_host_int_status, + ~pcie_ireg)) { PRINTM(MWARN, "Write register failed\n"); ret = MLAN_STATUS_FAILURE; @@ -3534,16 +3439,17 @@ wlan_process_pcie_int_status(mlan_adapter *pmadapter) } } while (pcie_ireg & pmadapter->pcard_pcie->reg->host_intr_mask) { - if (pcie_ireg & pmadapter->pcard_pcie->reg->host_intr_dnld_done) { + if (pcie_ireg & + pmadapter->pcard_pcie->reg->host_intr_dnld_done) { pcie_ireg &= - ~pmadapter->pcard_pcie->reg-> - host_intr_dnld_done; + ~pmadapter->pcard_pcie->reg->host_intr_dnld_done; PRINTM(MINFO, "<--- DATA sent Interrupt --->\n"); ret = wlan_pcie_send_data_complete(pmadapter); if (ret) goto done; } - if (pcie_ireg & pmadapter->pcard_pcie->reg->host_intr_upld_rdy) { + if (pcie_ireg & + pmadapter->pcard_pcie->reg->host_intr_upld_rdy) { pcie_ireg &= ~pmadapter->pcard_pcie->reg->host_intr_upld_rdy; PRINTM(MINFO, "Rx DATA\n"); @@ -3551,16 +3457,17 @@ wlan_process_pcie_int_status(mlan_adapter *pmadapter) if (ret) goto done; } - if (pcie_ireg & pmadapter->pcard_pcie->reg->host_intr_event_rdy) { + if (pcie_ireg & + pmadapter->pcard_pcie->reg->host_intr_event_rdy) { pcie_ireg &= - ~pmadapter->pcard_pcie->reg-> - host_intr_event_rdy; + ~pmadapter->pcard_pcie->reg->host_intr_event_rdy; PRINTM(MINFO, "Rx EVENT\n"); ret = wlan_pcie_process_event_ready(pmadapter); if (ret) goto done; } - if (pcie_ireg & pmadapter->pcard_pcie->reg->host_intr_cmd_done) { + if (pcie_ireg & + pmadapter->pcard_pcie->reg->host_intr_cmd_done) { pcie_ireg &= ~pmadapter->pcard_pcie->reg->host_intr_cmd_done; if (pmadapter->cmd_sent) { @@ -3573,8 +3480,8 @@ wlan_process_pcie_int_status(mlan_adapter *pmadapter) } #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->host_intr_cmd_dnld && - (pcie_ireg & pmadapter->pcard_pcie->reg-> - host_intr_cmd_dnld)) { + (pcie_ireg & + pmadapter->pcard_pcie->reg->host_intr_cmd_dnld)) { pcie_ireg &= ~pmadapter->pcard_pcie->reg->host_intr_cmd_dnld; if (pmadapter->cmd_sent) @@ -3591,10 +3498,10 @@ wlan_process_pcie_int_status(mlan_adapter *pmadapter) pcb->moal_spin_unlock(pmadapter->pmoal_handle, pmadapter->pint_lock); } - if (pcb-> - moal_read_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg-> - reg_host_int_status, &pcie_ireg)) { + if (pcb->moal_read_reg( + pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_host_int_status, + &pcie_ireg)) { PRINTM(MWARN, "Read register failed\n"); ret = MLAN_STATUS_FAILURE; goto done; @@ -3605,11 +3512,11 @@ wlan_process_pcie_int_status(mlan_adapter *pmadapter) if ((pmadapter->pcard_pcie->pcie_int_mode == PCIE_INT_MODE_LEGACY) || pmadapter->pcard_pcie->reg->msi_int_wr_clr) { - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg-> - reg_host_int_status, - ~pcie_ireg)) { + if (pcb->moal_write_reg( + pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg + ->reg_host_int_status, + ~pcie_ireg)) { PRINTM(MWARN, "Write register failed\n"); return MLAN_STATUS_FAILURE; @@ -3627,16 +3534,13 @@ wlan_process_pcie_int_status(mlan_adapter *pmadapter) /* Don't update the pmadapter->pcie_ireg, * serving the status right now */ } - } PRINTM(MINFO, "cmd_sent=%d data_sent=%d\n", pmadapter->cmd_sent, pmadapter->data_sent); if (pmadapter->pcard_pcie->pcie_int_mode != PCIE_INT_MODE_MSI) { - if (pmadapter->ps_state != PS_STATE_SLEEP || pmadapter->pcard_info->supp_ps_handshake) wlan_pcie_enable_host_int_mask(pmadapter); - } done: LEAVE(); @@ -3652,16 +3556,15 @@ done: * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE * */ -mlan_status -wlan_set_drv_ready_reg(mlan_adapter *pmadapter, t_u32 val) +mlan_status wlan_set_drv_ready_reg(mlan_adapter *pmadapter, t_u32 val) { pmlan_callbacks pcb = &pmadapter->callbacks; ENTER(); - if (pcb-> - moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg->reg_drv_ready, val)) { + if (pcb->moal_write_reg(pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_drv_ready, + val)) { LEAVE(); return MLAN_STATUS_FAILURE; } @@ -3680,8 +3583,7 @@ wlan_set_drv_ready_reg(mlan_adapter *pmadapter, t_u32 val) * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE * */ -mlan_status -wlan_pcie_check_winner_status(mlan_adapter *pmadapter, t_u32 *val) +mlan_status wlan_pcie_check_winner_status(mlan_adapter *pmadapter, t_u32 *val) { t_u32 winner = 0; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -3710,8 +3612,7 @@ wlan_pcie_check_winner_status(mlan_adapter *pmadapter, t_u32 *val) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_pcie_check_fw_status(mlan_adapter *pmadapter, t_u32 pollnum) +mlan_status wlan_pcie_check_fw_status(mlan_adapter *pmadapter, t_u32 pollnum) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -3722,10 +3623,9 @@ wlan_pcie_check_fw_status(mlan_adapter *pmadapter, t_u32 pollnum) /* Wait for firmware initialization event */ for (tries = 0; tries < pollnum; tries++) { - if (pcb-> - moal_read_reg(pmadapter->pmoal_handle, - pmadapter->pcard_pcie->reg->reg_scratch_3, - &firmware_stat)) + if (pcb->moal_read_reg(pmadapter->pmoal_handle, + pmadapter->pcard_pcie->reg->reg_scratch_3, + &firmware_stat)) ret = MLAN_STATUS_FAILURE; else ret = MLAN_STATUS_SUCCESS; @@ -3751,10 +3651,8 @@ wlan_pcie_check_fw_status(mlan_adapter *pmadapter, t_u32 pollnum) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_pcie_init(mlan_adapter *pmadapter) +mlan_status wlan_pcie_init(mlan_adapter *pmadapter) { - ENTER(); PRINTM(MINFO, "Setting driver ready signature\n"); @@ -3775,8 +3673,8 @@ wlan_pcie_init(mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_pcie_dnld_fw(IN pmlan_adapter pmadapter, IN pmlan_fw_image pmfw) +mlan_status wlan_pcie_dnld_fw(IN pmlan_adapter pmadapter, + IN pmlan_fw_image pmfw) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 poll_num = 1; @@ -3848,14 +3746,15 @@ done: * * @param pmpriv A pointer to mlan_private structure * @param type data or command - * @param pmbuf A pointer to mlan_buffer (pmbuf->data_len should include PCIE header) - * @param tx_param A pointer to mlan_tx_param (can be MNULL if type is command) + * @param pmbuf A pointer to mlan_buffer (pmbuf->data_len should include + * PCIE header) + * @param tx_param A pointer to mlan_tx_param (can be MNULL if type is + * command) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_pcie_host_to_card(pmlan_private pmpriv, t_u8 type, - mlan_buffer *pmbuf, mlan_tx_param *tx_param) +mlan_status wlan_pcie_host_to_card(pmlan_private pmpriv, t_u8 type, + mlan_buffer *pmbuf, mlan_tx_param *tx_param) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_adapter pmadapter = pmpriv->adapter; @@ -3886,15 +3785,14 @@ wlan_pcie_host_to_card(pmlan_private pmpriv, t_u8 type, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_alloc_ssu_pcie_buf(pmlan_adapter pmadapter) +mlan_status wlan_alloc_ssu_pcie_buf(pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; mlan_buffer *pmbuf = MNULL; - /** Virtual base address of ssu buffer */ + /** Virtual base address of ssu buffer */ t_u8 *ssu_vbase; - /** Physical base address of ssu buffer */ + /** Physical base address of ssu buffer */ t_u64 ssu_pbase = 0; ENTER(); @@ -3931,9 +3829,11 @@ wlan_alloc_ssu_pcie_buf(pmlan_adapter pmadapter) pmbuf->data_len = MLAN_SSU_BUF_SIZE; pmbuf->total_pcie_buf_len = MLAN_SSU_BUF_SIZE; - PRINTM(MCMND, "SSU buffer: add new mlan_buffer base: %p, " + PRINTM(MCMND, + "SSU buffer: add new mlan_buffer base: %p, " "buf_base: %p, data_offset: %x, buf_pbase: %#x:%x, " - "buf_len: %#x\n", pmbuf, pmbuf->pbuf, pmbuf->data_offset, + "buf_len: %#x\n", + pmbuf, pmbuf->pbuf, pmbuf->data_offset, (t_u32)((t_u64)pmbuf->buf_pa >> 32), (t_u32)pmbuf->buf_pa, pmbuf->data_len); @@ -3950,8 +3850,7 @@ wlan_alloc_ssu_pcie_buf(pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_free_ssu_pcie_buf(pmlan_adapter pmadapter) +mlan_status wlan_free_ssu_pcie_buf(pmlan_adapter pmadapter) { pmlan_callbacks pcb = &pmadapter->callbacks; mlan_buffer *pmbuf = MNULL; @@ -3994,8 +3893,7 @@ wlan_free_ssu_pcie_buf(pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_alloc_pcie_ring_buf(pmlan_adapter pmadapter) +mlan_status wlan_alloc_pcie_ring_buf(pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; @@ -4040,8 +3938,7 @@ err_cre_txbd: * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_free_pcie_ring_buf(pmlan_adapter pmadapter) +mlan_status wlan_free_pcie_ring_buf(pmlan_adapter pmadapter) { ENTER(); @@ -4051,8 +3948,8 @@ wlan_free_pcie_ring_buf(pmlan_adapter pmadapter) wlan_pcie_delete_txbd_ring(pmadapter); pmadapter->pcard_pcie->cmdrsp_buf = MNULL; #ifdef RPTR_MEM_COP - if ((pmadapter->card_type == CARD_TYPE_PCIE9098) - || (pmadapter->card_type == CARD_TYPE_PCIE9097)) + if ((pmadapter->card_type == CARD_TYPE_PCIE9098) || + (pmadapter->card_type == CARD_TYPE_PCIE9097)) wlan_pcie_free_rdptrs(pmadapter); #endif @@ -4070,8 +3967,7 @@ wlan_free_pcie_ring_buf(pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_clean_pcie_ring_buf(pmlan_adapter pmadapter) +mlan_status wlan_clean_pcie_ring_buf(pmlan_adapter pmadapter) { ENTER(); #if defined(PCIE8997) || defined(PCIE8897) @@ -4090,8 +3986,7 @@ wlan_clean_pcie_ring_buf(pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_set_pcie_buf_config(mlan_private *pmpriv) +mlan_status wlan_set_pcie_buf_config(mlan_private *pmpriv) { pmlan_adapter pmadapter = MNULL; #if defined(PCIE8997) || defined(PCIE8897) @@ -4113,21 +4008,18 @@ wlan_set_pcie_buf_config(mlan_private *pmpriv) /* Send the ring base addresses and count to firmware */ host_spec.txbd_addr_lo = (t_u32)(pmadapter->pcard_pcie->txbd_ring_pbase); - host_spec.txbd_addr_hi = - (t_u32)(((t_u64)pmadapter->pcard_pcie-> - txbd_ring_pbase) >> 32); + host_spec.txbd_addr_hi = (t_u32)( + ((t_u64)pmadapter->pcard_pcie->txbd_ring_pbase) >> 32); host_spec.txbd_count = MLAN_MAX_TXRX_BD; host_spec.rxbd_addr_lo = (t_u32)(pmadapter->pcard_pcie->rxbd_ring_pbase); - host_spec.rxbd_addr_hi = - (t_u32)(((t_u64)pmadapter->pcard_pcie-> - rxbd_ring_pbase) >> 32); + host_spec.rxbd_addr_hi = (t_u32)( + ((t_u64)pmadapter->pcard_pcie->rxbd_ring_pbase) >> 32); host_spec.rxbd_count = MLAN_MAX_TXRX_BD; host_spec.evtbd_addr_lo = (t_u32)(pmadapter->pcard_pcie->evtbd_ring_pbase); - host_spec.evtbd_addr_hi = - (t_u32)(((t_u64)pmadapter->pcard_pcie-> - evtbd_ring_pbase) >> 32); + host_spec.evtbd_addr_hi = (t_u32)( + ((t_u64)pmadapter->pcard_pcie->evtbd_ring_pbase) >> 32); host_spec.evtbd_count = MLAN_MAX_EVT_BD; ret = wlan_prepare_cmd(pmpriv, @@ -4143,21 +4035,21 @@ wlan_set_pcie_buf_config(mlan_private *pmpriv) #endif #if defined(PCIE9098) || defined(PCIE9097) if (pmadapter->pcard_pcie->reg->use_adma) { - /** config ADMA for Tx Data */ + /** config ADMA for Tx Data */ wlan_init_adma(pmadapter, ADMA_TX_DATA, pmadapter->pcard_pcie->txbd_ring_pbase, TX_RX_NUM_DESC, MTRUE); - /** config ADMA for Rx Data */ + /** config ADMA for Rx Data */ wlan_init_adma(pmadapter, ADMA_RX_DATA, pmadapter->pcard_pcie->rxbd_ring_pbase, TX_RX_NUM_DESC, MTRUE); - /** config ADMA for Rx Event */ + /** config ADMA for Rx Event */ wlan_init_adma(pmadapter, ADMA_EVENT, pmadapter->pcard_pcie->evtbd_ring_pbase, EVT_NUM_DESC, MTRUE); - /** config ADMA for cmd */ + /** config ADMA for cmd */ wlan_init_adma(pmadapter, ADMA_CMD, 0, 0, MTRUE); - /** config ADMA for cmdresp */ + /** config ADMA for cmdresp */ wlan_init_adma(pmadapter, ADMA_CMDRESP, pmadapter->pcard_pcie->cmdrsp_buf->buf_pa, 0, MTRUE); @@ -4179,10 +4071,10 @@ wlan_set_pcie_buf_config(mlan_private *pmpriv) * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_pcie_host_buf_cfg(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_pcie_host_buf_cfg(pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, + IN t_void *pdata_buf) { HostCmd_DS_PCIE_HOST_BUF_DETAILS *ppcie_hoost_spec = &cmd->params.pcie_host_spec; @@ -4190,9 +4082,8 @@ wlan_cmd_pcie_host_buf_cfg(pmlan_private pmpriv, ENTER(); cmd->command = wlan_cpu_to_le16(HostCmd_CMD_PCIE_HOST_BUF_DETAILS); - cmd->size = - wlan_cpu_to_le16((sizeof(HostCmd_DS_PCIE_HOST_BUF_DETAILS)) + - S_DS_GEN); + cmd->size = wlan_cpu_to_le16( + (sizeof(HostCmd_DS_PCIE_HOST_BUF_DETAILS)) + S_DS_GEN); if (cmd_action == HostCmd_ACT_GEN_SET) { memcpy_ext(pmpriv->adapter, ppcie_hoost_spec, pdata_buf, @@ -4213,8 +4104,8 @@ wlan_cmd_pcie_host_buf_cfg(pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_pm_pcie_wakeup_card(IN pmlan_adapter pmadapter, IN t_u8 timeout) +mlan_status wlan_pm_pcie_wakeup_card(IN pmlan_adapter pmadapter, + IN t_u8 timeout) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 age_ts_usec; @@ -4226,10 +4117,9 @@ wlan_pm_pcie_wakeup_card(IN pmlan_adapter pmadapter, IN t_u8 timeout) &age_ts_usec); if (timeout) { - pmadapter->callbacks.moal_start_timer(pmadapter->pmoal_handle, - pmadapter-> - pwakeup_fw_timer, MFALSE, - MRVDRV_TIMER_3S); + pmadapter->callbacks.moal_start_timer( + pmadapter->pmoal_handle, pmadapter->pwakeup_fw_timer, + MFALSE, MRVDRV_TIMER_3S); pmadapter->wakeup_fw_timer_is_set = MTRUE; } @@ -4239,8 +4129,7 @@ wlan_pm_pcie_wakeup_card(IN pmlan_adapter pmadapter, IN t_u8 timeout) return ret; } -mlan_status -wlan_pcie_debug_dump(IN pmlan_adapter pmadapter) +mlan_status wlan_pcie_debug_dump(IN pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_buffer pmbuf = pmadapter->pcard_pcie->cmdrsp_buf; @@ -4266,9 +4155,8 @@ wlan_pcie_debug_dump(IN pmlan_adapter pmadapter) * @param pmbuf A pointer to the mlan_buffer * @return N/A */ -mlan_status -wlan_pcie_data_complete(IN pmlan_adapter pmadapter, mlan_buffer *pmbuf, - mlan_status status) +mlan_status wlan_pcie_data_complete(IN pmlan_adapter pmadapter, + mlan_buffer *pmbuf, mlan_status status) { ENTER(); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_pcie.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_pcie.h index ac149c1bf32f..17ee7ce3e5cc 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_pcie.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_pcie.h @@ -29,433 +29,432 @@ Change log: #ifndef _MLAN_PCIE_H_ #define _MLAN_PCIE_H_ /** Tx DATA */ -#define ADMA_TX_DATA 0 +#define ADMA_TX_DATA 0 /** Rx DATA */ -#define ADMA_RX_DATA 1 +#define ADMA_RX_DATA 1 /** EVENT */ -#define ADMA_EVENT 2 +#define ADMA_EVENT 2 /** CMD */ -#define ADMA_CMD 3 +#define ADMA_CMD 3 /** CMD RESP */ -#define ADMA_CMDRESP 4 +#define ADMA_CMDRESP 4 /** ADMA direction */ -#define ADMA_HOST_TO_DEVICE 0 +#define ADMA_HOST_TO_DEVICE 0 /** ADMA direction Rx */ -#define ADMA_DEVICE_TO_HOST 1 +#define ADMA_DEVICE_TO_HOST 1 /** Direct Program mode */ -#define DMA_MODE_DIRECT 0 +#define DMA_MODE_DIRECT 0 /** Single descriptor mode */ -#define DMA_MODE_SINGLE_DESC 1 +#define DMA_MODE_SINGLE_DESC 1 /** dual discriptor mode */ -#define DMA_MODE_DUAL_DESC 2 +#define DMA_MODE_DUAL_DESC 2 /** descriptor mode: ring mode */ -#define DESC_MODE_RING 0 +#define DESC_MODE_RING 0 /** descriptor mode: chain mode */ -#define DESC_MODE_CHAIN 1 +#define DESC_MODE_CHAIN 1 /** DMA size start bit */ -#define DMA_SIZE_BIT 16 +#define DMA_SIZE_BIT 16 /** DMA size mask */ -#define DMA_SIZE_MASK 0xffff0000 +#define DMA_SIZE_MASK 0xffff0000 /** Descriptor mode */ -#define DESC_MODE_MASK 0x0004 +#define DESC_MODE_MASK 0x0004 /** DMA MODE MASK */ -#define DMA_MODE_MASK 0x0003 +#define DMA_MODE_MASK 0x0003 /** Dest Num Descriptor start bits */ -#define DST_NUM_DESC_BIT 12 +#define DST_NUM_DESC_BIT 12 /** Destination Num of Descriptor mask */ -#define DST_NUM_DESC_MASK 0xf000 +#define DST_NUM_DESC_MASK 0xf000 /** Src Num Descriptor start bits */ -#define SRC_NUM_DESC_BIT 8 +#define SRC_NUM_DESC_BIT 8 /** Destination Num of Descriptor mask */ -#define SRC_NUM_DESC_MASK 0x0f00 +#define SRC_NUM_DESC_MASK 0x0f00 /** Virtual Q priority mask */ -#define Q_PRIO_WEIGHT_MASK 0x00f0 +#define Q_PRIO_WEIGHT_MASK 0x00f0 /** DMA cfg register offset*/ -#define ADMA_DMA_CFG 0x0000 +#define ADMA_DMA_CFG 0x0000 /** source base low */ -#define ADMA_SRC_LOW 0x0004 +#define ADMA_SRC_LOW 0x0004 /** source base high */ -#define ADMA_SRC_HIGH 0x0008 +#define ADMA_SRC_HIGH 0x0008 /** destination base low */ -#define ADMA_DST_LOW 0x000C +#define ADMA_DST_LOW 0x000C /** destination base high */ -#define ADMA_DST_HIGH 0x0010 +#define ADMA_DST_HIGH 0x0010 /** source rd/wr pointer */ -#define ADMA_SRC_RW_PTR 0x0014 +#define ADMA_SRC_RW_PTR 0x0014 /** destination rd/wr pointer */ -#define ADMA_DST_RW_PTR 0x0018 -/** interrupt direction mapping reg, for each virtual Q, used for dual-descriptor only, only valid for Q0 */ -#define ADMA_INT_MAPPING 0x001C +#define ADMA_DST_RW_PTR 0x0018 +/** interrupt direction mapping reg, for each virtual Q, used for + * dual-descriptor only, only valid for Q0 */ +#define ADMA_INT_MAPPING 0x001C /** destination interrupt to device */ -#define DEST_INT_TO_DEVICE MBIT(0) +#define DEST_INT_TO_DEVICE MBIT(0) /** destination interrupt to host */ -#define DEST_INT_TO_HOST MBIT(1) +#define DEST_INT_TO_HOST MBIT(1) /** interrupt pending status for each virtual Q, only valid for Q0 */ -#define ADMA_INT_PENDING 0x0020 +#define ADMA_INT_PENDING 0x0020 /** Default ADMA INT mask, We only enable dma done */ -#define DEF_ADMA_INT_MASK MBIT(0) +#define DEF_ADMA_INT_MASK MBIT(0) /** source interrupt status mask reg */ -#define ADMA_SRC_INT_STATUS_MASK 0x0024 +#define ADMA_SRC_INT_STATUS_MASK 0x0024 /** source interrupt mask reg */ -#define ADMA_SRC_INT_MASK 0x0028 +#define ADMA_SRC_INT_MASK 0x0028 /** source interrupt status reg */ -#define ADMA_SRC_INT_STATUS 0x002C +#define ADMA_SRC_INT_STATUS 0x002C /** destination interrupt status mask reg */ -#define ADMA_DST_INT_STATUS_MASK 0x0030 +#define ADMA_DST_INT_STATUS_MASK 0x0030 /** destination interrupt mask reg */ -#define ADMA_DST_INT_MASK 0x0034 +#define ADMA_DST_INT_MASK 0x0034 /** destination interrupt status reg */ -#define ADMA_DST_INT_STATUS 0x0038 +#define ADMA_DST_INT_STATUS 0x0038 /** DMA cfg2 register */ -#define ADMA_DMA_CFG2 0x003C +#define ADMA_DMA_CFG2 0x003C /** ADMA_MSI_LEGACY_DST_DMA_DONE_INT_BYPASS_EN */ -#define ADMA_MSI_LEGACY_DST_DMA_DONE_INT_BYPASS_EN MBIT(22) +#define ADMA_MSI_LEGACY_DST_DMA_DONE_INT_BYPASS_EN MBIT(22) /** ADMA_MSI_LEGACY_SRC_DMA_DONE_INT_BYPASS_EN */ -#define ADMA_MSI_LEGACY_SRC_DMA_DONE_INT_BYPASS_EN MBIT(21) -/* If this bit is set, MSIX trigger event will be from DST, other wise MSIX trigger event will be from SRC */ -#define ADMA_MSIX_INT_SRC_DST_SEL MBIT(20) +#define ADMA_MSI_LEGACY_SRC_DMA_DONE_INT_BYPASS_EN MBIT(21) +/* If this bit is set, MSIX trigger event will be from DST, other wise MSIX + * trigger event will be from SRC */ +#define ADMA_MSIX_INT_SRC_DST_SEL MBIT(20) /** Enable MSI/Legacy for this Queue */ -#define ADMA_MSI_LEGACY_ENABLE MBIT(19) +#define ADMA_MSI_LEGACY_ENABLE MBIT(19) /** Enable MSIX for this queue */ -#define ADMA_MSIX_ENABLE MBIT(18) +#define ADMA_MSIX_ENABLE MBIT(18) /** ADMA_DST_DMA_DONE_INT_BYPASS_EN */ -#define ADMA_DST_DMA_DONE_INT_BYPASS_EN MBIT(17) +#define ADMA_DST_DMA_DONE_INT_BYPASS_EN MBIT(17) /** SRC_DMA_DONE_INT_BYPASS_EN */ -#define ADMA_SRC_DMA_DONE_INT_BYPASS_EN MBIT(16) +#define ADMA_SRC_DMA_DONE_INT_BYPASS_EN MBIT(16) /* Destination Read Pointer Memory Copy Enable */ -#define ADMA_DST_RPTR_MEM_COPY_EN MBIT(11) +#define ADMA_DST_RPTR_MEM_COPY_EN MBIT(11) /* Source Read Pointer Memory Copy Enable */ -#define ADMA_SRC_RPTR_MEM_COPY_EN MBIT(10) +#define ADMA_SRC_RPTR_MEM_COPY_EN MBIT(10) /** Destination address is host */ -#define ADMA_DST_ADDR_IS_HOST MBIT(2) +#define ADMA_DST_ADDR_IS_HOST MBIT(2) /** Source address is host */ -#define ADMA_SRC_ADDR_IS_HOST MBIT(1) +#define ADMA_SRC_ADDR_IS_HOST MBIT(1) /** DMA cfg3 register */ -#define ADMA_DMA_CFG3 0x0040 +#define ADMA_DMA_CFG3 0x0040 /** source rd ptr address low */ -#define ADMA_SRC_RD_PTR_LOW 0x0044 +#define ADMA_SRC_RD_PTR_LOW 0x0044 /** source rd ptr address high */ -#define ADMA_SRC_RD_PTR_HIGH 0x0048 +#define ADMA_SRC_RD_PTR_HIGH 0x0048 /** destination rd ptr address low */ -#define ADMA_DST_RD_PTR_LOW 0x004C +#define ADMA_DST_RD_PTR_LOW 0x004C /** destination rd ptr address high */ -#define ADMA_DST_RD_PTR_HIGH 0x0050 +#define ADMA_DST_RD_PTR_HIGH 0x0050 /** source active interrupt mask */ -#define ADMA_SRC_ACTV_INT_MASK 0x0054 +#define ADMA_SRC_ACTV_INT_MASK 0x0054 /** destination active interrupt mask */ -#define ADMA_DST_ACTV_INT_MASK 0x0058 +#define ADMA_DST_ACTV_INT_MASK 0x0058 /** Read pointer start from bit 16 */ -#define ADMA_RPTR_START 16 +#define ADMA_RPTR_START 16 /** write pointer start from bit 0 */ -#define ADMA_WPTR_START 0 +#define ADMA_WPTR_START 0 /** Tx/Rx Read/Write pointer's mask */ -#define TXRX_RW_PTR_MASK (MLAN_MAX_TXRX_BD - 1) +#define TXRX_RW_PTR_MASK (MLAN_MAX_TXRX_BD - 1) /** Tx/Rx Read/Write pointer's rollover indicate bit */ -#define TXRX_RW_PTR_ROLLOVER_IND MLAN_MAX_TXRX_BD +#define TXRX_RW_PTR_ROLLOVER_IND MLAN_MAX_TXRX_BD /** Start of packet flag */ -#define ADMA_BD_FLAG_SOP MBIT(0) +#define ADMA_BD_FLAG_SOP MBIT(0) /** End of packet flag */ -#define ADMA_BD_FLAG_EOP MBIT(1) +#define ADMA_BD_FLAG_EOP MBIT(1) /** interrupt enable flag */ -#define ADMA_BD_FLAG_INT_EN MBIT(2) +#define ADMA_BD_FLAG_INT_EN MBIT(2) /** Source address is host side flag */ -#define ADMA_BD_FLAG_SRC_HOST MBIT(3) +#define ADMA_BD_FLAG_SRC_HOST MBIT(3) /** Destination address is host side flag */ -#define ADMA_BD_FLAG_DST_HOST MBIT(4) +#define ADMA_BD_FLAG_DST_HOST MBIT(4) /** ADMA MIN PKT SIZE */ -#define ADMA_MIN_PKT_SIZE 128 +#define ADMA_MIN_PKT_SIZE 128 /** ADMA dual descriptor mode requir 8 bytes alignment in buf size */ -#define ADMA_ALIGN_SIZE 8 +#define ADMA_ALIGN_SIZE 8 /** ADMA RW_PTR wrap mask */ -#define ADMA_RW_PTR_WRAP_MASK 0x00001FFF +#define ADMA_RW_PTR_WRAP_MASK 0x00001FFF /** ADMA MSIX DOORBEEL DATA */ -#define ADMA_MSIX_DOORBELL_DATA 0x0064 +#define ADMA_MSIX_DOORBELL_DATA 0x0064 /** MSIX VECTOR MASK: BIT 0-10 */ -#define ADMA_MSIX_VECTOR_MASK 0x3f +#define ADMA_MSIX_VECTOR_MASK 0x3f /** PF mask: BIT 24-28 */ -#define ADMA_MSIX_PF_MASK 0x1f000000 +#define ADMA_MSIX_PF_MASK 0x1f000000 /** PF start bit */ -#define ADMA_MSIX_PF_BIT 24 +#define ADMA_MSIX_PF_BIT 24 #if defined(PCIE9098) || defined(PCIE9097) /** PCIE9098 dev_id/vendor id reg */ -#define PCIE9098_DEV_ID_REG 0x0000 +#define PCIE9098_DEV_ID_REG 0x0000 /** PCIE revision ID register */ -#define PCIE9098_REV_ID_REG 0x0008 +#define PCIE9098_REV_ID_REG 0x0008 /** PCIE IP revision register */ -#define PCIE9098_IP_REV_REG 0x1000 +#define PCIE9098_IP_REV_REG 0x1000 /** PCIE CPU interrupt events */ -#define PCIE9098_CPU_INT_EVENT 0x1C20 +#define PCIE9098_CPU_INT_EVENT 0x1C20 /** PCIE CPU interrupt status */ -#define PCIE9098_CPU_INT_STATUS 0x1C24 +#define PCIE9098_CPU_INT_STATUS 0x1C24 /** PCIe CPU Interrupt Status Mask */ -#define PCIE9098_CPU_INT2ARM_ISM 0x1C28 +#define PCIE9098_CPU_INT2ARM_ISM 0x1C28 /** PCIE host interrupt status */ -#define PCIE9098_HOST_INT_STATUS 0x1C44 +#define PCIE9098_HOST_INT_STATUS 0x1C44 /** PCIE host interrupt mask */ -#define PCIE9098_HOST_INT_MASK 0x1C48 +#define PCIE9098_HOST_INT_MASK 0x1C48 /** PCIE host interrupt clear select*/ -#define PCIE9098_HOST_INT_CLR_SEL 0x1C4C +#define PCIE9098_HOST_INT_CLR_SEL 0x1C4C /** PCIE host interrupt status mask */ -#define PCIE9098_HOST_INT_STATUS_MASK 0x1C50 +#define PCIE9098_HOST_INT_STATUS_MASK 0x1C50 /** PCIE host interrupt status */ -#define PCIE9097_B0_HOST_INT_STATUS 0x3C44 +#define PCIE9097_B0_HOST_INT_STATUS 0x3C44 /** PCIE host interrupt mask */ -#define PCIE9097_B0_HOST_INT_MASK 0x3C48 +#define PCIE9097_B0_HOST_INT_MASK 0x3C48 /** PCIE host interrupt clear select*/ -#define PCIE9097_B0_HOST_INT_CLR_SEL 0x3C4C +#define PCIE9097_B0_HOST_INT_CLR_SEL 0x3C4C /** PCIE host interrupt status mask */ -#define PCIE9097_B0_HOST_INT_STATUS_MASK 0x3C50 +#define PCIE9097_B0_HOST_INT_STATUS_MASK 0x3C50 /** PCIE host interrupt select*/ -#define PCIE9098_HOST_INT_SEL 0x1C58 +#define PCIE9098_HOST_INT_SEL 0x1C58 /** PCIE data exchange register 0 */ -#define PCIE9098_SCRATCH_0_REG 0x1C60 +#define PCIE9098_SCRATCH_0_REG 0x1C60 /** PCIE data exchange register 1 */ -#define PCIE9098_SCRATCH_1_REG 0x1C64 +#define PCIE9098_SCRATCH_1_REG 0x1C64 /** PCIE data exchange register 2 */ -#define PCIE9098_SCRATCH_2_REG 0x1C68 +#define PCIE9098_SCRATCH_2_REG 0x1C68 /** PCIE data exchange register 3 */ -#define PCIE9098_SCRATCH_3_REG 0x1C6C +#define PCIE9098_SCRATCH_3_REG 0x1C6C /** PCIE data exchange register 4 */ -#define PCIE9098_SCRATCH_4_REG 0x1C70 +#define PCIE9098_SCRATCH_4_REG 0x1C70 /** PCIE data exchange register 5 */ -#define PCIE9098_SCRATCH_5_REG 0x1C74 +#define PCIE9098_SCRATCH_5_REG 0x1C74 /** PCIE data exchange register 6 */ -#define PCIE9098_SCRATCH_6_REG 0x1C78 +#define PCIE9098_SCRATCH_6_REG 0x1C78 /** PCIE data exchange register 7 */ -#define PCIE9098_SCRATCH_7_REG 0x1C7C +#define PCIE9098_SCRATCH_7_REG 0x1C7C /** PCIE data exchange register 8 */ -#define PCIE9098_SCRATCH_8_REG 0x1C80 +#define PCIE9098_SCRATCH_8_REG 0x1C80 /** PCIE data exchange register 9 */ -#define PCIE9098_SCRATCH_9_REG 0x1C84 +#define PCIE9098_SCRATCH_9_REG 0x1C84 /** PCIE data exchange register 10 */ -#define PCIE9098_SCRATCH_10_REG 0x1C88 +#define PCIE9098_SCRATCH_10_REG 0x1C88 /** PCIE data exchange register 11 */ -#define PCIE9098_SCRATCH_11_REG 0x1C8C +#define PCIE9098_SCRATCH_11_REG 0x1C8C /** PCIE data exchange register 12 */ -#define PCIE9098_SCRATCH_12_REG 0x1C90 +#define PCIE9098_SCRATCH_12_REG 0x1C90 /** PCIE data exchange register 13 */ -#define PCIE9098_SCRATCH_13_REG 0x1C94 +#define PCIE9098_SCRATCH_13_REG 0x1C94 /** PCIE data exchange register 14 */ -#define PCIE9098_SCRATCH_14_REG 0x1C98 +#define PCIE9098_SCRATCH_14_REG 0x1C98 /** PCIE data exchange register 15 */ -#define PCIE9098_SCRATCH_15_REG 0x1C9C +#define PCIE9098_SCRATCH_15_REG 0x1C9C /** ADMA CHAN0_Q0 start address, Tx Data */ -#define ADMA_CHAN0_Q0 0x10000 +#define ADMA_CHAN0_Q0 0x10000 /** ADMA CHAN1_Q0 start address, Rx Data */ -#define ADMA_CHAN1_Q0 0x10800 +#define ADMA_CHAN1_Q0 0x10800 /** ADMA CHAN1_Q1 start address, Rx Event */ -#define ADMA_CHAN1_Q1 0x10880 +#define ADMA_CHAN1_Q1 0x10880 /** ADMA CHAN2_Q0 start address, Tx Command */ -#define ADMA_CHAN2_Q0 0x11000 +#define ADMA_CHAN2_Q0 0x11000 /** ADMA CHAN2_Q1 start address, Command Resp */ -#define ADMA_CHAN2_Q1 0x11080 +#define ADMA_CHAN2_Q1 0x11080 /** CH0-Q0' src rd/wr ptr */ -#define ADMA_SRC_PTR_CH0_Q0 (ADMA_CHAN0_Q0+ADMA_SRC_RW_PTR) +#define ADMA_SRC_PTR_CH0_Q0 (ADMA_CHAN0_Q0 + ADMA_SRC_RW_PTR) /** CH1-Q1' dest rd/wr ptr */ -#define ADMA_DST_PTR_CH1_Q0 (ADMA_CHAN1_Q0+ADMA_DST_RW_PTR) +#define ADMA_DST_PTR_CH1_Q0 (ADMA_CHAN1_Q0 + ADMA_DST_RW_PTR) /** CH1-Q1' dest rd/wr ptr */ -#define ADMA_DST_PTR_CH1_Q1 (ADMA_CHAN1_Q1+ADMA_DST_RW_PTR) +#define ADMA_DST_PTR_CH1_Q1 (ADMA_CHAN1_Q1 + ADMA_DST_RW_PTR) /* TX buffer description read pointer */ -#define PCIE9098_TXBD_RDPTR ADMA_SRC_PTR_CH0_Q0 +#define PCIE9098_TXBD_RDPTR ADMA_SRC_PTR_CH0_Q0 /* TX buffer description write pointer */ -#define PCIE9098_TXBD_WRPTR ADMA_SRC_PTR_CH0_Q0 +#define PCIE9098_TXBD_WRPTR ADMA_SRC_PTR_CH0_Q0 /* RX buffer description read pointer */ -#define PCIE9098_RXBD_RDPTR ADMA_DST_PTR_CH1_Q0 +#define PCIE9098_RXBD_RDPTR ADMA_DST_PTR_CH1_Q0 /* RX buffer description write pointer */ -#define PCIE9098_RXBD_WRPTR ADMA_DST_PTR_CH1_Q0 +#define PCIE9098_RXBD_WRPTR ADMA_DST_PTR_CH1_Q0 /* Event buffer description read pointer */ -#define PCIE9098_EVTBD_RDPTR ADMA_DST_PTR_CH1_Q1 +#define PCIE9098_EVTBD_RDPTR ADMA_DST_PTR_CH1_Q1 /* Event buffer description write pointer */ -#define PCIE9098_EVTBD_WRPTR ADMA_DST_PTR_CH1_Q1 +#define PCIE9098_EVTBD_WRPTR ADMA_DST_PTR_CH1_Q1 /* Driver ready signature write pointer */ -#define PCIE9098_DRV_READY PCIE9098_SCRATCH_12_REG +#define PCIE9098_DRV_READY PCIE9098_SCRATCH_12_REG /** interrupt bit define for ADMA CHAN0 Q0, For Tx DATA */ -#define ADMA_INT_CHAN0_Q0 MBIT(0) +#define ADMA_INT_CHAN0_Q0 MBIT(0) /** interrupt bit define for ADMA CHAN1 Q0, For Rx Data */ -#define AMDA_INT_CHAN1_Q0 MBIT(16) +#define AMDA_INT_CHAN1_Q0 MBIT(16) /** interrupt bit define for ADMA CHAN1 Q1, For Rx Event */ -#define AMDA_INT_CHAN1_Q1 MBIT(17) +#define AMDA_INT_CHAN1_Q1 MBIT(17) /** interrupt bit define for ADMA CHAN2 Q0, For Tx Command */ -#define AMDA_INT_CHAN2_Q0 MBIT(24) +#define AMDA_INT_CHAN2_Q0 MBIT(24) /** interrupt bit define for ADMA CHAN2 Q1, For Rx Command Resp */ -#define AMDA_INT_CHAN2_Q1 MBIT(25) +#define AMDA_INT_CHAN2_Q1 MBIT(25) /** interrupt vector number for ADMA CHAN0 Q0, For Tx DATA */ -#define ADMA_VECTOR_CHAN0_Q0 0 +#define ADMA_VECTOR_CHAN0_Q0 0 /** interrupt vector number for ADMA CHAN1 Q0, For Rx Data */ -#define AMDA_VECTOR_CHAN1_Q0 16 +#define AMDA_VECTOR_CHAN1_Q0 16 /** interrupt vector number for ADMA CHAN1 Q1, For Rx Event */ -#define AMDA_VECTOR_CHAN1_Q1 17 +#define AMDA_VECTOR_CHAN1_Q1 17 /** interrupt vector number for ADMA CHAN2 Q0, For Tx Command */ -#define AMDA_VECTOR_CHAN2_Q0 24 +#define AMDA_VECTOR_CHAN2_Q0 24 /** interrupt vector number for ADMA CHAN2 Q1, For Rx Command Resp */ -#define AMDA_VECTOR_CHAN2_Q1 25 +#define AMDA_VECTOR_CHAN2_Q1 25 /** Data sent interrupt for host */ -#define PCIE9098_HOST_INTR_DNLD_DONE ADMA_INT_CHAN0_Q0 +#define PCIE9098_HOST_INTR_DNLD_DONE ADMA_INT_CHAN0_Q0 /** Data receive interrupt for host */ -#define PCIE9098_HOST_INTR_UPLD_RDY AMDA_INT_CHAN1_Q0 +#define PCIE9098_HOST_INTR_UPLD_RDY AMDA_INT_CHAN1_Q0 /** Command sent interrupt for host */ -#define PCIE9098_HOST_INTR_CMD_DONE AMDA_INT_CHAN2_Q1 +#define PCIE9098_HOST_INTR_CMD_DONE AMDA_INT_CHAN2_Q1 /** Event ready interrupt for host */ -#define PCIE9098_HOST_INTR_EVENT_RDY AMDA_INT_CHAN1_Q1 +#define PCIE9098_HOST_INTR_EVENT_RDY AMDA_INT_CHAN1_Q1 /** CMD sent interrupt for host */ -#define PCIE9098_HOST_INTR_CMD_DNLD MBIT(7) +#define PCIE9098_HOST_INTR_CMD_DNLD MBIT(7) /** Interrupt mask for host */ -#define PCIE9098_HOST_INTR_MASK (PCIE9098_HOST_INTR_DNLD_DONE | \ - PCIE9098_HOST_INTR_UPLD_RDY | \ - PCIE9098_HOST_INTR_CMD_DONE | \ - PCIE9098_HOST_INTR_CMD_DNLD | \ - PCIE9098_HOST_INTR_EVENT_RDY) +#define PCIE9098_HOST_INTR_MASK \ + (PCIE9098_HOST_INTR_DNLD_DONE | PCIE9098_HOST_INTR_UPLD_RDY | \ + PCIE9098_HOST_INTR_CMD_DONE | PCIE9098_HOST_INTR_CMD_DNLD | \ + PCIE9098_HOST_INTR_EVENT_RDY) /** Interrupt select mask for host */ -#define PCIE9098_HOST_INTR_SEL_MASK (PCIE9098_HOST_INTR_DNLD_DONE | \ - PCIE9098_HOST_INTR_UPLD_RDY | \ - PCIE9098_HOST_INTR_CMD_DONE | \ - PCIE9098_HOST_INTR_EVENT_RDY) +#define PCIE9098_HOST_INTR_SEL_MASK \ + (PCIE9098_HOST_INTR_DNLD_DONE | PCIE9098_HOST_INTR_UPLD_RDY | \ + PCIE9098_HOST_INTR_CMD_DONE | PCIE9098_HOST_INTR_EVENT_RDY) #endif #if defined(PCIE8997) || defined(PCIE8897) /* PCIE INTERNAL REGISTERS */ /** PCIE data exchange register 0 */ -#define PCIE_SCRATCH_0_REG 0x0C10 +#define PCIE_SCRATCH_0_REG 0x0C10 /** PCIE data exchange register 1 */ -#define PCIE_SCRATCH_1_REG 0x0C14 +#define PCIE_SCRATCH_1_REG 0x0C14 /** PCIE CPU interrupt events */ -#define PCIE_CPU_INT_EVENT 0x0C18 +#define PCIE_CPU_INT_EVENT 0x0C18 /** PCIE CPU interrupt status */ -#define PCIE_CPU_INT_STATUS 0x0C1C +#define PCIE_CPU_INT_STATUS 0x0C1C /** PCIe CPU Interrupt Status Mask */ -#define PCIE_CPU_INT2ARM_ISM 0x0C28 +#define PCIE_CPU_INT2ARM_ISM 0x0C28 /** PCIE host interrupt status */ -#define PCIE_HOST_INT_STATUS 0x0C30 +#define PCIE_HOST_INT_STATUS 0x0C30 /** PCIE host interrupt mask */ -#define PCIE_HOST_INT_MASK 0x0C34 +#define PCIE_HOST_INT_MASK 0x0C34 /** PCIE host interrupt status mask */ -#define PCIE_HOST_INT_STATUS_MASK 0x0C3C +#define PCIE_HOST_INT_STATUS_MASK 0x0C3C /** PCIE data exchange register 2 */ -#define PCIE_SCRATCH_2_REG 0x0C40 +#define PCIE_SCRATCH_2_REG 0x0C40 /** PCIE data exchange register 3 */ -#define PCIE_SCRATCH_3_REG 0x0C44 +#define PCIE_SCRATCH_3_REG 0x0C44 -#define PCIE_IP_REV_REG 0x0C48 +#define PCIE_IP_REV_REG 0x0C48 /** PCIE data exchange register 4 */ -#define PCIE_SCRATCH_4_REG 0x0CD0 +#define PCIE_SCRATCH_4_REG 0x0CD0 /** PCIE data exchange register 5 */ -#define PCIE_SCRATCH_5_REG 0x0CD4 +#define PCIE_SCRATCH_5_REG 0x0CD4 /** PCIE data exchange register 6 */ -#define PCIE_SCRATCH_6_REG 0x0CD8 +#define PCIE_SCRATCH_6_REG 0x0CD8 /** PCIE data exchange register 7 */ -#define PCIE_SCRATCH_7_REG 0x0CDC +#define PCIE_SCRATCH_7_REG 0x0CDC /** PCIE data exchange register 8 */ -#define PCIE_SCRATCH_8_REG 0x0CE0 +#define PCIE_SCRATCH_8_REG 0x0CE0 /** PCIE data exchange register 9 */ -#define PCIE_SCRATCH_9_REG 0x0CE4 +#define PCIE_SCRATCH_9_REG 0x0CE4 /** PCIE data exchange register 10 */ -#define PCIE_SCRATCH_10_REG 0x0CE8 +#define PCIE_SCRATCH_10_REG 0x0CE8 /** PCIE data exchange register 11 */ -#define PCIE_SCRATCH_11_REG 0x0CEC +#define PCIE_SCRATCH_11_REG 0x0CEC /** PCIE data exchange register 12 */ -#define PCIE_SCRATCH_12_REG 0x0CF0 +#define PCIE_SCRATCH_12_REG 0x0CF0 #endif #ifdef PCIE8997 /* PCIE read data pointer for queue 0 and 1 */ -#define PCIE8997_RD_DATA_PTR_Q0_Q1 0xC1A4 /* 0x8000C1A4 */ +#define PCIE8997_RD_DATA_PTR_Q0_Q1 0xC1A4 /* 0x8000C1A4 */ /* PCIE read data pointer for queue 2 and 3 */ -#define PCIE8997_RD_DATA_PTR_Q2_Q3 0xC1A8 /* 0x8000C1A8 */ +#define PCIE8997_RD_DATA_PTR_Q2_Q3 0xC1A8 /* 0x8000C1A8 */ /* PCIE write data pointer for queue 0 and 1 */ -#define PCIE8997_WR_DATA_PTR_Q0_Q1 0xC174 /* 0x8000C174 */ +#define PCIE8997_WR_DATA_PTR_Q0_Q1 0xC174 /* 0x8000C174 */ /* PCIE write data pointer for queue 2 and 3 */ -#define PCIE8997_WR_DATA_PTR_Q2_Q3 0xC178 /* 0x8000C178 */ +#define PCIE8997_WR_DATA_PTR_Q2_Q3 0xC178 /* 0x8000C178 */ #endif #ifdef PCIE8897 /* PCIE read data pointer for queue 0 and 1 */ -#define PCIE8897_RD_DATA_PTR_Q0_Q1 0xC08C /* 0x8000C08C */ +#define PCIE8897_RD_DATA_PTR_Q0_Q1 0xC08C /* 0x8000C08C */ /* PCIE read data pointer for queue 2 and 3 */ -#define PCIE8897_RD_DATA_PTR_Q2_Q3 0xC090 /* 0x8000C090 */ +#define PCIE8897_RD_DATA_PTR_Q2_Q3 0xC090 /* 0x8000C090 */ /* PCIE write data pointer for queue 0 and 1 */ -#define PCIE8897_WR_DATA_PTR_Q0_Q1 0xC05C /* 0x8000C05C */ +#define PCIE8897_WR_DATA_PTR_Q0_Q1 0xC05C /* 0x8000C05C */ /* PCIE write data pointer for queue 2 and 3 */ -#define PCIE8897_WR_DATA_PTR_Q2_Q3 0xC060 /* 0x8000C060 */ +#define PCIE8897_WR_DATA_PTR_Q2_Q3 0xC060 /* 0x8000C060 */ #endif /** Download ready interrupt for CPU */ -#define CPU_INTR_DNLD_RDY MBIT(0) +#define CPU_INTR_DNLD_RDY MBIT(0) /** Command ready interrupt for CPU */ -#define CPU_INTR_DOOR_BELL MBIT(1) +#define CPU_INTR_DOOR_BELL MBIT(1) /** Confirmation that sleep confirm message has been processed. Device will enter sleep after receiving this interrupt */ -#define CPU_INTR_SLEEP_CFM_DONE MBIT(2) +#define CPU_INTR_SLEEP_CFM_DONE MBIT(2) /** Reset interrupt for CPU */ -#define CPU_INTR_RESET MBIT(3) +#define CPU_INTR_RESET MBIT(3) /** Set Event Done interupt to the FW*/ -#define CPU_INTR_EVENT_DONE MBIT(5) +#define CPU_INTR_EVENT_DONE MBIT(5) #if defined(PCIE8997) || defined(PCIE8897) /** Data sent interrupt for host */ -#define HOST_INTR_DNLD_DONE MBIT(0) +#define HOST_INTR_DNLD_DONE MBIT(0) /** Data receive interrupt for host */ -#define HOST_INTR_UPLD_RDY MBIT(1) +#define HOST_INTR_UPLD_RDY MBIT(1) /** Command sent interrupt for host */ -#define HOST_INTR_CMD_DONE MBIT(2) +#define HOST_INTR_CMD_DONE MBIT(2) /** Event ready interrupt for host */ -#define HOST_INTR_EVENT_RDY MBIT(3) +#define HOST_INTR_EVENT_RDY MBIT(3) /** Interrupt mask for host */ -#define HOST_INTR_MASK (HOST_INTR_DNLD_DONE | \ - HOST_INTR_UPLD_RDY | \ - HOST_INTR_CMD_DONE | \ - HOST_INTR_EVENT_RDY) +#define HOST_INTR_MASK \ + (HOST_INTR_DNLD_DONE | HOST_INTR_UPLD_RDY | HOST_INTR_CMD_DONE | \ + HOST_INTR_EVENT_RDY) /** Lower 32bits command address holding register */ -#define REG_CMD_ADDR_LO PCIE_SCRATCH_0_REG +#define REG_CMD_ADDR_LO PCIE_SCRATCH_0_REG /** Upper 32bits command address holding register */ -#define REG_CMD_ADDR_HI PCIE_SCRATCH_1_REG +#define REG_CMD_ADDR_HI PCIE_SCRATCH_1_REG /** Command length holding register */ -#define REG_CMD_SIZE PCIE_SCRATCH_2_REG +#define REG_CMD_SIZE PCIE_SCRATCH_2_REG /** Lower 32bits command response address holding register */ -#define REG_CMDRSP_ADDR_LO PCIE_SCRATCH_4_REG +#define REG_CMDRSP_ADDR_LO PCIE_SCRATCH_4_REG /** Upper 32bits command response address holding register */ -#define REG_CMDRSP_ADDR_HI PCIE_SCRATCH_5_REG +#define REG_CMDRSP_ADDR_HI PCIE_SCRATCH_5_REG /** TxBD's Read/Write pointer start from bit 16 */ -#define TXBD_RW_PTR_START 16 +#define TXBD_RW_PTR_START 16 /** RxBD's Read/Write pointer start from bit 0 */ -#define RXBD_RW_PTR_STRAT 0 +#define RXBD_RW_PTR_STRAT 0 -#define MLAN_BD_FLAG_SOP MBIT(0) -#define MLAN_BD_FLAG_EOP MBIT(1) -#define MLAN_BD_FLAG_XS_SOP MBIT(2) -#define MLAN_BD_FLAG_XS_EOP MBIT(3) +#define MLAN_BD_FLAG_SOP MBIT(0) +#define MLAN_BD_FLAG_EOP MBIT(1) +#define MLAN_BD_FLAG_XS_SOP MBIT(2) +#define MLAN_BD_FLAG_XS_EOP MBIT(3) /* Event buffer description write pointer */ -#define REG_EVTBD_WRPTR PCIE_SCRATCH_10_REG +#define REG_EVTBD_WRPTR PCIE_SCRATCH_10_REG /* Event buffer description read pointer */ -#define REG_EVTBD_RDPTR PCIE_SCRATCH_11_REG +#define REG_EVTBD_RDPTR PCIE_SCRATCH_11_REG /* Driver ready signature write pointer */ -#define REG_DRV_READY PCIE_SCRATCH_12_REG +#define REG_DRV_READY PCIE_SCRATCH_12_REG /** Event Read/Write pointer mask */ -#define EVT_RW_PTR_MASK 0x0f +#define EVT_RW_PTR_MASK 0x0f /** Event Read/Write pointer rollover bit */ -#define EVT_RW_PTR_ROLLOVER_IND MBIT(7) +#define EVT_RW_PTR_ROLLOVER_IND MBIT(7) #endif /* Define PCIE block size for firmware download */ -#define MLAN_PCIE_BLOCK_SIZE_FW_DNLD 256 +#define MLAN_PCIE_BLOCK_SIZE_FW_DNLD 256 /** Extra added macros **/ -#define MLAN_EVENT_HEADER_LEN 8 +#define MLAN_EVENT_HEADER_LEN 8 /** Max interrupt status register read limit */ -#define MAX_READ_REG_RETRY 10000 +#define MAX_READ_REG_RETRY 10000 #ifdef PCIE8897 static const struct _mlan_pcie_card_reg mlan_reg_pcie8897 = { diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_scan.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_scan.c index 129f03adfef1..5d3daf00ca20 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_scan.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_scan.c @@ -46,9 +46,9 @@ Change log: /** minimum scan time for passive to active scan */ #define MIN_PASSIVE_TO_ACTIVE_SCAN_TIME 150 -#define MRVDRV_MAX_CHANNELS_PER_SCAN 40 +#define MRVDRV_MAX_CHANNELS_PER_SCAN 40 /** The maximum number of channels the firmware can scan per command */ -#define MRVDRV_MAX_CHANNELS_PER_SPECIFIC_SCAN 4 +#define MRVDRV_MAX_CHANNELS_PER_SPECIFIC_SCAN 4 /** * Number of channels to scan per firmware scan command issuance. @@ -56,41 +56,39 @@ Change log: * Number restricted to prevent hitting the limit on the amount of scan data * returned in a single firmware scan command. */ -#define MRVDRV_CHANNELS_PER_SCAN_CMD 4 +#define MRVDRV_CHANNELS_PER_SCAN_CMD 4 /** Memory needed to store a max sized Channel List TLV for a firmware scan */ -#define CHAN_TLV_MAX_SIZE (sizeof(MrvlIEtypesHeader_t) \ - + (MRVDRV_MAX_CHANNELS_PER_SPECIFIC_SCAN \ - * sizeof(ChanScanParamSet_t))) +#define CHAN_TLV_MAX_SIZE \ + (sizeof(MrvlIEtypesHeader_t) + \ + (MRVDRV_MAX_CHANNELS_PER_SPECIFIC_SCAN * sizeof(ChanScanParamSet_t))) /** Memory needed to store supported rate */ -#define RATE_TLV_MAX_SIZE (sizeof(MrvlIEtypes_RatesParamSet_t) + HOSTCMD_SUPPORTED_RATES) +#define RATE_TLV_MAX_SIZE \ + (sizeof(MrvlIEtypes_RatesParamSet_t) + HOSTCMD_SUPPORTED_RATES) /** Memory needed to store a max number/size WildCard * SSID TLV for a firmware scan */ -#define WILDCARD_SSID_TLV_MAX_SIZE \ - (MRVDRV_MAX_SSID_LIST_LENGTH * \ - (sizeof(MrvlIEtypes_WildCardSsIdParamSet_t) + \ - MRVDRV_MAX_SSID_LENGTH)) +#define WILDCARD_SSID_TLV_MAX_SIZE \ + (MRVDRV_MAX_SSID_LIST_LENGTH * \ + (sizeof(MrvlIEtypes_WildCardSsIdParamSet_t) + \ + MRVDRV_MAX_SSID_LENGTH)) /** Memory needed to store a max number/size BSSID TLV for a firmware scan */ -#define BSSID_LIST_TLV_MAX_SIZE (sizeof(MrvlIEtypesHeader_t) \ - + (MRVDRV_MAX_BSSID_LIST \ - * MLAN_MAC_ADDR_LENGTH)) +#define BSSID_LIST_TLV_MAX_SIZE \ + (sizeof(MrvlIEtypesHeader_t) + \ + (MRVDRV_MAX_BSSID_LIST * MLAN_MAC_ADDR_LENGTH)) /** WPS TLV MAX size is MAX IE size plus 2 bytes for * t_u16 MRVL TLV extension */ -#define WPS_TLV_MAX_SIZE (sizeof(IEEEtypes_VendorSpecific_t) + 2) +#define WPS_TLV_MAX_SIZE (sizeof(IEEEtypes_VendorSpecific_t) + 2) /** Maximum memory needed for a wlan_scan_cmd_config * with all TLVs at max */ -#define MAX_SCAN_CFG_ALLOC (sizeof(wlan_scan_cmd_config) \ - + sizeof(MrvlIEtypes_NumProbes_t) \ - + sizeof(MrvlIETypes_HTCap_t) \ - + CHAN_TLV_MAX_SIZE \ - + RATE_TLV_MAX_SIZE \ - + WILDCARD_SSID_TLV_MAX_SIZE \ - + BSSID_LIST_TLV_MAX_SIZE \ - + WPS_TLV_MAX_SIZE) +#define MAX_SCAN_CFG_ALLOC \ + (sizeof(wlan_scan_cmd_config) + sizeof(MrvlIEtypes_NumProbes_t) + \ + sizeof(MrvlIETypes_HTCap_t) + CHAN_TLV_MAX_SIZE + RATE_TLV_MAX_SIZE + \ + WILDCARD_SSID_TLV_MAX_SIZE + BSSID_LIST_TLV_MAX_SIZE + \ + WPS_TLV_MAX_SIZE) /******************************************************** Local Variables @@ -101,9 +99,9 @@ Change log: * driver routines */ typedef union { - /** Scan configuration (variable length) */ + /** Scan configuration (variable length) */ wlan_scan_cmd_config config; - /** Max allocated block */ + /** Max allocated block */ t_u8 config_alloc_buf[MAX_SCAN_CFG_ALLOC]; } wlan_scan_cmd_config_tlv; @@ -127,20 +125,20 @@ enum cipher_suite { }; 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, 0x08}, /* GCMP */ - {0x00, 0x0f, 0xac, 0x09}, /* GCMP-256 */ - {0x00, 0x0f, 0xac, 0x0a}, /* CCMP-256 */ + {0x00, 0x0f, 0xac, 0x01}, /* WEP40 */ + {0x00, 0x0f, 0xac, 0x02}, /* TKIP */ + {0x00, 0x0f, 0xac, 0x04}, /* AES */ + {0x00, 0x0f, 0xac, 0x05}, /* WEP104 */ + {0x00, 0x0f, 0xac, 0x08}, /* GCMP */ + {0x00, 0x0f, 0xac, 0x09}, /* GCMP-256 */ + {0x00, 0x0f, 0xac, 0x0a}, /* CCMP-256 */ }; /** @@ -152,8 +150,7 @@ static t_u8 rsn_oui[CIPHER_SUITE_MAX][4] = { * @return Band type conversion of scanBand used in join/assoc cmds * */ -t_u8 -radio_type_to_band(t_u8 radio_type) +t_u8 radio_type_to_band(t_u8 radio_type) { t_u8 ret_band; @@ -178,18 +175,16 @@ radio_type_to_band(t_u8 radio_type) * * @return NA */ -void -wlan_update_chan_statistics(mlan_private *pmpriv, - MrvlIEtypes_ChannelStats_t *pchanstats_tlv) +void wlan_update_chan_statistics(mlan_private *pmpriv, + MrvlIEtypes_ChannelStats_t *pchanstats_tlv) { mlan_adapter *pmadapter = pmpriv->adapter; t_u8 i; chan_statistics_t *pchan_stats = - (chan_statistics_t *) ((t_u8 *)pchanstats_tlv + - sizeof(MrvlIEtypesHeader_t)); - t_u8 num_chan = - wlan_le16_to_cpu(pchanstats_tlv->header.len) / - sizeof(chan_statistics_t); + (chan_statistics_t *)((t_u8 *)pchanstats_tlv + + sizeof(MrvlIEtypesHeader_t)); + t_u8 num_chan = wlan_le16_to_cpu(pchanstats_tlv->header.len) / + sizeof(chan_statistics_t); ENTER(); @@ -214,9 +209,9 @@ wlan_update_chan_statistics(mlan_private *pmpriv, pchan_stats->cca_scan_duration, pchan_stats->cca_busy_duration); memcpy_ext(pmadapter, - (chan_statistics_t *) & pmadapter-> - pchan_stats[pmadapter->idx_chan_stats], pchan_stats, - sizeof(chan_statistics_t), + (chan_statistics_t *)&pmadapter + ->pchan_stats[pmadapter->idx_chan_stats], + pchan_stats, sizeof(chan_statistics_t), sizeof(chan_statistics_t)); pmadapter->idx_chan_stats++; pchan_stats++; @@ -234,8 +229,8 @@ wlan_update_chan_statistics(mlan_private *pmpriv, * @param pbss_desc A pointer to current BSS descriptor * @return 0 on failure to find OUI, 1 on success. */ -static t_u8 -search_oui_in_ie(mlan_adapter *pmadapter, IEBody *ie_body, t_u8 *oui) +static t_u8 search_oui_in_ie(mlan_adapter *pmadapter, IEBody *ie_body, + t_u8 *oui) { t_u8 count; @@ -248,9 +243,8 @@ search_oui_in_ie(mlan_adapter *pmadapter, IEBody *ie_body, t_u8 *oui) * 3) If one of them is AES then pass success. */ while (count) { - if (!memcmp - (pmadapter, ie_body->PtkBody, oui, - sizeof(ie_body->PtkBody))) { + if (!memcmp(pmadapter, ie_body->PtkBody, oui, + sizeof(ie_body->PtkBody))) { LEAVE(); return MLAN_OUI_PRESENT; } @@ -277,20 +271,19 @@ search_oui_in_ie(mlan_adapter *pmadapter, IEBody *ie_body, t_u8 *oui) * @param pbss_desc A pointer to current BSS descriptor * @return 0 on failure to find AES OUI, 1 on success. */ -static t_u8 -is_rsn_oui_present(mlan_adapter *pmadapter, BSSDescriptor_t *pbss_desc, - t_u32 cipher_suite) +static t_u8 is_rsn_oui_present(mlan_adapter *pmadapter, + BSSDescriptor_t *pbss_desc, 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); + if (pbss_desc->prsn_ie && + (pbss_desc->prsn_ie->ieee_hdr.element_id == RSN_IE) && + (pbss_desc->prsn_ie->ieee_hdr.len > RSN_GTK_OUI_OFFSET)) { + ie_body = (IEBody *)(((t_u8 *)pbss_desc->prsn_ie->data) + + RSN_GTK_OUI_OFFSET); oui = &rsn_oui[cipher_suite][0]; ret = search_oui_in_ie(pmadapter, ie_body, oui); if (ret) { @@ -302,6 +295,42 @@ is_rsn_oui_present(mlan_adapter *pmadapter, BSSDescriptor_t *pbss_desc, return ret; } +/** + * @brief This function will pass the correct ie and oui to search_oui_in_ie + * + * Check the wpa_ie for appropriate IE and then check if RSN IE has AES + * OUI in it. If RSN IE does not have AES in PTK then return 0; + * + * @param pmadapter A pointer to mlan adapter. + * @return 0 on failure to find AES OUI, 1 on success. + */ +static t_u8 is_rsn_oui_present_in_wpa_ie(mlan_private *pmpriv, + t_u32 cipher_suite) +{ + mlan_adapter *pmadapter = pmpriv->adapter; + t_u8 *oui = MNULL; + IEBody *ie_body = MNULL; + IEEEtypes_Generic_t *prsn_ie = MNULL; + t_u8 ret = MLAN_OUI_NOT_PRESENT; + + ENTER(); + prsn_ie = (IEEEtypes_Generic_t *)pmpriv->wpa_ie; + + if (prsn_ie && (prsn_ie->ieee_hdr.element_id == RSN_IE) && + (prsn_ie->ieee_hdr.len > RSN_GTK_OUI_OFFSET)) { + ie_body = (IEBody *)(prsn_ie->data + RSN_GTK_OUI_OFFSET); + oui = &rsn_oui[cipher_suite][0]; + ret = search_oui_in_ie(pmadapter, ie_body, oui); + if (ret) { + LEAVE(); + return ret; + } + } + + LEAVE(); + return ret; +} + /** * @brief This function will pass the correct ie and oui to search_oui_in_ie * @@ -311,9 +340,8 @@ is_rsn_oui_present(mlan_adapter *pmadapter, BSSDescriptor_t *pbss_desc, * @param pbss_desc A pointer to current BSS descriptor * @return 0 on failure to find AES OUI, 1 on success. */ -static t_u8 -is_wpa_oui_present(mlan_adapter *pmadapter, BSSDescriptor_t *pbss_desc, - t_u32 cipher_suite) +static t_u8 is_wpa_oui_present(mlan_adapter *pmadapter, + BSSDescriptor_t *pbss_desc, t_u32 cipher_suite) { t_u8 *oui = MNULL; IEBody *ie_body = MNULL; @@ -344,8 +372,7 @@ is_wpa_oui_present(mlan_adapter *pmadapter, BSSDescriptor_t *pbss_desc, * @return matched: non-zero. unmatched: 0 * */ -static t_u8 -wlan_is_band_compatible(t_u8 cfg_band, t_u8 scan_band) +static t_u8 wlan_is_band_compatible(t_u8 cfg_band, t_u8 scan_band) { t_u8 band; switch (scan_band) { @@ -368,8 +395,7 @@ wlan_is_band_compatible(t_u8 cfg_band, t_u8 scan_band) * @param pmpriv A pointer to mlan_private structure * @return index in BSSID list */ -static t_s32 -wlan_find_best_network_in_list(IN mlan_private *pmpriv) +static t_s32 wlan_find_best_network_in_list(IN mlan_private *pmpriv) { mlan_adapter *pmadapter = pmpriv->adapter; t_u32 mode = pmpriv->bss_mode; @@ -388,9 +414,8 @@ wlan_find_best_network_in_list(IN mlan_private *pmpriv) 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_rssi = SCAN_RSSI( + pmadapter->pscan_table[i].rssi); best_net = i; } } @@ -399,9 +424,8 @@ wlan_find_best_network_in_list(IN mlan_private *pmpriv) default: if (SCAN_RSSI(pmadapter->pscan_table[i].rssi) > best_rssi) { - best_rssi = - SCAN_RSSI(pmadapter->pscan_table[i]. - rssi); + best_rssi = SCAN_RSSI( + pmadapter->pscan_table[i].rssi); best_net = i; } break; @@ -422,19 +446,16 @@ wlan_find_best_network_in_list(IN mlan_private *pmpriv) * @param pmpriv A pointer to mlan_private structure * @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 - * increase the number of channels sent in a scan - * command and to disable the firmware channel scan + * @param filtered_scan 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 disable the firmware channel scan * filter. * * @return N/A */ -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) +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) { mlan_adapter *pmadapter = pmpriv->adapter; region_chan_t *pscan_region; @@ -449,9 +470,8 @@ wlan_scan_create_channel_list(IN mlan_private *pmpriv, ENTER(); - for (region_idx = 0; - region_idx < NELEMENTS(pmadapter->region_channel); region_idx++) { - + 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 */ @@ -467,9 +487,8 @@ wlan_scan_create_channel_list(IN mlan_private *pmpriv, 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; + 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; @@ -484,12 +503,12 @@ wlan_scan_create_channel_list(IN mlan_private *pmpriv, band = pmpriv->config_bands; if (!wlan_is_band_compatible(band, pscan_region->band)) continue; - for (next_chan = 0; - next_chan < pscan_region->num_cfp; + 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) + /* 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; @@ -504,16 +523,16 @@ wlan_scan_create_channel_list(IN mlan_private *pmpriv, pscan_chan_list[chan_idx].bandcfg.chanBand = BAND_5GHZ; /* Passive scan on DFS channels */ - if (wlan_11h_radar_detect_required - (pmpriv, (t_u8)cfp->channel) - && scan_type != MLAN_SCAN_TYPE_PASSIVE) + if (wlan_11h_radar_detect_required( + pmpriv, (t_u8)cfp->channel) && + scan_type != MLAN_SCAN_TYPE_PASSIVE) scan_type = MLAN_SCAN_TYPE_PASSIVE_TO_ACTIVE; break; case BAND_B: case BAND_G: - if (wlan_bg_scan_type_is_passive - (pmpriv, (t_u8)cfp->channel)) { + if (wlan_bg_scan_type_is_passive( + pmpriv, (t_u8)cfp->channel)) { scan_type = MLAN_SCAN_TYPE_PASSIVE; } pscan_chan_list[chan_idx].bandcfg.chanBand = @@ -527,12 +546,11 @@ wlan_scan_create_channel_list(IN mlan_private *pmpriv, if (puser_scan_in && puser_scan_in->chan_list[0].scan_time) { - scan_dur = - (t_u16)puser_scan_in->chan_list[0]. - scan_time; + scan_dur = (t_u16)puser_scan_in->chan_list[0] + .scan_time; } else if (scan_type == MLAN_SCAN_TYPE_PASSIVE || scan_type == - MLAN_SCAN_TYPE_PASSIVE_TO_ACTIVE) { + MLAN_SCAN_TYPE_PASSIVE_TO_ACTIVE) { scan_dur = pmadapter->passive_scan_time; } else if (filtered_scan) { scan_dur = pmadapter->specific_scan_time; @@ -541,25 +559,26 @@ wlan_scan_create_channel_list(IN mlan_private *pmpriv, } if (scan_type == MLAN_SCAN_TYPE_PASSIVE_TO_ACTIVE && pmadapter->passive_to_active_scan == - MLAN_PASS_TO_ACT_SCAN_EN) { - scan_dur = - MAX(scan_dur, - MIN_PASSIVE_TO_ACTIVE_SCAN_TIME); - pscan_chan_list[chan_idx].chan_scan_mode. - passive_to_active_scan = MTRUE; + MLAN_PASS_TO_ACT_SCAN_EN) { + scan_dur = MAX(scan_dur, + MIN_PASSIVE_TO_ACTIVE_SCAN_TIME); + pscan_chan_list[chan_idx] + .chan_scan_mode.passive_to_active_scan = + MTRUE; } pscan_chan_list[chan_idx].max_scan_time = wlan_cpu_to_le16(scan_dur); if (scan_type == MLAN_SCAN_TYPE_PASSIVE || scan_type == MLAN_SCAN_TYPE_PASSIVE_TO_ACTIVE) { - pscan_chan_list[chan_idx].chan_scan_mode. - passive_scan = MTRUE; - pscan_chan_list[chan_idx].chan_scan_mode. - hidden_ssid_report = MTRUE; + pscan_chan_list[chan_idx] + .chan_scan_mode.passive_scan = MTRUE; + pscan_chan_list[chan_idx] + .chan_scan_mode.hidden_ssid_report = + MTRUE; } else { - pscan_chan_list[chan_idx].chan_scan_mode. - passive_scan = MFALSE; + pscan_chan_list[chan_idx] + .chan_scan_mode.passive_scan = MFALSE; } pscan_chan_list[chan_idx].chan_number = @@ -567,10 +586,10 @@ wlan_scan_create_channel_list(IN mlan_private *pmpriv, PRINTM(MINFO, "chan=%d, mode=%d, passive_to_active=%d\n", pscan_chan_list[chan_idx].chan_number, - pscan_chan_list[chan_idx].chan_scan_mode. - passive_scan, - pscan_chan_list[chan_idx].chan_scan_mode. - passive_to_active_scan); + pscan_chan_list[chan_idx] + .chan_scan_mode.passive_scan, + pscan_chan_list[chan_idx] + .chan_scan_mode.passive_to_active_scan); } } @@ -585,8 +604,8 @@ wlan_scan_create_channel_list(IN mlan_private *pmpriv, * * @return N/A */ -static void -wlan_add_wps_probe_request_ie(IN mlan_private *pmpriv, OUT t_u8 **pptlv_out) +static void wlan_add_wps_probe_request_ie(IN mlan_private *pmpriv, + OUT t_u8 **pptlv_out) { MrvlIEtypesHeader_t *tlv; @@ -601,8 +620,8 @@ wlan_add_wps_probe_request_ie(IN mlan_private *pmpriv, OUT t_u8 **pptlv_out) pmpriv->wps.wps_ie.vend_hdr.oui, pmpriv->wps.wps_ie.vend_hdr.len, pmpriv->wps.wps_ie.vend_hdr.len); - *pptlv_out += (pmpriv->wps.wps_ie.vend_hdr.len - + sizeof(MrvlIEtypesHeader_t)); + *pptlv_out += (pmpriv->wps.wps_ie.vend_hdr.len + + sizeof(MrvlIEtypesHeader_t)); } LEAVE(); } @@ -626,15 +645,14 @@ wlan_add_wps_probe_request_ie(IN mlan_private *pmpriv, OUT t_u8 **pptlv_out) * @param pchan_tlv_out Pointer in the pscan_cfg_out where the channel TLV * should start. This is past any other TLVs that * must be sent down in each firmware command. - * @param pscan_chan_list List of channels to scan in max_chan_per_scan segments + * @param pscan_chan_list List of channels to scan in max_chan_per_scan + * segments * * @return MLAN_STATUS_SUCCESS or error return otherwise */ 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, +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) @@ -658,8 +676,8 @@ wlan_scan_channel_list(IN mlan_private *pmpriv, 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); + 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(); @@ -678,7 +696,8 @@ wlan_scan_channel_list(IN mlan_private *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 */ + /* Set the temp channel struct pointer to the start of the desired list + */ ptmp_chan_list = pscan_chan_list; /* @@ -687,7 +706,6 @@ wlan_scan_channel_list(IN mlan_private *pmpriv, * individually if configured accordingly) */ while (ptmp_chan_list->chan_number) { - tlv_idx = 0; total_scan_time = 0; pchan_tlv_out->header.len = 0; @@ -705,19 +723,16 @@ wlan_scan_channel_list(IN mlan_private *pmpriv, */ 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->bandcfg. - chanBand), - ptmp_chan_list-> - chan_number) || - wlan_is_chan_disabled(pmpriv, - radio_type_to_band - (ptmp_chan_list->bandcfg. - chanBand), - ptmp_chan_list-> - chan_number)) { + if (wlan_is_chan_blacklisted( + pmpriv, + radio_type_to_band( + ptmp_chan_list->bandcfg.chanBand), + ptmp_chan_list->chan_number) || + wlan_is_chan_disabled( + pmpriv, + radio_type_to_band( + ptmp_chan_list->bandcfg.chanBand), + ptmp_chan_list->chan_number)) { ptmp_chan_list++; continue; } @@ -741,7 +756,7 @@ wlan_scan_channel_list(IN mlan_private *pmpriv, /* Restore the TLV buffer */ pchan_tlv_out = (MrvlIEtypes_ChanListParamSet_t *) - pchan_tlv_out_temp; + pchan_tlv_out_temp; pchan_tlv_out->header.type = wlan_cpu_to_le16(TLV_TYPE_CHANLIST); pchan_tlv_out->header.len = 0; @@ -756,25 +771,24 @@ wlan_scan_channel_list(IN mlan_private *pmpriv, } } - /* 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 */ + /* 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) - && (pmadapter->ext_scan_type != EXT_SCAN_ENHANCE) - ) { - + pmadapter->region_code == COUNTRY_CODE_JP_FF) && + (ptmp_chan_list->chan_number == 14) && + (pmadapter->ext_scan_type != EXT_SCAN_ENHANCE)) { 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); + 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"); @@ -785,52 +799,50 @@ wlan_scan_channel_list(IN mlan_private *pmpriv, 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); + tlv_buf_len = (t_u32)(pchan_tlv_out_temp - + pscan_cfg_out->tlv_buf); memcpy_ext(pmadapter, ptlv_temp, ptlv_pos, tlv_buf_len, MAX_SCAN_CFG_ALLOC - - CHAN_TLV_MAX_SIZE); + CHAN_TLV_MAX_SIZE); /* Search for Rates TLV */ while ((!foundJPch14) && (ptlv_pos < pchan_tlv_out_temp)) { - header = (MrvlIEtypesHeader_t *) - ptlv_pos; + 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)); + (sizeof(MrvlIEtypesHeader_t) + + wlan_le16_to_cpu( + header->len)); } if (foundJPch14) { - /* Update the TLV buffer with *new* Rates TLV and rearrange remaining TLV buffer */ + /* Update the TLV buffer with *new* + * Rates TLV and rearrange remaining TLV + * buffer*/ prates_tlv = (MrvlIEtypes_RatesParamSet_t *) - ptlv_pos; + ptlv_pos; old_ratetlv_len = sizeof(MrvlIEtypesHeader_t) + - wlan_le16_to_cpu(prates_tlv-> - header.len); + wlan_le16_to_cpu( + prates_tlv->header.len); - prates_tlv->header.len = - wlan_copy_rates(prates_tlv-> - rates, 0, - SupportedRates_B, - sizeof - (SupportedRates_B)); + 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); + wlan_cpu_to_le16( + prates_tlv->header.len); memmove(pmadapter, ptlv_pos + new_ratetlv_len, @@ -840,25 +852,26 @@ wlan_scan_channel_list(IN mlan_private *pmpriv, old_ratetlv_len))); pchan_tlv_out = (MrvlIEtypes_ChanListParamSet_t - *) - (pchan_tlv_out_temp - - (old_ratetlv_len - - new_ratetlv_len)); + *)(pchan_tlv_out_temp - + (old_ratetlv_len - + new_ratetlv_len)); pchan_tlv_out->header.type = - wlan_cpu_to_le16 - (TLV_TYPE_CHANLIST); + wlan_cpu_to_le16( + TLV_TYPE_CHANLIST); pchan_tlv_out->header.len = 0; } } - /* Copy the current channel TLV to the command being prepared */ + /* Copy the current channel TLV to the command being + * prepared */ memcpy_ext(pmadapter, pchan_tlv_out->chan_scan_param + tlv_idx, ptmp_chan_list, sizeof(pchan_tlv_out->chan_scan_param), sizeof(pchan_tlv_out->chan_scan_param)); - /* Increment the TLV header length by the size appended */ + /* Increment the TLV header length by the size appended + */ pchan_tlv_out->header.len += sizeof(pchan_tlv_out->chan_scan_param); @@ -869,16 +882,17 @@ wlan_scan_channel_list(IN mlan_private *pmpriv, * 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); + 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 */ + /* 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); + (sizeof(pchan_tlv_out->header) + + pchan_tlv_out->header.len); - /* Increment the index to the channel tlv we are constructing */ + /* Increment the index to the channel tlv we are + * constructing */ tlv_idx++; /* Count the total scan time per command */ @@ -888,8 +902,9 @@ wlan_scan_channel_list(IN mlan_private *pmpriv, 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. + * 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 || @@ -903,18 +918,19 @@ wlan_scan_channel_list(IN mlan_private *pmpriv, * 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)) { + 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 */ + /* 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 + * 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 || @@ -928,8 +944,8 @@ wlan_scan_channel_list(IN mlan_private *pmpriv, * 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)) { + pmadapter->region_code == COUNTRY_CODE_JP_FF) && + (ptmp_chan_list->chan_number == 14)) { done_early = MTRUE; } if (pmadapter->ext_scan && pmadapter->ext_scan_enh && @@ -937,7 +953,8 @@ wlan_scan_channel_list(IN mlan_private *pmpriv, done_early = MFALSE; } - /* The total scan time should be less than scan command timeout value */ + /* 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", @@ -954,15 +971,14 @@ wlan_scan_channel_list(IN mlan_private *pmpriv, pmadapter->pscan_channels = pstart_chan; - /* Send the scan command to the firmware with the specified cfg */ + /* 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, MNULL, pscan_cfg_out); + ret = wlan_prepare_cmd(pmpriv, cmd_no, HostCmd_ACT_GEN_SET, 0, + MNULL, pscan_cfg_out); if (ret) break; } @@ -1017,16 +1033,12 @@ wlan_scan_channel_list(IN mlan_private *pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_scan_setup_scan_config(IN mlan_private *pmpriv, - IN 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) +static mlan_status wlan_scan_setup_scan_config( + IN mlan_private *pmpriv, IN 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; @@ -1035,7 +1047,7 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, MrvlIEtypes_RatesParamSet_t *prates_tlv; MrvlIEtypes_Bssid_List_t *pbssid_tlv; - const t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0, 0, 0, 0, 0, 0 }; + 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; @@ -1062,13 +1074,14 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, /* 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. + * 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 + * so later routines know where channels can be added to the command + * buf */ ptlv_pos = pscan_cfg_out->tlv_buf; @@ -1079,23 +1092,25 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, /* 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. + * 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); + 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 */ + /* 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); + (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 @@ -1111,28 +1126,27 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, pbssid_tlv = (MrvlIEtypes_Bssid_List_t *)ptlv_pos; pbssid_tlv->header.type = TLV_TYPE_BSSID; - pbssid_tlv->header.len = - wlan_cpu_to_le16(MLAN_MAC_ADDR_LENGTH * - puser_scan_in-> - bssid_num); + pbssid_tlv->header.len = wlan_cpu_to_le16( + MLAN_MAC_ADDR_LENGTH * + puser_scan_in->bssid_num); memcpy_ext(pmadapter, pbssid_tlv->bssid, puser_scan_in->bssid_list, MLAN_MAC_ADDR_LENGTH * - puser_scan_in->bssid_num, + puser_scan_in->bssid_num, MLAN_MAC_ADDR_LENGTH * - puser_scan_in->bssid_num); - ptlv_pos += - sizeof(MrvlIEtypesHeader_t) + - MLAN_MAC_ADDR_LENGTH * - puser_scan_in->bssid_num; - DBG_HEXDUMP(MCMD_D, "scan bssid filter", - pbssid_tlv, - sizeof(MrvlIEtypesHeader_t) + + puser_scan_in->bssid_num); + ptlv_pos += sizeof(MrvlIEtypesHeader_t) + MLAN_MAC_ADDR_LENGTH * - puser_scan_in->bssid_num); - } else if (memcmp - (pmadapter, pscan_cfg_out->specific_bssid, - &zero_mac, sizeof(zero_mac))) { + puser_scan_in->bssid_num; + DBG_HEXDUMP( + MCMD_D, "scan bssid filter", pbssid_tlv, + sizeof(MrvlIEtypesHeader_t) + + MLAN_MAC_ADDR_LENGTH * + puser_scan_in + ->bssid_num); + } else if (memcmp(pmadapter, + pscan_cfg_out->specific_bssid, + &zero_mac, sizeof(zero_mac))) { pbssid_tlv = (MrvlIEtypes_Bssid_List_t *)ptlv_pos; pbssid_tlv->header.type = TLV_TYPE_BSSID; @@ -1147,24 +1161,20 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, } 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 < 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); - ssid_len = - wlan_strlen((char *)puser_scan_in-> - ssid_list[ssid_idx].ssid); - - pwildcard_ssid_tlv - = + 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->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; @@ -1172,16 +1182,13 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, puser_scan_in->ssid_list[ssid_idx].ssid, ssid_len, MLAN_MAX_SSID_LENGTH); - ptlv_pos += (sizeof(pwildcard_ssid_tlv->header) - + pwildcard_ssid_tlv->header.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); + 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, + PRINTM(MINFO, "Scan: ssid_list[%d]: %s, %d\n", ssid_idx, pwildcard_ssid_tlv->ssid, pwildcard_ssid_tlv->max_ssid_length); @@ -1231,12 +1238,10 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, pscan_gap_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_SCAN_CHANNEL_GAP); pscan_gap_tlv->header.len = sizeof(pscan_gap_tlv->gap); - pscan_gap_tlv->gap = - wlan_cpu_to_le16((t_u16)puser_scan_in-> - scan_chan_gap); - ptlv_pos += - sizeof(pscan_gap_tlv->header) + - pscan_gap_tlv->header.len; + pscan_gap_tlv->gap = wlan_cpu_to_le16( + (t_u16)puser_scan_in->scan_chan_gap); + ptlv_pos += sizeof(pscan_gap_tlv->header) + + pscan_gap_tlv->header.len; pscan_gap_tlv->header.len = wlan_cpu_to_le16(pscan_gap_tlv->header.len); } @@ -1250,12 +1255,11 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, pscan_gap_tlv->header.len = sizeof(pscan_gap_tlv->gap); pscan_gap_tlv->gap = wlan_cpu_to_le16((t_u16)pmadapter->scan_chan_gap); - ptlv_pos += - sizeof(pscan_gap_tlv->header) + - pscan_gap_tlv->header.len; + ptlv_pos += sizeof(pscan_gap_tlv->header) + + pscan_gap_tlv->header.len; } if (pmadapter->ext_scan) { - pbss_mode = (MrvlIEtypes_BssMode_t *) ptlv_pos; + pbss_mode = (MrvlIEtypes_BssMode_t *)ptlv_pos; pbss_mode->header.type = wlan_cpu_to_le16(TLV_TYPE_BSS_MODE); pbss_mode->header.len = sizeof(pbss_mode->bss_mode); pbss_mode->bss_mode = pscan_cfg_out->bss_mode; @@ -1279,9 +1283,9 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, MRVDRV_MAX_CHANNELS_PER_SCAN; } } - /* If the input config or adapter has the number of Probes set, add tlv */ + /* 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; @@ -1292,9 +1296,8 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, 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; + 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); @@ -1303,11 +1306,12 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, /* 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); + 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); @@ -1317,9 +1321,9 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, 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)) { + 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); @@ -1332,8 +1336,8 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, 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)) { + 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); @@ -1346,9 +1350,9 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, pvht_cap->header.len = wlan_cpu_to_le16(pvht_cap->header.len); } - if (IS_FW_SUPPORT_11AX(pmadapter) - && (pmpriv->config_bands & BAND_AAX)) { - phe_cap = (MrvlIEtypes_Extension_t *) ptlv_pos; + if (IS_FW_SUPPORT_11AX(pmadapter) && + (pmpriv->config_bands & BAND_AAX)) { + phe_cap = (MrvlIEtypes_Extension_t *)ptlv_pos; len = wlan_fill_he_cap_tlv(pmpriv, BAND_A, phe_cap, MFALSE); HEXDUMP("SCAN: HE_CAPABILITIES IE", (t_u8 *)phe_cap, len); ptlv_pos += len; @@ -1369,14 +1373,15 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, pmpriv->usr_dot_11n_dev_cap_bg; if (usr_dot_11n_dev_cap & MBIT(17)) { bandwidth = BW_40MHZ; - if (ISSUPP_11ACENABLED(pmadapter->fw_cap_info) - && (pmpriv->config_bands & BAND_AAC)) + if (ISSUPP_11ACENABLED( + pmadapter->fw_cap_info) && + (pmpriv->config_bands & BAND_AAC)) bandwidth = BW_80MHZ; } - wlan_get_curr_oper_class(pmpriv, - pmpriv->curr_bss_params. - bss_descriptor.channel, - bandwidth, &oper_class); + wlan_get_curr_oper_class( + pmpriv, + pmpriv->curr_bss_params.bss_descriptor.channel, + bandwidth, &oper_class); } wlan_add_supported_oper_class_ie(pmpriv, &ptlv_pos, oper_class); } @@ -1384,7 +1389,7 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, if (puser_scan_in && puser_scan_in->proberesp_only) { MrvlIEtypes_OnlyProberesp_t *proberesp_only = - (MrvlIEtypes_OnlyProberesp_t *) ptlv_pos; + (MrvlIEtypes_OnlyProberesp_t *)ptlv_pos; memset(pmadapter, proberesp_only, 0, sizeof(MrvlIEtypes_OnlyProberesp_t)); proberesp_only->header.type = @@ -1394,9 +1399,8 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, ptlv_pos += sizeof(MrvlIEtypes_OnlyProberesp_t); } - if (puser_scan_in && - memcmp(pmadapter, puser_scan_in->random_mac, zero_mac, - MLAN_MAC_ADDR_LENGTH)) { + if (puser_scan_in && memcmp(pmadapter, puser_scan_in->random_mac, + zero_mac, MLAN_MAC_ADDR_LENGTH)) { MrvlIEtypes_MacAddr_t *randomMacParam = (MrvlIEtypes_MacAddr_t *)ptlv_pos; memset(pmadapter, randomMacParam, 0, @@ -1419,20 +1423,19 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, *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 < WLAN_USER_SCAN_CHAN_MAX && + puser_scan_in->chan_list[chan_idx].chan_number; chan_idx++) { - radio_type = puser_scan_in->chan_list[chan_idx].radio_type; - /*Ignore 5G/2G channels if radio_type do not match band */ - if (!wlan_is_band_compatible - (pmpriv->config_bands, - radio_type_to_band(radio_type))) + /*Ignore 5G/2G channels if radio_type do not match + * band*/ + if (!wlan_is_band_compatible( + pmpriv->config_bands, + radio_type_to_band(radio_type))) continue; (pscan_chan_list + chan_list_idx)->bandcfg.chanBand = radio_type; @@ -1458,7 +1461,6 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, ret = MLAN_STATUS_FAILURE; LEAVE(); return ret; - } } @@ -1466,12 +1468,13 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, /* do not send probe requests on this channel */ scan_type = MLAN_SCAN_TYPE_PASSIVE; } - /* Prevent active scanning on a radar controlled channel */ + /* Prevent active scanning on a radar controlled channel + */ if (radio_type == BAND_5GHZ && scan_type != MLAN_SCAN_TYPE_PASSIVE) { if (pmadapter->active_scan_triggered == MFALSE) - if (wlan_11h_radar_detect_required - (pmpriv, channel)) { + if (wlan_11h_radar_detect_required( + pmpriv, channel)) { scan_type = MLAN_SCAN_TYPE_PASSIVE_TO_ACTIVE; } @@ -1479,34 +1482,32 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, if (radio_type == BAND_2GHZ && scan_type != MLAN_SCAN_TYPE_PASSIVE) { if (pmadapter->active_scan_triggered == MFALSE) - if (wlan_bg_scan_type_is_passive - (pmpriv, channel)) { + if (wlan_bg_scan_type_is_passive( + pmpriv, channel)) { scan_type = MLAN_SCAN_TYPE_PASSIVE; } } if (scan_type == MLAN_SCAN_TYPE_PASSIVE || scan_type == MLAN_SCAN_TYPE_PASSIVE_TO_ACTIVE) { - (pscan_chan_list + - chan_list_idx)->chan_scan_mode.passive_scan = - MTRUE; - (pscan_chan_list + - chan_list_idx)->chan_scan_mode. - hidden_ssid_report = MTRUE; + (pscan_chan_list + chan_list_idx) + ->chan_scan_mode.passive_scan = MTRUE; + (pscan_chan_list + chan_list_idx) + ->chan_scan_mode.hidden_ssid_report = + MTRUE; } else { - (pscan_chan_list + - chan_list_idx)->chan_scan_mode.passive_scan = - MFALSE; + (pscan_chan_list + chan_list_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; + scan_dur = (t_u16)puser_scan_in + ->chan_list[chan_idx] + .scan_time; } else { if (scan_type == MLAN_SCAN_TYPE_PASSIVE || scan_type == - MLAN_SCAN_TYPE_PASSIVE_TO_ACTIVE) { + MLAN_SCAN_TYPE_PASSIVE_TO_ACTIVE) { scan_dur = pmadapter->passive_scan_time; } else if (*pfiltered_scan) { scan_dur = @@ -1522,22 +1523,20 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, scan_dur = pmadapter->coex_min_scan_time; if (scan_type == MLAN_SCAN_TYPE_PASSIVE_TO_ACTIVE && pmadapter->passive_to_active_scan == - MLAN_PASS_TO_ACT_SCAN_EN) { - (pscan_chan_list + - chan_list_idx)->chan_scan_mode. - passive_to_active_scan = MTRUE; - scan_dur = - MAX(MIN_PASSIVE_TO_ACTIVE_SCAN_TIME, - scan_dur); + MLAN_PASS_TO_ACT_SCAN_EN) { + (pscan_chan_list + chan_list_idx) + ->chan_scan_mode.passive_to_active_scan = + MTRUE; + scan_dur = MAX(MIN_PASSIVE_TO_ACTIVE_SCAN_TIME, + scan_dur); } PRINTM(MINFO, "chan=%d, mode=%d, passive_to_active=%d\n", (pscan_chan_list + chan_list_idx)->chan_number, - (pscan_chan_list + - chan_list_idx)->chan_scan_mode.passive_scan, - (pscan_chan_list + - chan_list_idx)->chan_scan_mode. - passive_to_active_scan); + (pscan_chan_list + chan_list_idx) + ->chan_scan_mode.passive_scan, + (pscan_chan_list + chan_list_idx) + ->chan_scan_mode.passive_to_active_scan); (pscan_chan_list + chan_list_idx)->min_scan_time = wlan_cpu_to_le16(scan_dur); @@ -1547,9 +1546,9 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, } /* 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)) { + 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"); } @@ -1575,16 +1574,16 @@ wlan_scan_setup_scan_config(IN mlan_private *pmpriv, * @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 pptlv Output parameter: Pointer to the request TLV if found + * @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) +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) { MrvlIEtypes_Data_t *pcurrent_tlv; t_u32 tlv_buf_left; @@ -1600,7 +1599,6 @@ wlan_ret_802_11_scan_get_tlv_ptrs(IN pmlan_adapter pmadapter, 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); @@ -1640,7 +1638,8 @@ wlan_ret_802_11_scan_get_tlv_ptrs(IN pmlan_adapter pmadapter, } if (*pptlv) { - /* HEXDUMP("SCAN_RESP: TLV Buf", (t_u8 *)*pptlv+4, tlv_len); */ + /* HEXDUMP("SCAN_RESP: TLV Buf", (t_u8 *)*pptlv+4, + * tlv_len); */ break; } @@ -1648,7 +1647,7 @@ wlan_ret_802_11_scan_get_tlv_ptrs(IN pmlan_adapter pmadapter, pcurrent_tlv = (MrvlIEtypes_Data_t *)(pcurrent_tlv->data + tlv_len); - } /* while */ + } /* while */ LEAVE(); } @@ -1668,11 +1667,9 @@ wlan_ret_802_11_scan_get_tlv_ptrs(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) +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) { mlan_status ret = MLAN_STATUS_SUCCESS; IEEEtypes_ElementId_e element_id; @@ -1694,9 +1691,9 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, 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 }; - const t_u8 osen_oui[] = { 0x50, 0x6f, 0x9a, 0x12 }; + const t_u8 wpa_oui[4] = {0x00, 0x50, 0xf2, 0x01}; + const t_u8 wmm_oui[4] = {0x00, 0x50, 0xf2, 0x02}; + const t_u8 osen_oui[] = {0x50, 0x6f, 0x9a, 0x12}; IEEEtypes_CountryInfoSet_t *pcountry_info; IEEEtypes_Extension_t *pext_tlv; @@ -1717,7 +1714,6 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, } if (!beacon_size || beacon_size > *bytes_left) { - *pbeacon_info += *bytes_left; *bytes_left = 0; @@ -1725,7 +1721,8 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, return MLAN_STATUS_FAILURE; } - /* Initialize the current working beacon pointer for this BSS iteration */ + /* Initialize the current working beacon pointer for this BSS iteration + */ pcurrent_ptr = *pbeacon_info; /* Advance the return beacon pointer past the current beacon */ @@ -1818,7 +1815,7 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, if (pcap_info->spectrum_mgmt == 1) { PRINTM(MINFO, "InterpretIE: 11h- Spectrum Management " - "capability bit found\n"); + "capability bit found\n"); pbss_entry->wlan_11h_bss_info.sensed_11h = 1; } @@ -1830,14 +1827,13 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, if (bytes_left_for_current_beacon < total_ie_len) { PRINTM(MERROR, "InterpretIE: Error in processing IE, " - "bytes left < IE length\n"); + "bytes left < IE length\n"); bytes_left_for_current_beacon = 0; ret = MLAN_STATUS_FAILURE; continue; } switch (element_id) { - case SSID: if (element_len > MRVDRV_MAX_SSID_LENGTH) { bytes_left_for_current_beacon = 0; @@ -1879,13 +1875,13 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, &pbss_entry->phy_param_set.fh_param_set, pfh_param_set, 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.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); + wlan_le16_to_cpu( + pbss_entry->phy_param_set.fh_param_set + .dwell_time); break; case DS_PARAM_SET: @@ -1898,10 +1894,9 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, &pbss_entry->phy_param_set.ds_param_set, pds_param_set, 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))); + 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: @@ -1910,10 +1905,9 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, &pbss_entry->ss_param_set.cf_param_set, pcf_param_set, 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))); + 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: @@ -1925,21 +1919,20 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, &pbss_entry->ss_param_set.ibss_param_set, pibss_param_set, 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))); + 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 */ + /* Handle Country Info IE */ case COUNTRY_INFO: pcountry_info = (IEEEtypes_CountryInfoSet_t *)pcurrent_ptr; if (pcountry_info->len < - sizeof(pcountry_info->country_code) || + sizeof(pcountry_info->country_code) || (unsigned)(pcountry_info->len + 2) > - sizeof(IEEEtypes_CountryInfoFullSet_t)) { + sizeof(IEEEtypes_CountryInfoFullSet_t)) { PRINTM(MERROR, "InterpretIE: 11D- Err " "country_info len =%d min=%d max=%d\n", @@ -1951,8 +1944,7 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, } memcpy_ext(pmadapter, &pbss_entry->country_info, - pcountry_info, - pcountry_info->len + 2, + pcountry_info, pcountry_info->len + 2, sizeof(pbss_entry->country_info)); HEXDUMP("InterpretIE: 11D- country_info:", (t_u8 *)pcountry_info, @@ -1972,10 +1964,9 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, case IBSS_DFS: case SUPPORTED_CHANNELS: case TPC_REQUEST: - wlan_11h_process_bss_elem(pmadapter, - &pbss_entry-> - wlan_11h_bss_info, - pcurrent_ptr); + wlan_11h_process_bss_elem( + pmadapter, &pbss_entry->wlan_11h_bss_info, + pcurrent_ptr); break; case EXTENDED_SUPPORTED_RATES: /* @@ -1987,9 +1978,8 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, if (found_data_rate_ie) { if ((element_len + rate_size) > WLAN_SUPPORTED_RATES) { - bytes_to_copy = - (WLAN_SUPPORTED_RATES - - rate_size); + bytes_to_copy = (WLAN_SUPPORTED_RATES - + rate_size); } else { bytes_to_copy = element_len; } @@ -2012,27 +2002,23 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, case VENDOR_SPECIFIC_221: pvendor_ie = (IEEEtypes_VendorSpecific_t *)pcurrent_ptr; - if (!memcmp - (pmadapter, pvendor_ie->vend_hdr.oui, wpa_oui, - sizeof(wpa_oui))) { + 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); + 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))) { + } 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)) { - + 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 @@ -2050,13 +2036,12 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, osen_oui, sizeof(osen_oui))) { pbss_entry->posen_ie = (IEEEtypes_Generic_t *)pcurrent_ptr; - pbss_entry->osen_offset = - (t_u16)(pcurrent_ptr - - pbss_entry->pbeacon_buf); + pbss_entry->osen_offset = (t_u16)( + pcurrent_ptr - pbss_entry->pbeacon_buf); HEXDUMP("InterpretIE: Resp OSEN_IE", (t_u8 *)pbss_entry->posen_ie, (*(pbss_entry->posen_ie)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + sizeof(IEEEtypes_Header_t)); } break; case RSN_IE: @@ -2067,7 +2052,7 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, HEXDUMP("InterpretIE: Resp RSN_IE", (t_u8 *)pbss_entry->prsn_ie, (*(pbss_entry->prsn_ie)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + sizeof(IEEEtypes_Header_t)); break; case WAPI_IE: pbss_entry->pwapi_ie = @@ -2077,7 +2062,7 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, HEXDUMP("InterpretIE: Resp WAPI_IE", (t_u8 *)pbss_entry->pwapi_ie, (*(pbss_entry->pwapi_ie)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + sizeof(IEEEtypes_Header_t)); break; case HT_CAPABILITY: pbss_entry->pht_cap = (IEEEtypes_HTCap_t *)pcurrent_ptr; @@ -2086,7 +2071,7 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, HEXDUMP("InterpretIE: Resp HTCAP_IE", (t_u8 *)pbss_entry->pht_cap, (*(pbss_entry->pht_cap)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + sizeof(IEEEtypes_Header_t)); break; case HT_OPERATION: pbss_entry->pht_info = @@ -2096,7 +2081,7 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, HEXDUMP("InterpretIE: Resp HTINFO_IE", (t_u8 *)pbss_entry->pht_info, (*(pbss_entry->pht_info)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + sizeof(IEEEtypes_Header_t)); break; case BSSCO_2040: pbss_entry->pbss_co_2040 = @@ -2106,7 +2091,7 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, HEXDUMP("InterpretIE: Resp 2040BSSCOEXISTANCE_IE", (t_u8 *)pbss_entry->pbss_co_2040, (*(pbss_entry->pbss_co_2040)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + sizeof(IEEEtypes_Header_t)); break; case EXT_CAPABILITY: pbss_entry->pext_cap = @@ -2116,7 +2101,7 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, HEXDUMP("InterpretIE: Resp EXTCAP_IE", (t_u8 *)pbss_entry->pext_cap, (*(pbss_entry->pext_cap)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + sizeof(IEEEtypes_Header_t)); break; case OVERLAPBSSSCANPARAM: pbss_entry->poverlap_bss_scan_param = @@ -2125,8 +2110,9 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, (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)); + (*(pbss_entry->poverlap_bss_scan_param)) + .ieee_hdr.len + + sizeof(IEEEtypes_Header_t)); break; case VHT_CAPABILITY: pbss_entry->pvht_cap = @@ -2136,7 +2122,7 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, HEXDUMP("InterpretIE: Resp VHTCAP_IE", (t_u8 *)pbss_entry->pvht_cap, (*(pbss_entry->pvht_cap)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + sizeof(IEEEtypes_Header_t)); break; case VHT_OPERATION: pbss_entry->pvht_oprat = @@ -2146,7 +2132,7 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, HEXDUMP("InterpretIE: Resp VHTOPER_IE", (t_u8 *)pbss_entry->pvht_oprat, (*(pbss_entry->pvht_oprat)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + sizeof(IEEEtypes_Header_t)); break; case EXT_BSS_LOAD: pbss_entry->pext_bssload = @@ -2156,7 +2142,7 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, HEXDUMP("InterpretIE: Resp EXTBSSLOAD_IE", (t_u8 *)pbss_entry->pext_bssload, (*(pbss_entry->pext_bssload)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + sizeof(IEEEtypes_Header_t)); break; case VHT_TX_POWER_ENV: pbss_entry->pvht_txpower = @@ -2166,7 +2152,7 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, HEXDUMP("InterpretIE: Resp TXPOW_IE", (t_u8 *)pbss_entry->pvht_txpower, (*(pbss_entry->pvht_txpower)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + sizeof(IEEEtypes_Header_t)); break; case EXT_POWER_CONSTR: pbss_entry->pext_pwer = @@ -2176,7 +2162,7 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, HEXDUMP("InterpretIE: Resp EXTPOW_IE", (t_u8 *)pbss_entry->pext_pwer, (*(pbss_entry->pext_pwer)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + sizeof(IEEEtypes_Header_t)); break; case QUIET_CHAN: pbss_entry->pquiet_chan = @@ -2186,7 +2172,7 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, HEXDUMP("InterpretIE: Resp QUIETCHAN_IE", (t_u8 *)pbss_entry->pquiet_chan, (*(pbss_entry->pquiet_chan)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + sizeof(IEEEtypes_Header_t)); break; case BW_CHANNEL_SWITCH: /* RANDYTODO */ @@ -2201,23 +2187,21 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, HEXDUMP("InterpretIE: Resp OPERMODENTF_IE", (t_u8 *)pbss_entry->poper_mode, (*(pbss_entry->poper_mode)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + sizeof(IEEEtypes_Header_t)); break; case EXTENSION: - pext_tlv = (IEEEtypes_Extension_t *) pcurrent_ptr; + pext_tlv = (IEEEtypes_Extension_t *)pcurrent_ptr; switch (pext_tlv->ext_id) { case HE_CAPABILITY: pbss_entry->phe_cap = - (IEEEtypes_HECap_t *) pcurrent_ptr; - pbss_entry->he_cap_offset = - (t_u16)(pcurrent_ptr - - pbss_entry->pbeacon_buf); + (IEEEtypes_HECap_t *)pcurrent_ptr; + pbss_entry->he_cap_offset = (t_u16)( + pcurrent_ptr - pbss_entry->pbeacon_buf); break; case HE_OPERATION: pbss_entry->phe_oprat = pext_tlv; - pbss_entry->he_oprat_offset = - (t_u16)(pcurrent_ptr - - pbss_entry->pbeacon_buf); + pbss_entry->he_oprat_offset = (t_u16)( + pcurrent_ptr - pbss_entry->pbeacon_buf); break; default: break; @@ -2232,7 +2216,7 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, HEXDUMP("InterpretIE: Resp Mobility Domain IE", (t_u8 *)pbss_entry->pmd_ie, (*(pbss_entry->pmd_ie)).ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + sizeof(IEEEtypes_Header_t)); break; default: break; @@ -2243,7 +2227,7 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, /* Need to account for IE ID and IE Len */ bytes_left_for_current_beacon -= (element_len + 2); - } /* while (bytes_left_for_current_beacon > 2) */ + } /* while (bytes_left_for_current_beacon > 2) */ LEAVE(); return ret; @@ -2257,109 +2241,121 @@ wlan_interpret_bss_desc_with_ie(IN pmlan_adapter pmadapter, * * @return N/A */ -static t_void -wlan_adjust_ie_in_bss_entry(IN mlan_private *pmpriv, - IN BSSDescriptor_t *pbss_entry) +static t_void wlan_adjust_ie_in_bss_entry(IN mlan_private *pmpriv, + 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); + 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); + 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); + pbss_entry->pwapi_ie = + (IEEEtypes_Generic_t *)(pbss_entry->pbeacon_buf + + pbss_entry->wapi_offset); } if (pbss_entry->posen_ie) { - pbss_entry->posen_ie = (IEEEtypes_Generic_t *) - (pbss_entry->pbeacon_buf + - pbss_entry->osen_offset); + pbss_entry->posen_ie = + (IEEEtypes_Generic_t *)(pbss_entry->pbeacon_buf + + pbss_entry->osen_offset); } if (pbss_entry->pmd_ie) { - pbss_entry->pmd_ie = (IEEEtypes_MobilityDomain_t *) - (pbss_entry->pbeacon_buf + - pbss_entry->md_offset); + pbss_entry->pmd_ie = + (IEEEtypes_MobilityDomain_t + *)(pbss_entry->pbeacon_buf + + pbss_entry->md_offset); } if (pbss_entry->pht_cap) { - pbss_entry->pht_cap = (IEEEtypes_HTCap_t *) - (pbss_entry->pbeacon_buf + - pbss_entry->ht_cap_offset); + 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); + 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); + 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); + 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); + (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); + 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); + 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); + 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); + 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); + 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); + 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); + pbss_entry->poper_mode = + (IEEEtypes_OperModeNtf_t + *)(pbss_entry->pbeacon_buf + + pbss_entry->oper_mode_offset); } if (pbss_entry->phe_cap) { - pbss_entry->phe_cap = (IEEEtypes_HECap_t *) - (pbss_entry->pbeacon_buf + - pbss_entry->he_cap_offset); + pbss_entry->phe_cap = + (IEEEtypes_HECap_t *)(pbss_entry->pbeacon_buf + + pbss_entry->he_cap_offset); } if (pbss_entry->phe_oprat) { - pbss_entry->phe_oprat = (IEEEtypes_Extension_t *) - (pbss_entry->pbeacon_buf + - pbss_entry->he_oprat_offset); + pbss_entry->phe_oprat = + (IEEEtypes_Extension_t + *)(pbss_entry->pbeacon_buf + + pbss_entry->he_oprat_offset); } } else { pbss_entry->pwpa_ie = MNULL; @@ -2413,11 +2409,10 @@ wlan_adjust_ie_in_bss_entry(IN mlan_private *pmpriv, * * @return N/A */ -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) +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) { mlan_adapter *pmadapter = pmpriv->adapter; t_u8 *pbcn_store; @@ -2433,7 +2428,6 @@ wlan_ret_802_11_scan_store_beacon(IN mlan_private *pmpriv, 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; @@ -2441,7 +2435,8 @@ wlan_ret_802_11_scan_store_beacon(IN mlan_private *pmpriv, 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 */ + /* 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) { @@ -2520,24 +2515,26 @@ wlan_ret_802_11_scan_store_beacon(IN mlan_private *pmpriv, */ pnew_beacon->beacon_buf_size_max = old_bcn_size; - /* Adjust beacon buffer pointers that are past the current */ + /* 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 -= + 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]); + 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)) { + } 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 @@ -2549,8 +2546,7 @@ wlan_ret_802_11_scan_store_beacon(IN mlan_private *pmpriv, beacon_idx, old_bcn_size, new_bcn_size, bcn_space, (pmadapter->bcn_buf_size - - (pmadapter->pbcn_buf_end - - pmadapter->bcn_buf))); + (pmadapter->pbcn_buf_end - pmadapter->bcn_buf))); /* * memmove (since the memory overlaps) the data @@ -2565,8 +2561,7 @@ wlan_ret_802_11_scan_store_beacon(IN mlan_private *pmpriv, (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))); + ((t_ptr)pbcn_store + (t_ptr)bcn_space))); /* Copy the new beacon buffer entry over the old one */ memcpy_ext(pmadapter, pbcn_store, @@ -2586,17 +2581,17 @@ wlan_ret_802_11_scan_store_beacon(IN mlan_private *pmpriv, */ pnew_beacon->beacon_buf_size_max = new_bcn_size; - /* Adjust beacon buffer pointers that are past the current */ + /* 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 += + 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]); + wlan_adjust_ie_in_bss_entry( + pmpriv, + &pmadapter->pscan_table[adj_idx]); } } } else { @@ -2611,140 +2606,133 @@ wlan_ret_802_11_scan_store_beacon(IN mlan_private *pmpriv, beacon_idx, old_bcn_size, new_bcn_size, bcn_space, (pmadapter->bcn_buf_size - - (pmadapter->pbcn_buf_end - - pmadapter->bcn_buf))); + (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; + pmadapter->pscan_table[beacon_idx] + .wpa_offset; if (pnew_beacon->prsn_ie) pnew_beacon->rsn_offset = - pmadapter->pscan_table[beacon_idx]. - 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; + pmadapter->pscan_table[beacon_idx] + .wapi_offset; if (pnew_beacon->posen_ie) pnew_beacon->osen_offset = - pmadapter->pscan_table[beacon_idx]. - osen_offset; + pmadapter->pscan_table[beacon_idx] + .osen_offset; if (pnew_beacon->pmd_ie) pnew_beacon->md_offset = - pmadapter->pscan_table[beacon_idx]. - md_offset; + pmadapter->pscan_table[beacon_idx] + .md_offset; if (pnew_beacon->pht_cap) pnew_beacon->ht_cap_offset = - pmadapter->pscan_table[beacon_idx]. - 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; + 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; + 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; + 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; + 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; + 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; + 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; + 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; + 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; + 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; + 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; + pmadapter->pscan_table[beacon_idx] + .oper_mode_offset; if (pnew_beacon->phe_cap) pnew_beacon->he_cap_offset = - pmadapter->pscan_table[beacon_idx]. - he_cap_offset; + pmadapter->pscan_table[beacon_idx] + .he_cap_offset; if (pnew_beacon->phe_oprat) pnew_beacon->he_oprat_offset = - pmadapter->pscan_table[beacon_idx]. - he_oprat_offset; + pmadapter->pscan_table[beacon_idx] + .he_oprat_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)) && + 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); + 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; + DEFAULT_SCAN_BEACON_BUFFER); + bcn_size = pmadapter->pbcn_buf_end - + pmadapter->bcn_buf; memcpy_ext(pmadapter, tmp_buf, pmadapter->bcn_buf, bcn_size, bcn_size); - /* Adjust beacon buffer pointers that are past the current */ + /* 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->pscan_table[adj_idx] + .pbeacon_buf - pmadapter->bcn_buf; - pmadapter->pscan_table[adj_idx]. - pbeacon_buf = + pmadapter->pscan_table[adj_idx] + .pbeacon_buf = tmp_buf + bcn_offset; - wlan_adjust_ie_in_bss_entry(pmpriv, - &pmadapter-> - pscan_table - [adj_idx]); + 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->callbacks.moal_mfree( + pmadapter->pmoal_handle, + (t_u8 *)pmadapter->bcn_buf); pmadapter->bcn_buf = tmp_buf; pmadapter->bcn_buf_size += DEFAULT_SCAN_BEACON_BUFFER; @@ -2755,9 +2743,8 @@ wlan_ret_802_11_scan_store_beacon(IN mlan_private *pmpriv, * 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)) { - + 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 @@ -2783,26 +2770,24 @@ wlan_ret_802_11_scan_store_beacon(IN mlan_private *pmpriv, pmadapter->pbcn_buf_end += pnew_beacon->beacon_buf_size_max; - PRINTM(MINFO, "AppControl: Beacon[%02d] sz=%03d," + PRINTM(MINFO, + "AppControl: Beacon[%02d] sz=%03d," " used = %04d, left = %04d\n", - beacon_idx, - pnew_beacon->beacon_buf_size, + 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))); + (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), + 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))); + (pmadapter->pbcn_buf_end - pmadapter->bcn_buf))); /* * Storage failure; clear storage records @@ -2825,8 +2810,7 @@ wlan_ret_802_11_scan_store_beacon(IN mlan_private *pmpriv, * * @return MLAN_STATUS_SUCCESS, otherwise failure */ -static mlan_status -wlan_update_curr_bcn(IN mlan_private *pmpriv) +static mlan_status wlan_update_curr_bcn(IN mlan_private *pmpriv) { BSSDescriptor_t *pcurr_bss = &pmpriv->curr_bss_params.bss_descriptor; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -2840,101 +2824,114 @@ wlan_update_curr_bcn(IN mlan_private *pmpriv) /* 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); + 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); + pcurr_bss->prsn_ie = + (IEEEtypes_Generic_t *)(pcurr_bss->pbeacon_buf + + pcurr_bss->rsn_offset); } if (pcurr_bss->pmd_ie) { - pcurr_bss->pmd_ie = (IEEEtypes_MobilityDomain_t *) - (pcurr_bss->pbeacon_buf + pcurr_bss->md_offset); + pcurr_bss->pmd_ie = (IEEEtypes_MobilityDomain_t + *)(pcurr_bss->pbeacon_buf + + pcurr_bss->md_offset); } if (pcurr_bss->pht_cap) { - pcurr_bss->pht_cap = (IEEEtypes_HTCap_t *) - (pcurr_bss->pbeacon_buf + - pcurr_bss->ht_cap_offset); + 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); + 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); + 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); + 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); + (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); + 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); + 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); + 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); + 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); + 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); + 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); + pcurr_bss->poper_mode = + (IEEEtypes_OperModeNtf_t + *)(pcurr_bss->pbeacon_buf + + pcurr_bss->oper_mode_offset); } if (pcurr_bss->phe_cap) { - pcurr_bss->phe_cap = (IEEEtypes_HECap_t *) - (pcurr_bss->pbeacon_buf + - pcurr_bss->he_cap_offset); + pcurr_bss->phe_cap = + (IEEEtypes_HECap_t *)(pcurr_bss->pbeacon_buf + + pcurr_bss->he_cap_offset); } if (pcurr_bss->phe_oprat) { - pcurr_bss->phe_oprat = (IEEEtypes_Extension_t *) - (pcurr_bss->pbeacon_buf + - pcurr_bss->he_oprat_offset); + pcurr_bss->phe_oprat = + (IEEEtypes_Extension_t + *)(pcurr_bss->pbeacon_buf + + pcurr_bss->he_oprat_offset); } PRINTM(MINFO, "current beacon restored %d\n", @@ -2956,8 +2953,7 @@ wlan_update_curr_bcn(IN mlan_private *pmpriv) * * @return channel load */ -static t_u16 -wlan_get_chan_load(mlan_adapter *pmadapter, t_u8 channel) +static t_u16 wlan_get_chan_load(mlan_adapter *pmadapter, t_u8 channel) { t_u16 chan_load = 0; int i; @@ -2982,8 +2978,8 @@ wlan_get_chan_load(mlan_adapter *pmadapter, t_u8 channel) * @param min_flag flag to get min rssi * @return rssi */ -static t_u8 -wlan_get_chan_rssi(mlan_adapter *pmadapter, t_u8 channel, t_u8 min_flag) +static t_u8 wlan_get_chan_rssi(mlan_adapter *pmadapter, t_u8 channel, + t_u8 min_flag) { t_u8 rssi = 0; int i; @@ -2993,13 +2989,13 @@ wlan_get_chan_rssi(mlan_adapter *pmadapter, t_u8 channel, t_u8 min_flag) rssi = (t_s32)pmadapter->pscan_table[i].rssi; else { if (min_flag) - rssi = MIN(rssi, - pmadapter->pscan_table[i]. - rssi); + rssi = MIN( + rssi, + pmadapter->pscan_table[i].rssi); else - rssi = MAX(rssi, - pmadapter->pscan_table[i]. - rssi); + rssi = MAX( + rssi, + pmadapter->pscan_table[i].rssi); } } } @@ -3012,8 +3008,7 @@ wlan_get_chan_rssi(mlan_adapter *pmadapter, t_u8 channel, t_u8 min_flag) * @param pmadapter A pointer to mlan_adapter structure * @return N/A */ -static t_void -wlan_update_chan_rssi(mlan_adapter *pmadapter) +static t_void wlan_update_chan_rssi(mlan_adapter *pmadapter) { int i; t_s8 min_rssi = 0; @@ -3022,16 +3017,15 @@ wlan_update_chan_rssi(mlan_adapter *pmadapter) for (i = 0; i < pmadapter->num_in_chan_stats; i++) { if (pmadapter->pchan_stats[i].chan_num && pmadapter->pchan_stats[i].cca_scan_duration) { - min_rssi = - -wlan_get_chan_rssi(pmadapter, - pmadapter->pchan_stats[i]. - chan_num, MFALSE); - max_rssi = - -wlan_get_chan_rssi(pmadapter, - pmadapter->pchan_stats[i]. - chan_num, MTRUE); + min_rssi = -wlan_get_chan_rssi( + pmadapter, pmadapter->pchan_stats[i].chan_num, + MFALSE); + max_rssi = -wlan_get_chan_rssi( + pmadapter, pmadapter->pchan_stats[i].chan_num, + MTRUE); rss = min_rssi - pmadapter->pchan_stats[i].noise; - //rss should always > 0, FW need fix the wrong rssi/noise in scantable + // rss should always > 0, FW need fix the wrong + // rssi/noise in scantable if (rss > 0) pmadapter->pchan_stats[i].min_rss = rss; else @@ -3067,8 +3061,7 @@ wlan_update_chan_rssi(mlan_adapter *pmadapter) * * @return N/A */ -static t_void -wlan_scan_process_results(IN mlan_private *pmpriv) +static t_void wlan_scan_process_results(IN mlan_private *pmpriv) { mlan_adapter *pmadapter = pmpriv->adapter; t_s32 j; @@ -3080,21 +3073,19 @@ wlan_scan_process_results(IN mlan_private *pmpriv) ENTER(); if (pmpriv->media_connected == MTRUE) { - - j = wlan_find_bssid_in_list(pmpriv, - pmpriv->curr_bss_params. - bss_descriptor.mac_address, - pmpriv->bss_mode); + j = wlan_find_bssid_in_list( + pmpriv, + pmpriv->curr_bss_params.bss_descriptor.mac_address, + pmpriv->bss_mode); if (j >= 0) { memcpy_ext(pmadapter, &pmadapter->pscan_table[j].ssid, &pmpriv->curr_bss_params.bss_descriptor.ssid, sizeof(mlan_802_11_ssid), sizeof(mlan_802_11_ssid)); - pmadapter->callbacks.moal_spin_lock(pmadapter-> - pmoal_handle, - pmpriv-> - curr_bcn_buf_lock); + 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; @@ -3114,42 +3105,42 @@ wlan_scan_process_results(IN mlan_private *pmpriv) 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 + .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 + .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.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 + .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 + .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 + .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.oper_mode_offset = + 0; pmpriv->curr_bss_params.bss_descriptor.phe_cap = MNULL; pmpriv->curr_bss_params.bss_descriptor.he_cap_offset = 0; @@ -3161,86 +3152,81 @@ wlan_scan_process_results(IN mlan_private *pmpriv) MNULL; pmpriv->curr_bss_params.bss_descriptor.beacon_buf_size = 0; - pmpriv->curr_bss_params.bss_descriptor. - beacon_buf_size_max = 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_ext(pmadapter, - &pmpriv->curr_bss_params.bss_descriptor, - &pmadapter->pscan_table[j], - sizeof(pmpriv->curr_bss_params. - bss_descriptor), - sizeof(pmpriv->curr_bss_params. - bss_descriptor)); + memcpy_ext( + pmadapter, + &pmpriv->curr_bss_params.bss_descriptor, + &pmadapter->pscan_table[j], + sizeof(pmpriv->curr_bss_params.bss_descriptor), + sizeof(pmpriv->curr_bss_params.bss_descriptor)); - pmadapter->callbacks.moal_spin_unlock(pmadapter-> - pmoal_handle, - pmpriv-> - curr_bcn_buf_lock); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, + pmpriv->curr_bcn_buf_lock); wlan_save_curr_bcn(pmpriv); } else { - //Apend to the end of scan table + // Apend to the end of scan table if (pmpriv->pcurr_bcn_buf && pmpriv->curr_bcn_size) { 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) { - memcpy_ext(pmadapter, bss_new_entry, - &pmpriv->curr_bss_params. - bss_descriptor, - sizeof(pmpriv-> - curr_bss_params. - bss_descriptor), - sizeof(BSSDescriptor_t)); + if (ret == MLAN_STATUS_SUCCESS && + bss_new_entry) { + memcpy_ext( + pmadapter, bss_new_entry, + &pmpriv->curr_bss_params + .bss_descriptor, + sizeof(pmpriv->curr_bss_params + .bss_descriptor), + sizeof(BSSDescriptor_t)); if (pmadapter->num_in_scan_table < MRVDRV_MAX_BSSID_LIST) pmadapter->num_in_scan_table++; - pmadapter->pscan_table[pmadapter-> - num_in_scan_table - - - 1].pbeacon_buf = - MNULL; - wlan_ret_802_11_scan_store_beacon - (pmpriv, - pmadapter->num_in_scan_table - - 1, - pmadapter->num_in_scan_table, - bss_new_entry); + pmadapter + ->pscan_table + [pmadapter->num_in_scan_table - + 1] + .pbeacon_buf = MNULL; + wlan_ret_802_11_scan_store_beacon( + pmpriv, + pmadapter->num_in_scan_table - + 1, + pmadapter->num_in_scan_table, + bss_new_entry); if (bss_new_entry->pbeacon_buf == MNULL) pmadapter->num_in_scan_table--; else - memcpy_ext(pmadapter, - &pmadapter-> - pscan_table - [pmadapter-> - num_in_scan_table - - 1], bss_new_entry, - sizeof - (BSSDescriptor_t), - sizeof - (BSSDescriptor_t)); + memcpy_ext( + pmadapter, + &pmadapter->pscan_table + [pmadapter->num_in_scan_table - + 1], + bss_new_entry, + sizeof(BSSDescriptor_t), + sizeof(BSSDescriptor_t)); pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *)bss_new_entry); } } } - } for (i = 0; i < pmadapter->num_in_scan_table; i++) { - PRINTM(MINFO, "Scan:(%02d) " MACSTR ", " + PRINTM(MINFO, + "Scan:(%02d) " MACSTR ", " "RSSI[%03d], SSID[%s]\n", - i, - MAC2STR(pmadapter->pscan_table[i].mac_address), + i, MAC2STR(pmadapter->pscan_table[i].mac_address), (t_s32)pmadapter->pscan_table[i].rssi, pmadapter->pscan_table[i].ssid.ssid); - pmadapter->pscan_table[i].chan_load = - wlan_get_chan_load(pmadapter, - pmadapter->pscan_table[i].channel); + pmadapter->pscan_table[i].chan_load = wlan_get_chan_load( + pmadapter, pmadapter->pscan_table[i].channel); } wlan_update_chan_rssi(pmadapter); @@ -3268,8 +3254,8 @@ wlan_scan_process_results(IN mlan_private *pmpriv) * * @pre table_idx must be an index to a valid entry */ -static t_void -wlan_scan_delete_table_entry(IN mlan_private *pmpriv, IN t_s32 table_idx) +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; @@ -3302,15 +3288,13 @@ wlan_scan_delete_table_entry(IN mlan_private *pmpriv, IN t_s32 table_idx) PRINTM(MINFO, "Scan: Delete Entry %d, compact data: %p <- %p (sz = %d)\n", - table_idx, - pbeacon_buf, - pbeacon_buf + beacon_buf_adj, + 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). + * 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. @@ -3339,215 +3323,214 @@ wlan_scan_delete_table_entry(IN mlan_private *pmpriv, IN t_s32 table_idx) /* * 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). + * 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); + (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); + (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); + (IEEEtypes_Generic_t + *)(pmadapter + ->pscan_table[del_idx] + .pbeacon_buf + + pmadapter + ->pscan_table[del_idx] + .wapi_offset); } if (pmadapter->pscan_table[del_idx].posen_ie) { pmadapter->pscan_table[del_idx].posen_ie = - (IEEEtypes_Generic_t *) - (pmadapter->pscan_table[del_idx]. - pbeacon_buf + - pmadapter->pscan_table[del_idx]. - osen_offset); + (IEEEtypes_Generic_t + *)(pmadapter + ->pscan_table[del_idx] + .pbeacon_buf + + pmadapter + ->pscan_table[del_idx] + .osen_offset); } if (pmadapter->pscan_table[del_idx].pmd_ie) { pmadapter->pscan_table[del_idx].pmd_ie = - (IEEEtypes_MobilityDomain_t *) - (pmadapter->pscan_table[del_idx]. - pbeacon_buf + - pmadapter->pscan_table[del_idx]. - md_offset); + (IEEEtypes_MobilityDomain_t + *)(pmadapter + ->pscan_table[del_idx] + .pbeacon_buf + + pmadapter + ->pscan_table[del_idx] + .md_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); + (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); + (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); + (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); + (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 = + 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); + *)(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); + (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); + (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); + (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); + (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); + (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); + (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); + (IEEEtypes_OperModeNtf_t + *)(pmadapter + ->pscan_table[del_idx] + .pbeacon_buf + + pmadapter + ->pscan_table[del_idx] + .oper_mode_offset); } if (pmadapter->pscan_table[del_idx].phe_cap) { pmadapter->pscan_table[del_idx].phe_cap = - (IEEEtypes_HECap_t *) (pmadapter-> - pscan_table - [del_idx]. - pbeacon_buf + - pmadapter-> - pscan_table - [del_idx]. - he_cap_offset); + (IEEEtypes_HECap_t + *)(pmadapter + ->pscan_table[del_idx] + .pbeacon_buf + + pmadapter + ->pscan_table[del_idx] + .he_cap_offset); } if (pmadapter->pscan_table[del_idx].phe_oprat) { pmadapter->pscan_table[del_idx].phe_oprat = - (IEEEtypes_Extension_t *) (pmadapter-> - pscan_table - [del_idx]. - pbeacon_buf + - pmadapter-> - pscan_table - [del_idx]. - he_oprat_offset); + (IEEEtypes_Extension_t + *)(pmadapter + ->pscan_table[del_idx] + .pbeacon_buf + + pmadapter + ->pscan_table[del_idx] + .he_oprat_offset); } } } - /* The last entry is invalid now that it has been deleted or moved back */ + /* 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)); @@ -3585,9 +3568,7 @@ wlan_scan_delete_ssid_table_entry(IN mlan_private *pmpriv, * 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, + 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); @@ -3609,11 +3590,12 @@ wlan_scan_delete_ssid_table_entry(IN mlan_private *pmpriv, * WEP WPA WPA2 ad-hoc encrypt Network * enabled enabled enabled AES mode Privacy WPA WPA2 Compatible * 0 0 0 0 NONE 0 0 0 yes No security - * 0 1 0 0 x 1x 1 x yes WPA (disable HT if no AES) - * 0 0 1 0 x 1x x 1 yes WPA2 (disable HT if no AES) - * 0 0 0 1 NONE 1 0 0 yes Ad-hoc AES - * 1 0 0 0 NONE 1 0 0 yes Static WEP (disable HT) - * 0 0 0 0 !=NONE 1 0 0 yes Dynamic WEP + * 0 1 0 0 x 1x 1 x yes WPA (disable + * HT if no AES) 0 0 1 0 x 1x x 1 yes + * WPA2 (disable HT if no AES) 0 0 0 1 NONE 1 0 0 + * yes Ad-hoc AES 1 0 0 0 NONE 1 0 0 yes + * Static WEP (disable HT) 0 0 0 0 !=NONE 1 0 0 + * yes Dynamic WEP * * @param pmpriv A pointer to mlan_private * @param index Index in scan table to check against current driver settings @@ -3621,9 +3603,8 @@ wlan_scan_delete_ssid_table_entry(IN mlan_private *pmpriv, * * @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) +t_s32 wlan_is_network_compatible(IN mlan_private *pmpriv, IN t_u32 index, + IN t_u32 mode) { mlan_adapter *pmadapter = pmpriv->adapter; BSSDescriptor_t *pbss_desc; @@ -3632,9 +3613,9 @@ wlan_is_network_compatible(IN mlan_private *pmpriv, pbss_desc = &pmadapter->pscan_table[index]; /* 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)) { + if ((pmpriv->media_connected == MTRUE) && + (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) && + (pbss_desc->bss_mode == MLAN_BSS_MODE_INFRA)) { LEAVE(); return index; } @@ -3670,16 +3651,14 @@ wlan_is_network_compatible(IN mlan_private *pmpriv, return index; } - if (pmpriv->sec_info.osen_enabled && - pbss_desc->posen_ie && + if (pmpriv->sec_info.osen_enabled && pbss_desc->posen_ie && ((*(pbss_desc->posen_ie)).ieee_hdr.element_id == - VENDOR_SPECIFIC_221) - ) { + VENDOR_SPECIFIC_221)) { /* Hotspot 2.0 OSEN AKM */ PRINTM(MMSG, "Return success directly in Hotspot OSEN: index=%d " - "encryption_mode=%#x\n", index, - pmpriv->sec_info.encryption_mode); + "encryption_mode=%#x\n", + index, pmpriv->sec_info.encryption_mode); LEAVE(); return index; } @@ -3689,33 +3668,31 @@ wlan_is_network_compatible(IN mlan_private *pmpriv, #ifdef DRV_EMBEDDED_SUPPLICANT || supplicantIsEnabled(pmpriv->psapriv) #endif - )) { + )) { 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) - && !is_rsn_oui_present(pmpriv->adapter, pbss_desc, - CIPHER_SUITE_GCMP) - && !is_rsn_oui_present(pmpriv->adapter, pbss_desc, - CIPHER_SUITE_GCMP_256) - && !is_rsn_oui_present(pmpriv->adapter, pbss_desc, - CIPHER_SUITE_CCMP_256) - ) { - - if (is_wpa_oui_present - (pmpriv->adapter, pbss_desc, - CIPHER_SUITE_TKIP) - || is_rsn_oui_present(pmpriv->adapter, - pbss_desc, - CIPHER_SUITE_TKIP)) { + 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) && + !is_rsn_oui_present(pmpriv->adapter, pbss_desc, + CIPHER_SUITE_GCMP) && + !is_rsn_oui_present(pmpriv->adapter, pbss_desc, + CIPHER_SUITE_GCMP_256) && + !is_rsn_oui_present(pmpriv->adapter, pbss_desc, + CIPHER_SUITE_CCMP_256)) { + 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; @@ -3743,22 +3720,24 @@ wlan_is_network_compatible(IN mlan_private *pmpriv, } 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->sec_info.encryption_mode == - MLAN_ENCRYPTION_MODE_NONE && !pbss_desc->privacy) { + 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->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 - && pbss_desc->privacy) { + } else if (pmpriv->sec_info.wep_status == + Wlan802_11WEPEnabled && + !pmpriv->sec_info.wpa_enabled && + !pmpriv->sec_info.wpa2_enabled && + pbss_desc->privacy) { /* Static WEP enabled */ PRINTM(MINFO, "Disable 11n in WEP mode\n"); pbss_desc->disable_11n = MTRUE; @@ -3770,12 +3749,13 @@ wlan_is_network_compatible(IN mlan_private *pmpriv, */ 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) && + 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) && @@ -3790,40 +3770,48 @@ wlan_is_network_compatible(IN mlan_private *pmpriv, 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)) + } 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)) /* * Privacy bit may NOT be set in some APs like * LinkSys WRT54G && pbss_desc->privacy */ - ) { + ) { 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, + "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", + 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)) { + 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; @@ -3834,51 +3822,70 @@ wlan_is_network_compatible(IN mlan_private *pmpriv, } 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)) + } 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)) /* * 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, + "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", + 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) - && !is_rsn_oui_present(pmpriv->adapter, pbss_desc, - CIPHER_SUITE_GCMP) - && !is_rsn_oui_present(pmpriv->adapter, pbss_desc, - CIPHER_SUITE_GCMP_256) - && !is_rsn_oui_present(pmpriv->adapter, pbss_desc, - CIPHER_SUITE_CCMP_256) - ) { - if (is_rsn_oui_present - (pmpriv->adapter, pbss_desc, - CIPHER_SUITE_TKIP)) { + pbss_desc->pht_cap) && + (pmpriv->bss_mode == MLAN_BSS_MODE_INFRA) && + !is_rsn_oui_present(pmpriv->adapter, pbss_desc, + CIPHER_SUITE_CCMP) && + !is_rsn_oui_present(pmpriv->adapter, pbss_desc, + CIPHER_SUITE_GCMP) && + !is_rsn_oui_present(pmpriv->adapter, pbss_desc, + CIPHER_SUITE_GCMP_256) && + !is_rsn_oui_present(pmpriv->adapter, pbss_desc, + CIPHER_SUITE_CCMP_256)) { + 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 if (is_rsn_oui_present_in_wpa_ie( + pmpriv, CIPHER_SUITE_CCMP) || + is_rsn_oui_present_in_wpa_ie( + pmpriv, CIPHER_SUITE_GCMP) || + is_rsn_oui_present_in_wpa_ie( + pmpriv, + CIPHER_SUITE_GCMP_256) || + is_rsn_oui_present_in_wpa_ie( + pmpriv, + CIPHER_SUITE_CCMP_256)) { + LEAVE(); + return index; } else { LEAVE(); return -1; @@ -3886,27 +3893,33 @@ wlan_is_network_compatible(IN mlan_private *pmpriv, } 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->sec_info.encryption_mode != - MLAN_ENCRYPTION_MODE_NONE && pbss_desc->privacy) { + } 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->sec_info.encryption_mode != + MLAN_ENCRYPTION_MODE_NONE && + pbss_desc->privacy) { /* Dynamic WEP enabled */ pbss_desc->disable_11n = MTRUE; 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, + (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(); @@ -3917,12 +3930,15 @@ wlan_is_network_compatible(IN mlan_private *pmpriv, "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", + (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); @@ -3941,8 +3957,7 @@ wlan_is_network_compatible(IN mlan_private *pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_flush_scan_table(IN pmlan_adapter pmadapter) +mlan_status wlan_flush_scan_table(IN pmlan_adapter pmadapter) { t_u8 i = 0; ENTER(); @@ -3978,9 +3993,8 @@ wlan_flush_scan_table(IN pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS or < 0 if error */ -mlan_status -wlan_scan_networks(IN mlan_private *pmpriv, - IN t_void *pioctl_buf, IN wlan_user_scan_cfg *puser_scan_in) +mlan_status wlan_scan_networks(IN mlan_private *pmpriv, IN t_void *pioctl_buf, + IN wlan_user_scan_cfg *puser_scan_in) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_adapter *pmadapter = pmpriv->adapter; @@ -4032,16 +4046,12 @@ wlan_scan_networks(IN mlan_private *pmpriv, keep_previous_scan = MFALSE; - ret = wlan_scan_setup_scan_config(pmpriv, - puser_scan_in, + 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, + &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, @@ -4068,11 +4078,8 @@ wlan_scan_networks(IN mlan_private *pmpriv, pmadapter->pchan_stats[i].cca_scan_duration = 0; pmadapter->idx_chan_stats = 0; - ret = wlan_scan_channel_list(pmpriv, - pioctl_buf, - max_chan_per_scan, - filtered_scan, - &pscan_cfg_out->config, + 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 */ @@ -4085,16 +4092,13 @@ wlan_scan_networks(IN mlan_private *pmpriv, wlan_release_cmd_lock(pmadapter); } else { wlan_request_cmd_lock(pmadapter); - if (util_peek_list - (pmadapter->pmoal_handle, - &pmadapter->scan_pending_q, MNULL, MNULL)) { - pcmd_node = - (cmd_ctrl_node *) - util_dequeue_list(pmadapter-> - pmoal_handle, - &pmadapter-> - scan_pending_q, MNULL, - MNULL); + if (util_peek_list(pmadapter->pmoal_handle, + &pmadapter->scan_pending_q, MNULL, + MNULL)) { + pcmd_node = (cmd_ctrl_node *)util_dequeue_list( + pmadapter->pmoal_handle, + &pmadapter->scan_pending_q, MNULL, + MNULL); pmadapter->pscan_ioctl_req = pioctl_req; pmadapter->scan_processing = MTRUE; wlan_insert_cmd_to_pending_q(pmadapter, @@ -4132,9 +4136,9 @@ wlan_scan_networks(IN mlan_private *pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_802_11_scan(IN mlan_private *pmpriv, - IN HostCmd_DS_COMMAND *pcmd, IN t_void *pdata_buf) +mlan_status wlan_cmd_802_11_scan(IN mlan_private *pmpriv, + 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; @@ -4153,10 +4157,9 @@ wlan_cmd_802_11_scan(IN mlan_private *pmpriv, 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)); + 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; @@ -4172,9 +4175,8 @@ wlan_cmd_802_11_scan(IN mlan_private *pmpriv, * @return MTRUE/MFALSE */ -t_bool -wlan_active_scan_req_for_passive_chan(IN mlan_private *pmpriv, - IN mlan_ioctl_req *pioctl_buf) +t_bool wlan_active_scan_req_for_passive_chan(IN mlan_private *pmpriv, + IN mlan_ioctl_req *pioctl_buf) { t_bool ret = MFALSE; mlan_adapter *pmadapter = pmpriv->adapter; @@ -4182,7 +4184,7 @@ wlan_active_scan_req_for_passive_chan(IN mlan_private *pmpriv, t_bool chan_listed = MFALSE; t_u8 id = 0; t_u32 bss_idx, i; - t_u8 null_ssid[MLAN_MAX_SSID_LENGTH] = { 0 }; + t_u8 null_ssid[MLAN_MAX_SSID_LENGTH] = {0}; mlan_callbacks *pcb = (mlan_callbacks *)&pmpriv->adapter->callbacks; wlan_user_scan_cfg *user_scan_cfg; mlan_ds_scan *pscan = (mlan_ds_scan *)pioctl_buf->pbuf; @@ -4192,9 +4194,8 @@ wlan_active_scan_req_for_passive_chan(IN mlan_private *pmpriv, ENTER(); if (pscan->sub_command == MLAN_OID_SCAN_USER_CONFIG) { - puser_scan_in = - (wlan_user_scan_cfg *)pscan->param.user_scan. - scan_cfg_buf; + puser_scan_in = (wlan_user_scan_cfg *) + pscan->param.user_scan.scan_cfg_buf; if (!puser_scan_in->ssid_filter) goto done; } @@ -4204,10 +4205,10 @@ wlan_active_scan_req_for_passive_chan(IN mlan_private *pmpriv, goto done; } - if ((pcb-> - moal_malloc(pmadapter->pmoal_handle, sizeof(wlan_user_scan_cfg), - MLAN_MEM_DEF, - (t_u8 **)&user_scan_cfg) != MLAN_STATUS_SUCCESS) || + if ((pcb->moal_malloc(pmadapter->pmoal_handle, + sizeof(wlan_user_scan_cfg), MLAN_MEM_DEF, + (t_u8 **)&user_scan_cfg) != + MLAN_STATUS_SUCCESS) || !user_scan_cfg) { PRINTM(MERROR, "Memory allocation for user_scan_cfg failed\n"); goto done; @@ -4215,22 +4216,22 @@ wlan_active_scan_req_for_passive_chan(IN mlan_private *pmpriv, memset(pmadapter, user_scan_cfg, 0, sizeof(wlan_user_scan_cfg)); for (bss_idx = 0; bss_idx < pmadapter->num_in_scan_table; bss_idx++) { scan_reqd = MFALSE; - if (!memcmp - (pmadapter, pmadapter->pscan_table[bss_idx].ssid.ssid, - null_ssid, - pmadapter->pscan_table[bss_idx].ssid.ssid_len)) { + if (!memcmp(pmadapter, + pmadapter->pscan_table[bss_idx].ssid.ssid, + null_ssid, + pmadapter->pscan_table[bss_idx].ssid.ssid_len)) { if (puser_scan_in && puser_scan_in->chan_list[0].chan_number) { for (i = 0; i < WLAN_USER_SCAN_CHAN_MAX && puser_scan_in->chan_list[i].chan_number; i++) { - if (puser_scan_in->chan_list[i]. - chan_number == - pmadapter->pscan_table[bss_idx]. - channel) { - if (puser_scan_in->chan_list[i]. - scan_type == + if (puser_scan_in->chan_list[i] + .chan_number == + pmadapter->pscan_table[bss_idx] + .channel) { + if (puser_scan_in->chan_list[i] + .scan_type == MLAN_SCAN_TYPE_PASSIVE) scan_reqd = MTRUE; break; @@ -4240,35 +4241,33 @@ wlan_active_scan_req_for_passive_chan(IN mlan_private *pmpriv, MLAN_SCAN_TYPE_PASSIVE) { scan_reqd = MTRUE; } else { - if ((pmadapter->pscan_table[bss_idx]. - bss_band & BAND_A) && - wlan_11h_radar_detect_required(pmpriv, - pmadapter-> - pscan_table - [bss_idx]. - channel)) + if ((pmadapter->pscan_table[bss_idx].bss_band & + BAND_A) && + wlan_11h_radar_detect_required( + pmpriv, + pmadapter->pscan_table[bss_idx] + .channel)) scan_reqd = MTRUE; - if (pmadapter->pscan_table[bss_idx]. - bss_band & (BAND_B | BAND_G) && - wlan_bg_scan_type_is_passive(pmpriv, - pmadapter-> - pscan_table - [bss_idx]. - channel)) + if (pmadapter->pscan_table[bss_idx].bss_band & + (BAND_B | BAND_G) && + wlan_bg_scan_type_is_passive( + pmpriv, + pmadapter->pscan_table[bss_idx] + .channel)) scan_reqd = MTRUE; } if (scan_reqd) { chan_listed = MFALSE; for (i = 0; i < id; i++) { - if ((user_scan_cfg->chan_list[i]. - chan_number == - pmadapter->pscan_table[bss_idx]. - channel) - && (user_scan_cfg->chan_list[i]. - radio_type & pmadapter-> - pscan_table[bss_idx]. - bss_band)) { + if ((user_scan_cfg->chan_list[i] + .chan_number == + pmadapter->pscan_table[bss_idx] + .channel) && + (user_scan_cfg->chan_list[i] + .radio_type & + pmadapter->pscan_table[bss_idx] + .bss_band)) { chan_listed = MTRUE; break; } @@ -4277,14 +4276,14 @@ wlan_active_scan_req_for_passive_chan(IN mlan_private *pmpriv, continue; user_scan_cfg->chan_list[id].chan_number = pmadapter->pscan_table[bss_idx].channel; - if (pmadapter->pscan_table[bss_idx]. - bss_band & (BAND_B | BAND_G)) - user_scan_cfg->chan_list[id]. - radio_type = BAND_2GHZ; - if (pmadapter->pscan_table[bss_idx]. - bss_band & BAND_A) - user_scan_cfg->chan_list[id]. - radio_type = BAND_5GHZ; + if (pmadapter->pscan_table[bss_idx].bss_band & + (BAND_B | BAND_G)) + user_scan_cfg->chan_list[id].radio_type = + BAND_2GHZ; + if (pmadapter->pscan_table[bss_idx].bss_band & + BAND_A) + user_scan_cfg->chan_list[id].radio_type = + BAND_5GHZ; user_scan_cfg->chan_list[id].scan_type = MLAN_SCAN_TYPE_ACTIVE; id++; @@ -4307,9 +4306,8 @@ wlan_active_scan_req_for_passive_chan(IN mlan_private *pmpriv, MLAN_MAX_SSID_LENGTH); } user_scan_cfg->keep_previous_scan = MTRUE; - if (MLAN_STATUS_SUCCESS != wlan_scan_networks(pmpriv, - pioctl_buf, - user_scan_cfg)) { + if (MLAN_STATUS_SUCCESS != + wlan_scan_networks(pmpriv, pioctl_buf, user_scan_cfg)) { goto done; } ret = MTRUE; @@ -4347,9 +4345,9 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ret_802_11_scan(IN mlan_private *pmpriv, - IN HostCmd_DS_COMMAND *resp, IN t_void *pioctl_buf) +mlan_status wlan_ret_802_11_scan(IN mlan_private *pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN t_void *pioctl_buf) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_adapter *pmadapter = pmpriv->adapter; @@ -4374,7 +4372,7 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, t_u8 band; t_u8 is_bgscan_resp; t_u32 age_ts_usec; - t_u8 null_ssid[MLAN_MAX_SSID_LENGTH] = { 0 }; + t_u8 null_ssid[MLAN_MAX_SSID_LENGTH] = {0}; t_u32 status_code = 0; pmlan_ioctl_req pscan_ioctl_req = MNULL; @@ -4413,14 +4411,12 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, * 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); + tlv_buf_size = scan_resp_size - + (bytes_left + sizeof(pscan_rsp->bss_descript_size) + + sizeof(pscan_rsp->number_of_sets) + S_DS_GEN); if (is_bgscan_resp) - tlv_buf_size -= - sizeof(resp->params.bg_scan_query_resp. - report_condition); + tlv_buf_size -= sizeof( + resp->params.bg_scan_query_resp.report_condition); ptlv = (MrvlIEtypes_Data_t *)(pscan_rsp->bss_desc_and_tlv_buffer + bytes_left); @@ -4429,9 +4425,7 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, * 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, + wlan_ret_802_11_scan_get_tlv_ptrs(pmadapter, ptlv, tlv_buf_size, TLV_TYPE_TSFTIMESTAMP, (MrvlIEtypes_Data_t **)&ptsf_tlv); @@ -4439,16 +4433,12 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, * 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); - wlan_ret_802_11_scan_get_tlv_ptrs(pmadapter, ptlv, tlv_buf_size, - TLV_TYPE_CHANNEL_STATS, - (MrvlIEtypes_Data_t **) - &pchanstats_tlv); + wlan_ret_802_11_scan_get_tlv_ptrs( + pmadapter, ptlv, tlv_buf_size, TLV_TYPE_CHANNELBANDLIST, + (MrvlIEtypes_Data_t **)&pchan_band_tlv); + wlan_ret_802_11_scan_get_tlv_ptrs( + pmadapter, ptlv, tlv_buf_size, TLV_TYPE_CHANNEL_STATS, + (MrvlIEtypes_Data_t **)&pchanstats_tlv); if (pchanstats_tlv) wlan_update_chan_statistics(pmpriv, pchanstats_tlv); @@ -4474,12 +4464,9 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, 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) { + 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)); @@ -4487,8 +4474,8 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, if (pchan_band_tlv) { pchan_band = &pchan_band_tlv->chan_band_param[idx]; - band = radio_type_to_band(pchan_band->bandcfg. - chanBand); + band = radio_type_to_band( + pchan_band->bandcfg.chanBand); if (!bss_new_entry->channel) bss_new_entry->channel = pchan_band->chan_number; @@ -4499,13 +4486,9 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, */ 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); + 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 @@ -4522,11 +4505,11 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, * 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 (!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 @@ -4534,15 +4517,16 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, * 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))) { + 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); @@ -4555,12 +4539,14 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, * 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)) { + 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); @@ -4584,9 +4570,9 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, num_in_table++; } else { if ((bss_new_entry->channel != - pmadapter->pscan_table[bss_idx].channel) - && (bss_new_entry->rssi > - pmadapter->pscan_table[bss_idx].rssi)) { + pmadapter->pscan_table[bss_idx].channel) && + (bss_new_entry->rssi > + pmadapter->pscan_table[bss_idx].rssi)) { PRINTM(MCMND, "skip update the duplicate entry with low rssi\n"); continue; @@ -4597,10 +4583,8 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, * 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); + 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"); @@ -4614,10 +4598,10 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, * the beacon or probe response was received. */ if (ptsf_tlv) { - memcpy_ext(pmpriv->adapter, &tsf_val, - &ptsf_tlv->tsf_data[idx * - TSF_DATA_SIZE], - sizeof(tsf_val), sizeof(tsf_val)); + memcpy_ext( + pmpriv->adapter, &tsf_val, + &ptsf_tlv->tsf_data[idx * TSF_DATA_SIZE], + sizeof(tsf_val), sizeof(tsf_val)); tsf_val = wlan_le64_to_cpu(tsf_val); memcpy_ext(pmpriv->adapter, &bss_new_entry->network_tsf, @@ -4626,14 +4610,16 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, sizeof(bss_new_entry->network_tsf)); } - /* Copy the locally created bss_new_entry to the scan table */ + /* Copy the locally created bss_new_entry to the scan + * table */ memcpy_ext(pmadapter, &pmadapter->pscan_table[bss_idx], bss_new_entry, sizeof(pmadapter->pscan_table[bss_idx]), sizeof(pmadapter->pscan_table[bss_idx])); } else { - /* Error parsing/interpreting the scan response, skipped */ + /* Error parsing/interpreting the scan response, skipped + */ PRINTM(MERROR, "SCAN_RESP: wlan_interpret_bss_desc_with_ie returned error\n"); } @@ -4646,23 +4632,24 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, /* 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); + pmadapter->callbacks.moal_get_system_time( + pmadapter->pmoal_handle, &pmadapter->age_in_secs, &age_ts_usec); if (is_bgscan_resp) goto done; wlan_request_cmd_lock(pmadapter); - if (!util_peek_list - (pmadapter->pmoal_handle, &pmadapter->scan_pending_q, MNULL, - MNULL)) { + if (!util_peek_list(pmadapter->pmoal_handle, &pmadapter->scan_pending_q, + MNULL, MNULL)) { wlan_release_cmd_lock(pmadapter); if (pmadapter->pscan_ioctl_req) { - if (((mlan_ds_scan *)pmadapter->pscan_ioctl_req->pbuf)-> - sub_command == MLAN_OID_SCAN_SPECIFIC_SSID || - ((mlan_ds_scan *)pmadapter->pscan_ioctl_req->pbuf)-> - sub_command == MLAN_OID_SCAN_USER_CONFIG) { - if (wlan_active_scan_req_for_passive_chan - (pmpriv, pmadapter->pscan_ioctl_req)) { + if (((mlan_ds_scan *)pmadapter->pscan_ioctl_req->pbuf) + ->sub_command == + MLAN_OID_SCAN_SPECIFIC_SSID || + ((mlan_ds_scan *)pmadapter->pscan_ioctl_req->pbuf) + ->sub_command == + MLAN_OID_SCAN_USER_CONFIG) { + if (wlan_active_scan_req_for_passive_chan( + pmpriv, + pmadapter->pscan_ioctl_req)) { goto done; } } @@ -4682,10 +4669,10 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, if (pscan_ioctl_req) { pscan_ioctl_req->status_code = MLAN_ERROR_NO_ERROR; /* Indicate ioctl complete */ - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, - (pmlan_ioctl_req) - pscan_ioctl_req, - MLAN_STATUS_SUCCESS); + pcb->moal_ioctl_complete( + pmadapter->pmoal_handle, + (pmlan_ioctl_req)pscan_ioctl_req, + MLAN_STATUS_SUCCESS); } wlan_release_cmd_lock(pmadapter); pmadapter->bgscan_reported = MFALSE; @@ -4698,14 +4685,11 @@ wlan_ret_802_11_scan(IN mlan_private *pmpriv, ret = MLAN_STATUS_FAILURE; goto done; } 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, - MNULL, - MNULL); + /* 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, MNULL, MNULL); wlan_insert_cmd_to_pending_q(pmadapter, pcmd_node, MTRUE); wlan_release_cmd_lock(pmadapter); @@ -4750,9 +4734,9 @@ done: * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_802_11_scan_ext(IN mlan_private *pmpriv, - IN HostCmd_DS_COMMAND *pcmd, IN t_void *pdata_buf) +mlan_status wlan_cmd_802_11_scan_ext(IN mlan_private *pmpriv, + 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; @@ -4768,15 +4752,10 @@ wlan_cmd_802_11_scan_ext(IN mlan_private *pmpriv, else pext_scan_cmd->ext_scan_type = EXT_SCAN_DEFAULT; } else { - pcmd->size = - wlan_cpu_to_le16((t_u16) - (sizeof - (pext_scan_cmd->ext_scan_type) - + - (t_u16)(sizeof - (pext_scan_cmd-> - reserved)) + - S_DS_GEN)); + pcmd->size = wlan_cpu_to_le16((t_u16)( + sizeof(pext_scan_cmd->ext_scan_type) + + (t_u16)(sizeof(pext_scan_cmd->reserved)) + + S_DS_GEN)); pext_scan_cmd->ext_scan_type = EXT_SCAN_CANCEL; LEAVE(); return MLAN_STATUS_SUCCESS; @@ -4789,11 +4768,10 @@ wlan_cmd_802_11_scan_ext(IN mlan_private *pmpriv, pscan_cfg->tlv_buf_len); /* Size is equal to the sizeof(fixed portions) + the TLV len + header */ - pcmd->size = - wlan_cpu_to_le16((t_u16)(sizeof(pext_scan_cmd->ext_scan_type) - + - (t_u16)sizeof(pext_scan_cmd->reserved) - + pscan_cfg->tlv_buf_len + S_DS_GEN)); + pcmd->size = wlan_cpu_to_le16( + (t_u16)(sizeof(pext_scan_cmd->ext_scan_type) + + (t_u16)sizeof(pext_scan_cmd->reserved) + + pscan_cfg->tlv_buf_len + S_DS_GEN)); LEAVE(); return MLAN_STATUS_SUCCESS; @@ -4808,9 +4786,9 @@ wlan_cmd_802_11_scan_ext(IN mlan_private *pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ret_802_11_scan_ext(IN mlan_private *pmpriv, - IN HostCmd_DS_COMMAND *resp, IN t_void *pioctl_buf) +mlan_status wlan_ret_802_11_scan_ext(IN mlan_private *pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN t_void *pioctl_buf) { HostCmd_DS_802_11_SCAN_EXT *pext_scan_cmd = &(resp->params.ext_scan); MrvlIEtypesHeader_t *tlv = MNULL; @@ -4852,9 +4830,8 @@ wlan_ret_802_11_scan_ext(IN mlan_private *pmpriv, return MLAN_STATUS_SUCCESS; } tlv = (MrvlIEtypesHeader_t *)pext_scan_cmd->tlv_buffer; - tlv_buf_left = - resp->size - (sizeof(HostCmd_DS_802_11_SCAN_EXT) - 1 + - S_DS_GEN); + tlv_buf_left = resp->size - + (sizeof(HostCmd_DS_802_11_SCAN_EXT) - 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); @@ -4887,15 +4864,14 @@ wlan_ret_802_11_scan_ext(IN mlan_private *pmpriv, * * @return N/A */ -t_void -wlan_add_new_entry_to_scan_table(mlan_private *pmpriv, - BSSDescriptor_t *bss_new_entry, - t_u32 *num_in_tbl) +t_void wlan_add_new_entry_to_scan_table(mlan_private *pmpriv, + BSSDescriptor_t *bss_new_entry, + t_u32 *num_in_tbl) { mlan_adapter *pmadapter = pmpriv->adapter; t_u32 bss_idx; t_u32 num_in_table = *num_in_tbl; - t_u8 null_ssid[MLAN_MAX_SSID_LENGTH] = { 0 }; + t_u8 null_ssid[MLAN_MAX_SSID_LENGTH] = {0}; /* * Search the scan table for the same bssid @@ -4911,10 +4887,10 @@ wlan_add_new_entry_to_scan_table(mlan_private *pmpriv, * 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))) { + 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); @@ -4926,11 +4902,11 @@ wlan_add_new_entry_to_scan_table(mlan_private *pmpriv, * 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)) { + 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); @@ -4950,9 +4926,9 @@ wlan_add_new_entry_to_scan_table(mlan_private *pmpriv, num_in_table++; } else { if ((bss_new_entry->channel != - pmadapter->pscan_table[bss_idx].channel) - && (bss_new_entry->rssi > - pmadapter->pscan_table[bss_idx].rssi)) { + pmadapter->pscan_table[bss_idx].channel) && + (bss_new_entry->rssi > + pmadapter->pscan_table[bss_idx].rssi)) { PRINTM(MCMND, "skip update the duplicate entry with low rssi\n"); return; @@ -4963,8 +4939,8 @@ wlan_add_new_entry_to_scan_table(mlan_private *pmpriv, * 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); + 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--; @@ -4991,10 +4967,10 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) +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) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_adapter *pmadapter = pmpriv->adapter; @@ -5048,8 +5024,9 @@ wlan_parse_ext_scan_result(IN mlan_private *pmpriv, goto done; } - for (idx = 0; idx < number_of_sets && bytes_left > - sizeof(MrvlIEtypesHeader_t); idx++) { + 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) { @@ -5076,7 +5053,7 @@ wlan_parse_ext_scan_result(IN mlan_private *pmpriv, /* 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_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 < @@ -5094,7 +5071,7 @@ wlan_parse_ext_scan_result(IN mlan_private *pmpriv, (MrvlIEtypes_Bss_Scan_Info_t *)ptlv; if (tlv_len != sizeof(MrvlIEtypes_Bss_Scan_Info_t) - - sizeof(MrvlIEtypesHeader_t)) { + sizeof(MrvlIEtypesHeader_t)) { bytes_left_for_tlv = 0; continue; } @@ -5124,12 +5101,9 @@ wlan_parse_ext_scan_result(IN mlan_private *pmpriv, 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) { + 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)); @@ -5142,9 +5116,8 @@ wlan_parse_ext_scan_result(IN mlan_private *pmpriv, */ if (pscan_info_tlv) { /* RSSI is 2 byte long */ - bss_new_entry->rssi = - -(t_s32)(wlan_le16_to_cpu - (pscan_info_tlv->rssi)); + 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_ext(pmpriv->adapter, &tsf_val, @@ -5156,22 +5129,19 @@ wlan_parse_ext_scan_result(IN mlan_private *pmpriv, &tsf_val, sizeof(bss_new_entry->network_tsf), sizeof(bss_new_entry->network_tsf)); - band = radio_type_to_band(pscan_info_tlv-> - bandcfg.chanBand); + band = radio_type_to_band( + pscan_info_tlv->bandcfg.chanBand); if (!bss_new_entry->channel) bss_new_entry->channel = pscan_info_tlv->channel; } - /* Save the band designation for this entry for use in join */ + /* 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); + 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 @@ -5187,7 +5157,8 @@ wlan_parse_ext_scan_result(IN mlan_private *pmpriv, &num_in_table); } else { - /* Error parsing/interpreting the scan response, skipped */ + /* Error parsing/interpreting the scan response, skipped + */ PRINTM(MERROR, "EXT_SCAN: wlan_interpret_bss_desc_with_ie returned error\n"); } @@ -5200,9 +5171,8 @@ wlan_parse_ext_scan_result(IN mlan_private *pmpriv, /* 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); + pmadapter->callbacks.moal_get_system_time( + pmadapter->pmoal_handle, &pmadapter->age_in_secs, &age_ts_usec); done: if (bss_new_entry) @@ -5220,9 +5190,8 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_handle_event_ext_scan_report(IN mlan_private *pmpriv, - IN mlan_buffer *pmbuf) +mlan_status wlan_handle_event_ext_scan_report(IN mlan_private *pmpriv, + IN mlan_buffer *pmbuf) { mlan_adapter *pmadapter = pmpriv->adapter; mlan_callbacks *pcb = &pmadapter->callbacks; @@ -5230,31 +5199,34 @@ wlan_handle_event_ext_scan_report(IN mlan_private *pmpriv, 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)); + 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_le16_to_cpu(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 - && (pmadapter->ext_scan_type != EXT_SCAN_ENHANCE) - ) { + 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 && + (pmadapter->ext_scan_type != EXT_SCAN_ENHANCE)) { wlan_request_cmd_lock(pmadapter); if (!util_peek_list(pmadapter->pmoal_handle, &pmadapter->scan_pending_q, MNULL, MNULL)) { wlan_release_cmd_lock(pmadapter); if (pmadapter->pscan_ioctl_req) { - if (((mlan_ds_scan *)pmadapter-> - pscan_ioctl_req->pbuf)->sub_command == - MLAN_OID_SCAN_SPECIFIC_SSID || - ((mlan_ds_scan *)pmadapter-> - pscan_ioctl_req->pbuf)->sub_command == - MLAN_OID_SCAN_USER_CONFIG) { - if (wlan_active_scan_req_for_passive_chan(pmpriv, pmadapter->pscan_ioctl_req)) { + if (((mlan_ds_scan *) + pmadapter->pscan_ioctl_req->pbuf) + ->sub_command == + MLAN_OID_SCAN_SPECIFIC_SSID || + ((mlan_ds_scan *) + pmadapter->pscan_ioctl_req->pbuf) + ->sub_command == + MLAN_OID_SCAN_USER_CONFIG) { + if (wlan_active_scan_req_for_passive_chan( + pmpriv, + pmadapter->pscan_ioctl_req)) { LEAVE(); return ret; } @@ -5274,11 +5246,10 @@ wlan_handle_event_ext_scan_report(IN mlan_private *pmpriv, 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); + pcb->moal_ioctl_complete( + pmadapter->pmoal_handle, + (pmlan_ioctl_req)pioctl_req, + MLAN_STATUS_SUCCESS); } wlan_release_cmd_lock(pmadapter); @@ -5286,8 +5257,8 @@ wlan_handle_event_ext_scan_report(IN mlan_private *pmpriv, wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_SCAN_REPORT, MNULL); } else { - - /* If firmware not ready, do not issue any more scan commands */ + /* If firmware not ready, do not issue any more scan + * commands */ if (pmadapter->hw_status != WlanHardwareStatusReady) { wlan_release_cmd_lock(pmadapter); /* Flush all pending scan commands */ @@ -5302,22 +5273,19 @@ wlan_handle_event_ext_scan_report(IN mlan_private *pmpriv, MLAN_ERROR_FW_NOT_READY; /* Indicate ioctl complete */ - pcb->moal_ioctl_complete(pmadapter-> - pmoal_handle, - (pmlan_ioctl_req) - pioctl_req, - MLAN_STATUS_FAILURE); + pcb->moal_ioctl_complete( + pmadapter->pmoal_handle, + (pmlan_ioctl_req)pioctl_req, + MLAN_STATUS_FAILURE); } wlan_release_cmd_lock(pmadapter); } 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, MNULL, - MNULL); + /* 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, MNULL, + MNULL); wlan_insert_cmd_to_pending_q(pmadapter, pcmd_node, MTRUE); wlan_release_cmd_lock(pmadapter); @@ -5336,9 +5304,8 @@ wlan_handle_event_ext_scan_report(IN mlan_private *pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_handle_event_ext_scan_status(IN mlan_private *pmpriv, - IN mlan_buffer *pmbuf) +mlan_status wlan_handle_event_ext_scan_status(IN mlan_private *pmpriv, + IN mlan_buffer *pmbuf) { mlan_adapter *pmadapter = pmpriv->adapter; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -5359,7 +5326,7 @@ wlan_handle_event_ext_scan_status(IN mlan_private *pmpriv, } scan_event = - (pmlan_event_scan_status) (pmbuf->pbuf + pmbuf->data_offset); + (pmlan_event_scan_status)(pmbuf->pbuf + pmbuf->data_offset); DBG_HEXDUMP(MCMD_D, "EVENT: Ext_Scan_Status", scan_event, pmbuf->data_len); status = scan_event->scan_status; @@ -5387,9 +5354,8 @@ wlan_handle_event_ext_scan_status(IN mlan_private *pmpriv, break; } tlv_buf_left -= tlv_len + sizeof(MrvlIEtypesHeader_t); - tlv = (MrvlIEtypesHeader_t *)((t_u8 *)(tlv + tlv_len + - sizeof - (MrvlIEtypesHeader_t))); + tlv = (MrvlIEtypesHeader_t *)((t_u8 *)tlv + tlv_len + + sizeof(MrvlIEtypesHeader_t)); } done: @@ -5402,12 +5368,14 @@ done: pmadapter->cmd_timer_is_set = MFALSE; } if (pmadapter->pscan_ioctl_req) { - if (((mlan_ds_scan *)pmadapter->pscan_ioctl_req->pbuf)-> - sub_command == MLAN_OID_SCAN_SPECIFIC_SSID || - ((mlan_ds_scan *)pmadapter->pscan_ioctl_req->pbuf)-> - sub_command == MLAN_OID_SCAN_USER_CONFIG) { - if (wlan_active_scan_req_for_passive_chan - (pmpriv, pmadapter->pscan_ioctl_req)) { + if (((mlan_ds_scan *)pmadapter->pscan_ioctl_req->pbuf) + ->sub_command == + MLAN_OID_SCAN_SPECIFIC_SSID || + ((mlan_ds_scan *)pmadapter->pscan_ioctl_req->pbuf) + ->sub_command == + MLAN_OID_SCAN_USER_CONFIG) { + if (wlan_active_scan_req_for_passive_chan( + pmpriv, pmadapter->pscan_ioctl_req)) { LEAVE(); return ret; } @@ -5419,7 +5387,7 @@ done: * - Update our current BSS information from scan data */ wlan_scan_process_results(pmpriv); - /** Complete scan ioctl */ + /** Complete scan ioctl */ wlan_request_cmd_lock(pmadapter); pmadapter->scan_processing = MFALSE; pmadapter->ext_scan_type = EXT_SCAN_DEFAULT; @@ -5429,8 +5397,8 @@ done: if (pioctl_req != MNULL) { pioctl_req->status_code = MLAN_ERROR_NO_ERROR; /* Indicate ioctl complete */ - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, - pioctl_req, MLAN_STATUS_SUCCESS); + pcb->moal_ioctl_complete(pmadapter->pmoal_handle, pioctl_req, + MLAN_STATUS_SUCCESS); } wlan_release_cmd_lock(pmadapter); pmadapter->bgscan_reported = MFALSE; @@ -5449,18 +5417,17 @@ done: * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_802_11_bg_scan_query(IN mlan_private *pmpriv, - IN HostCmd_DS_COMMAND *pcmd, IN t_void *pdata_buf) +mlan_status wlan_cmd_802_11_bg_scan_query(IN mlan_private *pmpriv, + IN HostCmd_DS_COMMAND *pcmd, + IN t_void *pdata_buf) { HostCmd_DS_802_11_BG_SCAN_QUERY *bg_query = &pcmd->params.bg_scan_query; 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->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_BG_SCAN_QUERY) + + S_DS_GEN); bg_query->flush = MTRUE; @@ -5477,7 +5444,8 @@ wlan_cmd_802_11_bg_scan_query(IN mlan_private *pmpriv, * * @param pmpriv A pointer to mlan_private structure * @param pbg_scan_in pointer to scan configuration parameters - * @param tlv_chan_list A pointer to structure MrvlIEtypes_ChanListParamSet_t + * @param tlv_chan_list A pointer to structure + * MrvlIEtypes_ChanListParamSet_t * * @return channel number */ @@ -5498,9 +5466,8 @@ wlan_bgscan_create_channel_list(IN mlan_private *pmpriv, ENTER(); - for (region_idx = 0; - region_idx < NELEMENTS(pmadapter->region_channel); region_idx++) { - + 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 */ @@ -5516,9 +5483,8 @@ wlan_bgscan_create_channel_list(IN mlan_private *pmpriv, 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; + 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; @@ -5533,8 +5499,7 @@ wlan_bgscan_create_channel_list(IN mlan_private *pmpriv, band = pmpriv->config_bands; if (!wlan_is_band_compatible(band, pscan_region->band)) continue; - for (next_chan = 0; - next_chan < pscan_region->num_cfp; + for (next_chan = 0; next_chan < pscan_region->num_cfp; next_chan++, chan_idx++) { if (chan_idx >= WLAN_BG_SCAN_CHAN_MAX) break; @@ -5548,64 +5513,59 @@ wlan_bgscan_create_channel_list(IN mlan_private *pmpriv, switch (pscan_region->band) { case BAND_A: - tlv_chan_list->chan_scan_param[chan_idx]. - bandcfg.chanBand = BAND_5GHZ; + tlv_chan_list->chan_scan_param[chan_idx] + .bandcfg.chanBand = BAND_5GHZ; /* Passive scan on DFS channels */ - if (wlan_11h_radar_detect_required - (pmpriv, (t_u8)cfp->channel)) + 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_bg_scan_type_is_passive - (pmpriv, (t_u8)cfp->channel)) + if (wlan_bg_scan_type_is_passive( + pmpriv, (t_u8)cfp->channel)) scan_type = MLAN_SCAN_TYPE_PASSIVE; - tlv_chan_list->chan_scan_param[chan_idx]. - bandcfg.chanBand = BAND_2GHZ; + tlv_chan_list->chan_scan_param[chan_idx] + .bandcfg.chanBand = BAND_2GHZ; break; default: - tlv_chan_list->chan_scan_param[chan_idx]. - bandcfg.chanBand = BAND_2GHZ; + tlv_chan_list->chan_scan_param[chan_idx] + .bandcfg.chanBand = BAND_2GHZ; 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); + 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); + 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); + 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; + 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_scan_mode.passive_scan = MFALSE; } tlv_chan_list->chan_scan_param[chan_idx].chan_number = @@ -5627,9 +5587,9 @@ wlan_bgscan_create_channel_list(IN mlan_private *pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_bgscan_config(IN mlan_private *pmpriv, - IN HostCmd_DS_COMMAND *pcmd, IN t_void *pdata_buf) +mlan_status wlan_cmd_bgscan_config(IN mlan_private *pmpriv, + IN HostCmd_DS_COMMAND *pcmd, + IN t_void *pdata_buf) { mlan_adapter *pmadapter = pmpriv->adapter; HostCmd_DS_802_11_BG_SCAN_CONFIG *bg_scan = @@ -5663,7 +5623,7 @@ wlan_cmd_bgscan_config(IN mlan_private *pmpriv, t_u16 scan_dur; t_u8 scan_type; t_u8 band; - const t_u8 zero_mac[6] = { 0, 0, 0, 0, 0, 0 }; + const t_u8 zero_mac[6] = {0, 0, 0, 0, 0, 0}; ENTER(); @@ -5688,7 +5648,7 @@ wlan_cmd_bgscan_config(IN mlan_private *pmpriv, 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); + pmadapter->scan_probes); if (num_probes) { pnum_probes_tlv = (MrvlIEtypes_NumProbes_t *)tlv; pnum_probes_tlv->header.type = @@ -5703,10 +5663,9 @@ wlan_cmd_bgscan_config(IN mlan_private *pmpriv, 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->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); @@ -5715,10 +5674,9 @@ wlan_cmd_bgscan_config(IN mlan_private *pmpriv, 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->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); @@ -5736,29 +5694,26 @@ wlan_cmd_bgscan_config(IN mlan_private *pmpriv, 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)); + 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); + 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->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_ext(pmadapter, pwildcard_ssid_tlv->ssid, bg_scan_in->ssid_list[ssid_idx].ssid, ssid_len, MLAN_MAX_SSID_LENGTH); 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; + 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, @@ -5769,8 +5724,8 @@ wlan_cmd_bgscan_config(IN mlan_private *pmpriv, 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; + 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 (bg_scan_in->bss_type == MLAN_SCAN_MODE_IBSS || @@ -5778,44 +5733,45 @@ wlan_cmd_bgscan_config(IN mlan_private *pmpriv, band = pmadapter->adhoc_start_band; else band = pmpriv->config_bands; - if (!wlan_is_band_compatible - (band, radio_type_to_band(radio_type))) + if (!wlan_is_band_compatible( + 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 */ + /* Prevent active scanning on a radar controlled channel + */ if (radio_type == BAND_5GHZ) { - if (wlan_11h_radar_detect_required - (pmpriv, - bg_scan_in->chan_list[chan_idx]. - chan_number)) { + 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 == BAND_2GHZ) { - if (wlan_bg_scan_type_is_passive - (pmpriv, - bg_scan_in->chan_list[chan_idx]. - chan_number)) { + 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].bandcfg. - chanBand = + tlv_chan_list->chan_scan_param[chan_num] + .bandcfg.chanBand = 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; + 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; + 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; + (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; @@ -5835,24 +5791,21 @@ wlan_cmd_bgscan_config(IN mlan_private *pmpriv, 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; + 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); + 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; + sizeof(ChanScanParamSet_t) * chan_num; + cmd_size += sizeof(MrvlIEtypesHeader_t) + + sizeof(ChanScanParamSet_t) * chan_num; } if (bg_scan_in->chan_per_scan) { bg_scan->chan_per_scan = bg_scan_in->chan_per_scan; @@ -5863,9 +5816,9 @@ wlan_cmd_bgscan_config(IN mlan_private *pmpriv, bg_scan->chan_per_scan = MRVDRV_MAX_CHANNELS_PER_SPECIFIC_SCAN; } - if (ISSUPP_11NENABLED(pmpriv->adapter->fw_cap_info) - && (pmpriv->config_bands & BAND_GN - || pmpriv->config_bands & BAND_AN)) { + if (ISSUPP_11NENABLED(pmpriv->adapter->fw_cap_info) && + (pmpriv->config_bands & BAND_GN || + pmpriv->config_bands & BAND_AN)) { pht_cap = (MrvlIETypes_HTCap_t *)tlv; memset(pmadapter, pht_cap, 0, sizeof(MrvlIETypes_HTCap_t)); pht_cap->header.type = wlan_cpu_to_le16(HT_CAPABILITY); @@ -5878,8 +5831,8 @@ wlan_cmd_bgscan_config(IN mlan_private *pmpriv, cmd_size += 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)) { + if (ISSUPP_11ACENABLED(pmpriv->adapter->fw_cap_info) && + (pmpriv->config_bands & BAND_AAC)) { pvht_cap = (MrvlIETypes_VHTCap_t *)tlv; memset(pmadapter, pvht_cap, 0, sizeof(MrvlIETypes_VHTCap_t)); pvht_cap->header.type = wlan_cpu_to_le16(VHT_CAPABILITY); @@ -5893,9 +5846,9 @@ wlan_cmd_bgscan_config(IN mlan_private *pmpriv, pvht_cap->header.len = wlan_cpu_to_le16(pvht_cap->header.len); } - if (IS_FW_SUPPORT_11AX(pmadapter) - && (pmpriv->config_bands & BAND_AAX)) { - phe_cap = (MrvlIEtypes_Extension_t *) tlv; + if (IS_FW_SUPPORT_11AX(pmadapter) && + (pmpriv->config_bands & BAND_AAX)) { + phe_cap = (MrvlIEtypes_Extension_t *)tlv; len = wlan_fill_he_cap_tlv(pmpriv, BAND_A, phe_cap, MFALSE); DBG_HEXDUMP(MCMD_D, "BGSCAN: HE_CAPABILITIES IE", (t_u8 *)phe_cap, len); @@ -5919,14 +5872,15 @@ wlan_cmd_bgscan_config(IN mlan_private *pmpriv, pmpriv->usr_dot_11n_dev_cap_bg; if (usr_dot_11n_dev_cap & MBIT(17)) { bandwidth = BW_40MHZ; - if (ISSUPP_11ACENABLED(pmadapter->fw_cap_info) - && (pmpriv->config_bands & BAND_AAC)) + if (ISSUPP_11ACENABLED( + pmadapter->fw_cap_info) && + (pmpriv->config_bands & BAND_AAC)) bandwidth = BW_80MHZ; } - wlan_get_curr_oper_class(pmpriv, - pmpriv->curr_bss_params. - bss_descriptor.channel, - bandwidth, &oper_class); + wlan_get_curr_oper_class( + pmpriv, + pmpriv->curr_bss_params.bss_descriptor.channel, + bandwidth, &oper_class); } len = wlan_add_supported_oper_class_ie(pmpriv, &tlv, oper_class); @@ -5936,16 +5890,15 @@ wlan_cmd_bgscan_config(IN mlan_private *pmpriv, 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->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_StartLater_t) - sizeof(MrvlIEtypesHeader_t)); tlv_start_later->value = wlan_cpu_to_le16(bg_scan_in->start_later); tlv += sizeof(MrvlIEtypes_StartLater_t); cmd_size += sizeof(MrvlIEtypes_StartLater_t); if (bg_scan_in->config_ees) { /* Fill EES configuration */ - tlv_ees_cfg = (MrvlIEtypes_EESParamSet_t *) tlv; + tlv_ees_cfg = (MrvlIEtypes_EESParamSet_t *)tlv; tlv_ees_cfg->header.type = wlan_cpu_to_le16(TLV_TYPE_EES_CFG); tlv_ees_cfg->header.len = wlan_cpu_to_le16(sizeof(MrvlIEtypes_EESParamSet_t) - @@ -5970,13 +5923,12 @@ wlan_cmd_bgscan_config(IN mlan_private *pmpriv, if (bg_scan_in->network_count) { /* Fill EES network configuration */ - tlv_ees_net_cfg = (MrvlIEtype_EESNetworkCfg_t *) tlv; + tlv_ees_net_cfg = (MrvlIEtype_EESNetworkCfg_t *)tlv; tlv_ees_net_cfg->header.type = wlan_cpu_to_le16(TLV_TYPE_EES_NET_CFG); - tlv_ees_net_cfg->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtype_EESNetworkCfg_t) - - sizeof(MrvlIEtypesHeader_t)); + tlv_ees_net_cfg->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtype_EESNetworkCfg_t) - + sizeof(MrvlIEtypesHeader_t)); tlv_ees_net_cfg->network_count = bg_scan_in->network_count; tlv_ees_net_cfg->max_conn_count = @@ -5987,28 +5939,28 @@ wlan_cmd_bgscan_config(IN mlan_private *pmpriv, cmd_size += sizeof(MrvlIEtype_EESNetworkCfg_t); for (index = 0; index < bg_scan_in->network_count; index++) { - if (wlan_strlen - ((char *)bg_scan_in->ees_ssid_cfg[index]. - ssid)) { + if (wlan_strlen((char *)bg_scan_in + ->ees_ssid_cfg[index] + .ssid)) { /* Fill SSID settings */ tlv_ssid = (MrvlIEtypes_SsIdParamSet_t *) - tlv; + tlv; tlv_ssid->header.type = wlan_cpu_to_le16(TLV_TYPE_SSID); - tlv_ssid->header.len = - wlan_cpu_to_le16((t_u16) - bg_scan_in->ees_ssid_cfg - [index]. - max_len); - memcpy_ext(pmadapter, tlv_ssid->ssid, - bg_scan_in-> - ees_ssid_cfg[index].ssid, - bg_scan_in-> - ees_ssid_cfg[index].max_len, - MLAN_MAX_SSID_LENGTH); + tlv_ssid->header.len = wlan_cpu_to_le16( + (t_u16)bg_scan_in + ->ees_ssid_cfg[index] + .max_len); + memcpy_ext( + pmadapter, tlv_ssid->ssid, + bg_scan_in->ees_ssid_cfg[index] + .ssid, + bg_scan_in->ees_ssid_cfg[index] + .max_len, + MLAN_MAX_SSID_LENGTH); tlv += sizeof(MrvlIEtypesHeader_t) + - tlv_ssid->header.len; + tlv_ssid->header.len; cmd_size += sizeof(MrvlIEtypesHeader_t) + tlv_ssid->header.len; @@ -6016,51 +5968,45 @@ wlan_cmd_bgscan_config(IN mlan_private *pmpriv, /* Fill Wildcard SSID settings */ pwildcard_ssid_tlv = (MrvlIEtypes_WildCardSsIdParamSet_t - *)tlv; + *)tlv; pwildcard_ssid_tlv->header.type = - wlan_cpu_to_le16 - (TLV_TYPE_WILDCARDSSID); - pwildcard_ssid_tlv->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_WildCardSsIdParamSet_t) - - - sizeof - (MrvlIEtypesHeader_t)); + wlan_cpu_to_le16( + TLV_TYPE_WILDCARDSSID); + pwildcard_ssid_tlv->header + .len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_WildCardSsIdParamSet_t) - + sizeof(MrvlIEtypesHeader_t)); pwildcard_ssid_tlv->max_ssid_length = MLAN_MAX_SSID_LENGTH; tlv += sizeof(MrvlIEtypesHeader_t) + - sizeof(pwildcard_ssid_tlv-> - max_ssid_length); + sizeof(pwildcard_ssid_tlv + ->max_ssid_length); cmd_size += sizeof(MrvlIEtypesHeader_t) + - sizeof(pwildcard_ssid_tlv-> - max_ssid_length); + sizeof(pwildcard_ssid_tlv + ->max_ssid_length); } /* Fill Cipher settings */ tlv_ees_cipher = (MrvlIEtypes_Cipher_t *)tlv; tlv_ees_cipher->header.type = wlan_cpu_to_le16(TLV_TYPE_CIPHER); - tlv_ees_cipher->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_Cipher_t) - - - sizeof - (MrvlIEtypesHeader_t)); + tlv_ees_cipher->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_Cipher_t) - + sizeof(MrvlIEtypesHeader_t)); tlv_ees_cipher->pair_cipher = - bg_scan_in->ees_ssid_cfg[index]. - pair_cipher; + bg_scan_in->ees_ssid_cfg[index] + .pair_cipher; tlv_ees_cipher->group_cipher = - bg_scan_in->ees_ssid_cfg[index]. - group_cipher; + bg_scan_in->ees_ssid_cfg[index] + .group_cipher; tlv += sizeof(MrvlIEtypes_Cipher_t); cmd_size += sizeof(MrvlIEtypes_Cipher_t); } } } - if (memcmp - (pmadapter, bg_scan_in->random_mac, zero_mac, - MLAN_MAC_ADDR_LENGTH)) { + if (memcmp(pmadapter, bg_scan_in->random_mac, zero_mac, + MLAN_MAC_ADDR_LENGTH)) { MrvlIEtypes_MacAddr_t *randomMacParam = (MrvlIEtypes_MacAddr_t *)tlv; memset(pmadapter, randomMacParam, 0, @@ -6090,10 +6036,9 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ret_bgscan_config(IN mlan_private *pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_bgscan_config(IN mlan_private *pmpriv, + 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 = @@ -6106,7 +6051,7 @@ wlan_ret_bgscan_config(IN mlan_private *pmpriv, 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) && + 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; @@ -6131,10 +6076,9 @@ wlan_ret_bgscan_config(IN mlan_private *pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ret_802_11_bgscan_query(IN mlan_private *pmpriv, - 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) { mlan_ds_scan *pscan = MNULL; mlan_adapter *pmadapter = pmpriv->adapter; @@ -6152,9 +6096,8 @@ wlan_ret_802_11_bgscan_query(IN mlan_private *pmpriv, pscan->param.scan_resp.num_in_chan_stats = pmadapter->num_in_chan_stats; - pioctl_buf->data_read_written = sizeof(mlan_scan_resp) + - MLAN_SUB_COMMAND_SIZE; - + pioctl_buf->data_read_written = + sizeof(mlan_scan_resp) + MLAN_SUB_COMMAND_SIZE; } LEAVE(); return MLAN_STATUS_SUCCESS; @@ -6170,9 +6113,8 @@ wlan_ret_802_11_bgscan_query(IN mlan_private *pmpriv, * * @return index in BSSID list or < 0 if error */ -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) +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) { mlan_adapter *pmadapter = pmpriv->adapter; t_s32 net = -1, j; @@ -6190,16 +6132,15 @@ wlan_find_ssid_in_list(IN mlan_private *pmpriv, 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) && + 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)) + !wlan_is_band_compatible( + pmpriv->config_bands, + pmadapter->pscan_table[i].bss_band)) continue; switch (mode) { @@ -6208,13 +6149,13 @@ wlan_find_ssid_in_list(IN mlan_private *pmpriv, j = wlan_is_network_compatible(pmpriv, i, mode); if (j >= 0) { - if (SCAN_RSSI - (pmadapter->pscan_table[i].rssi) > + if (SCAN_RSSI(pmadapter->pscan_table[i] + .rssi) > best_rssi) { - best_rssi = - SCAN_RSSI(pmadapter-> - pscan_table - [i].rssi); + best_rssi = SCAN_RSSI( + pmadapter + ->pscan_table[i] + .rssi); net = i; } } else { @@ -6225,15 +6166,15 @@ wlan_find_ssid_in_list(IN mlan_private *pmpriv, 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 + * 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); + best_rssi = SCAN_RSSI( + pmadapter->pscan_table[i].rssi); net = i; } break; @@ -6254,8 +6195,8 @@ wlan_find_ssid_in_list(IN mlan_private *pmpriv, * * @return index in BSSID list or < 0 if error */ -t_s32 -wlan_find_bssid_in_list(IN mlan_private *pmpriv, IN t_u8 *bssid, IN t_u32 mode) +t_s32 wlan_find_bssid_in_list(IN mlan_private *pmpriv, IN t_u8 *bssid, + IN t_u32 mode) { mlan_adapter *pmadapter = pmpriv->adapter; t_s32 net = -1; @@ -6279,13 +6220,12 @@ wlan_find_bssid_in_list(IN mlan_private *pmpriv, IN t_u8 *bssid, IN t_u32 mode) * 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 (!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)) + !wlan_is_band_compatible( + pmpriv->config_bands, + pmadapter->pscan_table[i].bss_band)) continue; switch (mode) { case MLAN_BSS_MODE_INFRA: @@ -6313,9 +6253,8 @@ wlan_find_bssid_in_list(IN mlan_private *pmpriv, IN t_u8 *bssid, IN t_u32 mode) * * @return 0--ssid is same, otherwise is different */ -t_s32 -wlan_ssid_cmp(IN pmlan_adapter pmadapter, - IN mlan_802_11_ssid *ssid1, IN mlan_802_11_ssid *ssid2) +t_s32 wlan_ssid_cmp(IN pmlan_adapter pmadapter, IN mlan_802_11_ssid *ssid1, + IN mlan_802_11_ssid *ssid2) { ENTER(); @@ -6341,9 +6280,8 @@ wlan_ssid_cmp(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS--success, otherwise--fail */ -mlan_status -wlan_find_best_network(IN mlan_private *pmpriv, - OUT mlan_ssid_bssid *preq_ssid_bssid) +mlan_status wlan_find_best_network(IN mlan_private *pmpriv, + OUT mlan_ssid_bssid *preq_ssid_bssid) { mlan_adapter *pmadapter = pmpriv->adapter; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -6383,7 +6321,8 @@ wlan_find_best_network(IN mlan_private *pmpriv, goto done; } - PRINTM(MINFO, "Best network found = [%s], " + PRINTM(MINFO, + "Best network found = [%s], " "[" MACSTR "]\n", preq_ssid_bssid->ssid.ssid, MAC2STR(preq_ssid_bssid->bssid)); @@ -6401,9 +6340,9 @@ done: * * @return MLAN_STATUS_SUCCESS--success, otherwise--fail */ -mlan_status -wlan_scan_specific_ssid(IN mlan_private *pmpriv, - IN t_void *pioctl_buf, IN mlan_802_11_ssid *preq_ssid) +mlan_status wlan_scan_specific_ssid(IN mlan_private *pmpriv, + 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; @@ -6460,8 +6399,7 @@ done: * * @return N/A */ -t_void -wlan_save_curr_bcn(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; @@ -6473,10 +6411,8 @@ wlan_save_curr_bcn(IN mlan_private *pmpriv) /* 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))) { - + (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); @@ -6519,8 +6455,7 @@ wlan_save_curr_bcn(IN mlan_private *pmpriv) * * @return N/A */ -t_void -wlan_free_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; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sdio.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sdio.c index 10792d61a03c..c22887bc896b 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sdio.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sdio.c @@ -55,8 +55,7 @@ Change log: * @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) +static mlan_status wlan_sdio_init_ioport(mlan_adapter *pmadapter) { t_u32 reg; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -87,27 +86,28 @@ wlan_sdio_init_ioport(mlan_adapter *pmadapter) /* 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); + 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); + 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; } #if defined(SD8977) || defined(SD8978) - if (IS_SD8977(pmadapter->card_type) || IS_SD8978(pmadapter->card_type)) { + if (IS_SD8977(pmadapter->card_type) || + IS_SD8978(pmadapter->card_type)) { if ((pmadapter->init_para.int_mode == INT_MODE_GPIO) && (pmadapter->init_para.gpio_pin == GPIO_INT_NEW_MODE)) { PRINTM(MMSG, "Enable GPIO-1 int mode\n"); @@ -118,9 +118,8 @@ wlan_sdio_init_ioport(mlan_adapter *pmadapter) } #endif /* Set Host interrupt reset to read to clear */ - if (MLAN_STATUS_SUCCESS == - pcb->moal_read_reg(pmadapter->pmoal_handle, host_int_rsr_reg, - ®)) { + 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 { @@ -129,9 +128,9 @@ wlan_sdio_init_ioport(mlan_adapter *pmadapter) } /* Dnld/Upld ready set to auto reset */ - if (MLAN_STATUS_SUCCESS == - pcb->moal_read_reg(pmadapter->pmoal_handle, card_misc_cfg_reg, - ®)) { + 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 { @@ -146,12 +145,13 @@ wlan_sdio_init_ioport(mlan_adapter *pmadapter) * @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 pmbuf A pointer to mlan_buffer (pmbuf->data_len should include + * SDIO header) * @param port Port * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_write_data_sync(mlan_adapter *pmadapter, mlan_buffer *pmbuf, t_u32 port) +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; @@ -192,8 +192,7 @@ exit: * @param pport A pointer to port number * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_get_rd_port(mlan_adapter *pmadapter, t_u8 *pport) +static mlan_status wlan_get_rd_port(mlan_adapter *pmadapter, t_u8 *pport) { t_u32 rd_bitmap = pmadapter->pcard_sd->mp_rd_bitmap; const mlan_sdio_card_reg *reg = pmadapter->pcard_sd->reg; @@ -208,8 +207,8 @@ wlan_get_rd_port(mlan_adapter *pmadapter, t_u8 *pport) return MLAN_STATUS_FAILURE; } - if (pmadapter->pcard_sd-> - mp_rd_bitmap & (1 << pmadapter->pcard_sd->curr_rd_port)) { + if (pmadapter->pcard_sd->mp_rd_bitmap & + (1 << pmadapter->pcard_sd->curr_rd_port)) { pmadapter->pcard_sd->mp_rd_bitmap &= (t_u32)(~(1 << pmadapter->pcard_sd->curr_rd_port)); *pport = pmadapter->pcard_sd->curr_rd_port; @@ -222,8 +221,8 @@ wlan_get_rd_port(mlan_adapter *pmadapter, t_u8 *pport) return MLAN_STATUS_FAILURE; } - PRINTM(MIF_D, "port=%d mp_rd_bitmap=0x%08x -> 0x%08x\n", - *pport, rd_bitmap, pmadapter->pcard_sd->mp_rd_bitmap); + PRINTM(MIF_D, "port=%d mp_rd_bitmap=0x%08x -> 0x%08x\n", *pport, + rd_bitmap, pmadapter->pcard_sd->mp_rd_bitmap); LEAVE(); return MLAN_STATUS_SUCCESS; @@ -236,8 +235,7 @@ wlan_get_rd_port(mlan_adapter *pmadapter, t_u8 *pport) * @param pport A pointer to port number * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_get_wr_port_data(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->pcard_sd->mp_wr_bitmap; const mlan_sdio_card_reg *reg = pmadapter->pcard_sd->reg; @@ -253,8 +251,8 @@ wlan_get_wr_port_data(mlan_adapter *pmadapter, t_u8 *pport) return MLAN_STATUS_RESOURCE; } - if (pmadapter->pcard_sd-> - mp_wr_bitmap & (1 << pmadapter->pcard_sd->curr_wr_port)) { + if (pmadapter->pcard_sd->mp_wr_bitmap & + (1 << pmadapter->pcard_sd->curr_wr_port)) { pmadapter->pcard_sd->mp_wr_bitmap &= (t_u32)(~(1 << pmadapter->pcard_sd->curr_wr_port)); *pport = pmadapter->pcard_sd->curr_wr_port; @@ -267,8 +265,8 @@ wlan_get_wr_port_data(mlan_adapter *pmadapter, t_u8 *pport) return MLAN_STATUS_RESOURCE; } - PRINTM(MIF_D, "port=%d mp_wr_bitmap=0x%08x -> 0x%08x\n", - *pport, wr_bitmap, pmadapter->pcard_sd->mp_wr_bitmap); + PRINTM(MIF_D, "port=%d mp_wr_bitmap=0x%08x -> 0x%08x\n", *pport, + wr_bitmap, pmadapter->pcard_sd->mp_wr_bitmap); LEAVE(); return MLAN_STATUS_SUCCESS; } @@ -280,8 +278,8 @@ wlan_get_wr_port_data(mlan_adapter *pmadapter, t_u8 *pport) * @param bits the bit mask * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_sdio_poll_card_status(mlan_adapter *pmadapter, t_u8 bits) +static mlan_status wlan_sdio_poll_card_status(mlan_adapter *pmadapter, + t_u8 bits) { pmlan_callbacks pcb = &pmadapter->callbacks; t_u32 tries; @@ -315,23 +313,22 @@ wlan_sdio_poll_card_status(mlan_adapter *pmadapter, t_u8 bits) * @param dat A pointer to keep returned data * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_sdio_read_fw_status(mlan_adapter *pmadapter, t_u16 *dat) +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, - pmadapter->pcard_sd->reg-> - status_reg_0, &fws0)) { + if (MLAN_STATUS_SUCCESS != + pcb->moal_read_reg(pmadapter->pmoal_handle, + pmadapter->pcard_sd->reg->status_reg_0, &fws0)) { LEAVE(); return MLAN_STATUS_FAILURE; } - if (MLAN_STATUS_SUCCESS != pcb->moal_read_reg(pmadapter->pmoal_handle, - pmadapter->pcard_sd->reg-> - status_reg_1, &fws1)) { + if (MLAN_STATUS_SUCCESS != + pcb->moal_read_reg(pmadapter->pmoal_handle, + pmadapter->pcard_sd->reg->status_reg_1, &fws1)) { LEAVE(); return MLAN_STATUS_FAILURE; } @@ -348,8 +345,8 @@ wlan_sdio_read_fw_status(mlan_adapter *pmadapter, t_u16 *dat) * @param dat A pointer to keep returned data * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_sdio_read_fw_dnld_offset(mlan_adapter *pmadapter, t_u32 *dat) +static mlan_status wlan_sdio_read_fw_dnld_offset(mlan_adapter *pmadapter, + t_u32 *dat) { pmlan_callbacks pcb = &pmadapter->callbacks; const mlan_sdio_card_reg *reg = pmadapter->pcard_sd->reg; @@ -400,8 +397,8 @@ wlan_sdio_read_fw_dnld_offset(mlan_adapter *pmadapter, t_u32 *dat) *dat = (t_u32)(((fw_dnld_offset_3 & 0xff) << 24) | ((fw_dnld_offset_2 & 0xff) << 16) | - ((fw_dnld_offset_1 & 0xff) << 8) | (fw_dnld_offset_0 & - 0xff)); + ((fw_dnld_offset_1 & 0xff) << 8) | + (fw_dnld_offset_0 & 0xff)); done: LEAVE(); @@ -415,8 +412,8 @@ done: * @param dat A pointer to keep returned data * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_sdio_read_fw_dnld_status(mlan_adapter *pmadapter, t_u16 *dat) +static mlan_status wlan_sdio_read_fw_dnld_status(mlan_adapter *pmadapter, + t_u16 *dat) { pmlan_callbacks pcb = &pmadapter->callbacks; const mlan_sdio_card_reg *reg = pmadapter->pcard_sd->reg; @@ -459,8 +456,8 @@ done: * @param mask the interrupt mask * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_sdio_disable_host_int_mask(pmlan_adapter pmadapter, t_u8 mask) +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; @@ -468,10 +465,10 @@ wlan_sdio_disable_host_int_mask(pmlan_adapter pmadapter, t_u8 mask) ENTER(); /* Read back the host_int_mask register */ - if (MLAN_STATUS_SUCCESS != pcb->moal_read_reg(pmadapter->pmoal_handle, - pmadapter->pcard_sd->reg-> - host_int_mask_reg, - &host_int_mask)) { + if (MLAN_STATUS_SUCCESS != + pcb->moal_read_reg(pmadapter->pmoal_handle, + pmadapter->pcard_sd->reg->host_int_mask_reg, + &host_int_mask)) { LEAVE(); return MLAN_STATUS_FAILURE; } @@ -479,10 +476,10 @@ wlan_sdio_disable_host_int_mask(pmlan_adapter pmadapter, t_u8 mask) /* 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, - pmadapter->pcard_sd-> - reg->host_int_mask_reg, - host_int_mask)) { + if (MLAN_STATUS_SUCCESS != + pcb->moal_write_reg(pmadapter->pmoal_handle, + pmadapter->pcard_sd->reg->host_int_mask_reg, + host_int_mask)) { PRINTM(MWARN, "Disable host interrupt failed\n"); LEAVE(); return MLAN_STATUS_FAILURE; @@ -499,18 +496,18 @@ wlan_sdio_disable_host_int_mask(pmlan_adapter pmadapter, t_u8 mask) * @param mask the interrupt mask * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_sdio_enable_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; ENTER(); /* Simply write the mask to the register */ - if (MLAN_STATUS_SUCCESS != pcb->moal_write_reg(pmadapter->pmoal_handle, - pmadapter->pcard_sd-> - reg->host_int_mask_reg, - mask)) { + if (MLAN_STATUS_SUCCESS != + pcb->moal_write_reg(pmadapter->pmoal_handle, + pmadapter->pcard_sd->reg->host_int_mask_reg, + mask)) { PRINTM(MWARN, "Enable host interrupt failed\n"); LEAVE(); return MLAN_STATUS_FAILURE; @@ -531,10 +528,9 @@ wlan_sdio_enable_host_int_mask(pmlan_adapter pmadapter, t_u8 mask) * @param ioport the SDIO ioport * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) +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) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -581,8 +577,8 @@ wlan_sdio_card_to_host(mlan_adapter *pmadapter, 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)); + *type = wlan_le16_to_cpu( + *(t_u16 *)(pmbuf->pbuf + pmbuf->data_offset + 2)); exit: LEAVE(); @@ -598,8 +594,8 @@ exit: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_sdio_prog_fw_w_helper(IN pmlan_adapter pmadapter, t_u8 *fw, t_u32 fw_len) +static mlan_status wlan_sdio_prog_fw_w_helper(IN pmlan_adapter pmadapter, + t_u8 *fw, t_u32 fw_len) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -654,8 +650,10 @@ wlan_sdio_prog_fw_w_helper(IN pmlan_adapter pmadapter, t_u8 *fw, t_u32 fw_len) ret = pcb->moal_read_reg(pmadapter->pmoal_handle, rev_id_reg, &revision_id); if (ret != MLAN_STATUS_SUCCESS) { - PRINTM(MERROR, "Card Revision register read failed:" - "card_revision_reg=0x%x\n", rev_id_reg); + PRINTM(MERROR, + "Card Revision register read failed:" + "card_revision_reg=0x%x\n", + rev_id_reg); goto done; } /* Skyhawk A0, need to check both CRC and MIC error */ @@ -669,10 +667,10 @@ wlan_sdio_prog_fw_w_helper(IN pmlan_adapter pmadapter, t_u8 *fw, t_u32 fw_len) #endif /* 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); + /* 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", @@ -688,7 +686,8 @@ wlan_sdio_prog_fw_w_helper(IN pmlan_adapter pmadapter, t_u8 *fw, t_u32 fw_len) ret = pcb->moal_read_reg(pmadapter->pmoal_handle, read_base_0_reg, &base0); if (ret != MLAN_STATUS_SUCCESS) { - PRINTM(MERROR, "Dev BASE0 register read failed:" + PRINTM(MERROR, + "Dev BASE0 register read failed:" " base0=0x%04X(%d). Terminating download\n", base0, base0); goto done; @@ -696,7 +695,8 @@ wlan_sdio_prog_fw_w_helper(IN pmlan_adapter pmadapter, t_u8 *fw, t_u32 fw_len) ret = pcb->moal_read_reg(pmadapter->pmoal_handle, read_base_1_reg, &base1); if (ret != MLAN_STATUS_SUCCESS) { - PRINTM(MERROR, "Dev BASE1 register read failed:" + PRINTM(MERROR, + "Dev BASE1 register read failed:" " base1=0x%04X(%d). Terminating download\n", base1, base1); goto done; @@ -728,17 +728,18 @@ wlan_sdio_prog_fw_w_helper(IN pmlan_adapter pmadapter, t_u8 *fw, t_u32 fw_len) /* New fw download process, check CRC and MIC error */ if (check_fw_status) { /* Get offset from fw dnld offset Register */ - ret = wlan_sdio_read_fw_dnld_offset(pmadapter, - &fw_dnld_offset); + ret = wlan_sdio_read_fw_dnld_offset( + pmadapter, &fw_dnld_offset); if (ret != MLAN_STATUS_SUCCESS) { PRINTM(MFATAL, "WLAN: FW download with helper read fw dnld offset failed @ %d\n", offset); goto done; } - /* Get CRC MIC error from fw dnld status Register */ - ret = wlan_sdio_read_fw_dnld_status(pmadapter, - &fw_dnld_status); + /* Get CRC MIC error from fw dnld status + * Register */ + ret = wlan_sdio_read_fw_dnld_status( + pmadapter, &fw_dnld_status); if (ret != MLAN_STATUS_SUCCESS) { PRINTM(MFATAL, "WLAN: FW download with helper read fw dnld status failed @ %d\n", @@ -760,7 +761,8 @@ wlan_sdio_prog_fw_w_helper(IN pmlan_adapter pmadapter, t_u8 *fw, t_u32 fw_len) PRINTM(MERROR, "WLAN: FW CRC error indicated by the helper:" - " len = 0x%04X, txlen = %d\n", len, txlen); + " len = 0x%04X, txlen = %d\n", + len, txlen); len &= ~MBIT(0); if (fw_dnld_status & (MBIT(6) | MBIT(7))) { offset = 0; @@ -787,9 +789,8 @@ wlan_sdio_prog_fw_w_helper(IN pmlan_adapter pmadapter, t_u8 *fw, t_u32 fw_len) txlen = firmwarelen - offset; PRINTM(MINFO, "."); - tx_blocks = - (txlen + MLAN_SDIO_BLOCK_SIZE_FW_DNLD - - 1) / MLAN_SDIO_BLOCK_SIZE_FW_DNLD; + tx_blocks = (txlen + MLAN_SDIO_BLOCK_SIZE_FW_DNLD - 1) / + MLAN_SDIO_BLOCK_SIZE_FW_DNLD; /* Copy payload to buffer */ if (firmware) @@ -811,10 +812,9 @@ wlan_sdio_prog_fw_w_helper(IN pmlan_adapter pmadapter, t_u8 *fw, t_u32 fw_len) 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) != + 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"); } @@ -843,8 +843,7 @@ done: * @param pmadapter A pointer to mlan_adapter structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_disable_sdio_host_int(pmlan_adapter pmadapter) +static mlan_status wlan_disable_sdio_host_int(pmlan_adapter pmadapter) { mlan_status ret; @@ -864,9 +863,9 @@ wlan_disable_sdio_host_int(pmlan_adapter pmadapter) * @param lock_flag flag for spin_lock. * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_decode_rx_packet(mlan_adapter *pmadapter, mlan_buffer *pmbuf, - t_u32 upld_typ, t_u8 lock_flag) +static mlan_status wlan_decode_rx_packet(mlan_adapter *pmadapter, + mlan_buffer *pmbuf, t_u32 upld_typ, + t_u8 lock_flag) { t_u8 *cmd_buf; t_u32 event; @@ -880,22 +879,18 @@ wlan_decode_rx_packet(mlan_adapter *pmadapter, mlan_buffer *pmbuf, if (pmadapter->rx_work_flag) { pmbuf->buf_type = MLAN_BUF_TYPE_SPA_DATA; if (lock_flag) - pmadapter->callbacks.moal_spin_lock(pmadapter-> - pmoal_handle, - pmadapter-> - rx_data_queue. - plock); + pmadapter->callbacks.moal_spin_lock( + pmadapter->pmoal_handle, + pmadapter->rx_data_queue.plock); util_enqueue_list_tail(pmadapter->pmoal_handle, &pmadapter->rx_data_queue, (pmlan_linked_list)pmbuf, MNULL, MNULL); pmadapter->rx_pkts_queued++; if (lock_flag) - pmadapter->callbacks. - moal_spin_unlock(pmadapter-> - pmoal_handle, - pmadapter-> - rx_data_queue.plock); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, + pmadapter->rx_data_queue.plock); } else { wlan_decode_spa_buffer(pmadapter, pmbuf->pbuf + pmbuf->data_offset, @@ -917,22 +912,18 @@ wlan_decode_rx_packet(mlan_adapter *pmadapter, mlan_buffer *pmbuf, pmbuf->data_offset += SDIO_INTF_HEADER_LEN; if (pmadapter->rx_work_flag) { if (lock_flag) - pmadapter->callbacks.moal_spin_lock(pmadapter-> - pmoal_handle, - pmadapter-> - rx_data_queue. - plock); + pmadapter->callbacks.moal_spin_lock( + pmadapter->pmoal_handle, + pmadapter->rx_data_queue.plock); util_enqueue_list_tail(pmadapter->pmoal_handle, &pmadapter->rx_data_queue, (pmlan_linked_list)pmbuf, MNULL, MNULL); pmadapter->rx_pkts_queued++; if (lock_flag) - pmadapter->callbacks. - moal_spin_unlock(pmadapter-> - pmoal_handle, - pmadapter-> - rx_data_queue.plock); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, + pmadapter->rx_data_queue.plock); } else { wlan_handle_rx_packet(pmadapter, pmbuf); } @@ -945,19 +936,17 @@ wlan_decode_rx_packet(mlan_adapter *pmadapter, mlan_buffer *pmbuf, if (!pmadapter->curr_cmd) { cmd_buf = pmadapter->upld_buf; if (pmadapter->ps_state == PS_STATE_SLEEP_CFM) { - wlan_process_sleep_confirm_resp(pmadapter, - pmbuf->pbuf + - pmbuf-> - data_offset + - SDIO_INTF_HEADER_LEN, - pmadapter-> - upld_len - - SDIO_INTF_HEADER_LEN); + wlan_process_sleep_confirm_resp( + pmadapter, + pmbuf->pbuf + pmbuf->data_offset + + SDIO_INTF_HEADER_LEN, + pmadapter->upld_len - + SDIO_INTF_HEADER_LEN); } pmadapter->upld_len -= SDIO_INTF_HEADER_LEN; memcpy_ext(pmadapter, cmd_buf, pmbuf->pbuf + pmbuf->data_offset + - SDIO_INTF_HEADER_LEN, + SDIO_INTF_HEADER_LEN, pmadapter->upld_len - SDIO_INTF_HEADER_LEN, MRVDRV_SIZE_OF_CMD_BUFFER); wlan_free_mlan_buffer(pmadapter, pmbuf); @@ -987,7 +976,7 @@ wlan_decode_rx_packet(mlan_adapter *pmadapter, mlan_buffer *pmbuf, MAX_EVENT_SIZE)) { memcpy_ext(pmadapter, pmadapter->event_body, pmbuf->pbuf + pmbuf->data_offset + - MLAN_EVENT_HEADER_LEN, + MLAN_EVENT_HEADER_LEN, pmadapter->upld_len - MLAN_EVENT_HEADER_LEN, MAX_EVENT_SIZE); } @@ -1018,8 +1007,7 @@ wlan_decode_rx_packet(mlan_adapter *pmadapter, mlan_buffer *pmbuf, * @param pmadapter A pointer to mlan_adapter structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_receive_single_packet(mlan_adapter *pmadapter) +mlan_status wlan_receive_single_packet(mlan_adapter *pmadapter) { mlan_buffer *pmbuf; t_u8 port; @@ -1031,12 +1019,10 @@ wlan_receive_single_packet(mlan_adapter *pmadapter) pmbuf = pmadapter->pcard_sd->mpa_rx.mbuf_arr[0]; port = pmadapter->pcard_sd->mpa_rx.start_port; rx_len = pmadapter->pcard_sd->mpa_rx.len_arr[0]; - if (MLAN_STATUS_SUCCESS != wlan_sdio_card_to_host(pmadapter, &pkt_type, - (t_u32 *)&pmadapter-> - upld_len, pmbuf, - rx_len, - pmadapter->pcard_sd-> - ioport + port)) { + if (MLAN_STATUS_SUCCESS != + wlan_sdio_card_to_host(pmadapter, &pkt_type, + (t_u32 *)&pmadapter->upld_len, pmbuf, rx_len, + pmadapter->pcard_sd->ioport + port)) { ret = MLAN_STATUS_FAILURE; goto done; } @@ -1064,8 +1050,7 @@ done: * @param pmadapter A pointer to mlan_adapter structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_receive_mp_aggr_buf(mlan_adapter *pmadapter) +mlan_status wlan_receive_mp_aggr_buf(mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -1094,9 +1079,9 @@ wlan_receive_mp_aggr_buf(mlan_adapter *pmadapter) pind++) { pmadapter->pcard_sd->mpa_rx.mbuf_arr[pind]->data_len = pmadapter->pcard_sd->mpa_rx.len_arr[pind]; - wlan_link_buf_to_aggr(&mbuf_aggr, - pmadapter->pcard_sd->mpa_rx. - mbuf_arr[pind]); + wlan_link_buf_to_aggr( + &mbuf_aggr, + pmadapter->pcard_sd->mpa_rx.mbuf_arr[pind]); } } else { mbuf_aggr.pbuf = (t_u8 *)pmadapter->pcard_sd->mpa_rx.buf; @@ -1105,10 +1090,9 @@ wlan_receive_mp_aggr_buf(mlan_adapter *pmadapter) port_count = bitcount(pmadapter->pcard_sd->mpa_rx.ports) - 1; /* port_count = pmadapter->mpa_rx.pkt_cnt - 1; */ - cmd53_port = - (pmadapter->pcard_sd-> - ioport | SDIO_MPA_ADDR_BASE | (port_count << 8)) - + pmadapter->pcard_sd->mpa_rx.start_port; + cmd53_port = (pmadapter->pcard_sd->ioport | SDIO_MPA_ADDR_BASE | + (port_count << 8)) + + pmadapter->pcard_sd->mpa_rx.start_port; do { ret = pcb->moal_read_data_sync(pmadapter->pmoal_handle, &mbuf_aggr, cmd53_port, 0); @@ -1130,24 +1114,21 @@ wlan_receive_mp_aggr_buf(mlan_adapter *pmadapter) } } while (ret == MLAN_STATUS_FAILURE); if (pmadapter->rx_work_flag) - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - pmadapter->rx_data_queue. - plock); + pmadapter->callbacks.moal_spin_lock( + pmadapter->pmoal_handle, + pmadapter->rx_data_queue.plock); if (!pmadapter->pcard_sd->mpa_rx.buf && pmadapter->pcard_sd->mpa_rx.pkt_cnt > 1) { for (pind = 0; pind < pmadapter->pcard_sd->mpa_rx.pkt_cnt; pind++) { mbuf_deaggr = pmadapter->pcard_sd->mpa_rx.mbuf_arr[pind]; - pkt_len = - wlan_le16_to_cpu(*(t_u16 *) - (mbuf_deaggr->pbuf + - mbuf_deaggr->data_offset)); - pkt_type = - wlan_le16_to_cpu(*(t_u16 *) - (mbuf_deaggr->pbuf + - mbuf_deaggr->data_offset + - 2)); + pkt_len = wlan_le16_to_cpu( + *(t_u16 *)(mbuf_deaggr->pbuf + + mbuf_deaggr->data_offset)); + pkt_type = wlan_le16_to_cpu( + *(t_u16 *)(mbuf_deaggr->pbuf + + mbuf_deaggr->data_offset + 2)); pmadapter->upld_len = pkt_len; wlan_decode_rx_packet(pmadapter, mbuf_deaggr, pkt_type, MFALSE); @@ -1162,7 +1143,6 @@ wlan_receive_mp_aggr_buf(mlan_adapter *pmadapter) for (pind = 0; pind < pmadapter->pcard_sd->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]); @@ -1179,8 +1159,8 @@ wlan_receive_mp_aggr_buf(mlan_adapter *pmadapter) pmadapter->pcard_sd->mpa_rx.len_arr[pind])) { memcpy_ext(pmadapter, mbuf_deaggr->pbuf + - mbuf_deaggr->data_offset, curr_ptr, - pkt_len, pkt_len); + mbuf_deaggr->data_offset, + curr_ptr, pkt_len, pkt_len); pmadapter->upld_len = pkt_len; /* Process de-aggr packet */ wlan_decode_rx_packet(pmadapter, mbuf_deaggr, @@ -1189,19 +1169,19 @@ wlan_receive_mp_aggr_buf(mlan_adapter *pmadapter) PRINTM(MERROR, "Wrong aggr packet: type=%d, len=%d, max_len=%d\n", pkt_type, pkt_len, - pmadapter->pcard_sd->mpa_rx. - len_arr[pind]); + pmadapter->pcard_sd->mpa_rx + .len_arr[pind]); wlan_free_mlan_buffer(pmadapter, mbuf_deaggr); } curr_ptr += pmadapter->pcard_sd->mpa_rx.len_arr[pind]; } } if (pmadapter->rx_work_flag) - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - pmadapter->rx_data_queue. - plock); - pmadapter->pcard_sd->mpa_rx_count[pmadapter->pcard_sd->mpa_rx.pkt_cnt - - 1]++; + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, + pmadapter->rx_data_queue.plock); + pmadapter->pcard_sd + ->mpa_rx_count[pmadapter->pcard_sd->mpa_rx.pkt_cnt - 1]++; MP_RX_AGGR_BUF_RESET(pmadapter); done: return ret; @@ -1216,9 +1196,9 @@ done: * @param rx_len Length of received packet * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_sdio_card_to_host_mp_aggr(mlan_adapter *pmadapter, mlan_buffer - *pmbuf, t_u8 port, t_u16 rx_len) +static mlan_status wlan_sdio_card_to_host_mp_aggr(mlan_adapter *pmadapter, + mlan_buffer *pmbuf, t_u8 port, + t_u16 rx_len) { mlan_status ret = MLAN_STATUS_SUCCESS; t_s32 f_do_rx_aggr = 0; @@ -1271,7 +1251,6 @@ wlan_sdio_card_to_host_mp_aggr(mlan_adapter *pmadapter, mlan_buffer } else { f_do_rx_cur = 1; } - } if (f_aggr_cur) { @@ -1280,8 +1259,7 @@ wlan_sdio_card_to_host_mp_aggr(mlan_adapter *pmadapter, mlan_buffer MP_RX_AGGR_SETUP(pmadapter, pmbuf, port, rx_len); if (MP_RX_AGGR_PKT_LIMIT_REACHED(pmadapter) || - MP_RX_AGGR_PORT_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 */ @@ -1291,7 +1269,8 @@ wlan_sdio_card_to_host_mp_aggr(mlan_adapter *pmadapter, mlan_buffer if (f_do_rx_aggr) { /* do aggr RX now */ - if (MLAN_STATUS_SUCCESS != wlan_receive_mp_aggr_buf(pmadapter)) { + if (MLAN_STATUS_SUCCESS != + wlan_receive_mp_aggr_buf(pmadapter)) { ret = MLAN_STATUS_FAILURE; goto done; } @@ -1302,16 +1281,15 @@ rx_curr_single: rx_len); if (MLAN_STATUS_SUCCESS != - wlan_sdio_card_to_host(pmadapter, &pkt_type, - (t_u32 *)&pmadapter->upld_len, pmbuf, - rx_len, - pmadapter->pcard_sd->ioport + - port)) { + wlan_sdio_card_to_host( + pmadapter, &pkt_type, (t_u32 *)&pmadapter->upld_len, + pmbuf, rx_len, + pmadapter->pcard_sd->ioport + port)) { ret = MLAN_STATUS_FAILURE; goto done; } - if (pkt_type != MLAN_TYPE_DATA - && pkt_type != MLAN_TYPE_SPA_DATA) { + if (pkt_type != MLAN_TYPE_DATA && + pkt_type != MLAN_TYPE_SPA_DATA) { PRINTM(MERROR, "receive a wrong pkt from DATA PORT: type=%d, len=%dd\n", pkt_type, pmbuf->data_len); @@ -1336,9 +1314,9 @@ done: for (pind = 0; pind < pmadapter->pcard_sd->mpa_rx.pkt_cnt; pind++) { - wlan_free_mlan_buffer(pmadapter, - pmadapter->pcard_sd-> - mpa_rx.mbuf_arr[pind]); + wlan_free_mlan_buffer( + pmadapter, pmadapter->pcard_sd->mpa_rx + .mbuf_arr[pind]); } MP_RX_AGGR_BUF_RESET(pmadapter); } @@ -1352,7 +1330,6 @@ done: LEAVE(); return ret; - } /** @@ -1361,8 +1338,7 @@ done: * @param pmadapter A pointer to mlan_adapter structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_send_mp_aggr_buf(mlan_adapter *pmadapter) +mlan_status wlan_send_mp_aggr_buf(mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 cmd53_port = 0; @@ -1377,8 +1353,10 @@ wlan_send_mp_aggr_buf(mlan_adapter *pmadapter) LEAVE(); return ret; } - PRINTM(MINFO, "host_2_card_mp_aggr: Send aggregation buffer." - "%d %d\n", pmadapter->pcard_sd->mpa_tx.start_port, + PRINTM(MINFO, + "host_2_card_mp_aggr: Send aggregation buffer." + "%d %d\n", + pmadapter->pcard_sd->mpa_tx.start_port, pmadapter->pcard_sd->mpa_tx.ports); memset(pmadapter, &mbuf_aggr, 0, sizeof(mlan_buffer)); @@ -1389,67 +1367,64 @@ wlan_send_mp_aggr_buf(mlan_adapter *pmadapter) mbuf_aggr.pnext = mbuf_aggr.pprev = &mbuf_aggr; mbuf_aggr.use_count = 0; for (i = 0; i < pmadapter->pcard_sd->mpa_tx.pkt_cnt; i++) - wlan_link_buf_to_aggr(&mbuf_aggr, - pmadapter->pcard_sd->mpa_tx. - mbuf_arr[i]); + wlan_link_buf_to_aggr( + &mbuf_aggr, + pmadapter->pcard_sd->mpa_tx.mbuf_arr[i]); } else { mbuf_aggr.pbuf = (t_u8 *)pmadapter->pcard_sd->mpa_tx.buf; mbuf_aggr.data_len = pmadapter->pcard_sd->mpa_tx.buf_len; } port_count = bitcount(pmadapter->pcard_sd->mpa_tx.ports) - 1; - cmd53_port = - (pmadapter->pcard_sd-> - ioport | SDIO_MPA_ADDR_BASE | (port_count << 8)) - + pmadapter->pcard_sd->mpa_tx.start_port; + cmd53_port = (pmadapter->pcard_sd->ioport | SDIO_MPA_ADDR_BASE | + (port_count << 8)) + + pmadapter->pcard_sd->mpa_tx.start_port; if (pmadapter->pcard_sd->mpa_tx.pkt_cnt == 1) - cmd53_port = - pmadapter->pcard_sd->ioport + - pmadapter->pcard_sd->mpa_tx.start_port; - /** only one packet */ + cmd53_port = pmadapter->pcard_sd->ioport + + pmadapter->pcard_sd->mpa_tx.start_port; + /** only one packet */ if (!pmadapter->pcard_sd->mpa_tx.buf && pmadapter->pcard_sd->mpa_tx.pkt_cnt == 1) - ret = wlan_write_data_sync(pmadapter, - pmadapter->pcard_sd->mpa_tx. - mbuf_arr[0], cmd53_port); + ret = wlan_write_data_sync( + pmadapter, pmadapter->pcard_sd->mpa_tx.mbuf_arr[0], + cmd53_port); else ret = wlan_write_data_sync(pmadapter, &mbuf_aggr, cmd53_port); if (!pmadapter->pcard_sd->mpa_tx.buf) { - /** free mlan buffer */ + /** free mlan buffer */ for (i = 0; i < pmadapter->pcard_sd->mpa_tx.pkt_cnt; i++) { - wlan_write_data_complete(pmadapter, - pmadapter->pcard_sd->mpa_tx. - mbuf_arr[i], - MLAN_STATUS_SUCCESS); + wlan_write_data_complete( + pmadapter, + pmadapter->pcard_sd->mpa_tx.mbuf_arr[i], + MLAN_STATUS_SUCCESS); } } - if (! - (pmadapter->pcard_sd-> - mp_wr_bitmap & (1 << pmadapter->pcard_sd->curr_wr_port)) -&& (pmadapter->pcard_sd->mpa_tx.pkt_cnt < mp_aggr_pkt_limit)) + if (!(pmadapter->pcard_sd->mp_wr_bitmap & + (1 << pmadapter->pcard_sd->curr_wr_port)) && + (pmadapter->pcard_sd->mpa_tx.pkt_cnt < mp_aggr_pkt_limit)) pmadapter->pcard_sd->mpa_sent_no_ports++; - pmadapter->pcard_sd->mpa_tx_count[pmadapter->pcard_sd->mpa_tx.pkt_cnt - - 1]++; - pmadapter->pcard_sd->last_mp_wr_bitmap[pmadapter->pcard_sd-> - last_mp_index] = + pmadapter->pcard_sd + ->mpa_tx_count[pmadapter->pcard_sd->mpa_tx.pkt_cnt - 1]++; + pmadapter->pcard_sd + ->last_mp_wr_bitmap[pmadapter->pcard_sd->last_mp_index] = pmadapter->pcard_sd->mp_wr_bitmap; - pmadapter->pcard_sd->last_mp_wr_ports[pmadapter->pcard_sd-> - last_mp_index] = cmd53_port; - pmadapter->pcard_sd->last_mp_wr_len[pmadapter->pcard_sd-> - last_mp_index] = + pmadapter->pcard_sd + ->last_mp_wr_ports[pmadapter->pcard_sd->last_mp_index] = + cmd53_port; + pmadapter->pcard_sd->last_mp_wr_len[pmadapter->pcard_sd->last_mp_index] = pmadapter->pcard_sd->mpa_tx.buf_len; - pmadapter->pcard_sd->last_curr_wr_port[pmadapter->pcard_sd-> - last_mp_index] = + pmadapter->pcard_sd + ->last_curr_wr_port[pmadapter->pcard_sd->last_mp_index] = pmadapter->pcard_sd->curr_wr_port; - memcpy_ext(pmadapter, - (t_u8 *)&pmadapter->pcard_sd->last_mp_wr_info[pmadapter-> - pcard_sd-> - last_mp_index * - mp_aggr_pkt_limit], - (t_u8 *)pmadapter->pcard_sd->mpa_tx.mp_wr_info, - mp_aggr_pkt_limit * sizeof(t_u16), - mp_aggr_pkt_limit * sizeof(t_u16)); + memcpy_ext( + pmadapter, + (t_u8 *)&pmadapter->pcard_sd + ->last_mp_wr_info[pmadapter->pcard_sd->last_mp_index * + mp_aggr_pkt_limit], + (t_u8 *)pmadapter->pcard_sd->mpa_tx.mp_wr_info, + mp_aggr_pkt_limit * sizeof(t_u16), + mp_aggr_pkt_limit * sizeof(t_u16)); pmadapter->pcard_sd->last_mp_index++; if (pmadapter->pcard_sd->last_mp_index >= SDIO_MP_DBG_NUM) pmadapter->pcard_sd->last_mp_index = 0; @@ -1467,9 +1442,9 @@ wlan_send_mp_aggr_buf(mlan_adapter *pmadapter) * @param next_pkt_len Length of next packet used for multiport aggregation * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_host_to_card_mp_aggr(mlan_adapter *pmadapter, mlan_buffer *mbuf, t_u8 port, - t_u32 next_pkt_len) +static mlan_status wlan_host_to_card_mp_aggr(mlan_adapter *pmadapter, + mlan_buffer *mbuf, t_u8 port, + t_u32 next_pkt_len) { mlan_status ret = MLAN_STATUS_SUCCESS; t_s32 f_send_aggr_buf = 0; @@ -1496,38 +1471,35 @@ wlan_host_to_card_mp_aggr(mlan_adapter *pmadapter, mlan_buffer *mbuf, t_u8 port, PRINTM(MINFO, "host_2_card_mp_aggr: More packets in Queue.\n"); if (MP_TX_AGGR_IN_PROGRESS(pmadapter)) { - if (MP_TX_AGGR_BUF_HAS_ROOM - (pmadapter, mbuf, mbuf->data_len)) { + if (MP_TX_AGGR_BUF_HAS_ROOM(pmadapter, mbuf, + mbuf->data_len)) { f_precopy_cur_buf = 1; - if (! - (pmadapter->pcard_sd-> - mp_wr_bitmap & (1 << pmadapter->pcard_sd-> - curr_wr_port)) || - !MP_TX_AGGR_BUF_HAS_ROOM(pmadapter, mbuf, - mbuf->data_len + - next_pkt_len)) { + if (!(pmadapter->pcard_sd->mp_wr_bitmap & + (1 + << pmadapter->pcard_sd->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 (! - (pmadapter->pcard_sd-> - mp_wr_bitmap & (1 << pmadapter->pcard_sd-> - curr_wr_port))) { + if (!(pmadapter->pcard_sd->mp_wr_bitmap & + (1 + << pmadapter->pcard_sd->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->pcard_sd-> - mp_wr_bitmap & (1 << pmadapter->pcard_sd-> - curr_wr_port))) + if (MP_TX_AGGR_BUF_HAS_ROOM(pmadapter, mbuf, + mbuf->data_len) && + (pmadapter->pcard_sd->mp_wr_bitmap & + (1 << pmadapter->pcard_sd->curr_wr_port))) f_precopy_cur_buf = 1; else f_send_cur_buf = 1; @@ -1541,8 +1513,8 @@ wlan_host_to_card_mp_aggr(mlan_adapter *pmadapter, mlan_buffer *mbuf, t_u8 port, /* some packs in Aggr buf already */ f_send_aggr_buf = 1; - if (MP_TX_AGGR_BUF_HAS_ROOM - (pmadapter, mbuf, mbuf->data_len)) { + 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 */ @@ -1557,18 +1529,19 @@ wlan_host_to_card_mp_aggr(mlan_adapter *pmadapter, mlan_buffer *mbuf, t_u8 port, if (f_precopy_cur_buf) { PRINTM(MINFO, "host_2_card_mp_aggr: Precopy current buffer\n"); if (pmadapter->pcard_sd->mpa_buf) - memcpy_ext(pmadapter, pmadapter->pcard_sd->mpa_buf + - (pmadapter->pcard_sd->last_mp_index * - mp_aggr_pkt_limit + - pmadapter->pcard_sd->mpa_tx.pkt_cnt) * - MLAN_SDIO_BLOCK_SIZE, - mbuf->pbuf + mbuf->data_offset, - MLAN_SDIO_BLOCK_SIZE, MLAN_SDIO_BLOCK_SIZE); + memcpy_ext( + pmadapter, + pmadapter->pcard_sd->mpa_buf + + (pmadapter->pcard_sd->last_mp_index * + mp_aggr_pkt_limit + + pmadapter->pcard_sd->mpa_tx.pkt_cnt) * + MLAN_SDIO_BLOCK_SIZE, + mbuf->pbuf + mbuf->data_offset, + MLAN_SDIO_BLOCK_SIZE, MLAN_SDIO_BLOCK_SIZE); if (!pmadapter->pcard_sd->mpa_tx.buf) { MP_TX_AGGR_BUF_PUT_SG(pmadapter, mbuf, port); aggr_sg = MTRUE; } else { - MP_TX_AGGR_BUF_PUT(pmadapter, mbuf, port); } if (MP_TX_AGGR_PKT_LIMIT_REACHED(pmadapter)) { @@ -1588,38 +1561,36 @@ tx_curr_single: port); ret = wlan_write_data_sync(pmadapter, mbuf, pmadapter->pcard_sd->ioport + port); - if (! - (pmadapter->pcard_sd-> - mp_wr_bitmap & (1 << pmadapter->pcard_sd->curr_wr_port))) + if (!(pmadapter->pcard_sd->mp_wr_bitmap & + (1 << pmadapter->pcard_sd->curr_wr_port))) pmadapter->pcard_sd->mpa_sent_no_ports++; - pmadapter->pcard_sd->last_mp_wr_bitmap[pmadapter->pcard_sd-> - last_mp_index] = + pmadapter->pcard_sd + ->last_mp_wr_bitmap[pmadapter->pcard_sd->last_mp_index] = pmadapter->pcard_sd->mp_wr_bitmap; - pmadapter->pcard_sd->last_mp_wr_ports[pmadapter->pcard_sd-> - last_mp_index] = + pmadapter->pcard_sd + ->last_mp_wr_ports[pmadapter->pcard_sd->last_mp_index] = pmadapter->pcard_sd->ioport + port; - pmadapter->pcard_sd->last_mp_wr_len[pmadapter->pcard_sd-> - last_mp_index] = + pmadapter->pcard_sd + ->last_mp_wr_len[pmadapter->pcard_sd->last_mp_index] = mbuf->data_len; memset(pmadapter, - (t_u8 *)&pmadapter->pcard_sd->last_mp_wr_info[pmadapter-> - pcard_sd-> - last_mp_index - * - mp_aggr_pkt_limit], + (t_u8 *)&pmadapter->pcard_sd->last_mp_wr_info + [pmadapter->pcard_sd->last_mp_index * + mp_aggr_pkt_limit], 0, sizeof(t_u16) * mp_aggr_pkt_limit); - pmadapter->pcard_sd->last_mp_wr_info[pmadapter->pcard_sd-> - last_mp_index * - mp_aggr_pkt_limit] = + pmadapter->pcard_sd + ->last_mp_wr_info[pmadapter->pcard_sd->last_mp_index * + mp_aggr_pkt_limit] = *(t_u16 *)(mbuf->pbuf + mbuf->data_offset); - pmadapter->pcard_sd->last_curr_wr_port[pmadapter->pcard_sd-> - last_mp_index] = + pmadapter->pcard_sd + ->last_curr_wr_port[pmadapter->pcard_sd->last_mp_index] = pmadapter->pcard_sd->curr_wr_port; if (pmadapter->pcard_sd->mpa_buf) memcpy_ext(pmadapter, pmadapter->pcard_sd->mpa_buf + - (pmadapter->pcard_sd->last_mp_index * - mp_aggr_pkt_limit * MLAN_SDIO_BLOCK_SIZE), + (pmadapter->pcard_sd->last_mp_index * + mp_aggr_pkt_limit * + MLAN_SDIO_BLOCK_SIZE), mbuf->pbuf + mbuf->data_offset, MLAN_SDIO_BLOCK_SIZE, MLAN_SDIO_BLOCK_SIZE); pmadapter->pcard_sd->last_mp_index++; @@ -1630,13 +1601,15 @@ tx_curr_single: if (f_postcopy_cur_buf) { PRINTM(MINFO, "host_2_card_mp_aggr: Postcopy current buffer\n"); if (pmadapter->pcard_sd->mpa_buf) - memcpy_ext(pmadapter, pmadapter->pcard_sd->mpa_buf + - (pmadapter->pcard_sd->last_mp_index * - mp_aggr_pkt_limit + - pmadapter->pcard_sd->mpa_tx.pkt_cnt) * - MLAN_SDIO_BLOCK_SIZE, - mbuf->pbuf + mbuf->data_offset, - MLAN_SDIO_BLOCK_SIZE, MLAN_SDIO_BLOCK_SIZE); + memcpy_ext( + pmadapter, + pmadapter->pcard_sd->mpa_buf + + (pmadapter->pcard_sd->last_mp_index * + mp_aggr_pkt_limit + + pmadapter->pcard_sd->mpa_tx.pkt_cnt) * + MLAN_SDIO_BLOCK_SIZE, + mbuf->pbuf + mbuf->data_offset, + MLAN_SDIO_BLOCK_SIZE, MLAN_SDIO_BLOCK_SIZE); if (!pmadapter->pcard_sd->mpa_tx.buf) { MP_TX_AGGR_BUF_PUT_SG(pmadapter, mbuf, port); aggr_sg = MTRUE; @@ -1665,8 +1638,7 @@ tx_curr_single: * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE * */ -mlan_status -wlan_sdio_check_winner_status(mlan_adapter *pmadapter, t_u32 *val) +mlan_status wlan_sdio_check_winner_status(mlan_adapter *pmadapter, t_u32 *val) { t_u32 winner = 0; pmlan_callbacks pcb; @@ -1676,9 +1648,9 @@ wlan_sdio_check_winner_status(mlan_adapter *pmadapter, t_u32 *val) pcb = &pmadapter->callbacks; - if (MLAN_STATUS_SUCCESS != - pcb->moal_read_reg(pmadapter->pmoal_handle, card_winner_check_reg, - &winner)) { + if (MLAN_STATUS_SUCCESS != pcb->moal_read_reg(pmadapter->pmoal_handle, + card_winner_check_reg, + &winner)) { LEAVE(); return MLAN_STATUS_FAILURE; } @@ -1696,8 +1668,7 @@ wlan_sdio_check_winner_status(mlan_adapter *pmadapter, t_u32 *val) * @param pollnum Maximum polling number * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_sdio_check_fw_status(mlan_adapter *pmadapter, t_u32 pollnum) +mlan_status wlan_sdio_check_fw_status(mlan_adapter *pmadapter, t_u32 pollnum) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u16 firmwarestat = 0; @@ -1738,8 +1709,7 @@ done: * @param pmadapter A pointer to mlan_adapter structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_enable_sdio_host_int(pmlan_adapter pmadapter) +mlan_status wlan_enable_sdio_host_int(pmlan_adapter pmadapter) { mlan_status ret; t_u8 mask = pmadapter->pcard_sd->reg->host_int_enable; @@ -1758,8 +1728,8 @@ wlan_enable_sdio_host_int(pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_sdio_dnld_fw(IN pmlan_adapter pmadapter, IN pmlan_fw_image pmfw) +mlan_status wlan_sdio_dnld_fw(IN pmlan_adapter pmadapter, + IN pmlan_fw_image pmfw) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 poll_num = 1; @@ -1767,13 +1737,13 @@ wlan_sdio_dnld_fw(IN pmlan_adapter pmadapter, IN pmlan_fw_image pmfw) ENTER(); -/*when using GPIO wakeup, don't run the below code. - *if using GPIO wakeup, host will do handshake with FW - *to check if FW wake up and pull up SDIO line, then reload driver. - *So when using GPIO wakeup, don't need driver to do check wakeup status again. - *when using SDIO interface wakeup, run the below code; - *if using SDIO interface wakeup, driver need to do check wakeup status with FW. - */ + /*when using GPIO wakeup, don't run the below code. + *if using GPIO wakeup, host will do handshake with FW + *to check if FW wake up and pull up SDIO line, then reload driver. + *So when using GPIO wakeup, don't need driver to do check wakeup status + *again. when using SDIO interface wakeup, run the below code; if using + *SDIO interface wakeup, driver need to do check wakeup status with FW. + */ /* Card specific probing */ ret = wlan_sdio_probe(pmadapter); @@ -1853,8 +1823,7 @@ done: * @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 wlan_sdio_probe(pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 sdio_ireg = 0; @@ -1888,8 +1857,7 @@ wlan_sdio_probe(pmlan_adapter pmadapter) * @param pmadapter A pointer to mlan_adapter structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_get_sdio_device(pmlan_adapter pmadapter) +mlan_status wlan_get_sdio_device(pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u16 card_type = pmadapter->card_type; @@ -1966,8 +1934,7 @@ wlan_get_sdio_device(pmlan_adapter pmadapter) * @param pmadapter A pointer to mlan_adapter structure * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_sdio_interrupt(t_u16 msg_id, pmlan_adapter pmadapter) +mlan_status wlan_sdio_interrupt(t_u16 msg_id, pmlan_adapter pmadapter) { pmlan_callbacks pcb = &pmadapter->callbacks; mlan_buffer mbuf; @@ -2030,9 +1997,8 @@ done: * @param rx_len Length of received packet * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_sdio_card_to_host_recovery(mlan_adapter *pmadapter, t_u8 port, - t_u16 rx_len) +static mlan_status wlan_sdio_card_to_host_recovery(mlan_adapter *pmadapter, + t_u8 port, t_u16 rx_len) { mlan_buffer mbuf; t_u32 pkt_type = 0; @@ -2049,12 +2015,10 @@ wlan_sdio_card_to_host_recovery(mlan_adapter *pmadapter, t_u8 port, mbuf.data_len = rx_len; PRINTM(MDATA, "Recovery: Try read 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, &mbuf, - rx_len, - pmadapter->pcard_sd-> - ioport + port)) { + if (MLAN_STATUS_SUCCESS != + wlan_sdio_card_to_host(pmadapter, &pkt_type, + (t_u32 *)&pmadapter->upld_len, &mbuf, rx_len, + pmadapter->pcard_sd->ioport + port)) { PRINTM(MERROR, "Recovery: Fail to do cmd53\n"); } if (pkt_type != MLAN_TYPE_DATA && pkt_type != MLAN_TYPE_SPA_DATA) { @@ -2064,7 +2028,7 @@ wlan_sdio_card_to_host_recovery(mlan_adapter *pmadapter, t_u8 port, goto done; } if (pkt_type == MLAN_TYPE_DATA) { - //TODO fill the hole in Rx reorder table + // TODO fill the hole in Rx reorder table PRINTM(MDATA, "Recovery: Drop Data packet\n"); pmadapter->dbg.num_pkt_dropped++; } else if (pkt_type == MLAN_TYPE_SPA_DATA) { @@ -2088,8 +2052,7 @@ done: * @param pmadapter A pointer to mlan_adapter structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_process_sdio_int_status(mlan_adapter *pmadapter) +mlan_status wlan_process_sdio_int_status(mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -2130,13 +2093,12 @@ wlan_process_sdio_int_status(mlan_adapter *pmadapter) if (sdio_ireg & UP_LD_CMD_PORT_HOST_INT_STATUS) { /* read the len of control packet */ - rx_len = ((t_u16)pmadapter->pcard_sd-> - mp_regs[cmd_rd_len_1]) << 8; + rx_len = ((t_u16)pmadapter->pcard_sd->mp_regs[cmd_rd_len_1]) + << 8; rx_len |= (t_u16)pmadapter->pcard_sd->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; + rx_blocks = (rx_len + MLAN_SDIO_BLOCK_SIZE - 1) / + MLAN_SDIO_BLOCK_SIZE; if (rx_len <= SDIO_INTF_HEADER_LEN || (rx_blocks * MLAN_SDIO_BLOCK_SIZE) > ALLOC_BUF_SIZE) { PRINTM(MERROR, "invalid rx_len=%d\n", rx_len); @@ -2155,11 +2117,10 @@ wlan_process_sdio_int_status(mlan_adapter *pmadapter) /* 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->pcard_sd-> - ioport | CMD_PORT_SLCT)) { + wlan_sdio_card_to_host( + pmadapter, &upld_typ, (t_u32 *)&pmadapter->upld_len, + pmbuf, rx_len, + pmadapter->pcard_sd->ioport | CMD_PORT_SLCT)) { pmadapter->dbg.num_cmdevt_card_to_host_failure++; PRINTM(MERROR, "Card-to-host cmd failed: int status=0x%x\n", @@ -2172,7 +2133,7 @@ wlan_process_sdio_int_status(mlan_adapter *pmadapter) if ((upld_typ != MLAN_TYPE_CMD) && (upld_typ != MLAN_TYPE_EVENT)) PRINTM(MERROR, - "receive a wrong packet from CMD PORT. type =0x%d\n", + "receive a wrong packet from CMD PORT. type =0x%x\n", upld_typ); wlan_decode_rx_packet(pmadapter, pmbuf, upld_typ, MFALSE); @@ -2185,23 +2146,22 @@ wlan_process_sdio_int_status(mlan_adapter *pmadapter) } if (sdio_ireg & DN_LD_HOST_INT_STATUS) { - if (pmadapter->pcard_sd->mp_wr_bitmap & pmadapter->pcard_sd-> - mp_data_port_mask) + if (pmadapter->pcard_sd->mp_wr_bitmap & + pmadapter->pcard_sd->mp_data_port_mask) pmadapter->pcard_sd->mp_invalid_update++; pmadapter->pcard_sd->mp_wr_bitmap = (t_u32)pmadapter->pcard_sd->mp_regs[reg->wr_bitmap_l]; pmadapter->pcard_sd->mp_wr_bitmap |= - ((t_u32)pmadapter->pcard_sd-> - mp_regs[reg->wr_bitmap_u]) << 8; + ((t_u32)pmadapter->pcard_sd->mp_regs[reg->wr_bitmap_u]) + << 8; pmadapter->pcard_sd->mp_wr_bitmap |= - ((t_u32)pmadapter->pcard_sd-> - mp_regs[reg->wr_bitmap_1l]) << 16; + ((t_u32)pmadapter->pcard_sd->mp_regs[reg->wr_bitmap_1l]) + << 16; pmadapter->pcard_sd->mp_wr_bitmap |= - ((t_u32)pmadapter->pcard_sd-> - mp_regs[reg->wr_bitmap_1u]) << 24; - bit_count = - bitcount(pmadapter->pcard_sd->mp_wr_bitmap & pmadapter-> - pcard_sd->mp_data_port_mask); + ((t_u32)pmadapter->pcard_sd->mp_regs[reg->wr_bitmap_1u]) + << 24; + bit_count = bitcount(pmadapter->pcard_sd->mp_wr_bitmap & + pmadapter->pcard_sd->mp_data_port_mask); if (bit_count) { pmadapter->pcard_sd->mp_update[bit_count - 1]++; if (pmadapter->pcard_sd->mp_update[bit_count - 1] == @@ -2216,8 +2176,8 @@ wlan_process_sdio_int_status(mlan_adapter *pmadapter) PRINTM(MINTR, "DNLD: wr_bitmap=0x%08x\n", pmadapter->pcard_sd->mp_wr_bitmap); if (pmadapter->data_sent && - (pmadapter->pcard_sd-> - mp_wr_bitmap & (1 << pmadapter->pcard_sd->curr_wr_port))) { + (pmadapter->pcard_sd->mp_wr_bitmap & + (1 << pmadapter->pcard_sd->curr_wr_port))) { PRINTM(MINFO, " <--- Tx DONE Interrupt --->\n"); pmadapter->data_sent = MFALSE; } @@ -2227,14 +2187,14 @@ wlan_process_sdio_int_status(mlan_adapter *pmadapter) pmadapter->pcard_sd->mp_rd_bitmap = (t_u32)pmadapter->pcard_sd->mp_regs[reg->rd_bitmap_l]; pmadapter->pcard_sd->mp_rd_bitmap |= - ((t_u32)pmadapter->pcard_sd-> - mp_regs[reg->rd_bitmap_u]) << 8; + ((t_u32)pmadapter->pcard_sd->mp_regs[reg->rd_bitmap_u]) + << 8; pmadapter->pcard_sd->mp_rd_bitmap |= - ((t_u32)pmadapter->pcard_sd-> - mp_regs[reg->rd_bitmap_1l]) << 16; + ((t_u32)pmadapter->pcard_sd->mp_regs[reg->rd_bitmap_1l]) + << 16; pmadapter->pcard_sd->mp_rd_bitmap |= - ((t_u32)pmadapter->pcard_sd-> - mp_regs[reg->rd_bitmap_1u]) << 24; + ((t_u32)pmadapter->pcard_sd->mp_regs[reg->rd_bitmap_1u]) + << 24; PRINTM(MINTR, "UPLD: rd_bitmap=0x%08x\n", pmadapter->pcard_sd->mp_rd_bitmap); @@ -2247,39 +2207,37 @@ wlan_process_sdio_int_status(mlan_adapter *pmadapter) } len_reg_l = rd_len_p0_l + (port << 1); len_reg_u = rd_len_p0_u + (port << 1); - rx_len = ((t_u16)pmadapter->pcard_sd-> - mp_regs[len_reg_u]) << 8; + rx_len = + ((t_u16)pmadapter->pcard_sd->mp_regs[len_reg_u]) + << 8; rx_len |= (t_u16)pmadapter->pcard_sd->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; + rx_blocks = (rx_len + MLAN_SDIO_BLOCK_SIZE - 1) / + MLAN_SDIO_BLOCK_SIZE; if (rx_len <= SDIO_INTF_HEADER_LEN || (rx_blocks * MLAN_SDIO_BLOCK_SIZE) > - pmadapter->pcard_sd->mpa_rx.buf_size) { + pmadapter->pcard_sd->mpa_rx.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); if (rx_len > MRVDRV_ETH_RX_PACKET_BUFFER_SIZE) - pmbuf = wlan_alloc_mlan_buffer(pmadapter, - rx_len, 0, - MOAL_MALLOC_BUFFER); + pmbuf = wlan_alloc_mlan_buffer( + pmadapter, rx_len, 0, + MOAL_MALLOC_BUFFER); else - pmbuf = wlan_alloc_mlan_buffer(pmadapter, - rx_len, - MLAN_RX_HEADER_LEN, - MOAL_ALLOC_MLAN_BUFFER); + 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"); pmadapter->dbg.num_alloc_buffer_failure++; if (MLAN_STATUS_SUCCESS == - wlan_sdio_card_to_host_recovery(pmadapter, - port, - rx_len)) + wlan_sdio_card_to_host_recovery( + pmadapter, port, rx_len)) continue; ret = MLAN_STATUS_FAILURE; goto done; @@ -2288,7 +2246,6 @@ wlan_process_sdio_int_status(mlan_adapter *pmadapter) if (MLAN_STATUS_SUCCESS != wlan_sdio_card_to_host_mp_aggr(pmadapter, pmbuf, port, rx_len)) { - pmadapter->dbg.num_rx_card_to_host_failure++; PRINTM(MERROR, @@ -2297,7 +2254,6 @@ wlan_process_sdio_int_status(mlan_adapter *pmadapter) ret = MLAN_STATUS_FAILURE; goto term_cmd53; } - } /* We might receive data/sleep_cfm at the same time */ /* reset data_receive flag to avoid ps_state change */ @@ -2337,13 +2293,13 @@ done: * * @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) + * @param pmbuf A pointer to mlan_buffer (pmbuf->data_len should include + * SDIO header) * @param tx_param A pointer to mlan_tx_param * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_sdio_host_to_card(mlan_adapter *pmadapter, t_u8 type, mlan_buffer *pmbuf, - mlan_tx_param *tx_param) +mlan_status wlan_sdio_host_to_card(mlan_adapter *pmadapter, t_u8 type, + mlan_buffer *pmbuf, mlan_tx_param *tx_param) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 buf_block_len; @@ -2385,7 +2341,7 @@ wlan_sdio_host_to_card(mlan_adapter *pmadapter, t_u8 type, mlan_buffer *pmbuf, ret = wlan_host_to_card_mp_aggr(pmadapter, pmbuf, port, 0); } else { - /*Type must be MLAN_TYPE_CMD */ + /*Type must be MLAN_TYPE_CMD*/ pmadapter->cmd_sent = MTRUE; if (pmbuf->data_len <= SDIO_INTF_HEADER_LEN || pmbuf->data_len > WLAN_UPLD_SIZE) @@ -2406,10 +2362,8 @@ wlan_sdio_host_to_card(mlan_adapter *pmadapter, t_u8 type, mlan_buffer *pmbuf, pmadapter->data_sent = MFALSE; } else { if (type == MLAN_TYPE_DATA) { - if (! - (pmadapter->pcard_sd-> - mp_wr_bitmap & (1 << pmadapter->pcard_sd-> - curr_wr_port))) + if (!(pmadapter->pcard_sd->mp_wr_bitmap & + (1 << pmadapter->pcard_sd->curr_wr_port))) pmadapter->data_sent = MTRUE; else pmadapter->data_sent = MFALSE; @@ -2428,11 +2382,11 @@ exit: * @brief This function sends vdll 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 pmbuf A pointer to mlan_buffer (pmbuf->data_len should include + * SDIO header) * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_sdio_send_vdll(mlan_adapter *pmadapter, mlan_buffer *pmbuf) +mlan_status wlan_sdio_send_vdll(mlan_adapter *pmadapter, mlan_buffer *pmbuf) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 buf_block_len; @@ -2471,18 +2425,19 @@ wlan_sdio_send_vdll(mlan_adapter *pmadapter, mlan_buffer *pmbuf) * * @param pmpriv A pointer to mlan_private structure * @param type data or command - * @param pmbuf A pointer to mlan_buffer (pmbuf->data_len should include SDIO header) + * @param pmbuf A pointer to mlan_buffer (pmbuf->data_len should include + * SDIO header) * @param tx_param A pointer to mlan_tx_param * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_sdio_host_to_card_ext(pmlan_private pmpriv, t_u8 type, mlan_buffer *pmbuf, - mlan_tx_param *tx_param) +mlan_status wlan_sdio_host_to_card_ext(pmlan_private pmpriv, t_u8 type, + mlan_buffer *pmbuf, + mlan_tx_param *tx_param) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_adapter *pmadapter = pmpriv->adapter; -#if defined(FW_VDLL) && (defined(SD9098) || defined(SD9097)) +#if (defined(SD9098) || defined(SD9097)) if (type == MLAN_TYPE_VDLL) return wlan_sdio_send_vdll(pmadapter, pmbuf); #endif @@ -2504,8 +2459,7 @@ wlan_sdio_host_to_card_ext(pmlan_private pmpriv, t_u8 type, mlan_buffer *pmbuf, * * @return N/A */ -void -wlan_decode_spa_buffer(mlan_adapter *pmadapter, t_u8 *buf, t_u32 len) +void wlan_decode_spa_buffer(mlan_adapter *pmadapter, t_u8 *buf, t_u32 len) { int total_pkt_len; t_u8 block_num = 0; @@ -2523,7 +2477,8 @@ wlan_decode_spa_buffer(mlan_adapter *pmadapter, t_u8 *buf, t_u32 len) total_pkt_len); goto done; } - while (total_pkt_len >= (OFFSET_OF_SDIO_HEADER + SDIO_INTF_HEADER_LEN)) { + while (total_pkt_len >= + (OFFSET_OF_SDIO_HEADER + SDIO_INTF_HEADER_LEN)) { block_num = *(data + OFFSET_OF_BLOCK_NUMBER); block_size = pmadapter->pcard_sd->sdio_rx_block_size * block_num; @@ -2533,23 +2488,19 @@ wlan_decode_spa_buffer(mlan_adapter *pmadapter, t_u8 *buf, t_u32 len) block_num, total_pkt_len); break; } - pkt_len = - wlan_le16_to_cpu(*(t_u16 *) - (data + OFFSET_OF_SDIO_HEADER)); - pkt_type = - wlan_le16_to_cpu(*(t_u16 *) - (data + OFFSET_OF_SDIO_HEADER + 2)); + pkt_len = wlan_le16_to_cpu( + *(t_u16 *)(data + OFFSET_OF_SDIO_HEADER)); + pkt_type = wlan_le16_to_cpu( + *(t_u16 *)(data + OFFSET_OF_SDIO_HEADER + 2)); if ((pkt_len + OFFSET_OF_SDIO_HEADER) > block_size) { PRINTM(MERROR, "Error in pkt, pkt_len=%d, block_size=%d\n", pkt_len, block_size); break; } - mbuf_deaggr = - wlan_alloc_mlan_buffer(pmadapter, - pkt_len - SDIO_INTF_HEADER_LEN, - MLAN_RX_HEADER_LEN, - MOAL_ALLOC_MLAN_BUFFER); + mbuf_deaggr = wlan_alloc_mlan_buffer( + pmadapter, pkt_len - SDIO_INTF_HEADER_LEN, + MLAN_RX_HEADER_LEN, MOAL_ALLOC_MLAN_BUFFER); if (mbuf_deaggr == MNULL) { PRINTM(MERROR, "Error allocating daggr mlan_buffer\n"); break; @@ -2578,8 +2529,7 @@ done: * @param pmbuf A pointer to the SDIO mpa data * @return N/A */ -t_void -wlan_sdio_deaggr_rx_pkt(IN pmlan_adapter pmadapter, mlan_buffer *pmbuf) +t_void wlan_sdio_deaggr_rx_pkt(IN pmlan_adapter pmadapter, mlan_buffer *pmbuf) { if (pmbuf->buf_type == MLAN_BUF_TYPE_SPA_DATA) { wlan_decode_spa_buffer(pmadapter, @@ -2600,9 +2550,9 @@ wlan_sdio_deaggr_rx_pkt(IN pmlan_adapter pmadapter, mlan_buffer *pmbuf) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_alloc_sdio_mpa_buffers(IN mlan_adapter *pmadapter, - t_u32 mpa_tx_buf_size, t_u32 mpa_rx_buf_size) +mlan_status wlan_alloc_sdio_mpa_buffers(IN mlan_adapter *pmadapter, + t_u32 mpa_tx_buf_size, + t_u32 mpa_rx_buf_size) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -2613,11 +2563,11 @@ wlan_alloc_sdio_mpa_buffers(IN mlan_adapter *pmadapter, if ((pmadapter->pcard_sd->max_segs < mp_aggr_pkt_limit) || (pmadapter->pcard_sd->max_seg_size < pmadapter->pcard_sd->max_sp_tx_size)) { - ret = pcb->moal_malloc(pmadapter->pmoal_handle, - mpa_tx_buf_size + DMA_ALIGNMENT, - MLAN_MEM_DEF | MLAN_MEM_DMA, - (t_u8 **)&pmadapter->pcard_sd->mpa_tx. - head_ptr); + ret = pcb->moal_malloc( + pmadapter->pmoal_handle, + mpa_tx_buf_size + DMA_ALIGNMENT, + MLAN_MEM_DEF | MLAN_MEM_DMA, + (t_u8 **)&pmadapter->pcard_sd->mpa_tx.head_ptr); if (ret != MLAN_STATUS_SUCCESS || !pmadapter->pcard_sd->mpa_tx.head_ptr) { PRINTM(MERROR, @@ -2625,9 +2575,8 @@ wlan_alloc_sdio_mpa_buffers(IN mlan_adapter *pmadapter, ret = MLAN_STATUS_FAILURE; goto error; } - pmadapter->pcard_sd->mpa_tx.buf = - (t_u8 *)ALIGN_ADDR(pmadapter->pcard_sd->mpa_tx.head_ptr, - DMA_ALIGNMENT); + pmadapter->pcard_sd->mpa_tx.buf = (t_u8 *)ALIGN_ADDR( + pmadapter->pcard_sd->mpa_tx.head_ptr, DMA_ALIGNMENT); } else { PRINTM(MMSG, "wlan: Enable TX SG mode\n"); pmadapter->pcard_sd->mpa_tx.head_ptr = MNULL; @@ -2638,11 +2587,11 @@ wlan_alloc_sdio_mpa_buffers(IN mlan_adapter *pmadapter, if ((pmadapter->pcard_sd->max_segs < mp_aggr_pkt_limit) || (pmadapter->pcard_sd->max_seg_size < pmadapter->pcard_sd->max_sp_rx_size)) { - ret = pcb->moal_malloc(pmadapter->pmoal_handle, - mpa_rx_buf_size + DMA_ALIGNMENT, - MLAN_MEM_DEF | MLAN_MEM_DMA, - (t_u8 **)&pmadapter->pcard_sd->mpa_rx. - head_ptr); + ret = pcb->moal_malloc( + pmadapter->pmoal_handle, + mpa_rx_buf_size + DMA_ALIGNMENT, + MLAN_MEM_DEF | MLAN_MEM_DMA, + (t_u8 **)&pmadapter->pcard_sd->mpa_rx.head_ptr); if (ret != MLAN_STATUS_SUCCESS || !pmadapter->pcard_sd->mpa_rx.head_ptr) { PRINTM(MERROR, @@ -2650,9 +2599,8 @@ wlan_alloc_sdio_mpa_buffers(IN mlan_adapter *pmadapter, ret = MLAN_STATUS_FAILURE; goto error; } - pmadapter->pcard_sd->mpa_rx.buf = - (t_u8 *)ALIGN_ADDR(pmadapter->pcard_sd->mpa_rx.head_ptr, - DMA_ALIGNMENT); + pmadapter->pcard_sd->mpa_rx.buf = (t_u8 *)ALIGN_ADDR( + pmadapter->pcard_sd->mpa_rx.head_ptr, DMA_ALIGNMENT); } else { PRINTM(MMSG, "wlan: Enable RX SG mode\n"); pmadapter->pcard_sd->mpa_rx.head_ptr = MNULL; @@ -2674,8 +2622,7 @@ error: * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_free_sdio_mpa_buffers(IN mlan_adapter *pmadapter) +mlan_status wlan_free_sdio_mpa_buffers(IN mlan_adapter *pmadapter) { pmlan_callbacks pcb = &pmadapter->callbacks; @@ -2708,8 +2655,7 @@ wlan_free_sdio_mpa_buffers(IN mlan_adapter *pmadapter) * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_re_alloc_sdio_rx_mpa_buffer(IN mlan_adapter *pmadapter) +mlan_status wlan_re_alloc_sdio_rx_mpa_buffer(IN mlan_adapter *pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -2725,20 +2671,19 @@ wlan_re_alloc_sdio_rx_mpa_buffer(IN mlan_adapter *pmadapter) } if (pmadapter->pcard_sd->sdio_rx_aggr_enable) { mpa_rx_buf_size = MAX(mpa_rx_buf_size, SDIO_CMD53_MAX_SIZE); - /** reallocate rx buffer for recover when single port rx aggregation enabled */ + /** reallocate rx buffer for recover when single port rx + * aggregation enabled */ if (pmadapter->pcard_sd->rx_buffer) { pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *)pmadapter->pcard_sd->rx_buffer); pmadapter->pcard_sd->rx_buffer = MNULL; pmadapter->pcard_sd->rx_buf = MNULL; } - ret = pmadapter->callbacks.moal_malloc(pmadapter->pmoal_handle, - SDIO_CMD53_MAX_SIZE + - DMA_ALIGNMENT, - MLAN_MEM_DEF | - MLAN_MEM_DMA, - (t_u8 **)&pmadapter-> - pcard_sd->rx_buffer); + ret = pmadapter->callbacks.moal_malloc( + pmadapter->pmoal_handle, + SDIO_CMD53_MAX_SIZE + DMA_ALIGNMENT, + MLAN_MEM_DEF | MLAN_MEM_DMA, + (t_u8 **)&pmadapter->pcard_sd->rx_buffer); if (ret != MLAN_STATUS_SUCCESS || !pmadapter->pcard_sd->rx_buffer) { @@ -2746,18 +2691,17 @@ wlan_re_alloc_sdio_rx_mpa_buffer(IN mlan_adapter *pmadapter) ret = MLAN_STATUS_FAILURE; goto error; } - pmadapter->pcard_sd->rx_buf = - (t_u8 *)ALIGN_ADDR(pmadapter->pcard_sd->rx_buffer, - DMA_ALIGNMENT); + pmadapter->pcard_sd->rx_buf = (t_u8 *)ALIGN_ADDR( + pmadapter->pcard_sd->rx_buffer, DMA_ALIGNMENT); } if ((pmadapter->pcard_sd->max_segs < mp_aggr_pkt_limit) || (pmadapter->pcard_sd->max_seg_size < pmadapter->pcard_sd->max_sp_rx_size)) { - ret = pcb->moal_malloc(pmadapter->pmoal_handle, - mpa_rx_buf_size + DMA_ALIGNMENT, - MLAN_MEM_DEF | MLAN_MEM_DMA, - (t_u8 **)&pmadapter->pcard_sd->mpa_rx. - head_ptr); + ret = pcb->moal_malloc( + pmadapter->pmoal_handle, + mpa_rx_buf_size + DMA_ALIGNMENT, + MLAN_MEM_DEF | MLAN_MEM_DMA, + (t_u8 **)&pmadapter->pcard_sd->mpa_rx.head_ptr); if (ret != MLAN_STATUS_SUCCESS || !pmadapter->pcard_sd->mpa_rx.head_ptr) { PRINTM(MERROR, @@ -2765,9 +2709,8 @@ wlan_re_alloc_sdio_rx_mpa_buffer(IN mlan_adapter *pmadapter) ret = MLAN_STATUS_FAILURE; goto error; } - pmadapter->pcard_sd->mpa_rx.buf = - (t_u8 *)ALIGN_ADDR(pmadapter->pcard_sd->mpa_rx.head_ptr, - DMA_ALIGNMENT); + pmadapter->pcard_sd->mpa_rx.buf = (t_u8 *)ALIGN_ADDR( + pmadapter->pcard_sd->mpa_rx.head_ptr, DMA_ALIGNMENT); } else { PRINTM(MMSG, "wlan: Enable RX SG mode\n"); pmadapter->pcard_sd->mpa_rx.head_ptr = MNULL; @@ -2787,8 +2730,8 @@ error: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_pm_sdio_wakeup_card(IN pmlan_adapter pmadapter, IN t_u8 timeout) +mlan_status wlan_pm_sdio_wakeup_card(IN pmlan_adapter pmadapter, + IN t_u8 timeout) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 age_ts_usec; @@ -2801,10 +2744,9 @@ wlan_pm_sdio_wakeup_card(IN pmlan_adapter pmadapter, IN t_u8 timeout) &age_ts_usec); if (timeout) { - pmadapter->callbacks.moal_start_timer(pmadapter->pmoal_handle, - pmadapter-> - pwakeup_fw_timer, MFALSE, - MRVDRV_TIMER_3S); + pmadapter->callbacks.moal_start_timer( + pmadapter->pmoal_handle, pmadapter->pwakeup_fw_timer, + MFALSE, MRVDRV_TIMER_3S); pmadapter->wakeup_fw_timer_is_set = MTRUE; } @@ -2822,8 +2764,7 @@ wlan_pm_sdio_wakeup_card(IN pmlan_adapter pmadapter, IN t_u8 timeout) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_pm_sdio_reset_card(IN pmlan_adapter pmadapter) +mlan_status wlan_pm_sdio_reset_card(IN pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -2844,8 +2785,7 @@ wlan_pm_sdio_reset_card(IN pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_set_sdio_gpio_int(IN pmlan_private priv) +mlan_status wlan_set_sdio_gpio_int(IN pmlan_private priv) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_adapter pmadapter = MNULL; @@ -2895,10 +2835,9 @@ wlan_set_sdio_gpio_int(IN pmlan_private priv) * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -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) +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) { HostCmd_DS_SDIO_GPIO_INT_CONFIG *psdio_gpio_int = &cmd->params.sdio_gpio_int; @@ -2906,9 +2845,8 @@ wlan_cmd_sdio_gpio_int(pmlan_private pmpriv, 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); + 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)); @@ -2930,8 +2868,7 @@ wlan_cmd_sdio_gpio_int(pmlan_private pmpriv, return MLAN_STATUS_SUCCESS; } -mlan_status -wlan_reset_fw(pmlan_adapter pmadapter) +mlan_status wlan_reset_fw(pmlan_adapter pmadapter) { t_u32 tries = 0; t_u32 value = 1; @@ -2943,7 +2880,7 @@ wlan_reset_fw(pmlan_adapter pmadapter) ENTER(); wlan_pm_sdio_wakeup_card(pmadapter, MFALSE); - /** wait SOC fully wake up */ + /** wait SOC fully wake up */ for (tries = 0; tries < MAX_POLL_TRIES; ++tries) { if (MLAN_STATUS_SUCCESS == pcb->moal_write_reg(pmadapter->pmoal_handle, reset_reg, @@ -2958,14 +2895,14 @@ wlan_reset_fw(pmlan_adapter pmadapter) pcb->moal_udelay(pmadapter->pmoal_handle, 1000); } /* Write register to notify FW */ - if (MLAN_STATUS_FAILURE == - pcb->moal_write_reg(pmadapter->pmoal_handle, reset_reg, - reset_val)) { + if (MLAN_STATUS_FAILURE == pcb->moal_write_reg(pmadapter->pmoal_handle, + reset_reg, reset_val)) { PRINTM(MERROR, "Failed to write register.\n"); ret = MLAN_STATUS_FAILURE; goto done; } -#if defined(SD8997) || defined(SD8977) || defined(SD8987) || defined(SD9098) || defined(SD9097) || defined(SD8978) +#if defined(SD8997) || defined(SD8977) || defined(SD8987) || \ + defined(SD9098) || defined(SD9097) || defined(SD8978) if (MFALSE #ifdef SD8997 || IS_SD8997(pmadapter->card_type) @@ -2985,7 +2922,7 @@ wlan_reset_fw(pmlan_adapter pmadapter) #ifdef SD9097 || IS_SD9097(pmadapter->card_type) #endif - ) { + ) { pcb->moal_read_reg(pmadapter->pmoal_handle, HOST_TO_CARD_EVENT_REG, &value); pcb->moal_write_reg(pmadapter->pmoal_handle, @@ -3022,9 +2959,8 @@ done: * @param pmbuf A pointer to the mlan_buffer * @return N/A */ -mlan_status -wlan_sdio_data_evt_complete(IN pmlan_adapter pmadapter, mlan_buffer *pmbuf, - mlan_status status) +mlan_status wlan_sdio_data_evt_complete(IN pmlan_adapter pmadapter, + mlan_buffer *pmbuf, mlan_status status) { ENTER(); @@ -3041,8 +2977,8 @@ wlan_sdio_data_evt_complete(IN pmlan_adapter pmadapter, mlan_buffer *pmbuf, * @param pmbuf A pointer to the mlan_buffer * @return */ -mlan_status -wlan_sdio_handle_rx_packet(mlan_adapter *pmadapter, pmlan_buffer pmbuf) +mlan_status wlan_sdio_handle_rx_packet(mlan_adapter *pmadapter, + pmlan_buffer pmbuf) { ENTER(); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sdio.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sdio.h index 7aede61a3e1d..2b7bb755f9b2 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sdio.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sdio.h @@ -1,8 +1,8 @@ /** @file mlan_sdio.h - * - * @brief This file contains definitions for SDIO interface. - * driver. - * + * + * @brief This file contains definitions for SDIO interface. + * driver. + * * * Copyright 2014-2020 NXP * @@ -24,198 +24,204 @@ Change log: ****************************************************/ -#ifndef _MLAN_SDIO_H -#define _MLAN_SDIO_H +#ifndef _MLAN_SDIO_H +#define _MLAN_SDIO_H /** Block mode */ #ifndef BLOCK_MODE -#define BLOCK_MODE 1 +#define BLOCK_MODE 1 #endif /** Fixed address mode */ #ifndef FIXED_ADDRESS -#define FIXED_ADDRESS 0 +#define FIXED_ADDRESS 0 #endif /* Host Control Registers */ /** Host Control Registers : Host to Card Event */ -#define HOST_TO_CARD_EVENT_REG 0x00 +#define HOST_TO_CARD_EVENT_REG 0x00 /** Host Control Registers : Host terminates Command 53 */ -#define HOST_TERM_CMD53 (0x1U << 2) +#define HOST_TERM_CMD53 (0x1U << 2) /** Host Control Registers : Host without Command 53 finish host */ -#define HOST_WO_CMD53_FINISH_HOST (0x1U << 2) +#define HOST_WO_CMD53_FINISH_HOST (0x1U << 2) /** Host Control Registers : Host power up */ -#define HOST_POWER_UP (0x1U << 1) +#define HOST_POWER_UP (0x1U << 1) /** Host Control Registers : Host power down */ -#define HOST_POWER_DOWN (0x1U << 0) +#define HOST_POWER_DOWN (0x1U << 0) /** Host Control Registers : Upload host interrupt RSR */ -#define UP_LD_HOST_INT_RSR (0x1U) -#define HOST_INT_RSR_MASK 0xFF +#define UP_LD_HOST_INT_RSR (0x1U) +#define HOST_INT_RSR_MASK 0xFF /** Host Control Registers : Upload command port host interrupt status */ -#define UP_LD_CMD_PORT_HOST_INT_STATUS (0x40U) +#define UP_LD_CMD_PORT_HOST_INT_STATUS (0x40U) /** Host Control Registers : Download command port host interrupt status */ -#define DN_LD_CMD_PORT_HOST_INT_STATUS (0x80U) +#define DN_LD_CMD_PORT_HOST_INT_STATUS (0x80U) /** Host Control Registers : Upload host interrupt mask */ -#define UP_LD_HOST_INT_MASK (0x1U) +#define UP_LD_HOST_INT_MASK (0x1U) /** Host Control Registers : Download host interrupt mask */ -#define DN_LD_HOST_INT_MASK (0x2U) +#define DN_LD_HOST_INT_MASK (0x2U) /** Host Control Registers : Cmd port upload interrupt mask */ -#define CMD_PORT_UPLD_INT_MASK (0x1U << 6) +#define CMD_PORT_UPLD_INT_MASK (0x1U << 6) /** Host Control Registers : Cmd port download interrupt mask */ -#define CMD_PORT_DNLD_INT_MASK (0x1U << 7) +#define CMD_PORT_DNLD_INT_MASK (0x1U << 7) /** Enable Host interrupt mask */ -#define HIM_ENABLE (UP_LD_HOST_INT_MASK | \ - DN_LD_HOST_INT_MASK | \ - CMD_PORT_UPLD_INT_MASK | \ - CMD_PORT_DNLD_INT_MASK) +#define HIM_ENABLE \ + (UP_LD_HOST_INT_MASK | DN_LD_HOST_INT_MASK | CMD_PORT_UPLD_INT_MASK | \ + CMD_PORT_DNLD_INT_MASK) /** Disable Host interrupt mask */ -#define HIM_DISABLE 0xff +#define HIM_DISABLE 0xff /** Host Control Registers : Upload host interrupt status */ -#define UP_LD_HOST_INT_STATUS (0x1U) +#define UP_LD_HOST_INT_STATUS (0x1U) /** Host Control Registers : Download host interrupt status */ -#define DN_LD_HOST_INT_STATUS (0x2U) +#define DN_LD_HOST_INT_STATUS (0x2U) /** Host Control Registers : Download CRC error */ -#define DN_LD_CRC_ERR (0x1U << 2) +#define DN_LD_CRC_ERR (0x1U << 2) /** Host Control Registers : Upload restart */ -#define UP_LD_RESTART (0x1U << 1) +#define UP_LD_RESTART (0x1U << 1) /** Host Control Registers : Download restart */ -#define DN_LD_RESTART (0x1U << 0) +#define DN_LD_RESTART (0x1U << 0) /** Card Control Registers : Command port upload ready */ -#define UP_LD_CP_RDY (0x1U << 6) +#define UP_LD_CP_RDY (0x1U << 6) /** Card Control Registers : Command port download ready */ -#define DN_LD_CP_RDY (0x1U << 7) +#define DN_LD_CP_RDY (0x1U << 7) /** Card Control Registers : Card I/O ready */ -#define CARD_IO_READY (0x1U << 3) +#define CARD_IO_READY (0x1U << 3) /** Card Control Registers : CIS card ready */ -#define CIS_CARD_RDY (0x1U << 2) +#define CIS_CARD_RDY (0x1U << 2) /** Card Control Registers : Upload card ready */ -#define UP_LD_CARD_RDY (0x1U << 1) +#define UP_LD_CARD_RDY (0x1U << 1) /** Card Control Registers : Download card ready */ -#define DN_LD_CARD_RDY (0x1U << 0) +#define DN_LD_CARD_RDY (0x1U << 0) /** Card Control Registers : Host power interrupt mask */ -#define HOST_POWER_INT_MASK (0x1U << 3) +#define HOST_POWER_INT_MASK (0x1U << 3) /** Card Control Registers : Abort card interrupt mask */ -#define ABORT_CARD_INT_MASK (0x1U << 2) +#define ABORT_CARD_INT_MASK (0x1U << 2) /** Card Control Registers : Upload card interrupt mask */ -#define UP_LD_CARD_INT_MASK (0x1U << 1) +#define UP_LD_CARD_INT_MASK (0x1U << 1) /** Card Control Registers : Download card interrupt mask */ -#define DN_LD_CARD_INT_MASK (0x1U << 0) +#define DN_LD_CARD_INT_MASK (0x1U << 0) /** Card Control Registers : Power up interrupt */ -#define POWER_UP_INT (0x1U << 4) +#define POWER_UP_INT (0x1U << 4) /** Card Control Registers : Power down interrupt */ -#define POWER_DOWN_INT (0x1U << 3) +#define POWER_DOWN_INT (0x1U << 3) /** Card Control Registers : Power up RSR */ -#define POWER_UP_RSR (0x1U << 4) +#define POWER_UP_RSR (0x1U << 4) /** Card Control Registers : Power down RSR */ -#define POWER_DOWN_RSR (0x1U << 3) +#define POWER_DOWN_RSR (0x1U << 3) /** Card Control Registers : SD test BUS 0 */ -#define SD_TESTBUS0 (0x1U) +#define SD_TESTBUS0 (0x1U) /** Card Control Registers : SD test BUS 1 */ -#define SD_TESTBUS1 (0x1U) +#define SD_TESTBUS1 (0x1U) /** Card Control Registers : SD test BUS 2 */ -#define SD_TESTBUS2 (0x1U) +#define SD_TESTBUS2 (0x1U) /** Card Control Registers : SD test BUS 3 */ -#define SD_TESTBUS3 (0x1U) +#define SD_TESTBUS3 (0x1U) /** Port for registers */ -#define REG_PORT 0 +#define REG_PORT 0 /** Port for memory */ -#define MEM_PORT 0x10000 +#define MEM_PORT 0x10000 /** Card Control Registers : cmd53 new mode */ -#define CMD53_NEW_MODE (0x1U << 0) +#define CMD53_NEW_MODE (0x1U << 0) /** Card Control Registers : cmd53 tx len format 1 (0x10) */ -#define CMD53_TX_LEN_FORMAT_1 (0x1U << 4) +#define CMD53_TX_LEN_FORMAT_1 (0x1U << 4) /** Card Control Registers : cmd53 tx len format 2 (0x20)*/ -#define CMD53_TX_LEN_FORMAT_2 (0x1U << 5) +#define CMD53_TX_LEN_FORMAT_2 (0x1U << 5) /** Card Control Registers : cmd53 rx len format 1 (0x40) */ -#define CMD53_RX_LEN_FORMAT_1 (0x1U << 6) +#define CMD53_RX_LEN_FORMAT_1 (0x1U << 6) /** Card Control Registers : cmd53 rx len format 2 (0x80)*/ -#define CMD53_RX_LEN_FORMAT_2 (0x1U << 7) +#define CMD53_RX_LEN_FORMAT_2 (0x1U << 7) -#define CMD_PORT_RD_LEN_EN (0x1U << 2) +#define CMD_PORT_RD_LEN_EN (0x1U << 2) /* Card Control Registers : cmd port auto enable */ -#define CMD_PORT_AUTO_EN (0x1U << 0) +#define CMD_PORT_AUTO_EN (0x1U << 0) /* Command port */ -#define CMD_PORT_SLCT 0x8000 +#define CMD_PORT_SLCT 0x8000 /** Misc. Config Register : Auto Re-enable interrupts */ -#define AUTO_RE_ENABLE_INT MBIT(4) +#define AUTO_RE_ENABLE_INT MBIT(4) /** Enable GPIO-1 as a duplicated signal of interrupt as appear of SDIO_DAT1*/ -#define ENABLE_GPIO_1_INT_MODE 0x88 +#define ENABLE_GPIO_1_INT_MODE 0x88 /** Scratch reg 3 2 : Configure GPIO-1 INT*/ -#define SCRATCH_REG_32 0xEE +#define SCRATCH_REG_32 0xEE /** Event header Len*/ -#define MLAN_EVENT_HEADER_LEN 8 +#define MLAN_EVENT_HEADER_LEN 8 /** SDIO byte mode size */ -#define MAX_BYTE_MODE_SIZE 512 +#define MAX_BYTE_MODE_SIZE 512 /** The base address for packet with multiple ports aggregation */ -#define SDIO_MPA_ADDR_BASE 0x1000 +#define SDIO_MPA_ADDR_BASE 0x1000 /** SDIO Tx aggregation in progress ? */ #define MP_TX_AGGR_IN_PROGRESS(a) (a->pcard_sd->mpa_tx.pkt_cnt > 0) /** SDIO Tx aggregation buffer room for next packet ? */ -#define MP_TX_AGGR_BUF_HAS_ROOM(a, mbuf, len) \ - (((a->pcard_sd->mpa_tx.buf_len) + len) <= (a->pcard_sd->mpa_tx.buf_size)) +#define MP_TX_AGGR_BUF_HAS_ROOM(a, mbuf, len) \ + (((a->pcard_sd->mpa_tx.buf_len) + len) <= \ + (a->pcard_sd->mpa_tx.buf_size)) /** Copy current packet (SDIO Tx aggregation buffer) to SDIO buffer */ -#define MP_TX_AGGR_BUF_PUT(a, mbuf, port) do { \ - pmadapter->callbacks.moal_memmove(a->pmoal_handle, \ - &a->pcard_sd->mpa_tx.buf[a->pcard_sd->mpa_tx.buf_len], \ - mbuf->pbuf+mbuf->data_offset, mbuf->data_len);\ - a->pcard_sd->mpa_tx.buf_len += mbuf->data_len; \ - a->pcard_sd->mpa_tx.mp_wr_info[a->pcard_sd->mpa_tx.pkt_cnt] = \ - *(t_u16 *)(mbuf->pbuf+mbuf->data_offset); \ - if (!a->pcard_sd->mpa_tx.pkt_cnt) { \ - a->pcard_sd->mpa_tx.start_port = port; \ - } \ - a->pcard_sd->mpa_tx.ports |= (1 << port); \ - a->pcard_sd->mpa_tx.pkt_cnt++; \ -} while (0) +#define MP_TX_AGGR_BUF_PUT(a, mbuf, port) \ + do { \ + pmadapter->callbacks.moal_memmove( \ + a->pmoal_handle, \ + &a->pcard_sd->mpa_tx.buf[a->pcard_sd->mpa_tx.buf_len], \ + mbuf->pbuf + mbuf->data_offset, mbuf->data_len); \ + a->pcard_sd->mpa_tx.buf_len += mbuf->data_len; \ + a->pcard_sd->mpa_tx.mp_wr_info[a->pcard_sd->mpa_tx.pkt_cnt] = \ + *(t_u16 *)(mbuf->pbuf + mbuf->data_offset); \ + if (!a->pcard_sd->mpa_tx.pkt_cnt) { \ + a->pcard_sd->mpa_tx.start_port = port; \ + } \ + a->pcard_sd->mpa_tx.ports |= (1 << port); \ + a->pcard_sd->mpa_tx.pkt_cnt++; \ + } while (0) -#define MP_TX_AGGR_BUF_PUT_SG(a, mbuf, port) do { \ - a->pcard_sd->mpa_tx.buf_len += mbuf->data_len; \ - a->pcard_sd->mpa_tx.mp_wr_info[a->pcard_sd->mpa_tx.pkt_cnt] = \ - *(t_u16 *)(mbuf->pbuf+mbuf->data_offset); \ - a->pcard_sd->mpa_tx.mbuf_arr[a->pcard_sd->mpa_tx.pkt_cnt] = mbuf; \ - if (!a->pcard_sd->mpa_tx.pkt_cnt) { \ - a->pcard_sd->mpa_tx.start_port = port; \ - } \ - a->pcard_sd->mpa_tx.ports |= (1 << port); \ - a->pcard_sd->mpa_tx.pkt_cnt++; \ -} while (0) +#define MP_TX_AGGR_BUF_PUT_SG(a, mbuf, port) \ + do { \ + a->pcard_sd->mpa_tx.buf_len += mbuf->data_len; \ + a->pcard_sd->mpa_tx.mp_wr_info[a->pcard_sd->mpa_tx.pkt_cnt] = \ + *(t_u16 *)(mbuf->pbuf + mbuf->data_offset); \ + a->pcard_sd->mpa_tx.mbuf_arr[a->pcard_sd->mpa_tx.pkt_cnt] = \ + mbuf; \ + if (!a->pcard_sd->mpa_tx.pkt_cnt) { \ + a->pcard_sd->mpa_tx.start_port = port; \ + } \ + a->pcard_sd->mpa_tx.ports |= (1 << port); \ + a->pcard_sd->mpa_tx.pkt_cnt++; \ + } while (0) /** SDIO Tx aggregation limit ? */ -#define MP_TX_AGGR_PKT_LIMIT_REACHED(a) ((a->pcard_sd->mpa_tx.pkt_cnt) \ - == (a->pcard_sd->mpa_tx.pkt_aggr_limit)) +#define MP_TX_AGGR_PKT_LIMIT_REACHED(a) \ + ((a->pcard_sd->mpa_tx.pkt_cnt) == (a->pcard_sd->mpa_tx.pkt_aggr_limit)) /** Reset SDIO Tx aggregation buffer parameters */ -#define MP_TX_AGGR_BUF_RESET(a) do { \ - memset(a, a->pcard_sd->mpa_tx.mp_wr_info, 0, sizeof(a->pcard_sd->mpa_tx.mp_wr_info)); \ - a->pcard_sd->mpa_tx.pkt_cnt = 0; \ - a->pcard_sd->mpa_tx.buf_len = 0; \ - a->pcard_sd->mpa_tx.ports = 0; \ - a->pcard_sd->mpa_tx.start_port = 0; \ -} while (0) +#define MP_TX_AGGR_BUF_RESET(a) \ + do { \ + memset(a, a->pcard_sd->mpa_tx.mp_wr_info, 0, \ + sizeof(a->pcard_sd->mpa_tx.mp_wr_info)); \ + a->pcard_sd->mpa_tx.pkt_cnt = 0; \ + a->pcard_sd->mpa_tx.buf_len = 0; \ + a->pcard_sd->mpa_tx.ports = 0; \ + a->pcard_sd->mpa_tx.start_port = 0; \ + } while (0) /** SDIO Rx aggregation limit ? */ -#define MP_RX_AGGR_PKT_LIMIT_REACHED(a) (a->pcard_sd->mpa_rx.pkt_cnt \ - == a->pcard_sd->mpa_rx.pkt_aggr_limit) +#define MP_RX_AGGR_PKT_LIMIT_REACHED(a) \ + (a->pcard_sd->mpa_rx.pkt_cnt == a->pcard_sd->mpa_rx.pkt_aggr_limit) /** SDIO Rx aggregation port limit ? */ /** this is for test only, because port 0 is reserved for control port */ @@ -223,44 +229,48 @@ Change log: /* receive packets aggregated up to a half of mp_end_port */ /* note: hw rx wraps round only after port (MAX_PORT-1) */ -#define MP_RX_AGGR_PORT_LIMIT_REACHED(a) \ - (((a->pcard_sd->curr_rd_port < a->pcard_sd->mpa_rx.start_port) && \ - (((MAX_PORT - a->pcard_sd->mpa_rx.start_port) + a->pcard_sd->curr_rd_port) \ - >= (a->pcard_sd->mp_end_port >> 1))) || \ - ((a->pcard_sd->curr_rd_port - a->pcard_sd->mpa_rx.start_port) >= \ - (a->pcard_sd->mp_end_port >> 1))) +#define MP_RX_AGGR_PORT_LIMIT_REACHED(a) \ + (((a->pcard_sd->curr_rd_port < a->pcard_sd->mpa_rx.start_port) && \ + (((MAX_PORT - a->pcard_sd->mpa_rx.start_port) + \ + a->pcard_sd->curr_rd_port) >= (a->pcard_sd->mp_end_port >> 1))) || \ + ((a->pcard_sd->curr_rd_port - a->pcard_sd->mpa_rx.start_port) >= \ + (a->pcard_sd->mp_end_port >> 1))) /** SDIO Rx aggregation in progress ? */ #define MP_RX_AGGR_IN_PROGRESS(a) (a->pcard_sd->mpa_rx.pkt_cnt > 0) /** SDIO Rx aggregation buffer room for next packet ? */ -#define MP_RX_AGGR_BUF_HAS_ROOM(a, rx_len) \ +#define MP_RX_AGGR_BUF_HAS_ROOM(a, rx_len) \ ((a->pcard_sd->mpa_rx.buf_len + rx_len) <= a->pcard_sd->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 { \ - a->pcard_sd->mpa_rx.buf_len += rx_len; \ - if (!a->pcard_sd->mpa_rx.pkt_cnt) { \ - a->pcard_sd->mpa_rx.start_port = port; \ - } \ - a->pcard_sd->mpa_rx.ports |= (1 << port); \ - a->pcard_sd->mpa_rx.mbuf_arr[a->pcard_sd->mpa_rx.pkt_cnt] = mbuf; \ - a->pcard_sd->mpa_rx.len_arr[a->pcard_sd->mpa_rx.pkt_cnt] = rx_len; \ - a->pcard_sd->mpa_rx.pkt_cnt++; \ -} while (0) +#define MP_RX_AGGR_SETUP(a, mbuf, port, rx_len) \ + do { \ + a->pcard_sd->mpa_rx.buf_len += rx_len; \ + if (!a->pcard_sd->mpa_rx.pkt_cnt) { \ + a->pcard_sd->mpa_rx.start_port = port; \ + } \ + a->pcard_sd->mpa_rx.ports |= (1 << port); \ + a->pcard_sd->mpa_rx.mbuf_arr[a->pcard_sd->mpa_rx.pkt_cnt] = \ + mbuf; \ + a->pcard_sd->mpa_rx.len_arr[a->pcard_sd->mpa_rx.pkt_cnt] = \ + rx_len; \ + a->pcard_sd->mpa_rx.pkt_cnt++; \ + } while (0) /** Reset SDIO Rx aggregation buffer parameters */ -#define MP_RX_AGGR_BUF_RESET(a) do { \ - a->pcard_sd->mpa_rx.pkt_cnt = 0; \ - a->pcard_sd->mpa_rx.buf_len = 0; \ - a->pcard_sd->mpa_rx.ports = 0; \ - a->pcard_sd->mpa_rx.start_port = 0; \ -} while (0) +#define MP_RX_AGGR_BUF_RESET(a) \ + do { \ + a->pcard_sd->mpa_rx.pkt_cnt = 0; \ + a->pcard_sd->mpa_rx.buf_len = 0; \ + a->pcard_sd->mpa_rx.ports = 0; \ + a->pcard_sd->mpa_rx.start_port = 0; \ + } while (0) /** aggr buf size 32k */ -#define SDIO_MP_AGGR_BUF_SIZE_32K (32768) +#define SDIO_MP_AGGR_BUF_SIZE_32K (32768) /** max aggr buf size 64k-256 */ -#define SDIO_MP_AGGR_BUF_SIZE_MAX (65280) +#define SDIO_MP_AGGR_BUF_SIZE_MAX (65280) #ifdef SD8887 static const struct _mlan_sdio_card_reg mlan_reg_sd8887 = { @@ -270,9 +280,10 @@ static const struct _mlan_sdio_card_reg mlan_reg_sd8887 = { .base_1_reg = 0x6D, .poll_reg = 0x5C, .host_int_enable = UP_LD_HOST_INT_MASK | DN_LD_HOST_INT_MASK | - CMD_PORT_UPLD_INT_MASK | CMD_PORT_DNLD_INT_MASK, + CMD_PORT_UPLD_INT_MASK | CMD_PORT_DNLD_INT_MASK, .host_int_status = DN_LD_HOST_INT_STATUS | UP_LD_HOST_INT_STATUS | - DN_LD_CMD_PORT_HOST_INT_STATUS | UP_LD_CMD_PORT_HOST_INT_STATUS, + DN_LD_CMD_PORT_HOST_INT_STATUS | + UP_LD_CMD_PORT_HOST_INT_STATUS, .status_reg_0 = 0x90, .status_reg_1 = 0x91, .sdio_int_mask = 0xff, @@ -339,9 +350,10 @@ static const struct _mlan_sdio_card_reg mlan_reg_sd8897 = { .base_1_reg = 0x61, .poll_reg = 0x50, .host_int_enable = UP_LD_HOST_INT_MASK | DN_LD_HOST_INT_MASK | - CMD_PORT_UPLD_INT_MASK | CMD_PORT_DNLD_INT_MASK, + CMD_PORT_UPLD_INT_MASK | CMD_PORT_DNLD_INT_MASK, .host_int_status = DN_LD_HOST_INT_STATUS | UP_LD_HOST_INT_STATUS | - DN_LD_CMD_PORT_HOST_INT_STATUS | UP_LD_CMD_PORT_HOST_INT_STATUS, + DN_LD_CMD_PORT_HOST_INT_STATUS | + UP_LD_CMD_PORT_HOST_INT_STATUS, .status_reg_0 = 0xC0, .status_reg_1 = 0xC1, .sdio_int_mask = 0xff, @@ -400,7 +412,8 @@ static const struct _mlan_card_info mlan_card_info_sd8897 = { }; #endif -#if defined(SD8977) || defined(SD8997) || defined(SD8987) || defined(SD9098) || defined(SD9097) || defined(SD8978) +#if defined(SD8977) || defined(SD8997) || defined(SD8987) || \ + defined(SD9098) || defined(SD9097) || defined(SD8978) static const struct _mlan_sdio_card_reg mlan_reg_sd8977_sd8997 = { .start_rd_port = 0, .start_wr_port = 0, @@ -408,9 +421,10 @@ static const struct _mlan_sdio_card_reg mlan_reg_sd8977_sd8997 = { .base_1_reg = 0xf9, .poll_reg = 0x5C, .host_int_enable = UP_LD_HOST_INT_MASK | DN_LD_HOST_INT_MASK | - CMD_PORT_UPLD_INT_MASK | CMD_PORT_DNLD_INT_MASK, + CMD_PORT_UPLD_INT_MASK | CMD_PORT_DNLD_INT_MASK, .host_int_status = DN_LD_HOST_INT_STATUS | UP_LD_HOST_INT_STATUS | - DN_LD_CMD_PORT_HOST_INT_STATUS | UP_LD_CMD_PORT_HOST_INT_STATUS, + DN_LD_CMD_PORT_HOST_INT_STATUS | + UP_LD_CMD_PORT_HOST_INT_STATUS, .status_reg_0 = 0xe8, .status_reg_1 = 0xe9, .sdio_int_mask = 0xff, diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_shim.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_shim.c index 05eb9c797374..c8e621e585c9 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_shim.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_shim.c @@ -108,23 +108,21 @@ mlan_operations *mlan_ops[] = { }; /** Global moal_assert callback */ -t_void (*assert_callback) (IN t_void *pmoal_handle, IN t_u32 cond) = MNULL; +t_void (*assert_callback)(IN t_void *pmoal_handle, IN t_u32 cond) = MNULL; #ifdef DEBUG_LEVEL1 #ifdef DEBUG_LEVEL2 -#define DEFAULT_DEBUG_MASK (0xffffffff) +#define DEFAULT_DEBUG_MASK (0xffffffff) #else -#define DEFAULT_DEBUG_MASK (MMSG | MFATAL | MERROR) +#define DEFAULT_DEBUG_MASK (MMSG | MFATAL | MERROR) #endif /** Global moal_print callback */ -t_void (*print_callback) (IN t_void *pmoal_handle, - IN t_u32 level, IN char *pformat, IN ... - ) = MNULL; +t_void (*print_callback)(IN t_void *pmoal_handle, 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; +mlan_status (*get_sys_time_callback)(IN t_void *pmoal_handle, OUT t_u32 *psec, + OUT t_u32 *pusec) = MNULL; /** Global driver debug mit masks */ t_u32 mlan_drvdbg = DEFAULT_DEBUG_MASK; @@ -142,8 +140,7 @@ extern mlan_status wlan_get_usb_device(pmlan_adapter pmadapter); * @param pmadapter A pointer to mlan_adapter structure * */ -void -wlan_process_pending_ioctl(mlan_adapter *pmadapter) +void wlan_process_pending_ioctl(mlan_adapter *pmadapter) { pmlan_ioctl_req pioctl_buf; mlan_status status = MLAN_STATUS_SUCCESS; @@ -158,11 +155,9 @@ wlan_process_pending_ioctl(mlan_adapter *pmadapter) pcb = &pmadapter->callbacks; - while ((pioctl_buf = - (pmlan_ioctl_req)util_dequeue_list(pmadapter->pmoal_handle, - &pmadapter->ioctl_pending_q, - pcb->moal_spin_lock, - pcb->moal_spin_unlock))) { + while ((pioctl_buf = (pmlan_ioctl_req)util_dequeue_list( + pmadapter->pmoal_handle, &pmadapter->ioctl_pending_q, + pcb->moal_spin_lock, pcb->moal_spin_unlock))) { switch (pioctl_buf->req_id) { #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) case MLAN_IOCTL_BSS: @@ -194,7 +189,6 @@ wlan_process_pending_ioctl(mlan_adapter *pmadapter) } LEAVE(); } - /******************************************************** Global Functions ********************************************************/ @@ -235,8 +229,7 @@ extern mlan_adapter_operations mlan_sdio_ops; * See Also * mlan_unregister */ -mlan_status -mlan_register(IN pmlan_device pmdevice, OUT t_void **ppmlan_adapter) +mlan_status mlan_register(IN pmlan_device pmdevice, OUT t_void **ppmlan_adapter) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_adapter pmadapter = MNULL; @@ -285,8 +278,8 @@ mlan_register(IN pmlan_device pmdevice, OUT t_void **ppmlan_adapter) goto exit_register; } - pmdevice->callbacks.moal_memset(pmdevice->pmoal_handle, pmadapter, - 0, sizeof(mlan_adapter)); + pmdevice->callbacks.moal_memset(pmdevice->pmoal_handle, pmadapter, 0, + sizeof(mlan_adapter)); pcb = &pmadapter->callbacks; @@ -467,6 +460,7 @@ mlan_register(IN pmlan_device pmdevice, OUT t_void **ppmlan_adapter) pmadapter->rx_data_ep = pmdevice->rx_data_ep; } #endif + pmadapter->init_para.dfs53cfg = pmdevice->dfs53cfg; pmadapter->priv_num = 0; pmadapter->priv[0] = MNULL; @@ -515,7 +509,7 @@ mlan_register(IN pmlan_device pmdevice, OUT t_void **ppmlan_adapter) break; } } - /** back up bss_attr table */ + /** back up bss_attr table */ memcpy_ext(pmadapter, pmadapter->bss_attr, pmdevice->bss_attr, sizeof(pmadapter->bss_attr), sizeof(pmadapter->bss_attr)); @@ -525,7 +519,7 @@ mlan_register(IN pmlan_device pmdevice, OUT t_void **ppmlan_adapter) goto error; } - /** init lock varible for first priv */ + /** init lock varible for first priv */ if (wlan_init_priv_lock_list(pmadapter, 0) != MLAN_STATUS_SUCCESS) { ret = MLAN_STATUS_FAILURE; goto error; @@ -581,9 +575,7 @@ exit_register: * @return MLAN_STATUS_SUCCESS * The deregistration succeeded. */ -mlan_status -mlan_unregister(IN t_void *pmlan_adapter - ) +mlan_status mlan_unregister(IN t_void *pmlan_adapter) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_adapter *pmadapter = (mlan_adapter *)pmlan_adapter; @@ -633,8 +625,7 @@ mlan_unregister(IN t_void *pmlan_adapter * MLAN_STATUS_FAILURE * The firmware download failed. */ -mlan_status -mlan_dnld_fw(IN t_void *pmlan_adapter, IN pmlan_fw_image pmfw) +mlan_status mlan_dnld_fw(IN t_void *pmlan_adapter, IN pmlan_fw_image pmfw) { mlan_status ret = MLAN_STATUS_FAILURE; mlan_adapter *pmadapter = (mlan_adapter *)pmlan_adapter; @@ -666,8 +657,8 @@ mlan_dnld_fw(IN t_void *pmlan_adapter, IN pmlan_fw_image pmfw) * @return MLAN_STATUS_SUCCESS * */ -mlan_status -mlan_set_init_param(IN t_void *pmlan_adapter, IN pmlan_init_param pparam) +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; @@ -675,7 +666,7 @@ mlan_set_init_param(IN t_void *pmlan_adapter, IN pmlan_init_param pparam) ENTER(); MASSERT(pmlan_adapter); - /** Save DPD data in MLAN */ + /** Save DPD data in MLAN */ if ((pparam->pdpd_data_buf) && (pparam->dpd_data_len > 0)) { pmadapter->pdpd_data = pparam->pdpd_data_buf; pmadapter->dpd_data_len = pparam->dpd_data_len; @@ -684,7 +675,7 @@ mlan_set_init_param(IN t_void *pmlan_adapter, IN pmlan_init_param pparam) pmadapter->ptxpwr_data = pparam->ptxpwr_data_buf; pmadapter->txpwr_data_len = pparam->txpwr_data_len; } - /** Save cal data in MLAN */ + /** 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; @@ -707,9 +698,7 @@ mlan_set_init_param(IN t_void *pmlan_adapter, IN pmlan_init_param pparam) * MLAN_STATUS_FAILURE * The firmware initialization failed. */ -mlan_status -mlan_init_fw(IN t_void *pmlan_adapter - ) +mlan_status mlan_init_fw(IN t_void *pmlan_adapter) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_adapter *pmadapter = (mlan_adapter *)pmlan_adapter; @@ -739,9 +728,7 @@ mlan_init_fw(IN t_void *pmlan_adapter * MLAN_STATUS_FAILURE * The firmware shutdown call failed. */ -mlan_status -mlan_shutdown_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; @@ -780,23 +767,18 @@ mlan_shutdown_fw(IN t_void *pmlan_adapter } pcb = &pmadapter->callbacks; - /** cancel pending ioctl */ - while ((pioctl_buf = - (pmlan_ioctl_req)util_dequeue_list(pmadapter->pmoal_handle, - &pmadapter->ioctl_pending_q, - pcb->moal_spin_lock, - pcb->moal_spin_unlock))) { + /** cancel pending ioctl */ + while ((pioctl_buf = (pmlan_ioctl_req)util_dequeue_list( + pmadapter->pmoal_handle, &pmadapter->ioctl_pending_q, + pcb->moal_spin_lock, pcb->moal_spin_unlock))) { pioctl_buf->status_code = MLAN_ERROR_CMD_CANCEL; pcb->moal_ioctl_complete(pmadapter->pmoal_handle, pioctl_buf, MLAN_STATUS_FAILURE); } - while ((pmbuf = (pmlan_buffer)util_dequeue_list(pmadapter->pmoal_handle, - &pmadapter-> - rx_data_queue, - pcb->moal_spin_lock, - pcb-> - moal_spin_unlock))) { + while ((pmbuf = (pmlan_buffer)util_dequeue_list( + pmadapter->pmoal_handle, &pmadapter->rx_data_queue, + pcb->moal_spin_lock, pcb->moal_spin_unlock))) { #ifdef USB if (IS_USB(pmadapter->card_type)) pcb->moal_recv_complete(pmadapter->pmoal_handle, pmbuf, @@ -830,8 +812,7 @@ mlan_shutdown_fw(IN t_void *pmlan_adapter * * @return N/A */ -static t_void -mlan_queue_main_work(mlan_adapter *pmadapter) +static t_void mlan_queue_main_work(mlan_adapter *pmadapter) { pmlan_callbacks pcb = &pmadapter->callbacks; ENTER(); @@ -860,8 +841,7 @@ mlan_queue_main_work(mlan_adapter *pmadapter) * * @return N/A */ -static t_void -mlan_queue_rx_work(mlan_adapter *pmadapter) +static t_void mlan_queue_rx_work(mlan_adapter *pmadapter) { pmlan_callbacks pcb = &pmadapter->callbacks; ENTER(); @@ -891,8 +871,7 @@ mlan_queue_rx_work(mlan_adapter *pmadapter) * * @return N/A */ -void -mlan_block_main_process(mlan_adapter *pmadapter, t_u8 block) +void mlan_block_main_process(mlan_adapter *pmadapter, t_u8 block) { pmlan_callbacks pcb = &pmadapter->callbacks; pcb->moal_spin_lock(pmadapter->pmoal_handle, @@ -907,10 +886,9 @@ mlan_block_main_process(mlan_adapter *pmadapter, t_u8 block) pcb->moal_spin_unlock(pmadapter->pmoal_handle, pmadapter->pmain_proc_lock); PRINTM(MEVENT, "wlan: wait main work done...\n"); - wlan_recv_event(wlan_get_priv - (pmadapter, MLAN_BSS_ROLE_ANY), - MLAN_EVENT_ID_DRV_FLUSH_MAIN_WORK, - MNULL); + wlan_recv_event( + wlan_get_priv(pmadapter, MLAN_BSS_ROLE_ANY), + MLAN_EVENT_ID_DRV_FLUSH_MAIN_WORK, MNULL); } else { pcb->moal_spin_unlock(pmadapter->pmoal_handle, pmadapter->pmain_proc_lock); @@ -926,8 +904,7 @@ mlan_block_main_process(mlan_adapter *pmadapter, t_u8 block) * * @return N/A */ -void -mlan_block_rx_process(mlan_adapter *pmadapter, t_u8 block) +void mlan_block_rx_process(mlan_adapter *pmadapter, t_u8 block) { pmlan_callbacks pcb = &pmadapter->callbacks; pcb->moal_spin_lock(pmadapter->pmoal_handle, pmadapter->prx_proc_lock); @@ -941,8 +918,8 @@ mlan_block_rx_process(mlan_adapter *pmadapter, t_u8 block) pcb->moal_spin_unlock(pmadapter->pmoal_handle, pmadapter->prx_proc_lock); PRINTM(MEVENT, "wlan: wait rx work done...\n"); - wlan_recv_event(wlan_get_priv - (pmadapter, MLAN_BSS_ROLE_ANY), + wlan_recv_event(wlan_get_priv(pmadapter, + MLAN_BSS_ROLE_ANY), MLAN_EVENT_ID_DRV_FLUSH_RX_WORK, MNULL); } else { pcb->moal_spin_unlock(pmadapter->pmoal_handle, @@ -959,8 +936,7 @@ mlan_block_rx_process(mlan_adapter *pmadapter, t_u8 block) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -mlan_rx_process(IN t_void *pmlan_adapter, IN t_u8 *rx_pkts) +mlan_status mlan_rx_process(IN t_void *pmlan_adapter, IN t_u8 *rx_pkts) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_adapter *pmadapter = (mlan_adapter *)pmlan_adapter; @@ -992,14 +968,12 @@ rx_process_start: while (MTRUE) { #ifdef DRV_EMBEDDED_AUTHENTICATOR if (pmadapter->authenticator_priv) { - if (IsAuthenticatorEnabled - (pmadapter->authenticator_priv->psapriv)) { - AuthenticatorKeyMgmtInit(pmadapter-> - authenticator_priv-> - psapriv, - pmadapter-> - authenticator_priv-> - curr_addr); + if (IsAuthenticatorEnabled( + pmadapter->authenticator_priv->psapriv)) { + AuthenticatorKeyMgmtInit( + pmadapter->authenticator_priv->psapriv, + pmadapter->authenticator_priv + ->curr_addr); pmadapter->authenticator_priv = MNULL; } } @@ -1008,26 +982,23 @@ rx_process_start: pmadapter->flush_data = MFALSE; wlan_flush_rxreorder_tbl(pmadapter); } - pmadapter->callbacks.moal_spin_lock(pmadapter->pmoal_handle, - pmadapter->rx_data_queue. - plock); - pmbuf = (pmlan_buffer)util_dequeue_list(pmadapter->pmoal_handle, - &pmadapter-> - rx_data_queue, MNULL, - MNULL); + pmadapter->callbacks.moal_spin_lock( + pmadapter->pmoal_handle, + pmadapter->rx_data_queue.plock); + pmbuf = (pmlan_buffer)util_dequeue_list( + pmadapter->pmoal_handle, &pmadapter->rx_data_queue, + MNULL, MNULL); if (!pmbuf) { - pmadapter->callbacks.moal_spin_unlock(pmadapter-> - pmoal_handle, - pmadapter-> - rx_data_queue. - plock); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, + pmadapter->rx_data_queue.plock); break; } pmadapter->rx_pkts_queued--; rx_num++; - pmadapter->callbacks.moal_spin_unlock(pmadapter->pmoal_handle, - pmadapter->rx_data_queue. - plock); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, + pmadapter->rx_data_queue.plock); if (pmadapter->delay_task_flag && (pmadapter->rx_pkts_queued < LOW_RX_PENDING)) { PRINTM(MEVENT, "Run\n"); @@ -1062,9 +1033,7 @@ exit_rx_proc: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -mlan_main_process(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; @@ -1103,9 +1072,8 @@ process_start: } if (pmadapter->pending_disconnect_priv) { PRINTM(MEVENT, "Reset connect state\n"); - wlan_reset_connect_state(pmadapter-> - pending_disconnect_priv, - MTRUE); + wlan_reset_connect_state( + pmadapter->pending_disconnect_priv, MTRUE); pmadapter->pending_disconnect_priv = MNULL; } #if defined(SDIO) || defined(PCIE) @@ -1132,54 +1100,54 @@ process_start: (pmadapter->pm_wakeup_card_req && !pmadapter->pm_wakeup_fw_try) && (wlan_is_cmd_pending(pmadapter) || - !wlan_bypass_tx_list_empty(pmadapter) - || !wlan_wmm_lists_empty(pmadapter) - )) { + !wlan_bypass_tx_list_empty(pmadapter) || + !wlan_wmm_lists_empty(pmadapter))) { pmadapter->ops.wakeup_card(pmadapter, MTRUE); pmadapter->pm_wakeup_fw_try = MTRUE; continue; } - if (IS_CARD_RX_RCVD(pmadapter) - || (!pmadapter->cmd_sent && - pmadapter->vdll_ctrl.pending_block) - ) { + if (IS_CARD_RX_RCVD(pmadapter) || + (!pmadapter->cmd_sent && + pmadapter->vdll_ctrl.pending_block)) { 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); + 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; if (pmadapter->wakeup_fw_timer_is_set) { - pcb->moal_stop_timer(pmadapter->pmoal_handle, - pmadapter-> - pwakeup_fw_timer); + pcb->moal_stop_timer( + pmadapter->pmoal_handle, + pmadapter->pwakeup_fw_timer); pmadapter->wakeup_fw_timer_is_set = MFALSE; } } else { /* We have tried to wakeup the card already */ if (pmadapter->pm_wakeup_fw_try) break; - /* Check if we need to confirm Sleep Request received previously */ + /* 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 - && !pmadapter->vdll_ctrl.pending_block) + if (!pmadapter->cmd_sent && + !pmadapter->curr_cmd && + !pmadapter->vdll_ctrl.pending_block) wlan_check_ps_cond(pmadapter); if (pmadapter->ps_state != PS_STATE_AWAKE || (pmadapter->tx_lock_flag == MTRUE)) break; - if (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 - || !wlan_is_cmd_pending(pmadapter)) { + if (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 || + !wlan_is_cmd_pending(pmadapter)) { break; } } @@ -1191,7 +1159,8 @@ process_start: wlan_process_cmdresp(pmadapter); /* call moal back when init_fw is done */ - if (pmadapter->hw_status == WlanHardwareStatusInitdone) { + if (pmadapter->hw_status == + WlanHardwareStatusInitdone) { pmadapter->hw_status = WlanHardwareStatusReady; wlan_init_fw_complete(pmadapter); } else if (pmadapter->hw_status == @@ -1208,31 +1177,30 @@ process_start: wlan_process_event(pmadapter); } - /* Check if we need to confirm Sleep Request received previously */ + /* 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 - && !pmadapter->vdll_ctrl.pending_block) + if (!pmadapter->cmd_sent && !pmadapter->curr_cmd && + !pmadapter->vdll_ctrl.pending_block) 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) - ) { + 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; } /* in a case of race condition, download the VDLL block here */ - if (!pmadapter->cmd_sent && pmadapter->vdll_ctrl.pending_block) { - wlan_download_vdll_block(pmadapter, - pmadapter->vdll_ctrl. - pending_block, - pmadapter->vdll_ctrl. - pending_block_len); + if (!pmadapter->cmd_sent && + pmadapter->vdll_ctrl.pending_block) { + wlan_download_vdll_block( + pmadapter, pmadapter->vdll_ctrl.pending_block, + pmadapter->vdll_ctrl.pending_block_len); pmadapter->vdll_ctrl.pending_block = MNULL; } if (!pmadapter->cmd_sent && !pmadapter->curr_cmd) { @@ -1250,23 +1218,22 @@ process_start: 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); + wlan_host_sleep_activated_event( + wlan_get_priv(pmadapter, + MLAN_BSS_ROLE_ANY), + MFALSE); } } - if (!pmadapter->data_sent && !wlan_wmm_lists_empty(pmadapter) - && !wlan_11h_radar_detected_tx_blocked(pmadapter) - ) { + if (!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); + wlan_host_sleep_activated_event( + wlan_get_priv(pmadapter, + MLAN_BSS_ROLE_ANY), + MFALSE); } } @@ -1275,11 +1242,11 @@ process_start: !pmadapter->curr_cmd && !wlan_is_cmd_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) { + 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; @@ -1315,8 +1282,7 @@ exit_main_proc: * * @return MLAN_STATUS_PENDING */ -mlan_status -mlan_send_packet(IN t_void *pmlan_adapter, IN pmlan_buffer pmbuf) +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; @@ -1324,9 +1290,9 @@ mlan_send_packet(IN t_void *pmlan_adapter, IN pmlan_buffer pmbuf) t_u16 eth_type = 0; ENTER(); - MASSERT(pmlan_adapter &&pmbuf); + MASSERT(pmlan_adapter && pmbuf); - if (!pmlan_adapter ||!pmbuf) { + if (!pmlan_adapter || !pmbuf) { return MLAN_STATUS_FAILURE; } @@ -1335,16 +1301,14 @@ mlan_send_packet(IN t_void *pmlan_adapter, IN pmlan_buffer pmbuf) pmpriv = pmadapter->priv[pmbuf->bss_index]; eth_type = - mlan_ntohs(*(t_u16 *)&pmbuf-> - pbuf[pmbuf->data_offset + - MLAN_ETHER_PKT_TYPE_OFFSET]); + mlan_ntohs(*(t_u16 *)&pmbuf->pbuf[pmbuf->data_offset + + MLAN_ETHER_PKT_TYPE_OFFSET]); if (((pmadapter->priv[pmbuf->bss_index]->port_ctrl_mode == MTRUE) && - ((eth_type == MLAN_ETHER_PKT_TYPE_EAPOL) - || (eth_type == MLAN_ETHER_PKT_TYPE_WAPI) - )) - || (pmbuf->buf_type == MLAN_BUF_TYPE_RAW_DATA) + ((eth_type == MLAN_ETHER_PKT_TYPE_EAPOL) || + (eth_type == MLAN_ETHER_PKT_TYPE_WAPI))) || + (pmbuf->buf_type == MLAN_BUF_TYPE_RAW_DATA) - ) { + ) { if (eth_type == MLAN_ETHER_PKT_TYPE_EAPOL) { PRINTM_NETINTF(MMSG, pmpriv); PRINTM(MMSG, "wlan: Send EAPOL pkt to " MACSTR "\n", @@ -1352,7 +1316,7 @@ mlan_send_packet(IN t_void *pmlan_adapter, IN pmlan_buffer pmbuf) } wlan_add_buf_bypass_txqueue(pmadapter, pmbuf); } else { - /* Transmit the packet */ + /* Transmit the packet*/ wlan_wmm_add_buf_txqueue(pmadapter, pmbuf); } @@ -1366,10 +1330,10 @@ mlan_send_packet(IN t_void *pmlan_adapter, IN pmlan_buffer pmbuf) * @param adapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -mlan_status -mlan_ioctl(IN t_void *adapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -1405,10 +1369,9 @@ exit: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -mlan_write_data_async_complete(IN t_void *pmlan_adapter, - IN pmlan_buffer pmbuf, - IN t_u32 port, IN mlan_status status) +mlan_status mlan_write_data_async_complete(IN t_void *pmlan_adapter, + IN pmlan_buffer pmbuf, IN t_u32 port, + IN mlan_status status) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_adapter *pmadapter = (mlan_adapter *)pmlan_adapter; @@ -1436,10 +1399,11 @@ mlan_write_data_async_complete(IN t_void *pmlan_adapter, * @param pmbuf A pointer to mlan_buffer structure * @param port Data port * - * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE or MLAN_STATUS_PENDING + * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE or + * MLAN_STATUS_PENDING */ -mlan_status -mlan_recv(IN t_void *pmlan_adapter, IN pmlan_buffer pmbuf, IN t_u32 port) +mlan_status mlan_recv(IN t_void *pmlan_adapter, IN pmlan_buffer pmbuf, + IN t_u32 port) { mlan_status ret = MLAN_STATUS_PENDING; mlan_adapter *pmadapter = (mlan_adapter *)pmlan_adapter; @@ -1453,7 +1417,7 @@ mlan_recv(IN t_void *pmlan_adapter, IN pmlan_buffer pmbuf, IN t_u32 port) ENTER(); - MASSERT(pmlan_adapter &&pmbuf); + MASSERT(pmlan_adapter && pmbuf); if (pmadapter->hs_activated == MTRUE) wlan_process_hs_config(pmadapter); @@ -1480,11 +1444,11 @@ mlan_recv(IN t_void *pmlan_adapter, IN pmlan_buffer pmbuf, IN t_u32 port) if (pmadapter->ps_state == PS_STATE_SLEEP_CFM) { pmbuf->data_offset += MLAN_TYPE_LEN; pmbuf->data_len -= MLAN_TYPE_LEN; - wlan_process_sleep_confirm_resp - (pmadapter, - pmbuf->pbuf + - pmbuf->data_offset, - pmbuf->data_len); + wlan_process_sleep_confirm_resp( + pmadapter, + pmbuf->pbuf + + pmbuf->data_offset, + pmbuf->data_len); pmbuf->flags |= MLAN_BUF_FLAG_SLEEPCFM_RESP; ret = MLAN_STATUS_SUCCESS; @@ -1534,18 +1498,16 @@ mlan_recv(IN t_void *pmlan_adapter, IN pmlan_buffer pmbuf, IN t_u32 port) PRINTM(MDATA, "mlan_recv: DATA (%lu.%06lu)\n", sec, usec); #if defined(USB) if (pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl.enable) { - max_rx_data_size = - pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl. - aggr_max; - if (pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl. - aggr_mode == MLAN_USB_AGGR_MODE_NUM) { + max_rx_data_size = pmadapter->pcard_usb->usb_rx_deaggr + .aggr_ctrl.aggr_max; + if (pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl + .aggr_mode == MLAN_USB_AGGR_MODE_NUM) { max_rx_data_size *= MAX(MLAN_USB_MAX_PKT_SIZE, - pmadapter->pcard_usb->usb_rx_deaggr. - aggr_ctrl.aggr_align); - max_rx_data_size = - MAX(max_rx_data_size, - MLAN_RX_DATA_BUF_SIZE); + pmadapter->pcard_usb->usb_rx_deaggr + .aggr_ctrl.aggr_align); + max_rx_data_size = MAX(max_rx_data_size, + MLAN_RX_DATA_BUF_SIZE); } } #endif @@ -1555,27 +1517,20 @@ mlan_recv(IN t_void *pmlan_adapter, IN pmlan_buffer pmbuf, IN t_u32 port) PRINTM(MERROR, "mlan_recv: DATA too large\n"); } else { pmadapter->upld_len = len; - pmadapter->callbacks.moal_get_system_time(pmadapter-> - pmoal_handle, - &pmbuf-> - in_ts_sec, - &pmbuf-> - in_ts_usec); - pmadapter->callbacks.moal_spin_lock(pmadapter-> - pmoal_handle, - pmadapter-> - rx_data_queue. - plock); + pmadapter->callbacks.moal_get_system_time( + pmadapter->pmoal_handle, &pmbuf->in_ts_sec, + &pmbuf->in_ts_usec); + pmadapter->callbacks.moal_spin_lock( + pmadapter->pmoal_handle, + pmadapter->rx_data_queue.plock); util_enqueue_list_tail(pmadapter->pmoal_handle, &pmadapter->rx_data_queue, (pmlan_linked_list)pmbuf, MNULL, MNULL); pmadapter->rx_pkts_queued++; - pmadapter->callbacks.moal_spin_unlock(pmadapter-> - pmoal_handle, - pmadapter-> - rx_data_queue. - plock); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, + pmadapter->rx_data_queue.plock); pmadapter->data_received = MTRUE; mlan_queue_rx_work(pmadapter); } @@ -1599,9 +1554,9 @@ mlan_recv(IN t_void *pmlan_adapter, IN pmlan_buffer pmbuf, IN t_u32 port) * * @return MLAN_STATUS_SUCCESS */ -mlan_status -mlan_recv_packet_complete(IN t_void *pmlan_adapter, - IN pmlan_buffer pmbuf, IN mlan_status status) +mlan_status mlan_recv_packet_complete(IN t_void *pmlan_adapter, + IN pmlan_buffer pmbuf, + IN mlan_status status) { mlan_adapter *pmadapter = (mlan_adapter *)pmlan_adapter; @@ -1620,8 +1575,8 @@ mlan_recv_packet_complete(IN t_void *pmlan_adapter, * * @return wmm queue priority (0 - 3) */ -t_u8 -mlan_select_wmm_queue(IN t_void *pmlan_adapter, IN t_u8 bss_num, IN t_u8 tid) +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]; @@ -1642,8 +1597,7 @@ mlan_select_wmm_queue(IN t_void *pmlan_adapter, IN t_u8 bss_num, IN t_u8 tid) * @param adapter A pointer to mlan_adapter structure * @return MLAN_STATUS_FAILURE -- if the intererupt is not for us */ -mlan_status -mlan_interrupt(IN t_u16 msg_id, IN t_void *adapter) +mlan_status mlan_interrupt(IN t_u16 msg_id, IN t_void *adapter) { mlan_adapter *pmadapter = (mlan_adapter *)adapter; mlan_status ret; @@ -1662,8 +1616,7 @@ mlan_interrupt(IN t_u16 msg_id, IN t_void *adapter) * @param keep_wakeup keep wake up flag * @return N/A */ -t_void -mlan_pm_wakeup_card(IN t_void *adapter, IN t_u8 keep_wakeup) +t_void mlan_pm_wakeup_card(IN t_void *adapter, IN t_u8 keep_wakeup) { mlan_adapter *pmadapter = (mlan_adapter *)adapter; @@ -1681,8 +1634,7 @@ mlan_pm_wakeup_card(IN t_void *adapter, IN t_u8 keep_wakeup) * @param adapter A pointer to mlan_adapter structure * @return MTRUE/MFALSE */ -t_u8 -mlan_is_main_process_running(IN t_void *adapter) +t_u8 mlan_is_main_process_running(IN t_void *adapter) { mlan_adapter *pmadapter = (mlan_adapter *)adapter; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -1711,8 +1663,8 @@ mlan_is_main_process_running(IN t_void *adapter) * @param func_num PCIE function num * @return N/A */ -t_void -mlan_set_int_mode(IN t_void *adapter, IN t_u32 int_mode, IN t_u8 func_num) +t_void mlan_set_int_mode(IN t_void *adapter, IN t_u32 int_mode, + IN t_u8 func_num) { mlan_adapter *pmadapter = (mlan_adapter *)adapter; ENTER(); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_cmd.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_cmd.c index 14c789af6b58..95cf5ee26f9c 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_cmd.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_cmd.c @@ -23,9 +23,9 @@ */ /****************************************************** -Change log: - 10/21/2008: initial version -******************************************************/ + * Change log: + * 10/21/2008: initial version + ******************************************************/ #include "mlan.h" #include "mlan_join.h" @@ -46,16 +46,16 @@ Change log: #endif /* PCIE */ /******************************************************** - Local Variables -********************************************************/ + * Local Variables + ********************************************************/ /******************************************************** - Global Variables -********************************************************/ + * Global Variables + ********************************************************/ /******************************************************** - Local Functions -********************************************************/ + * Local Functions + ********************************************************/ /** * @brief This function prepares command of RSSI info. @@ -66,16 +66,15 @@ Change log: * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_cmd_802_11_rssi_info(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *pcmd, IN t_u16 cmd_action) +static mlan_status wlan_cmd_802_11_rssi_info(IN pmlan_private pmpriv, + 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->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); @@ -104,10 +103,10 @@ wlan_cmd_802_11_rssi_info(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_cmd_802_11_rssi_info_ext(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *pcmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +static mlan_status wlan_cmd_802_11_rssi_info_ext(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *pcmd, + IN t_u16 cmd_action, + IN t_void *pdata_buf) { HostCmd_DS_802_11_RSSI_INFO_EXT *rssi_info_ext_cmd = &pcmd->params.rssi_info_ext; @@ -124,9 +123,8 @@ wlan_cmd_802_11_rssi_info_ext(IN pmlan_private pmpriv, rssi_info_ext_cmd->nbcn = 0; if (info->param.path_id) { - pos = (t_u8 *)rssi_info_ext_cmd + - sizeof(HostCmd_DS_802_11_RSSI_INFO_EXT); - signal_info_tlv = (MrvlIEtypes_RSSI_EXT_t *) pos; + pos = (t_u8 *)rssi_info_ext_cmd->tlv_buf; + signal_info_tlv = (MrvlIEtypes_RSSI_EXT_t *)pos; signal_info_tlv->header.len = wlan_cpu_to_le16(sizeof(MrvlIEtypes_RSSI_EXT_t) - sizeof(MrvlIEtypesHeader_t)); @@ -152,11 +150,11 @@ wlan_cmd_802_11_rssi_info_ext(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -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) +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) { HostCmd_DS_802_11_SNMP_MIB *psnmp_mib = &cmd->params.smib; t_u32 ul_temp; @@ -261,7 +259,7 @@ wlan_cmd_802_11_snmp_mib(IN pmlan_private pmpriv, psnmp_mib->oid = wlan_cpu_to_le16((t_u16)Thermal_i); break; case NullPktPeriod_i: - /** keep alive null data pkt interval in full power mode */ + /** keep alive null data pkt interval in full power mode */ psnmp_mib->oid = wlan_cpu_to_le16((t_u16)NullPktPeriod_i); if (cmd_action == HostCmd_ACT_GEN_SET) { psnmp_mib->query_type = @@ -314,8 +312,8 @@ wlan_cmd_802_11_snmp_mib(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_cmd_802_11_get_log(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd) +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); @@ -335,10 +333,10 @@ wlan_cmd_802_11_get_log(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd) * * @return MLAN_STATUS_SUCCESS */ -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) +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) { MrvlTypes_Power_Group_t *ppg_tlv = MNULL; HostCmd_DS_TXPWR_CFG *ptxp = MNULL; @@ -352,21 +350,20 @@ wlan_cmd_tx_power_cfg(IN pmlan_private pmpriv, 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)); + 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 = (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 { @@ -395,23 +392,22 @@ wlan_cmd_tx_power_cfg(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -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) +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) { - HostCmd_DS_802_11_RF_TX_POWER *prtp = &cmd->params.txp; ENTER(); - cmd->size = wlan_cpu_to_le16((sizeof(HostCmd_DS_802_11_RF_TX_POWER)) - + S_DS_GEN); + 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: @@ -436,11 +432,11 @@ wlan_cmd_802_11_rf_tx_power(IN pmlan_private pmpriv, * * @return MTRUE/MFALSE; */ -static t_u8 -wlan_is_p2p_connected(IN pmlan_adapter pmadapter) +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) { priv = pmadapter->priv[j]; @@ -474,10 +470,10 @@ wlan_is_p2p_connected(IN pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS */ -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) +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) { pmlan_adapter pmadapter = pmpriv->adapter; HostCmd_DS_802_11_HS_CFG_ENH *phs_cfg = &cmd->params.opt_hs_cfg; @@ -509,10 +505,9 @@ wlan_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, 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); + 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 = @@ -524,10 +519,9 @@ wlan_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, 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->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); tlv += sizeof(MrvlIEtypes_HsWakeHoldoff_t); @@ -537,18 +531,16 @@ wlan_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, if (pmadapter->hs_wake_interval && pmpriv->media_connected && (pmpriv->bss_type == MLAN_BSS_TYPE_STA)) { cmd->size += sizeof(MrvlIEtypes_PsParamsInHs_t); - psparam_tlv = (MrvlIEtypes_PsParamsInHs_t *) tlv; + psparam_tlv = (MrvlIEtypes_PsParamsInHs_t *)tlv; psparam_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_PS_PARAMS_IN_HS); - psparam_tlv->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_PsParamsInHs_t) - - sizeof(MrvlIEtypesHeader_t)); + psparam_tlv->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_PsParamsInHs_t) - + sizeof(MrvlIEtypesHeader_t)); psparam_tlv->hs_wake_interval = wlan_cpu_to_le32(pmadapter->hs_wake_interval); - psparam_tlv->hs_inactivity_timeout = - wlan_cpu_to_le32(pmadapter-> - hs_inactivity_timeout); + psparam_tlv->hs_inactivity_timeout = wlan_cpu_to_le32( + pmadapter->hs_inactivity_timeout); tlv += sizeof(MrvlIEtypes_PsParamsInHs_t); PRINTM(MCMND, "hs_wake_interval=%d\n", pmadapter->hs_wake_interval); @@ -557,27 +549,24 @@ wlan_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, } if (pmadapter->param_type_ind == 1) { cmd->size += sizeof(MrvlIEtypes_WakeupSourceGPIO_t); - gpio_tlv = (MrvlIEtypes_WakeupSourceGPIO_t *) tlv; - gpio_tlv->header.type = - wlan_cpu_to_le16 - (TLV_TYPE_HS_WAKEUP_SOURCE_GPIO); - gpio_tlv->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_WakeupSourceGPIO_t) - - sizeof(MrvlIEtypesHeader_t)); + gpio_tlv = (MrvlIEtypes_WakeupSourceGPIO_t *)tlv; + gpio_tlv->header.type = wlan_cpu_to_le16( + TLV_TYPE_HS_WAKEUP_SOURCE_GPIO); + gpio_tlv->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_WakeupSourceGPIO_t) - + sizeof(MrvlIEtypesHeader_t)); gpio_tlv->ind_gpio = (t_u8)pmadapter->ind_gpio; gpio_tlv->level = (t_u8)pmadapter->level; tlv += sizeof(MrvlIEtypes_WakeupSourceGPIO_t); } if (pmadapter->param_type_ext == 2) { cmd->size += sizeof(MrvlIEtypes_WakeupExtend_t); - ext_tlv = (MrvlIEtypes_WakeupExtend_t *) tlv; + ext_tlv = (MrvlIEtypes_WakeupExtend_t *)tlv; ext_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_WAKEUP_EXTEND); - ext_tlv->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_WakeupExtend_t) - - sizeof(MrvlIEtypesHeader_t)); + ext_tlv->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_WakeupExtend_t) - + sizeof(MrvlIEtypesHeader_t)); ext_tlv->event_force_ignore = wlan_cpu_to_le32(pmadapter->event_force_ignore); ext_tlv->event_use_ext_gap = @@ -589,10 +578,11 @@ wlan_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, if (pmadapter->mgmt_filter[0].type) { int i = 0; mgmt_frame_filter mgmt_filter[MAX_MGMT_FRAME_FILTER]; + memset(pmadapter, mgmt_filter, 0, MAX_MGMT_FRAME_FILTER * - sizeof(mgmt_frame_filter)); - mgmt_filter_tlv = (MrvlIEtypes_MgmtFrameFilter_t *) tlv; + sizeof(mgmt_frame_filter)); + mgmt_filter_tlv = (MrvlIEtypes_MgmtFrameFilter_t *)tlv; mgmt_filter_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_MGMT_FRAME_WAKEUP); tlv += sizeof(MrvlIEtypesHeader_t); @@ -602,10 +592,8 @@ wlan_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, (t_u8)pmadapter->mgmt_filter[i].action; mgmt_filter[i].type = (t_u8)pmadapter->mgmt_filter[i].type; - mgmt_filter[i].frame_mask = - wlan_cpu_to_le32(pmadapter-> - mgmt_filter[i]. - frame_mask); + mgmt_filter[i].frame_mask = wlan_cpu_to_le32( + pmadapter->mgmt_filter[i].frame_mask); i++; } memcpy_ext(pmadapter, (t_u8 *)mgmt_filter_tlv->filter, @@ -615,35 +603,36 @@ wlan_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, tlv += i * sizeof(mgmt_frame_filter); mgmt_filter_tlv->header.len = wlan_cpu_to_le16(i * sizeof(mgmt_frame_filter)); - cmd->size += - i * sizeof(mgmt_frame_filter) + - sizeof(MrvlIEtypesHeader_t); + cmd->size += i * sizeof(mgmt_frame_filter) + + sizeof(MrvlIEtypesHeader_t); } if (pmadapter->hs_mimo_switch) { cmd->size += sizeof(MrvlIEtypes_HS_Antmode_t); - antmode_tlv = (MrvlIEtypes_HS_Antmode_t *) tlv; + antmode_tlv = (MrvlIEtypes_HS_Antmode_t *)tlv; antmode_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_HS_ANTMODE); - antmode_tlv->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_HS_Antmode_t) - - sizeof(MrvlIEtypesHeader_t)); + antmode_tlv->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_HS_Antmode_t) - + sizeof(MrvlIEtypesHeader_t)); antmode_tlv->txpath_antmode = ANTMODE_FW_DECISION; antmode_tlv->rxpath_antmode = ANTMODE_FW_DECISION; tlv += sizeof(MrvlIEtypes_HS_Antmode_t); - PRINTM(MCMND, - "hs_mimo_switch=%d, txpath_antmode=%d, rxpath_antmode=%d\n", - pmadapter->hs_mimo_switch, + PRINTM(MCMND, "hs_mimo_switch=%d\n", + pmadapter->hs_mimo_switch); + PRINTM(MCMND, "txpath_antmode=%d, rxpath_antmode=%d\n", antmode_tlv->txpath_antmode, antmode_tlv->rxpath_antmode); } cmd->size = wlan_cpu_to_le16(cmd->size); - PRINTM(MCMND, - "HS_CFG_CMD: condition:0x%x gpio:0x%x gap:0x%x holdoff=%d wake_interval=%d inactivity_timeout=%d\n", + PRINTM(MCMND, "HS_CFG_CMD: condition:0x%x gpio:0x%x\n", phs_cfg->params.hs_config.conditions, - phs_cfg->params.hs_config.gpio, + phs_cfg->params.hs_config.gpio); + PRINTM(MCMND, "HS_CFG_CMD: gap:0x%x holdoff=%d\n", phs_cfg->params.hs_config.gap, - pmadapter->min_wake_holdoff, pmadapter->hs_wake_interval, + pmadapter->min_wake_holdoff); + PRINTM(MCMND, + "HS_CFG_CMD: wake_interval=%d inactivity_timeout=%d\n", + pmadapter->hs_wake_interval, pmadapter->hs_inactivity_timeout); } @@ -661,22 +650,21 @@ wlan_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -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) +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) { 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) { + 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(); @@ -693,10 +681,10 @@ wlan_cmd_802_11_sleep_period(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -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) +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) { HostCmd_DS_802_11_SLEEP_PARAMS *pcmd_sp = &cmd->params.sleep_param; mlan_ds_sleep_params *psp = (mlan_ds_sleep_params *)pdata_buf; @@ -704,9 +692,8 @@ wlan_cmd_802_11_sleep_params(IN pmlan_private pmpriv, 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); + 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; @@ -736,18 +723,17 @@ wlan_cmd_802_11_sleep_params(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -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) +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) { 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->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); @@ -771,19 +757,18 @@ wlan_cmd_mac_multicast_adr(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_cmd_802_11_deauthenticate(IN pmlan_private pmpriv, - IN t_u16 cmd_no, - IN HostCmd_DS_COMMAND *cmd, IN t_void *pdata_buf) +static mlan_status wlan_cmd_802_11_deauthenticate(IN pmlan_private pmpriv, + IN t_u16 cmd_no, + IN HostCmd_DS_COMMAND *cmd, + IN t_void *pdata_buf) { HostCmd_DS_802_11_DEAUTHENTICATE *pdeauth = &cmd->params.deauth; ENTER(); cmd->command = wlan_cpu_to_le16(cmd_no); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_DEAUTHENTICATE) + - S_DS_GEN); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_DEAUTHENTICATE) + + S_DS_GEN); /* Set AP MAC address */ memcpy_ext(pmpriv->adapter, pdeauth, (t_u8 *)pdata_buf, @@ -797,7 +782,7 @@ wlan_cmd_802_11_deauthenticate(IN pmlan_private pmpriv, 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 +#define REASON_CODE_PEER_STA_LEAVING 36 pdeauth->reason_code = wlan_cpu_to_le16(REASON_CODE_PEER_STA_LEAVING); } else { @@ -816,8 +801,8 @@ wlan_cmd_802_11_deauthenticate(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_cmd_802_11_ad_hoc_stop(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd) +static mlan_status wlan_cmd_802_11_ad_hoc_stop(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd) { ENTER(); @@ -842,11 +827,11 @@ wlan_cmd_802_11_ad_hoc_stop(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) +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) { HostCmd_DS_802_11_KEY_MATERIAL *pkey_material = &cmd->params.key_material; @@ -883,10 +868,9 @@ wlan_cmd_802_11_key_material(IN pmlan_private pmpriv, KEY_INFO_CMAC_AES_KEY; pkey_material->key_param_set.key_info = wlan_cpu_to_le16(pkey_material->key_param_set.key_info); - cmd->size = - wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + - S_DS_GEN + KEY_PARAMS_FIXED_LEN + - sizeof(pkey_material->action)); + cmd->size = wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + + S_DS_GEN + KEY_PARAMS_FIXED_LEN + + sizeof(pkey_material->action)); goto done; } memset(pmpriv->adapter, &pkey_material->key_param_set, 0, @@ -900,17 +884,15 @@ wlan_cmd_802_11_key_material(IN pmlan_private pmpriv, wlan_cpu_to_le16(KEY_PARAMS_FIXED_LEN); pkey_material->key_param_set.key_idx = pkey->key_index & KEY_INDEX_MASK; - pkey_material->key_param_set.key_info = - wlan_cpu_to_le16(KEY_INFO_MCAST_KEY | - KEY_INFO_UCAST_KEY); + pkey_material->key_param_set.key_info = wlan_cpu_to_le16( + KEY_INFO_MCAST_KEY | KEY_INFO_UCAST_KEY); memcpy_ext(pmpriv->adapter, pkey_material->key_param_set.mac_addr, pkey->mac_addr, MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); - cmd->size = - wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + - S_DS_GEN + KEY_PARAMS_FIXED_LEN + - sizeof(pkey_material->action)); + cmd->size = wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + + S_DS_GEN + KEY_PARAMS_FIXED_LEN + + sizeof(pkey_material->action)); PRINTM(MCMND, "Remove Key\n"); goto done; } @@ -922,9 +904,8 @@ wlan_cmd_802_11_key_material(IN pmlan_private pmpriv, memcpy_ext(pmpriv->adapter, pkey_material->key_param_set.mac_addr, pkey->mac_addr, MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); if (pkey->key_len <= MAX_WEP_KEY_SIZE) { - pkey_material->key_param_set.length = - wlan_cpu_to_le16(KEY_PARAMS_FIXED_LEN + - sizeof(wep_param_t)); + pkey_material->key_param_set.length = wlan_cpu_to_le16( + KEY_PARAMS_FIXED_LEN + sizeof(wep_param_t)); pkey_material->key_param_set.key_type = KEY_TYPE_ID_WEP; if (pkey->is_current_wep_key) { pkey_material->key_param_set.key_info |= @@ -948,11 +929,10 @@ wlan_cmd_802_11_key_material(IN pmlan_private pmpriv, memcpy_ext(pmpriv->adapter, pkey_material->key_param_set.key_params.wep.key, pkey->key_material, pkey->key_len, MAX_WEP_KEY_SIZE); - cmd->size = - wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + - S_DS_GEN + KEY_PARAMS_FIXED_LEN + - sizeof(wep_param_t) + - sizeof(pkey_material->action)); + cmd->size = wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + + S_DS_GEN + KEY_PARAMS_FIXED_LEN + + sizeof(wep_param_t) + + sizeof(pkey_material->action)); PRINTM(MCMND, "Set WEP Key\n"); goto done; } @@ -982,14 +962,12 @@ wlan_cmd_802_11_key_material(IN pmlan_private pmpriv, pmpriv->sec_info.wapi_key_on = MTRUE; pkey_material->key_param_set.key_info = wlan_cpu_to_le16(pkey_material->key_param_set.key_info); - pkey_material->key_param_set.length = - wlan_cpu_to_le16(KEY_PARAMS_FIXED_LEN + - sizeof(wapi_param)); - cmd->size = - wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + - S_DS_GEN + KEY_PARAMS_FIXED_LEN + - sizeof(wapi_param) + - sizeof(pkey_material->action)); + pkey_material->key_param_set.length = wlan_cpu_to_le16( + KEY_PARAMS_FIXED_LEN + sizeof(wapi_param)); + cmd->size = wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + + S_DS_GEN + KEY_PARAMS_FIXED_LEN + + sizeof(wapi_param) + + sizeof(pkey_material->action)); PRINTM(MCMND, "Set WAPI Key\n"); goto done; } @@ -1010,12 +988,12 @@ wlan_cmd_802_11_key_material(IN pmlan_private pmpriv, wlan_cpu_to_le16(pkey_material->key_param_set.key_info); if (pkey->key_flags & KEY_FLAG_GCMP || pkey->key_flags & KEY_FLAG_GCMP_256) { - if (pkey-> - key_flags & (KEY_FLAG_RX_SEQ_VALID | KEY_FLAG_TX_SEQ_VALID)) - { - memcpy_ext(pmpriv->adapter, - pkey_material->key_param_set.key_params.gcmp. - pn, pkey->pn, SEQ_MAX_SIZE, WPA_PN_SIZE); + if (pkey->key_flags & + (KEY_FLAG_RX_SEQ_VALID | KEY_FLAG_TX_SEQ_VALID)) { + memcpy_ext( + pmpriv->adapter, + pkey_material->key_param_set.key_params.gcmp.pn, + pkey->pn, SEQ_MAX_SIZE, WPA_PN_SIZE); } if (pkey->key_flags & KEY_FLAG_GCMP) pkey_material->key_param_set.key_type = @@ -1028,14 +1006,12 @@ wlan_cmd_802_11_key_material(IN pmlan_private pmpriv, memcpy_ext(pmpriv->adapter, pkey_material->key_param_set.key_params.gcmp.key, pkey->key_material, pkey->key_len, WPA_GCMP_KEY_LEN); - pkey_material->key_param_set.length = - wlan_cpu_to_le16(KEY_PARAMS_FIXED_LEN + - sizeof(gcmp_param)); - cmd->size = - wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + - S_DS_GEN + KEY_PARAMS_FIXED_LEN + - sizeof(gcmp_param) - + sizeof(pkey_material->action)); + pkey_material->key_param_set.length = wlan_cpu_to_le16( + KEY_PARAMS_FIXED_LEN + sizeof(gcmp_param)); + cmd->size = wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + + S_DS_GEN + KEY_PARAMS_FIXED_LEN + + sizeof(gcmp_param) + + sizeof(pkey_material->action)); goto done; } @@ -1043,8 +1019,9 @@ wlan_cmd_802_11_key_material(IN pmlan_private pmpriv, if (pkey->key_flags & (KEY_FLAG_RX_SEQ_VALID | KEY_FLAG_TX_SEQ_VALID)) { memcpy(pmpriv->adapter, - pkey_material->key_param_set.key_params.ccmp256. - pn, pkey->pn, SEQ_MAX_SIZE); + pkey_material->key_param_set.key_params.ccmp256 + .pn, + pkey->pn, SEQ_MAX_SIZE); } pkey_material->key_param_set.key_type = KEY_TYPE_ID_CCMP_256; pkey_material->key_param_set.key_params.ccmp256.key_len = @@ -1052,49 +1029,46 @@ wlan_cmd_802_11_key_material(IN pmlan_private pmpriv, memcpy(pmpriv->adapter, pkey_material->key_param_set.key_params.ccmp256.key, pkey->key_material, pkey->key_len); - pkey_material->key_param_set.length = - wlan_cpu_to_le16(KEY_PARAMS_FIXED_LEN + - sizeof(ccmp_256_param)); - cmd->size = - wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + - S_DS_GEN + KEY_PARAMS_FIXED_LEN + - sizeof(ccmp_256_param) - + sizeof(pkey_material->action)); + pkey_material->key_param_set.length = wlan_cpu_to_le16( + KEY_PARAMS_FIXED_LEN + sizeof(ccmp_256_param)); + cmd->size = wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + + S_DS_GEN + KEY_PARAMS_FIXED_LEN + + sizeof(ccmp_256_param) + + sizeof(pkey_material->action)); goto done; } if (pkey->key_len == WPA_AES_KEY_LEN && !(pkey->key_flags & KEY_FLAG_AES_MCAST_IGTK)) { - if (pkey-> - key_flags & (KEY_FLAG_RX_SEQ_VALID | KEY_FLAG_TX_SEQ_VALID)) - memcpy_ext(pmpriv->adapter, - pkey_material->key_param_set.key_params.aes. - pn, pkey->pn, SEQ_MAX_SIZE, WPA_PN_SIZE); + if (pkey->key_flags & + (KEY_FLAG_RX_SEQ_VALID | KEY_FLAG_TX_SEQ_VALID)) + memcpy_ext( + pmpriv->adapter, + pkey_material->key_param_set.key_params.aes.pn, + pkey->pn, SEQ_MAX_SIZE, WPA_PN_SIZE); pkey_material->key_param_set.key_type = KEY_TYPE_ID_AES; pkey_material->key_param_set.key_params.aes.key_len = wlan_cpu_to_le16(pkey->key_len); memcpy_ext(pmpriv->adapter, pkey_material->key_param_set.key_params.aes.key, pkey->key_material, pkey->key_len, WPA_AES_KEY_LEN); - pkey_material->key_param_set.length = - wlan_cpu_to_le16(KEY_PARAMS_FIXED_LEN + - sizeof(aes_param)); - cmd->size = - wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + - S_DS_GEN + KEY_PARAMS_FIXED_LEN + - sizeof(aes_param) + - sizeof(pkey_material->action)); + pkey_material->key_param_set.length = wlan_cpu_to_le16( + KEY_PARAMS_FIXED_LEN + sizeof(aes_param)); + cmd->size = wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + + S_DS_GEN + KEY_PARAMS_FIXED_LEN + + sizeof(aes_param) + + sizeof(pkey_material->action)); PRINTM(MCMND, "Set AES Key\n"); goto done; } if (pkey->key_len == WPA_IGTK_KEY_LEN && (pkey->key_flags & KEY_FLAG_AES_MCAST_IGTK)) { - if (pkey-> - key_flags & (KEY_FLAG_RX_SEQ_VALID | KEY_FLAG_TX_SEQ_VALID)) + if (pkey->key_flags & + (KEY_FLAG_RX_SEQ_VALID | KEY_FLAG_TX_SEQ_VALID)) memcpy_ext(pmpriv->adapter, - pkey_material->key_param_set.key_params. - cmac_aes.ipn, pkey->pn, SEQ_MAX_SIZE, - IGTK_PN_SIZE); + pkey_material->key_param_set.key_params + .cmac_aes.ipn, + pkey->pn, SEQ_MAX_SIZE, IGTK_PN_SIZE); pkey_material->key_param_set.key_info &= ~(wlan_cpu_to_le16(KEY_INFO_MCAST_KEY)); pkey_material->key_param_set.key_info |= @@ -1105,37 +1079,34 @@ wlan_cmd_802_11_key_material(IN pmlan_private pmpriv, memcpy_ext(pmpriv->adapter, pkey_material->key_param_set.key_params.cmac_aes.key, pkey->key_material, pkey->key_len, CMAC_AES_KEY_LEN); - pkey_material->key_param_set.length = - wlan_cpu_to_le16(KEY_PARAMS_FIXED_LEN + - sizeof(cmac_aes_param)); - cmd->size = - wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + - S_DS_GEN + KEY_PARAMS_FIXED_LEN + - sizeof(cmac_aes_param) + - sizeof(pkey_material->action)); + pkey_material->key_param_set.length = wlan_cpu_to_le16( + KEY_PARAMS_FIXED_LEN + sizeof(cmac_aes_param)); + cmd->size = wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + + S_DS_GEN + KEY_PARAMS_FIXED_LEN + + sizeof(cmac_aes_param) + + sizeof(pkey_material->action)); PRINTM(MCMND, "Set CMAC AES Key\n"); goto done; } if (pkey->key_len == WPA_TKIP_KEY_LEN) { - if (pkey-> - key_flags & (KEY_FLAG_RX_SEQ_VALID | KEY_FLAG_TX_SEQ_VALID)) - memcpy_ext(pmpriv->adapter, - pkey_material->key_param_set.key_params.tkip. - pn, pkey->pn, SEQ_MAX_SIZE, WPA_PN_SIZE); + if (pkey->key_flags & + (KEY_FLAG_RX_SEQ_VALID | KEY_FLAG_TX_SEQ_VALID)) + memcpy_ext( + pmpriv->adapter, + pkey_material->key_param_set.key_params.tkip.pn, + pkey->pn, SEQ_MAX_SIZE, WPA_PN_SIZE); pkey_material->key_param_set.key_type = KEY_TYPE_ID_TKIP; pkey_material->key_param_set.key_params.tkip.key_len = wlan_cpu_to_le16(pkey->key_len); memcpy_ext(pmpriv->adapter, pkey_material->key_param_set.key_params.tkip.key, pkey->key_material, pkey->key_len, WPA_TKIP_KEY_LEN); - pkey_material->key_param_set.length = - wlan_cpu_to_le16(KEY_PARAMS_FIXED_LEN + - sizeof(tkip_param)); - cmd->size = - wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + - S_DS_GEN + KEY_PARAMS_FIXED_LEN + - sizeof(tkip_param) + - sizeof(pkey_material->action)); + pkey_material->key_param_set.length = wlan_cpu_to_le16( + KEY_PARAMS_FIXED_LEN + sizeof(tkip_param)); + cmd->size = wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + + S_DS_GEN + KEY_PARAMS_FIXED_LEN + + sizeof(tkip_param) + + sizeof(pkey_material->action)); PRINTM(MCMND, "Set TKIP Key\n"); } done: @@ -1154,15 +1125,15 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_cmd_gtk_rekey_offload(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, - IN t_u32 cmd_oid, IN t_void *pdata_buf) +static mlan_status wlan_cmd_gtk_rekey_offload(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, + IN t_u32 cmd_oid, + IN t_void *pdata_buf) { HostCmd_DS_GTK_REKEY_PARAMS *rekey = &cmd->params.gtk_rekey; mlan_ds_misc_gtk_rekey_data *data = - (mlan_ds_misc_gtk_rekey_data *) pdata_buf; + (mlan_ds_misc_gtk_rekey_data *)pdata_buf; t_u64 rekey_ctr; ENTER(); @@ -1175,9 +1146,8 @@ wlan_cmd_gtk_rekey_offload(IN pmlan_private pmpriv, MLAN_KEK_LEN); memcpy_ext(pmpriv->adapter, rekey->kck, data->kck, MLAN_KCK_LEN, MLAN_KCK_LEN); - rekey_ctr = - wlan_le64_to_cpu(swap_byte_64 - (*(t_u64 *)data->replay_ctr)); + rekey_ctr = wlan_le64_to_cpu( + swap_byte_64(*(t_u64 *)data->replay_ctr)); rekey->replay_ctr_low = wlan_cpu_to_le32((t_u32)rekey_ctr); rekey->replay_ctr_high = wlan_cpu_to_le32((t_u64)rekey_ctr >> 32); @@ -1197,10 +1167,9 @@ wlan_cmd_gtk_rekey_offload(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_cmd_eapol_pkt(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +static mlan_status wlan_cmd_eapol_pkt(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, IN t_void *pdata_buf) { HostCmd_DS_EAPOL_PKT *eapol_pkt = &cmd->params.eapol_pkt; mlan_buffer *pmbuf = (mlan_buffer *)pdata_buf; @@ -1213,8 +1182,8 @@ wlan_cmd_eapol_pkt(IN pmlan_private pmpriv, eapol_pkt->tlv_eapol.header.type = wlan_cpu_to_le16(TLV_TYPE_EAPOL_PKT); eapol_pkt->tlv_eapol.header.len = wlan_cpu_to_le16(pmbuf->data_len); memcpy_ext(pmpriv->adapter, eapol_pkt->tlv_eapol.pkt_buf, - pmbuf->pbuf + pmbuf->data_offset, - pmbuf->data_len, pmbuf->data_len); + pmbuf->pbuf + pmbuf->data_offset, pmbuf->data_len, + pmbuf->data_len); cmd->size += pmbuf->data_len; cmd->size = wlan_cpu_to_le16(cmd->size); @@ -1237,8 +1206,8 @@ wlan_cmd_802_11_supplicant_profile(IN pmlan_private pmpriv, 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); + (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; @@ -1246,9 +1215,8 @@ wlan_cmd_802_11_supplicant_profile(IN pmlan_private pmpriv, ENTER(); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_802_11_SUPPLICANT_PROFILE) + - S_DS_GEN - 1); + 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) { @@ -1261,12 +1229,10 @@ wlan_cmd_802_11_supplicant_profile(IN pmlan_private pmpriv, (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)); + 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); } @@ -1285,12 +1251,10 @@ wlan_cmd_802_11_supplicant_profile(IN pmlan_private pmpriv, pcipher_tlv->group_cipher = esupp->act_groupcipher & 0xff; } - ptlv_buffer += - (pcipher_tlv->header.len + - sizeof(MrvlIEtypesHeader_t)); - cmd->size += - (pcipher_tlv->header.len + - sizeof(MrvlIEtypesHeader_t)); + 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); } @@ -1310,22 +1274,21 @@ wlan_cmd_802_11_supplicant_profile(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -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) +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) { 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); + 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) - ) + if ((pmpriv->adapter->adhoc_start_band & BAND_A)) prf_chan->rf_type.bandcfg.chanBand = BAND_5GHZ; prf_chan->rf_type.bandcfg.chanWidth = pmpriv->adapter->chan_bandwidth; @@ -1347,10 +1310,10 @@ wlan_cmd_802_11_rf_channel(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -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) +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) { HostCmd_DS_802_11_IBSS_STATUS *pibss_coal = &(cmd->params.ibss_coalescing); @@ -1360,9 +1323,8 @@ wlan_cmd_ibss_coalescing_status(IN pmlan_private pmpriv, 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->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); @@ -1373,7 +1335,7 @@ wlan_cmd_ibss_coalescing_status(IN pmlan_private pmpriv, pibss_coal->enable = wlan_cpu_to_le16(enable); break; - /* In other case.. Nothing to do */ + /* In other case.. Nothing to do */ case HostCmd_ACT_GEN_GET: default: break; @@ -1393,10 +1355,10 @@ wlan_cmd_ibss_coalescing_status(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -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) +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) { t_u16 req_len = 0, travel_len = 0; custom_ie *cptr = MNULL; @@ -1415,40 +1377,31 @@ wlan_cmd_mgmt_ie_list(IN pmlan_private pmpriv, 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); + 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_ext(pmpriv->adapter, - pmgmt_ie_list->ds_mgmt_ie.ie_data_list, - cust_ie->ie_data_list, cust_ie->len, - sizeof(pmgmt_ie_list->ds_mgmt_ie. - ie_data_list)); + 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_ext(pmpriv->adapter, + pmgmt_ie_list->ds_mgmt_ie.ie_data_list, + cust_ie->ie_data_list, cust_ie->len, + sizeof(pmgmt_ie_list->ds_mgmt_ie.ie_data_list)); - cmd->size -= - (MAX_MGMT_IE_INDEX_TO_FW * sizeof(custom_ie)) + - sizeof(tlvbuf_max_mgmt_ie); + 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); @@ -1465,10 +1418,10 @@ wlan_cmd_mgmt_ie_list(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -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) +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) { 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; @@ -1477,9 +1430,8 @@ wlan_cmd_sysclock_cfg(IN pmlan_private pmpriv, 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); + 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); @@ -1502,10 +1454,10 @@ wlan_cmd_sysclock_cfg(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -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) +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) { mlan_ds_subscribe_evt *sub_evt = (mlan_ds_subscribe_evt *)pdata_buf; HostCmd_DS_SUBSCRIBE_EVENT *evt = @@ -1538,10 +1490,9 @@ wlan_cmd_subscribe_event(IN pmlan_private pmpriv, 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->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); @@ -1550,10 +1501,9 @@ wlan_cmd_subscribe_event(IN pmlan_private pmpriv, 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->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); @@ -1584,10 +1534,9 @@ wlan_cmd_subscribe_event(IN pmlan_private pmpriv, 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->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); @@ -1596,10 +1545,9 @@ wlan_cmd_subscribe_event(IN pmlan_private pmpriv, 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->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); @@ -1609,10 +1557,9 @@ wlan_cmd_subscribe_event(IN pmlan_private pmpriv, 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->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); @@ -1622,10 +1569,9 @@ wlan_cmd_subscribe_event(IN pmlan_private pmpriv, 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->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); @@ -1635,10 +1581,9 @@ wlan_cmd_subscribe_event(IN pmlan_private pmpriv, 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->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); @@ -1648,10 +1593,9 @@ wlan_cmd_subscribe_event(IN pmlan_private pmpriv, 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->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); @@ -1661,10 +1605,9 @@ wlan_cmd_subscribe_event(IN pmlan_private pmpriv, 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->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); @@ -1705,10 +1648,10 @@ done: * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -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) +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) { mlan_ds_misc_otp_user_data *user_data = (mlan_ds_misc_otp_user_data *)pdata_buf; @@ -1742,11 +1685,9 @@ wlan_cmd_otp_user_data(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_cmd_packet_aggr_over_host_interface(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, - IN t_void *pdata_buf) +static mlan_status wlan_cmd_packet_aggr_over_host_interface( + IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, IN t_void *pdata_buf) { HostCmd_DS_PACKET_AGGR_OVER_HOST_INTERFACE *packet_aggr = &cmd->params.packet_aggr; @@ -1769,15 +1710,12 @@ wlan_cmd_packet_aggr_over_host_interface(IN pmlan_private pmpriv, wlan_cpu_to_le16(MRVL_USB_AGGR_PARAM_TLV_ID); usb_aggr_param_tlv->header.len = wlan_cpu_to_le16(MRVL_USB_AGGR_PARAM_TLV_LEN); - cmd->size = - wlan_cpu_to_le16(sizeof - (HostCmd_DS_PACKET_AGGR_OVER_HOST_INTERFACE) + - S_DS_GEN + MRVL_USB_AGGR_PARAM_TLV_LEN + - sizeof(MrvlIEtypesHeader_t) - 1); + cmd->size = wlan_cpu_to_le16( + sizeof(HostCmd_DS_PACKET_AGGR_OVER_HOST_INTERFACE) + S_DS_GEN + + MRVL_USB_AGGR_PARAM_TLV_LEN + sizeof(MrvlIEtypesHeader_t) - 1); - if (pmadapter->data_sent || (!wlan_bypass_tx_list_empty(pmadapter)) - || (!wlan_wmm_lists_empty(pmadapter)) - ) { + if (pmadapter->data_sent || (!wlan_bypass_tx_list_empty(pmadapter)) || + (!wlan_wmm_lists_empty(pmadapter))) { /* Make sure this is not issued during traffic */ PRINTM(MERROR, "USB aggregation parameters cannot be accessed during traffic.\n"); @@ -1789,23 +1727,18 @@ wlan_cmd_packet_aggr_over_host_interface(IN pmlan_private pmpriv, usb_aggr_param_tlv->enable = 0; if (usb_aggr_ctrl->tx_aggr_ctrl.enable) usb_aggr_param_tlv->enable |= MBIT(1); - usb_aggr_param_tlv->tx_aggr_align = - wlan_cpu_to_le16(usb_aggr_ctrl->tx_aggr_ctrl. - aggr_align); + usb_aggr_param_tlv->tx_aggr_align = wlan_cpu_to_le16( + usb_aggr_ctrl->tx_aggr_ctrl.aggr_align); if (usb_aggr_ctrl->rx_deaggr_ctrl.enable) usb_aggr_param_tlv->enable |= MBIT(0); - usb_aggr_param_tlv->rx_aggr_mode = - wlan_cpu_to_le16(usb_aggr_ctrl->rx_deaggr_ctrl. - aggr_mode); - usb_aggr_param_tlv->rx_aggr_align = - wlan_cpu_to_le16(usb_aggr_ctrl->rx_deaggr_ctrl. - aggr_align); - usb_aggr_param_tlv->rx_aggr_max = - wlan_cpu_to_le16(usb_aggr_ctrl->rx_deaggr_ctrl. - aggr_max); - usb_aggr_param_tlv->rx_aggr_tmo = - wlan_cpu_to_le16(usb_aggr_ctrl->rx_deaggr_ctrl. - aggr_tmo); + usb_aggr_param_tlv->rx_aggr_mode = wlan_cpu_to_le16( + usb_aggr_ctrl->rx_deaggr_ctrl.aggr_mode); + usb_aggr_param_tlv->rx_aggr_align = wlan_cpu_to_le16( + usb_aggr_ctrl->rx_deaggr_ctrl.aggr_align); + usb_aggr_param_tlv->rx_aggr_max = wlan_cpu_to_le16( + usb_aggr_ctrl->rx_deaggr_ctrl.aggr_max); + usb_aggr_param_tlv->rx_aggr_tmo = wlan_cpu_to_le16( + usb_aggr_ctrl->rx_deaggr_ctrl.aggr_tmo); usb_aggr_param_tlv->enable = wlan_cpu_to_le16(usb_aggr_param_tlv->enable); } @@ -1823,9 +1756,9 @@ wlan_cmd_packet_aggr_over_host_interface(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_cmd_inactivity_timeout(IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +static mlan_status wlan_cmd_inactivity_timeout(IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, + IN t_void *pdata_buf) { pmlan_ds_inactivity_to inac_to; HostCmd_DS_INACTIVITY_TIMEOUT_EXT *cmd_inac_to = @@ -1835,9 +1768,8 @@ wlan_cmd_inactivity_timeout(IN HostCmd_DS_COMMAND *cmd, inac_to = (mlan_ds_inactivity_to *)pdata_buf; - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_INACTIVITY_TIMEOUT_EXT) + - S_DS_GEN); + 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) { @@ -1865,9 +1797,9 @@ wlan_cmd_inactivity_timeout(IN HostCmd_DS_COMMAND *cmd, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_cmd_low_pwr_mode(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, IN t_void *pdata_buf) +static mlan_status wlan_cmd_low_pwr_mode(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_void *pdata_buf) { HostCmd_CONFIG_LOW_PWR_MODE *cmd_lpm_cfg = &cmd->params.low_pwr_mode_cfg; @@ -1896,10 +1828,10 @@ wlan_cmd_low_pwr_mode(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_cmd_dfs_repeater_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +static mlan_status wlan_cmd_dfs_repeater_cfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, + IN t_void *pdata_buf) { mlan_ds_misc_dfs_repeater *dfs_repeater = MNULL; HostCmd_DS_DFS_REPEATER_MODE *cmd_dfs_repeater = @@ -1931,17 +1863,17 @@ wlan_cmd_dfs_repeater_cfg(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_coalesce_config(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_coalesce_config(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, IN t_void *pdata_buf) { HostCmd_DS_COALESCE_CONFIG *coalesce_config = &cmd->params.coalesce_config; - mlan_ds_coalesce_cfg *cfg = (mlan_ds_coalesce_cfg *) pdata_buf; + mlan_ds_coalesce_cfg *cfg = (mlan_ds_coalesce_cfg *)pdata_buf; t_u16 cnt, idx, length; struct coalesce_filt_field_param *param; struct coalesce_receive_filt_rule *rule; + ENTER(); cmd->size = sizeof(HostCmd_DS_COALESCE_CONFIG) + S_DS_GEN; @@ -1953,53 +1885,50 @@ wlan_cmd_coalesce_config(IN pmlan_private pmpriv, for (cnt = 0; cnt < cfg->num_of_rules; cnt++) { rule->header.type = wlan_cpu_to_le16(TLV_TYPE_COALESCE_RULE); - rule->max_coalescing_delay = - wlan_cpu_to_le16(cfg->rule[cnt]. - max_coalescing_delay); + rule->max_coalescing_delay = wlan_cpu_to_le16( + cfg->rule[cnt].max_coalescing_delay); rule->pkt_type = cfg->rule[cnt].pkt_type; rule->num_of_fields = cfg->rule[cnt].num_of_fields; length = 0; param = rule->params; - for (idx = 0; idx < cfg->rule[cnt].num_of_fields; idx++) { + for (idx = 0; idx < cfg->rule[cnt].num_of_fields; + idx++) { param->operation = cfg->rule[cnt].params[idx].operation; param->operand_len = cfg->rule[cnt].params[idx].operand_len; - param->offset = - wlan_cpu_to_le16(cfg->rule[cnt]. - params[idx].offset); + param->offset = wlan_cpu_to_le16( + cfg->rule[cnt].params[idx].offset); memcpy_ext(pmpriv->adapter, param->operand_byte_stream, - cfg->rule[cnt].params[idx]. - operand_byte_stream, + cfg->rule[cnt] + .params[idx] + .operand_byte_stream, param->operand_len, sizeof(param->operand_byte_stream)); - length += - sizeof(struct - coalesce_filt_field_param); + length += sizeof( + struct coalesce_filt_field_param); param++; } - /* Total rule length is sizeof max_coalescing_delay(t_u16), - * num_of_fields(t_u8), pkt_type(t_u8) and total length of the all - * params + /* Total rule length is sizeof + * max_coalescing_delay(t_u16), num_of_fields(t_u8), + * pkt_type(t_u8) and total length of the all params */ rule->header.len = wlan_cpu_to_le16(length + sizeof(t_u16) + sizeof(t_u8) + sizeof(t_u8)); - /* Add the rule length to the command size */ - cmd->size += - wlan_le16_to_cpu(rule->header.len) + - sizeof(MrvlIEtypesHeader_t); + /* Add the rule length to the command size*/ + cmd->size += wlan_le16_to_cpu(rule->header.len) + + sizeof(MrvlIEtypesHeader_t); rule = (void *)((t_u8 *)rule->params + length); } - } cmd->size = wlan_cpu_to_le16(cmd->size); LEAVE(); @@ -2007,18 +1936,17 @@ wlan_cmd_coalesce_config(IN pmlan_private pmpriv, } /******************************************************** - Global Functions -********************************************************/ + * Global Functions + ********************************************************/ -static mlan_status -wlan_cmd_get_sensor_temp(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, IN t_u16 cmd_action) +static mlan_status wlan_cmd_get_sensor_temp(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action) { ENTER(); if (cmd_action != HostCmd_ACT_GEN_GET) { - PRINTM(MERROR, - "wlan_cmd_get_sensor_temp(): support GET only.\n"); + PRINTM(MERROR, "wlan_cmd_get_sensor_temp: support GET only.\n"); LEAVE(); return MLAN_STATUS_FAILURE; } @@ -2028,7 +1956,6 @@ wlan_cmd_get_sensor_temp(IN pmlan_private pmpriv, LEAVE(); return MLAN_STATUS_SUCCESS; - } /** @@ -2038,11 +1965,11 @@ wlan_cmd_get_sensor_temp(IN pmlan_private pmpriv, * @param cmd Hostcmd ID * @return N/A */ -static mlan_status -wlan_cmd_sta_config(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, - IN mlan_ioctl_req *pioctl_buf, IN t_void *pdata_buf) +static mlan_status wlan_cmd_sta_config(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, + IN mlan_ioctl_req *pioctl_buf, + IN t_void *pdata_buf) { mlan_ds_bss *bss = MNULL; HostCmd_DS_STA_CONFIGURE *sta_cfg_cmd = &cmd->params.sta_cfg; @@ -2059,23 +1986,19 @@ wlan_cmd_sta_config(IN pmlan_private pmpriv, (cmd_action == HostCmd_ACT_GEN_GET)) { cmd->command = wlan_cpu_to_le16(HostCmd_CMD_STA_CONFIGURE); - cmd->size = - wlan_cpu_to_le16(S_DS_GEN + - sizeof - (HostCmd_DS_STA_CONFIGURE) + - sizeof(*tlv_band_channel)); + cmd->size = wlan_cpu_to_le16( + S_DS_GEN + sizeof(HostCmd_DS_STA_CONFIGURE) + + sizeof(*tlv_band_channel)); sta_cfg_cmd->action = wlan_cpu_to_le16(cmd_action); - tlv_band_channel = - (MrvlIEtypes_channel_band_t *)sta_cfg_cmd-> - tlv_buffer; + tlv_band_channel = (MrvlIEtypes_channel_band_t *) + sta_cfg_cmd->tlv_buffer; memset(pmpriv->adapter, tlv_band_channel, 0x00, sizeof(*tlv_band_channel)); tlv_band_channel->header.type = wlan_cpu_to_le16(TLV_TYPE_CHANNELBANDLIST); - tlv_band_channel->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_channel_band_t) - - sizeof(MrvlIEtypesHeader_t)); + tlv_band_channel->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_channel_band_t) - + sizeof(MrvlIEtypesHeader_t)); ret = MLAN_STATUS_SUCCESS; } } @@ -2094,19 +2017,19 @@ wlan_cmd_sta_config(IN pmlan_private pmpriv, * @param pdata_buf A void pointer to information buffer * @return N/A */ -static mlan_status -wlan_cmd_auto_tx(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_u32 cmd_oid, IN t_void *pdata_buf) +static mlan_status wlan_cmd_auto_tx(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, IN t_u32 cmd_oid, + IN t_void *pdata_buf) { HostCmd_DS_AUTO_TX *auto_tx_cmd = &cmd->params.auto_tx; - t_u8 *pos = (t_u8 *)auto_tx_cmd + sizeof(auto_tx_cmd->action); + t_u8 *pos = (t_u8 *)auto_tx_cmd->tlv_buffer; t_u16 len = 0; MrvlIEtypes_Cloud_Keep_Alive_t *keep_alive_tlv = MNULL; MrvlIEtypes_Keep_Alive_Ctrl_t *ctrl_tlv = MNULL; MrvlIEtypes_Keep_Alive_Pkt_t *pkt_tlv = MNULL; mlan_ds_misc_keep_alive *misc_keep_alive = MNULL; - t_u8 eth_ip[] = { 0x08, 0x00 }; + t_u8 eth_ip[] = {0x08, 0x00}; ENTER(); @@ -2116,47 +2039,38 @@ wlan_cmd_auto_tx(IN pmlan_private pmpriv, switch (cmd_oid) { case OID_CLOUD_KEEP_ALIVE: - misc_keep_alive = (mlan_ds_misc_keep_alive *) pdata_buf; - keep_alive_tlv = (MrvlIEtypes_Cloud_Keep_Alive_t *) pos; + misc_keep_alive = (mlan_ds_misc_keep_alive *)pdata_buf; + keep_alive_tlv = (MrvlIEtypes_Cloud_Keep_Alive_t *)pos; keep_alive_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_CLOUD_KEEP_ALIVE); keep_alive_tlv->keep_alive_id = misc_keep_alive->mkeep_alive_id; keep_alive_tlv->enable = misc_keep_alive->enable; len = len + sizeof(keep_alive_tlv->keep_alive_id) + - sizeof(keep_alive_tlv->enable); + sizeof(keep_alive_tlv->enable); pos = pos + len + sizeof(MrvlIEtypesHeader_t); if (cmd_action == HostCmd_ACT_GEN_SET) { if (misc_keep_alive->enable) { - ctrl_tlv = - (MrvlIEtypes_Keep_Alive_Ctrl_t *) pos; - ctrl_tlv->header.type = - wlan_cpu_to_le16 - (TLV_TYPE_KEEP_ALIVE_CTRL); - ctrl_tlv->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_Keep_Alive_Ctrl_t) - - - sizeof - (MrvlIEtypesHeader_t)); - ctrl_tlv->snd_interval = - wlan_cpu_to_le32(misc_keep_alive-> - send_interval); - ctrl_tlv->retry_interval = - wlan_cpu_to_le16(misc_keep_alive-> - retry_interval); - ctrl_tlv->retry_count = - wlan_cpu_to_le16(misc_keep_alive-> - retry_count); + ctrl_tlv = (MrvlIEtypes_Keep_Alive_Ctrl_t *)pos; + ctrl_tlv->header.type = wlan_cpu_to_le16( + TLV_TYPE_KEEP_ALIVE_CTRL); + ctrl_tlv->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_Keep_Alive_Ctrl_t) - + sizeof(MrvlIEtypesHeader_t)); + ctrl_tlv->snd_interval = wlan_cpu_to_le32( + misc_keep_alive->send_interval); + ctrl_tlv->retry_interval = wlan_cpu_to_le16( + misc_keep_alive->retry_interval); + ctrl_tlv->retry_count = wlan_cpu_to_le16( + misc_keep_alive->retry_count); len = len + - sizeof(MrvlIEtypes_Keep_Alive_Ctrl_t); + sizeof(MrvlIEtypes_Keep_Alive_Ctrl_t); pos = pos + - sizeof(MrvlIEtypes_Keep_Alive_Ctrl_t); - pkt_tlv = (MrvlIEtypes_Keep_Alive_Pkt_t *) pos; - pkt_tlv->header.type = - wlan_cpu_to_le16 - (TLV_TYPE_KEEP_ALIVE_PKT); + sizeof(MrvlIEtypes_Keep_Alive_Ctrl_t); + pkt_tlv = (MrvlIEtypes_Keep_Alive_Pkt_t *)pos; + pkt_tlv->header.type = wlan_cpu_to_le16( + TLV_TYPE_KEEP_ALIVE_PKT); memcpy_ext(pmpriv->adapter, pkt_tlv->eth_header.dest_addr, misc_keep_alive->dst_mac, @@ -2167,38 +2081,36 @@ wlan_cmd_auto_tx(IN pmlan_private pmpriv, misc_keep_alive->src_mac, MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); - memcpy_ext(pmpriv->adapter, - (t_u8 *)&pkt_tlv->eth_header. - h803_len, eth_ip, sizeof(t_u16), - sizeof(t_u16)); + memcpy_ext( + pmpriv->adapter, + (t_u8 *)&pkt_tlv->eth_header.h803_len, + eth_ip, sizeof(t_u16), sizeof(t_u16)); if (misc_keep_alive->ether_type) - pkt_tlv->eth_header.h803_len = - mlan_htons(misc_keep_alive-> - ether_type); + pkt_tlv->eth_header + .h803_len = mlan_htons( + misc_keep_alive->ether_type); else memcpy_ext(pmpriv->adapter, - (t_u8 *)&pkt_tlv->eth_header. - h803_len, eth_ip, - sizeof(t_u16), + (t_u8 *)&pkt_tlv->eth_header + .h803_len, + eth_ip, sizeof(t_u16), sizeof(t_u16)); - pkt_tlv->header.len = - wlan_cpu_to_le16(sizeof(Eth803Hdr_t) + - misc_keep_alive-> - pkt_len); - len = len + sizeof(MrvlIEtypesHeader_t) + + pkt_tlv->header.len = wlan_cpu_to_le16( sizeof(Eth803Hdr_t) + - misc_keep_alive->pkt_len; + misc_keep_alive->pkt_len); + len = len + sizeof(MrvlIEtypesHeader_t) + + sizeof(Eth803Hdr_t) + + misc_keep_alive->pkt_len; } else { - pkt_tlv = (MrvlIEtypes_Keep_Alive_Pkt_t *) pos; - pkt_tlv->header.type = - wlan_cpu_to_le16 - (TLV_TYPE_KEEP_ALIVE_PKT); + pkt_tlv = (MrvlIEtypes_Keep_Alive_Pkt_t *)pos; + pkt_tlv->header.type = wlan_cpu_to_le16( + TLV_TYPE_KEEP_ALIVE_PKT); pkt_tlv->header.len = 0; len = len + sizeof(MrvlIEtypesHeader_t); } } if (cmd_action == HostCmd_ACT_GEN_RESET) { - pkt_tlv = (MrvlIEtypes_Keep_Alive_Pkt_t *) pos; + pkt_tlv = (MrvlIEtypes_Keep_Alive_Pkt_t *)pos; pkt_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_KEEP_ALIVE_PKT); pkt_tlv->header.len = 0; @@ -2225,10 +2137,10 @@ wlan_cmd_auto_tx(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_is_cmd_allowed(mlan_private *priv, IN t_u16 cmd_no) +mlan_status wlan_is_cmd_allowed(mlan_private *priv, IN t_u16 cmd_no) { mlan_status ret = MLAN_STATUS_SUCCESS; + ENTER(); if (priv->adapter->pcard_info->v16_fw_api) { if (!IS_FW_SUPPORT_ADHOC(priv->adapter)) { @@ -2262,13 +2174,10 @@ wlan_is_cmd_allowed(mlan_private *priv, IN t_u16 cmd_no) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) +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) { HostCmd_DS_COMMAND *cmd_ptr = (HostCmd_DS_COMMAND *)pcmd_buf; mlan_private *pmpriv = (mlan_private *)priv; @@ -2322,8 +2231,8 @@ wlan_ops_sta_prepare_cmd(IN t_void *priv, 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); + 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, @@ -2351,13 +2260,11 @@ wlan_ops_sta_prepare_cmd(IN t_void *priv, cmd_ptr->size = wlan_cpu_to_le16(S_DS_GEN); break; case HostCmd_CMD_802_11_SLEEP_PERIOD: - ret = wlan_cmd_802_11_sleep_period(pmpriv, cmd_ptr, - cmd_action, + 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, + ret = wlan_cmd_802_11_sleep_params(pmpriv, cmd_ptr, cmd_action, (t_u16 *)pdata_buf); break; case HostCmd_CMD_802_11_SCAN: @@ -2411,9 +2318,8 @@ wlan_ops_sta_prepare_cmd(IN t_void *priv, 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); + cmd_ptr->size = wlan_cpu_to_le16(sizeof(HostCmd_TX_RATE_QUERY) + + S_DS_GEN); pmpriv->tx_rate = 0; ret = MLAN_STATUS_SUCCESS; break; @@ -2421,9 +2327,8 @@ wlan_ops_sta_prepare_cmd(IN t_void *priv, 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); + 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: @@ -2432,9 +2337,8 @@ wlan_ops_sta_prepare_cmd(IN t_void *priv, 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); + 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, @@ -2523,9 +2427,8 @@ wlan_ops_sta_prepare_cmd(IN t_void *priv, 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); + 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: @@ -2594,15 +2497,14 @@ wlan_ops_sta_prepare_cmd(IN t_void *priv, cmd_ptr->params.bss_mode.con_type = *(t_u8 *)pdata_buf; } else #endif - if (pmpriv->bss_mode == MLAN_BSS_MODE_IBSS) + 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); + 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: @@ -2648,9 +2550,8 @@ wlan_ops_sta_prepare_cmd(IN t_void *priv, break; #ifdef USB case HostCmd_CMD_PACKET_AGGR_OVER_HOST_INTERFACE: - ret = wlan_cmd_packet_aggr_over_host_interface(pmpriv, cmd_ptr, - cmd_action, - pdata_buf); + ret = wlan_cmd_packet_aggr_over_host_interface( + pmpriv, cmd_ptr, cmd_action, pdata_buf); break; #endif #ifdef RX_PACKET_COALESCE @@ -2663,12 +2564,12 @@ wlan_ops_sta_prepare_cmd(IN t_void *priv, ret = wlan_cmd_low_pwr_mode(pmpriv, cmd_ptr, pdata_buf); break; case HostCmd_DFS_REPEATER_MODE: - ret = wlan_cmd_dfs_repeater_cfg(pmpriv, cmd_ptr, - cmd_action, pdata_buf); + ret = wlan_cmd_dfs_repeater_cfg(pmpriv, cmd_ptr, cmd_action, + pdata_buf); break; case HostCmd_CMD_COALESCE_CFG: - ret = wlan_cmd_coalesce_config(pmpriv, cmd_ptr, - cmd_action, pdata_buf); + ret = wlan_cmd_coalesce_config(pmpriv, cmd_ptr, cmd_action, + pdata_buf); break; case HostCmd_DS_GET_SENSOR_TEMP: ret = wlan_cmd_get_sensor_temp(pmpriv, cmd_ptr, cmd_action); @@ -2691,9 +2592,8 @@ wlan_ops_sta_prepare_cmd(IN t_void *priv, break; case HostCmd_CMD_CHAN_REGION_CFG: cmd_ptr->command = wlan_cpu_to_le16(cmd_no); - cmd_ptr->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_CHAN_REGION_CFG) + - S_DS_GEN); + cmd_ptr->size = wlan_cpu_to_le16( + sizeof(HostCmd_DS_CHAN_REGION_CFG) + S_DS_GEN); cmd_ptr->params.reg_cfg.action = wlan_cpu_to_le16(cmd_action); break; case HostCmd_CMD_AUTO_TX: @@ -2728,6 +2628,9 @@ wlan_ops_sta_prepare_cmd(IN t_void *priv, case HostCmd_CMD_11AX_CMD: ret = wlan_cmd_11ax_cmd(pmpriv, cmd_ptr, cmd_action, pdata_buf); break; + case HostCmd_CMD_TWT_CFG: + ret = wlan_cmd_twt_cfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); + break; case HostCmd_CMD_RX_ABORT_CFG: ret = wlan_cmd_rxabortcfg(pmpriv, cmd_ptr, cmd_action, pdata_buf); @@ -2753,9 +2656,8 @@ wlan_ops_sta_prepare_cmd(IN t_void *priv, pdata_buf); break; case HostCmd_CMD_LOW_POWER_MODE_CFG: - ret = wlan_cmd_set_get_low_power_mode_cfg(pmpriv, cmd_ptr, - cmd_action, - pdata_buf); + ret = wlan_cmd_set_get_low_power_mode_cfg( + pmpriv, cmd_ptr, cmd_action, pdata_buf); break; default: PRINTM(MERROR, "PREP_CMD: unknown command- %#x\n", cmd_no); @@ -2775,8 +2677,7 @@ wlan_ops_sta_prepare_cmd(IN t_void *priv, * * @return MLAN_STATUS_PENDING or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ops_sta_init_cmd(IN t_void *priv, IN t_u8 first_bss) +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; @@ -2805,8 +2706,7 @@ wlan_ops_sta_init_cmd(IN t_void *priv, IN t_u8 first_bss) pmpriv->data_rate = 0; /* get tx power */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_RF_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; @@ -2832,13 +2732,12 @@ wlan_ops_sta_init_cmd(IN t_void *priv, IN t_u8 first_bss) ret = MLAN_STATUS_FAILURE; goto done; } - /** set last_init_cmd */ + /** 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, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_MAC_ADDRESS, HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); if (ret) { ret = MLAN_STATUS_FAILURE; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_cmdresp.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_cmdresp.c index ac06eaa2afad..985c9726e039 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_cmdresp.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_cmdresp.c @@ -22,9 +22,9 @@ */ /****************************************************** -Change log: - 10/21/2008: initial version -******************************************************/ + * Change log: + * 10/21/2008: initial version + ******************************************************/ #include "mlan.h" #include "mlan_join.h" @@ -39,16 +39,16 @@ Change log: #include "mlan_meas.h" /******************************************************** - Local Variables -********************************************************/ + * Local Variables + ********************************************************/ /******************************************************** - Global Variables -********************************************************/ + * Global Variables + ********************************************************/ /******************************************************** - Local Functions -********************************************************/ + * Local Functions + ********************************************************/ /** * @brief This function handles the command response error @@ -59,9 +59,9 @@ Change log: * * @return N/A */ -static mlan_status -wlan_process_cmdresp_error(mlan_private *pmpriv, HostCmd_DS_COMMAND *resp, - mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_process_cmdresp_error(mlan_private *pmpriv, + HostCmd_DS_COMMAND *resp, + mlan_ioctl_req *pioctl_buf) { mlan_adapter *pmadapter = pmpriv->adapter; pmlan_ioctl_req pscan_ioctl_req = MNULL; @@ -72,31 +72,28 @@ wlan_process_cmdresp_error(mlan_private *pmpriv, HostCmd_DS_COMMAND *resp, mlan_status ret = MLAN_STATUS_FAILURE; ENTER(); - if (resp->command != HostCmd_CMD_WMM_PARAM_CONFIG - && resp->command != HostCmd_CMD_CHAN_REGION_CFG) + if (resp->command != HostCmd_CMD_WMM_PARAM_CONFIG && + resp->command != HostCmd_CMD_CHAN_REGION_CFG) 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_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 */ @@ -112,10 +109,10 @@ wlan_process_cmdresp_error(mlan_private *pmpriv, HostCmd_DS_COMMAND *resp, if (pscan_ioctl_req) { pscan_ioctl_req->status_code = MLAN_ERROR_CMD_SCAN_FAIL; /* Indicate ioctl complete */ - pcb->moal_ioctl_complete(pmadapter->pmoal_handle, - (pmlan_ioctl_req) - pscan_ioctl_req, - MLAN_STATUS_FAILURE); + pcb->moal_ioctl_complete( + pmadapter->pmoal_handle, + (pmlan_ioctl_req)pscan_ioctl_req, + MLAN_STATUS_FAILURE); } wlan_release_cmd_lock(pmadapter); wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_SCAN_REPORT, MNULL); @@ -128,8 +125,8 @@ wlan_process_cmdresp_error(mlan_private *pmpriv, HostCmd_DS_COMMAND *resp, #ifdef USB if (IS_USB(pmadapter->card_type)) { for (i = 0; i < MAX_USB_TX_PORT_NUM; i++) - pmadapter->pcard_usb->usb_tx_aggr[i].aggr_ctrl. - enable = MFALSE; + pmadapter->pcard_usb->usb_tx_aggr[i] + .aggr_ctrl.enable = MFALSE; pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl.enable = MFALSE; } @@ -154,72 +151,60 @@ wlan_process_cmdresp_error(mlan_private *pmpriv, HostCmd_DS_COMMAND *resp, break; #endif - case HostCmd_CMD_MGMT_IE_LIST: - { - HostCmd_DS_MGMT_IE_LIST_CFG *pmgmt_ie_list = - &(resp->params.mgmt_ie_list); - t_u16 resp_len = 0, travel_len = 0, index; - mlan_ds_misc_custom_ie *cust_ie = MNULL; - custom_ie *cptr; + case HostCmd_CMD_MGMT_IE_LIST: { + HostCmd_DS_MGMT_IE_LIST_CFG *pmgmt_ie_list = + &(resp->params.mgmt_ie_list); + t_u16 resp_len = 0, travel_len = 0, index; + mlan_ds_misc_custom_ie *cust_ie = MNULL; + custom_ie *cptr; - if (wlan_le16_to_cpu(pmgmt_ie_list->action) == - HostCmd_ACT_GEN_GET) - break; + if (wlan_le16_to_cpu(pmgmt_ie_list->action) == + HostCmd_ACT_GEN_GET) + break; - cust_ie = - (mlan_ds_misc_custom_ie *)&pmgmt_ie_list-> - ds_mgmt_ie; - 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); + cust_ie = (mlan_ds_misc_custom_ie *)&pmgmt_ie_list->ds_mgmt_ie; + 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); - index = 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; - if ((pmpriv->mgmt_ie[index]. - mgmt_subtype_mask == - cptr->mgmt_subtype_mask) && - (pmpriv->mgmt_ie[index].ie_length == - cptr->ie_length) && - !memcmp(pmpriv->adapter, - pmpriv->mgmt_ie[index]. - ie_buffer, cptr->ie_buffer, - cptr->ie_length)) { - PRINTM(MERROR, - "set custom ie fail, remove ie index :%d\n", - index); - memset(pmadapter, - &pmpriv->mgmt_ie[index], - 0, sizeof(custom_ie)); - } + while (resp_len > sizeof(t_u16)) { + cptr = (custom_ie *)(((t_u8 *)cust_ie + ->ie_data_list) + + travel_len); + index = 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; + if ((pmpriv->mgmt_ie[index].mgmt_subtype_mask == + cptr->mgmt_subtype_mask) && + (pmpriv->mgmt_ie[index].ie_length == + cptr->ie_length) && + !memcmp(pmpriv->adapter, + pmpriv->mgmt_ie[index].ie_buffer, + cptr->ie_buffer, cptr->ie_length)) { + PRINTM(MERROR, + "set custom ie fail, remove ie index :%d\n", + index); + memset(pmadapter, + &pmpriv->mgmt_ie[index], 0, + sizeof(custom_ie)); } } } - break; + } break; case HostCmd_CMD_CHAN_REGION_CFG: ret = MLAN_STATUS_SUCCESS; PRINTM(MCMND, "FW don't support chan region cfg command!\n"); @@ -254,10 +239,9 @@ wlan_process_cmdresp_error(mlan_private *pmpriv, HostCmd_DS_COMMAND *resp, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_802_11_rssi_info_ext(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_802_11_rssi_info_ext(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCmd_DS_802_11_RSSI_INFO_EXT *prssi_info_rsp = &resp->params.rssi_info_ext; @@ -273,66 +257,56 @@ wlan_ret_802_11_rssi_info_ext(IN pmlan_private pmpriv, if (pioctl_buf != MNULL) { info = (mlan_ds_get_info *)pioctl_buf->pbuf; signal_info_tlv = - (MrvlIEtypes_RSSI_EXT_t *) ((t_u8 *)prssi_info_rsp + - sizeof - (HostCmd_DS_802_11_RSSI_INFO_EXT)); + (MrvlIEtypes_RSSI_EXT_t *)(prssi_info_rsp->tlv_buf); tlv_left_len = - resp->size - (sizeof(HostCmd_DS_802_11_RSSI_INFO_EXT) + - S_DS_GEN); + resp->size - + (sizeof(HostCmd_DS_802_11_RSSI_INFO_EXT) + S_DS_GEN); while (tlv_left_len >= sizeof(MrvlIEtypes_RSSI_EXT_t)) { tlv_id = wlan_le16_to_cpu(signal_info_tlv->header.type); tlv_len = wlan_le16_to_cpu(signal_info_tlv->header.len); if ((tlv_id != TLV_TYPE_RSSI_INFO) || - (tlv_len != - sizeof(MrvlIEtypes_RSSI_EXT_t) - - sizeof(MrvlIEtypesHeader_t))) { + (tlv_len != sizeof(MrvlIEtypes_RSSI_EXT_t) - + sizeof(MrvlIEtypesHeader_t))) { PRINTM(MERROR, "Invalid RSSI INFO TLV, type=%d, len=%d\n", tlv_id, tlv_len); break; } - signal = (mlan_ds_get_signal *)&info->param. - signal_ext[tlv_num]; + signal = (mlan_ds_get_signal *)&info->param + .signal_ext[tlv_num]; /* PATH ID */ signal->selector = wlan_le16_to_cpu(signal_info_tlv->path_id); /* RSSI */ - signal->bcn_rssi_last = - wlan_le16_to_cpu(signal_info_tlv-> - bcn_rssi_last); + signal->bcn_rssi_last = wlan_le16_to_cpu( + signal_info_tlv->bcn_rssi_last); signal->bcn_rssi_avg = wlan_le16_to_cpu(signal_info_tlv->bcn_rssi_avg); - signal->data_rssi_last = - wlan_le16_to_cpu(signal_info_tlv-> - data_rssi_last); - signal->data_rssi_avg = - wlan_le16_to_cpu(signal_info_tlv-> - data_rssi_avg); + signal->data_rssi_last = wlan_le16_to_cpu( + signal_info_tlv->data_rssi_last); + signal->data_rssi_avg = wlan_le16_to_cpu( + signal_info_tlv->data_rssi_avg); /* SNR */ - signal->bcn_snr_last = - CAL_SNR(wlan_le16_to_cpu - (signal_info_tlv->bcn_rssi_last), - wlan_le16_to_cpu(signal_info_tlv-> - bcn_nf_last)); - signal->bcn_snr_avg = - CAL_SNR(wlan_le16_to_cpu - (signal_info_tlv->bcn_rssi_avg), - wlan_le16_to_cpu(signal_info_tlv-> - bcn_nf_avg)); - signal->data_snr_last = - CAL_SNR(wlan_le16_to_cpu - (signal_info_tlv->data_rssi_last), - wlan_le16_to_cpu(signal_info_tlv-> - data_nf_last)); - signal->data_snr_avg = - CAL_SNR(wlan_le16_to_cpu - (signal_info_tlv->data_rssi_avg), - wlan_le16_to_cpu(signal_info_tlv-> - data_nf_avg)); + signal->bcn_snr_last = CAL_SNR( + wlan_le16_to_cpu( + signal_info_tlv->bcn_rssi_last), + wlan_le16_to_cpu(signal_info_tlv->bcn_nf_last)); + signal->bcn_snr_avg = CAL_SNR( + wlan_le16_to_cpu(signal_info_tlv->bcn_rssi_avg), + wlan_le16_to_cpu(signal_info_tlv->bcn_nf_avg)); + signal->data_snr_last = CAL_SNR( + wlan_le16_to_cpu( + signal_info_tlv->data_rssi_last), + wlan_le16_to_cpu( + signal_info_tlv->data_nf_last)); + signal->data_snr_avg = CAL_SNR( + wlan_le16_to_cpu( + signal_info_tlv->data_rssi_avg), + wlan_le16_to_cpu(signal_info_tlv->data_nf_avg)); /* NF */ signal->bcn_nf_last = @@ -368,10 +342,9 @@ wlan_ret_802_11_rssi_info_ext(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_802_11_rssi_info(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_802_11_rssi_info(IN pmlan_private pmpriv, + 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; @@ -397,10 +370,9 @@ wlan_ret_802_11_rssi_info(IN pmlan_private pmpriv, /* Get current BSS info */ pbss_desc = &pmpriv->curr_bss_params.bss_descriptor; pbss_desc->rssi = -pmpriv->bcn_rssi_avg; - tbl_idx = - wlan_find_ssid_in_list(pmpriv, &pbss_desc->ssid, - pbss_desc->mac_address, - pmpriv->bss_mode); + 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; @@ -453,10 +425,9 @@ wlan_ret_802_11_rssi_info(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_802_11_snmp_mib(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_802_11_snmp_mib(IN pmlan_private pmpriv, + 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); @@ -505,15 +476,15 @@ wlan_ret_802_11_snmp_mib(IN pmlan_private pmpriv, 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; + ((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; + ((mlan_ds_misc_cfg *)pioctl_buf->pbuf) + ->param.thermal = ul_temp; break; case NullPktPeriod_i: ul_temp = psmib->value[0]; @@ -523,7 +494,7 @@ wlan_ret_802_11_snmp_mib(IN pmlan_private pmpriv, default: break; } - } else { /* (query_type == HostCmd_ACT_GEN_SET) */ + } 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))); @@ -540,13 +511,12 @@ wlan_ret_802_11_snmp_mib(IN pmlan_private pmpriv, 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 - = + pmpriv->adapter->state_11h.is_master_radar_det_active = (ul_temp & MASTER_RADAR_DET_MASK) ? MTRUE : - MFALSE; + MFALSE; pmpriv->adapter->state_11h.is_slave_radar_det_active = (ul_temp & SLAVE_RADAR_DET_MASK) ? MTRUE : - MFALSE; + MFALSE; } } @@ -568,9 +538,9 @@ wlan_ret_802_11_snmp_mib(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_get_log(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_get_log(IN pmlan_private pmpriv, + 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; @@ -628,49 +598,44 @@ wlan_ret_get_log(IN pmlan_private pmpriv, wlan_le32_to_cpu(pget_log->tx_frag_cnt); for (i = 0; i < 8; i++) { pget_info->param.stats.qos_tx_frag_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_tx_frag_cnt[i]); + wlan_le32_to_cpu( + pget_log->qos_tx_frag_cnt[i]); pget_info->param.stats.qos_failed_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_failed_cnt[i]); + wlan_le32_to_cpu( + pget_log->qos_failed_cnt[i]); pget_info->param.stats.qos_retry_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_retry_cnt[i]); + wlan_le32_to_cpu( + pget_log->qos_retry_cnt[i]); pget_info->param.stats.qos_multi_retry_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_multi_retry_cnt - [i]); + wlan_le32_to_cpu( + pget_log->qos_multi_retry_cnt[i]); pget_info->param.stats.qos_frm_dup_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_frm_dup_cnt[i]); + wlan_le32_to_cpu( + pget_log->qos_frm_dup_cnt[i]); pget_info->param.stats.qos_rts_suc_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_rts_suc_cnt[i]); + wlan_le32_to_cpu( + pget_log->qos_rts_suc_cnt[i]); pget_info->param.stats.qos_rts_failure_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_rts_failure_cnt - [i]); + wlan_le32_to_cpu( + pget_log->qos_rts_failure_cnt[i]); pget_info->param.stats.qos_ack_failure_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_ack_failure_cnt - [i]); + wlan_le32_to_cpu( + pget_log->qos_ack_failure_cnt[i]); pget_info->param.stats.qos_rx_frag_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_rx_frag_cnt[i]); + wlan_le32_to_cpu( + pget_log->qos_rx_frag_cnt[i]); pget_info->param.stats.qos_tx_frm_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_tx_frm_cnt[i]); - pget_info->param.stats. - qos_discarded_frm_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_discarded_frm_cnt - [i]); + wlan_le32_to_cpu( + pget_log->qos_tx_frm_cnt[i]); + pget_info->param.stats.qos_discarded_frm_cnt + [i] = wlan_le32_to_cpu( + pget_log->qos_discarded_frm_cnt[i]); pget_info->param.stats.qos_mpdus_rx_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_mpdus_rx_cnt[i]); + wlan_le32_to_cpu( + pget_log->qos_mpdus_rx_cnt[i]); pget_info->param.stats.qos_retries_rx_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_retries_rx_cnt[i]); + wlan_le32_to_cpu( + pget_log->qos_retries_rx_cnt[i]); } pget_info->param.stats.cmacicv_errors = wlan_le32_to_cpu(pget_log->cmacicv_errors); @@ -693,38 +658,38 @@ wlan_ret_get_log(IN pmlan_private pmpriv, pget_info->param.stats.retry_amsdu_cnt = wlan_le32_to_cpu(pget_log->retry_amsdu_cnt); pget_info->param.stats.multi_retry_amsdu_cnt = - wlan_le32_to_cpu(pget_log-> - multi_retry_amsdu_cnt); + wlan_le32_to_cpu( + pget_log->multi_retry_amsdu_cnt); pget_info->param.stats.tx_octets_in_amsdu_cnt = - wlan_le64_to_cpu(pget_log-> - tx_octets_in_amsdu_cnt); + wlan_le64_to_cpu( + pget_log->tx_octets_in_amsdu_cnt); pget_info->param.stats.amsdu_ack_failure_cnt = - wlan_le32_to_cpu(pget_log-> - amsdu_ack_failure_cnt); + wlan_le32_to_cpu( + pget_log->amsdu_ack_failure_cnt); pget_info->param.stats.rx_amsdu_cnt = wlan_le32_to_cpu(pget_log->rx_amsdu_cnt); pget_info->param.stats.rx_octets_in_amsdu_cnt = - wlan_le64_to_cpu(pget_log-> - rx_octets_in_amsdu_cnt); + wlan_le64_to_cpu( + pget_log->rx_octets_in_amsdu_cnt); pget_info->param.stats.tx_ampdu_cnt = wlan_le32_to_cpu(pget_log->tx_ampdu_cnt); pget_info->param.stats.tx_mpdus_in_ampdu_cnt = - wlan_le32_to_cpu(pget_log-> - tx_mpdus_in_ampdu_cnt); + wlan_le32_to_cpu( + pget_log->tx_mpdus_in_ampdu_cnt); pget_info->param.stats.tx_octets_in_ampdu_cnt = - wlan_le64_to_cpu(pget_log-> - tx_octets_in_ampdu_cnt); + wlan_le64_to_cpu( + pget_log->tx_octets_in_ampdu_cnt); pget_info->param.stats.ampdu_rx_cnt = wlan_le32_to_cpu(pget_log->ampdu_rx_cnt); pget_info->param.stats.mpdu_in_rx_ampdu_cnt = - wlan_le32_to_cpu(pget_log-> - mpdu_in_rx_ampdu_cnt); + wlan_le32_to_cpu( + pget_log->mpdu_in_rx_ampdu_cnt); pget_info->param.stats.rx_octets_in_ampdu_cnt = - wlan_le64_to_cpu(pget_log-> - rx_octets_in_ampdu_cnt); + wlan_le64_to_cpu( + pget_log->rx_octets_in_ampdu_cnt); pget_info->param.stats.ampdu_delimiter_crc_error_cnt = - wlan_le32_to_cpu(pget_log-> - ampdu_delimiter_crc_error_cnt); + wlan_le32_to_cpu( + pget_log->ampdu_delimiter_crc_error_cnt); /* Indicate ioctl complete */ pioctl_buf->data_read_written = @@ -746,8 +711,7 @@ wlan_ret_get_log(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_get_power_level(pmlan_private pmpriv, void *pdata_buf) +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; @@ -757,10 +721,9 @@ wlan_get_power_level(pmlan_private pmpriv, void *pdata_buf) ENTER(); if (pdata_buf) { - ppg_tlv = - (MrvlTypes_Power_Group_t *)((t_u8 *)pdata_buf + - sizeof - (HostCmd_DS_TXPWR_CFG)); + 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; @@ -799,10 +762,9 @@ wlan_get_power_level(pmlan_private pmpriv, void *pdata_buf) * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_tx_power_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_tx_power_cfg(IN pmlan_private pmpriv, + 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; @@ -814,8 +776,7 @@ wlan_ret_tx_power_cfg(IN pmlan_private pmpriv, ENTER(); - ppg_tlv = (MrvlTypes_Power_Group_t *)((t_u8 *)ptxp_cfg - + sizeof(HostCmd_DS_TXPWR_CFG)); + ppg_tlv = (MrvlTypes_Power_Group_t *)(ptxp_cfg->tlv_buf); pg = (Power_Group_t *)((t_u8 *)ppg_tlv + sizeof(MrvlTypes_Power_Group_t)); @@ -842,15 +803,14 @@ wlan_ret_tx_power_cfg(IN pmlan_private pmpriv, } 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); + 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 - = + pioctl_buf->data_read_written = sizeof(mlan_power_cfg_t) + MLAN_SUB_COMMAND_SIZE; power->param.power_cfg.power_level = @@ -866,9 +826,9 @@ wlan_ret_tx_power_cfg(IN pmlan_private pmpriv, i = 0; while ((ppg_tlv->length) && (i < MAX_POWER_GROUP)) { - pwr_grp = - (mlan_power_group *)&power-> - param.power_ext.power_group[i]; + 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 == @@ -902,19 +862,17 @@ wlan_ret_tx_power_cfg(IN pmlan_private pmpriv, pwr_grp->rate_format = MLAN_RATE_FORMAT_VHT; pwr_grp->first_rate_ind = - (pg-> - first_rate_code) & 0xF; + (pg->first_rate_code) & + 0xF; pwr_grp->last_rate_ind = - (pg-> - last_rate_code) & 0xF; + (pg->last_rate_code) & + 0xF; + // pwr_grp->nss = 1 + + // (pg->first_rate_code >> 4); pwr_grp->nss = 1 + - (pg-> - first_rate_code >> 4); - pwr_grp->nss = - 1 + - (pg-> - last_rate_code >> 4); + (pg->last_rate_code >> + 4); } pwr_grp->bandwidth = pg->ht_bandwidth; pwr_grp->power_min = pg->power_min; @@ -926,8 +884,7 @@ wlan_ret_tx_power_cfg(IN pmlan_private pmpriv, i++; } power->param.power_ext.num_pwr_grp = i; - pioctl_buf->data_read_written - = + pioctl_buf->data_read_written = sizeof(mlan_power_cfg_ext) + MLAN_SUB_COMMAND_SIZE; } @@ -946,10 +903,9 @@ wlan_ret_tx_power_cfg(IN pmlan_private pmpriv, * @param pioctl_buf A pointer to mlan_ioctl_req structure * @return MLAN_STATUS_SUCCESS */ -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) +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) { HostCmd_DS_802_11_RF_TX_POWER *rtp = &resp->params.txp; t_u16 action = wlan_le16_to_cpu(rtp->action); @@ -965,8 +921,7 @@ wlan_ret_802_11_rf_tx_power(IN pmlan_private pmpriv, if (pioctl_buf) { power = (mlan_ds_power_cfg *)pioctl_buf->pbuf; if (power->sub_command == MLAN_OID_POWER_CFG) { - pioctl_buf->data_read_written - = + pioctl_buf->data_read_written = sizeof(mlan_power_cfg_t) + MLAN_SUB_COMMAND_SIZE; power->param.power_cfg.power_level = @@ -976,8 +931,8 @@ wlan_ret_802_11_rf_tx_power(IN pmlan_private pmpriv, } 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); + pmpriv->tx_power_level, pmpriv->max_tx_power_level, + pmpriv->min_tx_power_level); LEAVE(); return MLAN_STATUS_SUCCESS; @@ -991,10 +946,9 @@ wlan_ret_802_11_rf_tx_power(IN pmlan_private pmpriv, * @param pioctl_buf A pointer to mlan_ioctl_req structure * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_802_11_sleep_period(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_802_11_sleep_period(IN pmlan_private pmpriv, + 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; @@ -1007,8 +961,8 @@ wlan_ret_802_11_sleep_period(IN pmlan_private pmpriv, 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; + sizeof(pm_cfg->param.sleep_period) + + MLAN_SUB_COMMAND_SIZE; } pmpriv->adapter->sleep_period.period = sleep_pd; @@ -1034,10 +988,9 @@ wlan_ret_802_11_sleep_period(IN pmlan_private pmpriv, * @param pioctl_buf A pointer to mlan_ioctl_req structure * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_802_11_sleep_params(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_802_11_sleep_params(IN pmlan_private pmpriv, + 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; @@ -1065,8 +1018,8 @@ wlan_ret_802_11_sleep_params(IN pmlan_private pmpriv, psp->reserved = (t_u32)psleep_params->sp_reserved; pioctl_buf->data_read_written = - sizeof(pm_cfg->param.sleep_params) - + MLAN_SUB_COMMAND_SIZE; + sizeof(pm_cfg->param.sleep_params) + + MLAN_SUB_COMMAND_SIZE; } LEAVE(); @@ -1082,10 +1035,9 @@ wlan_ret_802_11_sleep_params(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_mac_multicast_adr(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_mac_multicast_adr(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { ENTER(); if (pioctl_buf) { @@ -1105,10 +1057,9 @@ wlan_ret_mac_multicast_adr(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_802_11_deauthenticate(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_802_11_deauthenticate(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { mlan_adapter *pmadapter = pmpriv->adapter; t_u8 event_buf[32]; @@ -1121,7 +1072,6 @@ wlan_ret_802_11_deauthenticate(IN pmlan_private pmpriv, &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); @@ -1147,10 +1097,9 @@ wlan_ret_802_11_deauthenticate(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -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) +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) { ENTER(); @@ -1170,14 +1119,13 @@ wlan_ret_802_11_ad_hoc_stop(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_802_11_key_material(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_802_11_key_material(IN pmlan_private pmpriv, + 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; - t_u8 zero_kek[MLAN_KEK_LEN] = { 0 }; + t_u8 zero_kek[MLAN_KEK_LEN] = {0}; ENTER(); @@ -1189,25 +1137,24 @@ wlan_ret_802_11_key_material(IN pmlan_private pmpriv, 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"); + "GTK_SET: Open port: WPA/WPA2 h-supp mode\n"); pmpriv->port_open = MTRUE; } - if (0 != - memcmp(pmpriv->adapter, pmpriv->gtk_rekey.kek, - zero_kek, sizeof(zero_kek))) { - wlan_prepare_cmd(pmpriv, - HostCmd_CMD_GTK_REKEY_OFFLOAD_CFG, - HostCmd_ACT_GEN_SET, 0, MNULL, - &pmpriv->gtk_rekey); + if (memcmp(pmpriv->adapter, pmpriv->gtk_rekey.kek, + zero_kek, sizeof(zero_kek)) != 0) { + wlan_prepare_cmd( + pmpriv, + HostCmd_CMD_GTK_REKEY_OFFLOAD_CFG, + HostCmd_ACT_GEN_SET, 0, MNULL, + &pmpriv->gtk_rekey); memset(pmpriv->adapter, &pmpriv->gtk_rekey, 0, sizeof(mlan_ds_misc_gtk_rekey_data)); } pmpriv->adapter->scan_block = MFALSE; } - } else { - if (pioctl_buf && - (wlan_le16_to_cpu(pkey->key_param_set.type) == - TLV_TYPE_KEY_PARAM_V2)) { + } else if (wlan_le16_to_cpu(pkey->action) == HostCmd_ACT_GEN_GET) { + if (pioctl_buf && (wlan_le16_to_cpu(pkey->key_param_set.type) == + TLV_TYPE_KEY_PARAM_V2)) { sec = (mlan_ds_sec_cfg *)pioctl_buf->pbuf; memcpy_ext(pmpriv->adapter, sec->param.encrypt_key.mac_addr, @@ -1217,8 +1164,9 @@ wlan_ret_802_11_key_material(IN pmlan_private pmpriv, sec->param.encrypt_key.key_index = pkey->key_param_set.key_idx; PRINTM(MIOCTL, - "key_type=%d, key_index=%d, key_info=0x%x " - MACSTR "\n", pkey->key_param_set.key_type, + "key_type=%d, key_index=%d, key_info=0x%x " MACSTR + "\n", + pkey->key_param_set.key_type, pkey->key_param_set.key_idx, wlan_le16_to_cpu(pkey->key_param_set.key_info), MAC2STR(sec->param.encrypt_key.mac_addr)); @@ -1226,84 +1174,92 @@ wlan_ret_802_11_key_material(IN pmlan_private pmpriv, case KEY_TYPE_ID_WAPI: sec->param.encrypt_key.is_wapi_key = MTRUE; sec->param.encrypt_key.key_len = - wlan_le16_to_cpu(pkey->key_param_set. - key_params.wapi. - key_len); - memcpy_ext(pmpriv->adapter, - sec->param.encrypt_key.key_material, - pkey->key_param_set.key_params.wapi. - key, sec->param.encrypt_key.key_len, - sizeof(sec->param.encrypt_key. - key_material)); - memcpy_ext(pmpriv->adapter, - sec->param.encrypt_key.pn, - pkey->key_param_set.key_params.wapi. - pn, PN_SIZE, - sizeof(sec->param.encrypt_key.pn)); + wlan_le16_to_cpu( + pkey->key_param_set.key_params + .wapi.key_len); + memcpy_ext( + pmpriv->adapter, + sec->param.encrypt_key.key_material, + pkey->key_param_set.key_params.wapi.key, + sec->param.encrypt_key.key_len, + sizeof(sec->param.encrypt_key + .key_material)); + memcpy_ext( + pmpriv->adapter, + sec->param.encrypt_key.pn, + pkey->key_param_set.key_params.wapi.pn, + PN_SIZE, + sizeof(sec->param.encrypt_key.pn)); break; case KEY_TYPE_ID_TKIP: sec->param.encrypt_key.key_len = - wlan_le16_to_cpu(pkey->key_param_set. - key_params.tkip. - key_len); - memcpy_ext(pmpriv->adapter, - sec->param.encrypt_key.key_material, - pkey->key_param_set.key_params.tkip. - key, sec->param.encrypt_key.key_len, - sizeof(sec->param.encrypt_key. - key_material)); - memcpy_ext(pmpriv->adapter, - sec->param.encrypt_key.pn, - pkey->key_param_set.key_params.tkip. - pn, WPA_PN_SIZE, - sizeof(sec->param.encrypt_key.pn)); + wlan_le16_to_cpu( + pkey->key_param_set.key_params + .tkip.key_len); + memcpy_ext( + pmpriv->adapter, + sec->param.encrypt_key.key_material, + pkey->key_param_set.key_params.tkip.key, + sec->param.encrypt_key.key_len, + sizeof(sec->param.encrypt_key + .key_material)); + memcpy_ext( + pmpriv->adapter, + sec->param.encrypt_key.pn, + pkey->key_param_set.key_params.tkip.pn, + WPA_PN_SIZE, + sizeof(sec->param.encrypt_key.pn)); break; case KEY_TYPE_ID_AES: sec->param.encrypt_key.key_len = - wlan_le16_to_cpu(pkey->key_param_set. - key_params.aes. - key_len); - memcpy_ext(pmpriv->adapter, - sec->param.encrypt_key.key_material, - pkey->key_param_set.key_params.aes. - key, sec->param.encrypt_key.key_len, - sizeof(sec->param.encrypt_key. - key_material)); - memcpy_ext(pmpriv->adapter, - sec->param.encrypt_key.pn, - pkey->key_param_set.key_params.aes. - pn, WPA_PN_SIZE, - sizeof(sec->param.encrypt_key.pn)); + wlan_le16_to_cpu( + pkey->key_param_set.key_params + .aes.key_len); + memcpy_ext( + pmpriv->adapter, + sec->param.encrypt_key.key_material, + pkey->key_param_set.key_params.aes.key, + sec->param.encrypt_key.key_len, + sizeof(sec->param.encrypt_key + .key_material)); + memcpy_ext( + pmpriv->adapter, + sec->param.encrypt_key.pn, + pkey->key_param_set.key_params.aes.pn, + WPA_PN_SIZE, + sizeof(sec->param.encrypt_key.pn)); break; case KEY_TYPE_ID_AES_CMAC: sec->param.encrypt_key.key_len = - wlan_le16_to_cpu(pkey->key_param_set. - key_params.cmac_aes. - key_len); + wlan_le16_to_cpu( + pkey->key_param_set.key_params + .cmac_aes.key_len); memcpy_ext(pmpriv->adapter, sec->param.encrypt_key.key_material, - pkey->key_param_set.key_params. - cmac_aes.key, + pkey->key_param_set.key_params + .cmac_aes.key, sec->param.encrypt_key.key_len, - sizeof(sec->param.encrypt_key. - key_material)); + sizeof(sec->param.encrypt_key + .key_material)); memcpy_ext(pmpriv->adapter, sec->param.encrypt_key.pn, - pkey->key_param_set.key_params. - cmac_aes.ipn, IGTK_PN_SIZE, + pkey->key_param_set.key_params + .cmac_aes.ipn, + IGTK_PN_SIZE, sizeof(sec->param.encrypt_key.pn)); break; case KEY_TYPE_ID_WEP: sec->param.encrypt_key.key_len = - wlan_le16_to_cpu(pkey->key_param_set. - key_params.wep. - key_len); - memcpy_ext(pmpriv->adapter, - sec->param.encrypt_key.key_material, - pkey->key_param_set.key_params.wep. - key, sec->param.encrypt_key.key_len, - sizeof(sec->param.encrypt_key. - key_material)); + wlan_le16_to_cpu( + pkey->key_param_set.key_params + .wep.key_len); + memcpy_ext( + pmpriv->adapter, + sec->param.encrypt_key.key_material, + pkey->key_param_set.key_params.wep.key, + sec->param.encrypt_key.key_len, + sizeof(sec->param.encrypt_key + .key_material)); break; } } @@ -1350,8 +1306,8 @@ wlan_ret_802_11_supplicant_profile(IN pmlan_private pmpriv, encr_proto_tlv = (MrvlIEtypes_EncrProto_t *)head; sec->param.esupp_mode.rsn_mode = - wlan_le16_to_cpu(encr_proto_tlv-> - 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; @@ -1385,14 +1341,14 @@ wlan_ret_802_11_supplicant_profile(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_802_11_rf_channel(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_802_11_rf_channel(IN pmlan_private pmpriv, + 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", @@ -1417,13 +1373,12 @@ wlan_ret_802_11_rf_channel(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_ibss_coalescing_status(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp) +static mlan_status wlan_ret_ibss_coalescing_status(IN pmlan_private pmpriv, + 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 }; + t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = {0, 0, 0, 0, 0, 0}; ENTER(); @@ -1436,37 +1391,34 @@ wlan_ret_ibss_coalescing_status(IN pmlan_private pmpriv, 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)) { + 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)) { + if (memcmp(pmpriv->adapter, + pmpriv->curr_bss_params.bss_descriptor.mac_address, + pibss_coal_resp->bssid, MLAN_MAC_ADDR_LENGTH)) { /* BSSID */ memcpy_ext(pmpriv->adapter, pmpriv->curr_bss_params.bss_descriptor.mac_address, pibss_coal_resp->bssid, MLAN_MAC_ADDR_LENGTH, - sizeof(pmpriv->curr_bss_params.bss_descriptor. - mac_address)); + sizeof(pmpriv->curr_bss_params.bss_descriptor + .mac_address)); /* 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); + 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->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; } @@ -1484,10 +1436,9 @@ wlan_ret_ibss_coalescing_status(IN pmlan_private pmpriv, * * @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) +static mlan_status wlan_ret_mgmt_ie_list(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + OUT mlan_ioctl_req *pioctl_buf) { t_u16 resp_len = 0, travel_len = 0; int i = 0; @@ -1504,8 +1455,8 @@ wlan_ret_mgmt_ie_list(IN pmlan_private pmpriv, if ((pmpriv->adapter->state_rdh.stage == RDH_SET_CUSTOM_IE) || (pmpriv->adapter->state_rdh.stage == RDH_REM_CUSTOM_IE)) if (!pmpriv->adapter->ecsa_enable) - wlan_11h_radar_detected_callback((t_void *) - pmpriv); + wlan_11h_radar_detected_callback( + (t_void *)pmpriv); LEAVE(); return MLAN_STATUS_SUCCESS; } @@ -1518,9 +1469,8 @@ wlan_ret_mgmt_ie_list(IN pmlan_private pmpriv, 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); + 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) + @@ -1529,12 +1479,10 @@ wlan_ret_mgmt_ie_list(IN pmlan_private pmpriv, 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; + travel_len += cptr->ie_length + sizeof(custom_ie) - + MAX_IE_SIZE; + resp_len -= cptr->ie_length + sizeof(custom_ie) - + MAX_IE_SIZE; } memcpy_ext(pmpriv->adapter, &misc->param.cust_ie, cust_ie, (cust_ie->len + sizeof(MrvlIEtypesHeader_t)), @@ -1550,26 +1498,25 @@ wlan_ret_mgmt_ie_list(IN pmlan_private pmpriv, 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); + 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_ext(pmpriv->adapter, - (t_u8 *)&misc->param.cust_ie + - (cust_ie->len + - sizeof(MrvlIEtypesHeader_t)), - max_mgmt_ie, - max_mgmt_ie->len + - sizeof(MrvlIEtypesHeader_t), - sizeof(misc->param.cust_ie) - - (cust_ie->len + - sizeof(MrvlIEtypesHeader_t))); + memcpy_ext( + pmpriv->adapter, + (t_u8 *)&misc->param.cust_ie + + (cust_ie->len + + sizeof(MrvlIEtypesHeader_t)), + max_mgmt_ie, + max_mgmt_ie->len + + sizeof(MrvlIEtypesHeader_t), + sizeof(misc->param.cust_ie) - + (cust_ie->len + + sizeof(MrvlIEtypesHeader_t))); } } } @@ -1587,10 +1534,9 @@ wlan_ret_mgmt_ie_list(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_sysclock_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_sysclock_cfg(IN pmlan_private pmpriv, + 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 = @@ -1625,16 +1571,14 @@ wlan_ret_sysclock_cfg(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_inactivity_timeout(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_inactivity_timeout(IN pmlan_private pmpriv, + 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; + (HostCmd_DS_INACTIVITY_TIMEOUT_EXT *)&resp->params.inactivity_to; ENTER(); @@ -1665,12 +1609,10 @@ wlan_ret_inactivity_timeout(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_subscribe_event(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_subscribe_event(IN pmlan_private pmpriv, + 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; @@ -1697,12 +1639,10 @@ wlan_ret_subscribe_event(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_otp_user_data(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_otp_user_data(IN pmlan_private pmpriv, + 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; @@ -1710,10 +1650,9 @@ wlan_ret_otp_user_data(IN pmlan_private pmpriv, 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)); + user_data->user_data_length = + MIN(MAX_OTP_USER_DATA_LEN, + wlan_le16_to_cpu(cmd_user_data->user_data_length)); memcpy_ext(pmpriv->adapter, user_data->user_data, cmd_user_data->user_data, user_data->user_data_length, @@ -1744,8 +1683,8 @@ wlan_ret_packet_aggr_over_host_interface(IN pmlan_private pmpriv, { mlan_ds_misc_cfg *misc = MNULL; HostCmd_DS_PACKET_AGGR_OVER_HOST_INTERFACE *packet_aggr = - (HostCmd_DS_PACKET_AGGR_OVER_HOST_INTERFACE *)&resp->params. - packet_aggr; + (HostCmd_DS_PACKET_AGGR_OVER_HOST_INTERFACE *)&resp->params + .packet_aggr; MrvlIETypes_USBAggrParam_t *usb_aggr_param_tlv = MNULL; mlan_ds_misc_usb_aggr_ctrl *usb_aggr_ctrl = MNULL; t_u8 *ptlv_buffer = (t_u8 *)packet_aggr->tlv_buf; @@ -1763,191 +1702,157 @@ wlan_ret_packet_aggr_over_host_interface(IN pmlan_private pmpriv, resp->size - (sizeof(HostCmd_DS_PACKET_AGGR_OVER_HOST_INTERFACE) + S_DS_GEN); - if (pioctl_buf) { - while (tlv_buf_len > 0) { - changed = 0; - tlv = (*ptlv_buffer) | (*(ptlv_buffer + 1) << 8); - switch (tlv) { - case MRVL_USB_AGGR_PARAM_TLV_ID: - usb_aggr_param_tlv = - (MrvlIETypes_USBAggrParam_t *) - ptlv_buffer; - misc = (mlan_ds_misc_cfg *)pioctl_buf->pbuf; - usb_aggr_ctrl = - (mlan_ds_misc_usb_aggr_ctrl *)&(misc-> - param. - usb_aggr_params); - usb_aggr_param_tlv->header.len = - wlan_le16_to_cpu(usb_aggr_param_tlv-> - header.len); - usb_aggr_param_tlv->enable = - wlan_le16_to_cpu(usb_aggr_param_tlv-> - enable); + if (!pioctl_buf) { + LEAVE(); + return MLAN_STATUS_SUCCESS; + } + while (tlv_buf_len > 0) { + changed = 0; + tlv = (*ptlv_buffer) | (*(ptlv_buffer + 1) << 8); + switch (tlv) { + case MRVL_USB_AGGR_PARAM_TLV_ID: + usb_aggr_param_tlv = + (MrvlIETypes_USBAggrParam_t *)ptlv_buffer; + misc = (mlan_ds_misc_cfg *)pioctl_buf->pbuf; + usb_aggr_ctrl = (mlan_ds_misc_usb_aggr_ctrl *)&( + misc->param.usb_aggr_params); + usb_aggr_param_tlv->header.len = wlan_le16_to_cpu( + usb_aggr_param_tlv->header.len); + usb_aggr_param_tlv->enable = + wlan_le16_to_cpu(usb_aggr_param_tlv->enable); #if defined(USB) - if (pioctl_buf->action == MLAN_ACT_SET) { - /* Update the Tx aggregation values in MLAN */ - for (i = 0; i < MAX_USB_TX_PORT_NUM; - i++) { - pmadapter->pcard_usb-> - usb_tx_aggr[i]. - aggr_ctrl.enable = - usb_aggr_ctrl-> - tx_aggr_ctrl.enable; - if (pmadapter->pcard_usb-> - usb_tx_aggr[i].aggr_ctrl. - aggr_mode != - usb_aggr_ctrl->tx_aggr_ctrl. - aggr_mode) { - pmadapter->pcard_usb-> - usb_tx_aggr[i]. - aggr_ctrl. - aggr_mode = - usb_aggr_ctrl-> - tx_aggr_ctrl. - aggr_mode; - changed = 1; - } - if (pmadapter->pcard_usb-> - usb_tx_aggr[i].aggr_ctrl. - aggr_align != - usb_aggr_ctrl->tx_aggr_ctrl. - aggr_align) { - pmadapter->pcard_usb-> - usb_tx_aggr[i]. - aggr_ctrl. - aggr_align = - usb_aggr_ctrl-> - tx_aggr_ctrl. - aggr_align; - changed = 1; - } - if (pmadapter->pcard_usb-> - usb_tx_aggr[i].aggr_ctrl. - aggr_max != - usb_aggr_ctrl->tx_aggr_ctrl. - aggr_max) { - pmadapter->pcard_usb-> - usb_tx_aggr[i]. - aggr_ctrl. - aggr_max = - usb_aggr_ctrl-> - tx_aggr_ctrl. - aggr_max; - changed = 1; - } - pmadapter->pcard_usb-> - usb_tx_aggr[i]. - aggr_ctrl.aggr_tmo = - usb_aggr_ctrl-> - tx_aggr_ctrl.aggr_tmo; + if (pioctl_buf->action == MLAN_ACT_SET) { + /* Update the Tx aggregation values in + * MLAN */ + for (i = 0; i < MAX_USB_TX_PORT_NUM; i++) { + pmadapter->pcard_usb->usb_tx_aggr[i] + .aggr_ctrl.enable = + usb_aggr_ctrl->tx_aggr_ctrl + .enable; + if (pmadapter->pcard_usb->usb_tx_aggr[i] + .aggr_ctrl.aggr_mode != + usb_aggr_ctrl->tx_aggr_ctrl + .aggr_mode) { + pmadapter->pcard_usb + ->usb_tx_aggr[i] + .aggr_ctrl.aggr_mode = + usb_aggr_ctrl + ->tx_aggr_ctrl + .aggr_mode; + changed = 1; } - } else { - if (usb_aggr_param_tlv-> - enable & MBIT(1)) - usb_aggr_ctrl->tx_aggr_ctrl. - enable = MTRUE; - else - usb_aggr_ctrl->tx_aggr_ctrl. - enable = MFALSE; - usb_aggr_ctrl->tx_aggr_ctrl.aggr_align = - wlan_le16_to_cpu - (usb_aggr_param_tlv-> - tx_aggr_align); - usb_aggr_ctrl->tx_aggr_ctrl.aggr_mode = - pmadapter->pcard_usb-> - usb_tx_aggr[0].aggr_ctrl. - aggr_mode; - usb_aggr_ctrl->tx_aggr_ctrl.aggr_max = - pmadapter->pcard_usb-> - usb_tx_aggr[0].aggr_ctrl. - aggr_max; - usb_aggr_ctrl->tx_aggr_ctrl.aggr_tmo = - pmadapter->pcard_usb-> - usb_tx_aggr[0].aggr_ctrl. - aggr_tmo; + if (pmadapter->pcard_usb->usb_tx_aggr[i] + .aggr_ctrl.aggr_align != + usb_aggr_ctrl->tx_aggr_ctrl + .aggr_align) { + pmadapter->pcard_usb + ->usb_tx_aggr[i] + .aggr_ctrl.aggr_align = + usb_aggr_ctrl + ->tx_aggr_ctrl + .aggr_align; + changed = 1; + } + if (pmadapter->pcard_usb->usb_tx_aggr[i] + .aggr_ctrl.aggr_max != + usb_aggr_ctrl->tx_aggr_ctrl + .aggr_max) { + pmadapter->pcard_usb + ->usb_tx_aggr[i] + .aggr_ctrl.aggr_max = + usb_aggr_ctrl + ->tx_aggr_ctrl + .aggr_max; + changed = 1; + } + pmadapter->pcard_usb->usb_tx_aggr[i] + .aggr_ctrl.aggr_tmo = + usb_aggr_ctrl->tx_aggr_ctrl + .aggr_tmo; } - if (changed) - wlan_reset_usb_tx_aggr(pmadapter); + } else { + if (usb_aggr_param_tlv->enable & MBIT(1)) + usb_aggr_ctrl->tx_aggr_ctrl.enable = + MTRUE; + else + usb_aggr_ctrl->tx_aggr_ctrl.enable = + MFALSE; + usb_aggr_ctrl->tx_aggr_ctrl + .aggr_align = wlan_le16_to_cpu( + usb_aggr_param_tlv->tx_aggr_align); + usb_aggr_ctrl->tx_aggr_ctrl.aggr_mode = + pmadapter->pcard_usb->usb_tx_aggr[0] + .aggr_ctrl.aggr_mode; + usb_aggr_ctrl->tx_aggr_ctrl.aggr_max = + pmadapter->pcard_usb->usb_tx_aggr[0] + .aggr_ctrl.aggr_max; + usb_aggr_ctrl->tx_aggr_ctrl.aggr_tmo = + pmadapter->pcard_usb->usb_tx_aggr[0] + .aggr_ctrl.aggr_tmo; + } + if (changed) + wlan_reset_usb_tx_aggr(pmadapter); #endif #if defined(USB) - if (pioctl_buf->action == MLAN_ACT_SET) { - /* Update the Rx deaggregation values in MLAN */ - pmadapter->pcard_usb->usb_rx_deaggr. - aggr_ctrl.enable = - usb_aggr_ctrl->rx_deaggr_ctrl. - enable; - if (pmadapter->pcard_usb->usb_rx_deaggr. - aggr_ctrl.aggr_mode != - usb_aggr_ctrl->rx_deaggr_ctrl. - aggr_mode) - pmadapter->pcard_usb-> - usb_rx_deaggr.aggr_ctrl. - aggr_mode = - usb_aggr_ctrl-> - rx_deaggr_ctrl. - aggr_mode; - if (pmadapter->pcard_usb->usb_rx_deaggr. - aggr_ctrl.aggr_align != - usb_aggr_ctrl->rx_deaggr_ctrl. - aggr_align) - pmadapter->pcard_usb-> - usb_rx_deaggr.aggr_ctrl. - aggr_align = - usb_aggr_ctrl-> - rx_deaggr_ctrl. - aggr_align; - if (pmadapter->pcard_usb->usb_rx_deaggr. - aggr_ctrl.aggr_max != - usb_aggr_ctrl->rx_deaggr_ctrl. - aggr_max) - pmadapter->pcard_usb-> - usb_rx_deaggr.aggr_ctrl. - aggr_max = - usb_aggr_ctrl-> - rx_deaggr_ctrl.aggr_max; - pmadapter->pcard_usb->usb_rx_deaggr. - aggr_ctrl.aggr_tmo = - usb_aggr_ctrl->rx_deaggr_ctrl. - aggr_tmo; - } else { - if (usb_aggr_param_tlv-> - enable & MBIT(0)) - usb_aggr_ctrl->rx_deaggr_ctrl. - enable = MTRUE; - else - usb_aggr_ctrl->rx_deaggr_ctrl. - enable = MFALSE; - usb_aggr_ctrl->rx_deaggr_ctrl. - aggr_mode = - wlan_le16_to_cpu - (usb_aggr_param_tlv-> - rx_aggr_mode); - usb_aggr_ctrl->rx_deaggr_ctrl. - aggr_align = - wlan_le16_to_cpu - (usb_aggr_param_tlv-> - rx_aggr_align); - usb_aggr_ctrl->rx_deaggr_ctrl.aggr_max = - wlan_le16_to_cpu - (usb_aggr_param_tlv-> - rx_aggr_max); - usb_aggr_ctrl->rx_deaggr_ctrl.aggr_tmo = - wlan_le16_to_cpu - (usb_aggr_param_tlv-> - rx_aggr_tmo); - } -#endif - ptlv_buffer += - usb_aggr_param_tlv->header.len + - sizeof(MrvlIEtypesHeader_t); - tlv_buf_len -= - (usb_aggr_param_tlv->header.len + - sizeof(MrvlIEtypesHeader_t)); - break; - default: - break; + if (pioctl_buf->action == MLAN_ACT_SET) { + /* Update the Rx deaggregation values in + * MLAN */ + pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl + .enable = + usb_aggr_ctrl->rx_deaggr_ctrl.enable; + if (pmadapter->pcard_usb->usb_rx_deaggr + .aggr_ctrl.aggr_mode != + usb_aggr_ctrl->rx_deaggr_ctrl.aggr_mode) + pmadapter->pcard_usb->usb_rx_deaggr + .aggr_ctrl.aggr_mode = + usb_aggr_ctrl->rx_deaggr_ctrl + .aggr_mode; + if (pmadapter->pcard_usb->usb_rx_deaggr + .aggr_ctrl.aggr_align != + usb_aggr_ctrl->rx_deaggr_ctrl.aggr_align) + pmadapter->pcard_usb->usb_rx_deaggr + .aggr_ctrl.aggr_align = + usb_aggr_ctrl->rx_deaggr_ctrl + .aggr_align; + if (pmadapter->pcard_usb->usb_rx_deaggr + .aggr_ctrl.aggr_max != + usb_aggr_ctrl->rx_deaggr_ctrl.aggr_max) + pmadapter->pcard_usb->usb_rx_deaggr + .aggr_ctrl.aggr_max = + usb_aggr_ctrl->rx_deaggr_ctrl + .aggr_max; + pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl + .aggr_tmo = + usb_aggr_ctrl->rx_deaggr_ctrl.aggr_tmo; + } else { + if (usb_aggr_param_tlv->enable & MBIT(0)) + usb_aggr_ctrl->rx_deaggr_ctrl.enable = + MTRUE; + else + usb_aggr_ctrl->rx_deaggr_ctrl.enable = + MFALSE; + usb_aggr_ctrl->rx_deaggr_ctrl + .aggr_mode = wlan_le16_to_cpu( + usb_aggr_param_tlv->rx_aggr_mode); + usb_aggr_ctrl->rx_deaggr_ctrl + .aggr_align = wlan_le16_to_cpu( + usb_aggr_param_tlv->rx_aggr_align); + usb_aggr_ctrl->rx_deaggr_ctrl.aggr_max = + wlan_le16_to_cpu( + usb_aggr_param_tlv->rx_aggr_max); + usb_aggr_ctrl->rx_deaggr_ctrl.aggr_tmo = + wlan_le16_to_cpu( + usb_aggr_param_tlv->rx_aggr_tmo); } +#endif + ptlv_buffer += usb_aggr_param_tlv->header.len + + sizeof(MrvlIEtypesHeader_t); + tlv_buf_len -= (usb_aggr_param_tlv->header.len + + sizeof(MrvlIEtypesHeader_t)); + break; + default: + break; } } @@ -1966,10 +1871,9 @@ wlan_ret_packet_aggr_over_host_interface(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_dfs_repeater_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_dfs_repeater_cfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCmd_DS_DFS_REPEATER_MODE *cmd_dfs_repeater = &resp->params.dfs_repeater; @@ -2008,20 +1912,18 @@ wlan_ret_dfs_repeater_cfg(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_coalesce_config(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_coalesce_config(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { ENTER(); LEAVE(); return MLAN_STATUS_SUCCESS; } -mlan_status -wlan_ret_get_sensor_temp(IN pmlan_private pmpriv, - const IN HostCmd_DS_COMMAND *resp, - OUT mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_get_sensor_temp(IN pmlan_private pmpriv, + const IN HostCmd_DS_COMMAND *resp, + OUT mlan_ioctl_req *pioctl_buf) { mlan_ds_misc_cfg *pcfg = MNULL; const HostCmd_DS_SENSOR_TEMP *pSensorT = &resp->params.temp_sensor; @@ -2041,7 +1943,8 @@ wlan_ret_get_sensor_temp(IN pmlan_private pmpriv, } /** - * @brief This function handles the command response of sta get band and channel + * @brief This function handles the command response of sta get band and + * channel * * @param pmpriv A pointer to mlan_private structure * @param resp A pointer to HostCmd_DS_COMMAND @@ -2049,12 +1952,12 @@ wlan_ret_get_sensor_temp(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_sta_config(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_sta_config(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCmd_DS_STA_CONFIGURE *cmdrsp_sta_cfg = - (HostCmd_DS_STA_CONFIGURE *) & resp->params.sta_cfg; + (HostCmd_DS_STA_CONFIGURE *)&resp->params.sta_cfg; mlan_ds_bss *bss = MNULL; MrvlIEtypes_channel_band_t *tlv_band_channel = MNULL; @@ -2065,7 +1968,7 @@ wlan_ret_sta_config(IN pmlan_private pmpriv, if (bss->sub_command == MLAN_OID_BSS_CHAN_INFO) { tlv_band_channel = (MrvlIEtypes_channel_band_t *) - cmdrsp_sta_cfg->tlv_buffer; + cmdrsp_sta_cfg->tlv_buffer; bss->param.sta_channel.bandcfg = tlv_band_channel->bandcfg; bss->param.sta_channel.channel = @@ -2075,13 +1978,11 @@ wlan_ret_sta_config(IN pmlan_private pmpriv, if (bss->param.sta_channel.bandcfg.chanWidth == CHAN_BW_80MHZ) bss->param.sta_channel.center_chan = - wlan_get_center_freq_idx(pmpriv, - BAND_AAC, - bss-> - param. - sta_channel. - channel, - CHANNEL_BW_80MHZ); + wlan_get_center_freq_idx( + pmpriv, BAND_AAC, + bss->param.sta_channel + .channel, + CHANNEL_BW_80MHZ); PRINTM(MCMND, "Get STA channel, band=0x%x, channel=%d, is_11n_enabled=%d center_chan=%d\n", bss->param.sta_channel.bandcfg, @@ -2107,12 +2008,12 @@ wlan_ret_sta_config(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_ret_auto_tx(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_ret_auto_tx(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCmd_DS_AUTO_TX *cmdrsp_auto_tx = - (HostCmd_DS_AUTO_TX *) & resp->params.auto_tx; + (HostCmd_DS_AUTO_TX *)&resp->params.auto_tx; mlan_status status = MLAN_STATUS_SUCCESS; MrvlIEtypesHeader_t *header = MNULL; mlan_ds_misc_cfg *misc = MNULL; @@ -2125,20 +2026,29 @@ wlan_ret_auto_tx(IN pmlan_private pmpriv, ENTER(); action = wlan_le16_to_cpu(cmdrsp_auto_tx->action); - if (pioctl_buf) - misc = (mlan_ds_misc_cfg *)pioctl_buf->pbuf; + if (!pioctl_buf) { + PRINTM(MERROR, "ioctl is null\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } + + misc = (mlan_ds_misc_cfg *)pioctl_buf->pbuf; + + if (!misc) { + PRINTM(MERROR, "misc is null\n"); + LEAVE(); + return MLAN_STATUS_FAILURE; + } if (resp->result == HostCmd_RESULT_OK) { header = (MrvlIEtypesHeader_t *)cmdrsp_auto_tx->tlv_buffer; header->type = wlan_le16_to_cpu(header->type); len = wlan_le16_to_cpu(header->len); if (header->type == TLV_TYPE_CLOUD_KEEP_ALIVE) { - keep_alive_tlv = - (MrvlIEtypes_Cloud_Keep_Alive_t *) - cmdrsp_auto_tx->tlv_buffer; - misc_keep_alive = - (mlan_ds_misc_keep_alive *) & misc->param. - keep_alive; + keep_alive_tlv = (MrvlIEtypes_Cloud_Keep_Alive_t *) + cmdrsp_auto_tx->tlv_buffer; + misc_keep_alive = (mlan_ds_misc_keep_alive *)&misc + ->param.keep_alive; misc_keep_alive->mkeep_alive_id = keep_alive_tlv->keep_alive_id; misc_keep_alive->enable = keep_alive_tlv->enable; @@ -2146,47 +2056,43 @@ wlan_ret_auto_tx(IN pmlan_private pmpriv, (action == HostCmd_ACT_GEN_RESET)) && !keep_alive_tlv->enable) { len = len - - sizeof(keep_alive_tlv->keep_alive_id) - - sizeof(keep_alive_tlv->enable); - if (keep_alive_tlv->tlv && - len > sizeof(MrvlIEtypesHeader_t)) { + sizeof(keep_alive_tlv->keep_alive_id) - + sizeof(keep_alive_tlv->enable); + if (len > sizeof(MrvlIEtypesHeader_t)) { header = (MrvlIEtypesHeader_t *) - keep_alive_tlv->tlv; + keep_alive_tlv->tlv; header->type = wlan_le16_to_cpu(header->type); len = wlan_le16_to_cpu(header->len) - - sizeof(Eth803Hdr_t); + sizeof(Eth803Hdr_t); if (header->type == TLV_TYPE_KEEP_ALIVE_PKT) { pkt_tlv = (MrvlIEtypes_Keep_Alive_Pkt_t - *) keep_alive_tlv->tlv; - memcpy_ext(pmpriv->adapter, - misc_keep_alive-> - dst_mac, - pkt_tlv->eth_header. - dest_addr, - MLAN_MAC_ADDR_LENGTH, - sizeof - (misc_keep_alive-> - dst_mac)); - memcpy_ext(pmpriv->adapter, - misc_keep_alive-> - src_mac, - pkt_tlv->eth_header. - src_addr, - MLAN_MAC_ADDR_LENGTH, - sizeof - (misc_keep_alive-> - src_mac)); - memcpy_ext(pmpriv->adapter, - misc_keep_alive-> - packet, - pkt_tlv->ip_packet, - len, - sizeof - (misc_keep_alive-> - packet)); + *)keep_alive_tlv + ->tlv; + memcpy_ext( + pmpriv->adapter, + misc_keep_alive->dst_mac, + pkt_tlv->eth_header + .dest_addr, + MLAN_MAC_ADDR_LENGTH, + sizeof(misc_keep_alive + ->dst_mac)); + memcpy_ext( + pmpriv->adapter, + misc_keep_alive->src_mac, + pkt_tlv->eth_header + .src_addr, + MLAN_MAC_ADDR_LENGTH, + sizeof(misc_keep_alive + ->src_mac)); + memcpy_ext( + pmpriv->adapter, + misc_keep_alive->packet, + pkt_tlv->ip_packet, len, + sizeof(misc_keep_alive + ->packet)); misc_keep_alive->pkt_len = len; } } @@ -2212,10 +2118,8 @@ wlan_ret_auto_tx(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) +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) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_private *pmpriv = (mlan_private *)priv; @@ -2230,8 +2134,7 @@ wlan_ops_sta_process_cmdresp(IN t_void *priv, ENTER(); /* If the command is not successful, cleanup and return failure */ - if ((resp->result != HostCmd_RESULT_OK) - ) { + if ((resp->result != HostCmd_RESULT_OK)) { ret = wlan_process_cmdresp_error(pmpriv, resp, pioctl_buf); LEAVE(); return ret; @@ -2307,7 +2210,7 @@ wlan_ops_sta_process_cmdresp(IN t_void *priv, #if defined(PCIE) case HostCmd_CMD_SSU: PRINTM(MCMND, - "SSU cmdresp: number_of_buffers %d, buffer_size %d rec_len %d\n", + "SSU cmdresp:number_of_buffers %d, buffer_size %d rec_len %d\n", resp->params.ssu_params.number_of_buffers, resp->params.ssu_params.buffer_size, resp->params.ssu_params.rec_len); @@ -2405,12 +2308,11 @@ wlan_ops_sta_process_cmdresp(IN t_void *priv, (t_u16)wlan_le16_to_cpu(resp->params.tx_buf.buff_size); #ifdef SDIO if (IS_SD(pmadapter->card_type)) { - pmadapter->tx_buf_size = - (pmadapter->tx_buf_size / - MLAN_SDIO_BLOCK_SIZE) * MLAN_SDIO_BLOCK_SIZE; - pmadapter->pcard_sd->mp_end_port = - wlan_le16_to_cpu(resp->params.tx_buf. - mp_end_port); + pmadapter->tx_buf_size = (pmadapter->tx_buf_size / + MLAN_SDIO_BLOCK_SIZE) * + MLAN_SDIO_BLOCK_SIZE; + pmadapter->pcard_sd->mp_end_port = wlan_le16_to_cpu( + resp->params.tx_buf.mp_end_port); pmadapter->pcard_sd->mp_data_port_mask = pmadapter->pcard_sd->reg->data_port_mask; @@ -2426,8 +2328,8 @@ wlan_ops_sta_process_cmdresp(IN t_void *priv, MIN(SDIO_MP_AGGR_DEF_PKT_LIMIT, (pmadapter->pcard_sd->mp_end_port >> 1)); PRINTM(MCMND, "end port %d, data port mask %x\n", - wlan_le16_to_cpu(resp->params.tx_buf. - mp_end_port), + wlan_le16_to_cpu( + resp->params.tx_buf.mp_end_port), pmadapter->pcard_sd->mp_data_port_mask); } #endif @@ -2439,10 +2341,9 @@ wlan_ops_sta_process_cmdresp(IN t_void *priv, 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); + 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); @@ -2476,8 +2377,8 @@ wlan_ops_sta_process_cmdresp(IN t_void *priv, 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); + pmadapter->tx_buf_size = (t_u16)wlan_le16_to_cpu(resp->params. + tx_buf.buff_size); break; #endif case HostCmd_CMD_TX_BF_CFG: @@ -2606,6 +2507,8 @@ wlan_ops_sta_process_cmdresp(IN t_void *priv, case HostCmd_CMD_11AX_CMD: ret = wlan_ret_11ax_cmd(pmpriv, resp, pioctl_buf); break; + case HostCmd_CMD_TWT_CFG: + break; case HostCmd_CMD_RX_ABORT_CFG: ret = wlan_ret_rxabortcfg(pmpriv, resp, pioctl_buf); break; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_event.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_event.c index 7457d9ed646f..ccee8129d4d5 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_event.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_event.c @@ -55,8 +55,7 @@ Change log: * @param pmpriv A pointer to mlan_private structure * @return N/A */ -static t_void -wlan_handle_disconnect_event(pmlan_private pmpriv) +static t_void wlan_handle_disconnect_event(pmlan_private pmpriv) { ENTER(); @@ -80,8 +79,7 @@ wlan_handle_disconnect_event(pmlan_private pmpriv) * * @return N/A */ -t_void -wlan_reset_connect_state(pmlan_private priv, t_u8 drv_disconnect) +t_void wlan_reset_connect_state(pmlan_private priv, t_u8 drv_disconnect) { mlan_adapter *pmadapter = priv->adapter; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -93,11 +91,13 @@ wlan_reset_connect_state(pmlan_private priv, t_u8 drv_disconnect) PRINTM(MINFO, "Handles disconnect event.\n"); +#ifdef UAP_SUPPORT /* If DFS repeater mode is enabled and station interface disconnects * then make sure that all uAPs are stopped. */ if (pmadapter->dfs_repeater) wlan_dfs_rep_disconnect(pmadapter); +#endif if (drv_disconnect) { priv->media_connected = MFALSE; @@ -167,8 +167,7 @@ wlan_reset_connect_state(pmlan_private priv, t_u8 drv_disconnect) wlan_clean_txrx(priv); /* Need to erase the current SSID and BSSID info */ - memset(pmadapter, - &priv->curr_bss_params, 0x00, + memset(pmadapter, &priv->curr_bss_params, 0x00, sizeof(priv->curr_bss_params)); } pmadapter->tx_lock_flag = MFALSE; @@ -179,15 +178,13 @@ wlan_reset_connect_state(pmlan_private priv, t_u8 drv_disconnect) if ((wlan_fw_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); + 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"); } @@ -216,8 +213,7 @@ wlan_reset_connect_state(pmlan_private priv, t_u8 drv_disconnect) * * @return N/A */ -t_void -wlan_2040_coex_event(pmlan_private pmpriv) +t_void wlan_2040_coex_event(pmlan_private pmpriv) { t_u8 event_buf[100]; mlan_event *pevent = (mlan_event *)event_buf; @@ -226,19 +222,18 @@ wlan_2040_coex_event(pmlan_private pmpriv) 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; + 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; pevent->event_len = ele_len; /* Copy OBSS scan parameters */ memcpy_ext(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); + (t_u8 *)&pmpriv->curr_bss_params.bss_descriptor + .poverlap_bss_scan_param->obss_scan_param, + ele_len, pevent->event_len); wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_OBSS_SCAN_PARAM, pevent); } @@ -254,8 +249,8 @@ wlan_2040_coex_event(pmlan_private pmpriv) * * @return N/A */ -static void -wlan_process_sta_tx_pause_event(pmlan_private priv, pmlan_buffer pevent) +static void wlan_process_sta_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); @@ -290,7 +285,6 @@ wlan_process_sta_tx_pause_event(pmlan_private priv, pmlan_buffer pevent) else priv->tx_pause = MFALSE; } - } tlv_buf_left -= (sizeof(MrvlIEtypesHeader_t) + tlv_len); tlv = (MrvlIEtypesHeader_t *)((t_u8 *)tlv + tlv_len + @@ -309,8 +303,7 @@ wlan_process_sta_tx_pause_event(pmlan_private priv, pmlan_buffer pevent) * received from firmware * @return N/A */ -static void -wlan_print_disconnect_reason(t_u16 reason_code) +static void wlan_print_disconnect_reason(t_u16 reason_code) { ENTER(); @@ -365,8 +358,7 @@ wlan_print_disconnect_reason(t_u16 reason_code) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ops_sta_process_event(IN t_void *priv) +mlan_status wlan_ops_sta_process_event(IN t_void *priv) { pmlan_private pmpriv = (pmlan_private)priv; pmlan_adapter pmadapter = pmpriv->adapter; @@ -409,8 +401,7 @@ wlan_ops_sta_process_event(IN t_void *priv) pevent = (pmlan_event)event_buf; memset(pmadapter, event_buf, 0, MAX_EVENT_SIZE); - if (eventcause != EVENT_PS_SLEEP && - eventcause != EVENT_PS_AWAKE && + 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); @@ -433,10 +424,9 @@ wlan_ops_sta_process_event(IN t_void *priv) "wlan: Receive deauth event in wps session\n"); break; } - reason_code = - wlan_le16_to_cpu(*(t_u16 *) - (pmbuf->pbuf + pmbuf->data_offset + - sizeof(eventcause))); + reason_code = wlan_le16_to_cpu(*(t_u16 *)(pmbuf->pbuf + + pmbuf->data_offset + + sizeof(eventcause))); PRINTM(MMSG, "wlan: EVENT: Deauthenticated (reason 0x%x)\n", reason_code); wlan_print_disconnect_reason(reason_code); @@ -452,10 +442,9 @@ wlan_ops_sta_process_event(IN t_void *priv) "wlan: Receive disassociate event in wps session\n"); break; } - reason_code = - wlan_le16_to_cpu(*(t_u16 *) - (pmbuf->pbuf + pmbuf->data_offset + - sizeof(eventcause))); + reason_code = wlan_le16_to_cpu(*(t_u16 *)(pmbuf->pbuf + + pmbuf->data_offset + + sizeof(eventcause))); PRINTM(MMSG, "wlan: EVENT: Disassociated (reason 0x%x)\n", reason_code); wlan_print_disconnect_reason(reason_code); @@ -465,10 +454,9 @@ wlan_ops_sta_process_event(IN t_void *priv) break; case EVENT_LINK_LOST: - reason_code = - wlan_le16_to_cpu(*(t_u16 *) - (pmbuf->pbuf + pmbuf->data_offset + - sizeof(eventcause))); + reason_code = wlan_le16_to_cpu(*(t_u16 *)(pmbuf->pbuf + + pmbuf->data_offset + + sizeof(eventcause))); PRINTM(MMSG, "wlan: EVENT: Link lost (reason 0x%x)\n", reason_code); pmpriv->disconnect_reason_code = reason_code; @@ -493,8 +481,7 @@ wlan_ops_sta_process_event(IN t_void *priv) PRINTM(MINFO, "EVENT: AWAKE\n"); PRINTM_NETINTF(MEVENT, pmpriv); PRINTM(MEVENT, "|"); - if (!pmadapter->pps_uapsd_mode && - pmpriv->media_connected && + if (!pmadapter->pps_uapsd_mode && pmpriv->media_connected && (pmpriv->port_open || !pmpriv->port_ctrl_mode) && pmadapter->sleep_period.period) { pmadapter->pps_uapsd_mode = MTRUE; @@ -505,13 +492,14 @@ wlan_ops_sta_process_event(IN t_void *priv) break; pmadapter->tx_lock_flag = MFALSE; if (pmadapter->pps_uapsd_mode && pmadapter->gen_null_pkt) { - if (MTRUE == wlan_check_last_packet_indication(pmpriv)) { + 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) { + 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; } @@ -525,9 +513,8 @@ wlan_ops_sta_process_event(IN t_void *priv) 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); + 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"); @@ -554,11 +541,10 @@ wlan_ops_sta_process_event(IN t_void *priv) pevent->bss_index = pmpriv->bss_index; pevent->event_id = MLAN_EVENT_ID_FW_DEBUG_INFO; pevent->event_len = pmbuf->data_len - sizeof(eventcause); - memcpy_ext(pmadapter, - (t_u8 *)pevent->event_buf, + memcpy_ext(pmadapter, (t_u8 *)pevent->event_buf, pmbuf->pbuf + pmbuf->data_offset + - sizeof(eventcause), pevent->event_len, - pevent->event_len); + sizeof(eventcause), + pevent->event_len, pevent->event_len); PRINTM(MEVENT, "EVENT: FW Debug Info %s\n", (t_u8 *)pevent->event_buf); wlan_recv_event(pmpriv, pevent->event_id, pevent); @@ -588,18 +574,20 @@ wlan_ops_sta_process_event(IN t_void *priv) 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 */ + 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 */ + 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); if (pmadapter->ecsa_enable) { MrvlIEtypes_channel_band_t *pchan_info = - (MrvlIEtypes_channel_band_t *)(pmadapter-> - event_body); + (MrvlIEtypes_channel_band_t + *)(pmadapter->event_body); t_u8 channel = pchan_info->channel; chan_freq_power_t *cfp = MNULL; DBG_HEXDUMP(MCMD_D, "chan band config", @@ -609,11 +597,11 @@ wlan_ops_sta_process_event(IN t_void *priv) channel); #define MAX_CHANNEL_BAND_B 14 if (channel <= MAX_CHANNEL_BAND_B) - cfp = wlan_find_cfp_by_band_and_channel - (pmadapter, BAND_B, channel); + cfp = wlan_find_cfp_by_band_and_channel( + pmadapter, BAND_B, channel); else - cfp = wlan_find_cfp_by_band_and_channel - (pmadapter, BAND_A, channel); + cfp = wlan_find_cfp_by_band_and_channel( + pmadapter, BAND_A, channel); pmpriv->curr_bss_params.bss_descriptor.channel = channel; if (cfp) @@ -634,7 +622,7 @@ wlan_ops_sta_process_event(IN t_void *priv) pevent->event_id = MLAN_EVENT_ID_FW_CHAN_SWITCH_COMPLETE; pevent->event_len = sizeof(chan_band_info); - pchan_band_info = (chan_band_info *) pevent->event_buf; + pchan_band_info = (chan_band_info *)pevent->event_buf; /* Copy event data */ memcpy_ext(pmadapter, (t_u8 *)&pchan_band_info->bandcfg, (t_u8 *)&pchan_info->bandcfg, @@ -643,10 +631,10 @@ wlan_ops_sta_process_event(IN t_void *priv) pchan_band_info->channel = pchan_info->channel; if (pchan_band_info->bandcfg.chanWidth == CHAN_BW_80MHZ) pchan_band_info->center_chan = - wlan_get_center_freq_idx(priv, BAND_AAC, - pchan_info-> - channel, - CHANNEL_BW_80MHZ); + wlan_get_center_freq_idx( + priv, BAND_AAC, + pchan_info->channel, + CHANNEL_BW_80MHZ); wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_CHAN_SWITCH_COMPLETE, pevent); @@ -656,8 +644,8 @@ wlan_ops_sta_process_event(IN t_void *priv) PRINTM_NETINTF(MEVENT, pmpriv); 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_recv_event(pmpriv, MLAN_EVENT_ID_FW_CHANNEL_SWITCH_ANN, + MNULL); wlan_11h_handle_event_chanswann(pmpriv); break; case EVENT_RADAR_DETECTED: @@ -678,7 +666,7 @@ wlan_ops_sta_process_event(IN t_void *priv) wlan_11h_radar_detected_handling(pmadapter, pmpriv); } else { PRINTM(MEVENT, "Ignore Event Radar Detected - handling" - " already in progress.\n"); + " already in progress.\n"); } break; @@ -692,8 +680,8 @@ wlan_ops_sta_process_event(IN t_void *priv) /* Copy event data */ memcpy_ext(pmadapter, (t_u8 *)pevent->event_buf, pmbuf->pbuf + pmbuf->data_offset + - sizeof(eventcause), pevent->event_len, - pevent->event_len); + sizeof(eventcause), + pevent->event_len, pevent->event_len); /* Handle / pass event data */ ret = wlan_11h_handle_event_chanrpt_ready(pmpriv, pevent, &radar_chan); @@ -726,18 +714,18 @@ wlan_ops_sta_process_event(IN t_void *priv) HostCmd_ACT_GEN_SET, 0, 0, MNULL); break; case EVENT_WMM_STATUS_CHANGE: - if (pmbuf && pmbuf->data_len - > sizeof(eventcause) + sizeof(MrvlIEtypesHeader_t)) { + 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)); + evt_buf = (pmbuf->pbuf + pmbuf->data_offset + + sizeof(eventcause)); - wlan_ret_wmm_get_status(pmpriv, - evt_buf, + wlan_ret_wmm_get_status(pmpriv, evt_buf, pmbuf->data_len - - sizeof(eventcause)); + sizeof(eventcause)); } else { PRINTM(MEVENT, "EVENT: WMM status changed\n"); ret = wlan_cmd_wmm_status_change(pmpriv); @@ -749,7 +737,7 @@ wlan_ops_sta_process_event(IN t_void *priv) pevent->bss_index = pmpriv->bss_index; pevent->event_id = MLAN_EVENT_ID_FW_BCN_RSSI_LOW; pevent->event_len = sizeof(t_u16); - /** Fw send bcnRssi low value in event reason field*/ + /** Fw send bcnRssi low value in event reason field*/ memcpy_ext(pmadapter, (t_u8 *)pevent->event_buf, (t_u8 *)&pmadapter->event_body, pevent->event_len, pevent->event_len); @@ -768,7 +756,7 @@ wlan_ops_sta_process_event(IN t_void *priv) pevent->bss_index = pmpriv->bss_index; pevent->event_id = MLAN_EVENT_ID_FW_BCN_RSSI_HIGH; pevent->event_len = sizeof(t_u16); - /** Fw send bcnRssi high value in event reason field*/ + /** Fw send bcnRssi high value in event reason field*/ memcpy_ext(pmadapter, (t_u8 *)pevent->event_buf, (t_u8 *)&pmadapter->event_body, pevent->event_len, pevent->event_len); @@ -804,9 +792,9 @@ wlan_ops_sta_process_event(IN t_void *priv) 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); + 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"); @@ -830,9 +818,9 @@ wlan_ops_sta_process_event(IN t_void *priv) 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); + 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"); @@ -849,9 +837,9 @@ wlan_ops_sta_process_event(IN t_void *priv) MIN(pmadapter->curr_tx_buf_size, wlan_le16_to_cpu(*(t_u16 *)pmadapter->event_body)); if (pmbuf->data_len == sizeof(eventcause) + sizeof(t_u32)) { - enable = wlan_le16_to_cpu(*(t_u16 *) - (pmadapter->event_body + - sizeof(t_u16))); + enable = wlan_le16_to_cpu( + *(t_u16 *)(pmadapter->event_body + + sizeof(t_u16))); if (enable) pmpriv->amsdu_disable = MFALSE; else @@ -882,8 +870,10 @@ wlan_ops_sta_process_event(IN t_void *priv) memcpy_ext(pmadapter, (t_u8 *)pevent->event_buf, pmadapter->event_body, pevent->event_len, pevent->event_len); +#ifdef UAP_SUPPORT if (pmadapter->dfs_repeater) wlan_dfs_rep_bw_change(pmadapter); +#endif wlan_recv_event(pmpriv, MLAN_EVENT_ID_FW_BW_CHANGED, pevent); break; @@ -928,19 +918,16 @@ wlan_ops_sta_process_event(IN t_void *priv) break; case EVENT_IBSS_STATION_DISCONNECT: break; - case EVENT_SAD_REPORT: - { + case EVENT_SAD_REPORT: { #ifdef DEBUG_LEVEL1 - t_u8 *pevt_dat = - pmbuf->pbuf + pmbuf->data_offset + - sizeof(t_u32); + t_u8 *pevt_dat = + pmbuf->pbuf + pmbuf->data_offset + sizeof(t_u32); #endif - PRINTM(MEVENT, - "EVENT: Antenna Diversity %d (%d, %d, %d, %d)\n", - eventcause, pevt_dat[0] + 1, pevt_dat[1] + 1, - pevt_dat[2], pevt_dat[3]); - } - break; + PRINTM(MEVENT, + "EVENT: Antenna Diversity %d (%d, %d, %d, %d)\n", + eventcause, pevt_dat[0] + 1, pevt_dat[1] + 1, + pevt_dat[2], pevt_dat[3]); + } break; case EVENT_FW_DUMP_INFO: PRINTM(MEVENT, "EVENT: Dump FW info\n"); @@ -974,27 +961,28 @@ wlan_ops_sta_process_event(IN t_void *priv) if (!pmadapter->ssu_buf || !pmadapter->ssu_buf->pbuf) break; - /* If ADMA is supported, SSU header could not be received with SSU data. Instead, - * SSU header is received through this event. So, copy the header into the buffer - * before passing the buffer to upper layer for file writting + /* If ADMA is supported, SSU header could not be received with + * SSU data. Instead, SSU header is received through this event. + * So, copy the header into the buffer before passing the buffer + * to upper layer for file writting */ memcpy_ext(pmadapter, (t_u8 *)pmadapter->ssu_buf->pbuf + - pmadapter->ssu_buf->data_offset, + pmadapter->ssu_buf->data_offset, pmbuf->pbuf + pmbuf->data_offset + - sizeof(eventcause), + sizeof(eventcause), (pmbuf->data_len - sizeof(eventcause)), (pmbuf->data_len - sizeof(eventcause))); DBG_HEXDUMP(MEVT_D, "SSU data", (t_u8 *)pmadapter->ssu_buf->pbuf + - pmadapter->ssu_buf->data_offset, 512); + pmadapter->ssu_buf->data_offset, + 512); pevent->bss_index = pmpriv->bss_index; pevent->event_id = MLAN_EVENT_ID_SSU_DUMP_FILE; pevent->event_len = MLAN_SSU_BUF_SIZE; - *(t_u64 *)pevent->event_buf = - (t_u64)pmadapter->ssu_buf->pbuf + - pmadapter->ssu_buf->data_offset; + *(t_u64 *)pevent->event_buf = (t_u64)pmadapter->ssu_buf->pbuf + + pmadapter->ssu_buf->data_offset; wlan_recv_event(pmpriv, pevent->event_id, pevent); wlan_free_ssu_pcie_buf(pmadapter); break; @@ -1019,9 +1007,9 @@ wlan_ops_sta_process_event(IN t_void *priv) break; } PRINTM(MEVENT, "EVENT: EVENT_FW_HANG_REPORT reasoncode=%d\n", - wlan_le16_to_cpu(*(t_u16 *) - (pmbuf->pbuf + pmbuf->data_offset + - sizeof(eventcause)))); + wlan_le16_to_cpu(*(t_u16 *)(pmbuf->pbuf + + pmbuf->data_offset + + sizeof(eventcause)))); pmadapter->fw_hang_report = MTRUE; wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_DBG_DUMP, MNULL); break; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_ioctl.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_ioctl.c index 3b20b7c84e57..e72bb1bd2fad 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_ioctl.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_ioctl.c @@ -59,8 +59,8 @@ Change log: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_get_info_signal(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -95,10 +95,9 @@ wlan_get_info_signal(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_RSSI_INFO, - HostCmd_ACT_GEN_GET, - 0, (t_void *)pioctl_req, MNULL); + 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; @@ -116,9 +115,8 @@ exit: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_get_info_signal_ext(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_get_info_signal_ext(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { pmlan_private pmpriv = MNULL; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -147,10 +145,9 @@ wlan_get_info_signal_ext(IN pmlan_adapter pmadapter, } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_RSSI_INFO_EXT, - HostCmd_ACT_GEN_GET, - 0, (t_void *)pioctl_req, (t_void *)info); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_RSSI_INFO_EXT, + HostCmd_ACT_GEN_GET, 0, (t_void *)pioctl_req, + (t_void *)info); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -168,8 +165,8 @@ exit: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_get_info_stats(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; @@ -196,10 +193,9 @@ wlan_get_info_stats(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) } /* 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); + 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; @@ -217,9 +213,8 @@ exit: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_bss_ioctl_get_chan_info(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_bss_ioctl_get_chan_info(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { pmlan_private pmpriv = MNULL; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -246,10 +241,9 @@ wlan_bss_ioctl_get_chan_info(IN pmlan_adapter pmadapter, } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_STA_CONFIGURE, - HostCmd_ACT_GEN_GET, - 0, (t_void *)pioctl_req, MNULL); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_STA_CONFIGURE, + HostCmd_ACT_GEN_GET, 0, (t_void *)pioctl_req, + MNULL); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -267,9 +261,8 @@ exit: * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_get_info_bss_info(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) { pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -311,10 +304,9 @@ wlan_get_info_bss_info(IN pmlan_adapter pmadapter, 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); + 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; } @@ -355,7 +347,7 @@ wlan_get_info_bss_info(IN pmlan_adapter pmadapter, if (pbss_desc->pext_cap) { memcpy_ext(pmadapter, &info->param.bss_info.ext_cap, (t_u8 *)pbss_desc->pext_cap + - sizeof(IEEEtypes_Header_t), + sizeof(IEEEtypes_Header_t), pbss_desc->pext_cap->ieee_hdr.len, sizeof(info->param.bss_info.ext_cap)); } @@ -366,8 +358,8 @@ wlan_get_info_bss_info(IN pmlan_adapter pmadapter, /* Association ID */ if (pmpriv->assoc_rsp_buf) info->param.bss_info.assoc_id = - (t_u16)((IEEEtypes_AssocRsp_t *)pmpriv->assoc_rsp_buf)-> - a_id; + (t_u16)((IEEEtypes_AssocRsp_t *)pmpriv->assoc_rsp_buf) + ->a_id; else info->param.bss_info.assoc_id = 0; @@ -397,8 +389,8 @@ wlan_get_info_bss_info(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_get_info_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -495,8 +487,8 @@ wlan_get_info_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_snmp_mib_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; @@ -547,9 +539,7 @@ wlan_snmp_mib_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_SNMP_MIB, - cmd_action, + 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) @@ -568,8 +558,8 @@ exit: * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_radio_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -597,12 +587,12 @@ wlan_radio_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) status = wlan_radio_ioctl_ant_cfg(pmadapter, pioctl_req); break; case MLAN_OID_REMAIN_CHAN_CFG: - status = wlan_radio_ioctl_remain_chan_cfg(pmadapter, - pioctl_req); + status = + wlan_radio_ioctl_remain_chan_cfg(pmadapter, pioctl_req); break; case MLAN_OID_MIMO_SWITCH: - status = wlan_radio_ioctl_mimo_switch_cfg(pmadapter, - pioctl_req); + status = + wlan_radio_ioctl_mimo_switch_cfg(pmadapter, pioctl_req); break; default: pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; @@ -622,9 +612,8 @@ wlan_radio_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_bss_ioctl_mac_address(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) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_bss *bss = MNULL; @@ -643,8 +632,7 @@ wlan_bss_ioctl_mac_address(IN pmlan_adapter pmadapter, } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_MAC_ADDRESS, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_MAC_ADDRESS, cmd_action, 0, (t_void *)pioctl_req, MNULL); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -659,7 +647,8 @@ wlan_bss_ioctl_mac_address(IN pmlan_adapter pmadapter, * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ static mlan_status wlan_bss_ioctl_set_multicast_list(IN pmlan_adapter pmadapter, @@ -698,29 +687,26 @@ wlan_bss_ioctl_set_multicast_list(IN pmlan_adapter pmadapter, ~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); + 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); + 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); + ret = wlan_prepare_cmd( + pmpriv, + HostCmd_CMD_MAC_MULTICAST_ADR, + HostCmd_ACT_GEN_SET, 0, MNULL, + &bss->param.multicast_list); } if (ret) goto exit; @@ -730,10 +716,8 @@ wlan_bss_ioctl_set_multicast_list(IN pmlan_adapter pmadapter, 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, + 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) @@ -771,12 +755,10 @@ wlan_bss_ioctl_get_channel_list(IN pmlan_adapter pmadapter, LEAVE(); return MLAN_STATUS_FAILURE; } - if ((wlan_11d_is_enabled(pmpriv) && - pmpriv->media_connected == MTRUE) && + 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)) - ) { + pmpriv->adhoc_state != ADHOC_STARTED))) { t_u8 chan_no; t_u8 band; @@ -789,14 +771,14 @@ wlan_bss_ioctl_get_channel_list(IN pmlan_adapter pmadapter, 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) { + /*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; @@ -806,35 +788,36 @@ wlan_bss_ioctl_get_channel_list(IN pmlan_adapter pmadapter, 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++) { + (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.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++) { + (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; + 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++; } @@ -848,10 +831,10 @@ wlan_bss_ioctl_get_channel_list(IN pmlan_adapter pmadapter, } /** Highest channel used in 2.4GHz band */ -#define MAX_CHANNEL_BAND_B (14) +#define MAX_CHANNEL_BAND_B (14) /** Highest frequency used in 2.4GHz band */ -#define MAX_FREQUENCY_BAND_B (2484) +#define MAX_FREQUENCY_BAND_B (2484) /** * @brief Set/Get BSS channel @@ -861,9 +844,8 @@ wlan_bss_ioctl_get_channel_list(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_bss_ioctl_channel(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_bss_ioctl_channel(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = MNULL; mlan_ds_bss *bss = MNULL; @@ -879,12 +861,9 @@ wlan_bss_ioctl_channel(IN pmlan_adapter pmadapter, 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); + 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; @@ -906,30 +885,24 @@ wlan_bss_ioctl_channel(IN pmlan_adapter pmadapter, 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); + 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); + cfp = wlan_find_cfp_by_band_and_channel( + pmadapter, BAND_A, + (t_u16)bss->param.bss_chan.channel); if (cfp) { 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); + 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); + cfp = wlan_find_cfp_by_band_and_freq( + pmadapter, BAND_A, bss->param.bss_chan.freq); if (cfp) { pmadapter->adhoc_start_band = BAND_A; } @@ -941,7 +914,6 @@ wlan_bss_ioctl_channel(IN pmlan_adapter pmadapter, 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; @@ -958,10 +930,11 @@ wlan_bss_ioctl_channel(IN pmlan_adapter pmadapter, * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -static mlan_status -wlan_bss_ioctl_mode(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -997,10 +970,9 @@ wlan_bss_ioctl_mode(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) 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); + 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; } @@ -1017,14 +989,14 @@ exit: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_bss_ioctl_start(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 }; + t_u8 zero_mac[] = {0, 0, 0, 0, 0, 0}; ENTER(); @@ -1042,39 +1014,35 @@ wlan_bss_ioctl_start(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) 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); + 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); + 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); + 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); + 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 */ + /* 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, @@ -1089,7 +1057,8 @@ wlan_bss_ioctl_start(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) "SSID found in scan list ... associating...\n"); pmpriv->curr_bss_params.host_mlme = bss->param.ssid_bssid.host_mlme; - /* Clear any past association response stored for application retrieval */ + /* Clear any past association response stored for + * application retrieval */ pmpriv->assoc_rsp_size = 0; pmpriv->curr_chan_flags = bss->param.ssid_bssid.channel_flags; @@ -1099,10 +1068,11 @@ wlan_bss_ioctl_start(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) &pmadapter->pscan_table[i]); if (ret) goto start_ssid_done; - } else { /* i >= 0 */ + } else { /* i >= 0 */ PRINTM(MERROR, "SSID not found in scan list: ssid=%s, " MACSTR - ", idx=%d\n", bss->param.ssid_bssid.ssid.ssid, + ", 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; @@ -1113,9 +1083,9 @@ wlan_bss_ioctl_start(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) /* 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))) { + (!wlan_ssid_cmp(pmadapter, + &pmpriv->curr_bss_params.bss_descriptor.ssid, + &bss->param.ssid_bssid.ssid))) { ret = MLAN_STATUS_SUCCESS; goto start_ssid_done; } @@ -1132,23 +1102,20 @@ wlan_bss_ioctl_start(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) 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); + 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); + 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); + i = wlan_is_network_compatible( + pmpriv, bss->param.ssid_bssid.idx - 1, + pmpriv->bss_mode); } if (i >= 0) { @@ -1160,8 +1127,9 @@ wlan_bss_ioctl_start(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) &pmadapter->pscan_table[i]); if (ret) goto start_ssid_done; - } else { /* i >= 0 */ - PRINTM(MINFO, "Network not found in the list, " + } else { /* i >= 0 */ + PRINTM(MINFO, + "Network not found in the list, " "creating adhoc with ssid = %s\n", bss->param.ssid_bssid.ssid.ssid); pmpriv->curr_chan_flags = @@ -1187,10 +1155,11 @@ start_ssid_done: * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -static mlan_status -wlan_bss_ioctl_stop(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]; @@ -1210,11 +1179,11 @@ wlan_bss_ioctl_stop(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -static mlan_status -wlan_bss_ioctl_ibss_channel(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) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_bss *bss = MNULL; @@ -1237,11 +1206,8 @@ wlan_bss_ioctl_ibss_channel(IN pmlan_adapter pmadapter, } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_RF_CHANNEL, - cmd_action, - 0, - (t_void *)pioctl_req, + 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; @@ -1257,11 +1223,11 @@ exit: * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -static mlan_status -wlan_bss_ioctl_listen_interval(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_bss_ioctl_listen_interval(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_bss *bss = MNULL; @@ -1286,9 +1252,8 @@ wlan_bss_ioctl_listen_interval(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_bss_ioctl_beacon_interval(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_bss_ioctl_beacon_interval(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_bss *bss = MNULL; @@ -1299,8 +1264,8 @@ wlan_bss_ioctl_beacon_interval(IN pmlan_adapter pmadapter, bss->param.bcn_interval = pmpriv->beacon_period; if (pmpriv->media_connected == MTRUE) bss->param.bcn_interval = - pmpriv->curr_bss_params.bss_descriptor. - beacon_period; + 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; @@ -1316,9 +1281,8 @@ wlan_bss_ioctl_beacon_interval(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_bss_ioctl_atim_window(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_bss_ioctl_atim_window(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_bss *bss = MNULL; @@ -1329,8 +1293,8 @@ wlan_bss_ioctl_atim_window(IN pmlan_adapter pmadapter, bss->param.atim_window = pmpriv->atim_window; if (pmpriv->media_connected == MTRUE) bss->param.atim_window = - pmpriv->curr_bss_params.bss_descriptor. - atim_window; + pmpriv->curr_bss_params.bss_descriptor + .atim_window; } else pmpriv->atim_window = (t_u16)bss->param.atim_window; @@ -1347,8 +1311,8 @@ wlan_bss_ioctl_atim_window(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -static mlan_status -wlan_query_passphrase(mlan_private *priv, pmlan_ioctl_req pioctl_req) +static mlan_status wlan_query_passphrase(mlan_private *priv, + pmlan_ioctl_req pioctl_req) { mlan_adapter *pmadapter = priv->adapter; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -1393,10 +1357,9 @@ wlan_query_passphrase(mlan_private *priv, pmlan_ioctl_req pioctl_req) } /* Send request to firmware */ - ret = wlan_prepare_cmd(priv, - HostCmd_CMD_SUPPLICANT_PMK, - HostCmd_ACT_GEN_GET, - 0, (t_void *)pioctl_req, (t_void *)sec); + ret = wlan_prepare_cmd(priv, HostCmd_CMD_SUPPLICANT_PMK, + HostCmd_ACT_GEN_GET, 0, (t_void *)pioctl_req, + (t_void *)sec); if (sec) pcb->moal_mfree(pmadapter->pmoal_handle, (t_u8 *)sec); LEAVE(); @@ -1409,11 +1372,11 @@ wlan_query_passphrase(mlan_private *priv, pmlan_ioctl_req pioctl_req) * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -mlan_status -wlan_bss_ioctl_find_bss(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_bss_ioctl_find_bss(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1453,11 +1416,11 @@ wlan_bss_ioctl_find_bss(IN pmlan_adapter pmadapter, * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -mlan_status -wlan_bss_ioctl_find_bssid(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_bss_ioctl_find_bssid(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_bss *bss = MNULL; @@ -1487,11 +1450,11 @@ wlan_bss_ioctl_find_bssid(IN pmlan_adapter pmadapter, * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -mlan_status -wlan_bss_ioctl_bss_11d_check_channel(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_bss_ioctl_bss_11d_check_channel(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_bss *bss = MNULL; @@ -1528,8 +1491,8 @@ wlan_bss_ioctl_bss_11d_check_channel(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_bss_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -1649,16 +1612,17 @@ wlan_rate_ioctl_get_supported_rate(IN pmlan_adapter pmadapter, 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); + 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); + 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(); @@ -1671,10 +1635,11 @@ wlan_rate_ioctl_get_supported_rate(IN pmlan_adapter pmadapter, * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -static mlan_status -wlan_rate_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -1719,9 +1684,9 @@ wlan_rate_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_power_ioctl_get_power(IN pmlan_adapter pmadapter, - IN t_u16 cmd_no, 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) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; @@ -1729,10 +1694,8 @@ wlan_power_ioctl_get_power(IN pmlan_adapter pmadapter, ENTER(); /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - cmd_no, - HostCmd_ACT_GEN_GET, - 0, (t_void *)pioctl_req, MNULL); + 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; @@ -1749,9 +1712,8 @@ wlan_power_ioctl_get_power(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_power_ioctl_set_power(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_power_ioctl_set_power(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_ds_power_cfg *power = MNULL; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1795,9 +1757,8 @@ wlan_power_ioctl_set_power(IN pmlan_adapter pmadapter, 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 = (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) + @@ -1838,10 +1799,9 @@ wlan_power_ioctl_set_power(IN pmlan_adapter pmadapter, } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_TXPWR_CFG, - HostCmd_ACT_GEN_SET, - 0, (t_void *)pioctl_req, buf); + 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; @@ -1862,9 +1822,8 @@ exit: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_power_ioctl_set_power_ext(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_power_ioctl_set_power_ext(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]; @@ -1897,9 +1856,8 @@ wlan_power_ioctl_set_power_ext(IN pmlan_adapter pmadapter, else { txp_cfg->mode = 1; - pg_tlv = (MrvlTypes_Power_Group_t *)(buf + - sizeof - (HostCmd_DS_TXPWR_CFG)); + 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) + @@ -1910,7 +1868,8 @@ wlan_power_ioctl_set_power_ext(IN pmlan_adapter pmadapter, 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) { + if (pwr_grp->first_rate_ind <= + MLAN_RATE_INDEX_HRDSSS3) { pg->modulation_class = MOD_CLASS_HR_DSSS; } else { pg->modulation_class = MOD_CLASS_OFDM; @@ -1927,13 +1886,11 @@ wlan_power_ioctl_set_power_ext(IN pmlan_adapter pmadapter, } 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)); + (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)); + (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; @@ -1946,10 +1903,9 @@ wlan_power_ioctl_set_power_ext(IN pmlan_adapter pmadapter, } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_TXPWR_CFG, - HostCmd_ACT_GEN_SET, - 0, (t_void *)pioctl_req, buf); + 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) @@ -1968,8 +1924,8 @@ exit: * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_power_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -1988,9 +1944,8 @@ wlan_power_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) 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); + status = wlan_power_ioctl_get_power( + pmadapter, HostCmd_CMD_TXPWR_CFG, pioctl_req); else status = wlan_power_ioctl_set_power(pmadapter, pioctl_req); @@ -1998,9 +1953,8 @@ wlan_power_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) 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); + status = wlan_power_ioctl_get_power( + pmadapter, HostCmd_CMD_TXPWR_CFG, pioctl_req); else status = wlan_power_ioctl_set_power_ext(pmadapter, pioctl_req); @@ -2026,9 +1980,9 @@ wlan_power_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_pm_ioctl_ps_mode(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req, IN t_u16 ps_mode) +static mlan_status wlan_pm_ioctl_ps_mode(IN pmlan_adapter pmadapter, + 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]; @@ -2038,20 +1992,19 @@ wlan_pm_ioctl_ps_mode(IN pmlan_adapter pmadapter, 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); + 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); + 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) @@ -2086,8 +2039,7 @@ wlan_pm_ioctl_inactivity_timeout(IN pmlan_adapter pmadapter, cmd_action = HostCmd_ACT_GEN_SET; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_INACTIVITY_TIMEOUT_EXT, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_INACTIVITY_TIMEOUT_EXT, cmd_action, 0, (t_void *)pioctl_req, (t_void *)&pmcfg->param.inactivity_to); @@ -2106,9 +2058,8 @@ wlan_pm_ioctl_inactivity_timeout(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_set_auto_deep_sleep(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_set_auto_deep_sleep(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_private pmpriv = @@ -2118,8 +2069,8 @@ wlan_set_auto_deep_sleep(IN pmlan_adapter pmadapter, ENTER(); - if (((mlan_ds_pm_cfg *)pioctl_req->pbuf)->param.auto_deep_sleep. - auto_ds == DEEP_SLEEP_ON) { + 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; @@ -2128,19 +2079,16 @@ wlan_set_auto_deep_sleep(IN pmlan_adapter pmadapter, 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; + 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); + 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; @@ -2158,8 +2106,8 @@ wlan_set_auto_deep_sleep(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_set_get_sleep_pd(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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]; @@ -2193,8 +2141,8 @@ wlan_set_get_sleep_pd(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_set_get_ps_cfg(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; @@ -2223,8 +2171,8 @@ wlan_set_get_ps_cfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) (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; + (t_u16)pm_cfg->param.ps_cfg + .multiple_dtim_interval; else pm_cfg->param.ps_cfg.multiple_dtim_interval = (t_u32)pmadapter->multiple_dtim; @@ -2270,9 +2218,8 @@ wlan_set_get_ps_cfg(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_set_get_bcn_timeout(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_set_get_bcn_timeout(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]; @@ -2302,9 +2249,8 @@ wlan_set_get_bcn_timeout(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_set_get_sleep_params(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) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; @@ -2338,9 +2284,8 @@ wlan_set_get_sleep_params(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_config_mgmt_filter(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_config_mgmt_filter(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_pm_cfg *pm_cfg = MNULL; @@ -2373,8 +2318,8 @@ wlan_config_mgmt_filter(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_pm_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -2393,7 +2338,8 @@ wlan_pm_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) case MLAN_OID_PM_CFG_IEEE_PS: switch (pioctl_req->action) { case MLAN_ACT_SET: - /**Block ieee power save disable command when bt coex enable*/ + /**Block ieee power save disable command when bt coex + * enable*/ if (pmadapter->coex_scan && !pm->param.ps_mode) break; if (pm->param.ps_mode) @@ -2417,29 +2363,29 @@ wlan_pm_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) 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); + 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) { + 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) { + 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); + status = + wlan_set_auto_deep_sleep(pmadapter, pioctl_req); break; case MLAN_ACT_GET: if (pmadapter->is_deep_sleep) { @@ -2496,8 +2442,8 @@ wlan_pm_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_set_wpa_ie_helper(mlan_private *priv, t_u8 *ie_data_ptr, t_u16 ie_len) +static mlan_status wlan_set_wpa_ie_helper(mlan_private *priv, t_u8 *ie_data_ptr, + t_u16 ie_len) { ENTER(); @@ -2543,8 +2489,8 @@ wlan_set_wpa_ie_helper(mlan_private *priv, t_u8 *ie_data_ptr, t_u16 ie_len) * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_set_osen_ie(mlan_private *priv, t_u8 *ie_data_ptr, t_u16 ie_len) +static mlan_status wlan_set_osen_ie(mlan_private *priv, t_u8 *ie_data_ptr, + t_u16 ie_len) { ENTER(); if (ie_len) { @@ -2581,8 +2527,8 @@ wlan_set_osen_ie(mlan_private *priv, t_u8 *ie_data_ptr, t_u16 ie_len) * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_set_wapi_ie(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) { @@ -2619,9 +2565,8 @@ wlan_set_wapi_ie(mlan_private *priv, t_u8 *ie_data_ptr, t_u16 ie_len) * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_sec_ioctl_wapi_enable(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_sec_ioctl_wapi_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]; @@ -2650,9 +2595,8 @@ wlan_sec_ioctl_wapi_enable(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_sec_ioctl_set_wapi_key(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_sec_ioctl_set_wapi_key(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]; @@ -2660,10 +2604,8 @@ wlan_sec_ioctl_set_wapi_key(IN pmlan_adapter pmadapter, 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, + 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; @@ -2723,9 +2665,8 @@ wlan_sec_ioctl_port_ctrl_enable(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_sec_ioctl_auth_mode(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_sec_ioctl_auth_mode(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]; @@ -2750,9 +2691,8 @@ wlan_sec_ioctl_auth_mode(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_sec_ioctl_encrypt_mode(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_sec_ioctl_encrypt_mode(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]; @@ -2776,8 +2716,7 @@ wlan_sec_ioctl_encrypt_mode(IN pmlan_adapter pmadapter, * * @return random charactor */ -t_u8 -wlan_get_random_charactor(pmlan_adapter pmadapter) +t_u8 wlan_get_random_charactor(pmlan_adapter pmadapter) { t_u32 sec, usec; t_u8 ch = 0; @@ -2801,9 +2740,8 @@ wlan_get_random_charactor(pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_sec_ioctl_wpa_enable(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_sec_ioctl_wpa_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]; @@ -2832,9 +2770,8 @@ wlan_sec_ioctl_wpa_enable(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_sec_ioctl_set_wep_key(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_sec_ioctl_set_wep_key(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]; @@ -2854,15 +2791,17 @@ wlan_sec_ioctl_set_wep_key(IN pmlan_adapter pmadapter, sec->param.encrypt_key.key_index = index; } else { if (sec->param.encrypt_key.key_index >= MRVL_NUM_WEP_KEY) { - if ((sec->param.encrypt_key.key_remove == MTRUE)&& + if ((sec->param.encrypt_key.key_remove == MTRUE) && (sec->param.encrypt_key.key_index <= 5)) { /* call firmware remove key */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_KEY_MATERIAL, - HostCmd_ACT_GEN_SET, - 0, - MNULL, - &sec->param.encrypt_key); + ret = wlan_prepare_cmd( + pmpriv, HostCmd_CMD_802_11_KEY_MATERIAL, + HostCmd_ACT_GEN_SET, 0, + (t_void *)pioctl_req, + &sec->param.encrypt_key); + if (ret == MLAN_STATUS_SUCCESS) + ret = MLAN_STATUS_PENDING; + goto exit; } PRINTM(MERROR, "Key_index is invalid\n"); @@ -2872,7 +2811,7 @@ wlan_sec_ioctl_set_wep_key(IN pmlan_adapter pmadapter, index = sec->param.encrypt_key.key_index; } - if ((sec->param.encrypt_key.key_disable == MTRUE)|| + if ((sec->param.encrypt_key.key_disable == MTRUE) || (sec->param.encrypt_key.key_remove == MTRUE)) { pmpriv->sec_info.wep_status = Wlan802_11WEPDisabled; /* remove key */ @@ -2882,20 +2821,21 @@ wlan_sec_ioctl_set_wep_key(IN pmlan_adapter pmadapter, /* call firmware remove key */ ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_KEY_MATERIAL, - HostCmd_ACT_GEN_SET, - 0, - MNULL, &sec->param.encrypt_key); + HostCmd_ACT_GEN_SET, 0, MNULL, + &sec->param.encrypt_key); if (ret) goto exit; } } 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)) { + 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 */ + /* 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 = @@ -2906,8 +2846,8 @@ wlan_sec_ioctl_set_wep_key(IN pmlan_adapter pmadapter, for (i = 0; i < sec->param.encrypt_key.key_len; i++) sec->param.encrypt_key.key_material[i] = - wlan_get_random_charactor - (pmadapter); + wlan_get_random_charactor( + pmadapter); } pwep_key = &pmpriv->wep_key[index]; /* Cleanup */ @@ -2920,7 +2860,8 @@ wlan_sec_ioctl_set_wep_key(IN pmlan_adapter pmadapter, MRVL_KEY_BUFFER_SIZE_IN_BYTE); pwep_key->key_index = index; pwep_key->key_length = sec->param.encrypt_key.key_len; - if (pmpriv->sec_info.wep_status != Wlan802_11WEPEnabled) { + if (pmpriv->sec_info.wep_status != + Wlan802_11WEPEnabled) { /* * The status is set as Key Absent * so as to make sure we display the @@ -2953,12 +2894,13 @@ wlan_sec_ioctl_set_wep_key(IN pmlan_adapter pmadapter, } if (sec->param.encrypt_key.key_flags && pwep_key->key_length) { pmpriv->wep_key_curr_index = (t_u16)index; - // Only do this if the key is an xmit key. If the key is a group key, - // we might be in wpa/wep mixed mode in which case we don't want to - // set wep_status = Wlan802_11WEPEnabled because that enables WEP - // at the MAC controller level and WPA stops working properly. - if (sec->param.encrypt_key. - key_flags & KEY_FLAG_SET_TX_KEY) { + // Only do this if the key is an xmit key. If the key + // is a group key, we might be in wpa/wep mixed mode in + // which case we don't want to set wep_status = + // Wlan802_11WEPEnabled because that enables WEP at the + // MAC controller level and WPA stops working properly. + if (sec->param.encrypt_key.key_flags & + KEY_FLAG_SET_TX_KEY) { pmpriv->sec_info.wep_status = Wlan802_11WEPEnabled; } @@ -2970,12 +2912,11 @@ wlan_sec_ioctl_set_wep_key(IN pmlan_adapter pmadapter, 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 (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; if (!sec->param.encrypt_key.key_len) { @@ -2987,10 +2928,8 @@ wlan_sec_ioctl_set_wep_key(IN pmlan_adapter pmadapter, sec->param.encrypt_key.key_len, MLAN_MAX_KEY_LENGTH); } - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_KEY_MATERIAL, - HostCmd_ACT_GEN_SET, - 0, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_KEY_MATERIAL, + HostCmd_ACT_GEN_SET, 0, (t_void *)pioctl_req, &sec->param.encrypt_key); } else { @@ -3008,16 +2947,13 @@ wlan_sec_ioctl_set_wep_key(IN pmlan_adapter pmadapter, } ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_KEY_MATERIAL, - HostCmd_ACT_GEN_SET, - 0, - MNULL, &sec->param.encrypt_key); + HostCmd_ACT_GEN_SET, 0, MNULL, + &sec->param.encrypt_key); if (ret) goto exit; } - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_MAC_CONTROL, - HostCmd_ACT_GEN_SET, - 0, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_MAC_CONTROL, + HostCmd_ACT_GEN_SET, 0, (t_void *)pioctl_req, &pmpriv->curr_pkt_filter); } @@ -3037,9 +2973,8 @@ exit: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_sec_ioctl_set_wpa_key(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_sec_ioctl_set_wpa_key(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]; @@ -3056,11 +2991,9 @@ wlan_sec_ioctl_set_wpa_key(IN pmlan_adapter pmadapter, goto exit; } - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_KEY_MATERIAL, - HostCmd_ACT_GEN_SET, - 0, - (t_void *)pioctl_req, &sec->param.encrypt_key); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_KEY_MATERIAL, + HostCmd_ACT_GEN_SET, 0, (t_void *)pioctl_req, + &sec->param.encrypt_key); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -3078,9 +3011,8 @@ exit: * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_sec_ioctl_get_key(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_sec_ioctl_get_key(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]; @@ -3093,16 +3025,16 @@ wlan_sec_ioctl_get_key(IN pmlan_adapter pmadapter, 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) { + 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) { 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)&& + 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 = @@ -3115,11 +3047,10 @@ wlan_sec_ioctl_get_key(IN pmlan_adapter pmadapter, 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) - ) { + } else if ((pmpriv->sec_info.wpa_enabled) || + (pmpriv->sec_info.ewpa_enabled) || + (pmpriv->sec_info.wpa2_enabled) || + (pmpriv->sec_info.wapi_enabled)) { /* Return WPA enabled */ sec->param.encrypt_key.key_disable = MFALSE; memcpy_ext(pmadapter, @@ -3127,9 +3058,8 @@ wlan_sec_ioctl_get_key(IN pmlan_adapter pmadapter, pmpriv->aes_key.key_material, pmpriv->aes_key.key_len, MLAN_MAX_KEY_LENGTH); - sec->param.encrypt_key.key_len = - MIN(MLAN_MAX_KEY_LENGTH, - pmpriv->aes_key.key_len); + sec->param.encrypt_key.key_len = MIN( + MLAN_MAX_KEY_LENGTH, pmpriv->aes_key.key_len); } else { sec->param.encrypt_key.key_disable = MTRUE; } @@ -3146,11 +3076,10 @@ wlan_sec_ioctl_get_key(IN pmlan_adapter pmadapter, 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) - ) { + } else if ((pmpriv->sec_info.wpa_enabled) || + (pmpriv->sec_info.ewpa_enabled) || + (pmpriv->sec_info.wpa2_enabled) || + (pmpriv->sec_info.wapi_enabled)) { /* Return WPA enabled */ sec->param.encrypt_key.key_disable = MFALSE; } else { @@ -3168,11 +3097,11 @@ wlan_sec_ioctl_get_key(IN pmlan_adapter pmadapter, * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -static mlan_status -wlan_sec_ioctl_encrypt_key(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_sec_ioctl_encrypt_key(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status status = MLAN_STATUS_SUCCESS; mlan_ds_sec_cfg *sec = MNULL; @@ -3203,9 +3132,8 @@ wlan_sec_ioctl_encrypt_key(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_sec_ioctl_query_key(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_sec_ioctl_query_key(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]; @@ -3215,14 +3143,12 @@ wlan_sec_ioctl_query_key(IN pmlan_adapter pmadapter, sec = (mlan_ds_sec_cfg *)pioctl_req->pbuf; /* Current driver only supports get PTK/GTK */ - if (pmpriv->port_open && (pmpriv->sec_info.wpa_enabled - || pmpriv->sec_info.wpa2_enabled - || pmpriv->sec_info.wapi_enabled)) { + if (pmpriv->port_open && + (pmpriv->sec_info.wpa_enabled || pmpriv->sec_info.wpa2_enabled || + pmpriv->sec_info.wapi_enabled)) { /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_KEY_MATERIAL, - HostCmd_ACT_GEN_GET, - KEY_INFO_ENABLED, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_KEY_MATERIAL, + HostCmd_ACT_GEN_GET, KEY_INFO_ENABLED, (t_void *)pioctl_req, &sec->param.encrypt_key); @@ -3241,9 +3167,8 @@ wlan_sec_ioctl_query_key(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_sec_ioctl_ewpa_enable(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_sec_ioctl_ewpa_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]; @@ -3270,9 +3195,8 @@ wlan_sec_ioctl_ewpa_enable(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_sec_ioctl_esupp_mode(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_sec_ioctl_esupp_mode(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]; @@ -3292,26 +3216,26 @@ wlan_sec_ioctl_esupp_mode(IN pmlan_adapter pmadapter, 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) { + (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) { + (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) { + (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; @@ -3323,17 +3247,13 @@ wlan_sec_ioctl_esupp_mode(IN pmlan_adapter pmadapter, /* Send request to firmware */ if (sec) { - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_SUPPLICANT_PROFILE, - cmd_action, - 0, - (t_void *)pioctl_req, + 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); + 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; @@ -3349,10 +3269,11 @@ exit: * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -static mlan_status -wlan_sec_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -3427,15 +3348,15 @@ wlan_sec_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static int -wlan_set_gen_ie_helper(mlan_private *priv, t_u8 *ie_data_ptr, t_u16 ie_len) +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 }; - const t_u8 osen_oui[] = { 0x50, 0x6f, 0x9a, 0x12 }; - t_u8 i = 0, temp[12] = { 0 }; + const t_u8 wpa_oui[] = {0x00, 0x50, 0xf2, 0x01}; + const t_u8 wps_oui[] = {0x00, 0x50, 0xf2, 0x04}; + const t_u8 osen_oui[] = {0x50, 0x6f, 0x9a, 0x12}; + t_u8 i = 0, temp[12] = {0}; ENTER(); @@ -3450,7 +3371,6 @@ wlan_set_gen_ie_helper(mlan_private *priv, t_u8 *ie_data_ptr, t_u16 ie_len) /* MNULL check */ ret = MLAN_STATUS_FAILURE; } else { - pvendor_ie = (IEEEtypes_VendorHeader_t *)ie_data_ptr; if (pvendor_ie->element_id == EXT_CAPABILITY) { memcpy_ext(priv->adapter, temp, &priv->ext_cap, @@ -3462,13 +3382,12 @@ wlan_set_gen_ie_helper(mlan_private *priv, t_u8 *ie_data_ptr, t_u16 ie_len) memcpy_ext(priv->adapter, &priv->ext_cap, temp, sizeof(temp), sizeof(priv->ext_cap)); } else - /* 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)) { + /* 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; @@ -3476,17 +3395,15 @@ wlan_set_gen_ie_helper(mlan_private *priv, t_u8 *ie_data_ptr, t_u16 ie_len) /* 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 == VENDOR_SPECIFIC_221) && - (!memcmp - (priv->adapter, pvendor_ie->oui, osen_oui, - sizeof(osen_oui)))) { + (!memcmp(priv->adapter, pvendor_ie->oui, osen_oui, + sizeof(osen_oui)))) { /* IE is a OSEN IE so call set_osen function */ ret = wlan_set_osen_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)))) { + (!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 @@ -3500,7 +3417,8 @@ wlan_set_gen_ie_helper(mlan_private *priv, t_u8 *ie_data_ptr, t_u16 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 */ + /* 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"); @@ -3512,15 +3430,13 @@ wlan_set_gen_ie_helper(mlan_private *priv, t_u8 *ie_data_ptr, t_u16 ie_len) */ 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 */ + /* 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)))) { + 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"); } @@ -3529,10 +3445,10 @@ wlan_set_gen_ie_helper(mlan_private *priv, t_u8 *ie_data_ptr, t_u16 ie_len) * the genIeBuffer */ memcpy_ext(priv->adapter, priv->gen_ie_buf + - priv->gen_ie_buf_len, ie_data_ptr, - ie_len, + priv->gen_ie_buf_len, + ie_data_ptr, ie_len, MRVDRV_GENIE_BUF_SIZE - - priv->gen_ie_buf_len); + priv->gen_ie_buf_len); /* Increment the stored buffer length by * the size passed */ priv->gen_ie_buf_len += ie_len; @@ -3557,9 +3473,8 @@ wlan_set_gen_ie_helper(mlan_private *priv, t_u8 *ie_data_ptr, t_u16 ie_len) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_misc_ioctl_wws_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_misc_ioctl_wws_cfg(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; @@ -3588,9 +3503,7 @@ wlan_misc_ioctl_wws_cfg(IN pmlan_adapter pmadapter, enable = misc_cfg->param.wws_cfg; /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_SNMP_MIB, - cmd_action, + 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) @@ -3599,7 +3512,6 @@ wlan_misc_ioctl_wws_cfg(IN pmlan_adapter pmadapter, exit: LEAVE(); return ret; - } /** @@ -3608,11 +3520,11 @@ exit: * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -static mlan_status -wlan_11d_cfg_ioctl_enable(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_11d_cfg_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]; @@ -3636,9 +3548,9 @@ wlan_11d_cfg_ioctl_enable(IN pmlan_adapter pmadapter, /* 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); + 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 { @@ -3667,9 +3579,8 @@ done: * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_11d_clr_chan_table(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_11d_clr_chan_table(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]; @@ -3695,10 +3606,11 @@ wlan_11d_clr_chan_table(IN pmlan_adapter pmadapter, * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -static mlan_status -wlan_11d_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -3744,8 +3656,8 @@ exit: * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_wps_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]; @@ -3797,8 +3709,8 @@ wlan_wps_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_reg_mem_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; @@ -3841,9 +3753,8 @@ wlan_reg_mem_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_11h_channel_check_req(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) { pmlan_private pmpriv = MNULL; mlan_status ret = MLAN_STATUS_FAILURE; @@ -3863,24 +3774,22 @@ wlan_11h_channel_check_req(IN pmlan_adapter pmadapter, memset(pmadapter, &bandcfg, 0, sizeof(Band_Config_t)); pmpriv->adhoc_state = ADHOC_STARTING; - if ((pmadapter->adhoc_start_band & BAND_A) - ) { + if ((pmadapter->adhoc_start_band & BAND_A)) { 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. + * 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) - ) { + 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 + * 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); @@ -3952,10 +3861,11 @@ wlan_11h_ioctl_local_power_constraint(IN pmlan_adapter pmadapter, * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -static mlan_status -wlan_11h_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -3983,6 +3893,9 @@ wlan_11h_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) case MLAN_OID_11H_DFS_TESTING: status = wlan_11h_ioctl_dfs_testing(pmadapter, pioctl_req); break; + case MLAN_OID_11H_DFS_W53_CFG: + status = wlan_11h_ioctl_dfs_w53_cfg(pmadapter, pioctl_req); + break; default: pioctl_req->status_code = MLAN_ERROR_IOCTL_INVALID; status = MLAN_STATUS_FAILURE; @@ -4001,9 +3914,8 @@ wlan_11h_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_misc_ioctl_gen_ie(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) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; @@ -4044,9 +3956,8 @@ wlan_misc_ioctl_gen_ie(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, MLAN_STATUS_FAILURE */ -mlan_status -wlan_misc_ioctl_warm_reset(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_warm_reset(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; @@ -4062,16 +3973,13 @@ wlan_misc_ioctl_warm_reset(IN pmlan_adapter pmadapter, if (misc->param.fw_reload) wlan_cancel_all_pending_cmd(pmadapter); - /** Init all the head nodes and free all the locks here */ + /** 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]); - while ((pmbuf = (pmlan_buffer)util_dequeue_list(pmadapter->pmoal_handle, - &pmadapter-> - rx_data_queue, - pcb->moal_spin_lock, - pcb-> - moal_spin_unlock))) { + while ((pmbuf = (pmlan_buffer)util_dequeue_list( + pmadapter->pmoal_handle, &pmadapter->rx_data_queue, + pcb->moal_spin_lock, pcb->moal_spin_unlock))) { pmadapter->ops.data_complete(pmadapter, pmbuf, MLAN_STATUS_FAILURE); } @@ -4132,9 +4040,8 @@ done: * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static mlan_status -wlan_misc_ioctl_sdio_mpa_ctrl(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_misc_ioctl_sdio_mpa_ctrl(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]; @@ -4146,7 +4053,6 @@ wlan_misc_ioctl_sdio_mpa_ctrl(IN pmlan_adapter pmadapter, 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"); @@ -4180,7 +4086,6 @@ wlan_misc_ioctl_sdio_mpa_ctrl(IN pmlan_adapter pmadapter, } if (mpa_ctrl->tx_buf_size || mpa_ctrl->rx_buf_size) { - wlan_free_sdio_mpa_buffers(pmadapter); if (mpa_ctrl->tx_buf_size > 0) @@ -4191,11 +4096,10 @@ wlan_misc_ioctl_sdio_mpa_ctrl(IN pmlan_adapter pmadapter, pmadapter->pcard_sd->mpa_rx.buf_size = mpa_ctrl->rx_buf_size; - if (wlan_alloc_sdio_mpa_buffers(pmadapter, - pmadapter->pcard_sd-> - mpa_tx.buf_size, - pmadapter->pcard_sd-> - mpa_rx.buf_size) != + if (wlan_alloc_sdio_mpa_buffers( + pmadapter, + pmadapter->pcard_sd->mpa_tx.buf_size, + pmadapter->pcard_sd->mpa_rx.buf_size) != MLAN_STATUS_SUCCESS) { PRINTM(MERROR, "Failed to allocate sdio mp-a buffers\n"); @@ -4244,9 +4148,8 @@ exit: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_misc_ioctl_sysclock(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_misc_ioctl_sysclock(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_misc_cfg *misc = MNULL; @@ -4262,11 +4165,8 @@ wlan_misc_ioctl_sysclock(IN pmlan_adapter pmadapter, 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, + 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) @@ -4284,9 +4184,8 @@ wlan_misc_ioctl_sysclock(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_misc_ioctl_get_assoc_rsp(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_misc_ioctl_get_assoc_rsp(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_ds_misc_cfg *misc = MNULL; mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; @@ -4301,7 +4200,6 @@ wlan_misc_ioctl_get_assoc_rsp(IN pmlan_adapter pmadapter, ASSOC_RSP_BUF_SIZE); misc->param.assoc_resp.assoc_resp_len = MIN(ASSOC_RSP_BUF_SIZE, pmpriv->assoc_rsp_size); - } LEAVE(); @@ -4316,19 +4214,17 @@ wlan_misc_ioctl_get_assoc_rsp(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_misc_ioctl_soft_reset(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_misc_ioctl_soft_reset(IN pmlan_adapter pmadapter, + 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); + 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; @@ -4344,9 +4240,8 @@ wlan_misc_ioctl_soft_reset(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING -- success, otherwise fail */ -mlan_status -wlan_misc_ioctl_thermal(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_thermal(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -4375,9 +4270,7 @@ wlan_misc_ioctl_thermal(IN pmlan_adapter pmadapter, } /* Send command to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_SNMP_MIB, - cmd_action, + 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) @@ -4395,9 +4288,8 @@ wlan_misc_ioctl_thermal(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING -- success, otherwise fail */ -mlan_status -wlan_misc_ioctl_subscribe_evt(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_subscribe_evt(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -4413,11 +4305,8 @@ wlan_misc_ioctl_subscribe_evt(IN pmlan_adapter pmadapter, 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, + 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) @@ -4427,9 +4316,9 @@ wlan_misc_ioctl_subscribe_evt(IN pmlan_adapter pmadapter, return ret; } -#define FLTR_BUF_IP_OFFSET 24 -#define FLTR_BUF_IP_OFFSET_2_IP_1 9 -#define FLTR_BUF_IP_OFFSET_2_IP_2 26 +#define FLTR_BUF_IP_OFFSET 24 +#define FLTR_BUF_IP_OFFSET_2_IP_1 9 +#define FLTR_BUF_IP_OFFSET_2_IP_2 26 /** * @brief Enable/Disable Auto ARP resonse @@ -4441,10 +4330,9 @@ wlan_misc_ioctl_subscribe_evt(IN pmlan_adapter pmadapter, * * @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) +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) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -4455,26 +4343,24 @@ wlan_ipaddr_auto_arp_resp(IN pmlan_adapter pmadapter, 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 - }; + 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); + 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"); @@ -4499,9 +4385,8 @@ wlan_ipaddr_auto_arp_resp(IN pmlan_adapter pmadapter, 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->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; @@ -4528,9 +4413,8 @@ wlan_ipaddr_auto_arp_resp(IN pmlan_adapter pmadapter, hostcmd->len = buf_len; /* Send command to firmware */ - ret = wlan_prepare_cmd(pmpriv, - 0, - 0, 0, (t_void *)pioctl_req, (t_void *)hostcmd); + ret = wlan_prepare_cmd(pmpriv, 0, 0, 0, (t_void *)pioctl_req, + (t_void *)hostcmd); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -4548,9 +4432,8 @@ wlan_ipaddr_auto_arp_resp(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_mef_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_mef_cfg(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]; @@ -4562,14 +4445,12 @@ wlan_misc_ioctl_mef_cfg(IN pmlan_adapter pmadapter, 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 - }; + 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(); @@ -4580,8 +4461,8 @@ wlan_misc_ioctl_mef_cfg(IN pmlan_adapter pmadapter, } ret = pcb->moal_malloc(pmadapter->pmoal_handle, - sizeof(mlan_ds_misc_cmd), - MLAN_MEM_DEF, (t_u8 **)&hostcmd); + 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"); @@ -4639,9 +4520,8 @@ wlan_misc_ioctl_mef_cfg(IN pmlan_adapter pmadapter, hostcmd->len = buf_len; /* Send command to firmware */ - ret = wlan_prepare_cmd(pmpriv, - 0, - 0, 0, (t_void *)pioctl_req, (t_void *)hostcmd); + ret = wlan_prepare_cmd(pmpriv, 0, 0, 0, (t_void *)pioctl_req, + (t_void *)hostcmd); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -4661,14 +4541,13 @@ done: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_ipaddr_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_ipaddr_cfg(IN pmlan_adapter pmadapter, + 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] = { 0 }; + t_u32 ipv4_addr[MAX_IPADDR] = {0}; int i = 0; ENTER(); @@ -4716,9 +4595,8 @@ done: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_cfp_code_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_cfp_code_cfg(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]; @@ -4780,8 +4658,8 @@ wlan_misc_ioctl_cfp_code_cfg(IN pmlan_adapter pmadapter, else pmadapter->region_code = 0; if (wlan_set_regiontable(pmpriv, (t_u8)pmadapter->region_code, - pmadapter->config_bands | pmadapter-> - adhoc_start_band)) { + pmadapter->config_bands | + pmadapter->adhoc_start_band)) { pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; ret = MLAN_STATUS_FAILURE; goto done; @@ -4805,9 +4683,8 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_misc_ioctl_country_code(IN pmlan_adapter pmadapter, - IN mlan_ioctl_req *pioctl_req) +mlan_status wlan_misc_ioctl_country_code(IN pmlan_adapter pmadapter, + IN mlan_ioctl_req *pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; @@ -4829,10 +4706,9 @@ wlan_misc_ioctl_country_code(IN pmlan_adapter pmadapter, goto done; } /* 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)) { + 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; @@ -4847,8 +4723,8 @@ wlan_misc_ioctl_country_code(IN pmlan_adapter pmadapter, else pmadapter->region_code = 0; if (wlan_set_regiontable(pmpriv, pmadapter->region_code, - pmadapter->config_bands | pmadapter-> - adhoc_start_band)) { + pmadapter->config_bands | + pmadapter->adhoc_start_band)) { pioctl_req->status_code = MLAN_ERROR_INVALID_PARAMETER; ret = MLAN_STATUS_FAILURE; goto done; @@ -4876,8 +4752,8 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_misc_pmfcfg(IN pmlan_adapter pmadapter, IN mlan_ioctl_req *pioctl_req) +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; @@ -4900,9 +4776,8 @@ wlan_misc_pmfcfg(IN pmlan_adapter pmadapter, IN mlan_ioctl_req *pioctl_req) return ret; } -mlan_status -wlan_misc_ioctl_get_sensor_temp(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_get_sensor_temp(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cfg *misc = MNULL; @@ -4922,9 +4797,8 @@ wlan_misc_ioctl_get_sensor_temp(IN pmlan_adapter pmadapter, } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_DS_GET_SENSOR_TEMP, - cmd_action, 0, (t_void *)pioctl_req, MNULL); + ret = wlan_prepare_cmd(pmpriv, HostCmd_DS_GET_SENSOR_TEMP, cmd_action, + 0, (t_void *)pioctl_req, MNULL); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -4941,9 +4815,8 @@ wlan_misc_ioctl_get_sensor_temp(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_misc_ioctl_gtk_rekey_offload(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_misc_ioctl_gtk_rekey_offload(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cfg *misc_cfg = MNULL; @@ -4969,11 +4842,8 @@ wlan_misc_ioctl_gtk_rekey_offload(IN pmlan_adapter pmadapter, return ret; } /* Send request to firmware if it hasn't set gtk yet */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_GTK_REKEY_OFFLOAD_CFG, - cmd_action, - 0, - (t_void *)pioctl_req, + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_GTK_REKEY_OFFLOAD_CFG, + cmd_action, 0, (t_void *)pioctl_req, &misc_cfg->param.gtk_rekey); if (ret == MLAN_STATUS_SUCCESS) @@ -4991,9 +4861,8 @@ wlan_misc_ioctl_gtk_rekey_offload(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_misc_cloud_keep_alive(IN pmlan_adapter pmadapter, - IN mlan_ioctl_req *pioctl_req) +mlan_status wlan_misc_cloud_keep_alive(IN pmlan_adapter pmadapter, + IN mlan_ioctl_req *pioctl_req) { pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_misc_cfg *misc = MNULL; @@ -5015,11 +4884,9 @@ wlan_misc_cloud_keep_alive(IN pmlan_adapter pmadapter, } /* Send request to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_AUTO_TX, - cmd_action, - OID_CLOUD_KEEP_ALIVE, - (t_void *)pioctl_req, &misc->param.keep_alive); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_AUTO_TX, cmd_action, + OID_CLOUD_KEEP_ALIVE, (t_void *)pioctl_req, + &misc->param.keep_alive); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -5034,10 +4901,11 @@ wlan_misc_cloud_keep_alive(IN pmlan_adapter pmadapter, * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -static mlan_status -wlan_misc_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_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; @@ -5175,8 +5043,8 @@ wlan_misc_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) status = wlan_misc_ioctl_mef_flt_cfg(pmadapter, pioctl_req); break; case MLAN_OID_MISC_DFS_REAPTER_MODE: - status = wlan_misc_ioctl_dfs_repeater_cfg(pmadapter, - pioctl_req); + status = + wlan_misc_ioctl_dfs_repeater_cfg(pmadapter, pioctl_req); break; case MLAN_OID_MISC_COALESCE_CFG: status = wlan_misc_ioctl_coalesce_cfg(pmadapter, pioctl_req); @@ -5280,9 +5148,9 @@ wlan_misc_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_set_get_scan_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req, IN t_u32 action) +static mlan_status wlan_set_get_scan_cfg(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req, + IN t_u32 action) { mlan_ds_scan *scan = MNULL; @@ -5300,16 +5168,16 @@ wlan_set_get_scan_cfg(IN pmlan_adapter pmadapter, (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; + (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; + (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; + (t_u16)scan->param.scan_cfg.scan_time + .passive_scan_time; if (scan->param.scan_cfg.passive_to_active_scan) pmadapter->passive_to_active_scan = scan->param.scan_cfg.passive_to_active_scan; @@ -5342,10 +5210,11 @@ wlan_set_get_scan_cfg(IN pmlan_adapter pmadapter, * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -static mlan_status -wlan_scan_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -5354,8 +5223,8 @@ wlan_scan_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) ENTER(); pscan = (mlan_ds_scan *)pioctl_req->pbuf; - if (pscan->sub_command == MLAN_OID_SCAN_CONFIG - || pscan->sub_command == MLAN_OID_SCAN_BGSCAN_CONFIG) + if (pscan->sub_command == MLAN_OID_SCAN_CONFIG || + pscan->sub_command == MLAN_OID_SCAN_BGSCAN_CONFIG) goto start_config; if (pmadapter->scan_processing && pioctl_req->action == MLAN_ACT_SET && pscan->sub_command != MLAN_OID_SCAN_CANCEL) { @@ -5372,25 +5241,23 @@ wlan_scan_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) 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); + 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); + 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, + status = wlan_set_get_scan_cfg(pmadapter, pioctl_req, MLAN_ACT_SET); break; case MLAN_OID_SCAN_CANCEL: @@ -5402,13 +5269,10 @@ start_config: 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); + 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; @@ -5430,7 +5294,8 @@ start_config: 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) { + } 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 = @@ -5443,15 +5308,14 @@ start_config: /* Clear the previous scan result */ memset(pmadapter, pmadapter->pscan_table, 0x00, sizeof(BSSDescriptor_t) * - MRVDRV_MAX_BSSID_LIST); + 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); + 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"); @@ -5491,8 +5355,7 @@ start_config: * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_set_ewpa_mode(mlan_private *priv, mlan_ds_passphrase *psec_pp) +mlan_status wlan_set_ewpa_mode(mlan_private *priv, mlan_ds_passphrase *psec_pp) { ENTER(); @@ -5515,15 +5378,15 @@ wlan_set_ewpa_mode(mlan_private *priv, mlan_ds_passphrase *psec_pp) * @param pmpriv 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 */ -mlan_status -wlan_find_bss(mlan_private *pmpriv, pmlan_ioctl_req pioctl_req) +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 zero_mac[] = {0, 0, 0, 0, 0, 0}; t_u8 mac[MLAN_MAC_ADDR_LENGTH]; int i = 0; BSSDescriptor_t *pbss_desc = MNULL; @@ -5532,20 +5395,17 @@ wlan_find_bss(mlan_private *pmpriv, pmlan_ioctl_req pioctl_req) 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); + 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); + i = wlan_find_bssid_in_list( + pmpriv, (t_u8 *)&bss->param.ssid_bssid.bssid, + pmpriv->bss_mode); if (i < 0) { memcpy_ext(pmadapter, mac, &bss->param.ssid_bssid.bssid, sizeof(mac), MLAN_MAC_ADDR_LENGTH); @@ -5609,10 +5469,10 @@ wlan_find_bss(mlan_private *pmpriv, pmlan_ioctl_req pioctl_req) * @param adapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -mlan_status -wlan_ops_sta_ioctl(t_void *adapter, 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; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_rx.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_rx.c index 28d30efbb636..164e091cf9c6 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_rx.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_rx.c @@ -43,64 +43,64 @@ Change log: /** Ethernet II header */ typedef struct { - /** Ethernet II header destination address */ + /** Ethernet II header destination address */ t_u8 dest_addr[MLAN_MAC_ADDR_LENGTH]; - /** Ethernet II header source address */ + /** Ethernet II header source address */ t_u8 src_addr[MLAN_MAC_ADDR_LENGTH]; - /** Ethernet II header length */ + /** Ethernet II header length */ t_u16 ethertype; } EthII_Hdr_t; /** IPv4 ARP request header */ typedef MLAN_PACK_START struct { - /** Hardware type */ + /** Hardware type */ t_u16 Htype; - /** Protocol type */ + /** Protocol type */ t_u16 Ptype; - /** Hardware address length */ + /** Hardware address length */ t_u8 addr_len; - /** Protocol address length */ + /** Protocol address length */ t_u8 proto_len; - /** Operation code */ + /** Operation code */ t_u16 op_code; - /** Source mac address */ + /** Source mac address */ t_u8 src_mac[MLAN_MAC_ADDR_LENGTH]; - /** Sender IP address */ + /** Sender IP address */ t_u8 src_ip[4]; - /** Destination mac address */ + /** Destination mac address */ t_u8 dst_mac[MLAN_MAC_ADDR_LENGTH]; - /** Destination IP address */ + /** Destination IP address */ t_u8 dst_ip[4]; } MLAN_PACK_END IPv4_ARP_t; /** IPv6 Nadv packet header */ typedef MLAN_PACK_START struct { - /** IP protocol version */ + /** IP protocol version */ t_u8 version; - /** flow label */ + /** flow label */ t_u8 flow_lab[3]; - /** Payload length */ + /** Payload length */ t_u16 payload_len; - /** Next header type */ + /** Next header type */ t_u8 next_hdr; - /** Hot limit */ + /** Hot limit */ t_u8 hop_limit; - /** Source address */ + /** Source address */ t_u8 src_addr[16]; - /** Destination address */ + /** Destination address */ t_u8 dst_addr[16]; - /** ICMP type */ + /** ICMP type */ t_u8 icmp_type; - /** IPv6 Code */ + /** IPv6 Code */ t_u8 ipv6_code; - /** IPv6 Checksum */ + /** IPv6 Checksum */ t_u16 ipv6_checksum; - /** Flags */ + /** Flags */ t_u32 flags; - /** Target address */ + /** Target address */ t_u8 taget_addr[16]; - /** Reserved */ + /** Reserved */ t_u8 rev[8]; } MLAN_PACK_END IPv6_Nadv_t; @@ -108,17 +108,18 @@ typedef MLAN_PACK_START struct { Global functions ********************************************************/ /** - * @brief This function check and discard IPv4 and IPv6 gratuitous broadcast packets + * @brief This function check and discard IPv4 and IPv6 gratuitous broadcast + * packets * * @param prx_pkt A pointer to RxPacketHdr_t structure of received packet * @param pmadapter A pointer to pmlan_adapter structure * @return TRUE if found such type of packets, FALSE not found */ -static t_u8 -discard_gratuitous_ARP_msg(RxPacketHdr_t *prx_pkt, pmlan_adapter pmadapter) +static t_u8 discard_gratuitous_ARP_msg(RxPacketHdr_t *prx_pkt, + pmlan_adapter pmadapter) { - t_u8 proto_ARP_type[] = { 0x08, 0x06 }; - t_u8 proto_ARP_type_v6[] = { 0x86, 0xDD }; + t_u8 proto_ARP_type[] = {0x08, 0x06}; + t_u8 proto_ARP_type_v6[] = {0x86, 0xDD}; IPv4_ARP_t *parp_hdr; IPv6_Nadv_t *pNadv_hdr; t_u8 ret = MFALSE; @@ -128,16 +129,14 @@ discard_gratuitous_ARP_msg(RxPacketHdr_t *prx_pkt, pmlan_adapter pmadapter) * where the source and destination IP are both set to * the IP of the machine issuing the packet. */ - if (memcmp - (pmadapter, proto_ARP_type, &prx_pkt->eth803_hdr.h803_len, - sizeof(proto_ARP_type)) == 0) { + if (memcmp(pmadapter, proto_ARP_type, &prx_pkt->eth803_hdr.h803_len, + sizeof(proto_ARP_type)) == 0) { parp_hdr = (IPv4_ARP_t *)(&prx_pkt->rfc1042_hdr); - /* Graguitous ARP can be ARP request or ARP reply */ + /* Graguitous ARP can be ARP request or ARP reply*/ if ((parp_hdr->op_code == mlan_htons(0x01)) || (parp_hdr->op_code == mlan_htons(0x02))) - if (memcmp - (pmadapter, parp_hdr->src_ip, parp_hdr->dst_ip, - 4) == 0) + if (memcmp(pmadapter, parp_hdr->src_ip, + parp_hdr->dst_ip, 4) == 0) ret = MTRUE; } @@ -145,9 +144,8 @@ discard_gratuitous_ARP_msg(RxPacketHdr_t *prx_pkt, pmlan_adapter pmadapter) * An unsolicited Neighbor Advertisement pkt is * marked by a cleared Solicited Flag */ - if (memcmp - (pmadapter, proto_ARP_type_v6, &prx_pkt->eth803_hdr.h803_len, - sizeof(proto_ARP_type_v6)) == 0) { + if (memcmp(pmadapter, proto_ARP_type_v6, &prx_pkt->eth803_hdr.h803_len, + sizeof(proto_ARP_type_v6)) == 0) { pNadv_hdr = (IPv6_Nadv_t *)(&prx_pkt->rfc1042_hdr); /* Check Nadv type: next header is ICMPv6 and * icmp type is Nadv */ @@ -168,8 +166,7 @@ discard_gratuitous_ARP_msg(RxPacketHdr_t *prx_pkt, pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_process_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) +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]; @@ -177,16 +174,14 @@ wlan_process_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) 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 }; + 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}; #ifdef DRV_EMBEDDED_SUPPLICANT - t_u8 eapol_type[2] = { 0x88, 0x8e }; + t_u8 eapol_type[2] = {0x88, 0x8e}; #endif t_u8 ext_rate_info = 0; @@ -196,7 +191,7 @@ wlan_process_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) prx_pkt = (RxPacketHdr_t *)((t_u8 *)prx_pd + prx_pd->rx_pkt_offset); /** Small debug type */ -#define DBG_TYPE_SMALL 2 +#define DBG_TYPE_SMALL 2 /** Size of debugging structure */ #define SIZE_OF_DBG_STRUCT 4 if (prx_pd->rx_pkt_type == PKT_TYPE_DEBUG) { @@ -223,29 +218,29 @@ wlan_process_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) 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) && + 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)))) { + 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. + * 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)); + 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_ext(pmadapter, peth_hdr->src_addr, prx_pkt->eth803_hdr.src_addr, @@ -261,8 +256,7 @@ wlan_process_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) */ hdr_chop = (t_u32)((t_ptr)peth_hdr - (t_ptr)prx_pd); } else { - HEXDUMP("RX Data: LLC/SNAP", - (t_u8 *)&prx_pkt->rfc1042_hdr, + HEXDUMP("RX Data: LLC/SNAP", (t_u8 *)&prx_pkt->rfc1042_hdr, sizeof(prx_pkt->rfc1042_hdr)); if ((priv->hotspot_cfg & HOTSPOT_ENABLED) && discard_gratuitous_ARP_msg(prx_pkt, pmadapter)) { @@ -298,10 +292,9 @@ wlan_process_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) #ifdef DRV_EMBEDDED_SUPPLICANT if (supplicantIsEnabled(priv->psapriv) && - (!memcmp - (pmadapter, &prx_pkt->eth803_hdr.h803_len, eapol_type, - sizeof(eapol_type)))) { - //BML_SET_OFFSET(bufDesc, offset); + (!memcmp(pmadapter, &prx_pkt->eth803_hdr.h803_len, eapol_type, + sizeof(eapol_type)))) { + // BML_SET_OFFSET(bufDesc, offset); if (ProcessEAPoLPkt(priv->psapriv, pmbuf)) { pmadapter->ops.data_complete(pmadapter, pmbuf, ret); ret = MLAN_STATUS_SUCCESS; @@ -315,7 +308,6 @@ wlan_process_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) #endif if (MFALSE || priv->rx_pkt_info) { - ext_rate_info = (t_u8)(prx_pd->rx_info >> 16); pmbuf->u.rx_info.data_rate = wlan_index_to_data_rate(priv->adapter, prx_pd->rx_rate, @@ -356,8 +348,8 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ops_sta_process_rx_packet(IN t_void *adapter, IN 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; @@ -383,8 +375,9 @@ wlan_ops_sta_process_rx_packet(IN t_void *adapter, IN pmlan_buffer pmbuf) (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); + " 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; pmadapter->ops.data_complete(pmadapter, pmbuf, ret); @@ -397,23 +390,19 @@ wlan_ops_sta_process_rx_packet(IN t_void *adapter, IN pmlan_buffer pmbuf) /* 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 = (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), prx_pd); + 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), + prx_pd); pmadapter->ops.data_complete(pmadapter, pmbuf, ret); goto done; } @@ -423,17 +412,11 @@ wlan_ops_sta_process_rx_packet(IN t_void *adapter, IN pmlan_buffer pmbuf) priv->rxpd_rx_info = (t_u8)(prx_pd->rx_info >> 16); if (priv->bss_type == MLAN_BSS_TYPE_STA) { antenna = wlan_adjust_antenna(priv, prx_pd); - adj_rx_rate = - wlan_adjust_data_rate(priv, priv->rxpd_rate, - priv->rxpd_rate_info); - pmadapter->callbacks.moal_hist_data_add(pmadapter-> - pmoal_handle, - pmbuf-> - bss_index, - adj_rx_rate, - prx_pd->snr, - prx_pd->nf, - antenna); + adj_rx_rate = wlan_adjust_data_rate( + priv, priv->rxpd_rate, priv->rxpd_rate_info); + pmadapter->callbacks.moal_hist_data_add( + pmadapter->pmoal_handle, pmbuf->bss_index, + adj_rx_rate, prx_pd->snr, prx_pd->nf, antenna); } } @@ -441,8 +424,7 @@ wlan_ops_sta_process_rx_packet(IN t_void *adapter, IN pmlan_buffer pmbuf) * 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) - ) || + if ((!IS_11N_ENABLED(priv)) || memcmp(priv->adapter, priv->curr_addr, prx_pkt->eth803_hdr.dest_addr, MLAN_MAC_ADDR_LENGTH)) { priv->snr = prx_pd->snr; @@ -494,9 +476,9 @@ wlan_ops_sta_process_rx_packet(IN t_void *adapter, IN pmlan_buffer pmbuf) goto done; } /* Reorder and send to OS */ - ret = mlan_11n_rxreorder_pkt(priv, prx_pd->seq_num, - prx_pd->priority, ta, - (t_u8)prx_pd->rx_pkt_type, (void *)pmbuf); + ret = mlan_11n_rxreorder_pkt(priv, prx_pd->seq_num, prx_pd->priority, + ta, (t_u8)prx_pd->rx_pkt_type, + (void *)pmbuf); if (ret || (rx_pkt_type == PKT_TYPE_BAR)) pmadapter->ops.data_complete(pmadapter, pmbuf, ret); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_tx.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_tx.c index 6b581143df52..73a3899cabf3 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_tx.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_sta_tx.c @@ -56,8 +56,7 @@ Change log: * * @return headptr or MNULL */ -t_void * -wlan_ops_sta_process_txpd(IN t_void *priv, IN pmlan_buffer pmbuf) +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; @@ -85,8 +84,8 @@ wlan_ops_sta_process_txpd(IN t_void *priv, IN pmlan_buffer pmbuf) pmbuf->data_len -= sizeof(pkt_type) + sizeof(tx_control); } - if (pmbuf->data_offset < (sizeof(TxPD) + pmpriv->intf_hr_len + - DMA_ALIGNMENT)) { + if (pmbuf->data_offset < + (sizeof(TxPD) + pmpriv->intf_hr_len + DMA_ALIGNMENT)) { PRINTM(MERROR, "not enough space for TxPD: headroom=%d pkt_len=%d, required=%d\n", pmbuf->data_offset, pmbuf->data_len, @@ -96,9 +95,8 @@ wlan_ops_sta_process_txpd(IN t_void *priv, IN pmlan_buffer pmbuf) } /* head_ptr should be aligned */ - head_ptr = - pmbuf->pbuf + pmbuf->data_offset - sizeof(TxPD) - - pmpriv->intf_hr_len; + head_ptr = pmbuf->pbuf + pmbuf->data_offset - sizeof(TxPD) - + pmpriv->intf_hr_len; head_ptr = (t_u8 *)((t_ptr)head_ptr & ~((t_ptr)(DMA_ALIGNMENT - 1))); plocal_tx_pd = (TxPD *)(head_ptr + pmpriv->intf_hr_len); @@ -118,10 +116,8 @@ wlan_ops_sta_process_txpd(IN t_void *priv, IN pmlan_buffer pmbuf) * 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]; + 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; @@ -130,9 +126,8 @@ wlan_ops_sta_process_txpd(IN t_void *priv, IN pmlan_buffer pmbuf) } } /* Offset of actual data */ - plocal_tx_pd->tx_pkt_offset = - (t_u16)((t_ptr)pmbuf->pbuf + pmbuf->data_offset - - (t_ptr)plocal_tx_pd); + 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 */ @@ -151,9 +146,10 @@ wlan_ops_sta_process_txpd(IN t_void *priv, IN pmlan_buffer pmbuf) if (pmbuf->flags & MLAN_BUF_FLAG_TX_CTRL) { if (pmbuf->u.tx_info.data_rate) { plocal_tx_pd->tx_control |= - (wlan_ieee_rateid_to_mrvl_rateid - (pmpriv, pmbuf->u.tx_info.data_rate, - MNULL) << 16); + (wlan_ieee_rateid_to_mrvl_rateid( + pmpriv, pmbuf->u.tx_info.data_rate, + MNULL) + << 16); plocal_tx_pd->tx_control |= TXPD_TXRATE_ENABLE; } plocal_tx_pd->tx_control_1 |= pmbuf->u.tx_info.channel << 21; @@ -165,8 +161,8 @@ wlan_ops_sta_process_txpd(IN t_void *priv, IN pmlan_buffer pmbuf) plocal_tx_pd->tx_control |= (t_u32)pmbuf->u.tx_info.tx_power.val; if (pmbuf->u.tx_info.retry_limit) { - plocal_tx_pd->tx_control |= - pmbuf->u.tx_info.retry_limit << 8; + plocal_tx_pd->tx_control |= pmbuf->u.tx_info.retry_limit + << 8; plocal_tx_pd->tx_control |= TXPD_RETRY_ENABLE; } } @@ -188,10 +184,10 @@ done: * @param priv A pointer to mlan_private structure * @param flags Transmit Pkt Flags * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise failure + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise + * failure */ -mlan_status -wlan_send_null_packet(pmlan_private priv, t_u8 flags) +mlan_status wlan_send_null_packet(pmlan_private priv, t_u8 flags) { pmlan_adapter pmadapter = MNULL; TxPD *ptx_pd; @@ -297,8 +293,7 @@ done: * * @return MTRUE or MFALSE */ -t_u8 -wlan_check_last_packet_indication(pmlan_private priv) +t_u8 wlan_check_last_packet_indication(pmlan_private priv) { pmlan_adapter pmadapter = priv->adapter; t_u8 ret = MFALSE; @@ -313,12 +308,13 @@ wlan_check_last_packet_indication(pmlan_private priv) 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) + priv->wmm_qosinfo) || + prop_ps) ret = MTRUE; } - if (ret && !pmadapter->cmd_sent && !pmadapter->curr_cmd - && !wlan_is_cmd_pending(pmadapter)) { + if (ret && !pmadapter->cmd_sent && !pmadapter->curr_cmd && + !wlan_is_cmd_pending(pmadapter)) { pmadapter->delay_null_pkt = MFALSE; ret = MTRUE; } else { diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_txrx.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_txrx.c index afe60a5b40dd..f0cfcee0a204 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_txrx.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_txrx.c @@ -58,8 +58,7 @@ Change Log: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_handle_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) +mlan_status wlan_handle_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_private priv = MNULL; @@ -98,10 +97,11 @@ done: * @param pmbuf A pointer to the mlan_buffer for process * @param tx_param A pointer to mlan_tx_param structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise failure + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise + * failure */ -mlan_status -wlan_process_tx(pmlan_private priv, pmlan_buffer pmbuf, mlan_tx_param *tx_param) +mlan_status wlan_process_tx(pmlan_private priv, pmlan_buffer pmbuf, + mlan_tx_param *tx_param) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_adapter pmadapter = priv->adapter; @@ -187,9 +187,9 @@ done: * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_write_data_complete(IN pmlan_adapter pmadapter, - IN pmlan_buffer pmbuf, IN mlan_status status) +mlan_status wlan_write_data_complete(IN pmlan_adapter pmadapter, + IN pmlan_buffer pmbuf, + IN mlan_status status) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb; @@ -215,9 +215,9 @@ wlan_write_data_complete(IN pmlan_adapter pmadapter, for (i = 0; i <= use_count; i++) { pmbuf_next = pmbuf->pnext; if (pmbuf->flags & MLAN_BUF_FLAG_MOAL_TX_BUF) - pcb->moal_send_packet_complete - (pmadapter->pmoal_handle, pmbuf, - status); + pcb->moal_send_packet_complete( + pmadapter->pmoal_handle, pmbuf, + status); else wlan_free_mlan_buffer(pmadapter, pmbuf); pmbuf = pmbuf_next; @@ -226,9 +226,8 @@ wlan_write_data_complete(IN pmlan_adapter pmadapter, #endif if (pmbuf->flags & MLAN_BUF_FLAG_MOAL_TX_BUF) { /* pmbuf was allocated by MOAL */ - pcb->moal_send_packet_complete(pmadapter-> - pmoal_handle, - pmbuf, status); + pcb->moal_send_packet_complete( + pmadapter->pmoal_handle, pmbuf, status); } else { /* pmbuf was allocated by MLAN */ wlan_free_mlan_buffer(pmadapter, pmbuf); @@ -251,9 +250,9 @@ wlan_write_data_complete(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_recv_packet_complete(IN pmlan_adapter pmadapter, - IN pmlan_buffer pmbuf, IN mlan_status status) +mlan_status wlan_recv_packet_complete(IN pmlan_adapter pmadapter, + IN pmlan_buffer pmbuf, + IN mlan_status status) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb; @@ -270,7 +269,7 @@ wlan_recv_packet_complete(IN pmlan_adapter pmadapter, MASSERT(pmbuf->bss_index < pmadapter->priv_num); if (pmbuf->pparent) { - /** we will free the pparaent at the end of deaggr */ + /** we will free the pparaent at the end of deaggr */ wlan_free_mlan_buffer(pmadapter, pmbuf); } else { pmadapter->ops.data_complete(pmadapter, pmbuf, status); @@ -288,8 +287,7 @@ wlan_recv_packet_complete(IN pmlan_adapter pmadapter, * * @return N/A */ -t_void -wlan_add_buf_bypass_txqueue(mlan_adapter *pmadapter, pmlan_buffer pmbuf) +t_void wlan_add_buf_bypass_txqueue(mlan_adapter *pmadapter, pmlan_buffer pmbuf) { pmlan_private priv = pmadapter->priv[pmbuf->bss_index]; ENTER(); @@ -313,8 +311,7 @@ wlan_add_buf_bypass_txqueue(mlan_adapter *pmadapter, pmlan_buffer pmbuf) * * @return MFALSE if not empty; MTRUE if empty */ -INLINE t_u8 -wlan_bypass_tx_list_empty(mlan_adapter *pmadapter) +INLINE t_u8 wlan_bypass_tx_list_empty(mlan_adapter *pmadapter) { return (pmadapter->bypass_pkt_count) ? MFALSE : MTRUE; } @@ -326,18 +323,16 @@ wlan_bypass_tx_list_empty(mlan_adapter *pmadapter) * * @return N/A */ -t_void -wlan_cleanup_bypass_txq(mlan_private *priv) +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->bypass_txq.plock); - while ((pmbuf = - (pmlan_buffer)util_peek_list(pmadapter->pmoal_handle, - &priv->bypass_txq, MNULL, - MNULL))) { + 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); @@ -355,8 +350,7 @@ wlan_cleanup_bypass_txq(mlan_private *priv) * * @return N/A */ -t_void -wlan_process_bypass_tx(pmlan_adapter pmadapter) +t_void wlan_process_bypass_tx(pmlan_adapter pmadapter) { pmlan_buffer pmbuf; mlan_tx_param tx_param; @@ -368,67 +362,51 @@ wlan_process_bypass_tx(pmlan_adapter pmadapter) for (j = 0; j < pmadapter->priv_num; ++j) { priv = pmadapter->priv[j]; if (priv) { - pmbuf = (pmlan_buffer) - util_dequeue_list(pmadapter-> - pmoal_handle, - &priv->bypass_txq, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock); + pmbuf = (pmlan_buffer)util_dequeue_list( + pmadapter->pmoal_handle, + &priv->bypass_txq, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); if (pmbuf) { - pmadapter->callbacks. - moal_spin_lock(pmadapter-> - pmoal_handle, - priv->bypass_txq. - plock); + pmadapter->callbacks.moal_spin_lock( + pmadapter->pmoal_handle, + priv->bypass_txq.plock); pmadapter->bypass_pkt_count--; - pmadapter->callbacks. - moal_spin_unlock(pmadapter-> - pmoal_handle, - priv-> - bypass_txq. - plock); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, + priv->bypass_txq.plock); PRINTM(MINFO, "Dequeuing bypassed packet %p\n", pmbuf); - if (wlan_bypass_tx_list_empty - (pmadapter)) + if (wlan_bypass_tx_list_empty( + pmadapter)) tx_param.next_pkt_len = 0; else tx_param.next_pkt_len = pmbuf->data_len; - status = wlan_process_tx(pmadapter-> - priv[pmbuf-> - bss_index], - pmbuf, - &tx_param); + 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 */ - pmadapter->callbacks. - moal_spin_lock - (pmadapter-> - pmoal_handle, - priv->bypass_txq. - plock); + /* Queue the packet again so + * that it will be TX'ed later + */ + pmadapter->callbacks.moal_spin_lock( + pmadapter->pmoal_handle, + priv->bypass_txq.plock); pmadapter->bypass_pkt_count++; - util_enqueue_list_head - (pmadapter-> - pmoal_handle, - &priv->bypass_txq, - (pmlan_linked_list) - pmbuf, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock); - pmadapter->callbacks. - moal_spin_unlock - (pmadapter-> - pmoal_handle, - priv->bypass_txq. - plock); + util_enqueue_list_head( + pmadapter->pmoal_handle, + &priv->bypass_txq, + (pmlan_linked_list)pmbuf, + pmadapter->callbacks + .moal_spin_lock, + pmadapter->callbacks + .moal_spin_unlock); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, + priv->bypass_txq.plock); } break; } else { @@ -436,7 +414,7 @@ wlan_process_bypass_tx(pmlan_adapter pmadapter) } } } - } while (!pmadapter->data_sent && !pmadapter->tx_lock_flag - && !wlan_bypass_tx_list_empty(pmadapter)); + } while (!pmadapter->data_sent && !pmadapter->tx_lock_flag && + !wlan_bypass_tx_list_empty(pmadapter)); LEAVE(); } diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_uap.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_uap.h index 3e18d0f32c8e..e0f0db6381df 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_uap.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_uap.h @@ -39,15 +39,12 @@ 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, +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); -mlan_status wlan_ops_uap_process_cmdresp(IN t_void *priv, - IN t_u16 cmdresp_no, +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); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_uap_cmdevent.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_uap_cmdevent.c index 0a41754debe6..996f42c6957f 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_uap_cmdevent.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_uap_cmdevent.c @@ -59,18 +59,18 @@ Change log: * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_cmd_set_get_band_steering_cfg(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_set_get_band_steering_cfg(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, + IN t_void *pdata_buf) { mlan_ds_band_steer_cfg *pband_steer_cfg = - (mlan_ds_band_steer_cfg *) pdata_buf; + (mlan_ds_band_steer_cfg *)pdata_buf; ENTER(); cmd->command = wlan_cpu_to_le16(HostCmd_CMD_802_11_BAND_STEERING); - cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_BAND_STEERING) + - S_DS_GEN); + cmd->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_BAND_STEERING) + S_DS_GEN); cmd->params.band_steer_info.state = pband_steer_cfg->state; cmd->params.band_steer_info.block_2g_prb_req = pband_steer_cfg->block_2g_prb_req; @@ -90,10 +90,9 @@ wlan_cmd_set_get_band_steering_cfg(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ret_set_get_band_steering_cfg(mlan_private *pmpriv, - HostCmd_DS_COMMAND *resp, - mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_set_get_band_steering_cfg(mlan_private *pmpriv, + HostCmd_DS_COMMAND *resp, + mlan_ioctl_req *pioctl_buf) { mlan_status ret = MLAN_STATUS_SUCCESS; HostCmd_DS_BAND_STEERING *pband_steer_info = @@ -124,9 +123,9 @@ wlan_ret_set_get_band_steering_cfg(mlan_private *pmpriv, * * @return N/A */ -static mlan_status -uap_process_cmdresp_error(mlan_private *pmpriv, HostCmd_DS_COMMAND *resp, - mlan_ioctl_req *pioctl_buf) +static mlan_status uap_process_cmdresp_error(mlan_private *pmpriv, + HostCmd_DS_COMMAND *resp, + mlan_ioctl_req *pioctl_buf) { mlan_adapter *pmadapter = pmpriv->adapter; #if defined(USB) @@ -135,8 +134,8 @@ uap_process_cmdresp_error(mlan_private *pmpriv, HostCmd_DS_COMMAND *resp, mlan_status ret = MLAN_STATUS_FAILURE; ENTER(); - if (resp->command != HostCmd_CMD_WMM_PARAM_CONFIG - || resp->command != HostCmd_CMD_CHAN_REGION_CFG) + if (resp->command != HostCmd_CMD_WMM_PARAM_CONFIG || + resp->command != HostCmd_CMD_CHAN_REGION_CFG) PRINTM(MERROR, "CMD_RESP: cmd %#x error, result=%#x\n", resp->command, resp->result); if (pioctl_buf) @@ -152,95 +151,79 @@ uap_process_cmdresp_error(mlan_private *pmpriv, HostCmd_DS_COMMAND *resp, break; #endif - case HOST_CMD_APCMD_SYS_CONFIGURE: - { - HostCmd_DS_SYS_CONFIG *sys_config = - (HostCmd_DS_SYS_CONFIG *)&resp->params. - sys_config; - t_u16 resp_len = 0, travel_len = 0, index; - mlan_ds_misc_custom_ie *cust_ie = MNULL; - mlan_ds_misc_cfg *misc = MNULL; - custom_ie *cptr; + case HOST_CMD_APCMD_SYS_CONFIGURE: { + HostCmd_DS_SYS_CONFIG *sys_config = + (HostCmd_DS_SYS_CONFIG *)&resp->params.sys_config; + t_u16 resp_len = 0, travel_len = 0, index; + mlan_ds_misc_custom_ie *cust_ie = MNULL; + mlan_ds_misc_cfg *misc = MNULL; + custom_ie *cptr; - if (!pioctl_buf || - (pioctl_buf->req_id != MLAN_IOCTL_MISC_CFG)) - break; - misc = (mlan_ds_misc_cfg *)pioctl_buf->pbuf; - if ((pioctl_buf->action == MLAN_ACT_SET) && - (misc->sub_command == MLAN_OID_MISC_CUSTOM_IE)) { - cust_ie = - (mlan_ds_misc_custom_ie *)sys_config-> - tlv_buffer; - 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); + if (!pioctl_buf || (pioctl_buf->req_id != MLAN_IOCTL_MISC_CFG)) + break; + misc = (mlan_ds_misc_cfg *)pioctl_buf->pbuf; + if ((pioctl_buf->action == MLAN_ACT_SET) && + (misc->sub_command == MLAN_OID_MISC_CUSTOM_IE)) { + cust_ie = (mlan_ds_misc_custom_ie *) + sys_config->tlv_buffer; + 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) + + while (resp_len > sizeof(t_u16)) { + cptr = (custom_ie + *)(((t_u8 *)cust_ie + ->ie_data_list) + travel_len); - index = 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; - if ((pmpriv->mgmt_ie[index]. - mgmt_subtype_mask == - cptr->mgmt_subtype_mask) && - (pmpriv->mgmt_ie[index]. - ie_length == - cptr->ie_length) && - !memcmp(pmpriv->adapter, - pmpriv-> - mgmt_ie[index]. - ie_buffer, - cptr->ie_buffer, - cptr->ie_length)) { - PRINTM(MERROR, - "set custom ie fail, remove ie index :%d\n", - index); - memset(pmadapter, - &pmpriv-> - mgmt_ie[index], - 0, - sizeof - (custom_ie)); - } + index = 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; + if ((pmpriv->mgmt_ie[index] + .mgmt_subtype_mask == + cptr->mgmt_subtype_mask) && + (pmpriv->mgmt_ie[index].ie_length == + cptr->ie_length) && + !memcmp(pmpriv->adapter, + pmpriv->mgmt_ie[index] + .ie_buffer, + cptr->ie_buffer, + cptr->ie_length)) { + PRINTM(MERROR, + "set custom ie fail, remove ie index :%d\n", + index); + memset(pmadapter, + &pmpriv->mgmt_ie[index], + 0, sizeof(custom_ie)); } } } } - break; + } break; case HostCmd_CMD_PACKET_AGGR_CTRL: #ifdef USB if (IS_USB(pmadapter->card_type)) { for (i = 0; i < MAX_USB_TX_PORT_NUM; i++) - pmadapter->pcard_usb->usb_tx_aggr[i].aggr_ctrl. - enable = MFALSE; + pmadapter->pcard_usb->usb_tx_aggr[i] + .aggr_ctrl.enable = MFALSE; pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl.enable = MFALSE; } @@ -270,15 +253,14 @@ uap_process_cmdresp_error(mlan_private *pmpriv, HostCmd_DS_COMMAND *resp, } /** - * @brief This function will return the pointer to station entry in station list - * table which matches the give mac address + * @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 */ -void -wlan_notify_station_deauth(mlan_private *priv) +void wlan_notify_station_deauth(mlan_private *priv) { sta_node *sta_ptr; t_u8 event_buf[100]; @@ -286,12 +268,10 @@ wlan_notify_station_deauth(mlan_private *priv) t_u8 *pbuf; ENTER(); - 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); + 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); if (!sta_ptr) { LEAVE(); return; @@ -322,10 +302,10 @@ wlan_notify_station_deauth(mlan_private *priv) * * @return MLAN_STATUS_SUCCESS */ -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) +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) { pmlan_adapter pmadapter = pmpriv->adapter; HostCmd_DS_802_11_HS_CFG_ENH *phs_cfg = @@ -339,9 +319,8 @@ wlan_uap_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, 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)); + 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); @@ -354,23 +333,18 @@ wlan_uap_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, 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)); + 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); + 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); tlv += sizeof(MrvlIEtypes_HsWakeHoldoff_t); } PRINTM(MCMND, @@ -382,27 +356,24 @@ wlan_uap_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, if (pmadapter->param_type_ind == 1) { cmd->size += sizeof(MrvlIEtypes_WakeupSourceGPIO_t); - gpio_tlv = (MrvlIEtypes_WakeupSourceGPIO_t *) tlv; - gpio_tlv->header.type = - wlan_cpu_to_le16 - (TLV_TYPE_HS_WAKEUP_SOURCE_GPIO); - gpio_tlv->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_WakeupSourceGPIO_t) - - sizeof(MrvlIEtypesHeader_t)); + gpio_tlv = (MrvlIEtypes_WakeupSourceGPIO_t *)tlv; + gpio_tlv->header.type = wlan_cpu_to_le16( + TLV_TYPE_HS_WAKEUP_SOURCE_GPIO); + gpio_tlv->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_WakeupSourceGPIO_t) - + sizeof(MrvlIEtypesHeader_t)); gpio_tlv->ind_gpio = (t_u8)pmadapter->ind_gpio; gpio_tlv->level = (t_u8)pmadapter->level; tlv += sizeof(MrvlIEtypes_WakeupSourceGPIO_t); } if (pmadapter->param_type_ext == 2) { cmd->size += sizeof(MrvlIEtypes_WakeupExtend_t); - ext_tlv = (MrvlIEtypes_WakeupExtend_t *) tlv; + ext_tlv = (MrvlIEtypes_WakeupExtend_t *)tlv; ext_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_WAKEUP_EXTEND); - ext_tlv->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_WakeupExtend_t) - - sizeof(MrvlIEtypesHeader_t)); + ext_tlv->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_WakeupExtend_t) - + sizeof(MrvlIEtypesHeader_t)); ext_tlv->event_force_ignore = wlan_cpu_to_le32(pmadapter->event_force_ignore); ext_tlv->event_use_ext_gap = @@ -416,8 +387,8 @@ wlan_uap_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, mgmt_frame_filter mgmt_filter[MAX_MGMT_FRAME_FILTER]; memset(pmadapter, mgmt_filter, 0, MAX_MGMT_FRAME_FILTER * - sizeof(mgmt_frame_filter)); - mgmt_filter_tlv = (MrvlIEtypes_MgmtFrameFilter_t *) tlv; + sizeof(mgmt_frame_filter)); + mgmt_filter_tlv = (MrvlIEtypes_MgmtFrameFilter_t *)tlv; mgmt_filter_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_MGMT_FRAME_WAKEUP); tlv += sizeof(MrvlIEtypesHeader_t); @@ -427,10 +398,8 @@ wlan_uap_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, (t_u8)pmadapter->mgmt_filter[i].action; mgmt_filter[i].type = (t_u8)pmadapter->mgmt_filter[i].type; - mgmt_filter[i].frame_mask = - wlan_cpu_to_le32(pmadapter-> - mgmt_filter[i]. - frame_mask); + mgmt_filter[i].frame_mask = wlan_cpu_to_le32( + pmadapter->mgmt_filter[i].frame_mask); i++; } memcpy_ext(pmadapter, (t_u8 *)mgmt_filter_tlv->filter, @@ -440,19 +409,17 @@ wlan_uap_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, tlv += i * sizeof(mgmt_frame_filter); mgmt_filter_tlv->header.len = wlan_cpu_to_le16(i * sizeof(mgmt_frame_filter)); - cmd->size += - i * sizeof(mgmt_frame_filter) + - sizeof(MrvlIEtypesHeader_t); + cmd->size += i * sizeof(mgmt_frame_filter) + + sizeof(MrvlIEtypesHeader_t); } if (pmadapter->hs_mimo_switch) { cmd->size += sizeof(MrvlIEtypes_HS_Antmode_t); - antmode_tlv = (MrvlIEtypes_HS_Antmode_t *) tlv; + antmode_tlv = (MrvlIEtypes_HS_Antmode_t *)tlv; antmode_tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_HS_ANTMODE); - antmode_tlv->header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_HS_Antmode_t) - - sizeof(MrvlIEtypesHeader_t)); + antmode_tlv->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_HS_Antmode_t) - + sizeof(MrvlIEtypesHeader_t)); antmode_tlv->txpath_antmode = ANTMODE_FW_DECISION; antmode_tlv->rxpath_antmode = ANTMODE_FW_DECISION; tlv += sizeof(MrvlIEtypes_HS_Antmode_t); @@ -476,10 +443,10 @@ wlan_uap_cmd_802_11_hs_cfg(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -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) +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) { HostCmd_DS_CMD_TX_DATA_PAUSE *pause_cmd = (HostCmd_DS_CMD_TX_DATA_PAUSE *)&cmd->params.tx_data_pause; @@ -489,9 +456,8 @@ wlan_uap_cmd_txdatapause(pmlan_private pmpriv, 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); + 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) { @@ -512,10 +478,9 @@ wlan_uap_cmd_txdatapause(pmlan_private pmpriv, * * @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) +static mlan_status wlan_uap_ret_txdatapause(IN pmlan_private pmpriv, + 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; @@ -542,8 +507,7 @@ wlan_uap_ret_txdatapause(IN pmlan_private pmpriv, * * @return N/A */ -static void -wlan_process_tx_pause_event(pmlan_private priv, pmlan_buffer pevent) +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); @@ -552,9 +516,10 @@ wlan_process_tx_pause_event(pmlan_private priv, pmlan_buffer pevent) sizeof(t_u32)); MrvlIEtypes_tx_pause_t *tx_pause_tlv; sta_node *sta_ptr = MNULL; - t_u8 bc_mac[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + t_u8 bc_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; t_u32 total_pkts_queued; - t_u16 tx_pkts_queued = 0;; + t_u16 tx_pkts_queued = 0; + ; ENTER(); @@ -573,39 +538,34 @@ wlan_process_tx_pause_event(pmlan_private priv, pmlan_buffer pevent) if (tlv_type == TLV_TYPE_TX_PAUSE) { tx_pause_tlv = (MrvlIEtypes_tx_pause_t *)tlv; - if (!memcmp - (priv->adapter, bc_mac, tx_pause_tlv->peermac, - MLAN_MAC_ADDR_LENGTH)) - tx_pkts_queued = - wlan_update_ralist_tx_pause(priv, - tx_pause_tlv-> - peermac, - tx_pause_tlv-> - tx_pause); - else if (!memcmp - (priv->adapter, priv->curr_addr, - tx_pause_tlv->peermac, - MLAN_MAC_ADDR_LENGTH)) { + if (!memcmp(priv->adapter, bc_mac, + tx_pause_tlv->peermac, + MLAN_MAC_ADDR_LENGTH)) + tx_pkts_queued = wlan_update_ralist_tx_pause( + priv, tx_pause_tlv->peermac, + tx_pause_tlv->tx_pause); + else if (!memcmp(priv->adapter, priv->curr_addr, + tx_pause_tlv->peermac, + MLAN_MAC_ADDR_LENGTH)) { if (tx_pause_tlv->tx_pause) priv->tx_pause = MTRUE; else priv->tx_pause = MFALSE; } else { - sta_ptr = - wlan_get_station_entry(priv, - tx_pause_tlv-> - peermac); + sta_ptr = wlan_get_station_entry( + priv, tx_pause_tlv->peermac); if (sta_ptr) { if (sta_ptr->tx_pause != tx_pause_tlv->tx_pause) { sta_ptr->tx_pause = tx_pause_tlv->tx_pause; tx_pkts_queued = - wlan_update_ralist_tx_pause - (priv, - tx_pause_tlv->peermac, - tx_pause_tlv-> - tx_pause); + wlan_update_ralist_tx_pause( + priv, + tx_pause_tlv + ->peermac, + tx_pause_tlv + ->tx_pause); } } } @@ -636,10 +596,10 @@ wlan_process_tx_pause_event(pmlan_private priv, pmlan_buffer pevent) * @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) +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) { mlan_ds_bss *bss = MNULL; HostCmd_DS_SYS_CONFIG *sys_config = @@ -686,10 +646,11 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, MrvlIEtypes_preamble_t *tlv_preamble = MNULL; t_u32 cmd_size = 0; - t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; + t_u8 zero_mac[] = {0, 0, 0, 0, 0, 0}; t_u16 i; t_u16 ac; -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) int rx_mcs_supp = 0; #endif @@ -706,9 +667,8 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, 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)) { + 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); @@ -724,7 +684,7 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, /* ACS is not allowed when DFS repeater mode is on */ if (pmpriv->adapter->dfs_repeater) { PRINTM(MERROR, "ACS is not allowed when" - "DFS repeater mode is on.\n"); + "DFS repeater mode is on.\n"); return MLAN_STATUS_FAILURE; } } @@ -732,18 +692,16 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, 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); + tlv_ssid->header.len = wlan_cpu_to_le16( + (t_u16)bss->param.bss_config.ssid.ssid_len); memcpy_ext(pmpriv->adapter, tlv_ssid->ssid, bss->param.bss_config.ssid.ssid, bss->param.bss_config.ssid.ssid_len, MLAN_MAX_SSID_LENGTH); - cmd_size += - sizeof(MrvlIEtypesHeader_t) + - 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; + bss->param.bss_config.ssid.ssid_len; } if ((bss->param.bss_config.beacon_period >= MIN_BEACON_PERIOD) && @@ -892,24 +850,22 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, 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); + 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)) || + 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); + 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); } @@ -947,6 +903,7 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, cmd_size += sizeof(MrvlIEtypes_retry_limit_t); tlv += sizeof(MrvlIEtypes_retry_limit_t); } + #ifdef DRV_EMBEDDED_AUTHENTICATOR if (IS_FW_SUPPORT_AUTHENTICATOR(pmpriv->adapter)) { #endif @@ -954,14 +911,13 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, (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.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); + 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); } @@ -969,14 +925,12 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, 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.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); + 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); } @@ -985,14 +939,13 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, (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.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); + 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); } @@ -1000,14 +953,12 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, 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.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); + 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); } @@ -1015,16 +966,14 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, } #endif if ((bss->param.bss_config.filter.filter_mode <= - MAC_FILTER_MODE_BLOCK_MAC) - && (bss->param.bss_config.filter.mac_count <= MAX_MAC_FILTER_NUM)) { + 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->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 = @@ -1032,15 +981,14 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, memcpy_ext(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, + bss->param.bss_config.filter.mac_count, MLAN_MAC_ADDR_LENGTH * MAX_MAC_FILTER_NUM); - cmd_size += - sizeof(MrvlIEtypesHeader_t) + 2 + - 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; + MLAN_MAC_ADDR_LENGTH * + bss->param.bss_config.filter.mac_count; } if (((bss->param.bss_config.bandcfg.scanMode == SCAN_MODE_MANUAL) && @@ -1063,10 +1011,9 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, 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)); + 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 = @@ -1076,11 +1023,11 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, pscan_chan++; } cmd_size += sizeof(tlv_chan_list->header) + - (sizeof(ChanScanParamSet_t) * - bss->param.bss_config.num_of_chan); + (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); + (sizeof(ChanScanParamSet_t) * + bss->param.bss_config.num_of_chan); } if ((bss->param.bss_config.auth_mode <= MLAN_AUTH_MODE_SHARED) || @@ -1115,50 +1062,47 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, 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->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) { + 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->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; + 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) { + 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->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; + 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) { + 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); @@ -1172,9 +1116,8 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, 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.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 = @@ -1182,45 +1125,43 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, cmd_size += sizeof(MrvlIEtypes_rsn_replay_prot_t); tlv += sizeof(MrvlIEtypes_rsn_replay_prot_t); } + #ifdef DRV_EMBEDDED_AUTHENTICATOR if (IS_FW_SUPPORT_AUTHENTICATOR(pmpriv->adapter)) { #endif 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_ext(pmpriv->adapter, - tlv_passphrase->passphrase, - bss->param.bss_config.wpa_cfg. - passphrase, - bss->param.bss_config.wpa_cfg.length, - bss->param.bss_config.wpa_cfg. - length); + 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_ext( + pmpriv->adapter, + tlv_passphrase->passphrase, + bss->param.bss_config.wpa_cfg.passphrase, + bss->param.bss_config.wpa_cfg.length, + 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; + 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.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); + 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); @@ -1237,10 +1178,8 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, 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->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 = @@ -1249,11 +1188,10 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, bss->param.bss_config.wep_cfg.key0.key, bss->param.bss_config.wep_cfg.key0.length, bss->param.bss_config.wep_cfg.key0.length); - cmd_size += - sizeof(MrvlIEtypesHeader_t) + 2 + - 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; + bss->param.bss_config.wep_cfg.key0.length; } if ((bss->param.bss_config.wep_cfg.key1.length) && @@ -1264,10 +1202,8 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, 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->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 = @@ -1276,11 +1212,10 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, bss->param.bss_config.wep_cfg.key1.key, bss->param.bss_config.wep_cfg.key1.length, bss->param.bss_config.wep_cfg.key1.length); - cmd_size += - sizeof(MrvlIEtypesHeader_t) + 2 + - 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; + bss->param.bss_config.wep_cfg.key1.length; } if ((bss->param.bss_config.wep_cfg.key2.length) && @@ -1291,10 +1226,8 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, 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->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 = @@ -1303,11 +1236,10 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, bss->param.bss_config.wep_cfg.key2.key, bss->param.bss_config.wep_cfg.key2.length, bss->param.bss_config.wep_cfg.key2.length); - cmd_size += - sizeof(MrvlIEtypesHeader_t) + 2 + - 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; + bss->param.bss_config.wep_cfg.key2.length; } if ((bss->param.bss_config.wep_cfg.key3.length) && @@ -1318,10 +1250,8 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, 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->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 = @@ -1330,11 +1260,10 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, bss->param.bss_config.wep_cfg.key3.key, bss->param.bss_config.wep_cfg.key3.length, bss->param.bss_config.wep_cfg.key3.length); - cmd_size += - sizeof(MrvlIEtypesHeader_t) + 2 + - 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; + bss->param.bss_config.wep_cfg.key3.length; } } if (bss->param.bss_config.ht_cap_info) { @@ -1348,20 +1277,19 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, memcpy_ext(pmpriv->adapter, tlv_htcap->ht_cap.supported_mcs_set, bss->param.bss_config.supported_mcs_set, 16, sizeof(tlv_htcap->ht_cap.supported_mcs_set)); -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(SD9097) || defined(USB9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(SD9097) || defined(USB9097) if (IS_CARD9098(pmpriv->adapter->card_type) || IS_CARD9097(pmpriv->adapter->card_type)) { if (bss->param.bss_config.supported_mcs_set[0]) { if (bss->param.bss_config.bandcfg.chanBand == BAND_5GHZ) - rx_mcs_supp = - GET_RXMCSSUPP(pmpriv->adapter-> - user_htstream >> - 8); + rx_mcs_supp = GET_RXMCSSUPP( + pmpriv->adapter->user_htstream >> + 8); else - rx_mcs_supp = - GET_RXMCSSUPP(pmpriv->adapter-> - user_htstream); + rx_mcs_supp = GET_RXMCSSUPP( + pmpriv->adapter->user_htstream); if (rx_mcs_supp == 0x1) { tlv_htcap->ht_cap.supported_mcs_set[0] = @@ -1394,9 +1322,8 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, /* 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); + 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); } @@ -1412,14 +1339,14 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, 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) { + if ((bss->param.bss_config.uap_host_based_config == MTRUE) || + (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)); + tlv_wmm_parameter->header.len = wlan_cpu_to_le16( + sizeof(bss->param.bss_config.wmm_para)); memcpy_ext(pmpriv->adapter, tlv_wmm_parameter->wmm_para.ouitype, bss->param.bss_config.wmm_para.ouitype, sizeof(tlv_wmm_parameter->wmm_para.ouitype), @@ -1431,23 +1358,23 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, 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] + .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; + 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; + 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); + 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); @@ -1487,21 +1414,21 @@ wlan_uap_cmd_ap_config(pmlan_private pmpriv, * @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) +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) { 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 *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; + MrvlIEtypes_beacon_period_t *bcn_pd_tlv = MNULL, + *pdat_tlv_bcnpd = MNULL; + MrvlIEtypes_dtim_period_t *dtim_pd_tlv = MNULL, + *pdat_tlv_dtimpd = MNULL; MrvlIEtypes_wmm_parameter_t *tlv_wmm_parameter = MNULL; MrvlIEtypes_ChanListParamSet_t *tlv_chan_list = MNULL; ChanScanParamSet_t *pscan_chan = MNULL; @@ -1529,30 +1456,22 @@ wlan_uap_cmd_sys_configure(pmlan_private pmpriv, cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_SYS_CONFIG) - 1 + S_DS_GEN); if (pioctl_buf == MNULL) { - if (pdata_buf) { switch (pdata_header->type) { 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)); + 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->bandcfg = pdat_tlv_cb->bandcfg; @@ -1562,60 +1481,50 @@ wlan_uap_cmd_sys_configure(pmlan_private pmpriv, ret = MLAN_STATUS_SUCCESS; break; case TLV_TYPE_UAP_BEACON_PERIOD: - pdat_tlv_bcnpd = - (MrvlIEtypes_beacon_period_t *) + 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)); + 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); + wlan_cpu_to_le16( + pdat_tlv_bcnpd + ->beacon_period); } - /* Add TLV_UAP_DTIM_PERIOD if it follws in pdata_buf */ + /* 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)); + *)(((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)); + *)(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; + pdat_tlv_dtimpd + ->dtim_period; } } /* Finalize cmd size */ @@ -1624,50 +1533,43 @@ wlan_uap_cmd_sys_configure(pmlan_private pmpriv, 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); + 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) { + if (ie) { 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); + 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); + *)(((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; + 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); + 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); + wlan_cpu_to_le16( + cptr->ie_length); } memcpy_ext(pmpriv->adapter, ie, cust_ie->ie_data_list, @@ -1676,46 +1578,41 @@ wlan_uap_cmd_sys_configure(pmlan_private pmpriv, break; case REGULATORY_CLASS: poper_class_tlv = - (MrvlIEtypes_chan_bw_oper_t *) - pdata_buf; - ret = wlan_get_curr_oper_class(pmpriv, - poper_class_tlv-> - ds_chan_bw_oper. - channel, - poper_class_tlv-> - ds_chan_bw_oper. - bandwidth, - &curr_oper_class); + (MrvlIEtypes_chan_bw_oper_t *)pdata_buf; + ret = wlan_get_curr_oper_class( + pmpriv, + poper_class_tlv->ds_chan_bw_oper.channel, + poper_class_tlv->ds_chan_bw_oper + .bandwidth, + &curr_oper_class); if (ret != MLAN_STATUS_SUCCESS) { PRINTM(MERROR, "Can not get current oper class! bandwidth = %d, channel = %d\n", - poper_class_tlv->ds_chan_bw_oper. - bandwidth, - poper_class_tlv->ds_chan_bw_oper. - channel); + poper_class_tlv->ds_chan_bw_oper + .bandwidth, + poper_class_tlv->ds_chan_bw_oper + .channel); } if (cmd_action == HostCmd_ACT_GEN_SET) - length = wlan_add_supported_oper_class_ie(pmpriv, &oper_class_ie, curr_oper_class); - cmd->size = - wlan_cpu_to_le16(sizeof - (HostCmd_DS_SYS_CONFIG) - - 1 + S_DS_GEN + - length); + length = + wlan_add_supported_oper_class_ie( + pmpriv, &oper_class_ie, + curr_oper_class); + cmd->size = wlan_cpu_to_le16( + sizeof(HostCmd_DS_SYS_CONFIG) - 1 + + S_DS_GEN + length); break; case TLV_TYPE_UAP_MAX_STA_CNT_PER_CHIP: - memcpy_ext(pmpriv->adapter, - sys_config->tlv_buffer, pdata_buf, - sizeof - (MrvlIEtypes_uap_max_sta_cnt_t), - sizeof - (MrvlIEtypes_uap_max_sta_cnt_t)); - cmd->size = - wlan_cpu_to_le16(sizeof - (HostCmd_DS_SYS_CONFIG) - - 1 + S_DS_GEN + - sizeof - (MrvlIEtypes_uap_max_sta_cnt_t)); + memcpy_ext( + pmpriv->adapter, sys_config->tlv_buffer, + pdata_buf, + sizeof(MrvlIEtypes_uap_max_sta_cnt_t), + sizeof(MrvlIEtypes_uap_max_sta_cnt_t)); + cmd->size = wlan_cpu_to_le16( + sizeof(HostCmd_DS_SYS_CONFIG) - 1 + + S_DS_GEN + + sizeof(MrvlIEtypes_uap_max_sta_cnt_t)); break; default: PRINTM(MERROR, @@ -1727,10 +1624,9 @@ wlan_uap_cmd_sys_configure(pmlan_private pmpriv, } 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)); + 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 = @@ -1744,10 +1640,9 @@ wlan_uap_cmd_sys_configure(pmlan_private pmpriv, 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)); + 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 = @@ -1758,120 +1653,108 @@ wlan_uap_cmd_sys_configure(pmlan_private pmpriv, MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); } else if (bss->sub_command == MLAN_OID_UAP_CFG_WMM_PARAM) { - tlv_wmm_parameter = - (MrvlIEtypes_wmm_parameter_t *)sys_config-> - tlv_buffer; - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_SYS_CONFIG) - - 1 + S_DS_GEN + - sizeof - (MrvlIEtypes_wmm_parameter_t)); + tlv_wmm_parameter = (MrvlIEtypes_wmm_parameter_t *) + sys_config->tlv_buffer; + cmd->size = wlan_cpu_to_le16( + sizeof(HostCmd_DS_SYS_CONFIG) - 1 + S_DS_GEN + + sizeof(MrvlIEtypes_wmm_parameter_t)); tlv_wmm_parameter->header.type = wlan_cpu_to_le16(TLV_TYPE_AP_WMM_PARAM); - tlv_wmm_parameter->header.len = - wlan_cpu_to_le16(sizeof - (bss->param.ap_wmm_para)); + tlv_wmm_parameter->header.len = wlan_cpu_to_le16( + sizeof(bss->param.ap_wmm_para)); if (cmd_action == HostCmd_ACT_GEN_SET) { for (ac = 0; ac < 4; ac++) { - tlv_wmm_parameter->wmm_para. - ac_params[ac].aci_aifsn.aifsn = - bss->param.ap_wmm_para. - ac_params[ac].aci_aifsn.aifsn; - tlv_wmm_parameter->wmm_para. - ac_params[ac].aci_aifsn.aci = - bss->param.ap_wmm_para. - ac_params[ac].aci_aifsn.aci; - tlv_wmm_parameter->wmm_para. - ac_params[ac].ecw.ecw_max = - bss->param.ap_wmm_para. - ac_params[ac].ecw.ecw_max; - tlv_wmm_parameter->wmm_para. - ac_params[ac].ecw.ecw_min = - bss->param.ap_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. - ap_wmm_para. - ac_params[ac]. - tx_op_limit); + tlv_wmm_parameter->wmm_para + .ac_params[ac] + .aci_aifsn.aifsn = + bss->param.ap_wmm_para + .ac_params[ac] + .aci_aifsn.aifsn; + tlv_wmm_parameter->wmm_para + .ac_params[ac] + .aci_aifsn.aci = + bss->param.ap_wmm_para + .ac_params[ac] + .aci_aifsn.aci; + tlv_wmm_parameter->wmm_para + .ac_params[ac] + .ecw.ecw_max = + bss->param.ap_wmm_para + .ac_params[ac] + .ecw.ecw_max; + tlv_wmm_parameter->wmm_para + .ac_params[ac] + .ecw.ecw_min = + bss->param.ap_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.ap_wmm_para + .ac_params[ac] + .tx_op_limit); } } } else if (bss->sub_command == MLAN_OID_UAP_SCAN_CHANNELS) { - tlv_chan_list = - (MrvlIEtypes_ChanListParamSet_t *)sys_config-> - tlv_buffer; + tlv_chan_list = (MrvlIEtypes_ChanListParamSet_t *) + sys_config->tlv_buffer; tlv_chan_list->header.type = wlan_cpu_to_le16(TLV_TYPE_CHANLIST); if (bss->param.ap_scan_channels.num_of_chan && bss->param.ap_scan_channels.num_of_chan <= - MLAN_MAX_CHANNEL) { - cmd->size = - wlan_cpu_to_le16(sizeof - (HostCmd_DS_SYS_CONFIG) - - 1 + S_DS_GEN + - sizeof(tlv_chan_list-> - header) + - sizeof - (ChanScanParamSet_t) * - bss->param. - ap_scan_channels. - num_of_chan); - tlv_chan_list->header.len = - wlan_cpu_to_le16((t_u16) - (sizeof - (ChanScanParamSet_t) * - bss->param. - ap_scan_channels. - num_of_chan)); + MLAN_MAX_CHANNEL) { + cmd->size = wlan_cpu_to_le16( + sizeof(HostCmd_DS_SYS_CONFIG) - 1 + + S_DS_GEN + + sizeof(tlv_chan_list->header) + + sizeof(ChanScanParamSet_t) * + bss->param.ap_scan_channels + .num_of_chan); + tlv_chan_list->header.len = wlan_cpu_to_le16( + (t_u16)(sizeof(ChanScanParamSet_t) * + bss->param.ap_scan_channels + .num_of_chan)); pscan_chan = tlv_chan_list->chan_scan_param; for (i = 0; i < bss->param.ap_scan_channels.num_of_chan; i++) { pscan_chan->chan_number = - bss->param.ap_scan_channels. - chan_list[i].chan_number; + bss->param.ap_scan_channels + .chan_list[i] + .chan_number; pscan_chan->bandcfg = - bss->param.ap_scan_channels. - chan_list[i].bandcfg; + bss->param.ap_scan_channels + .chan_list[i] + .bandcfg; pscan_chan++; } PRINTM(MCMND, "Set AP scan channel list = %d\n", bss->param.ap_scan_channels.num_of_chan); } else { - tlv_chan_list->header.len = - wlan_cpu_to_le16((t_u16) - (sizeof - (ChanScanParamSet_t) * - MLAN_MAX_CHANNEL)); - cmd->size = - wlan_cpu_to_le16(sizeof - (HostCmd_DS_SYS_CONFIG) - - 1 + S_DS_GEN + - sizeof - (MrvlIEtypes_ChanListParamSet_t) - + - sizeof - (ChanScanParamSet_t) * - MLAN_MAX_CHANNEL); + tlv_chan_list->header.len = wlan_cpu_to_le16( + (t_u16)(sizeof(ChanScanParamSet_t) * + MLAN_MAX_CHANNEL)); + cmd->size = wlan_cpu_to_le16( + sizeof(HostCmd_DS_SYS_CONFIG) - 1 + + S_DS_GEN + + sizeof(MrvlIEtypes_ChanListParamSet_t) + + sizeof(ChanScanParamSet_t) * + MLAN_MAX_CHANNEL); } } else if (bss->sub_command == MLAN_OID_UAP_CHANNEL) { - 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 = (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)); + chan_band_tlv->header.len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_channel_band_t) - + sizeof(MrvlIEtypesHeader_t)); if (cmd_action == HostCmd_ACT_GEN_SET) { chan_band_tlv->bandcfg = bss->param.ap_channel.bandcfg; @@ -1892,11 +1775,10 @@ wlan_uap_cmd_sys_configure(pmlan_private pmpriv, 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); + 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); @@ -1908,53 +1790,50 @@ wlan_uap_cmd_sys_configure(pmlan_private pmpriv, } 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); + 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) { + if (ie) { 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); + 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); + *)(((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); + 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_ext(pmpriv->adapter, ie, - misc->param.cust_ie. - ie_data_list, - misc->param.cust_ie.len, - misc->param.cust_ie.len); + memcpy_ext( + pmpriv->adapter, ie, + misc->param.cust_ie.ie_data_list, + misc->param.cust_ie.len, + misc->param.cust_ie.len); } } } @@ -1972,10 +1851,9 @@ done: * * @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) +static mlan_status wlan_uap_ret_cmd_ap_config(IN pmlan_private pmpriv, + 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; @@ -2040,7 +1918,6 @@ wlan_uap_ret_cmd_ap_config(IN pmlan_private pmpriv, 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); @@ -2069,12 +1946,11 @@ wlan_uap_ret_cmd_ap_config(IN pmlan_private pmpriv, 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); + 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); + wlan_le16_to_cpu( + tlv_beacon_period->beacon_period); break; case TLV_TYPE_UAP_DTIM_PERIOD: tlv_dtim_period = (MrvlIEtypes_dtim_period_t *)tlv; @@ -2135,27 +2011,25 @@ wlan_uap_ret_cmd_ap_config(IN pmlan_private pmpriv, 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); + 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); + 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); + 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); + 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; @@ -2165,37 +2039,36 @@ wlan_uap_ret_cmd_ap_config(IN pmlan_private pmpriv, 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); + 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); + 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); + 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); + 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); + wlan_le32_to_cpu( + tlv_mgmt_ie_passthru->mgmt_ie_mask); break; case TLV_TYPE_2040_BSS_COEX_CONTROL: tlv_2040_coex_enable = @@ -2209,13 +2082,13 @@ wlan_uap_ret_cmd_ap_config(IN pmlan_private pmpriv, MIN(MAX_MAC_FILTER_NUM, tlv_mac_filter->count); bss->param.bss_config.filter.filter_mode = tlv_mac_filter->filter_mode; - memcpy_ext(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, - sizeof(bss->param.bss_config.filter. - mac_list)); + memcpy_ext( + 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, + sizeof(bss->param.bss_config.filter.mac_list)); break; case TLV_TYPE_UAP_CHAN_BAND_CONFIG: tlv_chan_band = (MrvlIEtypes_channel_band_t *)tlv; @@ -2231,7 +2104,8 @@ wlan_uap_ret_cmd_ap_config(IN pmlan_private pmpriv, 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++) { + 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].bandcfg = @@ -2247,9 +2121,8 @@ wlan_uap_ret_cmd_ap_config(IN pmlan_private pmpriv, 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); + 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; @@ -2257,25 +2130,25 @@ wlan_uap_ret_cmd_ap_config(IN pmlan_private pmpriv, 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); + 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 = + 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 = + bss->param.bss_config.wpa_cfg + .pairwise_cipher_wpa2 = tlv_pwk_cipher->pairwise_cipher; if (wlan_le16_to_cpu(tlv_pwk_cipher->protocol) & PROTOCOL_WPA3_SAE) - bss->param.bss_config.wpa_cfg. - pairwise_cipher_wpa2 = + bss->param.bss_config.wpa_cfg + .pairwise_cipher_wpa2 = tlv_pwk_cipher->pairwise_cipher; break; case TLV_TYPE_GWK_CIPHER: @@ -2296,8 +2169,8 @@ wlan_uap_ret_cmd_ap_config(IN pmlan_private pmpriv, bss->param.bss_config.wpa_cfg.passphrase, tlv_passphrase->passphrase, bss->param.bss_config.wpa_cfg.length, - sizeof(bss->param.bss_config.wpa_cfg. - passphrase)); + sizeof(bss->param.bss_config.wpa_cfg + .passphrase)); break; #ifdef WIFI_DIRECT_SUPPORT case TLV_TYPE_UAP_PSK: @@ -2342,8 +2215,8 @@ wlan_uap_ret_cmd_ap_config(IN pmlan_private pmpriv, 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; + (bss->param.bss_config.bss_status) ? MTRUE : + MFALSE; break; case TLV_TYPE_HT_CAPABILITY: tlv_htcap = (MrvlIETypes_HTCap_t *)tlv; @@ -2351,11 +2224,11 @@ wlan_uap_ret_cmd_ap_config(IN pmlan_private pmpriv, wlan_le16_to_cpu(tlv_htcap->ht_cap.ht_cap_info); bss->param.bss_config.ampdu_param = tlv_htcap->ht_cap.ampdu_param; - memcpy_ext(pmpriv->adapter, - bss->param.bss_config.supported_mcs_set, - tlv_htcap->ht_cap.supported_mcs_set, 16, - sizeof(bss->param.bss_config. - supported_mcs_set)); + memcpy_ext( + pmpriv->adapter, + bss->param.bss_config.supported_mcs_set, + tlv_htcap->ht_cap.supported_mcs_set, 16, + sizeof(bss->param.bss_config.supported_mcs_set)); 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 = @@ -2367,27 +2240,31 @@ wlan_uap_ret_cmd_ap_config(IN pmlan_private pmpriv, 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); + 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; } @@ -2415,10 +2292,9 @@ wlan_uap_ret_cmd_ap_config(IN pmlan_private pmpriv, * * @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) +static mlan_status wlan_uap_ret_sys_reset(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { ENTER(); @@ -2446,10 +2322,9 @@ wlan_uap_ret_sys_reset(IN pmlan_private pmpriv, * * @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) +static mlan_status wlan_uap_ret_sys_config(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { int resp_len = 0, travel_len = 0; int i = 0; @@ -2491,135 +2366,156 @@ wlan_uap_ret_sys_config(IN pmlan_private pmpriv, } else if (bss->sub_command == MLAN_OID_UAP_CFG_WMM_PARAM) { if (TLV_TYPE_AP_WMM_PARAM == - wlan_le16_to_cpu(tlv_wmm_parameter->header. - type)) { - if (wlan_le16_to_cpu - (tlv_wmm_parameter->header.len) < + wlan_le16_to_cpu( + tlv_wmm_parameter->header.type)) { + if (wlan_le16_to_cpu( + tlv_wmm_parameter->header + .len) < sizeof(bss->param.ap_wmm_para)) { PRINTM(MCMND, "FW don't support AP WMM PARAM\n"); } else { - bss->param.ap_wmm_para. - reserved = + bss->param.ap_wmm_para.reserved = MLAN_STATUS_COMPLETE; for (ac = 0; ac < 4; ac++) { - bss->param.ap_wmm_para. - ac_params[ac]. - aci_aifsn. - aifsn = - tlv_wmm_parameter-> - wmm_para. - ac_params[ac]. - aci_aifsn.aifsn; - bss->param.ap_wmm_para. - ac_params[ac]. - aci_aifsn.aci = - tlv_wmm_parameter-> - wmm_para. - ac_params[ac]. - aci_aifsn.aci; - bss->param.ap_wmm_para. - ac_params[ac]. - ecw.ecw_max = - tlv_wmm_parameter-> - wmm_para. - ac_params[ac]. - ecw.ecw_max; - bss->param.ap_wmm_para. - ac_params[ac]. - ecw.ecw_min = - tlv_wmm_parameter-> - wmm_para. - ac_params[ac]. - ecw.ecw_min; - bss->param.ap_wmm_para. - ac_params[ac]. - tx_op_limit = - wlan_le16_to_cpu - (tlv_wmm_parameter-> - wmm_para. - ac_params[ac]. - tx_op_limit); + bss->param.ap_wmm_para + .ac_params[ac] + .aci_aifsn + .aifsn = + tlv_wmm_parameter + ->wmm_para + .ac_params + [ac] + .aci_aifsn + .aifsn; + bss->param.ap_wmm_para + .ac_params[ac] + .aci_aifsn.aci = + tlv_wmm_parameter + ->wmm_para + .ac_params + [ac] + .aci_aifsn + .aci; + bss->param.ap_wmm_para + .ac_params[ac] + .ecw.ecw_max = + tlv_wmm_parameter + ->wmm_para + .ac_params + [ac] + .ecw + .ecw_max; + bss->param.ap_wmm_para + .ac_params[ac] + .ecw.ecw_min = + tlv_wmm_parameter + ->wmm_para + .ac_params + [ac] + .ecw + .ecw_min; + bss->param.ap_wmm_para + .ac_params[ac] + .tx_op_limit = wlan_le16_to_cpu( + tlv_wmm_parameter + ->wmm_para + .ac_params + [ac] + .tx_op_limit); PRINTM(MCMND, "ac=%d, aifsn=%d, aci=%d, ecw_max=%d, ecw_min=%d, tx_op=%d\n", ac, - bss->param. - ap_wmm_para. - ac_params[ac]. - aci_aifsn.aifsn, - bss->param. - ap_wmm_para. - ac_params[ac]. - aci_aifsn.aci, - bss->param. - ap_wmm_para. - ac_params[ac]. - ecw.ecw_max, - bss->param. - ap_wmm_para. - ac_params[ac]. - ecw.ecw_min, - bss->param. - ap_wmm_para. - ac_params[ac]. - tx_op_limit); + bss->param + .ap_wmm_para + .ac_params + [ac] + .aci_aifsn + .aifsn, + bss->param + .ap_wmm_para + .ac_params + [ac] + .aci_aifsn + .aci, + bss->param + .ap_wmm_para + .ac_params + [ac] + .ecw + .ecw_max, + bss->param + .ap_wmm_para + .ac_params + [ac] + .ecw + .ecw_min, + bss->param + .ap_wmm_para + .ac_params + [ac] + .tx_op_limit); } } } } else if (bss->sub_command == MLAN_OID_UAP_SCAN_CHANNELS) { if (TLV_TYPE_CHANLIST == - wlan_le16_to_cpu(tlv_chan_list->header. - type)) { + wlan_le16_to_cpu( + tlv_chan_list->header.type)) { pscan_chan = tlv_chan_list->chan_scan_param; - bss->param.ap_scan_channels. - num_of_chan = 0; + bss->param.ap_scan_channels.num_of_chan = + 0; for (i = 0; i < - wlan_le16_to_cpu(tlv_chan_list-> - header.len) / - sizeof(ChanScanParamSet_t); i++) { - if (bss->param.ap_scan_channels. - remove_nop_channel && - wlan_11h_is_channel_under_nop - (pmpriv->adapter, - pscan_chan->chan_number)) { - bss->param. - ap_scan_channels. - num_remvoed_channel++; + wlan_le16_to_cpu( + tlv_chan_list->header.len) / + sizeof(ChanScanParamSet_t); + i++) { + if (bss->param.ap_scan_channels + .remove_nop_channel && + wlan_11h_is_channel_under_nop( + pmpriv->adapter, + pscan_chan + ->chan_number)) { + bss->param + .ap_scan_channels + .num_remvoed_channel++; PRINTM(MCMND, "Remove nop channel=%d\n", - pscan_chan-> - chan_number); + pscan_chan + ->chan_number); pscan_chan++; continue; } - bss->param.ap_scan_channels. - chan_list[bss->param. - ap_scan_channels. - num_of_chan]. - chan_number = + bss->param.ap_scan_channels + .chan_list + [bss->param + .ap_scan_channels + .num_of_chan] + .chan_number = pscan_chan->chan_number; - bss->param.ap_scan_channels. - chan_list[bss->param. - ap_scan_channels. - num_of_chan]. - bandcfg = + bss->param.ap_scan_channels + .chan_list + [bss->param + .ap_scan_channels + .num_of_chan] + .bandcfg = pscan_chan->bandcfg; - bss->param.ap_scan_channels. - num_of_chan++; + bss->param.ap_scan_channels + .num_of_chan++; pscan_chan++; } PRINTM(MCMND, "AP scan channel list=%d\n", - bss->param.ap_scan_channels. - num_of_chan); + bss->param.ap_scan_channels + .num_of_chan); } } else if (bss->sub_command == MLAN_OID_UAP_CHANNEL) { if (TLV_TYPE_UAP_CHAN_BAND_CONFIG == - wlan_le16_to_cpu(chan_band_tlv->header. - type)) { + wlan_le16_to_cpu( + chan_band_tlv->header.type)) { bss->param.ap_channel.bandcfg = chan_band_tlv->bandcfg; bss->param.ap_channel.channel = @@ -2627,41 +2523,43 @@ wlan_uap_ret_sys_config(IN pmlan_private pmpriv, bss->param.ap_channel.is_11n_enabled = pmpriv->is_11n_enabled; bss->param.ap_channel.is_dfs_chan = - wlan_11h_radar_detect_required - (pmpriv, - bss->param.ap_channel.channel); + wlan_11h_radar_detect_required( + pmpriv, + bss->param.ap_channel + .channel); if (chan_band_tlv->bandcfg.chanWidth == CHAN_BW_80MHZ) - bss->param.ap_channel. - center_chan = - wlan_get_center_freq_idx - (pmpriv, BAND_AAC, - chan_band_tlv->channel, - CHANNEL_BW_80MHZ); + bss->param.ap_channel + .center_chan = + wlan_get_center_freq_idx( + pmpriv, + BAND_AAC, + chan_band_tlv + ->channel, + CHANNEL_BW_80MHZ); PRINTM(MCMND, "AP channel, band=0x%x, channel=%d, is_11n_enabled=%d center_chan=%d\n", bss->param.ap_channel.bandcfg, bss->param.ap_channel.channel, - bss->param.ap_channel. - is_11n_enabled, - bss->param.ap_channel. - center_chan); + bss->param.ap_channel + .is_11n_enabled, + bss->param.ap_channel + .center_chan); } - } else if ((bss->sub_command == MLAN_OID_UAP_BSS_CONFIG) - && (pioctl_buf->action == MLAN_ACT_GET)) { + } 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; + cust_ie = (mlan_ds_misc_custom_ie *) + sys_config->tlv_buffer; if ((pioctl_buf->action == MLAN_ACT_GET || pioctl_buf->action == MLAN_ACT_SET) && (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); @@ -2669,95 +2567,91 @@ wlan_uap_ret_sys_config(IN pmlan_private pmpriv, /* 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); + 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); + *)(((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; + 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_ext(pmpriv->adapter, &misc->param.cust_ie, cust_ie, cust_ie->len + - sizeof(MrvlIEtypesHeader_t), + sizeof(MrvlIEtypesHeader_t), sizeof(mlan_ds_misc_custom_ie) - - sizeof(tlvbuf_max_mgmt_ie)); + sizeof(tlvbuf_max_mgmt_ie)); max_mgmt_ie = - (tlvbuf_max_mgmt_ie *)(sys_config-> - tlv_buffer + - cust_ie->len + - sizeof - (MrvlIEtypesHeader_t)); + (tlvbuf_max_mgmt_ie + *)(sys_config->tlv_buffer + + cust_ie->len + + sizeof(MrvlIEtypesHeader_t)); if (max_mgmt_ie) { - max_mgmt_ie->type = - wlan_le16_to_cpu(max_mgmt_ie-> - type); + 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); + wlan_le16_to_cpu( + max_mgmt_ie + ->len); max_mgmt_ie->count = - wlan_le16_to_cpu - (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); + 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_ext(pmpriv->adapter, - (t_u8 *)&misc->param. - cust_ie + - (cust_ie->len + - sizeof - (MrvlIEtypesHeader_t)), - max_mgmt_ie, - max_mgmt_ie->len + - sizeof - (MrvlIEtypesHeader_t), - sizeof - (tlvbuf_max_mgmt_ie)); + /* Append max_mgmt_ie TLV after + * custom_ie */ + memcpy_ext( + pmpriv->adapter, + (t_u8 *)&misc->param + .cust_ie + + (cust_ie->len + + sizeof(MrvlIEtypesHeader_t)), + max_mgmt_ie, + max_mgmt_ie->len + + sizeof(MrvlIEtypesHeader_t), + sizeof(tlvbuf_max_mgmt_ie)); } } } } - } else { /* no ioctl: driver generated get/set */ + } else { /* no ioctl: driver generated get/set */ switch (wlan_le16_to_cpu(tlv->header.type)) { case TLV_TYPE_UAP_MAC_ADDRESS: memcpy_ext(pmpriv->adapter, pmpriv->curr_addr, tlv->mac, MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); break; case TLV_TYPE_UAP_MAX_STA_CNT_PER_CHIP: - tlv_uap_max_sta = (MrvlIEtypes_uap_max_sta_cnt_t *) tlv; + tlv_uap_max_sta = (MrvlIEtypes_uap_max_sta_cnt_t *)tlv; pmpriv->adapter->max_sta_conn = wlan_le16_to_cpu(tlv_uap_max_sta->uap_max_sta); PRINTM(MCMND, "Uap max_sta per chip=%d\n", @@ -2769,8 +2663,8 @@ wlan_uap_ret_sys_config(IN pmlan_private pmpriv, 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); + pmpriv->uap_state_chan_cb.get_chan_callback( + pmpriv); break; case TLV_TYPE_UAP_BEACON_PERIOD: tlv_bcnpd = (MrvlIEtypes_beacon_period_t *)tlv; @@ -2778,17 +2672,17 @@ wlan_uap_ret_sys_config(IN pmlan_private pmpriv, 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)); + (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); + pmpriv->uap_state_chan_cb.get_chan_callback( + pmpriv); break; case TLV_TYPE_MGMT_IE: if ((pmpriv->adapter->state_rdh.stage == @@ -2796,9 +2690,8 @@ wlan_uap_ret_sys_config(IN pmlan_private pmpriv, (pmpriv->adapter->state_rdh.stage == RDH_REM_CUSTOM_IE)) { if (!pmpriv->adapter->ecsa_enable) - wlan_11h_radar_detected_callback((t_void - *) - pmpriv); + wlan_11h_radar_detected_callback( + (t_void *)pmpriv); } break; } @@ -2818,14 +2711,15 @@ wlan_uap_ret_sys_config(IN pmlan_private pmpriv, * @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) +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) { HostCmd_DS_802_11_SNMP_MIB *psnmp_mib = &cmd->params.smib; + HostCmd_DS_UAP_802_11_SNMP_MIB *puap_snmp_mib = &cmd->params.uap_smib; + mlan_status ret = MLAN_STATUS_SUCCESS; t_u8 *psnmp_oid = MNULL; t_u32 ul_temp; @@ -2861,17 +2755,14 @@ wlan_uap_cmd_snmp_mib(pmlan_private pmpriv, if (cmd_oid == StopDeauth_i) { psnmp_mib->oid = wlan_cpu_to_le16((t_u16)StopDeauth_i); psnmp_mib->buf_size = wlan_cpu_to_le16(sizeof(t_u8)); - cmd->size = - wlan_cpu_to_le16(sizeof - (HostCmd_DS_802_11_SNMP_MIB) + - S_DS_GEN); + cmd->size = wlan_cpu_to_le16( + sizeof(HostCmd_DS_802_11_SNMP_MIB) + S_DS_GEN); } else { - 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; + cmd->size = wlan_cpu_to_le16( + sizeof(t_u16) + S_DS_GEN + + sizeof(snmp_oids) * + sizeof(MrvlIEtypes_snmp_oid_t)); + psnmp_oid = (t_u8 *)&puap_snmp_mib->snmp_data; for (i = 0; i < sizeof(snmp_oids); i++) { /* SNMP OID header type */ *(t_u16 *)psnmp_oid = @@ -2883,7 +2774,7 @@ wlan_uap_cmd_snmp_mib(pmlan_private pmpriv, psnmp_oid += sizeof(t_u16) + sizeof(t_u32); } } - } else { /* cmd_action == ACT_SET */ + } 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); @@ -2930,8 +2821,8 @@ wlan_uap_cmd_snmp_mib(pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_uap_cmd_802_11_get_log(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd) +static mlan_status wlan_uap_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); @@ -2949,8 +2840,8 @@ wlan_uap_cmd_802_11_get_log(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd) * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_uap_cmd_bss_start(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd) +static mlan_status wlan_uap_cmd_bss_start(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd) { MrvlIEtypes_HostMlme_t *tlv; @@ -2958,7 +2849,7 @@ wlan_uap_cmd_bss_start(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd) cmd->command = wlan_cpu_to_le16(HOST_CMD_APCMD_BSS_START); cmd->size = S_DS_GEN; if (pmpriv->uap_host_based & UAP_FLAG_HOST_MLME) { - tlv = (MrvlIEtypes_HostMlme_t *) ((t_u8 *)cmd + cmd->size); + tlv = (MrvlIEtypes_HostMlme_t *)((t_u8 *)cmd + cmd->size); tlv->header.type = wlan_cpu_to_le16(TLV_TYPE_HOST_MLME); tlv->header.len = wlan_cpu_to_le16(sizeof(tlv->host_mlme)); tlv->host_mlme = MTRUE; @@ -2978,10 +2869,9 @@ wlan_uap_cmd_bss_start(IN pmlan_private pmpriv, IN HostCmd_DS_COMMAND *cmd) * * @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) +static mlan_status wlan_uap_ret_snmp_mib(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { pmlan_adapter pmadapter = pmpriv->adapter; HostCmd_DS_802_11_SNMP_MIB *psnmp_mib = @@ -3097,7 +2987,7 @@ wlan_uap_ret_snmp_mib(IN pmlan_private pmpriv, tlv_buf_left -= sizeof(MrvlIEtypes_snmp_oid_t); psnmp_oid += sizeof(t_u32); } - } else { /* ACT_SET */ + } else { /* ACT_SET */ switch (wlan_le16_to_cpu(psnmp_mib->oid)) { case Dot11D_i: data = wlan_le16_to_cpu(*((t_u16 *)(psnmp_mib->value))); @@ -3113,8 +3003,7 @@ wlan_uap_ret_snmp_mib(IN pmlan_private pmpriv, 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 - = + 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; @@ -3135,9 +3024,9 @@ wlan_uap_ret_snmp_mib(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_uap_ret_get_log(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_uap_ret_get_log(IN pmlan_private pmpriv, + 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; @@ -3195,49 +3084,44 @@ wlan_uap_ret_get_log(IN pmlan_private pmpriv, wlan_le32_to_cpu(pget_log->tx_frag_cnt); for (i = 0; i < 8; i++) { pget_info->param.stats.qos_tx_frag_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_tx_frag_cnt[i]); + wlan_le32_to_cpu( + pget_log->qos_tx_frag_cnt[i]); pget_info->param.stats.qos_failed_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_failed_cnt[i]); + wlan_le32_to_cpu( + pget_log->qos_failed_cnt[i]); pget_info->param.stats.qos_retry_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_retry_cnt[i]); + wlan_le32_to_cpu( + pget_log->qos_retry_cnt[i]); pget_info->param.stats.qos_multi_retry_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_multi_retry_cnt - [i]); + wlan_le32_to_cpu( + pget_log->qos_multi_retry_cnt[i]); pget_info->param.stats.qos_frm_dup_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_frm_dup_cnt[i]); + wlan_le32_to_cpu( + pget_log->qos_frm_dup_cnt[i]); pget_info->param.stats.qos_rts_suc_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_rts_suc_cnt[i]); + wlan_le32_to_cpu( + pget_log->qos_rts_suc_cnt[i]); pget_info->param.stats.qos_rts_failure_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_rts_failure_cnt - [i]); + wlan_le32_to_cpu( + pget_log->qos_rts_failure_cnt[i]); pget_info->param.stats.qos_ack_failure_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_ack_failure_cnt - [i]); + wlan_le32_to_cpu( + pget_log->qos_ack_failure_cnt[i]); pget_info->param.stats.qos_rx_frag_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_rx_frag_cnt[i]); + wlan_le32_to_cpu( + pget_log->qos_rx_frag_cnt[i]); pget_info->param.stats.qos_tx_frm_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_tx_frm_cnt[i]); - pget_info->param.stats. - qos_discarded_frm_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_discarded_frm_cnt - [i]); + wlan_le32_to_cpu( + pget_log->qos_tx_frm_cnt[i]); + pget_info->param.stats.qos_discarded_frm_cnt + [i] = wlan_le32_to_cpu( + pget_log->qos_discarded_frm_cnt[i]); pget_info->param.stats.qos_mpdus_rx_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_mpdus_rx_cnt[i]); + wlan_le32_to_cpu( + pget_log->qos_mpdus_rx_cnt[i]); pget_info->param.stats.qos_retries_rx_cnt[i] = - wlan_le32_to_cpu(pget_log-> - qos_retries_rx_cnt[i]); + wlan_le32_to_cpu( + pget_log->qos_retries_rx_cnt[i]); } pget_info->param.stats.mgmt_ccmp_replays = wlan_le32_to_cpu(pget_log->mgmt_ccmp_replays); @@ -3248,38 +3132,38 @@ wlan_uap_ret_get_log(IN pmlan_private pmpriv, pget_info->param.stats.retry_amsdu_cnt = wlan_le32_to_cpu(pget_log->retry_amsdu_cnt); pget_info->param.stats.multi_retry_amsdu_cnt = - wlan_le32_to_cpu(pget_log-> - multi_retry_amsdu_cnt); + wlan_le32_to_cpu( + pget_log->multi_retry_amsdu_cnt); pget_info->param.stats.tx_octets_in_amsdu_cnt = - wlan_le64_to_cpu(pget_log-> - tx_octets_in_amsdu_cnt); + wlan_le64_to_cpu( + pget_log->tx_octets_in_amsdu_cnt); pget_info->param.stats.amsdu_ack_failure_cnt = - wlan_le32_to_cpu(pget_log-> - amsdu_ack_failure_cnt); + wlan_le32_to_cpu( + pget_log->amsdu_ack_failure_cnt); pget_info->param.stats.rx_amsdu_cnt = wlan_le32_to_cpu(pget_log->rx_amsdu_cnt); pget_info->param.stats.rx_octets_in_amsdu_cnt = - wlan_le64_to_cpu(pget_log-> - rx_octets_in_amsdu_cnt); + wlan_le64_to_cpu( + pget_log->rx_octets_in_amsdu_cnt); pget_info->param.stats.tx_ampdu_cnt = wlan_le32_to_cpu(pget_log->tx_ampdu_cnt); pget_info->param.stats.tx_mpdus_in_ampdu_cnt = - wlan_le32_to_cpu(pget_log-> - tx_mpdus_in_ampdu_cnt); + wlan_le32_to_cpu( + pget_log->tx_mpdus_in_ampdu_cnt); pget_info->param.stats.tx_octets_in_ampdu_cnt = - wlan_le64_to_cpu(pget_log-> - tx_octets_in_ampdu_cnt); + wlan_le64_to_cpu( + pget_log->tx_octets_in_ampdu_cnt); pget_info->param.stats.ampdu_rx_cnt = wlan_le32_to_cpu(pget_log->ampdu_rx_cnt); pget_info->param.stats.mpdu_in_rx_ampdu_cnt = - wlan_le32_to_cpu(pget_log-> - mpdu_in_rx_ampdu_cnt); + wlan_le32_to_cpu( + pget_log->mpdu_in_rx_ampdu_cnt); pget_info->param.stats.rx_octets_in_ampdu_cnt = - wlan_le64_to_cpu(pget_log-> - rx_octets_in_ampdu_cnt); + wlan_le64_to_cpu( + pget_log->rx_octets_in_ampdu_cnt); pget_info->param.stats.ampdu_delimiter_crc_error_cnt = - wlan_le32_to_cpu(pget_log-> - ampdu_delimiter_crc_error_cnt); + wlan_le32_to_cpu( + pget_log->ampdu_delimiter_crc_error_cnt); /* Indicate ioctl complete */ pioctl_buf->data_read_written = @@ -3301,9 +3185,9 @@ wlan_uap_ret_get_log(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_uap_cmd_sta_deauth(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, IN t_void *pdata_buf) +static mlan_status wlan_uap_cmd_sta_deauth(pmlan_private pmpriv, + 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; @@ -3327,9 +3211,9 @@ wlan_uap_cmd_sta_deauth(pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_uap_cmd_report_mic(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, IN t_void *pdata_buf) +static mlan_status wlan_uap_cmd_report_mic(pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_void *pdata_buf) { HostCmd_DS_REPORT_MIC *pcmd_report_mic = (HostCmd_DS_REPORT_MIC *)&cmd->params.report_mic; @@ -3353,11 +3237,11 @@ wlan_uap_cmd_report_mic(pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -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) +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) { HostCmd_DS_802_11_KEY_MATERIAL *pkey_material = &cmd->params.key_material; @@ -3373,9 +3257,8 @@ wlan_uap_cmd_key_material(IN pmlan_private pmpriv, 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); + cmd->size = wlan_cpu_to_le16(sizeof(pkey_material->action) + + S_DS_GEN); goto done; } memset(pmpriv->adapter, &pkey_material->key_param_set, 0, @@ -3389,17 +3272,15 @@ wlan_uap_cmd_key_material(IN pmlan_private pmpriv, wlan_cpu_to_le16(KEY_PARAMS_FIXED_LEN); pkey_material->key_param_set.key_idx = pkey->key_index & KEY_INDEX_MASK; - pkey_material->key_param_set.key_info = - wlan_cpu_to_le16(KEY_INFO_MCAST_KEY | - KEY_INFO_UCAST_KEY); + pkey_material->key_param_set.key_info = wlan_cpu_to_le16( + KEY_INFO_MCAST_KEY | KEY_INFO_UCAST_KEY); memcpy_ext(pmpriv->adapter, pkey_material->key_param_set.mac_addr, pkey->mac_addr, MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); - cmd->size = - wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + - S_DS_GEN + KEY_PARAMS_FIXED_LEN + - sizeof(pkey_material->action)); + cmd->size = wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + + S_DS_GEN + KEY_PARAMS_FIXED_LEN + + sizeof(pkey_material->action)); PRINTM(MCMND, "Remove Key\n"); goto done; } @@ -3411,9 +3292,8 @@ wlan_uap_cmd_key_material(IN pmlan_private pmpriv, memcpy_ext(pmpriv->adapter, pkey_material->key_param_set.mac_addr, pkey->mac_addr, MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); if (pkey->key_len <= MAX_WEP_KEY_SIZE) { - pkey_material->key_param_set.length = - wlan_cpu_to_le16(KEY_PARAMS_FIXED_LEN + - sizeof(wep_param_t)); + pkey_material->key_param_set.length = wlan_cpu_to_le16( + KEY_PARAMS_FIXED_LEN + sizeof(wep_param_t)); pkey_material->key_param_set.key_type = KEY_TYPE_ID_WEP; pkey_material->key_param_set.key_info |= KEY_INFO_MCAST_KEY | KEY_INFO_UCAST_KEY; @@ -3428,11 +3308,10 @@ wlan_uap_cmd_key_material(IN pmlan_private pmpriv, memcpy_ext(pmpriv->adapter, pkey_material->key_param_set.key_params.wep.key, pkey->key_material, pkey->key_len, MAX_WEP_KEY_SIZE); - cmd->size = - wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + - S_DS_GEN + KEY_PARAMS_FIXED_LEN + - sizeof(wep_param_t) + - sizeof(pkey_material->action)); + cmd->size = wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + + S_DS_GEN + KEY_PARAMS_FIXED_LEN + + sizeof(wep_param_t) + + sizeof(pkey_material->action)); PRINTM(MCMND, "Set WEP Key\n"); goto done; } @@ -3473,14 +3352,12 @@ wlan_uap_cmd_key_material(IN pmlan_private pmpriv, } pkey_material->key_param_set.key_info = wlan_cpu_to_le16(pkey_material->key_param_set.key_info); - pkey_material->key_param_set.length = - wlan_cpu_to_le16(KEY_PARAMS_FIXED_LEN + - sizeof(wapi_param)); - cmd->size = - wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + - S_DS_GEN + KEY_PARAMS_FIXED_LEN + - sizeof(wapi_param) + - sizeof(pkey_material->action)); + pkey_material->key_param_set.length = wlan_cpu_to_le16( + KEY_PARAMS_FIXED_LEN + sizeof(wapi_param)); + cmd->size = wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + + S_DS_GEN + KEY_PARAMS_FIXED_LEN + + sizeof(wapi_param) + + sizeof(pkey_material->action)); PRINTM(MCMND, "Set WAPI Key\n"); goto done; } @@ -3489,36 +3366,35 @@ wlan_uap_cmd_key_material(IN pmlan_private pmpriv, wlan_cpu_to_le16(pkey_material->key_param_set.key_info); if (pkey->key_len == WPA_AES_KEY_LEN && !(pkey->key_flags & KEY_FLAG_AES_MCAST_IGTK)) { - if (pkey-> - key_flags & (KEY_FLAG_RX_SEQ_VALID | KEY_FLAG_TX_SEQ_VALID)) - memcpy_ext(pmpriv->adapter, - pkey_material->key_param_set.key_params.aes. - pn, pkey->pn, SEQ_MAX_SIZE, WPA_PN_SIZE); + if (pkey->key_flags & + (KEY_FLAG_RX_SEQ_VALID | KEY_FLAG_TX_SEQ_VALID)) + memcpy_ext( + pmpriv->adapter, + pkey_material->key_param_set.key_params.aes.pn, + pkey->pn, SEQ_MAX_SIZE, WPA_PN_SIZE); pkey_material->key_param_set.key_type = KEY_TYPE_ID_AES; pkey_material->key_param_set.key_params.aes.key_len = wlan_cpu_to_le16(pkey->key_len); memcpy_ext(pmpriv->adapter, pkey_material->key_param_set.key_params.aes.key, pkey->key_material, pkey->key_len, WPA_AES_KEY_LEN); - pkey_material->key_param_set.length = - wlan_cpu_to_le16(KEY_PARAMS_FIXED_LEN + - sizeof(aes_param)); - cmd->size = - wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + - S_DS_GEN + KEY_PARAMS_FIXED_LEN + - sizeof(aes_param) + - sizeof(pkey_material->action)); + pkey_material->key_param_set.length = wlan_cpu_to_le16( + KEY_PARAMS_FIXED_LEN + sizeof(aes_param)); + cmd->size = wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + + S_DS_GEN + KEY_PARAMS_FIXED_LEN + + sizeof(aes_param) + + sizeof(pkey_material->action)); PRINTM(MCMND, "Set AES Key\n"); goto done; } if (pkey->key_len == WPA_IGTK_KEY_LEN && (pkey->key_flags & KEY_FLAG_AES_MCAST_IGTK)) { - if (pkey-> - key_flags & (KEY_FLAG_RX_SEQ_VALID | KEY_FLAG_TX_SEQ_VALID)) + if (pkey->key_flags & + (KEY_FLAG_RX_SEQ_VALID | KEY_FLAG_TX_SEQ_VALID)) memcpy_ext(pmpriv->adapter, - pkey_material->key_param_set.key_params. - cmac_aes.ipn, pkey->pn, SEQ_MAX_SIZE, - IGTK_PN_SIZE); + pkey_material->key_param_set.key_params + .cmac_aes.ipn, + pkey->pn, SEQ_MAX_SIZE, IGTK_PN_SIZE); pkey_material->key_param_set.key_info &= ~(wlan_cpu_to_le16(KEY_INFO_MCAST_KEY)); pkey_material->key_param_set.key_info |= @@ -3529,37 +3405,34 @@ wlan_uap_cmd_key_material(IN pmlan_private pmpriv, memcpy_ext(pmpriv->adapter, pkey_material->key_param_set.key_params.cmac_aes.key, pkey->key_material, pkey->key_len, CMAC_AES_KEY_LEN); - pkey_material->key_param_set.length = - wlan_cpu_to_le16(KEY_PARAMS_FIXED_LEN + - sizeof(cmac_aes_param)); - cmd->size = - wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + - S_DS_GEN + KEY_PARAMS_FIXED_LEN + - sizeof(cmac_aes_param) + - sizeof(pkey_material->action)); + pkey_material->key_param_set.length = wlan_cpu_to_le16( + KEY_PARAMS_FIXED_LEN + sizeof(cmac_aes_param)); + cmd->size = wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + + S_DS_GEN + KEY_PARAMS_FIXED_LEN + + sizeof(cmac_aes_param) + + sizeof(pkey_material->action)); PRINTM(MCMND, "Set CMAC AES Key\n"); goto done; } if (pkey->key_len == WPA_TKIP_KEY_LEN) { - if (pkey-> - key_flags & (KEY_FLAG_RX_SEQ_VALID | KEY_FLAG_TX_SEQ_VALID)) - memcpy_ext(pmpriv->adapter, - pkey_material->key_param_set.key_params.tkip. - pn, pkey->pn, SEQ_MAX_SIZE, WPA_PN_SIZE); + if (pkey->key_flags & + (KEY_FLAG_RX_SEQ_VALID | KEY_FLAG_TX_SEQ_VALID)) + memcpy_ext( + pmpriv->adapter, + pkey_material->key_param_set.key_params.tkip.pn, + pkey->pn, SEQ_MAX_SIZE, WPA_PN_SIZE); pkey_material->key_param_set.key_type = KEY_TYPE_ID_TKIP; pkey_material->key_param_set.key_params.tkip.key_len = wlan_cpu_to_le16(pkey->key_len); memcpy_ext(pmpriv->adapter, pkey_material->key_param_set.key_params.tkip.key, pkey->key_material, pkey->key_len, WPA_TKIP_KEY_LEN); - pkey_material->key_param_set.length = - wlan_cpu_to_le16(KEY_PARAMS_FIXED_LEN + - sizeof(tkip_param)); - cmd->size = - wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + - S_DS_GEN + KEY_PARAMS_FIXED_LEN + - sizeof(tkip_param) + - sizeof(pkey_material->action)); + pkey_material->key_param_set.length = wlan_cpu_to_le16( + KEY_PARAMS_FIXED_LEN + sizeof(tkip_param)); + cmd->size = wlan_cpu_to_le16(sizeof(MrvlIEtypesHeader_t) + + S_DS_GEN + KEY_PARAMS_FIXED_LEN + + sizeof(tkip_param) + + sizeof(pkey_material->action)); PRINTM(MCMND, "Set TKIP Key\n"); } done: @@ -3576,10 +3449,9 @@ done: * * @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) +static mlan_status wlan_uap_ret_sta_list(IN pmlan_private pmpriv, + 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; @@ -3595,7 +3467,7 @@ wlan_uap_ret_sta_list(IN pmlan_private pmpriv, info = (mlan_ds_get_info *)pioctl_buf->pbuf; info->param.sta_list.sta_count = wlan_le16_to_cpu(sta_list->sta_count); - buf = (t_u8 *)sta_list + sizeof(HostCmd_DS_STA_LIST); + buf = sta_list->tlv_buf; tlv = (MrvlIEtypes_sta_info_t *)buf; info->param.sta_list.sta_count = MIN(info->param.sta_list.sta_count, MAX_NUM_CLIENTS); @@ -3619,24 +3491,23 @@ wlan_uap_ret_sta_list(IN pmlan_private pmpriv, info->param.sta_list.info[i].power_mgmt_status = tlv->power_mgmt_status; info->param.sta_list.info[i].rssi = tlv->rssi; - sta_ptr = - wlan_get_station_entry(pmpriv, - tlv->mac_address); + sta_ptr = wlan_get_station_entry(pmpriv, + tlv->mac_address); if (sta_ptr) { info->param.sta_list.info[i].bandmode = sta_ptr->bandmode; - memcpy_ext(pmpriv->adapter, - &(info->param.sta_list.info[i]. - stats), &(sta_ptr->stats), - sizeof(sta_stats), - sizeof(sta_stats)); + memcpy_ext( + pmpriv->adapter, + &(info->param.sta_list.info[i].stats), + &(sta_ptr->stats), sizeof(sta_stats), + sizeof(sta_stats)); } else info->param.sta_list.info[i].bandmode = 0xFF; pioctl_buf->data_read_written += sizeof(sta_info) + info->param.sta_list.info[i].ie_len; buf += sizeof(MrvlIEtypes_sta_info_t) + - info->param.sta_list.info[i].ie_len; + info->param.sta_list.info[i].ie_len; tlv = (MrvlIEtypes_sta_info_t *)buf; } PRINTM(MCMND, "Total sta_list size=%d\n", @@ -3648,7 +3519,7 @@ wlan_uap_ret_sta_list(IN pmlan_private pmpriv, } /** Fixed size of bss start event */ -#define BSS_START_EVENT_FIX_SIZE 12 +#define BSS_START_EVENT_FIX_SIZE 12 /** * @brief This function will search for the specific ie @@ -3658,8 +3529,7 @@ wlan_uap_ret_sta_list(IN pmlan_private pmpriv, * * @return N/A */ -static void -wlan_check_uap_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; @@ -3667,12 +3537,12 @@ wlan_check_uap_capability(pmlan_private priv, pmlan_buffer pevent) (MrvlIEtypesHeader_t *)(pevent->pbuf + pevent->data_offset + BSS_START_EVENT_FIX_SIZE); - const t_u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 }; + const t_u8 wmm_oui[4] = {0x00, 0x50, 0xf2, 0x02}; IEEEtypes_WmmParameter_t wmm_param_ie; MrvlIEtypes_channel_band_t *pchan_info; t_u8 event_buf[100]; mlan_event *event = (mlan_event *)event_buf; - chan_band_info *pchan_band_info = (chan_band_info *) event->event_buf; + chan_band_info *pchan_band_info = (chan_band_info *)event->event_buf; MrvlIEtypes_He_cap_t *pext_tlv = MNULL; ENTER(); @@ -3702,23 +3572,22 @@ wlan_check_uap_capability(pmlan_private priv, pmlan_buffer pevent) priv->is_11ac_enabled = MTRUE; } if (tlv_type == EXTENSION) { - pext_tlv = (MrvlIEtypes_He_cap_t *) tlv; + pext_tlv = (MrvlIEtypes_He_cap_t *)tlv; if (pext_tlv->ext_id == HE_CAPABILITY) { - DBG_HEXDUMP(MCMD_D, "HE_CAP tlv", tlv, - tlv_len + - sizeof(MrvlIEtypesHeader_t)); + DBG_HEXDUMP( + MCMD_D, "HE_CAP tlv", tlv, + tlv_len + sizeof(MrvlIEtypesHeader_t)); priv->is_11ax_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)); + 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; @@ -3760,10 +3629,10 @@ wlan_check_uap_capability(pmlan_private priv, pmlan_buffer pevent) tlv_len); if (pchan_band_info->bandcfg.chanWidth == CHAN_BW_80MHZ) pchan_band_info->center_chan = - wlan_get_center_freq_idx(priv, BAND_AAC, - pchan_info-> - channel, - CHANNEL_BW_80MHZ); + wlan_get_center_freq_idx( + priv, BAND_AAC, + pchan_info->channel, + CHANNEL_BW_80MHZ); if (priv->adapter->ecsa_enable) { int ret; t_u8 bandwidth = BW_20MHZ; @@ -3784,10 +3653,10 @@ wlan_check_uap_capability(pmlan_private priv, pmlan_buffer pevent) chan_bw_oper.ds_chan_bw_oper.bandwidth = bandwidth; - ret = wlan_prepare_cmd(priv, - HOST_CMD_APCMD_SYS_CONFIGURE, - HostCmd_ACT_GEN_SET, 0, - MNULL, &chan_bw_oper); + ret = wlan_prepare_cmd( + priv, HOST_CMD_APCMD_SYS_CONFIGURE, + HostCmd_ACT_GEN_SET, 0, MNULL, + &chan_bw_oper); if (ret != MLAN_STATUS_SUCCESS && ret != MLAN_STATUS_PENDING) { PRINTM(MERROR, @@ -3802,7 +3671,8 @@ wlan_check_uap_capability(pmlan_private priv, pmlan_buffer pevent) sizeof(MrvlIEtypesHeader_t)); } if (priv->wmm_enabled == MFALSE) { - /* Since WMM is not enabled, setup the queues with the defaults */ + /* Since WMM is not enabled, setup the queues with the defaults + */ wlan_wmm_setup_queues(priv); } if (event->event_id == MLAN_EVENT_ID_DRV_UAP_CHAN_INFO) { @@ -3821,16 +3691,16 @@ wlan_check_uap_capability(pmlan_private priv, pmlan_buffer pevent) * * @return MFALSE */ -static t_u32 -wlan_update_wapi_info_tlv(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); + MrvlIEtypesHeader_t *tlv = + (MrvlIEtypesHeader_t *)(pevent->pbuf + pevent->data_offset + + ASSOC_EVENT_FIX_SIZE); MrvlIEtypes_wapi_info_t *wapi_tlv = MNULL; ENTER(); @@ -3878,9 +3748,9 @@ wlan_update_wapi_info_tlv(pmlan_private priv, pmlan_buffer pevent) * * @return MFALSE */ -static t_u32 -wlan_process_sta_assoc_event(pmlan_private priv, mlan_event *pevent, - pmlan_buffer pmbuf) +static t_u32 wlan_process_sta_assoc_event(pmlan_private priv, + mlan_event *pevent, + pmlan_buffer pmbuf) { t_u32 ret = MFALSE; t_u16 tlv_type, tlv_len; @@ -3888,8 +3758,9 @@ wlan_process_sta_assoc_event(pmlan_private priv, mlan_event *pevent, 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); + MrvlIEtypesHeader_t *tlv = + (MrvlIEtypesHeader_t *)(pmbuf->pbuf + pmbuf->data_offset + + ASSOC_EVENT_FIX_SIZE); MrvlIETypes_MgmtFrameSet_t *mgmt_tlv = MNULL; ENTER(); @@ -3914,13 +3785,11 @@ wlan_process_sta_assoc_event(pmlan_private priv, mlan_event *pevent, (t_u8 *)&(mgmt_tlv->frame_control), sizeof(frame_control), sizeof(frame_control)); - frame_sub_type = - IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE - (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); @@ -3930,16 +3799,16 @@ wlan_process_sta_assoc_event(pmlan_private priv, mlan_event *pevent, sizeof(IEEEtypes_ReAssocRqst_t); ie_len = tlv_len - - sizeof(IEEEtypes_FrameCtl_t) - - assoc_ie_len; + sizeof(IEEEtypes_FrameCtl_t) - + assoc_ie_len; assoc_req_ie = (t_u8 *)tlv + sizeof(MrvlIETypes_MgmtFrameSet_t) + assoc_ie_len; memcpy_ext(priv->adapter, pevent->event_buf + - pevent->event_len, assoc_req_ie, - ie_len, ie_len); + pevent->event_len, + assoc_req_ie, ie_len, ie_len); pevent->event_len += ie_len; break; } @@ -3965,13 +3834,12 @@ wlan_process_sta_assoc_event(pmlan_private priv, mlan_event *pevent, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_cmd_uap_acs_scan(IN pmlan_private pmpriv, - const IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_cmd_uap_acs_scan(IN pmlan_private pmpriv, + const IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCMD_DS_APCMD_ACS_SCAN *acs_scan = - (HostCMD_DS_APCMD_ACS_SCAN *) & resp->params.acs_scan; + (HostCMD_DS_APCMD_ACS_SCAN *)&resp->params.acs_scan; mlan_ds_bss *bss = MNULL; ENTER(); @@ -3997,13 +3865,13 @@ wlan_ret_cmd_uap_acs_scan(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_uap_cmd_oper_ctrl(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN t_void *pdata_buf) +static mlan_status wlan_uap_cmd_oper_ctrl(pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, + IN t_void *pdata_buf) { HostCmd_DS_UAP_OPER_CTRL *poper_ctl = - (HostCmd_DS_UAP_OPER_CTRL *) & cmd->params.uap_oper_ctrl; + (HostCmd_DS_UAP_OPER_CTRL *)&cmd->params.uap_oper_ctrl; mlan_ds_bss *bss = (mlan_ds_bss *)pdata_buf; mlan_uap_oper_ctrl *uap_oper_ctrl = &bss->param.ap_oper_ctrl; Band_Config_t *bandcfg = MNULL; @@ -4022,22 +3890,20 @@ wlan_uap_cmd_oper_ctrl(pmlan_private pmpriv, wlan_cpu_to_le16(uap_oper_ctrl->chan_opt); if (uap_oper_ctrl->chan_opt == 3) { poper_ctl->channel_band.header.type = - wlan_cpu_to_le16 - (TLV_TYPE_UAP_CHAN_BAND_CONFIG); - poper_ctl->channel_band.header.len = - wlan_cpu_to_le16(sizeof - (MrvlIEtypes_channel_band_t) - - - sizeof - (MrvlIEtypesHeader_t)); + wlan_cpu_to_le16( + TLV_TYPE_UAP_CHAN_BAND_CONFIG); + poper_ctl->channel_band.header + .len = wlan_cpu_to_le16( + sizeof(MrvlIEtypes_channel_band_t) - + sizeof(MrvlIEtypesHeader_t)); bandcfg = &poper_ctl->channel_band.bandcfg; if (uap_oper_ctrl->channel > 14) bandcfg->chanBand = BAND_5GHZ; bandcfg->chanWidth = uap_oper_ctrl->band_cfg; if (bandcfg->chanWidth) bandcfg->chan2Offset = - wlan_get_second_channel_offset - (uap_oper_ctrl->channel); + wlan_get_second_channel_offset( + uap_oper_ctrl->channel); bandcfg->scanMode = SCAN_MODE_MANUAL; poper_ctl->channel_band.channel = uap_oper_ctrl->channel; @@ -4058,13 +3924,12 @@ wlan_uap_cmd_oper_ctrl(pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -static mlan_status -wlan_uap_ret_oper_ctrl(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - IN mlan_ioctl_req *pioctl_buf) +static mlan_status wlan_uap_ret_oper_ctrl(IN pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *resp, + IN mlan_ioctl_req *pioctl_buf) { HostCmd_DS_UAP_OPER_CTRL *poper_ctl = - (HostCmd_DS_UAP_OPER_CTRL *) & resp->params.uap_oper_ctrl; + (HostCmd_DS_UAP_OPER_CTRL *)&resp->params.uap_oper_ctrl; mlan_ds_bss *bss = MNULL; mlan_uap_oper_ctrl *uap_oper_ctrl = MNULL; Band_Config_t *bandcfg = MNULL; @@ -4073,8 +3938,7 @@ wlan_uap_ret_oper_ctrl(IN pmlan_private pmpriv, if (pioctl_buf && pioctl_buf->action == MLAN_ACT_GET) { bss = (mlan_ds_bss *)pioctl_buf->pbuf; - uap_oper_ctrl = - (mlan_uap_oper_ctrl *) & bss->param.ap_oper_ctrl; + uap_oper_ctrl = (mlan_uap_oper_ctrl *)&bss->param.ap_oper_ctrl; uap_oper_ctrl->ctrl_value = wlan_le16_to_cpu(poper_ctl->ctrl); uap_oper_ctrl->chan_opt = wlan_le16_to_cpu(poper_ctl->chan_opt); uap_oper_ctrl->channel = poper_ctl->channel_band.channel; @@ -4095,16 +3959,15 @@ wlan_uap_ret_oper_ctrl(IN pmlan_private pmpriv, * @return MTRUE/MFALSE * */ -t_u8 -wlan_check_11B_support_rates(MrvlIEtypes_RatesParamSet_t *prates_tlv) +t_u8 wlan_check_11B_support_rates(MrvlIEtypes_RatesParamSet_t *prates_tlv) { int i; t_u8 rate; t_u8 ret = MTRUE; for (i = 0; i < prates_tlv->header.len; i++) { rate = prates_tlv->rates[i] & 0x7f; - if ((rate != 0x02) && (rate != 0x04) - && (rate != 0x0b) && (rate != 0x16)) { + if ((rate != 0x02) && (rate != 0x04) && (rate != 0x0b) && + (rate != 0x16)) { ret = MFALSE; break; } @@ -4121,14 +3984,14 @@ wlan_check_11B_support_rates(MrvlIEtypes_RatesParamSet_t *prates_tlv) * @param pioctl_buf A pointer to mlan_ioctl_req structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_uap_cmd_add_station(pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *cmd, - IN t_u16 cmd_action, IN pmlan_ioctl_req pioctl_buf) +static mlan_status wlan_uap_cmd_add_station(pmlan_private pmpriv, + IN HostCmd_DS_COMMAND *cmd, + IN t_u16 cmd_action, + IN pmlan_ioctl_req pioctl_buf) { mlan_ds_bss *bss = MNULL; HostCmd_DS_ADD_STATION *new_sta = - (HostCmd_DS_ADD_STATION *) & cmd->params.sta_info; + (HostCmd_DS_ADD_STATION *)&cmd->params.sta_info; sta_node *sta_ptr = MNULL; t_u16 tlv_buf_left; t_u8 *pos = MNULL; @@ -4154,18 +4017,14 @@ wlan_uap_cmd_add_station(pmlan_private pmpriv, new_sta->action = wlan_cpu_to_le16(cmd_action); cmd->size = sizeof(HostCmd_DS_ADD_STATION) + S_DS_GEN; if (cmd_action == HostCmd_ACT_ADD_STA) { - sta_ptr = - wlan_get_station_entry(pmpriv, - bss->param.sta_info.peer_mac); + sta_ptr = wlan_get_station_entry(pmpriv, + bss->param.sta_info.peer_mac); if (!sta_ptr) - sta_ptr = - wlan_add_station_entry(pmpriv, - bss->param.sta_info. - peer_mac); + sta_ptr = wlan_add_station_entry( + pmpriv, bss->param.sta_info.peer_mac); } else { - sta_ptr = - wlan_add_station_entry(pmpriv, - bss->param.sta_info.peer_mac); + sta_ptr = wlan_add_station_entry(pmpriv, + bss->param.sta_info.peer_mac); } if (!sta_ptr) { LEAVE(); @@ -4191,8 +4050,8 @@ wlan_uap_cmd_add_station(pmlan_private pmpriv, PRINTM(MCMND, "STA flags supports wmm \n"); sta_ptr->is_wmm_enabled = MTRUE; } - //append sta_flag_flags. - pstaflag = (MrvlIEtypes_StaFlag_t *) pos; + // append sta_flag_flags. + pstaflag = (MrvlIEtypes_StaFlag_t *)pos; pstaflag->header.type = wlan_cpu_to_le16(TLV_TYPE_UAP_STA_FLAGS); pstaflag->header.len = wlan_cpu_to_le16(sizeof(t_u32)); pstaflag->sta_flags = wlan_cpu_to_le32(bss->param.sta_info.sta_flags); @@ -4206,7 +4065,8 @@ wlan_uap_cmd_add_station(pmlan_private pmpriv, case EXT_CAPABILITY: break; case SUPPORTED_RATES: - b_only = wlan_check_11B_support_rates((MrvlIEtypes_RatesParamSet_t *)tlv); + b_only = wlan_check_11B_support_rates( + (MrvlIEtypes_RatesParamSet_t *)tlv); break; case QOS_INFO: PRINTM(MCMND, "STA supports wmm\n"); @@ -4216,13 +4076,14 @@ wlan_uap_cmd_add_station(pmlan_private pmpriv, PRINTM(MCMND, "STA supports 11n\n"); sta_ptr->is_11n_enabled = MTRUE; phtcap = (MrvlIETypes_HTCap_t *)tlv; - if (sta_ptr->HTcap.ieee_hdr.element_id == HT_CAPABILITY) { - if (GETHT_40MHZ_INTOLARANT - (sta_ptr->HTcap.ht_cap.ht_cap_info)) { + if (sta_ptr->HTcap.ieee_hdr.element_id == + HT_CAPABILITY) { + if (GETHT_40MHZ_INTOLARANT( + sta_ptr->HTcap.ht_cap.ht_cap_info)) { PRINTM(MCMND, "SETHT_40MHZ_INTOLARANT\n"); - SETHT_40MHZ_INTOLARANT(phtcap->ht_cap. - ht_cap_info); + SETHT_40MHZ_INTOLARANT( + phtcap->ht_cap.ht_cap_info); } } if (GETHT_MAXAMSDU(phtcap->ht_cap.ht_cap_info)) @@ -4234,11 +4095,11 @@ wlan_uap_cmd_add_station(pmlan_private pmpriv, PRINTM(MCMND, "STA supports 11ac\n"); sta_ptr->is_11ac_enabled = MTRUE; pvhtcap = (MrvlIETypes_VHTCap_t *)tlv; - if (GET_VHTCAP_MAXMPDULEN(pvhtcap->vht_cap.vht_cap_info) - == 2) + if (GET_VHTCAP_MAXMPDULEN( + pvhtcap->vht_cap.vht_cap_info) == 2) sta_ptr->max_amsdu = MLAN_TX_DATA_BUF_SIZE_12K; - else if (GET_VHTCAP_MAXMPDULEN - (pvhtcap->vht_cap.vht_cap_info) == 1) + else if (GET_VHTCAP_MAXMPDULEN( + pvhtcap->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; @@ -4309,13 +4170,10 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) +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) { HostCmd_DS_COMMAND *cmd_ptr = (HostCmd_DS_COMMAND *)pcmd_buf; mlan_private *pmpriv = (mlan_private *)priv; @@ -4461,9 +4319,8 @@ wlan_ops_uap_prepare_cmd(IN t_void *priv, 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); + cmd_ptr->size = wlan_cpu_to_le16( + sizeof(HostCmd_DS_SET_BSS_MODE) + S_DS_GEN); ret = MLAN_STATUS_SUCCESS; break; #endif @@ -4471,9 +4328,8 @@ wlan_ops_uap_prepare_cmd(IN t_void *priv, 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); + 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: @@ -4482,9 +4338,8 @@ wlan_ops_uap_prepare_cmd(IN t_void *priv, 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); + 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, @@ -4501,9 +4356,8 @@ wlan_ops_uap_prepare_cmd(IN t_void *priv, 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); + cmd_ptr->size = wlan_cpu_to_le16(sizeof(HostCmd_TX_RATE_QUERY) + + S_DS_GEN); pmpriv->tx_rate = 0; ret = MLAN_STATUS_SUCCESS; break; @@ -4574,9 +4428,8 @@ wlan_ops_uap_prepare_cmd(IN t_void *priv, case HostCmd_CMD_CHAN_REGION_CFG: cmd_ptr->command = wlan_cpu_to_le16(cmd_no); - cmd_ptr->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_CHAN_REGION_CFG) + - S_DS_GEN); + cmd_ptr->size = wlan_cpu_to_le16( + sizeof(HostCmd_DS_CHAN_REGION_CFG) + S_DS_GEN); cmd_ptr->params.reg_cfg.action = wlan_cpu_to_le16(cmd_action); break; case HostCmd_CMD_PACKET_AGGR_CTRL: @@ -4632,25 +4485,24 @@ wlan_ops_uap_prepare_cmd(IN t_void *priv, pdata_buf); break; case HostCmd_CMD_TX_AMPDU_PROT_MODE: - ret = wlan_cmd_tx_ampdu_prot_mode(pmpriv, cmd_ptr, - cmd_action, pdata_buf); + ret = wlan_cmd_tx_ampdu_prot_mode(pmpriv, cmd_ptr, cmd_action, + pdata_buf); break; case HostCmd_CMD_RATE_ADAPT_CFG: - ret = wlan_cmd_rate_adapt_cfg(pmpriv, cmd_ptr, - cmd_action, pdata_buf); + ret = wlan_cmd_rate_adapt_cfg(pmpriv, cmd_ptr, cmd_action, + pdata_buf); break; case HostCmd_CMD_CCK_DESENSE_CFG: - ret = wlan_cmd_cck_desense_cfg(pmpriv, cmd_ptr, - cmd_action, pdata_buf); + ret = wlan_cmd_cck_desense_cfg(pmpriv, cmd_ptr, cmd_action, + pdata_buf); break; case HostCmd_CHANNEL_TRPC_CONFIG: ret = wlan_cmd_get_chan_trpc_config(pmpriv, cmd_ptr, cmd_action, pdata_buf); break; case HostCmd_CMD_LOW_POWER_MODE_CFG: - ret = wlan_cmd_set_get_low_power_mode_cfg(pmpriv, cmd_ptr, - cmd_action, - pdata_buf); + ret = wlan_cmd_set_get_low_power_mode_cfg( + pmpriv, cmd_ptr, cmd_action, pdata_buf); break; case HostCmd_CMD_802_11_BAND_STEERING: ret = wlan_cmd_set_get_band_steering_cfg(pmpriv, cmd_ptr, @@ -4677,10 +4529,8 @@ wlan_ops_uap_prepare_cmd(IN t_void *priv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) +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) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_private *pmpriv = (mlan_private *)priv; @@ -4690,8 +4540,8 @@ wlan_ops_uap_process_cmdresp(IN t_void *priv, #ifdef SDIO int ctr; #endif - wlan_dfs_device_state_t *pstate_dfs = (wlan_dfs_device_state_t *) - &pmpriv->adapter->state_dfs; + wlan_dfs_device_state_t *pstate_dfs = + (wlan_dfs_device_state_t *)&pmpriv->adapter->state_dfs; t_u32 sec, usec; ENTER(); @@ -4713,11 +4563,8 @@ wlan_ops_uap_process_cmdresp(IN t_void *priv, if (!pmpriv->intf_state_11h.is_11h_host && !pstate_dfs->dfs_check_pending && pstate_dfs->dfs_check_channel) { - pmpriv->adapter->callbacks.moal_get_system_time(pmpriv-> - adapter-> - pmoal_handle, - &sec, - &usec); + pmpriv->adapter->callbacks.moal_get_system_time( + pmpriv->adapter->pmoal_handle, &sec, &usec); pstate_dfs->dfs_report_time_sec = sec; } if (pmpriv->intf_state_11h.is_11h_host) @@ -4748,7 +4595,7 @@ wlan_ops_uap_process_cmdresp(IN t_void *priv, pmpriv->adapter->tx_lock_flag = MFALSE; pmpriv->adapter->pps_uapsd_mode = MFALSE; pmpriv->adapter->delay_null_pkt = MFALSE; - /* Clear AMSDU statistics */ + /* Clear AMSDU statistics*/ pmpriv->amsdu_rx_cnt = 0; pmpriv->amsdu_tx_cnt = 0; pmpriv->msdu_in_rx_amsdu_cnt = 0; @@ -4843,12 +4690,11 @@ wlan_ops_uap_process_cmdresp(IN t_void *priv, (t_u16)wlan_le16_to_cpu(resp->params.tx_buf.buff_size); #ifdef SDIO if (IS_SD(pmadapter->card_type)) { - pmadapter->tx_buf_size = - (pmadapter->tx_buf_size / - MLAN_SDIO_BLOCK_SIZE) * MLAN_SDIO_BLOCK_SIZE; - pmadapter->pcard_sd->mp_end_port = - wlan_le16_to_cpu(resp->params.tx_buf. - mp_end_port); + pmadapter->tx_buf_size = (pmadapter->tx_buf_size / + MLAN_SDIO_BLOCK_SIZE) * + MLAN_SDIO_BLOCK_SIZE; + pmadapter->pcard_sd->mp_end_port = wlan_le16_to_cpu( + resp->params.tx_buf.mp_end_port); pmadapter->pcard_sd->mp_data_port_mask = pmadapter->pcard_sd->reg->data_port_mask; @@ -4864,8 +4710,8 @@ wlan_ops_uap_process_cmdresp(IN t_void *priv, MIN(SDIO_MP_AGGR_DEF_PKT_LIMIT, (pmadapter->pcard_sd->mp_end_port >> 1)); PRINTM(MCMND, "end port %d, data port mask %x\n", - wlan_le16_to_cpu(resp->params.tx_buf. - mp_end_port), + wlan_le16_to_cpu( + resp->params.tx_buf.mp_end_port), pmadapter->pcard_sd->mp_data_port_mask); } #endif @@ -5038,8 +4884,7 @@ wlan_ops_uap_process_cmdresp(IN t_void *priv, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ops_uap_process_event(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; @@ -5084,8 +4929,7 @@ wlan_ops_uap_process_event(IN t_void *priv) pevent = (pmlan_event)event_buf; memset(pmadapter, &pevent->event_id, 0, sizeof(pevent->event_id)); - if (eventcause != EVENT_PS_SLEEP && - eventcause != EVENT_PS_AWAKE && + 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); @@ -5166,13 +5010,13 @@ wlan_ops_uap_process_event(IN t_void *priv) #ifdef DRV_EMBEDDED_AUTHENTICATOR || IsAuthenticatorEnabled(pmpriv->psapriv) #endif - ) { + ) { 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; + pmpriv->aggr_prio_tbl[i] + .ampdu_user; else sta_ptr->ampdu_sta[i] = BA_STREAM_NOT_ALLOWED; @@ -5183,11 +5027,10 @@ wlan_ops_uap_process_event(IN t_void *priv) if (pmpriv->sec_info.wapi_enabled) wlan_update_wapi_info_tlv(pmpriv, pmbuf); #ifdef DRV_EMBEDDED_AUTHENTICATOR - /**enter authenticator*/ + /**enter authenticator*/ if (IsAuthenticatorEnabled(pmpriv->psapriv)) - AuthenticatorSendEapolPacket(pmpriv->psapriv, - sta_ptr-> - cm_connectioninfo); + AuthenticatorSendEapolPacket( + pmpriv->psapriv, sta_ptr->cm_connectioninfo); #endif pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; break; @@ -5240,9 +5083,9 @@ wlan_ops_uap_process_event(IN t_void *priv) 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); + 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"); @@ -5259,9 +5102,9 @@ wlan_ops_uap_process_event(IN t_void *priv) MIN(pmadapter->curr_tx_buf_size, wlan_le16_to_cpu(*(t_u16 *)pmadapter->event_body)); if (pmbuf->data_len == sizeof(eventcause) + sizeof(t_u32)) { - enable = wlan_le16_to_cpu(*(t_u16 *) - (pmadapter->event_body + - sizeof(t_u16))); + enable = wlan_le16_to_cpu( + *(t_u16 *)(pmadapter->event_body + + sizeof(t_u16))); if (enable) pmpriv->amsdu_disable = MFALSE; else @@ -5285,18 +5128,19 @@ wlan_ops_uap_process_event(IN t_void *priv) pevent->event_id = MLAN_EVENT_ID_DRV_PASSTHRU; pevent->event_len = pmbuf->data_len; memcpy_ext(pmadapter, (t_u8 *)pevent->event_buf, - pmbuf->pbuf + pmbuf->data_offset, - pevent->event_len, pevent->event_len); + pmbuf->pbuf + pmbuf->data_offset, pevent->event_len, + pevent->event_len); wlan_recv_event(pmpriv, pevent->event_id, pevent); - pevent->event_id = 0; /* clear to avoid resending at end of fcn */ + pevent->event_id = 0; /* clear to avoid resending at end of fcn + */ /* Print event data */ pevent->event_id = MLAN_EVENT_ID_FW_RADAR_DETECTED; pevent->event_len = pmbuf->data_len - sizeof(eventcause); memcpy_ext(pmadapter, (t_u8 *)pevent->event_buf, pmbuf->pbuf + pmbuf->data_offset + - sizeof(eventcause), pevent->event_len, - pevent->event_len); + sizeof(eventcause), + pevent->event_len, pevent->event_len); wlan_11h_print_event_radar_detected(pmpriv, pevent, &channel); *((t_u8 *)pevent->event_buf) = channel; if (!pmpriv->intf_state_11h.is_11h_host) { @@ -5305,27 +5149,27 @@ wlan_ops_uap_process_event(IN t_void *priv) wlan_11h_radar_detected_handling(pmadapter, pmpriv); if (pmpriv->uap_host_based) - wlan_recv_event(priv, - MLAN_EVENT_ID_FW_RADAR_DETECTED, - pevent); + wlan_recv_event( + priv, + MLAN_EVENT_ID_FW_RADAR_DETECTED, + pevent); } else { PRINTM(MEVENT, "Ignore Event Radar Detected - handling" " already in progress.\n"); } } else { - - if (pmpriv->adapter->dfs_test_params. - no_channel_change_on_radar || - pmpriv->adapter->dfs_test_params. - fixed_new_channel_on_radar) { + if (pmpriv->adapter->dfs_test_params + .no_channel_change_on_radar || + pmpriv->adapter->dfs_test_params + .fixed_new_channel_on_radar) { if (pmadapter->state_rdh.stage == RDH_OFF || pmadapter->state_rdh.stage == - RDH_SET_CUSTOM_IE) { + RDH_SET_CUSTOM_IE) { pmadapter->state_rdh.stage = RDH_CHK_INTFS; - wlan_11h_radar_detected_handling - (pmadapter, pmpriv); + wlan_11h_radar_detected_handling( + pmadapter, pmpriv); } else PRINTM(MEVENT, "Ignore Event Radar Detected - handling already in progress.\n"); @@ -5334,11 +5178,11 @@ wlan_ops_uap_process_event(IN t_void *priv) wlan_recv_event(priv, MLAN_EVENT_ID_FW_RADAR_DETECTED, pevent); - } } - pevent->event_id = 0; /* clear to avoid resending at end of fcn */ + pevent->event_id = 0; /* clear to avoid resending at end of fcn + */ break; case EVENT_CHANNEL_REPORT_RDY: PRINTM_NETINTF(MEVENT, pmpriv); @@ -5351,8 +5195,8 @@ wlan_ops_uap_process_event(IN t_void *priv) /* Copy event data */ memcpy_ext(pmadapter, (t_u8 *)pevent->event_buf, pmbuf->pbuf + pmbuf->data_offset + - sizeof(eventcause), pevent->event_len, - pevent->event_len); + sizeof(eventcause), + pevent->event_len, pevent->event_len); /* Handle / pass event data, and free buffer */ ret = wlan_11h_handle_event_chanrpt_ready(pmpriv, pevent, &channel); @@ -5381,14 +5225,15 @@ wlan_ops_uap_process_event(IN t_void *priv) pmpriv->uap_channel = channel; pmpriv->uap_state_chan_cb.channel = pchan_info->channel; pmpriv->uap_state_chan_cb.bandcfg = pchan_info->bandcfg; - if (wlan_11h_radar_detect_required(pmpriv, pchan_info->channel)) { + if (wlan_11h_radar_detect_required(pmpriv, + pchan_info->channel)) { if (!wlan_11h_is_active(pmpriv)) { /* active 11h extention in Fw */ 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_11h_check_update_radar_det_state( + pmpriv); } if (pmpriv->uap_host_based) pmpriv->intf_state_11h.is_11h_host = MTRUE; @@ -5396,11 +5241,9 @@ wlan_ops_uap_process_event(IN t_void *priv) pchan_info->channel); } if ((pmpriv->adapter->state_rdh.stage != RDH_OFF && - !pmpriv->intf_state_11h.is_11h_host) - || pmpriv->adapter->dfs_test_params. - no_channel_change_on_radar || - pmpriv->adapter->dfs_test_params. - fixed_new_channel_on_radar) { + !pmpriv->intf_state_11h.is_11h_host) || + pmpriv->adapter->dfs_test_params.no_channel_change_on_radar || + pmpriv->adapter->dfs_test_params.fixed_new_channel_on_radar) { /* Handle embedded DFS */ if (pmpriv->adapter->state_rdh.stage == RDH_SET_CUSTOM_IE) { @@ -5419,7 +5262,7 @@ wlan_ops_uap_process_event(IN t_void *priv) pevent->event_id = MLAN_EVENT_ID_FW_CHAN_SWITCH_COMPLETE; pevent->event_len = sizeof(chan_band_info); - pchan_band_info = (chan_band_info *) pevent->event_buf; + pchan_band_info = (chan_band_info *)pevent->event_buf; /* Copy event data */ memcpy_ext(pmadapter, (t_u8 *)&pchan_band_info->bandcfg, (t_u8 *)&pchan_info->bandcfg, @@ -5428,10 +5271,10 @@ wlan_ops_uap_process_event(IN t_void *priv) pchan_band_info->channel = pchan_info->channel; if (pchan_band_info->bandcfg.chanWidth == CHAN_BW_80MHZ) pchan_band_info->center_chan = - wlan_get_center_freq_idx(priv, BAND_AAC, - pchan_info-> - channel, - CHANNEL_BW_80MHZ); + wlan_get_center_freq_idx( + priv, BAND_AAC, + pchan_info->channel, + CHANNEL_BW_80MHZ); pchan_band_info->is_11n_enabled = pmpriv->is_11n_enabled; wlan_recv_event(pmpriv, @@ -5453,15 +5296,15 @@ wlan_ops_uap_process_event(IN t_void *priv) pevent->bss_index = pmpriv->bss_index; pevent->event_id = MLAN_EVENT_ID_FW_DEBUG_INFO; pevent->event_len = pmbuf->data_len - sizeof(eventcause); - memcpy_ext(pmadapter, - (t_u8 *)pevent->event_buf, + memcpy_ext(pmadapter, (t_u8 *)pevent->event_buf, pmbuf->pbuf + pmbuf->data_offset + - sizeof(eventcause), pevent->event_len, - pevent->event_len); + sizeof(eventcause), + pevent->event_len, pevent->event_len); PRINTM(MEVENT, "EVENT: FW Debug Info %s\n", (t_u8 *)pevent->event_buf); wlan_recv_event(pmpriv, pevent->event_id, pevent); - pevent->event_id = 0; /* clear to avoid resending at end of fcn */ + pevent->event_id = 0; /* clear to avoid resending at end of fcn + */ break; case EVENT_TX_STATUS_REPORT: PRINTM(MINFO, "EVENT: TX_STATUS\n"); @@ -5473,8 +5316,8 @@ wlan_ops_uap_process_event(IN t_void *priv) break; case EVENT_EXCEED_MAX_P2P_CONN: event_excd_p2p = - (event_exceed_max_p2p_conn *) (pmbuf->pbuf + - pmbuf->data_offset); + (event_exceed_max_p2p_conn *)(pmbuf->pbuf + + pmbuf->data_offset); PRINTM(MEVENT, "EVENT: EXCEED MAX P2P CONNECTION\n"); PRINTM(MEVENT, "REQUEST P2P MAC: " MACSTR "\n", MAC2STR(event_excd_p2p->peer_mac_addr)); @@ -5492,9 +5335,9 @@ wlan_ops_uap_process_event(IN t_void *priv) break; } PRINTM(MEVENT, "EVENT: EVENT_FW_HANG_REPORT reasoncode=%d\n", - wlan_le16_to_cpu(*(t_u16 *) - (pmbuf->pbuf + pmbuf->data_offset + - sizeof(eventcause)))); + wlan_le16_to_cpu(*(t_u16 *)(pmbuf->pbuf + + pmbuf->data_offset + + sizeof(eventcause)))); pmadapter->fw_hang_report = MTRUE; wlan_recv_event(pmpriv, MLAN_EVENT_ID_DRV_DBG_DUMP, MNULL); break; @@ -5526,8 +5369,8 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_PENDING or MLAN_STATUS_FAILURE */ -mlan_status -wlan_uap_set_uap_max_sta(IN pmlan_private pmpriv, IN t_u8 uap_max_sta) +mlan_status wlan_uap_set_uap_max_sta(IN pmlan_private pmpriv, + IN t_u8 uap_max_sta) { MrvlIEtypes_uap_max_sta_cnt_t tlv_uap_max_sta; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -5552,8 +5395,7 @@ wlan_uap_set_uap_max_sta(IN pmlan_private pmpriv, IN t_u8 uap_max_sta) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_PENDING or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ops_uap_init_cmd(IN t_void *priv, IN t_u8 first_bss) +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; @@ -5574,9 +5416,8 @@ wlan_ops_uap_init_cmd(IN t_void *priv, IN t_u8 first_bss) } if (pmpriv->adapter->init_para.uap_max_sta && (pmpriv->adapter->init_para.uap_max_sta <= MAX_STA_COUNT)) - wlan_uap_set_uap_max_sta(pmpriv, - pmpriv->adapter->init_para. - uap_max_sta); + wlan_uap_set_uap_max_sta( + pmpriv, pmpriv->adapter->init_para.uap_max_sta); ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_SYS_CONFIGURE, HostCmd_ACT_GEN_GET, 0, MNULL, MNULL); @@ -5585,7 +5426,7 @@ wlan_ops_uap_init_cmd(IN t_void *priv, IN t_u8 first_bss) goto done; } last_cmd = HOST_CMD_APCMD_SYS_CONFIGURE; - /** set last_init_cmd */ + /** set last_init_cmd */ if (last_cmd) { pmpriv->adapter->last_init_cmd = last_cmd; ret = MLAN_STATUS_PENDING; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_uap_ioctl.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_uap_ioctl.c index 90793fcdb876..23e425172940 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_uap_ioctl.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_uap_ioctl.c @@ -55,19 +55,17 @@ extern t_u8 tos_to_tid_inv[]; * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_uap_bss_ioctl_stop(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_uap_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]; ENTER(); - ret = wlan_prepare_cmd(pmpriv, - HOST_CMD_APCMD_BSS_STOP, - HostCmd_ACT_GEN_SET, - 0, (t_void *)pioctl_req, MNULL); + 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; @@ -75,8 +73,7 @@ wlan_uap_bss_ioctl_stop(IN pmlan_adapter pmadapter, return ret; } -static t_bool -wlan_can_radar_det_skip(mlan_private *priv) +static t_bool wlan_can_radar_det_skip(mlan_private *priv) { mlan_private *priv_list[MLAN_MAX_BSS_NUM]; mlan_private *pmpriv; @@ -99,7 +96,6 @@ wlan_can_radar_det_skip(mlan_private *priv) } return MFALSE; } - /** * @brief Callback to finish BSS IOCTL START * Not to be called directly to initiate bss_start @@ -109,8 +105,7 @@ wlan_can_radar_det_skip(mlan_private *priv) * @return MLAN_STATUS_PENDING --success, otherwise fail * @sa wlan_uap_bss_ioctl_start */ -static mlan_status -wlan_uap_callback_bss_ioctl_start(IN t_void *priv) +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; @@ -142,25 +137,23 @@ wlan_uap_callback_bss_ioctl_start(IN t_void *priv) PRINTM(MERROR, "BSS start is blocked when DFS-repeater\n" "mode is on and STA is not connected\n"); - pcb->moal_ioctl_complete(pmpriv->adapter-> - pmoal_handle, - puap_state_chan_cb-> - pioctl_req_curr, - MLAN_STATUS_FAILURE); + pcb->moal_ioctl_complete( + pmpriv->adapter->pmoal_handle, + puap_state_chan_cb->pioctl_req_curr, + MLAN_STATUS_FAILURE); goto done; } else { /* STA is connected. - * Skip DFS check for bss_start since its a repeater - * mode + * Skip DFS check for bss_start since its a + * repeater mode */ goto prep_bss_start; } } /* first check if channel is under NOP */ - if (wlan_11h_is_channel_under_nop(pmpriv->adapter, - puap_state_chan_cb-> - channel)) { + 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; under_nop = MTRUE; @@ -168,50 +161,43 @@ wlan_uap_callback_bss_ioctl_start(IN t_void *priv) /* Check cached radar check on the channel */ if (ret == MLAN_STATUS_SUCCESS) - ret = wlan_11h_check_chan_report(pmpriv, - puap_state_chan_cb-> - channel); + 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); + ret = wlan_11h_switch_non_dfs_chan( + pmpriv, &puap_state_chan_cb->channel); if (ret == MLAN_STATUS_SUCCESS) { - - wlan_11h_update_bandcfg(&pmpriv-> - uap_state_chan_cb. - bandcfg, - puap_state_chan_cb-> - channel); + wlan_11h_update_bandcfg( + &pmpriv->uap_state_chan_cb.bandcfg, + puap_state_chan_cb->channel); PRINTM(MCMD_D, "NOP: uap band config:0x%x channel=%d\n", pmpriv->uap_state_chan_cb.bandcfg, puap_state_chan_cb->channel); - ret = wlan_uap_set_channel(pmpriv, - pmpriv-> - uap_state_chan_cb. - bandcfg, - puap_state_chan_cb-> - channel); + ret = wlan_uap_set_channel( + pmpriv, + pmpriv->uap_state_chan_cb.bandcfg, + puap_state_chan_cb->channel); if (ret == MLAN_STATUS_SUCCESS) { if (under_nop) { PRINTM(MMSG, "Channel %d under NOP," " switched to new channel %d successfully.\n", old_channel, - puap_state_chan_cb-> - channel); + puap_state_chan_cb + ->channel); } else { PRINTM(MMSG, "Radar found on channel %d," " switched to new channel %d successfully.\n", old_channel, - puap_state_chan_cb-> - channel); + puap_state_chan_cb + ->channel); } } else { if (under_nop) { @@ -219,22 +205,21 @@ wlan_uap_callback_bss_ioctl_start(IN t_void *priv) "Channel %d under NOP," " switch to new channel %d failed.\n", old_channel, - puap_state_chan_cb-> - 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); + puap_state_chan_cb + ->channel); } - pcb->moal_ioctl_complete(pmpriv-> - adapter-> - pmoal_handle, - puap_state_chan_cb-> - pioctl_req_curr, - MLAN_STATUS_FAILURE); + pcb->moal_ioctl_complete( + pmpriv->adapter->pmoal_handle, + puap_state_chan_cb + ->pioctl_req_curr, + MLAN_STATUS_FAILURE); goto done; } } else { @@ -247,12 +232,12 @@ wlan_uap_callback_bss_ioctl_start(IN t_void *priv) "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); + /* 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 { @@ -263,17 +248,15 @@ wlan_uap_callback_bss_ioctl_start(IN t_void *priv) prep_bss_start: /* 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, + 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 */ + puap_state_chan_cb->pioctl_req_curr = MNULL; /* prevent re-use */ LEAVE(); return ret; } @@ -289,9 +272,8 @@ done: /** * @sa wlan_uap_callback_bss_ioctl_start */ -static mlan_status -wlan_uap_bss_ioctl_start(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_uap_bss_ioctl_start(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]; @@ -305,9 +287,10 @@ wlan_uap_bss_ioctl_start(IN pmlan_adapter pmadapter, pmpriv->intf_state_11h.is_11h_active) { /* if FW supports ACS+DFS then sequence is different */ - /* 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 */ + /* 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; @@ -316,10 +299,9 @@ wlan_uap_bss_ioctl_start(IN pmlan_adapter pmadapter, if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; } else { - ret = wlan_prepare_cmd(pmpriv, - HOST_CMD_APCMD_BSS_START, - HostCmd_ACT_GEN_SET, - 0, (t_void *)pioctl_req, MNULL); + ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_BSS_START, + HostCmd_ACT_GEN_SET, 0, + (t_void *)pioctl_req, MNULL); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; } @@ -336,9 +318,8 @@ wlan_uap_bss_ioctl_start(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_uap_bss_ioctl_reset(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_uap_bss_ioctl_reset(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]; @@ -363,18 +344,17 @@ wlan_uap_bss_ioctl_reset(IN pmlan_adapter pmadapter, } pmpriv->aggr_prio_tbl[6].ampdu_user = pmpriv->aggr_prio_tbl[7].ampdu_user = BA_STREAM_NOT_ALLOWED; - pmpriv->addba_reject[6] = - pmpriv->addba_reject[7] = ADDBA_RSP_STATUS_REJECT; + pmpriv->addba_reject[6] = pmpriv->addba_reject[7] = + ADDBA_RSP_STATUS_REJECT; /* 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); + 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; @@ -383,26 +363,24 @@ wlan_uap_bss_ioctl_reset(IN pmlan_adapter pmadapter, } /** -* @brief This function to process add station. -* -* @param pmadapter A pointer to pmadapter. -* -* @param pioctl_req A pointer to pioctl_req -* -* @return MLAN_STATUS_SUCCESS/MLAN_STATUS_FAILURE -*/ -mlan_status -wlan_uap_bss_ioctl_add_station(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) + * @brief This function to process add station. + * + * @param pmadapter A pointer to pmadapter. + * + * @param pioctl_req A pointer to pioctl_req + * + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_FAILURE + */ +mlan_status wlan_uap_bss_ioctl_add_station(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; ENTER(); - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_ADD_NEW_STATION, - HostCmd_ACT_ADD_STA, - 0, (t_void *)pioctl_req, MNULL); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_ADD_NEW_STATION, + HostCmd_ACT_ADD_STA, 0, (t_void *)pioctl_req, + MNULL); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -419,9 +397,8 @@ wlan_uap_bss_ioctl_add_station(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_uap_bss_ioctl_mac_address(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_uap_bss_ioctl_mac_address(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_bss *bss = MNULL; @@ -438,8 +415,8 @@ wlan_uap_bss_ioctl_mac_address(IN pmlan_adapter pmadapter, } 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); + 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; @@ -473,8 +450,8 @@ wlan_uap_bss_ioctl_uap_wmm_param(IN pmlan_adapter pmadapter, 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); + 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; @@ -508,8 +485,8 @@ wlan_uap_bss_ioctl_uap_scan_channels(IN pmlan_adapter pmadapter, 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); + 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; @@ -526,9 +503,8 @@ wlan_uap_bss_ioctl_uap_scan_channels(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_uap_bss_ioctl_uap_channel(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_uap_bss_ioctl_uap_channel(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_ds_bss *bss = MNULL; @@ -543,8 +519,8 @@ wlan_uap_bss_ioctl_uap_channel(IN pmlan_adapter pmadapter, 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); + 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; @@ -572,8 +548,8 @@ wlan_uap_bss_ioctl_uap_oper_ctrl(IN pmlan_adapter pmadapter, ENTER(); - if (pmadapter->fw_ver == HOST_API_VERSION_V15 - && pmadapter->fw_min_ver >= FW_MINOR_VERSION_1) { + if (pmadapter->fw_ver == HOST_API_VERSION_V15 && + pmadapter->fw_min_ver >= FW_MINOR_VERSION_1) { bss = (mlan_ds_bss *)pioctl_req->pbuf; if (pioctl_req->action == MLAN_ACT_SET) cmd_action = HostCmd_ACT_GEN_SET; @@ -601,18 +577,17 @@ wlan_uap_bss_ioctl_uap_oper_ctrl(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_uap_get_stats(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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]; ENTER(); - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_SNMP_MIB, - HostCmd_ACT_GEN_GET, - 0, (t_void *)pioctl_req, MNULL); + 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; @@ -628,9 +603,8 @@ wlan_uap_get_stats(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_uap_get_stats_log(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_uap_get_stats_log(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { pmlan_private pmpriv = MNULL; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -657,10 +631,9 @@ wlan_uap_get_stats_log(IN pmlan_adapter pmadapter, } /* 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); + 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; @@ -678,9 +651,8 @@ exit: * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_uap_bss_ioctl_config(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) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -694,8 +666,8 @@ wlan_uap_bss_ioctl_config(IN pmlan_adapter pmadapter, 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); + 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; @@ -712,42 +684,35 @@ wlan_uap_bss_ioctl_config(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_uap_bss_ioctl_deauth_sta(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_uap_bss_ioctl_deauth_sta(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 = MNULL; - const t_u8 bc_mac[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + const t_u8 bc_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; sta_node *sta_ptr = MNULL; ENTER(); bss = (mlan_ds_bss *)pioctl_req->pbuf; if (pmpriv->uap_host_based & UAP_FLAG_HOST_MLME) { - if (memcmp - (pmpriv->adapter, bss->param.deauth_param.mac_addr, bc_mac, - MLAN_MAC_ADDR_LENGTH)) { - sta_ptr = - wlan_get_station_entry(pmpriv, - bss->param.deauth_param. - mac_addr); + if (memcmp(pmpriv->adapter, bss->param.deauth_param.mac_addr, + bc_mac, MLAN_MAC_ADDR_LENGTH)) { + sta_ptr = wlan_get_station_entry( + pmpriv, bss->param.deauth_param.mac_addr); if (!sta_ptr) { PRINTM(MCMND, "Skip deauth to station " MACSTR "\n", - MAC2STR(bss->param.deauth_param. - mac_addr)); + MAC2STR(bss->param.deauth_param + .mac_addr)); LEAVE(); return ret; } } } - ret = wlan_prepare_cmd(pmpriv, - HOST_CMD_APCMD_STA_DEAUTH, - HostCmd_ACT_GEN_SET, - 0, - (t_void *)pioctl_req, + 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; @@ -764,8 +729,8 @@ wlan_uap_bss_ioctl_deauth_sta(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_uap_get_sta_list(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -773,10 +738,9 @@ wlan_uap_get_sta_list(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) 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); + 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; @@ -793,19 +757,17 @@ wlan_uap_get_sta_list(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_uap_misc_ioctl_soft_reset(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) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; ENTER(); - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_SOFT_RESET, - HostCmd_ACT_GEN_SET, - 0, (t_void *)pioctl_req, MNULL); + 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; @@ -836,11 +798,8 @@ wlan_uap_misc_ioctl_txdatapause(IN pmlan_adapter pmadapter, 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, + 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; @@ -857,9 +816,8 @@ wlan_uap_misc_ioctl_txdatapause(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_uap_pm_ioctl_mode(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_uap_pm_ioctl_mode(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; @@ -886,16 +844,14 @@ wlan_uap_pm_ioctl_mode(IN pmlan_adapter pmadapter, 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, + 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); + 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; @@ -912,8 +868,8 @@ wlan_uap_pm_ioctl_mode(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_uap_set_wapi_ie(mlan_private *priv, pmlan_ioctl_req pioctl_req) +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; @@ -963,11 +919,11 @@ wlan_uap_set_wapi_ie(mlan_private *priv, pmlan_ioctl_req pioctl_req) * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ -static mlan_status -wlan_uap_misc_ioctl_gen_ie(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_uap_misc_ioctl_gen_ie(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]; @@ -981,9 +937,8 @@ wlan_uap_misc_ioctl_gen_ie(IN pmlan_adapter pmadapter, 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; + 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); @@ -1005,9 +960,8 @@ wlan_uap_misc_ioctl_gen_ie(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_uap_sec_ioctl_wapi_enable(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_uap_sec_ioctl_wapi_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]; @@ -1053,11 +1007,8 @@ wlan_uap_sec_ioctl_report_mic_error(IN pmlan_adapter pmadapter, ENTER(); sec = (mlan_ds_sec_cfg *)pioctl_req->pbuf; - ret = wlan_prepare_cmd(pmpriv, - HOST_CMD_APCMD_REPORT_MIC, - HostCmd_ACT_GEN_SET, - 0, - (t_void *)pioctl_req, + ret = wlan_prepare_cmd(pmpriv, HOST_CMD_APCMD_REPORT_MIC, + HostCmd_ACT_GEN_SET, 0, (t_void *)pioctl_req, (t_void *)sec->param.sta_mac); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -1072,7 +1023,8 @@ wlan_uap_sec_ioctl_report_mic_error(IN pmlan_adapter pmadapter, * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, + * otherwise fail */ static mlan_status wlan_uap_sec_ioctl_set_encrypt_key(IN pmlan_adapter pmadapter, @@ -1095,10 +1047,8 @@ wlan_uap_sec_ioctl_set_encrypt_key(IN pmlan_adapter pmadapter, LEAVE(); return ret; } - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_KEY_MATERIAL, - HostCmd_ACT_GEN_SET, - KEY_INFO_ENABLED, + 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) @@ -1115,8 +1065,8 @@ wlan_uap_sec_ioctl_set_encrypt_key(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_uap_get_bss_info(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -1154,11 +1104,11 @@ wlan_uap_get_bss_info(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCES/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCES/MLAN_STATUS_PENDING --success, + * otherwise fail */ -static mlan_status -wlan_uap_pm_ioctl_deepsleep(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) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; @@ -1192,8 +1142,8 @@ wlan_uap_pm_ioctl_deepsleep(IN pmlan_adapter pmadapter, LEAVE(); return MLAN_STATUS_FAILURE; } - if (((mlan_ds_pm_cfg *)pioctl_req->pbuf)->param.auto_deep_sleep. - auto_ds == DEEP_SLEEP_ON) { + 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"); @@ -1202,17 +1152,15 @@ wlan_uap_pm_ioctl_deepsleep(IN pmlan_adapter pmadapter, 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) + 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; + ((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, + 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; @@ -1227,11 +1175,11 @@ wlan_uap_pm_ioctl_deepsleep(IN pmlan_adapter pmadapter, * @param pmadapter A pointer to mlan_adapter structure * @param pioctl_req A pointer to ioctl request buffer * - * @return MLAN_STATUS_SUCCES/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCES/MLAN_STATUS_PENDING --success, + * otherwise fail */ -static mlan_status -wlan_misc_band_steering_cfg(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_misc_band_steering_cfg(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]; @@ -1267,8 +1215,8 @@ wlan_misc_band_steering_cfg(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_uap_snmp_mib_11d(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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]; @@ -1313,8 +1261,7 @@ wlan_uap_snmp_mib_11d(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * @return MLAN_STATUS_PENDING --success, otherwise fail * @sa wlan_uap_domain_info */ -static mlan_status -wlan_uap_callback_domain_info(IN t_void *priv) +static mlan_status wlan_uap_callback_domain_info(IN t_void *priv) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_private *pmpriv = (mlan_private *)priv; @@ -1334,13 +1281,12 @@ wlan_uap_callback_domain_info(IN t_void *priv) return ret; } cfg11d = (mlan_ds_11d_cfg *)puap_state_chan_cb->pioctl_req_curr->pbuf; - band = (puap_state_chan_cb->bandcfg.chanBand == - BAND_5GHZ) ? BAND_A : BAND_B; + band = (puap_state_chan_cb->bandcfg.chanBand == BAND_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); + 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 { @@ -1351,7 +1297,7 @@ wlan_uap_callback_domain_info(IN t_void *priv) MLAN_STATUS_FAILURE); } - puap_state_chan_cb->pioctl_req_curr = MNULL; /* prevent re-use */ + puap_state_chan_cb->pioctl_req_curr = MNULL; /* prevent re-use */ LEAVE(); return ret; } @@ -1365,8 +1311,8 @@ wlan_uap_callback_domain_info(IN t_void *priv) * @return MLAN_STATUS_PENDING --success, otherwise fail * @sa wlan_uap_callback_domain_info */ -static mlan_status -wlan_uap_domain_info(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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]; @@ -1412,8 +1358,7 @@ wlan_uap_domain_info(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * @return MLAN_STATUS_SUCCESS/PENDING --success, otherwise fail * @sa wlan_uap_11h_channel_check_req */ -static mlan_status -wlan_uap_callback_11h_channel_check_req(IN t_void *priv) +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; @@ -1434,10 +1379,10 @@ wlan_uap_callback_11h_channel_check_req(IN t_void *priv) */ if ((puap_state_chan_cb->bandcfg.chanBand == BAND_5GHZ) && !wlan_can_radar_det_skip(pmpriv) && - wlan_11h_radar_detect_required(pmpriv, puap_state_chan_cb->channel) - && !wlan_11h_is_channel_under_nop(pmpriv->adapter, - puap_state_chan_cb->channel)) { - + 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 @@ -1447,16 +1392,16 @@ wlan_uap_callback_11h_channel_check_req(IN t_void *priv) ret = wlan_11h_check_update_radar_det_state(pmpriv); /* Check for radar on the channel */ - ret = wlan_11h_issue_radar_detect(pmpriv, - pioctl, + ret = wlan_11h_issue_radar_detect(pmpriv, pioctl, puap_state_chan_cb->channel, *pband_cfg); 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_COMPLETE); + /* No command sent with the ioctl, need manually signal + * completion */ + pcb->moal_ioctl_complete(pmpriv->adapter->pmoal_handle, pioctl, + MLAN_STATUS_COMPLETE); } LEAVE(); @@ -1472,9 +1417,8 @@ wlan_uap_callback_11h_channel_check_req(IN t_void *priv) * @return MLAN_STATUS_PENDING --success, otherwise fail * @sa wlan_uap_callback_11h_channel_check_req */ -static mlan_status -wlan_uap_11h_channel_check_req(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_uap_11h_channel_check_req(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]; @@ -1494,8 +1438,9 @@ wlan_uap_11h_channel_check_req(IN pmlan_adapter pmadapter, p11h_cfg->param.chan_rpt_req.host_based; if (!pmpriv->intf_state_11h.is_11h_host) { - /* store params, issue command to get UAP channel, whose CMD_RESP will - * callback remainder of 11H channel check handling */ + /* 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; @@ -1511,23 +1456,21 @@ wlan_uap_11h_channel_check_req(IN pmlan_adapter pmadapter, ret = wlan_11h_check_update_radar_det_state(pmpriv); } if (p11h_cfg->param.chan_rpt_req.millisec_dwell_time) { - if (pmpriv->adapter->dfs_test_params. - user_cac_period_msec) { + if (pmpriv->adapter->dfs_test_params + .user_cac_period_msec) { PRINTM(MCMD_D, "cfg80211 dfs_testing - user CAC period=%d (msec)\n", - pmpriv->adapter->dfs_test_params. - user_cac_period_msec); - p11h_cfg->param.chan_rpt_req. - millisec_dwell_time = - pmpriv->adapter->dfs_test_params. - user_cac_period_msec; + pmpriv->adapter->dfs_test_params + .user_cac_period_msec); + p11h_cfg->param.chan_rpt_req + .millisec_dwell_time = + pmpriv->adapter->dfs_test_params + .user_cac_period_msec; } - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_CHAN_REPORT_REQUEST, - HostCmd_ACT_GEN_SET, 0, - (t_void *)pioctl_req, - (t_void *)&p11h_cfg->param. - chan_rpt_req); + ret = wlan_prepare_cmd( + pmpriv, HostCmd_CMD_CHAN_REPORT_REQUEST, + HostCmd_ACT_GEN_SET, 0, (t_void *)pioctl_req, + (t_void *)&p11h_cfg->param.chan_rpt_req); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -1547,12 +1490,12 @@ wlan_uap_11h_channel_check_req(IN pmlan_adapter pmadapter, * @return MLAN_STATUS_PENDING --success, otherwise fail * @sa wlan_uap_snmp_mib_11h */ -static mlan_status -wlan_uap_callback_snmp_mib_11h(IN t_void *priv) +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_callbacks *pcb = (mlan_callbacks *)&pmpriv->adapter->callbacks; mlan_ds_snmp_mib *snmp; t_bool enable_11h; @@ -1566,11 +1509,18 @@ wlan_uap_callback_snmp_mib_11h(IN t_void *priv) if (enable_11h) { if ((puap_state_chan_cb->bandcfg.chanBand == BAND_5GHZ) && !wlan_can_radar_det_skip(pmpriv) && - wlan_11h_radar_detect_required(pmpriv, - puap_state_chan_cb-> - channel)) { + 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); + } else { + puap_state_chan_cb->pioctl_req_curr->status_code = + MLAN_STATUS_SUCCESS; + pcb->moal_ioctl_complete( + pmpriv->adapter->pmoal_handle, + puap_state_chan_cb->pioctl_req_curr, + MLAN_STATUS_SUCCESS); + goto done; } } @@ -1580,8 +1530,8 @@ wlan_uap_callback_snmp_mib_11h(IN t_void *priv) 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 */ +done: + puap_state_chan_cb->pioctl_req_curr = MNULL; /* prevent re-use */ LEAVE(); return ret; } @@ -1595,8 +1545,8 @@ wlan_uap_callback_snmp_mib_11h(IN t_void *priv) * @return MLAN_STATUS_PENDING --success, otherwise fail * @sa wlan_uap_callback_snmp_mib_11h */ -static mlan_status -wlan_uap_snmp_mib_11h(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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]; @@ -1650,9 +1600,8 @@ wlan_uap_snmp_mib_11h(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_uap_bss_ioctl_acs_scan(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_uap_bss_ioctl_acs_scan(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1685,8 +1634,7 @@ wlan_uap_bss_ioctl_acs_scan(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_uap_get_channel(IN pmlan_private pmpriv) +mlan_status wlan_uap_get_channel(IN pmlan_private pmpriv) { MrvlIEtypes_channel_band_t tlv_chan_band; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1694,8 +1642,8 @@ wlan_uap_get_channel(IN pmlan_private pmpriv) 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.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); @@ -1712,9 +1660,8 @@ wlan_uap_get_channel(IN pmlan_private pmpriv) * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_uap_set_channel(IN pmlan_private pmpriv, - IN Band_Config_t uap_band_cfg, IN t_u8 channel) +mlan_status wlan_uap_set_channel(IN pmlan_private pmpriv, + IN Band_Config_t uap_band_cfg, IN t_u8 channel) { MrvlIEtypes_channel_band_t tlv_chan_band; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1722,8 +1669,8 @@ wlan_uap_set_channel(IN pmlan_private pmpriv, 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.header.len = sizeof(MrvlIEtypes_channel_band_t) - + sizeof(MrvlIEtypesHeader_t); tlv_chan_band.bandcfg = uap_band_cfg; tlv_chan_band.channel = channel; @@ -1740,8 +1687,7 @@ wlan_uap_set_channel(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_uap_get_beacon_dtim(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)]; @@ -1754,16 +1700,15 @@ wlan_uap_get_beacon_dtim(IN pmlan_private pmpriv) 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_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 = + (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); + 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); @@ -1779,9 +1724,8 @@ wlan_uap_get_beacon_dtim(IN pmlan_private pmpriv) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -mlan_status -wlan_uap_snmp_mib_ctrl_deauth(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +mlan_status wlan_uap_snmp_mib_ctrl_deauth(IN pmlan_adapter pmadapter, + IN pmlan_ioctl_req pioctl_req) { mlan_private *pmpriv = pmadapter->priv[pioctl_req->bss_index]; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1798,11 +1742,9 @@ wlan_uap_snmp_mib_ctrl_deauth(IN pmlan_adapter pmadapter, } /* Send command to firmware */ - ret = wlan_prepare_cmd(pmpriv, - HostCmd_CMD_802_11_SNMP_MIB, - cmd_action, - StopDeauth_i, - (t_void *)pioctl_req, &mib->param.deauthctrl); + ret = wlan_prepare_cmd(pmpriv, HostCmd_CMD_802_11_SNMP_MIB, cmd_action, + StopDeauth_i, (t_void *)pioctl_req, + &mib->param.deauthctrl); if (ret == MLAN_STATUS_SUCCESS) ret = MLAN_STATUS_PENDING; @@ -1819,8 +1761,7 @@ wlan_uap_snmp_mib_ctrl_deauth(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_ops_uap_ioctl(t_void *adapter, pmlan_ioctl_req pioctl_req) +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; @@ -1851,8 +1792,8 @@ wlan_ops_uap_ioctl(t_void *adapter, pmlan_ioctl_req 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); + 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); @@ -1860,17 +1801,16 @@ wlan_ops_uap_ioctl(t_void *adapter, pmlan_ioctl_req pioctl_req) 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); + 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) { - util_enqueue_list_tail(pmadapter->pmoal_handle, - &pmadapter->ioctl_pending_q, - (pmlan_linked_list)pioctl_req, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock); + util_enqueue_list_tail( + pmadapter->pmoal_handle, + &pmadapter->ioctl_pending_q, + (pmlan_linked_list)pioctl_req, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); pmadapter->pending_ioctl = MTRUE; status = MLAN_STATUS_PENDING; } @@ -1887,8 +1827,8 @@ wlan_ops_uap_ioctl(t_void *adapter, pmlan_ioctl_req pioctl_req) status = wlan_uap_bss_ioctl_uap_wmm_param(pmadapter, pioctl_req); else if (bss->sub_command == MLAN_OID_UAP_SCAN_CHANNELS) - status = wlan_uap_bss_ioctl_uap_scan_channels(pmadapter, - pioctl_req); + status = wlan_uap_bss_ioctl_uap_scan_channels( + pmadapter, pioctl_req); else if (bss->sub_command == MLAN_OID_UAP_CHANNEL) status = wlan_uap_bss_ioctl_uap_channel(pmadapter, pioctl_req); @@ -1928,8 +1868,8 @@ wlan_ops_uap_ioctl(t_void *adapter, pmlan_ioctl_req pioctl_req) 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); + 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_GET_UAP_STATS_LOG) @@ -1982,17 +1922,17 @@ wlan_ops_uap_ioctl(t_void *adapter, pmlan_ioctl_req pioctl_req) pmadapter->hw_he_cap, pmadapter->hw_hecap_len, sizeof(pget_info->param.fw_info.hw_he_cap)); - memcpy_ext(pmadapter, - pget_info->param.fw_info.hw_2g_he_cap, - pmadapter->hw_2g_he_cap, - pmadapter->hw_2g_hecap_len, - sizeof(pget_info->param.fw_info. - hw_2g_he_cap)); + memcpy_ext( + pmadapter, + pget_info->param.fw_info.hw_2g_he_cap, + pmadapter->hw_2g_he_cap, + pmadapter->hw_2g_hecap_len, + sizeof(pget_info->param.fw_info.hw_2g_he_cap)); pget_info->param.fw_info.region_code = pmadapter->region_code; pget_info->param.fw_info.fw_supplicant_support = IS_FW_SUPPORT_SUPPLICANT(pmadapter) ? 0x01 : - 0x00; + 0x00; pget_info->param.fw_info.antinfo = pmadapter->antinfo; pget_info->param.fw_info.max_ap_assoc_sta = pmadapter->max_sta_conn; @@ -2008,17 +1948,16 @@ wlan_ops_uap_ioctl(t_void *adapter, pmlan_ioctl_req pioctl_req) 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); + status = + wlan_misc_ioctl_host_cmd(pmadapter, pioctl_req); if (misc->sub_command == MLAN_OID_MISC_REGION) status = wlan_misc_ioctl_region(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); + 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); @@ -2037,8 +1976,8 @@ wlan_ops_uap_ioctl(t_void *adapter, pmlan_ioctl_req pioctl_req) pioctl_req); #ifdef RX_PACKET_COALESCE if (misc->sub_command == MLAN_OID_MISC_RX_PACKET_COALESCE) - status = wlan_misc_ioctl_rx_pkt_coalesce_config - (pmadapter, pioctl_req); + status = wlan_misc_ioctl_rx_pkt_coalesce_config( + pmadapter, pioctl_req); #endif #ifdef WIFI_DIRECT_SUPPORT if (misc->sub_command == MLAN_OID_MISC_WIFI_DIRECT_CONFIG) @@ -2064,8 +2003,8 @@ wlan_ops_uap_ioctl(t_void *adapter, pmlan_ioctl_req pioctl_req) if (misc->sub_command == MLAN_OID_MISC_GET_CHAN_REGION_CFG) status = wlan_misc_chan_reg_cfg(pmadapter, pioctl_req); if (misc->sub_command == MLAN_OID_MISC_OPER_CLASS_CHECK) - status = wlan_misc_ioctl_operclass_validation(pmadapter, - pioctl_req); + status = wlan_misc_ioctl_operclass_validation( + pmadapter, pioctl_req); if (misc->sub_command == MLAN_OID_MISC_OPER_CLASS) status = wlan_misc_ioctl_oper_class(pmadapter, pioctl_req); @@ -2097,8 +2036,8 @@ wlan_ops_uap_ioctl(t_void *adapter, pmlan_ioctl_req pioctl_req) if (misc->sub_command == MLAN_OID_MISC_DMCS_CONFIG) status = wlan_misc_dmcs_config(pmadapter, pioctl_req); if (misc->sub_command == MLAN_OID_MISC_GET_TX_RX_HISTOGRAM) - status = wlan_get_tx_rx_histogram(pmadapter, - pioctl_req); + status = + wlan_get_tx_rx_histogram(pmadapter, pioctl_req); if (misc->sub_command == MLAN_OID_MISC_CFP_INFO) status = wlan_get_cfpinfo(pmadapter, pioctl_req); if (misc->sub_command == MLAN_OID_MISC_BOOT_SLEEP) @@ -2155,8 +2094,8 @@ wlan_ops_uap_ioctl(t_void *adapter, pmlan_ioctl_req pioctl_req) status = wlan_uap_sec_ioctl_wapi_enable(pmadapter, pioctl_req); if (sec->sub_command == MLAN_OID_SEC_CFG_REPORT_MIC_ERR) - status = wlan_uap_sec_ioctl_report_mic_error(pmadapter, - pioctl_req); + status = wlan_uap_sec_ioctl_report_mic_error( + pmadapter, pioctl_req); break; case MLAN_IOCTL_11N_CFG: status = wlan_11n_cfg_ioctl(pmadapter, pioctl_req); @@ -2166,8 +2105,8 @@ wlan_ops_uap_ioctl(t_void *adapter, pmlan_ioctl_req pioctl_req) if (cfg11d->sub_command == MLAN_OID_11D_DOMAIN_INFO) status = wlan_uap_domain_info(pmadapter, pioctl_req); else if (cfg11d->sub_command == MLAN_OID_11D_DOMAIN_INFO_EXT) - status = wlan_11d_cfg_domain_info(pmadapter, - pioctl_req); + status = + wlan_11d_cfg_domain_info(pmadapter, pioctl_req); break; case MLAN_IOCTL_11H_CFG: cfg11h = (mlan_ds_11h_cfg *)pioctl_req->pbuf; @@ -2178,14 +2117,17 @@ wlan_ops_uap_ioctl(t_void *adapter, pmlan_ioctl_req pioctl_req) status = wlan_11h_ioctl_dfs_testing(pmadapter, pioctl_req); if (cfg11h->sub_command == MLAN_OID_11H_CHAN_NOP_INFO) - status = wlan_11h_ioctl_get_channel_nop_info(pmadapter, - pioctl_req); + status = wlan_11h_ioctl_get_channel_nop_info( + pmadapter, pioctl_req); if (cfg11h->sub_command == MLAN_OID_11H_CHAN_REPORT_REQUEST) - status = wlan_11h_ioctl_dfs_cancel_chan_report(pmpriv, - pioctl_req); + status = wlan_11h_ioctl_dfs_cancel_chan_report( + pmpriv, pioctl_req); if (cfg11h->sub_command == MLAN_OID_11H_CHAN_SWITCH_COUNT) status = wlan_11h_ioctl_chan_switch_count(pmadapter, pioctl_req); + if (cfg11h->sub_command == MLAN_OID_11H_DFS_W53_CFG) + status = wlan_11h_ioctl_dfs_w53_cfg(pmadapter, + pioctl_req); break; case MLAN_IOCTL_RADIO_CFG: radiocfg = (mlan_ds_radio_cfg *)pioctl_req->pbuf; @@ -2199,8 +2141,8 @@ wlan_ops_uap_ioctl(t_void *adapter, pmlan_ioctl_req pioctl_req) status = wlan_radio_ioctl_remain_chan_cfg(pmadapter, pioctl_req); if (radiocfg->sub_command == MLAN_OID_ANT_CFG) - status = wlan_radio_ioctl_ant_cfg(pmadapter, - pioctl_req); + status = + wlan_radio_ioctl_ant_cfg(pmadapter, pioctl_req); if (radiocfg->sub_command == MLAN_OID_BAND_CFG) status = wlan_radio_ioctl_band_cfg(pmadapter, pioctl_req); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_uap_txrx.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_uap_txrx.c index e483b99411c9..cb5ceea12dea 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_uap_txrx.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_uap_txrx.c @@ -53,8 +53,8 @@ Change log: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_upload_uap_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) +static mlan_status wlan_upload_uap_rx_packet(pmlan_adapter pmadapter, + pmlan_buffer pmbuf) { mlan_status ret = MLAN_STATUS_SUCCESS; #ifdef DEBUG_LEVEL1 @@ -102,7 +102,6 @@ wlan_upload_uap_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) LEAVE(); return ret; - } /** @@ -111,10 +110,10 @@ wlan_upload_uap_rx_packet(pmlan_adapter pmadapter, pmlan_buffer pmbuf) * @param priv A pointer to mlan_private * @param mac mac address to find in station list table * - * @return MLAN_STATUS_FAILURE -- drop packet, otherwise forward to network stack + * @return MLAN_STATUS_FAILURE -- drop packet, otherwise forward to + * network stack */ -static mlan_status -wlan_check_unicast_packet(mlan_private *priv, t_u8 *mac) +static mlan_status wlan_check_unicast_packet(mlan_private *priv, t_u8 *mac) { int j; sta_node *sta_ptr = MNULL; @@ -150,7 +149,6 @@ wlan_check_unicast_packet(mlan_private *priv, t_u8 *mac) LEAVE(); return ret; } - /******************************************************** Global Functions ********************************************************/ @@ -162,8 +160,7 @@ wlan_check_unicast_packet(mlan_private *priv, t_u8 *mac) * * @return headptr or MNULL */ -t_void * -wlan_ops_uap_process_txpd(IN t_void *priv, IN pmlan_buffer pmbuf) +t_void *wlan_ops_uap_process_txpd(IN t_void *priv, IN pmlan_buffer pmbuf) { pmlan_private pmpriv = (pmlan_private)priv; TxPD *plocal_tx_pd; @@ -190,8 +187,8 @@ wlan_ops_uap_process_txpd(IN t_void *priv, IN pmlan_buffer pmbuf) pmbuf->data_offset += sizeof(pkt_type) + sizeof(tx_control); pmbuf->data_len -= sizeof(pkt_type) + sizeof(tx_control); } - if (pmbuf->data_offset < (sizeof(TxPD) + pmpriv->intf_hr_len + - DMA_ALIGNMENT)) { + if (pmbuf->data_offset < + (sizeof(TxPD) + pmpriv->intf_hr_len + DMA_ALIGNMENT)) { PRINTM(MERROR, "not enough space for TxPD: headroom=%d pkt_len=%d, required=%d\n", pmbuf->data_offset, pmbuf->data_len, @@ -203,9 +200,8 @@ wlan_ops_uap_process_txpd(IN t_void *priv, IN pmlan_buffer pmbuf) } /* head_ptr should be aligned */ - head_ptr = - pmbuf->pbuf + pmbuf->data_offset - sizeof(TxPD) - - pmpriv->intf_hr_len; + head_ptr = pmbuf->pbuf + pmbuf->data_offset - sizeof(TxPD) - + pmpriv->intf_hr_len; head_ptr = (t_u8 *)((t_ptr)head_ptr & ~((t_ptr)(DMA_ALIGNMENT - 1))); plocal_tx_pd = (TxPD *)(head_ptr + pmpriv->intf_hr_len); @@ -227,10 +223,8 @@ wlan_ops_uap_process_txpd(IN t_void *priv, IN pmlan_buffer pmbuf) * 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]; + plocal_tx_pd->tx_control = + pmpriv->wmm.user_pri_pkt_tx_ctrl[plocal_tx_pd->priority]; if (pmbuf->flags & MLAN_BUF_FLAG_TX_STATUS) { plocal_tx_pd->tx_control_1 |= pmbuf->tx_seq_num << 8; @@ -238,9 +232,8 @@ wlan_ops_uap_process_txpd(IN t_void *priv, IN pmlan_buffer pmbuf) } /* Offset of actual data */ - plocal_tx_pd->tx_pkt_offset = - (t_u16)((t_ptr)pmbuf->pbuf + pmbuf->data_offset - - (t_ptr)plocal_tx_pd); + 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 */ @@ -257,9 +250,10 @@ wlan_ops_uap_process_txpd(IN t_void *priv, IN pmlan_buffer pmbuf) pmbuf->pbuf + pmbuf->data_offset, sizeof(dst_mac), sizeof(dst_mac)); plocal_tx_pd->tx_control |= - (wlan_ieee_rateid_to_mrvl_rateid - (pmpriv, pmbuf->u.tx_info.data_rate, - dst_mac) << 16); + (wlan_ieee_rateid_to_mrvl_rateid( + pmpriv, pmbuf->u.tx_info.data_rate, + dst_mac) + << 16); plocal_tx_pd->tx_control |= TXPD_TXRATE_ENABLE; } plocal_tx_pd->tx_control_1 |= pmbuf->u.tx_info.channel << 21; @@ -271,8 +265,8 @@ wlan_ops_uap_process_txpd(IN t_void *priv, IN pmlan_buffer pmbuf) plocal_tx_pd->tx_control |= (t_u32)pmbuf->u.tx_info.tx_power.val; if (pmbuf->u.tx_info.retry_limit) { - plocal_tx_pd->tx_control |= - pmbuf->u.tx_info.retry_limit << 8; + plocal_tx_pd->tx_control |= pmbuf->u.tx_info.retry_limit + << 8; plocal_tx_pd->tx_control |= TXPD_RETRY_ENABLE; } } @@ -298,8 +292,8 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_ops_uap_process_rx_packet(IN t_void *adapter, 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; @@ -312,7 +306,7 @@ wlan_ops_uap_process_rx_packet(IN t_void *adapter, IN pmlan_buffer pmbuf) t_u16 rx_pkt_type = 0; sta_node *sta_ptr = MNULL; #ifdef DRV_EMBEDDED_AUTHENTICATOR - t_u8 eapol_type[2] = { 0x88, 0x8e }; + t_u8 eapol_type[2] = {0x88, 0x8e}; #endif t_u16 adj_rx_rate = 0; t_u8 antenna = 0; @@ -351,8 +345,9 @@ wlan_ops_uap_process_rx_packet(IN t_void *adapter, IN pmlan_buffer pmbuf) (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); + " 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; pmadapter->ops.data_complete(pmadapter, pmbuf, ret); @@ -365,21 +360,17 @@ wlan_ops_uap_process_rx_packet(IN t_void *adapter, IN pmlan_buffer pmbuf) /* 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 = (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), - (RxPD *)prx_pd); + 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), + (RxPD *)prx_pd); pmadapter->ops.data_complete(pmadapter, pmbuf, ret); goto done; } @@ -390,17 +381,11 @@ wlan_ops_uap_process_rx_packet(IN t_void *adapter, IN pmlan_buffer pmbuf) if (priv->bss_type == MLAN_BSS_TYPE_UAP) { antenna = wlan_adjust_antenna(priv, (RxPD *)prx_pd); - adj_rx_rate = - wlan_adjust_data_rate(priv, priv->rxpd_rate, - priv->rxpd_rate_info); - pmadapter->callbacks.moal_hist_data_add(pmadapter-> - pmoal_handle, - pmbuf-> - bss_index, - adj_rx_rate, - prx_pd->snr, - prx_pd->nf, - antenna); + adj_rx_rate = wlan_adjust_data_rate( + priv, priv->rxpd_rate, priv->rxpd_rate_info); + pmadapter->callbacks.moal_hist_data_add( + pmadapter->pmoal_handle, pmbuf->bss_index, + adj_rx_rate, prx_pd->snr, prx_pd->nf, antenna); } } @@ -408,22 +393,20 @@ wlan_ops_uap_process_rx_packet(IN t_void *adapter, IN pmlan_buffer pmbuf) if (sta_ptr) { sta_ptr->snr = prx_pd->snr; sta_ptr->nf = prx_pd->nf; - pmadapter->callbacks.moal_get_system_time(pmadapter-> - pmoal_handle, - &last_rx_sec, - &last_rx_usec); + pmadapter->callbacks.moal_get_system_time( + pmadapter->pmoal_handle, &last_rx_sec, &last_rx_usec); sta_ptr->stats.last_rx_in_msec = - (t_u64)last_rx_sec *1000 + (t_u64)last_rx_usec / 1000; + (t_u64)last_rx_sec * 1000 + (t_u64)last_rx_usec / 1000; } + #ifdef DRV_EMBEDDED_AUTHENTICATOR - /**process eapol packet for uap*/ + /**process eapol packet for uap*/ if (IsAuthenticatorEnabled(priv->psapriv) && - (!memcmp(pmadapter, &prx_pkt->eth803_hdr.h803_len, - eapol_type, sizeof(eapol_type)))) { - ret = AuthenticatorProcessEapolPacket(priv->psapriv, - ((t_u8 *)prx_pd + - prx_pd->rx_pkt_offset), - prx_pd->rx_pkt_length); + (!memcmp(pmadapter, &prx_pkt->eth803_hdr.h803_len, eapol_type, + sizeof(eapol_type)))) { + ret = AuthenticatorProcessEapolPacket( + priv->psapriv, ((t_u8 *)prx_pd + prx_pd->rx_pkt_offset), + prx_pd->rx_pkt_length); if (ret == MLAN_STATUS_SUCCESS) { pmadapter->ops.data_complete(pmadapter, pmbuf, ret); goto done; @@ -444,10 +427,9 @@ wlan_ops_uap_process_rx_packet(IN t_void *adapter, IN pmlan_buffer pmbuf) } /* 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) - )) { + (!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 @@ -455,9 +437,9 @@ wlan_ops_uap_process_rx_packet(IN t_void *adapter, IN pmlan_buffer pmbuf) goto done; } /* Reorder and send to OS */ - ret = mlan_11n_rxreorder_pkt(priv, prx_pd->seq_num, - prx_pd->priority, ta, - (t_u8)prx_pd->rx_pkt_type, (void *)pmbuf); + ret = mlan_11n_rxreorder_pkt(priv, prx_pd->seq_num, prx_pd->priority, + ta, (t_u8)prx_pd->rx_pkt_type, + (void *)pmbuf); if (ret || (rx_pkt_type == PKT_TYPE_BAR)) { pmadapter->ops.data_complete(pmadapter, pmbuf, ret); } @@ -475,8 +457,7 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_uap_recv_packet(IN mlan_private *priv, 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; @@ -501,9 +482,10 @@ wlan_uap_recv_packet(IN mlan_private *priv, IN pmlan_buffer pmbuf) if (prx_pkt->eth803_hdr.dest_addr[0] & 0x01) { if (!(priv->pkt_fwd & PKT_FWD_INTRA_BCAST)) { /* Multicast pkt */ - newbuf = wlan_alloc_mlan_buffer(pmadapter, - MLAN_TX_DATA_BUF_SIZE_2K, - 0, MOAL_MALLOC_BUFFER); + newbuf = + wlan_alloc_mlan_buffer(pmadapter, + MLAN_TX_DATA_BUF_SIZE_2K, + 0, MOAL_MALLOC_BUFFER); if (newbuf) { newbuf->bss_index = pmbuf->bss_index; newbuf->buf_type = pmbuf->buf_type; @@ -513,47 +495,45 @@ wlan_uap_recv_packet(IN mlan_private *priv, IN pmlan_buffer pmbuf) newbuf->data_offset = (sizeof(TxPD) + priv->intf_hr_len + DMA_ALIGNMENT); - util_scalar_increment(pmadapter->pmoal_handle, - &pmadapter-> - pending_bridge_pkts, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock); + util_scalar_increment( + pmadapter->pmoal_handle, + &pmadapter->pending_bridge_pkts, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); newbuf->flags |= MLAN_BUF_FLAG_BRIDGE_BUF; /* copy the data */ memcpy_ext(pmadapter, (t_u8 *)newbuf->pbuf + - newbuf->data_offset, + newbuf->data_offset, pmbuf->pbuf + pmbuf->data_offset, pmbuf->data_len, MLAN_TX_DATA_BUF_SIZE_2K); newbuf->data_len = pmbuf->data_len; wlan_wmm_add_buf_txqueue(pmadapter, newbuf); - if (util_scalar_read(pmadapter->pmoal_handle, - &pmadapter-> - pending_bridge_pkts, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock) > + if (util_scalar_read( + pmadapter->pmoal_handle, + &pmadapter->pending_bridge_pkts, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks + .moal_spin_unlock) > RX_HIGH_THRESHOLD) wlan_drop_tx_pkts(priv); - wlan_recv_event(priv, - MLAN_EVENT_ID_DRV_DEFER_HANDLING, - MNULL); + wlan_recv_event( + priv, MLAN_EVENT_ID_DRV_DEFER_HANDLING, + MNULL); } } } else { if ((!(priv->pkt_fwd & PKT_FWD_INTRA_UCAST)) && - (wlan_get_station_entry - (priv, prx_pkt->eth803_hdr.dest_addr))) { + (wlan_get_station_entry(priv, + prx_pkt->eth803_hdr.dest_addr))) { /* Intra BSS packet */ - newbuf = wlan_alloc_mlan_buffer(pmadapter, - MLAN_TX_DATA_BUF_SIZE_2K, - 0, MOAL_MALLOC_BUFFER); + newbuf = + wlan_alloc_mlan_buffer(pmadapter, + MLAN_TX_DATA_BUF_SIZE_2K, + 0, MOAL_MALLOC_BUFFER); if (newbuf) { newbuf->bss_index = pmbuf->bss_index; newbuf->buf_type = pmbuf->buf_type; @@ -563,42 +543,38 @@ wlan_uap_recv_packet(IN mlan_private *priv, IN pmlan_buffer pmbuf) newbuf->data_offset = (sizeof(TxPD) + priv->intf_hr_len + DMA_ALIGNMENT); - util_scalar_increment(pmadapter->pmoal_handle, - &pmadapter-> - pending_bridge_pkts, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock); + util_scalar_increment( + pmadapter->pmoal_handle, + &pmadapter->pending_bridge_pkts, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); newbuf->flags |= MLAN_BUF_FLAG_BRIDGE_BUF; /* copy the data */ memcpy_ext(pmadapter, (t_u8 *)newbuf->pbuf + - newbuf->data_offset, + newbuf->data_offset, pmbuf->pbuf + pmbuf->data_offset, pmbuf->data_len, MLAN_TX_DATA_BUF_SIZE_2K); newbuf->data_len = pmbuf->data_len; wlan_wmm_add_buf_txqueue(pmadapter, newbuf); - if (util_scalar_read(pmadapter->pmoal_handle, - &pmadapter-> - pending_bridge_pkts, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock) > + if (util_scalar_read( + pmadapter->pmoal_handle, + &pmadapter->pending_bridge_pkts, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks + .moal_spin_unlock) > RX_HIGH_THRESHOLD) wlan_drop_tx_pkts(priv); - wlan_recv_event(priv, - MLAN_EVENT_ID_DRV_DEFER_HANDLING, - MNULL); + wlan_recv_event( + priv, MLAN_EVENT_ID_DRV_DEFER_HANDLING, + MNULL); } goto done; } else if (MLAN_STATUS_FAILURE == - wlan_check_unicast_packet(priv, - prx_pkt->eth803_hdr. - dest_addr)) { + 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)); @@ -606,7 +582,7 @@ wlan_uap_recv_packet(IN mlan_private *priv, IN pmlan_buffer pmbuf) } } upload: - /** send packet to moal */ + /** send packet to moal */ ret = pmadapter->callbacks.moal_recv_packet(pmadapter->pmoal_handle, pmbuf); done: @@ -623,8 +599,8 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_process_uap_rx_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; @@ -659,9 +635,10 @@ wlan_process_uap_rx_packet(IN mlan_private *priv, IN pmlan_buffer pmbuf) if (prx_pkt->eth803_hdr.dest_addr[0] & 0x01) { if (!(priv->pkt_fwd & PKT_FWD_INTRA_BCAST)) { /* Multicast pkt */ - newbuf = wlan_alloc_mlan_buffer(pmadapter, - MLAN_TX_DATA_BUF_SIZE_2K, - 0, MOAL_MALLOC_BUFFER); + newbuf = + wlan_alloc_mlan_buffer(pmadapter, + MLAN_TX_DATA_BUF_SIZE_2K, + 0, MOAL_MALLOC_BUFFER); if (newbuf) { newbuf->bss_index = pmbuf->bss_index; newbuf->buf_type = pmbuf->buf_type; @@ -671,53 +648,50 @@ wlan_process_uap_rx_packet(IN mlan_private *priv, IN pmlan_buffer pmbuf) newbuf->data_offset = (sizeof(TxPD) + priv->intf_hr_len + DMA_ALIGNMENT); - util_scalar_increment(pmadapter->pmoal_handle, - &pmadapter-> - pending_bridge_pkts, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock); + util_scalar_increment( + pmadapter->pmoal_handle, + &pmadapter->pending_bridge_pkts, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); newbuf->flags |= MLAN_BUF_FLAG_BRIDGE_BUF; /* copy the data, skip rxpd */ memcpy_ext(pmadapter, (t_u8 *)newbuf->pbuf + - newbuf->data_offset, + newbuf->data_offset, pmbuf->pbuf + pmbuf->data_offset + - prx_pd->rx_pkt_offset, + prx_pd->rx_pkt_offset, pmbuf->data_len - - prx_pd->rx_pkt_offset, + prx_pd->rx_pkt_offset, MLAN_TX_DATA_BUF_SIZE_2K); newbuf->data_len = pmbuf->data_len - prx_pd->rx_pkt_offset; wlan_wmm_add_buf_txqueue(pmadapter, newbuf); - if (util_scalar_read(pmadapter->pmoal_handle, - &pmadapter-> - pending_bridge_pkts, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock) > + if (util_scalar_read( + pmadapter->pmoal_handle, + &pmadapter->pending_bridge_pkts, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks + .moal_spin_unlock) > RX_HIGH_THRESHOLD) wlan_drop_tx_pkts(priv); - wlan_recv_event(priv, - MLAN_EVENT_ID_DRV_DEFER_HANDLING, - MNULL); + wlan_recv_event( + priv, MLAN_EVENT_ID_DRV_DEFER_HANDLING, + MNULL); } } } else { if ((!(priv->pkt_fwd & PKT_FWD_INTRA_UCAST)) && - (wlan_get_station_entry - (priv, prx_pkt->eth803_hdr.dest_addr))) { + (wlan_get_station_entry(priv, + prx_pkt->eth803_hdr.dest_addr))) { /* Forwarding Intra-BSS packet */ #ifdef USB if (IS_USB(pmadapter->card_type)) { if (pmbuf->flags & MLAN_BUF_FLAG_RX_DEAGGR) { - newbuf = wlan_alloc_mlan_buffer - (pmadapter, - MLAN_TX_DATA_BUF_SIZE_2K, 0, - MOAL_MALLOC_BUFFER); + newbuf = wlan_alloc_mlan_buffer( + pmadapter, + MLAN_TX_DATA_BUF_SIZE_2K, 0, + MOAL_MALLOC_BUFFER); if (newbuf) { newbuf->bss_index = pmbuf->bss_index; @@ -733,59 +707,50 @@ wlan_process_uap_rx_packet(IN mlan_private *priv, IN pmlan_buffer pmbuf) (sizeof(TxPD) + priv->intf_hr_len + DMA_ALIGNMENT); - util_scalar_increment - (pmadapter-> - pmoal_handle, - &pmadapter-> - pending_bridge_pkts, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock); + util_scalar_increment( + pmadapter->pmoal_handle, + &pmadapter->pending_bridge_pkts, + pmadapter->callbacks + .moal_spin_lock, + pmadapter->callbacks + .moal_spin_unlock); newbuf->flags |= MLAN_BUF_FLAG_BRIDGE_BUF; /* copy the data, skip rxpd */ - memcpy_ext(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, - pmbuf->data_len - - prx_pd-> - rx_pkt_offset); + memcpy_ext( + 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, + 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 (util_scalar_read - (pmadapter->pmoal_handle, - &pmadapter-> - pending_bridge_pkts, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock) > + wlan_wmm_add_buf_txqueue( + pmadapter, newbuf); + if (util_scalar_read( + pmadapter->pmoal_handle, + &pmadapter->pending_bridge_pkts, + pmadapter->callbacks + .moal_spin_lock, + pmadapter->callbacks + .moal_spin_unlock) > RX_HIGH_THRESHOLD) wlan_drop_tx_pkts(priv); - wlan_recv_event(priv, - MLAN_EVENT_ID_DRV_DEFER_HANDLING, - MNULL); + wlan_recv_event( + priv, + MLAN_EVENT_ID_DRV_DEFER_HANDLING, + MNULL); } - pmadapter->callbacks. - moal_recv_complete(pmadapter-> - pmoal_handle, - pmbuf, - pmadapter-> - rx_data_ep, - ret); + pmadapter->callbacks.moal_recv_complete( + pmadapter->pmoal_handle, pmbuf, + pmadapter->rx_data_ep, ret); goto done; } } @@ -793,28 +758,25 @@ wlan_process_uap_rx_packet(IN mlan_private *priv, IN pmlan_buffer pmbuf) pmbuf->data_len -= prx_pd->rx_pkt_offset; pmbuf->data_offset += prx_pd->rx_pkt_offset; pmbuf->flags |= MLAN_BUF_FLAG_BRIDGE_BUF; - util_scalar_increment(pmadapter->pmoal_handle, - &pmadapter->pending_bridge_pkts, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock); + util_scalar_increment( + pmadapter->pmoal_handle, + &pmadapter->pending_bridge_pkts, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock); wlan_wmm_add_buf_txqueue(pmadapter, pmbuf); - if (util_scalar_read(pmadapter->pmoal_handle, - &pmadapter->pending_bridge_pkts, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock) > + if (util_scalar_read( + pmadapter->pmoal_handle, + &pmadapter->pending_bridge_pkts, + pmadapter->callbacks.moal_spin_lock, + pmadapter->callbacks.moal_spin_unlock) > RX_HIGH_THRESHOLD) wlan_drop_tx_pkts(priv); wlan_recv_event(priv, MLAN_EVENT_ID_DRV_DEFER_HANDLING, MNULL); goto done; } else if (MLAN_STATUS_FAILURE == - wlan_check_unicast_packet(priv, - prx_pkt->eth803_hdr. - dest_addr)) { + 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; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_usb.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_usb.c index 30777336ef7f..e41bda46ac2d 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_usb.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_usb.c @@ -99,8 +99,7 @@ static const struct _mlan_card_info mlan_card_info_usb9097 = { * @param rev_id A pointer to chip revision id * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_usb_check_revision(mlan_adapter *pmadapter, t_u32 *rev_id) +mlan_status wlan_usb_check_revision(mlan_adapter *pmadapter, t_u32 *rev_id) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -174,8 +173,8 @@ cleanup: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -wlan_usb_prog_fw_w_helper(IN pmlan_adapter pmadapter, IN pmlan_fw_image pmfw) +static mlan_status wlan_usb_prog_fw_w_helper(IN pmlan_adapter pmadapter, + IN pmlan_fw_image pmfw) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_callbacks pcb = &pmadapter->callbacks; @@ -243,25 +242,25 @@ wlan_usb_prog_fw_w_helper(IN pmlan_adapter pmadapter, IN pmlan_fw_image pmfw) sizeof(FWHeader)); DataLength = 0; } else { - /* Copy the header of the firmware data to get the length */ + /* Copy the header of the firmware data to get the + * length */ if (firmware) memcpy_ext(pmadapter, &fwdata->fw_header, &firmware[TotalBytes], sizeof(FWHeader), sizeof(fwdata->fw_header)); else - pcb->moal_get_fw_data(pmadapter->pmoal_handle, - TotalBytes, - sizeof(FWHeader), - (t_u8 *)&fwdata-> - fw_header); + pcb->moal_get_fw_data( + pmadapter->pmoal_handle, TotalBytes, + sizeof(FWHeader), + (t_u8 *)&fwdata->fw_header); DataLength = wlan_le32_to_cpu(fwdata->fw_header.data_length); DnldCmd = wlan_le32_to_cpu(fwdata->fw_header.dnld_cmd); TotalBytes += sizeof(FWHeader); - /** CMD 7 don't have data_length field */ + /** CMD 7 don't have data_length field */ if (DnldCmd == FW_CMD_4 || DnldCmd == FW_CMD_6 || DnldCmd == FW_CMD_7 || DnldCmd == FW_CMD_10) DataLength = 0; @@ -297,10 +296,10 @@ wlan_usb_prog_fw_w_helper(IN pmlan_adapter pmadapter, IN pmlan_fw_image pmfw) mbuf.pbuf = (t_u8 *)fwdata; mbuf.data_len = length; /* Send the firmware block */ - ret = pcb->moal_write_data_sync(pmadapter->pmoal_handle, - &mbuf, - pmadapter->tx_cmd_ep, - MLAN_USB_BULK_MSG_TIMEOUT); + ret = pcb->moal_write_data_sync( + pmadapter->pmoal_handle, &mbuf, + pmadapter->tx_cmd_ep, + MLAN_USB_BULK_MSG_TIMEOUT); if (ret != MLAN_STATUS_SUCCESS) { PRINTM(MERROR, "fw_dnld: write_data failed, ret %d\n", @@ -313,10 +312,10 @@ wlan_usb_prog_fw_w_helper(IN pmlan_adapter pmadapter, IN pmlan_fw_image pmfw) mbuf.data_len = FW_DNLD_RX_BUF_SIZE; /* Receive the firmware block response */ - ret = pcb->moal_read_data_sync(pmadapter->pmoal_handle, - &mbuf, - pmadapter->rx_cmd_ep, - MLAN_USB_BULK_MSG_TIMEOUT); + ret = pcb->moal_read_data_sync( + pmadapter->pmoal_handle, &mbuf, + pmadapter->rx_cmd_ep, + MLAN_USB_BULK_MSG_TIMEOUT); if (ret != MLAN_STATUS_SUCCESS) { PRINTM(MERROR, "fw_dnld: read_data failed, ret %d\n", @@ -326,7 +325,8 @@ wlan_usb_prog_fw_w_helper(IN pmlan_adapter pmadapter, IN pmlan_fw_image pmfw) memcpy_ext(pmadapter, &SyncFWHeader, RecvBuff, sizeof(FWSyncHeader), sizeof(SyncFWHeader)); endian_convert_syncfwheader(&SyncFWHeader); - /* Check the first firmware block response for highest bit set */ + /* Check the first firmware block response for highest + * bit set */ if (check_winner) { if (SyncFWHeader.cmd & 0x80000000) { PRINTM(MMSG, @@ -343,7 +343,8 @@ wlan_usb_prog_fw_w_helper(IN pmlan_adapter pmadapter, IN pmlan_fw_image pmfw) /* Check the firmware block response for CRC errors */ if (SyncFWHeader.cmd) { - /* Check firmware block response for CRC and MIC errors */ + /* Check firmware block response for CRC and MIC + * errors */ if (check_fw_status) { if (SyncFWHeader.status & MBIT(0)) { PRINTM(MERROR, @@ -353,8 +354,8 @@ wlan_usb_prog_fw_w_helper(IN pmlan_adapter pmadapter, IN pmlan_fw_image pmfw) ret = MLAN_STATUS_FAILURE; continue; } - if (SyncFWHeader. - status & (MBIT(6) | MBIT(7))) { + if (SyncFWHeader.status & + (MBIT(6) | MBIT(7))) { PRINTM(MERROR, "FW received Blk with MIC error 0x%x offset\n", SyncFWHeader.status, @@ -408,9 +409,8 @@ fw_exit: * * @return Number of packets */ -static int -wlan_usb_deaggr_rx_num_pkts(pmlan_adapter pmadapter, t_u8 *pdata, - int aggr_pkt_len) +static int wlan_usb_deaggr_rx_num_pkts(pmlan_adapter pmadapter, t_u8 *pdata, + int aggr_pkt_len) { int pkt_count = 0, pkt_len; RxPD *prx_pd; @@ -418,24 +418,23 @@ wlan_usb_deaggr_rx_num_pkts(pmlan_adapter pmadapter, t_u8 *pdata, ENTER(); while (aggr_pkt_len >= sizeof(RxPD)) { prx_pd = (RxPD *)pdata; - pkt_len = wlan_le16_to_cpu(prx_pd->rx_pkt_length) - + wlan_le16_to_cpu(prx_pd->rx_pkt_offset); - if (pkt_len == 0) /* blank RxPD can be at the end */ + pkt_len = wlan_le16_to_cpu(prx_pd->rx_pkt_length) + + wlan_le16_to_cpu(prx_pd->rx_pkt_offset); + if (pkt_len == 0) /* blank RxPD can be at the end */ break; ++pkt_count; - if (aggr_pkt_len == pkt_len) /* last packet has no padding */ + if (aggr_pkt_len == pkt_len) /* last packet has no padding */ break; /* skip padding and goto next */ if (pkt_len % pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl.aggr_align) pkt_len += - (pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl. - aggr_align - - (pkt_len % - pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl. - aggr_align)); + (pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl + .aggr_align - + (pkt_len % pmadapter->pcard_usb->usb_rx_deaggr + .aggr_ctrl.aggr_align)); aggr_pkt_len -= pkt_len; pdata += pkt_len; } @@ -443,18 +442,13 @@ wlan_usb_deaggr_rx_num_pkts(pmlan_adapter pmadapter, t_u8 *pdata, return pkt_count; } -static inline t_u32 -usb_tx_aggr_pad_len(t_u32 len, usb_tx_aggr_params *pusb_tx_aggr) +static inline t_u32 usb_tx_aggr_pad_len(t_u32 len, + usb_tx_aggr_params *pusb_tx_aggr) { - return (len % pusb_tx_aggr->aggr_ctrl.aggr_align) ? (len + - (pusb_tx_aggr-> - aggr_ctrl. - aggr_align - - (len % - pusb_tx_aggr-> - aggr_ctrl. - aggr_align))) : - len; + return (len % pusb_tx_aggr->aggr_ctrl.aggr_align) ? + (len + (pusb_tx_aggr->aggr_ctrl.aggr_align - + (len % pusb_tx_aggr->aggr_ctrl.aggr_align))) : + len; } /** @@ -468,8 +462,7 @@ usb_tx_aggr_pad_len(t_u32 len, usb_tx_aggr_params *pusb_tx_aggr) * @return N/A */ static inline t_void -wlan_usb_tx_copy_buf_to_aggr(pmlan_adapter pmadapter, - pmlan_buffer pmbuf_aggr, +wlan_usb_tx_copy_buf_to_aggr(pmlan_adapter pmadapter, pmlan_buffer pmbuf_aggr, pmlan_buffer pmbuf, usb_tx_aggr_params *pusb_tx_aggr) { @@ -478,13 +471,14 @@ wlan_usb_tx_copy_buf_to_aggr(pmlan_adapter pmadapter, usb_tx_aggr_pad_len(pmbuf_aggr->data_len, pusb_tx_aggr); memcpy_ext(pmadapter, pmbuf_aggr->pbuf + pmbuf_aggr->data_offset + - pmbuf_aggr->data_len, pmbuf->pbuf + pmbuf->data_offset, - pmbuf->data_len, pmbuf->data_len); + pmbuf_aggr->data_len, + pmbuf->pbuf + pmbuf->data_offset, pmbuf->data_len, + pmbuf->data_len); pmbuf_aggr->data_len += pmbuf->data_len; LEAVE(); } -#define MLAN_TYPE_AGGR_DATA_V2 11 +#define MLAN_TYPE_AGGR_DATA_V2 11 /** * @brief Copy pmbuf to aggregation buffer * @@ -498,8 +492,7 @@ wlan_usb_tx_copy_buf_to_aggr(pmlan_adapter pmadapter, */ static inline t_void wlan_usb_tx_copy_buf_to_aggr_v2(pmlan_adapter pmadapter, - pmlan_buffer pmbuf_aggr, - pmlan_buffer pmbuf, + pmlan_buffer pmbuf_aggr, pmlan_buffer pmbuf, t_u8 last, usb_tx_aggr_params *pusb_tx_aggr) { t_u8 *payload; @@ -510,11 +503,11 @@ wlan_usb_tx_copy_buf_to_aggr_v2(pmlan_adapter pmadapter, usb_tx_aggr_pad_len(pmbuf_aggr->data_len, pusb_tx_aggr); memcpy_ext(pmadapter, pmbuf_aggr->pbuf + pmbuf_aggr->data_offset + - pmbuf_aggr->data_len, pmbuf->pbuf + pmbuf->data_offset, - pmbuf->data_len, pmbuf->data_len); - payload = - pmbuf_aggr->pbuf + pmbuf_aggr->data_offset + - pmbuf_aggr->data_len; + pmbuf_aggr->data_len, + pmbuf->pbuf + pmbuf->data_offset, pmbuf->data_len, + pmbuf->data_len); + payload = pmbuf_aggr->pbuf + pmbuf_aggr->data_offset + + pmbuf_aggr->data_len; if (last) { offset = pmbuf->data_len; *(t_u16 *)&payload[2] = @@ -545,9 +538,8 @@ wlan_usb_copy_buf_to_aggr(pmlan_adapter pmadapter, pmlan_buffer pmbuf_aggr = MNULL; t_u8 i, use_count; pmlan_buffer pmbuf_curr, pmbuf_next; - pmbuf_aggr = - wlan_alloc_mlan_buffer(pmadapter, pusb_tx_aggr->aggr_len, 0, - MOAL_MALLOC_BUFFER); + pmbuf_aggr = wlan_alloc_mlan_buffer(pmadapter, pusb_tx_aggr->aggr_len, + 0, MOAL_MALLOC_BUFFER); if (pmbuf_aggr) { pmbuf_curr = pusb_tx_aggr->pmbuf_aggr; pmbuf_aggr->bss_index = pmbuf_curr->bss_index; @@ -562,15 +554,15 @@ wlan_usb_copy_buf_to_aggr(pmlan_adapter pmadapter, if (pusb_tx_aggr->aggr_ctrl.aggr_mode == MLAN_USB_AGGR_MODE_LEN_V2) { if (i == use_count) - wlan_usb_tx_copy_buf_to_aggr_v2 - (pmadapter, pmbuf_aggr, - pmbuf_curr, MTRUE, - pusb_tx_aggr); + wlan_usb_tx_copy_buf_to_aggr_v2( + pmadapter, pmbuf_aggr, + pmbuf_curr, MTRUE, + pusb_tx_aggr); else - wlan_usb_tx_copy_buf_to_aggr_v2 - (pmadapter, pmbuf_aggr, - pmbuf_curr, MFALSE, - pusb_tx_aggr); + wlan_usb_tx_copy_buf_to_aggr_v2( + pmadapter, pmbuf_aggr, + pmbuf_curr, MFALSE, + pusb_tx_aggr); } else wlan_usb_tx_copy_buf_to_aggr(pmadapter, pmbuf_aggr, @@ -593,8 +585,7 @@ wlan_usb_copy_buf_to_aggr(pmlan_adapter pmadapter, * @param pusb_tx_aggr Pointer to usb_tx_aggr_params */ static inline t_void -wlan_usb_tx_link_buf_to_aggr(pmlan_buffer pmbuf_aggr, - pmlan_buffer pmbuf, +wlan_usb_tx_link_buf_to_aggr(pmlan_buffer pmbuf_aggr, pmlan_buffer pmbuf, usb_tx_aggr_params *pusb_tx_aggr) { /* link new buf at end of list */ @@ -615,8 +606,8 @@ wlan_usb_tx_link_buf_to_aggr(pmlan_buffer pmbuf_aggr, * @param pmadapter Pointer to mlan_adapter structure * @param pusb_tx_aggr Pointer to usb_tx_aggr_params */ -static inline t_void -wlan_usb_tx_send_aggr(pmlan_adapter pmadapter, usb_tx_aggr_params *pusb_tx_aggr) +static inline t_void wlan_usb_tx_send_aggr(pmlan_adapter pmadapter, + usb_tx_aggr_params *pusb_tx_aggr) { mlan_status ret; pmlan_buffer pmbuf_aggr = pusb_tx_aggr->pmbuf_aggr; @@ -663,11 +654,9 @@ wlan_usb_tx_send_aggr(pmlan_adapter pmadapter, usb_tx_aggr_params *pusb_tx_aggr) if (pmbuf_aggr && pmbuf_aggr->data_len) { pmadapter->data_sent = MTRUE; - ret = pmadapter->callbacks.moal_write_data_async(pmadapter-> - pmoal_handle, - pmbuf_aggr, - pusb_tx_aggr-> - port); + ret = pmadapter->callbacks.moal_write_data_async( + pmadapter->pmoal_handle, pmbuf_aggr, + pusb_tx_aggr->port); switch (ret) { case MLAN_STATUS_PRESOURCE: PRINTM(MINFO, "MLAN_STATUS_PRESOURCE is returned\n"); @@ -675,7 +664,8 @@ wlan_usb_tx_send_aggr(pmlan_adapter pmadapter, usb_tx_aggr_params *pusb_tx_aggr) case MLAN_STATUS_RESOURCE: /* Shouldn't reach here due to next condition. */ /* TODO: (maybe) How to requeue the aggregate? */ - /* It may occur when the pending tx urbs reach the high mark */ + /* It may occur when the pending tx urbs reach the high + * mark */ /* Thus, block further pkts for a bit */ PRINTM(MERROR, "Error: moal_write_data_async failed: 0x%X\n", @@ -720,8 +710,7 @@ wlan_usb_tx_send_aggr(pmlan_adapter pmadapter, usb_tx_aggr_params *pusb_tx_aggr) * @param pmadapter A pointer to mlan_adapter structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_get_usb_device(pmlan_adapter pmadapter) +mlan_status wlan_get_usb_device(pmlan_adapter pmadapter) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u16 card_type = pmadapter->card_type; @@ -782,8 +771,7 @@ wlan_get_usb_device(pmlan_adapter pmadapter) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_usb_dnld_fw(IN pmlan_adapter pmadapter, IN pmlan_fw_image pmfw) +mlan_status wlan_usb_dnld_fw(IN pmlan_adapter pmadapter, IN pmlan_fw_image pmfw) { mlan_status ret = MLAN_STATUS_SUCCESS; @@ -807,10 +795,10 @@ wlan_usb_dnld_fw(IN pmlan_adapter pmadapter, IN pmlan_fw_image pmfw) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_usb_deaggr_rx_pkt(IN pmlan_adapter pmadapter, IN pmlan_buffer pmbuf) +mlan_status wlan_usb_deaggr_rx_pkt(IN pmlan_adapter pmadapter, + IN pmlan_buffer pmbuf) { - const t_u8 zero_rx_pd[sizeof(RxPD)] = { 0 }; + const t_u8 zero_rx_pd[sizeof(RxPD)] = {0}; mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 curr_pkt_len; RxPD *prx_pd; @@ -822,13 +810,13 @@ wlan_usb_deaggr_rx_pkt(IN pmlan_adapter pmadapter, IN pmlan_buffer pmbuf) pdata = pmbuf->pbuf + pmbuf->data_offset; prx_pd = (RxPD *)pdata; - curr_pkt_len = wlan_le16_to_cpu(prx_pd->rx_pkt_length) - + wlan_le16_to_cpu(prx_pd->rx_pkt_offset); + curr_pkt_len = wlan_le16_to_cpu(prx_pd->rx_pkt_length) + + wlan_le16_to_cpu(prx_pd->rx_pkt_offset); /* if non-aggregate, just send through, don’t process here */ aggr_len = pmbuf->data_len; - if ((aggr_len == curr_pkt_len) - || (wlan_usb_deaggr_rx_num_pkts(pmadapter, pdata, aggr_len) == 1) - || (pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl.enable != MTRUE)) { + if ((aggr_len == curr_pkt_len) || + (wlan_usb_deaggr_rx_num_pkts(pmadapter, pdata, aggr_len) == 1) || + (pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl.enable != MTRUE)) { ret = wlan_handle_rx_packet(pmadapter, pmbuf); LEAVE(); return ret; @@ -875,24 +863,22 @@ wlan_usb_deaggr_rx_pkt(IN pmlan_adapter pmadapter, IN pmlan_buffer pmbuf) /* round up to next block boundary */ if (curr_pkt_len % pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl.aggr_align) - curr_pkt_len += - (pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl. - aggr_align - - (curr_pkt_len % - pmadapter->pcard_usb->usb_rx_deaggr.aggr_ctrl. - aggr_align)); + curr_pkt_len += (pmadapter->pcard_usb->usb_rx_deaggr + .aggr_ctrl.aggr_align - + (curr_pkt_len % + pmadapter->pcard_usb->usb_rx_deaggr + .aggr_ctrl.aggr_align)); /* point to next packet */ aggr_len -= curr_pkt_len; pdata += curr_pkt_len; prx_pd = (RxPD *)pdata; - curr_pkt_len = wlan_le16_to_cpu(prx_pd->rx_pkt_length) - + wlan_le16_to_cpu(prx_pd->rx_pkt_offset); + curr_pkt_len = wlan_le16_to_cpu(prx_pd->rx_pkt_length) + + wlan_le16_to_cpu(prx_pd->rx_pkt_offset); } /* free original pmbuf (since not sent for processing) */ - pmadapter->callbacks.moal_recv_complete(pmadapter->pmoal_handle, - pmbuf, pmadapter->rx_data_ep, - ret); + pmadapter->callbacks.moal_recv_complete(pmadapter->pmoal_handle, pmbuf, + pmadapter->rx_data_ep, ret); LEAVE(); return ret; } @@ -905,9 +891,8 @@ wlan_usb_deaggr_rx_pkt(IN pmlan_adapter pmadapter, IN pmlan_buffer pmbuf) * * @return MTRUE/MFALSE */ -t_u8 -wlan_is_port_tx_paused(pmlan_adapter pmadapter, - usb_tx_aggr_params *pusb_tx_aggr) +t_u8 wlan_is_port_tx_paused(pmlan_adapter pmadapter, + usb_tx_aggr_params *pusb_tx_aggr) { mlan_private *pmpriv = MNULL; t_u8 i; @@ -930,10 +915,8 @@ wlan_is_port_tx_paused(pmlan_adapter pmadapter, * @param function_context A pointer to function_context * @return N/A */ -t_void -wlan_usb_tx_aggr_timeout_func(t_void *function_context) +t_void wlan_usb_tx_aggr_timeout_func(t_void *function_context) { - usb_tx_aggr_params *pusb_tx_aggr = (usb_tx_aggr_params *)function_context; pmlan_adapter pmadapter = (mlan_adapter *)pusb_tx_aggr->phandle; @@ -942,9 +925,8 @@ wlan_usb_tx_aggr_timeout_func(t_void *function_context) ENTER(); pcb->moal_spin_lock(pmadapter->pmoal_handle, pusb_tx_aggr->paggr_lock); pusb_tx_aggr->aggr_hold_timer_is_set = MFALSE; - if (pusb_tx_aggr->pmbuf_aggr && !pmadapter->data_sent - && !wlan_is_port_tx_paused(pmadapter, pusb_tx_aggr) - ) + if (pusb_tx_aggr->pmbuf_aggr && !pmadapter->data_sent && + !wlan_is_port_tx_paused(pmadapter, pusb_tx_aggr)) wlan_usb_tx_send_aggr(pmadapter, pusb_tx_aggr); pcb->moal_spin_unlock(pmadapter->pmoal_handle, pusb_tx_aggr->paggr_lock); @@ -968,11 +950,10 @@ wlan_usb_tx_aggr_timeout_func(t_void *function_context) * in order to handle complete AFTER the aggregate is sent. * pmbuf_aggr->data_len is used to keep track of bytes aggregated so far. */ -mlan_status -wlan_usb_host_to_card_aggr(IN pmlan_adapter pmadapter, - IN pmlan_buffer pmbuf, - IN mlan_tx_param *tx_param, - IN usb_tx_aggr_params *pusb_tx_aggr) +mlan_status wlan_usb_host_to_card_aggr(IN pmlan_adapter pmadapter, + IN pmlan_buffer pmbuf, + IN mlan_tx_param *tx_param, + IN usb_tx_aggr_params *pusb_tx_aggr) { pmlan_callbacks pcb = &pmadapter->callbacks; pmlan_buffer pmbuf_aggr; @@ -1004,7 +985,8 @@ wlan_usb_host_to_card_aggr(IN pmlan_adapter pmadapter, pusb_tx_aggr->hold_timeout_msec = MLAN_USB_TX_MIN_AGGR_TIMEOUT; } else { - /* Increase timeout in milisecond if pkts are consecutive */ + /* Increase timeout in milisecond if pkts are + * consecutive */ if (pusb_tx_aggr->hold_timeout_msec < MLAN_USB_TX_MAX_AGGR_TIMEOUT) pusb_tx_aggr->hold_timeout_msec++; @@ -1017,9 +999,8 @@ wlan_usb_host_to_card_aggr(IN pmlan_adapter pmadapter, max_aggr_size = max_aggr_num = pusb_tx_aggr->aggr_ctrl.aggr_max; if (pusb_tx_aggr->aggr_ctrl.aggr_mode == MLAN_USB_AGGR_MODE_NUM) { - max_aggr_size *= - MAX(MLAN_USB_MAX_PKT_SIZE, - pusb_tx_aggr->aggr_ctrl.aggr_align); + max_aggr_size *= MAX(MLAN_USB_MAX_PKT_SIZE, + pusb_tx_aggr->aggr_ctrl.aggr_align); } if (pusb_tx_aggr->aggr_ctrl.aggr_mode == MLAN_USB_AGGR_MODE_LEN) max_aggr_num /= pusb_tx_aggr->aggr_ctrl.aggr_align; @@ -1035,25 +1016,27 @@ wlan_usb_host_to_card_aggr(IN pmlan_adapter pmadapter, } else { /* DECIDE what to do */ - aggr_len_counter = - usb_tx_aggr_pad_len(pusb_tx_aggr->aggr_len, - pusb_tx_aggr); + aggr_len_counter = usb_tx_aggr_pad_len(pusb_tx_aggr->aggr_len, + pusb_tx_aggr); if ((aggr_len_counter + pmbuf->data_len) < max_aggr_size) { - f_precopy_cur_buf = 1; /* can fit current packet in aggr */ + f_precopy_cur_buf = 1; /* can fit current packet in aggr + */ if (next_pkt_len) { - aggr_len_counter += - usb_tx_aggr_pad_len(pmbuf->data_len, - pusb_tx_aggr); + aggr_len_counter += usb_tx_aggr_pad_len( + pmbuf->data_len, pusb_tx_aggr); if ((aggr_len_counter + next_pkt_len) >= max_aggr_size) - f_send_aggr_buf = 1; /* can't fit next packet, send now */ + f_send_aggr_buf = 1; /* can't fit next + packet, send now + */ } } else { /* can't fit current packet */ if (pusb_tx_aggr->aggr_len) - f_send_aggr_buf = 1; /* send aggr first */ - f_postcopy_cur_buf = 1; /* then copy into new aggr_buf */ + f_send_aggr_buf = 1; /* send aggr first */ + f_postcopy_cur_buf = 1; /* then copy into new aggr_buf + */ } } @@ -1069,19 +1052,19 @@ wlan_usb_host_to_card_aggr(IN pmlan_adapter pmadapter, if (pmbuf_aggr->use_count + 1 >= max_aggr_num) f_send_aggr_buf = 1; - if (pmbuf->flags & MLAN_BUF_FLAG_NULL_PKT - || pmbuf->flags & MLAN_BUF_FLAG_TCP_ACK) + if (pmbuf->flags & MLAN_BUF_FLAG_NULL_PKT || + pmbuf->flags & MLAN_BUF_FLAG_TCP_ACK) f_send_aggr_buf = 1; if (f_send_aggr_buf) { PRINTM(MIF_D, "%s: Send aggregate buffer.\n", __FUNCTION__); wlan_usb_tx_send_aggr(pmadapter, pusb_tx_aggr); - pmbuf_aggr = pusb_tx_aggr->pmbuf_aggr; /* update ptr */ + pmbuf_aggr = pusb_tx_aggr->pmbuf_aggr; /* update ptr */ } if (f_postcopy_cur_buf) { PRINTM(MIF_D, "%s: Postcopy current buffer.\n", __FUNCTION__); - if (!pmbuf_aggr) { /* this is possible if just sent (above) */ + if (!pmbuf_aggr) { /* this is possible if just sent (above) */ /* use this buf to start linked list */ pmbuf->pnext = pmbuf->pprev = pmbuf; pmbuf_aggr = pmbuf; @@ -1115,8 +1098,7 @@ wlan_usb_host_to_card_aggr(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_pm_usb_wakeup_card(IN pmlan_adapter pmadapter, IN t_u8 timeout) +mlan_status wlan_pm_usb_wakeup_card(IN pmlan_adapter pmadapter, IN t_u8 timeout) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 age_ts_usec; @@ -1147,14 +1129,15 @@ wlan_pm_usb_wakeup_card(IN pmlan_adapter pmadapter, IN t_u8 timeout) * * @param pmpriv A pointer to pmlan_private structure * @param type data or command - * @param pmbuf A pointer to mlan_buffer (pmbuf->data_len should include PCIE header) - * @param tx_param A pointer to mlan_tx_param (can be MNULL if type is command) + * @param pmbuf A pointer to mlan_buffer (pmbuf->data_len should include + * PCIE header) + * @param tx_param A pointer to mlan_tx_param (can be MNULL if type is + * command) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -wlan_usb_host_to_card(pmlan_private pmpriv, t_u8 type, - mlan_buffer *pmbuf, mlan_tx_param *tx_param) +mlan_status wlan_usb_host_to_card(pmlan_private pmpriv, t_u8 type, + mlan_buffer *pmbuf, mlan_tx_param *tx_param) { mlan_status ret = MLAN_STATUS_SUCCESS; usb_tx_aggr_params *pusb_tx_aggr = MNULL; @@ -1167,16 +1150,13 @@ wlan_usb_host_to_card(pmlan_private pmpriv, t_u8 type, return MLAN_STATUS_FAILURE; } if (type == MLAN_TYPE_CMD -#if defined(FW_VDLL) && (defined(USB9098) || defined(USB9097)) +#if (defined(USB9098) || defined(USB9097)) || type == MLAN_TYPE_VDLL #endif - ) { + ) { pmadapter->cmd_sent = MTRUE; - ret = pmadapter->callbacks.moal_write_data_async(pmadapter-> - pmoal_handle, - pmbuf, - pmadapter-> - tx_cmd_ep); + ret = pmadapter->callbacks.moal_write_data_async( + pmadapter->pmoal_handle, pmbuf, pmadapter->tx_cmd_ep); if (ret == MLAN_STATUS_FAILURE) pmadapter->cmd_sent = MFALSE; LEAVE(); @@ -1188,10 +1168,8 @@ wlan_usb_host_to_card(pmlan_private pmpriv, t_u8 type, pusb_tx_aggr); } else { pmadapter->data_sent = MTRUE; - ret = pmadapter->callbacks.moal_write_data_async(pmadapter-> - pmoal_handle, - pmbuf, - pmpriv->port); + ret = pmadapter->callbacks.moal_write_data_async( + pmadapter->pmoal_handle, pmbuf, pmpriv->port); switch (ret) { case MLAN_STATUS_PRESOURCE: PRINTM(MINFO, "MLAN_STATUS_PRESOURCE is returned\n"); @@ -1210,7 +1188,6 @@ wlan_usb_host_to_card(pmlan_private pmpriv, t_u8 type, default: break; } - } LEAVE(); @@ -1224,9 +1201,8 @@ wlan_usb_host_to_card(pmlan_private pmpriv, t_u8 type, * @param pmbuf A pointer to the mlan_buffer * @return N/A */ -mlan_status -wlan_usb_cmdevt_complete(IN pmlan_adapter pmadapter, mlan_buffer *pmbuf, - mlan_status status) +mlan_status wlan_usb_cmdevt_complete(IN pmlan_adapter pmadapter, + mlan_buffer *pmbuf, mlan_status status) { ENTER(); @@ -1244,9 +1220,8 @@ wlan_usb_cmdevt_complete(IN pmlan_adapter pmadapter, mlan_buffer *pmbuf, * @param pmbuf A pointer to the mlan_buffer * @return N/A */ -mlan_status -wlan_usb_data_complete(IN pmlan_adapter pmadapter, mlan_buffer *pmbuf, - mlan_status status) +mlan_status wlan_usb_data_complete(IN pmlan_adapter pmadapter, + mlan_buffer *pmbuf, mlan_status status) { ENTER(); @@ -1264,8 +1239,8 @@ wlan_usb_data_complete(IN pmlan_adapter pmadapter, mlan_buffer *pmbuf, * @param pmbuf A pointer to the mlan_buffer * @return */ -mlan_status -wlan_usb_handle_rx_packet(mlan_adapter *pmadapter, pmlan_buffer pmbuf) +mlan_status wlan_usb_handle_rx_packet(mlan_adapter *pmadapter, + pmlan_buffer pmbuf) { ENTER(); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_util.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_util.h index 1d5b7049f7d4..c86269e2b155 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_util.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_util.h @@ -31,19 +31,19 @@ Change log: /** Circular doubly linked list */ typedef struct _mlan_linked_list { - /** Pointer to previous node */ + /** Pointer to previous node */ struct _mlan_linked_list *pprev; - /** Pointer to next node */ + /** Pointer to next node */ struct _mlan_linked_list *pnext; } mlan_linked_list, *pmlan_linked_list; /** List head */ typedef struct _mlan_list_head { - /** Pointer to previous node */ + /** Pointer to previous node */ struct _mlan_linked_list *pprev; - /** Pointer to next node */ + /** Pointer to next node */ struct _mlan_linked_list *pnext; - /** Pointer to lock */ + /** Pointer to lock */ t_void *plock; } mlan_list_head, *pmlan_list_head; @@ -54,8 +54,7 @@ typedef struct _mlan_list_head { * * @return N/A */ -static INLINE t_void -util_init_list(pmlan_linked_list phead) +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; @@ -70,12 +69,9 @@ util_init_list(pmlan_linked_list phead) * * @return N/A */ -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)) +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)) { /* Both next and prev point to self */ util_init_list((pmlan_linked_list)phead); @@ -93,11 +89,9 @@ util_init_list_head(t_void *pmoal_handle, * * @return N/A */ -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)) +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)) { phead->pprev = phead->pnext = 0; if (phead->plock) @@ -114,10 +108,9 @@ util_free_list_head(t_void *pmoal_handle, * @return List node */ 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)) +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_linked_list pnode = 0; @@ -140,14 +133,10 @@ util_peek_list(t_void *pmoal_handle, * * @return N/A */ -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)) +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_linked_list pold_last; @@ -172,14 +161,10 @@ util_enqueue_list_tail(t_void *pmoal_handle, * * @return N/A */ -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)) +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_linked_list pold_first; @@ -204,13 +189,10 @@ util_enqueue_list_head(t_void *pmoal_handle, * * @return N/A */ -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)) +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_linked_list pmy_prev; pmlan_linked_list pmy_next; @@ -236,12 +218,10 @@ util_unlink_list(t_void *pmoal_handle, * * @return List node */ -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)) +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_linked_list pnode; @@ -259,16 +239,16 @@ util_dequeue_list(t_void *pmoal_handle, /** Access controlled scalar variable */ typedef struct _mlan_scalar { - /** Value */ + /** Value */ t_s32 value; - /** Pointer to lock */ + /** Pointer to lock */ t_void *plock; - /** Control flags */ + /** Control flags */ t_u32 flags; } mlan_scalar, *pmlan_scalar; /** Flag to scalar lock acquired */ -#define MLAN_SCALAR_FLAG_UNIQUE_LOCK MBIT(16) +#define MLAN_SCALAR_FLAG_UNIQUE_LOCK MBIT(16) /** scalar conditional value list */ typedef enum _MLAN_SCALAR_CONDITIONAL { @@ -291,12 +271,9 @@ typedef enum _MLAN_SCALAR_CONDITIONAL { * @return N/A */ static INLINE t_void -util_scalar_init(t_void *pmoal_handle, - pmlan_scalar pscalar, - t_s32 val, +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)) + mlan_status (*moal_init_lock)(t_void *handle, t_void **pplock)) { pscalar->value = val; pscalar->flags = 0; @@ -318,9 +295,8 @@ util_scalar_init(t_void *pmoal_handle, * @return N/A */ 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)) +util_scalar_free(t_void *pmoal_handle, 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); @@ -336,11 +312,9 @@ util_scalar_free(t_void *pmoal_handle, * @return Stored value */ 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)) +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)) { t_s32 val; @@ -363,13 +337,10 @@ util_scalar_read(t_void *pmoal_handle, * * @return N/A */ -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)) +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)) { if (moal_spin_lock) moal_spin_lock(pmoal_handle, pscalar->plock); @@ -387,13 +358,10 @@ util_scalar_write(t_void *pmoal_handle, * * @return N/A */ -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)) +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)) { if (moal_spin_lock) moal_spin_lock(pmoal_handle, pscalar->plock); @@ -411,13 +379,10 @@ util_scalar_increment(t_void *pmoal_handle, * * @return N/A */ -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)) +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)) { if (moal_spin_lock) moal_spin_lock(pmoal_handle, pscalar->plock); @@ -437,14 +402,10 @@ util_scalar_decrement(t_void *pmoal_handle, * * @return Value after offset */ -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)) +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)) { t_s32 newval; @@ -471,16 +432,11 @@ util_scalar_offset(t_void *pmoal_handle, * * @return Comparison result (MTRUE or MFALSE) */ -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)) +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)) { t_u8 update; if (moal_spin_lock) @@ -523,14 +479,11 @@ util_scalar_conditional_write(t_void *pmoal_handle, * @param num number * @return number of bits */ -static INLINE t_u32 -bitcount(t_u32 num) +static INLINE t_u32 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 - }; + 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; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_wmm.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_wmm.c index da44c1cd0734..c183a04c2436 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_wmm.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_wmm.c @@ -46,7 +46,7 @@ Change log: ********************************************************/ /** Maximum value FW can accept for driver delay in packet transmission */ -#define DRV_PKT_DELAY_TO_FW_MAX 512 +#define DRV_PKT_DELAY_TO_FW_MAX 512 /* * Upper and Lower threshold for packet queuing in the driver @@ -60,25 +60,23 @@ Change log: */ /** Lower threshold for packet queuing in the driver. - * When the number of packets drops beneath the lower limit after having - * reached the upper limit, the driver will restart the net queue. - */ -#define WMM_QUEUED_PACKET_LOWER_LIMIT 180 + * When the number of packets drops beneath the lower limit after having + * reached the upper limit, the driver will restart the net queue. + */ +#define WMM_QUEUED_PACKET_LOWER_LIMIT 180 /** Upper 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. - */ -#define WMM_QUEUED_PACKET_UPPER_LIMIT 200 + * When the number of packets queued reaches the upper limit, the driver + * will stop the net queue in the app/kernel space. + */ +#define WMM_QUEUED_PACKET_UPPER_LIMIT 200 /** Offset for TOS field in the IP header */ #define IPTOS_OFFSET 5 /** WMM information IE */ -static const t_u8 wmm_info_ie[] = { WMM_IE, 0x07, - 0x00, 0x50, 0xf2, 0x02, - 0x00, 0x01, 0x00 -}; +static const t_u8 wmm_info_ie[] = {WMM_IE, 0x07, 0x00, 0x50, 0xf2, + 0x02, 0x00, 0x01, 0x00}; /** Type enumeration of WMM AC_QUEUES */ typedef MLAN_PACK_START enum _wmm_ac_e { @@ -93,26 +91,22 @@ typedef MLAN_PACK_START enum _wmm_ac_e { * is higher than the enumeration for AC_BE (0); hence the needed * 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 -}; - +static const t_u8 wmm_aci_to_qidx_map[] = {WMM_AC_BE, 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 */ + 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 */ }; /** @@ -120,33 +114,22 @@ t_u8 tos_to_tid[] = { * 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. */ -const t_u8 ac_to_tid[4][2] = { {1, 2}, {0, 3}, {4, 5}, {6, 7} }; +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 -}; +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}; raListTbl *wlan_wmm_get_ralist_node(pmlan_private priv, t_u8 tid, t_u8 *ra_addr); @@ -165,11 +148,12 @@ 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(); - PRINTM(MINFO, "WMM AC_%s: ACI=%d, ACM=%d, Aifsn=%d, " + 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, @@ -179,7 +163,6 @@ wlan_wmm_ac_debug_print(const IEEEtypes_WmmAcParameters_t *pac_param) LEAVE(); } - /** Print the WMM AC for debug purpose */ #define PRINTM_AC(pac_param) wlan_wmm_ac_debug_print(pac_param) #else @@ -195,17 +178,16 @@ wlan_wmm_ac_debug_print(const IEEEtypes_WmmAcParameters_t *pac_param) * * @return ra_list */ -static -raListTbl * -wlan_wmm_allocate_ralist_node(pmlan_adapter pmadapter, t_u8 *ra) +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)) { + 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; } @@ -234,8 +216,8 @@ done: * * @return N/A */ -static void -wlan_wmm_queue_priorities_tid(pmlan_private priv, t_u8 queue_priority[]) +static void wlan_wmm_queue_priorities_tid(pmlan_private priv, + t_u8 queue_priority[]) { int i; @@ -253,8 +235,7 @@ wlan_wmm_queue_priorities_tid(pmlan_private priv, t_u8 queue_priority[]) * 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->wmm.highest_queued_prio, HIGH_PRIO_TID, priv->adapter->callbacks.moal_spin_lock, priv->adapter->callbacks.moal_spin_unlock); @@ -269,8 +250,8 @@ wlan_wmm_queue_priorities_tid(pmlan_private priv, t_u8 queue_priority[]) * * @return WMM AC The eval_ac traffic is to be sent on. */ -static mlan_wmm_ac_e -wlan_wmm_eval_downgrade_ac(pmlan_private priv, mlan_wmm_ac_e eval_ac) +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; @@ -298,9 +279,10 @@ wlan_wmm_eval_downgrade_ac(pmlan_private priv, mlan_wmm_ac_e eval_ac) 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 */ + 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; } @@ -316,8 +298,8 @@ wlan_wmm_eval_downgrade_ac(pmlan_private priv, mlan_wmm_ac_e eval_ac) * * @return WMM AC Queue mapping of the IP TOS field */ -static INLINE mlan_wmm_ac_e -wlan_wmm_convert_tos_to_ac(pmlan_adapter pmadapter, t_u32 tos) +static INLINE mlan_wmm_ac_e wlan_wmm_convert_tos_to_ac(pmlan_adapter pmadapter, + t_u32 tos) { ENTER(); @@ -342,17 +324,15 @@ wlan_wmm_convert_tos_to_ac(pmlan_adapter pmadapter, t_u32 tos) * @return Same tid as input if downgrading not required or * the tid the traffic for the given tid should be downgraded to */ -static INLINE t_u8 -wlan_wmm_downgrade_tid(pmlan_private priv, t_u32 tid) +static INLINE t_u8 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)]; + 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 @@ -374,17 +354,16 @@ wlan_wmm_downgrade_tid(pmlan_private priv, t_u32 tid) * * @return N/A */ -static INLINE void -wlan_wmm_del_pkts_in_ralist_node(pmlan_private priv, raListTbl *ra_list) +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))) { + 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); @@ -404,16 +383,15 @@ wlan_wmm_del_pkts_in_ralist_node(pmlan_private priv, raListTbl *ra_list) * * @return N/A */ -static INLINE void -wlan_wmm_del_pkts_in_ralist(pmlan_private priv, mlan_list_head *ra_list_head) +static INLINE void wlan_wmm_del_pkts_in_ralist(pmlan_private priv, + mlan_list_head *ra_list_head) { raListTbl *ra_list; 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); @@ -431,8 +409,7 @@ wlan_wmm_del_pkts_in_ralist(pmlan_private priv, mlan_list_head *ra_list_head) * * @return N/A */ -static void -wlan_wmm_cleanup_queues(pmlan_private priv) +static void wlan_wmm_cleanup_queues(pmlan_private priv) { int i; @@ -460,8 +437,7 @@ wlan_wmm_cleanup_queues(pmlan_private priv) * * @return N/A */ -static void -wlan_wmm_delete_all_ralist(pmlan_private priv) +static void wlan_wmm_delete_all_ralist(pmlan_private priv) { raListTbl *ra_list; int i; @@ -471,10 +447,10 @@ wlan_wmm_delete_all_ralist(pmlan_private priv) 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))) { + 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, @@ -484,8 +460,8 @@ wlan_wmm_delete_all_ralist(pmlan_private priv) (t_u8 *)ra_list); } - util_init_list((pmlan_linked_list) - &priv->wmm.tid_tbl_ptr[i].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; } @@ -501,12 +477,12 @@ wlan_wmm_delete_all_ralist(pmlan_private priv) * * @return ra_list */ -static raListTbl * -wlan_wmm_get_queue_raptr(pmlan_private priv, t_u8 tid, t_u8 *ra_addr) +static raListTbl *wlan_wmm_get_queue_raptr(pmlan_private priv, t_u8 tid, + t_u8 *ra_addr) { raListTbl *ra_list; #ifdef UAP_SUPPORT - t_u8 bcast_addr[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + t_u8 bcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; #endif ENTER(); @@ -549,10 +525,9 @@ wlan_wmm_get_queue_raptr(pmlan_private priv, t_u8 tid, t_u8 *ra_addr) * * @return N/A */ -static void -wlan_send_wmmac_host_event(pmlan_private priv, - char *type_str, - t_u8 *src_addr, t_u8 tid, t_u8 up, t_u8 status) +static void wlan_send_wmmac_host_event(pmlan_private priv, char *type_str, + t_u8 *src_addr, t_u8 tid, t_u8 up, + t_u8 status) { t_u8 event_buf[100]; mlan_event *pevent; @@ -561,9 +536,9 @@ wlan_send_wmmac_host_event(pmlan_private priv, ENTER(); /* Format one of the following two output strings: - ** - TSPEC:ADDTS_RSP:[]:TID=X:UP=Y - ** - TSPEC:DELTS_RX:[]:TID=X:UP=Y - */ + ** - TSPEC:ADDTS_RSP:[]:TID=X:UP=Y + ** - TSPEC:DELTS_RX:[]:TID=X:UP=Y + */ pevent = (mlan_event *)event_buf; pout_buf = pevent->event_buf; @@ -617,9 +592,9 @@ wlan_send_wmmac_host_event(pmlan_private priv, * * @return raListTbl */ -static raListTbl * -wlan_wmm_get_highest_priolist_ptr(pmlan_adapter pmadapter, - pmlan_private *priv, int *tid) +static raListTbl *wlan_wmm_get_highest_priolist_ptr(pmlan_adapter pmadapter, + pmlan_private *priv, + int *tid) { pmlan_private priv_tmp; raListTbl *ptr, *head; @@ -638,50 +613,51 @@ wlan_wmm_get_highest_priolist_ptr(pmlan_adapter pmadapter, continue; if (pmadapter->bssprio_tbl[j].bssprio_cur == - (mlan_bssprio_node *) - &pmadapter->bssprio_tbl[j].bssprio_head) { + (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; + 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(): " + 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 */ + /* Ignore data pkts from a BSS if port is closed + */ goto next_intf; } if (priv_tmp->tx_pause == MTRUE) { - PRINTM(MINFO, "get_highest_prio_ptr(): " + PRINTM(MINFO, + "get_highest_prio_ptr(): " "TX PASUE Ignore pkts from BSS%d\n", priv_tmp->bss_index); /* Ignore data pkts from a BSS if tx pause */ goto next_intf; } - pmadapter->callbacks.moal_spin_lock(pmadapter-> - pmoal_handle, - priv_tmp->wmm. - ra_list_spinlock); + 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)) + 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; /* @@ -695,44 +671,47 @@ wlan_wmm_get_highest_priolist_ptr(pmlan_adapter pmadapter, 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 */ + 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] && - (priv_tmp->wmm. - pkts_queued[next_tid] > - priv_tmp->wmm. - pkts_paused[next_tid])) - util_scalar_write - (pmadapter-> - pmoal_handle, - &priv_tmp->wmm. - highest_queued_prio, - next_prio, - MNULL, MNULL); + if (priv_tmp->wmm.pkts_queued + [next_tid] && + (priv_tmp->wmm.pkts_queued + [next_tid] > + priv_tmp->wmm.pkts_paused + [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); + /* 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 */ + /* hold priv->ra_list_spinlock + * to maintain ptr */ PRINTM(MDAT_D, "get highest prio ptr %p, tid %d\n", ptr, *tid); @@ -747,32 +726,33 @@ wlan_wmm_get_highest_priolist_ptr(pmlan_adapter pmadapter, } while (ptr != head); } - /* If priv still has packets queued, reset to HIGH_PRIO_TID */ + /* If priv still has packets queued, reset to + * HIGH_PRIO_TID */ if (util_scalar_read(pmadapter->pmoal_handle, &priv_tmp->wmm.tx_pkts_queued, MNULL, MNULL)) - util_scalar_write(pmadapter->pmoal_handle, - &priv_tmp->wmm. - highest_queued_prio, - HIGH_PRIO_TID, MNULL, MNULL); + util_scalar_write( + pmadapter->pmoal_handle, + &priv_tmp->wmm.highest_queued_prio, + HIGH_PRIO_TID, MNULL, MNULL); else - /* 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); + /* 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); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, + priv_tmp->wmm.ra_list_spinlock); -next_intf: + next_intf: bssprio_node = bssprio_node->pnext; - if (bssprio_node == (mlan_bssprio_node *) - &pmadapter->bssprio_tbl[j].bssprio_head) + if (bssprio_node == + (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); @@ -791,8 +771,8 @@ next_intf: * * @return Packet count */ -static int -wlan_num_pkts_in_txq(mlan_private *priv, raListTbl *ptr, int max_buf_size) +static int wlan_num_pkts_in_txq(mlan_private *priv, raListTbl *ptr, + int max_buf_size) { int count = 0, total_size = 0; pmlan_buffer pmbuf; @@ -801,7 +781,6 @@ wlan_num_pkts_in_txq(mlan_private *priv, raListTbl *ptr, int max_buf_size) 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 < max_buf_size) ++count; @@ -822,8 +801,8 @@ wlan_num_pkts_in_txq(mlan_private *priv, raListTbl *ptr, int max_buf_size) * * @return N/A */ -static INLINE void -wlan_send_single_packet(pmlan_private priv, raListTbl *ptr, int ptrindex) +static INLINE void wlan_send_single_packet(pmlan_private priv, raListTbl *ptr, + int ptrindex) { pmlan_buffer pmbuf; pmlan_buffer pmbuf_next; @@ -841,34 +820,28 @@ wlan_send_single_packet(pmlan_private priv, raListTbl *ptr, int 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); + 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); + 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 */ + /** 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); + 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); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); wlan_write_data_complete(pmadapter, pmbuf, MLAN_STATUS_FAILURE); LEAVE(); @@ -885,32 +858,28 @@ wlan_send_single_packet(pmlan_private priv, raListTbl *ptr, int ptrindex) ptr->total_pkts++; pmbuf->flags |= MLAN_BUF_FLAG_REQUEUED_PKT; - 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); } else { - 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); 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); + 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); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, priv->wmm.ra_list_spinlock); PRINTM(MINFO, "Nothing to send\n"); } @@ -925,8 +894,7 @@ wlan_send_single_packet(pmlan_private priv, raListTbl *ptr, int ptrindex) * * @return MTRUE or MFALSE */ -static INLINE int -wlan_is_ptr_processed(mlan_private *priv, raListTbl *ptr) +static INLINE int wlan_is_ptr_processed(mlan_private *priv, raListTbl *ptr) { pmlan_buffer pmbuf; @@ -947,8 +915,8 @@ wlan_is_ptr_processed(mlan_private *priv, raListTbl *ptr) * * @return N/A */ -static INLINE void -wlan_send_processed_packet(pmlan_private priv, raListTbl *ptr, int ptrindex) +static INLINE void wlan_send_processed_packet(pmlan_private priv, + raListTbl *ptr, int ptrindex) { pmlan_buffer pmbuf_next = MNULL; mlan_tx_param tx_param; @@ -959,19 +927,16 @@ wlan_send_processed_packet(pmlan_private priv, raListTbl *ptr, int ptrindex) pmbuf = (pmlan_buffer)util_dequeue_list(pmadapter->pmoal_handle, &ptr->buf_head, MNULL, MNULL); if (pmbuf) { - 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); + 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); + ((pmbuf_next) ? pmbuf_next->data_len + sizeof(TxPD) : + 0); - ret = pmadapter->ops.host_to_card(priv, MLAN_TYPE_DATA, - pmbuf, &tx_param); + ret = pmadapter->ops.host_to_card(priv, MLAN_TYPE_DATA, pmbuf, + &tx_param); switch (ret) { #ifdef USB case MLAN_STATUS_PRESOURCE: @@ -980,17 +945,14 @@ wlan_send_processed_packet(pmlan_private priv, raListTbl *ptr, int ptrindex) #endif 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); + 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); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); wlan_write_data_complete(pmadapter, pmbuf, MLAN_STATUS_FAILURE); LEAVE(); @@ -998,14 +960,13 @@ wlan_send_processed_packet(pmlan_private priv, raListTbl *ptr, int ptrindex) } util_enqueue_list_head(pmadapter->pmoal_handle, &ptr->buf_head, - (pmlan_linked_list)pmbuf, - MNULL, MNULL); + (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); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, + priv->wmm.ra_list_spinlock); break; case MLAN_STATUS_FAILURE: PRINTM(MERROR, "Error: Failed to write data\n"); @@ -1026,10 +987,9 @@ wlan_send_processed_packet(pmlan_private priv, raListTbl *ptr, int ptrindex) break; } if (ret != MLAN_STATUS_RESOURCE) { - 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); if (wlan_is_ralist_valid(priv, ptr, ptrindex)) { priv->wmm.packets_out[ptrindex]++; priv->wmm.tid_tbl_ptr[ptrindex].ra_list_curr = @@ -1037,21 +997,19 @@ wlan_send_processed_packet(pmlan_private priv, raListTbl *ptr, int ptrindex) ptr->total_pkts--; } pmadapter->bssprio_tbl[priv->bss_priority].bssprio_cur = - pmadapter->bssprio_tbl[priv->bss_priority]. - bssprio_cur->pnext; + 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); + &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); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, priv->wmm.ra_list_spinlock); } } @@ -1062,8 +1020,7 @@ wlan_send_processed_packet(pmlan_private priv, raListTbl *ptr, int ptrindex) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static int -wlan_dequeue_tx_packet(pmlan_adapter pmadapter) +static int wlan_dequeue_tx_packet(pmlan_adapter pmadapter) { raListTbl *ptr; pmlan_private priv = MNULL; @@ -1112,12 +1069,12 @@ wlan_dequeue_tx_packet(pmlan_adapter pmadapter) #ifdef STA_SUPPORT || priv->wps.session_enable #endif /* STA_SUPPORT */ - ) { - if (ptr->is_11n_enabled && ptr->ba_status - && ptr->amsdu_in_ampdu - && wlan_is_amsdu_allowed(priv, ptr, tid) - && (wlan_num_pkts_in_txq(priv, ptr, pmadapter->tx_buf_size) - >= MIN_NUM_AMSDU)) { + ) { + if (ptr->is_11n_enabled && ptr->ba_status && + ptr->amsdu_in_ampdu && + 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, priv->intf_hr_len, ptrindex); } else @@ -1129,33 +1086,29 @@ wlan_dequeue_tx_packet(pmlan_adapter pmadapter) PRINTM(MINFO, "BA setup threshold %d reached. tid=%d\n", ptr->packet_count, tid); - if (!wlan_11n_get_txbastream_tbl - (priv, tid, ptr->ra, MFALSE)) { - wlan_11n_create_txbastream_tbl(priv, - ptr->ra, - tid, - BA_STREAM_SETUP_INPROGRESS); + if (!wlan_11n_get_txbastream_tbl( + priv, tid, ptr->ra, MFALSE)) { + 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)) { + } 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); - if (!wlan_11n_get_txbastream_tbl - (priv, tid, ptr->ra, MFALSE)) { - wlan_11n_create_txbastream_tbl(priv, - ptr->ra, - tid, - BA_STREAM_SETUP_INPROGRESS); + if (!wlan_11n_get_txbastream_tbl( + priv, tid, ptr->ra, MFALSE)) { + 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) >= + (wlan_num_pkts_in_txq(priv, ptr, pmadapter->tx_buf_size) >= MIN_NUM_AMSDU)) { wlan_11n_aggregate_pkt(priv, ptr, priv->intf_hr_len, ptrindex); @@ -1178,8 +1131,7 @@ wlan_dequeue_tx_packet(pmlan_adapter pmadapter) * * @return packets queued for this mac */ -t_u16 -wlan_update_ralist_tx_pause(pmlan_private priv, t_u8 *mac, t_u8 tx_pause) +t_u16 wlan_update_ralist_tx_pause(pmlan_private priv, t_u8 *mac, t_u8 tx_pause) { raListTbl *ra_list; int i; @@ -1199,7 +1151,6 @@ wlan_update_ralist_tx_pause(pmlan_private priv, t_u8 *mac, t_u8 tx_pause) priv->wmm.pkts_paused[i] += ra_list->total_pkts; else priv->wmm.pkts_paused[i] -= ra_list->total_pkts; - } } if (pkt_cnt) { @@ -1236,8 +1187,7 @@ wlan_update_ralist_tx_pause(pmlan_private priv, t_u8 *mac, t_u8 tx_pause) * * @return threshold value. */ -t_u8 -wlan_get_random_ba_threshold(pmlan_adapter pmadapter) +t_u8 wlan_get_random_ba_threshold(pmlan_adapter pmadapter) { t_u32 sec, usec; t_u8 ba_threshold = 0; @@ -1245,18 +1195,18 @@ wlan_get_random_ba_threshold(pmlan_adapter pmadapter) ENTER(); /* setup ba_packet_threshold here random number between - [BA_SETUP_PACKET_OFFSET, BA_SETUP_PACKET_OFFSET+BA_SETUP_MAX_PACKET_THRESHOLD-1] */ + [BA_SETUP_PACKET_OFFSET, + BA_SETUP_PACKET_OFFSET+BA_SETUP_MAX_PACKET_THRESHOLD-1] */ -#define BA_SETUP_MAX_PACKET_THRESHOLD 16 +#define BA_SETUP_MAX_PACKET_THRESHOLD 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) + - pmadapter->min_ba_threshold; + ba_threshold = (((sec << 16) + usec) % BA_SETUP_MAX_PACKET_THRESHOLD) + + pmadapter->min_ba_threshold; PRINTM(MINFO, "pmadapter->min_ba_threshold = %d\n", pmadapter->min_ba_threshold); PRINTM(MINFO, "setup BA after %d packets\n", ba_threshold); @@ -1272,8 +1222,7 @@ wlan_get_random_ba_threshold(pmlan_adapter pmadapter) * * @return N/A */ -t_void -wlan_clean_txrx(pmlan_private priv) +t_void wlan_clean_txrx(pmlan_private priv) { mlan_adapter *pmadapter = priv->adapter; t_u8 i = 0; @@ -1324,8 +1273,7 @@ wlan_clean_txrx(pmlan_private priv) * * @return N/A */ -void -wlan_wmm_default_queue_priorities(pmlan_private priv) +void wlan_wmm_default_queue_priorities(pmlan_private priv) { ENTER(); @@ -1346,9 +1294,8 @@ wlan_wmm_default_queue_priorities(pmlan_private priv) * * @return N/A */ -void -wlan_wmm_setup_queue_priorities(pmlan_private priv, - IEEEtypes_WmmParameter_t *pwmm_ie) +void wlan_wmm_setup_queue_priorities(pmlan_private priv, + IEEEtypes_WmmParameter_t *pwmm_ie) { t_u16 cw_min, avg_back_off, tmp[4]; t_u32 i, j, num_ac; @@ -1364,23 +1311,22 @@ wlan_wmm_setup_queue_priorities(pmlan_private priv, } memset(priv->adapter, tmp, 0, sizeof(tmp)); - HEXDUMP("WMM: setup_queue_priorities: param IE", - (t_u8 *)pwmm_ie, sizeof(IEEEtypes_WmmParameter_t)); + HEXDUMP("WMM: setup_queue_priorities: param IE", (t_u8 *)pwmm_ie, + sizeof(IEEEtypes_WmmParameter_t)); - PRINTM(MINFO, "WMM Parameter IE: version=%d, " + 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; + 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]; + 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; @@ -1402,8 +1348,8 @@ wlan_wmm_setup_queue_priorities(pmlan_private priv, 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]) { + 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]); } @@ -1426,8 +1372,7 @@ wlan_wmm_setup_queue_priorities(pmlan_private priv, * * @return N/A */ -void -wlan_wmm_setup_ac_downgrade(pmlan_private priv) +void wlan_wmm_setup_ac_downgrade(pmlan_private priv) { int ac_val; @@ -1443,10 +1388,9 @@ wlan_wmm_setup_ac_downgrade(pmlan_private priv) } } 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); + 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]); } @@ -1463,8 +1407,7 @@ wlan_wmm_setup_ac_downgrade(pmlan_private priv) * * @return N/A */ -void -wlan_ralist_add(mlan_private *priv, t_u8 *ra) +void wlan_ralist_add(mlan_private *priv, t_u8 *ra) { int i; raListTbl *ra_list; @@ -1521,14 +1464,13 @@ wlan_ralist_add(mlan_private *priv, t_u8 *ra) * * @return N/A */ -t_void -wlan_init_wmm_param(pmlan_adapter pmadapter) +t_void wlan_init_wmm_param(pmlan_adapter pmadapter) { - /* Reuse the same structure of WmmAcParameters_t for configuration purpose here. - * the definition of acm bit is changed to ucm (user configuration mode) - * FW will take the setting of aifsn,ecw_max,ecw_min, tx_op_limit - * only when ucm is set to 1. othewise the default setting/behavoir in - * firmware will be used. + /* Reuse the same structure of WmmAcParameters_t for configuration + * purpose here. the definition of acm bit is changed to ucm (user + * configuration mode) FW will take the setting of + * aifsn,ecw_max,ecw_min, tx_op_limit only when ucm is set to 1. + * othewise the default setting/behavoir in firmware will be used. */ pmadapter->ac_params[AC_BE].aci_aifsn.acm = 0; pmadapter->ac_params[AC_BE].aci_aifsn.aci = AC_BE; @@ -1557,7 +1499,6 @@ wlan_init_wmm_param(pmlan_adapter pmadapter) pmadapter->ac_params[AC_VO].ecw.ecw_max = 3; pmadapter->ac_params[AC_VO].ecw.ecw_min = 2; pmadapter->ac_params[AC_VO].tx_op_limit = 102; - } /** @@ -1567,8 +1508,7 @@ wlan_init_wmm_param(pmlan_adapter pmadapter) * * @return N/A */ -t_void -wlan_wmm_init(pmlan_adapter pmadapter) +t_void wlan_wmm_init(pmlan_adapter pmadapter) { int i, j; pmlan_private priv; @@ -1583,7 +1523,7 @@ wlan_wmm_init(pmlan_adapter pmadapter) tos_to_tid_inv[i]; priv->aggr_prio_tbl[i].ampdu_ap = priv->aggr_prio_tbl[i].ampdu_user = - tos_to_tid_inv[i]; + tos_to_tid_inv[i]; priv->ibss_ampdu[i] = priv->aggr_prio_tbl[i].ampdu_user; priv->wmm.pkts_queued[i] = 0; @@ -1594,14 +1534,14 @@ wlan_wmm_init(pmlan_adapter pmadapter) priv->aggr_prio_tbl[6].amsdu = BA_STREAM_NOT_ALLOWED; priv->aggr_prio_tbl[7].amsdu = BA_STREAM_NOT_ALLOWED; - priv->aggr_prio_tbl[6].ampdu_ap - = priv->aggr_prio_tbl[6].ampdu_user = - BA_STREAM_NOT_ALLOWED; + priv->aggr_prio_tbl[6].ampdu_ap = + priv->aggr_prio_tbl[6].ampdu_user = + BA_STREAM_NOT_ALLOWED; priv->ibss_ampdu[6] = BA_STREAM_NOT_ALLOWED; - priv->aggr_prio_tbl[7].ampdu_ap - = priv->aggr_prio_tbl[7].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->ibss_ampdu[7] = BA_STREAM_NOT_ALLOWED; priv->add_ba_param.timeout = @@ -1651,8 +1591,7 @@ wlan_wmm_init(pmlan_adapter pmadapter) * * @return N/A */ -void -wlan_wmm_setup_queues(pmlan_private priv) +void wlan_wmm_setup_queues(pmlan_private priv) { ENTER(); wlan_wmm_setup_queue_priorities(priv, MNULL); @@ -1668,8 +1607,7 @@ wlan_wmm_setup_queues(pmlan_private priv) * * @return MLAN_STATUS_SUCCESS; MLAN_STATUS_FAILURE */ -mlan_status -wlan_cmd_wmm_status_change(pmlan_private priv) +mlan_status wlan_cmd_wmm_status_change(pmlan_private priv) { mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1689,8 +1627,7 @@ wlan_cmd_wmm_status_change(pmlan_private priv) * * @return MFALSE if not empty; MTRUE if empty */ -int -wlan_wmm_lists_empty(pmlan_adapter pmadapter) +int wlan_wmm_lists_empty(pmlan_adapter pmadapter) { int j; pmlan_private priv; @@ -1710,12 +1647,11 @@ wlan_wmm_lists_empty(pmlan_adapter pmadapter) if (priv->tx_pause) continue; - if (util_scalar_read(pmadapter->pmoal_handle, - &priv->wmm.tx_pkts_queued, - pmadapter->callbacks. - moal_spin_lock, - pmadapter->callbacks. - moal_spin_unlock)) { + 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; } @@ -1735,8 +1671,7 @@ wlan_wmm_lists_empty(pmlan_adapter pmadapter) * * @return ra_list or MNULL */ -raListTbl * -wlan_wmm_get_ralist_node(pmlan_private priv, t_u8 tid, t_u8 *ra_addr) +raListTbl *wlan_wmm_get_ralist_node(pmlan_private priv, t_u8 tid, t_u8 *ra_addr) { raListTbl *ra_list; ENTER(); @@ -1744,11 +1679,10 @@ wlan_wmm_get_ralist_node(pmlan_private priv, t_u8 tid, t_u8 *ra_addr) (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)) { + 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; } @@ -1767,19 +1701,19 @@ wlan_wmm_get_ralist_node(pmlan_private priv, t_u8 tid, t_u8 *ra_addr) * * @return MTRUE- valid. MFALSE- invalid. */ -int -wlan_is_ralist_valid(mlan_private *priv, raListTbl *ra_list, int ptrindex) +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); + 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)) { + while (rlist && + (rlist != + (raListTbl *)&priv->wmm.tid_tbl_ptr[ptrindex].ra_list)) { if (rlist == ra_list) { LEAVE(); return MTRUE; @@ -1800,8 +1734,7 @@ wlan_is_ralist_valid(mlan_private *priv, raListTbl *ra_list, int ptrindex) * * @return integer count of updated nodes */ -int -wlan_ralist_update(mlan_private *priv, t_u8 *old_ra, t_u8 *new_ra) +int wlan_ralist_update(mlan_private *priv, t_u8 *old_ra, t_u8 *new_ra) { t_u8 tid; int update_count; @@ -1812,7 +1745,6 @@ wlan_ralist_update(mlan_private *priv, t_u8 *old_ra, t_u8 *new_ra) update_count = 0; for (tid = 0; tid < MAX_NUM_TID; ++tid) { - ra_list = wlan_wmm_get_ralist_node(priv, tid, old_ra); if (ra_list) { @@ -1823,8 +1755,8 @@ wlan_ralist_update(mlan_private *priv, t_u8 *old_ra, t_u8 *new_ra) wlan_is_11n_enabled(priv, new_ra); if (ra_list->is_11n_enabled) ra_list->max_amsdu = - get_station_max_amsdu_size(priv, - new_ra); + get_station_max_amsdu_size( + priv, new_ra); } else { ra_list->is_11n_enabled = IS_11N_ENABLED(priv); if (ra_list->is_11n_enabled) @@ -1839,7 +1771,8 @@ wlan_ralist_update(mlan_private *priv, t_u8 *old_ra, t_u8 *new_ra) ra_list->ba_status = BA_STREAM_NOT_SETUP; PRINTM(MINFO, "ralist_update: %p, %d, " MACSTR "-->" MACSTR - "\n", ra_list, ra_list->is_11n_enabled, + "\n", + ra_list, ra_list->is_11n_enabled, MAC2STR(ra_list->ra), MAC2STR(new_ra)); memcpy_ext(priv->adapter, ra_list->ra, new_ra, @@ -1859,8 +1792,7 @@ wlan_ralist_update(mlan_private *priv, t_u8 *old_ra, t_u8 *new_ra) * * @return N/A */ -t_void -wlan_wmm_add_buf_txqueue(pmlan_adapter pmadapter, pmlan_buffer pmbuf) +t_void wlan_wmm_add_buf_txqueue(pmlan_adapter pmadapter, pmlan_buffer pmbuf) { pmlan_private priv = pmadapter->priv[pmbuf->bss_index]; t_u32 tid; @@ -1885,29 +1817,27 @@ wlan_wmm_add_buf_txqueue(pmlan_adapter pmadapter, pmlan_buffer pmbuf) 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 */ + /* 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); + ra_list = (raListTbl *)util_peek_list( + pmadapter->pmoal_handle, + &priv->wmm.tid_tbl_ptr[tid_down].ra_list, MNULL, MNULL); } else { memcpy_ext(pmadapter, ra, pmbuf->pbuf + pmbuf->data_offset, MLAN_MAC_ADDR_LENGTH, MLAN_MAC_ADDR_LENGTH); - /** put multicast/broadcast packet in the same ralist */ + /** put multicast/broadcast packet in the same ralist */ if (ra[0] & 0x01) memset(pmadapter, ra, 0xff, sizeof(ra)); #ifdef UAP_SUPPORT else if (priv->bss_type == MLAN_BSS_TYPE_UAP) { sta_ptr = wlan_get_station_entry(priv, ra); if (sta_ptr) { - if (!sta_ptr->is_wmm_enabled - && !priv->is_11ac_enabled) { - tid_down = - wlan_wmm_downgrade_tid(priv, - 0xff); + if (!sta_ptr->is_wmm_enabled && + !priv->is_11ac_enabled) { + tid_down = wlan_wmm_downgrade_tid(priv, + 0xff); } } } @@ -1920,9 +1850,8 @@ wlan_wmm_add_buf_txqueue(pmlan_adapter pmadapter, pmlan_buffer pmbuf) 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); + pmadapter->callbacks.moal_spin_unlock( + pmadapter->pmoal_handle, priv->wmm.ra_list_spinlock); wlan_write_data_complete(pmadapter, pmbuf, MLAN_STATUS_FAILURE); LEAVE(); return; @@ -1944,13 +1873,12 @@ wlan_wmm_add_buf_txqueue(pmlan_adapter pmadapter, pmlan_buffer pmbuf) } else { 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); + /* 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 @@ -1958,9 +1886,8 @@ wlan_wmm_add_buf_txqueue(pmlan_adapter pmadapter, pmlan_buffer pmbuf) * 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_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); @@ -1985,8 +1912,8 @@ wlan_wmm_add_buf_txqueue(pmlan_adapter pmadapter, pmlan_buffer pmbuf) * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_wmm_get_status(pmlan_private priv, t_u8 *ptlv, int resp_len) +mlan_status wlan_ret_wmm_get_status(pmlan_private priv, t_u8 *ptlv, + int resp_len) { t_u8 *pcurrent = ptlv; t_u32 tlv_len; @@ -2031,8 +1958,8 @@ wlan_ret_wmm_get_status(pmlan_private priv, t_u8 *ptlv, int resp_len) ptlv_wmm_q_status->disabled); pac_status = - &priv->wmm.ac_status[ptlv_wmm_q_status-> - queue_index]; + &priv->wmm.ac_status[ptlv_wmm_q_status + ->queue_index]; pac_status->disabled = ptlv_wmm_q_status->disabled; pac_status->flow_required = ptlv_wmm_q_status->flow_required; @@ -2040,7 +1967,7 @@ wlan_ret_wmm_get_status(pmlan_private priv, t_u8 *ptlv, int resp_len) ptlv_wmm_q_status->flow_created; break; - case TLV_TYPE_VENDOR_SPECIFIC_IE: /* WMM_IE */ + case TLV_TYPE_VENDOR_SPECIFIC_IE: /* WMM_IE */ /* * Point the regular IEEE IE 2 bytes into the NXP IE * and setup the IEEE IE type and length byte fields @@ -2060,8 +1987,9 @@ wlan_ret_wmm_get_status(pmlan_private priv, t_u8 *ptlv, int resp_len) pwmm_param_ie->qos_info.para_set_count); memcpy_ext(priv->adapter, - (t_u8 *)&priv->curr_bss_params. - bss_descriptor.wmm_ie, pwmm_param_ie, + (t_u8 *)&priv->curr_bss_params.bss_descriptor + .wmm_ie, + pwmm_param_ie, (pwmm_param_ie->vend_hdr.len + 2), sizeof(IEEEtypes_WmmParameter_t)); send_wmm_event = MTRUE; @@ -2072,57 +2000,40 @@ wlan_ret_wmm_get_status(pmlan_private priv, t_u8 *ptlv, int resp_len) ptlv_action = (MrvlIETypes_ActionFrame_t *)pcurrent; ptlv_action->actionFrame.wmmAc.tspecAct.category = - wlan_le32_to_cpu(ptlv_action->actionFrame.wmmAc. - tspecAct.category); + wlan_le32_to_cpu(ptlv_action->actionFrame.wmmAc + .tspecAct.category); if (ptlv_action->actionFrame.wmmAc.tspecAct.category == IEEE_MGMT_ACTION_CATEGORY_WMM_TSPEC) { - ptlv_action->actionFrame.wmmAc.tspecAct.action = - wlan_le32_to_cpu(ptlv_action-> - actionFrame.wmmAc. - tspecAct.action); - switch (ptlv_action->actionFrame.wmmAc.tspecAct. - action) { + wlan_le32_to_cpu( + ptlv_action->actionFrame.wmmAc + .tspecAct.action); + switch (ptlv_action->actionFrame.wmmAc.tspecAct + .action) { case TSPEC_ACTION_CODE_ADDTS_RSP: - padd_ts_rsp = - &ptlv_action->actionFrame.wmmAc. - addTsRsp; - wlan_send_wmmac_host_event(priv, - "ADDTS_RSP", - ptlv_action-> - srcAddr, - padd_ts_rsp-> - tspecIE. - TspecBody. - TSInfo.TID, - padd_ts_rsp-> - tspecIE. - TspecBody. - TSInfo. - UserPri, - padd_ts_rsp-> - statusCode); + padd_ts_rsp = &ptlv_action->actionFrame + .wmmAc.addTsRsp; + wlan_send_wmmac_host_event( + priv, "ADDTS_RSP", + ptlv_action->srcAddr, + padd_ts_rsp->tspecIE.TspecBody + .TSInfo.TID, + padd_ts_rsp->tspecIE.TspecBody + .TSInfo.UserPri, + padd_ts_rsp->statusCode); break; case TSPEC_ACTION_CODE_DELTS: - pdel_ts = - &ptlv_action->actionFrame.wmmAc. - delTs; - wlan_send_wmmac_host_event(priv, - "DELTS_RX", - ptlv_action-> - srcAddr, - pdel_ts-> - tspecIE. - TspecBody. - TSInfo.TID, - pdel_ts-> - tspecIE. - TspecBody. - TSInfo. - UserPri, - pdel_ts-> - reasonCode); + pdel_ts = &ptlv_action->actionFrame + .wmmAc.delTs; + wlan_send_wmmac_host_event( + priv, "DELTS_RX", + ptlv_action->srcAddr, + pdel_ts->tspecIE.TspecBody + .TSInfo.TID, + pdel_ts->tspecIE.TspecBody + .TSInfo.UserPri, + pdel_ts->reasonCode); break; case TSPEC_ACTION_CODE_ADDTS_REQ: @@ -2167,11 +2078,9 @@ wlan_ret_wmm_get_status(pmlan_private priv, t_u8 *ptlv, int resp_len) * * @return Length of data appended to the association tlv buffer */ -t_u32 -wlan_wmm_process_association_req(pmlan_private priv, - t_u8 **ppassoc_buf, - IEEEtypes_WmmParameter_t *pwmm_ie, - IEEEtypes_HTCap_t *pht_cap) +t_u32 wlan_wmm_process_association_req(pmlan_private priv, t_u8 **ppassoc_buf, + IEEEtypes_WmmParameter_t *pwmm_ie, + IEEEtypes_HTCap_t *pht_cap) { MrvlIEtypes_WmmParamSet_t *pwmm_tlv; t_u32 ret_len = 0; @@ -2196,12 +2105,10 @@ wlan_wmm_process_association_req(pmlan_private priv, PRINTM(MINFO, "WMM: process assoc req: bss->wmmIe=0x%x\n", pwmm_ie->vend_hdr.element_id); - if ((priv->wmm_required - || (pht_cap && (pht_cap->ieee_hdr.element_id == HT_CAPABILITY) - && (priv->config_bands & BAND_GN - || priv->config_bands & BAND_AN)) - ) - && pwmm_ie->vend_hdr.element_id == WMM_IE) { + if ((priv->wmm_required || + (pht_cap && (pht_cap->ieee_hdr.element_id == HT_CAPABILITY) && + (priv->config_bands & BAND_GN || priv->config_bands & BAND_AN))) && + pwmm_ie->vend_hdr.element_id == WMM_IE) { pwmm_tlv = (MrvlIEtypes_WmmParamSet_t *)*ppassoc_buf; pwmm_tlv->header.type = (t_u16)wmm_info_ie[0]; pwmm_tlv->header.type = wlan_cpu_to_le16(pwmm_tlv->header.type); @@ -2242,9 +2149,8 @@ wlan_wmm_process_association_req(pmlan_private priv, * * @return Time delay of the packet in 2ms units after having limit applied */ -t_u8 -wlan_wmm_compute_driver_packet_delay(pmlan_private priv, - const pmlan_buffer pmbuf) +t_u8 wlan_wmm_compute_driver_packet_delay(pmlan_private priv, + const pmlan_buffer pmbuf) { t_u8 ret_val = 0; t_u32 out_ts_sec, out_ts_usec; @@ -2252,9 +2158,8 @@ wlan_wmm_compute_driver_packet_delay(pmlan_private priv, 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; @@ -2267,8 +2172,8 @@ wlan_wmm_compute_driver_packet_delay(pmlan_private priv, */ 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; @@ -2281,8 +2186,7 @@ wlan_wmm_compute_driver_packet_delay(pmlan_private priv, * * @return N/A */ -void -wlan_wmm_process_tx(pmlan_adapter pmadapter) +void wlan_wmm_process_tx(pmlan_adapter pmadapter) { ENTER(); @@ -2299,8 +2203,8 @@ wlan_wmm_process_tx(pmlan_adapter pmadapter) #ifdef PCIE if (IS_PCIE(pmadapter->card_type) && - (pmadapter->ireg & pmadapter->pcard_pcie->reg-> - host_intr_event_rdy)) + (pmadapter->ireg & + pmadapter->pcard_pcie->reg->host_intr_event_rdy)) break; #endif #ifdef USB @@ -2308,8 +2212,8 @@ wlan_wmm_process_tx(pmlan_adapter pmadapter) break; #endif /* Check if busy */ - } while (!pmadapter->data_sent && !pmadapter->tx_lock_flag - && !wlan_wmm_lists_empty(pmadapter)); + } while (!pmadapter->data_sent && !pmadapter->tx_lock_flag && + !wlan_wmm_lists_empty(pmadapter)); LEAVE(); return; @@ -2323,14 +2227,13 @@ wlan_wmm_process_tx(pmlan_adapter pmadapter) * * @return wmm_queue priority (0-3) */ -t_u8 -wlan_wmm_select_queue(mlan_private *pmpriv, t_u8 tid) +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)]; + pmpriv->wmm.ac_down_graded_vals[wlan_wmm_convert_tos_to_ac( + pmadapter, tid)]; ENTER(); @@ -2353,31 +2256,29 @@ wlan_wmm_select_queue(mlan_private *pmpriv, t_u8 tid) * * @return N/A */ -static INLINE t_u8 -wlan_del_tx_pkts_in_ralist(pmlan_private priv, - mlan_list_head *ra_list_head, int tid) +static INLINE t_u8 wlan_del_tx_pkts_in_ralist(pmlan_private priv, + 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); + 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))) { - pmbuf = (pmlan_buffer)util_dequeue_list(pmadapter-> - pmoal_handle, - &ra_list-> - buf_head, MNULL, - MNULL); + if (ra_list->total_pkts && + (ra_list->tx_pause || + (ra_list->total_pkts > RX_LOW_THRESHOLD))) { + pmbuf = (pmlan_buffer)util_dequeue_list( + pmadapter->pmoal_handle, &ra_list->buf_head, + MNULL, MNULL); if (pmbuf) { PRINTM(MDATA, - "Drop pkts: tid=%d tx_pause=%d pkts=%d " - MACSTR "\n", tid, ra_list->tx_pause, + "Drop pkts: tid=%d tx_pause=%d pkts=%d " MACSTR + "\n", + tid, ra_list->tx_pause, ra_list->total_pkts, MAC2STR(ra_list->ra)); wlan_write_data_complete(pmadapter, pmbuf, @@ -2388,11 +2289,10 @@ wlan_del_tx_pkts_in_ralist(pmlan_private priv, if (ra_list->tx_pause) priv->wmm.pkts_paused[tid]--; else - util_scalar_decrement(pmadapter-> - pmoal_handle, - &priv->wmm. - tx_pkts_queued, - MNULL, MNULL); + util_scalar_decrement( + pmadapter->pmoal_handle, + &priv->wmm.tx_pkts_queued, + MNULL, MNULL); ret = MTRUE; break; } @@ -2411,8 +2311,7 @@ wlan_del_tx_pkts_in_ralist(pmlan_private priv, * * @return N/A */ -t_void -wlan_drop_tx_pkts(pmlan_private priv) +t_void wlan_drop_tx_pkts(pmlan_private priv) { int j; static int i; @@ -2422,8 +2321,8 @@ wlan_drop_tx_pkts(pmlan_private priv) 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)) { + if (wlan_del_tx_pkts_in_ralist( + priv, &priv->wmm.tid_tbl_ptr[i].ra_list, i)) { i++; break; } @@ -2441,8 +2340,7 @@ wlan_drop_tx_pkts(pmlan_private priv) * * @return N/A */ -t_void -wlan_wmm_delete_peer_ralist(pmlan_private priv, t_u8 *mac) +t_void wlan_wmm_delete_peer_ralist(pmlan_private priv, t_u8 *mac) { raListTbl *ra_list; int i; @@ -2472,8 +2370,8 @@ wlan_wmm_delete_peer_ralist(pmlan_private priv, t_u8 *mac) (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; + (raListTbl *)&priv->wmm.tid_tbl_ptr[i] + .ra_list; } } if (pkt_cnt) { @@ -2503,9 +2401,9 @@ wlan_wmm_delete_peer_ralist(pmlan_private priv, t_u8 *mac) * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_wmm_addts_req(IN pmlan_private pmpriv, - OUT HostCmd_DS_COMMAND *cmd, IN t_void *pdata_buf) +mlan_status wlan_cmd_wmm_addts_req(IN pmlan_private pmpriv, + 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; @@ -2513,18 +2411,17 @@ wlan_cmd_wmm_addts_req(IN pmlan_private pmpriv, 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->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_ext(pmpriv->adapter, - pcmd_addts->tspec_data, - paddts->ie_data, paddts->ie_data_len, WMM_TSPEC_SIZE); + memcpy_ext(pmpriv->adapter, pcmd_addts->tspec_data, paddts->ie_data, + paddts->ie_data_len, WMM_TSPEC_SIZE); LEAVE(); @@ -2540,10 +2437,9 @@ wlan_cmd_wmm_addts_req(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_wmm_addts_req(IN pmlan_private pmpriv, - const IN HostCmd_DS_COMMAND *resp, - OUT mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_wmm_addts_req(IN pmlan_private pmpriv, + const IN HostCmd_DS_COMMAND *resp, + OUT mlan_ioctl_req *pioctl_buf) { mlan_ds_wmm_cfg *pwmm = MNULL; mlan_ds_wmm_addts *paddts = MNULL; @@ -2559,24 +2455,23 @@ wlan_ret_wmm_addts_req(IN pmlan_private pmpriv, paddts->status_code = (t_u32)presp_addts->ieee_status_code; if (paddts->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. + /* 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); + 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_ext(pmpriv->adapter, - paddts->ie_data, - presp_addts->tspec_data, - paddts->ie_data_len, + /* Copy the TSPEC data include any extra IEs after the + * TSPEC */ + memcpy_ext(pmpriv->adapter, paddts->ie_data, + presp_addts->tspec_data, paddts->ie_data_len, sizeof(paddts->ie_data)); } else { paddts->ie_data_len = 0; @@ -2585,8 +2480,8 @@ wlan_ret_wmm_addts_req(IN pmlan_private pmpriv, paddts->result, paddts->status_code, paddts->ie_data_len); - HEXDUMP("TSPEC: ADDTS data", - paddts->ie_data, paddts->ie_data_len); + HEXDUMP("TSPEC: ADDTS data", paddts->ie_data, + paddts->ie_data_len); } LEAVE(); @@ -2601,9 +2496,9 @@ wlan_ret_wmm_addts_req(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_wmm_delts_req(IN pmlan_private pmpriv, - OUT HostCmd_DS_COMMAND *cmd, IN t_void *pdata_buf) +mlan_status wlan_cmd_wmm_delts_req(IN pmlan_private pmpriv, + 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; @@ -2611,15 +2506,14 @@ wlan_cmd_wmm_delts_req(IN pmlan_private pmpriv, 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->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_ext(pmpriv->adapter, - pcmd_delts->tspec_data, - pdelts->ie_data, pdelts->ie_data_len, WMM_TSPEC_SIZE); + memcpy_ext(pmpriv->adapter, pcmd_delts->tspec_data, pdelts->ie_data, + pdelts->ie_data_len, WMM_TSPEC_SIZE); LEAVE(); @@ -2635,10 +2529,9 @@ wlan_cmd_wmm_delts_req(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_wmm_delts_req(IN pmlan_private pmpriv, - const IN HostCmd_DS_COMMAND *resp, - OUT mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_wmm_delts_req(IN pmlan_private pmpriv, + const IN HostCmd_DS_COMMAND *resp, + OUT mlan_ioctl_req *pioctl_buf) { mlan_ds_wmm_cfg *pwmm; IEEEtypes_WMM_TSPEC_t *ptspec_ie; @@ -2655,17 +2548,13 @@ wlan_ret_wmm_delts_req(IN pmlan_private pmpriv, presp_delts->command_result); if (pwmm->param.delts.result == 0) { - ptspec_ie = - (IEEEtypes_WMM_TSPEC_t *)presp_delts-> - tspec_data; - wlan_send_wmmac_host_event(pmpriv, "DELTS_TX", MNULL, - ptspec_ie->TspecBody.TSInfo. - TID, - ptspec_ie->TspecBody.TSInfo. - UserPri, - presp_delts-> - ieee_reason_code); - + ptspec_ie = (IEEEtypes_WMM_TSPEC_t *) + presp_delts->tspec_data; + wlan_send_wmmac_host_event( + pmpriv, "DELTS_TX", MNULL, + ptspec_ie->TspecBody.TSInfo.TID, + ptspec_ie->TspecBody.TSInfo.UserPri, + presp_delts->ieee_reason_code); } } @@ -2681,9 +2570,9 @@ wlan_ret_wmm_delts_req(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_wmm_queue_stats(IN pmlan_private pmpriv, - OUT HostCmd_DS_COMMAND *cmd, IN t_void *pdata_buf) +mlan_status wlan_cmd_wmm_queue_stats(IN pmlan_private pmpriv, + 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; @@ -2692,8 +2581,8 @@ wlan_cmd_wmm_queue_stats(IN pmlan_private pmpriv, 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->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_WMM_QUEUE_STATS) + S_DS_GEN); cmd->result = 0; pcmd_qstats->action = pqstats->action; @@ -2724,10 +2613,9 @@ wlan_cmd_wmm_queue_stats(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_wmm_queue_stats(IN pmlan_private pmpriv, - const IN HostCmd_DS_COMMAND *resp, - OUT mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_wmm_queue_stats(IN pmlan_private pmpriv, + 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; @@ -2745,17 +2633,16 @@ wlan_ret_wmm_queue_stats(IN pmlan_private pmpriv, 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->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); + 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]); + pqstats->delay_histogram[id] = wlan_le16_to_cpu( + presp_qstats->delay_histogram[id]); } } @@ -2771,9 +2658,9 @@ wlan_ret_wmm_queue_stats(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_wmm_ts_status(IN pmlan_private pmpriv, - OUT HostCmd_DS_COMMAND *cmd, IN t_void *pdata_buf) +mlan_status wlan_cmd_wmm_ts_status(IN pmlan_private pmpriv, + 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; @@ -2781,8 +2668,8 @@ wlan_cmd_wmm_ts_status(IN pmlan_private pmpriv, 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->size = + wlan_cpu_to_le16(sizeof(HostCmd_DS_WMM_TS_STATUS) + S_DS_GEN); cmd->result = 0; memcpy_ext(pmpriv->adapter, (t_void *)pcmd_ts_status, @@ -2802,10 +2689,9 @@ wlan_cmd_wmm_ts_status(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_wmm_ts_status(IN pmlan_private pmpriv, - IN HostCmd_DS_COMMAND *resp, - OUT mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_wmm_ts_status(IN pmlan_private pmpriv, + 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; @@ -2814,10 +2700,9 @@ wlan_ret_wmm_ts_status(IN pmlan_private pmpriv, 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_ext(pmpriv->adapter, - (t_void *)&pwmm->param.ts_status, + presp_ts_status->medium_time = + wlan_le16_to_cpu(presp_ts_status->medium_time); + memcpy_ext(pmpriv->adapter, (t_void *)&pwmm->param.ts_status, (t_void *)presp_ts_status, sizeof(mlan_ds_wmm_ts_status), sizeof(mlan_ds_wmm_ts_status)); @@ -2835,8 +2720,8 @@ wlan_ret_wmm_ts_status(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_wmm_ioctl_enable(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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]; @@ -2860,8 +2745,8 @@ wlan_wmm_ioctl_enable(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_wmm_ioctl_qos(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]; @@ -2891,9 +2776,8 @@ wlan_wmm_ioctl_qos(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_wmm_ioctl_addts_req(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) { mlan_status ret = MLAN_STATUS_SUCCESS; pmlan_private pmpriv = pmadapter->priv[pioctl_req->bss_index]; @@ -2903,8 +2787,8 @@ wlan_wmm_ioctl_addts_req(IN pmlan_adapter pmadapter, 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, + 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) @@ -2922,9 +2806,8 @@ wlan_wmm_ioctl_addts_req(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_wmm_ioctl_delts_req(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_wmm_ioctl_delts_req(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]; @@ -2934,8 +2817,8 @@ wlan_wmm_ioctl_delts_req(IN pmlan_adapter pmadapter, 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, + 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) @@ -2953,9 +2836,8 @@ wlan_wmm_ioctl_delts_req(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_wmm_ioctl_queue_stats(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_wmm_ioctl_queue_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]; @@ -2965,8 +2847,8 @@ wlan_wmm_ioctl_queue_stats(IN pmlan_adapter pmadapter, 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, + 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) @@ -2984,9 +2866,8 @@ wlan_wmm_ioctl_queue_stats(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success */ -static mlan_status -wlan_wmm_ioctl_queue_status(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_wmm_ioctl_queue_status(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]; @@ -3026,9 +2907,8 @@ wlan_wmm_ioctl_queue_status(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_wmm_ioctl_ts_status(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_wmm_ioctl_ts_status(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]; @@ -3039,8 +2919,8 @@ wlan_wmm_ioctl_ts_status(IN pmlan_adapter pmadapter, 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, + 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) @@ -3060,10 +2940,9 @@ wlan_wmm_ioctl_ts_status(IN pmlan_adapter pmadapter, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_wmm_param_config(IN pmlan_private pmpriv, - OUT HostCmd_DS_COMMAND *cmd, - IN t_u8 cmd_action, IN t_void *pdata_buf) +mlan_status wlan_cmd_wmm_param_config(IN pmlan_private pmpriv, + OUT HostCmd_DS_COMMAND *cmd, + IN t_u8 cmd_action, IN t_void *pdata_buf) { wmm_ac_parameters_t *ac_params = (wmm_ac_parameters_t *)pdata_buf; HostCmd_DS_WMM_PARAM_CONFIG *pcmd_cfg = &cmd->params.param_config; @@ -3072,9 +2951,8 @@ wlan_cmd_wmm_param_config(IN pmlan_private pmpriv, ENTER(); cmd->command = wlan_cpu_to_le16(HostCmd_CMD_WMM_PARAM_CONFIG); - cmd->size = - wlan_cpu_to_le16(sizeof(HostCmd_DS_WMM_PARAM_CONFIG) + - S_DS_GEN); + cmd->size = wlan_cpu_to_le16(sizeof(HostCmd_DS_WMM_PARAM_CONFIG) + + S_DS_GEN); cmd->result = 0; pcmd_cfg->action = cmd_action; @@ -3083,9 +2961,8 @@ wlan_cmd_wmm_param_config(IN pmlan_private pmpriv, sizeof(wmm_ac_parameters_t) * MAX_AC_QUEUES, sizeof(wmm_ac_parameters_t) * MAX_AC_QUEUES); for (i = 0; i < MAX_AC_QUEUES; i++) { - pcmd_cfg->ac_params[i].tx_op_limit = - wlan_cpu_to_le16(pcmd_cfg->ac_params[i]. - tx_op_limit); + pcmd_cfg->ac_params[i].tx_op_limit = wlan_cpu_to_le16( + pcmd_cfg->ac_params[i].tx_op_limit); } } LEAVE(); @@ -3101,14 +2978,13 @@ wlan_cmd_wmm_param_config(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_wmm_param_config(IN pmlan_private pmpriv, - const IN HostCmd_DS_COMMAND *resp, - OUT mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_wmm_param_config(IN pmlan_private pmpriv, + const IN HostCmd_DS_COMMAND *resp, + OUT mlan_ioctl_req *pioctl_buf) { mlan_ds_wmm_cfg *pwmm = MNULL; HostCmd_DS_WMM_PARAM_CONFIG *pcfg = - (HostCmd_DS_WMM_PARAM_CONFIG *) & resp->params.param_config; + (HostCmd_DS_WMM_PARAM_CONFIG *)&resp->params.param_config; t_u8 i; ENTER(); @@ -3116,9 +2992,8 @@ wlan_ret_wmm_param_config(IN pmlan_private pmpriv, if (pioctl_buf) { pwmm = (mlan_ds_wmm_cfg *)pioctl_buf->pbuf; for (i = 0; i < MAX_AC_QUEUES; i++) { - pcfg->ac_params[i].tx_op_limit = - wlan_le16_to_cpu(pcfg->ac_params[i]. - tx_op_limit); + pcfg->ac_params[i].tx_op_limit = wlan_le16_to_cpu( + pcfg->ac_params[i].tx_op_limit); } memcpy_ext(pmpriv->adapter, pwmm->param.ac_params, pcfg->ac_params, @@ -3138,9 +3013,9 @@ wlan_ret_wmm_param_config(IN pmlan_private pmpriv, * @param pdata_buf A pointer to data buffer * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_cmd_wmm_queue_config(IN pmlan_private pmpriv, - OUT HostCmd_DS_COMMAND *cmd, IN t_void *pdata_buf) +mlan_status wlan_cmd_wmm_queue_config(IN pmlan_private pmpriv, + 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; @@ -3148,10 +3023,9 @@ wlan_cmd_wmm_queue_config(IN pmlan_private pmpriv, 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->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; @@ -3172,10 +3046,9 @@ wlan_cmd_wmm_queue_config(IN pmlan_private pmpriv, * * @return MLAN_STATUS_SUCCESS */ -mlan_status -wlan_ret_wmm_queue_config(IN pmlan_private pmpriv, - const IN HostCmd_DS_COMMAND *resp, - OUT mlan_ioctl_req *pioctl_buf) +mlan_status wlan_ret_wmm_queue_config(IN pmlan_private pmpriv, + 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 = @@ -3204,9 +3077,8 @@ wlan_ret_wmm_queue_config(IN pmlan_private pmpriv, * * @return MLAN_STATUS_PENDING --success, otherwise fail */ -static mlan_status -wlan_wmm_ioctl_queue_config(IN pmlan_adapter pmadapter, - IN pmlan_ioctl_req pioctl_req) +static mlan_status wlan_wmm_ioctl_queue_config(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]; @@ -3216,8 +3088,8 @@ wlan_wmm_ioctl_queue_config(IN pmlan_adapter pmadapter, 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, + 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) @@ -3235,8 +3107,8 @@ wlan_wmm_ioctl_queue_config(IN pmlan_adapter pmadapter, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -mlan_status -wlan_wmm_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) +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; @@ -3296,8 +3168,7 @@ wlan_wmm_cfg_ioctl(IN pmlan_adapter pmadapter, IN pmlan_ioctl_req pioctl_req) * @return number of ralist entry * */ -int -wlan_get_ralist_info(mlan_private *priv, ralist_info *buf) +int wlan_get_ralist_info(mlan_private *priv, ralist_info *buf) { ralist_info *plist = buf; mlan_list_head *ra_list_head = MNULL; @@ -3337,8 +3208,7 @@ wlan_get_ralist_info(mlan_private *priv, ralist_info *buf) * @return N/A * */ -void -wlan_dump_ralist(mlan_private *priv) +void wlan_dump_ralist(mlan_private *priv) { mlan_list_head *ra_list_head = MNULL; raListTbl *ra_list; @@ -3382,8 +3252,7 @@ wlan_dump_ralist(mlan_private *priv) * @return tid_down * */ -int -wlan_get_wmm_tid_down(mlan_private *priv, int tid) +int wlan_get_wmm_tid_down(mlan_private *priv, int tid) { return wlan_wmm_downgrade_tid(priv, tid); } diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_wmm.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_wmm.h index aaee5e81cc1b..bf7e4ad115b7 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_wmm.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlan/mlan_wmm.h @@ -37,8 +37,7 @@ Change log: * * @return TID */ -static INLINE t_u32 -wlan_get_tid(pmlan_adapter pmadapter, raListTbl *ptr) +static INLINE t_u32 wlan_get_tid(pmlan_adapter pmadapter, raListTbl *ptr) { pmlan_buffer mbuf; @@ -48,7 +47,7 @@ wlan_get_tid(pmlan_adapter pmadapter, raListTbl *ptr) LEAVE(); if (!mbuf) { - return 0; // The default TID,BE + return 0; // The default TID,BE } else return mbuf->priority; } @@ -60,8 +59,7 @@ wlan_get_tid(pmlan_adapter pmadapter, raListTbl *ptr) * * @return Length of list */ -static INLINE t_u32 -wlan_wmm_list_len(pmlan_list_head head) +static INLINE t_u32 wlan_wmm_list_len(pmlan_list_head head) { pmlan_linked_list pos; t_u32 count = 0; @@ -86,8 +84,7 @@ wlan_wmm_list_len(pmlan_list_head head) * * @return N/A */ -static INLINE t_void -wlan_request_ralist_lock(IN mlan_private *priv) +static INLINE t_void wlan_request_ralist_lock(IN mlan_private *priv) { mlan_adapter *pmadapter = priv->adapter; mlan_callbacks *pcb = (mlan_callbacks *)&pmadapter->callbacks; @@ -109,8 +106,7 @@ wlan_request_ralist_lock(IN mlan_private *priv) * * @return N/A */ -static INLINE t_void -wlan_release_ralist_lock(IN mlan_private *priv) +static INLINE t_void wlan_release_ralist_lock(IN mlan_private *priv) { mlan_adapter *pmadapter = priv->adapter; mlan_callbacks *pcb = (mlan_callbacks *)&pmadapter->callbacks; @@ -211,8 +207,8 @@ extern mlan_status wlan_cmd_wmm_ts_status(IN pmlan_private pmpriv, * 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); +extern mlan_status wlan_ret_wmm_get_status(IN pmlan_private priv, 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, diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/mlan_decl.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/mlan_decl.h index 1ed0c9eb1f47..b3ae85b45217 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/mlan_decl.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/mlan_decl.h @@ -24,7 +24,7 @@ #define _MLAN_DECL_H_ /** MLAN release version */ -#define MLAN_RELEASE_VERSION "169" +#define MLAN_RELEASE_VERSION "175" /** Re-define generic data types for MLAN/MOAL */ /** Signed char (1-byte) */ @@ -68,7 +68,7 @@ typedef t_s32 t_sval; /** Structure packing begins */ #define MLAN_PACK_START /** Structure packeing end */ -#define MLAN_PACK_END __attribute__((packed)) +#define MLAN_PACK_END __attribute__((packed)) #else /* !__GNUC__ */ #ifdef PRAGMA_PACK /** Structure packing begins */ @@ -77,7 +77,7 @@ typedef t_s32 t_sval; #define MLAN_PACK_END #else /* !PRAGMA_PACK */ /** Structure packing begins */ -#define MLAN_PACK_START __packed +#define MLAN_PACK_START __packed /** Structure packing end */ #define MLAN_PACK_END #endif /* PRAGMA_PACK */ @@ -86,17 +86,17 @@ typedef t_s32 t_sval; #ifndef INLINE #ifdef __GNUC__ /** inline directive */ -#define INLINE inline +#define INLINE inline #else /** inline directive */ -#define INLINE __inline +#define INLINE __inline #endif #endif /** MLAN TRUE */ -#define MTRUE (1) +#define MTRUE (1) /** MLAN FALSE */ -#define MFALSE (0) +#define MFALSE (0) #ifndef MACSTR /** MAC address security format */ @@ -116,110 +116,109 @@ typedef t_s32 t_sval; #endif /** Macros for Data Alignment : size */ -#define ALIGN_SZ(p, a) \ - (((p) + ((a) - 1)) & ~((a) - 1)) +#define ALIGN_SZ(p, a) (((p) + ((a)-1)) & ~((a)-1)) /** Macros for Data Alignment : address */ -#define ALIGN_ADDR(p, a) \ +#define ALIGN_ADDR(p, a) \ ((((t_ptr)(p)) + (((t_ptr)(a)) - 1)) & ~(((t_ptr)(a)) - 1)) /** Return the byte offset of a field in the given structure */ -#define MLAN_FIELD_OFFSET(type, field) ((t_u32)(t_ptr)&(((type *)0)->field)) +#define MLAN_FIELD_OFFSET(type, field) ((t_u32)(t_ptr) & (((type *)0)->field)) /** Return aligned offset */ #define OFFSET_ALIGN_ADDR(p, a) (t_u32)(ALIGN_ADDR(p, a) - (t_ptr)p) #if defined(WIFI_DIRECT_SUPPORT) /** Maximum BSS numbers */ -#define MLAN_MAX_BSS_NUM (16) +#define MLAN_MAX_BSS_NUM (16) #else /** Maximum BSS numbers */ -#define MLAN_MAX_BSS_NUM (2) +#define MLAN_MAX_BSS_NUM (2) #endif /** NET IP alignment */ -#define MLAN_NET_IP_ALIGN 2 +#define MLAN_NET_IP_ALIGN 2 /** DMA alignment */ /* SDIO3.0 Inrevium Adapter require 32 bit DMA alignment */ -#define DMA_ALIGNMENT 32 +#define DMA_ALIGNMENT 32 /** max size of TxPD */ -#define MAX_TXPD_SIZE 32 +#define MAX_TXPD_SIZE 32 /** Minimum data header length */ -#define MLAN_MIN_DATA_HEADER_LEN (DMA_ALIGNMENT+MAX_TXPD_SIZE) +#define MLAN_MIN_DATA_HEADER_LEN (DMA_ALIGNMENT + MAX_TXPD_SIZE) /** rx data header length */ -#define MLAN_RX_HEADER_LEN MLAN_MIN_DATA_HEADER_LEN +#define MLAN_RX_HEADER_LEN MLAN_MIN_DATA_HEADER_LEN /** This is current limit on Maximum Tx AMPDU allowed */ -#define MLAN_MAX_TX_BASTREAM_SUPPORTED 16 -#define MLAN_MAX_TX_BASTREAM_DEFAULT 2 +#define MLAN_MAX_TX_BASTREAM_SUPPORTED 16 +#define MLAN_MAX_TX_BASTREAM_DEFAULT 2 /** This is current limit on Maximum Rx AMPDU allowed */ -#define MLAN_MAX_RX_BASTREAM_SUPPORTED 16 +#define MLAN_MAX_RX_BASTREAM_SUPPORTED 16 #ifdef STA_SUPPORT /** Default Win size attached during ADDBA request */ -#define MLAN_STA_AMPDU_DEF_TXWINSIZE 64 +#define MLAN_STA_AMPDU_DEF_TXWINSIZE 64 /** Default Win size attached during ADDBA response */ -#define MLAN_STA_AMPDU_DEF_RXWINSIZE 64 +#define MLAN_STA_AMPDU_DEF_RXWINSIZE 64 /** RX winsize for COEX */ -#define MLAN_STA_COEX_AMPDU_DEF_RXWINSIZE 16 +#define MLAN_STA_COEX_AMPDU_DEF_RXWINSIZE 16 #endif /* STA_SUPPORT */ #ifdef UAP_SUPPORT /** Default Win size attached during ADDBA request */ -#define MLAN_UAP_AMPDU_DEF_TXWINSIZE 64 +#define MLAN_UAP_AMPDU_DEF_TXWINSIZE 64 /** Default Win size attached during ADDBA response */ -#define MLAN_UAP_AMPDU_DEF_RXWINSIZE 64 +#define MLAN_UAP_AMPDU_DEF_RXWINSIZE 64 /** RX winsize for COEX */ -#define MLAN_UAP_COEX_AMPDU_DEF_RXWINSIZE 16 +#define MLAN_UAP_COEX_AMPDU_DEF_RXWINSIZE 16 #endif /* UAP_SUPPORT */ #ifdef WIFI_DIRECT_SUPPORT /** WFD use the same window size for tx/rx */ -#define MLAN_WFD_AMPDU_DEF_TXRXWINSIZE 64 +#define MLAN_WFD_AMPDU_DEF_TXRXWINSIZE 64 /** RX winsize for COEX */ -#define MLAN_WFD_COEX_AMPDU_DEF_RXWINSIZE 16 +#define MLAN_WFD_COEX_AMPDU_DEF_RXWINSIZE 16 #endif /** Block ack timeout value */ -#define MLAN_DEFAULT_BLOCK_ACK_TIMEOUT 0xffff +#define MLAN_DEFAULT_BLOCK_ACK_TIMEOUT 0xffff /** Maximum Tx Win size configured for ADDBA request [10 bits] */ -#define MLAN_AMPDU_MAX_TXWINSIZE 0x3ff +#define MLAN_AMPDU_MAX_TXWINSIZE 0x3ff /** Maximum Rx Win size configured for ADDBA request [10 bits] */ -#define MLAN_AMPDU_MAX_RXWINSIZE 0x3ff +#define MLAN_AMPDU_MAX_RXWINSIZE 0x3ff /** Rate index for HR/DSSS 0 */ #define MLAN_RATE_INDEX_HRDSSS0 0 /** Rate index for HR/DSSS 3 */ #define MLAN_RATE_INDEX_HRDSSS3 3 /** Rate index for OFDM 0 */ -#define MLAN_RATE_INDEX_OFDM0 4 +#define MLAN_RATE_INDEX_OFDM0 4 /** Rate index for OFDM 7 */ -#define MLAN_RATE_INDEX_OFDM7 11 +#define MLAN_RATE_INDEX_OFDM7 11 /** Rate index for MCS 0 */ -#define MLAN_RATE_INDEX_MCS0 0 +#define MLAN_RATE_INDEX_MCS0 0 /** Rate index for MCS 7 */ -#define MLAN_RATE_INDEX_MCS7 7 +#define MLAN_RATE_INDEX_MCS7 7 /** Rate index for MCS 9 */ -#define MLAN_RATE_INDEX_MCS9 9 +#define MLAN_RATE_INDEX_MCS9 9 /** Rate index for MCS11 */ -#define MLAN_RATE_INDEX_MCS11 11 +#define MLAN_RATE_INDEX_MCS11 11 /** Rate index for MCS15 */ -#define MLAN_RATE_INDEX_MCS15 15 +#define MLAN_RATE_INDEX_MCS15 15 /** Rate index for MCS 32 */ -#define MLAN_RATE_INDEX_MCS32 32 +#define MLAN_RATE_INDEX_MCS32 32 /** Rate index for MCS 127 */ -#define MLAN_RATE_INDEX_MCS127 127 -#define MLAN_RATE_NSS1 1 -#define MLAN_RATE_NSS2 2 +#define MLAN_RATE_INDEX_MCS127 127 +#define MLAN_RATE_NSS1 1 +#define MLAN_RATE_NSS2 2 /** Rate bitmap for OFDM 0 */ -#define MLAN_RATE_BITMAP_OFDM0 16 +#define MLAN_RATE_BITMAP_OFDM0 16 /** Rate bitmap for OFDM 7 */ -#define MLAN_RATE_BITMAP_OFDM7 23 +#define MLAN_RATE_BITMAP_OFDM7 23 /** Rate bitmap for MCS 0 */ -#define MLAN_RATE_BITMAP_MCS0 32 +#define MLAN_RATE_BITMAP_MCS0 32 /** Rate bitmap for MCS 127 */ #define MLAN_RATE_BITMAP_MCS127 159 #define MLAN_RATE_BITMAP_NSS1_MCS0 160 @@ -228,18 +227,18 @@ typedef t_s32 t_sval; #define MLAN_RATE_BITMAP_NSS2_MCS9 185 /** MU beamformer */ -#define DEFALUT_11AC_CAP_BEAMFORMING_RESET_MASK (MBIT(19)) +#define DEFALUT_11AC_CAP_BEAMFORMING_RESET_MASK (MBIT(19)) /** Size of rx data buffer 4096+256 */ -#define MLAN_RX_DATA_BUF_SIZE 4352 +#define MLAN_RX_DATA_BUF_SIZE 4352 /** Size of command buffer */ /** because cal_data_size 2.4 k */ -#define MRVDRV_SIZE_OF_CMD_BUFFER (3 * 1024) +#define MRVDRV_SIZE_OF_CMD_BUFFER (3 * 1024) /** Size of rx command buffer */ -#define MLAN_RX_CMD_BUF_SIZE MRVDRV_SIZE_OF_CMD_BUFFER +#define MLAN_RX_CMD_BUF_SIZE MRVDRV_SIZE_OF_CMD_BUFFER /** Upload size */ -#define WLAN_UPLD_SIZE MRVDRV_SIZE_OF_CMD_BUFFER +#define WLAN_UPLD_SIZE MRVDRV_SIZE_OF_CMD_BUFFER #if defined(PCIE) #define MLAN_SSU_MAX_PKT_SIZE (283 * 4) @@ -248,15 +247,15 @@ typedef t_s32 t_sval; * Size of DMA buffer to collect 10ms SSU data: * 2500 spectral packets, plus header */ -#define MLAN_SSU_BUF_SIZE_1MS MLAN_SSU_MAX_PKT_SIZE * 250 -#define MLAN_SSU_BUF_SIZE (MLAN_SSU_HEADER_SIZE + MLAN_SSU_BUF_SIZE_1MS * 10) +#define MLAN_SSU_BUF_SIZE_1MS (MLAN_SSU_MAX_PKT_SIZE * 250) +#define MLAN_SSU_BUF_SIZE (MLAN_SSU_HEADER_SIZE + MLAN_SSU_BUF_SIZE_1MS * 10) #define MLAN_SSU_BUF_SIZE_HOST (MLAN_SSU_BUF_SIZE) #endif /** driver initial the fw reset */ -#define FW_RELOAD_SDIO_INBAND_RESET 1 +#define FW_RELOAD_SDIO_INBAND_RESET 1 /** out band reset trigger reset, no interface re-emulation */ -#define FW_RELOAD_NO_EMULATION 2 +#define FW_RELOAD_NO_EMULATION 2 /** out band reset with interface re-emulation */ #define FW_RELOAD_WITH_EMULATION 3 #ifdef PCIE @@ -265,128 +264,130 @@ typedef t_s32 t_sval; #endif #ifdef USB -#define MLAN_USB_BLOCK_SIZE (512) -#define MLAN_USB_AGGR_MODE_NUM (0) -#define MLAN_USB_AGGR_MODE_LEN (1) -#define MLAN_USB_AGGR_MODE_LEN_V2 (2) -#define MLAN_USB_TX_AGGR_MAX_LEN (16000) -#define MLAN_USB_TX_AGGR_MAX_NUM 10 -#define MLAN_USB_TX_AGGR_V2_ALIGN 4 -#define MLAN_USB_TX_AGGR_HEADER 4 -#define MLAN_USB_MAX_PKT_SIZE (MLAN_USB_BLOCK_SIZE * 4) +#define MLAN_USB_BLOCK_SIZE (512) +#define MLAN_USB_AGGR_MODE_NUM (0) +#define MLAN_USB_AGGR_MODE_LEN (1) +#define MLAN_USB_AGGR_MODE_LEN_V2 (2) +#define MLAN_USB_TX_AGGR_MAX_LEN (16000) +#define MLAN_USB_TX_AGGR_MAX_NUM 10 +#define MLAN_USB_TX_AGGR_V2_ALIGN 4 +#define MLAN_USB_TX_AGGR_HEADER 4 +#define MLAN_USB_MAX_PKT_SIZE (MLAN_USB_BLOCK_SIZE * 4) -#define MLAN_USB_RX_ALIGN_SIZE MLAN_USB_BLOCK_SIZE -#define MLAN_USB_RX_MAX_AGGR_NUM (8) +#define MLAN_USB_RX_ALIGN_SIZE MLAN_USB_BLOCK_SIZE +#define MLAN_USB_RX_MAX_AGGR_NUM (8) #define MLAN_USB_RX_DEAGGR_TIMEOUT_USEC (200) -#define MLAN_USB_TX_AGGR_ALIGN (MLAN_USB_BLOCK_SIZE * 4) -#define MLAN_USB_TX_MAX_AGGR_NUM (8) -#define MLAN_USB_TX_MAX_AGGR_SIZE (MLAN_USB_BLOCK_SIZE * 4 * MLAN_USB_TX_MAX_AGGR_NUM) -#define MLAN_USB_TX_MIN_AGGR_TIMEOUT (1) -#define MLAN_USB_TX_MAX_AGGR_TIMEOUT (4) -#define MLAN_USB_TX_AGGR_TIMEOUT_MSEC MLAN_USB_TX_MIN_AGGR_TIMEOUT -#define MLAN_USB_TX_AGGR_TIMEOUT_DYN (0xFFFF) +#define MLAN_USB_TX_AGGR_ALIGN (MLAN_USB_BLOCK_SIZE * 4) +#define MLAN_USB_TX_MAX_AGGR_NUM (8) +#define MLAN_USB_TX_MAX_AGGR_SIZE \ + (MLAN_USB_BLOCK_SIZE * 4 * MLAN_USB_TX_MAX_AGGR_NUM) +#define MLAN_USB_TX_MIN_AGGR_TIMEOUT (1) +#define MLAN_USB_TX_MAX_AGGR_TIMEOUT (4) +#define MLAN_USB_TX_AGGR_TIMEOUT_MSEC MLAN_USB_TX_MIN_AGGR_TIMEOUT +#define MLAN_USB_TX_AGGR_TIMEOUT_DYN (0xFFFF) #endif /*USB*/ + /** MLAN MAC Address Length */ -#define MLAN_MAC_ADDR_LENGTH (6) +#define MLAN_MAC_ADDR_LENGTH (6) /** MLAN 802.11 MAC Address */ - typedef t_u8 mlan_802_11_mac_addr[MLAN_MAC_ADDR_LENGTH]; +typedef t_u8 mlan_802_11_mac_addr[MLAN_MAC_ADDR_LENGTH]; /** MLAN Maximum SSID Length */ -#define MLAN_MAX_SSID_LENGTH (32) +#define MLAN_MAX_SSID_LENGTH (32) /** RTS/FRAG related defines */ /** Minimum RTS value */ -#define MLAN_RTS_MIN_VALUE (0) +#define MLAN_RTS_MIN_VALUE (0) /** Maximum RTS value */ -#define MLAN_RTS_MAX_VALUE (2347) +#define MLAN_RTS_MAX_VALUE (2347) /** Minimum FRAG value */ -#define MLAN_FRAG_MIN_VALUE (256) +#define MLAN_FRAG_MIN_VALUE (256) /** Maximum FRAG value */ -#define MLAN_FRAG_MAX_VALUE (2346) +#define MLAN_FRAG_MAX_VALUE (2346) /** Minimum tx retry count */ -#define MLAN_TX_RETRY_MIN (0) +#define MLAN_TX_RETRY_MIN (0) /** Maximum tx retry count */ -#define MLAN_TX_RETRY_MAX (14) +#define MLAN_TX_RETRY_MAX (14) /** max Wmm AC queues */ -#define MAX_AC_QUEUES 4 +#define MAX_AC_QUEUES 4 #ifdef SDIO /** define SDIO block size for data Tx/Rx */ /* We support up to 480-byte block size due to FW buffer limitation. */ -#define MLAN_SDIO_BLOCK_SIZE 256 +#define MLAN_SDIO_BLOCK_SIZE 256 /** define SDIO block size for firmware download */ -#define MLAN_SDIO_BLOCK_SIZE_FW_DNLD MLAN_SDIO_BLOCK_SIZE +#define MLAN_SDIO_BLOCK_SIZE_FW_DNLD MLAN_SDIO_BLOCK_SIZE /** define allocated buffer size */ -#define ALLOC_BUF_SIZE MLAN_RX_DATA_BUF_SIZE +#define ALLOC_BUF_SIZE MLAN_RX_DATA_BUF_SIZE /** SDIO MP aggr pkt limit */ -#define SDIO_MP_AGGR_DEF_PKT_LIMIT (16) +#define SDIO_MP_AGGR_DEF_PKT_LIMIT (16) /** max SDIO MP aggr pkt limit */ -#define SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX (16) +#define SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX (16) /** SDIO IO Port mask */ -#define MLAN_SDIO_IO_PORT_MASK 0xfffff +#define MLAN_SDIO_IO_PORT_MASK 0xfffff /** SDIO Block/Byte mode mask */ -#define MLAN_SDIO_BYTE_MODE_MASK 0x80000000 +#define MLAN_SDIO_BYTE_MODE_MASK 0x80000000 #endif /* SDIO */ /** SD Interface */ -#define INTF_SD MBIT(0) -#define IS_SD(ct) (ct & (INTF_SD << 8)) +#define INTF_SD MBIT(0) +#define IS_SD(ct) (ct & (INTF_SD << 8)) /** PCIE Interface */ -#define INTF_PCIE MBIT(1) +#define INTF_PCIE MBIT(1) #define IS_PCIE(ct) (ct & (INTF_PCIE << 8)) /** USB Interface */ -#define INTF_USB MBIT(2) -#define IS_USB(ct) (ct & (INTF_USB << 8)) +#define INTF_USB MBIT(2) +#define IS_USB(ct) (ct & (INTF_USB << 8)) /** 8887 card type */ -#define CARD_TYPE_8887 0x01 +#define CARD_TYPE_8887 0x01 /** 8897 card type */ -#define CARD_TYPE_8897 0x02 +#define CARD_TYPE_8897 0x02 /** 8977 card type */ -#define CARD_TYPE_8977 0x03 +#define CARD_TYPE_8977 0x03 /** 8997 card type */ -#define CARD_TYPE_8997 0x04 +#define CARD_TYPE_8997 0x04 /** 8987 card type */ -#define CARD_TYPE_8987 0x05 +#define CARD_TYPE_8987 0x05 /** 9098 card type */ -#define CARD_TYPE_9098 0x06 +#define CARD_TYPE_9098 0x06 /** 9097 card type */ -#define CARD_TYPE_9097 0x07 +#define CARD_TYPE_9097 0x07 /** 8978 card type */ -#define CARD_TYPE_8978 0x08 +#define CARD_TYPE_8978 0x08 /** 9098 A0 reverion num */ -#define CHIP_9098_REV_A0 1 -#define CHIP_9098_REV_A1 2 +#define CHIP_9098_REV_A0 1 +#define CHIP_9098_REV_A1 2 /** 9097 CHIP REV */ -#define CHIP_9097_REV_B0 1 +#define CHIP_9097_REV_B0 1 #define INTF_MASK 0xff #define CARD_TYPE_MASK 0xff #ifdef SDIO /** SD8887 card type */ -#define CARD_TYPE_SD8887 (CARD_TYPE_8887 | (INTF_SD << 8)) +#define CARD_TYPE_SD8887 (CARD_TYPE_8887 | (INTF_SD << 8)) /** SD8897 card type */ -#define CARD_TYPE_SD8897 (CARD_TYPE_8897 | (INTF_SD << 8)) +#define CARD_TYPE_SD8897 (CARD_TYPE_8897 | (INTF_SD << 8)) /** SD8977 card type */ -#define CARD_TYPE_SD8977 (CARD_TYPE_8977 | (INTF_SD << 8)) +#define CARD_TYPE_SD8977 (CARD_TYPE_8977 | (INTF_SD << 8)) /** SD8978 card type */ -#define CARD_TYPE_SD8978 (CARD_TYPE_8978 | (INTF_SD << 8)) +#define CARD_TYPE_SD8978 (CARD_TYPE_8978 | (INTF_SD << 8)) /** SD8997 card type */ -#define CARD_TYPE_SD8997 (CARD_TYPE_8997 | (INTF_SD << 8)) +#define CARD_TYPE_SD8997 (CARD_TYPE_8997 | (INTF_SD << 8)) /** SD8987 card type */ -#define CARD_TYPE_SD8987 (CARD_TYPE_8987 | (INTF_SD << 8)) +#define CARD_TYPE_SD8987 (CARD_TYPE_8987 | (INTF_SD << 8)) /** SD9097 card type */ -#define CARD_TYPE_SD9097 (CARD_TYPE_9097 | (INTF_SD << 8)) +#define CARD_TYPE_SD9097 (CARD_TYPE_9097 | (INTF_SD << 8)) /** SD9098 card type */ -#define CARD_TYPE_SD9098 (CARD_TYPE_9098 | (INTF_SD << 8)) +#define CARD_TYPE_SD9098 (CARD_TYPE_9098 | (INTF_SD << 8)) #define IS_SD8887(ct) (CARD_TYPE_SD8887 == (ct)) #define IS_SD8897(ct) (CARD_TYPE_SD8897 == (ct)) @@ -398,32 +399,32 @@ typedef t_s32 t_sval; #define IS_SD9098(ct) (CARD_TYPE_SD9098 == (ct)) /** SD8887 Card */ -#define CARD_SD8887 "SD8887" +#define CARD_SD8887 "SD8887" /** SD8897 Card */ -#define CARD_SD8897 "SD8897" +#define CARD_SD8897 "SD8897" /** SD8977 Card */ -#define CARD_SD8977 "SD8977" +#define CARD_SD8977 "SD8977" /** SD8978 Card */ -#define CARD_SD8978 "SD8978" +#define CARD_SD8978 "SD8978" /** SD8997 Card */ -#define CARD_SD8997 "SD8997" +#define CARD_SD8997 "SD8997" /** SD8987 Card */ -#define CARD_SD8987 "SD8987" +#define CARD_SD8987 "SD8987" /** SD9097 Card */ -#define CARD_SD9097 "SD9097" +#define CARD_SD9097 "SD9097" /** SD9098 Card */ -#define CARD_SD9098 "SD9098" +#define CARD_SD9098 "SD9098" #endif #ifdef PCIE /** PCIE8897 card type */ -#define CARD_TYPE_PCIE8897 (CARD_TYPE_8897 | (INTF_PCIE << 8)) +#define CARD_TYPE_PCIE8897 (CARD_TYPE_8897 | (INTF_PCIE << 8)) /** PCIE8997 card type */ -#define CARD_TYPE_PCIE8997 (CARD_TYPE_8997 | (INTF_PCIE << 8)) +#define CARD_TYPE_PCIE8997 (CARD_TYPE_8997 | (INTF_PCIE << 8)) /** PCIE9097 card type */ -#define CARD_TYPE_PCIE9097 (CARD_TYPE_9097 | (INTF_PCIE << 8)) +#define CARD_TYPE_PCIE9097 (CARD_TYPE_9097 | (INTF_PCIE << 8)) /** PCIE9098 card type */ -#define CARD_TYPE_PCIE9098 (CARD_TYPE_9098 | (INTF_PCIE << 8)) +#define CARD_TYPE_PCIE9098 (CARD_TYPE_9098 | (INTF_PCIE << 8)) #define IS_PCIE8897(ct) (CARD_TYPE_PCIE8897 == (ct)) #define IS_PCIE8997(ct) (CARD_TYPE_PCIE8997 == (ct)) @@ -431,28 +432,28 @@ typedef t_s32 t_sval; #define IS_PCIE9098(ct) (CARD_TYPE_PCIE9098 == (ct)) /** PCIE8897 Card */ -#define CARD_PCIE8897 "PCIE8897" +#define CARD_PCIE8897 "PCIE8897" /** PCIE8997 Card */ -#define CARD_PCIE8997 "PCIE8997" +#define CARD_PCIE8997 "PCIE8997" /** PCIE9097 Card */ -#define CARD_PCIE9097 "PCIE9097" +#define CARD_PCIE9097 "PCIE9097" /** PCIE9000S Card */ -#define CARD_PCIE9000S "PCIE9000S" +#define CARD_PCIE9000S "PCIE9000S" /** PCIE9098 Card */ -#define CARD_PCIE9098 "PCIE9098" +#define CARD_PCIE9098 "PCIE9098" #endif #ifdef USB /** USB8897 card type */ -#define CARD_TYPE_USB8897 (CARD_TYPE_8897 | (INTF_USB << 8)) +#define CARD_TYPE_USB8897 (CARD_TYPE_8897 | (INTF_USB << 8)) /** USB8997 card type */ -#define CARD_TYPE_USB8997 (CARD_TYPE_8997 | (INTF_USB << 8)) +#define CARD_TYPE_USB8997 (CARD_TYPE_8997 | (INTF_USB << 8)) /** USB8978 card type */ -#define CARD_TYPE_USB8978 (CARD_TYPE_8978 | (INTF_USB << 8)) +#define CARD_TYPE_USB8978 (CARD_TYPE_8978 | (INTF_USB << 8)) /** USB9098 card type */ -#define CARD_TYPE_USB9098 (CARD_TYPE_9098 | (INTF_USB << 8)) +#define CARD_TYPE_USB9098 (CARD_TYPE_9098 | (INTF_USB << 8)) /** USB9097 card type */ -#define CARD_TYPE_USB9097 (CARD_TYPE_9097 | (INTF_USB << 8)) +#define CARD_TYPE_USB9097 (CARD_TYPE_9097 | (INTF_USB << 8)) #define IS_USB8897(ct) (CARD_TYPE_USB8897 == (ct)) #define IS_USB8997(ct) (CARD_TYPE_USB8997 == (ct)) @@ -461,24 +462,24 @@ typedef t_s32 t_sval; #define IS_USB9097(ct) (CARD_TYPE_USB9097 == (ct)) /** USB8897 Card */ -#define CARD_USB8897 "USB8897" +#define CARD_USB8897 "USB8897" /** USB8997 Card */ -#define CARD_USB8997 "USB8997" +#define CARD_USB8997 "USB8997" /** USB8978 Card */ -#define CARD_USB8978 "USB8978" +#define CARD_USB8978 "USB8978" /** USB9098 Card */ -#define CARD_USB9098 "USB9098" +#define CARD_USB9098 "USB9098" /** USB9097 Card */ -#define CARD_USB9097 "USB9097" +#define CARD_USB9097 "USB9097" #endif -#define IS_CARD8887(ct) (CARD_TYPE_8887 == ((ct) & 0xf)) -#define IS_CARD8897(ct) (CARD_TYPE_8897 == ((ct) & 0xf)) -#define IS_CARD8977(ct) (CARD_TYPE_8977 == ((ct) & 0xf)) -#define IS_CARD8997(ct) (CARD_TYPE_8997 == ((ct) & 0xf)) -#define IS_CARD8987(ct) (CARD_TYPE_8987 == ((ct) & 0xf)) -#define IS_CARD9098(ct) (CARD_TYPE_9098 == ((ct) & 0xf)) -#define IS_CARD9097(ct) (CARD_TYPE_9097 == ((ct) & 0xf)) +#define IS_CARD8887(ct) (CARD_TYPE_8887 == ((ct)&0xf)) +#define IS_CARD8897(ct) (CARD_TYPE_8897 == ((ct)&0xf)) +#define IS_CARD8977(ct) (CARD_TYPE_8977 == ((ct)&0xf)) +#define IS_CARD8997(ct) (CARD_TYPE_8997 == ((ct)&0xf)) +#define IS_CARD8987(ct) (CARD_TYPE_8987 == ((ct)&0xf)) +#define IS_CARD9098(ct) (CARD_TYPE_9098 == ((ct)&0xf)) +#define IS_CARD9097(ct) (CARD_TYPE_9097 == ((ct)&0xf)) typedef struct _card_type_entry { t_u16 card_type; @@ -488,7 +489,7 @@ typedef struct _card_type_entry { #if defined(SDIO) || defined(PCIE) /** Max retry number of IO write */ -#define MAX_WRITE_IOMEM_RETRY 2 +#define MAX_WRITE_IOMEM_RETRY 2 #endif /* SDIO || PCIE */ #ifdef PCIE @@ -506,73 +507,73 @@ typedef enum { #define OUT /** BIT value */ -#define MBIT(x) (((t_u32)1) << (x)) +#define MBIT(x) (((t_u32)1) << (x)) /** Buffer flag for requeued packet */ -#define MLAN_BUF_FLAG_REQUEUED_PKT MBIT(0) +#define MLAN_BUF_FLAG_REQUEUED_PKT MBIT(0) /** Buffer flag for transmit buf from moal */ -#define MLAN_BUF_FLAG_MOAL_TX_BUF MBIT(1) +#define MLAN_BUF_FLAG_MOAL_TX_BUF MBIT(1) /** Buffer flag for malloc mlan_buffer */ -#define MLAN_BUF_FLAG_MALLOC_BUF MBIT(2) +#define MLAN_BUF_FLAG_MALLOC_BUF MBIT(2) /** Buffer flag for bridge packet */ -#define MLAN_BUF_FLAG_BRIDGE_BUF MBIT(3) +#define MLAN_BUF_FLAG_BRIDGE_BUF MBIT(3) #ifdef USB /** Buffer flag for deaggregated rx packet */ -#define MLAN_BUF_FLAG_RX_DEAGGR MBIT(5) +#define MLAN_BUF_FLAG_RX_DEAGGR MBIT(5) /** Buffer flag for sleep confirm resp packet */ -#define MLAN_BUF_FLAG_SLEEPCFM_RESP MBIT(6) +#define MLAN_BUF_FLAG_SLEEPCFM_RESP MBIT(6) /** Buffer flag for USB TX AGGR */ -#define MLAN_BUF_FLAG_USB_TX_AGGR MBIT(7) +#define MLAN_BUF_FLAG_USB_TX_AGGR MBIT(7) #endif /** Buffer flag for TCP_ACK */ -#define MLAN_BUF_FLAG_TCP_ACK MBIT(9) +#define MLAN_BUF_FLAG_TCP_ACK MBIT(9) /** Buffer flag for TX_STATUS */ -#define MLAN_BUF_FLAG_TX_STATUS MBIT(10) +#define MLAN_BUF_FLAG_TX_STATUS MBIT(10) /** Buffer flag for NULL data packet */ -#define MLAN_BUF_FLAG_NULL_PKT MBIT(12) +#define MLAN_BUF_FLAG_NULL_PKT MBIT(12) /** Buffer flag for Diag pkt */ -#define MLAN_BUF_FLAG_DIAG_BUF MBIT(13) +#define MLAN_BUF_FLAG_DIAG_BUF MBIT(13) -#define MLAN_BUF_FLAG_TX_CTRL MBIT(14) +#define MLAN_BUF_FLAG_TX_CTRL MBIT(14) #ifdef DEBUG_LEVEL1 /** Debug level bit definition */ -#define MMSG MBIT(0) -#define MFATAL MBIT(1) -#define MERROR MBIT(2) -#define MDATA MBIT(3) -#define MCMND MBIT(4) -#define MEVENT MBIT(5) -#define MINTR MBIT(6) -#define MIOCTL MBIT(7) +#define MMSG MBIT(0) +#define MFATAL MBIT(1) +#define MERROR MBIT(2) +#define MDATA MBIT(3) +#define MCMND MBIT(4) +#define MEVENT MBIT(5) +#define MINTR MBIT(6) +#define MIOCTL MBIT(7) -#define MREG_D MBIT(9) +#define MREG_D MBIT(9) -#define MMPA_D MBIT(15) -#define MDAT_D MBIT(16) -#define MCMD_D MBIT(17) -#define MEVT_D MBIT(18) -#define MFW_D MBIT(19) -#define MIF_D MBIT(20) +#define MMPA_D MBIT(15) +#define MDAT_D MBIT(16) +#define MCMD_D MBIT(17) +#define MEVT_D MBIT(18) +#define MFW_D MBIT(19) +#define MIF_D MBIT(20) -#define MENTRY MBIT(28) -#define MWARN MBIT(29) -#define MINFO MBIT(30) -#define MHEX_DUMP MBIT(31) +#define MENTRY MBIT(28) +#define MWARN MBIT(29) +#define MINFO MBIT(30) +#define MHEX_DUMP MBIT(31) #endif /* DEBUG_LEVEL1 */ /** Memory allocation type: DMA */ -#define MLAN_MEM_DMA MBIT(0) +#define MLAN_MEM_DMA MBIT(0) /** Default memory allocation flag */ -#define MLAN_MEM_DEF 0 +#define MLAN_MEM_DEF 0 /** mlan_status */ typedef enum _mlan_status { @@ -590,15 +591,15 @@ typedef enum _mlan_status { /** mlan_error_code */ typedef enum _mlan_error_code { - /** No error */ + /** No error */ MLAN_ERROR_NO_ERROR = 0, - /** Firmware/device errors below (MSB=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, - /** Driver errors below (MSB=1) */ + /** Driver errors below (MSB=1) */ MLAN_ERROR_PKT_SIZE_INVALID = 0x80000001, MLAN_ERROR_PKT_TIMEOUT = 0x80000002, MLAN_ERROR_PKT_INVALID = 0x80000003, @@ -614,7 +615,7 @@ typedef enum _mlan_error_code { MLAN_ERROR_EVENT_UNKNOWN = 0x8000000D, MLAN_ERROR_INVALID_PARAMETER = 0x8000000E, MLAN_ERROR_NO_MEM = 0x8000000F, - /** More to add */ + /** More to add */ } mlan_error_code; /** mlan_buf_type */ @@ -641,7 +642,7 @@ typedef enum _mlan_usb_ep { } mlan_usb_ep; /** Timeout in milliseconds for usb_bulk_msg function */ -#define MLAN_USB_BULK_MSG_TIMEOUT 100 +#define MLAN_USB_BULK_MSG_TIMEOUT 100 #endif /* USB */ /** MLAN BSS type */ @@ -662,10 +663,10 @@ typedef enum _mlan_bss_role { } mlan_bss_role; /** BSS role mask */ -#define BSS_ROLE_MASK (MBIT(0) |MBIT(1)) +#define BSS_ROLE_MASK (MBIT(0) | MBIT(1)) /** Get BSS role */ -#define GET_BSS_ROLE(priv) ((priv)->bss_role & BSS_ROLE_MASK) +#define GET_BSS_ROLE(priv) ((priv)->bss_role & BSS_ROLE_MASK) /** mlan_data_frame_type */ typedef enum _mlan_data_frame_type { @@ -753,48 +754,48 @@ typedef enum _mlan_event_id { /** Data Structures */ /** mlan_image data structure */ typedef struct _mlan_fw_image { - /** Firmware image buffer pointer */ + /** Firmware image buffer pointer */ t_u8 *pfw_buf; - /** Firmware image length */ + /** Firmware image length */ t_u32 fw_len; - /** Firmware reload flag */ + /** Firmware reload flag */ t_u8 fw_reload; } mlan_fw_image, *pmlan_fw_image; /** MrvlIEtypesHeader_t */ typedef MLAN_PACK_START struct _MrvlIEtypesHeader { - /** Header type */ + /** Header type */ t_u16 type; - /** Header length */ + /** Header length */ t_u16 len; } MLAN_PACK_END MrvlIEtypesHeader_t; /** MrvlIEtypes_Data_t */ typedef MLAN_PACK_START struct _MrvlIEtypes_Data_t { - /** Header */ + /** Header */ MrvlIEtypesHeader_t header; - /** Data */ + /** Data */ t_u8 data[1]; } MLAN_PACK_END MrvlIEtypes_Data_t; -#define OID_TYPE_CAL 0x2 -#define OID_TYPE_DPD 0xa +#define OID_TYPE_CAL 0x2 +#define OID_TYPE_DPD 0xa /** Custom data structure */ typedef struct _mlan_init_param { - /** DPD data buffer pointer */ + /** DPD data buffer pointer */ t_u8 *pdpd_data_buf; - /** DPD data length */ + /** DPD data length */ t_u32 dpd_data_len; - /** region txpowerlimit cfg data buffer pointer */ + /** region txpowerlimit cfg data buffer pointer */ t_u8 *ptxpwr_data_buf; - /** region txpowerlimit cfg data length */ + /** region txpowerlimit cfg data length */ t_u32 txpwr_data_len; - /** Cal data buffer pointer */ + /** Cal data buffer pointer */ t_u8 *pcal_data_buf; - /** Cal data length */ + /** Cal data length */ t_u32 cal_data_len; - /** Other custom data */ + /** Other custom data */ } mlan_init_param, *pmlan_init_param; /** channel type */ @@ -807,63 +808,67 @@ enum mlan_channel_type { }; /** channel band */ -enum { - BAND_2GHZ = 0, - BAND_5GHZ = 1, - BAND_4GHZ = 2, +enum { BAND_2GHZ = 0, + BAND_5GHZ = 1, + BAND_4GHZ = 2, }; /** channel offset */ -enum { - SEC_CHAN_NONE = 0, - SEC_CHAN_ABOVE = 1, - SEC_CHAN_5MHZ = 2, - SEC_CHAN_BELOW = 3 -}; +enum { SEC_CHAN_NONE = 0, + SEC_CHAN_ABOVE = 1, + SEC_CHAN_5MHZ = 2, + SEC_CHAN_BELOW = 3 }; /** channel bandwidth */ -enum { - CHAN_BW_20MHZ = 0, - CHAN_BW_10MHZ, - CHAN_BW_40MHZ, - CHAN_BW_80MHZ, +enum { CHAN_BW_20MHZ = 0, + CHAN_BW_10MHZ, + CHAN_BW_40MHZ, + CHAN_BW_80MHZ, }; /** scan mode */ -enum { - SCAN_MODE_MANUAL = 0, - SCAN_MODE_ACS, - SCAN_MODE_USER, +enum { SCAN_MODE_MANUAL = 0, + SCAN_MODE_ACS, + SCAN_MODE_USER, }; +typedef enum _dfs_w53_cfg_t { + /** DFS W53 Default Fw Value */ + DFS_W53_DEFAULT_FW = 0, + /** DFS W53 New W53 Rules/Standard */ + DFS_W53_NEW = 1, + /** DFS W53 Old W53 Rules/Standard */ + DFS_W53_OLD = 2 +} dfs_w53_cfg_t; + /** Band_Config_t */ typedef MLAN_PACK_START struct _Band_Config_t { #ifdef BIG_ENDIAN_SUPPORT - /** Channel Selection Mode - (00)=manual, (01)=ACS, (02)=user*/ - t_u8 scanMode:2; - /** Secondary Channel Offset - (00)=None, (01)=Above, (11)=Below */ - t_u8 chan2Offset:2; - /** Channel Width - (00)=20MHz, (10)=40MHz, (11)=80MHz */ - t_u8 chanWidth:2; - /** Band Info - (00)=2.4GHz, (01)=5GHz */ - t_u8 chanBand:2; + /** Channel Selection Mode - (00)=manual, (01)=ACS, (02)=user*/ + t_u8 scanMode : 2; + /** Secondary Channel Offset - (00)=None, (01)=Above, (11)=Below */ + t_u8 chan2Offset : 2; + /** Channel Width - (00)=20MHz, (10)=40MHz, (11)=80MHz */ + t_u8 chanWidth : 2; + /** Band Info - (00)=2.4GHz, (01)=5GHz */ + t_u8 chanBand : 2; #else - /** Band Info - (00)=2.4GHz, (01)=5GHz */ - t_u8 chanBand:2; - /** Channel Width - (00)=20MHz, (10)=40MHz, (11)=80MHz */ - t_u8 chanWidth:2; - /** Secondary Channel Offset - (00)=None, (01)=Above, (11)=Below */ - t_u8 chan2Offset:2; - /** Channel Selection Mode - (00)=manual, (01)=ACS, (02)=Adoption mode*/ - t_u8 scanMode:2; + /** Band Info - (00)=2.4GHz, (01)=5GHz */ + t_u8 chanBand : 2; + /** Channel Width - (00)=20MHz, (10)=40MHz, (11)=80MHz */ + t_u8 chanWidth : 2; + /** Secondary Channel Offset - (00)=None, (01)=Above, (11)=Below */ + t_u8 chan2Offset : 2; + /** Channel Selection Mode - (00)=manual, (01)=ACS, (02)=Adoption mode*/ + t_u8 scanMode : 2; #endif } MLAN_PACK_END Band_Config_t; /** channel_band_t */ typedef MLAN_PACK_START struct _chan_band_info { - /** Band Configuration */ + /** Band Configuration */ Band_Config_t bandcfg; - /** channel */ + /** channel */ t_u8 channel; /** 11n flag */ t_u8 is_11n_enabled; @@ -874,15 +879,15 @@ typedef MLAN_PACK_START struct _chan_band_info { } MLAN_PACK_END chan_band_info; /** Channel usability flags */ -#define NXP_CHANNEL_NO_OFDM MBIT(9) -#define NXP_CHANNEL_NO_CCK MBIT(8) -#define NXP_CHANNEL_DISABLED MBIT(7) +#define NXP_CHANNEL_NO_OFDM MBIT(9) +#define NXP_CHANNEL_NO_CCK MBIT(8) +#define NXP_CHANNEL_DISABLED MBIT(7) /* BIT 5/6 resevered for FW */ -#define NXP_CHANNEL_NOHT160 MBIT(4) -#define NXP_CHANNEL_NOHT80 MBIT(3) -#define NXP_CHANNEL_NOHT40 MBIT(2) -#define NXP_CHANNEL_DFS MBIT(1) -#define NXP_CHANNEL_PASSIVE MBIT(0) +#define NXP_CHANNEL_NOHT160 MBIT(4) +#define NXP_CHANNEL_NOHT80 MBIT(3) +#define NXP_CHANNEL_NOHT40 MBIT(2) +#define NXP_CHANNEL_DFS MBIT(1) +#define NXP_CHANNEL_PASSIVE MBIT(0) /** CFP dynamic (non-const) elements */ typedef struct _cfp_dyn_t { @@ -898,34 +903,35 @@ typedef struct _cfp_dyn_t { * bit 0 : if set, channel is passive */ t_u16 flags; - /** TRUE: Channel is blacklisted (do not use) */ + /** TRUE: Channel is blacklisted (do not use) */ t_bool blacklist; } cfp_dyn_t; /** Chan-Freq-TxPower mapping table*/ typedef struct _chan_freq_power_t { - /** Channel Number */ + /** Channel Number */ t_u16 channel; - /** Frequency of this Channel */ + /** Frequency of this Channel */ t_u32 freq; - /** Max allowed Tx power level */ + /** Max allowed Tx power level */ 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*/ + /** 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; - /** Elements associated to cfp that change at run-time */ + /** Elements associated to cfp that change at run-time */ cfp_dyn_t dynamic; } chan_freq_power_t; /** mlan_event data structure */ typedef struct _mlan_event { - /** BSS index number for multiple BSS support */ + /** BSS index number for multiple BSS support */ t_u32 bss_index; - /** Event ID */ + /** Event ID */ mlan_event_id event_id; - /** Event length */ + /** Event length */ t_u32 event_len; - /** Event buffer */ + /** Event buffer */ t_u8 event_buf[]; } mlan_event, *pmlan_event; @@ -933,127 +939,127 @@ typedef struct _mlan_event { /** mlan_ioctl_req data structure */ typedef struct _mlan_ioctl_req { - /** Pointer to previous mlan_ioctl_req */ + /** Pointer to previous mlan_ioctl_req */ struct _mlan_ioctl_req *pprev; - /** Pointer to next mlan_ioctl_req */ + /** Pointer to next mlan_ioctl_req */ struct _mlan_ioctl_req *pnext; - /** Status code from firmware/driver */ + /** Status code from firmware/driver */ t_u32 status_code; - /** BSS index number for multiple BSS support */ + /** BSS index number for multiple BSS support */ t_u32 bss_index; - /** Request id */ + /** Request id */ t_u32 req_id; - /** Action: set or get */ + /** Action: set or get */ t_u32 action; - /** Pointer to buffer */ + /** Pointer to buffer */ t_u8 *pbuf; - /** Length of buffer */ + /** Length of buffer */ t_u32 buf_len; - /** Length of the data read/written in buffer */ + /** Length of the data read/written in buffer */ t_u32 data_read_written; - /** Length of buffer needed */ + /** Length of buffer needed */ t_u32 buf_len_needed; - /** Reserved for MOAL module */ + /** Reserved for MOAL module */ t_ptr reserved_1; } mlan_ioctl_req, *pmlan_ioctl_req; /** txpower structure */ typedef MLAN_PACK_START struct { #ifdef BIG_ENDIAN_SUPPORT - /** Host tx power ctrl: - 0x0: use fw setting for TX power - 0x1: value specified in bit[6] and bit[5:0] are valid */ - t_u8 hostctl:1; - /** Sign of the power specified in bit[5:0] */ - t_u8 sign:1; - /** Power to be used for transmission(in dBm) */ - t_u8 abs_val:6; + /** Host tx power ctrl: + 0x0: use fw setting for TX power + 0x1: value specified in bit[6] and bit[5:0] are valid */ + t_u8 hostctl : 1; + /** Sign of the power specified in bit[5:0] */ + t_u8 sign : 1; + /** Power to be used for transmission(in dBm) */ + t_u8 abs_val : 6; #else - /** Power to be used for transmission(in dBm) */ - t_u8 abs_val:6; - /** Sign of the power specified in bit[5:0] */ - t_u8 sign:1; - /** Host tx power ctrl: - 0x0: use fw setting for TX power - 0x1: value specified in bit[6] and bit[5:0] are valid */ - t_u8 hostctl:1; + /** Power to be used for transmission(in dBm) */ + t_u8 abs_val : 6; + /** Sign of the power specified in bit[5:0] */ + t_u8 sign : 1; + /** Host tx power ctrl: + 0x0: use fw setting for TX power + 0x1: value specified in bit[6] and bit[5:0] are valid */ + t_u8 hostctl : 1; #endif } MLAN_PACK_END tx_power_t; /* pkt_txctrl */ typedef MLAN_PACK_START struct _pkt_txctrl { - /**Data rate in unit of 0.5Mbps */ + /**Data rate in unit of 0.5Mbps */ t_u16 data_rate; /*Channel number to transmit the frame */ t_u8 channel; - /** Bandwidth to transmit the frame*/ + /** Bandwidth to transmit the frame*/ t_u8 bw; - /** Power to be used for transmission*/ + /** Power to be used for transmission*/ union { tx_power_t tp; t_u8 val; } tx_power; - /** Retry time of tx transmission*/ + /** Retry time of tx transmission*/ t_u8 retry_limit; } MLAN_PACK_END pkt_txctrl, *ppkt_txctrl; /** pkt_rxinfo */ typedef MLAN_PACK_START struct _pkt_rxinfo { - /** Data rate of received paccket*/ + /** Data rate of received paccket*/ t_u16 data_rate; - /** Channel on which packet was received*/ + /** Channel on which packet was received*/ t_u8 channel; - /** Rx antenna*/ + /** Rx antenna*/ t_u8 antenna; - /** Rx Rssi*/ + /** Rx Rssi*/ t_u8 rssi; } MLAN_PACK_END pkt_rxinfo, *ppkt_rxinfo; /** mlan_buffer data structure */ typedef struct _mlan_buffer { - /** Pointer to previous mlan_buffer */ + /** Pointer to previous mlan_buffer */ struct _mlan_buffer *pprev; - /** Pointer to next mlan_buffer */ + /** Pointer to next mlan_buffer */ struct _mlan_buffer *pnext; - /** Status code from firmware/driver */ + /** Status code from firmware/driver */ t_u32 status_code; - /** Flags for this buffer */ + /** Flags for this buffer */ t_u32 flags; - /** BSS index number for multiple BSS support */ + /** BSS index number for multiple BSS support */ t_u32 bss_index; - /** Buffer descriptor, e.g. skb in Linux */ + /** Buffer descriptor, e.g. skb in Linux */ t_void *pdesc; - /** Pointer to buffer */ + /** Pointer to buffer */ t_u8 *pbuf; #ifdef PCIE - /** Physical address of the pbuf pointer */ + /** Physical address of the pbuf pointer */ t_u64 buf_pa; t_u32 total_pcie_buf_len; #endif - /** Offset to data */ + /** Offset to data */ t_u32 data_offset; - /** Data length */ + /** Data length */ t_u32 data_len; - /** Buffer type: data, cmd, event etc. */ + /** Buffer type: data, cmd, event etc. */ mlan_buf_type buf_type; - /** Fields below are valid for data packet only */ - /** QoS priority */ + /** Fields below are valid for data packet only */ + /** QoS priority */ t_u32 priority; - /** Time stamp when packet is received (seconds) */ + /** Time stamp when packet is received (seconds) */ t_u32 in_ts_sec; - /** Time stamp when packet is received (micro seconds) */ + /** Time stamp when packet is received (micro seconds) */ t_u32 in_ts_usec; - /** Time stamp when packet is processed (seconds) */ + /** Time stamp when packet is processed (seconds) */ t_u32 out_ts_sec; - /** Time stamp when packet is processed (micro seconds) */ + /** Time stamp when packet is processed (micro seconds) */ t_u32 out_ts_usec; - /** tx_seq_num */ + /** tx_seq_num */ t_u32 tx_seq_num; - /** Fields below are valid for MLAN module only */ - /** Pointer to parent mlan_buffer */ + /** Fields below are valid for MLAN module only */ + /** Pointer to parent mlan_buffer */ struct _mlan_buffer *pparent; - /** Use count for this buffer */ + /** Use count for this buffer */ t_u32 use_count; union { pkt_txctrl tx_info; @@ -1068,23 +1074,23 @@ typedef struct _mlan_hw_info { /** mlan_bss_attr data structure */ typedef struct _mlan_bss_attr { - /** BSS type */ + /** BSS type */ t_u32 bss_type; - /** Data frame type: Ethernet II, 802.11, etc. */ + /** Data frame type: Ethernet II, 802.11, etc. */ t_u32 frame_type; - /** The BSS is active (non-0) or not (0). */ + /** The BSS is active (non-0) or not (0). */ t_u32 active; - /** BSS Priority */ + /** BSS Priority */ t_u32 bss_priority; - /** BSS number */ + /** BSS number */ t_u32 bss_num; - /** The BSS is virtual */ + /** The BSS is virtual */ t_u32 bss_virtual; } mlan_bss_attr, *pmlan_bss_attr; /** bss tbl data structure */ typedef struct _mlan_bss_tbl { - /** BSS Attributes */ + /** BSS Attributes */ mlan_bss_attr bss_attr[MLAN_MAX_BSS_NUM]; } mlan_bss_tbl, *pmlan_bss_tbl; @@ -1121,8 +1127,8 @@ 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_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; @@ -1131,73 +1137,74 @@ typedef MLAN_PACK_START enum _mlan_wmm_queue_stats_action_e { * */ typedef MLAN_PACK_START struct { - /** TSID: Range: 0->7 */ + /** TSID: Range: 0->7 */ t_u8 tid; - /** TSID specified is valid */ + /** TSID specified is valid */ t_u8 valid; - /** AC TSID is active on */ + /** AC TSID is active on */ t_u8 access_category; - /** UP specified for the TSID */ + /** UP specified for the TSID */ t_u8 user_priority; - /** Power save mode for TSID: 0 (legacy), 1 (UAPSD) */ + /** Power save mode for TSID: 0 (legacy), 1 (UAPSD) */ t_u8 psb; - /** Upstream(0), Downlink(1), Bidirectional(3) */ + /** Upstream(0), Downlink(1), Bidirectional(3) */ t_u8 flow_dir; - /** Medium time granted for the TSID */ + /** Medium time granted for the TSID */ 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; + /** 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; /** Max Ie length */ -#define MAX_IE_SIZE 256 +#define MAX_IE_SIZE 256 /** custom IE */ typedef MLAN_PACK_START struct _custom_ie { - /** IE Index */ + /** IE Index */ t_u16 ie_index; - /** Mgmt Subtype Mask */ + /** Mgmt Subtype Mask */ t_u16 mgmt_subtype_mask; - /** IE Length */ + /** IE Length */ t_u16 ie_length; - /** IE buffer */ + /** IE buffer */ t_u8 ie_buffer[MAX_IE_SIZE]; } MLAN_PACK_END custom_ie; /** Max IE index to FW */ -#define MAX_MGMT_IE_INDEX_TO_FW 4 +#define MAX_MGMT_IE_INDEX_TO_FW 4 /** Max IE index per BSS */ -#define MAX_MGMT_IE_INDEX 26 +#define MAX_MGMT_IE_INDEX 26 /** custom IE info */ typedef MLAN_PACK_START struct _custom_ie_info { - /** size of buffer */ + /** size of buffer */ t_u16 buf_size; - /** no of buffers of buf_size */ + /** no of buffers of buf_size */ 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 */ + /** Type */ t_u16 type; - /** Length */ + /** Length */ t_u16 len; - /** No of tuples */ + /** No of tuples */ t_u16 count; - /** custom IE info tuples */ + /** custom IE info tuples */ 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 */ + /** Type */ t_u16 type; - /** Length */ + /** Length */ t_u16 len; - /** IE data */ + /** IE data */ custom_ie ie_data_list[MAX_MGMT_IE_INDEX_TO_FW]; - /** Max mgmt IE TLV */ + /** Max mgmt IE TLV */ tlvbuf_max_mgmt_ie max_mgmt_ie; } MLAN_PACK_END mlan_ds_misc_custom_ie; @@ -1215,30 +1222,31 @@ typedef enum wifi_channel_width { /** channel information */ typedef struct { - /** channel width (20, 40, 80, 80+80, 160) */ + /** channel width (20, 40, 80, 80+80, 160) */ wifi_channel_width_t width; - /** primary 20 MHz channel */ + /** primary 20 MHz channel */ int center_freq; - /** center frequency (MHz) first segment */ + /** center frequency (MHz) first segment */ int center_freq0; - /** center frequency (MHz) second segment */ + /** center frequency (MHz) second segment */ int center_freq1; } wifi_channel_info; /** wifi rate */ typedef struct { - /** 0: OFDM, 1:CCK, 2:HT 3:VHT 4..7 reserved */ - t_u32 preamble:3; - /** 0:1x1, 1:2x2, 3:3x3, 4:4x4 */ - t_u32 nss:2; - /** 0:20MHz, 1:40Mhz, 2:80Mhz, 3:160Mhz */ - t_u32 bw:3; - /** OFDM/CCK rate code would be as per ieee std in the units of 0.5mbps */ - /** HT/VHT it would be mcs index */ - t_u32 rateMcsIdx:8; - /** reserved */ - t_u32 reserved:16; - /** units of 100 Kbps */ + /** 0: OFDM, 1:CCK, 2:HT 3:VHT 4..7 reserved */ + t_u32 preamble : 3; + /** 0:1x1, 1:2x2, 3:3x3, 4:4x4 */ + t_u32 nss : 2; + /** 0:20MHz, 1:40Mhz, 2:80Mhz, 3:160Mhz */ + t_u32 bw : 3; + /** OFDM/CCK rate code would be as per ieee std in the units of 0.5mbps + */ + /** HT/VHT it would be mcs index */ + t_u32 rateMcsIdx : 8; + /** reserved */ + t_u32 reserved : 16; + /** units of 100 Kbps */ t_u32 bitrate; } wifi_rate; @@ -1253,7 +1261,7 @@ typedef enum { #define MAX_RADIO 2 #define MAX_NUM_CHAN 1 #define VHT_NUM_SUPPORT_MCS 10 -#define MCS_NUM_SUPP 16 +#define MCS_NUM_SUPP 16 #define BUF_MAXLEN 4096 /** connection state */ @@ -1262,9 +1270,9 @@ typedef enum { WIFI_AUTHENTICATING = 1, WIFI_ASSOCIATING = 2, WIFI_ASSOCIATED = 3, - /** if done by firmware/driver */ + /** if done by firmware/driver */ WIFI_EAPOL_STARTED = 4, - /** if done by firmware/driver */ + /** if done by firmware/driver */ WIFI_EAPOL_COMPLETED = 5, } wifi_connection_state; /** roam state */ @@ -1284,37 +1292,38 @@ typedef enum { } wifi_interface_mode; /** set for QOS association */ -#define WIFI_CAPABILITY_QOS 0x00000001 -/** set for protected association (802.11 beacon frame control protected bit set) */ -#define WIFI_CAPABILITY_PROTECTED 0x00000002 +#define WIFI_CAPABILITY_QOS 0x00000001 +/** set for protected association (802.11 beacon frame control protected bit + * set) */ +#define WIFI_CAPABILITY_PROTECTED 0x00000002 /** set if 802.11 Extended Capabilities element interworking bit is set */ #define WIFI_CAPABILITY_INTERWORKING 0x00000004 /** set for HS20 association */ -#define WIFI_CAPABILITY_HS20 0x00000008 +#define WIFI_CAPABILITY_HS20 0x00000008 /** set is 802.11 Extended Capabilities element UTF-8 SSID bit is set */ -#define WIFI_CAPABILITY_SSID_UTF8 0x00000010 +#define WIFI_CAPABILITY_SSID_UTF8 0x00000010 /** set is 802.11 Country Element is present */ -#define WIFI_CAPABILITY_COUNTRY 0x00000020 +#define WIFI_CAPABILITY_COUNTRY 0x00000020 /** link layer status */ typedef struct { - /** interface mode */ + /** interface mode */ wifi_interface_mode mode; - /** interface mac address (self) */ + /** interface mac address (self) */ t_u8 mac_addr[6]; - /** connection state (valid for STA, CLI only) */ + /** connection state (valid for STA, CLI only) */ wifi_connection_state state; - /** roaming state */ + /** roaming state */ wifi_roam_state roaming; - /** WIFI_CAPABILITY_XXX (self) */ + /** WIFI_CAPABILITY_XXX (self) */ t_u32 capabilities; - /** null terminated SSID */ + /** null terminated SSID */ t_u8 ssid[33]; - /** bssid */ + /** bssid */ t_u8 bssid[6]; - /** country string advertised by AP */ + /** country string advertised by AP */ t_u8 ap_country_str[3]; - /** country string for this association */ + /** country string for this association */ t_u8 country_str[3]; } wifi_interface_link_layer_info; @@ -1322,73 +1331,88 @@ typedef wifi_interface_link_layer_info *wifi_interface_handle; /** channel statistics */ typedef struct { - /** channel */ + /** channel */ wifi_channel_info channel; - /** msecs the radio is awake (32 bits number accruing over time) */ + /** msecs the radio is awake (32 bits number accruing over time) */ t_u32 on_time; - /** msecs the CCA register is busy (32 bits number accruing over time) */ + /** msecs the CCA register is busy (32 bits number accruing over time) + */ t_u32 cca_busy_time; } wifi_channel_stat; /** timeval */ typedef struct { - /** Time (seconds) */ + /** Time (seconds) */ t_u32 time_sec; - /** Time (micro seconds) */ + /** Time (micro seconds) */ t_u32 time_usec; } wifi_timeval; -#define timeval_to_msec(timeval) (t_u64)((t_u64)(timeval.time_sec)*1000 + (t_u64)(timeval.time_usec)/1000) -#define timeval_to_usec(timeval) (t_u64)((t_u64)(timeval.time_sec)*1000*1000 + (t_u64)(timeval.time_usec)) -#define is_zero_timeval(timeval) ((timeval.time_sec == 0) && (timeval.time_usec == 0)) +#define timeval_to_msec(timeval) \ + (t_u64)((t_u64)(timeval.time_sec) * 1000 + \ + (t_u64)(timeval.time_usec) / 1000) +#define timeval_to_usec(timeval) \ + (t_u64)((t_u64)(timeval.time_sec) * 1000 * 1000 + \ + (t_u64)(timeval.time_usec)) +#define is_zero_timeval(timeval) \ + ((timeval.time_sec == 0) && (timeval.time_usec == 0)) /** radio statistics */ typedef struct { - /** wifi radio (if multiple radio supported) */ + /** wifi radio (if multiple radio supported) */ int radio; - /** msecs the radio is awake (32 bits number accruing over time) */ + /** msecs the radio is awake (32 bits number accruing over time) */ t_u32 on_time; - /** msecs the radio is transmitting (32 bits number accruing over time) */ + /** msecs the radio is transmitting (32 bits number accruing over time) + */ t_u32 tx_time; - /** TBD: num_tx_levels: number of radio transmit power levels */ + /** TBD: num_tx_levels: number of radio transmit power levels */ t_u32 reserved0; - /** TBD: tx_time_per_levels: pointer to an array of radio transmit per power levels in msecs accured over time */ - /* t_u32 *reserved1; */ - /** msecs the radio is in active receive (32 bits number accruing over time) */ + /** TBD: tx_time_per_levels: pointer to an array of radio transmit per + * power levels in msecs accured over time */ + /* t_u32 *reserved1;*/ + /** msecs the radio is in active receive (32 bits number accruing over + * time) */ t_u32 rx_time; - /** msecs the radio is awake due to all scan (32 bits number accruing over time) */ + /** msecs the radio is awake due to all scan (32 bits number accruing + * over time) */ t_u32 on_time_scan; - /** msecs the radio is awake due to NAN (32 bits number accruing over time) */ + /** msecs the radio is awake due to NAN (32 bits number accruing over + * time) */ t_u32 on_time_nbd; - /** msecs the radio is awake due to G?scan (32 bits number accruing over time) */ + /** msecs the radio is awake due to G?scan (32 bits number accruing over + * time) */ t_u32 on_time_gscan; - /** msecs the radio is awake due to roam?scan (32 bits number accruing over time) */ + /** msecs the radio is awake due to roam?scan (32 bits number accruing + * over time) */ t_u32 on_time_roam_scan; - /** msecs the radio is awake due to PNO scan (32 bits number accruing over time) */ + /** msecs the radio is awake due to PNO scan (32 bits number accruing + * over time) */ t_u32 on_time_pno_scan; - /** msecs the radio is awake due to HS2.0 scans and GAS exchange (32 bits number accruing over time) */ + /** msecs the radio is awake due to HS2.0 scans and GAS exchange (32 + * bits number accruing over time) */ t_u32 on_time_hs20; - /** number of channels */ + /** number of channels */ t_u32 num_channels; - /** channel statistics */ + /** channel statistics */ wifi_channel_stat channels[MAX_NUM_CHAN]; } wifi_radio_stat; /** per rate statistics */ typedef struct { - /** rate information */ + /** rate information */ wifi_rate rate; - /** number of successfully transmitted data pkts (ACK rcvd) */ + /** number of successfully transmitted data pkts (ACK rcvd) */ t_u32 tx_mpdu; - /** number of received data pkts */ + /** number of received data pkts */ t_u32 rx_mpdu; - /** number of data packet losses (no ACK) */ + /** number of data packet losses (no ACK) */ t_u32 mpdu_lost; - /** total number of data pkt retries */ + /** total number of data pkt retries */ t_u32 retries; - /** number of short data pkt retries */ + /** number of short data pkt retries */ t_u32 retries_short; - /** number of long data pkt retries */ + /** number of long data pkt retries */ t_u32 retries_long; } wifi_rate_stat; @@ -1405,113 +1429,126 @@ typedef enum { /** per peer statistics */ typedef struct { - /** peer type (AP, TDLS, GO etc.) */ + /** peer type (AP, TDLS, GO etc.) */ wifi_peer_type type; - /** mac address */ + /** mac address */ t_u8 peer_mac_address[6]; - /** peer WIFI_CAPABILITY_XXX */ + /** peer WIFI_CAPABILITY_XXX */ t_u32 capabilities; - /** number of rates */ + /** number of rates */ t_u32 num_rate; - /** per rate statistics, number of entries = num_rate */ + /** per rate statistics, number of entries = num_rate */ wifi_rate_stat rate_stats[]; } wifi_peer_info; /** per access category statistics */ typedef struct { - /** access category (VI, VO, BE, BK) */ + /** access category (VI, VO, BE, BK) */ mlan_wmm_ac_e ac; - /** number of successfully transmitted unicast data pkts (ACK rcvd) */ + /** number of successfully transmitted unicast data pkts (ACK rcvd) */ t_u32 tx_mpdu; - /** number of received unicast mpdus */ + /** number of received unicast mpdus */ t_u32 rx_mpdu; - /** number of succesfully transmitted multicast data packets */ - /** STA case: implies ACK received from AP for the unicast packet in which mcast pkt was sent */ + /** number of succesfully transmitted multicast data packets */ + /** STA case: implies ACK received from AP for the unicast packet in + * which mcast pkt was sent */ t_u32 tx_mcast; - /** number of received multicast data packets */ + /** number of received multicast data packets */ t_u32 rx_mcast; - /** number of received unicast a-mpdus */ + /** number of received unicast a-mpdus */ t_u32 rx_ampdu; - /** number of transmitted unicast a-mpdus */ + /** number of transmitted unicast a-mpdus */ t_u32 tx_ampdu; - /** number of data pkt losses (no ACK) */ + /** number of data pkt losses (no ACK) */ t_u32 mpdu_lost; - /** total number of data pkt retries */ + /** total number of data pkt retries */ t_u32 retries; - /** number of short data pkt retries */ + /** number of short data pkt retries */ t_u32 retries_short; - /** number of long data pkt retries */ + /** number of long data pkt retries */ t_u32 retries_long; - /** data pkt min contention time (usecs) */ + /** data pkt min contention time (usecs) */ t_u32 contention_time_min; - /** data pkt max contention time (usecs) */ + /** data pkt max contention time (usecs) */ t_u32 contention_time_max; - /** data pkt avg contention time (usecs) */ + /** data pkt avg contention time (usecs) */ t_u32 contention_time_avg; - /** num of data pkts used for contention statistics */ + /** num of data pkts used for contention statistics */ t_u32 contention_num_samples; } wifi_wmm_ac_stat; /** interface statistics */ typedef struct { - /** wifi interface */ - /* wifi_interface_handle iface; */ - /** current state of the interface */ + /** wifi interface */ + /* wifi_interface_handle iface;*/ + /** current state of the interface */ wifi_interface_link_layer_info info; - /** access point beacon received count from connected AP */ + /** access point beacon received count from connected AP */ t_u32 beacon_rx; - /** Average beacon offset encountered (beacon_TSF - TBTT) - * the average_tsf_offset field is used so as to calculate the - * typical beacon contention time on the channel as well may be - * used to debug beacon synchronization and related power consumption issue - */ + /** Average beacon offset encountered (beacon_TSF - TBTT) + * the average_tsf_offset field is used so as to calculate the + * typical beacon contention time on the channel as well may be + * used to debug beacon synchronization and related power consumption + * issue + */ t_u64 average_tsf_offset; - /** indicate that this AP typically leaks packets beyond the driver guard time */ + /** indicate that this AP typically leaks packets beyond the driver + * guard time */ t_u32 leaky_ap_detected; - /** average number of frame leaked by AP after frame with PM bit set was ACK'ed by AP */ + /** average number of frame leaked by AP after frame with PM bit set was + * ACK'ed by AP */ t_u32 leaky_ap_avg_num_frames_leaked; - /** Guard time currently in force (when implementing IEEE power management based on - * frame control PM bit), How long driver waits before shutting down the radio and - * after receiving an ACK for a data frame with PM bit set) - */ + /** Guard time currently in force (when implementing IEEE power + * management based on frame control PM bit), How long driver waits + * before shutting down the radio and after receiving an ACK for a data + * frame with PM bit set) + */ t_u32 leaky_ap_guard_time; - /** access point mgmt frames received count from connected AP (including Beacon) */ + /** access point mgmt frames received count from connected AP (including + * Beacon) */ t_u32 mgmt_rx; - /** action frames received count */ + /** action frames received count */ t_u32 mgmt_action_rx; - /** action frames transmit count */ + /** action frames transmit count */ t_u32 mgmt_action_tx; - /** access Point Beacon and Management frames RSSI (averaged) */ + /** access Point Beacon and Management frames RSSI (averaged) */ t_s32 rssi_mgmt; - /** access Point Data Frames RSSI (averaged) from connected AP */ + /** access Point Data Frames RSSI (averaged) from connected AP */ t_s32 rssi_data; - /** access Point ACK RSSI (averaged) from connected AP */ + /** access Point ACK RSSI (averaged) from connected AP */ t_s32 rssi_ack; - /** per ac data packet statistics */ + /** per ac data packet statistics */ wifi_wmm_ac_stat ac[MAX_AC_QUEUES]; - /** number of peers */ + /** number of peers */ t_u32 num_peers; - /** per peer statistics */ + /** per peer statistics */ wifi_peer_info peer_info[]; } wifi_iface_stat; /** link layer stat configuration params */ typedef struct { - /** threshold to classify the pkts as short or long */ + /** threshold to classify the pkts as short or long */ t_u32 mpdu_size_threshold; - /** wifi statistics bitmap */ + /** wifi statistics bitmap */ t_u32 aggressive_statistics_gathering; } wifi_link_layer_params; /** wifi statistics bitmap */ -#define WIFI_STATS_RADIO 0x00000001 /** all radio statistics */ -#define WIFI_STATS_RADIO_CCA 0x00000002 /** cca_busy_time (within radio statistics) */ -#define WIFI_STATS_RADIO_CHANNELS 0x00000004 /** all channel statistics (within radio statistics) */ -#define WIFI_STATS_RADIO_SCAN 0x00000008 /** all scan statistics (within radio statistics) */ -#define WIFI_STATS_IFACE 0x00000010 /** all interface statistics */ -#define WIFI_STATS_IFACE_TXRATE 0x00000020 /** all tx rate statistics (within interface statistics) */ -#define WIFI_STATS_IFACE_AC 0x00000040 /** all ac statistics (within interface statistics) */ -#define WIFI_STATS_IFACE_CONTENTION 0x00000080 /** all contention (min, max, avg) statistics (within ac statisctics) */ +#define WIFI_STATS_RADIO 0x00000001 /** all radio statistics */ +#define WIFI_STATS_RADIO_CCA \ + 0x00000002 /** cca_busy_time (within radio statistics) */ +#define WIFI_STATS_RADIO_CHANNELS \ + 0x00000004 /** all channel statistics (within radio statistics) */ +#define WIFI_STATS_RADIO_SCAN \ + 0x00000008 /** all scan statistics (within radio statistics) */ +#define WIFI_STATS_IFACE 0x00000010 /** all interface statistics */ +#define WIFI_STATS_IFACE_TXRATE \ + 0x00000020 /** all tx rate statistics (within interface statistics) */ +#define WIFI_STATS_IFACE_AC \ + 0x00000040 /** all ac statistics (within interface statistics) */ +#define WIFI_STATS_IFACE_CONTENTION \ + 0x00000080 /** all contention (min, max, avg) statistics (within ac \ + statisctics) */ /** station stats */ typedef struct _sta_stats { @@ -1524,223 +1561,212 @@ typedef struct _sta_stats { /** mlan_callbacks data structure */ 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_vdll_data) (IN t_void *pmoal_handle, - IN t_u32 len, OUT t_u8 *pbuf); - /** moal_get_hw_spec_complete */ - mlan_status (*moal_get_hw_spec_complete) (IN t_void *pmoal_handle, - IN mlan_status status, - IN mlan_hw_info * phw, - IN pmlan_bss_tbl ptbl); - /** moal_init_fw_complete */ - 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); - /** moal_send_packet_complete */ - 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, + /** 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_vdll_data)(IN t_void *pmoal_handle, IN t_u32 len, + OUT t_u8 *pbuf); + /** moal_get_hw_spec_complete */ + mlan_status (*moal_get_hw_spec_complete)(IN t_void *pmoal_handle, + IN mlan_status status, + IN mlan_hw_info *phw, + IN pmlan_bss_tbl ptbl); + /** moal_init_fw_complete */ + 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); + /** moal_send_packet_complete */ + 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); + /** moal_recv_packet */ + 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); + /** moal_ioctl_complete */ + mlan_status (*moal_ioctl_complete)(IN t_void *pmoal_handle, + IN pmlan_ioctl_req pioctl_req, IN mlan_status status); - /** moal_recv_packet */ - 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); - /** moal_ioctl_complete */ - 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); - /** moal_free_mlan_buffer */ - mlan_status (*moal_free_mlan_buffer) (IN t_void *pmoal_handle, - IN pmlan_buffer pmbuf); + /** moal_alloc_mlan_buffer */ + 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); #ifdef USB - /** moal_write_data_async */ - mlan_status (*moal_write_data_async) (IN t_void *pmoal_handle, - IN pmlan_buffer pmbuf, - IN t_u32 port); -#endif /* USB */ -#if defined(SDIO) || defined(PCIE) - /** moal_write_reg */ - 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); -#endif /* SDIO || PCIE */ - /** moal_write_data_sync */ - mlan_status (*moal_write_data_sync) (IN t_void *pmoal_handle, + /** moal_write_data_async */ + mlan_status (*moal_write_data_async)(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); +#endif /* USB */ +#if defined(SDIO) || defined(PCIE) + /** moal_write_reg */ + 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); +#endif /* SDIO || PCIE */ + /** 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); - /** moal_malloc */ - 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); - /** moal_vmalloc */ - 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); + /** 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); + /** moal_malloc */ + 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); + /** moal_vmalloc */ + 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); #ifdef PCIE - /** moal_malloc_consistent */ - mlan_status (*moal_malloc_consistent) (IN t_void *pmoal_handle, - IN t_u32 size, - OUT t_u8 **ppbuf, - OUT t_u64 *pbuf_pa); - /** moal_mfree_consistent */ - mlan_status (*moal_mfree_consistent) (IN t_void *pmoal_handle, - IN t_u32 size, - IN t_u8 *pbuf, IN t_u64 buf_pa); - /** moal_map_memory */ - mlan_status (*moal_map_memory) (IN t_void *pmoal_handle, - IN t_u8 *pbuf, - OUT t_u64 *pbuf_pa, - IN t_u32 size, IN t_u32 flag); - /** moal_unmap_memory */ - mlan_status (*moal_unmap_memory) (IN t_void *pmoal_handle, - IN t_u8 *pbuf, - IN t_u64 buf_pa, - IN t_u32 size, IN t_u32 flag); -#endif /* PCIE */ - /** moal_memset */ - 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, + /** moal_malloc_consistent */ + mlan_status (*moal_malloc_consistent)(IN t_void *pmoal_handle, + IN t_u32 size, OUT t_u8 **ppbuf, + OUT t_u64 *pbuf_pa); + /** moal_mfree_consistent */ + mlan_status (*moal_mfree_consistent)(IN t_void *pmoal_handle, + IN t_u32 size, IN t_u8 *pbuf, + IN t_u64 buf_pa); + /** moal_map_memory */ + mlan_status (*moal_map_memory)(IN t_void *pmoal_handle, IN t_u8 *pbuf, + OUT t_u64 *pbuf_pa, IN t_u32 size, + IN t_u32 flag); + /** moal_unmap_memory */ + mlan_status (*moal_unmap_memory)(IN t_void *pmoal_handle, IN t_u8 *pbuf, + IN t_u64 buf_pa, IN t_u32 size, + IN t_u32 flag); +#endif /* PCIE */ + /** moal_memset */ + 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); + /** moal_memcpy_ext */ + t_void *(*moal_memcpy_ext)(IN t_void *pmoal_handle, IN t_void *pdest, + IN const t_void *psrc, IN t_u32 num, + IN t_u32 dest_size); + /** moal_memmove */ + t_void *(*moal_memmove)(IN t_void *pmoal_handle, IN t_void *pdest, IN const t_void *psrc, IN t_u32 num); - /** moal_memcpy_ext */ - t_void *(*moal_memcpy_ext) (IN t_void *pmoal_handle, - IN t_void *pdest, - IN const t_void *psrc, - IN t_u32 num, IN t_u32 dest_size); - /** moal_memmove */ - 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); - /** moal_udelay */ - t_void (*moal_udelay) (IN t_void *pmoal_handle, IN t_u32 udelay); - /** moal_get_boot_ktime */ - mlan_status (*moal_get_boot_ktime) (IN t_void *pmoal_handle, - OUT t_u64 *pnsec); - /** moal_get_system_time */ - 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); - /** moal_free_timer */ - 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); - /** moal_stop_timer*/ - 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); - /** moal_free_lock */ - 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); - /** moal_spin_unlock */ - 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 ... - ); - /** moal_print_netintf */ - 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); + /** 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); + /** moal_udelay */ + t_void (*moal_udelay)(IN t_void *pmoal_handle, IN t_u32 udelay); + /** moal_get_boot_ktime */ + mlan_status (*moal_get_boot_ktime)(IN t_void *pmoal_handle, + OUT t_u64 *pnsec); + /** moal_get_system_time */ + 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); + /** moal_free_timer */ + 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); + /** moal_stop_timer*/ + 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); + /** moal_free_lock */ + 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); + /** moal_spin_unlock */ + 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...); + /** moal_print_netintf */ + 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); - /** moal_hist_data_add */ - t_void (*moal_hist_data_add) (IN t_void *pmoal_handle, - IN t_u32 bss_index, - IN t_u16 rx_rate, - IN t_s8 snr, - IN t_s8 nflr, IN t_u8 antenna); + /** moal_hist_data_add */ + t_void (*moal_hist_data_add)(IN t_void *pmoal_handle, + IN t_u32 bss_index, IN t_u16 rx_rate, + IN t_s8 snr, IN t_s8 nflr, + IN t_u8 antenna); #if defined(DRV_EMBEDDED_AUTHENTICATOR) || defined(DRV_EMBEDDED_SUPPLICANT) - mlan_status (*moal_wait_hostcmd_complete) (IN t_void *pmoal_handle, - IN t_u32 bss_index); - mlan_status (*moal_notify_hostcmd_complete) (IN t_void *pmoal_handle, - IN t_u32 bss_index); + mlan_status (*moal_wait_hostcmd_complete)(IN t_void *pmoal_handle, + IN t_u32 bss_index); + mlan_status (*moal_notify_hostcmd_complete)(IN t_void *pmoal_handle, + IN t_u32 bss_index); #endif } mlan_callbacks, *pmlan_callbacks; /** Parameter unchanged, use MLAN default setting */ -#define ROBUSTCOEX_GPIO_UNCHANGED 0 +#define ROBUSTCOEX_GPIO_UNCHANGED 0 /** Parameter enabled, override MLAN default setting */ -#define ROBUSTCOEX_GPIO_CFG 1 +#define ROBUSTCOEX_GPIO_CFG 1 #if defined(SDIO) /** Interrupt Mode SDIO */ -#define INT_MODE_SDIO 0 +#define INT_MODE_SDIO 0 /** Interrupt Mode GPIO */ -#define INT_MODE_GPIO 1 -/** New mode: GPIO-1 as a duplicated signal of interrupt as appear of SDIO_DAT1 */ -#define GPIO_INT_NEW_MODE 255 +#define INT_MODE_GPIO 1 +/** New mode: GPIO-1 as a duplicated signal of interrupt as appear of SDIO_DAT1 + */ +#define GPIO_INT_NEW_MODE 255 #endif /** Parameter unchanged, use MLAN default setting */ -#define MLAN_INIT_PARA_UNCHANGED 0 +#define MLAN_INIT_PARA_UNCHANGED 0 /** Parameter enabled, override MLAN default setting */ -#define MLAN_INIT_PARA_ENABLED 1 +#define MLAN_INIT_PARA_ENABLED 1 /** Parameter disabled, override MLAN default setting */ -#define MLAN_INIT_PARA_DISABLED 2 +#define MLAN_INIT_PARA_DISABLED 2 /** Control bit for stream 2X2 */ -#define FEATURE_CTRL_STREAM_2X2 MBIT(0) +#define FEATURE_CTRL_STREAM_2X2 MBIT(0) /** Control bit for DFS support */ -#define FEATURE_CTRL_DFS_SUPPORT MBIT(1) +#define FEATURE_CTRL_DFS_SUPPORT MBIT(1) #ifdef USB /** Control bit for winner check & not wait for FW ready event */ -#define FEATURE_CTRL_USB_NEW_INIT MBIT(2) +#define FEATURE_CTRL_USB_NEW_INIT MBIT(2) #endif /** Default feature control */ -#define FEATURE_CTRL_DEFAULT 0xffffffff +#define FEATURE_CTRL_DEFAULT 0xffffffff /** Check if stream 2X2 enabled */ -#define IS_STREAM_2X2(x) ((x) & FEATURE_CTRL_STREAM_2X2) +#define IS_STREAM_2X2(x) ((x)&FEATURE_CTRL_STREAM_2X2) /** Check if DFS support enabled */ -#define IS_DFS_SUPPORT(x) ((x) & FEATURE_CTRL_DFS_SUPPORT) +#define IS_DFS_SUPPORT(x) ((x)&FEATURE_CTRL_DFS_SUPPORT) #ifdef USB /** Check if winner check & not wait for FW ready event */ -#define IS_USB_NEW_INIT(x) ((x) & FEATURE_CTRL_USB_NEW_INIT) +#define IS_USB_NEW_INIT(x) ((x)&FEATURE_CTRL_USB_NEW_INIT) #endif /* @@ -1748,35 +1774,35 @@ typedef struct _mlan_callbacks { #define DRV_MODE_11P MBIT(5) #define DRV_MODE_MAC80211 MBIT(6) #define DRV_MODE_DFS MBIT(7)*/ -#define DRV_MODE_MASK (MBIT(4)|MBIT(5)|MBIT(6)|MBIT(7)) +#define DRV_MODE_MASK (MBIT(4) | MBIT(5) | MBIT(6) | MBIT(7)) /** mlan_device data structure */ typedef struct _mlan_device { - /** MOAL Handle */ + /** MOAL Handle */ t_void *pmoal_handle; - /** BSS Attributes */ + /** BSS Attributes */ mlan_bss_attr bss_attr[MLAN_MAX_BSS_NUM]; - /** Callbacks */ + /** Callbacks */ mlan_callbacks callbacks; #ifdef MFG_CMD_SUPPORT - /** MFG mode */ + /** MFG mode */ t_u32 mfg_mode; #endif #if defined(SDIO) - /** SDIO interrupt mode (0: INT_MODE_SDIO, 1: INT_MODE_GPIO) */ + /** SDIO interrupt mode (0: INT_MODE_SDIO, 1: INT_MODE_GPIO) */ t_u32 int_mode; - /** GPIO interrupt pin number */ + /** GPIO interrupt pin number */ t_u32 gpio_pin; #endif #ifdef DEBUG_LEVEL1 - /** Driver debug bit masks */ + /** Driver debug bit masks */ t_u32 drvdbg; #endif - /** allocate fixed buffer size for scan beacon buffer*/ + /** allocate fixed buffer size for scan beacon buffer*/ t_u32 fixed_beacon_buffer; - /** SDIO MPA Tx */ + /** SDIO MPA Tx */ t_u32 mpa_tx_cfg; - /** SDIO MPA Rx */ + /** SDIO MPA Rx */ t_u32 mpa_rx_cfg; #ifdef SDIO /** SDIO Single port rx aggr */ @@ -1786,57 +1812,59 @@ typedef struct _mlan_device { /* see blk_queue_max_segments */ t_u16 max_segs; #endif - /** Auto deep sleep */ + /** Auto deep sleep */ t_u32 auto_ds; - /** IEEE PS mode */ + /** IEEE PS mode */ t_u32 ps_mode; - /** Max Tx buffer size */ + /** Max Tx buffer size */ t_u32 max_tx_buf; #if defined(STA_SUPPORT) - /** 802.11d configuration */ + /** 802.11d configuration */ t_u32 cfg_11d; #endif - /** Feature control bitmask */ + /** Feature control bitmask */ t_u32 feature_control; - /** enable/disable rx work */ + /** enable/disable rx work */ t_u8 rx_work; - /** dev cap mask */ + /** dev cap mask */ t_u32 dev_cap_mask; - /** oob independent reset */ + /** oob independent reset */ t_u32 indrstcfg; - /** dtim interval */ + /** dtim interval */ t_u16 multi_dtim; - /** IEEE ps inactivity timeout value */ + /** IEEE ps inactivity timeout value */ t_u16 inact_tmo; /** card type */ t_u16 card_type; - /** card rev */ + /** card rev */ t_u8 card_rev; - /** Host sleep wakeup interval */ + /** Host sleep wakeup interval */ t_u32 hs_wake_interval; - /** GPIO to indicate wakeup source */ + /** GPIO to indicate wakeup source */ t_u8 indication_gpio; - /** Dynamic MIMO-SISO switch for hscfg*/ + /** Dynamic MIMO-SISO switch for hscfg*/ t_u8 hs_mimo_switch; #ifdef USB - /** Tx CMD endpoint address */ + /** Tx CMD endpoint address */ t_u8 tx_cmd_ep; - /** Rx CMD/EVT endpoint address */ + /** Rx CMD/EVT endpoint address */ t_u8 rx_cmd_ep; - /** Rx data endpoint address */ + /** Rx data endpoint address */ t_u8 rx_data_ep; - /** Tx data endpoint address */ + /** Tx data endpoint address */ t_u8 tx_data_ep; #endif - /** fw region */ + /** fw region */ t_bool fw_region; - /** passive to active scan */ + /** passive to active scan */ t_u8 passive_to_active_scan; - /** uap max supported station per chip */ + /** uap max supported station per chip */ t_u8 uap_max_sta; - /** drv mode */ + /** drv mode */ t_u32 drv_mode; + /** dfs w53 cfg */ + t_u8 dfs53cfg; } mlan_device, *pmlan_device; /** MLAN API function prototype */ @@ -1847,8 +1875,7 @@ MLAN_API mlan_status mlan_register(IN pmlan_device pmdevice, OUT t_void **ppmlan_adapter); /** Un-registration */ -MLAN_API mlan_status mlan_unregister(IN t_void *pmlan_adapter - ); +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, @@ -1859,16 +1886,13 @@ MLAN_API mlan_status mlan_set_init_param(IN t_void *pmlan_adapter, IN pmlan_init_param pparam); /** Firmware Initialization */ -MLAN_API mlan_status mlan_init_fw(IN t_void *pmlan_adapter - ); +MLAN_API mlan_status mlan_init_fw(IN t_void *pmlan_adapter); /** Firmware Shutdown */ -MLAN_API mlan_status mlan_shutdown_fw(IN t_void *pmlan_adapter - ); +MLAN_API mlan_status mlan_shutdown_fw(IN t_void *pmlan_adapter); /** Main Process */ -MLAN_API mlan_status mlan_main_process(IN t_void *pmlan_adapter - ); +MLAN_API mlan_status mlan_main_process(IN t_void *pmlan_adapter); /** Rx process */ mlan_status mlan_rx_process(IN t_void *pmlan_adapter, IN t_u8 *rx_pkts); @@ -1885,8 +1909,8 @@ MLAN_API mlan_status mlan_write_data_async_complete(IN t_void *pmlan_adapter, IN mlan_status status); /** Packet Reception */ -MLAN_API mlan_status mlan_recv(IN t_void *pmlan_adapter, - IN pmlan_buffer pmbuf, IN t_u32 port); +MLAN_API mlan_status mlan_recv(IN t_void *pmlan_adapter, IN pmlan_buffer pmbuf, + IN t_u32 port); #endif /* USB */ /** Packet Reception complete callback */ @@ -1916,7 +1940,7 @@ MLAN_API t_void mlan_set_int_mode(IN t_void *adapter, IN t_u32 int_mode, MLAN_API mlan_status mlan_ioctl(IN t_void *pmlan_adapter, 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); +MLAN_API t_u8 mlan_select_wmm_queue(IN t_void *pmlan_adapter, IN t_u8 bss_num, + IN t_u8 tid); #endif /* !_MLAN_DECL_H_ */ diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/mlan_ieee.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/mlan_ieee.h index c4518c8b3bda..03b5fd4ffc92 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/mlan_ieee.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/mlan_ieee.h @@ -30,32 +30,32 @@ Change log: #define _MLAN_IEEE_H_ /** FIX IES size in beacon buffer */ -#define WLAN_802_11_FIXED_IE_SIZE 12 +#define WLAN_802_11_FIXED_IE_SIZE 12 /** WLAN supported rates */ -#define WLAN_SUPPORTED_RATES 14 +#define WLAN_SUPPORTED_RATES 14 /** WLAN supported rates extension */ -#define WLAN_SUPPORTED_RATES_EXT 60 +#define WLAN_SUPPORTED_RATES_EXT 60 /** Enumeration definition*/ /** WLAN_802_11_NETWORK_TYPE */ typedef enum _WLAN_802_11_NETWORK_TYPE { Wlan802_11FH, Wlan802_11DS, - /* Defined as upper bound */ + /* Defined as upper bound*/ Wlan802_11NetworkTypeMax } WLAN_802_11_NETWORK_TYPE; #ifdef BIG_ENDIAN_SUPPORT /** Frame control: Type Mgmt frame */ -#define IEEE80211_FC_MGMT_FRAME_TYPE_MASK 0x3000 +#define IEEE80211_FC_MGMT_FRAME_TYPE_MASK 0x3000 /** Frame control: SubType Mgmt frame */ -#define IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE(fc) (((fc) & 0xF000) >> 12) +#define IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE(fc) (((fc)&0xF000) >> 12) #else /** Frame control: Type Mgmt frame */ -#define IEEE80211_FC_MGMT_FRAME_TYPE_MASK 0x000C +#define IEEE80211_FC_MGMT_FRAME_TYPE_MASK 0x000C /** Frame control: SubType Mgmt frame */ -#define IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE(fc) (((fc) & 0x00F0) >> 4) +#define IEEE80211_GET_FC_MGMT_FRAME_SUBTYPE(fc) (((fc)&0x00F0) >> 4) #endif #ifdef PRAGMA_PACK @@ -63,7 +63,7 @@ typedef enum _WLAN_802_11_NETWORK_TYPE { #endif /* Reason codes */ -#define IEEE_80211_REASONCODE_UNSPECIFIED 1 +#define IEEE_80211_REASONCODE_UNSPECIFIED 1 typedef enum _IEEEtypes_Ext_ElementId_e { HE_CAPABILITY = 35, @@ -100,7 +100,7 @@ typedef MLAN_PACK_START enum _IEEEtypes_ElementId_e { NONTX_BSSID_CAP = 83, MBSSID_INDEX = 85, EXT_CAPABILITY = 127, - /*IEEE802.11r */ + /*IEEE802.11r*/ MOBILITY_DOMAIN = 54, FAST_BSS_TRANSITION = 55, TIMEOUT_INTERVAL = 56, @@ -136,70 +136,70 @@ typedef MLAN_PACK_START enum _IEEEtypes_ElementId_e { /** IEEE IE header */ typedef MLAN_PACK_START struct _IEEEtypes_Header_t { - /** Element ID */ + /** Element ID */ t_u8 element_id; - /** Length */ + /** Length */ 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 */ + /** Element ID */ t_u8 element_id; - /** Length */ + /** Length */ t_u8 len; - /** OUI */ + /** OUI */ t_u8 oui[3]; - /** OUI type */ + /** OUI type */ t_u8 oui_type; - /** OUI subtype */ + /** OUI subtype */ t_u8 oui_subtype; - /** Version */ + /** 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 */ + /** Vendor specific IE header */ IEEEtypes_VendorHeader_t vend_hdr; - /** IE Max - size of previous fields */ + /** IE Max - size of previous fields */ t_u8 data[IEEE_MAX_IE_SIZE - sizeof(IEEEtypes_VendorHeader_t)]; } MLAN_PACK_END IEEEtypes_VendorSpecific_t, *pIEEEtypes_VendorSpecific_t; /** IEEE IE */ typedef MLAN_PACK_START struct _IEEEtypes_Generic_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** IE Max - size of previous fields */ + /** IE Max - size of previous fields */ t_u8 data[IEEE_MAX_IE_SIZE - sizeof(IEEEtypes_Header_t)]; } MLAN_PACK_END IEEEtypes_Generic_t, *pIEEEtypes_Generic_t; /**ft capability policy*/ typedef MLAN_PACK_START struct _IEEEtypes_FtCapPolicy_t { #ifdef BIG_ENDIAN_SUPPORT - /** Reserved */ - t_u8 reserved:6; - /** RIC support */ - t_u8 ric:1; - /** FT over the DS capable */ - t_u8 ft_over_ds:1; + /** Reserved */ + t_u8 reserved : 6; + /** RIC support */ + t_u8 ric : 1; + /** FT over the DS capable */ + t_u8 ft_over_ds : 1; #else - /** FT over the DS capable */ - t_u8 ft_over_ds:1; - /** RIC support */ - t_u8 ric:1; - /** Reserved */ - t_u8 reserved:6; + /** FT over the DS capable */ + t_u8 ft_over_ds : 1; + /** RIC support */ + t_u8 ric : 1; + /** Reserved */ + t_u8 reserved : 6; #endif } MLAN_PACK_END IEEEtypes_FtCapPolicy_t; /** Mobility domain IE */ typedef MLAN_PACK_START struct _IEEEtypes_MobilityDomain_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** Mobility Domain ID */ + /** Mobility Domain ID */ t_u16 mdid; - /** FT Capability policy */ + /** FT Capability policy */ t_u8 ft_cap; } MLAN_PACK_END IEEEtypes_MobilityDomain_t; @@ -212,11 +212,11 @@ typedef MLAN_PACK_START struct _IEEEtypes_FT_MICControl_t { } MLAN_PACK_END IEEEtypes_FT_MICControl_t; /** FTIE MIC LEN */ -#define FTIE_MIC_LEN 16 +#define FTIE_MIC_LEN 16 /**FT IE*/ typedef MLAN_PACK_START struct _IEEEtypes_FastBssTransElement_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; /** mic control */ IEEEtypes_FT_MICControl_t mic_control; @@ -239,43 +239,43 @@ typedef MLAN_PACK_START struct _IEEEtypes_FastBssTransElement_t { /*FT response and FT ack*/ typedef MLAN_PACK_START struct { - /** category */ + /** category */ t_u8 category; - /** action */ + /** action */ t_u8 action; - /** sta address */ + /** sta address */ t_u8 sta_addr[MLAN_MAC_ADDR_LENGTH]; - /** target ap address */ + /** target ap address */ t_u8 target_ap_addr[MLAN_MAC_ADDR_LENGTH]; - /** status code */ + /** status code */ t_u16 status_code; - /** varible */ + /** varible */ t_u8 variable[]; } MLAN_PACK_END IEEEtypes_Ft_action_response; /**FT request */ typedef MLAN_PACK_START struct { - /** category */ + /** category */ t_u8 category; - /** action */ + /** action */ t_u8 action; - /** sta address */ + /** sta address */ t_u8 sta_addr[MLAN_MAC_ADDR_LENGTH]; - /** target ap address */ + /** target ap address */ t_u8 target_ap_addr[MLAN_MAC_ADDR_LENGTH]; - /** varible */ + /** varible */ t_u8 variable[]; } MLAN_PACK_END IEEEtypes_Ft_action_request; /** auth frame body*/ typedef MLAN_PACK_START struct { - /** auth alg */ + /** auth alg */ t_u16 auth_alg; - /** auth transaction */ + /** auth transaction */ t_u16 auth_transaction; - /** status code */ + /** status code */ t_u16 status_code; - /** variable */ + /** variable */ t_u8 variable[]; } MLAN_PACK_END IEEEtypes_Auth_framebody; @@ -283,25 +283,25 @@ typedef MLAN_PACK_START struct { typedef MLAN_PACK_START struct { t_u16 capab_info; t_u16 listen_interval; - /** followed by SSID and Supported rates */ + /** followed by SSID and Supported rates */ t_u8 variablep[]; } MLAN_PACK_END IEEEtypes_assoc_req; /*Mgmt frame*/ typedef MLAN_PACK_START struct { - /** frame control */ + /** frame control */ t_u16 frame_control; - /** duration */ + /** duration */ t_u16 duration; - /** dest address */ + /** dest address */ t_u8 da[MLAN_MAC_ADDR_LENGTH]; - /** source address */ + /** source address */ t_u8 sa[MLAN_MAC_ADDR_LENGTH]; - /** bssid */ + /** bssid */ t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; - /** seq control */ + /** seq control */ t_u16 seq_ctrl; - /** address 4 */ + /** address 4 */ t_u8 addr4[MLAN_MAC_ADDR_LENGTH]; union { IEEEtypes_Auth_framebody auth; @@ -313,75 +313,74 @@ typedef MLAN_PACK_START struct { /** TLV header */ typedef MLAN_PACK_START struct _TLV_Generic_t { - /** Type */ + /** Type */ t_u16 type; - /** Length */ + /** Length */ t_u16 len; } MLAN_PACK_END TLV_Generic_t, *pTLV_Generic_t; /** Capability information mask */ -#define CAPINFO_MASK \ -(~(MBIT(15) | MBIT(14) | MBIT(11) | MBIT(9))) +#define CAPINFO_MASK (~(MBIT(15) | MBIT(14) | MBIT(11) | MBIT(9))) /** Capability Bit Map*/ #ifdef BIG_ENDIAN_SUPPORT typedef MLAN_PACK_START struct _IEEEtypes_CapInfo_t { - t_u8 rsrvd1:2; - t_u8 dsss_ofdm:1; - t_u8 radio_measurement:1; - t_u8 rsvrd2:1; - 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 radio_measurement : 1; + t_u8 rsvrd2 : 1; + 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; - /** Capability Bit Map : IBSS */ - t_u8 ibss:1; - /** Capability Bit Map : CF pollable */ - t_u8 cf_pollable:1; - /** Capability Bit Map : CF poll request */ - t_u8 cf_poll_rqst:1; - /** Capability Bit Map : privacy */ - t_u8 privacy:1; - /** Capability Bit Map : Short preamble */ - t_u8 short_preamble:1; - /** Capability Bit Map : PBCC */ - t_u8 pbcc:1; - /** Capability Bit Map : Channel agility */ - t_u8 chan_agility:1; - /** Capability Bit Map : Spectrum management */ - t_u8 spectrum_mgmt:1; - /** Capability Bit Map : Reserved */ - t_u8 rsrvd3:1; - /** Capability Bit Map : Short slot time */ - t_u8 short_slot_time:1; - /** Capability Bit Map : APSD */ - t_u8 Apsd:1; - /** Capability Bit Map : Reserved */ - t_u8 rsvrd2:1; - /** Capability Bit Map : DSS OFDM */ - t_u8 dsss_ofdm:1; - /** Capability Bit Map : Reserved */ - t_u8 rsrvd1:2; + /** Capability Bit Map : ESS */ + t_u8 ess : 1; + /** Capability Bit Map : IBSS */ + t_u8 ibss : 1; + /** Capability Bit Map : CF pollable */ + t_u8 cf_pollable : 1; + /** Capability Bit Map : CF poll request */ + t_u8 cf_poll_rqst : 1; + /** Capability Bit Map : privacy */ + t_u8 privacy : 1; + /** Capability Bit Map : Short preamble */ + t_u8 short_preamble : 1; + /** Capability Bit Map : PBCC */ + t_u8 pbcc : 1; + /** Capability Bit Map : Channel agility */ + t_u8 chan_agility : 1; + /** Capability Bit Map : Spectrum management */ + t_u8 spectrum_mgmt : 1; + /** Capability Bit Map : Reserved */ + t_u8 rsrvd3 : 1; + /** Capability Bit Map : Short slot time */ + t_u8 short_slot_time : 1; + /** Capability Bit Map : APSD */ + t_u8 Apsd : 1; + /** Capability Bit Map : Reserved */ + t_u8 rsvrd2 : 1; + /** Capability Bit Map : DSS OFDM */ + t_u8 dsss_ofdm : 1; + /** Capability Bit Map : Reserved */ + t_u8 rsrvd1 : 2; } MLAN_PACK_END IEEEtypes_CapInfo_t, *pIEEEtypes_CapInfo_t; #endif /* BIG_ENDIAN_SUPPORT */ /** IEEEtypes_Ssid_t */ typedef MLAN_PACK_START struct _IEEEtypes_Ssid_t { - /** SSID: Element ID */ + /** SSID: Element ID */ t_u8 element_id; - /** SSID : Length */ + /** SSID : Length */ t_u8 len; /** ssid */ t_u8 ssid[MLAN_MAX_SSID_LENGTH]; @@ -389,79 +388,79 @@ typedef MLAN_PACK_START struct _IEEEtypes_Ssid_t { /** IEEEtypes_CfParamSet_t */ typedef MLAN_PACK_START struct _IEEEtypes_CfParamSet_t { - /** CF peremeter : Element ID */ + /** CF peremeter : Element ID */ t_u8 element_id; - /** CF peremeter : Length */ + /** CF peremeter : Length */ t_u8 len; - /** CF peremeter : Count */ + /** CF peremeter : Count */ t_u8 cfp_cnt; - /** CF peremeter : Period */ + /** CF peremeter : Period */ t_u8 cfp_period; - /** CF peremeter : Maximum duration */ + /** CF peremeter : Maximum duration */ t_u16 cfp_max_duration; - /** CF peremeter : Remaining duration */ + /** CF peremeter : Remaining duration */ 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 */ + /** Element ID */ t_u8 element_id; - /** Length */ + /** Length */ t_u8 len; - /** ATIM window value in milliseconds */ + /** ATIM window value in milliseconds */ 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 */ + /** SS parameter : CF parameter set */ IEEEtypes_CfParamSet_t cf_param_set; - /** SS parameter : IBSS parameter set */ + /** SS parameter : IBSS parameter 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 */ + /** FH parameter : Element ID */ t_u8 element_id; - /** FH parameter : Length */ + /** FH parameter : Length */ t_u8 len; - /** FH parameter : Dwell time in milliseconds */ + /** FH parameter : Dwell time in milliseconds */ t_u16 dwell_time; - /** FH parameter : Hop set */ + /** FH parameter : Hop set */ t_u8 hop_set; - /** FH parameter : Hop pattern */ + /** FH parameter : Hop pattern */ t_u8 hop_pattern; - /** FH parameter : Hop index */ + /** FH parameter : 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 */ + /** DS parameter : Element ID */ t_u8 element_id; - /** DS parameter : Length */ + /** DS parameter : Length */ t_u8 len; - /** DS parameter : Current channel */ + /** DS parameter : Current channel */ 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 */ + /** FH parameter set */ IEEEtypes_FhParamSet_t fh_param_set; - /** DS parameter set */ + /** DS parameter 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 */ + /** Element ID */ t_u8 element_id; - /** Length */ + /** Length */ t_u8 len; - /** ERP flags */ + /** ERP flags */ t_u8 erp_flags; } MLAN_PACK_END IEEEtypes_ERPInfo_t, *pIEEEtypes_ERPInfo_t; @@ -472,41 +471,41 @@ typedef t_u16 IEEEtypes_AId_t; typedef t_u16 IEEEtypes_StatusCode_t; /** Fixed size in assoc_resp */ -#define ASSOC_RESP_FIXED_SIZE 6 +#define ASSOC_RESP_FIXED_SIZE 6 /** IEEEtypes_SeqCtl_t */ typedef MLAN_PACK_START struct _IEEEtypes_SeqCtl_t { -/** Fragment Number */ - t_u16 FragNum:4; -/** Sequence Number */ - t_u16 SeqNum:12; + /** Fragment Number */ + t_u16 FragNum : 4; + /** Sequence Number */ + t_u16 SeqNum : 12; } MLAN_PACK_END IEEEtypes_SeqCtl_t; /** IEEEtypes_MgmtHdr_t */ typedef MLAN_PACK_START struct _IEEEtypes_MgmtHdr_t { -/** FrmCtl*/ + /** FrmCtl*/ t_u16 FrmCtl; -/** Duration*/ + /** Duration*/ t_u16 Duration; -/** Destination Addr*/ + /** Destination Addr*/ t_u8 DestAddr[6]; -/** Source Addr*/ + /** Source Addr*/ t_u8 SrcAddr[6]; -/** BSSID */ + /** BSSID */ t_u8 BssId[6]; -/** IEEEtypes_SeqCtl_t */ + /** IEEEtypes_SeqCtl_t */ IEEEtypes_SeqCtl_t SeqCtl; } MLAN_PACK_END IEEEtypes_MgmtHdr_t; /** IEEEtypes_AssocRsp_t */ typedef MLAN_PACK_START struct _IEEEtypes_AssocRsp_t { - /** Capability information */ + /** Capability information */ IEEEtypes_CapInfo_t capability; - /** Association response status code */ + /** Association response status code */ IEEEtypes_StatusCode_t status_code; - /** Association ID */ + /** Association ID */ IEEEtypes_AId_t a_id; - /** IE data buffer */ + /** IE data buffer */ t_u8 ie_buffer[1]; } MLAN_PACK_END IEEEtypes_AssocRsp_t, *pIEEEtypes_AssocRsp_t; @@ -514,39 +513,39 @@ typedef MLAN_PACK_START struct _IEEEtypes_AssocRsp_t { typedef t_u8 WLAN_802_11_RATES[WLAN_SUPPORTED_RATES]; /** cipher TKIP */ -#define WPA_CIPHER_TKIP 2 +#define WPA_CIPHER_TKIP 2 /** cipher AES */ -#define WPA_CIPHER_AES_CCM 4 +#define WPA_CIPHER_AES_CCM 4 /** AKM: 8021x */ -#define RSN_AKM_8021X 1 +#define RSN_AKM_8021X 1 /** AKM: PSK */ -#define RSN_AKM_PSK 2 +#define RSN_AKM_PSK 2 /** AKM: PSK SHA256 */ -#define RSN_AKM_PSK_SHA256 6 +#define RSN_AKM_PSK_SHA256 6 /** AKM: PSK SHA256 */ -#define RSN_AKM_SAE 8 +#define RSN_AKM_SAE 8 /** AKM: PSK SHA256 */ -#define RSN_AKM_OWE 18 +#define RSN_AKM_OWE 18 #if defined(STA_SUPPORT) /** Pairwise Cipher Suite length */ -#define PAIRWISE_CIPHER_SUITE_LEN 4 +#define PAIRWISE_CIPHER_SUITE_LEN 4 /** AKM Suite length */ -#define AKM_SUITE_LEN 4 +#define AKM_SUITE_LEN 4 /** MFPC bit in RSN capability */ -#define MFPC_BIT 7 +#define MFPC_BIT 7 /** MFPR bit in RSN capability */ -#define MFPR_BIT 6 +#define MFPR_BIT 6 /** PMF ORing mask */ -#define PMF_MASK 0x00c0 +#define PMF_MASK 0x00c0 #endif /** wpa_suite_t */ typedef MLAN_PACK_START struct _wpa_suite_t { - /** OUI */ + /** OUI */ t_u8 oui[3]; - /** tyep */ + /** tyep */ t_u8 type; } MLAN_PACK_END wpa_suite, wpa_suite_mcast_t; @@ -554,142 +553,141 @@ typedef MLAN_PACK_START struct _wpa_suite_t { typedef MLAN_PACK_START struct { /* count */ t_u16 count; - /** wpa_suite list */ + /** wpa_suite list */ 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 */ + /** Rsn : Element ID */ t_u8 element_id; - /** Rsn : Length */ + /** Rsn : Length */ t_u8 len; - /** Rsn : version */ + /** Rsn : version */ t_u16 version; - /** Rsn : group cipher */ + /** Rsn : group cipher */ wpa_suite_mcast_t group_cipher; - /** Rsn : pairwise cipher */ + /** Rsn : 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 */ + /** Wpa : Element ID */ t_u8 element_id; - /** Wpa : Length */ + /** Wpa : Length */ t_u8 len; - /** Wpa : oui */ + /** Wpa : oui */ t_u8 oui[4]; - /** version */ + /** version */ t_u16 version; - /** Wpa : group cipher */ + /** Wpa : group cipher */ wpa_suite_mcast_t group_cipher; - /** Wpa : pairwise cipher */ + /** Wpa : pairwise cipher */ wpa_suite_ucast_t pairwise_cipher; } MLAN_PACK_END IEEEtypes_Wpa_t, *pIEEEtypes_Wpa_t; /** Data structure of WMM QoS information */ typedef MLAN_PACK_START struct _IEEEtypes_WmmQosInfo_t { #ifdef BIG_ENDIAN_SUPPORT - /** QoS UAPSD */ - t_u8 qos_uapsd:1; - /** Reserved */ - t_u8 reserved:3; - /** Parameter set count */ - t_u8 para_set_count:4; + /** QoS UAPSD */ + t_u8 qos_uapsd : 1; + /** Reserved */ + t_u8 reserved : 3; + /** Parameter set count */ + t_u8 para_set_count : 4; #else - /** Parameter set count */ - t_u8 para_set_count:4; - /** Reserved */ - t_u8 reserved:3; - /** QoS UAPSD */ - t_u8 qos_uapsd:1; -#endif /* BIG_ENDIAN_SUPPORT */ + /** Parameter set count */ + t_u8 para_set_count : 4; + /** Reserved */ + t_u8 reserved : 3; + /** QoS UAPSD */ + t_u8 qos_uapsd : 1; +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END IEEEtypes_WmmQosInfo_t, *pIEEEtypes_WmmQosInfo_t; /** Data structure of WMM Aci/Aifsn */ typedef MLAN_PACK_START struct _IEEEtypes_WmmAciAifsn_t { #ifdef BIG_ENDIAN_SUPPORT - /** Reserved */ - t_u8 reserved:1; - /** Aci */ - t_u8 aci:2; - /** Acm */ - t_u8 acm:1; - /** Aifsn */ - t_u8 aifsn:4; + /** Reserved */ + t_u8 reserved : 1; + /** Aci */ + t_u8 aci : 2; + /** Acm */ + t_u8 acm : 1; + /** Aifsn */ + t_u8 aifsn : 4; #else - /** Aifsn */ - t_u8 aifsn:4; - /** Acm */ - t_u8 acm:1; - /** Aci */ - t_u8 aci:2; - /** Reserved */ - t_u8 reserved:1; -#endif /* BIG_ENDIAN_SUPPORT */ + /** Aifsn */ + t_u8 aifsn : 4; + /** Acm */ + t_u8 acm : 1; + /** Aci */ + t_u8 aci : 2; + /** Reserved */ + t_u8 reserved : 1; +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END IEEEtypes_WmmAciAifsn_t, *pIEEEtypes_WmmAciAifsn_t; /** Data structure of WMM ECW */ typedef MLAN_PACK_START struct _IEEEtypes_WmmEcw_t { #ifdef BIG_ENDIAN_SUPPORT - /** Maximum Ecw */ - t_u8 ecw_max:4; - /** Minimum Ecw */ - t_u8 ecw_min:4; + /** Maximum Ecw */ + t_u8 ecw_max : 4; + /** Minimum Ecw */ + t_u8 ecw_min : 4; #else - /** Minimum Ecw */ - t_u8 ecw_min:4; - /** Maximum Ecw */ - t_u8 ecw_max:4; -#endif /* BIG_ENDIAN_SUPPORT */ + /** Minimum Ecw */ + t_u8 ecw_min : 4; + /** Maximum Ecw */ + 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 */ typedef MLAN_PACK_START struct _IEEEtypes_WmmInfo_t { - - /** - * WMM Info IE - Vendor Specific Header: - * element_id [221/0xdd] - * Len [7] - * Oui [00:50:f2] - * OuiType [2] - * OuiSubType [0] - * Version [1] - */ + /** + * WMM Info IE - Vendor Specific Header: + * element_id [221/0xdd] + * Len [7] + * Oui [00:50:f2] + * OuiType [2] + * OuiSubType [0] + * Version [1] + */ IEEEtypes_VendorHeader_t vend_hdr; - /** QoS information */ + /** QoS information */ IEEEtypes_WmmQosInfo_t qos_info; } MLAN_PACK_END IEEEtypes_WmmInfo_t, *pIEEEtypes_WmmInfo_t; /** Data structure of WMM parameter IE */ typedef MLAN_PACK_START struct _IEEEtypes_WmmParameter_t { - /** - * WMM Parameter IE - Vendor Specific Header: - * element_id [221/0xdd] - * Len [24] - * Oui [00:50:f2] - * OuiType [2] - * OuiSubType [1] - * Version [1] - */ + /** + * WMM Parameter IE - Vendor Specific Header: + * element_id [221/0xdd] + * Len [24] + * Oui [00:50:f2] + * OuiType [2] + * OuiSubType [1] + * Version [1] + */ IEEEtypes_VendorHeader_t vend_hdr; - /** QoS information */ + /** QoS information */ IEEEtypes_WmmQosInfo_t qos_info; - /** Reserved */ + /** Reserved */ t_u8 reserved; - /** AC Parameters Record WMM_AC_BE, WMM_AC_BK, WMM_AC_VI, WMM_AC_VO */ + /** AC Parameters Record WMM_AC_BE, WMM_AC_BK, WMM_AC_VI, WMM_AC_VO */ IEEEtypes_WmmAcParameters_t ac_params[MAX_AC_QUEUES]; } MLAN_PACK_END IEEEtypes_WmmParameter_t, *pIEEEtypes_WmmParameter_t; @@ -732,57 +730,62 @@ typedef MLAN_PACK_START enum _IEEEtypes_WMM_TSPEC_TS_TRAFFIC_TYPE_e { /** Data structure of WMM TSPEC information */ 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; /** Data structure of WMM TSPEC Nominal Size */ 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; /** Data structure of WMM TSPEC SBWA */ 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; /** Data structure of WMM TSPEC Body */ typedef MLAN_PACK_START struct { - IEEEtypes_WMM_TSPEC_TS_Info_t TSInfo; IEEEtypes_WMM_TSPEC_NomMSDUSize_t NomMSDUSize; t_u16 MaximumMSDUSize; @@ -805,8 +808,8 @@ typedef MLAN_PACK_START struct { 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 OuiType[4]; /* 00:50:f2:02 */ + t_u8 OuiSubType; /* 01 */ t_u8 Version; IEEEtypes_WMM_TSPEC_Body_t TspecBody; @@ -829,6 +832,7 @@ typedef MLAN_PACK_START enum _IEEEtypes_ActionCategory_e { IEEE_MGMT_ACTION_CATEGORY_UNPROTECT_WNM = 11, IEEE_MGMT_ACTION_CATEGORY_WMM_TSPEC = 17 + } MLAN_PACK_END IEEEtypes_ActionCategory_e; /** WMM TSPEC operations */ @@ -842,7 +846,6 @@ typedef MLAN_PACK_START enum _IEEEtypes_WMM_Tspec_Action_e { /** WMM TSPEC Category Action Base */ typedef MLAN_PACK_START struct { - IEEEtypes_ActionCategory_e category; IEEEtypes_WMM_Tspec_Action_e action; t_u8 dialogToken; @@ -851,7 +854,6 @@ typedef MLAN_PACK_START struct { /** WMM TSPEC AddTS request structure */ typedef MLAN_PACK_START struct { - IEEEtypes_WMM_Tspec_Action_Base_Tspec_t tspecAct; t_u8 statusCode; IEEEtypes_WMM_TSPEC_t tspecIE; @@ -900,36 +902,36 @@ typedef MLAN_PACK_START union { /** Data structure for subband set */ typedef MLAN_PACK_START struct _IEEEtypes_SubbandSet_t { - /** First channel */ + /** First channel */ t_u8 first_chan; - /** Number of channels */ + /** Number of channels */ t_u8 no_of_chan; - /** Maximum Tx power in dBm */ + /** Maximum Tx power in dBm */ t_u8 max_tx_pwr; } MLAN_PACK_END IEEEtypes_SubbandSet_t, *pIEEEtypes_SubbandSet_t; #ifdef STA_SUPPORT /** Data structure for Country IE */ typedef MLAN_PACK_START struct _IEEEtypes_CountryInfoSet_t { - /** Element ID */ + /** Element ID */ t_u8 element_id; - /** Length */ + /** Length */ t_u8 len; - /** Country code */ + /** Country code */ t_u8 country_code[COUNTRY_CODE_LEN]; - /** Set of subbands */ + /** Set of subbands */ 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 */ + /** Element ID */ t_u8 element_id; - /** Length */ + /** Length */ t_u8 len; - /** Country code */ + /** Country code */ t_u8 country_code[COUNTRY_CODE_LEN]; - /** Set of subbands */ + /** Set of subbands */ IEEEtypes_SubbandSet_t sub_band[MRVDRV_MAX_SUBBAND_802_11D]; } MLAN_PACK_END IEEEtypes_CountryInfoFullSet_t, *pIEEEtypes_CountryInfoFullSet_t; @@ -938,46 +940,46 @@ typedef MLAN_PACK_START struct _IEEEtypes_CountryInfoFullSet_t { /** HT Capabilities Data */ typedef struct MLAN_PACK_START _HTCap_t { - /** HT Capabilities Info field */ + /** HT Capabilities Info field */ t_u16 ht_cap_info; - /** A-MPDU Parameters field */ + /** A-MPDU Parameters field */ t_u8 ampdu_param; - /** Supported MCS Set field */ + /** Supported MCS Set field */ t_u8 supported_mcs_set[16]; - /** HT Extended Capabilities field */ + /** HT Extended Capabilities field */ t_u16 ht_ext_cap; - /** Transmit Beamforming Capabilities field */ + /** Transmit Beamforming Capabilities field */ t_u32 tx_bf_cap; - /** Antenna Selection Capability field */ + /** Antenna Selection Capability field */ t_u8 asel; } MLAN_PACK_END HTCap_t, *pHTCap_t; /** HT Information Data */ typedef struct MLAN_PACK_START _HTInfo_t { - /** Primary channel */ + /** Primary channel */ t_u8 pri_chan; - /** Field 2 */ + /** Field 2 */ t_u8 field2; - /** Field 3 */ + /** Field 3 */ t_u16 field3; - /** Field 4 */ + /** Field 4 */ t_u16 field4; - /** Bitmap indicating MCSs supported by all HT STAs in the BSS */ + /** Bitmap indicating MCSs supported by all HT STAs in the BSS */ 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 */ + /** 20/40 BSS Coexistence value */ t_u8 bss_co_2040_value; } MLAN_PACK_END BSSCo2040_t, *pBSSCo2040_t; -#define MAX_DSCP_EXCEPTION_NUM 21 +#define MAX_DSCP_EXCEPTION_NUM 21 /** DSCP Range */ typedef struct MLAN_PACK_START _DSCP_Exception_t { /* DSCP value 0 to 63 or ff */ t_u8 dscp_value; - /* user priority 0-7 */ + /* user priority 0-7*/ t_u8 user_priority; } MLAN_PACK_END DSCP_Exception_t, *pDSCP_Exception_t; @@ -991,59 +993,59 @@ typedef struct MLAN_PACK_START _DSCP_Range_t { /** Overlapping BSS Scan Parameters Data */ typedef struct MLAN_PACK_START _OverlapBSSScanParam_t { - /** OBSS Scan Passive Dwell in milliseconds */ + /** OBSS Scan Passive Dwell in milliseconds */ t_u16 obss_scan_passive_dwell; - /** OBSS Scan Active Dwell in milliseconds */ + /** OBSS Scan Active Dwell in milliseconds */ t_u16 obss_scan_active_dwell; - /** BSS Channel Width Trigger Scan Interval in seconds */ + /** BSS Channel Width Trigger Scan Interval in seconds */ t_u16 bss_chan_width_trigger_scan_int; - /** OBSS Scan Passive Total Per Channel */ + /** OBSS Scan Passive Total Per Channel */ t_u16 obss_scan_passive_total; - /** OBSS Scan Active Total Per Channel */ + /** OBSS Scan Active Total Per Channel */ t_u16 obss_scan_active_total; - /** BSS Width Channel Transition Delay Factor */ + /** BSS Width Channel Transition Delay Factor */ t_u16 bss_width_chan_trans_delay; - /** OBSS Scan Activity Threshold */ + /** OBSS Scan Activity 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 */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** HTCap struct */ + /** HTCap struct */ 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 */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** HTInfo struct */ + /** HTInfo struct */ 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 */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** BSSCo2040_t struct */ + /** BSSCo2040_t struct */ 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 */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** ExtCap_t struct */ + /** ExtCap_t struct */ 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 */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** OBSSScanParam_t struct */ + /** OBSSScanParam_t struct */ OBSSScanParam_t obss_scan_param; } MLAN_PACK_END IEEEtypes_OverlapBSSScanParam_t, *pIEEEtypes_OverlapBSSScanParam_t; @@ -1051,53 +1053,53 @@ typedef MLAN_PACK_START struct _IEEEtypes_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 rx_max_rate; /* bit 29-31 reserved */ t_u16 tx_mcs_map; - t_u16 tx_max_rate; /* bit 61-63 reserved */ + 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 */ 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; @@ -1105,34 +1107,34 @@ typedef MLAN_PACK_START struct _VHT_capa { /** VHT Capabilities IE */ typedef MLAN_PACK_START struct _IEEEtypes_VHTCap_t { - /** Generic IE header */ + /** Generic IE header */ 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 -#define VHT_CAP_CHWD_160MHZ 1 -#define VHT_CAP_CHWD_80_80MHZ 2 +#define VHT_CAP_CHWD_80MHZ 0 +#define VHT_CAP_CHWD_160MHZ 1 +#define VHT_CAP_CHWD_80_80MHZ 2 /** VHT Operations IE */ typedef MLAN_PACK_START struct _IEEEtypes_VHTOprat_t { - /** Generic IE header */ + /** Generic IE header */ 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 */ + /** Basic MCS set map, each 2 bits stands for a Nss */ t_u16 basic_MCS_map; } MLAN_PACK_END IEEEtypes_VHTOprat_t, *pIEEEtypes_VHTOprat_t; -#define VHT_OPER_CHWD_20_40MHZ 0 -#define VHT_OPER_CHWD_80MHZ 1 -#define VHT_OPER_CHWD_160MHZ 2 -#define VHT_OPER_CHWD_80_80MHZ 3 +#define VHT_OPER_CHWD_20_40MHZ 0 +#define VHT_OPER_CHWD_80MHZ 1 +#define VHT_OPER_CHWD_160MHZ 2 +#define VHT_OPER_CHWD_80_80MHZ 3 /** VHT Transmit Power Envelope IE */ typedef MLAN_PACK_START struct _IEEEtypes_VHTtxpower_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; t_u8 max_tx_power; t_u8 chan_center_freq; @@ -1141,17 +1143,17 @@ typedef MLAN_PACK_START struct _IEEEtypes_VHTtxpower_t { /** Extended Power Constraint IE */ typedef MLAN_PACK_START struct _IEEEtypes_ExtPwerCons_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** channel width */ + /** channel width */ t_u8 chan_width; - /** local power constraint */ + /** local power constraint */ 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 */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; t_u8 MU_MIMO_capa_count; t_u8 stream_underutilization; @@ -1162,7 +1164,7 @@ typedef MLAN_PACK_START struct _IEEEtypes_ExtBSSload_t { /** Quiet Channel IE */ typedef MLAN_PACK_START struct _IEEEtypes_QuietChan_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; t_u8 AP_quiet_mode; t_u8 quiet_count; @@ -1173,7 +1175,7 @@ typedef MLAN_PACK_START struct _IEEEtypes_QuietChan_t { /** Wide Bandwidth Channel Switch IE */ typedef MLAN_PACK_START struct _IEEEtypes_BWSwitch_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; t_u8 new_chan_width; t_u8 new_chan_center_freq_1; @@ -1182,75 +1184,72 @@ typedef MLAN_PACK_START struct _IEEEtypes_BWSwitch_t { /** AID IE */ typedef MLAN_PACK_START struct _IEEEtypes_AID_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** AID number */ + /** AID number */ 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 */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** Operating Mode */ + /** Operating Mode */ t_u8 oper_mode; } MLAN_PACK_END IEEEtypes_OperModeNtf_t, *pIEEEtypes_OperModeNtf_t; typedef MLAN_PACK_START struct _IEEEtypes_Extension_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** Element id extension */ + /** Element id extension */ t_u8 ext_id; - /** payload */ + /** payload */ t_u8 data[]; } MLAN_PACK_END IEEEtypes_Extension_t, *pIEEEtypes_Extension_t; typedef MLAN_PACK_START struct _IEEEtypes_HECap_t { - /** Generic IE header */ + /** Generic IE header */ IEEEtypes_Header_t ieee_hdr; - /** Element id extension */ + /** Element id extension */ t_u8 ext_id; - /** he mac capability info */ + /** he mac capability info */ t_u8 he_mac_cap[6]; - /** he phy capability info */ + /** he phy capability info */ t_u8 he_phy_cap[11]; - /** he txrx mcs support , size would be 4 or 8 or 12 */ + /** he txrx mcs support , size would be 4 or 8 or 12 */ t_u8 he_txrx_mcs_support[4]; - /** PPE Thresholds (optional) */ + /** PPE Thresholds (optional) */ } MLAN_PACK_END IEEEtypes_HECap_t, *pIEEEtypes_HECap_t; /** Maximum number of subbands in the IEEEtypes_SupportedChannels_t structure */ -#define WLAN_11H_MAX_SUBBANDS 5 +#define WLAN_11H_MAX_SUBBANDS 5 /** Maximum number of DFS channels configured in IEEEtypes_IBSS_DFS_t */ #define WLAN_11H_MAX_IBSS_DFS_CHANNELS 25 /** 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) */ @@ -1258,8 +1257,8 @@ typedef MLAN_PACK_START struct { * 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; @@ -1269,16 +1268,16 @@ typedef MLAN_PACK_START struct { * of channels supported in each subband */ 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 */ + /** Configured sub-bands information in the element */ IEEEtypes_SupportChan_Subband_t subband[WLAN_11H_MAX_SUBBANDS]; } MLAN_PACK_END IEEEtypes_SupportedChannels_t; /** default channel switch count */ -#define DEF_CHAN_SWITCH_COUNT 5 +#define DEF_CHAN_SWITCH_COUNT 5 /* IEEE Channel Switch Announcement Element (7.3.2.20) */ /** @@ -1287,27 +1286,27 @@ typedef MLAN_PACK_START struct { * 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; /** data structure for extended channel switch */ typedef MLAN_PACK_START struct { - /** IEEE element ID = 60 */ + /** IEEE element ID = 60 */ t_u8 element_id; - /** Element length after id and len, set to 4 */ + /** Element length after id and len, set to 4 */ t_u8 len; - /** STA should not transmit any frames if 1 */ + /** STA should not transmit any frames if 1 */ t_u8 chan_switch_mode; - /** Operate class # that AP/IBSS is moving to */ + /** Operate class # that AP/IBSS is moving to */ t_u8 new_oper_class; - /** Channel # that AP/IBSS is moving to */ + /** Channel # that AP/IBSS is moving to */ t_u8 new_channel_num; - /** of TBTTs before channel switch */ + /** of TBTTs before channel switch */ t_u8 chan_switch_count; } MLAN_PACK_END IEEEtypes_ExtChanSwitchAnn_t; @@ -1319,7 +1318,7 @@ typedef MLAN_PACK_START struct { * switch element. */ typedef MLAN_PACK_START struct { - /** Generic IE header IEEE Element ID = 194*/ + /** Generic IE header IEEE Element ID = 194*/ IEEEtypes_Header_t ieee_hdr; t_u8 new_channel_width; t_u8 new_channel_center_freq0; @@ -1333,12 +1332,12 @@ typedef MLAN_PACK_START struct { * Wrapper IE. */ typedef MLAN_PACK_START struct { - /** Generic IE header IEEE Element ID = 195*/ + /** 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>*/ + 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) */ @@ -1348,13 +1347,15 @@ typedef MLAN_PACK_START struct { * 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; @@ -1363,32 +1364,32 @@ typedef MLAN_PACK_START struct { **/ typedef MLAN_PACK_START struct { #ifdef BIG_ENDIAN_SUPPORT - /**< Reserved */ - t_u8 rsvd5_7:3; - /**< Channel is unmeasured */ - t_u8 unmeasured:1; - /**< Radar detected on channel */ - t_u8 radar:1; - /**< Unidentified signal found on channel */ - t_u8 unidentified_sig:1; - /**< OFDM preamble detected on channel */ - t_u8 ofdm_preamble:1; - /**< At least one valid MPDU received on channel */ - t_u8 bss:1; + /**< Reserved */ + t_u8 rsvd5_7 : 3; + /**< Channel is unmeasured */ + t_u8 unmeasured : 1; + /**< Radar detected on channel */ + t_u8 radar : 1; + /**< Unidentified signal found on channel */ + t_u8 unidentified_sig : 1; + /**< OFDM preamble detected on channel */ + t_u8 ofdm_preamble : 1; + /**< At least one valid MPDU received on channel */ + t_u8 bss : 1; #else - /**< At least one valid MPDU received on channel */ - t_u8 bss:1; - /**< OFDM preamble detected on channel */ - t_u8 ofdm_preamble:1; - /**< Unidentified signal found on channel */ - t_u8 unidentified_sig:1; - /**< Radar detected on channel */ - t_u8 radar:1; - /**< Channel is unmeasured */ - t_u8 unmeasured:1; - /**< Reserved */ - t_u8 rsvd5_7:3; -#endif /* BIG_ENDIAN_SUPPORT */ + /**< At least one valid MPDU received on channel */ + t_u8 bss : 1; + /**< OFDM preamble detected on channel */ + t_u8 ofdm_preamble : 1; + /**< Unidentified signal found on channel */ + t_u8 unidentified_sig : 1; + /**< Radar detected on channel */ + t_u8 radar : 1; + /**< Channel is unmeasured */ + t_u8 unmeasured : 1; + /**< Reserved */ + t_u8 rsvd5_7 : 3; +#endif /* BIG_ENDIAN_SUPPORT */ } MLAN_PACK_END MeasRptBasicMap_t; @@ -1399,9 +1400,9 @@ typedef MLAN_PACK_START struct { * 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; @@ -1412,13 +1413,13 @@ typedef MLAN_PACK_START struct { * 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 */ + /** Variable length map field, one Map entry for each supported channel + */ IEEEtypes_ChannelMap_t channel_map[WLAN_11H_MAX_IBSS_DFS_CHANNELS]; } MLAN_PACK_END IEEEtypes_IBSS_DFS_t; @@ -1429,17 +1430,17 @@ typedef MLAN_PACK_START struct { * 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; @@ -1451,15 +1452,15 @@ typedef struct { #define MAX_SCAN_RSP_BUF (16 * 1024) /** Maximum number of channels that can be sent in user scan config */ -#define WLAN_USER_SCAN_CHAN_MAX 50 +#define WLAN_USER_SCAN_CHAN_MAX 50 /** Maximum length of SSID list */ -#define MRVDRV_MAX_SSID_LIST_LENGTH 10 +#define MRVDRV_MAX_SSID_LIST_LENGTH 10 /** Maximum length of BSSID list */ -#define MAX_BSSID_FILTER_LIST 5 +#define MAX_BSSID_FILTER_LIST 5 /** Scan all the channels in specified band */ -#define BAND_SPECIFIED 0x80 +#define BAND_SPECIFIED 0x80 /** * IOCTL SSID List sub-structure sent in wlan_ioctl_user_scan_cfg @@ -1468,9 +1469,9 @@ typedef struct { * filters for scan result processing in firmware. */ typedef MLAN_PACK_START struct _wlan_user_scan_ssid { - /** SSID */ + /** SSID */ t_u8 ssid[MLAN_MAX_SSID_LENGTH + 1]; - /** Maximum length of SSID */ + /** Maximum length of SSID */ t_u8 max_len; } MLAN_PACK_END wlan_user_scan_ssid; @@ -1481,21 +1482,21 @@ typedef MLAN_PACK_START struct _wlan_user_scan_ssid { * to configure a instance of a scan on the specific channel. */ typedef MLAN_PACK_START struct _wlan_user_scan_chan { - /** Channel Number to scan */ + /** Channel Number to scan */ t_u8 chan_number; - /** Radio type: 'B/G' Band = 0, 'A' Band = 1 */ + /** Radio type: 'B/G' Band = 0, 'A' Band = 1 */ t_u8 radio_type; - /** Scan type: Active = 1, Passive = 2 */ + /** Scan type: Active = 1, Passive = 2 */ t_u8 scan_type; - /** Reserved */ + /** Reserved */ t_u8 reserved; - /** Scan duration in milliseconds; if 0 default used */ + /** Scan duration in milliseconds; if 0 default used */ t_u32 scan_time; } MLAN_PACK_END wlan_user_scan_chan; /** channel statictics */ typedef MLAN_PACK_START struct _ChanStatistics_t { - /** channle number */ + /** channle number */ t_u8 chan_num; /** band info */ Band_Config_t bandcfg; @@ -1509,9 +1510,9 @@ typedef MLAN_PACK_START struct _ChanStatistics_t { t_u16 cca_scan_duration; /** busy duration */ t_u16 cca_busy_duration; - /** min rss */ + /** min rss */ t_u8 min_rss; - /** max rssi */ + /** max rssi */ t_u8 max_rss; } MLAN_PACK_END ChanStatistics_t; @@ -1530,54 +1531,55 @@ typedef enum _MLAN_EXT_SCAN_TYPE { * desired. */ typedef MLAN_PACK_START struct { - /** - * Flag set to keep the previous scan table intact - * - * If set, the scan results will accumulate, replacing any previous - * matched entries for a BSS with the new scan data - */ + /** + * Flag set to keep the previous scan table intact + * + * 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; - /** - * BSS mode to be sent in the firmware command - * - * Field can be used to restrict the types of networks returned in the - * scan. Valid settings are: - * - * - MLAN_SCAN_MODE_BSS (infrastructure) - * - MLAN_SCAN_MODE_IBSS (adhoc) - * - MLAN_SCAN_MODE_ANY (unrestricted, adhoc and infrastructure) - */ + /** + * BSS mode to be sent in the firmware command + * + * Field can be used to restrict the types of networks returned in the + * scan. Valid settings are: + * + * - MLAN_SCAN_MODE_BSS (infrastructure) + * - MLAN_SCAN_MODE_IBSS (adhoc) + * - MLAN_SCAN_MODE_ANY (unrestricted, adhoc and infrastructure) + */ t_u8 bss_mode; - /** - * Configure the number of probe requests for active chan scans - */ + /** + * Configure the number of probe requests for active chan scans + */ t_u8 num_probes; - /** - * @brief ssid filter flag - */ + /** + * @brief ssid filter flag + */ t_u8 ssid_filter; - /** - * @brief BSSID filter sent in the firmware command to limit the results - */ + /** + * @brief BSSID filter sent in the firmware command to limit the + * results + */ t_u8 specific_bssid[MLAN_MAC_ADDR_LENGTH]; - /** - * SSID filter list used in the to limit the scan results - */ + /** + * SSID filter list used in the to limit the scan results + */ wlan_user_scan_ssid ssid_list[MRVDRV_MAX_SSID_LIST_LENGTH]; - /** - * Variable number (fixed maximum) of channels to scan up - */ + /** + * Variable number (fixed maximum) of channels to scan up + */ wlan_user_scan_chan chan_list[WLAN_USER_SCAN_CHAN_MAX]; - /** scan channel gap */ + /** scan channel gap */ t_u16 scan_chan_gap; - /** scan type: 0 legacy, 1: enhance scan*/ + /** scan type: 0 legacy, 1: enhance scan*/ t_u8 ext_scan_type; - /** flag to filer only probe response */ + /** flag to filer only probe response */ t_u8 proberesp_only; t_u8 random_mac[MLAN_MAC_ADDR_LENGTH]; - /** Number of BSSIDs to be filtered */ + /** Number of BSSIDs to be filtered */ t_u8 bssid_num; - /** BSSID filter list used in the to limit the scan results */ + /** BSSID filter list used in the to limit the scan results */ mlan_802_11_mac_addr bssid_list[MAX_BSSID_FILTER_LIST]; } MLAN_PACK_END wlan_user_scan_cfg; @@ -1585,36 +1587,36 @@ typedef MLAN_PACK_START struct { #define DEFAULT_BGSCAN_INTERVAL 30000 /** action get all, except pps/uapsd config */ -#define BG_SCAN_ACT_GET 0x0000 +#define BG_SCAN_ACT_GET 0x0000 /** action set all, except pps/uapsd config */ -#define BG_SCAN_ACT_SET 0x0001 +#define BG_SCAN_ACT_SET 0x0001 /** action get pps/uapsd config */ -#define BG_SCAN_ACT_GET_PPS_UAPSD 0x0100 +#define BG_SCAN_ACT_GET_PPS_UAPSD 0x0100 /** action set pps/uapsd config */ -#define BG_SCAN_ACT_SET_PPS_UAPSD 0x0101 +#define BG_SCAN_ACT_SET_PPS_UAPSD 0x0101 /** action set all */ -#define BG_SCAN_ACT_SET_ALL 0xff01 +#define BG_SCAN_ACT_SET_ALL 0xff01 /** ssid match */ -#define BG_SCAN_SSID_MATCH 0x0001 +#define BG_SCAN_SSID_MATCH 0x0001 /** ssid match and RSSI exceeded */ -#define BG_SCAN_SSID_RSSI_MATCH 0x0004 +#define BG_SCAN_SSID_RSSI_MATCH 0x0004 /**wait for all channel scan to complete to report scan result*/ -#define BG_SCAN_WAIT_ALL_CHAN_DONE 0x80000000 +#define BG_SCAN_WAIT_ALL_CHAN_DONE 0x80000000 /** Maximum number of channels that can be sent in bg scan config */ -#define WLAN_BG_SCAN_CHAN_MAX 38 +#define WLAN_BG_SCAN_CHAN_MAX 38 /** Enumeration definition */ /** EES MODE */ typedef enum { - /** EES MODE: LOW */ + /** EES MODE: LOW */ EES_MODE_LOW = 0, - /** EES MODE: MID */ + /** EES MODE: MID */ EES_MODE_MID, - /** EES MODE: HIGH */ + /** EES MODE: HIGH */ EES_MODE_HIGH, - /** EES MODE: OFF */ + /** EES MODE: OFF */ EES_MODE_OFF, - /** EES MODE: LOOP */ + /** EES MODE: LOOP */ EES_MODE_LOOP = 15, } ees_modes; @@ -1623,13 +1625,13 @@ typedef enum { /** ees_ssid_config */ typedef MLAN_PACK_START struct { - /** SSID */ + /** SSID */ t_u8 ssid[MLAN_MAX_SSID_LENGTH + 1]; - /** Maximum length of SSID */ + /** Maximum length of SSID */ t_u8 max_len; - /** PairCipher */ + /** PairCipher */ t_u8 pair_cipher; - /** GroupCipher */ + /** GroupCipher */ t_u8 group_cipher; } MLAN_PACK_END ees_ssid_config; @@ -1637,66 +1639,66 @@ typedef MLAN_PACK_START struct { * Input structure to configure bs scan cmd to firmware */ typedef MLAN_PACK_START struct { - /** action */ + /** action */ t_u16 action; - /** enable/disable */ + /** enable/disable */ t_u8 enable; - /** BSS type: - * MLAN_SCAN_MODE_BSS (infrastructure) - * MLAN_SCAN_MODE_IBSS (adhoc) - * MLAN_SCAN_MODE_ANY (unrestricted, adhoc and infrastructure) - */ + /** BSS type: + * MLAN_SCAN_MODE_BSS (infrastructure) + * MLAN_SCAN_MODE_IBSS (adhoc) + * MLAN_SCAN_MODE_ANY (unrestricted, adhoc and infrastructure) + */ t_u8 bss_type; - /** number of channel scanned during each scan */ + /** number of channel scanned during each scan */ t_u8 chan_per_scan; - /** interval between consecutive scan */ + /** interval between consecutive scan */ 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 - */ + /** 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; - /** RSSI threshold */ + /** RSSI threshold */ t_u8 rssi_threshold; - /** SNR threshold */ + /** SNR threshold */ t_u8 snr_threshold; - /** repeat count */ + /** repeat count */ t_u16 repeat_count; - /** start later flag */ + /** start later flag */ t_u16 start_later; - /** SSID filter list used in the to limit the scan results */ + /** SSID filter list used in the to limit the scan results */ wlan_user_scan_ssid ssid_list[MRVDRV_MAX_SSID_LIST_LENGTH]; - /** Variable number (fixed maximum) of channels to scan up */ + /** Variable number (fixed maximum) of channels to scan up */ wlan_user_scan_chan chan_list[WLAN_BG_SCAN_CHAN_MAX]; - /** scan channel gap */ + /** scan channel gap */ t_u16 scan_chan_gap; - /** Enable EES configuration */ + /** Enable EES configuration */ t_u8 config_ees; - /** EES scan mode */ + /** EES scan mode */ t_u16 ees_mode; - /** EES report condition */ + /** EES report condition */ t_u16 report_cond; - /** EES High Period scan interval */ + /** EES High Period scan interval */ t_u16 high_period; - /** EES High Period scan count */ + /** EES High Period scan count */ t_u16 high_period_count; - /** EES Medium Period scan interval */ + /** EES Medium Period scan interval */ t_u16 mid_period; - /** EES Medium Period scan count */ + /** EES Medium Period scan count */ t_u16 mid_period_count; - /** EES Low Period scan interval */ + /** EES Low Period scan interval */ t_u16 low_period; - /** EES Low Period scan count */ + /** EES Low Period scan count */ t_u16 low_period_count; - /** Number of networks in the list */ + /** Number of networks in the list */ t_u8 network_count; - /** Maximum number of connection count */ + /** Maximum number of connection count */ t_u8 max_conn_count; - /** Black List Exp */ + /** Black List Exp */ t_u8 black_list_exp; - /** Array of ees config struct */ + /** Array of ees config struct */ ees_ssid_config ees_ssid_cfg[EES_MAX_SSIDS]; t_u8 random_mac[MLAN_MAC_ADDR_LENGTH]; } MLAN_PACK_END wlan_bgscan_cfg; @@ -1710,175 +1712,175 @@ typedef MLAN_PACK_START struct { * Structure used to store information for beacon/probe response */ typedef struct _BSSDescriptor_t { - /** MAC address */ + /** MAC address */ mlan_802_11_mac_addr mac_address; - /** SSID */ + /** SSID */ mlan_802_11_ssid ssid; - /** WEP encryption requirement */ + /** WEP encryption requirement */ t_u32 privacy; - /** Receive signal strength in dBm */ + /** Receive signal strength in dBm */ t_s32 rssi; - /** channel load */ + /** channel load */ t_u8 chan_load; - /** Channel */ + /** Channel */ t_u32 channel; - /** Freq */ + /** Freq */ t_u32 freq; - /** Beacon period */ + /** Beacon period */ t_u16 beacon_period; - /** ATIM window */ + /** ATIM window */ t_u32 atim_window; - /** ERP flags */ + /** ERP flags */ t_u8 erp_flags; - /** Type of network in use */ + /** Type of network in use */ WLAN_802_11_NETWORK_TYPE network_type_use; - /** Network infrastructure mode */ + /** Network infrastructure mode */ t_u32 bss_mode; - /** Network supported rates */ + /** Network supported rates */ WLAN_802_11_RATES supported_rates; - /** Supported data rates */ + /** Supported data rates */ t_u8 data_rates[WLAN_SUPPORTED_RATES]; - /** Current channel bandwidth - * 0 : 20MHZ - * 1 : 40MHZ - * 2 : 80MHZ - * 3 : 160MHZ - */ + /** Current channel bandwidth + * 0 : 20MHZ + * 1 : 40MHZ + * 2 : 80MHZ + * 3 : 160MHZ + */ t_u8 curr_bandwidth; - /** Network band. - * BAND_B(0x01): 'b' band - * BAND_G(0x02): 'g' band - * BAND_A(0X04): 'a' band - */ + /** Network band. + * BAND_B(0x01): 'b' band + * BAND_G(0x02): 'g' band + * BAND_A(0X04): 'a' band + */ t_u16 bss_band; - /** TSF timestamp from the current firmware TSF */ + /** TSF timestamp from the current firmware TSF */ t_u64 network_tsf; - /** TSF value included in the beacon/probe response */ + /** TSF value included in the beacon/probe response */ t_u8 time_stamp[8]; - /** PHY parameter set */ + /** PHY parameter set */ IEEEtypes_PhyParamSet_t phy_param_set; - /** SS parameter set */ + /** SS parameter set */ IEEEtypes_SsParamSet_t ss_param_set; - /** Capability information */ + /** Capability information */ IEEEtypes_CapInfo_t cap_info; - /** WMM IE */ + /** WMM IE */ IEEEtypes_WmmParameter_t wmm_ie; - /** 802.11h BSS information */ + /** 802.11h BSS information */ wlan_11h_bss_info_t wlan_11h_bss_info; - /** Indicate disabling 11n when associate with AP */ + /** Indicate disabling 11n when associate with AP */ t_u8 disable_11n; - /** 802.11n BSS information */ - /** HT Capabilities IE */ + /** 802.11n BSS information */ + /** HT Capabilities IE */ IEEEtypes_HTCap_t *pht_cap; - /** HT Capabilities Offset */ + /** HT Capabilities Offset */ t_u16 ht_cap_offset; - /** HT Information IE */ + /** HT Information IE */ IEEEtypes_HTInfo_t *pht_info; - /** HT Information Offset */ + /** HT Information Offset */ t_u16 ht_info_offset; - /** 20/40 BSS Coexistence IE */ + /** 20/40 BSS Coexistence IE */ IEEEtypes_2040BSSCo_t *pbss_co_2040; - /** 20/40 BSS Coexistence Offset */ + /** 20/40 BSS Coexistence Offset */ t_u16 bss_co_2040_offset; - /** Extended Capabilities IE */ + /** Extended Capabilities IE */ IEEEtypes_ExtCap_t *pext_cap; - /** Extended Capabilities Offset */ + /** Extended Capabilities Offset */ t_u16 ext_cap_offset; - /** Overlapping BSS Scan Parameters IE */ + /** Overlapping BSS Scan Parameters IE */ IEEEtypes_OverlapBSSScanParam_t *poverlap_bss_scan_param; - /** Overlapping BSS Scan Parameters Offset */ + /** Overlapping BSS Scan Parameters Offset */ t_u16 overlap_bss_offset; - /** VHT Capabilities IE */ + /** VHT Capabilities IE */ IEEEtypes_VHTCap_t *pvht_cap; - /** VHT Capabilities IE offset */ + /** VHT Capabilities IE offset */ t_u16 vht_cap_offset; - /** VHT Operations IE */ + /** VHT Operations IE */ IEEEtypes_VHTOprat_t *pvht_oprat; - /** VHT Operations IE offset */ + /** VHT Operations IE offset */ t_u16 vht_oprat_offset; - /** VHT Transmit Power Envelope IE */ + /** VHT Transmit Power Envelope IE */ IEEEtypes_VHTtxpower_t *pvht_txpower; - /** VHT Transmit Power Envelope IE offset */ + /** VHT Transmit Power Envelope IE offset */ t_u16 vht_txpower_offset; - /** Extended Power Constraint IE */ + /** Extended Power Constraint IE */ IEEEtypes_ExtPwerCons_t *pext_pwer; - /** Extended Power Constraint IE offset */ + /** Extended Power Constraint IE offset */ t_u16 ext_pwer_offset; - /** Extended BSS Load IE */ + /** Extended BSS Load IE */ IEEEtypes_ExtBSSload_t *pext_bssload; - /** Extended BSS Load IE offset */ + /** Extended BSS Load IE offset */ t_u16 ext_bssload_offset; - /** Quiet Channel IE */ + /** Quiet Channel IE */ IEEEtypes_QuietChan_t *pquiet_chan; - /** Quiet Channel IE offset */ + /** Quiet Channel IE offset */ t_u16 quiet_chan_offset; - /** Operating Mode Notification IE */ + /** Operating Mode Notification IE */ IEEEtypes_OperModeNtf_t *poper_mode; - /** Operating Mode Notification IE offset */ + /** Operating Mode Notification IE offset */ t_u16 oper_mode_offset; - /** HE Capability IE */ + /** HE Capability IE */ IEEEtypes_HECap_t *phe_cap; - /** HE Capability IE offset */ + /** HE Capability IE offset */ t_u16 he_cap_offset; - /** HE operation IE */ + /** HE operation IE */ IEEEtypes_Extension_t *phe_oprat; - /** HE operation IE offset */ + /** HE operation IE offset */ t_u16 he_oprat_offset; #ifdef STA_SUPPORT - /** Country information set */ + /** Country information set */ IEEEtypes_CountryInfoFullSet_t country_info; -#endif /* STA_SUPPORT */ +#endif /* STA_SUPPORT */ - /** WPA IE */ + /** WPA IE */ IEEEtypes_VendorSpecific_t *pwpa_ie; - /** WPA IE offset in the beacon buffer */ + /** WPA IE offset in the beacon buffer */ t_u16 wpa_offset; - /** RSN IE */ + /** RSN IE */ IEEEtypes_Generic_t *prsn_ie; - /** RSN IE offset in the beacon buffer */ + /** RSN IE offset in the beacon buffer */ t_u16 rsn_offset; #ifdef STA_SUPPORT - /** WAPI IE */ + /** WAPI IE */ IEEEtypes_Generic_t *pwapi_ie; - /** WAPI IE offset in the beacon buffer */ + /** WAPI IE offset in the beacon buffer */ t_u16 wapi_offset; #endif - /* Hotspot 2.0 OSEN AKM IE */ + /* Hotspot 2.0 OSEN AKM IE*/ IEEEtypes_Generic_t *posen_ie; - /** osen IE offset in the beacon buffer */ + /** osen IE offset in the beacon buffer */ t_u16 osen_offset; /* Mobility domain IE */ IEEEtypes_MobilityDomain_t *pmd_ie; /** Mobility domain IE offset in the beacon buffer */ t_u16 md_offset; - /** Pointer to the returned scan response */ + /** Pointer to the returned scan response */ t_u8 *pbeacon_buf; - /** Length of the stored scan response */ + /** Length of the stored scan response */ t_u32 beacon_buf_size; - /** Max allocated size for updated scan response */ + /** Max allocated size for updated scan response */ t_u32 beacon_buf_size_max; } BSSDescriptor_t, *pBSSDescriptor_t; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/mlan_ioctl.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/mlan_ioctl.h index 1bd134cbf240..9aba784de4b3 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/mlan_ioctl.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/mlan_ioctl.h @@ -228,6 +228,7 @@ enum _mlan_ioctl_req_id { MLAN_OID_11H_CHAN_REPORT_REQUEST = 0x00110004, MLAN_OID_11H_CHAN_SWITCH_COUNT = 0x00110005, MLAN_OID_11H_CHAN_NOP_INFO = 0x00110006, + MLAN_OID_11H_DFS_W53_CFG = 0x00110008, /* 802.11n Configuration Group RANDYTODO for value assign */ MLAN_IOCTL_11AC_CFG = 0x00120000, @@ -239,6 +240,7 @@ enum _mlan_ioctl_req_id { MLAN_IOCTL_11AX_CFG = 0x00170000, MLAN_OID_11AX_HE_CFG = 0x00170001, MLAN_OID_11AX_CMD_CFG = 0x00170002, + MLAN_OID_11AX_TWT_CFG = 0x00170003, /* Miscellaneous Configuration Group */ MLAN_IOCTL_MISC_CFG = 0x00200000, @@ -324,7 +326,7 @@ enum _mlan_ioctl_req_id { }; /** Sub command size */ -#define MLAN_SUB_COMMAND_SIZE 4 +#define MLAN_SUB_COMMAND_SIZE 4 /** Enumeration for the action of IOCTL request */ enum _mlan_act_ioctl { @@ -337,10 +339,7 @@ enum _mlan_act_ioctl { }; /** Enumeration for generic enable/disable */ -enum _mlan_act_generic { - MLAN_ACT_DISABLE = 0, - MLAN_ACT_ENABLE = 1 -}; +enum _mlan_act_generic { MLAN_ACT_DISABLE = 0, MLAN_ACT_ENABLE = 1 }; /** Enumeration for scan mode */ enum _mlan_scan_mode { @@ -366,27 +365,27 @@ enum _mlan_pass_to_act_scan { }; /** Max number of supported rates */ -#define MLAN_SUPPORTED_RATES 32 +#define MLAN_SUPPORTED_RATES 32 /** Mrvl Proprietary Tlv base */ -#define PROPRIETARY_TLV_BASE_ID 0x100 +#define PROPRIETARY_TLV_BASE_ID 0x100 /** RSSI scan */ -#define SCAN_RSSI(RSSI) (0x100 - ((t_u8)(RSSI))) +#define SCAN_RSSI(RSSI) (0x100 - ((t_u8)(RSSI))) /** Max passive scan time for each channel in milliseconds */ -#define MRVDRV_MAX_PASSIVE_SCAN_CHAN_TIME 2000 +#define MRVDRV_MAX_PASSIVE_SCAN_CHAN_TIME 2000 /** Max active scan time for each channel in milliseconds */ -#define MRVDRV_MAX_ACTIVE_SCAN_CHAN_TIME 500 +#define MRVDRV_MAX_ACTIVE_SCAN_CHAN_TIME 500 /** Max gap time between 2 scan in milliseconds */ -#define MRVDRV_MAX_SCAN_CHAN_GAP_TIME 500 +#define MRVDRV_MAX_SCAN_CHAN_GAP_TIME 500 /** Maximum number of probes to send on each channel */ -#define MAX_PROBES 5 +#define MAX_PROBES 5 /** Default number of probes to send on each channel */ -#define DEFAULT_PROBES 4 +#define DEFAULT_PROBES 4 /** * @brief Sub-structure passed in wlan_ioctl_get_scan_table_entry for each BSS @@ -395,32 +394,32 @@ enum _mlan_pass_to_act_scan { * response. */ typedef struct _wlan_get_scan_table_fixed { - /** BSSID of this network */ + /** BSSID of this network */ t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; - /** Channel this beacon/probe response was detected */ + /** Channel this beacon/probe response was detected */ t_u8 channel; - /** RSSI for the received packet */ + /** RSSI for the received packet */ t_u8 rssi; - /** channel load */ + /** channel load */ t_u8 chan_load; - /** TSF value in microseconds from the firmware at packet reception */ + /** TSF value in microseconds from the firmware at packet reception */ t_u64 network_tsf; } wlan_get_scan_table_fixed; /** mlan_802_11_ssid data structure */ typedef struct _mlan_802_11_ssid { - /** SSID Length */ + /** SSID Length */ t_u32 ssid_len; - /** SSID information field */ + /** SSID information field */ t_u8 ssid[MLAN_MAX_SSID_LENGTH]; } mlan_802_11_ssid, *pmlan_802_11_ssid; typedef MLAN_PACK_START struct _tx_status_event { - /** packet type */ + /** packet type */ t_u8 packet_type; - /** tx_token_id */ + /** tx_token_id */ t_u8 tx_token_id; - /** 0--success, 1--fail, 2--watchdogtimeout */ + /** 0--success, 1--fail, 2--watchdogtimeout */ t_u8 status; } MLAN_PACK_END tx_status_event; @@ -428,15 +427,15 @@ typedef MLAN_PACK_START struct _tx_status_event { * Sructure to retrieve the scan table */ typedef struct { - /** - * - Zero based scan entry to start retrieval in command request - * - Number of scans entries returned in command response - */ + /** + * - Zero based scan entry to start retrieval in command request + * - Number of scans entries returned in command response + */ 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. - */ + /** + * 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]; } wlan_ioctl_get_scan_table_info; @@ -445,24 +444,25 @@ typedef struct { * BSS returned in the WLAN_GET_SCAN_RESP IOCTL */ typedef struct _wlan_ioctl_get_scan_table_entry { - /** - * Fixed field length included in the response. - * - * Length value is included so future fixed fields can be added to the - * response without breaking backwards compatibility. Use the length - * to find the offset for the bssInfoLength field, not a sizeof() calc. - */ + /** + * Fixed field length included in the response. + * + * Length value is included so future fixed fields can be added to the + * 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; - /** - * Length of the BSS Information (probe resp or beacon) that - * follows after the fixed_field_length - */ + /** + * Length of the BSS Information (probe resp or beacon) that + * follows after the fixed_field_length + */ t_u32 bss_info_length; - /** - * Always present, fixed length data fields for the BSS - */ + /** + * Always present, fixed length data fields for the BSS + */ wlan_get_scan_table_fixed fixed_fields; /* @@ -480,64 +480,64 @@ typedef struct _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 */ + /** Scan channel time for specific scan in milliseconds */ t_u32 specific_scan_time; - /** Scan channel time for active scan in milliseconds */ + /** Scan channel time for active scan in milliseconds */ t_u32 active_scan_time; - /** Scan channel time for passive scan in milliseconds */ + /** Scan channel time for passive scan in milliseconds */ 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 */ + /** Length of scan_cfg_buf */ t_u32 scan_cfg_len; - /** Buffer of scan config */ + /** Buffer of scan config */ 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 */ + /** BSS mode for scanning */ t_u32 scan_mode; - /** Scan type */ + /** Scan type */ t_u32 scan_type; - /** SSID */ + /** SSID */ mlan_802_11_ssid scan_ssid; - /** Scan time parameters */ + /** Scan time parameters */ mlan_scan_time_params scan_time; - /** Scan config parameters in user scan */ + /** Scan config parameters in 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 */ + /** Number of scan result */ t_u32 num_in_scan_table; - /** Scan table */ + /** Scan table */ t_u8 *pscan_table; /* Age in seconds */ t_u32 age_in_secs; - /** channel statstics */ + /** channel statstics */ t_u8 *pchan_stats; - /** Number of records in the chan_stats */ + /** Number of records in the chan_stats */ t_u32 num_in_chan_stats; } mlan_scan_resp, *pmlan_scan_resp; -#define EXT_SCAN_TYPE_ENH 2 +#define EXT_SCAN_TYPE_ENH 2 /** Type definition of mlan_scan_cfg */ typedef struct _mlan_scan_cfg { - /** Scan type */ + /** Scan type */ t_u32 scan_type; - /** BSS mode for scanning */ + /** BSS mode for scanning */ t_u32 scan_mode; - /** Scan probe */ + /** Scan probe */ t_u32 scan_probe; - /** Scan time parameters */ + /** Scan time parameters */ mlan_scan_time_params scan_time; - /** First passive scan then active scan */ + /** First passive scan then active scan */ t_u8 passive_to_active_scan; - /** Ext_scan: 0 disable, 1: enable, 2: enhance scan*/ + /** Ext_scan: 0 disable, 1: enable, 2: enhance scan*/ t_u32 ext_scan; /** scan channel gap */ t_u32 scan_chan_gap; @@ -545,17 +545,17 @@ typedef struct _mlan_scan_cfg { /** Type defnition of mlan_ds_scan for MLAN_IOCTL_SCAN */ typedef struct _mlan_ds_scan { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** Scan request/response */ + /** Scan request/response */ union { - /** Scan request */ + /** Scan request */ mlan_scan_req scan_req; - /** Scan response */ + /** Scan response */ mlan_scan_resp scan_resp; - /** Scan config parameters in user scan */ + /** Scan config parameters in user scan */ mlan_user_scan user_scan; - /** Scan config parameters */ + /** Scan config parameters */ mlan_scan_cfg scan_cfg; } param; } mlan_ds_scan, *pmlan_ds_scan; @@ -571,97 +571,98 @@ enum _mlan_bss_mode { }; /** Maximum key length */ -#define MLAN_MAX_KEY_LENGTH 32 +#define MLAN_MAX_KEY_LENGTH 32 /** Maximum atim window in milliseconds */ -#define MLAN_MAX_ATIM_WINDOW 50 +#define MLAN_MAX_ATIM_WINDOW 50 /** Minimum beacon interval */ -#define MLAN_MIN_BEACON_INTERVAL 20 +#define MLAN_MIN_BEACON_INTERVAL 20 /** Maximum beacon interval */ -#define MLAN_MAX_BEACON_INTERVAL 1000 +#define MLAN_MAX_BEACON_INTERVAL 1000 /** Default beacon interval */ -#define MLAN_BEACON_INTERVAL 100 +#define MLAN_BEACON_INTERVAL 100 /** Receive all packets */ -#define MLAN_PROMISC_MODE 1 +#define MLAN_PROMISC_MODE 1 /** Receive multicast packets in multicast list */ -#define MLAN_MULTICAST_MODE 2 +#define MLAN_MULTICAST_MODE 2 /** Receive all multicast packets */ -#define MLAN_ALL_MULTI_MODE 4 +#define MLAN_ALL_MULTI_MODE 4 /** Maximum size of multicast list */ -#define MLAN_MAX_MULTICAST_LIST_SIZE 32 +#define MLAN_MAX_MULTICAST_LIST_SIZE 32 /** mlan_multicast_list data structure for MLAN_OID_BSS_MULTICAST_LIST */ typedef struct _mlan_multicast_list { - /** Multicast mode */ + /** Multicast mode */ t_u32 mode; - /** Number of multicast addresses in the list */ + /** Number of multicast addresses in the list */ t_u32 num_multicast_addr; - /** Multicast address list */ + /** Multicast address list */ mlan_802_11_mac_addr mac_list[MLAN_MAX_MULTICAST_LIST_SIZE]; } mlan_multicast_list, *pmlan_multicast_list; /** Max channel */ -#define MLAN_MAX_CHANNEL 165 +#define MLAN_MAX_CHANNEL 165 /** Maximum number of channels in table */ -#define MLAN_MAX_CHANNEL_NUM 128 +#define MLAN_MAX_CHANNEL_NUM 128 /** Channel/frequence for MLAN_OID_BSS_CHANNEL */ typedef struct _chan_freq { - /** Channel Number */ + /** Channel Number */ t_u32 channel; - /** Frequency of this Channel */ + /** Frequency of this Channel */ t_u32 freq; } chan_freq; /** mlan_chan_list data structure for MLAN_OID_BSS_CHANNEL_LIST */ typedef struct _mlan_chan_list { - /** Number of channel */ + /** Number of channel */ t_u32 num_of_chan; - /** Channel-Frequency table */ + /** Channel-Frequency table */ chan_freq cf[MLAN_MAX_CHANNEL_NUM]; } mlan_chan_list; /* This channel is disabled.*/ -#define CHAN_FLAGS_DISABLED MBIT(0) -/* do not initiate radiation, this includes sending probe requests or beaconing */ -#define CHAN_FLAGS_NO_IR MBIT(1) +#define CHAN_FLAGS_DISABLED MBIT(0) +/* do not initiate radiation, this includes sending probe requests or beaconing + */ +#define CHAN_FLAGS_NO_IR MBIT(1) /* Radar detection is required on this channel */ -#define CHAN_FLAGS_RADAR MBIT(3) +#define CHAN_FLAGS_RADAR MBIT(3) /* extension channel above this channel is not permitted */ -#define CHAN_FLAGS_NO_HT40PLUS MBIT(4) +#define CHAN_FLAGS_NO_HT40PLUS MBIT(4) /* extension channel below this channel is not permitted */ -#define CHAN_FLAGS_NO_HT40MINUS MBIT(5) +#define CHAN_FLAGS_NO_HT40MINUS MBIT(5) /* OFDM is not allowed on this channel */ -#define CHAN_FLAGS_NO_OFDM MBIT(6) +#define CHAN_FLAGS_NO_OFDM MBIT(6) /** 80Mhz can not used on this channel */ -#define CHAN_FLAGS_NO_80MHZ MBIT(7) +#define CHAN_FLAGS_NO_80MHZ MBIT(7) /** 180Mhz can not used on this channel */ -#define CHAN_FLAGS_NO_160MHZ MBIT(8) +#define CHAN_FLAGS_NO_160MHZ MBIT(8) /* Only indoor use is permitted on this channel */ -#define CHAN_FLAGS_INDOOR_ONLY MBIT(9) +#define CHAN_FLAGS_INDOOR_ONLY MBIT(9) /* IR operation is allowed on this channel if it's * connected concurrently to a BSS on the same channel on * the 2 GHz band or to a channel in the same UNII band (on the 5 GHz * band), and IEEE80211_CHAN_RADAR is not set */ -#define CHAN_FLAGS_IR_CONCURRENT MBIT(10) +#define CHAN_FLAGS_IR_CONCURRENT MBIT(10) /* 20 MHz operation is not allowed on this channel */ -#define CHAN_FLAGS_20MHZ MBIT(11) +#define CHAN_FLAGS_20MHZ MBIT(11) /* 10 MHz operation is not allowed on this channel */ -#define CHAN_FLAGS_NO_10MHZ MBIT(12) +#define CHAN_FLAGS_NO_10MHZ MBIT(12) /** This channel's flag is valid */ -#define CHAN_FLAGS_MAX MBIT(31) +#define CHAN_FLAGS_MAX MBIT(31) /** Maximum response buffer length */ #define ASSOC_RSP_BUF_SIZE 500 /** Type definition of mlan_ds_misc_assoc_rsp for MLAN_OID_MISC_ASSOC_RSP */ typedef struct _mlan_ds_misc_assoc_rsp { - /** Associate response buffer */ + /** Associate response buffer */ t_u8 assoc_resp_buf[ASSOC_RSP_BUF_SIZE]; - /** Response buffer length */ + /** Response buffer length */ t_u32 assoc_resp_len; } mlan_ds_misc_assoc_rsp; @@ -669,88 +670,88 @@ typedef struct _mlan_ds_misc_assoc_rsp { * MLAN_OID_BSS_START and MLAN_OID_BSS_FIND_BSS */ typedef struct _mlan_ssid_bssid { - /** SSID */ + /** SSID */ mlan_802_11_ssid ssid; - /** BSSID */ + /** BSSID */ mlan_802_11_mac_addr bssid; - /** index in BSSID list, start from 1 */ + /** index in BSSID list, start from 1 */ t_u32 idx; - /** Receive signal strength in dBm */ + /** Receive signal strength in dBm */ t_s32 rssi; - /**channel*/ + /**channel*/ t_u16 channel; - /**mobility domain value*/ + /**mobility domain value*/ t_u16 ft_md; - /**ft capability*/ + /**ft capability*/ t_u8 ft_cap; - /**band*/ + /**band*/ t_u16 bss_band; - /** channel flag */ + /** channel flag */ t_u32 channel_flags; - /** host mlme flag*/ + /** host mlme flag*/ t_u8 host_mlme; -/** assoicate resp frame/ie from firmware */ + /** assoicate resp frame/ie from firmware */ mlan_ds_misc_assoc_rsp assoc_rsp; } mlan_ssid_bssid; /** Data structure of WMM ECW */ typedef struct _wmm_ecw_t { #ifdef BIG_ENDIAN_SUPPORT - /** Maximum Ecw */ - t_u8 ecw_max:4; - /** Minimum Ecw */ - t_u8 ecw_min:4; + /** Maximum Ecw */ + t_u8 ecw_max : 4; + /** Minimum Ecw */ + t_u8 ecw_min : 4; #else - /** Minimum Ecw */ - t_u8 ecw_min:4; - /** Maximum Ecw */ - t_u8 ecw_max:4; -#endif /* BIG_ENDIAN_SUPPORT */ + /** Minimum Ecw */ + t_u8 ecw_min : 4; + /** Maximum Ecw */ + t_u8 ecw_max : 4; +#endif /* BIG_ENDIAN_SUPPORT */ } wmm_ecw_t, *pwmm_ecw_t; /** Data structure of WMM Aci/Aifsn */ typedef struct _wmm_aci_aifsn_t { #ifdef BIG_ENDIAN_SUPPORT - /** Reserved */ - t_u8 reserved:1; - /** Aci */ - t_u8 aci:2; - /** Acm */ - t_u8 acm:1; - /** Aifsn */ - t_u8 aifsn:4; + /** Reserved */ + t_u8 reserved : 1; + /** Aci */ + t_u8 aci : 2; + /** Acm */ + t_u8 acm : 1; + /** Aifsn */ + t_u8 aifsn : 4; #else - /** Aifsn */ - t_u8 aifsn:4; - /** Acm */ - t_u8 acm:1; - /** Aci */ - t_u8 aci:2; - /** Reserved */ - t_u8 reserved:1; -#endif /* BIG_ENDIAN_SUPPORT */ + /** Aifsn */ + t_u8 aifsn : 4; + /** Acm */ + t_u8 acm : 1; + /** Aci */ + t_u8 aci : 2; + /** Reserved */ + 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; /** mlan_deauth_param */ typedef struct _mlan_deauth_param { - /** STA mac addr */ + /** STA mac addr */ t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; - /** deauth reason */ + /** deauth reason */ t_u16 reason_code; } mlan_deauth_param; #ifdef UAP_SUPPORT /** UAP FLAG: Host based */ -#define UAP_FLAG_HOST_BASED MBIT(0) +#define UAP_FLAG_HOST_BASED MBIT(0) /** UAP FLAG: Host mlme */ -#define UAP_FLAG_HOST_MLME MBIT(1) +#define UAP_FLAG_HOST_MLME MBIT(1) /** Maximum packet forward control value */ #define MAX_PKT_FWD_CTRL 15 @@ -763,103 +764,103 @@ typedef struct _mlan_deauth_param { /** Minimum DTIM period */ #define MIN_DTIM_PERIOD 1 /** Maximum TX Power Limit */ -#define MAX_TX_POWER 20 +#define MAX_TX_POWER 20 /** Minimum TX Power Limit */ -#define MIN_TX_POWER 0 +#define MIN_TX_POWER 0 /** MAX station count */ -#define MAX_STA_COUNT 64 +#define MAX_STA_COUNT 64 /** Maximum RTS threshold */ -#define MAX_RTS_THRESHOLD 2347 +#define MAX_RTS_THRESHOLD 2347 /** Maximum fragmentation threshold */ #define MAX_FRAG_THRESHOLD 2346 /** Minimum fragmentation threshold */ #define MIN_FRAG_THRESHOLD 256 /** data rate 54 M */ -#define DATA_RATE_54M 108 +#define DATA_RATE_54M 108 /** Maximum value of bcast_ssid_ctl */ -#define MAX_BCAST_SSID_CTL 2 +#define MAX_BCAST_SSID_CTL 2 /** antenna A */ -#define ANTENNA_MODE_A 0 +#define ANTENNA_MODE_A 0 /** antenna B */ -#define ANTENNA_MODE_B 1 +#define ANTENNA_MODE_B 1 /** transmit antenna */ -#define TX_ANTENNA 1 +#define TX_ANTENNA 1 /** receive antenna */ -#define RX_ANTENNA 0 +#define RX_ANTENNA 0 /** Maximum stage out time */ -#define MAX_STAGE_OUT_TIME 864000 +#define MAX_STAGE_OUT_TIME 864000 /** Minimum stage out time */ -#define MIN_STAGE_OUT_TIME 50 +#define MIN_STAGE_OUT_TIME 50 /** Maximum Retry Limit */ -#define MAX_RETRY_LIMIT 14 +#define MAX_RETRY_LIMIT 14 /** Maximum group key timer in seconds */ -#define MAX_GRP_TIMER 86400 +#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 */ /** default UAP BAND 2.4G */ -#define DEFAULT_UAP_BAND 0 +#define DEFAULT_UAP_BAND 0 /** default UAP channel 6 */ -#define DEFAULT_UAP_CHANNEL 6 +#define DEFAULT_UAP_CHANNEL 6 /** Maximum data rates */ -#define MAX_DATA_RATES 14 +#define MAX_DATA_RATES 14 /** auto data rate */ -#define DATA_RATE_AUTO 0 +#define DATA_RATE_AUTO 0 /**filter mode: disable */ -#define MAC_FILTER_MODE_DISABLE 0 +#define MAC_FILTER_MODE_DISABLE 0 /**filter mode: block mac address */ -#define MAC_FILTER_MODE_ALLOW_MAC 1 +#define MAC_FILTER_MODE_ALLOW_MAC 1 /**filter mode: block mac address */ -#define MAC_FILTER_MODE_BLOCK_MAC 2 +#define MAC_FILTER_MODE_BLOCK_MAC 2 /** Maximum mac filter num */ -#define MAX_MAC_FILTER_NUM 64 +#define MAX_MAC_FILTER_NUM 64 /* Bitmap for protocol to use */ /** No security */ -#define PROTOCOL_NO_SECURITY 0x01 +#define PROTOCOL_NO_SECURITY 0x01 /** Static WEP */ -#define PROTOCOL_STATIC_WEP 0x02 +#define PROTOCOL_STATIC_WEP 0x02 /** WPA */ -#define PROTOCOL_WPA 0x08 +#define PROTOCOL_WPA 0x08 /** WPA2 */ -#define PROTOCOL_WPA2 0x20 +#define PROTOCOL_WPA2 0x20 /** WP2 Mixed */ -#define PROTOCOL_WPA2_MIXED 0x28 +#define PROTOCOL_WPA2_MIXED 0x28 /** EAP */ -#define PROTOCOL_EAP 0x40 +#define PROTOCOL_EAP 0x40 /** WAPI */ -#define PROTOCOL_WAPI 0x80 +#define PROTOCOL_WAPI 0x80 /** WPA3 SAE */ -#define PROTOCOL_WPA3_SAE 0x100 +#define PROTOCOL_WPA3_SAE 0x100 /** Key_mgmt_psk */ -#define KEY_MGMT_NONE 0x04 +#define KEY_MGMT_NONE 0x04 /** Key_mgmt_none */ -#define KEY_MGMT_PSK 0x02 +#define KEY_MGMT_PSK 0x02 /** Key_mgmt_eap */ -#define KEY_MGMT_EAP 0x01 +#define KEY_MGMT_EAP 0x01 /** Key_mgmt_psk_sha256 */ -#define KEY_MGMT_PSK_SHA256 0x100 +#define KEY_MGMT_PSK_SHA256 0x100 /** Key_mgmt_sae */ -#define KEY_MGMT_SAE 0x400 +#define KEY_MGMT_SAE 0x400 /** Key_mgmt_owe */ -#define KEY_MGMT_OWE 0x200 +#define KEY_MGMT_OWE 0x200 /** TKIP */ -#define CIPHER_TKIP 0x04 +#define CIPHER_TKIP 0x04 /** AES CCMP */ -#define CIPHER_AES_CCMP 0x08 +#define CIPHER_AES_CCMP 0x08 /** Valid cipher bitmap */ -#define VALID_CIPHER_BITMAP 0x0c +#define VALID_CIPHER_BITMAP 0x0c /** Packet forwarding to be done by FW or host */ -#define PKT_FWD_FW_BIT 0x01 +#define PKT_FWD_FW_BIT 0x01 /** Intra-BSS broadcast packet forwarding allow bit */ #define PKT_FWD_INTRA_BCAST 0x02 /** Intra-BSS unicast packet forwarding allow bit */ @@ -867,104 +868,104 @@ typedef struct _mlan_deauth_param { /** Inter-BSS unicast packet forwarding allow bit */ #define PKT_FWD_INTER_UCAST 0x08 /** Intra-BSS unicast packet */ -#define PKT_INTRA_UCAST 0x01 +#define PKT_INTRA_UCAST 0x01 /** Inter-BSS unicast packet */ -#define PKT_INTER_UCAST 0x02 +#define PKT_INTER_UCAST 0x02 /** Enable Host PKT forwarding */ -#define PKT_FWD_ENABLE_BIT 0x01 +#define PKT_FWD_ENABLE_BIT 0x01 /** Channel List Entry */ typedef struct _channel_list { - /** Channel Number */ + /** Channel Number */ t_u8 chan_number; - /** Band Config */ + /** Band Config */ Band_Config_t bandcfg; } scan_chan_list; /** mac_filter data structure */ typedef struct _mac_filter { - /** mac filter mode */ + /** mac filter mode */ t_u16 filter_mode; - /** mac adress count */ + /** mac adress count */ t_u16 mac_count; - /** mac address list */ + /** mac address list */ mlan_802_11_mac_addr mac_list[MAX_MAC_FILTER_NUM]; } mac_filter; /** wpa parameter */ typedef struct _wpa_param { - /** Pairwise cipher WPA */ + /** Pairwise cipher WPA */ t_u8 pairwise_cipher_wpa; - /** Pairwise cipher WPA2 */ + /** Pairwise cipher WPA2 */ t_u8 pairwise_cipher_wpa2; - /** group cipher */ + /** group cipher */ t_u8 group_cipher; - /** RSN replay protection */ + /** RSN replay protection */ t_u8 rsn_protection; - /** passphrase length */ + /** passphrase length */ t_u32 length; - /** passphrase */ + /** passphrase */ t_u8 passphrase[64]; - /**group key rekey time in seconds */ + /**group key rekey time in seconds */ t_u32 gk_rekey_time; } wpa_param; /** wep key */ typedef struct _wep_key { - /** key index 0-3 */ + /** key index 0-3 */ t_u8 key_index; - /** is default */ + /** is default */ t_u8 is_default; - /** length */ + /** length */ t_u16 length; - /** key data */ + /** key data */ t_u8 key[26]; } wep_key; /** wep param */ typedef struct _wep_param { - /** key 0 */ + /** key 0 */ wep_key key0; - /** key 1 */ + /** key 1 */ wep_key key1; - /** key 2 */ + /** key 2 */ wep_key key2; - /** key 3 */ + /** key 3 */ wep_key key3; } wep_param; /** Data structure of WMM QoS information */ typedef struct _wmm_qos_info_t { #ifdef BIG_ENDIAN_SUPPORT - /** QoS UAPSD */ - t_u8 qos_uapsd:1; - /** Reserved */ - t_u8 reserved:3; - /** Parameter set count */ - t_u8 para_set_count:4; + /** QoS UAPSD */ + t_u8 qos_uapsd : 1; + /** Reserved */ + t_u8 reserved : 3; + /** Parameter set count */ + t_u8 para_set_count : 4; #else - /** Parameter set count */ - t_u8 para_set_count:4; - /** Reserved */ - t_u8 reserved:3; - /** QoS UAPSD */ - t_u8 qos_uapsd:1; -#endif /* BIG_ENDIAN_SUPPORT */ + /** Parameter set count */ + t_u8 para_set_count : 4; + /** Reserved */ + t_u8 reserved : 3; + /** QoS UAPSD */ + t_u8 qos_uapsd : 1; +#endif /* BIG_ENDIAN_SUPPORT */ } wmm_qos_info_t, *pwmm_qos_info_t; /** Data structure of WMM parameter IE */ typedef struct _wmm_parameter_t { - /** OuiType: 00:50:f2:02 */ + /** OuiType: 00:50:f2:02 */ t_u8 ouitype[4]; - /** Oui subtype: 01 */ + /** Oui subtype: 01 */ t_u8 ouisubtype; - /** version: 01 */ + /** version: 01 */ t_u8 version; - /** QoS information */ + /** QoS information */ t_u8 qos_info; - /** Reserved */ + /** Reserved */ t_u8 reserved; - /** AC Parameters Record WMM_AC_BE, WMM_AC_BK, WMM_AC_VI, WMM_AC_VO */ + /** 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_parameter_t, *pwmm_parameter_t; @@ -977,255 +978,258 @@ typedef struct _wmm_parameter_t { * added to that command. */ typedef struct _mlan_uap_bss_param { - /** AP mac addr */ + /** AP mac addr */ mlan_802_11_mac_addr mac_addr; - /** SSID */ + /** SSID */ mlan_802_11_ssid ssid; - /** Broadcast ssid control */ + /** Broadcast ssid control */ t_u8 bcast_ssid_ctl; - /** Radio control: on/off */ + /** Radio control: on/off */ t_u8 radio_ctl; - /** dtim period */ + /** dtim period */ t_u8 dtim_period; - /** beacon period */ + /** beacon period */ t_u16 beacon_period; - /** rates */ + /** rates */ t_u8 rates[MAX_DATA_RATES]; - /** Tx data rate */ + /** Tx data rate */ t_u16 tx_data_rate; - /** Tx beacon rate */ + /** Tx beacon rate */ t_u16 tx_beacon_rate; - /** multicast/broadcast data rate */ + /** multicast/broadcast data rate */ t_u16 mcbc_data_rate; - /** Tx power level in dBm */ + /** Tx power level in dBm */ t_u8 tx_power_level; - /** Tx antenna */ + /** Tx antenna */ t_u8 tx_antenna; - /** Rx antenna */ + /** Rx antenna */ t_u8 rx_antenna; - /** packet forward control */ + /** packet forward control */ t_u8 pkt_forward_ctl; - /** max station count */ + /** max station count */ t_u16 max_sta_count; - /** mac filter */ + /** mac filter */ mac_filter filter; - /** station ageout timer in unit of 100ms */ + /** station ageout timer in unit of 100ms */ t_u32 sta_ageout_timer; - /** PS station ageout timer in unit of 100ms */ + /** PS station ageout timer in unit of 100ms */ t_u32 ps_sta_ageout_timer; - /** RTS threshold */ + /** RTS threshold */ t_u16 rts_threshold; - /** fragmentation threshold */ + /** fragmentation threshold */ t_u16 frag_threshold; - /** retry_limit */ + /** retry_limit */ t_u16 retry_limit; - /** pairwise update timeout in milliseconds */ + /** pairwise update timeout in milliseconds */ t_u32 pairwise_update_timeout; - /** pairwise handshake retries */ + /** pairwise handshake retries */ t_u32 pwk_retries; - /** groupwise update timeout in milliseconds */ + /** groupwise update timeout in milliseconds */ t_u32 groupwise_update_timeout; - /** groupwise handshake retries */ + /** groupwise handshake retries */ t_u32 gwk_retries; - /** preamble type */ + /** preamble type */ t_u8 preamble_type; - /** band cfg */ + /** band cfg */ Band_Config_t bandcfg; - /** channel */ + /** channel */ t_u8 channel; - /** auth mode */ + /** auth mode */ t_u16 auth_mode; - /** encryption protocol */ + /** encryption protocol */ t_u16 protocol; - /** key managment type */ + /** key managment type */ t_u16 key_mgmt; - /** wep param */ + /** wep param */ wep_param wep_cfg; - /** wpa param */ + /** wpa param */ wpa_param wpa_cfg; - /** Mgmt IE passthru mask */ + /** Mgmt IE passthru mask */ t_u32 mgmt_ie_passthru_mask; /* * 11n HT Cap HTCap_t ht_cap */ - /** HT Capabilities Info field */ + /** HT Capabilities Info field */ t_u16 ht_cap_info; - /** A-MPDU Parameters field */ + /** A-MPDU Parameters field */ t_u8 ampdu_param; - /** Supported MCS Set field */ + /** Supported MCS Set field */ t_u8 supported_mcs_set[16]; - /** HT Extended Capabilities field */ + /** HT Extended Capabilities field */ t_u16 ht_ext_cap; - /** Transmit Beamforming Capabilities field */ + /** Transmit Beamforming Capabilities field */ t_u32 tx_bf_cap; - /** Antenna Selection Capability field */ + /** Antenna Selection Capability field */ t_u8 asel; - /** Enable 2040 Coex */ + /** Enable 2040 Coex */ t_u8 enable_2040coex; - /** key management operation */ + /** key management operation */ t_u16 key_mgmt_operation; - /** BSS status */ + /** BSS status */ t_u16 bss_status; #ifdef WIFI_DIRECT_SUPPORT /* pre shared key */ t_u8 psk[MLAN_MAX_KEY_LENGTH]; -#endif /* WIFI_DIRECT_SUPPORT */ - /** Number of channels in scan_channel_list */ +#endif /* WIFI_DIRECT_SUPPORT */ + /** Number of channels in scan_channel_list */ t_u32 num_of_chan; - /** scan channel list in ACS mode */ + /** scan channel list in ACS mode */ scan_chan_list chan_list[MLAN_MAX_CHANNEL]; - /** Wmm parameters */ + /** Wmm parameters */ wmm_parameter_t wmm_para; + /** uap host based config */ + t_u32 uap_host_based_config; } mlan_uap_bss_param; /** mlan_uap_scan_channels */ typedef struct _mlan_uap_scan_channels { - /** flag for remove nop channel*/ + /** flag for remove nop channel*/ t_u8 remove_nop_channel; /** num of removed channel */ t_u8 num_remvoed_channel; - /** Number of channels in scan_channel_list */ + /** Number of channels in scan_channel_list */ t_u32 num_of_chan; - /** scan channel list in ACS mode */ + /** scan channel list in ACS mode */ scan_chan_list chan_list[MLAN_MAX_CHANNEL]; } mlan_uap_scan_channels; /** mlan_uap_oper_ctrl */ typedef struct _mlan_uap_oper_ctrl { - /** control value - * 0: do nothing, - * 2: uap stops and restarts automaticaly - */ + /** control value + * 0: do nothing, + * 2: uap stops and restarts automaticaly + */ t_u16 ctrl_value; - /** channel opt - * 1: uap restart on default 2.4G/channel 6 - * 2: uap restart on the band/channel configured by driver previously - * 3: uap restart on the band/channel specified by band_cfg and channel - */ + /** channel opt + * 1: uap restart on default 2.4G/channel 6 + * 2: uap restart on the band/channel configured by driver previously + * 3: uap restart on the band/channel specified by band_cfg and channel + */ t_u16 chan_opt; - /** band cfg 0 - * 0: 20Mhz 2: 40 Mhz 3: 80Mhz - */ + /** band cfg 0 + * 0: 20Mhz 2: 40 Mhz 3: 80Mhz + */ t_u8 band_cfg; - /** channel */ + /** channel */ t_u8 channel; } mlan_uap_oper_ctrl; /** mlan_uap_acs_scan */ typedef struct _mlan_uap_acs_scan { - /** band */ + /** band */ Band_Config_t bandcfg; - /** channel */ + /** channel */ t_u8 chan; } mlan_uap_acs_scan; /** station is authorized (802.1X) */ -#define STA_FLAG_AUTHORIZED MBIT(1) +#define STA_FLAG_AUTHORIZED MBIT(1) /** Station is capable of receiving frames with short barker preamble */ #define STA_FLAG_SHORT_PREAMBLE MBIT(2) /** station is WME/QoS capable */ -#define STA_FLAG_WME MBIT(3) +#define STA_FLAG_WME MBIT(3) /** station uses management frame protection */ -#define STA_FLAG_MFP MBIT(4) +#define STA_FLAG_MFP MBIT(4) /** station is authenticated */ -#define STA_FLAG_AUTHENTICATED MBIT(5) +#define STA_FLAG_AUTHENTICATED MBIT(5) /** station is a TDLS peer */ -#define STA_FLAG_TDLS_PEER MBIT(6) +#define STA_FLAG_TDLS_PEER MBIT(6) /** station is associated */ -#define STA_FLAG_ASSOCIATED MBIT(7) +#define STA_FLAG_ASSOCIATED MBIT(7) /** mlan_ds_sta_info */ typedef struct _mlan_ds_sta_info { - /** aid */ + /** aid */ t_u16 aid; - /** peer_mac */ + /** peer_mac */ t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; - /** Listen Interval */ + /** Listen Interval */ int listen_interval; - /** Capability Info */ + /** Capability Info */ t_u16 cap_info; - /** station flag */ + /** station flag */ t_u32 sta_flags; - /** tlv len */ + /** tlv len */ t_u16 tlv_len; - /** tlv start */ + /** tlv start */ t_u8 tlv[]; } mlan_ds_sta_info; #endif #ifdef WIFI_DIRECT_SUPPORT /** mode: disable wifi direct */ -#define WIFI_DIRECT_MODE_DISABLE 0 +#define WIFI_DIRECT_MODE_DISABLE 0 /** mode: listen */ -#define WIFI_DIRECT_MODE_LISTEN 1 +#define WIFI_DIRECT_MODE_LISTEN 1 /** mode: GO */ -#define WIFI_DIRECT_MODE_GO 2 +#define WIFI_DIRECT_MODE_GO 2 /** mode: client */ -#define WIFI_DIRECT_MODE_CLIENT 3 +#define WIFI_DIRECT_MODE_CLIENT 3 /** mode: find */ -#define WIFI_DIRECT_MODE_FIND 4 +#define WIFI_DIRECT_MODE_FIND 4 /** mode: stop find */ -#define WIFI_DIRECT_MODE_STOP_FIND 5 +#define WIFI_DIRECT_MODE_STOP_FIND 5 #endif /** Type definition of mlan_ds_bss for MLAN_IOCTL_BSS */ typedef struct _mlan_ds_bss { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** BSS parameter */ + /** BSS parameter */ union { - /** SSID-BSSID for MLAN_OID_BSS_START */ + /** SSID-BSSID for MLAN_OID_BSS_START */ mlan_ssid_bssid ssid_bssid; - /** BSSID for MLAN_OID_BSS_STOP */ + /** BSSID for MLAN_OID_BSS_STOP */ mlan_802_11_mac_addr bssid; - /** BSS mode for MLAN_OID_BSS_MODE */ + /** BSS mode for MLAN_OID_BSS_MODE */ t_u32 bss_mode; - /** BSS channel/frequency for MLAN_OID_BSS_CHANNEL */ + /** BSS channel/frequency for MLAN_OID_BSS_CHANNEL */ chan_freq bss_chan; - /** BSS channel list for MLAN_OID_BSS_CHANNEL_LIST */ + /** BSS channel list for MLAN_OID_BSS_CHANNEL_LIST */ mlan_chan_list chanlist; - /** MAC address for MLAN_OID_BSS_MAC_ADDR */ + /** MAC address for MLAN_OID_BSS_MAC_ADDR */ mlan_802_11_mac_addr mac_addr; - /** Multicast list for MLAN_OID_BSS_MULTICAST_LIST */ + /** Multicast list for MLAN_OID_BSS_MULTICAST_LIST */ mlan_multicast_list multicast_list; - /** Beacon interval for MLAN_OID_IBSS_BCN_INTERVAL */ + /** Beacon interval for MLAN_OID_IBSS_BCN_INTERVAL */ t_u32 bcn_interval; - /** ATIM window for MLAN_OID_IBSS_ATIM_WINDOW */ + /** ATIM window for MLAN_OID_IBSS_ATIM_WINDOW */ t_u32 atim_window; - /** deauth param for MLAN_OID_BSS_STOP & MLAN_OID_UAP_DEAUTH_STA */ + /** deauth param for MLAN_OID_BSS_STOP & MLAN_OID_UAP_DEAUTH_STA + */ mlan_deauth_param deauth_param; #ifdef UAP_SUPPORT - /** host based flag for MLAN_OID_BSS_START */ + /** host based flag for MLAN_OID_BSS_START */ t_u8 host_based; - /** BSS param for AP mode for MLAN_OID_UAP_BSS_CONFIG */ + /** BSS param for AP mode for MLAN_OID_UAP_BSS_CONFIG */ mlan_uap_bss_param bss_config; - /** AP Wmm parameters for MLAN_OID_UAP_CFG_WMM_PARAM */ + /** AP Wmm parameters for MLAN_OID_UAP_CFG_WMM_PARAM */ wmm_parameter_t ap_wmm_para; - /** ap scan channels for MLAN_OID_UAP_SCAN_CHANNELS*/ + /** ap scan channels for MLAN_OID_UAP_SCAN_CHANNELS*/ mlan_uap_scan_channels ap_scan_channels; - /** ap channel for MLAN_OID_UAP_CHANNEL*/ + /** ap channel for MLAN_OID_UAP_CHANNEL*/ chan_band_info ap_channel; - /** ap operation control for MLAN_OID_UAP_OPER_CTRL*/ + /** ap operation control for MLAN_OID_UAP_OPER_CTRL*/ mlan_uap_oper_ctrl ap_oper_ctrl; - /** AP acs scan MLAN_OID_UAP_ACS_SCAN */ + /** AP acs scan MLAN_OID_UAP_ACS_SCAN */ mlan_uap_acs_scan ap_acs_scan; #endif #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) - /** BSS role for MLAN_OID_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 */ + /** 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 */ + /** Listen interval for MLAN_OID_BSS_LISTEN_INTERVAL */ t_u16 listen_interval; - /** STA channel info for MLAN_OID_BSS_CHAN_INFO */ + /** STA channel info for MLAN_OID_BSS_CHAN_INFO */ chan_band_info sta_channel; #endif #ifdef UAP_SUPPORT - /** STA info for MLAN_OID_UAP_ADD_STATION */ + /** STA info for MLAN_OID_UAP_ADD_STATION */ mlan_ds_sta_info sta_info; #endif } param; @@ -1236,18 +1240,18 @@ typedef MLAN_PACK_START struct _otp_region_info { t_u8 country_code[2]; t_u8 region_code; t_u8 environment; - t_u16 force_reg:1; - t_u16 reserved:15; + t_u16 force_reg : 1; + t_u16 reserved : 15; } MLAN_PACK_END otp_region_info_t; /** Type definition of mlan_ds_custom_reg_domain */ typedef struct _mlan_ds_custom_reg_domain { otp_region_info_t region; - /** num of 2g channels in custom_reg_domain */ + /** num of 2g channels in custom_reg_domain */ t_u8 num_bg_chan; - /** num of 5g channels in custom_reg_domain */ + /** num of 5g channels in custom_reg_domain */ t_u8 num_a_chan; - /** cfp table */ + /** cfp table */ chan_freq_power_t cfp_tbl[]; } mlan_ds_custom_reg_domain; /*-----------------------------------------------------------------*/ @@ -1268,85 +1272,85 @@ enum _mlan_band_def { }; /** Channel bandwidth */ -#define CHANNEL_BW_20MHZ 0 -#define CHANNEL_BW_40MHZ_ABOVE 1 -#define CHANNEL_BW_40MHZ_BELOW 3 +#define CHANNEL_BW_20MHZ 0 +#define CHANNEL_BW_40MHZ_ABOVE 1 +#define CHANNEL_BW_40MHZ_BELOW 3 /** secondary channel is 80Mhz bandwidth for 11ac */ -#define CHANNEL_BW_80MHZ 4 -#define CHANNEL_BW_160MHZ 5 +#define CHANNEL_BW_80MHZ 4 +#define CHANNEL_BW_160MHZ 5 /** RF antenna selection */ -#define RF_ANTENNA_MASK(n) ((1<<(n))-1) +#define RF_ANTENNA_MASK(n) ((1 << (n)) - 1) /** RF antenna auto select */ -#define RF_ANTENNA_AUTO 0xFFFF +#define RF_ANTENNA_AUTO 0xFFFF /** Type definition of mlan_ds_band_cfg for MLAN_OID_BAND_CFG */ typedef struct _mlan_ds_band_cfg { - /** Infra band */ + /** Infra band */ t_u32 config_bands; - /** Ad-hoc start band */ + /** Ad-hoc start band */ t_u32 adhoc_start_band; - /** Ad-hoc start channel */ + /** Ad-hoc start channel */ t_u32 adhoc_channel; - /** fw supported band */ + /** fw supported band */ 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 */ + /** Tx antenna mode */ t_u32 tx_antenna; - /** Rx antenna mode */ + /** Rx antenna mode */ t_u32 rx_antenna; } mlan_ds_ant_cfg, *pmlan_ds_ant_cfg; /** Type definition of mlan_ds_mimo_switch for MLAN_OID_MIMO_SWITCH */ typedef struct _mlan_ds_mimo_switch { - /** Tx antenna mode */ + /** Tx antenna mode */ t_u8 txpath_antmode; - /** Rx antenna mode */ + /** Rx antenna mode */ t_u8 rxpath_antmode; } mlan_ds_mimo_switch, *pmlan_ds_mimo_switch; /** Type definition of mlan_ds_ant_cfg_1x1 for MLAN_OID_ANT_CFG */ typedef struct _mlan_ds_ant_cfg_1x1 { - /** Antenna mode */ + /** Antenna mode */ t_u32 antenna; - /** Evaluate time */ + /** Evaluate time */ t_u16 evaluate_time; - /** Current antenna */ + /** Current antenna */ t_u16 current_antenna; } mlan_ds_ant_cfg_1x1, *pmlan_ds_ant_cfg_1x1; /** Type definition of mlan_ds_remain_chan for MLAN_OID_REMAIN_CHAN_CFG */ typedef struct _mlan_ds_remain_chan { - /** remove flag */ + /** remove flag */ t_u16 remove; - /** status */ + /** status */ t_u8 status; - /** Band cfg */ + /** Band cfg */ Band_Config_t bandcfg; - /** channel */ + /** channel */ t_u8 channel; - /** remain time: Unit ms*/ + /** remain time: Unit ms*/ t_u32 remain_period; } mlan_ds_remain_chan, *pmlan_ds_remain_chan; /** Type definition of mlan_ds_radio_cfg for MLAN_IOCTL_RADIO_CFG */ typedef struct _mlan_ds_radio_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** Radio control parameter */ + /** Radio control parameter */ union { - /** Radio on/off for MLAN_OID_RADIO_CTRL */ + /** Radio on/off for MLAN_OID_RADIO_CTRL */ t_u32 radio_on_off; - /** Band info for MLAN_OID_BAND_CFG */ + /** Band info for MLAN_OID_BAND_CFG */ mlan_ds_band_cfg band_cfg; - /** Antenna info for MLAN_OID_ANT_CFG */ + /** Antenna info for MLAN_OID_ANT_CFG */ mlan_ds_ant_cfg ant_cfg; - /** Antenna mode for MLAN_OID_MIMO_SWITCH */ + /** Antenna mode for MLAN_OID_MIMO_SWITCH */ mlan_ds_mimo_switch mimo_switch_cfg; - /** Antenna info for MLAN_OID_ANT_CFG */ + /** Antenna info for MLAN_OID_ANT_CFG */ mlan_ds_ant_cfg_1x1 ant_cfg_1x1; - /** remain on channel for MLAN_OID_REMAIN_CHAN_CFG */ + /** remain on channel for MLAN_OID_REMAIN_CHAN_CFG */ mlan_ds_remain_chan remain_chan; } param; } mlan_ds_radio_cfg, *pmlan_ds_radio_cfg; @@ -1362,12 +1366,12 @@ enum COALESCE_PACKET_TYPE { PACKET_TYPE_BROADCAST = 3 }; -#define COALESCE_MAX_RULES 8 -#define COALESCE_MAX_BYTESEQ 4 /* non-adjustable */ -#define COALESCE_MAX_FILTERS 4 -#define MAX_COALESCING_DELAY 100 /* in msecs */ -#define MAX_PATTERN_LEN 20 -#define MAX_OFFSET_LEN 100 +#define COALESCE_MAX_RULES 8 +#define COALESCE_MAX_BYTESEQ 4 /* non-adjustable */ +#define COALESCE_MAX_FILTERS 4 +#define MAX_COALESCING_DELAY 100 /* in msecs */ +#define MAX_PATTERN_LEN 20 +#define MAX_OFFSET_LEN 100 struct filt_field_param { t_u8 operation; @@ -1393,23 +1397,23 @@ typedef struct _mlan_ds_coalesce_cfg { /*-----------------------------------------------------------------*/ /** Type definition of mlan_ds_snmp_mib for MLAN_IOCTL_SNMP_MIB */ typedef struct _mlan_ds_snmp_mib { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** SNMP MIB parameter */ + /** SNMP MIB parameter */ union { - /** RTS threshold for MLAN_OID_SNMP_MIB_RTS_THRESHOLD */ + /** RTS threshold for MLAN_OID_SNMP_MIB_RTS_THRESHOLD */ t_u32 rts_threshold; - /** Fragment threshold for MLAN_OID_SNMP_MIB_FRAG_THRESHOLD */ + /** Fragment threshold for MLAN_OID_SNMP_MIB_FRAG_THRESHOLD */ t_u32 frag_threshold; - /** Retry count for MLAN_OID_SNMP_MIB_RETRY_COUNT */ + /** Retry count for MLAN_OID_SNMP_MIB_RETRY_COUNT */ t_u32 retry_count; - /** OID value for MLAN_OID_SNMP_MIB_DOT11D/H */ + /** OID value for MLAN_OID_SNMP_MIB_DOT11D/H */ t_u32 oid_value; - /** DTIM period for MLAN_OID_SNMP_MIB_DTIM_PERIOD */ + /** DTIM period for MLAN_OID_SNMP_MIB_DTIM_PERIOD */ t_u32 dtim_period; - /** Singal_ext Enable for MLAN_OID_SNMP_MIB_SIGNALEXT_ENABLE */ + /** Singal_ext Enable for MLAN_OID_SNMP_MIB_SIGNALEXT_ENABLE */ t_u8 signalext_enable; - /** Control deauth when uap switch channel */ + /** Control deauth when uap switch channel */ t_u8 deauthctrl; } param; } mlan_ds_snmp_mib, *pmlan_ds_snmp_mib; @@ -1422,247 +1426,248 @@ enum _mlan_adhoc_status { ADHOC_IDLE, ADHOC_STARTED, ADHOC_JOINED, - ADHOC_COALESCED, ADHOC_STARTING + ADHOC_COALESCED, + ADHOC_STARTING }; typedef struct _mlan_ds_get_stats_org { - /** Statistics counter */ - /** Multicast transmitted frame count */ + /** Statistics counter */ + /** Multicast transmitted frame count */ t_u32 mcast_tx_frame; - /** Failure count */ + /** Failure count */ t_u32 failed; - /** Retry count */ + /** Retry count */ t_u32 retry; - /** Multi entry count */ + /** Multi entry count */ t_u32 multi_retry; - /** Duplicate frame count */ + /** Duplicate frame count */ t_u32 frame_dup; - /** RTS success count */ + /** RTS success count */ t_u32 rts_success; - /** RTS failure count */ + /** RTS failure count */ t_u32 rts_failure; - /** Ack failure count */ + /** Ack failure count */ t_u32 ack_failure; - /** Rx fragmentation count */ + /** Rx fragmentation count */ t_u32 rx_frag; - /** Multicast Tx frame count */ + /** Multicast Tx frame count */ t_u32 mcast_rx_frame; - /** FCS error count */ + /** FCS error count */ t_u32 fcs_error; - /** Tx frame count */ + /** Tx frame count */ t_u32 tx_frame; - /** WEP ICV error count */ + /** WEP ICV error count */ t_u32 wep_icv_error[4]; - /** beacon recv count */ + /** beacon recv count */ t_u32 bcn_rcv_cnt; - /** beacon miss count */ + /** beacon miss count */ t_u32 bcn_miss_cnt; - /** received amsdu count*/ + /** received amsdu count*/ t_u32 amsdu_rx_cnt; - /** received msdu count in amsdu*/ + /** received msdu count in amsdu*/ t_u32 msdu_in_rx_amsdu_cnt; - /** tx amsdu count*/ + /** tx amsdu count*/ t_u32 amsdu_tx_cnt; - /** tx msdu count in amsdu*/ + /** tx msdu count in amsdu*/ t_u32 msdu_in_tx_amsdu_cnt; } mlan_ds_get_stats_org; /** Type definition of mlan_ds_get_stats for MLAN_OID_GET_STATS */ typedef struct _mlan_ds_get_stats { - /** Statistics counter */ - /** Multicast transmitted frame count */ + /** Statistics counter */ + /** Multicast transmitted frame count */ t_u32 mcast_tx_frame; - /** Failure count */ + /** Failure count */ t_u32 failed; - /** Retry count */ + /** Retry count */ t_u32 retry; - /** Multi entry count */ + /** Multi entry count */ t_u32 multi_retry; - /** Duplicate frame count */ + /** Duplicate frame count */ t_u32 frame_dup; - /** RTS success count */ + /** RTS success count */ t_u32 rts_success; - /** RTS failure count */ + /** RTS failure count */ t_u32 rts_failure; - /** Ack failure count */ + /** Ack failure count */ t_u32 ack_failure; - /** Rx fragmentation count */ + /** Rx fragmentation count */ t_u32 rx_frag; - /** Multicast Tx frame count */ + /** Multicast Tx frame count */ t_u32 mcast_rx_frame; - /** FCS error count */ + /** FCS error count */ t_u32 fcs_error; - /** Tx frame count */ + /** Tx frame count */ t_u32 tx_frame; - /** WEP ICV error count */ + /** WEP ICV error count */ t_u32 wep_icv_error[4]; - /** beacon recv count */ + /** beacon recv count */ t_u32 bcn_rcv_cnt; - /** beacon miss count */ + /** beacon miss count */ t_u32 bcn_miss_cnt; - /** received amsdu count*/ + /** received amsdu count*/ t_u32 amsdu_rx_cnt; - /** received msdu count in amsdu*/ + /** received msdu count in amsdu*/ t_u32 msdu_in_rx_amsdu_cnt; - /** tx amsdu count*/ + /** tx amsdu count*/ t_u32 amsdu_tx_cnt; - /** tx msdu count in amsdu*/ + /** tx msdu count in amsdu*/ t_u32 msdu_in_tx_amsdu_cnt; - /** Tx frag count */ + /** Tx frag count */ t_u32 tx_frag_cnt; - /** Qos Tx frag count */ + /** Qos Tx frag count */ t_u32 qos_tx_frag_cnt[8]; - /** Qos failed count */ + /** Qos failed count */ t_u32 qos_failed_cnt[8]; - /** Qos retry count */ + /** Qos retry count */ t_u32 qos_retry_cnt[8]; - /** Qos multi retry count */ + /** Qos multi retry count */ t_u32 qos_multi_retry_cnt[8]; - /** Qos frame dup count */ + /** Qos frame dup count */ t_u32 qos_frm_dup_cnt[8]; - /** Qos rts success count */ + /** Qos rts success count */ t_u32 qos_rts_suc_cnt[8]; - /** Qos rts failure count */ + /** Qos rts failure count */ t_u32 qos_rts_failure_cnt[8]; - /** Qos ack failure count */ + /** Qos ack failure count */ t_u32 qos_ack_failure_cnt[8]; - /** Qos Rx frag count */ + /** Qos Rx frag count */ t_u32 qos_rx_frag_cnt[8]; - /** Qos Tx frame count */ + /** Qos Tx frame count */ t_u32 qos_tx_frm_cnt[8]; - /** Qos discarded frame count */ + /** Qos discarded frame count */ t_u32 qos_discarded_frm_cnt[8]; - /** Qos mpdus Rx count */ + /** Qos mpdus Rx count */ t_u32 qos_mpdus_rx_cnt[8]; - /** Qos retry rx count */ + /** Qos retry rx count */ t_u32 qos_retries_rx_cnt[8]; - /** CMAC ICV errors count */ + /** CMAC ICV errors count */ t_u32 cmacicv_errors; - /** CMAC replays count */ + /** CMAC replays count */ t_u32 cmac_replays; - /** mgmt CCMP replays count */ + /** mgmt CCMP replays count */ t_u32 mgmt_ccmp_replays; - /** TKIP ICV errors count */ + /** TKIP ICV errors count */ t_u32 tkipicv_errors; - /** TKIP replays count */ + /** TKIP replays count */ t_u32 tkip_replays; - /** CCMP decrypt errors count */ + /** CCMP decrypt errors count */ t_u32 ccmp_decrypt_errors; - /** CCMP replays count */ + /** CCMP replays count */ t_u32 ccmp_replays; - /** Tx amsdu count */ + /** Tx amsdu count */ t_u32 tx_amsdu_cnt; - /** failed amsdu count */ + /** failed amsdu count */ t_u32 failed_amsdu_cnt; - /** retry amsdu count */ + /** retry amsdu count */ t_u32 retry_amsdu_cnt; - /** multi-retry amsdu count */ + /** multi-retry amsdu count */ t_u32 multi_retry_amsdu_cnt; - /** Tx octets in amsdu count */ + /** Tx octets in amsdu count */ t_u64 tx_octets_in_amsdu_cnt; - /** amsdu ack failure count */ + /** amsdu ack failure count */ t_u32 amsdu_ack_failure_cnt; - /** Rx amsdu count */ + /** Rx amsdu count */ t_u32 rx_amsdu_cnt; - /** Rx octets in amsdu count */ + /** Rx octets in amsdu count */ t_u64 rx_octets_in_amsdu_cnt; - /** Tx ampdu count */ + /** Tx ampdu count */ t_u32 tx_ampdu_cnt; - /** tx mpdus in ampdu count */ + /** tx mpdus in ampdu count */ t_u32 tx_mpdus_in_ampdu_cnt; - /** tx octets in ampdu count */ + /** tx octets in ampdu count */ t_u64 tx_octets_in_ampdu_cnt; - /** ampdu Rx count */ + /** ampdu Rx count */ t_u32 ampdu_rx_cnt; - /** mpdu in Rx ampdu count */ + /** mpdu in Rx ampdu count */ t_u32 mpdu_in_rx_ampdu_cnt; - /** Rx octets ampdu count */ + /** Rx octets ampdu count */ t_u64 rx_octets_in_ampdu_cnt; - /** ampdu delimiter CRC error count */ + /** ampdu delimiter CRC error count */ t_u32 ampdu_delimiter_crc_error_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 */ + /** tkip mic failures */ t_u32 tkip_mic_failures; - /** ccmp decrypt errors */ + /** ccmp decrypt errors */ t_u32 ccmp_decrypt_errors; - /** wep undecryptable count */ + /** wep undecryptable count */ t_u32 wep_undecryptable_count; - /** wep icv error count */ + /** wep icv error count */ t_u32 wep_icv_error_count; - /** decrypt failure count */ + /** decrypt failure count */ t_u32 decrypt_failure_count; - /** dot11 multicast tx count */ + /** dot11 multicast tx count */ t_u32 mcast_tx_count; - /** dot11 failed count */ + /** dot11 failed count */ t_u32 failed_count; - /** dot11 retry count */ + /** dot11 retry count */ t_u32 retry_count; - /** dot11 multi retry count */ + /** dot11 multi retry count */ t_u32 multi_retry_count; - /** dot11 frame duplicate count */ + /** dot11 frame duplicate count */ t_u32 frame_dup_count; - /** dot11 rts success count */ + /** dot11 rts success count */ t_u32 rts_success_count; - /** dot11 rts failure count */ + /** dot11 rts failure count */ t_u32 rts_failure_count; - /** dot11 ack failure count */ + /** dot11 ack failure count */ t_u32 ack_failure_count; - /** dot11 rx ragment count */ + /** dot11 rx ragment count */ t_u32 rx_fragment_count; - /** dot11 mcast rx frame count */ + /** dot11 mcast rx frame count */ t_u32 mcast_rx_frame_count; - /** dot11 fcs error count */ + /** dot11 fcs error count */ t_u32 fcs_error_count; - /** dot11 tx frame count */ + /** dot11 tx frame count */ t_u32 tx_frame_count; - /** dot11 rsna tkip cm invoked */ + /** dot11 rsna tkip cm invoked */ t_u32 rsna_tkip_cm_invoked; - /** dot11 rsna 4way handshake failures */ + /** dot11 rsna 4way handshake failures */ t_u32 rsna_4way_hshk_failures; } mlan_ds_uap_stats, *pmlan_ds_uap_stats; /** Mask of last beacon RSSI */ -#define BCN_RSSI_LAST_MASK 0x00000001 +#define BCN_RSSI_LAST_MASK 0x00000001 /** Mask of average beacon RSSI */ -#define BCN_RSSI_AVG_MASK 0x00000002 +#define BCN_RSSI_AVG_MASK 0x00000002 /** Mask of last data RSSI */ -#define DATA_RSSI_LAST_MASK 0x00000004 +#define DATA_RSSI_LAST_MASK 0x00000004 /** Mask of average data RSSI */ -#define DATA_RSSI_AVG_MASK 0x00000008 +#define DATA_RSSI_AVG_MASK 0x00000008 /** Mask of last beacon SNR */ -#define BCN_SNR_LAST_MASK 0x00000010 +#define BCN_SNR_LAST_MASK 0x00000010 /** Mask of average beacon SNR */ -#define BCN_SNR_AVG_MASK 0x00000020 +#define BCN_SNR_AVG_MASK 0x00000020 /** Mask of last data SNR */ -#define DATA_SNR_LAST_MASK 0x00000040 +#define DATA_SNR_LAST_MASK 0x00000040 /** Mask of average data SNR */ -#define DATA_SNR_AVG_MASK 0x00000080 +#define DATA_SNR_AVG_MASK 0x00000080 /** Mask of last beacon NF */ -#define BCN_NF_LAST_MASK 0x00000100 +#define BCN_NF_LAST_MASK 0x00000100 /** Mask of average beacon NF */ -#define BCN_NF_AVG_MASK 0x00000200 +#define BCN_NF_AVG_MASK 0x00000200 /** Mask of last data NF */ -#define DATA_NF_LAST_MASK 0x00000400 +#define DATA_NF_LAST_MASK 0x00000400 /** Mask of average data NF */ -#define DATA_NF_AVG_MASK 0x00000800 +#define DATA_NF_AVG_MASK 0x00000800 /** Mask of all RSSI_INFO */ -#define ALL_RSSI_INFO_MASK 0x00000fff -#define MAX_PATH_NUM 3 +#define ALL_RSSI_INFO_MASK 0x00000fff +#define MAX_PATH_NUM 3 /** path A */ -#define PATH_A 0x01 +#define PATH_A 0x01 /** path B */ -#define PATH_B 0x02 +#define PATH_B 0x02 /** path AB */ -#define PATH_AB 0x03 +#define PATH_AB 0x03 /** ALL the path */ -#define PATH_ALL 0 +#define PATH_ALL 0 /** Type definition of mlan_ds_get_signal for MLAN_OID_GET_SIGNAL */ typedef struct _mlan_ds_get_signal { - /** Selector of get operation */ + /** Selector of get operation */ /* * Bit0: Last Beacon RSSI, Bit1: Average Beacon RSSI, * Bit2: Last Data RSSI, Bit3: Average Data RSSI, @@ -1676,268 +1681,268 @@ typedef struct _mlan_ds_get_signal { */ t_u16 selector; - /** RSSI */ - /** RSSI of last beacon */ + /** RSSI */ + /** RSSI of last beacon */ t_s16 bcn_rssi_last; - /** RSSI of beacon average */ + /** RSSI of beacon average */ t_s16 bcn_rssi_avg; - /** RSSI of last data packet */ + /** RSSI of last data packet */ t_s16 data_rssi_last; - /** RSSI of data packet average */ + /** RSSI of data packet average */ t_s16 data_rssi_avg; - /** SNR */ - /** SNR of last beacon */ + /** SNR */ + /** SNR of last beacon */ t_s16 bcn_snr_last; - /** SNR of beacon average */ + /** SNR of beacon average */ t_s16 bcn_snr_avg; - /** SNR of last data packet */ + /** SNR of last data packet */ t_s16 data_snr_last; - /** SNR of data packet average */ + /** SNR of data packet average */ t_s16 data_snr_avg; - /** NF */ - /** NF of last beacon */ + /** NF */ + /** NF of last beacon */ t_s16 bcn_nf_last; - /** NF of beacon average */ + /** NF of beacon average */ t_s16 bcn_nf_avg; - /** NF of last data packet */ + /** NF of last data packet */ t_s16 data_nf_last; - /** NF of data packet average */ + /** NF of data packet average */ t_s16 data_nf_avg; } mlan_ds_get_signal, *pmlan_ds_get_signal; /** bit for 2.4 G antenna diversity */ -#define ANT_DIVERSITY_2G MBIT(3) +#define ANT_DIVERSITY_2G MBIT(3) /** bit for 5 G antenna diversity */ -#define ANT_DIVERSITY_5G MBIT(7) +#define ANT_DIVERSITY_5G MBIT(7) /** mlan_fw_info data structure for MLAN_OID_GET_FW_INFO */ typedef struct _mlan_fw_info { - /** Firmware version */ + /** Firmware version */ t_u32 fw_ver; - /** MAC address */ + /** MAC address */ mlan_802_11_mac_addr mac_addr; - /** 802.11n device capabilities */ + /** 802.11n device capabilities */ t_u32 hw_dot_11n_dev_cap; - /** Device support for MIMO abstraction of MCSs */ + /** Device support for MIMO abstraction of MCSs */ t_u8 hw_dev_mcs_support; - /** user's MCS setting */ + /** user's MCS setting */ t_u8 usr_dev_mcs_support; - /** 802.11ac device capabilities */ + /** 802.11ac device capabilities */ t_u32 hw_dot_11ac_dev_cap; - /** 802.11ac device Capabilities for 2.4GHz */ + /** 802.11ac device Capabilities for 2.4GHz */ t_u32 usr_dot_11ac_dev_cap_bg; - /** 802.11ac device Capabilities for 5GHz */ + /** 802.11ac device Capabilities for 5GHz */ t_u32 usr_dot_11ac_dev_cap_a; - /** length of hw he capability */ + /** length of hw he capability */ t_u8 hw_hecap_len; - /** 802.11ax HE capability */ + /** 802.11ax HE capability */ t_u8 hw_he_cap[54]; - /** length of hw 2.4G he capability */ + /** length of hw 2.4G he capability */ t_u8 hw_2g_hecap_len; - /** 802.11ax 2.4G HE capability */ + /** 802.11ax 2.4G HE capability */ t_u8 hw_2g_he_cap[54]; - /** 802.11ac device support for MIMO abstraction of MCSs */ + /** 802.11ac device support for MIMO abstraction of MCSs */ t_u32 hw_dot_11ac_mcs_support; - /** User conf 802.11ac device support for MIMO abstraction of MCSs */ + /** User conf 802.11ac device support for MIMO abstraction of MCSs */ t_u32 usr_dot_11ac_mcs_support; /** fw supported band */ t_u16 fw_bands; /** region code */ t_u16 region_code; - /** ECSA support */ + /** ECSA support */ t_u8 ecsa_enable; - /** Get log support */ + /** Get log support */ t_u8 getlog_enable; - /** FW support for embedded supplicant */ + /** FW support for embedded supplicant */ t_u8 fw_supplicant_support; - /** ant info */ + /** ant info */ t_u8 antinfo; - /** max AP associated sta count supported by fw */ + /** max AP associated sta count supported by fw */ t_u8 max_ap_assoc_sta; - /** Bandwidth not support 80Mhz */ + /** Bandwidth not support 80Mhz */ t_u8 prohibit_80mhz; } mlan_fw_info, *pmlan_fw_info; /** Version string buffer length */ -#define MLAN_MAX_VER_STR_LEN 128 +#define MLAN_MAX_VER_STR_LEN 128 /** mlan_ver_ext data structure for MLAN_OID_GET_VER_EXT */ typedef struct _mlan_ver_ext { - /** Selected version string */ + /** Selected version string */ t_u32 version_str_sel; - /** Version string */ + /** Version string */ char version_str[MLAN_MAX_VER_STR_LEN]; } mlan_ver_ext, *pmlan_ver_ext; #ifdef BIG_ENDIAN_SUPPORT /** Extended Capabilities Data */ typedef struct MLAN_PACK_START _ExtCap_t { - /** Extended Capabilities value */ - t_u8 rsvdBit79:1; /* bit 79 */ - t_u8 TWTResp:1; /* bit 78 */ - t_u8 TWTReq:1; /* bit 77 */ - t_u8 rsvdBit76:1; /* bit 76 */ - t_u8 rsvdBit75:1; /* bit 75 */ - t_u8 rsvdBit74:1; /* bit 74 */ - t_u8 rsvdBit73:1; /* bit 73 */ - t_u8 FILS:1; /* bit 72 */ - t_u8 FTMI:1; /* bit 71 */ - t_u8 FTMR:1; /* bit 70 */ - t_u8 CAQ:1; /* bit 69 */ - t_u8 rsvdBit68:1; /* bit 68 */ - t_u8 NCC:1; /* bit 67 */ - t_u8 rsvdBit66:1; /* bit 66 */ - t_u8 chanSchedMgnt:1; /* bit 65 */ - t_u8 MaxAMSDU:2; /* bit 63-bit 64 */ - 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 */ + /** Extended Capabilities value */ + t_u8 rsvdBit79 : 1; /* bit 79 */ + t_u8 TWTResp : 1; /* bit 78 */ + t_u8 TWTReq : 1; /* bit 77 */ + t_u8 rsvdBit76 : 1; /* bit 76 */ + t_u8 rsvdBit75 : 1; /* bit 75 */ + t_u8 rsvdBit74 : 1; /* bit 74 */ + t_u8 rsvdBit73 : 1; /* bit 73 */ + t_u8 FILS : 1; /* bit 72 */ + t_u8 FTMI : 1; /* bit 71 */ + t_u8 FTMR : 1; /* bit 70 */ + t_u8 CAQ : 1; /* bit 69 */ + t_u8 rsvdBit68 : 1; /* bit 68 */ + t_u8 NCC : 1; /* bit 67 */ + t_u8 rsvdBit66 : 1; /* bit 66 */ + t_u8 chanSchedMgnt : 1; /* bit 65 */ + t_u8 MaxAMSDU : 2; /* bit 63-bit 64 */ + 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 MaxAMSDU:2; /* bit 63-bit 64 */ - t_u8 chanSchedMgnt:1; /* bit 65 */ - t_u8 rsvdBit66:1; /* bit 66 */ - t_u8 NCC:1; /* bit 67 */ - t_u8 rsvdBit68:1; /* bit 68 */ - t_u8 CAQ:1; /* bit 69 */ - t_u8 FTMR:1; /* bit 70 */ - t_u8 FTMI:1; /* bit 71 */ - t_u8 FILS:1; /* bit 72 */ - t_u8 rsvdBit73:1; /* bit 73 */ - t_u8 rsvdBit74:1; /* bit 74 */ - t_u8 rsvdBit75:1; /* bit 75 */ - t_u8 rsvdBit76:1; /* bit 76 */ - t_u8 TWTReq:1; /* bit 77 */ - t_u8 TWTResp:1; /* bit 78 */ - t_u8 rsvdBit79:1; /* bit 79 */ + /** 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 MaxAMSDU : 2; /* bit 63-bit 64 */ + t_u8 chanSchedMgnt : 1; /* bit 65 */ + t_u8 rsvdBit66 : 1; /* bit 66 */ + t_u8 NCC : 1; /* bit 67 */ + t_u8 rsvdBit68 : 1; /* bit 68 */ + t_u8 CAQ : 1; /* bit 69 */ + t_u8 FTMR : 1; /* bit 70 */ + t_u8 FTMI : 1; /* bit 71 */ + t_u8 FILS : 1; /* bit 72 */ + t_u8 rsvdBit73 : 1; /* bit 73 */ + t_u8 rsvdBit74 : 1; /* bit 74 */ + t_u8 rsvdBit75 : 1; /* bit 75 */ + t_u8 rsvdBit76 : 1; /* bit 76 */ + t_u8 TWTReq : 1; /* bit 77 */ + t_u8 TWTResp : 1; /* bit 78 */ + t_u8 rsvdBit79 : 1; /* bit 79 */ } MLAN_PACK_END ExtCap_t, *pExtCap_t; #endif @@ -1948,120 +1953,120 @@ typedef struct MLAN_PACK_START _ExtCap_t { /** mlan_bss_info data structure for MLAN_OID_GET_BSS_INFO */ typedef struct _mlan_bss_info { - /** BSS mode */ + /** BSS mode */ t_u32 bss_mode; - /** SSID */ + /** SSID */ mlan_802_11_ssid ssid; - /** Table index */ + /** Table index */ t_u32 scan_table_idx; - /** Channel */ + /** Channel */ t_u32 bss_chan; - /** Band */ + /** Band */ t_u8 bss_band; - /** Region code */ + /** Region code */ t_u32 region_code; - /** Connection status */ + /** Connection status */ t_u32 media_connected; - /** Radio on */ + /** Radio on */ t_u32 radio_on; - /** Max power level in dBm */ + /** Max power level in dBm */ t_s32 max_power_level; - /** Min power level in dBm */ + /** Min power level in dBm */ t_s32 min_power_level; - /** Adhoc state */ + /** Adhoc state */ t_u32 adhoc_state; - /** NF of last beacon */ + /** NF of last beacon */ t_s32 bcn_nf_last; - /** wep status */ + /** wep status */ t_u32 wep_status; - /** scan block status */ + /** scan block status */ t_u8 scan_block; - /** Host Sleep configured flag */ + /** Host Sleep configured flag */ t_u32 is_hs_configured; - /** Deep Sleep flag */ + /** Deep Sleep flag */ t_u32 is_deep_sleep; - /** BSSID */ + /** BSSID */ mlan_802_11_mac_addr bssid; #ifdef STA_SUPPORT - /** Capability Info */ + /** Capability Info */ t_u16 capability_info; - /** Beacon Interval */ + /** Beacon Interval */ t_u16 beacon_interval; - /** Listen Interval */ + /** Listen Interval */ t_u16 listen_interval; - /** Association Id */ + /** Association Id */ t_u16 assoc_id; - /** AP/Peer supported rates */ + /** AP/Peer supported rates */ t_u8 peer_supp_rates[MLAN_SUPPORTED_RATES]; - /** extend capability for AP */ + /** extend capability for AP */ ExtCap_t ext_cap; -#endif /* STA_SUPPORT */ - /** Mobility Domain ID */ +#endif /* STA_SUPPORT */ + /** Mobility Domain ID */ t_u16 mdid; - /** FT Capability policy */ + /** FT Capability policy */ t_u8 ft_cap; - /** 11h active */ + /** 11h active */ t_bool is_11h_active; - /** dfs check channel */ + /** dfs check channel */ t_u8 dfs_check_channel; } mlan_bss_info, *pmlan_bss_info; /** MAXIMUM number of TID */ -#define MAX_NUM_TID 8 +#define MAX_NUM_TID 8 /** Max RX Win size */ -#define MAX_RX_WINSIZE 64 +#define MAX_RX_WINSIZE 64 /** rx_reorder_tbl */ typedef struct { - /** TID */ + /** TID */ t_u16 tid; - /** TA */ + /** TA */ t_u8 ta[MLAN_MAC_ADDR_LENGTH]; - /** Start window */ + /** Start window */ t_u32 start_win; - /** Window size */ + /** Window size */ t_u32 win_size; - /** amsdu flag */ + /** amsdu flag */ t_u8 amsdu; - /** buffer status */ + /** buffer status */ t_u32 buffer[MAX_RX_WINSIZE]; } rx_reorder_tbl; /** tx_ba_stream_tbl */ typedef struct { - /** TID */ + /** TID */ t_u16 tid; - /** RA */ + /** RA */ t_u8 ra[MLAN_MAC_ADDR_LENGTH]; - /** amsdu flag */ + /** amsdu flag */ t_u8 amsdu; } tx_ba_stream_tbl; /** Debug command number */ -#define DBG_CMD_NUM 10 +#define DBG_CMD_NUM 10 #ifdef SDIO /** sdio mp debug number */ -#define SDIO_MP_DBG_NUM 10 +#define SDIO_MP_DBG_NUM 10 #endif #ifdef PCIE -#define MLAN_MAX_TXRX_BD 0x20 +#define MLAN_MAX_TXRX_BD 0x20 #endif /** Maximum size of IEEE Information Elements */ -#define IEEE_MAX_IE_SIZE 256 +#define IEEE_MAX_IE_SIZE 256 /** max ralist num */ -#define MLAN_MAX_RALIST_NUM 8 +#define MLAN_MAX_RALIST_NUM 8 /** ralist info */ typedef struct _ralist_info { - /** RA list buffer */ + /** RA list buffer */ t_u8 ra[MLAN_MAC_ADDR_LENGTH]; - /** total packets in RA list */ + /** total packets in RA list */ t_u16 total_pkts; - /** tid num */ + /** tid num */ t_u8 tid; /** tx_pause flag */ t_u8 tx_pause; @@ -2077,248 +2082,248 @@ typedef struct _mlan_debug_info { t_u32 wmm_ac_vi; /* WMM AC_VO count */ t_u32 wmm_ac_vo; - /** Corresponds to max_tx_buf_size member of mlan_adapter*/ + /** Corresponds to max_tx_buf_size member of mlan_adapter*/ t_u32 max_tx_buf_size; - /** Corresponds to tx_buf_size member of mlan_adapter*/ + /** Corresponds to tx_buf_size member of mlan_adapter*/ t_u32 tx_buf_size; - /** Corresponds to curr_tx_buf_size member of mlan_adapter*/ + /** Corresponds to curr_tx_buf_size member of mlan_adapter*/ t_u32 curr_tx_buf_size; - /** Tx table num */ + /** Tx table num */ t_u32 tx_tbl_num; - /** Tx ba stream table */ + /** Tx ba stream table */ tx_ba_stream_tbl tx_tbl[MLAN_MAX_TX_BASTREAM_SUPPORTED]; - /** Rx table num */ + /** Rx table num */ t_u32 rx_tbl_num; - /** Rx reorder table*/ + /** Rx reorder table*/ rx_reorder_tbl rx_tbl[MLAN_MAX_RX_BASTREAM_SUPPORTED]; - /** ralist num */ + /** ralist num */ t_u32 ralist_num; - /** ralist info */ + /** ralist info */ ralist_info ralist[MLAN_MAX_RALIST_NUM]; - /** Corresponds to ps_mode member of mlan_adapter */ + /** Corresponds to ps_mode member of mlan_adapter */ t_u16 ps_mode; - /** Corresponds to ps_state member of mlan_adapter */ + /** Corresponds to ps_state member of mlan_adapter */ t_u32 ps_state; #ifdef STA_SUPPORT - /** Corresponds to is_deep_sleep member of mlan_adapter */ + /** Corresponds to is_deep_sleep member of mlan_adapter */ t_u8 is_deep_sleep; #endif /** STA_SUPPORT */ - /** Corresponds to pm_wakeup_card_req member of mlan_adapter */ + /** Corresponds to pm_wakeup_card_req member of mlan_adapter */ t_u8 pm_wakeup_card_req; - /** Corresponds to pm_wakeup_fw_try member of mlan_adapter */ + /** Corresponds to pm_wakeup_fw_try member of mlan_adapter */ t_u32 pm_wakeup_fw_try; - /** time stamp when host try to wake up firmware */ + /** time stamp when host try to wake up firmware */ t_u32 pm_wakeup_in_secs; /** wake up timeout happened */ t_u32 pm_wakeup_timeout; - /** Corresponds to is_hs_configured member of mlan_adapter */ + /** Corresponds to is_hs_configured member of mlan_adapter */ t_u8 is_hs_configured; - /** Corresponds to hs_activated member of mlan_adapter */ + /** Corresponds to hs_activated member of mlan_adapter */ t_u8 hs_activated; - /** Corresponds to pps_uapsd_mode member of mlan_adapter */ + /** Corresponds to pps_uapsd_mode member of mlan_adapter */ t_u16 pps_uapsd_mode; - /** Corresponds to sleep_period.period member of mlan_adapter */ + /** Corresponds to sleep_period.period member of mlan_adapter */ t_u16 sleep_pd; - /** Corresponds to wmm_qosinfo member of mlan_private */ + /** Corresponds to wmm_qosinfo member of mlan_private */ t_u8 qos_cfg; - /** Corresponds to tx_lock_flag member of mlan_adapter */ + /** Corresponds to tx_lock_flag member of mlan_adapter */ t_u8 tx_lock_flag; - /** Corresponds to port_open member of mlan_private */ + /** Corresponds to port_open member of mlan_private */ t_u8 port_open; - /** bypass pkt count */ + /** bypass pkt count */ t_u16 bypass_pkt_count; - /** Corresponds to scan_processing member of mlan_adapter */ + /** Corresponds to scan_processing member of mlan_adapter */ t_u32 scan_processing; - /** Corresponds to mlan_processing member of mlan_adapter */ + /** Corresponds to mlan_processing member of mlan_adapter */ t_u32 mlan_processing; - /** Corresponds to main_lock_flag member of mlan_adapter */ + /** Corresponds to main_lock_flag member of mlan_adapter */ t_u32 main_lock_flag; - /** Corresponds to main_process_cnt member of mlan_adapter */ + /** Corresponds to main_process_cnt member of mlan_adapter */ t_u32 main_process_cnt; /** Corresponds to delay_task_flag member of mlan_adapter */ t_u32 delay_task_flag; - /** mlan_rx_processing */ + /** mlan_rx_processing */ t_u32 mlan_rx_processing; - /** rx pkts queued */ + /** rx pkts queued */ t_u32 rx_pkts_queued; - /** Number of host to card command failures */ + /** Number of host to card command failures */ t_u32 num_cmd_host_to_card_failure; - /** Number of host to card sleep confirm failures */ + /** Number of host to card sleep confirm failures */ t_u32 num_cmd_sleep_cfm_host_to_card_failure; - /** Number of host to card Tx failures */ + /** Number of host to card Tx failures */ t_u32 num_tx_host_to_card_failure; - /** Number of allocate buffer failure */ + /** Number of allocate buffer failure */ t_u32 num_alloc_buffer_failure; - /** Number of pkt dropped */ + /** Number of pkt dropped */ t_u32 num_pkt_dropped; #ifdef SDIO - /** Number of card to host command/event failures */ + /** Number of card to host command/event failures */ t_u32 num_cmdevt_card_to_host_failure; - /** Number of card to host Rx failures */ + /** Number of card to host Rx failures */ t_u32 num_rx_card_to_host_failure; - /** Number of interrupt read failures */ + /** Number of interrupt read failures */ t_u32 num_int_read_failure; - /** Last interrupt status */ + /** Last interrupt status */ t_u32 last_int_status; - /** number of interrupt receive */ + /** number of interrupt receive */ t_u32 num_of_irq; - /** flag for sdio rx aggr */ + /** flag for sdio rx aggr */ t_u8 sdio_rx_aggr; - /** FW update port number */ + /** FW update port number */ t_u32 mp_update[SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX * 2]; /** Invalid port update count */ t_u32 mp_invalid_update; - /** Number of packets tx aggr */ + /** Number of packets tx aggr */ t_u32 mpa_tx_count[SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX]; - /** no more packets count*/ + /** no more packets count*/ t_u32 mpa_sent_last_pkt; - /** no write_ports count */ + /** no write_ports count */ t_u32 mpa_sent_no_ports; /** last recv wr_bitmap */ t_u32 last_recv_wr_bitmap; - /** last mp_wr_bitmap */ + /** last mp_wr_bitmap */ t_u32 last_mp_wr_bitmap[SDIO_MP_DBG_NUM]; - /** last ports for cmd53 write data */ + /** last ports for cmd53 write data */ t_u32 last_mp_wr_ports[SDIO_MP_DBG_NUM]; /** last len for cmd53 write data */ t_u32 last_mp_wr_len[SDIO_MP_DBG_NUM]; - /** last curr_wr_port */ + /** last curr_wr_port */ t_u8 last_curr_wr_port[SDIO_MP_DBG_NUM]; - /** length info for cmd53 write data */ + /** length info for cmd53 write data */ t_u16 last_mp_wr_info[SDIO_MP_DBG_NUM * SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX]; - /** last mp_index */ + /** last mp_index */ t_u8 last_mp_index; - /** buffer for mp debug */ + /** buffer for mp debug */ t_u8 *mpa_buf; - /** length info for mp buf size */ + /** length info for mp buf size */ t_u32 mpa_buf_size; - /** Number of packets rx aggr */ + /** Number of packets rx aggr */ t_u32 mpa_rx_count[SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX]; /** mp aggr_pkt limit */ t_u8 mp_aggr_pkt_limit; #endif - /** Number of deauthentication events */ + /** Number of deauthentication events */ t_u32 num_event_deauth; - /** Number of disassosiation events */ + /** Number of disassosiation events */ t_u32 num_event_disassoc; - /** Number of link lost events */ + /** Number of link lost events */ t_u32 num_event_link_lost; - /** Number of deauthentication commands */ + /** Number of deauthentication commands */ t_u32 num_cmd_deauth; - /** Number of association comamnd successes */ + /** Number of association comamnd successes */ t_u32 num_cmd_assoc_success; - /** Number of association command failures */ + /** Number of association command failures */ t_u32 num_cmd_assoc_failure; - /** Number of consecutive association failures */ + /** Number of consecutive association failures */ t_u32 num_cons_assoc_failure; - /** Number of command timeouts */ + /** Number of command timeouts */ t_u32 num_cmd_timeout; - /** Timeout command ID */ + /** Timeout command ID */ t_u16 timeout_cmd_id; - /** Timeout command action */ + /** Timeout command action */ t_u16 timeout_cmd_act; - /** List of last command IDs */ + /** List of last command IDs */ t_u16 last_cmd_id[DBG_CMD_NUM]; - /** List of last command actions */ + /** List of last command actions */ t_u16 last_cmd_act[DBG_CMD_NUM]; - /** Last command index */ + /** Last command index */ t_u16 last_cmd_index; - /** List of last command response IDs */ + /** List of last command response IDs */ t_u16 last_cmd_resp_id[DBG_CMD_NUM]; - /** Last command response index */ + /** Last command response index */ t_u16 last_cmd_resp_index; - /** List of last events */ + /** List of last events */ t_u16 last_event[DBG_CMD_NUM]; - /** Last event index */ + /** Last event index */ t_u16 last_event_index; - /** Number of no free command node */ + /** Number of no free command node */ t_u16 num_no_cmd_node; - /** pending command id */ + /** pending command id */ t_u16 pending_cmd; - /** time stamp for dnld last cmd */ + /** time stamp for dnld last cmd */ t_u32 dnld_cmd_in_secs; - /** Corresponds to data_sent member of mlan_adapter */ + /** Corresponds to data_sent member of mlan_adapter */ t_u8 data_sent; - /** Corresponds to cmd_sent member of mlan_adapter */ + /** Corresponds to cmd_sent member of mlan_adapter */ t_u8 cmd_sent; - /** SDIO multiple port read bitmap */ + /** SDIO multiple port read bitmap */ t_u32 mp_rd_bitmap; - /** SDIO multiple port write bitmap */ + /** SDIO multiple port write bitmap */ t_u32 mp_wr_bitmap; - /** Current available port for read */ + /** Current available port for read */ t_u8 curr_rd_port; - /** Current available port for write */ + /** Current available port for write */ t_u8 curr_wr_port; #ifdef PCIE - /** PCIE txbd read pointer */ + /** PCIE txbd read pointer */ t_u32 txbd_rdptr; - /** PCIE txbd write pointer */ + /** PCIE txbd write pointer */ t_u32 txbd_wrptr; - /** PCIE rxbd read pointer */ + /** PCIE rxbd read pointer */ t_u32 rxbd_rdptr; - /** PCIE rxbd write pointer */ + /** PCIE rxbd write pointer */ t_u32 rxbd_wrptr; - /** PCIE eventbd read pointer */ + /** PCIE eventbd read pointer */ t_u32 eventbd_rdptr; - /** PCIE eventbd write pointer */ + /** PCIE eventbd write pointer */ t_u32 eventbd_wrptr; - /** Last pkt size in transmit */ + /** Last pkt size in transmit */ t_u32 last_tx_pkt_size[MLAN_MAX_TXRX_BD]; - /** txbd ring vbase */ + /** txbd ring vbase */ t_u8 *txbd_ring_vbase; - /** txbd ring size */ + /** txbd ring size */ t_u32 txbd_ring_size; - /** rxbd ring vbase */ + /** rxbd ring vbase */ t_u8 *rxbd_ring_vbase; - /** rxbd ring size */ + /** rxbd ring size */ t_u32 rxbd_ring_size; - /** evtbd ring vbase */ + /** evtbd ring vbase */ t_u8 *evtbd_ring_vbase; - /** evtbd ring size */ + /** evtbd ring size */ t_u32 evtbd_ring_size; #endif - /** Corresponds to cmdresp_received member of mlan_adapter */ + /** Corresponds to cmdresp_received member of mlan_adapter */ t_u8 cmd_resp_received; - /** Corresponds to event_received member of mlan_adapter */ + /** Corresponds to event_received member of mlan_adapter */ t_u8 event_received; - /** pendig tx pkts */ + /** pendig tx pkts */ t_u32 tx_pkts_queued; #ifdef UAP_SUPPORT - /** pending bridge pkts */ + /** pending bridge pkts */ t_u16 num_bridge_pkts; - /** dropped pkts */ + /** dropped pkts */ t_u32 num_drop_pkts; #endif - /** FW hang report */ + /** FW hang report */ t_u8 fw_hang_report; - /** mlan_adapter pointer */ + /** mlan_adapter pointer */ t_void *mlan_adapter; - /** mlan_adapter_size */ + /** mlan_adapter_size */ t_u32 mlan_adapter_size; - /** mlan_priv vector */ + /** mlan_priv vector */ t_void *mlan_priv[MLAN_MAX_BSS_NUM]; - /** mlan_priv_size */ + /** mlan_priv_size */ t_u32 mlan_priv_size[MLAN_MAX_BSS_NUM]; - /** mlan_priv_num */ + /** mlan_priv_num */ t_u8 mlan_priv_num; } mlan_debug_info, *pmlan_debug_info; #ifdef UAP_SUPPORT /** Maximum number of clients supported by AP */ -#define MAX_NUM_CLIENTS MAX_STA_COUNT +#define MAX_NUM_CLIENTS MAX_STA_COUNT /** station info */ typedef struct _sta_info { - /** STA MAC address */ + /** STA MAC address */ t_u8 mac_address[MLAN_MAC_ADDR_LENGTH]; - /** Power mgmt status */ + /** Power mgmt status */ t_u8 power_mgmt_status; - /** RSSI */ + /** RSSI */ t_s8 rssi; - /** station bandmode */ + /** station bandmode */ t_u16 bandmode; - /** station stats */ + /** station stats */ sta_stats stats; /** ie length */ t_u16 ie_len; @@ -2328,42 +2333,42 @@ typedef struct _sta_info { /** mlan_ds_sta_list structure for MLAN_OID_UAP_STA_LIST */ typedef struct _mlan_ds_sta_list { - /** station count */ + /** station count */ t_u16 sta_count; - /** station list */ + /** station list */ sta_info info[MAX_NUM_CLIENTS]; } mlan_ds_sta_list, *pmlan_ds_sta_list; #endif /** Type definition of mlan_ds_get_info for MLAN_IOCTL_GET_INFO */ typedef struct _mlan_ds_get_info { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** Status information parameter */ + /** Status information parameter */ union { - /** Signal information for MLAN_OID_GET_SIGNAL */ + /** Signal information for MLAN_OID_GET_SIGNAL */ mlan_ds_get_signal signal; /** Signal path id for MLAN_OID_GET_SIGNAL_EXT */ t_u16 path_id; - /** Signal information for MLAN_OID_GET_SIGNAL_EXT */ + /** Signal information for MLAN_OID_GET_SIGNAL_EXT */ mlan_ds_get_signal signal_ext[MAX_PATH_NUM]; - /** Statistics information for MLAN_OID_GET_STATS */ + /** Statistics information for MLAN_OID_GET_STATS */ mlan_ds_get_stats stats; - /** Statistics information for MLAN_OID_LINK_STATS*/ + /** Statistics information for MLAN_OID_LINK_STATS*/ t_u8 link_statistic[1]; - /** Firmware information for MLAN_OID_GET_FW_INFO */ + /** Firmware information for MLAN_OID_GET_FW_INFO */ mlan_fw_info fw_info; - /** Extended version information for MLAN_OID_GET_VER_EXT */ + /** Extended version information for MLAN_OID_GET_VER_EXT */ mlan_ver_ext ver_ext; - /** BSS information for MLAN_OID_GET_BSS_INFO */ + /** BSS information for MLAN_OID_GET_BSS_INFO */ mlan_bss_info bss_info; - /** Debug information for MLAN_OID_GET_DEBUG_INFO */ + /** Debug information for MLAN_OID_GET_DEBUG_INFO */ t_u8 debug_info[1]; #ifdef UAP_SUPPORT - /** UAP Statistics information for MLAN_OID_GET_STATS */ + /** UAP Statistics information for MLAN_OID_GET_STATS */ mlan_ds_uap_stats ustats; - /** UAP station list for MLAN_OID_UAP_STA_LIST */ + /** UAP station list for MLAN_OID_UAP_STA_LIST */ mlan_ds_sta_list sta_list; #endif } param; @@ -2415,174 +2420,175 @@ enum _mlan_psk_type { }; /** The bit to indicate the key is for unicast */ -#define MLAN_KEY_INDEX_UNICAST 0x40000000 +#define MLAN_KEY_INDEX_UNICAST 0x40000000 /** The key index to indicate default key */ -#define MLAN_KEY_INDEX_DEFAULT 0x000000ff +#define MLAN_KEY_INDEX_DEFAULT 0x000000ff /** Maximum key length */ /* #define MLAN_MAX_KEY_LENGTH 32 */ /** Minimum passphrase length */ -#define MLAN_MIN_PASSPHRASE_LENGTH 8 +#define MLAN_MIN_PASSPHRASE_LENGTH 8 /** Maximum passphrase length */ -#define MLAN_MAX_PASSPHRASE_LENGTH 63 +#define MLAN_MAX_PASSPHRASE_LENGTH 63 /** Minimum sae_password length */ -#define MLAN_MIN_SAE_PASSWORD_LENGTH 8 +#define MLAN_MIN_SAE_PASSWORD_LENGTH 8 /** Maximum sae_password length */ -#define MLAN_MAX_SAE_PASSWORD_LENGTH 255 +#define MLAN_MAX_SAE_PASSWORD_LENGTH 255 /** PMK length */ -#define MLAN_PMK_HEXSTR_LENGTH 64 +#define MLAN_PMK_HEXSTR_LENGTH 64 /* A few details needed for WEP (Wireless Equivalent Privacy) */ /** 104 bits */ -#define MAX_WEP_KEY_SIZE 13 +#define MAX_WEP_KEY_SIZE 13 /** 40 bits RC4 - WEP */ -#define MIN_WEP_KEY_SIZE 5 +#define MIN_WEP_KEY_SIZE 5 /** packet number size */ -#define PN_SIZE 16 +#define PN_SIZE 16 /** max seq size of wpa/wpa2 key */ -#define SEQ_MAX_SIZE 8 +#define SEQ_MAX_SIZE 8 /** key flag for tx_seq */ -#define KEY_FLAG_TX_SEQ_VALID 0x00000001 +#define KEY_FLAG_TX_SEQ_VALID 0x00000001 /** key flag for rx_seq */ -#define KEY_FLAG_RX_SEQ_VALID 0x00000002 +#define KEY_FLAG_RX_SEQ_VALID 0x00000002 /** key flag for group key */ -#define KEY_FLAG_GROUP_KEY 0x00000004 +#define KEY_FLAG_GROUP_KEY 0x00000004 /** key flag for tx */ -#define KEY_FLAG_SET_TX_KEY 0x00000008 +#define KEY_FLAG_SET_TX_KEY 0x00000008 /** key flag for mcast IGTK */ #define KEY_FLAG_AES_MCAST_IGTK 0x00000010 /** key flag for remove key */ -#define KEY_FLAG_REMOVE_KEY 0x80000000 +#define KEY_FLAG_REMOVE_KEY 0x80000000 /** key flag for GCMP */ -#define KEY_FLAG_GCMP 0x00000020 +#define KEY_FLAG_GCMP 0x00000020 /** key flag for GCMP_256 */ -#define KEY_FLAG_GCMP_256 0x00000040 +#define KEY_FLAG_GCMP_256 0x00000040 /** key flag for ccmp 256 */ -#define KEY_FLAG_CCMP_256 0x00000080 +#define KEY_FLAG_CCMP_256 0x00000080 /** Type definition of mlan_ds_encrypt_key for MLAN_OID_SEC_CFG_ENCRYPT_KEY */ typedef struct _mlan_ds_encrypt_key { - /** Key disabled, all other fields will be - * ignore when this flag set to MTRUE - */ + /** Key disabled, all other fields will be + * ignore when this flag set to MTRUE + */ t_u32 key_disable; - /** key removed flag, when this flag is set - * to MTRUE, only key_index will be check - */ + /** key removed flag, when this flag is set + * to MTRUE, only key_index will be check + */ t_u32 key_remove; - /** Key index, used as current tx key index - * when is_current_wep_key is set to MTRUE - */ + /** Key index, used as current tx key index + * when is_current_wep_key is set to MTRUE + */ t_u32 key_index; - /** Current Tx key flag */ + /** Current Tx key flag */ t_u32 is_current_wep_key; - /** Key length */ + /** Key length */ t_u32 key_len; - /** Key */ + /** Key */ t_u8 key_material[MLAN_MAX_KEY_LENGTH]; - /** mac address */ + /** mac address */ t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; - /** wapi key flag */ + /** wapi key flag */ t_u32 is_wapi_key; - /** Initial packet number */ + /** Initial packet number */ t_u8 pn[PN_SIZE]; - /** key flags */ + /** 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 */ + /** Length of passphrase */ t_u32 passphrase_len; - /** Passphrase */ + /** Passphrase */ t_u8 passphrase[MLAN_MAX_PASSPHRASE_LENGTH]; } mlan_passphrase_t; /** Type definition of mlan_sae_password_t */ typedef struct _mlan_sae_password_t { - /** Length of SAE Password */ + /** Length of SAE Password */ t_u32 sae_password_len; - /** SAE Password */ + /** SAE Password */ t_u8 sae_password[MLAN_MAX_SAE_PASSWORD_LENGTH]; } mlan_sae_password_t; /** Type defnition of mlan_pmk_t */ typedef struct _mlan_pmk_t { - /** PMK */ + /** PMK */ t_u8 pmk[MLAN_MAX_KEY_LENGTH]; } mlan_pmk_t; /** Embedded supplicant RSN type: No RSN */ -#define RSN_TYPE_NO_RSN MBIT(0) +#define RSN_TYPE_NO_RSN MBIT(0) /** Embedded supplicant RSN type: WPA */ -#define RSN_TYPE_WPA MBIT(3) +#define RSN_TYPE_WPA MBIT(3) /** Embedded supplicant RSN type: WPA-NONE */ -#define RSN_TYPE_WPANONE MBIT(4) +#define RSN_TYPE_WPANONE MBIT(4) /** Embedded supplicant RSN type: WPA2 */ -#define RSN_TYPE_WPA2 MBIT(5) +#define RSN_TYPE_WPA2 MBIT(5) /** Embedded supplicant RSN type: RFU */ -#define RSN_TYPE_VALID_BITS (RSN_TYPE_NO_RSN | RSN_TYPE_WPA | RSN_TYPE_WPANONE | RSN_TYPE_WPA2) +#define RSN_TYPE_VALID_BITS \ + (RSN_TYPE_NO_RSN | RSN_TYPE_WPA | RSN_TYPE_WPANONE | RSN_TYPE_WPA2) /** Embedded supplicant cipher type: TKIP */ -#define EMBED_CIPHER_TKIP MBIT(2) +#define EMBED_CIPHER_TKIP MBIT(2) /** Embedded supplicant cipher type: AES */ -#define EMBED_CIPHER_AES MBIT(3) +#define EMBED_CIPHER_AES MBIT(3) /** Embedded supplicant cipher type: RFU */ #define EMBED_CIPHER_VALID_BITS (EMBED_CIPHER_TKIP | EMBED_CIPHER_AES) /** Type definition of mlan_ds_passphrase for MLAN_OID_SEC_CFG_PASSPHRASE */ typedef struct _mlan_ds_passphrase { - /** SSID may be used */ + /** SSID may be used */ mlan_802_11_ssid ssid; - /** BSSID may be used */ + /** BSSID may be used */ mlan_802_11_mac_addr bssid; - /** Flag for passphrase or pmk used */ + /** Flag for passphrase or pmk used */ t_u16 psk_type; - /** Passphrase or PMK */ + /** Passphrase or PMK */ union { - /** Passphrase */ + /** Passphrase */ mlan_passphrase_t passphrase; - /** SAE Password */ + /** SAE Password */ mlan_sae_password_t sae_password; - /** PMK */ + /** 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 */ + /** RSN mode */ t_u32 rsn_mode; - /** Active pairwise cipher */ + /** Active pairwise cipher */ t_u32 act_paircipher; - /** Active pairwise cipher */ + /** Active pairwise cipher */ 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 */ + /** Sub-command */ t_u32 sub_command; - /** Security configuration parameter */ + /** Security configuration parameter */ union { - /** Authentication mode for MLAN_OID_SEC_CFG_AUTH_MODE */ + /** Authentication mode for MLAN_OID_SEC_CFG_AUTH_MODE */ t_u32 auth_mode; - /** Encryption mode for MLAN_OID_SEC_CFG_ENCRYPT_MODE */ + /** Encryption mode for MLAN_OID_SEC_CFG_ENCRYPT_MODE */ t_u32 encrypt_mode; - /** WPA enabled flag for MLAN_OID_SEC_CFG_WPA_ENABLED */ + /** WPA enabled flag for MLAN_OID_SEC_CFG_WPA_ENABLED */ t_u32 wpa_enabled; - /** WAPI enabled flag for MLAN_OID_SEC_CFG_WAPI_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 */ + /** 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 */ + /** Encryption key for MLAN_OID_SEC_CFG_ENCRYPT_KEY */ mlan_ds_encrypt_key encrypt_key; - /** Passphrase for MLAN_OID_SEC_CFG_PASSPHRASE */ + /** 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 */ + /** Embedded supplicant mode for MLAN_OID_SEC_CFG_ESUPP_MODE */ mlan_ds_esupp_mode esupp_mode; #ifdef UAP_SUPPORT t_u8 sta_mac[MLAN_MAC_ADDR_LENGTH]; @@ -2591,46 +2597,46 @@ typedef struct _mlan_ds_sec_cfg { } mlan_ds_sec_cfg, *pmlan_ds_sec_cfg; #if defined(DRV_EMBEDDED_AUTHENTICATOR) || defined(DRV_EMBEDDED_SUPPLICANT) -#define BIT_TLV_TYPE_CRYPTO_KEY (1<<0) -#define BIT_TLV_TYPE_CRYPTO_KEY_IV (1<<1) -#define BIT_TLV_TYPE_CRYPTO_KEY_PREFIX (1<<2) -#define BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK (1<<3) +#define BIT_TLV_TYPE_CRYPTO_KEY (1 << 0) +#define BIT_TLV_TYPE_CRYPTO_KEY_IV (1 << 1) +#define BIT_TLV_TYPE_CRYPTO_KEY_PREFIX (1 << 2) +#define BIT_TLV_TYPE_CRYPTO_KEY_DATA_BLK (1 << 3) /** Type definition of mlan_ds_sup_cfg */ typedef struct _mlan_ds_sup_cfg { - /** Sub-command */ + /** Sub-command */ t_u8 sub_command; - /** output length */ + /** output length */ t_u16 output_len; - /** number of data blks */ + /** number of data blks */ t_u16 data_blks_nr; - /** sub action code */ + /** sub action code */ t_u8 sub_action_code; - /** skip bytes */ + /** skip bytes */ t_u16 skip_bytes; - /** iteration */ + /** iteration */ t_u32 iteration; - /** count */ + /** count */ t_u32 count; - /** pointer to output */ + /** pointer to output */ t_u8 *output; - /** key length */ + /** key length */ t_u16 key_len; - /** pointer to key */ + /** pointer to key */ t_u8 *key; - /** key iv length */ + /** key iv length */ t_u16 key_iv_len; - /** pointer to key iv */ + /** pointer to key iv */ t_u8 *key_iv; - /** key prefix length */ + /** key prefix length */ t_u16 key_prefix_len; - /** pointer to key prefix */ + /** pointer to key prefix */ t_u8 *key_prefix; - /** pointer to data blk length array */ + /** pointer to data blk length array */ t_u32 *key_data_blk_len; - /** pointer to key data blk pointer array */ + /** pointer to key data blk pointer array */ t_u8 **key_data_blk; - /** callback */ + /** callback */ t_u8 call_back; } mlan_ds_sup_cfg, *pmlan_ds_sup_cfg; #endif @@ -2639,11 +2645,7 @@ typedef struct _mlan_ds_sup_cfg { /** Rate Configuration Group */ /*-----------------------------------------------------------------*/ /** Enumeration for rate type */ -enum _mlan_rate_type { - MLAN_RATE_INDEX, - MLAN_RATE_VALUE, - MLAN_RATE_BITMAP -}; +enum _mlan_rate_type { MLAN_RATE_INDEX, MLAN_RATE_VALUE, MLAN_RATE_BITMAP }; /** Enumeration for rate format */ enum _mlan_rate_format { @@ -2655,23 +2657,23 @@ enum _mlan_rate_format { }; /** Max bitmap rates size */ -#define MAX_BITMAP_RATES_SIZE 26 +#define MAX_BITMAP_RATES_SIZE 26 /** Type definition of mlan_rate_cfg_t for MLAN_OID_RATE_CFG */ typedef struct _mlan_rate_cfg_t { - /** Fixed rate: 0, auto rate: 1 */ + /** Fixed rate: 0, auto rate: 1 */ t_u32 is_rate_auto; - /** Rate type. 0: index; 1: value; 2: bitmap */ + /** Rate type. 0: index; 1: value; 2: bitmap */ t_u32 rate_type; - /** Rate/MCS index or rate value if fixed rate */ + /** Rate/MCS index or rate value if fixed rate */ t_u32 rate; - /** Rate Bitmap */ + /** Rate Bitmap */ t_u16 bitmap_rates[MAX_BITMAP_RATES_SIZE]; - /** NSS */ + /** NSS */ t_u32 nss; /* LG rate: 0, HT rate: 1, VHT rate: 2 */ t_u32 rate_format; - /** Rate Setting */ + /** Rate Setting */ t_u16 rate_setting; } mlan_rate_cfg_t; @@ -2679,7 +2681,7 @@ typedef struct _mlan_rate_cfg_t { typedef enum _mlan_ht_bw { MLAN_HT_BW20, MLAN_HT_BW40, -/** VHT channel bandwidth */ + /** VHT channel bandwidth */ MLAN_VHT_BW80, MLAN_VHT_BW160, } mlan_ht_bw; @@ -2702,31 +2704,31 @@ typedef enum _mlan_vht_ldpc { /** Band and BSS mode */ typedef struct _mlan_band_data_rate { - /** Band configuration */ + /** Band configuration */ t_u8 config_bands; - /** BSS mode (Infra or IBSS) */ + /** BSS mode (Infra or IBSS) */ 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 */ + /** Tx data rate */ t_u32 tx_data_rate; - /** Rx data rate */ + /** Rx data rate */ t_u32 rx_data_rate; - /** Tx channel bandwidth */ + /** Tx channel bandwidth */ t_u32 tx_ht_bw; - /** Tx guard interval */ + /** Tx guard interval */ t_u32 tx_ht_gi; - /** Rx channel bandwidth */ + /** Rx channel bandwidth */ t_u32 rx_ht_bw; - /** Rx guard interval */ + /** Rx guard interval */ t_u32 rx_ht_gi; - /** MCS index */ + /** MCS index */ t_u32 tx_mcs_index; t_u32 rx_mcs_index; - /** NSS */ + /** NSS */ t_u32 tx_nss; t_u32 rx_nss; /* LG rate: 0, HT rate: 1, VHT rate: 2 */ @@ -2736,17 +2738,17 @@ typedef struct _mlan_data_rate { /** Type definition of mlan_ds_rate for MLAN_IOCTL_RATE */ typedef struct _mlan_ds_rate { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** Rate configuration parameter */ + /** Rate configuration parameter */ union { - /** Rate configuration for MLAN_OID_RATE_CFG */ + /** Rate configuration for MLAN_OID_RATE_CFG */ mlan_rate_cfg_t rate_cfg; - /** Data rate for MLAN_OID_GET_DATA_RATE */ + /** Data rate for MLAN_OID_GET_DATA_RATE */ mlan_data_rate data_rate; - /** Supported rates for MLAN_OID_SUPPORTED_RATES */ + /** Supported rates for MLAN_OID_SUPPORTED_RATES */ t_u8 rates[MLAN_SUPPORTED_RATES]; - /** Band/BSS mode for getting supported rates */ + /** Band/BSS mode for getting supported rates */ mlan_band_data_rate rate_band_cfg; } param; } mlan_ds_rate, *pmlan_ds_rate; @@ -2757,69 +2759,70 @@ typedef struct _mlan_ds_rate { /** Type definition of mlan_power_cfg_t for MLAN_OID_POWER_CFG */ typedef struct _mlan_power_cfg_t { - /** Is power auto */ + /** Is power auto */ t_u32 is_power_auto; - /** Power level in dBm */ + /** Power level in dBm */ t_s32 power_level; } mlan_power_cfg_t; /** max power table size */ -#define MAX_POWER_TABLE_SIZE 128 -#define TX_PWR_CFG_AUTO_CTRL_OFF 0xFF -#define MAX_POWER_GROUP 64 +#define MAX_POWER_TABLE_SIZE 128 +#define TX_PWR_CFG_AUTO_CTRL_OFF 0xFF +#define MAX_POWER_GROUP 64 /** Type definition of mlan_power group info */ typedef struct mlan_power_group { - - /** rate format (LG: 0, HT: 1, VHT: 2, no auto ctrl: 0xFF) */ + /** rate format (LG: 0, HT: 1, VHT: 2, no auto ctrl: 0xFF) */ t_u32 rate_format; - /** bandwidth (LG: 20 MHz, HT: 20/40 MHz, VHT: 80/160/80+80 MHz) */ + /** bandwidth (LG: 20 MHz, HT: 20/40 MHz, VHT: 80/160/80+80 MHz) */ t_u8 bandwidth; - /** NSS */ + /** NSS */ t_u32 nss; - /** LG: first rate index, HT/VHT: first MCS */ + /** LG: first rate index, HT/VHT: first MCS */ t_u8 first_rate_ind; - /** LG: last rate index, HT/VHT: last MCS */ + /** LG: last rate index, HT/VHT: last MCS */ t_u8 last_rate_ind; - /** minmum tx power (dBm) */ + /** minmum tx power (dBm) */ t_s8 power_min; - /** maximum tx power (dBm) */ + /** maximum tx power (dBm) */ t_s8 power_max; - /** tx power step (dB) */ + /** tx power step (dB) */ t_s8 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 */ + /** number of power_groups */ t_u32 num_pwr_grp; - /** array of power groups */ + /** array of power groups */ 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 */ + /** Sub-command */ t_u32 sub_command; - /** Power configuration parameter */ + /** Power configuration parameter */ union { - /** Power configuration for MLAN_OID_POWER_CFG */ + /** Power configuration for MLAN_OID_POWER_CFG */ mlan_power_cfg_t power_cfg; - /** Extended power configuration for MLAN_OID_POWER_CFG_EXT */ + /** Extended power configuration for MLAN_OID_POWER_CFG_EXT */ mlan_power_cfg_ext power_ext; - /** Low power mode for MLAN_OID_POWER_LOW_POWER_MODE */ + /** Low power mode for MLAN_OID_POWER_LOW_POWER_MODE */ t_u16 lpm; } param; } mlan_ds_power_cfg, *pmlan_ds_power_cfg; /** Type definition of mlan_ds_band_steer_cfg for MLAN_IOCTL_POWER_CFG */ typedef struct _mlan_ds_band_steer_cfg { - /** Set/Get */ + /** Set/Get */ t_u8 action; - /** enable/disable band steering*/ + /** enable/disable band steering*/ t_u8 state; - /** Probe Response will be blocked to 2G channel for first block_2g_prb_req probe requests*/ + /** Probe Response will be blocked to 2G channel for first + * block_2g_prb_req probe requests*/ t_u8 block_2g_prb_req; - /** When band steering is enabled, limit the btm request sent to STA at */ + /** When band steering is enabled, limit the btm request sent to STA at + * */ t_u8 max_btm_req_allowed; } mlan_ds_band_steer_cfg, *pmlan_ds_band_steer_cfg; @@ -2827,26 +2830,28 @@ typedef struct _mlan_ds_band_steer_cfg { /** Power Management Configuration Group */ /*-----------------------------------------------------------------*/ /** Host sleep config conditions : Cancel */ -#define HOST_SLEEP_CFG_CANCEL 0xffffffff +#define HOST_SLEEP_CFG_CANCEL 0xffffffff /** Host sleep config condition: broadcast data */ -#define HOST_SLEEP_COND_BROADCAST_DATA MBIT(0) +#define HOST_SLEEP_COND_BROADCAST_DATA MBIT(0) /** Host sleep config condition: unicast data */ -#define HOST_SLEEP_COND_UNICAST_DATA MBIT(1) +#define HOST_SLEEP_COND_UNICAST_DATA MBIT(1) /** Host sleep config condition: mac event */ -#define HOST_SLEEP_COND_MAC_EVENT MBIT(2) +#define HOST_SLEEP_COND_MAC_EVENT MBIT(2) /** Host sleep config condition: multicast data */ -#define HOST_SLEEP_COND_MULTICAST_DATA MBIT(3) +#define HOST_SLEEP_COND_MULTICAST_DATA MBIT(3) /** Host sleep config condition: IPV6 packet */ -#define HOST_SLEEP_COND_IPV6_PACKET MBIT(31) +#define HOST_SLEEP_COND_IPV6_PACKET MBIT(31) /** 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) +#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 0xff /** Host sleep config gap : Default */ -#define HOST_SLEEP_DEF_GAP 200 +#define HOST_SLEEP_DEF_GAP 200 /** Host sleep config min wake holdoff */ #define HOST_SLEEP_DEF_WAKE_HOLDOFF 0; /** Host sleep config inactivity timeout */ @@ -2854,97 +2859,98 @@ typedef struct _mlan_ds_band_steer_cfg { /** 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 */ + /** MTRUE to invoke the HostCmd, MFALSE otherwise */ t_u32 is_invoke_hostcmd; - /** Host sleep config condition */ - /** Bit0: broadcast data - * Bit1: unicast data - * Bit2: mac event - * Bit3: multicast data - */ + /** Host sleep config condition */ + /** Bit0: broadcast data + * Bit1: unicast data + * Bit2: mac event + * Bit3: multicast data + */ t_u32 conditions; - /** GPIO pin or 0xff for interface */ + /** GPIO pin or 0xff for interface */ t_u32 gpio; - /** Gap in milliseconds or or 0xff for special - * setting when GPIO is used to wakeup host - */ + /** Gap in milliseconds or or 0xff for special + * setting when GPIO is used to wakeup host + */ t_u32 gap; - /** Host sleep wake interval */ + /** Host sleep wake interval */ t_u32 hs_wake_interval; - /** Parameter type for indication gpio*/ + /** Parameter type for indication gpio*/ t_u8 param_type_ind; - /** GPIO pin for indication wakeup source */ + /** GPIO pin for indication wakeup source */ t_u32 ind_gpio; - /** Level on ind_gpio pin for indication normal wakeup source */ + /** Level on ind_gpio pin for indication normal wakeup source */ t_u32 level; - /** Parameter type for extend hscfg*/ + /** Parameter type for extend hscfg*/ t_u8 param_type_ext; - /** Events that will be forced ignore*/ + /** Events that will be forced ignore*/ t_u32 event_force_ignore; - /** Events that will use extend gap to inform host*/ + /** Events that will use extend gap to inform host*/ t_u32 event_use_ext_gap; - /** Ext gap*/ + /** Ext gap*/ t_u8 ext_gap; - /** GPIO wave level for extend hscfg*/ + /** GPIO wave level for extend hscfg*/ t_u8 gpio_wave; } mlan_ds_hs_cfg, *pmlan_ds_hs_cfg; #define MAX_MGMT_FRAME_FILTER 2 typedef struct _mlan_mgmt_frame_wakeup { - /** action - bitmap - ** On matching rx'd pkt and filter during NON_HOSTSLEEP mode: - ** Action[1]=0 Discard - ** Action[1]=1 Allow - ** Note that default action on non-match is "Allow". - ** - ** On matching rx'd pkt and filter during HOSTSLEEP mode: - ** Action[1:0]=00 Discard and Not Wake host - ** Action[1:0]=01 Discard and Wake host - ** Action[1:0]=10 Invalid - ** Note that default action on non-match is "Discard and Not Wake host". - **/ + /** action - bitmap + ** On matching rx'd pkt and filter during NON_HOSTSLEEP mode: + ** Action[1]=0 Discard + ** Action[1]=1 Allow + ** Note that default action on non-match is "Allow". + ** + ** On matching rx'd pkt and filter during HOSTSLEEP mode: + ** Action[1:0]=00 Discard and Not Wake host + ** Action[1:0]=01 Discard and Wake host + ** Action[1:0]=10 Invalid + ** Note that default action on non-match is "Discard and Not Wake + *host". + **/ t_u32 action; - /** Frame type(p2p, tdls...) - ** type=0: invalid - ** type=1: p2p - ** type=others: reserved - **/ + /** Frame type(p2p, tdls...) + ** type=0: invalid + ** type=1: p2p + ** type=others: reserved + **/ t_u32 type; - /** Frame mask according to each type - ** When type=1 for p2p, frame-mask have following define: - ** Bit Frame - ** 0 GO Negotiation Request - ** 1 GO Negotiation Response - ** 2 GO Negotiation Confirmation - ** 3 P2P Invitation Request - ** 4 P2P Invitation Response - ** 5 Device Discoverability Request - ** 6 Device Discoverability Response - ** 7 Provision Discovery Request - ** 8 Provision Discovery Response - ** 9 Notice of Absence - ** 10 P2P Presence Request - ** 11 P2P Presence Response - ** 12 GO Discoverability Request - ** 13-31 Reserved - ** - ** When type=others, frame-mask is reserved. - **/ + /** Frame mask according to each type + ** When type=1 for p2p, frame-mask have following define: + ** Bit Frame + ** 0 GO Negotiation Request + ** 1 GO Negotiation Response + ** 2 GO Negotiation Confirmation + ** 3 P2P Invitation Request + ** 4 P2P Invitation Response + ** 5 Device Discoverability Request + ** 6 Device Discoverability Response + ** 7 Provision Discovery Request + ** 8 Provision Discovery Response + ** 9 Notice of Absence + ** 10 P2P Presence Request + ** 11 P2P Presence Response + ** 12 GO Discoverability Request + ** 13-31 Reserved + ** + ** When type=others, frame-mask is reserved. + **/ t_u32 frame_mask; } mlan_mgmt_frame_wakeup, *pmlan_mgmt_frame_wakeup; /** Enable deep sleep mode */ -#define DEEP_SLEEP_ON 1 +#define DEEP_SLEEP_ON 1 /** Disable deep sleep mode */ #define DEEP_SLEEP_OFF 0 /** Default idle time in milliseconds for auto deep sleep */ -#define DEEP_SLEEP_IDLE_TIME 100 +#define DEEP_SLEEP_IDLE_TIME 100 typedef struct _mlan_ds_auto_ds { - /** auto ds mode, 0 - disable, 1 - enable */ + /** auto ds mode, 0 - disable, 1 - enable */ t_u16 auto_ds; - /** auto ds idle time in milliseconds */ + /** auto ds idle time in milliseconds */ t_u16 idletime; } mlan_ds_auto_ds; @@ -2952,154 +2958,154 @@ typedef struct _mlan_ds_auto_ds { * for MLAN_OID_PM_CFG_INACTIVITY_TO */ typedef struct _mlan_ds_inactivity_to { - /** Timeout unit in microsecond, 0 means 1000us (1ms) */ + /** Timeout unit in microsecond, 0 means 1000us (1ms) */ t_u32 timeout_unit; - /** Inactivity timeout for unicast data */ + /** Inactivity timeout for unicast data */ t_u32 unicast_timeout; - /** Inactivity timeout for multicast data */ + /** Inactivity timeout for multicast data */ t_u32 mcast_timeout; - /** Timeout for additional Rx traffic after Null PM1 packet exchange */ + /** Timeout for additional Rx traffic after Null PM1 packet exchange */ t_u32 ps_entry_timeout; } mlan_ds_inactivity_to, *pmlan_ds_inactivity_to; /** Minimum sleep period in milliseconds */ -#define MIN_SLEEP_PERIOD 10 +#define MIN_SLEEP_PERIOD 10 /** Maximum sleep period in milliseconds */ -#define MAX_SLEEP_PERIOD 60 +#define MAX_SLEEP_PERIOD 60 /** Special setting for UPSD certification tests */ -#define SLEEP_PERIOD_RESERVED_FF 0xFF +#define SLEEP_PERIOD_RESERVED_FF 0xFF /** PS null interval disable */ -#define PS_NULL_DISABLE (-1) +#define PS_NULL_DISABLE (-1) /** Local listen interval disable */ -#define MRVDRV_LISTEN_INTERVAL_DISABLE (-1) +#define MRVDRV_LISTEN_INTERVAL_DISABLE (-1) /** Minimum listen interval */ -#define MRVDRV_MIN_LISTEN_INTERVAL 0 +#define MRVDRV_MIN_LISTEN_INTERVAL 0 /** Minimum multiple DTIM */ -#define MRVDRV_MIN_MULTIPLE_DTIM 0 +#define MRVDRV_MIN_MULTIPLE_DTIM 0 /** Maximum multiple DTIM */ -#define MRVDRV_MAX_MULTIPLE_DTIM 5 +#define MRVDRV_MAX_MULTIPLE_DTIM 5 /** Ignore multiple DTIM */ -#define MRVDRV_IGNORE_MULTIPLE_DTIM 0xfffe +#define MRVDRV_IGNORE_MULTIPLE_DTIM 0xfffe /** Match listen interval to closest DTIM */ -#define MRVDRV_MATCH_CLOSEST_DTIM 0xfffd +#define MRVDRV_MATCH_CLOSEST_DTIM 0xfffd /** Minimum beacon miss timeout in milliseconds */ -#define MIN_BCN_MISS_TO 0 +#define MIN_BCN_MISS_TO 0 /** Maximum beacon miss timeout in milliseconds */ -#define MAX_BCN_MISS_TO 50 +#define MAX_BCN_MISS_TO 50 /** Disable beacon miss timeout */ -#define DISABLE_BCN_MISS_TO 65535 +#define DISABLE_BCN_MISS_TO 65535 /** Minimum delay to PS in milliseconds */ -#define MIN_DELAY_TO_PS 0 +#define MIN_DELAY_TO_PS 0 /** Maximum delay to PS in milliseconds */ -#define MAX_DELAY_TO_PS 65535 +#define MAX_DELAY_TO_PS 65535 /** Delay to PS unchanged */ -#define DELAY_TO_PS_UNCHANGED (-1) +#define DELAY_TO_PS_UNCHANGED (-1) /** Default delay to PS in milliseconds */ -#define DELAY_TO_PS_DEFAULT 1000 +#define DELAY_TO_PS_DEFAULT 1000 /** PS mode: Unchanged */ -#define PS_MODE_UNCHANGED 0 +#define PS_MODE_UNCHANGED 0 /** PS mode: Auto */ -#define PS_MODE_AUTO 1 +#define PS_MODE_AUTO 1 /** PS mode: Poll */ -#define PS_MODE_POLL 2 +#define PS_MODE_POLL 2 /** PS mode: Null */ -#define PS_MODE_NULL 3 +#define PS_MODE_NULL 3 /** Type definition of mlan_ds_ps_cfg for MLAN_OID_PM_CFG_PS_CFG */ typedef struct _mlan_ds_ps_cfg { - /** PS null interval in seconds */ + /** PS null interval in seconds */ t_u32 ps_null_interval; - /** Multiple DTIM interval */ + /** Multiple DTIM interval */ t_u32 multiple_dtim_interval; - /** Listen interval */ + /** Listen interval */ t_u32 listen_interval; - /** Beacon miss timeout in milliseconds */ + /** Beacon miss timeout in milliseconds */ t_u32 bcn_miss_timeout; - /** Delay to PS in milliseconds */ + /** Delay to PS in milliseconds */ t_s32 delay_to_ps; - /** PS mode */ + /** 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 */ + /** Error */ t_u32 error; - /** Offset in microseconds */ + /** Offset in microseconds */ t_u32 offset; - /** Stable time in microseconds */ + /** Stable time in microseconds */ t_u32 stable_time; - /** Calibration control */ + /** Calibration control */ t_u32 cal_control; - /** External sleep clock */ + /** External sleep clock */ t_u32 ext_sleep_clk; - /** Reserved */ + /** Reserved */ t_u32 reserved; } mlan_ds_sleep_params, *pmlan_ds_sleep_params; /** sleep_param */ typedef struct _ps_sleep_param { - /** control bitmap */ + /** control bitmap */ t_u32 ctrl_bitmap; - /** minimum sleep period (micro second) */ + /** minimum sleep period (micro second) */ t_u32 min_sleep; - /** maximum sleep period (micro second) */ + /** maximum sleep period (micro second) */ t_u32 max_sleep; } ps_sleep_param; /** inactivity sleep_param */ typedef struct _inact_sleep_param { - /** inactivity timeout (micro second) */ + /** inactivity timeout (micro second) */ t_u32 inactivity_to; - /** miniumu awake period (micro second) */ + /** miniumu awake period (micro second) */ t_u32 min_awake; - /** maximum awake period (micro second) */ + /** maximum awake period (micro second) */ t_u32 max_awake; } inact_sleep_param; /** flag for ps mode */ -#define PS_FLAG_PS_MODE 1 +#define PS_FLAG_PS_MODE 1 /** flag for sleep param */ -#define PS_FLAG_SLEEP_PARAM 2 +#define PS_FLAG_SLEEP_PARAM 2 /** flag for inactivity sleep param */ -#define PS_FLAG_INACT_SLEEP_PARAM 4 +#define PS_FLAG_INACT_SLEEP_PARAM 4 /** Enable Robust Coex mode */ -#define ROBUSTCOEX_GPIOCFG_ENABLE 1 +#define ROBUSTCOEX_GPIOCFG_ENABLE 1 /** Disable Robust Coex mode */ -#define ROBUSTCOEX_GPIOCFG_DISABLE 0 +#define ROBUSTCOEX_GPIOCFG_DISABLE 0 /** Disable power mode */ -#define PS_MODE_DISABLE 0 +#define PS_MODE_DISABLE 0 /** Enable periodic dtim ps */ -#define PS_MODE_PERIODIC_DTIM 1 +#define PS_MODE_PERIODIC_DTIM 1 /** Enable inactivity ps */ -#define PS_MODE_INACTIVITY 2 +#define PS_MODE_INACTIVITY 2 /** FW wake up method interface */ -#define FW_WAKEUP_METHOD_INTERFACE 1 +#define FW_WAKEUP_METHOD_INTERFACE 1 /** FW wake up method gpio */ -#define FW_WAKEUP_METHOD_GPIO 2 +#define FW_WAKEUP_METHOD_GPIO 2 /** mlan_ds_ps_mgmt */ typedef struct _mlan_ds_ps_mgmt { - /** flags for valid field */ + /** flags for valid field */ t_u16 flags; - /** power mode */ + /** power mode */ t_u16 ps_mode; - /** sleep param */ + /** sleep param */ ps_sleep_param sleep_param; - /** inactivity sleep param */ + /** inactivity sleep param */ inact_sleep_param inact_param; } mlan_ds_ps_mgmt; /** mlan_ds_ps_info */ typedef struct _mlan_ds_ps_info { - /** suspend allowed flag */ + /** suspend allowed flag */ t_u32 is_suspend_allowed; } mlan_ds_ps_info; @@ -3110,45 +3116,46 @@ typedef struct _mlan_ds_hs_wakeup_reason { /** Type definition of mlan_ds_ps_cfg for MLAN_OID_PM_CFG_PS_CFG */ typedef struct _mlan_ds_bcn_timeout { - /** Beacon miss timeout period window */ + /** Beacon miss timeout period window */ t_u16 bcn_miss_tmo_window; - /** Beacon miss timeout period */ + /** Beacon miss timeout period */ t_u16 bcn_miss_tmo_period; - /** Beacon reacquire timeout period window */ + /** Beacon reacquire timeout period window */ t_u16 bcn_rq_tmo_window; - /** Beacon reacquire timeout period */ + /** Beacon reacquire timeout period */ t_u16 bcn_rq_tmo_period; } mlan_ds_bcn_timeout, *pmlan_ds_bcn_timeout; /** Type definition of mlan_ds_pm_cfg for MLAN_IOCTL_PM_CFG */ typedef struct _mlan_ds_pm_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** Power management parameter */ + /** Power management parameter */ union { - /** Power saving mode for MLAN_OID_PM_CFG_IEEE_PS */ + /** Power saving mode for MLAN_OID_PM_CFG_IEEE_PS */ t_u32 ps_mode; - /** Host Sleep configuration for MLAN_OID_PM_CFG_HS_CFG */ + /** 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 */ + /** 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 */ + /** Inactivity timeout for MLAN_OID_PM_CFG_INACTIVITY_TO */ mlan_ds_inactivity_to inactivity_to; - /** Sleep period for MLAN_OID_PM_CFG_SLEEP_PD */ + /** Sleep period for MLAN_OID_PM_CFG_SLEEP_PD */ t_u32 sleep_period; - /** PS configuration parameters for MLAN_OID_PM_CFG_PS_CFG */ + /** 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 */ + /** 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 */ + /** PS configuration parameters for MLAN_OID_PM_CFG_PS_MODE */ mlan_ds_ps_mgmt ps_mgmt; - /** power info for MLAN_OID_PM_INFO */ + /** power info for MLAN_OID_PM_INFO */ mlan_ds_ps_info ps_info; - /** hs wakeup reason for MLAN_OID_PM_HS_WAKEUP_REASON */ + /** hs wakeup reason for MLAN_OID_PM_HS_WAKEUP_REASON */ mlan_ds_hs_wakeup_reason wakeup_reason; - /** config manamgement frame for hs wakeup */ + /** config manamgement frame for hs wakeup */ mlan_mgmt_frame_wakeup mgmt_filter[MAX_MGMT_FRAME_FILTER]; - /** Beacon timout parameters for MLAN_OID_PM_CFG_BCN_TIMEOUT */ + /** Beacon timout parameters for MLAN_OID_PM_CFG_BCN_TIMEOUT */ mlan_ds_bcn_timeout bcn_timeout; } param; } mlan_ds_pm_cfg, *pmlan_ds_pm_cfg; @@ -3157,10 +3164,8 @@ typedef struct _mlan_ds_pm_cfg { typedef struct { mlan_cmd_result_e cmd_result; /**< Firmware execution result */ - t_u32 pkt_threshold; - /** Packet threshold */ - t_u16 delay; - /** Timeout value in milliseconds */ + t_u32 pkt_threshold; /** Packet threshold */ + t_u16 delay; /** Timeout value in milliseconds */ } wlan_ioctl_rx_pkt_coalesce_config_t; #endif @@ -3169,13 +3174,13 @@ typedef struct { /*-----------------------------------------------------------------*/ /** WMM TSpec size */ -#define MLAN_WMM_TSPEC_SIZE 63 +#define MLAN_WMM_TSPEC_SIZE 63 /** WMM Add TS extra IE bytes */ -#define MLAN_WMM_ADDTS_EXTRA_IE_BYTES 256 +#define MLAN_WMM_ADDTS_EXTRA_IE_BYTES 256 /** WMM statistics for packets hist bins */ -#define MLAN_WMM_STATS_PKTS_HIST_BINS 7 +#define MLAN_WMM_STATS_PKTS_HIST_BINS 7 /** Maximum number of AC QOS queues available */ -#define MLAN_WMM_MAX_AC_QUEUES 4 +#define MLAN_WMM_MAX_AC_QUEUES 4 /** * @brief IOCTL structure to send an ADDTS request and retrieve the response. @@ -3189,14 +3194,12 @@ typedef struct { typedef struct { 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; /** @@ -3208,12 +3211,10 @@ typedef struct { * @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; /** @@ -3227,10 +3228,10 @@ typedef struct { * @sa woal_wmm_queue_config_ioctl */ 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; /** @@ -3243,50 +3244,50 @@ typedef struct { * @sa woal_wmm_queue_stats_ioctl */ typedef struct { - /** Action of Queue Config : Start, Stop, or Get */ + /** Action of Queue Config : Start, Stop, or Get */ mlan_wmm_queue_stats_action_e action; - /** User Priority */ + /** User Priority */ t_u8 user_priority; - /** Number of successful packets transmitted */ + /** Number of successful packets transmitted */ t_u16 pkt_count; - /** Packets lost; not included in pkt_count */ + /** Packets lost; not included in pkt_count */ t_u16 pkt_loss; - /** Average Queue delay in microseconds */ + /** Average Queue delay in microseconds */ t_u32 avg_queue_delay; - /** Average Transmission delay in microseconds */ + /** Average Transmission delay in microseconds */ t_u32 avg_tx_delay; - /** Calculated used time in units of 32 microseconds */ + /** Calculated used time in units of 32 microseconds */ t_u16 used_time; - /** Calculated policed time in units of 32 microseconds */ + /** Calculated policed time in units of 32 microseconds */ t_u16 policed_time; - /** Queue Delay Histogram; number of packets per queue delay range - * - * [0] - 0ms <= delay < 5ms - * [1] - 5ms <= delay < 10ms - * [2] - 10ms <= delay < 20ms - * [3] - 20ms <= delay < 30ms - * [4] - 30ms <= delay < 40ms - * [5] - 40ms <= delay < 50ms - * [6] - 50ms <= delay < msduLifetime (TUs) - */ + /** Queue Delay Histogram; number of packets per queue delay range + * + * [0] - 0ms <= delay < 5ms + * [1] - 5ms <= delay < 10ms + * [2] - 10ms <= delay < 20ms + * [3] - 20ms <= delay < 30ms + * [4] - 30ms <= delay < 40ms + * [5] - 40ms <= delay < 50ms + * [6] - 50ms <= delay < msduLifetime (TUs) + */ 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; + /** 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; /** * @brief IOCTL sub structure for a specific WMM AC Status */ typedef struct { - /** WMM Acm */ + /** WMM Acm */ t_u8 wmm_acm; - /** Flow required flag */ + /** Flow required flag */ t_u8 flow_required; - /** Flow created flag */ + /** Flow created flag */ t_u8 flow_created; - /** Disabled flag */ + /** Disabled flag */ t_u8 disabled; } wlan_ioctl_wmm_queue_status_ac_t; @@ -3300,39 +3301,39 @@ typedef struct { * @sa woal_wmm_queue_status_ioctl */ typedef struct { - /** WMM AC queue status */ + /** WMM AC queue status */ 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; + /** 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; /** Type definition of mlan_ds_wmm_addts for MLAN_OID_WMM_CFG_ADDTS */ typedef struct _mlan_ds_wmm_addts { - /** Result of ADDTS request */ + /** Result of ADDTS request */ mlan_cmd_result_e result; - /** Timeout value in milliseconds */ + /** Timeout value in milliseconds */ t_u32 timeout; - /** IEEE status code */ + /** IEEE status code */ t_u32 status_code; - /** Dialog token */ + /** Dialog token */ t_u8 dialog_tok; - /** TSPEC data length */ + /** TSPEC data length */ t_u32 ie_data_len; - /** TSPEC to send in the ADDTS + buffering for any extra IEs */ + /** 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]; } 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 */ + /** Result of DELTS request */ mlan_cmd_result_e result; - /** IEEE status code */ + /** IEEE status code */ t_u32 status_code; - /** TSPEC data length */ + /** TSPEC data length */ t_u8 ie_data_len; - /** TSPEC to send in the DELTS */ + /** TSPEC to send in the DELTS */ t_u8 ie_data[MLAN_WMM_TSPEC_SIZE]; } mlan_ds_wmm_delts, *pmlan_ds_wmm_delts; @@ -3340,39 +3341,40 @@ typedef struct _mlan_ds_wmm_delts { * for MLAN_OID_WMM_CFG_QUEUE_CONFIG */ typedef struct _mlan_ds_wmm_queue_config { - /** Action of Queue Config : Set, Get, or Default */ + /** Action of Queue Config : Set, Get, or Default */ mlan_wmm_queue_config_action_e action; - /** WMM Access Category: WMM_AC_BK(0) to WMM_AC_VO(3) */ + /** WMM Access Category: WMM_AC_BK(0) to WMM_AC_VO(3) */ mlan_wmm_ac_e access_category; - /** Lifetime expiry in TUs */ + /** Lifetime expiry in TUs */ t_u16 msdu_lifetime_expiry; - /** Reserve for future use */ + /** Reserve for future use */ 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 */ + /** Sub-command */ t_u32 sub_command; - /** WMM configuration parameter */ + /** WMM configuration parameter */ union { - /** WMM enable for MLAN_OID_WMM_CFG_ENABLE */ + /** WMM enable for MLAN_OID_WMM_CFG_ENABLE */ t_u32 wmm_enable; - /** QoS configuration for MLAN_OID_WMM_CFG_QOS */ + /** QoS configuration for MLAN_OID_WMM_CFG_QOS */ t_u8 qos_cfg; - /** WMM add TS for MLAN_OID_WMM_CFG_ADDTS */ + /** WMM add TS for MLAN_OID_WMM_CFG_ADDTS */ mlan_ds_wmm_addts addts; - /** WMM delete TS for MLAN_OID_WMM_CFG_DELTS */ + /** WMM delete TS for MLAN_OID_WMM_CFG_DELTS */ mlan_ds_wmm_delts delts; - /** WMM queue configuration for MLAN_OID_WMM_CFG_QUEUE_CONFIG */ + /** WMM queue configuration for MLAN_OID_WMM_CFG_QUEUE_CONFIG */ mlan_ds_wmm_queue_config q_cfg; - /** AC Parameters Record WMM_AC_BE, WMM_AC_BK, WMM_AC_VI, WMM_AC_VO */ + /** 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 queue status for MLAN_OID_WMM_CFG_QUEUE_STATS */ + /** 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 */ + /** 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 */ + /** 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; @@ -3388,11 +3390,11 @@ enum _mlan_wps_status { /** Type definition of mlan_ds_wps_cfg for MLAN_IOCTL_WPS_CFG */ typedef struct _mlan_ds_wps_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** WPS configuration parameter */ + /** WPS configuration parameter */ union { - /** WPS session for MLAN_OID_WPS_CFG_SESSION */ + /** WPS session for MLAN_OID_WPS_CFG_SESSION */ t_u32 wps_session; } param; } mlan_ds_wps_cfg, *pmlan_ds_wps_cfg; @@ -3401,26 +3403,26 @@ typedef struct _mlan_ds_wps_cfg { /** 802.11n Configuration Group */ /*-----------------------------------------------------------------*/ /** Maximum MCS */ -#define NUM_MCS_FIELD 16 +#define NUM_MCS_FIELD 16 /** Supported stream modes */ -#define HT_STREAM_MODE_1X1 0x11 -#define HT_STREAM_MODE_2X2 0x22 +#define HT_STREAM_MODE_1X1 0x11 +#define HT_STREAM_MODE_2X2 0x22 /* Both 2.4G and 5G band selected */ -#define BAND_SELECT_BOTH 0 +#define BAND_SELECT_BOTH 0 /* Band 2.4G selected */ -#define BAND_SELECT_BG 1 +#define BAND_SELECT_BG 1 /* Band 5G selected */ -#define BAND_SELECT_A 2 +#define BAND_SELECT_A 2 /** Type definition of mlan_ds_11n_htcap_cfg for MLAN_OID_11N_HTCAP_CFG */ typedef struct _mlan_ds_11n_htcap_cfg { - /** HT Capability information */ + /** HT Capability information */ t_u32 htcap; - /** Band selection */ + /** Band selection */ t_u32 misc_cfg; - /** Hardware HT cap information required */ + /** Hardware HT cap information required */ t_u32 hw_cap_req; } mlan_ds_11n_htcap_cfg, *pmlan_ds_11n_htcap_cfg; @@ -3428,111 +3430,111 @@ typedef struct _mlan_ds_11n_htcap_cfg { * for MLAN_OID_11N_CFG_ADDBA_PARAM */ typedef struct _mlan_ds_11n_addba_param { - /** Timeout */ + /** Timeout */ t_u32 timeout; - /** Buffer size for ADDBA request */ + /** Buffer size for ADDBA request */ t_u32 txwinsize; - /** Buffer size for ADDBA response */ + /** Buffer size for ADDBA response */ t_u32 rxwinsize; - /** amsdu for ADDBA request */ + /** amsdu for ADDBA request */ t_u8 txamsdu; - /** amsdu for ADDBA response */ + /** amsdu for ADDBA response */ 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 */ + /** HTTxCap */ t_u16 httxcap; - /** HTTxInfo */ + /** HTTxInfo */ t_u16 httxinfo; - /** Band selection */ + /** Band selection */ t_u32 misc_cfg; } mlan_ds_11n_tx_cfg, *pmlan_ds_11n_tx_cfg; /** BF Global Configuration */ -#define BF_GLOBAL_CONFIGURATION 0x00 +#define BF_GLOBAL_CONFIGURATION 0x00 /** Performs NDP sounding for PEER specified */ -#define TRIGGER_SOUNDING_FOR_PEER 0x01 +#define TRIGGER_SOUNDING_FOR_PEER 0x01 /** TX BF interval for channel sounding */ -#define SET_GET_BF_PERIODICITY 0x02 +#define SET_GET_BF_PERIODICITY 0x02 /** Tell FW not to perform any sounding for peer */ -#define TX_BF_FOR_PEER_ENBL 0x03 +#define TX_BF_FOR_PEER_ENBL 0x03 /** TX BF SNR threshold for peer */ -#define SET_SNR_THR_PEER 0x04 +#define SET_SNR_THR_PEER 0x04 /** TX Sounding*/ -#define TX_SOUNDING_CFG 0x05 +#define TX_SOUNDING_CFG 0x05 /* Maximum number of peer MAC and status/SNR tuples */ -#define MAX_PEER_MAC_TUPLES 10 +#define MAX_PEER_MAC_TUPLES 10 /** Any new subcommand structure should be declare here */ /** bf global cfg args */ typedef struct _mlan_bf_global_cfg_args { - /** Global enable/disable bf */ + /** Global enable/disable bf */ t_u8 bf_enbl; - /** Global enable/disable sounding */ + /** Global enable/disable sounding */ t_u8 sounding_enbl; - /** FB Type */ + /** FB Type */ t_u8 fb_type; - /** SNR Threshold */ + /** SNR Threshold */ t_u8 snr_threshold; - /** Sounding interval in milliseconds */ + /** Sounding interval in milliseconds */ t_u16 sounding_interval; - /** BF mode */ + /** BF mode */ t_u8 bf_mode; - /** Reserved */ + /** Reserved */ t_u8 reserved; } mlan_bf_global_cfg_args; /** trigger sounding args */ typedef struct _mlan_trigger_sound_args { - /** Peer MAC address */ + /** Peer MAC address */ t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; - /** Status */ + /** Status */ t_u8 status; } mlan_trigger_sound_args; /** bf periodicity args */ typedef struct _mlan_bf_periodicity_args { - /** Peer MAC address */ + /** Peer MAC address */ t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; - /** Current Tx BF Interval in milliseconds */ + /** Current Tx BF Interval in milliseconds */ t_u16 interval; - /** Status */ + /** Status */ t_u8 status; } mlan_bf_periodicity_args; /** tx bf peer args */ typedef struct _mlan_tx_bf_peer_args { - /** Peer MAC address */ + /** Peer MAC address */ t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; - /** Reserved */ + /** Reserved */ t_u16 reserved; - /** Enable/Disable Beamforming */ + /** Enable/Disable Beamforming */ t_u8 bf_enbl; - /** Enable/Disable sounding */ + /** Enable/Disable sounding */ t_u8 sounding_enbl; - /** FB Type */ + /** FB Type */ t_u8 fb_type; } mlan_tx_bf_peer_args; /** SNR threshold args */ typedef struct _mlan_snr_thr_args { - /** Peer MAC address */ + /** Peer MAC address */ t_u8 peer_mac[MLAN_MAC_ADDR_LENGTH]; - /** SNR for peer */ + /** SNR for peer */ 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 */ + /** BF Action */ t_u16 bf_action; - /** Action */ + /** Action */ t_u16 action; - /** Number of peers */ + /** Number of peers */ t_u32 no_of_peers; union { mlan_bf_global_cfg_args bf_global_cfg; @@ -3546,9 +3548,9 @@ typedef struct _mlan_ds_11n_tx_bf_cfg { /** 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 */ + /** Enable/Disable */ t_u16 enable; - /** Current AMSDU size valid */ + /** Current AMSDU size valid */ t_u16 curr_buf_size; } mlan_ds_11n_amsdu_aggr_ctrl, *pmlan_ds_11n_amsdu_aggr_ctrl; @@ -3556,231 +3558,242 @@ typedef struct _mlan_ds_11n_amsdu_aggr_ctrl { * for MLAN_OID_11N_CFG_AGGR_PRIO_TBL */ typedef struct _mlan_ds_11n_aggr_prio_tbl { - /** ampdu priority table */ + /** ampdu priority table */ t_u8 ampdu[MAX_NUM_TID]; - /** amsdu priority table */ + /** amsdu priority table */ t_u8 amsdu[MAX_NUM_TID]; } mlan_ds_11n_aggr_prio_tbl, *pmlan_ds_11n_aggr_prio_tbl; /** DelBA All TIDs */ -#define DELBA_ALL_TIDS 0xff +#define DELBA_ALL_TIDS 0xff /** DelBA Tx */ -#define DELBA_TX MBIT(0) +#define DELBA_TX MBIT(0) /** DelBA Rx */ -#define DELBA_RX MBIT(1) +#define DELBA_RX MBIT(1) /** Type definition of mlan_ds_11n_delba for MLAN_OID_11N_CFG_DELBA */ typedef struct _mlan_ds_11n_delba { - /** TID */ + /** TID */ t_u8 tid; - /** Peer MAC address */ + /** Peer MAC address */ t_u8 peer_mac_addr[MLAN_MAC_ADDR_LENGTH]; - /** Direction (Tx: bit 0, Rx: bit 1) */ + /** Direction (Tx: bit 0, Rx: bit 1) */ 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 */ typedef struct _mlan_ds_reject_addba_req { - /** Bit0 : host sleep activated - * Bit1 : auto reconnect enabled - * Others : reserved - */ + /** Bit0 : host sleep activated + * Bit1 : auto reconnect enabled + * Others : reserved + */ t_u32 conditions; } mlan_ds_reject_addba_req, *pmlan_ds_reject_addba_req; /** Type definition of mlan_ds_ibss_ampdu_param */ typedef struct _mlan_ds_ibss_ampdu_param { - /** ampdu priority table */ + /** ampdu priority table */ t_u8 ampdu[MAX_NUM_TID]; - /** rx amdpdu setting */ + /** rx amdpdu setting */ t_u8 addba_reject[MAX_NUM_TID]; } mlan_ds_ibss_ampdu_param, *pmlan_ds_ibss_ampdu_param; /** Type definition of mlan_ds_11n_cfg for MLAN_IOCTL_11N_CFG */ typedef struct _mlan_ds_11n_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** 802.11n configuration parameter */ + /** 802.11n configuration parameter */ union { - /** Tx param for 11n for MLAN_OID_11N_CFG_TX */ + /** 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 */ + /** 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 */ + /** 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 */ + /** 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 */ + /** 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 */ + /** 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 */ + /** Tx param for 11n for MLAN_OID_11N_AMSDU_AGGR_CTRL */ mlan_ds_11n_amsdu_aggr_ctrl amsdu_aggr_ctrl; - /** Supported MCS Set field */ + /** Supported MCS Set field */ t_u8 supported_mcs_set[NUM_MCS_FIELD]; - /** Transmit Beamforming Capabilities field */ + /** Transmit Beamforming Capabilities field */ t_u32 tx_bf_cap; - /** Transmit Beamforming configuration */ + /** Transmit Beamforming configuration */ mlan_ds_11n_tx_bf_cfg tx_bf; - /** HT stream configuration */ + /** HT stream configuration */ t_u32 stream_cfg; - /** DelBA for MLAN_OID_11N_CFG_DELBA */ + /** DelBA for MLAN_OID_11N_CFG_DELBA */ mlan_ds_11n_delba del_ba; - /** Reject Addba Req for MLAN_OID_11N_CFG_REJECT_ADDBA_REQ */ + /** Reject Addba Req for MLAN_OID_11N_CFG_REJECT_ADDBA_REQ */ mlan_ds_reject_addba_req reject_addba_req; - /** Control coex RX window size configuration */ + /** Control coex RX window size configuration */ t_u32 coex_rx_winsize; - /** aggrprirotity table for MLAN_OID_11N_CFG_IBSS_AMPDU_PARAM */ + /** aggrprirotity table for MLAN_OID_11N_CFG_IBSS_AMPDU_PARAM */ mlan_ds_ibss_ampdu_param ibss_ampdu; - /** Minimum BA Threshold for MLAN_OID_11N_CFG_MIN_BA_THRESHOLD */ + /** Minimum BA Threshold for MLAN_OID_11N_CFG_MIN_BA_THRESHOLD + */ t_u8 min_ba_threshold; } param; } mlan_ds_11n_cfg, *pmlan_ds_11n_cfg; -#define NUM_MCS_SUPP 20 -#define VHT_MCS_SET_LEN 8 +#define NUM_MCS_SUPP 20 +#define VHT_MCS_SET_LEN 8 /** Type definition of mlan_ds_11ac_vhtcap_cfg for MLAN_OID_11AC_VHTCAP_CFG */ typedef struct _mlan_ds_11ac_vhtcap_cfg { - /** HT Capability information */ + /** HT Capability information */ t_u32 vhtcap; - /** Band selection */ + /** Band selection */ t_u32 misc_cfg; - /** Hardware HT cap information required */ + /** Hardware HT cap information required */ 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 */ + /** Band selection */ t_u8 band_cfg; - /** misc configuration */ + /** misc configuration */ t_u8 misc_cfg; - /** HTTxCap */ + /** HTTxCap */ t_u16 vhttxcap; - /** HTTxInfo */ + /** HTTxInfo */ t_u16 vhttxinfo; } mlan_ds_11ac_tx_cfg, *pmlan_ds_11ac_tx_cfg; /** Tx */ -#define MLAN_RADIO_TX MBIT(0) +#define MLAN_RADIO_TX MBIT(0) /** Rx */ -#define MLAN_RADIO_RX MBIT(1) +#define MLAN_RADIO_RX MBIT(1) /** Tx & Rx */ -#define MLAN_RADIO_TXRX (MLAN_RADIO_TX | MLAN_RADIO_RX) +#define MLAN_RADIO_TXRX (MLAN_RADIO_TX | MLAN_RADIO_RX) /** Type definition of mlan_ds_11ac_tx_cfg for MLAN_OID_11AC_CFG */ typedef struct _mlan_ds_11ac_vht_cfg { - /** Band selection (1: 2.4G, 2: 5 G, 3: both 2.4G and 5G) */ + /** Band selection (1: 2.4G, 2: 5 G, 3: both 2.4G and 5G) */ t_u32 band; - /** TxRx (1: Tx, 2: Rx, 3: both Tx and Rx) */ + /** TxRx (1: Tx, 2: Rx, 3: both Tx and Rx) */ t_u32 txrx; - /** BW CFG (0: 11N CFG, 1: vhtcap) */ + /** BW CFG (0: 11N CFG, 1: vhtcap) */ t_u32 bwcfg; - /** VHT capabilities. */ + /** VHT capabilities. */ t_u32 vht_cap_info; - /** VHT Tx mcs */ + /** VHT Tx mcs */ t_u32 vht_tx_mcs; - /** VHT Rx mcs */ + /** VHT Rx mcs */ t_u32 vht_rx_mcs; - /** VHT rx max rate */ + /** VHT rx max rate */ t_u16 vht_rx_max_rate; - /** VHT max tx rate */ + /** VHT max tx rate */ t_u16 vht_tx_max_rate; - /** Skip usr 11ac mcs cfg */ + /** Skip usr 11ac mcs cfg */ t_bool skip_usr_11ac_mcs_cfg; } mlan_ds_11ac_vht_cfg, *pmlan_ds_11ac_vht_cfg; /** Type definition of mlan_ds_11ac_tx_cfg for MLAN_OID_11AC_CFG */ typedef struct _mlan_ds_11ac_opermode_cfg { - /** channel width: 1-20MHz, 2-40MHz, 3-80MHz, 4-160MHz or 80+80MHz */ + /** channel width: 1-20MHz, 2-40MHz, 3-80MHz, 4-160MHz or 80+80MHz */ t_u8 bw; - /** Rx NSS */ + /** Rx NSS */ t_u8 nss; } mlan_ds_11ac_opermode_cfg, *pmlan_ds_11ac_opermode_cfg; /** Type definition of mlan_ds_11ac_cfg for MLAN_IOCTL_11AC_CFG */ typedef struct _mlan_ds_11ac_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** 802.11n configuration parameter */ + /** 802.11n configuration parameter */ union { - /** VHT configuration for MLAN_OID_11AC_VHT_CFG */ + /** VHT configuration for MLAN_OID_11AC_VHT_CFG */ mlan_ds_11ac_vht_cfg vht_cfg; - /** Supported MCS Set field */ + /** Supported MCS Set field */ t_u8 supported_mcs_set[NUM_MCS_SUPP]; - /** Oper mode configuration for MLAN_OID_11AC_OPERMODE_CFG */ + /** Oper mode configuration for MLAN_OID_11AC_OPERMODE_CFG */ mlan_ds_11ac_opermode_cfg opermode_cfg; } param; } mlan_ds_11ac_cfg, *pmlan_ds_11ac_cfg; /** Type definition of mlan_ds_11ax_he_capa for MLAN_OID_11AX_HE_CFG */ typedef MLAN_PACK_START struct _mlan_ds_11ax_he_capa { - /** tlv id of he capability */ + /** tlv id of he capability */ t_u16 id; - /** length of the payload */ + /** length of the payload */ t_u16 len; - /** extension id */ + /** extension id */ t_u8 ext_id; - /** he mac capability info */ + /** he mac capability info */ t_u8 he_mac_cap[6]; - /** he phy capability info */ + /** he phy capability info */ t_u8 he_phy_cap[11]; - /** he txrx mcs support for 80MHz */ + /** he txrx mcs support for 80MHz */ t_u8 he_txrx_mcs_support[4]; - /** val for txrx mcs 160Mhz or 80+80, and PPE thresholds */ + /** val for txrx mcs 160Mhz or 80+80, and PPE thresholds */ t_u8 val[28]; } MLAN_PACK_END mlan_ds_11ax_he_capa, *pmlan_ds_11ax_he_capa; /** Type definition of mlan_ds_11ax_he_cfg for MLAN_OID_11AX_HE_CFG */ typedef struct _mlan_ds_11ax_he_cfg { - /** band, BIT0:2.4G, BIT1:5G*/ + /** band, BIT0:2.4G, BIT1:5G*/ t_u8 band; - /** mlan_ds_11ax_he_capa */ + /** mlan_ds_11ax_he_capa */ mlan_ds_11ax_he_capa he_cap; } mlan_ds_11ax_he_cfg, *pmlan_ds_11ax_he_cfg; /** Type definition of mlan_ds_11as_cfg for MLAN_IOCTL_11AX_CFG */ typedef struct _mlan_ds_11ax_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** 802.11n configuration parameter */ + /** 802.11n configuration parameter */ union { - /** HE configuration for MLAN_OID_11AX_HE_CFG */ + /** HE configuration for MLAN_OID_11AX_HE_CFG */ mlan_ds_11ax_he_cfg he_cfg; } param; } mlan_ds_11ax_cfg, *pmlan_ds_11ax_cfg; -#define MLAN_11AXCMD_CFG_ID_SR_OBSS_PD_OFFSET 1 -#define MLAN_11AXCMD_CFG_ID_SR_ENABLE 2 -#define MLAN_11AXCMD_CFG_ID_BEAM_CHANGE 3 -#define MLAN_11AXCMD_CFG_ID_HTC_ENABLE 4 +#define MLAN_11AXCMD_CFG_ID_SR_OBSS_PD_OFFSET 1 +#define MLAN_11AXCMD_CFG_ID_SR_ENABLE 2 +#define MLAN_11AXCMD_CFG_ID_BEAM_CHANGE 3 +#define MLAN_11AXCMD_CFG_ID_HTC_ENABLE 4 +#define MLAN_11AXCMD_CFG_ID_TXOP_RTS 5 +#define MLAN_11AXCMD_CFG_ID_TX_OMI 6 +#define MLAN_11AXCMD_CFG_ID_OBSSNBRU_TOLTIME 7 -#define MLAN_11AXCMD_SR_SUBID 0x102 -#define MLAN_11AXCMD_BEAM_SUBID 0x103 -#define MLAN_11AXCMD_HTC_SUBID 0x104 +#define MLAN_11AXCMD_SR_SUBID 0x102 +#define MLAN_11AXCMD_BEAM_SUBID 0x103 +#define MLAN_11AXCMD_HTC_SUBID 0x104 +#define MLAN_11AXCMD_TXOMI_SUBID 0x105 +#define MLAN_11AXCMD_OBSS_TOLTIME_SUBID 0x106 +#define MLAN_11AXCMD_TXOPRTS_SUBID 0x108 -#define MRVL_DOT11AX_ENABLE_SR_TLV_ID (PROPRIETARY_TLV_BASE_ID + 322) -#define MRVL_DOT11AX_OBSS_PD_OFFSET_TLV_ID (PROPRIETARY_TLV_BASE_ID + 323) +#define MLAN_11AX_TWT_SETUP_SUBID 0x114 +#define MLAN_11AX_TWT_TEARDOWN_SUBID 0x115 -/** Type definition of mlan_11axcmdcfg_obss_pd_offset for MLAN_OID_11AX_CMD_CFG */ +#define MRVL_DOT11AX_ENABLE_SR_TLV_ID (PROPRIETARY_TLV_BASE_ID + 322) +#define MRVL_DOT11AX_OBSS_PD_OFFSET_TLV_ID (PROPRIETARY_TLV_BASE_ID + 323) + +/** Type definition of mlan_11axcmdcfg_obss_pd_offset for MLAN_OID_11AX_CMD_CFG + */ typedef struct MLAN_PACK_START _mlan_11axcmdcfg_obss_pd_offset { - /** */ + /** */ t_u8 offset[2]; } MLAN_PACK_END mlan_11axcmdcfg_obss_pd_offset; /** Type definition of mlan_11axcmdcfg_sr_control for MLAN_OID_11AX_CMD_CFG */ typedef struct MLAN_PACK_START _mlan_11axcmdcfg_sr_control { - /** 1 enable, 0 disable */ + /** 1 enable, 0 disable */ t_u8 control; } MLAN_PACK_END mlan_11axcmdcfg_sr_control; /** Type definition of mlan_ds_11ax_sr_cmd for MLAN_OID_11AX_CMD_CFG */ typedef struct MLAN_PACK_START _mlan_ds_11ax_sr_cmd { - /** type*/ + /** type*/ t_u16 type; - /** length of TLV */ + /** length of TLV */ t_u16 len; - /** value */ + /** value */ union { mlan_11axcmdcfg_obss_pd_offset obss_pd_offset; mlan_11axcmdcfg_sr_control sr_control; @@ -3789,80 +3802,162 @@ typedef struct MLAN_PACK_START _mlan_ds_11ax_sr_cmd { /** Type definition of mlan_ds_11ax_beam_cmd for MLAN_OID_11AX_CMD_CFG */ typedef struct _mlan_ds_11ax_beam_cmd { - /** command value: 1 is disable, 0 is enable*/ + /** command value: 1 is disable, 0 is enable*/ t_u8 value; } mlan_ds_11ax_beam_cmd, *pmlan_ds_11ax_beam_cmd; /** Type definition of mlan_ds_11ax_htc_cmd for MLAN_OID_11AX_CMD_CFG */ typedef struct _mlan_ds_11ax_htc_cmd { - /** command value: 1 is enable, 0 is disable*/ + /** command value: 1 is enable, 0 is disable*/ t_u8 value; } mlan_ds_11ax_htc_cmd, *pmlan_ds_11ax_htc_cmd; +/** Type definition of mlan_ds_11ax_htc_cmd for MLAN_OID_11AX_CMD_CFG */ +typedef struct _mlan_ds_11ax_txop_cmd { + /** Two byte rts threshold value of which only 10 bits, bit 0 to bit 9 + * are valid */ + t_u16 rts_thres; +} mlan_ds_11ax_txop_cmd, *pmlan_ds_11ax_txop_cmd; + +/** Type definition of mlan_ds_11ax_htc_cmd for MLAN_OID_11AX_CMD_CFG */ +typedef struct _mlan_ds_11ax_txomi_cmd { + /* 11ax spec 9.2.4.6a.2 OM Control 12 bits. Bit 0 to bit 11 */ + t_u16 omi; +} mlan_ds_11ax_txomi_cmd, *pmlan_ds_11ax_txomi_cmd; + +/** Type definition of mlan_ds_11ax_toltime_cmd for MLAN_OID_11AX_CMD_CFG */ +typedef struct _mlan_ds_11ax_toltime_cmd { + /* OBSS Narrow Bandwidth RU Tolerance Time */ + t_u32 tol_time; +} mlan_ds_11ax_toltime_cmd, *pmlan_ds_11ax_toltime_cmd; + /** Type definition of mlan_ds_11ax_cmd_cfg for MLAN_OID_11AX_CMD_CFG */ typedef struct _mlan_ds_11ax_cmd_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** Sub-id */ + /** Sub-id */ t_u32 sub_id; - /** 802.11n configuration parameter */ + /** 802.11n configuration parameter */ union { - /** SR configuration for MLAN_11AXCMD_SR_SUBID */ + /** SR configuration for MLAN_11AXCMD_SR_SUBID */ mlan_ds_11ax_sr_cmd sr_cfg; - /** Beam configuration for MLAN_11AXCMD_BEAM_SUBID */ + /** Beam configuration for MLAN_11AXCMD_BEAM_SUBID */ mlan_ds_11ax_beam_cmd beam_cfg; - /** HTC configuration for MLAN_11AXCMD_HTC_SUBID */ + /** HTC configuration for MLAN_11AXCMD_HTC_SUBID */ mlan_ds_11ax_htc_cmd htc_cfg; + /** txop RTS configuration for MLAN_11AXCMD_TXOPRTS_SUBID */ + mlan_ds_11ax_txop_cmd txop_cfg; + /** tx omi configuration for MLAN_11AXCMD_TXOMI_SUBID */ + mlan_ds_11ax_txomi_cmd txomi_cfg; + /** OBSS tolerance time configuration for + * MLAN_11AXCMD_TOLTIME_SUBID */ + mlan_ds_11ax_toltime_cmd toltime_cfg; } param; } mlan_ds_11ax_cmd_cfg, *pmlan_ds_11ax_cmd_cfg; +/** Type definition of mlan_ds_twt_setup for MLAN_OID_11AX_TWT_CFG */ +typedef struct MLAN_PACK_START _mlan_ds_twt_setup { + /** Implicit, 0: TWT session is explicit, 1: Session is implicit */ + t_u8 implicit; + /** Announced, 0: Unannounced, 1: Announced TWT */ + t_u8 announced; + /** Trigger Enabled, 0: Non-Trigger enabled, 1: Trigger enabled TWT */ + t_u8 trigger_enabled; + /** TWT Information Disabled, 0: TWT info enabled, 1: TWT info disabled + */ + t_u8 twt_info_disabled; + /** Negotiation Type, 0: Future Individual TWT SP start time, 1: Next + * Wake TBTT time */ + t_u8 negotiation_type; + /** TWT Wakeup Duration, time after which the TWT requesting STA can + * transition to doze state */ + t_u8 twt_wakeup_duration; + /** Flow Identifier. Range: [0-7]*/ + t_u8 flow_identifier; + /** Hard Constraint, 0: FW can tweak the TWT setup parameters if it is + *rejected by AP. + ** 1: Firmware should not tweak any parameters. */ + t_u8 hard_constraint; + /** TWT Exponent, Range: [0-63] */ + t_u8 twt_exponent; + /** TWT Mantissa Range: [0-sizeof(UINT16)] */ + t_u16 twt_mantissa; +} MLAN_PACK_END mlan_ds_twt_setup, *pmlan_ds_twt_setup; + +/** Type definition of mlan_ds_twt_teardown for MLAN_OID_11AX_TWT_CFG */ +typedef struct MLAN_PACK_START _mlan_ds_twt_teardown { + /** TWT Flow Identifier. Range: [0-7] */ + t_u8 flow_identifier; + /** Negotiation Type. 0: Future Individual TWT SP start time, 1: Next + * Wake TBTT time */ + t_u8 negotiation_type; + /** Tear down all TWT. 1: To teardown all TWT, 0 otherwise */ + t_u8 teardown_all_twt; +} MLAN_PACK_END mlan_ds_twt_teardown, *pmlan_ds_twt_teardown; + +/** Type definition of mlan_ds_twtcfg for MLAN_OID_11AX_TWT_CFG */ +typedef struct MLAN_PACK_START _mlan_ds_twtcfg { + /** Sub-command */ + t_u32 sub_command; + /** Sub-id */ + t_u32 sub_id; + /** TWT Setup/Teardown configuration parameter */ + union { + /** TWT Setup config for Sub ID: MLAN_11AX_TWT_SETUP_SUBID */ + mlan_ds_twt_setup twt_setup; + /** TWT Teardown config for Sub ID: MLAN_11AX_TWT_TEARDOWN_SUBID + */ + mlan_ds_twt_teardown twt_teardown; + } param; +} MLAN_PACK_END mlan_ds_twtcfg, *pmlan_ds_twtcfg; + /** Country code length */ -#define COUNTRY_CODE_LEN 3 +#define COUNTRY_CODE_LEN 3 /*-----------------------------------------------------------------*/ /** 802.11d Configuration Group */ /*-----------------------------------------------------------------*/ /** Maximum subbands for 11d */ -#define MRVDRV_MAX_SUBBAND_802_11D 83 +#define MRVDRV_MAX_SUBBAND_802_11D 83 /** Data structure for subband set */ typedef struct _mlan_ds_subband_set_t { - /** First channel */ + /** First channel */ t_u8 first_chan; - /** Number of channels */ + /** Number of channels */ t_u8 no_of_chan; - /** Maximum Tx power in dBm */ + /** Maximum Tx power in dBm */ t_u8 max_tx_pwr; } mlan_ds_subband_set_t; /** Domain regulatory information */ typedef struct _mlan_ds_11d_domain_info { - /** Country Code */ + /** Country Code */ t_u8 country_code[COUNTRY_CODE_LEN]; - /** Band that channels in sub_band belong to */ + /** Band that channels in sub_band belong to */ t_u8 band; - /** No. of subband in below */ + /** No. of subband in below */ t_u8 no_of_sub_band; - /** Subband data to send/last sent */ + /** Subband data to send/last sent */ mlan_ds_subband_set_t sub_band[MRVDRV_MAX_SUBBAND_802_11D]; } mlan_ds_11d_domain_info; /** Type definition of mlan_ds_11d_cfg for MLAN_IOCTL_11D_CFG */ typedef struct _mlan_ds_11d_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** 802.11d configuration parameter */ + /** 802.11d configuration parameter */ union { #ifdef STA_SUPPORT - /** Enable for MLAN_OID_11D_CFG_ENABLE */ + /** Enable for MLAN_OID_11D_CFG_ENABLE */ t_u32 enable_11d; -#endif /* STA_SUPPORT */ - /** Domain info for MLAN_OID_11D_DOMAIN_INFO_EXT */ +#endif /* STA_SUPPORT */ + /** Domain info for MLAN_OID_11D_DOMAIN_INFO_EXT */ mlan_ds_11d_domain_info domain_info; #ifdef UAP_SUPPORT - /** tlv data for MLAN_OID_11D_DOMAIN_INFO */ + /** tlv data for MLAN_OID_11D_DOMAIN_INFO */ t_u8 domain_tlv[MAX_IE_SIZE]; -#endif /* UAP_SUPPORT */ +#endif /* UAP_SUPPORT */ } param; } mlan_ds_11d_cfg, *pmlan_ds_11d_cfg; @@ -3882,7 +3977,8 @@ enum _mlan_reg_type { MLAN_REG_RF, MLAN_REG_CAU = 5, MLAN_REG_PSU = 6, -#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || defined(PCIE9097) || defined(USB9097) || defined(SD9097) +#if defined(PCIE9098) || defined(SD9098) || defined(USB9098) || \ + defined(PCIE9097) || defined(USB9097) || defined(SD9097) MLAN_REG_MAC2 = 0x81, MLAN_REG_BBP2 = 0x82, MLAN_REG_RF2 = 0x83 @@ -3891,11 +3987,11 @@ enum _mlan_reg_type { /** Type definition of mlan_ds_reg_rw for MLAN_OID_REG_RW */ typedef struct _mlan_ds_reg_rw { - /** Register type */ + /** Register type */ t_u32 type; - /** Offset */ + /** Offset */ t_u32 offset; - /** Value */ + /** Value */ t_u32 value; } mlan_ds_reg_rw; @@ -3904,33 +4000,33 @@ typedef struct _mlan_ds_reg_rw { /** Type definition of mlan_ds_read_eeprom for MLAN_OID_EEPROM_RD */ typedef struct _mlan_ds_read_eeprom { - /** Multiples of 4 */ + /** Multiples of 4 */ t_u16 offset; - /** Number of bytes */ + /** Number of bytes */ t_u16 byte_count; - /** Value */ + /** Value */ 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 */ + /** Address */ t_u32 addr; - /** Value */ + /** 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 */ + /** Sub-command */ t_u32 sub_command; - /** Register memory access parameter */ + /** Register memory access parameter */ union { - /** Register access for MLAN_OID_REG_RW */ + /** Register access for MLAN_OID_REG_RW */ mlan_ds_reg_rw reg_rw; - /** EEPROM access for MLAN_OID_EEPROM_RD */ + /** EEPROM access for MLAN_OID_EEPROM_RD */ mlan_ds_read_eeprom rd_eeprom; - /** Memory access for MLAN_OID_MEM_RW */ + /** Memory access for MLAN_OID_MEM_RW */ mlan_ds_mem_rw mem_rw; } param; } mlan_ds_reg_mem, *pmlan_ds_reg_mem; @@ -3943,25 +4039,26 @@ typedef struct _mlan_ds_reg_mem { /*-----------------------------------------------------------------*/ /** Type definition of mlan_ds_11h_dfs_testing for MLAN_OID_11H_DFS_TESTING */ typedef struct _mlan_ds_11h_dfs_testing { - /** User-configured CAC period in milliseconds, 0 to use default */ + /** User-configured CAC period in milliseconds, 0 to use default */ t_u32 usr_cac_period_msec; - /** User-configured NOP period in seconds, 0 to use default */ + /** User-configured NOP period in seconds, 0 to use default */ t_u16 usr_nop_period_sec; - /** User-configured skip channel change, 0 to disable */ + /** User-configured skip channel change, 0 to disable */ t_u8 usr_no_chan_change; - /** User-configured fixed channel to change to, 0 to use random channel */ + /** User-configured fixed channel to change to, 0 to use random channel + */ t_u8 usr_fixed_new_chan; } mlan_ds_11h_dfs_testing, *pmlan_ds_11h_dfs_testing; /** Type definition of mlan_ds_11h_dfs_testing for MLAN_OID_11H_CHAN_NOP_INFO */ typedef struct _mlan_ds_11h_chan_nop_info { - /** current channel */ + /** current channel */ t_u8 curr_chan; - /** channel_width */ + /** channel_width */ t_u8 chan_width; - /** flag for chan under nop */ + /** flag for chan under nop */ t_bool chan_under_nop; - /** chan_ban_info for new channel */ + /** chan_ban_info for new channel */ chan_band_info new_chan; } mlan_ds_11h_chan_nop_info; @@ -3969,26 +4066,32 @@ typedef struct _mlan_ds_11h_chan_rep_req { t_u16 startFreq; Band_Config_t bandcfg; t_u8 chanNum; - t_u32 millisec_dwell_time; - /**< Channel dwell time in milliseconds */ + t_u32 millisec_dwell_time; /**< Channel dwell time in milliseconds */ t_u8 host_based; } mlan_ds_11h_chan_rep_req; +typedef struct _mlan_ds_11h_dfs_w53_cfg { + /** dfs w53 cfg */ + t_u8 dfs53cfg; +} mlan_ds_11h_dfs_w53_cfg; + /** Type definition of mlan_ds_11h_cfg for MLAN_IOCTL_11H_CFG */ typedef struct _mlan_ds_11h_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; union { - /** Local power constraint for MLAN_OID_11H_LOCAL_POWER_CONSTRAINT */ + /** Local power constraint for + * MLAN_OID_11H_LOCAL_POWER_CONSTRAINT */ t_s8 usr_local_power_constraint; - /** User-configuation for MLAN_OID_11H_DFS_TESTING */ + /** User-configuation for MLAN_OID_11H_DFS_TESTING */ mlan_ds_11h_dfs_testing dfs_testing; - /** channel NOP information for MLAN_OID_11H_CHAN_NOP_INFO */ + /** channel NOP information for MLAN_OID_11H_CHAN_NOP_INFO */ mlan_ds_11h_chan_nop_info ch_nop_info; - /** channel report req for MLAN_OID_11H_CHAN_REPORT_REQUEST */ + /** channel report req for MLAN_OID_11H_CHAN_REPORT_REQUEST */ mlan_ds_11h_chan_rep_req chan_rpt_req; - /** channel switch count for MLAN_OID_11H_CHAN_SWITCH_COUNT*/ + /** channel switch count for MLAN_OID_11H_CHAN_SWITCH_COUNT*/ t_s8 cs_count; + mlan_ds_11h_dfs_w53_cfg dfs_w53_cfg; } param; } mlan_ds_11h_cfg, *pmlan_ds_11h_cfg; @@ -4000,9 +4103,9 @@ typedef struct _mlan_ds_11h_cfg { #define MLAN_SIZE_OF_CMD_BUFFER (3 * 1024) /** LDO Internal */ -#define LDO_INTERNAL 0 +#define LDO_INTERNAL 0 /** LDO External */ -#define LDO_EXTERNAL 1 +#define LDO_EXTERNAL 1 /** Enumeration for IE type */ enum _mlan_ie_type { @@ -4011,11 +4114,11 @@ enum _mlan_ie_type { /** Type definition of mlan_ds_misc_gen_ie for MLAN_OID_MISC_GEN_IE */ typedef struct _mlan_ds_misc_gen_ie { - /** IE type */ + /** IE type */ t_u32 type; - /** IE length */ + /** IE length */ t_u32 len; - /** IE buffer */ + /** IE buffer */ t_u8 ie_data[MAX_IE_SIZE]; } mlan_ds_misc_gen_ie; @@ -4024,46 +4127,46 @@ typedef struct _mlan_ds_misc_gen_ie { * for MLAN_OID_MISC_SDIO_MPA_CTRL */ typedef struct _mlan_ds_misc_sdio_mpa_ctrl { - /** SDIO MP-A TX enable/disable */ + /** SDIO MP-A TX enable/disable */ t_u16 tx_enable; - /** SDIO MP-A RX enable/disable */ + /** SDIO MP-A RX enable/disable */ t_u16 rx_enable; - /** SDIO MP-A TX buf size */ + /** SDIO MP-A TX buf size */ t_u16 tx_buf_size; - /** SDIO MP-A RX buf size */ + /** SDIO MP-A RX buf size */ t_u16 rx_buf_size; - /** SDIO MP-A TX Max Ports */ + /** SDIO MP-A TX Max Ports */ t_u16 tx_max_ports; - /** SDIO MP-A RX Max Ports */ + /** SDIO MP-A RX Max Ports */ t_u16 rx_max_ports; } mlan_ds_misc_sdio_mpa_ctrl; #endif /** Type definition of mlan_ds_misc_cmd for MLAN_OID_MISC_HOST_CMD */ typedef struct _mlan_ds_misc_cmd { - /** Command length */ + /** Command length */ t_u32 len; - /** Command buffer */ + /** Command buffer */ t_u8 cmd[MLAN_SIZE_OF_CMD_BUFFER]; } mlan_ds_misc_cmd; /** Maximum number of system clocks */ -#define MLAN_MAX_CLK_NUM 16 +#define MLAN_MAX_CLK_NUM 16 /** Clock type : Configurable */ -#define MLAN_CLK_CONFIGURABLE 0 +#define MLAN_CLK_CONFIGURABLE 0 /** Clock type : Supported */ -#define MLAN_CLK_SUPPORTED 1 +#define MLAN_CLK_SUPPORTED 1 /** Type definition of mlan_ds_misc_sys_clock for MLAN_OID_MISC_SYS_CLOCK */ typedef struct _mlan_ds_misc_sys_clock { - /** Current system clock */ + /** Current system clock */ t_u16 cur_sys_clk; - /** Clock type */ + /** Clock type */ t_u16 sys_clk_type; - /** Number of clocks */ + /** Number of clocks */ t_u16 sys_clk_num; - /** System clocks */ + /** System clocks */ t_u16 sys_clk[MLAN_MAX_CLK_NUM]; } mlan_ds_misc_sys_clock; @@ -4077,9 +4180,9 @@ enum _mlan_func_cmd { * for MLAN_OID_MISC_TX_DATAPAUSE */ typedef struct _mlan_ds_misc_tx_datapause { - /** Tx data pause flag */ + /** Tx data pause flag */ t_u16 tx_pause; - /** Max number of Tx buffers for all PS clients */ + /** Max number of Tx buffers for all PS clients */ t_u16 tx_buf_cnt; } mlan_ds_misc_tx_datapause; @@ -4087,9 +4190,9 @@ typedef struct _mlan_ds_misc_tx_datapause { * for MLAN_OID_MISC_RX_ABORT_CFG */ typedef struct _mlan_ds_misc_rx_abort_cfg { - /** enable/disable rx abort */ + /** enable/disable rx abort */ t_u8 enable; - /** Rx weak RSSI pkt threshold */ + /** Rx weak RSSI pkt threshold */ t_s8 rssi_threshold; } mlan_ds_misc_rx_abort_cfg; @@ -4097,11 +4200,11 @@ typedef struct _mlan_ds_misc_rx_abort_cfg { * for MLAN_OID_MISC_RX_ABORT_CFG_EXT */ typedef struct _mlan_ds_misc_rx_abort_cfg_ext { - /** enable/disable dynamic rx abort */ + /** enable/disable dynamic rx abort */ t_u8 enable; - /** rssi margin */ + /** rssi margin */ t_s8 rssi_margin; - /** specify ceil rssi threshold */ + /** specify ceil rssi threshold */ t_s8 ceil_rssi_threshold; } mlan_ds_misc_rx_abort_cfg_ext; @@ -4109,7 +4212,7 @@ typedef struct _mlan_ds_misc_rx_abort_cfg_ext { * for MLAN_OID_MISC_TX_AMDPU_PROT_MODE */ typedef struct _mlan_ds_misc_tx_ampdu_prot_mode { - /** set prot mode */ + /** set prot mode */ t_u16 mode; } mlan_ds_misc_tx_ampdu_prot_mode; @@ -4120,13 +4223,13 @@ typedef struct _mlan_ds_misc_tx_ampdu_prot_mode { * for MLAN_OID_MISC_RATE_ADAPT_CFG */ typedef struct _mlan_ds_misc_rate_adapt_cfg { - /** SR Rateadapt */ + /** SR Rateadapt */ t_u8 sr_rateadapt; - /** set low threshold */ + /** set low threshold */ t_u8 ra_low_thresh; - /** set high threshold */ + /** set high threshold */ t_u8 ra_high_thresh; - /** set interval */ + /** set interval */ t_u16 ra_interval; } mlan_ds_misc_rate_adapt_cfg; @@ -4134,68 +4237,68 @@ typedef struct _mlan_ds_misc_rate_adapt_cfg { * for MLAN_OID_MISC_CCK_DESENSE_CFG */ typedef struct _mlan_ds_misc_cck_desense_cfg { - /** cck desense mode: 0:disable 1:normal 2:dynamic */ + /** cck desense mode: 0:disable 1:normal 2:dynamic */ t_u16 mode; - /** specify rssi margin */ + /** specify rssi margin */ t_s8 margin; - /** specify ceil rssi threshold */ + /** specify ceil rssi threshold */ t_s8 ceil_thresh; - /** cck desense "on" interval count */ + /** cck desense "on" interval count */ t_u8 num_on_intervals; - /** cck desense "off" interval count */ + /** cck desense "off" interval count */ t_u8 num_off_intervals; } mlan_ds_misc_cck_desense_cfg; /** IP address length */ -#define IPADDR_LEN (16) +#define IPADDR_LEN (16) /** Max number of ip */ -#define MAX_IPADDR (4) +#define MAX_IPADDR (4) /** IP address type - NONE*/ -#define IPADDR_TYPE_NONE (0) +#define IPADDR_TYPE_NONE (0) /** IP address type - IPv4*/ -#define IPADDR_TYPE_IPV4 (1) +#define IPADDR_TYPE_IPV4 (1) /** IP operation remove */ -#define MLAN_IPADDR_OP_IP_REMOVE (0) +#define MLAN_IPADDR_OP_IP_REMOVE (0) /** IP operation ARP response */ -#define MLAN_IPADDR_OP_AUTO_ARP_RESP MBIT(1) +#define MLAN_IPADDR_OP_AUTO_ARP_RESP MBIT(1) /** Type definition of mlan_ds_misc_ipaddr_cfg for MLAN_OID_MISC_IP_ADDR */ typedef struct _mlan_ds_misc_ipaddr_cfg { - /** Operation code */ + /** Operation code */ t_u32 op_code; - /** IP address type */ + /** IP address type */ t_u32 ip_addr_type; - /** Number of IP */ + /** Number of IP */ t_u32 ip_addr_num; - /** IP address */ + /** IP address */ t_u8 ip_addr[MAX_IPADDR][IPADDR_LEN]; } mlan_ds_misc_ipaddr_cfg; /* MEF configuration disable */ -#define MEF_CFG_DISABLE 0 +#define MEF_CFG_DISABLE 0 /* MEF configuration Rx filter enable */ -#define MEF_CFG_RX_FILTER_ENABLE 1 +#define MEF_CFG_RX_FILTER_ENABLE 1 /* MEF configuration auto ARP response */ -#define MEF_CFG_AUTO_ARP_RESP 2 +#define MEF_CFG_AUTO_ARP_RESP 2 /* MEF configuration host command */ -#define MEF_CFG_HOSTCMD 0xFFFF +#define MEF_CFG_HOSTCMD 0xFFFF /** Type definition of mlan_ds_misc_mef_cfg for MLAN_OID_MISC_MEF_CFG */ typedef struct _mlan_ds_misc_mef_cfg { - /** Sub-ID for operation */ + /** Sub-ID for operation */ t_u32 sub_id; - /** Parameter according to sub-ID */ + /** Parameter according to sub-ID */ union { - /** MEF command buffer for MEF_CFG_HOSTCMD */ + /** 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 */ + /** CFP table code for 2.4GHz */ t_u32 cfp_code_bg; - /** CFP table code for 5GHz */ + /** CFP table code for 5GHz */ t_u32 cfp_code_a; } mlan_ds_misc_cfp_code; @@ -4203,108 +4306,108 @@ typedef struct _mlan_ds_misc_cfp_code { * for MLAN_OID_MISC_COUNTRY_CODE */ typedef struct _mlan_ds_misc_country_code { - /** Country Code */ + /** Country Code */ t_u8 country_code[COUNTRY_CODE_LEN]; } mlan_ds_misc_country_code; /** action for set */ -#define SUBSCRIBE_EVT_ACT_BITWISE_SET 0x0002 +#define SUBSCRIBE_EVT_ACT_BITWISE_SET 0x0002 /** action for clear */ -#define SUBSCRIBE_EVT_ACT_BITWISE_CLR 0x0003 +#define SUBSCRIBE_EVT_ACT_BITWISE_CLR 0x0003 /** BITMAP for subscribe event rssi low */ -#define SUBSCRIBE_EVT_RSSI_LOW MBIT(0) +#define SUBSCRIBE_EVT_RSSI_LOW MBIT(0) /** BITMAP for subscribe event snr low */ -#define SUBSCRIBE_EVT_SNR_LOW MBIT(1) +#define SUBSCRIBE_EVT_SNR_LOW MBIT(1) /** BITMAP for subscribe event max fail */ -#define SUBSCRIBE_EVT_MAX_FAIL MBIT(2) +#define SUBSCRIBE_EVT_MAX_FAIL MBIT(2) /** BITMAP for subscribe event beacon missed */ -#define SUBSCRIBE_EVT_BEACON_MISSED MBIT(3) +#define SUBSCRIBE_EVT_BEACON_MISSED MBIT(3) /** BITMAP for subscribe event rssi high */ -#define SUBSCRIBE_EVT_RSSI_HIGH MBIT(4) +#define SUBSCRIBE_EVT_RSSI_HIGH MBIT(4) /** BITMAP for subscribe event snr high */ -#define SUBSCRIBE_EVT_SNR_HIGH MBIT(5) +#define SUBSCRIBE_EVT_SNR_HIGH MBIT(5) /** BITMAP for subscribe event data rssi low */ -#define SUBSCRIBE_EVT_DATA_RSSI_LOW MBIT(6) +#define SUBSCRIBE_EVT_DATA_RSSI_LOW MBIT(6) /** BITMAP for subscribe event data snr low */ -#define SUBSCRIBE_EVT_DATA_SNR_LOW MBIT(7) +#define SUBSCRIBE_EVT_DATA_SNR_LOW MBIT(7) /** BITMAP for subscribe event data rssi high */ -#define SUBSCRIBE_EVT_DATA_RSSI_HIGH MBIT(8) +#define SUBSCRIBE_EVT_DATA_RSSI_HIGH MBIT(8) /** BITMAP for subscribe event data snr high */ -#define SUBSCRIBE_EVT_DATA_SNR_HIGH MBIT(9) +#define SUBSCRIBE_EVT_DATA_SNR_HIGH MBIT(9) /** BITMAP for subscribe event link quality */ -#define SUBSCRIBE_EVT_LINK_QUALITY MBIT(10) +#define SUBSCRIBE_EVT_LINK_QUALITY MBIT(10) /** BITMAP for subscribe event pre_beacon_lost */ -#define SUBSCRIBE_EVT_PRE_BEACON_LOST MBIT(11) +#define SUBSCRIBE_EVT_PRE_BEACON_LOST MBIT(11) /** default PRE_BEACON_MISS_COUNT */ -#define DEFAULT_PRE_BEACON_MISS 30 +#define DEFAULT_PRE_BEACON_MISS 30 /** Type definition of mlan_ds_subscribe_evt for MLAN_OID_MISC_CFP_CODE */ typedef struct _mlan_ds_subscribe_evt { - /** evt action */ + /** evt action */ t_u16 evt_action; - /** bitmap for subscribe event */ + /** bitmap for subscribe event */ t_u16 evt_bitmap; - /** Absolute value of RSSI threshold value (dBm) */ + /** Absolute value of RSSI threshold value (dBm) */ t_u8 low_rssi; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 low_rssi_freq; - /** SNR threshold value (dB) */ + /** SNR threshold value (dB) */ t_u8 low_snr; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 low_snr_freq; - /** Failure count threshold */ + /** Failure count threshold */ t_u8 failure_count; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 failure_count_freq; - /** num of missed beacons */ + /** num of missed beacons */ t_u8 beacon_miss; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 beacon_miss_freq; - /** Absolute value of RSSI threshold value (dBm) */ + /** Absolute value of RSSI threshold value (dBm) */ t_u8 high_rssi; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 high_rssi_freq; - /** SNR threshold value (dB) */ + /** SNR threshold value (dB) */ t_u8 high_snr; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 high_snr_freq; - /** Absolute value of data RSSI threshold value (dBm) */ + /** Absolute value of data RSSI threshold value (dBm) */ t_u8 data_low_rssi; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 data_low_rssi_freq; - /** Absolute value of data SNR threshold value (dBm) */ + /** Absolute value of data SNR threshold value (dBm) */ t_u8 data_low_snr; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 data_low_snr_freq; - /** Absolute value of data RSSI threshold value (dBm) */ + /** Absolute value of data RSSI threshold value (dBm) */ t_u8 data_high_rssi; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 data_high_rssi_freq; - /** Absolute value of data SNR threshold value (dBm) */ + /** Absolute value of data SNR threshold value (dBm) */ t_u8 data_high_snr; - /** 0--report once, 1--report everytime happen, - * N -- report only happend > N consecutive times - */ + /** 0--report once, 1--report everytime happen, + * N -- report only happend > N consecutive times + */ t_u8 data_high_snr_freq; - /* Link SNR threshold (dB) */ + /* Link SNR threshold (dB)*/ t_u16 link_snr; /* Link SNR frequency */ t_u16 link_snr_freq; @@ -4321,30 +4424,30 @@ typedef struct _mlan_ds_subscribe_evt { } mlan_ds_subscribe_evt; /** Max OTP user data length */ -#define MAX_OTP_USER_DATA_LEN 252 +#define MAX_OTP_USER_DATA_LEN 252 /** Type definition of mlan_ds_misc_otp_user_data * for MLAN_OID_MISC_OTP_USER_DATA */ typedef struct _mlan_ds_misc_otp_user_data { - /** Reserved */ + /** Reserved */ t_u16 reserved; - /** OTP user data length */ + /** OTP user data length */ t_u16 user_data_length; - /** User data buffer */ + /** User data buffer */ t_u8 user_data[MAX_OTP_USER_DATA_LEN]; } mlan_ds_misc_otp_user_data; typedef struct _aggr_ctrl { - /** Enable */ + /** Enable */ t_u16 enable; - /** Aggregation alignment */ + /** Aggregation alignment */ t_u16 aggr_align; - /** Aggregation max size */ + /** Aggregation max size */ t_u16 aggr_max_size; - /** Aggregation max packet number */ + /** Aggregation max packet number */ t_u16 aggr_max_num; - /** Aggrgation timeout, in microseconds */ + /** Aggrgation timeout, in microseconds */ t_u16 aggr_tmo; } aggr_ctrl; @@ -4352,21 +4455,21 @@ typedef struct _aggr_ctrl { * for MLAN_OID_MISC_AGGR_CTRL */ typedef struct _mlan_ds_misc_aggr_ctrl { - /** Tx aggregation control */ + /** Tx aggregation control */ aggr_ctrl tx; } mlan_ds_misc_aggr_ctrl; #ifdef USB typedef struct _usb_aggr_ctrl { - /** Enable */ + /** Enable */ t_u16 enable; - /** Aggregation mode */ + /** Aggregation mode */ t_u16 aggr_mode; - /** Aggregation alignment */ + /** Aggregation alignment */ t_u16 aggr_align; - /** Aggregation max packet/size */ + /** Aggregation max packet/size */ t_u16 aggr_max; - /** Aggrgation timeout, in microseconds */ + /** Aggrgation timeout, in microseconds */ t_u16 aggr_tmo; } usb_aggr_ctrl; @@ -4374,46 +4477,46 @@ typedef struct _usb_aggr_ctrl { * for MLAN_OID_MISC_USB_AGGR_CTRL */ typedef struct _mlan_ds_misc_usb_aggr_ctrl { - /** Tx aggregation control */ + /** Tx aggregation control */ usb_aggr_ctrl tx_aggr_ctrl; - /** Rx deaggregation control */ + /** Rx deaggregation control */ usb_aggr_ctrl rx_deaggr_ctrl; } mlan_ds_misc_usb_aggr_ctrl; #endif #ifdef WIFI_DIRECT_SUPPORT /** flag for NOA */ -#define WIFI_DIRECT_NOA 1 +#define WIFI_DIRECT_NOA 1 /** flag for OPP_PS */ -#define WIFI_DIRECT_OPP_PS 2 +#define WIFI_DIRECT_OPP_PS 2 /** Type definition of mlan_ds_wifi_direct_config * for MLAN_OID_MISC_WIFI_DIRECT_CONFIG */ typedef struct _mlan_ds_wifi_direct_config { - /** flags for NOA/OPP_PS */ + /** flags for NOA/OPP_PS */ t_u8 flags; - /** NoA enable/disable */ + /** NoA enable/disable */ t_u8 noa_enable; - /** index */ + /** index */ t_u16 index; - /** NoA count */ + /** NoA count */ t_u8 noa_count; - /** NoA duration */ + /** NoA duration */ t_u32 noa_duration; - /** NoA interval */ + /** NoA interval */ t_u32 noa_interval; - /** opp ps enable/disable */ + /** opp ps enable/disable */ t_u8 opp_ps_enable; - /** CT window value */ + /** CT window value */ t_u8 ct_window; } mlan_ds_wifi_direct_config; #endif #if defined(STA_SUPPORT) typedef struct _mlan_ds_misc_pmfcfg { - /** Management Frame Protection Capable */ + /** Management Frame Protection Capable */ t_u8 mfpc; - /** Management Frame Protection Required */ + /** Management Frame Protection Required */ t_u8 mfpr; } mlan_ds_misc_pmfcfg; #endif @@ -4437,52 +4540,52 @@ typedef struct _mlan_ds_misc_dfs_repeater { t_u16 mode; } mlan_ds_misc_dfs_repeater; -#define WOWLAN_MAX_PATTERN_LEN 20 -#define WOWLAN_MAX_OFFSET_LEN 50 -#define MAX_NUM_FILTERS 10 -#define MEF_MODE_HOST_SLEEP (1<<0) -#define MEF_MODE_NON_HOST_SLEEP (1<<1) -#define MEF_ACTION_WAKE (1<<0) -#define MEF_ACTION_ALLOW (1<<1) -#define MEF_ACTION_ALLOW_AND_WAKEUP_HOST 3 -#define MEF_AUTO_ARP 0x10 -#define MEF_AUTO_PING 0x20 -#define MEF_NS_RESP 0x40 -#define MEF_MAGIC_PKT 0x80 -#define CRITERIA_BROADCAST BIT(0) -#define CRITERIA_UNICAST BIT(1) -#define CRITERIA_MULTICAST BIT(3) +#define WOWLAN_MAX_PATTERN_LEN 20 +#define WOWLAN_MAX_OFFSET_LEN 50 +#define MAX_NUM_FILTERS 10 +#define MEF_MODE_HOST_SLEEP (1 << 0) +#define MEF_MODE_NON_HOST_SLEEP (1 << 1) +#define MEF_ACTION_WAKE (1 << 0) +#define MEF_ACTION_ALLOW (1 << 1) +#define MEF_ACTION_ALLOW_AND_WAKEUP_HOST 3 +#define MEF_AUTO_ARP 0x10 +#define MEF_AUTO_PING 0x20 +#define MEF_NS_RESP 0x40 +#define MEF_MAGIC_PKT 0x80 +#define CRITERIA_BROADCAST BIT(0) +#define CRITERIA_UNICAST BIT(1) +#define CRITERIA_MULTICAST BIT(3) -#define MAX_NUM_ENTRIES 8 -#define MAX_NUM_BYTE_SEQ 6 -#define MAX_NUM_MASK_SEQ 6 +#define MAX_NUM_ENTRIES 8 +#define MAX_NUM_BYTE_SEQ 6 +#define MAX_NUM_MASK_SEQ 6 -#define OPERAND_DNUM 1 -#define OPERAND_BYTE_SEQ 2 +#define OPERAND_DNUM 1 +#define OPERAND_BYTE_SEQ 2 -#define MAX_OPERAND 0x40 -#define TYPE_BYTE_EQ (MAX_OPERAND + 1) -#define TYPE_DNUM_EQ (MAX_OPERAND + 2) -#define TYPE_BIT_EQ (MAX_OPERAND + 3) +#define MAX_OPERAND 0x40 +#define TYPE_BYTE_EQ (MAX_OPERAND + 1) +#define TYPE_DNUM_EQ (MAX_OPERAND + 2) +#define TYPE_BIT_EQ (MAX_OPERAND + 3) -#define RPN_TYPE_AND (MAX_OPERAND + 4) -#define RPN_TYPE_OR (MAX_OPERAND + 5) +#define RPN_TYPE_AND (MAX_OPERAND + 4) +#define RPN_TYPE_OR (MAX_OPERAND + 5) -#define ICMP_OF_IP_PROTOCOL 0x01 -#define TCP_OF_IP_PROTOCOL 0x06 -#define UDP_OF_IP_PROTOCOL 0x11 +#define ICMP_OF_IP_PROTOCOL 0x01 +#define TCP_OF_IP_PROTOCOL 0x06 +#define UDP_OF_IP_PROTOCOL 0x11 -#define IPV4_PKT_OFFSET 20 -#define IP_PROTOCOL_OFFSET 31 -#define PORT_PROTOCOL_OFFSET 44 +#define IPV4_PKT_OFFSET 20 +#define IP_PROTOCOL_OFFSET 31 +#define PORT_PROTOCOL_OFFSET 44 -#define FILLING_TYPE MBIT(0) -#define FILLING_PATTERN MBIT(1) -#define FILLING_OFFSET MBIT(2) -#define FILLING_NUM_BYTES MBIT(3) -#define FILLING_REPEAT MBIT(4) -#define FILLING_BYTE_SEQ MBIT(5) -#define FILLING_MASK_SEQ MBIT(6) +#define FILLING_TYPE MBIT(0) +#define FILLING_PATTERN MBIT(1) +#define FILLING_OFFSET MBIT(2) +#define FILLING_NUM_BYTES MBIT(3) +#define FILLING_REPEAT MBIT(4) +#define FILLING_BYTE_SEQ MBIT(5) +#define FILLING_MASK_SEQ MBIT(6) /** Type definition of filter_item * Support three match methods: @@ -4491,40 +4594,40 @@ typedef struct _mlan_ds_misc_dfs_repeater { * <3>Bit comparison type=0x43 */ typedef struct _mef_filter_t { - /** flag*/ + /** flag*/ t_u32 fill_flag; - /** BYTE 0X41; Decimal 0X42; Bit 0x43*/ + /** BYTE 0X41; Decimal 0X42; Bit 0x43*/ t_u16 type; - /** value*/ + /** value*/ t_u32 pattern; - /** offset*/ + /** offset*/ t_u16 offset; - /** number of bytes*/ + /** number of bytes*/ t_u16 num_bytes; - /** repeat*/ + /** repeat*/ t_u16 repeat; - /** byte number*/ + /** byte number*/ t_u8 num_byte_seq; - /** array*/ + /** array*/ t_u8 byte_seq[MAX_NUM_BYTE_SEQ]; - /** mask numbers*/ + /** mask numbers*/ t_u8 num_mask_seq; - /** array*/ + /** array*/ t_u8 mask_seq[MAX_NUM_MASK_SEQ]; } mef_filter_t; typedef struct _mef_entry_t { - /** mode: bit0--hostsleep mode; bit1--non hostsleep mode */ + /** mode: bit0--hostsleep mode; bit1--non hostsleep mode */ t_u8 mode; - /** action: 0--discard and not wake host; - 1--discard and wake host; - 3--allow and wake host;*/ + /** action: 0--discard and not wake host; + 1--discard and wake host; + 3--allow and wake host;*/ t_u8 action; - /** filter number */ + /** filter number */ t_u8 filter_num; - /** filter array*/ + /** filter array*/ mef_filter_t filter_item[MAX_NUM_FILTERS]; - /** rpn array*/ + /** rpn array*/ t_u8 rpn[MAX_NUM_FILTERS]; } mef_entry_t; @@ -4532,11 +4635,11 @@ typedef struct _mef_entry_t { *for MLAN_OID_MISC_MEF_FLT_CFG */ typedef struct _mlan_ds_misc_mef_flt_cfg { - /** Type of action*/ + /** Type of action*/ int mef_act_type; - /** NV Filter Criteria*/ + /** NV Filter Criteria*/ t_u32 criteria; - /** NV MEF entry*/ + /** NV MEF entry*/ mef_entry_t mef_entry; } mlan_ds_misc_mef_flt_cfg; @@ -4555,20 +4658,20 @@ typedef struct _mlan_ds_sensor_temp { t_u32 temperature; } mlan_ds_sensor_temp; -#define MLAN_KCK_LEN 16 -#define MLAN_KEK_LEN 16 +#define MLAN_KCK_LEN 16 +#define MLAN_KEK_LEN 16 #define MLAN_REPLAY_CTR_LEN 8 /** mlan_ds_misc_gtk_rekey_data */ typedef struct _mlan_ds_misc_gtk_rekey_data { - /** key encryption key */ + /** key encryption key */ t_u8 kek[MLAN_KEK_LEN]; - /** key confirmation key */ + /** key confirmation key */ t_u8 kck[MLAN_KCK_LEN]; - /** replay counter */ + /** replay counter */ t_u8 replay_ctr[MLAN_REPLAY_CTR_LEN]; } mlan_ds_misc_gtk_rekey_data; typedef struct _mlan_ds_bw_chan_oper { - /* bandwidth 20:20M 40:40M 80:80M */ + /* bandwidth 20:20M 40:40M 80:80M*/ t_u8 bandwidth; /* channel number */ t_u8 channel; @@ -4581,17 +4684,17 @@ typedef struct _mlan_ds_ind_rst_cfg { t_u16 action; /** oob mode enable/ disable */ t_u8 ir_mode; - /** gpio pin */ + /** gpio pin */ t_u8 gpio_pin; } mlan_ds_ind_rst_cfg; -#define MKEEP_ALIVE_IP_PKT_MAX 256 +#define MKEEP_ALIVE_IP_PKT_MAX 256 typedef struct _mlan_ds_misc_keep_alive { t_u8 mkeep_alive_id; t_u8 enable; - /** enable/disable tcp reset*/ + /** enable/disable tcp reset*/ t_u8 reset; - /**True means saved in driver, false means not saved or download*/ + /**True means saved in driver, false means not saved or download*/ t_u8 cached; t_u32 send_interval; t_u16 retry_interval; @@ -4600,60 +4703,61 @@ typedef struct _mlan_ds_misc_keep_alive { t_u8 src_mac[MLAN_MAC_ADDR_LENGTH]; t_u16 pkt_len; t_u8 packet[MKEEP_ALIVE_IP_PKT_MAX]; - /** Ethernet type */ + /** Ethernet type */ t_u16 ether_type; } mlan_ds_misc_keep_alive; /** TX and RX histogram statistic parameters*/ typedef MLAN_PACK_START struct _mlan_ds_misc_tx_rx_histogram { - /** Enable or disable get tx/rx histogram statistic */ + /** Enable or disable get tx/rx histogram statistic */ t_u8 enable; - /** Choose to get TX, RX or both histogram statistic */ + /** Choose to get TX, RX or both histogram statistic */ t_u16 action; - /** Size of Tx/Rx info */ + /** Size of Tx/Rx info */ t_u16 size; - /** Store Tx/Rx info */ + /** Store Tx/Rx info */ t_u8 value[1]; } MLAN_PACK_END mlan_ds_misc_tx_rx_histogram; typedef MLAN_PACK_START struct _mlan_ds_cw_mode_ctrl { - /** Mode of Operation 0: Disable 1: Tx Continuous Packet 2: Tx Continuous Wave */ + /** Mode of Operation 0: Disable 1: Tx Continuous Packet 2: Tx + * Continuous Wave */ t_u8 mode; - /*channel */ + /*channel*/ t_u8 channel; - /* channel info */ + /* channel info*/ t_u8 chanInfo; - /** Tx Power level in dBm */ + /** Tx Power level in dBm */ t_u16 txPower; - /** Packet Length */ + /** Packet Length */ t_u16 pktLength; - /** bit rate Info */ + /** bit rate Info */ t_u32 rateInfo; } MLAN_PACK_END mlan_ds_cw_mode_ctrl; #define RX_PKT_INFO MBIT(1) /** Struct for per-packet configuration */ typedef struct _mlan_per_pkt_cfg { - /** Type ID*/ + /** Type ID*/ t_u16 type; - /** Length of payload*/ + /** Length of payload*/ t_u16 len; - /** Tx/Rx per-packet control */ + /** Tx/Rx per-packet control */ t_u8 tx_rx_control; - /** Number of ethernet types in ether_type array */ + /** Number of ethernet types in ether_type array */ t_u8 proto_type_num; - /** Array of ether_type for per-packet control */ + /** Array of ether_type for per-packet control */ t_u16 ether_type[]; } mlan_per_pkt_cfg; /** Type definition of mlan_ds_misc_robustcoex_params for MLAN_IOCTL_MISC_CFG */ typedef struct _mlan_ds_misc_robustcoex_params { t_u16 method; - /** enable/disable robustcoex gpio cfg */ + /** enable/disable robustcoex gpio cfg */ t_u8 enable; - /** Number of GPIO */ + /** Number of GPIO */ t_u8 gpio_num; - /** Polarity of GPIO */ + /** Polarity of GPIO */ t_u8 gpio_polarity; } mlan_ds_misc_robustcoex_params; @@ -4670,34 +4774,34 @@ typedef struct _mlan_ds_ssu_params { } mlan_ds_ssu_params; #endif -#define MAX_NUM_MAC 2 +#define MAX_NUM_MAC 2 /** Type definition of mlan_ds_misc_mapping_policy */ typedef struct _mlan_ds_misc_mapping_policy { - /** Enable/disable dynamic mapping */ + /** Enable/disable dynamic mapping */ t_u16 subcmd; - /** Mapping policy */ + /** Mapping policy */ t_u8 mapping_policy; } mlan_ds_misc_mapping_policy, *pmlan_ds_misc_mapping_policy; typedef struct _dmcsChanStatus_t { - /** Channel number */ + /** Channel number */ t_u8 channel; - /** Number of ap on this channel */ + /** Number of ap on this channel */ t_u8 ap_count; - /** Number of sta on this channel */ + /** Number of sta on this channel */ t_u8 sta_count; } dmcsChanStatus_t, *pdmcsChanStatus_t; typedef struct _dmcsStatus_t { - /** Radio ID */ + /** Radio ID */ t_u8 radio_id; - /** Running mode - ** 0 - Idle - ** 1 - DBC - ** 2 - DRCS - */ + /** Running mode + ** 0 - Idle + ** 1 - DBC + ** 2 - DRCS + */ t_u8 running_mode; - /** Current channel status */ + /** Current channel status */ dmcsChanStatus_t chan_status[2]; } dmcsStatus_t, *pdmcsStatus_t; @@ -4707,84 +4811,86 @@ typedef struct _mlan_ds_misc_dmcs_status { dmcsStatus_t radio_status[MAX_NUM_MAC]; } mlan_ds_misc_dmcs_status, *pmlan_ds_misc_dmcs_status; -/** Type definition of mlan_ds_misc_chan_trpc_cfg for MLAN_OID_MISC_GET_CHAN_TRPC_CFG */ +/** Type definition of mlan_ds_misc_chan_trpc_cfg for + * MLAN_OID_MISC_GET_CHAN_TRPC_CFG */ typedef struct _mlan_ds_misc_chan_trpc_cfg { - /** sub_band */ + /** sub_band */ t_u16 sub_band; - /** length */ + /** length */ t_u16 length; - /** buf */ + /** buf */ t_u8 trpc_buf[2048]; } mlan_ds_misc_chan_trpc_cfg; typedef struct _mlan_ds_misc_chnrgpwr_cfg { - /** length */ + /** length */ t_u16 length; - /** chnrgpwr buf */ + /** chnrgpwr buf */ t_u8 chnrgpwr_buf[2048]; } mlan_ds_misc_chnrgpwr_cfg; /** Type definition of mlan_ds_misc_cfg for MLAN_IOCTL_MISC_CFG */ typedef struct _mlan_ds_misc_cfg { - /** Sub-command */ + /** Sub-command */ t_u32 sub_command; - /** Miscellaneous configuration parameter */ + /** Miscellaneous configuration parameter */ union { - /** Generic IE for MLAN_OID_MISC_GEN_IE */ + /** Generic IE for MLAN_OID_MISC_GEN_IE */ mlan_ds_misc_gen_ie gen_ie; - /** Region code for MLAN_OID_MISC_REGION */ + /** Region code for MLAN_OID_MISC_REGION */ t_u32 region_code; #ifdef SDIO - /** SDIO MP-A Ctrl command for MLAN_OID_MISC_SDIO_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 */ + /** Hostcmd for MLAN_OID_MISC_HOST_CMD */ mlan_ds_misc_cmd hostcmd; - /** System clock for MLAN_OID_MISC_SYS_CLOCK */ + /** System clock for MLAN_OID_MISC_SYS_CLOCK */ mlan_ds_misc_sys_clock sys_clock; - /** WWS set/get for MLAN_OID_MISC_WWS */ + /** WWS set/get for MLAN_OID_MISC_WWS */ t_u32 wws_cfg; - /** Get associate response for MLAN_OID_MISC_ASSOC_RSP */ + /** 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 */ + /** Function init/shutdown for MLAN_OID_MISC_INIT_SHUTDOWN */ t_u32 func_init_shutdown; - /** Custom IE for MLAN_OID_MISC_CUSTOM_IE */ + /** Custom IE for MLAN_OID_MISC_CUSTOM_IE */ mlan_ds_misc_custom_ie cust_ie; - /** Config dynamic bandwidth*/ + /** Config dynamic bandwidth*/ t_u16 dyn_bw; - /** Tx data pause for MLAN_OID_MISC_TX_DATAPAUSE */ + /** Tx data pause for MLAN_OID_MISC_TX_DATAPAUSE */ mlan_ds_misc_tx_datapause tx_datapause; - /** IP address configuration */ + /** IP address configuration */ mlan_ds_misc_ipaddr_cfg ipaddr_cfg; - /** MAC control for MLAN_OID_MISC_MAC_CONTROL */ + /** MAC control for MLAN_OID_MISC_MAC_CONTROL */ t_u32 mac_ctrl; - /** MEF configuration for MLAN_OID_MISC_MEF_CFG */ + /** MEF configuration for MLAN_OID_MISC_MEF_CFG */ mlan_ds_misc_mef_cfg mef_cfg; - /** CFP code for MLAN_OID_MISC_CFP_CODE */ + /** CFP code for MLAN_OID_MISC_CFP_CODE */ mlan_ds_misc_cfp_code cfp_code; - /** Country code for MLAN_OID_MISC_COUNTRY_CODE */ + /** Country code for MLAN_OID_MISC_COUNTRY_CODE */ mlan_ds_misc_country_code country_code; - /** Thermal reading for MLAN_OID_MISC_THERMAL */ + /** Thermal reading for MLAN_OID_MISC_THERMAL */ t_u32 thermal; - /** Mgmt subtype mask for MLAN_OID_MISC_RX_MGMT_IND */ + /** Mgmt subtype mask for MLAN_OID_MISC_RX_MGMT_IND */ t_u32 mgmt_subtype_mask; - /** subscribe event for MLAN_OID_MISC_SUBSCRIBE_EVENT */ + /** subscribe event for MLAN_OID_MISC_SUBSCRIBE_EVENT */ mlan_ds_subscribe_evt subscribe_event; #ifdef DEBUG_LEVEL1 - /** Driver debug bit masks */ + /** Driver debug bit masks */ t_u32 drvdbg; #endif - /** Hotspot config param set */ + /** Hotspot config param set */ t_u32 hotspot_cfg; #ifdef STA_SUPPORT ExtCap_t ext_cap; #endif mlan_ds_misc_otp_user_data otp_user_data; #ifdef USB - /** USB aggregation parameters for MLAN_OID_MISC_USB_AGGR_CTRL */ + /** USB aggregation parameters for MLAN_OID_MISC_USB_AGGR_CTRL + */ mlan_ds_misc_usb_aggr_ctrl usb_aggr_params; #endif mlan_ds_misc_aggr_ctrl aggr_params; - /** Tx control */ + /** Tx control */ t_u32 tx_control; #if defined(STA_SUPPORT) mlan_ds_misc_pmfcfg pmfcfg; @@ -4794,16 +4900,16 @@ typedef struct _mlan_ds_misc_cfg { #endif mlan_ds_coalesce_cfg coalesce_cfg; t_u8 low_pwr_mode; - /** MEF-FLT-CONFIG for MLAN_OID_MISC_NV_FLT_CFG */ + /** MEF-FLT-CONFIG for MLAN_OID_MISC_NV_FLT_CFG */ mlan_ds_misc_mef_flt_cfg mef_flt_cfg; mlan_ds_misc_dfs_repeater dfs_repeater; #ifdef RX_PACKET_COALESCE mlan_ds_misc_rx_packet_coalesce rx_coalesce; #endif - /** FW reload flag */ + /** FW reload flag */ t_u8 fw_reload; mlan_ds_sensor_temp sensor_temp; - /** GTK rekey data */ + /** GTK rekey data */ mlan_ds_misc_gtk_rekey_data gtk_rekey; mlan_ds_bw_chan_oper bw_chan_oper; mlan_ds_ind_rst_cfg ind_rst_cfg; @@ -4812,15 +4918,15 @@ typedef struct _mlan_ds_misc_cfg { mlan_ds_misc_keep_alive keep_alive; mlan_ds_misc_tx_rx_histogram tx_rx_histogram; mlan_ds_cw_mode_ctrl cwmode; - /** Tx/Rx per-packet control */ + /** Tx/Rx per-packet control */ t_u8 txrx_pkt_ctrl; mlan_ds_misc_robustcoex_params robustcoexparams; #if defined(PCIE) mlan_ds_ssu_params ssu_params; #endif - /** boot sleep enable or disable */ + /** boot sleep enable or disable */ t_u16 boot_sleep; - /** Mapping Policy */ + /** Mapping Policy */ mlan_ds_misc_mapping_policy dmcs_policy; mlan_ds_misc_dmcs_status dmcs_status; mlan_ds_misc_rx_abort_cfg rx_abort_cfg; @@ -4836,21 +4942,21 @@ typedef struct _mlan_ds_misc_cfg { } mlan_ds_misc_cfg, *pmlan_ds_misc_cfg; /** Hotspot status enable */ -#define HOTSPOT_ENABLED MBIT(0) +#define HOTSPOT_ENABLED MBIT(0) /** Hotspot status disable */ -#define HOTSPOT_DISABLED MFALSE +#define HOTSPOT_DISABLED MFALSE /** Keep Hotspot2.0 compatible in mwu and wpa_supplicant */ -#define HOTSPOT_BY_SUPPLICANT MBIT(1) +#define HOTSPOT_BY_SUPPLICANT MBIT(1) /** Reason codes */ -#define MLAN_REASON_UNSPECIFIED 1 -#define MLAN_REASON_PREV_AUTH_NOT_VALID 2 -#define MLAN_REASON_DEAUTH_LEAVING 3 -#define MLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4 -#define MLAN_REASON_DISASSOC_AP_BUSY 5 -#define MLAN_REASON_CLASS2_FRAME_FROM_NOAUTH_STA 6 +#define MLAN_REASON_UNSPECIFIED 1 +#define MLAN_REASON_PREV_AUTH_NOT_VALID 2 +#define MLAN_REASON_DEAUTH_LEAVING 3 +#define MLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4 +#define MLAN_REASON_DISASSOC_AP_BUSY 5 +#define MLAN_REASON_CLASS2_FRAME_FROM_NOAUTH_STA 6 #define MLAN_REASON_CLASS3_FRAME_FROM_NOASSOC_STA 7 -#define MLAN_REASON_DISASSOC_STA_HAS_LEFT 8 -#define MLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9 +#define MLAN_REASON_DISASSOC_STA_HAS_LEFT 8 +#define MLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9 #endif /* !_MLAN_IOCTL_H_ */ diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_cfg80211.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_cfg80211.c index 3608d9483ded..1c4d78276fcf 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_cfg80211.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_cfg80211.c @@ -1,96 +1,132 @@ /** @file moal_cfg80211.c - * - * @brief This file contains the functions for CFG80211. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains the functions for CFG80211. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ -#include "moal_cfg80211.h" +#include "moal_cfg80211.h" #ifdef UAP_CFG80211 #ifdef UAP_SUPPORT -#include "moal_uap.h" +#include "moal_uap.h" #endif #endif /******************************************************** - Local Variables -********************************************************/ + * Local Variables + ********************************************************/ /** Supported rates to be advertised to the cfg80211 */ static struct ieee80211_rate cfg80211_rates[] = { - {.bitrate = 10,.hw_value = 2,}, - {.bitrate = 20,.hw_value = 4,}, - {.bitrate = 55,.hw_value = 11,}, - {.bitrate = 110,.hw_value = 22,}, - {.bitrate = 60,.hw_value = 12,}, - {.bitrate = 90,.hw_value = 18,}, - {.bitrate = 120,.hw_value = 24,}, - {.bitrate = 180,.hw_value = 36,}, - {.bitrate = 240,.hw_value = 48,}, - {.bitrate = 360,.hw_value = 72,}, - {.bitrate = 480,.hw_value = 96,}, - {.bitrate = 540,.hw_value = 108,}, + { + .bitrate = 10, + .hw_value = 2, + }, + { + .bitrate = 20, + .hw_value = 4, + }, + { + .bitrate = 55, + .hw_value = 11, + }, + { + .bitrate = 110, + .hw_value = 22, + }, + { + .bitrate = 60, + .hw_value = 12, + }, + { + .bitrate = 90, + .hw_value = 18, + }, + { + .bitrate = 120, + .hw_value = 24, + }, + { + .bitrate = 180, + .hw_value = 36, + }, + { + .bitrate = 240, + .hw_value = 48, + }, + { + .bitrate = 360, + .hw_value = 72, + }, + { + .bitrate = 480, + .hw_value = 96, + }, + { + .bitrate = 540, + .hw_value = 108, + }, }; /** Channel definitions for 2 GHz to be advertised to cfg80211 */ static struct ieee80211_channel cfg80211_channels_2ghz[] = { - {.center_freq = 2412,.hw_value = 1,.max_power = 20}, - {.center_freq = 2417,.hw_value = 2,.max_power = 20}, - {.center_freq = 2422,.hw_value = 3,.max_power = 20}, - {.center_freq = 2427,.hw_value = 4,.max_power = 20}, - {.center_freq = 2432,.hw_value = 5,.max_power = 20}, - {.center_freq = 2437,.hw_value = 6,.max_power = 20}, - {.center_freq = 2442,.hw_value = 7,.max_power = 20}, - {.center_freq = 2447,.hw_value = 8,.max_power = 20}, - {.center_freq = 2452,.hw_value = 9,.max_power = 20}, - {.center_freq = 2457,.hw_value = 10,.max_power = 20}, - {.center_freq = 2462,.hw_value = 11,.max_power = 20}, - {.center_freq = 2467,.hw_value = 12,.max_power = 20}, - {.center_freq = 2472,.hw_value = 13,.max_power = 20}, - {.center_freq = 2484,.hw_value = 14,.max_power = 20}, + {.center_freq = 2412, .hw_value = 1, .max_power = 20}, + {.center_freq = 2417, .hw_value = 2, .max_power = 20}, + {.center_freq = 2422, .hw_value = 3, .max_power = 20}, + {.center_freq = 2427, .hw_value = 4, .max_power = 20}, + {.center_freq = 2432, .hw_value = 5, .max_power = 20}, + {.center_freq = 2437, .hw_value = 6, .max_power = 20}, + {.center_freq = 2442, .hw_value = 7, .max_power = 20}, + {.center_freq = 2447, .hw_value = 8, .max_power = 20}, + {.center_freq = 2452, .hw_value = 9, .max_power = 20}, + {.center_freq = 2457, .hw_value = 10, .max_power = 20}, + {.center_freq = 2462, .hw_value = 11, .max_power = 20}, + {.center_freq = 2467, .hw_value = 12, .max_power = 20}, + {.center_freq = 2472, .hw_value = 13, .max_power = 20}, + {.center_freq = 2484, .hw_value = 14, .max_power = 20}, }; /** Channel definitions for 5 GHz to be advertised to cfg80211 */ static struct ieee80211_channel cfg80211_channels_5ghz[] = { - {.center_freq = 5180,.hw_value = 36,.max_power = 20}, - {.center_freq = 5200,.hw_value = 40,.max_power = 20}, - {.center_freq = 5220,.hw_value = 44,.max_power = 20}, - {.center_freq = 5240,.hw_value = 48,.max_power = 20}, - {.center_freq = 5260,.hw_value = 52,.max_power = 20}, - {.center_freq = 5280,.hw_value = 56,.max_power = 20}, - {.center_freq = 5300,.hw_value = 60,.max_power = 20}, - {.center_freq = 5320,.hw_value = 64,.max_power = 20}, - {.center_freq = 5500,.hw_value = 100,.max_power = 20}, - {.center_freq = 5520,.hw_value = 104,.max_power = 20}, - {.center_freq = 5540,.hw_value = 108,.max_power = 20}, - {.center_freq = 5560,.hw_value = 112,.max_power = 20}, - {.center_freq = 5580,.hw_value = 116,.max_power = 20}, - {.center_freq = 5600,.hw_value = 120,.max_power = 20}, - {.center_freq = 5620,.hw_value = 124,.max_power = 20}, - {.center_freq = 5640,.hw_value = 128,.max_power = 20}, - {.center_freq = 5660,.hw_value = 132,.max_power = 20}, - {.center_freq = 5680,.hw_value = 136,.max_power = 20}, - {.center_freq = 5700,.hw_value = 140,.max_power = 20}, - {.center_freq = 5720,.hw_value = 144,.max_power = 20}, - {.center_freq = 5745,.hw_value = 149,.max_power = 20}, - {.center_freq = 5765,.hw_value = 153,.max_power = 20}, - {.center_freq = 5785,.hw_value = 157,.max_power = 20}, - {.center_freq = 5805,.hw_value = 161,.max_power = 20}, - {.center_freq = 5825,.hw_value = 165,.max_power = 20}, + {.center_freq = 5180, .hw_value = 36, .max_power = 20}, + {.center_freq = 5200, .hw_value = 40, .max_power = 20}, + {.center_freq = 5220, .hw_value = 44, .max_power = 20}, + {.center_freq = 5240, .hw_value = 48, .max_power = 20}, + {.center_freq = 5260, .hw_value = 52, .max_power = 20}, + {.center_freq = 5280, .hw_value = 56, .max_power = 20}, + {.center_freq = 5300, .hw_value = 60, .max_power = 20}, + {.center_freq = 5320, .hw_value = 64, .max_power = 20}, + {.center_freq = 5500, .hw_value = 100, .max_power = 20}, + {.center_freq = 5520, .hw_value = 104, .max_power = 20}, + {.center_freq = 5540, .hw_value = 108, .max_power = 20}, + {.center_freq = 5560, .hw_value = 112, .max_power = 20}, + {.center_freq = 5580, .hw_value = 116, .max_power = 20}, + {.center_freq = 5600, .hw_value = 120, .max_power = 20}, + {.center_freq = 5620, .hw_value = 124, .max_power = 20}, + {.center_freq = 5640, .hw_value = 128, .max_power = 20}, + {.center_freq = 5660, .hw_value = 132, .max_power = 20}, + {.center_freq = 5680, .hw_value = 136, .max_power = 20}, + {.center_freq = 5700, .hw_value = 140, .max_power = 20}, + {.center_freq = 5720, .hw_value = 144, .max_power = 20}, + {.center_freq = 5745, .hw_value = 149, .max_power = 20}, + {.center_freq = 5765, .hw_value = 153, .max_power = 20}, + {.center_freq = 5785, .hw_value = 157, .max_power = 20}, + {.center_freq = 5805, .hw_value = 161, .max_power = 20}, + {.center_freq = 5825, .hw_value = 165, .max_power = 20}, }; struct ieee80211_supported_band cfg80211_band_2ghz = { @@ -111,33 +147,32 @@ struct ieee80211_supported_band cfg80211_band_5ghz = { /** Channel definitions for 5 GHz to be advertised to cfg80211 */ static struct ieee80211_channel mac1_cfg80211_channels_5ghz[] = { - {.center_freq = 5180,.hw_value = 36,.max_power = 20}, - {.center_freq = 5200,.hw_value = 40,.max_power = 20}, - {.center_freq = 5220,.hw_value = 44,.max_power = 20}, - {.center_freq = 5240,.hw_value = 48,.max_power = 20}, - {.center_freq = 5260,.hw_value = 52,.max_power = 20}, - {.center_freq = 5280,.hw_value = 56,.max_power = 20}, - {.center_freq = 5300,.hw_value = 60,.max_power = 20}, - {.center_freq = 5320,.hw_value = 64,.max_power = 20}, - {.center_freq = 5500,.hw_value = 100,.max_power = 20}, - {.center_freq = 5520,.hw_value = 104,.max_power = 20}, - {.center_freq = 5540,.hw_value = 108,.max_power = 20}, - {.center_freq = 5560,.hw_value = 112,.max_power = 20}, - {.center_freq = 5580,.hw_value = 116,.max_power = 20}, - {.center_freq = 5600,.hw_value = 120,.max_power = 20}, - {.center_freq = 5620,.hw_value = 124,.max_power = 20}, - {.center_freq = 5640,.hw_value = 128,.max_power = 20}, - {.center_freq = 5660,.hw_value = 132,.max_power = 20}, - {.center_freq = 5680,.hw_value = 136,.max_power = 20}, - {.center_freq = 5700,.hw_value = 140,.max_power = 20}, - {.center_freq = 5720,.hw_value = 144,.max_power = 20}, - {.center_freq = 5745,.hw_value = 149,.max_power = 20}, - {.center_freq = 5765,.hw_value = 153,.max_power = 20}, - {.center_freq = 5785,.hw_value = 157,.max_power = 20}, - {.center_freq = 5805,.hw_value = 161,.max_power = 20}, - {.center_freq = 5825,.hw_value = 165,.max_power = 20}, + {.center_freq = 5180, .hw_value = 36, .max_power = 20}, + {.center_freq = 5200, .hw_value = 40, .max_power = 20}, + {.center_freq = 5220, .hw_value = 44, .max_power = 20}, + {.center_freq = 5240, .hw_value = 48, .max_power = 20}, + {.center_freq = 5260, .hw_value = 52, .max_power = 20}, + {.center_freq = 5280, .hw_value = 56, .max_power = 20}, + {.center_freq = 5300, .hw_value = 60, .max_power = 20}, + {.center_freq = 5320, .hw_value = 64, .max_power = 20}, + {.center_freq = 5500, .hw_value = 100, .max_power = 20}, + {.center_freq = 5520, .hw_value = 104, .max_power = 20}, + {.center_freq = 5540, .hw_value = 108, .max_power = 20}, + {.center_freq = 5560, .hw_value = 112, .max_power = 20}, + {.center_freq = 5580, .hw_value = 116, .max_power = 20}, + {.center_freq = 5600, .hw_value = 120, .max_power = 20}, + {.center_freq = 5620, .hw_value = 124, .max_power = 20}, + {.center_freq = 5640, .hw_value = 128, .max_power = 20}, + {.center_freq = 5660, .hw_value = 132, .max_power = 20}, + {.center_freq = 5680, .hw_value = 136, .max_power = 20}, + {.center_freq = 5700, .hw_value = 140, .max_power = 20}, + {.center_freq = 5720, .hw_value = 144, .max_power = 20}, + {.center_freq = 5745, .hw_value = 149, .max_power = 20}, + {.center_freq = 5765, .hw_value = 153, .max_power = 20}, + {.center_freq = 5785, .hw_value = 157, .max_power = 20}, + {.center_freq = 5805, .hw_value = 161, .max_power = 20}, + {.center_freq = 5825, .hw_value = 165, .max_power = 20}, }; - struct ieee80211_supported_band mac1_cfg80211_band_5ghz = { .channels = mac1_cfg80211_channels_5ghz, .band = IEEE80211_BAND_5GHZ, @@ -146,7 +181,7 @@ struct ieee80211_supported_band mac1_cfg80211_band_5ghz = { .n_bitrates = ARRAY_SIZE(cfg80211_rates) - 4, }; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 29) +#if KERNEL_VERSION(2, 6, 29) < LINUX_VERSION_CODE #ifdef UAP_SUPPORT /** Network device handlers for uAP */ extern const struct net_device_ops woal_uap_netdev_ops; @@ -157,12 +192,12 @@ extern const struct net_device_ops woal_netdev_ops; #endif #endif /******************************************************** - Local Functions -********************************************************/ + * Local Functions + ********************************************************/ /******************************************************** - Global Functions -********************************************************/ + * Global Functions + ********************************************************/ /** * @brief Get the private structure from wiphy @@ -171,8 +206,7 @@ extern const struct net_device_ops woal_netdev_ops; * * @return Pointer to moal_private */ -void * -woal_get_wiphy_priv(struct wiphy *wiphy) +void *woal_get_wiphy_priv(struct wiphy *wiphy) { return (void *)(*(unsigned long *)wiphy_priv(wiphy)); } @@ -184,8 +218,7 @@ woal_get_wiphy_priv(struct wiphy *wiphy) * * @return Pointer to moal_private */ -void * -woal_get_netdev_priv(struct net_device *dev) +void *woal_get_netdev_priv(struct net_device *dev) { return (void *)netdev_priv(dev); } @@ -197,8 +230,7 @@ woal_get_netdev_priv(struct net_device *dev) * * @return channel frequency */ -int -woal_get_active_intf_freq(moal_private *priv) +int woal_get_active_intf_freq(moal_private *priv) { moal_handle *handle = priv->phandle; int i; @@ -207,56 +239,43 @@ woal_get_active_intf_freq(moal_private *priv) #ifdef UAP_SUPPORT || priv->bss_started == MTRUE #endif - ) - return ieee80211_channel_to_frequency(priv->channel -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) - , - (priv->channel <= - 14 ? IEEE80211_BAND_2GHZ - : IEEE80211_BAND_5GHZ) + ) + return ieee80211_channel_to_frequency( + priv->channel +#if KERNEL_VERSION(2, 6, 39) <= CFG80211_VERSION_CODE + , + (priv->channel <= 14 ? IEEE80211_BAND_2GHZ : + IEEE80211_BAND_5GHZ) #endif - ); + ); for (i = 0; i < handle->priv_num; i++) { #ifdef STA_SUPPORT if (GET_BSS_ROLE(handle->priv[i]) == MLAN_BSS_ROLE_STA) { if (handle->priv[i]->media_connected == MTRUE) - return ieee80211_channel_to_frequency(handle-> - priv[i]-> - channel -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) - , - (handle-> - priv[i]-> - channel - <= - 14 ? - IEEE80211_BAND_2GHZ - : - IEEE80211_BAND_5GHZ) + return ieee80211_channel_to_frequency( + handle->priv[i]->channel +#if KERNEL_VERSION(2, 6, 39) <= CFG80211_VERSION_CODE + , + (handle->priv[i]->channel <= 14 ? + IEEE80211_BAND_2GHZ : + IEEE80211_BAND_5GHZ) #endif - ); - + ); } #endif #ifdef UAP_SUPPORT if (GET_BSS_ROLE(handle->priv[i]) == MLAN_BSS_ROLE_UAP) { if (handle->priv[i]->bss_started == MTRUE) - return ieee80211_channel_to_frequency(handle-> - priv[i]-> - channel -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) - , - (handle-> - priv[i]-> - channel - <= - 14 ? - IEEE80211_BAND_2GHZ - : - IEEE80211_BAND_5GHZ) + return ieee80211_channel_to_frequency( + handle->priv[i]->channel +#if KERNEL_VERSION(2, 6, 39) <= CFG80211_VERSION_CODE + , + (handle->priv[i]->channel <= 14 ? + IEEE80211_BAND_2GHZ : + IEEE80211_BAND_5GHZ) #endif - ); + ); } #endif } @@ -270,8 +289,7 @@ woal_get_active_intf_freq(moal_private *priv) * * @return IEEE band type */ -t_u8 -woal_band_cfg_to_ieee_band(t_u32 band) +t_u8 woal_band_cfg_to_ieee_band(t_u32 band) { t_u8 ret_radio_type; @@ -288,6 +306,7 @@ woal_band_cfg_to_ieee_band(t_u32 band) case BAND_B | BAND_G: case BAND_GN: case BAND_B | BAND_GN: + /* Fall Through */ default: ret_radio_type = IEEE80211_BAND_2GHZ; break; @@ -314,16 +333,16 @@ woal_band_cfg_to_ieee_band(t_u32 band) * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_cfg80211_set_key(moal_private *priv, t_u8 is_enable_wep, - t_u32 cipher, const t_u8 *key, int key_len, - const t_u8 *seq, int seq_len, t_u8 key_index, - const t_u8 *addr, int disable, t_u8 wait_option) +mlan_status woal_cfg80211_set_key(moal_private *priv, t_u8 is_enable_wep, + t_u32 cipher, const t_u8 *key, int key_len, + const t_u8 *seq, int seq_len, t_u8 key_index, + const t_u8 *addr, int disable, + t_u8 wait_option) { mlan_ioctl_req *req = NULL; mlan_ds_sec_cfg *sec = NULL; mlan_status ret = MLAN_STATUS_SUCCESS; - t_u8 bcast_addr[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + t_u8 bcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; ENTER(); @@ -340,11 +359,10 @@ woal_cfg80211_set_key(moal_private *priv, t_u8 is_enable_wep, ((cipher == WLAN_CIPHER_SUITE_WEP40) || (cipher == WLAN_CIPHER_SUITE_WEP104))) { priv->uap_wep_key[key_index].length = key_len; - moal_memcpy_ext(priv->phandle, - priv->uap_wep_key[key_index].key, key, - key_len, - sizeof(priv->uap_wep_key[key_index]. - key)); + moal_memcpy_ext( + priv->phandle, priv->uap_wep_key[key_index].key, + key, key_len, + sizeof(priv->uap_wep_key[key_index].key)); priv->cipher = cipher; priv->uap_wep_key[key_index].key_index = key_index; priv->uap_wep_key[key_index].is_default = MFALSE; @@ -378,13 +396,13 @@ woal_cfg80211_set_key(moal_private *priv, t_u8 is_enable_wep, cipher != WLAN_CIPHER_SUITE_TKIP && cipher != WLAN_CIPHER_SUITE_SMS4 && cipher != WLAN_CIPHER_SUITE_AES_CMAC && -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4,0,0) +#if KERNEL_VERSION(4, 0, 0) <= CFG80211_VERSION_CODE cipher != WLAN_CIPHER_SUITE_CCMP_256 && #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,6,0) +#if KERNEL_VERSION(3, 6, 0) <= CFG80211_VERSION_CODE cipher != WLAN_CIPHER_SUITE_GCMP && #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4,0,0) +#if KERNEL_VERSION(4, 0, 0) <= CFG80211_VERSION_CODE cipher != WLAN_CIPHER_SUITE_BIP_GMAC_256 && cipher != WLAN_CIPHER_SUITE_GCMP_256 && #endif @@ -415,10 +433,9 @@ woal_cfg80211_set_key(moal_private *priv, t_u8 is_enable_wep, moal_memcpy_ext(priv->phandle, sec->param.encrypt_key.mac_addr, addr, ETH_ALEN, MLAN_MAC_ADDR_LENGTH); - if (0 == - memcmp(sec->param.encrypt_key.mac_addr, bcast_addr, - ETH_ALEN)) - sec->param.encrypt_key.key_flags = + if (memcmp(sec->param.encrypt_key.mac_addr, bcast_addr, + ETH_ALEN) == 0) + sec->param.encrypt_key.key_flags = KEY_FLAG_GROUP_KEY; else sec->param.encrypt_key.key_flags = @@ -438,24 +455,25 @@ woal_cfg80211_set_key(moal_private *priv, t_u8 is_enable_wep, sec->param.encrypt_key.key_flags |= KEY_FLAG_RX_SEQ_VALID; } -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,6,0) + +#if KERNEL_VERSION(3, 6, 0) <= CFG80211_VERSION_CODE if (cipher == WLAN_CIPHER_SUITE_GCMP) sec->param.encrypt_key.key_flags |= KEY_FLAG_GCMP; #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4,0,0) +#if KERNEL_VERSION(4, 0, 0) <= CFG80211_VERSION_CODE else if (cipher == WLAN_CIPHER_SUITE_GCMP_256) sec->param.encrypt_key.key_flags |= KEY_FLAG_GCMP_256; #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4,0,0) +#if KERNEL_VERSION(4, 0, 0) <= CFG80211_VERSION_CODE if (cipher == WLAN_CIPHER_SUITE_CCMP_256) sec->param.encrypt_key.key_flags |= KEY_FLAG_CCMP_256; #endif if (cipher == WLAN_CIPHER_SUITE_AES_CMAC -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4,0,0) +#if KERNEL_VERSION(4, 0, 0) <= CFG80211_VERSION_CODE || cipher == WLAN_CIPHER_SUITE_BIP_GMAC_256 #endif - ) { + ) { sec->param.encrypt_key.key_flags |= KEY_FLAG_AES_MCAST_IGTK; } @@ -494,9 +512,9 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_cfg80211_set_wep_keys(moal_private *priv, const t_u8 *key, int key_len, - t_u8 index, t_u8 wait_option) +mlan_status woal_cfg80211_set_wep_keys(moal_private *priv, const t_u8 *key, + int key_len, t_u8 index, + t_u8 wait_option) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u32 cipher = 0; @@ -512,7 +530,8 @@ woal_cfg80211_set_wep_keys(moal_private *priv, const t_u8 *key, int key_len, 0, index, NULL, 0, wait_option); } else { /* No key provided so it is enable key. We - * want to just set the transmit key index */ + * want to just set the transmit key index + */ woal_cfg80211_set_key(priv, 1, cipher, key, key_len, NULL, 0, index, NULL, 0, wait_option); } @@ -528,8 +547,7 @@ woal_cfg80211_set_wep_keys(moal_private *priv, const t_u8 *key, int key_len, * @param wait_option wait_option * @return N/A */ -void -woal_clear_all_mgmt_ies(moal_private *priv, t_u8 wait_option) +void woal_clear_all_mgmt_ies(moal_private *priv, t_u8 wait_option) { t_u16 mask = 0; /* clear BEACON WPS/P2P IE */ @@ -587,8 +605,7 @@ woal_clear_all_mgmt_ies(moal_private *priv, t_u8 wait_option) * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_bss_role_cfg(moal_private *priv, t_u16 action, t_u8 *bss_role) +int woal_cfg80211_bss_role_cfg(moal_private *priv, t_u16 action, t_u8 *bss_role) { int ret = 0; @@ -636,12 +653,11 @@ done: * * @return N/A */ -void -woal_cfg80211_display_p2p_actframe(const t_u8 *buf, int len, - struct ieee80211_channel *chan, - const t_u8 flag) +void woal_cfg80211_display_p2p_actframe(const t_u8 *buf, int len, + struct ieee80211_channel *chan, + const t_u8 flag) { - const t_u8 p2p_oui[] = { 0x50, 0x6f, 0x9a, 0x09 }; + const t_u8 p2p_oui[] = {0x50, 0x6f, 0x9a, 0x09}; t_u8 subtype; ENTER(); @@ -652,7 +668,7 @@ woal_cfg80211_display_p2p_actframe(const t_u8 *buf, int len, } if (((struct ieee80211_mgmt *)buf)->u.action.category == - P2P_ACT_FRAME_CATEGORY && + P2P_ACT_FRAME_CATEGORY && !memcmp(buf + P2P_ACT_FRAME_OUI_OFFSET, p2p_oui, sizeof(p2p_oui))) { subtype = *(buf + P2P_ACT_FRAME_OUI_SUBTYPE_OFFSET); switch (subtype) { @@ -706,13 +722,13 @@ woal_cfg80211_display_p2p_actframe(const t_u8 *buf, int len, break; case P2P_PROVDIS_RSP: PRINTM(MMSG, - "wlan: %s P2P Provision Discovery Response, channnel=%d\n", + "wlan: %s P2P Provision Discovery Response, channel=%d\n", (flag) ? "TX" : "RX", (chan) ? chan->hw_value : 0); break; default: PRINTM(MMSG, - "wlan: %s Unknow P2P Action Frame, channel=%d, subtype=%d\n", + "wlan: %s Unknown P2P Action Frame, channel=%d, subtype=%d\n", (flag) ? "TX" : "RX", (chan) ? chan->hw_value : 0, subtype); break; @@ -720,7 +736,6 @@ woal_cfg80211_display_p2p_actframe(const t_u8 *buf, int len, } LEAVE(); - return; } /** @@ -730,8 +745,7 @@ woal_cfg80211_display_p2p_actframe(const t_u8 *buf, int len, * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_init_p2p_client(moal_private *priv) +int woal_cfg80211_init_p2p_client(moal_private *priv) { int ret = MLAN_STATUS_SUCCESS; t_u16 wifi_direct_mode = WIFI_DIRECT_MODE_DISABLE; @@ -796,8 +810,7 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_init_p2p_go(moal_private *priv) +int woal_cfg80211_init_p2p_go(moal_private *priv) { int ret = MLAN_STATUS_SUCCESS; t_u16 wifi_direct_mode; @@ -853,7 +866,7 @@ woal_cfg80211_init_p2p_go(moal_private *priv) } } /* NoA:-- Interval = 100TUs and Duration= 50TUs, count=255*/ -#define DEF_NOA_COUNT 255 +#define DEF_NOA_COUNT 255 if (priv->phandle->noa_duration && priv->phandle->card_info->go_noa) { memset(&p2p_config, 0, sizeof(p2p_config)); p2p_config.noa_enable = MTRUE; @@ -883,8 +896,7 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_deinit_p2p(moal_private *priv) +int woal_cfg80211_deinit_p2p(moal_private *priv) { int ret = MLAN_STATUS_SUCCESS; t_u16 wifi_direct_mode; @@ -925,9 +937,9 @@ woal_cfg80211_deinit_p2p(moal_private *priv) ret = -EFAULT; goto done; } - if (woal_cfg80211_remain_on_channel_cfg - (remain_priv, MOAL_IOCTL_WAIT, MTRUE, &channel_status, NULL, - 0, 0)) { + if (woal_cfg80211_remain_on_channel_cfg( + remain_priv, MOAL_IOCTL_WAIT, MTRUE, + &channel_status, NULL, 0, 0)) { PRINTM(MERROR, "deinit_p2p: Fail to cancel remain on channel\n"); ret = -EFAULT; @@ -935,33 +947,24 @@ woal_cfg80211_deinit_p2p(moal_private *priv) } if (priv->phandle->cookie) { cfg80211_remain_on_channel_expired( -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 6, 0) - remain_priv-> - netdev, +#if KERNEL_VERSION(3, 6, 0) > CFG80211_VERSION_CODE + remain_priv->netdev, #else - remain_priv-> - wdev, + remain_priv->wdev, #endif - priv-> - phandle-> - cookie, - &priv-> - phandle->chan, -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - priv-> - phandle-> - channel_type, + priv->phandle->cookie, &priv->phandle->chan, +#if KERNEL_VERSION(3, 8, 0) > CFG80211_VERSION_CODE + priv->phandle->channel_type, #endif - GFP_ATOMIC); + GFP_ATOMIC); priv->phandle->cookie = 0; } priv->phandle->remain_on_channel = MFALSE; } /* get the bss role */ - if (MLAN_STATUS_SUCCESS != woal_cfg80211_bss_role_cfg(priv, - MLAN_ACT_GET, - &bss_role)) { + if (MLAN_STATUS_SUCCESS != + woal_cfg80211_bss_role_cfg(priv, MLAN_ACT_GET, &bss_role)) { ret = -EFAULT; goto done; } @@ -974,10 +977,9 @@ woal_cfg80211_deinit_p2p(moal_private *priv) woal_set_get_uap_power_mode(priv, MLAN_ACT_SET, &ps_mgmt); bss_role = MLAN_BSS_ROLE_STA; if (MLAN_STATUS_SUCCESS != - woal_cfg80211_bss_role_cfg(priv, MLAN_ACT_SET, &bss_role)) { + woal_cfg80211_bss_role_cfg(priv, MLAN_ACT_SET, &bss_role)) ret = -EFAULT; - goto done; - } + goto done; } wifi_direct_mode = WIFI_DIRECT_MODE_DISABLE; @@ -1004,14 +1006,13 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_change_virtual_intf(struct wiphy *wiphy, - struct net_device *dev, - enum nl80211_iftype type, -#if CFG80211_VERSION_CODE < KERNEL_VERSION(4, 12, 0) - u32 *flags, +int woal_cfg80211_change_virtual_intf(struct wiphy *wiphy, + struct net_device *dev, + enum nl80211_iftype type, +#if KERNEL_VERSION(4, 12, 0) > CFG80211_VERSION_CODE + u32 *flags, #endif - struct vif_params *params) + struct vif_params *params) { int ret = 0; moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -1044,6 +1045,7 @@ woal_cfg80211_change_virtual_intf(struct wiphy *wiphy, if (priv->phandle->remain_on_channel) { t_u8 channel_status; moal_private *remain_priv = NULL; + remain_priv = priv->phandle->priv[priv->phandle->remain_bss_index]; if (!remain_priv) { @@ -1053,9 +1055,9 @@ woal_cfg80211_change_virtual_intf(struct wiphy *wiphy, ret = -EFAULT; goto done; } - if (woal_cfg80211_remain_on_channel_cfg - (remain_priv, MOAL_IOCTL_WAIT, MTRUE, &channel_status, NULL, - 0, 0)) { + if (woal_cfg80211_remain_on_channel_cfg( + remain_priv, MOAL_IOCTL_WAIT, MTRUE, + &channel_status, NULL, 0, 0)) { PRINTM(MERROR, "change_virtual_intf: Fail to cancel remain on channel\n"); ret = -EFAULT; @@ -1063,24 +1065,16 @@ woal_cfg80211_change_virtual_intf(struct wiphy *wiphy, } if (priv->phandle->cookie) { cfg80211_remain_on_channel_expired( -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 6, 0) - remain_priv-> - netdev, +#if KERNEL_VERSION(3, 6, 0) > CFG80211_VERSION_CODE + remain_priv->netdev, #else - remain_priv-> - wdev, + remain_priv->wdev, #endif - priv-> - phandle-> - cookie, - &priv-> - phandle->chan, -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - priv-> - phandle-> - channel_type, + priv->phandle->cookie, &priv->phandle->chan, +#if KERNEL_VERSION(3, 8, 0) > CFG80211_VERSION_CODE + priv->phandle->channel_type, #endif - GFP_ATOMIC); + GFP_ATOMIC); priv->phandle->cookie = 0; } priv->phandle->remain_on_channel = MFALSE; @@ -1103,20 +1097,21 @@ woal_cfg80211_change_virtual_intf(struct wiphy *wiphy, case NL80211_IFTYPE_STATION: #ifdef WIFI_DIRECT_SUPPORT #if CFG80211_VERSION_CODE >= WIFI_DIRECT_KERNEL_VERSION - if (priv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT - && (priv->wdev->iftype == NL80211_IFTYPE_AP - || priv->wdev->iftype == NL80211_IFTYPE_P2P_GO - || priv->wdev->iftype == NL80211_IFTYPE_P2P_CLIENT)) { + if (priv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT && + (priv->wdev->iftype == NL80211_IFTYPE_AP || + priv->wdev->iftype == NL80211_IFTYPE_P2P_GO || + priv->wdev->iftype == NL80211_IFTYPE_P2P_CLIENT)) { if (priv->phandle->is_go_timer_set) { woal_cancel_timer(&priv->phandle->go_timer); priv->phandle->is_go_timer_set = MFALSE; } - /* if we support wifi direct && priv->bss_type == wifi_direct, - * and currently the interface type is AP or GO or client, - * that means wpa_supplicant deinit() wifi direct interface, - * so we should deinit bss_role and wifi direct mode, - * for other bss_type, we should not update bss_role - * and wifi direct mode */ + /* if we support wifi direct && priv->bss_type == + * wifi_direct, and currently the interface type is AP + * or GO or client, that means wpa_supplicant deinit() + * wifi direct interface, so we should deinit bss_role + * and wifi direct mode, for other bss_type, we should + * not update bss_role and wifi direct mode + */ if (MLAN_STATUS_SUCCESS != woal_cfg80211_deinit_p2p(priv)) { @@ -1147,7 +1142,8 @@ woal_cfg80211_change_virtual_intf(struct wiphy *wiphy, priv->phandle->is_go_timer_set = MFALSE; } - if (MLAN_STATUS_SUCCESS != woal_cfg80211_init_p2p_client(priv)) { + if (MLAN_STATUS_SUCCESS != + woal_cfg80211_init_p2p_client(priv)) { ret = -EFAULT; goto done; } @@ -1162,6 +1158,7 @@ woal_cfg80211_change_virtual_intf(struct wiphy *wiphy, case NL80211_IFTYPE_AP: #ifdef WIFI_DIRECT_SUPPORT #if CFG80211_VERSION_CODE >= WIFI_DIRECT_KERNEL_VERSION + /* Fall Through */ case NL80211_IFTYPE_P2P_GO: if (priv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT) { if (MLAN_STATUS_SUCCESS != @@ -1217,7 +1214,7 @@ woal_cfg80211_change_virtual_intf(struct wiphy *wiphy, goto done; status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); - if (MLAN_STATUS_SUCCESS != status) { + if (status != MLAN_STATUS_SUCCESS) { ret = -EFAULT; goto done; } @@ -1238,8 +1235,7 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed) +int woal_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed) { moal_private *priv = NULL; moal_handle *handle = (moal_handle *)woal_get_wiphy_priv(wiphy); @@ -1275,7 +1271,8 @@ woal_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed) return -EFAULT; } /* Initialize the invalid values so that the correct - * values below are downloaded to firmware */ + * values below are downloaded to firmware + */ woal_set_sys_config_invalid_data(sys_cfg); sys_cfg->frag_threshold = frag_thr; sys_cfg->rts_threshold = rts_thr; @@ -1285,8 +1282,8 @@ woal_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed) (changed & WIPHY_PARAM_FRAG_THRESHOLD) || (changed & (WIPHY_PARAM_RETRY_LONG | WIPHY_PARAM_RETRY_SHORT))) { - if (woal_set_get_sys_config - (priv, MLAN_ACT_SET, MOAL_IOCTL_WAIT, sys_cfg)) { + if (woal_set_get_sys_config(priv, MLAN_ACT_SET, + MOAL_IOCTL_WAIT, sys_cfg)) { kfree(sys_cfg); goto fail; } @@ -1300,19 +1297,19 @@ woal_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed) #ifdef STA_SUPPORT if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) { if (changed & WIPHY_PARAM_RTS_THRESHOLD) { - if (woal_set_get_rts - (priv, MLAN_ACT_SET, MOAL_IOCTL_WAIT, &rts_thr)) + if (woal_set_get_rts(priv, MLAN_ACT_SET, + MOAL_IOCTL_WAIT, &rts_thr)) goto fail; } if (changed & WIPHY_PARAM_FRAG_THRESHOLD) { - if (woal_set_get_frag - (priv, MLAN_ACT_SET, MOAL_IOCTL_WAIT, &frag_thr)) + if (woal_set_get_frag(priv, MLAN_ACT_SET, + MOAL_IOCTL_WAIT, &frag_thr)) goto fail; } if (changed & (WIPHY_PARAM_RETRY_LONG | WIPHY_PARAM_RETRY_SHORT)) - if (woal_set_get_retry - (priv, MLAN_ACT_SET, MOAL_IOCTL_WAIT, &retry)) + if (woal_set_get_retry(priv, MLAN_ACT_SET, + MOAL_IOCTL_WAIT, &retry)) goto fail; } #endif @@ -1326,7 +1323,7 @@ fail: return -EFAULT; } -#if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 36) +#if KERNEL_VERSION(2, 6, 36) < CFG80211_VERSION_CODE /** * @brief Request the driver to add a key * @@ -1352,13 +1349,12 @@ fail: * @return 0 -- success, otherwise fail */ #endif -int -woal_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev, - t_u8 key_index, -#if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 36) - bool pairwise, +int woal_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev, + t_u8 key_index, +#if KERNEL_VERSION(2, 6, 36) < CFG80211_VERSION_CODE + bool pairwise, #endif - const t_u8 *mac_addr, struct key_params *params) + const t_u8 *mac_addr, struct key_params *params) { moal_private *priv = (moal_private *)woal_get_netdev_priv(netdev); @@ -1381,7 +1377,7 @@ woal_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev, return 0; } -#if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 36) +#if KERNEL_VERSION(2, 6, 36) < CFG80211_VERSION_CODE /** * @brief Request the driver to delete a key * @@ -1405,27 +1401,25 @@ woal_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev, * @return 0 -- success, otherwise fail */ #endif -int -woal_cfg80211_del_key(struct wiphy *wiphy, struct net_device *netdev, - t_u8 key_index, -#if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 36) - bool pairwise, +int woal_cfg80211_del_key(struct wiphy *wiphy, struct net_device *netdev, + t_u8 key_index, +#if KERNEL_VERSION(2, 6, 36) < CFG80211_VERSION_CODE + bool pairwise, #endif - const t_u8 *mac_addr) + const t_u8 *mac_addr) { moal_private *priv = (moal_private *)woal_get_netdev_priv(netdev); ENTER(); if (priv->phandle->driver_status) { - PRINTM(MERROR, - "Block woal_cfg80211_del_key in abnormal driver state\n"); + PRINTM(MERROR, "Block %s in abnormal driver state\n", __func__); LEAVE(); return -EFAULT; } if (MLAN_STATUS_FAILURE == woal_cfg80211_set_key(priv, 0, 0, NULL, 0, NULL, 0, key_index, - mac_addr, 1, MOAL_NO_WAIT)) { + mac_addr, 1, MOAL_IOCTL_WAIT)) { PRINTM(MERROR, "Error deleting the crypto keys\n"); LEAVE(); return -EFAULT; @@ -1436,7 +1430,7 @@ woal_cfg80211_del_key(struct wiphy *wiphy, struct net_device *netdev, return 0; } -#if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 37) +#if KERNEL_VERSION(2, 6, 37) < CFG80211_VERSION_CODE /** * @brief Request to enable WEP key to driver * @@ -1459,13 +1453,13 @@ woal_cfg80211_del_key(struct wiphy *wiphy, struct net_device *netdev, * @return 0 -- success, otherwise fail */ #endif -int -woal_cfg80211_set_default_key(struct wiphy *wiphy, - struct net_device *netdev, t_u8 key_index -#if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 37) - , bool ucast, bool mcast +int woal_cfg80211_set_default_key(struct wiphy *wiphy, + struct net_device *netdev, t_u8 key_index +#if KERNEL_VERSION(2, 6, 37) < CFG80211_VERSION_CODE + , + bool ucast, bool mcast #endif - ) +) { int ret = 0; moal_private *priv = (moal_private *)woal_get_netdev_priv(netdev); @@ -1488,10 +1482,10 @@ woal_cfg80211_set_default_key(struct wiphy *wiphy, return ret; } -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) -int -woal_cfg80211_set_default_mgmt_key(struct wiphy *wiphy, - struct net_device *netdev, t_u8 key_index) +#if KERNEL_VERSION(2, 6, 30) <= CFG80211_VERSION_CODE +int woal_cfg80211_set_default_mgmt_key(struct wiphy *wiphy, + struct net_device *netdev, + t_u8 key_index) { PRINTM(MINFO, "set default mgmt key, key index=%d\n", key_index); @@ -1499,7 +1493,7 @@ woal_cfg80211_set_default_mgmt_key(struct wiphy *wiphy, } #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) +#if KERNEL_VERSION(3, 1, 0) <= CFG80211_VERSION_CODE /** * @brief Set GTK rekey data to driver * @@ -1509,9 +1503,9 @@ woal_cfg80211_set_default_mgmt_key(struct wiphy *wiphy, * * @return 0 --success, otherwise fail */ -mlan_status -woal_set_rekey_data(moal_private *priv, mlan_ds_misc_gtk_rekey_data * gtk_rekey, - t_u8 action, t_u8 wait_option) +mlan_status woal_set_rekey_data(moal_private *priv, + mlan_ds_misc_gtk_rekey_data *gtk_rekey, + t_u8 action, t_u8 wait_option) { mlan_ioctl_req *req; mlan_ds_misc_cfg *misc_cfg; @@ -1522,7 +1516,7 @@ woal_set_rekey_data(moal_private *priv, mlan_ds_misc_gtk_rekey_data * gtk_rekey, req = woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_misc_cfg)); - if (NULL == req) { + if (req == NULL) { ret = -ENOMEM; } else { misc_cfg = (mlan_ds_misc_cfg *)req->pbuf; @@ -1537,7 +1531,7 @@ woal_set_rekey_data(moal_private *priv, mlan_ds_misc_gtk_rekey_data * gtk_rekey, sizeof(mlan_ds_misc_gtk_rekey_data)); status = woal_request_ioctl(priv, req, wait_option); - if (MLAN_STATUS_SUCCESS != status) + if (status != MLAN_STATUS_SUCCESS) ret = -EFAULT; if (status != MLAN_STATUS_PENDING) kfree(req); @@ -1556,9 +1550,8 @@ woal_set_rekey_data(moal_private *priv, mlan_ds_misc_gtk_rekey_data * gtk_rekey, * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_set_rekey_data(struct wiphy *wiphy, struct net_device *dev, - struct cfg80211_gtk_rekey_data *data) +int woal_cfg80211_set_rekey_data(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_gtk_rekey_data *data) { int ret = 0; moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -1569,8 +1562,8 @@ woal_cfg80211_set_rekey_data(struct wiphy *wiphy, struct net_device *dev, if (priv->phandle->params.gtk_rekey_offload == GTK_REKEY_OFFLOAD_DISABLE) { - PRINTM(MMSG, - "woal_cfg80211_set_rekey_data return: gtk_rekey_offload is DISABLE\n"); + PRINTM(MMSG, "%s return: gtk_rekey_offload is DISABLE\n", + __func__); LEAVE(); return ret; } @@ -1616,8 +1609,7 @@ woal_cfg80211_set_rekey_data(struct wiphy *wiphy, struct net_device *dev, * @param bssid A pointer to bssid * @return pointer to target entry or NULL */ -struct pmksa_entry * -woal_get_pmksa_entry(moal_private *priv, const u8 *bssid) +struct pmksa_entry *woal_get_pmksa_entry(moal_private *priv, const u8 *bssid) { struct pmksa_entry *entry = NULL; unsigned long flags; @@ -1628,7 +1620,7 @@ woal_get_pmksa_entry(moal_private *priv, const u8 *bssid) } spin_lock_irqsave(&priv->pmksa_list_lock, flags); - list_for_each_entry(entry, &priv->pmksa_cache_list, link) { + list_for_each_entry (entry, &priv->pmksa_cache_list, link) { if (!memcmp(entry->bssid, bssid, ETH_ALEN)) { spin_unlock_irqrestore(&priv->pmksa_list_lock, flags); return entry; @@ -1644,8 +1636,7 @@ woal_get_pmksa_entry(moal_private *priv, const u8 *bssid) * @param priv A pointer to moal_private structure * @return success of failure */ -int -woal_flush_pmksa_list(moal_private *priv) +int woal_flush_pmksa_list(moal_private *priv) { struct pmksa_entry *entry, *tmp; unsigned long flags; @@ -1656,7 +1647,7 @@ woal_flush_pmksa_list(moal_private *priv) } spin_lock_irqsave(&priv->pmksa_list_lock, flags); - list_for_each_entry_safe(entry, tmp, &priv->pmksa_cache_list, link) { + list_for_each_entry_safe (entry, tmp, &priv->pmksa_cache_list, link) { list_del(&entry->link); kfree(entry); } @@ -1673,9 +1664,8 @@ woal_flush_pmksa_list(moal_private *priv) * @param pmksa A pointer to cfg80211_pmksa structure * @return success of failure */ -int -woal_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *dev, - struct cfg80211_pmksa *pmksa) +int woal_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_pmksa *pmksa) { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); struct pmksa_entry *entry = NULL; @@ -1717,6 +1707,7 @@ woal_cfg80211_set_pmksa(struct wiphy *wiphy, struct net_device *dev, /** Check if current roaming is going and received target pmkid */ if (priv->wait_target_ap_pmkid) { struct cfg80211_connect_params *param = &priv->sme_current; + if (param && !memcmp(pmksa->bssid, param->bssid, ETH_ALEN)) { PRINTM(MIOCTL, "Current roaming target bssid=" MACSTR "\n", @@ -1739,9 +1730,8 @@ done: * @param pmksa A pointer to cfg80211_pmksa structure * @return success of failure */ -int -woal_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev, - struct cfg80211_pmksa *pmksa) +int woal_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_pmksa *pmksa) { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); struct pmksa_entry *entry, *tmp; @@ -1758,7 +1748,7 @@ woal_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev, PRINTM(MIOCTL, "Delete pmksa: bssid=" MACSTR "\n", MAC2STR(pmksa->bssid)); spin_lock_irqsave(&priv->pmksa_list_lock, flags); - list_for_each_entry_safe(entry, tmp, &priv->pmksa_cache_list, link) { + list_for_each_entry_safe (entry, tmp, &priv->pmksa_cache_list, link) { if (!memcmp(entry->bssid, pmksa->bssid, ETH_ALEN)) { list_del(&entry->link); kfree(entry); @@ -1776,22 +1766,20 @@ woal_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev, * @param dev A pointer to net_device structure * @return success of failure */ -int -woal_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_device *dev) +int woal_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_device *dev) { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); - if (!priv || priv->bss_type != MLAN_BSS_TYPE_STA) { + if (!priv || priv->bss_type != MLAN_BSS_TYPE_STA) return -1; - } PRINTM(MIOCTL, "Flush pmksa list.\n"); return woal_flush_pmksa_list(priv); } #endif -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 5, 0) -#if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 34) +#if KERNEL_VERSION(3, 5, 0) > CFG80211_VERSION_CODE +#if KERNEL_VERSION(2, 6, 34) < CFG80211_VERSION_CODE /** * @brief Request the driver to change the channel * @@ -1813,27 +1801,27 @@ woal_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_device *dev) * @return 0 -- success, otherwise fail */ #endif -int -woal_cfg80211_set_channel(struct wiphy *wiphy, -#if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 34) - struct net_device *dev, +int woal_cfg80211_set_channel(struct wiphy *wiphy, +#if KERNEL_VERSION(2, 6, 34) < CFG80211_VERSION_CODE + struct net_device *dev, #endif - struct ieee80211_channel *chan, - enum nl80211_channel_type channel_type) + struct ieee80211_channel *chan, + enum nl80211_channel_type channel_type) { int ret = 0; moal_private *priv = NULL; ENTER(); -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 5, 0) -#if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 34) +#if KERNEL_VERSION(3, 5, 0) > CFG80211_VERSION_CODE +#if KERNEL_VERSION(2, 6, 34) < CFG80211_VERSION_CODE if (dev) priv = woal_get_netdev_priv(dev); #endif #endif if (!priv) { moal_handle *handle = (moal_handle *)woal_get_wiphy_priv(wiphy); + if (handle) priv = woal_get_priv(handle, MLAN_BSS_ROLE_ANY); } @@ -1843,8 +1831,7 @@ woal_cfg80211_set_channel(struct wiphy *wiphy, if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) { if (priv->media_connected == MTRUE) { PRINTM(MERROR, - "This configuration is valid only when station " - "is not connected\n"); + "This configuration is valid only when station is not connected\n"); LEAVE(); return -EINVAL; } @@ -1863,10 +1850,9 @@ woal_cfg80211_set_channel(struct wiphy *wiphy, } #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) -static bool -woal_is_pattern_supported(struct cfg80211_pkt_pattern *pat, t_u8 *byte_seq, - t_u8 max_byte_seq) +#if KERNEL_VERSION(3, 12, 0) <= CFG80211_VERSION_CODE +static bool woal_is_pattern_supported(struct cfg80211_pkt_pattern *pat, + t_u8 *byte_seq, t_u8 max_byte_seq) { int j, k, valid_byte_cnt = 0; bool dont_care_byte = false; @@ -1877,7 +1863,7 @@ woal_is_pattern_supported(struct cfg80211_pkt_pattern *pat, t_u8 *byte_seq, moal_memcpy_ext(NULL, byte_seq + valid_byte_cnt, &pat->pattern[j * 8 + k], 1, (t_u32)max_byte_seq - - (t_u32)valid_byte_cnt); + (t_u32)valid_byte_cnt); valid_byte_cnt++; if (dont_care_byte) return false; @@ -1896,12 +1882,11 @@ woal_is_pattern_supported(struct cfg80211_pkt_pattern *pat, t_u8 *byte_seq, return true; } -static int -woal_get_coalesce_pkt_type(t_u8 *byte_seq) +static int woal_get_coalesce_pkt_type(t_u8 *byte_seq) { - const t_u8 ipv4_mc_mac[] = { 0x33, 0x33 }; - const t_u8 ipv6_mc_mac[] = { 0x01, 0x00, 0x5e }; - const t_u8 bc_mac[] = { 0xff, 0xff, 0xff, 0xff }; + const t_u8 ipv4_mc_mac[] = {0x33, 0x33}; + const t_u8 ipv6_mc_mac[] = {0x01, 0x00, 0x5e}; + const t_u8 bc_mac[] = {0xff, 0xff, 0xff, 0xff}; if ((byte_seq[0] & 0x01) && (byte_seq[COALESCE_MAX_BYTESEQ] == 1)) return PACKET_TYPE_UNICAST; @@ -1916,9 +1901,8 @@ woal_get_coalesce_pkt_type(t_u8 *byte_seq) return 0; } -static int -woal_fill_coalesce_rule_info(struct cfg80211_coalesce_rules *crule, - struct coalesce_rule *mrule) +static int woal_fill_coalesce_rule_info(struct cfg80211_coalesce_rules *crule, + struct coalesce_rule *mrule) { t_u8 byte_seq[COALESCE_MAX_BYTESEQ + 1]; struct filt_field_param *param; @@ -1930,8 +1914,7 @@ woal_fill_coalesce_rule_info(struct cfg80211_coalesce_rules *crule, for (i = 0; i < crule->n_patterns; i++) { memset(byte_seq, 0, sizeof(byte_seq)); - if (!woal_is_pattern_supported(&crule->patterns[i], - byte_seq, + if (!woal_is_pattern_supported(&crule->patterns[i], byte_seq, COALESCE_MAX_BYTESEQ)) { PRINTM(MERROR, "Pattern not supported\n"); return -EOPNOTSUPP; @@ -1982,9 +1965,8 @@ woal_fill_coalesce_rule_info(struct cfg80211_coalesce_rules *crule, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_set_coalesce(moal_private *priv, t_u16 action, - mlan_ds_coalesce_cfg * coalesce_cfg) +mlan_status woal_set_coalesce(moal_private *priv, t_u16 action, + mlan_ds_coalesce_cfg *coalesce_cfg) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cfg *misc_cfg = NULL; @@ -2026,9 +2008,8 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_set_coalesce(struct wiphy *wiphy, - struct cfg80211_coalesce *coalesce) +int woal_cfg80211_set_coalesce(struct wiphy *wiphy, + struct cfg80211_coalesce *coalesce) { int ret = 0; int i; @@ -2055,9 +2036,8 @@ woal_cfg80211_set_coalesce(struct wiphy *wiphy, } else { coalesce_cfg.num_of_rules = coalesce->n_rules; for (i = 0; i < coalesce->n_rules; i++) { - ret = woal_fill_coalesce_rule_info(&coalesce->rules[i], - &coalesce_cfg. - rule[i]); + ret = woal_fill_coalesce_rule_info( + &coalesce->rules[i], &coalesce_cfg.rule[i]); if (ret) { PRINTM(MERROR, "Recheck the patterns provided for rule %d\n", @@ -2089,11 +2069,9 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_set_bitrate_mask(struct wiphy *wiphy, - struct net_device *dev, - const u8 *peer, - const struct cfg80211_bitrate_mask *mask) +int woal_cfg80211_set_bitrate_mask(struct wiphy *wiphy, struct net_device *dev, + const u8 *peer, + const struct cfg80211_bitrate_mask *mask) { int ret = 0; mlan_status status = MLAN_STATUS_SUCCESS; @@ -2140,14 +2118,14 @@ woal_cfg80211_set_bitrate_mask(struct wiphy *wiphy, else rate_cfg->bitmap_rates[1] = mask->control[band].legacy; -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) - /* Fill MCS rates */ -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +#if KERNEL_VERSION(3, 4, 0) <= CFG80211_VERSION_CODE + /* Fill MCS rates */ +#if KERNEL_VERSION(3, 14, 0) <= CFG80211_VERSION_CODE rate_cfg->bitmap_rates[2] = mask->control[band].ht_mcs[0]; #else rate_cfg->bitmap_rates[2] = mask->control[band].mcs[0]; #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +#if KERNEL_VERSION(3, 14, 0) <= CFG80211_VERSION_CODE rate_cfg->bitmap_rates[2] |= mask->control[band].ht_mcs[1] << 8; #else rate_cfg->bitmap_rates[2] |= mask->control[band].mcs[1] << 8; @@ -2155,7 +2133,7 @@ woal_cfg80211_set_bitrate_mask(struct wiphy *wiphy, #endif status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); - if (MLAN_STATUS_SUCCESS != status) { + if (status != MLAN_STATUS_SUCCESS) { ret = -EFAULT; goto done; } @@ -2167,7 +2145,7 @@ done: return ret; } -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) +#if KERNEL_VERSION(2, 6, 38) <= CFG80211_VERSION_CODE /** * @brief Request the driver to get antenna configuration * @@ -2177,8 +2155,7 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_get_antenna(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant) +int woal_cfg80211_get_antenna(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant) { moal_handle *handle = (moal_handle *)woal_get_wiphy_priv(wiphy); moal_private *priv = NULL; @@ -2212,7 +2189,7 @@ woal_cfg80211_get_antenna(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant) req->action = MLAN_ACT_GET; status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); - if (MLAN_STATUS_SUCCESS != status) { + if (status != MLAN_STATUS_SUCCESS) { ret = -EFAULT; goto done; } @@ -2233,7 +2210,6 @@ done: ret = -EINVAL; LEAVE(); return ret; - } /** @@ -2245,8 +2221,7 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_set_antenna(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant) +int woal_cfg80211_set_antenna(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant) { moal_handle *handle = (moal_handle *)woal_get_wiphy_priv(wiphy); moal_private *priv = NULL; @@ -2285,7 +2260,7 @@ woal_cfg80211_set_antenna(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant) } status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); - if (MLAN_STATUS_SUCCESS != status) { + if (status != MLAN_STATUS_SUCCESS) { ret = -EFAULT; goto done; } @@ -2309,8 +2284,7 @@ done: * * @return 0 -- success, otherwise fail */ -void -woal_mgmt_frame_register(moal_private *priv, u16 frame_type, bool reg) +void woal_mgmt_frame_register(moal_private *priv, u16 frame_type, bool reg) { mlan_status status = MLAN_STATUS_SUCCESS; t_u32 mgmt_subtype_mask = 0x0; @@ -2339,11 +2313,11 @@ woal_mgmt_frame_register(moal_private *priv, u16 frame_type, bool reg) priv->netdev->name, frame_type, mgmt_subtype_mask, last_mgmt_subtype_mask); if (mgmt_subtype_mask != last_mgmt_subtype_mask) { - last_mgmt_subtype_mask = mgmt_subtype_mask; /* Notify driver that a mgmt frame type was registered. * Note that this callback may not sleep, and cannot run - * concurrently with itself. */ + * concurrently with itself. + */ status = woal_reg_rx_mgmt_ind(priv, MLAN_ACT_SET, &mgmt_subtype_mask, MOAL_NO_WAIT); priv->mgmt_subtype_mask = last_mgmt_subtype_mask; @@ -2351,8 +2325,7 @@ woal_mgmt_frame_register(moal_private *priv, u16 frame_type, bool reg) LEAVE(); } - -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 6, 0) +#if KERNEL_VERSION(3, 6, 0) > CFG80211_VERSION_CODE /** * @brief register/unregister mgmt frame forwarding * @@ -2363,10 +2336,9 @@ woal_mgmt_frame_register(moal_private *priv, u16 frame_type, bool reg) * * @return 0 -- success, otherwise fail */ -void -woal_cfg80211_mgmt_frame_register(struct wiphy *wiphy, - struct net_device *dev, u16 frame_type, - bool reg) +void woal_cfg80211_mgmt_frame_register(struct wiphy *wiphy, + struct net_device *dev, u16 frame_type, + bool reg) #else /** * @brief register/unregister mgmt frame forwarding @@ -2378,13 +2350,12 @@ woal_cfg80211_mgmt_frame_register(struct wiphy *wiphy, * * @return 0 -- success, otherwise fail */ -void -woal_cfg80211_mgmt_frame_register(struct wiphy *wiphy, - struct wireless_dev *wdev, u16 frame_type, - bool reg) +void woal_cfg80211_mgmt_frame_register(struct wiphy *wiphy, + struct wireless_dev *wdev, + u16 frame_type, bool reg) #endif { -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) +#if KERNEL_VERSION(3, 6, 0) <= CFG80211_VERSION_CODE struct net_device *dev = wdev->netdev; #endif moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -2392,11 +2363,13 @@ woal_cfg80211_mgmt_frame_register(struct wiphy *wiphy, ENTER(); if (frame_type == IEEE80211_STYPE_AUTH -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) - /** Supplicant 2.8 always register auth, FW will handle auth when host_mlme=0 */ +#if KERNEL_VERSION(3, 8, 0) <= CFG80211_VERSION_CODE + /** Supplicant 2.8 always register auth, FW will handle auth when + * host_mlme=0 + */ && !moal_extflg_isset(priv->phandle, EXT_HOST_MLME) #endif - ) { + ) { LEAVE(); return; } @@ -2405,11 +2378,11 @@ woal_cfg80211_mgmt_frame_register(struct wiphy *wiphy, LEAVE(); } -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +#if KERNEL_VERSION(3, 2, 0) <= CFG80211_VERSION_CODE +#if KERNEL_VERSION(3, 3, 0) <= CFG80211_VERSION_CODE +#if KERNEL_VERSION(3, 6, 0) <= CFG80211_VERSION_CODE +#if KERNEL_VERSION(3, 8, 0) <= CFG80211_VERSION_CODE +#if KERNEL_VERSION(3, 14, 0) <= CFG80211_VERSION_CODE /** * @brief tx mgmt frame * @@ -2515,35 +2488,34 @@ woal_cfg80211_mgmt_frame_register(struct wiphy *wiphy, * @return 0 -- success, otherwise fail */ #endif -int -woal_cfg80211_mgmt_tx(struct wiphy *wiphy, -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 6, 0) - struct net_device *dev, +int woal_cfg80211_mgmt_tx(struct wiphy *wiphy, +#if KERNEL_VERSION(3, 6, 0) > CFG80211_VERSION_CODE + struct net_device *dev, #else - struct wireless_dev *wdev, + struct wireless_dev *wdev, #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) - struct cfg80211_mgmt_tx_params *params, +#if KERNEL_VERSION(3, 14, 0) <= CFG80211_VERSION_CODE + struct cfg80211_mgmt_tx_params *params, #else - struct ieee80211_channel *chan, bool offchan, -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - enum nl80211_channel_type channel_type, - bool channel_type_valid, + struct ieee80211_channel *chan, bool offchan, +#if KERNEL_VERSION(3, 8, 0) > CFG80211_VERSION_CODE + enum nl80211_channel_type channel_type, + bool channel_type_valid, #endif - unsigned int wait, const u8 *buf, size_t len, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) - bool no_cck, + unsigned int wait, const u8 *buf, size_t len, +#if KERNEL_VERSION(3, 2, 0) <= CFG80211_VERSION_CODE + bool no_cck, #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) - bool dont_wait_for_ack, +#if KERNEL_VERSION(3, 3, 0) <= CFG80211_VERSION_CODE + bool dont_wait_for_ack, #endif #endif - u64 * cookie) + u64 *cookie) { -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) +#if KERNEL_VERSION(3, 6, 0) <= CFG80211_VERSION_CODE struct net_device *dev = wdev->netdev; #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +#if KERNEL_VERSION(3, 14, 0) <= CFG80211_VERSION_CODE struct ieee80211_channel *chan = params->chan; unsigned int wait = params->wait; const u8 *buf = params->buf; @@ -2554,10 +2526,10 @@ woal_cfg80211_mgmt_tx(struct wiphy *wiphy, pmlan_buffer pmbuf = NULL; mlan_status status = MLAN_STATUS_SUCCESS; t_u16 packet_len = 0; - t_u8 addr[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; + t_u8 addr[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; t_u32 pkt_type; t_u32 tx_control; -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) +#if KERNEL_VERSION(2, 6, 39) <= CFG80211_VERSION_CODE t_u8 channel_status; t_u32 duration; moal_private *remain_priv = NULL; @@ -2572,20 +2544,21 @@ woal_cfg80211_mgmt_tx(struct wiphy *wiphy, ENTER(); if (buf == NULL || len == 0) { - PRINTM(MERROR, "woal_cfg80211_mgmt_tx() corrupt data\n"); + PRINTM(MERROR, "%s: corrupt data\n", __func__); LEAVE(); return -EFAULT; } /* If the packet is probe response, that means we are in listen phase, - so we should not call remain_on_channel_cfg because - remain_on_channl already handled it. If the packet if action, that - means we are in PD/GO negotiation, so we should call - remain_on_channel_cfg in order to receive action frame from peer - device */ - if ((GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP)) { - if (ieee80211_is_probe_resp - (((struct ieee80211_mgmt *)buf)->frame_control)) { + * so we should not call remain_on_channel_cfg because + * remain_on_channl already handled it. If the packet if action, that + * means we are in PD/GO negotiation, so we should call + * remain_on_channel_cfg in order to receive action frame from peer + * device + */ + if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { + if (ieee80211_is_probe_resp( + ((struct ieee80211_mgmt *)buf)->frame_control)) { PRINTM(MIOCTL, "Skip send probe_resp in GO/UAP mode\n"); goto done; } @@ -2615,12 +2588,12 @@ woal_cfg80211_mgmt_tx(struct wiphy *wiphy, } } } -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) +#if KERNEL_VERSION(2, 6, 39) <= CFG80211_VERSION_CODE if ((ieee80211_is_action(((struct ieee80211_mgmt *)buf)->frame_control)) -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) +#if KERNEL_VERSION(3, 8, 0) <= CFG80211_VERSION_CODE || moal_extflg_isset(priv->phandle, EXT_HOST_MLME) #endif - ) { + ) { #ifdef WIFI_DIRECT_SUPPORT if (priv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT) woal_cfg80211_display_p2p_actframe(buf, len, chan, @@ -2634,44 +2607,37 @@ woal_cfg80211_mgmt_tx(struct wiphy *wiphy, woal_cancel_timer(&priv->phandle->remain_timer); woal_remain_timer_func(priv->phandle); } - /* With sd8777 We have difficulty to receive response packet in 500ms */ -#define MGMT_TX_DEFAULT_WAIT_TIME 1500 + /* With sd8777 We have difficulty to receive response packet in + * 500ms + */ +#define MGMT_TX_DEFAULT_WAIT_TIME 1500 if (priv->phandle->remain_on_channel) remain_priv = - priv->phandle->priv[priv->phandle-> - remain_bss_index]; + priv->phandle + ->priv[priv->phandle->remain_bss_index]; /** cancel previous remain on channel */ if (priv->phandle->remain_on_channel && remain_priv) { if ((priv->phandle->chan.center_freq != - chan->center_freq) - ) { - if (woal_cfg80211_remain_on_channel_cfg - (remain_priv, MOAL_IOCTL_WAIT, MTRUE, - &channel_status, NULL, 0, 0)) + chan->center_freq)) { + if (woal_cfg80211_remain_on_channel_cfg( + remain_priv, MOAL_IOCTL_WAIT, MTRUE, + &channel_status, NULL, 0, 0)) PRINTM(MERROR, "mgmt_tx:Fail to cancel remain on channel\n"); } if (priv->phandle->cookie) { cfg80211_remain_on_channel_expired( -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 6, 0) - remain_priv-> - netdev, +#if KERNEL_VERSION(3, 6, 0) > CFG80211_VERSION_CODE + remain_priv->netdev, #else - remain_priv-> - wdev, + remain_priv->wdev, #endif - priv-> - phandle-> - cookie, - &priv-> - phandle-> - chan, -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - priv-> - phandle-> - channel_type, + priv->phandle->cookie, + &priv->phandle->chan, +#if KERNEL_VERSION(3, 8, 0) > CFG80211_VERSION_CODE + priv->phandle->channel_type, #endif - GFP_ATOMIC); + GFP_ATOMIC); priv->phandle->cookie = 0; } priv->phandle->remain_on_channel = MFALSE; @@ -2682,37 +2648,36 @@ woal_cfg80211_mgmt_tx(struct wiphy *wiphy, #endif if (chan) { - duration = - (wait > - MGMT_TX_DEFAULT_WAIT_TIME) ? wait : - MGMT_TX_DEFAULT_WAIT_TIME; -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) + duration = (wait > MGMT_TX_DEFAULT_WAIT_TIME) ? + wait : + MGMT_TX_DEFAULT_WAIT_TIME; +#if KERNEL_VERSION(3, 8, 0) > CFG80211_VERSION_CODE if (channel_type_valid) - ret = woal_cfg80211_remain_on_channel_cfg(priv, - MOAL_IOCTL_WAIT, - MFALSE, - &channel_status, - chan, - channel_type, - duration); + ret = woal_cfg80211_remain_on_channel_cfg( + priv, MOAL_IOCTL_WAIT, MFALSE, + &channel_status, chan, channel_type, + duration); else #endif - ret = woal_cfg80211_remain_on_channel_cfg(priv, - MOAL_IOCTL_WAIT, - MFALSE, - &channel_status, - chan, - 0, - duration); + ret = woal_cfg80211_remain_on_channel_cfg( + priv, MOAL_IOCTL_WAIT, MFALSE, + &channel_status, chan, 0, duration); if (ret) { - /* Return fail will cause p2p connnection fail */ + /* Return fail will cause p2p connection fail + */ woal_sched_timeout(2); -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) +#if KERNEL_VERSION(3, 8, 0) > CFG80211_VERSION_CODE if (channel_type_valid) - ret = woal_cfg80211_remain_on_channel_cfg(priv, MOAL_IOCTL_WAIT, MFALSE, &channel_status, chan, channel_type, duration); + ret = woal_cfg80211_remain_on_channel_cfg( + priv, MOAL_IOCTL_WAIT, MFALSE, + &channel_status, chan, + channel_type, duration); else #endif - ret = woal_cfg80211_remain_on_channel_cfg(priv, MOAL_IOCTL_WAIT, MFALSE, &channel_status, chan, 0, duration); + ret = woal_cfg80211_remain_on_channel_cfg( + priv, MOAL_IOCTL_WAIT, MFALSE, + &channel_status, chan, 0, + duration); PRINTM(MERROR, "Try configure remain on channel again, ret=%d\n", ret); @@ -2721,20 +2686,18 @@ woal_cfg80211_mgmt_tx(struct wiphy *wiphy, priv->phandle->remain_on_channel = MTRUE; priv->phandle->remain_bss_index = priv->bss_index; -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) +#if KERNEL_VERSION(3, 8, 0) > CFG80211_VERSION_CODE priv->phandle->channel_type = channel_type; #endif - moal_memcpy_ext(priv->phandle, - &priv->phandle->chan, chan, - sizeof(struct - ieee80211_channel), - sizeof(struct - ieee80211_channel)); + moal_memcpy_ext( + priv->phandle, &priv->phandle->chan, + chan, sizeof(struct ieee80211_channel), + sizeof(struct ieee80211_channel)); PRINTM(MIOCTL, "%s: Mgmt Tx: Set remain channel=%d duration=%d\n", dev->name, - ieee80211_frequency_to_channel(chan-> - center_freq), + ieee80211_frequency_to_channel( + chan->center_freq), duration); } } @@ -2742,17 +2705,17 @@ woal_cfg80211_mgmt_tx(struct wiphy *wiphy, #endif /* pkt_type + tx_control */ -#define HEADER_SIZE 8 +#define HEADER_SIZE 8 packet_len = (t_u16)len + MLAN_MAC_ADDR_LENGTH; pmbuf = woal_alloc_mlan_buffer(priv->phandle, MLAN_MIN_DATA_HEADER_LEN + HEADER_SIZE + - packet_len + sizeof(packet_len)); + packet_len + sizeof(packet_len)); if (!pmbuf) { PRINTM(MERROR, "Fail to allocate mlan_buffer\n"); ret = -ENOMEM; goto done; } -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) +#if KERNEL_VERSION(3, 8, 0) > LINUX_VERSION_CODE *cookie = random32() | 1; #else *cookie = prandom_u32() | 1; @@ -2770,25 +2733,25 @@ woal_cfg80211_mgmt_tx(struct wiphy *wiphy, &tx_control, sizeof(tx_control), remain_len); remain_len -= sizeof(tx_control); /* frmctl + durationid + addr1 + addr2 + addr3 + seqctl */ -#define PACKET_ADDR4_POS (2 + 2 + 6 + 6 + 6 + 2) +#define PACKET_ADDR4_POS (2 + 2 + 6 + 6 + 6 + 2) moal_memcpy_ext(priv->phandle, pmbuf->pbuf + pmbuf->data_offset + HEADER_SIZE, &packet_len, sizeof(packet_len), remain_len); remain_len -= sizeof(packet_len); moal_memcpy_ext(priv->phandle, pmbuf->pbuf + pmbuf->data_offset + HEADER_SIZE + - sizeof(packet_len), buf, PACKET_ADDR4_POS, remain_len); + sizeof(packet_len), + buf, PACKET_ADDR4_POS, remain_len); remain_len -= PACKET_ADDR4_POS; moal_memcpy_ext(priv->phandle, pmbuf->pbuf + pmbuf->data_offset + HEADER_SIZE + - sizeof(packet_len) - + PACKET_ADDR4_POS, addr, MLAN_MAC_ADDR_LENGTH, - remain_len); + sizeof(packet_len) + PACKET_ADDR4_POS, + addr, MLAN_MAC_ADDR_LENGTH, remain_len); remain_len -= MLAN_MAC_ADDR_LENGTH; moal_memcpy_ext(priv->phandle, pmbuf->pbuf + pmbuf->data_offset + HEADER_SIZE + - sizeof(packet_len) - + PACKET_ADDR4_POS + MLAN_MAC_ADDR_LENGTH, + sizeof(packet_len) + PACKET_ADDR4_POS + + MLAN_MAC_ADDR_LENGTH, buf + PACKET_ADDR4_POS, len - PACKET_ADDR4_POS, remain_len); @@ -2796,12 +2759,14 @@ woal_cfg80211_mgmt_tx(struct wiphy *wiphy, pmbuf->buf_type = MLAN_BUF_TYPE_RAW_DATA; pmbuf->bss_index = priv->bss_index; if ((ieee80211_is_action(((struct ieee80211_mgmt *)buf)->frame_control)) -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) +#if KERNEL_VERSION(3, 8, 0) <= CFG80211_VERSION_CODE || moal_extflg_isset(priv->phandle, EXT_HOST_MLME) #endif - ) { + ) { pmbuf->flags = MLAN_BUF_FLAG_TX_STATUS; - pmbuf->tx_seq_num = ++priv->tx_seq_num; + if (!priv->tx_seq_num) + priv->tx_seq_num++; + pmbuf->tx_seq_num = priv->tx_seq_num++; tx_info = kzalloc(sizeof(struct tx_status_info), GFP_ATOMIC); if (tx_info) { skb = alloc_skb(len, GFP_ATOMIC); @@ -2836,24 +2801,25 @@ woal_cfg80211_mgmt_tx(struct wiphy *wiphy, queue_work(priv->phandle->workqueue, &priv->phandle->main_work); /* Delay 30ms to guarantee the packet has been already tx'ed, - * becuase if we call cfg80211_mgmt_tx_status() immediately, + * because if we call cfg80211_mgmt_tx_status() immediately, * then wpa_supplicant will call cancel_remain_on_channel(), * which may affect the mgmt frame tx. Meanwhile it is only - * necessary for P2P action handshake to wait 30ms. */ - if ((ieee80211_is_action - (((struct ieee80211_mgmt *)buf)->frame_control)) -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) + * necessary for P2P action handshake to wait 30ms. + */ + if ((ieee80211_is_action( + ((struct ieee80211_mgmt *)buf)->frame_control)) +#if KERNEL_VERSION(3, 8, 0) <= CFG80211_VERSION_CODE || moal_extflg_isset(priv->phandle, EXT_HOST_MLME) #endif - ) { + ) { if (tx_info) break; else woal_sched_timeout(30); } /* Notify the mgmt tx status */ -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 6, 0) +#if KERNEL_VERSION(2, 6, 37) <= CFG80211_VERSION_CODE +#if KERNEL_VERSION(3, 6, 0) > CFG80211_VERSION_CODE cfg80211_mgmt_tx_status(dev, *cookie, buf, len, true, GFP_ATOMIC); #else @@ -2877,7 +2843,6 @@ done: if (status != MLAN_STATUS_PENDING) { if (tx_info) woal_remove_tx_info(priv, tx_info->tx_seq_num); - } LEAVE(); @@ -2901,12 +2866,11 @@ done: * @return 0 -- success, otherwise fail */ static mlan_status -woal_cfg80211_custom_ie(moal_private *priv, - custom_ie *beacon_ies_data, t_u16 *beacon_index, - custom_ie *proberesp_ies_data, t_u16 *proberesp_index, - custom_ie *assocresp_ies_data, t_u16 *assocresp_index, - custom_ie *probereq_ies_data, t_u16 *probereq_index, - t_u8 wait_option) +woal_cfg80211_custom_ie(moal_private *priv, custom_ie *beacon_ies_data, + t_u16 *beacon_index, custom_ie *proberesp_ies_data, + t_u16 *proberesp_index, custom_ie *assocresp_ies_data, + t_u16 *assocresp_index, custom_ie *probereq_ies_data, + t_u16 *probereq_index, t_u8 wait_option) { mlan_ioctl_req *ioctl_req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -2930,8 +2894,8 @@ woal_cfg80211_custom_ie(moal_private *priv, pos = (t_u8 *)custom_ie->ie_data_list; remain_len = sizeof(custom_ie->ie_data_list); if (beacon_ies_data) { - len = sizeof(*beacon_ies_data) - MAX_IE_SIZE - + beacon_ies_data->ie_length; + len = sizeof(*beacon_ies_data) - MAX_IE_SIZE + + beacon_ies_data->ie_length; moal_memcpy_ext(priv->phandle, pos, beacon_ies_data, len, remain_len); pos += len; @@ -2940,8 +2904,8 @@ woal_cfg80211_custom_ie(moal_private *priv, } if (proberesp_ies_data) { - len = sizeof(*proberesp_ies_data) - MAX_IE_SIZE - + proberesp_ies_data->ie_length; + len = sizeof(*proberesp_ies_data) - MAX_IE_SIZE + + proberesp_ies_data->ie_length; moal_memcpy_ext(priv->phandle, pos, proberesp_ies_data, len, remain_len); pos += len; @@ -2950,8 +2914,8 @@ woal_cfg80211_custom_ie(moal_private *priv, } if (assocresp_ies_data) { - len = sizeof(*assocresp_ies_data) - MAX_IE_SIZE - + assocresp_ies_data->ie_length; + len = sizeof(*assocresp_ies_data) - MAX_IE_SIZE + + assocresp_ies_data->ie_length; moal_memcpy_ext(priv->phandle, pos, assocresp_ies_data, len, remain_len); pos += len; @@ -2960,8 +2924,8 @@ woal_cfg80211_custom_ie(moal_private *priv, } if (probereq_ies_data) { - len = sizeof(*probereq_ies_data) - MAX_IE_SIZE - + probereq_ies_data->ie_length; + len = sizeof(*probereq_ies_data) - MAX_IE_SIZE + + probereq_ies_data->ie_length; moal_memcpy_ext(priv->phandle, pos, probereq_ies_data, len, remain_len); pos += len; @@ -2985,47 +2949,46 @@ woal_cfg80211_custom_ie(moal_private *priv, sizeof(mlan_ds_misc_custom_ie)); status = woal_request_ioctl(priv, ioctl_req, wait_option); - if (MLAN_STATUS_SUCCESS != status) { + if (status != MLAN_STATUS_SUCCESS) goto done; - } /* get the assigned index */ pos = (t_u8 *)(&misc->param.cust_ie.ie_data_list[0].ie_index); - if (beacon_ies_data && beacon_ies_data->ie_length - && beacon_ies_data->ie_index == MLAN_CUSTOM_IE_AUTO_IDX_MASK) { + if (beacon_ies_data && beacon_ies_data->ie_length && + beacon_ies_data->ie_index == MLAN_CUSTOM_IE_AUTO_IDX_MASK) { /* save beacon ie index after auto-indexing */ *beacon_index = misc->param.cust_ie.ie_data_list[0].ie_index; - len = sizeof(*beacon_ies_data) - MAX_IE_SIZE - + beacon_ies_data->ie_length; + len = sizeof(*beacon_ies_data) - MAX_IE_SIZE + + beacon_ies_data->ie_length; pos += len; } - if (proberesp_ies_data && proberesp_ies_data->ie_length - && proberesp_ies_data->ie_index == MLAN_CUSTOM_IE_AUTO_IDX_MASK) { + if (proberesp_ies_data && proberesp_ies_data->ie_length && + proberesp_ies_data->ie_index == MLAN_CUSTOM_IE_AUTO_IDX_MASK) { /* save probe resp ie index after auto-indexing */ *proberesp_index = *((t_u16 *)pos); - len = sizeof(*proberesp_ies_data) - MAX_IE_SIZE - + proberesp_ies_data->ie_length; + len = sizeof(*proberesp_ies_data) - MAX_IE_SIZE + + proberesp_ies_data->ie_length; pos += len; } - if (assocresp_ies_data && assocresp_ies_data->ie_length - && assocresp_ies_data->ie_index == MLAN_CUSTOM_IE_AUTO_IDX_MASK) { + if (assocresp_ies_data && assocresp_ies_data->ie_length && + assocresp_ies_data->ie_index == MLAN_CUSTOM_IE_AUTO_IDX_MASK) { /* save assoc resp ie index after auto-indexing */ *assocresp_index = *((t_u16 *)pos); - len = sizeof(*assocresp_ies_data) - MAX_IE_SIZE - + assocresp_ies_data->ie_length; + len = sizeof(*assocresp_ies_data) - MAX_IE_SIZE + + assocresp_ies_data->ie_length; pos += len; } - if (probereq_ies_data && probereq_ies_data->ie_length - && probereq_ies_data->ie_index == MLAN_CUSTOM_IE_AUTO_IDX_MASK) { + if (probereq_ies_data && probereq_ies_data->ie_length && + probereq_ies_data->ie_index == MLAN_CUSTOM_IE_AUTO_IDX_MASK) { /* save probe resp ie index after auto-indexing */ *probereq_index = *((t_u16 *)pos); - len = sizeof(*probereq_ies_data) - MAX_IE_SIZE - + probereq_ies_data->ie_length; + len = sizeof(*probereq_ies_data) - MAX_IE_SIZE + + probereq_ies_data->ie_length; pos += len; } - //TODO why we check status_code at end + // TODO why we check status_code at end if (ioctl_req->status_code == MLAN_ERROR_IOCTL_FAIL) status = MLAN_STATUS_FAILURE; @@ -3037,7 +3000,7 @@ done: return status; } -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,14,0) +#if KERNEL_VERSION(3, 14, 0) <= CFG80211_VERSION_CODE /** * @brief set Qos map * @@ -3048,27 +3011,25 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_set_qos_map(struct wiphy *wiphy, - struct net_device *dev, - struct cfg80211_qos_map *qos_map) +int woal_cfg80211_set_qos_map(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_qos_map *qos_map) { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); int i, j, ret = 0; ENTER(); - /**clear dscp map*/ + /**clear dscp map*/ if (!qos_map) { memset(priv->dscp_map, 0xFF, sizeof(priv->dscp_map)); goto done; } - /**update dscp map*/ + /**update dscp map*/ for (i = 0; i < MAX_NUM_TID; i++) { PRINTM(MINFO, "TID %d: dscp_low=%d, dscp_high=%d\n", i, qos_map->up[i].low, qos_map->up[i].high); - if (qos_map->up[i].low != 0xff && qos_map->up[i].high != 0xff - && qos_map->up[i].high <= 63) { + if (qos_map->up[i].low != 0xff && qos_map->up[i].high != 0xff && + qos_map->up[i].high <= 63) { for (j = qos_map->up[i].low; j <= qos_map->up[i].high; j++) priv->dscp_map[j] = i; @@ -3086,7 +3047,7 @@ woal_cfg80211_set_qos_map(struct wiphy *wiphy, } } - /**UAP update (re)associate response*/ + /**UAP update (re)associate response*/ if (priv->bss_type == MLAN_BSS_TYPE_UAP) { IEEEtypes_Generic_t qos_map_ie; t_u16 qos_map_ies_len; @@ -3111,8 +3072,7 @@ woal_cfg80211_set_qos_map(struct wiphy *wiphy, sizeof(qos_map_ie.data) - 2 * qos_map->num_des); /* set the assoc response ies */ - ret = woal_cfg80211_mgmt_frame_ie(priv, - NULL, 0, NULL, 0, + ret = woal_cfg80211_mgmt_frame_ie(priv, NULL, 0, NULL, 0, (t_u8 *)&qos_map_ie, qos_map_ies_len, NULL, 0, MGMT_MASK_ASSOC_RESP_QOS_MAP, @@ -3121,7 +3081,6 @@ woal_cfg80211_set_qos_map(struct wiphy *wiphy, PRINTM(MERROR, "Failed to set beacon wps/p2p ie\n"); goto done; } - } done: @@ -3141,9 +3100,8 @@ done: * * @return out IE length */ -static t_u16 -woal_get_specific_ie(const t_u8 *ie, int len, t_u8 *ie_out, t_u32 ie_out_len, - t_u16 mask) +static t_u16 woal_get_specific_ie(const t_u8 *ie, int len, t_u8 *ie_out, + t_u32 ie_out_len, t_u16 mask) { int left_len = len; const t_u8 *pos = ie; @@ -3151,10 +3109,10 @@ woal_get_specific_ie(const t_u8 *ie, int len, t_u8 *ie_out, t_u32 ie_out_len, t_u8 id = 0; t_u16 out_len = 0; IEEEtypes_VendorSpecific_t *pvendor_ie = NULL; - const u8 wps_oui[4] = { 0x00, 0x50, 0xf2, 0x04 }; - const u8 p2p_oui[4] = { 0x50, 0x6f, 0x9a, 0x09 }; - const u8 wfd_oui[4] = { 0x50, 0x6f, 0x9a, 0x0a }; - const t_u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 }; + const u8 wps_oui[4] = {0x00, 0x50, 0xf2, 0x04}; + const u8 p2p_oui[4] = {0x50, 0x6f, 0x9a, 0x09}; + const u8 wfd_oui[4] = {0x50, 0x6f, 0x9a, 0x0a}; + const t_u8 wmm_oui[4] = {0x00, 0x50, 0xf2, 0x02}; ENTER(); while (left_len >= 2) { @@ -3164,37 +3122,33 @@ woal_get_specific_ie(const t_u8 *ie, int len, t_u8 *ie_out, t_u32 ie_out_len, break; if (id == VENDOR_SPECIFIC_221) { pvendor_ie = (IEEEtypes_VendorSpecific_t *)pos; - if (!memcmp - (pvendor_ie->vend_hdr.oui, wmm_oui, - sizeof(pvendor_ie->vend_hdr.oui)) && + if (!memcmp(pvendor_ie->vend_hdr.oui, wmm_oui, + sizeof(pvendor_ie->vend_hdr.oui)) && pvendor_ie->vend_hdr.oui_type == wmm_oui[3]) { PRINTM(MIOCTL, "find WMM IE\n"); - } else if (!memcmp - (pvendor_ie->vend_hdr.oui, p2p_oui, - sizeof(pvendor_ie->vend_hdr.oui)) && + } else if (!memcmp(pvendor_ie->vend_hdr.oui, p2p_oui, + sizeof(pvendor_ie->vend_hdr.oui)) && pvendor_ie->vend_hdr.oui_type == - p2p_oui[3]) { + p2p_oui[3]) { if (mask & IE_MASK_P2P) { - /** only get first p2p ie here */ + /** only get first p2p ie here */ moal_memcpy_ext(NULL, ie_out + out_len, pos, length + 2, ie_out_len - out_len); out_len += length + 2; break; } - } else if (!memcmp - (pvendor_ie->vend_hdr.oui, wps_oui, - sizeof(pvendor_ie->vend_hdr.oui)) && + } else if (!memcmp(pvendor_ie->vend_hdr.oui, wps_oui, + sizeof(pvendor_ie->vend_hdr.oui)) && pvendor_ie->vend_hdr.oui_type == - wps_oui[3]) { + wps_oui[3]) { if (mask & IE_MASK_WPS) { - if ((out_len + length + 2) < ie_out_len) { - moal_memcpy_ext(NULL, - ie_out + - out_len, pos, - length + 2, - ie_out_len - - out_len); + if ((out_len + length + 2) < + ie_out_len) { + moal_memcpy_ext( + NULL, ie_out + out_len, + pos, length + 2, + ie_out_len - out_len); out_len += length + 2; } else { PRINTM(MERROR, @@ -3202,19 +3156,17 @@ woal_get_specific_ie(const t_u8 *ie, int len, t_u8 *ie_out, t_u32 ie_out_len, break; } } - } else if (!memcmp - (pvendor_ie->vend_hdr.oui, wfd_oui, - sizeof(pvendor_ie->vend_hdr.oui)) && + } else if (!memcmp(pvendor_ie->vend_hdr.oui, wfd_oui, + sizeof(pvendor_ie->vend_hdr.oui)) && pvendor_ie->vend_hdr.oui_type == - wfd_oui[3]) { + wfd_oui[3]) { if (mask & IE_MASK_WFD) { - if ((out_len + length + 2) < ie_out_len) { - moal_memcpy_ext(NULL, - ie_out + - out_len, pos, - length + 2, - ie_out_len - - out_len); + if ((out_len + length + 2) < + ie_out_len) { + moal_memcpy_ext( + NULL, ie_out + out_len, + pos, length + 2, + ie_out_len - out_len); out_len += length + 2; } else { PRINTM(MERROR, @@ -3248,12 +3200,12 @@ woal_get_specific_ie(const t_u8 *ie, int len, t_u8 *ie_out, t_u32 ie_out_len, * @param ie Pointer to IEs * @param len Total length of ie * @param spec_ie Pointer to specific IE buffer - * @param spec_len Total length of specifc IE + * @param spec_len Total length of specific IE * * @return out IE length */ -static t_u8 -woal_find_ie(const t_u8 *ie, int len, const t_u8 *spec_ie, int spec_len) +static t_u8 woal_find_ie(const t_u8 *ie, int len, const t_u8 *spec_ie, + int spec_len) { int left_len = len; const t_u8 *pos = ie; @@ -3266,9 +3218,8 @@ woal_find_ie(const t_u8 *ie, int len, const t_u8 *spec_ie, int spec_len) if ((length + 2) > left_len) break; if ((length + 2) == spec_len) { - if (!memcmp(pos, spec_ie, spec_len)) { + if (!memcmp(pos, spec_ie, spec_len)) return MTRUE; - } } pos += (length + 2); left_len -= (length + 2); @@ -3286,14 +3237,14 @@ woal_find_ie(const t_u8 *ie, int len, const t_u8 *spec_ie, int spec_len) * @param ie_out_len Total length of ie_out * @param wps_flag flag for wps/p2p * @param dup_ie Pointer to duplicate ie - * @param dup_ie_len duplicate IE len + * @param dup_ie_len duplicate IE len * * @return out IE length */ -static t_u16 -woal_filter_beacon_ies(moal_private *priv, const t_u8 *ie, int len, - t_u8 *ie_out, t_u32 ie_out_len, t_u16 wps_flag, - const t_u8 *dup_ie, int dup_ie_len) +static t_u16 woal_filter_beacon_ies(moal_private *priv, const t_u8 *ie, int len, + t_u8 *ie_out, t_u32 ie_out_len, + t_u16 wps_flag, const t_u8 *dup_ie, + int dup_ie_len) { int left_len = len; const t_u8 *pos = ie; @@ -3301,17 +3252,18 @@ woal_filter_beacon_ies(moal_private *priv, const t_u8 *ie, int len, t_u8 id = 0; t_u16 out_len = 0; IEEEtypes_VendorSpecific_t *pvendor_ie = NULL; - const u8 wps_oui[4] = { 0x00, 0x50, 0xf2, 0x04 }; - const u8 p2p_oui[4] = { 0x50, 0x6f, 0x9a, 0x09 }; - const u8 wfd_oui[4] = { 0x50, 0x6f, 0x9a, 0x0a }; - const t_u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 }; + const u8 wps_oui[4] = {0x00, 0x50, 0xf2, 0x04}; + const u8 p2p_oui[4] = {0x50, 0x6f, 0x9a, 0x09}; + const u8 wfd_oui[4] = {0x50, 0x6f, 0x9a, 0x0a}; + const t_u8 wmm_oui[4] = {0x00, 0x50, 0xf2, 0x02}; t_u8 find_p2p_ie = MFALSE; t_u8 enable_11d = MFALSE; t_u8 ext_id = 0; int ie_len; /* ERP_INFO/EXTENDED_SUPPORT_RATES/HT_CAPABILITY/HT_OPERATION/WMM - * and WPS/P2P/WFD IE will be fileter out */ + * and WPS/P2P/WFD IE will be fileter out + */ while (left_len >= 2) { length = *(pos + 1); id = *pos; @@ -3343,8 +3295,11 @@ woal_filter_beacon_ies(moal_private *priv, const t_u8 *ie, int len, case HT_OPERATION: case VHT_CAPABILITY: case VHT_OPERATION: + /* Fall Through */ case REGULATORY_CLASS: + /* Fall Through */ case OVERLAPBSSSCANPARAM: + /* Fall Through */ case WAPI_IE: break; case EXTENSION: @@ -3366,9 +3321,12 @@ woal_filter_beacon_ies(moal_private *priv, const t_u8 *ie, int len, /* filter out EXTCAP */ if (wps_flag & IE_MASK_EXTCAP) { ie_len = length + 2; - woal_set_get_gen_ie(priv, MLAN_ACT_SET, - (t_u8 *)pos, &ie_len, - MOAL_IOCTL_WAIT); + if (MLAN_STATUS_SUCCESS != + woal_set_get_gen_ie(priv, MLAN_ACT_SET, + (t_u8 *)pos, &ie_len, + MOAL_IOCTL_WAIT)) + PRINTM(MERROR, + "Fail to set EXTCAP IE\n"); break; } if ((out_len + length + 2) < ie_out_len) { @@ -3382,24 +3340,21 @@ woal_filter_beacon_ies(moal_private *priv, const t_u8 *ie, int len, case VENDOR_SPECIFIC_221: /* filter out wmm ie */ pvendor_ie = (IEEEtypes_VendorSpecific_t *)pos; - if (!memcmp - (pvendor_ie->vend_hdr.oui, wmm_oui, - sizeof(pvendor_ie->vend_hdr.oui)) && + if (!memcmp(pvendor_ie->vend_hdr.oui, wmm_oui, + sizeof(pvendor_ie->vend_hdr.oui)) && pvendor_ie->vend_hdr.oui_type == wmm_oui[3]) { break; } /* filter out wps ie */ - else if (!memcmp - (pvendor_ie->vend_hdr.oui, wps_oui, - sizeof(pvendor_ie->vend_hdr.oui)) && + else if (!memcmp(pvendor_ie->vend_hdr.oui, wps_oui, + sizeof(pvendor_ie->vend_hdr.oui)) && pvendor_ie->vend_hdr.oui_type == wps_oui[3]) { if (wps_flag & IE_MASK_WPS) break; } /* filter out first p2p ie */ - else if (!memcmp - (pvendor_ie->vend_hdr.oui, p2p_oui, - sizeof(pvendor_ie->vend_hdr.oui)) && + else if (!memcmp(pvendor_ie->vend_hdr.oui, p2p_oui, + sizeof(pvendor_ie->vend_hdr.oui)) && pvendor_ie->vend_hdr.oui_type == p2p_oui[3]) { if (!find_p2p_ie && (wps_flag & IE_MASK_P2P)) { find_p2p_ie = MTRUE; @@ -3407,14 +3362,13 @@ woal_filter_beacon_ies(moal_private *priv, const t_u8 *ie, int len, } } /* filter out wfd ie */ - else if (!memcmp - (pvendor_ie->vend_hdr.oui, wfd_oui, - sizeof(pvendor_ie->vend_hdr.oui)) && + else if (!memcmp(pvendor_ie->vend_hdr.oui, wfd_oui, + sizeof(pvendor_ie->vend_hdr.oui)) && pvendor_ie->vend_hdr.oui_type == wfd_oui[3]) { if (wps_flag & IE_MASK_WFD) break; } else if (wps_flag & IE_MASK_VENDOR) { - //filter out vendor IE + // filter out vendor IE break; } if ((out_len + length + 2) < ie_out_len) { @@ -3457,15 +3411,16 @@ woal_filter_beacon_ies(moal_private *priv, const t_u8 *ie, int len, * * @return MTRUE/MFALSE */ -t_u8 -is_selected_registrar_on(const t_u8 *ie, int len) +t_u8 is_selected_registrar_on(const t_u8 *ie, int len) { -#define WPS_IE_FIX_LEN 6 +#define WPS_IE_FIX_LEN 6 #define TLV_ID_SELECTED_REGISTRAR 0x1041 int left_len = len - WPS_IE_FIX_LEN; + TLV_Generic_t *tlv = (TLV_Generic_t *)(ie + WPS_IE_FIX_LEN); u16 tlv_type, tlv_len; u8 *pos = NULL; + while (left_len > sizeof(TLV_Generic_t)) { tlv_type = ntohs(tlv->type); tlv_len = ntohs(tlv->len); @@ -3493,15 +3448,14 @@ is_selected_registrar_on(const t_u8 *ie, int len) * * @return MTRUE/MFALSE */ -static t_u16 -woal_is_selected_registrar_on(const t_u8 *ie, int len) +static t_u16 woal_is_selected_registrar_on(const t_u8 *ie, int len) { int left_len = len; const t_u8 *pos = ie; int length; t_u8 id = 0; IEEEtypes_VendorSpecific_t *pvendor_ie = NULL; - const u8 wps_oui[4] = { 0x00, 0x50, 0xf2, 0x04 }; + const u8 wps_oui[4] = {0x00, 0x50, 0xf2, 0x04}; while (left_len >= 2) { length = *(pos + 1); @@ -3511,9 +3465,8 @@ woal_is_selected_registrar_on(const t_u8 *ie, int len) switch (id) { case VENDOR_SPECIFIC_221: pvendor_ie = (IEEEtypes_VendorSpecific_t *)pos; - if (!memcmp - (pvendor_ie->vend_hdr.oui, wps_oui, - sizeof(pvendor_ie->vend_hdr.oui)) && + if (!memcmp(pvendor_ie->vend_hdr.oui, wps_oui, + sizeof(pvendor_ie->vend_hdr.oui)) && pvendor_ie->vend_hdr.oui_type == wps_oui[3]) { PRINTM(MIOCTL, "Find WPS ie\n"); return is_selected_registrar_on(pos, @@ -3547,13 +3500,12 @@ woal_is_selected_registrar_on(const t_u8 *ie, int len) * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_mgmt_frame_ie(moal_private *priv, - const t_u8 *beacon_ies, size_t beacon_ies_len, - const t_u8 *proberesp_ies, size_t proberesp_ies_len, - const t_u8 *assocresp_ies, size_t assocresp_ies_len, - const t_u8 *probereq_ies, size_t probereq_ies_len, - t_u16 mask, t_u8 wait_option) +int woal_cfg80211_mgmt_frame_ie( + moal_private *priv, const t_u8 *beacon_ies, size_t beacon_ies_len, + const t_u8 *proberesp_ies, size_t proberesp_ies_len, + const t_u8 *assocresp_ies, size_t assocresp_ies_len, + const t_u8 *probereq_ies, size_t probereq_ies_len, t_u16 mask, + t_u8 wait_option) { int ret = 0; t_u8 *pos = NULL; @@ -3574,7 +3526,9 @@ woal_cfg80211_mgmt_frame_ie(moal_private *priv, ENTER(); - /* we need remove vendor IE from beacon extra IE, vendor IE will be configure through proberesp_vendor_index */ + /* we need remove vendor IE from beacon extra IE, vendor IE will be + * configure through proberesp_vendor_index + */ if (mask & MGMT_MASK_BEACON_WPS_P2P) { beacon_ies_data = kzalloc(sizeof(custom_ie), GFP_KERNEL); if (!beacon_ies_data) { @@ -3583,8 +3537,8 @@ woal_cfg80211_mgmt_frame_ie(moal_private *priv, } if (beacon_ies && beacon_ies_len) { #ifdef WIFI_DIRECT_SUPPORT - if (woal_is_selected_registrar_on - (beacon_ies, beacon_ies_len)) { + if (woal_is_selected_registrar_on(beacon_ies, + beacon_ies_len)) { PRINTM(MIOCTL, "selected_registrar is on\n"); priv->phandle->is_go_timer_set = MTRUE; woal_mod_timer(&priv->phandle->go_timer, @@ -3594,12 +3548,10 @@ woal_cfg80211_mgmt_frame_ie(moal_private *priv, #endif beacon_ies_data->ie_index = beacon_wps_index; beacon_ies_data->mgmt_subtype_mask = MGMT_MASK_BEACON; - beacon_ies_data->ie_length = - woal_filter_beacon_ies(priv, beacon_ies, - beacon_ies_len, - beacon_ies_data-> - ie_buffer, MAX_IE_SIZE, - IE_MASK_VENDOR, NULL, 0); + beacon_ies_data->ie_length = woal_filter_beacon_ies( + priv, beacon_ies, beacon_ies_len, + beacon_ies_data->ie_buffer, MAX_IE_SIZE, + IE_MASK_VENDOR, NULL, 0); DBG_HEXDUMP(MCMD_D, "beacon extra ie", beacon_ies_data->ie_buffer, beacon_ies_data->ie_length); @@ -3617,19 +3569,17 @@ woal_cfg80211_mgmt_frame_ie(moal_private *priv, beacon_ies_data->ie_length = 0; beacon_wps_index = MLAN_CUSTOM_IE_AUTO_IDX_MASK; } - if ((beacon_ies && beacon_ies_len && beacon_ies_data->ie_length) - || (beacon_ies_data->mgmt_subtype_mask == - MLAN_CUSTOM_IE_DELETE_MASK)) { + if ((beacon_ies && beacon_ies_len && + beacon_ies_data->ie_length) || + (beacon_ies_data->mgmt_subtype_mask == + MLAN_CUSTOM_IE_DELETE_MASK)) { if (MLAN_STATUS_FAILURE == - woal_cfg80211_custom_ie(priv, beacon_ies_data, - &beacon_wps_index, - proberesp_ies_data, - &proberesp_index, - assocresp_ies_data, - &assocresp_index, - probereq_ies_data, - &probereq_index, - wait_option)) { + woal_cfg80211_custom_ie( + priv, beacon_ies_data, &beacon_wps_index, + proberesp_ies_data, &proberesp_index, + assocresp_ies_data, &assocresp_index, + probereq_ies_data, &probereq_index, + wait_option)) { PRINTM(MERROR, "Fail to set beacon wps IE\n"); ret = -EFAULT; } @@ -3638,7 +3588,8 @@ woal_cfg80211_mgmt_frame_ie(moal_private *priv, beacon_wps_index, beacon_ies_data->ie_length); goto done; } - kfree(beacon_ies_data); // Further allocation of beacon_ies_data is happening, so need to free here. + kfree(beacon_ies_data); // Further allocation of beacon_ies_data + // is happening, so need to free here. beacon_ies_data = NULL; } @@ -3685,8 +3636,8 @@ woal_cfg80211_mgmt_frame_ie(moal_private *priv, assocrep_qos_map_index = MLAN_CUSTOM_IE_AUTO_IDX_MASK; } if (MLAN_STATUS_FAILURE == - woal_cfg80211_custom_ie(priv, NULL, &beacon_wps_index, - NULL, &proberesp_index, + woal_cfg80211_custom_ie(priv, NULL, &beacon_wps_index, NULL, + &proberesp_index, assocresp_ies_data, &assocrep_qos_map_index, NULL, &probereq_index, wait_option)) { @@ -3742,11 +3693,13 @@ woal_cfg80211_mgmt_frame_ie(moal_private *priv, if (beacon_ies_data) { if (beacon_ies && beacon_ies_len) { - /* set the probe response/beacon vendor ies which includes wpa IE */ + /* set the probe response/beacon vendor ies which + * includes wpa IE + */ beacon_ies_data->ie_index = beacon_vendor_index; beacon_ies_data->mgmt_subtype_mask = MGMT_MASK_PROBE_RESP | MGMT_MASK_BEACON; - if (MLAN_CUSTOM_IE_AUTO_IDX_MASK == beacon_vendor_index) + if (beacon_vendor_index == MLAN_CUSTOM_IE_AUTO_IDX_MASK) beacon_ies_data->mgmt_subtype_mask |= MLAN_CUSTOM_IE_NEW_MASK; beacon_ies_data->ie_length = @@ -3757,7 +3710,8 @@ woal_cfg80211_mgmt_frame_ie(moal_private *priv, DBG_HEXDUMP(MCMD_D, "beacon vendor IE", beacon_ies_data->ie_buffer, beacon_ies_data->ie_length); - } else if (beacon_vendor_index != MLAN_CUSTOM_IE_AUTO_IDX_MASK) { + } else if (beacon_vendor_index != + MLAN_CUSTOM_IE_AUTO_IDX_MASK) { /* clear the beacon vendor ies */ if (beacon_vendor_index > MAX_MGMT_IE_INDEX) { PRINTM(MERROR, @@ -3770,16 +3724,16 @@ woal_cfg80211_mgmt_frame_ie(moal_private *priv, beacon_ies_data->ie_length = 0; beacon_vendor_index = MLAN_CUSTOM_IE_AUTO_IDX_MASK; } - if ((beacon_ies && beacon_ies_len && beacon_ies_data->ie_length) - || (beacon_ies_data->mgmt_subtype_mask == - MLAN_CUSTOM_IE_DELETE_MASK)) { + if ((beacon_ies && beacon_ies_len && + beacon_ies_data->ie_length) || + (beacon_ies_data->mgmt_subtype_mask == + MLAN_CUSTOM_IE_DELETE_MASK)) { if (MLAN_STATUS_FAILURE == - woal_cfg80211_custom_ie(priv, beacon_ies_data, - &beacon_vendor_index, NULL, - &proberesp_index, NULL, - &assocresp_index, NULL, - &probereq_index, - wait_option)) { + woal_cfg80211_custom_ie( + priv, beacon_ies_data, &beacon_vendor_index, + NULL, &proberesp_index, NULL, + &assocresp_index, NULL, &probereq_index, + wait_option)) { PRINTM(MERROR, "Fail to set beacon vendor IE\n"); ret = -EFAULT; @@ -3792,20 +3746,19 @@ woal_cfg80211_mgmt_frame_ie(moal_private *priv, memset(beacon_ies_data, 0x00, sizeof(custom_ie)); if (beacon_ies && beacon_ies_len) { /* set the beacon ies */ - /* we need remove vendor IE from beacon tail, vendor/wpa IE will be configure through beacon_vendor_index */ + /* we need remove vendor IE from beacon tail, vendor/wpa + * IE will be configure through beacon_vendor_index + */ beacon_ies_data->ie_index = beacon_index; - beacon_ies_data->mgmt_subtype_mask = MGMT_MASK_BEACON | - MGMT_MASK_ASSOC_RESP | MGMT_MASK_PROBE_RESP; - beacon_ies_data->ie_length = - woal_filter_beacon_ies(priv, beacon_ies, - beacon_ies_len, - beacon_ies_data-> - ie_buffer, MAX_IE_SIZE, - IE_MASK_WPS | IE_MASK_WFD - | IE_MASK_P2P | - IE_MASK_VENDOR, - proberesp_ies, - proberesp_ies_len); + beacon_ies_data->mgmt_subtype_mask = + MGMT_MASK_BEACON | MGMT_MASK_ASSOC_RESP | + MGMT_MASK_PROBE_RESP; + beacon_ies_data->ie_length = woal_filter_beacon_ies( + priv, beacon_ies, beacon_ies_len, + beacon_ies_data->ie_buffer, MAX_IE_SIZE, + IE_MASK_WPS | IE_MASK_WFD | IE_MASK_P2P | + IE_MASK_VENDOR, + proberesp_ies, proberesp_ies_len); if (beacon_ies_data->ie_length) DBG_HEXDUMP(MCMD_D, "beacon ie", beacon_ies_data->ie_buffer, @@ -3836,16 +3789,15 @@ woal_cfg80211_mgmt_frame_ie(moal_private *priv, proberesp_ies_data->ie_index = proberesp_p2p_index; proberesp_ies_data->mgmt_subtype_mask = MGMT_MASK_PROBE_RESP; - proberesp_ies_data->ie_length = - woal_get_specific_ie(proberesp_ies, - proberesp_ies_len, - proberesp_ies_data-> - ie_buffer, MAX_IE_SIZE, - IE_MASK_P2P); + proberesp_ies_data->ie_length = woal_get_specific_ie( + proberesp_ies, proberesp_ies_len, + proberesp_ies_data->ie_buffer, MAX_IE_SIZE, + IE_MASK_P2P); DBG_HEXDUMP(MCMD_D, "proberesp p2p ie", proberesp_ies_data->ie_buffer, proberesp_ies_data->ie_length); - } else if (proberesp_p2p_index != MLAN_CUSTOM_IE_AUTO_IDX_MASK) { + } else if (proberesp_p2p_index != + MLAN_CUSTOM_IE_AUTO_IDX_MASK) { /* clear the probe response p2p ies */ if (proberesp_p2p_index > MAX_MGMT_IE_INDEX) { PRINTM(MERROR, @@ -3863,12 +3815,11 @@ woal_cfg80211_mgmt_frame_ie(moal_private *priv, (proberesp_ies_data->mgmt_subtype_mask == MLAN_CUSTOM_IE_DELETE_MASK)) { if (MLAN_STATUS_FAILURE == - woal_cfg80211_custom_ie(priv, NULL, &beacon_index, - proberesp_ies_data, - &proberesp_p2p_index, NULL, - &assocresp_index, NULL, - &probereq_index, - wait_option)) { + woal_cfg80211_custom_ie( + priv, NULL, &beacon_index, + proberesp_ies_data, &proberesp_p2p_index, + NULL, &assocresp_index, NULL, + &probereq_index, wait_option)) { PRINTM(MERROR, "Fail to set proberesp p2p IE\n"); ret = -EFAULT; @@ -3885,16 +3836,13 @@ woal_cfg80211_mgmt_frame_ie(moal_private *priv, proberesp_ies_data->ie_index = proberesp_index; proberesp_ies_data->mgmt_subtype_mask = MGMT_MASK_PROBE_RESP; - if (MLAN_CUSTOM_IE_AUTO_IDX_MASK == proberesp_index) + if (proberesp_index == MLAN_CUSTOM_IE_AUTO_IDX_MASK) proberesp_ies_data->mgmt_subtype_mask |= MLAN_CUSTOM_IE_NEW_MASK; - proberesp_ies_data->ie_length = - woal_filter_beacon_ies(priv, proberesp_ies, - proberesp_ies_len, - proberesp_ies_data-> - ie_buffer, MAX_IE_SIZE, - IE_MASK_P2P | - IE_MASK_VENDOR, NULL, 0); + proberesp_ies_data->ie_length = woal_filter_beacon_ies( + priv, proberesp_ies, proberesp_ies_len, + proberesp_ies_data->ie_buffer, MAX_IE_SIZE, + IE_MASK_P2P | IE_MASK_VENDOR, NULL, 0); if (proberesp_ies_data->ie_length) { DBG_HEXDUMP(MCMD_D, "proberesp ie", proberesp_ies_data->ie_buffer, @@ -3923,7 +3871,7 @@ woal_cfg80211_mgmt_frame_ie(moal_private *priv, assocresp_ies_data->ie_index = assocresp_index; assocresp_ies_data->mgmt_subtype_mask = MGMT_MASK_ASSOC_RESP; - if (MLAN_CUSTOM_IE_AUTO_IDX_MASK == assocresp_index) + if (assocresp_index == MLAN_CUSTOM_IE_AUTO_IDX_MASK) assocresp_ies_data->mgmt_subtype_mask |= MLAN_CUSTOM_IE_NEW_MASK; if (assocresp_ies_len > MAX_IE_SIZE) { @@ -3966,16 +3914,14 @@ woal_cfg80211_mgmt_frame_ie(moal_private *priv, if (priv->bss_type != MLAN_BSS_TYPE_WIFIDIRECT) { /* filter out P2P/WFD ie/EXT_CAP ie */ probereq_ies_data->ie_length = - woal_filter_beacon_ies(priv, - probereq_ies, - probereq_ies_len, - probereq_ies_data-> - ie_buffer, - MAX_IE_SIZE, - IE_MASK_P2P | - IE_MASK_WFD | - IE_MASK_EXTCAP, - NULL, 0); + woal_filter_beacon_ies( + priv, probereq_ies, + probereq_ies_len, + probereq_ies_data->ie_buffer, + MAX_IE_SIZE, + IE_MASK_P2P | IE_MASK_WFD | + IE_MASK_EXTCAP, + NULL, 0); } else { #endif /* KERNEL_VERSION */ #endif /* WIFI_DIRECT_SUPPORT */ @@ -4021,12 +3967,11 @@ woal_cfg80211_mgmt_frame_ie(moal_private *priv, if (beacon_ies_data || proberesp_ies_data || assocresp_ies_data || probereq_ies_data) { if (MLAN_STATUS_FAILURE == - woal_cfg80211_custom_ie(priv, beacon_ies_data, - &beacon_index, proberesp_ies_data, - &proberesp_index, - assocresp_ies_data, - &assocresp_index, probereq_ies_data, - &probereq_index, wait_option)) { + woal_cfg80211_custom_ie( + priv, beacon_ies_data, &beacon_index, + proberesp_ies_data, &proberesp_index, + assocresp_ies_data, &assocresp_index, + probereq_ies_data, &probereq_index, wait_option)) { PRINTM(MERROR, "Fail to set beacon proberesp assoc probereq IES\n"); ret = -EFAULT; @@ -4071,14 +4016,13 @@ done: * with default values * * @param ht_info A pointer to ieee80211_sta_ht_cap structure - * @param dev_cap Device capability informations + * @param dev_cap Device capability information * @param mcs_set Device MCS sets * * @return N/A */ -void -woal_cfg80211_setup_ht_cap(struct ieee80211_sta_ht_cap *ht_info, - t_u32 dev_cap, t_u8 *mcs_set) +void woal_cfg80211_setup_ht_cap(struct ieee80211_sta_ht_cap *ht_info, + t_u32 dev_cap, t_u8 *mcs_set) { ENTER(); @@ -4092,38 +4036,38 @@ woal_cfg80211_setup_ht_cap(struct ieee80211_sta_ht_cap *ht_info, moal_memcpy_ext(NULL, ht_info->mcs.rx_mask, mcs_set, sizeof(ht_info->mcs.rx_mask), sizeof(ht_info->mcs.rx_mask)); - if (dev_cap & MBIT(8)) /* 40Mhz intolarance enabled */ + if (dev_cap & MBIT(8)) /* 40Mhz intolarance enabled */ ht_info->cap |= IEEE80211_HT_CAP_40MHZ_INTOLERANT; - if (dev_cap & MBIT(17)) /* Channel width 20/40Mhz support */ + if (dev_cap & MBIT(17)) /* Channel width 20/40Mhz support */ ht_info->cap |= IEEE80211_HT_CAP_SUP_WIDTH_20_40; - if ((dev_cap >> 20) & 0x03) /* Delayed ACK supported */ + if ((dev_cap >> 20) & 0x03) /* Delayed ACK supported */ ht_info->cap |= IEEE80211_HT_CAP_DELAY_BA; - if (dev_cap & MBIT(22)) /* Rx LDPC supported */ + if (dev_cap & MBIT(22)) /* Rx LDPC supported */ ht_info->cap |= IEEE80211_HT_CAP_LDPC_CODING; - if (dev_cap & MBIT(23)) /* Short GI @ 20Mhz supported */ + if (dev_cap & MBIT(23)) /* Short GI @ 20Mhz supported */ ht_info->cap |= IEEE80211_HT_CAP_SGI_20; - if (dev_cap & MBIT(24)) /* Short GI @ 40Mhz supported */ + if (dev_cap & MBIT(24)) /* Short GI @ 40Mhz supported */ ht_info->cap |= IEEE80211_HT_CAP_SGI_40; - if (dev_cap & MBIT(25)) /* Tx STBC supported */ + if (dev_cap & MBIT(25)) /* Tx STBC supported */ ht_info->cap |= IEEE80211_HT_CAP_TX_STBC; - if (dev_cap & MBIT(26)) /* Rx STBC supported */ + if (dev_cap & MBIT(26)) /* Rx STBC supported */ ht_info->cap |= IEEE80211_HT_CAP_RX_STBC; - if (dev_cap & MBIT(27)) /* MIMO PS supported */ - ht_info->cap |= 0; /* WLAN_HT_CAP_SM_PS_STATIC */ - else /* Disable HT SM PS */ + if (dev_cap & MBIT(27)) /* MIMO PS supported */ + ht_info->cap |= 0; /* WLAN_HT_CAP_SM_PS_STATIC */ + else /* Disable HT SM PS */ ht_info->cap |= IEEE80211_HT_CAP_SM_PS; - if (dev_cap & MBIT(29)) /* Green field supported */ + if (dev_cap & MBIT(29)) /* Green field supported */ ht_info->cap |= IEEE80211_HT_CAP_GRN_FLD; - if (dev_cap & MBIT(31)) /* MAX AMSDU supported */ + if (dev_cap & MBIT(31)) /* MAX AMSDU supported */ ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU; - /* DSSS/CCK in 40Mhz supported */ + /* DSSS/CCK in 40Mhz supported*/ ht_info->cap |= IEEE80211_HT_CAP_DSSSCCK40; ht_info->mcs.tx_params = IEEE80211_HT_MCS_TX_DEFINED; LEAVE(); } -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) +#if KERNEL_VERSION(3, 6, 0) <= CFG80211_VERSION_CODE /** * @brief Sets up the CFG802.11 specific VHT capability fields * with default values @@ -4133,9 +4077,8 @@ woal_cfg80211_setup_ht_cap(struct ieee80211_sta_ht_cap *ht_info, * * @return N/A */ -void -woal_cfg80211_setup_vht_cap(moal_private *priv, - struct ieee80211_sta_vht_cap *vht_cap) +void woal_cfg80211_setup_vht_cap(moal_private *priv, + struct ieee80211_sta_vht_cap *vht_cap) { mlan_ioctl_req *req = NULL; mlan_ds_11ac_cfg *cfg_11ac = NULL; @@ -4154,7 +4097,7 @@ woal_cfg80211_setup_vht_cap(moal_private *priv, cfg_11ac->param.vht_cfg.band = BAND_SELECT_A; cfg_11ac->param.vht_cfg.txrx = MLAN_RADIO_RX; status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); - if (MLAN_STATUS_SUCCESS != status) { + if (status != MLAN_STATUS_SUCCESS) { PRINTM(MERROR, "Fail to get vht_cfg\n"); goto done; } @@ -4175,22 +4118,21 @@ done: if (status != MLAN_STATUS_PENDING) kfree(req); LEAVE(); - return; } #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 20, 0) +#if KERNEL_VERSION(4, 20, 0) <= CFG80211_VERSION_CODE /** - * @brief Sets up the CFG802.11 specific HE capability fields * with default values + * @brief Sets up the CFG802.11 specific HE capability fields * with default + * values * * @param priv A pointer to moal private structure * @param iftype_data A pointer to ieee80211_sband_iftype_data structure * * @return N/A */ -void -woal_cfg80211_setup_he_cap(moal_private *priv, - struct ieee80211_supported_band *band) +void woal_cfg80211_setup_he_cap(moal_private *priv, + struct ieee80211_supported_band *band) { mlan_fw_info fw_info; struct ieee80211_sband_iftype_data *iftype_data = NULL; @@ -4198,12 +4140,13 @@ woal_cfg80211_setup_he_cap(moal_private *priv, int ppe_threshold_len = 0; mlan_ds_11ax_he_capa *phe_cap = NULL; t_u8 hw_hecap_len; + woal_request_get_fw_info(priv, MOAL_IOCTL_WAIT, &fw_info); if (band->band == NL80211_BAND_5GHZ) { - phe_cap = (mlan_ds_11ax_he_capa *) fw_info.hw_he_cap; + phe_cap = (mlan_ds_11ax_he_capa *)fw_info.hw_he_cap; hw_hecap_len = fw_info.hw_hecap_len; } else { - phe_cap = (mlan_ds_11ax_he_capa *) fw_info.hw_2g_he_cap; + phe_cap = (mlan_ds_11ax_he_capa *)fw_info.hw_2g_he_cap; hw_hecap_len = fw_info.hw_2g_hecap_len; } if (!hw_hecap_len) @@ -4233,21 +4176,22 @@ woal_cfg80211_setup_he_cap(moal_private *priv, phe_cap->he_txrx_mcs_support, sizeof(phe_cap->he_txrx_mcs_support), sizeof(struct ieee80211_he_mcs_nss_supp)); - //Support 160Mhz + // Support 160Mhz if (phe_cap->he_phy_cap[0] & MBIT(3)) extra_mcs_size += 4; - //Support 80+80 + // Support 80+80 if (phe_cap->he_phy_cap[0] & MBIT(4)) extra_mcs_size += 4; if (extra_mcs_size) - moal_memcpy_ext(priv->phandle, - (t_u8 *)&iftype_data->he_cap.he_mcs_nss_supp. - rx_mcs_160, phe_cap->val, extra_mcs_size, - sizeof(struct ieee80211_he_mcs_nss_supp) - 4); + moal_memcpy_ext( + priv->phandle, + (t_u8 *)&iftype_data->he_cap.he_mcs_nss_supp.rx_mcs_160, + phe_cap->val, extra_mcs_size, + sizeof(struct ieee80211_he_mcs_nss_supp) - 4); -#define HE_CAP_FIX_SIZE 22 - //Support PPE threshold +#define HE_CAP_FIX_SIZE 22 + // Support PPE threshold ppe_threshold_len = phe_cap->len - HE_CAP_FIX_SIZE - extra_mcs_size; if (phe_cap->he_phy_cap[6] & MBIT(7) && ppe_threshold_len) { moal_memcpy_ext(priv->phandle, iftype_data->he_cap.ppe_thres, @@ -4263,7 +4207,6 @@ woal_cfg80211_setup_he_cap(moal_private *priv, band->iftype_data = iftype_data; done: LEAVE(); - return; } /** @@ -4274,10 +4217,10 @@ done: * * @return N/A */ -void -woal_cfg80211_free_iftype_data(struct wiphy *wiphy) +void woal_cfg80211_free_iftype_data(struct wiphy *wiphy) { enum nl80211_band band; + for (band = NL80211_BAND_2GHZ; band < NUM_NL80211_BANDS; ++band) { if (!wiphy->bands[band]) continue; @@ -4288,7 +4231,7 @@ woal_cfg80211_free_iftype_data(struct wiphy *wiphy) #endif #ifdef STA_CFG80211 -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) +#if KERNEL_VERSION(3, 2, 0) <= CFG80211_VERSION_CODE /** * @brief prepare woal_bgscan_stop event * @@ -4297,12 +4240,12 @@ woal_cfg80211_free_iftype_data(struct wiphy *wiphy) * * @return N/A */ -void -woal_bgscan_stop_event(moal_private *priv) +void woal_bgscan_stop_event(moal_private *priv) { struct woal_event *evt; unsigned long flags; moal_handle *handle = priv->phandle; + evt = kzalloc(sizeof(struct woal_event), GFP_ATOMIC); if (evt) { evt->priv = priv; @@ -4322,30 +4265,31 @@ woal_bgscan_stop_event(moal_private *priv) * * @return N/A */ -void -woal_cfg80211_notify_sched_scan_stop(moal_private *priv) +void woal_cfg80211_notify_sched_scan_stop(moal_private *priv) { -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 6) +#if KERNEL_VERSION(3, 14, 6) <= CFG80211_VERSION_CODE if (rtnl_is_locked()) cfg80211_sched_scan_stopped_rtnl(priv->wdev->wiphy -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - , 0 +#if KERNEL_VERSION(4, 12, 0) <= CFG80211_VERSION_CODE + , + 0 #endif - ); + ); else #endif cfg80211_sched_scan_stopped(priv->wdev->wiphy -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - , 0 +#if KERNEL_VERSION(4, 12, 0) <= CFG80211_VERSION_CODE + , + 0 #endif - ); + ); priv->sched_scanning = MFALSE; PRINTM(MEVENT, "Sched_Scan stopped\n"); } #endif #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) +#if KERNEL_VERSION(3, 5, 0) <= CFG80211_VERSION_CODE /** * @brief Handle woal_channel_switch event * @@ -4354,12 +4298,12 @@ woal_cfg80211_notify_sched_scan_stop(moal_private *priv) * * @return N/A */ -void -woal_channel_switch_event(moal_private *priv, chan_band_info * pchan_info) +void woal_channel_switch_event(moal_private *priv, chan_band_info *pchan_info) { struct woal_event *evt; unsigned long flags; moal_handle *handle = priv->phandle; + evt = kzalloc(sizeof(struct woal_event), GFP_ATOMIC); if (evt) { evt->priv = priv; @@ -4381,13 +4325,13 @@ woal_channel_switch_event(moal_private *priv, chan_band_info * pchan_info) * * @return N/A */ -void -woal_cfg80211_notify_channel(moal_private *priv, chan_band_info * pchan_info) +void woal_cfg80211_notify_channel(moal_private *priv, + chan_band_info *pchan_info) { -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) +#if KERNEL_VERSION(3, 8, 0) <= CFG80211_VERSION_CODE struct cfg80211_chan_def chandef; #else -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) +#if KERNEL_VERSION(3, 5, 0) <= CFG80211_VERSION_CODE enum nl80211_channel_type type; enum ieee80211_band band; int freq = 0; @@ -4395,7 +4339,7 @@ woal_cfg80211_notify_channel(moal_private *priv, chan_band_info * pchan_info) #endif ENTER(); -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) +#if KERNEL_VERSION(3, 8, 0) <= CFG80211_VERSION_CODE if (MLAN_STATUS_SUCCESS == woal_chandef_create(priv, &chandef, pchan_info)) { cfg80211_ch_switch_notify(priv->netdev, &chandef); @@ -4407,7 +4351,7 @@ woal_cfg80211_notify_channel(moal_private *priv, chan_band_info * pchan_info) #endif } #else -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) +#if KERNEL_VERSION(3, 5, 0) <= CFG80211_VERSION_CODE if (pchan_info->bandcfg.chanBand == BAND_2GHZ) band = IEEE80211_BAND_2GHZ; else if (pchan_info->bandcfg.chanBand == BAND_5GHZ) @@ -4441,7 +4385,7 @@ woal_cfg80211_notify_channel(moal_private *priv, chan_band_info * pchan_info) } #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) +#if KERNEL_VERSION(3, 8, 0) <= CFG80211_VERSION_CODE /** * @brief create cfg80211_chan_def structure based on chan_band info * @@ -4451,9 +4395,9 @@ woal_cfg80211_notify_channel(moal_private *priv, chan_band_info * pchan_info) * * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_FAILURE */ -mlan_status -woal_chandef_create(moal_private *priv, struct cfg80211_chan_def *chandef, - chan_band_info * pchan_info) +mlan_status woal_chandef_create(moal_private *priv, + struct cfg80211_chan_def *chandef, + chan_band_info *pchan_info) { enum ieee80211_band band = IEEE80211_BAND_2GHZ; mlan_status status = MLAN_STATUS_SUCCESS; @@ -4464,9 +4408,9 @@ woal_chandef_create(moal_private *priv, struct cfg80211_chan_def *chandef, band = IEEE80211_BAND_2GHZ; else if (pchan_info->bandcfg.chanBand == BAND_5GHZ) band = IEEE80211_BAND_5GHZ; - chandef->chan = ieee80211_get_channel(priv->wdev->wiphy, - ieee80211_channel_to_frequency - (pchan_info->channel, band)); + chandef->chan = ieee80211_get_channel( + priv->wdev->wiphy, + ieee80211_channel_to_frequency(pchan_info->channel, band)); if (chandef->chan == NULL) { PRINTM(MERROR, "Fail on ieee80211_get_channel, channel=%d, band=%d\n", @@ -4491,9 +4435,8 @@ woal_chandef_create(moal_private *priv, struct cfg80211_chan_def *chandef, break; case CHAN_BW_80MHZ: chandef->width = NL80211_CHAN_WIDTH_80; - chandef->center_freq1 = - ieee80211_channel_to_frequency(pchan_info->center_chan, - band); + chandef->center_freq1 = ieee80211_channel_to_frequency( + pchan_info->center_chan, band); break; default: break; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_cfg80211.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_cfg80211.h index 369a584daa91..bad196168224 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_cfg80211.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_cfg80211.h @@ -1,66 +1,66 @@ /** @file moal_cfg80211.h - * - * @brief This file contains the CFG80211 specific defines. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains the CFG80211 specific defines. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ #ifndef _MOAL_CFG80211_H_ #define _MOAL_CFG80211_H_ -#include "moal_main.h" +#include "moal_main.h" -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +#if KERNEL_VERSION(3, 14, 0) <= CFG80211_VERSION_CODE #define IEEE80211_CHAN_PASSIVE_SCAN IEEE80211_CHAN_NO_IR #define IEEE80211_CHAN_NO_IBSS IEEE80211_CHAN_NO_IR #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) +#if KERNEL_VERSION(3, 16, 0) <= CFG80211_VERSION_CODE #define MAX_CSA_COUNTERS_NUM 2 #endif /* Clear all key indexes */ -#define KEY_INDEX_CLEAR_ALL (0x0000000F) +#define KEY_INDEX_CLEAR_ALL (0x0000000F) /** RTS/FRAG disabled value */ -#define MLAN_FRAG_RTS_DISABLED (0xFFFFFFFF) +#define MLAN_FRAG_RTS_DISABLED (0xFFFFFFFF) #ifndef WLAN_CIPHER_SUITE_SMS4 -#define WLAN_CIPHER_SUITE_SMS4 0x00000020 +#define WLAN_CIPHER_SUITE_SMS4 0x00000020 #endif #ifndef WLAN_CIPHER_SUITE_AES_CMAC -#define WLAN_CIPHER_SUITE_AES_CMAC 0x000FAC06 +#define WLAN_CIPHER_SUITE_AES_CMAC 0x000FAC06 #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4,0,0) +#if KERNEL_VERSION(4, 0, 0) <= CFG80211_VERSION_CODE #ifndef WLAN_CIPHER_SUITE_BIP_GMAC_256 #define WLAN_CIPHER_SUITE_BIP_GMAC_256 0x000FAC0C #endif #endif /* define for custom ie operation */ -#define MLAN_CUSTOM_IE_AUTO_IDX_MASK 0xffff -#define MLAN_CUSTOM_IE_NEW_MASK 0x8000 -#define IE_MASK_WPS 0x0001 -#define IE_MASK_P2P 0x0002 -#define IE_MASK_WFD 0x0004 -#define IE_MASK_VENDOR 0x0008 -#define IE_MASK_EXTCAP 0x0010 +#define MLAN_CUSTOM_IE_AUTO_IDX_MASK 0xffff +#define MLAN_CUSTOM_IE_NEW_MASK 0x8000 +#define IE_MASK_WPS 0x0001 +#define IE_MASK_P2P 0x0002 +#define IE_MASK_WFD 0x0004 +#define IE_MASK_VENDOR 0x0008 +#define IE_MASK_EXTCAP 0x0010 #define MRVL_PKT_TYPE_MGMT_FRAME 0xE5 @@ -81,13 +81,13 @@ void *woal_get_netdev_priv(struct net_device *dev); #ifdef STA_SUPPORT /** get scan interface */ moal_private *woal_get_scan_interface(moal_handle *handle); -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) +#if KERNEL_VERSION(3, 8, 0) <= CFG80211_VERSION_CODE /** AUTH pending flag */ -#define HOST_MLME_AUTH_PENDING MBIT(0) +#define HOST_MLME_AUTH_PENDING MBIT(0) /** AUTH complete flag */ -#define HOST_MLME_AUTH_DONE MBIT(1) -#define HOST_MLME_ASSOC_PENDING MBIT(2) -#define HOST_MLME_ASSOC_DONE MBIT(3) +#define HOST_MLME_AUTH_DONE MBIT(1) +#define HOST_MLME_ASSOC_PENDING MBIT(2) +#define HOST_MLME_ASSOC_DONE MBIT(3) void woal_host_mlme_disconnect(moal_private *priv, t_u16 reason_code, t_u8 *sa); void woal_host_mlme_work_queue(struct work_struct *work); #endif @@ -98,23 +98,23 @@ t_u8 woal_band_cfg_to_ieee_band(t_u32 band); int woal_cfg80211_change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, enum nl80211_iftype type, -#if CFG80211_VERSION_CODE < KERNEL_VERSION(4, 12, 0) +#if KERNEL_VERSION(4, 12, 0) > CFG80211_VERSION_CODE u32 *flags, #endif struct vif_params *params); int woal_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed); -int woal_cfg80211_add_key(struct wiphy *wiphy, - struct net_device *dev, t_u8 key_index, -#if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 36) +int woal_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, + t_u8 key_index, +#if KERNEL_VERSION(2, 6, 36) < CFG80211_VERSION_CODE bool pairwise, #endif const t_u8 *mac_addr, struct key_params *params); -int woal_cfg80211_del_key(struct wiphy *wiphy, - struct net_device *dev, t_u8 key_index, -#if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 36) +int woal_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, + t_u8 key_index, +#if KERNEL_VERSION(2, 6, 36) < CFG80211_VERSION_CODE bool pairwise, #endif const t_u8 *mac_addr); @@ -133,33 +133,31 @@ int woal_cfg80211_del_pmksa(struct wiphy *wiphy, struct net_device *dev, int woal_cfg80211_flush_pmksa(struct wiphy *wiphy, struct net_device *dev); #endif -int woal_cfg80211_set_bitrate_mask(struct wiphy *wiphy, - struct net_device *dev, +int woal_cfg80211_set_bitrate_mask(struct wiphy *wiphy, struct net_device *dev, const u8 *peer, const struct cfg80211_bitrate_mask *mask); -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) +#if KERNEL_VERSION(2, 6, 38) <= CFG80211_VERSION_CODE int woal_cfg80211_set_antenna(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant); int woal_cfg80211_get_antenna(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant); #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) -int woal_cfg80211_set_qos_map(struct wiphy *wiphy, - struct net_device *dev, +#if KERNEL_VERSION(3, 14, 0) <= CFG80211_VERSION_CODE +int woal_cfg80211_set_qos_map(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_qos_map *qos_map); #endif #ifdef STA_CFG80211 #ifdef STA_SUPPORT -int woal_set_rf_channel(moal_private *priv, - struct ieee80211_channel *chan, +int woal_set_rf_channel(moal_private *priv, struct ieee80211_channel *chan, enum nl80211_channel_type channel_type, t_u8 wait_option); -static inline int -woal_cfg80211_scan_done(struct cfg80211_scan_request *request, bool aborted) +static inline int woal_cfg80211_scan_done(struct cfg80211_scan_request *request, + bool aborted) { -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) +#if KERNEL_VERSION(4, 8, 0) <= CFG80211_VERSION_CODE struct cfg80211_scan_info info; + info.aborted = aborted; cfg80211_scan_done(request, &info); #else @@ -167,44 +165,42 @@ woal_cfg80211_scan_done(struct cfg80211_scan_request *request, bool aborted) #endif return 0; } - mlan_status woal_inform_bss_from_scan_result(moal_private *priv, mlan_ssid_bssid *ssid_bssid, t_u8 wait_option); #endif #endif -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 5, 0) +#if KERNEL_VERSION(3, 5, 0) > CFG80211_VERSION_CODE int woal_cfg80211_set_channel(struct wiphy *wiphy, -#if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 34) +#if KERNEL_VERSION(2, 6, 34) < CFG80211_VERSION_CODE struct net_device *dev, #endif struct ieee80211_channel *chan, enum nl80211_channel_type channel_type); #endif -#if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 37) -int woal_cfg80211_set_default_key(struct wiphy *wiphy, - struct net_device *dev, t_u8 key_index, - bool ucast, bool mcast); +#if KERNEL_VERSION(2, 6, 37) < CFG80211_VERSION_CODE +int woal_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *dev, + t_u8 key_index, bool ucast, bool mcast); #else -int woal_cfg80211_set_default_key(struct wiphy *wiphy, - struct net_device *dev, t_u8 key_index); +int woal_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *dev, + t_u8 key_index); #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 30) +#if KERNEL_VERSION(2, 6, 30) <= CFG80211_VERSION_CODE int woal_cfg80211_set_default_mgmt_key(struct wiphy *wiphy, struct net_device *netdev, t_u8 key_index); #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) +#if KERNEL_VERSION(3, 1, 0) <= CFG80211_VERSION_CODE int woal_cfg80211_set_rekey_data(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_gtk_rekey_data *data); #endif void woal_mgmt_frame_register(moal_private *priv, u16 frame_type, bool reg); void woal_cfg80211_mgmt_frame_register(struct wiphy *wiphy, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) +#if KERNEL_VERSION(3, 6, 0) <= CFG80211_VERSION_CODE struct wireless_dev *wdev, #else struct net_device *dev, @@ -212,30 +208,30 @@ void woal_cfg80211_mgmt_frame_register(struct wiphy *wiphy, t_u16 frame_type, bool reg); int woal_cfg80211_mgmt_tx(struct wiphy *wiphy, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) +#if KERNEL_VERSION(3, 6, 0) <= CFG80211_VERSION_CODE struct wireless_dev *wdev, #else struct net_device *dev, #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +#if KERNEL_VERSION(3, 14, 0) <= CFG80211_VERSION_CODE struct cfg80211_mgmt_tx_params *params, #else struct ieee80211_channel *chan, bool offchan, -#if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) +#if KERNEL_VERSION(3, 8, 0) > CFG80211_VERSION_CODE enum nl80211_channel_type channel_type, bool channel_type_valid, #endif unsigned int wait, const u8 *buf, size_t len, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) +#if KERNEL_VERSION(3, 2, 0) <= CFG80211_VERSION_CODE bool no_cck, #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) +#if KERNEL_VERSION(3, 3, 0) <= CFG80211_VERSION_CODE bool dont_wait_for_ack, #endif #endif - u64 * cookie); + u64 *cookie); -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +#if KERNEL_VERSION(3, 14, 0) <= CFG80211_VERSION_CODE void woal_update_radar_chans_dfs_state(struct wiphy *wiphy); #endif @@ -249,47 +245,46 @@ extern struct ieee80211_supported_band mac1_cfg80211_band_5ghz; int woal_cfg80211_bss_role_cfg(moal_private *priv, t_u16 action, t_u8 *bss_role); #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 1, 0) -struct wireless_dev *woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, - const char *name, - unsigned char - name_assign_type, - enum nl80211_iftype type, -#if CFG80211_VERSION_CODE < KERNEL_VERSION(4, 12, 0) - u32 *flags, +#if KERNEL_VERSION(4, 1, 0) <= CFG80211_VERSION_CODE +struct wireless_dev * +woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, const char *name, + unsigned char name_assign_type, + enum nl80211_iftype type, +#if KERNEL_VERSION(4, 12, 0) > CFG80211_VERSION_CODE + u32 *flags, #endif - struct vif_params *params); + struct vif_params *params); #else -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) +#if KERNEL_VERSION(3, 7, 0) <= CFG80211_VERSION_CODE struct wireless_dev *woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, const char *name, enum nl80211_iftype type, u32 *flags, struct vif_params *params); #else -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) +#if KERNEL_VERSION(3, 6, 0) <= CFG80211_VERSION_CODE struct wireless_dev *woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, char *name, enum nl80211_iftype type, u32 *flags, struct vif_params *params); #else -#if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 37) +#if KERNEL_VERSION(2, 6, 37) < CFG80211_VERSION_CODE struct net_device *woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, char *name, enum nl80211_iftype type, u32 *flags, struct vif_params *params); #else -int woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, - char *name, enum nl80211_iftype type, - u32 *flags, struct vif_params *params); +int woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, char *name, + enum nl80211_iftype type, u32 *flags, + struct vif_params *params); #endif #endif #endif #endif int woal_cfg80211_del_virt_if(struct wiphy *wiphy, struct net_device *dev); -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) +#if KERNEL_VERSION(3, 6, 0) <= CFG80211_VERSION_CODE int woal_cfg80211_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev); #else @@ -298,35 +293,35 @@ int woal_cfg80211_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev); #ifdef WIFI_DIRECT_SUPPORT /* Group Owner Negotiation Req */ -#define P2P_GO_NEG_REQ 0 +#define P2P_GO_NEG_REQ 0 /* Group Owner Negotiation Rsp */ -#define P2P_GO_NEG_RSP 1 +#define P2P_GO_NEG_RSP 1 /* Group Owner Negotiation Confirm */ -#define P2P_GO_NEG_CONF 2 +#define P2P_GO_NEG_CONF 2 /* P2P Invitation Request */ -#define P2P_INVITE_REQ 3 +#define P2P_INVITE_REQ 3 /* P2P Invitation Response */ -#define P2P_INVITE_RSP 4 +#define P2P_INVITE_RSP 4 /* Device Discoverability Request */ -#define P2P_DEVDIS_REQ 5 +#define P2P_DEVDIS_REQ 5 /* Device Discoverability Response */ -#define P2P_DEVDIS_RSP 6 +#define P2P_DEVDIS_RSP 6 /* Provision Discovery Request */ -#define P2P_PROVDIS_REQ 7 +#define P2P_PROVDIS_REQ 7 /* Provision Discovery Response */ -#define P2P_PROVDIS_RSP 8 +#define P2P_PROVDIS_RSP 8 /** P2P category */ -#define P2P_ACT_FRAME_CATEGORY 0x04 +#define P2P_ACT_FRAME_CATEGORY 0x04 /** P2P oui offset */ -#define P2P_ACT_FRAME_OUI_OFFSET 26 +#define P2P_ACT_FRAME_OUI_OFFSET 26 /** P2P subtype offset */ -#define P2P_ACT_FRAME_OUI_SUBTYPE_OFFSET 30 +#define P2P_ACT_FRAME_OUI_SUBTYPE_OFFSET 30 void woal_cfg80211_display_p2p_actframe(const t_u8 *buf, int len, struct ieee80211_channel *chan, const t_u8 flag); /** Define kernel version for wifi direct */ -#define WIFI_DIRECT_KERNEL_VERSION KERNEL_VERSION(2, 6, 39) +#define WIFI_DIRECT_KERNEL_VERSION KERNEL_VERSION(2, 6, 39) #if CFG80211_VERSION_CODE >= WIFI_DIRECT_KERNEL_VERSION @@ -342,76 +337,71 @@ void woal_remove_virtual_interface(moal_handle *handle); #endif /* WIFI_DIRECT_SUPPORT */ /** Define for remain on channel duration timer */ -#define MAX_REMAIN_ON_CHANNEL_DURATION (1000) +#define MAX_REMAIN_ON_CHANNEL_DURATION (1000) -int woal_cfg80211_remain_on_channel_cfg(moal_private *priv, - t_u8 wait_option, t_u8 remove, - t_u8 *status, +int woal_cfg80211_remain_on_channel_cfg(moal_private *priv, t_u8 wait_option, + t_u8 remove, t_u8 *status, struct ieee80211_channel *chan, enum mlan_channel_type channel_type, t_u32 duration); #ifdef UAP_CFG80211 int woal_uap_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) +#if KERNEL_VERSION(3, 16, 0) <= CFG80211_VERSION_CODE const u8 *mac, #else u8 *mac, #endif struct station_info *stainfo); -int woal_uap_cfg80211_dump_station(struct wiphy *wiphy, - struct net_device *dev, int idx, - t_u8 *mac, struct station_info *sinfo); -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) +int woal_uap_cfg80211_dump_station(struct wiphy *wiphy, struct net_device *dev, + int idx, t_u8 *mac, + struct station_info *sinfo); +#if KERNEL_VERSION(3, 8, 0) <= CFG80211_VERSION_CODE int woal_cfg80211_change_bss(struct wiphy *wiphy, struct net_device *dev, struct bss_parameters *params); #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) +#if KERNEL_VERSION(3, 9, 0) <= CFG80211_VERSION_CODE int woal_cfg80211_set_mac_acl(struct wiphy *wiphy, struct net_device *dev, const struct cfg80211_acl_data *params); #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) +#if KERNEL_VERSION(3, 1, 0) <= CFG80211_VERSION_CODE int woal_cfg80211_set_txq_params(struct wiphy *wiphy, struct net_device *dev, struct ieee80211_txq_params *params); #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) +#if KERNEL_VERSION(3, 12, 0) <= CFG80211_VERSION_CODE int woal_cfg80211_set_coalesce(struct wiphy *wiphy, struct cfg80211_coalesce *coalesce); #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) -int woal_cfg80211_add_beacon(struct wiphy *wiphy, - struct net_device *dev, +#if KERNEL_VERSION(3, 4, 0) <= CFG80211_VERSION_CODE +int woal_cfg80211_add_beacon(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_ap_settings *params); -int woal_cfg80211_set_beacon(struct wiphy *wiphy, - struct net_device *dev, +int woal_cfg80211_set_beacon(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_beacon_data *params); #else -int woal_cfg80211_add_beacon(struct wiphy *wiphy, - struct net_device *dev, +int woal_cfg80211_add_beacon(struct wiphy *wiphy, struct net_device *dev, struct beacon_parameters *params); -int woal_cfg80211_set_beacon(struct wiphy *wiphy, - struct net_device *dev, +int woal_cfg80211_set_beacon(struct wiphy *wiphy, struct net_device *dev, struct beacon_parameters *params); #endif int woal_cfg80211_del_beacon(struct wiphy *wiphy, struct net_device *dev); int woal_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) +#if KERNEL_VERSION(3, 19, 0) <= CFG80211_VERSION_CODE struct station_del_parameters *param); #else -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) +#if KERNEL_VERSION(3, 16, 0) <= CFG80211_VERSION_CODE const u8 *mac_addr); #else u8 *mac_addr); #endif #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) +#if KERNEL_VERSION(3, 12, 0) <= CFG80211_VERSION_CODE +#if KERNEL_VERSION(3, 15, 0) <= CFG80211_VERSION_CODE int woal_cfg80211_start_radar_detection(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_chan_def *chandef, @@ -422,8 +412,7 @@ int woal_cfg80211_start_radar_detection(struct wiphy *wiphy, struct cfg80211_chan_def *chandef); #endif -int woal_cfg80211_channel_switch(struct wiphy *wiphy, - struct net_device *dev, +int woal_cfg80211_channel_switch(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_csa_settings *params); void woal_cac_timer_func(void *context); @@ -431,48 +420,45 @@ void woal_csa_work_queue(struct work_struct *work); #endif #endif /* UAP_CFG80211 */ #if defined(UAP_CFG80211) || defined(STA_CFG80211) -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) +#if KERNEL_VERSION(3, 5, 0) <= CFG80211_VERSION_CODE void woal_cfg80211_notify_channel(moal_private *priv, - chan_band_info * pchan_info); -void woal_channel_switch_event(moal_private *priv, chan_band_info * pchan_info); + chan_band_info *pchan_info); +void woal_channel_switch_event(moal_private *priv, chan_band_info *pchan_info); #endif #endif #ifdef STA_CFG80211 -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) +#if KERNEL_VERSION(3, 2, 0) <= CFG80211_VERSION_CODE void woal_bgscan_stop_event(moal_private *priv); void woal_cfg80211_notify_sched_scan_stop(moal_private *priv); #endif #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) +#if KERNEL_VERSION(3, 8, 0) <= CFG80211_VERSION_CODE mlan_status woal_chandef_create(moal_private *priv, struct cfg80211_chan_def *chandef, - chan_band_info * pchan_info); + chan_band_info *pchan_info); #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 20, 0) +#if KERNEL_VERSION(4, 20, 0) <= CFG80211_VERSION_CODE void woal_cfg80211_setup_he_cap(moal_private *priv, struct ieee80211_supported_band *band); void woal_cfg80211_free_iftype_data(struct wiphy *wiphy); #endif void woal_clear_all_mgmt_ies(moal_private *priv, t_u8 wait_option); -int woal_cfg80211_mgmt_frame_ie(moal_private *priv, - const t_u8 *beacon_ies, size_t beacon_ies_len, - const t_u8 *proberesp_ies, - size_t proberesp_ies_len, - const t_u8 *assocresp_ies, - size_t assocresp_ies_len, - const t_u8 *probereq_ies, - size_t probereq_ies_len, t_u16 mask, - t_u8 wait_option); +int woal_cfg80211_mgmt_frame_ie( + moal_private *priv, const t_u8 *beacon_ies, size_t beacon_ies_len, + const t_u8 *proberesp_ies, size_t proberesp_ies_len, + const t_u8 *assocresp_ies, size_t assocresp_ies_len, + const t_u8 *probereq_ies, size_t probereq_ies_len, t_u16 mask, + t_u8 wait_option); int woal_get_active_intf_freq(moal_private *priv); void woal_cfg80211_setup_ht_cap(struct ieee80211_sta_ht_cap *ht_info, t_u32 dev_cap, t_u8 *mcs_set); -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) +#if KERNEL_VERSION(3, 6, 0) <= CFG80211_VERSION_CODE void woal_cfg80211_setup_vht_cap(moal_private *priv, struct ieee80211_sta_vht_cap *vht_cap); #endif diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_cfg80211_util.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_cfg80211_util.c index c901df9542d0..88a91709713a 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_cfg80211_util.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_cfg80211_util.c @@ -1,62 +1,97 @@ /** @file moal_cfg80211_util.c - * - * @brief This file contains the functions for CFG80211 vendor. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains the functions for CFG80211 vendor. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ -#include "moal_cfg80211_util.h" -#include "moal_cfg80211.h" +#include "moal_cfg80211_util.h" +#include "moal_cfg80211.h" /******************************************************** - Local Variables -********************************************************/ + * Local Variables + ********************************************************/ /******************************************************** - Global Variables -********************************************************/ + * Global Variables + ********************************************************/ /******************************************************** - Local Functions -********************************************************/ + * Local Functions + ********************************************************/ /******************************************************** - Global Functions -********************************************************/ + * Global Functions + ********************************************************/ -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +#if KERNEL_VERSION(3, 14, 0) <= CFG80211_VERSION_CODE /**nxp vendor command and event*/ -#define MRVL_VENDOR_ID 0x005043 +#define MRVL_VENDOR_ID 0x005043 /** vendor events */ const struct nl80211_vendor_cmd_info vendor_events[] = { - {.vendor_id = MRVL_VENDOR_ID,.subcmd = event_hang,}, /*event_id 0 */ - {.vendor_id = MRVL_VENDOR_ID,.subcmd = event_rssi_monitor,}, /*event_id 0x1501 */ - {.vendor_id = MRVL_VENDOR_ID,.subcmd = event_cloud_keep_alive,}, /*event_id 0x10003 */ - {.vendor_id = MRVL_VENDOR_ID,.subcmd = event_dfs_radar_detected,}, /*event_id 0x10004 */ - {.vendor_id = MRVL_VENDOR_ID,.subcmd = event_dfs_cac_started,}, /*event_id 0x10005 */ - {.vendor_id = MRVL_VENDOR_ID,.subcmd = event_dfs_cac_finished,}, /*event_id 0x10006 */ - {.vendor_id = MRVL_VENDOR_ID,.subcmd = event_dfs_cac_aborted,}, /*event_id 0x10007 */ - {.vendor_id = MRVL_VENDOR_ID,.subcmd = event_dfs_nop_finished,}, /*event_id 0x10008 */ - {.vendor_id = MRVL_VENDOR_ID,.subcmd = - event_wifi_logger_ring_buffer_data,}, - {.vendor_id = MRVL_VENDOR_ID,.subcmd = event_wifi_logger_alert,}, - {.vendor_id = MRVL_VENDOR_ID,.subcmd = event_packet_fate_monitor,}, - {.vendor_id = MRVL_VENDOR_ID,.subcmd = event_wake_reason_report,}, + { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = event_hang, + }, /*event_id 0*/ + { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = event_rssi_monitor, + }, /*event_id 0x1501*/ + { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = event_cloud_keep_alive, + }, /*event_id 0x10003*/ + { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = event_dfs_radar_detected, + }, /*event_id 0x10004*/ + { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = event_dfs_cac_started, + }, /*event_id 0x10005*/ + { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = event_dfs_cac_finished, + }, /*event_id 0x10006*/ + { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = event_dfs_cac_aborted, + }, /*event_id 0x10007*/ + { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = event_dfs_nop_finished, + }, /*event_id 0x10008*/ + { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = event_wifi_logger_ring_buffer_data, + }, + { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = event_wifi_logger_alert, + }, + { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = event_packet_fate_monitor, + }, + { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = event_wake_reason_report, + }, /**add vendor event here*/ }; @@ -67,8 +102,7 @@ const struct nl80211_vendor_cmd_info vendor_events[] = { * * @return index of events array */ -int -woal_get_event_id(int event) +int woal_get_event_id(int event) { int i = 0; @@ -90,9 +124,8 @@ woal_get_event_id(int event) * * @return 0: success 1: fail */ -int -woal_cfg80211_vendor_event(IN moal_private *priv, - IN int event, IN t_u8 *data, IN int len) +int woal_cfg80211_vendor_event(IN moal_private *priv, IN int event, + IN t_u8 *data, IN int len) { struct wiphy *wiphy = NULL; struct sk_buff *skb = NULL; @@ -110,14 +143,14 @@ woal_cfg80211_vendor_event(IN moal_private *priv, PRINTM(MEVENT, "vendor event :0x%x\n", event); event_id = woal_get_event_id(event); if (event_max == event_id) { - PRINTM(MERROR, "Not find this event %d \n", event_id); + PRINTM(MERROR, "Not find this event %d\n", event_id); ret = 1; LEAVE(); return ret; } /**allocate skb*/ -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 1, 0) +#if KERNEL_VERSION(4, 1, 0) <= CFG80211_VERSION_CODE skb = cfg80211_vendor_event_alloc(wiphy, priv->wdev, len, event_id, GFP_ATOMIC); #else @@ -148,9 +181,8 @@ woal_cfg80211_vendor_event(IN moal_private *priv, * * @return 0: success 1: fail */ -struct sk_buff * -woal_cfg80211_alloc_vendor_event(IN moal_private *priv, - IN int event, IN int len) +struct sk_buff *woal_cfg80211_alloc_vendor_event(IN moal_private *priv, + IN int event, IN int len) { struct wiphy *wiphy = NULL; struct sk_buff *skb = NULL; @@ -159,19 +191,19 @@ woal_cfg80211_alloc_vendor_event(IN moal_private *priv, ENTER(); if (!priv || !priv->wdev || !priv->wdev->wiphy) { - PRINTM(MERROR, "Not find this event %d \n", event_id); + PRINTM(MERROR, "Not find this event %d\n", event_id); goto done; } wiphy = priv->wdev->wiphy; PRINTM(MEVENT, "vendor event :0x%x\n", event); event_id = woal_get_event_id(event); if (event_max == event_id) { - PRINTM(MERROR, "Not find this event %d \n", event_id); + PRINTM(MERROR, "Not find this event %d\n", event_id); goto done; } /**allocate skb*/ -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 1, 0) +#if KERNEL_VERSION(4, 1, 0) <= CFG80211_VERSION_CODE skb = cfg80211_vendor_event_alloc(wiphy, priv->wdev, len, event_id, GFP_ATOMIC); #else @@ -197,11 +229,11 @@ done: * * @return N/A */ -void -woal_cfg80211_dfs_vendor_event(moal_private *priv, int event, - struct cfg80211_chan_def *chandef) +void woal_cfg80211_dfs_vendor_event(moal_private *priv, int event, + struct cfg80211_chan_def *chandef) { dfs_event evt; + ENTER(); if (!chandef) { LEAVE(); @@ -237,7 +269,6 @@ woal_cfg80211_dfs_vendor_event(moal_private *priv, int event, woal_cfg80211_vendor_event(priv, event, (t_u8 *)&evt, sizeof(dfs_event)); LEAVE(); - return; } /** @@ -250,10 +281,9 @@ woal_cfg80211_dfs_vendor_event(moal_private *priv, int event, * * @return 0: success 1: fail */ -static int -woal_cfg80211_subcmd_set_drvdbg(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int data_len) +static int woal_cfg80211_subcmd_set_drvdbg(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int data_len) { #ifdef DEBUG_LEVEL1 struct net_device *dev = wdev->netdev; @@ -304,9 +334,9 @@ woal_cfg80211_subcmd_set_drvdbg(struct wiphy *wiphy, * * @return 0: success other: fail */ -static mlan_status -woal_band_to_valid_channels(moal_private *priv, wifi_band w_band, int channel[], - t_u32 *nchannel) +static mlan_status woal_band_to_valid_channels(moal_private *priv, + wifi_band w_band, int channel[], + t_u32 *nchannel) { int band = 0; struct ieee80211_supported_band *sband; @@ -331,7 +361,7 @@ woal_band_to_valid_channels(moal_private *priv, wifi_band w_band, int channel[], ch->center_freq); continue; } - if ((band == IEEE80211_BAND_5GHZ)) { + if (band == IEEE80211_BAND_5GHZ) { if (((ch->flags & IEEE80211_CHAN_RADAR) && !(w_band & WIFI_BAND_A_DFS)) || (!(ch->flags & IEEE80211_CHAN_RADAR) && @@ -367,10 +397,9 @@ woal_band_to_valid_channels(moal_private *priv, wifi_band w_band, int channel[], * * @return 0: success other: fail */ -static int -woal_cfg80211_subcmd_get_valid_channels(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int len) +static int woal_cfg80211_subcmd_get_valid_channels(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int len) { struct net_device *dev = wdev->netdev; moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -383,28 +412,29 @@ woal_cfg80211_subcmd_get_valid_channels(struct wiphy *wiphy, int err = 0; ENTER(); - PRINTM(MCMND, "Enter woal_cfg80211_subcmd_get_valid_channels\n"); + PRINTM(MCMND, "Enter %s()\n", __func__); err = nla_parse(tb, ATTR_WIFI_MAX, data, len, NULL -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - , NULL +#if KERNEL_VERSION(4, 12, 0) <= CFG80211_VERSION_CODE + , + NULL #endif - ); + ); if (err) { - PRINTM(MERROR, "%s: nla_parse fail\n", __FUNCTION__); + PRINTM(MERROR, "%s: nla_parse fail\n", __func__); err = -EFAULT; goto done; } if (!tb[ATTR_CHANNELS_BAND]) { - PRINTM(MERROR, "%s: null attr: tb[ATTR_GET_CH]=%p\n", - __FUNCTION__, tb[ATTR_CHANNELS_BAND]); + PRINTM(MERROR, "%s: null attr: tb[ATTR_GET_CH]=%p\n", __func__, + tb[ATTR_CHANNELS_BAND]); err = -EINVAL; goto done; } band = nla_get_u32(tb[ATTR_CHANNELS_BAND]); if (band > WIFI_BAND_MAX) { - PRINTM(MERROR, "%s: invalid band=%d\n", __FUNCTION__, band); + PRINTM(MERROR, "%s: invalid band=%d\n", __func__, band); err = -EINVAL; goto done; } @@ -418,10 +448,8 @@ woal_cfg80211_subcmd_get_valid_channels(struct wiphy *wiphy, return -EFAULT; } - mem_needed = - nla_total_size(nchannel * sizeof(ch_out[0])) + - nla_total_size(sizeof(nchannel)) - + VENDOR_REPLY_OVERHEAD; + mem_needed = nla_total_size(nchannel * sizeof(ch_out[0])) + + nla_total_size(sizeof(nchannel)) + VENDOR_REPLY_OVERHEAD; /* Alloc the SKB for vendor_event */ skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, mem_needed); if (unlikely(!skb)) { @@ -430,11 +458,17 @@ woal_cfg80211_subcmd_get_valid_channels(struct wiphy *wiphy, goto done; } - nla_put_u32(skb, ATTR_NUM_CHANNELS, nchannel); - nla_put(skb, ATTR_CHANNEL_LIST, nchannel * sizeof(ch_out[0]), ch_out); + if (nla_put_u32(skb, ATTR_NUM_CHANNELS, nchannel) || + nla_put(skb, ATTR_CHANNEL_LIST, nchannel * sizeof(ch_out[0]), + ch_out)) { + PRINTM(MERROR, "nla_put failed!\n"); + kfree_skb(skb); + err = -ENOMEM; + goto done; + } err = cfg80211_vendor_cmd_reply(skb); if (err) { - PRINTM(MERROR, "Vendor Command reply failed ret:%d \n", err); + PRINTM(MERROR, "Vendor Command reply failed ret:%d\n", err); goto done; } @@ -453,10 +487,9 @@ done: * * @return 0: success 1: fail */ -static int -woal_cfg80211_subcmd_get_drv_version(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int data_len) +static int woal_cfg80211_subcmd_get_drv_version(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int data_len) { struct net_device *dev = wdev->netdev; moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -464,7 +497,7 @@ woal_cfg80211_subcmd_get_drv_version(struct wiphy *wiphy, t_u32 reply_len = 0; int ret = 0; t_u32 drv_len = 0; - char drv_version[MLAN_MAX_VER_STR_LEN] = { 0 }; + char drv_version[MLAN_MAX_VER_STR_LEN] = {0}; char *pos; ENTER(); @@ -510,10 +543,9 @@ done: * * @return 0: success 1: fail */ -static int -woal_cfg80211_subcmd_get_fw_version(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int data_len) +static int woal_cfg80211_subcmd_get_fw_version(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int data_len) { struct net_device *dev = wdev->netdev; moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -521,7 +553,7 @@ woal_cfg80211_subcmd_get_fw_version(struct wiphy *wiphy, t_u32 reply_len = 0; char end_c = '\0'; int ret = 0; - char fw_ver[32] = { 0 }; + char fw_ver[32] = {0}; union { t_u32 l; t_u8 c[4]; @@ -530,8 +562,8 @@ woal_cfg80211_subcmd_get_fw_version(struct wiphy *wiphy, ENTER(); ver.l = priv->phandle->fw_release_number; - snprintf(fw_ver, sizeof(fw_ver), "%u.%u.%u.p%u%c", - ver.c[2], ver.c[1], ver.c[0], ver.c[3], end_c); + snprintf(fw_ver, sizeof(fw_ver), "%u.%u.%u.p%u%c", ver.c[2], ver.c[1], + ver.c[0], ver.c[3], end_c); reply_len = strlen(fw_ver) + 1; /** Allocate skb for cmd reply*/ @@ -561,10 +593,9 @@ done: * * @return 0: success 1: fail */ -static int -woal_cfg80211_subcmd_get_fw_dump(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int data_len) +static int woal_cfg80211_subcmd_get_fw_dump(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int data_len) { struct net_device *dev = NULL; moal_private *priv = NULL; @@ -581,7 +612,7 @@ woal_cfg80211_subcmd_get_fw_dump(struct wiphy *wiphy, dev = wdev->netdev; priv = (moal_private *)woal_get_netdev_priv(dev); handle = priv->phandle; - if (handle->firmware_dump_file) { + if (handle) { memset(handle->firmware_dump_file, 0, sizeof(handle->firmware_dump_file)); } @@ -612,10 +643,9 @@ done: * * @return 0: success 1: fail */ -static int -woal_cfg80211_subcmd_get_drv_dump(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int data_len) +static int woal_cfg80211_subcmd_get_drv_dump(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int data_len) { struct net_device *dev = NULL; moal_private *priv = NULL; @@ -649,7 +679,12 @@ woal_cfg80211_subcmd_get_drv_dump(struct wiphy *wiphy, ret = -ENOMEM; goto done; } - nla_put_string(skb, ATTR_DRV_DUMP_PATH, driver_dump_file); + if (nla_put_string(skb, ATTR_DRV_DUMP_PATH, driver_dump_file)) { + PRINTM(MERROR, "nla_put failed!\n"); + kfree_skb(skb); + ret = -ENOMEM; + goto done; + } ret = cfg80211_vendor_cmd_reply(skb); if (ret) PRINTM(MERROR, "Command reply failed ret = %d\n", ret); @@ -668,31 +703,30 @@ done: * * @return 0: success 1: fail */ -static int -woal_cfg80211_subcmd_get_supp_feature_set(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int data_len) +static int woal_cfg80211_subcmd_get_supp_feature_set(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, + int data_len) { struct sk_buff *skb = NULL; struct net_device *dev = wdev->netdev; moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); + mlan_fw_info fw_info; t_u32 reply_len = 0; int ret = 0; t_u32 supp_feature_set = 0; - mlan_fw_info fw_info; ENTER(); supp_feature_set = WLAN_FEATURE_INFRA #if defined(UAP_SUPPORT) && defined(STA_SUPPORT) - | WLAN_FEATURE_AP_STA + | WLAN_FEATURE_AP_STA #endif - | WLAN_FEATURE_LINK_LAYER_STATS - | WLAN_FEATURE_LOGGER - | WLAN_FEATURE_RSSI_MONITOR - | WLAN_FEATURE_CONFIG_NDO - | WLAN_FEATURE_CONTROL_ROAMING - | WLAN_FEATURE_SCAN_RAND | WLAN_FEATURE_MKEEP_ALIVE; + | WLAN_FEATURE_LINK_LAYER_STATS | + WLAN_FEATURE_LOGGER | WLAN_FEATURE_RSSI_MONITOR | + WLAN_FEATURE_CONFIG_NDO | + WLAN_FEATURE_CONTROL_ROAMING | + WLAN_FEATURE_SCAN_RAND | WLAN_FEATURE_MKEEP_ALIVE; woal_request_get_fw_info(priv, MOAL_IOCTL_WAIT, &fw_info); if (fw_info.fw_bands & BAND_A) @@ -706,7 +740,12 @@ woal_cfg80211_subcmd_get_supp_feature_set(struct wiphy *wiphy, ret = -ENOMEM; goto done; } - nla_put_u32(skb, ATTR_FEATURE_SET, supp_feature_set); + if (nla_put_u32(skb, ATTR_FEATURE_SET, supp_feature_set)) { + PRINTM(MERROR, "nla_put failed!\n"); + kfree_skb(skb); + ret = -ENOMEM; + goto done; + } ret = cfg80211_vendor_cmd_reply(skb); if (ret) PRINTM(MERROR, "Vendor command reply failed ret = %d\n", ret); @@ -725,20 +764,19 @@ done: * * @return 0: success 1: fail */ -static int -woal_cfg80211_subcmd_set_country_code(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int data_len) +static int woal_cfg80211_subcmd_set_country_code(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int data_len) { struct sk_buff *skb = NULL; t_u32 reply_len = 0; int ret = 0, rem, type; const struct nlattr *iter; - char country[COUNTRY_CODE_LEN] = { 0 }; + char country[COUNTRY_CODE_LEN] = {0}; ENTER(); - nla_for_each_attr(iter, data, data_len, rem) { + nla_for_each_attr (iter, data, data_len, rem) { type = nla_type(iter); switch (type) { case ATTR_COUNTRY_CODE: @@ -751,9 +789,8 @@ woal_cfg80211_subcmd_set_country_code(struct wiphy *wiphy, } } - if (!moal_extflg_isset - ((moal_handle *)woal_get_wiphy_priv(wiphy), - EXT_DISABLE_REGD_BY_DRIVER)) + if (!moal_extflg_isset((moal_handle *)woal_get_wiphy_priv(wiphy), + EXT_DISABLE_REGD_BY_DRIVER)) regulatory_hint(wiphy, country); /** Allocate skb for cmd reply*/ @@ -782,11 +819,9 @@ done: * * @return 0: success 1: fail */ -static int -woal_cfg80211_subcmd_get_wifi_logger_supp_feature_set(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, - int data_len) +static int woal_cfg80211_subcmd_get_wifi_logger_supp_feature_set( + struct wiphy *wiphy, struct wireless_dev *wdev, const void *data, + int data_len) { struct sk_buff *skb = NULL; t_u32 reply_len = 0; @@ -797,14 +832,19 @@ woal_cfg80211_subcmd_get_wifi_logger_supp_feature_set(struct wiphy *wiphy, supp_feature_set = WIFI_LOGGER_CONNECT_EVENT_SUPPORTED; reply_len = sizeof(supp_feature_set); - /** Allocate skb for cmd reply*/ + /** Allocate skb for cmd reply*/ skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, reply_len); if (!skb) { PRINTM(MERROR, "allocate memory fail for vendor cmd\n"); ret = -ENOMEM; goto done; } - nla_put_u32(skb, ATTR_WIFI_LOGGER_FEATURE_SET, supp_feature_set); + if (nla_put_u32(skb, ATTR_WIFI_LOGGER_FEATURE_SET, supp_feature_set)) { + PRINTM(MERROR, "nla_put failed!\n"); + kfree_skb(skb); + ret = -ENOMEM; + goto done; + } ret = cfg80211_vendor_cmd_reply(skb); if (ret) PRINTM(MERROR, "Vendor command reply failed ret = %d\n", ret); @@ -822,16 +862,15 @@ done: * * @return void */ -static void -woal_get_ring_status(moal_private *priv, int ring_id, - wifi_ring_buffer_status * status) +static void woal_get_ring_status(moal_private *priv, int ring_id, + wifi_ring_buffer_status *status) { int id = 0; wifi_ring_buffer *ring; ENTER(); for (id = 0; id < RING_ID_MAX; id++) { - ring = (wifi_ring_buffer *) priv->rings[id]; + ring = (wifi_ring_buffer *)priv->rings[id]; if (ring && VALID_RING(ring->ring_id) && ring_id == ring->ring_id) { strncpy(status->name, ring->name, @@ -843,9 +882,8 @@ woal_get_ring_status(moal_private *priv, int ring_id, status->read_bytes = ring->ctrl.read_bytes; status->verbose_level = ring->log_level; PRINTM(MINFO, - "%s, name: %s, ring_id: %d, ring_size : %d, written_bytes: %d, written_records: " - "%d, read_bytes: %d \n", - __FUNCTION__, status->name, status->ring_id, + "%s, name: %s, ring_id: %d, ring_size : %d, written_bytes: %d, written_records: %d, read_bytes: %d\n", + __func__, status->name, status->ring_id, status->ring_buffer_byte_size, status->written_bytes, status->written_records, status->read_bytes); @@ -853,7 +891,6 @@ woal_get_ring_status(moal_private *priv, int ring_id, } } LEAVE(); - return; } /** @@ -866,10 +903,10 @@ woal_get_ring_status(moal_private *priv, int ring_id, * * @return 0: success 1: fail */ -static int -woal_cfg80211_subcmd_get_ring_buff_status(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int data_len) +static int woal_cfg80211_subcmd_get_ring_buff_status(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, + int data_len) { struct net_device *dev = wdev->netdev; moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -883,7 +920,7 @@ woal_cfg80211_subcmd_get_ring_buff_status(struct wiphy *wiphy, ENTER(); reply_len = RING_ID_MAX * sizeof(wifi_ring_buffer_status) + sizeof(t_u32); - /** Allocate skb for cmd reply*/ + /** Allocate skb for cmd reply*/ skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, reply_len); if (!skb) { PRINTM(MERROR, "allocate memory fail for vendor cmd\n"); @@ -891,9 +928,9 @@ woal_cfg80211_subcmd_get_ring_buff_status(struct wiphy *wiphy, goto done; } - /* shoud sync with HAL side to decide payload layout. - just ring buffer status or ring buffer num + ring buffer status - currently only have ring buffer status + /* should sync with HAL side to decide payload layout. + * just ring buffer status or ring buffer num + ring buffer status + * currently only have ring buffer status */ for (ringIdx = 0; ringIdx < RING_ID_MAX; ringIdx++) { memset(&ring_status, 0, sizeof(wifi_ring_buffer_status)); @@ -903,9 +940,14 @@ woal_cfg80211_subcmd_get_ring_buff_status(struct wiphy *wiphy, sizeof(wifi_ring_buffer_status)); } - nla_put_u32(skb, ATTR_NUM_RINGS, ring_cnt); - nla_put(skb, ATTR_RING_BUFFER_STATUS, - sizeof(wifi_ring_buffer_status) * ring_cnt, status); + if (nla_put_u32(skb, ATTR_NUM_RINGS, ring_cnt) || + nla_put(skb, ATTR_RING_BUFFER_STATUS, + sizeof(wifi_ring_buffer_status) * ring_cnt, status)) { + PRINTM(MERROR, "nla_put failed!\n"); + kfree_skb(skb); + ret = -ENOMEM; + goto done; + } ret = cfg80211_vendor_cmd_reply(skb); @@ -924,8 +966,7 @@ done: * * @return An invalid ring id for failure or valid ring id on success. */ -int -woal_get_ring_id_by_name(moal_private *priv, char *ring_name) +int woal_get_ring_id_by_name(moal_private *priv, char *ring_name) { int id; wifi_ring_buffer *ring; @@ -933,7 +974,7 @@ woal_get_ring_id_by_name(moal_private *priv, char *ring_name) ENTER(); for (id = 0; id < RING_ID_MAX; id++) { - ring = (wifi_ring_buffer *) priv->rings[id]; + ring = (wifi_ring_buffer *)priv->rings[id]; if (ring && !strncmp(ring->name, ring_name, sizeof(ring->name) - 1)) break; @@ -955,9 +996,8 @@ woal_get_ring_id_by_name(moal_private *priv, char *ring_name) * * @return 0: success 1: fail */ -int -woal_start_logging(moal_private *priv, char *ring_name, int log_level, - int flags, int time_intval, int threshold) +int woal_start_logging(moal_private *priv, char *ring_name, int log_level, + int flags, int time_intval, int threshold) { int ret = 0; int ring_id; @@ -974,9 +1014,9 @@ woal_start_logging(moal_private *priv, char *ring_name, int log_level, PRINTM(MCMND, "%s , log_level : %d, time_intval : %d, threshod %d Bytes\n", - __FUNCTION__, log_level, time_intval, threshold); + __func__, log_level, time_intval, threshold); - ring_buffer = (wifi_ring_buffer *) priv->rings[ring_id]; + ring_buffer = (wifi_ring_buffer *)priv->rings[ring_id]; if (!ring_buffer || ring_buffer->state == RING_STOP) { PRINTM(MERROR, "Ring is stopped!\n"); ret = -EAGAIN; @@ -1016,13 +1056,12 @@ done: * * @return 0: success 1: fail */ -static int -woal_cfg80211_subcmd_start_logging(struct wiphy *wiphy, - struct wireless_dev *wdev, const void *data, - int len) +static int woal_cfg80211_subcmd_start_logging(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int len) { int ret = 0, rem, type; - char ring_name[RING_NAME_MAX] = { 0 }; + char ring_name[RING_NAME_MAX] = {0}; int log_level = 0, flags = 0, time_intval = 0, threshold = 0; const struct nlattr *iter; struct net_device *dev = wdev->netdev; @@ -1030,7 +1069,7 @@ woal_cfg80211_subcmd_start_logging(struct wiphy *wiphy, ENTER(); - nla_for_each_attr(iter, data, len, rem) { + nla_for_each_attr (iter, data, len, rem) { type = nla_type(iter); switch (type) { case ATTR_WIFI_LOGGER_RING_ID: @@ -1058,9 +1097,8 @@ woal_cfg80211_subcmd_start_logging(struct wiphy *wiphy, ret = woal_start_logging(priv, ring_name, log_level, flags, time_intval, threshold); - if (ret < 0) { + if (ret < 0) PRINTM(MERROR, "Start_logging is failed ret: %d\n", ret); - } done: LEAVE(); return ret; @@ -1074,8 +1112,7 @@ done: * * @return 0: success 1: fail */ -static int -woal_trigger_get_ring_data(moal_private *priv, char *ring_name) +static int woal_trigger_get_ring_data(moal_private *priv, char *ring_name) { int ret = 0; int ring_id; @@ -1085,14 +1122,14 @@ woal_trigger_get_ring_data(moal_private *priv, char *ring_name) ring_id = woal_get_ring_id_by_name(priv, ring_name); if (!VALID_RING(ring_id)) { - PRINTM(MERROR, "invalid ring_id \n"); + PRINTM(MERROR, "invalid ring_id\n"); ret = -EINVAL; goto done; } - ring_buffer = (wifi_ring_buffer *) priv->rings[ring_id]; + ring_buffer = (wifi_ring_buffer *)priv->rings[ring_id]; if (!ring_buffer) { - PRINTM(MERROR, "invalid ring_buffer \n"); + PRINTM(MERROR, "invalid ring_buffer\n"); ret = -EINVAL; goto done; } @@ -1115,20 +1152,19 @@ done: * * @return 0: success 1: fail */ -static int -woal_cfg80211_subcmd_get_ring_data(struct wiphy *wiphy, - struct wireless_dev *wdev, const void *data, - int len) +static int woal_cfg80211_subcmd_get_ring_data(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int len) { int ret = 0, rem, type; - char ring_name[RING_NAME_MAX] = { 0 }; + char ring_name[RING_NAME_MAX] = {0}; const struct nlattr *iter; struct net_device *dev = wdev->netdev; moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); ENTER(); - nla_for_each_attr(iter, data, len, rem) { + nla_for_each_attr (iter, data, len, rem) { type = nla_type(iter); switch (type) { case ATTR_WIFI_LOGGER_RING_ID: @@ -1143,9 +1179,8 @@ woal_cfg80211_subcmd_get_ring_data(struct wiphy *wiphy, } ret = woal_trigger_get_ring_data(priv, ring_name); - if (ret < 0) { + if (ret < 0) PRINTM(MERROR, "trigger_get_data failed ret:%d\n", ret); - } done: LEAVE(); @@ -1160,8 +1195,7 @@ done: * * @return void */ -static void -woal_ring_reset(wifi_ring_buffer * ring) +static void woal_ring_reset(wifi_ring_buffer *ring) { ENTER(); ring->wp = 0; @@ -1170,7 +1204,6 @@ woal_ring_reset(wifi_ring_buffer * ring) memset(ring->ring_buf, 0, ring->ring_size); LEAVE(); - return; } /** @@ -1181,16 +1214,16 @@ woal_ring_reset(wifi_ring_buffer * ring) * * @return A pointer to wifi_ring_buffer_entry struct */ -static wifi_ring_buffer_entry * -woal_get_ring_entry(wifi_ring_buffer * ring, t_u32 offset) +static wifi_ring_buffer_entry *woal_get_ring_entry(wifi_ring_buffer *ring, + t_u32 offset) { wifi_ring_buffer_entry *entry = - (wifi_ring_buffer_entry *) (ring->ring_buf + offset); + (wifi_ring_buffer_entry *)(ring->ring_buf + offset); ENTER(); if (!entry->entry_size) - return (wifi_ring_buffer_entry *) ring->ring_buf; + return (wifi_ring_buffer_entry *)ring->ring_buf; LEAVE(); return entry; @@ -1204,17 +1237,16 @@ woal_get_ring_entry(wifi_ring_buffer * ring, t_u32 offset) * * @return offset of next entry */ -static t_u32 -woal_get_ring_next_entry(wifi_ring_buffer * ring, t_u32 offset) +static t_u32 woal_get_ring_next_entry(wifi_ring_buffer *ring, t_u32 offset) { wifi_ring_buffer_entry *entry = - (wifi_ring_buffer_entry *) (ring->ring_buf + offset); + (wifi_ring_buffer_entry *)(ring->ring_buf + offset); wifi_ring_buffer_entry *next_entry = NULL; ENTER(); if (!entry->entry_size) { - entry = (wifi_ring_buffer_entry *) ring->ring_buf; + entry = (wifi_ring_buffer_entry *)ring->ring_buf; LEAVE(); return ENTRY_LENGTH(entry); } @@ -1223,9 +1255,8 @@ woal_get_ring_next_entry(wifi_ring_buffer * ring, t_u32 offset) LEAVE(); return 0; } - next_entry = - (wifi_ring_buffer_entry *) (ring->ring_buf + offset + - ENTRY_LENGTH(entry)); + next_entry = (wifi_ring_buffer_entry *)(ring->ring_buf + offset + + ENTRY_LENGTH(entry)); if (!next_entry->entry_size) { /* move to head */ LEAVE(); @@ -1245,8 +1276,8 @@ woal_get_ring_next_entry(wifi_ring_buffer * ring, t_u32 offset) * * @return data length */ -int -woal_ring_pull_data(moal_private *priv, int ring_id, void *data, t_s32 buf_len) +int woal_ring_pull_data(moal_private *priv, int ring_id, void *data, + t_s32 buf_len) { t_s32 r_len = 0; wifi_ring_buffer *ring; @@ -1255,7 +1286,7 @@ woal_ring_pull_data(moal_private *priv, int ring_id, void *data, t_s32 buf_len) ENTER(); - ring = (wifi_ring_buffer *) priv->rings[ring_id]; + ring = (wifi_ring_buffer *)priv->rings[ring_id]; /* get a fresh pending length */ while (buf_left > 0) { @@ -1292,10 +1323,9 @@ woal_ring_pull_data(moal_private *priv, int ring_id, void *data, t_s32 buf_len) * * @return 0: success 1: fail */ -int -woal_ring_buffer_data_vendor_event(IN moal_private *priv, IN int ring_id, - IN t_u8 *data, IN int len, - wifi_ring_buffer_status * ring_status) +int woal_ring_buffer_data_vendor_event(IN moal_private *priv, IN int ring_id, + IN t_u8 *data, IN int len, + wifi_ring_buffer_status *ring_status) { struct wiphy *wiphy = NULL; struct sk_buff *skb = NULL; @@ -1305,22 +1335,21 @@ woal_ring_buffer_data_vendor_event(IN moal_private *priv, IN int ring_id, ENTER(); if (!priv || !priv->wdev || !priv->wdev->wiphy) { - PRINTM(MERROR, "priv is null \n"); + PRINTM(MERROR, "priv is null\n"); ret = -EINVAL; goto done; } wiphy = priv->wdev->wiphy; - PRINTM(MEVENT, "woal_ring_buffer_data_vendor_event ring_id:%d\n", - ring_id); + PRINTM(MEVENT, "%s ring_id:%d\n", __func__, ring_id); event_id = woal_get_event_id(event_wifi_logger_ring_buffer_data); if (event_max == event_id) { - PRINTM(MERROR, "Not find this event %d \n", event_id); + PRINTM(MERROR, "Not find this event %d\n", event_id); ret = -EINVAL; goto done; } /**allocate skb*/ -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 1, 0) +#if KERNEL_VERSION(4, 1, 0) <= CFG80211_VERSION_CODE skb = cfg80211_vendor_event_alloc(wiphy, priv->wdev, len + sizeof(wifi_ring_buffer_status), event_id, GFP_ATOMIC); @@ -1340,7 +1369,7 @@ woal_ring_buffer_data_vendor_event(IN moal_private *priv, IN int ring_id, DBG_HEXDUMP(MEVT_D, "ring_buffer_data", data, len); nla_put(skb, ATTR_RING_BUFFER, len, data); - /**send event*/ + /**send event*/ cfg80211_vendor_event(skb, GFP_ATOMIC); done: @@ -1359,11 +1388,12 @@ done: * * @return void */ -static void -woal_ring_data_send(moal_private *priv, int ring_id, const void *data, - const t_u32 len, wifi_ring_buffer_status * ring_status) +static void woal_ring_data_send(moal_private *priv, int ring_id, + const void *data, const t_u32 len, + wifi_ring_buffer_status *ring_status) { struct net_device *ndev = priv->netdev; + ENTER(); if (!ndev) @@ -1373,7 +1403,6 @@ woal_ring_data_send(moal_private *priv, int ring_id, const void *data, done: LEAVE(); - return; } /** @@ -1383,8 +1412,7 @@ done: * * @return void */ -void -woal_ring_poll_worker(struct work_struct *work) +void woal_ring_poll_worker(struct work_struct *work) { struct delayed_work *d_work = to_delayed_work(work); wifi_ring_buffer *ring_info = @@ -1428,14 +1456,14 @@ woal_ring_poll_worker(struct work_struct *work) rlen = woal_ring_pull_data(priv, ringid, buf, buflen); spin_unlock_irqrestore(&ring_info->lock, flags); - hdr = (wifi_ring_buffer_entry *) buf; + hdr = (wifi_ring_buffer_entry *)buf; while (rlen > 0) { ring_status.read_bytes += ENTRY_LENGTH(hdr); woal_ring_data_send(priv, ringid, hdr, ENTRY_LENGTH(hdr), &ring_status); rlen -= ENTRY_LENGTH(hdr); - hdr = (wifi_ring_buffer_entry *) ((void *)hdr + - ENTRY_LENGTH(hdr)); + hdr = (wifi_ring_buffer_entry *)((void *)hdr + + ENTRY_LENGTH(hdr)); } exit: kfree(buf); @@ -1443,7 +1471,6 @@ exit: schedule_delayed_work(&ring_info->work, ring_info->interval); LEAVE(); - return; } /** @@ -1456,9 +1483,8 @@ exit: * * @return 0: success -1: fail */ -int -woal_ring_push_data(moal_private *priv, int ring_id, - wifi_ring_buffer_entry * hdr, void *data) +int woal_ring_push_data(moal_private *priv, int ring_id, + wifi_ring_buffer_entry *hdr, void *data) { unsigned long flags; t_u32 w_len; @@ -1468,7 +1494,7 @@ woal_ring_push_data(moal_private *priv, int ring_id, ENTER(); - ring = (wifi_ring_buffer *) priv->rings[ring_id]; + ring = (wifi_ring_buffer *)priv->rings[ring_id]; if (!ring || ring->state != RING_ACTIVE) { PRINTM(MERROR, "Ring is not active\n"); @@ -1495,12 +1521,10 @@ woal_ring_push_data(moal_private *priv, int ring_id, } else { /* full, we should drop one entry */ w_entry = - (wifi_ring_buffer_entry *) (ring-> - ring_buf + + (wifi_ring_buffer_entry + *)(ring->ring_buf + ring->rp); + ring->rp = woal_get_ring_next_entry(ring, ring->rp); - ring->rp = - woal_get_ring_next_entry(ring, - ring->rp); ring->ctrl.written_bytes -= ENTRY_LENGTH(w_entry); memset((u8 *)w_entry, 0, ENTRY_LENGTH(w_entry)); @@ -1513,14 +1537,12 @@ woal_ring_push_data(moal_private *priv, int ring_id, break; } else if (ring->ring_size - ring->wp < w_len) { if (ring->rp == 0) { - /** drop one entry */ - w_entry = - (wifi_ring_buffer_entry - *) (ring->ring_buf + ring->rp); - ring->rp = - woal_get_ring_next_entry(ring, - ring-> - rp); + /** drop one entry */ + w_entry = (wifi_ring_buffer_entry + *)(ring->ring_buf + + ring->rp); + ring->rp = woal_get_ring_next_entry( + ring, ring->rp); ring->ctrl.written_bytes -= ENTRY_LENGTH(w_entry); memset((u8 *)w_entry, 0, @@ -1533,14 +1555,12 @@ woal_ring_push_data(moal_private *priv, int ring_id, } if (ring->rp > ring->wp) { if (ring->rp - ring->wp < w_len) { - /** drop one entry */ + /** drop one entry */ w_entry = - (wifi_ring_buffer_entry *) (ring-> - ring_buf + + (wifi_ring_buffer_entry + *)(ring->ring_buf + ring->rp); + ring->rp = woal_get_ring_next_entry(ring, ring->rp); - ring->rp = - woal_get_ring_next_entry(ring, - ring->rp); ring->ctrl.written_bytes -= ENTRY_LENGTH(w_entry); memset((u8 *)w_entry, 0, ENTRY_LENGTH(w_entry)); @@ -1555,12 +1575,12 @@ woal_ring_push_data(moal_private *priv, int ring_id, if ((ring->wp + w_len) > ring->ring_size || (ring->ctrl.written_bytes + w_len) > ring->ring_size) { PRINTM(MERROR, - "Ring push buffer overflow: rp=%d wp=%d, write_bytes=%d \n", + "Ring push buffer overflow: rp=%d wp=%d, write_bytes=%d\n", ring->rp, ring->wp, ring->ctrl.written_bytes); goto done; } - w_entry = (wifi_ring_buffer_entry *) (ring->ring_buf + ring->wp); + w_entry = (wifi_ring_buffer_entry *)(ring->ring_buf + ring->wp); /* header */ moal_memcpy_ext(priv->phandle, w_entry, hdr, RING_ENTRY_SIZE, ENTRY_LENGTH(w_entry)); @@ -1603,12 +1623,13 @@ done: * * @return 0 - success */ -static int -woal_init_ring_buffer_internal(moal_private *priv, void **ring, t_u16 ringIdx, - t_u8 *name, t_u32 ring_sz) +static int woal_init_ring_buffer_internal(moal_private *priv, void **ring, + t_u16 ringIdx, t_u8 *name, + t_u32 ring_sz) { unsigned long flags; wifi_ring_buffer *ring_buff; + ENTER(); *ring = vmalloc(sizeof(wifi_ring_buffer)); @@ -1617,7 +1638,7 @@ woal_init_ring_buffer_internal(moal_private *priv, void **ring, t_u16 ringIdx, goto done; } memset(*ring, 0, sizeof(wifi_ring_buffer)); - ring_buff = (wifi_ring_buffer *) * ring; + ring_buff = (wifi_ring_buffer *)*ring; ring_buff->ring_buf = vmalloc(ring_sz); if (!unlikely(ring_buff->ring_buf)) { @@ -1652,8 +1673,7 @@ done: * * @return data length */ -static int -woal_init_ring_buffer(moal_private *priv) +static int woal_init_ring_buffer(moal_private *priv) { ENTER(); woal_init_ring_buffer_internal(priv, &priv->rings[VERBOSE_RING_ID], @@ -1673,24 +1693,23 @@ woal_init_ring_buffer(moal_private *priv) * * @return data length */ -static int -woal_deinit_ring_buffer(moal_private *priv) +static int woal_deinit_ring_buffer(moal_private *priv) { int i; enum ring_state ring_state = RING_STOP; unsigned long lock_flags = 0; wifi_ring_buffer *ring_buff; + ENTER(); for (i = 0; i < RING_ID_MAX - 1; i++) { - ring_buff = (wifi_ring_buffer *) priv->rings[i]; + ring_buff = (wifi_ring_buffer *)priv->rings[i]; if (!ring_buff) continue; spin_lock_irqsave(&ring_buff->lock, lock_flags); ring_state = ring_buff->state; - if (ring_state == RING_ACTIVE) { + if (ring_state == RING_ACTIVE) ring_buff->state = RING_STOP; - } spin_unlock_irqrestore(&ring_buff->lock, lock_flags); if (ring_state == RING_ACTIVE) cancel_delayed_work_sync(&ring_buff->work); @@ -1714,10 +1733,9 @@ woal_deinit_ring_buffer(moal_private *priv) * * @return 0: success -1: fail */ -int -woal_ring_event_logger(moal_private *priv, int ring_id, pmlan_event pmevent) +int woal_ring_event_logger(moal_private *priv, int ring_id, pmlan_event pmevent) { - t_u8 event_buf[100] = { 0 }; + t_u8 event_buf[100] = {0}; wifi_ring_buffer_driver_connectivity_event *connectivity_event; tlv_log *tlv; t_u8 *pos; @@ -1725,7 +1743,7 @@ woal_ring_event_logger(moal_private *priv, int ring_id, pmlan_event pmevent) wifi_ring_buffer *ring; ENTER(); - ring = (wifi_ring_buffer *) priv->rings[ring_id]; + ring = (wifi_ring_buffer *)priv->rings[ring_id]; if (!ring || ring->state != RING_ACTIVE) { PRINTM(MINFO, "Ring is not active\n"); @@ -1736,72 +1754,68 @@ woal_ring_event_logger(moal_private *priv, int ring_id, pmlan_event pmevent) case MLAN_EVENT_ID_DRV_ASSOC_SUCC_LOGGER: if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) { assoc_logger_data *pbss_desc = - (assoc_logger_data *) pmevent->event_buf; + (assoc_logger_data *)pmevent->event_buf; memset(&msg_hdr, 0, sizeof(msg_hdr)); msg_hdr.flags |= RING_BUFFER_ENTRY_FLAGS_HAS_TIMESTAMP; msg_hdr.type = ENTRY_TYPE_CONNECT_EVENT; connectivity_event = (wifi_ring_buffer_driver_connectivity_event *) - event_buf; + event_buf; connectivity_event->event = WIFI_EVENT_ASSOC_COMPLETE; pos = (t_u8 *)connectivity_event->tlvs; - if (pbss_desc->oui) { - tlv = (tlv_log *) pos; - tlv->tag = WIFI_TAG_VENDOR_SPECIFIC; - tlv->length = MLAN_MAC_ADDR_LENGTH / 2; - moal_memcpy_ext(priv->phandle, tlv->value, - pbss_desc->oui, tlv->length, - sizeof(event_buf) - + + tlv = (tlv_log *)pos; + tlv->tag = WIFI_TAG_VENDOR_SPECIFIC; + tlv->length = MLAN_MAC_ADDR_LENGTH / 2; + moal_memcpy_ext(priv->phandle, tlv->value, + pbss_desc->oui, tlv->length, + sizeof(event_buf) - (tlv->value - event_buf)); - msg_hdr.entry_size += - tlv->length + TLV_LOG_HEADER_LEN; - pos = pos + tlv->length + TLV_LOG_HEADER_LEN; - } - if (pbss_desc->bssid) { - tlv = (tlv_log *) pos; - tlv->tag = WIFI_TAG_BSSID; - tlv->length = sizeof(pbss_desc->bssid); - moal_memcpy_ext(priv->phandle, tlv->value, - pbss_desc->bssid, - sizeof(pbss_desc->bssid), - sizeof(event_buf) - + msg_hdr.entry_size += tlv->length + TLV_LOG_HEADER_LEN; + pos = pos + tlv->length + TLV_LOG_HEADER_LEN; + + tlv = (tlv_log *)pos; + tlv->tag = WIFI_TAG_BSSID; + tlv->length = sizeof(pbss_desc->bssid); + moal_memcpy_ext( + priv->phandle, tlv->value, pbss_desc->bssid, + sizeof(pbss_desc->bssid), + sizeof(event_buf) - (tlv->value - event_buf)); + msg_hdr.entry_size += tlv->length + TLV_LOG_HEADER_LEN; + pos = pos + tlv->length + TLV_LOG_HEADER_LEN; + + tlv = (tlv_log *)pos; + tlv->tag = WIFI_TAG_SSID; + tlv->length = strlen(pbss_desc->ssid); + moal_memcpy_ext(priv->phandle, tlv->value, + pbss_desc->ssid, tlv->length, + sizeof(event_buf) - (tlv->value - event_buf)); - msg_hdr.entry_size += - tlv->length + TLV_LOG_HEADER_LEN; - pos = pos + tlv->length + TLV_LOG_HEADER_LEN; - } - if (pbss_desc->ssid) { - tlv = (tlv_log *) pos; - tlv->tag = WIFI_TAG_SSID; - tlv->length = strlen(pbss_desc->ssid); - moal_memcpy_ext(priv->phandle, tlv->value, - pbss_desc->ssid, tlv->length, - sizeof(event_buf) - - (tlv->value - event_buf)); - msg_hdr.entry_size += - tlv->length + TLV_LOG_HEADER_LEN; - pos = pos + tlv->length + TLV_LOG_HEADER_LEN; - } + msg_hdr.entry_size += tlv->length + TLV_LOG_HEADER_LEN; + pos = pos + tlv->length + TLV_LOG_HEADER_LEN; + if (pbss_desc->rssi) { - tlv = (tlv_log *) pos; + tlv = (tlv_log *)pos; tlv->tag = WIFI_TAG_RSSI; tlv->length = sizeof(pbss_desc->rssi); - moal_memcpy_ext(priv->phandle, tlv->value, - &pbss_desc->rssi, tlv->length, - sizeof(event_buf) - + moal_memcpy_ext( + priv->phandle, tlv->value, + &pbss_desc->rssi, tlv->length, + sizeof(event_buf) - (tlv->value - event_buf)); msg_hdr.entry_size += tlv->length + TLV_LOG_HEADER_LEN; pos = pos + tlv->length + TLV_LOG_HEADER_LEN; } if (pbss_desc->channel) { - tlv = (tlv_log *) pos; + tlv = (tlv_log *)pos; tlv->tag = WIFI_TAG_CHANNEL; tlv->length = sizeof(pbss_desc->channel); - moal_memcpy_ext(priv->phandle, tlv->value, - &pbss_desc->channel, - sizeof(pbss_desc->channel), - sizeof(event_buf) - + moal_memcpy_ext( + priv->phandle, tlv->value, + &pbss_desc->channel, + sizeof(pbss_desc->channel), + sizeof(event_buf) - (tlv->value - event_buf)); msg_hdr.entry_size += tlv->length + TLV_LOG_HEADER_LEN; @@ -1817,21 +1831,22 @@ woal_ring_event_logger(moal_private *priv, int ring_id, pmlan_event pmevent) case MLAN_EVENT_ID_DRV_ASSOC_FAILURE_LOGGER: if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) { int status_code = *(int *)pmevent->event_buf; + memset(&msg_hdr, 0, sizeof(msg_hdr)); msg_hdr.flags |= RING_BUFFER_ENTRY_FLAGS_HAS_TIMESTAMP; msg_hdr.type = ENTRY_TYPE_CONNECT_EVENT; connectivity_event = (wifi_ring_buffer_driver_connectivity_event *) - event_buf; + event_buf; connectivity_event->event = WIFI_EVENT_ASSOC_COMPLETE; pos = (t_u8 *)connectivity_event->tlvs; - tlv = (tlv_log *) pos; + tlv = (tlv_log *)pos; tlv->tag = WIFI_TAG_STATUS; tlv->length = sizeof(status_code); moal_memcpy_ext(priv->phandle, tlv->value, &status_code, sizeof(status_code), - sizeof(event_buf) - (tlv->value - - event_buf)); + sizeof(event_buf) - + (tlv->value - event_buf)); msg_hdr.entry_size += tlv->length + 4; msg_hdr.entry_size += sizeof(connectivity_event->event); woal_ring_push_data(priv, ring_id, &msg_hdr, @@ -1841,21 +1856,22 @@ woal_ring_event_logger(moal_private *priv, int ring_id, pmlan_event pmevent) case MLAN_EVENT_ID_DRV_DISCONNECT_LOGGER: if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) { t_u16 reason_code = *(t_u16 *)pmevent->event_buf; + memset(&msg_hdr, 0, sizeof(msg_hdr)); msg_hdr.flags |= RING_BUFFER_ENTRY_FLAGS_HAS_TIMESTAMP; msg_hdr.type = ENTRY_TYPE_CONNECT_EVENT; connectivity_event = (wifi_ring_buffer_driver_connectivity_event *) - event_buf; + event_buf; connectivity_event->event = WIFI_EVENT_ASSOC_COMPLETE; pos = (t_u8 *)connectivity_event->tlvs; - tlv = (tlv_log *) pos; + tlv = (tlv_log *)pos; tlv->tag = WIFI_TAG_REASON_CODE; tlv->length = sizeof(reason_code); moal_memcpy_ext(priv->phandle, tlv->value, &reason_code, sizeof(reason_code), - sizeof(event_buf) - (tlv->value - - event_buf)); + sizeof(event_buf) - + (tlv->value - event_buf)); msg_hdr.entry_size += tlv->length + 4; msg_hdr.entry_size += sizeof(connectivity_event->event); woal_ring_push_data(priv, ring_id, &msg_hdr, @@ -1878,9 +1894,8 @@ done: * * @return 0: success 1: fail */ -int -woal_wake_reason_vendor_event(IN moal_private *priv, - IN mlan_ds_hs_wakeup_reason wake_reason) +int woal_wake_reason_vendor_event(IN moal_private *priv, + IN mlan_ds_hs_wakeup_reason wake_reason) { struct wiphy *wiphy = NULL; struct sk_buff *skb = NULL; @@ -1890,7 +1905,7 @@ woal_wake_reason_vendor_event(IN moal_private *priv, ENTER(); if (!priv || !priv->wdev || !priv->wdev->wiphy) { - PRINTM(MERROR, "priv is null \n"); + PRINTM(MERROR, "priv is null\n"); ret = -EINVAL; goto done; } @@ -1898,13 +1913,13 @@ woal_wake_reason_vendor_event(IN moal_private *priv, event_id = woal_get_event_id(event_wake_reason_report); if (event_max == event_id) { - PRINTM(MERROR, "Not find this event %d \n", event_id); + PRINTM(MERROR, "Not find this event %d\n", event_id); ret = MLAN_STATUS_FAILURE; goto done; } /**allocate skb*/ -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 1, 0) +#if KERNEL_VERSION(4, 1, 0) <= CFG80211_VERSION_CODE skb = cfg80211_vendor_event_alloc(wiphy, priv->wdev, sizeof(wake_reason.hs_wakeup_reason), event_id, GFP_ATOMIC); @@ -1923,7 +1938,7 @@ woal_wake_reason_vendor_event(IN moal_private *priv, PRINTM(MINFO, "wake_reason.hs_wakeup_reason = %d\n", wake_reason.hs_wakeup_reason); nla_put_u16(skb, ATTR_WAKE_REASON_STAT, wake_reason.hs_wakeup_reason); - /**send event*/ + /**send event*/ cfg80211_vendor_event(skb, GFP_ATOMIC); done: @@ -1940,11 +1955,11 @@ done: * * @return 0: success -1: fail */ -int -woal_wake_reason_logger(moal_private *priv, - mlan_ds_hs_wakeup_reason wake_reason) +int woal_wake_reason_logger(moal_private *priv, + mlan_ds_hs_wakeup_reason wake_reason) { int ret = 0; + ENTER(); ret = woal_wake_reason_vendor_event(priv, wake_reason); @@ -1976,7 +1991,7 @@ woal_cfg80211_subcmd_start_packet_fate_monitor(struct wiphy *wiphy, ENTER(); - /** Allocate skb for cmd reply*/ + /** Allocate skb for cmd reply*/ skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, reply_len); if (!skb) { PRINTM(MERROR, "allocate memory fail for vendor cmd\n"); @@ -2009,11 +2024,11 @@ done: * * @return 0: success 1: fail */ -int -woal_packet_fate_vendor_event(IN moal_private *priv, - IN packet_fate_packet_type pkt_type, IN t_u8 fate, - IN frame_type payload_type, IN t_u32 drv_ts_usec, - IN t_u32 fw_ts_usec, IN t_u8 *data, IN t_u32 len) +int woal_packet_fate_vendor_event(IN moal_private *priv, + IN packet_fate_packet_type pkt_type, + IN t_u8 fate, IN frame_type payload_type, + IN t_u32 drv_ts_usec, IN t_u32 fw_ts_usec, + IN t_u8 *data, IN t_u32 len) { struct wiphy *wiphy = NULL; struct sk_buff *skb = NULL; @@ -2024,7 +2039,7 @@ woal_packet_fate_vendor_event(IN moal_private *priv, ENTER(); if (!priv || !priv->wdev || !priv->wdev->wiphy) { - PRINTM(MERROR, "priv is null \n"); + PRINTM(MERROR, "priv is null\n"); ret = -EINVAL; goto done; } @@ -2032,20 +2047,19 @@ woal_packet_fate_vendor_event(IN moal_private *priv, event_id = woal_get_event_id(event_packet_fate_monitor); if (event_max == event_id) { - PRINTM(MERROR, "Not find this event %d \n", event_id); + PRINTM(MERROR, "Not find this event %d\n", event_id); ret = MLAN_STATUS_FAILURE; goto done; } /**allocate skb*/ -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 1, 0) +#if KERNEL_VERSION(4, 1, 0) <= CFG80211_VERSION_CODE skb = cfg80211_vendor_event_alloc(wiphy, priv->wdev, len + sizeof(PACKET_FATE_REPORT), event_id, GFP_ATOMIC); #else - skb = cfg80211_vendor_event_alloc(wiphy, - len + sizeof(PACKET_FATE_REPORT), - event_id, GFP_ATOMIC); + skb = cfg80211_vendor_event_alloc( + wiphy, len + sizeof(PACKET_FATE_REPORT), event_id, GFP_ATOMIC); #endif if (!skb) { @@ -2082,7 +2096,7 @@ woal_packet_fate_vendor_event(IN moal_private *priv, nla_put(skb, ATTR_PACKET_FATE_DATA, len, data); DBG_HEXDUMP(MCMD_D, "packet_fate_data", data, len); - /**send event*/ + /**send event*/ cfg80211_vendor_event(skb, GFP_ATOMIC); done: @@ -2105,10 +2119,10 @@ done: * * @return 0: success -1: fail */ -int -woal_packet_fate_monitor(moal_private *priv, packet_fate_packet_type pkt_type, - t_u8 fate, frame_type payload_type, t_u32 drv_ts_usec, - t_u32 fw_ts_usec, t_u8 *data, t_u32 len) +int woal_packet_fate_monitor(moal_private *priv, + packet_fate_packet_type pkt_type, t_u8 fate, + frame_type payload_type, t_u32 drv_ts_usec, + t_u32 fw_ts_usec, t_u8 *data, t_u32 len) { int ret = 0; @@ -2131,15 +2145,14 @@ woal_packet_fate_monitor(moal_private *priv, packet_fate_packet_type pkt_type, * * @return 0: success -1: fail */ -static int -woal_init_packet_filter(moal_private *priv) +static int woal_init_packet_filter(moal_private *priv) { int ret = 0; packet_filter *pkt_filter = NULL; ENTER(); - pkt_filter = vmalloc(sizeof(pkt_filter)); + pkt_filter = vmalloc(sizeof(packet_filter)); if (!unlikely(pkt_filter)) { PRINTM(MERROR, "WiFi Logger: packet_filter alloc failed\n"); ret = -ENOMEM; @@ -2168,8 +2181,7 @@ done: * * @return 0: success -1: fail */ -static int -woal_deinit_packet_filter(moal_private *priv) +static int woal_deinit_packet_filter(moal_private *priv) { int ret = 0; packet_filter *pkt_filter = NULL; @@ -2179,9 +2191,8 @@ woal_deinit_packet_filter(moal_private *priv) pkt_filter = priv->packet_filter; - if (!unlikely(pkt_filter)) { + if (!unlikely(pkt_filter)) goto done; - } spin_lock_irqsave(&pkt_filter->lock, flags); pkt_filter->state = PACKET_FILTER_STATE_INIT; @@ -2205,10 +2216,9 @@ done: * * @return 0: success 1: fail */ -static int -woal_cfg80211_subcmd_set_packet_filter(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int len) +static int woal_cfg80211_subcmd_set_packet_filter(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int len) { struct net_device *dev = wdev->netdev; moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -2227,7 +2237,7 @@ woal_cfg80211_subcmd_set_packet_filter(struct wiphy *wiphy, goto done; } - nla_for_each_attr(iter, data, len, rem) { + nla_for_each_attr (iter, data, len, rem) { type = nla_type(iter); switch (type) { case ATTR_PACKET_FILTER_TOTAL_LENGTH: @@ -2243,8 +2253,8 @@ woal_cfg80211_subcmd_set_packet_filter(struct wiphy *wiphy, case ATTR_PACKET_FILTER_PROGRAM: spin_lock_irqsave(&pkt_filter->lock, flags); strncpy(pkt_filter->packet_filter_program, - nla_data(iter), MIN(packet_filter_len, - nla_len(iter))); + nla_data(iter), + MIN(packet_filter_len, nla_len(iter))); pkt_filter->packet_filter_len = MIN(packet_filter_len, nla_len(iter)); pkt_filter->state = PACKET_FILTER_STATE_START; @@ -2277,11 +2287,9 @@ done: * * @return 0: success 1: fail */ -static int -woal_cfg80211_subcmd_get_packet_filter_capability(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, - int data_len) +static int woal_cfg80211_subcmd_get_packet_filter_capability( + struct wiphy *wiphy, struct wireless_dev *wdev, const void *data, + int data_len) { struct net_device *dev = wdev->netdev; moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -2298,10 +2306,9 @@ woal_cfg80211_subcmd_get_packet_filter_capability(struct wiphy *wiphy, goto done; } - reply_len = - sizeof(pkt_filter->packet_filter_version) + - sizeof(pkt_filter->packet_filter_max_len); - /** Allocate skb for cmd reply*/ + reply_len = sizeof(pkt_filter->packet_filter_version) + + sizeof(pkt_filter->packet_filter_max_len); + /** Allocate skb for cmd reply*/ skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, reply_len); if (!skb) { PRINTM(MERROR, "allocate memory fail for vendor cmd\n"); @@ -2309,10 +2316,16 @@ woal_cfg80211_subcmd_get_packet_filter_capability(struct wiphy *wiphy, goto done; } - nla_put_u32(skb, ATTR_PACKET_FILTER_VERSION, - pkt_filter->packet_filter_version); - nla_put_u32(skb, ATTR_PACKET_FILTER_MAX_LEN, - pkt_filter->packet_filter_max_len); + if (nla_put_u32(skb, ATTR_PACKET_FILTER_VERSION, + pkt_filter->packet_filter_version) || + nla_put_u32(skb, ATTR_PACKET_FILTER_MAX_LEN, + pkt_filter->packet_filter_max_len)) { + PRINTM(MERROR, "nla_put failed!\n"); + kfree_skb(skb); + ret = -ENOMEM; + goto done; + } + ret = cfg80211_vendor_cmd_reply(skb); if (ret) @@ -2335,20 +2348,21 @@ done: * @return non-zero if packet should be passed to AP, zero if * packet should be dropped. */ -int -process_packet(const t_u8 *program, t_u32 program_len, const t_u8 *packet, - t_u32 packet_len, t_u32 filter_age) +int process_packet(const t_u8 *program, t_u32 program_len, const t_u8 *packet, + t_u32 packet_len, t_u32 filter_age) { /* Program counter */ t_u32 pc = 0; /* Memory slot values. */ - t_u32 mem[MEM_ITEMS] = { }; + t_u32 mem[MEM_ITEMS] = {}; /* Register values. */ - t_u32 reg[2] = { }; - /* Number of instructions remaining to execute. This is done to make sure - * there is upper bound on execution time. It should never be hit and is only for - * safety. Initialize to the number of bytes in the program which is an - * upper bound on the number of instructions in the program. */ + t_u32 reg[2] = {}; + /* Number of instructions remaining to execute. This is done to make + * sure there is upper bound on execution time. It should never be hit + * and is only for safety. Initialize to the number of bytes in the + * program which is an + * upper bound on the number of instructions in the program. + */ t_u32 instructions_left = program_len; t_u8 bytecode; @@ -2370,13 +2384,18 @@ process_packet(const t_u8 *program, t_u32 program_len, const t_u8 *packet, /* Is offset within packet bounds? */ #define WITHIN_PACKET_BOUNDS(p) (ENFORCE_UNSIGNED(p) && (p) < packet_len) /* Verify an internal condition and accept packet if it fails. */ -#define ASSERT_RETURN(c) if (!(c)) return PASS_PKT +#define ASSERT_RETURN(c) \ + do { \ + if (!(c)) \ + return PASS_PKT; \ + } while (0) /* If not within program bounds, Accept the packet */ #define ASSERT_WITHIN_PROGRAM_BOUNDS(p) ASSERT_RETURN(WITHIN_PROGRAM_BOUNDS(p)) /* If not within packet bounds, Accept the packet */ #define ASSERT_WITHIN_PKT_BOUNDS(p) ASSERT_RETURN(WITHIN_PACKET_BOUNDS(p)) /* If not within program or not ahead of program counter, Accept the packet */ -#define ASSERT_FORWARD_WITHIN_PROGRAM(p) ASSERT_RETURN(WITHIN_PROGRAM_BOUNDS(p) && (p) >= pc) +#define ASSERT_FORWARD_WITHIN_PROGRAM(p) \ + ASSERT_RETURN(WITHIN_PROGRAM_BOUNDS(p) && (p) >= pc) /* Fill in pre-filled memory slot values. */ mem[MEM_OFFSET_PKT_SIZE] = packet_len; @@ -2390,11 +2409,10 @@ process_packet(const t_u8 *program, t_u32 program_len, const t_u8 *packet, } do { - if (pc == program_len) { + if (pc == program_len) return PASS_PKT; - } else if (pc == (program_len + 1)) { + else if (pc == (program_len + 1)) return DROP_PKT; - } ASSERT_WITHIN_PROGRAM_BOUNDS(pc); bytecode = program[pc++]; opcode = GET_OPCODE(bytecode); @@ -2423,41 +2441,47 @@ process_packet(const t_u8 *program, t_u32 program_len, const t_u8 *packet, case NXP_LDW_OPCODE: case NXP_LDBX_OPCODE: case NXP_LDHX_OPCODE: - case NXP_LDWX_OPCODE:{ - offs = imm; - if (opcode >= NXP_LDBX_OPCODE) { - /* Note: this can overflow and actually decrease offs. */ - offs += reg[1]; - } - ASSERT_WITHIN_PKT_BOUNDS(offs); - switch (opcode) { - case NXP_LDB_OPCODE: - case NXP_LDBX_OPCODE: - load_size = 1; - break; - case NXP_LDH_OPCODE: - case NXP_LDHX_OPCODE: - load_size = 2; - break; - case NXP_LDW_OPCODE: - case NXP_LDWX_OPCODE: - load_size = 4; - break; - /* Immediately enclosing switch statement guarantees - * opcode cannot be any other value. */ - } - end_offs = offs + (load_size - 1); - /* Catch overflow/wrap-around. */ - ASSERT_RETURN(end_offs >= offs); - ASSERT_WITHIN_PKT_BOUNDS(end_offs); - val = 0; - while (load_size--) - val = (val << 8) | packet[offs++]; - REG = val; - break; + case NXP_LDWX_OPCODE: { + offs = imm; + if (opcode >= NXP_LDBX_OPCODE) { + /* Note: this can overflow and actually decrease + * offs. + */ + offs += reg[1]; } + ASSERT_WITHIN_PKT_BOUNDS(offs); + switch (opcode) { + case NXP_LDB_OPCODE: + case NXP_LDBX_OPCODE: + load_size = 1; + break; + case NXP_LDH_OPCODE: + case NXP_LDHX_OPCODE: + load_size = 2; + break; + case NXP_LDW_OPCODE: + case NXP_LDWX_OPCODE: + load_size = 4; + break; + /* Immediately enclosing switch statement + * guarantees + * opcode cannot be any other value. + */ + } + end_offs = offs + (load_size - 1); + /* Catch overflow/wrap-around. */ + ASSERT_RETURN(end_offs >= offs); + ASSERT_WITHIN_PKT_BOUNDS(end_offs); + val = 0; + while (load_size--) + val = (val << 8) | packet[offs++]; + REG = val; + break; + } case NXP_JMP_OPCODE: - /* This can jump backwards. Infinite looping prevented by instructions_remaining. */ + /* This can jump backwards. Infinite looping prevented + * by instructions_remaining. + */ pc += imm; break; case NXP_JEQ_OPCODE: @@ -2465,112 +2489,106 @@ process_packet(const t_u8 *program, t_u32 program_len, const t_u8 *packet, case NXP_JGT_OPCODE: case NXP_JLT_OPCODE: case NXP_JSET_OPCODE: - case NXP_JNEBS_OPCODE:{ - /* Load second immediate field. */ - t_u32 cmp_imm = 0; - if (reg_num == 1) { - cmp_imm = reg[1]; - } else if (len_field != 0) { - t_u32 cmp_imm_len = - 1 << (len_field - 1); - ASSERT_FORWARD_WITHIN_PROGRAM(pc + - cmp_imm_len - - 1); - for (i = 0; i < cmp_imm_len; i++) - cmp_imm = - (cmp_imm << 8) | - program[pc++]; - } - switch (opcode) { - case NXP_JEQ_OPCODE: - if (reg[0] == cmp_imm) - pc += imm; - break; - case NXP_JNE_OPCODE: - if (reg[0] != cmp_imm) - pc += imm; - break; - case NXP_JGT_OPCODE: - if (reg[0] > cmp_imm) - pc += imm; - break; - case NXP_JLT_OPCODE: - if (reg[0] < cmp_imm) - pc += imm; - break; - case NXP_JSET_OPCODE: - if (reg[0] & cmp_imm) - pc += imm; - break; - case NXP_JNEBS_OPCODE:{ - /* cmp_imm is size in bytes of data to compare. - * pc is offset of program bytes to compare. - * imm is jump target offset. - * REG is offset of packet bytes to compare. */ - ASSERT_FORWARD_WITHIN_PROGRAM(pc - + - cmp_imm - - - 1); - ASSERT_WITHIN_PKT_BOUNDS(REG); - last_pkt_offs = - REG + cmp_imm - 1; - ASSERT_RETURN(last_pkt_offs >= - REG); - ASSERT_WITHIN_PKT_BOUNDS - (last_pkt_offs); - if (memcmp - (program + pc, packet + REG, - cmp_imm)) - pc += imm; - /* skip past comparison bytes */ - pc += cmp_imm; - break; - } - } + case NXP_JNEBS_OPCODE: { + /* Load second immediate field. */ + t_u32 cmp_imm = 0; + + if (reg_num == 1) { + cmp_imm = reg[1]; + } else if (len_field != 0) { + t_u32 cmp_imm_len = 1 << (len_field - 1); + + ASSERT_FORWARD_WITHIN_PROGRAM(pc + cmp_imm_len - + 1); + for (i = 0; i < cmp_imm_len; i++) + cmp_imm = + (cmp_imm << 8) | program[pc++]; + } + switch (opcode) { + case NXP_JEQ_OPCODE: + if (reg[0] == cmp_imm) + pc += imm; + break; + case NXP_JNE_OPCODE: + if (reg[0] != cmp_imm) + pc += imm; + break; + case NXP_JGT_OPCODE: + if (reg[0] > cmp_imm) + pc += imm; + break; + case NXP_JLT_OPCODE: + if (reg[0] < cmp_imm) + pc += imm; + break; + case NXP_JSET_OPCODE: + if (reg[0] & cmp_imm) + pc += imm; + break; + case NXP_JNEBS_OPCODE: { + /* cmp_imm is size in bytes of data to compare. + * pc is offset of program bytes to compare. + * imm is jump target offset. + * REG is offset of packet bytes to compare. + */ + ASSERT_FORWARD_WITHIN_PROGRAM(pc + cmp_imm - 1); + ASSERT_WITHIN_PKT_BOUNDS(REG); + last_pkt_offs = REG + cmp_imm - 1; + ASSERT_RETURN(last_pkt_offs >= REG); + ASSERT_WITHIN_PKT_BOUNDS(last_pkt_offs); + if (memcmp(program + pc, packet + REG, cmp_imm)) + pc += imm; + /* skip past comparison bytes */ + pc += cmp_imm; break; } + } + break; + } case NXP_ADD_OPCODE: reg[0] += reg_num ? reg[1] : imm; break; case NXP_MUL_OPCODE: reg[0] *= reg_num ? reg[1] : imm; break; - case NXP_DIV_OPCODE:{ - const t_u32 div_operand = - reg_num ? reg[1] : imm; - ASSERT_RETURN(div_operand); - reg[0] /= div_operand; - break; - } + case NXP_DIV_OPCODE: { + const t_u32 div_operand = reg_num ? reg[1] : imm; + + ASSERT_RETURN(div_operand); + reg[0] /= div_operand; + break; + } case NXP_AND_OPCODE: reg[0] &= reg_num ? reg[1] : imm; break; case NXP_OR_OPCODE: reg[0] |= reg_num ? reg[1] : imm; break; - case NXP_SH_OPCODE:{ - const int32_t shift_val = - reg_num ? (int32_t) reg[1] : sign_imm; - if (shift_val > 0) - reg[0] <<= shift_val; - else - reg[0] >>= -shift_val; - break; - } + case NXP_SH_OPCODE: { + const int32_t shift_val = + reg_num ? (int32_t)reg[1] : sign_imm; + if (shift_val > 0) + reg[0] <<= shift_val; + else + reg[0] >>= -shift_val; + break; + } case NXP_LI_OPCODE: REG = sign_imm; break; case NXP_EXT_OPCODE: if ( -/* If LDM_EXT_OPCODE is 0 and imm is compared with it, a compiler error will result, - * instead just enforce that imm is unsigned (so it's always greater or equal to 0). */ +/* If LDM_EXT_OPCODE is 0 and imm is compared with it, a compiler error will + * result, + * instead just enforce that imm is unsigned (so it's always greater or equal to + * 0). + */ #if NXP_LDM_EXT_OPCODE == 0 - ENFORCE_UNSIGNED(imm) && + ENFORCE_UNSIGNED(imm) && #else - imm >= NXP_LDM_EXT_OPCODE && + imm >= NXP_LDM_EXT_OPCODE && #endif - imm < (NXP_LDM_EXT_OPCODE + MEM_ITEMS)) { + imm < (NXP_LDM_EXT_OPCODE + MEM_ITEMS)) { REG = mem[imm - NXP_LDM_EXT_OPCODE]; } else if (imm >= NXP_STM_EXT_OPCODE && imm < (NXP_STM_EXT_OPCODE + MEM_ITEMS)) { @@ -2583,22 +2601,23 @@ process_packet(const t_u8 *program, t_u32 program_len, const t_u8 *packet, case NXP_NEG_EXT_OPCODE: REG = -REG; break; - case NXP_SWAP_EXT_OPCODE:{ - t_u32 tmp = REG; - REG = OTHER_REG; - OTHER_REG = tmp; - break; - } + case NXP_SWAP_EXT_OPCODE: { + t_u32 tmp = REG; + + REG = OTHER_REG; + OTHER_REG = tmp; + break; + } case NXP_MOV_EXT_OPCODE: REG = OTHER_REG; break; - /* Unknown extended opcode */ + /* Unknown extended opcode */ default: /* Bail out */ return PASS_PKT; } break; - /* Unknown opcode */ + /* Unknown opcode */ default: /* Bail out */ return PASS_PKT; @@ -2617,8 +2636,8 @@ process_packet(const t_u8 *program, t_u32 program_len, const t_u8 *packet, * @return non-zero if packet should be passed to AP, zero if * packet should be dropped. */ -int -woal_filter_packet(moal_private *priv, t_u8 *data, t_u32 len, t_u32 filter_age) +int woal_filter_packet(moal_private *priv, t_u8 *data, t_u32 len, + t_u32 filter_age) { packet_filter *pkt_filter = NULL; int ret = PASS_PKT; @@ -2657,8 +2676,7 @@ done: * * @return 0: success 1: fail */ -int -woal_init_wifi_hal(moal_private *priv) +int woal_init_wifi_hal(moal_private *priv) { ENTER(); woal_init_ring_buffer(priv); @@ -2676,8 +2694,7 @@ woal_init_wifi_hal(moal_private *priv) * * @return 0: success 1: fail */ -int -woal_deinit_wifi_hal(moal_private *priv) +int woal_deinit_wifi_hal(moal_private *priv) { ENTER(); woal_deinit_ring_buffer(priv); @@ -2698,10 +2715,9 @@ woal_deinit_wifi_hal(moal_private *priv) * * @return 0: success -1: fail */ -static int -woal_cfg80211_subcmd_link_statistic_get(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int len) +static int woal_cfg80211_subcmd_link_statistic_get(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int len) { struct net_device *dev = wdev->netdev; moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -2752,9 +2768,8 @@ woal_cfg80211_subcmd_link_statistic_get(struct wiphy *wiphy, ioctl_link_stats_buf = info->param.link_statistic; num_radio = *((t_u32 *)info->param.link_statistic); - radio_stat = - (wifi_radio_stat *) (info->param.link_statistic + - sizeof(num_radio)); + radio_stat = (wifi_radio_stat *)(info->param.link_statistic + + sizeof(num_radio)); radio_stat_len = num_radio * sizeof(wifi_radio_stat); /* Re-write on_time/tx_time/rx_time/on_time_scan from moal handle */ @@ -2764,7 +2779,10 @@ woal_cfg80211_subcmd_link_statistic_get(struct wiphy *wiphy, inter_msec = moal_do_div(cur_time - handle->on_time, 1000000); PRINTM(MINFO, "cur_time=%llu inter_msec=%llu max_msec=%llu\n", cur_time, inter_msec, max_msec); - /* When we report the time up, u32 is not big enough(represent max 49days) and might out of range, make the max value to 24days. */ + /* When we report the time up, u32 is not big enough(represent + * max 49days) and might out of range, make the max value to + * 24days. + */ if (inter_msec > max_msec) { PRINTM(MMSG, "Out of range, set inter_msec=%llu to max_msec=%llu\n", @@ -2787,25 +2805,23 @@ woal_cfg80211_subcmd_link_statistic_get(struct wiphy *wiphy, radio_stat_tmp++; } - iface_stat = - (wifi_iface_stat *) (info->param.link_statistic + - sizeof(num_radio) + radio_stat_len); + iface_stat = (wifi_iface_stat *)(info->param.link_statistic + + sizeof(num_radio) + radio_stat_len); iface_stat_len = sizeof(wifi_iface_stat); /* Fill some fileds */ iface_stat->beacon_rx = stats.bcn_rcv_cnt; - /* could get peer info with seperate cmd */ + /* could get peer info with separate cmd */ for (i = 0; i < iface_stat->num_peers; i++) { - /* no need copy, just increase iface_stat length */ - iface_stat_len += - sizeof(wifi_peer_info) + - sizeof(wifi_rate_stat) * - iface_stat->peer_info[i].num_rate; + /* no need copy, just increase iface_stat length*/ + iface_stat_len += sizeof(wifi_peer_info) + + sizeof(wifi_rate_stat) * + iface_stat->peer_info[i].num_rate; } /* Here the length doesn't contain addition 2 attribute header length */ length = NLA_HDRLEN * 2 + sizeof(num_radio) + radio_stat_len + - iface_stat_len; + iface_stat_len; /* Alloc the SKB for vendor_event */ skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, length); @@ -2818,11 +2834,11 @@ woal_cfg80211_subcmd_link_statistic_get(struct wiphy *wiphy, nla_put(skb, ATTR_LL_STATS_RADIO, radio_stat_len, radio_stat) || nla_put(skb, ATTR_LL_STATS_IFACE, iface_stat_len, iface_stat)) { PRINTM(MERROR, "nla_put failed!\n"); - kfree(skb); + kfree_skb(skb); goto done; } - PRINTM(MCMD_D, "%s: <<< Start DUMP\n", __FUNCTION__); + PRINTM(MCMD_D, "%s: <<< Start DUMP\n", __func__); PRINTM(MCMD_D, "sizeof(wifi_radio_stat)=%zu\n", sizeof(wifi_radio_stat)); DBG_HEXDUMP(MCMD_D, "radio_stat", (t_u8 *)radio_stat, radio_stat_len); @@ -2853,12 +2869,11 @@ woal_cfg80211_subcmd_link_statistic_get(struct wiphy *wiphy, radio_stat_tmp->num_channels); radio_stat_tmp++; } - PRINTM(MCMD_D, "%s: >>> End DUMP\n", __FUNCTION__); + PRINTM(MCMD_D, "%s: >>> End DUMP\n", __func__); err = cfg80211_vendor_cmd_reply(skb); - if (unlikely(err)) { - PRINTM(MERROR, "Vendor Command reply failed ret:%d \n", err); - } + if (unlikely(err)) + PRINTM(MERROR, "Vendor Command reply failed ret:%d\n", err); done: if (status != MLAN_STATUS_PENDING) @@ -2880,10 +2895,9 @@ done: * * @return 0: success -1: fail */ -static int -woal_cfg80211_subcmd_link_statistic_set(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int len) +static int woal_cfg80211_subcmd_link_statistic_set(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int len) { moal_private *priv = (moal_private *)woal_get_netdev_priv(wdev->netdev); struct nlattr *tb[ATTR_LL_STATS_MAX + 1]; @@ -2894,10 +2908,11 @@ woal_cfg80211_subcmd_link_statistic_set(struct wiphy *wiphy, int err = 0; err = nla_parse(tb, ATTR_LL_STATS_MAX, data, len, NULL -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - , NULL +#if KERNEL_VERSION(4, 12, 0) <= CFG80211_VERSION_CODE + , + NULL #endif - ); + ); if (err) return err; @@ -2936,9 +2951,8 @@ woal_cfg80211_subcmd_link_statistic_set(struct wiphy *wiphy, /* Send IOCTL request to MLAN */ status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); - if (status == MLAN_STATUS_SUCCESS) { + if (status == MLAN_STATUS_SUCCESS) PRINTM(MMSG, "enable link layer statistic successfully\n"); - } if (status != MLAN_STATUS_PENDING) kfree(req); @@ -2947,7 +2961,7 @@ woal_cfg80211_subcmd_link_statistic_set(struct wiphy *wiphy, /** * @brief clear function should download command to fimrware, - * so that firmware could cleanup per peer statistic number + * so that firmware could cleanup per peer statistic number * * @param wiphy A pointer to wiphy struct * @param wdev A pointer to wireless_dev struct @@ -2956,10 +2970,9 @@ woal_cfg80211_subcmd_link_statistic_set(struct wiphy *wiphy, * * @return 0: success -1: fail */ -static int -woal_cfg80211_subcmd_link_statistic_clr(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int len) +static int woal_cfg80211_subcmd_link_statistic_clr(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int len) { moal_private *priv = (moal_private *)woal_get_netdev_priv(wdev->netdev); struct nlattr *tb[ATTR_LL_STATS_MAX + 1]; @@ -2972,10 +2985,11 @@ woal_cfg80211_subcmd_link_statistic_clr(struct wiphy *wiphy, int err = 0, length = 0; err = nla_parse(tb, ATTR_LL_STATS_MAX, data, len, NULL -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - , NULL +#if KERNEL_VERSION(4, 12, 0) <= CFG80211_VERSION_CODE + , + NULL #endif - ); + ); if (err) return err; @@ -3010,9 +3024,8 @@ woal_cfg80211_subcmd_link_statistic_clr(struct wiphy *wiphy, /* Send IOCTL request to MLAN */ status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); - if (status == MLAN_STATUS_SUCCESS) { + if (status == MLAN_STATUS_SUCCESS) PRINTM(MMSG, "enable link layer statistic successfully\n"); - } length = NLA_HDRLEN + sizeof(stats_clear_rsp_mask) + sizeof(stop_rsp); /* Alloc the SKB for vendor_event */ @@ -3023,24 +3036,27 @@ woal_cfg80211_subcmd_link_statistic_clr(struct wiphy *wiphy, goto exit; } - /* clear api to reset statistics, stats_clear_rsp_mask identifies what stats have been cleared - * stop_req = 1 will imply whether to stop the statistics collection. - * stop_rsp = 1 will imply that stop_req was honored and statistics collection was stopped. + /* clear api to reset statistics, stats_clear_rsp_mask identifies what + * stats have been cleared stop_req = 1 will imply whether to stop the + * statistics collection. stop_rsp = 1 will imply that stop_req was + * honored and statistics collection was stopped. */ stats_clear_rsp_mask = WIFI_STATS_RADIO | WIFI_STATS_IFACE; stop_rsp = 1; - if (nla_put_u32(skb, ATTR_LL_STATS_CLEAR_RSP_MASK, stats_clear_rsp_mask) - || nla_put_u8(skb, ATTR_LL_STATS_STOP_RSP, stop_rsp)) { + if (nla_put_u32(skb, ATTR_LL_STATS_CLEAR_RSP_MASK, + stats_clear_rsp_mask) || + nla_put_u8(skb, ATTR_LL_STATS_STOP_RSP, stop_rsp)) { PRINTM(MERROR, "nla_put failed!\n"); - kfree(skb); + kfree_skb(skb); err = -EINVAL; goto exit; } err = cfg80211_vendor_cmd_reply(skb); if (unlikely(err)) { - PRINTM(MERROR, "Vendor Command reply failed ret:%d \n", err); - goto exit;; + PRINTM(MERROR, "Vendor Command reply failed ret:%d\n", err); + goto exit; + ; } exit: @@ -3063,10 +3079,9 @@ exit: * * @return 0: success -1: fail */ -static int -woal_cfg80211_subcmd_rssi_monitor(struct wiphy *wiphy, - struct wireless_dev *wdev, const void *data, - int len) +static int woal_cfg80211_subcmd_rssi_monitor(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int len) { struct nlattr *tb[ATTR_RSSI_MONITOR_MAX + 1]; moal_private *priv = (moal_private *)woal_get_netdev_priv(wdev->netdev); @@ -3085,10 +3100,11 @@ woal_cfg80211_subcmd_rssi_monitor(struct wiphy *wiphy, } ret = nla_parse(tb, ATTR_RSSI_MONITOR_MAX, data, len, NULL -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - , NULL +#if KERNEL_VERSION(4, 12, 0) <= CFG80211_VERSION_CODE + , + NULL #endif - ); + ); if (ret) goto done; @@ -3120,7 +3136,9 @@ woal_cfg80211_subcmd_rssi_monitor(struct wiphy *wiphy, } else if (rssi_monitor_control == RSSI_MONOTOR_STOP) { /* stop rssi monitor */ PRINTM(MEVENT, "stop rssi monitor\n"); - /* set both rssi_thold/hyst to 0, will trigger subscribe event clear */ + /* set both rssi_thold/hyst to 0, will trigger subscribe event + * clear + */ priv->cqm_rssi_high_thold = 0; priv->cqm_rssi_thold = 0; priv->cqm_rssi_hyst = 0; @@ -3142,7 +3160,7 @@ woal_cfg80211_subcmd_rssi_monitor(struct wiphy *wiphy, moal_memcpy_ext(priv->phandle, pos, data, len, len); err = cfg80211_vendor_cmd_reply(skb); if (unlikely(err)) { - PRINTM(MERROR, "Vendor Command reply failed ret:%d \n", err); + PRINTM(MERROR, "Vendor Command reply failed ret:%d\n", err); ret = err; } done: @@ -3158,8 +3176,7 @@ done: * * @return N/A */ -void -woal_cfg80211_rssi_monitor_event(moal_private *priv, t_s16 rssi) +void woal_cfg80211_rssi_monitor_event(moal_private *priv, t_s16 rssi) { struct sk_buff *skb = NULL; t_s8 rssi_value = 0; @@ -3169,10 +3186,10 @@ woal_cfg80211_rssi_monitor_event(moal_private *priv, t_s16 rssi) skb = dev_alloc_skb(NLA_HDRLEN * 2 + ETH_ALEN + sizeof(t_s8)); if (!skb) goto done; - /* convert t_s16 to t_s8 */ + /* convert t_s16 to t_s8*/ rssi_value = -abs(rssi); - if (nla_put - (skb, ATTR_RSSI_MONITOR_CUR_BSSID, ETH_ALEN, priv->conn_bssid) || + if (nla_put(skb, ATTR_RSSI_MONITOR_CUR_BSSID, ETH_ALEN, + priv->conn_bssid) || nla_put_s8(skb, ATTR_RSSI_MONITOR_CUR_RSSI, rssi_value)) { PRINTM(MERROR, "nla_put failed!\n"); kfree(skb); @@ -3217,10 +3234,8 @@ woal_cfg80211_subcmd_get_roaming_capability(struct wiphy *wiphy, capa.max_whitelist_size = MAX_SSID_NUM; /* Alloc the SKB for vendor_event */ - skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, - sizeof - (wifi_roaming_capabilities) + - 50); + skb = cfg80211_vendor_cmd_alloc_reply_skb( + wiphy, sizeof(wifi_roaming_capabilities) + 50); if (unlikely(!skb)) { PRINTM(MERROR, "skb alloc failed\n"); goto done; @@ -3231,9 +3246,8 @@ woal_cfg80211_subcmd_get_roaming_capability(struct wiphy *wiphy, sizeof(wifi_roaming_capabilities), (t_u8 *)&capa); err = cfg80211_vendor_cmd_reply(skb); - if (unlikely(err)) { - PRINTM(MERROR, "Vendor Command reply failed ret:%d \n", err); - } + if (unlikely(err)) + PRINTM(MERROR, "Vendor Command reply failed ret:%d\n", err); done: LEAVE(); @@ -3250,10 +3264,9 @@ done: * * @return 0: success fail otherwise */ -static int -woal_cfg80211_subcmd_fw_roaming_enable(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int len) +static int woal_cfg80211_subcmd_fw_roaming_enable(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int len) { moal_private *priv; struct net_device *dev; @@ -3277,7 +3290,7 @@ woal_cfg80211_subcmd_fw_roaming_enable(struct wiphy *wiphy, return -EFAULT; } - nla_for_each_attr(iter, data, len, rem) { + nla_for_each_attr (iter, data, len, rem) { type = nla_type(iter); switch (type) { case MRVL_WLAN_VENDOR_ATTR_FW_ROAMING_CONTROL: @@ -3308,9 +3321,8 @@ woal_cfg80211_subcmd_fw_roaming_enable(struct wiphy *wiphy, nla_put(skb, MRVL_WLAN_VENDOR_ATTR_FW_ROAMING_CONTROL, sizeof(t_u32), &fw_roaming_enable); err = cfg80211_vendor_cmd_reply(skb); - if (unlikely(err)) { - PRINTM(MERROR, "Vendor Command reply failed ret:%d \n", err); - } + if (unlikely(err)) + PRINTM(MERROR, "Vendor Command reply failed ret:%d\n", err); done: LEAVE(); @@ -3327,10 +3339,9 @@ done: * * @return 0: success fail otherwise */ -static int -woal_cfg80211_subcmd_fw_roaming_config(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int len) +static int woal_cfg80211_subcmd_fw_roaming_config(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int len) { moal_private *priv; struct net_device *dev; @@ -3356,7 +3367,7 @@ woal_cfg80211_subcmd_fw_roaming_config(struct wiphy *wiphy, memset((char *)&blacklist, 0, sizeof(wifi_bssid_params)); memset((char *)&whitelist, 0, sizeof(wifi_ssid_params)); - nla_for_each_attr(iter, data, len, rem) { + nla_for_each_attr (iter, data, len, rem) { type = nla_type(iter); switch (type) { case MRVL_WLAN_VENDOR_ATTR_FW_ROAMING_CONFIG_BSSID: @@ -3391,10 +3402,9 @@ done: * * @return 0: success <0: fail */ -static int -woal_cfg80211_subcmd_11k_cfg(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int data_len) +static int woal_cfg80211_subcmd_11k_cfg(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int data_len) { struct net_device *dev = NULL; moal_private *priv = NULL; @@ -3412,14 +3422,15 @@ woal_cfg80211_subcmd_11k_cfg(struct wiphy *wiphy, dev = wdev->netdev; priv = (moal_private *)woal_get_netdev_priv(dev); - nla_parse(tb_vendor, ATTR_ND_OFFLOAD_MAX, - (struct nlattr *)data, data_len, NULL -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - , NULL + nla_parse(tb_vendor, ATTR_ND_OFFLOAD_MAX, (struct nlattr *)data, + data_len, NULL +#if KERNEL_VERSION(4, 12, 0) <= CFG80211_VERSION_CODE + , + NULL #endif - ); + ); if (!tb_vendor[ATTR_ND_OFFLOAD_CONTROL]) { - PRINTM(MINFO, "%s: ATTR_ND_OFFLOAD not found\n", __FUNCTION__); + PRINTM(MINFO, "%s: ATTR_ND_OFFLOAD not found\n", __func__); ret = -EFAULT; goto done; } @@ -3429,7 +3440,6 @@ done: LEAVE(); return ret; - } /** @@ -3442,10 +3452,9 @@ done: * * @return 0: success <0: fail */ -static int -woal_cfg80211_subcmd_set_scan_mac_oui(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int data_len) +static int woal_cfg80211_subcmd_set_scan_mac_oui(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int data_len) { struct net_device *dev = NULL; moal_private *priv = NULL; @@ -3462,15 +3471,16 @@ woal_cfg80211_subcmd_set_scan_mac_oui(struct wiphy *wiphy, dev = wdev->netdev; priv = (moal_private *)woal_get_netdev_priv(dev); - nla_parse(tb_vendor, ATTR_WIFI_MAX, - (struct nlattr *)data, data_len, NULL -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - , NULL + nla_parse(tb_vendor, ATTR_WIFI_MAX, (struct nlattr *)data, data_len, + NULL +#if KERNEL_VERSION(4, 12, 0) <= CFG80211_VERSION_CODE + , + NULL #endif - ); + ); if (!tb_vendor[ATTR_SCAN_MAC_OUI_SET]) { PRINTM(MINFO, "%s: ATTR_SCAN_MAC_OUI_SET not found\n", - __FUNCTION__); + __func__); ret = -EFAULT; goto done; } @@ -3497,10 +3507,9 @@ done: * * @return 0: success fail otherwise */ -static int -woal_cfg80211_subcmd_start_keep_alive(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int len) +static int woal_cfg80211_subcmd_start_keep_alive(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int len) { moal_private *priv; struct net_device *dev; @@ -3531,7 +3540,7 @@ woal_cfg80211_subcmd_start_keep_alive(struct wiphy *wiphy, return -EFAULT; } - nla_for_each_attr(iter, data, len, rem) { + nla_for_each_attr (iter, data, len, rem) { type = nla_type(iter); switch (type) { case MKEEP_ALIVE_ATTRIBUTE_ID: @@ -3548,16 +3557,18 @@ woal_cfg80211_subcmd_start_keep_alive(struct wiphy *wiphy, } break; case MKEEP_ALIVE_ATTRIBUTE_IP_PKT: - ip_pkt = (u8 *)kzalloc(ip_pkt_len, GFP_ATOMIC); - if (ip_pkt == NULL) { - ret = -ENOMEM; - PRINTM(MERROR, - "Failed to allocate mem for ip packet\n"); - goto exit; + if (ip_pkt_len) { + ip_pkt = (u8 *)kzalloc(ip_pkt_len, GFP_ATOMIC); + if (ip_pkt == NULL) { + ret = -ENOMEM; + PRINTM(MERROR, + "Failed to allocate mem for ip packet\n"); + goto exit; + } + moal_memcpy_ext(priv->phandle, ip_pkt, + (u8 *)nla_data(iter), + nla_len(iter), ip_pkt_len); } - moal_memcpy_ext(priv->phandle, ip_pkt, - (u8 *)nla_data(iter), nla_len(iter), - ip_pkt_len); break; case MKEEP_ALIVE_ATTRIBUTE_SRC_MAC_ADDR: moal_memcpy_ext(priv->phandle, src_mac, nla_data(iter), @@ -3583,19 +3594,15 @@ woal_cfg80211_subcmd_start_keep_alive(struct wiphy *wiphy, } } - ret = woal_priv_save_cloud_keep_alive_params(priv, mkeep_alive_id, true, - ether_type, ip_pkt, - ip_pkt_len, src_mac, - dst_mac, period_msec, - retry_interval, retry_cnt); - if (ret < 0) { + ret = woal_priv_save_cloud_keep_alive_params( + priv, mkeep_alive_id, true, ether_type, ip_pkt, ip_pkt_len, + src_mac, dst_mac, period_msec, retry_interval, retry_cnt); + if (ret < 0) PRINTM(MERROR, "start_mkeep_alive is failed ret: %d\n", ret); - } exit: - if (ip_pkt) { + if (ip_pkt) kfree(ip_pkt); - } LEAVE(); return ret; @@ -3611,10 +3618,9 @@ exit: * * @return 0: success fail otherwise */ -static int -woal_cfg80211_subcmd_stop_keep_alive(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int len) +static int woal_cfg80211_subcmd_stop_keep_alive(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int len) { moal_private *priv; struct net_device *dev; @@ -3637,7 +3643,7 @@ woal_cfg80211_subcmd_stop_keep_alive(struct wiphy *wiphy, return -EFAULT; } - nla_for_each_attr(iter, data, len, rem) { + nla_for_each_attr (iter, data, len, rem) { type = nla_type(iter); switch (type) { case MKEEP_ALIVE_ATTRIBUTE_ID: @@ -3651,25 +3657,24 @@ woal_cfg80211_subcmd_stop_keep_alive(struct wiphy *wiphy, } ret = woal_stop_mkeep_alive(priv, mkeep_alive_id, 0, NULL, NULL); - if (ret < 0) { + if (ret < 0) PRINTM(MERROR, "stop_mkeep_alive is failed ret: %d\n", ret); - } LEAVE(); return ret; } /** - * @brief Upload last keep alive packet to Host through vendor event + * @brief Upload last keep alive packet to Host through vendor + event * * @param priv Pointer to moal_private structure * @param mkeep_alive Pointer to mlan_ds_misc_keep_alive structure * @return 0: success fail otherwise */ -int -woal_mkeep_alive_vendor_event(moal_private *priv, - mlan_ds_misc_keep_alive * mkeep_alive) +int woal_mkeep_alive_vendor_event(moal_private *priv, + mlan_ds_misc_keep_alive *mkeep_alive) { struct wiphy *wiphy = priv->wdev->wiphy; struct sk_buff *skb = NULL; @@ -3681,7 +3686,7 @@ woal_mkeep_alive_vendor_event(moal_private *priv, event_id = woal_get_event_id(event_cloud_keep_alive); if (event_max == event_id) { - PRINTM(MERROR, "Not find this event %d \n", event_id); + PRINTM(MERROR, "Not find this event %d\n", event_id); ret = MLAN_STATUS_FAILURE; goto done; } @@ -3692,8 +3697,8 @@ woal_mkeep_alive_vendor_event(moal_private *priv, } len = mkeep_alive->pkt_len; - /**allocate skb*/ -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 1, 0) + /**allocate skb*/ +#if KERNEL_VERSION(4, 1, 0) <= CFG80211_VERSION_CODE skb = cfg80211_vendor_event_alloc(wiphy, priv->wdev, len + 50, #else skb = cfg80211_vendor_event_alloc(wiphy, len + 50, @@ -3709,7 +3714,7 @@ woal_mkeep_alive_vendor_event(moal_private *priv, nla_put(skb, MKEEP_ALIVE_ATTRIBUTE_IP_PKT_LEN, sizeof(t_u16), &len); nla_put(skb, MKEEP_ALIVE_ATTRIBUTE_IP_PKT, len, mkeep_alive->packet); - /**send event*/ + /**send event*/ cfg80211_vendor_event(skb, GFP_ATOMIC); done: @@ -3727,10 +3732,9 @@ done: * * @return 0: success 1: fail */ -static int -woal_cfg80211_subcmd_set_dfs_offload(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, int data_len) +static int woal_cfg80211_subcmd_set_dfs_offload(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, int data_len) { struct sk_buff *skb = NULL; moal_handle *handle = (moal_handle *)woal_get_wiphy_priv(wiphy); @@ -3755,266 +3759,348 @@ woal_cfg80211_subcmd_set_dfs_offload(struct wiphy *wiphy, return ret; } +// clang-format off const struct wiphy_vendor_command vendor_commands[] = { { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = sub_cmd_set_drvdbg,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_set_drvdbg, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_set_drvdbg, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_set_drvdbg, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_get_valid_channels,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_get_valid_channels, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_get_valid_channels, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_get_valid_channels, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_set_scan_mac_oui,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_set_scan_mac_oui, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_set_scan_mac_oui, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_set_scan_mac_oui, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_link_statistic_set,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_link_statistic_set, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_link_statistic_set, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_link_statistic_set, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_link_statistic_get,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_link_statistic_get, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_link_statistic_get, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_link_statistic_get, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_link_statistic_clr,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_link_statistic_clr, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_link_statistic_clr, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_link_statistic_clr, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, #ifdef STA_CFG80211 { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = sub_cmd_rssi_monitor,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_rssi_monitor, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_rssi_monitor, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_rssi_monitor, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, #endif { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_get_roaming_capability,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_get_roaming_capability, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_get_roaming_capability, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_get_roaming_capability, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_fw_roaming_enable,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_fw_roaming_enable, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_fw_roaming_enable, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_fw_roaming_enable, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_fw_roaming_config,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_fw_roaming_config, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_fw_roaming_config, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_fw_roaming_config, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_start_keep_alive,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_start_keep_alive, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_start_keep_alive, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_start_keep_alive, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_stop_keep_alive,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_stop_keep_alive, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_stop_keep_alive, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_stop_keep_alive, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_dfs_capability,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_set_dfs_offload, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_dfs_capability, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_set_dfs_offload, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, + { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = sub_cmd_nd_offload}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_11k_cfg, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_nd_offload + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_11k_cfg, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_get_drv_version,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_get_drv_version, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_get_drv_version, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_get_drv_version, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_get_fw_version,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_get_fw_version, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_get_fw_version, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_get_fw_version, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_get_wifi_supp_feature_set,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_get_supp_feature_set, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_get_wifi_supp_feature_set, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_get_supp_feature_set, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_set_country_code,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_set_country_code, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_set_country_code, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_set_country_code, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_get_wifi_logger_supp_feature_set,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV, - .doit = woal_cfg80211_subcmd_get_wifi_logger_supp_feature_set, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = + sub_cmd_get_wifi_logger_supp_feature_set, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV, + .doit = woal_cfg80211_subcmd_get_wifi_logger_supp_feature_set, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_get_ring_buff_status,}, - .flags = - WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV | - WIPHY_VENDOR_CMD_NEED_RUNNING, - .doit = woal_cfg80211_subcmd_get_ring_buff_status, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_get_ring_buff_status, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV | + WIPHY_VENDOR_CMD_NEED_RUNNING, + .doit = woal_cfg80211_subcmd_get_ring_buff_status, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = sub_cmd_start_logging,}, - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | - WIPHY_VENDOR_CMD_NEED_NETDEV | WIPHY_VENDOR_CMD_NEED_RUNNING, - .doit = woal_cfg80211_subcmd_start_logging, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_start_logging, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV | + WIPHY_VENDOR_CMD_NEED_RUNNING, + .doit = woal_cfg80211_subcmd_start_logging, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_get_ring_buff_data,}, - .flags = - WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV | - WIPHY_VENDOR_CMD_NEED_RUNNING, - .doit = woal_cfg80211_subcmd_get_ring_data, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_get_ring_buff_data, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV | + WIPHY_VENDOR_CMD_NEED_RUNNING, + .doit = woal_cfg80211_subcmd_get_ring_data, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_start_packet_fate_monitor,}, - .flags = - WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV | - WIPHY_VENDOR_CMD_NEED_RUNNING, - .doit = woal_cfg80211_subcmd_start_packet_fate_monitor, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_start_packet_fate_monitor, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV | + WIPHY_VENDOR_CMD_NEED_RUNNING, + .doit = woal_cfg80211_subcmd_start_packet_fate_monitor, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_get_fw_mem_dump,}, - .flags = - WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV | - WIPHY_VENDOR_CMD_NEED_RUNNING, - .doit = woal_cfg80211_subcmd_get_fw_dump, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_get_fw_mem_dump, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV | + WIPHY_VENDOR_CMD_NEED_RUNNING, + .doit = woal_cfg80211_subcmd_get_fw_dump, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_get_drv_mem_dump,}, - .flags = - WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV | - WIPHY_VENDOR_CMD_NEED_RUNNING, - .doit = woal_cfg80211_subcmd_get_drv_dump, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_get_drv_mem_dump, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV | + WIPHY_VENDOR_CMD_NEED_RUNNING, + .doit = woal_cfg80211_subcmd_get_drv_dump, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_set_packet_filter,}, - .flags = - WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV | - WIPHY_VENDOR_CMD_NEED_RUNNING, - .doit = woal_cfg80211_subcmd_set_packet_filter, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_set_packet_filter, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV | + WIPHY_VENDOR_CMD_NEED_RUNNING, + .doit = woal_cfg80211_subcmd_set_packet_filter, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, { - .info = {.vendor_id = MRVL_VENDOR_ID,.subcmd = - sub_cmd_get_packet_filter_capability,}, - .flags = - WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV | - WIPHY_VENDOR_CMD_NEED_RUNNING, - .doit = woal_cfg80211_subcmd_get_packet_filter_capability, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 3, 0) - .policy = VENDOR_CMD_RAW_DATA, + .info = { + .vendor_id = MRVL_VENDOR_ID, + .subcmd = sub_cmd_get_packet_filter_capability, + }, + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_NETDEV | + WIPHY_VENDOR_CMD_NEED_RUNNING, + .doit = woal_cfg80211_subcmd_get_packet_filter_capability, +#if KERNEL_VERSION(5, 3, 0) <= CFG80211_VERSION_CODE + .policy = VENDOR_CMD_RAW_DATA, #endif - }, + }, }; +// clang-format on /** * @brief register vendor commands and events @@ -4023,8 +4109,7 @@ const struct wiphy_vendor_command vendor_commands[] = { * * @return */ -void -woal_register_cfg80211_vendor_command(struct wiphy *wiphy) +void woal_register_cfg80211_vendor_command(struct wiphy *wiphy) { ENTER(); wiphy->vendor_commands = vendor_commands; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_cfg80211_util.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_cfg80211_util.h index 7478492a9993..6cd7e6bb8570 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_cfg80211_util.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_cfg80211_util.h @@ -1,31 +1,31 @@ /** @file moal_cfg80211_util.h - * - * @brief This file contains the CFG80211 vendor specific defines. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains the CFG80211 vendor specific defines. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ #ifndef _MOAL_CFGVENDOR_H_ #define _MOAL_CFGVENDOR_H_ -#include "moal_main.h" +#include "moal_main.h" -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) +#if KERNEL_VERSION(3, 14, 0) <= CFG80211_VERSION_CODE #define RING_NAME_MAX 32 typedef int wifi_ring_buffer_id; @@ -33,52 +33,52 @@ typedef int wifi_ring_buffer_id; /** WiFi ring control structure */ typedef struct _wifi_ring_ctrl { - /** Written bytes */ + /** Written bytes */ t_u32 written_bytes; - /** Read Bytes */ + /** Read Bytes */ t_u32 read_bytes; - /** Written records */ + /** Written records */ t_u32 written_records; } ring_buffer_ctrl; enum ring_state { - /** ring is not initialized*/ + /** ring is not initialized*/ RING_STOP = 0, - /** ring is live and logging*/ + /** ring is live and logging*/ RING_ACTIVE, - /** ring is initialized but not logging*/ + /** ring is initialized but not logging*/ RING_SUSPEND, }; /** WiFi ring buffer sttructure */ typedef struct _wifi_ring_buffer { - /** Ring ID */ + /** Ring ID */ wifi_ring_buffer_id ring_id; - /** Ring name */ + /** Ring name */ t_u8 name[RING_NAME_MAX]; - /** Ring size */ + /** Ring size */ t_u32 ring_size; - /** Write pointer */ + /** Write pointer */ t_u32 wp; - /** Read pointer */ + /** Read pointer */ t_u32 rp; - /** Log level */ + /** Log level */ t_u32 log_level; - /** Threshold */ + /** Threshold */ t_u32 threshold; - /** Ring buffer */ + /** Ring buffer */ void *ring_buf; - /** Lock */ + /** Lock */ spinlock_t lock; - /** Buffer control */ + /** Buffer control */ ring_buffer_ctrl ctrl; - /** Ring state */ + /** Ring state */ enum ring_state state; - /** Delayed work */ + /** Delayed work */ struct delayed_work work; - /** Interval */ + /** Interval */ unsigned long interval; - /** Moal priv */ + /** Moal priv */ moal_private *priv; } wifi_ring_buffer; @@ -89,30 +89,32 @@ typedef struct _wifi_ring_buffer { #define TLV_LOG_HEADER_LEN 4 -#define WIFI_LOGGER_MEMORY_DUMP_SUPPORTED MBIT(0) /* Memory dump of Fw */ -#define WIFI_LOGGER_PER_PACKET_TX_RX_STATUS_SUPPORT MBIT(1) /*PKT status */ -#define WIFI_LOGGER_CONNECT_EVENT_SUPPORTED MBIT(2) /* connectivity event */ -#define WIFI_LOGGER_POWER_EVENT_SUPPORTED MBIT(3) /* Power of driver */ -#define WIFI_LOGGER_WAKE_LOCK_SUPPORTED MBIT(4) /* Wake lock of driver */ -#define WIFI_LOGGER_VERBOSE_SUPPORTED MBIT(5) /*verbose log of Fw */ -#define WIFI_LOGGER_WATCHDOG_TIMER_SUPPORTED MBIT(6) /*monitor the health of Fw */ +#define WIFI_LOGGER_MEMORY_DUMP_SUPPORTED MBIT(0) /* Memory dump of Fw*/ +#define WIFI_LOGGER_PER_PACKET_TX_RX_STATUS_SUPPORT MBIT(1) /*PKT status*/ +#define WIFI_LOGGER_CONNECT_EVENT_SUPPORTED MBIT(2) /* connectivity event*/ +#define WIFI_LOGGER_POWER_EVENT_SUPPORTED MBIT(3) /* Power of driver*/ +#define WIFI_LOGGER_WAKE_LOCK_SUPPORTED MBIT(4) /* Wake lock of driver*/ +#define WIFI_LOGGER_VERBOSE_SUPPORTED MBIT(5) /*verbose log of Fw*/ +#define WIFI_LOGGER_WATCHDOG_TIMER_SUPPORTED \ + MBIT(6) /*monitor the health of Fw*/ /** * Parameters of wifi logger events are TLVs * Event parameters tags are defined as: */ -#define WIFI_TAG_VENDOR_SPECIFIC 0 // take a byte stream as parameter -#define WIFI_TAG_BSSID 1 // takes a 6 bytes MAC address as parameter -#define WIFI_TAG_ADDR 2 // takes a 6 bytes MAC address as parameter -#define WIFI_TAG_SSID 3 // takes a 32 bytes SSID address as parameter -#define WIFI_TAG_STATUS 4 // takes an integer as parameter -#define WIFI_TAG_REASON_CODE 14 // take a reason code as per 802.11 as parameter -#define WIFI_TAG_RSSI 21 // take an integer as parameter -#define WIFI_TAG_CHANNEL 22 // take an integer as parameter +#define WIFI_TAG_VENDOR_SPECIFIC 0 // take a byte stream as parameter +#define WIFI_TAG_BSSID 1 // takes a 6 bytes MAC address as parameter +#define WIFI_TAG_ADDR 2 // takes a 6 bytes MAC address as parameter +#define WIFI_TAG_SSID 3 // takes a 32 bytes SSID address as parameter +#define WIFI_TAG_STATUS 4 // takes an integer as parameter +#define WIFI_TAG_REASON_CODE 14 // take a reason code as per 802.11 as parameter +#define WIFI_TAG_RSSI 21 // take an integer as parameter +#define WIFI_TAG_CHANNEL 22 // take an integer as parameter #define RING_ENTRY_SIZE (sizeof(wifi_ring_buffer_entry)) #define ENTRY_LENGTH(hdr) (hdr->entry_size + RING_ENTRY_SIZE) -#define READ_AVAIL_SPACE(ring) (ring->ctrl.written_bytes - ring->ctrl.read_bytes) +#define READ_AVAIL_SPACE(ring) \ + (ring->ctrl.written_bytes - ring->ctrl.read_bytes) enum logger_attributes { ATTR_WIFI_LOGGER_INVALID = 0, @@ -139,93 +141,93 @@ enum logger_attributes { ATTR_WIFI_LOGGER_MAX = ATTR_WIFI_LOGGER_AFTER_LAST - 1 }; -/* Below events refer to the wifi_connectivity_event ring and shall be supported */ -enum { - WIFI_EVENT_ASSOCIATION_REQUESTED = 0, - WIFI_EVENT_AUTH_COMPLETE, - WIFI_EVENT_ASSOC_COMPLETE, +/* Below events refer to the wifi_connectivity_event ring and shall be supported + */ +enum { WIFI_EVENT_ASSOCIATION_REQUESTED = 0, + WIFI_EVENT_AUTH_COMPLETE, + WIFI_EVENT_ASSOC_COMPLETE, }; enum { - RING_BUFFER_ENTRY_FLAGS_HAS_BINARY = (1 << (0)), // set for binary entries - RING_BUFFER_ENTRY_FLAGS_HAS_TIMESTAMP = (1 << (1)) // set if 64 bits timestamp is present + /* set for binary entries */ + RING_BUFFER_ENTRY_FLAGS_HAS_BINARY = (1 << (0)), + /* set if 64 bits timestamp is present */ + RING_BUFFER_ENTRY_FLAGS_HAS_TIMESTAMP = (1 << (1)) }; -enum { - ENTRY_TYPE_CONNECT_EVENT = 1, - ENTRY_TYPE_PKT, - ENTRY_TYPE_WAKE_LOCK, - ENTRY_TYPE_POWER_EVENT, - ENTRY_TYPE_DATA -}; +enum { ENTRY_TYPE_CONNECT_EVENT = 1, + ENTRY_TYPE_PKT, + ENTRY_TYPE_WAKE_LOCK, + ENTRY_TYPE_POWER_EVENT, + ENTRY_TYPE_DATA }; /** WiFi ring buffer entry structure */ typedef struct { - /** size of payload excluding the header */ + /** size of payload excluding the header */ t_u16 entry_size; - /** Flags */ + /** Flags */ t_u8 flags; - /** entry type */ + /** entry type */ t_u8 type; - /** present if has_timestamp bit is set. */ + /** present if has_timestamp bit is set. */ t_u64 timestamp; -} __attribute__ ((packed)) wifi_ring_buffer_entry; +} __attribute__((packed)) wifi_ring_buffer_entry; /** WiFi ring buffer status structure*/ typedef struct _wifi_ring_buffer_status { - /** Ring name */ + /** Ring name */ t_u8 name[RING_NAME_MAX]; - /** Flag */ + /** Flag */ t_u32 flag; - /** Ring ID */ + /** Ring ID */ wifi_ring_buffer_id ring_id; - /** Buffer size */ + /** Buffer size */ t_u32 ring_buffer_byte_size; - /** Verbose Level */ + /** Verbose Level */ t_u32 verbose_level; - /** Written bytes */ + /** Written bytes */ t_u32 written_bytes; - /** Read bytes */ + /** Read bytes */ t_u32 read_bytes; - /** Written records */ + /** Written records */ t_u32 written_records; } wifi_ring_buffer_status; /** TLV log structure */ typedef struct { - /** Tag */ + /** Tag */ u16 tag; - /** Length of value*/ + /** Length of value*/ u16 length; - /** Value */ + /** Value */ u8 value[]; -} __attribute__ ((packed)) tlv_log; +} __attribute__((packed)) tlv_log; /** WiFi ring buffer driver structure */ typedef struct { - /** event */ + /** event */ u16 event; - /** TLV log structure array */ + /** TLV log structure array */ tlv_log tlvs[]; - /** separate parameter structure per event to be provided and optional data - * the event_data is expected to include an official android part, with some - * parameter as transmit rate, num retries, num scan result found etc... - * as well, event_data can include a vendor proprietary part which is - * understood by the developer only - */ -} __attribute__ ((packed)) wifi_ring_buffer_driver_connectivity_event; + /** separate parameter structure per event to be provided and optional + * data the event_data is expected to include an official android part, + * with some parameter as transmit rate, num retries, num scan result + * found etc... as well, event_data can include a vendor proprietary + * part which is understood by the developer only + */ +} __attribute__((packed)) wifi_ring_buffer_driver_connectivity_event; /** Assoc logger data structure */ typedef struct _assoc_logger { - /** vendor specific */ + /** vendor specific */ t_u8 oui[3]; - /** BSSID */ + /** BSSID */ t_u8 bssid[MLAN_MAC_ADDR_LENGTH]; - /** SSID */ + /** SSID */ t_u8 ssid[MLAN_MAX_SSID_LENGTH]; - /** RSSI */ + /** RSSI */ t_s32 rssi; - /** Channel */ + /** Channel */ t_u32 channel; } assoc_logger_data; @@ -235,10 +237,10 @@ int woal_ring_event_logger(moal_private *priv, int ring_id, int woal_wake_reason_logger(moal_private *priv, mlan_ds_hs_wakeup_reason wake_reason); -#define MD5_PREFIX_LEN 4 -#define MAX_FATE_LOG_LEN 32 -#define MAX_FRAME_LEN_ETHERNET 1518 -#define MAX_FRAME_LEN_80211_MGMT 2352 +#define MD5_PREFIX_LEN 4 +#define MAX_FATE_LOG_LEN 32 +#define MAX_FRAME_LEN_ETHERNET 1518 +#define MAX_FRAME_LEN_80211_MGMT 2352 /** packet_fate_packet_type */ typedef enum { @@ -255,104 +257,111 @@ typedef enum { /** wifi_tx_packet_fate */ typedef enum { - /** Sent over air and ACKed. */ + /** Sent over air and ACKed. */ TX_PKT_FATE_ACKED, - /** Sent over air but not ACKed. (Normal for broadcast/multicast.) */ + /** Sent over air but not ACKed. (Normal for broadcast/multicast.) */ TX_PKT_FATE_SENT, - /** Queued within firmware, but not yet sent over air. */ + /** Queued within firmware, but not yet sent over air. */ TX_PKT_FATE_FW_QUEUED, - /** Dropped by firmware as invalid. E.g. bad source address, bad checksum, or invalid for current - state. */ + /** Dropped by firmware as invalid. E.g. bad source address, bad + * checksum, or invalid for current state. + */ TX_PKT_FATE_FW_DROP_INVALID, - /** Dropped by firmware due to lack of buffer space. */ + /** Dropped by firmware due to lack of buffer space. */ TX_PKT_FATE_FW_DROP_NOBUFS, - /** Dropped by firmware for any other reason. Includes frames that were sent by driver to firmware, but - unaccounted for by firmware. */ + /** Dropped by firmware for any other reason. Includes frames that were + * sent by driver to firmware, but unaccounted for by firmware. + */ TX_PKT_FATE_FW_DROP_OTHER, - /** Queued within driver, not yet sent to firmware. */ + /** Queued within driver, not yet sent to firmware. */ TX_PKT_FATE_DRV_QUEUED, - /** Dropped by driver as invalid. E.g. bad source address, or invalid for current state. */ + /** Dropped by driver as invalid. E.g. bad source address, or invalid + * for current state. + */ TX_PKT_FATE_DRV_DROP_INVALID, - /** Dropped by driver due to lack of buffer space. */ + /** Dropped by driver due to lack of buffer space. */ TX_PKT_FATE_DRV_DROP_NOBUFS, - /** Dropped by driver for any other reason. */ + /** Dropped by driver for any other reason. */ TX_PKT_FATE_DRV_DROP_OTHER, } wifi_tx_packet_fate; /** wifi_rx_packet_fate */ typedef enum { - /** Valid and delivered to network stack (e.g., netif_rx()). */ + /** Valid and delivered to network stack (e.g., netif_rx()). */ RX_PKT_FATE_SUCCESS, - /** Queued within firmware, but not yet sent to driver. */ + /** Queued within firmware, but not yet sent to driver. */ RX_PKT_FATE_FW_QUEUED, - /** Dropped by firmware due to host-programmable filters. */ + /** Dropped by firmware due to host-programmable filters. */ RX_PKT_FATE_FW_DROP_FILTER, - /** Dropped by firmware as invalid. E.g. bad checksum, decrypt failed, or invalid for current state. */ + /** Dropped by firmware as invalid. E.g. bad checksum, decrypt failed, + * or invalid for current state. + */ RX_PKT_FATE_FW_DROP_INVALID, - /** Dropped by firmware due to lack of buffer space. */ + /** Dropped by firmware due to lack of buffer space. */ RX_PKT_FATE_FW_DROP_NOBUFS, - /** Dropped by firmware for any other reason. */ + /** Dropped by firmware for any other reason. */ RX_PKT_FATE_FW_DROP_OTHER, - /** Queued within driver, not yet delivered to network stack. */ + /** Queued within driver, not yet delivered to network stack. */ RX_PKT_FATE_DRV_QUEUED, - /** Dropped by driver due to filter rules. */ + /** Dropped by driver due to filter rules. */ RX_PKT_FATE_DRV_DROP_FILTER, - /** Dropped by driver as invalid. E.g. not permitted in current state. */ + /** Dropped by driver as invalid. E.g. not permitted in current state. + */ RX_PKT_FATE_DRV_DROP_INVALID, - /** Dropped by driver due to lack of buffer space. */ + /** Dropped by driver due to lack of buffer space. */ RX_PKT_FATE_DRV_DROP_NOBUFS, - /** Dropped by driver for any other reason. */ + /** Dropped by driver for any other reason. */ RX_PKT_FATE_DRV_DROP_OTHER, } wifi_rx_packet_fate; /** frame_info_i */ typedef struct { - /** Payload Type */ + /** Payload Type */ frame_type payload_type; - /** Driver timestamp in uS */ + /** Driver timestamp in uS */ u32 driver_timestamp_usec; - /** FW timestamp in uS */ + /** FW timestamp in uS */ u32 firmware_timestamp_usec; - /** Frame Length */ + /** Frame Length */ u32 frame_len; } frame_info_i; /** wifi_tx_report_i */ typedef struct { - /** MD5 prefix */ + /** MD5 prefix */ char md5_prefix[MD5_PREFIX_LEN]; - /** TX packet fate */ + /** TX packet fate */ wifi_tx_packet_fate fate; - /** frame information */ + /** frame information */ frame_info_i frame_inf; } wifi_tx_report_i; /** wifi_rx_report_i */ typedef struct { - /** MD5 prefix */ + /** MD5 prefix */ char md5_prefix[MD5_PREFIX_LEN]; - /** TX packet fate */ + /** TX packet fate */ wifi_rx_packet_fate fate; - /** frame information */ + /** frame information */ frame_info_i frame_inf; } wifi_rx_report_i; @@ -382,7 +391,9 @@ int woal_packet_fate_monitor(moal_private *priv, /* Age since filter installed in seconds. */ #define MEM_OFFSET_FILTER_AGE 15 -/* Leave 0 opcode unused as it's a good indicator of accidental incorrect execution (e.g. data). */ +/* Leave 0 opcode unused as it's a good indicator of accidental incorrect + * execution (e.g. data). + */ /* Load 1 byte from immediate offset, e.g. "ldb R0, [5]" */ #define NXP_LDB_OPCODE 1 /* Load 2 bytes from immediate offset, e.g. "ldh R0, [5]" */ @@ -425,13 +436,16 @@ int woal_packet_fate_monitor(moal_private *priv, #define NXP_JNEBS_OPCODE 20 /* Immediate value is one of *_EXT_OPCODE * Extended opcodes. These all have an opcode of EXT_OPCODE - * and specify the actual opcode in the immediate field.*/ + * and specify the actual opcode in the immediate field. + */ #define NXP_EXT_OPCODE 21 /* Load from memory, e.g. "ldm R0,5" - * Values 0-15 represent loading the different memory slots. */ + * Values 0-15 represent loading the different memory slots. + */ #define NXP_LDM_EXT_OPCODE 0 /* Store to memory, e.g. "stm R0,5" * - * Values 16-31 represent storing to the different memory slots. */ + * Values 16-31 represent storing to the different memory slots. + */ #define NXP_STM_EXT_OPCODE 16 /* Not, e.g. "not R0" */ #define NXP_NOT_EXT_OPCODE 32 @@ -460,9 +474,11 @@ int woal_packet_fate_monitor(moal_private *priv, #define PASS_PKT 1 /* Return code indicating "packet" should be dropped. */ #define DROP_PKT 0 -/* If "c" is of an unsigned type, generate a compile warning that gets promoted to an error. - * This makes bounds checking simpler because ">= 0" can be avoided. Otherwise adding - * superfluous ">= 0" with unsigned expressions generates compile warnings. */ +/* If "c" is of an unsigned type, generate a compile warning that gets promoted + * to an error. This makes bounds checking simpler because ">= 0" can be + * avoided. Otherwise adding superfluous ">= 0" with unsigned expressions + * generates compile warnings. + */ #define ENFORCE_UNSIGNED(c) ((c) == (uint32_t)(c)) /** =========== Define Copied from apf_interpreter.c END =========== */ @@ -470,10 +486,9 @@ int woal_packet_fate_monitor(moal_private *priv, #define APF_FRAME_HEADER_SIZE 14 #define PACKET_FILTER_MAX_LEN 1024 -enum { - PACKET_FILTER_STATE_INIT = 0, - PACKET_FILTER_STATE_STOP, - PACKET_FILTER_STATE_START, +enum { PACKET_FILTER_STATE_INIT = 0, + PACKET_FILTER_STATE_STOP, + PACKET_FILTER_STATE_START, }; enum wifi_attr_packet_filter { @@ -502,42 +517,44 @@ int woal_filter_packet(moal_private *priv, t_u8 *data, t_u32 len, int woal_init_wifi_hal(moal_private *priv); int woal_deinit_wifi_hal(moal_private *priv); -#define ATTRIBUTE_U32_LEN (nla_total_size(NLA_HDRLEN + 4)) -#define VENDOR_ID_OVERHEAD ATTRIBUTE_U32_LEN -#define VENDOR_SUBCMD_OVERHEAD ATTRIBUTE_U32_LEN -#define VENDOR_DATA_OVERHEAD (nla_total_size(NLA_HDRLEN)) +#define ATTRIBUTE_U32_LEN (nla_total_size(NLA_HDRLEN + 4)) +#define VENDOR_ID_OVERHEAD ATTRIBUTE_U32_LEN +#define VENDOR_SUBCMD_OVERHEAD ATTRIBUTE_U32_LEN +#define VENDOR_DATA_OVERHEAD (nla_total_size(NLA_HDRLEN)) -#define VENDOR_REPLY_OVERHEAD (VENDOR_ID_OVERHEAD + \ - VENDOR_SUBCMD_OVERHEAD + \ - VENDOR_DATA_OVERHEAD) +#define VENDOR_REPLY_OVERHEAD \ + (VENDOR_ID_OVERHEAD + VENDOR_SUBCMD_OVERHEAD + VENDOR_DATA_OVERHEAD) /* Features Enums*/ -#define WLAN_FEATURE_INFRA 0x0001 // Basic infrastructure mode support -#define WLAN_FEATURE_INFRA_5G 0x0002 // 5 GHz Band support -#define WLAN_FEATURE_HOTSPOT 0x0004 // GAS/ANQP support -#define WLAN_FEATURE_P2P 0x0008 // Wifi-Direct/P2P -#define WLAN_FEATURE_SOFT_AP 0x0010 // Soft AP support -#define WLAN_FEATURE_GSCAN 0x0020 // Google-Scan APIsi support -#define WLAN_FEATURE_NAN 0x0040 // Neighbor Awareness Networking (NAN) -#define WLAN_FEATURE_D2D_RTT 0x0080 // Device-to-device RTT support -#define WLAN_FEATURE_D2AP_RTT 0x0100 // Device-to-AP RTT support -#define WLAN_FEATURE_BATCH_SCAN 0x0200 // Batched Scan (legacy) support -#define WLAN_FEATURE_PNO 0x0400 // Preferred network offload support -#define WLAN_FEATURE_ADDITIONAL_STA 0x0800 // Two STAs support -#define WLAN_FEATURE_TDLS 0x1000 // Tunnel directed link setup (TDLS) -#define WLAN_FEATURE_TDLS_OFFCHANNEL 0x2000 // TDLS off channel support -#define WLAN_FEATURE_EPR 0x4000 // Enhanced power reporting support -#define WLAN_FEATURE_AP_STA 0x8000 // AP STA Concurrency support -#define WLAN_FEATURE_LINK_LAYER_STATS 0x10000 // Link layer stats collection support -#define WLAN_FEATURE_LOGGER 0x20000 // WiFi Logger support -#define WLAN_FEATURE_HAL_EPNO 0x40000 // WiFi enhanced PNO support -#define WLAN_FEATURE_RSSI_MONITOR 0x80000 // RSSI Monitor support -#define WLAN_FEATURE_MKEEP_ALIVE 0x100000 // WiFi mkeep_alive support -#define WLAN_FEATURE_CONFIG_NDO 0x200000 // ND offload configure support -#define WLAN_FEATURE_TX_TRANSMIT_POWER 0x400000 // Capture Tx transmit power levels -#define WLAN_FEATURE_CONTROL_ROAMING 0x800000 // Enable/Disable firmware roaming -#define WLAN_FEATURE_IE_WHITELIST 0x1000000 // Probe IE white listing support -#define WLAN_FEATURE_SCAN_RAND 0x2000000 // MAC & Probe Sequence Number randomization Support +#define WLAN_FEATURE_INFRA 0x0001 // Basic infrastructure mode support +#define WLAN_FEATURE_INFRA_5G 0x0002 // 5 GHz Band support +#define WLAN_FEATURE_HOTSPOT 0x0004 // GAS/ANQP support +#define WLAN_FEATURE_P2P 0x0008 // Wifi-Direct/P2P +#define WLAN_FEATURE_SOFT_AP 0x0010 // Soft AP support +#define WLAN_FEATURE_GSCAN 0x0020 // Google-Scan APIsi support +#define WLAN_FEATURE_NAN 0x0040 // Neighbor Awareness Networking (NAN) +#define WLAN_FEATURE_D2D_RTT 0x0080 // Device-to-device RTT support +#define WLAN_FEATURE_D2AP_RTT 0x0100 // Device-to-AP RTT support +#define WLAN_FEATURE_BATCH_SCAN 0x0200 // Batched Scan (legacy) support +#define WLAN_FEATURE_PNO 0x0400 // Preferred network offload support +#define WLAN_FEATURE_ADDITIONAL_STA 0x0800 // Two STAs support +#define WLAN_FEATURE_TDLS 0x1000 // Tunnel directed link setup (TDLS) +#define WLAN_FEATURE_TDLS_OFFCHANNEL 0x2000 // TDLS off channel support +#define WLAN_FEATURE_EPR 0x4000 // Enhanced power reporting support +#define WLAN_FEATURE_AP_STA 0x8000 // AP STA Concurrency support +#define WLAN_FEATURE_LINK_LAYER_STATS \ + 0x10000 // Link layer stats collection support +#define WLAN_FEATURE_LOGGER 0x20000 // WiFi Logger support +#define WLAN_FEATURE_HAL_EPNO 0x40000 // WiFi enhanced PNO support +#define WLAN_FEATURE_RSSI_MONITOR 0x80000 // RSSI Monitor support +#define WLAN_FEATURE_MKEEP_ALIVE 0x100000 // WiFi mkeep_alive support +#define WLAN_FEATURE_CONFIG_NDO 0x200000 // ND offload configure support +#define WLAN_FEATURE_TX_TRANSMIT_POWER \ + 0x400000 // Capture Tx transmit power levels +#define WLAN_FEATURE_CONTROL_ROAMING 0x800000 // Enable/Disable firmware roaming +#define WLAN_FEATURE_IE_WHITELIST 0x1000000 // Probe IE white listing support +#define WLAN_FEATURE_SCAN_RAND \ + 0x2000000 // MAC & Probe Sequence Number randomization Support // Add more features here #define MAX_CHANNEL_NUM 200 @@ -545,20 +562,20 @@ int woal_deinit_wifi_hal(moal_private *priv); /** Wifi Band */ typedef enum { WIFI_BAND_UNSPECIFIED, - /** 2.4 GHz */ + /** 2.4 GHz */ WIFI_BAND_BG = 1, - /** 5 GHz without DFS */ + /** 5 GHz without DFS */ WIFI_BAND_A = 2, - /** 5 GHz DFS only */ + /** 5 GHz DFS only */ WIFI_BAND_A_DFS = 4, - /** 5 GHz with DFS */ + /** 5 GHz with DFS */ WIFI_BAND_A_WITH_DFS = 6, - /** 2.4 GHz + 5 GHz; no DFS */ + /** 2.4 GHz + 5 GHz; no DFS */ WIFI_BAND_ABG = 3, - /** 2.4 GHz + 5 GHz with DFS */ + /** 2.4 GHz + 5 GHz with DFS */ WIFI_BAND_ABG_WITH_DFS = 7, - /** Keep it last */ + /** Keep it last */ WIFI_BAND_LAST, WIFI_BAND_MAX = WIFI_BAND_LAST - 1, } wifi_band; @@ -602,17 +619,17 @@ enum vendor_event { /** struct dfs_event */ typedef struct _dfs_event { - /** Frequency */ + /** Frequency */ int freq; - /** HT enable */ + /** HT enable */ int ht_enabled; - /** Channel Offset */ + /** Channel Offset */ int chan_offset; - /** Channel width */ + /** Channel width */ enum nl80211_chan_width chan_width; - /** Center Frequency 1 */ + /** Center Frequency 1 */ int cf1; - /** Center Frequency 2 */ + /** Center Frequency 2 */ int cf2; } dfs_event; @@ -672,7 +689,7 @@ enum vendor_sub_command { sub_cmd_get_drv_mem_dump = 0x1407, sub_cmd_start_packet_fate_monitor = 0x1408, sub_cmd_rssi_monitor = 0x1500, - /*Sub-command for wifi hal */ + /*Sub-command for wifi hal*/ sub_cmd_get_roaming_capability = 0x1700, sub_cmd_fw_roaming_enable = 0x1701, sub_cmd_fw_roaming_config = 0x1702, @@ -680,8 +697,8 @@ enum vendor_sub_command { }; void woal_register_cfg80211_vendor_command(struct wiphy *wiphy); -int woal_cfg80211_vendor_event(IN moal_private *priv, - IN int event, IN t_u8 *data, IN int len); +int woal_cfg80211_vendor_event(IN moal_private *priv, IN int event, + IN t_u8 *data, IN int len); enum mrvl_wlan_vendor_attr { MRVL_WLAN_VENDOR_ATTR_INVALID = 0, @@ -699,7 +716,7 @@ typedef enum { ATTR_ND_OFFLOAD_MAX = ATTR_ND_OFFLOAD_AFTER_LAST - 1, } ND_OFFLOAD_ATTR; -#define MKEEP_ALIVE_IP_PKT_MAX 256 +#define MKEEP_ALIVE_IP_PKT_MAX 256 enum mkeep_alive_attributes { MKEEP_ALIVE_ATTRIBUTE_ID, MKEEP_ALIVE_ATTRIBUTE_ETHER_TYPE, diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_debug.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_debug.c index 9e0f1d25fd0a..bea75345a3cb 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_debug.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_debug.c @@ -1,33 +1,33 @@ /** @file moal_debug.c - * - * @brief This file contains functions for debug proc file. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains functions for debug proc file. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /******************************************************** Change log: 11/03/2008: initial version ********************************************************/ -#include "moal_main.h" +#include "moal_main.h" #ifdef USB -#include "moal_usb.h" +#include "moal_usb.h" #endif /******************************************************** @@ -42,23 +42,23 @@ Change log: /** Get info item size */ #define item_size(n) (sizeof(((mlan_debug_info *)0)->n)) /** Get info item address */ -#define item_addr(n) ((t_ptr) &(((mlan_debug_info *)0)->n)) +#define item_addr(n) ((t_ptr) & (((mlan_debug_info *)0)->n)) /** Get moal_private member size */ #define item_priv_size(n) (sizeof(((moal_private *)0)->n)) /** Get moal_private member address */ -#define item_priv_addr(n) ((t_ptr) &(((moal_private *)0)->n)) +#define item_priv_addr(n) ((t_ptr) & (((moal_private *)0)->n)) /** Get moal_handle member size */ #define item_handle_size(n) (sizeof(((moal_handle *)0)->n)) /** Get moal_handle member address */ -#define item_handle_addr(n) ((t_ptr) &(((moal_handle *)0)->n)) +#define item_handle_addr(n) ((t_ptr) & (((moal_handle *)0)->n)) #ifdef USB /** Get moal card member size */ #define item_card_size(n) (sizeof(((struct usb_card_rec *)0)->n)) /** Get moal card member address */ -#define item_card_addr(n) ((t_ptr) &(((struct usb_card_rec *)0)->n)) +#define item_card_addr(n) ((t_ptr) & (((struct usb_card_rec *)0)->n)) #endif #ifdef STA_SUPPORT @@ -446,8 +446,7 @@ static struct debug_data uap_items[] = { * * @return N/A */ -void -woal_hist_do_reset(moal_private *priv, void *data) +void woal_hist_do_reset(moal_private *priv, void *data) { hgm_data *phist_data = (hgm_data *)data; int ix; @@ -473,14 +472,12 @@ woal_hist_do_reset(moal_private *priv, void *data) * * @return N/A */ -void -woal_hist_data_reset(moal_private *priv) +void woal_hist_data_reset(moal_private *priv) { int i = 0; for (i = 0; i < priv->phandle->card_info->histogram_table_num; i++) woal_hist_do_reset(priv, priv->hist_data[i]); } - /** * @brief This function reset histogram data according to antenna * @@ -488,8 +485,7 @@ woal_hist_data_reset(moal_private *priv) * * @return N/A */ -void -woal_hist_reset_table(moal_private *priv, t_u8 antenna) +void woal_hist_reset_table(moal_private *priv, t_u8 antenna) { hgm_data *phist_data = priv->hist_data[antenna]; @@ -497,9 +493,9 @@ woal_hist_reset_table(moal_private *priv, t_u8 antenna) } /** NF calculation */ -#define CAL_NF(NF) ((t_s8)(-(t_s8)(NF))) +#define CAL_NF(NF) ((t_s8)(-(t_s8)(NF))) /** RSSI calculation */ -#define CAL_RSSI(SNR, NF) ((t_s8)((t_s8)(SNR) + CAL_NF(NF))) +#define CAL_RSSI(SNR, NF) ((t_s8)((t_s8)(SNR) + CAL_NF(NF))) /** * @brief This function set histogram data @@ -511,9 +507,8 @@ woal_hist_reset_table(moal_private *priv, t_u8 antenna) * * @return N/A */ -static void -woal_hist_data_set(moal_private *priv, t_u16 rx_rate, t_s8 snr, t_s8 nflr, - t_u8 antenna) +static void woal_hist_data_set(moal_private *priv, t_u16 rx_rate, t_s8 snr, + t_s8 nflr, t_u8 antenna) { hgm_data *phist_data = priv->hist_data[antenna]; t_s8 nf = CAL_NF(nflr); @@ -537,9 +532,8 @@ woal_hist_data_set(moal_private *priv, t_u16 rx_rate, t_s8 snr, t_s8 nflr, * * @return N/A */ -void -woal_hist_data_add(moal_private *priv, t_u16 rx_rate, t_s8 snr, t_s8 nflr, - t_u8 antenna) +void woal_hist_data_add(moal_private *priv, t_u16 rx_rate, t_s8 snr, t_s8 nflr, + t_u8 antenna) { hgm_data *phist_data = NULL; unsigned long curr_size; @@ -552,11 +546,10 @@ woal_hist_data_add(moal_private *priv, t_u16 rx_rate, t_s8 snr, t_s8 nflr, woal_hist_reset_table(priv, antenna); woal_hist_data_set(priv, rx_rate, snr, nflr, antenna); } - -#define MAX_MCS_NUM_SUPP 16 -#define MAX_MCS_NUM_AC 10 -#define MAX_MCS_NUM_AX 12 -#define RATE_INDEX_MCS0 12 +#define MAX_MCS_NUM_SUPP 16 +#define MAX_MCS_NUM_AC 10 +#define MAX_MCS_NUM_AX 12 +#define RATE_INDEX_MCS0 12 /** * @brief histogram info in proc * @@ -565,8 +558,7 @@ woal_hist_data_add(moal_private *priv, t_u16 rx_rate, t_s8 snr, t_s8 nflr, * * @return Number of output data or MLAN_STATUS_FAILURE */ -static int -woal_histogram_info(struct seq_file *sfp, void *data) +static int woal_histogram_info(struct seq_file *sfp, void *data) { hgm_data *phist_data = (hgm_data *)data; int i = 0; @@ -576,7 +568,7 @@ woal_histogram_info(struct seq_file *sfp, void *data) t_u8 mcs_index = 0; t_u8 nss = 0; t_u8 gi = 0; - wlan_hist_proc_data *hist_data = (wlan_hist_proc_data *) sfp->private; + wlan_hist_proc_data *hist_data = (wlan_hist_proc_data *)sfp->private; moal_private *priv = (moal_private *)hist_data->priv; t_u16 rx_rate_max_size = priv->phandle->card_info->rx_rate_max; @@ -591,40 +583,57 @@ woal_histogram_info(struct seq_file *sfp, void *data) seq_printf(sfp, "rx rates (in Mbps):\n"); seq_printf(sfp, "\t0-3: B-MCS 0-3\n"); seq_printf(sfp, "\t4-11: G-MCS 0-7\n"); - seq_printf(sfp, - "\t12-27: N-MCS 0-15(BW20) 28-43: N-MCS 0-15(BW40)\n"); - seq_printf(sfp, - "\t44-59: N-MCS 0-15(BW20:SGI) 60-75: N-MCS 0-15(BW40:SGI)\n"); - seq_printf(sfp, - "\t76-85: AC-MCS 0-9(VHT:BW20:NSS1) 86-95: AC-MCS 0-9(VHT:BW20:NSS2)\n"); - seq_printf(sfp, - "\t96-105: AC-MCS 0-9(VHT:BW40:NSS1) 106-115: AC-MCS 0-9(VHT:BW40:NSS2)\n"); - seq_printf(sfp, - "\t116-125: AC-MCS 0-9(VHT:BW80:NSS1) 126-135: AC-MCS 0-9(VHT:BW80:NSS2)\n"); - seq_printf(sfp, - "\t136-145: AC-MCS 0-9(VHT:BW20:NSS1:SGI) 146-155: AC-MCS 0-9(VHT:BW20:NSS2:SGI)\n"); - seq_printf(sfp, - "\t156-165: AC-MCS 0-9(VHT:BW40:NSS1:SGI) 166-175: AC-MCS 0-9(VHT:BW40:NSS2:SGI)\n"); - seq_printf(sfp, - "\t176-185: AC-MCS 0-9(VHT:BW80:NSS1:SGI) 186-195: AC-MCS 0-9(VHT:BW80:NSS2:SGI)\n\n"); - seq_printf(sfp, - "\t196-207: AX-MCS 0-11(BW20:NSS1) 208-219: AX-MCS 0-11(BW20:NSS2)\n"); - seq_printf(sfp, - "\t220-231: AX-MCS 0-11(BW40:NSS1) 232-243: AX-MCS 0-11(BW40:NSS2)\n"); - seq_printf(sfp, - "\t244-255: AX-MCS 0-11(BW80:NSS1) 256-267: AX-MCS 0-11(BW80:NSS2)\n"); - seq_printf(sfp, - "\t268-279: AX-MCS 0-11(BW20:NSS1:GI1) 280-291: AX-MCS 0-11(BW20:NSS2:GI1)\n"); - seq_printf(sfp, - "\t292-303: AX-MCS 0-11(BW40:NSS1:GI1) 304-315: AX-MCS 0-11(BW40:NSS2:GI1)\n"); - seq_printf(sfp, - "\t316-327: AX-MCS 0-11(BW80:NSS1:GI1) 328-339: AX-MCS 0-11(BW80:NSS2:GI1)\n"); - seq_printf(sfp, - "\t340-351: AX-MCS 0-11(BW20:NSS1:GI2) 352-363: AX-MCS 0-11(BW20:NSS2:GI2)\n"); - seq_printf(sfp, - "\t364-375: AX-MCS 0-11(BW40:NSS1:GI2) 376-387: AX-MCS 0-11(BW40:NSS2:GI2)\n"); - seq_printf(sfp, - "\t388-399: AX-MCS 0-11(BW80:NSS1:GI2) 400-411: AX-MCS 0-11(BW80:NSS2:GI2)\n"); + seq_printf( + sfp, + "\t12-27: N-MCS 0-15(BW20) 28-43: N-MCS 0-15(BW40)\n"); + seq_printf( + sfp, + "\t44-59: N-MCS 0-15(BW20:SGI) 60-75: N-MCS 0-15(BW40:SGI)\n"); + seq_printf( + sfp, + "\t76-85: AC-MCS 0-9(VHT:BW20:NSS1) 86-95: AC-MCS 0-9(VHT:BW20:NSS2)\n"); + seq_printf( + sfp, + "\t96-105: AC-MCS 0-9(VHT:BW40:NSS1) 106-115: AC-MCS 0-9(VHT:BW40:NSS2)\n"); + seq_printf( + sfp, + "\t116-125: AC-MCS 0-9(VHT:BW80:NSS1) 126-135: AC-MCS 0-9(VHT:BW80:NSS2)\n"); + seq_printf( + sfp, + "\t136-145: AC-MCS 0-9(VHT:BW20:NSS1:SGI) 146-155: AC-MCS 0-9(VHT:BW20:NSS2:SGI)\n"); + seq_printf( + sfp, + "\t156-165: AC-MCS 0-9(VHT:BW40:NSS1:SGI) 166-175: AC-MCS 0-9(VHT:BW40:NSS2:SGI)\n"); + seq_printf( + sfp, + "\t176-185: AC-MCS 0-9(VHT:BW80:NSS1:SGI) 186-195: AC-MCS 0-9(VHT:BW80:NSS2:SGI)\n\n"); + seq_printf( + sfp, + "\t196-207: AX-MCS 0-11(BW20:NSS1) 208-219: AX-MCS 0-11(BW20:NSS2)\n"); + seq_printf( + sfp, + "\t220-231: AX-MCS 0-11(BW40:NSS1) 232-243: AX-MCS 0-11(BW40:NSS2)\n"); + seq_printf( + sfp, + "\t244-255: AX-MCS 0-11(BW80:NSS1) 256-267: AX-MCS 0-11(BW80:NSS2)\n"); + seq_printf( + sfp, + "\t268-279: AX-MCS 0-11(BW20:NSS1:GI1) 280-291: AX-MCS 0-11(BW20:NSS2:GI1)\n"); + seq_printf( + sfp, + "\t292-303: AX-MCS 0-11(BW40:NSS1:GI1) 304-315: AX-MCS 0-11(BW40:NSS2:GI1)\n"); + seq_printf( + sfp, + "\t316-327: AX-MCS 0-11(BW80:NSS1:GI1) 328-339: AX-MCS 0-11(BW80:NSS2:GI1)\n"); + seq_printf( + sfp, + "\t340-351: AX-MCS 0-11(BW20:NSS1:GI2) 352-363: AX-MCS 0-11(BW20:NSS2:GI2)\n"); + seq_printf( + sfp, + "\t364-375: AX-MCS 0-11(BW40:NSS1:GI2) 376-387: AX-MCS 0-11(BW40:NSS2:GI2)\n"); + seq_printf( + sfp, + "\t388-399: AX-MCS 0-11(BW80:NSS1:GI2) 400-411: AX-MCS 0-11(BW80:NSS2:GI2)\n"); for (i = 0; i < rx_rate_max_size; i++) { value = atomic_read(&(phist_data->rx_rate[i])); @@ -633,33 +642,49 @@ woal_histogram_info(struct seq_file *sfp, void *data) seq_printf(sfp, "rx_rate[%03d] = %d\n", i, value); else if (i <= 75) { - sgi_enable = (i - 12) / (MAX_MCS_NUM_SUPP * 2); //0:LGI, 1:SGI - bw = ((i - 12) % (MAX_MCS_NUM_SUPP * 2)) / MAX_MCS_NUM_SUPP; //0:20MHz, 1:40MHz + sgi_enable = (i - 12) / + (MAX_MCS_NUM_SUPP * 2); // 0:LGI, + // 1:SGI + bw = ((i - 12) % (MAX_MCS_NUM_SUPP * 2)) / + MAX_MCS_NUM_SUPP; // 0:20MHz, 1:40MHz mcs_index = (i - 12) % MAX_MCS_NUM_SUPP; - seq_printf(sfp, - "rx_rate[%03d] = %d (MCS:%d HT BW:%dMHz%s)\n", - i, value, mcs_index, (1 << bw) * 20, - sgi_enable ? " SGI" : ""); + seq_printf( + sfp, + "rx_rate[%03d] = %d (MCS:%d HT BW:%dMHz%s)\n", + i, value, mcs_index, (1 << bw) * 20, + sgi_enable ? " SGI" : ""); } else if (i <= 195) { - sgi_enable = (i - 76) / (MAX_MCS_NUM_AC * 6); //0:LGI, 1:SGI - bw = ((i - 76) % (MAX_MCS_NUM_AC * 6)) / (MAX_MCS_NUM_AC * 2); //0:20MHz, 1:40MHz, 2:80MHz - nss = (((i - 76) % (MAX_MCS_NUM_AC * 6)) % (MAX_MCS_NUM_AC * 2)) / MAX_MCS_NUM_AC; //0:NSS1, 1:NSS2 + sgi_enable = (i - 76) / + (MAX_MCS_NUM_AC * 6); // 0:LGI, + // 1:SGI + bw = ((i - 76) % (MAX_MCS_NUM_AC * 6)) / + (MAX_MCS_NUM_AC * 2); // 0:20MHz, 1:40MHz, + // 2:80MHz + nss = (((i - 76) % (MAX_MCS_NUM_AC * 6)) % + (MAX_MCS_NUM_AC * 2)) / + MAX_MCS_NUM_AC; // 0:NSS1, 1:NSS2 mcs_index = (i - 76) % MAX_MCS_NUM_AC; - seq_printf(sfp, - "rx_rate[%03d] = %d (MCS:%d VHT BW:%dMHz NSS:%d%s)\n", - i, value, mcs_index, (1 << bw) * 20, - nss + 1, sgi_enable ? " SGI" : ""); + seq_printf( + sfp, + "rx_rate[%03d] = %d (MCS:%d VHT BW:%dMHz NSS:%d%s)\n", + i, value, mcs_index, (1 << bw) * 20, + nss + 1, sgi_enable ? " SGI" : ""); } else if (i <= 411) { - gi = (i - 196) / (MAX_MCS_NUM_AX * 6); //0,1,2 - bw = ((i - 196) % (MAX_MCS_NUM_AX * 6)) / (MAX_MCS_NUM_AX * 2); //0:20MHz, 1:40MHz, 2:80MHz - nss = (((i - 196) % (MAX_MCS_NUM_AX * 6)) % (MAX_MCS_NUM_AX * 2)) / MAX_MCS_NUM_AX; //0:NSS1, 1:NSS2 + gi = (i - 196) / (MAX_MCS_NUM_AX * 6); // 0,1,2 + bw = ((i - 196) % (MAX_MCS_NUM_AX * 6)) / + (MAX_MCS_NUM_AX * 2); // 0:20MHz, 1:40MHz, + // 2:80MHz + nss = (((i - 196) % (MAX_MCS_NUM_AX * 6)) % + (MAX_MCS_NUM_AX * 2)) / + MAX_MCS_NUM_AX; // 0:NSS1, 1:NSS2 mcs_index = (i - 196) % MAX_MCS_NUM_AX; - seq_printf(sfp, - "rx_rate[%03d] = %d (MCS:%d AX BW:%dMHz NSS:%d GI:%d)\n", - i, value, mcs_index, (1 << bw) * 20, - nss + 1, gi); + seq_printf( + sfp, + "rx_rate[%03d] = %d (MCS:%d AX BW:%dMHz NSS:%d GI:%d)\n", + i, value, mcs_index, (1 << bw) * 20, + nss + 1, gi); } } } @@ -695,10 +720,9 @@ woal_histogram_info(struct seq_file *sfp, void *data) * * @return Number of output data or MLAN_STATUS_FAILURE */ -static int -woal_histogram_read(struct seq_file *sfp, void *data) +static int woal_histogram_read(struct seq_file *sfp, void *data) { - wlan_hist_proc_data *hist_data = (wlan_hist_proc_data *) sfp->private; + wlan_hist_proc_data *hist_data = (wlan_hist_proc_data *)sfp->private; moal_private *priv = (moal_private *)hist_data->priv; ENTER(); @@ -707,10 +731,6 @@ woal_histogram_read(struct seq_file *sfp, void *data) return -EFAULT; } - if (!priv->hist_data) { - LEAVE(); - return -EFAULT; - } if (hist_data->ant_idx < priv->phandle->card_info->histogram_table_num) woal_histogram_info(sfp, priv->hist_data[hist_data->ant_idx]); @@ -718,8 +738,7 @@ woal_histogram_read(struct seq_file *sfp, void *data) return 0; } -static int -woal_histogram_proc_open(struct inode *inode, struct file *file) +static int woal_histogram_proc_open(struct inode *inode, struct file *file) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) return single_open(file, woal_histogram_read, PDE_DATA(inode)); @@ -738,12 +757,11 @@ woal_histogram_proc_open(struct inode *inode, struct file *file) * * @return number of data */ -static ssize_t -woal_histogram_write(struct file *f, const char __user * buf, size_t count, - loff_t * off) +static ssize_t woal_histogram_write(struct file *f, const char __user *buf, + size_t count, loff_t *off) { struct seq_file *sfp = f->private_data; - wlan_hist_proc_data *hist_data = (wlan_hist_proc_data *) sfp->private; + wlan_hist_proc_data *hist_data = (wlan_hist_proc_data *)sfp->private; moal_private *priv = (moal_private *)hist_data->priv; woal_hist_reset_table(priv, hist_data->ant_idx); return count; @@ -757,8 +775,7 @@ woal_histogram_write(struct file *f, const char __user * buf, size_t count, * * @return Number of output data or MLAN_STATUS_FAILURE */ -static int -woal_log_read(struct seq_file *sfp, void *data) +static int woal_log_read(struct seq_file *sfp, void *data) { moal_private *priv = (moal_private *)sfp->private; mlan_ds_get_stats stats; @@ -868,7 +885,8 @@ woal_log_read(struct seq_file *sfp, void *data) for (i = 0; i < 8; i++) { seq_printf(sfp, "%u ", stats.qos_retries_rx_cnt[i]); } - seq_printf(sfp, "\ndot11RSNAStatsCMACICVErrors = %u\n" + seq_printf(sfp, + "\ndot11RSNAStatsCMACICVErrors = %u\n" "dot11RSNAStatsCMACReplays = %u\n" "dot11RSNAStatsRobustMgmtCCMPReplays = %u\n" "dot11RSNAStatsTKIPICVErrors = %u\n" @@ -890,29 +908,20 @@ woal_log_read(struct seq_file *sfp, void *data) "dot11MPDUInReceivedAMPDUCount = %u\n" "dot11ReceivedOctetsInAMPDUCount = %llu\n" "dot11AMPDUDelimiterCRCErrorCount = %u\n", - stats.cmacicv_errors, - stats.cmac_replays, - stats.mgmt_ccmp_replays, - stats.tkipicv_errors, - stats.tkip_replays, - stats.ccmp_decrypt_errors, - stats.ccmp_replays, - stats.tx_amsdu_cnt, - stats.failed_amsdu_cnt, - stats.retry_amsdu_cnt, + stats.cmacicv_errors, stats.cmac_replays, + stats.mgmt_ccmp_replays, stats.tkipicv_errors, + stats.tkip_replays, stats.ccmp_decrypt_errors, + stats.ccmp_replays, stats.tx_amsdu_cnt, + stats.failed_amsdu_cnt, stats.retry_amsdu_cnt, stats.multi_retry_amsdu_cnt, stats.tx_octets_in_amsdu_cnt, - stats.amsdu_ack_failure_cnt, - stats.rx_amsdu_cnt, - stats.rx_octets_in_amsdu_cnt, - stats.tx_ampdu_cnt, + stats.amsdu_ack_failure_cnt, stats.rx_amsdu_cnt, + stats.rx_octets_in_amsdu_cnt, stats.tx_ampdu_cnt, stats.tx_mpdus_in_ampdu_cnt, - stats.tx_octets_in_ampdu_cnt, - stats.ampdu_rx_cnt, + stats.tx_octets_in_ampdu_cnt, stats.ampdu_rx_cnt, stats.mpdu_in_rx_ampdu_cnt, stats.rx_octets_in_ampdu_cnt, stats.ampdu_delimiter_crc_error_cnt); - } MODULE_PUT; @@ -928,8 +937,7 @@ woal_log_read(struct seq_file *sfp, void *data) * * @return number of data */ -static int -woal_log_proc_open(struct inode *inode, struct file *file) +static int woal_log_proc_open(struct inode *inode, struct file *file) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) return single_open(file, woal_log_read, PDE_DATA(inode)); @@ -949,8 +957,7 @@ woal_log_proc_open(struct inode *inode, struct file *file) * * @return Number of output data or MLAN_STATUS_FAILURE */ -static int -woal_debug_read(struct seq_file *sfp, void *data) +static int woal_debug_read(struct seq_file *sfp, void *data) { int val = 0; unsigned int i; @@ -959,7 +966,7 @@ woal_debug_read(struct seq_file *sfp, void *data) (struct debug_data_priv *)sfp->private; struct debug_data *d = items_priv->items; moal_private *priv = items_priv->priv; - mlan_debug_info *info = &(priv->phandle->debug_info); + mlan_debug_info *info = NULL; t_u32 intf_mask = INTF_MASK << 8; #ifdef SDIO unsigned int j; @@ -973,6 +980,8 @@ woal_debug_read(struct seq_file *sfp, void *data) return -EFAULT; } + info = &(priv->phandle->debug_info); + if (MODULE_GET == 0) { LEAVE(); return -EFAULT; @@ -984,10 +993,11 @@ woal_debug_read(struct seq_file *sfp, void *data) goto exit; for (i = 0; i < (unsigned int)items_priv->num_of_items; i++) { - /* If this item is interface specific but card interface is NOT correspond type, we will not count it. */ + /* If this item is interface specific but card interface is NOT + * correspond type, we will not count it. */ if ((d[i].attr & intf_mask) && - !((d[i].attr & intf_mask) & (priv->phandle-> - card_type & intf_mask))) + !((d[i].attr & intf_mask) & + (priv->phandle->card_type & intf_mask))) continue; if (d[i].size == 1) @@ -1006,12 +1016,11 @@ woal_debug_read(struct seq_file *sfp, void *data) seq_printf(sfp, "\n"); continue; } - if (strstr(d[i].name, "id") - || strstr(d[i].name, "bitmap") + if (strstr(d[i].name, "id") || strstr(d[i].name, "bitmap") #ifdef PCIE || strstr(d[i].name, "ptr") #endif - ) + ) seq_printf(sfp, "%s=0x%x\n", d[i].name, val); else seq_printf(sfp, "%s=%d\n", d[i].name, val); @@ -1022,17 +1031,17 @@ woal_debug_read(struct seq_file *sfp, void *data) seq_printf(sfp, "last_recv_wr_bitmap=0x%x last_mp_index=%d\n", info->last_recv_wr_bitmap, info->last_mp_index); for (i = 0; i < SDIO_MP_DBG_NUM; i++) { - seq_printf(sfp, - "mp_wr_bitmap: 0x%x mp_wr_ports=0x%x len=%d curr_wr_port=0x%x\n", - info->last_mp_wr_bitmap[i], - info->last_mp_wr_ports[i], - info->last_mp_wr_len[i], - info->last_curr_wr_port[i]); + seq_printf( + sfp, + "mp_wr_bitmap: 0x%x mp_wr_ports=0x%x len=%d curr_wr_port=0x%x\n", + info->last_mp_wr_bitmap[i], + info->last_mp_wr_ports[i], + info->last_mp_wr_len[i], + info->last_curr_wr_port[i]); for (j = 0; j < mp_aggr_pkt_limit; j++) { seq_printf(sfp, "0x%02x ", - info->last_mp_wr_info[i * - mp_aggr_pkt_limit - + j]); + info->last_mp_wr_info + [i * mp_aggr_pkt_limit + j]); } seq_printf(sfp, "\n"); } @@ -1072,13 +1081,14 @@ woal_debug_read(struct seq_file *sfp, void *data) if (info->tx_tbl_num) { seq_printf(sfp, "Tx BA stream table:\n"); for (i = 0; i < info->tx_tbl_num; i++) { - seq_printf(sfp, - "tid = %d, ra = %02x:%02x:%02x:%02x:%02x:%02x amsdu=%d\n", - (int)info->tx_tbl[i].tid, - info->tx_tbl[i].ra[0], info->tx_tbl[i].ra[1], - info->tx_tbl[i].ra[2], info->tx_tbl[i].ra[3], - info->tx_tbl[i].ra[4], info->tx_tbl[i].ra[5], - (int)info->tx_tbl[i].amsdu); + seq_printf( + sfp, + "tid = %d, ra = %02x:%02x:%02x:%02x:%02x:%02x amsdu=%d\n", + (int)info->tx_tbl[i].tid, info->tx_tbl[i].ra[0], + info->tx_tbl[i].ra[1], info->tx_tbl[i].ra[2], + info->tx_tbl[i].ra[3], info->tx_tbl[i].ra[4], + info->tx_tbl[i].ra[5], + (int)info->tx_tbl[i].amsdu); } } if (info->rx_tbl_num) { @@ -1086,16 +1096,17 @@ woal_debug_read(struct seq_file *sfp, void *data) for (i = 0; i < info->rx_tbl_num; i++) { unsigned int j; - seq_printf(sfp, - "tid = %d, ta = %02x:%02x:%02x:%02x:%02x:%02x, start_win = %d, " - "win_size = %d, amsdu=%d\n", - (int)info->rx_tbl[i].tid, - info->rx_tbl[i].ta[0], info->rx_tbl[i].ta[1], - info->rx_tbl[i].ta[2], info->rx_tbl[i].ta[3], - info->rx_tbl[i].ta[4], info->rx_tbl[i].ta[5], - (int)info->rx_tbl[i].start_win, - (int)info->rx_tbl[i].win_size, - (int)info->rx_tbl[i].amsdu); + seq_printf( + sfp, + "tid = %d, ta = %02x:%02x:%02x:%02x:%02x:%02x, start_win = %d, " + "win_size = %d, amsdu=%d\n", + (int)info->rx_tbl[i].tid, info->rx_tbl[i].ta[0], + info->rx_tbl[i].ta[1], info->rx_tbl[i].ta[2], + info->rx_tbl[i].ta[3], info->rx_tbl[i].ta[4], + info->rx_tbl[i].ta[5], + (int)info->rx_tbl[i].start_win, + (int)info->rx_tbl[i].win_size, + (int)info->rx_tbl[i].amsdu); seq_printf(sfp, "buffer: "); for (j = 0; j < info->rx_tbl[i].win_size; j++) { if (info->rx_tbl[i].buffer[j] == MTRUE) @@ -1107,13 +1118,14 @@ woal_debug_read(struct seq_file *sfp, void *data) } } for (i = 0; i < info->ralist_num; i++) { - seq_printf(sfp, - "ralist ra: %02x:%02x:%02x:%02x:%02x:%02x tid=%d pkts=%d pause=%d\n", - info->ralist[i].ra[0], info->ralist[i].ra[1], - info->ralist[i].ra[2], info->ralist[i].ra[3], - info->ralist[i].ra[4], info->ralist[i].ra[5], - info->ralist[i].tid, info->ralist[i].total_pkts, - info->ralist[i].tx_pause); + seq_printf( + sfp, + "ralist ra: %02x:%02x:%02x:%02x:%02x:%02x tid=%d pkts=%d pause=%d\n", + info->ralist[i].ra[0], info->ralist[i].ra[1], + info->ralist[i].ra[2], info->ralist[i].ra[3], + info->ralist[i].ra[4], info->ralist[i].ra[5], + info->ralist[i].tid, info->ralist[i].total_pkts, + info->ralist[i].tx_pause); } exit: @@ -1132,9 +1144,8 @@ exit: * * @return number of data */ -static ssize_t -woal_debug_write(struct file *f, const char __user * buf, size_t count, - loff_t * off) +static ssize_t woal_debug_write(struct file *f, const char __user *buf, + size_t count, loff_t *off) { int r, i; char *pdata; @@ -1159,7 +1170,7 @@ woal_debug_write(struct file *f, const char __user * buf, size_t count, LEAVE(); return MLAN_STATUS_FAILURE; } - flag = (in_atomic() || irqs_disabled())? GFP_ATOMIC : GFP_KERNEL; + flag = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; pdata = kzalloc(count + 1, flag); if (pdata == NULL) { MODULE_PUT; @@ -1174,6 +1185,7 @@ woal_debug_write(struct file *f, const char __user * buf, size_t count, LEAVE(); return 0; } + pdata[count] = '\0'; if (woal_get_debug_info(priv, MOAL_IOCTL_WAIT, info)) { kfree(pdata); @@ -1218,8 +1230,7 @@ woal_debug_write(struct file *f, const char __user * buf, size_t count, return count; } -static int -woal_debug_proc_open(struct inode *inode, struct file *file) +static int woal_debug_proc_open(struct inode *inode, struct file *file) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) return single_open(file, woal_debug_read, PDE_DATA(inode)); @@ -1264,8 +1275,7 @@ static const struct file_operations log_proc_fops = { * * @return N/A */ -void -woal_debug_entry(moal_private *priv) +void woal_debug_entry(moal_private *priv) { struct proc_dir_entry *r; int i; @@ -1278,6 +1288,7 @@ woal_debug_entry(moal_private *priv) LEAVE(); return; } + #ifdef STA_SUPPORT if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) { priv->items_priv.items = kmalloc(sizeof(items), GFP_KERNEL); @@ -1313,7 +1324,7 @@ woal_debug_entry(moal_private *priv) d = priv->items_priv.items; for (i = 0; i < priv->items_priv.num_of_items; i++) { if (IS_INFO_ADDR(d[i].attr)) - d[i].addr += (t_ptr)&(priv->phandle->debug_info); + d[i].addr += (t_ptr) & (priv->phandle->debug_info); else if (IS_HANDLE_ADDR(d[i].attr)) d[i].addr += (t_ptr)(priv->phandle); else if (IS_PRIV_ADDR(d[i].attr)) @@ -1403,8 +1414,7 @@ woal_debug_entry(moal_private *priv) * * @return N/A */ -void -woal_debug_remove(moal_private *priv) +void woal_debug_remove(moal_private *priv) { char hist_entry[50]; int i; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_eth_ioctl.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_eth_ioctl.c index 3f3a3b2f2436..9e5372345450 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_eth_ioctl.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_eth_ioctl.c @@ -25,34 +25,34 @@ Change log: 01/05/2012: initial version ************************************************************************/ -#include "moal_main.h" -#include "moal_eth_ioctl.h" -#include "mlan_ioctl.h" +#include "moal_main.h" +#include "moal_eth_ioctl.h" +#include "mlan_ioctl.h" #if defined(STA_WEXT) || defined(UAP_WEXT) -#include "moal_priv.h" +#include "moal_priv.h" #endif #if defined(STA_CFG80211) || defined(UAP_CFG80211) -#include "moal_cfg80211.h" +#include "moal_cfg80211.h" #endif #ifdef UAP_SUPPORT -#include "moal_uap.h" +#include "moal_uap.h" #endif #ifdef USB -#include "moal_usb.h" +#include "moal_usb.h" #endif #ifdef SDIO -#include "moal_sdio.h" +#include "moal_sdio.h" #endif #ifdef PCIE -#include "moal_pcie.h" +#include "moal_pcie.h" #endif #ifdef STA_CFG80211 -#include "moal_sta_cfg80211.h" +#include "moal_sta_cfg80211.h" #endif #ifdef STA_CFG80211 #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) -#include "moal_cfg80211_util.h" +#include "moal_cfg80211_util.h" #endif #endif @@ -63,19 +63,27 @@ Change log: /** Bands supported in Infra mode */ static t_u16 SupportedInfraBand[] = { BAND_B, - BAND_B | BAND_G, BAND_G, - BAND_GN, BAND_B | BAND_G | BAND_GN, BAND_G | BAND_GN, - BAND_A, BAND_B | BAND_A, BAND_B | BAND_G | BAND_A, BAND_G | BAND_A, + BAND_B | BAND_G, + BAND_G, + BAND_GN, + BAND_B | BAND_G | BAND_GN, + BAND_G | BAND_GN, + BAND_A, + BAND_B | BAND_A, + BAND_B | BAND_G | BAND_A, + BAND_G | BAND_A, BAND_A | BAND_B | BAND_G | BAND_AN | BAND_GN, - BAND_A | BAND_G | BAND_AN | BAND_GN, BAND_A | BAND_AN, - BAND_GN | BAND_GAC, BAND_B | BAND_G | BAND_GN | BAND_GAC, - BAND_G | BAND_GN | BAND_GAC, + BAND_A | BAND_G | BAND_AN | BAND_GN, + BAND_A | BAND_AN, + BAND_GN | BAND_GAC, + BAND_B | BAND_G | BAND_GN | BAND_GAC, + BAND_G | BAND_GN | BAND_GAC, BAND_GN | BAND_GAC | BAND_GAX, - BAND_B | BAND_G | BAND_GN | BAND_GAC | BAND_GAX, - BAND_G | BAND_GN | BAND_GAC | BAND_GAX, + BAND_B | BAND_G | BAND_GN | BAND_GAC | BAND_GAX, + BAND_G | BAND_GN | BAND_GAC | BAND_GAX, BAND_A | BAND_B | BAND_G | BAND_AN | BAND_GN | BAND_AAC, BAND_A | BAND_B | BAND_G | BAND_AN | BAND_GN | BAND_AAC | BAND_GAC, - BAND_A | BAND_G | BAND_AN | BAND_GN | BAND_AAC, + BAND_A | BAND_G | BAND_AN | BAND_GN | BAND_AAC, BAND_A | BAND_AN | BAND_AAC, BAND_A | BAND_B | BAND_G | BAND_AN | BAND_GN | BAND_AAC | BAND_AAX, BAND_A | BAND_B | BAND_G | BAND_AN | BAND_GN | BAND_AAC | BAND_GAC | @@ -86,7 +94,9 @@ static t_u16 SupportedInfraBand[] = { /** Bands supported in Ad-Hoc mode */ static t_u8 SupportedAdhocBand[] = { - BAND_B, BAND_B | BAND_G, BAND_G, + BAND_B, + BAND_B | BAND_G, + BAND_G, BAND_A, }; @@ -117,8 +127,8 @@ extern const struct net_device_ops woal_netdev_ops; * * @return MLAN_STATUS_SUCCESS */ -mlan_status -parse_arguments(t_u8 *pos, int *data, int datalen, int *user_data_len) +mlan_status parse_arguments(t_u8 *pos, int *data, int datalen, + int *user_data_len) { unsigned int i, j, k; char cdata[10]; @@ -177,8 +187,7 @@ parse_arguments(t_u8 *pos, int *data, int datalen, int *user_data_len) * @param raw_size raw data buffer size * @return Number of bytes read **/ -int -string2raw(char *str, unsigned char *raw, int raw_size) +int string2raw(char *str, unsigned char *raw, int raw_size) { int len = (strlen(str) + 1) / 2; int i = 0; @@ -209,8 +218,7 @@ string2raw(char *str, unsigned char *raw, int raw_size) * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_set_ap_wps_p2p_ie(moal_private *priv, t_u8 *ie, size_t len) +mlan_status woal_set_ap_wps_p2p_ie(moal_private *priv, t_u8 *ie, size_t len) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u8 *pos = ie; @@ -234,10 +242,9 @@ woal_set_ap_wps_p2p_ie(moal_private *priv, t_u8 *ie, size_t len) /* set the beacon wps/p2p ies */ pos += 2; if (MLAN_STATUS_SUCCESS != - woal_cfg80211_mgmt_frame_ie(priv, pos, ie_len, NULL, 0, - NULL, 0, NULL, 0, - MGMT_MASK_BEACON_WPS_P2P, - MOAL_IOCTL_WAIT)) { + woal_cfg80211_mgmt_frame_ie( + priv, pos, ie_len, NULL, 0, NULL, 0, NULL, 0, + MGMT_MASK_BEACON_WPS_P2P, MOAL_IOCTL_WAIT)) { PRINTM(MERROR, "Failed to set beacon wps/p2p ie\n"); ret = -EFAULT; goto done; @@ -246,10 +253,9 @@ woal_set_ap_wps_p2p_ie(moal_private *priv, t_u8 *ie, size_t len) /* set the probe resp ies */ pos += 2; if (MLAN_STATUS_SUCCESS != - woal_cfg80211_mgmt_frame_ie(priv, NULL, 0, pos, ie_len, - NULL, 0, NULL, 0, - MGMT_MASK_PROBE_RESP, - MOAL_IOCTL_WAIT)) { + woal_cfg80211_mgmt_frame_ie( + priv, NULL, 0, pos, ie_len, NULL, 0, NULL, 0, + MGMT_MASK_PROBE_RESP, MOAL_IOCTL_WAIT)) { PRINTM(MERROR, "Failed to set probe resp ie\n"); ret = -EFAULT; goto done; @@ -258,10 +264,9 @@ woal_set_ap_wps_p2p_ie(moal_private *priv, t_u8 *ie, size_t len) /* set the assoc resp ies */ pos += 2; if (MLAN_STATUS_SUCCESS != - woal_cfg80211_mgmt_frame_ie(priv, NULL, 0, NULL, 0, pos, - ie_len, NULL, 0, - MGMT_MASK_ASSOC_RESP, - MOAL_IOCTL_WAIT)) { + woal_cfg80211_mgmt_frame_ie( + priv, NULL, 0, NULL, 0, pos, ie_len, NULL, 0, + MGMT_MASK_ASSOC_RESP, MOAL_IOCTL_WAIT)) { PRINTM(MERROR, "Failed to set assoc resp ie\n"); ret = -EFAULT; goto done; @@ -285,8 +290,7 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_set_miracast_mode(moal_private *priv, t_u8 *pdata, size_t len) +mlan_status woal_set_miracast_mode(moal_private *priv, t_u8 *pdata, size_t len) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u8 *pos = pdata; @@ -334,9 +338,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_get_priv_driver_version(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +int woal_get_priv_driver_version(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int len = 0, ret = -1; char buf[MLAN_MAX_VER_STR_LEN]; @@ -368,7 +371,6 @@ woal_get_priv_driver_version(moal_private *priv, t_u8 *respbuf, LEAVE(); return ret; } - /** * @brief Hostcmd interface from application * @@ -379,9 +381,8 @@ woal_get_priv_driver_version(moal_private *priv, t_u8 *respbuf, * * @return Number of bytes written, negative for failure. */ -int -woal_priv_hostcmd(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen, - t_u8 wait_option) +int woal_priv_hostcmd(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen, + t_u8 wait_option) { int ret = 0; t_u8 *data_ptr; @@ -426,17 +427,16 @@ woal_priv_hostcmd(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen, goto error; } ret = misc_cfg->param.hostcmd.len + sizeof(buf_len) + strlen(CMD_NXP) + - strlen(PRIV_CMD_HOSTCMD); + strlen(PRIV_CMD_HOSTCMD); if (ret > respbuflen) { ret = -EFAULT; goto error; } - moal_memcpy_ext(priv->phandle, data_ptr + sizeof(buf_len), - misc_cfg->param.hostcmd.cmd, - misc_cfg->param.hostcmd.len, - respbuflen - (strlen(CMD_NXP) + - strlen(PRIV_CMD_HOSTCMD) + - sizeof(buf_len))); + moal_memcpy_ext( + priv->phandle, data_ptr + sizeof(buf_len), + misc_cfg->param.hostcmd.cmd, misc_cfg->param.hostcmd.len, + respbuflen - (strlen(CMD_NXP) + strlen(PRIV_CMD_HOSTCMD) + + sizeof(buf_len))); moal_memcpy_ext(priv->phandle, data_ptr, (t_u8 *)&misc_cfg->param.hostcmd.len, sizeof(t_u32), sizeof(t_u32)); @@ -460,16 +460,15 @@ error: * * @return Number of bytes written if successful else negative value */ -static int -woal_setget_priv_11axcmdcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen, - t_u8 wait_option) +static int woal_setget_priv_11axcmdcfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen, t_u8 wait_option) { mlan_ioctl_req *req = NULL; mlan_ds_11ax_cmd_cfg *cfg = NULL; int ret = 0; mlan_status status = MLAN_STATUS_SUCCESS; int header_len = 0, user_data_len = 0; - int data[3] = { 0 }; + int data[3] = {0}; ENTER(); req = woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_11ax_cmd_cfg)); @@ -481,7 +480,7 @@ woal_setget_priv_11axcmdcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen, req->req_id = MLAN_IOCTL_11AX_CFG; req->action = MLAN_ACT_SET; - cfg = (mlan_ds_11ax_cmd_cfg *) req->pbuf; + cfg = (mlan_ds_11ax_cmd_cfg *)req->pbuf; cfg->sub_command = MLAN_OID_11AX_CMD_CFG; parse_arguments(respbuf + header_len, data, ARRAY_SIZE(data), @@ -519,6 +518,18 @@ woal_setget_priv_11axcmdcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen, cfg->sub_id = MLAN_11AXCMD_HTC_SUBID; cfg->param.htc_cfg.value = data[1]; break; + case MLAN_11AXCMD_CFG_ID_TXOP_RTS: + cfg->sub_id = MLAN_11AXCMD_TXOPRTS_SUBID; + cfg->param.txop_cfg.rts_thres = data[1]; + break; + case MLAN_11AXCMD_CFG_ID_TX_OMI: + cfg->sub_id = MLAN_11AXCMD_TXOMI_SUBID; + cfg->param.txomi_cfg.omi = data[1]; + break; + case MLAN_11AXCMD_CFG_ID_OBSSNBRU_TOLTIME: + cfg->sub_id = MLAN_11AXCMD_OBSS_TOLTIME_SUBID; + cfg->param.toltime_cfg.tol_time = data[1]; + break; default: PRINTM(MERROR, "unknown 11axcmd\n"); ret = -EFAULT; @@ -534,7 +545,7 @@ woal_setget_priv_11axcmdcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen, sizeof(req->action), sizeof(req->action)); respbuf += sizeof(req->action); - cfg = (mlan_ds_11ax_cmd_cfg *) respbuf; + cfg = (mlan_ds_11ax_cmd_cfg *)respbuf; moal_memcpy_ext(priv->phandle, cfg, req->pbuf, sizeof(mlan_ds_11ax_cmd_cfg), respbuflen); @@ -556,8 +567,7 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_customie(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_customie(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int ret = 0; t_u8 *data_ptr; @@ -579,9 +589,8 @@ woal_priv_customie(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) misc = (mlan_ds_misc_cfg *)ioctl_req->pbuf; misc->sub_command = MLAN_OID_MISC_CUSTOM_IE; ioctl_req->req_id = MLAN_IOCTL_MISC_CFG; - if ((custom_ie->len == 0)||(custom_ie->len == - sizeof(custom_ie->ie_data_list[0]. - ie_index))) + if ((custom_ie->len == 0) || + (custom_ie->len == sizeof(custom_ie->ie_data_list[0].ie_index))) ioctl_req->action = MLAN_ACT_GET; else ioctl_req->action = MLAN_ACT_SET; @@ -598,8 +607,8 @@ woal_priv_customie(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) custom_ie = (mlan_ds_misc_custom_ie *)data_ptr; moal_memcpy_ext(priv->phandle, custom_ie, &misc->param.cust_ie, sizeof(mlan_ds_misc_custom_ie), - respbuflen - (strlen(CMD_NXP) + - strlen(PRIV_CMD_CUSTOMIE))); + respbuflen - + (strlen(CMD_NXP) + strlen(PRIV_CMD_CUSTOMIE))); ret = sizeof(mlan_ds_misc_custom_ie); if (ioctl_req->status_code == MLAN_ERROR_IOCTL_FAIL) { /* send a separate error code to indicate error from driver */ @@ -621,8 +630,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_setget_priv_bandcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_setget_priv_bandcfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; unsigned int i; @@ -645,8 +654,8 @@ woal_setget_priv_bandcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* SET operation */ memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_BANDCFG), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_BANDCFG), + data, ARRAY_SIZE(data), &user_data_len); } if (sizeof(int) * user_data_len > sizeof(data)) { @@ -679,10 +688,9 @@ woal_setget_priv_bandcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) } else { /* To support only */ infra_band = data[0]; - for (i = 0; - i < - (sizeof(SupportedInfraBand) / - sizeof(SupportedInfraBand[0])); i++) + for (i = 0; i < (sizeof(SupportedInfraBand) / + sizeof(SupportedInfraBand[0])); + i++) if (infra_band == SupportedInfraBand[i]) break; if (i == sizeof(SupportedInfraBand)) { @@ -706,7 +714,8 @@ woal_setget_priv_bandcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) if (user_data_len >= 3) { adhoc_channel = data[2]; if (adhoc_channel == 0) { - /* Check if specified adhoc channel is non-zero */ + /* Check if specified adhoc channel is non-zero + */ ret = -EINVAL; goto error; } @@ -748,8 +757,8 @@ error: * * @return Number of bytes written, negative for failure. */ -int -woal_setget_priv_httxcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_setget_priv_httxcfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { t_u32 data[2]; mlan_ioctl_req *req = NULL; @@ -767,8 +776,8 @@ woal_setget_priv_httxcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* SET operation */ memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_HTTXCFG), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_HTTXCFG), + data, ARRAY_SIZE(data), &user_data_len); } if (user_data_len > 2) { @@ -847,8 +856,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_setget_priv_htcapinfo(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_setget_priv_htcapinfo(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data[2]; mlan_ioctl_req *req = NULL; @@ -867,8 +876,8 @@ woal_setget_priv_htcapinfo(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* SET operation */ memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_HTCAPINFO), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_HTCAPINFO), + data, ARRAY_SIZE(data), &user_data_len); } if (user_data_len > 2) { @@ -949,8 +958,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_setget_priv_addbapara(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_setget_priv_addbapara(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data[5]; mlan_ioctl_req *req = NULL; @@ -969,8 +978,8 @@ woal_setget_priv_addbapara(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* SET operation */ memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_ADDBAPARA), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_ADDBAPARA), + data, ARRAY_SIZE(data), &user_data_len); if (user_data_len != ARRAY_SIZE(data)) { PRINTM(MERROR, "Invalid number of arguments\n"); @@ -1044,7 +1053,6 @@ done: kfree(req); LEAVE(); return ret; - } /** @@ -1056,10 +1064,9 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_delba(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_delba(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { - t_u32 data[2] = { 0xFF, 0xFF }; + t_u32 data[2] = {0xFF, 0xFF}; mlan_ioctl_req *req = NULL; mlan_ds_11n_cfg *cfg_11n = NULL; mlan_ds_11n_delba *del_ba = NULL; @@ -1067,7 +1074,7 @@ woal_priv_delba(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) int user_data_len = 0; int header_len = 0; t_u8 *mac_pos = NULL; - t_u8 peer_mac[ETH_ALEN] = { 0 }; + t_u8 peer_mac[ETH_ALEN] = {0}; mlan_status status = MLAN_STATUS_SUCCESS; ENTER(); @@ -1085,7 +1092,7 @@ woal_priv_delba(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) if (mac_pos) mac_pos = strstr(mac_pos + 1, " "); if (mac_pos) { -#define MAC_STRING_LENGTH 17 +#define MAC_STRING_LENGTH 17 if (strlen(mac_pos + 1) != MAC_STRING_LENGTH) { PRINTM(MERROR, "%d: Invalid arguments\n", __LINE__); ret = -EINVAL; @@ -1101,8 +1108,7 @@ woal_priv_delba(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) if (mac_pos) user_data_len++; - if (user_data_len > 3 || - (!(data[0] & (DELBA_TX | DELBA_RX))) || + if (user_data_len > 3 || (!(data[0] & (DELBA_TX | DELBA_RX))) || (data[1] != DELBA_ALL_TIDS && !(data[1] <= 7))) { /* Incorrect number of arguments */ PRINTM(MERROR, "%d: Invalid arguments\n", __LINE__); @@ -1154,8 +1160,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_rejectaddbareq(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_rejectaddbareq(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { t_u32 data[1]; mlan_ioctl_req *req = NULL; @@ -1174,8 +1180,8 @@ woal_priv_rejectaddbareq(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* SET operation */ memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_REJECTADDBAREQ), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_REJECTADDBAREQ), + data, ARRAY_SIZE(data), &user_data_len); } if (user_data_len > 1) { @@ -1195,7 +1201,7 @@ woal_priv_rejectaddbareq(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) req->req_id = MLAN_IOCTL_11N_CFG; if (user_data_len == 0) { - /* Get the reject addba req conditions */ + /* Get the reject addba req conditions*/ req->action = MLAN_ACT_GET; } else { /* Set the reject addba req conditions */ @@ -1222,7 +1228,6 @@ done: kfree(req); LEAVE(); return ret; - } /** @@ -1232,10 +1237,11 @@ done: * @param action Action set or get * @param addba_reject A pointer to addba_reject array. * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_ioctl_addba_reject(moal_private *priv, t_u32 action, t_u8 *addba_reject) +mlan_status woal_ioctl_addba_reject(moal_private *priv, t_u32 action, + t_u8 *addba_reject) { mlan_ioctl_req *req = NULL; mlan_ds_11n_cfg *cfg_11n = NULL; @@ -1281,11 +1287,11 @@ done: * @param action Action set or get * @param aggr_prio_tbl A pointer to mlan_ds_11n_aggr_prio_tbl. * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_ioctl_aggr_prio_tbl(moal_private *priv, t_u32 action, - mlan_ds_11n_aggr_prio_tbl *aggr_prio_tbl) +mlan_status woal_ioctl_aggr_prio_tbl(moal_private *priv, t_u32 action, + mlan_ds_11n_aggr_prio_tbl *aggr_prio_tbl) { mlan_ioctl_req *req = NULL; mlan_ds_11n_cfg *cfg_11n = NULL; @@ -1323,7 +1329,6 @@ done: kfree(req); LEAVE(); return ret; - } /** @@ -1333,11 +1338,11 @@ done: * @param action Action set or get * @param addba_param A pointer to mlan_ds_11n_addba_param. * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_ioctl_addba_param(moal_private *priv, t_u32 action, - mlan_ds_11n_addba_param *addba_param) +mlan_status woal_ioctl_addba_param(moal_private *priv, t_u32 action, + mlan_ds_11n_addba_param *addba_param) { mlan_ioctl_req *req = NULL; mlan_ds_11n_cfg *cfg_11n = NULL; @@ -1374,7 +1379,6 @@ done: kfree(req); LEAVE(); return ret; - } /** @@ -1386,8 +1390,7 @@ done: * * @return 0 --success, otherwise failure */ -int -woal_set_rx_ba_winsize(moal_private *priv, t_u8 *respbuf, int respbuflen) +int woal_set_rx_ba_winsize(moal_private *priv, t_u8 *respbuf, int respbuflen) { int data[2]; t_u8 addba_reject[MAX_NUM_TID]; @@ -1450,16 +1453,13 @@ woal_set_rx_ba_winsize(moal_private *priv, t_u8 *respbuf, int respbuflen) if (MLAN_STATUS_SUCCESS != woal_ioctl_addba_param(priv, MLAN_ACT_SET, &addba_param)) - ret = -EFAULT; + ret = -EFAULT; } - } done: LEAVE(); return ret; - } - /** * @brief Configuring trx block-ack window size * @@ -1469,16 +1469,13 @@ done: * * @return 0 --success, otherwise failure */ -int -woal_set_tx_ba_winsize(moal_private *priv, t_u8 *respbuf, int respbuflen) +int woal_set_tx_ba_winsize(moal_private *priv, t_u8 *respbuf, int respbuflen) { int data[2]; mlan_ds_11n_aggr_prio_tbl aggr_prio_tbl; mlan_ds_11n_addba_param addba_param; - t_u8 tos_to_tid_inv[] = { - 0x02, 0x00, 0x01, 0x03, - 0x04, 0x05, 0x06, 0x07 - }; + t_u8 tos_to_tid_inv[] = {0x02, 0x00, 0x01, 0x03, + 0x04, 0x05, 0x06, 0x07}; int ret = 0; int user_data_len = 0; @@ -1517,7 +1514,7 @@ woal_set_tx_ba_winsize(moal_private *priv, t_u8 *respbuf, int respbuflen) if (MLAN_STATUS_SUCCESS != woal_ioctl_aggr_prio_tbl(priv, MLAN_ACT_SET, &aggr_prio_tbl)) - ret = -EFAULT; + ret = -EFAULT; } } else { if (aggr_prio_tbl.ampdu[data[0]] == 0xff) { @@ -1540,14 +1537,12 @@ woal_set_tx_ba_winsize(moal_private *priv, t_u8 *respbuf, int respbuflen) if (MLAN_STATUS_SUCCESS != woal_ioctl_addba_param(priv, MLAN_ACT_SET, &addba_param)) - ret = -EFAULT; + ret = -EFAULT; } - } done: LEAVE(); return ret; - } /** @@ -1559,9 +1554,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_setget_priv_aggrpriotbl(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +int woal_setget_priv_aggrpriotbl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data[MAX_NUM_TID * 2], i, j; mlan_ioctl_req *req = NULL; @@ -1572,15 +1566,16 @@ woal_setget_priv_aggrpriotbl(moal_private *priv, t_u8 *respbuf, ENTER(); - if (strlen(respbuf) == (strlen(CMD_NXP) + strlen(PRIV_CMD_AGGRPRIOTBL))) { + if (strlen(respbuf) == + (strlen(CMD_NXP) + strlen(PRIV_CMD_AGGRPRIOTBL))) { /* GET operation */ user_data_len = 0; } else { /* SET operation */ memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_AGGRPRIOTBL), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_AGGRPRIOTBL), + data, ARRAY_SIZE(data), &user_data_len); if (user_data_len != ARRAY_SIZE(data)) { PRINTM(MERROR, "Invalid number of arguments\n"); @@ -1636,7 +1631,6 @@ done: kfree(req); LEAVE(); return ret; - } /** @@ -1648,9 +1642,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_setget_priv_addbareject(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +int woal_setget_priv_addbareject(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data[MAX_NUM_TID], i; mlan_ioctl_req *req = NULL; @@ -1661,15 +1654,16 @@ woal_setget_priv_addbareject(moal_private *priv, t_u8 *respbuf, ENTER(); - if (strlen(respbuf) == (strlen(CMD_NXP) + strlen(PRIV_CMD_ADDBAREJECT))) { + if (strlen(respbuf) == + (strlen(CMD_NXP) + strlen(PRIV_CMD_ADDBAREJECT))) { /* GET operation */ user_data_len = 0; } else { /* SET operation */ memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_ADDBAREJECT), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_ADDBAREJECT), + data, ARRAY_SIZE(data), &user_data_len); if (user_data_len != ARRAY_SIZE(data)) { PRINTM(MERROR, "Invalid number of arguments\n"); @@ -1720,7 +1714,6 @@ done: kfree(req); LEAVE(); return ret; - } /** @@ -1732,8 +1725,7 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_setget_priv_vhtcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_setget_priv_vhtcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int data[6]; mlan_ioctl_req *req = NULL; @@ -1877,7 +1869,6 @@ done: kfree(req); LEAVE(); return ret; - } /** @@ -1889,9 +1880,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_setget_priv_opermodecfg(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +int woal_setget_priv_opermodecfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data[2]; mlan_ioctl_req *req = NULL; @@ -1905,8 +1895,8 @@ woal_setget_priv_opermodecfg(moal_private *priv, t_u8 *respbuf, memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_OPERMODECFG), data, ARRAY_SIZE(data), - &user_data_len); + strlen(PRIV_CMD_OPERMODECFG), + data, ARRAY_SIZE(data), &user_data_len); if ((user_data_len != 0) && (user_data_len != 2)) { PRINTM(MERROR, "Invalid number of arguments\n"); @@ -1951,7 +1941,7 @@ woal_setget_priv_opermodecfg(moal_private *priv, t_u8 *respbuf, ret = -EFAULT; goto done; } - opermodecfg = (mlan_ds_11ac_opermode_cfg *) respbuf; + opermodecfg = (mlan_ds_11ac_opermode_cfg *)respbuf; moal_memcpy_ext(priv->phandle, opermodecfg, &(cfg_11ac->param.opermode_cfg), sizeof(*opermodecfg), respbuflen); @@ -1973,8 +1963,7 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_get_priv_datarate(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_get_priv_datarate(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_rate *rate = NULL; @@ -2013,7 +2002,6 @@ done: kfree(req); LEAVE(); return ret; - } /** @@ -2025,8 +2013,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_setget_priv_txratecfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_setget_priv_txratecfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { t_u32 data[4]; mlan_ioctl_req *req = NULL; @@ -2045,8 +2033,8 @@ woal_setget_priv_txratecfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* SET operation */ memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_TXRATECFG), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_TXRATECFG), + data, ARRAY_SIZE(data), &user_data_len); } if (user_data_len > 4) { @@ -2085,8 +2073,7 @@ woal_setget_priv_txratecfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* fixed rate */ PRINTM(MINFO, "SET: txratefg format: 0x%x\n", data[0]); if ((data[0] != AUTO_RATE) && - (data[0] > MLAN_RATE_FORMAT_HE) - ) { + (data[0] > MLAN_RATE_FORMAT_HE)) { PRINTM(MERROR, "Invalid format selection\n"); ret = -EINVAL; goto done; @@ -2098,14 +2085,13 @@ woal_setget_priv_txratecfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) data[1]); /* sanity check */ if (((data[0] == MLAN_RATE_FORMAT_LG) && - (data[1] > MLAN_RATE_INDEX_OFDM7)) - || ((data[0] == MLAN_RATE_FORMAT_HT) && - (data[1] != 32) && (data[1] > 15)) - || ((data[0] == MLAN_RATE_FORMAT_VHT) && - (data[1] > MLAN_RATE_INDEX_MCS9)) - || ((data[0] == MLAN_RATE_FORMAT_HE) && - (data[1] > MLAN_RATE_INDEX_MCS11)) - ) { + (data[1] > MLAN_RATE_INDEX_OFDM7)) || + ((data[0] == MLAN_RATE_FORMAT_HT) && + (data[1] != 32) && (data[1] > 15)) || + ((data[0] == MLAN_RATE_FORMAT_VHT) && + (data[1] > MLAN_RATE_INDEX_MCS9)) || + ((data[0] == MLAN_RATE_FORMAT_HE) && + (data[1] > MLAN_RATE_INDEX_MCS11))) { PRINTM(MERROR, "Invalid index selection\n"); ret = -EINVAL; @@ -2115,7 +2101,6 @@ woal_setget_priv_txratecfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) PRINTM(MINFO, "SET: txratefg index: 0x%x\n", data[1]); rate->param.rate_cfg.rate = data[1]; - } if (data[0] == 2 || data[0] == 3) { @@ -2155,8 +2140,8 @@ woal_setget_priv_txratecfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* fixed rate */ ratecfg->rate_format = rate->param.rate_cfg.rate_format; ratecfg->rate_index = rate->param.rate_cfg.rate; - if (rate->param.rate_cfg.rate_format == MLAN_RATE_FORMAT_VHT - || rate->param.rate_cfg.rate_format == MLAN_RATE_FORMAT_HE) + if (rate->param.rate_cfg.rate_format == MLAN_RATE_FORMAT_VHT || + rate->param.rate_cfg.rate_format == MLAN_RATE_FORMAT_HE) ratecfg->nss = rate->param.rate_cfg.nss; ratecfg->rate_setting = rate->param.rate_cfg.rate_setting; } @@ -2168,7 +2153,6 @@ done: kfree(req); LEAVE(); return ret; - } #if defined(STA_SUPPORT) || defined(UAP_SUPPORT) @@ -2179,11 +2163,11 @@ done: * @param wait_option Wait option * @param stats A pointer to mlan_ds_get_stats structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_get_stats_info(moal_private *priv, t_u8 wait_option, - mlan_ds_get_stats *stats) +mlan_status woal_get_stats_info(moal_private *priv, t_u8 wait_option, + mlan_ds_get_stats *stats) { int ret = 0; mlan_ds_get_info *info = NULL; @@ -2237,8 +2221,7 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_get_priv_getlog(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_get_priv_getlog(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int ret = 0; mlan_ds_get_stats *stats; @@ -2278,8 +2261,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_setget_priv_esuppmode(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_setget_priv_esuppmode(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { t_u32 data[3]; mlan_ioctl_req *req = NULL; @@ -2303,8 +2286,8 @@ woal_setget_priv_esuppmode(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* SET operation */ memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_ESUPPMODE), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_ESUPPMODE), + data, ARRAY_SIZE(data), &user_data_len); } if (user_data_len >= 4 || user_data_len == 1 || user_data_len == 2) { @@ -2357,7 +2340,6 @@ done: kfree(req); LEAVE(); return ret; - } /** @@ -2369,15 +2351,15 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_setget_priv_passphrase(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_setget_priv_passphrase(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_sec_cfg *sec = NULL; int ret = 0, action = -1, i = 0; char *begin, *end, *opt; t_u16 len = 0; - t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; + t_u8 zero_mac[] = {0, 0, 0, 0, 0, 0}; t_u8 *mac = NULL; mlan_status status = MLAN_STATUS_SUCCESS; @@ -2389,7 +2371,8 @@ woal_setget_priv_passphrase(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) goto done; } - if (strlen(respbuf) == (strlen(CMD_NXP) + strlen(PRIV_CMD_PASSPHRASE))) { + if (strlen(respbuf) == + (strlen(CMD_NXP) + strlen(PRIV_CMD_PASSPHRASE))) { PRINTM(MERROR, "No arguments provided\n"); ret = -EINVAL; goto done; @@ -2435,8 +2418,9 @@ woal_setget_priv_passphrase(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) break; } sec->param.passphrase.ssid.ssid_len = strlen(end); - strncpy((char *)sec->param.passphrase.ssid.ssid, end, - MIN(strlen(end), MLAN_MAX_SSID_LENGTH)); + moal_memcpy_ext(priv->phandle, + sec->param.passphrase.ssid.ssid, end, + strlen(end), MLAN_MAX_SSID_LENGTH); PRINTM(MINFO, "ssid=%s, len=%d\n", sec->param.passphrase.ssid.ssid, (int)sec->param.passphrase.ssid.ssid_len); @@ -2449,9 +2433,9 @@ woal_setget_priv_passphrase(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) ret = -EINVAL; break; } - woal_ascii2hex((t_u8 *)(sec->param.passphrase.psk.pmk. - pmk), end, - MLAN_PMK_HEXSTR_LENGTH / 2); + woal_ascii2hex( + (t_u8 *)(sec->param.passphrase.psk.pmk.pmk), + end, MLAN_PMK_HEXSTR_LENGTH / 2); sec->param.passphrase.psk_type = MLAN_PSK_PMK; } else if (!strnicmp(opt, "passphrase", strlen(opt)) && req->action == MLAN_ACT_SET) { @@ -2463,19 +2447,20 @@ woal_setget_priv_passphrase(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) break; } sec->param.passphrase.psk_type = MLAN_PSK_PASSPHRASE; - moal_memcpy_ext(priv->phandle, - sec->param.passphrase.psk.passphrase. - passphrase, end, - sizeof(sec->param.passphrase.psk. - passphrase.passphrase), - sizeof(sec->param.passphrase.psk. - passphrase.passphrase)); + moal_memcpy_ext( + priv->phandle, + sec->param.passphrase.psk.passphrase.passphrase, + end, + sizeof(sec->param.passphrase.psk.passphrase + .passphrase), + sizeof(sec->param.passphrase.psk.passphrase + .passphrase)); sec->param.passphrase.psk.passphrase.passphrase_len = strlen(end); PRINTM(MINFO, "passphrase=%s, len=%d\n", sec->param.passphrase.psk.passphrase.passphrase, - (int)sec->param.passphrase.psk.passphrase. - passphrase_len); + (int)sec->param.passphrase.psk.passphrase + .passphrase_len); } else if (!strnicmp(opt, "sae_password", strlen(opt)) && req->action == MLAN_ACT_SET) { if (strlen(end) < MLAN_MIN_SAE_PASSWORD_LENGTH || @@ -2486,20 +2471,22 @@ woal_setget_priv_passphrase(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) break; } sec->param.passphrase.psk_type = MLAN_PSK_SAE_PASSWORD; - moal_memcpy_ext(priv->phandle, - sec->param.passphrase.psk.sae_password. - sae_password, end, - sizeof(sec->param.passphrase.psk. - sae_password.sae_password), - sizeof(sec->param.passphrase.psk. - sae_password.sae_password)); - sec->param.passphrase.psk.sae_password. - sae_password_len = strlen(end); + moal_memcpy_ext( + priv->phandle, + sec->param.passphrase.psk.sae_password + .sae_password, + end, + sizeof(sec->param.passphrase.psk.sae_password + .sae_password), + sizeof(sec->param.passphrase.psk.sae_password + .sae_password)); + sec->param.passphrase.psk.sae_password.sae_password_len = + strlen(end); PRINTM(MINFO, "sae_password=%s, len=%d\n", - sec->param.passphrase.psk.sae_password. - sae_password, - (int)sec->param.passphrase.psk.sae_password. - sae_password_len); + sec->param.passphrase.psk.sae_password + .sae_password, + (int)sec->param.passphrase.psk.sae_password + .sae_password_len); } else { PRINTM(MERROR, "Invalid option %s\n", opt); ret = -EINVAL; @@ -2548,9 +2535,9 @@ woal_setget_priv_passphrase(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) len += sprintf(respbuf + len, "passphrase:%s\n", sec->param.passphrase.psk.passphrase.passphrase); if (sec->param.passphrase.psk_type == MLAN_PSK_SAE_PASSWORD) - len += sprintf(respbuf + len, "sae_password:%s\n", - sec->param.passphrase.psk.sae_password. - sae_password); + len += sprintf( + respbuf + len, "sae_password:%s\n", + sec->param.passphrase.psk.sae_password.sae_password); ret = len; done: @@ -2558,7 +2545,6 @@ done: kfree(req); LEAVE(); return ret; - } /** @@ -2570,8 +2556,7 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_deauth(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_deauth(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int ret = 0; t_u8 mac[ETH_ALEN]; @@ -2580,9 +2565,8 @@ woal_priv_deauth(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) if (strlen(respbuf) > (strlen(CMD_NXP) + strlen(PRIV_CMD_DEAUTH))) { /* Deauth mentioned BSSID */ - woal_mac2u8(mac, - respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_DEAUTH)); + woal_mac2u8(mac, respbuf + strlen(CMD_NXP) + + strlen(PRIV_CMD_DEAUTH)); if (MLAN_STATUS_SUCCESS != woal_disconnect(priv, MOAL_IOCTL_WAIT, mac, DEF_DEAUTH_REASON_CODE)) { @@ -2611,8 +2595,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_ap_deauth(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_ap_deauth(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { t_u8 *data_ptr; mlan_ioctl_req *ioctl_req = NULL; @@ -2650,10 +2634,9 @@ woal_priv_ap_deauth(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) goto done; } - moal_memcpy_ext(priv->phandle, data_ptr, &ioctl_req->status_code, - sizeof(t_u32), - respbuflen - (strlen(CMD_NXP) + - strlen(PRIV_CMD_AP_DEAUTH))); + moal_memcpy_ext( + priv->phandle, data_ptr, &ioctl_req->status_code, sizeof(t_u32), + respbuflen - (strlen(CMD_NXP) + strlen(PRIV_CMD_AP_DEAUTH))); ret = sizeof(t_u32); done: if (status != MLAN_STATUS_PENDING) @@ -2669,8 +2652,8 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_priv_get_sta_list(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_get_sta_list(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; mlan_ds_get_info *info = NULL; @@ -2681,9 +2664,8 @@ woal_priv_get_sta_list(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) ENTER(); /* Allocate an IOCTL request buffer */ - ioctl_req = - (mlan_ioctl_req *) - woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_get_info)); + ioctl_req = (mlan_ioctl_req *)woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_get_info)); if (ioctl_req == NULL) { ret = -ENOMEM; goto done; @@ -2700,13 +2682,12 @@ woal_priv_get_sta_list(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) goto done; } - sta_list = - (mlan_ds_sta_list *)(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_GET_STA_LIST)); - moal_memcpy_ext(priv->phandle, sta_list, &info->param.sta_list, - sizeof(mlan_ds_sta_list), - respbuflen - (strlen(CMD_NXP) + - strlen(PRIV_CMD_GET_STA_LIST))); + sta_list = (mlan_ds_sta_list *)(respbuf + strlen(CMD_NXP) + + strlen(PRIV_CMD_GET_STA_LIST)); + moal_memcpy_ext( + priv->phandle, sta_list, &info->param.sta_list, + sizeof(mlan_ds_sta_list), + respbuflen - (strlen(CMD_NXP) + strlen(PRIV_CMD_GET_STA_LIST))); ret = sizeof(mlan_ds_sta_list); done: if (status != MLAN_STATUS_PENDING) @@ -2722,8 +2703,8 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_priv_bss_config(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_bss_config(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; mlan_ds_bss *bss = NULL; @@ -2740,9 +2721,8 @@ woal_priv_bss_config(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) offset += sizeof(action); /* Allocate an IOCTL request buffer */ - ioctl_req = - (mlan_ioctl_req *) - woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_bss)); + ioctl_req = (mlan_ioctl_req *)woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_bss)); if (ioctl_req == NULL) { ret = -ENOMEM; goto done; @@ -2793,8 +2773,7 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_bssrole(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_bssrole(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { t_u32 data[1]; int ret = 0; @@ -2810,8 +2789,8 @@ woal_priv_bssrole(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) } else { /* SET operation */ parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_BSSROLE), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_BSSROLE), + data, ARRAY_SIZE(data), &user_data_len); } if (user_data_len >= 2) { @@ -2839,9 +2818,8 @@ woal_priv_bssrole(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) woal_reset_intf(priv, MOAL_IOCTL_WAIT, MFALSE); } - if (MLAN_STATUS_SUCCESS != woal_bss_role_cfg(priv, - action, MOAL_IOCTL_WAIT, - (t_u8 *)data)) { + if (MLAN_STATUS_SUCCESS != + woal_bss_role_cfg(priv, action, MOAL_IOCTL_WAIT, (t_u8 *)data)) { ret = -EFAULT; goto error; } @@ -2876,8 +2854,7 @@ error: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_setuserscan(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_setuserscan(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { wlan_user_scan_cfg scan_cfg; int ret = 0; @@ -2890,7 +2867,7 @@ woal_priv_setuserscan(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* We expect the scan_cfg structure to be passed in respbuf */ moal_memcpy_ext(priv->phandle, (char *)&scan_cfg, respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_SETUSERSCAN), + strlen(PRIV_CMD_SETUSERSCAN), sizeof(wlan_user_scan_cfg), sizeof(wlan_user_scan_cfg)); moal_memcpy_ext(priv->phandle, scan_cfg.random_mac, priv->random_mac, ETH_ALEN, MLAN_MAC_ADDR_LENGTH); @@ -2911,8 +2888,7 @@ woal_priv_setuserscan(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) * * @return Number of bytes written, negative for failure. */ -int -woal_priv_get_chanstats(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_get_chanstats(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { mlan_scan_resp scan_resp; chan_stats *stats = NULL; @@ -2925,14 +2901,13 @@ woal_priv_get_chanstats(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) goto done; } memset(&scan_resp, 0, sizeof(scan_resp)); - if (MLAN_STATUS_SUCCESS != woal_get_scan_table(priv, - MOAL_IOCTL_WAIT, - &scan_resp)) { + if (MLAN_STATUS_SUCCESS != + woal_get_scan_table(priv, MOAL_IOCTL_WAIT, &scan_resp)) { ret = -EFAULT; goto done; } memset(respbuf, 0, respbuflen); - stats = (chan_stats *) respbuf; + stats = (chan_stats *)respbuf; stats->num_in_chan_stats = scan_resp.num_in_chan_stats; ret = sizeof(ChanStatistics_t) * stats->num_in_chan_stats; moal_memcpy_ext(priv->phandle, (t_u8 *)stats->stats, @@ -2953,9 +2928,8 @@ done: * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -int -moal_ret_get_scan_table_ioctl(t_u8 *respbuf, t_u32 respbuflen, - mlan_scan_resp *scan_resp, t_u32 scan_start) +int moal_ret_get_scan_table_ioctl(t_u8 *respbuf, t_u32 respbuflen, + mlan_scan_resp *scan_resp, t_u32 scan_start) { pBSSDescriptor_t pbss_desc, scan_table; wlan_ioctl_get_scan_table_info *prsp_info; @@ -2987,8 +2961,7 @@ moal_ret_get_scan_table_ioctl(t_u8 *respbuf, t_u32 respbuflen, /* Use to get current association saved descriptor */ pbss_desc = scan_table; - ret_code = wlan_get_scan_table_ret_entry(pbss_desc, - &pcurrent, + ret_code = wlan_get_scan_table_ret_entry(pbss_desc, &pcurrent, &space_left); if (ret_code == MLAN_STATUS_SUCCESS) @@ -2997,11 +2970,10 @@ moal_ret_get_scan_table_ioctl(t_u8 *respbuf, t_u32 respbuflen, } else { scan_start--; - while (space_left - && (scan_start + num_scans_done < - scan_resp->num_in_scan_table) - && (ret_code == MLAN_STATUS_SUCCESS)) { - + while (space_left && + (scan_start + num_scans_done < + scan_resp->num_in_scan_table) && + (ret_code == MLAN_STATUS_SUCCESS)) { pbss_desc = (scan_table + (scan_start + num_scans_done)); @@ -3009,13 +2981,11 @@ moal_ret_get_scan_table_ioctl(t_u8 *respbuf, t_u32 respbuflen, "GetScanTable: get current BSS Descriptor [%d]\n", scan_start + num_scans_done); - ret_code = wlan_get_scan_table_ret_entry(pbss_desc, - &pcurrent, - &space_left); + ret_code = wlan_get_scan_table_ret_entry( + pbss_desc, &pcurrent, &space_left); if (ret_code == MLAN_STATUS_SUCCESS) num_scans_done++; - } } @@ -3035,8 +3005,7 @@ moal_ret_get_scan_table_ioctl(t_u8 *respbuf, t_u32 respbuflen, * * @return Number of bytes written, negative for failure. */ -int -woal_priv_getscantable(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_getscantable(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -3068,8 +3037,8 @@ woal_priv_getscantable(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* Get the whole command from user */ moal_memcpy_ext(handle, &scan_start, respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_GETSCANTABLE), sizeof(scan_start), - sizeof(scan_start)); + strlen(PRIV_CMD_GETSCANTABLE), + sizeof(scan_start), sizeof(scan_start)); if (scan_start) scan->sub_command = MLAN_OID_SCAN_NORMAL; else @@ -3088,7 +3057,6 @@ done: LEAVE(); return ret; } - /** * @brief Extended capabilities configuration * @@ -3098,8 +3066,7 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_extcapcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_extcapcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int ret, header; mlan_ioctl_req *req = NULL; @@ -3175,8 +3142,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_setgetdeepsleep(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_setgetdeepsleep(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { t_u32 data[2]; int ret = 0; @@ -3191,8 +3158,8 @@ woal_priv_setgetdeepsleep(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* SET operation */ memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_DEEPSLEEP), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_DEEPSLEEP), + data, ARRAY_SIZE(data), &user_data_len); } if (user_data_len >= 3) { @@ -3238,7 +3205,6 @@ woal_priv_setgetdeepsleep(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) done: LEAVE(); return ret; - } /** @@ -3250,8 +3216,7 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_setgetipaddr(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_setgetipaddr(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -3277,7 +3242,7 @@ woal_priv_setgetipaddr(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) } misc = (mlan_ds_misc_cfg *)req->pbuf; - if (data_length < 1) { /* GET */ + if (data_length < 1) { /* GET */ req->action = MLAN_ACT_GET; } else { /* Make sure we have the operation argument */ @@ -3345,8 +3310,7 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_setwpssession(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_setwpssession(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_wps_cfg *pwps = NULL; @@ -3358,14 +3322,15 @@ woal_priv_setwpssession(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) ENTER(); memset((char *)data, 0, sizeof(data)); - if (strlen(respbuf) == (strlen(CMD_NXP) + strlen(PRIV_CMD_WPSSESSION))) { + if (strlen(respbuf) == + (strlen(CMD_NXP) + strlen(PRIV_CMD_WPSSESSION))) { /* GET operation */ user_data_len = 0; } else { /* SET operation */ parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_WPSSESSION), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_WPSSESSION), + data, ARRAY_SIZE(data), &user_data_len); } if (user_data_len > 1) { @@ -3413,8 +3378,7 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_otpuserdata(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_otpuserdata(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int data[1]; int user_data_len = 0; @@ -3426,15 +3390,16 @@ woal_priv_otpuserdata(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) ENTER(); - if (strlen(respbuf) == (strlen(CMD_NXP) + strlen(PRIV_CMD_OTPUSERDATA))) { + if (strlen(respbuf) == + (strlen(CMD_NXP) + strlen(PRIV_CMD_OTPUSERDATA))) { PRINTM(MERROR, "Invalid number of arguments\n"); ret = -EINVAL; goto done; } memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_OTPUSERDATA), data, ARRAY_SIZE(data), - &user_data_len); + strlen(PRIV_CMD_OTPUSERDATA), + data, ARRAY_SIZE(data), &user_data_len); if (user_data_len != 1) { PRINTM(MERROR, "Invalid number of arguments\n"); @@ -3483,13 +3448,12 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_set_get_countrycode(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +int woal_priv_set_get_countrycode(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; /* char data[COUNTRY_CODE_LEN] = {0, 0, 0}; */ - int header = 0, data_length = 0; /* wrq->u.data.length; */ + int header = 0, data_length = 0; /* wrq->u.data.length; */ mlan_ioctl_req *req = NULL; mlan_ds_misc_cfg *pcfg_misc = NULL; mlan_ds_misc_country_code *country_code = NULL; @@ -3561,8 +3525,7 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_get_cfpinfo(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_get_cfpinfo(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -3624,8 +3587,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_setgettcpackenh(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_setgettcpackenh(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { t_u32 data[1]; int ret = 0; @@ -3640,8 +3603,8 @@ woal_priv_setgettcpackenh(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* SET operation */ memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_TCPACKENH), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_TCPACKENH), + data, ARRAY_SIZE(data), &user_data_len); } if (user_data_len >= 2) { @@ -3675,7 +3638,6 @@ woal_priv_setgettcpackenh(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) done: LEAVE(); return ret; - } #ifdef REASSOCIATION @@ -3689,9 +3651,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_assocessid(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen, - t_u8 bBSSID) +int woal_priv_assocessid(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen, + t_u8 bBSSID) { mlan_ssid_bssid ssid_bssid; moal_handle *handle = priv->phandle; @@ -3728,8 +3689,10 @@ woal_priv_assocessid(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen, if (buflen < (3 * ETH_ALEN) + 2) { PRINTM(MERROR, "Associate: Insufficient length in IOCTL input\n"); - /* buffer should be at least 3 characters per BSSID octet "00:" - ** plus a space separater and at least 1 char in the SSID + /* buffer should be at least 3 characters per BSSID + *octet "00:" + ** plus a space separater and at least 1 char in the + *SSID */ ret = -EINVAL; goto setessid_ret; @@ -3792,7 +3755,8 @@ woal_priv_assocessid(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen, if (MTRUE == woal_is_connected(priv, &ssid_bssid)) { PRINTM(MIOCTL, "Already connect to the network\n"); ret = sprintf(respbuf, - "Has already connected to this ESSID!\n") + 1; + "Has already connected to this ESSID!\n") + + 1; goto setessid_ret; } moal_memcpy_ext(handle, &priv->prev_ssid_bssid, &ssid_bssid, @@ -3823,8 +3787,8 @@ setessid_ret: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_getwakeupreason(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_getwakeupreason(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_pm_cfg *pm_cfg = NULL; @@ -3869,7 +3833,6 @@ woal_priv_getwakeupreason(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) done: LEAVE(); return ret; - } #ifdef STA_SUPPORT @@ -3882,9 +3845,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_set_get_listeninterval(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +int woal_priv_set_get_listeninterval(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data[1]; int user_data_len = 0; @@ -3903,8 +3865,8 @@ woal_priv_set_get_listeninterval(moal_private *priv, t_u8 *respbuf, /* SET operation */ memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_LISTENINTERVAL), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_LISTENINTERVAL), + data, ARRAY_SIZE(data), &user_data_len); } if (user_data_len > 1) { @@ -3964,8 +3926,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_set_get_drvdbg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_set_get_drvdbg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data[4]; int user_data_len = 0; @@ -3980,8 +3942,8 @@ woal_priv_set_get_drvdbg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* SET operation */ memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_DRVDBG), data, ARRAY_SIZE(data), - &user_data_len); + strlen(PRIV_CMD_DRVDBG), + data, ARRAY_SIZE(data), &user_data_len); } if (user_data_len > 1) { @@ -4062,8 +4024,7 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_priv_mgmt_filter(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_mgmt_filter(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { mlan_ioctl_req *ioctl_req = NULL; mlan_ds_pm_cfg *pm_cfg = NULL; @@ -4140,11 +4101,10 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_priv_hscfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen, - BOOLEAN invoke_hostcmd) +int woal_priv_hscfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen, + BOOLEAN invoke_hostcmd) { - int data[13] = { 0 }; + int data[13] = {0}; int *temp_data, type; int user_data_len = 0; int ret = 0; @@ -4273,11 +4233,12 @@ woal_priv_hscfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen, ret = -EINVAL; goto done; } - /* Force_ignore_gpio and ext_gap_gpio should not set the same bit(s) */ - if ((hscfg.event_force_ignore & hscfg. - event_use_ext_gap) || (hscfg.gpio_wave != 1 - && hscfg. - gpio_wave != 0)) { + /* Force_ignore_gpio and ext_gap_gpio should not + * set the same bit(s)*/ + if ((hscfg.event_force_ignore & + hscfg.event_use_ext_gap) || + (hscfg.gpio_wave != 1 && + hscfg.gpio_wave != 0)) { PRINTM(MERROR, "Invalid arguments for extend hscfg\n"); ret = -EINVAL; @@ -4344,10 +4305,9 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_priv_hssetpara(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_hssetpara(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { - int data[13] = { 0 }; + int data[13] = {0}; int user_data_len = 0; int ret = 0; @@ -4361,8 +4321,8 @@ woal_priv_hssetpara(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* SET operation */ memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_HSSETPARA), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_HSSETPARA), + data, ARRAY_SIZE(data), &user_data_len); } if (sizeof(int) * user_data_len > sizeof(data)) { @@ -4373,8 +4333,8 @@ woal_priv_hssetpara(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) if (user_data_len >= 1 && user_data_len <= 13) { sprintf(respbuf, "%s%s%s", CMD_NXP, PRIV_CMD_HSCFG, - respbuf + (strlen(CMD_NXP) + - strlen(PRIV_CMD_HSSETPARA))); + respbuf + + (strlen(CMD_NXP) + strlen(PRIV_CMD_HSSETPARA))); respbuflen = strlen(respbuf); ret = woal_priv_hscfg(priv, respbuf, respbuflen, MFALSE); goto done; @@ -4393,8 +4353,8 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_priv_set_get_scancfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_set_get_scancfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; int user_data_len = 0; @@ -4413,8 +4373,8 @@ woal_priv_set_get_scancfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* SET operation */ memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_SCANCFG), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_SCANCFG), + data, ARRAY_SIZE(data), &user_data_len); } if (sizeof(int) * user_data_len > sizeof(data)) { @@ -4469,7 +4429,8 @@ woal_priv_set_get_scancfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) ret = -EINVAL; goto done; } - if ((data[8] < 0) || (data[8] > MRVDRV_MAX_SCAN_CHAN_GAP_TIME)) { + if ((data[8] < 0) || + (data[8] > MRVDRV_MAX_SCAN_CHAN_GAP_TIME)) { PRINTM(MERROR, "Invalid argument for scan channel gap\n"); ret = -EINVAL; @@ -4505,8 +4466,7 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_getnlnum(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_getnlnum(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int ret = 0; int data = 0; @@ -4538,8 +4498,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_set_get_aggrctrl(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_set_get_aggrctrl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data[1]; int user_data_len = 0; @@ -4570,8 +4530,8 @@ woal_priv_set_get_aggrctrl(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) } /* SET operation */ parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_AGGRCTRL), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_AGGRCTRL), + data, ARRAY_SIZE(data), &user_data_len); if (sizeof(int) * user_data_len > sizeof(data)) { PRINTM(MERROR, "Too many arguments\n"); @@ -4592,7 +4552,8 @@ woal_priv_set_get_aggrctrl(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) pcfg_misc->sub_command = MLAN_OID_MISC_AGGR_CTRL; req->req_id = MLAN_IOCTL_MISC_CFG; - /* Get the values first, then modify these values if user had modified them */ + /* Get the values first, then modify these values if user had modified + * them */ if (user_data_len == 0) req->action = MLAN_ACT_GET; else { @@ -4603,7 +4564,8 @@ woal_priv_set_get_aggrctrl(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* Send IOCTL request to MLAN */ status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); if (status != MLAN_STATUS_SUCCESS) { - /* MLAN will return CMD_INVALID if FW does not support this feature */ + /* MLAN will return CMD_INVALID if FW does not support this + * feature */ if (MLAN_ERROR_CMD_INVALID == req->status_code) ret = -EOPNOTSUPP; else @@ -4632,9 +4594,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_set_get_usbaggrctrl(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +int woal_priv_set_get_usbaggrctrl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data[8]; int user_data_len = 0; @@ -4656,14 +4617,15 @@ woal_priv_set_get_usbaggrctrl(moal_private *priv, t_u8 *respbuf, cardp = (struct usb_card_rec *)handle->card; memset((char *)data, 0, sizeof(data)); - if (strlen(respbuf) == (strlen(CMD_NXP) + strlen(PRIV_CMD_USBAGGRCTRL))) { + if (strlen(respbuf) == + (strlen(CMD_NXP) + strlen(PRIV_CMD_USBAGGRCTRL))) { /* GET operation */ user_data_len = 0; } else { /* SET operation */ parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_USBAGGRCTRL), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_USBAGGRCTRL), + data, ARRAY_SIZE(data), &user_data_len); if (sizeof(int) * user_data_len > sizeof(data)) { PRINTM(MERROR, "Too many arguments\n"); @@ -4684,11 +4646,13 @@ woal_priv_set_get_usbaggrctrl(moal_private *priv, t_u8 *respbuf, pcfg_misc->sub_command = MLAN_OID_MISC_USB_AGGR_CTRL; req->req_id = MLAN_IOCTL_MISC_CFG; - /* Get the values first, then modify these values if user had modified them */ + /* Get the values first, then modify these values if user had modified + * them */ req->action = MLAN_ACT_GET; status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); if (status != MLAN_STATUS_SUCCESS) { - /* MLAN will return CMD_INVALID if FW does not support this feature */ + /* MLAN will return CMD_INVALID if FW does not support this + * feature */ if (MLAN_ERROR_CMD_INVALID == req->status_code) ret = -EOPNOTSUPP; else @@ -4714,10 +4678,10 @@ woal_priv_set_get_usbaggrctrl(moal_private *priv, t_u8 *respbuf, } pcfg_misc->param.usb_aggr_params.rx_deaggr_ctrl.aggr_tmo = (t_u16)data[7]; + /* fall through */ case 7: - if (data[6] < 0 || - (data[6] > 10000 && - data[6] != MLAN_USB_TX_AGGR_TIMEOUT_DYN)) { + if (data[6] < 0 || (data[6] > 10000 && + data[6] != MLAN_USB_TX_AGGR_TIMEOUT_DYN)) { PRINTM(MERROR, "Invalid Tx timeout value (%d)\n", data[6]); ret = -EINVAL; @@ -4725,6 +4689,7 @@ woal_priv_set_get_usbaggrctrl(moal_private *priv, t_u8 *respbuf, } pcfg_misc->param.usb_aggr_params.tx_aggr_ctrl.aggr_tmo = (t_u16)data[6]; + /* fall through */ case 6: if ((data[5] < 512) || ((data[5] % 512) != 0)) { PRINTM(MERROR, "Invalid Rx alignment value (%d)\n", @@ -4733,11 +4698,12 @@ woal_priv_set_get_usbaggrctrl(moal_private *priv, t_u8 *respbuf, goto done; } if (cardp->rx_deaggr_ctrl.enable && - pcfg_misc->param.usb_aggr_params.rx_deaggr_ctrl. - aggr_align != (t_u16)data[5]) + pcfg_misc->param.usb_aggr_params.rx_deaggr_ctrl.aggr_align != + (t_u16)data[5]) usb_resubmit_urbs = 1; pcfg_misc->param.usb_aggr_params.rx_deaggr_ctrl.aggr_align = (t_u16)data[5]; + /* fall through */ case 5: if ((data[4] < 2048) || ((data[4] % 2048) != 0)) { PRINTM(MERROR, "Invalid Tx alignment value (%d)\n", @@ -4747,15 +4713,16 @@ woal_priv_set_get_usbaggrctrl(moal_private *priv, t_u8 *respbuf, } pcfg_misc->param.usb_aggr_params.tx_aggr_ctrl.aggr_align = (t_u16)data[4]; + /* fall through */ case 4: if ((data[3] == 2) || (data[3] == 4) || (data[3] == 8) || (data[3] == 16)) { - pcfg_misc->param.usb_aggr_params.rx_deaggr_ctrl. - aggr_mode = MLAN_USB_AGGR_MODE_NUM; + pcfg_misc->param.usb_aggr_params.rx_deaggr_ctrl + .aggr_mode = MLAN_USB_AGGR_MODE_NUM; } else if ((data[3] == 4096) || (data[3] == 8192) || (data[3] == 16384) || (data[3] == 32768)) { - pcfg_misc->param.usb_aggr_params.rx_deaggr_ctrl. - aggr_mode = MLAN_USB_AGGR_MODE_LEN; + pcfg_misc->param.usb_aggr_params.rx_deaggr_ctrl + .aggr_mode = MLAN_USB_AGGR_MODE_LEN; } else { PRINTM(MERROR, "Invalid Rx max size/num value (%d)\n", data[3]); @@ -4764,19 +4731,20 @@ woal_priv_set_get_usbaggrctrl(moal_private *priv, t_u8 *respbuf, } if (cardp->rx_deaggr_ctrl.enable && pcfg_misc->param.usb_aggr_params.rx_deaggr_ctrl.aggr_max != - (t_u16)data[3]) + (t_u16)data[3]) usb_resubmit_urbs = 1; pcfg_misc->param.usb_aggr_params.rx_deaggr_ctrl.aggr_max = (t_u16)data[3]; + /* fall through */ case 3: if ((data[2] == 2) || (data[2] == 4) || (data[2] == 8) || (data[2] == 16)) { - pcfg_misc->param.usb_aggr_params.tx_aggr_ctrl. - aggr_mode = MLAN_USB_AGGR_MODE_NUM; + pcfg_misc->param.usb_aggr_params.tx_aggr_ctrl.aggr_mode = + MLAN_USB_AGGR_MODE_NUM; } else if ((data[2] == 4096) || (data[2] == 8192) || (data[2] == 16384) || (data[2] == 32768)) { - pcfg_misc->param.usb_aggr_params.tx_aggr_ctrl. - aggr_mode = MLAN_USB_AGGR_MODE_LEN; + pcfg_misc->param.usb_aggr_params.tx_aggr_ctrl.aggr_mode = + MLAN_USB_AGGR_MODE_LEN; } else { PRINTM(MERROR, "Invalid Tx max size/num value (%d)\n", data[2]); @@ -4785,6 +4753,7 @@ woal_priv_set_get_usbaggrctrl(moal_private *priv, t_u8 *respbuf, } pcfg_misc->param.usb_aggr_params.tx_aggr_ctrl.aggr_max = (t_u16)data[2]; + /* fall through */ case 2: if ((data[1] != 0) && (data[1] != 1)) { PRINTM(MERROR, "Invalid Rx enable value (%d)\n", @@ -4797,6 +4766,7 @@ woal_priv_set_get_usbaggrctrl(moal_private *priv, t_u8 *respbuf, usb_resubmit_urbs = 1; pcfg_misc->param.usb_aggr_params.rx_deaggr_ctrl.enable = (t_u16)data[1]; + /* fall through */ case 1: if ((data[0] != 0) && (data[0] != 1)) { PRINTM(MERROR, "Invalid Tx enable value (%d)\n", @@ -4835,14 +4805,15 @@ woal_priv_set_get_usbaggrctrl(moal_private *priv, t_u8 *respbuf, /* Indicate resubmition from here */ cardp->resubmit_urbs = 1; /* Rx SG parameters has changed or disabled, kill the URBs, they - will be resubmitted after saving the parameters to USB card */ + will be resubmitted after saving the parameters to USB card + */ if (atomic_read(&cardp->rx_data_urb_pending)) { for (i = 0; i < MVUSB_RX_DATA_URB; i++) { if (cardp->rx_data_list[i].urb) { - usb_kill_urb(cardp->rx_data_list[i]. - urb); - usb_init_urb(cardp->rx_data_list[i]. - urb); + usb_kill_urb( + cardp->rx_data_list[i].urb); + usb_init_urb( + cardp->rx_data_list[i].urb); } } } @@ -4881,14 +4852,12 @@ done: * * @return Number of bytes written if successful, otherwise fail */ -static int -woal_priv_set_ap(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_set_ap(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int ret = 0; t_u8 *data_ptr; - const t_u8 bcast[MLAN_MAC_ADDR_LENGTH] = - { 255, 255, 255, 255, 255, 255 }; - const t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0, 0, 0, 0, 0, 0 }; + const t_u8 bcast[MLAN_MAC_ADDR_LENGTH] = {255, 255, 255, 255, 255, 255}; + const t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = {0, 0, 0, 0, 0, 0}; mlan_ssid_bssid ssid_bssid; mlan_bss_info bss_info; struct mwreq *mwr; @@ -4914,6 +4883,7 @@ woal_priv_set_ap(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) ret = -EFAULT; goto done; } + #ifdef REASSOCIATION /* Cancel re-association */ priv->reassoc_required = MFALSE; @@ -4939,9 +4909,8 @@ woal_priv_set_ap(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) ETH_ALEN, sizeof(mlan_802_11_mac_addr)); } - if (MLAN_STATUS_SUCCESS != woal_find_best_network(priv, - MOAL_IOCTL_WAIT, - &ssid_bssid)) { + if (MLAN_STATUS_SUCCESS != + woal_find_best_network(priv, MOAL_IOCTL_WAIT, &ssid_bssid)) { PRINTM(MERROR, "ASSOC: WAP: MAC address not found in BSSID List\n"); ret = -ENETUNREACH; @@ -4949,17 +4918,16 @@ woal_priv_set_ap(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) } /* Zero SSID implies use BSSID to connect */ memset(&ssid_bssid.ssid, 0, sizeof(mlan_802_11_ssid)); - if (MLAN_STATUS_SUCCESS != woal_bss_start(priv, - MOAL_IOCTL_WAIT, - &ssid_bssid)) { + if (MLAN_STATUS_SUCCESS != + woal_bss_start(priv, MOAL_IOCTL_WAIT, &ssid_bssid)) { ret = -EFAULT; goto done; } + #ifdef REASSOCIATION memset(&bss_info, 0, sizeof(bss_info)); - if (MLAN_STATUS_SUCCESS != woal_get_bss_info(priv, - MOAL_IOCTL_WAIT, - &bss_info)) { + if (MLAN_STATUS_SUCCESS != + woal_get_bss_info(priv, MOAL_IOCTL_WAIT, &bss_info)) { ret = -EFAULT; goto done; } @@ -4974,7 +4942,6 @@ woal_priv_set_ap(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) done: LEAVE(); return ret; - } #endif @@ -4987,8 +4954,8 @@ done: * * @return Number of bytes written if successful, otherwise fail */ -static int -woal_priv_set_bss_mode(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_set_bss_mode(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; mlan_ds_bss *bss = NULL; @@ -5052,8 +5019,8 @@ done: * * @return Number of bytes written if successful, otherwise fail */ -static int -woal_priv_set_power(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_set_power(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { struct mwreq *mwr; t_u8 *data_ptr; @@ -5072,11 +5039,9 @@ woal_priv_set_power(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) mwr = (struct mwreq *)data_ptr; disabled = mwr->u.power.disabled; - if (MLAN_STATUS_SUCCESS != woal_set_get_power_mgmt(priv, - MLAN_ACT_SET, - &disabled, - mwr->u.power.flags, - MOAL_IOCTL_WAIT)) { + if (MLAN_STATUS_SUCCESS != + woal_set_get_power_mgmt(priv, MLAN_ACT_SET, &disabled, + mwr->u.power.flags, MOAL_IOCTL_WAIT)) { return -EFAULT; } LEAVE(); @@ -5092,8 +5057,8 @@ woal_priv_set_power(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) * * @return Number of bytes written if successful, otherwise fail */ -static int -woal_priv_set_essid(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_set_essid(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_802_11_ssid req_ssid; mlan_ssid_bssid ssid_bssid; @@ -5186,7 +5151,6 @@ woal_priv_set_essid(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) } } } - } mode = woal_get_mode(priv, MOAL_IOCTL_WAIT); @@ -5198,25 +5162,27 @@ woal_priv_set_essid(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) ret = -EFAULT; goto setessid_ret; } - } else if (MLAN_STATUS_SUCCESS != - woal_find_best_network(priv, MOAL_IOCTL_WAIT, &ssid_bssid)) + } +#ifdef UAP_SUPPORT + else if (MLAN_STATUS_SUCCESS != + woal_find_best_network(priv, MOAL_IOCTL_WAIT, &ssid_bssid)) /* Adhoc start, Check the channel command */ woal_11h_channel_check_ioctl(priv, MOAL_IOCTL_WAIT); +#endif /* Connect to BSS by ESSID */ memset(&ssid_bssid.bssid, 0, MLAN_MAC_ADDR_LENGTH); - if (MLAN_STATUS_SUCCESS != woal_bss_start(priv, - MOAL_IOCTL_WAIT, - &ssid_bssid)) { + if (MLAN_STATUS_SUCCESS != + woal_bss_start(priv, MOAL_IOCTL_WAIT, &ssid_bssid)) { ret = -EFAULT; goto setessid_ret; } + #ifdef REASSOCIATION memset(&bss_info, 0, sizeof(bss_info)); - if (MLAN_STATUS_SUCCESS != woal_get_bss_info(priv, - MOAL_IOCTL_WAIT, - &bss_info)) { + if (MLAN_STATUS_SUCCESS != + woal_get_bss_info(priv, MOAL_IOCTL_WAIT, &bss_info)) { ret = -EFAULT; goto setessid_ret; } @@ -5245,8 +5211,8 @@ setessid_ret: * * @return Number of bytes written if successful, otherwise fail */ -static int -woal_priv_set_auth(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_set_auth(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { struct mwreq *mwr; t_u8 *data_ptr; @@ -5307,7 +5273,7 @@ woal_priv_set_auth(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) mwr->u.param.value)) ret = -EFAULT; break; -#define MW_AUTH_WAPI_ENABLED 0x20 +#define MW_AUTH_WAPI_ENABLED 0x20 case MW_AUTH_WAPI_ENABLED: if (MLAN_STATUS_SUCCESS != woal_set_wapi_enable(priv, MOAL_IOCTL_WAIT, @@ -5345,8 +5311,7 @@ woal_priv_set_auth(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) * * @return Number of bytes written if successful else negative value */ -static int -woal_priv_get_ap(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_get_ap(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { struct mwreq *mwr; t_u8 *data_ptr; @@ -5388,8 +5353,8 @@ woal_priv_get_ap(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) * * @return Number of bytes written if successful else negative value */ -static int -woal_priv_get_power(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_get_power(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { struct mwreq *mwr; t_u8 *data_ptr; @@ -5401,8 +5366,7 @@ woal_priv_get_power(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) mwr = (struct mwreq *)data_ptr; - if (MLAN_STATUS_SUCCESS != woal_set_get_power_mgmt(priv, - MLAN_ACT_GET, + if (MLAN_STATUS_SUCCESS != woal_set_get_power_mgmt(priv, MLAN_ACT_GET, &ps_mode, 0, MOAL_IOCTL_WAIT)) { return -EFAULT; @@ -5415,7 +5379,7 @@ woal_priv_get_power(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) mwr->u.power.value = 0; ret = strlen(CMD_NXP) + strlen(PRIV_CMD_GET_POWER) + - sizeof(struct mwreq); + sizeof(struct mwreq); LEAVE(); return ret; } @@ -5429,8 +5393,8 @@ woal_priv_get_power(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) * * @return 0 --success, otherwise fail */ -static int -woal_priv_set_get_psmode(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_set_get_psmode(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; int data = 0; @@ -5489,8 +5453,8 @@ done: * * @return Number of bytes written if successful else negative value */ -static int -woal_priv_warmreset(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_warmreset(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; moal_handle *handle = priv->phandle; @@ -5527,8 +5491,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_priv_txpowercfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_txpowercfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data[5]; int user_data_len; @@ -5544,7 +5508,8 @@ woal_priv_txpowercfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) memset(&bss_info, 0, sizeof(bss_info)); woal_get_bss_info(priv, MOAL_IOCTL_WAIT, &bss_info); - if (strlen(respbuf) == (strlen(CMD_NXP) + strlen(PRIV_CMD_TXPOWERCFG))) { + if (strlen(respbuf) == + (strlen(CMD_NXP) + strlen(PRIV_CMD_TXPOWERCFG))) { /* GET operation */ user_data_len = 0; } else { @@ -5577,70 +5542,70 @@ woal_priv_txpowercfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) switch (user_data_len) { case 1: if (data[0] == 0xFF) - pcfg->param.power_ext.power_group[0]. - rate_format = TX_PWR_CFG_AUTO_CTRL_OFF; + pcfg->param.power_ext.power_group[0] + .rate_format = TX_PWR_CFG_AUTO_CTRL_OFF; else ret = -EINVAL; break; case 3: case 5: switch (data[0]) { - case 0: /* LG */ - pcfg->param.power_ext.power_group[0]. - rate_format = MLAN_RATE_FORMAT_LG; + case 0: /* LG */ + pcfg->param.power_ext.power_group[0] + .rate_format = MLAN_RATE_FORMAT_LG; pcfg->param.power_ext.power_group[0].bandwidth = MLAN_HT_BW20; break; - case 1: /* 20 MHz HT */ - pcfg->param.power_ext.power_group[0]. - rate_format = MLAN_RATE_FORMAT_HT; + case 1: /* 20 MHz HT */ + pcfg->param.power_ext.power_group[0] + .rate_format = MLAN_RATE_FORMAT_HT; pcfg->param.power_ext.power_group[0].bandwidth = MLAN_HT_BW20; break; - case 2: /* 40 MHz HT */ - pcfg->param.power_ext.power_group[0]. - rate_format = MLAN_RATE_FORMAT_HT; + case 2: /* 40 MHz HT */ + pcfg->param.power_ext.power_group[0] + .rate_format = MLAN_RATE_FORMAT_HT; pcfg->param.power_ext.power_group[0].bandwidth = MLAN_HT_BW40; break; - case 3: /* 1 NSS 20 MHZ VHT */ - pcfg->param.power_ext.power_group[0]. - rate_format = MLAN_RATE_FORMAT_VHT; + case 3: /* 1 NSS 20 MHZ VHT */ + pcfg->param.power_ext.power_group[0] + .rate_format = MLAN_RATE_FORMAT_VHT; pcfg->param.power_ext.power_group[0].bandwidth = MLAN_HT_BW20; pcfg->param.power_ext.power_group[0].nss = 1; break; - case 4: /* 2 NSS 20 MHZ VHT */ - pcfg->param.power_ext.power_group[0]. - rate_format = MLAN_RATE_FORMAT_VHT; + case 4: /* 2 NSS 20 MHZ VHT */ + pcfg->param.power_ext.power_group[0] + .rate_format = MLAN_RATE_FORMAT_VHT; pcfg->param.power_ext.power_group[0].bandwidth = MLAN_HT_BW20; pcfg->param.power_ext.power_group[0].nss = 2; break; - case 5: /* 1 NSS 40 MHZ VHT */ - pcfg->param.power_ext.power_group[0]. - rate_format = MLAN_RATE_FORMAT_VHT; + case 5: /* 1 NSS 40 MHZ VHT */ + pcfg->param.power_ext.power_group[0] + .rate_format = MLAN_RATE_FORMAT_VHT; pcfg->param.power_ext.power_group[0].bandwidth = MLAN_HT_BW40; pcfg->param.power_ext.power_group[0].nss = 1; break; - case 6: /* 2 NSS 40 MHZ VHT */ - pcfg->param.power_ext.power_group[0]. - rate_format = MLAN_RATE_FORMAT_VHT; + case 6: /* 2 NSS 40 MHZ VHT */ + pcfg->param.power_ext.power_group[0] + .rate_format = MLAN_RATE_FORMAT_VHT; pcfg->param.power_ext.power_group[0].bandwidth = MLAN_HT_BW40; pcfg->param.power_ext.power_group[0].nss = 2; break; - case 7: /* 1 NSS 80 MHZ VHT */ - pcfg->param.power_ext.power_group[0]. - rate_format = MLAN_RATE_FORMAT_VHT; + case 7: /* 1 NSS 80 MHZ VHT */ + pcfg->param.power_ext.power_group[0] + .rate_format = MLAN_RATE_FORMAT_VHT; pcfg->param.power_ext.power_group[0].bandwidth = MLAN_VHT_BW80; pcfg->param.power_ext.power_group[0].nss = 1; break; - case 8: /* 2 NSS 80 MHZ VHT */ - pcfg->param.power_ext.power_group[0]. - rate_format = MLAN_RATE_FORMAT_VHT; + case 8: /* 2 NSS 80 MHZ VHT */ + pcfg->param.power_ext.power_group[0] + .rate_format = MLAN_RATE_FORMAT_VHT; pcfg->param.power_ext.power_group[0].bandwidth = MLAN_VHT_BW80; pcfg->param.power_ext.power_group[0].nss = 2; @@ -5694,13 +5659,13 @@ woal_priv_txpowercfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) moal_memcpy_ext(priv->phandle, respbuf, (t_u8 *)&pcfg->param.power_ext, sizeof(pcfg->param.power_ext.num_pwr_grp) + - (MIN - (pcfg->param.power_ext.num_pwr_grp, - MAX_POWER_GROUP) * sizeof(mlan_power_group)), + (MIN(pcfg->param.power_ext.num_pwr_grp, + MAX_POWER_GROUP) * + sizeof(mlan_power_group)), respbuflen); ret = sizeof(pcfg->param.power_ext.num_pwr_grp) + - (MIN(pcfg->param.power_ext.num_pwr_grp, MAX_POWER_GROUP) - * sizeof(mlan_power_group)); + (MIN(pcfg->param.power_ext.num_pwr_grp, MAX_POWER_GROUP) * + sizeof(mlan_power_group)); } done: if (status != MLAN_STATUS_PENDING) @@ -5718,10 +5683,9 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_priv_pscfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_pscfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { - int data[7] = { 0 }, ret = 0; + int data[7] = {0}, ret = 0; mlan_ds_pm_cfg *pm_cfg = NULL; mlan_ioctl_req *req = NULL; int allowed = 3; @@ -5731,8 +5695,8 @@ woal_priv_pscfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) ENTER(); - allowed++; /* For beacon missing timeout parameter */ - allowed += 2; /* For delay to PS and PS mode parameters */ + allowed++; /* For beacon missing timeout parameter */ + allowed += 2; /* For delay to PS and PS mode parameters */ req = woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_pm_cfg)); if (req == NULL) { ret = -ENOMEM; @@ -5766,17 +5730,17 @@ woal_priv_pscfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) ret = -EINVAL; goto done; } - if ((data[1] != MRVDRV_IGNORE_MULTIPLE_DTIM) - && (data[1] != MRVDRV_MATCH_CLOSEST_DTIM) - && ((data[1] < MRVDRV_MIN_MULTIPLE_DTIM) - || (data[1] > MRVDRV_MAX_MULTIPLE_DTIM))) { + if ((data[1] != MRVDRV_IGNORE_MULTIPLE_DTIM) && + (data[1] != MRVDRV_MATCH_CLOSEST_DTIM) && + ((data[1] < MRVDRV_MIN_MULTIPLE_DTIM) || + (data[1] > MRVDRV_MAX_MULTIPLE_DTIM))) { PRINTM(MERROR, "Invalid argument for multiple DTIM\n"); ret = -EINVAL; goto done; } - if ((data[2] < MRVDRV_MIN_LISTEN_INTERVAL) - && (data[2] != MRVDRV_LISTEN_INTERVAL_DISABLE)) { + if ((data[2] < MRVDRV_MIN_LISTEN_INTERVAL) && + (data[2] != MRVDRV_LISTEN_INTERVAL_DISABLE)) { PRINTM(MERROR, "Invalid argument for listen interval\n"); ret = -EINVAL; @@ -5801,8 +5765,9 @@ woal_priv_pscfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) goto done; } i++; - if ((data[i] != PS_MODE_UNCHANGED) && (data[i] != PS_MODE_AUTO) - && (data[i] != PS_MODE_POLL) && (data[i] != PS_MODE_NULL)) { + if ((data[i] != PS_MODE_UNCHANGED) && + (data[i] != PS_MODE_AUTO) && (data[i] != PS_MODE_POLL) && + (data[i] != PS_MODE_NULL)) { PRINTM(MERROR, "Invalid argument for PS mode\n"); ret = -EINVAL; goto done; @@ -5821,7 +5786,8 @@ woal_priv_pscfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) } moal_memcpy_ext(priv->phandle, data, &pm_cfg->param.ps_cfg, MIN((sizeof(int) * allowed), - sizeof(pm_cfg->param.ps_cfg)), sizeof(data)); + sizeof(pm_cfg->param.ps_cfg)), + sizeof(data)); moal_memcpy_ext(priv->phandle, respbuf, (t_u8 *)data, sizeof(int) * allowed, respbuflen); ret = sizeof(int) * allowed; @@ -5850,10 +5816,10 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_priv_bcntimeoutcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_bcntimeoutcfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { - int data[4] = { 0 }, ret = 0; + int data[4] = {0}, ret = 0; mlan_ds_pm_cfg *pm_cfg = NULL; mlan_ioctl_req *req = NULL; int allowed = 4; @@ -5918,8 +5884,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_priv_sleeppd(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_sleeppd(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; mlan_ds_pm_cfg *pm_cfg = NULL; @@ -5958,9 +5924,7 @@ woal_priv_sleeppd(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) if (user_data_len) { if ((data <= MAX_SLEEP_PERIOD && data >= MIN_SLEEP_PERIOD) || - (data == 0) - || (data == SLEEP_PERIOD_RESERVED_FF) - ) { + (data == 0) || (data == SLEEP_PERIOD_RESERVED_FF)) { req->action = MLAN_ACT_SET; pm_cfg->param.sleep_period = data; } else { @@ -5998,8 +5962,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_priv_txcontrol(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_txcontrol(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; mlan_ds_misc_cfg *misc_cfg = NULL; @@ -6071,8 +6035,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_priv_regrdwr(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_regrdwr(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data[3]; int ret = 0; @@ -6104,7 +6068,7 @@ woal_priv_regrdwr(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) } /* SET operation */ memset((char *)data, 0, sizeof(data)); - flag = (in_atomic() || irqs_disabled())? GFP_ATOMIC : GFP_KERNEL; + flag = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; arguments = kzalloc(strlen(respbuf) * sizeof(char), flag); if (arguments == NULL) { ret = -ENOMEM; @@ -6168,8 +6132,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_priv_rdeeprom(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_rdeeprom(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data[2]; int ret = 0; @@ -6240,8 +6204,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_priv_memrdwr(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_memrdwr(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data[2]; int ret = 0; @@ -6317,8 +6281,8 @@ done: * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static int -woal_priv_sdcmd52rw(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_sdcmd52rw(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { t_u8 rw = 0, func, data = 0; int buf[3], reg, ret = MLAN_STATUS_SUCCESS; @@ -6351,11 +6315,11 @@ woal_priv_sdcmd52rw(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) } reg = (t_u32)buf[1]; if (user_data_len == 2) { - rw = 0; /* CMD52 read */ + rw = 0; /* CMD52 read */ PRINTM(MINFO, "Cmd52 read, func=%d, reg=0x%08X\n", func, reg); } if (user_data_len == 3) { - rw = 1; /* CMD52 write */ + rw = 1; /* CMD52 write */ data = (t_u8)buf[2]; PRINTM(MINFO, "Cmd52 write, func=%d, reg=0x%08X, data=0x%02X\n", func, reg, data); @@ -6363,16 +6327,20 @@ woal_priv_sdcmd52rw(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) if (!rw) { #ifdef SDIO_MMC - sdio_claim_host(((struct sdio_mmc_card *)priv->phandle->card)-> - func); + sdio_claim_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); if (func) - data = sdio_readb(((struct sdio_mmc_card *)priv-> - phandle->card)->func, reg, &ret); + data = sdio_readb( + ((struct sdio_mmc_card *)priv->phandle->card) + ->func, + reg, &ret); else - data = sdio_f0_readb(((struct sdio_mmc_card *)priv-> - phandle->card)->func, reg, &ret); - sdio_release_host(((struct sdio_mmc_card *)priv->phandle-> - card)->func); + data = sdio_f0_readb( + ((struct sdio_mmc_card *)priv->phandle->card) + ->func, + reg, &ret); + sdio_release_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); if (ret) { PRINTM(MERROR, "sdio_readb: reading register 0x%X failed\n", @@ -6380,7 +6348,8 @@ woal_priv_sdcmd52rw(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) goto done; } #else - if (sdio_read_ioreg(priv->phandle->card, func, reg, &data) < 0) { + if (sdio_read_ioreg(priv->phandle->card, func, reg, &data) < + 0) { PRINTM(MERROR, "sdio_read_ioreg: reading register 0x%X failed\n", reg); @@ -6390,16 +6359,20 @@ woal_priv_sdcmd52rw(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) #endif /* SDIO_MMC */ } else { #ifdef SDIO_MMC - sdio_claim_host(((struct sdio_mmc_card *)priv->phandle->card)-> - func); + sdio_claim_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); if (func) - sdio_writeb(((struct sdio_mmc_card *)priv->phandle-> - card)->func, data, reg, &ret); + sdio_writeb( + ((struct sdio_mmc_card *)priv->phandle->card) + ->func, + data, reg, &ret); else - sdio_f0_writeb(((struct sdio_mmc_card *)priv->phandle-> - card)->func, data, reg, &ret); - sdio_release_host(((struct sdio_mmc_card *)priv->phandle-> - card)->func); + sdio_f0_writeb( + ((struct sdio_mmc_card *)priv->phandle->card) + ->func, + data, reg, &ret); + sdio_release_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); if (ret) { PRINTM(MERROR, "sdio_writeb: writing register 0x%X failed\n", @@ -6407,7 +6380,8 @@ woal_priv_sdcmd52rw(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) goto done; } #else - if (sdio_write_ioreg(priv->phandle->card, func, reg, data) < 0) { + if (sdio_write_ioreg(priv->phandle->card, func, reg, data) < + 0) { PRINTM(MERROR, "sdio_write_ioreg: writing register 0x%X failed\n", reg); @@ -6438,8 +6412,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_set_get_auto_arp(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_set_get_auto_arp(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data[4]; int user_data_len = 0; @@ -6461,8 +6435,8 @@ woal_priv_set_get_auto_arp(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* SET operation */ memset((char *)data, 0, sizeof(data)); parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_AUTO_ARP), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_AUTO_ARP), + data, ARRAY_SIZE(data), &user_data_len); } if (user_data_len > 1) { @@ -6496,8 +6470,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_deauth_ctrl(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_deauth_ctrl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ds_snmp_mib *cfg = NULL; mlan_ioctl_req *req = NULL; @@ -6563,8 +6537,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_per_pkt_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_per_pkt_cfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ds_misc_cfg *misc = NULL; mlan_ioctl_req *req = NULL; @@ -6600,7 +6574,7 @@ woal_priv_per_pkt_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* GET operation */ pos++; if (priv->tx_protocols.protocol_num) { - perpkt = (mlan_per_pkt_cfg *) pos; + perpkt = (mlan_per_pkt_cfg *)pos; perpkt->type = TLV_TYPE_PER_PKT_CFG; perpkt->tx_rx_control = TX_PKT_CTRL; perpkt->proto_type_num = @@ -6614,7 +6588,7 @@ woal_priv_per_pkt_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) pos += perpkt->len + MRVL_TLV_HEADER_SIZE; } if (priv->rx_protocols.protocol_num) { - perpkt = (mlan_per_pkt_cfg *) pos; + perpkt = (mlan_per_pkt_cfg *)pos; perpkt->type = TLV_TYPE_PER_PKT_CFG; perpkt->tx_rx_control = RX_PKT_INFO; perpkt->proto_type_num = @@ -6635,19 +6609,19 @@ woal_priv_per_pkt_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) pos++; left_len--; while (*pos == TLV_TYPE_PER_PKT_CFG && (left_len > 2)) { - perpkt = (mlan_per_pkt_cfg *) pos; + perpkt = (mlan_per_pkt_cfg *)pos; if (perpkt->tx_rx_control & TX_PKT_CTRL) { priv->tx_protocols.protocol_num = perpkt->proto_type_num; if (perpkt->proto_type_num <= MAX_NUM_ETHER_TYPE) - moal_memcpy_ext(priv->phandle, - priv->tx_protocols. - protocols, - perpkt->ether_type, - perpkt->proto_type_num * + moal_memcpy_ext( + priv->phandle, + priv->tx_protocols.protocols, + perpkt->ether_type, + perpkt->proto_type_num * sizeof(t_u16), - MAX_NUM_ETHER_TYPE * + MAX_NUM_ETHER_TYPE * sizeof(t_u16)); } if (perpkt->tx_rx_control & RX_PKT_INFO) { @@ -6655,13 +6629,13 @@ woal_priv_per_pkt_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) perpkt->proto_type_num; if (perpkt->proto_type_num <= MAX_NUM_ETHER_TYPE) - moal_memcpy_ext(priv->phandle, - priv->rx_protocols. - protocols, - perpkt->ether_type, - perpkt->proto_type_num * + moal_memcpy_ext( + priv->phandle, + priv->rx_protocols.protocols, + perpkt->ether_type, + perpkt->proto_type_num * sizeof(t_u16), - MAX_NUM_ETHER_TYPE * + MAX_NUM_ETHER_TYPE * sizeof(t_u16)); } if (!perpkt->tx_rx_control) { @@ -6700,8 +6674,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_get_chnrgpwr(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_get_chnrgpwr(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -6747,8 +6721,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_get_txpwrlimit(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_get_txpwrlimit(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -6760,9 +6734,9 @@ woal_priv_get_txpwrlimit(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) ENTER(); header_len = strlen(PRIV_CMD_GET_TXPWR_LIMIT); - trpc_cfg = (mlan_ds_misc_chan_trpc_cfg *) (respbuf + header_len); - if ((trpc_cfg->sub_band != 0) && (trpc_cfg->sub_band != 0x10) - && (trpc_cfg->sub_band != 0x11) && (trpc_cfg->sub_band != 0x12)) { + trpc_cfg = (mlan_ds_misc_chan_trpc_cfg *)(respbuf + header_len); + if ((trpc_cfg->sub_band != 0) && (trpc_cfg->sub_band != 0x10) && + (trpc_cfg->sub_band != 0x11) && (trpc_cfg->sub_band != 0x12)) { PRINTM(MERROR, "Invalid subband=0x%x\n", trpc_cfg->sub_band); ret = -EINVAL; goto done; @@ -6783,11 +6757,12 @@ woal_priv_get_txpwrlimit(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) goto done; } ret = header_len + sizeof(t_u16) + sizeof(t_u16) + - misc->param.trpc_cfg.length; + misc->param.trpc_cfg.length; pos = respbuf + header_len; moal_memcpy_ext(priv->phandle, pos, &misc->param.trpc_cfg, sizeof(t_u16) + sizeof(t_u16) + - misc->param.trpc_cfg.length, respbuflen - header_len); + misc->param.trpc_cfg.length, + respbuflen - header_len); done: if (status != MLAN_STATUS_PENDING) kfree(req); @@ -6805,8 +6780,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_getcfgchanlist(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_getcfgchanlist(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; int num_chan = 0; @@ -6823,7 +6798,7 @@ woal_priv_getcfgchanlist(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) ret = -EFAULT; goto done; } - plist = (wlan_ieee80211_chan_list *) respbuf; + plist = (wlan_ieee80211_chan_list *)respbuf; sband = wiphy->bands[NL80211_BAND_2GHZ]; if (sband) { num_chan += sband->n_channels; @@ -6855,7 +6830,7 @@ woal_priv_getcfgchanlist(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) } plist->num_chan = num_chan; ret = sizeof(wlan_ieee80211_chan_list) + - sizeof(wlan_ieee80211_chan) * num_chan; + sizeof(wlan_ieee80211_chan) * num_chan; done: LEAVE(); return ret; @@ -6871,9 +6846,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_get_rx_tx_histogram(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +static int woal_priv_get_rx_tx_histogram(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -6885,7 +6859,7 @@ woal_priv_get_rx_tx_histogram(moal_private *priv, t_u8 *respbuf, ENTER(); header_len = strlen(PRIV_CMD_TX_RX_HISTOGRAM); - tx_rx_info = (tx_rx_histogram *) (respbuf + header_len); + tx_rx_info = (tx_rx_histogram *)(respbuf + header_len); if (tx_rx_info->enable > 2 || (tx_rx_info->enable == GET_TX_RX_HISTOGRAM && (tx_rx_info->action > 3 || tx_rx_info->action <= 0))) { @@ -6926,10 +6900,10 @@ woal_priv_get_rx_tx_histogram(moal_private *priv, t_u8 *respbuf, respbuflen - (header_len + 2 * sizeof(t_u8))); ret += sizeof(misc->param.tx_rx_histogram.size); pos += sizeof(misc->param.tx_rx_histogram.size); - moal_memcpy_ext(priv->phandle, pos, - &misc->param.tx_rx_histogram.value, - misc->param.tx_rx_histogram.size, - respbuflen - (header_len + 2 * sizeof(t_u8)) - + moal_memcpy_ext( + priv->phandle, pos, &misc->param.tx_rx_histogram.value, + misc->param.tx_rx_histogram.size, + respbuflen - (header_len + 2 * sizeof(t_u8)) - sizeof(misc->param.tx_rx_histogram.size)); ret += misc->param.tx_rx_histogram.size; } @@ -6950,8 +6924,7 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_priv_hotspotcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_hotspotcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -7007,7 +6980,6 @@ done: kfree(req); LEAVE(); return ret; - } /** @@ -7019,9 +6991,8 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_priv_mgmt_frame_passthru_ctrl(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +int woal_priv_mgmt_frame_passthru_ctrl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; int data = 0; @@ -7054,9 +7025,9 @@ woal_priv_mgmt_frame_passthru_ctrl(moal_private *priv, t_u8 *respbuf, req->req_id = MLAN_IOCTL_MISC_CFG; mgmt_cfg->sub_command = MLAN_OID_MISC_RX_MGMT_IND; - if (user_data_len == 0) { /* Get */ + if (user_data_len == 0) { /* Get */ req->action = MLAN_ACT_GET; - } else { /* Set */ + } else { /* Set */ mgmt_cfg->param.mgmt_subtype_mask = data; req->action = MLAN_ACT_SET; } @@ -7078,7 +7049,6 @@ done: kfree(req); LEAVE(); return ret; - } /** @@ -7116,9 +7086,8 @@ done: * * @return Number of bytes written if successful else negative value */ -static int -woal_priv_wmm_addts_req_ioctl(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +static int woal_priv_wmm_addts_req_ioctl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_wmm_cfg *cfg = NULL; @@ -7150,8 +7119,7 @@ woal_priv_wmm_addts_req_ioctl(moal_private *priv, t_u8 *respbuf, cfg->param.addts.ie_data_len = addts_ioctl.ie_data_len; moal_memcpy_ext(priv->phandle, cfg->param.addts.ie_data, - addts_ioctl.ie_data, - cfg->param.addts.ie_data_len, + addts_ioctl.ie_data, cfg->param.addts.ie_data_len, MLAN_WMM_TSPEC_SIZE + MLAN_WMM_ADDTS_EXTRA_IE_BYTES); status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); @@ -7164,13 +7132,11 @@ woal_priv_wmm_addts_req_ioctl(moal_private *priv, t_u8 *respbuf, addts_ioctl.ie_data_len = cfg->param.addts.ie_data_len; moal_memcpy_ext(priv->phandle, addts_ioctl.ie_data, - cfg->param.addts.ie_data, - cfg->param.addts.ie_data_len, + cfg->param.addts.ie_data, cfg->param.addts.ie_data_len, MLAN_WMM_TSPEC_SIZE + MLAN_WMM_ADDTS_EXTRA_IE_BYTES); - copy_len = (sizeof(addts_ioctl) - - sizeof(addts_ioctl.ie_data) - + cfg->param.addts.ie_data_len); + copy_len = (sizeof(addts_ioctl) - sizeof(addts_ioctl.ie_data) + + cfg->param.addts.ie_data_len); moal_memcpy_ext(priv->phandle, respbuf, (t_u8 *)&addts_ioctl, copy_len, respbuflen); @@ -7204,9 +7170,8 @@ done: * * @return Number of bytes written if successful else negative value */ -static int -woal_priv_wmm_delts_req_ioctl(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +static int woal_priv_wmm_delts_req_ioctl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_wmm_cfg *cfg = NULL; @@ -7251,7 +7216,8 @@ woal_priv_wmm_delts_req_ioctl(moal_private *priv, t_u8 *respbuf, goto done; } - /* Return the firmware command result back to the application layer */ + /* Return the firmware command result back to the application + * layer */ delts_ioctl.cmd_result = cfg->param.delts.result; copy_len = sizeof(delts_ioctl); moal_memcpy_ext(priv->phandle, respbuf, (t_u8 *)&delts_ioctl, @@ -7278,8 +7244,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_priv_qconfig(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_qconfig(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_wmm_cfg *pwmm = NULL; @@ -7322,8 +7288,8 @@ woal_priv_qconfig(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) qcfg_ioctl.msdu_lifetime_expiry = pqcfg->msdu_lifetime_expiry; moal_memcpy_ext(priv->phandle, data_ptr, (t_u8 *)&qcfg_ioctl, sizeof(qcfg_ioctl), - respbuflen - (strlen(CMD_NXP) + - strlen(PRIV_CMD_QCONFIG))); + respbuflen - + (strlen(CMD_NXP) + strlen(PRIV_CMD_QCONFIG))); ret = strlen(CMD_NXP) + strlen(PRIV_CMD_QCONFIG) + sizeof(qcfg_ioctl); done: if (status != MLAN_STATUS_PENDING) @@ -7349,9 +7315,8 @@ done: * * @return Number of bytes written if successful else negative value */ -static int -woal_priv_wmm_queue_status_ioctl(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +static int woal_priv_wmm_queue_status_ioctl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_wmm_cfg *pwmm = NULL; @@ -7404,9 +7369,8 @@ done: * * @return Number of bytes written if successful else negative value */ -static int -woal_priv_wmm_ts_status_ioctl(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +static int woal_priv_wmm_ts_status_ioctl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_wmm_cfg *pwmm = NULL; @@ -7467,8 +7431,7 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_macctrl(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_macctrl(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int data = 0; mlan_ioctl_req *req = NULL; @@ -7536,8 +7499,7 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_priv_getwap(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_getwap(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int ret = 0; #ifdef STA_SUPPORT @@ -7586,8 +7548,7 @@ woal_priv_getwap(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) * * @return Number of bytes written, negative for failure. */ -int -woal_priv_region_code(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_region_code(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int data = 0; mlan_ioctl_req *req = NULL; @@ -7656,9 +7617,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_rx_pkt_coalesce_cfg(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +int woal_priv_rx_pkt_coalesce_cfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; t_u32 data[2]; @@ -7717,9 +7677,10 @@ woal_priv_rx_pkt_coalesce_cfg(moal_private *priv, t_u8 *respbuf, goto done; } - moal_memcpy_ext(priv->phandle, respbuf, - (mlan_ds_misc_rx_packet_coalesce *)&cfg->param. - rx_coalesce, req->buf_len, respbuflen); + moal_memcpy_ext( + priv->phandle, respbuf, + (mlan_ds_misc_rx_packet_coalesce *)&cfg->param.rx_coalesce, + req->buf_len, respbuflen); ret = req->buf_len; done: @@ -7736,8 +7697,7 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_priv_fwmacaddr(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_fwmacaddr(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { t_u8 data[ETH_ALEN]; int ret = 0; @@ -7803,8 +7763,7 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_priv_offchannel(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_offchannel(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int data[4]; int ret = 0; @@ -7823,11 +7782,12 @@ woal_priv_offchannel(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) if (priv->phandle->remain_on_channel) ret = sprintf(respbuf, "There is pending remain on channel from bss %d\n", - priv->phandle->remain_bss_index) + 1; + priv->phandle->remain_bss_index) + + 1; else ret = sprintf(respbuf, - "There is no pending remain on channel\n") - + 1; + "There is no pending remain on channel\n") + + 1; goto done; } else parse_arguments(respbuf + header_len, data, ARRAY_SIZE(data), @@ -7873,9 +7833,8 @@ woal_priv_offchannel(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) if (user_data_len == 4) { if (data[3] && (data[3] != CHANNEL_BW_40MHZ_ABOVE) && - (data[3] != CHANNEL_BW_40MHZ_BELOW) - && (data[3] != CHANNEL_BW_80MHZ) - ) { + (data[3] != CHANNEL_BW_40MHZ_BELOW) && + (data[3] != CHANNEL_BW_80MHZ)) { PRINTM(MERROR, "invalid bandwidth"); ret = -EINVAL; goto done; @@ -7900,12 +7859,13 @@ woal_priv_offchannel(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) if (data[0] == 0) { if (!priv->phandle->remain_on_channel) { ret = sprintf(respbuf, - "There is no pending remain on channel to be canceled\n") - + 1; + "There is no pending remain on channel to be canceled\n") + + 1; goto done; } - if (woal_cfg80211_remain_on_channel_cfg - (priv, MOAL_IOCTL_WAIT, MTRUE, &status, NULL, 0, 0)) { + if (woal_cfg80211_remain_on_channel_cfg(priv, MOAL_IOCTL_WAIT, + MTRUE, &status, NULL, 0, + 0)) { PRINTM(MERROR, "remain_on_channel: Failed to cancel\n"); ret = -EFAULT; goto done; @@ -7913,22 +7873,20 @@ woal_priv_offchannel(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) if (status == MLAN_STATUS_SUCCESS) priv->phandle->remain_on_channel = MFALSE; } else if (data[0] == 1) { - if (woal_cfg80211_remain_on_channel_cfg - (priv, MOAL_IOCTL_WAIT, MFALSE, &status, - ieee80211_get_channel(priv->wdev->wiphy, - ieee80211_channel_to_frequency(data - [1] + if (woal_cfg80211_remain_on_channel_cfg( + priv, MOAL_IOCTL_WAIT, MFALSE, &status, + ieee80211_get_channel( + priv->wdev->wiphy, + ieee80211_channel_to_frequency( + data[1] #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) - , - (data - [1] - <= - 14 ? - IEEE80211_BAND_2GHZ - : - IEEE80211_BAND_5GHZ) + , + (data[1] <= 14 ? + IEEE80211_BAND_2GHZ : + IEEE80211_BAND_5GHZ) #endif - )), chan_type, (t_u32)data[2])) { + )), + chan_type, (t_u32)data[2])) { PRINTM(MERROR, "remain_on_channel: Failed to start\n"); ret = -EFAULT; goto done; @@ -7960,8 +7918,8 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_priv_set_get_dscp_map(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_set_get_dscp_map(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = MLAN_STATUS_SUCCESS; t_u8 *pos = NULL; @@ -7995,8 +7953,8 @@ woal_priv_set_get_dscp_map(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) * * @return Number of bytes written, negative for failure. */ -int -woal_priv_get_driver_verext(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_get_driver_verext(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data = 0; mlan_ds_get_info *info = NULL; @@ -8076,8 +8034,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_enter_usb_suspend(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_enter_usb_suspend(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; @@ -8099,8 +8057,8 @@ woal_priv_enter_usb_suspend(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_exit_usb_suspend(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_exit_usb_suspend(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; @@ -8125,8 +8083,8 @@ woal_priv_exit_usb_suspend(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_radio_ctrl(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_radio_ctrl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0, option = 0; int user_data_len = 0, header_len = 0; @@ -8184,8 +8142,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_wmm_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_wmm_cfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data = 0; mlan_ds_wmm_cfg *wmm = NULL; @@ -8259,9 +8217,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_min_ba_threshold_cfg(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +static int woal_priv_min_ba_threshold_cfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data = 0; mlan_ds_11n_cfg *cfg_11n = NULL; @@ -8334,8 +8291,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_11d_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_11d_cfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data = 0; mlan_ds_11d_cfg *pcfg_11d = NULL; @@ -8408,8 +8365,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_priv_11d_clr_chan_tbl(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_11d_clr_chan_tbl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ds_11d_cfg *pcfg_11d = NULL; mlan_ioctl_req *req = NULL; @@ -8461,8 +8418,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_wws_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_wws_cfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data = 0; mlan_ds_misc_cfg *wws = NULL; @@ -8535,8 +8492,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_set_get_reassoc(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_set_get_reassoc(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { moal_handle *handle = priv->phandle; int data = 0; @@ -8564,8 +8521,8 @@ woal_priv_set_get_reassoc(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) priv->reassoc_required = MFALSE; if (!handle->reassoc_on && handle->is_reassoc_timer_set == MTRUE) { - woal_cancel_timer(&handle-> - reassoc_timer); + woal_cancel_timer( + &handle->reassoc_timer); handle->is_reassoc_timer_set = MFALSE; } } else if (data == 1) { @@ -8595,8 +8552,8 @@ woal_priv_set_get_reassoc(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_txbuf_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_txbuf_cfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ds_11n_cfg *cfg_11n = NULL; mlan_ioctl_req *req = NULL; @@ -8655,8 +8612,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_auth_type(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_auth_type(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int auth_type = 0; t_u32 auth_mode; @@ -8687,8 +8644,8 @@ woal_priv_auth_type(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) if (user_data_len == 1) { PRINTM(MINFO, "SET: auth_type %d\n", auth_type); if (((auth_type < MLAN_AUTH_MODE_OPEN) || - (auth_type > MLAN_AUTH_MODE_SAE)) - && (auth_type != MLAN_AUTH_MODE_AUTO)) { + (auth_type > MLAN_AUTH_MODE_SAE)) && + (auth_type != MLAN_AUTH_MODE_AUTO)) { ret = -EINVAL; goto done; } @@ -8720,9 +8677,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_11h_local_pwr_constraint(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +static int woal_priv_11h_local_pwr_constraint(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data = 0; mlan_ds_11h_cfg *ds_11hcfg = NULL; @@ -8791,8 +8747,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_ht_stream_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_ht_stream_cfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data = 0; mlan_ds_11n_cfg *cfg = NULL; @@ -8864,10 +8820,10 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_mimo_switch(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_mimo_switch(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { - int data[2] = { 0 }; + int data[2] = {0}; mlan_ds_radio_cfg *radio = NULL; mlan_ioctl_req *req = NULL; int ret = 0; @@ -8927,8 +8883,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_thermal(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_thermal(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ds_misc_cfg *cfg = NULL; mlan_ioctl_req *req = NULL; @@ -8983,8 +8939,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_beacon_interval(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_beacon_interval(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data = 0; mlan_ds_bss *bss = NULL; @@ -9057,13 +9013,13 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_get_signal(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_get_signal(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { /** Input data size */ -#define IN_DATA_SIZE 2 +#define IN_DATA_SIZE 2 /** Output data size */ -#define OUT_DATA_SIZE 12 +#define OUT_DATA_SIZE 12 int ret = 0; int in_data[IN_DATA_SIZE]; int out_data[OUT_DATA_SIZE]; @@ -9099,15 +9055,15 @@ woal_priv_get_signal(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) } switch (user_data_len) { - case 0: /* No checking, get everything */ + case 0: /* No checking, get everything */ break; - case 2: /* Check subtype range */ + case 2: /* Check subtype range */ if (in_data[1] < 1 || in_data[1] > 4) { ret = -EINVAL; goto done; } /* Fall through */ - case 1: /* Check type range */ + case 1: /* Check type range */ if (in_data[0] < 1 || in_data[0] > 3) { ret = -EINVAL; goto done; @@ -9139,7 +9095,7 @@ woal_priv_get_signal(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* Check type */ switch (in_data[0]) { - case 0: /* Send everything */ + case 0: /* Send everything */ out_data[data_length++] = signal.bcn_rssi_last; out_data[data_length++] = signal.bcn_rssi_avg; out_data[data_length++] = signal.data_rssi_last; @@ -9153,75 +9109,75 @@ woal_priv_get_signal(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) out_data[data_length++] = signal.data_nf_last; out_data[data_length++] = signal.data_nf_avg; break; - case 1: /* RSSI */ + case 1: /* RSSI */ /* Check subtype */ switch (in_data[1]) { - case 0: /* Everything */ + case 0: /* Everything */ out_data[data_length++] = signal.bcn_rssi_last; out_data[data_length++] = signal.bcn_rssi_avg; out_data[data_length++] = signal.data_rssi_last; out_data[data_length++] = signal.data_rssi_avg; break; - case 1: /* bcn last */ + case 1: /* bcn last */ out_data[data_length++] = signal.bcn_rssi_last; break; - case 2: /* bcn avg */ + case 2: /* bcn avg */ out_data[data_length++] = signal.bcn_rssi_avg; break; - case 3: /* data last */ + case 3: /* data last */ out_data[data_length++] = signal.data_rssi_last; break; - case 4: /* data avg */ + case 4: /* data avg */ out_data[data_length++] = signal.data_rssi_avg; break; default: break; } break; - case 2: /* SNR */ + case 2: /* SNR */ /* Check subtype */ switch (in_data[1]) { - case 0: /* Everything */ + case 0: /* Everything */ out_data[data_length++] = signal.bcn_snr_last; out_data[data_length++] = signal.bcn_snr_avg; out_data[data_length++] = signal.data_snr_last; out_data[data_length++] = signal.data_snr_avg; break; - case 1: /* bcn last */ + case 1: /* bcn last */ out_data[data_length++] = signal.bcn_snr_last; break; - case 2: /* bcn avg */ + case 2: /* bcn avg */ out_data[data_length++] = signal.bcn_snr_avg; break; - case 3: /* data last */ + case 3: /* data last */ out_data[data_length++] = signal.data_snr_last; break; - case 4: /* data avg */ + case 4: /* data avg */ out_data[data_length++] = signal.data_snr_avg; break; default: break; } break; - case 3: /* NF */ + case 3: /* NF */ /* Check subtype */ switch (in_data[1]) { - case 0: /* Everything */ + case 0: /* Everything */ out_data[data_length++] = signal.bcn_nf_last; out_data[data_length++] = signal.bcn_nf_avg; out_data[data_length++] = signal.data_nf_last; out_data[data_length++] = signal.data_nf_avg; break; - case 1: /* bcn last */ + case 1: /* bcn last */ out_data[data_length++] = signal.bcn_nf_last; break; - case 2: /* bcn avg */ + case 2: /* bcn avg */ out_data[data_length++] = signal.bcn_nf_avg; break; - case 3: /* data last */ + case 3: /* data last */ out_data[data_length++] = signal.data_nf_last; break; - case 4: /* data avg */ + case 4: /* data avg */ out_data[data_length++] = signal.data_nf_avg; break; default: @@ -9241,8 +9197,7 @@ done: return ret; } -static int -woal_signal_ext_enable(moal_private *priv, t_u8 enable) +static int woal_signal_ext_enable(moal_private *priv, t_u8 enable) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -9285,14 +9240,14 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_get_signal_ext(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_get_signal_ext(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { -#define PATH_SIZE 13 +#define PATH_SIZE 13 int ret = 0; int data = 0, path = 0, data_len = 0; int user_data_len = 0, header_len = 0; - int out_data[PATH_SIZE * MAX_PATH_NUM] = { 0 }; + int out_data[PATH_SIZE * MAX_PATH_NUM] = {0}; mlan_ioctl_req *req = NULL; mlan_ds_get_info *info = NULL; mlan_ds_get_signal signal_get[MAX_PATH_NUM]; @@ -9333,7 +9288,7 @@ woal_priv_get_signal_ext(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) goto done; } - /** Enable signalext feature in firmware */ + /** Enable signalext feature in firmware */ if (MLAN_STATUS_SUCCESS != woal_signal_ext_enable(priv, enable)) { ret = -EFAULT; goto done; @@ -9415,9 +9370,10 @@ woal_priv_get_signal_ext(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) out_data[data_len++] = (int)signal_get[path].data_nf_last; out_data[data_len++] = (int)signal_get[path].data_nf_avg; } - moal_memcpy_ext(priv->phandle, respbuf, out_data, - (MIN((PATH_SIZE * MAX_PATH_NUM), data_len) * - sizeof(int)), respbuflen); + moal_memcpy_ext( + priv->phandle, respbuf, out_data, + (MIN((PATH_SIZE * MAX_PATH_NUM), data_len) * sizeof(int)), + respbuflen); ret = data_len * sizeof(int); done: if (status != MLAN_STATUS_PENDING) @@ -9435,14 +9391,14 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_get_signal_ext_v2(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_get_signal_ext_v2(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { -#define PATH_SIZE 13 +#define PATH_SIZE 13 int ret = 0; int data = 0, path = 0, data_len = 0; int user_data_len = 0, header_len = 0; - int out_data[PATH_SIZE * MAX_PATH_NUM] = { 0 }; + int out_data[PATH_SIZE * MAX_PATH_NUM] = {0}; mlan_ioctl_req *req = NULL; mlan_ds_get_info *info = NULL; mlan_ds_get_signal signal_get[MAX_PATH_NUM]; @@ -9556,9 +9512,10 @@ woal_priv_get_signal_ext_v2(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) out_data[data_len++] = (int)signal_get[path].data_nf_last; out_data[data_len++] = (int)signal_get[path].data_nf_avg; } - moal_memcpy_ext(priv->phandle, respbuf, out_data, - (MIN((PATH_SIZE * MAX_PATH_NUM), data_len) * - sizeof(int)), respbuflen); + moal_memcpy_ext( + priv->phandle, respbuf, out_data, + (MIN((PATH_SIZE * MAX_PATH_NUM), data_len) * sizeof(int)), + respbuflen); ret = data_len * sizeof(int); done: if (status != MLAN_STATUS_PENDING) @@ -9576,8 +9533,8 @@ done: * * @return The result of this processing. */ -static int -woal_priv_signalext_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_signalext_cfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int enable = 0; int ret = 0; @@ -9620,10 +9577,10 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_priv_set_get_pmfcfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_set_get_pmfcfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { - int data[2] = { 0, 0 }; + int data[2] = {0, 0}; mlan_ioctl_req *req = NULL; mlan_ds_misc_cfg *cfg = NULL; mlan_ds_misc_pmfcfg *pmfcfg; @@ -9699,9 +9656,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_inactivity_timeout_ext(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +static int woal_priv_inactivity_timeout_ext(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data[4]; mlan_ioctl_req *req = NULL; @@ -9787,9 +9743,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_11n_amsdu_aggr_ctrl(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +static int woal_priv_11n_amsdu_aggr_ctrl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_11n_cfg *cfg_11n = NULL; @@ -9856,8 +9811,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_tx_bf_cap_ioctl(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_tx_bf_cap_ioctl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_11n_cfg *bf_cfg = NULL; @@ -9925,8 +9880,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_sdio_clock_ioctl(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_sdio_clock_ioctl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; int data = 2; @@ -9985,8 +9940,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_sdio_mpa_ctrl(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_sdio_mpa_ctrl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -10103,24 +10058,22 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_sleep_params_ioctl(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +static int woal_priv_sleep_params_ioctl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; mlan_ioctl_req *req = NULL; mlan_ds_pm_cfg *pm = NULL; mlan_ds_sleep_params *psleep_params = NULL; - int data[6] = { 0 }, i; + int data[6] = {0}, i; int user_data_len = 0, header_len = 0; #ifdef DEBUG_LEVEL1 - char err_str[][36] = { {"sleep clock error in ppm"}, - {"wakeup offset in usec"}, - {"clock stabilization time in usec"}, - {"control periodic calibration(0-2)"}, - {"control of external sleepClock(0-2)"}, - {"value of reserved for debug"} - }; + char err_str[][36] = {{"sleep clock error in ppm"}, + {"wakeup offset in usec"}, + {"clock stabilization time in usec"}, + {"control periodic calibration(0-2)"}, + {"control of external sleepClock(0-2)"}, + {"value of reserved for debug"}}; #endif mlan_status status = MLAN_STATUS_SUCCESS; @@ -10220,8 +10173,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_dfs_testing(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_dfs_testing(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_11h_cfg *ds_11hcfg = NULL; @@ -10316,6 +10269,89 @@ done: return ret; } +/** + * @brief Set/Get DFS W53 settings + * + * @param priv Pointer to moal_private structure + * @param respbuf Pointer to response buffer + * @param resplen Response buffer length + * + * @return Number of bytes written, negative for failure. + */ +static int woal_priv_dfs53cfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) +{ + mlan_ioctl_req *req = NULL; + mlan_ds_11h_cfg *ds_11hcfg = NULL; + int ret = 0; + int data; + int user_data_len = 0, header_len = 0; + mlan_status status = MLAN_STATUS_SUCCESS; + + ENTER(); + + header_len = strlen(CMD_NXP) + strlen(PRIV_CMD_DFS53_CFG); + /* Allocate an IOCTL request buffer */ + req = woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_11h_cfg)); + if (req == NULL) { + ret = -ENOMEM; + goto done; + } + + /* Fill request buffer */ + ds_11hcfg = (mlan_ds_11h_cfg *)req->pbuf; + ds_11hcfg->sub_command = MLAN_OID_11H_DFS_W53_CFG; + req->req_id = MLAN_IOCTL_11H_CFG; + + if (strlen(respbuf) == header_len) { + /* GET operation */ + user_data_len = 0; + req->action = MLAN_ACT_GET; + } else { + /* SET operation */ + parse_arguments(respbuf + header_len, &data, + sizeof(data) / sizeof(int), &user_data_len); + if (user_data_len != 1) { + PRINTM(MERROR, "Invalid number of args !\n"); + ret = -EINVAL; + goto done; + } + if (data > DFS_W53_OLD) { + PRINTM(MERROR, "Invalid config !\n"); + ret = -EINVAL; + goto done; + } + + ds_11hcfg->param.dfs_w53_cfg.dfs53cfg = (t_u8)data; + req->action = MLAN_ACT_SET; + } + + /* Send IOCTL request to MLAN */ + status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); + if (status != MLAN_STATUS_SUCCESS) { + ret = -EFAULT; + goto done; + } + + if (!user_data_len) { + moal_memcpy_ext(priv->phandle, respbuf, + (t_u8 *)&ds_11hcfg->param.dfs_w53_cfg.dfs53cfg, + sizeof(ds_11hcfg->param.dfs_w53_cfg.dfs53cfg), + respbuflen); + ret = sizeof(t_u8); + } + + PRINTM(MIOCTL, "dfs w53 cfg %d\n", + ds_11hcfg->param.dfs_w53_cfg.dfs53cfg); + +done: + if (status != MLAN_STATUS_PENDING) + kfree(req); + + LEAVE(); + return ret; +} + /** * @brief Set/Get CFP table codes * @@ -10325,8 +10361,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_cfp_code(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_cfp_code(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; int user_data_len = 0, header_len = 0; @@ -10404,14 +10440,14 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_set_get_tx_rx_ant(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_set_get_tx_rx_ant(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; int user_data_len = 0, header_len = 0; mlan_ds_radio_cfg *radio = NULL; mlan_ioctl_req *req = NULL; - int data[3] = { 0 }; + int data[3] = {0}; mlan_status status = MLAN_STATUS_SUCCESS; #if defined(STA_CFG80211) || defined(UAP_CFG80211) struct wiphy *wiphy = priv->phandle->wiphy; @@ -10450,86 +10486,85 @@ woal_priv_set_get_tx_rx_ant(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) #if defined(STA_CFG80211) || defined(UAP_CFG80211) if (IS_CARD9098(priv->phandle->card_type) || IS_CARD9097(priv->phandle->card_type)) { - if (IS_STA_OR_UAP_CFG80211 - (priv->phandle->params.cfg80211_wext) && + if (IS_STA_OR_UAP_CFG80211( + priv->phandle->params + .cfg80211_wext) && wiphy) { if (wiphy->bands[IEEE80211_BAND_2GHZ]) { - if (((radio->param.ant_cfg. - tx_antenna & 0xFF) != 3 && - (radio->param.ant_cfg. - tx_antenna & 0xFF) != 0) - || - ((radio->param.ant_cfg. - rx_antenna & 0xFF) != 3 && - (radio->param.ant_cfg. - tx_antenna & 0xFF) != 0)) - wiphy->bands - [IEEE80211_BAND_2GHZ]-> - ht_cap.mcs. - rx_mask[1] = 0; - else if ((radio->param.ant_cfg. - tx_antenna & 0xFF) == - 3 || - (radio->param.ant_cfg. - rx_antenna & 0xFF) == - 3) - wiphy->bands - [IEEE80211_BAND_2GHZ]-> - ht_cap.mcs. - rx_mask[1] = + if (((radio->param.ant_cfg + .tx_antenna & + 0xFF) != 3 && + (radio->param.ant_cfg + .tx_antenna & + 0xFF) != 0) || + ((radio->param.ant_cfg + .rx_antenna & + 0xFF) != 3 && + (radio->param.ant_cfg + .rx_antenna & + 0xFF) != 0)) + wiphy->bands[IEEE80211_BAND_2GHZ] + ->ht_cap.mcs + .rx_mask[1] = 0; + else if ((radio->param.ant_cfg + .tx_antenna & + 0xFF) == 3 || + (radio->param.ant_cfg + .rx_antenna & + 0xFF) == 3) + wiphy->bands[IEEE80211_BAND_2GHZ] + ->ht_cap.mcs + .rx_mask[1] = 0xff; - wiphy->bands - [IEEE80211_BAND_2GHZ]-> - ht_cap.mcs.rx_mask[4] = + wiphy->bands[IEEE80211_BAND_2GHZ] + ->ht_cap.mcs.rx_mask[4] = 0; } if (wiphy->bands[IEEE80211_BAND_5GHZ]) { - if (((radio->param.ant_cfg. - tx_antenna & 0xFF00) != 3 - && (radio->param.ant_cfg. - tx_antenna & 0xFF00) != - 0) || - ((radio->param.ant_cfg. - rx_antenna & 0xFF00) != 3 - && (radio->param.ant_cfg. - tx_antenna & 0xFF00) != - 0)) { - wiphy->bands - [IEEE80211_BAND_5GHZ]-> - ht_cap.mcs. - rx_mask[1] = 0; - wiphy->bands - [IEEE80211_BAND_5GHZ]-> - vht_cap.vht_mcs. - rx_mcs_map = + if (((radio->param.ant_cfg + .tx_antenna & + 0xFF00) != 0x300 && + (radio->param.ant_cfg + .tx_antenna & + 0xFF00) != 0) || + ((radio->param.ant_cfg + .rx_antenna & + 0xFF00) != 0x300 && + (radio->param.ant_cfg + .rx_antenna & + 0xFF00) != 0)) { + wiphy->bands[IEEE80211_BAND_5GHZ] + ->ht_cap.mcs + .rx_mask[1] = 0; + wiphy->bands[IEEE80211_BAND_5GHZ] + ->vht_cap + .vht_mcs + .rx_mcs_map = 0xfffe; - wiphy->bands - [IEEE80211_BAND_5GHZ]-> - vht_cap.vht_mcs. - tx_mcs_map = + wiphy->bands[IEEE80211_BAND_5GHZ] + ->vht_cap + .vht_mcs + .tx_mcs_map = 0xfffe; - } else if ((radio->param. - ant_cfg. - tx_antenna & 0xFF00) - == 3 || - (radio->param. - ant_cfg. - rx_antenna & 0xFF00) - == 3) { - wiphy->bands - [IEEE80211_BAND_5GHZ]-> - ht_cap.mcs. - rx_mask[1] = + } else if ((radio->param.ant_cfg + .tx_antenna & + 0xFF00) == 0x300 || + (radio->param.ant_cfg + .rx_antenna & + 0xFF00) == 0x300) { + wiphy->bands[IEEE80211_BAND_5GHZ] + ->ht_cap.mcs + .rx_mask[1] = 0xff; - wiphy->bands - [IEEE80211_BAND_5GHZ]-> - vht_cap.vht_mcs. - rx_mcs_map = + wiphy->bands[IEEE80211_BAND_5GHZ] + ->vht_cap + .vht_mcs + .rx_mcs_map = 0xfffa; - wiphy->bands - [IEEE80211_BAND_5GHZ]-> - vht_cap.vht_mcs. - tx_mcs_map = + wiphy->bands[IEEE80211_BAND_5GHZ] + ->vht_cap + .vht_mcs + .tx_mcs_map = 0xfffa; } } @@ -10584,8 +10619,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_set_get_cwmode(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_set_get_cwmode(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *ioctl_req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -10620,8 +10655,8 @@ woal_priv_set_get_cwmode(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* SET operation */ ioctl_req->action = MLAN_ACT_SET; - cwmode = (mlan_ds_cw_mode_ctrl *) (respbuf + header_len + - sizeof(t_u8)); + cwmode = (mlan_ds_cw_mode_ctrl *)(respbuf + header_len + + sizeof(t_u8)); misc->param.cwmode.mode = cwmode->mode; misc->param.cwmode.txPower = cwmode->txPower; misc->param.cwmode.rateInfo = cwmode->rateInfo; @@ -10657,14 +10692,14 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_ind_rst_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_ind_rst_cfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; int user_data_len = 0, header_len = 0; mlan_ds_misc_cfg *misc = NULL; mlan_ioctl_req *req = NULL; - int data[2] = { 0 }; + int data[2] = {0}; mlan_status status = MLAN_STATUS_SUCCESS; ENTER(); @@ -10744,8 +10779,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_sysclock(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_sysclock(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int data[65]; mlan_ioctl_req *req = NULL; @@ -10867,8 +10902,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_get_key(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_get_key(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0, copy_len = 0; int header_len = 0; @@ -10984,9 +11019,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_associate_ssid_bssid(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +static int woal_priv_associate_ssid_bssid(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0, copy_len = 0; int header_len = 0; @@ -11018,8 +11052,8 @@ woal_priv_associate_ssid_bssid(moal_private *priv, t_u8 *respbuf, "Associate: Insufficient length in IOCTL input\n"); /* buffer should be at least 3 characters per BSSID octet "00:" - ** plus a space separater and at least 1 char in the SSID - */ + ** plus a space separater and at least 1 char in the SSID + */ ret = -EINVAL; goto done; } @@ -11028,7 +11062,8 @@ woal_priv_associate_ssid_bssid(moal_private *priv, t_u8 *respbuf, sizeof(buf)); /* Skip white space */ - for (i = 0; (i < buflen) && (buf[i] == ' '); i++) ; + for (i = 0; (i < buflen) && (buf[i] == ' '); i++) + ; /* Copy/Convert the BSSID */ for (; (i < buflen) && (mac_idx < ETH_ALEN) && (buf[i] != ' '); i++) { @@ -11053,23 +11088,21 @@ woal_priv_associate_ssid_bssid(moal_private *priv, t_u8 *respbuf, sizeof(ssid_bssid.ssid.ssid)); PRINTM(MCMND, "iwpriv assoc: AP=[" MACSTR "], ssid(%d)=[%s]\n", - MAC2STR(ssid_bssid.bssid), - (int)ssid_bssid.ssid.ssid_len, ssid_bssid.ssid.ssid); + MAC2STR(ssid_bssid.bssid), (int)ssid_bssid.ssid.ssid_len, + ssid_bssid.ssid.ssid); - if (MLAN_STATUS_SUCCESS != woal_bss_start(priv, - MOAL_IOCTL_WAIT, - &ssid_bssid)) { + if (MLAN_STATUS_SUCCESS != + woal_bss_start(priv, MOAL_IOCTL_WAIT, &ssid_bssid)) { ret = -EFAULT; goto done; } + #ifdef REASSOCIATION memset(&bss_info, 0x00, sizeof(bss_info)); - if (MLAN_STATUS_SUCCESS == woal_get_bss_info(priv, - MOAL_IOCTL_WAIT, - &bss_info)) { + if (MLAN_STATUS_SUCCESS == + woal_get_bss_info(priv, MOAL_IOCTL_WAIT, &bss_info)) { moal_memcpy_ext(priv->phandle, &priv->prev_ssid_bssid.ssid, - &bss_info.ssid, - sizeof(mlan_802_11_ssid), + &bss_info.ssid, sizeof(mlan_802_11_ssid), sizeof(mlan_802_11_ssid)); moal_memcpy_ext(priv->phandle, &priv->prev_ssid_bssid.bssid, &bss_info.bssid, MLAN_MAC_ADDR_LENGTH, @@ -11083,17 +11116,17 @@ done: } /* Maximum input output characters in group WOAL_SET_GET_256_CHAR */ -#define MAX_IN_OUT_CHAR 256 +#define MAX_IN_OUT_CHAR 256 /** Tx BF Global conf argument index */ -#define BF_ENABLE_PARAM 1 -#define SOUND_ENABLE_PARAM 2 -#define FB_TYPE_PARAM 3 +#define BF_ENABLE_PARAM 1 +#define SOUND_ENABLE_PARAM 2 +#define FB_TYPE_PARAM 3 #define SNR_THRESHOLD_PARAM 4 -#define SOUND_INTVL_PARAM 5 -#define BF_MODE_PARAM 6 -#define MAX_TX_BF_GLOBAL_ARGS 6 -#define BF_CFG_ACT_GET 0 -#define BF_CFG_ACT_SET 1 +#define SOUND_INTVL_PARAM 5 +#define BF_MODE_PARAM 6 +#define MAX_TX_BF_GLOBAL_ARGS 6 +#define BF_CFG_ACT_GET 0 +#define BF_CFG_ACT_SET 1 /** * @brief Set/Get Transmit beamforming configuration @@ -11103,8 +11136,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_tx_bf_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_tx_bf_cfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int header_len = 0; int ret = 0, copy_len = 0; @@ -11234,7 +11267,8 @@ woal_priv_tx_bf_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* First arg = 2 BfAction * Second arg = 18 MAC "00:50:43:20:BF:64;" * Third arg = 1 (min char) TX BF interval - * 10 (max char) u32 maximum value 4294967295 */ + * 10 (max char) u32 maximum value + * 4294967295 */ if (char_count < 19 || char_count > 30) { PRINTM(MERROR, "Invalid argument\n"); ret = -EINVAL; @@ -11369,8 +11403,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_cmd53rdwr(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_cmd53rdwr(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int header_len = 0; int ret = 0; @@ -11387,7 +11421,7 @@ woal_priv_cmd53rdwr(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) header_len = strlen(CMD_NXP) + strlen(PRIV_CMD_SD_CMD53_RW); - flag = (in_atomic() || irqs_disabled())? GFP_ATOMIC : GFP_KERNEL; + flag = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; data = kzalloc(WOAL_2K_BYTES, flag); if (!data) { PRINTM(MERROR, "Cannot allocate buffer for command!\n"); @@ -11398,16 +11432,16 @@ woal_priv_cmd53rdwr(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) sizeof(cmd_len), sizeof(cmd_len)); buf = respbuf + header_len + sizeof(cmd_len); - rw = buf[0]; /* read/write (0/1) */ - func = buf[1]; /* func (0/1/2) */ - reg = buf[5]; /* address */ + rw = buf[0]; /* read/write (0/1) */ + func = buf[1]; /* func (0/1/2) */ + reg = buf[5]; /* address */ reg = (reg << 8) | buf[4]; reg = (reg << 8) | buf[3]; reg = (reg << 8) | buf[2]; - mode = buf[6]; /* byte mode/block mode (0/1) */ - blklen = buf[8]; /* block size */ + mode = buf[6]; /* byte mode/block mode (0/1) */ + blklen = buf[8]; /* block size */ blklen = (blklen << 8) | buf[7]; - blknum = buf[10]; /* block number or byte number */ + blknum = buf[10]; /* block number or byte number */ blknum = (blknum << 8) | buf[9]; if (mode == BYTE_MODE) @@ -11421,23 +11455,24 @@ woal_priv_cmd53rdwr(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) ret = -EINVAL; goto done; } - PRINTM(MINFO, "CMD53 read/write, func = %d, addr = %#x, mode = %d, " + PRINTM(MINFO, + "CMD53 read/write, func = %d, addr = %#x, mode = %d, " "block size = %d, block(byte) number = %d\n", func, reg, mode, blklen, blknum); if (!rw) { - sdio_claim_host(((struct sdio_mmc_card *)priv->phandle->card)-> - func); - if (sdio_readsb - (((struct sdio_mmc_card *)priv->phandle->card)->func, - respbuf, reg, total_len)) { + sdio_claim_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); + if (sdio_readsb( + ((struct sdio_mmc_card *)priv->phandle->card)->func, + respbuf, reg, total_len)) { PRINTM(MERROR, "sdio_readsb: reading memory 0x%x failed\n", reg); goto done; } - sdio_release_host(((struct sdio_mmc_card *)priv->phandle-> - card)->func); + sdio_release_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); ret = total_len; } else { int pos = 0; @@ -11448,16 +11483,16 @@ woal_priv_cmd53rdwr(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) /* Copy/duplicate the pattern to data buffer */ for (pos = 0; pos < total_len; pos++) data[pos] = buf[11 + (pos % pattern_len)]; - sdio_claim_host(((struct sdio_mmc_card *)priv->phandle->card)-> - func); - if (sdio_writesb - (((struct sdio_mmc_card *)priv->phandle->card)->func, reg, - data, total_len)) + sdio_claim_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); + if (sdio_writesb( + ((struct sdio_mmc_card *)priv->phandle->card)->func, + reg, data, total_len)) PRINTM(MERROR, "sdio_writesb: writing memory 0x%x failed\n", reg); - sdio_release_host(((struct sdio_mmc_card *)priv->phandle-> - card)->func); + sdio_release_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); } done: @@ -11475,8 +11510,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_port_ctrl(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_port_ctrl(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int header_len = 0, user_data_len = 0; mlan_ioctl_req *req = NULL; @@ -11539,15 +11574,16 @@ done: } /** - * @brief Private IOCTL entry to get the By-passed TX packet from upper layer + * @brief Private IOCTL entry to get the By-passed TX packet from + * upper layer * @param priv Pointer to moal_private structure * @param respbuf Pointer to response buffer * @param resplen Response buffer length * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_bypassed_packet(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_bypassed_packet(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int header_len = 0; int ret = 0; @@ -11556,12 +11592,12 @@ woal_priv_bypassed_packet(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) t_u16 moreLen = 0, copyLen = 0; ENTER(); -#define MLAN_BYPASS_PKT_EXTRA_OFFSET (4) +#define MLAN_BYPASS_PKT_EXTRA_OFFSET (4) header_len = strlen(CMD_NXP) + strlen(PRIV_CMD_PB_BYPASS); copyLen = strlen(respbuf) - header_len; - moreLen = MLAN_MIN_DATA_HEADER_LEN + MLAN_BYPASS_PKT_EXTRA_OFFSET - + sizeof(mlan_buffer); + moreLen = MLAN_MIN_DATA_HEADER_LEN + MLAN_BYPASS_PKT_EXTRA_OFFSET + + sizeof(mlan_buffer); skb = alloc_skb(copyLen + moreLen, GFP_KERNEL); if (skb == NULL) { @@ -11595,8 +11631,8 @@ woal_priv_bypassed_packet(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_robustcoex(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_robustcoex(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int header_len = 0, user_data_len = 0; int ret = 0, data[3]; @@ -11613,7 +11649,7 @@ woal_priv_robustcoex(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) } robust_coex_cfg = (mlan_ds_misc_cfg *)req->pbuf; while (respbuf[0] == ' ') { - /** skip space */ + /** skip space */ respbuf++; } @@ -11675,7 +11711,6 @@ done: kfree(req); LEAVE(); return ret; - } /** @@ -11686,8 +11721,7 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_dmcs(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_dmcs(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int header_len = 0, user_data_len = 0; int ret = 0, data[2]; @@ -11757,14 +11791,14 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_bootsleep(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_bootsleep(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = MLAN_STATUS_SUCCESS; int user_data_len = 0; int header_len = 0; int allowed = 1; - int data[1] = { 0 }; + int data[1] = {0}; mlan_ioctl_req *req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -11814,7 +11848,7 @@ woal_priv_bootsleep(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) sizeof(misc->param.boot_sleep), respbuflen); ret = sizeof(misc->param.boot_sleep); - PRINTM(MIOCTL, "boot sleep cfg: 0x%u\n", misc->param.boot_sleep); + PRINTM(MIOCTL, "boot sleep cfg: %u\n", misc->param.boot_sleep); done: if (ret != MLAN_STATUS_PENDING) @@ -11833,9 +11867,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_ssu_cmd(moal_private *priv, t_u8 used_len, t_u8 *respbuf, - t_u32 respbuflen) +static int woal_priv_ssu_cmd(moal_private *priv, t_u8 used_len, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; mlan_ds_misc_cfg *ssu_cfg = NULL; @@ -11860,7 +11893,7 @@ woal_priv_ssu_cmd(moal_private *priv, t_u8 used_len, t_u8 *respbuf, ssu_cfg->param.ssu_params.mask_adc_pkt = 0; ssu_cfg->param.ssu_params.out_16bits = 1; } else { - ssu_params = (ssu_params_cfg *) respbuf; + ssu_params = (ssu_params_cfg *)respbuf; DBG_HEXDUMP(MCMD_D, "User SSU params:", respbuf, sizeof(mlan_ds_ssu_params)); if (ssu_params->ssu_mode == 2) @@ -11897,7 +11930,6 @@ done: kfree(req); LEAVE(); return ret; - } #endif @@ -11912,9 +11944,8 @@ done: * * @return Number of bytes written if successful else negative value */ -static int -woal_priv_11axcfg_cmd(moal_private *priv, t_u8 *respbuf, t_u8 len, - t_u32 respbuflen) +static int woal_priv_11axcfg_cmd(moal_private *priv, t_u8 *respbuf, t_u8 len, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_11ax_cfg *cfg = NULL; @@ -11924,7 +11955,7 @@ woal_priv_11axcfg_cmd(moal_private *priv, t_u8 *respbuf, t_u8 len, ENTER(); - data_ptr = (mlan_ds_11ax_he_cfg *) respbuf; + data_ptr = (mlan_ds_11ax_he_cfg *)respbuf; req = woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_11ax_cfg)); if (req == NULL) { ret = -ENOMEM; @@ -11933,7 +11964,7 @@ woal_priv_11axcfg_cmd(moal_private *priv, t_u8 *respbuf, t_u8 len, req->req_id = MLAN_IOCTL_11AX_CFG; req->action = MLAN_ACT_SET; - cfg = (mlan_ds_11ax_cfg *) req->pbuf; + cfg = (mlan_ds_11ax_cfg *)req->pbuf; cfg->sub_command = MLAN_OID_11AX_HE_CFG; if (len) moal_memcpy_ext(priv->phandle, (t_u8 *)&cfg->param.he_cfg, @@ -11954,6 +11985,115 @@ done: LEAVE(); return ret; } +/** + * @brief Configure TWT Setup parameters + * + * @param priv Pointer to the mlan_private driver data struct + * @param respbuf A pointer to response buffer + * @param len Length used + * @param respbuflen Available length of response buffer + * + * @return Number of bytes written if successful else negative + * value + */ +static int woal_priv_twt_setup(moal_private *priv, t_u8 *respbuf, t_u8 len, + t_u32 respbuflen) +{ + mlan_ioctl_req *req = NULL; + mlan_ds_twtcfg *cfg = NULL; + int ret = 0; + mlan_status status = MLAN_STATUS_SUCCESS; + + ENTER(); + + req = woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_twtcfg)); + if (req == NULL) { + PRINTM(MERROR, "Failed to allocate ioctl_req!\n"); + ret = -ENOMEM; + goto done; + } + + req->req_id = MLAN_IOCTL_11AX_CFG; + req->action = MLAN_ACT_SET; + cfg = (mlan_ds_twtcfg *)req->pbuf; + cfg->sub_command = MLAN_OID_11AX_TWT_CFG; + cfg->sub_id = MLAN_11AX_TWT_SETUP_SUBID; + + if (len) { + moal_memcpy_ext(priv->phandle, (t_u8 *)&cfg->param.twt_setup, + respbuf, len, sizeof(mlan_ds_twt_setup)); + } + + status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); + if (status != MLAN_STATUS_SUCCESS) { + PRINTM(MERROR, "woal_request_ioctl failed!\n"); + ret = -EFAULT; + goto done; + } + + ret = sizeof(mlan_ds_twt_setup); +done: + if (status != MLAN_STATUS_PENDING) { + kfree(req); + } + LEAVE(); + return ret; +} + +/** + * @brief Configure TWT Tear down parameters + * + * @param priv Pointer to the mlan_private driver data struct + * @param respbuf A pointer to response buffer + * @param len Length used + * @param respbuflen Available length of response buffer + * + * @return Number of bytes written if successful else negative + * value + */ +static int woal_priv_twt_teardown(moal_private *priv, t_u8 *respbuf, t_u8 len, + t_u32 respbuflen) +{ + mlan_ioctl_req *req = NULL; + mlan_ds_twtcfg *cfg = NULL; + int ret = 0; + mlan_status status = MLAN_STATUS_SUCCESS; + + ENTER(); + + req = woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_twtcfg)); + if (req == NULL) { + PRINTM(MERROR, "Failed to allocate ioctl_req!\n"); + ret = -ENOMEM; + goto done; + } + + req->req_id = MLAN_IOCTL_11AX_CFG; + req->action = MLAN_ACT_SET; + cfg = (mlan_ds_twtcfg *)req->pbuf; + cfg->sub_command = MLAN_OID_11AX_TWT_CFG; + cfg->sub_id = MLAN_11AX_TWT_TEARDOWN_SUBID; + + if (len) { + moal_memcpy_ext(priv->phandle, (t_u8 *)&cfg->param.twt_teardown, + respbuf, len, sizeof(mlan_ds_twt_teardown)); + } + + status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); + if (status != MLAN_STATUS_SUCCESS) { + PRINTM(MERROR, "woal_request_ioctl failed!\n"); + ret = -EFAULT; + goto done; + } + + ret = sizeof(mlan_ds_twt_teardown); +done: + if (status != MLAN_STATUS_PENDING) { + kfree(req); + } + LEAVE(); + return ret; +} #ifdef WIFI_DIRECT_SUPPORT #if defined(UAP_CFG80211) @@ -11965,8 +12105,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_cfg_noa(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_cfg_noa(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int header_len = 0, user_data_len = 0; int ret = 0, data[7]; @@ -12055,8 +12195,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_cfg_opp_ps(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_cfg_opp_ps(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int header_len = 0, user_data_len = 0; int ret = 0, data[7]; @@ -12130,8 +12270,7 @@ done: ** ** @return Number of bytes written, negative for failure. **/ -static int -woal_p2p_ps_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_p2p_ps_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { int user_data_len = 0; int ret = 0, data[2]; @@ -12153,9 +12292,8 @@ woal_p2p_ps_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) if (data[0] < DEF_NOA_INTERVAL) interval = DEF_NOA_INTERVAL; else - interval = - (data[0] + DEF_NOA_INTERVAL - - 1) / DEF_NOA_INTERVAL * DEF_NOA_INTERVAL; + interval = (data[0] + DEF_NOA_INTERVAL - 1) / DEF_NOA_INTERVAL * + DEF_NOA_INTERVAL; if (user_data_len == 2) duration = data[1]; @@ -12186,8 +12324,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_dfs_repeater_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_dfs_repeater_cfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; int user_data_len = 0, header_len = 0, data[1]; @@ -12252,8 +12390,8 @@ woal_priv_dfs_repeater_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) ret = sizeof(mlan_ds_misc_dfs_repeater); } - /* Store current value of DFS repeater mode for futher references. eg., for - * avoiding CAC timers + /* Store current value of DFS repeater mode for futher references. eg., + * for avoiding CAC timers */ priv->phandle->dfs_repeater_mode = dfs_repeater->mode; @@ -12276,11 +12414,11 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_miracast_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_miracast_cfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; - int user_data_len = 0, header_len = 0, data[3] = { 0, 0, 0 }; + int user_data_len = 0, header_len = 0, data[3] = {0, 0, 0}; ENTER(); @@ -12340,8 +12478,7 @@ done: * * @return 0 --success, otherwise failure */ -int -woal_set_scan_chan_gap(moal_private *priv, t_u8 *respbuf, int respbuflen) +int woal_set_scan_chan_gap(moal_private *priv, t_u8 *respbuf, int respbuflen) { t_u32 data[2]; int ret = 0; @@ -12365,7 +12502,6 @@ woal_set_scan_chan_gap(moal_private *priv, t_u8 *respbuf, int respbuflen) done: LEAVE(); return ret; - } #endif #endif @@ -12379,8 +12515,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_coex_rx_winsize(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_coex_rx_winsize(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; int user_data_len = 0, header_len = 0, data = 0; @@ -12467,8 +12603,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_pcie_reg_rw(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_pcie_reg_rw(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { moal_handle *handle = priv->phandle; int data[3]; @@ -12527,8 +12663,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_pcie_bar0_reg_rw(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_pcie_bar0_reg_rw(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { moal_handle *handle = priv->phandle; pcie_service_card *card = (pcie_service_card *)handle->card; @@ -12587,8 +12723,8 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_get_sensor_temp(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_get_sensor_temp(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_misc_cfg *pcfg = NULL; @@ -12639,13 +12775,12 @@ done: * * @return Number of bytes written, negative for failure. */ -static int -woal_priv_dfs_offload_enable(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +static int woal_priv_dfs_offload_enable(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { struct wiphy *wiphy = NULL; - int ret = 0, dfs_offload_en = 0, user_data_len = 0, header_len = - 0, dfs_offload; + int ret = 0, dfs_offload_en = 0, user_data_len = 0, header_len = 0, + dfs_offload; ENTER(); @@ -12701,8 +12836,8 @@ done: * @return Number of bytes written, negative for failure. */ -static int -woal_priv_config_dyn_bw(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_config_dyn_bw(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *ioctl_req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -12775,9 +12910,8 @@ done: * @return SUCCESS/FAIL */ -static int -woal_check_valid_channel_operclass(moal_private *priv, int channel, - int oper_class) +static int woal_check_valid_channel_operclass(moal_private *priv, int channel, + int oper_class) { int ret = 0; mlan_ioctl_req *ioctl_req = NULL; @@ -12825,9 +12959,8 @@ done: * @return channel center frequency center, if found; O, otherwise */ -t_u8 -woal_get_center_freq_idx(IN moal_private *priv, - IN t_u8 band, IN t_u32 pri_chan, IN t_u8 chan_bw) +t_u8 woal_get_center_freq_idx(IN moal_private *priv, IN t_u8 band, + IN t_u32 pri_chan, IN t_u8 chan_bw) { t_u8 center_freq_idx = 0; @@ -13024,8 +13157,7 @@ woal_get_center_freq_idx(IN moal_private *priv, break; } /* fall through */ - - default: /* error. go to the default */ + default: /* error. go to the default */ center_freq_idx = 42; } } @@ -13041,13 +13173,12 @@ woal_get_center_freq_idx(IN moal_private *priv, ** ** @return Number of bytes written, negative for failure. **/ -static int -woal_priv_extend_channel_switch(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +static int woal_priv_extend_channel_switch(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; int user_data_len = 0; - int data[5] = { 0 }; + int data[5] = {0}; IEEEtypes_ExtChanSwitchAnn_t *ext_chan_switch = NULL; IEEEtypes_ChanSwitchAnn_t *chan_switch = NULL; custom_ie *pcust_chansw_ie = NULL; @@ -13094,13 +13225,15 @@ woal_priv_extend_channel_switch(moal_private *priv, t_u8 *respbuf, misc->param.cust_ie.len = (sizeof(custom_ie) - MAX_IE_SIZE); pcust_chansw_ie = (custom_ie *)&misc->param.cust_ie.ie_data_list[0]; - pcust_chansw_ie->ie_index = 0xffff; /*Auto index */ + pcust_chansw_ie->ie_index = 0xffff; /*Auto index */ pcust_chansw_ie->ie_length = sizeof(IEEEtypes_ChanSwitchAnn_t); - pcust_chansw_ie->mgmt_subtype_mask = MGMT_MASK_BEACON | MGMT_MASK_PROBE_RESP; /*Add IE for BEACON/probe resp */ + pcust_chansw_ie->mgmt_subtype_mask = + MGMT_MASK_BEACON | MGMT_MASK_PROBE_RESP; /*Add IE for + BEACON/probe resp*/ parse_arguments(respbuf + strlen(CMD_NXP) + - strlen(PRIV_CMD_EXTEND_CHAN_SWITCH), data, - ARRAY_SIZE(data), &user_data_len); + strlen(PRIV_CMD_EXTEND_CHAN_SWITCH), + data, ARRAY_SIZE(data), &user_data_len); if (sizeof(int) * user_data_len > sizeof(data)) { PRINTM(MERROR, "Too many arguments\n"); @@ -13121,17 +13254,17 @@ woal_priv_extend_channel_switch(moal_private *priv, t_u8 *respbuf, pcust_chansw_ie->ie_length += sizeof(IEEEtypes_ExtChanSwitchAnn_t); ext_chan_switch = - (IEEEtypes_ExtChanSwitchAnn_t *) (pcust_chansw_ie-> - ie_buffer + - sizeof - (IEEEtypes_ChanSwitchAnn_t)); + (IEEEtypes_ExtChanSwitchAnn_t + *)(pcust_chansw_ie->ie_buffer + + sizeof(IEEEtypes_ChanSwitchAnn_t)); ext_chan_switch->element_id = EXTEND_CHANNEL_SWITCH_ANN; ext_chan_switch->len = 4; ext_chan_switch->chan_switch_mode = data[0]; ext_chan_switch->new_oper_class = data[1]; ext_chan_switch->new_channel_num = data[2]; ext_chan_switch->chan_switch_count = data[3]; - if (woal_check_valid_channel_operclass(priv, data[2], data[1])) { + if (woal_check_valid_channel_operclass(priv, data[2], + data[1])) { PRINTM(MERROR, "Wrong channel switch parameters!\n"); ret = -EINVAL; goto done; @@ -13140,9 +13273,10 @@ woal_priv_extend_channel_switch(moal_private *priv, t_u8 *respbuf, (t_u8 *)(pcust_chansw_ie->ie_buffer + sizeof(IEEEtypes_ChanSwitchAnn_t)), pcust_chansw_ie->ie_length - - sizeof(IEEEtypes_ChanSwitchAnn_t)); + sizeof(IEEEtypes_ChanSwitchAnn_t)); } - /* bandwidth 40/80/160 should set channel switch wrapper ie for 11ac 5G channel */ + /* bandwidth 40/80/160 should set channel switch wrapper ie for 11ac 5G + * channel*/ if (data[4] && data[2] > 14) { pChanSwWrap_ie = (IEEEtypes_Header_t *)(pcust_chansw_ie->ie_buffer + @@ -13150,19 +13284,16 @@ woal_priv_extend_channel_switch(moal_private *priv, t_u8 *respbuf, pChanSwWrap_ie->element_id = EXT_POWER_CONSTR; pChanSwWrap_ie->len = sizeof(IEEEtypes_WideBWChanSwitch_t); - pbwchansw_ie = - (IEEEtypes_WideBWChanSwitch_t *)((t_u8 *)pChanSwWrap_ie - + - sizeof - (IEEEtypes_Header_t)); + 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); - center_freq_idx = - woal_get_center_freq_idx(priv, BAND_AAC, data[2], - data[4]); + center_freq_idx = woal_get_center_freq_idx(priv, BAND_AAC, + data[2], data[4]); if (data[4] == CHANNEL_BW_40MHZ_ABOVE || data[4] == CHANNEL_BW_40MHZ_BELOW) { pbwchansw_ie->new_channel_width = 0; @@ -13184,13 +13315,12 @@ woal_priv_extend_channel_switch(moal_private *priv, t_u8 *respbuf, PRINTM(MERROR, "Invalid bandwidth.Support value 1/3/4/5 for 40+/40-/80/160MHZ\n"); - /*prepare the VHT Transmit Power Envelope IE */ + /*prepare the VHT Transmit Power Envelope IE*/ pvhttpcEnv_ie = - (IEEEtypes_VhtTpcEnvelope_t *)((t_u8 *)pChanSwWrap_ie + - sizeof - (IEEEtypes_Header_t) + - sizeof - (IEEEtypes_WideBWChanSwitch_t)); + (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) - @@ -13229,7 +13359,7 @@ woal_priv_extend_channel_switch(moal_private *priv, t_u8 *respbuf, priv->phandle->chsw_wait_q_woken, (u32)HZ * (data[3] + 2) * 110 / 1000); - pcust_chansw_ie->ie_index = 0xffff; /*Auto index */ + pcust_chansw_ie->ie_index = 0xffff; /*Auto index */ pcust_chansw_ie->mgmt_subtype_mask = 0; status = woal_request_ioctl(priv, ioctl_req, MOAL_IOCTL_WAIT); if (status != MLAN_STATUS_SUCCESS) { @@ -13252,12 +13382,12 @@ done: * @return Number of bytes written, negative for failure. */ -static int -woal_priv_p2p_ecsa(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_p2p_ecsa(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; int user_data_len = 0, header_len = 0; - int data[2] = { 0 }; + int data[2] = {0}; t_u8 bw = 0, oper_class = 0, channel = 0; IEEEtypes_ExtChanSwitchAnn_t *ext_chan_switch = NULL; custom_ie *pcust_chansw_ie = NULL; @@ -13300,11 +13430,13 @@ woal_priv_p2p_ecsa(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) misc->param.cust_ie.len = (sizeof(custom_ie) - MAX_IE_SIZE); pcust_chansw_ie = (custom_ie *)&misc->param.cust_ie.ie_data_list[0]; - pcust_chansw_ie->ie_index = 0xffff; /*Auto index */ + pcust_chansw_ie->ie_index = 0xffff; /*Auto index */ pcust_chansw_ie->ie_length = sizeof(IEEEtypes_ExtChanSwitchAnn_t); - pcust_chansw_ie->mgmt_subtype_mask = MGMT_MASK_BEACON | MGMT_MASK_PROBE_RESP; /*Add IE for BEACON/probe resp */ + pcust_chansw_ie->mgmt_subtype_mask = + MGMT_MASK_BEACON | MGMT_MASK_PROBE_RESP; /*Add IE for + BEACON/probe resp*/ ext_chan_switch = - (IEEEtypes_ExtChanSwitchAnn_t *) pcust_chansw_ie->ie_buffer; + (IEEEtypes_ExtChanSwitchAnn_t *)pcust_chansw_ie->ie_buffer; header_len = strlen("P2P_ECSA"); parse_arguments(respbuf + header_len + 1, data, ARRAY_SIZE(data), @@ -13317,7 +13449,7 @@ woal_priv_p2p_ecsa(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) } channel = data[0]; - /* bandwidth 20:20M 40:40M 80:80M */ + /* bandwidth 20:20M 40:40M 80:80M*/ bw = data[1]; if (bw != 20 && bw != 40 && bw != 80) { PRINTM(MERROR, "Unsupported bandwidth\n"); @@ -13362,13 +13494,12 @@ woal_priv_p2p_ecsa(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) priv->phandle->chsw_wait_q_woken = MFALSE; /* wait for channel switch to complete */ - wait_event_interruptible_timeout(priv->phandle->chsw_wait_q, - priv->phandle->chsw_wait_q_woken, - (u32)HZ * - (ext_chan_switch->chan_switch_count + - 2) * 110 / 1000); + wait_event_interruptible_timeout( + priv->phandle->chsw_wait_q, priv->phandle->chsw_wait_q_woken, + (u32)HZ * (ext_chan_switch->chan_switch_count + 2) * 110 / + 1000); - pcust_chansw_ie->ie_index = 0xffff; /*Auto index */ + pcust_chansw_ie->ie_index = 0xffff; /*Auto index */ pcust_chansw_ie->mgmt_subtype_mask = 0; status = woal_request_ioctl(priv, ioctl_req, MOAL_IOCTL_WAIT); if (status != MLAN_STATUS_SUCCESS) { @@ -13383,22 +13514,22 @@ done: } #endif - /** - * @brief Set random mac configure value (ON/OFF) - * - * @param priv Pointer to moal_private structure - * @param respbuf Pointer to response buffer - * @param resplen Response buffer length +/** +* @brief Set random mac configure value (ON/OFF) +* +* @param priv Pointer to moal_private structure +* @param respbuf Pointer to response buffer +* @param resplen Response buffer length - * @return Number of bytes written, negative for failure. - */ -static int -woal_priv_config_random_mac(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +* @return Number of bytes written, negative for failure. +*/ +static int woal_priv_config_random_mac(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; int header_len = 0, space_len = 0, i; t_u8 rand_data[3]; - const t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0, 0, 0, 0, 0, 0 }; + const t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = {0, 0, 0, 0, 0, 0}; ENTER(); @@ -13410,21 +13541,19 @@ woal_priv_config_random_mac(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) header_len = strlen("FAKEMAC"); if (strlen(respbuf) >= header_len) { - for (i = 0; i < (strlen(respbuf) - header_len - 1); i++) { if (respbuf[header_len + 1 + i] != ' ') break; } space_len = i; - if (strncmp - (respbuf + header_len + 1 + space_len, "On", - strlen("On")) == 0) { - if (memcmp - (priv->random_mac, zero_mac, - MLAN_MAC_ADDR_LENGTH)) { + if (strncmp(respbuf + header_len + 1 + space_len, "On", + strlen("On")) == 0) { + if (memcmp(priv->random_mac, zero_mac, + MLAN_MAC_ADDR_LENGTH)) { ret = sprintf(respbuf, - "FAKEMAC has been On\n") + 1; + "FAKEMAC has been On\n") + + 1; goto done; } moal_memcpy_ext(priv->phandle, priv->random_mac, @@ -13433,9 +13562,8 @@ woal_priv_config_random_mac(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) get_random_bytes(rand_data, 3); moal_memcpy_ext(priv->phandle, priv->random_mac + 3, rand_data, 3, 3); - } else if (strncmp - (respbuf + header_len + 1 + space_len, "Off", - strlen("Off")) == 0) { + } else if (strncmp(respbuf + header_len + 1 + space_len, "Off", + strlen("Off")) == 0) { memset(priv->random_mac, 0, ETH_ALEN); } else { PRINTM(MERROR, "Invalid parameter!\n"); @@ -13449,7 +13577,8 @@ woal_priv_config_random_mac(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) } ret = sprintf(respbuf, "FAKEMAC parameter is %s\n", - (t_u8 *)(respbuf + header_len + 1 + space_len)) + 1; + (t_u8 *)(respbuf + header_len + 1 + space_len)) + + 1; PRINTM(MMSG, "FAKEMAC parameter is %s\n", (t_u8 *)(respbuf + header_len + 1 + space_len)); @@ -13471,10 +13600,10 @@ done: * @return 0: success fail otherwise */ -int -woal_start_mkeep_alive(moal_private *priv, t_u8 mkeep_alive_id, t_u8 *ip_pkt, - t_u16 ip_pkt_len, t_u8 *src_mac, t_u8 *dst_mac, - t_u32 period_msec, t_u32 retry_interval, t_u8 retry_cnt) +int woal_start_mkeep_alive(moal_private *priv, t_u8 mkeep_alive_id, + t_u8 *ip_pkt, t_u16 ip_pkt_len, t_u8 *src_mac, + t_u8 *dst_mac, t_u32 period_msec, + t_u32 retry_interval, t_u8 retry_cnt) { mlan_ioctl_req *ioctl_req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -13499,7 +13628,7 @@ woal_start_mkeep_alive(moal_private *priv, t_u8 mkeep_alive_id, t_u8 *ip_pkt, misc->sub_command = MLAN_OID_MISC_CLOUD_KEEP_ALIVE; ioctl_req->req_id = MLAN_IOCTL_MISC_CFG; - if (mkeep_alive_id < 0 || mkeep_alive_id >= MAX_KEEP_ALIVE_ID) { + if (mkeep_alive_id >= MAX_KEEP_ALIVE_ID) { PRINTM(MERROR, "Invalid parameters\n"); ret = -EFAULT; goto done; @@ -13545,9 +13674,8 @@ done: * @return 0: success fail otherwise */ -int -woal_stop_mkeep_alive(moal_private *priv, t_u8 mkeep_alive_id, t_u8 reset, - t_u8 *ip_pkt, t_u8 *pkt_len) +int woal_stop_mkeep_alive(moal_private *priv, t_u8 mkeep_alive_id, t_u8 reset, + t_u8 *ip_pkt, t_u8 *pkt_len) { mlan_ioctl_req *ioctl_req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -13574,7 +13702,7 @@ woal_stop_mkeep_alive(moal_private *priv, t_u8 mkeep_alive_id, t_u8 reset, ioctl_req->req_id = MLAN_IOCTL_MISC_CFG; misc_keep_alive = &misc->param.keep_alive; - if (mkeep_alive_id < 0 || mkeep_alive_id >= MAX_KEEP_ALIVE_ID) { + if (mkeep_alive_id >= MAX_KEEP_ALIVE_ID) { PRINTM(MERROR, "Invalid parameters\n"); ret = -EFAULT; goto done; @@ -13609,6 +13737,7 @@ woal_stop_mkeep_alive(moal_private *priv, t_u8 mkeep_alive_id, t_u8 reset, ret = -EFAULT; goto done; } + #ifdef STA_CFG80211 #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) if (IS_STA_CFG80211(priv->phandle->params.cfg80211_wext)) { @@ -13621,10 +13750,11 @@ woal_stop_mkeep_alive(moal_private *priv, t_u8 mkeep_alive_id, t_u8 reset, #endif #endif if (pkt_len) { - *pkt_len = misc_keep_alive->pkt_len; + *pkt_len = MIN(misc_keep_alive->pkt_len, + (MKEEP_ALIVE_IP_PKT_MAX - 1)); PRINTM(MINFO, "keep alive stop pkt_len is %d\n", *pkt_len); } - if (*pkt_len && ip_pkt && (*pkt_len < MKEEP_ALIVE_IP_PKT_MAX)) + if (*pkt_len && ip_pkt) moal_memcpy_ext(priv->phandle, ip_pkt, misc_keep_alive->packet, *pkt_len, *pkt_len); @@ -13644,13 +13774,13 @@ done: * @return Number of bytes written, negative for failure. */ -int -woal_priv_save_cloud_keep_alive_params(moal_private *priv, t_u8 mkeep_alive_id, - t_u8 enable, t_u16 ether_type, - t_u8 *ip_pkt, t_u16 ip_pkt_len, - t_u8 *src_mac, t_u8 *dst_mac, - t_u32 period_msec, t_u32 retry_interval, - t_u8 retry_cnt) +int woal_priv_save_cloud_keep_alive_params(moal_private *priv, + t_u8 mkeep_alive_id, t_u8 enable, + t_u16 ether_type, t_u8 *ip_pkt, + t_u16 ip_pkt_len, t_u8 *src_mac, + t_u8 *dst_mac, t_u32 period_msec, + t_u32 retry_interval, t_u8 retry_cnt) + { mlan_ioctl_req *ioctl_req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -13677,7 +13807,7 @@ woal_priv_save_cloud_keep_alive_params(moal_private *priv, t_u8 mkeep_alive_id, misc->sub_command = MLAN_OID_MISC_CLOUD_KEEP_ALIVE; ioctl_req->req_id = MLAN_IOCTL_MISC_CFG; - if (mkeep_alive_id < 0 || mkeep_alive_id >= MAX_KEEP_ALIVE_ID) { + if (mkeep_alive_id >= MAX_KEEP_ALIVE_ID) { PRINTM(MERROR, "Invalid parameters\n"); ret = -EINVAL; goto done; @@ -13738,8 +13868,8 @@ done: * @return Number of bytes written, negative for failure. */ -static int -woal_priv_cloud_keep_alive(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_cloud_keep_alive(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; cloud_keep_alive *keep_alive = NULL; @@ -13749,31 +13879,20 @@ woal_priv_cloud_keep_alive(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) header_len = strlen(PRIV_CMD_CLOUD_KEEP_ALIVE); - keep_alive = (cloud_keep_alive *) (respbuf + header_len); + keep_alive = (cloud_keep_alive *)(respbuf + header_len); if (keep_alive->enable) { - ret = woal_priv_save_cloud_keep_alive_params(priv, - keep_alive-> - mkeep_alive_id, - keep_alive->enable, - 0, keep_alive->pkt, - keep_alive-> - pkt_len, - keep_alive-> - src_mac, - keep_alive-> - dst_mac, - keep_alive-> - sendInterval, - keep_alive-> - retryInterval, - keep_alive-> - retryCount); + ret = woal_priv_save_cloud_keep_alive_params( + priv, keep_alive->mkeep_alive_id, keep_alive->enable, 0, + keep_alive->pkt, keep_alive->pkt_len, + keep_alive->src_mac, keep_alive->dst_mac, + keep_alive->sendInterval, keep_alive->retryInterval, + keep_alive->retryCount); } else { - if (0 != - woal_stop_mkeep_alive(priv, keep_alive->mkeep_alive_id, - keep_alive->reset, keep_alive->pkt, - &keep_alive->pkt_len)) { + if (0 != woal_stop_mkeep_alive(priv, keep_alive->mkeep_alive_id, + keep_alive->reset, + keep_alive->pkt, + &keep_alive->pkt_len)) { ret = -EFAULT; return ret; } @@ -13793,8 +13912,7 @@ woal_priv_cloud_keep_alive(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) * * @return Number of bytes written, negative for failure. */ -int -woal_priv_rx_abort_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_rx_abort_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -13877,8 +13995,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_rx_abort_cfg_ext(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_rx_abort_cfg_ext(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -13974,9 +14092,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_tx_ampdu_prot_mode(moal_private *priv, t_u8 *respbuf, - t_u32 respbuflen) +int woal_priv_tx_ampdu_prot_mode(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -14055,8 +14172,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_rate_adapt_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_rate_adapt_cfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -14106,8 +14223,8 @@ woal_priv_rate_adapt_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) } if (data[0] == RATEADAPT_ALGO_SR && user_data_len > 1) { if ((data[1] & data[2]) == 0xff) { - /* dynamic CCA noise based rate adapation enable request - * nothing to do here + /* dynamic CCA noise based rate adapation enable + * request nothing to do here */ } else if (data[1] > 100 || data[2] > 100) { PRINTM(MERROR, @@ -14161,8 +14278,8 @@ done: * * @return Number of bytes written, negative for failure. */ -int -woal_priv_cck_desense_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +int woal_priv_cck_desense_cfg(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { mlan_ioctl_req *req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -14210,9 +14327,10 @@ woal_priv_cck_desense_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) ret = -EINVAL; goto done; } - if ((data[0] == CCK_DESENSE_MODE_DISABLED && user_data_len > 1) - || (data[0] == CCK_DESENSE_MODE_DYNAMIC && - user_data_len != 3) || + if ((data[0] == CCK_DESENSE_MODE_DISABLED && + user_data_len > 1) || + (data[0] == CCK_DESENSE_MODE_DYNAMIC && + user_data_len != 3) || (data[0] == CCK_DESENSE_MODE_DYN_ENH && (user_data_len < 3 || user_data_len == 4))) { PRINTM(MERROR, @@ -14253,8 +14371,8 @@ woal_priv_cck_desense_cfg(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) misc->param.cck_desense_cfg.num_off_intervals = (t_u8)data[4]; } else { - /* set these to 0xff. This will indicate the FW to use - * previously set values. + /* set these to 0xff. This will indicate the FW + * to use previously set values. */ misc->param.cck_desense_cfg.num_on_intervals = 0xff; @@ -14297,8 +14415,8 @@ done: * @return Number of bytes written, negative for failure. */ -static int -woal_priv_set_get_lpm(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) +static int woal_priv_set_get_lpm(moal_private *priv, t_u8 *respbuf, + t_u32 respbuflen) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -14325,8 +14443,8 @@ woal_priv_set_get_lpm(moal_private *priv, t_u8 *respbuf, t_u32 respbuflen) ret = -EINVAL; goto done; } else { - req = woal_alloc_mlan_ioctl_req(sizeof - (mlan_ds_power_cfg)); + req = woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_power_cfg)); if (req == NULL) { ret = -ENOMEM; goto done; @@ -14370,8 +14488,7 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) +int woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) { int ret = 0; android_wifi_priv_cmd priv_cmd; @@ -14405,7 +14522,7 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) ret = -EFAULT; goto done; } -#define CMD_BUF_LEN 3072 +#define CMD_BUF_LEN 3072 if (priv_cmd.used_len < 0 || priv_cmd.total_len <= 0 || priv_cmd.used_len > priv_cmd.total_len) { PRINTM(MERROR, @@ -14417,7 +14534,7 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) if (priv_cmd.total_len + 1 > CMD_BUF_LEN) priv_cmd.total_len = CMD_BUF_LEN - 1; - flag = (in_atomic() || irqs_disabled())? GFP_ATOMIC : GFP_KERNEL; + flag = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; buf = kzalloc(CMD_BUF_LEN, flag); if (!buf) { PRINTM(MERROR, "%s: failed to allocate memory\n", __FUNCTION__); @@ -14449,168 +14566,147 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) /* This command has come from mlanutl app */ /* Check command */ - if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_VERSION, - strlen(PRIV_CMD_VERSION)) == 0) { + if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_VERSION, + strlen(PRIV_CMD_VERSION)) == 0) { /* Get version */ len = woal_get_priv_driver_version(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_BANDCFG, - strlen(PRIV_CMD_BANDCFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_BANDCFG, + strlen(PRIV_CMD_BANDCFG)) == 0) { /* Set/Get band configuration */ len = woal_setget_priv_bandcfg(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_HOSTCMD, - strlen(PRIV_CMD_HOSTCMD)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_HOSTCMD, + strlen(PRIV_CMD_HOSTCMD)) == 0) { /* hostcmd configuration */ len = woal_priv_hostcmd(priv, buf, priv_cmd.total_len, MOAL_IOCTL_WAIT); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_11AXCMDCFG, - strlen(PRIV_CMD_11AXCMDCFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_11AXCMDCFG, + strlen(PRIV_CMD_11AXCMDCFG)) == 0) { /* 11ax command */ pdata = buf + strlen(CMD_NXP) + strlen(PRIV_CMD_11AXCMDCFG); len = priv_cmd.total_len - strlen(CMD_NXP) + - strlen(PRIV_CMD_11AXCMDCFG); + strlen(PRIV_CMD_11AXCMDCFG); len = woal_setget_priv_11axcmdcfg(priv, pdata, len, MOAL_IOCTL_WAIT); len += strlen(CMD_NXP) + strlen(PRIV_CMD_11AXCMDCFG); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_HTTXCFG, - strlen(PRIV_CMD_HTTXCFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_HTTXCFG, + strlen(PRIV_CMD_HTTXCFG)) == 0) { /* Set/Get HT Tx configuration */ len = woal_setget_priv_httxcfg(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_HTCAPINFO, - strlen(PRIV_CMD_HTCAPINFO)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_HTCAPINFO, + strlen(PRIV_CMD_HTCAPINFO)) == 0) { /* Set/Get HT Capability information */ len = woal_setget_priv_htcapinfo(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_ADDBAPARA, - strlen(PRIV_CMD_ADDBAPARA)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_ADDBAPARA, + strlen(PRIV_CMD_ADDBAPARA)) == 0) { /* Set/Get Add BA parameters */ len = woal_setget_priv_addbapara(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_AGGRPRIOTBL, - strlen(PRIV_CMD_AGGRPRIOTBL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_AGGRPRIOTBL, + strlen(PRIV_CMD_AGGRPRIOTBL)) == 0) { /* Set/Get Aggregation priority table parameters */ len = woal_setget_priv_aggrpriotbl(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_ADDBAREJECT, - strlen(PRIV_CMD_ADDBAREJECT)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_ADDBAREJECT, + strlen(PRIV_CMD_ADDBAREJECT)) == 0) { /* Set/Get Add BA reject parameters */ len = woal_setget_priv_addbareject(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_DELBA, - strlen(PRIV_CMD_DELBA)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_DELBA, + strlen(PRIV_CMD_DELBA)) == 0) { /* Delete selective BA based on parameters */ len = woal_priv_delba(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_REJECTADDBAREQ, - strlen(PRIV_CMD_REJECTADDBAREQ)) == 0) { - /* Set/Get the reject addba requst conditions */ + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_REJECTADDBAREQ, + strlen(PRIV_CMD_REJECTADDBAREQ)) == 0) { + /* Set/Get the reject addba requst conditions*/ len = woal_priv_rejectaddbareq(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_VHTCFG, - strlen(PRIV_CMD_VHTCFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_VHTCFG, + strlen(PRIV_CMD_VHTCFG)) == 0) { /* Set/Get 11AC configuration */ len = woal_setget_priv_vhtcfg(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_OPERMODECFG, - strlen(PRIV_CMD_OPERMODECFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_OPERMODECFG, + strlen(PRIV_CMD_OPERMODECFG)) == 0) { /* Set/Get 11AC configuration */ len = woal_setget_priv_opermodecfg(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_DATARATE, - strlen(PRIV_CMD_DATARATE)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_DATARATE, + strlen(PRIV_CMD_DATARATE)) == 0) { /* Get data rate */ len = woal_get_priv_datarate(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_TXRATECFG, - strlen(PRIV_CMD_TXRATECFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_TXRATECFG, + strlen(PRIV_CMD_TXRATECFG)) == 0) { /* Set/Get tx rate cfg */ len = woal_setget_priv_txratecfg(priv, buf, priv_cmd.total_len); goto handled; #if defined(STA_SUPPORT) || defined(UAP_SUPPORT) - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_GETLOG, - strlen(PRIV_CMD_GETLOG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_GETLOG, + strlen(PRIV_CMD_GETLOG)) == 0) { /* Get wireless stats information */ len = woal_get_priv_getlog(priv, buf, priv_cmd.total_len); goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_CUSTOMIE, - strlen(PRIV_CMD_CUSTOMIE)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_CUSTOMIE, + strlen(PRIV_CMD_CUSTOMIE)) == 0) { /* Custom IE configuration */ len = woal_priv_customie(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_ESUPPMODE, - strlen(PRIV_CMD_ESUPPMODE)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_ESUPPMODE, + strlen(PRIV_CMD_ESUPPMODE)) == 0) { /* Esupplicant mode configuration */ len = woal_setget_priv_esuppmode(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_PASSPHRASE, - strlen(PRIV_CMD_PASSPHRASE)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_PASSPHRASE, + strlen(PRIV_CMD_PASSPHRASE)) == 0) { /* Esupplicant passphrase configuration */ len = woal_setget_priv_passphrase(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_DEAUTH, - strlen(PRIV_CMD_DEAUTH)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_DEAUTH, + strlen(PRIV_CMD_DEAUTH)) == 0) { /* Deauth */ len = woal_priv_deauth(priv, buf, priv_cmd.total_len); goto handled; #ifdef UAP_SUPPORT - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_AP_DEAUTH, - strlen(PRIV_CMD_AP_DEAUTH)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_AP_DEAUTH, + strlen(PRIV_CMD_AP_DEAUTH)) == 0) { /* AP Deauth */ len = woal_priv_ap_deauth(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_GET_STA_LIST, - strlen(PRIV_CMD_GET_STA_LIST)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_GET_STA_LIST, + strlen(PRIV_CMD_GET_STA_LIST)) == 0) { /* Get STA list */ len = woal_priv_get_sta_list(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_BSS_CONFIG, - strlen(PRIV_CMD_BSS_CONFIG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_BSS_CONFIG, + strlen(PRIV_CMD_BSS_CONFIG)) == 0) { /* BSS config */ len = woal_priv_bss_config(priv, buf, priv_cmd.total_len); @@ -14618,9 +14714,8 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) #endif #ifdef WIFI_DIRECT_SUPPORT #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_BSSROLE, - strlen(PRIV_CMD_BSSROLE)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_BSSROLE, + strlen(PRIV_CMD_BSSROLE)) == 0) { /* BSS Role */ len = woal_priv_bssrole(priv, buf, (t_u32)priv_cmd.total_len); @@ -14628,72 +14723,64 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) #endif #endif #ifdef STA_SUPPORT - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_SETUSERSCAN, - strlen(PRIV_CMD_SETUSERSCAN)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_SETUSERSCAN, + strlen(PRIV_CMD_SETUSERSCAN)) == 0) { /* Set user scan */ len = woal_priv_setuserscan(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_GETSCANTABLE, - strlen(PRIV_CMD_GETSCANTABLE)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_GETSCANTABLE, + strlen(PRIV_CMD_GETSCANTABLE)) == 0) { /* Get scan table */ len = woal_priv_getscantable(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_GETCHANSTATS, - strlen(PRIV_CMD_GETCHANSTATS)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_GETCHANSTATS, + strlen(PRIV_CMD_GETCHANSTATS)) == 0) { /* Get channel statistics */ len = woal_priv_get_chanstats(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_EXTCAPCFG, - strlen(PRIV_CMD_EXTCAPCFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_EXTCAPCFG, + strlen(PRIV_CMD_EXTCAPCFG)) == 0) { /* Extended capabilities configure */ len = woal_priv_extcapcfg(priv, buf, (t_u32)priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_CANCELSCAN, - strlen(PRIV_CMD_CANCELSCAN)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_CANCELSCAN, + strlen(PRIV_CMD_CANCELSCAN)) == 0) { /* Cancel scan */ len = woal_cancel_scan(priv, MOAL_IOCTL_WAIT); goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_DEEPSLEEP, - strlen(PRIV_CMD_DEEPSLEEP)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_DEEPSLEEP, + strlen(PRIV_CMD_DEEPSLEEP)) == 0) { /* Deep sleep */ len = woal_priv_setgetdeepsleep(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_IPADDR, - strlen(PRIV_CMD_IPADDR)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_IPADDR, + strlen(PRIV_CMD_IPADDR)) == 0) { /* IP address */ len = woal_priv_setgetipaddr(priv, buf, (t_u32)priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_WPSSESSION, - strlen(PRIV_CMD_WPSSESSION)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_WPSSESSION, + strlen(PRIV_CMD_WPSSESSION)) == 0) { /* WPS Session */ len = woal_priv_setwpssession(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_OTPUSERDATA, - strlen(PRIV_CMD_OTPUSERDATA)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_OTPUSERDATA, + strlen(PRIV_CMD_OTPUSERDATA)) == 0) { /* OTP user data */ len = woal_priv_otpuserdata(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_COUNTRYCODE, - strlen(PRIV_CMD_COUNTRYCODE)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_COUNTRYCODE, + strlen(PRIV_CMD_COUNTRYCODE)) == 0) { /* Country code */ len = woal_priv_set_get_countrycode(priv, buf, priv_cmd.total_len); @@ -14704,170 +14791,149 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) len = woal_priv_get_cfpinfo(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_TCPACKENH, - strlen(PRIV_CMD_TCPACKENH)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_TCPACKENH, + strlen(PRIV_CMD_TCPACKENH)) == 0) { /* TCP ack enhancement */ len = woal_priv_setgettcpackenh(priv, buf, priv_cmd.total_len); goto handled; #ifdef REASSOCIATION - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_ASSOCBSSID, - strlen(PRIV_CMD_ASSOCBSSID)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_ASSOCBSSID, + strlen(PRIV_CMD_ASSOCBSSID)) == 0) { /* Associate to essid */ len = woal_priv_assocessid(priv, buf, priv_cmd.total_len, 1); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_ASSOCESSID, - strlen(PRIV_CMD_ASSOCESSID)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_ASSOCESSID, + strlen(PRIV_CMD_ASSOCESSID)) == 0) { /* Associate to essid */ len = woal_priv_assocessid(priv, buf, priv_cmd.total_len, 0); goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_WAKEUPREASON, - strlen(PRIV_CMD_WAKEUPREASON)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_WAKEUPREASON, + strlen(PRIV_CMD_WAKEUPREASON)) == 0) { /* wakeup reason */ len = woal_priv_getwakeupreason(priv, buf, priv_cmd.total_len); goto handled; #ifdef STA_SUPPORT - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_LISTENINTERVAL, - strlen(PRIV_CMD_LISTENINTERVAL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_LISTENINTERVAL, + strlen(PRIV_CMD_LISTENINTERVAL)) == 0) { /* Listen Interval */ - len = woal_priv_set_get_listeninterval(priv, buf, - priv_cmd. - total_len); + len = woal_priv_set_get_listeninterval( + priv, buf, priv_cmd.total_len); goto handled; #endif #ifdef DEBUG_LEVEL1 - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_DRVDBG, - strlen(PRIV_CMD_DRVDBG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_DRVDBG, + strlen(PRIV_CMD_DRVDBG)) == 0) { /* Driver debug bit mask */ len = woal_priv_set_get_drvdbg(priv, buf, priv_cmd.total_len); goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_HSCFG, - strlen(PRIV_CMD_HSCFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_HSCFG, + strlen(PRIV_CMD_HSCFG)) == 0) { /* HS configuration */ len = woal_priv_hscfg(priv, buf, priv_cmd.total_len, MTRUE); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_HSSETPARA, - strlen(PRIV_CMD_HSSETPARA)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_HSSETPARA, + strlen(PRIV_CMD_HSSETPARA)) == 0) { /* Set HS parameter */ len = woal_priv_hssetpara(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_MGMT_FILTER, - strlen(PRIV_CMD_MGMT_FILTER)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_MGMT_FILTER, + strlen(PRIV_CMD_MGMT_FILTER)) == 0) { /* Management frame filter wakeup */ len = woal_priv_mgmt_filter(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_SCANCFG, - strlen(PRIV_CMD_SCANCFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_SCANCFG, + strlen(PRIV_CMD_SCANCFG)) == 0) { /* Scan configuration */ len = woal_priv_set_get_scancfg(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_GETNLNUM, - strlen(PRIV_CMD_GETNLNUM)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_GETNLNUM, + strlen(PRIV_CMD_GETNLNUM)) == 0) { /* Scan configuration */ len = woal_priv_getnlnum(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_AGGRCTRL, - strlen(PRIV_CMD_AGGRCTRL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_AGGRCTRL, + strlen(PRIV_CMD_AGGRCTRL)) == 0) { /* aggregation control */ len = woal_priv_set_get_aggrctrl(priv, buf, priv_cmd.total_len); goto handled; #ifdef USB - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_USBAGGRCTRL, - strlen(PRIV_CMD_USBAGGRCTRL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_USBAGGRCTRL, + strlen(PRIV_CMD_USBAGGRCTRL)) == 0) { /* USB aggregation control */ len = woal_priv_set_get_usbaggrctrl(priv, buf, priv_cmd.total_len); goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_SET_BSS_MODE, - strlen(PRIV_CMD_SET_BSS_MODE)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_SET_BSS_MODE, + strlen(PRIV_CMD_SET_BSS_MODE)) == 0) { /* Set bss mode */ len = woal_priv_set_bss_mode(priv, buf, priv_cmd.total_len); goto handled; #ifdef STA_SUPPORT - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_SET_AP, - strlen(PRIV_CMD_SET_AP)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_SET_AP, + strlen(PRIV_CMD_SET_AP)) == 0) { /* Set AP */ len = woal_priv_set_ap(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_SET_POWER, - strlen(PRIV_CMD_SET_POWER)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_SET_POWER, + strlen(PRIV_CMD_SET_POWER)) == 0) { /* Set power management parameters */ len = woal_priv_set_power(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_SET_ESSID, - strlen(PRIV_CMD_SET_ESSID)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_SET_ESSID, + strlen(PRIV_CMD_SET_ESSID)) == 0) { /* Set essid */ len = woal_priv_set_essid(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_SET_AUTH, - strlen(PRIV_CMD_SET_AUTH)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_SET_AUTH, + strlen(PRIV_CMD_SET_AUTH)) == 0) { /* Set authentication mode parameters */ len = woal_priv_set_auth(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_GET_AP, - strlen(PRIV_CMD_GET_AP)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_GET_AP, + strlen(PRIV_CMD_GET_AP)) == 0) { /* Get AP */ len = woal_priv_get_ap(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_GET_POWER, - strlen(PRIV_CMD_GET_POWER)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_GET_POWER, + strlen(PRIV_CMD_GET_POWER)) == 0) { /* Get power management parameters */ len = woal_priv_get_power(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_PSMODE, - strlen(PRIV_CMD_PSMODE)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_PSMODE, + strlen(PRIV_CMD_PSMODE)) == 0) { /* Set/Get PS mode */ len = woal_priv_set_get_psmode(priv, buf, priv_cmd.total_len); goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_WARMRESET, - strlen(PRIV_CMD_WARMRESET)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_WARMRESET, + strlen(PRIV_CMD_WARMRESET)) == 0) { /* Performs warm reset */ len = woal_priv_warmreset(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_TXPOWERCFG, - strlen(PRIV_CMD_TXPOWERCFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_TXPOWERCFG, + strlen(PRIV_CMD_TXPOWERCFG)) == 0) { /* TX power configurations */ len = woal_priv_txpowercfg(priv, buf, priv_cmd.total_len); @@ -14879,9 +14945,9 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) len = woal_priv_rx_abort_cfg_ext(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_RX_ABORT_CFG, - strlen(PRIV_CMD_RX_ABORT_CFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_RX_ABORT_CFG, + strlen(PRIV_CMD_RX_ABORT_CFG)) == 0) { /* static Rx Abort config */ len = woal_priv_rx_abort_cfg(priv, buf, priv_cmd.total_len); @@ -14893,9 +14959,9 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) len = woal_priv_tx_ampdu_prot_mode(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_RATE_ADAPT_CFG, - strlen(PRIV_CMD_RATE_ADAPT_CFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_RATE_ADAPT_CFG, + strlen(PRIV_CMD_RATE_ADAPT_CFG)) == 0) { /* rate adapt config */ len = woal_priv_rate_adapt_cfg(priv, buf, priv_cmd.total_len); @@ -14907,188 +14973,164 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) len = woal_priv_cck_desense_cfg(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_PSCFG, - strlen(PRIV_CMD_PSCFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_PSCFG, + strlen(PRIV_CMD_PSCFG)) == 0) { /* PS configurations */ len = woal_priv_pscfg(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_BCNTIMEOUTCFG, - strlen(PRIV_CMD_BCNTIMEOUTCFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_BCNTIMEOUTCFG, + strlen(PRIV_CMD_BCNTIMEOUTCFG)) == 0) { /* Beacon timeout configurations */ len = woal_priv_bcntimeoutcfg(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_SLEEPPD, - strlen(PRIV_CMD_SLEEPPD)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_SLEEPPD, + strlen(PRIV_CMD_SLEEPPD)) == 0) { /* Sleep period */ len = woal_priv_sleeppd(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_TXCONTROL, - strlen(PRIV_CMD_TXCONTROL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_TXCONTROL, + strlen(PRIV_CMD_TXCONTROL)) == 0) { /* Tx control */ len = woal_priv_txcontrol(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_REGRDWR, - strlen(PRIV_CMD_REGRDWR)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_REGRDWR, + strlen(PRIV_CMD_REGRDWR)) == 0) { /* Register Read/Write */ len = woal_priv_regrdwr(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_RDEEPROM, - strlen(PRIV_CMD_RDEEPROM)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_RDEEPROM, + strlen(PRIV_CMD_RDEEPROM)) == 0) { /* Read the EEPROM contents of the card */ len = woal_priv_rdeeprom(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_MEMRDWR, - strlen(PRIV_CMD_MEMRDWR)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_MEMRDWR, + strlen(PRIV_CMD_MEMRDWR)) == 0) { /* Memory Read/Write */ len = woal_priv_memrdwr(priv, buf, priv_cmd.total_len); goto handled; #ifdef SDIO - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_SDCMD52RW, - strlen(PRIV_CMD_SDCMD52RW)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_SDCMD52RW, + strlen(PRIV_CMD_SDCMD52RW)) == 0) { /* Cmd52 read/write register */ len = woal_priv_sdcmd52rw(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_SDIO_CLOCK, - strlen(PRIV_CMD_SDIO_CLOCK)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_SDIO_CLOCK, + strlen(PRIV_CMD_SDIO_CLOCK)) == 0) { /* Turn on/off the sdio clock */ len = woal_priv_sdio_clock_ioctl(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_MPA_CTRL, - strlen(PRIV_CMD_MPA_CTRL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_MPA_CTRL, + strlen(PRIV_CMD_MPA_CTRL)) == 0) { /* Set SDIO Multi-point aggregation * control parameters */ len = woal_priv_sdio_mpa_ctrl(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_SD_CMD53_RW, - strlen(PRIV_CMD_SD_CMD53_RW)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_SD_CMD53_RW, + strlen(PRIV_CMD_SD_CMD53_RW)) == 0) { /* Cmd53 read/write register */ len = woal_priv_cmd53rdwr(priv, buf, priv_cmd.total_len); goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_ROBUSTCOEX, - strlen(PRIV_CMD_ROBUSTCOEX)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_ROBUSTCOEX, + strlen(PRIV_CMD_ROBUSTCOEX)) == 0) { /* Set Robustcoex GPIOcfg */ pdata = buf + strlen(CMD_NXP) + strlen(PRIV_CMD_ROBUSTCOEX); len = priv_cmd.total_len - strlen(PRIV_CMD_ROBUSTCOEX) - - strlen(CMD_NXP); + strlen(CMD_NXP); len = woal_priv_robustcoex(priv, pdata, len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_DMCS, - strlen(PRIV_CMD_DMCS)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_DMCS, + strlen(PRIV_CMD_DMCS)) == 0) { /* Set/Get DMCS config */ len = woal_priv_dmcs(priv, buf, priv_cmd.total_len); goto handled; #if defined(PCIE) - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_SSU, - strlen(PRIV_CMD_SSU)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_SSU, + strlen(PRIV_CMD_SSU)) == 0) { /* Set SSU config */ pdata = buf + strlen(CMD_NXP) + strlen(PRIV_CMD_SSU); len = priv_cmd.used_len - strlen(PRIV_CMD_SSU) - - strlen(CMD_NXP); + strlen(CMD_NXP); len = woal_priv_ssu_cmd(priv, len, pdata, priv_cmd.total_len); goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_AUTO_ARP, - strlen(PRIV_CMD_AUTO_ARP)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_AUTO_ARP, + strlen(PRIV_CMD_AUTO_ARP)) == 0) { /* Auto ARP enable/disable */ len = woal_priv_set_get_auto_arp(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_HOTSPOTCFG, - strlen(PRIV_CMD_HOTSPOTCFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_HOTSPOTCFG, + strlen(PRIV_CMD_HOTSPOTCFG)) == 0) { /* Hotspot CFG */ len = woal_priv_hotspotcfg(priv, buf, priv_cmd.total_len); goto handled; #ifdef RX_PACKET_COALESCE - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_RX_COAL_CFG, - strlen(PRIV_CMD_RX_COAL_CFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_RX_COAL_CFG, + strlen(PRIV_CMD_RX_COAL_CFG)) == 0) { /* RX packet coalescing Configuration */ len = woal_priv_rx_pkt_coalesce_cfg(priv, buf, priv_cmd.total_len); goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_MGMT_FRAME_CTRL, - strlen(PRIV_CMD_MGMT_FRAME_CTRL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_MGMT_FRAME_CTRL, + strlen(PRIV_CMD_MGMT_FRAME_CTRL)) == 0) { /* Mgmt Frame Passthrough Ctrl */ - len = woal_priv_mgmt_frame_passthru_ctrl(priv, buf, - priv_cmd. - total_len); + len = woal_priv_mgmt_frame_passthru_ctrl( + priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_QCONFIG, - strlen(PRIV_CMD_QCONFIG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_QCONFIG, + strlen(PRIV_CMD_QCONFIG)) == 0) { /* Queue config */ len = woal_priv_qconfig(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_ADDTS, - strlen(PRIV_CMD_ADDTS)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_ADDTS, + strlen(PRIV_CMD_ADDTS)) == 0) { /* Send an ADDTS TSPEC */ len = woal_priv_wmm_addts_req_ioctl(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_DELTS, - strlen(PRIV_CMD_DELTS)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_DELTS, + strlen(PRIV_CMD_DELTS)) == 0) { /* Send a DELTS TSPE */ len = woal_priv_wmm_delts_req_ioctl(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_QSTATUS, - strlen(PRIV_CMD_QSTATUS)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_QSTATUS, + strlen(PRIV_CMD_QSTATUS)) == 0) { /* Get the status of the WMM queues */ - len = woal_priv_wmm_queue_status_ioctl(priv, buf, - priv_cmd. - total_len); + len = woal_priv_wmm_queue_status_ioctl( + priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_TS_STATUS, - strlen(PRIV_CMD_TS_STATUS)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_TS_STATUS, + strlen(PRIV_CMD_TS_STATUS)) == 0) { /* Get the status of the WMM Traffic Streams */ len = woal_priv_wmm_ts_status_ioctl(priv, buf, priv_cmd.total_len); goto handled; #ifdef STA_SUPPORT - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_QOS_CFG, - strlen(PRIV_CMD_QOS_CFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_QOS_CFG, + strlen(PRIV_CMD_QOS_CFG)) == 0) { t_u32 action = MLAN_ACT_GET; if (strlen(buf) == strlen(CMD_NXP) + strlen(PRIV_CMD_QOS_CFG)) { - pdata = buf; /* GET operation */ + pdata = buf; /* GET operation */ } else { pdata = buf + strlen(CMD_NXP) + strlen(PRIV_CMD_QOS_CFG); - action = MLAN_ACT_SET; /* SET operation */ + action = MLAN_ACT_SET; /* SET operation */ } if (MLAN_STATUS_SUCCESS != woal_priv_qos_cfg(priv, action, pdata)) { @@ -15099,74 +15141,66 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) len = sizeof(t_u8); goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_MAC_CTRL, - strlen(PRIV_CMD_MAC_CTRL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_MAC_CTRL, + strlen(PRIV_CMD_MAC_CTRL)) == 0) { /* MAC CTRL */ len = woal_priv_macctrl(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_GETWAP, - strlen(PRIV_CMD_GETWAP)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_GETWAP, + strlen(PRIV_CMD_GETWAP)) == 0) { /* Get WAP */ len = woal_priv_getwap(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_REGION_CODE, - strlen(PRIV_CMD_REGION_CODE)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_REGION_CODE, + strlen(PRIV_CMD_REGION_CODE)) == 0) { /* Region Code */ len = woal_priv_region_code(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_FWMACADDR, - strlen(PRIV_CMD_FWMACADDR)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_FWMACADDR, + strlen(PRIV_CMD_FWMACADDR)) == 0) { /* Set FW MAC address */ len = woal_priv_fwmacaddr(priv, buf, priv_cmd.total_len); goto handled; #if defined(STA_CFG80211) || defined(UAP_CFG80211) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_OFFCHANNEL, - strlen(PRIV_CMD_OFFCHANNEL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_OFFCHANNEL, + strlen(PRIV_CMD_OFFCHANNEL)) == 0) { if (IS_STA_CFG80211(cfg80211_wext)) { /* Set offchannel */ len = woal_priv_offchannel(priv, buf, priv_cmd.total_len); } else len = sprintf(buf, - "CFG80211 is not enabled\n") + 1; + "CFG80211 is not enabled\n") + + 1; goto handled; #endif #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_DSCP_MAP, - strlen(PRIV_CMD_DSCP_MAP)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_DSCP_MAP, + strlen(PRIV_CMD_DSCP_MAP)) == 0) { /* Set/Get DSCP Map */ len = woal_priv_set_get_dscp_map(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_VEREXT, - strlen(PRIV_CMD_VEREXT)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_VEREXT, + strlen(PRIV_CMD_VEREXT)) == 0) { /* Get Extended version */ len = woal_priv_get_driver_verext(priv, buf, priv_cmd.total_len); goto handled; #ifdef USB #ifdef CONFIG_USB_SUSPEND - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_USB_SUSPEND, - strlen(PRIV_CMD_USB_SUSPEND)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_USB_SUSPEND, + strlen(PRIV_CMD_USB_SUSPEND)) == 0) { /* Makes USB device to suspend */ len = woal_priv_enter_usb_suspend(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_USB_RESUME, - strlen(PRIV_CMD_USB_RESUME)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_USB_RESUME, + strlen(PRIV_CMD_USB_RESUME)) == 0) { /* Makes USB device to resume */ len = woal_priv_exit_usb_suspend(priv, buf, priv_cmd.total_len); @@ -15174,229 +15208,210 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) #endif /* CONFIG_USB_SUSPEND */ #endif #if defined(STA_SUPPORT) && defined(STA_WEXT) - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_RADIO_CTRL, - strlen(PRIV_CMD_RADIO_CTRL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_RADIO_CTRL, + strlen(PRIV_CMD_RADIO_CTRL)) == 0) { /* Set/Get radio */ len = woal_priv_radio_ctrl(priv, buf, priv_cmd.total_len); goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_WMM_CFG, - strlen(PRIV_CMD_WMM_CFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_WMM_CFG, + strlen(PRIV_CMD_WMM_CFG)) == 0) { /* Implement WMM enable command */ len = woal_priv_wmm_cfg(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_MIN_BA_THRESH_CFG, - strlen(PRIV_CMD_MIN_BA_THRESH_CFG)) == 0) { - /* Implement Minimum BA threshold configuration command */ - len = woal_priv_min_ba_threshold_cfg(priv, buf, - priv_cmd. - total_len); + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_MIN_BA_THRESH_CFG, + strlen(PRIV_CMD_MIN_BA_THRESH_CFG)) == 0) { + /* Implement Minimum BA threshold configuration command + */ + len = woal_priv_min_ba_threshold_cfg( + priv, buf, priv_cmd.total_len); goto handled; #if defined(STA_SUPPORT) - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_11D_CFG, - strlen(PRIV_CMD_11D_CFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_11D_CFG, + strlen(PRIV_CMD_11D_CFG)) == 0) { /* Implement 802.11D enable command */ len = woal_priv_11d_cfg(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_11D_CLR_TBL, - strlen(PRIV_CMD_11D_CLR_TBL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_11D_CLR_TBL, + strlen(PRIV_CMD_11D_CLR_TBL)) == 0) { /* Implement 802.11D clear chan table command */ len = woal_priv_11d_clr_chan_tbl(priv, buf, priv_cmd.total_len); goto handled; #endif #ifndef OPCHAN - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_WWS_CFG, - strlen(PRIV_CMD_WWS_CFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_WWS_CFG, + strlen(PRIV_CMD_WWS_CFG)) == 0) { /* Set/Get WWS configuration */ len = woal_priv_wws_cfg(priv, buf, priv_cmd.total_len); goto handled; #endif #if defined(REASSOCIATION) - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_REASSOCTRL, - strlen(PRIV_CMD_REASSOCTRL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_REASSOCTRL, + strlen(PRIV_CMD_REASSOCTRL)) == 0) { /* Set/Get reassociation settings */ len = woal_priv_set_get_reassoc(priv, buf, priv_cmd.total_len); goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_TXBUF_CFG, - strlen(PRIV_CMD_TXBUF_CFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_TXBUF_CFG, + strlen(PRIV_CMD_TXBUF_CFG)) == 0) { /* Get Transmit buffer size */ len = woal_priv_txbuf_cfg(priv, buf, priv_cmd.total_len); goto handled; #ifdef STA_SUPPORT - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_AUTH_TYPE, - strlen(PRIV_CMD_AUTH_TYPE)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_AUTH_TYPE, + strlen(PRIV_CMD_AUTH_TYPE)) == 0) { /* Set/Get auth type */ len = woal_priv_auth_type(priv, buf, priv_cmd.total_len); goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_POWER_CONS, - strlen(PRIV_CMD_POWER_CONS)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_POWER_CONS, + strlen(PRIV_CMD_POWER_CONS)) == 0) { /* Set/get user provisioned local power constraint */ - len = woal_priv_11h_local_pwr_constraint(priv, buf, - priv_cmd. - total_len); + len = woal_priv_11h_local_pwr_constraint( + priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_HT_STREAM_CFG, - strlen(PRIV_CMD_HT_STREAM_CFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_HT_STREAM_CFG, + strlen(PRIV_CMD_HT_STREAM_CFG)) == 0) { /* Set/get HT stream configurations */ len = woal_priv_ht_stream_cfg(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_MIMO_SWITCH, - strlen(PRIV_CMD_MIMO_SWITCH)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_MIMO_SWITCH, + strlen(PRIV_CMD_MIMO_SWITCH)) == 0) { /* Set mimo switch configurations */ len = woal_priv_mimo_switch(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_THERMAL, - strlen(PRIV_CMD_THERMAL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_THERMAL, + strlen(PRIV_CMD_THERMAL)) == 0) { /* Get thermal reading */ len = woal_priv_thermal(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_BCN_INTERVAL, - strlen(PRIV_CMD_BCN_INTERVAL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_BCN_INTERVAL, + strlen(PRIV_CMD_BCN_INTERVAL)) == 0) { /* Set/Get beacon interval */ len = woal_priv_beacon_interval(priv, buf, priv_cmd.total_len); goto handled; #ifdef STA_SUPPORT - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_SIGNALEXT_CFG, - strlen(PRIV_CMD_SIGNALEXT_CFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_SIGNALEXT_CFG, + strlen(PRIV_CMD_SIGNALEXT_CFG)) == 0) { /* Set signalext flag */ len = woal_priv_signalext_cfg(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_GET_SIGNAL_EXT_V2, - strlen(PRIV_CMD_GET_SIGNAL_EXT_V2)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_GET_SIGNAL_EXT_V2, + strlen(PRIV_CMD_GET_SIGNAL_EXT_V2)) == 0) { /* Get signal info */ len = woal_priv_get_signal_ext_v2(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_GET_SIGNAL_EXT, - strlen(PRIV_CMD_GET_SIGNAL_EXT)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_GET_SIGNAL_EXT, + strlen(PRIV_CMD_GET_SIGNAL_EXT)) == 0) { /* Get signal info */ len = woal_priv_get_signal_ext(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_GET_SIGNAL, - strlen(PRIV_CMD_GET_SIGNAL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_GET_SIGNAL, + strlen(PRIV_CMD_GET_SIGNAL)) == 0) { /* Get signal */ len = woal_priv_get_signal(priv, buf, priv_cmd.total_len); goto handled; #endif #if defined(STA_SUPPORT) - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_PMFCFG, - strlen(PRIV_CMD_PMFCFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_PMFCFG, + strlen(PRIV_CMD_PMFCFG)) == 0) { /* Configure PMF */ len = woal_priv_set_get_pmfcfg(priv, buf, priv_cmd.total_len); goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_INACTIVITYTO, - strlen(PRIV_CMD_INACTIVITYTO)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_INACTIVITYTO, + strlen(PRIV_CMD_INACTIVITYTO)) == 0) { /* Get/Set inactivity timeout extend */ - len = woal_priv_inactivity_timeout_ext(priv, buf, - priv_cmd. - total_len); + len = woal_priv_inactivity_timeout_ext( + priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_AMSDU_AGGR_CTRL, - strlen(PRIV_CMD_AMSDU_AGGR_CTRL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_AMSDU_AGGR_CTRL, + strlen(PRIV_CMD_AMSDU_AGGR_CTRL)) == 0) { /* Enable/Disable amsdu_aggr_ctrl */ len = woal_priv_11n_amsdu_aggr_ctrl(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_TX_BF_CAP, - strlen(PRIV_CMD_TX_BF_CAP)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_TX_BF_CAP, + strlen(PRIV_CMD_TX_BF_CAP)) == 0) { /* Set/Get Transmit beamforming capabilities */ len = woal_priv_tx_bf_cap_ioctl(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_SLEEP_PARAMS, - strlen(PRIV_CMD_SLEEP_PARAMS)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_SLEEP_PARAMS, + strlen(PRIV_CMD_SLEEP_PARAMS)) == 0) { /* Configure sleep parameters */ len = woal_priv_sleep_params_ioctl(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_DFS_TESTING, - strlen(PRIV_CMD_DFS_TESTING)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_DFS_TESTING, + strlen(PRIV_CMD_DFS_TESTING)) == 0) { /* Set/Get DFS Testing settings */ len = woal_priv_dfs_testing(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_CFP_CODE, - strlen(PRIV_CMD_CFP_CODE)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_DFS53_CFG, + strlen(PRIV_CMD_DFS53_CFG)) == 0) { + /* Set/Get DFS W53 settings */ + len = woal_priv_dfs53cfg(priv, buf, priv_cmd.total_len); + goto handled; + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_CFP_CODE, + strlen(PRIV_CMD_CFP_CODE)) == 0) { /* Set/Get CFP table codes */ len = woal_priv_cfp_code(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_CWMODE, - strlen(PRIV_CMD_CWMODE)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_CWMODE, + strlen(PRIV_CMD_CWMODE)) == 0) { /* Set/Get Tx CWMode */ len = woal_priv_set_get_cwmode(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_ANT_CFG, - strlen(PRIV_CMD_ANT_CFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_ANT_CFG, + strlen(PRIV_CMD_ANT_CFG)) == 0) { /* Set/Get Tx/Rx antenna */ len = woal_priv_set_get_tx_rx_ant(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_SYSCLOCK, - strlen(PRIV_CMD_SYSCLOCK)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_SYSCLOCK, + strlen(PRIV_CMD_SYSCLOCK)) == 0) { /* Get/Set system clock */ len = woal_priv_sysclock(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_GET_KEY, - strlen(PRIV_CMD_GET_KEY)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_GET_KEY, + strlen(PRIV_CMD_GET_KEY)) == 0) { /* Get GTK/PTK */ len = woal_priv_get_key(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_ASSOCIATE, - strlen(PRIV_CMD_ASSOCIATE)) == 0) { - /* Associate to a specific indexed entry in the ScanTable */ - len = woal_priv_associate_ssid_bssid(priv, buf, - priv_cmd. - total_len); + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_ASSOCIATE, + strlen(PRIV_CMD_ASSOCIATE)) == 0) { + /* Associate to a specific indexed entry in the + * ScanTable */ + len = woal_priv_associate_ssid_bssid( + priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_TX_BF_CFG, - strlen(PRIV_CMD_TX_BF_CFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_TX_BF_CFG, + strlen(PRIV_CMD_TX_BF_CFG)) == 0) { /* Set/Get Transmit beamforming configuration */ len = woal_priv_tx_bf_cfg(priv, buf, priv_cmd.total_len); @@ -15406,135 +15421,125 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) len = woal_priv_bootsleep(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_PORT_CTRL, - strlen(PRIV_CMD_PORT_CTRL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_PORT_CTRL, + strlen(PRIV_CMD_PORT_CTRL)) == 0) { /* Set/Get Port Control mode */ len = woal_priv_port_ctrl(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_PB_BYPASS, - strlen(PRIV_CMD_PB_BYPASS)) == 0) { - /* Private IOCTL entry to get the By-passed TX packet from upper layer */ + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_PB_BYPASS, + strlen(PRIV_CMD_PB_BYPASS)) == 0) { + /* Private IOCTL entry to get the By-passed TX packet + * from upper layer */ len = woal_priv_bypassed_packet(priv, buf, priv_cmd.total_len); goto handled; #ifdef WIFI_DIRECT_SUPPORT #if defined(UAP_CFG80211) - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_CFG_NOA, - strlen(PRIV_CMD_CFG_NOA)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_CFG_NOA, + strlen(PRIV_CMD_CFG_NOA)) == 0) { /* Set/Get P2P NoA (Notice of Absence) parameters */ len = woal_priv_cfg_noa(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_CFG_OPP_PS, - strlen(PRIV_CMD_CFG_OPP_PS)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_CFG_OPP_PS, + strlen(PRIV_CMD_CFG_OPP_PS)) == 0) { /* Set/Get P2P OPP-PS parameters */ len = woal_priv_cfg_opp_ps(priv, buf, priv_cmd.total_len); goto handled; #endif #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_DFS_REPEATER_CFG, - strlen(PRIV_CMD_DFS_REPEATER_CFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_DFS_REPEATER_CFG, + strlen(PRIV_CMD_DFS_REPEATER_CFG)) == 0) { /* Set/Get DFS_REPEATER mode */ len = woal_priv_dfs_repeater_cfg(priv, buf, priv_cmd.total_len); goto handled; #ifdef WIFI_DIRECT_SUPPORT #if defined(STA_CFG80211) || defined(UAP_CFG80211) - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_MIRACAST_CFG, - strlen(PRIV_CMD_MIRACAST_CFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_MIRACAST_CFG, + strlen(PRIV_CMD_MIRACAST_CFG)) == 0) { /* Set/Get MIRACAST configuration parameters */ len = woal_priv_miracast_cfg(priv, buf, priv_cmd.total_len); goto handled; #endif #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_COEX_RX_WINSIZE, - strlen(PRIV_CMD_COEX_RX_WINSIZE)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_COEX_RX_WINSIZE, + strlen(PRIV_CMD_COEX_RX_WINSIZE)) == 0) { /* Set/Get control to coex RX window size */ len = woal_priv_coex_rx_winsize(priv, buf, priv_cmd.total_len); goto handled; #ifdef PCIE - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_PCIE_REG_RW, - strlen(PRIV_CMD_PCIE_REG_RW)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_PCIE_REG_RW, + strlen(PRIV_CMD_PCIE_REG_RW)) == 0) { /* Read/Write PCIE register */ len = woal_priv_pcie_reg_rw(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_PCIE_BAR0_REG_RW, - strlen(PRIV_CMD_PCIE_BAR0_REG_RW)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_PCIE_BAR0_REG_RW, + strlen(PRIV_CMD_PCIE_BAR0_REG_RW)) == 0) { /* Read/Write PCIE register/memory from BAR0 */ len = woal_priv_pcie_bar0_reg_rw(priv, buf, priv_cmd.total_len); goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_GET_SENSOR_TEMP, - strlen(PRIV_CMD_GET_SENSOR_TEMP)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_GET_SENSOR_TEMP, + strlen(PRIV_CMD_GET_SENSOR_TEMP)) == 0) { /* Get SOC temperature */ len = woal_priv_get_sensor_temp(priv, buf, priv_cmd.total_len); goto handled; #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) #if defined(STA_CFG80211) || defined(UAP_CFG80211) - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_DFS_OFFLOAD, - strlen(PRIV_CMD_DFS_OFFLOAD)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_DFS_OFFLOAD, + strlen(PRIV_CMD_DFS_OFFLOAD)) == 0) { /* Enable/disable DFS offload */ if (IS_STA_OR_UAP_CFG80211(cfg80211_wext)) - len = woal_priv_dfs_offload_enable(priv, buf, - priv_cmd. - total_len); + len = woal_priv_dfs_offload_enable( + priv, buf, priv_cmd.total_len); else len = sprintf(buf, - "CFG80211 is not enabled\n") + 1; + "CFG80211 is not enabled\n") + + 1; goto handled; #endif #endif #if defined(UAP_SUPPORT) - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_EXTEND_CHAN_SWITCH, - strlen(PRIV_CMD_EXTEND_CHAN_SWITCH)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_EXTEND_CHAN_SWITCH, + strlen(PRIV_CMD_EXTEND_CHAN_SWITCH)) == 0) { /* Extended channel switch */ - len = woal_priv_extend_channel_switch(priv, buf, - priv_cmd. - total_len); + len = woal_priv_extend_channel_switch( + priv, buf, priv_cmd.total_len); goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_DYN_BW, - strlen(PRIV_CMD_DYN_BW)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_DYN_BW, + strlen(PRIV_CMD_DYN_BW)) == 0) { /* Set/Get dynamic bandwidth */ len = woal_priv_config_dyn_bw(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_IND_RST_CFG, - strlen(PRIV_CMD_IND_RST_CFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_IND_RST_CFG, + strlen(PRIV_CMD_IND_RST_CFG)) == 0) { /* Set/Get out band independent reset */ len = woal_priv_ind_rst_cfg(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_PER_PKT_CFG, - strlen(PRIV_CMD_PER_PKT_CFG)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_PER_PKT_CFG, + strlen(PRIV_CMD_PER_PKT_CFG)) == 0) { /* Get/Set per packet Txctl and Rxinfo configuration */ len = woal_priv_per_pkt_cfg(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_DEAUTH_CTRL, - strlen(PRIV_CMD_DEAUTH_CTRL)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_DEAUTH_CTRL, + strlen(PRIV_CMD_DEAUTH_CTRL)) == 0) { len = woal_priv_deauth_ctrl(priv, buf, priv_cmd.total_len); goto handled; @@ -15543,28 +15548,49 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) pdata = buf + strlen(CMD_NXP) + strlen(PRIV_CMD_11AXCFG); len = priv_cmd.used_len - strlen(PRIV_CMD_11AXCFG) - - strlen(CMD_NXP); + strlen(CMD_NXP); len = woal_priv_11axcfg_cmd(priv, pdata, len, priv_cmd.total_len); len += strlen(PRIV_CMD_11AXCFG) + strlen(CMD_NXP); goto handled; + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_TWT_SETUP, + strlen(PRIV_CMD_TWT_SETUP)) == 0) { + pdata = buf + strlen(CMD_NXP) + + strlen(PRIV_CMD_TWT_SETUP); + len = priv_cmd.used_len - strlen(PRIV_CMD_TWT_SETUP) - + strlen(CMD_NXP); + len = woal_priv_twt_setup(priv, pdata, len, + priv_cmd.total_len); + len += strlen(PRIV_CMD_TWT_SETUP) + strlen(CMD_NXP); + goto handled; + + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_TWT_TEARDOWN, + strlen(PRIV_CMD_TWT_TEARDOWN)) == 0) { + pdata = buf + strlen(CMD_NXP) + + strlen(PRIV_CMD_TWT_TEARDOWN); + len = priv_cmd.used_len - + strlen(PRIV_CMD_TWT_TEARDOWN) - strlen(CMD_NXP); + len = woal_priv_twt_teardown(priv, pdata, len, + priv_cmd.total_len); + len += strlen(PRIV_CMD_TWT_TEARDOWN) + strlen(CMD_NXP); + goto handled; #if defined(STA_CFG80211) || defined(UAP_CFG80211) - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_GET_CFG_CHAN_LIST, - strlen(PRIV_CMD_GET_CFG_CHAN_LIST)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), + PRIV_CMD_GET_CFG_CHAN_LIST, + strlen(PRIV_CMD_GET_CFG_CHAN_LIST)) == 0) { /* Get txpwrlimit */ if (IS_STA_OR_UAP_CFG80211(cfg80211_wext)) - len = woal_priv_getcfgchanlist(priv, buf, - priv_cmd. - total_len); + len = woal_priv_getcfgchanlist( + priv, buf, priv_cmd.total_len); else len = sprintf(buf, - "CFG80211 is not enabled\n") + 1; + "CFG80211 is not enabled\n") + + 1; goto handled; #endif - } else if (strnicmp - (buf + strlen(CMD_NXP), PRIV_CMD_LPM, - strlen(PRIV_CMD_LPM)) == 0) { + } else if (strnicmp(buf + strlen(CMD_NXP), PRIV_CMD_LPM, + strlen(PRIV_CMD_LPM)) == 0) { /* Set/Get low power mode */ len = woal_priv_set_get_lpm(priv, buf, priv_cmd.total_len); @@ -15578,7 +15604,8 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) } } #ifdef STA_SUPPORT - if (strncmp(buf, "RSSILOW-THRESHOLD", strlen("RSSILOW-THRESHOLD")) == 0) { + if (strncmp(buf, "RSSILOW-THRESHOLD", strlen("RSSILOW-THRESHOLD")) == + 0) { pdata = buf + strlen("RSSILOW-THRESHOLD") + 1; if (MLAN_STATUS_SUCCESS != woal_set_rssi_low_threshold(priv, pdata, MOAL_IOCTL_WAIT)) { @@ -15595,23 +15622,21 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) } len = sprintf(buf, "OK\n") + 1; } else if (strncmp(buf, "RSSI", strlen("RSSI")) == 0) { - if (MLAN_STATUS_SUCCESS != woal_get_bss_info(priv, - MOAL_IOCTL_WAIT, - &bss_info)) { + if (MLAN_STATUS_SUCCESS != + woal_get_bss_info(priv, MOAL_IOCTL_WAIT, &bss_info)) { ret = -EFAULT; goto done; } if (bss_info.media_connected) { - if (MLAN_STATUS_SUCCESS != woal_get_signal_info(priv, - MOAL_IOCTL_WAIT, - &signal)) - { + if (MLAN_STATUS_SUCCESS != + woal_get_signal_info(priv, MOAL_IOCTL_WAIT, + &signal)) { ret = -EFAULT; goto done; } len = sprintf(buf, "%.32s rssi %d\n", - bss_info.ssid.ssid, - signal.bcn_rssi_avg) + 1; + bss_info.ssid.ssid, signal.bcn_rssi_avg) + + 1; } else { len = sprintf(buf, "OK\n") + 1; } @@ -15623,15 +15648,16 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) } PRINTM(MIOCTL, "tx rate=%d\n", (int)rate.rate); len = sprintf(buf, "LinkSpeed %d\n", - (int)(rate.rate * 500000 / 1000000)) - + 1; + (int)(rate.rate * 500000 / 1000000)) + + 1; } else #endif - if (strncmp(buf, "MACADDR", strlen("MACADDR")) == 0) { + if (strncmp(buf, "MACADDR", strlen("MACADDR")) == 0) { len = sprintf(buf, "Macaddr = %02X:%02X:%02X:%02X:%02X:%02X\n", priv->current_addr[0], priv->current_addr[1], priv->current_addr[2], priv->current_addr[3], - priv->current_addr[4], priv->current_addr[5]) + 1; + priv->current_addr[4], priv->current_addr[5]) + + 1; } #ifdef STA_SUPPORT else if (strncmp(buf, "GETPOWER", strlen("GETPOWER")) == 0) { @@ -15642,9 +15668,8 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) } len = sprintf(buf, "powermode = %d\n", power_mode) + 1; } else if (strncmp(buf, "SCAN-ACTIVE", strlen("SCAN-ACTIVE")) == 0) { - if (MLAN_STATUS_SUCCESS != woal_set_scan_type(priv, - MLAN_SCAN_TYPE_ACTIVE)) - { + if (MLAN_STATUS_SUCCESS != + woal_set_scan_type(priv, MLAN_SCAN_TYPE_ACTIVE)) { ret = -EFAULT; goto done; } @@ -15652,9 +15677,8 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) PRINTM(MIOCTL, "Set Active Scan\n"); len = sprintf(buf, "OK\n") + 1; } else if (strncmp(buf, "SCAN-PASSIVE", strlen("SCAN-PASSIVE")) == 0) { - if (MLAN_STATUS_SUCCESS != woal_set_scan_type(priv, - MLAN_SCAN_TYPE_PASSIVE)) - { + if (MLAN_STATUS_SUCCESS != + woal_set_scan_type(priv, MLAN_SCAN_TYPE_PASSIVE)) { ret = -EFAULT; goto done; } @@ -15731,8 +15755,8 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) if (IS_STA_CFG80211(cfg80211_wext)) { PRINTM(MIOCTL, "Notify country code=%s\n", country_code); - if (!moal_extflg_isset - (priv->phandle, EXT_DISABLE_REGD_BY_DRIVER)) + if (!moal_extflg_isset(priv->phandle, + EXT_DISABLE_REGD_BY_DRIVER)) regulatory_hint(priv->wdev->wiphy, country_code); len = sprintf(buf, "OK\n") + 1; @@ -15745,11 +15769,11 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) goto done; } len = sprintf(buf, "OK\n") + 1; - } else if (memcmp(buf, WEXT_CSCAN_HEADER, WEXT_CSCAN_HEADER_SIZE) == 0) { + } else if (memcmp(buf, WEXT_CSCAN_HEADER, WEXT_CSCAN_HEADER_SIZE) == + 0) { PRINTM(MIOCTL, "Set Combo Scan\n"); - if (MLAN_STATUS_SUCCESS != woal_set_combo_scan(priv, buf, - priv_cmd. - total_len)) { + if (MLAN_STATUS_SUCCESS != + woal_set_combo_scan(priv, buf, priv_cmd.total_len)) { ret = -EFAULT; goto done; } @@ -15791,7 +15815,7 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) pdata = buf + strlen("AP_SET_CFG") + 1; ret = woal_uap_set_ap_cfg(priv, pdata, priv_cmd.total_len - - strlen("AP_SET_CFG") - 1); + strlen("AP_SET_CFG") - 1); if (ret) goto done; len = sprintf(buf, "OK\n") + 1; @@ -15812,8 +15836,8 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) len = sprintf(buf, "OK\n") + 1; } else if (strncmp(buf, "BTCOEXMODE", strlen("BTCOEXMODE")) == 0) { len = sprintf(buf, "OK\n") + 1; - } else if (strncmp(buf, "BTCOEXSCAN-START", strlen("BTCOEXSCAN-START")) - == 0) { + } else if (strncmp(buf, "BTCOEXSCAN-START", + strlen("BTCOEXSCAN-START")) == 0) { len = sprintf(buf, "OK\n") + 1; } else if (strncmp(buf, "BTCOEXSCAN-STOP", strlen("BTCOEXSCAN-STOP")) == 0) { @@ -15822,7 +15846,8 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) #ifdef STA_SUPPORT else if (strncmp(buf, "BGSCAN-START", strlen("BGSCAN-START")) == 0) { len = sprintf(buf, "OK\n") + 1; - } else if (strncmp(buf, "BGSCAN-CONFIG", strlen("BGSCAN-CONFIG")) == 0) { + } else if (strncmp(buf, "BGSCAN-CONFIG", strlen("BGSCAN-CONFIG")) == + 0) { if (MLAN_STATUS_SUCCESS != woal_set_bg_scan(priv, buf, priv_cmd.total_len)) { ret = -EFAULT; @@ -15850,7 +15875,8 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) goto done; #endif len = sprintf(buf, "OK\n") + 1; - } else if (strncmp(buf, "RXFILTER-STOP", strlen("RXFILTER-STOP")) == 0) { + } else if (strncmp(buf, "RXFILTER-STOP", strlen("RXFILTER-STOP")) == + 0) { #ifdef MEF_CFG_RX_FILTER ret = woal_set_rxfilter(priv, MFALSE); if (ret) @@ -15862,8 +15888,8 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) else if (strncmp(buf, "GET_EVENT", strlen("GET_EVENT")) == 0) { if (IS_STA_CFG80211(cfg80211_wext)) { if (priv->last_event & EVENT_BG_SCAN_REPORT) - woal_inform_bss_from_scan_result(priv, NULL, - MOAL_IOCTL_WAIT); + woal_inform_bss_from_scan_result( + priv, NULL, MOAL_IOCTL_WAIT); } len = sprintf(buf, "EVENT=%d\n", priv->last_event) + 1; priv->last_event = 0; @@ -15916,7 +15942,8 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) if (MLAN_STATUS_SUCCESS != woal_set_ap_wps_p2p_ie(priv, (t_u8 *)pdata, priv_cmd.used_len - - strlen("SET_AP_WPS_P2P_IE") - 1)) { + strlen("SET_AP_WPS_P2P_IE") - + 1)) { ret = -EFAULT; goto done; } @@ -15926,7 +15953,7 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) } #endif else if (strncmp(buf, "P2P_DEV_ADDR", strlen("P2P_DEV_ADDR")) == 0) { - memset(buf, 0x0, (size_t) priv_cmd.total_len); + memset(buf, 0x0, (size_t)priv_cmd.total_len); moal_memcpy_ext(priv->phandle, buf, priv->current_addr, ETH_ALEN, (t_u32)priv_cmd.total_len); len = ETH_ALEN; @@ -15934,7 +15961,7 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) /* TODO * Just return '\0' */ - memset(buf, 0x0, (size_t) priv_cmd.total_len); + memset(buf, 0x0, (size_t)priv_cmd.total_len); *buf = 0; len = 1; } else if (strnicmp(buf, "MIRACAST", strlen("MIRACAST")) == 0) { @@ -15949,7 +15976,7 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) if (MLAN_STATUS_SUCCESS != woal_set_miracast_mode(priv, (t_u8 *)pdata, priv_cmd.used_len - - strlen("MIRACAST"))) { + strlen("MIRACAST"))) { ret = -EFAULT; goto done; } @@ -15985,9 +16012,8 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) goto done; } len = sprintf(buf, "OK\n") + 1; - } else if (strncmp - (buf, "FAKE_SCAN_COMPLETE", - strlen("FAKE_SCAN_COMPLETE")) == 0) { + } else if (strncmp(buf, "FAKE_SCAN_COMPLETE", + strlen("FAKE_SCAN_COMPLETE")) == 0) { pdata = buf + strlen("FAKE_SCAN_COMPLETE") + 1; #ifdef STA_CFG80211 if (*pdata == '1') { @@ -16002,9 +16028,8 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) } #if defined(STA_CFG80211) || defined(UAP_CFG80211) #ifdef WIFI_DIRECT_SUPPORT - else if (strncmp - (buf, "P2P_PERIODIC_SLEEP", - strlen("P2P_PERIODIC_SLEEP")) == 0) { + else if (strncmp(buf, "P2P_PERIODIC_SLEEP", + strlen("P2P_PERIODIC_SLEEP")) == 0) { if (MLAN_STATUS_SUCCESS != woal_p2p_ps_cfg(priv, buf, priv_cmd.total_len)) { ret = -EFAULT; @@ -16026,26 +16051,22 @@ woal_android_priv_cmd(struct net_device *dev, struct ifreq *req) else if (strncmp(buf, "FAKEMAC", strlen("FAKEMAC")) == 0) { len = woal_priv_config_random_mac(priv, buf, priv_cmd.total_len); - } else if (strncmp - (buf, PRIV_CMD_CLOUD_KEEP_ALIVE, - strlen(PRIV_CMD_CLOUD_KEEP_ALIVE)) == 0) { + } else if (strncmp(buf, PRIV_CMD_CLOUD_KEEP_ALIVE, + strlen(PRIV_CMD_CLOUD_KEEP_ALIVE)) == 0) { len = woal_priv_cloud_keep_alive(priv, buf, priv_cmd.total_len); - } else if (strnicmp - (buf, PRIV_CMD_TX_RX_HISTOGRAM, - strlen(PRIV_CMD_TX_RX_HISTOGRAM)) == 0) { + } else if (strnicmp(buf, PRIV_CMD_TX_RX_HISTOGRAM, + strlen(PRIV_CMD_TX_RX_HISTOGRAM)) == 0) { /* Get TX/RX histogram statistic */ len = woal_priv_get_rx_tx_histogram(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf, PRIV_CMD_GET_CHNRGPWR, - strlen(PRIV_CMD_GET_CHNRGPWR)) == 0) { + } else if (strnicmp(buf, PRIV_CMD_GET_CHNRGPWR, + strlen(PRIV_CMD_GET_CHNRGPWR)) == 0) { /* Get chnrgpwr */ len = woal_priv_get_chnrgpwr(priv, buf, priv_cmd.total_len); goto handled; - } else if (strnicmp - (buf, PRIV_CMD_GET_TXPWR_LIMIT, - strlen(PRIV_CMD_GET_TXPWR_LIMIT)) == 0) { + } else if (strnicmp(buf, PRIV_CMD_GET_TXPWR_LIMIT, + strlen(PRIV_CMD_GET_TXPWR_LIMIT)) == 0) { /* Get txpwrlimit */ len = woal_priv_get_txpwrlimit(priv, buf, priv_cmd.total_len); goto handled; @@ -16062,7 +16083,7 @@ handled: priv_cmd.used_len = len; if (priv_cmd.used_len <= priv_cmd.total_len) { memset(buf + priv_cmd.used_len, 0, - (size_t) (CMD_BUF_LEN - priv_cmd.used_len)); + (size_t)(CMD_BUF_LEN - priv_cmd.used_len)); if (copy_to_user(cmd_buf, buf, priv_cmd.total_len)) { PRINTM(MERROR, "%s: failed to copy data to user buffer\n", @@ -16070,9 +16091,8 @@ handled: ret = -EFAULT; goto done; } - if (copy_to_user - (req->ifr_data, &priv_cmd, - sizeof(android_wifi_priv_cmd))) { + if (copy_to_user(req->ifr_data, &priv_cmd, + sizeof(android_wifi_priv_cmd))) { PRINTM(MERROR, "%s: failed to copy command header to user buffer\n", __FUNCTION__); @@ -16115,8 +16135,8 @@ done: * * @return N/A */ -void -wlan_scan_create_brief_table_entry(t_u8 **ppbuffer, BSSDescriptor_t *pbss_desc) +void wlan_scan_create_brief_table_entry(t_u8 **ppbuffer, + BSSDescriptor_t *pbss_desc) { t_u8 *ptmp_buf = *ppbuffer; t_u8 tmp_ssid_hdr[2]; @@ -16139,7 +16159,7 @@ wlan_scan_create_brief_table_entry(t_u8 **ppbuffer, BSSDescriptor_t *pbss_desc) sizeof(pbss_desc->cap_info)); ptmp_buf += sizeof(pbss_desc->cap_info); - tmp_ssid_hdr[0] = 0; /* Element ID for SSID is zero */ + tmp_ssid_hdr[0] = 0; /* Element ID for SSID is zero */ tmp_ssid_hdr[1] = pbss_desc->ssid.ssid_len; moal_memcpy_ext(NULL, ptmp_buf, tmp_ssid_hdr, sizeof(tmp_ssid_hdr), sizeof(tmp_ssid_hdr)); @@ -16151,7 +16171,7 @@ wlan_scan_create_brief_table_entry(t_u8 **ppbuffer, BSSDescriptor_t *pbss_desc) if (pbss_desc->wmm_ie.vend_hdr.element_id == WMM_IE) { ie_len = sizeof(IEEEtypes_Header_t) + - pbss_desc->wmm_ie.vend_hdr.len; + pbss_desc->wmm_ie.vend_hdr.len; moal_memcpy_ext(NULL, ptmp_buf, &pbss_desc->wmm_ie, ie_len, ie_len); ptmp_buf += ie_len; @@ -16160,7 +16180,7 @@ wlan_scan_create_brief_table_entry(t_u8 **ppbuffer, BSSDescriptor_t *pbss_desc) if (pbss_desc->pwpa_ie) { if ((*(pbss_desc->pwpa_ie)).vend_hdr.element_id == WPA_IE) { ie_len = sizeof(IEEEtypes_Header_t) + - (*(pbss_desc->pwpa_ie)).vend_hdr.len; + (*(pbss_desc->pwpa_ie)).vend_hdr.len; moal_memcpy_ext(NULL, ptmp_buf, pbss_desc->pwpa_ie, ie_len, ie_len); } @@ -16170,7 +16190,7 @@ wlan_scan_create_brief_table_entry(t_u8 **ppbuffer, BSSDescriptor_t *pbss_desc) if (pbss_desc->prsn_ie) { if ((*(pbss_desc->prsn_ie)).ieee_hdr.element_id == RSN_IE) { ie_len = sizeof(IEEEtypes_Header_t) + - (*(pbss_desc->prsn_ie)).ieee_hdr.len; + (*(pbss_desc->prsn_ie)).ieee_hdr.len; moal_memcpy_ext(NULL, ptmp_buf, pbss_desc->prsn_ie, ie_len, ie_len); } @@ -16189,15 +16209,15 @@ wlan_scan_create_brief_table_entry(t_u8 **ppbuffer, BSSDescriptor_t *pbss_desc) * * @param pbss_desc Pointer to a BSS entry in the scan table to form * scan response from for delivery to the application layer - * @param ppbuffer Output parameter: Buffer used to output scan return struct + * @param ppbuffer Output parameter: Buffer used to output scan return + * struct * @param pspace_left Output parameter: Number of bytes available in the * response buffer. * * @return MLAN_STATUS_SUCCESS, or < 0 with IOCTL error code */ -int -wlan_get_scan_table_ret_entry(BSSDescriptor_t *pbss_desc, - t_u8 **ppbuffer, int *pspace_left) +int wlan_get_scan_table_ret_entry(BSSDescriptor_t *pbss_desc, t_u8 **ppbuffer, + int *pspace_left) { wlan_ioctl_get_scan_table_entry *prsp_entry; wlan_ioctl_get_scan_table_entry tmp_rsp_entry; @@ -16221,39 +16241,37 @@ wlan_get_scan_table_ret_entry(BSSDescriptor_t *pbss_desc, */ if (!variable_size) { variable_size = pbss_desc->ssid.ssid_len + 2; - variable_size += (sizeof(pbss_desc->beacon_period) - + sizeof(pbss_desc->time_stamp) - + sizeof(pbss_desc->cap_info)); + variable_size += (sizeof(pbss_desc->beacon_period) + + sizeof(pbss_desc->time_stamp) + + sizeof(pbss_desc->cap_info)); if (pbss_desc->wmm_ie.vend_hdr.element_id == WMM_IE) { - variable_size += (sizeof(IEEEtypes_Header_t) - + pbss_desc->wmm_ie.vend_hdr.len); + variable_size += (sizeof(IEEEtypes_Header_t) + + pbss_desc->wmm_ie.vend_hdr.len); } if (pbss_desc->pwpa_ie) { if ((*(pbss_desc->pwpa_ie)).vend_hdr.element_id == WPA_IE) { - variable_size += (sizeof(IEEEtypes_Header_t) - + - (*(pbss_desc->pwpa_ie)). - vend_hdr.len); + variable_size += + (sizeof(IEEEtypes_Header_t) + + (*(pbss_desc->pwpa_ie)).vend_hdr.len); } } if (pbss_desc->prsn_ie) { if ((*(pbss_desc->prsn_ie)).ieee_hdr.element_id == RSN_IE) { - variable_size += (sizeof(IEEEtypes_Header_t) - + - (*(pbss_desc->prsn_ie)). - ieee_hdr.len); + variable_size += + (sizeof(IEEEtypes_Header_t) + + (*(pbss_desc->prsn_ie)).ieee_hdr.len); } } } space_needed = fixed_size + variable_size; - PRINTM(MINFO, "GetScanTable: need(%d), left(%d)\n", - space_needed, *pspace_left); + PRINTM(MINFO, "GetScanTable: need(%d), left(%d)\n", space_needed, + *pspace_left); if (space_needed >= *pspace_left) { *pspace_left = 0; @@ -16263,13 +16281,10 @@ wlan_get_scan_table_ret_entry(BSSDescriptor_t *pbss_desc, *pspace_left -= space_needed; - tmp_rsp_entry.fixed_field_length = (sizeof(tmp_rsp_entry) - - - sizeof(tmp_rsp_entry. - fixed_field_length) - - - sizeof(tmp_rsp_entry. - bss_info_length)); + tmp_rsp_entry.fixed_field_length = + (sizeof(tmp_rsp_entry) - + sizeof(tmp_rsp_entry.fixed_field_length) - + sizeof(tmp_rsp_entry.bss_info_length)); moal_memcpy_ext(NULL, tmp_rsp_entry.fixed_fields.bssid, pbss_desc->mac_address, @@ -16317,8 +16332,7 @@ wlan_get_scan_table_ret_entry(BSSDescriptor_t *pbss_desc, * * @return 0 --success, otherwise fail */ -int -woal_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd) +int woal_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd) { int ret = 0; @@ -16327,7 +16341,7 @@ woal_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd) PRINTM(MINFO, "woal_do_ioctl: ioctl cmd = 0x%x\n", cmd); switch (cmd) { case WOAL_ANDROID_DEF_CMD: - /** android default ioctl ID is SIOCDEVPRIVATE + 1 */ + /** android default ioctl ID is SIOCDEVPRIVATE + 1 */ ret = woal_android_priv_cmd(dev, req); break; case WOAL_CUSTOM_IE_CFG: diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_eth_ioctl.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_eth_ioctl.h index 6c78d7c01062..2e7637e3a291 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_eth_ioctl.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_eth_ioctl.h @@ -3,325 +3,326 @@ * * @brief This file contains definition for private IOCTL call. * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /******************************************************** Change log: 01/05/2012: initial version ********************************************************/ #if defined(STA_CFG80211) || defined(UAP_CFG80211) -#include "moal_cfg80211.h" +#include "moal_cfg80211.h" #endif #ifndef _WOAL_ETH_PRIV_H_ #define _WOAL_ETH_PRIV_H_ /** Command disabled */ -#define CMD_DISABLED 0 +#define CMD_DISABLED 0 /** Command enabled */ -#define CMD_ENABLED 1 +#define CMD_ENABLED 1 /** Command get */ -#define CMD_GET 2 +#define CMD_GET 2 /** 2K bytes */ -#define WOAL_2K_BYTES 2000 +#define WOAL_2K_BYTES 2000 /** NXP private command identifier string */ -#define CMD_NXP "MRVL_CMD" +#define CMD_NXP "MRVL_CMD" /** Private command: Version */ -#define PRIV_CMD_VERSION "version" +#define PRIV_CMD_VERSION "version" /** Private command: Band cfg */ -#define PRIV_CMD_BANDCFG "bandcfg" +#define PRIV_CMD_BANDCFG "bandcfg" /** Private command: Host cmd */ -#define PRIV_CMD_HOSTCMD "hostcmd" +#define PRIV_CMD_HOSTCMD "hostcmd" /** Private command: Custom IE config*/ -#define PRIV_CMD_CUSTOMIE "customie" +#define PRIV_CMD_CUSTOMIE "customie" /** Private command: HT Tx Cfg */ -#define PRIV_CMD_HTTXCFG "httxcfg" +#define PRIV_CMD_HTTXCFG "httxcfg" /** Private command: HT Cap Info */ -#define PRIV_CMD_HTCAPINFO "htcapinfo" +#define PRIV_CMD_HTCAPINFO "htcapinfo" /** Private command: Add BA para */ -#define PRIV_CMD_ADDBAPARA "addbapara" +#define PRIV_CMD_ADDBAPARA "addbapara" /** Private command: Aggragation priority table */ -#define PRIV_CMD_AGGRPRIOTBL "aggrpriotbl" +#define PRIV_CMD_AGGRPRIOTBL "aggrpriotbl" /** Private command: Add BA reject cfg */ -#define PRIV_CMD_ADDBAREJECT "addbareject" +#define PRIV_CMD_ADDBAREJECT "addbareject" /** Private command: Delete BA */ -#define PRIV_CMD_DELBA "delba" +#define PRIV_CMD_DELBA "delba" /** Private command: Reject Addba Req */ -#define PRIV_CMD_REJECTADDBAREQ "rejectaddbareq" +#define PRIV_CMD_REJECTADDBAREQ "rejectaddbareq" /** Private command: 11AC Cfg */ -#define PRIV_CMD_VHTCFG "vhtcfg" +#define PRIV_CMD_VHTCFG "vhtcfg" /** Private command: 11AC Oper Mode Cfg */ -#define PRIV_CMD_OPERMODECFG "opermodecfg" -#define PRIV_CMD_DATARATE "getdatarate" -#define PRIV_CMD_TXRATECFG "txratecfg" -#define PRIV_CMD_GETLOG "getlog" -#define PRIV_CMD_ESUPPMODE "esuppmode" +#define PRIV_CMD_OPERMODECFG "opermodecfg" +#define PRIV_CMD_DATARATE "getdatarate" +#define PRIV_CMD_TXRATECFG "txratecfg" +#define PRIV_CMD_GETLOG "getlog" +#define PRIV_CMD_ESUPPMODE "esuppmode" #define PRIV_CMD_PASSPHRASE "passphrase" -#define PRIV_CMD_DEAUTH "deauth" +#define PRIV_CMD_DEAUTH "deauth" #ifdef UAP_SUPPORT -#define PRIV_CMD_AP_DEAUTH "apdeauth" -#define PRIV_CMD_GET_STA_LIST "getstalist" -#define PRIV_CMD_BSS_CONFIG "bssconfig" +#define PRIV_CMD_AP_DEAUTH "apdeauth" +#define PRIV_CMD_GET_STA_LIST "getstalist" +#define PRIV_CMD_BSS_CONFIG "bssconfig" #endif #ifdef WIFI_DIRECT_SUPPORT #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) -#define PRIV_CMD_BSSROLE "bssrole" +#define PRIV_CMD_BSSROLE "bssrole" #endif #endif #ifdef STA_SUPPORT -#define PRIV_CMD_GETSCANTABLE "getscantable" -#define PRIV_CMD_GETCHANSTATS "getchanstats" +#define PRIV_CMD_GETSCANTABLE "getscantable" +#define PRIV_CMD_GETCHANSTATS "getchanstats" typedef struct _chan_stats { - /** Number of records in the chan_stats */ + /** Number of records in the chan_stats */ t_u32 num_in_chan_stats; - /** channel statistics */ + /** channel statistics */ ChanStatistics_t stats[]; } chan_stats; -#define PRIV_CMD_SETUSERSCAN "setuserscan" -#define PRIV_CMD_EXTCAPCFG "extcapcfg" -#define PRIV_CMD_CANCELSCAN "cancelscan" +#define PRIV_CMD_SETUSERSCAN "setuserscan" +#define PRIV_CMD_EXTCAPCFG "extcapcfg" +#define PRIV_CMD_CANCELSCAN "cancelscan" #endif -#define PRIV_CMD_DEEPSLEEP "deepsleep" -#define PRIV_CMD_IPADDR "ipaddr" -#define PRIV_CMD_WPSSESSION "wpssession" -#define PRIV_CMD_OTPUSERDATA "otpuserdata" -#define PRIV_CMD_COUNTRYCODE "countrycode" -#define PRIV_CMD_TCPACKENH "tcpackenh" +#define PRIV_CMD_DEEPSLEEP "deepsleep" +#define PRIV_CMD_IPADDR "ipaddr" +#define PRIV_CMD_WPSSESSION "wpssession" +#define PRIV_CMD_OTPUSERDATA "otpuserdata" +#define PRIV_CMD_COUNTRYCODE "countrycode" +#define PRIV_CMD_TCPACKENH "tcpackenh" #ifdef REASSOCIATION -#define PRIV_CMD_ASSOCESSID "assocessid" -#define PRIV_CMD_ASSOCBSSID "assocessid_bssid" +#define PRIV_CMD_ASSOCESSID "assocessid" +#define PRIV_CMD_ASSOCBSSID "assocessid_bssid" #endif -#define PRIV_CMD_WAKEUPREASON "wakeupreason" +#define PRIV_CMD_WAKEUPREASON "wakeupreason" #ifdef STA_SUPPORT #define PRIV_CMD_LISTENINTERVAL "listeninterval" #endif #ifdef DEBUG_LEVEL1 -#define PRIV_CMD_DRVDBG "drvdbg" +#define PRIV_CMD_DRVDBG "drvdbg" #endif -#define PRIV_CMD_HSCFG "hscfg" -#define PRIV_CMD_HSSETPARA "hssetpara" -#define PRIV_CMD_MGMT_FILTER "mgmtfilter" -#define PRIV_CMD_SCANCFG "scancfg" -#define PRIV_CMD_GETNLNUM "getnlnum" -#define PRIV_CMD_AGGRCTRL "aggrctrl" +#define PRIV_CMD_HSCFG "hscfg" +#define PRIV_CMD_HSSETPARA "hssetpara" +#define PRIV_CMD_MGMT_FILTER "mgmtfilter" +#define PRIV_CMD_SCANCFG "scancfg" +#define PRIV_CMD_GETNLNUM "getnlnum" +#define PRIV_CMD_AGGRCTRL "aggrctrl" #ifdef USB -#define PRIV_CMD_USBAGGRCTRL "usbaggrctrl" +#define PRIV_CMD_USBAGGRCTRL "usbaggrctrl" #endif -#define PRIV_CMD_SET_BSS_MODE "setbssmode" +#define PRIV_CMD_SET_BSS_MODE "setbssmode" #ifdef STA_SUPPORT -#define PRIV_CMD_SET_AP "setap" -#define PRIV_CMD_SET_POWER "setpower" -#define PRIV_CMD_SET_ESSID "setessid" -#define PRIV_CMD_SET_AUTH "setauth" -#define PRIV_CMD_GET_AP "getap" -#define PRIV_CMD_GET_POWER "getpower" -#define PRIV_CMD_PSMODE "psmode" +#define PRIV_CMD_SET_AP "setap" +#define PRIV_CMD_SET_POWER "setpower" +#define PRIV_CMD_SET_ESSID "setessid" +#define PRIV_CMD_SET_AUTH "setauth" +#define PRIV_CMD_GET_AP "getap" +#define PRIV_CMD_GET_POWER "getpower" +#define PRIV_CMD_PSMODE "psmode" #endif -#define PRIV_CMD_WARMRESET "warmreset" -#define PRIV_CMD_TXPOWERCFG "txpowercfg" -#define PRIV_CMD_PSCFG "pscfg" -#define PRIV_CMD_BCNTIMEOUTCFG "bcntimeoutcfg" -#define PRIV_CMD_SLEEPPD "sleeppd" -#define PRIV_CMD_TXCONTROL "txcontrol" -#define PRIV_CMD_REGRDWR "regrdwr" -#define PRIV_CMD_RDEEPROM "rdeeprom" -#define PRIV_CMD_MEMRDWR "memrdwr" +#define PRIV_CMD_WARMRESET "warmreset" +#define PRIV_CMD_TXPOWERCFG "txpowercfg" +#define PRIV_CMD_PSCFG "pscfg" +#define PRIV_CMD_BCNTIMEOUTCFG "bcntimeoutcfg" +#define PRIV_CMD_SLEEPPD "sleeppd" +#define PRIV_CMD_TXCONTROL "txcontrol" +#define PRIV_CMD_REGRDWR "regrdwr" +#define PRIV_CMD_RDEEPROM "rdeeprom" +#define PRIV_CMD_MEMRDWR "memrdwr" #ifdef SDIO -#define PRIV_CMD_SDCMD52RW "sdcmd52rw" +#define PRIV_CMD_SDCMD52RW "sdcmd52rw" #endif -#define PRIV_CMD_HOTSPOTCFG "hotspotcfg" -#define PRIV_CMD_MGMT_FRAME_CTRL "mgmtframectrl" -#define PRIV_CMD_QCONFIG "qconfig" -#define PRIV_CMD_ADDTS "addts" -#define PRIV_CMD_DELTS "delts" -#define PRIV_CMD_QSTATUS "qstatus" -#define PRIV_CMD_TS_STATUS "ts_status" -#define PRIV_CMD_QOS_CFG "qoscfg" -#define PRIV_CMD_MAC_CTRL "macctrl" -#define PRIV_CMD_GETWAP "getwap" -#define PRIV_CMD_REGION_CODE "regioncode" -#define PRIV_CMD_CFPINFO "cfpinfo" -#define PRIV_CMD_FWMACADDR "fwmacaddr" -#define PRIV_CMD_OFFCHANNEL "offchannel" -#define PRIV_CMD_DSCP_MAP "dscpmap" +#define PRIV_CMD_HOTSPOTCFG "hotspotcfg" +#define PRIV_CMD_MGMT_FRAME_CTRL "mgmtframectrl" +#define PRIV_CMD_QCONFIG "qconfig" +#define PRIV_CMD_ADDTS "addts" +#define PRIV_CMD_DELTS "delts" +#define PRIV_CMD_QSTATUS "qstatus" +#define PRIV_CMD_TS_STATUS "ts_status" +#define PRIV_CMD_QOS_CFG "qoscfg" +#define PRIV_CMD_MAC_CTRL "macctrl" +#define PRIV_CMD_GETWAP "getwap" +#define PRIV_CMD_REGION_CODE "regioncode" +#define PRIV_CMD_CFPINFO "cfpinfo" +#define PRIV_CMD_FWMACADDR "fwmacaddr" +#define PRIV_CMD_OFFCHANNEL "offchannel" +#define PRIV_CMD_DSCP_MAP "dscpmap" /** Private command: Verext */ -#define PRIV_CMD_VEREXT "verext" +#define PRIV_CMD_VEREXT "verext" #ifdef CONFIG_USB_SUSPEND -#define PRIV_CMD_USB_SUSPEND "usbsuspend" -#define PRIV_CMD_USB_RESUME "usbresume" +#define PRIV_CMD_USB_SUSPEND "usbsuspend" +#define PRIV_CMD_USB_RESUME "usbresume" #endif /* CONFIG_USB_SUSPEND */ #if defined(STA_SUPPORT) && defined(STA_WEXT) -#define PRIV_CMD_RADIO_CTRL "radioctrl" +#define PRIV_CMD_RADIO_CTRL "radioctrl" #endif -#define PRIV_CMD_WMM_CFG "wmmcfg" -#define PRIV_CMD_MIN_BA_THRESH_CFG "min_ba_threshold" +#define PRIV_CMD_WMM_CFG "wmmcfg" +#define PRIV_CMD_MIN_BA_THRESH_CFG "min_ba_threshold" #if defined(STA_SUPPORT) -#define PRIV_CMD_11D_CFG "11dcfg" -#define PRIV_CMD_11D_CLR_TBL "11dclrtbl" +#define PRIV_CMD_11D_CFG "11dcfg" +#define PRIV_CMD_11D_CLR_TBL "11dclrtbl" #endif #ifndef OPCHAN -#define PRIV_CMD_WWS_CFG "wwscfg" +#define PRIV_CMD_WWS_CFG "wwscfg" #endif #if defined(REASSOCIATION) -#define PRIV_CMD_REASSOCTRL "reassoctrl" +#define PRIV_CMD_REASSOCTRL "reassoctrl" #endif -#define PRIV_CMD_TXBUF_CFG "txbufcfg" +#define PRIV_CMD_TXBUF_CFG "txbufcfg" #ifdef STA_SUPPORT -#define PRIV_CMD_AUTH_TYPE "authtype" +#define PRIV_CMD_AUTH_TYPE "authtype" #endif -#define PRIV_CMD_POWER_CONS "powercons" -#define PRIV_CMD_HT_STREAM_CFG "htstreamcfg" -#define PRIV_CMD_MIMO_SWITCH "mimoswitch" -#define PRIV_CMD_THERMAL "thermal" -#define PRIV_CMD_BCN_INTERVAL "bcninterval" +#define PRIV_CMD_POWER_CONS "powercons" +#define PRIV_CMD_HT_STREAM_CFG "htstreamcfg" +#define PRIV_CMD_MIMO_SWITCH "mimoswitch" +#define PRIV_CMD_THERMAL "thermal" +#define PRIV_CMD_BCN_INTERVAL "bcninterval" #ifdef STA_SUPPORT -#define PRIV_CMD_GET_SIGNAL "getsignal" -#define PRIV_CMD_SIGNALEXT_CFG "signalextcfg" -#define PRIV_CMD_GET_SIGNAL_EXT_V2 "getsignalextv2" -#define PRIV_CMD_GET_SIGNAL_EXT "getsignalext" +#define PRIV_CMD_GET_SIGNAL "getsignal" +#define PRIV_CMD_SIGNALEXT_CFG "signalextcfg" +#define PRIV_CMD_GET_SIGNAL_EXT_V2 "getsignalextv2" +#define PRIV_CMD_GET_SIGNAL_EXT "getsignalext" #endif #if defined(STA_SUPPORT) -#define PRIV_CMD_PMFCFG "pmfcfg" +#define PRIV_CMD_PMFCFG "pmfcfg" #endif -#define PRIV_CMD_INACTIVITYTO "inactivityto" -#define PRIV_CMD_AMSDU_AGGR_CTRL "amsduaggrctrl" -#define PRIV_CMD_TX_BF_CAP "httxbfcap" +#define PRIV_CMD_INACTIVITYTO "inactivityto" +#define PRIV_CMD_AMSDU_AGGR_CTRL "amsduaggrctrl" +#define PRIV_CMD_TX_BF_CAP "httxbfcap" #ifdef SDIO -#define PRIV_CMD_SDIO_CLOCK "sdioclock" +#define PRIV_CMD_SDIO_CLOCK "sdioclock" #endif #ifdef SDIO -#define PRIV_CMD_MPA_CTRL "mpactrl" +#define PRIV_CMD_MPA_CTRL "mpactrl" #endif -#define PRIV_CMD_SLEEP_PARAMS "sleepparams" -#define PRIV_CMD_DFS_TESTING "dfstesting" -#define PRIV_CMD_CFP_CODE "cfpcode" -#define PRIV_CMD_CWMODE "cwmode" -#define PRIV_CMD_ANT_CFG "antcfg" -#define PRIV_CMD_SYSCLOCK "sysclock" -#define PRIV_CMD_GET_KEY "getkey" -#define PRIV_CMD_ASSOCIATE "associate" -#define PRIV_CMD_TX_BF_CFG "httxbfcfg" -#define PRIV_CMD_PORT_CTRL "port_ctrl" -#define PRIV_CMD_PB_BYPASS "pb_bypass" +#define PRIV_CMD_SLEEP_PARAMS "sleepparams" +#define PRIV_CMD_DFS_TESTING "dfstesting" +#define PRIV_CMD_DFS53_CFG "dfs53cfg" +#define PRIV_CMD_CFP_CODE "cfpcode" +#define PRIV_CMD_CWMODE "cwmode" +#define PRIV_CMD_ANT_CFG "antcfg" +#define PRIV_CMD_SYSCLOCK "sysclock" +#define PRIV_CMD_GET_KEY "getkey" +#define PRIV_CMD_ASSOCIATE "associate" +#define PRIV_CMD_TX_BF_CFG "httxbfcfg" +#define PRIV_CMD_PORT_CTRL "port_ctrl" +#define PRIV_CMD_PB_BYPASS "pb_bypass" #ifdef SDIO -#define PRIV_CMD_SD_CMD53_RW "sdcmd53rw" +#define PRIV_CMD_SD_CMD53_RW "sdcmd53rw" #endif #ifdef RX_PACKET_COALESCE #define PRIV_CMD_RX_COAL_CFG "rxpktcoal_cfg" #endif #ifdef WIFI_DIRECT_SUPPORT #if defined(UAP_CFG80211) -#define PRIV_CMD_CFG_NOA "cfg_noa" -#define PRIV_CMD_CFG_OPP_PS "cfg_opp_ps" +#define PRIV_CMD_CFG_NOA "cfg_noa" +#define PRIV_CMD_CFG_OPP_PS "cfg_opp_ps" #endif #endif -#define PRIV_CMD_DFS_REPEATER_CFG "dfs_repeater" +#define PRIV_CMD_DFS_REPEATER_CFG "dfs_repeater" #ifdef WIFI_DIRECT_SUPPORT #if defined(STA_CFG80211) || defined(UAP_CFG80211) -#define PRIV_CMD_MIRACAST_CFG "miracastcfg" +#define PRIV_CMD_MIRACAST_CFG "miracastcfg" #endif #endif -#define PRIV_CMD_COEX_RX_WINSIZE "coex_rx_winsize" +#define PRIV_CMD_COEX_RX_WINSIZE "coex_rx_winsize" #ifdef PCIE -#define PRIV_CMD_PCIE_REG_RW "pcieregrw" -#define PRIV_CMD_PCIE_BAR0_REG_RW "pciebar0regrw" +#define PRIV_CMD_PCIE_REG_RW "pcieregrw" +#define PRIV_CMD_PCIE_BAR0_REG_RW "pciebar0regrw" #endif -#define PRIV_CMD_GET_SENSOR_TEMP "get_sensor_temp" +#define PRIV_CMD_GET_SENSOR_TEMP "get_sensor_temp" -#define PRIV_CMD_GET_CHNRGPWR "get_chnrgpwr" -#define PRIV_CMD_GET_TXPWR_LIMIT "get_txpwrlimit" -#define PRIV_CMD_GET_CFG_CHAN_LIST "getcfgchanlist" +#define PRIV_CMD_GET_CHNRGPWR "get_chnrgpwr" +#define PRIV_CMD_GET_TXPWR_LIMIT "get_txpwrlimit" +#define PRIV_CMD_GET_CFG_CHAN_LIST "getcfgchanlist" #if defined(UAP_SUPPORT) -#define PRIV_CMD_EXTEND_CHAN_SWITCH "channel_switch" +#define PRIV_CMD_EXTEND_CHAN_SWITCH "channel_switch" #endif -#define PRIV_CMD_DYN_BW "dyn_bw" +#define PRIV_CMD_DYN_BW "dyn_bw" #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) -#define PRIV_CMD_DFS_OFFLOAD "dfs_offload" +#define PRIV_CMD_DFS_OFFLOAD "dfs_offload" #endif -#define PRIV_CMD_AUTO_ARP "auto_arp" +#define PRIV_CMD_AUTO_ARP "auto_arp" -#define PRIV_CMD_PER_PKT_CFG "per_pkt_cfg" +#define PRIV_CMD_PER_PKT_CFG "per_pkt_cfg" -#define PRIV_CMD_DEAUTH_CTRL "ctrldeauth" +#define PRIV_CMD_DEAUTH_CTRL "ctrldeauth" -#define PRIV_CMD_TX_RX_HISTOGRAM "txrxhistogram" +#define PRIV_CMD_TX_RX_HISTOGRAM "txrxhistogram" /**Private command ID to set/get independent reset*/ -#define PRIV_CMD_IND_RST_CFG "indrstcfg" +#define PRIV_CMD_IND_RST_CFG "indrstcfg" /**Private command to configure static rx abort config */ -#define PRIV_CMD_RX_ABORT_CFG "rx_abort_cfg" +#define PRIV_CMD_RX_ABORT_CFG "rx_abort_cfg" /**Private command to configure dynamic rx abort config */ -#define PRIV_CMD_RX_ABORT_CFG_EXT "rx_abort_cfg_ext" -#define TX_AMPDU_RTS_CTS 0 -#define TX_AMPDU_CTS_2_SELF 1 -#define TX_AMPDU_DISABLE_PROTECTION 2 -#define TX_AMPDU_DYNAMIC_RTS_CTS 3 +#define PRIV_CMD_RX_ABORT_CFG_EXT "rx_abort_cfg_ext" +#define TX_AMPDU_RTS_CTS 0 +#define TX_AMPDU_CTS_2_SELF 1 +#define TX_AMPDU_DISABLE_PROTECTION 2 +#define TX_AMPDU_DYNAMIC_RTS_CTS 3 /**Private command to set tx ampdu protection mode */ -#define PRIV_CMD_TX_AMPDU_PROT_MODE "tx_ampdu_prot_mode" +#define PRIV_CMD_TX_AMPDU_PROT_MODE "tx_ampdu_prot_mode" /**Private command to configure tx rate adapt config */ -#define PRIV_CMD_RATE_ADAPT_CFG "rate_adapt_cfg" -#define CCK_DESENSE_MODE_DISABLED 0 -#define CCK_DESENSE_MODE_DYNAMIC 1 -#define CCK_DESENSE_MODE_DYN_ENH 2 +#define PRIV_CMD_RATE_ADAPT_CFG "rate_adapt_cfg" +#define CCK_DESENSE_MODE_DISABLED 0 +#define CCK_DESENSE_MODE_DYNAMIC 1 +#define CCK_DESENSE_MODE_DYN_ENH 2 /**Private command to configure cck desense config */ -#define PRIV_CMD_CCK_DESENSE_CFG "cck_desense_cfg" +#define PRIV_CMD_CCK_DESENSE_CFG "cck_desense_cfg" /** Private command ID for Android default commands */ -#define WOAL_ANDROID_DEF_CMD (SIOCDEVPRIVATE + 1) +#define WOAL_ANDROID_DEF_CMD (SIOCDEVPRIVATE + 1) /** Private command ID to pass mgmt frame */ -#define WOAL_MGMT_FRAME_TX WOAL_MGMT_FRAME_TX_IOCTL +#define WOAL_MGMT_FRAME_TX WOAL_MGMT_FRAME_TX_IOCTL /** Private command ID to pass custom IE list */ -#define WOAL_CUSTOM_IE_CFG (SIOCDEVPRIVATE + 13) +#define WOAL_CUSTOM_IE_CFG (SIOCDEVPRIVATE + 13) /** Private command ID for Android ICS priv CMDs */ -#define WOAL_ANDROID_PRIV_CMD (SIOCDEVPRIVATE + 14) +#define WOAL_ANDROID_PRIV_CMD (SIOCDEVPRIVATE + 14) /** Private command ID to get BSS type */ -#define WOAL_GET_BSS_TYPE (SIOCDEVPRIVATE + 15) +#define WOAL_GET_BSS_TYPE (SIOCDEVPRIVATE + 15) /** Private command ID for robustcoex */ -#define PRIV_CMD_ROBUSTCOEX "robustcoex" +#define PRIV_CMD_ROBUSTCOEX "robustcoex" -#define PRIV_CMD_DMCS "dmcs" +#define PRIV_CMD_DMCS "dmcs" #if defined(PCIE) -#define PRIV_CMD_SSU "ssu" +#define PRIV_CMD_SSU "ssu" /** ssu_params_ctrl */ typedef struct _ssu_params_cfg { /* ssu mode */ t_u8 ssu_mode; - /* 0-3; # of FFT samples to skip */ + /* 0-3; # of FFT samples to skip*/ t_u32 nskip; /* 0-3: # of FFT samples selected to dump */ t_u32 nsel; - /* 0-3: Down sample ADC input for buffering */ + /* 0-3: Down sample ADC input for buffering*/ t_u32 adcdownsample; /* 0-1: Mask out ADC Data from spectral packet */ t_u32 mask_adc_pkt; @@ -331,19 +332,24 @@ typedef struct _ssu_params_cfg { t_u32 spec_pwr_enable; /* 0-1: Enable spectral packet rate reduction in DB output format */ t_u32 rate_deduction; - /* 0-7: Number of spectral packets over which spectral data is to be averaged. */ + /* 0-7: Number of spectral packets over which spectral data is to be + * averaged. */ t_u32 n_pkt_avg; -} __attribute__ ((packed)) ssu_params_cfg; +} __attribute__((packed)) ssu_params_cfg; #endif -#define PRIV_CMD_BOOTSLEEP "bootsleep" +#define PRIV_CMD_BOOTSLEEP "bootsleep" /** Private command: 11AX Cfg */ -#define PRIV_CMD_11AXCFG "11axcfg" +#define PRIV_CMD_11AXCFG "11axcfg" /** Private command: 11AX Cmd */ -#define PRIV_CMD_11AXCMDCFG "11axcmd" +#define PRIV_CMD_11AXCMDCFG "11axcmd" +/** Private command: TWT Setup Cfg */ +#define PRIV_CMD_TWT_SETUP "twt_setup" +/** Private command: TWT Teardown Cfg */ +#define PRIV_CMD_TWT_TEARDOWN "twt_teardown" -#define PRIV_CMD_LPM "lpm" +#define PRIV_CMD_LPM "lpm" int woal_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd); @@ -357,21 +363,20 @@ int woal_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd); /** Private command structure from app */ #ifdef USERSPACE_32BIT_OVER_KERNEL_64BIT typedef struct _android_wifi_priv_cmd { - /** Buffer pointer */ + /** Buffer pointer */ t_u64 buf; - /** buffer updated by driver */ + /** buffer updated by driver */ int used_len; - /** buffer sent by application */ + /** buffer sent by application */ int total_len; -} __attribute__ ((packed)) - android_wifi_priv_cmd; +} __attribute__((packed)) android_wifi_priv_cmd; #else typedef struct _android_wifi_priv_cmd { - /** Buffer pointer */ + /** Buffer pointer */ char *buf; - /** buffer updated by driver */ + /** buffer updated by driver */ int used_len; - /** buffer sent by application */ + /** buffer sent by application */ int total_len; } android_wifi_priv_cmd; #endif @@ -381,55 +386,55 @@ typedef struct _android_wifi_priv_cmd { #endif /* Maximum size of the ESSID and NICKN strings */ -#define MW_ESSID_MAX_SIZE 32 +#define MW_ESSID_MAX_SIZE 32 /* Modes of operation */ -#define MW_MODE_AUTO 0 /* Let the driver decides */ -#define MW_MODE_ADHOC 1 /* Single cell network */ -#define MW_MODE_INFRA 2 /* Multi cell network, roaming, ... */ -#define MW_MODE_MASTER 3 /* Synchronisation master or Access Point */ -#define MW_MODE_REPEAT 4 /* Wireless Repeater (forwarder) */ -#define MW_MODE_SECOND 5 /* Secondary master/repeater (backup) */ -#define MW_MODE_MONITOR 6 /* Passive monitor (listen only) */ -#define MW_MODE_MESH 7 /* Mesh (IEEE 802.11s) network */ +#define MW_MODE_AUTO 0 /* Let the driver decides */ +#define MW_MODE_ADHOC 1 /* Single cell network */ +#define MW_MODE_INFRA 2 /* Multi cell network, roaming, ... */ +#define MW_MODE_MASTER 3 /* Synchronisation master or Access Point */ +#define MW_MODE_REPEAT 4 /* Wireless Repeater (forwarder) */ +#define MW_MODE_SECOND 5 /* Secondary master/repeater (backup) */ +#define MW_MODE_MONITOR 6 /* Passive monitor (listen only) */ +#define MW_MODE_MESH 7 /* Mesh (IEEE 802.11s) network */ -#define MW_POWER_TYPE 0xF000 /* Type of parameter */ -#define MW_POWER_PERIOD 0x1000 /* Value is a period/duration of */ -#define MW_POWER_TIMEOUT 0x2000 /* Value is a timeout (to go asleep) */ +#define MW_POWER_TYPE 0xF000 /* Type of parameter */ +#define MW_POWER_PERIOD 0x1000 /* Value is a period/duration of */ +#define MW_POWER_TIMEOUT 0x2000 /* Value is a timeout (to go asleep) */ -#define MW_AUTH_INDEX 0x0FFF -#define MW_AUTH_FLAGS 0xF000 -#define MW_AUTH_WPA_VERSION 0 -#define MW_AUTH_CIPHER_PAIRWISE 1 -#define MW_AUTH_CIPHER_GROUP 2 -#define MW_AUTH_KEY_MGMT 3 -#define MW_AUTH_TKIP_COUNTERMEASURES 4 -#define MW_AUTH_DROP_UNENCRYPTED 5 -#define MW_AUTH_80211_AUTH_ALG 6 -#define MW_AUTH_WPA_ENABLED 7 -#define MW_AUTH_RX_UNENCRYPTED_EAPOL 8 -#define MW_AUTH_ROAMING_CONTROL 9 -#define MW_AUTH_PRIVACY_INVOKED 10 -#define MW_AUTH_CIPHER_GROUP_MGMT 11 -#define MW_AUTH_MFP 12 +#define MW_AUTH_INDEX 0x0FFF +#define MW_AUTH_FLAGS 0xF000 +#define MW_AUTH_WPA_VERSION 0 +#define MW_AUTH_CIPHER_PAIRWISE 1 +#define MW_AUTH_CIPHER_GROUP 2 +#define MW_AUTH_KEY_MGMT 3 +#define MW_AUTH_TKIP_COUNTERMEASURES 4 +#define MW_AUTH_DROP_UNENCRYPTED 5 +#define MW_AUTH_80211_AUTH_ALG 6 +#define MW_AUTH_WPA_ENABLED 7 +#define MW_AUTH_RX_UNENCRYPTED_EAPOL 8 +#define MW_AUTH_ROAMING_CONTROL 9 +#define MW_AUTH_PRIVACY_INVOKED 10 +#define MW_AUTH_CIPHER_GROUP_MGMT 11 +#define MW_AUTH_MFP 12 #define MW_AUTH_CIPHER_NONE 0x00000001 -#define MW_AUTH_CIPHER_WEP40 0x00000002 +#define MW_AUTH_CIPHER_WEP40 0x00000002 #define MW_AUTH_CIPHER_TKIP 0x00000004 #define MW_AUTH_CIPHER_CCMP 0x00000008 -#define MW_AUTH_CIPHER_WEP104 0x00000010 +#define MW_AUTH_CIPHER_WEP104 0x00000010 #define MW_AUTH_CIPHER_AES_CMAC 0x00000020 #define MW_AUTH_ALG_OPEN_SYSTEM 0x00000001 -#define MW_AUTH_ALG_SHARED_KEY 0x00000002 -#define MW_AUTH_ALG_LEAP 0x00000004 +#define MW_AUTH_ALG_SHARED_KEY 0x00000002 +#define MW_AUTH_ALG_LEAP 0x00000004 /* Generic format for most parameters that fit in an int */ struct mw_param { - t_s32 value; /* The value of the parameter itself */ - t_u8 fixed; /* Hardware should not use auto select */ - t_u8 disabled; /* Disable the feature */ - t_u16 flags; /* Various specifc flags (if any) */ + t_s32 value; /* The value of the parameter itself */ + t_u8 fixed; /* Hardware should not use auto select */ + t_u8 disabled; /* Disable the feature */ + t_u16 flags; /* Various specifc flags (if any) */ }; /* @@ -437,9 +442,9 @@ struct mw_param { * pointer to memory allocated in user space. */ struct mw_point { - t_u8 *pointer; /* Pointer to the data (in user space) */ - t_u16 length; /* number of fields or size in bytes */ - t_u16 flags; /* Optional params */ + t_u8 *pointer; /* Pointer to the data (in user space) */ + t_u16 length; /* number of fields or size in bytes */ + t_u16 flags; /* Optional params */ }; /* @@ -450,18 +455,18 @@ union mwreq_data { /* Config - generic */ char name[IFNAMSIZ]; - struct mw_point essid; /* Extended network name */ - t_u32 mode; /* Operation mode */ - struct mw_param power; /* PM duration/timeout */ - struct sockaddr ap_addr; /* Access point address */ - struct mw_param param; /* Other small parameters */ - struct mw_point data; /* Other large parameters */ + struct mw_point essid; /* Extended network name */ + t_u32 mode; /* Operation mode */ + struct mw_param power; /* PM duration/timeout */ + struct sockaddr ap_addr; /* Access point address */ + struct mw_param param; /* Other small parameters */ + struct mw_point data; /* Other large parameters */ }; - /* The structure to exchange data for ioctl */ +/* The structure to exchange data for ioctl */ struct mwreq { union { - char ifrn_name[IFNAMSIZ]; /* if name, e.g. "eth0" */ + char ifrn_name[IFNAMSIZ]; /* if name, e.g. "eth0" */ } ifr_ifrn; /* Data part */ @@ -485,13 +490,13 @@ typedef struct woal_priv_addba { typedef struct woal_priv_tx_rate_cfg { /* LG rate: 0, HT rate: 1, VHT rate: 2 */ t_u32 rate_format; - /** Rate/MCS index (0xFF: auto) */ + /** Rate/MCS index (0xFF: auto) */ t_u32 rate_index; - /** Data rate */ + /** Data rate */ t_u32 rate; - /** NSS */ + /** NSS */ t_u32 nss; - /** Rate Setting */ + /** Rate Setting */ t_u16 rate_setting; } woal_tx_rate_cfg; @@ -513,45 +518,45 @@ int woal_android_priv_cmd(struct net_device *dev, struct ifreq *req); #define PRIV_CMD_CLOUD_KEEP_ALIVE "cloud_keep_alive" /** cloud keep alive parameters */ typedef struct _cloud_keep_alive { - /** id */ + /** id */ t_u8 mkeep_alive_id; - /** enable/disable of this id */ + /** enable/disable of this id */ t_u8 enable; - /** enable/disable reset*/ + /** enable/disable reset*/ t_u8 reset; - /** Reserved */ + /** Reserved */ t_u8 reserved; - /** Destination MAC address */ + /** Destination MAC address */ t_u8 dst_mac[ETH_ALEN]; - /** Source MAC address */ + /** Source MAC address */ t_u8 src_mac[ETH_ALEN]; - /** packet send period */ + /** packet send period */ t_u32 sendInterval; - /** packet retry interval */ + /** packet retry interval */ t_u32 retryInterval; - /** packet retry count */ + /** packet retry count */ t_u8 retryCount; - /** packet length */ + /** packet length */ t_u8 pkt_len; - /** packet content */ + /** packet content */ t_u8 pkt[255]; } __ATTRIB_PACK__ cloud_keep_alive; #define TLV_TYPE_PER_PKT_CFG 0x0001 -#define TX_PKT_CTRL MBIT(0) -#define RX_PKT_INFO MBIT(1) +#define TX_PKT_CTRL MBIT(0) +#define RX_PKT_INFO MBIT(1) -#define FLAG_TX_HISTOGRAM 0x01 -#define FLAG_RX_HISTOGRAM 0x02 -#define DISABLE_TX_RX_HISTOGRAM 0x00 -#define ENABLE_TX_RX_HISTOGRAM 0x01 -#define GET_TX_RX_HISTOGRAM 0x02 -#define PRIV_CMD_TX_RX_HISTOGRAM "txrxhistogram" +#define FLAG_TX_HISTOGRAM 0x01 +#define FLAG_RX_HISTOGRAM 0x02 +#define DISABLE_TX_RX_HISTOGRAM 0x00 +#define ENABLE_TX_RX_HISTOGRAM 0x01 +#define GET_TX_RX_HISTOGRAM 0x02 +#define PRIV_CMD_TX_RX_HISTOGRAM "txrxhistogram" /** TX and RX histogram statistic parameters*/ typedef struct _tx_rx_histogram { - /** Enable or disable get tx/rx histogram statistic */ + /** Enable or disable get tx/rx histogram statistic */ t_u8 enable; - /** Choose to get TX, RX or both histogram statistic */ + /** Choose to get TX, RX or both histogram statistic */ t_u8 action; } __ATTRIB_PACK__ tx_rx_histogram; @@ -564,23 +569,23 @@ typedef enum _cw_modes_e { /** wlan_ieee80211_chan */ typedef struct { - /** center freq */ + /** center freq */ t_u16 center_freq; - /** chan num */ + /** chan num */ t_u16 hw_value; - /** chan flags */ + /** chan flags */ t_u32 flags; - /** max power */ + /** max power */ int max_power; - /** dfs_state */ + /** dfs_state */ t_u8 dfs_state; } __ATTRIB_PACK__ wlan_ieee80211_chan; /** wlan_ieee80211_chan_list*/ typedef struct { - /** num of chan */ + /** num of chan */ t_u8 num_chan; - /** chan_list */ + /** chan_list */ wlan_ieee80211_chan chan_list[]; } __ATTRIB_PACK__ wlan_ieee80211_chan_list; #endif /* _WOAL_ETH_PRIV_H_ */ diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_init.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_init.c index 6bdf921166ee..6c65f14d0bf0 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_init.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_init.c @@ -1,26 +1,26 @@ /** @file moal_init.c - * - * @brief This file contains the major functions in WLAN - * driver. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ -#include "moal_main.h" + * + * @brief This file contains the major functions in WLAN + * driver. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ +#include "moal_main.h" /** Global moal_handle array */ extern moal_handle *m_handle[]; @@ -33,7 +33,7 @@ int fw_reload; /** MAC address */ char *mac_addr; /** Module param cfg file */ -char *mod_para = NULL; +char *mod_para; #ifdef MFG_CMD_SUPPORT /** Mfg mode */ @@ -59,7 +59,7 @@ int beacon_hints; #if defined(STA_CFG80211) || defined(UAP_CFG80211) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) -int host_mlme = 0; +int host_mlme; #endif #endif @@ -88,7 +88,7 @@ int max_uap_bss = DEF_UAP_BSS; /** uAP interface name */ char *uap_name; /** Max uAP station number */ -int uap_max_sta = 0; +int uap_max_sta; #endif #ifdef WIFI_DIRECT_SUPPORT @@ -136,7 +136,7 @@ char *init_cfg; /** Set configuration data of Tx power limitation */ char *txpwrlimit_cfg; /** Allow setting tx power table of country */ -int cntry_txpwr = 0; +int cntry_txpwr; /** Init hostcmd file */ char *init_hostcmd_cfg; @@ -152,7 +152,7 @@ int cfg80211_wext = STA_CFG80211_MASK | UAP_CFG80211_MASK; #if defined(STA_CFG80211) || defined(UAP_CFG80211) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) -int fw_region = 0; +int fw_region; #endif #endif @@ -189,7 +189,7 @@ int dts_enable = 1; #endif #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) -int dfs_offload = 0; +int dfs_offload; #endif #ifdef ANDROID_KERNEL @@ -212,16 +212,16 @@ int drv_mode = DRV_MODE_UAP; int gtk_rekey_offload = GTK_REKEY_OFFLOAD_DISABLE; -int pmic = 0; +int pmic; -int antcfg = 0; +int antcfg; -t_u32 uap_oper_ctrl = 0; +t_u32 uap_oper_ctrl; int hs_wake_interval = 400; int indication_gpio = 0xff; int disconnect_on_suspend; -int hs_mimo_switch = 0; +int hs_mimo_switch; int indrstcfg = 0xffffffff; @@ -233,21 +233,21 @@ int sdio_rx_aggr = MTRUE; #endif /** The global variable of scan beacon buffer **/ -int fixed_beacon_buffer = 0; +int fixed_beacon_buffer; #ifdef WIFI_DIRECT_SUPPORT -int GoAgeoutTime = 0; +int GoAgeoutTime; #endif -t_u16 multi_dtim = 0; +t_u16 multi_dtim; -t_u16 inact_tmo = 0; +t_u16 inact_tmo; #ifdef DEBUG_LEVEL1 #ifdef DEBUG_LEVEL2 -#define DEFAULT_DEBUG_MASK (0xffffffff) +#define DEFAULT_DEBUG_MASK (0xffffffff) #else -#define DEFAULT_DEBUG_MASK (MMSG | MFATAL | MERROR |MREG_D) +#define DEFAULT_DEBUG_MASK (MMSG | MFATAL | MERROR | MREG_D) #endif /* DEBUG_LEVEL2 */ t_u32 drvdbg = DEFAULT_DEBUG_MASK; @@ -307,6 +307,8 @@ static card_type_entry card_type_map_tbl[] = { #endif }; +int dfs53cfg = DFS_W53_DEFAULT_FW; + /** * @brief This function read a line in module parameter file * @@ -315,16 +317,15 @@ static card_type_entry card_type_map_tbl[] = { * @param line_pos A pointer to offset of current line * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static t_size -parse_cfg_get_line(t_u8 *data, t_size size, t_u8 *line_pos) +static t_size parse_cfg_get_line(t_u8 *data, t_size size, t_u8 *line_pos) { t_u8 *src, *dest; static t_s32 pos; ENTER(); - if (pos >= size) { /* reach the end */ - pos = 0; /* Reset position for rfkill */ + if (pos >= size) { /* reach the end */ + pos = 0; /* Reset position for rfkill */ LEAVE(); return -1; } @@ -333,7 +334,7 @@ parse_cfg_get_line(t_u8 *data, t_size size, t_u8 *line_pos) dest = line_pos; while (pos < size && *src != '\x0A' && *src != '\0') { - if (*src != ' ' && *src != '\t') /* parse space */ + if (*src != ' ' && *src != '\t') /* parse space */ *dest++ = *src++; else src++; @@ -354,20 +355,23 @@ parse_cfg_get_line(t_u8 *data, t_size size, t_u8 *line_pos) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static void -woal_dup_string(char **dst, char *src) +static void woal_dup_string(char **dst, char *src) { size_t len = 0; - if (src && (len = strlen(src)) != 0) { - if (*dst != NULL) - kfree(*dst); - *dst = kzalloc(len + 1, GFP_KERNEL); - if (*dst == NULL) { - PRINTM(MERROR, "Failed to alloc mem for param: %s\n", - src); - return; + if (src) { + len = strlen(src); + if (len != 0) { + if (*dst != NULL) + kfree(*dst); + *dst = kzalloc(len + 1, GFP_KERNEL); + if (*dst == NULL) { + PRINTM(MERROR, + "Failed to alloc mem for param: %s\n", + src); + return; + } + moal_memcpy_ext(NULL, *dst, src, len, len); } - moal_memcpy_ext(NULL, *dst, src, len, len); } } @@ -379,8 +383,7 @@ woal_dup_string(char **dst, char *src) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -parse_line_read_int(t_u8 *line, int *out_data) +static mlan_status parse_line_read_int(t_u8 *line, int *out_data) { t_u8 *p = NULL; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -410,8 +413,7 @@ out: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -parse_line_read_string(t_u8 *line, char **out_str) +static mlan_status parse_line_read_string(t_u8 *line, char **out_str) { t_u8 *p = NULL, *pstr = NULL; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -448,21 +450,26 @@ out: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -parse_line_read_card_info(t_u8 *line, char **type, char **if_id) +static mlan_status parse_line_read_card_info(t_u8 *line, char **type, + char **if_id) { t_u8 *p = NULL; mlan_status ret = MLAN_STATUS_SUCCESS; + if (line == NULL) { ret = MLAN_STATUS_FAILURE; goto out; } - if ((p = strstr(line, "=")) == NULL) { + + p = strstr(line, "="); + if (p == NULL) { ret = MLAN_STATUS_FAILURE; goto out; } *p = '\0'; - if ((p = strstr(line, "_")) != NULL) { + + p = strstr(line, "_"); + if (p != NULL) { *p++ = '\0'; *if_id = p; } else { @@ -482,8 +489,8 @@ out: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) +static mlan_status parse_cfg_read_block(t_u8 *data, t_u32 size, + moal_handle *handle) { int out_data = 0, end = 0; char *out_str = NULL; @@ -507,11 +514,12 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) else moal_extflg_clear(handle, EXT_HW_TEST); PRINTM(MMSG, "hw_test %s\n", - moal_extflg_isset(handle, - EXT_HW_TEST) ? "on" : "off"); + moal_extflg_isset(handle, EXT_HW_TEST) ? "on" : + "off"); } #ifdef CONFIG_OF - else if (strncmp(line, "dts_enable", strlen("dts_enable")) == 0) { + else if (strncmp(line, "dts_enable", strlen("dts_enable")) == + 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -520,9 +528,9 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) else moal_extflg_clear(handle, EXT_DTS_ENABLE); PRINTM(MMSG, "dts_enable %s\n", - moal_extflg_isset(handle, - EXT_DTS_ENABLE) ? "on" : - "off"); + moal_extflg_isset(handle, EXT_DTS_ENABLE) ? + "on" : + "off"); } #endif else if (strncmp(line, "fw_name", strlen("fw_name")) == 0) { @@ -531,9 +539,8 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) goto err; woal_dup_string(¶ms->fw_name, out_str); PRINTM(MMSG, "fw_name=%s\n", params->fw_name); - } else if (strncmp - (line, "req_fw_nowait", - strlen("req_fw_nowait")) == 0) { + } else if (strncmp(line, "req_fw_nowait", + strlen("req_fw_nowait")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -542,16 +549,18 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) else moal_extflg_clear(handle, EXT_REQ_FW_NOWAIT); PRINTM(MMSG, "req fw nowait %s\n", - moal_extflg_isset(handle, - EXT_REQ_FW_NOWAIT) ? "on" : - "off"); - } else if (strncmp(line, "fw_reload", strlen("fw_reload")) == 0) { + moal_extflg_isset(handle, EXT_REQ_FW_NOWAIT) ? + "on" : + "off"); + } else if (strncmp(line, "fw_reload", strlen("fw_reload")) == + 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; params->fw_reload = out_data; PRINTM(MMSG, "fw_reload %d\n", params->fw_reload); - } else if (strncmp(line, "fw_serial", strlen("fw_serial")) == 0) { + } else if (strncmp(line, "fw_serial", strlen("fw_serial")) == + 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -560,8 +569,9 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) else moal_extflg_clear(handle, EXT_FW_SERIAL); PRINTM(MMSG, "fw_serial %s\n", - moal_extflg_isset(handle, - EXT_FW_SERIAL) ? "on" : "off"); + moal_extflg_isset(handle, EXT_FW_SERIAL) ? + "on" : + "off"); } #if defined(STA_CFG80211) || defined(UAP_CFG80211) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) @@ -574,8 +584,9 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) else moal_extflg_clear(handle, EXT_FW_REGION); PRINTM(MMSG, "fw_region %s\n", - moal_extflg_isset(handle, - EXT_FW_REGION) ? "on" : "off"); + moal_extflg_isset(handle, EXT_FW_REGION) ? + "on" : + "off"); } #endif #endif @@ -671,9 +682,8 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) goto err; params->p2a_scan = out_data; PRINTM(MMSG, "p2a_scan = %d\n", params->p2a_scan); - } else if (strncmp - (line, "scan_chan_gap", - strlen("scan_chan_gap")) == 0) { + } else if (strncmp(line, "scan_chan_gap", + strlen("scan_chan_gap")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -698,8 +708,8 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) else moal_extflg_clear(handle, EXT_INTMODE); PRINTM(MMSG, "intmode %s\n", - moal_extflg_isset(handle, - EXT_INTMODE) ? "on" : "off"); + moal_extflg_isset(handle, EXT_INTMODE) ? "on" : + "off"); } else if (strncmp(line, "gpiopin", strlen("gpiopin")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) @@ -709,8 +719,8 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) } #endif #if defined(SDIO) && defined(SDIO_SUSPEND_RESUME) - else if (strncmp(line, "pm_keep_power", strlen("pm_keep_power")) - == 0) { + else if (strncmp(line, "pm_keep_power", + strlen("pm_keep_power")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -719,11 +729,11 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) else moal_extflg_clear(handle, EXT_PM_KEEP_POWER); PRINTM(MMSG, "pm_keep_power %s\n", - moal_extflg_isset(handle, - EXT_PM_KEEP_POWER) ? "on" : - "off"); - } else if (strncmp(line, "shutdown_hs", strlen("shutdown_hs")) - == 0) { + moal_extflg_isset(handle, EXT_PM_KEEP_POWER) ? + "on" : + "off"); + } else if (strncmp(line, "shutdown_hs", + strlen("shutdown_hs")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -732,9 +742,9 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) else moal_extflg_clear(handle, EXT_SHUTDOWN_HS); PRINTM(MMSG, "shutdown_hs %s\n", - moal_extflg_isset(handle, - EXT_SHUTDOWN_HS) ? "on" : - "off"); + moal_extflg_isset(handle, EXT_SHUTDOWN_HS) ? + "on" : + "off"); } #endif #if defined(STA_SUPPORT) @@ -755,8 +765,8 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) PRINTM(MMSG, "slew_rate = %d\n", params->slew_rate); } #endif - else if (strncmp(line, "dpd_data_cfg", strlen("dpd_data_cfg")) - == 0) { + else if (strncmp(line, "dpd_data_cfg", + strlen("dpd_data_cfg")) == 0) { if (parse_line_read_string(line, &out_str) != MLAN_STATUS_SUCCESS) goto err; @@ -768,24 +778,23 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) goto err; woal_dup_string(¶ms->init_cfg, out_str); PRINTM(MMSG, "init_cfg=%s\n", params->init_cfg); - } else if (strncmp(line, "cal_data_cfg", strlen("cal_data_cfg")) - == 0) { + } else if (strncmp(line, "cal_data_cfg", + strlen("cal_data_cfg")) == 0) { if (parse_line_read_string(line, &out_str) != MLAN_STATUS_SUCCESS) goto err; woal_dup_string(¶ms->cal_data_cfg, out_str); PRINTM(MMSG, "cal_data_cfg=%s\n", params->cal_data_cfg); - } else if (strncmp - (line, "txpwrlimit_cfg", - strlen("txpwrlimit_cfg")) == 0) { + } else if (strncmp(line, "txpwrlimit_cfg", + strlen("txpwrlimit_cfg")) == 0) { if (parse_line_read_string(line, &out_str) != MLAN_STATUS_SUCCESS) goto err; woal_dup_string(¶ms->txpwrlimit_cfg, out_str); PRINTM(MMSG, "txpwrlimit_cfg=%s\n", params->txpwrlimit_cfg); - } else if (strncmp(line, "cntry_txpwr", strlen("cntry_txpwr")) - == 0) { + } else if (strncmp(line, "cntry_txpwr", + strlen("cntry_txpwr")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -794,30 +803,27 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) else moal_extflg_clear(handle, EXT_CNTRY_TXPWR); PRINTM(MMSG, "cntry_txpwr %s\n", - moal_extflg_isset(handle, - EXT_CNTRY_TXPWR) ? "on" : - "off"); - } else if (strncmp - (line, "init_hostcmd_cfg", - strlen("init_hostcmd_cfg")) == 0) { + moal_extflg_isset(handle, EXT_CNTRY_TXPWR) ? + "on" : + "off"); + } else if (strncmp(line, "init_hostcmd_cfg", + strlen("init_hostcmd_cfg")) == 0) { if (parse_line_read_string(line, &out_str) != MLAN_STATUS_SUCCESS) goto err; woal_dup_string(¶ms->init_hostcmd_cfg, out_str); PRINTM(MMSG, "init_hostcmd_cfg=%s\n", params->init_hostcmd_cfg); - } else if (strncmp - (line, "band_steer_cfg", - strlen("band_steer_cfg")) == 0) { + } else if (strncmp(line, "band_steer_cfg", + strlen("band_steer_cfg")) == 0) { if (parse_line_read_string(line, &out_str) != MLAN_STATUS_SUCCESS) goto err; woal_dup_string(¶ms->band_steer_cfg, out_str); PRINTM(MMSG, "band_steer_cfg=%s\n", params->band_steer_cfg); - } else if (strncmp - (line, "cfg80211_wext", - strlen("cfg80211_wext")) == 0) { + } else if (strncmp(line, "cfg80211_wext", + strlen("cfg80211_wext")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -827,8 +833,8 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) } #if defined(USB) else if (IS_USB(handle->card_type) && - strncmp(line, "skip_fwdnld", - strlen("skip_fwdnld")) == 0) { + strncmp(line, "skip_fwdnld", strlen("skip_fwdnld")) == + 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -837,22 +843,21 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) else moal_extflg_clear(handle, EXT_SKIP_FWDNLD); PRINTM(MMSG, "skip_fwdnld %s\n", - moal_extflg_isset(handle, - EXT_SKIP_FWDNLD) ? "on" : - "off"); + moal_extflg_isset(handle, EXT_SKIP_FWDNLD) ? + "on" : + "off"); } #endif - else if (strncmp(line, "wq_sched_prio", strlen("wq_sched_prio")) - == 0) { + else if (strncmp(line, "wq_sched_prio", + strlen("wq_sched_prio")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; params->wq_sched_prio = out_data; PRINTM(MMSG, "wq_sched_prio=0x%x\n", params->wq_sched_prio); - } else if (strncmp - (line, "wq_sched_policy", - strlen("wq_sched_policy")) == 0) { + } else if (strncmp(line, "wq_sched_policy", + strlen("wq_sched_policy")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -874,8 +879,9 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) else moal_extflg_clear(handle, EXT_AGGR_CTRL); PRINTM(MMSG, "aggrctrl %s\n", - moal_extflg_isset(handle, - EXT_AGGR_CTRL) ? "on" : "off"); + moal_extflg_isset(handle, EXT_AGGR_CTRL) ? + "on" : + "off"); } #ifdef USB else if (IS_USB(handle->card_type) && @@ -899,9 +905,8 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) params->pcie_int_mode); } #endif - else if (strncmp - (line, "low_power_mode_enable", - strlen("low_power_mode_enable")) == 0) { + else if (strncmp(line, "low_power_mode_enable", + strlen("low_power_mode_enable")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -910,14 +915,13 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) else moal_extflg_clear(handle, EXT_LOW_PW_MODE); PRINTM(MMSG, "low_power_mode_enable %s\n", - moal_extflg_isset(handle, - EXT_LOW_PW_MODE) ? "on" : - "off"); + moal_extflg_isset(handle, EXT_LOW_PW_MODE) ? + "on" : + "off"); } #ifdef ANDROID_KERNEL - else if (strncmp - (line, "wakelock_timeout", - strlen("wakelock_timeout")) == 0) { + else if (strncmp(line, "wakelock_timeout", + strlen("wakelock_timeout")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -926,8 +930,8 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) params->wakelock_timeout); } #endif - else if (strncmp(line, "dev_cap_mask", strlen("dev_cap_mask")) - == 0) { + else if (strncmp(line, "dev_cap_mask", + strlen("dev_cap_mask")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -935,8 +939,8 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) PRINTM(MMSG, "dev_cap_mask=%d\n", params->dev_cap_mask); } #ifdef SDIO - else if (strncmp(line, "sdio_rx_aggr", strlen("sdio_rx_aggr")) - == 0) { + else if (strncmp(line, "sdio_rx_aggr", + strlen("sdio_rx_aggr")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -945,13 +949,16 @@ parse_cfg_read_block(t_u8 *data, t_u32 size, moal_handle *handle) else moal_extflg_clear(handle, EXT_SDIO_RX_AGGR); PRINTM(MMSG, "sdio_rx_aggr %s\n", - moal_extflg_isset(handle, - EXT_SDIO_RX_AGGR) ? "on" : - "off"); + moal_extflg_isset(handle, EXT_SDIO_RX_AGGR) ? + "on" : + "off"); } #endif -#if defined(SD8997) || defined(PCIE8997) || defined(USB8997) || defined(SD8977) || defined(SD8987) ||\ -defined(SD9098)||defined(USB9098) || defined(PCIE9098) || defined(SD9097) || defined(USB9097)|| defined(PCIE9097)||defined(SD8978)|| defined(USB8978) +#if defined(SD8997) || defined(PCIE8997) || defined(USB8997) || \ + defined(SD8977) || defined(SD8987) || defined(SD9098) || \ + defined(USB9098) || defined(PCIE9098) || defined(SD9097) || \ + defined(USB9097) || defined(PCIE9097) || defined(SD8978) || \ + defined(USB8978) else if (strncmp(line, "pmic", strlen("pmic")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) @@ -961,8 +968,8 @@ defined(SD9098)||defined(USB9098) || defined(PCIE9098) || defined(SD9097) || def else moal_extflg_clear(handle, EXT_PMIC); PRINTM(MMSG, "pmic %s\n", - moal_extflg_isset(handle, - EXT_PMIC) ? "on" : "off"); + moal_extflg_isset(handle, EXT_PMIC) ? "on" : + "off"); } #endif else if (strncmp(line, "antcfg", strlen("antcfg")) == 0) { @@ -971,36 +978,32 @@ defined(SD9098)||defined(USB9098) || defined(PCIE9098) || defined(SD9097) || def goto err; params->antcfg = out_data; PRINTM(MMSG, "antcfg=%d\n", params->antcfg); - } else if (strncmp - (line, "uap_oper_ctrl", - strlen("uap_oper_ctrl")) == 0) { + } else if (strncmp(line, "uap_oper_ctrl", + strlen("uap_oper_ctrl")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; params->uap_oper_ctrl = out_data; PRINTM(MMSG, "uap_oper_ctrl=%d\n", params->uap_oper_ctrl); - } else if (strncmp - (line, "hs_wake_interval", - strlen("hs_wake_interval")) == 0) { + } else if (strncmp(line, "hs_wake_interval", + strlen("hs_wake_interval")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; params->hs_wake_interval = out_data; PRINTM(MMSG, "hs_wake_interval=%d\n", params->hs_wake_interval); - } else if (strncmp - (line, "indication_gpio", - strlen("indication_gpio")) == 0) { + } else if (strncmp(line, "indication_gpio", + strlen("indication_gpio")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; params->indication_gpio = out_data; PRINTM(MMSG, "indication_gpio=%d\n", params->indication_gpio); - } else if (strncmp - (line, "disconnect_on_suspend", - strlen("disconnect_on_suspend")) == 0) { + } else if (strncmp(line, "disconnect_on_suspend", + strlen("disconnect_on_suspend")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -1013,10 +1016,10 @@ defined(SD9098)||defined(USB9098) || defined(PCIE9098) || defined(SD9097) || def PRINTM(MMSG, "disconnect_on_suspend %s\n", moal_extflg_isset(handle, EXT_DISCONNECT_ON_SUSPEND) ? - "on" : "off"); - } else if (strncmp - (line, "hs_mimo_switch", - strlen("hs_mimo_switch")) == 0) { + "on" : + "off"); + } else if (strncmp(line, "hs_mimo_switch", + strlen("hs_mimo_switch")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -1025,18 +1028,18 @@ defined(SD9098)||defined(USB9098) || defined(PCIE9098) || defined(SD9097) || def else moal_extflg_clear(handle, EXT_HS_MIMO_SWITCH); PRINTM(MMSG, "hs_mimo_switch %s\n", - moal_extflg_isset(handle, - EXT_HS_MIMO_SWITCH) ? "on" : - "off"); - } else if (strncmp(line, "indrstcfg", strlen("indrstcfg")) == 0) { + moal_extflg_isset(handle, EXT_HS_MIMO_SWITCH) ? + "on" : + "off"); + } else if (strncmp(line, "indrstcfg", strlen("indrstcfg")) == + 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; params->indrstcfg = out_data; PRINTM(MMSG, "indrstcfg=%d\n", params->indrstcfg); - } else if (strncmp - (line, "fixed_beacon_buffer", - strlen("fixed_beacon_buffer")) == 0) { + } else if (strncmp(line, "fixed_beacon_buffer", + strlen("fixed_beacon_buffer")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -1045,13 +1048,13 @@ defined(SD9098)||defined(USB9098) || defined(PCIE9098) || defined(SD9097) || def else moal_extflg_clear(handle, EXT_FIX_BCN_BUF); PRINTM(MMSG, "fixed_beacon_buffer %s\n", - moal_extflg_isset(handle, - EXT_FIX_BCN_BUF) ? "on" : - "off"); + moal_extflg_isset(handle, EXT_FIX_BCN_BUF) ? + "on" : + "off"); } #ifdef WIFI_DIRECT_SUPPORT - else if (strncmp(line, "GoAgeoutTime", strlen("GoAgeoutTime")) - == 0) { + else if (strncmp(line, "GoAgeoutTime", + strlen("GoAgeoutTime")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -1059,9 +1062,8 @@ defined(SD9098)||defined(USB9098) || defined(PCIE9098) || defined(SD9097) || def PRINTM(MMSG, "GoAgeoutTime=%d\n", params->GoAgeoutTime); } #endif - else if (strncmp - (line, "gtk_rekey_offload", - strlen("gtk_rekey_offload")) == 0) { + else if (strncmp(line, "gtk_rekey_offload", + strlen("gtk_rekey_offload")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -1075,7 +1077,8 @@ defined(SD9098)||defined(USB9098) || defined(PCIE9098) || defined(SD9097) || def goto err; params->multi_dtim = out_data; PRINTM(MMSG, "multi_dtim=%d\n", params->multi_dtim); - } else if (strncmp(line, "inact_tmo", strlen("inact_tmo")) == 0) { + } else if (strncmp(line, "inact_tmo", strlen("inact_tmo")) == + 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -1090,8 +1093,8 @@ defined(SD9098)||defined(USB9098) || defined(PCIE9098) || defined(SD9097) || def else moal_extflg_clear(handle, EXT_NAPI); PRINTM(MMSG, "napi %s\n", - moal_extflg_isset(handle, - EXT_NAPI) ? "on" : "off"); + moal_extflg_isset(handle, EXT_NAPI) ? "on" : + "off"); } #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) else if (strncmp(line, "dfs_offload", strlen("dfs_offload")) == @@ -1104,15 +1107,14 @@ defined(SD9098)||defined(USB9098) || defined(PCIE9098) || defined(SD9097) || def else moal_extflg_clear(handle, EXT_DFS_OFFLOAD); PRINTM(MMSG, "dfs_offload %s\n", - moal_extflg_isset(handle, - EXT_DFS_OFFLOAD) ? "on" : - "off"); + moal_extflg_isset(handle, EXT_DFS_OFFLOAD) ? + "on" : + "off"); } #endif #if defined(STA_CFG80211) || defined(UAP_CFG80211) - else if (strncmp - (line, "disable_regd_by_driver", - strlen("disable_regd_by_driver")) == 0) { + else if (strncmp(line, "disable_regd_by_driver", + strlen("disable_regd_by_driver")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -1125,7 +1127,8 @@ defined(SD9098)||defined(USB9098) || defined(PCIE9098) || defined(SD9097) || def PRINTM(MMSG, "reg domain set by driver=%s\n", moal_extflg_isset(handle, EXT_DISABLE_REGD_BY_DRIVER) ? - "disable" : "enable"); + "disable" : + "enable"); } else if (strncmp(line, "reg_alpha2", strlen("reg_alpha2")) == 0) { if (parse_line_read_string(line, &out_str) != @@ -1135,9 +1138,8 @@ defined(SD9098)||defined(USB9098) || defined(PCIE9098) || defined(SD9097) || def PRINTM(MMSG, "reg_alpha2=%s\n", params->reg_alpha2); } #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) - else if (strncmp - (line, "country_ie_ignore", - strlen("country_ie_ignore")) == 0) { + else if (strncmp(line, "country_ie_ignore", + strlen("country_ie_ignore")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -1148,10 +1150,11 @@ defined(SD9098)||defined(USB9098) || defined(PCIE9098) || defined(SD9097) || def EXT_COUNTRY_IE_IGNORE); PRINTM(MMSG, "country_ie_ignore=%s\n", moal_extflg_isset(handle, - EXT_COUNTRY_IE_IGNORE) ? "on" : - "off"); - } else if (strncmp(line, "beacon_hints", strlen("beacon_hints")) - == 0) { + EXT_COUNTRY_IE_IGNORE) ? + "on" : + "off"); + } else if (strncmp(line, "beacon_hints", + strlen("beacon_hints")) == 0) { if (parse_line_read_int(line, &out_data) != MLAN_STATUS_SUCCESS) goto err; @@ -1160,9 +1163,9 @@ defined(SD9098)||defined(USB9098) || defined(PCIE9098) || defined(SD9097) || def else moal_extflg_clear(handle, EXT_BEACON_HINTS); PRINTM(MMSG, "beacon_hints=%s\n", - moal_extflg_isset(handle, - EXT_BEACON_HINTS) ? "disable" : - "enable"); + moal_extflg_isset(handle, EXT_BEACON_HINTS) ? + "disable" : + "enable"); } #endif #endif @@ -1187,12 +1190,19 @@ defined(SD9098)||defined(USB9098) || defined(PCIE9098) || defined(SD9097) || def else moal_extflg_clear(handle, EXT_HOST_MLME); PRINTM(MMSG, "host_mlme=%s\n", - moal_extflg_isset(handle, - EXT_HOST_MLME) ? "disable" : - "enable"); + moal_extflg_isset(handle, EXT_HOST_MLME) ? + "disable" : + "enable"); } #endif #endif + else if (strncmp(line, "dfs53cfg", strlen("dfs53cfg")) == 0) { + if (parse_line_read_int(line, &out_data) != + MLAN_STATUS_SUCCESS) + goto err; + params->dfs53cfg = out_data; + PRINTM(MMSG, "dfs53cfg= %d\n", params->dfs53cfg); + } } if (end) return ret; @@ -1210,10 +1220,8 @@ err: * * @return N/A */ -static void -woal_setup_module_param(moal_handle *handle, moal_mod_para * params) +static void woal_setup_module_param(moal_handle *handle, moal_mod_para *params) { - if (hw_test) moal_extflg_set(handle, EXT_HW_TEST); #ifdef CONFIG_OF @@ -1386,8 +1394,11 @@ woal_setup_module_param(moal_handle *handle, moal_mod_para * params) if (sdio_rx_aggr) moal_extflg_set(handle, EXT_SDIO_RX_AGGR); #endif -#if defined(SD8997) || defined(PCIE8997) || defined(USB8997) || defined(SD8977) || defined(SD8987) ||\ -defined(SD9098)||defined(USB9098)|| defined(PCIE9098) || defined(SD9097) || defined(USB9097)|| defined(PCIE9097) || defined(SD8978)|| defined(USB8978) +#if defined(SD8997) || defined(PCIE8997) || defined(USB8997) || \ + defined(SD8977) || defined(SD8987) || defined(SD9098) || \ + defined(USB9098) || defined(PCIE9098) || defined(SD9097) || \ + defined(USB9097) || defined(PCIE9097) || defined(SD8978) || \ + defined(USB8978) if (pmic) moal_extflg_set(handle, EXT_PMIC); #endif @@ -1457,7 +1468,7 @@ defined(SD9098)||defined(USB9098)|| defined(PCIE9098) || defined(SD9097) || defi params->ext_flgs, sizeof(params->ext_flgs), sizeof(handle->params.ext_flgs)); - /* do some special handle for MFG mode */ + /* do some special handle for MFG mode */ #ifdef MFG_CMD_SUPPORT if (handle->params.mfg_mode) { #if defined(STA_WEXT) || defined(UAP_WEXT) @@ -1468,7 +1479,14 @@ defined(SD9098)||defined(USB9098)|| defined(PCIE9098) || defined(SD9097) || defi handle->params.drv_mode = DRV_MODE_STA; } #endif - + if (dfs53cfg > DFS_W53_OLD) { + PRINTM(MERROR, "Invalid value for dfs53cfg !\n"); + handle->params.dfs53cfg = DFS_W53_DEFAULT_FW; + } else { + handle->params.dfs53cfg = dfs53cfg; + if (params) + handle->params.dfs53cfg = params->dfs53cfg; + } } /** @@ -1478,8 +1496,7 @@ defined(SD9098)||defined(USB9098)|| defined(PCIE9098) || defined(SD9097) || defi * * @return N/A */ -void -woal_free_module_param(moal_handle *handle) +void woal_free_module_param(moal_handle *handle) { moal_mod_para *params = &handle->params; PRINTM(MMSG, "Free module params\n"); @@ -1547,8 +1564,7 @@ woal_free_module_param(moal_handle *handle) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_req_mod_param(moal_handle *handle, char *mod_file) +static mlan_status woal_req_mod_param(moal_handle *handle, char *mod_file) { mlan_status ret = MLAN_STATUS_SUCCESS; struct device *dev = handle->hotplug_device; @@ -1558,7 +1574,9 @@ woal_req_mod_param(moal_handle *handle, char *mod_file) ret = MLAN_STATUS_FAILURE; goto out; } - if ((ret = request_firmware(&handle->param_data, mod_file, dev) < 0)) + + ret = request_firmware(&handle->param_data, mod_file, dev); + if (ret < 0) PRINTM(MERROR, "Request firmware: %s failed, error: %d\n", mod_file, ret); out: @@ -1573,8 +1591,7 @@ out: * * @return N/A */ -void -woal_init_from_dev_tree(void) +void woal_init_from_dev_tree(void) { struct device_node *dt_node = NULL; struct property *prop; @@ -1593,7 +1610,7 @@ woal_init_from_dev_tree(void) LEAVE(); return; } - for_each_property_of_node(dt_node, prop) { + for_each_property_of_node (dt_node, prop) { if (!strncmp(prop->name, "drv_mode", strlen("drv_mode"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { PRINTM(MIOCTL, "drv_mode=0x%x\n", data); @@ -1608,8 +1625,8 @@ woal_init_from_dev_tree(void) } } #endif - else if (!strncmp - (prop->name, "dev_cap_mask", strlen("dev_cap_mask"))) { + else if (!strncmp(prop->name, "dev_cap_mask", + strlen("dev_cap_mask"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { PRINTM(MIOCTL, "dev_cap_mask=0x%x\n", data); dev_cap_mask = data; @@ -1621,7 +1638,8 @@ woal_init_from_dev_tree(void) } } #if defined(SDIO) - else if (!strncmp(prop->name, "slew_rate", strlen("slew_rate"))) { + else if (!strncmp(prop->name, "slew_rate", + strlen("slew_rate"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { PRINTM(MIOCTL, "slew_rate=0x%x\n", data); slew_rate = data; @@ -1637,22 +1655,21 @@ woal_init_from_dev_tree(void) } #endif else if (!strncmp(prop->name, "mac_addr", strlen("mac_addr"))) { - if (!of_property_read_string - (dt_node, prop->name, &string_data)) { + if (!of_property_read_string(dt_node, prop->name, + &string_data)) { mac_addr = (char *)string_data; PRINTM(MIOCTL, "mac_addr=%s\n", mac_addr); } } else if (!strncmp(prop->name, "fw_name", strlen("fw_name"))) { - if (!of_property_read_string - (dt_node, prop->name, &string_data)) { + if (!of_property_read_string(dt_node, prop->name, + &string_data)) { fw_name = (char *)string_data; PRINTM(MIOCTL, "fw_name=%s\n", fw_name); } } #if defined(STA_WEXT) || defined(UAP_WEXT) - else if (!strncmp - (prop->name, "cfg80211_wext", - strlen("cfg80211_wext"))) { + else if (!strncmp(prop->name, "cfg80211_wext", + strlen("cfg80211_wext"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { PRINTM(MIOCTL, "cfg80211_wext=0x%x\n", data); cfg80211_wext = data; @@ -1661,8 +1678,8 @@ woal_init_from_dev_tree(void) #endif #ifdef STA_SUPPORT else if (!strncmp(prop->name, "sta_name", strlen("sta_name"))) { - if (!of_property_read_string - (dt_node, prop->name, &string_data)) { + if (!of_property_read_string(dt_node, prop->name, + &string_data)) { sta_name = (char *)string_data; PRINTM(MIOCTL, "sta_name=%s\n", sta_name); } @@ -1670,42 +1687,39 @@ woal_init_from_dev_tree(void) #endif #ifdef WIFI_DIRECT_SUPPORT else if (!strncmp(prop->name, "wfd_name", strlen("wfd_name"))) { - if (!of_property_read_string - (dt_node, prop->name, &string_data)) { + if (!of_property_read_string(dt_node, prop->name, + &string_data)) { wfd_name = (char *)string_data; PRINTM(MIOCTL, "wfd_name=%s\n", wfd_name); } } #endif #if defined(STA_CFG80211) || defined(UAP_CFG80211) - else if (!strncmp - (prop->name, "disable_regd_by_driver", - strlen("disable_regd_by_driver"))) { + else if (!strncmp(prop->name, "disable_regd_by_driver", + strlen("disable_regd_by_driver"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { PRINTM(MIOCTL, "disable_regd_by_driver=0x%x\n", data); disable_regd_by_driver = data; } - } else if (!strncmp - (prop->name, "reg_alpha2", strlen("reg_alpha2"))) { - if (!of_property_read_string - (dt_node, prop->name, &string_data)) { + } else if (!strncmp(prop->name, "reg_alpha2", + strlen("reg_alpha2"))) { + if (!of_property_read_string(dt_node, prop->name, + &string_data)) { reg_alpha2 = (char *)string_data; PRINTM(MIOCTL, "reg_alpha2=%s\n", reg_alpha2); } } #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) - else if (!strncmp - (prop->name, "country_ie_ignore", - strlen("country_ie_ignore"))) { + else if (!strncmp(prop->name, "country_ie_ignore", + strlen("country_ie_ignore"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { PRINTM(MIOCTL, "country_ie_ignore=0x%x\n", data); country_ie_ignore = data; } - } else if (!strncmp - (prop->name, "beacon_hints", - strlen("beacon_hints"))) { + } else if (!strncmp(prop->name, "beacon_hints", + strlen("beacon_hints"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { PRINTM(MIOCTL, "beacon_hints=0x%x\n", data); beacon_hints = data; @@ -1715,8 +1729,8 @@ woal_init_from_dev_tree(void) #endif #ifdef WIFI_DIRECT_SUPPORT #if defined(STA_CFG80211) && defined(UAP_CFG80211) - else if (!strncmp - (prop->name, "max_vir_bss", strlen("max_vir_bss"))) { + else if (!strncmp(prop->name, "max_vir_bss", + strlen("max_vir_bss"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { PRINTM(MIOCTL, "max_vir_bss=0x%x\n", data); max_vir_bss = data; @@ -1724,58 +1738,55 @@ woal_init_from_dev_tree(void) } #endif #endif - else if (!strncmp - (prop->name, "dpd_data_cfg", strlen("dpd_data_cfg"))) { - if (!of_property_read_string - (dt_node, prop->name, &string_data)) { + else if (!strncmp(prop->name, "dpd_data_cfg", + strlen("dpd_data_cfg"))) { + if (!of_property_read_string(dt_node, prop->name, + &string_data)) { dpd_data_cfg = (char *)string_data; PRINTM(MIOCTL, "dpd_data_cfg=%s\n", dpd_data_cfg); } - } else if (!strncmp(prop->name, "init_cfg", strlen("init_cfg"))) { - if (!of_property_read_string - (dt_node, prop->name, &string_data)) { + } else if (!strncmp(prop->name, "init_cfg", + strlen("init_cfg"))) { + if (!of_property_read_string(dt_node, prop->name, + &string_data)) { init_cfg = (char *)string_data; PRINTM(MIOCTL, "init_cfg=%s\n", init_cfg); } - } else if (!strncmp - (prop->name, "cal_data_cfg", - strlen("cal_data_cfg"))) { - if (!of_property_read_string - (dt_node, prop->name, &string_data)) { + } else if (!strncmp(prop->name, "cal_data_cfg", + strlen("cal_data_cfg"))) { + if (!of_property_read_string(dt_node, prop->name, + &string_data)) { cal_data_cfg = (char *)string_data; PRINTM(MIOCTL, "cal_data_cfg=%s\n", cal_data_cfg); } - } else if (!strncmp - (prop->name, "txpwrlimit_cfg", - strlen("txpwrlimit_cfg"))) { - if (!of_property_read_string - (dt_node, prop->name, &string_data)) { + } else if (!strncmp(prop->name, "txpwrlimit_cfg", + strlen("txpwrlimit_cfg"))) { + if (!of_property_read_string(dt_node, prop->name, + &string_data)) { txpwrlimit_cfg = (char *)string_data; PRINTM(MIOCTL, "txpwrlimit_cfg=%s\n", txpwrlimit_cfg); } - } else if (!strncmp - (prop->name, "cntry_txpwr", strlen("cntry_txpwr"))) { + } else if (!strncmp(prop->name, "cntry_txpwr", + strlen("cntry_txpwr"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { cntry_txpwr = data; PRINTM(MIOCTL, "cntry_txpwr=%d\n", cntry_txpwr); } - } else if (!strncmp - (prop->name, "init_hostcmd_cfg", - strlen("init_hostcmd_cfg"))) { - if (!of_property_read_string - (dt_node, prop->name, &string_data)) { + } else if (!strncmp(prop->name, "init_hostcmd_cfg", + strlen("init_hostcmd_cfg"))) { + if (!of_property_read_string(dt_node, prop->name, + &string_data)) { init_hostcmd_cfg = (char *)string_data; PRINTM(MIOCTL, "init_hostcmd_cfg=%s\n", init_hostcmd_cfg); } - } else if (!strncmp - (prop->name, "band_steer_cfg", - strlen("band_steer_cfg"))) { - if (!of_property_read_string - (dt_node, prop->name, &string_data)) { + } else if (!strncmp(prop->name, "band_steer_cfg", + strlen("band_steer_cfg"))) { + if (!of_property_read_string(dt_node, prop->name, + &string_data)) { band_steer_cfg = (char *)string_data; PRINTM(MIOCTL, "band_steer_cfg=%s\n", band_steer_cfg); @@ -1790,25 +1801,22 @@ woal_init_from_dev_tree(void) antcfg = data; PRINTM(MIOCTL, "antcfg=%d\n", antcfg); } - } else if (!strncmp - (prop->name, "hs_wake_interval", - strlen("hs_wake_interval"))) { + } else if (!strncmp(prop->name, "hs_wake_interval", + strlen("hs_wake_interval"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { hs_wake_interval = data; PRINTM(MIOCTL, "hs_wake_interval=%d\n", hs_wake_interval); } - } else if (!strncmp - (prop->name, "indication_gpio", - strlen("indication_gpio"))) { + } else if (!strncmp(prop->name, "indication_gpio", + strlen("indication_gpio"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { indication_gpio = (t_u8)data; PRINTM(MIOCTL, "indication_gpio=%d\n", indication_gpio); } - } else if (!strncmp - (prop->name, "hs_mimo_switch", - strlen("hs_mimo_switch"))) { + } else if (!strncmp(prop->name, "hs_mimo_switch", + strlen("hs_mimo_switch"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { hs_mimo_switch = data; PRINTM(MIOCTL, "hs_mimo_switch=%d\n", @@ -1816,8 +1824,8 @@ woal_init_from_dev_tree(void) } } #ifdef WIFI_DIRECT_SUPPORT - else if (!strncmp - (prop->name, "GoAgeoutTime", strlen("GoAgeoutTime"))) { + else if (!strncmp(prop->name, "GoAgeoutTime", + strlen("GoAgeoutTime"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { GoAgeoutTime = data; PRINTM(MIOCTL, "GoAgeoutTime=%d\n", @@ -1825,44 +1833,43 @@ woal_init_from_dev_tree(void) } } #endif - else if (!strncmp(prop->name, "indrstcfg", strlen("indrstcfg"))) { + else if (!strncmp(prop->name, "indrstcfg", + strlen("indrstcfg"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { indrstcfg = data; PRINTM(MIOCTL, "indrstcfg=%d\n", indrstcfg); } - } else if (!strncmp - (prop->name, "fixed_beacon_buffer", - strlen("fixed_beacon_buffer"))) { + } else if (!strncmp(prop->name, "fixed_beacon_buffer", + strlen("fixed_beacon_buffer"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { fixed_beacon_buffer = data; PRINTM(MIOCTL, "fixed_beacon_buffer=%d\n", fixed_beacon_buffer); } - } else if (!strncmp - (prop->name, "multi_dtim", strlen("multi_dtim"))) { + } else if (!strncmp(prop->name, "multi_dtim", + strlen("multi_dtim"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { multi_dtim = data; PRINTM(MIOCTL, "multi_dtim=%d\n", multi_dtim); } - } else if (!strncmp - (prop->name, "inact_tmo", strlen("inact_tmo"))) { + } else if (!strncmp(prop->name, "inact_tmo", + strlen("inact_tmo"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { inact_tmo = data; PRINTM(MIOCTL, "inact_tmo=%d\n", inact_tmo); } } #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) - else if (!strncmp - (prop->name, "dfs_offload", strlen("dfs_offload"))) { + else if (!strncmp(prop->name, "dfs_offload", + strlen("dfs_offload"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { dfs_offload = data; PRINTM(MIOCTL, "dfs_offload=%d\n", dfs_offload); } } #endif - else if (!strncmp - (prop->name, "gtk_rekey_offload", - strlen("gtk_rekey_offload"))) { + else if (!strncmp(prop->name, "gtk_rekey_offload", + strlen("gtk_rekey_offload"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { gtk_rekey_offload = data; PRINTM(MIOCTL, "gtk_rekey_offload=%d\n", @@ -1871,7 +1878,8 @@ woal_init_from_dev_tree(void) } #if defined(STA_CFG80211) || defined(UAP_CFG80211) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) - else if (!strncmp(prop->name, "host_mlme", strlen("host_mlme"))) { + else if (!strncmp(prop->name, "host_mlme", + strlen("host_mlme"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { PRINTM(MIOCTL, "host_mlme=0x%x\n", data); host_mlme = data; @@ -1880,8 +1888,8 @@ woal_init_from_dev_tree(void) #endif #endif #ifdef UAP_SUPPORT - else if (!strncmp - (prop->name, "uap_max_sta", strlen("uap_max_sta"))) { + else if (!strncmp(prop->name, "uap_max_sta", + strlen("uap_max_sta"))) { if (!of_property_read_u32(dt_node, prop->name, &data)) { PRINTM(MERROR, "uap_max_sta=0x%x\n", data); uap_max_sta = data; @@ -1901,8 +1909,7 @@ woal_init_from_dev_tree(void) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_validate_cfg_id(moal_handle *handle) +mlan_status woal_validate_cfg_id(moal_handle *handle) { int i; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1926,8 +1933,7 @@ woal_validate_cfg_id(moal_handle *handle) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -parse_skip_cfg_block(t_u8 *data, t_u32 size) +mlan_status parse_skip_cfg_block(t_u8 *data, t_u32 size) { int end = 0; t_u8 line[MAX_LINE_LEN]; @@ -1950,8 +1956,7 @@ parse_skip_cfg_block(t_u8 *data, t_u32 size) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_cfg_fallback_process(moal_handle *handle) +mlan_status woal_cfg_fallback_process(moal_handle *handle) { int i, blk_id = 0x7fffffff, idx = -1; mlan_status ret = MLAN_STATUS_FAILURE; @@ -1984,8 +1989,7 @@ woal_cfg_fallback_process(moal_handle *handle) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_init_module_param(moal_handle *handle) +mlan_status woal_init_module_param(moal_handle *handle) { int no_match = 1; t_u32 size, i, tbl_size; @@ -2022,10 +2026,9 @@ woal_init_module_param(moal_handle *handle) if (line[0] == '#') continue; if (strstr(line, "={")) { - if ((ret = parse_line_read_card_info(line, - &card_type, - &blk_id)) != - MLAN_STATUS_SUCCESS) + ret = parse_line_read_card_info(line, &card_type, + &blk_id); + if (ret != MLAN_STATUS_SUCCESS) goto out; PRINTM(MINFO, "Traverse, card_type: %s, config block: %s\n", @@ -2055,10 +2058,8 @@ woal_init_module_param(moal_handle *handle) "card_type: %s, config block: %d\n", card_type, handle->blk_id); /* parse config block */ - if ((ret = - parse_cfg_read_block(data, size, - handle)) != - MLAN_STATUS_SUCCESS) + ret = parse_cfg_read_block(data, size, handle); + if (ret != MLAN_STATUS_SUCCESS) goto out; break; } @@ -2091,14 +2092,16 @@ MODULE_PARM_DESC(dts_enable, "0: Disable DTS; 1: Enable DTS"); module_param(fw_name, charp, 0660); MODULE_PARM_DESC(fw_name, "Firmware name"); module_param(req_fw_nowait, int, 0); -MODULE_PARM_DESC(req_fw_nowait, - "0: Use request_firmware API; 1: Use request_firmware_nowait API"); +MODULE_PARM_DESC( + req_fw_nowait, + "0: Use request_firmware API; 1: Use request_firmware_nowait API"); module_param(fw_reload, int, 0); MODULE_PARM_DESC(fw_reload, "0: disable fw_reload; 1: enable fw reload feature"); module_param(fw_serial, int, 0); -MODULE_PARM_DESC(fw_serial, - "0: support parallel download FW; 1: support serial download FW"); +MODULE_PARM_DESC( + fw_serial, + "0: support parallel download FW; 1: support serial download FW"); #if defined(STA_CFG80211) || defined(UAP_CFG80211) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) module_param(fw_region, int, 0); @@ -2142,17 +2145,21 @@ module_param(drvdbg, uint, 0660); MODULE_PARM_DESC(drvdbg, "Driver debug"); #endif /* DEBUG_LEVEL1 */ module_param(auto_ds, int, 0660); -MODULE_PARM_DESC(auto_ds, - "0: MLAN default; 1: Enable auto deep sleep; 2: Disable auto deep sleep"); +MODULE_PARM_DESC( + auto_ds, + "0: MLAN default; 1: Enable auto deep sleep; 2: Disable auto deep sleep"); module_param(ps_mode, int, 0660); -MODULE_PARM_DESC(ps_mode, - "0: MLAN default; 1: Enable IEEE PS mode; 2: Disable IEEE PS mode"); +MODULE_PARM_DESC( + ps_mode, + "0: MLAN default; 1: Enable IEEE PS mode; 2: Disable IEEE PS mode"); module_param(p2a_scan, int, 0660); -MODULE_PARM_DESC(p2a_scan, - "0: MLAN default; 1: Enable passive to active scan for DFS channel; 2: Disable passive to active scan for DFS channel"); +MODULE_PARM_DESC( + p2a_scan, + "0: MLAN default; 1: Enable passive to active scan for DFS channel; 2: Disable passive to active scan for DFS channel"); module_param(scan_chan_gap, int, 0660); -MODULE_PARM_DESC(scan_chan_gap, - "Time gap between two scans in milliseconds when connected to AP(max value 500ms)"); +MODULE_PARM_DESC( + scan_chan_gap, + "Time gap between two scans in milliseconds when connected to AP(max value 500ms)"); module_param(max_tx_buf, int, 0); MODULE_PARM_DESC(max_tx_buf, "Maximum Tx buffer size (2048/4096/8192)"); @@ -2177,8 +2184,9 @@ MODULE_PARM_DESC(cfg_11d, #endif #if defined(SDIO) module_param(slew_rate, int, 0); -MODULE_PARM_DESC(slew_rate, - "0:has the slowest slew rate, then 01, then 02, and 03 has the highest slew rate"); +MODULE_PARM_DESC( + slew_rate, + "0:has the slowest slew rate, then 01, then 02, and 03 has the highest slew rate"); #endif module_param(dpd_data_cfg, charp, 0); MODULE_PARM_DESC(dpd_data_cfg, "DPD data file name"); @@ -2190,8 +2198,9 @@ module_param(txpwrlimit_cfg, charp, 0); MODULE_PARM_DESC(txpwrlimit_cfg, "Set configuration data of Tx power limitation"); module_param(cntry_txpwr, int, 0); -MODULE_PARM_DESC(cntry_txpwr, - "Allow setting tx power table of country; 0: disable (default), 1: enable."); +MODULE_PARM_DESC( + cntry_txpwr, + "Allow setting tx power table of country; 0: disable (default), 1: enable."); module_param(init_hostcmd_cfg, charp, 0); MODULE_PARM_DESC(init_hostcmd_cfg, "Init hostcmd file name"); module_param(band_steer_cfg, charp, 0); @@ -2210,7 +2219,7 @@ MODULE_PARM_DESC(cfg80211_wext, #ifdef UAP_CFG80211 "Bit 3: UAP CFG80211;" #endif - ); +); #if defined(USB) module_param(skip_fwdnld, int, 0); MODULE_PARM_DESC(skip_fwdnld, "0: Enable FW download; 1: Disable FW download"); @@ -2218,11 +2227,13 @@ MODULE_PARM_DESC(skip_fwdnld, "0: Enable FW download; 1: Disable FW download"); module_param(wq_sched_prio, int, 0); module_param(wq_sched_policy, int, 0); MODULE_PARM_DESC(wq_sched_prio, "Priority of work queue"); -MODULE_PARM_DESC(wq_sched_policy, - "0: SCHED_NORMAL; 1: SCHED_FIFO; 2: SCHED_RR; 3: SCHED_BATCH; 5: SCHED_IDLE"); +MODULE_PARM_DESC( + wq_sched_policy, + "0: SCHED_NORMAL; 1: SCHED_FIFO; 2: SCHED_RR; 3: SCHED_BATCH; 5: SCHED_IDLE"); module_param(rx_work, int, 0); -MODULE_PARM_DESC(rx_work, - "0: default; 1: Enable rx_work_queue; 2: Disable rx_work_queue"); +MODULE_PARM_DESC( + rx_work, + "0: default; 1: Enable rx_work_queue; 2: Disable rx_work_queue"); module_param(aggrctrl, int, 0); MODULE_PARM_DESC(aggrctrl, "1: Enable Tx aggregation; 0: Disable Tx aggregation"); @@ -2253,36 +2264,44 @@ MODULE_PARM_DESC(sdio_rx_aggr, #endif module_param(pmic, int, 0); -MODULE_PARM_DESC(pmic, - "1: Send pmic configure cmd to firmware; 0: No pmic configure cmd sent to firmware"); +MODULE_PARM_DESC( + pmic, + "1: Send pmic configure cmd to firmware; 0: No pmic configure cmd sent to firmware"); module_param(antcfg, int, 0660); -MODULE_PARM_DESC(antcfg, - "0:default; SD8887/SD8987-[1:Tx/Rx antenna 1, 2:Tx/Rx antenna 2, 0xffff:enable antenna diversity];SD8897/SD8997-[Bit0:Rx Path A, Bit1:Rx Path B, Bit 4:Tx Path A, Bit 5:Tx Path B];9098/9097-[Bit 0: 2G Tx/Rx path A, Bit 1: 2G Tx/Rx path B,Bit 8: 5G Tx/Rx path A, Bit 9: 5G Tx/Rx path B]"); +MODULE_PARM_DESC( + antcfg, + "0:default; SD8887/SD8987-[1:Tx/Rx antenna 1, 2:Tx/Rx antenna 2, 0xffff:enable antenna diversity];SD8897/SD8997-[Bit0:Rx Path A, Bit1:Rx Path B, Bit 4:Tx Path A, Bit 5:Tx Path B];9098/9097-[Bit 0: 2G Tx/Rx path A, Bit 1: 2G Tx/Rx path B,Bit 8: 5G Tx/Rx path A, Bit 9: 5G Tx/Rx path B]"); module_param(uap_oper_ctrl, uint, 0); MODULE_PARM_DESC(uap_oper_ctrl, "0:default; 0x20001:uap restarts on channel 6"); module_param(hs_wake_interval, int, 0660); -MODULE_PARM_DESC(hs_wake_interval, - "Host sleep wakeup interval,it will round to nearest multiple dtim*beacon_period in fw"); +MODULE_PARM_DESC( + hs_wake_interval, + "Host sleep wakeup interval,it will round to nearest multiple dtim*beacon_period in fw"); module_param(indication_gpio, int, 0); -MODULE_PARM_DESC(indication_gpio, - "GPIO to indicate wakeup source; high four bits: level for normal wakeup; low four bits: GPIO pin number."); +MODULE_PARM_DESC( + indication_gpio, + "GPIO to indicate wakeup source; high four bits: level for normal wakeup; low four bits: GPIO pin number."); module_param(disconnect_on_suspend, int, 0); -MODULE_PARM_DESC(disconnect_on_suspend, - "1: Enable disconnect wifi on suspend; 0: Disable disconnect wifi on suspend"); +MODULE_PARM_DESC( + disconnect_on_suspend, + "1: Enable disconnect wifi on suspend; 0: Disable disconnect wifi on suspend"); module_param(hs_mimo_switch, int, 0660); -MODULE_PARM_DESC(hs_mimo_switch, - "Dynamic MIMO-SISO switch during host sleep; 0: disable (default), 1: enable"); +MODULE_PARM_DESC( + hs_mimo_switch, + "Dynamic MIMO-SISO switch during host sleep; 0: disable (default), 1: enable"); module_param(indrstcfg, int, 0); -MODULE_PARM_DESC(indrstcfg, - "Independent reset configuration; high byte: GPIO pin number; low byte: IR mode"); +MODULE_PARM_DESC( + indrstcfg, + "Independent reset configuration; high byte: GPIO pin number; low byte: IR mode"); module_param(fixed_beacon_buffer, int, 0); -MODULE_PARM_DESC(fixed_beacon_buffer, - "0: allocate default buffer size; 1: allocate max buffer size."); +MODULE_PARM_DESC( + fixed_beacon_buffer, + "0: allocate default buffer size; 1: allocate max buffer size."); #ifdef WIFI_DIRECT_SUPPORT module_param(GoAgeoutTime, int, 0); @@ -2291,8 +2310,9 @@ MODULE_PARM_DESC(GoAgeoutTime, #endif module_param(gtk_rekey_offload, int, 0); -MODULE_PARM_DESC(gtk_rekey_offload, - "0: disable gtk_rekey_offload; 1: enable gtk_rekey_offload (default); 2: enable gtk_rekey_offload in suspend mode only;"); +MODULE_PARM_DESC( + gtk_rekey_offload, + "0: disable gtk_rekey_offload; 1: enable gtk_rekey_offload (default); 2: enable gtk_rekey_offload in suspend mode only;"); module_param(multi_dtim, ushort, 0); MODULE_PARM_DESC(multi_dtim, "DTIM interval"); @@ -2322,16 +2342,21 @@ MODULE_PARM_DESC(host_mlme, #if defined(STA_CFG80211) || defined(UAP_CFG80211) module_param(disable_regd_by_driver, int, 0); -MODULE_PARM_DESC(disable_regd_by_driver, - "0: reg domain set by driver enable(default); 1: reg domain set by driver disable"); +MODULE_PARM_DESC( + disable_regd_by_driver, + "0: reg domain set by driver enable(default); 1: reg domain set by driver disable"); module_param(reg_alpha2, charp, 0660); MODULE_PARM_DESC(reg_alpha2, "Regulatory alpha2"); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) module_param(country_ie_ignore, int, 0); -MODULE_PARM_DESC(country_ie_ignore, - "0: Follow countryIE from AP and beacon hint enable; 1: Ignore countryIE from AP and beacon hint disable"); +MODULE_PARM_DESC( + country_ie_ignore, + "0: Follow countryIE from AP and beacon hint enable; 1: Ignore countryIE from AP and beacon hint disable"); module_param(beacon_hints, int, 0); MODULE_PARM_DESC(beacon_hints, "0: enable beacon hints(default); 1: disable beacon hints"); #endif #endif + +module_param(dfs53cfg, int, 0); +MODULE_PARM_DESC(dfs53cfg, "0: fw default; 1: new w53 dfs; 2: old w53 dfs"); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_ioctl.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_ioctl.c index 90b82726f3a0..5b90653af268 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_ioctl.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_ioctl.c @@ -1,40 +1,40 @@ /** @file moal_ioctl.c - * - * @brief This file contains ioctl function to MLAN - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains ioctl function to MLAN + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /******************************************************** Change log: 10/21/2008: initial version ********************************************************/ -#include "moal_main.h" -#include "moal_eth_ioctl.h" +#include "moal_main.h" +#include "moal_eth_ioctl.h" #ifdef SDIO -#include "moal_sdio.h" +#include "moal_sdio.h" #endif #ifdef USB -#include "moal_usb.h" +#include "moal_usb.h" #endif #ifdef UAP_SUPPORT -#include "moal_uap.h" +#include "moal_uap.h" #endif #if defined(STA_CFG80211) || defined(UAP_CFG80211) @@ -47,28 +47,28 @@ Change log: /******************************************************** Local Variables ********************************************************/ -#define MRVL_TLV_HEADER_SIZE 4 +#define MRVL_TLV_HEADER_SIZE 4 /* NXP Channel config TLV ID */ -#define MRVL_CHANNELCONFIG_TLV_ID (0x0100 + 0x2a) /* 0x012a */ +#define MRVL_CHANNELCONFIG_TLV_ID (0x0100 + 0x2a) /* 0x012a */ typedef struct _hostcmd_header { - /** Command Header : Command */ + /** Command Header : Command */ t_u16 command; - /** Command Header : Size */ + /** Command Header : Size */ t_u16 size; - /** Command Header : Sequence number */ + /** Command Header : Sequence number */ t_u16 seq_num; - /** Command Header : Result */ + /** Command Header : Result */ t_u16 result; - /** Command action */ + /** Command action */ t_u16 action; } hostcmd_header, *phostcmd_header; /** Region code mapping */ typedef struct _region_code_mapping_t { - /** Region */ + /** Region */ t_u8 region[COUNTRY_CODE_LEN]; - /** Code */ + /** Code */ t_u8 code; } region_code_mapping_t; @@ -76,40 +76,38 @@ typedef struct _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 */ - {"JP", 0x40}, /* Japan */ - {"CN", 0x50}, /* China */ - {"BR", 0x09}, /* Brazil */ - {"RU", 0x0f}, /* Russia */ - {"IN", 0x06}, /* India */ - {"MY", 0x06}, /* Malaysia */ + {"US", 0x10}, /* US FCC */ + {"CA", 0x20}, /* IC Canada */ + {"SG", 0x10}, /* Singapore */ + {"EU", 0x30}, /* ETSI */ + {"AU", 0x30}, /* Australia */ + {"KR", 0x30}, /* Republic Of Korea */ + {"JP", 0x40}, /* Japan */ + {"CN", 0x50}, /* China */ + {"BR", 0x09}, /* Brazil */ + {"RU", 0x0f}, /* Russia */ + {"IN", 0x06}, /* India */ + {"MY", 0x06}, /* Malaysia */ }; /** EEPROM Region code mapping table */ static region_code_mapping_t hw_region_code_mapping[] = { - {"US ", 0x10}, /* US FCC */ - {"CA ", 0x20}, /* IC Canada */ - {"KR ", 0x30}, /* Korea */ - {"CN ", 0x50}, /* China */ - {"ES ", 0x31}, /* Spain */ - {"FR ", 0x32}, /* France */ - {"JP ", 0x40}, /* Japan */ - {"JP ", 0x41}, /* Japan */ + {"US ", 0x10}, /* US FCC */ + {"CA ", 0x20}, /* IC Canada */ + {"KR ", 0x30}, /* Korea */ + {"CN ", 0x50}, /* China */ + {"ES ", 0x31}, /* Spain */ + {"FR ", 0x32}, /* France */ + {"JP ", 0x40}, /* Japan */ + {"JP ", 0x41}, /* Japan */ }; /** Country code for ETSI */ static t_u8 eu_country_code_table[][COUNTRY_CODE_LEN] = { - "AL", "AD", "AT", "AU", "BY", "BE", "BA", "BG", "HR", "CY", - "CZ", "DK", "EE", "FI", "FR", "MK", "DE", "GR", "HU", "IS", - "IE", "IT", "KR", "LV", "LI", "LT", "LU", "MT", "MD", "MC", - "ME", "NL", "NO", "PL", "RO", "RU", "SM", "RS", "SI", "SK", - "ES", "SE", "CH", "TR", "UA", "UK", "GB" -}; + "AL", "AD", "AT", "AU", "BY", "BE", "BA", "BG", "HR", "CY", "CZ", "DK", + "EE", "FI", "FR", "MK", "DE", "GR", "HU", "IS", "IE", "IT", "KR", "LV", + "LI", "LT", "LU", "MT", "MD", "MC", "ME", "NL", "NO", "PL", "RO", "RU", + "SM", "RS", "SI", "SK", "ES", "SE", "CH", "TR", "UA", "UK", "GB"}; /******************************************************** Global Variables @@ -141,10 +139,8 @@ extern int mfg_mode; * * @return Region code */ -t_bool -woal_is_country_code_supported(t_u8 *country_code) +t_bool woal_is_country_code_supported(t_u8 *country_code) { - t_u8 i; ENTER(); @@ -161,7 +157,6 @@ woal_is_country_code_supported(t_u8 *country_code) LEAVE(); return MFALSE; } - /** * @brief This function converts region string to region code * @@ -169,15 +164,13 @@ woal_is_country_code_supported(t_u8 *country_code) * * @return Region code */ -t_u8 -region_string_2_region_code(char *region_string) +t_u8 region_string_2_region_code(char *region_string) { t_u8 i; ENTER(); for (i = 0; i < ARRAY_SIZE(region_code_mapping); i++) { - if (!memcmp(region_string, - region_code_mapping[i].region, + if (!memcmp(region_string, region_code_mapping[i].region, strlen(region_string))) { LEAVE(); return region_code_mapping[i].code; @@ -207,10 +200,8 @@ region_string_2_region_code(char *region_string) * * @return Region code */ -t_bool -woal_is_etsi_country(t_u8 *country_code) +t_bool woal_is_etsi_country(t_u8 *country_code) { - t_u8 i; ENTER(); @@ -235,8 +226,7 @@ woal_is_etsi_country(t_u8 *country_code) * * @return Region string or NULL */ -char * -region_code_2_string(t_u8 region_code) +char *region_code_2_string(t_u8 region_code) { t_u8 i; @@ -251,8 +241,7 @@ region_code_2_string(t_u8 region_code) return NULL; } -t_u8 -woal_is_valid_alpha2(char *alpha2) +t_u8 woal_is_valid_alpha2(char *alpha2) { if (!alpha2 || strlen(alpha2) < 2) return MFALSE; @@ -267,8 +256,7 @@ woal_is_valid_alpha2(char *alpha2) * @param chan channel num * @return second channel offset */ -t_u8 -woal_get_second_channel_offset(int chan) +t_u8 woal_get_second_channel_offset(int chan) { t_u8 chan2Offset = SEC_CHAN_NONE; @@ -317,8 +305,8 @@ woal_get_second_channel_offset(int chan) * * @return N/A */ -static inline void -woal_copy_mc_addr(mlan_multicast_list *mlist, mlan_802_11_mac_addr mac) +static inline void woal_copy_mc_addr(mlan_multicast_list *mlist, + mlan_802_11_mac_addr mac) { int i = 0; for (i = 0; i < mlist->num_multicast_addr; i++) { @@ -341,8 +329,8 @@ woal_copy_mc_addr(mlan_multicast_list *mlist, mlan_802_11_mac_addr mac) * * @return Number of multicast addresses */ -static inline int -woal_copy_mcast_addr(mlan_multicast_list *mlist, struct net_device *dev) +static inline int woal_copy_mcast_addr(mlan_multicast_list *mlist, + struct net_device *dev) { #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) struct dev_mc_list *mcptr = dev->mc_list; @@ -358,7 +346,7 @@ woal_copy_mcast_addr(mlan_multicast_list *mlist, struct net_device *dev) mcptr = mcptr->next; } #else - netdev_for_each_mc_addr(mcptr, dev) + netdev_for_each_mc_addr (mcptr, dev) woal_copy_mc_addr(mlist, mcptr->addr); #endif /* < 2.6.35 */ LEAVE(); @@ -373,8 +361,8 @@ woal_copy_mcast_addr(mlan_multicast_list *mlist, struct net_device *dev) * * @return total_mc_count */ -static int -woal_copy_all_mc_list(moal_handle *handle, mlan_multicast_list *mlist) +static int woal_copy_all_mc_list(moal_handle *handle, + mlan_multicast_list *mlist) { int i; moal_private *priv = NULL; @@ -412,8 +400,8 @@ woal_copy_all_mc_list(moal_handle *handle, mlan_multicast_list *mlist) * * @return N/A */ -static inline void -woal_fill_wait_queue(moal_private *priv, wait_queue *wait, t_u8 wait_option) +static inline void woal_fill_wait_queue(moal_private *priv, wait_queue *wait, + t_u8 wait_option) { ENTER(); wait->start_time = jiffies; @@ -443,9 +431,9 @@ woal_fill_wait_queue(moal_private *priv, wait_queue *wait, t_u8 wait_option) * * @return N/A */ -static inline mlan_status -woal_wait_ioctl_complete(moal_private *priv, mlan_ioctl_req *req, - t_u8 wait_option) +static inline mlan_status woal_wait_ioctl_complete(moal_private *priv, + mlan_ioctl_req *req, + t_u8 wait_option) { mlan_status status; wait_queue *wait = (wait_queue *)req->reserved_1; @@ -459,9 +447,9 @@ woal_wait_ioctl_complete(moal_private *priv, mlan_ioctl_req *req, case MOAL_NO_WAIT: break; case MOAL_IOCTL_WAIT: - while (wait_event_interruptible_exclusive - (wait->wait, wait->condition) - == -ERESTARTSYS && wait->retry < MAX_RETRY_CNT) { + while (wait_event_interruptible_exclusive( + wait->wait, wait->condition) == -ERESTARTSYS && + wait->retry < MAX_RETRY_CNT) { wait->retry++; } break; @@ -503,8 +491,8 @@ woal_wait_ioctl_complete(moal_private *priv, mlan_ioctl_req *req, * * @return MTRUE/MFALSE */ -static inline t_bool -woal_cac_period_block_cmd(moal_private *priv, pmlan_ioctl_req req) +static inline t_bool woal_cac_period_block_cmd(moal_private *priv, + pmlan_ioctl_req req) { mlan_status ret = MFALSE; t_u32 sub_command; @@ -525,7 +513,7 @@ woal_cac_period_block_cmd(moal_private *priv, pmlan_ioctl_req req) case MLAN_IOCTL_BSS: if (sub_command == MLAN_OID_BSS_STOP || sub_command == MLAN_OID_BSS_CHANNEL - /* sub_command == MLAN_OID_BSS_ROLE */ ) + /* sub_command == MLAN_OID_BSS_ROLE */) ret = MTRUE; #ifdef UAP_SUPPORT else if (sub_command == MLAN_OID_UAP_BSS_CONFIG) { @@ -571,15 +559,16 @@ woal_cac_period_block_cmd(moal_private *priv, pmlan_ioctl_req req) t_u16 tag, length; phostcmd = - (phostcmd_header)((pmlan_ds_misc_cfg)req-> - pbuf)->param.hostcmd.cmd; + (phostcmd_header)((pmlan_ds_misc_cfg)req->pbuf) + ->param.hostcmd.cmd; ptlv_buf = (t_u8 *)phostcmd + sizeof(hostcmd_header); if (phostcmd->action == MLAN_ACT_SET) { while (ptlv_buf < (t_u8 *)phostcmd + phostcmd->size) { tag = *(t_u16 *)ptlv_buf; length = *(t_u16 *)(ptlv_buf + 2); - /* Check Blocking TLV here, should add more... */ + /* Check Blocking TLV here, should add + * more... */ if (tag == MRVL_CHANNELCONFIG_TLV_ID) { ret = MTRUE; break; @@ -619,22 +608,25 @@ done: * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING * -- success, otherwise fail */ -mlan_status -woal_request_ioctl(moal_private *priv, mlan_ioctl_req *req, t_u8 wait_option) +mlan_status woal_request_ioctl(moal_private *priv, mlan_ioctl_req *req, + t_u8 wait_option) { wait_queue *wait = NULL; mlan_status status; unsigned long flags; - t_u32 sub_command = *(t_u32 *)req->pbuf; + t_u32 sub_command = 0; ENTER(); - if (!priv || !priv->phandle || !priv->phandle->pmlan_adapter) { + if (!priv || !priv->phandle || !priv->phandle->pmlan_adapter || !req) { PRINTM(MINFO, - "priv or priv->phandle or priv->phandle->pmlan_adapter is null\n"); + "priv or priv->phandle or priv->phandle->pmlan_adapter or req is null\n"); LEAVE(); return MLAN_STATUS_FAILURE; } + + sub_command = *(t_u32 *)req->pbuf; + if (sub_command != MLAN_OID_GET_DEBUG_INFO) { if (priv->phandle->surprise_removed == MTRUE || priv->phandle->driver_status) { @@ -656,10 +648,10 @@ woal_request_ioctl(moal_private *priv, mlan_ioctl_req *req, t_u8 wait_option) } #endif } - /* For MLAN_OID_MISC_HOST_CMD, action is 0, "action set" is checked later */ + /* For MLAN_OID_MISC_HOST_CMD, action is 0, "action set" is checked + * later */ if ((req->action == MLAN_ACT_SET || req->action == 0) && priv->phandle->cac_period == MTRUE) { - /* CAC checking period left to complete jiffies */ long cac_left_jiffies; @@ -668,14 +660,17 @@ woal_request_ioctl(moal_private *priv, mlan_ioctl_req *req, t_u8 wait_option) * after CAC measure period ends, * usually this could be considered as a FW bug */ - cac_left_jiffies = priv->phandle->cac_timer_jiffies - + cac_left_jiffies = + priv->phandle->cac_timer_jiffies - (jiffies - priv->phandle->meas_start_jiffies); if (priv->phandle->cac_period_jiffies) { - cac_left_jiffies = priv->phandle->cac_period_jiffies - + cac_left_jiffies = + priv->phandle->cac_period_jiffies - (jiffies - priv->phandle->meas_start_jiffies); } if (cac_left_jiffies < 0) { - /* Avoid driver hang in FW died during CAC measure period */ + /* Avoid driver hang in FW died during CAC measure + * period */ priv->phandle->cac_period = MFALSE; PRINTM(MERROR, "CAC measure period spends longer than scheduled time " @@ -686,9 +681,9 @@ woal_request_ioctl(moal_private *priv, mlan_ioctl_req *req, t_u8 wait_option) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) if (priv->uap_host_based && moal_extflg_isset(priv->phandle, EXT_DFS_OFFLOAD)) - woal_cfg80211_dfs_vendor_event(priv, - event_dfs_cac_aborted, - &priv->chan); + woal_cfg80211_dfs_vendor_event( + priv, event_dfs_cac_aborted, + &priv->chan); #endif #endif #endif @@ -711,14 +706,15 @@ woal_request_ioctl(moal_private *priv, mlan_ioctl_req *req, t_u8 wait_option) "Received BSS Start command during CAC period, delay executing %ld seconds\n", cac_left_jiffies / HZ); priv->phandle->delay_bss_start = MTRUE; - moal_memcpy_ext(priv->phandle, - &priv->phandle-> - delay_ssid_bssid, - &bss->param.ssid_bssid, - sizeof(mlan_ssid_bssid), - sizeof(mlan_ssid_bssid)); - /* TODO: return success to allow the half below of routines - * of which calling BSS start to execute + moal_memcpy_ext( + priv->phandle, + &priv->phandle->delay_ssid_bssid, + &bss->param.ssid_bssid, + sizeof(mlan_ssid_bssid), + sizeof(mlan_ssid_bssid)); + /* TODO: return success to allow the half below + * of routines of which calling BSS start to + * execute */ status = MLAN_STATUS_SUCCESS; goto done; @@ -735,13 +731,12 @@ woal_request_ioctl(moal_private *priv, mlan_ioctl_req *req, t_u8 wait_option) PRINTM(MMSG, "CAC check is on going... Blocking Command %ld seconds\n", cac_left_jiffies / HZ); - /* blocking timeout set to 1.5 * CAC checking period left time */ - wait_event_interruptible_timeout(priv->phandle-> - meas_wait_q, - priv->phandle-> - meas_wait_q_woken, - cac_left_jiffies * 3 / - 2); + /* blocking timeout set to 1.5 * CAC checking period + * left time */ + wait_event_interruptible_timeout( + priv->phandle->meas_wait_q, + priv->phandle->meas_wait_q_woken, + cac_left_jiffies * 3 / 2); } } #ifdef UAP_CFG80211 @@ -792,10 +787,11 @@ woal_request_ioctl(moal_private *priv, mlan_ioctl_req *req, t_u8 wait_option) case MLAN_STATUS_SUCCESS: case MLAN_STATUS_FAILURE: case MLAN_STATUS_RESOURCE: - PRINTM(MIOCTL, - "IOCTL: %p id=0x%x, sub_id=0x%x wait_option=%d, action=%d status=%d\n", - req, req->req_id, (*(t_u32 *)req->pbuf), wait_option, - (int)req->action, status); + if (req) + PRINTM(MIOCTL, + "IOCTL: %p id=0x%x, sub_id=0x%x wait_option=%d, action=%d status=%d\n", + req, req->req_id, (*(t_u32 *)req->pbuf), + wait_option, (int)req->action, status); atomic_dec(&priv->phandle->ioctl_pending); break; default: @@ -817,8 +813,7 @@ done: * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING * -- success, otherwise fail */ -mlan_status -woal_request_set_mac_address(moal_private *priv, t_u8 wait_option) +mlan_status woal_request_set_mac_address(moal_private *priv, t_u8 wait_option) { mlan_ioctl_req *req = NULL; mlan_ds_bss *bss = NULL; @@ -867,8 +862,7 @@ done: * * @return N/A */ -void -woal_request_set_multicast_list(moal_private *priv, struct net_device *dev) +void woal_request_set_multicast_list(moal_private *priv, struct net_device *dev) { mlan_ioctl_req *req = NULL; mlan_ds_bss *bss = NULL; @@ -896,9 +890,8 @@ woal_request_set_multicast_list(moal_private *priv, struct net_device *dev) bss->param.multicast_list.mode = MLAN_ALL_MULTI_MODE; } else { bss->param.multicast_list.mode = MLAN_MULTICAST_MODE; - mc_count = - woal_copy_all_mc_list(priv->phandle, - &bss->param.multicast_list); + mc_count = woal_copy_all_mc_list(priv->phandle, + &bss->param.multicast_list); if (mc_count > MLAN_MAX_MULTICAST_LIST_SIZE) bss->param.multicast_list.mode = MLAN_ALL_MULTI_MODE; } @@ -919,11 +912,11 @@ done: * @param wait_option Wait option * @param mac MAC address to deauthenticate * @param reason code reason code to deauthenticate - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_disconnect(moal_private *priv, t_u8 wait_option, t_u8 *mac, - t_u16 reason_code) +mlan_status woal_disconnect(moal_private *priv, t_u8 wait_option, t_u8 *mac, + t_u16 reason_code) { mlan_ioctl_req *req = NULL; mlan_ds_bss *bss = NULL; @@ -974,10 +967,10 @@ done: * @return non-global operclass */ -int -woal_priv_get_nonglobal_operclass_by_bw_channel(moal_private *priv, - t_u8 bandwidth, t_u8 channel, - t_u8 *oper_class) +int woal_priv_get_nonglobal_operclass_by_bw_channel(moal_private *priv, + t_u8 bandwidth, + t_u8 channel, + t_u8 *oper_class) { int ret = 0; mlan_ioctl_req *ioctl_req = NULL; @@ -1022,11 +1015,11 @@ done: * @param wait_option Wait option * @param ssid_bssid A point to mlan_ssid_bssid structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_bss_start(moal_private *priv, t_u8 wait_option, - mlan_ssid_bssid *ssid_bssid) +mlan_status woal_bss_start(moal_private *priv, t_u8 wait_option, + mlan_ssid_bssid *ssid_bssid) { mlan_ioctl_req *req = NULL; mlan_ds_bss *bss = NULL; @@ -1083,10 +1076,11 @@ done: * @param wait_option Wait option * @param bss_info A pointer to mlan_bss_info structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_get_bss_info(moal_private *priv, t_u8 wait_option, mlan_bss_info *bss_info) +mlan_status woal_get_bss_info(moal_private *priv, t_u8 wait_option, + mlan_bss_info *bss_info) { mlan_ioctl_req *req = NULL; mlan_ds_get_info *info = NULL; @@ -1135,9 +1129,8 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_set_get_gen_ie(moal_private *priv, t_u32 action, - t_u8 *ie, int *ie_len, t_u8 wait_option) +mlan_status woal_set_get_gen_ie(moal_private *priv, t_u32 action, t_u8 *ie, + int *ie_len, t_u8 wait_option) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cfg *misc = NULL; @@ -1203,11 +1196,11 @@ done: * @param wait_option Wait option * @param value Retry value * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_set_get_retry(moal_private *priv, t_u32 action, - t_u8 wait_option, int *value) +mlan_status woal_set_get_retry(moal_private *priv, t_u32 action, + t_u8 wait_option, int *value) { mlan_ioctl_req *req = NULL; mlan_ds_snmp_mib *mib = NULL; @@ -1266,8 +1259,7 @@ done: * * @return 0 if successful else negative value */ -int -woal_pre_warmreset(moal_private *priv) +int woal_pre_warmreset(moal_private *priv) { moal_handle *handle = priv->phandle; int ret = 0; @@ -1335,8 +1327,7 @@ done: * * @return 0 success, otherwise failure */ -int -woal_warmreset(moal_private *priv) +int woal_warmreset(moal_private *priv) { moal_handle *handle = priv->phandle; mlan_ioctl_req *req = NULL; @@ -1401,10 +1392,11 @@ done: * @param wait_option Wait option * @param value RTS threshold value * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_set_get_rts(moal_private *priv, t_u32 action, t_u8 wait_option, int *value) +mlan_status woal_set_get_rts(moal_private *priv, t_u32 action, t_u8 wait_option, + int *value) { mlan_ioctl_req *req = NULL; mlan_ds_snmp_mib *mib = NULL; @@ -1426,7 +1418,8 @@ woal_set_get_rts(moal_private *priv, t_u32 action, t_u8 wait_option, int *value) req->action = action; if (action == MLAN_ACT_SET) { - if (*value < MLAN_RTS_MIN_VALUE || *value > MLAN_RTS_MAX_VALUE) { + if (*value < MLAN_RTS_MIN_VALUE || + *value > MLAN_RTS_MAX_VALUE) { ret = MLAN_STATUS_FAILURE; goto done; } @@ -1462,11 +1455,11 @@ done: * @param wait_option Wait option * @param value Fragment threshold value * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_set_get_frag(moal_private *priv, t_u32 action, - t_u8 wait_option, int *value) +mlan_status woal_set_get_frag(moal_private *priv, t_u32 action, + t_u8 wait_option, int *value) { mlan_ioctl_req *req = NULL; mlan_ds_snmp_mib *mib = NULL; @@ -1524,11 +1517,11 @@ done: * @param action Action set or get * @param power_cfg A pinter to mlan_power_cfg_t structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_set_get_tx_power(moal_private *priv, - t_u32 action, mlan_power_cfg_t *power_cfg) +mlan_status woal_set_get_tx_power(moal_private *priv, t_u32 action, + mlan_power_cfg_t *power_cfg) { mlan_ds_power_cfg *pcfg = NULL; mlan_ioctl_req *req = NULL; @@ -1577,10 +1570,9 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_set_get_power_mgmt(moal_private *priv, - t_u32 action, int *disabled, int power_type, - t_u8 wait_option) +mlan_status woal_set_get_power_mgmt(moal_private *priv, t_u32 action, + int *disabled, int power_type, + t_u8 wait_option) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ioctl_req *req = NULL; @@ -1604,7 +1596,8 @@ woal_set_get_power_mgmt(moal_private *priv, if (*disabled) pm_cfg->param.ps_mode = 0; else { - /* Check not support case only (vwrq->disabled == FALSE) */ + /* Check not support case only (vwrq->disabled == FALSE) + */ if ((power_type & MW_POWER_TYPE) == MW_POWER_TIMEOUT) { PRINTM(MERROR, "Setting power timeout is not supported\n"); @@ -1632,8 +1625,7 @@ woal_set_get_power_mgmt(moal_private *priv, /* If set is invoked from other than iw i.e iwconfig, * wiphy IEEE power save mode should be updated */ if (IS_STA_CFG80211(priv->phandle->params.cfg80211_wext) && - priv->wdev && - (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) && + priv->wdev && (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) && (action == MLAN_ACT_SET)) { if (*disabled) priv->wdev->ps = MFALSE; @@ -1655,10 +1647,10 @@ done: * @param priv A pointer to moal_private structure * @param region A pointer to region string * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise + * fail */ -int -woal_set_countrycode(moal_private *priv, char *country) +int woal_set_countrycode(moal_private *priv, char *country) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -1706,10 +1698,10 @@ done: * @param priv A pointer to moal_private structure * @param region A pointer to region string * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING --success, otherwise + * fail */ -mlan_status -woal_set_region_code(moal_private *priv, char *region) +mlan_status woal_set_region_code(moal_private *priv, char *region) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cfg *cfg = NULL; @@ -1747,9 +1739,8 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_set_get_data_rate(moal_private *priv, - t_u8 action, mlan_rate_cfg_t *datarate) +mlan_status woal_set_get_data_rate(moal_private *priv, t_u8 action, + mlan_rate_cfg_t *datarate) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_rate *rate = NULL; @@ -1796,9 +1787,9 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_get_assoc_rsp(moal_private *priv, mlan_ds_misc_assoc_rsp *assoc_rsp, - t_u8 wait_option) +mlan_status woal_get_assoc_rsp(moal_private *priv, + mlan_ds_misc_assoc_rsp *assoc_rsp, + t_u8 wait_option) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cfg *misc = NULL; @@ -1840,11 +1831,11 @@ done: * @param wait_option Wait option * @param fw_info FW information * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_request_get_fw_info(moal_private *priv, t_u8 wait_option, - mlan_fw_info *fw_info) +mlan_status woal_request_get_fw_info(moal_private *priv, t_u8 wait_option, + mlan_fw_info *fw_info) { mlan_ioctl_req *req = NULL; mlan_ds_get_info *info; @@ -1853,8 +1844,8 @@ woal_request_get_fw_info(moal_private *priv, t_u8 wait_option, memset(priv->current_addr, 0xff, ETH_ALEN); /* Allocate an IOCTL request buffer */ - req = (mlan_ioctl_req *) - woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_get_info)); + req = (mlan_ioctl_req *)woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_get_info)); if (req == NULL) { status = MLAN_STATUS_FAILURE; goto done; @@ -1904,8 +1895,8 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_get_active_intf_channel(moal_private *priv, chan_band_info * channel) +mlan_status woal_get_active_intf_channel(moal_private *priv, + chan_band_info *channel) { moal_handle *handle = priv->phandle; int i; @@ -1939,10 +1930,10 @@ woal_get_active_intf_channel(moal_private *priv, chan_band_info * channel) * @param buf data buffer * @param len data buffer length * - * @return number of bytes of extended capability -- success, otherwise error + * @return number of bytes of extended capability -- success, + * otherwise error */ -int -woal_request_extcap(moal_private *priv, t_u8 *buf, t_u8 len) +int woal_request_extcap(moal_private *priv, t_u8 *buf, t_u8 len) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -1987,11 +1978,11 @@ out: * @param wait_option Wait option * @param debug_info A pointer to mlan_debug_info structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_get_debug_info(moal_private *priv, t_u8 wait_option, - mlan_debug_info *debug_info) +mlan_status woal_get_debug_info(moal_private *priv, t_u8 wait_option, + mlan_debug_info *debug_info) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -2038,8 +2029,7 @@ done: * @param wrq A pointer to iwreq structure * @return 0 --success, otherwise fail */ -int -woal_host_command(moal_private *priv, struct iwreq *wrq) +int woal_host_command(moal_private *priv, struct iwreq *wrq) { HostCmd_Header cmd_header; int ret = 0; @@ -2064,8 +2054,8 @@ woal_host_command(moal_private *priv, struct iwreq *wrq) memset(&cmd_header, 0, sizeof(cmd_header)); /* get command header */ - if (copy_from_user - (&cmd_header, wrq->u.data.pointer, sizeof(HostCmd_Header))) { + if (copy_from_user(&cmd_header, wrq->u.data.pointer, + sizeof(HostCmd_Header))) { PRINTM(MERROR, "copy from user failed: Host command header\n"); ret = -EFAULT; goto done; @@ -2082,9 +2072,8 @@ woal_host_command(moal_private *priv, struct iwreq *wrq) } /* get the whole command from user */ - if (copy_from_user - (misc->param.hostcmd.cmd, wrq->u.data.pointer, - woal_le16_to_cpu(cmd_header.size))) { + if (copy_from_user(misc->param.hostcmd.cmd, wrq->u.data.pointer, + woal_le16_to_cpu(cmd_header.size))) { PRINTM(MERROR, "copy from user failed\n"); ret = -EFAULT; goto done; @@ -2097,9 +2086,8 @@ woal_host_command(moal_private *priv, struct iwreq *wrq) ret = -EFAULT; goto done; } - if (copy_to_user - (wrq->u.data.pointer, (t_u8 *)misc->param.hostcmd.cmd, - misc->param.hostcmd.len)) { + if (copy_to_user(wrq->u.data.pointer, (t_u8 *)misc->param.hostcmd.cmd, + misc->param.hostcmd.len)) { ret = -EFAULT; goto done; } @@ -2128,8 +2116,7 @@ done: /* to application */ /* Hostcmd_body */ /*******************************************/ -int -woal_hostcmd_ioctl(struct net_device *dev, struct ifreq *req) +int woal_hostcmd_ioctl(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); t_u32 buf_len = 0; @@ -2157,9 +2144,8 @@ woal_hostcmd_ioctl(struct net_device *dev, struct ifreq *req) memset(&cmd_header, 0, sizeof(cmd_header)); /* get command header */ - if (copy_from_user - (&cmd_header, req->ifr_data + sizeof(buf_len), - sizeof(HostCmd_Header))) { + if (copy_from_user(&cmd_header, req->ifr_data + sizeof(buf_len), + sizeof(HostCmd_Header))) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -2183,9 +2169,9 @@ woal_hostcmd_ioctl(struct net_device *dev, struct ifreq *req) misc->param.hostcmd.len = woal_le16_to_cpu(cmd_header.size); /* get the whole command from user */ - if (copy_from_user - (misc->param.hostcmd.cmd, req->ifr_data + sizeof(buf_len), - misc->param.hostcmd.len)) { + if (copy_from_user(misc->param.hostcmd.cmd, + req->ifr_data + sizeof(buf_len), + misc->param.hostcmd.len)) { PRINTM(MERROR, "copy from user failed\n"); ret = -EFAULT; goto done; @@ -2205,9 +2191,9 @@ woal_hostcmd_ioctl(struct net_device *dev, struct ifreq *req) ret = -EFAULT; goto done; } - if (copy_to_user - (req->ifr_data + sizeof(buf_len), (t_u8 *)misc->param.hostcmd.cmd, - misc->param.hostcmd.len)) { + if (copy_to_user(req->ifr_data + sizeof(buf_len), + (t_u8 *)misc->param.hostcmd.cmd, + misc->param.hostcmd.len)) { ret = -EFAULT; goto done; } @@ -2226,8 +2212,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -int -woal_custom_ie_ioctl(struct net_device *dev, struct ifreq *req) +int woal_custom_ie_ioctl(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ioctl_req *ioctl_req = NULL; @@ -2246,15 +2231,15 @@ woal_custom_ie_ioctl(struct net_device *dev, struct ifreq *req) goto done; } - flag = (in_atomic() || irqs_disabled())? GFP_ATOMIC : GFP_KERNEL; + flag = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; custom_ie = kzalloc(sizeof(mlan_ds_misc_custom_ie), flag); if (!custom_ie) { ret = -ENOMEM; goto done; } - if (copy_from_user - (custom_ie, req->ifr_data, sizeof(mlan_ds_misc_custom_ie))) { + if (copy_from_user(custom_ie, req->ifr_data, + sizeof(mlan_ds_misc_custom_ie))) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -2269,9 +2254,8 @@ woal_custom_ie_ioctl(struct net_device *dev, struct ifreq *req) misc = (mlan_ds_misc_cfg *)ioctl_req->pbuf; misc->sub_command = MLAN_OID_MISC_CUSTOM_IE; ioctl_req->req_id = MLAN_IOCTL_MISC_CFG; - if ((custom_ie->len == 0)||(custom_ie->len == - sizeof(custom_ie->ie_data_list[0]. - ie_index))) + if ((custom_ie->len == 0) || + (custom_ie->len == sizeof(custom_ie->ie_data_list[0].ie_index))) ioctl_req->action = MLAN_ACT_GET; else ioctl_req->action = MLAN_ACT_SET; @@ -2287,9 +2271,8 @@ woal_custom_ie_ioctl(struct net_device *dev, struct ifreq *req) } if (ioctl_req->action == MLAN_ACT_GET) { - if (copy_to_user - (req->ifr_data, &misc->param.cust_ie, - sizeof(mlan_ds_misc_custom_ie))) { + if (copy_to_user(req->ifr_data, &misc->param.cust_ie, + sizeof(mlan_ds_misc_custom_ie))) { PRINTM(MERROR, "Copy to user failed!\n"); ret = -EFAULT; goto done; @@ -2314,8 +2297,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -int -woal_send_host_packet(struct net_device *dev, struct ifreq *req) +int woal_send_host_packet(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); t_u32 packet_len = 0; @@ -2343,17 +2325,16 @@ woal_send_host_packet(struct net_device *dev, struct ifreq *req) ret = -EFAULT; goto done; } -#define PACKET_HEADER_LEN 8 -#define MV_ETH_FRAME_LEN 1514 +#define PACKET_HEADER_LEN 8 +#define MV_ETH_FRAME_LEN 1514 if (packet_len > MV_ETH_FRAME_LEN) { PRINTM(MERROR, "Invalid packet length %d\n", packet_len); ret = -EFAULT; goto done; } - pmbuf = woal_alloc_mlan_buffer(priv->phandle, - (int)(MLAN_MIN_DATA_HEADER_LEN + - (int)packet_len + - PACKET_HEADER_LEN)); + pmbuf = woal_alloc_mlan_buffer( + priv->phandle, (int)(MLAN_MIN_DATA_HEADER_LEN + + (int)packet_len + PACKET_HEADER_LEN)); if (!pmbuf) { PRINTM(MERROR, "Fail to allocate mlan_buffer\n"); ret = -ENOMEM; @@ -2362,10 +2343,9 @@ woal_send_host_packet(struct net_device *dev, struct ifreq *req) pmbuf->data_offset = MLAN_MIN_DATA_HEADER_LEN; /* get whole packet and header */ - if (copy_from_user - (pmbuf->pbuf + pmbuf->data_offset, - req->ifr_data + sizeof(packet_len), - PACKET_HEADER_LEN + packet_len)) { + if (copy_from_user(pmbuf->pbuf + pmbuf->data_offset, + req->ifr_data + sizeof(packet_len), + PACKET_HEADER_LEN + packet_len)) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; woal_free_mlan_buffer(priv->phandle, pmbuf); @@ -2406,8 +2386,7 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_set_get_custom_ie(moal_private *priv, t_u16 mask, t_u8 *ie, int ie_len) +int woal_set_get_custom_ie(moal_private *priv, t_u16 mask, t_u8 *ie, int ie_len) { mlan_ioctl_req *ioctl_req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -2457,8 +2436,7 @@ woal_set_get_custom_ie(moal_private *priv, t_u16 mask, t_u8 *ie, int ie_len) * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -int -woal_get_bss_type(struct net_device *dev, struct ifreq *req) +int woal_get_bss_type(struct net_device *dev, struct ifreq *req) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -2487,9 +2465,8 @@ woal_get_bss_type(struct net_device *dev, struct ifreq *req) * * @return 0 --success, otherwise fail */ -mlan_status -woal_bss_role_cfg(moal_private *priv, t_u8 action, - t_u8 wait_option, t_u8 *bss_role) +mlan_status woal_bss_role_cfg(moal_private *priv, t_u8 action, t_u8 wait_option, + t_u8 *bss_role) { int ret = 0; mlan_ds_bss *bss = NULL; @@ -2548,8 +2525,8 @@ woal_bss_role_cfg(moal_private *priv, t_u8 action, woal_get_uap_wireless_stats; #endif dev->wireless_handlers = - (struct iw_handler_def *) - &woal_uap_handler_def; + (struct iw_handler_def + *)&woal_uap_handler_def; } #endif /* UAP_WEXT */ } else if (*bss_role == MLAN_BSS_ROLE_STA) { @@ -2568,8 +2545,8 @@ woal_bss_role_cfg(moal_private *priv, t_u8 action, woal_get_wireless_stats; #endif dev->wireless_handlers = - (struct iw_handler_def *) - &woal_handler_def; + (struct iw_handler_def + *)&woal_handler_def; } #endif /* STA_WEXT */ } @@ -2591,8 +2568,7 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_set_get_bss_role(moal_private *priv, struct iwreq *wrq) +int woal_set_get_bss_role(moal_private *priv, struct iwreq *wrq) { int ret = 0; int bss_role = 0; @@ -2601,7 +2577,8 @@ woal_set_get_bss_role(moal_private *priv, struct iwreq *wrq) ENTER(); if (wrq->u.data.length) { - if (copy_from_user(&bss_role, wrq->u.data.pointer, sizeof(int))) { + if (copy_from_user(&bss_role, wrq->u.data.pointer, + sizeof(int))) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -2611,7 +2588,7 @@ woal_set_get_bss_role(moal_private *priv, struct iwreq *wrq) #ifdef WIFI_DIRECT_SUPPORT || (priv->bss_type != MLAN_BSS_TYPE_WIFIDIRECT) #endif - ) { + ) { PRINTM(MWARN, "Invalid BSS role\n"); ret = -EINVAL; goto done; @@ -2626,8 +2603,8 @@ woal_set_get_bss_role(moal_private *priv, struct iwreq *wrq) woal_reset_intf(priv, MOAL_IOCTL_WAIT, MFALSE); } - if (MLAN_STATUS_SUCCESS != woal_bss_role_cfg(priv, - action, MOAL_IOCTL_WAIT, + if (MLAN_STATUS_SUCCESS != woal_bss_role_cfg(priv, action, + MOAL_IOCTL_WAIT, (t_u8 *)&bss_role)) { ret = -EFAULT; goto done; @@ -2667,11 +2644,11 @@ done: * @param wait_option Wait option * @param value DTIM period * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_set_get_dtim_period(moal_private *priv, - t_u32 action, t_u8 wait_option, t_u8 *value) +mlan_status woal_set_get_dtim_period(moal_private *priv, t_u32 action, + t_u8 wait_option, t_u8 *value) { mlan_ioctl_req *req = NULL; mlan_ds_snmp_mib *mib = NULL; @@ -2715,11 +2692,11 @@ done: * @param wait_option Wait option (MOAL_WAIT or MOAL_NO_WAIT) * @param hscfg A pointer to mlan_ds_hs_cfg structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_set_get_hs_params(moal_private *priv, t_u16 action, t_u8 wait_option, - mlan_ds_hs_cfg *hscfg) +mlan_status woal_set_get_hs_params(moal_private *priv, t_u16 action, + t_u8 wait_option, mlan_ds_hs_cfg *hscfg) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_pm_cfg *pmcfg = NULL; @@ -2766,11 +2743,11 @@ done: * @param priv A pointer to moal_private structure * @param wakeup_reason A pointer to mlan_ds_hs_wakeup_reason structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_get_wakeup_reason(moal_private *priv, - mlan_ds_hs_wakeup_reason *wakeup_reason) +mlan_status woal_get_wakeup_reason(moal_private *priv, + mlan_ds_hs_wakeup_reason *wakeup_reason) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_pm_cfg *pmcfg = NULL; @@ -2814,9 +2791,9 @@ done: * * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_FAILURE */ -mlan_status -woal_set_get_wowlan_config(moal_private *priv, t_u16 action, t_u8 wait_option, - mlan_ds_misc_mef_flt_cfg *mefcfg) +mlan_status woal_set_get_wowlan_config(moal_private *priv, t_u16 action, + t_u8 wait_option, + mlan_ds_misc_mef_flt_cfg *mefcfg) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_misc_cfg *misccfg = NULL; @@ -2824,13 +2801,13 @@ woal_set_get_wowlan_config(moal_private *priv, t_u16 action, t_u8 wait_option, ENTER(); - /** Allocate an IOCTL request buffer*/ + /** Allocate an IOCTL request buffer*/ req = woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_misc_cfg)); if (req == NULL) { ret = -ENOMEM; goto done; } - /** Fill request buffer */ + /** Fill request buffer */ misccfg = (mlan_ds_misc_cfg *)req->pbuf; misccfg->sub_command = MLAN_OID_MISC_MEF_FLT_CFG; req->req_id = MLAN_IOCTL_MISC_CFG; @@ -2866,8 +2843,7 @@ done: * @return MLAN_STATUS_SUCCESS, MLAN_STATUS_PENDING, * or MLAN_STATUS_FAILURE */ -mlan_status -woal_cancel_hs(moal_private *priv, t_u8 wait_option) +mlan_status woal_cancel_hs(moal_private *priv, t_u8 wait_option) { moal_handle *handle = NULL; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -2896,7 +2872,8 @@ woal_cancel_hs(moal_private *priv, t_u8 wait_option) PRINTM(MIOCTL, "Cancel Host Sleep... clear gtk rekey offload of FW\n"); for (i = 0; i < handle->priv_num; i++) { - if (handle->priv[i] && handle->priv[i]->gtk_data_ready) { + if (handle->priv[i] && + handle->priv[i]->gtk_data_ready) { PRINTM(MCMND, "clear GTK in resume\n"); woal_set_rekey_data(handle->priv[i], NULL, MLAN_ACT_CLEAR, @@ -2916,8 +2893,7 @@ woal_cancel_hs(moal_private *priv, t_u8 wait_option) * @param priv A Pointer to the moal_private structure * @return MTRUE or MFALSE */ -int -woal_enable_hs(moal_private *priv) +int woal_enable_hs(moal_private *priv) { mlan_ds_hs_cfg hscfg; moal_handle *handle = NULL; @@ -2944,8 +2920,9 @@ woal_enable_hs(moal_private *priv) for (i = 0; i < MIN(handle->priv_num, MLAN_MAX_BSS_NUM); i++) { if (handle->priv[i] && (GET_BSS_ROLE(handle->priv[i]) == MLAN_BSS_ROLE_STA)) { - if (moal_extflg_isset(handle, EXT_DISCONNECT_ON_SUSPEND) - && handle->priv[i]->media_connected == MTRUE) { + if (moal_extflg_isset(handle, + EXT_DISCONNECT_ON_SUSPEND) && + handle->priv[i]->media_connected == MTRUE) { PRINTM(MIOCTL, "disconnect on suspend\n"); woal_disconnect(handle->priv[i], MOAL_NO_WAIT, NULL, DEF_DEAUTH_REASON_CODE); @@ -2976,24 +2953,16 @@ woal_enable_hs(moal_private *priv) if (priv->phandle->cookie) { cfg80211_remain_on_channel_expired( #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 6, 0) - remain_priv-> - netdev, + remain_priv->netdev, #else - remain_priv-> - wdev, + remain_priv->wdev, #endif - priv-> - phandle-> - cookie, - &priv-> - phandle-> - chan, + priv->phandle->cookie, + &priv->phandle->chan, #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - priv-> - phandle-> - channel_type, + priv->phandle->channel_type, #endif - GFP_ATOMIC); + GFP_ATOMIC); priv->phandle->cookie = 0; } } @@ -3012,12 +2981,13 @@ woal_enable_hs(moal_private *priv) PRINTM(MIOCTL, "Host Sleep enabled... set gtk rekey offload to FW\n"); for (i = 0; i < handle->priv_num; i++) { - if (handle->priv[i] && handle->priv[i]->gtk_data_ready) { + if (handle->priv[i] && + handle->priv[i]->gtk_data_ready) { PRINTM(MCMND, "set GTK before suspend\n"); - woal_set_rekey_data(handle->priv[i], - &handle->priv[i]-> - gtk_rekey_data, - MLAN_ACT_SET, MOAL_NO_WAIT); + woal_set_rekey_data( + handle->priv[i], + &handle->priv[i]->gtk_rekey_data, + MLAN_ACT_SET, MOAL_NO_WAIT); } } } @@ -3028,16 +2998,13 @@ woal_enable_hs(moal_private *priv) keep_alive = &handle->keep_alive[i]; if (keep_alive && keep_alive->cached && keep_alive->enable) { keep_alive->cached = false; - woal_start_mkeep_alive(woal_get_priv - (handle, MLAN_BSS_ROLE_ANY), - keep_alive->mkeep_alive_id, - keep_alive->packet, - keep_alive->pkt_len, - keep_alive->src_mac, - keep_alive->dst_mac, - keep_alive->send_interval, - keep_alive->retry_interval, - keep_alive->retry_count); + woal_start_mkeep_alive( + woal_get_priv(handle, MLAN_BSS_ROLE_ANY), + keep_alive->mkeep_alive_id, keep_alive->packet, + keep_alive->pkt_len, keep_alive->src_mac, + keep_alive->dst_mac, keep_alive->send_interval, + keep_alive->retry_interval, + keep_alive->retry_count); keep_alive->pkt_len = 0; memset(keep_alive->packet, 0, MKEEP_ALIVE_IP_PKT_MAX); } @@ -3059,7 +3026,8 @@ woal_enable_hs(moal_private *priv) sdio_claim_host(((struct sdio_mmc_card *)handle->card)->func); } #endif - if ((handle->hs_activated == MTRUE) || (handle->is_suspended == MTRUE)) { + if ((handle->hs_activated == MTRUE) || + (handle->is_suspended == MTRUE)) { PRINTM(MCMND, "suspend success! force=%u skip=%u\n", handle->hs_force_count, handle->hs_skip_count); hs_actived = MTRUE; @@ -3078,7 +3046,7 @@ woal_enable_hs(moal_private *priv) hs_actived = MTRUE; } } -#endif /* SDIO_SUSPEND_RESUME */ +#endif /* SDIO_SUSPEND_RESUME*/ #ifdef SDIO_MMC if (IS_SD(handle->card_type)) { sdio_release_host(((struct sdio_mmc_card *)handle->card)->func); @@ -3094,8 +3062,8 @@ woal_enable_hs(moal_private *priv) handle->hs_force_count, handle->hs_skip_count); } #else - PRINTM(MCMND, "suspend skipped! timeout=%d skip=%u\n", - timeout, handle->hs_skip_count); + PRINTM(MCMND, "suspend skipped! timeout=%d skip=%u\n", timeout, + handle->hs_skip_count); #endif woal_cancel_hs(priv, MOAL_NO_WAIT); } @@ -3112,8 +3080,7 @@ done: * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING on success, * otherwise failure code */ -mlan_status -woal_request_soft_reset(moal_handle *handle) +mlan_status woal_request_soft_reset(moal_handle *handle) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ioctl_req *req = NULL; @@ -3126,9 +3093,9 @@ woal_request_soft_reset(moal_handle *handle) misc->sub_command = MLAN_OID_MISC_SOFT_RESET; req->req_id = MLAN_IOCTL_MISC_CFG; req->action = MLAN_ACT_SET; - ret = woal_request_ioctl(woal_get_priv - (handle, MLAN_BSS_ROLE_ANY), req, - MOAL_IOCTL_WAIT); + ret = woal_request_ioctl(woal_get_priv(handle, + MLAN_BSS_ROLE_ANY), + req, MOAL_IOCTL_WAIT); } handle->surprise_removed = MTRUE; @@ -3147,10 +3114,11 @@ woal_request_soft_reset(moal_handle *handle) * @param wait_option Wait option * @param enable MTRUE or MFALSE * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_set_wapi_enable(moal_private *priv, t_u8 wait_option, t_u32 enable) +mlan_status woal_set_wapi_enable(moal_private *priv, t_u8 wait_option, + t_u32 enable) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -3190,8 +3158,7 @@ done: * * @return N/A */ -void -woal_get_version(moal_handle *handle, char *version, int max_len) +void woal_get_version(moal_handle *handle, char *version, int max_len) { union { t_u32 l; @@ -3202,8 +3169,8 @@ woal_get_version(moal_handle *handle, char *version, int max_len) ENTER(); ver.l = handle->fw_release_number; - snprintf(fw_ver, sizeof(fw_ver), "%u.%u.%u.p%u", - ver.c[2], ver.c[1], ver.c[0], ver.c[3]); + snprintf(fw_ver, sizeof(fw_ver), "%u.%u.%u.p%u", ver.c[2], ver.c[1], + ver.c[0], ver.c[3]); snprintf(version, max_len, handle->driver_version, fw_ver); @@ -3219,8 +3186,7 @@ woal_get_version(moal_handle *handle, char *version, int max_len) * * @return 0 --success, otherwise fail */ -int -woal_get_driver_version(moal_private *priv, struct ifreq *req) +int woal_get_driver_version(moal_private *priv, struct ifreq *req) { struct iwreq *wrq = (struct iwreq *)req; int len; @@ -3251,8 +3217,7 @@ woal_get_driver_version(moal_private *priv, struct ifreq *req) * * @return 0 --success, otherwise fail */ -int -woal_get_driver_verext(moal_private *priv, struct ifreq *ireq) +int woal_get_driver_verext(moal_private *priv, struct ifreq *ireq) { struct iwreq *wrq = (struct iwreq *)ireq; mlan_ds_get_info *info = NULL; @@ -3277,14 +3242,16 @@ woal_get_driver_verext(moal_private *priv, struct ifreq *ireq) info->param.ver_ext.version_str_sel = *((int *)(wrq->u.name + SUBCMD_OFFSET)); } else { - if (copy_from_user - (&info->param.ver_ext.version_str_sel, wrq->u.data.pointer, - sizeof(info->param.ver_ext.version_str_sel))) { + if (copy_from_user( + &info->param.ver_ext.version_str_sel, + wrq->u.data.pointer, + sizeof(info->param.ver_ext.version_str_sel))) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; } else { - if (((t_s32)(info->param.ver_ext.version_str_sel)) < 0) { + if (((t_s32)(info->param.ver_ext.version_str_sel)) < + 0) { PRINTM(MERROR, "Invalid arguments!\n"); ret = -EINVAL; goto done; @@ -3299,9 +3266,9 @@ woal_get_driver_verext(moal_private *priv, struct ifreq *ireq) } if (wrq->u.data.pointer) { - if (copy_to_user - (wrq->u.data.pointer, info->param.ver_ext.version_str, - strlen(info->param.ver_ext.version_str))) { + if (copy_to_user(wrq->u.data.pointer, + info->param.ver_ext.version_str, + strlen(info->param.ver_ext.version_str))) { PRINTM(MERROR, "Copy to user failed\n"); ret = -EFAULT; goto done; @@ -3329,8 +3296,7 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_set_drvdbg(moal_private *priv, t_u32 drvdbg) +int woal_set_drvdbg(moal_private *priv, t_u32 drvdbg) { mlan_ioctl_req *req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -3370,9 +3336,8 @@ woal_set_drvdbg(moal_private *priv, t_u32 drvdbg) * * @return 0 --success, otherwise fail */ -int -woal_reg_rx_mgmt_ind(moal_private *priv, t_u16 action, - t_u32 *pmgmt_subtype_mask, t_u8 wait_option) +int woal_reg_rx_mgmt_ind(moal_private *priv, t_u16 action, + t_u32 *pmgmt_subtype_mask, t_u8 wait_option) { mlan_ioctl_req *req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -3421,8 +3386,8 @@ woal_reg_rx_mgmt_ind(moal_private *priv, t_u16 action, * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_set_get_tx_bf_cap(moal_private *priv, t_u16 action, t_u32 *tx_bf_cap) +mlan_status woal_set_get_tx_bf_cap(moal_private *priv, t_u16 action, + t_u32 *tx_bf_cap) { mlan_ioctl_req *req = NULL; mlan_ds_11n_cfg *bf_cfg = NULL; @@ -3474,9 +3439,8 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_set_get_tx_bf_cfg(moal_private *priv, t_u16 action, - mlan_ds_11n_tx_bf_cfg *tx_bf_cfg) +mlan_status woal_set_get_tx_bf_cfg(moal_private *priv, t_u16 action, + mlan_ds_11n_tx_bf_cfg *tx_bf_cfg) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ioctl_req *req = NULL; @@ -3532,8 +3496,7 @@ done: * * @return N/A */ -void -woal_process_ioctl_resp(moal_private *priv, mlan_ioctl_req *req) +void woal_process_ioctl_resp(moal_private *priv, mlan_ioctl_req *req) { int cfg80211_wext; @@ -3558,9 +3521,8 @@ woal_process_ioctl_resp(moal_private *priv, mlan_ioctl_req *req) #ifdef UAP_SUPPORT if (IS_UAP_WEXT(cfg80211_wext) && GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) - woal_ioctl_get_uap_info_resp(priv, - (mlan_ds_get_info *)req-> - pbuf); + woal_ioctl_get_uap_info_resp( + priv, (mlan_ds_get_info *)req->pbuf); #endif #endif break; @@ -3589,10 +3551,10 @@ woal_process_ioctl_resp(moal_private *priv, mlan_ioctl_req *req) * @param priv A pointer to moal_private structure * @param pm_info A pointer to mlan_ds_ps_info structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_get_pm_info(moal_private *priv, mlan_ds_ps_info *pm_info) +mlan_status woal_get_pm_info(moal_private *priv, mlan_ds_ps_info *pm_info) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_pm_cfg *pmcfg = NULL; @@ -3639,8 +3601,7 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_get_deep_sleep(moal_private *priv, t_u32 *data) +int woal_get_deep_sleep(moal_private *priv, t_u32 *data) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -3684,9 +3645,8 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_set_deep_sleep(moal_private *priv, t_u8 wait_option, BOOLEAN bdeep_sleep, - t_u16 idletime) +int woal_set_deep_sleep(moal_private *priv, t_u8 wait_option, + BOOLEAN bdeep_sleep, t_u16 idletime) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -3737,8 +3697,7 @@ done: * * @return N/A */ -void -woal_cancel_cac_block(moal_private *priv) +void woal_cancel_cac_block(moal_private *priv) { ENTER(); /* if during CAC period, wake up wait queue */ @@ -3758,9 +3717,8 @@ woal_cancel_cac_block(moal_private *priv) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) if (priv->uap_host_based && moal_extflg_isset(priv->phandle, EXT_DFS_OFFLOAD)) - woal_cfg80211_dfs_vendor_event(priv, - event_dfs_cac_aborted, - &priv->chan); + woal_cfg80211_dfs_vendor_event( + priv, event_dfs_cac_aborted, &priv->chan); #endif #endif #endif @@ -3778,8 +3736,7 @@ woal_cancel_cac_block(moal_private *priv) * * @return 0 --success, otherwise fail */ -int -woal_11h_channel_check_ioctl(moal_private *priv, t_u8 wait_option) +int woal_11h_channel_check_ioctl(moal_private *priv, t_u8 wait_option) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -3788,13 +3745,16 @@ woal_11h_channel_check_ioctl(moal_private *priv, t_u8 wait_option) ENTER(); +#ifdef UAP_SUPPORT if (priv->skip_cac) { LEAVE(); return ret; } +#endif /* Skip sending request/report query when DFS_REPEATER_MODE is on. This - * would get rid of CAC timers before starting BSSes in DFS_REPEATER_MODE + * would get rid of CAC timers before starting BSSes in + * DFS_REPEATER_MODE */ if (priv->phandle->dfs_repeater_mode) { LEAVE(); @@ -3802,8 +3762,6 @@ woal_11h_channel_check_ioctl(moal_private *priv, t_u8 wait_option) } if (woal_is_any_interface_active(priv->phandle)) { - LEAVE(); - return status; } req = woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_11h_cfg)); @@ -3828,6 +3786,7 @@ woal_11h_channel_check_ioctl(moal_private *priv, t_u8 wait_option) priv->phandle->meas_start_jiffies = jiffies; priv->phandle->cac_timer_jiffies = ds_11hcfg->param.chan_rpt_req.millisec_dwell_time * HZ / 1000; + #ifdef UAP_SUPPORT #if defined(STA_CFG80211) || defined(UAP_CFG80211) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) @@ -3853,8 +3812,7 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_11h_cancel_chan_report_ioctl(moal_private *priv, t_u8 wait_option) +int woal_11h_cancel_chan_report_ioctl(moal_private *priv, t_u8 wait_option) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -3897,9 +3855,8 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_set_remain_channel_ioctl(moal_private *priv, t_u8 wait_option, - mlan_ds_remain_chan *pchan) +mlan_status woal_set_remain_channel_ioctl(moal_private *priv, t_u8 wait_option, + mlan_ds_remain_chan *pchan) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ioctl_req *req = NULL; @@ -3946,8 +3903,8 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_wifi_direct_mode_cfg(moal_private *priv, t_u16 action, t_u16 *mode) +mlan_status woal_wifi_direct_mode_cfg(moal_private *priv, t_u16 action, + t_u16 *mode) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ioctl_req *req = NULL; @@ -3987,9 +3944,8 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_p2p_config(moal_private *priv, t_u32 action, - mlan_ds_wifi_direct_config *p2p_config) +mlan_status woal_p2p_config(moal_private *priv, t_u32 action, + mlan_ds_wifi_direct_config *p2p_config) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ioctl_req *req = NULL; @@ -4036,11 +3992,11 @@ done: * @param wait_option Wait option * @param channel A pointer to channel info * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_get_sta_channel(moal_private *priv, t_u8 wait_option, - chan_band_info * channel) +mlan_status woal_get_sta_channel(moal_private *priv, t_u8 wait_option, + chan_band_info *channel) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -4083,11 +4039,11 @@ done: * @param wait_option Wait option * @param signal A pointer tp mlan_ds_get_signal structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_get_signal_info(moal_private *priv, t_u8 wait_option, - mlan_ds_get_signal *signal) +mlan_status woal_get_signal_info(moal_private *priv, t_u8 wait_option, + mlan_ds_get_signal *signal) { int ret = 0; mlan_ds_get_info *info = NULL; @@ -4143,11 +4099,11 @@ done: * @param wait_option Wait option * @param scan_resp A pointer to mlan_scan_resp structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_get_scan_table(moal_private *priv, t_u8 wait_option, - mlan_scan_resp *scan_resp) +mlan_status woal_get_scan_table(moal_private *priv, t_u8 wait_option, + mlan_scan_resp *scan_resp) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -4203,9 +4159,8 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_request_scan(moal_private *priv, - t_u8 wait_option, mlan_802_11_ssid *req_ssid) +mlan_status woal_request_scan(moal_private *priv, t_u8 wait_option, + mlan_802_11_ssid *req_ssid) { mlan_status ret = MLAN_STATUS_SUCCESS; moal_handle *handle = priv->phandle; @@ -4239,8 +4194,8 @@ woal_request_scan(moal_private *priv, scan->sub_command = MLAN_OID_SCAN_SPECIFIC_SSID; moal_memcpy_ext(handle, scan->param.scan_req.scan_ssid.ssid, - req_ssid->ssid, - req_ssid->ssid_len, MLAN_MAX_SSID_LENGTH); + req_ssid->ssid, req_ssid->ssid_len, + MLAN_MAX_SSID_LENGTH); scan->param.scan_req.scan_ssid.ssid_len = MIN(MLAN_MAX_SSID_LENGTH, req_ssid->ssid_len); } else { @@ -4279,8 +4234,8 @@ done: * * @return MLAN_STATUS_SUCCESS--success, MLAN_STATUS_FAILURE--fail */ -mlan_status -woal_change_adhoc_chan(moal_private *priv, int channel, t_u8 wait_option) +mlan_status woal_change_adhoc_chan(moal_private *priv, int channel, + t_u8 wait_option) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_bss_info bss_info; @@ -4332,7 +4287,7 @@ woal_change_adhoc_chan(moal_private *priv, int channel, t_u8 wait_option) goto done; } - /* Do disonnect */ + /* Do disonnect*/ bss->sub_command = MLAN_OID_BSS_STOP; memset((t_u8 *)&bss->param.bssid, 0, ETH_ALEN); @@ -4371,11 +4326,11 @@ done: * @param wait_option Wait option * @param ssid_bssid A pointer to mlan_ssid_bssid structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_find_best_network(moal_private *priv, t_u8 wait_option, - mlan_ssid_bssid *ssid_bssid) +mlan_status woal_find_best_network(moal_private *priv, t_u8 wait_option, + mlan_ssid_bssid *ssid_bssid) { mlan_ioctl_req *req = NULL; mlan_ds_bss *bss = NULL; @@ -4430,10 +4385,10 @@ done: * @param priv A pointer to moal_private structure * @param bssid A pointer to bssid * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_find_bssid(moal_private *priv, mlan_802_11_mac_addr bssid) +mlan_status woal_find_bssid(moal_private *priv, mlan_802_11_mac_addr bssid) { mlan_ioctl_req *req = NULL; mlan_ds_bss *bss = NULL; @@ -4473,11 +4428,11 @@ done: * @param wait_option Wait option * @param ssid_bssid A pointer to mlan_ssid_bssid structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_11d_check_ap_channel(moal_private *priv, t_u8 wait_option, - mlan_ssid_bssid *ssid_bssid) +mlan_status woal_11d_check_ap_channel(moal_private *priv, t_u8 wait_option, + mlan_ssid_bssid *ssid_bssid) { mlan_ioctl_req *req = NULL; mlan_ds_bss *bss = NULL; @@ -4508,8 +4463,8 @@ woal_11d_check_ap_channel(moal_private *priv, t_u8 wait_option, sizeof(mlan_ssid_bssid), sizeof(mlan_ssid_bssid)); mac = (t_u8 *)&ssid_bssid->bssid; - PRINTM(MINFO, "ssid=%s, " MACSTR ", idx=%d\n", - ssid_bssid->ssid.ssid, MAC2STR(mac), (int)ssid_bssid->idx); + PRINTM(MINFO, "ssid=%s, " MACSTR ", idx=%d\n", ssid_bssid->ssid.ssid, + MAC2STR(mac), (int)ssid_bssid->idx); /* Send IOCTL request to MLAN */ ret = woal_request_ioctl(priv, req, wait_option); @@ -4528,10 +4483,11 @@ done: * @param wait_option Wait option * @param auth_mode A pointer to authentication mode * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_get_auth_mode(moal_private *priv, t_u8 wait_option, t_u32 *auth_mode) +mlan_status woal_get_auth_mode(moal_private *priv, t_u8 wait_option, + t_u32 *auth_mode) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -4570,10 +4526,11 @@ done: * @param wait_option Wait option * @param encrypt_mode A pointer to encrypt mode * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_get_encrypt_mode(moal_private *priv, t_u8 wait_option, t_u32 *encrypt_mode) +mlan_status woal_get_encrypt_mode(moal_private *priv, t_u8 wait_option, + t_u32 *encrypt_mode) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -4613,10 +4570,11 @@ done: * @param wait_option Wait option * @param enable A pointer to wpa enable status * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_get_wpa_enable(moal_private *priv, t_u8 wait_option, t_u32 *enable) +mlan_status woal_get_wpa_enable(moal_private *priv, t_u8 wait_option, + t_u32 *enable) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -4656,10 +4614,11 @@ done: * @param wait_option Wait option * @param auth_mode Authentication mode * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_set_auth_mode(moal_private *priv, t_u8 wait_option, t_u32 auth_mode) +mlan_status woal_set_auth_mode(moal_private *priv, t_u8 wait_option, + t_u32 auth_mode) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -4697,10 +4656,11 @@ done: * @param wait_option Wait option * @param encrypt_mode Encryption mode * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_set_encrypt_mode(moal_private *priv, t_u8 wait_option, t_u32 encrypt_mode) +mlan_status woal_set_encrypt_mode(moal_private *priv, t_u8 wait_option, + t_u32 encrypt_mode) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -4738,10 +4698,11 @@ done: * @param wait_option Wait option * @param enable MTRUE or MFALSE * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_set_wpa_enable(moal_private *priv, t_u8 wait_option, t_u32 enable) +mlan_status woal_set_wpa_enable(moal_private *priv, t_u8 wait_option, + t_u32 enable) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -4778,10 +4739,10 @@ done: * @param priv A pointer to moal_private structure * @param wait_option Wait option * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_enable_wep_key(moal_private *priv, t_u8 wait_option) +mlan_status woal_enable_wep_key(moal_private *priv, t_u8 wait_option) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -4823,9 +4784,8 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_request_userscan(moal_private *priv, - t_u8 wait_option, wlan_user_scan_cfg *scan_cfg) +mlan_status woal_request_userscan(moal_private *priv, t_u8 wait_option, + wlan_user_scan_cfg *scan_cfg) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ioctl_req *ioctl_req = NULL; @@ -4843,9 +4803,8 @@ woal_request_userscan(moal_private *priv, handle->scan_priv = priv; /* Allocate an IOCTL request buffer */ - ioctl_req = - woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_scan) + - sizeof(wlan_user_scan_cfg)); + ioctl_req = woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_scan) + + sizeof(wlan_user_scan_cfg)); if (ioctl_req == NULL) { ret = MLAN_STATUS_FAILURE; goto done; @@ -4888,8 +4847,7 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_get_scan_config(moal_private *priv, mlan_scan_cfg *scan_cfg) +mlan_status woal_get_scan_config(moal_private *priv, mlan_scan_cfg *scan_cfg) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_scan *scan = NULL; @@ -4929,9 +4887,9 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_set_scan_time(moal_private *priv, t_u16 active_scan_time, - t_u16 passive_scan_time, t_u16 specific_scan_time) +mlan_status woal_set_scan_time(moal_private *priv, t_u16 active_scan_time, + t_u16 passive_scan_time, + t_u16 specific_scan_time) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_scan *scan = NULL; @@ -4980,8 +4938,7 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_do_scan(moal_private *priv, wlan_user_scan_cfg *scan_cfg) +mlan_status woal_do_scan(moal_private *priv, wlan_user_scan_cfg *scan_cfg) { mlan_status ret = MLAN_STATUS_SUCCESS; moal_handle *handle = priv->phandle; @@ -5019,8 +4976,7 @@ woal_do_scan(moal_private *priv, wlan_user_scan_cfg *scan_cfg) * @param priv A pointer to moal_private structure * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_cancel_scan(moal_private *priv, t_u8 wait_option) +mlan_status woal_cancel_scan(moal_private *priv, t_u8 wait_option) { mlan_ioctl_req *req = NULL; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -5047,7 +5003,7 @@ woal_cancel_scan(moal_private *priv, t_u8 wait_option) spin_lock_irqsave(&handle->scan_req_lock, flags); if (IS_STA_CFG80211(handle->params.cfg80211_wext) && handle->scan_request) { - /** some supplicant can not handle SCAN abort event */ + /** some supplicant can not handle SCAN abort event */ if (scan_priv->bss_type == MLAN_BSS_TYPE_STA) woal_cfg80211_scan_done(handle->scan_request, MTRUE); else @@ -5056,7 +5012,8 @@ woal_cancel_scan(moal_private *priv, t_u8 wait_option) } spin_unlock_irqrestore(&handle->scan_req_lock, flags); #endif - /* add 10ms delay, incase firmware delay 0x7f event after scan cancel command response */ + /* add 10ms delay, incase firmware delay 0x7f event after scan cancel + * command response */ woal_sched_timeout(10); handle->scan_priv = NULL; done: @@ -5074,9 +5031,8 @@ done: * * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_FAILURE */ -int -woal_find_essid(moal_private *priv, mlan_ssid_bssid *ssid_bssid, - t_u8 wait_option) +int woal_find_essid(moal_private *priv, mlan_ssid_bssid *ssid_bssid, + t_u8 wait_option) { int ret = 0; mlan_scan_resp scan_resp; @@ -5090,7 +5046,7 @@ woal_find_essid(moal_private *priv, mlan_ssid_bssid *ssid_bssid, } #ifdef STA_CFG80211 if (priv->ft_pre_connect || priv->ft_ie_len) { - /** skip check the scan age out */ + /** skip check the scan age out */ ret = woal_find_best_network(priv, wait_option, ssid_bssid); LEAVE(); return ret; @@ -5098,7 +5054,7 @@ woal_find_essid(moal_private *priv, mlan_ssid_bssid *ssid_bssid, #endif woal_get_monotonic_time(&t); /** scan result timeout value */ -#define SCAN_RESULT_AGEOUT 10 +#define SCAN_RESULT_AGEOUT 10 if (t.tv_sec > (scan_resp.age_in_secs + SCAN_RESULT_AGEOUT)) { LEAVE(); return MLAN_STATUS_FAILURE; @@ -5117,9 +5073,8 @@ woal_find_essid(moal_private *priv, mlan_ssid_bssid *ssid_bssid, * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_request_bgscan(moal_private *priv, - t_u8 wait_option, wlan_bgscan_cfg *scan_cfg) +mlan_status woal_request_bgscan(moal_private *priv, t_u8 wait_option, + wlan_bgscan_cfg *scan_cfg) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ioctl_req *ioctl_req = NULL; @@ -5128,9 +5083,8 @@ woal_request_bgscan(moal_private *priv, ENTER(); /* Allocate an IOCTL request buffer */ - ioctl_req = - woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_scan) + - sizeof(wlan_bgscan_cfg)); + ioctl_req = woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_scan) + + sizeof(wlan_bgscan_cfg)); if (ioctl_req == NULL) { ret = MLAN_STATUS_FAILURE; goto done; @@ -5166,8 +5120,7 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_set_bg_scan(moal_private *priv, char *buf, int length) +mlan_status woal_set_bg_scan(moal_private *priv, char *buf, int length) { t_u8 *ptr = buf + strlen("BGSCAN-CONFIG") + 1; int buf_left = length - (strlen("BGSCAN-CONFIG") + 1); @@ -5241,7 +5194,7 @@ woal_set_bg_scan(moal_private *priv, char *buf, int length) break; } } - /** set bgscan when ssid_num > 0 */ + /** set bgscan when ssid_num > 0 */ if (num_ssid) { if (MLAN_STATUS_SUCCESS != woal_get_band(priv, &band)) { ret = MLAN_STATUS_FAILURE; @@ -5282,8 +5235,7 @@ done: * * @return N/A */ -void -woal_config_bgscan_and_rssi(moal_private *priv, t_u8 set_rssi) +void woal_config_bgscan_and_rssi(moal_private *priv, t_u8 set_rssi) { char rssi_low[11]; mlan_bss_info bss_info; @@ -5347,8 +5299,7 @@ woal_config_bgscan_and_rssi(moal_private *priv, t_u8 set_rssi) * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_stop_bg_scan(moal_private *priv, t_u8 wait_option) +mlan_status woal_stop_bg_scan(moal_private *priv, t_u8 wait_option) { wlan_bgscan_cfg scan_cfg; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -5370,8 +5321,7 @@ woal_stop_bg_scan(moal_private *priv, t_u8 wait_option) * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -void -woal_reconfig_bgscan(moal_handle *handle) +void woal_reconfig_bgscan(moal_handle *handle) { int i; for (i = 0; i < MIN(handle->priv_num, MLAN_MAX_BSS_NUM); i++) { @@ -5398,8 +5348,8 @@ woal_reconfig_bgscan(moal_handle *handle) * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_set_rssi_low_threshold(moal_private *priv, char *rssi, t_u8 wait_option) +mlan_status woal_set_rssi_low_threshold(moal_private *priv, char *rssi, + t_u8 wait_option) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ioctl_req *req = NULL; @@ -5455,8 +5405,8 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_set_rssi_threshold(moal_private *priv, t_u32 event_id, t_u8 wait_option) +mlan_status woal_set_rssi_threshold(moal_private *priv, t_u32 event_id, + t_u8 wait_option) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ioctl_req *req = NULL; @@ -5521,17 +5471,16 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_get_powermode(moal_private *priv, int *powermode) +mlan_status woal_get_powermode(moal_private *priv, int *powermode) { mlan_status ret = MLAN_STATUS_SUCCESS; int ps_mode; ENTER(); - if (MLAN_STATUS_SUCCESS != - woal_set_get_power_mgmt(priv, MLAN_ACT_GET, &ps_mode, 0, - MOAL_IOCTL_WAIT)) { + if (MLAN_STATUS_SUCCESS != woal_set_get_power_mgmt(priv, MLAN_ACT_GET, + &ps_mode, 0, + MOAL_IOCTL_WAIT)) { ret = MLAN_STATUS_FAILURE; goto done; } @@ -5554,8 +5503,7 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_set_scan_type(moal_private *priv, t_u32 scan_type) +mlan_status woal_set_scan_type(moal_private *priv, t_u32 scan_type) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_scan *scan = NULL; @@ -5600,8 +5548,7 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_enable_ext_scan(moal_private *priv, t_u8 enable) +mlan_status woal_enable_ext_scan(moal_private *priv, t_u8 enable) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_scan *scan = NULL; @@ -5646,8 +5593,7 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_set_powermode(moal_private *priv, char *powermode) +mlan_status woal_set_powermode(moal_private *priv, char *powermode) { mlan_status ret = MLAN_STATUS_SUCCESS; int disabled; @@ -5666,9 +5612,9 @@ woal_set_powermode(moal_private *priv, char *powermode) goto done; } - if (MLAN_STATUS_SUCCESS != - woal_set_get_power_mgmt(priv, MLAN_ACT_SET, &disabled, 0, - MOAL_IOCTL_WAIT)) + if (MLAN_STATUS_SUCCESS != woal_set_get_power_mgmt(priv, MLAN_ACT_SET, + &disabled, 0, + MOAL_IOCTL_WAIT)) ret = MLAN_STATUS_FAILURE; done: @@ -5685,8 +5631,7 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_set_combo_scan(moal_private *priv, char *buf, int length) +int woal_set_combo_scan(moal_private *priv, char *buf, int length) { int ret = 0; wlan_user_scan_cfg scan_cfg; @@ -5812,8 +5757,7 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_get_band(moal_private *priv, int *band) +mlan_status woal_get_band(moal_private *priv, int *band) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ioctl_req *req = NULL; @@ -5830,14 +5774,15 @@ woal_get_band(moal_private *priv, int *band) radio_cfg = (mlan_ds_radio_cfg *)req->pbuf; radio_cfg->sub_command = MLAN_OID_BAND_CFG; req->req_id = MLAN_IOCTL_RADIO_CFG; - /* Get config_bands, adhoc_start_band and adhoc_channel values from MLAN */ + /* Get config_bands, adhoc_start_band and adhoc_channel values from MLAN + */ req->action = MLAN_ACT_GET; ret = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); if (ret != MLAN_STATUS_SUCCESS) goto done; - if (radio_cfg->param.band_cfg. - config_bands & (BAND_B | BAND_G | BAND_GN)) + if (radio_cfg->param.band_cfg.config_bands & + (BAND_B | BAND_G | BAND_GN)) support_band |= WIFI_FREQUENCY_BAND_2GHZ; if (radio_cfg->param.band_cfg.config_bands & (BAND_A | BAND_AN)) support_band |= WIFI_FREQUENCY_BAND_5GHZ; @@ -5859,8 +5804,7 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_set_band(moal_private *priv, char *pband) +mlan_status woal_set_band(moal_private *priv, char *pband) { mlan_status ret = MLAN_STATUS_SUCCESS; int band = 0; @@ -5963,15 +5907,14 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_add_rxfilter(moal_private *priv, char *rxfilter) +mlan_status woal_add_rxfilter(moal_private *priv, char *rxfilter) { mlan_status ret = MLAN_STATUS_SUCCESS; ENTER(); /* Android command: - "DRIVER RXFILTER-ADD 0" - "DRIVER RXFILTER-ADD 1" - "DRIVER RXFILTER-ADD 3" */ + "DRIVER RXFILTER-ADD 0" + "DRIVER RXFILTER-ADD 1" + "DRIVER RXFILTER-ADD 3" */ if (*rxfilter == '0') { PRINTM(MIOCTL, "Add IPV4 multicast filter\n"); priv->rx_filter |= RX_FILTER_IPV4_MULTICAST; @@ -6002,8 +5945,7 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_remove_rxfilter(moal_private *priv, char *rxfilter) +mlan_status woal_remove_rxfilter(moal_private *priv, char *rxfilter) { mlan_status ret = MLAN_STATUS_SUCCESS; ENTER(); @@ -6038,8 +5980,7 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_priv_qos_cfg(moal_private *priv, t_u32 action, char *qos_cfg) +mlan_status woal_priv_qos_cfg(moal_private *priv, t_u32 action, char *qos_cfg) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_wmm_cfg *cfg = NULL; @@ -6089,8 +6030,7 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_set_sleeppd(moal_private *priv, char *psleeppd) +mlan_status woal_set_sleeppd(moal_private *priv, char *psleeppd) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_pm_cfg *pm_cfg = NULL; @@ -6113,9 +6053,7 @@ woal_set_sleeppd(moal_private *priv, char *psleeppd) pm_cfg->sub_command = MLAN_OID_PM_CFG_SLEEP_PD; req->req_id = MLAN_IOCTL_PM_CFG; if ((sleeppd <= MAX_SLEEP_PERIOD && sleeppd >= MIN_SLEEP_PERIOD) || - (sleeppd == 0) - || (sleeppd == SLEEP_PERIOD_RESERVED_FF) - ) { + (sleeppd == 0) || (sleeppd == SLEEP_PERIOD_RESERVED_FF)) { req->action = MLAN_ACT_SET; pm_cfg->param.sleep_period = sleeppd; } else { @@ -6141,8 +6079,7 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -int -woal_set_scan_cfg(moal_private *priv, char *buf, int length) +int woal_set_scan_cfg(moal_private *priv, char *buf, int length) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u8 *ptr = buf + NL80211_SCANCFG_HEADER_SIZE; @@ -6219,8 +6156,7 @@ woal_set_scan_cfg(moal_private *priv, char *buf, int length) * * @return 0 --success, otherwise fail */ -int -woal_set_radio(moal_private *priv, t_u8 option) +int woal_set_radio(moal_private *priv, t_u8 option) { int ret = 0; mlan_ds_radio_cfg *radio = NULL; @@ -6262,8 +6198,7 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_usb_aggr_init(moal_handle *handle) +mlan_status woal_usb_aggr_init(moal_handle *handle) { mlan_status ret = MLAN_STATUS_SUCCESS; moal_private *priv = NULL; @@ -6300,8 +6235,10 @@ woal_usb_aggr_init(moal_handle *handle) } else if (handle->params.usb_aggr == 1) { usb_aggr_enable = MTRUE; } else { - PRINTM(MWARN, "Invalid module param (usb_aggr) value %d, " - "using MLAN default\n", handle->params.usb_aggr); + PRINTM(MWARN, + "Invalid module param (usb_aggr) value %d, " + "using MLAN default\n", + handle->params.usb_aggr); handle->params.usb_aggr = 0; usb_aggr_enable = MFALSE; } @@ -6363,10 +6300,10 @@ woal_usb_aggr_init(moal_handle *handle) if (atomic_read(&cardp->rx_data_urb_pending)) { for (i = 0; i < MVUSB_RX_DATA_URB; i++) { if (cardp->rx_data_list[i].urb) { - usb_kill_urb(cardp->rx_data_list[i]. - urb); - usb_init_urb(cardp->rx_data_list[i]. - urb); + usb_kill_urb( + cardp->rx_data_list[i].urb); + usb_init_urb( + cardp->rx_data_list[i].urb); } } } @@ -6399,10 +6336,11 @@ done: * @param wait_option wait option * @param hotspotcfg Hotspot configuration value * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_set_hotspotcfg(moal_private *priv, t_u8 wait_option, t_u32 hotspotcfg) +mlan_status woal_set_hotspotcfg(moal_private *priv, t_u8 wait_option, + t_u32 hotspotcfg) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ioctl_req *req = NULL; @@ -6440,20 +6378,20 @@ done: * @param priv A pointer to moal_private structure * @param wait_option Wait option * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_delba_all(moal_private *priv, t_u8 wait_option) +mlan_status woal_delba_all(moal_private *priv, t_u8 wait_option) { mlan_ioctl_req *req = NULL; mlan_ds_11n_cfg *cfg_11n = NULL; mlan_ds_11n_delba *del_ba = NULL; - t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0 }; + t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = {0}; mlan_status status = MLAN_STATUS_SUCCESS; int ret = 0; - req = (mlan_ioctl_req *) - woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_11n_cfg)); + req = (mlan_ioctl_req *)woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_11n_cfg)); if (req == NULL) { ret = -ENOMEM; goto done; @@ -6490,10 +6428,10 @@ done: * @param wait_option Wait option * @param enable Enable/Disable 11d * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_set_11d(moal_private *priv, t_u8 wait_option, t_u8 enable) +mlan_status woal_set_11d(moal_private *priv, t_u8 wait_option, t_u8 enable) { mlan_ioctl_req *req = NULL; mlan_ds_snmp_mib *snmp = NULL; @@ -6530,8 +6468,7 @@ woal_set_11d(moal_private *priv, t_u8 wait_option, t_u8 enable) * * @return N/A */ -void -woal_ioctl_get_misc_conf(moal_private *priv, mlan_ds_misc_cfg *info) +void woal_ioctl_get_misc_conf(moal_private *priv, mlan_ds_misc_cfg *info) { ENTER(); switch (info->sub_command) { diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_main.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_main.c index b4d929efdf1c..7ff957ed2eb8 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_main.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_main.c @@ -1,56 +1,56 @@ /** @file moal_main.c - * - * @brief This file contains the major functions in WLAN - * driver. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains the major functions in WLAN + * driver. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /******************************************************** Change log: 10/21/2008: initial version ********************************************************/ -#include "moal_main.h" +#include "moal_main.h" #ifdef USB -#include "moal_usb.h" +#include "moal_usb.h" #endif #ifdef SDIO -#include "moal_sdio.h" +#include "moal_sdio.h" #endif #ifdef PCIE -#include "moal_pcie.h" +#include "moal_pcie.h" #endif #ifdef UAP_SUPPORT -#include "moal_uap.h" +#include "moal_uap.h" #endif #if defined(STA_CFG80211) || defined(UAP_CFG80211) -#include "moal_cfg80211.h" -#include "moal_cfg80211_util.h" +#include "moal_cfg80211.h" +#include "moal_cfg80211_util.h" #endif #ifdef STA_CFG80211 #ifdef STA_SUPPORT -#include "moal_sta_cfg80211.h" +#include "moal_sta_cfg80211.h" #endif #endif #ifdef UAP_CFG80211 #ifdef UAP_SUPPORT -#include "moal_uap_cfg80211.h" +#include "moal_uap_cfg80211.h" #endif #endif #include "moal_eth_ioctl.h" @@ -66,10 +66,10 @@ Change log: #endif /******************************************************** - Global Variables + Global Variables ********************************************************/ /** the pointer of new fwdump fname for each dump**/ -char *fwdump_fname = NULL; +char *fwdump_fname; /** Semaphore for add/remove card */ struct semaphore AddRemoveCardSem; /** @@ -107,8 +107,8 @@ static struct _card_info card_info_SD8887 = { .dump_fw_start_reg = 0xa3, .dump_fw_end_reg = 0xaa, .dump_fw_host_ready = 0xee, - .dump_reg.reg_table = {0x08, 0x58, 0x5C, 0x5D, 0x60, 0x61, 0x62, - 0x64, 0x65, 0x66, 0x68, 0x69, 0x6a}, + .dump_reg.reg_table = {0x08, 0x58, 0x5C, 0x5D, 0x60, 0x61, 0x62, 0x64, + 0x65, 0x66, 0x68, 0x69, 0x6a}, .dump_reg.reg_table_size = 13, .scratch_reg = 0x90, .func1_reg_start = 0x10, @@ -217,8 +217,8 @@ static struct _card_info card_info_SD8977 = { .dump_fw_start_reg = 0xf1, .dump_fw_end_reg = 0xf8, .dump_fw_host_ready = 0xcc, - .dump_reg.reg_table = {0x08, 0x58, 0x5C, 0x5D, 0x60, 0x61, 0x62, - 0x64, 0x65, 0x66, 0x68, 0x69, 0x6a}, + .dump_reg.reg_table = {0x08, 0x58, 0x5C, 0x5D, 0x60, 0x61, 0x62, 0x64, + 0x65, 0x66, 0x68, 0x69, 0x6a}, .dump_reg.reg_table_size = 13, .scratch_reg = 0xe8, .func1_reg_start = 0x10, @@ -255,8 +255,8 @@ static struct _card_info card_info_SD8978 = { .dump_fw_start_reg = 0xf1, .dump_fw_end_reg = 0xf8, .dump_fw_host_ready = 0xcc, - .dump_reg.reg_table = {0x08, 0x58, 0x5C, 0x5D, 0x60, 0x61, 0x62, - 0x64, 0x65, 0x66, 0x68, 0x69, 0x6a}, + .dump_reg.reg_table = {0x08, 0x58, 0x5C, 0x5D, 0x60, 0x61, 0x62, 0x64, + 0x65, 0x66, 0x68, 0x69, 0x6a}, .dump_reg.reg_table_size = 13, .scratch_reg = 0xe8, .func1_reg_start = 0x10, @@ -293,8 +293,8 @@ static struct _card_info card_info_SD8997 = { .dump_fw_start_reg = 0xf1, .dump_fw_end_reg = 0xf8, .dump_fw_host_ready = 0xcc, - .dump_reg.reg_table = {0x08, 0x58, 0x5C, 0x5D, 0x60, 0x61, 0x62, - 0x64, 0x65, 0x66, 0x68, 0x69, 0x6a}, + .dump_reg.reg_table = {0x08, 0x58, 0x5C, 0x5D, 0x60, 0x61, 0x62, 0x64, + 0x65, 0x66, 0x68, 0x69, 0x6a}, .dump_reg.reg_table_size = 13, .scratch_reg = 0xe8, .func1_reg_start = 0x10, @@ -332,8 +332,8 @@ static struct _card_info card_info_SD9098 = { .dump_fw_start_reg = 0xf1, .dump_fw_end_reg = 0xf8, .dump_fw_host_ready = 0xcc, - .dump_reg.reg_table = {0x08, 0x58, 0x5C, 0x5D, 0x60, 0x61, 0x62, - 0x64, 0x65, 0x66, 0x68, 0x69, 0x6a}, + .dump_reg.reg_table = {0x08, 0x58, 0x5C, 0x5D, 0x60, 0x61, 0x62, 0x64, + 0x65, 0x66, 0x68, 0x69, 0x6a}, .dump_reg.reg_table_size = 13, .scratch_reg = 0xe8, .func1_reg_start = 0x10, @@ -371,8 +371,8 @@ static struct _card_info card_info_SD9097 = { .dump_fw_start_reg = 0xf1, .dump_fw_end_reg = 0xf8, .dump_fw_host_ready = 0xcc, - .dump_reg.reg_table = {0x08, 0x58, 0x5C, 0x5D, 0x60, 0x61, 0x62, - 0x64, 0x65, 0x66, 0x68, 0x69, 0x6a}, + .dump_reg.reg_table = {0x08, 0x58, 0x5C, 0x5D, 0x60, 0x61, 0x62, 0x64, + 0x65, 0x66, 0x68, 0x69, 0x6a}, .dump_reg.reg_table_size = 13, .scratch_reg = 0xe8, .func1_reg_start = 0x10, @@ -546,8 +546,8 @@ static struct _card_info card_info_SD8987 = { .dump_fw_start_reg = 0xf1, .dump_fw_end_reg = 0xf8, .dump_fw_host_ready = 0xcc, - .dump_reg.reg_table = {0x08, 0x58, 0x5C, 0x5D, 0x60, 0x61, 0x62, - 0x64, 0x65, 0x66, 0x68, 0x69, 0x6a}, + .dump_reg.reg_table = {0x08, 0x58, 0x5C, 0x5D, 0x60, 0x61, 0x62, 0x64, + 0x65, 0x66, 0x68, 0x69, 0x6a}, .dump_reg.reg_table_size = 13, .scratch_reg = 0xe8, .func1_reg_start = 0x10, @@ -563,12 +563,13 @@ static struct _card_info card_info_SD8987 = { /** Driver version */ char driver_version[] = - INTF_CARDTYPE KERN_VERSION "--" MLAN_RELEASE_VERSION - "-GPL" "-(" "FP" FPNUM ")" -#ifdef DEBUG_LEVEL2 - "-dbg" + INTF_CARDTYPE KERN_VERSION "--" MLAN_RELEASE_VERSION "-GPL" + "-(" + "FP" FPNUM ")" +#ifdef DEBUG_LEVEL2 + "-dbg" #endif - " "; + " "; /** woal_callbacks */ static mlan_callbacks woal_callbacks = { @@ -673,8 +674,7 @@ static struct work_struct hang_work; * * @return N/A */ -static void -woal_hang_work_queue(struct work_struct *work) +static void woal_hang_work_queue(struct work_struct *work) { int i; ENTER(); @@ -703,8 +703,7 @@ woal_hang_work_queue(struct work_struct *work) * * @return N/A */ -void -woal_process_hang(moal_handle *handle) +void woal_process_hang(moal_handle *handle) { ENTER(); if (reset_handle == NULL) { @@ -733,8 +732,7 @@ woal_process_hang(moal_handle *handle) * * @return MTRUE/MFALSE; */ -t_u8 -woal_is_any_interface_active(moal_handle *handle) +t_u8 woal_is_any_interface_active(moal_handle *handle) { int i; for (i = 0; i < handle->priv_num; i++) { @@ -761,8 +759,7 @@ woal_is_any_interface_active(moal_handle *handle) * * @return MTRUE or MFALSE */ -BOOLEAN -woal_ssid_valid(mlan_802_11_ssid *pssid) +BOOLEAN woal_ssid_valid(mlan_802_11_ssid *pssid) { #ifdef ASCII_SSID_CHECK unsigned int ssid_idx; @@ -789,8 +786,7 @@ woal_ssid_valid(mlan_802_11_ssid *pssid) * @param context A pointer to context * @return N/A */ -void -woal_remain_timer_func(void *context) +void woal_remain_timer_func(void *context) { moal_handle *handle = (moal_handle *)context; moal_private *priv = handle->priv[handle->remain_bss_index]; @@ -801,16 +797,15 @@ woal_remain_timer_func(void *context) if (handle->cookie) { cfg80211_remain_on_channel_expired( #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 6, 0) - priv->netdev, + priv->netdev, #else - priv->wdev, + priv->wdev, #endif - handle->cookie, - &handle->chan, + handle->cookie, &handle->chan, #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - handle->channel_type, + handle->channel_type, #endif - GFP_ATOMIC); + GFP_ATOMIC); handle->cookie = 0; } handle->is_remain_timer_set = MFALSE; @@ -829,8 +824,7 @@ woal_remain_timer_func(void *context) * @param context A pointer to context * @return N/A */ -void -woal_go_timer_func(void *context) +void woal_go_timer_func(void *context) { moal_handle *handle = (moal_handle *)context; @@ -853,12 +847,11 @@ woal_go_timer_func(void *context) * * @return MTRUE/MFALSE; */ -int -woal_is_connected(moal_private *priv, mlan_ssid_bssid *ssid_bssid) +int woal_is_connected(moal_private *priv, mlan_ssid_bssid *ssid_bssid) { mlan_bss_info bss_info; int ret = MFALSE; - t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; + t_u8 zero_mac[] = {0, 0, 0, 0, 0, 0}; ENTER(); memset(&bss_info, 0, sizeof(bss_info)); if (MLAN_STATUS_SUCCESS != @@ -866,7 +859,8 @@ woal_is_connected(moal_private *priv, mlan_ssid_bssid *ssid_bssid) goto done; if (bss_info.media_connected) { if (memcmp(ssid_bssid->bssid, zero_mac, sizeof(zero_mac))) { - if (ssid_bssid->ssid.ssid_len) { /* compare ssid and bssid */ + if (ssid_bssid->ssid.ssid_len) { /* compare ssid and + bssid */ if ((ssid_bssid->ssid.ssid_len == bss_info.ssid.ssid_len) && !memcmp(ssid_bssid->ssid.ssid, @@ -875,20 +869,19 @@ woal_is_connected(moal_private *priv, mlan_ssid_bssid *ssid_bssid) !memcmp(ssid_bssid->bssid, bss_info.bssid, MLAN_MAC_ADDR_LENGTH)) ret = MTRUE; - } else { /* compare bssid */ - if (!memcmp - (ssid_bssid->bssid, bss_info.bssid, - MLAN_MAC_ADDR_LENGTH)) { - moal_memcpy_ext(priv->phandle, - &ssid_bssid->ssid, - &bss_info.ssid, - sizeof(bss_info.ssid), - sizeof(ssid_bssid-> - ssid)); + } else { /* compare bssid */ + if (!memcmp(ssid_bssid->bssid, bss_info.bssid, + MLAN_MAC_ADDR_LENGTH)) { + moal_memcpy_ext( + priv->phandle, + &ssid_bssid->ssid, + &bss_info.ssid, + sizeof(bss_info.ssid), + sizeof(ssid_bssid->ssid)); ret = MTRUE; } } - } else { /* compare ssid */ + } else { /* compare ssid */ if (ssid_bssid->ssid.ssid_len && (ssid_bssid->ssid.ssid_len == bss_info.ssid.ssid_len) && @@ -917,8 +910,7 @@ done: * * @return Pointer of the specific IE -- success, NULL -- fail */ -const t_u8 * -woal_parse_ie_tlv(const t_u8 *ie, int len, t_u8 id) +const t_u8 *woal_parse_ie_tlv(const t_u8 *ie, int len, t_u8 id) { int left_len = len; const t_u8 *pos = ie; @@ -947,10 +939,10 @@ woal_parse_ie_tlv(const t_u8 *ie, int len, t_u8 id) * @param len Total length of ie * @param ext_id Extended Element id to lookup * - * @return Pointer of the specific Extended IE -- success, NULL -- fail + * @return Pointer of the specific Extended IE -- success, NULL + * -- fail */ -const t_u8 * -woal_parse_ext_ie_tlv(const t_u8 *ie, int len, t_u8 ext_id) +const t_u8 *woal_parse_ext_ie_tlv(const t_u8 *ie, int len, t_u8 ext_id) { int left_len = len; const t_u8 *pos = ie; @@ -982,8 +974,7 @@ woal_parse_ext_ie_tlv(const t_u8 *ie, int len, t_u8 ext_id) * * @return Wireless mode */ -t_u32 -woal_get_mode(moal_private *priv, t_u8 wait_option) +t_u32 woal_get_mode(moal_private *priv, t_u8 wait_option) { int ret = 0; mlan_ds_bss *bss = NULL; @@ -1041,22 +1032,19 @@ done: * * @return N/A */ -void -woal_update_firmware_name(moal_handle *handle) +void woal_update_firmware_name(moal_handle *handle) { if (handle->params.fw_name) { handle->drv_mode.fw_name = handle->params.fw_name; } else { - if (!moal_extflg_isset(handle, EXT_FW_SERIAL) - || handle->fw_reload || handle->params.fw_reload) { + if (!moal_extflg_isset(handle, EXT_FW_SERIAL) || + handle->fw_reload || handle->params.fw_reload) { handle->drv_mode.fw_name = handle->card_info->fw_name_wlan; } else handle->drv_mode.fw_name = handle->card_info->fw_name; - } } - /** * @brief This function dynamically populates the driver mode table * @@ -1065,8 +1053,7 @@ woal_update_firmware_name(moal_handle *handle) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_update_drv_tbl(moal_handle *handle, int drv_mode_local) +mlan_status woal_update_drv_tbl(moal_handle *handle, int drv_mode_local) { mlan_status ret = MLAN_STATUS_SUCCESS; unsigned int intf_num = 0; @@ -1131,6 +1118,7 @@ woal_update_drv_tbl(moal_handle *handle, int drv_mode_local) intf_num += max_vir_bss; #endif } + #endif /* WIFI_DIRECT_SUPPORT */ /* Create BSS attribute table */ @@ -1203,7 +1191,7 @@ woal_update_drv_tbl(moal_handle *handle, int drv_mode_local) #ifdef WIFI_DIRECT_SUPPORT #if defined(STA_CFG80211) && defined(UAP_CFG80211) - /** append virtual interface at the end of table */ + /** append virtual interface at the end of table */ for (j = 0; j < max_vir_bss; j++) { if (i >= intf_num) break; @@ -1241,8 +1229,7 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_init_sw(moal_handle *handle) +mlan_status woal_init_sw(moal_handle *handle) { mlan_status ret = MLAN_STATUS_SUCCESS; unsigned int i; @@ -1267,7 +1254,7 @@ woal_init_sw(moal_handle *handle) #ifdef MFG_CMD_SUPPORT && !handle->params.mfg_mode #endif - ) { + ) { PRINTM(MERROR, "STA without WEXT or CFG80211 bit definition!\n"); LEAVE(); @@ -1295,7 +1282,7 @@ woal_init_sw(moal_handle *handle) return MLAN_STATUS_FAILURE; } - /** user config file */ + /** user config file */ init_waitqueue_head(&handle->init_user_conf_wait_q); /* PnP and power profile */ @@ -1334,8 +1321,8 @@ woal_init_sw(moal_handle *handle) #if defined(STA_CFG80211) || defined(UAP_CFG80211) #ifdef WIFI_DIRECT_SUPPORT handle->miracast_scan_time = DEF_MIRACAST_SCAN_TIME; -#define DEF_NOA_DURATION 0 -#define DEF_NOA_INTERVAL 100 +#define DEF_NOA_DURATION 0 +#define DEF_NOA_INTERVAL 100 handle->noa_duration = DEF_NOA_DURATION; handle->noa_interval = DEF_NOA_INTERVAL; #endif @@ -1372,8 +1359,8 @@ woal_init_sw(moal_handle *handle) handle->reassoc_on = 0; /* Initialize the timer for the reassociation */ - woal_initialize_timer(&handle->reassoc_timer, - woal_reassoc_timer_func, handle); + woal_initialize_timer(&handle->reassoc_timer, woal_reassoc_timer_func, + handle); handle->is_reassoc_timer_set = MFALSE; #endif /* REASSOCIATION */ @@ -1392,8 +1379,8 @@ woal_init_sw(moal_handle *handle) handle->remain_on_channel = MFALSE; /* Initialize the timer for remain on channel */ - woal_initialize_timer(&handle->remain_timer, - woal_remain_timer_func, handle); + woal_initialize_timer(&handle->remain_timer, woal_remain_timer_func, + handle); handle->is_remain_timer_set = MFALSE; #endif @@ -1437,12 +1424,10 @@ woal_init_sw(moal_handle *handle) device.gpio_pin = (t_u32)handle->params.gpiopin; #ifdef SDIO_MMC #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 36) - device.max_segs = - ((struct sdio_mmc_card *)handle->card)->func->card-> - host->max_segs; - device.max_seg_size = - ((struct sdio_mmc_card *)handle->card)->func->card-> - host->max_seg_size; + device.max_segs = ((struct sdio_mmc_card *)handle->card) + ->func->card->host->max_segs; + device.max_seg_size = ((struct sdio_mmc_card *)handle->card) + ->func->card->host->max_seg_size; #endif PRINTM(MMSG, "SDIO: max_segs=%d max_seg_size=%d\n", device.max_segs, device.max_seg_size); @@ -1482,11 +1467,15 @@ woal_init_sw(moal_handle *handle) device.multi_dtim = handle->params.multi_dtim; device.inact_tmo = handle->params.inact_tmo; +#ifdef UAP_SUPPORT device.uap_max_sta = handle->params.uap_max_sta; +#endif device.hs_wake_interval = handle->params.hs_wake_interval; device.indication_gpio = handle->params.indication_gpio; device.hs_mimo_switch = moal_extflg_isset(handle, EXT_HS_MIMO_SWITCH); + device.dfs53cfg = handle->params.dfs53cfg; + for (i = 0; i < handle->drv_mode.intf_num; i++) { device.bss_attr[i].bss_type = handle->drv_mode.bss_attr[i].bss_type; @@ -1520,8 +1509,7 @@ woal_init_sw(moal_handle *handle) * * @return N/A */ -void -woal_free_moal_handle(moal_handle *handle) +void woal_free_moal_handle(moal_handle *handle) { moal_handle *ref_handle = NULL; @@ -1605,16 +1593,15 @@ woal_free_moal_handle(moal_handle *handle) * @param line_pos Destination data * @return routnine status */ -static t_size -parse_cfg_get_line(t_u8 *data, t_size size, t_u8 *line_pos) +static t_size parse_cfg_get_line(t_u8 *data, t_size size, t_u8 *line_pos) { t_u8 *src, *dest; static t_s32 pos; ENTER(); - if (pos >= size) { /* reach the end */ - pos = 0; /* Reset position for rfkill */ + if (pos >= size) { /* reach the end */ + pos = 0; /* Reset position for rfkill */ LEAVE(); return -1; } @@ -1624,7 +1611,7 @@ parse_cfg_get_line(t_u8 *data, t_size size, t_u8 *line_pos) while ((dest - line_pos < MAX_LINE_LEN - 1) && pos < size && *src != '\x0A' && *src != '\0') { - if (*src != ' ' && *src != '\t') /* parse space */ + if (*src != ' ' && *src != '\t') /* parse space */ *dest++ = *src++; else src++; @@ -1644,9 +1631,8 @@ parse_cfg_get_line(t_u8 *data, t_size size, t_u8 *line_pos) * @param value_string String format Pointer to value * @return MLAN_STATUS_SUCCESS--success, otherwise--fail */ -static t_u32 -woal_process_regrdwr(moal_handle *handle, t_u8 *type_string, - t_u8 *offset_string, t_u8 *value_string) +static t_u32 woal_process_regrdwr(moal_handle *handle, t_u8 *type_string, + t_u8 *offset_string, t_u8 *value_string) { mlan_status ret = MLAN_STATUS_FAILURE; int type, offset, value; @@ -1711,9 +1697,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_getset_regrdwr(moal_private *priv, t_u32 action, t_u32 type, t_u32 offset, - t_u32 *value) +static int woal_getset_regrdwr(moal_private *priv, t_u32 action, t_u32 type, + t_u32 offset, t_u32 *value) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -1760,8 +1745,7 @@ done: * @param handle MOAL handle * @return MLAN_STATUS_SUCCESS--success, otherwise--fail */ -static t_u32 -woal_set_sdio_slew_rate(moal_handle *handle) +static t_u32 woal_set_sdio_slew_rate(moal_handle *handle) { t_u32 value = 0; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1784,9 +1768,8 @@ woal_set_sdio_slew_rate(moal_handle *handle) goto done; } new_value = value & ~(0x3 << handle->card_info->slew_rate_bit_offset); - new_value |= - (t_u32)handle->params.slew_rate << handle->card_info-> - slew_rate_bit_offset; + new_value |= (t_u32)handle->params.slew_rate + << handle->card_info->slew_rate_bit_offset; if (value != new_value) { PRINTM(MMSG, "Set REG 0x%8x: 0x%x slew_rate=%d\n", @@ -1813,8 +1796,7 @@ done: * @param handle MOAL handle * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_set_uap_operation_ctrl(moal_handle *handle) +static mlan_status woal_set_uap_operation_ctrl(moal_handle *handle) { mlan_status ret = MLAN_STATUS_SUCCESS; moal_private *priv = NULL; @@ -1857,7 +1839,6 @@ done: LEAVE(); return ret; - } #endif @@ -1869,13 +1850,12 @@ done: * @param size data length * @return MLAN_STATUS_SUCCESS--success, otherwise--fail */ -static t_u32 -woal_process_init_cfg(moal_handle *handle, t_u8 *data, t_size size) +static t_u32 woal_process_init_cfg(moal_handle *handle, t_u8 *data, t_size size) { mlan_status ret = MLAN_STATUS_FAILURE; t_u8 *pos; t_u8 *intf_s, *intf_e; - t_u8 s[MAX_LINE_LEN]; /* 1 line data */ + t_u8 s[MAX_LINE_LEN]; /* 1 line data */ t_size line_len; t_u8 index = 0; t_u32 i; @@ -1888,14 +1868,13 @@ woal_process_init_cfg(moal_handle *handle, t_u8 *data, t_size size) ENTER(); while ((line_len = parse_cfg_get_line(data, size, s)) != -1) { - pos = s; while (*pos == ' ' || *pos == '\t') pos++; if (*pos == '#' || (*pos == '\r' && *(pos + 1) == '\n') || *pos == '\n' || *pos == '\0') - continue; /* Needn't process this line */ + continue; /* Needn't process this line */ /* Process MAC addr */ if (strncmp(pos, "mac_addr", 8) == 0) { @@ -1918,58 +1897,58 @@ woal_process_init_cfg(moal_handle *handle, t_u8 *data, t_size size) intf_e - intf_s - 1); bss_mac_name[intf_e - intf_s - 1] = '\0'; for (i = 0; i < handle->priv_num; i++) { - if (strcmp - (bss_mac_name, - handle->priv[i]->netdev->name) == + if (strcmp(bss_mac_name, + handle->priv[i] + ->netdev->name) == 0) { - memset(handle->priv[i]-> - current_addr, 0, - ETH_ALEN); + memset(handle->priv[i] + ->current_addr, + 0, ETH_ALEN); PRINTM(MINFO, "Interface name: %s mac: %s\n", bss_mac_name, bss_mac_addr); - woal_mac2u8(handle->priv[i]-> - current_addr, - bss_mac_addr); + woal_mac2u8( + handle->priv[i] + ->current_addr, + bss_mac_addr); #ifdef WIFI_DIRECT_SUPPORT #if defined(STA_CFG80211) && defined(UAP_CFG80211) #if CFG80211_VERSION_CODE >= WIFI_DIRECT_KERNEL_VERSION if (handle->priv[i]->bss_type == MLAN_BSS_TYPE_WIFIDIRECT) { - handle->priv[i]-> - current_addr[0] - |= 0x02; + handle->priv[i] + ->current_addr[0] |= + 0x02; PRINTM(MCMND, - "Set WFD device addr: " - MACSTR "\n", - MAC2STR(handle-> - priv[i]-> - current_addr)); + "Set WFD device addr: " MACSTR + "\n", + MAC2STR(handle->priv[i] + ->current_addr)); } #endif #endif #endif /* Set WLAN MAC addresses */ if (MLAN_STATUS_SUCCESS != - woal_request_set_mac_address - (handle->priv[i], - MOAL_IOCTL_WAIT)) { + woal_request_set_mac_address( + handle->priv[i], + MOAL_IOCTL_WAIT)) { PRINTM(MERROR, "Set MAC address failed\n"); goto done; } - moal_memcpy_ext(handle, - handle-> - priv[i]-> - netdev-> - dev_addr, - handle-> - priv[i]-> - current_addr, - ETH_ALEN, - ETH_ALEN); - index++; /* Mark found one interface matching */ + moal_memcpy_ext( + handle, + handle->priv[i] + ->netdev + ->dev_addr, + handle->priv[i] + ->current_addr, + ETH_ALEN, ETH_ALEN); + index++; /* Mark found one + interface matching + */ } } } else { @@ -2049,9 +2028,8 @@ done: * @param wait_option wait option * @return MLAN_STATUS_SUCCESS--success, otherwise--fail */ -static t_u32 -woal_process_hostcmd_cfg(moal_handle *handle, t_u8 *data, t_size size, - t_u8 wait_option) +static t_u32 woal_process_hostcmd_cfg(moal_handle *handle, t_u8 *data, + t_size size, t_u8 wait_option) { mlan_status ret = MLAN_STATUS_SUCCESS; t_u8 *pos = data; @@ -2062,11 +2040,11 @@ woal_process_hostcmd_cfg(moal_handle *handle, t_u8 *data, t_size size, t_u8 start_raw = MFALSE; gfp_t flag; -#define CMD_STR "MRVL_CMDhostcmd" +#define CMD_STR "MRVL_CMDhostcmd" #define CMD_BUF_LEN 2048 ENTER(); - flag = (in_atomic() || irqs_disabled())? GFP_ATOMIC : GFP_KERNEL; + flag = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; buf = kzalloc(CMD_BUF_LEN, flag); if (!buf) { PRINTM(MERROR, "Could not allocate buffer space!\n"); @@ -2078,21 +2056,20 @@ woal_process_hostcmd_cfg(moal_handle *handle, t_u8 *data, t_size size, while ((pos - data) < size) { while (*pos == ' ' || *pos == '\t') pos++; - if (*pos == '#') { /* Line comment */ + if (*pos == '#') { /* Line comment */ while (*pos != '\n') pos++; pos++; } - if ((*pos == '\r' && *(pos + 1) == '\n') || - *pos == '\n' || *pos == '\0') { + if ((*pos == '\r' && *(pos + 1) == '\n') || *pos == '\n' || + *pos == '\0') { pos++; - continue; /* Needn't process this line */ + continue; /* Needn't process this line */ } if (*pos == '}') { - cmd_len = - *((t_u16 *)(buf + strlen(CMD_STR) + - sizeof(t_u32) + sizeof(t_u16))); + cmd_len = *((t_u16 *)(buf + strlen(CMD_STR) + + sizeof(t_u32) + sizeof(t_u16))); moal_memcpy_ext(handle, buf + strlen(CMD_STR), &cmd_len, sizeof(t_u32), CMD_BUF_LEN - strlen(CMD_STR)); @@ -2141,11 +2118,10 @@ done: LEAVE(); return ret; } - -#define INIT_CFG_DATA 0x00 -#define INIT_HOSTCMD_CFG_DATA 0x02 -#define COUNTRY_POWER_TABLE 0x04 -#define BAND_STEER_CFG_DATA 0x08 +#define INIT_CFG_DATA 0x00 +#define INIT_HOSTCMD_CFG_DATA 0x02 +#define COUNTRY_POWER_TABLE 0x04 +#define BAND_STEER_CFG_DATA 0x08 /** * @brief Request init conf firmware callback @@ -2156,9 +2132,8 @@ done: * * @return N/A */ -void -woal_request_init_user_conf_callback(const struct firmware *firmware, - void *context) +void woal_request_init_user_conf_callback(const struct firmware *firmware, + void *context) { moal_handle *handle; @@ -2190,9 +2165,8 @@ woal_request_init_user_conf_callback(const struct firmware *firmware, * * @return N/A */ -static void -woal_request_init_dpd_conf_callback(const struct firmware *firmware, - void *context) +static void woal_request_init_dpd_conf_callback(const struct firmware *firmware, + void *context) { moal_handle *handle; @@ -2224,8 +2198,8 @@ woal_request_init_dpd_conf_callback(const struct firmware *firmware, * * @return N/A */ -static void -woal_request_vdll_fw_callback(const struct firmware *firmware, void *context) +static void woal_request_vdll_fw_callback(const struct firmware *firmware, + void *context) { moal_handle *handle; @@ -2255,8 +2229,7 @@ woal_request_vdll_fw_callback(const struct firmware *firmware, void *context) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_vdll_req_fw(moal_handle *handle) +mlan_status woal_vdll_req_fw(moal_handle *handle) { int ret = MLAN_STATUS_SUCCESS; t_u8 req_fw_nowait = moal_extflg_isset(handle, EXT_REQ_FW_NOWAIT); @@ -2267,20 +2240,21 @@ woal_vdll_req_fw(moal_handle *handle) PRINTM(MMSG, "VDLL: Request firmware: %s\n", vdll_fw); if (req_fw_nowait) { #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) - if ((request_firmware_nowait - (THIS_MODULE, FW_ACTION_HOTPLUG, vdll_fw, - handle->hotplug_device, GFP_KERNEL, handle, - woal_request_vdll_fw_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, FW_ACTION_HOTPLUG, vdll_fw, + handle->hotplug_device, GFP_KERNEL, handle, + woal_request_vdll_fw_callback)) < 0) { #else #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13) - if ((request_firmware_nowait - (THIS_MODULE, FW_ACTION_HOTPLUG, vdll_fw, - handle->hotplug_device, handle, - woal_request_vdll_fw_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, FW_ACTION_HOTPLUG, vdll_fw, + handle->hotplug_device, handle, + woal_request_vdll_fw_callback)) < 0) { #else - if ((request_firmware_nowait - (THIS_MODULE, vdll_fw, handle->hotplug_device, - handle, woal_request_vdll_fw_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, vdll_fw, + handle->hotplug_device, handle, + woal_request_vdll_fw_callback)) < 0) { #endif #endif PRINTM(MERROR, @@ -2289,13 +2263,12 @@ woal_vdll_req_fw(moal_handle *handle) goto done; } handle->init_user_conf_wait_flag = MFALSE; - wait_event_interruptible(handle->init_user_conf_wait_q, - handle-> - init_user_conf_wait_flag); + wait_event_interruptible( + handle->init_user_conf_wait_q, + handle->init_user_conf_wait_flag); } else { - if ((request_firmware - (&handle->firmware, vdll_fw, - handle->hotplug_device)) < 0) { + if ((request_firmware(&handle->firmware, vdll_fw, + handle->hotplug_device)) < 0) { PRINTM(MERROR, "VDLL: request_firmware() failed\n"); ret = MLAN_STATUS_FAILURE; @@ -2351,9 +2324,8 @@ woal_request_init_txpwr_conf_callback(const struct firmware *firmware, * * @return N/A */ -static void -woal_request_init_cfg_data_callback(const struct firmware *firmware, - void *context) +static void woal_request_init_cfg_data_callback(const struct firmware *firmware, + void *context) { moal_handle *handle; @@ -2385,9 +2357,8 @@ woal_request_init_cfg_data_callback(const struct firmware *firmware, * @param country_txpwrlimit Configure Tx Power Limit * @return MLAN_STATUS_SUCCESS--success, otherwise--fail */ -static t_u32 -woal_set_user_init_data(moal_handle *handle, int type, t_u8 wait_option, - char *country_txpwrlimit) +static t_u32 woal_set_user_init_data(moal_handle *handle, int type, + t_u8 wait_option, char *country_txpwrlimit) { mlan_status ret = MLAN_STATUS_FAILURE; t_u8 *cfg_data = NULL; @@ -2402,21 +2373,21 @@ woal_set_user_init_data(moal_handle *handle, int type, t_u8 wait_option, if (type == INIT_CFG_DATA) { if (req_fw_nowait) { #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) - if ((request_firmware_nowait - (THIS_MODULE, FW_ACTION_HOTPLUG, init_cfg, - handle->hotplug_device, GFP_KERNEL, handle, - woal_request_init_cfg_data_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, FW_ACTION_HOTPLUG, init_cfg, + handle->hotplug_device, GFP_KERNEL, handle, + woal_request_init_cfg_data_callback)) < 0) { #else #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13) - if ((request_firmware_nowait - (THIS_MODULE, FW_ACTION_HOTPLUG, init_cfg, - handle->hotplug_device, handle, - woal_request_init_cfg_data_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, FW_ACTION_HOTPLUG, init_cfg, + handle->hotplug_device, handle, + woal_request_init_cfg_data_callback)) < 0) { #else - if ((request_firmware_nowait - (THIS_MODULE, init_cfg, handle->hotplug_device, - handle, - woal_request_init_cfg_data_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, init_cfg, + handle->hotplug_device, handle, + woal_request_init_cfg_data_callback)) < 0) { #endif #endif PRINTM(MERROR, @@ -2424,13 +2395,12 @@ woal_set_user_init_data(moal_handle *handle, int type, t_u8 wait_option, goto done; } handle->init_user_conf_wait_flag = MFALSE; - wait_event_interruptible(handle->init_user_conf_wait_q, - handle-> - init_user_conf_wait_flag); + wait_event_interruptible( + handle->init_user_conf_wait_q, + handle->init_user_conf_wait_flag); } else { - if ((request_firmware - (&handle->init_cfg_data, init_cfg, - handle->hotplug_device)) < 0) { + if ((request_firmware(&handle->init_cfg_data, init_cfg, + handle->hotplug_device)) < 0) { PRINTM(MERROR, "Init config file request_firmware() failed\n"); goto done; @@ -2443,26 +2413,30 @@ woal_set_user_init_data(moal_handle *handle, int type, t_u8 wait_option, ret = MLAN_STATUS_FAILURE; goto done; } - /* 'country_txpwrlimit' holds the value of Configured Tx Power Limit */ + /* 'country_txpwrlimit' holds the value of Configured Tx Power + * Limit */ if (req_fw_nowait) { #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) - if ((request_firmware_nowait - (THIS_MODULE, FW_ACTION_HOTPLUG, - country_txpwrlimit, handle->hotplug_device, - GFP_KERNEL, handle, - woal_request_init_user_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, FW_ACTION_HOTPLUG, + country_txpwrlimit, handle->hotplug_device, + GFP_KERNEL, handle, + woal_request_init_user_conf_callback)) < + 0) { #else #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13) - if ((request_firmware_nowait - (THIS_MODULE, FW_ACTION_HOTPLUG, - country_txpwrlimit, handle->hotplug_device, - handle, - woal_request_init_user_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, FW_ACTION_HOTPLUG, + country_txpwrlimit, handle->hotplug_device, + handle, + woal_request_init_user_conf_callback)) < + 0) { #else - if ((request_firmware_nowait - (THIS_MODULE, country_txpwrlimit, - handle->hotplug_device, handle, - woal_request_init_user_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, country_txpwrlimit, + handle->hotplug_device, handle, + woal_request_init_user_conf_callback)) < + 0) { #endif #endif PRINTM(MERROR, @@ -2470,14 +2444,13 @@ woal_set_user_init_data(moal_handle *handle, int type, t_u8 wait_option, goto done; } handle->init_user_conf_wait_flag = MFALSE; - wait_event_interruptible(handle->init_user_conf_wait_q, - handle-> - init_user_conf_wait_flag); + wait_event_interruptible( + handle->init_user_conf_wait_q, + handle->init_user_conf_wait_flag); } else { - int status = - request_firmware(&handle->user_data, - country_txpwrlimit, - handle->hotplug_device); + int status = request_firmware(&handle->user_data, + country_txpwrlimit, + handle->hotplug_device); /* File does not exist, skip download */ if (status == -ENOENT) { ret = MLAN_STATUS_FILE_ERR; @@ -2493,21 +2466,26 @@ woal_set_user_init_data(moal_handle *handle, int type, t_u8 wait_option, } else if (type == INIT_HOSTCMD_CFG_DATA) { if (req_fw_nowait) { #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) - if ((request_firmware_nowait - (THIS_MODULE, FW_ACTION_HOTPLUG, init_hostcmd_cfg, - handle->hotplug_device, GFP_KERNEL, handle, - woal_request_init_user_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, FW_ACTION_HOTPLUG, + init_hostcmd_cfg, handle->hotplug_device, + GFP_KERNEL, handle, + woal_request_init_user_conf_callback)) < + 0) { #else #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13) - if ((request_firmware_nowait - (THIS_MODULE, FW_ACTION_HOTPLUG, init_hostcmd_cfg, - handle->hotplug_device, handle, - woal_request_init_user_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, FW_ACTION_HOTPLUG, + init_hostcmd_cfg, handle->hotplug_device, + handle, + woal_request_init_user_conf_callback)) < + 0) { #else - if ((request_firmware_nowait - (THIS_MODULE, init_hostcmd_cfg, - handle->hotplug_device, handle, - woal_request_init_user_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, init_hostcmd_cfg, + handle->hotplug_device, handle, + woal_request_init_user_conf_callback)) < + 0) { #endif #endif PRINTM(MERROR, @@ -2515,13 +2493,13 @@ woal_set_user_init_data(moal_handle *handle, int type, t_u8 wait_option, goto done; } handle->init_user_conf_wait_flag = MFALSE; - wait_event_interruptible(handle->init_user_conf_wait_q, - handle-> - init_user_conf_wait_flag); + wait_event_interruptible( + handle->init_user_conf_wait_q, + handle->init_user_conf_wait_flag); } else { - if ((request_firmware - (&handle->user_data, init_hostcmd_cfg, - handle->hotplug_device)) < 0) { + if ((request_firmware(&handle->user_data, + init_hostcmd_cfg, + handle->hotplug_device)) < 0) { PRINTM(MERROR, "Init hostcmd config file request_firmware() failed\n"); goto done; @@ -2531,21 +2509,26 @@ woal_set_user_init_data(moal_handle *handle, int type, t_u8 wait_option, if (type == BAND_STEER_CFG_DATA) { if (req_fw_nowait) { #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) - if ((request_firmware_nowait - (THIS_MODULE, FW_ACTION_HOTPLUG, band_steer_cfg, - handle->hotplug_device, GFP_KERNEL, handle, - woal_request_init_user_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, FW_ACTION_HOTPLUG, + band_steer_cfg, handle->hotplug_device, + GFP_KERNEL, handle, + woal_request_init_user_conf_callback)) < + 0) { #else #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13) - if ((request_firmware_nowait - (THIS_MODULE, FW_ACTION_HOTPLUG, band_steer_cfg, - handle->hotplug_device, handle, - woal_request_init_user_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, FW_ACTION_HOTPLUG, + band_steer_cfg, handle->hotplug_device, + handle, + woal_request_init_user_conf_callback)) < + 0) { #else - if ((request_firmware_nowait - (THIS_MODULE, band_steer_cfg, - handle->hotplug_device, handle, - woal_request_init_user_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, band_steer_cfg, + handle->hotplug_device, handle, + woal_request_init_user_conf_callback)) < + 0) { #endif #endif PRINTM(MERROR, @@ -2553,13 +2536,13 @@ woal_set_user_init_data(moal_handle *handle, int type, t_u8 wait_option, goto done; } handle->init_user_conf_wait_flag = MFALSE; - wait_event_interruptible(handle->init_user_conf_wait_q, - handle-> - init_user_conf_wait_flag); + wait_event_interruptible( + handle->init_user_conf_wait_q, + handle->init_user_conf_wait_flag); } else { - if ((request_firmware - (&handle->user_data, band_steer_cfg, - handle->hotplug_device)) < 0) { + if ((request_firmware(&handle->user_data, + band_steer_cfg, + handle->hotplug_device)) < 0) { PRINTM(MERROR, "band_steer_cfg file request_firmware() failed\n"); goto done; @@ -2569,9 +2552,9 @@ woal_set_user_init_data(moal_handle *handle, int type, t_u8 wait_option, if (handle->user_data) { cfg_data = (t_u8 *)(handle->user_data)->data; len = (handle->user_data)->size; - if (type == INIT_HOSTCMD_CFG_DATA - || type == BAND_STEER_CFG_DATA - || type == COUNTRY_POWER_TABLE) { + if (type == INIT_HOSTCMD_CFG_DATA || + type == BAND_STEER_CFG_DATA || + type == COUNTRY_POWER_TABLE) { if (MLAN_STATUS_SUCCESS != woal_process_hostcmd_cfg(handle, cfg_data, len, wait_option)) { @@ -2604,8 +2587,7 @@ done: * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, * otherwise fail */ -mlan_status -woal_init_aggr_ctrl(moal_handle *handle, t_u8 wait_option) +mlan_status woal_init_aggr_ctrl(moal_handle *handle, t_u8 wait_option) { moal_private *priv = NULL; mlan_ioctl_req *req = NULL; @@ -2650,8 +2632,7 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_add_card_dpc(moal_handle *handle) +mlan_status woal_add_card_dpc(moal_handle *handle) { mlan_status ret = MLAN_STATUS_SUCCESS; int i; @@ -2675,9 +2656,8 @@ woal_add_card_dpc(moal_handle *handle) for (i = 0; i < handle->drv_mode.intf_num; i++) { if (handle->drv_mode.bss_attr[i].bss_virtual) continue; - if (!woal_add_interface - (handle, handle->priv_num, - handle->drv_mode.bss_attr[i].bss_type)) { + if (!woal_add_interface(handle, handle->priv_num, + handle->drv_mode.bss_attr[i].bss_type)) { ret = MLAN_STATUS_FAILURE; goto err; } @@ -2708,6 +2688,7 @@ woal_add_card_dpc(moal_handle *handle) goto err; } } + #ifdef USB if (handle->params.usb_aggr == 1) { /* Enable USB aggregation in FW */ @@ -2724,6 +2705,7 @@ woal_add_card_dpc(moal_handle *handle) /* Proceed with Warning */ PRINTM(MERROR, "Unable to set Low Power Mode\n"); } + #if defined(SDIO) if (IS_SD(handle->card_type)) woal_set_sdio_slew_rate(handle); @@ -2746,6 +2728,7 @@ woal_add_card_dpc(moal_handle *handle) goto err; } } + #ifdef UAP_SUPPORT if (handle->params.uap_oper_ctrl) woal_set_uap_operation_ctrl(handle); @@ -2780,8 +2763,8 @@ err: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_req_dpd_data(moal_handle *handle, mlan_init_param *param) +static mlan_status woal_req_dpd_data(moal_handle *handle, + mlan_init_param *param) { int ret = MLAN_STATUS_SUCCESS; t_u8 req_fw_nowait = moal_extflg_isset(handle, EXT_REQ_FW_NOWAIT); @@ -2792,21 +2775,23 @@ woal_req_dpd_data(moal_handle *handle, mlan_init_param *param) if (dpd_data_cfg && strncmp(dpd_data_cfg, "none", strlen("none"))) { if (req_fw_nowait) { #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) - if ((request_firmware_nowait - (THIS_MODULE, FW_ACTION_HOTPLUG, dpd_data_cfg, - handle->hotplug_device, GFP_KERNEL, handle, - woal_request_init_dpd_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, FW_ACTION_HOTPLUG, + dpd_data_cfg, handle->hotplug_device, + GFP_KERNEL, handle, + woal_request_init_dpd_conf_callback)) < 0) { #else #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13) - if ((request_firmware_nowait - (THIS_MODULE, FW_ACTION_HOTPLUG, dpd_data_cfg, - handle->hotplug_device, handle, - woal_request_init_dpd_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, FW_ACTION_HOTPLUG, + dpd_data_cfg, handle->hotplug_device, + handle, + woal_request_init_dpd_conf_callback)) < 0) { #else - if ((request_firmware_nowait - (THIS_MODULE, dpd_data_cfg, handle->hotplug_device, - handle, - woal_request_init_dpd_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, dpd_data_cfg, + handle->hotplug_device, handle, + woal_request_init_dpd_conf_callback)) < 0) { #endif #endif PRINTM(MERROR, @@ -2815,13 +2800,12 @@ woal_req_dpd_data(moal_handle *handle, mlan_init_param *param) goto done; } handle->init_user_conf_wait_flag = MFALSE; - wait_event_interruptible(handle->init_user_conf_wait_q, - handle-> - init_user_conf_wait_flag); + wait_event_interruptible( + handle->init_user_conf_wait_q, + handle->init_user_conf_wait_flag); } else { - if ((request_firmware - (&handle->dpd_data, dpd_data_cfg, - handle->hotplug_device)) < 0) { + if ((request_firmware(&handle->dpd_data, dpd_data_cfg, + handle->hotplug_device)) < 0) { PRINTM(MERROR, "DPD data request_firmware() failed\n"); ret = MLAN_STATUS_FAILURE; @@ -2846,8 +2830,8 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_req_txpwr_data(moal_handle *handle, mlan_init_param *param) +static mlan_status woal_req_txpwr_data(moal_handle *handle, + mlan_init_param *param) { int ret = MLAN_STATUS_SUCCESS; t_u8 req_fw_nowait = moal_extflg_isset(handle, EXT_REQ_FW_NOWAIT); @@ -2858,39 +2842,44 @@ woal_req_txpwr_data(moal_handle *handle, mlan_init_param *param) if (txpwrlimit_cfg && strncmp(txpwrlimit_cfg, "none", strlen("none"))) { if (req_fw_nowait) { #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) - if ((request_firmware_nowait - (THIS_MODULE, FW_ACTION_HOTPLUG, txpwrlimit_cfg, - handle->hotplug_device, GFP_KERNEL, handle, - woal_request_init_txpwr_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, FW_ACTION_HOTPLUG, + txpwrlimit_cfg, handle->hotplug_device, + GFP_KERNEL, handle, + woal_request_init_txpwr_conf_callback)) < + 0) { #else #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13) - if ((request_firmware_nowait - (THIS_MODULE, FW_ACTION_HOTPLUG, txpwrlimit_cfg, - handle->hotplug_device, handle, - woal_request_init_txpwr_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, FW_ACTION_HOTPLUG, + txpwrlimit_cfg, handle->hotplug_device, + handle, + woal_request_init_txpwr_conf_callback)) < + 0) { #else - if ((request_firmware_nowait - (THIS_MODULE, txpwrlimit_cfg, - handle->hotplug_device, handle, - woal_request_init_txpwr_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, txpwrlimit_cfg, + handle->hotplug_device, handle, + woal_request_init_txpwr_conf_callback)) < + 0) { #endif #endif - PRINTM(MERROR, "Region txpwrlimit cfg data " + PRINTM(MERROR, + "Region txpwrlimit cfg data " "request_firmware_nowait() failed\n"); ret = MLAN_STATUS_FAILURE; goto done; } handle->init_user_conf_wait_flag = MFALSE; - wait_event_interruptible(handle->init_user_conf_wait_q, - handle-> - init_user_conf_wait_flag); + wait_event_interruptible( + handle->init_user_conf_wait_q, + handle->init_user_conf_wait_flag); } else { - if ((request_firmware - (&handle->txpwr_data, txpwrlimit_cfg, - handle->hotplug_device)) < 0) { - PRINTM(MERROR, - "Region txpwrlimit cfg data " - "request_firmware() failed\n"); + if ((request_firmware(&handle->txpwr_data, + txpwrlimit_cfg, + handle->hotplug_device)) < 0) { + PRINTM(MERROR, "Region txpwrlimit cfg data " + "request_firmware() failed\n"); ret = MLAN_STATUS_FAILURE; goto done; } @@ -2914,33 +2903,38 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_req_cal_data(moal_handle *handle, mlan_init_param *param) +static mlan_status woal_req_cal_data(moal_handle *handle, + mlan_init_param *param) { int ret = MLAN_STATUS_SUCCESS; t_u8 req_fw_nowait = moal_extflg_isset(handle, EXT_REQ_FW_NOWAIT); char *cal_data_cfg = handle->params.cal_data_cfg; ENTER(); - /** Cal data request */ + /** Cal data request */ if (cal_data_cfg && strncmp(cal_data_cfg, "none", strlen("none"))) { if (req_fw_nowait) { #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 32) - if ((request_firmware_nowait - (THIS_MODULE, FW_ACTION_HOTPLUG, cal_data_cfg, - handle->hotplug_device, GFP_KERNEL, handle, - woal_request_init_user_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, FW_ACTION_HOTPLUG, + cal_data_cfg, handle->hotplug_device, + GFP_KERNEL, handle, + woal_request_init_user_conf_callback)) < + 0) { #else #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13) - if ((request_firmware_nowait - (THIS_MODULE, FW_ACTION_HOTPLUG, cal_data_cfg, - handle->hotplug_device, handle, - woal_request_init_user_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, FW_ACTION_HOTPLUG, + cal_data_cfg, handle->hotplug_device, + handle, + woal_request_init_user_conf_callback)) < + 0) { #else - if ((request_firmware_nowait - (THIS_MODULE, cal_data_cfg, handle->hotplug_device, - handle, - woal_request_init_user_conf_callback)) < 0) { + if ((request_firmware_nowait( + THIS_MODULE, cal_data_cfg, + handle->hotplug_device, handle, + woal_request_init_user_conf_callback)) < + 0) { #endif #endif PRINTM(MERROR, @@ -2949,13 +2943,12 @@ woal_req_cal_data(moal_handle *handle, mlan_init_param *param) goto done; } handle->init_user_conf_wait_flag = MFALSE; - wait_event_interruptible(handle->init_user_conf_wait_q, - handle-> - init_user_conf_wait_flag); + wait_event_interruptible( + handle->init_user_conf_wait_q, + handle->init_user_conf_wait_flag); } else { - if ((request_firmware - (&handle->user_data, cal_data_cfg, - handle->hotplug_device)) < 0) { + if ((request_firmware(&handle->user_data, cal_data_cfg, + handle->hotplug_device)) < 0) { PRINTM(MERROR, "Cal data request_firmware() failed\n"); ret = MLAN_STATUS_FAILURE; @@ -2984,8 +2977,7 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_reset_usb_dev(moal_handle *handle) +static mlan_status woal_reset_usb_dev(moal_handle *handle) { int ret = MLAN_STATUS_SUCCESS; struct usb_device *udev = ((struct usb_card_rec *)(handle->card))->udev; @@ -2998,11 +2990,17 @@ woal_reset_usb_dev(moal_handle *handle) /* Reset USB device to get re-enumeration */ if (udev) { -#define USB_WAIT_FW_READY (500) +#define USB_WAIT_FW_READY (500) mdelay(USB_WAIT_FW_READY); usbRstDev_ret = usb_reset_device(udev); - if ((usbRstDev_ret == 0) || (usbRstDev_ret == -ENODEV) || /* expected since chip re-enumerates */ - (usbRstDev_ret == -EINVAL)) { /* expected if USB FW detaches first */ + if ((usbRstDev_ret == 0) || + (usbRstDev_ret == -ENODEV) || /* expected + since + chip + re-enumerates + */ + (usbRstDev_ret == -EINVAL)) { /* expected if USB FW detaches + first */ PRINTM(MMSG, "usb_reset_device() successful.\n"); } else { PRINTM(MERROR, @@ -3027,8 +3025,7 @@ woal_reset_usb_dev(moal_handle *handle) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_init_fw_dpc(moal_handle *handle) +static mlan_status woal_init_fw_dpc(moal_handle *handle) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_fw_image fw; @@ -3073,16 +3070,19 @@ woal_init_fw_dpc(moal_handle *handle) moal_get_boot_ktime(handle, &handle->on_time); PRINTM(MMSG, "on_time is %llu\n", handle->on_time); - /** data request */ + /** data request */ memset(¶m, 0, sizeof(mlan_init_param)); - if ((ret = woal_req_dpd_data(handle, ¶m)) != MLAN_STATUS_SUCCESS) + ret = woal_req_dpd_data(handle, ¶m); + if (ret != MLAN_STATUS_SUCCESS) goto done; - if ((ret = woal_req_txpwr_data(handle, ¶m)) != MLAN_STATUS_SUCCESS) + ret = woal_req_txpwr_data(handle, ¶m); + if (ret != MLAN_STATUS_SUCCESS) goto done; - if ((ret = woal_req_cal_data(handle, ¶m)) != MLAN_STATUS_SUCCESS) + ret = woal_req_cal_data(handle, ¶m); + if (ret != MLAN_STATUS_SUCCESS) goto done; handle->hardware_status = HardwareStatusFwReady; @@ -3093,10 +3093,10 @@ woal_init_fw_dpc(moal_handle *handle) if (ret == MLAN_STATUS_SUCCESS) ret = woal_usb_tx_init(handle); } + if (ret != MLAN_STATUS_SUCCESS) + goto done; } #endif /* USB */ - if (ret != MLAN_STATUS_SUCCESS) - goto done; if (handle->fw_reload) goto done; handle->init_wait_q_woken = MFALSE; @@ -3111,8 +3111,8 @@ woal_init_fw_dpc(moal_handle *handle) goto done; } /* Wait for mlan_init to complete */ - wait_event_timeout(handle->init_wait_q, - handle->init_wait_q_woken, 5 * HZ); + wait_event_timeout(handle->init_wait_q, handle->init_wait_q_woken, + 5 * HZ); if (handle->hardware_status != HardwareStatusReady) { woal_moal_debug_info(woal_get_priv(handle, MLAN_BSS_ROLE_ANY), handle, MTRUE); @@ -3146,8 +3146,8 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_request_fw_dpc(moal_handle *handle, const struct firmware *firmware) +static mlan_status woal_request_fw_dpc(moal_handle *handle, + const struct firmware *firmware) { mlan_status ret = MLAN_STATUS_SUCCESS; struct timeval tstamp; @@ -3196,8 +3196,8 @@ done: * * @return N/A */ -static void -woal_request_fw_callback(const struct firmware *firmware, void *context) +static void woal_request_fw_callback(const struct firmware *firmware, + void *context) { moal_handle *handle; @@ -3221,8 +3221,7 @@ woal_request_fw_callback(const struct firmware *firmware, void *context) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_request_fw(moal_handle *handle) +mlan_status woal_request_fw(moal_handle *handle) { int err; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -3288,8 +3287,7 @@ woal_request_fw(moal_handle *handle) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_init_fw(moal_handle *handle) +mlan_status woal_init_fw(moal_handle *handle) { mlan_status ret = MLAN_STATUS_SUCCESS; @@ -3301,9 +3299,10 @@ woal_init_fw(moal_handle *handle) #if defined(USB) || (handle->boot_state == USB_FW_READY) #endif /* USB_NEW_FW_DNLD */ - ) { + ) { PRINTM(MMSG, "WLAN FW is active\n"); - /* Set it to NULL to skip downloading firmware to card */ + /* Set it to NULL to skip downloading firmware to card + */ handle->firmware = NULL; ret = woal_init_fw_dpc(handle); if (ret) @@ -3313,7 +3312,7 @@ woal_init_fw(moal_handle *handle) goto done; /* Release semaphore if download is not required */ MOAL_REL_SEMAPHORE(&AddRemoveCardSem); -done: + done: LEAVE(); return ret; } @@ -3338,9 +3337,8 @@ done: * * @return N/A */ -void -woal_fill_mlan_buffer(moal_private *priv, - mlan_buffer *pmbuf, struct sk_buff *skb) +void woal_fill_mlan_buffer(moal_private *priv, mlan_buffer *pmbuf, + struct sk_buff *skb) { struct timeval tstamp; struct ethhdr *eth; @@ -3388,16 +3386,16 @@ woal_fill_mlan_buffer(moal_private *priv, for (i = 0; i < priv->tx_protocols.protocol_num; i++) { if (eth->h_proto == - __constant_htons(priv->tx_protocols. - protocols[i])) + __constant_htons( + priv->tx_protocols + .protocols[i])) tx_ctrl_flag = MTRUE; } } if (tx_ctrl_flag) { - txcontrol = - (dot11_txcontrol *) (skb->data + - sizeof(struct - ethhdr)); + txcontrol = (dot11_txcontrol + *)(skb->data + + sizeof(struct ethhdr)); pmbuf->u.tx_info.data_rate = txcontrol->datarate; pmbuf->u.tx_info.channel = txcontrol->channel; @@ -3453,7 +3451,9 @@ woal_fill_mlan_buffer(moal_private *priv, } #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) -static struct device_type wlan_type = {.name = "wlan", }; +static struct device_type wlan_type = { + .name = "wlan", +}; #endif #ifdef STA_SUPPORT @@ -3486,8 +3486,7 @@ const struct net_device_ops woal_netdev_ops = { * * @return MLAN_STATUS_SUCCESS */ -mlan_status -woal_init_sta_dev(struct net_device *dev, moal_private *priv) +mlan_status woal_init_sta_dev(struct net_device *dev, moal_private *priv) { ENTER(); @@ -3506,11 +3505,11 @@ woal_init_sta_dev(struct net_device *dev, moal_private *priv) #endif dev->watchdog_timeo = MRVDRV_DEFAULT_WATCHDOG_TIMEOUT; #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) - dev->needed_headroom += MLAN_MIN_DATA_HEADER_LEN + sizeof(mlan_buffer) - + priv->extra_tx_head_len; + dev->needed_headroom += MLAN_MIN_DATA_HEADER_LEN + sizeof(mlan_buffer) + + priv->extra_tx_head_len; #else - dev->hard_header_len += MLAN_MIN_DATA_HEADER_LEN + sizeof(mlan_buffer) - + priv->extra_tx_head_len; + dev->hard_header_len += MLAN_MIN_DATA_HEADER_LEN + sizeof(mlan_buffer) + + priv->extra_tx_head_len; #endif #ifdef STA_WEXT if (IS_STA_WEXT(priv->phandle->params.cfg80211_wext)) { @@ -3562,8 +3561,7 @@ const struct net_device_ops woal_uap_netdev_ops = { * * @return MLAN_STATUS_SUCCESS */ -mlan_status -woal_init_uap_dev(struct net_device *dev, moal_private *priv) +mlan_status woal_init_uap_dev(struct net_device *dev, moal_private *priv) { mlan_status status = MLAN_STATUS_SUCCESS; @@ -3584,11 +3582,11 @@ woal_init_uap_dev(struct net_device *dev, moal_private *priv) #endif dev->watchdog_timeo = MRVDRV_DEFAULT_UAP_WATCHDOG_TIMEOUT; #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) - dev->needed_headroom += MLAN_MIN_DATA_HEADER_LEN + sizeof(mlan_buffer) - + priv->extra_tx_head_len; + dev->needed_headroom += MLAN_MIN_DATA_HEADER_LEN + sizeof(mlan_buffer) + + priv->extra_tx_head_len; #else - dev->hard_header_len += MLAN_MIN_DATA_HEADER_LEN + sizeof(mlan_buffer) - + priv->extra_tx_head_len; + dev->hard_header_len += MLAN_MIN_DATA_HEADER_LEN + sizeof(mlan_buffer) + + priv->extra_tx_head_len; #endif #ifdef UAP_WEXT if (IS_UAP_WEXT(priv->phandle->params.cfg80211_wext)) { @@ -3616,8 +3614,8 @@ woal_init_uap_dev(struct net_device *dev, moal_private *priv) * * @return A pointer to the new priv structure */ -moal_private * -woal_add_interface(moal_handle *handle, t_u8 bss_index, t_u8 bss_type) +moal_private *woal_add_interface(moal_handle *handle, t_u8 bss_index, + t_u8 bss_type) { struct net_device *dev = NULL; moal_private *priv = NULL; @@ -3631,7 +3629,7 @@ woal_add_interface(moal_handle *handle, t_u8 bss_index, t_u8 bss_type) ENTER(); #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 29) -#define MAX_WMM_QUEUE 4 +#define MAX_WMM_QUEUE 4 /* Allocate an Ethernet device */ dev = alloc_etherdev_mq(sizeof(moal_private), MAX_WMM_QUEUE); #else @@ -3651,7 +3649,8 @@ woal_add_interface(moal_handle *handle, t_u8 bss_index, t_u8 bss_type) else snprintf(name, sizeof(name), "%s", default_mlan_name); - if ((bss_type == MLAN_BSS_TYPE_STA) && (dev_alloc_name(dev, name) < 0)) { + if ((bss_type == MLAN_BSS_TYPE_STA) && + (dev_alloc_name(dev, name) < 0)) { PRINTM(MERROR, "Could not allocate mlan device name\n"); goto error; } @@ -3664,7 +3663,8 @@ woal_add_interface(moal_handle *handle, t_u8 bss_index, t_u8 bss_type) snprintf(name, sizeof(name), "m%s", default_uap_name); else snprintf(name, sizeof(name), "%s", default_uap_name); - if ((bss_type == MLAN_BSS_TYPE_UAP) && (dev_alloc_name(dev, name) < 0)) { + if ((bss_type == MLAN_BSS_TYPE_UAP) && + (dev_alloc_name(dev, name) < 0)) { PRINTM(MERROR, "Could not allocate uap device name\n"); goto error; } @@ -3733,7 +3733,7 @@ woal_add_interface(moal_handle *handle, t_u8 bss_index, t_u8 bss_type) #ifdef WIFI_DIRECT_SUPPORT || bss_type == MLAN_BSS_TYPE_WIFIDIRECT #endif - ) + ) woal_init_sta_dev(dev, priv); #endif #ifdef UAP_SUPPORT @@ -3746,7 +3746,7 @@ woal_add_interface(moal_handle *handle, t_u8 bss_index, t_u8 bss_type) #ifdef MFG_CMD_SUPPORT && (handle->params.mfg_mode != MLAN_INIT_PARA_ENABLED) #endif - ) { + ) { if (handle->params.init_cfg) { if (MLAN_STATUS_SUCCESS != woal_set_user_init_data(handle, INIT_CFG_DATA, @@ -3805,7 +3805,7 @@ woal_add_interface(moal_handle *handle, t_u8 bss_index, t_u8 bss_type) || bss_type == MLAN_BSS_TYPE_WIFIDIRECT #endif #endif - ) + ) /* Register cfg80211 for STA or Wifi direct */ if (woal_register_sta_cfg80211(dev, bss_type)) { PRINTM(MERROR, @@ -3818,8 +3818,7 @@ woal_add_interface(moal_handle *handle, t_u8 bss_index, t_u8 bss_type) #ifdef UAP_CFG80211 #ifdef UAP_SUPPORT if ((priv->bss_role == MLAN_BSS_ROLE_UAP) && - IS_UAP_CFG80211(handle->params.cfg80211_wext) - ) { + IS_UAP_CFG80211(handle->params.cfg80211_wext)) { /* Register cfg80211 for UAP */ if (woal_register_uap_cfg80211(dev, bss_type)) { PRINTM(MERROR, "Cannot register UAP with cfg80211\n"); @@ -3829,9 +3828,8 @@ woal_add_interface(moal_handle *handle, t_u8 bss_index, t_u8 bss_type) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) strcpy(csa_str, "CSA"); strcat(csa_str, name); - priv->csa_workqueue = - alloc_workqueue(csa_str, - WQ_HIGHPRI | WQ_MEM_RECLAIM | WQ_UNBOUND, 1); + priv->csa_workqueue = alloc_workqueue( + csa_str, WQ_HIGHPRI | WQ_MEM_RECLAIM | WQ_UNBOUND, 1); if (!priv->csa_workqueue) { PRINTM(MERROR, "cannot alloc csa workqueue \n"); goto error; @@ -3874,20 +3872,19 @@ woal_add_interface(moal_handle *handle, t_u8 bss_index, t_u8 bss_type) #ifdef SD8987 || IS_SD8987(handle->card_type) #endif - ) { - if ((fw_info.antinfo & ANT_DIVERSITY_2G)&&(fw_info. - antinfo & - ANT_DIVERSITY_5G)) + ) { + if ((fw_info.antinfo & ANT_DIVERSITY_2G) && + (fw_info.antinfo & ANT_DIVERSITY_5G)) handle->card_info->histogram_table_num = 4; } #endif for (i = 0; i < handle->card_info->histogram_table_num; i++) { - priv->hist_data[i] = kmalloc(sizeof(hgm_data) + - handle->card_info-> - rx_rate_max * - sizeof(atomic_t), - GFP_KERNEL); + priv->hist_data[i] = + kmalloc(sizeof(hgm_data) + + handle->card_info->rx_rate_max * + sizeof(atomic_t), + GFP_KERNEL); if (!(priv->hist_data[i])) { PRINTM(MERROR, "kmalloc priv->hist_data[%d] failed\n", @@ -3895,8 +3892,7 @@ woal_add_interface(moal_handle *handle, t_u8 bss_index, t_u8 bss_type) goto error; } } - if (priv->hist_data) - woal_hist_data_reset(priv); + woal_hist_data_reset(priv); } #ifdef CONFIG_PROC_FS woal_create_proc_entry(priv); @@ -3939,8 +3935,7 @@ error: * * @return N/A */ -void -woal_remove_interface(moal_handle *handle, t_u8 bss_index) +void woal_remove_interface(moal_handle *handle, t_u8 bss_index) { struct net_device *dev = NULL; moal_private *priv = handle->priv[bss_index]; @@ -4025,7 +4020,11 @@ woal_remove_interface(moal_handle *handle, t_u8 bss_index) woal_deinit_wifi_hal(priv); #endif - /* Clear the priv in handle */ + /* Clear the priv in handle */ +#if defined(STA_CFG80211) || defined(UAP_CFG80211) + if (IS_STA_OR_UAP_CFG80211(handle->params.cfg80211_wext)) + priv->phandle->wiphy->extended_capabilities = NULL; +#endif priv->phandle->priv[priv->bss_index] = NULL; priv->phandle = NULL; priv->netdev = NULL; @@ -4044,8 +4043,7 @@ error: * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, * otherwise fail */ -mlan_status -woal_pmic_configure(moal_handle *handle, t_u8 wait_option) +mlan_status woal_pmic_configure(moal_handle *handle, t_u8 wait_option) { moal_private *priv = NULL; mlan_ioctl_req *req = NULL; @@ -4061,8 +4059,8 @@ woal_pmic_configure(moal_handle *handle, t_u8 wait_option) } /* Allocate an IOCTL request buffer */ - req = (mlan_ioctl_req *) - woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_misc_cfg)); + req = (mlan_ioctl_req *)woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_misc_cfg)); if (req == NULL) { status = MLAN_STATUS_FAILURE; goto done; @@ -4091,8 +4089,7 @@ done: * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, * otherwise fail */ -mlan_status -woal_set_user_antcfg(moal_handle *handle, t_u8 wait_option) +mlan_status woal_set_user_antcfg(moal_handle *handle, t_u8 wait_option) { moal_private *priv = NULL; mlan_ioctl_req *req = NULL; @@ -4108,8 +4105,8 @@ woal_set_user_antcfg(moal_handle *handle, t_u8 wait_option) } antcfg = handle->params.antcfg; /* Allocate an IOCTL request buffer */ - req = (mlan_ioctl_req *) - woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_radio_cfg)); + req = (mlan_ioctl_req *)woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_radio_cfg)); if (req == NULL) { status = MLAN_STATUS_FAILURE; goto done; @@ -4150,8 +4147,7 @@ done: * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, * otherwise fail */ -mlan_status -woal_set_low_pwr_mode(moal_handle *handle, t_u8 wait_option) +mlan_status woal_set_low_pwr_mode(moal_handle *handle, t_u8 wait_option) { moal_private *priv = NULL; mlan_ioctl_req *req = NULL; @@ -4167,8 +4163,8 @@ woal_set_low_pwr_mode(moal_handle *handle, t_u8 wait_option) } /* Allocate an IOCTL request buffer */ - req = (mlan_ioctl_req *) - woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_misc_cfg)); + req = (mlan_ioctl_req *)woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_misc_cfg)); if (req == NULL) { status = MLAN_STATUS_FAILURE; goto done; @@ -4198,8 +4194,7 @@ done: * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, * otherwise fail */ -mlan_status -woal_shutdown_fw(moal_private *priv, t_u8 wait_option) +mlan_status woal_shutdown_fw(moal_private *priv, t_u8 wait_option) { mlan_ioctl_req *req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -4208,8 +4203,8 @@ woal_shutdown_fw(moal_private *priv, t_u8 wait_option) ENTER(); /* Allocate an IOCTL request buffer */ - req = (mlan_ioctl_req *) - woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_misc_cfg)); + req = (mlan_ioctl_req *)woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_misc_cfg)); if (req == NULL) { status = MLAN_STATUS_FAILURE; goto done; @@ -4240,8 +4235,7 @@ done: * * @return The converted character if chr is a valid hex, else 0 */ -int -woal_hexval(char chr) +int woal_hexval(char chr) { if (chr >= '0' && chr <= '9') return chr - '0'; @@ -4263,13 +4257,12 @@ woal_hexval(char chr) * * @return N/A */ -void -woal_flush_evt_queue(moal_handle *handle) +void woal_flush_evt_queue(moal_handle *handle) { struct woal_event *evt = NULL, *tmp_node; unsigned long flags; spin_lock_irqsave(&handle->evt_lock, flags); - list_for_each_entry_safe(evt, tmp_node, &handle->evt_queue, link) { + list_for_each_entry_safe (evt, tmp_node, &handle->evt_queue, link) { list_del(&evt->link); spin_unlock_irqrestore(&handle->evt_lock, flags); kfree(evt); @@ -4287,8 +4280,7 @@ woal_flush_evt_queue(moal_handle *handle) * * @return N/A */ -void -woal_terminate_workqueue(moal_handle *handle) +void woal_terminate_workqueue(moal_handle *handle) { ENTER(); @@ -4324,8 +4316,7 @@ woal_terminate_workqueue(moal_handle *handle) * * @return 0 --success, otherwise fail */ -int -woal_open(struct net_device *dev) +int woal_open(struct net_device *dev) { moal_private *priv = (moal_private *)netdev_priv(dev); #if defined(USB) @@ -4355,8 +4346,10 @@ woal_open(struct net_device *dev) #endif /* USB_SUSPEND_RESUME */ #if defined(USB) || defined(SYSKT) - /* On some systems the device open handler will be called before HW ready. - Use the following flag check and wait function to work around the issue. */ + /* On some systems the device open handler will be called before HW + ready. + Use the following flag check and wait function to work around + the issue. */ if (MTRUE #ifdef SDIO && !IS_SD(priv->phandle->card_type) @@ -4364,11 +4357,12 @@ woal_open(struct net_device *dev) #ifdef PCIE && !IS_PCIE(priv->phandle->card_type) #endif - ) { + ) { int i = 0; - while ((priv->phandle->hardware_status != HardwareStatusReady) - && (i < MAX_WAIT_DEVICE_READY_COUNT)) { + while ((priv->phandle->hardware_status != + HardwareStatusReady) && + (i < MAX_WAIT_DEVICE_READY_COUNT)) { i++; woal_sched_timeout(100); } @@ -4414,8 +4408,7 @@ woal_open(struct net_device *dev) * * @return 0 */ -int -woal_close(struct net_device *dev) +int woal_close(struct net_device *dev) { moal_private *priv = (moal_private *)netdev_priv(dev); #if defined(USB) @@ -4456,9 +4449,10 @@ woal_close(struct net_device *dev) priv->bg_scan_reported = MFALSE; cfg80211_sched_scan_stopped(priv->wdev->wiphy #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - , priv->bg_scan_reqid + , + priv->bg_scan_reqid #endif - ); + ); priv->sched_scanning = MFALSE; } #endif @@ -4485,8 +4479,7 @@ woal_close(struct net_device *dev) * * @return 0 --success, otherwise fail */ -int -woal_set_mac_address(struct net_device *dev, void *addr) +int woal_set_mac_address(struct net_device *dev, void *addr) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -4546,8 +4539,7 @@ done: * * @return MTRUE/MFALSE */ -t_u8 -woal_check_driver_status(moal_handle *handle) +t_u8 woal_check_driver_status(moal_handle *handle) { moal_private *priv = NULL; struct timeval t; @@ -4563,8 +4555,8 @@ woal_check_driver_status(moal_handle *handle) LEAVE(); return MTRUE; } -#define MOAL_CMD_TIMEOUT_MAX 9 -#define MOAL_CMD_TIMEOUT 20 +#define MOAL_CMD_TIMEOUT_MAX 9 +#define MOAL_CMD_TIMEOUT 20 woal_get_monotonic_time(&t); if (info->dnld_cmd_in_secs && info->pending_cmd && (t.tv_sec > (info->dnld_cmd_in_secs + MOAL_CMD_TIMEOUT_MAX))) { @@ -4610,7 +4602,7 @@ woal_check_driver_status(moal_handle *handle) } } if (info->pm_wakeup_card_req && info->pm_wakeup_fw_try) { -#define MAX_WAIT_TIME 3 +#define MAX_WAIT_TIME 3 if (t.tv_sec > (info->pm_wakeup_in_secs + MAX_WAIT_TIME)) { PRINTM(MERROR, "wakeup_dev_req=%d wakeup_tries=%d wait=%d\n", @@ -4642,21 +4634,28 @@ woal_check_driver_status(moal_handle *handle) * * @return N/A */ -void -woal_mlan_debug_info(moal_private *priv) +void woal_mlan_debug_info(moal_private *priv) { int i; #ifdef SDIO int j; t_u8 mp_aggr_pkt_limit = 0; #endif - char str[512] = { 0 }; + char str[512] = {0}; char *s; - mlan_debug_info *info = &(priv->phandle->debug_info); + mlan_debug_info *info = NULL; ENTER(); - if (!priv || woal_get_debug_info(priv, MOAL_IOCTL_WAIT, info)) { + if (!priv || !priv->phandle) { + PRINTM(MERROR, "priv or priv->phandle is null\n"); + LEAVE(); + return; + } + + info = &(priv->phandle->debug_info); + + if (woal_get_debug_info(priv, MOAL_IOCTL_WAIT, info)) { PRINTM(MERROR, "Could not retrieve debug information from MLAN\n"); LEAVE(); @@ -4720,10 +4719,10 @@ woal_mlan_debug_info(moal_private *priv) info->last_recv_wr_bitmap, info->last_mp_index); for (i = 0; i < SDIO_MP_DBG_NUM; i++) { for (s = str, j = 0; j < mp_aggr_pkt_limit; j++) - s += sprintf(s, "0x%02x ", - info->last_mp_wr_info[i * - mp_aggr_pkt_limit - + j]); + s += sprintf( + s, "0x%02x ", + info->last_mp_wr_info + [i * mp_aggr_pkt_limit + j]); PRINTM(MERROR, "mp_wr_bitmap: 0x%x mp_wr_ports=0x%x len=%d curr_wr_port=0x%x\n%s\n", @@ -4817,8 +4816,7 @@ woal_mlan_debug_info(moal_private *priv) * * @return N/A */ -void -woal_ioctl_timeout(moal_handle *handle) +void woal_ioctl_timeout(moal_handle *handle) { moal_private *priv = NULL; @@ -4842,16 +4840,15 @@ woal_ioctl_timeout(moal_handle *handle) * * @return N/A */ -void -woal_tx_timeout(struct net_device *dev) +void woal_tx_timeout(struct net_device *dev) { moal_private *priv = (moal_private *)netdev_priv(dev); ENTER(); priv->num_tx_timeout++; - PRINTM(MERROR, "%lu : %s (bss=%d): Tx timeout (%d)\n", - jiffies, dev->name, priv->bss_index, priv->num_tx_timeout); + PRINTM(MERROR, "%lu : %s (bss=%d): Tx timeout (%d)\n", jiffies, + dev->name, priv->bss_index, priv->num_tx_timeout); woal_set_trans_start(dev); if (priv->num_tx_timeout == NUM_TX_TIMEOUT_THRESHOLD) { @@ -4883,8 +4880,7 @@ woal_tx_timeout(struct net_device *dev) * * @return A pointer to net_device_stats structure */ -struct net_device_stats * -woal_get_stats(struct net_device *dev) +struct net_device_stats *woal_get_stats(struct net_device *dev) { moal_private *priv = (moal_private *)netdev_priv(dev); return &priv->stats; @@ -4899,19 +4895,22 @@ woal_get_stats(struct net_device *dev) * * @return tx_queue index (0-3) */ -u16 -woal_select_queue(struct net_device *dev, struct sk_buff *skb +u16 woal_select_queue(struct net_device *dev, struct sk_buff *skb #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) - , struct net_device *sb_dev + , + struct net_device *sb_dev #else - , void *accel_priv + , + void *accel_priv #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) - , select_queue_fallback_t fallback +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) && \ + LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) + , + select_queue_fallback_t fallback #endif #endif - ) +) { moal_private *priv = (moal_private *)netdev_priv(dev); struct ethhdr *eth = NULL; @@ -4964,14 +4963,14 @@ woal_select_queue(struct net_device *dev, struct sk_buff *skb * * @return N/A */ -void -woal_flush_tx_stat_queue(moal_private *priv) +void woal_flush_tx_stat_queue(moal_private *priv) { struct tx_status_info *tx_info = NULL, *tmp_node; unsigned long flags; struct sk_buff *skb = NULL; spin_lock_irqsave(&priv->tx_stat_lock, flags); - list_for_each_entry_safe(tx_info, tmp_node, &priv->tx_stat_queue, link) { + list_for_each_entry_safe (tx_info, tmp_node, &priv->tx_stat_queue, + link) { list_del(&tx_info->link); spin_unlock_irqrestore(&priv->tx_stat_lock, flags); skb = (struct sk_buff *)tx_info->tx_skb; @@ -5007,13 +5006,12 @@ woal_flush_tx_stat_queue(moal_private *priv) * @return A pointer to the tcp tx_status_info structure, if found. * Otherwise, null */ -struct tx_status_info * -woal_get_tx_info(moal_private *priv, t_u8 tx_seq_num) +struct tx_status_info *woal_get_tx_info(moal_private *priv, t_u8 tx_seq_num) { struct tx_status_info *tx_info = NULL; ENTER(); - list_for_each_entry(tx_info, &priv->tx_stat_queue, link) { + list_for_each_entry (tx_info, &priv->tx_stat_queue, link) { if (tx_info->tx_seq_num == tx_seq_num) { LEAVE(); return tx_info; @@ -5031,15 +5029,14 @@ woal_get_tx_info(moal_private *priv, t_u8 tx_seq_num) * * @return N/A */ -void -woal_remove_tx_info(moal_private *priv, t_u8 tx_seq_num) +void woal_remove_tx_info(moal_private *priv, t_u8 tx_seq_num) { struct tx_status_info *tx_info, *tmp = NULL; unsigned long flags; ENTER(); spin_lock_irqsave(&priv->tx_stat_lock, flags); - list_for_each_entry_safe(tx_info, tmp, &priv->tx_stat_queue, link) { + list_for_each_entry_safe (tx_info, tmp, &priv->tx_stat_queue, link) { if (tx_info->tx_seq_num == tx_seq_num) { list_del(&tx_info->link); dev_kfree_skb_any((struct sk_buff *)tx_info->tx_skb); @@ -5059,15 +5056,14 @@ woal_remove_tx_info(moal_private *priv, t_u8 tx_seq_num) * * @return N/A */ -void -woal_flush_tcp_sess_queue(moal_private *priv) +void woal_flush_tcp_sess_queue(moal_private *priv) { struct tcp_sess *tcp_sess = NULL, *tmp_node; unsigned long flags; struct sk_buff *skb; spin_lock_irqsave(&priv->tcp_sess_lock, flags); - list_for_each_entry_safe(tcp_sess, tmp_node, &priv->tcp_sess_queue, - link) { + list_for_each_entry_safe (tcp_sess, tmp_node, &priv->tcp_sess_queue, + link) { list_del(&tcp_sess->link); if (tcp_sess->is_timer_set) woal_cancel_timer(&tcp_sess->ack_timer); @@ -5094,14 +5090,14 @@ woal_flush_tcp_sess_queue(moal_private *priv) * @return A pointer to the tcp session data structure, if found. * Otherwise, null */ -static inline struct tcp_sess * -woal_get_tcp_sess(moal_private *priv, - t_u32 src_ip, t_u16 src_port, t_u32 dst_ip, t_u16 dst_port) +static inline struct tcp_sess *woal_get_tcp_sess(moal_private *priv, + t_u32 src_ip, t_u16 src_port, + t_u32 dst_ip, t_u16 dst_port) { struct tcp_sess *tcp_sess = NULL; ENTER(); - list_for_each_entry(tcp_sess, &priv->tcp_sess_queue, link) { + list_for_each_entry (tcp_sess, &priv->tcp_sess_queue, link) { if ((tcp_sess->src_ip_addr == src_ip) && (tcp_sess->src_tcp_port == src_port) && (tcp_sess->dst_ip_addr == dst_ip) && @@ -5121,8 +5117,7 @@ woal_get_tcp_sess(moal_private *priv, * @param context A pointer to context * @return N/A */ -void -woal_tcp_ack_timer_func(void *context) +void woal_tcp_ack_timer_func(void *context) { struct tcp_sess *tcp_session = (struct tcp_sess *)context; moal_private *priv = (moal_private *)tcp_session->priv; @@ -5151,9 +5146,8 @@ woal_tcp_ack_timer_func(void *context) atomic_inc(&priv->wmm_tx_pending[index]); if (atomic_read(&priv->wmm_tx_pending[index]) >= MAX_TX_PENDING) { - struct netdev_queue *txq = - netdev_get_tx_queue(priv->netdev, - index); + struct netdev_queue *txq = netdev_get_tx_queue( + priv->netdev, index); netif_tx_stop_queue(txq); PRINTM(MINFO, "Stop Kernel Queue : %d\n", index); @@ -5162,7 +5156,7 @@ woal_tcp_ack_timer_func(void *context) if (atomic_read(&priv->phandle->tx_pending) >= MAX_TX_PENDING) woal_stop_queue(priv->netdev); -#endif /*#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29) */ +#endif /*#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29)*/ queue_work(priv->phandle->workqueue, &priv->phandle->main_work); break; @@ -5190,8 +5184,7 @@ woal_tcp_ack_timer_func(void *context) * @param tcp_session A pointer to tcp_session * @return N/A */ -void -woal_send_tcp_ack(moal_private *priv, struct tcp_sess *tcp_session) +void woal_send_tcp_ack(moal_private *priv, struct tcp_sess *tcp_session) { mlan_status status; struct sk_buff *skb = (struct sk_buff *)tcp_session->ack_skb; @@ -5213,7 +5206,8 @@ woal_send_tcp_ack(moal_private *priv, struct tcp_sess *tcp_session) #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 29) index = skb_get_queue_mapping(skb); atomic_inc(&priv->wmm_tx_pending[index]); - if (atomic_read(&priv->wmm_tx_pending[index]) >= MAX_TX_PENDING) { + if (atomic_read(&priv->wmm_tx_pending[index]) >= + MAX_TX_PENDING) { struct netdev_queue *txq = netdev_get_tx_queue(priv->netdev, index); netif_tx_stop_queue(txq); @@ -5222,7 +5216,7 @@ woal_send_tcp_ack(moal_private *priv, struct tcp_sess *tcp_session) #else if (atomic_read(&priv->phandle->tx_pending) >= MAX_TX_PENDING) woal_stop_queue(priv->netdev); -#endif /*#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29) */ +#endif /*#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29)*/ queue_work(priv->phandle->workqueue, &priv->phandle->main_work); break; case MLAN_STATUS_SUCCESS: @@ -5247,8 +5241,7 @@ woal_send_tcp_ack(moal_private *priv, struct tcp_sess *tcp_session) * * @return 1, if it's dropped; 0, if not dropped */ -int -woal_process_tcp_ack(moal_private *priv, mlan_buffer *pmbuf) +int woal_process_tcp_ack(moal_private *priv, mlan_buffer *pmbuf) { int ret = 0; unsigned long flags; @@ -5284,9 +5277,8 @@ woal_process_tcp_ack(moal_private *priv, mlan_buffer *pmbuf) } priv->tcp_ack_cnt++; spin_lock_irqsave(&priv->tcp_sess_lock, flags); - tcp_session = woal_get_tcp_sess(priv, iph->saddr, - tcph->source, iph->daddr, - tcph->dest); + tcp_session = woal_get_tcp_sess(priv, iph->saddr, tcph->source, + iph->daddr, tcph->dest); if (!tcp_session) { tcp_session = kmalloc(sizeof(struct tcp_sess), GFP_ATOMIC); @@ -5344,8 +5336,8 @@ woal_process_tcp_ack(moal_private *priv, mlan_buffer *pmbuf) tcp_session->ack_seq = ack_seq; ret = DROP_TCP_ACK; skb->cb[0]++; -//We will drop 90% tcp ack -#define TCP_ACK_MAX_HOLD 9 +// We will drop 90% tcp ack +#define TCP_ACK_MAX_HOLD 9 if (skb->cb[0] >= TCP_ACK_MAX_HOLD) woal_send_tcp_ack(priv, tcp_session); spin_unlock_irqrestore(&priv->tcp_sess_lock, flags); @@ -5372,8 +5364,7 @@ done: * * @return 0 --success */ -int -woal_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) +int woal_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_buffer *pmbuf = NULL; @@ -5385,8 +5376,8 @@ woal_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) int ret = 0; ENTER(); - PRINTM(MDATA, "%lu : %s (bss=%d): Data <= kernel\n", - jiffies, dev->name, priv->bss_index); + PRINTM(MDATA, "%lu : %s (bss=%d): Data <= kernel\n", jiffies, dev->name, + priv->bss_index); if (priv->phandle->surprise_removed == MTRUE) { dev_kfree_skb_any(skb); @@ -5395,22 +5386,22 @@ woal_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) } priv->num_tx_timeout = 0; if (!skb->len || (skb->len > ETH_FRAME_LEN)) { - PRINTM(MERROR, "Tx Error: Bad skb length %d : %d\n", - skb->len, ETH_FRAME_LEN); + PRINTM(MERROR, "Tx Error: Bad skb length %d : %d\n", skb->len, + ETH_FRAME_LEN); dev_kfree_skb_any(skb); priv->stats.tx_dropped++; goto done; } - if (skb->cloned || (skb_headroom(skb) < (MLAN_MIN_DATA_HEADER_LEN + - sizeof(mlan_buffer) + - priv->extra_tx_head_len))) { + if (skb->cloned || (skb_headroom(skb) < + (MLAN_MIN_DATA_HEADER_LEN + sizeof(mlan_buffer) + + priv->extra_tx_head_len))) { PRINTM(MWARN, "Tx: skb cloned %d or Insufficient skb headroom %d\n", skb->cloned, skb_headroom(skb)); /* Insufficient skb headroom - allocate a new skb */ - new_skb = skb_realloc_headroom(skb, MLAN_MIN_DATA_HEADER_LEN + - sizeof(mlan_buffer) + - priv->extra_tx_head_len); + new_skb = skb_realloc_headroom( + skb, MLAN_MIN_DATA_HEADER_LEN + sizeof(mlan_buffer) + + priv->extra_tx_head_len); if (unlikely(!new_skb)) { PRINTM(MERROR, "Tx: Cannot allocate skb\n"); dev_kfree_skb_any(skb); @@ -5450,7 +5441,8 @@ woal_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) atomic_inc(&priv->phandle->tx_pending); #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 29) atomic_inc(&priv->wmm_tx_pending[index]); - if (atomic_read(&priv->wmm_tx_pending[index]) >= MAX_TX_PENDING) { + if (atomic_read(&priv->wmm_tx_pending[index]) >= + MAX_TX_PENDING) { struct netdev_queue *txq = netdev_get_tx_queue(priv->netdev, index); netif_tx_stop_queue(txq); @@ -5459,10 +5451,10 @@ woal_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) #else if (atomic_read(&priv->phandle->tx_pending) >= MAX_TX_PENDING) woal_stop_queue(priv->netdev); -#endif /*#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29) */ +#endif /*#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29)*/ if (!mlan_is_main_process_running(priv->phandle->pmlan_adapter)) - queue_work(priv->phandle->workqueue, - &priv->phandle->main_work); + queue_work(priv->phandle->workqueue, + &priv->phandle->main_work); break; case MLAN_STATUS_SUCCESS: priv->stats.tx_packets++; @@ -5489,8 +5481,7 @@ done: * * @return Number of integer */ -int -woal_ascii2hex(t_u8 *d, char *s, t_u32 dlen) +int woal_ascii2hex(t_u8 *d, char *s, t_u32 dlen) { unsigned int i; t_u8 n; @@ -5525,8 +5516,7 @@ woal_ascii2hex(t_u8 *d, char *s, t_u32 dlen) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_atoi(int *data, char *a) +mlan_status woal_atoi(int *data, char *a) { int i, val = 0, len; int mul = 1; @@ -5570,8 +5560,7 @@ woal_atoi(int *data, char *a) * * @return The converted character if a is a valid hex, else 0 */ -int -woal_atox(char *a) +int woal_atox(char *a) { int i = 0; @@ -5594,8 +5583,7 @@ woal_atox(char *a) * * @return Pointer to the separated string if delim found, else NULL */ -char * -woal_strsep(char **s, char delim, char esc) +char *woal_strsep(char **s, char delim, char esc) { char *se = *s, *sb; @@ -5646,8 +5634,7 @@ woal_strsep(char **s, char delim, char esc) * * @return N/A */ -void -woal_mac2u8(t_u8 *mac_addr, char *buf) +void woal_mac2u8(t_u8 *mac_addr, char *buf) { char *begin, *end, *mac_buff; int i; @@ -5685,8 +5672,7 @@ woal_mac2u8(t_u8 *mac_addr, char *buf) * * @return N/A */ -void -woal_set_multicast_list(struct net_device *dev) +void woal_set_multicast_list(struct net_device *dev) { moal_private *priv = (moal_private *)netdev_priv(dev); ENTER(); @@ -5704,8 +5690,7 @@ woal_set_multicast_list(struct net_device *dev) * * @return N/A */ -void -woal_init_priv(moal_private *priv, t_u8 wait_option) +void woal_init_priv(moal_private *priv, t_u8 wait_option) { ENTER(); #ifdef STA_SUPPORT @@ -5780,6 +5765,7 @@ woal_init_priv(moal_private *priv, t_u8 wait_option) moal_memcpy_ext(priv->phandle, priv->current_addr, priv->phandle->mac_addr, ETH_ALEN, ETH_ALEN); } + #ifdef WIFI_DIRECT_SUPPORT #if defined(STA_CFG80211) && defined(UAP_CFG80211) #if CFG80211_VERSION_CODE >= WIFI_DIRECT_KERNEL_VERSION @@ -5789,11 +5775,11 @@ woal_init_priv(moal_private *priv, t_u8 wait_option) if (priv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT) { if (priv->bss_virtual) { if (priv->pa_netdev) { - moal_memcpy_ext(priv->phandle, - priv->current_addr, - priv->pa_netdev-> - dev_addr, ETH_ALEN, - ETH_ALEN); + moal_memcpy_ext( + priv->phandle, + priv->current_addr, + priv->pa_netdev->dev_addr, + ETH_ALEN, ETH_ALEN); priv->current_addr[4] ^= 0x80; PRINTM(MCMND, "Set WFD interface addr: " MACSTR @@ -5811,7 +5797,8 @@ woal_init_priv(moal_private *priv, t_u8 wait_option) #endif #endif - /* Set MAC address for UAPx/MLANx/WFDx/OCBx and let them different with each other */ + /* Set MAC address for UAPx/MLANx/WFDx/OCBx and let them + * different with each other */ #ifdef WIFI_DIRECT_SUPPORT if (priv->bss_type != MLAN_BSS_TYPE_WIFIDIRECT) #endif @@ -5842,8 +5829,7 @@ woal_init_priv(moal_private *priv, t_u8 wait_option) * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -int -woal_reset_intf(moal_private *priv, t_u8 wait_option, int all_intf) +int woal_reset_intf(moal_private *priv, t_u8 wait_option, int all_intf) { int ret = MLAN_STATUS_SUCCESS; int intf_num; @@ -5892,7 +5878,7 @@ woal_reset_intf(moal_private *priv, t_u8 wait_option, int all_intf) #ifdef UAP_SUPPORT || (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) #endif - ) { + ) { woal_disconnect(priv, wait_option, NULL, DEF_DEAUTH_REASON_CODE); priv->media_connected = MFALSE; @@ -5905,7 +5891,7 @@ woal_reset_intf(moal_private *priv, t_u8 wait_option, int all_intf) || (GET_BSS_ROLE(handle->priv[intf_num]) == MLAN_BSS_ROLE_UAP) #endif - ) { + ) { woal_disconnect(handle->priv[intf_num], wait_option, NULL, DEF_DEAUTH_REASON_CODE); @@ -5965,8 +5951,7 @@ done: * * @return moal_private pointer or NULL */ -moal_private * -woal_bss_index_to_priv(moal_handle *handle, t_u8 bss_index) +moal_private *woal_bss_index_to_priv(moal_handle *handle, t_u8 bss_index) { int i; @@ -5994,8 +5979,7 @@ woal_bss_index_to_priv(moal_handle *handle, t_u8 bss_index) * * @return mlan_buffer pointer or NULL */ -pmlan_buffer -woal_alloc_mlan_buffer(moal_handle *handle, int size) +pmlan_buffer woal_alloc_mlan_buffer(moal_handle *handle, int size) { mlan_buffer *pmbuf = NULL; struct sk_buff *skb; @@ -6003,7 +5987,7 @@ woal_alloc_mlan_buffer(moal_handle *handle, int size) ENTER(); - flag = (in_atomic() || irqs_disabled())? GFP_ATOMIC : GFP_KERNEL; + flag = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; if (size <= 0) { PRINTM(MERROR, "Buffer size must be positive\n"); LEAVE(); @@ -6033,17 +6017,17 @@ woal_alloc_mlan_buffer(moal_handle *handle, int size) * * @return mlan_ioctl_req pointer or NULL */ -pmlan_ioctl_req -woal_alloc_mlan_ioctl_req(int size) +pmlan_ioctl_req woal_alloc_mlan_ioctl_req(int size) { mlan_ioctl_req *req = NULL; gfp_t flag; ENTER(); - flag = (in_atomic() || irqs_disabled())? GFP_ATOMIC : GFP_KERNEL; + flag = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; req = kzalloc((sizeof(mlan_ioctl_req) + size + sizeof(int) + - sizeof(wait_queue)), flag); + sizeof(wait_queue)), + flag); if (!req) { PRINTM(MERROR, "%s: Fail to alloc ioctl buffer\n", __func__); LEAVE(); @@ -6064,8 +6048,7 @@ woal_alloc_mlan_ioctl_req(int size) * * @return N/A */ -void -woal_free_mlan_buffer(moal_handle *handle, pmlan_buffer pmbuf) +void woal_free_mlan_buffer(moal_handle *handle, pmlan_buffer pmbuf) { ENTER(); if (!pmbuf) { @@ -6088,8 +6071,7 @@ woal_free_mlan_buffer(moal_handle *handle, pmlan_buffer pmbuf) * * @return N/A */ -static int -woal_get_card_info(moal_handle *phandle) +static int woal_get_card_info(moal_handle *phandle) { int ret = 0; @@ -6203,8 +6185,7 @@ woal_get_card_info(moal_handle *phandle) * @param len Length of the payload * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_broadcast_event(moal_private *priv, t_u8 *payload, t_u32 len) +mlan_status woal_broadcast_event(moal_private *priv, t_u8 *payload, t_u32 len) { mlan_status ret = MLAN_STATUS_SUCCESS; struct sk_buff *skb = NULL; @@ -6218,9 +6199,9 @@ woal_broadcast_event(moal_private *priv, t_u8 *payload, t_u32 len) /* interface name to be prepended to event */ if ((len + IFNAMSIZ) > NL_MAX_PAYLOAD #ifdef WIFI_DIRECT_SUPPORT - * 2 + * 2 #endif - ) { + ) { PRINTM(MERROR, "event size is too big, len=%d\n", (int)len); ret = MLAN_STATUS_FAILURE; goto done; @@ -6314,8 +6295,7 @@ done: * @param data A pointer to wlan_thread structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -int -woal_reassociation_thread(void *data) +int woal_reassociation_thread(void *data) { moal_thread *pmoal_thread = data; moal_private *priv = NULL; @@ -6332,7 +6312,7 @@ woal_reassociation_thread(void *data) mlan_status status; mlan_bss_info bss_info; t_u32 timer_val = MOAL_TIMER_10S; - t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; + t_u8 zero_mac[] = {0, 0, 0, 0, 0, 0}; ENTER(); woal_activate_thread(pmoal_thread); @@ -6351,11 +6331,12 @@ woal_reassociation_thread(void *data) #if defined(USB) if (IS_USB(handle->card_type)) { #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13) - try_to_freeze(0); /* Argument is not used by the kernel */ + try_to_freeze(0); /* Argument is not used by the kernel + */ #else try_to_freeze(); - } #endif + } #endif /* Cancel re-association timer */ @@ -6378,9 +6359,9 @@ woal_reassociation_thread(void *data) PRINTM(MEVENT, "Reassoc: Thread waking up...\n"); reassoc_timer_req = MFALSE; #ifdef STA_CFG80211 - for (i = 0; - i < MIN(handle->priv_num, MLAN_MAX_BSS_NUM) && - (priv = handle->priv[i]); i++) { + for (i = 0; i < MIN(handle->priv_num, MLAN_MAX_BSS_NUM) && + (priv = handle->priv[i]); + i++) { if (priv->roaming_required) { priv->roaming_required = MFALSE; PRINTM(MEVENT, "Try to roaming......\n"); @@ -6390,10 +6371,9 @@ woal_reassociation_thread(void *data) } #endif - for (i = 0; - i < MIN(handle->priv_num, MLAN_MAX_BSS_NUM) && - (priv = handle->priv[i]); i++) { - + for (i = 0; i < MIN(handle->priv_num, MLAN_MAX_BSS_NUM) && + (priv = handle->priv[i]); + i++) { if (priv->reassoc_required == MFALSE) { priv->set_asynced_essid_flag = MFALSE; continue; @@ -6401,10 +6381,9 @@ woal_reassociation_thread(void *data) memset(&bss_info, 0x00, sizeof(bss_info)); - if (MLAN_STATUS_SUCCESS != woal_get_bss_info(priv, - MOAL_IOCTL_WAIT, - &bss_info)) - { + if (MLAN_STATUS_SUCCESS != + woal_get_bss_info(priv, MOAL_IOCTL_WAIT, + &bss_info)) { PRINTM(MINFO, "Ressoc: Fail to get bss info\n"); priv->reassoc_required = MFALSE; priv->set_asynced_essid_flag = MFALSE; @@ -6419,17 +6398,19 @@ woal_reassociation_thread(void *data) priv->set_asynced_essid_flag = MFALSE; continue; } - /** avoid on going scan from other thread */ + /** avoid on going scan from other thread */ if (handle->scan_pending_on_block) { reassoc_timer_req = MTRUE; break; } - /* The semaphore is used to avoid reassociation thread and - wlan_set_scan/wlan_set_essid interrupting each other. - Reassociation should be disabled completely by application if - wlan_set_user_scan_ioctl/wlan_set_wap is used. - */ + /* The semaphore is used to avoid reassociation + thread and wlan_set_scan/wlan_set_essid + interrupting each other. Reassociation should + be disabled completely by application if + wlan_set_user_scan_ioctl/wlan_set_wap is + used. + */ if (MOAL_ACQ_SEMAPHORE_BLOCK(&handle->reassoc_sem)) { PRINTM(MERROR, "Acquire semaphore error, reassociation thread\n"); @@ -6472,15 +6453,15 @@ woal_reassociation_thread(void *data) /* Search AP by BSSID & SSID */ PRINTM(MINFO, "Reassoc: Search AP by BSSID & SSID\n"); - moal_memcpy_ext(priv->phandle, - &ssid_bssid.bssid, - &priv->prev_ssid_bssid. - bssid, - MLAN_MAC_ADDR_LENGTH, - sizeof - (mlan_802_11_mac_addr)); + moal_memcpy_ext( + priv->phandle, + &ssid_bssid.bssid, + &priv->prev_ssid_bssid.bssid, + MLAN_MAC_ADDR_LENGTH, + sizeof(mlan_802_11_mac_addr)); } else { - /* Search AP by ESSID for asynced essid setting */ + /* Search AP by ESSID for asynced essid + * setting */ PRINTM(MINFO, "Set asynced essid: Search AP by ESSID\n"); } @@ -6514,7 +6495,8 @@ woal_reassociation_thread(void *data) } } #endif - /** The find AP without ssid, we need re-search */ + /** The find AP without ssid, we need re-search + */ if (status == MLAN_STATUS_SUCCESS && !ssid_bssid.ssid.ssid_len) { PRINTM(MINFO, @@ -6533,16 +6515,14 @@ woal_reassociation_thread(void *data) &priv->prev_ssid_bssid.ssid, sizeof(mlan_802_11_ssid), sizeof(mlan_802_11_ssid)); - status = woal_find_best_network(priv, - MOAL_IOCTL_WAIT, - &ssid_bssid); + status = woal_find_best_network( + priv, MOAL_IOCTL_WAIT, &ssid_bssid); #ifdef STA_WEXT if (status == MLAN_STATUS_SUCCESS) { if (MLAN_STATUS_SUCCESS != - woal_11d_check_ap_channel(priv, - MOAL_IOCTL_WAIT, - &ssid_bssid)) - { + woal_11d_check_ap_channel( + priv, MOAL_IOCTL_WAIT, + &ssid_bssid)) { PRINTM(MERROR, "Reassoc: The AP's channel is invalid for current region\n"); status = MLAN_STATUS_FAILURE; @@ -6556,7 +6536,8 @@ woal_reassociation_thread(void *data) if (bss_info.wep_status) woal_enable_wep_key(priv, MOAL_IOCTL_WAIT); - /* Zero SSID implies use BSSID to connect */ + /* Zero SSID implies use BSSID to + * connect */ memset(&ssid_bssid.ssid, 0, sizeof(mlan_802_11_ssid)); status = woal_bss_start(priv, MOAL_IOCTL_WAIT, @@ -6579,30 +6560,27 @@ woal_reassociation_thread(void *data) PRINTM(MINFO, "Set asynced essid: Fail to get bss info after assoc\n"); } else { - moal_memcpy_ext(priv->phandle, - &priv-> - prev_ssid_bssid. - ssid, - &bss_info.ssid, - sizeof - (mlan_802_11_ssid), - sizeof - (mlan_802_11_ssid)); - moal_memcpy_ext(priv->phandle, - &priv-> - prev_ssid_bssid. - bssid, - &bss_info.bssid, - MLAN_MAC_ADDR_LENGTH, - sizeof(priv-> - prev_ssid_bssid. - bssid)); + moal_memcpy_ext( + priv->phandle, + &priv->prev_ssid_bssid + .ssid, + &bss_info.ssid, + sizeof(mlan_802_11_ssid), + sizeof(mlan_802_11_ssid)); + moal_memcpy_ext( + priv->phandle, + &priv->prev_ssid_bssid + .bssid, + &bss_info.bssid, + MLAN_MAC_ADDR_LENGTH, + sizeof(priv->prev_ssid_bssid + .bssid)); } priv->set_asynced_essid_flag = MFALSE; } if (priv->rate_index != AUTO_RATE) { - req = woal_alloc_mlan_ioctl_req(sizeof - (mlan_ds_rate)); + req = woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_rate)); if (req == NULL) { LEAVE(); @@ -6620,8 +6598,8 @@ woal_reassociation_thread(void *data) rate->param.rate_cfg.rate = priv->rate_index; - status = woal_request_ioctl(priv, req, - MOAL_IOCTL_WAIT); + status = woal_request_ioctl( + priv, req, MOAL_IOCTL_WAIT); if (status != MLAN_STATUS_SUCCESS) { if (status != MLAN_STATUS_PENDING) @@ -6672,8 +6650,7 @@ woal_reassociation_thread(void *data) * @param context A pointer to context * @return N/A */ -void -woal_reassoc_timer_func(void *context) +void woal_reassoc_timer_func(void *context) { moal_handle *handle = (moal_handle *)context; @@ -6698,8 +6675,7 @@ woal_reassoc_timer_func(void *context) * * @return N/A */ -void -woal_update_dscp_mapping(moal_private *priv) +void woal_update_dscp_mapping(moal_private *priv) { mlan_ds_misc_assoc_rsp assoc_rsp; IEEEtypes_AssocRsp_t *passoc_rsp = NULL; @@ -6714,18 +6690,14 @@ woal_update_dscp_mapping(moal_private *priv) woal_get_assoc_rsp(priv, &assoc_rsp, MOAL_NO_WAIT); passoc_rsp = (IEEEtypes_AssocRsp_t *)assoc_rsp.assoc_resp_buf; memset(priv->dscp_map, 0xFF, sizeof(priv->dscp_map)); - qos_mapping_ie = - (IEEEtypes_Header_t *)woal_parse_ie_tlv(passoc_rsp->ie_buffer, - assoc_rsp. - assoc_resp_len - - ASSOC_RESP_FIXED_SIZE, - QOS_MAPPING); + qos_mapping_ie = (IEEEtypes_Header_t *)woal_parse_ie_tlv( + passoc_rsp->ie_buffer, + assoc_rsp.assoc_resp_len - ASSOC_RESP_FIXED_SIZE, QOS_MAPPING); if (qos_mapping_ie && (qos_mapping_ie->len >= (sizeof(DSCP_Range_t) * MAX_NUM_TID))) { - dscp_except_num = - (qos_mapping_ie->len - - sizeof(DSCP_Range_t) * MAX_NUM_TID) / - sizeof(DSCP_Exception_t); + dscp_except_num = (qos_mapping_ie->len - + sizeof(DSCP_Range_t) * MAX_NUM_TID) / + sizeof(DSCP_Exception_t); if (dscp_except_num > MAX_DSCP_EXCEPTION_NUM) { PRINTM(MERROR, "dscp_except_num exceeds MAX limit\n"); LEAVE(); @@ -6733,14 +6705,14 @@ woal_update_dscp_mapping(moal_private *priv) } moal_memcpy_ext(priv->phandle, dscp_except, (t_u8 *)qos_mapping_ie + - sizeof(IEEEtypes_Header_t), + sizeof(IEEEtypes_Header_t), dscp_except_num * sizeof(DSCP_Exception_t), sizeof(dscp_except)); pdscp_range = (DSCP_Range_t *)((t_u8 *)qos_mapping_ie + sizeof(IEEEtypes_Header_t) + dscp_except_num * - sizeof(DSCP_Exception_t)); + sizeof(DSCP_Exception_t)); for (i = 0; i < MAX_NUM_TID; i++) { PRINTM(MEVENT, "TID %d: dscp_low=%d, dscp_high=%d\n", i, pdscp_range->dscp_low_value, @@ -6776,8 +6748,8 @@ woal_update_dscp_mapping(moal_private *priv) * @param disconnect_reason disconnect reason code * @return N/A */ -t_void -woal_send_disconnect_to_system(moal_private *priv, t_u16 disconnect_reason) +t_void woal_send_disconnect_to_system(moal_private *priv, + t_u16 disconnect_reason) { int custom_len = 0; t_u8 event_buf[32]; @@ -6810,9 +6782,10 @@ woal_send_disconnect_to_system(moal_private *priv, t_u16 disconnect_reason) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) priv->gtk_data_ready = MFALSE; memset(&zero_gtk, 0x00, sizeof(zero_gtk)); - if (priv->phandle->params.gtk_rekey_offload == GTK_REKEY_OFFLOAD_ENABLE - && memcmp(&priv->gtk_rekey_data, &zero_gtk, - sizeof(priv->gtk_rekey_data)) != 0) { + if (priv->phandle->params.gtk_rekey_offload == + GTK_REKEY_OFFLOAD_ENABLE && + memcmp(&priv->gtk_rekey_data, &zero_gtk, + sizeof(priv->gtk_rekey_data)) != 0) { PRINTM(MCMND, "clear GTK in woal_send_disconnect_to_system\n"); woal_set_rekey_data(priv, NULL, MLAN_ACT_CLEAR, MOAL_NO_WAIT); } @@ -6831,7 +6804,7 @@ woal_send_disconnect_to_system(moal_private *priv, t_u16 disconnect_reason) } } #endif - if (priv->bss_type == MLAN_BSS_TYPE_STA && priv->hist_data) + if (priv->bss_type == MLAN_BSS_TYPE_STA) woal_hist_data_reset(priv); #ifdef STA_WEXT @@ -6844,25 +6817,26 @@ woal_send_disconnect_to_system(moal_private *priv, t_u16 disconnect_reason) #ifdef STA_CFG80211 if (IS_STA_CFG80211(cfg80211_wext)) { spin_lock_irqsave(&priv->connect_lock, flags); - if (!priv->cfg_disconnect && !priv->cfg_connect && - priv->wdev && priv->wdev->current_bss) { + if (!priv->cfg_disconnect && !priv->cfg_connect && priv->wdev && + priv->wdev->current_bss) { PRINTM(MMSG, "wlan: Disconnected from " MACSTR - ": Reason code %d\n", MAC2STR(priv->cfg_bssid), - reason_code); + ": Reason code %d\n", + MAC2STR(priv->cfg_bssid), reason_code); spin_unlock_irqrestore(&priv->connect_lock, flags); priv->cfg_disconnect = MTRUE; - /* This function must be called only when disconnect issued by - the FW, i.e. disconnected by AP. For IBSS mode this call is - not valid */ + /* This function must be called only when + disconnect issued by the FW, i.e. + disconnected by AP. For IBSS mode this call + is not valid */ #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) if (priv->host_mlme) woal_host_mlme_disconnect(priv, reason_code, NULL); else #endif - cfg80211_disconnected(priv->netdev, - reason_code, NULL, 0, + cfg80211_disconnected(priv->netdev, reason_code, + NULL, 0, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) false, #endif @@ -6900,8 +6874,7 @@ woal_send_disconnect_to_system(moal_private *priv, t_u16 disconnect_reason) * * @return N/A */ -t_void -woal_store_ssu_dump(moal_handle *phandle, mlan_event *pmevent) +t_void woal_store_ssu_dump(moal_handle *phandle, mlan_event *pmevent) { struct dentry *dentry; struct path path; @@ -6917,16 +6890,15 @@ woal_store_ssu_dump(moal_handle *phandle, mlan_event *pmevent) goto save_ssudump; } vfs_mkdir(path.dentry->d_inode, dentry, 0777); -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) mutex_unlock(&path.dentry->d_inode->i_mutex); #else inode_unlock(path.dentry->d_inode); #endif save_ssudump: - pfile_ssudump = - filp_open("/data/ssudump.txt", O_CREAT | O_WRONLY | O_APPEND, - 0644); + pfile_ssudump = filp_open("/data/ssudump.txt", + O_CREAT | O_WRONLY | O_APPEND, 0644); if (IS_ERR(pfile_ssudump)) { PRINTM(MERROR, "Cannot create ssu dump file\n"); LEAVE(); @@ -6956,16 +6928,7 @@ save_ssudump: #endif /* SSU_SUPPORT */ #define OFFSET_SEQNUM 4 -/** - * @brief This function stores the FW dumps received from events - * - * @param phandle A pointer to moal_handle - * @param pmevent A pointer to mlan_event structure - * - * @return N/A - */ -t_void -woal_store_firmware_dump(moal_handle *phandle, mlan_event *pmevent) +t_void woal_store_firmware_dump(moal_handle *phandle, mlan_event *pmevent) { struct file *pfile_fwdump = NULL; loff_t pos = 0; @@ -6975,15 +6938,14 @@ woal_store_firmware_dump(moal_handle *phandle, mlan_event *pmevent) ENTER(); if (phandle->fwdump_fname) - pfile_fwdump = - filp_open(phandle->fwdump_fname, - O_CREAT | O_WRONLY | O_APPEND, 0644); + pfile_fwdump = filp_open(phandle->fwdump_fname, + O_CREAT | O_WRONLY | O_APPEND, 0644); else { - seqnum = woal_le16_to_cpu(*(t_u16 *) - (pmevent->event_buf + OFFSET_SEQNUM)); + seqnum = woal_le16_to_cpu( + *(t_u16 *)(pmevent->event_buf + OFFSET_SEQNUM)); if (seqnum == 1) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) - /** Create dump directort*/ + /** Create dump directort*/ woal_create_dump_dir(phandle, path_name, sizeof(path_name)); #else @@ -7000,9 +6962,9 @@ woal_store_firmware_dump(moal_handle *phandle, mlan_event *pmevent) memset(fwdump_fname, 0, 64); } else { gfp_t flag; - flag = (in_atomic() || - irqs_disabled())? GFP_ATOMIC : - GFP_KERNEL; + flag = (in_atomic() || irqs_disabled()) ? + GFP_ATOMIC : + GFP_KERNEL; fwdump_fname = kzalloc(64, flag); } sprintf(fwdump_fname, "%s/file_fwdump", path_name); @@ -7040,9 +7002,9 @@ woal_store_firmware_dump(moal_handle *phandle, mlan_event *pmevent) } #define DRV_INFO_SIZE 0x60000 -#define DRV_INFO_PER_INTF 0x11000 -#define ROW_SIZE_16 16 -#define ROW_SIZE_32 32 +#define DRV_INFO_PER_INTF 0x11000 +#define ROW_SIZE_16 16 +#define ROW_SIZE_32 32 /** * @brief This function dump hex to file @@ -7055,9 +7017,8 @@ woal_store_firmware_dump(moal_handle *phandle, mlan_event *pmevent) * * @return The length of this log */ -static int -woal_save_hex_dump(int rowsize, const void *buf, size_t len, - bool ascii, t_u8 *save_buf) +static int woal_save_hex_dump(int rowsize, const void *buf, size_t len, + bool ascii, t_u8 *save_buf) { const u8 *ptr = buf; int i, linelen, remaining = len; @@ -7088,8 +7049,7 @@ woal_save_hex_dump(int rowsize, const void *buf, size_t len, * * @return The length of this log */ -static int -woal_dump_priv_drv_info(moal_handle *handle, t_u8 *buf) +static int woal_dump_priv_drv_info(moal_handle *handle, t_u8 *buf) { char *ptr = (char *)buf; int index; @@ -7121,25 +7081,28 @@ woal_dump_priv_drv_info(moal_handle *handle, t_u8 *buf) atomic_read(&priv->wmm_tx_pending[3])); #endif ptr += sprintf(ptr, "Media state = \"%s\"\n", - ((priv->media_connected == - MFALSE) ? "Disconnected" : - "Connected")); + ((priv->media_connected == MFALSE) ? + "Disconnected" : + "Connected")); ptr += sprintf(ptr, "carrier %s\n", - ((netif_carrier_ok(priv->netdev)) ? "on" - : "off")); + ((netif_carrier_ok(priv->netdev)) ? + "on" : + "off")); #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 29) for (i = 0; i < (priv->netdev->num_tx_queues); i++) { - ptr += sprintf(ptr, "tx queue %d: %s\n", i, - ((netif_tx_queue_stopped - (netdev_get_tx_queue - (priv->netdev, - i))) ? "stopped" : - "started")); + ptr += sprintf( + ptr, "tx queue %d: %s\n", i, + ((netif_tx_queue_stopped( + netdev_get_tx_queue( + priv->netdev, i))) ? + "stopped" : + "started")); } #else ptr += sprintf(ptr, "tx queue %s\n", ((netif_queue_stopped(priv->netdev)) ? - "stopped" : "started")); + "stopped" : + "started")); #endif ptr += sprintf(ptr, "%s: num_tx_timeout = %d\n", priv->netdev->name, @@ -7159,8 +7122,7 @@ woal_dump_priv_drv_info(moal_handle *handle, t_u8 *buf) * * @return The length of this log */ -static int -woal_dump_moal_drv_info(moal_handle *phandle, t_u8 *buf) +static int woal_dump_moal_drv_info(moal_handle *phandle, t_u8 *buf) { char *ptr; #ifdef USB @@ -7236,8 +7198,7 @@ woal_dump_moal_drv_info(moal_handle *phandle, t_u8 *buf) * * @return The length of this log */ -static int -woal_dump_mlan_drv_info(moal_private *priv, t_u8 *buf) +static int woal_dump_mlan_drv_info(moal_private *priv, t_u8 *buf) { char *ptr = (char *)buf; int i; @@ -7245,12 +7206,18 @@ woal_dump_mlan_drv_info(moal_private *priv, t_u8 *buf) int j; t_u8 mp_aggr_pkt_limit = 0; #endif - char str[11 * DBG_CMD_NUM + 1] = { 0 }; + char str[11 * DBG_CMD_NUM + 1] = {0}; char *s; - mlan_debug_info *info = &(priv->phandle->debug_info); + mlan_debug_info *info = NULL; ENTER(); - if (!priv || woal_get_debug_info(priv, MOAL_IOCTL_WAIT, info)) { + if (!priv || !priv->phandle) { + PRINTM(MERROR, "priv or priv->phandle is null\n"); + LEAVE(); + return 0; + } + info = &(priv->phandle->debug_info); + if (woal_get_debug_info(priv, MOAL_IOCTL_WAIT, info)) { PRINTM(MERROR, "Could not retrieve debug information from MLAN\n"); LEAVE(); @@ -7320,17 +7287,18 @@ woal_dump_mlan_drv_info(moal_private *priv, t_u8 *buf) info->last_recv_wr_bitmap, info->last_mp_index); for (i = 0; i < SDIO_MP_DBG_NUM; i++) { for (s = str, j = 0; j < mp_aggr_pkt_limit; j++) - s += sprintf(s, "0x%02x ", - info->last_mp_wr_info[i * - mp_aggr_pkt_limit - + j]); + s += sprintf( + s, "0x%02x ", + info->last_mp_wr_info + [i * mp_aggr_pkt_limit + j]); - ptr += sprintf(ptr, - "mp_wr_bitmap: 0x%x mp_wr_ports=0x%x len=%d curr_wr_port=0x%x\n%s\n", - info->last_mp_wr_bitmap[i], - info->last_mp_wr_ports[i], - info->last_mp_wr_len[i], - info->last_curr_wr_port[i], str); + ptr += sprintf( + ptr, + "mp_wr_bitmap: 0x%x mp_wr_ports=0x%x len=%d curr_wr_port=0x%x\n%s\n", + info->last_mp_wr_bitmap[i], + info->last_mp_wr_ports[i], + info->last_mp_wr_len[i], + info->last_curr_wr_port[i], str); } } #endif @@ -7375,10 +7343,10 @@ woal_dump_mlan_drv_info(moal_private *priv, t_u8 *buf) info->cmd_sent); ptr += sprintf(ptr, "ps_mode=%d ps_state=%d\n", info->ps_mode, info->ps_state); - ptr += sprintf(ptr, - "wakeup_dev_req=%d wakeup_tries=%d pm_wakeup_timeout=%d\n", - info->pm_wakeup_card_req, info->pm_wakeup_fw_try, - info->pm_wakeup_timeout); + ptr += sprintf( + ptr, "wakeup_dev_req=%d wakeup_tries=%d pm_wakeup_timeout=%d\n", + info->pm_wakeup_card_req, info->pm_wakeup_fw_try, + info->pm_wakeup_timeout); ptr += sprintf(ptr, "hs_configured=%d hs_activated=%d\n", info->is_hs_configured, info->hs_activated); ptr += sprintf(ptr, "pps_uapsd_mode=%d sleep_pd=%d\n", @@ -7420,8 +7388,7 @@ woal_dump_mlan_drv_info(moal_private *priv, t_u8 *buf) * * @return The length of this log */ -static int -woal_dump_moal_hex(moal_handle *phandle, t_u8 *buf) +static int woal_dump_moal_hex(moal_handle *phandle, t_u8 *buf) { char *ptr = (char *)buf; int i; @@ -7464,16 +7431,21 @@ woal_dump_moal_hex(moal_handle *phandle, t_u8 *buf) * * @return The length of this log */ -static int -woal_dump_mlan_hex(moal_private *priv, t_u8 *buf) +static int woal_dump_mlan_hex(moal_private *priv, t_u8 *buf) { char *ptr = (char *)buf; int i; - mlan_debug_info *info = &(priv->phandle->debug_info); + mlan_debug_info *info = NULL; ENTER(); - if (!buf || !priv || woal_get_debug_info(priv, MOAL_IOCTL_WAIT, info)) { + if (!buf || !priv || !priv->phandle) { + PRINTM(MERROR, "buf priv or priv->phandle is null\n"); + LEAVE(); + return 0; + } + info = &(priv->phandle->debug_info); + if (woal_get_debug_info(priv, MOAL_IOCTL_WAIT, info)) { PRINTM(MMSG, "%s: can't retreive info\n", __func__); LEAVE(); return 0; @@ -7522,8 +7494,7 @@ woal_dump_mlan_hex(moal_private *priv, t_u8 *buf) * * @return N/A */ -void -woal_create_dump_dir(moal_handle *phandle, char *dir_buf, int buf_size) +void woal_create_dump_dir(moal_handle *phandle, char *dir_buf, int buf_size) { struct dentry *dentry; struct path path; @@ -7557,7 +7528,7 @@ woal_create_dump_dir(moal_handle *phandle, char *dir_buf, int buf_size) goto default_dir; } ret = vfs_mkdir(path.dentry->d_inode, dentry, 0777); -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) mutex_unlock(&path.dentry->d_inode->i_mutex); #else inode_unlock(path.dentry->d_inode); @@ -7591,9 +7562,8 @@ done: * * @return SUCCESS OR FAILURE */ -mlan_status -woal_save_dump_info_to_file(char *dir_name, char *file_name, t_u8 *buf, - t_u32 buf_len) +mlan_status woal_save_dump_info_to_file(char *dir_name, char *file_name, + t_u8 *buf, t_u32 buf_len) { mlan_status ret = MLAN_STATUS_SUCCESS; struct file *pfile = NULL; @@ -7657,8 +7627,7 @@ done: * * @return N/A */ -void -woal_dump_drv_info(moal_handle *phandle, t_u8 *dir_name) +void woal_dump_drv_info(moal_handle *phandle, t_u8 *dir_name) { int ret = 0; struct file *pfile = NULL; @@ -7693,6 +7662,7 @@ woal_dump_drv_info(moal_handle *phandle, t_u8 *dir_name) PRINTM(MMSG, "Create file_drv_info file failed\n"); goto done; } + #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) fs = get_fs(); set_fs(KERNEL_DS); @@ -7746,8 +7716,7 @@ done: * * @return N/A */ -void -woal_moal_debug_info(moal_private *priv, moal_handle *handle, u8 flag) +void woal_moal_debug_info(moal_private *priv, moal_handle *handle, u8 flag) { moal_handle *phandle = NULL; #ifdef USB @@ -7821,21 +7790,22 @@ woal_moal_debug_info(moal_private *priv, moal_handle *handle, u8 flag) if (priv && priv->netdev) { PRINTM(MERROR, "Media state = \"%s\"\n", - ((priv->media_connected == - MFALSE) ? "Disconnected" : "Connected")); + ((priv->media_connected == MFALSE) ? "Disconnected" : + "Connected")); PRINTM(MERROR, "carrier %s\n", ((netif_carrier_ok(priv->netdev)) ? "on" : "off")); #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 29) for (i = 0; i < (priv->netdev->num_tx_queues); i++) { PRINTM(MERROR, "tx queue %d: %s\n", i, - ((netif_tx_queue_stopped - (netdev_get_tx_queue(priv->netdev, i))) ? - "stopped" : "started")); + ((netif_tx_queue_stopped( + netdev_get_tx_queue(priv->netdev, i))) ? + "stopped" : + "started")); } #else PRINTM(MERROR, "tx queue %s\n", ((netif_queue_stopped(priv->netdev)) ? "stopped" : - "started")); + "started")); #endif } @@ -7850,6 +7820,7 @@ woal_moal_debug_info(moal_private *priv, moal_handle *handle, u8 flag) LEAVE(); return; } + #ifdef PCIE if (IS_PCIE(phandle->card_type)) { if (phandle->ops.reg_dbg && (drvdbg & (MREG_D | MFW_D))) @@ -7858,9 +7829,8 @@ woal_moal_debug_info(moal_private *priv, moal_handle *handle, u8 flag) #endif #ifdef SDIO if (IS_SD(phandle->card_type)) { - if (flag && - ((phandle->main_state == MOAL_END_MAIN_PROCESS) || - (phandle->main_state == MOAL_STATE_IDLE))) { + if (flag && ((phandle->main_state == MOAL_END_MAIN_PROCESS) || + (phandle->main_state == MOAL_STATE_IDLE))) { if (phandle->ops.reg_dbg && (drvdbg & (MREG_D | MFW_D))) phandle->ops.reg_dbg(phandle); } else { @@ -7891,8 +7861,7 @@ woal_moal_debug_info(moal_private *priv, moal_handle *handle, u8 flag) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_request_country_power_table(moal_private *priv, char *country) +mlan_status woal_request_country_power_table(moal_private *priv, char *country) { mlan_status ret = MLAN_STATUS_SUCCESS; moal_handle *handle = NULL; @@ -7929,8 +7898,8 @@ woal_request_country_power_table(moal_private *priv, char *country) last_slash = strrchr(file_path, '/'); if (last_slash) memset(last_slash + 1, 0, - sizeof(file_path) - 1 - (last_slash - - file_path)); + sizeof(file_path) - 1 - + (last_slash - file_path)); else memset(file_path, 0, sizeof(file_path)); } else { @@ -7940,7 +7909,7 @@ woal_request_country_power_table(moal_private *priv, char *country) if ((strlen(file_path) + strlen(country_name)) < (sizeof(file_path) - 1)) strncpy(file_path + strlen(file_path), country_name, - strlen(country_name)); + sizeof(file_path) - strlen(file_path)); else { PRINTM(MERROR, "file path buffer too small, fail to dnld power table\n"); @@ -7959,8 +7928,8 @@ woal_request_country_power_table(moal_private *priv, char *country) last_slash = strrchr(file_path, '/'); if (last_slash) memset(last_slash + 1, 0, - sizeof(file_path) - 1 - (last_slash - - file_path)); + sizeof(file_path) - 1 - + (last_slash - file_path)); else memset(file_path, 0, sizeof(file_path)); strncpy(file_path + strlen(file_path), country_name, @@ -7986,8 +7955,7 @@ woal_request_country_power_table(moal_private *priv, char *country) * * @return packets received */ -int -woal_netdev_poll_rx(struct napi_struct *napi, int budget) +int woal_netdev_poll_rx(struct napi_struct *napi, int budget) { moal_handle *handle = container_of(napi, moal_handle, napi_rx); t_u8 recv = budget; @@ -8012,8 +7980,7 @@ woal_netdev_poll_rx(struct napi_struct *napi, int budget) * * @return N/A */ -t_void -woal_evt_work_queue(struct work_struct *work) +t_void woal_evt_work_queue(struct work_struct *work) { moal_handle *handle = container_of(work, moal_handle, evt_work); struct woal_event *evt; @@ -8025,8 +7992,8 @@ woal_evt_work_queue(struct work_struct *work) } spin_lock_irqsave(&handle->evt_lock, flags); while (!list_empty(&handle->evt_queue)) { - evt = list_first_entry(&handle->evt_queue, - struct woal_event, link); + evt = list_first_entry(&handle->evt_queue, struct woal_event, + link); list_del(&evt->link); spin_unlock_irqrestore(&handle->evt_lock, flags); switch (evt->type) { @@ -8043,8 +8010,8 @@ woal_evt_work_queue(struct work_struct *work) case WOAL_EVENT_BGSCAN_STOP: #ifdef STA_CFG80211 #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) - woal_cfg80211_notify_sched_scan_stop((moal_private *) - evt->priv); + woal_cfg80211_notify_sched_scan_stop( + (moal_private *)evt->priv); #endif #endif break; @@ -8055,7 +8022,6 @@ woal_evt_work_queue(struct work_struct *work) spin_unlock_irqrestore(&handle->evt_lock, flags); LEAVE(); } - /** * @brief This workqueue function handles rx_process * @@ -8063,8 +8029,7 @@ woal_evt_work_queue(struct work_struct *work) * * @return N/A */ -t_void -woal_rx_work_queue(struct work_struct *work) +t_void woal_rx_work_queue(struct work_struct *work) { moal_handle *handle = container_of(work, moal_handle, rx_work); #ifdef STA_CFG80211 @@ -8092,15 +8057,15 @@ woal_rx_work_queue(struct work_struct *work) woal_get_monotonic_time(&tstamp); end_timeval.time_sec = (t_u32)tstamp.tv_sec; end_timeval.time_usec = (t_u32)tstamp.tv_usec; - handle->rx_time += - (t_u64)(timeval_to_usec(end_timeval) - - timeval_to_usec(start_timeval)); + handle->rx_time += (t_u64)(timeval_to_usec(end_timeval) - + timeval_to_usec(start_timeval)); PRINTM(MINFO, "%s : start_timeval=%d:%d end_timeval=%d:%d inter=%llu rx_time=%llu\n", __func__, start_timeval.time_sec, start_timeval.time_usec, end_timeval.time_sec, end_timeval.time_usec, (t_u64)(timeval_to_usec(end_timeval) - - timeval_to_usec(start_timeval)), handle->rx_time); + timeval_to_usec(start_timeval)), + handle->rx_time); LEAVE(); } @@ -8111,15 +8076,14 @@ woal_rx_work_queue(struct work_struct *work) * * @return N/A */ -t_void -woal_main_work_queue(struct work_struct *work) +t_void woal_main_work_queue(struct work_struct *work) { moal_handle *handle = container_of(work, moal_handle, main_work); #ifdef USB struct usb_card_rec *cardp = (struct usb_card_rec *)handle->card; #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) - struct sched_param sp = {.sched_priority = wq_sched_prio }; + struct sched_param sp = {.sched_priority = wq_sched_prio}; #endif ENTER(); @@ -8140,7 +8104,8 @@ woal_main_work_queue(struct work_struct *work) return; } #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36) - /* Change the priority and scheduling policy of main work queue */ + /* Change the priority and scheduling policy of main work queue + */ if ((handle->params.wq_sched_prio != current->rt_priority) || (handle->params.wq_sched_policy != current->policy)) { PRINTM(MMSG, @@ -8180,9 +8145,8 @@ woal_main_work_queue(struct work_struct *work) * * @return A pointer to moal_handle structure */ -moal_handle * -woal_add_card(void *card, struct device *dev, moal_if_ops * if_ops, - t_u16 card_type) +moal_handle *woal_add_card(void *card, struct device *dev, moal_if_ops *if_ops, + t_u16 card_type) { moal_handle *handle = NULL; mlan_status status = MLAN_STATUS_SUCCESS; @@ -8242,21 +8206,22 @@ woal_add_card(void *card, struct device *dev, moal_if_ops * if_ops, #ifdef MFG_CMD_SUPPORT && handle->params.mfg_mode != MLAN_INIT_PARA_ENABLED #endif - ) { + ) { t_u8 temp[20]; t_u8 len = strlen(handle->params.mac_addr) + 1; if (len < sizeof(temp)) { moal_memcpy_ext(handle, temp, handle->params.mac_addr, len, sizeof(temp)); handle->set_mac_addr = 1; - /* note: the following function overwrites the temp buffer */ + /* note: the following function overwrites the + * temp buffer */ woal_mac2u8(handle->mac_addr, temp); } } /* Get card info */ woal_get_card_info(handle); - /** Get card revision */ + /** Get card revision */ handle->ops.get_fw_name(handle); #ifdef STA_SUPPORT handle->scan_pending_on_block = MFALSE; @@ -8278,9 +8243,8 @@ woal_add_card(void *card, struct device *dev, moal_if_ops * if_ops, handle->nl_sk = netlink_kernel_create(netlink_num, NULL); #else #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22) - handle->nl_sk = - netlink_kernel_create(netlink_num, NL_MULTICAST_GROUP, - NULL, THIS_MODULE); + handle->nl_sk = netlink_kernel_create( + netlink_num, NL_MULTICAST_GROUP, NULL, THIS_MODULE); #else #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) handle->nl_sk = @@ -8288,15 +8252,13 @@ woal_add_card(void *card, struct device *dev, moal_if_ops * if_ops, NULL, NULL, THIS_MODULE); #else #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0) - handle->nl_sk = - netlink_kernel_create(&init_net, netlink_num, - NL_MULTICAST_GROUP, NULL, NULL, - THIS_MODULE); + handle->nl_sk = netlink_kernel_create(&init_net, netlink_num, + NL_MULTICAST_GROUP, NULL, + NULL, THIS_MODULE); #else #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0) - handle->nl_sk = - netlink_kernel_create(&init_net, netlink_num, - THIS_MODULE, &cfg); + handle->nl_sk = netlink_kernel_create(&init_net, netlink_num, + THIS_MODULE, &cfg); #else handle->nl_sk = netlink_kernel_create(&init_net, netlink_num, &cfg); @@ -8326,9 +8288,8 @@ woal_add_card(void *card, struct device *dev, moal_if_ops * if_ops, handle->workqueue = create_workqueue("MOAL_WORKQ"); #else #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) - handle->workqueue = - alloc_workqueue("MOAL_WORK_QUEUE", - WQ_HIGHPRI | WQ_MEM_RECLAIM | WQ_UNBOUND, 1); + handle->workqueue = alloc_workqueue( + "MOAL_WORK_QUEUE", WQ_HIGHPRI | WQ_MEM_RECLAIM | WQ_UNBOUND, 1); #else handle->workqueue = create_workqueue("MOAL_WORK_QUEUE"); #endif @@ -8375,10 +8336,9 @@ woal_add_card(void *card, struct device *dev, moal_if_ops * if_ops, handle->rx_workqueue = create_workqueue("MOAL_RX_WORKQ"); #else #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) - handle->rx_workqueue = - alloc_workqueue("MOAL_RX_WORK_QUEUE", - WQ_HIGHPRI | WQ_MEM_RECLAIM | - WQ_UNBOUND, 1); + handle->rx_workqueue = alloc_workqueue( + "MOAL_RX_WORK_QUEUE", + WQ_HIGHPRI | WQ_MEM_RECLAIM | WQ_UNBOUND, 1); #else handle->rx_workqueue = create_workqueue("MOAL_RX_WORK_QUEUE"); #endif @@ -8389,7 +8349,7 @@ woal_add_card(void *card, struct device *dev, moal_if_ops * if_ops, } MLAN_INIT_WORK(&handle->rx_work, woal_rx_work_queue); } -#define NAPI_BUDGET 64 +#define NAPI_BUDGET 64 if (moal_extflg_isset(handle, EXT_NAPI)) { init_dummy_netdev(&handle->napi_dev); netif_napi_add(&handle->napi_dev, &handle->napi_rx, @@ -8400,16 +8360,16 @@ woal_add_card(void *card, struct device *dev, moal_if_ops * if_ops, #ifdef REASSOCIATION PRINTM(MINFO, "Starting re-association thread...\n"); handle->reassoc_thread.handle = handle; - woal_create_thread(woal_reassociation_thread, - &handle->reassoc_thread, "woal_reassoc_service"); + woal_create_thread(woal_reassociation_thread, &handle->reassoc_thread, + "woal_reassoc_service"); while (!handle->reassoc_thread.pid) woal_sched_timeout(2); #endif /* REASSOCIATION */ /* Register the device. Fill up the private data structure with - * relevant information from the card and request for the required - * IRQ. + * relevant information from the card and request for the + * required IRQ. */ if (handle->ops.register_dev(handle) != MLAN_STATUS_SUCCESS) { PRINTM(MFATAL, "Failed to register wlan device!\n"); @@ -8429,6 +8389,7 @@ woal_add_card(void *card, struct device *dev, moal_if_ops * if_ops, PRINTM(MFATAL, "Firmware Init Failed\n"); goto err_init_fw; } + #ifdef SD8887 if (IS_SD8887(handle->card_type)) { union { @@ -8496,8 +8457,7 @@ exit_sem_err: * * @return MLAN_STATUS_SUCCESS */ -mlan_status -woal_remove_card(void *card) +mlan_status woal_remove_card(void *card) { moal_handle *handle = NULL; moal_private *priv = NULL; @@ -8523,7 +8483,7 @@ woal_remove_card(void *card) #if defined(USB) && handle->boot_state == USB_FW_READY #endif - ) { + ) { if (handle->params.fw_name) { kfree(handle->params.fw_name); handle->params.fw_name = NULL; @@ -8570,14 +8530,16 @@ woal_remove_card(void *card) mlan_unregister(handle->pmlan_adapter); handle->pmlan_adapter = NULL; } - if (atomic_read(&handle->rx_pending) || atomic_read(&handle->tx_pending) - || atomic_read(&handle->ioctl_pending)) { + if (atomic_read(&handle->rx_pending) || + atomic_read(&handle->tx_pending) || + atomic_read(&handle->ioctl_pending)) { PRINTM(MERROR, "ERR: rx_pending=%d,tx_pending=%d,ioctl_pending=%d\n", atomic_read(&handle->rx_pending), atomic_read(&handle->tx_pending), atomic_read(&handle->ioctl_pending)); } + #if defined(STA_CFG80211) || defined(UAP_CFG80211) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) if (handle->is_remain_timer_set) { @@ -8663,10 +8625,10 @@ exit_sem_err: * @param handle A pointer to moal_handle structure * @param mode new drv_mode to switch. * - * @return MLAN_STATUS_SUCCESS /MLAN_STATUS_FAILURE /MLAN_STATUS_PENDING + * @return MLAN_STATUS_SUCCESS /MLAN_STATUS_FAILURE + * /MLAN_STATUS_PENDING */ -mlan_status -woal_switch_drv_mode(moal_handle *handle, t_u32 mode) +mlan_status woal_switch_drv_mode(moal_handle *handle, t_u32 mode) { unsigned int i; mlan_status status = MLAN_STATUS_SUCCESS; @@ -8709,8 +8671,9 @@ woal_switch_drv_mode(moal_handle *handle, t_u32 mode) mlan_unregister(handle->pmlan_adapter); handle->pmlan_adapter = NULL; } - if (atomic_read(&handle->rx_pending) || atomic_read(&handle->tx_pending) - || atomic_read(&handle->ioctl_pending)) { + if (atomic_read(&handle->rx_pending) || + atomic_read(&handle->tx_pending) || + atomic_read(&handle->ioctl_pending)) { PRINTM(MERROR, "ERR: rx_pending=%d,tx_pending=%d,ioctl_pending=%d\n", atomic_read(&handle->rx_pending), @@ -8771,8 +8734,7 @@ exit_sem_err: * * @return 0--success, otherwise failure */ -static int -woal_reset_and_reload_fw(moal_handle *handle) +static int woal_reset_and_reload_fw(moal_handle *handle) { int ret = 0, tries = 0; t_u32 value = 1; @@ -8783,7 +8745,7 @@ woal_reset_and_reload_fw(moal_handle *handle) if (!IS_SD9098(handle->card_type) && !IS_SD9097(handle->card_type)) { mlan_pm_wakeup_card(handle->pmlan_adapter, MTRUE); - /** wait SOC fully wake up */ + /** wait SOC fully wake up */ for (tries = 0; tries < FW_POLL_TRIES; ++tries) { ret = handle->ops.write_reg(handle, reset_reg, 0xba); if (ret == MLAN_STATUS_SUCCESS) { @@ -8844,8 +8806,7 @@ done: * * @return 0--success, otherwise failure */ -static int -woal_reload_fw(moal_handle *handle) +static int woal_reload_fw(moal_handle *handle) { int ret = 0; ENTER(); @@ -8861,12 +8822,11 @@ done: return ret; } -void -woal_pre_reset(moal_handle *handle) +void woal_pre_reset(moal_handle *handle) { int intf_num; ENTER(); - /** detach network interface */ + /** detach network interface */ for (intf_num = 0; intf_num < handle->priv_num; intf_num++) { woal_stop_queue(handle->priv[intf_num]->netdev); netif_device_detach(handle->priv[intf_num]->netdev); @@ -8880,8 +8840,7 @@ woal_pre_reset(moal_handle *handle) LEAVE(); } -void -woal_post_reset(moal_handle *handle) +void woal_post_reset(moal_handle *handle) { mlan_ioctl_req *req = NULL; mlan_ds_misc_cfg *misc = NULL; @@ -8895,7 +8854,7 @@ woal_post_reset(moal_handle *handle) #endif /* WIFI_DIRECT_SUPPORT */ ENTER(); - /** un-block IOCTL */ + /** un-block IOCTL */ handle->fw_reload = MFALSE; handle->driver_status = MFALSE; /* Restart the firmware */ @@ -8958,8 +8917,7 @@ done: * * @return 0--success, otherwise failure */ -void -woal_request_fw_reload(moal_handle *phandle, t_u8 mode) +void woal_request_fw_reload(moal_handle *phandle, t_u8 mode) { int ret = 0; @@ -8981,7 +8939,7 @@ woal_request_fw_reload(moal_handle *phandle, t_u8 mode) } #endif - //handle-> mac0 , ref_handle->second mac + // handle-> mac0 , ref_handle->second mac if (handle->pref_mac) { if (phandle->second_mac) { handle = (moal_handle *)handle->pref_mac; @@ -8991,7 +8949,7 @@ woal_request_fw_reload(moal_handle *phandle, t_u8 mode) } ref_handle->driver_status = MTRUE; } - /** start block IOCTL */ + /** start block IOCTL */ handle->driver_status = MTRUE; if (mode == FW_RELOAD_WITH_EMULATION) { @@ -9031,8 +8989,7 @@ done: } /** Register to bus driver function */ -static mlan_status -woal_bus_register(void) +static mlan_status woal_bus_register(void) { mlan_status ret = MLAN_STATUS_SUCCESS; #ifdef SDIO @@ -9071,9 +9028,8 @@ out: return ret; } - /** Unregister from bus driver function */ -static void -woal_bus_unregister(void) +/** Unregister from bus driver function */ +static void woal_bus_unregister(void) { #ifdef SDIO #ifdef SDIO_MMC @@ -9098,8 +9054,7 @@ woal_bus_unregister(void) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static int -woal_init_module(void) +static int woal_init_module(void) { int ret = (int)MLAN_STATUS_SUCCESS; int index = 0; @@ -9131,9 +9086,9 @@ woal_init_module(void) hang_workqueue = create_workqueue("MOAL_HANG_WORKQ"); #else #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) - hang_workqueue = alloc_workqueue("MOAL_HANG_WORK_QUEUE", - WQ_HIGHPRI | WQ_MEM_RECLAIM | - WQ_UNBOUND, 1); + hang_workqueue = + alloc_workqueue("MOAL_HANG_WORK_QUEUE", + WQ_HIGHPRI | WQ_MEM_RECLAIM | WQ_UNBOUND, 1); #else hang_workqueue = create_workqueue("MOAL_HANG_WORK_QUEUE"); #endif @@ -9156,8 +9111,7 @@ woal_init_module(void) * * @return N/A */ -static void -woal_cleanup_module(void) +static void woal_cleanup_module(void) { moal_handle *handle = NULL; int index = 0; @@ -9182,7 +9136,8 @@ woal_cleanup_module(void) #ifdef USB #ifdef CONFIG_USB_SUSPEND - if (IS_USB(handle->card_type) && handle->is_suspended == MTRUE) { + if (IS_USB(handle->card_type) && + handle->is_suspended == MTRUE) { woal_exit_usb_suspend(handle); } #endif /* CONFIG_USB_SUSPEND */ @@ -9192,9 +9147,9 @@ woal_cleanup_module(void) #ifdef SDIO_SUSPEND_RESUME #ifdef MMC_PM_KEEP_POWER if (handle->is_suspended == MTRUE) { - woal_sdio_resume(& - (((struct sdio_mmc_card *)handle-> - card)->func)->dev); + woal_sdio_resume( + &(((struct sdio_mmc_card *)handle->card)->func) + ->dev); } #endif /* MMC_PM_KEEP_POWER */ #endif /* SDIO_SUSPEND_RESUME */ @@ -9202,7 +9157,8 @@ woal_cleanup_module(void) for (i = 0; i < handle->priv_num; i++) { #ifdef STA_SUPPORT - if (GET_BSS_ROLE(handle->priv[i]) == MLAN_BSS_ROLE_STA) { + if (GET_BSS_ROLE(handle->priv[i]) == + MLAN_BSS_ROLE_STA) { if (handle->priv[i]->media_connected == MTRUE) { woal_disconnect(handle->priv[i], MOAL_IOCTL_WAIT_TIMEOUT, @@ -9214,30 +9170,30 @@ woal_cleanup_module(void) } } #ifdef STA_CFG80211 - if (IS_STA_CFG80211 - (handle->params.cfg80211_wext) && + if (IS_STA_CFG80211( + handle->params.cfg80211_wext) && (handle->priv[i]->bss_type == MLAN_BSS_TYPE_STA)) woal_clear_conn_params(handle->priv[i]); spin_lock_irqsave(&handle->scan_req_lock, flags); - if (IS_STA_CFG80211 - (handle->params.cfg80211_wext) && + if (IS_STA_CFG80211( + handle->params.cfg80211_wext) && handle->scan_request) { - woal_cfg80211_scan_done(handle-> - scan_request, - MTRUE); + woal_cfg80211_scan_done( + handle->scan_request, MTRUE); handle->scan_request = NULL; handle->scan_priv = NULL; } spin_unlock_irqrestore(&handle->scan_req_lock, flags); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) - if (IS_STA_CFG80211 - (handle->params.cfg80211_wext) && + if (IS_STA_CFG80211( + handle->params.cfg80211_wext) && handle->priv[i]->sched_scanning) { - woal_stop_bg_scan(handle->priv[i], - MOAL_IOCTL_WAIT_TIMEOUT); + woal_stop_bg_scan( + handle->priv[i], + MOAL_IOCTL_WAIT_TIMEOUT); if (handle->ioctl_timeout) { woal_ioctl_timeout(handle); goto exit; @@ -9245,16 +9201,13 @@ woal_cleanup_module(void) handle->priv[i]->bg_scan_start = MFALSE; handle->priv[i]->bg_scan_reported = MFALSE; - cfg80211_sched_scan_stopped(handle-> - priv[i]-> - wdev->wiphy + cfg80211_sched_scan_stopped( + handle->priv[i]->wdev->wiphy #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - , - handle-> - priv[i]-> - bg_scan_reqid + , + handle->priv[i]->bg_scan_reqid #endif - ); + ); handle->priv[i]->sched_scanning = MFALSE; } @@ -9263,18 +9216,21 @@ woal_cleanup_module(void) } #endif #ifdef UAP_SUPPORT - if (GET_BSS_ROLE(handle->priv[i]) == MLAN_BSS_ROLE_UAP) { + if (GET_BSS_ROLE(handle->priv[i]) == + MLAN_BSS_ROLE_UAP) { #ifdef MFG_CMD_SUPPORT if (handle->params.mfg_mode != MLAN_INIT_PARA_ENABLED) #endif + { woal_disconnect(handle->priv[i], MOAL_IOCTL_WAIT_TIMEOUT, NULL, DEF_DEAUTH_REASON_CODE); - if (handle->ioctl_timeout) { - woal_ioctl_timeout(handle); - goto exit; + if (handle->ioctl_timeout) { + woal_ioctl_timeout(handle); + goto exit; + } } } #endif @@ -9287,25 +9243,28 @@ woal_cleanup_module(void) } woal_flush_tx_stat_queue(handle->priv[i]); #endif - } #ifdef MFG_CMD_SUPPORT if (handle->params.mfg_mode != MLAN_INIT_PARA_ENABLED) #endif - woal_set_deep_sleep(woal_get_priv - (handle, MLAN_BSS_ROLE_ANY), + { + woal_set_deep_sleep(woal_get_priv(handle, + MLAN_BSS_ROLE_ANY), MOAL_IOCTL_WAIT_TIMEOUT, MFALSE, 0); + } #ifdef MFG_CMD_SUPPORT if (handle->params.mfg_mode != MLAN_INIT_PARA_ENABLED) #endif - woal_shutdown_fw(woal_get_priv - (handle, MLAN_BSS_ROLE_ANY), + { + woal_shutdown_fw(woal_get_priv(handle, + MLAN_BSS_ROLE_ANY), MOAL_IOCTL_WAIT_TIMEOUT); - if (handle->ioctl_timeout) { - woal_ioctl_timeout(handle); - goto exit; + if (handle->ioctl_timeout) { + woal_ioctl_timeout(handle); + goto exit; + } } } @@ -9333,8 +9292,7 @@ exit_sem_err: * @param str buffer for mfg_mode * @return N/A */ -static int __init -mfg_mode_setup(char *str) +static int __init mfg_mode_setup(char *str) { int val = -1; get_option(&str, &val); @@ -9343,7 +9301,6 @@ mfg_mode_setup(char *str) PRINTM(MMSG, "mfg_mode=%d\n", mfg_mode); return 1; } - __setup("mfg_mode=", mfg_mode_setup); #endif #endif diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_main.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_main.h index 8a9abf164d47..e25e30288d6e 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_main.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_main.h @@ -1,24 +1,24 @@ /** @file moal_main.h - * - * @brief This file contains wlan driver specific defines etc. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains wlan driver specific defines etc. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /******************************************************** Change log: @@ -34,75 +34,75 @@ Change log: #endif /* Linux header files */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) -#include -#include +#include +#include #endif -#include +#include #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18) -#include +#include #endif #ifdef USB #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -#include +#include #endif -#include +#include #endif /* USB */ /* ASM files */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) -#include +#include #else -#include +#include #endif -#include -#include -#include -#include +#include +#include +#include +#include #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) -#include +#include #else -#include +#include #endif -#include +#include /* Net header files */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include +#include #ifdef ANDROID_KERNEL #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) @@ -113,34 +113,34 @@ Change log: #endif #endif -#include "mlan.h" -#include "moal_shim.h" +#include "mlan.h" +#include "moal_shim.h" /* Wireless header */ #if defined(STA_CFG80211) || defined(UAP_CFG80211) -#include -#include -#include +#include +#include +#include #endif #if defined(STA_WEXT) || defined(UAP_WEXT) -#include -#include -#include "moal_wext.h" +#include +#include +#include "moal_wext.h" #endif #ifdef STA_WEXT -#include "moal_priv.h" +#include "moal_priv.h" #endif #ifndef MIN /** Find minimum */ -#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define MIN(a, b) ((a) < (b) ? (a) : (b)) #endif /** Find maximum */ #ifndef MAX -#define MAX(a, b) ((a) > (b) ? (a) : (b)) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) #endif -#define COMPAT_VERSION_CODE KERNEL_VERSION( 0, 0, 0) +#define COMPAT_VERSION_CODE KERNEL_VERSION(0, 0, 0) #define CFG80211_VERSION_CODE MAX(LINUX_VERSION_CODE, COMPAT_VERSION_CODE) /** @@ -195,50 +195,50 @@ Change log: * Linux kernel later 4.7 use new macro */ #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) -#define ieee80211_band nl80211_band -#define IEEE80211_BAND_2GHZ NL80211_BAND_2GHZ -#define IEEE80211_BAND_5GHZ NL80211_BAND_5GHZ -#define IEEE80211_NUM_BANDS NUM_NL80211_BANDS +#define ieee80211_band nl80211_band +#define IEEE80211_BAND_2GHZ NL80211_BAND_2GHZ +#define IEEE80211_BAND_5GHZ NL80211_BAND_5GHZ +#define IEEE80211_NUM_BANDS NUM_NL80211_BANDS #endif /** -* interface name -*/ -#define default_mlan_name "mlan%d" -#define default_uap_name "uap%d" -#define default_wfd_name "wfd%d" -#define default_nan_name "nan%d" -#define default_mpl_name "mpl%d" -#define default_11p_name "ocb%d" -#define mwiphy_name "mwiphy%d" + * interface name + */ +#define default_mlan_name "mlan%d" +#define default_uap_name "uap%d" +#define default_wfd_name "wfd%d" +#define default_nan_name "nan%d" +#define default_mpl_name "mpl%d" +#define default_11p_name "ocb%d" +#define mwiphy_name "mwiphy%d" /** Define BOOLEAN */ typedef t_u8 BOOLEAN; #define INTF_CARDTYPE "---------%s-MX" -#define KERN_VERSION "4X" +#define KERN_VERSION "4X" -#define V15 "15" -#define V16 "16" -#define V17 "17" +#define V15 "15" +#define V16 "16" +#define V17 "17" /** Chip Magic Value */ -#define CHIP_MAGIC_VALUE 0x24 +#define CHIP_MAGIC_VALUE 0x24 /** card type SD_UART */ -#define CARD_TYPE_SD_UART 0 +#define CARD_TYPE_SD_UART 0 /** card type SD_SD */ -#define CARD_TYPE_SD_SD 1 +#define CARD_TYPE_SD_SD 1 /** card type PCIE_PCIE */ -#define CARD_TYPE_PCIE_PCIE 2 +#define CARD_TYPE_PCIE_PCIE 2 /** card type PCIE_UART */ -#define CARD_TYPE_PCIE_UART 3 +#define CARD_TYPE_PCIE_UART 3 /** card type USB_UART */ -#define CARD_TYPE_USB_UART 4 +#define CARD_TYPE_USB_UART 4 /** card type USB_USB */ -#define CARD_TYPE_USB_USB 6 +#define CARD_TYPE_USB_USB 6 /** card type PCIE_USB */ -#define CARD_TYPE_PCIE_USB 7 +#define CARD_TYPE_PCIE_USB 7 /** Driver version */ extern char driver_version[]; @@ -259,33 +259,27 @@ typedef enum _MOAL_HARDWARE_STATUS { } MOAL_HARDWARE_STATUS; /** fw cap info 11p */ -#define FW_CAPINFO_80211P MBIT(24) +#define FW_CAPINFO_80211P MBIT(24) /** fw cap info disable nan */ -#define FW_CAPINFO_DISABLE_NAN MBIT(29) +#define FW_CAPINFO_DISABLE_NAN MBIT(29) /** fw cap info BGA */ -#define FW_CAPINFO_80211BGA (MBIT(8)|MBIT(9)|MBIT(10)) +#define FW_CAPINFO_80211BGA (MBIT(8) | MBIT(9) | MBIT(10)) /** moal_wait_option */ -enum { - MOAL_NO_WAIT, - MOAL_IOCTL_WAIT, - MOAL_IOCTL_WAIT_TIMEOUT -}; +enum { MOAL_NO_WAIT, MOAL_IOCTL_WAIT, MOAL_IOCTL_WAIT_TIMEOUT }; /** moal_main_state */ -enum { - MOAL_STATE_IDLE, - MOAL_RECV_INT, - MOAL_ENTER_WORK_QUEUE, - MOAL_START_MAIN_PROCESS, - MOAL_END_MAIN_PROCESS -}; +enum { MOAL_STATE_IDLE, + MOAL_RECV_INT, + MOAL_ENTER_WORK_QUEUE, + MOAL_START_MAIN_PROCESS, + MOAL_END_MAIN_PROCESS }; /** HostCmd_Header */ typedef struct _HostCmd_Header { - /** Command */ + /** Command */ t_u16 command; - /** Size */ + /** Size */ t_u16 size; } HostCmd_Header; @@ -298,7 +292,7 @@ typedef struct _moal_drv_timer { /** Timer list */ struct timer_list tl; /** Timer function */ - void (*timer_function) (void *context); + void (*timer_function)(void *context); /** Timer function context */ void *function_context; /** Time period */ @@ -317,13 +311,11 @@ typedef struct _moal_drv_timer { * @return N/A */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) -static inline void -woal_timer_handler(struct timer_list *t) +static inline void woal_timer_handler(struct timer_list *t) { pmoal_drv_timer timer = from_timer(timer, t, tl); #else -static inline void -woal_timer_handler(unsigned long fcontext) +static inline void woal_timer_handler(unsigned long fcontext) { pmoal_drv_timer timer = (pmoal_drv_timer)fcontext; #endif @@ -348,10 +340,9 @@ woal_timer_handler(unsigned long fcontext) * * @return N/A */ -static inline void -woal_initialize_timer(pmoal_drv_timer timer, - void (*TimerFunction) (void *context), - void *FunctionContext) +static inline void woal_initialize_timer(pmoal_drv_timer timer, + void (*TimerFunction)(void *context), + void *FunctionContext) { /* First, setup the timer to trigger the wlan_timer_handler proxy */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) @@ -378,8 +369,8 @@ woal_initialize_timer(pmoal_drv_timer timer, * * @return N/A */ -static inline void -woal_mod_timer(pmoal_drv_timer timer, t_u32 millisecondperiod) +static inline void woal_mod_timer(pmoal_drv_timer timer, + t_u32 millisecondperiod) { timer->time_period = millisecondperiod; mod_timer(&timer->tl, jiffies + (millisecondperiod * HZ) / 1000); @@ -393,8 +384,7 @@ woal_mod_timer(pmoal_drv_timer timer, t_u32 millisecondperiod) * * @return N/A */ -static inline void -woal_cancel_timer(moal_drv_timer *timer) +static inline void woal_cancel_timer(moal_drv_timer *timer) { if (timer->timer_is_periodic || in_atomic() || irqs_disabled()) del_timer(&timer->tl); @@ -409,17 +399,17 @@ woal_cancel_timer(moal_drv_timer *timer) * OS Thread Specific */ -#include +#include /** Kernel thread structure */ typedef struct _moal_thread { - /** Task control structrue */ + /** Task control structrue */ struct task_struct *task; - /** Pointer to wait_queue_head */ + /** Pointer to wait_queue_head */ wait_queue_head_t wait_q; - /** PID */ + /** PID */ pid_t pid; - /** Pointer to moal_handle */ + /** Pointer to moal_handle */ void *handle; } moal_thread; @@ -429,13 +419,12 @@ typedef struct _moal_thread { * @param thr Thread structure * @return N/A */ -static inline void -woal_activate_thread(moal_thread *thr) +static inline void woal_activate_thread(moal_thread *thr) { - /** Initialize the wait queue */ + /** Initialize the wait queue */ init_waitqueue_head(&thr->wait_q); - /** Record the thread pid */ + /** Record the thread pid */ thr->pid = current->pid; } @@ -445,8 +434,7 @@ woal_activate_thread(moal_thread *thr) * @param thr Thread structure * @return N/A */ -static inline void -woal_deactivate_thread(moal_thread *thr) +static inline void woal_deactivate_thread(moal_thread *thr) { /* Reset the pid */ thr->pid = 0; @@ -460,8 +448,8 @@ woal_deactivate_thread(moal_thread *thr) * @param name Thread name * @return N/A */ -static inline void -woal_create_thread(int (*threadfunc) (void *), moal_thread *thr, char *name) +static inline void woal_create_thread(int (*threadfunc)(void *), + moal_thread *thr, char *name) { /* Create and run the thread */ thr->task = kthread_run(threadfunc, thr, "%s", name); @@ -477,18 +465,21 @@ woal_create_thread(int (*threadfunc) (void *), moal_thread *thr, char *name) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) /** Work_queue work initialization */ -#define MLAN_INIT_WORK(_work, _fun) INIT_WORK(_work, ((void (*)(void *))_fun), _work) +#define MLAN_INIT_WORK(_work, _fun) \ + INIT_WORK(_work, ((void (*)(void *))_fun), _work) /** Work_queue delayed work initialization */ -#define MLAN_INIT_DELAYED_WORK(_work, _fun) INIT_WORK(_work, ((void (*)(void *))_fun), _work) +#define MLAN_INIT_DELAYED_WORK(_work, _fun) \ + INIT_WORK(_work, ((void (*)(void *))_fun), _work) /** Work_queue container parameter */ -#define MLAN_DELAYED_CONTAINER_OF(_ptr, _type, _m) container_of(_ptr, _type, _m) +#define MLAN_DELAYED_CONTAINER_OF(_ptr, _type, _m) container_of(_ptr, _type, _m) #else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) */ /** Work_queue work initialization */ -#define MLAN_INIT_WORK INIT_WORK +#define MLAN_INIT_WORK INIT_WORK /** Work_queue delayed work initialization */ -#define MLAN_INIT_DELAYED_WORK INIT_DELAYED_WORK +#define MLAN_INIT_DELAYED_WORK INIT_DELAYED_WORK /** Work_queue container parameter */ -#define MLAN_DELAYED_CONTAINER_OF(_ptr, _type, _m) container_of(_ptr, _type, _m.work) +#define MLAN_DELAYED_CONTAINER_OF(_ptr, _type, _m) \ + container_of(_ptr, _type, _m.work) #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) */ /** @@ -498,8 +489,7 @@ woal_create_thread(int (*threadfunc) (void *), moal_thread *thr, char *name) * * @return N/A */ -static inline void -woal_sched_timeout(t_u32 millisec) +static inline void woal_sched_timeout(t_u32 millisec) { set_current_state(TASK_INTERRUPTIBLE); @@ -507,19 +497,18 @@ woal_sched_timeout(t_u32 millisec) } #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) -#define IN6PTON_XDIGIT 0x00010000 -#define IN6PTON_DIGIT 0x00020000 -#define IN6PTON_COLON_MASK 0x00700000 -#define IN6PTON_COLON_1 0x00100000 /* single : requested */ -#define IN6PTON_COLON_2 0x00200000 /* second : requested */ -#define IN6PTON_COLON_1_2 0x00400000 /* :: requested */ -#define IN6PTON_DOT 0x00800000 /* . */ -#define IN6PTON_DELIM 0x10000000 -#define IN6PTON_NULL 0x20000000 /* first/tail */ -#define IN6PTON_UNKNOWN 0x40000000 +#define IN6PTON_XDIGIT 0x00010000 +#define IN6PTON_DIGIT 0x00020000 +#define IN6PTON_COLON_MASK 0x00700000 +#define IN6PTON_COLON_1 0x00100000 /* single : requested */ +#define IN6PTON_COLON_2 0x00200000 /* second : requested */ +#define IN6PTON_COLON_1_2 0x00400000 /* :: requested */ +#define IN6PTON_DOT 0x00800000 /* . */ +#define IN6PTON_DELIM 0x10000000 +#define IN6PTON_NULL 0x20000000 /* first/tail */ +#define IN6PTON_UNKNOWN 0x40000000 -static inline int -xdigit2bin(char c, int delim) +static inline int xdigit2bin(char c, int delim) { if (c == delim || c == '\0') return IN6PTON_DELIM; @@ -538,8 +527,8 @@ xdigit2bin(char c, int delim) return IN6PTON_UNKNOWN; } -static inline int -in4_pton(const char *src, int srclen, u8 *dst, int delim, const char **end) +static inline int in4_pton(const char *src, int srclen, u8 *dst, int delim, + const char **end) { const char *s; u8 *d; @@ -556,10 +545,8 @@ in4_pton(const char *src, int srclen, u8 *dst, int delim, const char **end) while (1) { int c; c = xdigit2bin(srclen > 0 ? *s : '\0', delim); - if (! - (c & - (IN6PTON_DIGIT | IN6PTON_DOT | IN6PTON_DELIM | - IN6PTON_COLON_MASK))) { + if (!(c & (IN6PTON_DIGIT | IN6PTON_DOT | IN6PTON_DELIM | + IN6PTON_COLON_MASK))) { goto out; } if (c & (IN6PTON_DOT | IN6PTON_DELIM | IN6PTON_COLON_MASK)) { @@ -578,7 +565,7 @@ in4_pton(const char *src, int srclen, u8 *dst, int delim, const char **end) w = (w * 10) + c; if ((w & 0xffff) > 255) goto out; -cont: + cont: if (i >= 4) goto out; s++; @@ -598,39 +585,39 @@ out: #endif #ifndef __ATTRIB_PACK__ -#define __ATTRIB_PACK__ __attribute__ ((packed)) +#define __ATTRIB_PACK__ __attribute__((packed)) #endif /** Get module */ -#define MODULE_GET try_module_get(THIS_MODULE) +#define MODULE_GET try_module_get(THIS_MODULE) /** Put module */ -#define MODULE_PUT module_put(THIS_MODULE) +#define MODULE_PUT module_put(THIS_MODULE) #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) /** Initialize semaphore */ -#define MOAL_INIT_SEMAPHORE(x) init_MUTEX(x) +#define MOAL_INIT_SEMAPHORE(x) init_MUTEX(x) /** Initialize semaphore */ -#define MOAL_INIT_SEMAPHORE_LOCKED(x) init_MUTEX_LOCKED(x) +#define MOAL_INIT_SEMAPHORE_LOCKED(x) init_MUTEX_LOCKED(x) #else /** Initialize semaphore */ -#define MOAL_INIT_SEMAPHORE(x) sema_init(x, 1) +#define MOAL_INIT_SEMAPHORE(x) sema_init(x, 1) /** Initialize semaphore */ -#define MOAL_INIT_SEMAPHORE_LOCKED(x) sema_init(x, 0) +#define MOAL_INIT_SEMAPHORE_LOCKED(x) sema_init(x, 0) #endif /** Acquire semaphore and with blocking */ -#define MOAL_ACQ_SEMAPHORE_BLOCK(x) down_interruptible(x) +#define MOAL_ACQ_SEMAPHORE_BLOCK(x) down_interruptible(x) /** Acquire semaphore without blocking */ -#define MOAL_ACQ_SEMAPHORE_NOBLOCK(x) down_trylock(x) +#define MOAL_ACQ_SEMAPHORE_NOBLOCK(x) down_trylock(x) /** Release semaphore */ -#define MOAL_REL_SEMAPHORE(x) up(x) +#define MOAL_REL_SEMAPHORE(x) up(x) /** Request FW timeout in second */ -#define REQUEST_FW_TIMEOUT 30 +#define REQUEST_FW_TIMEOUT 30 #if defined(USB) || defined(SYSKT) /** Max loop count (* 100ms) for waiting device ready at init time */ -#define MAX_WAIT_DEVICE_READY_COUNT 50 +#define MAX_WAIT_DEVICE_READY_COUNT 50 #endif /** Default watchdog timeout */ @@ -647,7 +634,7 @@ out: #endif /* IOCTL Timeout */ -#define MOAL_IOCTL_TIMEOUT (20 * HZ) +#define MOAL_IOCTL_TIMEOUT (20 * HZ) #ifdef ANDROID_KERNEL /** Wake lock timeout in msec */ @@ -657,151 +644,152 @@ out: #endif /** Threshold value of number of times the Tx timeout happened */ -#define NUM_TX_TIMEOUT_THRESHOLD 5 +#define NUM_TX_TIMEOUT_THRESHOLD 5 /** Custom event : DRIVER HANG */ -#define CUS_EVT_DRIVER_HANG "EVENT=DRIVER_HANG" +#define CUS_EVT_DRIVER_HANG "EVENT=DRIVER_HANG" /** AP connected event */ -#define CUS_EVT_AP_CONNECTED "EVENT=AP_CONNECTED" +#define CUS_EVT_AP_CONNECTED "EVENT=AP_CONNECTED" /** Custom event : BW changed */ -#define CUS_EVT_BW_CHANGED "EVENT=BW_CHANGED" +#define CUS_EVT_BW_CHANGED "EVENT=BW_CHANGED" /** Custom event : OBSS scan parameter */ -#define CUS_EVT_OBSS_SCAN_PARAM "EVENT=OBSS_SCAN_PARAM" +#define CUS_EVT_OBSS_SCAN_PARAM "EVENT=OBSS_SCAN_PARAM" /** Custom event : AdHoc link sensed */ -#define CUS_EVT_ADHOC_LINK_SENSED "EVENT=ADHOC_LINK_SENSED" +#define CUS_EVT_ADHOC_LINK_SENSED "EVENT=ADHOC_LINK_SENSED" /** Custom event : AdHoc link lost */ -#define CUS_EVT_ADHOC_LINK_LOST "EVENT=ADHOC_LINK_LOST" +#define CUS_EVT_ADHOC_LINK_LOST "EVENT=ADHOC_LINK_LOST" /** Custom event : MIC failure, unicast */ -#define CUS_EVT_MLME_MIC_ERR_UNI "MLME-MICHAELMICFAILURE.indication unicast" +#define CUS_EVT_MLME_MIC_ERR_UNI "MLME-MICHAELMICFAILURE.indication unicast" /** Custom event : MIC failure, multicast */ -#define CUS_EVT_MLME_MIC_ERR_MUL "MLME-MICHAELMICFAILURE.indication multicast" +#define CUS_EVT_MLME_MIC_ERR_MUL "MLME-MICHAELMICFAILURE.indication multicast" /** Custom event : Beacon RSSI low */ -#define CUS_EVT_BEACON_RSSI_LOW "EVENT=BEACON_RSSI_LOW" +#define CUS_EVT_BEACON_RSSI_LOW "EVENT=BEACON_RSSI_LOW" /** Custom event : Beacon SNR low */ -#define CUS_EVT_BEACON_SNR_LOW "EVENT=BEACON_SNR_LOW" +#define CUS_EVT_BEACON_SNR_LOW "EVENT=BEACON_SNR_LOW" /** Custom event : Beacon RSSI high */ -#define CUS_EVT_BEACON_RSSI_HIGH "EVENT=BEACON_RSSI_HIGH" +#define CUS_EVT_BEACON_RSSI_HIGH "EVENT=BEACON_RSSI_HIGH" /** Custom event : Beacon SNR high */ -#define CUS_EVT_BEACON_SNR_HIGH "EVENT=BEACON_SNR_HIGH" +#define CUS_EVT_BEACON_SNR_HIGH "EVENT=BEACON_SNR_HIGH" /** Custom event : Max fail */ -#define CUS_EVT_MAX_FAIL "EVENT=MAX_FAIL" +#define CUS_EVT_MAX_FAIL "EVENT=MAX_FAIL" /** Custom event : Data RSSI low */ -#define CUS_EVT_DATA_RSSI_LOW "EVENT=DATA_RSSI_LOW" +#define CUS_EVT_DATA_RSSI_LOW "EVENT=DATA_RSSI_LOW" /** Custom event : Data SNR low */ -#define CUS_EVT_DATA_SNR_LOW "EVENT=DATA_SNR_LOW" +#define CUS_EVT_DATA_SNR_LOW "EVENT=DATA_SNR_LOW" /** Custom event : Data RSSI high */ -#define CUS_EVT_DATA_RSSI_HIGH "EVENT=DATA_RSSI_HIGH" +#define CUS_EVT_DATA_RSSI_HIGH "EVENT=DATA_RSSI_HIGH" /** Custom event : Data SNR high */ -#define CUS_EVT_DATA_SNR_HIGH "EVENT=DATA_SNR_HIGH" +#define CUS_EVT_DATA_SNR_HIGH "EVENT=DATA_SNR_HIGH" /** Custom event : Link Quality */ -#define CUS_EVT_LINK_QUALITY "EVENT=LINK_QUALITY" +#define CUS_EVT_LINK_QUALITY "EVENT=LINK_QUALITY" /** Custom event : Port Release */ -#define CUS_EVT_PORT_RELEASE "EVENT=PORT_RELEASE" +#define CUS_EVT_PORT_RELEASE "EVENT=PORT_RELEASE" /** Custom event : Pre-Beacon Lost */ -#define CUS_EVT_PRE_BEACON_LOST "EVENT=PRE_BEACON_LOST" +#define CUS_EVT_PRE_BEACON_LOST "EVENT=PRE_BEACON_LOST" /** Custom event : Deep Sleep awake */ -#define CUS_EVT_DEEP_SLEEP_AWAKE "EVENT=DS_AWAKE" +#define CUS_EVT_DEEP_SLEEP_AWAKE "EVENT=DS_AWAKE" /** Custom event : Host Sleep activated */ -#define CUS_EVT_HS_ACTIVATED "HS_ACTIVATED" +#define CUS_EVT_HS_ACTIVATED "HS_ACTIVATED" /** Custom event : Host Sleep deactivated */ -#define CUS_EVT_HS_DEACTIVATED "HS_DEACTIVATED" +#define CUS_EVT_HS_DEACTIVATED "HS_DEACTIVATED" /** Custom event : Host Sleep wakeup */ -#define CUS_EVT_HS_WAKEUP "HS_WAKEUP" +#define CUS_EVT_HS_WAKEUP "HS_WAKEUP" /** Wakeup Reason */ typedef enum { - NO_HSWAKEUP_REASON = 0, //0.unknown - BCAST_DATA_MATCHED, // 1. Broadcast data matched - MCAST_DATA_MATCHED, // 2. Multicast data matched - UCAST_DATA_MATCHED, // 3. Unicast data matched - MASKTABLE_EVENT_MATCHED, // 4. Maskable event matched - NON_MASKABLE_EVENT_MATCHED, // 5. Non-maskable event matched - NON_MASKABLE_CONDITION_MATCHED, // 6. Non-maskable condition matched (EAPoL rekey) - MAGIC_PATTERN_MATCHED, // 7. Magic pattern matched - CONTROL_FRAME_MATCHED, // 8. Control frame matched - MANAGEMENT_FRAME_MATCHED, // 9. Management frame matched - GTK_REKEY_FAILURE, //10. GTK rekey failure - RESERVED // Others: reserved + NO_HSWAKEUP_REASON = 0, // 0.unknown + BCAST_DATA_MATCHED, // 1. Broadcast data matched + MCAST_DATA_MATCHED, // 2. Multicast data matched + UCAST_DATA_MATCHED, // 3. Unicast data matched + MASKTABLE_EVENT_MATCHED, // 4. Maskable event matched + NON_MASKABLE_EVENT_MATCHED, // 5. Non-maskable event matched + NON_MASKABLE_CONDITION_MATCHED, // 6. Non-maskable condition matched + // (EAPoL rekey) + MAGIC_PATTERN_MATCHED, // 7. Magic pattern matched + CONTROL_FRAME_MATCHED, // 8. Control frame matched + MANAGEMENT_FRAME_MATCHED, // 9. Management frame matched + GTK_REKEY_FAILURE, // 10. GTK rekey failure + RESERVED // Others: reserved } HSWakeupReason_t; /** Custom event : WEP ICV error */ -#define CUS_EVT_WEP_ICV_ERR "EVENT=WEP_ICV_ERR" +#define CUS_EVT_WEP_ICV_ERR "EVENT=WEP_ICV_ERR" /** Custom event : Channel Switch Announcment */ -#define CUS_EVT_CHANNEL_SWITCH_ANN "EVENT=CHANNEL_SWITCH_ANN" +#define CUS_EVT_CHANNEL_SWITCH_ANN "EVENT=CHANNEL_SWITCH_ANN" /** Custom indiciation message sent to the application layer for WMM changes */ -#define WMM_CONFIG_CHANGE_INDICATION "WMM_CONFIG_CHANGE.indication" +#define WMM_CONFIG_CHANGE_INDICATION "WMM_CONFIG_CHANGE.indication" #ifdef UAP_SUPPORT /** Custom event : STA connected */ -#define CUS_EVT_STA_CONNECTED "EVENT=STA_CONNECTED" +#define CUS_EVT_STA_CONNECTED "EVENT=STA_CONNECTED" /** Custom event : STA disconnected */ -#define CUS_EVT_STA_DISCONNECTED "EVENT=STA_DISCONNECTED" +#define CUS_EVT_STA_DISCONNECTED "EVENT=STA_DISCONNECTED" #endif -#define FW_DEBUG_INFO "EVENT=FW_DEBUG_INFO" +#define FW_DEBUG_INFO "EVENT=FW_DEBUG_INFO" /** 10 seconds */ -#define MOAL_TIMER_10S 10000 +#define MOAL_TIMER_10S 10000 /** 5 seconds */ -#define MOAL_TIMER_5S 5000 +#define MOAL_TIMER_5S 5000 /** 1 second */ -#define MOAL_TIMER_1S 1000 +#define MOAL_TIMER_1S 1000 /** 1 milisecond */ -#define MOAL_TIMER_1MS 1 +#define MOAL_TIMER_1MS 1 /** passive scan time */ -#define PASSIVE_SCAN_CHAN_TIME 110 +#define PASSIVE_SCAN_CHAN_TIME 110 /** active scan time */ -#define ACTIVE_SCAN_CHAN_TIME 110 +#define ACTIVE_SCAN_CHAN_TIME 110 /** specific scan time */ -#define SPECIFIC_SCAN_CHAN_TIME 110 +#define SPECIFIC_SCAN_CHAN_TIME 110 /** passive scan time */ -#define INIT_PASSIVE_SCAN_CHAN_TIME 80 +#define INIT_PASSIVE_SCAN_CHAN_TIME 80 /** active scan time */ -#define INIT_ACTIVE_SCAN_CHAN_TIME 80 +#define INIT_ACTIVE_SCAN_CHAN_TIME 80 /** specific scan time */ #define INIT_SPECIFIC_SCAN_CHAN_TIME 80 /** specific scan time after connected */ -#define MIN_SPECIFIC_SCAN_CHAN_TIME 40 +#define MIN_SPECIFIC_SCAN_CHAN_TIME 40 /** Default value of re-assoc timer */ -#define REASSOC_TIMER_DEFAULT 500 +#define REASSOC_TIMER_DEFAULT 500 /** Netlink protocol number */ -#define NETLINK_NXP (MAX_LINKS - 1) +#define NETLINK_NXP (MAX_LINKS - 1) /** Netlink maximum payload size */ -#define NL_MAX_PAYLOAD 1024 +#define NL_MAX_PAYLOAD 1024 /** Netlink multicast group number */ -#define NL_MULTICAST_GROUP 1 +#define NL_MULTICAST_GROUP 1 -#define MAX_RX_PENDING_THRHLD 50 +#define MAX_RX_PENDING_THRHLD 50 /** high rx pending packets */ -#define HIGH_RX_PENDING 100 +#define HIGH_RX_PENDING 100 /** low rx pending packets */ -#define LOW_RX_PENDING 80 +#define LOW_RX_PENDING 80 /** MAX Tx Pending count */ -#define MAX_TX_PENDING 400 +#define MAX_TX_PENDING 400 /** LOW Tx Pending count */ -#define LOW_TX_PENDING 380 +#define LOW_TX_PENDING 380 /** Offset for subcommand */ -#define SUBCMD_OFFSET 4 +#define SUBCMD_OFFSET 4 /** default scan channel gap */ -#define DEF_SCAN_CHAN_GAP 50 +#define DEF_SCAN_CHAN_GAP 50 /** default scan time per channel in miracast mode */ -#define DEF_MIRACAST_SCAN_TIME 20 +#define DEF_MIRACAST_SCAN_TIME 20 /** GAP value is optional */ -#define GAP_FLAG_OPTIONAL MBIT(15) +#define GAP_FLAG_OPTIONAL MBIT(15) /** Macro to extract the TOS field from a skb */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) @@ -809,7 +797,7 @@ typedef enum { #else #define SKB_TOS(skb) (skb->nh.iph->tos) #endif -#define SKB_TIDV6(skb) (ipv6_get_dsfield(ipv6_hdr(skb))) +#define SKB_TIDV6(skb) (ipv6_get_dsfield(ipv6_hdr(skb))) #define IS_SKB_MAGIC_VLAN(skb) (skb->priority >= 256 && skb->priority <= 263) #define GET_VLAN_PRIO(skb) (skb->priority - 256) @@ -831,149 +819,149 @@ typedef struct _wait_queue { long start_time; /** Status from MLAN */ mlan_status status; - /** flag for wait_timeout */ + /** flag for wait_timeout */ t_u8 wait_timeout; - /** retry count */ + /** retry count */ t_u8 retry; } wait_queue, *pwait_queue; /** Auto Rate */ #define AUTO_RATE 0xFF -#define STA_WEXT_MASK MBIT(0) -#define UAP_WEXT_MASK MBIT(1) -#define STA_CFG80211_MASK MBIT(2) -#define UAP_CFG80211_MASK MBIT(3) +#define STA_WEXT_MASK MBIT(0) +#define UAP_WEXT_MASK MBIT(1) +#define STA_CFG80211_MASK MBIT(2) +#define UAP_CFG80211_MASK MBIT(3) #ifdef STA_CFG80211 #ifdef STA_SUPPORT /** Is STA CFG80211 enabled in module param */ -#define IS_STA_CFG80211(x) (x & STA_CFG80211_MASK) +#define IS_STA_CFG80211(x) (x & STA_CFG80211_MASK) #endif #endif #ifdef UAP_CFG80211 #ifdef UAP_SUPPORT /** Is UAP CFG80211 enabled in module param */ -#define IS_UAP_CFG80211(x) (x & UAP_CFG80211_MASK) +#define IS_UAP_CFG80211(x) (x & UAP_CFG80211_MASK) #endif #endif #if defined(STA_CFG80211) || defined(UAP_CFG80211) /** Is UAP or STA CFG80211 enabled in module param */ -#define IS_STA_OR_UAP_CFG80211(x) (x & (STA_CFG80211_MASK | UAP_CFG80211_MASK)) +#define IS_STA_OR_UAP_CFG80211(x) (x & (STA_CFG80211_MASK | UAP_CFG80211_MASK)) #endif #ifdef STA_WEXT /** Is STA WEXT enabled in module param */ -#define IS_STA_WEXT(x) (x & STA_WEXT_MASK) +#define IS_STA_WEXT(x) (x & STA_WEXT_MASK) #endif /* STA_WEXT */ #ifdef UAP_WEXT /** Is UAP WEXT enabled in module param */ -#define IS_UAP_WEXT(x) (x & UAP_WEXT_MASK) +#define IS_UAP_WEXT(x) (x & UAP_WEXT_MASK) #endif /* UAP_WEXT */ #if defined(STA_WEXT) || defined(UAP_WEXT) /** Is UAP or STA WEXT enabled in module param */ -#define IS_STA_OR_UAP_WEXT(x) (x & (STA_WEXT_MASK | UAP_WEXT_MASK)) +#define IS_STA_OR_UAP_WEXT(x) (x & (STA_WEXT_MASK | UAP_WEXT_MASK)) #endif #ifdef STA_SUPPORT /** Driver mode STA bit */ -#define DRV_MODE_STA MBIT(0) +#define DRV_MODE_STA MBIT(0) /** Maximum STA BSS */ -#define MAX_STA_BSS 1 +#define MAX_STA_BSS 1 /** Default STA BSS */ -#define DEF_STA_BSS 1 +#define DEF_STA_BSS 1 #endif #ifdef UAP_SUPPORT /** Driver mode uAP bit */ -#define DRV_MODE_UAP MBIT(1) +#define DRV_MODE_UAP MBIT(1) /** Maximum uAP BSS */ -#define MAX_UAP_BSS 1 +#define MAX_UAP_BSS 1 /** Default uAP BSS */ -#define DEF_UAP_BSS 1 +#define DEF_UAP_BSS 1 #endif #ifdef WIFI_DIRECT_SUPPORT /** Driver mode WIFIDIRECT bit */ -#define DRV_MODE_WIFIDIRECT MBIT(2) +#define DRV_MODE_WIFIDIRECT MBIT(2) /** Maximum WIFIDIRECT BSS */ -#define MAX_WIFIDIRECT_BSS 2 +#define MAX_WIFIDIRECT_BSS 2 /** Default WIFIDIRECT BSS */ -#define DEF_WIFIDIRECT_BSS 1 +#define DEF_WIFIDIRECT_BSS 1 #if defined(STA_CFG80211) && defined(UAP_CFG80211) -#define DEF_VIRTUAL_BSS 0 +#define DEF_VIRTUAL_BSS 0 #endif #endif /* WIFI_DIRECT_SUPPORT */ -#define DRV_MODE_WLAN (MBIT(0)|MBIT(1)|MBIT(2)|MBIT(3)|MBIT(4)) +#define DRV_MODE_WLAN (MBIT(0) | MBIT(1) | MBIT(2) | MBIT(3) | MBIT(4)) /** * the maximum number of adapter supported **/ -#define MAX_MLAN_ADAPTER 3 +#define MAX_MLAN_ADAPTER 3 typedef struct _moal_drv_mode { - /** driver mode */ + /** driver mode */ t_u16 drv_mode; - /** total number of interfaces */ + /** total number of interfaces */ t_u16 intf_num; - /** attribute of bss */ + /** attribute of bss */ mlan_bss_attr *bss_attr; - /** name of firmware image */ + /** name of firmware image */ char *fw_name; } moal_drv_mode; /** Indicate if handle->info's address */ -#define INFO_ADDR BIT(0) -#define IS_INFO_ADDR(attr) (attr & INFO_ADDR) +#define INFO_ADDR BIT(0) +#define IS_INFO_ADDR(attr) (attr & INFO_ADDR) /** Indicate if handle's address */ -#define HANDLE_ADDR BIT(1) -#define IS_HANDLE_ADDR(attr) (attr & HANDLE_ADDR) +#define HANDLE_ADDR BIT(1) +#define IS_HANDLE_ADDR(attr) (attr & HANDLE_ADDR) /** Indicate if card's address */ -#define CARD_ADDR BIT(2) -#define IS_CARD_ADDR(attr) (attr & CARD_ADDR) +#define CARD_ADDR BIT(2) +#define IS_CARD_ADDR(attr) (attr & CARD_ADDR) /** indicate if priv's address */ -#define PRIV_ADDR BIT(3) -#define IS_PRIV_ADDR(attr) (attr & PRIV_ADDR) +#define PRIV_ADDR BIT(3) +#define IS_PRIV_ADDR(attr) (attr & PRIV_ADDR) /** Debug data */ struct debug_data { - /** Name */ + /** Name */ char name[32]; - /** Size */ + /** Size */ t_u32 size; - /** Address */ + /** Address */ t_ptr addr; - /** Attribute: - 0-7bit: start address for addr to add to, 0 means common(no specific) - 8-15bit: interface type, 0 means common(no interface specific) - other: unused - */ + /** Attribute: + 0-7bit: start address for addr to add to, 0 means common(no specific) + 8-15bit: interface type, 0 means common(no interface specific) + other: unused + */ t_u32 attr; }; /** Private debug data */ struct debug_data_priv { - /** moal_private handle */ + /** moal_private handle */ moal_private *priv; - /** Debug items */ + /** Debug items */ struct debug_data *items; - /** numbre of item */ + /** numbre of item */ int num_of_items; }; /** Maximum IP address buffer length */ -#define IPADDR_MAX_BUF 20 +#define IPADDR_MAX_BUF 20 /** IP address operation: Remove */ -#define IPADDR_OP_REMOVE 0 +#define IPADDR_OP_REMOVE 0 -#define DROP_TCP_ACK 1 -#define HOLD_TCP_ACK 2 +#define DROP_TCP_ACK 1 +#define HOLD_TCP_ACK 2 struct tcp_sess { struct list_head link; - /** tcp session info */ + /** tcp session info */ t_u32 src_ip_addr; t_u32 dst_ip_addr; t_u16 src_tcp_port; t_u16 dst_tcp_port; - /** tx ack packet info */ + /** tx ack packet info */ t_u32 ack_seq; /** tcp ack buffer */ void *ack_skb; @@ -981,19 +969,19 @@ struct tcp_sess { void *priv; /** pmbuf */ void *pmbuf; - /** timer for ack */ + /** timer for ack */ moal_drv_timer ack_timer __ATTRIB_ALIGN__; - /** timer is set */ + /** timer is set */ BOOLEAN is_timer_set; }; struct tx_status_info { struct list_head link; - /** cookie */ + /** cookie */ t_u64 tx_cookie; - /** seq_num */ + /** seq_num */ t_u8 tx_seq_num; - /** cancel remain on channel when receive tx status */ + /** cancel remain on channel when receive tx status */ t_u8 cancel_remain_on_channel; /** skb */ void *tx_skb; @@ -1020,38 +1008,38 @@ struct woal_event { #define MAX_NUM_ETHER_TYPE 8 typedef struct { - /** number of protocols in protocol array*/ + /** number of protocols in protocol array*/ t_u8 protocol_num; - /** protocols supported */ + /** protocols supported */ t_u16 protocols[MAX_NUM_ETHER_TYPE]; } __ATTRIB_PACK__ dot11_protocol; typedef struct { - /** Data rate in unit of 0.5Mbps */ + /** Data rate in unit of 0.5Mbps */ t_u16 datarate; - /** Channel number to transmit the frame */ + /** Channel number to transmit the frame */ t_u8 channel; - /** Bandwidth to transmit the frame */ + /** Bandwidth to transmit the frame */ t_u8 bw; - /** Power to be used for transmission */ + /** Power to be used for transmission */ t_u8 power; - /** Priority of the packet to be transmitted */ + /** Priority of the packet to be transmitted */ t_u8 priority; - /** retry time of tx transmission*/ + /** retry time of tx transmission*/ t_u8 retry_limit; - /** Reserved fields*/ + /** Reserved fields*/ t_u8 reserved[1]; } __ATTRIB_PACK__ dot11_txcontrol; typedef struct { - /** Data rate of received paccket*/ + /** Data rate of received paccket*/ t_u16 datarate; - /** Channel on which packet was received*/ + /** Channel on which packet was received*/ t_u8 channel; - /** Rx antenna*/ + /** Rx antenna*/ t_u8 antenna; - /** RSSI */ + /** RSSI */ t_u8 rssi; - /** Reserved */ + /** Reserved */ t_u8 reserved[3]; } __ATTRIB_PACK__ dot11_rxcontrol; @@ -1064,35 +1052,35 @@ struct pmksa_entry { }; /** Number of samples in histogram (/proc/mwlan/adapterX/mlan0/histogram).*/ -#define HIST_MAX_SAMPLES 1048576 -#define RX_RATE_MAX 196 +#define HIST_MAX_SAMPLES 1048576 +#define RX_RATE_MAX 196 /** SRN MAX */ -#define SNR_MAX 256 +#define SNR_MAX 256 /** NOISE FLR MAX */ -#define NOISE_FLR_MAX 256 +#define NOISE_FLR_MAX 256 /** SIG STRENTGH MAX */ -#define SIG_STRENGTH_MAX 256 +#define SIG_STRENGTH_MAX 256 /** historgram data */ typedef struct _hgm_data { - /** snr */ + /** snr */ atomic_t snr[SNR_MAX]; - /** noise flr */ + /** noise flr */ atomic_t noise_flr[NOISE_FLR_MAX]; - /** sig_str */ + /** sig_str */ atomic_t sig_str[SIG_STRENGTH_MAX]; - /** num sample */ + /** num sample */ atomic_t num_samples; - /** rx rate */ + /** rx rate */ atomic_t rx_rate[]; } hgm_data; /** max antenna number */ -#define MAX_ANTENNA_NUM 4 +#define MAX_ANTENNA_NUM 4 /* wlan_hist_proc_data */ typedef struct _wlan_hist_proc_data { - /** antenna */ + /** antenna */ u8 ant_idx; /** Private structure */ struct _moal_private *priv; @@ -1129,15 +1117,15 @@ struct _moal_private { #ifdef UAP_SUPPORT /** uAP started or not */ BOOLEAN bss_started; - /** host based uap flag */ + /** host based uap flag */ BOOLEAN uap_host_based; /** uAP skip CAC*/ BOOLEAN skip_cac; /** tx block flag */ BOOLEAN uap_tx_blocked; - /** user cac period */ + /** user cac period */ t_u32 user_cac_period_msec; - /** channel under nop */ + /** channel under nop */ BOOLEAN chan_under_nop; #ifdef UAP_CFG80211 #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) @@ -1163,34 +1151,34 @@ struct _moal_private { ExtCap_t extended_capabilities; /** bg_scan_start */ t_u8 bg_scan_start; - /** bg_scan reported */ + /** bg_scan reported */ t_u8 bg_scan_reported; - /** bg_scan config */ + /** bg_scan config */ wlan_bgscan_cfg scan_cfg; /** sched scaning flag */ t_u8 sched_scanning; - /** bgscan request id */ + /** bgscan request id */ t_u64 bg_scan_reqid; #ifdef STA_CFG80211 - /** roaming enabled flag */ + /** roaming enabled flag */ t_u8 roaming_enabled; - /** roaming required flag */ + /** roaming required flag */ t_u8 roaming_required; #endif #ifdef STA_CFG80211 - /** rssi low threshold */ + /** rssi low threshold */ int rssi_low; - /** channel for connect */ + /** channel for connect */ struct ieee80211_channel conn_chan; - /** bssid for connect */ + /** bssid for connect */ t_u8 conn_bssid[ETH_ALEN]; - /** ssid for connect */ + /** ssid for connect */ t_u8 conn_ssid[MLAN_MAX_SSID_LENGTH]; - /** length of ssid for connect */ + /** length of ssid for connect */ t_u8 conn_ssid_len; /** key data */ t_u8 conn_wep_key[MAX_WEP_KEY_SIZE]; - /** connection param */ + /** connection param */ struct cfg80211_connect_params sme_current; #endif t_u8 wait_target_ap_pmkid; @@ -1215,7 +1203,7 @@ struct _moal_private { /** channel parameter for UAP/GO */ t_u16 channel; #ifdef UAP_SUPPORT - /** wep key */ + /** wep key */ wep_key uap_wep_key[4]; /** cipher */ t_u32 cipher; @@ -1245,9 +1233,9 @@ struct _moal_private { t_u8 cfg_bssid[ETH_ALEN]; /** Disconnect request from CFG80211 */ bool cfg_disconnect; - /** connect request from CFG80211 */ + /** connect request from CFG80211 */ bool cfg_connect; - /** lock for cfg connect */ + /** lock for cfg connect */ spinlock_t connect_lock; /** assoc status */ t_u32 assoc_status; @@ -1269,32 +1257,32 @@ struct _moal_private { u8 fake_scan_complete; /**ft ie*/ t_u8 ft_ie[MAX_IE_SIZE]; - /**ft ie len*/ + /**ft ie len*/ t_u8 ft_ie_len; /**ft ie*/ t_u8 pre_ft_ie[MAX_IE_SIZE]; - /**ft ie len*/ + /**ft ie len*/ t_u8 pre_ft_ie_len; - /**mobility domain value*/ + /**mobility domain value*/ t_u16 ft_md; - /**ft capability*/ + /**ft capability*/ t_u8 ft_cap; - /** set true when receive ft auth or action ft roaming */ + /** set true when receive ft auth or action ft roaming */ t_bool ft_pre_connect; - /**ft roaming triggered by driver or not*/ + /**ft roaming triggered by driver or not*/ t_bool ft_roaming_triggered_by_driver; - /**target ap mac address for Fast Transition*/ + /**target ap mac address for Fast Transition*/ t_u8 target_ap_bssid[ETH_ALEN]; - /** IOCTL wait queue for FT*/ + /** IOCTL wait queue for FT*/ wait_queue_head_t ft_wait_q __ATTRIB_ALIGN__; /** ft wait condition */ t_bool ft_wait_condition; -#endif /* STA_SUPPORT */ -#endif /* STA_CFG80211 */ +#endif /* STA_SUPPORT */ +#endif /* STA_CFG80211 */ #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) - /** flag for host_mlme */ + /** flag for host_mlme */ t_u8 host_mlme; - /** flag for auth */ + /** flag for auth */ t_u8 auth_flag; #endif #ifdef CONFIG_PROC_FS @@ -1302,11 +1290,11 @@ struct _moal_private { struct proc_dir_entry *proc_entry; /** Proc entry name */ char proc_entry_name[IFNAMSIZ]; - /** proc entry for hist */ + /** proc entry for hist */ struct proc_dir_entry *hist_entry; /** ant_hist_proc_data */ wlan_hist_proc_data hist_proc[MAX_ANTENNA_NUM]; -#endif /* CONFIG_PROC_FS */ +#endif /* CONFIG_PROC_FS */ #ifdef STA_SUPPORT /** Nickname */ t_u8 nick_name[16]; @@ -1322,7 +1310,7 @@ struct _moal_private { BOOLEAN reassoc_on; /** Set asynced essid flag */ BOOLEAN set_asynced_essid_flag; -#endif /* REASSOCIATION */ +#endif /* REASSOCIATION */ /** Report scan result */ t_u8 report_scan_result; /** wpa_version */ @@ -1331,7 +1319,7 @@ struct _moal_private { t_u8 key_mgmt; /** rx_filter */ t_u8 rx_filter; -#endif /* STA_SUPPORT */ +#endif /* STA_SUPPORT */ /** Rate index */ t_u16 rate_index; #if defined(STA_WEXT) || defined(UAP_WEXT) @@ -1339,43 +1327,43 @@ struct _moal_private { struct iw_statistics w_stats; #endif #ifdef UAP_WEXT - /** Pairwise Cipher used for WPA/WPA2 mode */ + /** Pairwise Cipher used for WPA/WPA2 mode */ t_u16 pairwise_cipher; - /** Group Cipher */ + /** Group Cipher */ t_u16 group_cipher; - /** Protocol stored during uap wext configuratoin */ + /** Protocol stored during uap wext configuratoin */ t_u16 uap_protocol; - /** Key Mgmt whether PSK or 1x */ + /** Key Mgmt whether PSK or 1x */ t_u16 uap_key_mgmt; - /** Beacon IE length from hostapd */ + /** Beacon IE length from hostapd */ t_u16 bcn_ie_len; - /** Beacon IE buffer from hostapd */ + /** Beacon IE buffer from hostapd */ t_u8 bcn_ie_buf[MAX_IE_SIZE]; #endif - /** dscp mapping */ + /** dscp mapping */ t_u8 dscp_map[64]; - /** MLAN debug info */ + /** MLAN debug info */ struct debug_data_priv items_priv; - /** tcp session queue */ + /** tcp session queue */ struct list_head tcp_sess_queue; - /** TCP Ack enhance flag */ + /** TCP Ack enhance flag */ t_u8 enable_tcp_ack_enh; - /** TCP session spin lock */ + /** TCP session spin lock */ spinlock_t tcp_sess_lock; #if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 29) atomic_t wmm_tx_pending[4]; #endif - /** per interface extra headroom */ + /** per interface extra headroom */ t_u16 extra_tx_head_len; - /** TX status spin lock */ + /** TX status spin lock */ spinlock_t tx_stat_lock; - /** tx_seq_num */ + /** tx_seq_num */ t_u8 tx_seq_num; - /** tx status queue */ + /** tx status queue */ struct list_head tx_stat_queue; - /** rx hgm data */ + /** rx hgm data */ hgm_data *hist_data[MAX_ANTENNA_NUM]; t_u8 random_mac[MLAN_MAC_ADDR_LENGTH]; BOOLEAN assoc_with_mac; @@ -1384,9 +1372,9 @@ struct _moal_private { dot11_protocol tx_protocols; dot11_protocol rx_protocols; #if defined(DRV_EMBEDDED_AUTHENTICATOR) || defined(DRV_EMBEDDED_SUPPLICANT) - /** hostcmd_wait_q */ + /** hostcmd_wait_q */ wait_queue_head_t hostcmd_wait_q __ATTRIB_ALIGN__; - /** hostcmd_wait_condition */ + /** hostcmd_wait_condition */ t_bool hostcmd_wait_condition; #endif void *rings[RING_ID_MAX]; @@ -1395,10 +1383,10 @@ struct _moal_private { }; #ifdef SDIO -#define DUMP_FW_SDIO_V2 2 -#define DUMP_FW_SDIO_V3 3 +#define DUMP_FW_SDIO_V2 2 +#define DUMP_FW_SDIO_V3 3 -#define DUMP_REG_MAX 13 +#define DUMP_REG_MAX 13 typedef struct _dump_reg_t { t_u8 reg_table[DUMP_REG_MAX]; @@ -1406,7 +1394,7 @@ typedef struct _dump_reg_t { } dump_reg_t; #endif -#define FW_NAMW_MAX_LEN 64 +#define FW_NAMW_MAX_LEN 64 /** card info */ typedef struct _card_info { @@ -1435,7 +1423,7 @@ typedef struct _card_info { t_u32 feature_control; /* Revision id register */ t_u32 rev_id_reg; - /* host interface selection reg */ + /* host interface selection reg*/ t_u32 host_strap_reg; /* Chip Magic Register */ t_u32 magic_reg; @@ -1460,30 +1448,30 @@ typedef struct _card_info { t_u8 per_pkt_cfg_support; } card_info; -#define GTK_REKEY_OFFLOAD_DISABLE 0 -#define GTK_REKEY_OFFLOAD_ENABLE 1 -#define GTK_REKEY_OFFLOAD_SUSPEND 2 +#define GTK_REKEY_OFFLOAD_DISABLE 0 +#define GTK_REKEY_OFFLOAD_ENABLE 1 +#define GTK_REKEY_OFFLOAD_SUSPEND 2 #define MAX_KEEP_ALIVE_ID 4 /** Operation data structure for MOAL bus interfaces */ typedef struct _moal_if_ops { - mlan_status (*register_dev) (moal_handle *handle); - void (*unregister_dev) (moal_handle *handle); - mlan_status (*read_reg) (moal_handle *handle, t_u32 reg, t_u32 *data); - mlan_status (*write_reg) (moal_handle *handle, t_u32 reg, t_u32 data); - mlan_status (*read_data_sync) (moal_handle *handle, mlan_buffer *pmbuf, + mlan_status (*register_dev)(moal_handle *handle); + void (*unregister_dev)(moal_handle *handle); + mlan_status (*read_reg)(moal_handle *handle, t_u32 reg, t_u32 *data); + mlan_status (*write_reg)(moal_handle *handle, t_u32 reg, t_u32 data); + mlan_status (*read_data_sync)(moal_handle *handle, mlan_buffer *pmbuf, + t_u32 port, t_u32 timeout); + mlan_status (*write_data_sync)(moal_handle *handle, mlan_buffer *pmbuf, t_u32 port, t_u32 timeout); - mlan_status (*write_data_sync) (moal_handle *handle, mlan_buffer *pmbuf, - t_u32 port, t_u32 timeout); - mlan_status (*get_fw_name) (moal_handle *handle); - void (*dump_fw_info) (moal_handle *handle); - int (*dump_reg_info) (moal_handle *handle, t_u8 *buf); - void (*reg_dbg) (moal_handle *handle); - t_u8 (*is_second_mac) (moal_handle *handle); + mlan_status (*get_fw_name)(moal_handle *handle); + void (*dump_fw_info)(moal_handle *handle); + int (*dump_reg_info)(moal_handle *handle, t_u8 *buf); + void (*reg_dbg)(moal_handle *handle); + t_u8 (*is_second_mac)(moal_handle *handle); } moal_if_ops; -#define WIFI_DIRECT_KERNEL_VERSION KERNEL_VERSION(2, 6, 39) +#define WIFI_DIRECT_KERNEL_VERSION KERNEL_VERSION(2, 6, 39) /** Extended flags */ enum ext_mod_params { @@ -1541,28 +1529,28 @@ typedef struct _moal_mod_para { char *mac_addr; #ifdef MFG_CMD_SUPPORT int mfg_mode; -#endif /* MFG_CMD_SUPPORT */ +#endif /* MFG_CMD_SUPPORT */ int drv_mode; #ifdef STA_SUPPORT int max_sta_bss; char *sta_name; -#endif /* STA_SUPPORT */ +#endif /* STA_SUPPORT */ #ifdef UAP_SUPPORT int max_uap_bss; char *uap_name; int uap_max_sta; -#endif /* UAP_SUPPORT */ +#endif /* UAP_SUPPORT */ #ifdef WIFI_DIRECT_SUPPORT int max_wfd_bss; char *wfd_name; #if defined(STA_CFG80211) && defined(UAP_CFG80211) int max_vir_bss; #endif -#endif /* WIFI_DIRECT_SUPPORT */ +#endif /* WIFI_DIRECT_SUPPORT */ int auto_ds; int ps_mode; int p2a_scan; - /** scan chan gap */ + /** scan chan gap */ int scan_chan_gap; int max_tx_buf; #if defined(SDIO) @@ -1589,13 +1577,16 @@ typedef struct _moal_mod_para { #endif #ifdef PCIE int pcie_int_mode; -#endif /* PCIE */ +#endif /* PCIE */ #ifdef ANDROID_KERNEL int wakelock_timeout; #endif unsigned int dev_cap_mask; -#if defined(SD8997) || defined(PCIE8997) || defined(USB8997) || defined(SD8977) || defined(SD8987)\ -||defined(SD9098) || defined(USB9098)|| defined(PCIE9098) || defined(SD9097) || defined(USB9097)|| defined(PCIE9097)||defined(SD8978)||defined(USB8978) +#if defined(SD8997) || defined(PCIE8997) || defined(USB8997) || \ + defined(SD8977) || defined(SD8987) || defined(SD9098) || \ + defined(USB9098) || defined(PCIE9098) || defined(SD9097) || \ + defined(USB9097) || defined(PCIE9097) || defined(SD8978) || \ + defined(USB8978) int pmic; #endif int antcfg; @@ -1610,6 +1601,7 @@ typedef struct _moal_mod_para { t_u16 multi_dtim; t_u16 inact_tmo; char *reg_alpha2; + int dfs53cfg; } moal_mod_para; /** Handle data structure for MOAL */ @@ -1636,7 +1628,7 @@ struct _moal_handle { #ifdef USB /** Firmware download skip flag */ t_u8 skip_fw_dnld; -#endif /* USB */ +#endif /* USB */ /** Firmware */ const struct firmware *firmware; /** Firmware request start time */ @@ -1688,7 +1680,7 @@ struct _moal_handle { t_u16 hs_activate_wait_q_woken; /** Host Sleep activated event wait queue */ wait_queue_head_t hs_activate_wait_q __ATTRIB_ALIGN__; - /** auto_arp and ipv6 offload enable/disable flag */ + /** auto_arp and ipv6 offload enable/disable flag */ t_u8 hs_auto_arp; /** Card pointer */ t_void *card; @@ -1727,7 +1719,7 @@ struct _moal_handle { struct semaphore reassoc_sem; /** Bitmap for re-association on/off */ t_u8 reassoc_on; -#endif /* REASSOCIATION */ +#endif /* REASSOCIATION */ /** Driver workqueue */ struct workqueue_struct *workqueue; /** main work */ @@ -1738,7 +1730,7 @@ struct _moal_handle { /** Host Mlme Work struct**/ struct work_struct host_mlme_work; #endif - /** Driver workqueue */ + /** Driver workqueue */ struct workqueue_struct *rx_workqueue; /** main work */ struct work_struct rx_work; @@ -1746,11 +1738,11 @@ struct _moal_handle { struct workqueue_struct *evt_workqueue; /** event work */ struct work_struct evt_work; - /** event spin lock */ + /** event spin lock */ spinlock_t evt_lock; - /** event queue */ + /** event queue */ struct list_head evt_queue; - /** remain on channel flag */ + /** remain on channel flag */ t_u8 remain_on_channel; /** bss index for remain on channel */ t_u8 remain_bss_index; @@ -1758,9 +1750,9 @@ struct _moal_handle { struct wiphy *wiphy; /** Country code for regulatory domain */ t_u8 country_code[COUNTRY_CODE_LEN]; - /** band */ + /** band */ enum ieee80211_band band; - /** first scan done flag */ + /** first scan done flag */ t_u8 first_scan_done; #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) /** remain_on_channel timer set flag */ @@ -1778,11 +1770,11 @@ struct _moal_handle { #endif #ifdef WIFI_DIRECT_SUPPORT - /** NoA duration */ + /** NoA duration */ t_u32 noa_duration; - /** NoA interval */ + /** NoA interval */ t_u32 noa_interval; - /** miracast mode */ + /** miracast mode */ t_u8 miracast_mode; /** scan time in miracast mode */ t_u16 miracast_scan_time; @@ -1798,56 +1790,56 @@ struct _moal_handle { #endif /** FW debug flag */ t_u8 fw_dbg; - /** reg debug flag */ + /** reg debug flag */ t_u8 reg_dbg; #ifdef SDIO -#endif /* SDIO */ +#endif /* SDIO */ /** Netlink kernel socket */ struct sock *nl_sk; /** Netlink kernel socket number */ t_u32 netlink_num; - /** w_stats wait queue token */ + /** w_stats wait queue token */ BOOLEAN meas_wait_q_woken; - /** w_stats wait queue */ + /** w_stats wait queue */ wait_queue_head_t meas_wait_q __ATTRIB_ALIGN__; - /** Measurement start jiffes */ + /** Measurement start jiffes */ long meas_start_jiffies; - /** CAC checking period flag */ + /** CAC checking period flag */ BOOLEAN cac_period; - /** CAC timer jiffes */ + /** CAC timer jiffes */ long cac_timer_jiffies; - /** User NOP Period in sec */ + /** User NOP Period in sec */ t_u16 usr_nop_period_sec; - /** BSS START command delay executing flag */ + /** BSS START command delay executing flag */ BOOLEAN delay_bss_start; - /** SSID,BSSID parameter of delay executing */ + /** SSID,BSSID parameter of delay executing */ mlan_ssid_bssid delay_ssid_bssid; #ifdef UAP_CFG80211 #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) /* CAC channel info */ struct cfg80211_chan_def dfs_channel; - /* time set flag */ + /* time set flag*/ BOOLEAN is_cac_timer_set; - /** cac_timer */ + /** cac_timer */ moal_drv_timer cac_timer __ATTRIB_ALIGN__; /** cac bss index */ t_u8 cac_bss_index; #endif #endif #if defined(UAP_SUPPORT) -/** channel switch wait queue token */ + /** channel switch wait queue token */ BOOLEAN chsw_wait_q_woken; - /** channel switch wait queue */ + /** channel switch wait queue */ wait_queue_head_t chsw_wait_q __ATTRIB_ALIGN__; #endif - /** cac period length, valid only when dfs testing is enabled */ + /** cac period length, valid only when dfs testing is enabled */ long cac_period_jiffies; - /** handle index - for multiple card supports */ + /** handle index - for multiple card supports */ t_u8 handle_idx; #if defined(USB) - /** Flag to indicate boot state */ + /** Flag to indicate boot state */ t_u8 boot_state; -#endif /* USB_NEW_FW_DNLD */ +#endif /* USB_NEW_FW_DNLD */ #ifdef SDIO_MMC_DEBUG /** cmd53 write state */ u8 cmd53w; @@ -1857,11 +1849,11 @@ struct _moal_handle { #ifdef STA_SUPPORT /** Scan pending on blocked flag */ t_u8 scan_pending_on_block; - /** Scan Private pointer */ + /** Scan Private pointer */ moal_private *scan_priv; /** Async scan semaphore */ struct semaphore async_sem; - /** scan channel gap */ + /** scan channel gap */ t_u16 scan_chan_gap; #ifdef STA_CFG80211 /** CFG80211 scan request description */ @@ -1870,15 +1862,15 @@ struct _moal_handle { #endif /** main state */ t_u8 main_state; - /** driver status */ + /** driver status */ t_u8 driver_status; - /** driver state */ + /** driver state */ t_u8 driver_state; - /** ioctl timeout */ + /** ioctl timeout */ t_u8 ioctl_timeout; - /** FW dump state */ + /** FW dump state */ t_u8 fw_dump; - /** FW dump full name */ + /** FW dump full name */ t_u8 firmware_dump_file[128]; #ifdef SDIO /** cmd52 function */ @@ -1900,7 +1892,7 @@ struct _moal_handle { spinlock_t scan_req_lock; /** Interface type: 1 byte, Card type: 1 byte */ t_u16 card_type; - /** card revsion */ + /** card revsion */ t_u8 card_rev; /** card info */ card_info *card_info; @@ -1931,25 +1923,25 @@ struct _moal_handle { mlan_debug_info debug_info; /* block id in module param config file */ int blk_id; - /** time when FW is active, time is get from boot time, in Nanosecond */ + /** time when FW is active, time is get from boot time, in Nanosecond */ t_u64 on_time; - /** tx time, in usecs */ + /** tx time, in usecs */ t_u64 tx_time; - /** systime when tx start */ + /** systime when tx start */ wifi_timeval tx_time_start; - /** systime when tx end */ + /** systime when tx end */ wifi_timeval tx_time_end; - /** rx time, in usecs */ + /** rx time, in usecs */ t_u64 rx_time; - /** scan time, in usecs */ + /** scan time, in usecs */ t_u64 scan_time; - /** systime when scan cmd response return success */ + /** systime when scan cmd response return success */ wifi_timeval scan_time_start; - /** systime when scan event has no more event */ + /** systime when scan event has no more event */ wifi_timeval scan_time_end; /** seecond mac flag */ t_u8 second_mac; - /** moal handle for another mac */ + /** moal handle for another mac */ void *pref_mac; }; @@ -1960,8 +1952,7 @@ struct _moal_handle { * @param idx extended flags id * @return N/A */ -static inline void -moal_extflg_set(moal_handle *handle, enum ext_mod_params idx) +static inline void moal_extflg_set(moal_handle *handle, enum ext_mod_params idx) { t_u8 *ext_fbyte; ext_fbyte = &handle->params.ext_flgs[idx / 8]; @@ -1975,8 +1966,8 @@ moal_extflg_set(moal_handle *handle, enum ext_mod_params idx) * @param idx extended flags id * @return N/A */ -static inline void -moal_extflg_clear(moal_handle *handle, enum ext_mod_params idx) +static inline void moal_extflg_clear(moal_handle *handle, + enum ext_mod_params idx) { t_u8 *ext_fbyte; ext_fbyte = &handle->params.ext_flgs[idx / 8]; @@ -1990,8 +1981,8 @@ moal_extflg_clear(moal_handle *handle, enum ext_mod_params idx) * @param idx extended flags id * @return value of extended flag */ -static inline t_u8 -moal_extflg_isset(moal_handle *handle, enum ext_mod_params idx) +static inline t_u8 moal_extflg_isset(moal_handle *handle, + enum ext_mod_params idx) { t_u8 ext_fbyte; ext_fbyte = handle->params.ext_flgs[idx / 8]; @@ -2005,8 +1996,7 @@ moal_extflg_isset(moal_handle *handle, enum ext_mod_params idx) * * @return N/A */ -static inline void -woal_set_trans_start(struct net_device *dev) +static inline void woal_set_trans_start(struct net_device *dev) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31) unsigned int i; @@ -2027,8 +2017,7 @@ woal_set_trans_start(struct net_device *dev) * * @return N/A */ -static inline void -woal_start_queue(struct net_device *dev) +static inline void woal_start_queue(struct net_device *dev) { #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 29) netif_start_queue(dev); @@ -2047,8 +2036,7 @@ woal_start_queue(struct net_device *dev) * * @return N/A */ -static inline void -woal_stop_queue(struct net_device *dev) +static inline void woal_stop_queue(struct net_device *dev) { #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 29) unsigned long flags; @@ -2072,8 +2060,7 @@ woal_stop_queue(struct net_device *dev) * * @return N/A */ -static inline void -woal_wake_queue(struct net_device *dev) +static inline void woal_wake_queue(struct net_device *dev) { #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 29) unsigned long flags; @@ -2089,115 +2076,150 @@ woal_wake_queue(struct net_device *dev) } /** Debug Macro definition*/ -#ifdef DEBUG_LEVEL1 +#ifdef DEBUG_LEVEL1 extern t_u32 drvdbg; -#define LOG_CTRL(level) (0) +#define LOG_CTRL(level) (0) -#ifdef DEBUG_LEVEL2 -#define PRINTM_MINFO(level, msg...) do { \ - woal_print(level, msg); \ - if (drvdbg & MINFO) printk(KERN_DEBUG msg); \ -} while (0) -#define PRINTM_MWARN(level, msg...) do { \ - woal_print(level, msg); \ - if (drvdbg & MWARN) printk(KERN_DEBUG msg); \ -} while (0) -#define PRINTM_MENTRY(level, msg...) do { \ - woal_print(level, msg); \ - if (drvdbg & MENTRY) printk(KERN_DEBUG msg); \ -} while (0) +#ifdef DEBUG_LEVEL2 +#define PRINTM_MINFO(level, msg...) \ + do { \ + woal_print(level, msg); \ + if (drvdbg & MINFO) \ + printk(KERN_DEBUG msg); \ + } while (0) +#define PRINTM_MWARN(level, msg...) \ + do { \ + woal_print(level, msg); \ + if (drvdbg & MWARN) \ + printk(KERN_DEBUG msg); \ + } while (0) +#define PRINTM_MENTRY(level, msg...) \ + do { \ + woal_print(level, msg); \ + if (drvdbg & MENTRY) \ + printk(KERN_DEBUG msg); \ + } while (0) #else -#define PRINTM_MINFO(level, msg...) do {} while (0) -#define PRINTM_MWARN(level, msg...) do {} while (0) -#define PRINTM_MENTRY(level, msg...) do {} while (0) +#define PRINTM_MINFO(level, msg...) \ + do { \ + } while (0) +#define PRINTM_MWARN(level, msg...) \ + do { \ + } while (0) +#define PRINTM_MENTRY(level, msg...) \ + do { \ + } while (0) #endif /* DEBUG_LEVEL2 */ -#define PRINTM_MFW_D(level, msg...) do { \ - woal_print(level, msg); \ - if (drvdbg & MFW_D) printk(KERN_DEBUG msg); \ -} while (0) -#define PRINTM_MCMD_D(level, msg...) do { \ - woal_print(level, msg); \ - if (drvdbg & MCMD_D) printk(KERN_DEBUG msg); \ -} while (0) -#define PRINTM_MDAT_D(level, msg...) do { \ - woal_print(level, msg); \ - if (drvdbg & MDAT_D) printk(KERN_DEBUG msg); \ -} while (0) -#define PRINTM_MIF_D(level, msg...) do { \ - woal_print(level, msg); \ - if (drvdbg & MIF_D) printk(KERN_DEBUG msg); \ -} while (0) +#define PRINTM_MFW_D(level, msg...) \ + do { \ + woal_print(level, msg); \ + if (drvdbg & MFW_D) \ + printk(KERN_DEBUG msg); \ + } while (0) +#define PRINTM_MCMD_D(level, msg...) \ + do { \ + woal_print(level, msg); \ + if (drvdbg & MCMD_D) \ + printk(KERN_DEBUG msg); \ + } while (0) +#define PRINTM_MDAT_D(level, msg...) \ + do { \ + woal_print(level, msg); \ + if (drvdbg & MDAT_D) \ + printk(KERN_DEBUG msg); \ + } while (0) +#define PRINTM_MIF_D(level, msg...) \ + do { \ + woal_print(level, msg); \ + if (drvdbg & MIF_D) \ + printk(KERN_DEBUG msg); \ + } while (0) -#define PRINTM_MIOCTL(level, msg...) do { \ - woal_print(level, msg); \ - if (drvdbg & MIOCTL) printk(KERN_DEBUG msg); \ -} while (0) -#define PRINTM_MINTR(level, msg...) do { \ - woal_print(level, msg); \ - if (drvdbg & MINTR) printk(KERN_DEBUG msg); \ -} while (0) -#define PRINTM_MEVENT(level, msg...) do { \ - woal_print(level, msg); \ - if (drvdbg & MEVENT) printk(msg); \ -} while (0) -#define PRINTM_MCMND(level, msg...) do { \ - woal_print(level, msg); \ - if (drvdbg & MCMND) printk(KERN_DEBUG msg); \ -} while (0) -#define PRINTM_MDATA(level, msg...) do { \ - woal_print(level, msg); \ - if (drvdbg & MDATA) printk(KERN_DEBUG msg); \ -} while (0) -#define PRINTM_MERROR(level, msg...) do { \ - woal_print(level, msg); \ - if (drvdbg & MERROR) printk(KERN_ERR msg); \ -} while (0) -#define PRINTM_MFATAL(level, msg...) do { \ - woal_print(level, msg); \ - if (drvdbg & MFATAL) printk(KERN_ERR msg); \ -} while (0) -#define PRINTM_MMSG(level, msg...) do { \ - woal_print(level, msg); \ - if (drvdbg & MMSG) printk(KERN_ALERT msg); \ -} while (0) +#define PRINTM_MIOCTL(level, msg...) \ + do { \ + woal_print(level, msg); \ + if (drvdbg & MIOCTL) \ + printk(KERN_DEBUG msg); \ + } while (0) +#define PRINTM_MINTR(level, msg...) \ + do { \ + woal_print(level, msg); \ + if (drvdbg & MINTR) \ + printk(KERN_DEBUG msg); \ + } while (0) +#define PRINTM_MEVENT(level, msg...) \ + do { \ + woal_print(level, msg); \ + if (drvdbg & MEVENT) \ + printk(msg); \ + } while (0) +#define PRINTM_MCMND(level, msg...) \ + do { \ + woal_print(level, msg); \ + if (drvdbg & MCMND) \ + printk(KERN_DEBUG msg); \ + } while (0) +#define PRINTM_MDATA(level, msg...) \ + do { \ + woal_print(level, msg); \ + if (drvdbg & MDATA) \ + printk(KERN_DEBUG msg); \ + } while (0) +#define PRINTM_MERROR(level, msg...) \ + do { \ + woal_print(level, msg); \ + if (drvdbg & MERROR) \ + printk(KERN_ERR msg); \ + } while (0) +#define PRINTM_MFATAL(level, msg...) \ + do { \ + woal_print(level, msg); \ + if (drvdbg & MFATAL) \ + printk(KERN_ERR msg); \ + } while (0) +#define PRINTM_MMSG(level, msg...) \ + do { \ + woal_print(level, msg); \ + if (drvdbg & MMSG) \ + printk(KERN_ALERT msg); \ + } while (0) -static inline void -woal_print(t_u32 level, char *fmt, ...) +static inline void woal_print(t_u32 level, char *fmt, ...) { } -#define PRINTM(level, msg...) PRINTM_##level(level, msg) +#define PRINTM(level, msg...) PRINTM_##level(level, msg) #else -#define PRINTM(level, msg...) do {} while (0) +#define PRINTM(level, msg...) \ + do { \ + } while (0) #endif /* DEBUG_LEVEL1 */ /** Wait until a condition becomes true */ -#define MASSERT(cond) \ -do { \ - if (!(cond)) { \ - PRINTM(MFATAL, "ASSERT: %s: %i\n", __func__, __LINE__); \ - panic("Assert failed: Panic!"); \ - } \ -} while (0) +#define MASSERT(cond) \ + do { \ + if (!(cond)) { \ + PRINTM(MFATAL, "ASSERT: %s: %i\n", __func__, \ + __LINE__); \ + panic("Assert failed: Panic!"); \ + } \ + } while (0) /** Log entry point for debugging */ -#define ENTER() PRINTM(MENTRY, "Enter: %s\n", \ - __func__) +#define ENTER() PRINTM(MENTRY, "Enter: %s\n", __func__) /** Log exit point for debugging */ -#define LEAVE() PRINTM(MENTRY, "Leave: %s\n", \ - __func__) +#define LEAVE() PRINTM(MENTRY, "Leave: %s\n", __func__) #ifdef DEBUG_LEVEL1 -#define DBG_DUMP_BUF_LEN 64 -#define MAX_DUMP_PER_LINE 16 +#define DBG_DUMP_BUF_LEN 64 +#define MAX_DUMP_PER_LINE 16 -static inline void -hexdump(t_u32 level, char *prompt, t_u8 *buf, int len) +static inline void hexdump(t_u32 level, char *prompt, t_u8 *buf, int len) { int i; char dbgdumpbuf[DBG_DUMP_BUF_LEN]; @@ -2222,45 +2244,56 @@ hexdump(t_u32 level, char *prompt, t_u8 *buf, int len) } } -#define DBG_HEXDUMP_MERROR(x, y, z) do { \ - if ((drvdbg & MERROR) || LOG_CTRL(MERROR)) \ - hexdump(MERROR, x, y, z); \ -} while (0) -#define DBG_HEXDUMP_MCMD_D(x, y, z) do { \ - if ((drvdbg & MCMD_D) || LOG_CTRL(MCMD_D)) \ - hexdump(MCMD_D, x, y, z); \ -} while (0) -#define DBG_HEXDUMP_MDAT_D(x, y, z) do { \ - if ((drvdbg & MDAT_D) || LOG_CTRL(MDAT_D)) \ - hexdump(MDAT_D, x, y, z); \ -} while (0) -#define DBG_HEXDUMP_MIF_D(x, y, z) do { \ - if ((drvdbg & MIF_D) || LOG_CTRL(MIF_D)) \ - hexdump(MIF_D, x, y, z); \ -} while (0) -#define DBG_HEXDUMP_MEVT_D(x, y, z) do { \ - if ((drvdbg & MEVT_D) || LOG_CTRL(MEVT_D)) \ - hexdump(MEVT_D, x, y, z); \ -} while (0) -#define DBG_HEXDUMP_MFW_D(x, y, z) do { \ - if ((drvdbg & MFW_D) || LOG_CTRL(MFW_D)) \ - hexdump(MFW_D, x, y, z); \ -} while (0) -#define DBG_HEXDUMP(level, x, y, z) DBG_HEXDUMP_##level(x, y, z) +#define DBG_HEXDUMP_MERROR(x, y, z) \ + do { \ + if ((drvdbg & MERROR) || LOG_CTRL(MERROR)) \ + hexdump(MERROR, x, y, z); \ + } while (0) +#define DBG_HEXDUMP_MCMD_D(x, y, z) \ + do { \ + if ((drvdbg & MCMD_D) || LOG_CTRL(MCMD_D)) \ + hexdump(MCMD_D, x, y, z); \ + } while (0) +#define DBG_HEXDUMP_MDAT_D(x, y, z) \ + do { \ + if ((drvdbg & MDAT_D) || LOG_CTRL(MDAT_D)) \ + hexdump(MDAT_D, x, y, z); \ + } while (0) +#define DBG_HEXDUMP_MIF_D(x, y, z) \ + do { \ + if ((drvdbg & MIF_D) || LOG_CTRL(MIF_D)) \ + hexdump(MIF_D, x, y, z); \ + } while (0) +#define DBG_HEXDUMP_MEVT_D(x, y, z) \ + do { \ + if ((drvdbg & MEVT_D) || LOG_CTRL(MEVT_D)) \ + hexdump(MEVT_D, x, y, z); \ + } while (0) +#define DBG_HEXDUMP_MFW_D(x, y, z) \ + do { \ + if ((drvdbg & MFW_D) || LOG_CTRL(MFW_D)) \ + hexdump(MFW_D, x, y, z); \ + } while (0) +#define DBG_HEXDUMP(level, x, y, z) DBG_HEXDUMP_##level(x, y, z) #else /** Do nothing since debugging is not turned on */ -#define DBG_HEXDUMP(level, x, y, z) do {} while (0) +#define DBG_HEXDUMP(level, x, y, z) \ + do { \ + } while (0) #endif #ifdef DEBUG_LEVEL2 -#define HEXDUMP(x, y, z) do { \ - if ((drvdbg & MINFO) || LOG_CTRL(MINFO)) \ - hexdump(MINFO, x, y, z); \ -} while (0) +#define HEXDUMP(x, y, z) \ + do { \ + if ((drvdbg & MINFO) || LOG_CTRL(MINFO)) \ + hexdump(MINFO, x, y, z); \ + } while (0) #else /** Do nothing since debugging is not turned on */ -#define HEXDUMP(x, y, z) do {} while (0) +#define HEXDUMP(x, y, z) \ + do { \ + } while (0) #endif #ifdef BIG_ENDIAN_SUPPORT @@ -2300,8 +2333,8 @@ hexdump(t_u32 level, char *prompt, t_u8 *buf, int len) * * @return Pointer to moal_private */ -static inline moal_private * -woal_get_priv(moal_handle *handle, mlan_bss_role bss_role) +static inline moal_private *woal_get_priv(moal_handle *handle, + mlan_bss_role bss_role) { int i; @@ -2324,8 +2357,8 @@ woal_get_priv(moal_handle *handle, mlan_bss_role bss_role) * * @return Pointer to moal_private */ -static inline moal_private * -woal_get_priv_bss_type(moal_handle *handle, mlan_bss_type bss_type) +static inline moal_private *woal_get_priv_bss_type(moal_handle *handle, + mlan_bss_type bss_type) { int i; @@ -2342,8 +2375,7 @@ woal_get_priv_bss_type(moal_handle *handle, mlan_bss_type bss_type) #if defined(STA_CFG80211) || defined(UAP_CFG80211) #endif -static inline void -woal_get_monotonic_time(struct timeval *tv) +static inline void woal_get_monotonic_time(struct timeval *tv) { struct timespec ts; @@ -2358,18 +2390,18 @@ woal_get_monotonic_time(struct timeval *tv) #define MEAS_REPORT_TIME (60 * HZ) /** Max line length allowed in init config file */ -#define MAX_LINE_LEN 256 +#define MAX_LINE_LEN 256 /** Max MAC address string length allowed */ -#define MAX_MAC_ADDR_LEN 18 +#define MAX_MAC_ADDR_LEN 18 /** Max register type/offset/value etc. parameter length allowed */ -#define MAX_PARAM_LEN 12 +#define MAX_PARAM_LEN 12 /** HostCmd_CMD_CFG_DATA for CAL data */ #define HostCmd_CMD_CFG_DATA 0x008f /** HostCmd action set */ #define HostCmd_ACT_GEN_SET 0x0001 /** HostCmd CAL data header length */ -#define CFG_DATA_HEADER_LEN 6 +#define CFG_DATA_HEADER_LEN 6 typedef struct _HostCmd_DS_GEN { t_u16 command; @@ -2379,76 +2411,76 @@ typedef struct _HostCmd_DS_GEN { } HostCmd_DS_GEN; typedef struct _HostCmd_DS_802_11_CFG_DATA { - /** Action */ + /** Action */ t_u16 action; - /** Type */ + /** Type */ t_u16 type; - /** Data length */ + /** Data length */ t_u16 data_len; - /** Data */ + /** Data */ t_u8 data[1]; } __ATTRIB_PACK__ HostCmd_DS_802_11_CFG_DATA; /** combo scan header */ -#define WEXT_CSCAN_HEADER "CSCAN S\x01\x00\x00S\x00" +#define WEXT_CSCAN_HEADER "CSCAN S\x01\x00\x00S\x00" /** combo scan header size */ -#define WEXT_CSCAN_HEADER_SIZE 12 +#define WEXT_CSCAN_HEADER_SIZE 12 /** combo scan ssid section */ -#define WEXT_CSCAN_SSID_SECTION 'S' +#define WEXT_CSCAN_SSID_SECTION 'S' /** commbo scan channel section */ -#define WEXT_CSCAN_CHANNEL_SECTION 'C' +#define WEXT_CSCAN_CHANNEL_SECTION 'C' /** commbo scan passive dwell section */ -#define WEXT_CSCAN_PASV_DWELL_SECTION 'P' +#define WEXT_CSCAN_PASV_DWELL_SECTION 'P' /** commbo scan home dwell section */ -#define WEXT_CSCAN_HOME_DWELL_SECTION 'H' +#define WEXT_CSCAN_HOME_DWELL_SECTION 'H' /** BGSCAN RSSI section */ -#define WEXT_BGSCAN_RSSI_SECTION 'R' +#define WEXT_BGSCAN_RSSI_SECTION 'R' /** BGSCAN SCAN INTERVAL SECTION */ #define WEXT_BGSCAN_INTERVAL_SECTION 'T' /** BGSCAN REPEAT SECTION */ -#define WEXT_BGSCAN_REPEAT_SECTION 'E' +#define WEXT_BGSCAN_REPEAT_SECTION 'E' /** Min BGSCAN interval 30 second */ -#define MIN_BGSCAN_INTERVAL 30000 +#define MIN_BGSCAN_INTERVAL 30000 /** default repeat count */ -#define DEF_REPEAT_COUNT 6 +#define DEF_REPEAT_COUNT 6 /** default rssi low threshold */ #define DEFAULT_RSSI_LOW_THRESHOLD 70 /** RSSI HYSTERSIS */ -#define RSSI_HYSTERESIS 6 +#define RSSI_HYSTERESIS 6 /** lowest rssi threshold */ -#define LOWEST_RSSI_THRESHOLD 82 +#define LOWEST_RSSI_THRESHOLD 82 /** delta rssi */ #define DELTA_RSSI 10 /** NL80211 scan configuration header */ -#define NL80211_SCANCFG_HEADER "SCAN-CFG " +#define NL80211_SCANCFG_HEADER "SCAN-CFG " /** NL80211 scan configuration header length */ -#define NL80211_SCANCFG_HEADER_SIZE 9 +#define NL80211_SCANCFG_HEADER_SIZE 9 /** NL80211 scan configuration active scan section */ -#define NL80211_SCANCFG_ACTV_DWELL_SECTION 'A' +#define NL80211_SCANCFG_ACTV_DWELL_SECTION 'A' /** NL80211 scan configuration passive scan section */ -#define NL80211_SCANCFG_PASV_DWELL_SECTION 'P' +#define NL80211_SCANCFG_PASV_DWELL_SECTION 'P' /** NL80211 scan configuration specific scan section */ -#define NL80211_SCANCFG_SPCF_DWELL_SECTION 'S' +#define NL80211_SCANCFG_SPCF_DWELL_SECTION 'S' /** band AUTO */ -#define WIFI_FREQUENCY_BAND_AUTO 0 +#define WIFI_FREQUENCY_BAND_AUTO 0 /** band 5G */ -#define WIFI_FREQUENCY_BAND_5GHZ 1 +#define WIFI_FREQUENCY_BAND_5GHZ 1 /** band 2G */ -#define WIFI_FREQUENCY_BAND_2GHZ 2 +#define WIFI_FREQUENCY_BAND_2GHZ 2 /** All band */ -#define WIFI_FREQUENCY_ALL_BAND 3 +#define WIFI_FREQUENCY_ALL_BAND 3 /** Rx filter: IPV4 multicast */ -#define RX_FILTER_IPV4_MULTICAST 1 +#define RX_FILTER_IPV4_MULTICAST 1 /** Rx filter: broadcast */ -#define RX_FILTER_BROADCAST 2 +#define RX_FILTER_BROADCAST 2 /** Rx filter: unicast */ -#define RX_FILTER_UNICAST 4 +#define RX_FILTER_UNICAST 4 /** Rx filter: IPV6 multicast */ -#define RX_FILTER_IPV6_MULTICAST 8 +#define RX_FILTER_IPV6_MULTICAST 8 /** Convert ASCII string to hex value */ int woal_ascii2hex(t_u8 *d, char *s, t_u32 dlen); @@ -2494,8 +2526,8 @@ mlan_status woal_shutdown_fw(moal_private *priv, t_u8 wait_option); /* Functions in interface module */ #ifdef ANDROID_KERNEL #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) -static inline void -wakeup_source_init(struct wakeup_source *ws, const char *name) +static inline void wakeup_source_init(struct wakeup_source *ws, + const char *name) { ENTER(); @@ -2508,8 +2540,7 @@ wakeup_source_init(struct wakeup_source *ws, const char *name) LEAVE(); } -static inline void -wakeup_source_trash(struct wakeup_source *ws) +static inline void wakeup_source_trash(struct wakeup_source *ws) { ENTER(); @@ -2525,7 +2556,7 @@ wakeup_source_trash(struct wakeup_source *ws) #endif #endif /** Add card */ -moal_handle *woal_add_card(void *card, struct device *dev, moal_if_ops * if_ops, +moal_handle *woal_add_card(void *card, struct device *dev, moal_if_ops *if_ops, t_u16 card_type); /** Remove card */ mlan_status woal_remove_card(void *card); @@ -2592,14 +2623,13 @@ mlan_status woal_request_get_fw_info(moal_private *priv, t_u8 wait_option, mlan_fw_info *fw_info); /** Get channel of active intf */ mlan_status woal_get_active_intf_channel(moal_private *priv, - chan_band_info * channel); + chan_band_info *channel); #ifdef STA_SUPPORT /** Request Exented Capability information */ int woal_request_extcap(moal_private *priv, t_u8 *buf, t_u8 len); #endif -mlan_status woal_set_get_dtim_period(moal_private *priv, - t_u32 action, t_u8 wait_option, - t_u8 *value); +mlan_status woal_set_get_dtim_period(moal_private *priv, t_u32 action, + t_u8 wait_option, t_u8 *value); /** Set/get Host Sleep parameters */ mlan_status woal_set_get_hs_params(moal_private *priv, t_u16 action, t_u8 wait_option, mlan_ds_hs_cfg *hscfg); @@ -2608,7 +2638,7 @@ mlan_status woal_cancel_hs(moal_private *priv, t_u8 wait_option); /** Enable Host Sleep configuration */ int woal_enable_hs(moal_private *priv); /** hs active timeout 2 second */ -#define HS_ACTIVE_TIMEOUT (2 * HZ) +#define HS_ACTIVE_TIMEOUT (2 * HZ) /** Get wakeup reason */ mlan_status woal_get_wakeup_reason(moal_private *priv, mlan_ds_hs_wakeup_reason *wakeup_reason); @@ -2619,15 +2649,15 @@ mlan_status woal_save_dump_info_to_file(char *dir_name, char *file_name, t_u8 *buf, t_u32 buf_len); void woal_dump_drv_info(moal_handle *phandle, t_u8 *dir_name); -#define FW_DUMP_TYPE_ENDED 0x002 -#define FW_DUMP_TYPE_MEM_ITCM 0x004 -#define FW_DUMP_TYPE_MEM_DTCM 0x005 -#define FW_DUMP_TYPE_MEM_SQRAM 0x006 -#define FW_DUMP_TYPE_MEM_IRAM 0x007 -#define FW_DUMP_TYPE_REG_MAC 0x009 -#define FW_DUMP_TYPE_REG_CIU 0x00E -#define FW_DUMP_TYPE_REG_APU 0x00F -#define FW_DUMP_TYPE_REG_ICU 0x014 +#define FW_DUMP_TYPE_ENDED 0x002 +#define FW_DUMP_TYPE_MEM_ITCM 0x004 +#define FW_DUMP_TYPE_MEM_DTCM 0x005 +#define FW_DUMP_TYPE_MEM_SQRAM 0x006 +#define FW_DUMP_TYPE_MEM_IRAM 0x007 +#define FW_DUMP_TYPE_REG_MAC 0x009 +#define FW_DUMP_TYPE_REG_CIU 0x00E +#define FW_DUMP_TYPE_REG_APU 0x00F +#define FW_DUMP_TYPE_REG_ICU 0x014 #ifdef SDIO_MMC void woal_dump_firmware_info(moal_handle *phandle); void woal_dump_firmware_info_v2(moal_handle *phandle); @@ -2671,7 +2701,7 @@ mlan_status woal_get_signal_info(moal_private *priv, t_u8 wait_option, /** Get mode */ t_u32 woal_get_mode(moal_private *priv, t_u8 wait_option); mlan_status woal_get_sta_channel(moal_private *priv, t_u8 wait_option, - chan_band_info * channel); + chan_band_info *channel); #ifdef STA_WEXT /** Get data rates */ mlan_status woal_get_data_rates(moal_private *priv, t_u8 wait_option, @@ -2740,7 +2770,7 @@ mlan_status woal_get_encrypt_mode(moal_private *priv, t_u8 wait_option, /** Get WPA state */ mlan_status woal_get_wpa_enable(moal_private *priv, t_u8 wait_option, t_u32 *enable); -#endif /**STA_SUPPORT */ +#endif /**STA_SUPPORT */ mlan_status woal_set_11d(moal_private *priv, t_u8 wait_option, t_u8 enable); @@ -2748,7 +2778,7 @@ mlan_status woal_set_11d(moal_private *priv, t_u8 wait_option, t_u8 enable); /** Get statistics information */ mlan_status woal_get_stats_info(moal_private *priv, t_u8 wait_option, mlan_ds_get_stats *stats); -#endif /**STA_SUPPORT||UAP_SUPPORT*/ +#endif /**STA_SUPPORT||UAP_SUPPORT*/ mlan_status woal_set_wapi_enable(moal_private *priv, t_u8 wait_option, t_u32 enable); @@ -2757,17 +2787,17 @@ mlan_status woal_set_wapi_enable(moal_private *priv, t_u8 wait_option, void woal_init_priv(moal_private *priv, t_u8 wait_option); /** Reset interface(s) */ int woal_reset_intf(moal_private *priv, t_u8 wait_option, int all_intf); -#define TLV_TYPE_MGMT_IE (0x169) -#define MGMT_MASK_ASSOC_REQ 0x01 -#define MGMT_MASK_REASSOC_REQ 0x04 -#define MGMT_MASK_ASSOC_RESP 0x02 -#define MGMT_MASK_REASSOC_RESP 0x08 -#define MGMT_MASK_PROBE_REQ 0x10 -#define MGMT_MASK_PROBE_RESP 0x20 -#define MGMT_MASK_BEACON 0x100 -#define MGMT_MASK_ASSOC_RESP_QOS_MAP 0x4000 -#define MGMT_MASK_BEACON_WPS_P2P 0x8000 -#define MLAN_CUSTOM_IE_DELETE_MASK 0x0 +#define TLV_TYPE_MGMT_IE (0x169) +#define MGMT_MASK_ASSOC_REQ 0x01 +#define MGMT_MASK_REASSOC_REQ 0x04 +#define MGMT_MASK_ASSOC_RESP 0x02 +#define MGMT_MASK_REASSOC_RESP 0x08 +#define MGMT_MASK_PROBE_REQ 0x10 +#define MGMT_MASK_PROBE_RESP 0x20 +#define MGMT_MASK_BEACON 0x100 +#define MGMT_MASK_ASSOC_RESP_QOS_MAP 0x4000 +#define MGMT_MASK_BEACON_WPS_P2P 0x8000 +#define MLAN_CUSTOM_IE_DELETE_MASK 0x0 /** common ioctl for uap, station */ int woal_custom_ie_ioctl(struct net_device *dev, struct ifreq *req); #ifdef UAP_SUPPORT @@ -2778,15 +2808,15 @@ int woal_priv_get_nonglobal_operclass_by_bw_channel(moal_private *priv, #endif int woal_send_host_packet(struct net_device *dev, struct ifreq *req); /** Private command ID to pass mgmt frame */ -#define WOAL_MGMT_FRAME_TX_IOCTL (SIOCDEVPRIVATE + 12) +#define WOAL_MGMT_FRAME_TX_IOCTL (SIOCDEVPRIVATE + 12) int woal_get_bss_type(struct net_device *dev, struct ifreq *req); #if defined(STA_WEXT) || defined(UAP_WEXT) int woal_host_command(moal_private *priv, struct iwreq *wrq); #endif #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) -mlan_status woal_bss_role_cfg(moal_private *priv, t_u8 action, - t_u8 wait_option, t_u8 *bss_role); +mlan_status woal_bss_role_cfg(moal_private *priv, t_u8 action, t_u8 wait_option, + t_u8 *bss_role); #if defined(STA_CFG80211) && defined(UAP_CFG80211) void woal_go_timer_func(void *context); #endif @@ -2899,15 +2929,15 @@ int woal_set_scan_cfg(moal_private *priv, char *buf, int length); void woal_update_dscp_mapping(moal_private *priv); /* EVENT: BCN_RSSI_LOW */ -#define EVENT_BCN_RSSI_LOW 0x0001 +#define EVENT_BCN_RSSI_LOW 0x0001 /* EVENT: PRE_BCN_LOST */ -#define EVENT_PRE_BCN_LOST 0x0002 +#define EVENT_PRE_BCN_LOST 0x0002 mlan_status woal_set_rssi_low_threshold(moal_private *priv, char *rssi, t_u8 wait_option); mlan_status woal_set_rssi_threshold(moal_private *priv, t_u32 event_id, t_u8 wait_option); /* EVENT: BG_SCAN_REPORT */ -#define EVENT_BG_SCAN_REPORT 0x0004 +#define EVENT_BG_SCAN_REPORT 0x0004 mlan_status woal_set_bg_scan(moal_private *priv, char *buf, int length); mlan_status woal_stop_bg_scan(moal_private *priv, t_u8 wait_option); void woal_reconfig_bgscan(moal_handle *handle); @@ -2964,7 +2994,7 @@ mlan_status woal_delba_all(moal_private *priv, t_u8 wait_option); #ifdef STA_CFG80211 #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) int woal_mkeep_alive_vendor_event(moal_private *priv, - mlan_ds_misc_keep_alive * mkeep_alive); + mlan_ds_misc_keep_alive *mkeep_alive); #endif #endif int woal_start_mkeep_alive(moal_private *priv, t_u8 mkeep_alive_id, @@ -2973,19 +3003,16 @@ int woal_start_mkeep_alive(moal_private *priv, t_u8 mkeep_alive_id, t_u32 retry_interval, t_u8 retry_cnt); int woal_stop_mkeep_alive(moal_private *priv, t_u8 mkeep_alive_id, t_u8 reset, t_u8 *ip_pkt, t_u8 *pkt_len); -int woal_priv_save_cloud_keep_alive_params(moal_private *priv, - t_u8 mkeep_alive_id, t_u8 enable, - t_u16 ether_type, t_u8 *ip_pkt, - t_u16 ip_pkt_len, t_u8 *src_mac, - t_u8 *dst_mac, t_u32 period_msec, - t_u32 retry_interval, - t_u8 retry_cnt); +int woal_priv_save_cloud_keep_alive_params( + moal_private *priv, t_u8 mkeep_alive_id, t_u8 enable, t_u16 ether_type, + t_u8 *ip_pkt, t_u16 ip_pkt_len, t_u8 *src_mac, t_u8 *dst_mac, + t_u32 period_msec, t_u32 retry_interval, t_u8 retry_cnt); mlan_status woal_init_aggr_ctrl(moal_handle *handle, t_u8 wait_option); #ifdef STA_CFG80211 #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) mlan_status woal_set_rekey_data(moal_private *priv, - mlan_ds_misc_gtk_rekey_data * gtk_rekey, + mlan_ds_misc_gtk_rekey_data *gtk_rekey, t_u8 action, t_u8 wait_option); #endif #endif diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_pcie.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_pcie.c index 35c26c0a5d09..aef47db72593 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_pcie.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_pcie.c @@ -1,25 +1,25 @@ /** @file moal_pcie.c - * - * @brief This file contains PCIE IF (interface) module - * related functions. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains PCIE IF (interface) module + * related functions. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /******************************************************** Change log: @@ -28,12 +28,12 @@ Change log: #include -#include "moal_pcie.h" +#include "moal_pcie.h" /******************************************************** Local Variables ********************************************************/ -#define DRV_NAME "NXP mdriver PCIe" +#define DRV_NAME "NXP mdriver PCIe" /* PCIE resume handler */ static int woal_pcie_resume(struct pci_dev *pdev); @@ -49,39 +49,62 @@ extern moal_handle **m_handle; static const struct pci_device_id wlan_ids[] = { #ifdef PCIE8897 { - PCIE_VENDOR_ID_NXP, PCIE_DEVICE_ID_NXP_88W8897P, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - }, + PCIE_VENDOR_ID_NXP, + PCIE_DEVICE_ID_NXP_88W8897P, + PCI_ANY_ID, + PCI_ANY_ID, + 0, + 0, + }, #endif #ifdef PCIE8997 { - PCIE_VENDOR_ID_NXP, PCIE_DEVICE_ID_NXP_88W8997P, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - }, + PCIE_VENDOR_ID_NXP, + PCIE_DEVICE_ID_NXP_88W8997P, + PCI_ANY_ID, + PCI_ANY_ID, + 0, + 0, + }, { - PCIE_VENDOR_ID_V2_NXP, PCIE_DEVICE_ID_NXP_88W8997P, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - }, + PCIE_VENDOR_ID_V2_NXP, + PCIE_DEVICE_ID_NXP_88W8997P, + PCI_ANY_ID, + PCI_ANY_ID, + 0, + 0, + }, #endif #ifdef PCIE9097 { - PCIE_VENDOR_ID_V2_NXP, PCIE_DEVICE_ID_NXP_88W9097, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - }, + PCIE_VENDOR_ID_V2_NXP, + PCIE_DEVICE_ID_NXP_88W9097, + PCI_ANY_ID, + PCI_ANY_ID, + 0, + 0, + }, #endif #ifdef PCIE9098 { - PCIE_VENDOR_ID_V2_NXP, PCIE_DEVICE_ID_NXP_88W9098P_FN0, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - }, + PCIE_VENDOR_ID_V2_NXP, + PCIE_DEVICE_ID_NXP_88W9098P_FN0, + PCI_ANY_ID, + PCI_ANY_ID, + 0, + 0, + }, { - PCIE_VENDOR_ID_V2_NXP, PCIE_DEVICE_ID_NXP_88W9098P_FN1, - PCI_ANY_ID, PCI_ANY_ID, 0, 0, - }, + PCIE_VENDOR_ID_V2_NXP, + PCIE_DEVICE_ID_NXP_88W9098P_FN1, + PCI_ANY_ID, + PCI_ANY_ID, + 0, + 0, + }, #endif {}, }; - /* moal interface ops */ static moal_if_ops pcie_ops; @@ -101,8 +124,7 @@ static mlan_status woal_pcie_preinit(struct pci_dev *pdev); * * @return N/A */ -static t_u16 -woal_update_card_type(t_void *card) +static t_u16 woal_update_card_type(t_void *card) { pcie_service_card *cardp_pcie = (pcie_service_card *)card; t_u16 card_type = 0; @@ -115,9 +137,10 @@ woal_update_card_type(t_void *card) strlen(CARD_PCIE8897), strlen(driver_version)); moal_memcpy_ext(NULL, driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V15, strlen(V15), + strlen(KERN_VERSION), + V15, strlen(V15), strlen(driver_version) - strlen(INTF_CARDTYPE) - - strlen(KERN_VERSION)); + strlen(KERN_VERSION)); } #endif #ifdef PCIE8997 @@ -127,9 +150,10 @@ woal_update_card_type(t_void *card) strlen(CARD_PCIE8997), strlen(driver_version)); moal_memcpy_ext(NULL, driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V16, strlen(V16), + strlen(KERN_VERSION), + V16, strlen(V16), strlen(driver_version) - strlen(INTF_CARDTYPE) - - strlen(KERN_VERSION)); + strlen(KERN_VERSION)); } #endif #ifdef PCIE9097 @@ -139,9 +163,10 @@ woal_update_card_type(t_void *card) strlen(CARD_PCIE9097), strlen(driver_version)); moal_memcpy_ext(NULL, driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V17, strlen(V17), + strlen(KERN_VERSION), + V17, strlen(V17), strlen(driver_version) - strlen(INTF_CARDTYPE) - - strlen(KERN_VERSION)); + strlen(KERN_VERSION)); } #endif #ifdef PCIE9098 @@ -152,9 +177,10 @@ woal_update_card_type(t_void *card) strlen(CARD_PCIE9098), strlen(driver_version)); moal_memcpy_ext(NULL, driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V17, strlen(V17), + strlen(KERN_VERSION), + V17, strlen(V17), strlen(driver_version) - strlen(INTF_CARDTYPE) - - strlen(KERN_VERSION)); + strlen(KERN_VERSION)); } #endif return card_type; @@ -175,8 +201,7 @@ woal_update_card_type(t_void *card) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_do_flr(moal_handle *handle, bool prepare) +mlan_status woal_do_flr(moal_handle *handle, bool prepare) { unsigned int i; int index = 0; @@ -229,7 +254,6 @@ woal_do_flr(moal_handle *handle, bool prepare) if (atomic_read(&handle->rx_pending) || atomic_read(&handle->tx_pending) || atomic_read(&handle->ioctl_pending)) { - PRINTM(MERROR, "ERR: rx_pending=%d,tx_pending=%d,ioctl_pending=%d\n", atomic_read(&handle->rx_pending), @@ -247,8 +271,8 @@ woal_do_flr(moal_handle *handle, bool prepare) if (atomic_read(&handle->lock_count) || atomic_read(&handle->malloc_count) || atomic_read(&handle->mbufalloc_count)) { - - PRINTM(MERROR, "mlan has memory leak: lock_count=%d," + PRINTM(MERROR, + "mlan has memory leak: lock_count=%d," " malloc_count=%d, mbufalloc_count=%d\n", atomic_read(&handle->lock_count), atomic_read(&handle->malloc_count), @@ -272,6 +296,7 @@ perform_init: PRINTM(MFATAL, "Software Init Failed\n"); goto err_init_fw; } + #ifdef PCIE9098 if (card->dev->device == PCIE_DEVICE_ID_NXP_88W9098P_FN1) mlan_set_int_mode(handle->pmlan_adapter, pcie_int_mode, 1); @@ -357,8 +382,7 @@ err_init_fw: * * @return error code */ -int -woal_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) +int woal_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) { pcie_service_card *card = NULL; t_u16 card_type = 0; @@ -366,8 +390,8 @@ woal_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) ENTER(); - PRINTM(MINFO, "vendor=0x%4.04X device=0x%4.04X rev=%d\n", - pdev->vendor, pdev->device, pdev->revision); + PRINTM(MINFO, "vendor=0x%4.04X device=0x%4.04X rev=%d\n", pdev->vendor, + pdev->device, pdev->revision); /* Preinit PCIE device so allocate PCIE memory can be successful */ if (woal_pcie_preinit(pdev)) { @@ -393,7 +417,8 @@ woal_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) } woal_pcie_init(card); - if (woal_add_card(card, &card->dev->dev, &pcie_ops, card_type) == NULL) { + if (woal_add_card(card, &card->dev->dev, &pcie_ops, card_type) == + NULL) { woal_pcie_cleanup(card); PRINTM(MERROR, "%s: failed\n", __func__); ret = -EFAULT; @@ -418,8 +443,7 @@ err: * * @return error code */ -static void -woal_pcie_remove(struct pci_dev *dev) +static void woal_pcie_remove(struct pci_dev *dev) { pcie_service_card *card; moal_handle *handle; @@ -455,8 +479,7 @@ woal_pcie_remove(struct pci_dev *dev) * * @return error code */ -static int -woal_pcie_suspend(struct pci_dev *pdev, pm_message_t state) +static int woal_pcie_suspend(struct pci_dev *pdev, pm_message_t state) { pcie_service_card *cardp; moal_handle *handle = NULL; @@ -497,7 +520,7 @@ woal_pcie_suspend(struct pci_dev *pdev, pm_message_t state) } handle->suspend_fail = MFALSE; memset(&pm_info, 0, sizeof(pm_info)); -#define MAX_RETRY_NUM 8 +#define MAX_RETRY_NUM 8 for (i = 0; i < MAX_RETRY_NUM; i++) { if (MLAN_STATUS_SUCCESS == woal_get_pm_info(woal_get_priv(handle, MLAN_BSS_ROLE_ANY), @@ -552,8 +575,7 @@ done: * * @return error code */ -static int -woal_pcie_resume(struct pci_dev *pdev) +static int woal_pcie_resume(struct pci_dev *pdev) { moal_handle *handle; pcie_service_card *card; @@ -611,8 +633,7 @@ done: * * @param pdev A pointer to pci_dev structure */ -static void -woal_pcie_reset_prepare(struct pci_dev *pdev) +static void woal_pcie_reset_prepare(struct pci_dev *pdev) { pcie_service_card *card; moal_handle *handle; @@ -643,7 +664,7 @@ woal_pcie_reset_prepare(struct pci_dev *pdev) * PCIe and HW. * Note. FW might not be healthy. */ - //handle-> mac0 , ref_handle->second mac + // handle-> mac0 , ref_handle->second mac if (handle->pref_mac) { if (handle->second_mac) { handle = (moal_handle *)handle->pref_mac; @@ -661,14 +682,12 @@ woal_pcie_reset_prepare(struct pci_dev *pdev) LEAVE(); } - /** * @brief Pcie reset done handler * * @param pdev A pointer to pci_dev structure */ -static void -woal_pcie_reset_done(struct pci_dev *pdev) +static void woal_pcie_reset_done(struct pci_dev *pdev) { pcie_service_card *card; moal_handle *handle; @@ -697,7 +716,7 @@ woal_pcie_reset_done(struct pci_dev *pdev) * * Reconfigure the sw and fw including fw redownload */ - //handle-> mac0 , ref_handle->second mac + // handle-> mac0 , ref_handle->second mac if (handle->pref_mac) { if (handle->second_mac) { handle = (moal_handle *)handle->pref_mac; @@ -716,8 +735,7 @@ woal_pcie_reset_done(struct pci_dev *pdev) LEAVE(); } #else -void -woal_pcie_reset_notify(struct pci_dev *pdev, bool prepare) +void woal_pcie_reset_notify(struct pci_dev *pdev, bool prepare) { pcie_service_card *card; moal_handle *handle; @@ -743,7 +761,7 @@ woal_pcie_reset_notify(struct pci_dev *pdev, bool prepare) __func__, pdev->vendor, pdev->device, pdev->revision, prepare ? "Pre-FLR" : "Post-FLR"); - //handle-> mac0 , ref_handle->second mac + // handle-> mac0 , ref_handle->second mac if (handle->pref_mac) { if (handle->second_mac) { handle = (moal_handle *)handle->pref_mac; @@ -784,14 +802,17 @@ woal_pcie_reset_notify(struct pci_dev *pdev, bool prepare) static const struct pci_error_handlers woal_pcie_err_handler[] = { #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) - {.reset_prepare = woal_pcie_reset_prepare, - .reset_done = woal_pcie_reset_done, - }, + { + .reset_prepare = woal_pcie_reset_prepare, + .reset_done = woal_pcie_reset_done, + }, #else - {.reset_notify = woal_pcie_reset_notify,}, + { + .reset_notify = woal_pcie_reset_notify, + }, #endif }; -#endif //KERNEL_VERSION(3.18.0) +#endif // KERNEL_VERSION(3.18.0) /* PCI Device Driver */ static struct pci_driver REFDATA wlan_pcie = { @@ -822,8 +843,8 @@ static struct pci_driver REFDATA wlan_pcie = { * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_pcie_write_reg(moal_handle *handle, t_u32 reg, t_u32 data) +static mlan_status woal_pcie_write_reg(moal_handle *handle, t_u32 reg, + t_u32 data) { pcie_service_card *card = (pcie_service_card *)handle->card; @@ -841,8 +862,8 @@ woal_pcie_write_reg(moal_handle *handle, t_u32 reg, t_u32 data) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_pcie_read_reg(moal_handle *handle, t_u32 reg, t_u32 *data) +static mlan_status woal_pcie_read_reg(moal_handle *handle, t_u32 reg, + t_u32 *data) { pcie_service_card *card = (pcie_service_card *)handle->card; *data = ioread32(card->pci_mmap1 + reg); @@ -863,9 +884,8 @@ woal_pcie_read_reg(moal_handle *handle, t_u32 reg, t_u32 *data) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_pcie_write_data_sync(moal_handle *handle, - mlan_buffer *pmbuf, t_u32 port, t_u32 timeout) +mlan_status woal_pcie_write_data_sync(moal_handle *handle, mlan_buffer *pmbuf, + t_u32 port, t_u32 timeout) { return MLAN_STATUS_SUCCESS; } @@ -880,9 +900,8 @@ woal_pcie_write_data_sync(moal_handle *handle, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_pcie_read_data_sync(moal_handle *handle, - mlan_buffer *pmbuf, t_u32 port, t_u32 timeout) +mlan_status woal_pcie_read_data_sync(moal_handle *handle, mlan_buffer *pmbuf, + t_u32 port, t_u32 timeout) { return MLAN_STATUS_SUCCESS; } @@ -895,8 +914,7 @@ woal_pcie_read_data_sync(moal_handle *handle, * * @return IRQ_HANDLED */ -static irqreturn_t -woal_pcie_interrupt(int irq, void *dev_id) +static irqreturn_t woal_pcie_interrupt(int irq, void *dev_id) { struct pci_dev *pdev; pcie_service_card *card; @@ -942,13 +960,12 @@ exit: * * @return IRQ_HANDLED */ -static irqreturn_t -woal_pcie_msix_interrupt(int irq, void *dev_id) +static irqreturn_t woal_pcie_msix_interrupt(int irq, void *dev_id) { struct pci_dev *pdev; pcie_service_card *card; moal_handle *handle; - msix_context *ctx = (msix_context *) dev_id; + msix_context *ctx = (msix_context *)dev_id; mlan_status ret = MLAN_STATUS_SUCCESS; if (!ctx) { @@ -986,7 +1003,6 @@ exit: else return IRQ_NONE; } - /** * @brief This function pre-initializes the PCI-E host * memory space, etc. @@ -995,8 +1011,7 @@ exit: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_pcie_preinit(struct pci_dev *pdev) +static mlan_status woal_pcie_preinit(struct pci_dev *pdev) { int ret; @@ -1034,8 +1049,7 @@ err_enable_dev: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_pcie_init(pcie_service_card *card) +mlan_status woal_pcie_init(pcie_service_card *card) { struct pci_dev *pdev = NULL; int ret; @@ -1084,8 +1098,10 @@ woal_pcie_init(pcie_service_card *card) goto err_iomap2; } - PRINTM(MINFO, "PCI memory map Virt0: %p PCI memory map Virt2: " - "%p\n", card->pci_mmap, card->pci_mmap1); + PRINTM(MINFO, + "PCI memory map Virt0: %p PCI memory map Virt2: " + "%p\n", + card->pci_mmap, card->pci_mmap1); return MLAN_STATUS_SUCCESS; @@ -1114,8 +1130,7 @@ err_enable_dev: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_pcie_register_dev(moal_handle *handle) +static mlan_status woal_pcie_register_dev(moal_handle *handle) { mlan_status ret = MLAN_STATUS_SUCCESS; pcie_service_card *card = NULL; @@ -1166,26 +1181,25 @@ woal_pcie_register_dev(moal_handle *handle) "request_irq failed: ret=%d\n", ret); for (j = 0; j < i; j++) - free_irq(card->msix_entries[j]. - vector, - &(card-> - msix_contexts[i])); + free_irq(card->msix_entries[j] + .vector, + &(card->msix_contexts + [i])); pci_disable_msix(pdev); break; } - } if (i == nvec) break; } - //follow through + // follow through + /* fall through */ case PCIE_INT_MODE_MSI: pcie_int_mode = PCIE_INT_MODE_MSI; ret = pci_enable_msi(pdev); if (ret == 0) { - ret = request_irq(pdev->irq, - woal_pcie_interrupt, 0, + ret = request_irq(pdev->irq, woal_pcie_interrupt, 0, "mrvl_pcie_msi", pdev); if (ret) { PRINTM(MFATAL, "request_irq failed: ret=%d\n", @@ -1195,12 +1209,12 @@ woal_pcie_register_dev(moal_handle *handle) break; } } - //follow through + // follow through + /* fall through */ case PCIE_INT_MODE_LEGACY: pcie_int_mode = PCIE_INT_MODE_LEGACY; - ret = request_irq(pdev->irq, - woal_pcie_interrupt, IRQF_SHARED, + ret = request_irq(pdev->irq, woal_pcie_interrupt, IRQF_SHARED, "mrvl_pcie", pdev); if (ret) { PRINTM(MFATAL, "request_irq failed: ret=%d\n", ret); @@ -1238,8 +1252,7 @@ done: * * @return N/A */ -void -woal_pcie_cleanup(pcie_service_card *card) +void woal_pcie_cleanup(pcie_service_card *card) { struct pci_dev *pdev = NULL; pdev = card->dev; @@ -1265,8 +1278,7 @@ woal_pcie_cleanup(pcie_service_card *card) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static void -woal_pcie_unregister_dev(moal_handle *handle) +static void woal_pcie_unregister_dev(moal_handle *handle) { pcie_service_card *card = handle ? (pcie_service_card *)handle->card : NULL; @@ -1318,8 +1330,7 @@ woal_pcie_unregister_dev(moal_handle *handle) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_pcie_bus_register(void) +mlan_status woal_pcie_bus_register(void) { mlan_status ret = MLAN_STATUS_SUCCESS; ENTER(); @@ -1339,8 +1350,7 @@ woal_pcie_bus_register(void) * * @return N/A */ -void -woal_pcie_bus_unregister(void) +void woal_pcie_bus_unregister(void) { ENTER(); @@ -1351,14 +1361,14 @@ woal_pcie_bus_unregister(void) } #if defined(PCIE9098) || defined(PCIE9097) -#define PCIE9098_DUMP_CTRL_REG 0x1C94 -#define PCIE9098_DUMP_START_REG 0x1C98 -#define PCIE9098_DUMP_END_REG 0x1C9F +#define PCIE9098_DUMP_CTRL_REG 0x1C94 +#define PCIE9098_DUMP_START_REG 0x1C98 +#define PCIE9098_DUMP_END_REG 0x1C9F #endif #if defined(PCIE8897) || defined(PCIE8997) -#define DEBUG_DUMP_CTRL_REG 0xCF4 -#define DEBUG_DUMP_START_REG 0xCF8 -#define DEBUG_DUMP_END_REG 0xCFF +#define DEBUG_DUMP_CTRL_REG 0xCF4 +#define DEBUG_DUMP_START_REG 0xCF8 +#define DEBUG_DUMP_END_REG 0xCFF #endif #if defined(PCIE9098) || defined(PCIE9097) @@ -1366,7 +1376,7 @@ woal_pcie_bus_unregister(void) #define PCIE9098_SCRATCH_14_REG 0x1C98 #define PCIE9098_SCRATCH_15_REG 0x1C9C #define PCIE9098_DUMP_REG_START 0x1C20 -#define PCIE9098_DUMP_REG_END 0x1C9C +#define PCIE9098_DUMP_REG_END 0x1C9C #endif #if defined(PCIE8997) || defined(PCIE8897) @@ -1374,52 +1384,49 @@ woal_pcie_bus_unregister(void) #define PCIE_SCRATCH_14_REG 0x0CF8; #define PCIE_SCRATCH_15_REG 0x0CFC; #define PCIE_DUMP_START_REG 0xC00 -#define PCIE_DUMP_END_REG 0xCFC +#define PCIE_DUMP_END_REG 0xCFC #endif - /** - * @brief This function save the log of pcie register value - * - * @param phandle A pointer to moal_handle - * @param buffer A pointer to buffer saving log - * - * @return The length of this log - */ -int -woal_pcie_dump_reg_info(moal_handle *phandle, t_u8 *buffer) +/** + * @brief This function save the log of pcie register value + * + * @param phandle A pointer to moal_handle + * @param buffer A pointer to buffer saving log + * + * @return The length of this log + */ +int woal_pcie_dump_reg_info(moal_handle *phandle, t_u8 *buffer) { char *drv_ptr = (char *)buffer; t_u32 reg = 0, value = 0; t_u8 i; char buf[256], *ptr; pcie_service_card *card = (pcie_service_card *)phandle->card; - int config_reg_table[] = - { 0x00, 0x04, 0x10, 0x18, 0x2c, 0x3c, 0x44, 0x80, 0x98, 0x170 }; + int config_reg_table[] = {0x00, 0x04, 0x10, 0x18, 0x2c, + 0x3c, 0x44, 0x80, 0x98, 0x170}; t_u32 dump_start_reg = 0; t_u32 dump_end_reg = 0; t_u32 scratch_14_reg = 0; t_u32 scratch_15_reg = 0; #if defined(PCIE9098) || defined(PCIE9097) /* Tx/Rx/Event AMDA start address */ - t_u32 adma_reg_table[] = - { 0x10000, 0x10800, 0x10880, 0x11000, 0x11080 }; + t_u32 adma_reg_table[] = {0x10000, 0x10800, 0x10880, 0x11000, 0x11080}; t_u8 j; #endif ENTER(); mlan_pm_wakeup_card(phandle->pmlan_adapter, MTRUE); - drv_ptr += - sprintf(drv_ptr, - "------------PCIe Registers dump-------------\n"); + drv_ptr += sprintf(drv_ptr, + "------------PCIe Registers dump-------------\n"); drv_ptr += sprintf(drv_ptr, "Config Space Registers:\n"); for (i = 0; i < ARRAY_SIZE(config_reg_table); i++) { pci_read_config_dword(card->dev, config_reg_table[i], &value); - drv_ptr += - sprintf(drv_ptr, "reg:0x%02x value=0x%08x\n", - config_reg_table[i], value); + drv_ptr += sprintf(drv_ptr, "reg:0x%02x value=0x%08x\n", + config_reg_table[i], value); } drv_ptr += sprintf(drv_ptr, "FW Scrach Registers:\n"); #if defined(PCIE8897) || defined(PCIE8997) - if (IS_PCIE8897(phandle->card_type) || IS_PCIE8997(phandle->card_type)) { + if (IS_PCIE8897(phandle->card_type) || + IS_PCIE8997(phandle->card_type)) { reg = PCIE_SCRATCH_12_REG; dump_start_reg = PCIE_DUMP_START_REG; dump_end_reg = PCIE_DUMP_END_REG; @@ -1429,7 +1436,8 @@ woal_pcie_dump_reg_info(moal_handle *phandle, t_u8 *buffer) #endif #if defined(PCIE9098) || defined(PCIE9097) - if (IS_PCIE9098(phandle->card_type) || IS_PCIE9097(phandle->card_type)) { + if (IS_PCIE9098(phandle->card_type) || + IS_PCIE9097(phandle->card_type)) { reg = PCIE9098_SCRATCH_12_REG; dump_start_reg = PCIE9098_DUMP_REG_START; dump_end_reg = PCIE9098_DUMP_REG_END; @@ -1471,10 +1479,11 @@ woal_pcie_dump_reg_info(moal_handle *phandle, t_u8 *buffer) i++; } #if defined(PCIE9098) || defined(PCIE9097) - if (IS_PCIE9098(phandle->card_type) || IS_PCIE9097(phandle->card_type)) { - drv_ptr += - sprintf(drv_ptr, - "PCIE registers from offset 0x1c20 to 0x1c9c:\n"); + if (IS_PCIE9098(phandle->card_type) || + IS_PCIE9097(phandle->card_type)) { + drv_ptr += sprintf( + drv_ptr, + "PCIE registers from offset 0x1c20 to 0x1c9c:\n"); memset(buf, 0, sizeof(buf)); ptr = buf; i = 1; @@ -1490,16 +1499,15 @@ woal_pcie_dump_reg_info(moal_handle *phandle, t_u8 *buffer) } drv_ptr += sprintf(drv_ptr, "%s\n", buf); } - if (IS_PCIE9098(phandle->card_type) || IS_PCIE9097(phandle->card_type)) { - drv_ptr += - sprintf(drv_ptr, - "ADMA Tx/Rx/Event/Cmd/CmdResp registers:\n"); + if (IS_PCIE9098(phandle->card_type) || + IS_PCIE9097(phandle->card_type)) { + drv_ptr += sprintf(drv_ptr, + "ADMA Tx/Rx/Event/Cmd/CmdResp registers:\n"); for (j = 0; j < ARRAY_SIZE(adma_reg_table); j++) { - drv_ptr += - sprintf(drv_ptr, - "ADMA registers dump from offset 0x%x to 0x%x\n", - adma_reg_table[j], - adma_reg_table[j] + 0x68); + drv_ptr += sprintf( + drv_ptr, + "ADMA registers dump from offset 0x%x to 0x%x\n", + adma_reg_table[j], adma_reg_table[j] + 0x68); memset(buf, 0, sizeof(buf)); ptr = buf; i = 1; @@ -1519,9 +1527,8 @@ woal_pcie_dump_reg_info(moal_handle *phandle, t_u8 *buffer) } } #endif - drv_ptr += - sprintf(drv_ptr, - "-----------PCIe Registers dump End-----------\n"); + drv_ptr += sprintf(drv_ptr, + "-----------PCIe Registers dump End-----------\n"); mlan_pm_wakeup_card(phandle->pmlan_adapter, MFALSE); LEAVE(); return drv_ptr - (char *)buffer; @@ -1534,23 +1541,21 @@ woal_pcie_dump_reg_info(moal_handle *phandle, t_u8 *buffer) * * @return N/A */ -static void -woal_pcie_reg_dbg(moal_handle *phandle) +static void woal_pcie_reg_dbg(moal_handle *phandle) { t_u32 reg = 0, value = 0; t_u8 i; char buf[256], *ptr; pcie_service_card *card = (pcie_service_card *)phandle->card; - int config_reg_table[] = - { 0x00, 0x04, 0x10, 0x18, 0x2c, 0x3c, 0x44, 0x80, 0x98, 0x170 }; + int config_reg_table[] = {0x00, 0x04, 0x10, 0x18, 0x2c, + 0x3c, 0x44, 0x80, 0x98, 0x170}; t_u32 dump_start_reg = 0; t_u32 dump_end_reg = 0; t_u32 scratch_14_reg = 0; t_u32 scratch_15_reg = 0; #if defined(PCIE9098) || defined(PCIE9097) /* Tx/Rx/Event AMDA start address */ - t_u32 adma_reg_table[] = - { 0x10000, 0x10800, 0x10880, 0x11000, 0x11080 }; + t_u32 adma_reg_table[] = {0x10000, 0x10800, 0x10880, 0x11000, 0x11080}; t_u8 j; #endif mlan_pm_wakeup_card(phandle->pmlan_adapter, MTRUE); @@ -1562,7 +1567,8 @@ woal_pcie_reg_dbg(moal_handle *phandle) } PRINTM(MMSG, "FW Scrach Registers:\n"); #if defined(PCIE8897) || defined(PCIE8997) - if (IS_PCIE8897(phandle->card_type) || IS_PCIE8997(phandle->card_type)) { + if (IS_PCIE8897(phandle->card_type) || + IS_PCIE8997(phandle->card_type)) { reg = PCIE_SCRATCH_12_REG; dump_start_reg = PCIE_DUMP_START_REG; dump_end_reg = PCIE_DUMP_END_REG; @@ -1572,7 +1578,8 @@ woal_pcie_reg_dbg(moal_handle *phandle) #endif #if defined(PCIE9098) || defined(PCIE9097) - if (IS_PCIE9098(phandle->card_type) || IS_PCIE9097(phandle->card_type)) { + if (IS_PCIE9098(phandle->card_type) || + IS_PCIE9097(phandle->card_type)) { reg = PCIE9098_SCRATCH_12_REG; dump_start_reg = PCIE9098_DUMP_START_REG; dump_end_reg = PCIE9098_DUMP_END_REG; @@ -1609,7 +1616,8 @@ woal_pcie_reg_dbg(moal_handle *phandle) i++; } #if defined(PCIE9098) || defined(PCIE9097) - if (IS_PCIE9098(phandle->card_type) || IS_PCIE9097(phandle->card_type)) { + if (IS_PCIE9098(phandle->card_type) || + IS_PCIE9097(phandle->card_type)) { PRINTM(MMSG, "PCIE registers from offset 0x1c20 to 0x1c9c:\n"); memset(buf, 0, sizeof(buf)); ptr = buf; @@ -1626,7 +1634,8 @@ woal_pcie_reg_dbg(moal_handle *phandle) } PRINTM(MMSG, "%s\n", buf); } - if (IS_PCIE9098(phandle->card_type) || IS_PCIE9097(phandle->card_type)) { + if (IS_PCIE9098(phandle->card_type) || + IS_PCIE9097(phandle->card_type)) { PRINTM(MMSG, "ADMA Tx/Rx/Event/Cmd/CmdResp registers:\n"); for (j = 0; j < ARRAY_SIZE(adma_reg_table); j++) { PRINTM(MMSG, @@ -1653,8 +1662,8 @@ woal_pcie_reg_dbg(moal_handle *phandle) mlan_pm_wakeup_card(phandle->pmlan_adapter, MFALSE); } -#define DEBUG_FW_DONE 0xFF -#define MAX_POLL_TRIES 100 +#define DEBUG_FW_DONE 0xFF +#define MAX_POLL_TRIES 100 typedef enum { DUMP_TYPE_ITCM = 0, @@ -1667,8 +1676,8 @@ typedef enum { DUMP_TYPE_MAC = 7, } dumped_mem_type; -#define MAX_NAME_LEN 8 -#define MAX_FULL_NAME_LEN 32 +#define MAX_NAME_LEN 8 +#define MAX_FULL_NAME_LEN 32 t_u8 *name_prefix = "/data/file_"; typedef struct { @@ -1686,8 +1695,8 @@ typedef enum { } rdwr_status; #ifdef PCIE8897 -#define DEBUG_HOST_READY_8897 0xEE -#define DEBUG_MEMDUMP_FINISH_8897 0xFE +#define DEBUG_HOST_READY_8897 0xEE +#define DEBUG_MEMDUMP_FINISH_8897 0xFE memory_type_mapping mem_type_mapping_tbl_8897[] = { {"ITCM", NULL, NULL, 0xF0, FW_DUMP_TYPE_MEM_ITCM}, {"DTCM", NULL, NULL, 0xF1, FW_DUMP_TYPE_MEM_DTCM}, @@ -1701,14 +1710,15 @@ memory_type_mapping mem_type_mapping_tbl_8897[] = { #endif #if defined(PCIE8997) || defined(PCIE9098) || defined(PCIE9097) -#define DEBUG_HOST_READY_8997 0xCC -#define DEBUG_MEMDUMP_FINISH_8997 0xDD -memory_type_mapping mem_type_mapping_tbl_8997 = - { "DUMP", NULL, NULL, 0xDD, 0x00 }; +#define DEBUG_HOST_READY_8997 0xCC +#define DEBUG_MEMDUMP_FINISH_8997 0xDD +memory_type_mapping mem_type_mapping_tbl_8997 = {"DUMP", NULL, NULL, 0xDD, + 0x00}; #endif -#if defined(PCIE8897) || defined(PCIE8997) || defined(PCIE9098) || defined(PCIE9097) +#if defined(PCIE8897) || defined(PCIE8997) || defined(PCIE9098) || \ + defined(PCIE9097) /** * @brief This function reads data by 8 bit from card register * @@ -1718,8 +1728,7 @@ memory_type_mapping mem_type_mapping_tbl_8997 = * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_read_reg_eight_bit(moal_handle *handle, t_u32 reg, t_u8 *data) +mlan_status woal_read_reg_eight_bit(moal_handle *handle, t_u32 reg, t_u8 *data) { pcie_service_card *card = (pcie_service_card *)handle->card; *data = ioread8(card->pci_mmap1 + reg); @@ -1734,8 +1743,7 @@ woal_read_reg_eight_bit(moal_handle *handle, t_u32 reg, t_u8 *data) * * @return MLAN_STATUS_SUCCESS */ -rdwr_status -woal_pcie_rdwr_firmware(moal_handle *phandle, t_u8 doneflag) +rdwr_status woal_pcie_rdwr_firmware(moal_handle *phandle, t_u8 doneflag) { int ret = 0; int tries = 0; @@ -1758,7 +1766,8 @@ woal_pcie_rdwr_firmware(moal_handle *phandle, t_u8 doneflag) #endif #if defined(PCIE9098) || defined(PCIE9097) - if (IS_PCIE9098(phandle->card_type) || IS_PCIE9097(phandle->card_type)) { + if (IS_PCIE9098(phandle->card_type) || + IS_PCIE9097(phandle->card_type)) { debug_host_ready = DEBUG_HOST_READY_8997; dump_ctrl_reg = PCIE9098_DUMP_CTRL_REG; } @@ -1812,10 +1821,8 @@ woal_pcie_rdwr_firmware(moal_handle *phandle, t_u8 doneflag) * * @return N/A */ -void -woal_pcie_dump_fw_info_v1(moal_handle *phandle) +void woal_pcie_dump_fw_info_v1(moal_handle *phandle) { - int ret = 0; unsigned int reg, reg_start, reg_end; t_u8 *dbg_ptr = NULL; @@ -1837,7 +1844,7 @@ woal_pcie_dump_fw_info_v1(moal_handle *phandle) } DEBUG_MEMDUMP_FINISH = DEBUG_MEMDUMP_FINISH_8897; #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) - /** Create dump directory*/ + /** Create dump directory*/ woal_create_dump_dir(phandle, path_name, sizeof(path_name)); #else memset(path_name, 0, sizeof(path_name)); @@ -1845,7 +1852,7 @@ woal_pcie_dump_fw_info_v1(moal_handle *phandle) #endif PRINTM(MMSG, "Directory name is %s\n", path_name); woal_dump_drv_info(phandle, path_name); - /* start dump fw memory */ + /* start dump fw memory */ moal_get_system_time(phandle, &sec, &usec); PRINTM(MMSG, "====PCIE DEBUG MODE OUTPUT START: %u.%06u ====\n", sec, usec); @@ -1890,9 +1897,9 @@ woal_pcie_dump_fw_info_v1(moal_handle *phandle) } else { PRINTM(MMSG, "%s_SIZE=0x%x\n", mem_type_mapping_tbl[idx].mem_name, memory_size); - ret = moal_vmalloc(phandle, memory_size + 1, - (t_u8 **)&mem_type_mapping_tbl[idx]. - mem_Ptr); + ret = moal_vmalloc( + phandle, memory_size + 1, + (t_u8 **)&mem_type_mapping_tbl[idx].mem_Ptr); if ((ret != MLAN_STATUS_SUCCESS) || !mem_type_mapping_tbl[idx].mem_Ptr) { PRINTM(MERROR, @@ -1931,17 +1938,16 @@ woal_pcie_dump_fw_info_v1(moal_handle *phandle) PRINTM(MMSG, "%s done: size=0x%x\n", mem_type_mapping_tbl[idx].mem_name, (unsigned int)(dbg_ptr - - mem_type_mapping_tbl[idx]. - mem_Ptr)); + mem_type_mapping_tbl[idx] + .mem_Ptr)); memset(file_name, 0, sizeof(file_name)); sprintf(file_name, "%s%s", "file_pcie_", mem_type_mapping_tbl[idx].mem_name); if (MLAN_STATUS_SUCCESS != - woal_save_dump_info_to_file(path_name, - file_name, - mem_type_mapping_tbl - [idx].mem_Ptr, - memory_size)) + woal_save_dump_info_to_file( + path_name, file_name, + mem_type_mapping_tbl[idx].mem_Ptr, + memory_size)) PRINTM(MMSG, "Can't save dump file %s in %s\n", file_name, path_name); @@ -1983,10 +1989,8 @@ done: * * @return N/A */ -void -woal_pcie_dump_fw_info_v2(moal_handle *phandle) +void woal_pcie_dump_fw_info_v2(moal_handle *phandle) { - int ret = 0; unsigned int reg, reg_start, reg_end; t_u8 *dbg_ptr = NULL; @@ -2007,8 +2011,9 @@ woal_pcie_dump_fw_info_v2(moal_handle *phandle) PRINTM(MERROR, "Could not dump firmwware info\n"); return; } + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) - /** Create dump directory*/ + /** Create dump directory*/ woal_create_dump_dir(phandle, path_name, sizeof(path_name)); #else memset(path_name, 0, sizeof(path_name)); @@ -2020,7 +2025,7 @@ woal_pcie_dump_fw_info_v2(moal_handle *phandle) woal_dump_drv_info(ref_handle, path_name); woal_dump_drv_info(phandle, path_name); - /* start dump fw memory */ + /* start dump fw memory */ moal_get_system_time(phandle, &sec, &usec); PRINTM(MMSG, "====PCIE DEBUG MODE OUTPUT START: %u.%06u ====\n", sec, usec); @@ -2028,7 +2033,8 @@ woal_pcie_dump_fw_info_v2(moal_handle *phandle) if (RDWR_STATUS_FAILURE == woal_pcie_rdwr_firmware(phandle, doneflag)) goto done; #if defined(PCIE9098) || defined(PCIE9097) - if (IS_PCIE9098(phandle->card_type) || IS_PCIE9097(phandle->card_type)) { + if (IS_PCIE9098(phandle->card_type) || + IS_PCIE9097(phandle->card_type)) { dump_start_reg = PCIE9098_DUMP_START_REG; dump_end_reg = PCIE9098_DUMP_END_REG; } @@ -2037,7 +2043,6 @@ woal_pcie_dump_fw_info_v2(moal_handle *phandle) if (IS_PCIE8997(phandle->card_type)) { dump_start_reg = DEBUG_DUMP_START_REG; dump_end_reg = DEBUG_DUMP_END_REG; - } #endif reg = dump_start_reg; @@ -2095,17 +2100,16 @@ woal_pcie_dump_fw_info_v2(moal_handle *phandle) mem_type_mapping_tbl->mem_Ptr); mem_type_mapping_tbl->mem_Ptr = tmp_ptr; tmp_ptr = NULL; - dbg_ptr = - mem_type_mapping_tbl->mem_Ptr + - memory_size; + dbg_ptr = mem_type_mapping_tbl->mem_Ptr + + memory_size; memory_size += 0x4000; - end_ptr = - mem_type_mapping_tbl->mem_Ptr + - memory_size; + end_ptr = mem_type_mapping_tbl->mem_Ptr + + memory_size; } } if (RDWR_STATUS_DONE == stat) { - PRINTM(MMSG, "%s done:" + PRINTM(MMSG, + "%s done:" #ifdef MLAN_64BIT "size = 0x%lx\n", #else @@ -2117,12 +2121,10 @@ woal_pcie_dump_fw_info_v2(moal_handle *phandle) sprintf(file_name, "%s%s", "file_pcie_", mem_type_mapping_tbl->mem_name); if (MLAN_STATUS_SUCCESS != - woal_save_dump_info_to_file(path_name, file_name, - mem_type_mapping_tbl-> - mem_Ptr, - dbg_ptr - - mem_type_mapping_tbl-> - mem_Ptr)) + woal_save_dump_info_to_file( + path_name, file_name, + mem_type_mapping_tbl->mem_Ptr, + dbg_ptr - mem_type_mapping_tbl->mem_Ptr)) PRINTM(MMSG, "Can't save dump file %s in %s\n", file_name, path_name); moal_vfree(phandle, mem_type_mapping_tbl->mem_Ptr); @@ -2156,8 +2158,7 @@ done: * @return MTRUE/MFALSE * */ -static t_u8 -woal_pcie_is_second_mac(moal_handle *handle) +static t_u8 woal_pcie_is_second_mac(moal_handle *handle) { #ifdef PCIE9098 pcie_service_card *card = (pcie_service_card *)handle->card; @@ -2167,8 +2168,7 @@ woal_pcie_is_second_mac(moal_handle *handle) return MFALSE; } -void -woal_pcie_dump_fw_info(moal_handle *phandle) +void woal_pcie_dump_fw_info(moal_handle *phandle) { mlan_pm_wakeup_card(phandle->pmlan_adapter, MTRUE); phandle->fw_dump = MTRUE; @@ -2177,9 +2177,8 @@ woal_pcie_dump_fw_info(moal_handle *phandle) woal_pcie_dump_fw_info_v1(phandle); #endif #if defined(PCIE8997) || defined(PCIE9098) || defined(PCIE9097) - if (IS_PCIE8997(phandle->card_type) - || IS_PCIE9098(phandle->card_type) - || IS_PCIE9097(phandle->card_type)) + if (IS_PCIE8997(phandle->card_type) || + IS_PCIE9098(phandle->card_type) || IS_PCIE9097(phandle->card_type)) woal_pcie_dump_fw_info_v2(phandle); #endif phandle->fw_dump = MFALSE; @@ -2187,8 +2186,7 @@ woal_pcie_dump_fw_info(moal_handle *phandle) queue_work(phandle->workqueue, &phandle->main_work); } -static mlan_status -woal_pcie_get_fw_name(moal_handle *handle) +static mlan_status woal_pcie_get_fw_name(moal_handle *handle) { mlan_status ret = MLAN_STATUS_SUCCESS; #ifdef PCIE9098 @@ -2230,6 +2228,7 @@ woal_pcie_get_fw_name(moal_handle *handle) #endif goto done; } + #ifdef PCIE8997 if (IS_PCIE8997(handle->card_type)) { woal_pcie_read_reg(handle, rev_id_reg, &revision_id); @@ -2240,7 +2239,8 @@ woal_pcie_get_fw_name(moal_handle *handle) magic &= 0xff; PRINTM(MCMND, "magic=0x%x, strap=0x%x, revision_id=0x%x\n", magic, strap, revision_id); - if ((revision_id == PCIE8997_A1) && (magic == CHIP_MAGIC_VALUE)) { + if ((revision_id == PCIE8997_A1) && + (magic == CHIP_MAGIC_VALUE)) { if (strap == CARD_TYPE_PCIE_UART) strcpy(handle->card_info->fw_name, PCIEUART8997_DEFAULT_COMBO_FW_NAME); @@ -2266,16 +2266,16 @@ woal_pcie_get_fw_name(moal_handle *handle) case PCIE9098_Z1Z2: if (magic == CHIP_MAGIC_VALUE) { if (strap == CARD_TYPE_PCIE_UART) - strcpy(handle->card_info-> - fw_name, + strcpy(handle->card_info + ->fw_name, PCIEUART9098_DEFAULT_COMBO_FW_NAME); else if (strap == CARD_TYPE_PCIE_PCIE) - strcpy(handle->card_info-> - fw_name, + strcpy(handle->card_info + ->fw_name, PCIEPCIE9098_DEFAULT_COMBO_FW_NAME); else - strcpy(handle->card_info-> - fw_name, + strcpy(handle->card_info + ->fw_name, PCIEUSB9098_DEFAULT_COMBO_FW_NAME); } strcpy(handle->card_info->fw_name_wlan, @@ -2283,18 +2283,19 @@ woal_pcie_get_fw_name(moal_handle *handle) break; case PCIE9098_A0: case PCIE9098_A1: + case PCIE9098_A2: if (magic == CHIP_MAGIC_VALUE) { if (strap == CARD_TYPE_PCIE_UART) - strcpy(handle->card_info-> - fw_name, + strcpy(handle->card_info + ->fw_name, PCIEUART9098_COMBO_V1_FW_NAME); else if (strap == CARD_TYPE_PCIE_PCIE) - strcpy(handle->card_info-> - fw_name, + strcpy(handle->card_info + ->fw_name, PCIEPCIE9098_COMBO_V1_FW_NAME); else - strcpy(handle->card_info-> - fw_name, + strcpy(handle->card_info + ->fw_name, PCIEUSB9098_COMBO_V1_FW_NAME); } strcpy(handle->card_info->fw_name_wlan, diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_pcie.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_pcie.h index 3f5664d5cb2c..ae22f4d01341 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_pcie.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_pcie.h @@ -1,25 +1,25 @@ /** @file moal_pcie.h - * - * @brief This file contains definitions for PCIE interface. - * driver. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains definitions for PCIE interface. + * driver. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /******************************************************** Change log: @@ -29,104 +29,105 @@ Change log: #ifndef _MOAL_PCIE_H_ #define _MOAL_PCIE_H_ -#define PCIE_VENDOR_ID_NXP (0x11ab) -#define PCIE_VENDOR_ID_V2_NXP (0x1b4b) +#define PCIE_VENDOR_ID_NXP (0x11ab) +#define PCIE_VENDOR_ID_V2_NXP (0x1b4b) #ifdef PCIE8997 /** PCIE device ID for 8997 card */ -#define PCIE_DEVICE_ID_NXP_88W8997P (0x2b42) +#define PCIE_DEVICE_ID_NXP_88W8997P (0x2b42) #endif #ifdef PCIE8897 /** PCIE device ID for 8897 card */ -#define PCIE_DEVICE_ID_NXP_88W8897P (0x2b38) +#define PCIE_DEVICE_ID_NXP_88W8897P (0x2b38) #endif #ifdef PCIE9097 /** PCIE device ID for 9097 card */ -#define PCIE_DEVICE_ID_NXP_88W9097 (0x2b56) +#define PCIE_DEVICE_ID_NXP_88W9097 (0x2b56) #endif #ifdef PCIE9098 /** PCIE device ID for 9098 card FN0 */ -#define PCIE_DEVICE_ID_NXP_88W9098P_FN0 (0x2b43) +#define PCIE_DEVICE_ID_NXP_88W9098P_FN0 (0x2b43) /** PCIE device ID for 9098 card FN1 */ -#define PCIE_DEVICE_ID_NXP_88W9098P_FN1 (0x2b44) +#define PCIE_DEVICE_ID_NXP_88W9098P_FN1 (0x2b44) #endif -#include -#include +#include +#include #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0) -#include +#include #endif -#include +#include -#include "moal_main.h" +#include "moal_main.h" /** Default firmware name */ #ifdef PCIE8997 -#define PCIE8997_DEFAULT_COMBO_FW_NAME "nxp/pcieusb8997_combo_v4.bin" -#define PCIEUART8997_DEFAULT_COMBO_FW_NAME "nxp/pcieuart8997_combo_v4.bin" -#define PCIEUSB8997_DEFAULT_COMBO_FW_NAME "nxp/pcieusb8997_combo_v4.bin" +#define PCIE8997_DEFAULT_COMBO_FW_NAME "nxp/pcieusb8997_combo_v4.bin" +#define PCIEUART8997_DEFAULT_COMBO_FW_NAME "nxp/pcieuart8997_combo_v4.bin" +#define PCIEUSB8997_DEFAULT_COMBO_FW_NAME "nxp/pcieusb8997_combo_v4.bin" #define PCIE8997_DEFAULT_WLAN_FW_NAME "nxp/pcie8997_wlan_v4.bin" /** PCIE8997 chip revision ID */ -#define PCIE8997_A0 0x10 -#define PCIE8997_A1 0x11 +#define PCIE8997_A0 0x10 +#define PCIE8997_A1 0x11 #endif /* PCIE8997 */ #ifdef PCIE8897 #define PCIE8897_DEFAULT_COMBO_FW_NAME "nxp/pcie8897_uapsta.bin" #define PCIE8897_DEFAULT_WLAN_FW_NAME "nxp/pcie8897_wlan.bin" -#endif /* PCIE8897 */ +#endif /* PCIE8897*/ #ifdef PCIE9098 -#define PCIE9098_Z1Z2 0x00 -#define PCIE9098_A0 0x01 -#define PCIE9098_A1 0x02 -#define PCIE9098_DEFAULT_COMBO_FW_NAME "nxp/pcieusb9098_combo.bin" -#define PCIEUART9098_DEFAULT_COMBO_FW_NAME "nxp/pcieuart9098_combo.bin" -#define PCIEUSB9098_DEFAULT_COMBO_FW_NAME "nxp/pcieusb9098_combo.bin" -#define PCIEPCIE9098_DEFAULT_COMBO_FW_NAME "nxp/pciepcie9098_combo.bin" -#define PCIEUART9098_COMBO_V1_FW_NAME "nxp/pcieuart9098_combo_v1.bin" -#define PCIEUSB9098_COMBO_V1_FW_NAME "nxp/pcieusb9098_combo_v1.bin" -#define PCIEPCIE9098_COMBO_V1_FW_NAME "nxp/pciepcie9098_combo_v1.bin" +#define PCIE9098_Z1Z2 0x00 +#define PCIE9098_A0 0x01 +#define PCIE9098_A1 0x02 +#define PCIE9098_A2 0x03 +#define PCIE9098_DEFAULT_COMBO_FW_NAME "nxp/pcieusb9098_combo.bin" +#define PCIEUART9098_DEFAULT_COMBO_FW_NAME "nxp/pcieuart9098_combo.bin" +#define PCIEUSB9098_DEFAULT_COMBO_FW_NAME "nxp/pcieusb9098_combo.bin" +#define PCIEPCIE9098_DEFAULT_COMBO_FW_NAME "nxp/pciepcie9098_combo.bin" +#define PCIEUART9098_COMBO_V1_FW_NAME "nxp/pcieuart9098_combo_v1.bin" +#define PCIEUSB9098_COMBO_V1_FW_NAME "nxp/pcieusb9098_combo_v1.bin" +#define PCIEPCIE9098_COMBO_V1_FW_NAME "nxp/pciepcie9098_combo_v1.bin" #define PCIE9098_DEFAULT_WLAN_FW_NAME "nxp/pcie9098_wlan.bin" -#define PCIE9098_WLAN_V1_FW_NAME "nxp/pcie9098_wlan_v1.bin" +#define PCIE9098_WLAN_V1_FW_NAME "nxp/pcie9098_wlan_v1.bin" #endif /* PCIE9098 */ #ifdef PCIE9097 -#define PCIE9097_A0 0x00 -#define PCIE9097_B0 0x01 -#define PCIE9097_B1 0x02 -#define PCIE9097_DEFAULT_COMBO_FW_NAME "nxp/pcieusb9097_combo.bin" -#define PCIEUART9097_DEFAULT_COMBO_FW_NAME "nxp/pcieuart9097_combo.bin" -#define PCIEUSB9097_DEFAULT_COMBO_FW_NAME "nxp/pcieusb9097_combo.bin" -#define PCIEUART9097_COMBO_V1_FW_NAME "nxp/pcieuart9097_combo_v1.bin" -#define PCIEUSB9097_COMBO_V1_FW_NAME "nxp/pcieusb9097_combo_v1.bin" +#define PCIE9097_A0 0x00 +#define PCIE9097_B0 0x01 +#define PCIE9097_B1 0x02 +#define PCIE9097_DEFAULT_COMBO_FW_NAME "nxp/pcieusb9097_combo.bin" +#define PCIEUART9097_DEFAULT_COMBO_FW_NAME "nxp/pcieuart9097_combo.bin" +#define PCIEUSB9097_DEFAULT_COMBO_FW_NAME "nxp/pcieusb9097_combo.bin" +#define PCIEUART9097_COMBO_V1_FW_NAME "nxp/pcieuart9097_combo_v1.bin" +#define PCIEUSB9097_COMBO_V1_FW_NAME "nxp/pcieusb9097_combo_v1.bin" #define PCIE9097_DEFAULT_WLAN_FW_NAME "nxp/pcie9097_wlan.bin" -#define PCIE9097_WLAN_V1_FW_NAME "nxp/pcie9097_wlan_v1.bin" +#define PCIE9097_WLAN_V1_FW_NAME "nxp/pcie9097_wlan_v1.bin" #endif /* PCIE9097 */ #if defined(PCIE9098) || defined(PCIE9097) -#define PCIE_NUM_MSIX_VECTORS 32 +#define PCIE_NUM_MSIX_VECTORS 32 #else -#define PCIE_NUM_MSIX_VECTORS 4 +#define PCIE_NUM_MSIX_VECTORS 4 #endif typedef struct _msix_context { - /** pci_dev structure pointer */ + /** pci_dev structure pointer */ struct pci_dev *dev; - /** message id related to msix vector */ + /** message id related to msix vector */ t_u16 msg_id; } msix_context; /** Structure: PCIE service card */ typedef struct _pcie_service_card { - /** pci_dev structure pointer */ + /** pci_dev structure pointer */ struct pci_dev *dev; - /** moal_handle structure pointer */ + /** moal_handle structure pointer */ moal_handle *handle; - /** I/O memory regions pointer to the bus */ + /** I/O memory regions pointer to the bus */ void __iomem *pci_mmap; - /** I/O memory regions pointer to the bus */ + /** I/O memory regions pointer to the bus */ void __iomem *pci_mmap1; #if defined(PCIE) struct msix_entry msix_entries[PCIE_NUM_MSIX_VECTORS]; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_priv.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_priv.c index ea4325359699..691f917a1fe7 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_priv.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_priv.c @@ -1,38 +1,38 @@ /** @file moal_priv.c - * - * @brief This file contains standard ioctl functions - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains standard ioctl functions + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /************************************************************************ Change log: 10/30/2008: initial version ************************************************************************/ -#include "moal_main.h" +#include "moal_main.h" #ifdef SDIO -#include "moal_sdio.h" +#include "moal_sdio.h" #endif /* SDIO */ -#include "moal_eth_ioctl.h" +#include "moal_eth_ioctl.h" #ifdef USB -#include "moal_usb.h" +#include "moal_usb.h" #endif /******************************************************** @@ -41,21 +41,31 @@ Change log: /** Bands supported in Infra mode */ static t_u8 SupportedInfraBand[] = { BAND_B, - BAND_B | BAND_G, BAND_G, - BAND_GN, BAND_B | BAND_G | BAND_GN, BAND_G | BAND_GN, - BAND_A, BAND_B | BAND_A, BAND_B | BAND_G | BAND_A, BAND_G | BAND_A, + BAND_B | BAND_G, + BAND_G, + BAND_GN, + BAND_B | BAND_G | BAND_GN, + BAND_G | BAND_GN, + BAND_A, + BAND_B | BAND_A, + BAND_B | BAND_G | BAND_A, + BAND_G | BAND_A, BAND_A | BAND_B | BAND_G | BAND_AN | BAND_GN, - BAND_A | BAND_G | BAND_AN | BAND_GN, BAND_A | BAND_AN, - BAND_GN | BAND_GAC, BAND_B | BAND_G | BAND_GN | BAND_GAC, - BAND_G | BAND_GN | BAND_GAC, + BAND_A | BAND_G | BAND_AN | BAND_GN, + BAND_A | BAND_AN, + BAND_GN | BAND_GAC, + BAND_B | BAND_G | BAND_GN | BAND_GAC, + BAND_G | BAND_GN | BAND_GAC, BAND_A | BAND_B | BAND_G | BAND_AN | BAND_GN | BAND_AAC, - BAND_A | BAND_G | BAND_AN | BAND_GN | BAND_AAC, + BAND_A | BAND_G | BAND_AN | BAND_GN | BAND_AAC, BAND_A | BAND_AN | BAND_AAC, }; /** Bands supported in Ad-Hoc mode */ static t_u8 SupportedAdhocBand[] = { - BAND_B, BAND_B | BAND_G, BAND_G, + BAND_B, + BAND_B | BAND_G, + BAND_G, BAND_A, }; @@ -71,8 +81,7 @@ static t_u8 SupportedAdhocBand[] = { * * @return 0 --success, otherwise fail */ -static int -woal_associate_ssid_bssid(moal_private *priv, struct iwreq *wrq) +static int woal_associate_ssid_bssid(moal_private *priv, struct iwreq *wrq) { mlan_ssid_bssid ssid_bssid; #ifdef REASSOCIATION @@ -95,8 +104,8 @@ woal_associate_ssid_bssid(moal_private *priv, struct iwreq *wrq) "Associate: Insufficient length in IOCTL input\n"); /* buffer should be at least 3 characters per BSSID octet "00:" - ** plus a space separater and at least 1 char in the SSID - */ + ** plus a space separater and at least 1 char in the SSID + */ LEAVE(); return -EINVAL; } @@ -138,23 +147,21 @@ woal_associate_ssid_bssid(moal_private *priv, struct iwreq *wrq) sizeof(ssid_bssid.ssid.ssid)); PRINTM(MCMND, "iwpriv assoc: AP=[" MACSTR "], ssid(%d)=[%s]\n", - MAC2STR(ssid_bssid.bssid), - (int)ssid_bssid.ssid.ssid_len, ssid_bssid.ssid.ssid); + MAC2STR(ssid_bssid.bssid), (int)ssid_bssid.ssid.ssid_len, + ssid_bssid.ssid.ssid); - if (MLAN_STATUS_SUCCESS != woal_bss_start(priv, - MOAL_IOCTL_WAIT, - &ssid_bssid)) { + if (MLAN_STATUS_SUCCESS != + woal_bss_start(priv, MOAL_IOCTL_WAIT, &ssid_bssid)) { LEAVE(); return -EFAULT; } + #ifdef REASSOCIATION memset(&bss_info, 0x00, sizeof(bss_info)); - if (MLAN_STATUS_SUCCESS == woal_get_bss_info(priv, - MOAL_IOCTL_WAIT, - &bss_info)) { + if (MLAN_STATUS_SUCCESS == + woal_get_bss_info(priv, MOAL_IOCTL_WAIT, &bss_info)) { moal_memcpy_ext(priv->phandle, &priv->prev_ssid_bssid.ssid, - &bss_info.ssid, - sizeof(mlan_802_11_ssid), + &bss_info.ssid, sizeof(mlan_802_11_ssid), sizeof(mlan_802_11_ssid)); moal_memcpy_ext(priv->phandle, &priv->prev_ssid_bssid.bssid, &bss_info.bssid, MLAN_MAC_ADDR_LENGTH, @@ -176,8 +183,7 @@ woal_associate_ssid_bssid(moal_private *priv, struct iwreq *wrq) * * @return Number of rates copied */ -static inline int -woal_copy_rates(t_u8 *dest, int pos, t_u8 *src, int len) +static inline int woal_copy_rates(t_u8 *dest, int pos, t_u8 *src, int len) { int i; @@ -196,8 +202,7 @@ woal_copy_rates(t_u8 *dest, int pos, t_u8 *src, int len) * * @return 0/MLAN_STATUS_SUCCESS --success, otherwise fail */ -static int -woal_warm_reset(moal_private *priv) +static int woal_warm_reset(moal_private *priv) { int ret = 0; moal_handle *handle = priv->phandle; @@ -233,13 +238,12 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_get_signal(moal_private *priv, struct iwreq *wrq) +static int woal_get_signal(moal_private *priv, struct iwreq *wrq) { /** Input data size */ -#define IN_DATA_SIZE 2 +#define IN_DATA_SIZE 2 /** Output data size */ -#define OUT_DATA_SIZE 12 +#define OUT_DATA_SIZE 12 int ret = 0; int in_data[IN_DATA_SIZE]; int out_data[OUT_DATA_SIZE]; @@ -265,8 +269,8 @@ woal_get_signal(moal_private *priv, struct iwreq *wrq) ret = -EINVAL; goto done; } - if (copy_from_user - (in_data, wrq->u.data.pointer, sizeof(int) * buflen)) { + if (copy_from_user(in_data, wrq->u.data.pointer, + sizeof(int) * buflen)) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -274,15 +278,15 @@ woal_get_signal(moal_private *priv, struct iwreq *wrq) } switch (wrq->u.data.length) { - case 0: /* No checking, get everything */ + case 0: /* No checking, get everything */ break; - case 2: /* Check subtype range */ + case 2: /* Check subtype range */ if (in_data[1] < 1 || in_data[1] > 4) { ret = -EINVAL; goto done; } /* Fall through */ - case 1: /* Check type range */ + case 1: /* Check type range */ if (in_data[0] < 1 || in_data[0] > 3) { ret = -EINVAL; goto done; @@ -314,7 +318,7 @@ woal_get_signal(moal_private *priv, struct iwreq *wrq) /* Check type */ switch (in_data[0]) { - case 0: /* Send everything */ + case 0: /* Send everything */ out_data[data_length++] = signal.bcn_rssi_last; out_data[data_length++] = signal.bcn_rssi_avg; out_data[data_length++] = signal.data_rssi_last; @@ -328,75 +332,75 @@ woal_get_signal(moal_private *priv, struct iwreq *wrq) out_data[data_length++] = signal.data_nf_last; out_data[data_length++] = signal.data_nf_avg; break; - case 1: /* RSSI */ + case 1: /* RSSI */ /* Check subtype */ switch (in_data[1]) { - case 0: /* Everything */ + case 0: /* Everything */ out_data[data_length++] = signal.bcn_rssi_last; out_data[data_length++] = signal.bcn_rssi_avg; out_data[data_length++] = signal.data_rssi_last; out_data[data_length++] = signal.data_rssi_avg; break; - case 1: /* bcn last */ + case 1: /* bcn last */ out_data[data_length++] = signal.bcn_rssi_last; break; - case 2: /* bcn avg */ + case 2: /* bcn avg */ out_data[data_length++] = signal.bcn_rssi_avg; break; - case 3: /* data last */ + case 3: /* data last */ out_data[data_length++] = signal.data_rssi_last; break; - case 4: /* data avg */ + case 4: /* data avg */ out_data[data_length++] = signal.data_rssi_avg; break; default: break; } break; - case 2: /* SNR */ + case 2: /* SNR */ /* Check subtype */ switch (in_data[1]) { - case 0: /* Everything */ + case 0: /* Everything */ out_data[data_length++] = signal.bcn_snr_last; out_data[data_length++] = signal.bcn_snr_avg; out_data[data_length++] = signal.data_snr_last; out_data[data_length++] = signal.data_snr_avg; break; - case 1: /* bcn last */ + case 1: /* bcn last */ out_data[data_length++] = signal.bcn_snr_last; break; - case 2: /* bcn avg */ + case 2: /* bcn avg */ out_data[data_length++] = signal.bcn_snr_avg; break; - case 3: /* data last */ + case 3: /* data last */ out_data[data_length++] = signal.data_snr_last; break; - case 4: /* data avg */ + case 4: /* data avg */ out_data[data_length++] = signal.data_snr_avg; break; default: break; } break; - case 3: /* NF */ + case 3: /* NF */ /* Check subtype */ switch (in_data[1]) { - case 0: /* Everything */ + case 0: /* Everything */ out_data[data_length++] = signal.bcn_nf_last; out_data[data_length++] = signal.bcn_nf_avg; out_data[data_length++] = signal.data_nf_last; out_data[data_length++] = signal.data_nf_avg; break; - case 1: /* bcn last */ + case 1: /* bcn last */ out_data[data_length++] = signal.bcn_nf_last; break; - case 2: /* bcn avg */ + case 2: /* bcn avg */ out_data[data_length++] = signal.bcn_nf_avg; break; - case 3: /* data last */ + case 3: /* data last */ out_data[data_length++] = signal.data_nf_last; break; - case 4: /* data avg */ + case 4: /* data avg */ out_data[data_length++] = signal.data_nf_avg; break; default: @@ -427,8 +431,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_deep_sleep_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_deep_sleep_ioctl(moal_private *priv, struct iwreq *wrq) { int ret = 0; int user_data_len; @@ -478,7 +481,7 @@ woal_deep_sleep_ioctl(moal_private *priv, struct iwreq *wrq) user_data_len); LEAVE(); return -EINVAL; - } else { /* Display Deep Sleep settings */ + } else { /* Display Deep Sleep settings */ PRINTM(MINFO, "Get Deep Sleep Mode\n"); if (MLAN_STATUS_SUCCESS != woal_get_deep_sleep(priv, data)) { LEAVE(); @@ -491,8 +494,8 @@ woal_deep_sleep_ioctl(moal_private *priv, struct iwreq *wrq) } /* Copy the Deep Sleep setting to user */ - if (copy_to_user - (wrq->u.data.pointer, data, wrq->u.data.length * sizeof(int))) { + if (copy_to_user(wrq->u.data.pointer, data, + wrq->u.data.length * sizeof(int))) { PRINTM(MERROR, "Copy to user failed\n"); LEAVE(); return -EINVAL; @@ -510,8 +513,7 @@ woal_deep_sleep_ioctl(moal_private *priv, struct iwreq *wrq) * * @return 0 --success, otherwise fail */ -static int -woal_11n_htcap_cfg(moal_private *priv, struct iwreq *wrq) +static int woal_11n_htcap_cfg(moal_private *priv, struct iwreq *wrq) { int data[2], copy_len; mlan_ioctl_req *req = NULL; @@ -618,8 +620,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_11n_amsdu_aggr_ctrl(moal_private *priv, struct iwreq *wrq) +static int woal_11n_amsdu_aggr_ctrl(moal_private *priv, struct iwreq *wrq) { int data[2], copy_len; mlan_ioctl_req *req = NULL; @@ -688,8 +689,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_11n_tx_cfg(moal_private *priv, struct iwreq *wrq) +static int woal_11n_tx_cfg(moal_private *priv, struct iwreq *wrq) { int data[2], copy_len; mlan_ioctl_req *req = NULL; @@ -792,8 +792,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_11n_prio_tbl(moal_private *priv, struct iwreq *wrq) +static int woal_11n_prio_tbl(moal_private *priv, struct iwreq *wrq) { int data[MAX_NUM_TID * 2], i, j, copy_len; mlan_ioctl_req *req = NULL; @@ -885,8 +884,7 @@ error: * * @return 0 --success, otherwise fail */ -static int -woal_addba_reject(moal_private *priv, struct iwreq *wrq) +static int woal_addba_reject(moal_private *priv, struct iwreq *wrq) { int data[MAX_NUM_TID], ret = 0, i, copy_len; mlan_ioctl_req *req = NULL; @@ -968,8 +966,7 @@ error: * * @return 0 --success, otherwise fail */ -static int -woal_addba_para_updt(moal_private *priv, struct iwreq *wrq) +static int woal_addba_para_updt(moal_private *priv, struct iwreq *wrq) { int data[5], ret = 0, copy_len; mlan_ioctl_req *req = NULL; @@ -1070,8 +1067,7 @@ error: * * @return 0 --success, otherwise fail */ -static int -woal_txbuf_cfg(moal_private *priv, struct iwreq *wrq) +static int woal_txbuf_cfg(moal_private *priv, struct iwreq *wrq) { int buf_size; mlan_ioctl_req *req = NULL; @@ -1126,8 +1122,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_hs_cfg(moal_private *priv, struct iwreq *wrq, BOOLEAN invoke_hostcmd) +static int woal_hs_cfg(moal_private *priv, struct iwreq *wrq, + BOOLEAN invoke_hostcmd) { int data[3], copy_len; int ret = 0; @@ -1147,7 +1143,8 @@ woal_hs_cfg(moal_private *priv, struct iwreq *wrq, BOOLEAN invoke_hostcmd) } else { action = MLAN_ACT_SET; if (data_length >= 1 && data_length <= 3) { - if (copy_from_user(data, wrq->u.data.pointer, copy_len)) { + if (copy_from_user(data, wrq->u.data.pointer, + copy_len)) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -1206,9 +1203,8 @@ woal_hs_cfg(moal_private *priv, struct iwreq *wrq, BOOLEAN invoke_hostcmd) data[1] = hscfg.gpio; data[2] = hscfg.gap; wrq->u.data.length = 3; - if (copy_to_user - (wrq->u.data.pointer, data, - sizeof(int) * wrq->u.data.length)) { + if (copy_to_user(wrq->u.data.pointer, data, + sizeof(int) * wrq->u.data.length)) { PRINTM(MERROR, "Copy to user failed\n"); ret = -EFAULT; goto done; @@ -1227,8 +1223,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_hs_setpara(moal_private *priv, struct iwreq *wrq) +static int woal_hs_setpara(moal_private *priv, struct iwreq *wrq) { int ret = 0; int data_length = wrq->u.data.length; @@ -1256,8 +1251,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_inactivity_timeout_ext(moal_private *priv, struct iwreq *wrq) +static int woal_inactivity_timeout_ext(moal_private *priv, struct iwreq *wrq) { int data[4], copy_len; int ret = 0; @@ -1317,9 +1311,8 @@ woal_inactivity_timeout_ext(moal_private *priv, struct iwreq *wrq) if (req->action == MLAN_ACT_GET) { wrq->u.data.length = 4; - if (copy_to_user - (wrq->u.data.pointer, data, - wrq->u.data.length * sizeof(int))) { + if (copy_to_user(wrq->u.data.pointer, data, + wrq->u.data.length * sizeof(int))) { PRINTM(MERROR, "Copy to user failed\n"); ret = -EFAULT; goto done; @@ -1341,8 +1334,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_ecl_sys_clock(moal_private *priv, struct iwreq *wrq) +static int woal_ecl_sys_clock(moal_private *priv, struct iwreq *wrq) { int data[64], copy_len; int ret = 0; @@ -1424,9 +1416,8 @@ woal_ecl_sys_clock(moal_private *priv, struct iwreq *wrq) wrq->u.data.length += data_length; - if (copy_to_user - (wrq->u.data.pointer, data, - sizeof(int) * wrq->u.data.length)) { + if (copy_to_user(wrq->u.data.pointer, data, + sizeof(int) * wrq->u.data.length)) { PRINTM(MERROR, "Copy to user failed\n"); ret = -EFAULT; goto done; @@ -1460,8 +1451,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_band_cfg(moal_private *priv, struct iwreq *wrq) +static int woal_band_cfg(moal_private *priv, struct iwreq *wrq) { int ret = 0; unsigned int i; @@ -1500,7 +1490,8 @@ woal_band_cfg(moal_private *priv, struct iwreq *wrq) req->req_id = MLAN_IOCTL_RADIO_CFG; if (wrq->u.data.length == 0) { - /* Get config_bands, adhoc_start_band and adhoc_channel values from MLAN */ + /* Get config_bands, adhoc_start_band and adhoc_channel values + * from MLAN */ req->action = MLAN_ACT_GET; status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); if (status != MLAN_STATUS_SUCCESS) { @@ -1515,9 +1506,8 @@ woal_band_cfg(moal_private *priv, struct iwreq *wrq) data[2] = radio_cfg->param.band_cfg.adhoc_channel; wrq->u.data.length = 3; - if (copy_to_user - (wrq->u.data.pointer, data, - sizeof(int) * wrq->u.data.length)) { + if (copy_to_user(wrq->u.data.pointer, data, + sizeof(int) * wrq->u.data.length)) { ret = -EFAULT; goto error; } @@ -1554,7 +1544,8 @@ woal_band_cfg(moal_private *priv, struct iwreq *wrq) if (user_data_len >= 3) { adhoc_channel = data[2]; if (adhoc_channel == 0) { - /* Check if specified adhoc channel is non-zero */ + /* Check if specified adhoc channel is non-zero + */ ret = -EINVAL; goto error; } @@ -1586,8 +1577,7 @@ error: * * @return 0 --success, otherwise fail */ -static int -woal_reg_read_write(moal_private *priv, struct iwreq *wrq) +static int woal_reg_read_write(moal_private *priv, struct iwreq *wrq) { int data[3], copy_len; int ret = 0; @@ -1636,9 +1626,8 @@ woal_reg_read_write(moal_private *priv, struct iwreq *wrq) } if (req->action == MLAN_ACT_GET) { - if (copy_to_user - (wrq->u.data.pointer, ®->param.reg_rw.value, - sizeof(int))) { + if (copy_to_user(wrq->u.data.pointer, ®->param.reg_rw.value, + sizeof(int))) { PRINTM(MERROR, "Copy to user failed\n"); ret = -EFAULT; goto done; @@ -1661,8 +1650,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_read_eeprom(moal_private *priv, struct iwreq *wrq) +static int woal_read_eeprom(moal_private *priv, struct iwreq *wrq) { int data[2], copy_len; int ret = 0; @@ -1709,9 +1697,9 @@ woal_read_eeprom(moal_private *priv, struct iwreq *wrq) if (req->action == MLAN_ACT_GET) { wrq->u.data.length = reg->param.rd_eeprom.byte_count; - if (copy_to_user - (wrq->u.data.pointer, reg->param.rd_eeprom.value, - MIN(wrq->u.data.length, MAX_EEPROM_DATA))) { + if (copy_to_user(wrq->u.data.pointer, + reg->param.rd_eeprom.value, + MIN(wrq->u.data.length, MAX_EEPROM_DATA))) { PRINTM(MERROR, "Copy to user failed\n"); ret = -EFAULT; goto done; @@ -1733,8 +1721,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_mem_read_write(moal_private *priv, struct iwreq *wrq) +static int woal_mem_read_write(moal_private *priv, struct iwreq *wrq) { t_u32 data[2]; int ret = 0; @@ -1789,9 +1776,8 @@ woal_mem_read_write(moal_private *priv, struct iwreq *wrq) } if (req->action == MLAN_ACT_GET) { - if (copy_to_user - (wrq->u.data.pointer, ®_mem->param.mem_rw.value, - sizeof(int))) { + if (copy_to_user(wrq->u.data.pointer, + ®_mem->param.mem_rw.value, sizeof(int))) { PRINTM(MERROR, "Copy to user failed\n"); ret = -EFAULT; goto done; @@ -1814,8 +1800,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_get_log(moal_private *priv, struct iwreq *wrq) +static int woal_get_log(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_ds_get_stats stats; @@ -1840,7 +1825,8 @@ woal_get_log(moal_private *priv, struct iwreq *wrq) } if (wrq->u.data.pointer) { - sprintf(buf, "\n" + sprintf(buf, + "\n" "mcasttxframe %u\n" "failed %u\n" "retry %u\n" @@ -1859,22 +1845,12 @@ woal_get_log(moal_private *priv, struct iwreq *wrq) "wepicverrcnt-4 %u\n" "beacon_rcnt %u\n" "beacon_mcnt %u\n", - stats.mcast_tx_frame, - stats.failed, - stats.retry, - stats.multi_retry, - stats.frame_dup, - stats.rts_success, - stats.rts_failure, - stats.ack_failure, - stats.rx_frag, - stats.mcast_rx_frame, - stats.fcs_error, - stats.tx_frame, - stats.wep_icv_error[0], - stats.wep_icv_error[1], - stats.wep_icv_error[2], - stats.wep_icv_error[3], + stats.mcast_tx_frame, stats.failed, stats.retry, + stats.multi_retry, stats.frame_dup, stats.rts_success, + stats.rts_failure, stats.ack_failure, stats.rx_frag, + stats.mcast_rx_frame, stats.fcs_error, stats.tx_frame, + stats.wep_icv_error[0], stats.wep_icv_error[1], + stats.wep_icv_error[2], stats.wep_icv_error[3], stats.bcn_rcv_cnt, stats.bcn_miss_cnt); if (priv->phandle->fw_getlog_enable) { sprintf(buf + strlen(buf), "tx_frag_cnt %u\n", @@ -1973,10 +1949,10 @@ woal_get_log(moal_private *priv, struct iwreq *wrq) stats.ampdu_rx_cnt, stats.mpdu_in_rx_ampdu_cnt, stats.rx_octets_in_ampdu_cnt, stats.ampdu_delimiter_crc_error_cnt); - } wrq->u.data.length = MIN(GETLOG_BUFSIZE - 1, strlen(buf) + 1); - if (copy_to_user(wrq->u.data.pointer, buf, wrq->u.data.length)) { + if (copy_to_user(wrq->u.data.pointer, buf, + wrq->u.data.length)) { PRINTM(MERROR, "Copy to user failed\n"); ret = -EFAULT; } @@ -1995,8 +1971,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_deauth(moal_private *priv, struct iwreq *wrq) +static int woal_deauth(moal_private *priv, struct iwreq *wrq) { int ret = 0; struct sockaddr saddr; @@ -2004,7 +1979,8 @@ woal_deauth(moal_private *priv, struct iwreq *wrq) ENTER(); if (wrq->u.data.length) { /* Deauth mentioned BSSID */ - if (copy_from_user(&saddr, wrq->u.data.pointer, sizeof(saddr))) { + if (copy_from_user(&saddr, wrq->u.data.pointer, + sizeof(saddr))) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -2035,8 +2011,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_tx_power_cfg(moal_private *priv, struct iwreq *wrq) +static int woal_tx_power_cfg(moal_private *priv, struct iwreq *wrq) { int data[5], user_data_len, copy_len; int ret = 0; @@ -2147,28 +2122,28 @@ woal_tx_power_cfg(moal_private *priv, struct iwreq *wrq) pcfg->param.power_ext.power_group[0].last_rate_ind = data[0]; if (data[0] <= 11) { - pcfg->param.power_ext.power_group[0]. - rate_format = MLAN_RATE_FORMAT_LG; + pcfg->param.power_ext.power_group[0] + .rate_format = MLAN_RATE_FORMAT_LG; pcfg->param.power_ext.power_group[0].bandwidth = MLAN_HT_BW20; } else if (data[0] <= 27) { - pcfg->param.power_ext.power_group[0]. - rate_format = MLAN_RATE_FORMAT_HT; + pcfg->param.power_ext.power_group[0] + .rate_format = MLAN_RATE_FORMAT_HT; pcfg->param.power_ext.power_group[0].bandwidth = MLAN_HT_BW20; - pcfg->param.power_ext.power_group[0]. - first_rate_ind -= 12; - pcfg->param.power_ext.power_group[0]. - last_rate_ind -= 12; + pcfg->param.power_ext.power_group[0] + .first_rate_ind -= 12; + pcfg->param.power_ext.power_group[0] + .last_rate_ind -= 12; } else if ((140 <= data[0]) && (data[0] <= 155)) { - pcfg->param.power_ext.power_group[0]. - rate_format = MLAN_RATE_FORMAT_HT; + pcfg->param.power_ext.power_group[0] + .rate_format = MLAN_RATE_FORMAT_HT; pcfg->param.power_ext.power_group[0].bandwidth = MLAN_HT_BW40; - pcfg->param.power_ext.power_group[0]. - first_rate_ind -= 140; - pcfg->param.power_ext.power_group[0]. - last_rate_ind -= 140; + pcfg->param.power_ext.power_group[0] + .first_rate_ind -= 140; + pcfg->param.power_ext.power_group[0] + .last_rate_ind -= 140; } if (user_data_len == 2) { pcfg->param.power_ext.power_group[0].power_min = @@ -2180,8 +2155,8 @@ woal_tx_power_cfg(moal_private *priv, struct iwreq *wrq) data[1]; pcfg->param.power_ext.power_group[0].power_max = data[2]; - pcfg->param.power_ext.power_group[0]. - power_step = data[3]; + pcfg->param.power_ext.power_group[0].power_step = + data[3]; } pcfg->param.power_ext.num_pwr_grp = 1; } @@ -2247,8 +2222,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_get_txrx_rate(moal_private *priv, struct iwreq *wrq) +static int woal_get_txrx_rate(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_ds_rate *rate = NULL; @@ -2273,9 +2247,8 @@ woal_get_txrx_rate(moal_private *priv, struct iwreq *wrq) goto done; } - if (copy_to_user - (wrq->u.data.pointer, (t_u8 *)&rate->param.data_rate, - sizeof(int) * 2)) { + if (copy_to_user(wrq->u.data.pointer, (t_u8 *)&rate->param.data_rate, + sizeof(int) * 2)) { ret = -EFAULT; goto done; } @@ -2296,8 +2269,7 @@ done: * * @return 0/MLAN_STATUS_SUCCESS --success, otherwise fail */ -static int -woal_sdio_clock_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_sdio_clock_ioctl(moal_private *priv, struct iwreq *wrq) { int ret = 0; int data = 2; @@ -2314,8 +2286,8 @@ woal_sdio_clock_ioctl(moal_private *priv, struct iwreq *wrq) } } else { wrq->u.data.length = sizeof(clock_state) / sizeof(int); - if (copy_to_user - (wrq->u.data.pointer, &clock_state, sizeof(int))) { + if (copy_to_user(wrq->u.data.pointer, &clock_state, + sizeof(int))) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -2353,8 +2325,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_beacon_interval(moal_private *priv, struct iwreq *wrq) +static int woal_beacon_interval(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_ds_bss *bss = NULL; @@ -2398,9 +2369,8 @@ woal_beacon_interval(moal_private *priv, struct iwreq *wrq) goto done; } - if (copy_to_user - (wrq->u.data.pointer, (t_u8 *)&bss->param.bcn_interval, - sizeof(int))) { + if (copy_to_user(wrq->u.data.pointer, (t_u8 *)&bss->param.bcn_interval, + sizeof(int))) { ret = -EFAULT; goto done; } @@ -2420,8 +2390,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_get_txrate(moal_private *priv, struct iwreq *wrq) +static int woal_set_get_txrate(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_ds_rate *rate = NULL; @@ -2431,8 +2400,8 @@ woal_set_get_txrate(moal_private *priv, struct iwreq *wrq) ENTER(); if (wrq->u.data.length) { - if (copy_from_user - (&rateindex, wrq->u.data.pointer, sizeof(int))) { + if (copy_from_user(&rateindex, wrq->u.data.pointer, + sizeof(int))) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -2497,8 +2466,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_get_regioncode(moal_private *priv, struct iwreq *wrq) +static int woal_set_get_regioncode(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_ds_misc_cfg *cfg = NULL; @@ -2540,8 +2508,8 @@ woal_set_get_regioncode(moal_private *priv, struct iwreq *wrq) if (!wrq->u.data.length) { wrq->u.data.length = 1; - if (copy_to_user - (wrq->u.data.pointer, &cfg->param.region_code, sizeof(int))) + if (copy_to_user(wrq->u.data.pointer, &cfg->param.region_code, + sizeof(int))) ret = -EFAULT; } done: @@ -2559,8 +2527,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_get_radio(moal_private *priv, struct iwreq *wrq) +static int woal_set_get_radio(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_bss_info bss_info; @@ -2583,9 +2550,8 @@ woal_set_get_radio(moal_private *priv, struct iwreq *wrq) /* Get radio status */ woal_get_bss_info(priv, MOAL_IOCTL_WAIT, &bss_info); wrq->u.data.length = 1; - if (copy_to_user - (wrq->u.data.pointer, &bss_info.radio_on, - sizeof(bss_info.radio_on))) { + if (copy_to_user(wrq->u.data.pointer, &bss_info.radio_on, + sizeof(bss_info.radio_on))) { PRINTM(MERROR, "Copy to user failed\n"); ret = -EFAULT; } @@ -2604,8 +2570,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_drv_dbg(moal_private *priv, struct iwreq *wrq) +static int woal_drv_dbg(moal_private *priv, struct iwreq *wrq) { int data[4], copy_len; int ret = 0; @@ -2691,8 +2656,7 @@ drvdbgexit: * * @return 0 --success, otherwise fail */ -static int -woal_set_get_qos_cfg(moal_private *priv, struct iwreq *wrq) +static int woal_set_get_qos_cfg(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_ds_wmm_cfg *cfg = NULL; @@ -2719,11 +2683,13 @@ woal_set_get_qos_cfg(moal_private *priv, struct iwreq *wrq) cfg->param.qos_cfg = (t_u8)data; } else req->action = MLAN_ACT_GET; + status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); if (status != MLAN_STATUS_SUCCESS) { ret = -EFAULT; goto done; } + if (!wrq->u.data.length) { data = (int)cfg->param.qos_cfg; if (copy_to_user(wrq->u.data.pointer, &data, sizeof(int))) { @@ -2748,8 +2714,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_wws_cfg(moal_private *priv, struct iwreq *wrq) +static int woal_wws_cfg(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_ds_misc_cfg *wws = NULL; @@ -2809,8 +2774,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_sleep_pd(moal_private *priv, struct iwreq *wrq) +static int woal_sleep_pd(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_ds_pm_cfg *pm_cfg = NULL; @@ -2835,9 +2799,7 @@ woal_sleep_pd(moal_private *priv, struct iwreq *wrq) goto done; } if ((data <= MAX_SLEEP_PERIOD && data >= MIN_SLEEP_PERIOD) || - (data == 0) - || (data == SLEEP_PERIOD_RESERVED_FF) - ) { + (data == 0) || (data == SLEEP_PERIOD_RESERVED_FF)) { req->action = MLAN_ACT_SET; pm_cfg->param.sleep_period = data; } else { @@ -2876,23 +2838,21 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_sleep_params_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_sleep_params_ioctl(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_ioctl_req *req = NULL; mlan_ds_pm_cfg *pm = NULL; mlan_ds_sleep_params *psleep_params = NULL; - int data[6] = { 0 }, i, copy_len; + int data[6] = {0}, i, copy_len; int data_length = wrq->u.data.length; #ifdef DEBUG_LEVEL1 - char err_str[][36] = { {"sleep clock error in ppm"}, - {"wakeup offset in usec"}, - {"clock stabilization time in usec"}, - {"control periodic calibration(0-2)"}, - {"control of external sleepClock(0-2)"}, - {"value of reserved for debug"} - }; + char err_str[][36] = {{"sleep clock error in ppm"}, + {"wakeup offset in usec"}, + {"clock stabilization time in usec"}, + {"control periodic calibration(0-2)"}, + {"control of external sleepClock(0-2)"}, + {"value of reserved for debug"}}; #endif mlan_status status = MLAN_STATUS_SUCCESS; @@ -2918,8 +2878,8 @@ woal_sleep_params_ioctl(moal_private *priv, struct iwreq *wrq) PRINTM(MERROR, "S_PARAMS: copy from user failed\n"); ret = -EINVAL; goto done; - } + #define MIN_VAL 0x0000 #define MAX_VAL 0xFFFF for (i = 0; i < 6; i++) { @@ -2972,8 +2932,8 @@ woal_sleep_params_ioctl(moal_private *priv, struct iwreq *wrq) data[5] = psleep_params->reserved; wrq->u.data.length = 6; - if (copy_to_user(wrq->u.data.pointer, data, sizeof(int) * - wrq->u.data.length)) { + if (copy_to_user(wrq->u.data.pointer, data, + sizeof(int) * wrq->u.data.length)) { PRINTM(MERROR, "QCONFIG: copy to user failed\n"); ret = -EFAULT; goto done; @@ -2993,8 +2953,8 @@ done: * @param wrq A pointer to iwreq structure * @return 0 --success, otherwise fail */ -static int -woal_set_get_11h_local_pwr_constraint(moal_private *priv, struct iwreq *wrq) +static int woal_set_get_11h_local_pwr_constraint(moal_private *priv, + struct iwreq *wrq) { int ret = 0, data = 0; mlan_ioctl_req *req = NULL; @@ -3054,8 +3014,7 @@ done: * @param wrq A pointer to iwreq structure * @return 0 --success, otherwise fail */ -static int -woal_ht_stream_cfg_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_ht_stream_cfg_ioctl(moal_private *priv, struct iwreq *wrq) { int ret = 0, data = 0; mlan_ioctl_req *req = NULL; @@ -3118,8 +3077,7 @@ done: * @param wrq A pointer to iwreq structure * @return 0 --success, otherwise fail */ -static int -woal_mac_control_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_mac_control_ioctl(moal_private *priv, struct iwreq *wrq) { int ret = 0, data = 0; mlan_ioctl_req *req = NULL; @@ -3178,8 +3136,7 @@ done: * @param wrq A pointer to iwreq structure * @return 0 --success, otherwise fail */ -static int -woal_thermal_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_thermal_ioctl(moal_private *priv, struct iwreq *wrq) { int ret = 0, data = 0; mlan_ioctl_req *req = NULL; @@ -3234,8 +3191,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_cfg_hotspot(moal_private *priv, struct iwreq *wrq) +static int woal_cfg_hotspot(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -3301,8 +3257,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_get_reassoc(moal_private *priv, struct iwreq *wrq) +static int woal_set_get_reassoc(moal_private *priv, struct iwreq *wrq) { moal_handle *handle = priv->phandle; int ret = 0; @@ -3352,8 +3307,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_wmm_enable_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_wmm_enable_ioctl(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_ds_wmm_cfg *wmm = NULL; @@ -3400,9 +3354,8 @@ woal_wmm_enable_ioctl(moal_private *priv, struct iwreq *wrq) } if (wrq->u.data.pointer) { - if (copy_to_user - (wrq->u.data.pointer, &wmm->param.wmm_enable, - sizeof(wmm->param.wmm_enable))) { + if (copy_to_user(wrq->u.data.pointer, &wmm->param.wmm_enable, + sizeof(wmm->param.wmm_enable))) { PRINTM(MERROR, "Copy to user failed\n"); ret = -EFAULT; goto done; @@ -3424,8 +3377,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_11d_enable_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_11d_enable_ioctl(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_ds_11d_cfg *pcfg_11d = NULL; @@ -3471,9 +3423,9 @@ woal_11d_enable_ioctl(moal_private *priv, struct iwreq *wrq) } if (wrq->u.data.pointer) { - if (copy_to_user - (wrq->u.data.pointer, &pcfg_11d->param.enable_11d, - sizeof(pcfg_11d->param.enable_11d))) { + if (copy_to_user(wrq->u.data.pointer, + &pcfg_11d->param.enable_11d, + sizeof(pcfg_11d->param.enable_11d))) { PRINTM(MERROR, "Copy to user failed\n"); ret = -EFAULT; goto done; @@ -3495,8 +3447,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_11d_clr_chan_table(moal_private *priv, struct iwreq *wrq) +static int woal_11d_clr_chan_table(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_ds_11d_cfg *pcfg_11d = NULL; @@ -3537,8 +3488,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_wps_cfg_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_wps_cfg_ioctl(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_ds_wps_cfg *pwps = NULL; @@ -3595,8 +3545,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_passphrase(moal_private *priv, struct iwreq *wrq) +static int woal_passphrase(moal_private *priv, struct iwreq *wrq) { t_u16 len = 0; char buf[256]; @@ -3604,7 +3553,7 @@ woal_passphrase(moal_private *priv, struct iwreq *wrq) int ret = 0, action = -1, i; mlan_ds_sec_cfg *sec = NULL; mlan_ioctl_req *req = NULL; - t_u8 zero_mac[] = { 0, 0, 0, 0, 0, 0 }; + t_u8 zero_mac[] = {0, 0, 0, 0, 0, 0}; t_u8 *mac = NULL; int data_length = wrq->u.data.length, copy_len; mlan_status status = MLAN_STATUS_SUCCESS; @@ -3616,7 +3565,7 @@ woal_passphrase(moal_private *priv, struct iwreq *wrq) ret = -EOPNOTSUPP; goto done; } - if (!data_length || data_length >= sizeof(buf)) { + if (!data_length || data_length >= sizeof(buf) - 1) { PRINTM(MERROR, "Argument missing or too long for setpassphrase\n"); ret = -EINVAL; @@ -3630,6 +3579,7 @@ woal_passphrase(moal_private *priv, struct iwreq *wrq) ret = -EFAULT; goto done; } + buf[copy_len] = '\0'; /* Parse the buf to get the cmd_action */ begin = buf; @@ -3672,8 +3622,9 @@ woal_passphrase(moal_private *priv, struct iwreq *wrq) break; } sec->param.passphrase.ssid.ssid_len = strlen(end); - strncpy((char *)sec->param.passphrase.ssid.ssid, end, - MIN(strlen(end), MLAN_MAX_SSID_LENGTH)); + moal_memcpy_ext(priv->phandle, + sec->param.passphrase.ssid.ssid, end, + strlen(end), MLAN_MAX_SSID_LENGTH); PRINTM(MINFO, "ssid=%s, len=%d\n", sec->param.passphrase.ssid.ssid, (int)sec->param.passphrase.ssid.ssid_len); @@ -3686,9 +3637,9 @@ woal_passphrase(moal_private *priv, struct iwreq *wrq) ret = -EINVAL; break; } - woal_ascii2hex((t_u8 *)(sec->param.passphrase.psk.pmk. - pmk), end, - MLAN_PMK_HEXSTR_LENGTH / 2); + woal_ascii2hex( + (t_u8 *)(sec->param.passphrase.psk.pmk.pmk), + end, MLAN_PMK_HEXSTR_LENGTH / 2); sec->param.passphrase.psk_type = MLAN_PSK_PMK; } else if (!strnicmp(opt, "passphrase", strlen(opt)) && req->action == MLAN_ACT_SET) { @@ -3700,19 +3651,20 @@ woal_passphrase(moal_private *priv, struct iwreq *wrq) break; } sec->param.passphrase.psk_type = MLAN_PSK_PASSPHRASE; - moal_memcpy_ext(priv->phandle, - sec->param.passphrase.psk.passphrase. - passphrase, end, - sizeof(sec->param.passphrase.psk. - passphrase.passphrase), - sizeof(sec->param.passphrase.psk. - passphrase.passphrase)); + moal_memcpy_ext( + priv->phandle, + sec->param.passphrase.psk.passphrase.passphrase, + end, + sizeof(sec->param.passphrase.psk.passphrase + .passphrase), + sizeof(sec->param.passphrase.psk.passphrase + .passphrase)); sec->param.passphrase.psk.passphrase.passphrase_len = strlen(end); PRINTM(MINFO, "passphrase=%s, len=%d\n", sec->param.passphrase.psk.passphrase.passphrase, - (int)sec->param.passphrase.psk.passphrase. - passphrase_len); + (int)sec->param.passphrase.psk.passphrase + .passphrase_len); } else { PRINTM(MERROR, "Invalid option %s\n", opt); ret = -EINVAL; @@ -3743,9 +3695,8 @@ woal_passphrase(moal_private *priv, struct iwreq *wrq) len += sec->param.passphrase.ssid.ssid_len; len += sprintf(buf + len, " "); } - if (memcmp - (&sec->param.passphrase.bssid, zero_mac, - sizeof(zero_mac))) { + if (memcmp(&sec->param.passphrase.bssid, zero_mac, + sizeof(zero_mac))) { mac = (t_u8 *)&sec->param.passphrase.bssid; len += sprintf(buf + len, "bssid:"); for (i = 0; i < ETH_ALEN - 1; ++i) @@ -3755,19 +3706,19 @@ woal_passphrase(moal_private *priv, struct iwreq *wrq) if (sec->param.passphrase.psk_type == MLAN_PSK_PMK) { len += sprintf(buf + len, "psk:"); for (i = 0; i < MLAN_MAX_KEY_LENGTH; ++i) - len += sprintf(buf + len, "%02x", - sec->param.passphrase.psk.pmk. - pmk[i]); + len += sprintf( + buf + len, "%02x", + sec->param.passphrase.psk.pmk.pmk[i]); len += sprintf(buf + len, "\n"); } if (sec->param.passphrase.psk_type == MLAN_PSK_PASSPHRASE) { - len += sprintf(buf + len, "passphrase:%s\n", - sec->param.passphrase.psk.passphrase. - passphrase); + len += sprintf( + buf + len, "passphrase:%s\n", + sec->param.passphrase.psk.passphrase.passphrase); } if (wrq->u.data.pointer) { - if (copy_to_user - (wrq->u.data.pointer, buf, MIN(len, sizeof(buf)))) { + if (copy_to_user(wrq->u.data.pointer, buf, + MIN(len, sizeof(buf)))) { PRINTM(MERROR, "Copy to user failed, len %d\n", len); ret = -EFAULT; @@ -3775,7 +3726,6 @@ woal_passphrase(moal_private *priv, struct iwreq *wrq) } wrq->u.data.length = len; } - } done: if (status != MLAN_STATUS_PENDING) @@ -3792,8 +3742,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_get_esupp_mode(moal_private *priv, struct iwreq *wrq) +static int woal_get_esupp_mode(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_ds_sec_cfg *sec = NULL; @@ -3823,9 +3772,8 @@ woal_get_esupp_mode(moal_private *priv, struct iwreq *wrq) goto done; } - if (copy_to_user - (wrq->u.data.pointer, (t_u8 *)&sec->param.esupp_mode, - sizeof(int) * 3)) { + if (copy_to_user(wrq->u.data.pointer, (t_u8 *)&sec->param.esupp_mode, + sizeof(int) * 3)) { ret = -EFAULT; goto done; } @@ -3845,8 +3793,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_get_key_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_get_key_ioctl(moal_private *priv, struct iwreq *wrq) { int ret = 0; unsigned int i; @@ -3937,8 +3884,8 @@ woal_get_key_ioctl(moal_private *priv, struct iwreq *wrq) wrq->u.data.length = sizeof(key_ascii) + 1; if (wrq->u.data.pointer) { - if (copy_to_user - (wrq->u.data.pointer, &key_ascii, tmp - key_ascii)) { + if (copy_to_user(wrq->u.data.pointer, &key_ascii, + tmp - key_ascii)) { PRINTM(MERROR, "copy_to_user failed\n"); ret = -EFAULT; goto done; @@ -3958,8 +3905,7 @@ done: * @param wrq A pointer to iwreq structure * @return 0 --success, otherwise fail */ -static int -woal_set_get_ip_addr(moal_private *priv, struct iwreq *wrq) +static int woal_set_get_ip_addr(moal_private *priv, struct iwreq *wrq) { char buf[IPADDR_MAX_BUF]; mlan_ioctl_req *ioctl_req = NULL; @@ -3977,7 +3923,7 @@ woal_set_get_ip_addr(moal_private *priv, struct iwreq *wrq) } misc = (mlan_ds_misc_cfg *)ioctl_req->pbuf; - if (data_length <= 1) { /* GET */ + if (data_length <= 1) { /* GET */ ioctl_req->action = MLAN_ACT_GET; } else { if (copy_from_user(buf, wrq->u.data.pointer, @@ -4048,8 +3994,7 @@ done: * * @return 0 -- success, otherwise fail */ -static int -woal_tx_bf_cap_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_tx_bf_cap_ioctl(moal_private *priv, struct iwreq *wrq) { int ret = 0, data_length = wrq->u.data.length; mlan_ioctl_req *req = NULL; @@ -4076,7 +4021,7 @@ woal_tx_bf_cap_ioctl(moal_private *priv, struct iwreq *wrq) req->req_id = MLAN_IOCTL_11N_CFG; bf_cfg->sub_command = MLAN_OID_11N_CFG_TX_BF_CAP; req->action = MLAN_ACT_GET; - if (data_length) { /* SET */ + if (data_length) { /* SET */ if (copy_from_user(&bf_cap, wrq->u.data.pointer, sizeof(int))) { PRINTM(MERROR, "copy from user failed\n"); ret = -EFAULT; @@ -4108,17 +4053,17 @@ done: } /* Maximum input output characters in group WOAL_SET_GET_256_CHAR */ -#define MAX_IN_OUT_CHAR 256 +#define MAX_IN_OUT_CHAR 256 /** Tx BF Global conf argument index */ -#define BF_ENABLE_PARAM 1 -#define SOUND_ENABLE_PARAM 2 -#define FB_TYPE_PARAM 3 +#define BF_ENABLE_PARAM 1 +#define SOUND_ENABLE_PARAM 2 +#define FB_TYPE_PARAM 3 #define SNR_THRESHOLD_PARAM 4 -#define SOUND_INTVL_PARAM 5 -#define BF_MODE_PARAM 6 -#define MAX_TX_BF_GLOBAL_ARGS 6 -#define BF_CFG_ACT_GET 0 -#define BF_CFG_ACT_SET 1 +#define SOUND_INTVL_PARAM 5 +#define BF_MODE_PARAM 6 +#define MAX_TX_BF_GLOBAL_ARGS 6 +#define BF_CFG_ACT_GET 0 +#define BF_CFG_ACT_SET 1 /** * @brief Set/Get Transmit beamforming configuration @@ -4128,8 +4073,7 @@ done: * * @return 0 -- success, otherwise fail */ -static int -woal_tx_bf_cfg_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_tx_bf_cfg_ioctl(moal_private *priv, struct iwreq *wrq) { int ret = 0, data_length = wrq->u.data.length; int bf_action = 0, interval = 0; @@ -4257,7 +4201,8 @@ woal_tx_bf_cfg_ioctl(moal_private *priv, struct iwreq *wrq) * First arg = 2 BfAction * Second arg = 18 MAC "00:50:43:20:BF:64;" * Third arg = 1 (min char) TX BF interval - * 10 (max char) u32 maximum value 4294967295 + * 10 (max char) u32 maximum value + * 4294967295 */ if (char_count < 19 || char_count > 30) { PRINTM(MERROR, "Invalid argument\n"); @@ -4358,24 +4303,19 @@ woal_tx_bf_cfg_ioctl(moal_private *priv, struct iwreq *wrq) memset(buf, 0, sizeof(buf)); switch (bf_action) { case BF_GLOBAL_CONFIGURATION: - data_length += - sprintf(buf + data_length, "%d ", - (int)bf_global->bf_enbl); - data_length += - sprintf(buf + data_length, "%d ", - (int)bf_global->sounding_enbl); - data_length += - sprintf(buf + data_length, "%d ", - (int)bf_global->fb_type); - data_length += - sprintf(buf + data_length, "%d ", - (int)bf_global->snr_threshold); + data_length += sprintf(buf + data_length, "%d ", + (int)bf_global->bf_enbl); + data_length += sprintf(buf + data_length, "%d ", + (int)bf_global->sounding_enbl); + data_length += sprintf(buf + data_length, "%d ", + (int)bf_global->fb_type); + data_length += sprintf(buf + data_length, "%d ", + (int)bf_global->snr_threshold); data_length += sprintf(buf + data_length, "%d ", (int)bf_global->sounding_interval); - data_length += - sprintf(buf + data_length, "%d ", - (int)bf_global->bf_mode); + data_length += sprintf(buf + data_length, "%d ", + (int)bf_global->bf_mode); break; case SET_GET_BF_PERIODICITY: data_length += sprintf(buf + data_length, @@ -4387,49 +4327,47 @@ woal_tx_bf_cfg_ioctl(moal_private *priv, struct iwreq *wrq) bf_periodicity->peer_mac[4], bf_periodicity->peer_mac[5]); data_length += sprintf(buf + data_length, "%c", ' '); - data_length += - sprintf(buf + data_length, "%d", - bf_periodicity->interval); + data_length += sprintf(buf + data_length, "%d", + bf_periodicity->interval); break; case TX_BF_FOR_PEER_ENBL: for (i = 0; i < bf_cfg.no_of_peers; i++) { - data_length += sprintf(buf + data_length, - "%02x:%02x:%02x:%02x:%02x:%02x", - tx_bf_peer->peer_mac[0], - tx_bf_peer->peer_mac[1], - tx_bf_peer->peer_mac[2], - tx_bf_peer->peer_mac[3], - tx_bf_peer->peer_mac[4], - tx_bf_peer->peer_mac[5]); + data_length += + sprintf(buf + data_length, + "%02x:%02x:%02x:%02x:%02x:%02x", + tx_bf_peer->peer_mac[0], + tx_bf_peer->peer_mac[1], + tx_bf_peer->peer_mac[2], + tx_bf_peer->peer_mac[3], + tx_bf_peer->peer_mac[4], + tx_bf_peer->peer_mac[5]); data_length += sprintf(buf + data_length, "%c", ' '); - data_length += - sprintf(buf + data_length, "%d;", - tx_bf_peer->bf_enbl); + data_length += sprintf(buf + data_length, "%d;", + tx_bf_peer->bf_enbl); data_length += sprintf(buf + data_length, "%d;", tx_bf_peer->sounding_enbl); - data_length += - sprintf(buf + data_length, "%d ", - tx_bf_peer->fb_type); + data_length += sprintf(buf + data_length, "%d ", + tx_bf_peer->fb_type); tx_bf_peer++; } break; case SET_SNR_THR_PEER: for (i = 0; i < bf_cfg.no_of_peers; i++) { - data_length += sprintf(buf + data_length, - "%02x:%02x:%02x:%02x:%02x:%02x", - bf_snr->peer_mac[0], - bf_snr->peer_mac[1], - bf_snr->peer_mac[2], - bf_snr->peer_mac[3], - bf_snr->peer_mac[4], - bf_snr->peer_mac[5]); + data_length += + sprintf(buf + data_length, + "%02x:%02x:%02x:%02x:%02x:%02x", + bf_snr->peer_mac[0], + bf_snr->peer_mac[1], + bf_snr->peer_mac[2], + bf_snr->peer_mac[3], + bf_snr->peer_mac[4], + bf_snr->peer_mac[5]); data_length += sprintf(buf + data_length, "%c", ';'); - data_length += - sprintf(buf + data_length, "%d", - bf_snr->snr); + data_length += sprintf(buf + data_length, "%d", + bf_snr->snr); data_length += sprintf(buf + data_length, "%c", ' '); bf_snr++; @@ -4459,9 +4397,9 @@ done: * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static int -moal_ret_get_scan_table_ioctl(struct iwreq *wrq, - mlan_scan_resp *scan_resp, t_u32 scan_start) +static int moal_ret_get_scan_table_ioctl(struct iwreq *wrq, + mlan_scan_resp *scan_resp, + t_u32 scan_start) { pBSSDescriptor_t pbss_desc, scan_table; wlan_ioctl_get_scan_table_info *prsp_info; @@ -4493,8 +4431,7 @@ moal_ret_get_scan_table_ioctl(struct iwreq *wrq, /* Use to get current association saved descriptor */ pbss_desc = scan_table; - ret_code = wlan_get_scan_table_ret_entry(pbss_desc, - &pcurrent, + ret_code = wlan_get_scan_table_ret_entry(pbss_desc, &pcurrent, &space_left); if (ret_code == MLAN_STATUS_SUCCESS) @@ -4502,11 +4439,10 @@ moal_ret_get_scan_table_ioctl(struct iwreq *wrq, } else { scan_start--; - while (space_left - && (scan_start + num_scans_done < - scan_resp->num_in_scan_table) - && (ret_code == MLAN_STATUS_SUCCESS)) { - + while (space_left && + (scan_start + num_scans_done < + scan_resp->num_in_scan_table) && + (ret_code == MLAN_STATUS_SUCCESS)) { pbss_desc = (scan_table + (scan_start + num_scans_done)); @@ -4514,9 +4450,8 @@ moal_ret_get_scan_table_ioctl(struct iwreq *wrq, "GetScanTable: get current BSS Descriptor [%d]\n", scan_start + num_scans_done); - ret_code = wlan_get_scan_table_ret_entry(pbss_desc, - &pcurrent, - &space_left); + ret_code = wlan_get_scan_table_ret_entry( + pbss_desc, &pcurrent, &space_left); if (ret_code == MLAN_STATUS_SUCCESS) num_scans_done++; @@ -4528,8 +4463,8 @@ moal_ret_get_scan_table_ioctl(struct iwreq *wrq, wrq->u.data.length = ret_len; - /* Return ret_code (EFAULT or E2BIG) in the case where no scan results were - * successfully encoded. + /* Return ret_code (EFAULT or E2BIG) in the case where no scan results + * were successfully encoded. */ LEAVE(); return num_scans_done ? MLAN_STATUS_SUCCESS : ret_code; @@ -4541,10 +4476,11 @@ moal_ret_get_scan_table_ioctl(struct iwreq *wrq, * @param priv A pointer to moal_private structure * @param wrq A pointer to iwreq structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -static mlan_status -woal_get_scan_table_ioctl(moal_private *priv, struct iwreq *wrq) +static mlan_status woal_get_scan_table_ioctl(moal_private *priv, + struct iwreq *wrq) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -4567,8 +4503,8 @@ woal_get_scan_table_ioctl(moal_private *priv, struct iwreq *wrq) req->action = MLAN_ACT_GET; /* get the whole command from user */ - if (copy_from_user - (&scan_start, wrq->u.data.pointer, sizeof(scan_start))) { + if (copy_from_user(&scan_start, wrq->u.data.pointer, + sizeof(scan_start))) { PRINTM(MERROR, "copy from user failed\n"); ret = -EFAULT; goto done; @@ -4580,9 +4516,8 @@ woal_get_scan_table_ioctl(moal_private *priv, struct iwreq *wrq) /* Send IOCTL request to MLAN */ status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); if (status == MLAN_STATUS_SUCCESS) { - status = moal_ret_get_scan_table_ioctl(wrq, - &scan->param.scan_resp, - scan_start); + status = moal_ret_get_scan_table_ioctl( + wrq, &scan->param.scan_resp, scan_start); } done: if (status != MLAN_STATUS_PENDING) @@ -4599,16 +4534,14 @@ done: * * @return 0 -- success, otherwise fail */ -static int -woal_set_user_scan_ext_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_set_user_scan_ext_ioctl(moal_private *priv, struct iwreq *wrq) { int ret = 0; wlan_user_scan_cfg scan_req; ENTER(); memset(&scan_req, 0x00, sizeof(scan_req)); - if (copy_from_user - (&scan_req, wrq->u.data.pointer, - MIN(wrq->u.data.length, sizeof(scan_req)))) { + if (copy_from_user(&scan_req, wrq->u.data.pointer, + MIN(wrq->u.data.length, sizeof(scan_req)))) { PRINTM(MINFO, "Copy from user failed\n"); LEAVE(); return -EFAULT; @@ -4625,10 +4558,11 @@ woal_set_user_scan_ext_ioctl(moal_private *priv, struct iwreq *wrq) * @param priv A pointer to moal_private structure * @param wrq A pointer to iwreq structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -static mlan_status -woal_set_user_scan_ioctl(moal_private *priv, struct iwreq *wrq) +static mlan_status woal_set_user_scan_ioctl(moal_private *priv, + struct iwreq *wrq) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -4698,8 +4632,7 @@ done: * @param wrq A pointer to iwreq structure * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static int -woal_cmd52rdwr_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_cmd52rdwr_ioctl(moal_private *priv, struct iwreq *wrq) { t_u8 rw = 0, func, data = 0; int buf[3], reg, ret = MLAN_STATUS_SUCCESS; @@ -4713,7 +4646,8 @@ woal_cmd52rdwr_ioctl(moal_private *priv, struct iwreq *wrq) goto done; } - if (copy_from_user(buf, wrq->u.data.pointer, sizeof(int) * data_length)) { + if (copy_from_user(buf, wrq->u.data.pointer, + sizeof(int) * data_length)) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -4727,11 +4661,11 @@ woal_cmd52rdwr_ioctl(moal_private *priv, struct iwreq *wrq) } reg = (t_u32)buf[1]; if (data_length == 2) { - rw = 0; /* CMD52 read */ + rw = 0; /* CMD52 read */ PRINTM(MINFO, "Cmd52 read, func=%d, reg=0x%08X\n", func, reg); } if (data_length == 3) { - rw = 1; /* CMD52 write */ + rw = 1; /* CMD52 write */ data = (t_u8)buf[2]; PRINTM(MINFO, "Cmd52 write, func=%d, reg=0x%08X, data=0x%02X\n", func, reg, data); @@ -4739,16 +4673,20 @@ woal_cmd52rdwr_ioctl(moal_private *priv, struct iwreq *wrq) if (!rw) { #ifdef SDIO_MMC - sdio_claim_host(((struct sdio_mmc_card *)priv->phandle->card)-> - func); + sdio_claim_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); if (func) - data = sdio_readb(((struct sdio_mmc_card *)priv-> - phandle->card)->func, reg, &ret); + data = sdio_readb( + ((struct sdio_mmc_card *)priv->phandle->card) + ->func, + reg, &ret); else - data = sdio_f0_readb(((struct sdio_mmc_card *)priv-> - phandle->card)->func, reg, &ret); - sdio_release_host(((struct sdio_mmc_card *)priv->phandle-> - card)->func); + data = sdio_f0_readb( + ((struct sdio_mmc_card *)priv->phandle->card) + ->func, + reg, &ret); + sdio_release_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); if (ret) { PRINTM(MERROR, "sdio_readb: reading register 0x%X failed\n", @@ -4756,7 +4694,8 @@ woal_cmd52rdwr_ioctl(moal_private *priv, struct iwreq *wrq) goto done; } #else - if (sdio_read_ioreg(priv->phandle->card, func, reg, &data) < 0) { + if (sdio_read_ioreg(priv->phandle->card, func, reg, &data) < + 0) { PRINTM(MERROR, "sdio_read_ioreg: reading register 0x%X failed\n", reg); @@ -4766,16 +4705,20 @@ woal_cmd52rdwr_ioctl(moal_private *priv, struct iwreq *wrq) #endif } else { #ifdef SDIO_MMC - sdio_claim_host(((struct sdio_mmc_card *)priv->phandle->card)-> - func); + sdio_claim_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); if (func) - sdio_writeb(((struct sdio_mmc_card *)priv->phandle-> - card)->func, data, reg, &ret); + sdio_writeb( + ((struct sdio_mmc_card *)priv->phandle->card) + ->func, + data, reg, &ret); else - sdio_f0_writeb(((struct sdio_mmc_card *)priv->phandle-> - card)->func, data, reg, &ret); - sdio_release_host(((struct sdio_mmc_card *)priv->phandle-> - card)->func); + sdio_f0_writeb( + ((struct sdio_mmc_card *)priv->phandle->card) + ->func, + data, reg, &ret); + sdio_release_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); if (ret) { PRINTM(MERROR, "sdio_writeb: writing register 0x%X failed\n", @@ -4783,7 +4726,8 @@ woal_cmd52rdwr_ioctl(moal_private *priv, struct iwreq *wrq) goto done; } #else - if (sdio_write_ioreg(priv->phandle->card, func, reg, data) < 0) { + if (sdio_write_ioreg(priv->phandle->card, func, reg, data) < + 0) { PRINTM(MERROR, "sdio_write_ioreg: writing register 0x%X failed\n", reg); @@ -4813,8 +4757,7 @@ done: * @param wrq A pointer to iwreq structure * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static int -woal_cmd53rdwr_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_cmd53rdwr_ioctl(moal_private *priv, struct iwreq *wrq) { t_u8 *buf = NULL; t_u8 rw, func, mode; @@ -4848,16 +4791,16 @@ woal_cmd53rdwr_ioctl(moal_private *priv, struct iwreq *wrq) goto done; } - rw = buf[0]; /* read/write (0/1) */ - func = buf[1]; /* func (0/1/2) */ - reg = buf[5]; /* address */ + rw = buf[0]; /* read/write (0/1) */ + func = buf[1]; /* func (0/1/2) */ + reg = buf[5]; /* address */ reg = (reg << 8) + buf[4]; reg = (reg << 8) + buf[3]; reg = (reg << 8) + buf[2]; - mode = buf[6]; /* byte mode/block mode (0/1) */ - blklen = buf[8]; /* block size */ + mode = buf[6]; /* byte mode/block mode (0/1) */ + blklen = buf[8]; /* block size */ blklen = (blklen << 8) + buf[7]; - blknum = buf[10]; /* block number or byte number */ + blknum = buf[10]; /* block number or byte number */ blknum = (blknum << 8) + buf[9]; if (mode != BYTE_MODE) @@ -4873,16 +4816,16 @@ woal_cmd53rdwr_ioctl(moal_private *priv, struct iwreq *wrq) func, reg, mode, blklen, blknum); if (!rw) { - sdio_claim_host(((struct sdio_mmc_card *)priv->phandle->card)-> - func); - if (sdio_readsb - (((struct sdio_mmc_card *)priv->phandle->card)->func, data, - reg, total_len)) + sdio_claim_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); + if (sdio_readsb( + ((struct sdio_mmc_card *)priv->phandle->card)->func, + data, reg, total_len)) PRINTM(MERROR, "sdio_readsb: reading memory 0x%x failed\n", reg); - sdio_release_host(((struct sdio_mmc_card *)priv->phandle-> - card)->func); + sdio_release_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); if (copy_to_user(wrq->u.data.pointer, data, total_len)) { PRINTM(MINFO, "Copy to user failed\n"); @@ -4900,16 +4843,16 @@ woal_cmd53rdwr_ioctl(moal_private *priv, struct iwreq *wrq) for (pos = 0; pos < total_len; pos++) data[pos] = buf[11 + (pos % pattern_len)]; - sdio_claim_host(((struct sdio_mmc_card *)priv->phandle->card)-> - func); - if (sdio_writesb - (((struct sdio_mmc_card *)priv->phandle->card)->func, reg, - data, total_len)) + sdio_claim_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); + if (sdio_writesb( + ((struct sdio_mmc_card *)priv->phandle->card)->func, + reg, data, total_len)) PRINTM(MERROR, "sdio_writesb: writing memory 0x%x failed\n", reg); - sdio_release_host(((struct sdio_mmc_card *)priv->phandle-> - card)->func); + sdio_release_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); } done: @@ -4929,8 +4872,7 @@ done: * * @return 0/MLAN_STATUS_PENDING --success, otherwise fail */ -static int -woal_do_sdio_mpa_ctrl(moal_private *priv, struct iwreq *wrq) +static int woal_do_sdio_mpa_ctrl(moal_private *priv, struct iwreq *wrq) { int data[6], data_length = wrq->u.data.length, copy_len; int ret = 0; @@ -5048,8 +4990,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_get_scan_cfg(moal_private *priv, struct iwreq *wrq) +static int woal_set_get_scan_cfg(moal_private *priv, struct iwreq *wrq) { int ret = 0; int data[7], copy_len; @@ -5147,8 +5088,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_get_ps_cfg(moal_private *priv, struct iwreq *wrq) +static int woal_set_get_ps_cfg(moal_private *priv, struct iwreq *wrq) { int data[7], copy_len, ret = 0; mlan_ds_pm_cfg *pm_cfg = NULL; @@ -5160,8 +5100,8 @@ woal_set_get_ps_cfg(moal_private *priv, struct iwreq *wrq) ENTER(); - allowed++; /* For beacon missing timeout parameter */ - allowed += 2; /* For delay to PS and PS mode parameters */ + allowed++; /* For beacon missing timeout parameter */ + allowed += 2; /* For delay to PS and PS mode parameters */ copy_len = MIN(sizeof(data), sizeof(int) * data_length); req = woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_pm_cfg)); @@ -5190,17 +5130,17 @@ woal_set_get_ps_cfg(moal_private *priv, struct iwreq *wrq) ret = -EINVAL; goto done; } - if ((data[1] != MRVDRV_IGNORE_MULTIPLE_DTIM) - && (data[1] != MRVDRV_MATCH_CLOSEST_DTIM) - && ((data[1] < MRVDRV_MIN_MULTIPLE_DTIM) - || (data[1] > MRVDRV_MAX_MULTIPLE_DTIM))) { + if ((data[1] != MRVDRV_IGNORE_MULTIPLE_DTIM) && + (data[1] != MRVDRV_MATCH_CLOSEST_DTIM) && + ((data[1] < MRVDRV_MIN_MULTIPLE_DTIM) || + (data[1] > MRVDRV_MAX_MULTIPLE_DTIM))) { PRINTM(MERROR, "Invalid argument for multiple DTIM\n"); ret = -EINVAL; goto done; } - if ((data[2] < MRVDRV_MIN_LISTEN_INTERVAL) - && (data[2] != MRVDRV_LISTEN_INTERVAL_DISABLE)) { + if ((data[2] < MRVDRV_MIN_LISTEN_INTERVAL) && + (data[2] != MRVDRV_LISTEN_INTERVAL_DISABLE)) { PRINTM(MERROR, "Invalid argument for listen interval\n"); ret = -EINVAL; @@ -5225,8 +5165,9 @@ woal_set_get_ps_cfg(moal_private *priv, struct iwreq *wrq) goto done; } i++; - if ((data[i] != PS_MODE_UNCHANGED) && (data[i] != PS_MODE_AUTO) - && (data[i] != PS_MODE_POLL) && (data[i] != PS_MODE_NULL)) { + if ((data[i] != PS_MODE_UNCHANGED) && + (data[i] != PS_MODE_AUTO) && (data[i] != PS_MODE_POLL) && + (data[i] != PS_MODE_NULL)) { PRINTM(MERROR, "Invalid argument for PS mode\n"); ret = -EINVAL; goto done; @@ -5245,7 +5186,8 @@ woal_set_get_ps_cfg(moal_private *priv, struct iwreq *wrq) } moal_memcpy_ext(priv->phandle, data, &pm_cfg->param.ps_cfg, MIN((sizeof(int) * allowed), - sizeof(pm_cfg->param.ps_cfg)), sizeof(data)); + sizeof(pm_cfg->param.ps_cfg)), + sizeof(data)); if (copy_to_user(wrq->u.data.pointer, data, sizeof(int) * allowed)) { ret = -EFAULT; goto done; @@ -5303,8 +5245,7 @@ done: * * @return 0 if successful; IOCTL error code otherwise */ -static int -woal_wmm_addts_req_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_wmm_addts_req_ioctl(moal_private *priv, struct iwreq *wrq) { mlan_ioctl_req *req = NULL; mlan_ds_wmm_cfg *cfg = NULL; @@ -5365,12 +5306,12 @@ woal_wmm_addts_req_ioctl(moal_private *priv, struct iwreq *wrq) cfg->param.addts.ie_data_len, sizeof(addts_ioctl.ie_data)); - wrq->u.data.length = (sizeof(addts_ioctl) - - sizeof(addts_ioctl.ie_data) - + cfg->param.addts.ie_data_len); + wrq->u.data.length = + (sizeof(addts_ioctl) - sizeof(addts_ioctl.ie_data) + + cfg->param.addts.ie_data_len); - if (copy_to_user(wrq->u.data.pointer, - &addts_ioctl, wrq->u.data.length)) { + if (copy_to_user(wrq->u.data.pointer, &addts_ioctl, + wrq->u.data.length)) { PRINTM(MERROR, "TSPEC: ADDTS copy to user failed\n"); ret = -EFAULT; goto done; @@ -5405,8 +5346,7 @@ done: * * @return 0 if successful; IOCTL error code otherwise */ -static int -woal_wmm_delts_req_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_wmm_delts_req_ioctl(moal_private *priv, struct iwreq *wrq) { mlan_ioctl_req *req = NULL; mlan_ds_wmm_cfg *cfg = NULL; @@ -5459,12 +5399,13 @@ woal_wmm_delts_req_ioctl(moal_private *priv, struct iwreq *wrq) goto done; } - /* Return the firmware command result back to the application layer */ + /* Return the firmware command result back to the application + * layer */ delts_ioctl.cmd_result = cfg->param.delts.result; wrq->u.data.length = sizeof(delts_ioctl); - if (copy_to_user(wrq->u.data.pointer, - &delts_ioctl, wrq->u.data.length)) { + if (copy_to_user(wrq->u.data.pointer, &delts_ioctl, + wrq->u.data.length)) { PRINTM(MERROR, "TSPEC: DELTS copy to user failed\n"); ret = -EFAULT; goto done; @@ -5490,8 +5431,7 @@ done: * * @return 0 if successful; IOCTL error code otherwise */ -static int -woal_wmm_queue_config_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_wmm_queue_config_ioctl(moal_private *priv, struct iwreq *wrq) { mlan_ioctl_req *req = NULL; mlan_ds_wmm_cfg *pwmm = NULL; @@ -5539,8 +5479,8 @@ woal_wmm_queue_config_ioctl(moal_private *priv, struct iwreq *wrq) qcfg_ioctl.msdu_lifetime_expiry = pqcfg->msdu_lifetime_expiry; wrq->u.data.length = sizeof(qcfg_ioctl); - if (copy_to_user - (wrq->u.data.pointer, &qcfg_ioctl, wrq->u.data.length)) { + if (copy_to_user(wrq->u.data.pointer, &qcfg_ioctl, + wrq->u.data.length)) { PRINTM(MERROR, "QCONFIG: copy to user failed\n"); ret = -EFAULT; goto done; @@ -5569,8 +5509,7 @@ done: * * @return 0 if successful; IOCTL error code otherwise */ -static int -woal_wmm_queue_stats_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_wmm_queue_stats_ioctl(moal_private *priv, struct iwreq *wrq) { mlan_ioctl_req *req = NULL; mlan_ds_wmm_cfg *pwmm = NULL; @@ -5621,8 +5560,8 @@ woal_wmm_queue_stats_ioctl(moal_private *priv, struct iwreq *wrq) sizeof(qstats_ioctl)); wrq->u.data.length = sizeof(qstats_ioctl); - if (copy_to_user - (wrq->u.data.pointer, &qstats_ioctl, wrq->u.data.length)) { + if (copy_to_user(wrq->u.data.pointer, &qstats_ioctl, + wrq->u.data.length)) { PRINTM(MERROR, "QSTATS: copy to user failed\n"); ret = -EFAULT; goto done; @@ -5653,8 +5592,7 @@ done: * * @return 0 if successful; IOCTL error code otherwise */ -static int -woal_wmm_queue_status_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_wmm_queue_status_ioctl(moal_private *priv, struct iwreq *wrq) { mlan_ioctl_req *req = NULL; mlan_ds_wmm_cfg *pwmm = NULL; @@ -5690,8 +5628,8 @@ woal_wmm_queue_status_ioctl(moal_private *priv, struct iwreq *wrq) wrq->u.data.length = 0; } - if (copy_to_user - (wrq->u.data.pointer, &qstatus_ioctl, wrq->u.data.length)) { + if (copy_to_user(wrq->u.data.pointer, &qstatus_ioctl, + wrq->u.data.length)) { PRINTM(MERROR, "QSTATUS: copy to user failed\n"); ret = -EFAULT; goto done; @@ -5713,8 +5651,7 @@ done: * * @return 0 if successful; IOCTL error code otherwise */ -static int -woal_wmm_ts_status_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_wmm_ts_status_ioctl(moal_private *priv, struct iwreq *wrq) { mlan_ioctl_req *req = NULL; mlan_ds_wmm_cfg *pwmm = NULL; @@ -5764,8 +5701,8 @@ woal_wmm_ts_status_ioctl(moal_private *priv, struct iwreq *wrq) wrq->u.data.length = 0; } - if (copy_to_user - (wrq->u.data.pointer, &ts_status_ioctl, wrq->u.data.length)) { + if (copy_to_user(wrq->u.data.pointer, &ts_status_ioctl, + wrq->u.data.length)) { PRINTM(MERROR, "TS_STATUS: copy to user failed\n"); ret = -EFAULT; goto done; @@ -5786,8 +5723,7 @@ done: * * @return 0 if successful; IOCTL error code otherwise */ -static int -woal_bypassed_packet_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_bypassed_packet_ioctl(moal_private *priv, struct iwreq *wrq) { int ret = 0; struct sk_buff *skb = NULL; @@ -5795,11 +5731,11 @@ woal_bypassed_packet_ioctl(moal_private *priv, struct iwreq *wrq) t_u16 moreLen = 0, copyLen = 0; ENTER(); -#define MLAN_BYPASS_PKT_EXTRA_OFFSET (4) +#define MLAN_BYPASS_PKT_EXTRA_OFFSET (4) copyLen = wrq->u.data.length; - moreLen = MLAN_MIN_DATA_HEADER_LEN + MLAN_BYPASS_PKT_EXTRA_OFFSET - + sizeof(mlan_buffer); + moreLen = MLAN_MIN_DATA_HEADER_LEN + MLAN_BYPASS_PKT_EXTRA_OFFSET + + sizeof(mlan_buffer); skb = alloc_skb(copyLen + moreLen, GFP_KERNEL); if (skb == NULL) { @@ -5810,7 +5746,8 @@ woal_bypassed_packet_ioctl(moal_private *priv, struct iwreq *wrq) skb_reserve(skb, moreLen); - if (copy_from_user(skb_put(skb, copyLen), wrq->u.data.pointer, copyLen)) { + if (copy_from_user(skb_put(skb, copyLen), wrq->u.data.pointer, + copyLen)) { PRINTM(MERROR, "PortBlock: copy from user failed\n"); dev_kfree_skb_any(skb); ret = -EFAULT; @@ -5837,8 +5774,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_auth_type(moal_private *priv, struct iwreq *wrq) +static int woal_auth_type(moal_private *priv, struct iwreq *wrq) { int auth_type; t_u32 auth_mode; @@ -5852,24 +5788,24 @@ woal_auth_type(moal_private *priv, struct iwreq *wrq) goto done; } auth_type = auth_mode; - if (copy_to_user - (wrq->u.data.pointer, &auth_type, sizeof(auth_type))) { + if (copy_to_user(wrq->u.data.pointer, &auth_type, + sizeof(auth_type))) { PRINTM(MERROR, "Copy to user failed\n"); ret = -EFAULT; goto done; } wrq->u.data.length = 1; } else { - if (copy_from_user - (&auth_type, wrq->u.data.pointer, sizeof(auth_type))) { + if (copy_from_user(&auth_type, wrq->u.data.pointer, + sizeof(auth_type))) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; } PRINTM(MINFO, "SET: auth_type %d\n", auth_type); if (((auth_type < MLAN_AUTH_MODE_OPEN) || - (auth_type > MLAN_AUTH_MODE_SHARED)) - && (auth_type != MLAN_AUTH_MODE_AUTO)) { + (auth_type > MLAN_AUTH_MODE_SHARED)) && + (auth_type != MLAN_AUTH_MODE_AUTO)) { ret = -EINVAL; goto done; } @@ -5893,8 +5829,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_port_ctrl(moal_private *priv, struct iwreq *wrq) +static int woal_port_ctrl(moal_private *priv, struct iwreq *wrq) { mlan_ioctl_req *req = NULL; mlan_ds_sec_cfg *sec = NULL; @@ -5934,9 +5869,8 @@ woal_port_ctrl(moal_private *priv, struct iwreq *wrq) } if (!wrq->u.data.length) { - if (copy_to_user - (wrq->u.data.pointer, &sec->param.port_ctrl_enabled, - sizeof(int))) { + if (copy_to_user(wrq->u.data.pointer, + &sec->param.port_ctrl_enabled, sizeof(int))) { PRINTM(MERROR, "port_ctrl:Copy to user failed\n"); ret = -EFAULT; goto done; @@ -5959,8 +5893,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_dfs_testing(moal_private *priv, struct iwreq *wrq) +static int woal_dfs_testing(moal_private *priv, struct iwreq *wrq) { mlan_ioctl_req *req = NULL; mlan_ds_11h_cfg *ds_11hcfg = NULL; @@ -6057,8 +5990,7 @@ done: * * @return 0 -- success, otherwise fail */ -static int -woal_mgmt_frame_passthru_ctrl(moal_private *priv, struct iwreq *wrq) +static int woal_mgmt_frame_passthru_ctrl(moal_private *priv, struct iwreq *wrq) { int ret = 0, data_length = wrq->u.data.length; mlan_ioctl_req *req = NULL; @@ -6085,7 +6017,7 @@ woal_mgmt_frame_passthru_ctrl(moal_private *priv, struct iwreq *wrq) req->req_id = MLAN_IOCTL_MISC_CFG; mgmt_cfg->sub_command = MLAN_OID_MISC_RX_MGMT_IND; - if (data_length) { /* SET */ + if (data_length) { /* SET */ if (copy_from_user(&mask, wrq->u.data.pointer, sizeof(int))) { PRINTM(MERROR, "copy from user failed\n"); ret = -EFAULT; @@ -6126,8 +6058,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_cfp_code(moal_private *priv, struct iwreq *wrq) +static int woal_cfp_code(moal_private *priv, struct iwreq *wrq) { int ret = 0; int data[2], copy_len; @@ -6184,8 +6115,8 @@ woal_cfp_code(moal_private *priv, struct iwreq *wrq) data[0] = cfp_code->cfp_code_bg; data[1] = cfp_code->cfp_code_a; data_length = 2; - if (copy_to_user - (wrq->u.data.pointer, &data, sizeof(int) * data_length)) { + if (copy_to_user(wrq->u.data.pointer, &data, + sizeof(int) * data_length)) { PRINTM(MERROR, "Copy to user failed\n"); ret = -EFAULT; goto done; @@ -6208,13 +6139,12 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_get_tx_rx_ant(moal_private *priv, struct iwreq *wrq) +static int woal_set_get_tx_rx_ant(moal_private *priv, struct iwreq *wrq) { int ret = 0; mlan_ds_radio_cfg *radio = NULL; mlan_ioctl_req *req = NULL; - int data[3] = { 0 }; + int data[3] = {0}; mlan_status status = MLAN_STATUS_SUCCESS; int copy_len; @@ -6282,10 +6212,8 @@ woal_set_get_tx_rx_ant(moal_private *priv, struct iwreq *wrq) else if (data[0] == 0xffff) wrq->u.data.length = 2; } - if (copy_to_user - (wrq->u.data.pointer, data, - wrq->u.data.length * sizeof(int))) - { + if (copy_to_user(wrq->u.data.pointer, data, + wrq->u.data.length * sizeof(int))) { ret = -EFAULT; goto done; } @@ -6305,8 +6233,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_ind_rst_ioctl(moal_private *priv, struct iwreq *wrq) +static int woal_ind_rst_ioctl(moal_private *priv, struct iwreq *wrq) { int data[2], data_length = wrq->u.data.length, copy_len; int ret = 0; @@ -6379,8 +6306,8 @@ woal_ind_rst_ioctl(moal_private *priv, struct iwreq *wrq) data[1] = misc->param.ind_rst_cfg.gpio_pin; wrq->u.data.length = 2; - if (copy_to_user(wrq->u.data.pointer, data, sizeof(int) * - wrq->u.data.length)) { + if (copy_to_user(wrq->u.data.pointer, data, + sizeof(int) * wrq->u.data.length)) { PRINTM(MERROR, "QCONFIG: copy to user failed\n"); ret = -EFAULT; goto done; @@ -6405,8 +6332,7 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_wext_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd) +int woal_wext_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd) { moal_private *priv = (moal_private *)netdev_priv(dev); struct iwreq *wrq = (struct iwreq *)req; @@ -6421,10 +6347,10 @@ woal_wext_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd) switch (cmd) { case WOAL_SETONEINT_GETWORDCHAR: switch (wrq->u.data.flags) { - case WOAL_VERSION: /* Get driver version */ + case WOAL_VERSION: /* Get driver version */ ret = woal_get_driver_version(priv, req); break; - case WOAL_VEREXT: /* Get extended driver version */ + case WOAL_VEREXT: /* Get extended driver version */ ret = woal_get_driver_verext(priv, req); break; default: @@ -6761,11 +6687,9 @@ woal_wext_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd) break; case WOAL_FROYO_STOP: if (IS_UAP_WEXT(priv->phandle->params.cfg80211_wext) && - MLAN_STATUS_SUCCESS != woal_disconnect(priv, - MOAL_IOCTL_WAIT, - NULL, - DEF_DEAUTH_REASON_CODE)) - { + MLAN_STATUS_SUCCESS != + woal_disconnect(priv, MOAL_IOCTL_WAIT, NULL, + DEF_DEAUTH_REASON_CODE)) { ret = -EFAULT; } break; @@ -6786,11 +6710,11 @@ woal_wext_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd) * @param wait_option Wait option * @param m_rates A pointer to moal_802_11_rates structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_get_data_rates(moal_private *priv, t_u8 wait_option, - moal_802_11_rates *m_rates) +mlan_status woal_get_data_rates(moal_private *priv, t_u8 wait_option, + moal_802_11_rates *m_rates) { int ret = 0; mlan_ds_rate *rate = NULL; @@ -6815,11 +6739,9 @@ woal_get_data_rates(moal_private *priv, t_u8 wait_option, status = woal_request_ioctl(priv, req, wait_option); if (status == MLAN_STATUS_SUCCESS) { if (m_rates) - m_rates->num_of_rates = - woal_copy_rates(m_rates->rates, - m_rates->num_of_rates, - rate->param.rates, - MLAN_SUPPORTED_RATES); + m_rates->num_of_rates = woal_copy_rates( + m_rates->rates, m_rates->num_of_rates, + rate->param.rates, MLAN_SUPPORTED_RATES); } done: if (status != MLAN_STATUS_PENDING) @@ -6835,11 +6757,11 @@ done: * @param wait_option Wait option * @param chan_list A pointer to mlan_chan_list structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_get_channel_list(moal_private *priv, t_u8 wait_option, - mlan_chan_list *chan_list) +mlan_status woal_get_channel_list(moal_private *priv, t_u8 wait_option, + mlan_chan_list *chan_list) { int ret = 0; mlan_ds_bss *bss = NULL; @@ -6885,8 +6807,7 @@ done: * * @return N/A */ -void -woal_ioctl_get_info_resp(moal_private *priv, mlan_ds_get_info *info) +void woal_ioctl_get_info_resp(moal_private *priv, mlan_ds_get_info *info) { ENTER(); switch (info->sub_command) { @@ -6917,8 +6838,7 @@ woal_ioctl_get_info_resp(moal_private *priv, mlan_ds_get_info *info) * * @return N/A */ -void -woal_ioctl_get_bss_resp(moal_private *priv, mlan_ds_bss *bss) +void woal_ioctl_get_bss_resp(moal_private *priv, mlan_ds_bss *bss) { t_u32 mode = 0; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_priv.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_priv.h index c69cf80c43c0..c84569d7b96c 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_priv.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_priv.h @@ -3,23 +3,23 @@ * * @brief This file contains definition for extended private IOCTL call. * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /******************************************************** Change log: @@ -30,22 +30,22 @@ Change log: #define _WOAL_PRIV_H_ /** 2K bytes */ -#define WOAL_2K_BYTES 2000 +#define WOAL_2K_BYTES 2000 /** PRIVATE CMD ID */ -#define WOAL_IOCTL (SIOCIWFIRSTPRIV) /* 0x8BE0 defined in wireless.h */ +#define WOAL_IOCTL (SIOCIWFIRSTPRIV) /* 0x8BE0 defined in wireless.h */ /** Private command ID to set one int/get word char */ -#define WOAL_SETONEINT_GETWORDCHAR (WOAL_IOCTL + 1) +#define WOAL_SETONEINT_GETWORDCHAR (WOAL_IOCTL + 1) /** Private command ID to get version */ -#define WOAL_VERSION 1 +#define WOAL_VERSION 1 /** Private command ID to get extended version */ -#define WOAL_VEREXT 2 +#define WOAL_VEREXT 2 /** Private command ID to set/get none */ -#define WOAL_SETNONE_GETNONE (WOAL_IOCTL + 2) +#define WOAL_SETNONE_GETNONE (WOAL_IOCTL + 2) /** Private command ID for warm reset */ -#define WOAL_WARMRESET 1 +#define WOAL_WARMRESET 1 /** * Linux Kernels later 3.9 use CONFIG_PM_RUNTIME instead of @@ -69,692 +69,404 @@ Change log: #ifdef CONFIG_USB_SUSPEND /** Private command ID for usb suspend */ -#define WOAL_USB_SUSPEND 2 +#define WOAL_USB_SUSPEND 2 /** Private command ID for usb resume */ -#define WOAL_USB_RESUME 3 +#define WOAL_USB_RESUME 3 #endif /* CONFIG_USB_SUSPEND */ /** Private command ID to clear 11d chan table */ -#define WOAL_11D_CLR_CHAN_TABLE 4 +#define WOAL_11D_CLR_CHAN_TABLE 4 /** Private command ID to set/get sixteen int */ -#define WOAL_SET_GET_SIXTEEN_INT (WOAL_IOCTL + 3) +#define WOAL_SET_GET_SIXTEEN_INT (WOAL_IOCTL + 3) /** Private command ID to set/get TX power configurations */ -#define WOAL_TX_POWERCFG 1 +#define WOAL_TX_POWERCFG 1 #ifdef DEBUG_LEVEL1 /** Private command ID to set/get driver debug */ -#define WOAL_DRV_DBG 2 +#define WOAL_DRV_DBG 2 #endif /** Private command ID to set/get beacon interval */ -#define WOAL_BEACON_INTERVAL 3 +#define WOAL_BEACON_INTERVAL 3 /** Private command ID to get RSSI */ -#define WOAL_SIGNAL 5 +#define WOAL_SIGNAL 5 /** Private command ID to set/get Deep Sleep mode */ -#define WOAL_DEEP_SLEEP 7 +#define WOAL_DEEP_SLEEP 7 /** Private command ID for 11n ht configration */ -#define WOAL_11N_TX_CFG 8 +#define WOAL_11N_TX_CFG 8 /** Private command ID for 11n usr ht configration */ -#define WOAL_11N_HTCAP_CFG 9 +#define WOAL_11N_HTCAP_CFG 9 /** Private command ID for TX Aggregation */ -#define WOAL_PRIO_TBL 10 +#define WOAL_PRIO_TBL 10 /** Private command ID for Updating ADDBA variables */ -#define WOAL_ADDBA_UPDT 11 +#define WOAL_ADDBA_UPDT 11 /** Private command ID to set/get Host Sleep configuration */ -#define WOAL_HS_CFG 12 +#define WOAL_HS_CFG 12 /** Private command ID to set Host Sleep parameters */ -#define WOAL_HS_SETPARA 13 +#define WOAL_HS_SETPARA 13 /** Private command ID to read/write registers */ -#define WOAL_REG_READ_WRITE 14 +#define WOAL_REG_READ_WRITE 14 /** Private command ID to set/get band/adhocband */ -#define WOAL_BAND_CFG 15 +#define WOAL_BAND_CFG 15 /** Private command ID for TX Aggregation */ -#define WOAL_11N_AMSDU_AGGR_CTRL 17 +#define WOAL_11N_AMSDU_AGGR_CTRL 17 /** Private command ID to set/get Inactivity timeout */ #define WOAL_INACTIVITY_TIMEOUT_EXT 18 #ifdef SDIO /** Private command ID to turn on/off sdio clock */ -#define WOAL_SDIO_CLOCK 19 +#define WOAL_SDIO_CLOCK 19 /** Private command ID to read/write Command 52 */ -#define WOAL_CMD_52RDWR 20 +#define WOAL_CMD_52RDWR 20 #endif /** Private command ID to set/get scan configuration parameter */ -#define WOAL_SCAN_CFG 21 +#define WOAL_SCAN_CFG 21 /** Private command ID to set/get PS configuration parameter */ -#define WOAL_PS_CFG 22 +#define WOAL_PS_CFG 22 /** Private command ID to read/write memory */ -#define WOAL_MEM_READ_WRITE 23 +#define WOAL_MEM_READ_WRITE 23 #ifdef SDIO /** Private command ID to control SDIO MP-A */ -#define WOAL_SDIO_MPA_CTRL 25 +#define WOAL_SDIO_MPA_CTRL 25 #endif /** Private command ID for Updating ADDBA variables */ -#define WOAL_ADDBA_REJECT 27 +#define WOAL_ADDBA_REJECT 27 /** Private command ID to set/get sleep parameters */ -#define WOAL_SLEEP_PARAMS 28 +#define WOAL_SLEEP_PARAMS 28 /** Private command ID to set/get TX BF capabilities */ -#define WOAL_TX_BF_CAP 31 +#define WOAL_TX_BF_CAP 31 /** Private command ID to set/get dfs testing settings */ -#define WOAL_DFS_TESTING 33 +#define WOAL_DFS_TESTING 33 /** Private command ID to set/get CFP table codes */ -#define WOAL_CFP_CODE 34 +#define WOAL_CFP_CODE 34 /** Private command ID to set/get tx/rx antenna */ -#define WOAL_SET_GET_TX_RX_ANT 35 +#define WOAL_SET_GET_TX_RX_ANT 35 /** Private command ID to set/get management frame passthru mask */ -#define WOAL_MGMT_FRAME_CTRL 36 +#define WOAL_MGMT_FRAME_CTRL 36 /** Private command ID to configure gpio independent reset */ -#define WOAL_IND_RST_CFG 37 +#define WOAL_IND_RST_CFG 37 /** Private command ID to set one int/get one int */ -#define WOAL_SETONEINT_GETONEINT (WOAL_IOCTL + 5) +#define WOAL_SETONEINT_GETONEINT (WOAL_IOCTL + 5) /** Private command ID to set/get Tx rate */ -#define WOAL_SET_GET_TXRATE 1 +#define WOAL_SET_GET_TXRATE 1 /** Private command ID to set/get region code */ -#define WOAL_SET_GET_REGIONCODE 2 +#define WOAL_SET_GET_REGIONCODE 2 /** Private command ID to turn on/off radio */ -#define WOAL_SET_RADIO 3 +#define WOAL_SET_RADIO 3 /** Private command ID to enable WMM */ -#define WOAL_WMM_ENABLE 4 +#define WOAL_WMM_ENABLE 4 /** Private command ID to enable 802.11D */ -#define WOAL_11D_ENABLE 5 +#define WOAL_11D_ENABLE 5 /** Private command ID to set/get QoS configuration */ -#define WOAL_SET_GET_QOS_CFG 7 +#define WOAL_SET_GET_QOS_CFG 7 #if defined(REASSOCIATION) /** Private command ID to set/get reassociation setting */ -#define WOAL_SET_GET_REASSOC 9 +#define WOAL_SET_GET_REASSOC 9 #endif /* REASSOCIATION */ /** Private command ID for Updating Transmit buffer configration */ -#define WOAL_TXBUF_CFG 10 +#define WOAL_TXBUF_CFG 10 /** Private command ID to set/get WWS mode */ -#define WOAL_SET_GET_WWS_CFG 12 +#define WOAL_SET_GET_WWS_CFG 12 /** Private command ID to set/get sleep period */ -#define WOAL_SLEEP_PD 13 +#define WOAL_SLEEP_PD 13 /** Private command ID to set/get auth type */ -#define WOAL_AUTH_TYPE 18 +#define WOAL_AUTH_TYPE 18 /** Private command ID to set/get port control */ -#define WOAL_PORT_CTRL 19 +#define WOAL_PORT_CTRL 19 #ifdef WIFI_DIRECT_SUPPORT #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) /** Private command ID for set/get BSS role */ -#define WOAL_SET_GET_BSS_ROLE 21 +#define WOAL_SET_GET_BSS_ROLE 21 #endif #endif /** Private command ID for set/get 11h local power constraint */ #define WOAL_SET_GET_11H_LOCAL_PWR_CONSTRAINT 22 /** Private command ID to set/get 11N HT stream configuration */ -#define WOAL_HT_STREAM_CFG 23 +#define WOAL_HT_STREAM_CFG 23 /** Private command ID to set/get MAC control */ -#define WOAL_MAC_CONTROL 24 +#define WOAL_MAC_CONTROL 24 /** Private command ID to get thermal value */ -#define WOAL_THERMAL 25 +#define WOAL_THERMAL 25 /** Private command ID to set/get hs cfg param */ -#define WOAL_CFG_HOTSPOT 26 +#define WOAL_CFG_HOTSPOT 26 /** Private command ID to get log */ -#define WOALGETLOG (WOAL_IOCTL + 7) +#define WOALGETLOG (WOAL_IOCTL + 7) /** Private command ID to set a wext address variable */ -#define WOAL_SETADDR_GETNONE (WOAL_IOCTL + 8) +#define WOAL_SETADDR_GETNONE (WOAL_IOCTL + 8) /** Private command ID to send deauthentication */ -#define WOAL_DEAUTH 1 +#define WOAL_DEAUTH 1 /** Private command to get/set 256 chars */ -#define WOAL_SET_GET_256_CHAR (WOAL_IOCTL + 9) +#define WOAL_SET_GET_256_CHAR (WOAL_IOCTL + 9) /** Private command to read/write passphrase */ -#define WOAL_PASSPHRASE 1 -#define WOAL_ASSOCIATE 3 +#define WOAL_PASSPHRASE 1 +#define WOAL_ASSOCIATE 3 /** Private command ID to get WMM queue status */ -#define WOAL_WMM_QUEUE_STATUS 4 +#define WOAL_WMM_QUEUE_STATUS 4 /** Private command ID to get Traffic stream status */ -#define WOAL_WMM_TS_STATUS 5 -#define WOAL_IP_ADDRESS 7 +#define WOAL_WMM_TS_STATUS 5 +#define WOAL_IP_ADDRESS 7 /** Private command ID to set/get TX bemaforming */ -#define WOAL_TX_BF_CFG 8 +#define WOAL_TX_BF_CFG 8 /** Private command ID to get PTK/GTK */ -#define WOAL_GET_KEY 9 +#define WOAL_GET_KEY 9 /** Get log buffer size */ -#define GETLOG_BUFSIZE 1500 +#define GETLOG_BUFSIZE 1500 /** Private command ID to set none/get twelve chars*/ #define WOAL_SETNONE_GETTWELVE_CHAR (WOAL_IOCTL + 11) /** Private command ID for WPS session */ -#define WOAL_WPS_SESSION 1 +#define WOAL_WPS_SESSION 1 /** Private command ID to set none/get four int */ -#define WOAL_SETNONE_GET_FOUR_INT (WOAL_IOCTL + 13) +#define WOAL_SETNONE_GET_FOUR_INT (WOAL_IOCTL + 13) /** Private command ID to get data rates */ -#define WOAL_DATA_RATE 1 +#define WOAL_DATA_RATE 1 /** Private command ID to get E-Supplicant mode */ -#define WOAL_ESUPP_MODE 2 +#define WOAL_ESUPP_MODE 2 /** Private command to get/set 64 ints */ -#define WOAL_SET_GET_64_INT (WOAL_IOCTL + 15) +#define WOAL_SET_GET_64_INT (WOAL_IOCTL + 15) /** Private command ID to set/get ECL system clock */ -#define WOAL_ECL_SYS_CLOCK 1 +#define WOAL_ECL_SYS_CLOCK 1 /** Private command ID for hostcmd */ -#define WOAL_HOST_CMD (WOAL_IOCTL + 17) +#define WOAL_HOST_CMD (WOAL_IOCTL + 17) /** Private command ID to set ints and get chars */ -#define WOAL_SET_INTS_GET_CHARS (WOAL_IOCTL + 21) +#define WOAL_SET_INTS_GET_CHARS (WOAL_IOCTL + 21) /** Private command ID to read EEPROM data */ -#define WOAL_READ_EEPROM 1 +#define WOAL_READ_EEPROM 1 /** Private command ID to set/get 2K bytes */ -#define WOAL_SET_GET_2K_BYTES (WOAL_IOCTL + 23) +#define WOAL_SET_GET_2K_BYTES (WOAL_IOCTL + 23) #ifdef SDIO /** Private command ID to read/write Command 53 */ -#define WOAL_CMD_53RDWR 2 +#define WOAL_CMD_53RDWR 2 #endif /** Private command ID for setuserscan */ -#define WOAL_SET_USER_SCAN 3 +#define WOAL_SET_USER_SCAN 3 /** Private command ID for getscantable */ -#define WOAL_GET_SCAN_TABLE 4 +#define WOAL_GET_SCAN_TABLE 4 /** Private command ID for setuserscanext: async without wait */ -#define WOAL_SET_USER_SCAN_EXT 5 +#define WOAL_SET_USER_SCAN_EXT 5 /** Private command ID to request ADDTS */ -#define WOAL_WMM_ADDTS 7 +#define WOAL_WMM_ADDTS 7 /** Private command ID to request DELTS */ -#define WOAL_WMM_DELTS 8 +#define WOAL_WMM_DELTS 8 /** Private command ID to queue configuration */ -#define WOAL_WMM_QUEUE_CONFIG 9 +#define WOAL_WMM_QUEUE_CONFIG 9 /** Private command ID to queue stats */ -#define WOAL_WMM_QUEUE_STATS 10 +#define WOAL_WMM_QUEUE_STATS 10 /** Private command ID to Bypass auth packet */ -#define WOAL_BYPASSED_PACKET 11 +#define WOAL_BYPASSED_PACKET 11 #ifdef UAP_WEXT /** The following command IDs are for Froyo app */ /** Private command ID to start driver */ -#define WOAL_FROYO_START (WOAL_IOCTL + 28) +#define WOAL_FROYO_START (WOAL_IOCTL + 28) /** Private command ID to reload FW */ -#define WOAL_FROYO_WL_FW_RELOAD (WOAL_IOCTL + 29) +#define WOAL_FROYO_WL_FW_RELOAD (WOAL_IOCTL + 29) /** Private command ID to stop driver */ -#define WOAL_FROYO_STOP (WOAL_IOCTL + 30) +#define WOAL_FROYO_STOP (WOAL_IOCTL + 30) #endif /** * iwpriv ioctl handlers */ static const struct iw_priv_args woal_private_args[] = { - { - WOAL_SETONEINT_GETWORDCHAR, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_CHAR | 128, - ""}, - { - WOAL_VERSION, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_CHAR | 128, + {WOAL_SETONEINT_GETWORDCHAR, IW_PRIV_TYPE_INT | 1, + IW_PRIV_TYPE_CHAR | 128, ""}, + {WOAL_VERSION, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_CHAR | 128, "version"}, - { - WOAL_VEREXT, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_CHAR | 128, - "verext"}, - { - WOAL_SETNONE_GETNONE, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_NONE, - ""}, - { - WOAL_WARMRESET, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_NONE, - "warmreset"}, + {WOAL_VEREXT, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_CHAR | 128, "verext"}, + {WOAL_SETNONE_GETNONE, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_NONE, ""}, + {WOAL_WARMRESET, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_NONE, "warmreset"}, #ifdef CONFIG_USB_SUSPEND - { - WOAL_USB_SUSPEND, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_NONE, - "usbsuspend"}, - { - WOAL_USB_RESUME, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_NONE, - "usbresume"}, + {WOAL_USB_SUSPEND, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_NONE, "usbsuspend"}, + {WOAL_USB_RESUME, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_NONE, "usbresume"}, #endif /* CONFIG_USB_SUSPEND */ - { - WOAL_SETONEINT_GETONEINT, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, + {WOAL_SETONEINT_GETONEINT, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, ""}, - { - WOAL_SET_GET_TXRATE, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, + {WOAL_SET_GET_TXRATE, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "txratecfg"}, - { - WOAL_SET_GET_REGIONCODE, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, + {WOAL_SET_GET_REGIONCODE, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "regioncode"}, - { - WOAL_SET_RADIO, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, + {WOAL_SET_RADIO, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "radioctrl"}, - { - WOAL_WMM_ENABLE, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, - "wmmcfg"}, - { - WOAL_11D_ENABLE, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, - "11dcfg"}, - { - WOAL_11D_CLR_CHAN_TABLE, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_NONE, + {WOAL_WMM_ENABLE, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "wmmcfg"}, + {WOAL_11D_ENABLE, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "11dcfg"}, + {WOAL_11D_CLR_CHAN_TABLE, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_NONE, "11dclrtbl"}, - { - WOAL_SET_GET_QOS_CFG, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, + {WOAL_SET_GET_QOS_CFG, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "qoscfg"}, #ifndef OPCHAN - { - WOAL_SET_GET_WWS_CFG, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, + {WOAL_SET_GET_WWS_CFG, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "wwscfg"}, #endif #if defined(REASSOCIATION) - { - WOAL_SET_GET_REASSOC, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, + {WOAL_SET_GET_REASSOC, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "reassoctrl"}, #endif - { - WOAL_TXBUF_CFG, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, + {WOAL_TXBUF_CFG, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "txbufcfg"}, - { - WOAL_SLEEP_PD, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, - "sleeppd"}, - { - WOAL_AUTH_TYPE, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, + {WOAL_SLEEP_PD, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "sleeppd"}, + {WOAL_AUTH_TYPE, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "authtype"}, - { - WOAL_PORT_CTRL, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, + {WOAL_PORT_CTRL, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "port_ctrl"}, #ifdef WIFI_DIRECT_SUPPORT #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) - { - WOAL_SET_GET_BSS_ROLE, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, + {WOAL_SET_GET_BSS_ROLE, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "bssrole"}, #endif #endif - { - WOAL_SET_GET_11H_LOCAL_PWR_CONSTRAINT, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, - "powercons"}, - { - WOAL_HT_STREAM_CFG, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, + {WOAL_SET_GET_11H_LOCAL_PWR_CONSTRAINT, IW_PRIV_TYPE_INT | 1, + IW_PRIV_TYPE_INT | 1, "powercons"}, + {WOAL_HT_STREAM_CFG, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "htstreamcfg"}, - { - WOAL_MAC_CONTROL, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, + {WOAL_MAC_CONTROL, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "macctrl"}, - { - WOAL_THERMAL, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, - "thermal"}, - { - WOAL_CFG_HOTSPOT, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, + {WOAL_THERMAL, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "thermal"}, + {WOAL_CFG_HOTSPOT, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "hotspotcfg"}, - { - WOAL_SET_GET_SIXTEEN_INT, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_SET_GET_SIXTEEN_INT, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, ""}, - { - WOAL_TX_POWERCFG, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_TX_POWERCFG, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "txpowercfg"}, #ifdef DEBUG_LEVEL1 - { - WOAL_DRV_DBG, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, - "drvdbg"}, + {WOAL_DRV_DBG, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "drvdbg"}, #endif - { - WOAL_BEACON_INTERVAL, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_BEACON_INTERVAL, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "bcninterval"}, - { - WOAL_SIGNAL, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_SIGNAL, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "getsignal"}, { - WOAL_DEEP_SLEEP, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, - "deepsleep", - }, - { - WOAL_11N_TX_CFG, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + WOAL_DEEP_SLEEP, + IW_PRIV_TYPE_INT | 16, + IW_PRIV_TYPE_INT | 16, + "deepsleep", + }, + {WOAL_11N_TX_CFG, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "httxcfg"}, - { - WOAL_11N_HTCAP_CFG, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_11N_HTCAP_CFG, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "htcapinfo"}, - { - WOAL_PRIO_TBL, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_PRIO_TBL, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "aggrpriotbl"}, - { - WOAL_11N_AMSDU_AGGR_CTRL, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_11N_AMSDU_AGGR_CTRL, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "amsduaggrctrl"}, - { - WOAL_ADDBA_UPDT, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_ADDBA_UPDT, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "addbapara"}, - { - WOAL_ADDBA_REJECT, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_ADDBA_REJECT, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "addbareject"}, - { - WOAL_TX_BF_CAP, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_TX_BF_CAP, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "httxbfcap"}, - { - WOAL_HS_CFG, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, - "hscfg"}, - { - WOAL_HS_SETPARA, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_HS_CFG, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "hscfg"}, + {WOAL_HS_SETPARA, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "hssetpara"}, - { - WOAL_REG_READ_WRITE, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_REG_READ_WRITE, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "regrdwr"}, - { - WOAL_BAND_CFG, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_BAND_CFG, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "bandcfg"}, - { - WOAL_INACTIVITY_TIMEOUT_EXT, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, - "inactivityto"}, + {WOAL_INACTIVITY_TIMEOUT_EXT, IW_PRIV_TYPE_INT | 16, + IW_PRIV_TYPE_INT | 16, "inactivityto"}, #ifdef SDIO - { - WOAL_SDIO_CLOCK, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_SDIO_CLOCK, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "sdioclock"}, - { - WOAL_CMD_52RDWR, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_CMD_52RDWR, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "sdcmd52rw"}, #endif - { - WOAL_SCAN_CFG, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_SCAN_CFG, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "scancfg"}, - { - WOAL_PS_CFG, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, - "pscfg"}, - { - WOAL_MEM_READ_WRITE, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_PS_CFG, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "pscfg"}, + {WOAL_MEM_READ_WRITE, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "memrdwr"}, #ifdef SDIO - { - WOAL_SDIO_MPA_CTRL, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_SDIO_MPA_CTRL, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "mpactrl"}, #endif - { - WOAL_SLEEP_PARAMS, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_SLEEP_PARAMS, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "sleepparams"}, - { - WOAL_DFS_TESTING, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_DFS_TESTING, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "dfstesting"}, - { - WOAL_MGMT_FRAME_CTRL, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_MGMT_FRAME_CTRL, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "mgmtframectrl"}, - { - WOAL_CFP_CODE, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_CFP_CODE, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "cfpcode"}, - { - WOAL_SET_GET_TX_RX_ANT, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_SET_GET_TX_RX_ANT, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "antcfg"}, - { - WOAL_IND_RST_CFG, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_INT | 16, + {WOAL_IND_RST_CFG, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_INT | 16, "indrstcfg"}, - { - WOALGETLOG, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_CHAR | GETLOG_BUFSIZE, + {WOALGETLOG, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_CHAR | GETLOG_BUFSIZE, "getlog"}, - { - WOAL_SETADDR_GETNONE, - IW_PRIV_TYPE_ADDR | 1, - IW_PRIV_TYPE_NONE, - ""}, - { - WOAL_DEAUTH, - IW_PRIV_TYPE_ADDR | 1, - IW_PRIV_TYPE_NONE, - "deauth"}, - { - WOAL_SET_GET_256_CHAR, - IW_PRIV_TYPE_CHAR | 256, - IW_PRIV_TYPE_CHAR | 256, - ""}, - { - WOAL_PASSPHRASE, - IW_PRIV_TYPE_CHAR | 256, - IW_PRIV_TYPE_CHAR | 256, + {WOAL_SETADDR_GETNONE, IW_PRIV_TYPE_ADDR | 1, IW_PRIV_TYPE_NONE, ""}, + {WOAL_DEAUTH, IW_PRIV_TYPE_ADDR | 1, IW_PRIV_TYPE_NONE, "deauth"}, + {WOAL_SET_GET_256_CHAR, IW_PRIV_TYPE_CHAR | 256, + IW_PRIV_TYPE_CHAR | 256, ""}, + {WOAL_PASSPHRASE, IW_PRIV_TYPE_CHAR | 256, IW_PRIV_TYPE_CHAR | 256, "passphrase"}, - { - WOAL_GET_KEY, - IW_PRIV_TYPE_CHAR | 256, - IW_PRIV_TYPE_CHAR | 256, + {WOAL_GET_KEY, IW_PRIV_TYPE_CHAR | 256, IW_PRIV_TYPE_CHAR | 256, "getkey"}, - { - WOAL_ASSOCIATE, - IW_PRIV_TYPE_CHAR | 256, - IW_PRIV_TYPE_CHAR | 256, + {WOAL_ASSOCIATE, IW_PRIV_TYPE_CHAR | 256, IW_PRIV_TYPE_CHAR | 256, "associate"}, - { - WOAL_WMM_QUEUE_STATUS, - IW_PRIV_TYPE_CHAR | 256, - IW_PRIV_TYPE_CHAR | 256, - "qstatus"}, - { - WOAL_WMM_TS_STATUS, - IW_PRIV_TYPE_CHAR | 256, - IW_PRIV_TYPE_CHAR | 256, + {WOAL_WMM_QUEUE_STATUS, IW_PRIV_TYPE_CHAR | 256, + IW_PRIV_TYPE_CHAR | 256, "qstatus"}, + {WOAL_WMM_TS_STATUS, IW_PRIV_TYPE_CHAR | 256, IW_PRIV_TYPE_CHAR | 256, "ts_status"}, - { - WOAL_IP_ADDRESS, - IW_PRIV_TYPE_CHAR | 256, - IW_PRIV_TYPE_CHAR | 256, + {WOAL_IP_ADDRESS, IW_PRIV_TYPE_CHAR | 256, IW_PRIV_TYPE_CHAR | 256, "ipaddr"}, - { - WOAL_TX_BF_CFG, - IW_PRIV_TYPE_CHAR | 256, - IW_PRIV_TYPE_CHAR | 256, + {WOAL_TX_BF_CFG, IW_PRIV_TYPE_CHAR | 256, IW_PRIV_TYPE_CHAR | 256, "httxbfcfg"}, - { - WOAL_SETNONE_GETTWELVE_CHAR, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_CHAR | 12, + {WOAL_SETNONE_GETTWELVE_CHAR, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_CHAR | 12, ""}, - { - WOAL_WPS_SESSION, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_CHAR | 12, + {WOAL_WPS_SESSION, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_CHAR | 12, "wpssession"}, - { - WOAL_SETNONE_GET_FOUR_INT, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_INT | 4, + {WOAL_SETNONE_GET_FOUR_INT, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_INT | 4, ""}, - { - WOAL_DATA_RATE, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_INT | 4, + {WOAL_DATA_RATE, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_INT | 4, "getdatarate"}, - { - WOAL_ESUPP_MODE, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_INT | 4, - "esuppmode"}, - { - WOAL_SET_GET_64_INT, - IW_PRIV_TYPE_INT | 64, - IW_PRIV_TYPE_INT | 64, - ""}, - { - WOAL_ECL_SYS_CLOCK, - IW_PRIV_TYPE_INT | 64, - IW_PRIV_TYPE_INT | 64, + {WOAL_ESUPP_MODE, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_INT | 4, "esuppmode"}, + {WOAL_SET_GET_64_INT, IW_PRIV_TYPE_INT | 64, IW_PRIV_TYPE_INT | 64, ""}, + {WOAL_ECL_SYS_CLOCK, IW_PRIV_TYPE_INT | 64, IW_PRIV_TYPE_INT | 64, "sysclock"}, - { - WOAL_HOST_CMD, - IW_PRIV_TYPE_BYTE | 2047, - IW_PRIV_TYPE_BYTE | 2047, + {WOAL_HOST_CMD, IW_PRIV_TYPE_BYTE | 2047, IW_PRIV_TYPE_BYTE | 2047, "hostcmd"}, - { - WOAL_SET_INTS_GET_CHARS, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_BYTE | 256, - ""}, - { - WOAL_READ_EEPROM, - IW_PRIV_TYPE_INT | 16, - IW_PRIV_TYPE_BYTE | 256, + {WOAL_SET_INTS_GET_CHARS, IW_PRIV_TYPE_INT | 16, + IW_PRIV_TYPE_BYTE | 256, ""}, + {WOAL_READ_EEPROM, IW_PRIV_TYPE_INT | 16, IW_PRIV_TYPE_BYTE | 256, "rdeeprom"}, - { - WOAL_SET_GET_2K_BYTES, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - ""}, + {WOAL_SET_GET_2K_BYTES, IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, + IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, ""}, #if defined(SDIO) - { - WOAL_CMD_53RDWR, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - "sdcmd53rw"}, + {WOAL_CMD_53RDWR, IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, + IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, "sdcmd53rw"}, #endif - { - WOAL_SET_USER_SCAN, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - "setuserscan"}, - { - WOAL_GET_SCAN_TABLE, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - "getscantable"}, - { - WOAL_SET_USER_SCAN_EXT, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - "setuserscanext"}, - { - WOAL_WMM_ADDTS, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - "addts"}, - { - WOAL_WMM_DELTS, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - "delts"}, - { - WOAL_WMM_QUEUE_CONFIG, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - "qconfig"}, - { - WOAL_WMM_QUEUE_STATS, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - "qstats"}, - { - WOAL_BYPASSED_PACKET, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, - "pb_bypass"}, + {WOAL_SET_USER_SCAN, IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, + IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, "setuserscan"}, + {WOAL_GET_SCAN_TABLE, IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, + IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, "getscantable"}, + {WOAL_SET_USER_SCAN_EXT, IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, + IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, "setuserscanext"}, + {WOAL_WMM_ADDTS, IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, + IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, "addts"}, + {WOAL_WMM_DELTS, IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, + IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, "delts"}, + {WOAL_WMM_QUEUE_CONFIG, IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, + IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, "qconfig"}, + {WOAL_WMM_QUEUE_STATS, IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, + IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, "qstats"}, + {WOAL_BYPASSED_PACKET, IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, + IW_PRIV_TYPE_BYTE | WOAL_2K_BYTES, "pb_bypass"}, #ifdef UAP_WEXT - { - WOAL_FROYO_START, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_NONE, - "START"}, - { - WOAL_FROYO_STOP, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_NONE, - "STOP"}, - { - WOAL_FROYO_WL_FW_RELOAD, - IW_PRIV_TYPE_CHAR | 256, - IW_PRIV_TYPE_CHAR | 256, - "WL_FW_RELOAD"}, + {WOAL_FROYO_START, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_NONE, "START"}, + {WOAL_FROYO_STOP, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_NONE, "STOP"}, + {WOAL_FROYO_WL_FW_RELOAD, IW_PRIV_TYPE_CHAR | 256, + IW_PRIV_TYPE_CHAR | 256, "WL_FW_RELOAD"}, #endif }; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_proc.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_proc.c index 179d5e89317c..1ef491dec831 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_proc.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_proc.c @@ -1,54 +1,54 @@ /** @file moal_proc.c - * - * @brief This file contains functions for proc file. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains functions for proc file. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /******************************************************** Change log: 10/21/2008: initial version ********************************************************/ -#include "moal_main.h" +#include "moal_main.h" #ifdef UAP_SUPPORT -#include "moal_uap.h" +#include "moal_uap.h" #endif #ifdef SDIO -#include "moal_sdio.h" +#include "moal_sdio.h" #endif /******************************************************** Local Variables ********************************************************/ #ifdef CONFIG_PROC_FS -#define STATUS_PROC "wifi_status" -#define MWLAN_PROC "mwlan" -#define WLAN_PROC "adapter%d" +#define STATUS_PROC "wifi_status" +#define MWLAN_PROC "mwlan" +#define WLAN_PROC "adapter%d" /** Proc mwlan directory entry */ struct proc_dir_entry *proc_mwlan; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) -#define PROC_DIR NULL +#define PROC_DIR NULL #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) -#define PROC_DIR (&proc_root) +#define PROC_DIR (&proc_root) #else -#define PROC_DIR proc_net +#define PROC_DIR proc_net #endif #ifdef STA_SUPPORT @@ -63,7 +63,7 @@ static char *szModes[] = { /******************************************************** Global Variables ********************************************************/ -int wifi_status = 0; +int wifi_status; /******************************************************** Local Functions @@ -76,8 +76,7 @@ int wifi_status = 0; * * @return Number of output data */ -static int -woal_info_proc_read(struct seq_file *sfp, void *data) +static int woal_info_proc_read(struct seq_file *sfp, void *data) { struct net_device *netdev = (struct net_device *)sfp->private; char fmt[MLAN_MAX_VER_STR_LEN]; @@ -121,7 +120,8 @@ woal_info_proc_read(struct seq_file *sfp, void *data) #ifdef UAP_SUPPORT memset(&ustats, 0, sizeof(ustats)); if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { - seq_printf(sfp, "driver_name = " "\"uap\"\n"); + seq_printf(sfp, "driver_name = " + "\"uap\"\n"); woal_uap_get_version(priv, fmt, sizeof(fmt) - 1); if (MLAN_STATUS_SUCCESS != woal_uap_get_stats(priv, MOAL_IOCTL_WAIT, &ustats)) { @@ -130,7 +130,7 @@ woal_info_proc_read(struct seq_file *sfp, void *data) return -EFAULT; } } -#endif /* UAP_SUPPORT */ +#endif /* UAP_SUPPORT*/ #ifdef STA_SUPPORT memset(&info, 0, sizeof(info)); if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) { @@ -141,7 +141,8 @@ woal_info_proc_read(struct seq_file *sfp, void *data) LEAVE(); return -EFAULT; } - seq_printf(sfp, "driver_name = " "\"wlan\"\n"); + seq_printf(sfp, "driver_name = " + "\"wlan\"\n"); } #endif seq_printf(sfp, "driver_version = %s", fmt); @@ -159,8 +160,8 @@ woal_info_proc_read(struct seq_file *sfp, void *data) seq_printf(sfp, "bss_mode =\"%s\"\n", szModes[info.bss_mode]); #endif seq_printf(sfp, "media_state=\"%s\"\n", - ((priv->media_connected == - MFALSE) ? "Disconnected" : "Connected")); + ((priv->media_connected == MFALSE) ? "Disconnected" : + "Connected")); seq_printf(sfp, "mac_address=\"%02x:%02x:%02x:%02x:%02x:%02x\"\n", netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2], netdev->dev_addr[3], @@ -170,9 +171,8 @@ woal_info_proc_read(struct seq_file *sfp, void *data) seq_printf(sfp, "multicast_count=\"%d\"\n", mc_count); seq_printf(sfp, "essid=\"%s\"\n", info.ssid.ssid); seq_printf(sfp, "bssid=\"%02x:%02x:%02x:%02x:%02x:%02x\"\n", - info.bssid[0], info.bssid[1], - info.bssid[2], info.bssid[3], - info.bssid[4], info.bssid[5]); + info.bssid[0], info.bssid[1], info.bssid[2], + info.bssid[3], info.bssid[4], info.bssid[5]); seq_printf(sfp, "channel=\"%d\"\n", (int)info.bss_chan); seq_printf(sfp, "region_code = \"%02x\"\n", (t_u8)info.region_code); @@ -182,23 +182,23 @@ woal_info_proc_read(struct seq_file *sfp, void *data) */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) for (i = 0; i < netdev->mc_count; i++) { - seq_printf(sfp, - "multicast_address[%d]=\"%02x:%02x:%02x:%02x:%02x:%02x\"\n", - i, - mcptr->dmi_addr[0], mcptr->dmi_addr[1], - mcptr->dmi_addr[2], mcptr->dmi_addr[3], - mcptr->dmi_addr[4], mcptr->dmi_addr[5]); + seq_printf( + sfp, + "multicast_address[%d]=\"%02x:%02x:%02x:%02x:%02x:%02x\"\n", + i, mcptr->dmi_addr[0], mcptr->dmi_addr[1], + mcptr->dmi_addr[2], mcptr->dmi_addr[3], + mcptr->dmi_addr[4], mcptr->dmi_addr[5]); mcptr = mcptr->next; } #else - netdev_for_each_mc_addr(mcptr, netdev) - seq_printf(sfp, - "multicast_address[%d]=\"%02x:%02x:%02x:%02x:%02x:%02x\"\n", - i++, - mcptr->addr[0], mcptr->addr[1], - mcptr->addr[2], mcptr->addr[3], - mcptr->addr[4], mcptr->addr[5]); + netdev_for_each_mc_addr (mcptr, netdev) + seq_printf( + sfp, + "multicast_address[%d]=\"%02x:%02x:%02x:%02x:%02x:%02x\"\n", + i++, mcptr->addr[0], mcptr->addr[1], + mcptr->addr[2], mcptr->addr[3], mcptr->addr[4], + mcptr->addr[5]); #endif /* < 2.6.35 */ } #endif @@ -215,14 +215,15 @@ woal_info_proc_read(struct seq_file *sfp, void *data) #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 29) for (i = 0; i < netdev->num_tx_queues; i++) { seq_printf(sfp, "tx queue %d: %s\n", i, - ((netif_tx_queue_stopped - (netdev_get_tx_queue(netdev, 0))) ? "stopped" : - "started")); + ((netif_tx_queue_stopped( + netdev_get_tx_queue(netdev, 0))) ? + "stopped" : + "started")); } #else seq_printf(sfp, "tx queue %s\n", ((netif_queue_stopped(priv->netdev)) ? "stopped" : - "started")); + "started")); #endif #ifdef UAP_SUPPORT if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { @@ -268,8 +269,7 @@ exit: return 0; } -static int -woal_info_proc_open(struct inode *inode, struct file *file) +static int woal_info_proc_open(struct inode *inode, struct file *file) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) return single_open(file, woal_info_proc_read, PDE_DATA(inode)); @@ -287,7 +287,7 @@ static const struct file_operations info_proc_fops = { }; #ifdef SDIO -#define CMD52_STR_LEN 50 +#define CMD52_STR_LEN 50 /* * @brief Parse cmd52 string * @@ -298,9 +298,8 @@ static const struct file_operations info_proc_fops = { * @param val Parsed value to set * @return BT_STATUS_SUCCESS */ -static int -parse_cmd52_string(const char *buffer, size_t len, int *func, int *reg, - int *val) +static int parse_cmd52_string(const char *buffer, size_t len, int *func, + int *reg, int *val) { int ret = MLAN_STATUS_SUCCESS; char *string = NULL; @@ -308,7 +307,7 @@ parse_cmd52_string(const char *buffer, size_t len, int *func, int *reg, gfp_t flag; ENTER(); - flag = (in_atomic() || irqs_disabled())? GFP_ATOMIC : GFP_KERNEL; + flag = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; string = kzalloc(CMD52_STR_LEN, flag); if (string == NULL) return -ENOMEM; @@ -351,9 +350,8 @@ parse_cmd52_string(const char *buffer, size_t len, int *func, int *reg, * * @return number of data */ -static ssize_t -woal_config_write(struct file *f, const char __user * buf, size_t count, - loff_t * off) +static ssize_t woal_config_write(struct file *f, const char __user *buf, + size_t count, loff_t *off) { char databuf[101]; char *line = NULL; @@ -410,8 +408,8 @@ woal_config_write(struct file *f, const char __user * buf, size_t count, if (IS_SD(handle->card_type)) { if (!strncmp(databuf, "sdcmd52rw=", strlen("sdcmd52rw=")) && count > strlen("sdcmd52rw=")) { - parse_cmd52_string((const char *)databuf, - (size_t) count, &func, ®, &val); + parse_cmd52_string((const char *)databuf, (size_t)count, + &func, ®, &val); woal_sdio_read_write_cmd52(handle, func, reg, val); } } @@ -445,14 +443,14 @@ woal_config_write(struct file *f, const char __user * buf, size_t count, gfp_t flag; if (len) { kfree(handle->fwdump_fname); - flag = (in_atomic() || - irqs_disabled())? GFP_ATOMIC : GFP_KERNEL; + flag = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : + GFP_KERNEL; handle->fwdump_fname = kzalloc(len, flag); if (handle->fwdump_fname) moal_memcpy_ext(handle, handle->fwdump_fname, databuf + - strlen("fwdump_file="), len - 1, - len - 1); + strlen("fwdump_file="), + len - 1, len - 1); } } if (!strncmp(databuf, "fw_reload", strlen("fw_reload"))) { @@ -480,8 +478,7 @@ woal_config_write(struct file *f, const char __user * buf, size_t count, * * @return number of output data */ -static int -woal_config_read(struct seq_file *sfp, void *data) +static int woal_config_read(struct seq_file *sfp, void *data) { moal_handle *handle = (moal_handle *)sfp->private; @@ -508,8 +505,7 @@ woal_config_read(struct seq_file *sfp, void *data) return 0; } -static int -woal_config_proc_open(struct inode *inode, struct file *file) +static int woal_config_proc_open(struct inode *inode, struct file *file) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) return single_open(file, woal_config_read, PDE_DATA(inode)); @@ -535,8 +531,7 @@ static const struct file_operations config_proc_fops = { * * @return number of output data */ -static int -woal_wifi_status_read(struct seq_file *sfp, void *data) +static int woal_wifi_status_read(struct seq_file *sfp, void *data) { ENTER(); @@ -552,8 +547,7 @@ woal_wifi_status_read(struct seq_file *sfp, void *data) return 0; } -static int -woal_wifi_status_proc_open(struct inode *inode, struct file *file) +static int woal_wifi_status_proc_open(struct inode *inode, struct file *file) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) return single_open(file, woal_wifi_status_read, PDE_DATA(inode)); @@ -580,8 +574,7 @@ static const struct file_operations wifi_status_proc_fops = { * * @return Converted number from string s */ -int -woal_string_to_number(char *s) +int woal_string_to_number(char *s) { int r = 0; int base = 0; @@ -617,8 +610,7 @@ woal_string_to_number(char *s) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_root_proc_init(void) +mlan_status woal_root_proc_init(void) { ENTER(); @@ -646,8 +638,7 @@ woal_root_proc_init(void) * * @return N/A */ -void -woal_root_proc_remove(void) +void woal_root_proc_remove(void) { ENTER(); @@ -666,8 +657,7 @@ woal_root_proc_remove(void) * * @return N/A */ -void -woal_proc_init(moal_handle *handle) +void woal_proc_init(moal_handle *handle) { struct proc_dir_entry *r; #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) @@ -690,7 +680,8 @@ woal_proc_init(moal_handle *handle) #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) /* Check if directory already exists */ for (pde = pde->subdir; pde; pde = pde->next) { - if (pde->namelen && !strcmp(handle->proc_wlan_name, pde->name)) { + if (pde->namelen && + !strcmp(handle->proc_wlan_name, pde->name)) { /* Directory exists */ PRINTM(MWARN, "proc interface already exists!\n"); handle->proc_wlan = pde; @@ -739,8 +730,7 @@ done: * * @return N/A */ -void -woal_proc_exit(moal_handle *handle) +void woal_proc_exit(moal_handle *handle) { char config_proc_dir[20]; @@ -777,8 +767,7 @@ woal_proc_exit(moal_handle *handle) * * @return N/A */ -void -woal_create_proc_entry(moal_private *priv) +void woal_create_proc_entry(moal_private *priv) { struct proc_dir_entry *r; struct net_device *dev = priv->netdev; @@ -803,7 +792,8 @@ woal_create_proc_entry(moal_private *priv) return; } strcat(proc_dir_name, dev->name); - /* Try to create adapterX/dev_name directory first under /proc/mwlan/ */ + /* Try to create adapterX/dev_name directory first under + * /proc/mwlan/ */ priv->proc_entry = proc_mkdir(proc_dir_name, proc_mwlan); if (priv->proc_entry) { /* Success. Continue normally */ @@ -815,10 +805,10 @@ woal_create_proc_entry(moal_private *priv) atomic_inc(&(priv->phandle->proc_wlan->count)); #endif } else { - /* Failure. adapterX/ may not exist. Try to create that first */ - priv->phandle->proc_wlan = - proc_mkdir(priv->phandle->proc_wlan_name, - proc_mwlan); + /* Failure. adapterX/ may not exist. Try to create that + * first */ + priv->phandle->proc_wlan = proc_mkdir( + priv->phandle->proc_wlan_name, proc_mwlan); if (!priv->phandle->proc_wlan) { /* Failure. Something broken */ LEAVE(); @@ -867,8 +857,7 @@ woal_create_proc_entry(moal_private *priv) * * @return N/A */ -void -woal_proc_remove(moal_private *priv) +void woal_proc_remove(moal_private *priv) { ENTER(); if (priv->phandle->proc_wlan && priv->proc_entry) { diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sdio.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sdio.h index edf89b03e850..1453dbb6e8e1 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sdio.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sdio.h @@ -1,59 +1,59 @@ /** @file moal_sdio.h - * - * @brief This file contains definitions for SDIO interface. - * driver. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains definitions for SDIO interface. + * driver. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /**************************************************** Change log: ****************************************************/ -#ifndef _MOAL_SDIO_H -#define _MOAL_SDIO_H +#ifndef _MOAL_SDIO_H +#define _MOAL_SDIO_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "moal_main.h" #ifndef BLOCK_MODE /** Block mode */ -#define BLOCK_MODE 1 +#define BLOCK_MODE 1 #endif #ifndef BYTE_MODE /** Byte Mode */ -#define BYTE_MODE 0 +#define BYTE_MODE 0 #endif #ifndef FIXED_ADDRESS /** Fixed address mode */ -#define FIXED_ADDRESS 0 +#define FIXED_ADDRESS 0 #endif #if defined(SD8977) -#define SD8977_V0 0x0 -#define SD8977_V1 0x8 -#define SD8977_V2 0x9 +#define SD8977_V0 0x0 +#define SD8977_V1 0x8 +#define SD8977_V2 0x9 #define SD8977_V0_FW_NAME "nxp/sdsd8977_combo.bin" #define SD8977_V1_FW_NAME "nxp/sdsd8977_combo_v1.bin" #define SD8977_V2_FW_NAME "nxp/sdsd8977_combo_v2.bin" @@ -64,8 +64,8 @@ Change log: #if defined(SD8887) /** SD8887 chip revision ID */ -#define SD8887_A0 0x0 -#define SD8887_A2 0x2 +#define SD8887_A0 0x0 +#define SD8887_A2 0x2 #define SD8887_A0_FW_NAME "nxp/sd8887_uapsta.bin" #define SD8887_A2_FW_NAME "nxp/sd8887_uapsta_a2.bin" @@ -80,57 +80,58 @@ Change log: #endif /* SD8887 */ #ifdef SD8977 -#define SD8977_DEFAULT_COMBO_FW_NAME "nxp/sdsd8977_combo_v2.bin" +#define SD8977_DEFAULT_COMBO_FW_NAME "nxp/sdsd8977_combo_v2.bin" #define SD8977_DEFAULT_WLAN_FW_NAME "nxp/sd8977_wlan_v2.bin" #endif /* SD8977 */ #ifdef SD8997 -#define SD8997_DEFAULT_COMBO_FW_NAME "nxp/sdsd8997_combo_v4.bin" -#define SDUART8997_DEFAULT_COMBO_FW_NAME "nxp/sduart8997_combo_v4.bin" -#define SDSD8997_DEFAULT_COMBO_FW_NAME "nxp/sdsd8997_combo_v4.bin" +#define SD8997_DEFAULT_COMBO_FW_NAME "nxp/sdsd8997_combo_v4.bin" +#define SDUART8997_DEFAULT_COMBO_FW_NAME "nxp/sduart8997_combo_v4.bin" +#define SDSD8997_DEFAULT_COMBO_FW_NAME "nxp/sdsd8997_combo_v4.bin" #define SD8997_DEFAULT_WLAN_FW_NAME "nxp/sd8997_wlan_v4.bin" #endif /* SD8997 */ #ifdef SD8987 -#define SD8987_DEFAULT_COMBO_FW_NAME "nxp/sdsd8987_combo.bin" -#define SDUART8987_DEFAULT_COMBO_FW_NAME "nxp/sduart8987_combo.bin" -#define SDSD8987_DEFAULT_COMBO_FW_NAME "nxp/sdsd8987_combo.bin" +#define SD8987_DEFAULT_COMBO_FW_NAME "nxp/sdsd8987_combo.bin" +#define SDUART8987_DEFAULT_COMBO_FW_NAME "nxp/sduart8987_combo.bin" +#define SDSD8987_DEFAULT_COMBO_FW_NAME "nxp/sdsd8987_combo.bin" #define SD8987_DEFAULT_WLAN_FW_NAME "nxp/sd8987_wlan.bin" #endif /* SD8987 */ #ifdef SD8897 -#define SD8897_DEFAULT_COMBO_FW_NAME "nxp/sdsd8897_uapsta.bin" +#define SD8897_DEFAULT_COMBO_FW_NAME "nxp/sdsd8897_uapsta.bin" #define SD8897_DEFAULT_WLAN_FW_NAME "nxp/sd8897_wlan.bin" #endif /* SD8897 */ #ifdef SD8978 -#define SD8978_DEFAULT_COMBO_FW_NAME "nxp/sdsd8978_combo.bin" +#define SD8978_DEFAULT_COMBO_FW_NAME "nxp/sdsd8978_combo.bin" #define SDUART8978_DEFAULT_COMBO_FW_NAME "nxp/sduart8978_combo.bin" -#define SDSD8978_DEFAULT_COMBO_FW_NAME "nxp/sdsd8978_combo.bin" -#define SD8978_DEFAULT_WLAN_FW_NAME "nxp/sd8978_wlan.bin" +#define SDSD8978_DEFAULT_COMBO_FW_NAME "nxp/sdsd8978_combo.bin" +#define SD8978_DEFAULT_WLAN_FW_NAME "nxp/sd8978_wlan.bin" #endif /* SD8978 */ #ifdef SD9098 -#define SD9098_Z1Z2 0x00 -#define SD9098_A0 0x01 -#define SD9098_A1 0x02 -#define SD9098_DEFAULT_COMBO_FW_NAME "nxp/sdsd9098_combo.bin" -#define SDUART9098_DEFAULT_COMBO_FW_NAME "nxp/sduart9098_combo.bin" -#define SDSD9098_DEFAULT_COMBO_FW_NAME "nxp/sdsd9098_combo.bin" +#define SD9098_Z1Z2 0x00 +#define SD9098_A0 0x01 +#define SD9098_A1 0x02 +#define SD9098_A2 0x03 +#define SD9098_DEFAULT_COMBO_FW_NAME "nxp/sdsd9098_combo.bin" +#define SDUART9098_DEFAULT_COMBO_FW_NAME "nxp/sduart9098_combo.bin" +#define SDSD9098_DEFAULT_COMBO_FW_NAME "nxp/sdsd9098_combo.bin" #define SD9098_DEFAULT_WLAN_FW_NAME "nxp/sd9098_wlan.bin" -#define SDUART9098_COMBO_V1_FW_NAME "nxp/sduart9098_combo_v1.bin" -#define SDSD9098_COMBO_V1_FW_NAME "nxp/sdsd9098_combo_v1.bin" +#define SDUART9098_COMBO_V1_FW_NAME "nxp/sduart9098_combo_v1.bin" +#define SDSD9098_COMBO_V1_FW_NAME "nxp/sdsd9098_combo_v1.bin" #define SD9098_WLAN_V1_FW_NAME "nxp/sd9098_wlan_v1.bin" #endif /* SD9098 */ #ifdef SD9097 -#define SD9097_B0 0x01 -#define SD9097_B1 0x02 -#define SD9097_DEFAULT_COMBO_FW_NAME "nxp/sdsd9097_combo_v1.bin" +#define SD9097_B0 0x01 +#define SD9097_B1 0x02 +#define SD9097_DEFAULT_COMBO_FW_NAME "nxp/sdsd9097_combo_v1.bin" #define SD9097_DEFAULT_WLAN_FW_NAME "nxp/sd9097_wlan_v1.bin" -#define SDUART9097_COMBO_V1_FW_NAME "nxp/sduart9097_combo_v1.bin" -#define SDSD9097_COMBO_V1_FW_NAME "nxp/sdsd9097_combo_v1.bin" +#define SDUART9097_COMBO_V1_FW_NAME "nxp/sduart9097_combo_v1.bin" +#define SDSD9097_COMBO_V1_FW_NAME "nxp/sdsd9097_combo_v1.bin" #define SD9097_WLAN_V1_FW_NAME "nxp/sd9097_wlan_v1.bin" #endif /* SD9097 */ diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sdio_mmc.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sdio_mmc.c index 8e9fa582ee45..76a055ec5129 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sdio_mmc.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sdio_mmc.c @@ -3,23 +3,23 @@ * @brief This file contains SDIO MMC IF (interface) module * related functions. * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /**************************************************** Change log: 02/25/09: Initial creation - @@ -44,41 +44,41 @@ static moal_if_ops sdiommc_ops; #ifdef SD8887 /** Device ID for SD8887 */ -#define SD_DEVICE_ID_8887 (0x9135) +#define SD_DEVICE_ID_8887 (0x9135) #endif #ifdef SD8897 /** Device ID for SD8897 */ -#define SD_DEVICE_ID_8897 (0x912d) +#define SD_DEVICE_ID_8897 (0x912d) #endif #ifdef SD8977 /** Device ID for SD8977 */ -#define SD_DEVICE_ID_8977 (0x9145) +#define SD_DEVICE_ID_8977 (0x9145) #endif #ifdef SD8978 /** Device ID for SD8978 */ -#define SD_DEVICE_ID_8978 (0x9159) +#define SD_DEVICE_ID_8978 (0x9159) #endif #ifdef SD8997 /** Device ID for SD8997 */ -#define SD_DEVICE_ID_8997 (0x9141) +#define SD_DEVICE_ID_8997 (0x9141) #endif #ifdef SD8987 /** Device ID for SD8987 */ -#define SD_DEVICE_ID_8987 (0x9149) +#define SD_DEVICE_ID_8987 (0x9149) #endif #ifdef SD9098 /** Device ID for SD9098 */ -#define SD_DEVICE_ID_9098_FN1 (0x914D) +#define SD_DEVICE_ID_9098_FN1 (0x914D) /** Device ID for SD9098 */ -#define SD_DEVICE_ID_9098_FN2 (0x914E) +#define SD_DEVICE_ID_9098_FN2 (0x914E) #endif #ifdef SD9097 /** Device ID for SD9097 */ -#define SD_DEVICE_ID_9097 (0x9155) +#define SD_DEVICE_ID_9097 (0x9155) #endif /** Device ID any */ #ifndef SD_DEVICE_ANY -#define SD_DEVICE_ANY (0xffff) +#define SD_DEVICE_ANY (0xffff) #endif /* SD_DEVICE_ANY */ /** WLAN IDs */ @@ -130,6 +130,8 @@ static struct dev_pm_ops wlan_sdio_pm_ops = { void woal_sdio_shutdown(struct device *dev); #endif #endif + +// clang-format off static struct sdio_driver REFDATA wlan_sdio = { .name = "wlan_sdio", .id_table = wlan_ids, @@ -145,18 +147,19 @@ static struct sdio_driver REFDATA wlan_sdio = { #endif #endif - } + } #else #ifdef SDIO_SUSPEND_RESUME #ifdef MMC_PM_KEEP_POWER .drv = { .pm = &wlan_sdio_pm_ops, .shutdown = woal_sdio_shutdown, - } + } #endif #endif #endif }; +// clang-format on /******************************************************** Local Functions @@ -168,22 +171,22 @@ static void woal_sdiommc_dump_fw_info(moal_handle *phandle); * @param handle A Pointer to the moal_handle structure * @return N/A */ -void -woal_dump_sdio_reg(moal_handle *handle) +void woal_dump_sdio_reg(moal_handle *handle) { int ret = 0; t_u8 data, i; - int fun0_reg[] = { 0x05, 0x04 }; + int fun0_reg[] = {0x05, 0x04}; t_u8 array_size = 0; #ifdef SD8897 - int fun1_reg_8897[] = { 0x03, 0x04, 0x05, 0x06, 0x07, 0xC0, 0xC1 }; + int fun1_reg_8897[] = {0x03, 0x04, 0x05, 0x06, 0x07, 0xC0, 0xC1}; #endif - int fun1_reg_other[] = { 0x03, 0x04, 0x05, 0x60, 0x61 }; + int fun1_reg_other[] = {0x03, 0x04, 0x05, 0x60, 0x61}; int *fun1_reg = NULL; for (i = 0; i < ARRAY_SIZE(fun0_reg); i++) { - data = sdio_f0_readb(((struct sdio_mmc_card *)handle->card)-> - func, fun0_reg[i], &ret); + data = sdio_f0_readb( + ((struct sdio_mmc_card *)handle->card)->func, + fun0_reg[i], &ret); PRINTM(MMSG, "fun0: reg 0x%02x=0x%02x ret=%d\n", fun0_reg[i], data, ret); } @@ -207,7 +210,6 @@ woal_dump_sdio_reg(moal_handle *handle) } return; } - /******************************************************** Global Functions ********************************************************/ @@ -217,8 +219,7 @@ woal_dump_sdio_reg(moal_handle *handle) * @param func A pointer to the sdio_func structure * @return N/A */ -static void -woal_sdio_interrupt(struct sdio_func *func) +static void woal_sdio_interrupt(struct sdio_func *func) { moal_handle *handle; struct sdio_mmc_card *card; @@ -265,8 +266,7 @@ woal_sdio_interrupt(struct sdio_func *func) * * @return N/A */ -static t_u16 -woal_update_card_type(t_void *card) +static t_u16 woal_update_card_type(t_void *card) { struct sdio_mmc_card *cardp_sd = (struct sdio_mmc_card *)card; t_u16 card_type = 0; @@ -277,10 +277,12 @@ woal_update_card_type(t_void *card) card_type = CARD_TYPE_SD8887; moal_memcpy_ext(NULL, driver_version, CARD_SD8887, strlen(CARD_SD8887), strlen(driver_version)); - moal_memcpy_ext(NULL, - driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V15, strlen(V15), - strlen(driver_version) - + moal_memcpy_ext( + NULL, + driver_version + strlen(INTF_CARDTYPE) + + strlen(KERN_VERSION), + V15, strlen(V15), + strlen(driver_version) - (strlen(INTF_CARDTYPE) + strlen(KERN_VERSION))); } #endif @@ -289,10 +291,12 @@ woal_update_card_type(t_void *card) card_type = CARD_TYPE_SD8897; moal_memcpy_ext(NULL, driver_version, CARD_SD8897, strlen(CARD_SD8897), strlen(driver_version)); - moal_memcpy_ext(NULL, - driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V15, strlen(V15), - strlen(driver_version) - + moal_memcpy_ext( + NULL, + driver_version + strlen(INTF_CARDTYPE) + + strlen(KERN_VERSION), + V15, strlen(V15), + strlen(driver_version) - (strlen(INTF_CARDTYPE) + strlen(KERN_VERSION))); } #endif @@ -301,10 +305,12 @@ woal_update_card_type(t_void *card) card_type = CARD_TYPE_SD8977; moal_memcpy_ext(NULL, driver_version, CARD_SD8977, strlen(CARD_SD8977), strlen(driver_version)); - moal_memcpy_ext(NULL, - driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V16, strlen(V16), - strlen(driver_version) - + moal_memcpy_ext( + NULL, + driver_version + strlen(INTF_CARDTYPE) + + strlen(KERN_VERSION), + V16, strlen(V16), + strlen(driver_version) - (strlen(INTF_CARDTYPE) + strlen(KERN_VERSION))); } #endif @@ -313,10 +319,12 @@ woal_update_card_type(t_void *card) card_type = CARD_TYPE_SD8978; moal_memcpy_ext(NULL, driver_version, CARD_SD8978, strlen(CARD_SD8978), strlen(driver_version)); - moal_memcpy_ext(NULL, - driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V16, strlen(V16), - strlen(driver_version) - + moal_memcpy_ext( + NULL, + driver_version + strlen(INTF_CARDTYPE) + + strlen(KERN_VERSION), + V16, strlen(V16), + strlen(driver_version) - (strlen(INTF_CARDTYPE) + strlen(KERN_VERSION))); } #endif @@ -325,10 +333,12 @@ woal_update_card_type(t_void *card) card_type = CARD_TYPE_SD8997; moal_memcpy_ext(NULL, driver_version, CARD_SD8997, strlen(CARD_SD8997), strlen(driver_version)); - moal_memcpy_ext(NULL, - driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V16, strlen(V16), - strlen(driver_version) - + moal_memcpy_ext( + NULL, + driver_version + strlen(INTF_CARDTYPE) + + strlen(KERN_VERSION), + V16, strlen(V16), + strlen(driver_version) - (strlen(INTF_CARDTYPE) + strlen(KERN_VERSION))); } #endif @@ -337,10 +347,12 @@ woal_update_card_type(t_void *card) card_type = CARD_TYPE_SD8987; moal_memcpy_ext(NULL, driver_version, CARD_SD8987, strlen(CARD_SD8987), strlen(driver_version)); - moal_memcpy_ext(NULL, - driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V16, strlen(V16), - strlen(driver_version) - + moal_memcpy_ext( + NULL, + driver_version + strlen(INTF_CARDTYPE) + + strlen(KERN_VERSION), + V16, strlen(V16), + strlen(driver_version) - (strlen(INTF_CARDTYPE) + strlen(KERN_VERSION))); } #endif @@ -349,10 +361,12 @@ woal_update_card_type(t_void *card) card_type = CARD_TYPE_SD9097; moal_memcpy_ext(NULL, driver_version, CARD_SD9097, strlen(CARD_SD9097), strlen(driver_version)); - moal_memcpy_ext(NULL, - driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V17, strlen(V17), - strlen(driver_version) - + moal_memcpy_ext( + NULL, + driver_version + strlen(INTF_CARDTYPE) + + strlen(KERN_VERSION), + V17, strlen(V17), + strlen(driver_version) - (strlen(INTF_CARDTYPE) + strlen(KERN_VERSION))); } #endif @@ -362,10 +376,12 @@ woal_update_card_type(t_void *card) card_type = CARD_TYPE_SD9098; moal_memcpy_ext(NULL, driver_version, CARD_SD9098, strlen(CARD_SD9098), strlen(driver_version)); - moal_memcpy_ext(NULL, - driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V17, strlen(V17), - strlen(driver_version) - + moal_memcpy_ext( + NULL, + driver_version + strlen(INTF_CARDTYPE) + + strlen(KERN_VERSION), + V17, strlen(V17), + strlen(driver_version) - (strlen(INTF_CARDTYPE) + strlen(KERN_VERSION))); } #endif @@ -378,8 +394,7 @@ woal_update_card_type(t_void *card) * @param id A pointer to sdio_device_id structure. * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE/error code */ -int -woal_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id) +int woal_sdio_probe(struct sdio_func *func, const struct sdio_device_id *id) { int ret = MLAN_STATUS_SUCCESS; struct sdio_mmc_card *card = NULL; @@ -457,8 +472,7 @@ err: * @param func A pointer to sdio_func structure. * @return N/A */ -void -woal_sdio_remove(struct sdio_func *func) +void woal_sdio_remove(struct sdio_func *func) { struct sdio_mmc_card *card; @@ -484,30 +498,28 @@ woal_sdio_remove(struct sdio_func *func) * @param handle A Pointer to the moal_handle structure * @return N/A */ -void -woal_wlan_is_suspended(moal_handle *handle) +void woal_wlan_is_suspended(moal_handle *handle) { ENTER(); if (handle->suspend_notify_req == MTRUE) { handle->is_suspended = MTRUE; - sdio_func_suspended(((struct sdio_mmc_card *)handle->card)-> - func); + sdio_func_suspended( + ((struct sdio_mmc_card *)handle->card)->func); } LEAVE(); } #endif -#define SHUTDOWN_HOST_SLEEP_DEF_GAP 100 -#define SHUTDOWN_HOST_SLEEP_DEF_GPIO 0x3 -#define SHUTDOWN_HOST_SLEEP_DEF_COND 0x0 +#define SHUTDOWN_HOST_SLEEP_DEF_GAP 100 +#define SHUTDOWN_HOST_SLEEP_DEF_GPIO 0x3 +#define SHUTDOWN_HOST_SLEEP_DEF_COND 0x0 /** @brief This function handles client driver shutdown * * @param dev A pointer to device structure * @return N/A */ -void -woal_sdio_shutdown(struct device *dev) +void woal_sdio_shutdown(struct device *dev) { struct sdio_func *func = dev_to_sdio_func(dev); moal_handle *handle = NULL; @@ -533,8 +545,8 @@ woal_sdio_shutdown(struct device *dev) memset(&pm_info, 0, sizeof(pm_info)); for (i = 0; i < retry_num; i++) { if (MLAN_STATUS_SUCCESS == - woal_get_pm_info(woal_get_priv - (handle, MLAN_BSS_ROLE_ANY), + woal_get_pm_info(woal_get_priv(handle, + MLAN_BSS_ROLE_ANY), &pm_info)) { if (pm_info.is_suspend_allowed == MTRUE) break; @@ -550,12 +562,9 @@ woal_sdio_shutdown(struct device *dev) } woal_enable_hs(woal_get_priv(handle, MLAN_BSS_ROLE_ANY)); - timeout = - wait_event_interruptible_timeout(handle-> - hs_activate_wait_q, - handle-> - hs_activate_wait_q_woken, - HS_ACTIVE_TIMEOUT); + timeout = wait_event_interruptible_timeout( + handle->hs_activate_wait_q, + handle->hs_activate_wait_q_woken, HS_ACTIVE_TIMEOUT); if (handle->hs_activated == MTRUE) PRINTM(MMSG, "HS actived in shutdown\n"); else @@ -568,7 +577,7 @@ woal_sdio_shutdown(struct device *dev) || (GET_BSS_ROLE(handle->priv[i]) == MLAN_BSS_ROLE_UAP) #endif - ) { + ) { PRINTM(MIOCTL, "disconnect on suspend\n"); woal_disconnect(handle->priv[i], @@ -590,8 +599,7 @@ done: * @param dev A pointer to device structure * @return MLAN_STATUS_SUCCESS or error code */ -int -woal_sdio_suspend(struct device *dev) +int woal_sdio_suspend(struct device *dev) { struct sdio_func *func = dev_to_sdio_func(dev); mmc_pm_flag_t pm_flags = 0; @@ -607,13 +615,13 @@ woal_sdio_suspend(struct device *dev) pm_flags = sdio_get_host_pm_caps(func); PRINTM(MCMND, "%s: suspend: PM flags = 0x%x\n", sdio_func_id(func), pm_flags); - cardp = sdio_get_drvdata(func); if (!cardp || !cardp->handle) { PRINTM(MERROR, "Card or moal_handle structure is not valid\n"); LEAVE(); return MLAN_STATUS_SUCCESS; } + handle = cardp->handle; if (moal_extflg_isset(handle, EXT_PM_KEEP_POWER) && @@ -624,7 +632,6 @@ woal_sdio_suspend(struct device *dev) LEAVE(); return -ENOSYS; } - if (handle->is_suspended == MTRUE) { PRINTM(MWARN, "Device already suspended\n"); LEAVE(); @@ -670,9 +677,8 @@ woal_sdio_suspend(struct device *dev) #ifdef MMC_PM_FUNC_SUSPENDED handle->suspend_notify_req = MTRUE; #endif - hs_actived = - woal_enable_hs(woal_get_priv - (handle, MLAN_BSS_ROLE_ANY)); + hs_actived = woal_enable_hs( + woal_get_priv(handle, MLAN_BSS_ROLE_ANY)); #ifdef MMC_PM_FUNC_SUSPENDED handle->suspend_notify_req = MFALSE; #endif @@ -680,8 +686,9 @@ woal_sdio_suspend(struct device *dev) #ifdef MMC_PM_SKIP_RESUME_PROBE PRINTM(MCMND, "suspend with MMC_PM_KEEP_POWER and MMC_PM_SKIP_RESUME_PROBE\n"); - ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER | - MMC_PM_SKIP_RESUME_PROBE); + ret = sdio_set_host_pm_flags( + func, + MMC_PM_KEEP_POWER | MMC_PM_SKIP_RESUME_PROBE); #else PRINTM(MCMND, "suspend with MMC_PM_KEEP_POWER\n"); ret = sdio_set_host_pm_flags(func, MMC_PM_KEEP_POWER); @@ -709,8 +716,7 @@ done: * @param dev A pointer to device structure * @return MLAN_STATUS_SUCCESS */ -int -woal_sdio_resume(struct device *dev) +int woal_sdio_resume(struct device *dev) { struct sdio_func *func = dev_to_sdio_func(dev); mmc_pm_flag_t pm_flags = 0; @@ -763,8 +769,8 @@ woal_sdio_resume(struct device *dev) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_sdiommc_write_reg(moal_handle *handle, t_u32 reg, t_u32 data) +static mlan_status woal_sdiommc_write_reg(moal_handle *handle, t_u32 reg, + t_u32 data) { mlan_status ret = MLAN_STATUS_FAILURE; sdio_claim_host(((struct sdio_mmc_card *)handle->card)->func); @@ -783,8 +789,8 @@ woal_sdiommc_write_reg(moal_handle *handle, t_u32 reg, t_u32 data) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_sdiommc_read_reg(moal_handle *handle, t_u32 reg, t_u32 *data) +static mlan_status woal_sdiommc_read_reg(moal_handle *handle, t_u32 reg, + t_u32 *data) { mlan_status ret = MLAN_STATUS_FAILURE; t_u8 val; @@ -806,8 +812,7 @@ woal_sdiommc_read_reg(moal_handle *handle, t_u32 reg, t_u32 *data) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_sdio_writeb(moal_handle *handle, t_u32 reg, t_u8 data) +mlan_status woal_sdio_writeb(moal_handle *handle, t_u32 reg, t_u8 data) { mlan_status ret = MLAN_STATUS_FAILURE; sdio_claim_host(((struct sdio_mmc_card *)handle->card)->func); @@ -826,8 +831,7 @@ woal_sdio_writeb(moal_handle *handle, t_u32 reg, t_u8 data) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_sdio_readb(moal_handle *handle, t_u32 reg, t_u8 *data) +mlan_status woal_sdio_readb(moal_handle *handle, t_u32 reg, t_u8 *data) { mlan_status ret = MLAN_STATUS_FAILURE; t_u8 val; @@ -849,8 +853,7 @@ woal_sdio_readb(moal_handle *handle, t_u32 reg, t_u8 *data) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_sdio_f0_readb(moal_handle *handle, t_u32 reg, t_u8 *data) +mlan_status woal_sdio_f0_readb(moal_handle *handle, t_u32 reg, t_u8 *data) { mlan_status ret = MLAN_STATUS_FAILURE; t_u8 val; @@ -873,9 +876,8 @@ woal_sdio_f0_readb(moal_handle *handle, t_u32 reg, t_u8 *data) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_sdio_rw_mb(moal_handle *handle, pmlan_buffer pmbuf_list, t_u32 port, - t_u8 write) +mlan_status woal_sdio_rw_mb(moal_handle *handle, pmlan_buffer pmbuf_list, + t_u32 port, t_u8 write) { struct scatterlist sg_list[SDIO_MP_AGGR_DEF_PKT_LIMIT_MAX]; int num_sg = pmbuf_list->use_count; @@ -917,8 +919,8 @@ woal_sdio_rw_mb(moal_handle *handle, pmlan_buffer pmbuf_list, t_u32 port, mmc_cmd.opcode = SD_IO_RW_EXTENDED; mmc_cmd.arg = write ? 1 << 31 : 0; mmc_cmd.arg |= (func->num & 0x7) << 28; - mmc_cmd.arg |= 1 << 27; /* block basic */ - mmc_cmd.arg |= 0; /* fix address */ + mmc_cmd.arg |= 1 << 27; /* block basic */ + mmc_cmd.arg |= 0; /* fix address */ mmc_cmd.arg |= (ioport & 0x1FFFF) << 9; mmc_cmd.arg |= blkcnt & 0x1FF; mmc_cmd.flags = MMC_RSP_SPI_R5 | MMC_RSP_R5 | MMC_CMD_ADTC; @@ -927,17 +929,17 @@ woal_sdio_rw_mb(moal_handle *handle, pmlan_buffer pmbuf_list, t_u32 port, mmc_req.data = &mmc_dat; sdio_claim_host(((struct sdio_mmc_card *)handle->card)->func); - mmc_set_data_timeout(&mmc_dat, - ((struct sdio_mmc_card *)handle->card)->func-> - card); - mmc_wait_for_req(((struct sdio_mmc_card *)handle->card)->func->card-> - host, &mmc_req); + mmc_set_data_timeout( + &mmc_dat, ((struct sdio_mmc_card *)handle->card)->func->card); + mmc_wait_for_req( + ((struct sdio_mmc_card *)handle->card)->func->card->host, + &mmc_req); if (mmc_cmd.error || mmc_dat.error) { PRINTM(MERROR, "CMD53 %s cmd_error = %d data_error=%d\n", write ? "write" : "read", mmc_cmd.error, mmc_dat.error); #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) - /* issue abort cmd52 command through F0 */ + /* issue abort cmd52 command through F0*/ sdio_f0_writeb(((struct sdio_mmc_card *)handle->card)->func, 0x01, SDIO_CCCR_ABORT, &status); #endif @@ -958,19 +960,18 @@ woal_sdio_rw_mb(moal_handle *handle, pmlan_buffer pmbuf_list, t_u32 port, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_sdiommc_write_data_sync(moal_handle *handle, mlan_buffer *pmbuf, - t_u32 port, t_u32 timeout) +static mlan_status woal_sdiommc_write_data_sync(moal_handle *handle, + mlan_buffer *pmbuf, t_u32 port, + t_u32 timeout) { mlan_status ret = MLAN_STATUS_FAILURE; t_u8 *buffer = (t_u8 *)(pmbuf->pbuf + pmbuf->data_offset); t_u8 blkmode = (port & MLAN_SDIO_BYTE_MODE_MASK) ? BYTE_MODE : BLOCK_MODE; t_u32 blksz = (blkmode == BLOCK_MODE) ? MLAN_SDIO_BLOCK_SIZE : 1; - t_u32 blkcnt = - (blkmode == - BLOCK_MODE) ? (pmbuf->data_len / - MLAN_SDIO_BLOCK_SIZE) : pmbuf->data_len; + t_u32 blkcnt = (blkmode == BLOCK_MODE) ? + (pmbuf->data_len / MLAN_SDIO_BLOCK_SIZE) : + pmbuf->data_len; t_u32 ioport = (port & MLAN_SDIO_IO_PORT_MASK); int status = 0; if (pmbuf->use_count > 1) @@ -986,7 +987,7 @@ woal_sdiommc_write_data_sync(moal_handle *handle, mlan_buffer *pmbuf, else { PRINTM(MERROR, "cmd53 write error=%d\n", status); #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) - /* issue abort cmd52 command through F0 */ + /* issue abort cmd52 command through F0*/ sdio_f0_writeb(((struct sdio_mmc_card *)handle->card)->func, 0x01, SDIO_CCCR_ABORT, &status); #endif @@ -1008,19 +1009,18 @@ woal_sdiommc_write_data_sync(moal_handle *handle, mlan_buffer *pmbuf, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_sdiommc_read_data_sync(moal_handle *handle, mlan_buffer *pmbuf, t_u32 port, - t_u32 timeout) +static mlan_status woal_sdiommc_read_data_sync(moal_handle *handle, + mlan_buffer *pmbuf, t_u32 port, + t_u32 timeout) { mlan_status ret = MLAN_STATUS_FAILURE; t_u8 *buffer = (t_u8 *)(pmbuf->pbuf + pmbuf->data_offset); t_u8 blkmode = (port & MLAN_SDIO_BYTE_MODE_MASK) ? BYTE_MODE : BLOCK_MODE; t_u32 blksz = (blkmode == BLOCK_MODE) ? MLAN_SDIO_BLOCK_SIZE : 1; - t_u32 blkcnt = - (blkmode == - BLOCK_MODE) ? (pmbuf->data_len / - MLAN_SDIO_BLOCK_SIZE) : pmbuf->data_len; + t_u32 blkcnt = (blkmode == BLOCK_MODE) ? + (pmbuf->data_len / MLAN_SDIO_BLOCK_SIZE) : + pmbuf->data_len; t_u32 ioport = (port & MLAN_SDIO_IO_PORT_MASK); int status = 0; if (pmbuf->use_count > 1) @@ -1036,7 +1036,7 @@ woal_sdiommc_read_data_sync(moal_handle *handle, mlan_buffer *pmbuf, t_u32 port, } else { PRINTM(MERROR, "cmd53 read error=%d\n", status); #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) - /* issue abort cmd52 command through F0 */ + /* issue abort cmd52 command through F0*/ sdio_f0_writeb(((struct sdio_mmc_card *)handle->card)->func, 0x01, SDIO_CCCR_ABORT, &status); #endif @@ -1053,8 +1053,7 @@ woal_sdiommc_read_data_sync(moal_handle *handle, mlan_buffer *pmbuf, t_u32 port, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_sdiommc_bus_register(void) +mlan_status woal_sdiommc_bus_register(void) { mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1076,8 +1075,7 @@ woal_sdiommc_bus_register(void) * * @return N/A */ -void -woal_sdiommc_bus_unregister(void) +void woal_sdiommc_bus_unregister(void) { ENTER(); @@ -1093,8 +1091,7 @@ woal_sdiommc_bus_unregister(void) * @param handle A pointer to moal_handle structure * @return N/A */ -static void -woal_sdiommc_unregister_dev(moal_handle *handle) +static void woal_sdiommc_unregister_dev(moal_handle *handle) { ENTER(); if (handle->card) { @@ -1120,8 +1117,7 @@ woal_sdiommc_unregister_dev(moal_handle *handle) * @param handle A pointer to moal_handle structure * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_sdiommc_register_dev(moal_handle *handle) +static mlan_status woal_sdiommc_register_dev(moal_handle *handle) { int ret = MLAN_STATUS_SUCCESS; struct sdio_mmc_card *card = handle->card; @@ -1172,8 +1168,7 @@ release_host: * @param option TRUE--on , FALSE--off * @return MLAN_STATUS_SUCCESS */ -int -woal_sdio_set_bus_clock(moal_handle *handle, t_u8 option) +int woal_sdio_set_bus_clock(moal_handle *handle, t_u8 option) { struct sdio_mmc_card *cardp = (struct sdio_mmc_card *)handle->card; struct mmc_host *host = cardp->func->card->host; @@ -1196,7 +1191,8 @@ woal_sdio_set_bus_clock(moal_handle *handle, t_u8 option) } /** - * @brief This function updates card reg based on the Cmd52 value in dev structure + * @brief This function updates card reg based on the Cmd52 value in dev + * structure * * @param handle A pointer to moal_handle structure * @param func A pointer to store func variable @@ -1204,8 +1200,7 @@ woal_sdio_set_bus_clock(moal_handle *handle, t_u8 option) * @param val A pointer to store val variable * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -int -woal_sdio_read_write_cmd52(moal_handle *handle, int func, int reg, int val) +int woal_sdio_read_write_cmd52(moal_handle *handle, int func, int reg, int val) { int ret = MLAN_STATUS_SUCCESS; struct sdio_mmc_card *card = (struct sdio_mmc_card *)handle->card; @@ -1258,8 +1253,7 @@ woal_sdio_read_write_cmd52(moal_handle *handle, int func, int reg, int val) * @return MTRUE/MFALSE * */ -static t_u8 -woal_sdiommc_is_second_mac(moal_handle *handle) +static t_u8 woal_sdiommc_is_second_mac(moal_handle *handle) { #ifdef SD9098 struct sdio_mmc_card *card = (struct sdio_mmc_card *)handle->card; @@ -1269,8 +1263,7 @@ woal_sdiommc_is_second_mac(moal_handle *handle) return MFALSE; } -static mlan_status -woal_sdiommc_get_fw_name(moal_handle *handle) +static mlan_status woal_sdiommc_get_fw_name(moal_handle *handle) { mlan_status ret = MLAN_STATUS_SUCCESS; #ifdef SD9098 @@ -1279,7 +1272,8 @@ woal_sdiommc_get_fw_name(moal_handle *handle) t_u32 revision_id = 0; t_u32 rev_id_reg = handle->card_info->rev_id_reg; -#if defined(SD8987) || defined(SD8997) || defined(SD9098) || defined(SD9097) || defined(SD8978) +#if defined(SD8987) || defined(SD8997) || defined(SD9098) || \ + defined(SD9097) || defined(SD8978) t_u32 magic_reg = handle->card_info->magic_reg; t_u32 magic = 0; t_u32 host_strap_reg = handle->card_info->host_strap_reg; @@ -1290,14 +1284,15 @@ woal_sdiommc_get_fw_name(moal_handle *handle) if (handle->params.fw_name) goto done; - /** Revision ID register */ + /** Revision ID register */ woal_sdiommc_read_reg(handle, rev_id_reg, &revision_id); PRINTM(MCMND, "revision_id=0x%x\n", revision_id); -#if defined(SD8987) || defined(SD8997) || defined(SD9098) || defined(SD9097) || defined(SD8978) - /** Revision ID register */ +#if defined(SD8987) || defined(SD8997) || defined(SD9098) || \ + defined(SD9097) || defined(SD8978) + /** Revision ID register */ woal_sdiommc_read_reg(handle, magic_reg, &magic); - /** Revision ID register */ + /** Revision ID register */ woal_sdiommc_read_reg(handle, host_strap_reg, &strap); strap &= 0x1; magic &= 0xFF; @@ -1404,6 +1399,7 @@ woal_sdiommc_get_fw_name(moal_handle *handle) break; case SD9098_A0: case SD9098_A1: + case SD9098_A2: if (magic == CHIP_MAGIC_VALUE) { if (strap == CARD_TYPE_SD_UART) strcpy(handle->card_info->fw_name, @@ -1448,9 +1444,9 @@ done: return ret; } -#define DEBUG_FW_DONE 0xFF -#define DEBUG_MEMDUMP_FINISH 0xFE -#define MAX_POLL_TRIES 100 +#define DEBUG_FW_DONE 0xFF +#define DEBUG_MEMDUMP_FINISH 0xFE +#define MAX_POLL_TRIES 100 typedef enum { DUMP_TYPE_ITCM = 0, @@ -1470,8 +1466,8 @@ typedef enum { DUMP_TYPE_EXTEND_LAST = 14 } dumped_mem_type; -#define MAX_NAME_LEN 8 -#define MAX_FULL_NAME_LEN 32 +#define MAX_NAME_LEN 8 +#define MAX_FULL_NAME_LEN 32 typedef struct { t_u8 mem_name[MAX_NAME_LEN]; @@ -1498,8 +1494,8 @@ memory_type_mapping mem_type_mapping_tbl[] = { {"EXT13", NULL, NULL, 0xFD, 0}, {"EXTLAST", NULL, NULL, 0xFE, 0}, }; -memory_type_mapping mem_type_mapping_tbl_8977_8997 = - { "DUMP", NULL, NULL, 0xDD, 0 }; +memory_type_mapping mem_type_mapping_tbl_8977_8997 = {"DUMP", NULL, NULL, 0xDD, + 0}; typedef enum { RDWR_STATUS_SUCCESS = 0, @@ -1515,8 +1511,7 @@ typedef enum { * * @return MLAN_STATUS_SUCCESS */ -rdwr_status -woal_cmd52_rdwr_firmware(moal_handle *phandle, t_u8 doneflag) +rdwr_status woal_cmd52_rdwr_firmware(moal_handle *phandle, t_u8 doneflag) { int ret = 0; int tries = 0; @@ -1565,10 +1560,8 @@ woal_cmd52_rdwr_firmware(moal_handle *phandle, t_u8 doneflag) * * @return N/A */ -void -woal_dump_firmware_info_v2(moal_handle *phandle) +void woal_dump_firmware_info_v2(moal_handle *phandle) { - int ret = 0; unsigned int reg, reg_start, reg_end; t_u8 *dbg_ptr = NULL; @@ -1582,16 +1575,21 @@ woal_dump_firmware_info_v2(moal_handle *phandle) t_u32 memory_size = 0; t_u8 path_name[64], file_name[32], firmware_dump_file[128]; t_u8 *end_ptr = NULL; - t_u8 dbg_dump_start_reg = phandle->card_info->dump_fw_start_reg; - t_u8 dbg_dump_end_reg = phandle->card_info->dump_fw_end_reg; - t_u8 dbg_dump_ctrl_reg = phandle->card_info->dump_fw_ctrl_reg; + t_u8 dbg_dump_start_reg = 0; + t_u8 dbg_dump_end_reg = 0; + t_u8 dbg_dump_ctrl_reg = 0; if (!phandle) { PRINTM(MERROR, "Could not dump firmwware info\n"); return; } + + dbg_dump_start_reg = phandle->card_info->dump_fw_start_reg; + dbg_dump_end_reg = phandle->card_info->dump_fw_end_reg; + dbg_dump_ctrl_reg = phandle->card_info->dump_fw_ctrl_reg; + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) - /** Create dump directort*/ + /** Create dump directort*/ woal_create_dump_dir(phandle, path_name, sizeof(path_name)); #else memset(path_name, 0, sizeof(path_name)); @@ -1643,9 +1641,9 @@ woal_dump_firmware_info_v2(moal_handle *phandle) } else { PRINTM(MMSG, "%s_SIZE=0x%x\n", mem_type_mapping_tbl[idx].mem_name, memory_size); - ret = moal_vmalloc(phandle, memory_size + 1, - (t_u8 **)&mem_type_mapping_tbl[idx]. - mem_Ptr); + ret = moal_vmalloc( + phandle, memory_size + 1, + (t_u8 **)&mem_type_mapping_tbl[idx].mem_Ptr); if ((ret != MLAN_STATUS_SUCCESS) || !mem_type_mapping_tbl[idx].mem_Ptr) { PRINTM(MERROR, @@ -1679,24 +1677,24 @@ woal_dump_firmware_info_v2(moal_handle *phandle) "pre-allocced buf is not enough\n"); } if (RDWR_STATUS_DONE == stat) { - PRINTM(MMSG, "%s done:" + PRINTM(MMSG, + "%s done:" #ifdef MLAN_64BIT "size = 0x%lx\n", #else "size = 0x%x\n", #endif mem_type_mapping_tbl[idx].mem_name, - dbg_ptr - - mem_type_mapping_tbl[idx].mem_Ptr); + dbg_ptr - mem_type_mapping_tbl[idx] + .mem_Ptr); memset(file_name, 0, sizeof(file_name)); sprintf(file_name, "%s%s", "file_sdio_", mem_type_mapping_tbl[idx].mem_name); if (MLAN_STATUS_SUCCESS != - woal_save_dump_info_to_file(path_name, - file_name, - mem_type_mapping_tbl - [idx].mem_Ptr, - memory_size)) + woal_save_dump_info_to_file( + path_name, file_name, + mem_type_mapping_tbl[idx].mem_Ptr, + memory_size)) PRINTM(MERROR, "Can't save dump file %s in %s\n", file_name, path_name); @@ -1733,10 +1731,8 @@ done: * * @return N/A */ -void -woal_dump_firmware_info_v3(moal_handle *phandle) +void woal_dump_firmware_info_v3(moal_handle *phandle) { - int ret = 0; int tries = 0; unsigned int reg, reg_start, reg_end; @@ -1750,8 +1746,8 @@ woal_dump_firmware_info_v3(moal_handle *phandle) t_u8 path_name[64], file_name[32], firmware_dump_file[128]; moal_handle *ref_handle; t_u8 *end_ptr = NULL; - t_u8 dbg_dump_start_reg = phandle->card_info->dump_fw_start_reg; - t_u8 dbg_dump_end_reg = phandle->card_info->dump_fw_end_reg; + t_u8 dbg_dump_start_reg = 0; + t_u8 dbg_dump_end_reg = 0; memory_type_mapping *pmem_type_mapping_tbl = &mem_type_mapping_tbl_8977_8997; @@ -1759,8 +1755,12 @@ woal_dump_firmware_info_v3(moal_handle *phandle) PRINTM(MERROR, "Could not dump firmwware info\n"); return; } + + dbg_dump_start_reg = phandle->card_info->dump_fw_start_reg; + dbg_dump_end_reg = phandle->card_info->dump_fw_end_reg; + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) - /** Create dump directort*/ + /** Create dump directort*/ woal_create_dump_dir(phandle, path_name, sizeof(path_name)); #else memset(path_name, 0, sizeof(path_name)); @@ -1779,7 +1779,7 @@ woal_dump_firmware_info_v3(moal_handle *phandle) if (RDWR_STATUS_FAILURE == woal_cmd52_rdwr_firmware(phandle, doneflag)) goto done; - /** check the reg which indicate dump starting */ + /** check the reg which indicate dump starting */ for (reg = dbg_dump_start_reg; reg <= dbg_dump_end_reg; reg++) { for (tries = 0; tries < MAX_POLL_TRIES; tries++) { ret = woal_sdio_readb(phandle, reg, &start_flag); @@ -1787,7 +1787,7 @@ woal_dump_firmware_info_v3(moal_handle *phandle) PRINTM(MMSG, "SDIO READ ERR\n"); goto done; } - /** 0 means dump starting*/ + /** 0 means dump starting*/ if (start_flag == 0) break; udelay(100); @@ -1796,7 +1796,6 @@ woal_dump_firmware_info_v3(moal_handle *phandle) PRINTM(MMSG, "FW not ready to dump\n"); goto done; } - } memory_size = 0xF0000; PRINTM(MMSG, "%s_SIZE=0x%x\n", pmem_type_mapping_tbl->mem_name, @@ -1846,17 +1845,16 @@ woal_dump_firmware_info_v3(moal_handle *phandle) pmem_type_mapping_tbl->mem_Ptr); pmem_type_mapping_tbl->mem_Ptr = temp_Ptr; temp_Ptr = NULL; - dbg_ptr = - pmem_type_mapping_tbl->mem_Ptr + - memory_size; + dbg_ptr = pmem_type_mapping_tbl->mem_Ptr + + memory_size; memory_size += 0x4000; - end_ptr = - pmem_type_mapping_tbl->mem_Ptr + - memory_size; + end_ptr = pmem_type_mapping_tbl->mem_Ptr + + memory_size; } } if (RDWR_STATUS_DONE == stat) { - PRINTM(MMSG, "%s done:" + PRINTM(MMSG, + "%s done:" #ifdef MLAN_64BIT "size = 0x%lx\n", #else @@ -1868,12 +1866,10 @@ woal_dump_firmware_info_v3(moal_handle *phandle) sprintf(file_name, "%s%s", "file_sdio_", pmem_type_mapping_tbl->mem_name); if (MLAN_STATUS_SUCCESS != - woal_save_dump_info_to_file(path_name, file_name, - pmem_type_mapping_tbl-> - mem_Ptr, - dbg_ptr - - pmem_type_mapping_tbl-> - mem_Ptr)) + woal_save_dump_info_to_file( + path_name, file_name, + pmem_type_mapping_tbl->mem_Ptr, + dbg_ptr - pmem_type_mapping_tbl->mem_Ptr)) PRINTM(MERROR, "Can't save dump file %s in %s\n", file_name, path_name); @@ -1906,8 +1902,7 @@ done: * * @return N/A */ -static void -woal_sdiommc_reg_dbg(moal_handle *phandle) +static void woal_sdiommc_reg_dbg(moal_handle *phandle) { int ret = 0; t_u8 loop, index = 0, func, data; @@ -1980,8 +1975,7 @@ woal_sdiommc_reg_dbg(moal_handle *phandle) * * @return N/A */ -static void -woal_sdiommc_dump_fw_info(moal_handle *phandle) +static void woal_sdiommc_dump_fw_info(moal_handle *phandle) { if (!phandle) { PRINTM(MERROR, "Could not dump firmwware info\n"); @@ -2008,16 +2002,15 @@ woal_sdiommc_dump_fw_info(moal_handle *phandle) * * @return The length of this log */ -static int -woal_sdiommc_dump_reg_info(moal_handle *phandle, t_u8 *drv_buf) +static int woal_sdiommc_dump_reg_info(moal_handle *phandle, t_u8 *drv_buf) { char *drv_ptr = (char *)drv_buf; int ret = 0; t_u8 loop, index = 0, func, data; unsigned int reg, reg_start, reg_end; - unsigned int scratch_reg = phandle->card_info->scratch_reg; - t_u8 *reg_table = phandle->card_info->dump_reg.reg_table; - t_u8 reg_table_size = phandle->card_info->dump_reg.reg_table_size; + unsigned int scratch_reg = 0; + t_u8 *reg_table = NULL; + t_u8 reg_table_size = 0; char buf[256], *ptr; ENTER(); @@ -2027,6 +2020,11 @@ woal_sdiommc_dump_reg_info(moal_handle *phandle, t_u8 *drv_buf) LEAVE(); return 0; } + + scratch_reg = phandle->card_info->scratch_reg; + reg_table = phandle->card_info->dump_reg.reg_table; + reg_table_size = phandle->card_info->dump_reg.reg_table_size; + mlan_pm_wakeup_card(phandle->pmlan_adapter, MTRUE); drv_ptr += sprintf(drv_ptr, "--------sdio_reg_debug_info---------\n"); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_shim.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_shim.c index 78b584381088..2432287c21d2 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_shim.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_shim.c @@ -1,42 +1,42 @@ /** @file moal_shim.c - * - * @brief This file contains the callback functions registered to MLAN - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains the callback functions registered to MLAN + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /******************************************************** Change log: 10/21/2008: initial version ********************************************************/ -#include "moal_main.h" +#include "moal_main.h" #ifdef USB -#include "moal_usb.h" +#include "moal_usb.h" #endif #ifdef SDIO -#include "moal_sdio.h" +#include "moal_sdio.h" #endif #ifdef PCIE -#include "moal_pcie.h" +#include "moal_pcie.h" #endif #ifdef UAP_SUPPORT -#include "moal_uap.h" +#include "moal_uap.h" #endif #if defined(STA_CFG80211) || defined(UAP_CFG80211) #include "moal_cfg80211.h" @@ -74,17 +74,17 @@ extern int wifi_status; * @param pmoal_handle Pointer to the MOAL context * @param size The size of the buffer to be allocated * @param flag The type of the buffer to be allocated - * @param ppbuf Pointer to a buffer location to store buffer pointer allocated + * @param ppbuf Pointer to a buffer location to store buffer pointer + * allocated * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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_handle *handle = (moal_handle *)pmoal_handle; - t_u32 mem_flag = (in_interrupt() || - irqs_disabled())? GFP_ATOMIC : GFP_KERNEL; + t_u32 mem_flag = + (in_interrupt() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; #ifdef USB if (!IS_USB(handle->card_type)) @@ -112,8 +112,7 @@ moal_malloc(IN t_void *pmoal_handle, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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_handle *handle = (moal_handle *)pmoal_handle; @@ -129,12 +128,13 @@ moal_mfree(IN t_void *pmoal_handle, IN t_u8 *pbuf) * * @param pmoal_handle Pointer to the MOAL context * @param size The size of the buffer to be allocated - * @param ppbuf Pointer to a buffer location to store buffer pointer allocated + * @param ppbuf Pointer to a buffer location to store buffer pointer + * allocated * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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_handle *handle = (moal_handle *)pmoal_handle; @@ -157,8 +157,7 @@ moal_vmalloc(IN t_void *pmoal_handle, IN t_u32 size, OUT t_u8 **ppbuf) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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_handle *handle = (moal_handle *)pmoal_handle; @@ -176,19 +175,19 @@ moal_vfree(IN t_void *pmoal_handle, IN t_u8 *pbuf) * @param pmoal_handle Pointer to the MOAL context * @param size The size of the buffer to be allocated * @param ppbuf Pointer to a buffer location to store memory allocated - * @param pbuf_pa Pointer to a buffer location to store physical address of above memory + * @param pbuf_pa Pointer to a buffer location to store physical address + * of above memory * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -moal_malloc_consistent(IN t_void *pmoal_handle, - IN t_u32 size, OUT t_u8 **ppbuf, OUT t_u64 *pbuf_pa) +mlan_status moal_malloc_consistent(IN t_void *pmoal_handle, IN t_u32 size, + OUT t_u8 **ppbuf, OUT t_u64 *pbuf_pa) { moal_handle *handle = (moal_handle *)pmoal_handle; pcie_service_card *card = (pcie_service_card *)handle->card; *pbuf_pa = 0; *ppbuf = (t_u8 *)pci_alloc_consistent(card->dev, size, - (dma_addr_t *) pbuf_pa); + (dma_addr_t *)pbuf_pa); if (*ppbuf == NULL) { PRINTM(MERROR, "%s: allocate consistent memory (%d bytes) failed!\n", @@ -210,9 +209,8 @@ moal_malloc_consistent(IN t_void *pmoal_handle, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -moal_mfree_consistent(IN t_void *pmoal_handle, - IN t_u32 size, IN t_u8 *pbuf, IN t_u64 buf_pa) +mlan_status moal_mfree_consistent(IN t_void *pmoal_handle, IN t_u32 size, + IN t_u8 *pbuf, IN t_u64 buf_pa) { moal_handle *handle = (moal_handle *)pmoal_handle; pcie_service_card *card = handle->card; @@ -236,9 +234,8 @@ moal_mfree_consistent(IN t_void *pmoal_handle, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -moal_map_memory(IN t_void *pmoal_handle, - IN t_u8 *pbuf, OUT t_u64 *pbuf_pa, IN t_u32 size, IN t_u32 flag) +mlan_status moal_map_memory(IN t_void *pmoal_handle, IN t_u8 *pbuf, + OUT t_u64 *pbuf_pa, IN t_u32 size, IN t_u32 flag) { moal_handle *handle = (moal_handle *)pmoal_handle; pcie_service_card *card = (pcie_service_card *)handle->card; @@ -271,9 +268,8 @@ moal_map_memory(IN t_void *pmoal_handle, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -moal_unmap_memory(IN t_void *pmoal_handle, - IN t_u8 *pbuf, IN t_u64 buf_pa, IN t_u32 size, IN t_u32 flag) +mlan_status moal_unmap_memory(IN t_void *pmoal_handle, IN t_u8 *pbuf, + IN t_u64 buf_pa, IN t_u32 size, IN t_u32 flag) { moal_handle *handle = (moal_handle *)pmoal_handle; pcie_service_card *card = (pcie_service_card *)handle->card; @@ -294,9 +290,8 @@ moal_unmap_memory(IN t_void *pmoal_handle, * * @return Pointer to the memory area */ -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) { t_void *p = pmem; @@ -316,9 +311,8 @@ moal_memset(IN t_void *pmoal_handle, * * @return Pointer to the dest memory */ -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) { t_void *p = pdest; @@ -339,10 +333,8 @@ moal_memcpy(IN t_void *pmoal_handle, * * @return Pointer to the dest memory */ -t_void * -moal_memcpy_ext(IN t_void *pmoal_handle, - IN t_void *pdest, - IN const t_void *psrc, IN t_u32 num, IN t_u32 dest_size) +t_void *moal_memcpy_ext(IN t_void *pmoal_handle, IN t_void *pdest, + IN const t_void *psrc, IN t_u32 num, IN t_u32 dest_size) { t_void *p = pdest; if (pdest && psrc && num && dest_size) @@ -361,9 +353,8 @@ moal_memcpy_ext(IN t_void *pmoal_handle, * * @return Pointer to the dest memory */ -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) { t_void *p = pdest; @@ -383,9 +374,8 @@ moal_memmove(IN t_void *pmoal_handle, * * @return Compare result returns by 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) { t_s32 result; @@ -402,8 +392,7 @@ moal_memcmp(IN t_void *pmoal_handle, * * @return N/A */ -t_void -moal_udelay(IN t_void *pmoal_handle, IN t_u32 delay) +t_void moal_udelay(IN t_void *pmoal_handle, IN t_u32 delay) { if (delay >= 1000) mdelay(delay / 1000); @@ -420,8 +409,8 @@ moal_udelay(IN t_void *pmoal_handle, IN t_u32 delay) * * @return MLAN_STATUS_SUCCESS */ -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) { struct timeval t; @@ -440,8 +429,7 @@ moal_get_system_time(IN t_void *pmoal_handle, OUT t_u32 *psec, OUT t_u32 *pusec) * * @return MLAN_STATUS_SUCCESS */ -mlan_status -moal_get_boot_ktime(IN t_void *pmoal_handle, OUT t_u64 *pnsec) +mlan_status moal_get_boot_ktime(IN t_void *pmoal_handle, OUT t_u64 *pnsec) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0) ktime_t time; @@ -462,14 +450,13 @@ moal_get_boot_ktime(IN t_void *pmoal_handle, OUT t_u64 *pnsec) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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_drv_timer *timer = NULL; - t_u32 mem_flag = (in_interrupt() || - irqs_disabled())? GFP_ATOMIC : GFP_KERNEL; + t_u32 mem_flag = + (in_interrupt() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; timer = kmalloc(sizeof(moal_drv_timer), mem_flag); if (timer == NULL) @@ -488,13 +475,13 @@ moal_init_timer(IN t_void *pmoal_handle, * * @return MLAN_STATUS_SUCCESS */ -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_drv_timer *timer = (moal_drv_timer *)ptimer; if (timer) { - if ((timer->timer_is_canceled == MFALSE) && timer->time_period) { + if ((timer->timer_is_canceled == MFALSE) && + timer->time_period) { PRINTM(MWARN, "mlan try to free timer without stop timer!\n"); woal_cancel_timer(timer); @@ -515,9 +502,8 @@ moal_free_timer(IN t_void *pmoal_handle, IN t_void *ptimer) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) { if (!ptimer) return MLAN_STATUS_FAILURE; @@ -536,8 +522,7 @@ moal_start_timer(IN t_void *pmoal_handle, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) { if (!ptimer) return MLAN_STATUS_FAILURE; @@ -554,8 +539,7 @@ moal_stop_timer(IN t_void *pmoal_handle, IN t_void *ptimer) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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_handle *handle = (moal_handle *)pmoal_handle; moal_lock *mlock = NULL; @@ -579,8 +563,7 @@ moal_init_lock(IN t_void *pmoal_handle, OUT t_void **pplock) * * @return MLAN_STATUS_SUCCESS */ -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_handle *handle = (moal_handle *)pmoal_handle; moal_lock *mlock = plock; @@ -600,8 +583,7 @@ moal_free_lock(IN t_void *pmoal_handle, IN t_void *plock) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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_lock *mlock = plock; unsigned long flags = 0; @@ -623,8 +605,7 @@ moal_spin_lock(IN t_void *pmoal_handle, IN t_void *plock) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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_lock *mlock = (moal_lock *)plock; @@ -647,9 +628,8 @@ moal_spin_unlock(IN t_void *pmoal_handle, IN t_void *plock) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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_handle *handle = (moal_handle *)pmoal_handle; @@ -674,8 +654,8 @@ moal_get_fw_data(IN t_void *pmoal_handle, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -moal_get_vdll_data(IN t_void *pmoal_handle, IN t_u32 len, OUT t_u8 *pbuf) +mlan_status moal_get_vdll_data(IN t_void *pmoal_handle, IN t_u32 len, + OUT t_u8 *pbuf) { moal_handle *handle = (moal_handle *)pmoal_handle; mlan_status status = MLAN_STATUS_FAILURE; @@ -707,7 +687,8 @@ moal_get_vdll_data(IN t_void *pmoal_handle, IN t_u32 len, OUT t_u8 *pbuf) } /** - * @brief This function is called when MLAN completes the initialization firmware. + * @brief This function is called when MLAN completes the initialization + * firmware. * * @param pmoal_handle Pointer to the MOAL context * @param status The status code for mlan_init_fw request @@ -715,9 +696,10 @@ moal_get_vdll_data(IN t_void *pmoal_handle, IN t_u32 len, OUT t_u8 *pbuf) * @param ptbl pointer to mplan_bss_tbl * @return MLAN_STATUS_SUCCESS */ -mlan_status -moal_get_hw_spec_complete(IN t_void *pmoal_handle, IN mlan_status status, - IN mlan_hw_info * phw, IN pmlan_bss_tbl ptbl) +mlan_status moal_get_hw_spec_complete(IN t_void *pmoal_handle, + IN mlan_status status, + IN mlan_hw_info *phw, + IN pmlan_bss_tbl ptbl) { ENTER(); if (status == MLAN_STATUS_SUCCESS) { @@ -728,15 +710,16 @@ moal_get_hw_spec_complete(IN t_void *pmoal_handle, IN mlan_status status, } /** - * @brief This function is called when MLAN completes the initialization firmware. + * @brief This function is called when MLAN completes the initialization + * firmware. * * @param pmoal_handle Pointer to the MOAL context * @param status The status code for mlan_init_fw request * * @return MLAN_STATUS_SUCCESS */ -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_handle *handle = (moal_handle *)pmoal_handle; ENTER(); @@ -756,8 +739,8 @@ moal_init_fw_complete(IN t_void *pmoal_handle, IN mlan_status status) * * @return MLAN_STATUS_SUCCESS */ -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_handle *handle = (moal_handle *)pmoal_handle; ENTER(); @@ -777,9 +760,9 @@ moal_shutdown_fw_complete(IN t_void *pmoal_handle, IN mlan_status status) * * @return MLAN_STATUS_SUCCESS */ -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_handle *handle = (moal_handle *)pmoal_handle; moal_private *priv = NULL; @@ -851,9 +834,8 @@ moal_ioctl_complete(IN t_void *pmoal_handle, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) { *pmbuf = woal_alloc_mlan_buffer((moal_handle *)pmoal_handle, size); if (NULL == *pmbuf) @@ -869,8 +851,8 @@ moal_alloc_mlan_buffer(IN t_void *pmoal_handle, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) { if (!pmbuf) return MLAN_STATUS_FAILURE; @@ -887,9 +869,9 @@ moal_free_mlan_buffer(IN t_void *pmoal_handle, IN pmlan_buffer pmbuf) * * @return MLAN_STATUS_SUCCESS */ -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_private *priv = NULL; moal_handle *handle = (moal_handle *)pmoal_handle; @@ -915,36 +897,31 @@ moal_send_packet_complete(IN t_void *pmoal_handle, priv->stats.tx_packets++; priv->stats.tx_bytes += skb->len; #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) - woal_packet_fate_monitor(priv, - PACKET_TYPE_TX, - TX_PKT_FATE_SENT, - FRAME_TYPE_ETHERNET_II, - 0, 0, - skb->data, - skb->data_len); + woal_packet_fate_monitor( + priv, PACKET_TYPE_TX, + TX_PKT_FATE_SENT, + FRAME_TYPE_ETHERNET_II, 0, 0, + skb->data, skb->data_len); #endif } else { priv->stats.tx_errors++; #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) - woal_packet_fate_monitor(priv, - PACKET_TYPE_TX, - TX_PKT_FATE_DRV_DROP_OTHER, - FRAME_TYPE_ETHERNET_II, - 0, 0, - skb->data, - skb->data_len); + woal_packet_fate_monitor( + priv, PACKET_TYPE_TX, + TX_PKT_FATE_DRV_DROP_OTHER, + FRAME_TYPE_ETHERNET_II, 0, 0, + skb->data, skb->data_len); #endif } #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 29) index = skb_get_queue_mapping(skb); atomic_dec(&handle->tx_pending); - if (atomic_dec_return - (&priv->wmm_tx_pending[index]) == + if (atomic_dec_return( + &priv->wmm_tx_pending[index]) == LOW_TX_PENDING) { struct netdev_queue *txq = - netdev_get_tx_queue(priv-> - netdev, - index); + netdev_get_tx_queue( + priv->netdev, index); if (netif_tx_queue_stopped(txq)) { netif_tx_wake_queue(txq); PRINTM(MINFO, @@ -952,40 +929,37 @@ moal_send_packet_complete(IN t_void *pmoal_handle, index); } } -#else /*#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29) */ +#else /*#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29)*/ if (atomic_dec_return(&handle->tx_pending) < LOW_TX_PENDING) { int i; for (i = 0; i < handle->priv_num; i++) { #ifdef STA_SUPPORT - if ((GET_BSS_ROLE - (handle->priv[i]) == + if ((GET_BSS_ROLE( + handle->priv[i]) == MLAN_BSS_ROLE_STA) && - (handle->priv[i]-> - media_connected || - priv-> - is_adhoc_link_sensed)) { - woal_wake_queue(handle-> - priv - [i]-> - netdev); + (handle->priv[i] + ->media_connected || + priv->is_adhoc_link_sensed)) { + woal_wake_queue( + handle->priv[i] + ->netdev); } #endif #ifdef UAP_SUPPORT - if ((GET_BSS_ROLE - (handle->priv[i]) == + if ((GET_BSS_ROLE( + handle->priv[i]) == MLAN_BSS_ROLE_UAP) && - (handle->priv[i]-> - media_connected)) { - woal_wake_queue(handle-> - priv - [i]-> - netdev); + (handle->priv[i] + ->media_connected)) { + woal_wake_queue( + handle->priv[i] + ->netdev); } #endif } } -#endif /*#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29) */ +#endif /*#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,29)*/ } } if (skb) @@ -1029,9 +1003,8 @@ done: * * @return MLAN_STATUS_SUCCESS */ -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_private *priv = NULL; moal_handle *handle = (moal_handle *)pmoal_handle; @@ -1052,15 +1025,16 @@ moal_recv_complete(IN t_void *pmoal_handle, woal_submit_rx_urb(handle, port); else { woal_free_mlan_buffer(handle, pmbuf); - if ((atomic_read(&handle->rx_pending) < LOW_RX_PENDING) - && atomic_read(&cardp->rx_data_urb_pending) < - MVUSB_RX_DATA_URB) + if ((atomic_read(&handle->rx_pending) < + LOW_RX_PENDING) && + atomic_read(&cardp->rx_data_urb_pending) < + MVUSB_RX_DATA_URB) woal_usb_submit_rx_data_urbs(handle); } } else if (port == cardp->rx_data_ep) { if ((atomic_read(&handle->rx_pending) < LOW_RX_PENDING) && atomic_read(&cardp->rx_data_urb_pending) < - MVUSB_RX_DATA_URB) + MVUSB_RX_DATA_URB) woal_usb_submit_rx_data_urbs(handle); } LEAVE(); @@ -1074,11 +1048,11 @@ moal_recv_complete(IN t_void *pmoal_handle, * @param pmbuf Pointer to the mlan buffer structure * @param port Port number for sent * - * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE or MLAN_STATUS_PENDING or MLAN_STATUS_RESOURCE + * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE or + * MLAN_STATUS_PENDING or MLAN_STATUS_RESOURCE */ -mlan_status -moal_write_data_async(IN t_void *pmoal_handle, - IN pmlan_buffer pmbuf, IN t_u32 port) +mlan_status moal_write_data_async(IN t_void *pmoal_handle, + IN pmlan_buffer pmbuf, IN t_u32 port) { moal_handle *handle = (moal_handle *)pmoal_handle; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1107,9 +1081,8 @@ moal_write_data_async(IN t_void *pmoal_handle, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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_handle *handle = (moal_handle *)pmoal_handle; return handle->ops.write_data_sync(handle, pmbuf, port, timeout); @@ -1126,9 +1099,9 @@ moal_write_data_sync(IN t_void *pmoal_handle, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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_handle *handle = (moal_handle *)pmoal_handle; return handle->ops.read_data_sync(handle, pmbuf, port, timeout); @@ -1144,8 +1117,7 @@ moal_read_data_sync(IN t_void *pmoal_handle, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) { int ret = MLAN_STATUS_FAILURE; moal_handle *handle = (moal_handle *)pmoal_handle; @@ -1163,8 +1135,8 @@ moal_write_reg(IN t_void *pmoal_handle, IN t_u32 reg, IN t_u32 data) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) { int ret = MLAN_STATUS_FAILURE; moal_handle *handle = (moal_handle *)pmoal_handle; @@ -1183,8 +1155,7 @@ moal_read_reg(IN t_void *pmoal_handle, IN t_u32 reg, OUT t_u32 *data) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -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) { mlan_status status = MLAN_STATUS_SUCCESS; moal_private *priv = NULL; @@ -1212,8 +1183,8 @@ moal_recv_packet(IN t_void *pmoal_handle, IN pmlan_buffer pmbuf) MLAN_USB_AGGR_MODE_NUM) { max_rx_data_size *= MAX(MLAN_USB_MAX_PKT_SIZE, - cardp->rx_deaggr_ctrl. - aggr_align); + cardp->rx_deaggr_ctrl + .aggr_align); max_rx_data_size = MAX(max_rx_data_size, MLAN_RX_DATA_BUF_SIZE); @@ -1241,7 +1212,8 @@ moal_recv_packet(IN t_void *pmoal_handle, IN pmlan_buffer pmbuf) pmbuf->pdesc = NULL; pmbuf->pbuf = NULL; pmbuf->data_offset = pmbuf->data_len = 0; - /* pkt been submit to kernel, no need to free by mlan */ + /* pkt been submit to kernel, no need to + * free by mlan*/ status = MLAN_STATUS_PENDING; atomic_dec(&handle->mbufalloc_count); } else { @@ -1255,18 +1227,13 @@ moal_recv_packet(IN t_void *pmoal_handle, IN pmlan_buffer pmbuf) status = MLAN_STATUS_FAILURE; priv->stats.rx_dropped++; #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) - woal_packet_fate_monitor(priv, - PACKET_TYPE_RX, - RX_PKT_FATE_DRV_DROP_NOBUFS, - FRAME_TYPE_ETHERNET_II, - 0, 0, - (t_u8 - *)(pmbuf-> - pbuf + - pmbuf-> - data_offset), - pmbuf-> - data_len); + woal_packet_fate_monitor( + priv, PACKET_TYPE_RX, + RX_PKT_FATE_DRV_DROP_NOBUFS, + FRAME_TYPE_ETHERNET_II, 0, 0, + (t_u8 *)(pmbuf->pbuf + + pmbuf->data_offset), + pmbuf->data_len); #endif goto done; } @@ -1277,38 +1244,47 @@ moal_recv_packet(IN t_void *pmoal_handle, IN pmlan_buffer pmbuf) pmbuf->data_len, pmbuf->data_len); skb_put(skb, pmbuf->data_len); - } ethh = (struct ethhdr *)(skb->data); if (ntohs(ethh->h_proto) == ETH_P_PAE) PRINTM(MEVENT, "wlan: %s Rx EAPOL pkt from " MACSTR - "\n", priv->netdev->name, + "\n", + priv->netdev->name, MAC2STR(ethh->h_source)); skb->dev = priv->netdev; skb->protocol = eth_type_trans(skb, priv->netdev); skb->ip_summed = CHECKSUM_NONE; #if defined(USB) || defined(PCIE) - /* This is only required only in case of 11n and USB as we alloc if(skb_tailroom(skb) < pmbuf->data_len){ - PRINTM(MERROR,"skb overflow: tail room=%d, data_len\n", skb_tailroom(skb), pmbuf->data_len); - status = MLAN_STATUS_FAILURE; - priv->stats.rx_dropped++; - goto done; - } - * a buffer of 4K only if its 11N (to be able to receive 4K AMSDU - * packets). In case of SD we allocate buffers based on the size - * of packet and hence this is not needed. - */ - /* Modifying the truesize here as our allocation for each skb is 4K - * but we only receive 2K packets and this cause the kernel to start - * dropping packets in case where application has allocated buffer - * based on 2K size i.e. if there a 64K packet received (in IP - * fragments and application allocates 64K to receive this packet - * but this packet would almost double up because we allocate each - * 1.5K fragment in 4K and pass it up. As soon as the 64K limit - * hits kernel will start to drop rest of the fragments. Currently - * we fail the Filesndl-ht.scr script for UDP, hence this fix + /* This is only required only in case of 11n and + USB as we alloc if(skb_tailroom(skb) < + pmbuf->data_len){ PRINTM(MERROR,"skb overflow: + tail room=%d, data_len\n", skb_tailroom(skb), + pmbuf->data_len); status = MLAN_STATUS_FAILURE; + priv->stats.rx_dropped++; + goto done; + } + * a buffer of 4K only if its 11N (to be able to + receive 4K AMSDU + * packets). In case of SD we allocate buffers + based on the size + * of packet and hence this is not needed. + */ + /* Modifying the truesize here as our allocation + * for each skb is 4K but we only receive 2K + * packets and this cause the kernel to start + * dropping packets in case where application + * has allocated buffer based on 2K size i.e. if + * there a 64K packet received (in IP fragments + * and application allocates 64K to receive this + * packet but this packet would almost double up + * because we allocate each 1.5K fragment in 4K + * and pass it up. As soon as the 64K limit hits + * kernel will start to drop rest of the + * fragments. Currently we fail the + * Filesndl-ht.scr script for UDP, hence this + * fix */ if (!IS_SD(priv->phandle->card_type)) { if (skb->truesize > max_rx_data_size) @@ -1322,11 +1298,11 @@ moal_recv_packet(IN t_void *pmoal_handle, IN pmlan_buffer pmbuf) priv->netdev->name); status = MLAN_STATUS_FAILURE; priv->stats.rx_dropped++; - woal_packet_fate_monitor(priv, PACKET_TYPE_RX, - RX_PKT_FATE_DRV_DROP_FILTER, - FRAME_TYPE_ETHERNET_II, - 0, 0, skb->data, - skb->len); + woal_packet_fate_monitor( + priv, PACKET_TYPE_RX, + RX_PKT_FATE_DRV_DROP_FILTER, + FRAME_TYPE_ETHERNET_II, 0, 0, skb->data, + skb->len); dev_kfree_skb(skb); goto done; } @@ -1342,14 +1318,15 @@ moal_recv_packet(IN t_void *pmoal_handle, IN pmlan_buffer pmbuf) #ifdef ANDROID_KERNEL if (handle->params.wakelock_timeout) { #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) - __pm_wakeup_event(&handle->ws, - handle->params. - wakelock_timeout); + __pm_wakeup_event( + &handle->ws, + handle->params.wakelock_timeout); #else - wake_lock_timeout(&handle->wake_lock, - msecs_to_jiffies(handle-> - params. - wakelock_timeout)); + wake_lock_timeout( + &handle->wake_lock, + msecs_to_jiffies( + handle->params + .wakelock_timeout)); #endif } #endif @@ -1401,8 +1378,7 @@ done: * * @return MLAN_STATUS_SUCCESS */ -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) { #ifdef STA_SUPPORT int custom_len = 0; @@ -1553,30 +1529,31 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) if (priv->phandle->scan_request) { PRINTM(MINFO, "Reporting scan results\n"); - woal_inform_bss_from_scan_result(priv, - NULL, - MOAL_NO_WAIT); + woal_inform_bss_from_scan_result( + priv, NULL, MOAL_NO_WAIT); if (!priv->phandle->first_scan_done) { priv->phandle->first_scan_done = MTRUE; - woal_set_scan_time(priv, - ACTIVE_SCAN_CHAN_TIME, - PASSIVE_SCAN_CHAN_TIME, - SPECIFIC_SCAN_CHAN_TIME); + woal_set_scan_time( + priv, + ACTIVE_SCAN_CHAN_TIME, + PASSIVE_SCAN_CHAN_TIME, + SPECIFIC_SCAN_CHAN_TIME); } - spin_lock_irqsave(&priv->phandle-> - scan_req_lock, flags); + spin_lock_irqsave( + &priv->phandle->scan_req_lock, + flags); if (priv->phandle->scan_request) { - woal_cfg80211_scan_done(priv-> - phandle-> - scan_request, - MFALSE); + woal_cfg80211_scan_done( + priv->phandle + ->scan_request, + MFALSE); priv->phandle->scan_request = NULL; } - spin_unlock_irqrestore(&priv->phandle-> - scan_req_lock, - flags); + spin_unlock_irqrestore( + &priv->phandle->scan_req_lock, + flags); } } #endif /* STA_CFG80211 */ @@ -1590,7 +1567,6 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) #endif woal_broadcast_event(priv, (t_u8 *)&pmevent->event_id, sizeof(mlan_event_id)); - } if (!is_zero_timeval(priv->phandle->scan_time_start)) { @@ -1599,11 +1575,10 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) (t_u32)tstamp.tv_sec; priv->phandle->scan_time_end.time_usec = (t_u32)tstamp.tv_usec; - priv->phandle->scan_time += - (t_u64)(timeval_to_usec - (priv->phandle->scan_time_end) - - timeval_to_usec(priv->phandle-> - scan_time_start)); + priv->phandle->scan_time += (t_u64)( + timeval_to_usec(priv->phandle->scan_time_end) - + timeval_to_usec( + priv->phandle->scan_time_start)); PRINTM(MINFO, "%s : start_timeval=%d:%d end_timeval=%d:%d inter=%llu scan_time=%llu\n", __func__, @@ -1611,10 +1586,10 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) priv->phandle->scan_time_start.time_usec, priv->phandle->scan_time_end.time_sec, priv->phandle->scan_time_end.time_usec, - (t_u64)(timeval_to_usec - (priv->phandle->scan_time_end) - - timeval_to_usec(priv->phandle-> - scan_time_start)), + (t_u64)(timeval_to_usec( + priv->phandle->scan_time_end) - + timeval_to_usec( + priv->phandle->scan_time_start)), priv->phandle->scan_time); priv->phandle->scan_time_start.time_sec = 0; priv->phandle->scan_time_start.time_usec = 0; @@ -1629,7 +1604,8 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) case MLAN_EVENT_ID_DRV_OBSS_SCAN_PARAM: memmove((pmevent->event_buf + strlen(CUS_EVT_OBSS_SCAN_PARAM) + - 1), pmevent->event_buf, pmevent->event_len); + 1), + pmevent->event_buf, pmevent->event_len); moal_memcpy_ext(priv->phandle, pmevent->event_buf, (t_u8 *)CUS_EVT_OBSS_SCAN_PARAM, strlen(CUS_EVT_OBSS_SCAN_PARAM), @@ -1637,15 +1613,14 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) pmevent->event_buf[strlen(CUS_EVT_OBSS_SCAN_PARAM)] = 0; woal_broadcast_event(priv, pmevent->event_buf, pmevent->event_len + - strlen(CUS_EVT_OBSS_SCAN_PARAM)); + strlen(CUS_EVT_OBSS_SCAN_PARAM)); #ifdef STA_WEXT if (IS_STA_WEXT(cfg80211_wext)) { memset(&wrqu, 0, sizeof(union iwreq_data)); wrqu.data.pointer = pmevent->event_buf; - wrqu.data.length = - pmevent->event_len + - strlen(CUS_EVT_OBSS_SCAN_PARAM) + 1; + wrqu.data.length = pmevent->event_len + + strlen(CUS_EVT_OBSS_SCAN_PARAM) + 1; wireless_send_event(priv->netdev, IWEVCUSTOM, &wrqu, pmevent->event_buf); } @@ -1661,15 +1636,14 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) pmevent->event_buf[strlen(CUS_EVT_BW_CHANGED)] = 0; woal_broadcast_event(priv, pmevent->event_buf, pmevent->event_len + - strlen(CUS_EVT_BW_CHANGED)); + strlen(CUS_EVT_BW_CHANGED)); #ifdef STA_WEXT if (IS_STA_WEXT(cfg80211_wext)) { memset(&wrqu, 0, sizeof(union iwreq_data)); wrqu.data.pointer = pmevent->event_buf; - wrqu.data.length = - pmevent->event_len + - strlen(CUS_EVT_BW_CHANGED) + 1; + wrqu.data.length = pmevent->event_len + + strlen(CUS_EVT_BW_CHANGED) + 1; wireless_send_event(priv->netdev, IWEVCUSTOM, &wrqu, pmevent->event_buf); } @@ -1760,22 +1734,21 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) #ifdef STA_CFG80211 if (IS_STA_CFG80211(cfg80211_wext)) { #if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 35) - cfg80211_cqm_rssi_notify(priv->netdev, - NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW, + cfg80211_cqm_rssi_notify( + priv->netdev, + NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) - *(t_s16 *)pmevent->event_buf, + *(t_s16 *)pmevent->event_buf, #endif - GFP_KERNEL); + GFP_KERNEL); priv->last_event |= EVENT_BCN_RSSI_LOW; #endif if (!hw_test && priv->roaming_enabled) woal_config_bgscan_and_rssi(priv, MTRUE); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) - woal_cfg80211_rssi_monitor_event(priv, - *(t_s16 *)pmevent-> - event_buf); + woal_cfg80211_rssi_monitor_event( + priv, *(t_s16 *)pmevent->event_buf); #endif - } #endif woal_broadcast_event(priv, CUS_EVT_BEACON_RSSI_LOW, @@ -1791,22 +1764,21 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) if (IS_STA_CFG80211(cfg80211_wext)) { if (!priv->mrvl_rssi_low) { #if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 35) - cfg80211_cqm_rssi_notify(priv->netdev, - NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH, + cfg80211_cqm_rssi_notify( + priv->netdev, + NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) - *(t_s16 *)pmevent-> - event_buf, + *(t_s16 *)pmevent->event_buf, #endif - GFP_KERNEL); + GFP_KERNEL); #endif - woal_set_rssi_threshold(priv, - MLAN_EVENT_ID_FW_BCN_RSSI_HIGH, - MOAL_NO_WAIT); + woal_set_rssi_threshold( + priv, MLAN_EVENT_ID_FW_BCN_RSSI_HIGH, + MOAL_NO_WAIT); } #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) - woal_cfg80211_rssi_monitor_event(priv, - *(t_s16 *)pmevent-> - event_buf); + woal_cfg80211_rssi_monitor_event( + priv, *(t_s16 *)pmevent->event_buf); #endif } #endif @@ -1926,13 +1898,13 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) pmevent->event_buf[strlen(FW_DEBUG_INFO)] = 0; woal_broadcast_event(priv, pmevent->event_buf, pmevent->event_len + - strlen(FW_DEBUG_INFO) + 1); + strlen(FW_DEBUG_INFO) + 1); break; case MLAN_EVENT_ID_FW_WMM_CONFIG_CHANGE: #ifdef STA_WEXT if (IS_STA_WEXT(cfg80211_wext)) - woal_send_iwevcustom_event(priv, - WMM_CONFIG_CHANGE_INDICATION); + woal_send_iwevcustom_event( + priv, WMM_CONFIG_CHANGE_INDICATION); #endif woal_broadcast_event(priv, WMM_CONFIG_CHANGE_INDICATION, strlen(WMM_CONFIG_CHANGE_INDICATION)); @@ -2013,30 +1985,32 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) if (priv->sched_scanning && !priv->phandle->cfg80211_suspend) { mlan_scan_resp scan_resp; - woal_get_scan_table(priv, MOAL_NO_WAIT, - &scan_resp); - PRINTM(MIOCTL, - "Trigger mlan get bgscan result\n"); + if (MLAN_STATUS_SUCCESS == + woal_get_scan_table(priv, MOAL_NO_WAIT, + &scan_resp)) + PRINTM(MIOCTL, + "Triggered mlan get bgscan result\n"); } #endif if (!hw_test && priv->roaming_enabled #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) && !priv->phandle->cfg80211_suspend #endif - ) { + ) { priv->roaming_required = MTRUE; #ifdef ANDROID_KERNEL #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) __pm_wakeup_event(&priv->phandle->ws, ROAMING_WAKE_LOCK_TIMEOUT); #else - wake_lock_timeout(&priv->phandle->wake_lock, - msecs_to_jiffies - (ROAMING_WAKE_LOCK_TIMEOUT)); + wake_lock_timeout( + &priv->phandle->wake_lock, + msecs_to_jiffies( + ROAMING_WAKE_LOCK_TIMEOUT)); #endif #endif - wake_up_interruptible(&priv->phandle-> - reassoc_thread.wait_q); + wake_up_interruptible( + &priv->phandle->reassoc_thread.wait_q); } } #endif @@ -2064,7 +2038,7 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) , priv->bg_scan_reqid #endif - ); + ); priv->last_event = 0; woal_bgscan_stop_event(priv); PRINTM(MEVENT, @@ -2101,9 +2075,10 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) NL80211_RADAR_CAC_ABORTED, GFP_KERNEL); #endif - cfg80211_radar_event(priv->wdev->wiphy, - &priv->phandle-> - dfs_channel, GFP_KERNEL); + cfg80211_radar_event( + priv->wdev->wiphy, + &priv->phandle->dfs_channel, + GFP_KERNEL); } else { #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) cfg80211_cac_event(priv->netdev, @@ -2134,7 +2109,8 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) PRINTM(MEVENT, "radar detected during CAC \n"); woal_cancel_timer(&priv->phandle->cac_timer); priv->phandle->is_cac_timer_set = MFALSE; - /* downstream: cancel the unfinished CAC in Firmware */ + /* downstream: cancel the unfinished CAC in + * Firmware*/ woal_11h_cancel_chan_report_ioctl(priv, MOAL_NO_WAIT); /* upstream: inform cfg80211 */ @@ -2148,9 +2124,10 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) NL80211_RADAR_CAC_ABORTED, GFP_KERNEL); #endif - cfg80211_radar_event(priv->wdev->wiphy, - &priv->phandle-> - dfs_channel, GFP_KERNEL); + cfg80211_radar_event( + priv->wdev->wiphy, + &priv->phandle->dfs_channel, + GFP_KERNEL); memset(&priv->phandle->dfs_channel, 0, sizeof(priv->phandle->dfs_channel)); @@ -2163,9 +2140,9 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) PRINTM(MEVENT, "radar detected during BSS active \n"); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) if (moal_extflg_isset(priv->phandle, EXT_DFS_OFFLOAD)) - woal_cfg80211_dfs_vendor_event(priv, - event_dfs_radar_detected, - &priv->chan); + woal_cfg80211_dfs_vendor_event( + priv, event_dfs_radar_detected, + &priv->chan); else #endif cfg80211_radar_event(priv->wdev->wiphy, @@ -2186,27 +2163,26 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) case MLAN_EVENT_ID_FW_CHAN_SWITCH_COMPLETE: #if defined(UAP_CFG80211) || defined(STA_CFG80211) - pchan_info = (chan_band_info *) pmevent->event_buf; + pchan_info = (chan_band_info *)pmevent->event_buf; if (IS_STA_OR_UAP_CFG80211(cfg80211_wext)) { PRINTM(MMSG, "CSA/ECSA: Switch to new channel %d complete!\n", pchan_info->channel); priv->channel = pchan_info->channel; #ifdef UAP_CFG80211 -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,12,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) if (priv->csa_chan.chan && (pchan_info->channel == priv->csa_chan.chan->hw_value)) { - moal_memcpy_ext(priv->phandle, &priv->chan, - &priv->csa_chan, - sizeof(struct - cfg80211_chan_def), - sizeof(struct - cfg80211_chan_def)); + moal_memcpy_ext( + priv->phandle, &priv->chan, + &priv->csa_chan, + sizeof(struct cfg80211_chan_def), + sizeof(struct cfg80211_chan_def)); } #endif #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,8,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) if (MFALSE #ifdef UAP_CFG80211 || priv->uap_host_based @@ -2214,7 +2190,7 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) #ifdef STA_CFG80211 || priv->sme_current.ssid_len #endif - ) { + ) { PRINTM(MEVENT, "CHAN_SWITCH: 11n=%d, chan=%d, center_chan=%d, band=%d, width=%d, 2Offset=%d\n", pchan_info->is_11n_enabled, @@ -2335,8 +2311,7 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) break; #ifdef UAP_SUPPORT case MLAN_EVENT_ID_UAP_FW_BSS_START: - if (priv->hist_data) - woal_hist_data_reset(priv); + woal_hist_data_reset(priv); priv->bss_started = MTRUE; priv->skip_cac = MFALSE; if (!netif_carrier_ok(priv->netdev)) @@ -2375,7 +2350,7 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) #ifdef UAP_CFG80211 if (IS_UAP_CFG80211(cfg80211_wext)) { chan_band_info *pchan_info = - (chan_band_info *) pmevent->event_buf; + (chan_band_info *)pmevent->event_buf; PRINTM(MEVENT, "UAP: 11n=%d, chan=%d, center_chan=%d, band=%d, width=%d, 2Offset=%d\n", pchan_info->is_11n_enabled, pchan_info->channel, @@ -2403,25 +2378,23 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) woal_broadcast_event(priv, pmevent->event_buf, pmevent->event_len); break; - case MLAN_EVENT_ID_UAP_FW_MIC_COUNTERMEASURES: - { - t_u16 status = 0; - status = *(t_u16 *)(pmevent->event_buf + 4); - if (status) { - priv->media_connected = MFALSE; - woal_stop_queue(priv->netdev); - if (netif_carrier_ok(priv->netdev)) - netif_carrier_off(priv->netdev); - } else { - priv->media_connected = MTRUE; - if (!netif_carrier_ok(priv->netdev)) - netif_carrier_on(priv->netdev); - woal_wake_queue(priv->netdev); - } - woal_broadcast_event(priv, pmevent->event_buf, - pmevent->event_len); + case MLAN_EVENT_ID_UAP_FW_MIC_COUNTERMEASURES: { + t_u16 status = 0; + status = *(t_u16 *)(pmevent->event_buf + 4); + if (status) { + priv->media_connected = MFALSE; + woal_stop_queue(priv->netdev); + if (netif_carrier_ok(priv->netdev)) + netif_carrier_off(priv->netdev); + } else { + priv->media_connected = MTRUE; + if (!netif_carrier_ok(priv->netdev)) + netif_carrier_on(priv->netdev); + woal_wake_queue(priv->netdev); } - break; + woal_broadcast_event(priv, pmevent->event_buf, + pmevent->event_len); + } break; #if defined(STA_CFG80211) || defined(UAP_CFG80211) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) case MLAN_EVENT_ID_FW_REMAIN_ON_CHAN_EXPIRED: @@ -2439,24 +2412,16 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) !priv->phandle->is_remain_timer_set) { cfg80211_remain_on_channel_expired( #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 6, 0) - priv-> - netdev, + priv->netdev, #else - priv-> - wdev, + priv->wdev, #endif - priv-> - phandle-> - cookie, - &priv-> - phandle-> - chan, + priv->phandle->cookie, + &priv->phandle->chan, #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - priv-> - phandle-> - channel_type, + priv->phandle->channel_type, #endif - GFP_ATOMIC); + GFP_ATOMIC); priv->phandle->cookie = 0; } } @@ -2466,7 +2431,7 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) case MLAN_EVENT_ID_UAP_FW_STA_CONNECT: #if defined(STA_CFG80211) || defined(UAP_CFG80211) if (IS_STA_OR_UAP_CFG80211(cfg80211_wext)) { - struct station_info sinfo = { 0 }; + struct station_info sinfo = {0}; t_u8 addr[ETH_ALEN]; sinfo.filled = 0; @@ -2475,11 +2440,11 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) memset(addr, 0xFF, ETH_ALEN); moal_memcpy_ext(priv->phandle, addr, pmevent->event_buf, ETH_ALEN, ETH_ALEN); - /** these field add in kernel 3.2, but some - * kernel do have the pacth to support it, - * like T3T and pxa978T 3.0.31 JB, these - * patch are needed to support - * wpa_supplicant 2.x */ + /** these field add in kernel 3.2, but some + * kernel do have the pacth to support it, + * like T3T and pxa978T 3.0.31 JB, these + * patch are needed to support + * wpa_supplicant 2.x */ #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 0, 31) if (pmevent->event_len > ETH_ALEN) { #if CFG80211_VERSION_CODE < KERNEL_VERSION(4, 0, 0) @@ -2495,17 +2460,16 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) ETH_ALEN); sinfo.assoc_req_ies_len = pmevent->event_len - ETH_ALEN; - } #endif /* KERNEL_VERSION */ if (priv->netdev && priv->wdev) - cfg80211_new_sta(priv->netdev, - (t_u8 *)addr, &sinfo, - GFP_KERNEL); + cfg80211_new_sta(priv->netdev, (t_u8 *)addr, + &sinfo, GFP_KERNEL); } #endif /* UAP_CFG80211 */ memmove((pmevent->event_buf + strlen(CUS_EVT_STA_CONNECTED) + - 1), pmevent->event_buf, pmevent->event_len); + 1), + pmevent->event_buf, pmevent->event_len); moal_memcpy_ext(priv->phandle, pmevent->event_buf, (t_u8 *)CUS_EVT_STA_CONNECTED, strlen(CUS_EVT_STA_CONNECTED), @@ -2513,7 +2477,7 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) pmevent->event_buf[strlen(CUS_EVT_STA_CONNECTED)] = 0; woal_broadcast_event(priv, pmevent->event_buf, pmevent->event_len + - strlen(CUS_EVT_STA_CONNECTED)); + strlen(CUS_EVT_STA_CONNECTED)); #ifdef UAP_WEXT if (IS_UAP_WEXT(cfg80211_wext)) { memset(&wrqu, 0, sizeof(union iwreq_data)); @@ -2537,22 +2501,20 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) if (IS_UAP_CFG80211(cfg80211_wext)) { #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) - /**Forward Deauth, Auth and disassoc frame to Host*/ + /**Forward Deauth, Auth and disassoc frame to Host*/ if (moal_extflg_isset(priv->phandle, EXT_HOST_MLME)) { - t_u16 reason_code = - woal_le16_to_cpu(*(t_u16 *)pmevent-> - event_buf); + t_u16 reason_code = woal_le16_to_cpu( + *(t_u16 *)pmevent->event_buf); PRINTM(MCMND, "deauth reason code =0x%x\n", reason_code); - /** BIT 14 indicate deauth is initiated by FW */ + /** BIT 14 indicate deauth is initiated by FW */ if (reason_code & MBIT(14)) - woal_host_mlme_disconnect(priv, 0, - pmevent-> - event_buf + - 2); + woal_host_mlme_disconnect( + priv, 0, + pmevent->event_buf + 2); } else #endif - if (priv->netdev && priv->wdev) + if (priv->netdev && priv->wdev) cfg80211_del_sta(priv->netdev, pmevent->event_buf + 2, GFP_KERNEL); @@ -2561,7 +2523,8 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) } #endif /* UAP_CFG80211 */ memmove((pmevent->event_buf + strlen(CUS_EVT_STA_DISCONNECTED) + - 1), pmevent->event_buf, pmevent->event_len); + 1), + pmevent->event_buf, pmevent->event_len); moal_memcpy_ext(priv->phandle, pmevent->event_buf, (t_u8 *)CUS_EVT_STA_DISCONNECTED, strlen(CUS_EVT_STA_DISCONNECTED), @@ -2569,15 +2532,14 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) pmevent->event_buf[strlen(CUS_EVT_STA_DISCONNECTED)] = 0; woal_broadcast_event(priv, pmevent->event_buf, pmevent->event_len + - strlen(CUS_EVT_STA_DISCONNECTED)); + strlen(CUS_EVT_STA_DISCONNECTED)); #ifdef UAP_WEXT if (IS_UAP_WEXT(cfg80211_wext)) { memset(&wrqu, 0, sizeof(union iwreq_data)); wrqu.data.pointer = pmevent->event_buf; - wrqu.data.length = - pmevent->event_len + - strlen(CUS_EVT_STA_DISCONNECTED) + 1; + wrqu.data.length = pmevent->event_len + + strlen(CUS_EVT_STA_DISCONNECTED) + 1; wireless_send_event(priv->netdev, IWEVCUSTOM, &wrqu, pmevent->event_buf); } @@ -2594,17 +2556,17 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) #if defined(STA_CFG80211) || defined(UAP_CFG80211) if (IS_STA_OR_UAP_CFG80211(cfg80211_wext)) { #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) - if (priv->netdev - && priv->netdev->ieee80211_ptr->wiphy->mgmt_stypes - && priv->mgmt_subtype_mask) { - /* frmctl + durationid + addr1 + addr2 + addr3 + seqctl */ -#define PACKET_ADDR4_POS (2 + 2 + 6 + 6 + 6 + 2) + if (priv->netdev && + priv->netdev->ieee80211_ptr->wiphy->mgmt_stypes && + priv->mgmt_subtype_mask) { + /* frmctl + durationid + addr1 + addr2 + addr3 + + * seqctl */ +#define PACKET_ADDR4_POS (2 + 2 + 6 + 6 + 6 + 2) t_u8 *pkt; int freq = - priv->phandle-> - remain_on_channel ? priv->phandle->chan. - center_freq : - woal_get_active_intf_freq(priv); + priv->phandle->remain_on_channel ? + priv->phandle->chan.center_freq : + woal_get_active_intf_freq(priv); if (!freq) { if (!priv->phandle->chan.center_freq) { PRINTM(MINFO, @@ -2614,79 +2576,70 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) freq = priv->phandle->chan.center_freq; } - pkt = ((t_u8 *)pmevent->event_buf - + sizeof(pmevent->event_id)); + pkt = ((t_u8 *)pmevent->event_buf + + sizeof(pmevent->event_id)); /* move addr4 */ memmove(pkt + PACKET_ADDR4_POS, pkt + PACKET_ADDR4_POS + ETH_ALEN, pmevent->event_len - - sizeof(pmevent->event_id) - - PACKET_ADDR4_POS - ETH_ALEN); + sizeof(pmevent->event_id) - + PACKET_ADDR4_POS - ETH_ALEN); #ifdef WIFI_DIRECT_SUPPORT - if (ieee80211_is_action - (((struct ieee80211_mgmt *)pkt)-> - frame_control)) - woal_cfg80211_display_p2p_actframe(pkt, - pmevent-> - event_len - - - sizeof - (pmevent-> - event_id) - - - MLAN_MAC_ADDR_LENGTH, - ieee80211_get_channel - (priv-> - wdev-> - wiphy, - freq), - MFALSE); + if (ieee80211_is_action( + ((struct ieee80211_mgmt *)pkt) + ->frame_control)) + woal_cfg80211_display_p2p_actframe( + pkt, + pmevent->event_len - + sizeof(pmevent->event_id) - + MLAN_MAC_ADDR_LENGTH, + ieee80211_get_channel( + priv->wdev->wiphy, + freq), + MFALSE); #endif #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) - /**Forward Deauth, Auth and disassoc frame to Host*/ + /**Forward Deauth, Auth and disassoc frame to + * Host*/ if (priv->host_mlme && (GET_BSS_ROLE(priv) != MLAN_BSS_ROLE_UAP) && - (ieee80211_is_deauth - (((struct ieee80211_mgmt *)pkt)-> - frame_control) - || - ieee80211_is_auth(((struct ieee80211_mgmt - *)pkt)->frame_control) - || - ieee80211_is_disassoc(((struct - ieee80211_mgmt *) - pkt)-> - frame_control))) { - - if (ieee80211_is_auth - (((struct ieee80211_mgmt *)pkt)-> - frame_control)) { - if (priv-> - auth_flag & + (ieee80211_is_deauth( + ((struct ieee80211_mgmt *)pkt) + ->frame_control) || + ieee80211_is_auth( + ((struct ieee80211_mgmt *)pkt) + ->frame_control) || + ieee80211_is_disassoc( + ((struct ieee80211_mgmt *)pkt) + ->frame_control))) { + if (ieee80211_is_auth( + ((struct ieee80211_mgmt *) + pkt) + ->frame_control)) { + if (priv->auth_flag & HOST_MLME_AUTH_PENDING) { PRINTM(MEVENT, "HostMlme %s: Receive auth\n", - priv->netdev-> - name); + priv->netdev + ->name); priv->auth_flag &= ~HOST_MLME_AUTH_PENDING; priv->auth_flag |= HOST_MLME_AUTH_DONE; - priv->phandle-> - host_mlme_priv = + priv->phandle + ->host_mlme_priv = priv; - queue_work(priv-> - phandle-> - evt_workqueue, - &priv-> - phandle-> - host_mlme_work); + queue_work( + priv->phandle + ->evt_workqueue, + &priv->phandle + ->host_mlme_work); } else { PRINTM(MERROR, "HostMlme %s: Drop auth pkt,auth_flag=0x%x\n", - priv->netdev-> - name, + priv->netdev + ->name, priv->auth_flag); break; } @@ -2694,12 +2647,14 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) PRINTM(MEVENT, "HostMlme %s: Receive deauth/disassociate\n", priv->netdev->name); - woal_mgmt_frame_register(priv, - IEEE80211_STYPE_DEAUTH, - MFALSE); - woal_mgmt_frame_register(priv, - IEEE80211_STYPE_DISASSOC, - MFALSE); + woal_mgmt_frame_register( + priv, + IEEE80211_STYPE_DEAUTH, + MFALSE); + woal_mgmt_frame_register( + priv, + IEEE80211_STYPE_DISASSOC, + MFALSE); priv->host_mlme = MFALSE; priv->auth_flag = 0; if (!priv->wdev->current_bss) { @@ -2710,57 +2665,40 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) } #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) mutex_lock(&priv->wdev->mtx); - cfg80211_rx_mlme_mgmt(priv->netdev, - pkt, - pmevent-> - event_len - - sizeof(pmevent-> - event_id) - - - MLAN_MAC_ADDR_LENGTH); + cfg80211_rx_mlme_mgmt( + priv->netdev, pkt, + pmevent->event_len - + sizeof(pmevent->event_id) - + MLAN_MAC_ADDR_LENGTH); mutex_unlock(&priv->wdev->mtx); #else - if (ieee80211_is_deauth - (((struct ieee80211_mgmt *)pkt)-> - frame_control)) - cfg80211_send_deauth(priv-> - netdev, - pkt, - pmevent-> - event_len - - sizeof - (pmevent-> - event_id) - - - MLAN_MAC_ADDR_LENGTH); - else if (ieee80211_is_auth - (((struct ieee80211_mgmt *) - pkt)->frame_control)) - cfg80211_send_rx_auth(priv-> - netdev, - pkt, - pmevent-> - event_len - - - sizeof - (pmevent-> - event_id) - - - MLAN_MAC_ADDR_LENGTH); - else if (ieee80211_is_disassoc - (((struct ieee80211_mgmt *) - pkt)->frame_control)) - cfg80211_send_disassoc(priv-> - netdev, - pkt, - pmevent-> - event_len - - - sizeof - (pmevent-> - event_id) - - - MLAN_MAC_ADDR_LENGTH); + if (ieee80211_is_deauth( + ((struct ieee80211_mgmt *) + pkt) + ->frame_control)) + cfg80211_send_deauth( + priv->netdev, pkt, + pmevent->event_len - + sizeof(pmevent->event_id) - + MLAN_MAC_ADDR_LENGTH); + else if (ieee80211_is_auth( + ((struct ieee80211_mgmt + *)pkt) + ->frame_control)) + cfg80211_send_rx_auth( + priv->netdev, pkt, + pmevent->event_len - + sizeof(pmevent->event_id) - + MLAN_MAC_ADDR_LENGTH); + else if (ieee80211_is_disassoc( + ((struct ieee80211_mgmt + *)pkt) + ->frame_control)) + cfg80211_send_disassoc( + priv->netdev, pkt, + pmevent->event_len - + sizeof(pmevent->event_id) - + MLAN_MAC_ADDR_LENGTH); #endif } else @@ -2768,54 +2706,46 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) cfg80211_rx_mgmt( #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) - priv->wdev, + priv->wdev, #else - priv->netdev, + priv->netdev, #endif - freq, 0, - ((const t_u8 *) - pmevent-> - event_buf) + - sizeof(pmevent-> - event_id), - pmevent-> - event_len - - sizeof(pmevent-> - event_id) - - - MLAN_MAC_ADDR_LENGTH + freq, 0, + ((const t_u8 *) + pmevent->event_buf) + + sizeof(pmevent->event_id), + pmevent->event_len - + sizeof(pmevent->event_id) - + MLAN_MAC_ADDR_LENGTH #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) - , 0 + , + 0 #endif #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 18, 0) - , GFP_ATOMIC + , + GFP_ATOMIC #endif - ); + ); #else - cfg80211_rx_mgmt(priv->netdev, freq, - ((const t_u8 *) - pmevent->event_buf) + - sizeof(pmevent-> - event_id), - pmevent->event_len - - sizeof(pmevent-> - event_id) - - MLAN_MAC_ADDR_LENGTH, - GFP_ATOMIC); + cfg80211_rx_mgmt( + priv->netdev, freq, + ((const t_u8 *)pmevent->event_buf) + + sizeof(pmevent->event_id), + pmevent->event_len - + sizeof(pmevent->event_id) - + MLAN_MAC_ADDR_LENGTH, + GFP_ATOMIC); #endif #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) - woal_packet_fate_monitor(priv, PACKET_TYPE_RX, - RX_PKT_FATE_SUCCESS, - FRAME_TYPE_80211_MGMT, - 0, 0, - ((t_u8 *)pmevent-> - event_buf) + - sizeof(pmevent-> - event_id), - pmevent->event_len - - sizeof(pmevent-> - event_id) - - MLAN_MAC_ADDR_LENGTH); + woal_packet_fate_monitor( + priv, PACKET_TYPE_RX, + RX_PKT_FATE_SUCCESS, + FRAME_TYPE_80211_MGMT, 0, 0, + ((t_u8 *)pmevent->event_buf) + + sizeof(pmevent->event_id), + pmevent->event_len - + sizeof(pmevent->event_id) - + MLAN_MAC_ADDR_LENGTH); #endif } #endif /* KERNEL_VERSION */ @@ -2841,15 +2771,16 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) } break; case MLAN_EVENT_ID_DRV_MEAS_REPORT: - /* We have received measurement report, wakeup measurement wait queue */ + /* We have received measurement report, wakeup measurement wait + * queue */ PRINTM(MINFO, "Measurement Report\n"); /* Going out of CAC checking period */ if (priv->phandle->cac_period == MTRUE) { priv->phandle->cac_period = MFALSE; if (priv->phandle->meas_wait_q_woken == MFALSE) { priv->phandle->meas_wait_q_woken = MTRUE; - wake_up_interruptible(&priv->phandle-> - meas_wait_q); + wake_up_interruptible( + &priv->phandle->meas_wait_q); } /* Execute delayed BSS START command */ @@ -2863,8 +2794,8 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) PRINTM(MMSG, "Now CAC measure period end. Execute delayed BSS Start command.\n"); - req = woal_alloc_mlan_ioctl_req(sizeof - (mlan_ds_bss)); + req = woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_bss)); if (!req) { PRINTM(MERROR, "Failed to allocate ioctl request buffer\n"); @@ -2874,15 +2805,15 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) req->req_id = MLAN_IOCTL_BSS; req->action = MLAN_ACT_SET; bss->sub_command = MLAN_OID_BSS_START; - moal_memcpy_ext(priv->phandle, - &bss->param.ssid_bssid, - &priv->phandle-> - delay_ssid_bssid, - sizeof(mlan_ssid_bssid), - sizeof(mlan_ssid_bssid)); + moal_memcpy_ext( + priv->phandle, &bss->param.ssid_bssid, + &priv->phandle->delay_ssid_bssid, + sizeof(mlan_ssid_bssid), + sizeof(mlan_ssid_bssid)); - if (woal_request_ioctl(priv, req, MOAL_NO_WAIT) - != MLAN_STATUS_PENDING) { + if (woal_request_ioctl(priv, req, + MOAL_NO_WAIT) != + MLAN_STATUS_PENDING) { PRINTM(MERROR, "Delayed BSS Start operation failed!\n"); kfree(req); @@ -2895,99 +2826,84 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) if (priv->uap_host_based && moal_extflg_isset(priv->phandle, EXT_DFS_OFFLOAD)) - woal_cfg80211_dfs_vendor_event(priv, - event_dfs_cac_finished, - &priv->chan); + woal_cfg80211_dfs_vendor_event( + priv, event_dfs_cac_finished, + &priv->chan); #endif #endif #endif - } break; - case MLAN_EVENT_ID_FW_TX_STATUS: - { + case MLAN_EVENT_ID_FW_TX_STATUS: { #if defined(STA_CFG80211) || defined(UAP_CFG80211) - unsigned long flag; - tx_status_event *tx_status = - (tx_status_event *)(pmevent->event_buf + 4); - struct tx_status_info *tx_info = NULL; - PRINTM(MINFO, - "Receive Tx status: tx_token=%d, pkt_type=0x%x, status=%d tx_seq_num=%d\n", - tx_status->tx_token_id, tx_status->packet_type, - tx_status->status, priv->tx_seq_num); - spin_lock_irqsave(&priv->tx_stat_lock, flag); - tx_info = - woal_get_tx_info(priv, tx_status->tx_token_id); - if (tx_info) { - bool ack; - struct sk_buff *skb = - (struct sk_buff *)tx_info->tx_skb; - list_del(&tx_info->link); - spin_unlock_irqrestore(&priv->tx_stat_lock, - flag); - if (!tx_status->status) - ack = true; - else - ack = false; + unsigned long flag; + tx_status_event *tx_status = + (tx_status_event *)(pmevent->event_buf + 4); + struct tx_status_info *tx_info = NULL; + PRINTM(MINFO, + "Receive Tx status: tx_token=%d, pkt_type=0x%x, status=%d tx_seq_num=%d\n", + tx_status->tx_token_id, tx_status->packet_type, + tx_status->status, priv->tx_seq_num); + spin_lock_irqsave(&priv->tx_stat_lock, flag); + tx_info = woal_get_tx_info(priv, tx_status->tx_token_id); + if (tx_info) { + bool ack; + struct sk_buff *skb = (struct sk_buff *)tx_info->tx_skb; + list_del(&tx_info->link); + spin_unlock_irqrestore(&priv->tx_stat_lock, flag); + if (!tx_status->status) + ack = true; + else + ack = false; #if defined(STA_CFG80211) || defined(UAP_CFG80211) - if (priv->phandle->remain_on_channel && - tx_info->cancel_remain_on_channel) { - remain_priv = - priv->phandle->priv[priv-> - phandle-> - remain_bss_index]; - if (remain_priv) { - woal_cfg80211_remain_on_channel_cfg - (remain_priv, - MOAL_NO_WAIT, MTRUE, - &channel_status, NULL, - 0, 0); - priv->phandle-> - remain_on_channel = - MFALSE; - } + if (priv->phandle->remain_on_channel && + tx_info->cancel_remain_on_channel) { + remain_priv = + priv->phandle->priv + [priv->phandle->remain_bss_index]; + if (remain_priv) { + woal_cfg80211_remain_on_channel_cfg( + remain_priv, MOAL_NO_WAIT, + MTRUE, &channel_status, NULL, 0, + 0); + priv->phandle->remain_on_channel = + MFALSE; } + } #endif - PRINTM(MEVENT, "Wlan: Tx status=%d\n", ack); + PRINTM(MEVENT, "Wlan: Tx status=%d\n", ack); #if defined(STA_CFG80211) || defined(UAP_CFG80211) - if (tx_info->tx_cookie) { + if (tx_info->tx_cookie) { #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 6, 0) - cfg80211_mgmt_tx_status(priv->netdev, - tx_info-> - tx_cookie, - skb->data, - skb->len, ack, - GFP_ATOMIC); + cfg80211_mgmt_tx_status(priv->netdev, + tx_info->tx_cookie, + skb->data, skb->len, + ack, GFP_ATOMIC); #else - cfg80211_mgmt_tx_status(priv->wdev, - tx_info-> - tx_cookie, - skb->data, - skb->len, ack, - GFP_ATOMIC); + cfg80211_mgmt_tx_status(priv->wdev, + tx_info->tx_cookie, + skb->data, skb->len, + ack, GFP_ATOMIC); #endif #endif - } + } #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) - woal_packet_fate_monitor(priv, PACKET_TYPE_TX, - ack ? TX_PKT_FATE_ACKED - : TX_PKT_FATE_SENT, - FRAME_TYPE_80211_MGMT, - 0, 0, skb->data, - skb->len); + woal_packet_fate_monitor(priv, PACKET_TYPE_TX, + ack ? TX_PKT_FATE_ACKED : + TX_PKT_FATE_SENT, + FRAME_TYPE_80211_MGMT, 0, 0, + skb->data, skb->len); #endif #endif - dev_kfree_skb_any(skb); - kfree(tx_info); - } else - spin_unlock_irqrestore(&priv->tx_stat_lock, - flag); + dev_kfree_skb_any(skb); + kfree(tx_info); + } else + spin_unlock_irqrestore(&priv->tx_stat_lock, flag); #endif - } - break; + } break; case MLAN_EVENT_ID_DRV_FT_RESPONSE: -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,10,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) #ifdef STA_CFG80211 if (IS_STA_CFG80211(cfg80211_wext)) { struct cfg80211_ft_event_params ft_event; @@ -3005,9 +2921,11 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) ft_event.target_ap = priv->target_ap_bssid; ft_event.ies = pmevent->event_buf + ETH_ALEN; ft_event.ies_len = pmevent->event_len - ETH_ALEN; - /*TSPEC info is needed by RIC, However the TS operation is configured by mlanutl */ - /*So do not add RIC temporally */ - /*when add RIC, 1. query TS status, 2. copy tspec from addts command */ + /*TSPEC info is needed by RIC, However the TS operation + * is configured by mlanutl*/ + /*So do not add RIC temporally*/ + /*when add RIC, 1. query TS status, 2. copy tspec from + * addts command*/ ft_event.ric_ies = NULL; ft_event.ric_ies_len = 0; @@ -3019,7 +2937,6 @@ moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent) priv->ft_wait_condition = MTRUE; wake_up(&priv->ft_wait_q); } - } #endif #endif @@ -3041,10 +2958,10 @@ done: * * @return N/A */ -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...) { -#ifdef DEBUG_LEVEL1 +#ifdef DEBUG_LEVEL1 va_list args; if (level & MHEX_DUMP) { @@ -3094,15 +3011,16 @@ moal_print(IN t_void *pmoal_handle, IN t_u32 level, IN char *pformat, IN ...) * * @return N/A */ -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) { #ifdef DEBUG_LEVEL1 moal_handle *phandle = (moal_handle *)pmoal_handle; if (phandle) { - if ((bss_index < MLAN_MAX_BSS_NUM) && phandle->priv[bss_index] - && phandle->priv[bss_index]->netdev) { + if ((bss_index < MLAN_MAX_BSS_NUM) && + phandle->priv[bss_index] && + phandle->priv[bss_index]->netdev) { if (drvdbg & level) printk("%s: ", phandle->priv[bss_index]->netdev->name); @@ -3119,8 +3037,7 @@ moal_print_netintf(IN t_void *pmoal_handle, IN t_u32 bss_index, IN t_u32 level) * * @return N/A */ -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) { if (!cond) { panic("Assert failed: Panic!"); @@ -3139,9 +3056,9 @@ moal_assert(IN t_void *pmoal_handle, IN t_u32 cond) * * @return N/A */ -t_void -moal_hist_data_add(IN t_void *pmoal_handle, IN t_u32 bss_index, - IN t_u16 rx_rate, IN t_s8 snr, IN t_s8 nflr, IN t_u8 antenna) +t_void moal_hist_data_add(IN t_void *pmoal_handle, IN t_u32 bss_index, + IN t_u16 rx_rate, IN t_s8 snr, IN t_s8 nflr, + IN t_u8 antenna) { moal_private *priv = NULL; priv = woal_bss_index_to_priv(pmoal_handle, bss_index); @@ -3162,8 +3079,7 @@ moal_hist_data_add(IN t_void *pmoal_handle, IN t_u32 bss_index, * @param base divisor * @return returns 64-bit quotient */ -t_u64 -moal_do_div(IN t_u64 num, IN t_u32 base) +t_u64 moal_do_div(IN t_u64 num, IN t_u32 base) { t_u64 val = num; do_div(val, base); @@ -3178,8 +3094,8 @@ moal_do_div(IN t_u64 num, IN t_u32 base) * @param bss_index index of priv * @return MLAN_STATUS_SUCCESS */ -mlan_status -moal_wait_hostcmd_complete(IN t_void *pmoal_handle, IN t_u32 bss_index) +mlan_status moal_wait_hostcmd_complete(IN t_void *pmoal_handle, + IN t_u32 bss_index) { mlan_status status = MLAN_STATUS_SUCCESS; moal_handle *handle = (moal_handle *)pmoal_handle; @@ -3194,10 +3110,9 @@ moal_wait_hostcmd_complete(IN t_void *pmoal_handle, IN t_u32 bss_index) } priv->hostcmd_wait_condition = MFALSE; - time_left = - wait_event_timeout(priv->hostcmd_wait_q, - priv->hostcmd_wait_condition, - MOAL_IOCTL_TIMEOUT); + time_left = wait_event_timeout(priv->hostcmd_wait_q, + priv->hostcmd_wait_condition, + MOAL_IOCTL_TIMEOUT); if (!time_left) { PRINTM(MERROR, "moal_wait_event: wait timeout "); @@ -3216,8 +3131,8 @@ done: * @param bss_index index of priv * @return MLAN_STATUS_SUCCESS */ -mlan_status -moal_notify_hostcmd_complete(IN t_void *pmoal_handle, IN t_u32 bss_index) +mlan_status moal_notify_hostcmd_complete(IN t_void *pmoal_handle, + IN t_u32 bss_index) { mlan_status status = MLAN_STATUS_SUCCESS; moal_handle *handle = (moal_handle *)pmoal_handle; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_shim.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_shim.h index 5cc1164dde80..c22cbd61c403 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_shim.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_shim.h @@ -1,40 +1,40 @@ /** @file moal_shim.h - * - * @brief This file contains declaration referring to - * functions defined in moal module - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains declaration referring to + * functions defined in moal module + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /************************************************************* -Change Log: - 10/21/2008: initial version -************************************************************/ + * Change Log: + * 10/21/2008: initial version + ************************************************************/ #ifndef _MOAL_H #define _MOAL_H -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_vdll_data(IN t_void *pmoal_handle, - 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); +mlan_status moal_get_vdll_data(IN t_void *pmoal_handle, IN t_u32 len, + OUT t_u8 *pbuf); mlan_status moal_get_hw_spec_complete(IN t_void *pmoal_handle, IN mlan_status status, - IN mlan_hw_info * phw, + IN mlan_hw_info *phw, IN pmlan_bss_tbl ptbl); mlan_status moal_init_fw_complete(IN t_void *pmoal_handle, IN mlan_status status); @@ -51,8 +51,7 @@ mlan_status moal_send_packet_complete(IN t_void *pmoal_handle, IN pmlan_buffer pmbuf, IN mlan_status status); #ifdef USB -mlan_status moal_recv_complete(IN t_void *pmoal_handle, - IN pmlan_buffer pmbuf, +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_write_data_async(IN t_void *pmoal_handle, IN pmlan_buffer pmbuf, IN t_u32 port); @@ -60,53 +59,47 @@ mlan_status moal_write_data_async(IN t_void *pmoal_handle, #if defined(SDIO) || defined(PCIE) /** 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); #endif /* SDIO || PCIE */ -mlan_status moal_write_data_sync(IN t_void *pmoal_handle, - IN pmlan_buffer pmbuf, +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_read_data_sync(IN t_void *pmoal_handle, - IN OUT pmlan_buffer pmbuf, - IN t_u32 port, IN t_u32 timeout); + IN OUT pmlan_buffer pmbuf, IN t_u32 port, + IN t_u32 timeout); mlan_status moal_recv_packet(IN t_void *pmoal_handle, IN pmlan_buffer pmbuf); mlan_status moal_recv_event(IN t_void *pmoal_handle, IN pmlan_event pmevent); -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); mlan_status moal_mfree(IN t_void *pmoal_handle, IN t_u8 *pbuf); -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); mlan_status moal_vfree(IN t_void *pmoal_handle, IN t_u8 *pbuf); #ifdef PCIE -mlan_status moal_malloc_consistent(IN t_void *pmoal_handle, - IN t_u32 size, +mlan_status moal_malloc_consistent(IN t_void *pmoal_handle, IN t_u32 size, OUT t_u8 **ppbuf, OUT t_u64 *pbuf_pa); -mlan_status moal_mfree_consistent(IN t_void *pmoal_handle, - IN t_u32 size, +mlan_status moal_mfree_consistent(IN t_void *pmoal_handle, IN t_u32 size, IN t_u8 *pbuf, IN t_u64 buf_pa); -mlan_status moal_map_memory(IN t_void *pmoal_handle, - IN t_u8 *pbuf, +mlan_status moal_map_memory(IN t_void *pmoal_handle, IN t_u8 *pbuf, OUT t_u64 *pbuf_pa, IN t_u32 size, IN t_u32 flag); -mlan_status moal_unmap_memory(IN t_void *pmoal_handle, - IN t_u8 *pbuf, +mlan_status moal_unmap_memory(IN t_void *pmoal_handle, IN t_u8 *pbuf, IN t_u64 buf_pa, IN t_u32 size, IN t_u32 flag); #endif /* PCIE */ -t_void *moal_memset(IN t_void *pmoal_handle, - IN t_void *pmem, IN t_u8 byte, 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); -t_void *moal_memcpy_ext(IN t_void *pmoal_handle, - IN t_void *pdest, - IN const t_void *psrc, - IN t_u32 num, IN t_u32 dest_size); +t_void *moal_memset(IN t_void *pmoal_handle, IN t_void *pmem, IN t_u8 byte, + 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); +t_void *moal_memcpy_ext(IN t_void *pmoal_handle, IN t_void *pdest, + IN const t_void *psrc, IN t_u32 num, + IN t_u32 dest_size); -t_void *moal_memmove(IN t_void *pmoal_handle, - IN t_void *pdest, IN const t_void *psrc, 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); +t_void *moal_memmove(IN t_void *pmoal_handle, IN t_void *pdest, + IN const t_void *psrc, 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); mlan_status moal_get_boot_ktime(IN t_void *pmoal_handle, OUT t_u64 *pnsec); @@ -123,7 +116,7 @@ mlan_status moal_notify_hostcmd_complete(IN t_void *pmoal_handle, IN t_u32 bss_index); #endif t_void moal_print(IN t_void *pmoal_handle, IN t_u32 level, IN char *pformat, - IN ...); + IN...); t_void moal_print_netintf(IN t_void *pmoal_handle, IN t_u32 bss_index, IN t_u32 level); t_void moal_assert(IN t_void *pmoal_handle, IN t_u32 cond); @@ -133,13 +126,11 @@ t_void moal_hist_data_add(IN t_void *pmoal_handle, IN t_u32 bss_index, t_u64 moal_do_div(IN t_u64 num, IN t_u32 base); -mlan_status moal_init_timer(IN t_void *pmoal_handle, - OUT t_void **pptimer, - IN t_void (*callback) (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); mlan_status moal_free_timer(IN t_void *pmoal_handle, IN t_void *ptimer); -mlan_status moal_start_timer(IN t_void *pmoal_handle, - IN t_void *ptimer, +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_stop_timer(IN t_void *pmoal_handle, IN t_void *ptimer); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c index 07114540ca0d..840196ac3cb8 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.c @@ -1,52 +1,49 @@ /** @file moal_sta_cfg80211.c - * - * @brief This file contains the functions for STA CFG80211. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains the functions for STA CFG80211. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ #include "moal_cfg80211.h" #include "moal_cfg80211_util.h" #include "moal_sta_cfg80211.h" #include "moal_eth_ioctl.h" #ifdef UAP_SUPPORT -#include "moal_uap.h" +#include "moal_uap.h" #endif #include /* Supported crypto cipher suits to be advertised to cfg80211 */ const u32 cfg80211_cipher_suites[] = { - WLAN_CIPHER_SUITE_WEP40, - WLAN_CIPHER_SUITE_WEP104, - WLAN_CIPHER_SUITE_TKIP, - WLAN_CIPHER_SUITE_CCMP, - WLAN_CIPHER_SUITE_SMS4, - WLAN_CIPHER_SUITE_AES_CMAC, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4,0,0) + WLAN_CIPHER_SUITE_WEP40, WLAN_CIPHER_SUITE_WEP104, + WLAN_CIPHER_SUITE_TKIP, WLAN_CIPHER_SUITE_CCMP, + WLAN_CIPHER_SUITE_SMS4, WLAN_CIPHER_SUITE_AES_CMAC, +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) WLAN_CIPHER_SUITE_BIP_GMAC_256, #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,6,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) WLAN_CIPHER_SUITE_GCMP, #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4,0,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) WLAN_CIPHER_SUITE_GCMP_256, #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4,0,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) WLAN_CIPHER_SUITE_CCMP_256, #endif }; @@ -56,7 +53,6 @@ static void #else static int #endif - woal_cfg80211_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request); @@ -67,15 +63,15 @@ static int woal_cfg80211_scan(struct wiphy *wiphy, static int woal_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_scan_request *request); #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4,5,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) static void woal_cfg80211_abort_scan(struct wiphy *wiphy, struct wireless_dev *wdev); #endif static int woal_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_connect_params *sme); -static int woal_cfg80211_disconnect(struct wiphy *wiphy, - struct net_device *dev, t_u16 reason_code); +static int woal_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, + t_u16 reason_code); static int woal_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, @@ -135,18 +131,18 @@ static int woal_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy, #endif u64 cookie); -static int woal_cfg80211_remain_on_channel(struct wiphy *wiphy, +static int +woal_cfg80211_remain_on_channel(struct wiphy *wiphy, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) - struct wireless_dev *wdev, + struct wireless_dev *wdev, #else - struct net_device *dev, + struct net_device *dev, #endif - struct ieee80211_channel *chan, + struct ieee80211_channel *chan, #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - enum nl80211_channel_type - channel_type, + enum nl80211_channel_type channel_type, #endif - unsigned int duration, u64 * cookie); + unsigned int duration, u64 *cookie); static int woal_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) @@ -167,14 +163,14 @@ static int woal_testmode_cmd(struct wiphy *wiphy, void *data, int len); #endif #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) -int woal_cfg80211_sched_scan_start(struct wiphy *wiphy, - struct net_device *dev, +int woal_cfg80211_sched_scan_start(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_sched_scan_request *request); int woal_cfg80211_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - , u64 reqid + , + u64 reqid #endif - ); +); #endif #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) @@ -185,17 +181,17 @@ int woal_cfg80211_suspend(struct wiphy *wiphy, struct cfg80211_wowlan *wow); static void woal_cfg80211_set_wakeup(struct wiphy *wiphy, bool enabled); #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,2,0) -static int - woal_cfg80211_change_station(struct wiphy *wiphy, struct net_device *dev, +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) +static int woal_cfg80211_change_station(struct wiphy *wiphy, + struct net_device *dev, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) - const u8 *mac, + const u8 *mac, #else - u8 *mac, + u8 *mac, #endif - struct station_parameters *params); + struct station_parameters *params); #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,10,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) int woal_cfg80211_update_ft_ies(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_update_ft_ies_params *ftie); #endif @@ -204,8 +200,7 @@ static int woal_cfg80211_authenticate(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_auth_request *req); -static int woal_cfg80211_associate(struct wiphy *wiphy, - struct net_device *dev, +static int woal_cfg80211_associate(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_assoc_request *req); #ifdef UAP_SUPPORT int woal_cfg80211_uap_add_station(struct wiphy *wiphy, struct net_device *dev, @@ -213,15 +208,17 @@ int woal_cfg80211_uap_add_station(struct wiphy *wiphy, struct net_device *dev, #endif #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,2,0) -static int - woal_cfg80211_add_station(struct wiphy *wiphy, struct net_device *dev, +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) +#ifdef UAP_SUPPORT +static int woal_cfg80211_add_station(struct wiphy *wiphy, + struct net_device *dev, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) - const u8 *mac, + const u8 *mac, #else - u8 *mac, + u8 *mac, +#endif + struct station_parameters *params); #endif - struct station_parameters *params); #endif static int woal_cfg80211_deauthenticate(struct wiphy *wiphy, @@ -236,7 +233,7 @@ static int woal_cfg80211_disassociate(struct wiphy *wiphy, static struct cfg80211_ops woal_cfg80211_ops = { .change_virtual_intf = woal_cfg80211_change_virtual_intf, .scan = woal_cfg80211_scan, -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4,5,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) .abort_scan = woal_cfg80211_abort_scan, #endif .connect = woal_cfg80211_connect, @@ -289,13 +286,13 @@ static struct cfg80211_ops woal_cfg80211_ops = { #if CFG80211_VERSION_CODE > KERNEL_VERSION(2, 6, 35) .set_cqm_rssi_config = woal_cfg80211_set_cqm_rssi_config, #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,2,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) .change_station = woal_cfg80211_change_station, #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,10,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) .update_ft_ies = woal_cfg80211_update_ft_ies, #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,14,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) .set_qos_map = woal_cfg80211_set_qos_map, #endif #ifdef UAP_CFG80211 @@ -316,7 +313,7 @@ static struct cfg80211_ops woal_cfg80211_ops = { #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) .change_bss = woal_cfg80211_change_bss, #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,2,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) .add_station = woal_cfg80211_add_station, #endif .del_station = woal_cfg80211_del_station, @@ -331,6 +328,7 @@ static struct cfg80211_ops woal_cfg80211_ops = { .channel_switch = woal_cfg80211_channel_switch, #endif +#endif #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) .mgmt_frame_register = woal_cfg80211_mgmt_frame_register, .mgmt_tx = woal_cfg80211_mgmt_tx, @@ -341,7 +339,7 @@ static struct cfg80211_ops woal_cfg80211_ops = { .remain_on_channel = woal_cfg80211_remain_on_channel, .cancel_remain_on_channel = woal_cfg80211_cancel_remain_on_channel, #endif -#endif + #ifdef CONFIG_NL80211_TESTMODE .testmode_cmd = woal_testmode_cmd, #endif @@ -349,7 +347,7 @@ static struct cfg80211_ops woal_cfg80211_ops = { /** Region code mapping */ typedef struct _region_code_t { - /** Region */ + /** Region */ t_u8 region[COUNTRY_CODE_LEN]; } region_code_t; @@ -357,75 +355,76 @@ static const struct ieee80211_regdomain mrvl_regdom = { .n_reg_rules = 4, .alpha2 = "99", .reg_rules = { - /* IEEE 802.11b/g, channels 1..11 */ - REG_RULE(2412 - 10, 2472 + 10, 40, 6, 20, 0), - /* If any */ - /* IEEE 802.11 channel 14 - Only JP enables - * this and for 802.11b only - */ - REG_RULE(2484 - 10, 2484 + 10, 20, 6, 20, 0), - /* IEEE 802.11a, channel 36..64 */ - REG_RULE(5150 - 10, 5350 + 10, 80, 6, 20, 0), - /* IEEE 802.11a, channel 100..165 */ - REG_RULE(5470 - 10, 5850 + 10, 80, 6, 20, 0),} -}; - + /* IEEE 802.11b/g, channels 1..11 */ + REG_RULE(2412 - 10, 2472 + 10, 40, 6, 20, 0), + /* If any */ + /* IEEE 802.11 channel 14 - Only JP enables + * this and for 802.11b only + */ + REG_RULE(2484 - 10, 2484 + 10, 20, 6, 20, 0), + /* IEEE 802.11a, channel 36..64 */ + REG_RULE(5150 - 10, 5350 + 10, 80, 6, 20, 0), + /* IEEE 802.11a, channel 100..165 */ + REG_RULE(5470 - 10, 5850 + 10, 80, 6, 20, 0), + }}; /******************************************************** Local Variables ********************************************************/ #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) +// clang-format off static const struct ieee80211_txrx_stypes - ieee80211_mgmt_stypes[NUM_NL80211_IFTYPES] = { - [NL80211_IFTYPE_STATION] = { - .tx = MBIT(IEEE80211_STYPE_ACTION >> 4) | - MBIT(IEEE80211_STYPE_PROBE_RESP >> 4), - .rx = MBIT(IEEE80211_STYPE_ACTION >> 4) | - MBIT(IEEE80211_STYPE_PROBE_REQ >> 4), - }, - [NL80211_IFTYPE_AP] = { - .tx = 0xffff, - .rx = MBIT(IEEE80211_STYPE_ASSOC_REQ >> 4) | - MBIT(IEEE80211_STYPE_REASSOC_REQ >> 4) | - MBIT(IEEE80211_STYPE_PROBE_REQ >> 4) | - MBIT(IEEE80211_STYPE_DISASSOC >> 4) | - MBIT(IEEE80211_STYPE_AUTH >> 4) | - MBIT(IEEE80211_STYPE_DEAUTH >> 4) | - MBIT(IEEE80211_STYPE_ACTION >> 4), - }, - [NL80211_IFTYPE_AP_VLAN] = { - .tx = 0x0000, - .rx = 0x0000, - }, + ieee80211_mgmt_stypes[NUM_NL80211_IFTYPES] = { + [NL80211_IFTYPE_STATION] = { + .tx = MBIT(IEEE80211_STYPE_ACTION >> 4) | + MBIT(IEEE80211_STYPE_PROBE_RESP >> 4), + .rx = MBIT(IEEE80211_STYPE_ACTION >> 4) | + MBIT(IEEE80211_STYPE_PROBE_REQ >> 4), + }, + [NL80211_IFTYPE_AP] = { + .tx = 0xffff, + .rx = MBIT(IEEE80211_STYPE_ASSOC_REQ >> 4) | + MBIT(IEEE80211_STYPE_REASSOC_REQ >> 4) | + MBIT(IEEE80211_STYPE_PROBE_REQ >> 4) | + MBIT(IEEE80211_STYPE_DISASSOC >> 4) | + MBIT(IEEE80211_STYPE_AUTH >> 4) | + MBIT(IEEE80211_STYPE_DEAUTH >> 4) | + MBIT(IEEE80211_STYPE_ACTION >> 4), + }, + [NL80211_IFTYPE_AP_VLAN] = { + .tx = 0x0000, + .rx = 0x0000, + }, #ifdef WIFI_DIRECT_SUPPORT #if CFG80211_VERSION_CODE >= WIFI_DIRECT_KERNEL_VERSION - [NL80211_IFTYPE_P2P_CLIENT] = { - .tx = MBIT(IEEE80211_STYPE_ACTION >> 4) | - MBIT(IEEE80211_STYPE_PROBE_RESP >> 4), - .rx = MBIT(IEEE80211_STYPE_ACTION >> 4) | - MBIT(IEEE80211_STYPE_PROBE_REQ >> 4), - }, - [NL80211_IFTYPE_P2P_GO] = { - .tx = MBIT(IEEE80211_STYPE_ACTION >> 4) | - MBIT(IEEE80211_STYPE_AUTH >> 4) | - MBIT(IEEE80211_STYPE_ASSOC_RESP >> 4) | - MBIT(IEEE80211_STYPE_REASSOC_RESP >> 4) | - MBIT(IEEE80211_STYPE_PROBE_RESP >> 4), - .rx = MBIT(IEEE80211_STYPE_ASSOC_REQ >> 4) | - MBIT(IEEE80211_STYPE_REASSOC_REQ >> 4) | - MBIT(IEEE80211_STYPE_PROBE_REQ >> 4) | - MBIT(IEEE80211_STYPE_DISASSOC >> 4) | - MBIT(IEEE80211_STYPE_AUTH >> 4) | - MBIT(IEEE80211_STYPE_DEAUTH >> 4) | - MBIT(IEEE80211_STYPE_ACTION >> 4), - }, + [NL80211_IFTYPE_P2P_CLIENT] = { + .tx = MBIT(IEEE80211_STYPE_ACTION >> 4) | + MBIT(IEEE80211_STYPE_PROBE_RESP >> 4), + .rx = MBIT(IEEE80211_STYPE_ACTION >> 4) | + MBIT(IEEE80211_STYPE_PROBE_REQ >> 4), + }, + [NL80211_IFTYPE_P2P_GO] = { + .tx = MBIT(IEEE80211_STYPE_ACTION >> 4) | + MBIT(IEEE80211_STYPE_AUTH >> 4) | + MBIT(IEEE80211_STYPE_ASSOC_RESP >> 4) | + MBIT(IEEE80211_STYPE_REASSOC_RESP >> 4) | + MBIT(IEEE80211_STYPE_PROBE_RESP >> 4), + .rx = MBIT(IEEE80211_STYPE_ASSOC_REQ >> 4) | + MBIT(IEEE80211_STYPE_REASSOC_REQ >> 4) | + MBIT(IEEE80211_STYPE_PROBE_REQ >> 4) | + MBIT(IEEE80211_STYPE_DISASSOC >> 4) | + MBIT(IEEE80211_STYPE_AUTH >> 4) | + MBIT(IEEE80211_STYPE_DEAUTH >> 4) | + MBIT(IEEE80211_STYPE_ACTION >> 4), + }, #endif #endif - [NL80211_IFTYPE_MESH_POINT] = { - .tx = 0x0000, - .rx = 0x0000, - }, + [NL80211_IFTYPE_MESH_POINT] = { + .tx = 0x0000, + .rx = 0x0000, + }, }; +// clang-format on #endif #if CFG80211_VERSION_CODE > KERNEL_VERSION(3, 0, 0) @@ -434,20 +433,18 @@ static const struct ieee80211_txrx_stypes * initial value of wiphy->interface_modes */ static const struct ieee80211_iface_limit cfg80211_ap_sta_limits[] = { - { - .max = 4, + {.max = 4, .types = MBIT(NL80211_IFTYPE_STATION) #ifdef UAP_CFG80211 - | MBIT(NL80211_IFTYPE_AP) + | MBIT(NL80211_IFTYPE_AP) #endif #ifdef WIFI_DIRECT_SUPPORT #if CFG80211_VERSION_CODE >= WIFI_DIRECT_KERNEL_VERSION - | MBIT(NL80211_IFTYPE_P2P_GO) - | MBIT(NL80211_IFTYPE_P2P_CLIENT) + | MBIT(NL80211_IFTYPE_P2P_GO) | + MBIT(NL80211_IFTYPE_P2P_CLIENT) #endif #endif - } -}; + }}; static struct ieee80211_iface_combination cfg80211_iface_comb_ap_sta = { .limits = cfg80211_ap_sta_limits, @@ -456,8 +453,8 @@ static struct ieee80211_iface_combination cfg80211_iface_comb_ap_sta = { .max_interfaces = 4, .beacon_int_infra_match = MTRUE, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) - .radar_detect_widths = MBIT(NL80211_CHAN_WIDTH_20_NOHT) - | MBIT(NL80211_CHAN_WIDTH_20), + .radar_detect_widths = + MBIT(NL80211_CHAN_WIDTH_20_NOHT) | MBIT(NL80211_CHAN_WIDTH_20), #endif }; #endif @@ -473,11 +470,10 @@ static const struct wiphy_wowlan_support wowlan_support = { .pattern_max_len = WOWLAN_MAX_PATTERN_LEN, .max_pkt_offset = WOWLAN_MAX_OFFSET_LEN, }; - static const struct wiphy_wowlan_support wowlan_support_with_gtk = { - .flags = WIPHY_WOWLAN_ANY | WIPHY_WOWLAN_MAGIC_PKT - | WIPHY_WOWLAN_SUPPORTS_GTK_REKEY | - WIPHY_WOWLAN_GTK_REKEY_FAILURE, + .flags = WIPHY_WOWLAN_ANY | WIPHY_WOWLAN_MAGIC_PKT | + WIPHY_WOWLAN_SUPPORTS_GTK_REKEY | + WIPHY_WOWLAN_GTK_REKEY_FAILURE, .n_patterns = MAX_NUM_FILTERS, .pattern_min_len = 1, .pattern_max_len = WOWLAN_MAX_PATTERN_LEN, @@ -512,13 +508,11 @@ static const struct wiphy_coalesce_support coalesce_support = { * * @return MTRUE/MFALSE */ -t_u8 -is_cfg80211_special_region_code(char *region_string) +t_u8 is_cfg80211_special_region_code(char *region_string) { t_u8 i; region_code_t cfg80211_special_region_code[] = { - {"00 "}, {"99 "}, {"98 "}, {"97 "} - }; + {"00 "}, {"99 "}, {"98 "}, {"97 "}}; for (i = 0; i < COUNTRY_CODE_LEN && region_string[i]; i++) region_string[i] = toupper(region_string[i]); @@ -543,8 +537,7 @@ is_cfg80211_special_region_code(char *region_string) * * @return MLAN_ENCRYPTION_MODE_* */ -static int -woal_cfg80211_get_encryption_mode(t_u32 cipher, int *wpa_enabled) +static int woal_cfg80211_get_encryption_mode(t_u32 cipher, int *wpa_enabled) { int encrypt_mode; @@ -569,20 +562,20 @@ woal_cfg80211_get_encryption_mode(t_u32 cipher, int *wpa_enabled) encrypt_mode = MLAN_ENCRYPTION_MODE_CCMP; *wpa_enabled = 1; break; -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4,0,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) case WLAN_CIPHER_SUITE_CCMP_256: encrypt_mode = MLAN_ENCRYPTION_MODE_CCMP_256; *wpa_enabled = 1; break; #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,6,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) case WLAN_CIPHER_SUITE_GCMP: encrypt_mode = MLAN_ENCRYPTION_MODE_GCMP; *wpa_enabled = 1; break; #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4,0,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) case WLAN_CIPHER_SUITE_GCMP_256: encrypt_mode = MLAN_ENCRYPTION_MODE_GCMP_256; *wpa_enabled = 1; @@ -603,8 +596,7 @@ woal_cfg80211_get_encryption_mode(t_u32 cipher, int *wpa_enabled) * * @return IEEE status code */ -static int -woal_get_assoc_status(moal_private *priv) +static int woal_get_assoc_status(moal_private *priv) { int ret = WLAN_STATUS_UNSPECIFIED_FAILURE; t_u16 status = (t_u16)(priv->assoc_status & 0xffff); @@ -634,8 +626,7 @@ woal_get_assoc_status(moal_private *priv) * * @return 1 -- enable or 0 -- disable */ -static int -woal_cfg80211_is_alg_wep(t_u32 cipher) +static int woal_cfg80211_is_alg_wep(t_u32 cipher) { int alg = 0; ENTER(); @@ -655,8 +646,7 @@ woal_cfg80211_is_alg_wep(t_u32 cipher) * * @return Driver bss mode */ -static t_u32 -woal_nl80211_iftype_to_mode(enum nl80211_iftype iftype) +static t_u32 woal_nl80211_iftype_to_mode(enum nl80211_iftype iftype) { switch (iftype) { case NL80211_IFTYPE_STATION: @@ -675,8 +665,7 @@ woal_nl80211_iftype_to_mode(enum nl80211_iftype iftype) * * @return 0 --success, otherwise fail */ -static int -woal_wps_cfg(moal_private *priv, int enable) +static int woal_wps_cfg(moal_private *priv, int enable) { int ret = 0; mlan_ds_wps_cfg *pwps = NULL; @@ -725,9 +714,8 @@ done: * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_assoc_ies_cfg(moal_private *priv, t_u8 *ie, int ie_len, - t_u8 wait_option) +static int woal_cfg80211_assoc_ies_cfg(moal_private *priv, t_u8 *ie, int ie_len, + t_u8 wait_option) { int bytes_left = ie_len; t_u8 *pcurrent_ptr = ie; @@ -736,8 +724,8 @@ woal_cfg80211_assoc_ies_cfg(moal_private *priv, t_u8 *ie, int ie_len, int ret = MLAN_STATUS_SUCCESS; IEEEtypes_ElementId_e element_id; IEEEtypes_VendorSpecific_t *pvendor_ie; - t_u8 wps_oui[] = { 0x00, 0x50, 0xf2, 0x04 }; - t_u8 hs20_oui[] = { 0x50, 0x6f, 0x9a, 0x10 }; + t_u8 wps_oui[] = {0x00, 0x50, 0xf2, 0x04}; + t_u8 hs20_oui[] = {0x50, 0x6f, 0x9a, 0x10}; while (bytes_left >= 2) { element_id = (IEEEtypes_ElementId_e)(*((t_u8 *)pcurrent_ptr)); @@ -763,16 +751,15 @@ woal_cfg80211_assoc_ies_cfg(moal_private *priv, t_u8 *ie, int ie_len, break; case VENDOR_SPECIFIC_221: pvendor_ie = (IEEEtypes_VendorSpecific_t *)pcurrent_ptr; - if (!memcmp - (pvendor_ie->vend_hdr.oui, wps_oui, - sizeof(pvendor_ie->vend_hdr.oui)) && + if (!memcmp(pvendor_ie->vend_hdr.oui, wps_oui, + sizeof(pvendor_ie->vend_hdr.oui)) && (pvendor_ie->vend_hdr.oui_type == wps_oui[3])) { PRINTM(MIOCTL, "Enable WPS session\n"); woal_wps_cfg(priv, MTRUE); } - if (!memcmp - (pvendor_ie->vend_hdr.oui, hs20_oui, - sizeof(hs20_oui))) { + if (!memcmp(pvendor_ie->vend_hdr.oui, hs20_oui, + sizeof(pvendor_ie->vend_hdr.oui)) && + (pvendor_ie->vend_hdr.oui_type == hs20_oui[3])) { PRINTM(MIOCTL, "Hotspot2.0 is enabled for this bss\n"); if (MLAN_STATUS_SUCCESS != @@ -808,9 +795,8 @@ woal_cfg80211_assoc_ies_cfg(moal_private *priv, t_u8 *ie, int ie_len, woal_set_get_gen_ie(priv, MLAN_ACT_SET, pcurrent_ptr, &total_ie_len, wait_option)) { - PRINTM(MERROR, - "Fail to set" - "FAST_BSS_TRANSITION IE\n"); + PRINTM(MERROR, "Fail to set" + "FAST_BSS_TRANSITION IE\n"); ret = -EFAULT; goto done; } @@ -908,12 +894,10 @@ enum moal_tm_command { }; #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) -static int -woal_testmode_cmd(struct wiphy *wiphy, struct wireless_dev *wdev, - void *data, int len) +static int woal_testmode_cmd(struct wiphy *wiphy, struct wireless_dev *wdev, + void *data, int len) #else -static int -woal_testmode_cmd(struct wiphy *wiphy, void *data, int len) +static int woal_testmode_cmd(struct wiphy *wiphy, void *data, int len) #endif { moal_handle *handle = (moal_handle *)woal_get_wiphy_priv(wiphy); @@ -961,10 +945,9 @@ woal_testmode_cmd(struct wiphy *wiphy, void *data, int len) err = -EFAULT; goto error; } - /* process hostcmd response */ - skb = cfg80211_testmode_alloc_reply_skb(wiphy, - misc_cfg->param.hostcmd. - len); + /* process hostcmd response*/ + skb = cfg80211_testmode_alloc_reply_skb( + wiphy, misc_cfg->param.hostcmd.len); if (!skb) { kfree(req); return -ENOMEM; @@ -998,8 +981,8 @@ error: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_send_domain_info_cmd_fw(moal_private *priv, t_u8 wait_option) +static mlan_status woal_send_domain_info_cmd_fw(moal_private *priv, + t_u8 wait_option) { mlan_status ret = MLAN_STATUS_SUCCESS; enum ieee80211_band band; @@ -1059,7 +1042,8 @@ woal_send_domain_info_cmd_fw(moal_private *priv, t_u8 wait_option) sband = priv->wdev->wiphy->bands[band]; for (i = 0; (i < sband->n_channels) && - (no_of_sub_band < MRVDRV_MAX_SUBBAND_802_11D); i++) { + (no_of_sub_band < MRVDRV_MAX_SUBBAND_802_11D); + i++) { channel = &sband->channels[i]; if (channel->flags & IEEE80211_CHAN_DISABLED) continue; @@ -1091,12 +1075,12 @@ woal_send_domain_info_cmd_fw(moal_private *priv, t_u8 wait_option) } if (flag && (no_of_sub_band < MRVDRV_MAX_SUBBAND_802_11D)) { - cfg_11d->param.domain_info.sub_band[no_of_sub_band] - .first_chan = first_chan; - cfg_11d->param.domain_info.sub_band[no_of_sub_band] - .no_of_chan = no_of_parsed_chan; - cfg_11d->param.domain_info.sub_band[no_of_sub_band] - .max_tx_pwr = max_pwr; + cfg_11d->param.domain_info.sub_band[no_of_sub_band].first_chan = + first_chan; + cfg_11d->param.domain_info.sub_band[no_of_sub_band].no_of_chan = + no_of_parsed_chan; + cfg_11d->param.domain_info.sub_band[no_of_sub_band].max_tx_pwr = + max_pwr; no_of_sub_band++; } cfg_11d->param.domain_info.no_of_sub_band = no_of_sub_band; @@ -1130,10 +1114,9 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_set_rf_channel(moal_private *priv, - struct ieee80211_channel *chan, - enum nl80211_channel_type channel_type, t_u8 wait_option) +int woal_set_rf_channel(moal_private *priv, struct ieee80211_channel *chan, + enum nl80211_channel_type channel_type, + t_u8 wait_option) { int ret = 0; t_u32 mode, config_bands = 0; @@ -1156,7 +1139,8 @@ woal_set_rf_channel(moal_private *priv, radio_cfg = (mlan_ds_radio_cfg *)req->pbuf; radio_cfg->sub_command = MLAN_OID_BAND_CFG; req->req_id = MLAN_IOCTL_RADIO_CFG; - /* Get config_bands, adhoc_start_band and adhoc_channel values from MLAN */ + /* Get config_bands, adhoc_start_band and adhoc_channel values from MLAN + */ req->action = MLAN_ACT_GET; status = woal_request_ioctl(priv, req, wait_option); if (status != MLAN_STATUS_SUCCESS) { @@ -1189,10 +1173,9 @@ woal_set_rf_channel(moal_private *priv, ieee80211_frequency_to_channel(chan->center_freq)); if (MLAN_STATUS_SUCCESS != - woal_change_adhoc_chan(priv, - ieee80211_frequency_to_channel(chan-> - center_freq), - wait_option)) { + woal_change_adhoc_chan( + priv, ieee80211_frequency_to_channel(chan->center_freq), + wait_option)) { ret = -EFAULT; goto done; } @@ -1211,11 +1194,11 @@ done: * @param wait_option Wait option * @param ssid_bssid A pointer to mlan_ssid_bssid structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_set_ewpa_mode(moal_private *priv, t_u8 wait_option, - mlan_ssid_bssid *ssid_bssid) +mlan_status woal_set_ewpa_mode(moal_private *priv, t_u8 wait_option, + mlan_ssid_bssid *ssid_bssid) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -1284,9 +1267,8 @@ error: * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_set_auth(moal_private *priv, int encrypt_mode, - int wpa_enabled, t_u8 wait_option) +static int woal_cfg80211_set_auth(moal_private *priv, int encrypt_mode, + int wpa_enabled, t_u8 wait_option) { int ret = 0; @@ -1331,9 +1313,9 @@ woal_cfg80211_set_auth(moal_private *priv, int encrypt_mode, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_inform_bss_from_scan_result(moal_private *priv, - mlan_ssid_bssid *ssid_bssid, t_u8 wait_option) +mlan_status woal_inform_bss_from_scan_result(moal_private *priv, + mlan_ssid_bssid *ssid_bssid, + t_u8 wait_option) { mlan_status ret = MLAN_STATUS_SUCCESS; struct ieee80211_channel *chan; @@ -1351,9 +1333,8 @@ woal_inform_bss_from_scan_result(moal_private *priv, } memset(&scan_resp, 0, sizeof(scan_resp)); - if (MLAN_STATUS_SUCCESS != woal_get_scan_table(priv, - wait_option, - &scan_resp)) { + if (MLAN_STATUS_SUCCESS != + woal_get_scan_table(priv, wait_option, &scan_resp)) { ret = MLAN_STATUS_FAILURE; goto done; } @@ -1363,26 +1344,21 @@ woal_inform_bss_from_scan_result(moal_private *priv, for (i = 0; i < scan_resp.num_in_scan_table; i++) { if (ssid_bssid) { /* Inform specific BSS only */ - if (memcmp - (ssid_bssid->ssid.ssid, - scan_table[i].ssid.ssid, - ssid_bssid->ssid.ssid_len) || + if (memcmp(ssid_bssid->ssid.ssid, + scan_table[i].ssid.ssid, + ssid_bssid->ssid.ssid_len) || memcmp(ssid_bssid->bssid, scan_table[i].mac_address, ETH_ALEN)) continue; } if (!scan_table[i].freq) { scan_table[i].freq = - ieee80211_channel_to_frequency((int) - scan_table - [i]. - channel + ieee80211_channel_to_frequency( + (int)scan_table[i].channel #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) - , - woal_band_cfg_to_ieee_band - (scan_table - [i]. - bss_band) + , + woal_band_cfg_to_ieee_band( + scan_table[i].bss_band) #endif ); } @@ -1399,23 +1375,22 @@ woal_inform_bss_from_scan_result(moal_private *priv, #if CFG80211_VERSION_CODE >= WIFI_DIRECT_KERNEL_VERSION if (priv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT && !ssid_bssid) { - if (!strncmp - (scan_table[i].ssid.ssid, "DIRECT-", - strlen("DIRECT-"))) { + if (!strncmp(scan_table[i].ssid.ssid, "DIRECT-", + strlen("DIRECT-"))) { PRINTM(MCMND, "wlan: P2P device " MACSTR " found, channel=%d\n", - MAC2STR(scan_table[i]. - mac_address), + MAC2STR(scan_table[i] + .mac_address), (int)chan->hw_value); } } #endif #endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) - /** Andorid's Location service is expecting timestamp to be - * local time (in microsecond) since boot; - * and not the TSF found in the beacon. */ + /** Andorid's Location service is expecting timestamp to + * be local time (in microsecond) since boot; and not + * the TSF found in the beacon. */ ts = ktime_to_us(ktime_get_boottime()); #else moal_memcpy_ext(priv->phandle, &ts, @@ -1425,21 +1400,19 @@ woal_inform_bss_from_scan_result(moal_private *priv, moal_memcpy_ext(priv->phandle, &cap_info, &scan_table[i].cap_info, sizeof(cap_info), sizeof(cap_info)); - pub = cfg80211_inform_bss(priv->wdev->wiphy, chan, + pub = cfg80211_inform_bss( + priv->wdev->wiphy, chan, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) - CFG80211_BSS_FTYPE_UNKNOWN, + CFG80211_BSS_FTYPE_UNKNOWN, #endif - scan_table[i].mac_address, - ts, cap_info, - scan_table[i].beacon_period, - scan_table[i].pbeacon_buf + - WLAN_802_11_FIXED_IE_SIZE, - scan_table[i]. - beacon_buf_size - - WLAN_802_11_FIXED_IE_SIZE, - -RSSI_DBM_TO_MDM(scan_table - [i].rssi), - GFP_KERNEL); + scan_table[i].mac_address, ts, cap_info, + scan_table[i].beacon_period, + scan_table[i].pbeacon_buf + + WLAN_802_11_FIXED_IE_SIZE, + scan_table[i].beacon_buf_size - + WLAN_802_11_FIXED_IE_SIZE, + -RSSI_DBM_TO_MDM(scan_table[i].rssi), + GFP_KERNEL); if (pub) { #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) pub->len_information_elements = @@ -1483,10 +1456,9 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_cfg80211_inform_ibss_bss(moal_private *priv, - struct ieee80211_channel *chan, - t_u16 beacon_interval) +static mlan_status woal_cfg80211_inform_ibss_bss(moal_private *priv, + struct ieee80211_channel *chan, + t_u16 beacon_interval) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_bss_info bss_info; @@ -1545,8 +1517,7 @@ done: * * @return 0 -- success, otherwise fail */ -static int -woal_process_country_ie(moal_private *priv, struct cfg80211_bss *bss) +static int woal_process_country_ie(moal_private *priv, struct cfg80211_bss *bss) { u8 *country_ie, country_ie_len; int ret = 0; @@ -1597,19 +1568,18 @@ woal_process_country_ie(moal_private *priv, struct cfg80211_bss *bss) priv->phandle->country_code[1]; cfg_11d->param.domain_info.country_code[2] = ' '; - /** IEEE80211_BAND_2GHZ or IEEE80211_BAND_5GHZ */ + /** IEEE80211_BAND_2GHZ or IEEE80211_BAND_5GHZ */ cfg_11d->param.domain_info.band = priv->phandle->band; country_ie_len -= COUNTRY_CODE_LEN; - cfg_11d->param.domain_info.no_of_sub_band = - MIN(MRVDRV_MAX_SUBBAND_802_11D, - (country_ie_len / - sizeof(struct ieee80211_country_ie_triplet))); + cfg_11d->param.domain_info.no_of_sub_band = MIN( + MRVDRV_MAX_SUBBAND_802_11D, + (country_ie_len / sizeof(struct ieee80211_country_ie_triplet))); moal_memcpy_ext(priv->phandle, (u8 *)cfg_11d->param.domain_info.sub_band, &country_ie[2] + COUNTRY_CODE_LEN, cfg_11d->param.domain_info.no_of_sub_band * - sizeof(mlan_ds_subband_set_t), + sizeof(mlan_ds_subband_set_t), sizeof(cfg_11d->param.domain_info.sub_band)); PRINTM(MCMND, "11D: Country IE: %c%c band=%d no_of_sub_band=%d\n", @@ -1638,10 +1608,9 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_connect_scan(moal_private *priv, - struct cfg80211_connect_params *conn_param, - t_u8 wait_option) +int woal_cfg80211_connect_scan(moal_private *priv, + struct cfg80211_connect_params *conn_param, + t_u8 wait_option) { moal_handle *handle = priv->phandle; int ret = 0; @@ -1716,7 +1685,6 @@ woal_cfg80211_connect_scan(moal_private *priv, #endif LEAVE(); return ret; - } #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) @@ -1726,9 +1694,9 @@ woal_cfg80211_connect_scan(moal_private *priv, * @param priv A pointer to moal_private * @param req A pointer to cfg80211_assoc_request structure */ -void -woal_save_assoc_params(moal_private *priv, struct cfg80211_assoc_request *req, - mlan_ssid_bssid *ssid_bssid) +void woal_save_assoc_params(moal_private *priv, + struct cfg80211_assoc_request *req, + mlan_ssid_bssid *ssid_bssid) { ENTER(); @@ -1785,8 +1753,8 @@ woal_save_assoc_params(moal_private *priv, struct cfg80211_assoc_request *req, * @param priv A pointer to moal_private * @param req A pointer to struct cfg80211_auth_request */ -void -woal_save_auth_params(moal_private *priv, struct cfg80211_auth_request *req) +void woal_save_auth_params(moal_private *priv, + struct cfg80211_auth_request *req) { ENTER(); woal_clear_conn_params(priv); @@ -1803,22 +1771,21 @@ woal_save_auth_params(moal_private *priv, struct cfg80211_auth_request *req) } /** -* @brief This function is authentication handler when host MLME -* enable. -* In this case driver will prepare and send Auth Req. -* -* @param wiphy A pointer to wiphy. -* -* @param dev A pointer to net_device -* -* @param req A pointer to cfg80211_auth_request -* -* @return 0 -- success, otherwise fail -*/ -static int -woal_cfg80211_authenticate(struct wiphy *wiphy, - struct net_device *dev, - struct cfg80211_auth_request *req) + * @brief This function is authentication handler when host MLME + * enable. + * In this case driver will prepare and send Auth Req. + * + * @param wiphy A pointer to wiphy. + * + * @param dev A pointer to net_device + * + * @param req A pointer to cfg80211_auth_request + * + * @return 0 -- success, otherwise fail + */ +static int woal_cfg80211_authenticate(struct wiphy *wiphy, + struct net_device *dev, + struct cfg80211_auth_request *req) { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); IEEE80211_MGMT *mgmt = NULL; @@ -1826,7 +1793,7 @@ woal_cfg80211_authenticate(struct wiphy *wiphy, pmlan_buffer pmbuf = NULL; t_u32 pkt_type, tx_control; t_u16 packet_len = 0, auth_alg; - t_u8 addr[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; + t_u8 addr[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; int ret = 0; t_u8 trans = 1, status_code = 0; @@ -1847,8 +1814,9 @@ woal_cfg80211_authenticate(struct wiphy *wiphy, if (priv->wdev->iftype != NL80211_IFTYPE_STATION #ifdef WIFI_DIRECT_SUPPORT && priv->wdev->iftype != NL80211_IFTYPE_P2P_CLIENT + #endif /* WIFI_DIRECT_SUPPORT */ - ) { + ) { PRINTM(MERROR, "Received infra auth request when interface not in infra mode\n"); LEAVE(); @@ -1864,13 +1832,13 @@ woal_cfg80211_authenticate(struct wiphy *wiphy, moal_memcpy_ext(priv->phandle, ssid_bssid->bssid, req->bss->bssid, ETH_ALEN, sizeof(ssid_bssid->bssid)); /* Not allowed to connect to the same AP which is already connected - with other interface */ + with other interface */ for (i = 0; i < handle->priv_num; i++) { if (handle->priv[i] != priv && MTRUE == woal_is_connected(handle->priv[i], ssid_bssid)) { PRINTM(MMSG, - "wlan: already connected with other interface, bssid " - MACSTR "\n", + "wlan: already connected with other interface, bssid " MACSTR + "\n", MAC2STR(handle->priv[i]->cfg_bssid)); kfree(ssid_bssid); LEAVE(); @@ -1890,22 +1858,23 @@ woal_cfg80211_authenticate(struct wiphy *wiphy, LEAVE(); return -EBUSY; } - /** cancel pending scan */ + /** cancel pending scan */ woal_cancel_scan(priv, MOAL_IOCTL_WAIT); #ifdef WIFI_DIRECT_SUPPORT - if (priv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT - && (priv->wdev->iftype == NL80211_IFTYPE_STATION - || priv->wdev->iftype == NL80211_IFTYPE_P2P_CLIENT)) { - /* if bsstype == wifi direct, and iftype == station or p2p client, - * that means wpa_supplicant wants to enable wifi direct + if (priv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT && + (priv->wdev->iftype == NL80211_IFTYPE_STATION || + priv->wdev->iftype == NL80211_IFTYPE_P2P_CLIENT)) { + /* if bsstype == wifi direct, and iftype == station or p2p + * client, that means wpa_supplicant wants to enable wifi direct * functionality, so we should init p2p client. * * Note that due to kernel iftype check, ICS wpa_supplicant * could not updaet iftype to init p2p client, so we have to * done it here. * */ - if (MLAN_STATUS_SUCCESS != woal_cfg80211_init_p2p_client(priv)) { + if (MLAN_STATUS_SUCCESS != + woal_cfg80211_init_p2p_client(priv)) { PRINTM(MERROR, "Init p2p client for wpa_supplicant failed.\n"); ret = -EFAULT; @@ -1919,26 +1888,26 @@ woal_cfg80211_authenticate(struct wiphy *wiphy, } #endif - /*enable auth register frame */ + /*enable auth register frame*/ woal_mgmt_frame_register(priv, IEEE80211_STYPE_AUTH, MTRUE); woal_mgmt_frame_register(priv, IEEE80211_STYPE_DEAUTH, MTRUE); woal_mgmt_frame_register(priv, IEEE80211_STYPE_DISASSOC, MTRUE); -#define HEADER_SIZE 8 +#define HEADER_SIZE 8 // frmctl + durationid + addr1 + addr2 + addr3 + seqctl + addr4 -#define MGMT_HEADER_LEN (2 + 2 + 6 + 6 + 6 + 2 +6) +#define MGMT_HEADER_LEN (2 + 2 + 6 + 6 + 6 + 2 + 6) // 6 = auth_alg + auth_transaction +auth_status #define AUTH_BODY_LEN 6 -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4,10,0) - packet_len = (t_u16)req->ie_len + req->auth_data_len - + MGMT_HEADER_LEN + AUTH_BODY_LEN; +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) + packet_len = (t_u16)req->ie_len + req->auth_data_len + MGMT_HEADER_LEN + + AUTH_BODY_LEN; #else - packet_len = (t_u16)req->ie_len + req->sae_data_len - + MGMT_HEADER_LEN + AUTH_BODY_LEN; + packet_len = (t_u16)req->ie_len + req->sae_data_len + MGMT_HEADER_LEN + + AUTH_BODY_LEN; #endif pmbuf = woal_alloc_mlan_buffer(priv->phandle, MLAN_MIN_DATA_HEADER_LEN + HEADER_SIZE + - packet_len + sizeof(packet_len)); + packet_len + sizeof(packet_len)); if (!pmbuf) { PRINTM(MERROR, "Fail to allocate mlan_buffer\n"); @@ -1993,11 +1962,11 @@ woal_cfg80211_authenticate(struct wiphy *wiphy, goto done; } } -#define AUTH_TX_DEFAULT_WAIT_TIME 1200 - if (woal_cfg80211_remain_on_channel_cfg(priv, MOAL_IOCTL_WAIT, MFALSE, - (t_u8 *)&status, - req->bss->channel, 0, - AUTH_TX_DEFAULT_WAIT_TIME)) { + +#define AUTH_TX_DEFAULT_WAIT_TIME 1200 + if (woal_cfg80211_remain_on_channel_cfg( + priv, MOAL_IOCTL_WAIT, MFALSE, (t_u8 *)&status, + req->bss->channel, 0, AUTH_TX_DEFAULT_WAIT_TIME)) { PRINTM(MERROR, "Fail to configure remain on channel\n"); ret = -EFAULT; goto done; @@ -2024,28 +1993,28 @@ woal_cfg80211_authenticate(struct wiphy *wiphy, pmbuf->pbuf + pmbuf->data_offset + sizeof(pkt_type), &tx_control, sizeof(tx_control), sizeof(tx_control)); - mgmt = (IEEE80211_MGMT *)(pmbuf->pbuf + pmbuf->data_offset - + HEADER_SIZE + sizeof(packet_len)); + mgmt = (IEEE80211_MGMT *)(pmbuf->pbuf + pmbuf->data_offset + + HEADER_SIZE + sizeof(packet_len)); memset(mgmt, 0, MGMT_HEADER_LEN); - /**Authentication Frame: Frame Control*/ - mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | - IEEE80211_STYPE_AUTH); - /**Authentication Frame: Destination Address*/ + /**Authentication Frame: Frame Control*/ + mgmt->frame_control = + cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH); + /**Authentication Frame: Destination Address*/ moal_memcpy_ext(priv->phandle, mgmt->da, req->bss->bssid, ETH_ALEN, sizeof(mgmt->da)); - /**Authentication Frame: Source Address*/ + /**Authentication Frame: Source Address*/ moal_memcpy_ext(priv->phandle, mgmt->sa, priv->current_addr, ETH_ALEN, sizeof(mgmt->sa)); - /**Authentication Frame: BSSID*/ + /**Authentication Frame: BSSID*/ moal_memcpy_ext(priv->phandle, mgmt->bssid, req->bss->bssid, ETH_ALEN, sizeof(mgmt->bssid)); moal_memcpy_ext(priv->phandle, mgmt->addr4, addr, ETH_ALEN, sizeof(mgmt->addr4)); -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4,10,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 10, 0) if (req->auth_data_len >= 4) { if (req->auth_type == NL80211_AUTHTYPE_SAE) { - __le16 *pos = (__le16 *) req->auth_data; + __le16 *pos = (__le16 *)req->auth_data; trans = le16_to_cpu(pos[0]); status_code = le16_to_cpu(pos[1]); @@ -2053,14 +2022,14 @@ woal_cfg80211_authenticate(struct wiphy *wiphy, moal_memcpy_ext(priv->phandle, (t_u8 *)(&mgmt->u.auth.variable), req->auth_data + 4, req->auth_data_len - 4, req->auth_data_len - 4); - varptr = (t_u8 *)&mgmt->u.auth.variable + (req->auth_data_len - - 4); + varptr = (t_u8 *)&mgmt->u.auth.variable + + (req->auth_data_len - 4); packet_len -= 4; } #else if (req->sae_data_len >= 4) { if (req->auth_type == NL80211_AUTHTYPE_SAE) { - __le16 *pos = (__le16 *) req->sae_data; + __le16 *pos = (__le16 *)req->sae_data; trans = le16_to_cpu(pos[0]); status_code = le16_to_cpu(pos[1]); @@ -2068,20 +2037,20 @@ woal_cfg80211_authenticate(struct wiphy *wiphy, moal_memcpy_ext(priv->phandle, (t_u8 *)(&mgmt->u.auth.variable), req->sae_data + 4, req->sae_data_len - 4, req->sae_data_len - 4); - varptr = (t_u8 *)&mgmt->u.auth.variable + (req->sae_data_len - - 4); + varptr = (t_u8 *)&mgmt->u.auth.variable + + (req->sae_data_len - 4); packet_len -= 4; } #endif - /*Add packet len */ + /*Add packet len*/ moal_memcpy_ext(priv->phandle, pmbuf->pbuf + pmbuf->data_offset + HEADER_SIZE, &packet_len, sizeof(packet_len), sizeof(packet_len)); - /**Authentication Frame: Authentication Alg*/ + /**Authentication Frame: Authentication Alg*/ mgmt->u.auth.auth_alg = cpu_to_le16(auth_alg); mgmt->u.auth.auth_transaction = trans; - /**Authentication Frame: Status code*/ + /**Authentication Frame: Status code*/ mgmt->u.auth.status_code = status_code; if (req->ie && req->ie_len) { @@ -2125,28 +2094,25 @@ done: if (ret) { woal_mgmt_frame_register(priv, IEEE80211_STYPE_AUTH, MFALSE); if (priv->phandle->remain_on_channel) { - woal_cfg80211_remain_on_channel_cfg(priv, - MOAL_IOCTL_WAIT, - MTRUE, - (t_u8 *)&status, - NULL, 0, 0); + woal_cfg80211_remain_on_channel_cfg( + priv, MOAL_IOCTL_WAIT, MTRUE, (t_u8 *)&status, + NULL, 0, 0); priv->phandle->remain_on_channel = MFALSE; } } LEAVE(); return ret; - } /** - * @brief This workqueue function handles association response in host mlme case + * @brief This workqueue function handles association response in host mlme + * case * * @param work A pointer to work_struct * * @return N/A */ -void -woal_host_mlme_work_queue(struct work_struct *work) +void woal_host_mlme_work_queue(struct work_struct *work) { mlan_ds_misc_assoc_rsp assoc_rsp; struct cfg80211_bss *bss = NULL; @@ -2163,12 +2129,9 @@ woal_host_mlme_work_queue(struct work_struct *work) MFALSE); if (priv->phandle->remain_on_channel) { - woal_cfg80211_remain_on_channel_cfg(priv, - MOAL_IOCTL_WAIT, - MTRUE, - (t_u8 *) - &status, - NULL, 0, 0); + woal_cfg80211_remain_on_channel_cfg( + priv, MOAL_IOCTL_WAIT, MTRUE, + (t_u8 *)&status, NULL, 0, 0); priv->phandle->remain_on_channel = MFALSE; } PRINTM(MCMND, "wlan: HostMlme %s auth success\n", @@ -2177,19 +2140,15 @@ woal_host_mlme_work_queue(struct work_struct *work) if (priv->auth_flag & HOST_MLME_ASSOC_DONE) { priv->auth_flag = 0; #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 1, 0) - bss = cfg80211_get_bss(priv->wdev->wiphy, NULL, - priv->conn_bssid, - priv->conn_ssid, - priv->conn_ssid_len, - IEEE80211_BSS_TYPE_ESS, - IEEE80211_PRIVACY_ANY); + bss = cfg80211_get_bss( + priv->wdev->wiphy, NULL, priv->conn_bssid, + priv->conn_ssid, priv->conn_ssid_len, + IEEE80211_BSS_TYPE_ESS, IEEE80211_PRIVACY_ANY); #else - bss = cfg80211_get_bss(priv->wdev->wiphy, NULL, - priv->conn_bssid, - priv->conn_ssid, - priv->conn_ssid_len, - WLAN_CAPABILITY_ESS, - WLAN_CAPABILITY_ESS); + bss = cfg80211_get_bss( + priv->wdev->wiphy, NULL, priv->conn_bssid, + priv->conn_ssid, priv->conn_ssid_len, + WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS); #endif if (!bss) { PRINTM(MERROR, "HostMlme %s:Fail to get bss\n", @@ -2204,66 +2163,59 @@ woal_host_mlme_work_queue(struct work_struct *work) "HostMlme: %s assoc_resp_len=%d, frame_control=0x%x\n", priv->netdev->name, assoc_rsp.assoc_resp_len, - ((struct ieee80211_mgmt *)assoc_rsp. - assoc_resp_buf)->frame_control); - if (ieee80211_is_assoc_resp - (((struct ieee80211_mgmt *)assoc_rsp. - assoc_resp_buf)->frame_control) || - ieee80211_is_reassoc_resp(((struct - ieee80211_mgmt - *)assoc_rsp. - assoc_resp_buf)-> - frame_control)) { + ((struct ieee80211_mgmt *) + assoc_rsp.assoc_resp_buf) + ->frame_control); + if (ieee80211_is_assoc_resp( + ((struct ieee80211_mgmt *) + assoc_rsp.assoc_resp_buf) + ->frame_control) || + ieee80211_is_reassoc_resp( + ((struct ieee80211_mgmt *) + assoc_rsp.assoc_resp_buf) + ->frame_control)) { spin_lock_irqsave(&priv->connect_lock, flags); - if (le16_to_cpu - (((struct ieee80211_mgmt *) - assoc_rsp.assoc_resp_buf)->u. - assoc_resp.status_code) != + if (le16_to_cpu( + ((struct ieee80211_mgmt + *)assoc_rsp + .assoc_resp_buf) + ->u.assoc_resp + .status_code) != WLAN_STATUS_SUCCESS) { memset(priv->cfg_bssid, 0, ETH_ALEN); if (priv->bss_type == MLAN_BSS_TYPE_STA) - woal_clear_conn_params - (priv); + woal_clear_conn_params( + priv); } - spin_unlock_irqrestore(&priv-> - connect_lock, - flags); + spin_unlock_irqrestore( + &priv->connect_lock, flags); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) - cfg80211_rx_assoc_resp(priv->netdev, - bss, - assoc_rsp. - assoc_resp_buf, - assoc_rsp. - assoc_resp_len, - -1, NULL, 0); + cfg80211_rx_assoc_resp( + priv->netdev, bss, + assoc_rsp.assoc_resp_buf, + assoc_rsp.assoc_resp_len, -1, + NULL, 0); #else #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) - cfg80211_rx_assoc_resp(priv->netdev, - bss, - assoc_rsp. - assoc_resp_buf, - assoc_rsp. - assoc_resp_len, - -1); + cfg80211_rx_assoc_resp( + priv->netdev, bss, + assoc_rsp.assoc_resp_buf, + assoc_rsp.assoc_resp_len, -1); #else #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 11, 0) - cfg80211_rx_assoc_resp(priv->netdev, - bss, - assoc_rsp. - assoc_resp_buf, - assoc_rsp. - assoc_resp_len); + cfg80211_rx_assoc_resp( + priv->netdev, bss, + assoc_rsp.assoc_resp_buf, + assoc_rsp.assoc_resp_len); #else - cfg80211_send_rx_assoc(priv->netdev, - bss, - assoc_rsp. - assoc_resp_buf, - assoc_rsp. - assoc_resp_len); + cfg80211_send_rx_assoc( + priv->netdev, bss, + assoc_rsp.assoc_resp_buf, + assoc_rsp.assoc_resp_len); #endif #endif #endif @@ -2279,21 +2231,20 @@ woal_host_mlme_work_queue(struct work_struct *work) } /** -* @brief This function is association handler when host MLME -* enable. -* In this case driver will prepare and send Assoc Req. -* -* @param wiphy A pointer to wiphy. -* -* @param dev A pointer to net_device -* -* @param req A pointer to cfg80211_assoc_request -* -* @return 0 -- success, otherwise fail -*/ -static int -woal_cfg80211_associate(struct wiphy *wiphy, struct net_device *dev, - struct cfg80211_assoc_request *req) + * @brief This function is association handler when host MLME + * enable. + * In this case driver will prepare and send Assoc Req. + * + * @param wiphy A pointer to wiphy. + * + * @param dev A pointer to net_device + * + * @param req A pointer to cfg80211_assoc_request + * + * @return 0 -- success, otherwise fail + */ +static int woal_cfg80211_associate(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_assoc_request *req) { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); int ret = 0; @@ -2338,6 +2289,7 @@ woal_cfg80211_associate(struct wiphy *wiphy, struct net_device *dev, ret = -EINVAL; goto done; } + #ifdef STA_WEXT if (IS_STA_WEXT(priv->phandle->params.cfg80211_wext)) { switch (req->crypto.wpa_versions) { @@ -2376,7 +2328,7 @@ woal_cfg80211_associate(struct wiphy *wiphy, struct net_device *dev, goto done; } - if (req->ie && req->ie_len) { /* Set the IE */ + if (req->ie && req->ie_len) { /* Set the IE */ if (MLAN_STATUS_SUCCESS != woal_cfg80211_assoc_ies_cfg(priv, (t_u8 *)req->ie, req->ie_len, MOAL_IOCTL_WAIT)) { @@ -2386,10 +2338,8 @@ woal_cfg80211_associate(struct wiphy *wiphy, struct net_device *dev, } if (req->crypto.n_ciphers_pairwise) { - pairwise_enc_mode = - woal_cfg80211_get_encryption_mode(req-> - crypto.ciphers_pairwise - [0], &wpa_enabled); + pairwise_enc_mode = woal_cfg80211_get_encryption_mode( + req->crypto.ciphers_pairwise[0], &wpa_enabled); ret = woal_cfg80211_set_auth(priv, pairwise_enc_mode, wpa_enabled, MOAL_IOCTL_WAIT); if (ret) @@ -2397,10 +2347,8 @@ woal_cfg80211_associate(struct wiphy *wiphy, struct net_device *dev, } if (req->crypto.cipher_group) { - group_enc_mode = - woal_cfg80211_get_encryption_mode(req-> - crypto.cipher_group, - &wpa_enabled); + group_enc_mode = woal_cfg80211_get_encryption_mode( + req->crypto.cipher_group, &wpa_enabled); ret = woal_cfg80211_set_auth(priv, group_enc_mode, wpa_enabled, MOAL_IOCTL_WAIT); if (ret) @@ -2431,9 +2379,9 @@ done: priv->rssi_low = DEFAULT_RSSI_LOW_THRESHOLD; if (priv->bss_type == MLAN_BSS_TYPE_STA #ifdef WIFI_DIRECT_SUPPORT - || MLAN_BSS_TYPE_WIFIDIRECT + || priv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT #endif - ) + ) woal_save_assoc_params(priv, req, &ssid_bssid); memset(&bss_info, 0, sizeof(bss_info)); woal_get_bss_info(priv, MOAL_IOCTL_WAIT, &bss_info); @@ -2445,17 +2393,19 @@ done: if (!ret && priv->media_connected) { PRINTM(MMSG, "wlan: HostMlme %s Connected to bssid " MACSTR - " successfully\n", priv->netdev->name, - MAC2STR(priv->cfg_bssid)); + " successfully\n", + priv->netdev->name, MAC2STR(priv->cfg_bssid)); spin_unlock_irqrestore(&priv->connect_lock, flags); } else { PRINTM(MERROR, "wlan: HostMlme %s Failed to connect to bssid " MACSTR - "\n", priv->netdev->name, MAC2STR(req->bss->bssid)); + "\n", + priv->netdev->name, MAC2STR(req->bss->bssid)); if (ssid_bssid.assoc_rsp.assoc_resp_len && ssid_bssid.assoc_rsp.assoc_resp_len > - sizeof(IEEEtypes_MgmtHdr_t)) { - //save the connection param when send assoc_resp to kernel + sizeof(IEEEtypes_MgmtHdr_t)) { + // save the connection param when send assoc_resp to + // kernel woal_save_assoc_params(priv, req, &ssid_bssid); ret = 0; } else { @@ -2470,8 +2420,8 @@ done: spin_unlock_irqrestore(&priv->connect_lock, flags); } /*Association Response should also be send when ret is non-zero. - We also need to return success when we have association response - available */ + We also need to return success when we have association response + available*/ if (ssid_bssid.assoc_rsp.assoc_resp_len) { priv->auth_flag |= HOST_MLME_ASSOC_DONE; priv->phandle->host_mlme_priv = priv; @@ -2494,9 +2444,8 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_assoc(moal_private *priv, void *sme, t_u8 wait_option, - mlan_ds_misc_assoc_rsp *assoc_rsp) +int woal_cfg80211_assoc(moal_private *priv, void *sme, t_u8 wait_option, + mlan_ds_misc_assoc_rsp *assoc_rsp) { struct cfg80211_ibss_params *ibss_param = NULL; struct cfg80211_connect_params *conn_param = NULL; @@ -2575,11 +2524,10 @@ woal_cfg80211_assoc(moal_private *priv, void *sme, t_u8 wait_option, strncmp(priv->phandle->params.reg_alpha2, "99", strlen("99"))) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) - && - (!moal_extflg_isset - (priv->phandle, EXT_COUNTRY_IE_IGNORE)) + && (!moal_extflg_isset(priv->phandle, + EXT_COUNTRY_IE_IGNORE)) #endif - ) + ) woal_process_country_ie(priv, bss); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) cfg80211_put_bss(priv->wdev->wiphy, bss); @@ -2665,13 +2613,13 @@ woal_cfg80211_assoc(moal_private *priv, void *sme, t_u8 wait_option, #endif if ((priv->ft_pre_connect || - (conn_param && conn_param->auth_type == NL80211_AUTHTYPE_FT)) - && priv->ft_ie_len) { + (conn_param && conn_param->auth_type == NL80211_AUTHTYPE_FT)) && + priv->ft_ie_len) { ie = priv->ft_ie; ie_len = priv->ft_ie_len; priv->ft_ie_len = 0; } - if (ie && ie_len) { /* Set the IE */ + if (ie && ie_len) { /* Set the IE */ if (MLAN_STATUS_SUCCESS != woal_cfg80211_assoc_ies_cfg(priv, ie, ie_len, wait_option)) { @@ -2701,11 +2649,9 @@ woal_cfg80211_assoc(moal_private *priv, void *sme, t_u8 wait_option, } if (conn_param->crypto.n_ciphers_pairwise) { - pairwise_enc_mode = - woal_cfg80211_get_encryption_mode(conn_param-> - crypto.ciphers_pairwise - [0], - &wpa_enabled); + pairwise_enc_mode = woal_cfg80211_get_encryption_mode( + conn_param->crypto.ciphers_pairwise[0], + &wpa_enabled); ret = woal_cfg80211_set_auth(priv, pairwise_enc_mode, wpa_enabled, wait_option); if (ret) @@ -2713,10 +2659,8 @@ woal_cfg80211_assoc(moal_private *priv, void *sme, t_u8 wait_option, } if (conn_param->crypto.cipher_group) { - group_enc_mode = - woal_cfg80211_get_encryption_mode(conn_param-> - crypto.cipher_group, - &wpa_enabled); + group_enc_mode = woal_cfg80211_get_encryption_mode( + conn_param->crypto.cipher_group, &wpa_enabled); ret = woal_cfg80211_set_auth(priv, group_enc_mode, wpa_enabled, wait_option); if (ret) @@ -2733,22 +2677,18 @@ woal_cfg80211_assoc(moal_private *priv, void *sme, t_u8 wait_option, conn_param->key_len); /* Set the WEP key */ if (MLAN_STATUS_SUCCESS != - woal_cfg80211_set_wep_keys(priv, - conn_param->key, - conn_param-> - key_len, - conn_param-> - key_idx, - wait_option)) { + woal_cfg80211_set_wep_keys( + priv, conn_param->key, + conn_param->key_len, + conn_param->key_idx, wait_option)) { ret = -EFAULT; goto done; } /* Enable the WEP key by key index */ if (MLAN_STATUS_SUCCESS != - woal_cfg80211_set_wep_keys(priv, NULL, 0, - conn_param-> - key_idx, - wait_option)) { + woal_cfg80211_set_wep_keys( + priv, NULL, 0, conn_param->key_idx, + wait_option)) { ret = -EFAULT; goto done; } @@ -2799,9 +2739,9 @@ woal_cfg80211_assoc(moal_private *priv, void *sme, t_u8 wait_option, } wpa_enabled = 0; - ret = woal_cfg80211_set_auth(priv, - MLAN_ENCRYPTION_MODE_WEP104, - wpa_enabled, wait_option); + ret = woal_cfg80211_set_auth( + priv, MLAN_ENCRYPTION_MODE_WEP104, wpa_enabled, + wait_option); if (ret) goto done; } @@ -2855,7 +2795,7 @@ woal_cfg80211_assoc(moal_private *priv, void *sme, t_u8 wait_option, /* Zero SSID implies use BSSID to connect */ if (bssid) memset(&ssid_bssid.ssid, 0, sizeof(mlan_802_11_ssid)); - else /* Connect to BSS by ESSID */ + else /* Connect to BSS by ESSID */ memset(&ssid_bssid.bssid, 0, MLAN_MAC_ADDR_LENGTH); if (channel) { ssid_bssid.channel_flags = channel->flags; @@ -2887,8 +2827,12 @@ woal_cfg80211_assoc(moal_private *priv, void *sme, t_u8 wait_option, done: if (ret) { /* clear the encryption mode */ - woal_cfg80211_set_auth(priv, MLAN_ENCRYPTION_MODE_NONE, MFALSE, - wait_option); + if (MLAN_STATUS_SUCCESS != + woal_cfg80211_set_auth(priv, MLAN_ENCRYPTION_MODE_NONE, + MFALSE, wait_option)) { + PRINTM(MERROR, "Could not clear encryption \n"); + ret = -EFAULT; + } /* clear IE */ ie_len = 0; if (MLAN_STATUS_SUCCESS != @@ -2912,19 +2856,16 @@ done: * * @return 0 -- success, otherwise fail */ -static mlan_status -woal_cfg80211_dump_station_info(moal_private *priv, struct station_info *sinfo) +static mlan_status woal_cfg80211_dump_station_info(moal_private *priv, + struct station_info *sinfo) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_get_signal signal; mlan_ds_get_stats stats; mlan_ioctl_req *req = NULL; mlan_ds_rate *rate = NULL; - t_u16 Rates[12] = { - 0x02, 0x04, 0x0B, 0x16, - 0x0C, 0x12, 0x18, 0x24, - 0x30, 0x48, 0x60, 0x6c - }; + t_u16 Rates[12] = {0x02, 0x04, 0x0B, 0x16, 0x0C, 0x12, + 0x18, 0x24, 0x30, 0x48, 0x60, 0x6c}; #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) mlan_bss_info bss_info; t_u8 dtim_period = 0; @@ -2932,17 +2873,16 @@ woal_cfg80211_dump_station_info(moal_private *priv, struct station_info *sinfo) ENTER(); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) - sinfo->filled = - MBIT(NL80211_STA_INFO_RX_BYTES) | - MBIT(NL80211_STA_INFO_TX_BYTES) | - MBIT(NL80211_STA_INFO_RX_PACKETS) | - MBIT(NL80211_STA_INFO_TX_PACKETS) | - MBIT(NL80211_STA_INFO_SIGNAL) | - MBIT(NL80211_STA_INFO_TX_BITRATE); + sinfo->filled = MBIT(NL80211_STA_INFO_RX_BYTES) | + MBIT(NL80211_STA_INFO_TX_BYTES) | + MBIT(NL80211_STA_INFO_RX_PACKETS) | + MBIT(NL80211_STA_INFO_TX_PACKETS) | + MBIT(NL80211_STA_INFO_SIGNAL) | + MBIT(NL80211_STA_INFO_TX_BITRATE); #else sinfo->filled = STATION_INFO_RX_BYTES | STATION_INFO_TX_BYTES | - STATION_INFO_RX_PACKETS | STATION_INFO_TX_PACKETS | - STATION_INFO_SIGNAL | STATION_INFO_TX_BITRATE; + STATION_INFO_RX_PACKETS | STATION_INFO_TX_PACKETS | + STATION_INFO_SIGNAL | STATION_INFO_TX_BITRATE; #endif #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) @@ -2984,7 +2924,8 @@ woal_cfg80211_dump_station_info(moal_private *priv, struct station_info *sinfo) if (ret != MLAN_STATUS_SUCCESS) goto done; if (rate->param.data_rate.tx_rate_format != MLAN_RATE_FORMAT_LG) { - if (rate->param.data_rate.tx_rate_format == MLAN_RATE_FORMAT_HT) { + if (rate->param.data_rate.tx_rate_format == + MLAN_RATE_FORMAT_HT) { sinfo->txrate.flags = RATE_INFO_FLAGS_MCS; if (rate->param.data_rate.tx_ht_bw == MLAN_HT_BW40) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) @@ -3057,8 +2998,8 @@ woal_cfg80211_dump_station_info(moal_private *priv, struct station_info *sinfo) sinfo->bss_param.flags |= BSS_PARAM_FLAGS_SHORT_SLOT_TIME; sinfo->bss_param.beacon_interval = bss_info.beacon_interval; /* Get DTIM period */ - ret = woal_set_get_dtim_period(priv, MLAN_ACT_GET, - MOAL_IOCTL_WAIT, &dtim_period); + ret = woal_set_get_dtim_period(priv, MLAN_ACT_GET, MOAL_IOCTL_WAIT, + &dtim_period); if (ret) { PRINTM(MERROR, "Get DTIM period failed\n"); goto done; @@ -3085,8 +3026,7 @@ done: * * @return N/A */ -void -woal_update_radar_chans_dfs_state(struct wiphy *wiphy) +void woal_update_radar_chans_dfs_state(struct wiphy *wiphy) { moal_handle *handle = (moal_handle *)woal_get_wiphy_priv(wiphy); enum ieee80211_band band; @@ -3121,8 +3061,7 @@ woal_update_radar_chans_dfs_state(struct wiphy *wiphy) * @param rhs RHS value * @return 0 */ -static int -compare(const void *lhs, const void *rhs) +static int compare(const void *lhs, const void *rhs) { const chan_freq_power_t *lhs_cfp = (const chan_freq_power_t *)(lhs); const chan_freq_power_t *rhs_cfp = (const chan_freq_power_t *)(rhs); @@ -3134,7 +3073,6 @@ compare(const void *lhs, const void *rhs) return 0; } - /** * @brief This function update channel region config * @@ -3145,7 +3083,7 @@ compare(const void *lhs, const void *rhs) * @return N/A */ static struct ieee80211_regdomain * -create_custom_regdomain(mlan_ds_custom_reg_domain * custom_reg) +create_custom_regdomain(mlan_ds_custom_reg_domain *custom_reg) { struct ieee80211_reg_rule *rule; bool new_rule; @@ -3164,7 +3102,7 @@ create_custom_regdomain(mlan_ds_custom_reg_domain * custom_reg) custom_reg->num_a_chan, sizeof(chan_freq_power_t), &compare, NULL); regd_size = sizeof(struct ieee80211_regdomain) + - num_chan * sizeof(struct ieee80211_reg_rule); + num_chan * sizeof(struct ieee80211_reg_rule); regd = kzalloc(regd_size, GFP_KERNEL); if (!regd) { @@ -3177,6 +3115,8 @@ create_custom_regdomain(mlan_ds_custom_reg_domain * custom_reg) chan = custom_reg->cfp_tbl[idx].channel; if (!chan) { + if (regd) + kfree(regd); return NULL; } chflags = custom_reg->cfp_tbl[idx].dynamic.flags; @@ -3268,8 +3208,7 @@ create_custom_regdomain(mlan_ds_custom_reg_domain * custom_reg) * * @return 0-success, otherwise failure */ -static int -woal_update_custom_regdomain(moal_private *priv, struct wiphy *wiphy) +static int woal_update_custom_regdomain(moal_private *priv, struct wiphy *wiphy) { mlan_ds_misc_cfg *misc = NULL; mlan_ioctl_req *req = NULL; @@ -3312,9 +3251,9 @@ woal_update_custom_regdomain(moal_private *priv, struct wiphy *wiphy) country_code[1] = priv->phandle->country_code[1]; } if (misc->param.custom_reg_domain.region.country_code[0] != - country_code[0] - || misc->param.custom_reg_domain.region.country_code[1] != - country_code[1]) { + country_code[0] || + misc->param.custom_reg_domain.region.country_code[1] != + country_code[1]) { PRINTM(MERROR, "country code %c%c not match %c%c\n", misc->param.custom_reg_domain.region.country_code[0], misc->param.custom_reg_domain.region.country_code[1], @@ -3378,9 +3317,10 @@ woal_cfg80211_reg_notifier(struct wiphy *wiphy, #endif } - PRINTM(MIOCTL, "cfg80211 regulatory domain callback " - "%c%c initiator=%d\n", request->alpha2[0], request->alpha2[1], - request->initiator); + PRINTM(MIOCTL, + "cfg80211 regulatory domain callback " + "%c%c initiator=%d\n", + request->alpha2[0], request->alpha2[1], request->initiator); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) if (moal_extflg_isset(handle, EXT_DFS_OFFLOAD)) woal_update_radar_chans_dfs_state(wiphy); @@ -3479,8 +3419,8 @@ woal_cfg80211_reg_notifier(struct wiphy *wiphy, * * @return 0 --success, otherwise fail */ -mlan_status -woal_role_switch(moal_private *priv, t_u8 wait_option, t_u8 bss_role) +mlan_status woal_role_switch(moal_private *priv, t_u8 wait_option, + t_u8 bss_role) { int ret = 0; mlan_ds_bss *bss = NULL; @@ -3521,8 +3461,8 @@ done: * * @return 0 -- success, otherwise fail */ -static int -woal_setget_bandcfg(moal_private *priv, t_u8 action, mlan_ds_band_cfg *band_cfg) +static int woal_setget_bandcfg(moal_private *priv, t_u8 action, + mlan_ds_band_cfg *band_cfg) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -3569,8 +3509,7 @@ error: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_uap_scan(moal_private *priv, wlan_user_scan_cfg *scan_cfg) +mlan_status woal_uap_scan(moal_private *priv, wlan_user_scan_cfg *scan_cfg) { mlan_status ret = MLAN_STATUS_SUCCESS; moal_handle *handle = priv->phandle; @@ -3621,14 +3560,13 @@ done: } #endif -static int -woal_find_wps_ie_in_probereq(const t_u8 *ie, int len) +static int woal_find_wps_ie_in_probereq(const t_u8 *ie, int len) { int left_len = len; const t_u8 *pos = ie; t_u8 ie_id, ie_len; IEEEtypes_VendorSpecific_t *pvendor_ie = NULL; - const u8 wps_oui[4] = { 0x00, 0x50, 0xf2, 0x04 }; + const u8 wps_oui[4] = {0x00, 0x50, 0xf2, 0x04}; while (left_len >= 2) { ie_id = *pos; @@ -3637,9 +3575,8 @@ woal_find_wps_ie_in_probereq(const t_u8 *ie, int len) break; if (ie_id == VENDOR_SPECIFIC_221) { pvendor_ie = (IEEEtypes_VendorSpecific_t *)pos; - if (!memcmp - (pvendor_ie->vend_hdr.oui, wps_oui, - sizeof(pvendor_ie->vend_hdr.oui)) && + if (!memcmp(pvendor_ie->vend_hdr.oui, wps_oui, + sizeof(pvendor_ie->vend_hdr.oui)) && pvendor_ie->vend_hdr.oui_type == wps_oui[3]) return MTRUE; } @@ -3659,12 +3596,17 @@ woal_find_wps_ie_in_probereq(const t_u8 *ie, int len) * * @return MTRUE/MFALSE; */ -t_u8 -woal_is_scan_result_expired(moal_private *priv) +t_u8 woal_is_scan_result_expired(moal_private *priv) { mlan_scan_resp scan_resp; struct timeval t; ENTER(); + + if(GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { + LEAVE(); + return MTRUE; + } + if (!woal_is_any_interface_active(priv->phandle)) { LEAVE(); return MTRUE; @@ -3677,7 +3619,7 @@ woal_is_scan_result_expired(moal_private *priv) } woal_get_monotonic_time(&t); /** scan result expired value */ -#define SCAN_RESULT_EXPIRTED 1 +#define SCAN_RESULT_EXPIRTED 1 if (t.tv_sec > (scan_resp.age_in_secs + SCAN_RESULT_EXPIRTED)) { LEAVE(); return MTRUE; @@ -3698,8 +3640,8 @@ woal_is_scan_result_expired(moal_private *priv) * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request) +static int woal_cfg80211_scan(struct wiphy *wiphy, + struct cfg80211_scan_request *request) #else /** * @brief Request the driver to do a scan. Always returning @@ -3713,9 +3655,8 @@ woal_cfg80211_scan(struct wiphy *wiphy, struct cfg80211_scan_request *request) * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev, - struct cfg80211_scan_request *request) +static int woal_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_scan_request *request) #endif { #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) @@ -3825,7 +3766,7 @@ woal_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev, #ifdef WIFI_DIRECT_SUPPORT } #endif - /** indicate FW, gap is optional */ + /** indicate FW, gap is optional */ if (scan_req->scan_chan_gap && priv->phandle->pref_mac) scan_req->scan_chan_gap |= GAP_FLAG_OPTIONAL; @@ -3849,14 +3790,14 @@ woal_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev, } #endif #endif - for (i = 0; - i < MIN(WLAN_USER_SCAN_CHAN_MAX, - priv->phandle->scan_request->n_channels); i++) { + for (i = 0; i < MIN(WLAN_USER_SCAN_CHAN_MAX, + priv->phandle->scan_request->n_channels); + i++) { chan = priv->phandle->scan_request->channels[i]; scan_req->chan_list[i].chan_number = chan->hw_value; scan_req->chan_list[i].radio_type = chan->band; - if ((chan->flags & IEEE80211_CHAN_PASSIVE_SCAN) - || !priv->phandle->scan_request->n_ssids) + if ((chan->flags & IEEE80211_CHAN_PASSIVE_SCAN) || + !priv->phandle->scan_request->n_ssids) scan_req->chan_list[i].scan_type = MLAN_SCAN_TYPE_PASSIVE; else if (chan->flags & IEEE80211_CHAN_RADAR) @@ -3902,21 +3843,19 @@ woal_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev, } if (priv->phandle->scan_request->ie && priv->phandle->scan_request->ie_len) { - if (woal_find_wps_ie_in_probereq - ((t_u8 *)priv->phandle->scan_request->ie, - priv->phandle->scan_request->ie_len)) { + if (woal_find_wps_ie_in_probereq( + (t_u8 *)priv->phandle->scan_request->ie, + priv->phandle->scan_request->ie_len)) { PRINTM(MIOCTL, "Notify firmware only keep probe response\n"); scan_req->proberesp_only = MTRUE; } if (MLAN_STATUS_SUCCESS != - woal_cfg80211_mgmt_frame_ie(priv, NULL, 0, - NULL, 0, NULL, 0, - (t_u8 *)priv->phandle-> - scan_request->ie, - priv->phandle->scan_request-> - ie_len, MGMT_MASK_PROBE_REQ, - MOAL_IOCTL_WAIT)) { + woal_cfg80211_mgmt_frame_ie( + priv, NULL, 0, NULL, 0, NULL, 0, + (t_u8 *)priv->phandle->scan_request->ie, + priv->phandle->scan_request->ie_len, + MGMT_MASK_PROBE_REQ, MOAL_IOCTL_WAIT)) { PRINTM(MERROR, "Fail to set scan request IE\n"); ret = -EFAULT; goto done; @@ -3931,7 +3870,7 @@ woal_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev, } #ifdef UAP_CFG80211 if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { - /** use sync scan for uap */ + /** use sync scan for uap */ ret = woal_uap_scan(priv, scan_req); if (!ret) { kfree(scan_req); @@ -3949,9 +3888,8 @@ woal_cfg80211_scan(struct wiphy *wiphy, struct net_device *dev, get_random_bytes(buf, ETH_ALEN); for (i = 0; i < ETH_ALEN; i++) { buf[i] &= ~request->mac_addr_mask[i]; - buf[i] |= - request->mac_addr[i] & request-> - mac_addr_mask[i]; + buf[i] |= request->mac_addr[i] & + request->mac_addr_mask[i]; } moal_memcpy_ext(priv->phandle, scan_req->random_mac, buf, ETH_ALEN, sizeof(scan_req->random_mac)); @@ -3981,10 +3919,9 @@ done: LEAVE(); return ret; } - #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) -static void -woal_cfg80211_abort_scan(struct wiphy *wiphy, struct wireless_dev *wdev) +static void woal_cfg80211_abort_scan(struct wiphy *wiphy, + struct wireless_dev *wdev) { moal_private *priv = (moal_private *)woal_get_netdev_priv(wdev->netdev); ENTER(); @@ -3997,16 +3934,15 @@ woal_cfg80211_abort_scan(struct wiphy *wiphy, struct wireless_dev *wdev) /** * @brief construct and send ft action request * -* @param priv A pointer to moal_private structure + * @param priv A pointer to moal_private structure * @param ie A pointer to ft ie * @param le Value of ie len * @param bssid A pointer to target ap bssid * @ * @return 0 -- success, otherwise fail */ -static int -woal_send_ft_action_requst(moal_private *priv, t_u8 *ie, t_u8 len, t_u8 *bssid, - t_u8 *target_ap) +static int woal_send_ft_action_requst(moal_private *priv, t_u8 *ie, t_u8 len, + t_u8 *bssid, t_u8 *target_ap) { IEEE80211_MGMT *mgmt = NULL; mlan_status status = MLAN_STATUS_SUCCESS; @@ -4014,21 +3950,21 @@ woal_send_ft_action_requst(moal_private *priv, t_u8 *ie, t_u8 len, t_u8 *bssid, t_u32 pkt_type; t_u32 tx_control; t_u16 packet_len = 0; - t_u8 addr[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; + t_u8 addr[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; int ret = 0; ENTER(); /* pkt_type + tx_control */ -#define HEADER_SIZE 8 - /* frmctl + durationid + addr1 + addr2 + addr3 + seqctl + addr4 */ -#define MGMT_HEADER_LEN (2 + 2 + 6 + 6 + 6 + 2 +6) +#define HEADER_SIZE 8 + /* frmctl + durationid + addr1 + addr2 + addr3 + seqctl + addr4*/ +#define MGMT_HEADER_LEN (2 + 2 + 6 + 6 + 6 + 2 + 6) /* 14 = category + action + sta addr + target ap */ #define FT_REQUEST_LEN 14 packet_len = (t_u16)len + MGMT_HEADER_LEN + FT_REQUEST_LEN; pmbuf = woal_alloc_mlan_buffer(priv->phandle, MLAN_MIN_DATA_HEADER_LEN + HEADER_SIZE + - packet_len + sizeof(packet_len)); + packet_len + sizeof(packet_len)); if (!pmbuf) { PRINTM(MERROR, "Fail to allocate mlan_buffer\n"); ret = -ENOMEM; @@ -4044,7 +3980,7 @@ woal_send_ft_action_requst(moal_private *priv, t_u8 *ie, t_u8 len, t_u8 *bssid, moal_memcpy_ext(priv->phandle, pmbuf->pbuf + pmbuf->data_offset + sizeof(pkt_type), &tx_control, sizeof(tx_control), sizeof(tx_control)); - /*Add packet len */ + /*Add packet len*/ moal_memcpy_ext(priv->phandle, pmbuf->pbuf + pmbuf->data_offset + HEADER_SIZE, &packet_len, sizeof(packet_len), sizeof(packet_len)); @@ -4052,8 +3988,8 @@ woal_send_ft_action_requst(moal_private *priv, t_u8 *ie, t_u8 len, t_u8 *bssid, mgmt = (IEEE80211_MGMT *)(pmbuf->pbuf + pmbuf->data_offset + HEADER_SIZE + sizeof(packet_len)); memset(mgmt, 0, MGMT_HEADER_LEN); - mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | - IEEE80211_STYPE_ACTION); + mgmt->frame_control = + cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_ACTION); moal_memcpy_ext(priv->phandle, mgmt->da, bssid, ETH_ALEN, sizeof(mgmt->da)); moal_memcpy_ext(priv->phandle, mgmt->sa, priv->current_addr, ETH_ALEN, @@ -4063,7 +3999,7 @@ woal_send_ft_action_requst(moal_private *priv, t_u8 *ie, t_u8 len, t_u8 *bssid, moal_memcpy_ext(priv->phandle, mgmt->addr4, addr, ETH_ALEN, sizeof(mgmt->addr4)); - mgmt->u.ft_req.category = 0x06; /**ft action code 0x6*/ + mgmt->u.ft_req.category = 0x06; /**ft action code 0x6*/ mgmt->u.ft_req.action = 0x1; /**ft action request*/ moal_memcpy_ext(priv->phandle, mgmt->u.ft_req.sta_addr, priv->current_addr, ETH_ALEN, @@ -4102,19 +4038,18 @@ done: LEAVE(); return ret; } - /** * @brief construct and send ft auth request * -* @param priv A pointer to moal_private structure + * @param priv A pointer to moal_private structure * @param ie A pointer to ft ie * @param le Value of ie len * @param bssid A pointer to target ap bssid * @ * @return 0 -- success, otherwise fail */ -static int -woal_send_ft_auth_requst(moal_private *priv, t_u8 *ie, t_u8 len, t_u8 *bssid) +static int woal_send_ft_auth_requst(moal_private *priv, t_u8 *ie, t_u8 len, + t_u8 *bssid) { IEEE80211_MGMT *mgmt = NULL; mlan_status status = MLAN_STATUS_SUCCESS; @@ -4122,20 +4057,20 @@ woal_send_ft_auth_requst(moal_private *priv, t_u8 *ie, t_u8 len, t_u8 *bssid) t_u32 pkt_type; t_u32 tx_control; t_u16 packet_len = 0; - t_u8 addr[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; + t_u8 addr[] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; int ret = 0; ENTER(); /* pkt_type + tx_control */ -#define HEADER_SIZE 8 - /* frmctl + durationid + addr1 + addr2 + addr3 + seqctl + addr4 */ -#define MGMT_HEADER_LEN (2 + 2 + 6 + 6 + 6 + 2 +6) - /* 6 = auth_alg + auth_transaction +auth_status */ +#define HEADER_SIZE 8 + /* frmctl + durationid + addr1 + addr2 + addr3 + seqctl + addr4*/ +#define MGMT_HEADER_LEN (2 + 2 + 6 + 6 + 6 + 2 + 6) + /* 6 = auth_alg + auth_transaction +auth_status*/ #define AUTH_BODY_LEN 6 packet_len = (t_u16)len + MGMT_HEADER_LEN + AUTH_BODY_LEN; pmbuf = woal_alloc_mlan_buffer(priv->phandle, MLAN_MIN_DATA_HEADER_LEN + HEADER_SIZE + - packet_len + sizeof(packet_len)); + packet_len + sizeof(packet_len)); if (!pmbuf) { PRINTM(MERROR, "Fail to allocate mlan_buffer\n"); ret = -ENOMEM; @@ -4151,7 +4086,7 @@ woal_send_ft_auth_requst(moal_private *priv, t_u8 *ie, t_u8 len, t_u8 *bssid) moal_memcpy_ext(priv->phandle, pmbuf->pbuf + pmbuf->data_offset + sizeof(pkt_type), &tx_control, sizeof(tx_control), sizeof(tx_control)); - /*Add packet len */ + /*Add packet len*/ moal_memcpy_ext(priv->phandle, pmbuf->pbuf + pmbuf->data_offset + HEADER_SIZE, &packet_len, sizeof(packet_len), sizeof(packet_len)); @@ -4159,8 +4094,8 @@ woal_send_ft_auth_requst(moal_private *priv, t_u8 *ie, t_u8 len, t_u8 *bssid) mgmt = (IEEE80211_MGMT *)(pmbuf->pbuf + pmbuf->data_offset + HEADER_SIZE + sizeof(packet_len)); memset(mgmt, 0, MGMT_HEADER_LEN); - mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | - IEEE80211_STYPE_AUTH); + mgmt->frame_control = + cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH); moal_memcpy_ext(priv->phandle, mgmt->da, bssid, ETH_ALEN, sizeof(mgmt->da)); moal_memcpy_ext(priv->phandle, mgmt->sa, priv->current_addr, ETH_ALEN, @@ -4213,9 +4148,8 @@ done: * * @return 0 -- success, otherwise fail */ -static int -woal_connect_ft_over_air(moal_private *priv, t_u8 *bssid, - struct ieee80211_channel *chan) +static int woal_connect_ft_over_air(moal_private *priv, t_u8 *bssid, + struct ieee80211_channel *chan) { #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) t_u8 status = 0; @@ -4234,23 +4168,22 @@ woal_connect_ft_over_air(moal_private *priv, t_u8 *bssid, return -EFAULT; } - /*enable auth register frame */ + /*enable auth register frame*/ woal_mgmt_frame_register(priv, IEEE80211_STYPE_AUTH, MTRUE); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) -#define AUTH_TX_DEFAULT_WAIT_TIME 1200 +#define AUTH_TX_DEFAULT_WAIT_TIME 1200 woal_cfg80211_remain_on_channel_cfg(priv, wait_option, MFALSE, &status, chan, 0, AUTH_TX_DEFAULT_WAIT_TIME); #endif - /*construct auth request and send out */ + /*construct auth request and send out*/ woal_send_ft_auth_requst(priv, priv->ft_ie, priv->ft_ie_len, bssid); PRINTM(MMSG, "wlan: send out FT auth,wait for auth response\n"); - /*wait until received auth response */ + /*wait until received auth response*/ priv->ft_wait_condition = MFALSE; - timeout = - wait_event_timeout(priv->ft_wait_q, priv->ft_wait_condition, - 1 * HZ); + timeout = wait_event_timeout(priv->ft_wait_q, priv->ft_wait_condition, + 1 * HZ); if (!timeout) { /*connet fail */ if (!priv->ft_roaming_triggered_by_driver) { @@ -4290,9 +4223,8 @@ woal_connect_ft_over_air(moal_private *priv, t_u8 *bssid, * * @return 0 -- success, otherwise fail */ -static int -woal_connect_ft_over_ds(moal_private *priv, t_u8 *bssid, - struct ieee80211_channel *pchan) +static int woal_connect_ft_over_ds(moal_private *priv, t_u8 *bssid, + struct ieee80211_channel *pchan) { #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) t_u8 status = 0; @@ -4308,23 +4240,21 @@ woal_connect_ft_over_ds(moal_private *priv, t_u8 *bssid, woal_cfg80211_remain_on_channel_cfg(priv, wait_option, MFALSE, &status, pchan, 0, 1200); #endif - /*construct ft action request and send out */ + /*construct ft action request and send out*/ woal_send_ft_action_requst(priv, priv->ft_ie, priv->ft_ie_len, (t_u8 *)priv->cfg_bssid, bssid); PRINTM(MMSG, "wlan: send out FT request,wait for FT response\n"); - /*wait until received auth response */ + /*wait until received auth response*/ priv->ft_wait_condition = MFALSE; - timeout = - wait_event_timeout(priv->ft_wait_q, - priv->ft_wait_condition, 1 * HZ); + timeout = wait_event_timeout(priv->ft_wait_q, + priv->ft_wait_condition, 1 * HZ); if (!timeout) { /*go over air, as current AP may be unreachable */ PRINTM(MMSG, "wlan: go over air\n"); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) - woal_cfg80211_remain_on_channel_cfg(priv, wait_option, - MTRUE, &status, - NULL, 0, 0); + woal_cfg80211_remain_on_channel_cfg( + priv, wait_option, MTRUE, &status, NULL, 0, 0); #endif woal_connect_ft_over_air(priv, bssid, pchan); LEAVE(); @@ -4354,8 +4284,8 @@ woal_connect_ft_over_ds(moal_private *priv, t_u8 *bssid, * * @return 0 -- success, otherwise fail */ -static int -woal_start_ft_roaming(moal_private *priv, mlan_ssid_bssid *ssid_bssid) +static int woal_start_ft_roaming(moal_private *priv, + mlan_ssid_bssid *ssid_bssid) { struct ieee80211_channel chan; int ret = 0; @@ -4363,20 +4293,22 @@ woal_start_ft_roaming(moal_private *priv, mlan_ssid_bssid *ssid_bssid) ENTER(); PRINTM(MEVENT, "Try to start FT roaming......\n"); - chan.band = (ssid_bssid->channel < 36) ? - IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ; + chan.band = (ssid_bssid->channel < 36) ? IEEE80211_BAND_2GHZ : + IEEE80211_BAND_5GHZ; chan.center_freq = ieee80211_channel_to_frequency(ssid_bssid->channel #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) - , chan.band + , + chan.band #endif - ); + ); if (!(priv->last_event & EVENT_PRE_BCN_LOST) && (ssid_bssid->ft_cap & MBIT(0))) { woal_connect_ft_over_ds(priv, (t_u8 *)&ssid_bssid->bssid, &chan); } else { - /*if pre beacon lost, it need to send auth request instead ft action request when ft over ds */ + /*if pre beacon lost, it need to send auth request instead ft + * action request when ft over ds */ woal_connect_ft_over_air(priv, (t_u8 *)&ssid_bssid->bssid, &chan); } @@ -4384,7 +4316,6 @@ woal_start_ft_roaming(moal_private *priv, mlan_ssid_bssid *ssid_bssid) LEAVE(); return ret; } - /** * @brief Request the driver to connect to the ESS with * the specified parameters from kernel @@ -4395,9 +4326,8 @@ woal_start_ft_roaming(moal_private *priv, mlan_ssid_bssid *ssid_bssid) * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, - struct cfg80211_connect_params *sme) +static int woal_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_connect_params *sme) { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); int ret = 0; @@ -4425,7 +4355,7 @@ woal_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, && priv->wdev->iftype != NL80211_IFTYPE_P2P_CLIENT #endif /* KERNEL_VERSION */ #endif /* WIFI_DIRECT_SUPPORT */ - ) { + ) { PRINTM(MERROR, "Received infra assoc request when station not in infra mode\n"); LEAVE(); @@ -4439,13 +4369,13 @@ woal_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, moal_memcpy_ext(priv->phandle, &ssid_bssid.bssid, sme->bssid, ETH_ALEN, sizeof(ssid_bssid.bssid)); /* Not allowed to connect to the same AP which is already connected - with other interface */ + with other interface */ for (i = 0; i < handle->priv_num; i++) { if (handle->priv[i] != priv && MTRUE == woal_is_connected(handle->priv[i], &ssid_bssid)) { PRINTM(MMSG, - "wlan: already connected with other interface, bssid " - MACSTR "\n", + "wlan: already connected with other interface, bssid " MACSTR + "\n", MAC2STR(handle->priv[i]->cfg_bssid)); LEAVE(); return -EINVAL; @@ -4457,18 +4387,19 @@ woal_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, #ifdef WIFI_DIRECT_SUPPORT #if CFG80211_VERSION_CODE >= WIFI_DIRECT_KERNEL_VERSION - if (priv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT - && (priv->wdev->iftype == NL80211_IFTYPE_STATION - || priv->wdev->iftype == NL80211_IFTYPE_P2P_CLIENT)) { - /* if bsstype == wifi direct, and iftype == station or p2p client, - * that means wpa_supplicant wants to enable wifi direct + if (priv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT && + (priv->wdev->iftype == NL80211_IFTYPE_STATION || + priv->wdev->iftype == NL80211_IFTYPE_P2P_CLIENT)) { + /* if bsstype == wifi direct, and iftype == station or p2p + * client, that means wpa_supplicant wants to enable wifi direct * functionality, so we should init p2p client. * * Note that due to kernel iftype check, ICS wpa_supplicant * could not updaet iftype to init p2p client, so we have to * done it here. * */ - if (MLAN_STATUS_SUCCESS != woal_cfg80211_init_p2p_client(priv)) { + if (MLAN_STATUS_SUCCESS != + woal_cfg80211_init_p2p_client(priv)) { PRINTM(MERROR, "Init p2p client for wpa_supplicant failed.\n"); ret = -EFAULT; @@ -4486,10 +4417,10 @@ woal_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, /*11r roaming triggered by supplicant */ if (priv->media_connected && priv->ft_ie_len && !(priv->ft_cap & MBIT(0))) { - /** get current bss info */ + /** get current bss info */ memset(&bss_info, 0, sizeof(bss_info)); woal_get_bss_info(priv, MOAL_IOCTL_WAIT, &bss_info); - /** get target bss info */ + /** get target bss info */ if (MLAN_STATUS_SUCCESS != woal_find_essid(priv, &ssid_bssid, MOAL_IOCTL_WAIT)) { ret = woal_cfg80211_connect_scan(priv, sme, @@ -4544,7 +4475,6 @@ woal_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, priv->ft_md = 0; priv->ft_cap = 0; } - } spin_lock_irqsave(&priv->connect_lock, flags); priv->cfg_connect = MFALSE; @@ -4556,7 +4486,7 @@ woal_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, cfg80211_connect_result(priv->netdev, priv->cfg_bssid, NULL, 0, passoc_rsp->ie_buffer, assoc_rsp->assoc_resp_len - - ASSOC_RESP_FIXED_SIZE, + ASSOC_RESP_FIXED_SIZE, WLAN_STATUS_SUCCESS, GFP_KERNEL); } else { PRINTM(MINFO, "wlan: Failed to connect to bssid " MACSTR "\n", @@ -4566,7 +4496,6 @@ woal_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, cfg80211_connect_result(priv->netdev, priv->cfg_bssid, NULL, 0, NULL, 0, woal_get_assoc_status(priv), GFP_KERNEL); - } kfree(assoc_rsp); @@ -4583,8 +4512,7 @@ woal_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, * received from firmware * @return N/A */ -static void -woal_print_disconnect_reason(t_u16 reason_code) +static void woal_print_disconnect_reason(t_u16 reason_code) { ENTER(); @@ -4641,9 +4569,8 @@ woal_print_disconnect_reason(t_u16 reason_code) * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, - t_u16 reason_code) +static int woal_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, + t_u16 reason_code) { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -4690,9 +4617,8 @@ woal_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, } priv->cfg_disconnect = MTRUE; - if (woal_disconnect - (priv, MOAL_IOCTL_WAIT_TIMEOUT, priv->cfg_bssid, - reason_code) != MLAN_STATUS_SUCCESS) { + if (woal_disconnect(priv, MOAL_IOCTL_WAIT_TIMEOUT, priv->cfg_bssid, + reason_code) != MLAN_STATUS_SUCCESS) { priv->cfg_disconnect = MFALSE; LEAVE(); return -EFAULT; @@ -4718,23 +4644,22 @@ woal_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, } /** -* @brief This function is deauthentication handler when host MLME -* enable. -* In this case driver will prepare and send Deauth Req. -* -* @param wiphy A pointer to wiphy. -* -* @param dev A pointer to net_device -* -* @param req A pointer to cfg80211_deauth_request -* -* @return 0 -- success, otherwise fail -*/ + * @brief This function is deauthentication handler when host MLME + * enable. + * In this case driver will prepare and send Deauth Req. + * + * @param wiphy A pointer to wiphy. + * + * @param dev A pointer to net_device + * + * @param req A pointer to cfg80211_deauth_request + * + * @return 0 -- success, otherwise fail + */ -static int -woal_cfg80211_deauthenticate(struct wiphy *wiphy, - struct net_device *dev, - struct cfg80211_deauth_request *req) +static int woal_cfg80211_deauthenticate(struct wiphy *wiphy, + struct net_device *dev, + struct cfg80211_deauth_request *req) { int ret = 0; #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) @@ -4755,21 +4680,21 @@ woal_cfg80211_deauthenticate(struct wiphy *wiphy, } /** -* @brief This function is disassociation handler when host MLME -* enable. -* In this case driver will prepare and send Disassoc frame. -* -* @param wiphy A pointer to wiphy. -* -* @param dev A pointer to net_device -* -* @param req A pointer to cfg80211_disassoc_request -* -* @return 0 -- success, otherwise fail -*/ -static int -woal_cfg80211_disassociate(struct wiphy *wiphy, struct net_device *dev, - struct cfg80211_disassoc_request *req) + * @brief This function is disassociation handler when host MLME + * enable. + * In this case driver will prepare and send Disassoc frame. + * + * @param wiphy A pointer to wiphy. + * + * @param dev A pointer to net_device + * + * @param req A pointer to cfg80211_disassoc_request + * + * @return 0 -- success, otherwise fail + */ +static int woal_cfg80211_disassociate(struct wiphy *wiphy, + struct net_device *dev, + struct cfg80211_disassoc_request *req) { int ret = 0; #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) @@ -4799,14 +4724,14 @@ woal_cfg80211_disassociate(struct wiphy *wiphy, struct net_device *dev, * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, +static int woal_cfg80211_get_station(struct wiphy *wiphy, + struct net_device *dev, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) - const t_u8 *mac, + const t_u8 *mac, #else - t_u8 *mac, + t_u8 *mac, #endif - struct station_info *sinfo) + struct station_info *sinfo) { mlan_status ret = MLAN_STATUS_SUCCESS; moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -4825,11 +4750,12 @@ woal_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, return -ENOENT; } - if (MLAN_STATUS_SUCCESS != woal_cfg80211_dump_station_info(priv, sinfo)) { + if (MLAN_STATUS_SUCCESS != + woal_cfg80211_dump_station_info(priv, sinfo)) { PRINTM(MERROR, "cfg80211: Failed to get station info\n"); ret = -EFAULT; } -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,2,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) #endif LEAVE(); return ret; @@ -4846,10 +4772,9 @@ woal_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_dump_station(struct wiphy *wiphy, - struct net_device *dev, int idx, - t_u8 *mac, struct station_info *sinfo) +static int woal_cfg80211_dump_station(struct wiphy *wiphy, + struct net_device *dev, int idx, + t_u8 *mac, struct station_info *sinfo) { mlan_status ret = MLAN_STATUS_SUCCESS; moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -4874,7 +4799,8 @@ woal_cfg80211_dump_station(struct wiphy *wiphy, moal_memcpy_ext(priv->phandle, mac, priv->cfg_bssid, ETH_ALEN, ETH_ALEN); - if (MLAN_STATUS_SUCCESS != woal_cfg80211_dump_station_info(priv, sinfo)) { + if (MLAN_STATUS_SUCCESS != + woal_cfg80211_dump_station_info(priv, sinfo)) { PRINTM(MERROR, "cfg80211: Failed to get station info\n"); ret = -EFAULT; } @@ -4890,8 +4816,7 @@ woal_cfg80211_dump_station(struct wiphy *wiphy, * * @return IEEE band type */ -t_u8 -woal_bandcfg_to_ieee_band(Band_Config_t bandcfg) +t_u8 woal_bandcfg_to_ieee_band(Band_Config_t bandcfg) { t_u8 ret_radio_type = 0; @@ -4920,9 +4845,9 @@ woal_bandcfg_to_ieee_band(Band_Config_t bandcfg) * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_dump_survey(struct wiphy *wiphy, struct net_device *dev, - int idx, struct survey_info *survey) +static int woal_cfg80211_dump_survey(struct wiphy *wiphy, + struct net_device *dev, int idx, + struct survey_info *survey) { int ret = -ENOENT; moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -4934,9 +4859,8 @@ woal_cfg80211_dump_survey(struct wiphy *wiphy, struct net_device *dev, PRINTM(MIOCTL, "dump_survey idx=%d\n", idx); memset(&scan_resp, 0, sizeof(scan_resp)); - if (MLAN_STATUS_SUCCESS != woal_get_scan_table(priv, - MOAL_IOCTL_WAIT, - &scan_resp)) { + if (MLAN_STATUS_SUCCESS != + woal_get_scan_table(priv, MOAL_IOCTL_WAIT, &scan_resp)) { ret = -EFAULT; goto done; } @@ -4951,15 +4875,13 @@ woal_cfg80211_dump_survey(struct wiphy *wiphy, struct net_device *dev, ret = 0; memset(survey, 0, sizeof(*survey)); band = woal_bandcfg_to_ieee_band(pchan_stats[idx].bandcfg); - survey->channel = - ieee80211_get_channel(wiphy, - ieee80211_channel_to_frequency(pchan_stats - [idx]. - chan_num + survey->channel = ieee80211_get_channel( + wiphy, ieee80211_channel_to_frequency(pchan_stats[idx].chan_num #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) - , band + , + band #endif - )); + )); survey->filled = SURVEY_INFO_NOISE_DBM; survey->noise = pchan_stats[idx].noise; #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) @@ -4980,10 +4902,9 @@ done: } #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) -static int -woal_cfg80211_get_channel(struct wiphy *wiphy, - struct wireless_dev *wdev, - struct cfg80211_chan_def *chandef) +static int woal_cfg80211_get_channel(struct wiphy *wiphy, + struct wireless_dev *wdev, + struct cfg80211_chan_def *chandef) { moal_private *priv = (moal_private *)woal_get_netdev_priv(wdev->netdev); chan_band_info channel; @@ -5006,7 +4927,7 @@ woal_cfg80211_get_channel(struct wiphy *wiphy, } } else #endif - if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) { + if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_STA) { if (priv->media_connected == MTRUE) { if (MLAN_STATUS_SUCCESS != woal_get_sta_channel(priv, MOAL_IOCTL_WAIT, @@ -5042,9 +4963,9 @@ woal_cfg80211_get_channel(struct wiphy *wiphy, * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_set_power_mgmt(struct wiphy *wiphy, - struct net_device *dev, bool enabled, int timeout) +static int woal_cfg80211_set_power_mgmt(struct wiphy *wiphy, + struct net_device *dev, bool enabled, + int timeout) { int ret = 0, disabled; moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -5079,9 +5000,9 @@ woal_cfg80211_set_power_mgmt(struct wiphy *wiphy, else disabled = 1; - if (MLAN_STATUS_SUCCESS != - woal_set_get_power_mgmt(priv, MLAN_ACT_SET, &disabled, timeout, - MOAL_IOCTL_WAIT)) { + if (MLAN_STATUS_SUCCESS != woal_set_get_power_mgmt(priv, MLAN_ACT_SET, + &disabled, timeout, + MOAL_IOCTL_WAIT)) { ret = -EOPNOTSUPP; } @@ -5099,12 +5020,11 @@ woal_cfg80211_set_power_mgmt(struct wiphy *wiphy, * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_get_tx_power(struct wiphy *wiphy, +static int woal_cfg80211_get_tx_power(struct wiphy *wiphy, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) - struct wireless_dev *wdev, + struct wireless_dev *wdev, #endif - int *dbm) + int *dbm) { int ret = 0; moal_private *priv = NULL; @@ -5138,7 +5058,6 @@ woal_cfg80211_get_tx_power(struct wiphy *wiphy, LEAVE(); return ret; } - /** * @brief Request the driver to change the transmit power * @@ -5148,17 +5067,16 @@ woal_cfg80211_get_tx_power(struct wiphy *wiphy, * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_set_tx_power(struct wiphy *wiphy, +static int woal_cfg80211_set_tx_power(struct wiphy *wiphy, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) - struct wireless_dev *wdev, + struct wireless_dev *wdev, #endif #if CFG80211_VERSION_CODE < KERNEL_VERSION(2, 6, 36) - enum tx_power_setting type, + enum tx_power_setting type, #else - enum nl80211_tx_power_setting type, + enum nl80211_tx_power_setting type, #endif - int dbm) + int dbm) { int ret = 0; moal_private *priv = NULL; @@ -5198,10 +5116,9 @@ woal_cfg80211_set_tx_power(struct wiphy *wiphy, * @param rssi_thold rssi threshold * @param rssi_hyst rssi hysteresis */ -static int -woal_cfg80211_set_cqm_rssi_config(struct wiphy *wiphy, - struct net_device *dev, - s32 rssi_thold, u32 rssi_hyst) +static int woal_cfg80211_set_cqm_rssi_config(struct wiphy *wiphy, + struct net_device *dev, + s32 rssi_thold, u32 rssi_hyst) { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); ENTER(); @@ -5209,8 +5126,8 @@ woal_cfg80211_set_cqm_rssi_config(struct wiphy *wiphy, priv->cqm_rssi_high_thold = rssi_thold; priv->cqm_rssi_hyst = rssi_hyst; - PRINTM(MIOCTL, "rssi_thold=%d rssi_hyst=%d\n", - (int)rssi_thold, (int)rssi_hyst); + PRINTM(MIOCTL, "rssi_thold=%d rssi_hyst=%d\n", (int)rssi_thold, + (int)rssi_hyst); woal_set_rssi_threshold(priv, 0, MOAL_IOCTL_WAIT); LEAVE(); return 0; @@ -5231,12 +5148,11 @@ woal_cfg80211_set_cqm_rssi_config(struct wiphy *wiphy, * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_remain_on_channel_cfg(moal_private *priv, - t_u8 wait_option, t_u8 remove, t_u8 *status, - struct ieee80211_channel *chan, - enum mlan_channel_type channel_type, - t_u32 duration) +int woal_cfg80211_remain_on_channel_cfg(moal_private *priv, t_u8 wait_option, + t_u8 remove, t_u8 *status, + struct ieee80211_channel *chan, + enum mlan_channel_type channel_type, + t_u32 duration) { mlan_ds_remain_chan chan_cfg; int ret = 0; @@ -5290,7 +5206,6 @@ woal_cfg80211_remain_on_channel_cfg(moal_private *priv, "Remain on Channel: chan=%d, offset=%d width=%d\n", chan_cfg.channel, chan_cfg.bandcfg.chan2Offset, chan_cfg.bandcfg.chanWidth); - } if (MLAN_STATUS_SUCCESS == woal_set_remain_channel_ioctl(priv, wait_option, &chan_cfg)) @@ -5311,9 +5226,9 @@ woal_cfg80211_remain_on_channel_cfg(moal_private *priv, * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy, - struct wireless_dev *wdev, u64 cookie) +static int woal_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy, + struct wireless_dev *wdev, + u64 cookie) #else /** * @brief tx mgmt frame @@ -5324,9 +5239,8 @@ woal_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy, * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy, - struct net_device *dev, u64 cookie) +static int woal_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy, + struct net_device *dev, u64 cookie) #endif { #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) @@ -5349,9 +5263,9 @@ woal_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy, ret = -EFAULT; goto done; } - if (woal_cfg80211_remain_on_channel_cfg - (remain_priv, MOAL_IOCTL_WAIT, MTRUE, &status, NULL, 0, - 0)) { + if (woal_cfg80211_remain_on_channel_cfg(remain_priv, + MOAL_IOCTL_WAIT, MTRUE, + &status, NULL, 0, 0)) { PRINTM(MERROR, "mgmt_tx_cancel_wait: Fail to cancel remain on channel\n"); ret = -EFAULT; @@ -5360,23 +5274,15 @@ woal_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy, if (priv->phandle->cookie) { cfg80211_remain_on_channel_expired( #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 6, 0) - remain_priv-> - netdev, + remain_priv->netdev, #else - remain_priv-> - wdev, + remain_priv->wdev, #endif - priv-> - phandle-> - cookie, - &priv-> - phandle->chan, + priv->phandle->cookie, &priv->phandle->chan, #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - priv-> - phandle-> - channel_type, + priv->phandle->channel_type, #endif - GFP_ATOMIC); + GFP_ATOMIC); priv->phandle->cookie = 0; } priv->phandle->remain_on_channel = MFALSE; @@ -5401,13 +5307,12 @@ done: * @return 0 -- success, otherwise fail */ static int -woal_cfg80211_remain_on_channel(struct wiphy *wiphy, - struct wireless_dev *wdev, +woal_cfg80211_remain_on_channel(struct wiphy *wiphy, struct wireless_dev *wdev, struct ieee80211_channel *chan, #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) enum nl80211_channel_type channel_type, #endif - unsigned int duration, u64 * cookie) + unsigned int duration, u64 *cookie) #else /** * @brief Make chip remain on channel @@ -5422,11 +5327,10 @@ woal_cfg80211_remain_on_channel(struct wiphy *wiphy, * @return 0 -- success, otherwise fail */ static int -woal_cfg80211_remain_on_channel(struct wiphy *wiphy, - struct net_device *dev, +woal_cfg80211_remain_on_channel(struct wiphy *wiphy, struct net_device *dev, struct ieee80211_channel *chan, enum nl80211_channel_type channel_type, - unsigned int duration, u64 * cookie) + unsigned int duration, u64 *cookie) #endif { #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) @@ -5446,8 +5350,7 @@ woal_cfg80211_remain_on_channel(struct wiphy *wiphy, } /** cancel previous remain on channel */ if (priv->phandle->remain_on_channel && - ((priv->phandle->chan.center_freq != chan->center_freq) - )) { + ((priv->phandle->chan.center_freq != chan->center_freq))) { remain_priv = priv->phandle->priv[priv->phandle->remain_bss_index]; if (!remain_priv) { @@ -5457,9 +5360,9 @@ woal_cfg80211_remain_on_channel(struct wiphy *wiphy, ret = -EFAULT; goto done; } - if (woal_cfg80211_remain_on_channel_cfg - (remain_priv, MOAL_IOCTL_WAIT, MTRUE, &status, NULL, 0, - 0)) { + if (woal_cfg80211_remain_on_channel_cfg(remain_priv, + MOAL_IOCTL_WAIT, MTRUE, + &status, NULL, 0, 0)) { PRINTM(MERROR, "remain_on_channel: Fail to cancel remain on channel\n"); ret = -EFAULT; @@ -5469,8 +5372,8 @@ woal_cfg80211_remain_on_channel(struct wiphy *wiphy, priv->phandle->remain_on_channel = MFALSE; } if (MLAN_STATUS_SUCCESS != - woal_cfg80211_remain_on_channel_cfg(priv, MOAL_IOCTL_WAIT, - MFALSE, &status, chan, + woal_cfg80211_remain_on_channel_cfg(priv, MOAL_IOCTL_WAIT, MFALSE, + &status, chan, #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) channel_type, #else @@ -5496,9 +5399,9 @@ woal_cfg80211_remain_on_channel(struct wiphy *wiphy, /* remain on channel operation success */ /* we need update the value cookie */ #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - *cookie = (u64) random32() | 1; + *cookie = (u64)random32() | 1; #else - *cookie = (u64) prandom_u32() | 1; + *cookie = (u64)prandom_u32() | 1; #endif priv->phandle->remain_on_channel = MTRUE; priv->phandle->remain_bss_index = priv->bss_index; @@ -5519,15 +5422,15 @@ woal_cfg80211_remain_on_channel(struct wiphy *wiphy, cfg80211_ready_on_channel( #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 6, 0) - dev, + dev, #else - priv->wdev, + priv->wdev, #endif - *cookie, chan, + *cookie, chan, #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - channel_type, + channel_type, #endif - duration, GFP_KERNEL); + duration, GFP_KERNEL); done: LEAVE(); @@ -5544,9 +5447,9 @@ done: * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, - struct wireless_dev *wdev, u64 cookie) +static int woal_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, + struct wireless_dev *wdev, + u64 cookie) #else /** * @brief Cancel remain on channel @@ -5557,9 +5460,9 @@ woal_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, - struct net_device *dev, u64 cookie) +static int woal_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, + struct net_device *dev, + u64 cookie) #endif { #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) @@ -5580,8 +5483,8 @@ woal_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy, ret = -EFAULT; goto done; } - if (woal_cfg80211_remain_on_channel_cfg - (remain_priv, MOAL_IOCTL_WAIT, MTRUE, &status, NULL, 0, 0)) { + if (woal_cfg80211_remain_on_channel_cfg(remain_priv, MOAL_IOCTL_WAIT, + MTRUE, &status, NULL, 0, 0)) { PRINTM(MERROR, "cancel_remain_on_channel: Fail to cancel remain on channel\n"); ret = -EFAULT; @@ -5607,10 +5510,8 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_sched_scan_start(struct wiphy *wiphy, - struct net_device *dev, - struct cfg80211_sched_scan_request *request) +int woal_cfg80211_sched_scan_start(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_sched_scan_request *request) { struct ieee80211_channel *chan = NULL; int i = 0; @@ -5647,7 +5548,7 @@ woal_cfg80211_sched_scan_start(struct wiphy *wiphy, priv->netdev->name, request->n_ssids, request->n_match_sets, request->n_channels, request->interval, (int)request->ie_len); #endif - /** We have pending scan, start bgscan later */ + /** We have pending scan, start bgscan later */ if (priv->phandle->scan_pending_on_block) priv->scan_cfg.start_later = MTRUE; for (i = 0; i < request->n_match_sets; i++) { @@ -5664,9 +5565,8 @@ woal_cfg80211_sched_scan_start(struct wiphy *wiphy, chan = request->channels[i]; priv->scan_cfg.chan_list[i].chan_number = chan->hw_value; priv->scan_cfg.chan_list[i].radio_type = chan->band; - if (chan-> - flags & (IEEE80211_CHAN_PASSIVE_SCAN | - IEEE80211_CHAN_RADAR)) + if (chan->flags & + (IEEE80211_CHAN_PASSIVE_SCAN | IEEE80211_CHAN_RADAR)) priv->scan_cfg.chan_list[i].scan_type = MLAN_SCAN_TYPE_PASSIVE; else @@ -5685,12 +5585,10 @@ woal_cfg80211_sched_scan_start(struct wiphy *wiphy, /** set scan request IES */ if (request->ie && request->ie_len) { if (MLAN_STATUS_SUCCESS != - woal_cfg80211_mgmt_frame_ie(priv, NULL, 0, - NULL, 0, NULL, 0, - (t_u8 *)request->ie, - request->ie_len, - MGMT_MASK_PROBE_REQ, - MOAL_IOCTL_WAIT)) { + woal_cfg80211_mgmt_frame_ie( + priv, NULL, 0, NULL, 0, NULL, 0, + (t_u8 *)request->ie, request->ie_len, + MGMT_MASK_PROBE_REQ, MOAL_IOCTL_WAIT)) { PRINTM(MERROR, "Fail to set sched scan IE\n"); ret = -EFAULT; goto done; @@ -5704,7 +5602,8 @@ woal_cfg80211_sched_scan_start(struct wiphy *wiphy, MOAL_IOCTL_WAIT); } - /* Interval between scan cycles in milliseconds,supplicant set to 10 second */ + /* Interval between scan cycles in milliseconds,supplicant set to 10 + * second */ /* We want to use 30 second for per scan cycle */ priv->scan_cfg.scan_interval = MIN_BGSCAN_INTERVAL; #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) @@ -5755,9 +5654,8 @@ woal_cfg80211_sched_scan_start(struct wiphy *wiphy, get_random_bytes(buf, ETH_ALEN); for (i = 0; i < ETH_ALEN; i++) { buf[i] &= ~request->mac_addr_mask[i]; - buf[i] |= - request->mac_addr[i] & request-> - mac_addr_mask[i]; + buf[i] |= request->mac_addr[i] & + request->mac_addr_mask[i]; } moal_memcpy_ext(priv->phandle, priv->scan_cfg.random_mac, buf, ETH_ALEN, sizeof(priv->scan_cfg.random_mac)); @@ -5792,12 +5690,12 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev +int woal_cfg80211_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - , u64 reqid + , + u64 reqid #endif - ) +) { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); ENTER(); @@ -5819,8 +5717,7 @@ woal_cfg80211_sched_scan_stop(struct wiphy *wiphy, struct net_device *dev * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_resume(struct wiphy *wiphy) +int woal_cfg80211_resume(struct wiphy *wiphy) { moal_handle *handle = (moal_handle *)woal_get_wiphy_priv(wiphy); moal_private *priv = woal_get_priv(handle, MLAN_BSS_ROLE_ANY); @@ -5840,18 +5737,19 @@ woal_cfg80211_resume(struct wiphy *wiphy) for (i = 0; i < MIN(handle->priv_num, MLAN_MAX_BSS_NUM); i++) { if (handle->priv[i] && (GET_BSS_ROLE(handle->priv[i]) == MLAN_BSS_ROLE_STA)) { - if (handle->priv[i]->last_event & EVENT_BG_SCAN_REPORT) { + if (handle->priv[i]->last_event & + EVENT_BG_SCAN_REPORT) { if (handle->priv[i]->sched_scanning) { - woal_inform_bss_from_scan_result - (handle->priv[i], NULL, - MOAL_IOCTL_WAIT); - cfg80211_sched_scan_results(handle-> - priv[i]-> - wdev->wiphy + woal_inform_bss_from_scan_result( + handle->priv[i], NULL, + MOAL_IOCTL_WAIT); + cfg80211_sched_scan_results( + handle->priv[i]->wdev->wiphy #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - , 0 + , + 0 #endif - ); + ); woal_bgscan_stop_event(handle->priv[i]); handle->priv[i]->last_event = 0; PRINTM(MIOCTL, @@ -5863,17 +5761,18 @@ woal_cfg80211_resume(struct wiphy *wiphy) MTRUE; #ifdef ANDROID_KERNEL #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) - __pm_wakeup_event(&handle->ws, - ROAMING_WAKE_LOCK_TIMEOUT); + __pm_wakeup_event( + &handle->ws, + ROAMING_WAKE_LOCK_TIMEOUT); #else - wake_lock_timeout(&handle->wake_lock, - msecs_to_jiffies - (ROAMING_WAKE_LOCK_TIMEOUT)); + wake_lock_timeout( + &handle->wake_lock, + msecs_to_jiffies( + ROAMING_WAKE_LOCK_TIMEOUT)); #endif #endif - wake_up_interruptible(&handle-> - reassoc_thread. - wait_q); + wake_up_interruptible( + &handle->reassoc_thread.wait_q); } } } @@ -5906,13 +5805,13 @@ woal_cfg80211_resume(struct wiphy *wiphy) case NON_MASKABLE_EVENT_MATCHED: break; case NON_MASKABLE_CONDITION_MATCHED: - if (wiphy->wowlan_config->disconnect) + if (wiphy->wowlan_config && wiphy->wowlan_config->disconnect) wakeup_report.disconnect = true; break; case MAGIC_PATTERN_MATCHED: - if (wiphy->wowlan_config->magic_pkt) + if (wiphy->wowlan_config && wiphy->wowlan_config->magic_pkt) wakeup_report.magic_pkt = true; - if (wiphy->wowlan_config->n_patterns) + if (wiphy->wowlan_config && wiphy->wowlan_config->n_patterns) wakeup_report.pattern_idx = 1; break; case CONTROL_FRAME_MATCHED: @@ -5920,7 +5819,8 @@ woal_cfg80211_resume(struct wiphy *wiphy) case MANAGEMENT_FRAME_MATCHED: break; case GTK_REKEY_FAILURE: - if (wiphy->wowlan_config->gtk_rekey_failure) + if (wiphy->wowlan_config && + wiphy->wowlan_config->gtk_rekey_failure) wakeup_report.gtk_rekey_failure = true; break; default: @@ -5949,14 +5849,14 @@ done: * * @return 1 -- support, 0 -- not support */ -static t_bool -is_wowlan_pattern_supported(moal_private *priv, +static t_bool is_wowlan_pattern_supported(moal_private *priv, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) - struct cfg80211_pkt_pattern *pat, + struct cfg80211_pkt_pattern *pat, #else - struct cfg80211_wowlan_trig_pkt_pattern *pat, + struct cfg80211_wowlan_trig_pkt_pattern + *pat, #endif - t_s8 *byte_seq) + t_s8 *byte_seq) { int j, k, valid_byte_cnt = 0; t_bool dont_care_byte = MFALSE; @@ -5993,8 +5893,7 @@ is_wowlan_pattern_supported(moal_private *priv, * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_suspend(struct wiphy *wiphy, struct cfg80211_wowlan *wow) +int woal_cfg80211_suspend(struct wiphy *wiphy, struct cfg80211_wowlan *wow) { moal_handle *handle = (moal_handle *)woal_get_wiphy_priv(wiphy); int i; @@ -6007,8 +5906,8 @@ woal_cfg80211_suspend(struct wiphy *wiphy, struct cfg80211_wowlan *wow) t_bool first_pat = MTRUE; #endif t_u8 byte_seq[MAX_NUM_BYTE_SEQ + 1]; - const t_u8 ipv4_mc_mac[] = { 0x33, 0x33 }; - const t_u8 ipv6_mc_mac[] = { 0x01, 0x00, 0x5e }; + const t_u8 ipv4_mc_mac[] = {0x33, 0x33}; + const t_u8 ipv6_mc_mac[] = {0x01, 0x00, 0x5e}; moal_private *priv = woal_get_priv(handle, MLAN_BSS_ROLE_STA); mlan_ds_hs_cfg hscfg; @@ -6064,12 +5963,13 @@ woal_cfg80211_suspend(struct wiphy *wiphy, struct cfg80211_wowlan *wow) for (i = 0; i < wow->n_patterns; i++) { memset(byte_seq, 0, sizeof(byte_seq)); - if (!is_wowlan_pattern_supported - (priv, &wow->patterns[i], byte_seq)) { + if (!is_wowlan_pattern_supported(priv, &wow->patterns[i], + byte_seq)) { PRINTM(MERROR, "Pattern not supported\n"); ret = -EOPNOTSUPP; goto done; } + #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) if (!wow->patterns[i].pkt_offset) { #endif @@ -6096,11 +5996,11 @@ woal_cfg80211_suspend(struct wiphy *wiphy, struct cfg80211_wowlan *wow) mef_entry->filter_item[filt_num].repeat = 1; mef_entry->filter_item[filt_num].offset = wow->patterns[i].pkt_offset; - moal_memcpy_ext(priv->phandle, - mef_entry->filter_item[filt_num].byte_seq, - byte_seq, MAX_NUM_BYTE_SEQ, - sizeof(mef_entry->filter_item[filt_num]. - byte_seq)); + moal_memcpy_ext( + priv->phandle, + mef_entry->filter_item[filt_num].byte_seq, byte_seq, + MAX_NUM_BYTE_SEQ, + sizeof(mef_entry->filter_item[filt_num].byte_seq)); mef_entry->filter_item[filt_num].num_byte_seq = byte_seq[MAX_NUM_BYTE_SEQ]; mef_entry->filter_item[filt_num].type = TYPE_BYTE_EQ; @@ -6115,18 +6015,17 @@ woal_cfg80211_suspend(struct wiphy *wiphy, struct cfg80211_wowlan *wow) } if (wow->magic_pkt) { - mef_cfg.criteria |= - CRITERIA_UNICAST | CRITERIA_BROADCAST | - CRITERIA_MULTICAST; + mef_cfg.criteria |= CRITERIA_UNICAST | CRITERIA_BROADCAST | + CRITERIA_MULTICAST; mef_entry->filter_item[filt_num].fill_flag = (FILLING_TYPE | FILLING_REPEAT | FILLING_BYTE_SEQ | FILLING_OFFSET); mef_entry->filter_item[filt_num].repeat = 16; - moal_memcpy_ext(priv->phandle, - mef_entry->filter_item[filt_num].byte_seq, - priv->current_addr, ETH_ALEN, - sizeof(mef_entry->filter_item[filt_num]. - byte_seq)); + moal_memcpy_ext( + priv->phandle, + mef_entry->filter_item[filt_num].byte_seq, + priv->current_addr, ETH_ALEN, + sizeof(mef_entry->filter_item[filt_num].byte_seq)); mef_entry->filter_item[filt_num].num_byte_seq = ETH_ALEN; mef_entry->filter_item[filt_num].offset = 56; mef_entry->filter_item[filt_num].type = TYPE_BYTE_EQ; @@ -6137,11 +6036,11 @@ woal_cfg80211_suspend(struct wiphy *wiphy, struct cfg80211_wowlan *wow) (FILLING_TYPE | FILLING_REPEAT | FILLING_BYTE_SEQ | FILLING_OFFSET); mef_entry->filter_item[filt_num].repeat = 16; - moal_memcpy_ext(priv->phandle, - mef_entry->filter_item[filt_num].byte_seq, - priv->current_addr, ETH_ALEN, - sizeof(mef_entry->filter_item[filt_num]. - byte_seq)); + moal_memcpy_ext( + priv->phandle, + mef_entry->filter_item[filt_num].byte_seq, + priv->current_addr, ETH_ALEN, + sizeof(mef_entry->filter_item[filt_num].byte_seq)); mef_entry->filter_item[filt_num].num_byte_seq = ETH_ALEN; mef_entry->filter_item[filt_num].offset = 28; mef_entry->filter_item[filt_num].type = TYPE_BYTE_EQ; @@ -6153,8 +6052,8 @@ woal_cfg80211_suspend(struct wiphy *wiphy, struct cfg80211_wowlan *wow) mef_entry->filter_num = filt_num; if (!mef_cfg.criteria) - mef_cfg.criteria = CRITERIA_BROADCAST | - CRITERIA_UNICAST | CRITERIA_MULTICAST; + mef_cfg.criteria = CRITERIA_BROADCAST | CRITERIA_UNICAST | + CRITERIA_MULTICAST; status = woal_set_get_wowlan_config(priv, MLAN_ACT_SET, MOAL_IOCTL_WAIT, &mef_cfg); @@ -6194,8 +6093,7 @@ done: #endif #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) -static void -woal_cfg80211_set_wakeup(struct wiphy *wiphy, bool enabled) +static void woal_cfg80211_set_wakeup(struct wiphy *wiphy, bool enabled) { moal_handle *handle = (moal_handle *)woal_get_wiphy_priv(wiphy); @@ -6203,7 +6101,7 @@ woal_cfg80211_set_wakeup(struct wiphy *wiphy, bool enabled) } #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,2,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) /** * @brief change station info * @@ -6214,27 +6112,28 @@ woal_cfg80211_set_wakeup(struct wiphy *wiphy, bool enabled) * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_change_station(struct wiphy *wiphy, struct net_device *dev, +static int woal_cfg80211_change_station(struct wiphy *wiphy, + struct net_device *dev, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) - const u8 *mac, + const u8 *mac, #else - u8 *mac, + u8 *mac, #endif - struct station_parameters *params) + struct station_parameters *params) { int ret = 0; ENTER(); - /**do nothing*/ + /**do nothing*/ LEAVE(); return ret; } #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,2,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) +#ifdef UAP_SUPPORT /** * @brief add station * @@ -6245,14 +6144,14 @@ woal_cfg80211_change_station(struct wiphy *wiphy, struct net_device *dev, * * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_add_station(struct wiphy *wiphy, struct net_device *dev, +static int woal_cfg80211_add_station(struct wiphy *wiphy, + struct net_device *dev, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) - const u8 *mac, + const u8 *mac, #else - u8 *mac, + u8 *mac, #endif - struct station_parameters *params) + struct station_parameters *params) { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); int ret = 0; @@ -6273,8 +6172,9 @@ woal_cfg80211_add_station(struct wiphy *wiphy, struct net_device *dev, return ret; } #endif +#endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,10,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) /** * @brief Update ft ie for Fast BSS Transition * @@ -6284,9 +6184,8 @@ woal_cfg80211_add_station(struct wiphy *wiphy, struct net_device *dev, * * @return 0 success , other failure */ -int -woal_cfg80211_update_ft_ies(struct wiphy *wiphy, struct net_device *dev, - struct cfg80211_update_ft_ies_params *ftie) +int woal_cfg80211_update_ft_ies(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_update_ft_ies_params *ftie) { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); IEEEtypes_MobilityDomain_t *md_ie = NULL; @@ -6296,7 +6195,7 @@ woal_cfg80211_update_ft_ies(struct wiphy *wiphy, struct net_device *dev, mlan_bss_info bss_info; #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - struct cfg80211_roam_info roam_info = { }; + struct cfg80211_roam_info roam_info = {}; #endif ENTER(); @@ -6310,9 +6209,8 @@ woal_cfg80211_update_ft_ies(struct wiphy *wiphy, struct net_device *dev, #else PRINTM(MINFO, "==>woal_cfg80211_update_ft_ies %x \n", ftie->ie_len); #endif - md_ie = (IEEEtypes_MobilityDomain_t *)woal_parse_ie_tlv(ftie->ie, - ftie->ie_len, - MOBILITY_DOMAIN); + md_ie = (IEEEtypes_MobilityDomain_t *)woal_parse_ie_tlv( + ftie->ie, ftie->ie_len, MOBILITY_DOMAIN); if (!md_ie) { PRINTM(MERROR, "No Mobility domain IE\n"); LEAVE(); @@ -6322,7 +6220,7 @@ woal_cfg80211_update_ft_ies(struct wiphy *wiphy, struct net_device *dev, if (priv->ft_ie_len) { priv->pre_ft_ie_len = priv->ft_ie_len; moal_memcpy_ext(priv->phandle, priv->pre_ft_ie, priv->ft_ie, - MIN(priv->ft_ie_len, MAX_IE_SIZE), MAX_IE_SIZE); + priv->ft_ie_len, MAX_IE_SIZE); } memset(priv->ft_ie, 0, MAX_IE_SIZE); moal_memcpy_ext(priv->phandle, priv->ft_ie, ftie->ie, @@ -6335,8 +6233,8 @@ woal_cfg80211_update_ft_ies(struct wiphy *wiphy, struct net_device *dev, return ret; } /* check if is different AP */ - if (!memcmp - (&priv->target_ap_bssid, priv->cfg_bssid, MLAN_MAC_ADDR_LENGTH)) { + if (!memcmp(&priv->target_ap_bssid, priv->cfg_bssid, + MLAN_MAC_ADDR_LENGTH)) { PRINTM(MMSG, "This is the same AP, no Fast bss transition\n"); priv->ft_pre_connect = MFALSE; priv->ft_ie_len = 0; @@ -6358,17 +6256,15 @@ woal_cfg80211_update_ft_ies(struct wiphy *wiphy, struct net_device *dev, if (!ret) { woal_inform_bss_from_scan_result(priv, NULL, MOAL_IOCTL_WAIT); - passoc_rsp = - (IEEEtypes_AssocRsp_t *)assoc_rsp. - assoc_resp_buf; + passoc_rsp = (IEEEtypes_AssocRsp_t *) + assoc_rsp.assoc_resp_buf; #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) roam_info.bssid = priv->cfg_bssid; roam_info.req_ie = priv->sme_current.ie; roam_info.req_ie_len = priv->sme_current.ie_len; roam_info.resp_ie = passoc_rsp->ie_buffer; - roam_info.resp_ie_len = - assoc_rsp.assoc_resp_len - - ASSOC_RESP_FIXED_SIZE; + roam_info.resp_ie_len = assoc_rsp.assoc_resp_len - + ASSOC_RESP_FIXED_SIZE; cfg80211_roamed(priv->netdev, &roam_info, GFP_KERNEL); #else #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 0, 0) @@ -6377,31 +6273,34 @@ woal_cfg80211_update_ft_ies(struct wiphy *wiphy, struct net_device *dev, priv->sme_current.ie_len, passoc_rsp->ie_buffer, assoc_rsp.assoc_resp_len - - ASSOC_RESP_FIXED_SIZE, GFP_KERNEL); + ASSOC_RESP_FIXED_SIZE, + GFP_KERNEL); #else cfg80211_roamed(priv->netdev, priv->cfg_bssid, priv->sme_current.ie, priv->sme_current.ie_len, passoc_rsp->ie_buffer, assoc_rsp.assoc_resp_len - - ASSOC_RESP_FIXED_SIZE, GFP_KERNEL); + ASSOC_RESP_FIXED_SIZE, + GFP_KERNEL); #endif #endif PRINTM(MMSG, "Fast BSS transition to bssid " MACSTR - " successfully\n", MAC2STR(priv->cfg_bssid)); + " successfully\n", + MAC2STR(priv->cfg_bssid)); } else { PRINTM(MMSG, - "Fast BSS transition failed, keep connect to " - MACSTR " \n", MAC2STR(priv->cfg_bssid)); + "Fast BSS transition failed, keep connect to " MACSTR + " \n", + MAC2STR(priv->cfg_bssid)); moal_memcpy_ext(priv->phandle, (void *)priv->sme_current.bssid, &priv->cfg_bssid, MLAN_MAC_ADDR_LENGTH, sizeof(priv->conn_bssid)); priv->ft_ie_len = priv->pre_ft_ie_len; moal_memcpy_ext(priv->phandle, priv->ft_ie, - priv->pre_ft_ie, - MIN(priv->pre_ft_ie_len, MAX_IE_SIZE), + priv->pre_ft_ie, priv->pre_ft_ie_len, MAX_IE_SIZE); } priv->ft_roaming_triggered_by_driver = MFALSE; @@ -6410,18 +6309,18 @@ woal_cfg80211_update_ft_ies(struct wiphy *wiphy, struct net_device *dev, if (!ret) { memset(&assoc_rsp, 0, sizeof(mlan_ds_misc_assoc_rsp)); woal_get_assoc_rsp(priv, &assoc_rsp, MOAL_IOCTL_WAIT); - passoc_rsp = - (IEEEtypes_AssocRsp_t *)assoc_rsp. - assoc_resp_buf; + passoc_rsp = (IEEEtypes_AssocRsp_t *) + assoc_rsp.assoc_resp_buf; cfg80211_connect_result(priv->netdev, priv->cfg_bssid, NULL, 0, passoc_rsp->ie_buffer, assoc_rsp.assoc_resp_len - - ASSOC_RESP_FIXED_SIZE, + ASSOC_RESP_FIXED_SIZE, WLAN_STATUS_SUCCESS, GFP_KERNEL); PRINTM(MMSG, "wlan: Fast Bss transition to bssid " MACSTR - " successfully\n", MAC2STR(priv->cfg_bssid)); + " successfully\n", + MAC2STR(priv->cfg_bssid)); memset(&bss_info, 0, sizeof(bss_info)); woal_get_bss_info(priv, MOAL_IOCTL_WAIT, &bss_info); @@ -6442,10 +6341,9 @@ woal_cfg80211_update_ft_ies(struct wiphy *wiphy, struct net_device *dev, memset(priv->target_ap_bssid, 0, ETH_ALEN); priv->ft_ie_len = priv->pre_ft_ie_len; moal_memcpy_ext(priv->phandle, priv->ft_ie, - priv->pre_ft_ie, - MIN(priv->pre_ft_ie_len, MAX_IE_SIZE), + priv->pre_ft_ie, priv->pre_ft_ie_len, MAX_IE_SIZE); - //priv->ft_ie_len = 0; + // priv->ft_ie_len = 0; } } @@ -6461,8 +6359,8 @@ woal_cfg80211_update_ft_ies(struct wiphy *wiphy, struct net_device *dev, * @param priv A pointer to moal_private * @param sme A pointer to cfg80211_connect_params structure */ -void -woal_save_conn_params(moal_private *priv, struct cfg80211_connect_params *sme) +void woal_save_conn_params(moal_private *priv, + struct cfg80211_connect_params *sme) { ENTER(); woal_clear_conn_params(priv); @@ -6506,8 +6404,7 @@ woal_save_conn_params(moal_private *priv, struct cfg80211_connect_params *sme) * * @param priv A pointer to moal_private */ -void -woal_clear_conn_params(moal_private *priv) +void woal_clear_conn_params(moal_private *priv) { ENTER(); if (priv->sme_current.ie_len) @@ -6523,8 +6420,7 @@ woal_clear_conn_params(moal_private *priv) * @param priv A pointer to moal_private * @param entry A pointer to pmksa_entry **/ -int -woal_update_okc_roaming_ie(moal_private *priv, struct pmksa_entry *entry) +int woal_update_okc_roaming_ie(moal_private *priv, struct pmksa_entry *entry) { struct cfg80211_connect_params *sme = &priv->sme_current; int ret = MLAN_STATUS_SUCCESS; @@ -6550,7 +6446,7 @@ woal_update_okc_roaming_ie(moal_private *priv, struct pmksa_entry *entry) if (!priv->okc_roaming_ie) { int okc_ie_len = sme->ie_len + sizeof(t_u16) + PMKID_LEN; - /** Alloc new buffer for okc roaming ie */ + /** Alloc new buffer for okc roaming ie */ priv->okc_roaming_ie = kzalloc(okc_ie_len, GFP_KERNEL); if (!priv->okc_roaming_ie) { PRINTM(MERROR, "Fail to allocate assoc req ie\n"); @@ -6569,8 +6465,8 @@ woal_update_okc_roaming_ie(moal_private *priv, struct pmksa_entry *entry) * |PMKIDCount|PMKID List|Group Management Cipher Suite| */ #define PAIRWISE_CIPHER_COUNT_OFFSET 8 -#define AKM_SUITE_COUNT_OFFSET(n) (10 + (n) * 4) -#define PMKID_COUNT_OFFSET(n) (14 + (n) * 4) +#define AKM_SUITE_COUNT_OFFSET(n) (10 + (n)*4) +#define PMKID_COUNT_OFFSET(n) (14 + (n)*4) sme_pos = sme->ie; left_len = sme->ie_len; @@ -6595,9 +6491,8 @@ woal_update_okc_roaming_ie(moal_private *priv, struct pmksa_entry *entry) *(t_u16 *)(sme_pos + PAIRWISE_CIPHER_COUNT_OFFSET); akm_count = - *(t_u16 *)(sme_pos + - AKM_SUITE_COUNT_OFFSET - (pairwise_count)); + *(t_u16 *)(sme_pos + AKM_SUITE_COUNT_OFFSET( + pairwise_count)); rsn_offset = PMKID_COUNT_OFFSET(pairwise_count + akm_count); sme_ptr = (t_u8 *)(sme_pos + rsn_offset); @@ -6617,21 +6512,18 @@ woal_update_okc_roaming_ie(moal_private *priv, struct pmksa_entry *entry) rsn_offset - 2 + sizeof(t_u16) + PMKID_LEN; if ((ie_len + 2) > rsn_offset) { - /** Previous conn ie include pmkid list */ + /** Previous conn ie include pmkid list */ u16 pmkid_count = *(t_u16 *)sme_ptr; - rsn_offset += - (sizeof(t_u16) + - PMKID_LEN * pmkid_count); + rsn_offset += (sizeof(t_u16) + + PMKID_LEN * pmkid_count); if ((ie_len + 2) > rsn_offset) { - sme_ptr += - (sizeof(t_u16) + - PMKID_LEN * pmkid_count); - moal_memcpy_ext(priv->phandle, - okc_ie_pos, sme_ptr, - (ie_len + 2 - - rsn_offset), - (ie_len + 2 - - rsn_offset)); + sme_ptr += (sizeof(t_u16) + + PMKID_LEN * pmkid_count); + moal_memcpy_ext( + priv->phandle, okc_ie_pos, + sme_ptr, + (ie_len + 2 - rsn_offset), + (ie_len + 2 - rsn_offset)); okc_ie_pos += (ie_len + 2 - rsn_offset); priv->okc_ie_len += (ie_len + 2 - rsn_offset); @@ -6670,8 +6562,7 @@ done: * * @return N/A */ -void -woal_start_roaming(moal_private *priv) +void woal_start_roaming(moal_private *priv) { mlan_ds_get_signal signal; mlan_ssid_bssid ssid_bssid; @@ -6680,7 +6571,7 @@ woal_start_roaming(moal_private *priv) mlan_ds_misc_assoc_rsp *assoc_rsp; IEEEtypes_AssocRsp_t *passoc_rsp = NULL; #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) - struct cfg80211_roam_info roam_info = { }; + struct cfg80211_roam_info roam_info = {}; #endif ENTER(); @@ -6736,7 +6627,7 @@ woal_start_roaming(moal_private *priv) goto done; } } -/**check if need start FT Roaming*/ + /**check if need start FT Roaming*/ if (priv->ft_ie_len && (priv->ft_md == ssid_bssid.ft_md) && (priv->ft_cap == ssid_bssid.ft_cap)) { priv->ft_roaming_triggered_by_driver = MTRUE; @@ -6752,34 +6643,32 @@ woal_start_roaming(moal_private *priv) #ifdef STA_CFG80211 #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) if (IS_STA_CFG80211(priv->phandle->params.cfg80211_wext)) { - /** Check if current roaming support OKC offload roaming */ + /** Check if current roaming support OKC offload roaming */ if (priv->sme_current.crypto.n_akm_suites && priv->sme_current.crypto.akm_suites[0] == - WLAN_AKM_SUITE_8021X) { + WLAN_AKM_SUITE_8021X) { struct pmksa_entry *entry = NULL; - /** Get OKC PMK Cache entry - * Firstly try to get pmksa from cfg80211 - */ + /** Get OKC PMK Cache entry + * Firstly try to get pmksa from cfg80211 + */ priv->wait_target_ap_pmkid = MTRUE; cfg80211_pmksa_candidate_notify(priv->netdev, 0, priv->sme_current.bssid, MTRUE, GFP_ATOMIC); - if (wait_event_interruptible_timeout(priv->okc_wait_q, - !priv-> - wait_target_ap_pmkid, - OKC_WAIT_TARGET_PMKSA_TIMEOUT)) - { + if (wait_event_interruptible_timeout( + priv->okc_wait_q, + !priv->wait_target_ap_pmkid, + OKC_WAIT_TARGET_PMKSA_TIMEOUT)) { PRINTM(MIOCTL, "OKC Roaming is ready\n"); entry = priv->target_ap_pmksa; } else { - /** Try to get pmksa from pmksa list */ + /** Try to get pmksa from pmksa list */ priv->wait_target_ap_pmkid = MFALSE; - entry = woal_get_pmksa_entry(priv, - priv->sme_current. - bssid); + entry = woal_get_pmksa_entry( + priv, priv->sme_current.bssid); } - /** Build okc roaming ie */ + /** Build okc roaming ie */ woal_update_okc_roaming_ie(priv, entry); priv->target_ap_pmksa = NULL; } @@ -6801,15 +6690,16 @@ woal_start_roaming(moal_private *priv) woal_inform_bss_from_scan_result(priv, NULL, MOAL_IOCTL_WAIT); passoc_rsp = (IEEEtypes_AssocRsp_t *)assoc_rsp->assoc_resp_buf; - /** Update connect ie in roam event */ + /** Update connect ie in roam event */ ie = priv->sme_current.ie; ie_len = priv->sme_current.ie_len; #ifdef STA_CFG80211 if (IS_STA_CFG80211(priv->phandle->params.cfg80211_wext)) { - /** Check if current roaming support OKC offload roaming */ + /** Check if current roaming support OKC offload roaming + */ if (priv->sme_current.crypto.n_akm_suites && priv->sme_current.crypto.akm_suites[0] == - WLAN_AKM_SUITE_8021X) { + WLAN_AKM_SUITE_8021X) { if (priv->okc_roaming_ie && priv->okc_ie_len) { ie = priv->okc_roaming_ie; ie_len = priv->okc_ie_len; @@ -6830,12 +6720,14 @@ woal_start_roaming(moal_private *priv) cfg80211_roamed(priv->netdev, NULL, priv->cfg_bssid, ie, ie_len, passoc_rsp->ie_buffer, assoc_rsp->assoc_resp_len - - ASSOC_RESP_FIXED_SIZE, GFP_KERNEL); + ASSOC_RESP_FIXED_SIZE, + GFP_KERNEL); #else cfg80211_roamed(priv->netdev, priv->cfg_bssid, ie, ie_len, passoc_rsp->ie_buffer, assoc_rsp->assoc_resp_len - - ASSOC_RESP_FIXED_SIZE, GFP_KERNEL); + ASSOC_RESP_FIXED_SIZE, + GFP_KERNEL); #endif #endif PRINTM(MMSG, "Roamed to bssid " MACSTR " successfully\n", @@ -6867,9 +6759,8 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_uap_add_station(struct wiphy *wiphy, struct net_device *dev, - u8 *mac, struct station_parameters *params) +int woal_cfg80211_uap_add_station(struct wiphy *wiphy, struct net_device *dev, + u8 *mac, struct station_parameters *params) { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); mlan_ioctl_req *req = NULL; @@ -6889,19 +6780,16 @@ woal_cfg80211_uap_add_station(struct wiphy *wiphy, struct net_device *dev, req_len += sizeof(MrvlIEtypesHeader_t) + params->ext_capab_len; #endif if (params->supported_rates_len) - req_len += - sizeof(MrvlIEtypesHeader_t) + - params->supported_rates_len; + req_len += sizeof(MrvlIEtypesHeader_t) + + params->supported_rates_len; if (params->uapsd_queues || params->max_sp) req_len += sizeof(MrvlIEtypesHeader_t) + sizeof(qosinfo); if (params->ht_capa) - req_len += - sizeof(MrvlIEtypesHeader_t) + - sizeof(struct ieee80211_ht_cap); + req_len += sizeof(MrvlIEtypesHeader_t) + + sizeof(struct ieee80211_ht_cap); if (params->vht_capa) - req_len += - sizeof(MrvlIEtypesHeader_t) + - sizeof(struct ieee80211_vht_cap); + req_len += sizeof(MrvlIEtypesHeader_t) + + sizeof(struct ieee80211_vht_cap); #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) if (params->opmode_notif_used) req_len += sizeof(MrvlIEtypesHeader_t) + sizeof(u8); @@ -7023,21 +6911,21 @@ done: } /** -* @brief This function is probe client handle. -* -* @param wiphy A pointer to wiphy. -* -* @param dev A pointer to net_device -* -* @param peer A pointer to peer -* -* @param cookie A pointer to cookie -* -* @return 0 -- success, otherwise fail -*/ -static int -woal_cfg80211_probe_client(struct wiphy *wiphy, struct net_device *dev, - const u8 *peer, u64 * cookie) + * @brief This function is probe client handle. + * + * @param wiphy A pointer to wiphy. + * + * @param dev A pointer to net_device + * + * @param peer A pointer to peer + * + * @param cookie A pointer to cookie + * + * @return 0 -- success, otherwise fail + */ +static int woal_cfg80211_probe_client(struct wiphy *wiphy, + struct net_device *dev, const u8 *peer, + u64 *cookie) { return -1; } @@ -7051,10 +6939,9 @@ woal_cfg80211_probe_client(struct wiphy *wiphy, struct net_device *dev, * @param reason_code disconnect reason code * @return N/A */ -void -woal_host_mlme_disconnect(moal_private *priv, t_u16 reason_code, t_u8 *sa) +void woal_host_mlme_disconnect(moal_private *priv, t_u16 reason_code, t_u8 *sa) { - t_u8 broadcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + t_u8 broadcast_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; t_u8 frame_buf[26]; struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)frame_buf; ENTER(); @@ -7095,30 +6982,31 @@ woal_host_mlme_disconnect(moal_private *priv, t_u16 reason_code, t_u8 *sa) #endif } else { - int freq = ieee80211_channel_to_frequency(priv->channel + int freq = ieee80211_channel_to_frequency( + priv->channel #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) - , - (priv->channel <= - 14 ? - IEEE80211_BAND_2GHZ : - IEEE80211_BAND_5GHZ) + , + (priv->channel <= 14 ? IEEE80211_BAND_2GHZ : + IEEE80211_BAND_5GHZ) #endif - ); + ); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) cfg80211_rx_mgmt( #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) - priv->wdev, + priv->wdev, #else - priv->netdev, + priv->netdev, #endif - freq, 0, frame_buf, 26 + freq, 0, frame_buf, 26 #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) - , 0 + , + 0 #endif #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 18, 0) - , GFP_ATOMIC + , + GFP_ATOMIC #endif - ); + ); #else cfg80211_rx_mgmt(priv->netdev, freq, frame_buf, 26, GFP_ATOMIC); #endif @@ -7137,8 +7025,7 @@ woal_host_mlme_disconnect(moal_private *priv, t_u16 reason_code, t_u8 *sa) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_register_sta_cfg80211(struct net_device *dev, t_u8 bss_type) +mlan_status woal_register_sta_cfg80211(struct net_device *dev, t_u8 bss_type) { mlan_status ret = MLAN_STATUS_SUCCESS; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -7170,9 +7057,9 @@ woal_register_sta_cfg80211(struct net_device *dev, t_u8 bss_type) SET_NETDEV_DEV(dev, wiphy_dev(wdev->wiphy)); priv->wdev = wdev; /* Get IEEE power save mode */ - if (MLAN_STATUS_SUCCESS == - woal_set_get_power_mgmt(priv, MLAN_ACT_GET, &psmode, 0, - MOAL_IOCTL_WAIT)) { + if (MLAN_STATUS_SUCCESS == woal_set_get_power_mgmt(priv, MLAN_ACT_GET, + &psmode, 0, + MOAL_IOCTL_WAIT)) { /* Save the IEEE power save mode to wiphy, because after * warmreset wiphy power save should be updated instead * of using the last saved configuration */ @@ -7193,8 +7080,7 @@ woal_register_sta_cfg80211(struct net_device *dev, t_u8 bss_type) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_cfg80211_init_wiphy(moal_private *priv, t_u8 wait_option) +mlan_status woal_cfg80211_init_wiphy(moal_private *priv, t_u8 wait_option) { mlan_status ret = MLAN_STATUS_SUCCESS; int retry_count, rts_thr, frag_thr; @@ -7248,9 +7134,9 @@ woal_cfg80211_init_wiphy(moal_private *priv, t_u8 wait_option) cfg_11n->param.supported_mcs_set[1] = 0; cfg_11n->param.supported_mcs_set[4] = 0; } - woal_cfg80211_setup_ht_cap(&wiphy->bands[IEEE80211_BAND_2GHZ]-> - ht_cap, hw_dev_cap, - cfg_11n->param.supported_mcs_set); + woal_cfg80211_setup_ht_cap( + &wiphy->bands[IEEE80211_BAND_2GHZ]->ht_cap, hw_dev_cap, + cfg_11n->param.supported_mcs_set); } /* For 2.4G band only card, this shouldn't be set */ if (wiphy->bands[IEEE80211_BAND_5GHZ]) { @@ -7260,13 +7146,12 @@ woal_cfg80211_init_wiphy(moal_private *priv, t_u8 wait_option) if (mcs_supp != 3 && mcs_supp != 0) cfg_11n->param.supported_mcs_set[1] = 0; } - woal_cfg80211_setup_ht_cap(&wiphy->bands[IEEE80211_BAND_5GHZ]-> - ht_cap, hw_dev_cap, - cfg_11n->param.supported_mcs_set); + woal_cfg80211_setup_ht_cap( + &wiphy->bands[IEEE80211_BAND_5GHZ]->ht_cap, hw_dev_cap, + cfg_11n->param.supported_mcs_set); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) - woal_cfg80211_setup_vht_cap(priv, - &wiphy->bands[IEEE80211_BAND_5GHZ]-> - vht_cap); + woal_cfg80211_setup_vht_cap( + priv, &wiphy->bands[IEEE80211_BAND_5GHZ]->vht_cap); #endif #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 20, 0) woal_cfg80211_setup_he_cap(priv, @@ -7372,8 +7257,7 @@ done: * * @return N/A */ -void -woal_update_channel_flag(struct wiphy *wiphy, mlan_fw_info *fw_info) +void woal_update_channel_flag(struct wiphy *wiphy, mlan_fw_info *fw_info) { enum ieee80211_band band; struct ieee80211_supported_band *sband; @@ -7402,8 +7286,7 @@ woal_update_channel_flag(struct wiphy *wiphy, mlan_fw_info *fw_info) * @param priv A pointer to moal_private * */ -mlan_status -woal_register_cfg80211(moal_private *priv) +mlan_status woal_register_cfg80211(moal_private *priv) { mlan_status ret = MLAN_STATUS_SUCCESS; struct wiphy *wiphy; @@ -7426,7 +7309,9 @@ woal_register_cfg80211(moal_private *priv) if (moal_extflg_isset(priv->phandle, EXT_HOST_MLME)) { woal_cfg80211_ops.auth = woal_cfg80211_authenticate; woal_cfg80211_ops.assoc = woal_cfg80211_associate; +#ifdef UAP_SUPPORT woal_cfg80211_ops.probe_client = woal_cfg80211_probe_client; +#endif } #endif #ifdef CONFIG_PM @@ -7439,9 +7324,8 @@ woal_register_cfg80211(moal_private *priv) #else wiphy->wowlan.flags = WIPHY_WOWLAN_ANY | WIPHY_WOWLAN_MAGIC_PKT; if (fw_info.fw_supplicant_support) { - wiphy->wowlan.flags |= - WIPHY_WOWLAN_SUPPORTS_GTK_REKEY | - WIPHY_WOWLAN_GTK_REKEY_FAILURE; + wiphy->wowlan.flags |= WIPHY_WOWLAN_SUPPORTS_GTK_REKEY | + WIPHY_WOWLAN_GTK_REKEY_FAILURE; } wiphy->wowlan.n_patterns = MAX_NUM_FILTERS; wiphy->wowlan.pattern_min_len = 1; @@ -7456,13 +7340,13 @@ woal_register_cfg80211(moal_private *priv) wiphy->max_scan_ssids = MRVDRV_MAX_SSID_LIST_LENGTH; wiphy->max_scan_ie_len = MAX_IE_SIZE; wiphy->interface_modes = 0; - wiphy->interface_modes = MBIT(NL80211_IFTYPE_STATION) | - MBIT(NL80211_IFTYPE_AP); + wiphy->interface_modes = + MBIT(NL80211_IFTYPE_STATION) | MBIT(NL80211_IFTYPE_AP); #ifdef WIFI_DIRECT_SUPPORT #if CFG80211_VERSION_CODE >= WIFI_DIRECT_KERNEL_VERSION - wiphy->interface_modes |= MBIT(NL80211_IFTYPE_P2P_GO) | - MBIT(NL80211_IFTYPE_P2P_CLIENT); + wiphy->interface_modes |= + MBIT(NL80211_IFTYPE_P2P_GO) | MBIT(NL80211_IFTYPE_P2P_CLIENT); #endif #endif @@ -7489,12 +7373,12 @@ woal_register_cfg80211(moal_private *priv) /* Supported bands */ if (fw_info.fw_bands & (BAND_B | BAND_G | BAND_GN | BAND_GAC)) { wiphy->bands[IEEE80211_BAND_2GHZ] = &cfg80211_band_2ghz; - /* If 2.4G enable, it will overwrite default to 2.4G */ + /* If 2.4G enable, it will overwrite default to 2.4G*/ priv->phandle->band = IEEE80211_BAND_2GHZ; } if (fw_info.fw_bands & BAND_A) { - /** reduce scan time from 110ms to 80ms */ + /** reduce scan time from 110ms to 80ms */ woal_set_scan_time(priv, INIT_ACTIVE_SCAN_CHAN_TIME, INIT_PASSIVE_SCAN_CHAN_TIME, INIT_SPECIFIC_SCAN_CHAN_TIME); @@ -7575,15 +7459,15 @@ woal_register_cfg80211(moal_private *priv) wiphy->max_sched_scan_plan_iterations = 100; #endif #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,4,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) wiphy->features |= NL80211_FEATURE_INACTIVITY_TIMER; #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,8,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) if (moal_extflg_isset(priv->phandle, EXT_HOST_MLME)) wiphy->features |= NL80211_FEATURE_SAE; #endif -#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3,8,0) +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) wiphy->features |= NL80211_FEATURE_NEED_OBSS_SCAN; #endif @@ -7620,7 +7504,7 @@ woal_register_cfg80211(moal_private *priv) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) set_wiphy_dev(wiphy, (struct device *)priv->phandle->hotplug_device); #endif - /* Set phy name */ + /* Set phy name*/ for (index = 0; index < MAX_MLAN_ADAPTER; index++) { if (m_handle[index] == priv->phandle) { dev_set_name(&wiphy->dev, mwiphy_name, index); @@ -7630,7 +7514,8 @@ woal_register_cfg80211(moal_private *priv) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) if (moal_extflg_isset(priv->phandle, EXT_BEACON_HINTS)) { - /* REGULATORY_DISABLE_BEACON_HINTS: NO-IR flag won't be removed on chn where an AP is visible! */ + /* REGULATORY_DISABLE_BEACON_HINTS: NO-IR flag won't be removed + * on chn where an AP is visible! */ wiphy->regulatory_flags |= REGULATORY_DISABLE_BEACON_HINTS; } if (moal_extflg_isset(priv->phandle, EXT_COUNTRY_IE_IGNORE)) { @@ -7648,16 +7533,16 @@ woal_register_cfg80211(moal_private *priv) if (reg_alpha2 && !strncmp(reg_alpha2, "99", strlen("99"))) { #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) wiphy->regulatory_flags |= REGULATORY_CUSTOM_REG | - REGULATORY_DISABLE_BEACON_HINTS | - REGULATORY_COUNTRY_IE_IGNORE; + REGULATORY_DISABLE_BEACON_HINTS | + REGULATORY_COUNTRY_IE_IGNORE; #else wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY; #endif wiphy_apply_custom_regulatory(wiphy, &mrvl_regdom); } + #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) - if (woal_request_extcap(priv, - (t_u8 *)&priv->extended_capabilities, + if (woal_request_extcap(priv, (t_u8 *)&priv->extended_capabilities, sizeof(priv->extended_capabilities)) < 0) PRINTM(MERROR, "Failed to get driver extended capability, use default\n"); @@ -7676,8 +7561,8 @@ woal_register_cfg80211(moal_private *priv) } #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) - if (moal_extflg_isset(priv->phandle, EXT_FW_REGION) - && priv->phandle->params.txpwrlimit_cfg) { + if (moal_extflg_isset(priv->phandle, EXT_FW_REGION) && + priv->phandle->params.txpwrlimit_cfg) { PRINTM(MCMND, "FW region_code=%d\n", fw_info.region_code); country = region_code_2_string(fw_info.region_code); if (country) { @@ -7690,13 +7575,13 @@ woal_register_cfg80211(moal_private *priv) #endif if ((!reg_alpha2 || strncmp(reg_alpha2, "99", strlen("99"))) - ) { - /** we will try driver parameter first */ + ) { + /** we will try driver parameter first */ if (reg_alpha2 && woal_is_valid_alpha2(reg_alpha2)) { PRINTM(MIOCTL, "Notify reg_alpha2 %c%c\n", reg_alpha2[0], reg_alpha2[1]); - if (!moal_extflg_isset - (priv->phandle, EXT_DISABLE_REGD_BY_DRIVER)) + if (!moal_extflg_isset(priv->phandle, + EXT_DISABLE_REGD_BY_DRIVER)) regulatory_hint(wiphy, reg_alpha2); } else { country = region_code_2_string(fw_info.region_code); @@ -7706,9 +7591,9 @@ woal_register_cfg80211(moal_private *priv) "Notify hw region code=%d %c%c\n", fw_info.region_code, country[0], country[1]); - if (!moal_extflg_isset - (priv->phandle, - EXT_DISABLE_REGD_BY_DRIVER)) + if (!moal_extflg_isset( + priv->phandle, + EXT_DISABLE_REGD_BY_DRIVER)) regulatory_hint(wiphy, country); } } else diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.h index 384379c047a8..8080a481ca74 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_sta_cfg80211.h @@ -1,43 +1,41 @@ /** @file moal_sta_cfg80211.h - * - * @brief This file contains the STA CFG80211 specific defines. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains the STA CFG80211 specific defines. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ #ifndef _MOAL_STA_CFG80211_H_ #define _MOAL_STA_CFG80211_H_ /** Convert RSSI signal strength from dBm to mBm (100*dBm) */ -#define RSSI_DBM_TO_MDM(x) ((x) * 100) +#define RSSI_DBM_TO_MDM(x) ((x)*100) mlan_status woal_register_sta_cfg80211(struct net_device *dev, t_u8 bss_type); -mlan_status +mlan_status woal_cfg80211_set_key(moal_private *priv, t_u8 is_enable_wep, + t_u32 cipher, const t_u8 *key, int key_len, + const t_u8 *seq, int seq_len, t_u8 key_index, + const t_u8 *addr, int disable, + t_u8 wait_option); -woal_cfg80211_set_key(moal_private *priv, t_u8 is_enable_wep, - t_u32 cipher, const t_u8 *key, int key_len, - const t_u8 *seq, int seq_len, t_u8 key_index, - const t_u8 *addr, int disable, t_u8 wait_option); - -mlan_status - -woal_cfg80211_set_wep_keys(moal_private *priv, const t_u8 *key, int key_len, - t_u8 index, t_u8 wait_option); +mlan_status woal_cfg80211_set_wep_keys(moal_private *priv, const t_u8 *key, + int key_len, t_u8 index, + t_u8 wait_option); #endif /* _MOAL_STA_CFG80211_H_ */ diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap.c index 59a042ea1404..8caf17d2d993 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap.c @@ -1,39 +1,39 @@ /** @file moal_uap.c - * - * @brief This file contains the major functions in UAP - * driver. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains the major functions in UAP + * driver. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /******************************************************** Change log: 10/21/2008: initial version ********************************************************/ -#include "moal_main.h" -#include "moal_uap.h" +#include "moal_main.h" +#include "moal_uap.h" #ifdef SDIO -#include "moal_sdio.h" +#include "moal_sdio.h" #endif /* SDIO */ -#include "moal_eth_ioctl.h" +#include "moal_eth_ioctl.h" #if defined(STA_CFG80211) && defined(UAP_CFG80211) -#include "moal_cfg80211.h" +#include "moal_cfg80211.h" #endif /******************************************************** @@ -53,8 +53,7 @@ Change log: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_addba_param(struct net_device *dev, struct ifreq *req) +static int woal_uap_addba_param(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ioctl_req *ioctl_req = NULL; @@ -133,8 +132,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_aggr_priotbl(struct net_device *dev, struct ifreq *req) +static int woal_uap_aggr_priotbl(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ioctl_req *ioctl_req = NULL; @@ -209,8 +207,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_addba_reject(struct net_device *dev, struct ifreq *req) +static int woal_uap_addba_reject(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ioctl_req *ioctl_req = NULL; @@ -281,8 +278,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_get_fw_info(struct net_device *dev, struct ifreq *req) +static int woal_uap_get_fw_info(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); fw_info fw; @@ -332,8 +328,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_deep_sleep(struct net_device *dev, struct ifreq *req) +static int woal_uap_deep_sleep(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ioctl_req *ioctl_req = NULL; @@ -410,8 +405,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_band_steer(struct net_device *dev, struct ifreq *req) +static int woal_uap_band_steer(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ioctl_req *ioctl_req = NULL; @@ -482,8 +476,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_txdatapause(struct net_device *dev, struct ifreq *req) +static int woal_uap_txdatapause(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ioctl_req *ioctl_req = NULL; @@ -557,8 +550,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_sdcmd52_rw(struct net_device *dev, struct ifreq *req) +static int woal_uap_sdcmd52_rw(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); sdcmd52_para param; @@ -586,16 +578,20 @@ woal_uap_sdcmd52_rw(struct net_device *dev, struct ifreq *req) if (!param.action) { PRINTM(MINFO, "Cmd52 read, func=%d, reg=0x%08X\n", func, reg); #ifdef SDIO_MMC - sdio_claim_host(((struct sdio_mmc_card *)priv->phandle->card)-> - func); + sdio_claim_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); if (func) - data = sdio_readb(((struct sdio_mmc_card *)priv-> - phandle->card)->func, reg, &ret); + data = sdio_readb( + ((struct sdio_mmc_card *)priv->phandle->card) + ->func, + reg, &ret); else - data = sdio_f0_readb(((struct sdio_mmc_card *)priv-> - phandle->card)->func, reg, &ret); - sdio_release_host(((struct sdio_mmc_card *)priv->phandle-> - card)->func); + data = sdio_f0_readb( + ((struct sdio_mmc_card *)priv->phandle->card) + ->func, + reg, &ret); + sdio_release_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); if (ret) { PRINTM(MERROR, "sdio_readb: reading register 0x%X failed\n", @@ -603,7 +599,8 @@ woal_uap_sdcmd52_rw(struct net_device *dev, struct ifreq *req) goto done; } #else - if (sdio_read_ioreg(priv->phandle->card, func, reg, &data) < 0) { + if (sdio_read_ioreg(priv->phandle->card, func, reg, &data) < + 0) { PRINTM(MERROR, "sdio_read_ioreg: reading register 0x%X failed\n", reg); @@ -617,16 +614,20 @@ woal_uap_sdcmd52_rw(struct net_device *dev, struct ifreq *req) PRINTM(MINFO, "Cmd52 write, func=%d, reg=0x%08X, data=0x%02X\n", func, reg, data); #ifdef SDIO_MMC - sdio_claim_host(((struct sdio_mmc_card *)priv->phandle->card)-> - func); + sdio_claim_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); if (func) - sdio_writeb(((struct sdio_mmc_card *)priv->phandle-> - card)->func, data, reg, &ret); + sdio_writeb( + ((struct sdio_mmc_card *)priv->phandle->card) + ->func, + data, reg, &ret); else - sdio_f0_writeb(((struct sdio_mmc_card *)priv->phandle-> - card)->func, data, reg, &ret); - sdio_release_host(((struct sdio_mmc_card *)priv->phandle-> - card)->func); + sdio_f0_writeb( + ((struct sdio_mmc_card *)priv->phandle->card) + ->func, + data, reg, &ret); + sdio_release_host( + ((struct sdio_mmc_card *)priv->phandle->card)->func); if (ret) { PRINTM(MERROR, "sdio_writeb: writing register 0x%X failed\n", @@ -634,7 +635,8 @@ woal_uap_sdcmd52_rw(struct net_device *dev, struct ifreq *req) goto done; } #else - if (sdio_write_ioreg(priv->phandle->card, func, reg, data) < 0) { + if (sdio_write_ioreg(priv->phandle->card, func, reg, data) < + 0) { PRINTM(MERROR, "sdio_write_ioreg: writing register 0x%X failed\n", reg); @@ -661,8 +663,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_snmp_mib(struct net_device *dev, struct ifreq *req) +static int woal_uap_snmp_mib(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ioctl_req *ioctl_req = NULL; @@ -742,10 +743,10 @@ woal_uap_snmp_mib(struct net_device *dev, struct ifreq *req) ret = -EFAULT; goto done; } - if (!param.action) { /* GET */ - if (copy_to_user - (req->ifr_data + sizeof(param), &snmp->param.oid_value, - MIN(param.oid_val_len, sizeof(t_u32)))) { + if (!param.action) { /* GET */ + if (copy_to_user(req->ifr_data + sizeof(param), + &snmp->param.oid_value, + MIN(param.oid_val_len, sizeof(t_u32)))) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -766,8 +767,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_domain_info(struct net_device *dev, struct ifreq *req) +static int woal_uap_domain_info(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ioctl_req *ioctl_req = NULL; @@ -798,8 +798,8 @@ woal_uap_domain_info(struct net_device *dev, struct ifreq *req) DBG_HEXDUMP(MCMD_D, "domain_info_para", (t_u8 *)¶m, sizeof(param)); if (param.action) { /* get tlv header */ - if (copy_from_user - (tlv, req->ifr_data + sizeof(param), TLV_HEADER_LEN)) { + if (copy_from_user(tlv, req->ifr_data + sizeof(param), + TLV_HEADER_LEN)) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -852,11 +852,11 @@ woal_uap_domain_info(struct net_device *dev, struct ifreq *req) ret = -EFAULT; goto done; } - if (!param.action) { /* GET */ + if (!param.action) { /* GET */ tlv_data_len = ((t_u16 *)(cfg11d->param.domain_tlv))[1]; - if (copy_to_user - (req->ifr_data + sizeof(param), &cfg11d->param.domain_tlv, - TLV_HEADER_LEN + tlv_data_len)) { + if (copy_to_user(req->ifr_data + sizeof(param), + &cfg11d->param.domain_tlv, + TLV_HEADER_LEN + tlv_data_len)) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -877,8 +877,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_dfs_testing(struct net_device *dev, struct ifreq *req) +static int woal_uap_dfs_testing(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ioctl_req *ioctl_req = NULL; @@ -939,7 +938,7 @@ woal_uap_dfs_testing(struct net_device *dev, struct ifreq *req) goto done; } - if (!param.action) { /* GET */ + if (!param.action) { /* GET */ param.usr_cac_period = cfg11h->param.dfs_testing.usr_cac_period_msec; param.usr_nop_period = @@ -973,9 +972,8 @@ done: * @param data BSS control type * @return 0 --success, otherwise fail */ -int -woal_uap_get_channel_nop_info(moal_private *priv, t_u8 wait_option, - mlan_ds_11h_chan_nop_info * ch_info) +int woal_uap_get_channel_nop_info(moal_private *priv, t_u8 wait_option, + mlan_ds_11h_chan_nop_info *ch_info) { mlan_ioctl_req *req = NULL; mlan_ds_11h_cfg *ds_11hcfg = NULL; @@ -1029,8 +1027,8 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_chan_switch_count_cfg(struct net_device *dev, struct ifreq *req) +static int woal_uap_chan_switch_count_cfg(struct net_device *dev, + struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ioctl_req *ioctl_req = NULL; @@ -1080,7 +1078,7 @@ woal_uap_chan_switch_count_cfg(struct net_device *dev, struct ifreq *req) goto done; } - if (!param.action) { /* GET */ + if (!param.action) { /* GET */ param.cs_count = cfg11h->param.cs_count; } /* Copy to user */ @@ -1104,8 +1102,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_tx_bf_cfg(struct net_device *dev, struct ifreq *req) +static int woal_uap_tx_bf_cfg(struct net_device *dev, struct ifreq *req) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1150,8 +1147,8 @@ woal_uap_tx_bf_cfg(struct net_device *dev, struct ifreq *req) } /* Copy to user */ - if (copy_to_user(req->ifr_data + sizeof(tx_bf_cfg_para_hdr), - &bf_cfg, sizeof(bf_cfg))) { + if (copy_to_user(req->ifr_data + sizeof(tx_bf_cfg_para_hdr), &bf_cfg, + sizeof(bf_cfg))) { PRINTM(MERROR, "Copy to user failed!\n"); ret = -EFAULT; goto done; @@ -1169,8 +1166,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_ht_tx_cfg(struct net_device *dev, struct ifreq *req) +static int woal_uap_ht_tx_cfg(struct net_device *dev, struct ifreq *req) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1204,9 +1200,9 @@ woal_uap_ht_tx_cfg(struct net_device *dev, struct ifreq *req) cfg_11n = (mlan_ds_11n_cfg *)ioctl_req->pbuf; cfg_11n->sub_command = MLAN_OID_11N_CFG_TX; ioctl_req->req_id = MLAN_IOCTL_11N_CFG; - if (copy_from_user - (&httx_cfg, req->ifr_data + sizeof(ht_tx_cfg_para_hdr), - sizeof(mlan_ds_11n_tx_cfg))) { + if (copy_from_user(&httx_cfg, + req->ifr_data + sizeof(ht_tx_cfg_para_hdr), + sizeof(mlan_ds_11n_tx_cfg))) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -1231,8 +1227,8 @@ woal_uap_ht_tx_cfg(struct net_device *dev, struct ifreq *req) PRINTM(MINFO, "GET: httxcap:0x%x\n", httx_cfg.httxcap); } /* Copy to user */ - if (copy_to_user(req->ifr_data + sizeof(ht_tx_cfg_para_hdr), - &httx_cfg, sizeof(mlan_ds_11n_tx_cfg))) { + if (copy_to_user(req->ifr_data + sizeof(ht_tx_cfg_para_hdr), &httx_cfg, + sizeof(mlan_ds_11n_tx_cfg))) { PRINTM(MERROR, "Copy to user failed!\n"); ret = -EFAULT; goto done; @@ -1251,8 +1247,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_vht_cfg(struct net_device *dev, struct ifreq *req) +static int woal_uap_vht_cfg(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); int ret = 0, resbuf_len = 0; @@ -1262,14 +1257,14 @@ woal_uap_vht_cfg(struct net_device *dev, struct ifreq *req) t_u8 *respbuf = NULL; vht_cfg_para_hdr param; mlan_status status = MLAN_STATUS_SUCCESS; -#define CMD_RESPBUF_LEN 2048 +#define CMD_RESPBUF_LEN 2048 gfp_t flag; ENTER(); memset(¶m, 0, sizeof(vht_cfg_para_hdr)); - flag = (in_atomic() || irqs_disabled())? GFP_ATOMIC : GFP_KERNEL; + flag = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; respbuf = kzalloc(CMD_RESPBUF_LEN, flag); if (!respbuf) { ret = -ENOMEM; @@ -1400,9 +1395,8 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_hs_cfg(struct net_device *dev, struct ifreq *req, - BOOLEAN invoke_hostcmd) +static int woal_uap_hs_cfg(struct net_device *dev, struct ifreq *req, + BOOLEAN invoke_hostcmd) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ds_hs_cfg hscfg; @@ -1480,9 +1474,8 @@ woal_uap_hs_cfg(struct net_device *dev, struct ifreq *req, goto done; } if (!(hs_cfg.flags & HS_CFG_FLAG_SET)) { - hs_cfg.flags = - HS_CFG_FLAG_CONDITION | HS_CFG_FLAG_GPIO | - HS_CFG_FLAG_GAP; + hs_cfg.flags = HS_CFG_FLAG_CONDITION | HS_CFG_FLAG_GPIO | + HS_CFG_FLAG_GAP; hs_cfg.conditions = hscfg.conditions; hs_cfg.gpio = hscfg.gpio; hs_cfg.gap = hscfg.gap; @@ -1507,8 +1500,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_uap_hs_set_para(struct net_device *dev, struct ifreq *req) +static int woal_uap_hs_set_para(struct net_device *dev, struct ifreq *req) { int ret = 0; @@ -1534,8 +1526,8 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_mgmt_frame_control(struct net_device *dev, struct ifreq *req) +static int woal_uap_mgmt_frame_control(struct net_device *dev, + struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); int ret = 0; @@ -1576,9 +1568,9 @@ woal_uap_mgmt_frame_control(struct net_device *dev, struct ifreq *req) sys_config->mgmt_ie_passthru_mask = param.mask; } - if (MLAN_STATUS_SUCCESS != - woal_set_get_sys_config(priv, action, MOAL_IOCTL_WAIT, - sys_config)) { + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, action, + MOAL_IOCTL_WAIT, + sys_config)) { ret = -EFAULT; goto done; } @@ -1604,8 +1596,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_uap_tx_rate_cfg(struct net_device *dev, struct ifreq *req) +static int woal_uap_tx_rate_cfg(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); int ret = 0, i = 0; @@ -1625,8 +1616,8 @@ woal_uap_tx_rate_cfg(struct net_device *dev, struct ifreq *req) memset(&tx_rate_config, 0, sizeof(tx_rate_cfg_t)); /* Get user data */ - if (copy_from_user - (&tx_rate_config, req->ifr_data, sizeof(tx_rate_cfg_t))) { + if (copy_from_user(&tx_rate_config, req->ifr_data, + sizeof(tx_rate_cfg_t))) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -1663,8 +1654,8 @@ woal_uap_tx_rate_cfg(struct net_device *dev, struct ifreq *req) goto done; } /* rate_format sanity check */ - if ((tx_rate_config.rate_format > MLAN_RATE_FORMAT_HE) - ) { + if ((tx_rate_config.rate_format > + MLAN_RATE_FORMAT_HE)) { PRINTM(MERROR, "Invalid format selection\n"); ret = -EINVAL; goto done; @@ -1677,24 +1668,19 @@ woal_uap_tx_rate_cfg(struct net_device *dev, struct ifreq *req) if (((tx_rate_config.rate_format == MLAN_RATE_FORMAT_LG) && (tx_rate_config.rate > - MLAN_RATE_INDEX_OFDM7)) - || + MLAN_RATE_INDEX_OFDM7)) || ((tx_rate_config.rate_format == MLAN_RATE_FORMAT_HT) && (tx_rate_config.rate != 32) && - (tx_rate_config.rate > 15) - ) - || + (tx_rate_config.rate > 15)) || ((tx_rate_config.rate_format == MLAN_RATE_FORMAT_VHT) && (tx_rate_config.rate > - MLAN_RATE_INDEX_MCS9)) - || + MLAN_RATE_INDEX_MCS9)) || ((tx_rate_config.rate_format == MLAN_RATE_FORMAT_HE) && (tx_rate_config.rate > - MLAN_RATE_INDEX_MCS11)) - ) { + MLAN_RATE_INDEX_MCS11))) { PRINTM(MERROR, "Invalid rate selection\n"); ret = -EINVAL; @@ -1740,9 +1726,9 @@ woal_uap_tx_rate_cfg(struct net_device *dev, struct ifreq *req) rate->param.rate_cfg.rate_format; tx_rate_config.rate = rate->param.rate_cfg.rate; if (rate->param.rate_cfg.rate_format == - MLAN_RATE_FORMAT_VHT || + MLAN_RATE_FORMAT_VHT || rate->param.rate_cfg.rate_format == - MLAN_RATE_FORMAT_HE) + MLAN_RATE_FORMAT_HE) tx_rate_config.nss = rate->param.rate_cfg.nss; tx_rate_config.rate_setting = rate->param.rate_cfg.rate_setting; @@ -1752,8 +1738,8 @@ woal_uap_tx_rate_cfg(struct net_device *dev, struct ifreq *req) rate->param.rate_cfg.bitmap_rates[i]; } - if (copy_to_user - (req->ifr_data, &tx_rate_config, sizeof(tx_rate_cfg_t))) { + if (copy_to_user(req->ifr_data, &tx_rate_config, + sizeof(tx_rate_cfg_t))) { PRINTM(MERROR, "Copy to user failed\n"); ret = -EFAULT; } @@ -1773,8 +1759,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_uap_antenna_cfg(struct net_device *dev, struct ifreq *req) +static int woal_uap_antenna_cfg(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); int ret = 0; @@ -1823,8 +1808,8 @@ woal_uap_antenna_cfg(struct net_device *dev, struct ifreq *req) if (mreq->action == MLAN_ACT_GET) { antenna_config.tx_mode = radio->param.ant_cfg.tx_antenna; antenna_config.rx_mode = radio->param.ant_cfg.rx_antenna; - if (copy_to_user - (req->ifr_data, &antenna_config, sizeof(ant_cfg_t))) { + if (copy_to_user(req->ifr_data, &antenna_config, + sizeof(ant_cfg_t))) { PRINTM(MERROR, "Copy to user failed\n"); ret = -EFAULT; } @@ -1844,8 +1829,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_uap_htstream_cfg(struct net_device *dev, struct ifreq *req) +static int woal_uap_htstream_cfg(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); int ret = 0; @@ -1864,8 +1848,8 @@ woal_uap_htstream_cfg(struct net_device *dev, struct ifreq *req) ret = -EFAULT; goto done; } - if (copy_from_user - (&htstream_cfg, req->ifr_data, sizeof(htstream_cfg_t))) { + if (copy_from_user(&htstream_cfg, req->ifr_data, + sizeof(htstream_cfg_t))) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -1900,8 +1884,8 @@ woal_uap_htstream_cfg(struct net_device *dev, struct ifreq *req) PRINTM(MINFO, "GET: htstream_cfg:0x%x\n", htstream_cfg.stream_cfg); htstream_cfg.stream_cfg = cfg->param.stream_cfg; - if (copy_to_user(req->ifr_data, - &htstream_cfg, sizeof(htstream_cfg_t))) { + if (copy_to_user(req->ifr_data, &htstream_cfg, + sizeof(htstream_cfg_t))) { PRINTM(MERROR, "Copy to user failed!\n"); ret = -EFAULT; goto done; @@ -1922,8 +1906,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_uap_dfs_repeater(struct net_device *dev, struct ifreq *req) +static int woal_uap_dfs_repeater(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); int ret = 0; @@ -1984,8 +1967,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_uap_skip_cac(struct net_device *dev, struct ifreq *req) +static int woal_uap_skip_cac(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); int ret = 0; @@ -2034,8 +2016,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_uap_cac_timer_status(struct net_device *dev, struct ifreq *req) +static int woal_uap_cac_timer_status(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); int ret = 0; @@ -2066,11 +2047,12 @@ woal_uap_cac_timer_status(struct net_device *dev, struct ifreq *req) if (priv->phandle->cac_period == MTRUE) { long cac_left_jiffies; - cac_left_jiffies = MEAS_REPORT_TIME - + cac_left_jiffies = + MEAS_REPORT_TIME - (jiffies - priv->phandle->meas_start_jiffies); - /* cac_left_jiffies would be negative if timer has already elapsed. - * positive if timer is still yet to lapsed + /* cac_left_jiffies would be negative if timer has already + * elapsed. positive if timer is still yet to lapsed */ if (cac_left_jiffies > 0) param.mode = (t_u32)cac_left_jiffies / HZ; @@ -2094,8 +2076,7 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_uap_operation_ctrl(struct net_device *dev, struct ifreq *req) +static int woal_uap_operation_ctrl(struct net_device *dev, struct ifreq *req) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -2149,7 +2130,6 @@ woal_uap_operation_ctrl(struct net_device *dev, struct ifreq *req) bss->param.ap_oper_ctrl.band_cfg = uap_oper.band_cfg; bss->param.ap_oper_ctrl.channel = uap_oper.channel; } - } status = woal_request_ioctl(priv, ioctl_req, MOAL_IOCTL_WAIT); if (status != MLAN_STATUS_SUCCESS) { @@ -2179,8 +2159,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_ioctl(struct net_device *dev, struct ifreq *req) +static int woal_uap_ioctl(struct net_device *dev, struct ifreq *req) { int ret = 0; t_u32 subcmd = 0; @@ -2292,8 +2271,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_sta_deauth_ioctl(struct net_device *dev, struct ifreq *req) +static int woal_uap_sta_deauth_ioctl(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ioctl_req *ioctl_req = NULL; @@ -2311,8 +2289,8 @@ woal_uap_sta_deauth_ioctl(struct net_device *dev, struct ifreq *req) ret = -EFAULT; goto done; } - if (copy_from_user - (&deauth_param, req->ifr_data, sizeof(mlan_deauth_param))) { + if (copy_from_user(&deauth_param, req->ifr_data, + sizeof(mlan_deauth_param))) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -2338,8 +2316,8 @@ woal_uap_sta_deauth_ioctl(struct net_device *dev, struct ifreq *req) status = woal_request_ioctl(priv, ioctl_req, MOAL_IOCTL_WAIT); if (status != MLAN_STATUS_SUCCESS) { ret = -EFAULT; - if (copy_to_user - (req->ifr_data, &ioctl_req->status_code, sizeof(t_u32))) + if (copy_to_user(req->ifr_data, &ioctl_req->status_code, + sizeof(t_u32))) PRINTM(MERROR, "Copy to user failed!\n"); goto done; } @@ -2359,14 +2337,13 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_uap_radio_ctl(struct net_device *dev, struct ifreq *req) +static int woal_uap_radio_ctl(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); int ret = 0; mlan_ds_radio_cfg *radio = NULL; mlan_ioctl_req *mreq = NULL; - int data[2] = { 0, 0 }; + int data[2] = {0, 0}; mlan_bss_info bss_info; mlan_status status = MLAN_STATUS_SUCCESS; @@ -2425,8 +2402,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_bss_ctrl_ioctl(struct net_device *dev, struct ifreq *req) +static int woal_uap_bss_ctrl_ioctl(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); int ret = 0, data = 0; @@ -2459,8 +2435,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_report_mic_ioctl(struct net_device *dev, struct ifreq *req) +static int woal_uap_report_mic_ioctl(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ioctl_req *ioctl_req = NULL; @@ -2520,15 +2495,14 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_set_key_ioctl(struct net_device *dev, struct ifreq *req) +static int woal_uap_set_key_ioctl(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ioctl_req *ioctl_req = NULL; mlan_ds_sec_cfg *sec = NULL; encrypt_key key; int ret = 0; - t_u8 bcast_addr[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + t_u8 bcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; mlan_status status = MLAN_STATUS_SUCCESS; ENTER(); @@ -2563,7 +2537,7 @@ woal_uap_set_key_ioctl(struct net_device *dev, struct ifreq *req) sec = (mlan_ds_sec_cfg *)ioctl_req->pbuf; sec->sub_command = MLAN_OID_SEC_CFG_ENCRYPT_KEY, - ioctl_req->req_id = MLAN_IOCTL_SEC_CFG; + ioctl_req->req_id = MLAN_IOCTL_SEC_CFG; ioctl_req->action = MLAN_ACT_SET; moal_memcpy_ext(priv->phandle, sec->param.encrypt_key.mac_addr, @@ -2575,7 +2549,7 @@ woal_uap_set_key_ioctl(struct net_device *dev, struct ifreq *req) key.key_material, key.key_len, sizeof(sec->param.encrypt_key.key_material)); if (0 == memcmp(sec->param.encrypt_key.mac_addr, bcast_addr, ETH_ALEN)) - sec->param.encrypt_key.key_flags = KEY_FLAG_GROUP_KEY; + sec->param.encrypt_key.key_flags = KEY_FLAG_GROUP_KEY; else sec->param.encrypt_key.key_flags = KEY_FLAG_SET_TX_KEY; @@ -2600,9 +2574,8 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -int -woal_set_get_uap_power_mode(moal_private *priv, t_u32 action, - mlan_ds_ps_mgmt *ps_mgmt) +int woal_set_get_uap_power_mode(moal_private *priv, t_u32 action, + mlan_ds_ps_mgmt *ps_mgmt) { mlan_ioctl_req *ioctl_req = NULL; mlan_ds_pm_cfg *pm_cfg = NULL; @@ -2648,8 +2621,7 @@ woal_set_get_uap_power_mode(moal_private *priv, t_u32 action, * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_power_mode_ioctl(struct net_device *dev, struct ifreq *req) +static int woal_uap_power_mode_ioctl(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ioctl_req *ioctl_req = NULL; @@ -2680,17 +2652,17 @@ woal_uap_power_mode_ioctl(struct net_device *dev, struct ifreq *req) } PRINTM(MIOCTL, "ioctl power: flag=0x%x ps_mode=%d ctrl_bitmap=%d min_sleep=%d max_sleep=%d " - "inact_to=%d min_awake=%d max_awake=%d\n", ps_mgmt.flags, - (int)ps_mgmt.ps_mode, (int)ps_mgmt.sleep_param.ctrl_bitmap, + "inact_to=%d min_awake=%d max_awake=%d\n", + ps_mgmt.flags, (int)ps_mgmt.ps_mode, + (int)ps_mgmt.sleep_param.ctrl_bitmap, (int)ps_mgmt.sleep_param.min_sleep, (int)ps_mgmt.sleep_param.max_sleep, (int)ps_mgmt.inact_param.inactivity_to, (int)ps_mgmt.inact_param.min_awake, (int)ps_mgmt.inact_param.max_awake); - if (ps_mgmt. - flags & ~(PS_FLAG_PS_MODE | PS_FLAG_SLEEP_PARAM | - PS_FLAG_INACT_SLEEP_PARAM)) { + if (ps_mgmt.flags & ~(PS_FLAG_PS_MODE | PS_FLAG_SLEEP_PARAM | + PS_FLAG_INACT_SLEEP_PARAM)) { PRINTM(MERROR, "Invalid parameter: flags = 0x%x\n", ps_mgmt.flags); ret = -EINVAL; @@ -2724,16 +2696,15 @@ woal_uap_power_mode_ioctl(struct net_device *dev, struct ifreq *req) status = woal_request_ioctl(priv, ioctl_req, MOAL_IOCTL_WAIT); if (status != MLAN_STATUS_SUCCESS) { ret = -EFAULT; - if (copy_to_user - (req->ifr_data, &ioctl_req->status_code, sizeof(t_u32))) + if (copy_to_user(req->ifr_data, &ioctl_req->status_code, + sizeof(t_u32))) PRINTM(MERROR, "Copy to user failed!\n"); goto done; } if (!ps_mgmt.flags) { /* Copy to user */ - if (copy_to_user - (req->ifr_data, &pm_cfg->param.ps_mgmt, - sizeof(mlan_ds_ps_mgmt))) { + if (copy_to_user(req->ifr_data, &pm_cfg->param.ps_mgmt, + sizeof(mlan_ds_ps_mgmt))) { PRINTM(MERROR, "Copy to user failed!\n"); ret = -EFAULT; goto done; @@ -2753,8 +2724,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_bss_cfg_ioctl(struct net_device *dev, struct ifreq *req) +static int woal_uap_bss_cfg_ioctl(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); int ret = 0; @@ -2782,9 +2752,8 @@ woal_uap_bss_cfg_ioctl(struct net_device *dev, struct ifreq *req) offset += sizeof(action); /* Allocate an IOCTL request buffer */ - ioctl_req = - (mlan_ioctl_req *) - woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_bss)); + ioctl_req = (mlan_ioctl_req *)woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_bss)); if (ioctl_req == NULL) { ret = -ENOMEM; goto done; @@ -2800,9 +2769,9 @@ woal_uap_bss_cfg_ioctl(struct net_device *dev, struct ifreq *req) if (ioctl_req->action == MLAN_ACT_SET) { /* Get the BSS config from user */ - if (copy_from_user - (&bss->param.bss_config, req->ifr_data + offset, - sizeof(mlan_uap_bss_param))) { + if (copy_from_user(&bss->param.bss_config, + req->ifr_data + offset, + sizeof(mlan_uap_bss_param))) { PRINTM(MERROR, "Copy from user failed\n"); ret = -EFAULT; goto done; @@ -2819,9 +2788,8 @@ woal_uap_bss_cfg_ioctl(struct net_device *dev, struct ifreq *req) offset = sizeof(action); /* Copy to user : BSS config */ - if (copy_to_user - (req->ifr_data + offset, &bss->param.bss_config, - sizeof(mlan_uap_bss_param))) { + if (copy_to_user(req->ifr_data + offset, &bss->param.bss_config, + sizeof(mlan_uap_bss_param))) { PRINTM(MERROR, "Copy to user failed!\n"); ret = -EFAULT; goto done; @@ -2841,8 +2809,8 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_get_sta_list_ioctl(struct net_device *dev, struct ifreq *req) +static int woal_uap_get_sta_list_ioctl(struct net_device *dev, + struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); int ret = 0; @@ -2860,9 +2828,8 @@ woal_uap_get_sta_list_ioctl(struct net_device *dev, struct ifreq *req) } /* Allocate an IOCTL request buffer */ - ioctl_req = - (mlan_ioctl_req *) - woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_get_info)); + ioctl_req = (mlan_ioctl_req *)woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_get_info)); if (ioctl_req == NULL) { ret = -ENOMEM; goto done; @@ -2881,9 +2848,8 @@ woal_uap_get_sta_list_ioctl(struct net_device *dev, struct ifreq *req) if (ioctl_req->action == MLAN_ACT_GET) { /* Copy to user : sta_list */ - if (copy_to_user - (req->ifr_data, &info->param.sta_list, - ioctl_req->data_read_written)) { + if (copy_to_user(req->ifr_data, &info->param.sta_list, + ioctl_req->data_read_written)) { PRINTM(MERROR, "Copy to user failed!\n"); ret = -EFAULT; goto done; @@ -2904,14 +2870,13 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_uap_set_wapi_key_ioctl(moal_private *priv, wapi_msg *msg) +static int woal_uap_set_wapi_key_ioctl(moal_private *priv, wapi_msg *msg) { mlan_ioctl_req *req = NULL; mlan_ds_sec_cfg *sec = NULL; int ret = 0; wapi_key_msg *key_msg = NULL; - t_u8 bcast_addr[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; + t_u8 bcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; mlan_status status = MLAN_STATUS_SUCCESS; ENTER(); @@ -2961,10 +2926,10 @@ done: * @param priv A pointer to moal_private structure * @param enable MTRUE/MFALSE * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -static mlan_status -woal_enable_wapi(moal_private *priv, t_u8 enable) +static mlan_status woal_enable_wapi(moal_private *priv, t_u8 enable) { mlan_ioctl_req *req = NULL; mlan_ds_bss *bss = NULL; @@ -3027,25 +2992,14 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_uap_set_wapi_flag_ioctl(moal_private *priv, wapi_msg *msg) +static int woal_uap_set_wapi_flag_ioctl(moal_private *priv, wapi_msg *msg) { - t_u8 wapi_psk_ie[] = { - 0x44, 0x14, 0x01, 0x00, - 0x01, 0x00, 0x00, 0x14, - 0x72, 0x02, 0x01, 0x00, - 0x00, 0x14, 0x72, 0x01, - 0x00, 0x14, 0x72, 0x01, - 0x00, 0x00 - }; - t_u8 wapi_cert_ie[] = { - 0x44, 0x14, 0x01, 0x00, - 0x01, 0x00, 0x00, 0x14, - 0x72, 0x01, 0x01, 0x00, - 0x00, 0x14, 0x72, 0x01, - 0x00, 0x14, 0x72, 0x01, - 0x00, 0x00 - }; + t_u8 wapi_psk_ie[] = {0x44, 0x14, 0x01, 0x00, 0x01, 0x00, 0x00, 0x14, + 0x72, 0x02, 0x01, 0x00, 0x00, 0x14, 0x72, 0x01, + 0x00, 0x14, 0x72, 0x01, 0x00, 0x00}; + t_u8 wapi_cert_ie[] = {0x44, 0x14, 0x01, 0x00, 0x01, 0x00, 0x00, 0x14, + 0x72, 0x01, 0x01, 0x00, 0x00, 0x14, 0x72, 0x01, + 0x00, 0x14, 0x72, 0x01, 0x00, 0x00}; mlan_ds_misc_cfg *misc = NULL; mlan_ioctl_req *req = NULL; int ret = 0; @@ -3106,8 +3060,7 @@ done: * @param req A pointer to ifreq structure * @return 0 --success, otherwise fail */ -static int -woal_uap_set_wapi(struct net_device *dev, struct ifreq *req) +static int woal_uap_set_wapi(struct net_device *dev, struct ifreq *req) { moal_private *priv = (moal_private *)netdev_priv(dev); wapi_msg msg; @@ -3164,9 +3117,9 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_uap_get_bss_param(moal_private *priv, mlan_uap_bss_param *sys_cfg, - t_u8 wait_option) +mlan_status woal_uap_get_bss_param(moal_private *priv, + mlan_uap_bss_param *sys_cfg, + t_u8 wait_option) { mlan_ds_bss *info = NULL; mlan_ioctl_req *req = NULL; @@ -3210,8 +3163,7 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_set_uap_ht_tx_cfg(moal_private *priv, Band_Config_t bandcfg, t_u8 en) +int woal_set_uap_ht_tx_cfg(moal_private *priv, Band_Config_t bandcfg, t_u8 en) { int ret = 0; mlan_ds_11n_cfg *cfg_11n = NULL; @@ -3268,19 +3220,17 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_uap_set_11n_status(moal_private *priv, mlan_uap_bss_param *sys_cfg, - t_u8 action) +mlan_status woal_uap_set_11n_status(moal_private *priv, + mlan_uap_bss_param *sys_cfg, t_u8 action) { mlan_status status = MLAN_STATUS_SUCCESS; mlan_fw_info fw_info; ENTER(); if (action == MLAN_ACT_DISABLE) { - if ((sys_cfg->supported_mcs_set[0] == 0) - && (sys_cfg->supported_mcs_set[4] == 0) - && (sys_cfg->supported_mcs_set[1] == 0) - ) { + if ((sys_cfg->supported_mcs_set[0] == 0) && + (sys_cfg->supported_mcs_set[4] == 0) && + (sys_cfg->supported_mcs_set[1] == 0)) { goto done; } else { sys_cfg->supported_mcs_set[0] = 0; @@ -3307,7 +3257,7 @@ done: return status; } -#define VHT_CAP_11AC_MASK 0x007fffff +#define VHT_CAP_11AC_MASK 0x007fffff /** * @brief enable/disable 11AC @@ -3319,11 +3269,9 @@ done: * * @return 0--success, otherwise failure */ -int -woal_uap_set_11ac_status(moal_private *priv, t_u8 action, t_u8 vht20_40, - IEEEtypes_VHTCap_t *vhtcap_ie) +int woal_uap_set_11ac_status(moal_private *priv, t_u8 action, t_u8 vht20_40, + IEEEtypes_VHTCap_t *vhtcap_ie) { - mlan_ioctl_req *req = NULL; mlan_ds_11ac_cfg *cfg_11ac = NULL; mlan_fw_info fw_info; @@ -3351,13 +3299,13 @@ woal_uap_set_11ac_status(moal_private *priv, t_u8 action, t_u8 vht20_40, /* * p2p GO (negotiation or auto GO) cases, wpa_supplicant will download * invalid vht capability with value 0 in beacon parameters, so for p2p - * GO case (vht_cap_info = 0), driver will use hardware 11ac vht capability - * value instead of up layer value. + * GO case (vht_cap_info = 0), driver will use hardware 11ac vht + * capability value instead of up layer value. */ if (vhtcap_ie && vhtcap_ie->vht_cap.vht_cap_info != 0) { cfg_11ac->param.vht_cfg.vht_cap_info = woal_le32_to_cpu(vhtcap_ie->vht_cap.vht_cap_info); - /** todo mcs configuration */ + /** todo mcs configuration */ } else { cfg_11ac->param.vht_cfg.vht_cap_info = fw_info.usr_dot_11ac_dev_cap_a; @@ -3397,7 +3345,6 @@ done: kfree(req); LEAVE(); return ret; - } /** @@ -3409,8 +3356,7 @@ done: * * @return 0--success, otherwise failure */ -int -woal_11ax_cfg(moal_private *priv, t_u8 action, mlan_ds_11ax_he_cfg * he_cfg) +int woal_11ax_cfg(moal_private *priv, t_u8 action, mlan_ds_11ax_he_cfg *he_cfg) { int ret = 0; mlan_status status = MLAN_STATUS_SUCCESS; @@ -3421,7 +3367,7 @@ woal_11ax_cfg(moal_private *priv, t_u8 action, mlan_ds_11ax_he_cfg * he_cfg) ret = -ENOMEM; goto done; } - cfg_11ax = (mlan_ds_11ax_cfg *) req->pbuf; + cfg_11ax = (mlan_ds_11ax_cfg *)req->pbuf; cfg_11ax->sub_command = MLAN_OID_11AX_HE_CFG; req->req_id = MLAN_IOCTL_11AX_CFG; req->action = action; @@ -3452,11 +3398,9 @@ done: * * @return 0--success, otherwise failure */ -int -woal_uap_set_11ax_status(moal_private *priv, t_u8 action, t_u8 band, - IEEEtypes_HECap_t * hecap_ie) +int woal_uap_set_11ax_status(moal_private *priv, t_u8 action, t_u8 band, + IEEEtypes_HECap_t *hecap_ie) { - mlan_fw_info fw_info; int ret = 0; mlan_ds_11ax_he_cfg he_cfg; @@ -3487,7 +3431,7 @@ woal_uap_set_11ax_status(moal_private *priv, t_u8 action, t_u8 band, if (hecap_ie) { DBG_HEXDUMP(MCMD_D, "hecap_ie", (t_u8 *)hecap_ie, hecap_ie->ieee_hdr.len + - sizeof(IEEEtypes_Header_t)); + sizeof(IEEEtypes_Header_t)); he_cfg.he_cap.id = hecap_ie->ieee_hdr.element_id; he_cfg.he_cap.len = hecap_ie->ieee_hdr.len; moal_memcpy_ext(priv->phandle, &he_cfg.he_cap.ext_id, @@ -3520,9 +3464,8 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_uap_ap_cfg_parse_data(moal_private *priv, mlan_uap_bss_param *ap_cfg, - char *buf) +int woal_uap_ap_cfg_parse_data(moal_private *priv, mlan_uap_bss_param *ap_cfg, + char *buf) { int ret = 0, atoi_ret; int set_sec = 0, set_key = 0, set_chan = 0; @@ -3601,8 +3544,8 @@ woal_uap_ap_cfg_parse_data(moal_private *priv, mlan_uap_bss_param *ap_cfg, ap_cfg->wpa_cfg.length = 0; ap_cfg->key_mgmt = KEY_MGMT_NONE; ap_cfg->protocol = PROTOCOL_NO_SECURITY; - } else if (!strnicmp - (value, "wpa2-psk", strlen("wpa2-psk"))) { + } else if (!strnicmp(value, "wpa2-psk", + strlen("wpa2-psk"))) { ap_cfg->auth_mode = MLAN_AUTH_MODE_OPEN; ap_cfg->protocol = PROTOCOL_WPA2; ap_cfg->key_mgmt = KEY_MGMT_PSK; @@ -3611,15 +3554,16 @@ woal_uap_ap_cfg_parse_data(moal_private *priv, mlan_uap_bss_param *ap_cfg, ap_cfg->wpa_cfg.pairwise_cipher_wpa2 = CIPHER_AES_CCMP; ap_cfg->wpa_cfg.group_cipher = CIPHER_AES_CCMP; - } else if (!strnicmp - (value, "wpa-psk", strlen("wpa-psk"))) { + } else if (!strnicmp(value, "wpa-psk", + strlen("wpa-psk"))) { ap_cfg->auth_mode = MLAN_AUTH_MODE_OPEN; ap_cfg->protocol = PROTOCOL_WPA; ap_cfg->key_mgmt = KEY_MGMT_PSK; ap_cfg->wpa_cfg.pairwise_cipher_wpa = CIPHER_TKIP; ap_cfg->wpa_cfg.group_cipher = CIPHER_TKIP; - } else if (!strnicmp(value, "wep128", strlen("wep128"))) { + } else if (!strnicmp(value, "wep128", + strlen("wep128"))) { ap_cfg->auth_mode = MLAN_AUTH_MODE_OPEN; if (set_key) ap_cfg->wpa_cfg.length = 0; @@ -3638,7 +3582,8 @@ woal_uap_ap_cfg_parse_data(moal_private *priv, mlan_uap_bss_param *ap_cfg, PRINTM(MWARN, "Skipping KEY, found again!\n"); continue; } - if (set_sec && ap_cfg->protocol == PROTOCOL_STATIC_WEP) { + if (set_sec && + ap_cfg->protocol == PROTOCOL_STATIC_WEP) { if (strlen(value) != MAX_WEP_KEY_SIZE) { PRINTM(MERROR, "Invalid WEP KEY length\n"); @@ -3648,16 +3593,15 @@ woal_uap_ap_cfg_parse_data(moal_private *priv, mlan_uap_bss_param *ap_cfg, ap_cfg->wep_cfg.key0.key_index = 0; ap_cfg->wep_cfg.key0.is_default = 1; ap_cfg->wep_cfg.key0.length = strlen(value); - moal_memcpy_ext(priv->phandle, - ap_cfg->wep_cfg.key0.key, value, - strlen(value), - sizeof(ap_cfg->wep_cfg.key0. - key)); + moal_memcpy_ext( + priv->phandle, ap_cfg->wep_cfg.key0.key, + value, strlen(value), + sizeof(ap_cfg->wep_cfg.key0.key)); set_key = 1; continue; } - if (set_sec && ap_cfg->protocol != PROTOCOL_WPA2 - && ap_cfg->protocol != PROTOCOL_WPA) { + if (set_sec && ap_cfg->protocol != PROTOCOL_WPA2 && + ap_cfg->protocol != PROTOCOL_WPA) { PRINTM(MWARN, "Warning! No KEY for open mode\n"); set_key = 1; @@ -3688,7 +3632,8 @@ woal_uap_ap_cfg_parse_data(moal_private *priv, mlan_uap_bss_param *ap_cfg, if (atoi_ret < 1 || atoi_ret > MLAN_MAX_CHANNEL) { PRINTM(MERROR, "AP_CFG: Channel must be between 1 and %d" - "(both included)\n", MLAN_MAX_CHANNEL); + "(both included)\n", + MLAN_MAX_CHANNEL); ret = -EINVAL; goto done; } @@ -3720,7 +3665,8 @@ woal_uap_ap_cfg_parse_data(moal_private *priv, mlan_uap_bss_param *ap_cfg, if (atoi_ret < 1 || atoi_ret > MAX_STA_COUNT) { PRINTM(MERROR, "AP_CFG: MAX_SCB must be between 1 to %d " - "(both included)\n", MAX_STA_COUNT); + "(both included)\n", + MAX_STA_COUNT); ret = -EINVAL; goto done; } @@ -3747,8 +3693,7 @@ done: * * @return 0 --success, otherwise fail */ -int -woal_uap_set_ap_cfg(moal_private *priv, t_u8 *data, int len) +int woal_uap_set_ap_cfg(moal_private *priv, t_u8 *data, int len) { int ret = 0; static char buf[MAX_BUF_LEN]; @@ -3757,7 +3702,7 @@ woal_uap_set_ap_cfg(moal_private *priv, t_u8 *data, int len) ENTER(); -#define MIN_AP_CFG_CMD_LEN 16 /* strlen("ASCII_CMD=AP_CFG") */ +#define MIN_AP_CFG_CMD_LEN 16 /* strlen("ASCII_CMD=AP_CFG") */ if ((len - 1) <= MIN_AP_CFG_CMD_LEN) { PRINTM(MERROR, "Invalid length of command\n"); ret = -EINVAL; @@ -3795,8 +3740,8 @@ woal_uap_set_ap_cfg(moal_private *priv, t_u8 *data, int len) /* If the security mode is configured as WEP or WPA-PSK, * it will disable 11n automatically, and if configured as * open(off) or wpa2-psk, it will automatically enable 11n */ - if ((sys_config->protocol == PROTOCOL_STATIC_WEP) - || (sys_config->protocol == PROTOCOL_WPA)) { + if ((sys_config->protocol == PROTOCOL_STATIC_WEP) || + (sys_config->protocol == PROTOCOL_WPA)) { if (MLAN_STATUS_SUCCESS != woal_uap_set_11n_status(priv, sys_config, MLAN_ACT_DISABLE)) { @@ -3812,9 +3757,9 @@ woal_uap_set_ap_cfg(moal_private *priv, t_u8 *data, int len) } } - if (MLAN_STATUS_SUCCESS != - woal_set_get_sys_config(priv, MLAN_ACT_SET, MOAL_IOCTL_WAIT, - sys_config)) { + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_SET, + MOAL_IOCTL_WAIT, + sys_config)) { ret = -EFAULT; goto done; } @@ -3838,9 +3783,8 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_set_get_ap_scan_channels(moal_private *priv, t_u16 action, - mlan_uap_scan_channels * scan_channels) +mlan_status woal_set_get_ap_scan_channels(moal_private *priv, t_u16 action, + mlan_uap_scan_channels *scan_channels) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_bss *bss = NULL; @@ -3889,9 +3833,9 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_set_get_ap_channel(moal_private *priv, t_u16 action, t_u8 wait_option, - chan_band_info * uap_channel) +mlan_status woal_set_get_ap_channel(moal_private *priv, t_u16 action, + t_u8 wait_option, + chan_band_info *uap_channel) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_bss *bss = NULL; @@ -3935,8 +3879,7 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_start_acs_scan(moal_private *priv) +mlan_status woal_start_acs_scan(moal_private *priv) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_bss *bss = NULL; @@ -3979,8 +3922,7 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_do_acs_check(moal_private *priv) +mlan_status woal_do_acs_check(moal_private *priv) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_uap_bss_param *sys_config = NULL; @@ -3995,9 +3937,9 @@ woal_do_acs_check(moal_private *priv) return MLAN_STATUS_FAILURE; } - if (MLAN_STATUS_SUCCESS != - woal_set_get_sys_config(priv, MLAN_ACT_GET, MOAL_IOCTL_WAIT, - sys_config)) { + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_GET, + MOAL_IOCTL_WAIT, + sys_config)) { PRINTM(MERROR, "Fail to get sys config data\n"); kfree(sys_config); LEAVE(); @@ -4024,7 +3966,7 @@ woal_do_acs_check(moal_private *priv) if (scan_channels->num_remvoed_channel && scan_channels->num_of_chan) { scan_channels->remove_nop_channel = 0; - /** set back new channel list after remove nop channels */ + /** set back new channel list after remove nop channels */ if (MLAN_STATUS_SUCCESS != woal_set_get_ap_scan_channels(priv, MLAN_ACT_SET, scan_channels)) { @@ -4036,7 +3978,7 @@ woal_do_acs_check(moal_private *priv) ret = woal_start_acs_scan(priv); else ret = MLAN_STATUS_FAILURE; - /** set to default channel 6 when 5G ACS is configured */ + /** set to default channel 6 when 5G ACS is configured */ if ((ret != MLAN_STATUS_SUCCESS) && (sys_config->bandcfg.chanBand == BAND_5GHZ)) { memset(&uap_channel, 0, sizeof(uap_channel)); @@ -4060,8 +4002,7 @@ done: * @param data BSS control type * @return 0 --success, otherwise fail */ -int -woal_uap_bss_ctrl(moal_private *priv, t_u8 wait_option, int data) +int woal_uap_bss_ctrl(moal_private *priv, t_u8 wait_option, int data) { mlan_ioctl_req *req = NULL; mlan_ds_bss *bss = NULL; @@ -4092,7 +4033,7 @@ woal_uap_bss_ctrl(moal_private *priv, t_u8 wait_option, int data) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 14, 0) || moal_extflg_isset(priv->phandle, EXT_DFS_OFFLOAD) #endif - ) { + ) { woal_do_acs_check(priv); /* about to start bss: issue channel check */ status = woal_11h_channel_check_ioctl(priv, @@ -4118,11 +4059,13 @@ woal_uap_bss_ctrl(moal_private *priv, t_u8 wait_option, int data) case UAP_BSS_STOP: if (priv->bss_started == MFALSE) { PRINTM(MWARN, "Warning: BSS already stopped!\n"); - /* This is a situation where CAC it started and BSS start is dealyed - * and before CAC timer expires BSS stop is triggered. + /* This is a situation where CAC it started and BSS + * start is dealyed and before CAC timer expires BSS + * stop is triggered. * - * Do not skip sending the BSS_STOP command since there are many - * routines triggered on BSS_STOP command response. + * Do not skip sending the BSS_STOP command since there + * are many routines triggered on BSS_STOP command + * response. */ woal_cancel_cac_block(priv); } @@ -4146,6 +4089,8 @@ woal_uap_bss_ctrl(moal_private *priv, t_u8 wait_option, int data) woal_stop_queue(priv->netdev); if (netif_carrier_ok(priv->netdev)) netif_carrier_off(priv->netdev); + if (data == UAP_BSS_RESET) + woal_request_set_mac_address(priv, wait_option); woal_flush_tcp_sess_queue(priv); } done: @@ -4161,8 +4106,7 @@ done: * @param dev A pointer to net_device structure * @return N/A */ -void -woal_uap_set_multicast_list(struct net_device *dev) +void woal_uap_set_multicast_list(struct net_device *dev) { ENTER(); @@ -4178,14 +4122,13 @@ woal_uap_set_multicast_list(struct net_device *dev) * * @return 0 --success, otherwise fail */ -int -woal_uap_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd) +int woal_uap_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd) { int ret = 0; ENTER(); switch (cmd) { case WOAL_ANDROID_DEF_CMD: - /** android default ioctl ID is SIOCDEVPRIVATE + 1 */ + /** android default ioctl ID is SIOCDEVPRIVATE + 1 */ ret = woal_android_priv_cmd(dev, req); break; case UAP_IOCTL_CMD: @@ -4253,8 +4196,7 @@ woal_uap_do_ioctl(struct net_device *dev, struct ifreq *req, int cmd) * * @return N/A */ -void -woal_uap_get_version(moal_private *priv, char *version, int max_len) +void woal_uap_get_version(moal_private *priv, char *version, int max_len) { mlan_ds_get_info *info = NULL; mlan_ioctl_req *req = NULL; @@ -4295,11 +4237,11 @@ woal_uap_get_version(moal_private *priv, char *version, int max_len) * @param wait_option Wait option * @param ustats A pointer to mlan_ds_uap_stats structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- + * success, otherwise fail */ -mlan_status -woal_uap_get_stats(moal_private *priv, t_u8 wait_option, - mlan_ds_uap_stats *ustats) +mlan_status woal_uap_get_stats(moal_private *priv, t_u8 wait_option, + mlan_ds_uap_stats *ustats) { mlan_ds_get_info *info = NULL; mlan_ioctl_req *req = NULL; @@ -4349,9 +4291,8 @@ woal_uap_get_stats(moal_private *priv, t_u8 wait_option, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_set_get_ap_wmm_para(moal_private *priv, t_u16 action, - wmm_parameter_t *ap_wmm_para) +mlan_status woal_set_get_ap_wmm_para(moal_private *priv, t_u16 action, + wmm_parameter_t *ap_wmm_para) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_bss *bss = NULL; @@ -4405,9 +4346,9 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_set_get_sys_config(moal_private *priv, t_u16 action, t_u8 wait_option, - mlan_uap_bss_param *sys_cfg) +mlan_status woal_set_get_sys_config(moal_private *priv, t_u16 action, + t_u8 wait_option, + mlan_uap_bss_param *sys_cfg) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_ds_bss *bss = NULL; @@ -4455,8 +4396,7 @@ done: * * @return N/A */ -void -woal_set_sys_config_invalid_data(mlan_uap_bss_param *config) +void woal_set_sys_config_invalid_data(mlan_uap_bss_param *config) { ENTER(); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap.h index 82ce93dfef86..93f3d874ce49 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap.h @@ -1,24 +1,24 @@ /** @file moal_uap.h - * - * @brief This file contains uap driver specific defines etc. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains uap driver specific defines etc. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /******************************************************** Change log: @@ -29,149 +29,149 @@ Change log: #define _MOAL_UAP_H /** Maximum buffer length for WOAL_UAP_SET_GET_256_CHAR */ -#define MAX_BUF_LEN 256 +#define MAX_BUF_LEN 256 /** Private command ID to send ioctl */ -#define UAP_IOCTL_CMD (SIOCDEVPRIVATE + 2) +#define UAP_IOCTL_CMD (SIOCDEVPRIVATE + 2) /** Updating ADDBA variables */ -#define UAP_ADDBA_PARA 0 +#define UAP_ADDBA_PARA 0 /** Updating priority table for AMPDU/AMSDU */ -#define UAP_AGGR_PRIOTBL 1 +#define UAP_AGGR_PRIOTBL 1 /** Updating addbareject table */ -#define UAP_ADDBA_REJECT 2 +#define UAP_ADDBA_REJECT 2 /** Get FW INFO */ -#define UAP_FW_INFO 4 +#define UAP_FW_INFO 4 /** Updating Deep sleep variables */ -#define UAP_DEEP_SLEEP 3 +#define UAP_DEEP_SLEEP 3 /** Tx data pause subcommand */ -#define UAP_TX_DATA_PAUSE 5 +#define UAP_TX_DATA_PAUSE 5 #ifdef SDIO /** sdcmd52 read write subcommand */ -#define UAP_SDCMD52_RW 6 +#define UAP_SDCMD52_RW 6 #endif /** snmp mib subcommand */ -#define UAP_SNMP_MIB 7 +#define UAP_SNMP_MIB 7 /** domain info subcommand */ -#define UAP_DOMAIN_INFO 8 +#define UAP_DOMAIN_INFO 8 /** TX beamforming configuration */ -#define UAP_TX_BF_CFG 9 +#define UAP_TX_BF_CFG 9 /** dfs testing subcommand */ -#define UAP_DFS_TESTING 10 +#define UAP_DFS_TESTING 10 /** sub command ID to set/get Host Sleep configuration */ -#define UAP_HS_CFG 11 +#define UAP_HS_CFG 11 /** sub command ID to set/get Host Sleep Parameters */ -#define UAP_HS_SET_PARA 12 +#define UAP_HS_SET_PARA 12 /** Management Frame Control Mask */ -#define UAP_MGMT_FRAME_CONTROL 13 +#define UAP_MGMT_FRAME_CONTROL 13 -#define UAP_TX_RATE_CFG 14 +#define UAP_TX_RATE_CFG 14 /** Subcommand ID to set/get antenna configuration */ -#define UAP_ANTENNA_CFG 15 +#define UAP_ANTENNA_CFG 15 -#define UAP_DFS_REPEATER_MODE 16 +#define UAP_DFS_REPEATER_MODE 16 -#define UAP_CAC_TIMER_STATUS 17 +#define UAP_CAC_TIMER_STATUS 17 /** Skip CAC */ -#define UAP_SKIP_CAC 18 +#define UAP_SKIP_CAC 18 -#define UAP_HT_TX_CFG 19 +#define UAP_HT_TX_CFG 19 -#define UAP_VHT_CFG 20 +#define UAP_VHT_CFG 20 -#define UAP_HT_STREAM_CFG 21 +#define UAP_HT_STREAM_CFG 21 -#define UAP_OPERATION_CTRL 22 +#define UAP_OPERATION_CTRL 22 -#define UAP_CHAN_SWITCH_COUNT_CFG 23 -#define UAP_BAND_STEER 24 +#define UAP_CHAN_SWITCH_COUNT_CFG 23 +#define UAP_BAND_STEER 24 /** Private command ID to Power Mode */ -#define UAP_POWER_MODE (SIOCDEVPRIVATE + 3) +#define UAP_POWER_MODE (SIOCDEVPRIVATE + 3) /** Private command id to start/stop/reset bss */ -#define UAP_BSS_CTRL (SIOCDEVPRIVATE + 4) +#define UAP_BSS_CTRL (SIOCDEVPRIVATE + 4) /** BSS START */ -#define UAP_BSS_START 0 +#define UAP_BSS_START 0 /** BSS STOP */ -#define UAP_BSS_STOP 1 +#define UAP_BSS_STOP 1 /** BSS RESET */ -#define UAP_BSS_RESET 2 +#define UAP_BSS_RESET 2 /** wapi_msg */ typedef struct _wapi_msg { - /** message type */ + /** message type */ t_u16 msg_type; - /** message len */ + /** message len */ t_u16 msg_len; - /** message */ + /** message */ t_u8 msg[96]; } wapi_msg; /* wapi key msg */ typedef struct _wapi_key_msg { - /** mac address */ + /** mac address */ t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; - /** pad */ + /** pad */ t_u8 pad; - /** key id */ + /** key id */ t_u8 key_id; - /** key */ + /** key */ t_u8 key[32]; } wapi_key_msg; /** Private command ID to set wapi info */ -#define UAP_WAPI_MSG (SIOCDEVPRIVATE + 10) +#define UAP_WAPI_MSG (SIOCDEVPRIVATE + 10) /** set wapi flag */ -#define P80211_PACKET_WAPIFLAG 0x0001 +#define P80211_PACKET_WAPIFLAG 0x0001 /** set wapi key */ -#define P80211_PACKET_SETKEY 0x0003 +#define P80211_PACKET_SETKEY 0x0003 /** wapi mode psk */ -#define WAPI_MODE_PSK 0x04 +#define WAPI_MODE_PSK 0x04 /** wapi mode certificate */ -#define WAPI_MODE_CERT 0x08 +#define WAPI_MODE_CERT 0x08 typedef struct _tx_rate_cfg_t { - /** sub command */ + /** sub command */ int subcmd; - /** Action */ + /** Action */ int action; - /** Rate format */ + /** Rate format */ int rate_format; - /** Rate configured */ + /** Rate configured */ int rate; - /** nss */ + /** nss */ int nss; - /** user_data_cnt */ + /** user_data_cnt */ int user_data_cnt; - /** Rate bitmap */ + /** Rate bitmap */ t_u16 bitmap_rates[MAX_BITMAP_RATES_SIZE]; - /** Rate Setting */ + /** Rate Setting */ t_u16 rate_setting; } tx_rate_cfg_t; /** ant_cfg structure */ typedef struct _ant_cfg_t { - /** Subcommand */ + /** Subcommand */ int subcmd; - /** Action */ + /** Action */ int action; - /** TX mode configured */ + /** TX mode configured */ int tx_mode; - /** RX mode configured */ + /** RX mode configured */ int rx_mode; } ant_cfg_t; /** htstream_cfg structure */ typedef struct _htstream_cfg_t { - /** Subcommand */ + /** Subcommand */ int subcmd; - /** Action */ + /** Action */ int action; - /** HT stream configuration */ + /** HT stream configuration */ t_u32 stream_cfg; } htstream_cfg_t; @@ -197,316 +197,318 @@ typedef struct _cac_timer_status { /** skip_cac parameters */ typedef struct _skip_cac_para { - /** subcmd */ + /** subcmd */ t_u32 subcmd; - /** Set/Get */ + /** Set/Get */ t_u32 action; - /** enable/disable deepsleep*/ + /** enable/disable deepsleep*/ t_u16 skip_cac; } skip_cac_para; /** radio control command */ -#define UAP_RADIO_CTL (SIOCDEVPRIVATE + 5) +#define UAP_RADIO_CTL (SIOCDEVPRIVATE + 5) /** Private command ID to BSS config */ -#define UAP_BSS_CONFIG (SIOCDEVPRIVATE + 6) +#define UAP_BSS_CONFIG (SIOCDEVPRIVATE + 6) /** deauth station */ -#define UAP_STA_DEAUTH (SIOCDEVPRIVATE + 7) +#define UAP_STA_DEAUTH (SIOCDEVPRIVATE + 7) /** enable UAP report mic error */ -#define UAP_REPORT_MIC_ERR (SIOCDEVPRIVATE + 8) +#define UAP_REPORT_MIC_ERR (SIOCDEVPRIVATE + 8) /** uap set key */ -#define UAP_SET_KEY (SIOCDEVPRIVATE + 9) +#define UAP_SET_KEY (SIOCDEVPRIVATE + 9) /** encrypt key */ typedef struct _encrypt_key { - /** Key index */ + /** Key index */ t_u32 key_index; - /** Key length */ + /** Key length */ t_u32 key_len; - /** Key */ + /** Key */ t_u8 key_material[MLAN_MAX_KEY_LENGTH]; - /** mac address */ + /** mac address */ t_u8 mac_addr[MLAN_MAC_ADDR_LENGTH]; } encrypt_key; /** pkt_header */ typedef struct _pkt_header { - /** pkt_len */ + /** pkt_len */ u32 pkt_len; - /** pkt_type */ + /** pkt_type */ u32 TxPktType; - /** tx control */ + /** tx control */ u32 TxControl; } pkt_header; /** uap get station list */ -#define UAP_GET_STA_LIST (SIOCDEVPRIVATE + 11) +#define UAP_GET_STA_LIST (SIOCDEVPRIVATE + 11) /** Packet inject command ioctl number */ -#define UAPHOSTPKTINJECT WOAL_MGMT_FRAME_TX_IOCTL +#define UAPHOSTPKTINJECT WOAL_MGMT_FRAME_TX_IOCTL /** Private command ID to set/get custom IE buffer */ -#define UAP_CUSTOM_IE (SIOCDEVPRIVATE + 13) +#define UAP_CUSTOM_IE (SIOCDEVPRIVATE + 13) /** HS WAKE UP event id */ -#define UAP_EVENT_ID_HS_WAKEUP 0x80000001 +#define UAP_EVENT_ID_HS_WAKEUP 0x80000001 /** HS_ACTIVATED event id */ -#define UAP_EVENT_ID_DRV_HS_ACTIVATED 0x80000002 +#define UAP_EVENT_ID_DRV_HS_ACTIVATED 0x80000002 /** HS DEACTIVATED event id */ -#define UAP_EVENT_ID_DRV_HS_DEACTIVATED 0x80000003 +#define UAP_EVENT_ID_DRV_HS_DEACTIVATED 0x80000003 /** Host sleep flag set */ -#define HS_CFG_FLAG_GET 0 +#define HS_CFG_FLAG_GET 0 /** Host sleep flag get */ -#define HS_CFG_FLAG_SET 1 +#define HS_CFG_FLAG_SET 1 /** Host sleep flag for condition */ -#define HS_CFG_FLAG_CONDITION 2 +#define HS_CFG_FLAG_CONDITION 2 /** Host sleep flag for GPIO */ -#define HS_CFG_FLAG_GPIO 4 +#define HS_CFG_FLAG_GPIO 4 /** Host sleep flag for Gap */ -#define HS_CFG_FLAG_GAP 8 +#define HS_CFG_FLAG_GAP 8 /** Host sleep flag for all */ -#define HS_CFG_FLAG_ALL 0x0f +#define HS_CFG_FLAG_ALL 0x0f /** Host sleep mask to get condition */ -#define HS_CFG_CONDITION_MASK 0x0f +#define HS_CFG_CONDITION_MASK 0x0f /** ds_hs_cfg */ typedef struct _ds_hs_cfg { - /** subcmd */ + /** subcmd */ t_u32 subcmd; - /** Bit0: 0 - Get, 1 Set - * Bit1: 1 - conditions is valid - * Bit2: 2 - gpio is valid - * Bit3: 3 - gap is valid - */ + /** Bit0: 0 - Get, 1 Set + * Bit1: 1 - conditions is valid + * Bit2: 2 - gpio is valid + * Bit3: 3 - gap is valid + */ t_u32 flags; - /** Host sleep config condition */ - /** Bit0: non-unicast data - * Bit1: unicast data - * Bit2: mac events - * Bit3: magic packet - */ + /** Host sleep config condition */ + /** Bit0: non-unicast data + * Bit1: unicast data + * Bit2: mac events + * Bit3: magic packet + */ t_u32 conditions; - /** GPIO */ + /** GPIO */ t_u32 gpio; - /** Gap in milliseconds */ + /** Gap in milliseconds */ t_u32 gap; } ds_hs_cfg; /** Private command ID to get BSS type */ -#define UAP_GET_BSS_TYPE (SIOCDEVPRIVATE + 15) +#define UAP_GET_BSS_TYPE (SIOCDEVPRIVATE + 15) /** addba_param */ typedef struct _addba_param { - /** subcmd */ + /** subcmd */ t_u32 subcmd; - /** Set/Get */ + /** Set/Get */ t_u32 action; - /** block ack timeout for ADDBA request */ + /** block ack timeout for ADDBA request */ t_u32 timeout; - /** Buffer size for ADDBA request */ + /** Buffer size for ADDBA request */ t_u32 txwinsize; - /** Buffer size for ADDBA response */ + /** Buffer size for ADDBA response */ t_u32 rxwinsize; - /** amsdu for ADDBA request */ + /** amsdu for ADDBA request */ t_u8 txamsdu; - /** amsdu for ADDBA response */ + /** amsdu for ADDBA response */ t_u8 rxamsdu; } addba_param; /** aggr_prio_tbl */ typedef struct _aggr_prio_tbl { - /** subcmd */ + /** subcmd */ t_u32 subcmd; - /** Set/Get */ + /** Set/Get */ t_u32 action; - /** ampdu priority table */ + /** ampdu priority table */ t_u8 ampdu[MAX_NUM_TID]; - /** amsdu priority table */ + /** amsdu priority table */ t_u8 amsdu[MAX_NUM_TID]; } aggr_prio_tbl; /** addba_reject parameters */ typedef struct _addba_reject_para { - /** subcmd */ + /** subcmd */ t_u32 subcmd; - /** Set/Get */ + /** Set/Get */ t_u32 action; - /** BA Reject paramters */ + /** BA Reject paramters */ t_u8 addba_reject[MAX_NUM_TID]; } addba_reject_para; /** fw_info */ typedef struct _fw_info { - /** subcmd */ + /** subcmd */ t_u32 subcmd; - /** Get */ + /** Get */ t_u32 action; - /** Firmware release number */ + /** Firmware release number */ t_u32 fw_release_number; - /** Device support for MIMO abstraction of MCSs */ + /** Device support for MIMO abstraction of MCSs */ t_u8 hw_dev_mcs_support; - /** fw_bands*/ + /** fw_bands*/ t_u8 fw_bands; - /** Region Code */ + /** Region Code */ t_u16 region_code; - /** 802.11n device capabilities */ + /** 802.11n device capabilities */ t_u32 hw_dot_11n_dev_cap; } fw_info; typedef struct _ht_tx_cfg_para_hdr { - /** Sub command */ + /** Sub command */ t_u32 subcmd; - /** Action: Set/Get */ + /** Action: Set/Get */ t_u32 action; } ht_tx_cfg_para_hdr; typedef struct _tx_bf_cfg_para_hdr { - /** Sub command */ + /** Sub command */ t_u32 subcmd; - /** Action: Set/Get */ + /** Action: Set/Get */ t_u32 action; } tx_bf_cfg_para_hdr; typedef struct _vht_cfg_para_hdr { - /** Sub command */ + /** Sub command */ t_u32 subcmd; - /** Action: Set/Get */ + /** Action: Set/Get */ t_u32 action; } vht_cfg_para_hdr; typedef struct _uap_oper_para_hdr { - /** Sub command */ + /** Sub command */ t_u32 subcmd; - /** Action: Set/Get */ + /** Action: Set/Get */ t_u32 action; } uap_oper_para_hdr; #ifdef SDIO /** sdcmd52rw parameters */ typedef struct _sdcmd52_para { - /** subcmd */ + /** subcmd */ t_u32 subcmd; - /** Write /Read */ + /** Write /Read */ t_u32 action; - /** Command 52 paramters */ + /** Command 52 paramters */ t_u8 cmd52_params[3]; } sdcmd52_para; #endif /** deep_sleep parameters */ typedef struct _deep_sleep_para { - /** subcmd */ + /** subcmd */ t_u32 subcmd; - /** Set/Get */ + /** Set/Get */ t_u32 action; - /** enable/disable deepsleep*/ + /** enable/disable deepsleep*/ t_u16 deep_sleep; - /** idle_time */ + /** idle_time */ t_u16 idle_time; } deep_sleep_para; /** band_steering parameters */ typedef struct _band_steer_para { - /** subcmd */ + /** subcmd */ t_u32 subcmd; - /** Set/Get */ + /** Set/Get */ t_u8 action; - /** enable/disable band steering*/ + /** enable/disable band steering*/ t_u8 state; - /** Probe Response will be blocked to 2G channel for first block_2g_prb_req probe requests*/ + /** Probe Response will be blocked to 2G channel for first + * block_2g_prb_req probe requests*/ t_u8 block_2g_prb_req; - /** When band steering is enabled, limit the btm request sent to STA at */ + /** When band steering is enabled, limit the btm request sent to STA at + * */ t_u8 max_btm_req_allowed; } band_steer_para; /** tx_data_pause parameters */ typedef struct _tx_data_pause_para { - /** subcmd */ + /** subcmd */ t_u32 subcmd; - /** Set/Get */ + /** Set/Get */ t_u32 action; - /** enable/disable Tx data pause*/ + /** enable/disable Tx data pause*/ t_u16 txpause; - /** Max number of TX buffer allowed for all PS client*/ + /** Max number of TX buffer allowed for all PS client*/ t_u16 txbufcnt; } tx_data_pause_para; /** mgmt_frame_ctrl */ typedef struct _mgmt_frame_ctrl { - /** subcmd */ + /** subcmd */ t_u32 subcmd; - /** Set/Get */ + /** Set/Get */ t_u32 action; - /** mask */ + /** mask */ t_u32 mask; } mgmt_frame_ctrl; typedef struct _snmp_mib_para { - /** subcmd */ + /** subcmd */ t_u32 subcmd; - /** Set/Get */ + /** Set/Get */ t_u32 action; - /** oid to set/get */ + /** oid to set/get */ t_u16 oid; - /** length of oid value */ + /** length of oid value */ t_u16 oid_val_len; - /** oid value to set/get */ + /** oid value to set/get */ t_u8 oid_value[]; } snmp_mib_para; /** Max length for oid_value field */ -#define MAX_SNMP_VALUE_SIZE 128 +#define MAX_SNMP_VALUE_SIZE 128 /** Oid for 802.11D enable/disable */ -#define OID_80211D_ENABLE 0x0009 +#define OID_80211D_ENABLE 0x0009 /** Oid for 802.11H enable/disable */ -#define OID_80211H_ENABLE 0x000a +#define OID_80211H_ENABLE 0x000a /** dfs_testing parameters */ typedef struct _dfs_testing_param { - /** subcmd */ + /** subcmd */ t_u32 subcmd; - /** Set/Get */ + /** Set/Get */ t_u32 action; - /** user CAC period (msec) */ + /** user CAC period (msec) */ t_u32 usr_cac_period; - /** user NOP period (sec) */ + /** user NOP period (sec) */ t_u16 usr_nop_period; - /** don't change channel on radar */ + /** don't change channel on radar */ t_u8 no_chan_change; - /** fixed channel to change to on radar */ + /** fixed channel to change to on radar */ t_u8 fixed_new_chan; } dfs_testing_para; /** Channel switch count config */ typedef struct _cscount_cfg_t { - /** subcmd */ + /** subcmd */ t_u32 subcmd; - /** Set/Get */ + /** Set/Get */ t_u32 action; - /** user channel switch count */ + /** user channel switch count */ t_u8 cs_count; } cscount_cfg_t; /** domain_info parameters */ typedef struct _domain_info_param { - /** subcmd */ + /** subcmd */ t_u32 subcmd; - /** Set/Get */ + /** Set/Get */ t_u32 action; - /** domain_param TLV (incl. header) */ + /** domain_param TLV (incl. header) */ t_u8 tlv[]; } domain_info_para; /** DOMAIN_INFO param sizes */ -#define TLV_HEADER_LEN (2 + 2) -#define SUB_BAND_LEN 3 -#define MAX_SUB_BANDS 40 +#define TLV_HEADER_LEN (2 + 2) +#define SUB_BAND_LEN 3 +#define MAX_SUB_BANDS 40 /** MAX domain TLV length */ -#define MAX_DOMAIN_TLV_LEN (TLV_HEADER_LEN + COUNTRY_CODE_LEN \ - + (SUB_BAND_LEN * MAX_SUB_BANDS)) +#define MAX_DOMAIN_TLV_LEN \ + (TLV_HEADER_LEN + COUNTRY_CODE_LEN + (SUB_BAND_LEN * MAX_SUB_BANDS)) int woal_set_get_uap_power_mode(moal_private *priv, t_u32 action, mlan_ds_ps_mgmt *ps_mgmt); @@ -516,12 +518,12 @@ int woal_uap_bss_ctrl(moal_private *priv, t_u8 wait_option, int data); #ifdef UAP_CFG80211 #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) int woal_uap_get_channel_nop_info(moal_private *priv, t_u8 wait_option, - mlan_ds_11h_chan_nop_info * ch_info); + mlan_ds_11h_chan_nop_info *ch_info); #endif #endif mlan_status woal_set_get_ap_channel(moal_private *priv, t_u16 action, t_u8 wait_option, - chan_band_info * uap_channel); + chan_band_info *uap_channel); #ifdef CONFIG_PROC_FS void woal_uap_get_version(moal_private *priv, char *version, int max_len); #endif @@ -536,8 +538,8 @@ int woal_uap_do_priv_ioctl(struct net_device *dev, struct ifreq *req, int cmd); /** Set invalid data for each member of mlan_uap_bss_param */ void woal_set_sys_config_invalid_data(mlan_uap_bss_param *config); /** Set/Get system configuration parameters */ -mlan_status woal_set_get_sys_config(moal_private *priv, - t_u16 action, t_u8 wait_option, +mlan_status woal_set_get_sys_config(moal_private *priv, t_u16 action, + t_u8 wait_option, mlan_uap_bss_param *sys_cfg); /** Set get AP wmm parameter */ mlan_status woal_set_get_ap_wmm_para(moal_private *priv, t_u16 action, @@ -545,10 +547,9 @@ mlan_status woal_set_get_ap_wmm_para(moal_private *priv, t_u16 action, int woal_uap_set_ap_cfg(moal_private *priv, t_u8 *data, int len); int woal_uap_set_11ac_status(moal_private *priv, t_u8 action, t_u8 vht20_40, IEEEtypes_VHTCap_t *vhtcap_ie); -int woal_11ax_cfg(moal_private *priv, t_u8 action, - mlan_ds_11ax_he_cfg * he_cfg); +int woal_11ax_cfg(moal_private *priv, t_u8 action, mlan_ds_11ax_he_cfg *he_cfg); int woal_uap_set_11ax_status(moal_private *priv, t_u8 action, t_u8 band, - IEEEtypes_HECap_t * hecap_ie); + IEEEtypes_HECap_t *hecap_ie); int woal_set_uap_ht_tx_cfg(moal_private *priv, Band_Config_t bandcfg, t_u8 en); mlan_status woal_uap_set_11n_status(moal_private *priv, mlan_uap_bss_param *sys_cfg, t_u8 action); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_cfg80211.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_cfg80211.c index 254e1256d189..c28fdc782b78 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_cfg80211.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_cfg80211.c @@ -1,29 +1,29 @@ /** @file moal_uap_cfg80211.c - * - * @brief This file contains the functions for uAP CFG80211. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains the functions for uAP CFG80211. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ #include "moal_cfg80211.h" #include "moal_uap_cfg80211.h" /** deauth reason code */ -#define REASON_CODE_DEAUTH_LEAVING 3 +#define REASON_CODE_DEAUTH_LEAVING 3 /******************************************************** Local Variables ********************************************************/ @@ -46,8 +46,8 @@ * @param reason_code ieee deauth reason code * @return 0 -- success, otherwise fail */ -static int -woal_deauth_station(moal_private *priv, u8 *mac_addr, u16 reason_code) +static int woal_deauth_station(moal_private *priv, u8 *mac_addr, + u16 reason_code) { mlan_ioctl_req *ioctl_req = NULL; mlan_ds_bss *bss = NULL; @@ -91,8 +91,7 @@ done: * * @return 0 -- success, otherwise fail */ -static int -woal_deauth_all_station(moal_private *priv) +static int woal_deauth_all_station(moal_private *priv) { int ret = -EFAULT; int i = 0; @@ -108,9 +107,8 @@ woal_deauth_all_station(moal_private *priv) } PRINTM(MIOCTL, "del all station\n"); /* Allocate an IOCTL request buffer */ - ioctl_req = - (mlan_ioctl_req *) - woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_get_info)); + ioctl_req = (mlan_ioctl_req *)woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_get_info)); if (ioctl_req == NULL) { ret = -ENOMEM; goto done; @@ -129,10 +127,9 @@ woal_deauth_all_station(moal_private *priv) for (i = 0; i < info->param.sta_list.sta_count; i++) { PRINTM(MIOCTL, "deauth station " MACSTR "\n", MAC2STR(info->param.sta_list.info[i].mac_address)); - ret = woal_deauth_station(priv, - info->param.sta_list.info[i]. - mac_address, - REASON_CODE_DEAUTH_LEAVING); + ret = woal_deauth_station( + priv, info->param.sta_list.info[i].mac_address, + REASON_CODE_DEAUTH_LEAVING); } woal_sched_timeout(200); done: @@ -149,8 +146,8 @@ done: * * @return MTRUE/MFALSE */ -static t_u8 -woal_check_rsn_ie(IEEEtypes_Rsn_t *rsn_ie, mlan_uap_bss_param *sys_config) +static t_u8 woal_check_rsn_ie(IEEEtypes_Rsn_t *rsn_ie, + mlan_uap_bss_param *sys_config) { int left = 0; int count = 0; @@ -192,13 +189,11 @@ woal_check_rsn_ie(IEEEtypes_Rsn_t *rsn_ie, mlan_uap_bss_param *sys_config) return MFALSE; key_mgmt = (wpa_suite_auth_key_mgmt_t *)((u8 *)rsn_ie + - sizeof(IEEEtypes_Rsn_t) + (count - - 1) * - sizeof(wpa_suite)); + sizeof(IEEEtypes_Rsn_t) + + (count - 1) * sizeof(wpa_suite)); count = le16_to_cpu(key_mgmt->count); - if (left < - (sizeof(wpa_suite_auth_key_mgmt_t) + - (count - 1) * sizeof(wpa_suite))) + if (left < (sizeof(wpa_suite_auth_key_mgmt_t) + + (count - 1) * sizeof(wpa_suite))) return MFALSE; for (i = 0; i < count; i++) { switch (key_mgmt->list[i].type) { @@ -230,8 +225,8 @@ woal_check_rsn_ie(IEEEtypes_Rsn_t *rsn_ie, mlan_uap_bss_param *sys_config) * * @return MTRUE/MFALSE */ -static t_u8 -woal_check_wpa_ie(IEEEtypes_Wpa_t *wpa_ie, mlan_uap_bss_param *sys_config) +static t_u8 woal_check_wpa_ie(IEEEtypes_Wpa_t *wpa_ie, + mlan_uap_bss_param *sys_config) { int left = 0; int count = 0; @@ -271,13 +266,11 @@ woal_check_wpa_ie(IEEEtypes_Wpa_t *wpa_ie, mlan_uap_bss_param *sys_config) return MFALSE; key_mgmt = (wpa_suite_auth_key_mgmt_t *)((u8 *)wpa_ie + - sizeof(IEEEtypes_Wpa_t) + (count - - 1) * - sizeof(wpa_suite)); + sizeof(IEEEtypes_Wpa_t) + + (count - 1) * sizeof(wpa_suite)); count = le16_to_cpu(key_mgmt->count); - if (left < - (sizeof(wpa_suite_auth_key_mgmt_t) + - (count - 1) * sizeof(wpa_suite))) + if (left < (sizeof(wpa_suite_auth_key_mgmt_t) + + (count - 1) * sizeof(wpa_suite))) return MFALSE; for (i = 0; i < count; i++) { switch (key_mgmt->list[i].type) { @@ -300,8 +293,8 @@ woal_check_wpa_ie(IEEEtypes_Wpa_t *wpa_ie, mlan_uap_bss_param *sys_config) * * @return MTRUE/MFALSE */ -static t_u8 -woal_find_wpa_ies(const t_u8 *ie, int len, mlan_uap_bss_param *sys_config) +static t_u8 woal_find_wpa_ies(const t_u8 *ie, int len, + mlan_uap_bss_param *sys_config) { int bytes_left = len; const t_u8 *pcurrent_ptr = ie; @@ -312,7 +305,7 @@ woal_find_wpa_ies(const t_u8 *ie, int len, mlan_uap_bss_param *sys_config) t_u8 ret = MFALSE; IEEEtypes_ElementId_e element_id; IEEEtypes_VendorSpecific_t *pvendor_ie; - const t_u8 wpa_oui[4] = { 0x00, 0x50, 0xf2, 0x01 }; + const t_u8 wpa_oui[4] = {0x00, 0x50, 0xf2, 0x01}; while (bytes_left >= 2) { element_id = (IEEEtypes_ElementId_e)(*((t_u8 *)pcurrent_ptr)); @@ -326,18 +319,17 @@ woal_find_wpa_ies(const t_u8 *ie, int len, mlan_uap_bss_param *sys_config) } switch (element_id) { case RSN_IE: - wpa2 = woal_check_rsn_ie((IEEEtypes_Rsn_t *) - pcurrent_ptr, sys_config); + wpa2 = woal_check_rsn_ie( + (IEEEtypes_Rsn_t *)pcurrent_ptr, sys_config); break; case VENDOR_SPECIFIC_221: pvendor_ie = (IEEEtypes_VendorSpecific_t *)pcurrent_ptr; - if (!memcmp - (pvendor_ie->vend_hdr.oui, wpa_oui, - sizeof(pvendor_ie->vend_hdr.oui)) && + if (!memcmp(pvendor_ie->vend_hdr.oui, wpa_oui, + sizeof(pvendor_ie->vend_hdr.oui)) && (pvendor_ie->vend_hdr.oui_type == wpa_oui[3])) { - wpa = woal_check_wpa_ie((IEEEtypes_Wpa_t *) - pcurrent_ptr, - sys_config); + wpa = woal_check_wpa_ie( + (IEEEtypes_Wpa_t *)pcurrent_ptr, + sys_config); } break; default: @@ -369,9 +361,8 @@ woal_find_wpa_ies(const t_u8 *ie, int len, mlan_uap_bss_param *sys_config) * * @return N/A */ -static t_void -woal_set_wmm_ies(moal_private *priv, const t_u8 *ie, int len, - mlan_uap_bss_param *sys_config) +static t_void woal_set_wmm_ies(moal_private *priv, const t_u8 *ie, int len, + mlan_uap_bss_param *sys_config) { int bytes_left = len; const t_u8 *pcurrent_ptr = ie; @@ -379,7 +370,7 @@ woal_set_wmm_ies(moal_private *priv, const t_u8 *ie, int len, t_u8 element_len; IEEEtypes_VendorSpecific_t *pvendor_ie; IEEEtypes_ElementId_e element_id; - const t_u8 wmm_oui[4] = { 0x00, 0x50, 0xf2, 0x02 }; + const t_u8 wmm_oui[4] = {0x00, 0x50, 0xf2, 0x02}; while (bytes_left >= 2) { element_id = (IEEEtypes_ElementId_e)(*((t_u8 *)pcurrent_ptr)); @@ -394,9 +385,8 @@ woal_set_wmm_ies(moal_private *priv, const t_u8 *ie, int len, switch (element_id) { case VENDOR_SPECIFIC_221: pvendor_ie = (IEEEtypes_VendorSpecific_t *)pcurrent_ptr; - if (!memcmp - (pvendor_ie->vend_hdr.oui, wmm_oui, - sizeof(pvendor_ie->vend_hdr.oui)) && + if (!memcmp(pvendor_ie->vend_hdr.oui, wmm_oui, + sizeof(pvendor_ie->vend_hdr.oui)) && pvendor_ie->vend_hdr.oui_type == wmm_oui[3]) { if (total_ie_len == sizeof(IEEEtypes_WmmParameter_t)) { @@ -405,14 +395,16 @@ woal_set_wmm_ies(moal_private *priv, const t_u8 *ie, int len, * it matches the size expected for the * WMM Parameter IE. */ - moal_memcpy_ext(priv->phandle, - &sys_config->wmm_para, - pcurrent_ptr + - sizeof - (IEEEtypes_Header_t), - element_len, - sizeof(sys_config-> - wmm_para)); + moal_memcpy_ext( + priv->phandle, + &sys_config->wmm_para, + pcurrent_ptr + + sizeof(IEEEtypes_Header_t), + element_len, + sizeof(sys_config->wmm_para)); + /** set uap_host_based_config to true */ + sys_config->uap_host_based_config = + MTRUE; } } @@ -424,7 +416,6 @@ woal_set_wmm_ies(moal_private *priv, const t_u8 *ie, int len, /* Need to account for IE ID and IE Len */ bytes_left -= (element_len + 2); } - } #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) @@ -434,17 +425,15 @@ woal_set_wmm_ies(moal_private *priv, const t_u8 *ie, int len, * @param params A pointer to cfg80211_ap_settings structure * @return 0 -- success, otherwise fail */ -t_u8 -woal_check_11ac_capability(moal_private *priv, - struct cfg80211_ap_settings *params) +t_u8 woal_check_11ac_capability(moal_private *priv, + struct cfg80211_ap_settings *params) #else /** * @brief initialize AP or GO bss config * @param priv A pointer to moal private structure * @return 0 -- success, otherwise fail */ -t_u8 -woal_check_11ac_capability(moal_private *priv) +t_u8 woal_check_11ac_capability(moal_private *priv) #endif { mlan_fw_info fw_info; @@ -480,15 +469,14 @@ woal_check_11ac_capability(moal_private *priv) * @param params A pointer to cfg80211_ap_settings structure * @return 0 -- success, otherwise fail */ -t_u8 -woal_check_11ax_capability(moal_private *priv, t_u8 band, - struct cfg80211_ap_settings *params) +t_u8 woal_check_11ax_capability(moal_private *priv, t_u8 band, + struct cfg80211_ap_settings *params) { mlan_fw_info fw_info; t_u8 enable_11ax = MFALSE; #if CFG80211_VERSION_CODE < KERNEL_VERSION(4, 20, 0) mlan_ds_11ax_he_cfg he_cfg; - t_u8 he_txrx_mcs_support[4] = { 0xff, 0xff, 0xff, 0xff }; + t_u8 he_txrx_mcs_support[4] = {0xff, 0xff, 0xff, 0xff}; #endif ENTER(); woal_request_get_fw_info(priv, MOAL_IOCTL_WAIT, &fw_info); @@ -510,9 +498,9 @@ woal_check_11ax_capability(moal_private *priv, t_u8 band, if (0 == woal_11ax_cfg(priv, MLAN_ACT_GET, &he_cfg)) { if (he_cfg.he_cap.len && (he_cfg.he_cap.ext_id == HE_CAPABILITY)) { - if (memcmp - (he_cfg.he_cap.he_txrx_mcs_support, - he_txrx_mcs_support, sizeof(he_txrx_mcs_support))) + if (memcmp(he_cfg.he_cap.he_txrx_mcs_support, + he_txrx_mcs_support, + sizeof(he_txrx_mcs_support))) enable_11ax = MTRUE; } } @@ -531,15 +519,15 @@ woal_check_11ax_capability(moal_private *priv, t_u8 band, * * @return ht_cap */ -static t_u16 -woal_get_htcap_info(const t_u8 *ie, int len) +static t_u16 woal_get_htcap_info(const t_u8 *ie, int len) { t_u16 ht_cap_info = 0; IEEEtypes_HTCap_t *htcap_ie = NULL; htcap_ie = (IEEEtypes_HTCap_t *)woal_parse_ie_tlv(ie, len, HT_CAPABILITY); if (htcap_ie) { - /* hostap has converted ht_cap_info to little endian, here conver to host endian */ + /* hostap has converted ht_cap_info to little endian, here + * conver to host endian */ ht_cap_info = woal_le16_to_cpu(htcap_ie->ht_cap.ht_cap_info); PRINTM(MMSG, "Get ht_cap from beacon ies: 0x%x\n", ht_cap_info); } @@ -554,13 +542,11 @@ woal_get_htcap_info(const t_u8 *ie, int len) * * @return Pointer to vht_cap ie */ -static IEEEtypes_VHTCap_t * -woal_get_vhtcap_info(const t_u8 *ie, int len) +static IEEEtypes_VHTCap_t *woal_get_vhtcap_info(const t_u8 *ie, int len) { IEEEtypes_VHTCap_t *vhtcap_ie = NULL; - vhtcap_ie = - (IEEEtypes_VHTCap_t *)woal_parse_ie_tlv(ie, len, - VHT_CAPABILITY); + vhtcap_ie = (IEEEtypes_VHTCap_t *)woal_parse_ie_tlv(ie, len, + VHT_CAPABILITY); if (vhtcap_ie) PRINTM(MMSG, "Get vht_cap from beacon ies: 0x%x\n", vhtcap_ie->vht_cap.vht_cap_info); @@ -569,7 +555,7 @@ woal_get_vhtcap_info(const t_u8 *ie, int len) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 12, 0) /** Starting Frequency for 11A band */ -#define START_FREQ_11A_BAND 5000 /* in MHz */ +#define START_FREQ_11A_BAND 5000 /* in MHz */ /** * @brief convert cfg80211_chan_def to Band_Config * @@ -578,9 +564,8 @@ woal_get_vhtcap_info(const t_u8 *ie, int len) * * @return N/A */ -static void -woal_convert_chan_to_bandconfig(Band_Config_t *bandcfg, - struct cfg80211_chan_def *chandef) +static void woal_convert_chan_to_bandconfig(Band_Config_t *bandcfg, + struct cfg80211_chan_def *chandef) { ENTER(); @@ -621,8 +606,8 @@ woal_convert_chan_to_bandconfig(Band_Config_t *bandcfg, * @param chandef A pointer to cfg80211_chan_def structure * @return N/A */ -static void -woal_enable_dfs_support(moal_private *priv, struct cfg80211_chan_def *chandef) +static void woal_enable_dfs_support(moal_private *priv, + struct cfg80211_chan_def *chandef) { mlan_ioctl_req *req = NULL; mlan_ds_11h_chan_rep_req *pchan_rpt_req = NULL; @@ -674,10 +659,9 @@ woal_enable_dfs_support(moal_private *priv, struct cfg80211_chan_def *chandef) * @param tail_len tail IE buffer length * * @return N/A */ -static void -woal_set_uap_rates(moal_private *priv, mlan_uap_bss_param *bss_cfg, - const t_u8 *head_ie, int head_len, const t_u8 *tail_ie, - int tail_len) +static void woal_set_uap_rates(moal_private *priv, mlan_uap_bss_param *bss_cfg, + const t_u8 *head_ie, int head_len, + const t_u8 *tail_ie, int tail_len) { pIEEEtypes_Header_t rate_ie; pIEEEtypes_Header_t ext_rate_ie; @@ -693,16 +677,14 @@ woal_set_uap_rates(moal_private *priv, mlan_uap_bss_param *bss_cfg, rate_ie->len, sizeof(bss_cfg->rates)); rate_len = MIN(rate_ie->len, sizeof(bss_cfg->rates)); } - ext_rate_ie = - (void *)woal_parse_ie_tlv(tail_ie, tail_len, - WLAN_EID_EXT_SUPP_RATES); + ext_rate_ie = (void *)woal_parse_ie_tlv(tail_ie, tail_len, + WLAN_EID_EXT_SUPP_RATES); if (ext_rate_ie) { moal_memcpy_ext(priv->phandle, &bss_cfg->rates[rate_len], ext_rate_ie + 1, ext_rate_ie->len, sizeof(bss_cfg->rates) - rate_len); - rate_len += - MIN(ext_rate_ie->len, - (sizeof(bss_cfg->rates) - rate_len)); + rate_len += MIN(ext_rate_ie->len, + (sizeof(bss_cfg->rates) - rate_len)); } DBG_HEXDUMP(MCMD_D, "rates", bss_cfg->rates, sizeof(bss_cfg->rates)); } @@ -715,9 +697,8 @@ woal_set_uap_rates(moal_private *priv, mlan_uap_bss_param *bss_cfg, * @param params A pointer to cfg80211_ap_settings structure * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_beacon_config(moal_private *priv, - struct cfg80211_ap_settings *params) +static int woal_cfg80211_beacon_config(moal_private *priv, + struct cfg80211_ap_settings *params) #else /** * @brief initialize AP or GO bss config @@ -726,9 +707,8 @@ woal_cfg80211_beacon_config(moal_private *priv, * @param params A pointer to beacon_parameters structure * @return 0 -- success, otherwise fail */ -static int -woal_cfg80211_beacon_config(moal_private *priv, - struct beacon_parameters *params) +static int woal_cfg80211_beacon_config(moal_private *priv, + struct beacon_parameters *params) #endif { struct wiphy *wiphy = NULL; @@ -743,23 +723,13 @@ woal_cfg80211_beacon_config(moal_private *priv, struct ieee80211_mgmt *head = NULL; t_u16 capab_info = 0; #endif - t_u8 rates_bg[13] = { - 0x82, 0x84, 0x8b, 0x96, - 0x0c, 0x12, 0x18, 0x24, - 0x30, 0x48, 0x60, 0x6c, - 0x00 - }; - t_u8 rates_a[9] = { - 0x8c, 0x12, 0x98, 0x24, - 0xb0, 0x48, 0x60, 0x6c, - 0x00 - }; + t_u8 rates_bg[13] = {0x82, 0x84, 0x8b, 0x96, 0x0c, 0x12, 0x18, + 0x24, 0x30, 0x48, 0x60, 0x6c, 0x00}; + t_u8 rates_a[9] = {0x8c, 0x12, 0x98, 0x24, 0xb0, + 0x48, 0x60, 0x6c, 0x00}; #ifdef WIFI_DIRECT_SUPPORT - t_u8 rates_wfd[9] = { - 0x8c, 0x12, 0x18, 0x24, - 0x30, 0x48, 0x60, 0x6c, - 0x00 - }; + t_u8 rates_wfd[9] = {0x8c, 0x12, 0x18, 0x24, 0x30, + 0x48, 0x60, 0x6c, 0x00}; #endif t_u8 chan2Offset = SEC_CHAN_NONE; t_u8 enable_11n = MTRUE; @@ -795,13 +765,18 @@ woal_cfg80211_beacon_config(moal_private *priv, wapi_ie = (t_u8 *)woal_parse_ie_tlv(params->beacon.tail, params->beacon.tail_len, WAPI_IE); #else - wapi_ie = (t_u8 *)woal_parse_ie_tlv(params->tail, - params->tail_len, WAPI_IE); + wapi_ie = (t_u8 *)woal_parse_ie_tlv(params->tail, params->tail_len, + WAPI_IE); #endif if (wapi_ie) { wapi_ie_len = *(wapi_ie + 1) + 2; - woal_set_get_gen_ie(priv, MLAN_ACT_SET, wapi_ie, &wapi_ie_len, - MOAL_IOCTL_WAIT); + if (MLAN_STATUS_FAILURE == + woal_set_get_gen_ie(priv, MLAN_ACT_SET, wapi_ie, + &wapi_ie_len, MOAL_IOCTL_WAIT)) { + PRINTM(MERROR, "Failed to set wapi ie\n"); + ret = -EFAULT; + goto done; + } } wiphy = priv->phandle->wiphy; @@ -809,7 +784,7 @@ woal_cfg80211_beacon_config(moal_private *priv, #ifdef WIFI_DIRECT_SUPPORT && priv->bss_type != MLAN_BSS_TYPE_WIFIDIRECT #endif - ) { + ) { ret = -EFAULT; goto done; } @@ -821,8 +796,7 @@ woal_cfg80211_beacon_config(moal_private *priv, } /* Initialize the uap bss values which are uploaded from firmware */ - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_GET, + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_GET, MOAL_IOCTL_WAIT, sys_config)) { PRINTM(MERROR, "Error getting AP confiruration\n"); @@ -868,8 +842,9 @@ woal_cfg80211_beacon_config(moal_private *priv, if (params->dtim_period) sys_config->dtim_period = params->dtim_period; } + #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) - /** back up ap's channel */ + /** back up ap's channel */ moal_memcpy_ext(priv->phandle, &priv->chan, ¶ms->chandef, sizeof(struct cfg80211_chan_def), sizeof(priv->chan)); #endif @@ -978,17 +953,16 @@ woal_cfg80211_beacon_config(moal_private *priv, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) /* Force enable 40MHZ on WFD interface */ if (priv->bss_type == MLAN_BSS_TYPE_WIFIDIRECT) - chan2Offset = - woal_get_second_channel_offset(priv-> - channel); + chan2Offset = woal_get_second_channel_offset( + priv->channel); #endif #endif #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) enable_11ac = woal_check_11ac_capability(priv, params); if (enable_11ac && - ((priv->chan.width == NL80211_CHAN_WIDTH_20) - || (priv->chan.width == NL80211_CHAN_WIDTH_40))) + ((priv->chan.width == NL80211_CHAN_WIDTH_20) || + (priv->chan.width == NL80211_CHAN_WIDTH_40))) vht20_40 = MTRUE; #else enable_11ac = woal_check_11ac_capability(priv); @@ -1019,10 +993,8 @@ woal_cfg80211_beacon_config(moal_private *priv, #endif #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) - enable_11ax = - woal_check_11ax_capability(priv, - sys_config->bandcfg.chanBand, - params); + enable_11ax = woal_check_11ax_capability( + priv, sys_config->bandcfg.chanBand, params); #endif /* Disable GreenField by default */ @@ -1042,15 +1014,17 @@ woal_cfg80211_beacon_config(moal_private *priv, if (sys_config->bandcfg.chanBand == BAND_2GHZ) sys_config->ht_cap_info = (ht_cap & - (wiphy-> - bands[IEEE80211_BAND_2GHZ]-> - ht_cap.cap & 0x13ff)) | 0x0c; + (wiphy->bands[IEEE80211_BAND_2GHZ] + ->ht_cap.cap & + 0x13ff)) | + 0x0c; else sys_config->ht_cap_info = (ht_cap & - (wiphy-> - bands[IEEE80211_BAND_5GHZ]-> - ht_cap.cap & 0x13ff)) | 0x0c; + (wiphy->bands[IEEE80211_BAND_5GHZ] + ->ht_cap.cap & + 0x13ff)) | + 0x0c; } PRINTM(MCMND, "11n=%d, ht_cap=0x%x, channel=%d, bandcfg:chanBand=0x%x chanWidth=0x%x chan2Offset=0x%x scanMode=0x%x\n", @@ -1071,10 +1045,10 @@ woal_cfg80211_beacon_config(moal_private *priv, sizeof(sys_config->ssid.ssid)); sys_config->ssid.ssid_len = MIN(MLAN_MAX_SSID_LENGTH, params->ssid_len); /** - * hidden_ssid=0: broadcast SSID in beacons. - * hidden_ssid=1: send empty SSID (length=0) in beacon. - * hidden_ssid=2: clear SSID (ACSII 0), but keep the original length - */ + * hidden_ssid=0: broadcast SSID in beacons. + * hidden_ssid=1: send empty SSID (length=0) in beacon. + * hidden_ssid=2: clear SSID (ACSII 0), but keep the original length + */ if (!params->hidden_ssid) sys_config->bcast_ssid_ctl = 1; else if (params->hidden_ssid == 1) @@ -1180,12 +1154,12 @@ woal_cfg80211_beacon_config(moal_private *priv, break; } #else - /* Since in Android ICS 4.0.1's wpa_supplicant, there is no way to set ssid - * when GO (AP) starts up, so get it from beacon head parameter - * TODO: right now use hard code - * 24 -- ieee80211 header lenth, 12 -- fixed element length for beacon - */ -#define BEACON_IE_OFFSET 36 +/* Since in Android ICS 4.0.1's wpa_supplicant, there is no way to set ssid + * when GO (AP) starts up, so get it from beacon head parameter + * TODO: right now use hard code + * 24 -- ieee80211 header lenth, 12 -- fixed element length for beacon + */ +#define BEACON_IE_OFFSET 36 /* Find SSID in head * SSID IE id: 0, right now use hard code */ @@ -1231,9 +1205,8 @@ woal_cfg80211_beacon_config(moal_private *priv, } else { /** Get cipher and key_mgmt from RSN/WPA IE */ if (capab_info & WLAN_CAPABILITY_PRIVACY) { - wpa_ies = - woal_find_wpa_ies(params->tail, - params->tail_len, sys_config); + wpa_ies = woal_find_wpa_ies( + params->tail, params->tail_len, sys_config); if (wpa_ies == MFALSE) { /* hard code setting to wpa2-psk */ sys_config->protocol = PROTOCOL_WPA2; @@ -1248,7 +1221,7 @@ woal_cfg80211_beacon_config(moal_private *priv, #endif if (GET_BSS_ROLE(priv) == MLAN_BSS_ROLE_UAP) { - /*find and set wmm ie */ + /*find and set wmm ie*/ woal_set_wmm_ies(priv, ie, ie_len, sys_config); } /* If the security mode is configured as WEP or WPA-PSK, @@ -1278,10 +1251,8 @@ woal_cfg80211_beacon_config(moal_private *priv, if (sys_config->bandcfg.chanBand == BAND_5GHZ) { if (enable_11ax && enable_11ac && enable_11n) { #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 20, 0) - hecap_ie = - (IEEEtypes_HECap_t *) woal_parse_ext_ie_tlv(ie, - ie_len, - HE_CAPABILITY); + hecap_ie = (IEEEtypes_HECap_t *)woal_parse_ext_ie_tlv( + ie, ie_len, HE_CAPABILITY); #endif woal_uap_set_11ax_status(priv, MLAN_ACT_ENABLE, BAND_5GHZ, hecap_ie); @@ -1289,6 +1260,7 @@ woal_cfg80211_beacon_config(moal_private *priv, woal_uap_set_11ax_status(priv, MLAN_ACT_DISABLE, BAND_5GHZ, NULL); } + #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) if (params->inactivity_timeout) { sys_config->sta_ageout_timer = params->inactivity_timeout * 10; @@ -1300,8 +1272,7 @@ woal_cfg80211_beacon_config(moal_private *priv, sys_config->sta_ageout_timer, sys_config->ps_sta_ageout_timer); #endif - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_SET, + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_SET, MOAL_IOCTL_WAIT, sys_config)) { ret = -EFAULT; @@ -1326,8 +1297,7 @@ done: * * @return N/A */ -static void -woal_virt_if_setup(struct net_device *dev) +static void woal_virt_if_setup(struct net_device *dev) { ENTER(); ether_setup(dev); @@ -1351,10 +1321,9 @@ woal_virt_if_setup(struct net_device *dev) * * @return A pointer to the new priv structure */ -moal_private * -woal_alloc_virt_interface(moal_handle *handle, t_u8 bss_index, - unsigned char name_assign_type, - t_u8 bss_type, const char *name) +moal_private *woal_alloc_virt_interface(moal_handle *handle, t_u8 bss_index, + unsigned char name_assign_type, + t_u8 bss_type, const char *name) #else /** * @brief This function adds a new interface. It will @@ -1366,12 +1335,12 @@ woal_alloc_virt_interface(moal_handle *handle, t_u8 bss_index, * * @return A pointer to the new priv structure */ -moal_private * -woal_alloc_virt_interface(moal_handle *handle, t_u8 bss_index, t_u8 bss_type, +moal_private *woal_alloc_virt_interface(moal_handle *handle, t_u8 bss_index, + t_u8 bss_type, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) - const + const #endif - char *name) + char *name) #endif { struct net_device *dev = NULL; @@ -1380,7 +1349,7 @@ woal_alloc_virt_interface(moal_handle *handle, t_u8 bss_index, t_u8 bss_type, #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 29) #ifndef MAX_WMM_QUEUE -#define MAX_WMM_QUEUE 4 +#define MAX_WMM_QUEUE 4 #endif /* Allocate an Ethernet device */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 17, 0) @@ -1455,13 +1424,11 @@ error: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_add_virt_if(struct wiphy *wiphy, - const char *name, - unsigned char name_assign_type, - enum nl80211_iftype type, u32 *flags, - struct vif_params *params, - struct net_device **new_dev) +int woal_cfg80211_add_virt_if(struct wiphy *wiphy, const char *name, + unsigned char name_assign_type, + enum nl80211_iftype type, u32 *flags, + struct vif_params *params, + struct net_device **new_dev) #else /** * @brief Request the driver to add a virtual interface @@ -1475,14 +1442,14 @@ woal_cfg80211_add_virt_if(struct wiphy *wiphy, * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_add_virt_if(struct wiphy *wiphy, +int woal_cfg80211_add_virt_if(struct wiphy *wiphy, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) - const + const #endif - char *name, enum nl80211_iftype type, u32 *flags, - struct vif_params *params, - struct net_device **new_dev) + char *name, + enum nl80211_iftype type, u32 *flags, + struct vif_params *params, + struct net_device **new_dev) #endif { int ret = 0; @@ -1512,7 +1479,8 @@ woal_cfg80211_add_virt_if(struct wiphy *wiphy, break; } } - if (priv->phandle->drv_mode.intf_num == priv->phandle->priv_num) { + if (priv->phandle->drv_mode.intf_num == + priv->phandle->priv_num) { LEAVE(); return -ENOMEM; } @@ -1529,14 +1497,12 @@ woal_cfg80211_add_virt_if(struct wiphy *wiphy, /* Cancel previous scan req */ woal_cancel_scan(priv, MOAL_IOCTL_WAIT); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 1, 0) - new_priv = - woal_alloc_virt_interface(handle, handle->priv_num, - name_assign_type, - MLAN_BSS_TYPE_WIFIDIRECT, name); + new_priv = woal_alloc_virt_interface(handle, handle->priv_num, + name_assign_type, + MLAN_BSS_TYPE_WIFIDIRECT, name); #else - new_priv = - woal_alloc_virt_interface(handle, handle->priv_num, - MLAN_BSS_TYPE_WIFIDIRECT, name); + new_priv = woal_alloc_virt_interface(handle, handle->priv_num, + MLAN_BSS_TYPE_WIFIDIRECT, name); #endif if (!new_priv) { PRINTM(MERROR, "Add virtual interface fail."); @@ -1560,7 +1526,7 @@ woal_cfg80211_add_virt_if(struct wiphy *wiphy, /* Initialize priv structure */ woal_init_priv(new_priv, MOAL_IOCTL_WAIT); - /** Init to GO/CLIENT mode */ + /** Init to GO/CLIENT mode */ if (type == NL80211_IFTYPE_P2P_CLIENT) woal_cfg80211_init_p2p_client(new_priv); else if (type == NL80211_IFTYPE_P2P_GO) @@ -1595,10 +1561,10 @@ done: * * @param priv A pointer to moal_private structure * - * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, otherwise fail + * @return MLAN_STATUS_SUCCESS/MLAN_STATUS_PENDING -- success, + * otherwise fail */ -mlan_status -woal_bss_remove(moal_private *priv) +mlan_status woal_bss_remove(moal_private *priv) { mlan_ioctl_req *req = NULL; mlan_ds_bss *bss = NULL; @@ -1636,8 +1602,7 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_del_virt_if(struct wiphy *wiphy, struct net_device *dev) +int woal_cfg80211_del_virt_if(struct wiphy *wiphy, struct net_device *dev) { int ret = 0; int i = 0; @@ -1671,7 +1636,7 @@ woal_cfg80211_del_virt_if(struct wiphy *wiphy, struct net_device *dev) woal_remain_timer_func(handle); } - /*** cancel pending scan */ + /*** cancel pending scan */ woal_cancel_scan(vir_priv, MOAL_IOCTL_WAIT); woal_flush_tx_stat_queue(vir_priv); @@ -1681,36 +1646,28 @@ woal_cfg80211_del_virt_if(struct wiphy *wiphy, struct net_device *dev) if (priv->phandle->remain_on_channel) { t_u8 channel_status; remain_priv = - priv->phandle->priv[priv->phandle-> - remain_bss_index]; + priv->phandle + ->priv[priv->phandle->remain_bss_index]; if (remain_priv) { - if (woal_cfg80211_remain_on_channel_cfg - (remain_priv, MOAL_IOCTL_WAIT, MTRUE, - &channel_status, NULL, 0, 0)) + if (woal_cfg80211_remain_on_channel_cfg( + remain_priv, MOAL_IOCTL_WAIT, MTRUE, + &channel_status, NULL, 0, 0)) PRINTM(MERROR, "del_virt_if: Fail to cancel remain on channel\n"); if (priv->phandle->cookie) { cfg80211_remain_on_channel_expired( #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 6, 0) - remain_priv-> - netdev, + remain_priv->netdev, #else - remain_priv-> - wdev, + remain_priv->wdev, #endif - priv-> - phandle-> - cookie, - &priv-> - phandle-> - chan, + priv->phandle->cookie, + &priv->phandle->chan, #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - priv-> - phandle-> - channel_type, + priv->phandle->channel_type, #endif - GFP_ATOMIC); + GFP_ATOMIC); priv->phandle->cookie = 0; } priv->phandle->remain_on_channel = MFALSE; @@ -1752,8 +1709,7 @@ woal_cfg80211_del_virt_if(struct wiphy *wiphy, struct net_device *dev) * * @return N/A */ -void -woal_remove_virtual_interface(moal_handle *handle) +void woal_remove_virtual_interface(moal_handle *handle) { #ifdef WIFI_DIRECT_SUPPORT moal_private *priv = NULL; @@ -1800,9 +1756,8 @@ woal_remove_virtual_interface(moal_handle *handle) * * @return MTRUE/MFALSE; */ -static t_u8 -woal_uap_interface_ready(struct wiphy *wiphy, char *name, - struct net_device **new_dev) +static t_u8 woal_uap_interface_ready(struct wiphy *wiphy, char *name, + struct net_device **new_dev) { moal_handle *handle = (moal_handle *)woal_get_wiphy_priv(wiphy); moal_private *priv = NULL; @@ -1836,10 +1791,11 @@ woal_uap_interface_ready(struct wiphy *wiphy, char *name, * * @return A pointer to net_device -- success, otherwise null */ -struct net_device * -woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, - char *name, enum nl80211_iftype type, u32 *flags, - struct vif_params *params) +struct net_device *woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, + char *name, + enum nl80211_iftype type, + u32 *flags, + struct vif_params *params) #else /** * @brief Request the driver to add a virtual interface @@ -1852,10 +1808,9 @@ woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, - char *name, enum nl80211_iftype type, u32 *flags, - struct vif_params *params) +int woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, char *name, + enum nl80211_iftype type, u32 *flags, + struct vif_params *params) #endif #else #if CFG80211_VERSION_CODE < KERNEL_VERSION(4, 1, 0) @@ -1870,13 +1825,14 @@ woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, * * @return A pointer to wireless_dev -- success, otherwise null */ -struct wireless_dev * -woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, +struct wireless_dev *woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 7, 0) - const + const #endif - char *name, enum nl80211_iftype type, u32 *flags, - struct vif_params *params) + char *name, + enum nl80211_iftype type, + u32 *flags, + struct vif_params *params) #else /** * @brief Request the driver to add a virtual interface @@ -1891,8 +1847,7 @@ woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, * @return A pointer to wireless_dev -- success, otherwise null */ struct wireless_dev * -woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, - const char *name, +woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, const char *name, unsigned char name_assign_type, enum nl80211_iftype type, #if CFG80211_VERSION_CODE < KERNEL_VERSION(4, 12, 0) @@ -1967,8 +1922,7 @@ woal_cfg80211_add_virtual_intf(struct wiphy *wiphy, * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev) +int woal_cfg80211_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev) #else /** * @brief Request the driver to del a virtual interface @@ -1978,8 +1932,8 @@ woal_cfg80211_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev) * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev) +int woal_cfg80211_del_virtual_intf(struct wiphy *wiphy, + struct wireless_dev *wdev) #endif { int ret = 0; @@ -2024,6 +1978,7 @@ woal_cfg80211_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev) LEAVE(); return ret; } + #ifdef WIFI_DIRECT_SUPPORT #if CFG80211_VERSION_CODE >= WIFI_DIRECT_KERNEL_VERSION ret = woal_cfg80211_del_virt_if(wiphy, dev); @@ -2043,10 +1998,8 @@ woal_cfg80211_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev) * @param params A pointer to cfg80211_ap_settings structure * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_add_beacon(struct wiphy *wiphy, - struct net_device *dev, - struct cfg80211_ap_settings *params) +int woal_cfg80211_add_beacon(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_ap_settings *params) #else /** * @brief initialize AP or GO parameters @@ -2057,10 +2010,8 @@ woal_cfg80211_add_beacon(struct wiphy *wiphy, * @param params A pointer to beacon_parameters structure * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_add_beacon(struct wiphy *wiphy, - struct net_device *dev, - struct beacon_parameters *params) +int woal_cfg80211_add_beacon(struct wiphy *wiphy, struct net_device *dev, + struct beacon_parameters *params) #endif { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -2081,32 +2032,24 @@ woal_cfg80211_add_beacon(struct wiphy *wiphy, if (remain_priv) { PRINTM(MCMND, "Cancel Remain on Channel before Starting AP\n"); - if (woal_cfg80211_remain_on_channel_cfg - (remain_priv, MOAL_IOCTL_WAIT, MTRUE, - &channel_status, NULL, 0, 0)) + if (woal_cfg80211_remain_on_channel_cfg( + remain_priv, MOAL_IOCTL_WAIT, MTRUE, + &channel_status, NULL, 0, 0)) PRINTM(MERROR, "add beacon: Fail to cancel remain on channel\n"); if (priv->phandle->cookie) { cfg80211_remain_on_channel_expired( #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 6, 0) - remain_priv-> - netdev, + remain_priv->netdev, #else - remain_priv-> - wdev, + remain_priv->wdev, #endif - priv-> - phandle-> - cookie, - &priv-> - phandle-> - chan, + priv->phandle->cookie, + &priv->phandle->chan, #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 8, 0) - priv-> - phandle-> - channel_type, + priv->phandle->channel_type, #endif - GFP_ATOMIC); + GFP_ATOMIC); priv->phandle->cookie = 0; } priv->phandle->remain_on_channel = MFALSE; @@ -2123,11 +2066,11 @@ woal_cfg80211_add_beacon(struct wiphy *wiphy, LEAVE(); return -EFAULT; } + #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) - priv->channel = - ieee80211_frequency_to_channel(params->chandef.chan-> - center_freq); + priv->channel = ieee80211_frequency_to_channel( + params->chandef.chan->center_freq); #else priv->channel = ieee80211_frequency_to_channel(params->channel->center_freq); @@ -2161,22 +2104,21 @@ woal_cfg80211_add_beacon(struct wiphy *wiphy, #endif NULL, 0, MGMT_MASK_BEACON | - MGMT_MASK_PROBE_RESP | - MGMT_MASK_ASSOC_RESP + MGMT_MASK_PROBE_RESP | + MGMT_MASK_ASSOC_RESP #endif - , MOAL_IOCTL_WAIT); + , + MOAL_IOCTL_WAIT); if (ret) goto done; #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 2, 0) #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 4, 0) if (params->beacon.beacon_ies && params->beacon.beacon_ies_len) { - ret = woal_cfg80211_mgmt_frame_ie(priv, - params->beacon.beacon_ies, - params->beacon.beacon_ies_len, - NULL, 0, NULL, 0, NULL, 0, - MGMT_MASK_BEACON_WPS_P2P, - MOAL_IOCTL_WAIT); + ret = woal_cfg80211_mgmt_frame_ie( + priv, params->beacon.beacon_ies, + params->beacon.beacon_ies_len, NULL, 0, NULL, 0, NULL, + 0, MGMT_MASK_BEACON_WPS_P2P, MOAL_IOCTL_WAIT); if (ret) { PRINTM(MERROR, "Failed to set beacon wps/p2p ie\n"); goto done; @@ -2184,8 +2126,7 @@ woal_cfg80211_add_beacon(struct wiphy *wiphy, } #else if (params->beacon_ies && params->beacon_ies_len) { - ret = woal_cfg80211_mgmt_frame_ie(priv, - params->beacon_ies, + ret = woal_cfg80211_mgmt_frame_ie(priv, params->beacon_ies, params->beacon_ies_len, NULL, 0, NULL, 0, NULL, 0, MGMT_MASK_BEACON_WPS_P2P, @@ -2227,10 +2168,8 @@ done: * @param params A pointer to cfg80211_beacon_data structure * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_set_beacon(struct wiphy *wiphy, - struct net_device *dev, - struct cfg80211_beacon_data *params) +int woal_cfg80211_set_beacon(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_beacon_data *params) #else /** * @brief set AP or GO parameter @@ -2240,10 +2179,8 @@ woal_cfg80211_set_beacon(struct wiphy *wiphy, * @param params A pointer to beacon_parameters structure * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_set_beacon(struct wiphy *wiphy, - struct net_device *dev, - struct beacon_parameters *params) +int woal_cfg80211_set_beacon(struct wiphy *wiphy, struct net_device *dev, + struct beacon_parameters *params) #endif { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -2255,13 +2192,10 @@ woal_cfg80211_set_beacon(struct wiphy *wiphy, if (params != NULL) { #if CFG80211_VERSION_CODE < KERNEL_VERSION(3, 2, 0) if (params->tail && params->tail_len) { - ret = woal_cfg80211_mgmt_frame_ie(priv, - params->tail, - params->tail_len, - NULL, 0, NULL, 0, - NULL, 0, - MGMT_MASK_BEACON, - MOAL_IOCTL_WAIT); + ret = woal_cfg80211_mgmt_frame_ie( + priv, params->tail, params->tail_len, NULL, 0, + NULL, 0, NULL, 0, MGMT_MASK_BEACON, + MOAL_IOCTL_WAIT); if (ret) goto done; } @@ -2275,27 +2209,21 @@ woal_cfg80211_set_beacon(struct wiphy *wiphy, mask |= MGMT_MASK_ASSOC_RESP; PRINTM(MIOCTL, "Set beacon: mask=0x%x\n", mask); if (mask) { - ret = woal_cfg80211_mgmt_frame_ie(priv, params->tail, - params->tail_len, - params->proberesp_ies, - params-> - proberesp_ies_len, - params->assocresp_ies, - params-> - assocresp_ies_len, - NULL, 0, mask, - MOAL_IOCTL_WAIT); + ret = woal_cfg80211_mgmt_frame_ie( + priv, params->tail, params->tail_len, + params->proberesp_ies, + params->proberesp_ies_len, + params->assocresp_ies, + params->assocresp_ies_len, NULL, 0, mask, + MOAL_IOCTL_WAIT); if (ret) goto done; } if (params->beacon_ies && params->beacon_ies_len) { - ret = woal_cfg80211_mgmt_frame_ie(priv, - params->beacon_ies, - params-> - beacon_ies_len, NULL, - 0, NULL, 0, NULL, 0, - MGMT_MASK_BEACON_WPS_P2P, - MOAL_IOCTL_WAIT); + ret = woal_cfg80211_mgmt_frame_ie( + priv, params->beacon_ies, + params->beacon_ies_len, NULL, 0, NULL, 0, NULL, + 0, MGMT_MASK_BEACON_WPS_P2P, MOAL_IOCTL_WAIT); if (ret) { PRINTM(MERROR, "Failed to set beacon wps/p2p ie\n"); @@ -2318,8 +2246,7 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_del_beacon(struct wiphy *wiphy, struct net_device *dev) +int woal_cfg80211_del_beacon(struct wiphy *wiphy, struct net_device *dev) { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); int ret = 0; @@ -2419,9 +2346,8 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_change_bss(struct wiphy *wiphy, struct net_device *dev, - struct bss_parameters *params) +int woal_cfg80211_change_bss(struct wiphy *wiphy, struct net_device *dev, + struct bss_parameters *params) { int ret = 0; t_u8 change = MFALSE; @@ -2440,8 +2366,7 @@ woal_cfg80211_change_bss(struct wiphy *wiphy, struct net_device *dev, return -EFAULT; } - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_GET, + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_GET, MOAL_IOCTL_WAIT, sys_config)) { PRINTM(MERROR, "Error getting AP confiruration\n"); @@ -2451,7 +2376,7 @@ woal_cfg80211_change_bss(struct wiphy *wiphy, struct net_device *dev, pkt_forward_ctl = sys_config->pkt_forward_ctl; if (params->ap_isolate) { - /** disable packet forwarding */ + /** disable packet forwarding */ sys_config->pkt_forward_ctl |= PKT_FWD_INTRA_BCAST; sys_config->pkt_forward_ctl |= PKT_FWD_INTRA_UCAST; } else { @@ -2473,10 +2398,9 @@ woal_cfg80211_change_bss(struct wiphy *wiphy, struct net_device *dev, sys_config->preamble_type = 2; else sys_config->preamble_type = 0; - if (MLAN_STATUS_SUCCESS == woal_set_get_sys_config(priv, - MLAN_ACT_SET, - MOAL_IOCTL_WAIT, - sys_config)) + if (MLAN_STATUS_SUCCESS == + woal_set_get_sys_config(priv, MLAN_ACT_SET, MOAL_IOCTL_WAIT, + sys_config)) ret = 0; if (bss_started) woal_uap_bss_ctrl(priv, MOAL_IOCTL_WAIT_TIMEOUT, @@ -2510,15 +2434,14 @@ done: * @return 0 -- success, otherwise fail */ #endif -int -woal_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev, +int woal_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) - struct station_del_parameters *param) + struct station_del_parameters *param) #else #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) - const u8 *mac_addr) + const u8 *mac_addr) #else - u8 *mac_addr) + u8 *mac_addr) #endif #endif { @@ -2563,7 +2486,8 @@ woal_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev, reason_code = param->reason_code; } #endif - /** we will not send deauth to p2p interface, it might cause WPS failure */ + /** we will not send deauth to p2p interface, it might cause WPS failure + */ if (mac_addr) { PRINTM(MMSG, "wlan: deauth station " MACSTR "\n", MAC2STR(mac_addr)); @@ -2576,7 +2500,6 @@ woal_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev, } LEAVE(); return 0; - } /** @@ -2589,14 +2512,13 @@ woal_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev, * * @return 0 -- success, otherwise fail */ -int -woal_uap_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, +int woal_uap_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, #if CFG80211_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) - const u8 *mac, + const u8 *mac, #else - u8 *mac, + u8 *mac, #endif - struct station_info *stainfo) + struct station_info *stainfo) { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); int ret = -EFAULT; @@ -2604,6 +2526,7 @@ woal_uap_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, mlan_ds_get_info *info = NULL; mlan_ioctl_req *ioctl_req = NULL; mlan_status status = MLAN_STATUS_SUCCESS; + mlan_ds_get_stats stats; ENTER(); if (priv->media_connected == MFALSE) { @@ -2613,9 +2536,8 @@ woal_uap_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, } /* Allocate an IOCTL request buffer */ - ioctl_req = - (mlan_ioctl_req *) - woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_get_info)); + ioctl_req = (mlan_ioctl_req *)woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_get_info)); if (ioctl_req == NULL) { ret = -ENOMEM; goto done; @@ -2630,29 +2552,27 @@ woal_uap_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, if (status != MLAN_STATUS_SUCCESS) goto done; for (i = 0; i < info->param.sta_list.sta_count; i++) { - if (!memcmp - (info->param.sta_list.info[i].mac_address, mac, ETH_ALEN)) { + if (!memcmp(info->param.sta_list.info[i].mac_address, mac, + ETH_ALEN)) { PRINTM(MIOCTL, "Get station: " MACSTR " RSSI=%d\n", MAC2STR(mac), (int)info->param.sta_list.info[i].rssi); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) - stainfo->filled = - BIT(NL80211_STA_INFO_INACTIVE_TIME) | - BIT(NL80211_STA_INFO_RX_BYTES) | - BIT(NL80211_STA_INFO_TX_BYTES) | - BIT(NL80211_STA_INFO_RX_PACKETS) | - BIT(NL80211_STA_INFO_TX_PACKETS) - | BIT(NL80211_STA_INFO_SIGNAL) | - BIT(NL80211_STA_INFO_TX_BITRATE); + stainfo->filled = BIT(NL80211_STA_INFO_INACTIVE_TIME) | + BIT(NL80211_STA_INFO_RX_BYTES) | + BIT(NL80211_STA_INFO_TX_BYTES) | + BIT(NL80211_STA_INFO_RX_PACKETS) | + BIT(NL80211_STA_INFO_TX_PACKETS) | + BIT(NL80211_STA_INFO_SIGNAL) | + BIT(NL80211_STA_INFO_TX_BITRATE); stainfo->rx_bytes = priv->stats.rx_bytes; stainfo->tx_bytes = priv->stats.tx_bytes; stainfo->rx_packets = priv->stats.rx_packets; stainfo->tx_packets = priv->stats.tx_packets; #else - stainfo->filled = - STATION_INFO_INACTIVE_TIME | - STATION_INFO_SIGNAL; + stainfo->filled = STATION_INFO_INACTIVE_TIME | + STATION_INFO_SIGNAL; #endif stainfo->inactive_time = 0; stainfo->signal = info->param.sta_list.info[i].rssi; @@ -2660,6 +2580,21 @@ woal_uap_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, break; } } + memset(&stats, 0, sizeof(mlan_ds_get_stats)); + if (MLAN_STATUS_SUCCESS != + woal_get_stats_info(priv, MOAL_IOCTL_WAIT, &stats)) { + PRINTM(MERROR, "Error getting stats information\n"); + ret = MLAN_STATUS_FAILURE; + goto done; + } +#if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) + stainfo->filled |= BIT(NL80211_STA_INFO_TX_RETRIES) | + BIT(NL80211_STA_INFO_TX_FAILED) | + BIT(NL80211_STA_INFO_RX_DROP_MISC); + stainfo->tx_failed = stats.failed; + stainfo->tx_retries = stats.retry; + stainfo->rx_dropped_misc = stats.fcs_error; +#endif done: if (status != MLAN_STATUS_PENDING) kfree(ioctl_req); @@ -2678,10 +2613,9 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_uap_cfg80211_dump_station(struct wiphy *wiphy, - struct net_device *dev, int idx, - t_u8 *mac, struct station_info *sinfo) +int woal_uap_cfg80211_dump_station(struct wiphy *wiphy, struct net_device *dev, + int idx, t_u8 *mac, + struct station_info *sinfo) { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); int ret = -EFAULT; @@ -2699,9 +2633,8 @@ woal_uap_cfg80211_dump_station(struct wiphy *wiphy, } /* Allocate an IOCTL request buffer */ - ioctl_req = - (mlan_ioctl_req *) - woal_alloc_mlan_ioctl_req(sizeof(mlan_ds_get_info)); + ioctl_req = (mlan_ioctl_req *)woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_get_info)); if (ioctl_req == NULL) { ret = -ENOMEM; goto done; @@ -2726,19 +2659,17 @@ woal_uap_cfg80211_dump_station(struct wiphy *wiphy, PRINTM(MIOCTL, "Dump station: " MACSTR " RSSI=%d\n", MAC2STR(mac), (int)info->param.sta_list.info[idx].rssi); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(4, 0, 0) - sinfo->filled = - BIT(NL80211_STA_INFO_INACTIVE_TIME) | - BIT(NL80211_STA_INFO_SIGNAL); + sinfo->filled = BIT(NL80211_STA_INFO_INACTIVE_TIME) | + BIT(NL80211_STA_INFO_SIGNAL); #else sinfo->filled = STATION_INFO_INACTIVE_TIME | STATION_INFO_SIGNAL; #endif if (info->param.sta_list.info[idx].stats.last_rx_in_msec) { moal_get_system_time(priv->phandle, &sec, &usec); - cur_msec = (t_u64)sec *1000 + (t_u64)usec / 1000; - sinfo->inactive_time = - (t_u32)(cur_msec - - info->param.sta_list.info[idx].stats. - last_rx_in_msec); + cur_msec = (t_u64)sec * 1000 + (t_u64)usec / 1000; + sinfo->inactive_time = (t_u32)( + cur_msec - + info->param.sta_list.info[idx].stats.last_rx_in_msec); PRINTM(MIOCTL, "cur:%llu - [%d].last_rx:%llu = inactive_time:%d\n", cur_msec, idx, @@ -2764,9 +2695,8 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_set_mac_acl(struct wiphy *wiphy, struct net_device *dev, - const struct cfg80211_acl_data *params) +int woal_cfg80211_set_mac_acl(struct wiphy *wiphy, struct net_device *dev, + const struct cfg80211_acl_data *params) { int ret = -EFAULT; mlan_uap_bss_param *sys_config = NULL; @@ -2784,8 +2714,7 @@ woal_cfg80211_set_mac_acl(struct wiphy *wiphy, struct net_device *dev, } /* Initialize the uap bss values which are uploaded from firmware */ - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_GET, + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_GET, MOAL_IOCTL_WAIT, sys_config)) { PRINTM(MERROR, "Error getting AP confiruration\n"); @@ -2802,17 +2731,15 @@ woal_cfg80211_set_mac_acl(struct wiphy *wiphy, struct net_device *dev, sys_config->filter.filter_mode = MAC_FILTER_MODE_ALLOW_MAC; else if (params->acl_policy == NL80211_ACL_POLICY_ACCEPT_UNLESS_LISTED) sys_config->filter.filter_mode = MAC_FILTER_MODE_BLOCK_MAC; - moal_memcpy_ext(priv->phandle, sys_config->filter.mac_list, - params->mac_addrs, - sys_config->filter.mac_count * - sizeof(mlan_802_11_mac_addr), - sizeof(sys_config->filter.mac_list)); + moal_memcpy_ext( + priv->phandle, sys_config->filter.mac_list, params->mac_addrs, + sys_config->filter.mac_count * sizeof(mlan_802_11_mac_addr), + sizeof(sys_config->filter.mac_list)); if (priv->bss_started == MTRUE) { bss_started = MTRUE; woal_uap_bss_ctrl(priv, MOAL_IOCTL_WAIT, UAP_BSS_STOP); } - if (MLAN_STATUS_SUCCESS == woal_set_get_sys_config(priv, - MLAN_ACT_SET, + if (MLAN_STATUS_SUCCESS == woal_set_get_sys_config(priv, MLAN_ACT_SET, MOAL_IOCTL_WAIT, sys_config)) ret = 0; @@ -2835,9 +2762,8 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_set_txq_params(struct wiphy *wiphy, struct net_device *dev, - struct ieee80211_txq_params *params) +int woal_cfg80211_set_txq_params(struct wiphy *wiphy, struct net_device *dev, + struct ieee80211_txq_params *params) { int ret = 0; u8 ac = 0; @@ -2916,8 +2842,7 @@ woal_cfg80211_set_txq_params(struct wiphy *wiphy, struct net_device *dev, * * @return N/A */ -void -woal_cac_timer_func(void *context) +void woal_cac_timer_func(void *context) { moal_handle *handle = (moal_handle *)context; moal_private *priv = handle->priv[handle->cac_bss_index]; @@ -2945,17 +2870,14 @@ woal_cac_timer_func(void *context) * * @return N/A */ -void -woal_switch_uap_channel(moal_private *priv, t_u8 wait_option) +void woal_switch_uap_channel(moal_private *priv, t_u8 wait_option) { - chan_band_info uap_channel; t_u8 chan2Offset = SEC_CHAN_NONE; ENTER(); woal_clear_all_mgmt_ies(priv, MOAL_IOCTL_WAIT); - if (MLAN_STATUS_SUCCESS != woal_uap_bss_ctrl(priv, - wait_option, - UAP_BSS_STOP)) { + if (MLAN_STATUS_SUCCESS != + woal_uap_bss_ctrl(priv, wait_option, UAP_BSS_STOP)) { PRINTM(MERROR, "%s: stop uap failed \n", __func__); goto done; } @@ -2965,9 +2887,8 @@ woal_switch_uap_channel(moal_private *priv, t_u8 wait_option) goto done; } - uap_channel.channel = - ieee80211_frequency_to_channel(priv->csa_chan.chan-> - center_freq); + uap_channel.channel = ieee80211_frequency_to_channel( + priv->csa_chan.chan->center_freq); switch (priv->csa_chan.width) { case NL80211_CHAN_WIDTH_5: case NL80211_CHAN_WIDTH_10: @@ -3002,9 +2923,9 @@ woal_switch_uap_channel(moal_private *priv, t_u8 wait_option) else if (priv->csa_chan.chan->band == IEEE80211_BAND_5GHZ) uap_channel.bandcfg.chanBand = BAND_5GHZ; uap_channel.bandcfg.chan2Offset = chan2Offset; - if (MLAN_STATUS_SUCCESS != - woal_set_get_ap_channel(priv, MLAN_ACT_SET, wait_option, - &uap_channel)) { + if (MLAN_STATUS_SUCCESS != woal_set_get_ap_channel(priv, MLAN_ACT_SET, + wait_option, + &uap_channel)) { PRINTM(MERROR, "Fail to set ap channel \n"); goto done; } @@ -3037,8 +2958,7 @@ done: * * @return 0 -- success, otherwise fail */ -void -woal_csa_work_queue(struct work_struct *work) +void woal_csa_work_queue(struct work_struct *work) { struct delayed_work *delayed_work = container_of(work, struct delayed_work, work); @@ -3060,11 +2980,10 @@ woal_csa_work_queue(struct work_struct *work) * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_start_radar_detection(struct wiphy *wiphy, - struct net_device *dev, - struct cfg80211_chan_def *chandef, - u32 cac_time_ms) +int woal_cfg80211_start_radar_detection(struct wiphy *wiphy, + struct net_device *dev, + struct cfg80211_chan_def *chandef, + u32 cac_time_ms) #else /** * @brief start radar detection @@ -3075,10 +2994,9 @@ woal_cfg80211_start_radar_detection(struct wiphy *wiphy, * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_start_radar_detection(struct wiphy *wiphy, - struct net_device *dev, - struct cfg80211_chan_def *chandef) +int woal_cfg80211_start_radar_detection(struct wiphy *wiphy, + struct net_device *dev, + struct cfg80211_chan_def *chandef) #endif { moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -3185,10 +3103,8 @@ done: * * @return 0 -- success, otherwise fail */ -int -woal_cfg80211_channel_switch(struct wiphy *wiphy, - struct net_device *dev, - struct cfg80211_csa_settings *params) +int woal_cfg80211_channel_switch(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_csa_settings *params) { int ret = 0; moal_private *priv = (moal_private *)woal_get_netdev_priv(dev); @@ -3210,7 +3126,7 @@ woal_cfg80211_channel_switch(struct wiphy *wiphy, goto done; } - /* actually hostapd would always choose one diff channel */ + /* actually hostapd would always choose one diff channel*/ if (cfg80211_chandef_identical(¶ms->chandef, &priv->chan)) { PRINTM(MMSG, "csa channel is same with current channel, invaild\n"); @@ -3272,8 +3188,7 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_register_uap_cfg80211(struct net_device *dev, t_u8 bss_type) +mlan_status woal_register_uap_cfg80211(struct net_device *dev, t_u8 bss_type) { mlan_status ret = MLAN_STATUS_SUCCESS; moal_private *priv = (moal_private *)netdev_priv(dev); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_cfg80211.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_cfg80211.h index d9b0fd54a03c..9f3c470825ca 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_cfg80211.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_cfg80211.h @@ -1,29 +1,29 @@ /** @file moal_uap_cfg80211.h - * - * @brief This file contains the uAP CFG80211 specific defines. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains the uAP CFG80211 specific defines. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ #ifndef _MOAL_UAP_CFG80211_H_ #define _MOAL_UAP_CFG80211_H_ -#include "moal_uap.h" +#include "moal_uap.h" mlan_status woal_register_uap_cfg80211(struct net_device *dev, t_u8 bss_type); diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_priv.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_priv.c index c2a7e59975b3..02e3cc232b4d 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_priv.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_priv.c @@ -1,33 +1,33 @@ /** @file moal_uap_priv.c - * - * @brief This file contains standard ioctl functions - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains standard ioctl functions + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /************************************************************************ Change log: 08/06/2010: initial version ************************************************************************/ -#include "moal_main.h" -#include "moal_uap.h" -#include "moal_uap_priv.h" +#include "moal_main.h" +#include "moal_uap.h" +#include "moal_uap_priv.h" /******************************************************** Local Variables @@ -54,8 +54,7 @@ Change log: * * @return 0 --success, otherwise fail */ -int -woal_uap_do_priv_ioctl(struct net_device *dev, struct ifreq *req, int cmd) +int woal_uap_do_priv_ioctl(struct net_device *dev, struct ifreq *req, int cmd) { moal_private *priv = (moal_private *)netdev_priv(dev); struct iwreq *wrq = (struct iwreq *)req; @@ -162,8 +161,7 @@ woal_uap_do_priv_ioctl(struct net_device *dev, struct ifreq *req, int cmd) * * @return N/A */ -void -woal_ioctl_get_uap_info_resp(moal_private *priv, mlan_ds_get_info *info) +void woal_ioctl_get_uap_info_resp(moal_private *priv, mlan_ds_get_info *info) { ENTER(); switch (info->sub_command) { diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_priv.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_priv.h index d733c831f81b..d050bac0e6bc 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_priv.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_priv.h @@ -1,24 +1,24 @@ /** @file moal_uap_priv.h - * - * @brief This file contains definition for extended private IOCTL call. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains definition for extended private IOCTL call. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /************************************************************************ Change log: @@ -29,167 +29,100 @@ Change log: #define _MOAL_UAP_PRIV_H_ /** Private command ID */ -#define WOAL_UAP_IOCTL 0x8BE0 +#define WOAL_UAP_IOCTL 0x8BE0 /** Private command to get/set 256 chars */ -#define WOAL_UAP_SET_GET_256_CHAR (WOAL_UAP_IOCTL + 1) +#define WOAL_UAP_SET_GET_256_CHAR (WOAL_UAP_IOCTL + 1) /** Private command ID to FW reload */ -#define WOAL_WL_FW_RELOAD 1 +#define WOAL_WL_FW_RELOAD 1 /** Private command ID to set AP configuration */ -#define WOAL_AP_SET_CFG 2 +#define WOAL_AP_SET_CFG 2 /** Private command ID to set/get none */ -#define WOAL_UAP_SETNONE_GETNONE (WOAL_UAP_IOCTL + 2) +#define WOAL_UAP_SETNONE_GETNONE (WOAL_UAP_IOCTL + 2) /** Private command ID to start UAP */ -#define WOAL_UAP_START 1 +#define WOAL_UAP_START 1 /** Private command ID to stop UAP */ -#define WOAL_UAP_STOP 2 +#define WOAL_UAP_STOP 2 /** Private command ID to start AP BSS */ -#define WOAL_AP_BSS_START 3 +#define WOAL_AP_BSS_START 3 /** Private command ID to stop AP BSS */ -#define WOAL_AP_BSS_STOP 4 +#define WOAL_AP_BSS_STOP 4 /** Private command ID to set one int/get word char */ -#define WOAL_UAP_SETONEINT_GETWORDCHAR (WOAL_UAP_IOCTL + 3) +#define WOAL_UAP_SETONEINT_GETWORDCHAR (WOAL_UAP_IOCTL + 3) /** Private command ID to get version */ -#define WOAL_UAP_VERSION 1 +#define WOAL_UAP_VERSION 1 /** Private command ID to get extended version */ -#define WOAL_UAP_VEREXT 2 +#define WOAL_UAP_VEREXT 2 #ifdef WIFI_DIRECT_SUPPORT #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) /** Private command ID to set one int/get one int */ -#define WOAL_UAP_SETONEINT_GETONEINT (WOAL_UAP_IOCTL + 5) +#define WOAL_UAP_SETONEINT_GETONEINT (WOAL_UAP_IOCTL + 5) /** Private command ID for set/get BSS role */ -#define WOAL_UAP_SET_GET_BSS_ROLE 1 +#define WOAL_UAP_SET_GET_BSS_ROLE 1 #endif #endif /** Private command ID for hostcmd */ -#define WOAL_UAP_HOST_CMD (WOAL_UAP_IOCTL + 17) +#define WOAL_UAP_HOST_CMD (WOAL_UAP_IOCTL + 17) /** The following command IDs are for Froyo app */ /** Private command ID to start AP BSS */ -#define WOAL_UAP_FROYO_AP_BSS_START (WOAL_UAP_IOCTL + 24) +#define WOAL_UAP_FROYO_AP_BSS_START (WOAL_UAP_IOCTL + 24) /** Private command ID to stop AP BSS */ -#define WOAL_UAP_FROYO_AP_BSS_STOP (WOAL_UAP_IOCTL + 26) +#define WOAL_UAP_FROYO_AP_BSS_STOP (WOAL_UAP_IOCTL + 26) /** Private command ID to set AP config */ -#define WOAL_UAP_FROYO_AP_SET_CFG (WOAL_UAP_IOCTL + 27) +#define WOAL_UAP_FROYO_AP_SET_CFG (WOAL_UAP_IOCTL + 27) /** Private command ID to start driver */ -#define WOAL_UAP_FROYO_START (WOAL_UAP_IOCTL + 28) +#define WOAL_UAP_FROYO_START (WOAL_UAP_IOCTL + 28) /** Private command ID to reload FW */ -#define WOAL_UAP_FROYO_WL_FW_RELOAD (WOAL_UAP_IOCTL + 29) +#define WOAL_UAP_FROYO_WL_FW_RELOAD (WOAL_UAP_IOCTL + 29) /** Private command ID to stop driver */ -#define WOAL_UAP_FROYO_STOP (WOAL_UAP_IOCTL + 30) +#define WOAL_UAP_FROYO_STOP (WOAL_UAP_IOCTL + 30) /** * iwpriv ioctl handlers */ static const struct iw_priv_args woal_uap_priv_args[] = { - { - WOAL_UAP_SETNONE_GETNONE, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_NONE, - ""}, - { - WOAL_UAP_START, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_NONE, - "start"}, - { - WOAL_UAP_STOP, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_NONE, - "stop"}, - { - WOAL_AP_BSS_START, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_NONE, - "bssstart"}, - { - WOAL_AP_BSS_STOP, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_NONE, - "bssstop"}, - { - WOAL_UAP_SETONEINT_GETWORDCHAR, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_CHAR | 128, - ""}, - { - WOAL_UAP_VERSION, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_CHAR | 128, + {WOAL_UAP_SETNONE_GETNONE, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_NONE, ""}, + {WOAL_UAP_START, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_NONE, "start"}, + {WOAL_UAP_STOP, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_NONE, "stop"}, + {WOAL_AP_BSS_START, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_NONE, "bssstart"}, + {WOAL_AP_BSS_STOP, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_NONE, "bssstop"}, + {WOAL_UAP_SETONEINT_GETWORDCHAR, IW_PRIV_TYPE_INT | 1, + IW_PRIV_TYPE_CHAR | 128, ""}, + {WOAL_UAP_VERSION, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_CHAR | 128, "version"}, - { - WOAL_UAP_VEREXT, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_CHAR | 128, + {WOAL_UAP_VEREXT, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_CHAR | 128, "verext"}, #ifdef WIFI_DIRECT_SUPPORT #if defined(STA_SUPPORT) && defined(UAP_SUPPORT) - { - WOAL_UAP_SETONEINT_GETONEINT, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, - ""}, - { - WOAL_UAP_SET_GET_BSS_ROLE, - IW_PRIV_TYPE_INT | 1, - IW_PRIV_TYPE_INT | 1, + {WOAL_UAP_SETONEINT_GETONEINT, IW_PRIV_TYPE_INT | 1, + IW_PRIV_TYPE_INT | 1, ""}, + {WOAL_UAP_SET_GET_BSS_ROLE, IW_PRIV_TYPE_INT | 1, IW_PRIV_TYPE_INT | 1, "bssrole"}, #endif #endif - { - WOAL_UAP_SET_GET_256_CHAR, - IW_PRIV_TYPE_CHAR | 256, - IW_PRIV_TYPE_CHAR | 256, - ""}, - { - WOAL_WL_FW_RELOAD, - IW_PRIV_TYPE_CHAR | 256, - IW_PRIV_TYPE_CHAR | 256, + {WOAL_UAP_SET_GET_256_CHAR, IW_PRIV_TYPE_CHAR | 256, + IW_PRIV_TYPE_CHAR | 256, ""}, + {WOAL_WL_FW_RELOAD, IW_PRIV_TYPE_CHAR | 256, IW_PRIV_TYPE_CHAR | 256, "fwreload"}, - { - WOAL_AP_SET_CFG, - IW_PRIV_TYPE_CHAR | 256, - IW_PRIV_TYPE_CHAR | 256, + {WOAL_AP_SET_CFG, IW_PRIV_TYPE_CHAR | 256, IW_PRIV_TYPE_CHAR | 256, "apcfg"}, - { - WOAL_UAP_HOST_CMD, - IW_PRIV_TYPE_BYTE | 2047, - IW_PRIV_TYPE_BYTE | 2047, + {WOAL_UAP_HOST_CMD, IW_PRIV_TYPE_BYTE | 2047, IW_PRIV_TYPE_BYTE | 2047, "hostcmd"}, - { - WOAL_UAP_FROYO_START, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_NONE, - "START"}, - { - WOAL_UAP_FROYO_STOP, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_NONE, - "STOP"}, - { - WOAL_UAP_FROYO_AP_BSS_START, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_NONE, + {WOAL_UAP_FROYO_START, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_NONE, "START"}, + {WOAL_UAP_FROYO_STOP, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_NONE, "STOP"}, + {WOAL_UAP_FROYO_AP_BSS_START, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_NONE, "AP_BSS_START"}, - { - WOAL_UAP_FROYO_AP_BSS_STOP, - IW_PRIV_TYPE_NONE, - IW_PRIV_TYPE_NONE, + {WOAL_UAP_FROYO_AP_BSS_STOP, IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_NONE, "AP_BSS_STOP"}, - { - WOAL_UAP_FROYO_WL_FW_RELOAD, - IW_PRIV_TYPE_CHAR | 256, - IW_PRIV_TYPE_CHAR | 256, - "WL_FW_RELOAD"}, - { - WOAL_UAP_FROYO_AP_SET_CFG, - IW_PRIV_TYPE_CHAR | 256, - IW_PRIV_TYPE_CHAR | 256, - "AP_SET_CFG"}, + {WOAL_UAP_FROYO_WL_FW_RELOAD, IW_PRIV_TYPE_CHAR | 256, + IW_PRIV_TYPE_CHAR | 256, "WL_FW_RELOAD"}, + {WOAL_UAP_FROYO_AP_SET_CFG, IW_PRIV_TYPE_CHAR | 256, + IW_PRIV_TYPE_CHAR | 256, "AP_SET_CFG"}, }; #endif /* _MOAL_UAP_PRIV_H_ */ diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_wext.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_wext.c index 7310555f6fed..05f10a0b2fe9 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_wext.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_uap_wext.c @@ -1,109 +1,67 @@ /** @file moal_uap_wext.c - * - * @brief This file contains wireless extension standard ioctl functions - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains wireless extension standard ioctl functions + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /************************************************************************ Change log: 08/06/2010: initial version ************************************************************************/ -#include "moal_main.h" -#include "moal_uap.h" -#include "moal_wext.h" -#include "moal_uap_priv.h" +#include "moal_main.h" +#include "moal_uap.h" +#include "moal_wext.h" +#include "moal_uap_priv.h" /******************************************************** Global Variables ********************************************************/ typedef struct _chan_to_freq_t { - /** Channel */ + /** Channel */ t_u16 channel; - /** Frequency */ + /** Frequency */ t_u32 freq; - /** Band */ + /** Band */ t_u8 band; } chan_to_freq_t; const chan_to_freq_t chan_to_freq[] = { - {1, 2412, 0}, - {2, 2417, 0}, - {3, 2422, 0}, - {4, 2427, 0}, - {5, 2432, 0}, - {6, 2437, 0}, - {7, 2442, 0}, - {8, 2447, 0}, - {9, 2452, 0}, - {10, 2457, 0}, - {11, 2462, 0}, - {12, 2467, 0}, - {13, 2472, 0}, - {14, 2484, 0}, - {183, 4915, 1}, - {184, 4920, 1}, - {185, 4925, 1}, - {187, 4935, 1}, - {188, 4940, 1}, - {189, 4945, 1}, - {192, 4960, 1}, - {196, 4980, 1}, - {7, 5035, 1}, - {8, 5040, 1}, - {9, 5045, 1}, - {11, 5055, 1}, - {12, 5060, 1}, - {16, 5080, 1}, - {34, 5170, 1}, - {36, 5180, 1}, - {38, 5190, 1}, - {40, 5200, 1}, - {42, 5210, 1}, - {44, 5220, 1}, - {46, 5230, 1}, - {48, 5240, 1}, - {52, 5260, 1}, - {56, 5280, 1}, - {60, 5300, 1}, - {64, 5320, 1}, - {100, 5500, 1}, - {104, 5520, 1}, - {108, 5540, 1}, - {112, 5560, 1}, - {116, 5580, 1}, - {120, 5600, 1}, - {124, 5620, 1}, - {128, 5640, 1}, - {132, 5660, 1}, - {136, 5680, 1}, - {140, 5700, 1}, - {144, 5720, 1}, - {149, 5745, 1}, - {153, 5765, 1}, - {157, 5785, 1}, - {161, 5805, 1}, + {1, 2412, 0}, {2, 2417, 0}, {3, 2422, 0}, {4, 2427, 0}, + {5, 2432, 0}, {6, 2437, 0}, {7, 2442, 0}, {8, 2447, 0}, + {9, 2452, 0}, {10, 2457, 0}, {11, 2462, 0}, {12, 2467, 0}, + {13, 2472, 0}, {14, 2484, 0}, {183, 4915, 1}, {184, 4920, 1}, + {185, 4925, 1}, {187, 4935, 1}, {188, 4940, 1}, {189, 4945, 1}, + {192, 4960, 1}, {196, 4980, 1}, {7, 5035, 1}, {8, 5040, 1}, + {9, 5045, 1}, {11, 5055, 1}, {12, 5060, 1}, {16, 5080, 1}, + {34, 5170, 1}, {36, 5180, 1}, {38, 5190, 1}, {40, 5200, 1}, + {42, 5210, 1}, {44, 5220, 1}, {46, 5230, 1}, {48, 5240, 1}, + {52, 5260, 1}, {56, 5280, 1}, {60, 5300, 1}, {64, 5320, 1}, + {100, 5500, 1}, {104, 5520, 1}, {108, 5540, 1}, {112, 5560, 1}, + {116, 5580, 1}, {120, 5600, 1}, {124, 5620, 1}, {128, 5640, 1}, + {132, 5660, 1}, {136, 5680, 1}, {140, 5700, 1}, {144, 5720, 1}, + {149, 5745, 1}, {153, 5765, 1}, {157, 5785, 1}, {161, 5805, 1}, {165, 5825, 1}, }; /** Convertion from frequency to channel */ -#define freq_to_chan(x) ((((x) - 2412) / 5) + 1) +#define freq_to_chan(x) ((((x)-2412) / 5) + 1) /******************************************************** Local Functions @@ -117,8 +75,7 @@ const chan_to_freq_t chan_to_freq[] = { * * @return N/A */ -static inline void -woal_sort_channels(struct iw_freq *freq, int num) +static inline void woal_sort_channels(struct iw_freq *freq, int num) { int i, j; struct iw_freq temp; @@ -145,8 +102,7 @@ woal_sort_channels(struct iw_freq *freq, int num) * * @return freq */ -static int -channel_to_frequency(t_u16 channel, t_u8 band) +static int channel_to_frequency(t_u16 channel, t_u8 band) { int i = 0; @@ -172,9 +128,9 @@ channel_to_frequency(t_u16 channel, t_u8 band) * * @return 0 --success */ -static int -woal_config_commit(struct net_device *dev, - struct iw_request_info *info, char *cwrq, char *extra) +static int woal_config_commit(struct net_device *dev, + struct iw_request_info *info, char *cwrq, + char *extra) { ENTER(); @@ -192,9 +148,8 @@ woal_config_commit(struct net_device *dev, * * @return 0 --success */ -static int -woal_get_name(struct net_device *dev, struct iw_request_info *info, - char *cwrq, char *extra) +static int woal_get_name(struct net_device *dev, struct iw_request_info *info, + char *cwrq, char *extra) { ENTER(); strcpy(cwrq, "IEEE 802.11-DS"); @@ -212,9 +167,8 @@ woal_get_name(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success */ -static int -woal_get_wap(struct net_device *dev, struct iw_request_info *info, - struct sockaddr *awrq, char *extra) +static int woal_get_wap(struct net_device *dev, struct iw_request_info *info, + struct sockaddr *awrq, char *extra) { moal_private *priv = (moal_private *)netdev_priv(dev); int ret = 0; @@ -243,13 +197,12 @@ woal_get_wap(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success, otherwise fail */ -static int -woal_set_wap(struct net_device *dev, struct iw_request_info *info, - struct sockaddr *awrq, char *extra) +static int woal_set_wap(struct net_device *dev, struct iw_request_info *info, + struct sockaddr *awrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); - const t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { 0, 0, 0, 0, 0, 0 }; + const t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = {0, 0, 0, 0, 0, 0}; ENTER(); @@ -295,9 +248,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_freq(struct net_device *dev, struct iw_request_info *info, - struct iw_freq *fwrq, char *extra) +static int woal_set_freq(struct net_device *dev, struct iw_request_info *info, + struct iw_freq *fwrq, char *extra) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_uap_bss_param *sys_cfg = NULL, *ap_cfg = NULL; @@ -317,8 +269,7 @@ woal_set_freq(struct net_device *dev, struct iw_request_info *info, goto done; } - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_GET, + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_GET, MOAL_IOCTL_WAIT, ap_cfg)) { PRINTM(MERROR, "Error getting AP confiruration\n"); @@ -351,8 +302,7 @@ woal_set_freq(struct net_device *dev, struct iw_request_info *info, goto done; } - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_SET, + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_SET, MOAL_IOCTL_WAIT, sys_cfg)) { PRINTM(MERROR, "Error setting AP confiruration\n"); @@ -377,9 +327,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_get_freq(struct net_device *dev, struct iw_request_info *info, - struct iw_freq *fwrq, char *extra) +static int woal_get_freq(struct net_device *dev, struct iw_request_info *info, + struct iw_freq *fwrq, char *extra) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_uap_bss_param *ap_cfg = NULL; @@ -394,8 +343,7 @@ woal_get_freq(struct net_device *dev, struct iw_request_info *info, return -EFAULT; } - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_GET, + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_GET, MOAL_IOCTL_WAIT, ap_cfg)) { PRINTM(MERROR, "Error getting AP confiruration\n"); @@ -424,9 +372,9 @@ woal_get_freq(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success, otherwise fail */ -static int -woal_set_bss_mode(struct net_device *dev, struct iw_request_info *info, - t_u32 *uwrq, char *extra) +static int woal_set_bss_mode(struct net_device *dev, + struct iw_request_info *info, t_u32 *uwrq, + char *extra) { int ret = 0; ENTER(); @@ -455,9 +403,9 @@ woal_set_bss_mode(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success */ -static int -woal_get_bss_mode(struct net_device *dev, struct iw_request_info *info, - t_u32 *uwrq, char *extra) +static int woal_get_bss_mode(struct net_device *dev, + struct iw_request_info *info, t_u32 *uwrq, + char *extra) { ENTER(); @@ -477,9 +425,8 @@ woal_get_bss_mode(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success, otherwise fail */ -static int -woal_set_encode(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_set_encode(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -509,8 +456,7 @@ woal_set_encode(struct net_device *dev, struct iw_request_info *info, goto done; } - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_GET, + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_GET, MOAL_IOCTL_WAIT, ap_cfg)) { PRINTM(MERROR, "Error getting AP confiruration\n"); @@ -554,7 +500,8 @@ woal_set_encode(struct net_device *dev, struct iw_request_info *info, pkey = &sys_cfg->wep_cfg.key2; if (ap_cfg->wep_cfg.key3.is_default) pkey = &sys_cfg->wep_cfg.key3; - else { /* Something wrong, select first key as default */ + else { /* Something wrong, select first key as default + */ PRINTM(MERROR, "No default key set! Selecting first key.\n"); pkey = &sys_cfg->wep_cfg.key0; @@ -636,8 +583,7 @@ woal_set_encode(struct net_device *dev, struct iw_request_info *info, } } - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_SET, + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_SET, MOAL_IOCTL_WAIT, sys_cfg)) { PRINTM(MERROR, "Error setting AP confiruration\n"); @@ -662,9 +608,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_get_encode(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_get_encode(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { moal_private *priv = (moal_private *)netdev_priv(dev); int index = (dwrq->flags & IW_ENCODE_INDEX); @@ -685,8 +630,7 @@ woal_get_encode(struct net_device *dev, struct iw_request_info *info, goto done; } - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_GET, + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_GET, MOAL_IOCTL_WAIT, ap_cfg)) { PRINTM(MERROR, "Error getting AP confiruration\n"); @@ -767,9 +711,8 @@ done: * * @return -EOPNOTSUPP */ -static int -woal_get_gen_ie(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_get_gen_ie(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { ENTER(); LEAVE(); @@ -790,9 +733,8 @@ woal_get_gen_ie(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success, otherwise fail */ -static int -woal_set_gen_ie(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_set_gen_ie(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_uap_bss_param *sys_cfg = NULL; @@ -839,7 +781,7 @@ woal_set_gen_ie(struct net_device *dev, struct iw_request_info *info, ((t_u8 *)tlv), sizeof(IEEEtypes_Header_t) + tlv->len, sizeof(priv->bcn_ie_buf) - - priv->bcn_ie_len); + priv->bcn_ie_len); priv->bcn_ie_len += sizeof(IEEEtypes_Header_t) + tlv->len; } @@ -863,7 +805,7 @@ woal_set_gen_ie(struct net_device *dev, struct iw_request_info *info, ((t_u8 *)tlv), sizeof(IEEEtypes_Header_t) + tlv->len, sizeof(priv->bcn_ie_buf) - - priv->bcn_ie_len); + priv->bcn_ie_len); priv->bcn_ie_len += sizeof(IEEEtypes_Header_t) + tlv->len; } @@ -882,10 +824,9 @@ woal_set_gen_ie(struct net_device *dev, struct iw_request_info *info, sys_cfg->key_mgmt_operation |= 0x03; if (sys_cfg->protocol) { - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_SET, - MOAL_IOCTL_WAIT, - sys_cfg)) { + if (MLAN_STATUS_SUCCESS != + woal_set_get_sys_config(priv, MLAN_ACT_SET, MOAL_IOCTL_WAIT, + sys_cfg)) { PRINTM(MERROR, "Error setting AP configuration\n"); ret = -EFAULT; goto done; @@ -895,7 +836,7 @@ woal_set_gen_ie(struct net_device *dev, struct iw_request_info *info, /* custom IE command to set priv->bcn_ie_buf */ if (MLAN_STATUS_SUCCESS != -#define UAP_RSN_MASK (BIT(8) | BIT(5) | BIT(1) | BIT(3)) +#define UAP_RSN_MASK (BIT(8) | BIT(5) | BIT(1) | BIT(3)) woal_set_get_custom_ie(priv, UAP_RSN_MASK, priv->bcn_ie_buf, priv->bcn_ie_len)) { PRINTM(MERROR, "Error setting wpa-rsn IE\n"); @@ -928,10 +869,9 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_encode_ext(struct net_device *dev, - struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_set_encode_ext(struct net_device *dev, + struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1033,12 +973,13 @@ woal_set_encode_ext(struct net_device *dev, sec->param.encrypt_key.pn, SEQ_MAX_SIZE); } PRINTM(MIOCTL, - "set uap wpa key key_index=%d, key_len=%d key_flags=0x%x " - MACSTR "\n", key_index, ext->key_len, + "set uap wpa key key_index=%d, key_len=%d key_flags=0x%x " MACSTR + "\n", + key_index, ext->key_len, sec->param.encrypt_key.key_flags, MAC2STR(sec->param.encrypt_key.mac_addr)); DBG_HEXDUMP(MCMD_D, "uap wpa key", pkey_material, ext->key_len); -#define IW_ENCODE_ALG_AES_CMAC 5 +#define IW_ENCODE_ALG_AES_CMAC 5 if (ext->alg == IW_ENCODE_ALG_AES_CMAC) sec->param.encrypt_key.key_flags |= @@ -1049,10 +990,9 @@ woal_set_encode_ext(struct net_device *dev, /* Cipher set will be done in set generic IE */ priv->pairwise_cipher = ext->alg; priv->group_cipher = ext->alg; - goto done; /* No AP configuration */ + goto done; /* No AP configuration */ } - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_SET, + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_SET, MOAL_IOCTL_WAIT, sys_cfg)) { PRINTM(MERROR, "Error setting AP confiruration\n"); @@ -1078,10 +1018,9 @@ done: * * @return -EOPNOTSUPP */ -static int -woal_get_encode_ext(struct net_device *dev, - struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_get_encode_ext(struct net_device *dev, + struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { ENTER(); LEAVE(); @@ -1098,9 +1037,8 @@ woal_get_encode_ext(struct net_device *dev, * * @return 0--success, otherwise fail */ -static int -woal_set_mlme(struct net_device *dev, - struct iw_request_info *info, struct iw_point *dwrq, char *extra) +static int woal_set_mlme(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { struct iw_mlme *mlme = (struct iw_mlme *)extra; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1108,7 +1046,7 @@ woal_set_mlme(struct net_device *dev, mlan_ds_get_info *pinfo = NULL; mlan_ioctl_req *req = NULL; mlan_ds_sta_list *sta_list = NULL; - const t_u8 bc_addr[] = { 0XFF, 0XFF, 0XFF, 0XFF, 0XFF, 0XFF }; + const t_u8 bc_addr[] = {0XFF, 0XFF, 0XFF, 0XFF, 0XFF, 0XFF}; t_u8 sta_addr[ETH_ALEN]; int ret = 0, i; mlan_status status = MLAN_STATUS_SUCCESS; @@ -1130,8 +1068,8 @@ woal_set_mlme(struct net_device *dev, /* If deauth all station, get the connected STA list first */ if (!memcmp(bc_addr, sta_addr, ETH_ALEN)) { PRINTM(MIOCTL, "Deauth all stations\n"); - req = woal_alloc_mlan_ioctl_req(sizeof - (mlan_ds_get_info)); + req = woal_alloc_mlan_ioctl_req( + sizeof(mlan_ds_get_info)); if (req == NULL) { LEAVE(); return -ENOMEM; @@ -1171,13 +1109,12 @@ woal_set_mlme(struct net_device *dev, if (sta_list && !memcmp(bc_addr, sta_addr, ETH_ALEN)) { for (i = 0; i < sta_list->sta_count; i++) { - moal_memcpy_ext(priv->phandle, - bss->param.deauth_param. - mac_addr, - sta_list->info[i].mac_address, - ETH_ALEN, - sizeof(bss->param.deauth_param. - mac_addr)); + moal_memcpy_ext( + priv->phandle, + bss->param.deauth_param.mac_addr, + sta_list->info[i].mac_address, ETH_ALEN, + sizeof(bss->param.deauth_param + .mac_addr)); bss->param.deauth_param.reason_code = mlme->reason_code; @@ -1189,11 +1126,10 @@ woal_set_mlme(struct net_device *dev, } } } else { - moal_memcpy_ext(priv->phandle, - bss->param.deauth_param.mac_addr, - sta_addr, ETH_ALEN, - sizeof(bss->param.deauth_param. - mac_addr)); + moal_memcpy_ext( + priv->phandle, bss->param.deauth_param.mac_addr, + sta_addr, ETH_ALEN, + sizeof(bss->param.deauth_param.mac_addr)); bss->param.deauth_param.reason_code = mlme->reason_code; status = woal_request_ioctl(priv, req, MOAL_IOCTL_WAIT); @@ -1221,9 +1157,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_auth(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_set_auth(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1363,7 +1298,7 @@ woal_set_auth(struct net_device *dev, struct iw_request_info *info, default: kfree(sys_cfg); LEAVE(); - return -EOPNOTSUPP; /* No AP configuration */ + return -EOPNOTSUPP; /* No AP configuration */ } if (!sys_cfg->key_mgmt) sys_cfg->key_mgmt = priv->uap_key_mgmt; @@ -1375,8 +1310,7 @@ woal_set_auth(struct net_device *dev, struct iw_request_info *info, sys_cfg->protocol = priv->uap_protocol; /* Set AP configuration */ - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_SET, + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_SET, MOAL_IOCTL_WAIT, sys_cfg)) { PRINTM(MERROR, "Error setting AP confiruration\n"); @@ -1400,9 +1334,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_get_auth(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_get_auth(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_uap_bss_param *ap_cfg = NULL; @@ -1416,8 +1349,7 @@ woal_get_auth(struct net_device *dev, struct iw_request_info *info, return -EFAULT; } - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_GET, + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_GET, MOAL_IOCTL_WAIT, ap_cfg)) { PRINTM(MERROR, "Error getting AP confiruration\n"); @@ -1430,9 +1362,10 @@ woal_get_auth(struct net_device *dev, struct iw_request_info *info, if (ap_cfg->wpa_cfg.pairwise_cipher_wpa == CIPHER_TKIP || ap_cfg->wpa_cfg.pairwise_cipher_wpa2 == CIPHER_TKIP) vwrq->value = IW_AUTH_CIPHER_TKIP; - else if (ap_cfg->wpa_cfg.pairwise_cipher_wpa == CIPHER_AES_CCMP - || ap_cfg->wpa_cfg.pairwise_cipher_wpa2 == - CIPHER_AES_CCMP) + else if (ap_cfg->wpa_cfg.pairwise_cipher_wpa == + CIPHER_AES_CCMP || + ap_cfg->wpa_cfg.pairwise_cipher_wpa2 == + CIPHER_AES_CCMP) vwrq->value = IW_AUTH_CIPHER_CCMP; else vwrq->value = IW_AUTH_CIPHER_NONE; @@ -1504,9 +1437,8 @@ woal_get_auth(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success, otherwise fail */ -static int -woal_get_range(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_get_range(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_uap_bss_param *ap_cfg = NULL; @@ -1523,8 +1455,7 @@ woal_get_range(struct net_device *dev, struct iw_request_info *info, return -EFAULT; } - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_GET, + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_GET, MOAL_IOCTL_WAIT, ap_cfg)) { PRINTM(MERROR, "Error getting AP confiruration\n"); @@ -1539,13 +1470,14 @@ woal_get_range(struct net_device *dev, struct iw_request_info *info, range->max_nwid = 0; range->num_bitrates = MAX_DATA_RATES; - for (i = 0; i < MIN(MAX_DATA_RATES, IW_MAX_BITRATES) && - ap_cfg->rates[i]; i++) { + for (i = 0; + i < MIN(MAX_DATA_RATES, IW_MAX_BITRATES) && ap_cfg->rates[i]; + i++) { range->bitrate[i] = (ap_cfg->rates[i] & 0x7f) * 500000; } range->num_bitrates = i; - PRINTM(MINFO, "IW_MAX_BITRATES=%d num_bitrates=%d\n", - IW_MAX_BITRATES, range->num_bitrates); + PRINTM(MINFO, "IW_MAX_BITRATES=%d num_bitrates=%d\n", IW_MAX_BITRATES, + range->num_bitrates); range->num_frequency = MIN(ap_cfg->num_of_chan, IW_MAX_FREQUENCIES); @@ -1553,8 +1485,9 @@ woal_get_range(struct net_device *dev, struct iw_request_info *info, range->freq[i].i = (long)ap_cfg->chan_list[i].chan_number; band = (ap_cfg->chan_list[i].bandcfg.chanBand == BAND_5GHZ); range->freq[i].m = - (long)channel_to_frequency(ap_cfg->chan_list[i]. - chan_number, band) * 100000; + (long)channel_to_frequency( + ap_cfg->chan_list[i].chan_number, band) * + 100000; range->freq[i].e = 1; } @@ -1585,13 +1518,13 @@ woal_get_range(struct net_device *dev, struct iw_request_info *info, range->max_encoding_tokens = 4; /** Minimum power period */ -#define IW_POWER_PERIOD_MIN 1000000 /* 1 sec */ +#define IW_POWER_PERIOD_MIN 1000000 /* 1 sec */ /** Maximum power period */ -#define IW_POWER_PERIOD_MAX 120000000 /* 2 min */ +#define IW_POWER_PERIOD_MAX 120000000 /* 2 min */ /** Minimum power timeout value */ -#define IW_POWER_TIMEOUT_MIN 1000 /* 1 ms */ +#define IW_POWER_TIMEOUT_MIN 1000 /* 1 ms */ /** Maximim power timeout value */ -#define IW_POWER_TIMEOUT_MAX 1000000 /* 1 sec */ +#define IW_POWER_TIMEOUT_MAX 1000000 /* 1 sec */ /* Power Management duration & timeout */ range->min_pmp = IW_POWER_PERIOD_MIN; @@ -1647,9 +1580,8 @@ woal_get_range(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success, otherwise fail */ -static int -woal_set_priv(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_set_priv(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { ENTER(); LEAVE(); @@ -1666,9 +1598,8 @@ woal_set_priv(struct net_device *dev, struct iw_request_info *info, * * @return 0--success, otherwise fail */ -static int -woal_set_essid(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_set_essid(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_uap_bss_param *sys_cfg = NULL; @@ -1707,12 +1638,11 @@ woal_set_essid(struct net_device *dev, struct iw_request_info *info, goto done; } PRINTM(MINFO, "Requested new SSID = %s\n", - (sys_cfg->ssid.ssid_len > 0) ? - (char *)sys_cfg->ssid.ssid : "NULL"); + (sys_cfg->ssid.ssid_len > 0) ? (char *)sys_cfg->ssid.ssid : + "NULL"); /* Set AP configuration */ - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_SET, + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_SET, MOAL_IOCTL_WAIT, sys_cfg)) { PRINTM(MERROR, "Error setting AP confiruration\n"); @@ -1736,9 +1666,8 @@ done: * * @return 0--success, otherwise fail */ -static int -woal_get_essid(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_get_essid(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_uap_bss_param *ap_cfg = NULL; @@ -1751,8 +1680,7 @@ woal_get_essid(struct net_device *dev, struct iw_request_info *info, return -EFAULT; } - if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, - MLAN_ACT_GET, + if (MLAN_STATUS_SUCCESS != woal_set_get_sys_config(priv, MLAN_ACT_GET, MOAL_IOCTL_WAIT, ap_cfg)) { PRINTM(MERROR, "Error getting AP confiruration\n"); @@ -1778,85 +1706,85 @@ woal_get_essid(struct net_device *dev, struct iw_request_info *info, * iwconfig settable callbacks */ static const iw_handler woal_handler[] = { - (iw_handler) woal_config_commit, /* SIOCSIWCOMMIT */ - (iw_handler) woal_get_name, /* SIOCGIWNAME */ - (iw_handler) NULL, /* SIOCSIWNWID */ - (iw_handler) NULL, /* SIOCGIWNWID */ - (iw_handler) woal_set_freq, /* SIOCSIWFREQ */ - (iw_handler) woal_get_freq, /* SIOCGIWFREQ */ - (iw_handler) woal_set_bss_mode, /* SIOCSIWMODE */ - (iw_handler) woal_get_bss_mode, /* SIOCGIWMODE */ - (iw_handler) NULL, /* SIOCSIWSENS */ - (iw_handler) NULL, /* SIOCGIWSENS */ - (iw_handler) NULL, /* SIOCSIWRANGE */ - (iw_handler) woal_get_range, /* SIOCGIWRANGE */ - (iw_handler) woal_set_priv, /* SIOCSIWPRIV */ - (iw_handler) NULL, /* SIOCGIWPRIV */ - (iw_handler) NULL, /* SIOCSIWSTATS */ - (iw_handler) NULL, /* SIOCGIWSTATS */ + (iw_handler)woal_config_commit, /* SIOCSIWCOMMIT */ + (iw_handler)woal_get_name, /* SIOCGIWNAME */ + (iw_handler)NULL, /* SIOCSIWNWID */ + (iw_handler)NULL, /* SIOCGIWNWID */ + (iw_handler)woal_set_freq, /* SIOCSIWFREQ */ + (iw_handler)woal_get_freq, /* SIOCGIWFREQ */ + (iw_handler)woal_set_bss_mode, /* SIOCSIWMODE */ + (iw_handler)woal_get_bss_mode, /* SIOCGIWMODE */ + (iw_handler)NULL, /* SIOCSIWSENS */ + (iw_handler)NULL, /* SIOCGIWSENS */ + (iw_handler)NULL, /* SIOCSIWRANGE */ + (iw_handler)woal_get_range, /* SIOCGIWRANGE */ + (iw_handler)woal_set_priv, /* SIOCSIWPRIV */ + (iw_handler)NULL, /* SIOCGIWPRIV */ + (iw_handler)NULL, /* SIOCSIWSTATS */ + (iw_handler)NULL, /* SIOCGIWSTATS */ #if WIRELESS_EXT > 15 #ifdef CONFIG_WEXT_SPY - iw_handler_set_spy, /* SIOCSIWSPY */ - iw_handler_get_spy, /* SIOCGIWSPY */ - iw_handler_set_thrspy, /* SIOCSIWTHRSPY */ - iw_handler_get_thrspy, /* SIOCGIWTHRSPY */ + iw_handler_set_spy, /* SIOCSIWSPY */ + iw_handler_get_spy, /* SIOCGIWSPY */ + iw_handler_set_thrspy, /* SIOCSIWTHRSPY */ + iw_handler_get_thrspy, /* SIOCGIWTHRSPY */ #else - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ #endif #else /* WIRELESS_EXT > 15 */ - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ #endif /* WIRELESS_EXT > 15 */ - (iw_handler) woal_set_wap, /* SIOCSIWAP */ - (iw_handler) woal_get_wap, /* SIOCGIWAP */ + (iw_handler)woal_set_wap, /* SIOCSIWAP */ + (iw_handler)woal_get_wap, /* SIOCGIWAP */ #if WIRELESS_EXT >= 18 - (iw_handler) woal_set_mlme, /* SIOCSIWMLME */ + (iw_handler)woal_set_mlme, /* SIOCSIWMLME */ #else - (iw_handler) NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ #endif - /* (iw_handler) wlan_get_aplist, *//* SIOCGIWAPLIST */ - NULL, /* SIOCGIWAPLIST */ + /* (iw_handler) wlan_get_aplist, */ /* SIOCGIWAPLIST */ + NULL, /* SIOCGIWAPLIST */ #if WIRELESS_EXT > 13 - (iw_handler) NULL, /* SIOCSIWSCAN */ - (iw_handler) NULL, /* SIOCGIWSCAN */ + (iw_handler)NULL, /* SIOCSIWSCAN */ + (iw_handler)NULL, /* SIOCGIWSCAN */ #else /* WIRELESS_EXT > 13 */ - (iw_handler) NULL, /* SIOCSIWSCAN */ - (iw_handler) NULL, /* SIOCGIWSCAN */ + (iw_handler)NULL, /* SIOCSIWSCAN */ + (iw_handler)NULL, /* SIOCGIWSCAN */ #endif /* WIRELESS_EXT > 13 */ - (iw_handler) woal_set_essid, /* SIOCSIWESSID */ - (iw_handler) woal_get_essid, /* SIOCGIWESSID */ - (iw_handler) NULL, /* SIOCSIWNICKN */ - (iw_handler) NULL, /* SIOCGIWNICKN */ - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* SIOCSIWRATE */ - (iw_handler) NULL, /* SIOCGIWRATE */ - (iw_handler) NULL, /* SIOCSIWRTS */ - (iw_handler) NULL, /* SIOCGIWRTS */ - (iw_handler) NULL, /* SIOCSIWFRAG */ - (iw_handler) NULL, /* SIOCGIWFRAG */ - (iw_handler) NULL, /* SIOCSIWTXPOW */ - (iw_handler) NULL, /* SIOCGIWTXPOW */ - (iw_handler) NULL, /* SIOCSIWRETRY */ - (iw_handler) NULL, /* SIOCGIWRETRY */ - (iw_handler) woal_set_encode, /* SIOCSIWENCODE */ - (iw_handler) woal_get_encode, /* SIOCGIWENCODE */ - (iw_handler) NULL, /* SIOCSIWPOWER */ - (iw_handler) NULL, /* SIOCGIWPOWER */ + (iw_handler)woal_set_essid, /* SIOCSIWESSID */ + (iw_handler)woal_get_essid, /* SIOCGIWESSID */ + (iw_handler)NULL, /* SIOCSIWNICKN */ + (iw_handler)NULL, /* SIOCGIWNICKN */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* SIOCSIWRATE */ + (iw_handler)NULL, /* SIOCGIWRATE */ + (iw_handler)NULL, /* SIOCSIWRTS */ + (iw_handler)NULL, /* SIOCGIWRTS */ + (iw_handler)NULL, /* SIOCSIWFRAG */ + (iw_handler)NULL, /* SIOCGIWFRAG */ + (iw_handler)NULL, /* SIOCSIWTXPOW */ + (iw_handler)NULL, /* SIOCGIWTXPOW */ + (iw_handler)NULL, /* SIOCSIWRETRY */ + (iw_handler)NULL, /* SIOCGIWRETRY */ + (iw_handler)woal_set_encode, /* SIOCSIWENCODE */ + (iw_handler)woal_get_encode, /* SIOCGIWENCODE */ + (iw_handler)NULL, /* SIOCSIWPOWER */ + (iw_handler)NULL, /* SIOCGIWPOWER */ #if (WIRELESS_EXT >= 18) - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) woal_set_gen_ie, /* SIOCSIWGENIE */ - (iw_handler) woal_get_gen_ie, /* SIOCGIWGENIE */ - (iw_handler) woal_set_auth, /* SIOCSIWAUTH */ - (iw_handler) woal_get_auth, /* SIOCGIWAUTH */ - (iw_handler) woal_set_encode_ext, /* SIOCSIWENCODEEXT */ - (iw_handler) woal_get_encode_ext, /* SIOCGIWENCODEEXT */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)woal_set_gen_ie, /* SIOCSIWGENIE */ + (iw_handler)woal_get_gen_ie, /* SIOCGIWGENIE */ + (iw_handler)woal_set_auth, /* SIOCSIWAUTH */ + (iw_handler)woal_get_auth, /* SIOCGIWAUTH */ + (iw_handler)woal_set_encode_ext, /* SIOCSIWENCODEEXT */ + (iw_handler)woal_get_encode_ext, /* SIOCGIWENCODEEXT */ #endif /* WIRELESSS_EXT >= 18 */ }; @@ -1864,25 +1792,27 @@ static const iw_handler woal_handler[] = { * iwpriv settable callbacks */ static const iw_handler woal_private_handler[] = { - NULL, /* SIOCIWFIRSTPRIV */ + NULL, /* SIOCIWFIRSTPRIV */ }; /******************************************************** Global Functions ********************************************************/ +// clang-format off /** wlan_handler_def */ struct iw_handler_def woal_uap_handler_def = { -num_standard:ARRAY_SIZE(woal_handler), -num_private:ARRAY_SIZE(woal_private_handler), -num_private_args:ARRAY_SIZE(woal_uap_priv_args), -standard:(iw_handler *) woal_handler, -private:(iw_handler *) woal_private_handler, -private_args:(struct iw_priv_args *)woal_uap_priv_args, + num_standard: ARRAY_SIZE(woal_handler), + num_private : ARRAY_SIZE(woal_private_handler), + num_private_args : ARRAY_SIZE(woal_uap_priv_args), + standard : (iw_handler *)woal_handler, + private : (iw_handler *)woal_private_handler, + private_args : (struct iw_priv_args *)woal_uap_priv_args, #if WIRELESS_EXT > 20 -get_wireless_stats:woal_get_uap_wireless_stats, + get_wireless_stats : woal_get_uap_wireless_stats, #endif }; +// clang-format on /** * @brief Get wireless statistics @@ -1891,8 +1821,7 @@ get_wireless_stats:woal_get_uap_wireless_stats, * * @return A pointer to iw_statistics buf */ -struct iw_statistics * -woal_get_uap_wireless_stats(struct net_device *dev) +struct iw_statistics *woal_get_uap_wireless_stats(struct net_device *dev) { moal_private *priv = (moal_private *)netdev_priv(dev); t_u16 wait_option = MOAL_IOCTL_WAIT; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_usb.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_usb.c index 4a25f83e0b66..155003f086af 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_usb.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_usb.c @@ -1,33 +1,33 @@ /** @file moal_usb.c - * - * @brief This file contains the interfaceing to USB bus - * driver. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains the interfaceing to USB bus + * driver. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /******************************************************** Change log: 10/21/2008: initial version ********************************************************/ -#include "moal_main.h" -#include "moal_usb.h" +#include "moal_main.h" +#include "moal_usb.h" extern struct semaphore AddRemoveCardSem; /******************************************************** @@ -37,38 +37,37 @@ extern struct semaphore AddRemoveCardSem; #if defined(USB8997) || defined(USB9098) || defined(USB9097) || defined(USB8978) /** Card-type detection frame response */ typedef struct { - /** 32-bit ACK+WINNER field */ + /** 32-bit ACK+WINNER field */ t_u32 ack_winner; - /** 32-bit Sequence number */ + /** 32-bit Sequence number */ t_u32 seq; - /** 32-bit extend */ + /** 32-bit extend */ t_u32 extend; - /** 32-bit chip-revision code */ + /** 32-bit chip-revision code */ t_u32 chip_rev; - /** 32-bit strap setting */ + /** 32-bit strap setting */ t_u32 strap; } usb_ack_pkt; #endif /** NXP USB device */ -#define NXP_USB_DEVICE(vid, pid, name) \ - USB_DEVICE(vid, pid), \ - .driver_info = (t_ptr)name +#define NXP_USB_DEVICE(vid, pid, name) \ + USB_DEVICE(vid, pid), .driver_info = (t_ptr)name /** Name of the USB driver */ const char usbdriver_name[] = "usbxxx"; /** This structure contains the device signature */ struct usb_device_id woal_usb_table[] = { - /* Enter the device signature inside */ +/* Enter the device signature inside */ #ifdef USB8897 {NXP_USB_DEVICE(USB8897_VID_1, USB8897_PID_1, "NXP WLAN USB Adapter")}, {NXP_USB_DEVICE(USB8897_VID_1, USB8897_PID_2, "NXP WLAN USB Adapter")}, #endif #ifdef USB8997 {NXP_USB_DEVICE(USB8997_VID_1, USB8997_PID_1, "NXP WLAN USB Adapter")}, - {NXP_USB_DEVICE - (USB8997_VID_1, USB8997V2_PID_1, "NXP WLAN USB Adapter")}, + {NXP_USB_DEVICE(USB8997_VID_1, USB8997V2_PID_1, + "NXP WLAN USB Adapter")}, {NXP_USB_DEVICE(USB8997_VID_1, USB8997_PID_2, "NXP WLAN USB Adapter")}, {NXP_USB_DEVICE(USB8997_VID_1, USB8997_PID_3, "NXP WLAN USB Adapter")}, {NXP_USB_DEVICE(USB8997_VID_1, USB8997_PID_4, "NXP WLAN USB Adapter")}, @@ -77,11 +76,11 @@ struct usb_device_id woal_usb_table[] = { #endif #ifdef USB8978 {NXP_USB_DEVICE(USB8978_VID_1, USB8978_PID_1, "NXP WLAN USB Adapter")}, - {NXP_USB_DEVICE - (USB8978_VID_1, USB8978_PID_1_BT, "NXP WLAN USB Adapter")}, + {NXP_USB_DEVICE(USB8978_VID_1, USB8978_PID_1_BT, + "NXP WLAN USB Adapter")}, {NXP_USB_DEVICE(USB8978_VID_1, USB8978_PID_2, "NXP WLAN USB Adapter")}, - {NXP_USB_DEVICE - (USB8978_VID_1, USB8978_PID_2_BT, "NXP WLAN USB Adapter")}, + {NXP_USB_DEVICE(USB8978_VID_1, USB8978_PID_2_BT, + "NXP WLAN USB Adapter")}, #endif #ifdef USB9098 {NXP_USB_DEVICE(USB9098_VID_1, USB9098_PID_1, "NXP WLAN USB Adapter")}, @@ -97,7 +96,7 @@ struct usb_device_id woal_usb_table[] = { /** This structure contains the device signature */ struct usb_device_id woal_usb_table_skip_fwdnld[] = { - /* Enter the device signature inside */ +/* Enter the device signature inside */ #ifdef USB8897 {NXP_USB_DEVICE(USB8897_VID_1, USB8897_PID_2, "NXP WLAN USB Adapter")}, #endif @@ -106,8 +105,8 @@ struct usb_device_id woal_usb_table_skip_fwdnld[] = { #endif #ifdef USB8978 {NXP_USB_DEVICE(USB8978_VID_1, USB8978_PID_2, "NXP WLAN USB Adapter")}, - {NXP_USB_DEVICE - (USB8978_VID_1, USB8978_PID_2_BT, "NXP WLAN USB Adapter")}, + {NXP_USB_DEVICE(USB8978_VID_1, USB8978_PID_2_BT, + "NXP WLAN USB Adapter")}, #endif #ifdef USB9098 {NXP_USB_DEVICE(USB9098_VID_1, USB9098_PID_2, "NXP WLAN USB Adapter")}, @@ -191,8 +190,7 @@ extern int max_tx_buf; * * @return N/A */ -static void -woal_usb_receive(struct urb *urb, struct pt_regs *regs) +static void woal_usb_receive(struct urb *urb, struct pt_regs *regs) #else /** * @brief This function receive packet of the data/cmd/event packet @@ -202,8 +200,7 @@ woal_usb_receive(struct urb *urb, struct pt_regs *regs) * * @return N/A */ -static void -woal_usb_receive(struct urb *urb) +static void woal_usb_receive(struct urb *urb) #endif { urb_context *context = NULL; @@ -248,7 +245,8 @@ woal_usb_receive(struct urb *urb) PRINTM(MERROR, "EP %d Rx URB status failure: %d\n", context->ep, urb->status); - /* Do not free mlan_buffer in case of command ep */ + /* Do not free mlan_buffer in case of command ep + */ if (cardp->rx_cmd_ep != context->ep) woal_free_mlan_buffer(handle, pmbuf); goto setup_for_next; @@ -263,8 +261,10 @@ woal_usb_receive(struct urb *urb) status); if (status == MLAN_STATUS_PENDING) { queue_work(handle->workqueue, &handle->main_work); - /* urb for data_ep is re-submitted now, unless we reach HIGH_RX_PENDING */ - /* urb for cmd_ep will be re-submitted in callback moal_recv_complete */ + /* urb for data_ep is re-submitted now, unless we reach + * HIGH_RX_PENDING */ + /* urb for cmd_ep will be re-submitted in callback + * moal_recv_complete */ if (cardp->rx_cmd_ep == context->ep) goto rx_exit; else if (atomic_read(&handle->rx_pending) >= @@ -278,8 +278,8 @@ woal_usb_receive(struct urb *urb) PRINTM(MERROR, "MLAN fail to process the receive data\n"); } else if ((status == MLAN_STATUS_SUCCESS) && - (pmbuf-> - flags & MLAN_BUF_FLAG_SLEEPCFM_RESP)) { + (pmbuf->flags & + MLAN_BUF_FLAG_SLEEPCFM_RESP)) { pmbuf->flags &= ~MLAN_BUF_FLAG_SLEEPCFM_RESP; queue_work(handle->workqueue, &handle->main_work); @@ -289,9 +289,8 @@ woal_usb_receive(struct urb *urb) woal_free_mlan_buffer(handle, pmbuf); } } else if (urb->status) { - if (! - ((cardp->rx_data_ep == context->ep) && - (cardp->resubmit_urbs == 1))) { + if (!((cardp->rx_data_ep == context->ep) && + (cardp->resubmit_urbs == 1))) { if (!handle->is_suspended) { PRINTM(MMSG, "Card is removed: %d\n", urb->status); @@ -339,8 +338,7 @@ rx_exit: * * @return N/A */ -static void -woal_usb_tx_complete(struct urb *urb, struct pt_regs *regs) +static void woal_usb_tx_complete(struct urb *urb, struct pt_regs *regs) #else /** * @brief Call back function to handle the status of the Tx data URB @@ -349,8 +347,7 @@ woal_usb_tx_complete(struct urb *urb, struct pt_regs *regs) * * @return N/A */ -static void -woal_usb_tx_complete(struct urb *urb) +static void woal_usb_tx_complete(struct urb *urb) #endif { urb_context *context = NULL; @@ -409,8 +406,7 @@ woal_usb_tx_complete(struct urb *urb) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_usb_submit_rx_urb(urb_context *ctx, int size) +static mlan_status woal_usb_submit_rx_urb(urb_context *ctx, int size) { moal_handle *handle = ctx->handle; struct usb_card_rec *cardp = (struct usb_card_rec *)handle->card; @@ -453,8 +449,7 @@ woal_usb_submit_rx_urb(urb_context *ctx, int size) cardp->rx_cmd_interval); else usb_fill_bulk_urb(ctx->urb, cardp->udev, - usb_rcvbulkpipe(cardp->udev, ctx->ep), - data, + usb_rcvbulkpipe(cardp->udev, ctx->ep), data, size - ctx->pmbuf->data_offset, woal_usb_receive, (void *)ctx); if (cardp->rx_cmd_ep == ctx->ep) @@ -494,9 +489,8 @@ rx_ret: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_check_chip_revision(moal_handle *handle, - t_u32 *usb_chip_rev, t_u32 *usb_strap) +mlan_status woal_check_chip_revision(moal_handle *handle, t_u32 *usb_chip_rev, + t_u32 *usb_strap) { mlan_status ret = MLAN_STATUS_SUCCESS; mlan_buffer mbuf; @@ -536,8 +530,7 @@ woal_check_chip_revision(moal_handle *handle, mbuf.data_len = tx_size; /* Send the chip revision check frame */ - ret = woal_usb_write_data_sync(handle, - &mbuf, cardp->tx_cmd_ep, + ret = woal_usb_write_data_sync(handle, &mbuf, cardp->tx_cmd_ep, MLAN_USB_BULK_MSG_TIMEOUT); if (ret != MLAN_STATUS_SUCCESS) { PRINTM(MERROR, @@ -552,8 +545,7 @@ woal_check_chip_revision(moal_handle *handle, mbuf.data_len = CHIP_REV_RX_BUF_SIZE; /* Receive the chip revision check frame response */ - ret = woal_usb_read_data_sync(handle, - &mbuf, cardp->rx_cmd_ep, + ret = woal_usb_read_data_sync(handle, &mbuf, cardp->rx_cmd_ep, MLAN_USB_BULK_MSG_TIMEOUT); if (ret != MLAN_STATUS_SUCCESS) { PRINTM(MERROR, @@ -579,7 +571,6 @@ woal_check_chip_revision(moal_handle *handle, *usb_strap = ack_pkt.strap & 0x7; } else PRINTM(MINFO, "chip_rev=0x%x\n", *usb_chip_rev); - } cleanup: kfree(recv_buff); @@ -596,8 +587,7 @@ cleanup: * @param handle A pointer to moal_handle structure * @return N/A */ -static void -woal_usb_unlink_urb(void *card_desc) +static void woal_usb_unlink_urb(void *card_desc) { struct usb_card_rec *cardp = (struct usb_card_rec *)card_desc; int i; @@ -612,8 +602,8 @@ woal_usb_unlink_urb(void *card_desc) if (atomic_read(&cardp->rx_data_urb_pending)) { for (i = 0; i < MVUSB_RX_DATA_URB; i++) { if (cardp->rx_data_list[i].urb) - usb_kill_urb(cardp->rx_data_list[i]. - urb); + usb_kill_urb( + cardp->rx_data_list[i].urb); } } /* Unlink Tx cmd URB */ @@ -625,12 +615,11 @@ woal_usb_unlink_urb(void *card_desc) if (atomic_read(&cardp->tx_data_urb_pending)) { for (i = 0; i < MVUSB_TX_HIGH_WMARK; i++) { if (cardp->tx_data_list[i].urb) { - usb_kill_urb(cardp->tx_data_list[i]. - urb); + usb_kill_urb( + cardp->tx_data_list[i].urb); } } } - } LEAVE(); } @@ -642,8 +631,7 @@ woal_usb_unlink_urb(void *card_desc) * * @return N/A */ -void -woal_usb_free(struct usb_card_rec *cardp) +void woal_usb_free(struct usb_card_rec *cardp) { int i; @@ -680,8 +668,7 @@ woal_usb_free(struct usb_card_rec *cardp) return; } -static t_u16 -woal_update_card_type(t_void *card) +static t_u16 woal_update_card_type(t_void *card) { struct usb_card_rec *cardp_usb = (struct usb_card_rec *)card; t_u16 card_type = 0; @@ -689,87 +676,92 @@ woal_update_card_type(t_void *card) /* Update card type */ #ifdef USB8897 if (woal_cpu_to_le16(cardp_usb->udev->descriptor.idProduct) == - USB8897_PID_1 || + USB8897_PID_1 || woal_cpu_to_le16(cardp_usb->udev->descriptor.idProduct) == - USB8897_PID_2) { + USB8897_PID_2) { card_type = CARD_TYPE_USB8897; moal_memcpy_ext(NULL, driver_version, CARD_USB8897, strlen(CARD_USB8897), strlen(driver_version)); moal_memcpy_ext(NULL, driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V15, strlen(V15), + strlen(KERN_VERSION), + V15, strlen(V15), strlen(driver_version) - strlen(INTF_CARDTYPE) - - strlen(KERN_VERSION)); + strlen(KERN_VERSION)); } #endif #ifdef USB8997 if (woal_cpu_to_le16(cardp_usb->udev->descriptor.idProduct) == - USB8997_PID_1 || + USB8997_PID_1 || woal_cpu_to_le16(cardp_usb->udev->descriptor.idProduct) == - USB8997_PID_2 || + USB8997_PID_2 || woal_cpu_to_le16(cardp_usb->udev->descriptor.idProduct) == - USB8997_PID_3 || + USB8997_PID_3 || woal_cpu_to_le16(cardp_usb->udev->descriptor.idProduct) == - USB8997_PID_4 || + USB8997_PID_4 || woal_cpu_to_le16(cardp_usb->udev->descriptor.idProduct) == - USB8997_PID_5 || + USB8997_PID_5 || woal_cpu_to_le16(cardp_usb->udev->descriptor.idProduct) == - USB8997_PID_6 || + USB8997_PID_6 || woal_cpu_to_le16(cardp_usb->udev->descriptor.idProduct) == - USB8997V2_PID_1) { + USB8997V2_PID_1) { card_type = CARD_TYPE_USB8997; moal_memcpy_ext(NULL, driver_version, CARD_USB8997, strlen(CARD_USB8997), strlen(driver_version)); moal_memcpy_ext(NULL, driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V16, strlen(V16), + strlen(KERN_VERSION), + V16, strlen(V16), strlen(driver_version) - strlen(INTF_CARDTYPE) - - strlen(KERN_VERSION)); + strlen(KERN_VERSION)); } #endif #ifdef USB8978 if (woal_cpu_to_le16(cardp_usb->udev->descriptor.idProduct) == - USB8978_PID_1 || + USB8978_PID_1 || woal_cpu_to_le16(cardp_usb->udev->descriptor.idProduct) == - USB8978_PID_2) { + USB8978_PID_2) { card_type = CARD_TYPE_USB8978; moal_memcpy_ext(NULL, driver_version, CARD_USB8978, strlen(CARD_USB8978), strlen(driver_version)); moal_memcpy_ext(NULL, driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V16, strlen(V16), + strlen(KERN_VERSION), + V16, strlen(V16), strlen(driver_version) - strlen(INTF_CARDTYPE) - - strlen(KERN_VERSION)); + strlen(KERN_VERSION)); } #endif #ifdef USB9098 if (woal_cpu_to_le16(cardp_usb->udev->descriptor.idProduct) == - USB9098_PID_1 || + USB9098_PID_1 || woal_cpu_to_le16(cardp_usb->udev->descriptor.idProduct) == - USB9098_PID_2) { + USB9098_PID_2) { card_type = CARD_TYPE_USB9098; moal_memcpy_ext(NULL, driver_version, CARD_USB9098, strlen(CARD_USB9098), strlen(driver_version)); moal_memcpy_ext(NULL, driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V17, strlen(V17), + strlen(KERN_VERSION), + V17, strlen(V17), strlen(driver_version) - strlen(INTF_CARDTYPE) - - strlen(KERN_VERSION)); + strlen(KERN_VERSION)); } #endif #ifdef USB9097 if (woal_cpu_to_le16(cardp_usb->udev->descriptor.idProduct) == - USB9097_PID_1 || + USB9097_PID_1 || woal_cpu_to_le16(cardp_usb->udev->descriptor.idProduct) == - USB9097_PID_2) { + USB9097_PID_2) { card_type = CARD_TYPE_USB9097; moal_memcpy_ext(NULL, driver_version, CARD_USB9097, strlen(CARD_USB9097), strlen(driver_version)); moal_memcpy_ext(NULL, driver_version + strlen(INTF_CARDTYPE) + - strlen(KERN_VERSION), V17, strlen(V17), + strlen(KERN_VERSION), + V17, strlen(V17), strlen(driver_version) - strlen(INTF_CARDTYPE) - - strlen(KERN_VERSION)); + strlen(KERN_VERSION)); } #endif return card_type; @@ -783,8 +775,8 @@ woal_update_card_type(t_void *card) * * @return Address of variable usb_cardp, error code otherwise */ -static int -woal_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) +static int woal_usb_probe(struct usb_interface *intf, + const struct usb_device_id *id) { struct usb_device *udev; struct usb_host_interface *iface_desc; @@ -811,9 +803,9 @@ woal_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) /* Check probe is for our device */ for (i = 0; woal_usb_table[i].idVendor; i++) { if (woal_cpu_to_le16(udev->descriptor.idVendor) == - woal_usb_table[i].idVendor && + woal_usb_table[i].idVendor && woal_cpu_to_le16(udev->descriptor.idProduct) == - woal_usb_table[i].idProduct) { + woal_usb_table[i].idProduct) { PRINTM(MMSG, "VID/PID = %X/%X, Boot2 version = %X\n", woal_cpu_to_le16(udev->descriptor.idVendor), woal_cpu_to_le16(udev->descriptor.idProduct), @@ -836,7 +828,8 @@ woal_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) #ifdef USB9097 case USB9097_PID_1: #endif /* USB9097 */ - /* If skip FW is set, we must return error so the next driver can download the FW */ + /* If skip FW is set, we must return error so + * the next driver can download the FW */ if (skip_fwdnld) goto error; else @@ -861,12 +854,15 @@ woal_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) usb_cardp->boot_state = USB_FW_READY; break; } - /*To do, get card type */ -/* if (woal_cpu_to_le16(udev->descriptor.idProduct) == USB8897_PID_2) - usb_cardp->card_type = CARD_TYPE_USB8897; - else if (woal_cpu_to_le16(udev->descriptor.idProduct) == USB8997_PID_2) - usb_cardp->card_type = CARD_TYPE_USB997; -*/ + /*To do, get card type*/ + /* if + (woal_cpu_to_le16(udev->descriptor.idProduct) == + USB8897_PID_2) usb_cardp->card_type = + CARD_TYPE_USB8897; else if + (woal_cpu_to_le16(udev->descriptor.idProduct) == + USB8997_PID_2) usb_cardp->card_type = + CARD_TYPE_USB997; + */ break; } } @@ -876,7 +872,8 @@ woal_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) iface_desc = intf->cur_altsetting; usb_cardp->intf = intf; - PRINTM(MINFO, "bcdUSB = 0x%X bDeviceClass = 0x%X" + PRINTM(MINFO, + "bcdUSB = 0x%X bDeviceClass = 0x%X" " bDeviceSubClass = 0x%X, bDeviceProtocol = 0x%X\n", woal_cpu_to_le16(udev->descriptor.bcdUSB), udev->descriptor.bDeviceClass, @@ -886,12 +883,11 @@ woal_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { endpoint = &iface_desc->endpoint[i].desc; if ((usb_endpoint_is_bulk_in(endpoint) || - usb_endpoint_is_int_in(endpoint)) - && (usb_endpoint_num(endpoint) == - MLAN_USB_EP_CMD_EVENT || - usb_endpoint_num(endpoint) == - MLAN_USB_EP_CMD_EVENT_IF2) - ) { + usb_endpoint_is_int_in(endpoint)) && + (usb_endpoint_num(endpoint) == + MLAN_USB_EP_CMD_EVENT || + usb_endpoint_num(endpoint) == + MLAN_USB_EP_CMD_EVENT_IF2)) { usb_cardp->rx_cmd_ep_type = usb_endpoint_type(endpoint); usb_cardp->rx_cmd_interval = @@ -899,13 +895,12 @@ woal_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) /* We found a bulk in command/event endpoint */ PRINTM(MCMND, "Rx CMD/EVT: max packet size = %d, address = %d ep_type=%d\n", - woal_le16_to_cpu(endpoint-> - wMaxPacketSize), + woal_le16_to_cpu( + endpoint->wMaxPacketSize), endpoint->bEndpointAddress, usb_cardp->rx_cmd_ep_type); usb_cardp->rx_cmd_ep = - (endpoint-> - bEndpointAddress & + (endpoint->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); atomic_set(&usb_cardp->rx_cmd_urb_pending, 0); @@ -914,48 +909,44 @@ woal_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) usb_cardp->second_mac = MTRUE; } if (usb_endpoint_is_bulk_in(endpoint) && - (usb_endpoint_num(endpoint) == MLAN_USB_EP_DATA - || usb_endpoint_num(endpoint) == - MLAN_USB_EP_DATA_IF2) - ) { + (usb_endpoint_num(endpoint) == MLAN_USB_EP_DATA || + usb_endpoint_num(endpoint) == + MLAN_USB_EP_DATA_IF2)) { /* We found a bulk in data endpoint */ PRINTM(MINFO, "Bulk IN: max packet size = %d, address = %d\n", - woal_le16_to_cpu(endpoint-> - wMaxPacketSize), + woal_le16_to_cpu( + endpoint->wMaxPacketSize), endpoint->bEndpointAddress); usb_cardp->rx_data_ep = - (endpoint-> - bEndpointAddress & + (endpoint->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK); atomic_set(&usb_cardp->rx_data_urb_pending, 0); } if (usb_endpoint_is_bulk_out(endpoint) && - (usb_endpoint_num(endpoint) == MLAN_USB_EP_DATA - || usb_endpoint_num(endpoint) == - MLAN_USB_EP_DATA_IF2) - ) { + (usb_endpoint_num(endpoint) == MLAN_USB_EP_DATA || + usb_endpoint_num(endpoint) == + MLAN_USB_EP_DATA_IF2)) { /* We found a bulk out data endpoint */ PRINTM(MCMND, "Bulk OUT: max packet size = %d, address = %d\n", - woal_le16_to_cpu(endpoint-> - wMaxPacketSize), + woal_le16_to_cpu( + endpoint->wMaxPacketSize), endpoint->bEndpointAddress); usb_cardp->tx_data_ep = endpoint->bEndpointAddress; atomic_set(&usb_cardp->tx_data_urb_pending, 0); usb_cardp->tx_data_maxpktsize = - woal_le16_to_cpu(endpoint-> - wMaxPacketSize); + woal_le16_to_cpu( + endpoint->wMaxPacketSize); } if ((usb_endpoint_is_bulk_out(endpoint) || - usb_endpoint_is_int_out(endpoint)) - && (usb_endpoint_num(endpoint) == - MLAN_USB_EP_CMD_EVENT || - usb_endpoint_num(endpoint) == - MLAN_USB_EP_CMD_EVENT_IF2) - ) { + usb_endpoint_is_int_out(endpoint)) && + (usb_endpoint_num(endpoint) == + MLAN_USB_EP_CMD_EVENT || + usb_endpoint_num(endpoint) == + MLAN_USB_EP_CMD_EVENT_IF2)) { usb_cardp->tx_cmd_ep_type = usb_endpoint_type(endpoint); usb_cardp->tx_cmd_interval = @@ -963,16 +954,15 @@ woal_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) /* We found a bulk out command/event endpoint */ PRINTM(MCMND, "Tx CMD: max packet size = %d, address = %d ep_type=%d\n", - woal_le16_to_cpu(endpoint-> - wMaxPacketSize), + woal_le16_to_cpu( + endpoint->wMaxPacketSize), endpoint->bEndpointAddress, usb_cardp->tx_cmd_ep_type); usb_cardp->tx_cmd_ep = endpoint->bEndpointAddress; atomic_set(&usb_cardp->tx_cmd_urb_pending, 0); - usb_cardp->tx_cmd_maxpktsize = - woal_le16_to_cpu(endpoint-> - wMaxPacketSize); + usb_cardp->tx_cmd_maxpktsize = woal_le16_to_cpu( + endpoint->wMaxPacketSize); } } @@ -1012,9 +1002,8 @@ woal_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) } /* At this point wlan_add_card() will be called */ - if (! - (woal_add_card - (usb_cardp, &usb_cardp->udev->dev, &usb_ops, card_type))) { + if (!(woal_add_card(usb_cardp, &usb_cardp->udev->dev, &usb_ops, + card_type))) { PRINTM(MERROR, "%s: woal_add_card failed\n", __FUNCTION__); goto error; @@ -1024,16 +1013,16 @@ woal_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) * default. So drivers wanting remote wakeup will have to enable * this using - * device_set_wakeup_enable(&udev->dev, 1); - * It has been observed that some cards having device attr = 0xa0 - * do not support remote wakeup. These cards come immediately out - * of the suspend when power/wakeup file is set to 'enabled'. - * To support all types of cards i.e. with/without remote wakeup, - * we are NOT setting the 'power/wakeup' file from here. - * Also in principle, we are not supposed to change the wakeup - * policy, which is purely a userspace decision. + * It has been observed that some cards having device attr = + * 0xa0 do not support remote wakeup. These cards come + * immediately out of the suspend when power/wakeup file is set + * to 'enabled'. To support all types of cards i.e. with/without + * remote wakeup, we are NOT setting the 'power/wakeup' file + * from here. Also in principle, we are not supposed to change + * the wakeup policy, which is purely a userspace decision. */ - /* if (udev->actconfig->desc.bmAttributes & USB_CONFIG_ATT_WAKEUP) - intf->needs_remote_wakeup = 1; */ + /* if (udev->actconfig->desc.bmAttributes & + USB_CONFIG_ATT_WAKEUP) intf->needs_remote_wakeup = 1; */ #endif usb_get_dev(udev); LEAVE(); @@ -1058,8 +1047,7 @@ error: * * @return N/A */ -static void -woal_usb_disconnect(struct usb_interface *intf) +static void woal_usb_disconnect(struct usb_interface *intf) { struct usb_card_rec *cardp = usb_get_intfdata(intf); moal_handle *phandle = NULL; @@ -1096,8 +1084,7 @@ woal_usb_disconnect(struct usb_interface *intf) * * @return N/A */ -void -woal_kill_urbs(moal_handle *handle) +void woal_kill_urbs(moal_handle *handle) { ENTER(); handle->is_suspended = MTRUE; @@ -1113,8 +1100,7 @@ woal_kill_urbs(moal_handle *handle) * * @return N/A */ -void -woal_resubmit_urbs(moal_handle *handle) +void woal_resubmit_urbs(moal_handle *handle) { struct usb_card_rec *cardp = handle->card; @@ -1144,8 +1130,7 @@ woal_resubmit_urbs(moal_handle *handle) * * @return MLAN_STATUS_SUCCESS */ -static int -woal_usb_suspend(struct usb_interface *intf, pm_message_t message) +static int woal_usb_suspend(struct usb_interface *intf, pm_message_t message) { struct usb_card_rec *cardp = usb_get_intfdata(intf); moal_handle *handle = NULL; @@ -1227,8 +1212,7 @@ done: * * @return MLAN_STATUS_SUCCESS */ -static int -woal_usb_resume(struct usb_interface *intf) +static int woal_usb_resume(struct usb_interface *intf) { struct usb_card_rec *cardp = usb_get_intfdata(intf); moal_handle *handle = NULL; @@ -1278,8 +1262,8 @@ woal_usb_resume(struct usb_interface *intf) MOAL_NO_WAIT); #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) - /* Resume handler may be called due to remote wakeup, - force to exit suspend anyway */ + /* Resume handler may be called due to remote wakeup, + force to exit suspend anyway */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) cardp->udev->autosuspend_disabled = 1; #else @@ -1311,8 +1295,7 @@ done: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_usb_tx_init(moal_handle *handle) +mlan_status woal_usb_tx_init(moal_handle *handle) { struct usb_card_rec *cardp = (struct usb_card_rec *)handle->card; int i; @@ -1355,8 +1338,7 @@ init_exit: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_usb_submit_rx_data_urbs(moal_handle *handle) +mlan_status woal_usb_submit_rx_data_urbs(moal_handle *handle) { struct usb_card_rec *cardp = (struct usb_card_rec *)handle->card; int i; @@ -1368,9 +1350,8 @@ woal_usb_submit_rx_data_urbs(moal_handle *handle) if (cardp->rx_deaggr_ctrl.enable) { buffer_len = cardp->rx_deaggr_ctrl.aggr_max; if (cardp->rx_deaggr_ctrl.aggr_mode == MLAN_USB_AGGR_MODE_NUM) { - buffer_len *= - MAX(MLAN_USB_MAX_PKT_SIZE, - cardp->rx_deaggr_ctrl.aggr_align); + buffer_len *= MAX(MLAN_USB_MAX_PKT_SIZE, + cardp->rx_deaggr_ctrl.aggr_align); buffer_len = MAX(buffer_len, MLAN_RX_DATA_BUF_SIZE); } } @@ -1378,8 +1359,8 @@ woal_usb_submit_rx_data_urbs(moal_handle *handle) for (i = 0; i < MVUSB_RX_DATA_URB; i++) { /* Submit Rx data URB */ if (!cardp->rx_data_list[i].pmbuf) { - if (woal_usb_submit_rx_urb - (&cardp->rx_data_list[i], buffer_len)) + if (woal_usb_submit_rx_urb(&cardp->rx_data_list[i], + buffer_len)) continue; } ret = MLAN_STATUS_SUCCESS; @@ -1395,8 +1376,7 @@ woal_usb_submit_rx_data_urbs(moal_handle *handle) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_usb_rx_init(moal_handle *handle) +mlan_status woal_usb_rx_init(moal_handle *handle) { struct usb_card_rec *cardp = (struct usb_card_rec *)handle->card; int i; @@ -1418,8 +1398,8 @@ woal_usb_rx_init(moal_handle *handle) woal_alloc_mlan_buffer(handle, MLAN_RX_CMD_BUF_SIZE); if (cardp->rx_cmd.pmbuf) { /* Submit Rx command URB */ - if (woal_usb_submit_rx_urb - (&cardp->rx_cmd, MLAN_RX_CMD_BUF_SIZE)) { + if (woal_usb_submit_rx_urb(&cardp->rx_cmd, + MLAN_RX_CMD_BUF_SIZE)) { ret = MLAN_STATUS_FAILURE; goto init_exit; } @@ -1456,9 +1436,9 @@ init_exit: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_usb_write_data_sync(moal_handle *handle, mlan_buffer *pmbuf, - t_u32 endpoint, t_u32 timeout) +static mlan_status woal_usb_write_data_sync(moal_handle *handle, + mlan_buffer *pmbuf, t_u32 endpoint, + t_u32 timeout) { struct usb_card_rec *cardp = handle->card; t_u8 *data = (t_u8 *)(pmbuf->pbuf + pmbuf->data_offset); @@ -1500,9 +1480,9 @@ woal_usb_write_data_sync(moal_handle *handle, mlan_buffer *pmbuf, * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_usb_read_data_sync(moal_handle *handle, mlan_buffer *pmbuf, t_u32 endpoint, - t_u32 timeout) +static mlan_status woal_usb_read_data_sync(moal_handle *handle, + mlan_buffer *pmbuf, t_u32 endpoint, + t_u32 timeout) { struct usb_card_rec *cardp = handle->card; t_u8 *data = (t_u8 *)(pmbuf->pbuf + pmbuf->data_offset); @@ -1531,10 +1511,11 @@ woal_usb_read_data_sync(moal_handle *handle, mlan_buffer *pmbuf, t_u32 endpoint, * @param pmbuf Pointer to mlan_buffer structure * @param ep Endpoint to send * - * @return MLAN_STATUS_PENDING or MLAN_STATUS_FAILURE or MLAN_STATUS_RESOURCE + * @return MLAN_STATUS_PENDING or MLAN_STATUS_FAILURE or + * MLAN_STATUS_RESOURCE */ -mlan_status -woal_write_data_async(moal_handle *handle, mlan_buffer *pmbuf, t_u8 ep) +mlan_status woal_write_data_async(moal_handle *handle, mlan_buffer *pmbuf, + t_u8 ep) { struct usb_card_rec *cardp = handle->card; urb_context *context = NULL; @@ -1600,11 +1581,11 @@ woal_write_data_async(moal_handle *handle, mlan_buffer *pmbuf, t_u8 ep) (void *)context, cardp->tx_cmd_interval); } else usb_fill_bulk_urb(tx_urb, cardp->udev, - usb_sndbulkpipe(cardp->udev, ep), - data, data_len, - woal_usb_tx_complete, (void *)context); -/* We find on Ubuntu 12.10 this flag does not work */ - //tx_urb->transfer_flags |= URB_ZERO_PACKET; + usb_sndbulkpipe(cardp->udev, ep), data, + data_len, woal_usb_tx_complete, + (void *)context); + /* We find on Ubuntu 12.10 this flag does not work */ + // tx_urb->transfer_flags |= URB_ZERO_PACKET; if (ep == cardp->tx_cmd_ep) atomic_inc(&cardp->tx_cmd_urb_pending); @@ -1650,8 +1631,7 @@ tx_ret: * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -static mlan_status -woal_usb_register_dev(moal_handle *handle) +static mlan_status woal_usb_register_dev(moal_handle *handle) { struct usb_card_rec *cardp = (struct usb_card_rec *)handle->card; mlan_status ret = MLAN_STATUS_SUCCESS; @@ -1663,8 +1643,7 @@ woal_usb_register_dev(moal_handle *handle) return ret; } -static void -woal_usb_unregister_dev(moal_handle *handle) +static void woal_usb_unregister_dev(moal_handle *handle) { struct usb_card_rec *cardp = (struct usb_card_rec *)handle->card; PRINTM(MMSG, "USB: unregister device\n"); @@ -1678,8 +1657,7 @@ woal_usb_unregister_dev(moal_handle *handle) * * @return MLAN_STATUS_SUCCESS or MLAN_STATUS_FAILURE */ -mlan_status -woal_usb_bus_register(void) +mlan_status woal_usb_bus_register(void) { mlan_status ret = MLAN_STATUS_SUCCESS; ENTER(); @@ -1704,8 +1682,7 @@ woal_usb_bus_register(void) * * @return N/A */ -void -woal_usb_bus_unregister(void) +void woal_usb_bus_unregister(void) { ENTER(); /* API unregisters the driver from USB subsystem */ @@ -1721,8 +1698,7 @@ woal_usb_bus_unregister(void) * @return MTRUE/MFALSE * */ -static t_u8 -woal_usb_is_second_mac(moal_handle *handle) +static t_u8 woal_usb_is_second_mac(moal_handle *handle) { return ((struct usb_card_rec *)(handle->card))->second_mac; } @@ -1735,8 +1711,7 @@ woal_usb_is_second_mac(moal_handle *handle) * * @return 0 --success, otherwise fail */ -int -woal_enter_usb_suspend(moal_handle *handle) +int woal_enter_usb_suspend(moal_handle *handle) { struct usb_device *udev = ((struct usb_card_rec *)(handle->card))->udev; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) @@ -1762,12 +1737,14 @@ woal_enter_usb_suspend(moal_handle *handle) /* Enter into USB suspend */ usb_lock_device(udev); #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38) - udev->autosuspend_delay = 0; /* Autosuspend delay in jiffies */ + udev->autosuspend_delay = 0; /* Autosuspend delay in jiffies */ #else - pm_runtime_set_autosuspend_delay(&udev->dev, 0); /* Autosuspend delay in jiffies */ + pm_runtime_set_autosuspend_delay(&udev->dev, 0); /* Autosuspend delay in + jiffies */ #endif /* < 2.6.38 */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) - udev->autosuspend_disabled = 0; /* /sys/bus/usb/devices/.../power/level < auto */ + udev->autosuspend_disabled = 0; /* /sys/bus/usb/devices/.../power/level + < auto */ #endif /* < 2.6.34 */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) udev->autoresume_disabled = 0; @@ -1803,8 +1780,7 @@ woal_enter_usb_suspend(moal_handle *handle) * * @return 0 --success, otherwise fail */ -int -woal_exit_usb_suspend(moal_handle *handle) +int woal_exit_usb_suspend(moal_handle *handle) { struct usb_device *udev = ((struct usb_card_rec *)(handle->card))->udev; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) @@ -1824,11 +1800,13 @@ woal_exit_usb_suspend(moal_handle *handle) LEAVE(); return -EFAULT; } + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) /* Exit from USB suspend */ usb_lock_device(udev); #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) - udev->autosuspend_disabled = 1; /* /sys/bus/usb/devices/.../power/level < on */ + udev->autosuspend_disabled = 1; /* /sys/bus/usb/devices/.../power/level + < on */ #endif /* < 2.6.34 */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) udev->autoresume_disabled = 0; @@ -1862,8 +1840,7 @@ woal_exit_usb_suspend(moal_handle *handle) * * @return N/A */ -void -woal_submit_rx_urb(moal_handle *handle, t_u8 ep) +void woal_submit_rx_urb(moal_handle *handle, t_u8 ep) { struct usb_card_rec *cardp = (struct usb_card_rec *)handle->card; @@ -1885,8 +1862,7 @@ woal_submit_rx_urb(moal_handle *handle, t_u8 ep) * * @return N/A */ -void -woal_usb_dump_fw_info(moal_handle *phandle) +void woal_usb_dump_fw_info(moal_handle *phandle) { moal_private *priv = NULL; mlan_ioctl_req *req = NULL; @@ -1924,8 +1900,7 @@ done: return; } -static mlan_status -woal_usb_get_fw_name(moal_handle *handle) +static mlan_status woal_usb_get_fw_name(moal_handle *handle) { mlan_status ret = MLAN_STATUS_SUCCESS; #if defined(USB8997) || defined(USB9098) || defined(USB9097) || defined(USB8978) @@ -2001,6 +1976,7 @@ woal_usb_get_fw_name(moal_handle *handle) break; case USB9098_A0: case USB9098_A1: + case USB9098_A2: if (strap != 0) { if (strap == CARD_TYPE_USB_UART) strcpy(handle->card_info->fw_name, @@ -2013,7 +1989,6 @@ woal_usb_get_fw_name(moal_handle *handle) USB9098_WLAN_V1_FW_NAME); break; } - } #endif #ifdef USB9097 @@ -2033,7 +2008,6 @@ woal_usb_get_fw_name(moal_handle *handle) USB9097_WLAN_V1_FW_NAME); break; } - } #endif done: diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_usb.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_usb.h index d116afde09e0..7c95c28be29c 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_usb.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_usb.h @@ -1,25 +1,25 @@ /** @file moal_usb.h - * - * @brief This file contains definitions for USB interface. - * driver. - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains definitions for USB interface. + * driver. + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /************************************************************* Change Log: 10/21/2008: initial version @@ -30,123 +30,124 @@ Change Log: #ifdef USB8997 /** USB VID 1 */ -#define USB8997_VID_1 0x1286 +#define USB8997_VID_1 0x1286 /** USB PID 1 */ -#define USB8997_PID_1 0x204D +#define USB8997_PID_1 0x204D /** USB PID 2 */ -#define USB8997_PID_2 0x204E -#define USB8997_PID_3 0x2047 -#define USB8997_PID_4 0x2048 -#define USB8997_PID_5 0x2050 -#define USB8997_PID_6 0x2051 +#define USB8997_PID_2 0x204E +#define USB8997_PID_3 0x2047 +#define USB8997_PID_4 0x2048 +#define USB8997_PID_5 0x2050 +#define USB8997_PID_6 0x2051 #define USB8997V2_PID_1 0x2052 #endif /* USB8997 */ #ifdef USB8978 /** USB VID 1 */ -#define USB8978_VID_1 0x1286 +#define USB8978_VID_1 0x1286 /** USB PID 1 */ -#define USB8978_PID_1 0x2062 +#define USB8978_PID_1 0x2062 /** USB PID 2 */ -#define USB8978_PID_2 0x2063 +#define USB8978_PID_2 0x2063 /* BT downloaded combo firmware; register for WLAN enumeration */ -#define USB8978_PID_1_BT 0x2064 -#define USB8978_PID_2_BT 0x2065 +#define USB8978_PID_1_BT 0x2064 +#define USB8978_PID_2_BT 0x2065 #endif #ifdef USB8897 /** USB VID 1 */ -#define USB8897_VID_1 0x1286 +#define USB8897_VID_1 0x1286 /** USB PID 1 */ -#define USB8897_PID_1 0x2045 +#define USB8897_PID_1 0x2045 /** USB PID 2 */ -#define USB8897_PID_2 0x2046 +#define USB8897_PID_2 0x2046 #endif /* USB8897 */ #ifdef USB9098 /** USB VID 1 */ -#define USB9098_VID_1 0x1286 +#define USB9098_VID_1 0x1286 /** USB PID 1 */ -#define USB9098_PID_1 0x2056 +#define USB9098_PID_1 0x2056 /** USB PID 2 */ -#define USB9098_PID_2 0x2057 +#define USB9098_PID_2 0x2057 #endif /* USB9098 */ #ifdef USB9097 /** USB VID 1 */ -#define USB9097_VID_1 0x1286 +#define USB9097_VID_1 0x1286 /** USB PID 1 */ -#define USB9097_PID_1 0x2060 +#define USB9097_PID_1 0x2060 /** USB PID 2 */ -#define USB9097_PID_2 0x2061 +#define USB9097_PID_2 0x2061 #endif /* USB9097 */ /** Boot state: FW download */ -#define USB_FW_DNLD 1 +#define USB_FW_DNLD 1 /** Boot state: FW ready */ -#define USB_FW_READY 2 +#define USB_FW_READY 2 /** High watermark for Tx data */ -#define MVUSB_TX_HIGH_WMARK 12 +#define MVUSB_TX_HIGH_WMARK 12 /** Number of Rx data URB */ -#define MVUSB_RX_DATA_URB 6 +#define MVUSB_RX_DATA_URB 6 #if defined(USB8997) || defined(USB9098) || defined(USB9097) || defined(USB8978) /* Transmit buffer size for chip revision check */ -#define CHIP_REV_TX_BUF_SIZE 16 +#define CHIP_REV_TX_BUF_SIZE 16 /* Receive buffer size for chip revision check */ -#define CHIP_REV_RX_BUF_SIZE 2048 +#define CHIP_REV_RX_BUF_SIZE 2048 /* Extensions */ -#define EXTEND_HDR (0xAB950000) -#define EXTEND_V1 (0x00000001) -#define EXTEND_V2 (0x00000002) +#define EXTEND_HDR (0xAB950000) +#define EXTEND_V1 (0x00000001) +#define EXTEND_V2 (0x00000002) #endif /** Default firmaware name */ #ifdef USB8997 -#define USB8997_DEFAULT_COMBO_FW_NAME "nxp/usbusb8997_combo_v4.bin" -#define USB8997_DEFAULT_WLAN_FW_NAME "nxp/usb8997_wlan_v4.bin" -#define USBUART8997_DEFAULT_COMBO_FW_NAME "nxp/usbuart8997_combo_v4.bin" -#define USBUSB8997_DEFAULT_COMBO_FW_NAME "nxp/usbusb8997_combo_v4.bin" +#define USB8997_DEFAULT_COMBO_FW_NAME "nxp/usbusb8997_combo_v4.bin" +#define USB8997_DEFAULT_WLAN_FW_NAME "nxp/usb8997_wlan_v4.bin" +#define USBUART8997_DEFAULT_COMBO_FW_NAME "nxp/usbuart8997_combo_v4.bin" +#define USBUSB8997_DEFAULT_COMBO_FW_NAME "nxp/usbusb8997_combo_v4.bin" #endif /* USB8997 */ #ifdef USB8978 -#define USB8978_DEFAULT_COMBO_FW_NAME "nxp/usbusb8978_combo.bin" -#define USB8978_DEFAULT_WLAN_FW_NAME "nxp/usb8978_wlan.bin" -#define USBUART8978_DEFAULT_COMBO_FW_NAME "nxp/usbuart8978_combo.bin" -#define USBUSB8978_DEFAULT_COMBO_FW_NAME "nxp/usbusb8978_combo.bin" +#define USB8978_DEFAULT_COMBO_FW_NAME "nxp/usbusb8978_combo.bin" +#define USB8978_DEFAULT_WLAN_FW_NAME "nxp/usb8978_wlan.bin" +#define USBUART8978_DEFAULT_COMBO_FW_NAME "nxp/usbuart8978_combo.bin" +#define USBUSB8978_DEFAULT_COMBO_FW_NAME "nxp/usbusb8978_combo.bin" #endif /* USB8978 */ #ifdef USB8897 -#define USB8897_DEFAULT_COMBO_FW_NAME "nxp/usb8897_uapsta.bin" -#define USB8897_DEFAULT_WLAN_FW_NAME "nxp/usb8897_wlan.bin" +#define USB8897_DEFAULT_COMBO_FW_NAME "nxp/usb8897_uapsta.bin" +#define USB8897_DEFAULT_WLAN_FW_NAME "nxp/usb8897_wlan.bin" #endif /* USB8897 */ #ifdef USB9098 -#define USB9098_Z1Z2 0x00 -#define USB9098_A0 0x01 -#define USB9098_A1 0x02 -#define USB9098_DEFAULT_COMBO_FW_NAME "nxp/usbusb9098_combo.bin" -#define USB9098_DEFAULT_WLAN_FW_NAME "nxp/usb9098_wlan.bin" -#define USBUART9098_DEFAULT_COMBO_FW_NAME "nxp/usbuart9098_combo.bin" -#define USBUSB9098_DEFAULT_COMBO_FW_NAME "nxp/usbusb9098_combo.bin" -#define USB9098_WLAN_V1_FW_NAME "nxp/usb9098_wlan_v1.bin" -#define USBUART9098_COMBO_V1_FW_NAME "nxp/usbuart9098_combo_v1.bin" -#define USBUSB9098_COMBO_V1_FW_NAME "nxp/usbusb9098_combo_v1.bin" +#define USB9098_Z1Z2 0x00 +#define USB9098_A0 0x01 +#define USB9098_A1 0x02 +#define USB9098_A2 0x03 +#define USB9098_DEFAULT_COMBO_FW_NAME "nxp/usbusb9098_combo.bin" +#define USB9098_DEFAULT_WLAN_FW_NAME "nxp/usb9098_wlan.bin" +#define USBUART9098_DEFAULT_COMBO_FW_NAME "nxp/usbuart9098_combo.bin" +#define USBUSB9098_DEFAULT_COMBO_FW_NAME "nxp/usbusb9098_combo.bin" +#define USB9098_WLAN_V1_FW_NAME "nxp/usb9098_wlan_v1.bin" +#define USBUART9098_COMBO_V1_FW_NAME "nxp/usbuart9098_combo_v1.bin" +#define USBUSB9098_COMBO_V1_FW_NAME "nxp/usbusb9098_combo_v1.bin" #endif /* USB9098 */ #ifdef USB9097 -#define USB9097_B0 0x01 -#define USB9097_B1 0x02 -#define USB9097_DEFAULT_COMBO_FW_NAME "nxp/usbusb9097_combo_v1.bin" -#define USB9097_DEFAULT_WLAN_FW_NAME "nxp/usb9097_wlan_v1.bin" -#define USB9097_WLAN_V1_FW_NAME "nxp/usb9097_wlan_v1.bin" -#define USBUART9097_COMBO_V1_FW_NAME "nxp/usbuart9097_combo_v1.bin" -#define USBUSB9097_COMBO_V1_FW_NAME "nxp/usbusb9097_combo_v1.bin" +#define USB9097_B0 0x01 +#define USB9097_B1 0x02 +#define USB9097_DEFAULT_COMBO_FW_NAME "nxp/usbusb9097_combo_v1.bin" +#define USB9097_DEFAULT_WLAN_FW_NAME "nxp/usb9097_wlan_v1.bin" +#define USB9097_WLAN_V1_FW_NAME "nxp/usb9097_wlan_v1.bin" +#define USBUART9097_COMBO_V1_FW_NAME "nxp/usbuart9097_combo_v1.bin" +#define USBUSB9097_COMBO_V1_FW_NAME "nxp/usbusb9097_combo_v1.bin" #endif /* USB9097 */ /** urb context */ @@ -169,9 +170,9 @@ struct usb_card_rec { moal_handle *phandle; /** USB interface */ struct usb_interface *intf; - /** Rx command endpoint type */ + /** Rx command endpoint type */ int rx_cmd_ep_type; - /** Rx command interval for INTR type */ + /** Rx command interval for INTR type */ t_u8 rx_cmd_interval; /** Rx data endpoint address */ t_u8 rx_cmd_ep; @@ -181,7 +182,7 @@ struct usb_card_rec { atomic_t rx_cmd_urb_pending; /** Rx data context list */ urb_context rx_data_list[MVUSB_RX_DATA_URB]; - /** Flag to indicate boot state */ + /** Flag to indicate boot state */ t_u8 boot_state; /** Rx data endpoint address */ t_u8 rx_data_ep; @@ -189,9 +190,9 @@ struct usb_card_rec { atomic_t rx_data_urb_pending; /** Tx data endpoint address */ t_u8 tx_data_ep; - /** Tx command endpoint type */ + /** Tx command endpoint type */ int tx_cmd_ep_type; - /** Tx command interval for INTR type */ + /** Tx command interval for INTR type */ t_u8 tx_cmd_interval; /** Tx command endpoint address */ t_u8 tx_cmd_ep; @@ -199,9 +200,9 @@ struct usb_card_rec { atomic_t tx_data_urb_pending; /** Tx command URB pending count */ atomic_t tx_cmd_urb_pending; - /** Tx data endpoint max pkt size */ + /** Tx data endpoint max pkt size */ int tx_data_maxpktsize; - /** Tx cmd endpoint max pkt size */ + /** Tx cmd endpoint max pkt size */ int tx_cmd_maxpktsize; /** Pre-allocated urb for command */ urb_context tx_cmd; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_wext.c b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_wext.c index 23677abd7791..7b0d3404d1af 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_wext.c +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_wext.c @@ -1,43 +1,38 @@ /** @file moal_wext.c - * - * @brief This file contains wireless extension standard ioctl functions - * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * @brief This file contains wireless extension standard ioctl functions + * + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /************************************************************************ Change log: 10/21/2008: initial version ************************************************************************/ -#include "moal_main.h" +#include "moal_main.h" #ifdef STA_SUPPORT /** Approximate amount of data needed to pass a scan result back to iwlist */ -#define MAX_SCAN_CELL_SIZE \ - (IW_EV_ADDR_LEN \ - + MLAN_MAX_SSID_LENGTH \ - + IW_EV_UINT_LEN \ - + IW_EV_FREQ_LEN \ - + IW_EV_QUAL_LEN \ - + MLAN_MAX_SSID_LENGTH \ - + IW_EV_PARAM_LEN \ - + 40) /* 40 for WPAIE */ +#define MAX_SCAN_CELL_SIZE \ + (IW_EV_ADDR_LEN + MLAN_MAX_SSID_LENGTH + IW_EV_UINT_LEN + \ + IW_EV_FREQ_LEN + IW_EV_QUAL_LEN + MLAN_MAX_SSID_LENGTH + \ + IW_EV_PARAM_LEN + 40) /* 40 for WPAIE */ /** Macro for minimum size of scan buffer */ #define MIN_ACCEPTED_GET_SCAN_BUF 8000 @@ -53,8 +48,7 @@ Change log: * * @return 0--ssid is same, otherwise is different */ -static t_s32 -woal_ssid_cmp(mlan_802_11_ssid *ssid1, mlan_802_11_ssid *ssid2) +static t_s32 woal_ssid_cmp(mlan_802_11_ssid *ssid1, mlan_802_11_ssid *ssid2) { ENTER(); @@ -79,8 +73,7 @@ woal_ssid_cmp(mlan_802_11_ssid *ssid1, mlan_802_11_ssid *ssid2) * * @return N/A */ -static inline void -woal_sort_channels(struct iw_freq *freq, int num) +static inline void woal_sort_channels(struct iw_freq *freq, int num) { int i, j; struct iw_freq temp; @@ -106,16 +99,15 @@ woal_sort_channels(struct iw_freq *freq, int num) * * @return Quality of the link (0-5) */ -static t_u8 -woal_rssi_to_quality(t_s16 rssi) +static t_u8 woal_rssi_to_quality(t_s16 rssi) { /** Macro for RSSI range */ #define MOAL_RSSI_NO_SIGNAL -90 -#define MOAL_RSSI_VERY_LOW -80 -#define MOAL_RSSI_LOW -70 -#define MOAL_RSSI_GOOD -60 +#define MOAL_RSSI_VERY_LOW -80 +#define MOAL_RSSI_LOW -70 +#define MOAL_RSSI_GOOD -60 #define MOAL_RSSI_VERY_GOOD -50 -#define MOAL_RSSI_INVALID 0 +#define MOAL_RSSI_INVALID 0 if (rssi <= MOAL_RSSI_NO_SIGNAL || rssi == MOAL_RSSI_INVALID) return 0; else if (rssi <= MOAL_RSSI_VERY_LOW) @@ -140,9 +132,8 @@ woal_rssi_to_quality(t_s16 rssi) * * @return 0 --success, otherwise fail */ -static int -woal_set_nick(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_set_nick(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { moal_private *priv = (moal_private *)netdev_priv(dev); ENTER(); @@ -170,9 +161,8 @@ woal_set_nick(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success */ -static int -woal_get_nick(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_get_nick(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { moal_private *priv = (moal_private *)netdev_priv(dev); ENTER(); @@ -203,9 +193,9 @@ woal_get_nick(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success */ -static int -woal_config_commit(struct net_device *dev, - struct iw_request_info *info, char *cwrq, char *extra) +static int woal_config_commit(struct net_device *dev, + struct iw_request_info *info, char *cwrq, + char *extra) { ENTER(); @@ -223,9 +213,8 @@ woal_config_commit(struct net_device *dev, * * @return 0 --success */ -static int -woal_get_name(struct net_device *dev, struct iw_request_info *info, - char *cwrq, char *extra) +static int woal_get_name(struct net_device *dev, struct iw_request_info *info, + char *cwrq, char *extra) { ENTER(); strcpy(cwrq, "IEEE 802.11-DS"); @@ -243,9 +232,8 @@ woal_get_name(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success, otherwise fail */ -static int -woal_set_freq(struct net_device *dev, struct iw_request_info *info, - struct iw_freq *fwrq, char *extra) +static int woal_set_freq(struct net_device *dev, struct iw_request_info *info, + struct iw_freq *fwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -299,9 +287,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_get_freq(struct net_device *dev, struct iw_request_info *info, - struct iw_freq *fwrq, char *extra) +static int woal_get_freq(struct net_device *dev, struct iw_request_info *info, + struct iw_freq *fwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -346,9 +333,9 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_bss_mode(struct net_device *dev, struct iw_request_info *info, - t_u32 *uwrq, char *extra) +static int woal_set_bss_mode(struct net_device *dev, + struct iw_request_info *info, t_u32 *uwrq, + char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -406,9 +393,8 @@ done: * * @return 0 --success */ -static int -woal_get_wap(struct net_device *dev, struct iw_request_info *info, - struct sockaddr *awrq, char *extra) +static int woal_get_wap(struct net_device *dev, struct iw_request_info *info, + struct sockaddr *awrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -443,17 +429,12 @@ woal_get_wap(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success, otherwise fail */ -static int -woal_set_wap(struct net_device *dev, struct iw_request_info *info, - struct sockaddr *awrq, char *extra) +static int woal_set_wap(struct net_device *dev, struct iw_request_info *info, + struct sockaddr *awrq, char *extra) { int ret = 0; - const t_u8 bcast[MLAN_MAC_ADDR_LENGTH] = { - 255, 255, 255, 255, 255, 255 - }; - const t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = { - 0, 0, 0, 0, 0, 0 - }; + const t_u8 bcast[MLAN_MAC_ADDR_LENGTH] = {255, 255, 255, 255, 255, 255}; + const t_u8 zero_mac[MLAN_MAC_ADDR_LENGTH] = {0, 0, 0, 0, 0, 0}; moal_private *priv = (moal_private *)netdev_priv(dev); mlan_ssid_bssid ssid_bssid; mlan_bss_info bss_info; @@ -473,6 +454,7 @@ woal_set_wap(struct net_device *dev, struct iw_request_info *info, ret = -EFAULT; goto done; } + #ifdef REASSOCIATION /* Cancel re-association */ priv->reassoc_required = MFALSE; @@ -498,9 +480,8 @@ woal_set_wap(struct net_device *dev, struct iw_request_info *info, ETH_ALEN, sizeof(ssid_bssid.bssid)); } - if (MLAN_STATUS_SUCCESS != woal_find_best_network(priv, - MOAL_IOCTL_WAIT, - &ssid_bssid)) { + if (MLAN_STATUS_SUCCESS != + woal_find_best_network(priv, MOAL_IOCTL_WAIT, &ssid_bssid)) { PRINTM(MERROR, "ASSOC: WAP: MAC address not found in BSSID List\n"); ret = -ENETUNREACH; @@ -508,17 +489,16 @@ woal_set_wap(struct net_device *dev, struct iw_request_info *info, } /* Zero SSID implies use BSSID to connect */ memset(&ssid_bssid.ssid, 0, sizeof(mlan_802_11_ssid)); - if (MLAN_STATUS_SUCCESS != woal_bss_start(priv, - MOAL_IOCTL_WAIT, - &ssid_bssid)) { + if (MLAN_STATUS_SUCCESS != + woal_bss_start(priv, MOAL_IOCTL_WAIT, &ssid_bssid)) { ret = -EFAULT; goto done; } + #ifdef REASSOCIATION memset(&bss_info, 0, sizeof(bss_info)); - if (MLAN_STATUS_SUCCESS != woal_get_bss_info(priv, - MOAL_IOCTL_WAIT, - &bss_info)) { + if (MLAN_STATUS_SUCCESS != + woal_get_bss_info(priv, MOAL_IOCTL_WAIT, &bss_info)) { ret = -EFAULT; goto done; } @@ -546,9 +526,9 @@ done: * * @return 0 --success */ -static int -woal_get_bss_mode(struct net_device *dev, struct iw_request_info *info, - t_u32 *uwrq, char *extra) +static int woal_get_bss_mode(struct net_device *dev, + struct iw_request_info *info, t_u32 *uwrq, + char *extra) { moal_private *priv = (moal_private *)netdev_priv(dev); ENTER(); @@ -567,9 +547,8 @@ woal_get_bss_mode(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success */ -static int -woal_set_sens(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_set_sens(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int ret = 0; @@ -589,9 +568,8 @@ woal_set_sens(struct net_device *dev, struct iw_request_info *info, * * @return -1 */ -static int -woal_get_sens(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_get_sens(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int ret = -1; @@ -611,9 +589,8 @@ woal_get_sens(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success, otherwise fail */ -static int -woal_set_txpow(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_set_txpow(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -654,9 +631,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_get_txpow(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_get_txpow(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -702,9 +678,8 @@ done: * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static int -woal_set_power(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_set_power(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int ret = 0, disabled; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -718,11 +693,9 @@ woal_set_power(struct net_device *dev, struct iw_request_info *info, } disabled = vwrq->disabled; - if (MLAN_STATUS_SUCCESS != woal_set_get_power_mgmt(priv, - MLAN_ACT_SET, - &disabled, - vwrq->flags, - MOAL_IOCTL_WAIT)) { + if (MLAN_STATUS_SUCCESS != + woal_set_get_power_mgmt(priv, MLAN_ACT_SET, &disabled, vwrq->flags, + MOAL_IOCTL_WAIT)) { ret = -EFAULT; } @@ -740,17 +713,15 @@ woal_set_power(struct net_device *dev, struct iw_request_info *info, * * @return MLAN_STATUS_SUCCESS --success, otherwise fail */ -static int -woal_get_power(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_get_power(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int ret = 0, ps_mode; moal_private *priv = (moal_private *)netdev_priv(dev); ENTER(); - if (MLAN_STATUS_SUCCESS != woal_set_get_power_mgmt(priv, - MLAN_ACT_GET, + if (MLAN_STATUS_SUCCESS != woal_set_get_power_mgmt(priv, MLAN_ACT_GET, &ps_mode, 0, MOAL_IOCTL_WAIT)) { ret = -EFAULT; @@ -777,9 +748,8 @@ woal_get_power(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success, otherwise fail */ -static int -woal_set_retry(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_set_retry(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int ret = 0, retry_val = vwrq->value; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -793,8 +763,8 @@ woal_set_retry(struct net_device *dev, struct iw_request_info *info, */ if (MLAN_STATUS_SUCCESS != - woal_set_get_retry(priv, MLAN_ACT_SET, - MOAL_IOCTL_WAIT, &retry_val)) { + woal_set_get_retry(priv, MLAN_ACT_SET, MOAL_IOCTL_WAIT, + &retry_val)) { ret = -EFAULT; goto done; } @@ -818,18 +788,17 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_get_retry(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_get_retry(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int retry_val, ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); ENTER(); - if (MLAN_STATUS_SUCCESS != - woal_set_get_retry(priv, MLAN_ACT_GET, - MOAL_IOCTL_WAIT, &retry_val)) { + if (MLAN_STATUS_SUCCESS != woal_set_get_retry(priv, MLAN_ACT_GET, + MOAL_IOCTL_WAIT, + &retry_val)) { ret = -EFAULT; goto done; } @@ -856,9 +825,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_encode(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_set_encode(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -981,9 +949,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_get_encode(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_get_encode(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1079,9 +1046,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_rate(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_set_rate(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1096,9 +1062,8 @@ woal_set_rate(struct net_device *dev, struct iw_request_info *info, rate_cfg.rate_type = MLAN_RATE_VALUE; rate_cfg.rate = vwrq->value / 500000; } - if (MLAN_STATUS_SUCCESS != woal_set_get_data_rate(priv, - MLAN_ACT_SET, - &rate_cfg)) { + if (MLAN_STATUS_SUCCESS != + woal_set_get_data_rate(priv, MLAN_ACT_SET, &rate_cfg)) { ret = -EFAULT; } @@ -1116,9 +1081,8 @@ woal_set_rate(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success, otherwise fail */ -static int -woal_get_rate(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_get_rate(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1126,9 +1090,8 @@ woal_get_rate(struct net_device *dev, struct iw_request_info *info, ENTER(); - if (MLAN_STATUS_SUCCESS != woal_set_get_data_rate(priv, - MLAN_ACT_GET, - &rate_cfg)) { + if (MLAN_STATUS_SUCCESS != + woal_set_get_data_rate(priv, MLAN_ACT_GET, &rate_cfg)) { ret = -EFAULT; goto done; } @@ -1153,9 +1116,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_rts(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_set_rts(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1193,9 +1155,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_get_rts(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_get_rts(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int rthr, ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1209,8 +1170,8 @@ woal_get_rts(struct net_device *dev, struct iw_request_info *info, } vwrq->value = rthr; - vwrq->disabled = ((vwrq->value < MLAN_RTS_MIN_VALUE) - || (vwrq->value > MLAN_RTS_MAX_VALUE)); + vwrq->disabled = ((vwrq->value < MLAN_RTS_MIN_VALUE) || + (vwrq->value > MLAN_RTS_MAX_VALUE)); vwrq->fixed = 1; done: @@ -1228,9 +1189,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_frag(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_set_frag(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1268,9 +1228,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_get_frag(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_get_frag(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int ret = 0, fthr; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1284,8 +1243,8 @@ woal_get_frag(struct net_device *dev, struct iw_request_info *info, } vwrq->value = fthr; - vwrq->disabled = ((vwrq->value < MLAN_FRAG_MIN_VALUE) - || (vwrq->value > MLAN_FRAG_MAX_VALUE)); + vwrq->disabled = ((vwrq->value < MLAN_FRAG_MIN_VALUE) || + (vwrq->value > MLAN_FRAG_MAX_VALUE)); vwrq->fixed = 1; done: @@ -1304,9 +1263,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_get_gen_ie(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_get_gen_ie(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1315,9 +1273,9 @@ woal_get_gen_ie(struct net_device *dev, struct iw_request_info *info, ENTER(); - if (MLAN_STATUS_SUCCESS != - woal_set_get_gen_ie(priv, MLAN_ACT_GET, ie, &ie_len, - MOAL_IOCTL_WAIT)) { + if (MLAN_STATUS_SUCCESS != woal_set_get_gen_ie(priv, MLAN_ACT_GET, ie, + &ie_len, + MOAL_IOCTL_WAIT)) { ret = -EFAULT; goto done; } @@ -1345,14 +1303,13 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_gen_ie(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_set_gen_ie(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); int ie_len = dwrq->length; - const t_u8 wps_oui[] = { 0x00, 0x50, 0xf2, 0x04 }; + const t_u8 wps_oui[] = {0x00, 0x50, 0xf2, 0x04}; mlan_ds_wps_cfg *pwps = NULL; mlan_ioctl_req *req = NULL; mlan_status status = MLAN_STATUS_SUCCESS; @@ -1380,9 +1337,9 @@ woal_set_gen_ie(struct net_device *dev, struct iw_request_info *info, } } - if (MLAN_STATUS_SUCCESS != - woal_set_get_gen_ie(priv, MLAN_ACT_SET, (t_u8 *)extra, &ie_len, - MOAL_IOCTL_WAIT)) { + if (MLAN_STATUS_SUCCESS != woal_set_get_gen_ie(priv, MLAN_ACT_SET, + (t_u8 *)extra, &ie_len, + MOAL_IOCTL_WAIT)) { ret = -EFAULT; goto done; } @@ -1405,10 +1362,9 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_encode_ext(struct net_device *dev, - struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_set_encode_ext(struct net_device *dev, + struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1491,16 +1447,17 @@ woal_set_encode_ext(struct net_device *dev, pkey_material, ext->key_len, sizeof(sec->param.encrypt_key.key_material)); PRINTM(MIOCTL, - "set wpa key key_index=%d, key_len=%d key_flags=0x%x " - MACSTR "\n", key_index, ext->key_len, + "set wpa key key_index=%d, key_len=%d key_flags=0x%x " MACSTR + "\n", + key_index, ext->key_len, sec->param.encrypt_key.key_flags, MAC2STR(sec->param.encrypt_key.mac_addr)); DBG_HEXDUMP(MCMD_D, "wpa key", pkey_material, ext->key_len); -#define IW_ENCODE_ALG_AES_CMAC 5 +#define IW_ENCODE_ALG_AES_CMAC 5 if (ext->alg == IW_ENCODE_ALG_AES_CMAC) sec->param.encrypt_key.key_flags |= KEY_FLAG_AES_MCAST_IGTK; -#define IW_ENCODE_ALG_SMS4 0x20 +#define IW_ENCODE_ALG_SMS4 0x20 /* Set WAPI key */ if (ext->alg == IW_ENCODE_ALG_SMS4) { sec->param.encrypt_key.is_wapi_key = MTRUE; @@ -1508,11 +1465,11 @@ woal_set_encode_ext(struct net_device *dev, sec->param.encrypt_key.pn, (t_u8 *)ext->tx_seq, SEQ_MAX_SIZE, sizeof(sec->param.encrypt_key.pn)); - moal_memcpy_ext(priv->phandle, - &sec->param.encrypt_key. - pn[SEQ_MAX_SIZE], (t_u8 *)ext->rx_seq, - SEQ_MAX_SIZE, - sizeof(sec->param.encrypt_key.pn) - + moal_memcpy_ext( + priv->phandle, + &sec->param.encrypt_key.pn[SEQ_MAX_SIZE], + (t_u8 *)ext->rx_seq, SEQ_MAX_SIZE, + sizeof(sec->param.encrypt_key.pn) - SEQ_MAX_SIZE); DBG_HEXDUMP(MCMD_D, "WAPI PN", sec->param.encrypt_key.pn, PN_SIZE); @@ -1538,10 +1495,9 @@ done: * * @return -EOPNOTSUPP */ -static int -woal_get_encode_ext(struct net_device *dev, - struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_get_encode_ext(struct net_device *dev, + struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { ENTER(); LEAVE(); @@ -1558,9 +1514,8 @@ woal_get_encode_ext(struct net_device *dev, * * @return 0--success, otherwise fail */ -static int -woal_set_mlme(struct net_device *dev, - struct iw_request_info *info, struct iw_point *dwrq, char *extra) +static int woal_set_mlme(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { struct iw_mlme *mlme = (struct iw_mlme *)extra; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1568,7 +1523,6 @@ woal_set_mlme(struct net_device *dev, ENTER(); if ((mlme->cmd == IW_MLME_DEAUTH) || (mlme->cmd == IW_MLME_DISASSOC)) { - if (MLAN_STATUS_SUCCESS != woal_disconnect(priv, MOAL_IOCTL_WAIT, (t_u8 *)mlme->addr.sa_data, @@ -1588,9 +1542,8 @@ woal_set_mlme(struct net_device *dev, * * @return 0 --success, otherwise fail */ -static int -woal_set_auth(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_set_auth(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1644,7 +1597,7 @@ woal_set_auth(struct net_device *dev, struct iw_request_info *info, woal_set_wpa_enable(priv, MOAL_IOCTL_WAIT, vwrq->value)) ret = -EFAULT; break; -#define IW_AUTH_WAPI_ENABLED 0x20 +#define IW_AUTH_WAPI_ENABLED 0x20 case IW_AUTH_WAPI_ENABLED: if (MLAN_STATUS_SUCCESS != woal_set_wapi_enable(priv, MOAL_IOCTL_WAIT, vwrq->value)) @@ -1685,9 +1638,8 @@ woal_set_auth(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success, otherwise fail */ -static int -woal_get_auth(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_get_auth(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1765,9 +1717,8 @@ done: * * @return -EOPNOTSUPP */ -static int -woal_set_pmksa(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_set_pmksa(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { ENTER(); LEAVE(); @@ -1796,9 +1747,8 @@ woal_set_pmksa(struct net_device *dev, struct iw_request_info *info, * * @return 0 --success, otherwise fail */ -static int -woal_get_range(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_get_range(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { int i; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -1810,7 +1760,7 @@ woal_get_range(struct net_device *dev, struct iw_request_info *info, ENTER(); - flag = (in_atomic() || irqs_disabled())? GFP_ATOMIC : GFP_KERNEL; + flag = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; pchan_list = kzalloc(sizeof(mlan_chan_list), flag); if (!pchan_list) { LEAVE(); @@ -1876,13 +1826,13 @@ woal_get_range(struct net_device *dev, struct iw_request_info *info, range->max_encoding_tokens = 4; /** Minimum power period */ -#define IW_POWER_PERIOD_MIN 1000000 /* 1 sec */ +#define IW_POWER_PERIOD_MIN 1000000 /* 1 sec */ /** Maximum power period */ -#define IW_POWER_PERIOD_MAX 120000000 /* 2 min */ +#define IW_POWER_PERIOD_MAX 120000000 /* 2 min */ /** Minimum power timeout value */ -#define IW_POWER_TIMEOUT_MIN 1000 /* 1 ms */ +#define IW_POWER_TIMEOUT_MIN 1000 /* 1 ms */ /** Maximim power timeout value */ -#define IW_POWER_TIMEOUT_MAX 1000000 /* 1 sec */ +#define IW_POWER_TIMEOUT_MAX 1000000 /* 1 sec */ /* Power Management duration & timeout */ range->min_pmp = IW_POWER_PERIOD_MIN; @@ -1944,9 +1894,8 @@ woal_get_range(struct net_device *dev, struct iw_request_info *info, range->txpower_capa = IW_TXPOW_DBM | IW_TXPOW_RANGE; #if (WIRELESS_EXT >= 18) - range->enc_capa = IW_ENC_CAPA_WPA | - IW_ENC_CAPA_WPA2 | - IW_ENC_CAPA_CIPHER_CCMP | IW_ENC_CAPA_CIPHER_TKIP; + range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 | + IW_ENC_CAPA_CIPHER_CCMP | IW_ENC_CAPA_CIPHER_TKIP; #endif LEAVE(); return 0; @@ -1961,8 +1910,7 @@ woal_get_range(struct net_device *dev, struct iw_request_info *info, * * @return 0 -- success, otherwise fail */ -static int -woal_set_rxfilter(moal_private *priv, BOOLEAN enable) +static int woal_set_rxfilter(moal_private *priv, BOOLEAN enable) { int ret = 0; mlan_ioctl_req *req = NULL; @@ -2008,9 +1956,8 @@ done: * * @return 0 --success, otherwise fail */ -static int -woal_set_priv(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_set_priv(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -2031,7 +1978,7 @@ woal_set_priv(struct net_device *dev, struct iw_request_info *info, ret = -EFAULT; goto done; } - flag = (in_atomic() || irqs_disabled())? GFP_ATOMIC : GFP_KERNEL; + flag = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; buf = kzalloc(dwrq->length + 1, flag); if (!buf) { ret = -ENOMEM; @@ -2041,8 +1988,10 @@ woal_set_priv(struct net_device *dev, struct iw_request_info *info, ret = -EFAULT; goto done; } + buf[dwrq->length] = '\0'; PRINTM(MIOCTL, "SIOCSIWPRIV request = %s\n", buf); - if (strncmp(buf, "RSSILOW-THRESHOLD", strlen("RSSILOW-THRESHOLD")) == 0) { + if (strncmp(buf, "RSSILOW-THRESHOLD", strlen("RSSILOW-THRESHOLD")) == + 0) { if (dwrq->length > strlen("RSSILOW-THRESHOLD") + 1) { pdata = buf + strlen("RSSILOW-THRESHOLD") + 1; if (MLAN_STATUS_SUCCESS != @@ -2057,9 +2006,8 @@ woal_set_priv(struct net_device *dev, struct iw_request_info *info, goto done; } } else if (strncmp(buf, "RSSI", strlen("RSSI")) == 0) { - if (MLAN_STATUS_SUCCESS != woal_get_bss_info(priv, - MOAL_IOCTL_WAIT, - &bss_info)) { + if (MLAN_STATUS_SUCCESS != + woal_get_bss_info(priv, MOAL_IOCTL_WAIT, &bss_info)) { ret = -EFAULT; goto done; } @@ -2071,7 +2019,8 @@ woal_set_priv(struct net_device *dev, struct iw_request_info *info, goto done; } len = sprintf(buf, "%s rssi %d\n", bss_info.ssid.ssid, - signal.bcn_rssi_avg) + 1; + signal.bcn_rssi_avg) + + 1; } else { len = sprintf(buf, "OK\n") + 1; } @@ -2083,12 +2032,14 @@ woal_set_priv(struct net_device *dev, struct iw_request_info *info, } PRINTM(MIOCTL, "tx rate=%d\n", (int)rate.rate); len = sprintf(buf, "LinkSpeed %d\n", - (int)(rate.rate * 500000 / 1000000)) + 1; + (int)(rate.rate * 500000 / 1000000)) + + 1; } else if (strncmp(buf, "MACADDR", strlen("MACADDR")) == 0) { len = sprintf(buf, "Macaddr = %02X:%02X:%02X:%02X:%02X:%02X\n", priv->current_addr[0], priv->current_addr[1], priv->current_addr[2], priv->current_addr[3], - priv->current_addr[4], priv->current_addr[5]) + 1; + priv->current_addr[4], priv->current_addr[5]) + + 1; } else if (strncmp(buf, "GETPOWER", strlen("GETPOWER")) == 0) { if (MLAN_STATUS_SUCCESS != woal_get_powermode(priv, &power_mode)) { @@ -2171,20 +2122,22 @@ woal_set_priv(struct net_device *dev, struct iw_request_info *info, len = sprintf(buf, "OK\n") + 1; } else if (strncmp(buf, "STOP", strlen("STOP")) == 0) { len = sprintf(buf, "OK\n") + 1; - } else if (strncmp(buf, "SETSUSPENDOPT", strlen("SETSUSPENDOPT")) == 0) { + } else if (strncmp(buf, "SETSUSPENDOPT", strlen("SETSUSPENDOPT")) == + 0) { /* it will be done by GUI */ len = sprintf(buf, "OK\n") + 1; } else if (strncmp(buf, "BTCOEXMODE", strlen("BTCOEXMODE")) == 0) { len = sprintf(buf, "OK\n") + 1; - } else if (strncmp(buf, "BTCOEXSCAN-START", strlen("BTCOEXSCAN-START")) - == 0) { + } else if (strncmp(buf, "BTCOEXSCAN-START", + strlen("BTCOEXSCAN-START")) == 0) { len = sprintf(buf, "OK\n") + 1; } else if (strncmp(buf, "BTCOEXSCAN-STOP", strlen("BTCOEXSCAN-STOP")) == 0) { len = sprintf(buf, "OK\n") + 1; } else if (strncmp(buf, "BGSCAN-START", strlen("BGSCAN-START")) == 0) { len = sprintf(buf, "OK\n") + 1; - } else if (strncmp(buf, "BGSCAN-CONFIG", strlen("BGSCAN-CONFIG")) == 0) { + } else if (strncmp(buf, "BGSCAN-CONFIG", strlen("BGSCAN-CONFIG")) == + 0) { if (MLAN_STATUS_SUCCESS != woal_set_bg_scan(priv, buf, dwrq->length)) { ret = -EFAULT; @@ -2212,7 +2165,8 @@ woal_set_priv(struct net_device *dev, struct iw_request_info *info, goto done; #endif len = sprintf(buf, "OK\n") + 1; - } else if (strncmp(buf, "RXFILTER-STOP", strlen("RXFILTER-STOP")) == 0) { + } else if (strncmp(buf, "RXFILTER-STOP", strlen("RXFILTER-STOP")) == + 0) { #ifdef MEF_CFG_RX_FILTER ret = woal_set_rxfilter(priv, MFALSE); if (ret) @@ -2296,9 +2250,8 @@ done: * * @return MLAN_STATUS_SUCCESS -- success, otherwise fail */ -mlan_status -woal_wext_request_scan(moal_private *priv, - t_u8 wait_option, mlan_802_11_ssid *req_ssid) +mlan_status woal_wext_request_scan(moal_private *priv, t_u8 wait_option, + mlan_802_11_ssid *req_ssid) { wlan_user_scan_cfg scan_req; mlan_scan_cfg scan_cfg; @@ -2320,7 +2273,7 @@ woal_wext_request_scan(moal_private *priv, scan_req.scan_chan_gap = scan_cfg.scan_chan_gap; else scan_req.scan_chan_gap = priv->phandle->scan_chan_gap; - /** indicate FW, gap is optional */ + /** indicate FW, gap is optional */ if (scan_req.scan_chan_gap && priv->phandle->pref_mac) scan_req.scan_chan_gap |= GAP_FLAG_OPTIONAL; LEAVE(); @@ -2337,9 +2290,8 @@ woal_wext_request_scan(moal_private *priv, * * @return 0--success, otherwise fail */ -static int -woal_set_scan(struct net_device *dev, struct iw_request_info *info, - struct iw_param *vwrq, char *extra) +static int woal_set_scan(struct net_device *dev, struct iw_request_info *info, + struct iw_param *vwrq, char *extra) { int ret = 0; moal_private *priv = (moal_private *)netdev_priv(dev); @@ -2373,11 +2325,10 @@ woal_set_scan(struct net_device *dev, struct iw_request_info *info, req = (struct iw_scan_req *)extra; if (req->essid_len <= MLAN_MAX_SSID_LENGTH) { - req_ssid.ssid_len = req->essid_len; moal_memcpy_ext(priv->phandle, req_ssid.ssid, - (t_u8 *)req->essid, - req->essid_len, sizeof(req_ssid.ssid)); + (t_u8 *)req->essid, req->essid_len, + sizeof(req_ssid.ssid)); if (MLAN_STATUS_SUCCESS != woal_wext_request_scan(priv, MOAL_NO_WAIT, &req_ssid)) { @@ -2420,9 +2371,8 @@ done: * * @return 0--success, otherwise fail */ -static int -woal_set_essid(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_set_essid(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_802_11_ssid req_ssid; @@ -2517,7 +2467,6 @@ woal_set_essid(struct net_device *dev, struct iw_request_info *info, } } } - } mode = woal_get_mode(priv, MOAL_IOCTL_WAIT); @@ -2559,17 +2508,16 @@ woal_set_essid(struct net_device *dev, struct iw_request_info *info, /* Connect to BSS by ESSID */ memset(&ssid_bssid.bssid, 0, MLAN_MAC_ADDR_LENGTH); - if (MLAN_STATUS_SUCCESS != woal_bss_start(priv, - MOAL_IOCTL_WAIT, - &ssid_bssid)) { + if (MLAN_STATUS_SUCCESS != + woal_bss_start(priv, MOAL_IOCTL_WAIT, &ssid_bssid)) { ret = -EFAULT; goto setessid_ret; } + #ifdef REASSOCIATION memset(&bss_info, 0, sizeof(bss_info)); - if (MLAN_STATUS_SUCCESS != woal_get_bss_info(priv, - MOAL_IOCTL_WAIT, - &bss_info)) { + if (MLAN_STATUS_SUCCESS != + woal_get_bss_info(priv, MOAL_IOCTL_WAIT, &bss_info)) { ret = -EFAULT; goto setessid_ret; } @@ -2601,9 +2549,8 @@ setessid_ret: * * @return 0--success, otherwise fail */ -static int -woal_get_essid(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_get_essid(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { moal_private *priv = (moal_private *)netdev_priv(dev); mlan_bss_info bss_info; @@ -2646,16 +2593,15 @@ done: * * @return 0--success, otherwise fail */ -static int -woal_get_scan(struct net_device *dev, struct iw_request_info *info, - struct iw_point *dwrq, char *extra) +static int woal_get_scan(struct net_device *dev, struct iw_request_info *info, + struct iw_point *dwrq, char *extra) { moal_private *priv = (moal_private *)netdev_priv(dev); int ret = 0; char *current_ev = extra; char *end_buf = extra + IW_SCAN_MAX_DATA; - char *current_val; /* For rates */ - struct iw_event iwe; /* Temporary buffer */ + char *current_val; /* For rates */ + struct iw_event iwe; /* Temporary buffer */ unsigned int i; unsigned int j; mlan_scan_resp scan_resp; @@ -2680,7 +2626,7 @@ woal_get_scan(struct net_device *dev, struct iw_request_info *info, LEAVE(); return -EAGAIN; } - flag = (in_atomic() || irqs_disabled())? GFP_ATOMIC : GFP_KERNEL; + flag = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; buf = kzalloc((buf_size), flag); if (!buf) { PRINTM(MERROR, "Cannot allocate buffer!\n"); @@ -2695,9 +2641,8 @@ woal_get_scan(struct net_device *dev, struct iw_request_info *info, goto done; } memset(&scan_resp, 0, sizeof(scan_resp)); - if (MLAN_STATUS_SUCCESS != woal_get_scan_table(priv, - MOAL_IOCTL_WAIT, - &scan_resp)) { + if (MLAN_STATUS_SUCCESS != + woal_get_scan_table(priv, MOAL_IOCTL_WAIT, &scan_resp)) { ret = -EFAULT; goto done; } @@ -2719,8 +2664,9 @@ woal_get_scan(struct net_device *dev, struct iw_request_info *info, if ((current_ev + MAX_SCAN_CELL_SIZE) >= end_buf) { PRINTM(MINFO, "i=%d break out: current_ev=%p end_buf=%p " - "MAX_SCAN_CELL_SIZE=%d\n", i, current_ev, - end_buf, (t_u32)MAX_SCAN_CELL_SIZE); + "MAX_SCAN_CELL_SIZE=%d\n", + i, current_ev, end_buf, + (t_u32)MAX_SCAN_CELL_SIZE); ret = -E2BIG; break; } @@ -2732,7 +2678,8 @@ woal_get_scan(struct net_device *dev, struct iw_request_info *info, PRINTM(MINFO, "i=%d Ssid: %-32s\n", i, scan_table[i].ssid.ssid); - /* check ssid is valid or not, ex. hidden ssid will be filter out */ + /* check ssid is valid or not, ex. hidden ssid will be filter + * out */ if (woal_ssid_valid(&scan_table[i].ssid) == MFALSE) continue; @@ -2744,9 +2691,8 @@ woal_get_scan(struct net_device *dev, struct iw_request_info *info, sizeof(iwe.u.ap_addr.sa_data)); iwe.len = IW_EV_ADDR_LEN; - current_ev = - IWE_STREAM_ADD_EVENT(info, current_ev, end_buf, &iwe, - iwe.len); + current_ev = IWE_STREAM_ADD_EVENT(info, current_ev, end_buf, + &iwe, iwe.len); /* Add the ESSID */ iwe.u.data.length = scan_table[i].ssid.ssid_len; @@ -2771,9 +2717,8 @@ woal_get_scan(struct net_device *dev, struct iw_request_info *info, iwe.u.mode = IW_MODE_AUTO; iwe.len = IW_EV_UINT_LEN; - current_ev = - IWE_STREAM_ADD_EVENT(info, current_ev, end_buf, &iwe, - iwe.len); + current_ev = IWE_STREAM_ADD_EVENT(info, current_ev, end_buf, + &iwe, iwe.len); /* Frequency */ iwe.cmd = SIOCGIWFREQ; @@ -2781,9 +2726,8 @@ woal_get_scan(struct net_device *dev, struct iw_request_info *info, iwe.u.freq.e = 6; iwe.u.freq.flags = IW_FREQ_FIXED; iwe.len = IW_EV_FREQ_LEN; - current_ev = - IWE_STREAM_ADD_EVENT(info, current_ev, end_buf, &iwe, - iwe.len); + current_ev = IWE_STREAM_ADD_EVENT(info, current_ev, end_buf, + &iwe, iwe.len); memset(&iwe, 0, sizeof(iwe)); /* Add quality statistics */ @@ -2795,8 +2739,8 @@ woal_get_scan(struct net_device *dev, struct iw_request_info *info, iwe.u.qual.noise = bss_info.bcn_nf_last; if ((bss_info.bss_mode == MLAN_BSS_MODE_IBSS) && - !woal_ssid_cmp(&bss_info.ssid, &scan_table[i].ssid) - && bss_info.adhoc_state == ADHOC_STARTED) { + !woal_ssid_cmp(&bss_info.ssid, &scan_table[i].ssid) && + bss_info.adhoc_state == ADHOC_STARTED) { memset(&rssi, 0, sizeof(mlan_ds_get_signal)); if (MLAN_STATUS_SUCCESS != woal_get_signal_info(priv, MOAL_IOCTL_WAIT, @@ -2809,9 +2753,8 @@ woal_get_scan(struct net_device *dev, struct iw_request_info *info, iwe.u.qual.qual = woal_rssi_to_quality((t_s16)(iwe.u.qual.level - 0x100)); iwe.len = IW_EV_QUAL_LEN; - current_ev = - IWE_STREAM_ADD_EVENT(info, current_ev, end_buf, &iwe, - iwe.len); + current_ev = IWE_STREAM_ADD_EVENT(info, current_ev, end_buf, + &iwe, iwe.len); /* Add encryption capability */ iwe.cmd = SIOCGIWENCODE; @@ -2822,9 +2765,8 @@ woal_get_scan(struct net_device *dev, struct iw_request_info *info, iwe.u.data.length = 0; iwe.len = IW_EV_POINT_LEN + iwe.u.data.length; - current_ev = - IWE_STREAM_ADD_POINT(info, current_ev, end_buf, &iwe, - NULL); + current_ev = IWE_STREAM_ADD_POINT(info, current_ev, end_buf, + &iwe, NULL); current_val = current_ev + IW_EV_LCP_LEN; @@ -2843,21 +2785,18 @@ woal_get_scan(struct net_device *dev, struct iw_request_info *info, (scan_table[i].supported_rates[j] & 0x7f) * 500000; iwe.len = IW_EV_PARAM_LEN; - current_val = - IWE_STREAM_ADD_VALUE(info, current_ev, - current_val, end_buf, &iwe, - iwe.len); - + current_val = IWE_STREAM_ADD_VALUE(info, current_ev, + current_val, end_buf, + &iwe, iwe.len); } if ((bss_info.bss_mode == MLAN_BSS_MODE_IBSS) && - !woal_ssid_cmp(&bss_info.ssid, &scan_table[i].ssid) - && bss_info.adhoc_state == ADHOC_STARTED) { + !woal_ssid_cmp(&bss_info.ssid, &scan_table[i].ssid) && + bss_info.adhoc_state == ADHOC_STARTED) { iwe.u.bitrate.value = 22 * 500000; iwe.len = IW_EV_PARAM_LEN; - current_val = - IWE_STREAM_ADD_VALUE(info, current_ev, - current_val, end_buf, &iwe, - iwe.len); + current_val = IWE_STREAM_ADD_VALUE(info, current_ev, + current_val, end_buf, + &iwe, iwe.len); } /* Check if an event is added */ @@ -2873,9 +2812,8 @@ woal_get_scan(struct net_device *dev, struct iw_request_info *info, iwe.u.data.length = strlen(buf); iwe.cmd = IWEVCUSTOM; iwe.len = IW_EV_POINT_LEN + iwe.u.data.length; - current_ev = - IWE_STREAM_ADD_POINT(info, current_ev, end_buf, &iwe, - buf); + current_ev = IWE_STREAM_ADD_POINT(info, current_ev, end_buf, + &iwe, buf); current_val = current_ev + IW_EV_LCP_LEN + strlen(buf); /* Parse and send the IEs */ @@ -2885,21 +2823,20 @@ woal_get_scan(struct net_device *dev, struct iw_request_info *info, /* Skip time stamp, beacon interval and capability */ if (pbeacon) { pbeacon += sizeof(scan_table[i].beacon_period) + - sizeof(scan_table[i].time_stamp) + - sizeof(scan_table[i].cap_info); + sizeof(scan_table[i].time_stamp) + + sizeof(scan_table[i].cap_info); beacon_size -= sizeof(scan_table[i].beacon_period) + - sizeof(scan_table[i].time_stamp) + - sizeof(scan_table[i].cap_info); + sizeof(scan_table[i].time_stamp) + + sizeof(scan_table[i].cap_info); while ((unsigned int)beacon_size >= sizeof(IEEEtypes_Header_t)) { - element_id = - (IEEEtypes_ElementId_e)(*(t_u8 *) - pbeacon); + element_id = (IEEEtypes_ElementId_e)( + *(t_u8 *)pbeacon); element_len = *((t_u8 *)pbeacon + 1); if ((unsigned int)beacon_size < (unsigned int)element_len + - sizeof(IEEEtypes_Header_t)) { + sizeof(IEEEtypes_Header_t)) { PRINTM(MERROR, "Get scan: Error in processing IE, " "bytes left < IE length\n"); @@ -2915,40 +2852,35 @@ woal_get_scan(struct net_device *dev, struct iw_request_info *info, memset(&iwe, 0, sizeof(iwe)); memset(buf, 0, buf_size); ptr = buf; - moal_memcpy_ext(priv->phandle, buf, - praw_data, - element_len + - sizeof - (IEEEtypes_Header_t), - buf_size); + moal_memcpy_ext( + priv->phandle, buf, praw_data, + element_len + + sizeof(IEEEtypes_Header_t), + buf_size); iwe.cmd = IWEVGENIE; iwe.u.data.length = element_len + sizeof(IEEEtypes_Header_t); - iwe.len = - IW_EV_POINT_LEN + - iwe.u.data.length; - current_ev = - IWE_STREAM_ADD_POINT(info, - current_ev, - end_buf, - &iwe, buf); - current_val = - current_ev + IW_EV_LCP_LEN + - strlen(buf); + iwe.len = IW_EV_POINT_LEN + + iwe.u.data.length; + current_ev = IWE_STREAM_ADD_POINT( + info, current_ev, end_buf, &iwe, + buf); + current_val = current_ev + + IW_EV_LCP_LEN + + strlen(buf); break; #endif default: break; } - pbeacon += - element_len + - sizeof(IEEEtypes_Header_t); - beacon_size -= - element_len + - sizeof(IEEEtypes_Header_t); + pbeacon += element_len + + sizeof(IEEEtypes_Header_t); + beacon_size -= element_len + + sizeof(IEEEtypes_Header_t); } } + #if WIRELESS_EXT > 14 memset(&iwe, 0, sizeof(iwe)); memset(buf, 0, buf_size); @@ -2964,9 +2896,8 @@ woal_get_scan(struct net_device *dev, struct iw_request_info *info, PRINTM(MINFO, "BUF: %s\n", buf); iwe.cmd = IWEVCUSTOM; iwe.len = IW_EV_POINT_LEN + iwe.u.data.length; - current_ev = - IWE_STREAM_ADD_POINT(info, current_ev, end_buf, &iwe, - buf); + current_ev = IWE_STREAM_ADD_POINT(info, current_ev, end_buf, + &iwe, buf); current_val = current_ev + IW_EV_LCP_LEN + strlen(buf); #endif current_val = current_ev + IW_EV_LCP_LEN; @@ -2992,86 +2923,86 @@ done: * iwconfig settable callbacks */ static const iw_handler woal_handler[] = { - (iw_handler) woal_config_commit, /* SIOCSIWCOMMIT */ - (iw_handler) woal_get_name, /* SIOCGIWNAME */ - (iw_handler) NULL, /* SIOCSIWNWID */ - (iw_handler) NULL, /* SIOCGIWNWID */ - (iw_handler) woal_set_freq, /* SIOCSIWFREQ */ - (iw_handler) woal_get_freq, /* SIOCGIWFREQ */ - (iw_handler) woal_set_bss_mode, /* SIOCSIWMODE */ - (iw_handler) woal_get_bss_mode, /* SIOCGIWMODE */ - (iw_handler) woal_set_sens, /* SIOCSIWSENS */ - (iw_handler) woal_get_sens, /* SIOCGIWSENS */ - (iw_handler) NULL, /* SIOCSIWRANGE */ - (iw_handler) woal_get_range, /* SIOCGIWRANGE */ - (iw_handler) woal_set_priv, /* SIOCSIWPRIV */ - (iw_handler) NULL, /* SIOCGIWPRIV */ - (iw_handler) NULL, /* SIOCSIWSTATS */ - (iw_handler) NULL, /* SIOCGIWSTATS */ + (iw_handler)woal_config_commit, /* SIOCSIWCOMMIT */ + (iw_handler)woal_get_name, /* SIOCGIWNAME */ + (iw_handler)NULL, /* SIOCSIWNWID */ + (iw_handler)NULL, /* SIOCGIWNWID */ + (iw_handler)woal_set_freq, /* SIOCSIWFREQ */ + (iw_handler)woal_get_freq, /* SIOCGIWFREQ */ + (iw_handler)woal_set_bss_mode, /* SIOCSIWMODE */ + (iw_handler)woal_get_bss_mode, /* SIOCGIWMODE */ + (iw_handler)woal_set_sens, /* SIOCSIWSENS */ + (iw_handler)woal_get_sens, /* SIOCGIWSENS */ + (iw_handler)NULL, /* SIOCSIWRANGE */ + (iw_handler)woal_get_range, /* SIOCGIWRANGE */ + (iw_handler)woal_set_priv, /* SIOCSIWPRIV */ + (iw_handler)NULL, /* SIOCGIWPRIV */ + (iw_handler)NULL, /* SIOCSIWSTATS */ + (iw_handler)NULL, /* SIOCGIWSTATS */ #if WIRELESS_EXT > 15 #ifdef CONFIG_WEXT_SPY - iw_handler_set_spy, /* SIOCSIWSPY */ - iw_handler_get_spy, /* SIOCGIWSPY */ - iw_handler_set_thrspy, /* SIOCSIWTHRSPY */ - iw_handler_get_thrspy, /* SIOCGIWTHRSPY */ + iw_handler_set_spy, /* SIOCSIWSPY */ + iw_handler_get_spy, /* SIOCGIWSPY */ + iw_handler_set_thrspy, /* SIOCSIWTHRSPY */ + iw_handler_get_thrspy, /* SIOCGIWTHRSPY */ #else - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ #endif #else /* WIRELESS_EXT > 15 */ - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ #endif /* WIRELESS_EXT > 15 */ - (iw_handler) woal_set_wap, /* SIOCSIWAP */ - (iw_handler) woal_get_wap, /* SIOCGIWAP */ + (iw_handler)woal_set_wap, /* SIOCSIWAP */ + (iw_handler)woal_get_wap, /* SIOCGIWAP */ #if WIRELESS_EXT >= 18 - (iw_handler) woal_set_mlme, /* SIOCSIWMLME */ + (iw_handler)woal_set_mlme, /* SIOCSIWMLME */ #else - (iw_handler) NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ #endif - /* (iw_handler) wlan_get_aplist, *//* SIOCGIWAPLIST */ - NULL, /* SIOCGIWAPLIST */ + /* (iw_handler) wlan_get_aplist, */ /* SIOCGIWAPLIST */ + NULL, /* SIOCGIWAPLIST */ #if WIRELESS_EXT > 13 - (iw_handler) woal_set_scan, /* SIOCSIWSCAN */ - (iw_handler) woal_get_scan, /* SIOCGIWSCAN */ + (iw_handler)woal_set_scan, /* SIOCSIWSCAN */ + (iw_handler)woal_get_scan, /* SIOCGIWSCAN */ #else /* WIRELESS_EXT > 13 */ - (iw_handler) NULL, /* SIOCSIWSCAN */ - (iw_handler) NULL, /* SIOCGIWSCAN */ + (iw_handler)NULL, /* SIOCSIWSCAN */ + (iw_handler)NULL, /* SIOCGIWSCAN */ #endif /* WIRELESS_EXT > 13 */ - (iw_handler) woal_set_essid, /* SIOCSIWESSID */ - (iw_handler) woal_get_essid, /* SIOCGIWESSID */ - (iw_handler) woal_set_nick, /* SIOCSIWNICKN */ - (iw_handler) woal_get_nick, /* SIOCGIWNICKN */ - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) woal_set_rate, /* SIOCSIWRATE */ - (iw_handler) woal_get_rate, /* SIOCGIWRATE */ - (iw_handler) woal_set_rts, /* SIOCSIWRTS */ - (iw_handler) woal_get_rts, /* SIOCGIWRTS */ - (iw_handler) woal_set_frag, /* SIOCSIWFRAG */ - (iw_handler) woal_get_frag, /* SIOCGIWFRAG */ - (iw_handler) woal_set_txpow, /* SIOCSIWTXPOW */ - (iw_handler) woal_get_txpow, /* SIOCGIWTXPOW */ - (iw_handler) woal_set_retry, /* SIOCSIWRETRY */ - (iw_handler) woal_get_retry, /* SIOCGIWRETRY */ - (iw_handler) woal_set_encode, /* SIOCSIWENCODE */ - (iw_handler) woal_get_encode, /* SIOCGIWENCODE */ - (iw_handler) woal_set_power, /* SIOCSIWPOWER */ - (iw_handler) woal_get_power, /* SIOCGIWPOWER */ + (iw_handler)woal_set_essid, /* SIOCSIWESSID */ + (iw_handler)woal_get_essid, /* SIOCGIWESSID */ + (iw_handler)woal_set_nick, /* SIOCSIWNICKN */ + (iw_handler)woal_get_nick, /* SIOCGIWNICKN */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)woal_set_rate, /* SIOCSIWRATE */ + (iw_handler)woal_get_rate, /* SIOCGIWRATE */ + (iw_handler)woal_set_rts, /* SIOCSIWRTS */ + (iw_handler)woal_get_rts, /* SIOCGIWRTS */ + (iw_handler)woal_set_frag, /* SIOCSIWFRAG */ + (iw_handler)woal_get_frag, /* SIOCGIWFRAG */ + (iw_handler)woal_set_txpow, /* SIOCSIWTXPOW */ + (iw_handler)woal_get_txpow, /* SIOCGIWTXPOW */ + (iw_handler)woal_set_retry, /* SIOCSIWRETRY */ + (iw_handler)woal_get_retry, /* SIOCGIWRETRY */ + (iw_handler)woal_set_encode, /* SIOCSIWENCODE */ + (iw_handler)woal_get_encode, /* SIOCGIWENCODE */ + (iw_handler)woal_set_power, /* SIOCSIWPOWER */ + (iw_handler)woal_get_power, /* SIOCGIWPOWER */ #if (WIRELESS_EXT >= 18) - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) NULL, /* -- hole -- */ - (iw_handler) woal_set_gen_ie, /* SIOCSIWGENIE */ - (iw_handler) woal_get_gen_ie, /* SIOCGIWGENIE */ - (iw_handler) woal_set_auth, /* SIOCSIWAUTH */ - (iw_handler) woal_get_auth, /* SIOCGIWAUTH */ - (iw_handler) woal_set_encode_ext, /* SIOCSIWENCODEEXT */ - (iw_handler) woal_get_encode_ext, /* SIOCGIWENCODEEXT */ - (iw_handler) woal_set_pmksa, /* SIOCSIWPMKSA */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)NULL, /* -- hole -- */ + (iw_handler)woal_set_gen_ie, /* SIOCSIWGENIE */ + (iw_handler)woal_get_gen_ie, /* SIOCGIWGENIE */ + (iw_handler)woal_set_auth, /* SIOCSIWAUTH */ + (iw_handler)woal_get_auth, /* SIOCGIWAUTH */ + (iw_handler)woal_set_encode_ext, /* SIOCSIWENCODEEXT */ + (iw_handler)woal_get_encode_ext, /* SIOCGIWENCODEEXT */ + (iw_handler)woal_set_pmksa, /* SIOCSIWPMKSA */ #endif /* WIRELESSS_EXT >= 18 */ }; @@ -3079,7 +3010,7 @@ static const iw_handler woal_handler[] = { * iwpriv settable callbacks */ static const iw_handler woal_private_handler[] = { - NULL, /* SIOCIWFIRSTPRIV */ + NULL, /* SIOCIWFIRSTPRIV */ }; #endif /* STA_SUPPORT */ @@ -3097,8 +3028,7 @@ static const iw_handler woal_private_handler[] = { * * @return N/A */ -void -woal_send_iwevcustom_event(moal_private *priv, char *str) +void woal_send_iwevcustom_event(moal_private *priv, char *str) { union iwreq_data iwrq; char buf[IW_CUSTOM_MAX]; @@ -3131,8 +3061,7 @@ woal_send_iwevcustom_event(moal_private *priv, char *str) * * @return N/A */ -void -woal_send_mic_error_event(moal_private *priv, t_u32 event) +void woal_send_mic_error_event(moal_private *priv, t_u32 event) { union iwreq_data iwrq; struct iw_michaelmicfailure mic; @@ -3156,19 +3085,21 @@ woal_send_mic_error_event(moal_private *priv, t_u32 event) } #endif +// clang-format off #ifdef STA_SUPPORT /** wlan_handler_def */ struct iw_handler_def woal_handler_def = { -num_standard:ARRAY_SIZE(woal_handler), -num_private:ARRAY_SIZE(woal_private_handler), -num_private_args:ARRAY_SIZE(woal_private_args), -standard:(iw_handler *) woal_handler, -private:(iw_handler *) woal_private_handler, -private_args:(struct iw_priv_args *)woal_private_args, + num_standard: ARRAY_SIZE(woal_handler), + num_private : ARRAY_SIZE(woal_private_handler), + num_private_args : ARRAY_SIZE(woal_private_args), + standard : (iw_handler *)woal_handler, + private : (iw_handler *)woal_private_handler, + private_args : (struct iw_priv_args *)woal_private_args, #if WIRELESS_EXT > 20 -get_wireless_stats:woal_get_wireless_stats, + get_wireless_stats : woal_get_wireless_stats, #endif }; +// clang-format on /** * @brief Get wireless statistics @@ -3177,8 +3108,7 @@ get_wireless_stats:woal_get_wireless_stats, * * @return A pointer to iw_statistics buf */ -struct iw_statistics * -woal_get_wireless_stats(struct net_device *dev) +struct iw_statistics *woal_get_wireless_stats(struct net_device *dev) { moal_private *priv = (moal_private *)netdev_priv(dev); t_u16 wait_option = MOAL_IOCTL_WAIT; @@ -3205,10 +3135,8 @@ woal_get_wireless_stats(struct net_device *dev) if (priv->media_connected == MTRUE) { if (MLAN_STATUS_SUCCESS == woal_get_signal_info(priv, wait_option, NULL)) - priv->w_stats.qual.qual = - woal_rssi_to_quality((t_s16) - (priv->w_stats.qual.level - - 0x100)); + priv->w_stats.qual.qual = woal_rssi_to_quality( + (t_s16)(priv->w_stats.qual.level - 0x100)); } #if WIRELESS_EXT > 18 priv->w_stats.qual.updated |= (IW_QUAL_ALL_UPDATED | IW_QUAL_DBM); @@ -3222,7 +3150,8 @@ woal_get_wireless_stats(struct net_device *dev) PRINTM(MINFO, "Signal Level = %#x\n", priv->w_stats.qual.level); PRINTM(MINFO, "Noise = %#x\n", priv->w_stats.qual.noise); priv->w_stats.discard.code = 0; - woal_get_stats_info(priv, wait_option, NULL); + if (MLAN_STATUS_SUCCESS != woal_get_stats_info(priv, wait_option, NULL)) + PRINTM(MERROR, "Error getting stats information\n"); LEAVE(); return &priv->w_stats; diff --git a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_wext.h b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_wext.h index f1e572d0de0a..f363f2f0a99d 100644 --- a/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_wext.h +++ b/drivers/net/wireless/nxp/mxm_wifiex/wlan_src/mlinux/moal_wext.h @@ -2,23 +2,23 @@ * * @brief This file contains definition for wireless extension IOCTL call. * - * - * Copyright 2014-2020 NXP - * - * This software file (the File) is distributed by NXP - * under the terms of the GNU General Public License Version 2, June 1991 - * (the License). You may use, redistribute and/or modify the 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 - * this warranty disclaimer. - * - */ + * + * Copyright 2014-2020 NXP + * + * This software file (the File) is distributed by NXP + * under the terms of the GNU General Public License Version 2, June 1991 + * (the License). You may use, redistribute and/or modify the 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 + * this warranty disclaimer. + * + */ /******************************************************** Change log: @@ -29,22 +29,28 @@ Change log: #define _WOAL_WEXT_H_ /** NF value for default scan */ -#define MRVDRV_NF_DEFAULT_SCAN_VALUE (-96) +#define MRVDRV_NF_DEFAULT_SCAN_VALUE (-96) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) /** Add event */ -#define IWE_STREAM_ADD_EVENT(i, c, e, w, l) iwe_stream_add_event((i), (c), (e), (w), (l)) +#define IWE_STREAM_ADD_EVENT(i, c, e, w, l) \ + iwe_stream_add_event((i), (c), (e), (w), (l)) /** Add point */ -#define IWE_STREAM_ADD_POINT(i, c, e, w, p) iwe_stream_add_point((i), (c), (e), (w), (p)) +#define IWE_STREAM_ADD_POINT(i, c, e, w, p) \ + iwe_stream_add_point((i), (c), (e), (w), (p)) /** Add value */ -#define IWE_STREAM_ADD_VALUE(i, c, v, e, w, l) iwe_stream_add_value((i), (c), (v), (e), (w), (l)) +#define IWE_STREAM_ADD_VALUE(i, c, v, e, w, l) \ + iwe_stream_add_value((i), (c), (v), (e), (w), (l)) #else /** Add event */ -#define IWE_STREAM_ADD_EVENT(i, c, e, w, l) iwe_stream_add_event((c), (e), (w), (l)) +#define IWE_STREAM_ADD_EVENT(i, c, e, w, l) \ + iwe_stream_add_event((c), (e), (w), (l)) /** Add point */ -#define IWE_STREAM_ADD_POINT(i, c, e, w, p) iwe_stream_add_point((c), (e), (w), (p)) +#define IWE_STREAM_ADD_POINT(i, c, e, w, p) \ + iwe_stream_add_point((c), (e), (w), (p)) /** Add value */ -#define IWE_STREAM_ADD_VALUE(i, c, v, e, w, l) iwe_stream_add_value((c), (v), (e), (w), (l)) +#define IWE_STREAM_ADD_VALUE(i, c, v, e, w, l) \ + iwe_stream_add_value((c), (v), (e), (w), (l)) #endif extern struct iw_handler_def woal_handler_def;