From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 C3C393B27D8 for ; Thu, 19 Mar 2026 23:14:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773962094; cv=none; b=qpcVrgv41wNx6gM2U9aZe9x8p4Tm3jLfUXX1YEGbsctlV3exoltZue+W6c4mGEPmbhHHNbqxW38LPz6mzuYxBu19npqt0UGlWxjUpgIm5uYL9KSXyoZXjiobhY+aSeuLdeAaeWMv2HHjHrtnzz6DA4NxCH/0Ygvsyc8bcf+VaZA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773962094; c=relaxed/simple; bh=Kp6IjVEjLlGy5WnhPLWjptcEFf75RF/kLuFwJWXqN0I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UOiOyJiRt2xOmuknoRGXD6ZWu643VA4Ig8ErLC1ccTXe5jWRt3nuXQ6CSStgFuLDoQykXXb8JgCl8JOI3YrGwaj3PFDxBGC2iKSEaEHONtg+XP08b0jfg7OYQyIeR0IJQkQWShDjl5E9sPCIN7Bmecs4bIbDXE0rUNcQMJ65B8w= 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=JRacegUu; arc=none smtp.client-ip=209.85.221.47 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="JRacegUu" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-439cd6b0aedso901106f8f.1 for ; Thu, 19 Mar 2026 16:14:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773962091; x=1774566891; 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; bh=ZNAofQ8GE4fNXYlR3XYlXGO3JPt3QB1r0SX77vSZvNI=; b=JRacegUuw2mbisfb+DrLNX4d6CRGm6KSO5jXv95VFs6lTeC/7ObtZPqx1twm2HaABu qsU84Wyhw8ELh4PsdoPUF5qdYL5qKTyFAESBGw1qe54/WpvtoBS3KhnZ6d2SkPIslCJb tFPqzV6fRUsrjcvWJVmB0wpjWtPe9zZtETKmQU6Ce1s8q9/ya0kZqHXvvdteCZL0L3VO JMEqzbNJjOCBshQ4aCCDWwxTzPChXk2/mWNQiKFiQv8cwhayYCL7li5OqjWrXiQPtUsX 5QPBNDZZLwaaP28/KN+/bFliC2BPM3dbKccXwhMM6kku1CDpMq9qnTjRykqIvyCd48u1 zt+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773962091; x=1774566891; 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; bh=ZNAofQ8GE4fNXYlR3XYlXGO3JPt3QB1r0SX77vSZvNI=; b=JIBlrZ7jlOj7t9rOQgi0vgsfkRyW/TzLxvFAhtGpTEc67bd+z0ZMmqe5lLPFRmuEjU Fj3t3v6BdZ2x8qQvEwyoXJkl1eQvfpOuHoOzTJ45ivj7JeQ+sihYGjwYGouysKDI6+dP P7p8Eeme5HGGwRkakqobdMkium2TwxINEu3Od+lxDOs5tD4Fhyk74IxanZ0g663//wpP pjWmEsEKEHP6QXXGrayUjhpo3ums6dq7fvXLZf/fSD9hWvhUIv2gtYXgLJCcnmCVgKqu 9YDk+e/3FQGUZCJyn2FxTQThd6TNHRAbowK3wz+wxl6C8MmBd0VHyFVweWHqzWR17z0q /JEg== X-Forwarded-Encrypted: i=1; AJvYcCVKznVKLdHotimuQ/M6wYbvZCyv2h9H1qckdMaQmxF581QWoS2HqA9XoKBR3d7WpR5xxI1w8S1EeyJ19cQ=@vger.kernel.org X-Gm-Message-State: AOJu0Ywai3VRn8MB3MxIJAHiL23ED1VAElMuVRW6kIKvjE8/3db/g9az sTKxSXgQuqhkv6/t7xpuVQ9cNOFbzQ8oS8ACe1n87Ah2m2WRPS9qjZAx X-Gm-Gg: ATEYQzw6KCRnfDdCc861PX6rEpsno8IArMefwPkYtgCDGaQu53zMliwnPUOYOVFYtFE GJzGkPPlxLFat2dutmI+SkaPNpWk8U2FvBejawl0pCeuFPQzIdKYce+5+HBvtXWQMJdpn2BkUhn Zky8MCQnkXksP8A1NRoBtS1vMVH/AjtsEWjUfFTgRi+GfZRFs8TEFnW6LOavpaoXZ0quiCYe7Et +yvAR03Qjxfg/4a8es8JSAgR7XEbqCd2yLXTkt+/Sp7tAthICMYUc5qa4zaH2qqCo8l8pRXHQt+ goG/zfsrQY5HHIa5S6ZbWGpNHi7BrHHDF6WchNd6FFIZZoJnf3n8oBkQhb8e6sqhTGFpGMciuui 5BviobKHj4N1TFNAebNvnZW44Wy21lFzL+qmhIqcE0gCD9VxgIlz1MLPH3X1bKzccDIcxGlcckK zMFr9Du16Zbf4DrqFHNPVg0NclIUz3sUfFr87v93+i35j7UA== X-Received: by 2002:a05:6000:2508:b0:439:c2ce:1226 with SMTP id ffacd0b85a97d-43b642755f3mr1791689f8f.33.1773962090961; Thu, 19 Mar 2026 16:14:50 -0700 (PDT) Received: from localhost.localdomain ([2a00:f41:1c48:8ce3:7093:e9ff:fede:440c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b64703c35sm1983888f8f.22.2026.03.19.16.14.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 16:14:50 -0700 (PDT) From: "Jose A. Perez de Azpillaga" To: linux-staging@lists.linux.dev Cc: Greg Kroah-Hartman , Michael Straube , Hans de Goede , Khushal Chitturi , Dan Carpenter , Vivek BalachandharTN , Ethan Tidmore , Luka Gejak , Artur Stupa , Zhuoheng Li , Nino Zhang , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] staging: rtl8723bs: remove dead REJOIN code Date: Fri, 20 Mar 2026 00:13:34 +0100 Message-ID: <20260319231344.569418-2-azpijr@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260319231344.569418-1-azpijr@gmail.com> References: <20260319231344.569418-1-azpijr@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 The REJOIN macro is not defined anywhere in the kernel tree. Remove this dead code to simplify the function. Signed-off-by: Jose A. Perez de Azpillaga --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 26 ++--------------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 2adc98c955fd..805427353aa6 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1153,7 +1153,6 @@ void rtw_reset_securitypriv(struct adapter *adapter) /* if join_res > 0, for (fw_state ==WIFI_ADHOC_STATE), we only check if "ptarget_wlan" exist. */ /* if join_res > 0, update "cur_network->network" from "pnetwork->network" if (ptarget_wlan != NULL). */ /* */ -/* define REJOIN */ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) { static u8 __maybe_unused retry; @@ -1250,29 +1249,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); } else {/* if join_res < 0 (join fails), then try again */ - - #ifdef REJOIN - res = _FAIL; - if (retry < 2) - res = rtw_select_and_join_from_scanned_queue(pmlmepriv); - - if (res == _SUCCESS) { - /* extend time of assoc_timer */ - _set_timer(&pmlmepriv->assoc_timer, MAX_JOIN_TIMEOUT); - retry++; - } else if (res == 2) {/* there is no need to wait for join */ - _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); - rtw_indicate_connect(adapter); - } else { - #endif - - _set_timer(&pmlmepriv->assoc_timer, 1); - _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); - - #ifdef REJOIN - retry = 0; - } - #endif + _set_timer(&pmlmepriv->assoc_timer, 1); + _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); } ignore_joinbss_callback: -- 2.53.0