mirrors/rtl8812au-chinawrj
1
0
Fork 0
mirror of https://github.com/chinawrj/rtl8812au synced 2024-11-28 08:04:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #144 from kimocoder/v5.2.20

Browse Source 
Fixed compilation warnings
This commit is contained in:
Christian B 2018-07-02 07:23:48 +02:00 committed by GitHub
commit 2e64f3b55e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 65 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/rtw_mlme_ext.c
View File

@ -1639,7 +1639,7 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
ptable->func = &OnAuth;
else
ptable->func = &OnAuthClient;
/* pass through */
/* Intentional fallthrough */
case WIFI_ASSOCREQ:
case WIFI_REASSOCREQ:
_mgt_dispatcher(padapter, ptable, precv_frame);
@ -2435,14 +2435,15 @@ unsigned int OnAuth(_adapter *padapter, union recv_frame *precv_frame)
if (rtw_is_list_empty(&pstat->asoc_list) == _FALSE) {
rtw_list_delete(&pstat->asoc_list);
pstapriv->asoc_list_cnt--;
if (pstat->expire_to > 0)
if (pstat->expire_to > 0) {
;/* TODO: STA re_auth within expire_to */
}
}
_exit_critical_bh(&pstapriv->asoc_list_lock, &irqL);
if (seq == 1)
if (seq == 1) {
; /* TODO: STA re_auth and auth timeout */
}
}
}

3
core/rtw_recv.c
View File

@ -2253,8 +2253,9 @@ sint validate_recv_frame(_adapter *adapter, union recv_frame *precv_frame)
dump_rx_packet(ptr);
}
#endif
} else
} else {
DBG_COUNTER(adapter->rx_logs.core_rx_pre_data_handled);
}
break;
default:
DBG_COUNTER(adapter->rx_logs.core_rx_pre_unknown);

4
core/rtw_wlan_util.c
View File

