Commit 3d086236 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove unused da parameter 



All callers of issue_probereq_p2p set the da parameter to NULL. Remove
this parameters and the code that runs only for da != NULL.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20221202092525.403887-3-martin@kaiser.cx


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3f48ad1f

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+12 −16
Original line number Diff line number Diff line
@@ -3183,7 +3183,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) 
	dump_mgntframe(padapter, pmgntframe);

}



inline void issue_probereq_p2p(struct adapter *padapter, u8 *da)

inline void issue_probereq_p2p(struct adapter *padapter)

{

	struct xmit_frame		*pmgntframe;

	struct pkt_attrib		*pattrib;
@@ -3216,10 +3216,6 @@ inline void issue_probereq_p2p(struct adapter *padapter, u8 *da) 
	fctrl = &pwlanhdr->frame_control;

	*(fctrl) = 0;



	if (da) {

		memcpy(pwlanhdr->addr1, da, ETH_ALEN);

		memcpy(pwlanhdr->addr3, da, ETH_ALEN);

	} else {

	if ((pwdinfo->p2p_info.scan_op_ch_only) || (pwdinfo->rx_invitereq_info.scan_op_ch_only)) {

		/*	This two flags will be set when this is only the P2P client mode. */

		memcpy(pwlanhdr->addr1, pwdinfo->p2p_peer_interface_addr, ETH_ALEN);
@@ -3229,7 +3225,7 @@ inline void issue_probereq_p2p(struct adapter *padapter, u8 *da) 
		eth_broadcast_addr(pwlanhdr->addr1);

		eth_broadcast_addr(pwlanhdr->addr3);

	}

	}



	memcpy(pwlanhdr->addr2, mac, ETH_ALEN);



	SetSeqNum(pwlanhdr, pmlmeext->mgnt_seq);
@@ -5867,9 +5863,9 @@ void site_survey(struct adapter *padapter) 
		if (ScanType == SCAN_ACTIVE) { /* obey the channel plan setting... */

			if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_SCAN) ||

			    rtw_p2p_chk_state(pwdinfo, P2P_STATE_FIND_PHASE_SEARCH)) {

				issue_probereq_p2p(padapter, NULL);

				issue_probereq_p2p(padapter, NULL);

				issue_probereq_p2p(padapter, NULL);

				issue_probereq_p2p(padapter);

				issue_probereq_p2p(padapter);

				issue_probereq_p2p(padapter);

			} else {

				int i;

				for (i = 0; i < RTW_SSID_SCAN_AMOUNT; i++) {

drivers/staging/r8188eu/core/rtw_p2p.c

+4 −4
Original line number Diff line number Diff line
@@ -1453,7 +1453,7 @@ static void pre_tx_invitereq_handler(struct adapter *padapter) 


	set_channel_bwmode(padapter, pwdinfo->invitereq_info.peer_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);

	rtw_mlme_under_site_survey(padapter);

	issue_probereq_p2p(padapter, NULL);

	issue_probereq_p2p(padapter);

	_set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT);



}
@@ -1464,7 +1464,7 @@ static void pre_tx_provdisc_handler(struct adapter *padapter) 


	set_channel_bwmode(padapter, pwdinfo->tx_prov_disc_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);

	rtw_mlme_under_site_survey(padapter);

	issue_probereq_p2p(padapter, NULL);

	issue_probereq_p2p(padapter);

	_set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT);



}
@@ -1475,7 +1475,7 @@ static void pre_tx_negoreq_handler(struct adapter *padapter) 


	set_channel_bwmode(padapter, pwdinfo->nego_req_info.peer_channel_num[0], HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20);

	rtw_mlme_under_site_survey(padapter);

	issue_probereq_p2p(padapter, NULL);

	issue_probereq_p2p(padapter);

	_set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT);



}
@@ -1725,7 +1725,7 @@ static void pre_tx_scan_timer_process(struct timer_list *t) 
	if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_PROVISION_DIS_REQ)) {

		if (pwdinfo->tx_prov_disc_info.benable) {	/*	the provision discovery request frame is trigger to send or not */

			p2p_protocol_wk_cmd(adapter, P2P_PRE_TX_PROVDISC_PROCESS_WK);

			/* issue_probereq_p2p(adapter, NULL); */

			/* issue_probereq_p2p(adapter); */

			/* _set_timer(&pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT); */

		}

	} else if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING)) {

drivers/staging/r8188eu/include/rtw_mlme_ext.h

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da); 
void issue_p2p_provision_request(struct adapter *padapter, u8 *pssid,

				 u8 ussidlen, u8 *pdev_raddr);

void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr);

void issue_probereq_p2p(struct adapter *padapter, u8 *da);

void issue_probereq_p2p(struct adapter *padapter);

void issue_p2p_invitation_response(struct adapter *padapter, u8 *raddr,

				   u8 dialogToken, u8 success);

void issue_p2p_invitation_request(struct adapter *padapter, u8 *raddr);