mir/rtl88x2bu
2
0
Fork 0
mirror of https://github.com/cilynx/rtl88x2bu synced 2025-08-22 02:01:55 +00:00
Code Issues Projects Releases Wiki Activity

Remove trailing whitespaces

Browse Source 
This commit removes all trailing whitespaces by a Bash oneliner:

    find -type f | grep -v '\.git' | xargs sed -i 's/\s\+$//'
This commit is contained in:
Max Görner 2018-11-19 21:24:50 +01:00
parent a0b115d65a
commit 7d06cdc54a
100 changed files with 4675 additions and 4675 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -111,7 +111,7 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y
###################### MP HW TX MODE FOR VHT #######################
CONFIG_MP_VHT_HW_TX_MODE = n
###################### Platform Related #######################
CONFIG_PLATFORM_ARM_NV_NANO = n
CONFIG_PLATFORM_ARM_NV_NANO = n
CONFIG_PLATFORM_I386_PC = y
CONFIG_PLATFORM_ARM_RPI = n
CONFIG_PLATFORM_ANDROID_X86 = n
@ -1199,7 +1199,7 @@ endif
ifeq ($(CONFIG_LED_CONTROL), y)
EXTRA_CFLAGS += -DCONFIG_LED_CONTROL
ifeq ($(CONFIG_RTL8822B), y)
EXTRA_CFLAGS += -DCONFIG_SW_LED
EXTRA_CFLAGS += -DCONFIG_SW_LED
endif
ifeq ($(CONFIG_LED_ENABLE), y)
EXTRA_CFLAGS += -DCONFIG_LED_ENABLE

4
README.md
View File

@ -138,8 +138,8 @@ EOF
$ iwconfig
wlx74ee2ae24062 IEEE 802.11an ESSID:"borg" Nickname:"<WIFI@REALTEK>"
Mode:Master Frequency:5.18 GHz Access Point: 74:EE:2A:E2:40:62
Bit Rate:144.4 Mb/s Sensitivity:0/0
Mode:Master Frequency:5.18 GHz Access Point: 74:EE:2A:E2:40:62
Bit Rate:144.4 Mb/s Sensitivity:0/0
Retry:off RTS thr:off Fragment thr:off
Power Management:off
Link Quality=0/100 Signal level=-100 dBm Noise level=0 dBm

12
core/efuse/rtw_efuse.c
View File