@ -2277,9 +2277,9 @@ int rtw_get_bcn_keys(ADAPTER *Adapter, u8 *pframe, u32 packet_len,
_rtw_memcpy(recv_beacon->ssid, elems.ssid, elems.ssid_len);
recv_beacon->ssid_len = elems.ssid_len;
} else
} else {
; /* means hidden ssid */
}
/* checking RSN first */
if (elems.rsn_ie && elems.rsn_ie_len) {
recv_beacon->encryp_protocol = ENCRYP_PROTOCOL_WPA2;

4
core/rtw_xmit.c
View File

@ -1331,9 +1331,9 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
_rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN);
_rtw_memcpy(pattrib->ta, get_bssid(pmlmepriv), ETH_ALEN);
DBG_COUNTER(padapter->tx_logs.core_tx_upd_attrib_ap);
} else
} else {
DBG_COUNTER(padapter->tx_logs.core_tx_upd_attrib_unknown);
}
bmcast = IS_MCAST(pattrib->ra);
if (bmcast) {
psta = rtw_get_bcmc_stainfo(padapter);

2
dkms.conf
View File

@ -1,5 +1,5 @@
PACKAGE_NAME="realtek-rtl8812au"
PACKAGE_VERSION="5.2.20~20180625"
PACKAGE_VERSION="5.2.20~20180701"
BUILT_MODULE_NAME[0]="8812au"
PROCS_NUM=`nproc`
[ $PROCS_NUM -gt 16 ] && PROCS_NUM=16

3
docs/kimocoder_Changelog.txt
View File

@ -21,6 +21,9 @@
+++ And propably alot more. We'll see.
[2018.07.01]
- Fixed compilation warnings (brackets missing etc)
[2018.06.26]
- Enable TX queue in the monitor mode
- Add support for namespaces (CONFIG_NET_NS)

1
hal/hal_intf.c
View File

@ -933,6 +933,7 @@ s32 c2h_handler(_adapter *adapter, u8 id, u8 seq, u8 plen, u8 *payload)
case C2H_EXTEND:
sub_id = payload[0];
/* Intentional fallthrough */
/* no handle, goto default */
default:

67
hal/phydm/txbf/halcomtxbf.c
View File

@ -46,9 +46,10 @@ hal_com_txbf_config_gtab(
{
struct PHY_DM_STRUCT *p_dm = (struct PHY_DM_STRUCT *)p_dm_void;
if (p_dm->support_ic_type & ODM_RTL8822B)
if (p_dm->support_ic_type & ODM_RTL8822B) {
hal_txbf_8822b_config_gtab(p_dm);
}
}
void
phydm_beamform_set_sounding_enter(
@ -204,15 +205,19 @@ hal_com_txbf_enter_work_item_callback(
PHYDM_DBG(p_dm, DBG_TXBF, ("[%s] Start!\n", __func__));
if (p_dm->support_ic_type & (ODM_RTL8812 | ODM_RTL8821))
if (p_dm->support_ic_type & (ODM_RTL8812 | ODM_RTL8821)) {
hal_txbf_jaguar_enter(p_dm, idx);
else if (p_dm->support_ic_type & ODM_RTL8192E)
}
else if (p_dm->support_ic_type & ODM_RTL8192E) {
hal_txbf_8192e_enter(p_dm, idx);
else if (p_dm->support_ic_type & ODM_RTL8814A)
}
else if (p_dm->support_ic_type & ODM_RTL8814A) {
hal_txbf_8814a_enter(p_dm, idx);
else if (p_dm->support_ic_type & ODM_RTL8822B)
}
else if (p_dm->support_ic_type & ODM_RTL8822B) {
hal_txbf_8822b_enter(p_dm, idx);
}
}
void
hal_com_txbf_leave_work_item_callback(
@ -235,15 +240,19 @@ hal_com_txbf_leave_work_item_callback(
PHYDM_DBG(p_dm, DBG_TXBF, ("[%s] Start!\n", __func__));
if (p_dm->support_ic_type & (ODM_RTL8812 | ODM_RTL8821))
if (p_dm->support_ic_type & (ODM_RTL8812 | ODM_RTL8821)) {
hal_txbf_jaguar_leave(p_dm, idx);
else if (p_dm->support_ic_type & ODM_RTL8192E)
}
else if (p_dm->support_ic_type & ODM_RTL8192E) {
hal_txbf_8192e_leave(p_dm, idx);
else if (p_dm->support_ic_type & ODM_RTL8814A)
}
else if (p_dm->support_ic_type & ODM_RTL8814A) {
hal_txbf_8814a_leave(p_dm, idx);
else if (p_dm->support_ic_type & ODM_RTL8822B)
}
else if (p_dm->support_ic_type & ODM_RTL8822B) {
hal_txbf_8822b_leave(p_dm, idx);
}
}
void
@ -266,15 +275,19 @@ hal_com_txbf_fw_ndpa_work_item_callback(
PHYDM_DBG(p_dm, DBG_TXBF, ("[%s] Start!\n", __func__));
if (p_dm->support_ic_type & (ODM_RTL8812 | ODM_RTL8821))
if (p_dm->support_ic_type & (ODM_RTL8812 | ODM_RTL8821)) {
hal_txbf_jaguar_fw_txbf(p_dm, idx);
else if (p_dm->support_ic_type & ODM_RTL8192E)
}
else if (p_dm->support_ic_type & ODM_RTL8192E) {
hal_txbf_8192e_fw_tx_bf(p_dm, idx);
else if (p_dm->support_ic_type & ODM_RTL8814A)
}
else if (p_dm->support_ic_type & ODM_RTL8814A) {
hal_txbf_8814a_fw_txbf(p_dm, idx);
else if (p_dm->support_ic_type & ODM_RTL8822B)
}
else if (p_dm->support_ic_type & ODM_RTL8822B) {
hal_txbf_8822b_fw_txbf(p_dm, idx);
}
}
void
hal_com_txbf_clk_work_item_callback(
@ -321,12 +334,15 @@ hal_com_txbf_rate_work_item_callback(
PHYDM_DBG(p_dm, DBG_TXBF, ("[%s] Start!\n", __func__));
if (p_dm->support_ic_type & ODM_RTL8812)
if (p_dm->support_ic_type & ODM_RTL8812) {
hal_txbf_8812a_set_ndpa_rate(p_dm, BW, rate);
else if (p_dm->support_ic_type & ODM_RTL8192E)
}
else if (p_dm->support_ic_type & ODM_RTL8192E) {
hal_txbf_8192e_set_ndpa_rate(p_dm, BW, rate);
else if (p_dm->support_ic_type & ODM_RTL8814A)
}
else if (p_dm->support_ic_type & ODM_RTL8814A) {
hal_txbf_8814a_set_ndpa_rate(p_dm, BW, rate);
}
}
@ -376,15 +392,19 @@ hal_com_txbf_status_work_item_callback(
PHYDM_DBG(p_dm, DBG_TXBF, ("[%s] Start!\n", __func__));
if (p_dm->support_ic_type & (ODM_RTL8812 | ODM_RTL8821))
if (p_dm->support_ic_type & (ODM_RTL8812 | ODM_RTL8821)) {
hal_txbf_jaguar_status(p_dm, idx);
else if (p_dm->support_ic_type & ODM_RTL8192E)
}
else if (p_dm->support_ic_type & ODM_RTL8192E) {
hal_txbf_8192e_status(p_dm, idx);
else if (p_dm->support_ic_type & ODM_RTL8814A)
}
else if (p_dm->support_ic_type & ODM_RTL8814A) {
hal_txbf_8814a_status(p_dm, idx);
else if (p_dm->support_ic_type & ODM_RTL8822B)
}
else if (p_dm->support_ic_type & ODM_RTL8822B) {
hal_txbf_8822b_status(p_dm, idx);
}
}
void
hal_com_txbf_reset_tx_path_work_item_callback(
@ -405,9 +425,9 @@ hal_com_txbf_reset_tx_path_work_item_callback(
u8 idx = p_txbf_info->txbf_idx;
if (p_dm->support_ic_type & ODM_RTL8814A)
if (p_dm->support_ic_type & ODM_RTL8814A) {
hal_txbf_8814a_reset_tx_path(p_dm, idx);
}
}
void
@ -426,9 +446,10 @@ hal_com_txbf_get_tx_rate_work_item_callback(
struct PHY_DM_STRUCT *p_dm = (struct PHY_DM_STRUCT *)p_dm_void;
#endif
if (p_dm->support_ic_type & ODM_RTL8814A)
if (p_dm->support_ic_type & ODM_RTL8814A) {
hal_txbf_8814a_get_tx_rate(p_dm);
}
}
boolean

2
os_dep/linux/ioctl_cfg80211.c
View File

@ -2059,6 +2059,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
case NL80211_IFTYPE_P2P_CLIENT:
is_p2p = _TRUE;
#endif
/* Intentional fallthrough */
case NL80211_IFTYPE_STATION:
networkType = Ndis802_11Infrastructure;
@ -2083,6 +2084,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
case NL80211_IFTYPE_P2P_GO:
is_p2p = _TRUE;
#endif
/* Intentional fallthrough */
case NL80211_IFTYPE_AP:
networkType = Ndis802_11APMode;

5
os_dep/linux/recv_linux.c
View File

@ -501,12 +501,13 @@ void rtw_os_recv_indicate_pkt(_adapter *padapter, _pkt *pkt, union recv_frame *r
#endif /* CONFIG_RTW_NAPI */
ret = rtw_netif_rx(padapter->pnetdev, pkt);
if (ret == NET_RX_SUCCESS)
if (ret == NET_RX_SUCCESS) {
DBG_COUNTER(padapter->rx_logs.os_netif_ok);
else
} else {
DBG_COUNTER(padapter->rx_logs.os_netif_err);
}
}
}
void rtw_handle_tkip_mic_err(_adapter *padapter, struct sta_info *sta, u8 bgroup)
{