]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
staging: r8188eu: remove wait_ms parameter
authorMartin Kaiser <martin@kaiser.cx>
Sat, 26 Nov 2022 15:42:50 +0000 (16:42 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 5 Dec 2022 12:26:13 +0000 (13:26 +0100)
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: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20221126154253.178275-3-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_mlme_ext.c
drivers/staging/r8188eu/include/rtw_mlme_ext.h

index 2f3f7da08d0c7afa521b50e5a2179a0fb18d7bc1..990336244030de6f149eeb98e8f906b1fdbf40e0 100644 (file)
@@ -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);
index 720610bc8fefc423de96b489cfb2002fecc87ba7..04fd673d3a04cd3c74e65493b38a6d475f2151ea 100644 (file)
@@ -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,