@ -931,7 +931,7 @@ void EFUSE_GetEfuseDefinition(PADAPTER adapter, u8 efusetype, u8 type, void *out
*(u16 *)out = (u16)v32;
return;
case TYPE_EFUSE_REAL_CONTENT_LEN:
case TYPE_EFUSE_REAL_CONTENT_LEN:
rtw_halmac_get_physical_efuse_size(d, &v32);
*(u16 *)out = (u16)v32;
return;
@ -1035,7 +1035,7 @@ u8 rtw_efuse_bt_access(PADAPTER adapter, u8 write, u16 addr, u16 cnts, u8 *data)
if (efuse) {
err = rtw_halmac_read_bt_physical_efuse_map(d, efuse, size);
if (err == -1) {
RTW_ERR("%s: rtw_halmac_read_bt_physical_efuse_map fail!\n", __FUNCTION__);
rtw_mfree(efuse, size);
@ -1309,7 +1309,7 @@ VOID hal_ReadEFuse_BT_logic_map(
if (rtw_efuse_bt_access(padapter, _FALSE, 0, EFUSE_BT_REAL_CONTENT_LEN, phyefuse))
dump_buf(phyefuse, EFUSE_BT_REAL_BANK_CONTENT_LEN);
total = BANK_NUM;
for (bank = 1; bank <= total; bank++) { /* 8723d Max bake 0~2 */
eFuse_Addr = 0;
@ -1472,7 +1472,7 @@ static u8 hal_EfusePgPacketWrite2ByteHeader(
/* RTW_INFO("%s: pg_header=0x%x\n", __FUNCTION__, pg_header); */
do {
rtw_efuse_bt_access(padapter, _TRUE, efuse_addr, 1, &pg_header);
rtw_efuse_bt_access(padapter, _FALSE, efuse_addr, 1, &tmp_header);
@ -1680,7 +1680,7 @@ u8 efuse_OneByteRead(struct _ADAPTER *a, u16 addr, u8 *data, u8 bPseudoTest)
}
return ret;
}
static u16
@ -3093,7 +3093,7 @@ u8 rtw_efuse_file_read(PADAPTER padapter, u8 *filepatch, u8 *buf, u32 len)
while ((j < len) && (i < count)) {
if (ptmpbuf[i] == '\0')
break;
ptr = strpbrk(&ptmpbuf[i], " \t\n\r");
if (ptr) {
if (ptr == &ptmpbuf[i]) {

40
core/mesh/rtw_mesh.c
View File

@ -198,7 +198,7 @@ int rtw_bss_is_candidate_mesh_peer(WLAN_BSSID_EX *self, WLAN_BSSID_EX *target, u
/* BSSBasicRateSet */
for (i = 0; i < NDIS_802_11_LENGTH_RATES_EX; i++) {
if (target->SupportedRates[i] == 0)
break;
break;
if (target->SupportedRates[i] & 0x80) {
u8 match = 0;
@ -208,7 +208,7 @@ int rtw_bss_is_candidate_mesh_peer(WLAN_BSSID_EX *self, WLAN_BSSID_EX *target, u
match = rtw_is_basic_rate_ofdm(target->SupportedRates[i]);
else
match = rtw_is_basic_rate_mix(target->SupportedRates[i]);
} else {
} else {
for (j = 0; j < NDIS_802_11_LENGTH_RATES_EX; j++) {
if (self->SupportedRates[j] == 0)
break;
@ -796,7 +796,7 @@ void rtw_mesh_peer_status_chk(_adapter *adapter)
if (rtw_mesh_cto_mgate_required(adapter)) {
flush = 1;
goto flush_add;
}
}
}
} else {
SET_CTO_MGATE_CONF_DISABLED(plink);
@ -953,7 +953,7 @@ exit:
}
/*
* this function is called under off channel candidate is required
* this function is called under off channel candidate is required
* the channel with maximum candidate count is selected
*/
u8 rtw_mesh_select_operating_ch(_adapter *adapter)
@ -1191,7 +1191,7 @@ void rtw_mesh_sae_check_frames(_adapter *adapter, const u8 *buf, u32 len, u8 tx,
#ifdef CONFIG_RTW_MESH_AEK
static int rtw_mpm_ampe_dec(_adapter *adapter, struct mesh_plink_ent *plink
, u8 *fhead, size_t flen, u8* fbody, u8 *mic_ie, u8 *ampe_buf)
{
{
int ret = _FAIL, verify_ret;
const u8 *aad[] = {adapter_mac_addr(adapter), plink->addr, fbody};
const size_t aad_len[] = {ETH_ALEN, ETH_ALEN, mic_ie - fbody};
@ -1317,7 +1317,7 @@ static int rtw_mpm_tx_ies_sync_bss(_adapter *adapter, struct mesh_plink_ent *pli
pos = BSS_EX_TLV_IES(network);
while (left >= 2) {
u8 id, elen;
id = *pos++;
elen = *pos++;
left -= 2;
@ -1359,7 +1359,7 @@ static int rtw_mpm_tx_ies_sync_bss(_adapter *adapter, struct mesh_plink_ent *pli
pos = BSS_EX_TLV_IES(network);
while (left >= 2) {
u8 id, elen;
id = *pos++;
elen = *pos++;
left -= 2;
@ -1729,7 +1729,7 @@ bypass_sync_bss:
plink->rx_conf_ies = ies;
plink->rx_conf_ies_len = ies_len;
}
#ifdef CONFIG_RTW_MESH_DRIVER_AID
#ifdef CONFIG_RTW_MESH_DRIVER_AID
else {
plink->tx_conf_ies = ies;
plink->tx_conf_ies_len = ies_len;
@ -2433,7 +2433,7 @@ int rtw_mesh_peer_establish(_adapter *adapter, struct mesh_plink_ent *plink, str
if (rtw_ap_parse_sta_supported_rates(adapter, sta, tlv_ies, tlv_ieslen) != _STATS_SUCCESSFUL_)
goto exit;
if (rtw_ap_parse_sta_security_ie(adapter, sta, &elems) != _STATS_SUCCESSFUL_)
goto exit;
@ -3082,11 +3082,11 @@ void rtw_mesh_init_mesh_info(_adapter *adapter)
_rtw_memset(minfo, 0, sizeof(struct rtw_mesh_info));
rtw_mesh_plink_ctl_init(adapter);
minfo->last_preq = rtw_get_current_time();
/* minfo->last_sn_update = rtw_get_current_time(); */
minfo->next_perr = rtw_get_current_time();
ATOMIC_SET(&minfo->mpaths, 0);
rtw_mesh_pathtbl_init(adapter);
@ -3099,7 +3099,7 @@ void rtw_mesh_init_mesh_info(_adapter *adapter)
_rtw_init_listhead(&minfo->preq_queue.list);
_rtw_spinlock_init(&minfo->mesh_preq_queue_lock);
rtw_init_timer(&adapter->mesh_path_timer, adapter, rtw_ieee80211_mesh_path_timer, adapter);
rtw_init_timer(&adapter->mesh_path_root_timer, adapter, rtw_ieee80211_mesh_path_root_timer, adapter);
rtw_init_timer(&adapter->mesh_atlm_param_req_timer, adapter, rtw_mesh_atlm_param_req_timer, adapter);
@ -3260,7 +3260,7 @@ static bool rtw_mesh_data_bmc_to_uc(_adapter *adapter
sta = LIST_CONTAINOR(list, struct sta_info, asoc_list);
list = get_next(list);
stainfo_offset = rtw_stainfo_offset(stapriv, sta);
if (stainfo_offset_valid(stainfo_offset))
b2u_sta_id[b2u_sta_num++] = stainfo_offset;
@ -3342,7 +3342,7 @@ int rtw_mesh_addr_resolve(_adapter *adapter, struct xmit_frame *xframe, _pkt *pk
res = _FAIL;
goto exit;
}
xframe->pkt = pkt;
#if CONFIG_RTW_MESH_DATA_BMC_TO_UC
_rtw_init_listhead(b2u_list);
@ -3350,9 +3350,9 @@ int rtw_mesh_addr_resolve(_adapter *adapter, struct xmit_frame *xframe, _pkt *pk
is_da_mcast = IS_MCAST(etherhdr.h_dest);
if (!is_da_mcast) {
struct sta_info *next_hop;
struct sta_info *next_hop;
bool mpp_lookup = 1;
mpath = rtw_mesh_path_lookup(adapter, etherhdr.h_dest);
if (mpath) {
mpp_lookup = 0;
@ -3452,7 +3452,7 @@ s8 rtw_mesh_tx_set_whdr_mctrl_len(u8 mesh_frame_mode, struct pkt_attrib *attrib)
RTW_WARN("Invalid mesh frame mode:%u\n", mesh_frame_mode);
ret = -1;
break;
}
}
return ret;
}
@ -3538,7 +3538,7 @@ u8 rtw_mesh_tx_build_whdr(_adapter *adapter, struct pkt_attrib *attrib
RTW_WARN("Invalid mesh frame mode\n");
break;
}
return 0;
}
@ -3681,7 +3681,7 @@ int rtw_mesh_rx_data_validate_mctrl(_adapter *adapter, union recv_frame *rframe
} else
*mctrl_len = mlen;
return ret;
return ret;
}
inline int rtw_mesh_rx_validate_mctrl_non_amsdu(_adapter *adapter, union recv_frame *rframe)
@ -3766,7 +3766,7 @@ int rtw_mesh_rx_msdu_act_check(union recv_frame *rframe
struct rtw_mesh_info *minfo = &adapter->mesh_info;
struct rx_pkt_attrib *rattrib = &rframe->u.hdr.attrib;
struct rtw_mesh_path *mppath;
u8 is_mda_bmc = IS_MCAST(mda);
u8 is_mda_bmc = IS_MCAST(mda);
u8 is_mda_self = !is_mda_bmc && _rtw_memcmp(mda, adapter_mac_addr(adapter), ETH_ALEN);
struct xmit_frame *xframe;
struct pkt_attrib *xattrib;

2
core/mesh/rtw_mesh.h
View File

@ -376,7 +376,7 @@ struct rtw_mesh_info {
systime next_perr;
/* Last used Path Discovery ID */
u32 preq_id;
ATOMIC_T mpaths;
struct rtw_mesh_table *mesh_paths;
struct rtw_mesh_table *mpp_paths;

10
core/mesh/rtw_mesh_hwmp.c
View File

@ -210,7 +210,7 @@ static int rtw_mesh_path_sel_frame_tx(enum rtw_mpath_frame_type mpath_action, u8
const u8 *originator_addr, u32 originator_sn,
u8 target_flags, const u8 *target,
u32 target_sn, const u8 *da, u8 hopcount, u8 ttl,
u32 lifetime, u32 metric, u32 preq_id,
u32 lifetime, u32 metric, u32 preq_id,
_adapter *adapter)
{
struct xmit_priv *pxmitpriv = &(adapter->xmitpriv);
@ -390,7 +390,7 @@ int rtw_mesh_path_error_tx(_adapter *adapter,
dump_mgntframe(adapter, pmgntframe);
RTW_HWMP_DBG("TX PERR toward "MAC_FMT", ra = "MAC_FMT"\n", MAC_ARG(target), MAC_ARG(ra));
return 0;
}
@ -616,7 +616,7 @@ void rtw_ieee80211s_update_metric(_adapter *adapter, u8 mac_id,
sta->metrics.total_pkt = total_pkt;
rtw_ewma_err_rate_add(&sta->metrics.err_rate, per);
if (rtw_ewma_err_rate_read(&sta->metrics.err_rate) >
if (rtw_ewma_err_rate_read(&sta->metrics.err_rate) >
RTW_LINK_FAIL_THRESH)
rtw_mesh_plink_broken(sta);
}
@ -1018,7 +1018,7 @@ static void rtw_hwmp_rann_frame_process(_adapter *adapter,
_rtw_memcpy(path->add_chk_rann_snd_addr,
path->rann_snd_addr, ETH_ALEN);
preq_node_flag |= RTW_PREQ_Q_F_CHK;
}
#endif
rtw_mesh_queue_preq(path, preq_node_flag);
@ -1159,7 +1159,7 @@ static u32 rtw_hwmp_route_info_get(_adapter *adapter,
rtw_mesh_path_activate(path);
#ifdef CONFIG_RTW_MESH_ADD_ROOT_CHK
if (path->is_root && (action == RTW_MPATH_PREP)) {
_rtw_memcpy(path->rann_snd_addr,
_rtw_memcpy(path->rann_snd_addr,
mgmt->addr2, ETH_ALEN);
path->rann_metric = new_metric;
}

2
core/mesh/rtw_mesh_pathtbl.c
View File

@ -829,7 +829,7 @@ static void rtw_table_flush_by_iface(struct rtw_mesh_table *tbl)
if (!tbl)
return;
ret = rtw_rhashtable_walk_enter(&tbl->rhead, &iter);
if (ret)
return;

2
core/mesh/rtw_mesh_pathtbl.h
View File

@ -42,7 +42,7 @@
* With this flag, It will try the last used rann_snd_addr
* @RTW_MESH_PATH_PEER_AKA: only used toward a peer, only used in active keep
* alive mechanism. PREQ's da = path dst
*
*
* RTW_MESH_PATH_RESOLVED is used by the mesh path timer to
* decide when to stop or cancel the mesh path discovery.
*/

18
core/rtw_ap.c
View File

@ -59,7 +59,7 @@ u8 rtw_set_tim_ie(u8 dtim_cnt, u8 dtim_period
if (tim_bmp[i])
break;
n1 = i & 0xFE;
/* find the last nonzero octet in tim_bitmap, except octet 0 */
for (i = tim_bmp_len - 1; i > 0; i--)
if (tim_bmp[i])
@ -359,7 +359,7 @@ static void rtw_check_restore_rf18(_adapter *padapter)
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
u32 reg;
u8 union_ch = 0, union_bw = 0, union_offset = 0, setchbw = _FALSE;
reg = rtw_hal_read_rfreg(padapter, 0, 0x18, 0x3FF);
if ((reg & 0xFF) == 0)
setchbw = _TRUE;
@ -1515,7 +1515,7 @@ static void rtw_ap_check_scan(_adapter *padapter)
if (_FALSE == ATOMIC_READ(&pmlmepriv->olbc_ht))
ATOMIC_SET(&pmlmepriv->olbc_ht, _TRUE);
if (padapter->registrypriv.wifi_spec)
RTW_INFO("%s: %s is a/b/g ap\n", __func__, pnetwork->network.Ssid.Ssid);
}
@ -1732,7 +1732,7 @@ chbw_decision:
#ifdef CONFIG_MCC_MODE
if (MCC_EN(padapter)) {
/*
/*
* due to check under rtw_ap_chbw_decision
* if under MCC mode, means req channel setting is the same as current channel setting
* if not under MCC mode, mean req channel setting is not the same as current channel setting
@ -2044,7 +2044,7 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len)
pbss_network->IELength = pbss_network->IELength - *(p+1) - 2;
ret_rm = rtw_ies_remove_ie(ie , &len, _BEACON_IE_OFFSET_, _ERPINFO_IE_,NULL,0);
RTW_DBG("%s, remove_ie of ERP_IE=%d\n", __FUNCTION__, ret_rm);
} else
} else
ERP_IE_handler(padapter, (PNDIS_802_11_VARIABLE_IEs)p);
}
@ -2075,7 +2075,7 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len)
psecuritypriv->wpa2_pairwise_cipher = pairwise_cipher;
/*
Kernel < v5.1, the auth_type set as NL80211_AUTHTYPE_AUTOMATIC
Kernel < v5.1, the auth_type set as NL80211_AUTHTYPE_AUTOMATIC
in cfg80211_rtw_start_ap().
if the AKM SAE in the RSN IE, we have to update the auth_type for SAE
in rtw_check_beacon_data().
@ -4704,7 +4704,7 @@ u8 rtw_ap_chbw_decision(_adapter *adapter, u8 ifbmp, u8 excl_ifbmp
rtw_hal_set_mcc_setting_disconnect(adapter);
}
}
}
}
#endif /* CONFIG_MCC_MODE */
@ -4827,7 +4827,7 @@ u8 rtw_ap_chbw_decision(_adapter *adapter, u8 ifbmp, u8 excl_ifbmp
u8 tmp_ch = dec_ch[i];
u8 tmp_bw = dec_bw[i];
u8 tmp_offset = dec_offset[i];
rtw_adjust_chbw(adapter, tmp_ch, &tmp_bw, &tmp_offset);
rtw_get_offset_by_chbw(tmp_ch, tmp_bw, &tmp_offset);
@ -5256,7 +5256,7 @@ u16 rtw_ap_parse_sta_security_ie(_adapter *adapter, struct sta_info *sta, struct
sta->flags |= WLAN_STA_MFP;
} else
#endif
if ((sec->mfp_opt == MFP_REQUIRED && mfp_opt == MFP_NO) || mfp_opt == MFP_INVALID)
if ((sec->mfp_opt == MFP_REQUIRED && mfp_opt == MFP_NO) || mfp_opt == MFP_INVALID)
status = WLAN_STATUS_ROBUST_MGMT_FRAME_POLICY_VIOLATION;
else if (sec->mfp_opt >= MFP_OPTIONAL && mfp_opt >= MFP_OPTIONAL)
sta->flags |= WLAN_STA_MFP;

2
core/rtw_btcoex.c
View File

@ -506,7 +506,7 @@ u8 rtw_btcoex_get_ant_div_cfg(PADAPTER padapter)
PHAL_DATA_TYPE pHalData;
pHalData = GET_HAL_DATA(padapter);
return (pHalData->AntDivCfg == 0) ? _FALSE : _TRUE;
}

2368
core/rtw_chplan.c
View File

File diff suppressed because it is too large Load Diff

358
core/rtw_chplan.h
View File

@ -1,179 +1,179 @@
/******************************************************************************
*
* Copyright(c) 2007 - 2018 Realtek Corporation.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
*****************************************************************************/
#ifndef __RTW_CHPLAN_H__
#define __RTW_CHPLAN_H__
enum rtw_chplan_id {
/* ===== 0x00 ~ 0x1F, legacy channel plan ===== */
RTW_CHPLAN_FCC = 0x00,
RTW_CHPLAN_IC = 0x01,
RTW_CHPLAN_ETSI = 0x02,
RTW_CHPLAN_SPAIN = 0x03,
RTW_CHPLAN_FRANCE = 0x04,
RTW_CHPLAN_MKK = 0x05,
RTW_CHPLAN_MKK1 = 0x06,
RTW_CHPLAN_ISRAEL = 0x07,
RTW_CHPLAN_TELEC = 0x08,
RTW_CHPLAN_GLOBAL_DOAMIN = 0x09,
RTW_CHPLAN_WORLD_WIDE_13 = 0x0A,
RTW_CHPLAN_TAIWAN = 0x0B,
RTW_CHPLAN_CHINA = 0x0C,
RTW_CHPLAN_SINGAPORE_INDIA_MEXICO = 0x0D,
RTW_CHPLAN_KOREA = 0x0E,
RTW_CHPLAN_TURKEY = 0x0F,
RTW_CHPLAN_JAPAN = 0x10,
RTW_CHPLAN_FCC_NO_DFS = 0x11,
RTW_CHPLAN_JAPAN_NO_DFS = 0x12,
RTW_CHPLAN_WORLD_WIDE_5G = 0x13,
RTW_CHPLAN_TAIWAN_NO_DFS = 0x14,
/* ===== 0x20 ~ 0x7F, new channel plan ===== */
RTW_CHPLAN_WORLD_NULL = 0x20,
RTW_CHPLAN_ETSI1_NULL = 0x21,
RTW_CHPLAN_FCC1_NULL = 0x22,
RTW_CHPLAN_MKK1_NULL = 0x23,
RTW_CHPLAN_ETSI2_NULL = 0x24,
RTW_CHPLAN_FCC1_FCC1 = 0x25,
RTW_CHPLAN_WORLD_ETSI1 = 0x26,
RTW_CHPLAN_MKK1_MKK1 = 0x27,
RTW_CHPLAN_WORLD_KCC1 = 0x28,
RTW_CHPLAN_WORLD_FCC2 = 0x29,
RTW_CHPLAN_FCC2_NULL = 0x2A,
RTW_CHPLAN_IC1_IC2 = 0x2B,
RTW_CHPLAN_MKK2_NULL = 0x2C,
RTW_CHPLAN_WORLD_CHILE1= 0x2D,
RTW_CHPLAN_WORLD1_WORLD1 = 0x2E,
RTW_CHPLAN_WORLD_CHILE2 = 0x2F,
RTW_CHPLAN_WORLD_FCC3 = 0x30,
RTW_CHPLAN_WORLD_FCC4 = 0x31,
RTW_CHPLAN_WORLD_FCC5 = 0x32,
RTW_CHPLAN_WORLD_FCC6 = 0x33,
RTW_CHPLAN_FCC1_FCC7 = 0x34,
RTW_CHPLAN_WORLD_ETSI2 = 0x35,
RTW_CHPLAN_WORLD_ETSI3 = 0x36,
RTW_CHPLAN_MKK1_MKK2 = 0x37,
RTW_CHPLAN_MKK1_MKK3 = 0x38,
RTW_CHPLAN_FCC1_NCC1 = 0x39,
RTW_CHPLAN_ETSI1_ETSI1 = 0x3A,
RTW_CHPLAN_ETSI1_ACMA1 = 0x3B,
RTW_CHPLAN_ETSI1_ETSI6 = 0x3C,
RTW_CHPLAN_ETSI1_ETSI12 = 0x3D,
RTW_CHPLAN_KCC1_KCC2 = 0x3E,
RTW_CHPLAN_FCC1_NCC2 = 0x40,
RTW_CHPLAN_GLOBAL_NULL = 0x41,
RTW_CHPLAN_ETSI1_ETSI4 = 0x42,
RTW_CHPLAN_FCC1_FCC2 = 0x43,
RTW_CHPLAN_FCC1_NCC3 = 0x44,
RTW_CHPLAN_WORLD_ACMA1 = 0x45,
RTW_CHPLAN_FCC1_FCC8 = 0x46,
RTW_CHPLAN_WORLD_ETSI6 = 0x47,
RTW_CHPLAN_WORLD_ETSI7 = 0x48,
RTW_CHPLAN_WORLD_ETSI8 = 0x49,
RTW_CHPLAN_WORLD_ETSI9 = 0x50,
RTW_CHPLAN_WORLD_ETSI10 = 0x51,
RTW_CHPLAN_WORLD_ETSI11 = 0x52,
RTW_CHPLAN_FCC1_NCC4 = 0x53,
RTW_CHPLAN_WORLD_ETSI12 = 0x54,
RTW_CHPLAN_FCC1_FCC9 = 0x55,
RTW_CHPLAN_WORLD_ETSI13 = 0x56,
RTW_CHPLAN_FCC1_FCC10 = 0x57,
RTW_CHPLAN_MKK2_MKK4 = 0x58,
RTW_CHPLAN_WORLD_ETSI14 = 0x59,
RTW_CHPLAN_FCC1_FCC5 = 0x60,
RTW_CHPLAN_FCC2_FCC7 = 0x61,
RTW_CHPLAN_FCC2_FCC1 = 0x62,
RTW_CHPLAN_WORLD_ETSI15 = 0x63,
RTW_CHPLAN_MKK2_MKK5 = 0x64,
RTW_CHPLAN_ETSI1_ETSI16 = 0x65,
RTW_CHPLAN_FCC1_FCC14 = 0x66,
RTW_CHPLAN_FCC1_FCC12 = 0x67,
RTW_CHPLAN_FCC2_FCC14 = 0x68,
RTW_CHPLAN_FCC2_FCC12 = 0x69,
RTW_CHPLAN_ETSI1_ETSI17 = 0x6A,
RTW_CHPLAN_WORLD_FCC16 = 0x6B,
RTW_CHPLAN_WORLD_FCC13 = 0x6C,
RTW_CHPLAN_FCC2_FCC15 = 0x6D,
RTW_CHPLAN_WORLD_FCC12 = 0x6E,
RTW_CHPLAN_NULL_ETSI8 = 0x6F,
RTW_CHPLAN_NULL_ETSI18 = 0x70,
RTW_CHPLAN_NULL_ETSI17 = 0x71,
RTW_CHPLAN_NULL_ETSI19 = 0x72,
RTW_CHPLAN_WORLD_FCC7 = 0x73,
RTW_CHPLAN_FCC2_FCC17 = 0x74,
RTW_CHPLAN_WORLD_ETSI20 = 0x75,
RTW_CHPLAN_FCC2_FCC11 = 0x76,
RTW_CHPLAN_WORLD_ETSI21 = 0x77,
RTW_CHPLAN_FCC1_FCC18 = 0x78,
RTW_CHPLAN_MKK2_MKK1 = 0x79,
RTW_CHPLAN_MAX,
RTW_CHPLAN_REALTEK_DEFINE = 0x7F,
RTW_CHPLAN_UNSPECIFIED = 0xFF,
};
u8 rtw_chplan_get_default_regd(u8 id);
bool rtw_chplan_is_empty(u8 id);
#define rtw_is_channel_plan_valid(chplan) (((chplan) < RTW_CHPLAN_MAX || (chplan) == RTW_CHPLAN_REALTEK_DEFINE) && !rtw_chplan_is_empty(chplan))
#define rtw_is_legacy_channel_plan(chplan) ((chplan) < 0x20)
struct _RT_CHANNEL_INFO;
u8 init_channel_set(_adapter *padapter, u8 ChannelPlan, struct _RT_CHANNEL_INFO *channel_set);
#define IS_ALPHA2_NO_SPECIFIED(_alpha2) ((*((u16 *)(_alpha2))) == 0xFFFF)
#define RTW_MODULE_RTL8821AE_HMC_M2 BIT0 /* RTL8821AE(HMC + M.2) */
#define RTW_MODULE_RTL8821AU BIT1 /* RTL8821AU */
#define RTW_MODULE_RTL8812AENF_NGFF BIT2 /* RTL8812AENF(8812AE+8761)_NGFF */
#define RTW_MODULE_RTL8812AEBT_HMC BIT3 /* RTL8812AEBT(8812AE+8761)_HMC */
#define RTW_MODULE_RTL8188EE_HMC_M2 BIT4 /* RTL8188EE(HMC + M.2) */
#define RTW_MODULE_RTL8723BE_HMC_M2 BIT5 /* RTL8723BE(HMC + M.2) */
#define RTW_MODULE_RTL8723BS_NGFF1216 BIT6 /* RTL8723BS(NGFF1216) */
#define RTW_MODULE_RTL8192EEBT_HMC_M2 BIT7 /* RTL8192EEBT(8192EE+8761AU)_(HMC + M.2) */
#define RTW_MODULE_RTL8723DE_NGFF1630 BIT8 /* RTL8723DE(NGFF1630) */
#define RTW_MODULE_RTL8822BE BIT9 /* RTL8822BE */
#define RTW_MODULE_RTL8821CE BIT10 /* RTL8821CE */
struct country_chplan {
char alpha2[2];
u8 chplan;
#ifdef CONFIG_80211AC_VHT
u8 en_11ac;
#endif
#if RTW_DEF_MODULE_REGULATORY_CERT
u16 def_module_flags; /* RTW_MODULE_RTLXXX */
#endif
};
#ifdef CONFIG_80211AC_VHT
#define COUNTRY_CHPLAN_EN_11AC(_ent) ((_ent)->en_11ac)
#else
#define COUNTRY_CHPLAN_EN_11AC(_ent) 0
#endif
#if RTW_DEF_MODULE_REGULATORY_CERT
#define COUNTRY_CHPLAN_DEF_MODULE_FALGS(_ent) ((_ent)->def_module_flags)
#else
#define COUNTRY_CHPLAN_DEF_MODULE_FALGS(_ent) 0
#endif
const struct country_chplan *rtw_get_chplan_from_country(const char *country_code);
void dump_country_chplan(void *sel, const struct country_chplan *ent);
void dump_country_chplan_map(void *sel);
void dump_chplan_id_list(void *sel);
void dump_chplan_test(void *sel);
void dump_chplan_ver(void *sel);
#endif /* __RTW_CHPLAN_H__ */
/******************************************************************************
*
* Copyright(c) 2007 - 2018 Realtek Corporation.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
*****************************************************************************/
#ifndef __RTW_CHPLAN_H__
#define __RTW_CHPLAN_H__
enum rtw_chplan_id {
/* ===== 0x00 ~ 0x1F, legacy channel plan ===== */
RTW_CHPLAN_FCC = 0x00,
RTW_CHPLAN_IC = 0x01,
RTW_CHPLAN_ETSI = 0x02,
RTW_CHPLAN_SPAIN = 0x03,
RTW_CHPLAN_FRANCE = 0x04,
RTW_CHPLAN_MKK = 0x05,
RTW_CHPLAN_MKK1 = 0x06,
RTW_CHPLAN_ISRAEL = 0x07,
RTW_CHPLAN_TELEC = 0x08,
RTW_CHPLAN_GLOBAL_DOAMIN = 0x09,
RTW_CHPLAN_WORLD_WIDE_13 = 0x0A,
RTW_CHPLAN_TAIWAN = 0x0B,
RTW_CHPLAN_CHINA = 0x0C,
RTW_CHPLAN_SINGAPORE_INDIA_MEXICO = 0x0D,
RTW_CHPLAN_KOREA = 0x0E,
RTW_CHPLAN_TURKEY = 0x0F,
RTW_CHPLAN_JAPAN = 0x10,
RTW_CHPLAN_FCC_NO_DFS = 0x11,
RTW_CHPLAN_JAPAN_NO_DFS = 0x12,
RTW_CHPLAN_WORLD_WIDE_5G = 0x13,
RTW_CHPLAN_TAIWAN_NO_DFS = 0x14,
/* ===== 0x20 ~ 0x7F, new channel plan ===== */
RTW_CHPLAN_WORLD_NULL = 0x20,
RTW_CHPLAN_ETSI1_NULL = 0x21,
RTW_CHPLAN_FCC1_NULL = 0x22,
RTW_CHPLAN_MKK1_NULL = 0x23,
RTW_CHPLAN_ETSI2_NULL = 0x24,
RTW_CHPLAN_FCC1_FCC1 = 0x25,
RTW_CHPLAN_WORLD_ETSI1 = 0x26,
RTW_CHPLAN_MKK1_MKK1 = 0x27,
RTW_CHPLAN_WORLD_KCC1 = 0x28,
RTW_CHPLAN_WORLD_FCC2 = 0x29,
RTW_CHPLAN_FCC2_NULL = 0x2A,
RTW_CHPLAN_IC1_IC2 = 0x2B,
RTW_CHPLAN_MKK2_NULL = 0x2C,
RTW_CHPLAN_WORLD_CHILE1= 0x2D,
RTW_CHPLAN_WORLD1_WORLD1 = 0x2E,
RTW_CHPLAN_WORLD_CHILE2 = 0x2F,
RTW_CHPLAN_WORLD_FCC3 = 0x30,
RTW_CHPLAN_WORLD_FCC4 = 0x31,
RTW_CHPLAN_WORLD_FCC5 = 0x32,
RTW_CHPLAN_WORLD_FCC6 = 0x33,
RTW_CHPLAN_FCC1_FCC7 = 0x34,
RTW_CHPLAN_WORLD_ETSI2 = 0x35,
RTW_CHPLAN_WORLD_ETSI3 = 0x36,
RTW_CHPLAN_MKK1_MKK2 = 0x37,
RTW_CHPLAN_MKK1_MKK3 = 0x38,
RTW_CHPLAN_FCC1_NCC1 = 0x39,
RTW_CHPLAN_ETSI1_ETSI1 = 0x3A,
RTW_CHPLAN_ETSI1_ACMA1 = 0x3B,
RTW_CHPLAN_ETSI1_ETSI6 = 0x3C,
RTW_CHPLAN_ETSI1_ETSI12 = 0x3D,
RTW_CHPLAN_KCC1_KCC2 = 0x3E,
RTW_CHPLAN_FCC1_NCC2 = 0x40,
RTW_CHPLAN_GLOBAL_NULL = 0x41,
RTW_CHPLAN_ETSI1_ETSI4 = 0x42,
RTW_CHPLAN_FCC1_FCC2 = 0x43,
RTW_CHPLAN_FCC1_NCC3 = 0x44,
RTW_CHPLAN_WORLD_ACMA1 = 0x45,
RTW_CHPLAN_FCC1_FCC8 = 0x46,
RTW_CHPLAN_WORLD_ETSI6 = 0x47,
RTW_CHPLAN_WORLD_ETSI7 = 0x48,
RTW_CHPLAN_WORLD_ETSI8 = 0x49,
RTW_CHPLAN_WORLD_ETSI9 = 0x50,
RTW_CHPLAN_WORLD_ETSI10 = 0x51,
RTW_CHPLAN_WORLD_ETSI11 = 0x52,
RTW_CHPLAN_FCC1_NCC4 = 0x53,
RTW_CHPLAN_WORLD_ETSI12 = 0x54,
RTW_CHPLAN_FCC1_FCC9 = 0x55,
RTW_CHPLAN_WORLD_ETSI13 = 0x56,
RTW_CHPLAN_FCC1_FCC10 = 0x57,
RTW_CHPLAN_MKK2_MKK4 = 0x58,
RTW_CHPLAN_WORLD_ETSI14 = 0x59,
RTW_CHPLAN_FCC1_FCC5 = 0x60,
RTW_CHPLAN_FCC2_FCC7 = 0x61,
RTW_CHPLAN_FCC2_FCC1 = 0x62,
RTW_CHPLAN_WORLD_ETSI15 = 0x63,
RTW_CHPLAN_MKK2_MKK5 = 0x64,
RTW_CHPLAN_ETSI1_ETSI16 = 0x65,
RTW_CHPLAN_FCC1_FCC14 = 0x66,
RTW_CHPLAN_FCC1_FCC12 = 0x67,
RTW_CHPLAN_FCC2_FCC14 = 0x68,
RTW_CHPLAN_FCC2_FCC12 = 0x69,
RTW_CHPLAN_ETSI1_ETSI17 = 0x6A,
RTW_CHPLAN_WORLD_FCC16 = 0x6B,
RTW_CHPLAN_WORLD_FCC13 = 0x6C,
RTW_CHPLAN_FCC2_FCC15 = 0x6D,
RTW_CHPLAN_WORLD_FCC12 = 0x6E,
RTW_CHPLAN_NULL_ETSI8 = 0x6F,
RTW_CHPLAN_NULL_ETSI18 = 0x70,
RTW_CHPLAN_NULL_ETSI17 = 0x71,
RTW_CHPLAN_NULL_ETSI19 = 0x72,
RTW_CHPLAN_WORLD_FCC7 = 0x73,
RTW_CHPLAN_FCC2_FCC17 = 0x74,
RTW_CHPLAN_WORLD_ETSI20 = 0x75,
RTW_CHPLAN_FCC2_FCC11 = 0x76,
RTW_CHPLAN_WORLD_ETSI21 = 0x77,
RTW_CHPLAN_FCC1_FCC18 = 0x78,
RTW_CHPLAN_MKK2_MKK1 = 0x79,
RTW_CHPLAN_MAX,
RTW_CHPLAN_REALTEK_DEFINE = 0x7F,
RTW_CHPLAN_UNSPECIFIED = 0xFF,
};
u8 rtw_chplan_get_default_regd(u8 id);
bool rtw_chplan_is_empty(u8 id);
#define rtw_is_channel_plan_valid(chplan) (((chplan) < RTW_CHPLAN_MAX || (chplan) == RTW_CHPLAN_REALTEK_DEFINE) && !rtw_chplan_is_empty(chplan))
#define rtw_is_legacy_channel_plan(chplan) ((chplan) < 0x20)
struct _RT_CHANNEL_INFO;
u8 init_channel_set(_adapter *padapter, u8 ChannelPlan, struct _RT_CHANNEL_INFO *channel_set);
#define IS_ALPHA2_NO_SPECIFIED(_alpha2) ((*((u16 *)(_alpha2))) == 0xFFFF)
#define RTW_MODULE_RTL8821AE_HMC_M2 BIT0 /* RTL8821AE(HMC + M.2) */
#define RTW_MODULE_RTL8821AU BIT1 /* RTL8821AU */
#define RTW_MODULE_RTL8812AENF_NGFF BIT2 /* RTL8812AENF(8812AE+8761)_NGFF */
#define RTW_MODULE_RTL8812AEBT_HMC BIT3 /* RTL8812AEBT(8812AE+8761)_HMC */
#define RTW_MODULE_RTL8188EE_HMC_M2 BIT4 /* RTL8188EE(HMC + M.2) */
#define RTW_MODULE_RTL8723BE_HMC_M2 BIT5 /* RTL8723BE(HMC + M.2) */
#define RTW_MODULE_RTL8723BS_NGFF1216 BIT6 /* RTL8723BS(NGFF1216) */
#define RTW_MODULE_RTL8192EEBT_HMC_M2 BIT7 /* RTL8192EEBT(8192EE+8761AU)_(HMC + M.2) */
#define RTW_MODULE_RTL8723DE_NGFF1630 BIT8 /* RTL8723DE(NGFF1630) */
#define RTW_MODULE_RTL8822BE BIT9 /* RTL8822BE */
#define RTW_MODULE_RTL8821CE BIT10 /* RTL8821CE */
struct country_chplan {
char alpha2[2];
u8 chplan;
#ifdef CONFIG_80211AC_VHT
u8 en_11ac;
#endif
#if RTW_DEF_MODULE_REGULATORY_CERT
u16 def_module_flags; /* RTW_MODULE_RTLXXX */
#endif
};
#ifdef CONFIG_80211AC_VHT
#define COUNTRY_CHPLAN_EN_11AC(_ent) ((_ent)->en_11ac)
#else
#define COUNTRY_CHPLAN_EN_11AC(_ent) 0
#endif
#if RTW_DEF_MODULE_REGULATORY_CERT
#define COUNTRY_CHPLAN_DEF_MODULE_FALGS(_ent) ((_ent)->def_module_flags)
#else
#define COUNTRY_CHPLAN_DEF_MODULE_FALGS(_ent) 0
#endif
const struct country_chplan *rtw_get_chplan_from_country(const char *country_code);
void dump_country_chplan(void *sel, const struct country_chplan *ent);
void dump_country_chplan_map(void *sel);
void dump_chplan_id_list(void *sel);
void dump_chplan_test(void *sel);
void dump_chplan_ver(void *sel);
#endif /* __RTW_CHPLAN_H__ */

20
core/rtw_cmd.c
View File

@ -1329,13 +1329,13 @@ static void rtw_ft_validate_akm_type(_adapter *padapter,
/*IEEE802.11-2012 Std. Table 8-101-AKM suite selectors*/
if (rtw_ft_valid_akm(padapter, psecuritypriv->rsn_akm_suite_type)) {
ptmp = rtw_get_ie(&pnetwork->network.IEs[12],
ptmp = rtw_get_ie(&pnetwork->network.IEs[12],
_MDIE_, &tmp_len, (pnetwork->network.IELength-12));
if (ptmp) {
pft_roam->mdid = *(u16 *)(ptmp+2);
pft_roam->ft_cap = *(ptmp+4);
RTW_INFO("FT: target " MAC_FMT " mdid=(0x%2x), capacity=(0x%2x)\n",
RTW_INFO("FT: target " MAC_FMT " mdid=(0x%2x), capacity=(0x%2x)\n",
MAC_ARG(pnetwork->network.MacAddress), pft_roam->mdid, pft_roam->ft_cap);
rtw_ft_set_flags(padapter, RTW_FT_PEER_EN);
@ -1350,7 +1350,7 @@ static void rtw_ft_validate_akm_type(_adapter *padapter,
/* It could be a non-FT connection */
rtw_ft_clr_flags(padapter, (RTW_FT_PEER_EN|RTW_FT_PEER_OTD_EN));
rtw_ft_reset_status(padapter);
}
}
}
#endif
@ -1470,9 +1470,9 @@ u8 rtw_joinbss_cmd(_adapter *padapter, struct wlan_network *pnetwork)
pqospriv->qos_option = 0;
if (pregistrypriv->wmm_enable) {
#ifdef CONFIG_WMMPS_STA
#ifdef CONFIG_WMMPS_STA
rtw_uapsd_use_default_setting(padapter);
#endif /* CONFIG_WMMPS_STA */
#endif /* CONFIG_WMMPS_STA */
tmp_len = rtw_restruct_wmm_ie(padapter, &pnetwork->network.IEs[0], &psecnetwork->IEs[0], pnetwork->network.IELength, psecnetwork->IELength);
if (psecnetwork->IELength != tmp_len) {
@ -2922,7 +2922,7 @@ u8 _lps_chk_by_tp(_adapter *adapter, u8 from_timer)
#endif
static u8 _lps_chk_by_pkt_cnts(_adapter *padapter, u8 from_timer, u8 bBusyTraffic)
{
{
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
u8 bEnterPS = _FALSE;
@ -3203,7 +3203,7 @@ static void dynamic_update_bcn_check(_adapter *padapter)
if (_FALSE != ATOMIC_READ(&pmlmepriv->olbc)
&& _FALSE != ATOMIC_READ(&pmlmepriv->olbc_ht)) {
if (rtw_ht_operation_update(padapter) > 0) {
update_beacon(padapter, _HT_CAPABILITY_IE_, NULL, _FALSE);
update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, _TRUE);
@ -3827,7 +3827,7 @@ inline u8 p2p_cancel_roch_cmd(_adapter *adapter, u64 cookie, struct wireless_dev
#endif /* CONFIG_IOCTL_CFG80211 */
#endif /* CONFIG_P2P */
#ifdef CONFIG_IOCTL_CFG80211
#ifdef CONFIG_IOCTL_CFG80211
inline u8 rtw_mgnt_tx_cmd(_adapter *adapter, u8 tx_ch, u8 no_cck, const u8 *buf, size_t len, int wait_ack, u8 flags)
{
struct cmd_obj *cmdobj;
@ -4013,7 +4013,7 @@ void rtw_dfs_ch_switch_hdl(struct dvobj_priv *dvobj)
if (ifbmp_s) {
_adapter *iface;
int i;
for (i = 0; i < dvobj->iface_nums; i++) {
iface = dvobj->padapters[i];
if (!iface || !(ifbmp_s & BIT(iface->iface_id)))
@ -5345,7 +5345,7 @@ static s32 rtw_req_per_cmd_hdl(_adapter *adapter)
}
/* group_macid: always be 0 in NIC, so only pass macid_bitmap.m0
* rpt_type: 0 includes all info in 1, use 0 for now
* rpt_type: 0 includes all info in 1, use 0 for now
* macid_bitmap: pass m0 only for NIC
*/
ret = rtw_hal_set_req_per_rpt_cmd(adapter, 0, 0, req_macid_bmp.m0);

18
core/rtw_debug.c
View File

@ -139,7 +139,7 @@ void dump_drv_cfg(void *sel)
#ifdef CONFIG_RTW_TPT_MODE
RTW_PRINT_SEL(sel, "CONFIG_RTW_TPT_MODE\n");
#endif
#endif
#ifdef CONFIG_USB_HCI
#ifdef CONFIG_SUPPORT_USB_INT
@ -1803,7 +1803,7 @@ ssize_t proc_set_rate_ctl(struct file *file, const char __user *buffer, size_t c
if ((fix_rate == 0) || (fix_rate == 0xFF))
en = 0;
if (macid != 255) {
RTW_INFO("Call phydm_fw_fix_rate()--en[%d] mac_id[%d] bw[%d] fix_rate[%d]\n", en, macid, bw, fix_rate);
phydm_fw_fix_rate(dm, en, macid, bw, fix_rate);
@ -2695,7 +2695,7 @@ int proc_get_rx_signal(struct seq_file *m, void *v)
RTW_PRINT_SEL(m, "rx_rate = %s\n", HDATA_RATE(odm->rx_rate));
return 0;
} else
} else
#endif
{
/* RTW_PRINT_SEL(m, "rxpwdb:%d\n", padapter->recvpriv.rxpwdb); */
@ -4916,21 +4916,21 @@ ssize_t proc_set_ps_info(struct file *file, const char __user *buffer, size_t co
RTW_INFO("%s: back to original LPS/IPS Mode\n", __FUNCTION__);
rtw_pm_set_lps(adapter, adapter->registrypriv.power_mgnt);
rtw_pm_set_ips(adapter, adapter->registrypriv.ips_mode);
goto exit;
}
if (mode == 1) {
if (mode == 1) {
/* LPS */
RTW_INFO("%s: LPS: %s, en=%d\n", __FUNCTION__, (en == 0) ? "disable":"enable", en);
RTW_INFO("%s: LPS: %s, en=%d\n", __FUNCTION__, (en == 0) ? "disable":"enable", en);
if (rtw_pm_set_lps(adapter, en) != 0 )
RTW_ERR("%s: invalid parameter, mode=%d, level=%d\n", __FUNCTION__, mode, en);
} else if (mode == 2) {
/* IPS */
RTW_INFO("%s: IPS: %s, en=%d\n", __FUNCTION__, (en == 0) ? "disable":"enable", en);
RTW_INFO("%s: IPS: %s, en=%d\n", __FUNCTION__, (en == 0) ? "disable":"enable", en);
if (rtw_pm_set_ips(adapter, en) != 0 )
RTW_ERR("%s: invalid parameter, mode=%d, level=%d\n", __FUNCTION__, mode, en);
} else

4
core/rtw_ieee80211.c
View File

@ -427,7 +427,7 @@ int rtw_remove_ie_g_rate(u8 *ie, uint *ie_len, uint offset, u8 eid)
while (1) {
tem_target_ie=rtw_get_ie(start,eid,&temp_target_ielen,search_len);
/*if(tem_target_ie)
RTW_INFO("%s, tem_target_ie=%u\n", __FUNCTION__,*tem_target_ie);*/
if (tem_target_ie && temp_target_ielen) {
@ -441,7 +441,7 @@ int rtw_remove_ie_g_rate(u8 *ie, uint *ie_len, uint offset, u8 eid)
target_ielen=cck_rate_size;/*discount g mode rate 6, 9 12,18Mbps,id , length*/
*(tem_target_ie+1)=target_ielen;/*set new length to Supposrted Rates*/
target_ie=tem_target_ie+target_ielen + 2;/*set target ie to address of rate 6Mbps */
_rtw_memmove(target_ie, remain_ies, remain_len);
*ie_len = *ie_len - rm_size;
ret = rm_size;

4
core/rtw_ioctl_set.c
View File

@ -817,7 +817,7 @@ u16 rtw_get_cur_max_rate(_adapter *adapter)
else
#endif /* CONFIG_80211N_HT */
{
/*station mode show :station && ap support rate; softap :show ap support rate*/
/*station mode show :station && ap support rate; softap :show ap support rate*/
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE)
get_rate_set(adapter, sta_bssrate, &sta_bssrate_len);/*get sta rate and length*/
@ -839,7 +839,7 @@ u16 rtw_get_cur_max_rate(_adapter *adapter)
}
}
} else {
if (rate > max_rate)
max_rate = rate;

70
core/rtw_mlme.c
View File

@ -139,7 +139,7 @@ sint _rtw_init_mlme_priv(_adapter *padapter)
#if defined(CONFIG_RTW_WNM) || defined(CONFIG_RTW_80211K)
rtw_roam_nb_info_init(padapter);
pmlmepriv->ch_cnt = 0;
#endif
#endif
#endif
rtw_init_mlme_timer(padapter);
@ -698,8 +698,8 @@ int is_same_network(WLAN_BSSID_EX *src, WLAN_BSSID_EX *dst, u8 feature)
return _TRUE;
#endif
/* Wi-Fi driver doesn't consider the situation of BCN and ProbRsp sent from the same hidden AP,
* it considers these two packets are sent from different AP.
/* Wi-Fi driver doesn't consider the situation of BCN and ProbRsp sent from the same hidden AP,
* it considers these two packets are sent from different AP.
* Therefore, the scan queue may store two scan results of the same hidden AP, likes below.
*
* index bssid ch RSSI SdBm Noise age flag ssid
@ -712,11 +712,11 @@ int is_same_network(WLAN_BSSID_EX *src, WLAN_BSSID_EX *dst, u8 feature)
* It means the scan queue will not store two scan results of the same hidden AP, it only store ProbRsp.
* For customer request.
*/
if (((_rtw_memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) == _TRUE) &&
((s_cap & WLAN_CAPABILITY_IBSS) == (d_cap & WLAN_CAPABILITY_IBSS)) &&
((s_cap & WLAN_CAPABILITY_BSS) == (d_cap & WLAN_CAPABILITY_BSS))) {
if ((src->Ssid.SsidLength == dst->Ssid.SsidLength) &&
if ((src->Ssid.SsidLength == dst->Ssid.SsidLength) &&
(((_rtw_memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength)) == _TRUE) || //Case of normal AP
(is_all_null(src->Ssid.Ssid, src->Ssid.SsidLength) == _TRUE || is_all_null(dst->Ssid.Ssid, dst->Ssid.SsidLength) == _TRUE))) //Case of hidden AP
return _TRUE;
@ -993,7 +993,7 @@ bool rtw_update_scanned_network(_adapter *adapter, WLAN_BSSID_EX *target)
plist = get_next(plist);
continue;
}
#ifdef CONFIG_RSSI_PRIORITY
if ((choice == NULL) || (pnetwork->network.PhyInfo.SignalStrength < choice->network.PhyInfo.SignalStrength))
#ifdef CONFIG_RTW_MESH
@ -2657,10 +2657,10 @@ u8 rtw_ft_chk_roaming_candidate(
/*The candidate don't support over-the-DS*/
if (rtw_ft_valid_otd_candidate(padapter, pmdie)) {
RTW_INFO("FT: ignore the candidate("
MAC_FMT ") for over-the-DS\n",
MAC_FMT ") for over-the-DS\n",
MAC_ARG(competitor->network.MacAddress));
rtw_ft_clr_flags(padapter, RTW_FT_PEER_OTD_EN);
return _FALSE;
return _FALSE;
}
return _TRUE;
@ -2736,7 +2736,7 @@ err_2:
void rtw_roam_nb_info_init(_adapter *padapter)
{
struct roam_nb_info *pnb = &(padapter->mlmepriv.nb_info);
_rtw_memset(&pnb->nb_rpt, 0, sizeof(pnb->nb_rpt));
_rtw_memset(&pnb->nb_rpt_ch_list, 0, sizeof(pnb->nb_rpt_ch_list));
_rtw_memset(&pnb->roam_target_addr, 0, ETH_ALEN);
@ -2746,8 +2746,8 @@ void rtw_roam_nb_info_init(_adapter *padapter)
pnb->nb_rpt_is_same = _TRUE;
pnb->last_nb_rpt_entries = 0;
#ifdef CONFIG_RTW_WNM
rtw_init_timer(&pnb->roam_scan_timer,
padapter, rtw_wnm_roam_scan_hdl,
rtw_init_timer(&pnb->roam_scan_timer,
padapter, rtw_wnm_roam_scan_hdl,
padapter);
#endif
}
@ -2775,7 +2775,7 @@ u8 rtw_roam_nb_scan_list_set(
rtw_init_sitesurvey_parm(padapter, pparm);
if (rtw_roam_busy_scan(padapter, pnb)) {
pparm->ch_num = 1;
pparm->ch[pmlmepriv->ch_cnt].hw_value =
pparm->ch[pmlmepriv->ch_cnt].hw_value =
pnb->nb_rpt_ch_list[pmlmepriv->ch_cnt].hw_value;
pmlmepriv->ch_cnt++;
ret = _TRUE;
@ -2794,7 +2794,7 @@ u8 rtw_roam_nb_scan_list_set(
}
pmlmepriv->nb_info.nb_rpt_valid = _FALSE;
pmlmepriv->ch_cnt = 0;
pmlmepriv->ch_cnt = 0;
ret = _TRUE;
set_bssid_list:
@ -3139,7 +3139,7 @@ void rtw_scan_timeout_handler(void *ctx)
void rtw_mlme_reset_auto_scan_int(_adapter *adapter, u8 *reason)
{
#if defined(CONFIG_RTW_MESH) && defined(CONFIG_DFS_MASTER)
#if CONFIG_RTW_MESH_OFFCH_CAND
#if CONFIG_RTW_MESH_OFFCH_CAND
struct rf_ctl_t *rfctl = adapter_to_rfctl(adapter);
#endif
#endif
@ -3253,7 +3253,7 @@ void rtw_drv_scan_by_self(_adapter *padapter, u8 reason)
}
#if defined(CONFIG_RTW_WNM) || defined(CONFIG_RTW_80211K)
if ((reason == RTW_AUTO_SCAN_REASON_ROAM)
if ((reason == RTW_AUTO_SCAN_REASON_ROAM)
&& (rtw_roam_nb_scan_list_set(padapter, &parm)))
goto exit;
#endif
@ -3483,7 +3483,7 @@ static void collect_traffic_statistics(_adapter *padapter)
dynamic_napi_th_chk (padapter);
#endif /* CONFIG_RTW_NAPI_DYNAMIC */
#endif
}
void rtw_dynamic_check_timer_handlder(void *ctx)
@ -3617,10 +3617,10 @@ static int rtw_check_roaming_candidate(struct mlme_priv *mlme
goto exit;
#if defined(CONFIG_RTW_80211R) && defined(CONFIG_RTW_WNM)
if (rtw_wnm_btm_diff_bss(adapter) &&
if (rtw_wnm_btm_diff_bss(adapter) &&
rtw_wnm_btm_roam_candidate(adapter, competitor)) {
goto update;
}
}
#endif
if (competitor->network.Rssi - mlme->cur_network_scanned->network.Rssi < mlme->roam_rssi_diff_th)
@ -4064,9 +4064,9 @@ exit:
/*
* rtw_uapsd_use_default_setting
* This function is used for setting default uapsd max sp length to uapsd_max_sp_len
* in qos_priv data structure from registry. In additional, it will also map default uapsd
* ac to each uapsd TID, delivery-enabled and trigger-enabled of corresponding TID.
*
* in qos_priv data structure from registry. In additional, it will also map default uapsd
* ac to each uapsd TID, delivery-enabled and trigger-enabled of corresponding TID.
*
* Arguments:
* @padapter: _adapter pointer.
*
@ -4081,7 +4081,7 @@ void rtw_uapsd_use_default_setting(_adapter *padapter)
if (pregistrypriv->uapsd_ac_enable != 0) {
pqospriv->uapsd_max_sp_len = pregistrypriv->uapsd_max_sp_len;
CLEAR_FLAGS(pqospriv->uapsd_tid);
CLEAR_FLAGS(pqospriv->uapsd_tid_delivery_enabled);
CLEAR_FLAGS(pqospriv->uapsd_tid_trigger_enabled);
@ -4097,7 +4097,7 @@ void rtw_uapsd_use_default_setting(_adapter *padapter)
}
/* check the uapsd setting of AC_VI from registry then map these setting to each TID if necessary */
if(TEST_FLAG(pregistrypriv->uapsd_ac_enable, DRV_CFG_UAPSD_VI)) {
if(TEST_FLAG(pregistrypriv->uapsd_ac_enable, DRV_CFG_UAPSD_VI)) {
SET_FLAG(pqospriv->uapsd_tid, WMM_TID5);
SET_FLAG(pqospriv->uapsd_tid_delivery_enabled, WMM_TID5);
SET_FLAG(pqospriv->uapsd_tid_trigger_enabled, WMM_TID5);
@ -4126,7 +4126,7 @@ void rtw_uapsd_use_default_setting(_adapter *padapter)
SET_FLAG(pqospriv->uapsd_tid_trigger_enabled, WMM_TID0);
}
RTW_INFO("[WMMPS] UAPSD MAX SP Len = 0x%02x, UAPSD TID enabled = 0x%02x\n",
RTW_INFO("[WMMPS] UAPSD MAX SP Len = 0x%02x, UAPSD TID enabled = 0x%02x\n",
pqospriv->uapsd_max_sp_len, (u8)pqospriv->uapsd_tid);
}
@ -4136,18 +4136,18 @@ void rtw_uapsd_use_default_setting(_adapter *padapter)
* rtw_is_wmmps_mode
* This function is used for checking whether Driver and an AP support uapsd function or not.
* If both of them support uapsd function, it will return true. Otherwise returns false.
*
*
* Arguments:
* @padapter: _adapter pointer.
*
* Auther: Arvin Liu
* Date: 2017/06/12
*/
bool rtw_is_wmmps_mode(_adapter *padapter)
bool rtw_is_wmmps_mode(_adapter *padapter)
{
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct qos_priv *pqospriv = &pmlmepriv->qospriv;
if ((pqospriv->uapsd_ap_supported) && ((pqospriv->uapsd_tid & BIT_MASK_TID_TC) != 0))
return _TRUE;
@ -4190,16 +4190,16 @@ int rtw_restruct_wmm_ie(_adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, u
#ifdef CONFIG_WMMPS_STA
switch(pqospriv->uapsd_max_sp_len) {
case NO_LIMIT:
case NO_LIMIT:
/* do nothing */
break;
case TWO_MSDU:
case TWO_MSDU:
SET_FLAG(qos_info, BIT5);
break;
case FOUR_MSDU:
case FOUR_MSDU:
SET_FLAG(qos_info, BIT6);
break;
case SIX_MSDU:
break;
case SIX_MSDU:
SET_FLAG(qos_info, BIT5);
SET_FLAG(qos_info, BIT6);
break;
@ -4221,7 +4221,7 @@ int rtw_restruct_wmm_ie(_adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_len, u
if((TEST_FLAG(pqospriv->uapsd_tid, WMM_TID3)) && (TEST_FLAG(pqospriv->uapsd_tid, WMM_TID0)))
SET_FLAG(qos_info, WMM_IE_UAPSD_BE);
#endif /* CONFIG_WMMPS_STA */
out_ie[initial_out_len + 8] = qos_info;
break;
@ -4332,7 +4332,7 @@ int rtw_rsn_sync_pmkid(_adapter *adapter, u8 *ie, uint ie_len, int i_ent)
+ 2 + 16 * info.pmkid_cnt
+ (info.gmcs ? 4 : 0)
;
ie[1] = (u8)(ie_len - 2);
exit:
@ -4898,7 +4898,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len, u8 channel)
phtpriv->ampdu_enable = _TRUE;
} else
phtpriv->ampdu_enable = _TRUE;
}
}
/* check Max Rx A-MPDU Size */

212
core/rtw_mlme_ext.c
View File

@ -1763,17 +1763,17 @@ static void rtw_check_legacy_ap(_adapter *padapter, u8 *pframe, u32 len)
if (!padapter->registrypriv.wifi_spec)
return;
if(!MLME_IS_AP(padapter))
return;
if (pmlmeext->bstart_bss == _TRUE) {
int left;
unsigned char *pos;
struct rtw_ieee802_11_elems elems;
#ifdef CONFIG_80211N_HT
u16 cur_op_mode;
u16 cur_op_mode;
#endif
/* checking IEs */
left = len - sizeof(struct rtw_ieee80211_hdr_3addr) - _BEACON_IE_OFFSET_;
@ -1794,7 +1794,7 @@ static void rtw_check_legacy_ap(_adapter *padapter, u8 *pframe, u32 len)
ATOMIC_SET(&pmlmepriv->olbc, _TRUE);
ATOMIC_SET(&pmlmepriv->olbc_ht, _TRUE);
}
}
}
@ -2720,7 +2720,7 @@ void rtw_roam_nb_discover(_adapter *padapter, u8 bfroce)
{
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct sta_priv *pstapriv = &padapter->stapriv;
struct sta_info *psta;
u8 nb_req_issue = _FALSE;
@ -2734,11 +2734,11 @@ void rtw_roam_nb_discover(_adapter *padapter, u8 bfroce)
psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.MacAddress);
if (!psta)
return;
if (bfroce || (!pmlmepriv->nb_info.nb_rpt_is_same))
nb_req_issue = _TRUE;
if (nb_req_issue && (psta->rm_en_cap[0] & RTW_RRM_NB_RPT_EN))
if (nb_req_issue && (psta->rm_en_cap[0] & RTW_RRM_NB_RPT_EN))
rm_add_nb_req(padapter, psta);
}
#endif
@ -2790,7 +2790,7 @@ unsigned int OnAssocRsp(_adapter *padapter, union recv_frame *precv_frame)
/* AID */
res = pmlmeinfo->aid = (int)(le16_to_cpu(*(unsigned short *)(pframe + WLAN_HDR_A3_LEN + 4)) & 0x3fff);
/* check aid value */
if (res < 1 || res > 2007) {
RTW_INFO("assoc reject, aid: %d\n", res);
@ -3193,7 +3193,7 @@ unsigned int on_action_wnm(_adapter *adapter, union recv_frame *rframe)
u8 *frame = rframe->u.hdr.rx_data;
u32 frame_len = rframe->u.hdr.len;
u8 *frame_body = (u8 *)(frame + sizeof(struct rtw_ieee80211_hdr_3addr));
u32 frame_body_len = frame_len - sizeof(struct rtw_ieee80211_hdr_3addr);
u32 frame_body_len = frame_len - sizeof(struct rtw_ieee80211_hdr_3addr);
u8 category, action;
int cnt = 0;
char msg[16];
@ -3217,7 +3217,7 @@ unsigned int on_action_wnm(_adapter *adapter, union recv_frame *rframe)
}
ret = _SUCCESS;
break;
#endif
#endif
default:
#ifdef CONFIG_IOCTL_CFG80211
cnt += sprintf((msg + cnt), "ACT_WNM %u", action);
@ -3264,12 +3264,12 @@ u8 rtw_rx_ampdu_size(_adapter *adapter)
max_rx_ampdu_factor = (HT_CAP_AMPDU_FACTOR)adapter->driver_rx_ampdu_factor;
else
rtw_hal_get_def_var(adapter, HW_VAR_MAX_RX_AMPDU_FACTOR, &max_rx_ampdu_factor);
/* In Maximum A-MPDU Length Exponent subfield of A-MPDU Parameters field of HT Capabilities element,
the unit of max_rx_ampdu_factor are octets. 8K, 16K, 32K, 64K is right.
But the buffer size subfield of Block Ack Parameter Set field in ADDBA action frame indicates
the number of buffers available for this particular TID. Each buffer is equal to max. size of
MSDU or AMSDU.
the number of buffers available for this particular TID. Each buffer is equal to max. size of
MSDU or AMSDU.
The size variable means how many MSDUs or AMSDUs, it's not Kbytes.
*/
if (MAX_AMPDU_FACTOR_64K == max_rx_ampdu_factor)
@ -6636,7 +6636,7 @@ exit:
#if defined(CONFIG_RTW_WNM) || defined(CONFIG_RTW_80211K)
static u8 rtw_wnm_nb_elem_parsing(
u8* pdata, u32 data_len, u8 from_btm,
u8* pdata, u32 data_len, u8 from_btm,
u32 *nb_rpt_num, u8 *nb_rpt_is_same,
struct roam_nb_info *pnb, struct wnm_btm_cant *pcandidates)
{
@ -6659,7 +6659,7 @@ static u8 rtw_wnm_nb_elem_parsing(
subelem_len = (u32)*(pdata+1);
for (i=0; i < RTW_MAX_NB_RPT_NUM; i++) {
if (((ptr + 7) > pend) || (elem_len < subelem_len))
if (((ptr + 7) > pend) || (elem_len < subelem_len))
break;
if (*ptr != 0x34) {
@ -6668,10 +6668,10 @@ static u8 rtw_wnm_nb_elem_parsing(
break;
}
pie = (struct nb_rpt_hdr *)ptr;
pie = (struct nb_rpt_hdr *)ptr;
if (from_btm) {
op = rtw_get_ie((u8 *)(ptr+15),
WNM_BTM_CAND_PREF_SUBEID,
op = rtw_get_ie((u8 *)(ptr+15),
WNM_BTM_CAND_PREF_SUBEID,
&op_len, (subelem_len - 15));
}
@ -6690,28 +6690,28 @@ static u8 rtw_wnm_nb_elem_parsing(
RTW_DBG("WNM: preference check bssid("MAC_FMT
") ,bss_info(0x%04X), reg_class(0x%02X), ch(%d),"
" phy_type(0x%02X), preference(0x%02X)\n",
MAC_ARG(pcandidate->nb_rpt.bssid), pcandidate->nb_rpt.bss_info,
pcandidate->nb_rpt.reg_class, pcandidate->nb_rpt.ch_num,
MAC_ARG(pcandidate->nb_rpt.bssid), pcandidate->nb_rpt.bss_info,
pcandidate->nb_rpt.reg_class, pcandidate->nb_rpt.ch_num,
pcandidate->nb_rpt.phy_type, pcandidate->preference);
} else {
if (_rtw_memcmp(&pnb->nb_rpt[i], pie, sizeof(struct nb_rpt_hdr)) == _FALSE)
*nb_rpt_is_same = _FALSE;
_rtw_memcpy(&pnb->nb_rpt[i], pie, sizeof(struct nb_rpt_hdr));
}
nb_rpt_entries++;
}
nb_rpt_entries++;
}
if (from_btm)
pnb->preference_en = (bfound)?_TRUE:_FALSE;
if (from_btm)
pnb->preference_en = (bfound)?_TRUE:_FALSE;
*nb_rpt_num = nb_rpt_entries;
return ret;
}
}
/* selection sorting based on preference value
* IN : nb_rpt_entries - candidate num
* IN/OUT : pcandidates - candidate list
* return : TRUE - means pcandidates is updated.
* return : TRUE - means pcandidates is updated.
*/
static u8 rtw_wnm_candidates_sorting(
u32 nb_rpt_entries, struct wnm_btm_cant *pcandidates)
@ -6739,13 +6739,13 @@ static u8 rtw_wnm_candidates_sorting(
_rtw_memcpy((pcandidates+i), (pcandidates+pos), sizeof(struct wnm_btm_cant));
_rtw_memcpy((pcandidates+pos), &swap, sizeof(struct wnm_btm_cant));
}
}
}
return updated;
}
}
static void rtw_wnm_nb_info_update(
u32 nb_rpt_entries, u8 from_btm,
struct roam_nb_info *pnb, struct wnm_btm_cant *pcandidates,
u32 nb_rpt_entries, u8 from_btm,
struct roam_nb_info *pnb, struct wnm_btm_cant *pcandidates,
u8 *nb_rpt_is_same)
{
u8 is_found;
@ -6766,10 +6766,10 @@ static void rtw_wnm_nb_info_update(
_rtw_memcpy(&pnb->nb_rpt[i], &pcand->nb_rpt, sizeof(struct nb_rpt_hdr));
}
RTW_DBG("WNM: bssid(" MAC_FMT
RTW_DBG("WNM: bssid(" MAC_FMT
") , bss_info(0x%04X), reg_class(0x%02X), ch_num(%d), phy_type(0x%02X)\n",
MAC_ARG(pnb->nb_rpt[i].bssid), pnb->nb_rpt[i].bss_info,
pnb->nb_rpt[i].reg_class, pnb->nb_rpt[i].ch_num,
MAC_ARG(pnb->nb_rpt[i].bssid), pnb->nb_rpt[i].bss_info,
pnb->nb_rpt[i].reg_class, pnb->nb_rpt[i].ch_num,
pnb->nb_rpt[i].phy_type);
if (pnb->nb_rpt[i].ch_num == 0)
@ -6781,7 +6781,7 @@ static void rtw_wnm_nb_info_update(
break;
}
}
if (!is_found) {
pnb->nb_rpt_ch_list[pnb->nb_rpt_ch_list_num].hw_value = pnb->nb_rpt[i].ch_num;
pnb->nb_rpt_ch_list_num++;
@ -6799,7 +6799,7 @@ static void rtw_wnm_btm_candidate_select(_adapter *padapter)
for (i = 0; i < pnb->last_nb_rpt_entries; i++) {
pnetwork = rtw_find_network(
&(pmlmepriv->scanned_queue),
&(pmlmepriv->scanned_queue),
pnb->nb_rpt[i].bssid);
if (pnetwork) {
@ -6816,7 +6816,7 @@ static void rtw_wnm_btm_candidate_select(_adapter *padapter)
, MAC_ARG(pnetwork->network.MacAddress)
, pnetwork->network.Configuration.DSConfig
, (int)pnetwork->network.Rssi);
} else
} else
_rtw_memset(pnb->roam_target_addr,0, ETH_ALEN);
}
@ -6827,20 +6827,20 @@ u32 rtw_wnm_btm_candidates_survey(
struct wnm_btm_cant *pcandidate_list = NULL;
u8 nb_rpt_is_same = _TRUE;
u32 ret = _FAIL;
u32 nb_rpt_entries = 0;
u32 nb_rpt_entries = 0;
if (from_btm) {
u32 mlen = sizeof(struct wnm_btm_cant) * RTW_MAX_NB_RPT_NUM;
pcandidate_list = (struct wnm_btm_cant *)rtw_malloc(mlen);
if (pcandidate_list == NULL)
goto exit;
if (pcandidate_list == NULL)
goto exit;
}
/*clean the status set last time*/
_rtw_memset(&pnb->nb_rpt_ch_list, 0, sizeof(pnb->nb_rpt_ch_list));
pnb->nb_rpt_valid = _FALSE;
if (!rtw_wnm_nb_elem_parsing(
pframe, elem_len, from_btm,
pframe, elem_len, from_btm,
&nb_rpt_entries, &nb_rpt_is_same,
pnb, pcandidate_list))
goto exit;
@ -6850,11 +6850,11 @@ u32 rtw_wnm_btm_candidates_survey(
rtw_wnm_candidates_sorting(nb_rpt_entries, pcandidate_list);
rtw_wnm_nb_info_update(
nb_rpt_entries, from_btm,
nb_rpt_entries, from_btm,
pnb, pcandidate_list, &nb_rpt_is_same);
}
RTW_INFO("nb_rpt_is_same = %d, nb_rpt_entries = %d, last_nb_rpt_entries = %d\n",
RTW_INFO("nb_rpt_is_same = %d, nb_rpt_entries = %d, last_nb_rpt_entries = %d\n",
nb_rpt_is_same, nb_rpt_entries, pnb->last_nb_rpt_entries);
if ((nb_rpt_is_same == _TRUE) && (nb_rpt_entries == pnb->last_nb_rpt_entries))
pnb->nb_rpt_is_same = _TRUE;
@ -6865,14 +6865,14 @@ u32 rtw_wnm_btm_candidates_survey(
if ((from_btm) && (nb_rpt_entries != 0))
rtw_wnm_btm_candidate_select(padapter);
pnb->nb_rpt_valid = _TRUE;
ret = _SUCCESS;
exit:
if (from_btm && pcandidate_list)
rtw_mfree((u8 *)pcandidate_list, sizeof(struct wnm_btm_cant) * RTW_MAX_NB_RPT_NUM);
return ret;
}
#endif
@ -6980,21 +6980,21 @@ u8 rtw_wmn_btm_rsp_reason_decision(_adapter *padapter, u8* req_mode)
/* Accept */
reason = 0;
goto under_survey;
}
}
#endif
if (((*req_mode) & DISASSOC_IMMINENT) == 0) {
/* Reject - Unspecified reject reason */
reason = 1;
goto candidate_remove;
}
}
if (precvpriv->signal_strength_data.avg_val >= pmlmepriv->roam_rssi_threshold) {
reason = 1;
goto candidate_remove;
}
under_survey:
under_survey:
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) {
RTW_INFO("%s reject due to _FW_UNDER_SURVEY\n", __func__);
reason = 1;
@ -7021,14 +7021,14 @@ static u32 rtw_wnm_btm_candidates_offset_get(u8* pframe)
/* BSS Termination Duration check */
if (wnm_btm_bss_term_inc(pframe)) {
offset += 12;
pos += offset;
}
pos += offset;
}
/* Session Information URL check*/
if (wnm_btm_ess_disassoc_im(pframe)) {
/*URL length field + URL variable length*/
offset = 1 + *(pframe + offset);
pos += offset;
pos += offset;
}
offset = (pos - pframe);
@ -7048,8 +7048,8 @@ static void rtw_wnm_btm_req_hdr_parsing(u8* pframe, struct btm_req_hdr *phdr)
phdr->disassoc_timer = wnm_btm_disassoc_timer(pframe);
phdr->validity_interval = wnm_btm_valid_interval(pframe);
if (wnm_btm_bss_term_inc(pframe)) {
_rtw_memcpy(&phdr->term_duration,
wnm_btm_term_duration_offset(pframe),
_rtw_memcpy(&phdr->term_duration,
wnm_btm_term_duration_offset(pframe),
sizeof(struct btm_term_duration));
}
@ -7065,9 +7065,9 @@ void rtw_wnm_roam_scan_hdl(void *ctx)
_adapter *padapter = (_adapter *)ctx;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
if (rtw_is_scan_deny(padapter))
if (rtw_is_scan_deny(padapter))
RTW_INFO("WNM: roam scan would abort by scan_deny!\n");
pmlmepriv->need_to_roam = _TRUE;
rtw_drv_scan_by_self(padapter, RTW_AUTO_SCAN_REASON_ROAM);
}
@ -7099,10 +7099,10 @@ void rtw_wnm_process_btm_req(_adapter *padapter, u8* pframe, u32 frame_len)
elem_len = (frame_len - offset);
rtw_wnm_btm_candidates_survey(padapter, ptr, elem_len, _TRUE);
reason = rtw_wmn_btm_rsp_reason_decision(padapter, &pframe[3]);
rtw_wnm_issue_action(padapter,
rtw_wnm_issue_action(padapter,
RTW_WLAN_ACTION_WNM_BTM_RSP, reason);
if (reason == 0)
if (reason == 0)
rtw_wnm_roam_scan(padapter);
}
@ -7139,7 +7139,7 @@ void rtw_wnm_issue_action(_adapter *padapter, u8 action, u8 reason)
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
return ;
pattrib = &(pmgntframe->attrib);
update_mgntframe_attrib(padapter, pattrib);
_rtw_memset(pmgntframe->buf_addr, 0, (WLANHDR_OFFSET + TXDESC_OFFSET));
@ -7177,19 +7177,19 @@ void rtw_wnm_issue_action(_adapter *padapter, u8 action, u8 reason)
pframe = rtw_set_fixed_ie(pframe, 1, &(reason), &(pattrib->pktlen));
pframe = rtw_set_fixed_ie(pframe, 1, &(termination_delay), &(pattrib->pktlen));
if (!is_zero_mac_addr(pmlmepriv->nb_info.roam_target_addr)) {
pframe = rtw_set_fixed_ie(pframe, 6,
pframe = rtw_set_fixed_ie(pframe, 6,
pmlmepriv->nb_info.roam_target_addr, &(pattrib->pktlen));
}
RTW_INFO("WNM: RTW_WLAN_ACTION_WNM_BTM_RSP sent. reason = %d\n", reason);
break;
RTW_INFO("WNM: RTW_WLAN_ACTION_WNM_BTM_RSP sent. reason = %d\n", reason);
break;
default:
goto exit;
}
}
pattrib->last_txcmdsz = pattrib->pktlen;
dump_mgntframe(padapter, pmgntframe);
exit:
exit:
return;
}
#endif
@ -8010,7 +8010,7 @@ void issue_beacon(_adapter *padapter, int timeout_ms)
pattrib->pktlen += rtw_build_vendor_ie(padapter , &pframe , WIFI_BEACON_VENDOR_IE_BIT);
#endif
#ifdef CONFIG_RTL8812A
#ifdef CONFIG_RTL8812A
pframe = rtw_hal_set_8812a_vendor_ie(padapter, pframe, &pattrib->pktlen );
#endif/*CONFIG_RTL8812A*/
@ -8361,7 +8361,7 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe
}
#endif /* CONFIG_AUTO_AP_MODE */
#ifdef CONFIG_RTL8812A
#ifdef CONFIG_RTL8812A
pframe = rtw_hal_set_8812a_vendor_ie(padapter, pframe, &pattrib->pktlen);
#endif/*CONFIG_RTL8812A*/
@ -8495,7 +8495,7 @@ int _issue_probereq(_adapter *padapter, const NDIS_802_11_SSID *pssid, const u8
pattrib->pktlen += rtw_build_vendor_ie(padapter , &pframe , WIFI_PROBEREQ_VENDOR_IE_BIT);
#endif
#ifdef CONFIG_RTL8812A
#ifdef CONFIG_RTL8812A
pframe = rtw_hal_set_8812a_vendor_ie(padapter, pframe, &pattrib->pktlen );
#endif/*CONFIG_RTL8812A*/
@ -8936,7 +8936,7 @@ void issue_asocrsp(_adapter *padapter, unsigned short status, struct sta_info *p
pattrib->pktlen += rtw_build_vendor_ie(padapter , &pframe , WIFI_ASSOCRESP_VENDOR_IE_BIT);
#endif
#ifdef CONFIG_RTL8812A
#ifdef CONFIG_RTL8812A
pframe = rtw_hal_set_8812a_vendor_ie(padapter, pframe, &pattrib->pktlen );
#endif/*CONFIG_RTL8812A*/
@ -9414,7 +9414,7 @@ void _issue_assocreq(_adapter *padapter, u8 is_reassoc)
/* OWE */
{
u32 owe_ie_len;
owe_ie_len = rtw_append_assoc_req_owe_ie(padapter, pframe);
pframe += owe_ie_len;
pattrib->pktlen += owe_ie_len;
@ -9427,7 +9427,7 @@ void _issue_assocreq(_adapter *padapter, u8 is_reassoc)
pattrib->pktlen += rtw_build_vendor_ie(padapter , &pframe , WIFI_ASSOCREQ_VENDOR_IE_BIT);
#endif
#ifdef CONFIG_RTL8812A
#ifdef CONFIG_RTL8812A
pframe = rtw_hal_set_8812a_vendor_ie(padapter, pframe, &pattrib->pktlen );
#endif/*CONFIG_RTL8812A*/
@ -10813,7 +10813,7 @@ unsigned int send_beacon(_adapter *padapter)
#endif
/* CONFIG_PCI_BCN_POLLING is for pci interface beacon polling mode */
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)|| defined(CONFIG_PCI_BCN_POLLING)
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)|| defined(CONFIG_PCI_BCN_POLLING)
u8 bxmitok = _FALSE;
int issue = 0;
int poll = 0;
@ -10847,14 +10847,14 @@ unsigned int send_beacon(_adapter *padapter)
rtw_hal_set_hwreg(padapter, HW_VAR_BCN_HEAD_SEL, &vap_id);
#endif
do {
#if defined(CONFIG_PCI_BCN_POLLING)
#if defined(CONFIG_PCI_BCN_POLLING)
issue_beacon(padapter, 0);
#else
issue_beacon(padapter, 100);
#endif
issue++;
do {
#if defined(CONFIG_PCI_BCN_POLLING)
#if defined(CONFIG_PCI_BCN_POLLING)
rtw_msleep_os(1);
#else
rtw_yield_os();
@ -10862,7 +10862,7 @@ unsigned int send_beacon(_adapter *padapter)
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bxmitok));
poll++;
} while ((poll % 10) != 0 && _FALSE == bxmitok && !RTW_CANNOT_RUN(padapter));
#if defined(CONFIG_PCI_BCN_POLLING)
#if defined(CONFIG_PCI_BCN_POLLING)
rtw_hal_unmap_beacon_icf(padapter);
#endif
} while (bxmitok == _FALSE && (issue < 100) && !RTW_CANNOT_RUN(padapter));
@ -12584,9 +12584,9 @@ void rtw_delba_check(_adapter *padapter, struct sta_info *psta, u8 from_timer)
*/
if (pmlmeinfo->assoc_AP_vendor == HT_IOT_PEER_BROADCOM) {
for (i = 0; i < TID_NUM ; i++) {
if ((psta->recvreorder_ctrl[i].enable) &&
(sta_rx_data_qos_pkts(psta, i) == sta_last_rx_data_qos_pkts(psta, i)) ) {
if (_TRUE == rtw_inc_and_chk_continual_no_rx_packet(psta, i)) {
if ((psta->recvreorder_ctrl[i].enable) &&
(sta_rx_data_qos_pkts(psta, i) == sta_last_rx_data_qos_pkts(psta, i)) ) {
if (_TRUE == rtw_inc_and_chk_continual_no_rx_packet(psta, i)) {
/* send a DELBA frame to the peer STA with the Reason Code field set to TIMEOUT */
if (!from_timer)
ret = issue_del_ba_ex(padapter, psta->cmn.mac_addr, i, 39, 0, 3, 1);
@ -12596,7 +12596,7 @@ void rtw_delba_check(_adapter *padapter, struct sta_info *psta, u8 from_timer)
if (ret != _FAIL)
psta->recvreorder_ctrl[i].ampdu_size = RX_AMPDU_SIZE_INVALID;
rtw_reset_continual_no_rx_packet(psta, i);
}
}
} else {
/* The inactivity timer is reset when MPDUs to the TID is received. */
rtw_reset_continual_no_rx_packet(psta, i);
@ -12877,7 +12877,7 @@ void linked_status_chk(_adapter *padapter, u8 from_timer)
is_p2p_enable = !rtw_p2p_chk_state(&padapter->wdinfo, P2P_STATE_NONE);
#endif
#ifdef CONFIG_ISSUE_DELBA_WHEN_NO_TRAFFIC
#ifdef CONFIG_ISSUE_DELBA_WHEN_NO_TRAFFIC
/*issue delba when ap does not tx data packet that is Broadcom ap */
rtw_delba_check(padapter, psta, from_timer);
#endif
@ -12894,7 +12894,7 @@ void linked_status_chk(_adapter *padapter, u8 from_timer)
u8 union_ch = 0, union_bw = 0, union_offset = 0;
u8 switch_channel_by_drv = _TRUE;
#ifdef CONFIG_MCC_MODE
if (MCC_EN(padapter)) {
/* driver doesn't switch channel under MCC */
@ -13279,7 +13279,7 @@ void rtw_ft_update_bcn(_adapter *padapter, union recv_frame *precv_frame)
uint len = precv_frame->u.hdr.len;
WLAN_BSSID_EX *pbss;
if (rtw_ft_chk_status(padapter,RTW_FT_ASSOCIATED_STA)
if (rtw_ft_chk_status(padapter,RTW_FT_ASSOCIATED_STA)
&& (pmlmepriv->ft_roam.ft_updated_bcn == _FALSE)) {
pbss = (WLAN_BSSID_EX*)rtw_malloc(sizeof(WLAN_BSSID_EX));
if (pbss) {
@ -13287,7 +13287,7 @@ void rtw_ft_update_bcn(_adapter *padapter, union recv_frame *precv_frame)
struct beacon_keys recv_beacon;
update_network(&(pmlmepriv->cur_network.network), pbss, padapter, _TRUE);
/* update bcn keys */
if (rtw_get_bcn_keys(padapter, pframe, len, &recv_beacon) == _TRUE) {
RTW_INFO("%s: beacon keys ready\n", __func__);
@ -13305,7 +13305,7 @@ void rtw_ft_update_bcn(_adapter *padapter, union recv_frame *precv_frame)
}
/* check the vendor of the assoc AP */
pmlmeinfo->assoc_AP_vendor =
pmlmeinfo->assoc_AP_vendor =
check_assoc_AP(pframe+sizeof(struct rtw_ieee80211_hdr_3addr),
(len - sizeof(struct rtw_ieee80211_hdr_3addr)));
@ -13343,26 +13343,26 @@ void rtw_ft_start_clnt_join(_adapter *padapter)
}
u8 rtw_ft_update_rsnie(
_adapter *padapter, u8 bwrite,
_adapter *padapter, u8 bwrite,
struct pkt_attrib *pattrib, u8 **pframe)
{
struct ft_roam_info *pft_roam = &(padapter->mlmepriv.ft_roam);
u8 *pie;
u32 len;
pie = rtw_get_ie(pft_roam->updated_ft_ies, EID_WPA2, &len,
pie = rtw_get_ie(pft_roam->updated_ft_ies, EID_WPA2, &len,
pft_roam->updated_ft_ies_len);
if (!bwrite)
return (pie)?_SUCCESS:_FAIL;
if (pie) {
*pframe = rtw_set_ie(((u8 *)*pframe), EID_WPA2, len,
*pframe = rtw_set_ie(((u8 *)*pframe), EID_WPA2, len,
pie+2, &(pattrib->pktlen));
} else
return _FAIL;
return _SUCCESS;
return _SUCCESS;
}
static u8 rtw_ft_update_mdie(
@ -13373,10 +13373,10 @@ static u8 rtw_ft_update_mdie(
u32 len = 3;
if (rtw_ft_roam(padapter)) {
if ((pie = rtw_get_ie(pft_roam->updated_ft_ies, _MDIE_,
if ((pie = rtw_get_ie(pft_roam->updated_ft_ies, _MDIE_,
&len, pft_roam->updated_ft_ies_len))) {
pie = (pie + 2); /* ignore md-id & length */
} else
} else
return _FAIL;
} else {
*((u16 *)&mdie[0]) = pft_roam->mdid;
@ -13385,7 +13385,7 @@ static u8 rtw_ft_update_mdie(
}
*pframe = rtw_set_ie(((u8 *)*pframe), _MDIE_, len , pie, &(pattrib->pktlen));
return _SUCCESS;
return _SUCCESS;
}
static u8 rtw_ft_update_ftie(
@ -13395,17 +13395,17 @@ static u8 rtw_ft_update_ftie(
u8 *pie;
u32 len;
if ((pie = rtw_get_ie(pft_roam->updated_ft_ies, _FTIE_, &len,
if ((pie = rtw_get_ie(pft_roam->updated_ft_ies, _FTIE_, &len,
pft_roam->updated_ft_ies_len)) != NULL) {
*pframe = rtw_set_ie(*pframe, _FTIE_, len ,
*pframe = rtw_set_ie(*pframe, _FTIE_, len ,
(pie+2), &(pattrib->pktlen));
} else
return _FAIL;
return _SUCCESS;
return _SUCCESS;
}
void rtw_ft_build_auth_req_ies(_adapter *padapter,
void rtw_ft_build_auth_req_ies(_adapter *padapter,
struct pkt_attrib *pattrib, u8 **pframe)
{
u8 ftie_append = _TRUE;
@ -13422,7 +13422,7 @@ void rtw_ft_build_auth_req_ies(_adapter *padapter,
rtw_ft_update_ftie(padapter, pattrib, pframe);
}
void rtw_ft_build_assoc_req_ies(_adapter *padapter,
void rtw_ft_build_assoc_req_ies(_adapter *padapter,
u8 is_reassoc, struct pkt_attrib *pattrib, u8 **pframe)
{
if (!pattrib || !(*pframe))
@ -13435,7 +13435,7 @@ void rtw_ft_build_assoc_req_ies(_adapter *padapter,
return;
if (rtw_ft_update_rsnie(padapter, _FALSE, pattrib, pframe))
rtw_ft_update_ftie(padapter, pattrib, pframe);
rtw_ft_update_ftie(padapter, pattrib, pframe);
}
u8 rtw_ft_update_auth_rsp_ies(_adapter *padapter, u8 *pframe, u32 len)
@ -13455,8 +13455,8 @@ u8 rtw_ft_update_auth_rsp_ies(_adapter *padapter, u8 *pframe, u32 len)
if (!pframe || !len)
return _FAIL;
rtw_buf_update(&pmlmepriv->auth_rsp,
rtw_buf_update(&pmlmepriv->auth_rsp,
&pmlmepriv->auth_rsp_len, pframe, len);
pft_roam->ft_event.ies =
(pmlmepriv->auth_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6);
@ -13469,7 +13469,7 @@ u8 rtw_ft_update_auth_rsp_ies(_adapter *padapter, u8 *pframe, u32 len)
_rtw_memcpy(target_ap_addr, pmlmepriv->assoc_bssid, ETH_ALEN);
rtw_ft_report_reassoc_evt(padapter, target_ap_addr);
return ret;
return ret;
}
static void rtw_ft_start_clnt_action(_adapter *padapter, u8 *pTargetAddr)
@ -13642,7 +13642,7 @@ void rtw_ft_link_timer_hdl(void *ctx)
rtw_ft_issue_action_req(padapter, (u8 *)pmlmepriv->roam_network->network.MacAddress);
_set_timer(&pmlmeext->ft_link_timer, REASSOC_TO);
} else {
pft_roam->ft_req_retry_cnt = 0;
pft_roam->ft_req_retry_cnt = 0;
if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)
rtw_ft_set_status(padapter, RTW_FT_ASSOCIATED_STA);
else
@ -13664,11 +13664,11 @@ void rtw_ft_roam_status_reset(_adapter *padapter)
{
struct ft_roam_info *pft_roam = &(padapter->mlmepriv.ft_roam);
if ((rtw_to_roam(padapter) > 0) &&
if ((rtw_to_roam(padapter) > 0) &&
(!rtw_ft_chk_status(padapter, RTW_FT_REQUESTED_STA))) {
rtw_ft_reset_status(padapter);
}
}
padapter->mlmepriv.ft_roam.ft_updated_bcn = _FALSE;
}
#endif
@ -14359,7 +14359,7 @@ u32 rtw_scan_timeout_decision(_adapter *padapter)
struct ss_res *ss = &pmlmeext->sitesurvey_res;
if (is_supported_5g(padapter->registrypriv.wireless_mode)
&& IsSupported24G(padapter->registrypriv.wireless_mode))
&& IsSupported24G(padapter->registrypriv.wireless_mode))
max_chan_num = MAX_CHANNEL_NUM;/* dual band */
else
max_chan_num = MAX_CHANNEL_NUM_2G;/*single band*/
@ -16586,7 +16586,7 @@ u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf)
pchsw_info->ch_offset, (pchsw_info->ch_offset) ? CHANNEL_WIDTH_40 : CHANNEL_WIDTH_20, ptdls_sta->ch_switch_time) == _SUCCESS) {
pchsw_info->ch_sw_state &= ~(TDLS_PEER_AT_OFF_STATE);
if (pchsw_info->ch_sw_state & TDLS_CH_SW_INITIATOR_STATE) {
if (issue_nulldata_to_TDLS_peer_STA(ptdls_sta->padapter, ptdls_sta->cmn.mac_addr, 0, 1,
if (issue_nulldata_to_TDLS_peer_STA(ptdls_sta->padapter, ptdls_sta->cmn.mac_addr, 0, 1,
(padapter->registrypriv.wifi_spec == 0) ? 3 : 0) == _FAIL)
rtw_tdls_cmd(padapter, ptdls_sta->cmn.mac_addr, TDLS_CH_SW_TO_BASE_CHNL);
}

28
core/rtw_pwrctrl.c
View File

@ -94,7 +94,7 @@ void _ips_enter(_adapter *padapter)
if (pwrpriv->ips_mode == IPS_LEVEL_2)
pwrpriv->bkeepfwalive = _TRUE;
#ifdef CONFIG_RTW_CFGVEDNOR_LLSTATS
#ifdef CONFIG_RTW_CFGVEDNOR_LLSTATS
pwrpriv->pwr_saving_start_time = rtw_get_current_time();
#endif /* CONFIG_RTW_CFGVEDNOR_LLSTATS */
@ -133,8 +133,8 @@ int _ips_leave(_adapter *padapter)
result = rtw_ips_pwr_up(padapter);
if (result == _SUCCESS)
pwrpriv->rf_pwrstate = rf_on;
#ifdef CONFIG_RTW_CFGVEDNOR_LLSTATS
#ifdef CONFIG_RTW_CFGVEDNOR_LLSTATS
pwrpriv->pwr_saving_time += rtw_get_passing_time_ms(pwrpriv->pwr_saving_start_time);
#endif /* CONFIG_RTW_CFGVEDNOR_LLSTATS */
@ -751,7 +751,7 @@ void rtw_set_fw_config_32k(PADAPTER padapter, u8 enable)
int cnt = 0;
systime start_time;
if (enable){
/* H2C done, enter 32k */
if (val8 == 0) {
/* ser rpwm to enter 32k */
@ -888,7 +888,7 @@ void rtw_leave_lps_and_chk(_adapter *padapter, u8 ps_mode)
#ifdef CONFIG_LPS_ACK
_exit_critical_mutex(&pwrpriv->lps_ack_mutex, NULL);
#endif /* CONFIG_LPS_ACK */
}
void rtw_set_ps_mode(PADAPTER padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode, const char *msg)
@ -899,7 +899,7 @@ void rtw_set_ps_mode(PADAPTER padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode
struct dvobj_priv *psdpriv = padapter->dvobj;
struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;
#endif
#ifdef CONFIG_WMMPS_STA
#ifdef CONFIG_WMMPS_STA
struct registry_priv *pregistrypriv = &padapter->registrypriv;
#endif
#ifdef CONFIG_P2P
@ -927,7 +927,7 @@ void rtw_set_ps_mode(PADAPTER padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode
return;
#ifndef CONFIG_BT_COEXIST
#ifdef CONFIG_WMMPS_STA
#ifdef CONFIG_WMMPS_STA
if (!rtw_is_wmmps_mode(padapter))
#endif /* CONFIG_WMMPS_STA */
if ((pwrpriv->smart_ps == smart_ps) &&
@ -1111,11 +1111,11 @@ void rtw_set_ps_mode(PADAPTER padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode
}
#endif
#ifdef CONFIG_WMMPS_STA
#ifdef CONFIG_WMMPS_STA
pwrpriv->wmm_smart_ps = pregistrypriv->wmm_smart_ps;
#endif /* CONFIG_WMMPS_STA */
if (check_fwstate(pmlmepriv, _FW_LINKED))
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode));
#ifdef CONFIG_WOWLAN
@ -1224,10 +1224,10 @@ void LPS_Enter(PADAPTER padapter, const char *msg)
if (rtw_is_wmmps_mode(padapter))
msg = "WMMPS_IDLE";
#endif /* CONFIG_WMMPS_STA */
sprintf(buf, "WIFI-%s", msg);
pwrpriv->bpower_saving = _TRUE;
#ifdef CONFIG_RTW_CFGVEDNOR_LLSTATS
pwrpriv->pwr_saving_start_time = rtw_get_current_time();
#endif /* CONFIG_RTW_CFGVEDNOR_LLSTATS */
@ -1272,11 +1272,11 @@ void LPS_Leave(PADAPTER padapter, const char *msg)
if (rtw_is_wmmps_mode(padapter))
msg = "WMMPS_BUSY";
#endif /* CONFIG_WMMPS_STA */
sprintf(buf, "WIFI-%s", msg);
rtw_set_ps_mode(padapter, PS_MODE_ACTIVE, 0, 0, buf);
#ifdef CONFIG_RTW_CFGVEDNOR_LLSTATS
#ifdef CONFIG_RTW_CFGVEDNOR_LLSTATS
pwrpriv->pwr_saving_time += rtw_get_passing_time_ms(pwrpriv->pwr_saving_start_time);
#endif /* CONFIG_RTW_CFGVEDNOR_LLSTATS */
}

4
core/rtw_recv.c
View File

@ -2922,7 +2922,7 @@ static int rtw_recv_indicatepkt_check(union recv_frame *rframe, u8 *ehdr_pos, u3
RTW_INFO("0x%x ",ehdr_pos[i+ETHERNET_HEADER_SIZE]);
RTW_INFO("\n");
}
}
}
}
@ -4871,7 +4871,7 @@ void rx_query_phy_status(
precvframe->u.hdr.psta = psta;
rx_process_phy_info(padapter, precvframe);
}
} else
} else
#endif
{
if (psta)

6
core/rtw_rf.c
View File

@ -1225,7 +1225,7 @@ s8 rtw_rf_get_kfree_tx_gain_offset(_adapter *padapter, u8 path, u8 ch)
kfree_offset = kfree_data->bb_gain[bb_gain_sel][path];
if (IS_HARDWARE_TYPE_8723D(padapter))
RTW_INFO("%s path:%s, ch:%u, bb_gain_sel:%d, kfree_offset:%d\n"
, __func__, (path == 0)?"S1":"S0",
, __func__, (path == 0)?"S1":"S0",
ch, bb_gain_sel, kfree_offset);
else
RTW_INFO("%s path:%u, ch:%u, bb_gain_sel:%d, kfree_offset:%d\n"
@ -1256,7 +1256,7 @@ void rtw_rf_set_tx_gain_offset(_adapter *adapter, u8 path, s8 offset)
target_path = path;
RTW_INFO("kfree gain_offset 0x55:0x%x ", rtw_hal_read_rfreg(adapter, target_path, 0x55, 0xffffffff));
}
switch (rtw_get_chip_type(adapter)) {
#ifdef CONFIG_RTL8723D
case RTL8723D:
@ -1311,7 +1311,7 @@ void rtw_rf_set_tx_gain_offset(_adapter *adapter, u8 path, s8 offset)
rtw_warn_on(1);
break;
}
if (IS_HARDWARE_TYPE_8723D(adapter)) {
if (path == PPG_8723D_S1)
val32 = rtw_hal_read_rfreg(adapter, target_path, 0x55, 0xffffffff);

4
core/rtw_rm.c
View File

@ -1879,7 +1879,7 @@ int retrieve_radio_meas_result(struct rm_obj *prm)
/* IPI 0~10 */
for (i=0;i<11;i++)
prm->p.ipi[i] = hal_data->acs.nhm[ch][i];
#else
val8 = 0;
prm->p.anpi = val8;
@ -2285,7 +2285,7 @@ static void rm_dbg_add_meas(_adapter *padapter, char *s)
if (prm->q.action_code == RM_ACT_RADIO_MEAS_REQ)
sprintf(pstr(s), "\nAdd rmid=%x, meas_type=%s ok\n",
prm->rmid, rm_type_req_name(prm->q.m_type));
else if (prm->q.action_code == RM_ACT_NB_REP_REQ)
else if (prm->q.action_code == RM_ACT_NB_REP_REQ)
sprintf(pstr(s), "\nAdd rmid=%x, meas_type=bcn_req ok\n",
prm->rmid);

4
core/rtw_tdls.c
View File

@ -940,7 +940,7 @@ void rtw_tdls_set_ch_sw_oper_control(_adapter *padapter, u8 enable)
}
else
pHalData->ch_switch_offload = _FALSE;
if (ATOMIC_READ(&padapter->tdlsinfo.chsw_info.chsw_on) != enable)
ATOMIC_SET(&padapter->tdlsinfo.chsw_info.chsw_on, enable);
@ -1869,7 +1869,7 @@ sint On_TDLS_Setup_Req(_adapter *padapter, union recv_frame *precv_frame, struct
ptdls_sta = rtw_alloc_stainfo(pstapriv, psa);
if (ptdls_sta == NULL)
goto exit;
ptdlsinfo->sta_cnt++;
}
else {

18
core/rtw_wlan_util.c
View File

@ -1543,7 +1543,7 @@ void WMMOnAssocRsp(_adapter *padapter)
#ifdef CONFIG_WMMPS_STA
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct qos_priv *pqospriv = &pmlmepriv->qospriv;
#endif /* CONFIG_WMMPS_STA */
#endif /* CONFIG_WMMPS_STA */
acm_mask = 0;
@ -1669,7 +1669,7 @@ void WMMOnAssocRsp(_adapter *padapter)
pxmitpriv->wmm_para_seq[i] = inx[i];
RTW_INFO("wmm_para_seq(%d): %d\n", i, pxmitpriv->wmm_para_seq[i]);
}
#ifdef CONFIG_WMMPS_STA
/* if AP supports UAPSD function, driver must set each uapsd TID to coresponding mac register 0x693 */
if (pmlmeinfo->WMM_param.QoS_info & AP_SUPPORTED_UAPSD) {
@ -2317,11 +2317,11 @@ inline bool match_ranges(u16 EID, u32 value)
/*
* rtw_validate_value: validate the IE contain.
*
* Input :
* Input :
* EID : Element ID
* p : IE buffer (without EID & length)
* len : IE length
* return:
* return:
* _TRUE : All Values are validated.
* _FALSE : At least one value is NOT validated.
*/
@ -2348,7 +2348,7 @@ bool rtw_validate_value(u16 EID, u8 *p, u16 len)
inline bool hidden_ssid_ap(WLAN_BSSID_EX *snetwork)
{
return ((snetwork->Ssid.SsidLength == 0) ||
return ((snetwork->Ssid.SsidLength == 0) ||
is_all_null(snetwork->Ssid.Ssid, snetwork->Ssid.SsidLength) == _TRUE);
}
@ -2386,7 +2386,7 @@ void rtw_absorb_ssid_ifneed(_adapter *padapter, WLAN_BSSID_EX *bssid, u8 *pframe
ie_offset = _FIXED_IE_LENGTH_;
}
}
_enter_critical_bh(&padapter->mlmepriv.scanned_queue.lock, &irqL);
scanned = _rtw_find_network(&padapter->mlmepriv.scanned_queue, mac);
if (!scanned) {
@ -3167,7 +3167,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
void get_assoc_AP_Vendor(char *vendor, u8 assoc_AP_vendor)
{
switch (assoc_AP_vendor) {
case HT_IOT_PEER_UNKNOWN:
sprintf(vendor, "%s", "unknown");
break;
@ -3229,7 +3229,7 @@ void rtw_parse_sta_vendor_ie_8812(_adapter *adapter, struct sta_info *sta, u8 *t
RTW_INFO("\n");
if(*(p+6) != 2)
goto exit;
if(*(p+8) == RT_HT_CAP_USE_JAGUAR_BCUT)
sta->vendor_8812 = TRUE;
else if (*(p+8) == RT_HT_CAP_USE_JAGUAR_CCUT)
@ -3456,7 +3456,7 @@ int rtw_ies_get_supported_rate(u8 *ies, uint ies_len, u8 *rate_set, u8 *rate_num
{IEEE80211_OFDM_RATE_48MB, _FALSE, _FALSE},
{IEEE80211_OFDM_RATE_54MB, _FALSE, _FALSE},
};
if (!rate_set || !rate_num)
return _FALSE;

10
core/rtw_xmit.c
View File

@ -881,9 +881,9 @@ static void update_attrib_vcs_info(_adapter *padapter, struct xmit_frame *pxmitf
#ifdef CONFIG_WMMPS_STA
/*
* update_attrib_trigger_frame_info
* For Station mode, if a specific TID of driver setting and an AP support uapsd function, the data
* For Station mode, if a specific TID of driver setting and an AP support uapsd function, the data
* frame with corresponding TID will be a trigger frame when driver is in wmm power saving mode.
*
*
* Arguments:
* @padapter: _adapter pointer.
* @pattrib: pkt_attrib pointer.
@ -893,7 +893,7 @@ static void update_attrib_vcs_info(_adapter *padapter, struct xmit_frame *pxmitf
*/
static void update_attrib_trigger_frame_info(_adapter *padapter, struct pkt_attrib *pattrib) {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct qos_priv *pqospriv = &pmlmepriv->qospriv;
u8 trigger_frame_en = 0;
@ -1575,7 +1575,7 @@ get_sta_info:
#ifdef CONFIG_WMMPS_STA
update_attrib_trigger_frame_info(padapter, pattrib);
#endif /* CONFIG_WMMPS_STA */
#endif /* CONFIG_WMMPS_STA */
/* pattrib->priority = 5; */ /* force to used VI queue, for testing */
pattrib->hw_ssn_sel = pxmitpriv->hw_ssn_seq_no;
@ -1878,7 +1878,7 @@ s32 rtw_make_wlanhdr(_adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib)
/* TBD: temporary set (rspi, eosp) = (0, 1) which means End MPSP */
set_rspi(qc, 0);
SetEOSP(qc, 1);
set_mctrl_present(qc, 1);
}
#endif

4
hal/efuse/efuse_mask.h
View File

@ -62,11 +62,11 @@
#if defined(CONFIG_RTL8821C)
#include "rtl8821c/HalEfuseMask8821C_USB.h"
#endif
#if defined(CONFIG_RTL8710B)
#include "rtl8710b/HalEfuseMask8710B_USB.h"
#endif
#if defined(CONFIG_RTL8192F)
#include "rtl8192f/HalEfuseMask8192F_USB.h"
#endif

34
hal/hal_btcoex.c
View File

@ -643,7 +643,7 @@ struct btc_wifi_link_info halbtcoutsrc_getwifilinkinfo(PBTC_COEXIST pBtCoexist)
iface = dvobj->padapters[i];
if (!iface)
continue;
mlmeext = &iface->mlmeextpriv;
if (MLME_IS_GO(iface)) {
wifi_link_info.link_mode = BTC_LINK_ONLY_GO;
@ -681,7 +681,7 @@ struct btc_wifi_link_info halbtcoutsrc_getwifilinkinfo(PBTC_COEXIST pBtCoexist)
wifi_link_info.link_mode = BTC_LINK_NONE;
} else if (n_assoc_iface == 1) {
/* by pass */
} else if (n_assoc_iface == 2) {
} else if (n_assoc_iface == 2) {
if (sta_iface && p2p_iface) {
u8 band_sta = sta_iface->mlmeextpriv.cur_channel > 14 ? BAND_ON_5G : BAND_ON_2_4G;
u8 band_p2p = p2p_iface->mlmeextpriv.cur_channel > 14 ? BAND_ON_5G : BAND_ON_2_4G;
@ -1242,7 +1242,7 @@ u8 halbtcoutsrc_Get(void *pBtcContext, u8 getType, void *pOutBuf)
#ifdef CONFIG_P2P
{
struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
*pU1Tmp = pwdinfo->operating_channel;
}
#else
@ -1321,7 +1321,7 @@ u16 halbtcoutsrc_LnaConstrainLvl(void *pBtcContext, u8 *lna_constrain_level)
ret = _btmpoper_cmd(pBtCoexist, BT_OP_SET_BT_LANCONSTRAIN_LEVEL, 0, lna_constrain_level, 1);
_exit_critical_mutex(&GLBtcBtMpOperLock, &irqL);
} else {
} else {
ret = BT_STATUS_NOT_IMPLEMENT;
RTW_INFO("%s halbtcoutsrc_IsHwMailboxExist(pBtCoexist) == FALSE\n", __func__);
}
@ -1886,7 +1886,7 @@ void halbtcoutsrc_DisplayWifiStatus(PBTC_COEXIST pBtCoexist)
pBtCoexist->btc_get(pBtCoexist, BTC_GET_BL_WIFI_ROAM, &bRoam);
CL_SPRINTF(cliBuf, BT_TMP_BUF_SIZE, "\r\n %-35s = %d/ %d/ %d ", "Link/ Roam/ Scan",
bLink, bRoam, bScan);
CL_PRINTF(cliBuf);
CL_PRINTF(cliBuf);
pBtCoexist->btc_get(pBtCoexist, BTC_GET_U4_WIFI_IQK_TOTAL, &iqk_cnt_total);
pBtCoexist->btc_get(pBtCoexist, BTC_GET_U4_WIFI_IQK_OK, &iqk_cnt_ok);
@ -1895,7 +1895,7 @@ void halbtcoutsrc_DisplayWifiStatus(PBTC_COEXIST pBtCoexist)
"IQK All/ OK/ Fail/AutoLoad/FWDL", iqk_cnt_total, iqk_cnt_ok, iqk_cnt_fail,
((halbtcoutsrc_is_autoload_fail(pBtCoexist) == _TRUE) ? "fail":"ok"), ((halbtcoutsrc_is_fw_ready(pBtCoexist) == _TRUE) ? "ok":"fail"));
CL_PRINTF(cliBuf);
if (wifiLinkStatus & WIFI_STA_CONNECTED) {
CL_SPRINTF(cliBuf, BT_TMP_BUF_SIZE, "\r\n %-35s = %s", "IOT Peer", GLBtcIotPeerString[padapter->mlmeextpriv.mlmext_info.assoc_AP_vendor]);
CL_PRINTF(cliBuf);
@ -2198,7 +2198,7 @@ halbtcoutsrc_SetBtTRXMASK(
bStatus = NDBG_SetBtTRXMASK(Adapter, 2, bt_trx_mask, &btCanTx);
}
if (bStatus)
return TRUE;
else
@ -2244,7 +2244,7 @@ u16 halbtcoutsrc_GetBtReg_with_status(void *pBtcContext, u8 RegType, u32 RegAddr
u32 halbtcoutsrc_GetBtReg(void *pBtcContext, u8 RegType, u32 RegAddr)
{
u32 regVal;
return (BT_STATUS_BT_OP_SUCCESS == halbtcoutsrc_GetBtReg_with_status(pBtcContext, RegType, RegAddr, &regVal)) ? regVal : 0xffffffff;
}
@ -2441,7 +2441,7 @@ u32 halbtcoutsrc_GetBleScanParaFromBt(void *pBtcContext, u8 scanType)
_irqL irqL;
u8 op_code;
u8 status;
buf[0] = scanType;
_enter_critical_mutex(&GLBtcBtMpOperLock, &irqL);
@ -3422,7 +3422,7 @@ void EXhalbtcoutsrc_connect_notify(PBTC_COEXIST pBtCoexist, u8 assoType)
pBtCoexist->statistics.cnt_connect_notify++;
if (pBtCoexist->manual_control)
return;
/* All notify is called in cmd thread, don't need to leave low power again
* halbtcoutsrc_LeaveLowPower(pBtCoexist); */
if (IS_HARDWARE_TYPE_8821(pBtCoexist->Adapter)) {
@ -3684,7 +3684,7 @@ void EXhalbtcoutsrc_specific_packet_notify(PBTC_COEXIST pBtCoexist, u8 pktType)
/* compatible for 8812A */
if (hal->current_band_type == BAND_ON_5G)
packetType &= ~BTC_5G_BAND;
if (pBtCoexist->board_info.btdm_ant_num == 2)
ex_halbtc8812a2ant_specific_packet_notify(pBtCoexist, packetType);
else if (pBtCoexist->board_info.btdm_ant_num == 1)
@ -4565,7 +4565,7 @@ void EXhalbtcoutsrc_switchband_notify(struct btc_coexist *pBtCoexist, u8 type)
{
if(!halbtcoutsrc_IsBtCoexistAvailable(pBtCoexist))
return;
if(pBtCoexist->manual_control)
return;
@ -4735,7 +4735,7 @@ u8 EXhalbtcoutsrc_rate_id_to_btc_rate_id(u8 rate_id)
case DESC_RATEMCS31:
btc_rate_id = BTC_MCS_31;
break;
case DESC_RATEVHTSS1MCS0:
btc_rate_id = BTC_VHT_1SS_MCS_0;
break;
@ -4860,7 +4860,7 @@ u8 EXhalbtcoutsrc_rate_id_to_btc_rate_id(u8 rate_id)
btc_rate_id = BTC_VHT_4SS_MCS_9;
break;
}
return btc_rate_id;
}
@ -5052,7 +5052,7 @@ void hal_btcoex_ConnectNotify(PADAPTER padapter, u8 action)
else
assoType = BTC_ASSOCIATE_FINISH;
}
EXhalbtcoutsrc_connect_notify(&GLBtCoexist, assoType);
}
@ -5208,7 +5208,7 @@ u8 hal_btcoex_IsBtControlLps(PADAPTER padapter)
{
if (GLBtCoexist.bdontenterLPS == _TRUE)
return _TRUE;
if (hal_btcoex_IsBtExist(padapter) == _FALSE)
return _FALSE;
@ -5225,7 +5225,7 @@ u8 hal_btcoex_IsLpsOn(PADAPTER padapter)
{
if (GLBtCoexist.bdontenterLPS == _TRUE)
return _FALSE;
if (hal_btcoex_IsBtExist(padapter) == _FALSE)
return _FALSE;

78
hal/hal_com.c
View File

@ -1340,7 +1340,7 @@ void rtw_hal_c2h_pkt_pre_hdl(_adapter *adapter, u8 *buf, u16 len)
}
hdl_here = rtw_hal_c2h_id_handle_directly(adapter, id, seq, plen, payload) == _TRUE ? 1 : 0;
if (hdl_here)
if (hdl_here)
ret = rtw_hal_c2h_handler(adapter, id, seq, plen, payload);
else
ret = rtw_c2h_packet_wk_cmd(adapter, buf, len);
@ -1660,7 +1660,7 @@ int c2h_defeature_dbg_hdl(_adapter *adapter, u8 *data, u8 len)
RTW_PRINT("%s: 0x%02X\n", __func__, *(data + i));
ret = _SUCCESS;
exit:
return ret;
}
@ -1904,9 +1904,9 @@ u8 rtw_hal_set_req_per_rpt_cmd(_adapter *adapter, u8 group_macid,
SET_H2CCMD_REQ_PER_RPT_RPT_TYPE(cmd_buf, rpt_type);
SET_H2CCMD_REQ_PER_RPT_MACID_BMAP(cmd_buf, macid_bitmap);
ret = rtw_hal_fill_h2c_cmd(adapter,
H2C_REQ_PER_RPT,
H2C_REQ_PER_RPT_LEN,
ret = rtw_hal_fill_h2c_cmd(adapter,
H2C_REQ_PER_RPT,
H2C_REQ_PER_RPT_LEN,
cmd_buf);
return ret;
}
@ -2030,7 +2030,7 @@ int c2h_lps_status_rpt(PADAPTER adapter, u8 *data, u8 len)
if (DBG_LPS_STATUS_RPT)
RTW_INFO("=== [C2H LPS Action(%d)] LPS Status Code:%d ===\n", action, status_code);
break;
default:
RTW_INFO("UnKnown Action(%d) for C2H LPS RPT\n", action);
@ -3152,7 +3152,7 @@ void rtw_ap_multi_bcn_cfg(_adapter *adapter)
if (IS_HARDWARE_TYPE_8821(adapter) || IS_HARDWARE_TYPE_8192E(adapter))/* select BCN on port 0 for DualBeacon*/
rtw_write8(adapter, REG_CCK_CHECK, rtw_read8(adapter, REG_CCK_CHECK) & (~BIT_BCN_PORT_SEL));
/* Enable HW seq for BCN
/* Enable HW seq for BCN
* 0x4FC[0]: EN_HWSEQ / 0x4FC[1]: EN_HWSEQEXT */
#ifdef CONFIG_RTL8822B
if (IS_HARDWARE_TYPE_8822B(adapter))
@ -3714,7 +3714,7 @@ void rtw_hal_rcr_set_chk_bssid(_adapter *adapter, u8 self_action)
else if ((MSTATE_AP_NUM(&mstate) && adapter->registrypriv.wifi_spec) /* for 11n Logo 4.2.31/4.2.32 */
|| MSTATE_MESH_NUM(&mstate)
)
rcr_new &= ~RCR_CBSSID_BCN;
rcr_new &= ~RCR_CBSSID_BCN;
else
rcr_new |= RCR_CBSSID_BCN;
@ -4617,7 +4617,7 @@ void rtw_hal_set_FwAoacRsvdPage_cmd(PADAPTER padapter, PRSVDPAGE_LOC rsvdpageloc
}
#ifdef CONFIG_PNO_SUPPORT
else {
#ifndef RTW_HALMAC
#ifndef RTW_HALMAC
if (!pwrpriv->wowlan_in_resume) {
RTW_INFO("NLO_INFO=%d\n", rsvdpageloc->LocPNOInfo);
_rtw_memset(&u1H2CAoacRsvdPageParm, 0,
@ -5404,11 +5404,11 @@ static u8 rtw_hal_set_wowlan_ctrl_cmd(_adapter *adapter, u8 enable, u8 change_un
gpionum = WAKEUP_GPIO_IDX;
sdio_wakeup_enable = 0;
#endif /* CONFIG_GPIO_WAKEUP */
if(registry_par->suspend_type == FW_IPS_DISABLE_BBRF &&
!check_fwstate(pmlmepriv, _FW_LINKED))
no_wake = 1;
if (!ppwrpriv->wowlan_pno_enable &&
registry_par->wakeup_event & BIT(0) && !no_wake)
magic_pkt = enable;
@ -5535,31 +5535,31 @@ static u8 rtw_hal_set_remote_wake_ctrl_cmd(_adapter *adapter, u8 enable)
u1H2CRemoteWakeCtrlParm, 0);
}
#endif /* CONFIG_GTK_OL */
#ifdef CONFIG_IPV6
if (ppwrpriv->wowlan_ns_offload_en == _TRUE) {
RTW_INFO("enable NS offload\n");
SET_H2CCMD_REMOTE_WAKE_CTRL_NDP_OFFLOAD_EN(
u1H2CRemoteWakeCtrlParm, enable);
}
/*
* filter NetBios name service pkt to avoid being waked-up
* by this kind of unicast pkt this exceptional modification
* is used for match competitor's behavior
*/
SET_H2CCMD_REMOTE_WAKE_CTRL_NBNS_FILTER_EN(
u1H2CRemoteWakeCtrlParm, enable);
#endif /*CONFIG_IPV6*/
#ifdef CONFIG_RTL8192F
if (IS_HARDWARE_TYPE_8192F(adapter)){
SET_H2CCMD_REMOTE_WAKE_CTRL_FW_UNICAST_EN(
u1H2CRemoteWakeCtrlParm, enable);
}
#endif /* CONFIG_RTL8192F */
if ((psecuritypriv->dot11PrivacyAlgrthm == _AES_) ||
(psecuritypriv->dot11PrivacyAlgrthm == _TKIP_) ||
(psecuritypriv->dot11PrivacyAlgrthm == _NO_PRIVACY_)) {
@ -5569,12 +5569,12 @@ static u8 rtw_hal_set_remote_wake_ctrl_cmd(_adapter *adapter, u8 enable)
SET_H2CCMD_REMOTE_WAKE_CTRL_ARP_ACTION(
u1H2CRemoteWakeCtrlParm, 1);
}
if (psecuritypriv->dot11PrivacyAlgrthm == _TKIP_ &&
psecuritypriv->ndisauthtype == Ndis802_11AuthModeWPA2PSK) {
SET_H2CCMD_REMOTE_WAKE_CTRL_TKIP_OFFLOAD_EN(
u1H2CRemoteWakeCtrlParm, enable);
if (IS_HARDWARE_TYPE_8188E(adapter) ||
IS_HARDWARE_TYPE_8812(adapter)) {
SET_H2CCMD_REMOTE_WAKE_CTRL_TKIP_OFFLOAD_EN(
@ -5583,7 +5583,7 @@ static u8 rtw_hal_set_remote_wake_ctrl_cmd(_adapter *adapter, u8 enable)
u1H2CRemoteWakeCtrlParm, 1);
}
}
SET_H2CCMD_REMOTE_WAKE_CTRL_FW_PARSING_UNTIL_WAKEUP(
u1H2CRemoteWakeCtrlParm, 1);
}
@ -5595,7 +5595,7 @@ static u8 rtw_hal_set_remote_wake_ctrl_cmd(_adapter *adapter, u8 enable)
u1H2CRemoteWakeCtrlParm, enable);
}
#endif
#ifdef CONFIG_P2P_WOWLAN
if (_TRUE == ppwrpriv->wowlan_p2p_mode) {
RTW_INFO("P2P OFFLOAD ENABLE\n");
@ -5701,7 +5701,7 @@ void rtw_hal_set_fw_wow_related_cmd(_adapter *padapter, u8 enable)
u16 media_status_rpt;
u8 pkt_type = 0, no_wake = 0;
u8 ret = _SUCCESS;
if(pregistry->suspend_type == FW_IPS_DISABLE_BBRF &&
!check_fwstate(pmlmepriv, _FW_LINKED))
no_wake = 1;
@ -9744,7 +9744,7 @@ static void rtw_hal_wow_enable(_adapter *adapter)
if(pwrctl->wowlan_pno_enable)
rtw_halmac_pno_scanoffload(adapter->dvobj, 1);
#endif
#ifdef CONFIG_GTK_OL_DBG
dump_sec_cam(RTW_DBGDUMP, adapter);
dump_sec_cam_cache(RTW_DBGDUMP, adapter);
@ -9829,7 +9829,7 @@ static void rtw_hal_wow_disable(_adapter *adapter)
u8 val8;
RTW_PRINT("%s, WOWLAN_DISABLE\n", __func__);
if(registry_par->suspend_type == FW_IPS_DISABLE_BBRF
&& !check_fwstate(pmlmepriv, _FW_LINKED)
&& !pwrctl->wowlan_pno_enable) {
@ -9841,7 +9841,7 @@ static void rtw_hal_wow_disable(_adapter *adapter)
if(pwrctl->wowlan_pno_enable)
rtw_halmac_pno_scanoffload(adapter->dvobj, 0);
#endif
if (!pwrctl->wowlan_pno_enable) {
psta = rtw_get_stainfo(&adapter->stapriv, get_bssid(pmlmepriv));
if (psta != NULL)
@ -10589,7 +10589,7 @@ static void _rtw_hal_set_fw_rsvd_page(_adapter *adapter, bool finished, u8 *page
/*======== Qos null data * 1 page ======== */
if (pwrctl->wowlan_mode == _FALSE ||
pwrctl->wowlan_in_resume == _TRUE) {/*Normal mode*/
pwrctl->wowlan_in_resume == _TRUE) {/*Normal mode*/
if (MLME_IS_STA(sta_iface) || (nr_assoc_if == 0)) {
RsvdPageLoc.LocQosNull = TotalPageNum;
RTW_INFO("LocQosNull: %d\n", RsvdPageLoc.LocQosNull);
@ -11577,7 +11577,7 @@ void rtw_hal_update_uapsd_tid(_adapter *adapter)
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
struct qos_priv *pqospriv = &pmlmepriv->qospriv;
/* write complement of pqospriv->uapsd_tid to mac register 0x693 because
/* write complement of pqospriv->uapsd_tid to mac register 0x693 because
it's designed for "0" represents "enable" and "1" represents "disable" */
rtw_write8(adapter, REG_WMMPS_UAPSD_TID, (u8)(~pqospriv->uapsd_tid));
}
@ -11945,7 +11945,7 @@ u8 SetHwReg(_adapter *adapter, u8 variable, u8 *val)
break;
#endif/*CONFIG_RTS_FULL_BW*/
#if defined(CONFIG_PCI_HCI)
case HW_VAR_ENSWBCN:
case HW_VAR_ENSWBCN:
if (*val == _TRUE) {
rtw_write8(adapter, REG_CR + 1,
rtw_read8(adapter, REG_CR + 1) | BIT(0));
@ -11980,7 +11980,7 @@ void GetHwReg(_adapter *adapter, u8 variable, u8 *val)
break;
case HW_VAR_RF_TYPE:
*((u8 *)val) = hal_data->rf_type;
#ifdef CONFIG_CUSTOMER01_SMART_ANTENNA
#ifdef CONFIG_CUSTOMER01_SMART_ANTENNA
*((u8 *)val) = RF_1T1R;
#endif
break;
@ -12911,7 +12911,7 @@ u32 Hal_readPGDataFromConfigFile(PADAPTER padapter)
if (maplen < 256 || maplen > EEPROM_MAX_SIZE) {
RTW_ERR("eFuse length error :%d\n", maplen);
return _FALSE;
}
}
ret = rtw_read_efuse_from_file(EFUSE_MAP_PATH, hal_data->efuse_eeprom_data, maplen);
@ -13890,7 +13890,7 @@ void update_IOT_info(_adapter *padapter)
}
}
#ifdef CONFIG_RTS_FULL_BW
#ifdef CONFIG_RTS_FULL_BW
/*
8188E: not support full RTS BW feature(mac REG no define 480[5])
*/
@ -13909,18 +13909,18 @@ void rtw_set_rts_bw(_adapter *padapter) {
station = NULL;
station = macid_ctl->sta[i];
if(station) {
_adapter *sta_adapter =station->padapter;
struct mlme_ext_priv *pmlmeext = &(sta_adapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
if ( pmlmeinfo->state != WIFI_FW_NULL_STATE) {
if(_rtw_memcmp(macid_ctl->sta[i]->cmn.mac_addr, bc_addr, ETH_ALEN) != _TRUE) {
if ( macid_ctl->sta[i]->vendor_8812) {
connect_to_8812 = _TRUE;
enable = 0;
}
}
}
}
}
}
}
@ -13928,7 +13928,7 @@ void rtw_set_rts_bw(_adapter *padapter) {
if(connect_to_8812)
break;
}
RTW_INFO("%s connect_to_8812=%d,enable=%u\n", __FUNCTION__,connect_to_8812,enable);
rtw_hal_set_hwreg(padapter, HW_VAR_SET_RTS_BW, &enable);
}
@ -14411,8 +14411,8 @@ void hw_var_set_opmode_mbid(_adapter *Adapter, u8 mode)
rtw_hw_client_port_release(Adapter);
#endif
#if defined(CONFIG_RTL8192F)
rtw_write16(Adapter, REG_WLAN_ACT_MASK_CTRL_1, rtw_read16(Adapter,
REG_WLAN_ACT_MASK_CTRL_1) | EN_PORT_0_FUNCTION);
rtw_write16(Adapter, REG_WLAN_ACT_MASK_CTRL_1, rtw_read16(Adapter,
REG_WLAN_ACT_MASK_CTRL_1) | EN_PORT_0_FUNCTION);
#endif
}
#endif
@ -14525,7 +14525,7 @@ void rtw_dump_phy_cap_by_hal(void *sel, _adapter *adapter)
phy_cap = _FALSE;
rtw_hal_get_def_var(adapter, HAL_DEF_RX_LDPC, (u8 *)&phy_cap);
RTW_PRINT_SEL(sel, "[HAL] LDPC Rx : %s\n\n", (_TRUE == phy_cap) ? "Supported" : "N/A");
#ifdef CONFIG_BEAMFORMING
phy_cap = _FALSE;
rtw_hal_get_def_var(adapter, HAL_DEF_EXPLICIT_BEAMFORMER, (u8 *)&phy_cap);
@ -14747,7 +14747,7 @@ u8 * rtw_hal_set_8812a_vendor_ie(_adapter *padapter , u8 *pframe ,uint *frlen )
else
vendor_info[6] = RT_HT_CAP_USE_JAGUAR_BCUT;
pframe = rtw_set_ie(pframe, _VENDOR_SPECIFIC_IE_,vender_len,vendor_info , frlen);
return pframe;
}
#endif /*CONFIG_RTL8812A*/

4
hal/hal_com_c2h.h
View File

@ -18,7 +18,7 @@
#define C2H_TYPE_REG 0
#define C2H_TYPE_PKT 1
/*
/*
* C2H event format:
* Fields TRIGGER PAYLOAD SEQ PLEN ID
* BITS [127:120] [119:16] [15:8] [7:4] [3:0]
@ -32,7 +32,7 @@
#define SET_C2H_PLEN(_c2h, _val) SET_BITS_TO_LE_1BYTE(((u8*)(_c2h)), 4, 4, _val)
#define SET_C2H_SEQ(_c2h, _val) SET_BITS_TO_LE_1BYTE(((u8*)(_c2h)) + 1 , 0, 8, _val)
/*
/*
* C2H event format:
* Fields TRIGGER PLEN PAYLOAD SEQ ID
* BITS [127:120] [119:112] [111:16] [15:8] [7:0]

52
hal/hal_dm.c
View File

@ -463,20 +463,20 @@ struct turbo_edca_setting{
static struct turbo_edca_setting rtw_turbo_edca[TURBO_EDCA_MODE_NUM] = {
TURBO_EDCA_ENT(0xa42b, 0xa42b), /* mode 0 */
TURBO_EDCA_ENT(0x431c, 0x431c), /* mode 1 */
TURBO_EDCA_ENT(0x4319, 0x4319), /* mode 2 */
TURBO_EDCA_ENT(0x4319, 0x4319), /* mode 2 */
TURBO_EDCA_ENT(0x5ea42b, 0x5ea42b), /* mode 3 */
TURBO_EDCA_ENT(0x5e431c, 0x5e431c), /* mode 4 */
TURBO_EDCA_ENT(0x5e4319, 0x5e4319), /* mode 5 */
TURBO_EDCA_ENT(0x5e4319, 0x5e4319), /* mode 5 */
TURBO_EDCA_ENT(0x6ea42b, 0x6ea42b), /* mode 6 */
TURBO_EDCA_ENT(0x6e431c, 0x6e431c), /* mode 7 */
TURBO_EDCA_ENT(0x6e4319, 0x6e4319), /* mode 8 */
TURBO_EDCA_ENT(0x5ea42b, 0xa42b), /* mode 9 */
TURBO_EDCA_ENT(0x5e431c, 0x431c), /* mode 10 */
TURBO_EDCA_ENT(0x5e4319, 0x4319), /* mode 11 */
TURBO_EDCA_ENT(0x6ea42b, 0xa42b), /* mode 12 */
TURBO_EDCA_ENT(0x6e431c, 0x431c), /* mode 13 */
TURBO_EDCA_ENT(0x6e4319, 0x4319), /* mode 14 */
@ -493,18 +493,18 @@ static struct turbo_edca_setting rtw_turbo_edca[TURBO_EDCA_MODE_NUM] = {
/* { UL, DL } */
TURBO_EDCA_ENT(0x5e431c, 0x431c), /* mode 0 */
TURBO_EDCA_ENT(0x431c, 0x431c), /* mode 1 */
TURBO_EDCA_ENT(0x431c, 0x431c), /* mode 1 */
TURBO_EDCA_ENT(0x5e431c, 0x5e431c), /* mode 2 */
TURBO_EDCA_ENT(0x5ea42b, 0x5ea42b), /* mode 3 */
TURBO_EDCA_ENT(0x5ea42b, 0x431c), /* mode 4 */
TURBO_EDCA_ENT(0x6ea42b, 0x6ea42b), /* mode 5 */
TURBO_EDCA_ENT(0xa42b, 0xa42b), /* mode 6 */
TURBO_EDCA_ENT(0x5e431c, 0xa42b), /* mode 7 */
};
#endif
@ -640,15 +640,15 @@ void rtw_hal_turbo_edca(_adapter *adapter)
EDCA_BE_DL = 0x00431c;
#ifdef CONFIG_RTW_TPT_MODE
if ( dvobj->tpt_mode > 0 ) {
if ( dvobj->tpt_mode > 0 ) {
EDCA_BE_UL = dvobj->edca_be_ul;
EDCA_BE_DL = dvobj->edca_be_dl;
}
#endif /* CONFIG_RTW_TPT_MODE */
/* keep this condition at last check */
if (hal_data->dis_turboedca == 2) {
if (hal_data->dis_turboedca == 2) {
if (hal_data->edca_param_mode < TURBO_EDCA_MODE_NUM) {
struct turbo_edca_setting param;
@ -657,12 +657,12 @@ void rtw_hal_turbo_edca(_adapter *adapter)
EDCA_BE_UL = param.edca_ul;
EDCA_BE_DL = param.edca_dl;
} else {
EDCA_BE_UL = hal_data->edca_param_mode;
EDCA_BE_DL = hal_data->edca_param_mode;
}
}
}
if (traffic_index == DOWN_LINK)
@ -680,7 +680,7 @@ void rtw_hal_turbo_edca(_adapter *adapter)
struct sta_info *psta;
struct macid_ctl_t *macid_ctl = dvobj_to_macidctl(dvobj);
u8 mac_id, role, current_rate_id;
/* search all used & connect2AP macid */
for (mac_id = 0; mac_id < macid_ctl->num; mac_id++) {
if (rtw_macid_is_used(macid_ctl, mac_id)) {
@ -725,7 +725,7 @@ void rtw_hal_turbo_edca(_adapter *adapter)
#endif
if ( edca_param != hal_data->ac_param_be) {
rtw_hal_set_hwreg(adapter, HW_VAR_AC_PARAM_BE, (u8 *)(&edca_param));
RTW_INFO("Turbo EDCA =0x%x\n", edca_param);
@ -1191,7 +1191,7 @@ void dump_sta_traffic(void *sel, _adapter *adapter, struct sta_info *psta)
else
_RTW_PRINT_SEL(sel, "Tx : %d(Kbps) ", psta->sta_stats.tx_tp_kbits);
if (rx_tp_mbips)
if (rx_tp_mbips)
_RTW_PRINT_SEL(sel, "Rx : %d(Mbps) ", rx_tp_mbips);
else
_RTW_PRINT_SEL(sel, "Rx : %d(Kbps) ", psta->sta_stats.rx_tp_kbits);
@ -1211,7 +1211,7 @@ void dump_sta_traffic(void *sel, _adapter *adapter, struct sta_info *psta)
else
_RTW_PRINT_SEL(sel, "Tx : %d(Kbps) ", psta->sta_stats.smooth_tx_tp_kbits);
if (rx_tp_mbips)
if (rx_tp_mbips)
_RTW_PRINT_SEL(sel, "Rx : %d(Mbps) ", rx_tp_mbips);
else
_RTW_PRINT_SEL(sel, "Rx : %d(Kbps) ", psta->sta_stats.smooth_rx_tp_kbits);
@ -1359,7 +1359,7 @@ static u8 _rtw_phydm_rfk_condition_check(_adapter *adapter, u8 is_scaning, u8 if
#ifdef CONFIG_MCC_MODE
/*not in MCC State*/
if (MCC_EN(adapter) &&
if (MCC_EN(adapter) &&
rtw_hal_check_mcc_status(adapter, MCC_STATUS_DOING_MCC)) {
rfk_allowed = _FALSE;
if (0)
@ -1461,15 +1461,15 @@ void rtw_dyn_soml_config(_adapter *adapter)
RTW_INFO("dyn_soml_en = 1\n");
} else {
if (adapter->registrypriv.dyn_soml_en == 2) {
rtw_dyn_soml_para_set(adapter,
adapter->registrypriv.dyn_soml_train_num,
adapter->registrypriv.dyn_soml_interval,
rtw_dyn_soml_para_set(adapter,
adapter->registrypriv.dyn_soml_train_num,
adapter->registrypriv.dyn_soml_interval,
adapter->registrypriv.dyn_soml_period,
adapter->registrypriv.dyn_soml_delay);
RTW_INFO("dyn_soml_en = 2\n");
RTW_INFO("dyn_soml_en, param = %d, %d, %d, %d\n",
adapter->registrypriv.dyn_soml_train_num,
adapter->registrypriv.dyn_soml_interval,
adapter->registrypriv.dyn_soml_interval,
adapter->registrypriv.dyn_soml_period,
adapter->registrypriv.dyn_soml_delay);
} else if (adapter->registrypriv.dyn_soml_en == 0) {

4
hal/hal_dm_acs.h
View File

@ -41,7 +41,7 @@ enum NHM_PID {
nhm.mntr_time = time;\
} while (0)
#define init_acs_clm(clm, time) \
init_clm_param(clm, CLM_ACS, CLM_LV_2, time)
@ -50,7 +50,7 @@ enum NHM_PID {
#define init_11K_high_nhm(nhm, time) \
init_nhm_param(nhm, NHM_EXCLUDE_TXON, NHM_EXCLUDE_CCA, NHM_CNT_ALL, IEEE_11K_HIGH, NHM_LV_2, time)
#define init_11K_low_nhm(nhm, time) \
init_nhm_param(nhm, NHM_EXCLUDE_TXON, NHM_EXCLUDE_CCA, NHM_CNT_ALL, IEEE_11K_LOW, NHM_LV_2, time)

2
hal/hal_halmac.c
View File

@ -2603,7 +2603,7 @@ int rtw_halmac_poweron(struct dvobj_priv *d)
addr = 0x3F3;
v8 = rtw_read8(a, addr);
RTW_PRINT("%s: 0x%X = 0x%02x\n", __FUNCTION__, addr, v8);
/* are we in pcie debug mode? */
if (!(v8 & BIT(2))) {
RTW_PRINT("%s: Enable pcie debug mode\n", __FUNCTION__);

8
hal/hal_hci/hal_usb.c
View File

@ -333,7 +333,7 @@ u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr)
wvalue = (u16)(addr & 0x0000ffff);
len = 1;
/* WLANON PAGE0_REG needs to add an offset 0x8000 */
#if defined(CONFIG_RTL8710B)
if(wvalue >= 0x0000 && wvalue < 0x0100)
@ -363,7 +363,7 @@ u16 usb_read16(struct intf_hdl *pintfhdl, u32 addr)
wvalue = (u16)(addr & 0x0000ffff);
len = 2;
/* WLANON PAGE0_REG needs to add an offset 0x8000 */
#if defined(CONFIG_RTL8710B)
if(wvalue >= 0x0000 && wvalue < 0x0100)
@ -394,7 +394,7 @@ u32 usb_read32(struct intf_hdl *pintfhdl, u32 addr)
wvalue = (u16)(addr & 0x0000ffff);
len = 4;
/* WLANON PAGE0_REG needs to add an offset 0x8000 */
#if defined(CONFIG_RTL8710B)
if(wvalue >= 0x0000 && wvalue < 0x0100)
@ -426,7 +426,7 @@ int usb_write8(struct intf_hdl *pintfhdl, u32 addr, u8 val)
wvalue = (u16)(addr & 0x0000ffff);
len = 1;
data = val;
/* WLANON PAGE0_REG needs to add an offset 0x8000 */
#if defined(CONFIG_RTL8710B)
if(wvalue >= 0x0000 && wvalue < 0x0100)

6
hal/hal_intf.c
View File

@ -84,7 +84,7 @@ static void rtw_init_wireless_mode(_adapter *padapter)
struct hal_spec_t *hal_spec = GET_HAL_SPEC(padapter);
if(hal_spec->proto_cap & PROTO_CAP_11B)
proto_wireless_mode |= WIRELESS_11B;
if(hal_spec->proto_cap & PROTO_CAP_11G)
proto_wireless_mode |= WIRELESS_11G;
#ifdef CONFIG_80211AC_VHT
@ -103,7 +103,7 @@ static void rtw_init_wireless_mode(_adapter *padapter)
#endif
#ifdef CONFIG_80211AC_VHT
if(hal_spec->proto_cap & PROTO_CAP_11AC)
if(hal_spec->proto_cap & PROTO_CAP_11AC)
proto_wireless_mode |= WIRELESS_11AC;
#endif
padapter->registrypriv.wireless_mode &= proto_wireless_mode;
@ -119,7 +119,7 @@ void rtw_hal_def_value_init(_adapter *padapter)
padapter->hal_func.init_default_value(padapter);
rtw_init_hal_com_default_value(padapter);
#ifdef CONFIG_FW_MULTI_PORT_SUPPORT
adapter_to_dvobj(padapter)->dft.port_id = 0xFF;
adapter_to_dvobj(padapter)->dft.mac_id = 0xFF;

90
hal/hal_mcc.c
View File

@ -64,7 +64,7 @@ static void dump_iqk_val_table(PADAPTER padapter)
);
}
}
}
}
RTW_INFO("=============================================\n");
#endif
@ -96,7 +96,7 @@ static void rtw_hal_mcc_build_p2p_noa_attr(PADAPTER padapter, u8 *ie, u32 *ie_le
/* attrute ID(1 byte) */
p2p_noa_attr_ie[p2p_noa_attr_len] = P2P_ATTR_NOA;
p2p_noa_attr_len = p2p_noa_attr_len + 1;
/* attrute length(2 bytes) length = noa_desc_num*13 + 2 */
RTW_PUT_LE16(p2p_noa_attr_ie + p2p_noa_attr_len, (noa_desc_num * 13 + 2));
p2p_noa_attr_len = p2p_noa_attr_len + 2;
@ -153,7 +153,7 @@ static void rtw_hal_mcc_update_go_p2p_ie(PADAPTER padapter)
else {
/* has noa attribut, modify it */
u32 noa_duration = 0;
/* update index */
pos = pmccadapriv->p2p_go_noa_ie + pmccadapriv->p2p_go_noa_ie_len - 15;
/* 0~255 */
@ -277,7 +277,7 @@ static void rtw_hal_mcc_update_policy_table(PADAPTER adapter)
mcc_switch_channel_policy_table[mcc_policy_idx][MCC_START_TIME_OFFSET_IDX]
= new_starttime_offset;
}
@ -314,7 +314,7 @@ static void rtw_hal_config_mcc_switch_channel_setting(PADAPTER padapter)
}
static void rtw_hal_mcc_assign_tx_threshold(PADAPTER padapter)
static void rtw_hal_mcc_assign_tx_threshold(PADAPTER padapter)
{
struct registry_priv *preg = &padapter->registrypriv;
struct mcc_adapter_priv *pmccadapriv = &padapter->mcc_adapterpriv;
@ -458,7 +458,7 @@ static void rtw_hal_config_mcc_role_setting(PADAPTER padapter, u8 order)
phead = &pstapriv->asoc_list;
plist = get_next(phead);
pmccadapriv->mcc_macid_bitmap = 0;
while ((rtw_end_of_queue_search(phead, plist)) == _FALSE) {
psta = LIST_CONTAINOR(plist, struct sta_info, asoc_list);
plist = get_next(plist);
@ -584,7 +584,7 @@ static u8 rtw_hal_mcc_check_start_time_is_valid(PADAPTER padapter, u8 case_num,
u8 intersection = _FALSE;
u8 min_start_time = 5;
u8 max_start_time = 95;
duration_0 = mccobjpriv->iface[0]->mcc_adapterpriv.mcc_duration;
duration_1 = mccobjpriv->iface[1]->mcc_adapterpriv.mcc_duration;
@ -687,7 +687,7 @@ static void rtw_hal_mcc_decide_duration(PADAPTER padapter)
iface_order1 = mccobjpriv->iface[1];
mccadapriv_order0 = &iface_order0->mcc_adapterpriv;
mccadapriv_order1 = &iface_order1->mcc_adapterpriv;
if (mccobjpriv->duration == 0) {
/* default */
duration = 30;/*(%)*/
@ -746,7 +746,7 @@ static u8 rtw_hal_mcc_update_timing_parameters(PADAPTER padapter, u8 force_updat
u8 valid = _FALSE;
u8 case_num = 1;
u8 i = 0;
/* query TSF */
rtw_hal_mcc_rqt_tsf(padapter, tsf);
@ -816,7 +816,7 @@ static u8 rtw_hal_mcc_update_timing_parameters(PADAPTER padapter, u8 force_updat
rtw_hal_mcc_decide_duration(padapter);
if (tsfdiff <= 50) {
/* RX TBTT 0 */
case_num = 1;
valid = rtw_hal_mcc_check_start_time_is_valid(padapter, case_num, tsfdiff,
@ -824,7 +824,7 @@ static u8 rtw_hal_mcc_update_timing_parameters(PADAPTER padapter, u8 force_updat
if (valid)
goto valid_result;
/* RX TBTT 1 */
case_num = 2;
valid = rtw_hal_mcc_check_start_time_is_valid(padapter, case_num, tsfdiff,
@ -832,7 +832,7 @@ static u8 rtw_hal_mcc_update_timing_parameters(PADAPTER padapter, u8 force_updat
if (valid)
goto valid_result;
/* RX TBTT 2 */
case_num = 3;
valid = rtw_hal_mcc_check_start_time_is_valid(padapter, case_num, tsfdiff,
@ -857,8 +857,8 @@ static u8 rtw_hal_mcc_update_timing_parameters(PADAPTER padapter, u8 force_updat
if (valid)
goto valid_result;
/* RX TBTT 1 */
case_num = 5;
valid = rtw_hal_mcc_check_start_time_is_valid(padapter, case_num, tsfdiff,
@ -867,7 +867,7 @@ static u8 rtw_hal_mcc_update_timing_parameters(PADAPTER padapter, u8 force_updat
if (valid)
goto valid_result;
/* RX TBTT 2 */
case_num = 6;
valid = rtw_hal_mcc_check_start_time_is_valid(padapter, case_num, tsfdiff,
@ -883,7 +883,7 @@ static u8 rtw_hal_mcc_update_timing_parameters(PADAPTER padapter, u8 force_updat
}
}
valid_result:
RTW_INFO("********************\n");
@ -893,7 +893,7 @@ static u8 rtw_hal_mcc_update_timing_parameters(PADAPTER padapter, u8 force_updat
__func__, upper_bound_0, lower_bound_0);
RTW_INFO("%s: upper_bound_1:%d, lower_bound_1:%d\n",
__func__, upper_bound_1, lower_bound_1);
for (i = 0; i < dvobj->iface_nums; i++) {
iface = dvobj->padapters[i];
if (iface == NULL)
@ -922,7 +922,7 @@ static u8 rtw_hal_mcc_update_timing_parameters(PADAPTER padapter, u8 force_updat
FUNC_ADPT_ARG(iface), pmccadapriv->mgmt_queue_macid, pmccadapriv->mcc_macid_bitmap);
RTW_INFO("********************\n");
}
}
exit:
return need_update;
@ -1181,7 +1181,7 @@ u8 rtw_hal_dl_mcc_fw_rsvd_page(_adapter *adapter, u8 *pframe, u16 *index,
i, pmccobjpriv->mcc_pwr_idx_rsvd_page[i]);
total_rate_offset = start;
for (path = RF_PATH_A; path < hal->NumTotalRFPath; ++path) {
total_rate = 0;
/* PATH A for 0~63 byte, PATH B for 64~127 byte*/
@ -1223,7 +1223,7 @@ u8 rtw_hal_dl_mcc_fw_rsvd_page(_adapter *adapter, u8 *pframe, u16 *index,
ADPT_ARG(iface), rf_path_char(path), ch_width_str(bw),
center_ch, MGN_RATE_STR(rates[j]), power_index);
shift = rate % 4;
power_index_4bytes |= ((power_index & 0xff) << (shift * 8));
if (shift == 3) {
@ -1233,7 +1233,7 @@ u8 rtw_hal_dl_mcc_fw_rsvd_page(_adapter *adapter, u8 *pframe, u16 *index,
total_rate++;
}
#endif
}
}
@ -1344,7 +1344,7 @@ u8 rtw_hal_dl_mcc_fw_rsvd_page(_adapter *adapter, u8 *pframe, u16 *index,
RTW_INFO("TXPWR("ADPT_FMT"): [%c][%s]ch:%u, %s, pwr_idx:%u\n",
ADPT_ARG(iface), rf_path_char(path), ch_width_str(bw),
center_ch, MGN_RATE_STR(rates[j]), power_index);
shift = rate % 4;
power_index_4bytes |= ((power_index & 0xff) << (shift * 8));
if (shift == 3) {
@ -1427,7 +1427,7 @@ u8 rtw_hal_dl_mcc_fw_rsvd_page(_adapter *adapter, u8 *pframe, u16 *index,
}
#endif
}
}
/* total rate store in offset 0 */
*total_rate_offset = total_rate;
@ -1523,7 +1523,7 @@ static void rtw_hal_set_mcc_time_setting_cmd(PADAPTER padapter)
u8 fw_eable = 1;
u8 swchannel_early_time = MCC_SWCH_FW_EARLY_TIME;
u8 starting_ap_num = DEV_AP_STARTING_NUM(dvobj);
u8 ap_num = DEV_AP_NUM(dvobj);
u8 ap_num = DEV_AP_NUM(dvobj);
if (starting_ap_num == 0 && ap_num == 0)
/* For STA+GC/STA+STA, TSF of GC/STA does not need to sync from TSF of other STA/GC */
@ -1548,7 +1548,7 @@ static void rtw_hal_set_mcc_time_setting_cmd(PADAPTER padapter)
tsf_bsae_port = rtw_hal_get_port(order1_iface);
tsf_sync_port = rtw_hal_get_port(order0_iface);
/* FW set enable */
SET_H2CCMD_MCC_TIME_SETTING_FW_EN(cmd, fw_eable);
/* TSF Sync offset */
@ -1683,7 +1683,7 @@ static void rtw_hal_set_mcc_macid_cmd(PADAPTER padapter)
pmccadapriv = &iface->mcc_adapterpriv;
if (pmccadapriv->role == MCC_ROLE_MAX)
continue;
order = pmccadapriv->order;
bitmap = pmccadapriv->mcc_macid_bitmap;
@ -2215,7 +2215,7 @@ static void rtw_hal_mcc_start_posthdl(PADAPTER padapter)
mccadapriv = &iface->mcc_adapterpriv;
if (mccadapriv->role == MCC_ROLE_MAX)
continue;
mccadapriv->mcc_tx_bytes_from_kernel = 0;
mccadapriv->mcc_last_tx_bytes_from_kernel = 0;
mccadapriv->mcc_tx_bytes_to_port = 0;
@ -2426,12 +2426,12 @@ static void rtw_hal_mcc_update_noa_start_time_hdl(PADAPTER padapter, u8 buflen,
u8 policy_idx = pmccobjpriv->policy_index;
u8 noa_tsf_sync_offset = mcc_switch_channel_policy_table[policy_idx][MCC_TSF_SYNC_OFFSET_IDX];
u8 noa_start_time_offset = mcc_switch_channel_policy_table[policy_idx][MCC_START_TIME_OFFSET_IDX];
for (i = 0; i < pdvobjpriv->iface_nums; i++) {
iface = pdvobjpriv->padapters[i];
if (iface == NULL)
continue;
pmccadapriv = &iface->mcc_adapterpriv;
if (pmccadapriv->role == MCC_ROLE_MAX)
continue;
@ -2518,7 +2518,7 @@ void rtw_hal_mcc_c2h_handler(PADAPTER padapter, u8 buflen, u8 *tmpBuf)
if (0)
RTW_INFO("%d,order:%d,TSF:0x%llx\n", tmpBuf[0], tmpBuf[1], RTW_GET_LE64(tmpBuf + 2));
switch (pmccobjpriv->mcc_c2h_status) {
case MCC_RPT_SUCCESS:
_enter_critical_bh(&pmccobjpriv->mcc_lock, &irqL);
@ -2566,12 +2566,12 @@ void rtw_hal_mcc_c2h_handler(PADAPTER padapter, u8 buflen, u8 *tmpBuf)
}
void rtw_hal_mcc_update_parameter(PADAPTER padapter, u8 force_update)
{
{
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
struct mcc_obj_priv *mccobjpriv = &(dvobj->mcc_objpriv);
u8 cmd[H2C_MCC_TIME_SETTING_LEN] = {0};
u8 swchannel_early_time = MCC_SWCH_FW_EARLY_TIME;
u8 ap_num = DEV_AP_NUM(dvobj);
u8 ap_num = DEV_AP_NUM(dvobj);
if (ap_num == 0) {
u8 need_update = _FALSE;
@ -2581,7 +2581,7 @@ void rtw_hal_mcc_update_parameter(PADAPTER padapter, u8 force_update)
if (need_update == _FALSE)
return;
start_time_offset = mccobjpriv->start_time;
interval = mccobjpriv->interval;
duration = mccobjpriv->iface[0]->mcc_adapterpriv.mcc_duration;
@ -2626,11 +2626,11 @@ void rtw_hal_mcc_update_parameter(PADAPTER padapter, u8 force_update)
iface = dvobj->padapters[i];
if (iface == NULL)
continue;
mccadapriv = &iface->mcc_adapterpriv;
if (mccadapriv->role == MCC_ROLE_MAX)
continue;
if (mccadapriv->role == MCC_ROLE_GO)
rtw_hal_mcc_update_go_p2p_ie(iface);
}
@ -2672,7 +2672,7 @@ void rtw_hal_mcc_sw_status_check(PADAPTER padapter)
u8 noa_enable = _FALSE;
u8 i = 0;
_irqL irqL;
u8 ap_num = DEV_AP_NUM(dvobj);
u8 ap_num = DEV_AP_NUM(dvobj);
/* #define MCC_RESTART 1 */
@ -2692,12 +2692,12 @@ void rtw_hal_mcc_sw_status_check(PADAPTER padapter)
mccadapriv = &iface->mcc_adapterpriv;
if (mccadapriv->role == MCC_ROLE_MAX)
continue;
if (iface->wdinfo.p2p_ps_mode == P2P_PS_NOA) {
noa_enable = _TRUE;
break;
}
}
}
if (!noa_enable && ap_num == 0)
rtw_hal_mcc_update_parameter(padapter, _FALSE);
@ -2780,7 +2780,7 @@ u8 rtw_hal_mcc_change_scan_flag(PADAPTER padapter, u8 *ch, u8 *bw, u8 *offset)
/* disable PS_ANNC & TX_RESUME for all interface */
/* ToDo: TX_RESUME by interface in SCAN_BACKING_OP */
mlmeext = &padapter->mlmeextpriv;
flags = mlmeext_scan_backop_flags(mlmeext);
if (mlmeext_chk_scan_backop_flags(mlmeext, SS_BACKOP_PS_ANNC))
flags &= ~SS_BACKOP_PS_ANNC;
@ -2809,7 +2809,7 @@ u8 rtw_hal_mcc_change_scan_flag(PADAPTER padapter, u8 *ch, u8 *bw, u8 *offset)
/* bypass non-linked/non-linking interface/scan interface */
continue;
}
if (back_op) {
*ch = mlmeext->cur_channel;
*bw = mlmeext->cur_bwmode;
@ -2965,7 +2965,7 @@ u8 rtw_hal_set_mcc_setting_scan_complete(PADAPTER padapter)
if (rtw_hal_check_mcc_status(padapter, MCC_STATUS_NEED_MCC)) {
rtw_hal_mcc_assign_scan_flag(padapter, 1);
ret = rtw_hal_set_mcc_setting(padapter, MCC_SETCMD_STATUS_START_SCAN_DONE);
ret = rtw_hal_set_mcc_setting(padapter, MCC_SETCMD_STATUS_START_SCAN_DONE);
}
_exit_critical_mutex(&pmccobjpriv->mcc_mutex, NULL);
}
@ -3179,7 +3179,7 @@ void rtw_hal_dump_mcc_info(void *sel, struct dvobj_priv *dvobj)
}
}
RTW_PRINT_SEL(sel, "------------------------------------------\n");
RTW_PRINT_SEL(sel, "policy index:%d\n", mccobjpriv->policy_index);
RTW_PRINT_SEL(sel, "policy index:%d\n", mccobjpriv->policy_index);
RTW_PRINT_SEL(sel, "------------------------------------------\n");
RTW_PRINT_SEL(sel, "define data:\n");
RTW_PRINT_SEL(sel, "ap target tx TP(BW:20M):%d Mbps\n", MCC_AP_BW20_TARGET_TX_TP);
@ -3281,7 +3281,7 @@ u8 *rtw_hal_mcc_append_go_p2p_ie(PADAPTER padapter, u8 *pframe, u32 *len)
if (!MCC_EN(padapter))
return pframe;
if (!rtw_hal_check_mcc_status(padapter, MCC_STATUS_DOING_MCC))
return pframe;
@ -3433,7 +3433,7 @@ u8 rtw_set_mcc_duration_hdl(PADAPTER adapter, u8 type, const u8 *val)
rtw_hal_mcc_update_policy_table(adapter);
}
/* only update sw parameter under MCC
/* only update sw parameter under MCC
it will be force update during */
if (noa_enable)
goto exit;
@ -3452,7 +3452,7 @@ u8 rtw_set_mcc_duration_cmd(_adapter *adapter, u8 type, u8 val)
u8 *mcc_duration = NULL;
u8 res = _FAIL;
cmdobj = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (cmdobj == NULL)
goto exit;

4
hal/led/hal_led.c
View File

@ -102,7 +102,7 @@ void rtw_sw_led_blink_uc_trx_only(LED_DATA *led)
led->BlinkingLedState = RTW_LED_OFF;
else
led->BlinkingLedState = RTW_LED_ON;
if (bStopBlinking) {
led->CurrLedState = RTW_LED_OFF;
led->bLedBlinkInProgress = _FALSE;
@ -225,7 +225,7 @@ void rtw_led_set_iface_en_mask(_adapter *adapter, u8 mask)
void rtw_led_set_ctl_en_mask(_adapter *adapter, u32 ctl_mask)
{
struct led_priv *ledpriv = adapter_to_led(adapter);
#if CONFIG_RTW_SW_LED_TRX_DA_CLASSIFY
if (ctl_mask & BIT(LED_CTL_TX))
ctl_mask |= BIT(LED_CTL_UC_TX) | BIT(LED_CTL_BMC_TX);

2
hal/phydm/ap_makefile.mk
View File

@ -98,7 +98,7 @@ ifeq ($(CONFIG_WLAN_HAL_8822CE),y)
_PHYDM_FILES += phydm/halrf/rtl8822c/halrf_8822c.o
_PHYDM_FILES += phydm/halrf/rtl8822c/halrf_iqk_8822c.o
_PHYDM_FILES += phydm/halrf/rtl8822c/halrf_dpk_8822c.o
_PHYDM_FILES += phydm/halrf/rtl8822c/halrf_rfk_init_8822c.o
_PHYDM_FILES += phydm/halrf/rtl8822c/halrf_rfk_init_8822c.o
ifeq ($(CONFIG_RTL_ODM_WLAN_DRIVER),y)
_PHYDM_FILES += \
phydm/rtl8822c/halhwimg8822c_bb.o\

6
hal/phydm/halrf/halphyrf_iot.c
View File

@ -500,7 +500,7 @@ odm_reset_iqk_result(
u8 odm_get_right_chnl_place_for_iqk(u8 chnl)
{
}
void
@ -508,7 +508,7 @@ odm_iq_calibrate(
struct dm_struct *dm
)
{
}
void phydm_rf_init(void *dm_void)
@ -516,7 +516,7 @@ void phydm_rf_init(void *dm_void)
struct dm_struct *dm = (struct dm_struct *)dm_void;
odm_txpowertracking_init(dm);
odm_clear_txpowertracking_state(dm);
}

2
hal/phydm/halrf/halphyrf_win.c
View File

@ -783,7 +783,7 @@ odm_iq_calibrate(
{
void *adapter = dm->adapter;
struct dm_iqk_info *iqk_info = &dm->IQK_info;
RF_DBG(dm, DBG_RF_IQK, "=>%s\n",__FUNCTION__);
#if (DM_ODM_SUPPORT_TYPE == ODM_WIN)

6
hal/phydm/halrf/halrf.c
View File

@ -1935,7 +1935,7 @@ void halrf_dpk_track(void *dm_void)
#if (RTL8822C_SUPPORT == 1)
case ODM_RTL8822C:
dpk_track_8822c(dm);
break;
break;
#endif
#if (RTL8195B_SUPPORT == 1)
@ -1961,7 +1961,7 @@ void halrf_dpk_track(void *dm_void)
#if (RTL8198F_SUPPORT == 1)
case ODM_RTL8198F:
dpk_track_8198f(dm);
break;
break;
#endif
#endif
@ -2003,7 +2003,7 @@ void halrf_dpk_reload(void *dm_void)
case ODM_RTL8198F:
if (dpk_info->dpk_path_ok > 0)
dpk_reload_8198f(dm);
break;
break;
#endif
#endif

2
hal/phydm/halrf/halrf_powertracking_ap.c
View File

@ -1032,7 +1032,7 @@ odm_txpowertracking_thermal_meter_init(
void *adapter = dm->adapter;
HAL_DATA_TYPE *hal_data = GET_HAL_DATA(((PADAPTER)adapter));
struct dm_priv *pdmpriv = &hal_data->dmpriv;
pdmpriv->is_txpowertracking = true;
pdmpriv->tx_powercount = 0;
pdmpriv->is_txpowertracking_init = false;

2
hal/phydm/halrf/halrf_powertracking_ce.c
View File

@ -806,7 +806,7 @@ void odm_txpowertracking_check_ce(void *dm_void)
dm->rf_calibrate_info.tm_trigger = 1;
return;
}
if (dm->support_ic_type &
(ODM_RTL8822C | ODM_RTL8814B))
return;

8
hal/phydm/halrf/halrf_powertracking_win.c
View File

@ -530,8 +530,8 @@ get_swing_index(
u32 bb_swing, table_value;
if (dm->support_ic_type == ODM_RTL8188E || dm->support_ic_type == ODM_RTL8723B ||
dm->support_ic_type == ODM_RTL8192E || dm->support_ic_type == ODM_RTL8188F ||
dm->support_ic_type == ODM_RTL8703B || dm->support_ic_type == ODM_RTL8723D ||
dm->support_ic_type == ODM_RTL8192E || dm->support_ic_type == ODM_RTL8188F ||
dm->support_ic_type == ODM_RTL8703B || dm->support_ic_type == ODM_RTL8723D ||
dm->support_ic_type == ODM_RTL8192F || dm->support_ic_type == ODM_RTL8710B ||
dm->support_ic_type == ODM_RTL8821) {
bb_swing = odm_get_bb_reg(dm, REG_OFDM_0_XA_TX_IQ_IMBALANCE, 0xFFC00000);
@ -674,11 +674,11 @@ odm_txpowertracking_thermal_meter_init(
cali_info->default_ofdm_index = 28; /*OFDM: -1dB*/
cali_info->default_cck_index = 28; /*CCK: -6dB*/
/* JJ ADD 20161014 */
} else if (dm->support_ic_type == ODM_RTL8710B) {
} else if (dm->support_ic_type == ODM_RTL8710B) {
cali_info->default_ofdm_index = 28; /*OFDM: -1dB*/
cali_info->default_cck_index = 28; /*CCK: -6dB*/
/*Winnita add 20170828*/
} else if (dm->support_ic_type == ODM_RTL8192F) {
} else if (dm->support_ic_type == ODM_RTL8192F) {
cali_info->default_ofdm_index = 30; /*OFDM: 0dB*/
cali_info->default_cck_index = 28; /*CCK: -6dB*/
} else {

4
hal/phydm/halrf/halrf_psd.c
View File

@ -127,7 +127,7 @@ void halrf_psd(
psd->buf_size = 256;
mode = average >> 16;
if (mode == 1)
average_tmp = average & 0xffff;
else if (mode == 2)
@ -284,7 +284,7 @@ void halrf_iqk_psd(
psd->buf_size = 256;
mode = average >> 16;
if (mode == 1)
average_tmp = average & 0xffff;
else if (mode == 2) {

4
hal/phydm/phydm.mk
View File

@ -40,7 +40,7 @@ _PHYDM_FILES := hal/phydm/phydm_debug.o \
hal/phydm/halrf/halrf_powertracking_ce.o\
hal/phydm/halrf/halrf_powertracking.o\
hal/phydm/halrf/halrf_kfree.o
ifeq ($(CONFIG_RTL8188E), y)
RTL871X = rtl8188e
_PHYDM_FILES += hal/phydm/$(RTL871X)/halhwimg8188e_mac.o\
@ -189,7 +189,7 @@ _PHYDM_FILES += hal/phydm/$(RTL871X)/halhwimg8192f_bb.o\
hal/phydm/$(RTL871X)/phydm_hal_api8192f.o\
hal/phydm/$(RTL871X)/phydm_regconfig8192f.o\
hal/phydm/$(RTL871X)/phydm_rtl8192f.o\
hal/phydm/halrf/$(RTL871X)/halrf_8192f.o
hal/phydm/halrf/$(RTL871X)/halrf_8192f.o
endif
ifeq ($(CONFIG_RTL8198F), y)

2
hal/phydm/phydm_debug.c
View File

@ -2201,7 +2201,7 @@ void phydm_basic_dbg_message(void *dm_void)
/*if (!(dm->debug_components & DBG_CMN))*/
/* return; */
if (dm->cmn_dbg_msg_cnt >= dm->cmn_dbg_msg_period) {
dm->cmn_dbg_msg_cnt = PHYDM_WATCH_DOG_PERIOD;

2
hal/phydm/phydm_dig.c
View File

@ -135,7 +135,7 @@ void phydm_dig_damping_chk(void *dm_void)
switch (igi_bitmap_4bit) {
case 0x5:
/*@ 4b'0101
/*@ 4b'0101
* IGI:[3]down(0x24)->[2]up(0x26)->[1]down(0x24)->[0]up(0x26)->[new](Lock @ 0x26)
* FA: [3] >high1 ->[2] <low ->[1] >high1 ->[0] <low ->[new] <low
*

4
hal/phydm/phydm_dynamictxpower.c
View File

@ -221,7 +221,7 @@ u8 phydm_search_min_power_index(void *dm_void)
#endif
if (gain_index == 0xff) {
min_gain_index = 0x20;
PHYDM_DBG(dm, DBG_DYN_TXPWR,
PHYDM_DBG(dm, DBG_DYN_TXPWR,
"Error Gain idx!! Rewite to: ((%d))\n", min_gain_index);
break;
}
@ -349,7 +349,7 @@ void phydm_dtp_per_sta(void *dm_void, u8 macid)
PHYDM_DBG(dm, DBG_DYN_TXPWR,
"STA=%d , RSSI: %d , GetPwrLv: %d\n", macid,
rssi->rssi, dtp->sta_tx_high_power_lvl);
if (dtp->sta_tx_high_power_lvl == tx_high_pwr_level_unchange
if (dtp->sta_tx_high_power_lvl == tx_high_pwr_level_unchange
|| dtp->sta_tx_high_power_lvl == dtp->sta_last_dtp_lvl) {
dtp->sta_tx_high_power_lvl = dtp->sta_last_dtp_lvl;
PHYDM_DBG(dm, DBG_DYN_TXPWR,

4
hal/phydm/phydm_features_win.h
View File

@ -120,11 +120,11 @@
/*#define CONFIG_HL_SMART_ANTENNA_TYPE1*/
#define CONFIG_FAT_PATCH
#endif
#if (RTL8822B_SUPPORT)
/*#define CONFIG_HL_SMART_ANTENNA_TYPE2*/
#endif
#if (defined(CONFIG_HL_SMART_ANTENNA_TYPE1) || defined(CONFIG_HL_SMART_ANTENNA_TYPE2))
#define CONFIG_HL_SMART_ANTENNA
#endif

12
hal/phydm/phydm_mp.c
View File

@ -272,7 +272,7 @@ void phydm_mp_set_single_carrier(void *dm_void, boolean is_single_carrier)
odm_set_bb_reg(dm, R_0x100, 0x100, 0x0);
odm_set_bb_reg(dm, R_0x100, 0x100, 0x1);
}
}
}
}
void phydm_mp_reset_rx_counters_phy(void *dm_void)
{
@ -306,9 +306,9 @@ void phydm_mp_get_tx_ok(void *dm_void, u32 rate_index)
void phydm_mp_get_rx_ok(void *dm_void)
{
struct dm_struct *dm = (struct dm_struct *)dm_void;
struct phydm_mp *mp = &dm->dm_mp_table;
struct phydm_mp *mp = &dm->dm_mp_table;
u32 cck_ok = 0, ofdm_ok = 0, ht_ok = 0, vht_ok = 0;
u32 cck_ok = 0, ofdm_ok = 0, ht_ok = 0, vht_ok = 0;
u32 cck_err = 0, ofdm_err = 0, ht_err = 0, vht_err = 0;
if (dm->support_ic_type & ODM_IC_JGR3_SERIES) {
@ -316,7 +316,7 @@ void phydm_mp_get_rx_ok(void *dm_void)
ofdm_ok = odm_get_bb_reg(dm, R_0x2c14, 0xffff);
ht_ok = odm_get_bb_reg(dm, R_0x2c10, 0xffff);
vht_ok = odm_get_bb_reg(dm, R_0x2c0c, 0xffff);
cck_err = odm_get_bb_reg(dm, R_0x2c04, 0xffff0000);
ofdm_err = odm_get_bb_reg(dm, R_0x2c14, 0xffff0000);
ht_err = odm_get_bb_reg(dm, R_0x2c10, 0xffff0000);
@ -326,7 +326,7 @@ void phydm_mp_get_rx_ok(void *dm_void)
ofdm_ok = odm_get_bb_reg(dm, R_0xf14, 0x3FFF);
ht_ok = odm_get_bb_reg(dm, R_0xf10, 0x3FFF);
vht_ok = odm_get_bb_reg(dm, R_0xf0c, 0x3FFF);
cck_err = odm_get_bb_reg(dm, R_0xf04, 0x3FFF0000);
ofdm_err = odm_get_bb_reg(dm, R_0xf14, 0x3FFF0000);
ht_err = odm_get_bb_reg(dm, R_0xf10, 0x3FFF0000);
@ -335,7 +335,7 @@ void phydm_mp_get_rx_ok(void *dm_void)
cck_ok = odm_get_bb_reg(dm, R_0xf88, MASKDWORD);
ofdm_ok = odm_get_bb_reg(dm, R_0xf94, 0xffff);
ht_ok = odm_get_bb_reg(dm, R_0xf90, 0xffff);
cck_err = odm_get_bb_reg(dm, R_0xf84, MASKDWORD);
ofdm_err = odm_get_bb_reg(dm, R_0xf94, 0xffff0000);
ht_err = odm_get_bb_reg(dm, R_0xf90, 0xffff0000);

2
hal/phydm/phydm_mp.h
View File

@ -60,7 +60,7 @@ struct phydm_mp {
* 1 ============================================================
*/
enum TX_MODE_OFDM {
OFDM_OFF = 0,
OFDM_OFF = 0,
OFDM_CONT_TX = 1,
OFDM_SINGLE_CARRIER = 2,
OFDM_SINGLE_TONE = 4,

2
hal/phydm/phydm_regtable.h
View File

@ -267,7 +267,7 @@
#define R_0x3a44 0x3a44
#define R_0x3a48 0x3a48
#define R_0x3a4c 0x3a4c
#define R_0x3a50 0x3a50
#define R_0x3a50 0x3a50
#define R_0x3a54 0x3a54
#define R_0x3a58 0x3a58
#define R_0x3a5c 0x3a5c

16
hal/phydm/rtl8822b/phydm_rtl8822b.c
View File

@ -507,7 +507,7 @@ void phydm_set_weighting_mcc(u8 b_equal_weighting, void *dm_void, u8 port)
mcc_dm->mcc_reg_id[4] = 0x4;
mcc_dm->mcc_dm_reg[4] = 0x81b;
mcc_dm->mcc_dm_val[4][port] = val_0x81b;
}
void phydm_dyn_ant_dec_mcc(u8 port, u8 rssi_in, void *dm_void)
{
@ -573,11 +573,11 @@ u8 phydm_check(void *dm_void)
mcc_macid = mcc_dm->sta_macid[i][j];
p_entry = dm->phydm_sta_info[mcc_macid];
if (p_entry == NULL) {
PHYDM_DBG(dm, DBG_COMP_MCC, "Pentry == NULL(mac=%d)\n",
PHYDM_DBG(dm, DBG_COMP_MCC, "Pentry == NULL(mac=%d)\n",
mcc_dm->sta_macid[i][j]);
return _FAIL;
}
PHYDM_DBG(dm, DBG_COMP_MCC, "undecorated_smoothed_pwdb=%d\n",
PHYDM_DBG(dm, DBG_COMP_MCC, "undecorated_smoothed_pwdb=%d\n",
p_entry->rssi_stat.rssi);
if (p_entry->rssi_stat.rssi < rssi_tmp_min[i])
rssi_tmp_min[i] = p_entry->rssi_stat.rssi;
@ -615,7 +615,7 @@ void phydm_mcc_h2ccmd(void *dm_void)
u8 h2c_mcc[H2C_MAX_LENGTH];
if (mcc_dm->mcc_rf_channel[0] == 0xff && mcc_dm->mcc_rf_channel[1] == 0xff) {
PHYDM_DBG(dm, DBG_COMP_MCC, "MCC channel Error\n");
PHYDM_DBG(dm, DBG_COMP_MCC, "MCC channel Error\n");
return;
}
/* Set Channel number */
@ -655,8 +655,8 @@ void phydm_mcc_h2ccmd(void *dm_void)
h2c_mcc[5], h2c_mcc[6]);
}
}
}
void phydm_mcc_ctrl(void *dm_void)
@ -716,7 +716,7 @@ void phydm_mcc_switch(void *dm_void)
}
/* Set IGI*/
phydm_mcc_igi_cal(dm);
/* Set Antenna Gain*/
#if (RTL8822B_SUPPORT == 1)
phydm_dynamic_ant_weighting_mcc_8822b(dm);
@ -760,7 +760,7 @@ phydm_pw_sat_8822b(
odm_set_bb_reg(dm, 0x830, MASKDWORD, 0x79a0eaaa);
odm_set_bb_reg(dm, 0xe58, BIT(20), 0x1);
odm_set_bb_reg(dm, 0xcb0, (MASKBYTE2 | MASKLWORD),
0x177717);
odm_set_bb_reg(dm, 0xeb0, (MASKBYTE2 | MASKLWORD),

16
hal/rtl8822b/rtl8822b_cmd.c
View File

@ -125,7 +125,7 @@ void rtl8822b_set_FwPwrMode_cmd(PADAPTER adapter, u8 psmode)
#ifdef CONFIG_WMMPS_STA
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
struct qos_priv *pqospriv = &pmlmepriv->qospriv;
#endif /* CONFIG_WMMPS_STA */
#endif /* CONFIG_WMMPS_STA */
u8 h2c[RTW_HALMAC_H2C_MAX_SIZE] = {0};
u8 PowerState = 0, awake_intvl = 1, rlbm = 0;
u8 allQueueUAPSD = 0;
@ -143,7 +143,7 @@ void rtl8822b_set_FwPwrMode_cmd(PADAPTER adapter, u8 psmode)
psmode == PS_MODE_ACTIVE ? pwrpriv->current_lps_hw_port_id : hw_port);
if (psmode == PS_MODE_MIN || psmode == PS_MODE_MAX) {
#ifdef CONFIG_WMMPS_STA
#ifdef CONFIG_WMMPS_STA
if (rtw_is_wmmps_mode(adapter)) {
mode = 2;
@ -156,8 +156,8 @@ void rtl8822b_set_FwPwrMode_cmd(PADAPTER adapter, u8 psmode)
#endif /* CONFIG_WMMPS_STA */
{
mode = 1;
#ifdef CONFIG_WMMPS_STA
/* For WMMPS test case, the station must retain sleep mode to capture buffered data on LPS mechanism */
#ifdef CONFIG_WMMPS_STA
/* For WMMPS test case, the station must retain sleep mode to capture buffered data on LPS mechanism */
if ((pqospriv->uapsd_tid & BIT_MASK_TID_TC) != 0)
smart_ps = 0;
else
@ -222,7 +222,7 @@ void rtl8822b_set_FwPwrMode_cmd(PADAPTER adapter, u8 psmode)
else
fw_psmode_str = "UNSPECIFIED";
RTW_INFO(FUNC_ADPT_FMT": fw ps mode = %s, drv ps mode = %d, rlbm = %d , smart_ps = %d, allQueueUAPSD = %d\n",
RTW_INFO(FUNC_ADPT_FMT": fw ps mode = %s, drv ps mode = %d, rlbm = %d , smart_ps = %d, allQueueUAPSD = %d\n",
FUNC_ADPT_ARG(adapter), fw_psmode_str, psmode, rlbm, smart_ps, allQueueUAPSD);
SET_PWR_MODE_SET_CMD_ID(h2c, CMD_ID_SET_PWR_MODE);
@ -274,7 +274,7 @@ void rtl8822b_set_BcnEarly_C2H_Rpt_cmd(PADAPTER padapter, u8 enable)
SET_PWR_MODE_SET_RLBM(u1H2CSetPwrMode, 1);
SET_PWR_MODE_SET_BCN_EARLY_RPT(u1H2CSetPwrMode, enable);
SET_PWR_MODE_SET_PWR_STATE(u1H2CSetPwrMode, 0x0C);
rtw_halmac_send_h2c(adapter_to_dvobj(padapter), u1H2CSetPwrMode);
}
#endif
@ -406,7 +406,7 @@ C2HTxRPTHandler_8822b(
RTW_WARN("%s,%d: No gotc2h!\n", __FUNCTION__, __LINE__);
return;
}
adapter_ognl = rtw_get_iface_by_id(GET_PRIMARY_ADAPTER(Adapter), pstapriv->c2h_adapter_id);
if(!adapter_ognl) {
RTW_WARN("%s: No adapter!\n", __FUNCTION__);
@ -452,7 +452,7 @@ C2HSPC_STAT_8822b(
RTW_WARN("%s, %d: No gotc2h!\n", __FUNCTION__, __LINE__);
return;
}
adapter_ognl = rtw_get_iface_by_id(GET_PRIMARY_ADAPTER(Adapter), pstapriv->c2h_adapter_id);
if(!adapter_ognl) {
RTW_WARN("%s: No adapter!\n", __FUNCTION__);

2
hal/rtl8822b/rtl8822b_halinit.c
View File

@ -160,7 +160,7 @@ u8 rtl8822b_hal_init(PADAPTER adapter)
return _FALSE;
}
RTW_INFO("%s Download Firmware from %s success\n", __FUNCTION__, (fw_bin) ? "file" : "array");
RTW_INFO("%s FW Version:%d SubVersion:%d FW size:%d\n", "NIC",

8
hal/rtl8822b/rtl8822b_ops.c
View File

@ -1395,7 +1395,7 @@ static void hw_var_set_bcn_func(PADAPTER adapter, u8 enable)
val8 |= BIT_EN_BCN_TRXRPT_V1_8822B;
rtw_write8(adapter, REG_FWHW_TXQ_CTRL_8822B, val8);
switch (adapter->hw_port) {
case HW_PORT0:
val8 = BIT_EN_BCN_FUNCTION_8822B | BIT_P0_EN_TXBCN_RPT_8822B;
@ -3035,7 +3035,7 @@ u8 rtl8822b_gethaldefvar(PADAPTER adapter, HAL_DEF_VARIABLE variable, void *pval
/* support 1T STBC under 2TX */
case HAL_DEF_TX_STBC:
#ifdef CONFIG_ALPHA_SMART_ANTENNA
#ifdef CONFIG_ALPHA_SMART_ANTENNA
*(u8 *)pval = 0;
#else
if (hal->rf_type == RF_1T2R || hal->rf_type == RF_1T1R)
@ -3394,7 +3394,7 @@ void rtl8822b_fill_txdesc_mgnt_bf(struct xmit_frame *frame, u8 *desc)
/*SET_TX_DESC_MACID_8822B(desc, pattrib->mac_id);*/ /* ad-hoc mode */
/*SET_TX_DESC_G_ID_8822B(desc, 63);*/
/*
* partial AID of 1st STA, at infrastructure mode, either SU or MU;
* partial AID of 1st STA, at infrastructure mode, either SU or MU;
* MACID, at ad-hoc mode
*
* For WMAC to restore the received CSI report of STA1.
@ -3596,7 +3596,7 @@ static void fill_default_txdesc(struct xmit_frame *pxmitframe, u8 *pbuf)
SET_TX_DESC_DATA_SHORT_8822B(pbuf, 1);
#ifdef CONFIG_IP_R_MONITOR
if((pattrib->ether_type == ETH_P_ARP) &&
(IsSupportedTxOFDM(adapter->registrypriv.wireless_mode)))
(IsSupportedTxOFDM(adapter->registrypriv.wireless_mode)))
SET_TX_DESC_DATARATE_8822B(pbuf, MRateToHwRate(IEEE80211_OFDM_RATE_6MB));
else
#endif/*CONFIG_IP_R_MONITOR*/

6
hal/rtl8822b/usb/rtl8822bu_ops.c
View File

@ -23,7 +23,7 @@
#ifdef CONFIG_SUPPORT_USB_INT
static void rtl8822bu_interrupt_handler(PADAPTER padapter, u16 pkt_len, u8 *pbuf)
{
{
}
#endif /* CONFIG_SUPPORT_USB_INT */
@ -216,7 +216,7 @@ static void read_ledsetting(PADAPTER adapter)
#ifdef CONFIG_RTW_SW_LED
PHAL_DATA_TYPE hal;
hal = GET_HAL_DATA(adapter);
ledpriv->bRegUseLed = _TRUE;
@ -237,7 +237,7 @@ static void read_ledsetting(PADAPTER adapter)
#endif /* CONFIG_RTW_SW_LED */
}
#endif /* CONFIG_RTW_LED */
/*
* Description:

6
hal/rtl8822b/usb/rtl8822bu_xmit.c
View File

@ -203,7 +203,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag
#ifdef CONFIG_WMMPS_STA
if (pattrib->trigger_frame)
SET_TX_DESC_TRI_FRAME_8822B (ptxdesc, 1);
#endif /* CONFIG_WMMPS_STA */
#endif /* CONFIG_WMMPS_STA */
} else {
/*
@ -436,7 +436,7 @@ static s32 rtw_dump_xframe(PADAPTER padapter, struct xmit_frame *pxmitframe)
/* download rsvd page or fw */
inner_ret = rtw_write_port(padapter, ff_hwaddr, w_sz, (unsigned char *)pxmitbuf);
else
enqueue_pending_xmitbuf(pxmitpriv, pxmitbuf);
enqueue_pending_xmitbuf(pxmitpriv, pxmitbuf);
#else
inner_ret = rtw_write_port(padapter, ff_hwaddr, w_sz, (unsigned char *)pxmitbuf);
#endif
@ -745,7 +745,7 @@ agg_end:
/* download rsvd page or fw */
rtw_write_port(padapter, ff_hwaddr, pbuf_tail, (u8 *)pxmitbuf);
else
enqueue_pending_xmitbuf(pxmitpriv, pxmitbuf);
enqueue_pending_xmitbuf(pxmitpriv, pxmitbuf);
#else
rtw_write_port(padapter, ff_hwaddr, pbuf_tail, (u8 *)pxmitbuf);
#endif

6
ifcfg-wlan0
View File

@ -1,4 +1,4 @@
#DHCP client
DEVICE=wlan0
BOOTPROTO=dhcp
#DHCP client
DEVICE=wlan0
BOOTPROTO=dhcp
ONBOOT=yes

2
include/Hal8192FPhyCfg.h
View File

@ -102,7 +102,7 @@ PHY_GetTxPowerIndex_8192F(
);
VOID
PHY_GetTxPowerLevel8192F(
PHY_GetTxPowerLevel8192F(
IN PADAPTER Adapter,
OUT s32 *powerlevel
);

8
include/Hal8192FPwrSeq.h
View File

@ -48,7 +48,7 @@
#define RTL8192F_TRANS_CARDEMU_TO_PDN_STEPS 4
#define RTL8192F_TRANS_PDN_TO_CARDEMU_STEPS 1
#define RTL8192F_TRANS_ACT_TO_LPS_STEPS 13
#define RTL8192F_TRANS_LPS_TO_ACT_STEPS 11
#define RTL8192F_TRANS_LPS_TO_ACT_STEPS 11
#define RTL8192F_TRANS_END_STEPS 1
@ -94,7 +94,7 @@
{0x001C, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, BIT7, 0},/*Register Lock Enable*/\
{0x0077, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_PCI_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, (BIT7|BIT6), 0x3},/*set HCI Power sequence state delay time:0*/
#define RTL8192F_TRANS_ACT_TO_CARDEMU \
/* format */ \
/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, // comments here*/ \
@ -128,7 +128,7 @@
{0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,PWR_BASEADDR_SDIO,PWR_CMD_POLLING, BIT1, BIT1}, /*wait power state to suspend*/\
{0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, BIT4, 0}, /*0x23[4] = 1b'0 12H LDO enter normal mode*/ \
{0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, BIT3|BIT4, 0}, /*0x04[12:11] = 2b'01enable WL suspend*/
#define RTL8192F_TRANS_CARDEMU_TO_CARDDIS \
/* format */ \
@ -200,7 +200,7 @@
{0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, 0xFF, 0xFF}, /*. 0x100[7:0] = 0xFF enable WMAC TRX*/\
{0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, BIT1|BIT0, BIT1|BIT0}, /*. 0x02[1:0] = 2b'11 enable BB macro*/\
{0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, 0xFF, 0}, /*. 0x522 = 0*/
#define RTL8192F_TRANS_END \
/* format */ \
/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, // comments here*/ \

12
include/Hal8710BPwrSeq.h
View File

@ -46,7 +46,7 @@
#define RTL8710B_TRANS_CARDEMU_TO_PDN_STEPS 15
#define RTL8710B_TRANS_PDN_TO_CARDEMU_STEPS 15
#define RTL8710B_TRANS_ACT_TO_LPS_STEPS 15
#define RTL8710B_TRANS_LPS_TO_ACT_STEPS 15
#define RTL8710B_TRANS_LPS_TO_ACT_STEPS 15
#define RTL8710B_TRANS_ACT_TO_SWLPS_STEPS 22
#define RTL8710B_TRANS_SWLPS_TO_ACT_STEPS 15
#define RTL8710B_TRANS_END_STEPS 1
@ -59,9 +59,9 @@
{0x0004, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, BIT0, 1},\
{0x0056, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, 0xFF, 0x0E},\
{0x0020, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, BIT0, 1},\
{0x0020, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_POLLING, BIT0, 0},/**/
{0x0020, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_POLLING, BIT0, 0},/**/
#define RTL8710B_TRANS_ACT_TO_CARDEMU \
/* format */ \
/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, // comments here*/ \
@ -91,7 +91,7 @@
{0x0086, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,PWR_BASEADDR_SDIO,PWR_CMD_POLLING, BIT1, BIT1}, /*wait power state to suspend*/\
{0x0023, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, BIT4, 0}, /*0x23[4] = 1b'0 12H LDO enter normal mode*/ \
{0x0005, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, BIT3|BIT4, 0}, /*0x04[12:11] = 2b'01enable WL suspend*/
#define RTL8710B_TRANS_CARDEMU_TO_CARDDIS \
/* format */ \
@ -130,7 +130,7 @@
{0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, 0xFF, 0x03},/*Reset MAC TRX*/ \
{0x0101, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, BIT1, 0},/*check if removed later*/ \
{0x0093, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, 0xFF, 0x00},/*When driver enter Sus/ Disable, enable LOP for BT*/ \
{0x0553, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, BIT5, BIT5},/*Respond TxOK to scheduler*/
{0x0553, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, BIT5, BIT5},/*Respond TxOK to scheduler*/
#define RTL8710B_TRANS_LPS_TO_ACT \
@ -147,7 +147,7 @@
{0x0100, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, 0xFF, 0xFF}, /*. 0x100[7:0] = 0xFF enable WMAC TRX*/\
{0x0002, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, BIT1|BIT0, BIT1|BIT0}, /*. 0x02[1:0] = 2b'11 enable BB macro*/\
{0x0522, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_ALL_MSK,PWR_BASEADDR_MAC,PWR_CMD_WRITE, 0xFF, 0}, /*. 0x522 = 0*/
#define RTL8710B_TRANS_END \
/* format */ \
/* { offset, cut_msk, fab_msk|interface_msk, base|cmd, msk, value }, // comments here*/ \

2
include/cmn_info/rtw_sta_info.h
View File

@ -189,7 +189,7 @@ struct dtp_info {
};
struct cmn_sta_info {
u16 dm_ctrl; /*[Driver]*/
u16 dm_ctrl; /*[Driver]*/
enum channel_width bw_mode; /*[Driver] max support BW*/
u8 mac_id; /*[Driver]*/
u8 mac_addr[6]; /*[Driver]*/

4
include/drv_conf.h
View File

@ -475,11 +475,11 @@
#endif
#endif
#define CONFIG_RTW_TPT_MODE
#define CONFIG_RTW_TPT_MODE
#ifdef CONFIG_PCI_BCN_POLLING
#define CONFIG_BCN_ICF
#endif
#endif
#ifndef CONFIG_PCI_MSI
#define CONFIG_RTW_PCI_MSI_DISABLE

6
include/drv_types.h
View File

@ -1112,7 +1112,7 @@ struct dvobj_priv {
_timer txbcn_timer;
#endif
_timer dynamic_chk_timer; /* dynamic/periodic check timer */
#ifdef CONFIG_RTW_NAPI_DYNAMIC
u8 en_napi_dynamic;
#endif /* CONFIG_RTW_NAPI_DYNAMIC */
@ -1258,8 +1258,8 @@ struct dvobj_priv {
u8 tpt_mode; /* RTK T/P Testing Mode, 0:default mode */
u32 edca_be_ul;
u32 edca_be_dl;
#endif
/* also for RTK T/P Testing Mode */
#endif
/* also for RTK T/P Testing Mode */
u8 scan_deny;
};

2
include/hal_com_h2c.h
View File

@ -401,7 +401,7 @@ s32 rtw_hal_customer_str_write(_adapter *adapter, const u8 *cs);
#define SET_H2CCMD_MCC_CTRL_V2_PRIMARY_CH(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE((__pH2CCmd)+2, 0, 4, __Value)
#define SET_H2CCMD_MCC_CTRL_V2_BW(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE((__pH2CCmd)+2, 4, 4, __Value)
#define SET_H2CCMD_MCC_CTRL_V2_DURATION(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE((__pH2CCmd)+3, 0, 8, __Value)
#define SET_H2CCMD_MCC_CTRL_V2_ROLE(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE((__pH2CCmd)+4, 0, 3, __Value)
#define SET_H2CCMD_MCC_CTRL_V2_ROLE(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE((__pH2CCmd)+4, 0, 3, __Value)
#define SET_H2CCMD_MCC_CTRL_V2_INCURCH(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE((__pH2CCmd)+4, 3, 1, __Value)
#define SET_H2CCMD_MCC_CTRL_V2_DIS_SW_RETRY(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE((__pH2CCmd)+4, 4, 1, __Value)
#define SET_H2CCMD_MCC_CTRL_V2_DISTXNULL(__pH2CCmd, __Value) SET_BITS_TO_LE_1BYTE((__pH2CCmd)+4, 5, 1, __Value)

2
include/hal_data.h
View File

@ -397,7 +397,7 @@ typedef struct hal_com_data {
u16 ForcedDataRate; /* Force Data Rate. 0: Auto, 0x02: 1M ~ 0x6C: 54M. */
u8 bDumpRxPkt;
u8 bDumpTxPkt;
u8 dis_turboedca; /* 1: disable turboedca,
u8 dis_turboedca; /* 1: disable turboedca,
2: disable turboedca and setting EDCA parameter based on the input parameter*/
u32 edca_param_mode;

6
include/hal_intf.h
View File

@ -373,7 +373,7 @@ struct hal_ops {
void (*write_syson_reg)(_adapter *padapter, u32 RegAddr, u32 BitMask, u32 Data);
#endif
void (*read_wmmedca_reg)(_adapter *padapter, u16 *vo_params, u16 *vi_params, u16 *be_params, u16 *bk_params);
#ifdef CONFIG_HOSTAPD_MLME
s32(*hostap_mgnt_xmit_entry)(_adapter *padapter, _pkt *pkt);
#endif
@ -583,9 +583,9 @@ typedef enum _HARDWARE_TYPE {
#define IS_HARDWARE_TYPE_8192FS(_Adapter)\
(rtw_get_hw_type(_Adapter) == HARDWARE_TYPE_RTL8192FS)
#define IS_HARDWARE_TYPE_8192FU(_Adapter)\
(rtw_get_hw_type(_Adapter) == HARDWARE_TYPE_RTL8192FU)
(rtw_get_hw_type(_Adapter) == HARDWARE_TYPE_RTL8192FU)
#define IS_HARDWARE_TYPE_8192FE(_Adapter)\
(rtw_get_hw_type(_Adapter) == HARDWARE_TYPE_RTL8192FE)
(rtw_get_hw_type(_Adapter) == HARDWARE_TYPE_RTL8192FE)
#define IS_HARDWARE_TYPE_8192F(_Adapter)\
(IS_HARDWARE_TYPE_8192FS(_Adapter) ||\
IS_HARDWARE_TYPE_8192FU(_Adapter) ||\

2
include/ieee80211.h
View File

@ -741,7 +741,7 @@ struct ieee80211_snap_hdr {
#define WLAN_REASON_MESH_MAX_PEERS 53
#define WLAN_REASON_MESH_CONFIG 54
#define WLAN_REASON_MESH_CLOSE 55
#define WLAN_REASON_MESH_MAX_RETRIES 56
#define WLAN_REASON_MESH_MAX_RETRIES 56
#define WLAN_REASON_MESH_CONFIRM_TIMEOUT 57
#define WLAN_REASON_MESH_INVALID_GTK 58
#define WLAN_REASON_MESH_INCONSISTENT_PARAM 59

1408
include/osdep_service_bsd.h
View File

File diff suppressed because it is too large Load Diff

306
include/osdep_service_ce.h
View File

@ -12,113 +12,113 @@
* more details.
*
*****************************************************************************/
#ifndef __OSDEP_CE_SERVICE_H_
#define __OSDEP_CE_SERVICE_H_
#include <ndis.h>
#include <ntddndis.h>
#ifdef CONFIG_SDIO_HCI
#include "SDCardDDK.h"
#endif
#ifdef CONFIG_USB_HCI
#include <usbdi.h>
#endif
typedef HANDLE _sema;
typedef LIST_ENTRY _list;
typedef NDIS_STATUS _OS_STATUS;
typedef NDIS_SPIN_LOCK _lock;
typedef HANDLE _rwlock; //Mutex
typedef u32 _irqL;
typedef NDIS_HANDLE _nic_hdl;
#ifndef __OSDEP_CE_SERVICE_H_
#define __OSDEP_CE_SERVICE_H_
#include <ndis.h>
#include <ntddndis.h>
#ifdef CONFIG_SDIO_HCI
#include "SDCardDDK.h"
#endif
#ifdef CONFIG_USB_HCI
#include <usbdi.h>
#endif
typedef HANDLE _sema;
typedef LIST_ENTRY _list;
typedef NDIS_STATUS _OS_STATUS;
typedef NDIS_SPIN_LOCK _lock;
typedef HANDLE _rwlock; //Mutex
typedef u32 _irqL;
typedef NDIS_HANDLE _nic_hdl;
struct rtw_timer_list {
NDIS_MINIPORT_TIMER ndis_timer;
void (*function)(void *);
void *arg;
};
struct __queue {
LIST_ENTRY queue;
_lock lock;
};
typedef NDIS_PACKET _pkt;
typedef NDIS_BUFFER _buffer;
typedef struct __queue _queue;
typedef HANDLE _thread_hdl_;
typedef DWORD thread_return;
typedef void* thread_context;
typedef NDIS_WORK_ITEM _workitem;
#define SEMA_UPBND (0x7FFFFFFF) //8192
__inline static _list *get_prev(_list *list)
{
return list->Blink;
}
__inline static _list *get_next(_list *list)
{
return list->Flink;
}
__inline static _list *get_list_head(_queue *queue)
{
return (&(queue->queue));
}
#define LIST_CONTAINOR(ptr, type, member) CONTAINING_RECORD(ptr, type, member)
__inline static void _enter_critical(_lock *plock, _irqL *pirqL)
{
NdisAcquireSpinLock(plock);
}
__inline static void _exit_critical(_lock *plock, _irqL *pirqL)
{
NdisReleaseSpinLock(plock);
}
__inline static _enter_critical_ex(_lock *plock, _irqL *pirqL)
{
NdisDprAcquireSpinLock(plock);
}
__inline static _exit_critical_ex(_lock *plock, _irqL *pirqL)
{
NdisDprReleaseSpinLock(plock);
}
__inline static void _enter_hwio_critical(_rwlock *prwlock, _irqL *pirqL)
{
WaitForSingleObject(*prwlock, INFINITE );
}
__inline static void _exit_hwio_critical(_rwlock *prwlock, _irqL *pirqL)
{
ReleaseMutex(*prwlock);
}
__inline static void rtw_list_delete(_list *plist)
{
RemoveEntryList(plist);
InitializeListHead(plist);
}
struct __queue {
LIST_ENTRY queue;
_lock lock;
};
typedef NDIS_PACKET _pkt;
typedef NDIS_BUFFER _buffer;
typedef struct __queue _queue;
typedef HANDLE _thread_hdl_;
typedef DWORD thread_return;
typedef void* thread_context;
typedef NDIS_WORK_ITEM _workitem;
#define SEMA_UPBND (0x7FFFFFFF) //8192
__inline static _list *get_prev(_list *list)
{
return list->Blink;
}
__inline static _list *get_next(_list *list)
{
return list->Flink;
}
__inline static _list *get_list_head(_queue *queue)
{
return (&(queue->queue));
}
#define LIST_CONTAINOR(ptr, type, member) CONTAINING_RECORD(ptr, type, member)
__inline static void _enter_critical(_lock *plock, _irqL *pirqL)
{
NdisAcquireSpinLock(plock);
}
__inline static void _exit_critical(_lock *plock, _irqL *pirqL)
{
NdisReleaseSpinLock(plock);
}
__inline static _enter_critical_ex(_lock *plock, _irqL *pirqL)
{
NdisDprAcquireSpinLock(plock);
}
__inline static _exit_critical_ex(_lock *plock, _irqL *pirqL)
{
NdisDprReleaseSpinLock(plock);
}
__inline static void _enter_hwio_critical(_rwlock *prwlock, _irqL *pirqL)
{
WaitForSingleObject(*prwlock, INFINITE );
}
__inline static void _exit_hwio_critical(_rwlock *prwlock, _irqL *pirqL)
{
ReleaseMutex(*prwlock);
}
__inline static void rtw_list_delete(_list *plist)
{
RemoveEntryList(plist);
InitializeListHead(plist);
}
static inline void timer_hdl(
IN PVOID SystemSpecific1,
IN PVOID FunctionContext,
@ -146,55 +146,55 @@ static inline void _cancel_timer(_timer *ptimer, u8 *bcancelled)
{
NdisMCancelTimer(ptimer, bcancelled);
}
__inline static void _init_workitem(_workitem *pwork, void *pfunc, PVOID cntx)
{
NdisInitializeWorkItem(pwork, pfunc, cntx);
}
__inline static void _set_workitem(_workitem *pwork)
{
NdisScheduleWorkItem(pwork);
}
#define ATOMIC_INIT(i) { (i) }
//
// Global Mutex: can only be used at PASSIVE level.
//
#define ACQUIRE_GLOBAL_MUTEX(_MutexCounter) \
{ \
while (NdisInterlockedIncrement((PULONG)&(_MutexCounter)) != 1)\
{ \
NdisInterlockedDecrement((PULONG)&(_MutexCounter)); \
NdisMSleep(10000); \
} \
}
#define RELEASE_GLOBAL_MUTEX(_MutexCounter) \
{ \
NdisInterlockedDecrement((PULONG)&(_MutexCounter)); \
}
// limitation of path length
#define PATH_LENGTH_MAX MAX_PATH
//Atomic integer operations
#define ATOMIC_T LONG
#define NDEV_FMT "%s"
#define NDEV_ARG(ndev) ""
#define ADPT_FMT "%s"
#define ADPT_ARG(adapter) ""
#define FUNC_NDEV_FMT "%s"
#define FUNC_NDEV_ARG(ndev) __func__
#define FUNC_ADPT_FMT "%s"
#define FUNC_ADPT_ARG(adapter) __func__
#define STRUCT_PACKED
#endif
__inline static void _init_workitem(_workitem *pwork, void *pfunc, PVOID cntx)
{
NdisInitializeWorkItem(pwork, pfunc, cntx);
}
__inline static void _set_workitem(_workitem *pwork)
{
NdisScheduleWorkItem(pwork);
}
#define ATOMIC_INIT(i) { (i) }
//
// Global Mutex: can only be used at PASSIVE level.
//
#define ACQUIRE_GLOBAL_MUTEX(_MutexCounter) \
{ \
while (NdisInterlockedIncrement((PULONG)&(_MutexCounter)) != 1)\
{ \
NdisInterlockedDecrement((PULONG)&(_MutexCounter)); \
NdisMSleep(10000); \
} \
}
#define RELEASE_GLOBAL_MUTEX(_MutexCounter) \
{ \
NdisInterlockedDecrement((PULONG)&(_MutexCounter)); \
}
// limitation of path length
#define PATH_LENGTH_MAX MAX_PATH
//Atomic integer operations
#define ATOMIC_T LONG
#define NDEV_FMT "%s"
#define NDEV_ARG(ndev) ""
#define ADPT_FMT "%s"
#define ADPT_ARG(adapter) ""
#define FUNC_NDEV_FMT "%s"
#define FUNC_NDEV_ARG(ndev) __func__
#define FUNC_ADPT_FMT "%s"
#define FUNC_ADPT_ARG(adapter) __func__
#define STRUCT_PACKED
#endif

328
include/osdep_service_xp.h
View File

@ -12,122 +12,122 @@
* more details.
*
*****************************************************************************/
#ifndef __OSDEP_LINUX_SERVICE_H_
#define __OSDEP_LINUX_SERVICE_H_
#include <ndis.h>
#include <ntddk.h>
#include <ntddndis.h>
#include <ntdef.h>
#ifdef CONFIG_USB_HCI
#include <usb.h>
#include <usbioctl.h>
#include <usbdlib.h>
#endif
typedef KSEMAPHORE _sema;
typedef LIST_ENTRY _list;
typedef NDIS_STATUS _OS_STATUS;
typedef NDIS_SPIN_LOCK _lock;
typedef KMUTEX _mutex;
typedef KIRQL _irqL;
// USB_PIPE for WINCE , but handle can be use just integer under windows
typedef NDIS_HANDLE _nic_hdl;
#ifndef __OSDEP_LINUX_SERVICE_H_
#define __OSDEP_LINUX_SERVICE_H_
#include <ndis.h>
#include <ntddk.h>
#include <ntddndis.h>
#include <ntdef.h>
#ifdef CONFIG_USB_HCI
#include <usb.h>
#include <usbioctl.h>
#include <usbdlib.h>
#endif
typedef KSEMAPHORE _sema;
typedef LIST_ENTRY _list;
typedef NDIS_STATUS _OS_STATUS;
typedef NDIS_SPIN_LOCK _lock;
typedef KMUTEX _mutex;
typedef KIRQL _irqL;
// USB_PIPE for WINCE , but handle can be use just integer under windows
typedef NDIS_HANDLE _nic_hdl;
struct rtw_timer_list {
NDIS_MINIPORT_TIMER ndis_timer;
void (*function)(void *);
void *arg;
};
struct __queue {
LIST_ENTRY queue;
_lock lock;
};
typedef NDIS_PACKET _pkt;
typedef NDIS_BUFFER _buffer;
typedef struct __queue _queue;
typedef PKTHREAD _thread_hdl_;
typedef void thread_return;
typedef void* thread_context;
typedef NDIS_WORK_ITEM _workitem;
#define HZ 10000000
#define SEMA_UPBND (0x7FFFFFFF) //8192
__inline static _list *get_next(_list *list)
{
return list->Flink;
}
__inline static _list *get_list_head(_queue *queue)
{
return (&(queue->queue));
}
#define LIST_CONTAINOR(ptr, type, member) CONTAINING_RECORD(ptr, type, member)
__inline static _enter_critical(_lock *plock, _irqL *pirqL)
{
NdisAcquireSpinLock(plock);
}
__inline static _exit_critical(_lock *plock, _irqL *pirqL)
{
NdisReleaseSpinLock(plock);
}
__inline static _enter_critical_ex(_lock *plock, _irqL *pirqL)
{
NdisDprAcquireSpinLock(plock);
}
__inline static _exit_critical_ex(_lock *plock, _irqL *pirqL)
{
NdisDprReleaseSpinLock(plock);
}
__inline static void _enter_critical_bh(_lock *plock, _irqL *pirqL)
{
NdisDprAcquireSpinLock(plock);
}
__inline static void _exit_critical_bh(_lock *plock, _irqL *pirqL)
{
NdisDprReleaseSpinLock(plock);
}
__inline static _enter_critical_mutex(_mutex *pmutex, _irqL *pirqL)
{
KeWaitForSingleObject(pmutex, Executive, KernelMode, FALSE, NULL);
}
__inline static _exit_critical_mutex(_mutex *pmutex, _irqL *pirqL)
{
KeReleaseMutex(pmutex, FALSE);
}
__inline static void rtw_list_delete(_list *plist)
{
RemoveEntryList(plist);
InitializeListHead(plist);
}
struct __queue {
LIST_ENTRY queue;
_lock lock;
};
typedef NDIS_PACKET _pkt;
typedef NDIS_BUFFER _buffer;
typedef struct __queue _queue;
typedef PKTHREAD _thread_hdl_;
typedef void thread_return;
typedef void* thread_context;
typedef NDIS_WORK_ITEM _workitem;
#define HZ 10000000
#define SEMA_UPBND (0x7FFFFFFF) //8192
__inline static _list *get_next(_list *list)
{
return list->Flink;
}
__inline static _list *get_list_head(_queue *queue)
{
return (&(queue->queue));
}
#define LIST_CONTAINOR(ptr, type, member) CONTAINING_RECORD(ptr, type, member)
__inline static _enter_critical(_lock *plock, _irqL *pirqL)
{
NdisAcquireSpinLock(plock);
}
__inline static _exit_critical(_lock *plock, _irqL *pirqL)
{
NdisReleaseSpinLock(plock);
}
__inline static _enter_critical_ex(_lock *plock, _irqL *pirqL)
{
NdisDprAcquireSpinLock(plock);
}
__inline static _exit_critical_ex(_lock *plock, _irqL *pirqL)
{
NdisDprReleaseSpinLock(plock);
}
__inline static void _enter_critical_bh(_lock *plock, _irqL *pirqL)
{
NdisDprAcquireSpinLock(plock);
}
__inline static void _exit_critical_bh(_lock *plock, _irqL *pirqL)
{
NdisDprReleaseSpinLock(plock);
}
__inline static _enter_critical_mutex(_mutex *pmutex, _irqL *pirqL)
{
KeWaitForSingleObject(pmutex, Executive, KernelMode, FALSE, NULL);
}
__inline static _exit_critical_mutex(_mutex *pmutex, _irqL *pirqL)
{
KeReleaseMutex(pmutex, FALSE);
}
__inline static void rtw_list_delete(_list *plist)
{
RemoveEntryList(plist);
InitializeListHead(plist);
}
static inline void timer_hdl(
IN PVOID SystemSpecific1,
IN PVOID FunctionContext,
@ -155,56 +155,56 @@ static inline void _cancel_timer(_timer *ptimer, u8 *bcancelled)
{
NdisMCancelTimer(ptimer, bcancelled);
}
__inline static void _init_workitem(_workitem *pwork, void *pfunc, PVOID cntx)
{
NdisInitializeWorkItem(pwork, pfunc, cntx);
}
__inline static void _set_workitem(_workitem *pwork)
{
NdisScheduleWorkItem(pwork);
}
#define ATOMIC_INIT(i) { (i) }
//
// Global Mutex: can only be used at PASSIVE level.
//
#define ACQUIRE_GLOBAL_MUTEX(_MutexCounter) \
{ \
while (NdisInterlockedIncrement((PULONG)&(_MutexCounter)) != 1)\
{ \
NdisInterlockedDecrement((PULONG)&(_MutexCounter)); \
NdisMSleep(10000); \
} \
}
#define RELEASE_GLOBAL_MUTEX(_MutexCounter) \
{ \
NdisInterlockedDecrement((PULONG)&(_MutexCounter)); \
}
// limitation of path length
#define PATH_LENGTH_MAX MAX_PATH
//Atomic integer operations
#define ATOMIC_T LONG
#define NDEV_FMT "%s"
#define NDEV_ARG(ndev) ""
#define ADPT_FMT "%s"
#define ADPT_ARG(adapter) ""
#define FUNC_NDEV_FMT "%s"
#define FUNC_NDEV_ARG(ndev) __func__
#define FUNC_ADPT_FMT "%s"
#define FUNC_ADPT_ARG(adapter) __func__
#define STRUCT_PACKED
#endif
__inline static void _init_workitem(_workitem *pwork, void *pfunc, PVOID cntx)
{
NdisInitializeWorkItem(pwork, pfunc, cntx);
}
__inline static void _set_workitem(_workitem *pwork)
{
NdisScheduleWorkItem(pwork);
}
#define ATOMIC_INIT(i) { (i) }
//
// Global Mutex: can only be used at PASSIVE level.
//
#define ACQUIRE_GLOBAL_MUTEX(_MutexCounter) \
{ \
while (NdisInterlockedIncrement((PULONG)&(_MutexCounter)) != 1)\
{ \
NdisInterlockedDecrement((PULONG)&(_MutexCounter)); \
NdisMSleep(10000); \
} \
}
#define RELEASE_GLOBAL_MUTEX(_MutexCounter) \
{ \
NdisInterlockedDecrement((PULONG)&(_MutexCounter)); \
}
// limitation of path length
#define PATH_LENGTH_MAX MAX_PATH
//Atomic integer operations
#define ATOMIC_T LONG
#define NDEV_FMT "%s"
#define NDEV_ARG(ndev) ""
#define ADPT_FMT "%s"
#define ADPT_ARG(adapter) ""
#define FUNC_NDEV_FMT "%s"
#define FUNC_NDEV_ARG(ndev) __func__
#define FUNC_ADPT_FMT "%s"
#define FUNC_ADPT_ARG(adapter) __func__
#define STRUCT_PACKED
#endif

36
include/rtl8192f_cmd.h
View File

@ -25,32 +25,32 @@ enum h2c_cmd_8192F {
H2C_8192F_MEDIA_STATUS_RPT = 0x01,
H2C_8192F_SCAN_ENABLE = 0x02,
H2C_8192F_KEEP_ALIVE = 0x03,
H2C_8192F_DISCON_DECISION = 0x04,
H2C_8192F_PSD_OFFLOAD = 0x05,
H2C_8192F_AP_OFFLOAD = 0x08,
H2C_8192F_BCN_RSVDPAGE = 0x09,
H2C_8192F_PROBERSP_RSVDPAGE = 0x0A,
H2C_8192F_FCS_RSVDPAGE = 0x10,
H2C_8192F_FCS_INFO = 0x11,
H2C_8192F_DISCON_DECISION = 0x04,
H2C_8192F_PSD_OFFLOAD = 0x05,
H2C_8192F_AP_OFFLOAD = 0x08,
H2C_8192F_BCN_RSVDPAGE = 0x09,
H2C_8192F_PROBERSP_RSVDPAGE = 0x0A,
H2C_8192F_FCS_RSVDPAGE = 0x10,
H2C_8192F_FCS_INFO = 0x11,
H2C_8192F_AP_WOW_GPIO_CTRL = 0x13,
/* PoweSave Class: 001 */
H2C_8192F_SET_PWR_MODE = 0x20,
H2C_8192F_PS_TUNING_PARA = 0x21,
H2C_8192F_PS_TUNING_PARA2 = 0x22,
H2C_8192F_P2P_LPS_PARAM = 0x23,
H2C_8192F_P2P_PS_OFFLOAD = 0x24,
H2C_8192F_PS_SCAN_ENABLE = 0x25,
H2C_8192F_P2P_LPS_PARAM = 0x23,
H2C_8192F_P2P_PS_OFFLOAD = 0x24,
H2C_8192F_PS_SCAN_ENABLE = 0x25,
H2C_8192F_SAP_PS_ = 0x26,
H2C_8192F_INACTIVE_PS_ = 0x27,/* Inactive_PS */
H2C_8192F_FWLPS_IN_IPS_ = 0x28,
/* Dynamic Mechanism Class: 010 */
H2C_8192F_MACID_CFG = 0x40,
H2C_8192F_TXBF = 0x41,
H2C_8192F_RSSI_SETTING = 0x42,
H2C_8192F_AP_REQ_TXRPT = 0x43,
H2C_8192F_INIT_RATE_COLLECT = 0x44,
H2C_8192F_MACID_CFG = 0x40,
H2C_8192F_TXBF = 0x41,
H2C_8192F_RSSI_SETTING = 0x42,
H2C_8192F_AP_REQ_TXRPT = 0x43,
H2C_8192F_INIT_RATE_COLLECT = 0x44,
H2C_8192F_RA_PARA_ADJUST = 0x46,
/* BT Class: 011 */
@ -70,13 +70,13 @@ enum h2c_cmd_8192F {
/* WOWLAN Class: 100 */
H2C_8192F_WOWLAN = 0x80,
H2C_8192F_REMOTE_WAKE_CTRL = 0x81,
H2C_8192F_AOAC_GLOBAL_INFO = 0x82,
H2C_8192F_AOAC_RSVD_PAGE = 0x83,
H2C_8192F_AOAC_GLOBAL_INFO = 0x82,
H2C_8192F_AOAC_RSVD_PAGE = 0x83,
H2C_8192F_AOAC_RSVD_PAGE2 = 0x84,
H2C_8192F_D0_SCAN_OFFLOAD_CTRL = 0x85,
H2C_8192F_D0_SCAN_OFFLOAD_INFO = 0x86,
H2C_8192F_CHNL_SWITCH_OFFLOAD = 0x87,
H2C_8192F_P2P_OFFLOAD_RSVD_PAGE = 0x8A,
H2C_8192F_P2P_OFFLOAD_RSVD_PAGE = 0x8A,
H2C_8192F_P2P_OFFLOAD = 0x8B,
H2C_8192F_RESET_TSF = 0xC0,

4
include/rtl8192f_spec.h
View File

@ -320,7 +320,7 @@
#define REG_USTIME_TSF_8192F 0x055C
#define REG_BCN_MAX_ERR_8192F 0x055D
#define REG_RXTSF_OFFSET_CCK_8192F 0x055E
#define REG_RXTSF_OFFSET_OFDM_8192F 0x055F
#define REG_RXTSF_OFFSET_OFDM_8192F 0x055F
#define REG_TSFTR_8192F 0x0560
#define REG_CTWND_8192F 0x0572
#define REG_SECONDARY_CCA_CTRL_8192F 0x0577
@ -526,7 +526,7 @@
/*mac queue info*/
#define QUEUE_TOTAL_NUM 20/*reg414h : 0~f ac queue 0x10~0x13MGQ HIQ BCNQ CMDQ*/
#define QUEUE_ACQ_NUM 16
#define QUEUE_ACQ_NUM 16
#define QUEUE_INDEX_MGQ 0x10
#define QUEUE_INDEX_HIQ 0x11
#define QUEUE_INDEX_BCNQ 0x12

6
include/rtl8710b_hal.h
View File

@ -175,10 +175,10 @@ typedef struct _RT_8710B_FIRMWARE_HDR {
#define PACKAGE_QFN32_S 0
#define PACKAGE_QFN48M_S 1 //definiton 8188GU Dongle Package, Efuse Physical Address 0xF8 = 0xFE
#define PACKAGE_QFN48_S 2
#define PACKAGE_QFN64_S 3
#define PACKAGE_QFN32_U 4
#define PACKAGE_QFN64_S 3
#define PACKAGE_QFN32_U 4
#define PACKAGE_QFN48M_U 5 //definiton 8188GU Dongle Package, Efuse Physical Address 0xF8 = 0xEE
#define PACKAGE_QFN48_U 6
#define PACKAGE_QFN48_U 6
#define PACKAGE_QFN68_U 7
typedef enum _PACKAGE_TYPE_E

10
include/rtl8710b_spec.h
View File

@ -417,9 +417,9 @@
/* ****************************************************************************
* 8723 Regsiter Bit and Content definition
* **************************************************************************** */
/* -----------------------------------------------------
* REG_SYS_SYSTEM_CFG0
* REG_SYS_SYSTEM_CFG0
* ----------------------------------------------------- */
#define BIT_RTL_ID_8710B BIT(16)
@ -431,18 +431,18 @@
#define BIT_GET_VENDOR_ID_8710B(x) (((x) >> BIT_SHIFT_VENDOR_ID_8710B) & BIT_MASK_VENDOR_ID_8710B)
/* -----------------------------------------------------
* REG_SYS_SYSTEM_CFG1
* REG_SYS_SYSTEM_CFG1
* ----------------------------------------------------- */
#define BIT_SPSLDO_SEL_8710B BIT(25)
/* -----------------------------------------------------
* REG_SYS_SYSTEM_CFG2
* REG_SYS_SYSTEM_CFG2
* ----------------------------------------------------- */
#define BIT_MASK_RF_RL_ID_8710B 0xf
#define BIT_GET_RF_RL_ID_8710B(x) ((x) & BIT_MASK_RF_RL_ID_8710B)
/* -----------------------------------------------------
* REG_SYS_SYSTEM_CFG2
* REG_SYS_SYSTEM_CFG2
* ----------------------------------------------------- */
#define BIT_EERPOMSEL_8710B BIT(4)
#define BIT_AUTOLOAD_SUS_8710B BIT(5)

6
include/rtl8821c_spec.h
View File

@ -115,15 +115,15 @@
/* RFE */
#define rA_RFE_Pinmux_Jaguar 0xCB0 /* hal_mp.c */
#define rB_RFE_Pinmux_Jaguar 0xEB0 /* Path_B RFE control pinmux */
#define rA_RFE_Inv_Jaguar 0xCB4 /* Path_A RFE cotrol */
#define rA_RFE_Inv_Jaguar 0xCB4 /* Path_A RFE cotrol */
#define rB_RFE_Inv_Jaguar 0xEB4 /* Path_B RFE control */
#define rA_RFE_Jaguar 0xCB8 /* Path_A RFE cotrol */
#define rA_RFE_Jaguar 0xCB8 /* Path_A RFE cotrol */
#define rB_RFE_Jaguar 0xEB8 /* Path_B RFE control */
#define rA_RFE_Inverse_Jaguar 0xCBC /* Path_A RFE control inverse */
#define rB_RFE_Inverse_Jaguar 0xEBC /* Path_B RFE control inverse */
#define r_ANTSEL_SW_Jaguar 0x900 /* ANTSEL SW Control */
#define bMask_RFEInv_Jaguar 0x3FF00000
#define bMask_AntselPathFollow_Jaguar 0x00030000
#define bMask_AntselPathFollow_Jaguar 0x00030000
#define rOFDM1_LSTF 0xD00
#define rOFDM1_TRxPathEnable 0xD04 /* hal_mp.c */

4
include/rtl8822b_hal.h
View File

@ -153,9 +153,9 @@
/* RFE */
#define rA_RFE_Pinmux_Jaguar 0xCB0 /* hal_mp.c */
#define rB_RFE_Pinmux_Jaguar 0xEB0 /* Path_B RFE control pinmux */
#define rA_RFE_Inv_Jaguar 0xCB4 /* Path_A RFE cotrol */
#define rA_RFE_Inv_Jaguar 0xCB4 /* Path_A RFE cotrol */
#define rB_RFE_Inv_Jaguar 0xEB4 /* Path_B RFE control */
#define rA_RFE_Jaguar 0xCB8 /* Path_A RFE cotrol */
#define rA_RFE_Jaguar 0xCB8 /* Path_A RFE cotrol */
#define rB_RFE_Jaguar 0xEB8 /* Path_B RFE control */
#define rA_RFE_Inverse_Jaguar 0xCBC /* Path_A RFE control inverse */
#define rB_RFE_Inverse_Jaguar 0xEBC /* Path_B RFE control inverse */

2
include/rtw_cmd.h
View File

@ -213,7 +213,7 @@ u8 p2p_cancel_roch_cmd(_adapter *adapter, u64 cookie, struct wireless_dev *wdev,
#endif /* CONFIG_IOCTL_CFG80211 */
#endif /* CONFIG_P2P */
#ifdef CONFIG_IOCTL_CFG80211
#ifdef CONFIG_IOCTL_CFG80211
u8 rtw_mgnt_tx_cmd(_adapter *adapter, u8 tx_ch, u8 no_cck, const u8 *buf, size_t len, int wait_ack, u8 flags);
struct mgnt_tx_parm {
u8 tx_ch;

2
include/rtw_debug.h
View File

@ -506,7 +506,7 @@ ssize_t proc_set_new_bcn_max(struct file *file, const char __user *buffer, size_
#ifdef CONFIG_POWER_SAVING
int proc_get_ps_info(struct seq_file *m, void *v);
ssize_t proc_set_ps_info(struct file *file, const char __user *buffer, size_t count, loff_t *pos, void *data);
#ifdef CONFIG_WMMPS_STA
#ifdef CONFIG_WMMPS_STA
int proc_get_wmmps_info(struct seq_file *m, void *v);
ssize_t proc_set_wmmps_info(struct file *file, const char __user *buffer, size_t count, loff_t *pos, void *data);
#endif /* CONFIG_WMMPS_STA */

12
include/rtw_mlme.h
View File

@ -607,7 +607,7 @@ enum rtw_ft_capability {
#define rtw_ft_roam(a) \
((rtw_to_roam(a) > 0) && rtw_ft_chk_flags(a, RTW_FT_PEER_EN))
#define rtw_ft_valid_akm(a, t) \
((rtw_ft_chk_flags(a, RTW_FT_EN)) && \
(((t) == 3) || ((t) == 4)))
@ -620,7 +620,7 @@ enum rtw_ft_capability {
((rtw_ft_chk_flags(a, RTW_FT_OTD_EN)) \
&& ((a)->mlmepriv.ft_roam.ft_roam_on_expired == _FALSE) \
&& ((a)->mlmepriv.ft_roam.ft_cap & 0x01))
#define rtw_ft_otd_roam(a) \
rtw_ft_chk_flags(a, RTW_FT_PEER_OTD_EN)
@ -633,7 +633,7 @@ enum rtw_ft_capability {
struct ft_roam_info {
u16 mdid;
u8 ft_cap;
u8 ft_cap;
/*b0: FT over DS, b1: Resource Req Protocol Cap, b2~b7: Reserved*/
u8 updated_ft_ies[RTW_FT_MAX_IE_SZ];
u16 updated_ft_ies_len;
@ -644,7 +644,7 @@ struct ft_roam_info {
u8 ft_flags;
u32 ft_status;
u32 ft_req_retry_cnt;
bool ft_updated_bcn;
bool ft_updated_bcn;
};
#endif
@ -695,7 +695,7 @@ struct nb_rpt_hdr {
u32 bss_info;
u8 reg_class;
u8 ch_num;
u8 phy_type;
u8 phy_type;
};
/*IEEE Std 80211v, Figure 7-95e2¡XBSS Termination Duration subelement field format */
@ -1072,7 +1072,7 @@ void rtw_sta_timeout_event_callback(_adapter *adapter, u8 *pbuf);
#endif /* CONFIG_IEEE80211W */
#ifdef CONFIG_RTW_80211R
void rtw_ft_info_init(struct ft_roam_info *pft);
u8 rtw_ft_chk_roaming_candidate(_adapter *padapter,
u8 rtw_ft_chk_roaming_candidate(_adapter *padapter,
struct wlan_network *competitor);
void rtw_ft_update_stainfo(_adapter *padapter, WLAN_BSSID_EX *pnetwork);
void rtw_ft_reassoc_event_callback(_adapter *padapter, u8 *pbuf);

6
include/rtw_mlme_ext.h
View File

@ -982,11 +982,11 @@ unsigned int OnAction_p2p(_adapter *padapter, union recv_frame *precv_frame);
#ifdef CONFIG_RTW_80211R
void rtw_ft_update_bcn(_adapter *padapter, union recv_frame *precv_frame);
void rtw_ft_start_clnt_join(_adapter *padapter);
u8 rtw_ft_update_rsnie(_adapter *padapter, u8 bwrite,
u8 rtw_ft_update_rsnie(_adapter *padapter, u8 bwrite,
struct pkt_attrib *pattrib, u8 **pframe);
void rtw_ft_build_auth_req_ies(_adapter *padapter,
void rtw_ft_build_auth_req_ies(_adapter *padapter,
struct pkt_attrib *pattrib, u8 **pframe);
void rtw_ft_build_assoc_req_ies(_adapter *padapter,
void rtw_ft_build_assoc_req_ies(_adapter *padapter,
u8 is_reassoc, struct pkt_attrib *pattrib, u8 **pframe);
u8 rtw_ft_update_auth_rsp_ies(_adapter *padapter, u8 *pframe, u32 len);
void rtw_ft_start_roam(_adapter *padapter, u8 *pTargetAddr);

2
include/rtw_pwrctrl.h
View File

@ -339,7 +339,7 @@ struct pwrctrl_priv {
#ifdef CONFIG_WMMPS_STA
u8 wmm_smart_ps;
#endif /* CONFIG_WMMPS_STA */
#endif /* CONFIG_WMMPS_STA */
u32 alives;
_workitem cpwm_event;

2
include/rtw_qos.h
View File

@ -58,7 +58,7 @@ struct qos_priv {
u8 uapsd_tid_trigger_enabled;
/* declare uapsd_ap_supported to record whether the connected ap supports uapsd or not */
u8 uapsd_ap_supported;
#endif /* CONFIG_WMMPS_STA */
#endif /* CONFIG_WMMPS_STA */
};

2
include/rtw_recv.h
View File

@ -410,7 +410,7 @@ struct recv_priv {
struct sk_buff_head rx_skb_queue;
#ifdef CONFIG_RTW_NAPI
struct sk_buff_head rx_napi_skb_queue;
#endif
#endif
#ifdef CONFIG_RX_INDICATE_QUEUE
struct task rx_indicate_tasklet;
struct ifqueue rx_indicate_queue;

2
include/rtw_rm_fsm.h
View File

@ -267,7 +267,7 @@ struct data_buf {
struct rm_obj {
/* aid << 16
/* aid << 16
|diag_token << 8
|B(1) 1/0:All_AID/UNIC
|B(0) 1/0:RM_MASTER/RM_SLAVE */

4
include/rtw_xmit.h
View File

@ -467,7 +467,7 @@ struct pkt_attrib {
#ifdef CONFIG_WMMPS_STA
u8 trigger_frame;
#endif /* CONFIG_WMMPS_STA */
struct sta_info *psta;
u8 rtsen;
@ -1034,7 +1034,7 @@ extern void rtw_amsdu_set_timer_status(_adapter *padapter, u8 priority, u8 statu
extern void rtw_amsdu_set_timer(_adapter *padapter, u8 priority);
extern void rtw_amsdu_cancel_timer(_adapter *padapter, u8 priority);
extern s32 rtw_xmitframe_coalesce_amsdu(_adapter *padapter, struct xmit_frame *pxmitframe, struct xmit_frame *pxmitframe_queue);
extern s32 rtw_xmitframe_coalesce_amsdu(_adapter *padapter, struct xmit_frame *pxmitframe, struct xmit_frame *pxmitframe_queue);
extern s32 check_amsdu(struct xmit_frame *pxmitframe);
extern s32 check_amsdu_tx_support(_adapter *padapter);
extern struct xmit_frame *rtw_get_xframe(struct xmit_priv *pxmitpriv, int *num_frame);

44
os_dep/linux/ioctl_cfg80211.c
View File

@ -82,7 +82,7 @@
#endif
/*
* In the current design of Wi-Fi driver, it will return success to the system (e.g. supplicant)
* In the current design of Wi-Fi driver, it will return success to the system (e.g. supplicant)
* when Wi-Fi driver decides to abort the scan request in the scan flow by default.
* Defining this flag makes Wi-Fi driver to return -EBUSY to the system if Wi-Fi driver is too busy to do the scan.
*/
@ -323,7 +323,7 @@ static u8 rtw_chbw_to_cfg80211_chan_def(struct wiphy *wiphy, struct cfg80211_cha
if (!chan)
goto exit;
if (bw == CHANNEL_WIDTH_20)
if (bw == CHANNEL_WIDTH_20)
chdef->width = ht ? NL80211_CHAN_WIDTH_20 : NL80211_CHAN_WIDTH_20_NOHT;
else if (bw == CHANNEL_WIDTH_40)
chdef->width = NL80211_CHAN_WIDTH_40;
@ -357,7 +357,7 @@ static void rtw_get_chbw_from_cfg80211_chan_def(struct cfg80211_chan_def *chdef,
rtw_warn_on(1);
*ch = 0;
return;
}
}
switch (chdef->width) {
case NL80211_CHAN_WIDTH_20_NOHT:
@ -1621,8 +1621,8 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param
_rtw_memcpy(padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16]), 8);
_rtw_memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24]), 8);
padapter->securitypriv.binstallGrpkey = _TRUE;
if (param->u.crypt.idx < 4)
_rtw_memcpy(padapter->securitypriv.iv_seq[param->u.crypt.idx], param->u.crypt.seq, 8);
if (param->u.crypt.idx < 4)
_rtw_memcpy(padapter->securitypriv.iv_seq[param->u.crypt.idx], param->u.crypt.seq, 8);
padapter->securitypriv.dot118021XGrpKeyid = param->u.crypt.idx;
rtw_set_key(padapter, &padapter->securitypriv, param->u.crypt.idx, 1, _TRUE);
@ -1870,7 +1870,7 @@ static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
|| (MLME_IS_STA(adapter) && !pairwise)
#endif
) {
) {
/* WEP key, TX GTK/IGTK, RX GTK/IGTK(for STA mode) */
if (is_wep_enc(sec->dot118021XGrpPrivacy)) {
if (keyid >= WEP_KEYS)
@ -1959,7 +1959,7 @@ static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev
}
ret = 0;
exit:
RTW_INFO(FUNC_NDEV_FMT
GET_KEY_PARAM_FMT_S
@ -5695,7 +5695,7 @@ release_plink_ctl:
if (del_sta) {
u8 sta_addr[ETH_ALEN];
u8 updated = _FALSE;
_rtw_memcpy(sta_addr, del_sta->cmn.mac_addr, ETH_ALEN);
updated = ap_free_sta(adapter, del_sta, 0, 0, 1);
rtw_mesh_expire_peer(stapriv->padapter, sta_addr);
@ -5780,7 +5780,7 @@ static int cfg80211_rtw_dump_station(struct wiphy *wiphy, struct net_device *nde
else
_rtw_memcpy(mac, plink->addr, ETH_ALEN);
#endif
sinfo->filled = 0;
if (psta) {
@ -7872,7 +7872,7 @@ void dump_mesh_config(void *sel, const struct mesh_config *conf)
RTW_PRINT_SEL(sel, "path_refresh_time:%u\n", conf->path_refresh_time);
RTW_PRINT_SEL(sel, "min_discovery_timeout:%u\n", conf->min_discovery_timeout);
RTW_PRINT_SEL(sel, "dot11MeshHWMPactivePathTimeout:%u\n", conf->dot11MeshHWMPactivePathTimeout);
RTW_PRINT_SEL(sel, "dot11MeshHWMPpreqMinInterval:%u\n", conf->dot11MeshHWMPpreqMinInterval);
RTW_PRINT_SEL(sel, "dot11MeshHWMPpreqMinInterval:%u\n", conf->dot11MeshHWMPpreqMinInterval);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0))
RTW_PRINT_SEL(sel, "dot11MeshHWMPperrMinInterval:%u\n", conf->dot11MeshHWMPperrMinInterval);
#endif
@ -7887,11 +7887,11 @@ void dump_mesh_config(void *sel, const struct mesh_config *conf)
RTW_PRINT_SEL(sel, "dot11MeshForwarding:%d\n", conf->dot11MeshForwarding);
RTW_PRINT_SEL(sel, "rssi_threshold:%d\n", conf->rssi_threshold);
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0))
RTW_PRINT_SEL(sel, "ht_opmode:0x%04x\n", conf->ht_opmode);
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
RTW_PRINT_SEL(sel, "dot11MeshHWMPactivePathToRootTimeout:%u\n", conf->dot11MeshHWMPactivePathToRootTimeout);
RTW_PRINT_SEL(sel, "dot11MeshHWMProotInterval:%u\n", conf->dot11MeshHWMProotInterval);
@ -7902,7 +7902,7 @@ void dump_mesh_config(void *sel, const struct mesh_config *conf)
RTW_PRINT_SEL(sel, "power_mode:%s\n", nl80211_mesh_power_mode_str(conf->power_mode));
RTW_PRINT_SEL(sel, "dot11MeshAwakeWindowDuration:%u\n", conf->dot11MeshAwakeWindowDuration);
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
RTW_PRINT_SEL(sel, "plink_timeout:%u\n", conf->plink_timeout);
#endif
@ -8038,14 +8038,14 @@ static void rtw_cfg80211_mesh_cfg_set(_adapter *adapter, const struct mesh_confi
if (chk_mesh_attr(NL80211_MESHCONF_HT_OPMODE, mask));
#endif
#endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
if (chk_mesh_attr(NL80211_MESHCONF_HWMP_PATH_TO_ROOT_TIMEOUT, mask))
mcfg->dot11MeshHWMPactivePathToRootTimeout = conf->dot11MeshHWMPactivePathToRootTimeout;
if (chk_mesh_attr(NL80211_MESHCONF_HWMP_ROOT_INTERVAL, mask))
mcfg->dot11MeshHWMProotInterval = conf->dot11MeshHWMProotInterval;
if (chk_mesh_attr(NL80211_MESHCONF_HWMP_CONFIRMATION_INTERVAL, mask))
mcfg->dot11MeshHWMPconfirmationInterval = conf->dot11MeshHWMPconfirmationInterval;
mcfg->dot11MeshHWMPconfirmationInterval = conf->dot11MeshHWMPconfirmationInterval;
#endif
#if 0 /* TBD */
@ -8103,7 +8103,7 @@ u8 *rtw_cfg80211_construct_mesh_beacon_ies(struct wiphy *wiphy, _adapter *adapte
#endif
if (!ch)
goto exit;
#if defined(CONFIG_80211AC_VHT) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
vht = ht && ch > 14 && bw >= CHANNEL_WIDTH_80; /* VHT40/VHT20? */
#endif
@ -8428,7 +8428,7 @@ static int cfg80211_rtw_join_mesh(struct wiphy *wiphy, struct net_device *dev,
ret = -EINVAL;
goto exit;
}
rtw_mesh_work(&adapter->mesh_work);
exit:
@ -8509,7 +8509,7 @@ static int cfg80211_rtw_del_mpath(struct wiphy *wiphy, struct net_device *dev
}
} else {
rtw_mesh_path_flush_by_iface(adapter);
}
}
exit:
return ret;
@ -8816,13 +8816,13 @@ int cfg80211_rtw_resume(struct wiphy *wiphy) {
//rtw_sitesurvey_cmd(padapter, NULL);
rtw_sitesurvey_cmd(padapter, &parm);
_exit_critical_bh(&pmlmepriv->lock, &irqL);
for (PNOWakeupScanWaitCnt = 0; PNOWakeupScanWaitCnt < 10; PNOWakeupScanWaitCnt++) {
if(check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _FALSE)
break;
rtw_msleep_os(1000);
}
_enter_critical_bh(&pmlmepriv->lock, &irqL);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0))
@ -8835,7 +8835,7 @@ int cfg80211_rtw_resume(struct wiphy *wiphy) {
}
RTW_DBG("<== %s\n",__func__);
return 0;
}
#endif /* CONFIG_PNO_SUPPORT */
@ -9729,7 +9729,7 @@ int rtw_hostapd_acs_dump_survey(struct wiphy *wiphy, struct net_device *netdev,
#elif defined(CONFIG_RTW_ACS) && defined(CONFIG_BACKGROUND_NOISE_MONITOR)
rtw_cfg80211_set_survey_info_with_clm(padapter, idx, info);
#else
RTW_ERR("%s: unknown acs operation!\n", __func__);
RTW_ERR("%s: unknown acs operation!\n", __func__);
#endif
return ret;

16
os_dep/linux/os_intfs.c
View File

@ -88,7 +88,7 @@ MODULE_PARM_DESC(rtw_lps_level, "The default LPS level");
module_param(rtw_lps_chk_by_tp, int, 0644);
/* LPS:
/* LPS:
* rtw_smart_ps = 0 => TX: pwr bit = 1, RX: PS_Poll
* rtw_smart_ps = 1 => TX: pwr bit = 0, RX: PS_Poll
* rtw_smart_ps = 2 => TX: pwr bit = 0, RX: NullData with pwr bit = 0
@ -97,8 +97,8 @@ int rtw_smart_ps = 2;
int rtw_max_bss_cnt = 0;
module_param(rtw_max_bss_cnt, int, 0644);
#ifdef CONFIG_WMMPS_STA
/* WMMPS:
#ifdef CONFIG_WMMPS_STA
/* WMMPS:
* rtw_smart_ps = 0 => Only for fw test
* rtw_smart_ps = 1 => Refer to Beacon's TIM Bitmap
* rtw_smart_ps = 2 => Don't refer to Beacon's TIM Bitmap
@ -2181,7 +2181,7 @@ struct dvobj_priv *devobj_init(void)
pdvobj->tpt_mode = 0;
pdvobj->edca_be_ul = 0x5ea42b;
pdvobj->edca_be_dl = 0x00a42b;
#endif
#endif
pdvobj->scan_deny = _FALSE;
return pdvobj;
@ -3296,7 +3296,7 @@ int _netdev_open(struct net_device *pnetdev)
}
#endif /*CONFIG_AUTOSUSPEND*/
if (!rtw_is_hw_init_completed(padapter)) { // ips
if (!rtw_is_hw_init_completed(padapter)) { // ips
rtw_clr_surprise_removed(padapter);
rtw_clr_drv_stopped(padapter);
RTW_ENABLE_FUNC(padapter, DF_RX_BIT);
@ -3318,7 +3318,7 @@ int _netdev_open(struct net_device *pnetdev)
{
#ifdef CONFIG_BT_COEXIST_SOCKET_TRX
_adapter *prim_adpt = GET_PRIMARY_ADAPTER(padapter);
if (prim_adpt && (_TRUE == prim_adpt->EEPROMBluetoothCoexist)) {
rtw_btcoex_init_socket(prim_adpt);
prim_adpt->coex_info.BtMgnt.ExtConfig.HCIExtensionVer = 0x04;
@ -3705,7 +3705,7 @@ int _pm_netdev_open(_adapter *padapter)
}
#endif /*CONFIG_AUTOSUSPEND*/
if (!rtw_is_hw_init_completed(padapter)) { // ips
if (!rtw_is_hw_init_completed(padapter)) { // ips
rtw_clr_surprise_removed(padapter);
rtw_clr_drv_stopped(padapter);
status = rtw_hal_init(padapter);
@ -4805,7 +4805,7 @@ int rtw_resume_process_wow(_adapter *padapter)
rtw_mi_start_drv_threads(padapter);
rtw_mi_intf_start(padapter);
if(registry_par->suspend_type == FW_IPS_DISABLE_BBRF && !check_fwstate(pmlmepriv, _FW_LINKED)) {
if (!rtw_is_surprise_removed(padapter)) {
rtw_hal_deinit(padapter);

4
os_dep/linux/recv_linux.c
View File

@ -404,7 +404,7 @@ void dynamic_napi_th_chk (_adapter *adapter)
if (adapter->registrypriv.en_napi) {
struct dvobj_priv *dvobj;
struct registry_priv *registry;
dvobj = adapter_to_dvobj(adapter);
registry = &adapter->registrypriv;
if (dvobj->traffic_stat.cur_rx_tp > registry->napi_threshold)
@ -520,7 +520,7 @@ void rtw_os_recv_indicate_pkt(_adapter *padapter, _pkt *pkt, union recv_frame *r
#ifdef CONFIG_RTW_NAPI
#ifdef CONFIG_RTW_NAPI_DYNAMIC
if (!skb_queue_empty(&precvpriv->rx_napi_skb_queue)
&& !adapter_to_dvobj(padapter)->en_napi_dynamic
&& !adapter_to_dvobj(padapter)->en_napi_dynamic
)
napi_recv(padapter, RTL_NAPI_WEIGHT);
#endif

1688
os_dep/linux/rhashtable.c
View File

File diff suppressed because it is too large Load Diff

1654
os_dep/linux/rhashtable.h
View File

File diff suppressed because it is too large Load Diff

4
os_dep/linux/rtw_android.c
View File

@ -656,7 +656,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
ret = -EFAULT;
goto exit;
}
command = rtw_zmalloc(priv_cmd.total_len+1);
if (!command) {
RTW_INFO("%s: failed to allocate memory\n", __FUNCTION__);
@ -935,7 +935,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
bytes_written = rtw_android_set_aek(net, command, priv_cmd.total_len);
break;
#endif
case ANDROID_WIFI_CMD_EXT_AUTH_STATUS: {
rtw_set_external_auth_status(padapter,
command + strlen("EXT_AUTH_STATUS "),

40
os_dep/linux/rtw_cfgvendor.c
View File

@ -1152,7 +1152,7 @@ static void LinkLayerStats(_adapter *padapter)
u32 ps_time, trx_total_time;
u64 tx_bytes, rx_bytes, trx_total_bytes = 0;
u64 tmp = 0;
RTW_DBG("%s adapter type : %u\n", __func__, padapter->adapter_type);
tx_bytes = 0;
@ -1169,7 +1169,7 @@ static void LinkLayerStats(_adapter *padapter)
pwrpriv->pwr_saving_time += rtw_get_passing_time_ms(pwrpriv->pwr_saving_start_time);
pwrpriv->pwr_saving_start_time = rtw_get_current_time();
}
} else {
} else {
#ifdef CONFIG_IPS
if ( pwrpriv->bpower_saving == _TRUE ) {
pwrpriv->pwr_saving_time += rtw_get_passing_time_ms(pwrpriv->pwr_saving_start_time);
@ -1187,7 +1187,7 @@ static void LinkLayerStats(_adapter *padapter)
ps_time = pwrpriv->on_time;
tx_bytes = pdvobjpriv->traffic_stat.last_tx_bytes;
rx_bytes = pdvobjpriv->traffic_stat.last_rx_bytes;
rx_bytes = pdvobjpriv->traffic_stat.last_rx_bytes;
trx_total_bytes = tx_bytes + rx_bytes;
trx_total_time = pwrpriv->on_time - ps_time;
@ -1206,30 +1206,30 @@ static void LinkLayerStats(_adapter *padapter)
tmp = (rx_bytes * trx_total_time);
tmp = rtw_division64(tmp, trx_total_bytes);
pwrpriv->rx_time = tmp;
pwrpriv->rx_time = tmp;
}
}
else {
pwrpriv->on_time = 0;
pwrpriv->tx_time = 0;
pwrpriv->rx_time = 0;
pwrpriv->rx_time = 0;
}
#ifdef CONFIG_RTW_WIFI_HAL_DEBUG
RTW_INFO("- tx_bytes : %llu rx_bytes : %llu total bytes : %llu\n", tx_bytes, rx_bytes, trx_total_bytes);
RTW_INFO("- netif_up = %s, on_time : %u ms\n", padapter->netif_up ? "1":"0", pwrpriv->on_time);
RTW_INFO("- pwr_saving_time : %u (%u) ms\n", pwrpriv->pwr_saving_time, ps_time);
RTW_INFO("- trx_total_time : %u ms\n", trx_total_time);
RTW_INFO("- trx_total_time : %u ms\n", trx_total_time);
RTW_INFO("- tx_time : %u ms\n", pwrpriv->tx_time);
RTW_INFO("- rx_time : %u ms\n", pwrpriv->rx_time);
RTW_INFO("- rx_time : %u ms\n", pwrpriv->rx_time);
#endif /* CONFIG_RTW_WIFI_HAL_DEBUG */
}
#define DUMMY_TIME_STATICS 99
static int rtw_cfgvendor_lstats_get_info(struct wiphy *wiphy,
static int rtw_cfgvendor_lstats_get_info(struct wiphy *wiphy,
struct wireless_dev *wdev, const void *data, int len)
{
int err = 0;
@ -1250,8 +1250,8 @@ static int rtw_cfgvendor_lstats_get_info(struct wiphy *wiphy,
radio->radio = 1;
/* to get on_time, tx_time, rx_time */
LinkLayerStats(padapter);
LinkLayerStats(padapter);
radio->on_time = pwrpriv->on_time;
radio->tx_time = pwrpriv->tx_time;
radio->rx_time = pwrpriv->rx_time;
@ -1270,9 +1270,9 @@ static int rtw_cfgvendor_lstats_get_info(struct wiphy *wiphy,
RTW_INFO("radio->tx_time : %u ms\n", (radio->tx_time));
RTW_INFO("radio->rx_time : %u ms\n", (radio->rx_time));
#endif /* CONFIG_RTW_WIFI_HAL_DEBUG */
RTW_DBG(FUNC_NDEV_FMT" %s\n", FUNC_NDEV_ARG(wdev_to_ndev(wdev)), (char*)data);
err = rtw_cfgvendor_send_cmd_reply(wiphy, wdev_to_ndev(wdev),
err = rtw_cfgvendor_send_cmd_reply(wiphy, wdev_to_ndev(wdev),
output, sizeof(wifi_iface_stat) + sizeof(wifi_radio_stat_internal));
if (unlikely(err))
RTW_ERR(FUNC_NDEV_FMT"Vendor Command reply failed ret:%d \n"
@ -1280,14 +1280,14 @@ static int rtw_cfgvendor_lstats_get_info(struct wiphy *wiphy,
rtw_mfree(output, sizeof(wifi_iface_stat) + sizeof(wifi_radio_stat_internal));
return err;
}
static int rtw_cfgvendor_lstats_set_info(struct wiphy *wiphy,
static int rtw_cfgvendor_lstats_set_info(struct wiphy *wiphy,
struct wireless_dev *wdev, const void *data, int len)
{
int err = 0;
RTW_INFO("%s\n", __func__);
return err;
}
static int rtw_cfgvendor_lstats_clear_info(struct wiphy *wiphy,
static int rtw_cfgvendor_lstats_clear_info(struct wiphy *wiphy,
struct wireless_dev *wdev, const void *data, int len)
{
int err = 0;
@ -1665,7 +1665,7 @@ static int rtw_cfgvendor_set_rand_mac_oui(struct wiphy *wiphy,
static int rtw_cfgvendor_set_nodfs_flag(struct wiphy *wiphy,
struct wireless_dev *wdev, const void *data, int len)
{
int err = 0;
int err = 0;
int type;
u32 nodfs = 0;
_adapter *padapter = GET_PRIMARY_ADAPTER(wiphy_to_adapter(wiphy));
@ -1681,7 +1681,7 @@ static int rtw_cfgvendor_set_nodfs_flag(struct wiphy *wiphy,
}
RTW_INFO("%s nodfs=%d, err=%d\n", __func__, nodfs, err);
return err;
}
@ -1719,7 +1719,7 @@ static int rtw_cfgvendor_set_country(struct wiphy *wiphy,
static int rtw_cfgvendor_set_nd_offload(struct wiphy *wiphy,
struct wireless_dev *wdev, const void *data, int len)
{
int err = 0;
int err = 0;
int type;
u8 nd_en = 0;
_adapter *padapter = GET_PRIMARY_ADAPTER(wiphy_to_adapter(wiphy));
@ -1735,7 +1735,7 @@ static int rtw_cfgvendor_set_nd_offload(struct wiphy *wiphy,
}
RTW_INFO("%s nd_en=%d, err=%d\n", __func__, nd_en, err);
return err;
}
#endif /* CONFIG_RTW_WIFI_HAL */
@ -1949,7 +1949,7 @@ static const struct wiphy_vendor_command rtw_vendor_cmds[] = {
},
.flags = WIPHY_VENDOR_CMD_NEED_WDEV | WIPHY_VENDOR_CMD_NEED_NETDEV,
.doit = rtw_cfgvendor_logger_get_rx_pkt_fates
},
},
#endif /* CONFIG_RTW_CFGVENDOR_WIFI_LOGGER */
#ifdef CONFIG_RTW_WIFI_HAL
#ifdef CONFIG_RTW_CFGVENDOR_RANDOM_MAC_OUI

2
os_dep/linux/rtw_cfgvendor.h
View File

@ -122,7 +122,7 @@ enum rtw_vendor_subcmd {
APF_SUBCMD_GET_CAPABILITIES = ANDROID_NL80211_SUBCMD_PKT_FILTER_RANGE_START,
APF_SUBCMD_SET_FILTER,
LOGGER_START_LOGGING = ANDROID_NL80211_SUBCMD_DEBUG_RANGE_START,
LOGGER_TRIGGER_MEM_DUMP,
LOGGER_GET_MEM_DUMP,

50
os_dep/linux/rtw_proc.c
View File

@ -1033,15 +1033,15 @@ static int proc_get_turboedca_ctrl(struct seq_file *m, void *v)
u32 edca_param;
if (hal_data->dis_turboedca == 0)
RTW_PRINT_SEL(m, "Turbo-EDCA : %s\n", "Enable");
else
RTW_PRINT_SEL(m, "Turbo-EDCA : %s\n", "Enable");
else
RTW_PRINT_SEL(m, "Turbo-EDCA : %s, mode=%d, edca_param_mode=0x%x\n", "Disable", hal_data->dis_turboedca, hal_data->edca_param_mode);
rtw_hal_get_hwreg(padapter, HW_VAR_AC_PARAM_BE, (u8 *)(&edca_param));
_RTW_PRINT_SEL(m, "PARAM_BE:0x%x\n", edca_param);
}
return 0;
@ -1072,28 +1072,28 @@ static ssize_t proc_set_turboedca_ctrl(struct file *file, const char __user *buf
}
/* 0: enable turboedca,
1: disable turboedca,
1: disable turboedca,
2: disable turboedca and setting EDCA parameter based on the input parameter
> 2 : currently reset to 0 */
if (mode > 2)
> 2 : currently reset to 0 */
if (mode > 2)
mode = 0;
hal_data->dis_turboedca = mode;
hal_data->edca_param_mode = 0; /* init. value */
RTW_INFO("dis_turboedca mode = 0x%x\n", hal_data->dis_turboedca);
if (num == 2) {
hal_data->edca_param_mode = param_mode;
hal_data->edca_param_mode = param_mode;
RTW_INFO("param_mode = 0x%x\n", param_mode);
}
}
return count;
}
@ -1269,7 +1269,7 @@ ssize_t proc_set_macaddr_acl(struct file *file, const char __user *buffer, size_
#define MAC_ACL_CMD_DEL 2
#define MAC_ACL_CMD_CLR 3
#define MAC_ACL_CMD_NUM 4
static const char * const mac_acl_cmd_str[] = {
"mode",
"add",
@ -1371,7 +1371,7 @@ ssize_t proc_set_macaddr_acl(struct file *file, const char __user *buffer, size_
} else if (!is_bcast)
rtw_acl_add_sta(adapter, period, addr);
}
c = strsep(&next, " \t");
}
}
@ -2036,7 +2036,7 @@ static void rtw_set_tx_bw_mode(struct _ADAPTER *adapter, u8 bw_mode)
) {
/* RA mask update needed */
update = _TRUE;
}
}
adapter->driver_tx_bw_mode = bw_mode;
if (update == _TRUE) {
@ -3093,7 +3093,7 @@ static ssize_t proc_set_napi_th(struct file *file, const char __user *buffer, si
for (i = 0; i < dvobj->iface_nums; i++) {
iface = dvobj->padapters[i];
if (iface) {
if (iface) {
if (buffer && !copy_from_user(tmp, buffer, count)) {
registry = &iface->registrypriv;
num = sscanf(tmp, "%d", &thrshld);
@ -3615,7 +3615,7 @@ static void tpt_mode_default(struct _ADAPTER *adapter)
dvobj->scan_deny = _FALSE;
/* 2. back to original LPS mode */
#ifdef CONFIG_LPS
#ifdef CONFIG_LPS
rtw_pm_set_lps(adapter, adapter->registrypriv.power_mgnt);
#endif
@ -3630,13 +3630,13 @@ static void rtw_tpt_mode(struct _ADAPTER *adapter)
if (dvobj->tpt_mode > 0) {
/* when enable each tpt mode
/* when enable each tpt mode
1. scan deny
2. disable LPS */
dvobj->scan_deny = _TRUE;
#ifdef CONFIG_LPS
#ifdef CONFIG_LPS
rtw_pm_set_lps(adapter, PS_MODE_ACTIVE);
#endif
@ -3647,9 +3647,9 @@ static void rtw_tpt_mode(struct _ADAPTER *adapter)
tpt_mode_default(adapter);
break;
case 1: /* High TP*/
/*tpt_mode1(adapter);*/
/*tpt_mode1(adapter);*/
dvobj->edca_be_ul = 0x5e431c;
dvobj->edca_be_dl = 0x00431c;
dvobj->edca_be_dl = 0x00431c;
break;
case 2: /* noise */
/* tpt_mode2(adapter); */
@ -3673,7 +3673,7 @@ static void rtw_tpt_mode(struct _ADAPTER *adapter)
rtw_set_tx_bw_mode(adapter, 0x20); /* for 2.4g, fixed tx_bw_mode to 20Mhz */
break;
default: /* default mode */
tpt_mode_default(adapter);
tpt_mode_default(adapter);
break;
}
@ -3706,7 +3706,7 @@ static ssize_t proc_set_tpt_mode(struct file *file, const char __user *buffer,
}
if (mode > MAX_TPT_MODE_NUM )
mode = 0;
mode = 0;
RTW_PRINT("%s: previous mode = %d\n",
__FUNCTION__, dvobj->tpt_mode);
@ -3976,7 +3976,7 @@ const struct rtw_proc_hdl adapter_proc_hdls[] = {
RTW_PROC_HDL_SSEQ("ps_info", proc_get_ps_info, proc_set_ps_info),
#ifdef CONFIG_WMMPS_STA
RTW_PROC_HDL_SSEQ("wmmps_info", proc_get_wmmps_info, proc_set_wmmps_info),
#endif /* CONFIG_WMMPS_STA */
#endif /* CONFIG_WMMPS_STA */
#endif
#ifdef CONFIG_TDLS
RTW_PROC_HDL_SSEQ("tdls_info", proc_get_tdls_info, NULL),

4
os_dep/linux/usb_intf.c
View File

@ -272,7 +272,7 @@ static struct usb_device_id rtw_usb_id_tbl[] = {
{USB_DEVICE_AND_INTERFACE_INFO(USB_VENDER_ID_REALTEK, 0xC82A, 0xff, 0xff, 0xff), .driver_info = RTL8821C}, /* 8821CU */
{USB_DEVICE_AND_INTERFACE_INFO(USB_VENDER_ID_REALTEK, 0xC82B, 0xff, 0xff, 0xff), .driver_info = RTL8821C}, /* 8821CU */
{USB_DEVICE_AND_INTERFACE_INFO(USB_VENDER_ID_REALTEK, 0xC811, 0xff, 0xff, 0xff), .driver_info = RTL8821C}, /* 8811CU */
{USB_DEVICE_AND_INTERFACE_INFO(USB_VENDER_ID_REALTEK, 0x8811, 0xff, 0xff, 0xff), .driver_info = RTL8821C}, /* 8811CU */
{USB_DEVICE_AND_INTERFACE_INFO(USB_VENDER_ID_REALTEK, 0x8811, 0xff, 0xff, 0xff), .driver_info = RTL8821C}, /* 8811CU */
/*=== Customer ID ===*/
#endif
@ -1100,7 +1100,7 @@ static int rtw_resume(struct usb_interface *pusb_intf)
#ifdef CONFIG_AUTOSUSPEND
if (pwrpriv->bInternalAutoSuspend)
ret = rtw_resume_process(padapter);
else
else
#endif
{
if (pwrpriv->wowlan_mode || pwrpriv->wowlan_ap_mode) {

8
os_dep/linux/xmit_linux.c
View File

@ -65,7 +65,7 @@ sint rtw_endofpktfile(struct pkt_file *pfile)
void rtw_set_tx_chksum_offload(_pkt *pkt, struct pkt_attrib *pattrib)
{
#ifdef CONFIG_TX_CSUM_OFFLOAD
#ifdef CONFIG_TX_CSUM_OFFLOAD
struct sk_buff *skb = (struct sk_buff *)pkt;
struct iphdr *iph = NULL;
struct ipv6hdr *i6ph = NULL;
@ -305,12 +305,12 @@ void rtw_os_xmit_schedule(_adapter *padapter)
tasklet_hi_schedule(&pxmitpriv->xmit_tasklet);
_exit_critical_bh(&pxmitpriv->lock, &irqL);
#if defined(CONFIG_PCI_HCI) && defined(CONFIG_XMIT_THREAD_MODE)
if (_rtw_queue_empty(&padapter->xmitpriv.pending_xmitbuf_queue) == _FALSE)
_rtw_up_sema(&padapter->xmitpriv.xmit_sema);
#endif
#endif
}
@ -451,7 +451,7 @@ int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev)
#ifdef CONFIG_TX_MCAST2UNI
extern int rtw_mc2u_disable;
#endif /* CONFIG_TX_MCAST2UNI */
#ifdef CONFIG_TX_CSUM_OFFLOAD
#ifdef CONFIG_TX_CSUM_OFFLOAD
struct sk_buff *skb = pkt;
struct sk_buff *segs, *nskb;
netdev_features_t features = padapter->pnetdev->features;

4
os_dep/osdep_service.c
View File

@ -2817,7 +2817,7 @@ int map_readN(const struct map_t *map, u16 offset, u16 len, u8 *buf)
else
c_len = seg->sa + seg->len - offset;
}
_rtw_memcpy(c_dst, c_src, c_len);
}
@ -3001,7 +3001,7 @@ void dump_blacklist(void *sel, _queue *blist, const char *title)
if (rtw_end_of_queue_search(head, list) == _FALSE) {
if (title)
RTW_PRINT_SEL(sel, "%s:\n", title);
while (rtw_end_of_queue_search(head, list) == _FALSE) {
ent = LIST_CONTAINOR(list, struct blacklist_ent, list);
list = get_next(list);

10
runwpa
View File

@ -1,17 +1,17 @@
#!/bin/bash
if [ "`which iwconfig`" = "" ] ; then
if [ "`which iwconfig`" = "" ] ; then
echo "WARNING:Wireless tool not exist!"
echo " Please install it!"
exit
else
if [ `uname -r | cut -d. -f2` -eq 4 ]; then
wpa_supplicant -D ipw -c wpa1.conf -i wlan0
wpa_supplicant -D ipw -c wpa1.conf -i wlan0
else
if [ `iwconfig -v |awk '{print $4}' | head -n 1` -lt 18 ] ; then
wpa_supplicant -D ipw -c wpa1.conf -i wlan0
else
wpa_supplicant -D wext -c wpa1.conf -i wlan0
wpa_supplicant -D ipw -c wpa1.conf -i wlan0
else
wpa_supplicant -D wext -c wpa1.conf -i wlan0
fi
fi