From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 21B67481253 for ; Wed, 15 Jul 2026 12:50:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119839; cv=none; b=koousbcvHYYkrikNU3Juz1gPZrEFbTdqqcKz0L6BeOKu6KX20fz4XhKAWk0lKAZLdXi5nKpc2TSqBXTzaE5fxDBje/uYhYl/ypSOwZNJKOC0ZkysExv2R/2jmRQ/L6cU0o91GUTiiBweS9rZBvYxvH7YorFnGb9LeXK694hmCB4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119839; c=relaxed/simple; bh=yL3MDBeVkAVOB9oDfKbW+0M2Vb7XK/uO0pym0tpxAao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=plJnUgnpu4flnmDXm4WVhKDwW7DPjHeUkg2cxjbuG07RUYzhZqH4h6l6J5fqEigiWV9ywp6gcFk3Bc3r1oForgbEcahvqoYiSp3dFf4DIYyA1HnYa5WOMl/YCz5+lqkf7ev/60ONLWr4xDURovZeFnCFlzKDhF6q/Lhspl8kYsM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hPjpuZJB; arc=none smtp.client-ip=209.85.167.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hPjpuZJB" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-5aea9d606f0so5627441e87.3 for ; Wed, 15 Jul 2026 05:50:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119834; x=1784724634; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=1XiIWCVLfMVYPMIlR/WL0zQsHXtVSv4kGRxUBvVkPwI=; b=hPjpuZJBLl5RNVhAHRURA5F+H30rwWR0mhG0YoZ919QDUnbEKqeaBiU+LX8nC6xPIm JXLX5ORK7easz9gmOoxkgip007wrswWL5v4XBr/Se1e1nzuUUFY47rFAnQrcX81GFA16 EFmtYVsvKHx8fE7Snw10QF8f+kf230D5skGIQIdGrhxfPDIxtux527Ir6zywP7FBmQpX 2Tj9rZn4TcGXuzEcC36Tts6Xv9W4uoKh/CJlxwSmnjKKlQcm3A7xCOR4ij96T3rP1VwY pH3ZYjOivYVhbHPzlYKp4UOq0avgYjpcweZH19GTuHdkaEb2xQ2+9GXoVyfwQqghXZQl WWxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119834; x=1784724634; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=1XiIWCVLfMVYPMIlR/WL0zQsHXtVSv4kGRxUBvVkPwI=; b=D+Nfkpb2Vf8DyU8KJLknXViV6u8FvHxfp4Q65KeHl1LbBn8SWfVjsGL1HVnE/Hx/iS 6K4NtK7FdLjYNnvrHvByZuAu/bNUFXcWgeCKGb8g2qA+36KwJ2Lhv9nZ9iLwBbU2qZ2f 9s/s4q63HiK7rblxh/GQKmLrO1iKaeFwjShES2zxr1iUu80CywUxOGVFkdHSU17TQiQx AkkDgyh04167I5BvmKm9psNHBcd/JtEatK8Q2Z4qD0UxsQ8RrSMGAVTgOnY+EdASxBNN C5lVPbJ40oBRiIuva/IwxG2+WYizZCKZP7Oz/ggYDvn1zPdsg71K7sKrNMiA8FKk5q+b f25w== X-Forwarded-Encrypted: i=1; AHgh+RpOGIZwrKSRxIskq2NK2/mrzqej9X3YmxwI8n1JIq47yqSpdnLXyf8UXvIdsyfoclx21+a7ENhvHE8BXU8=@vger.kernel.org X-Gm-Message-State: AOJu0YyWqWFww2HeAK8f0XEM/kN9adIkgn84Urp/pYFNTvG8VjAnnm5O EfryF+W8AQ1dohE0HSdPaK0dI5W+j5yBaQc2Pzqge+JjwbsUeM4WAk6h X-Gm-Gg: AfdE7cmfjk8Fv1V9UcPyYPS+5Aos43ilL+XhnpZo8v87HgS4xFLR24cft6MElAdyGyX 8uyoiAsuFDkNeeH9jSFHPgQGSbalC/G8s4jgbAGfJnmFWAup2hhIPbmxP6vFSrdrnehvh9FHPWD D7wQYS5p0tBw0evoG+T+LJ3vGRMG5/4ycPHmRBrPtfMrOo5HJrt+m4Qfh2TJhSzBSlGDMq7UmFJ 8lzLJKQE+t4lf9H35KmLwuLo9DaL9IoVRAqGjWbOSiUG72W1EBfO7TefYrlTCPUAGwxR3uMRSWG d10wZqDyrLy/gzjW1RNRkgqRkf9zo0DhQ+y2P+Wo1NLVCZasdOHANztQDb7/GZ9mswiY2NCHtAW eFhCtFs2QQMfyU9ke0aj1hxJt8kOWvYlzBYxpFQxqmKul+1V54t13D3bX7gJE19JjlNpHHGXzgE 12GbvVViafAdlvvRyy49Q8lA9b+lD2kiSLAgHrMeutdsY+xamXMMIoTtZAPmv031Na43OOZfLyV qNnmXPLXBpXgrREJPXvafJ9 X-Received: by 2002:ac2:5689:0:b0:5ae:b9b3:8ba8 with SMTP id 2adb3069b0e04-5b15d7c2ef5mr635991e87.57.1784119833531; Wed, 15 Jul 2026 05:50:33 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:33 -0700 (PDT) From: Arsenii Pashchenko To: Greg Kroah-Hartman Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, ulijg308@gmail.com Subject: [PATCH 23/61] staging: rtl8723bs: remove issue_probereq wrapper and rename helper Date: Wed, 15 Jul 2026 19:47:51 +0700 Message-ID: <20260715124829.90290-24-ulijg308@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260715124829.90290-1-ulijg308@gmail.com> References: <20260715124829.90290-1-ulijg308@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Remove the redundant issue_probereq() wrapper function from rtw_mlme_ext.c, which did nothing but pass fixed default arguments to _issue_probereq(). Simplify the code by renaming the internal _issue_probereq() helper to issue_probereq() and exposing its full signature. Update its only call sites across the driver to pass the required explicit arguments (0, 1, false) directly. This eliminates the useless leading underscore naming convention, reduces unnecessary abstraction layers, and cleans up the MLME extension interface. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 24 ++++++++++--------- .../staging/rtl8723bs/include/rtw_mlme_ext.h | 3 ++- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index 54690c2fc..0c5770f09 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -2357,7 +2357,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p dump_mgntframe(padapter, pmgntframe); } -static int _issue_probereq(struct adapter *padapter, +int issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, u8 ch, bool append_wps, bool wait_ack) { @@ -2450,10 +2450,6 @@ static int _issue_probereq(struct adapter *padapter, return ret; } -inline void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da) -{ - _issue_probereq(padapter, pssid, da, 0, 1, false); -} int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, u8 ch, bool append_wps, int try_cnt, int wait_ms) @@ -2462,7 +2458,7 @@ int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, int i = 0; do { - ret = _issue_probereq(padapter, pssid, da, ch, append_wps, + ret = issue_probereq(padapter, pssid, da, ch, append_wps, wait_ms > 0); i++; @@ -3703,20 +3699,26 @@ void site_survey(struct adapter *padapter) /* IOT issue, When wifi_spec is not set, send one probe req without WPS IE. */ if (padapter->registrypriv.wifi_spec) - issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL); + issue_probereq(padapter, + &pmlmeext->sitesurvey_res.ssid[i], + NULL, 0, 1, false); else - issue_probereq_ex(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL, 0, 0, 0, 0); + issue_probereq_ex(padapter, + &pmlmeext->sitesurvey_res.ssid[i], + NULL, 0, 0, 0, 0); - issue_probereq(padapter, &(pmlmeext->sitesurvey_res.ssid[i]), NULL); + issue_probereq(padapter, + &pmlmeext->sitesurvey_res.ssid[i], + NULL, 0, 1, false); } if (pmlmeext->sitesurvey_res.scan_mode == SCAN_ACTIVE) { /* IOT issue, When wifi_spec is not set, send one probe req without WPS IE. */ if (padapter->registrypriv.wifi_spec) - issue_probereq(padapter, NULL, NULL); + issue_probereq(padapter, NULL, NULL, 0, 1, false); else issue_probereq_ex(padapter, NULL, NULL, 0, 0, 0, 0); - issue_probereq(padapter, NULL, NULL); + issue_probereq(padapter, NULL, NULL, 0, 1, false); } } } diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h index a850675d5..ae4c4586f 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -539,7 +539,8 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p void issue_assocreq(struct adapter *padapter); void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_info *pstat, int pkt_type); void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short status); -void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da); +int issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *pssid, + u8 *da, u8 ch, bool append_wps, bool wait_ack); s32 issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, u8 ch, bool append_wps, int try_cnt, int wait_ms); int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int power_mode, int try_cnt, int wait_ms); s32 issue_nulldata_in_interrupt(struct adapter *padapter, u8 *da); -- 2.55.0