staging: rtl8723bs: remove MAC_FMT macro
PATCH 1/9 staging: rtl8723bs: remove MAC_FMT macro
Remove unnecessary macro for %pM and call it directly.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 39 +++++---------- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- .../staging/rtl8723bs/core/rtw_ieee80211.c | 2 +- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 4 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 24 +++++----- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 47 +++++++++---------- drivers/staging/rtl8723bs/core/rtw_recv.c | 22 ++++----- .../staging/rtl8723bs/core/rtw_wlan_util.c | 6 +-- drivers/staging/rtl8723bs/core/rtw_xmit.c | 10 ++-- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 4 +- drivers/staging/rtl8723bs/include/ieee80211.h | 1 - .../staging/rtl8723bs/include/osdep_service.h | 3 -- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 14 +++--- .../staging/rtl8723bs/os_dep/ioctl_linux.c | 16 +++---- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 8 ++-- drivers/staging/rtl8723bs/os_dep/recv_linux.c | 2 +- 16 files changed, 93 insertions(+), 111 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +13 -26
@@ -182,7 +182,7 @@ u8 chk_sta_is_alive(struct sta_info *psta) {#ifdef DBG_EXPIRATION_CHK DBG_871X ( -"sta:" MAC_FMT ", rssi:%d, rx:" STA_PKTS_FMT ", expire_to:%u, %s%ssq_len:%u\n" +"sta:%pM, rssi:%d, rx:" STA_PKTS_FMT ", expire_to:%u, %s%ssq_len:%u\n" ,MAC_ARG (psta->hwaddr) , psta->rssi_stat.UndecoratedSmoothedPWDB /* STA_RX_PKTS_ARG(psta) */
@@ -297,7 +297,7 @@ void expire_timeout_chk(struct adapter *padapter) psta->expire_to = pstapriv->expire_to; psta->state |=WIFI_STA_ALIVE_CHK_STATE ; -/* DBG_871X("alive chk, sta:" MAC_FMT " is at ps mode!\n", MAC_ARG(psta->hwaddr)); */ +/* DBG_871X("alive chk, sta:%pM is at ps mode!\n", MAC_ARG(psta->hwaddr)); */ /* to update bcn with tim_bitmap for this station */ pstapriv->tim_bitmap |=BIT (psta->aid);
@@ -319,7 +319,7 @@ void expire_timeout_chk(struct adapter *padapter)list_del_init (&psta->asoc_list); pstapriv->asoc_list_cnt--;DBG_871X ( -"asoc expire " MAC_FMT ", state = 0x%x\n" , +"asoc expire %pM, state = 0x%x\n" ,MAC_ARG (psta->hwaddr), psta->state );
@@ -332,7 +332,7 @@ void expire_timeout_chk(struct adapter *padapter) ) / 2) ) { DBG_871X( - "%s sta:"MAC_FMT", sleepq_len:%u, free_xmitframe_cnt:%u, asoc_list_cnt:%u, clear sleep_q\n", + "%s sta:%pM, sleepq_len:%u, free_xmitframe_cnt:%u, asoc_list_cnt:%u, clear sleep_q\n", __func__, MAC_ARG(psta->hwaddr), psta->sleepq_len,
@@ -372,7 +372,7 @@ void expire_timeout_chk(struct adapter *padapter) psta->keep_alive_trycnt++;if (ret == _SUCCESS) {DBG_871X ( -"asoc check, sta(" MAC_FMT ") is alive\n" , +"asoc check, sta(%pM) is alive\n" ,MAC_ARG (psta->hwaddr) ); psta->expire_to = pstapriv->expire_to;
@@ -387,10 +387,8 @@ void expire_timeout_chk(struct adapter *padapter) } psta->keep_alive_trycnt =0 ; -DBG_871X ( -"asoc expire " MAC_FMT ", state = 0x%x\n" , -MAC_ARG (psta->hwaddr), - psta->state); +DBG_871X ("asoc expire %pM, state = 0x%x\n" ,MAC_ARG (psta->hwaddr), + psta->state);spin_lock_bh (&pstapriv->asoc_list_lock);if (list_empty (&psta->asoc_list) == false) {list_del_init (&psta->asoc_list);
@@ -1335,12 +1333,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;struct __queue *pacl_node_q = &pacl_list->acl_node_q; -DBG_871X ( -"%s(acl_num =%d) =" MAC_FMT "\n" , - __func__, - pacl_list->num, -MAC_ARG (addr) - ); +DBG_871X ("%s(acl_num =%d) =%pM\n" , __func__, pacl_list->num,MAC_ARG (addr));if ((NUM_ACL -1 ) < pacl_list->num)return (-1 );
@@ -1404,12 +1397,7 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)struct __queue *pacl_node_q = &pacl_list->acl_node_q;u8 baddr[ETH_ALEN ] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff };/* Baddr is used for clearing acl_list */ -DBG_871X ( -"%s(acl_num =%d) =" MAC_FMT "\n" , - __func__, - pacl_list->num, -MAC_ARG (addr) - ); +DBG_871X ("%s(acl_num =%d) =%pM\n" , __func__, pacl_list->num,MAC_ARG (addr));spin_lock_bh (&(pacl_node_q->lock));
@@ -2021,7 +2009,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)if (psta->flags &WLAN_STA_HT ) {u16 ht_capab =le16_to_cpu (psta->htpriv.ht_cap.cap_info); -DBG_871X ("HT: STA " MAC_FMT " HT Capabilities " +DBG_871X ("HT: STA %pM HT Capabilities " "Info: 0x%04x\n" ,MAC_ARG (psta->hwaddr), ht_capab);if (psta->no_ht_set) {
@@ -2034,7 +2022,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) psta->no_ht_gf_set =1 ; pmlmepriv->num_sta_ht_no_gf++; } -DBG_871X ("%s STA " MAC_FMT " - no " +DBG_871X ("%s STA %pM - no " "greenfield, num of non-gf stations %d\n" , __func__,MAC_ARG (psta->hwaddr), pmlmepriv->num_sta_ht_no_gf);
@@ -2045,7 +2033,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) psta->ht_20mhz_set =1 ; pmlmepriv->num_sta_ht_20mhz++; } -DBG_871X ("%s STA " MAC_FMT " - 20 MHz HT, " +DBG_871X ("%s STA %pM - 20 MHz HT, " "num of 20MHz HT STAs %d\n" , __func__,MAC_ARG (psta->hwaddr), pmlmepriv->num_sta_ht_20mhz);
@@ -2057,8 +2045,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) pmlmepriv->num_sta_no_ht++; }if (pmlmepriv->htpriv.ht_option == true) { -DBG_871X ("%s STA " MAC_FMT -" - no HT, num of non-HT stations %d\n" , +DBG_871X ("%s STA %pM - no HT, num of non-HT stations %d\n" , __func__,MAC_ARG (psta->hwaddr), pmlmepriv->num_sta_no_ht); }
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -1
@@ -1024,7 +1024,7 @@ u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8 enqueuif (!enqueue) {while ((cam_id =rtw_camid_search (padapter, sta->hwaddr,-1 )) >=0 ) { -DBG_871X_LEVEL (_drv_always_,"clear key for addr:" MAC_FMT ", camid:%d\n" ,MAC_ARG (sta->hwaddr), cam_id); +DBG_871X_LEVEL (_drv_always_,"clear key for addr:%pM, camid:%d\n" ,MAC_ARG (sta->hwaddr), cam_id);clear_cam_entry (padapter, cam_id);rtw_camid_free (padapter, cam_id); }
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +1 -1
@@ -1127,7 +1127,7 @@ void rtw_macaddr_cfg(struct device *dev, u8 *mac_addr) } } -DBG_871X ("rtw_macaddr_cfg MAC Address = " MAC_FMT "\n" ,MAC_ARG (mac_addr)); +DBG_871X ("rtw_macaddr_cfg MAC Address = %pM\n" ,MAC_ARG (mac_addr)); }static int rtw_get_cipher_info (struct wlan_network *pnetwork)
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +2 -2
@@ -189,8 +189,8 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid) goto release_mlme_lock;/* it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again. */ }else {RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("Set BSSID not the same bssid\n" )); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_bssid =" MAC_FMT "\n" ,MAC_ARG (bssid))); -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("cur_bssid =" MAC_FMT "\n" ,MAC_ARG (pmlmepriv->cur_network.network.MacAddress))); +RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_bssid =%pM\n" ,MAC_ARG (bssid))); +RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("cur_bssid =%pM\n" ,MAC_ARG (pmlmepriv->cur_network.network.MacAddress)));rtw_disassoc_cmd (padapter,0 , true);
drivers/staging/rtl8723bs/core/rtw_mlme.c +12 -12
@@ -494,7 +494,7 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,#if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED ) &&1 if (strcmp (dst->Ssid.Ssid,DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED ) ==0 ) { -DBG_871X (FUNC_ADPT_FMT " %s(" MAC_FMT ", ch%u) ss_ori:%3u, sq_ori:%3u, rssi_ori:%3ld, ss_smp:%3u, sq_smp:%3u, rssi_smp:%3ld\n" +DBG_871X (FUNC_ADPT_FMT " %s(%pM, ch%u) ss_ori:%3u, sq_ori:%3u, rssi_ori:%3ld, ss_smp:%3u, sq_smp:%3u, rssi_smp:%3ld\n" ,FUNC_ADPT_ARG (padapter) , src->Ssid.Ssid,MAC_ARG (src->MacAddress), src->Configuration.DSConfig , ss_ori, sq_ori, rssi_ori
@@ -539,7 +539,7 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,#if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED ) &&1 if (strcmp (dst->Ssid.Ssid,DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED ) ==0 ) { -DBG_871X (FUNC_ADPT_FMT " %s(" MAC_FMT "), SignalStrength:%u, SignalQuality:%u, RawRSSI:%ld\n" +DBG_871X (FUNC_ADPT_FMT " %s(%pM), SignalStrength:%u, SignalQuality:%u, RawRSSI:%ld\n" ,FUNC_ADPT_ARG (padapter) , dst->Ssid.Ssid,MAC_ARG (dst->MacAddress), dst->PhyInfo.SignalStrength, dst->PhyInfo.SignalQuality, dst->Rssi); }
@@ -986,7 +986,7 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;RT_TRACE (_module_rtl871x_mlme_c_, _drv_notice_, ("+rtw_free_assoc_resources\n" )); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("tgt_network->network.MacAddress =" MAC_FMT " ssid =%s\n" , +RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("tgt_network->network.MacAddress =%pM ssid =%s\n" ,MAC_ARG (tgt_network->network.MacAddress), tgt_network->network.Ssid.Ssid));if (check_fwstate (pmlmepriv,WIFI_STATION_STATE |WIFI_AP_STATE )) {
@@ -1221,7 +1221,7 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_netDBG_871X ("%s\n" , __func__); -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("\nfw_state:%x, BSSID:" MAC_FMT "\n" +RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("\nfw_state:%x, BSSID:%pM\n" ,get_fwstate (pmlmepriv),MAC_ARG (pnetwork->network.MacAddress)));/* why not use ptarget_wlan?? */
@@ -1578,7 +1578,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)else mac_id = pstadel->mac_id; -DBG_871X ("%s(mac_id =%d) =" MAC_FMT "\n" , __func__, mac_id,MAC_ARG (pstadel->macaddr)); +DBG_871X ("%s(mac_id =%d) =%pM\n" , __func__, mac_id,MAC_ARG (pstadel->macaddr));if (mac_id >=0 ) {u16 media_status;
@@ -1889,7 +1889,7 @@ static int rtw_check_roaming_candidate(struct mlme_priv *mlmeif (rtw_is_desired_network (adapter, competitor) == false) goto exit; - DBG_871X("roam candidate:%s %s("MAC_FMT", ch%3u) rssi:%d, age:%5d\n", + DBG_871X("roam candidate:%s %s(%pM, ch%3u) rssi:%d, age:%5d\n", (competitor == mlme->cur_network_scanned)?"*":" ", competitor->network.Ssid.Ssid, MAC_ARG(competitor->network.MacAddress),
@@ -1951,7 +1951,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme) mlme->pscanned =get_next (mlme->pscanned); -DBG_871X ("%s(" MAC_FMT ", ch%u) rssi:%d\n" +DBG_871X ("%s(%pM, ch%u) rssi:%d\n" , pnetwork->network.Ssid.Ssid ,MAC_ARG (pnetwork->network.MacAddress) , pnetwork->network.Configuration.DSConfig
@@ -1966,7 +1966,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme) ret = _FAIL; goto exit; }else { -DBG_871X ("%s: candidate: %s(" MAC_FMT ", ch:%u)\n" , __func__, +DBG_871X ("%s: candidate: %s(%pM, ch:%u)\n" , __func__, candidate->network.Ssid.Ssid,MAC_ARG (candidate->network.MacAddress), candidate->network.Configuration.DSConfig);
@@ -2026,7 +2026,7 @@ static int rtw_check_join_candidate(struct mlme_priv *mlmeif (updated) { DBG_871X("[by_bssid:%u][assoc_ssid:%s]" "[to_roam:%u] " - "new candidate: %s("MAC_FMT", ch%u) rssi:%d\n", + "new candidate: %s(%pM, ch%u) rssi:%d\n", mlme->assoc_by_bssid, mlme->assoc_ssid.Ssid, rtw_to_roam(adapter),
@@ -2081,7 +2081,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) pmlmepriv->pscanned =get_next (pmlmepriv->pscanned); -DBG_871X ("%s(" MAC_FMT ", ch%u) rssi:%d\n" +DBG_871X ("%s(%pM, ch%u) rssi:%d\n" , pnetwork->network.Ssid.Ssid ,MAC_ARG (pnetwork->network.MacAddress) , pnetwork->network.Configuration.DSConfig
@@ -2099,7 +2099,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) ret = _FAIL; goto exit; }else { -DBG_871X ("%s: candidate: %s(" MAC_FMT ", ch:%u)\n" , __func__, +DBG_871X ("%s: candidate: %s(%pM, ch:%u)\n" , __func__, candidate->network.Ssid.Ssid,MAC_ARG (candidate->network.MacAddress), candidate->network.Configuration.DSConfig); goto candidate_exist;
@@ -2941,7 +2941,7 @@ void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)int do_join_r;if (0 <rtw_to_roam (padapter)) { -DBG_871X ("roaming from %s(" MAC_FMT "), length:%d\n" , +DBG_871X ("roaming from %s(%pM), length:%d\n" , cur_network->network.Ssid.Ssid,MAC_ARG (cur_network->network.MacAddress), cur_network->network.Ssid.SsidLength);memcpy (&pmlmepriv->assoc_ssid, &cur_network->network.Ssid,sizeof (struct ndis_802_11_ssid ));
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +23 -24
181 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_recv.c +11 -11
@@ -893,7 +893,7 @@ sint ap2sta_data_frame(if (!memcmp (myhwaddr, pattrib->src,ETH_ALEN )) {RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, (" SA ==myself\n" ));#ifdef DBG_RX_DROP_FRAME -DBG_871X ("DBG_RX_DROP_FRAME %s SA =" MAC_FMT ", myhwaddr =" MAC_FMT "\n" , +DBG_871X ("DBG_RX_DROP_FRAME %s SA =%pM, myhwaddr =%pM\n" , __func__,MAC_ARG (pattrib->src),MAC_ARG (myhwaddr));#endif ret = _FAIL;
@@ -903,9 +903,9 @@ sint ap2sta_data_frame(/* da should be for me */ if ((memcmp (myhwaddr, pattrib->dst,ETH_ALEN )) && (!bmcast)) {RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, - (" ap2sta_data_frame: compare DA fail; DA =" MAC_FMT "\n" ,MAC_ARG (pattrib->dst))); + (" ap2sta_data_frame: compare DA fail; DA =%pM\n" ,MAC_ARG (pattrib->dst)));#ifdef DBG_RX_DROP_FRAME -DBG_871X ("DBG_RX_DROP_FRAME %s DA =" MAC_FMT "\n" , __func__,MAC_ARG (pattrib->dst)); +DBG_871X ("DBG_RX_DROP_FRAME %s DA =%pM\n" , __func__,MAC_ARG (pattrib->dst));#endif ret = _FAIL; goto exit;
@@ -917,16 +917,16 @@ sint ap2sta_data_frame( !memcmp(mybssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) || (memcmp(pattrib->bssid, mybssid, ETH_ALEN))) {RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, - (" ap2sta_data_frame: compare BSSID fail ; BSSID =" MAC_FMT "\n" ,MAC_ARG (pattrib->bssid))); -RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("mybssid =" MAC_FMT "\n" ,MAC_ARG (mybssid))); + (" ap2sta_data_frame: compare BSSID fail ; BSSID =%pM\n" ,MAC_ARG (pattrib->bssid))); +RT_TRACE (_module_rtl871x_recv_c_, _drv_info_, ("mybssid =%pM\n" ,MAC_ARG (mybssid)));#ifdef DBG_RX_DROP_FRAME -DBG_871X ("DBG_RX_DROP_FRAME %s BSSID =" MAC_FMT ", mybssid =" MAC_FMT "\n" , +DBG_871X ("DBG_RX_DROP_FRAME %s BSSID =%pM, mybssid =%pM\n" , __func__,MAC_ARG (pattrib->bssid),MAC_ARG (mybssid)); DBG_871X("this adapter = %d, buddy adapter = %d\n", adapter->adapter_type, adapter->pbuddystruct adapter->adapter_type);#endif if (!bmcast) { -DBG_871X ("issue_deauth to the nonassociated ap =" MAC_FMT " for the reason(7)\n" ,MAC_ARG (pattrib->bssid)); +DBG_871X ("issue_deauth to the nonassociated ap =%pM for the reason(7)\n" ,MAC_ARG (pattrib->bssid));issue_deauth (adapter, pattrib->bssid,WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA ); }
@@ -998,7 +998,7 @@ sint ap2sta_data_frame(if (jiffies_to_msecs (jiffies - send_issue_deauth_time) >10000 || send_issue_deauth_time ==0 ) { send_issue_deauth_time = jiffies; -DBG_871X ("issue_deauth to the ap =" MAC_FMT " for the reason(7)\n" ,MAC_ARG (pattrib->bssid)); +DBG_871X ("issue_deauth to the ap =%pM for the reason(7)\n" ,MAC_ARG (pattrib->bssid));issue_deauth (adapter, pattrib->bssid,WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA ); }
@@ -1041,7 +1041,7 @@ sint sta2ap_data_frame( *psta =rtw_get_stainfo (pstapriv, pattrib->src);if (!*psta) {RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, ("can't get psta under AP_MODE; drop pkt\n" )); -DBG_871X ("issue_deauth to sta =" MAC_FMT " for the reason(7)\n" ,MAC_ARG (pattrib->src)); +DBG_871X ("issue_deauth to sta =%pM for the reason(7)\n" ,MAC_ARG (pattrib->src));issue_deauth (adapter, pattrib->src,WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA );
@@ -1067,7 +1067,7 @@ sint sta2ap_data_frame( ret =RTW_RX_HANDLED ; goto exit; } -DBG_871X ("issue_deauth to sta =" MAC_FMT " for the reason(7)\n" ,MAC_ARG (pattrib->src)); +DBG_871X ("issue_deauth to sta =%pM for the reason(7)\n" ,MAC_ARG (pattrib->src));issue_deauth (adapter, pattrib->src,WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA ); ret =RTW_RX_HANDLED ; goto exit;
@@ -1653,7 +1653,7 @@ sint wlanhdr_to_ethhdr(union recv_frame *precvframe) rx_pid = *(u16 *)(ptr+rmv_len+2 ); -DBG_871X ("wlan rx(pid = 0x%x): sta(" MAC_FMT ") pid = 0x%x\n" , +DBG_871X ("wlan rx(pid = 0x%x): sta(%pM) pid = 0x%x\n" , rx_pid,MAC_ARG (psta->hwaddr), psta->pid);if (rx_pid == psta->pid) {
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +3 -3
@@ -628,7 +628,7 @@ static s16 _rtw_camid_search(struct adapter *adapter, u8 *addr, s16 kid) }if (addr) -DBG_871X (FUNC_ADPT_FMT " addr:" MAC_FMT " kid:%d, return cam_id:%d\n" +DBG_871X (FUNC_ADPT_FMT " addr:%pM kid:%d, return cam_id:%d\n" ,FUNC_ADPT_ARG (adapter),MAC_ARG (addr), kid, cam_id);else DBG_871X(FUNC_ADPT_FMT" addr:%p kid:%d, return cam_id:%d\n"
@@ -702,7 +702,7 @@ s16 rtw_camid_alloc(struct adapter *adapter, struct sta_info *sta, u8 kid)if (i ==TOTAL_CAM_ENTRY ) {if (sta) -DBG_871X_LEVEL (_drv_always_,FUNC_ADPT_FMT " pairwise key with " MAC_FMT " id:%u no room\n" +DBG_871X_LEVEL (_drv_always_,FUNC_ADPT_FMT " pairwise key with %pM id:%u no room\n" ,FUNC_ADPT_ARG (adapter),MAC_ARG (sta->hwaddr), kid);else DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" group key id:%u no room\n"
@@ -1251,7 +1251,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) }if (memcmp (cur_network->network.MacAddress, pbssid,6 )) { -DBG_871X ("Oops: rtw_check_network_encrypt linked but recv other bssid bcn\n" MAC_FMT MAC_FMT , +DBG_871X ("Oops: rtw_check_network_encrypt linked but recv other bssid bcn %pM %pM\n" ,MAC_ARG (pbssid),MAC_ARG (cur_network->network.MacAddress));return true; }
drivers/staging/rtl8723bs/core/rtw_xmit.c +5 -5
@@ -736,9 +736,9 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attrib psta =rtw_get_stainfo (pstapriv, pattrib->ra);if (!psta) {/* if we cannot get psta => drop the pkt */ DBG_COUNTER (padapter->tx_logs.core_tx_upd_attrib_err_ucast_sta); -RT_TRACE (_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT "\n" ,MAC_ARG (pattrib->ra))); +RT_TRACE (_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:%pM\n" ,MAC_ARG (pattrib->ra)));#ifdef DBG_TX_DROP_FRAME -DBG_871X ("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT "\n" , __func__,MAC_ARG (pattrib->ra)); +DBG_871X ("DBG_TX_DROP_FRAME %s get sta_info fail, ra:%pM\n" , __func__,MAC_ARG (pattrib->ra));#endif res = _FAIL; goto exit;
@@ -752,9 +752,9 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attribif (!psta) {/* if we cannot get psta => drop the pkt */ DBG_COUNTER (padapter->tx_logs.core_tx_upd_attrib_err_sta); -RT_TRACE (_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT "\n" ,MAC_ARG (pattrib->ra))); +RT_TRACE (_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:%pM\n" ,MAC_ARG (pattrib->ra)));#ifdef DBG_TX_DROP_FRAME -DBG_871X ("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT "\n" , __func__,MAC_ARG (pattrib->ra)); +DBG_871X ("DBG_TX_DROP_FRAME %s get sta_info fail, ra:%pM\n" , __func__,MAC_ARG (pattrib->ra));#endif res = _FAIL; goto exit;
@@ -762,7 +762,7 @@ static s32 update_attrib(struct adapter *padapter, _pkt *pkt, struct pkt_attribif (!(psta->state & _FW_LINKED)) {DBG_COUNTER (padapter->tx_logs.core_tx_upd_attrib_err_link); -DBG_871X ("%s, psta(" MAC_FMT ")->state(0x%x) != _FW_LINKED\n" , __func__,MAC_ARG (psta->hwaddr), psta->state); +DBG_871X ("%s, psta(%pM)->state(0x%x) != _FW_LINKED\n" , __func__,MAC_ARG (psta->hwaddr), psta->state);return _FAIL; }
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +2 -2
@@ -415,7 +415,7 @@ static void ConstructARPResponse( {SET_ARP_PKT_TARGET_MAC_ADDR (pARPRspPkt,get_my_bssid (&(pmlmeinfo->network)));SET_ARP_PKT_TARGET_IP_ADDR (pARPRspPkt, pIPAddress); -DBG_871X ("%s Target Mac Addr:" MAC_FMT "\n" , __func__,MAC_ARG (get_my_bssid (&(pmlmeinfo->network)))); +DBG_871X ("%s Target Mac Addr:%pM\n" , __func__,MAC_ARG (get_my_bssid (&(pmlmeinfo->network))));DBG_871X ("%s Target IP Addr" IP_FMT "\n" , __func__,IP_ARG (pIPAddress)); }
@@ -737,7 +737,7 @@ static void ConstructProbeRsp(struct adapter *padapter, u8 *pframe, u32 *pLengthmemcpy (pwlanhdr->addr2, mac,ETH_ALEN );memcpy (pwlanhdr->addr3, bssid,ETH_ALEN ); -DBG_871X ("%s FW Mac Addr:" MAC_FMT "\n" , __func__,MAC_ARG (mac)); +DBG_871X ("%s FW Mac Addr:%pM\n" , __func__,MAC_ARG (mac));DBG_871X ("%s FW IP Addr" IP_FMT "\n" , __func__,IP_ARG (StaAddr));SetSeqNum (pwlanhdr,0 );
drivers/staging/rtl8723bs/include/ieee80211.h +0 -1
@@ -844,7 +844,6 @@ enum ieee80211_state {#define DEFAULT_MAX_SCAN_AGE (15 * HZ)#define DEFAULT_FTS 2346 -#define MAC_FMT "%pM"#define MAC_ARG (x) (x)#define IP_FMT "%pI4"#define IP_ARG (x) (x)
drivers/staging/rtl8723bs/include/osdep_service.h +0 -3
@@ -132,9 +132,6 @@ static inline int rtw_bug_check(void *parg1, void *parg2, void *parg3, void *par#define _RND (sz, r) ((((sz)+((r)-1))/(r))*(r)) -#ifndef MAC_FMT -#define MAC_FMT "%pM" -#endif #ifndef MAC_ARG #define MAC_ARG (x) (x)#endif
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +7 -7
@@ -481,7 +481,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)/* DBG_871X(FUNC_ADPT_FMT" inform success !!\n", FUNC_ADPT_ARG(padapter)); */ } }else { -DBG_871X ("scanned: %s(" MAC_FMT "), cur: %s(" MAC_FMT ")\n" , +DBG_871X ("scanned: %s(%pM), cur: %s(%pM)\n" , scanned->network.Ssid.Ssid,MAC_ARG (scanned->network.MacAddress), pnetwork->Ssid.Ssid,MAC_ARG (pnetwork->MacAddress) );
@@ -1222,7 +1222,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy, }#ifdef DEBUG_CFG80211 -DBG_871X (FUNC_NDEV_FMT " mac =" MAC_FMT "\n" ,FUNC_NDEV_ARG (ndev),MAC_ARG (mac)); +DBG_871X (FUNC_NDEV_FMT " mac =%pM\n" ,FUNC_NDEV_ARG (ndev),MAC_ARG (mac));#endif /* for infra./P2PClient mode */
@@ -1233,7 +1233,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,struct wlan_network *cur_network = &(pmlmepriv->cur_network);if (memcmp ((u8 *)mac, cur_network->network.MacAddress,ETH_ALEN )) { -DBG_871X ("%s, mismatch bssid =" MAC_FMT "\n" , __func__,MAC_ARG (cur_network->network.MacAddress)); +DBG_871X ("%s, mismatch bssid =%pM\n" , __func__,MAC_ARG (cur_network->network.MacAddress)); ret = -ENOENT ; goto exit; }
@@ -2079,7 +2079,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,if (sme->bssid) -DBG_8192C ("bssid =" MAC_FMT "\n" ,MAC_ARG (sme->bssid)); +DBG_8192C ("bssid =%pM\n" ,MAC_ARG (sme->bssid));if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING) == true) {
@@ -2502,7 +2502,7 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struc goto fail; } -DBG_8192C ("RTW_Tx:da =" MAC_FMT " via " FUNC_NDEV_FMT "\n" , +DBG_8192C ("RTW_Tx:da =%pM via " FUNC_NDEV_FMT "\n" ,MAC_ARG (GetAddr1Ptr (buf)),FUNC_NDEV_ARG (ndev));if (category ==RTW_WLAN_CATEGORY_PUBLIC )DBG_871X ("RTW_Tx:%s\n" ,action_public_str (action));
@@ -2838,7 +2838,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev } -DBG_8192C ("free sta macaddr =" MAC_FMT "\n" ,MAC_ARG (mac)); +DBG_8192C ("free sta macaddr =%pM\n" ,MAC_ARG (mac)); if (mac[0] == 0xff && mac[1] == 0xff && mac[2] == 0xff && mac[3] == 0xff &&
@@ -3102,7 +3102,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, goto exit; } -DBG_8192C ("RTW_Tx:tx_ch =%d, da =" MAC_FMT "\n" , tx_ch,MAC_ARG (GetAddr1Ptr (buf))); +DBG_8192C ("RTW_Tx:tx_ch =%d, da =%pM\n" , tx_ch,MAC_ARG (GetAddr1Ptr (buf)));if (category ==RTW_WLAN_CATEGORY_PUBLIC )DBG_871X ("RTW_Tx:%s\n" ,action_public_str (action));else
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +8 -8
@@ -2489,7 +2489,7 @@ static int rtw_get_ap_info(struct net_device *dev,if (!memcmp (bssid, pnetwork->network.MacAddress,ETH_ALEN )) {/* BSSID match, then check if supporting wpa/wpa2 */ -DBG_871X ("BSSID:" MAC_FMT "\n" ,MAC_ARG (bssid)); +DBG_871X ("BSSID:%pM\n" ,MAC_ARG (bssid)); pbuf =rtw_get_wpa_ie (&pnetwork->network.IEs[12 ], &wpa_ielen, pnetwork->network.IELength-12 );if (pbuf && (wpa_ielen >0 )) {
@@ -2799,7 +2799,7 @@ static int rtw_dbg_port(struct net_device *dev,struct recv_reorder_ctrl *preorder_ctrl;DBG_871X ("SSID =%s\n" , cur_network->network.Ssid.Ssid); -DBG_871X ("sta's macaddr:" MAC_FMT "\n" ,MAC_ARG (psta->hwaddr)); +DBG_871X ("sta's macaddr:%pM\n" ,MAC_ARG (psta->hwaddr));DBG_871X ("cur_channel =%d, cur_bwmode =%d, cur_ch_offset =%d\n" , pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset);DBG_871X ("rtsen =%d, cts2slef =%d\n" , psta->rtsen, psta->cts2self);DBG_871X ("state = 0x%x, aid =%d, macid =%d, raid =%d\n" , psta->state, psta->aid, psta->mac_id, psta->raid);
@@ -2815,7 +2815,7 @@ static int rtw_dbg_port(struct net_device *dev, } }else { -DBG_871X ("can't get sta's macaddr, cur_network's macaddr:" MAC_FMT "\n" ,MAC_ARG (cur_network->network.MacAddress)); +DBG_871X ("can't get sta's macaddr, cur_network's macaddr:%pM\n" ,MAC_ARG (cur_network->network.MacAddress)); }break ;case 0x06 :
@@ -2857,7 +2857,7 @@ static int rtw_dbg_port(struct net_device *dev, plist =get_next (plist);if (extra_arg == psta->aid) { -DBG_871X ("sta's macaddr:" MAC_FMT "\n" ,MAC_ARG (psta->hwaddr)); +DBG_871X ("sta's macaddr:%pM\n" ,MAC_ARG (psta->hwaddr));DBG_871X ("rtsen =%d, cts2slef =%d\n" , psta->rtsen, psta->cts2self);DBG_871X ("state = 0x%x, aid =%d, macid =%d, raid =%d\n" , psta->state, psta->aid, psta->mac_id, psta->raid);DBG_871X ("qos_en =%d, ht_en =%d, init_rate =%d\n" , psta->qos_option, psta->htpriv.ht_option, psta->init_rate);
@@ -3745,7 +3745,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);struct sta_priv *pstapriv = &padapter->stapriv; -DBG_871X ("rtw_add_sta(aid =%d) =" MAC_FMT "\n" , param->u.add_sta.aid,MAC_ARG (param->sta_addr)); +DBG_871X ("rtw_add_sta(aid =%d) =%pM\n" , param->u.add_sta.aid,MAC_ARG (param->sta_addr));if (check_fwstate (pmlmepriv, (_FW_LINKED|WIFI_AP_STATE )) != true)return -EINVAL ;
@@ -3820,7 +3820,7 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param)struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);struct sta_priv *pstapriv = &padapter->stapriv; -DBG_871X ("rtw_del_sta =" MAC_FMT "\n" ,MAC_ARG (param->sta_addr)); +DBG_871X ("rtw_del_sta =%pM\n" ,MAC_ARG (param->sta_addr));if (check_fwstate (pmlmepriv, (_FW_LINKED|WIFI_AP_STATE )) != true)return -EINVAL ;
@@ -3871,7 +3871,7 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *parstruct ieee_param_ex *param_ex = (struct ieee_param_ex *)param;struct sta_data *psta_data = (struct sta_data *)param_ex->data; -DBG_871X ("rtw_ioctl_get_sta_info, sta_addr: " MAC_FMT "\n" ,MAC_ARG (param_ex->sta_addr)); +DBG_871X ("rtw_ioctl_get_sta_info, sta_addr: %pM\n" ,MAC_ARG (param_ex->sta_addr));if (check_fwstate (pmlmepriv, (_FW_LINKED|WIFI_AP_STATE )) != true)return -EINVAL ;
@@ -3932,7 +3932,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param)struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);struct sta_priv *pstapriv = &padapter->stapriv; -DBG_871X ("rtw_get_sta_wpaie, sta_addr: " MAC_FMT "\n" ,MAC_ARG (param->sta_addr)); +DBG_871X ("rtw_get_sta_wpaie, sta_addr: %pM\n" ,MAC_ARG (param->sta_addr));if (check_fwstate (pmlmepriv, (_FW_LINKED|WIFI_AP_STATE )) != true)return -EINVAL ;
drivers/staging/rtl8723bs/os_dep/os_intfs.c +4 -4
@@ -864,7 +864,7 @@ static int _rtw_drv_register_netdev(struct adapter *padapter, char *name) goto error_register_netdev; } -DBG_871X ("%s, MAC Address (if%d) = " MAC_FMT "\n" , __func__, (padapter->iface_id +1 ),MAC_ARG (pnetdev->dev_addr)); +DBG_871X ("%s, MAC Address (if%d) = %pM\n" , __func__, (padapter->iface_id +1 ),MAC_ARG (pnetdev->dev_addr));return ret;
@@ -913,7 +913,7 @@ int _netdev_open(struct net_device *pnetdev) goto netdev_open_error; } -DBG_871X ("MAC Address = " MAC_FMT "\n" ,MAC_ARG (pnetdev->dev_addr)); +DBG_871X ("MAC Address = %pM\n" ,MAC_ARG (pnetdev->dev_addr)); status =rtw_start_drv_threads (padapter);if (status == _FAIL) {
@@ -1209,7 +1209,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)if (rtw_chk_roam_flags (padapter,RTW_ROAM_ON_RESUME )) {if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) &&check_fwstate (pmlmepriv, _FW_LINKED)) { - DBG_871X("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n", __func__, + DBG_871X("%s %s(%pM), length:%d assoc_ssid.length:%d\n", __func__, pmlmepriv->cur_network.network.Ssid.Ssid, MAC_ARG(pmlmepriv->cur_network.network.MacAddress), pmlmepriv->cur_network.network.Ssid.SsidLength,
@@ -1284,7 +1284,7 @@ void rtw_suspend_wow(struct adapter *padapter) padapter->HalFunc.SetHwRegHandler (padapter,HW_VAR_WOWLAN , (u8 *)&poidparam);if (rtw_chk_roam_flags (padapter,RTW_ROAM_ON_RESUME )) {if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) &&check_fwstate (pmlmepriv, _FW_LINKED)) { - DBG_871X("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n", __func__, + DBG_871X("%s %s(%pM), length:%d assoc_ssid.length:%d\n", __func__, pmlmepriv->cur_network.network.Ssid.Ssid, MAC_ARG(pmlmepriv->cur_network.network.MacAddress), pmlmepriv->cur_network.network.Ssid.SsidLength,
drivers/staging/rtl8723bs/os_dep/recv_linux.c +1 -1
@@ -220,7 +220,7 @@ static void rtw_os_ksocket_send(struct adapter *padapter, union recv_frame *prec rx_pid = *(u16 *)(skb->data+ETH_HLEN ); -DBG_871X ("eth rx(pid = 0x%x): sta(" MAC_FMT ") pid = 0x%x\n" , +DBG_871X ("eth rx(pid = 0x%x): sta(%pM) pid = 0x%x\n" , rx_pid,MAC_ARG (psta->hwaddr), psta->pid);if (rx_pid == psta->pid) {
Signature · 1 line
2.25.1
PATCH 2/9 staging: rtl8723bs: use %pM format for MAC addresses
Use %pM format instead of custom printing code.
--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +2 -13
@@ -1231,19 +1231,8 @@ static void Hal_EfuseParseMACAddr_8723BS( }/* NicIFSetMacAddress(padapter, padapter->PermanentAddress); */ -RT_TRACE ( - _module_hci_hal_init_c_, - _drv_notice_, - ( -"Hal_EfuseParseMACAddr_8723BS: Permanent Address = %02x-%02x-%02x-%02x-%02x-%02x\n" , - pEEPROM->mac_addr[0 ], - pEEPROM->mac_addr[1 ], - pEEPROM->mac_addr[2 ], - pEEPROM->mac_addr[3 ], - pEEPROM->mac_addr[4 ], - pEEPROM->mac_addr[5 ] - ) - ); +RT_TRACE (_module_hci_hal_init_c_, _drv_notice_, + ("Hal_EfuseParseMACAddr_8723BS: Permanent Address = %pM\n" , pEEPROM->mac_addr)); } static void Hal_EfuseParseBoardType_8723BS(
Signature · 1 line
2.25.1
PATCH 3/9 staging: rtl8723bs: remove IP_FMT macro
In reply to Ross SchmidtRemove unnecessary macro for %pI4 and call it directly.
--- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 4 ++-- drivers/staging/rtl8723bs/include/ieee80211.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +2 -2
@@ -416,7 +416,7 @@ static void ConstructARPResponse(SET_ARP_PKT_TARGET_MAC_ADDR (pARPRspPkt,get_my_bssid (&(pmlmeinfo->network)));SET_ARP_PKT_TARGET_IP_ADDR (pARPRspPkt, pIPAddress);DBG_871X ("%s Target Mac Addr:%pM\n" , __func__,MAC_ARG (get_my_bssid (&(pmlmeinfo->network)))); -DBG_871X ("%s Target IP Addr" IP_FMT "\n" , __func__,IP_ARG (pIPAddress)); +DBG_871X ("%s Target IP Addr:%pI4\n" , __func__,IP_ARG (pIPAddress)); } *pLength +=28 ;
@@ -738,7 +738,7 @@ static void ConstructProbeRsp(struct adapter *padapter, u8 *pframe, u32 *pLengthmemcpy (pwlanhdr->addr3, bssid,ETH_ALEN );DBG_871X ("%s FW Mac Addr:%pM\n" , __func__,MAC_ARG (mac)); -DBG_871X ("%s FW IP Addr" IP_FMT "\n" , __func__,IP_ARG (StaAddr)); +DBG_871X ("%s FW IP Addr:%pI4\n" , __func__,IP_ARG (StaAddr));SetSeqNum (pwlanhdr,0 );SetFrameSubType (fctrl,WIFI_PROBERSP );
drivers/staging/rtl8723bs/include/ieee80211.h +0 -1
@@ -845,7 +845,6 @@ enum ieee80211_state {#define DEFAULT_MAX_SCAN_AGE (15 * HZ)#define DEFAULT_FTS 2346#define MAC_ARG (x) (x) -#define IP_FMT "%pI4"#define IP_ARG (x) (x)static inline int is_multicast_mac_addr (const u8 *addr)
Signature · 1 line
2.25.1
PATCH 4/9 staging: rtl8723bs: remove NDEV_FMT macro
In reply to Ross SchmidtRemove unnecessary macro for %s and call it directly.
--- drivers/staging/rtl8723bs/include/osdep_service_linux.h | 1 - drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
drivers/staging/rtl8723bs/include/osdep_service_linux.h +0 -1
@@ -123,7 +123,6 @@ static inline void rtw_netif_stop_queue(struct net_device *pnetdev)#define rtw_signal_process (pid, sig) kill_pid(find_vpid((pid)), (sig), 1) -#define NDEV_FMT "%s"#define NDEV_ARG (ndev) ndev->name#define ADPT_FMT "%s"#define ADPT_ARG (adapter) adapter->pnetdev->name
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -1
@@ -2574,7 +2574,7 @@ static int rtw_cfg80211_add_monitor_if(struct adapter *padapter, char *name, str }if (pwdev_priv->pmon_ndev) { -DBG_871X (FUNC_ADPT_FMT " monitor interface exist: " NDEV_FMT "\n" , +DBG_871X (FUNC_ADPT_FMT " monitor interface exist: %s\n" ,FUNC_ADPT_ARG (padapter),NDEV_ARG (pwdev_priv->pmon_ndev)); ret = -EBUSY ; goto out;
Signature · 1 line
2.25.1
PATCH 5/9 staging: rtl8723bs: remove ADPT_FMT macro
In reply to Ross SchmidtRemove unnecessary macro for %s and call it directly.
--- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_security.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 6 +++--- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 12 ++++++------ drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 +- .../staging/rtl8723bs/include/osdep_service_linux.h | 1 - 7 files changed, 15 insertions(+), 16 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -1
@@ -503,7 +503,7 @@ int rtw_cmd_thread(void *context) cmd_process_time =jiffies_to_msecs (jiffies - cmd_start_time);if (cmd_process_time >1000 ) { -DBG_871X (ADPT_FMT "cmd= %d process_time= %lu > 1 sec\n" , +DBG_871X ("%s cmd= %d process_time= %lu > 1 sec\n" ,ADPT_ARG (pcmd->padapter), pcmd->cmdcode, cmd_process_time); }
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +2 -2
@@ -5108,7 +5108,7 @@ void report_surveydone_event(struct adapter *padapter) psurveydone_evt = (struct surveydone_event *)(pevtcmd +sizeof (struct C2HEvent_Header )); psurveydone_evt->bss_cnt = pmlmeext->sitesurvey_res.bss_cnt; -DBG_871X ("survey done event(%x) band:%d for " ADPT_FMT "\n" , psurveydone_evt->bss_cnt, padapter->setband,ADPT_ARG (padapter)); +DBG_871X ("survey done event(%x) band:%d for %s\n" , psurveydone_evt->bss_cnt, padapter->setband,ADPT_ARG (padapter));rtw_enqueue_cmd (pcmdpriv, pcmd_obj);
@@ -5585,7 +5585,7 @@ void _linked_info_dump(struct adapter *padapter)if (padapter->bLinkInfoDump) { -DBG_871X ("\n ============[" ADPT_FMT "] linked status check ===================\n" ,ADPT_ARG (padapter)); +DBG_871X ("\n ============[%s] linked status check ===================\n" ,ADPT_ARG (padapter));if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_STATION_STATE ) {rtw_hal_get_def_var (padapter,HAL_DEF_UNDERCORATEDSMOOTHEDPWDB , &UndecoratedSmoothedPWDB);
drivers/staging/rtl8723bs/core/rtw_security.c +2 -2
@@ -2372,12 +2372,12 @@ u8 rtw_handle_tkip_countermeasure(struct adapter *adapter, const char *caller)if (securitypriv->btkip_countermeasure) {unsigned long passing_ms =jiffies_to_msecs (jiffies - securitypriv->btkip_countermeasure_time);if (passing_ms >60 *1000 ) { -DBG_871X_LEVEL (_drv_always_,"%s(" ADPT_FMT ") countermeasure time:%lus > 60s\n" , +DBG_871X_LEVEL (_drv_always_,"%s(%s) countermeasure time:%lus > 60s\n" , caller,ADPT_ARG (adapter), passing_ms/1000 ); securitypriv->btkip_countermeasure = false; securitypriv->btkip_countermeasure_time =0 ; }else { -DBG_871X_LEVEL (_drv_always_,"%s(" ADPT_FMT ") countermeasure time:%lus < 60s\n" , +DBG_871X_LEVEL (_drv_always_,"%s(%s) countermeasure time:%lus < 60s\n" , caller,ADPT_ARG (adapter), passing_ms/1000 ); status = _FAIL; }
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +3 -3
@@ -304,7 +304,7 @@ inline void rtw_set_oper_ch(struct adapter *adapter, u8 ch)for (i =0 ; i < dvobj->iface_nums; i++) {struct adapter *iface = dvobj->padapters[i]; - cnt +=scnprintf (msg+cnt, len-cnt," [" ADPT_FMT ":" ,ADPT_ARG (iface)); + cnt +=scnprintf (msg+cnt, len-cnt," [%s:" ,ADPT_ARG (iface));if (iface->mlmeextpriv.cur_channel == ch) cnt +=scnprintf (msg+cnt, len-cnt,"C" );else
@@ -1431,11 +1431,11 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) pmlmepriv->timeBcnInfoChkStart = jiffies; pmlmepriv->NumOfBcnInfoChkFail++; -DBG_871X ("%s by " ADPT_FMT " - NumOfChkFail = %d (SeqNum of this Beacon frame = %d).\n" , __func__,ADPT_ARG (Adapter), pmlmepriv->NumOfBcnInfoChkFail,GetSequence (pframe)); +DBG_871X ("%s by %s - NumOfChkFail = %d (SeqNum of this Beacon frame = %d).\n" , __func__,ADPT_ARG (Adapter), pmlmepriv->NumOfBcnInfoChkFail,GetSequence (pframe));if ((pmlmepriv->timeBcnInfoChkStart !=0 ) && (jiffies_to_msecs (jiffies - pmlmepriv->timeBcnInfoChkStart) <=DISCONNECT_BY_CHK_BCN_FAIL_OBSERV_PERIOD_IN_MS ) && (pmlmepriv->NumOfBcnInfoChkFail >=DISCONNECT_BY_CHK_BCN_FAIL_THRESHOLD )) { -DBG_871X ("%s by " ADPT_FMT " - NumOfChkFail = %d >= threshold : %d (in %d ms), return FAIL.\n" , __func__,ADPT_ARG (Adapter), pmlmepriv->NumOfBcnInfoChkFail, +DBG_871X ("%s by %s - NumOfChkFail = %d >= threshold : %d (in %d ms), return FAIL.\n" , __func__,ADPT_ARG (Adapter), pmlmepriv->NumOfBcnInfoChkFail,DISCONNECT_BY_CHK_BCN_FAIL_THRESHOLD ,jiffies_to_msecs (jiffies - pmlmepriv->timeBcnInfoChkStart)); pmlmepriv->timeBcnInfoChkStart =0 ; pmlmepriv->NumOfBcnInfoChkFail =0 ;
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +6 -6
@@ -1993,12 +1993,12 @@ void rtl8723b_download_rsvd_page(struct adapter *padapter, u8 mstatus)if (padapter->bSurpriseRemoved || padapter->bDriverStopped) { }else if (!bcn_valid) -DBG_871X (ADPT_FMT ": 1 DL RSVD page failed! DLBcnCount:%u, poll:%u\n" , +DBG_871X ("%s: 1 DL RSVD page failed! DLBcnCount:%u, poll:%u\n" ,ADPT_ARG (padapter), DLBcnCount, poll);else {struct pwrctrl_priv *pwrctl =adapter_to_pwrctl (padapter); pwrctl->fw_psmode_iface_id = padapter->iface_id; -DBG_871X (ADPT_FMT ": 1 DL RSVD page success! DLBcnCount:%u, poll:%u\n" , +DBG_871X ("%s: 1 DL RSVD page success! DLBcnCount:%u, poll:%u\n" ,ADPT_ARG (padapter), DLBcnCount, poll); }
@@ -2290,14 +2290,14 @@ void rtl8723b_download_BTCoex_AP_mode_rsvd_page(struct adapter *padapter)if (bcn_valid) {struct pwrctrl_priv *pwrctl =adapter_to_pwrctl (padapter); pwrctl->fw_psmode_iface_id = padapter->iface_id; -DBG_8192C (ADPT_FMT ": DL RSVD page success! DLBcnCount:%d, poll:%d\n" , +DBG_8192C ("%s: DL RSVD page success! DLBcnCount:%d, poll:%d\n" ,ADPT_ARG (padapter), DLBcnCount, poll); }else { -DBG_8192C (ADPT_FMT ": DL RSVD page fail! DLBcnCount:%d, poll:%d\n" , +DBG_8192C ("%s: DL RSVD page fail! DLBcnCount:%d, poll:%d\n" ,ADPT_ARG (padapter), DLBcnCount, poll); -DBG_8192C (ADPT_FMT ": DL RSVD page fail! bSurpriseRemoved =%d\n" , +DBG_8192C ("%s: DL RSVD page fail! bSurpriseRemoved =%d\n" ,ADPT_ARG (padapter), padapter->bSurpriseRemoved); -DBG_8192C (ADPT_FMT ": DL RSVD page fail! bDriverStopped =%d\n" , +DBG_8192C ("%s: DL RSVD page fail! bDriverStopped =%d\n" ,ADPT_ARG (padapter), padapter->bDriverStopped); }
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +1 -1
@@ -482,7 +482,7 @@ int rtl8723bs_xmit_thread(void *context) padapter = context; pxmitpriv = &padapter->xmitpriv; -rtw_sprintf (thread_name,20 ,"RTWHALXT-" ADPT_FMT ,ADPT_ARG (padapter)); +rtw_sprintf (thread_name,20 ,"RTWHALXT-%s" ,ADPT_ARG (padapter));thread_enter (thread_name);DBG_871X ("start " FUNC_ADPT_FMT "\n" ,FUNC_ADPT_ARG (padapter));
drivers/staging/rtl8723bs/include/osdep_service_linux.h +0 -1
@@ -124,7 +124,6 @@ static inline void rtw_netif_stop_queue(struct net_device *pnetdev)#define rtw_signal_process (pid, sig) kill_pid(find_vpid((pid)), (sig), 1)#define NDEV_ARG (ndev) ndev->name -#define ADPT_FMT "%s"#define ADPT_ARG (adapter) adapter->pnetdev->name#define FUNC_NDEV_FMT "%s(%s)"#define FUNC_NDEV_ARG (ndev) __func__, ndev->name
Signature · 1 line
2.25.1
PATCH 6/9 staging: rtl8723bs: replace rtw_ieee80211_ht_cap
In reply to Ross SchmidtReplace the unique rtw_ieee80211_ht_cap struct with the provided standard ieee80211_ht_cap.
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 6 +++--- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 20 +++++++++---------- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 8 ++++---- .../staging/rtl8723bs/core/rtw_wlan_util.c | 4 ++-- drivers/staging/rtl8723bs/hal/hal_com.c | 2 +- drivers/staging/rtl8723bs/include/ieee80211.h | 4 ++-- drivers/staging/rtl8723bs/include/rtw_ht.h | 2 +- drivers/staging/rtl8723bs/include/wifi.h | 16 --------------- .../staging/rtl8723bs/os_dep/ioctl_linux.c | 10 +++++----- 10 files changed, 29 insertions(+), 45 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +3 -3
@@ -1179,7 +1179,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)if (p && ie_len >0 ) {u8 rf_type =0 ;u8 max_rx_ampdu_factor =0 ; -struct rtw_ieee80211_ht_cap *pht_cap = (struct rtw_ieee80211_ht_cap *)(p +2 ); +struct ieee80211_ht_cap *pht_cap = (struct ieee80211_ht_cap *)(p +2 ); pHT_caps_ie = p;
@@ -1225,8 +1225,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)rtw_hal_get_hwreg (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type));if (rf_type ==RF_1T1R ) { - pht_cap->supp_mcs_set[0 ] =0xff ; - pht_cap->supp_mcs_set[1 ] =0x0 ; + pht_cap->mcs.rx_mask[0 ] =0xff ; + pht_cap->mcs.rx_mask[1 ] =0x0 ; }memcpy (&pmlmepriv->htpriv.ht_cap, p +2 , ie_len);
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +1 -1
@@ -661,7 +661,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) rf_type, ((psta->bw_mode ==CHANNEL_WIDTH_40 )?1 :0 ), short_GI, - psta->htpriv.ht_cap.supp_mcs_set + psta->htpriv.ht_cap.mcs.rx_mask ); }else {while ((pcur_bss->SupportedRates[i] !=0 ) && (pcur_bss->SupportedRates[i] !=0xFF )) {
drivers/staging/rtl8723bs/core/rtw_mlme.c +10 -10
@@ -2582,7 +2582,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_u32 ielen, out_len;enum HT_CAP_AMPDU_FACTOR max_rx_ampdu_factor;unsigned char *p, *pframe; -struct rtw_ieee80211_ht_cap ht_capie; +struct ieee80211_ht_cap ht_capie;u8 cbw40_enable =0 , stbc_rx_enable =0 , rf_type =0 , operation_bw =0 ;struct registry_priv *pregistrypriv = &padapter->registrypriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -2593,7 +2593,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ out_len = *pout_len; -memset (&ht_capie,0 ,sizeof (struct rtw_ieee80211_ht_cap )); +memset (&ht_capie,0 ,sizeof (struct ieee80211_ht_cap )); ht_capie.cap_info =cpu_to_le16 (IEEE80211_HT_CAP_DSSSCCK40 );
@@ -2660,7 +2660,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ }/* fill default supported_mcs_set */ -memcpy (ht_capie.supp_mcs_set, pmlmeext->default_supported_mcs_set,16 ); +memcpy (ht_capie.mcs.rx_mask, pmlmeext->default_supported_mcs_set,16 );/* update default supported_mcs_set */ rtw_hal_get_hwreg (padapter,HW_VAR_RF_TYPE , (u8 *)(&rf_type));
@@ -2670,7 +2670,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_if (stbc_rx_enable) ht_capie.cap_info |=cpu_to_le16 (IEEE80211_HT_CAP_RX_STBC_1R );/* RX STBC One spatial stream */ -set_mcs_rate_by_mask (ht_capie.supp_mcs_set,MCS_RATE_1R ); +set_mcs_rate_by_mask (ht_capie.mcs.rx_mask,MCS_RATE_1R );break ;case RF_2T2R :
@@ -2681,11 +2681,11 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_#ifdef CONFIG_DISABLE_MCS13TO15 if (((cbw40_enable ==1 ) && (operation_bw ==CHANNEL_WIDTH_40 )) && (pregistrypriv->wifi_spec !=1 )) -set_mcs_rate_by_mask (ht_capie.supp_mcs_set,MCS_RATE_2R_13TO15_OFF ); +set_mcs_rate_by_mask (ht_capie.mcs.rx_mask,MCS_RATE_2R_13TO15_OFF );else -set_mcs_rate_by_mask (ht_capie.supp_mcs_set,MCS_RATE_2R ); +set_mcs_rate_by_mask (ht_capie.mcs.rx_mask,MCS_RATE_2R );#else /* CONFIG_DISABLE_MCS13TO15 */ -set_mcs_rate_by_mask (ht_capie.supp_mcs_set,MCS_RATE_2R ); +set_mcs_rate_by_mask (ht_capie.mcs.rx_mask,MCS_RATE_2R );#endif /* CONFIG_DISABLE_MCS13TO15 */ break ; }
@@ -2712,7 +2712,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY &0x00 ); pframe =rtw_set_ie (out_ie+out_len, _HT_CAPABILITY_IE_, -sizeof (struct rtw_ieee80211_ht_cap ), (unsigned char *)&ht_capie, pout_len); +sizeof (struct ieee80211_ht_cap ), (unsigned char *)&ht_capie, pout_len); phtpriv->ht_option = true;
@@ -2734,7 +2734,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channeu8 *p, max_ampdu_sz;int len;/* struct sta_info *bmc_sta, *psta; */ -struct rtw_ieee80211_ht_cap *pht_capie; +struct ieee80211_ht_cap *pht_capie;struct ieee80211_ht_addt_info *pht_addtinfo;/* struct recv_reorder_ctrl *preorder_ctrl; */ struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -2763,7 +2763,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe len =0 ; p =rtw_get_ie (pie+sizeof (struct ndis_802_11_fix_ie ), _HT_CAPABILITY_IE_, &len, ie_len-sizeof (struct ndis_802_11_fix_ie ));if (p && len >0 ) { - pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2 ); + pht_capie = (struct ieee80211_ht_cap *)(p+2 ); max_ampdu_sz = (pht_capie->ampdu_params_info &IEEE80211_HT_CAP_AMPDU_FACTOR ); max_ampdu_sz =1 << (max_ampdu_sz+3 );/* max_ampdu_sz (kbytes); */
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +4 -4
@@ -1494,13 +1494,13 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) }/* save HT capabilities in the sta object */ -memset (&pstat->htpriv.ht_cap,0 ,sizeof (struct rtw_ieee80211_ht_cap )); -if (elems.ht_capabilities && elems.ht_capabilities_len >=sizeof (struct rtw_ieee80211_ht_cap )) { +memset (&pstat->htpriv.ht_cap,0 ,sizeof (struct ieee80211_ht_cap )); +if (elems.ht_capabilities && elems.ht_capabilities_len >=sizeof (struct ieee80211_ht_cap )) { pstat->flags |=WLAN_STA_HT ; pstat->flags |=WLAN_STA_WME ; -memcpy (&pstat->htpriv.ht_cap, elems.ht_capabilities,sizeof (struct rtw_ieee80211_ht_cap )); +memcpy (&pstat->htpriv.ht_cap, elems.ht_capabilities,sizeof (struct ieee80211_ht_cap )); }else pstat->flags &= ~WLAN_STA_HT ;
@@ -5348,7 +5348,7 @@ void update_sta_info(struct adapter *padapter, struct sta_info *psta) psta->htpriv.stbc_cap = pmlmepriv->htpriv.stbc_cap; psta->htpriv.beamform_cap = pmlmepriv->htpriv.beamform_cap; -memcpy (&psta->htpriv.ht_cap, &pmlmeinfo->HT_caps,sizeof (struct rtw_ieee80211_ht_cap )); +memcpy (&psta->htpriv.ht_cap, &pmlmeinfo->HT_caps,sizeof (struct ieee80211_ht_cap )); }else { psta->htpriv.ht_option = false;
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +2 -2
@@ -1233,7 +1233,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)u32 wpa_ielen =0 ;u8 *pbssid =GetAddr3Ptr (pframe);struct HT_info_element *pht_info =NULL ; -struct rtw_ieee80211_ht_cap *pht_cap =NULL ; +struct ieee80211_ht_cap *pht_cap =NULL ;u32 bcn_channel;unsigned short ht_cap_info;unsigned char ht_info_infos_0;
@@ -1282,7 +1282,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)/* parsing HT_CAP_IE */ p =rtw_get_ie (bssid->IEs + _FIXED_IE_LENGTH_, _HT_CAPABILITY_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_);if (p && len >0 ) { - pht_cap = (struct rtw_ieee80211_ht_cap *)(p +2 ); + pht_cap = (struct ieee80211_ht_cap *)(p +2 ); ht_cap_info =le16_to_cpu (pht_cap->cap_info); }else { ht_cap_info =0 ;
drivers/staging/rtl8723bs/hal/hal_com.c +1 -1
@@ -989,7 +989,7 @@ void rtw_hal_update_sta_rate_mask(struct adapter *padapter, struct sta_info *pst limit =8 ;/* 1R */ for (i =0 ; i < limit; i++) { -if (psta->htpriv.ht_cap.supp_mcs_set[i/8 ] &BIT (i%8 )) +if (psta->htpriv.ht_cap.mcs.rx_mask[i/8 ] &BIT (i%8 )) tx_ra_bitmap |=BIT (i+12 ); } }
drivers/staging/rtl8723bs/include/ieee80211.h +2 -2
@@ -232,7 +232,7 @@ struct ieee_param {u16 capability;int flags;u8 tx_supp_rates[16 ]; -struct rtw_ieee80211_ht_cap ht_cap; +struct ieee80211_ht_cap ht_cap; } add_sta;struct {u8 reserved[2 ];/* for set max_num_sta */
@@ -254,7 +254,7 @@ struct sta_data {u32 sta_set;u8 tx_supp_rates[16 ];u32 tx_supp_rates_len; -struct rtw_ieee80211_ht_cap ht_cap; +struct ieee80211_ht_cap ht_cap;u64 rx_pkts;u64 rx_bytes;u64 rx_drops;
drivers/staging/rtl8723bs/include/rtw_ht.h +1 -1
@@ -33,7 +33,7 @@ struct ht_priv {u8 stbc_cap;u8 beamform_cap; -struct rtw_ieee80211_ht_cap ht_cap; +struct ieee80211_ht_cap ht_cap; };
drivers/staging/rtl8723bs/include/wifi.h +0 -16
@@ -657,22 +657,6 @@ struct rtw_ieee80211_bar {__le16 start_seq_num; } __attribute__((packed)); -/** -* struct rtw_ieee80211_ht_cap - HT capabilities -* -* This structure refers to "HT capabilities element" as -* described in 802.11n draft section 7.3.2.52 -*/ - -struct rtw_ieee80211_ht_cap { -__le16 cap_info; -unsigned char ampdu_params_info; -unsigned char supp_mcs_set[16 ]; -__le16 extended_ht_cap_info; -__le16 tx_BF_cap_info; -unsigned char antenna_selection_info; -} __attribute__ ((packed)); -/** * struct rtw_ieee80211_ht_cap - HT additional information *
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +5 -5
@@ -114,10 +114,10 @@ static char *translate_scan(struct adapter *padapter, p =rtw_get_ie (&pnetwork->network.IEs[12 ], _HT_CAPABILITY_IE_, &ht_ielen, pnetwork->network.IELength-12 ); }if (p && ht_ielen >0 ) { -struct rtw_ieee80211_ht_cap *pht_capie; +struct ieee80211_ht_cap *pht_capie; ht_cap = true; - pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2 ); -memcpy (&mcs_rate, pht_capie->supp_mcs_set,2 ); + pht_capie = (struct ieee80211_ht_cap *)(p+2 ); +memcpy (&mcs_rate, pht_capie->mcs.rx_mask,2 ); bw_40MHz = (le16_to_cpu (pht_capie->cap_info) &IEEE80211_HT_CAP_SUP_WIDTH ) ?1 :0 ; short_GI = (le16_to_cpu (pht_capie->cap_info) & (IEEE80211_HT_CAP_SGI_20 |IEEE80211_HT_CAP_SGI_40 )) ?1 :0 ; }
@@ -3793,7 +3793,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)if (WLAN_STA_HT &flags) { psta->htpriv.ht_option = true; psta->qos_option =1 ; -memcpy ((void *)&psta->htpriv.ht_cap, (void *)¶m->u.add_sta.ht_cap,sizeof (struct rtw_ieee80211_ht_cap )); +memcpy ((void *)&psta->htpriv.ht_cap, (void *)¶m->u.add_sta.ht_cap,sizeof (struct ieee80211_ht_cap )); }else { psta->htpriv.ht_option = false; }
@@ -3906,7 +3906,7 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *par psta_data->tx_supp_rates_len = psta->bssratelen;memcpy (psta_data->tx_supp_rates, psta->bssrateset, psta->bssratelen); -memcpy (&psta_data->ht_cap, &psta->htpriv.ht_cap,sizeof (struct rtw_ieee80211_ht_cap )); +memcpy (&psta_data->ht_cap, &psta->htpriv.ht_cap,sizeof (struct ieee80211_ht_cap )); psta_data->rx_pkts = psta->sta_stats.rx_data_pkts; psta_data->rx_bytes = psta->sta_stats.rx_bytes; psta_data->rx_drops = psta->sta_stats.rx_drops;
Signature · 1 line
2.25.1
PATCH 7/9 staging: rtl8723bs: replace rtw_ieee80211_spectrum_mgmt_actioncode
In reply to Ross SchmidtReplace the unique rtw_ieee80211_mgmt_actioncode enum with the provided standard ieee80211_spectrum_mgmt_actioncode.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 10 +++++----- drivers/staging/rtl8723bs/include/ieee80211.h | 10 ---------- 2 files changed, 5 insertions(+), 15 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +5 -5
@@ -1891,11 +1891,11 @@ unsigned int on_action_spct(struct adapter *padapter, union recv_frame *precv_fr action = frame_body[1 ];switch (action) { -case RTW_WLAN_ACTION_SPCT_MSR_REQ : -case RTW_WLAN_ACTION_SPCT_MSR_RPRT : -case RTW_WLAN_ACTION_SPCT_TPC_REQ : -case RTW_WLAN_ACTION_SPCT_TPC_RPRT : -case RTW_WLAN_ACTION_SPCT_CHL_SWITCH : +case WLAN_ACTION_SPCT_MSR_REQ : +case WLAN_ACTION_SPCT_MSR_RPRT : +case WLAN_ACTION_SPCT_TPC_REQ : +case WLAN_ACTION_SPCT_TPC_RPRT : +case WLAN_ACTION_SPCT_CHL_SWITCH :break ;default :break ;
drivers/staging/rtl8723bs/include/ieee80211.h +0 -10
@@ -893,16 +893,6 @@ enum rtw_ieee80211_category { RTW_WLAN_CATEGORY_P2P = 0x7f,/* P2P action frames */ }; -/* SPECTRUM_MGMT action code */ -enum rtw_ieee80211_spectrum_mgmt_actioncode { -RTW_WLAN_ACTION_SPCT_MSR_REQ =0 , -RTW_WLAN_ACTION_SPCT_MSR_RPRT =1 , -RTW_WLAN_ACTION_SPCT_TPC_REQ =2 , -RTW_WLAN_ACTION_SPCT_TPC_RPRT =3 , -RTW_WLAN_ACTION_SPCT_CHL_SWITCH =4 , -RTW_WLAN_ACTION_SPCT_EXT_CHL_SWITCH =5 , -}; -enum _PUBLIC_ACTION {ACT_PUBLIC_BSSCOEXIST =0 ,/* 20/40 BSS Coexistence */ ACT_PUBLIC_DSE_ENABLE =1 ,
Signature · 1 line
2.25.1
PATCH 8/9 staging: rtl8723bs: replace rtw_ieee80211_ht_actioncode
In reply to Ross SchmidtReplace the unique rtw_ieee80211_ht_actioncode enum with the provided standard ieee80211_ht_actioncode.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723bs/include/ieee80211.h | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
@@ -2145,7 +2145,7 @@ unsigned int OnAction_ht(struct adapter *padapter, union recv_frame *precv_frame action = frame_body[1 ];switch (action) { -case RTW_WLAN_ACTION_HT_COMPRESS_BEAMFORMING : +case WLAN_HT_ACTION_COMPRESSED_BF :break ;default :break ;
drivers/staging/rtl8723bs/include/ieee80211.h +0 -12
@@ -920,18 +920,6 @@ enum rtw_ieee80211_back_actioncode { RTW_WLAN_ACTION_DELBA = 2, }; -/* HT features action code */ -enum rtw_ieee80211_ht_actioncode { -RTW_WLAN_ACTION_HT_NOTI_CHNL_WIDTH =0 , -RTW_WLAN_ACTION_HT_SM_PS =1 , -RTW_WLAN_ACTION_HT_PSMP =2 , -RTW_WLAN_ACTION_HT_SET_PCO_PHASE =3 , -RTW_WLAN_ACTION_HT_CSI =4 , -RTW_WLAN_ACTION_HT_NON_COMPRESS_BEAMFORMING =5 , -RTW_WLAN_ACTION_HT_COMPRESS_BEAMFORMING =6 , -RTW_WLAN_ACTION_HT_ASEL_FEEDBACK =7 , -}; -/* BACK (block-ack) parties */ enum rtw_ieee80211_back_parties {RTW_WLAN_BACK_RECIPIENT =0 ,
Signature · 1 line
2.25.1
PATCH 9/9 staging: rtl8723bs: replace ieee80211_back_actioncode
In reply to Ross SchmidtReplace the unique rtw_ieee80211_back_actioncode with the standard provided ieee80211_back_actioncode.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 16 ++++++++-------- drivers/staging/rtl8723bs/include/ieee80211.h | 7 ------- 2 files changed, 8 insertions(+), 15 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +8 -8
@@ -1944,21 +1944,21 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra action = frame_body[1 ];DBG_871X ("%s, action =%d\n" , __func__, action);switch (action) { -case RTW_WLAN_ACTION_ADDBA_REQ :/* ADDBA request */ +case WLAN_ACTION_ADDBA_REQ :/* ADDBA request */ memcpy (&(pmlmeinfo->ADDBA_req), &(frame_body[2 ]),sizeof (struct ADDBA_request ));/* process_addba_req(padapter, (u8 *)&(pmlmeinfo->ADDBA_req), GetAddr3Ptr(pframe)); */ process_addba_req (padapter, (u8 *)&(pmlmeinfo->ADDBA_req), addr);if (pmlmeinfo->accept_addba_req) { -issue_action_BA (padapter, addr,RTW_WLAN_ACTION_ADDBA_RESP ,0 ); +issue_action_BA (padapter, addr,WLAN_ACTION_ADDBA_RESP ,0 ); }else { -issue_action_BA (padapter, addr,RTW_WLAN_ACTION_ADDBA_RESP ,37 );/* reject ADDBA Req */ +issue_action_BA (padapter, addr,WLAN_ACTION_ADDBA_RESP ,37 );/* reject ADDBA Req */ }break ; -case RTW_WLAN_ACTION_ADDBA_RESP :/* ADDBA response */ +case WLAN_ACTION_ADDBA_RESP :/* ADDBA response */ status =get_unaligned_le16 (&frame_body[3 ]); tid = ((frame_body[5 ] >>2 ) &0x7 );
@@ -1981,7 +1981,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra/* DBG_871X("marc: ADDBA RSP: %x\n", pmlmeinfo->agg_enable_bitmap); */ break ; -case RTW_WLAN_ACTION_DELBA :/* DELBA */ +case WLAN_ACTION_DELBA :/* DELBA */ if ((frame_body[3 ] &BIT (3 )) ==0 ) { psta->htpriv.agg_enable_bitmap &= ~BIT ((frame_body[3 ] >>4 ) &0xf );
@@ -4199,7 +4199,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)for (tid =0 ; tid <MAXTID ; tid++) {if (psta->recvreorder_ctrl[tid].enable) {DBG_871X ("rx agg disable tid(%d)\n" , tid); -issue_action_BA (padapter, addr,RTW_WLAN_ACTION_DELBA , (((tid <<1 ) | initiator)&0x1F )); +issue_action_BA (padapter, addr,WLAN_ACTION_DELBA , (((tid <<1 ) | initiator)&0x1F )); psta->recvreorder_ctrl[tid].enable = false; psta->recvreorder_ctrl[tid].indicate_seq =0xffff ;#ifdef DBG_RX_SEQ
@@ -4213,7 +4213,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)for (tid =0 ; tid <MAXTID ; tid++) {if (psta->htpriv.agg_enable_bitmap &BIT (tid)) {DBG_871X ("tx agg disable tid(%d)\n" , tid); -issue_action_BA (padapter, addr,RTW_WLAN_ACTION_DELBA , (((tid <<1 ) | initiator)&0x1F )); +issue_action_BA (padapter, addr,WLAN_ACTION_DELBA , (((tid <<1 ) | initiator)&0x1F )); psta->htpriv.agg_enable_bitmap &= ~BIT (tid); psta->htpriv.candidate_tid_bitmap &= ~BIT (tid);
@@ -6529,7 +6529,7 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf)/* pmlmeinfo->ADDBA_retry_count = 0; */ /* pmlmeinfo->candidate_tid_bitmap |= (0x1 << pparm->tid); */ /* psta->htpriv.candidate_tid_bitmap |= BIT(pparm->tid); */ -issue_action_BA (padapter, pparm->addr,RTW_WLAN_ACTION_ADDBA_REQ , (u16 )pparm->tid); +issue_action_BA (padapter, pparm->addr,WLAN_ACTION_ADDBA_REQ , (u16 )pparm->tid);/* _set_timer(&pmlmeext->ADDBA_timer, ADDBA_TO); */ _set_timer (&psta->addba_retry_timer,ADDBA_TO ); }else {
drivers/staging/rtl8723bs/include/ieee80211.h +0 -7
@@ -913,13 +913,6 @@ enum _PUBLIC_ACTION {ACT_PUBLIC_MAX }; -/* BACK action code */ -enum rtw_ieee80211_back_actioncode { -RTW_WLAN_ACTION_ADDBA_REQ =0 , -RTW_WLAN_ACTION_ADDBA_RESP =1 , -RTW_WLAN_ACTION_DELBA =2 , -}; -/* BACK (block-ack) parties */ enum rtw_ieee80211_back_parties {RTW_WLAN_BACK_RECIPIENT =0 ,
Signature · 1 line
2.25.1