mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-08 12:52:40 -04:00
staging: r8188eu: remove RT_TRACE calls from core/rtw_mlme_ext.c
Remove RT_TRACE macro calls from core/rtw_mlme_ext.c, so that ultimately the macro definition itself can eventually be removed. Signed-off-by: Phillip Potter <phil@philpotter.co.uk> Link: https://lore.kernel.org/r/20210806004034.82233-5-phil@philpotter.co.uk Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
2965d4b44b
commit
a0adc4cc74
@@ -418,14 +418,8 @@ void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame)
|
||||
u8 *pframe = precv_frame->rx_data;
|
||||
struct sta_info *psta = rtw_get_stainfo(&padapter->stapriv, GetAddr2Ptr(pframe));
|
||||
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
|
||||
("+mgt_dispatcher: type(0x%x) subtype(0x%x)\n",
|
||||
GetFrameType(pframe), GetFrameSubType(pframe)));
|
||||
|
||||
if (GetFrameType(pframe) != WIFI_MGT_TYPE) {
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("mgt_dispatcher: type(0x%x) error!\n", GetFrameType(pframe)));
|
||||
if (GetFrameType(pframe) != WIFI_MGT_TYPE)
|
||||
return;
|
||||
}
|
||||
|
||||
/* receive the frames that ra(a1) is my address or ra(a1) is bc address. */
|
||||
if (memcmp(GetAddr1Ptr(pframe), myid(&padapter->eeprompriv), ETH_ALEN) &&
|
||||
@@ -436,10 +430,8 @@ void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame)
|
||||
|
||||
index = GetFrameSubType(pframe) >> 4;
|
||||
|
||||
if (index > 13) {
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("Currently we do not support reserved sub-fr-type=%d\n", index));
|
||||
if (index > 13)
|
||||
return;
|
||||
}
|
||||
ptable += index;
|
||||
|
||||
if (psta) {
|
||||
@@ -3743,8 +3735,6 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack)
|
||||
|
||||
pattrib->last_txcmdsz = pattrib->pktlen;
|
||||
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("issuing probe_req, tx_len=%d\n", pattrib->last_txcmdsz));
|
||||
|
||||
if (wait_ack) {
|
||||
ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe);
|
||||
} else {
|
||||
@@ -4816,8 +4806,6 @@ static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps
|
||||
int bssrate_len = 0;
|
||||
u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
|
||||
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+issue_probereq\n"));
|
||||
|
||||
pmgntframe = alloc_mgtxmitframe(pxmitpriv);
|
||||
if (!pmgntframe)
|
||||
goto exit;
|
||||
@@ -4878,9 +4866,6 @@ static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps
|
||||
|
||||
pattrib->last_txcmdsz = pattrib->pktlen;
|
||||
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,
|
||||
("issuing probe_req, tx_len=%d\n", pattrib->last_txcmdsz));
|
||||
|
||||
if (wait_ack) {
|
||||
ret = dump_mgntframe_and_wait_ack(padapter, pmgntframe);
|
||||
} else {
|
||||
@@ -6644,8 +6629,6 @@ void start_create_ibss(struct adapter *padapter)
|
||||
|
||||
/* issue beacon */
|
||||
if (send_beacon(padapter) == _FAIL) {
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("issuing beacon frame fail....\n"));
|
||||
|
||||
report_join_res(padapter, -1);
|
||||
pmlmeinfo->state = WIFI_FW_NULL_STATE;
|
||||
} else {
|
||||
@@ -6822,8 +6805,6 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
|
||||
memset(country, 0, 4);
|
||||
memcpy(country, p, 3);
|
||||
p += 3;
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,
|
||||
("%s: 802.11d country =%s\n", __func__, country));
|
||||
|
||||
i = 0;
|
||||
while ((ie - p) >= 3) {
|
||||
@@ -6929,12 +6910,8 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
|
||||
i = 0;
|
||||
while ((i < MAX_CHANNEL_NUM) && (chplan_new[i].ChannelNum != 0)) {
|
||||
if (chplan_new[i].ChannelNum == channel) {
|
||||
if (chplan_new[i].ScanType == SCAN_PASSIVE) {
|
||||
if (chplan_new[i].ScanType == SCAN_PASSIVE)
|
||||
chplan_new[i].ScanType = SCAN_ACTIVE;
|
||||
RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,
|
||||
("%s: change channel %d scan type from passive to active\n",
|
||||
__func__, channel));
|
||||
}
|
||||
break;
|
||||
}
|
||||
i++;
|
||||
@@ -8199,19 +8176,13 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)
|
||||
evt_code = (u8)((*peventbuf>>16)&0xff);
|
||||
|
||||
/* checking if event code is valid */
|
||||
if (evt_code >= MAX_C2HEVT) {
|
||||
RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_, ("\nEvent Code(%d) mismatch!\n", evt_code));
|
||||
if (evt_code >= MAX_C2HEVT)
|
||||
goto _abort_event_;
|
||||
}
|
||||
|
||||
/* checking if event size match the event parm size */
|
||||
if ((wlanevents[evt_code].parmsize != 0) &&
|
||||
(wlanevents[evt_code].parmsize != evt_sz)) {
|
||||
RT_TRACE(_module_rtl871x_cmd_c_, _drv_err_,
|
||||
("\nEvent(%d) Parm Size mismatch (%d vs %d)!\n",
|
||||
evt_code, wlanevents[evt_code].parmsize, evt_sz));
|
||||
(wlanevents[evt_code].parmsize != evt_sz))
|
||||
goto _abort_event_;
|
||||
}
|
||||
|
||||
atomic_inc(&pevt_priv->event_seq);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user