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

staging: r8188eu: remove wait_ms parameter 



Remove the wait_ms parameter from function issue_probereq_ex. There's only
one caller, who requests a waiting time of 1 ms.

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/20221126154253.178275-3-martin@kaiser.cx


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

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+6 −6
Original line number Diff line number Diff line
@@ -4483,20 +4483,20 @@ inline void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps 
}



void issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da,

		       int try_cnt, int wait_ms)

		       int try_cnt)

{

	int ret;

	int i = 0;



	do {

		ret = _issue_probereq(padapter, pssid, da, wait_ms > 0);

		ret = _issue_probereq(padapter, pssid, da, true);



		i++;



		if (i < try_cnt && wait_ms > 0 && ret == _FAIL)

			msleep(wait_ms);

		if (i < try_cnt && ret == _FAIL)

			msleep(1);



	} while ((i < try_cnt) && ((ret == _FAIL) || (wait_ms == 0)));

	} while ((i < try_cnt) && (ret == _FAIL));

}



/*  if psta == NULL, indicate we are station (client) now... */
@@ -7046,7 +7046,7 @@ void linked_status_chk(struct adapter *padapter) 
				}



				if (rx_chk != _SUCCESS)

					issue_probereq_ex(padapter, &pmlmeinfo->network.Ssid, psta->hwaddr, 3, 1);

					issue_probereq_ex(padapter, &pmlmeinfo->network.Ssid, psta->hwaddr, 3);



				if ((tx_chk != _SUCCESS && pmlmeinfo->link_count++ == 0xf) || rx_chk != _SUCCESS) {

					tx_chk = issue_nulldata(padapter, psta->hwaddr, 0, 3, 1);

drivers/staging/r8188eu/include/rtw_mlme_ext.h

+1 −1
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, 
void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid,

		    u8 *da);

void issue_probereq_ex(struct adapter *adapter, struct ndis_802_11_ssid *pssid,

		       u8 *da, int try_cnt, int wait_ms);

		       u8 *da, int try_cnt);

int issue_nulldata(struct adapter *padapter, unsigned char *da,

		   unsigned int power_mode, int try_cnt, int wait_ms);

int issue_qos_nulldata(struct adapter *padapter, unsigned char *da,