From 90d03c245c0e832695fc018bb7bd8ac49e690367 Mon Sep 17 00:00:00 2001 From: kimocoder Date: Fri, 27 Sep 2019 23:18:20 -0700 Subject: [PATCH] Fixed 2 warnings on Ubuntu --- core/rtw_mlme_ext.c | 5 ++--- dkms.conf | 2 +- hal/hal_intf.c | 7 ++++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 1025c8c..4c6343e 100644 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -20,7 +20,6 @@ #endif /* CONFIG_IOCTL_CFG80211 */ #include - struct mlme_handler mlme_sta_tbl[] = { {WIFI_ASSOCREQ, "OnAssocReq", &OnAssocReq}, {WIFI_ASSOCRSP, "OnAssocRsp", &OnAssocRsp}, @@ -94,14 +93,13 @@ struct action_handler OnAction_tbl[] = { {RTW_WLAN_CATEGORY_P2P, "ACTION_P2P", &OnAction_p2p}, }; - u8 null_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0}; /************************************************** OUI definitions for the vendor specific IE ***************************************************/ unsigned char RTW_WPA_OUI[] = {0x00, 0x50, 0xf2, 0x01}; -unsigned char WMM_OUI[] = {0x00, 0x50, 0xf2, 0x02}; +unsigned char WMM_OUI[] = {0x00, 0x50, 0xf2, 0x02}; unsigned char WPS_OUI[] = {0x00, 0x50, 0xf2, 0x04}; unsigned char P2P_OUI[] = {0x50, 0x6F, 0x9A, 0x09}; unsigned char WFD_OUI[] = {0x50, 0x6F, 0x9A, 0x0A}; @@ -258,6 +256,7 @@ void rtw_txpwr_init_regd(struct rf_ctl_t *rfctl) ); if (rfctl->regd_name) break; + // Intentional fallthrough default: rfctl->regd_name = regd_str(TXPWR_LMT_WW); RTW_PRINT("assign %s for default case\n", regd_str(TXPWR_LMT_WW)); diff --git a/dkms.conf b/dkms.conf index c62a506..adc39cf 100644 --- a/dkms.conf +++ b/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="realtek-rtl88xxau" -PACKAGE_VERSION="5.6.4.1~20190919" +PACKAGE_VERSION="5.6.4.1~20190928" CLEAN="'make' clean" BUILT_MODULE_NAME[0]=88XXau PROCS_NUM=`nproc` diff --git a/hal/hal_intf.c b/hal/hal_intf.c index 2d020fb..26a02a3 100644 --- a/hal/hal_intf.c +++ b/hal/hal_intf.c @@ -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; @@ -1081,6 +1081,7 @@ s32 c2h_handler(_adapter *adapter, u8 id, u8 seq, u8 plen, u8 *payload) #endif case C2H_EXTEND: sub_id = payload[0]; + // Intentional fallthrough /* no handle, goto default */ default: