From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 863EB67721 for ; Mon, 29 Jan 2024 14:19:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537959; cv=none; b=nxEBc766CToc56Uwm9VA/SCWCGbihP4dK7kGtp029mz4akFguSqTRTQQHMXQlG1T8c2bwafx40Us9g7KGUObDp2SXgyibz0Bw2on9pS8KESfCcnPzG4u8s/vasVXyOCJ9buLXQnH+jNhRQHspGsbq3RB0ddsW5u9CMAFWNKKuc8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706537959; c=relaxed/simple; bh=7O6rXoPUceZ5vSfUZs1f50iG4DBaw4PqXEIh8pA+98A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=UK3CimCyPSKnqlQjAnBQstP2lbLdZAVowEnlbaAb5LYwpuV+oDo+OBk0TMEjfHsa2W7/WJDXkqJ07oDx54G1TfkZQlLXnvZNU7m8qGQDKZ5Fy+7LVgFKptNo/7ziBvSK5pCd9NSpJI2Gmpp7c1rm3xef+jF5380huPLkm63dVhI= 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=Hj7ujIpq; arc=none smtp.client-ip=209.85.128.54 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="Hj7ujIpq" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-40ef3f351d2so6716615e9.1 for ; Mon, 29 Jan 2024 06:19:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706537956; x=1707142756; darn=lists.linux.dev; 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=y9moHDVvU6z3kwiFZUQJD1fH1NG2dZetKlW8LuOaa3I=; b=Hj7ujIpqPuklaf1nd2evhwzUzRdEzZ1R3p3fDuZXkMGfDsx5QxWyfsI7CelmDx2gf+ gC9/Fdul7Qg4FnUCnXAz8+exiuE6wO/ZbtHlKaFD40EySrtqJyiOuanH5Y2uwDpvF83h Hct53Mu1cVqj6rJIEbZCpHA/Cb1caEuk4LWtyePqABjcbIAyMwsslSFiouQrm6q3XhWt WOqRBhLMbE8t/VYOvvpZ3kNtPTUTmPgc1FQOG87aLp3HVy9/LnZGVVCxQ1hOpZ1EBlQg ucGAJXNm4giYPaJMECL+EJ+gTZB4SkcY6OfaR5Z+JrZpxXtr61NmFE5JPUZYBHCDg5/w TFdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706537956; x=1707142756; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y9moHDVvU6z3kwiFZUQJD1fH1NG2dZetKlW8LuOaa3I=; b=ssU5TxHN3l5kX8YBksykazSQKT65l8hY1DkTTVjtWtZIvKPjfeZ8jQBu+NowGNAmtx okcCtWyxagF43IQQ8/Js8bteHZ6+em3wYV/VQnU1tjMF0y+JGOqH3MDnQAktanqMmE5y 13cQpijyE8+d4hZc2uMWal5mjpVbITZka3rcvTcfvDs3N9omAPj5m2JGKAANjmId33I1 ed5k7UBzAB77UQRI+Lp32l4WgaFGGuKY6snM9ekbho5EhNlBAThkaManWrBUYcqhfdZ0 zHMS3fNUs79mQpLuJIXlIuM8fiE/xUsV4VKvxufez+MEmn/q5eBhnBEcb/i+kUe3xgvY NrlA== X-Gm-Message-State: AOJu0YzirclgAoXkufyis2qvXMkqsHo/czgjq0shbAAxhCulExcfjUol OINyS6Y1FU5XdUKmWsc1tGfPtsfHz8XCHjDqyHz8YyUimMQgynNDjKJ3A3kJaOZrcg== X-Google-Smtp-Source: AGHT+IHm6388xm/QTCaGEDK1ImPfBbY9GsIXBQvs2+ki3e6r2DjTGCcPGaDAPpKFu3QXHl8Kc/TsKg== X-Received: by 2002:a05:600c:3b9d:b0:40d:858c:53f6 with SMTP id n29-20020a05600c3b9d00b0040d858c53f6mr5412782wms.2.1706537955755; Mon, 29 Jan 2024 06:19:15 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXdm4wUtSp6rYEMPJ0lKaNsh61o/2lREf5Zq7rC+VWl+F4650XLgIVf07vKJ21/vvbM1453su4X/Q0Qqu3K9HBqHvEh+9g7fXt9yMQHTJFuy9I94ig3FgC47isLk+sRLWAmgRD0i7Yyg+sMzWvtuG1W0v5IbcvaIEnlNz+wqes2FLaQrF+qYdJ1i3SKq5GLjwSMsOE2VcS9PzR4yTGFhJhpv/rH7IkD Received: from Ubuntu22.myguest.virtualbox.org ([46.121.140.152]) by smtp.gmail.com with ESMTPSA id e21-20020a05600c4e5500b0040efb8118e9sm1200186wmq.38.2024.01.29.06.19.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 06:19:15 -0800 (PST) From: Meir Elisha X-Google-Original-From: Meir Elisha Received: by Ubuntu22.myguest.virtualbox.org (sSMTP sendmail emulation); Mon, 29 Jan 2024 16:19:12 +0200 To: Greg Kroah-Hartman , Hans de Goede , Ruan Jinjie , Yang Yingliang Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Meir Elisha Subject: [PATCH 4/4] Staging: rtl8723bs: fix else after break warning Date: Mon, 29 Jan 2024 16:18:56 +0200 Message-Id: <20240129141856.416532-5-meir6264@Gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240129141856.416532-1-meir6264@Gmail.com> References: <20240129141856.416532-1-meir6264@Gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Fix checkpatch warning: else is not generally useful after a break or return Signed-off-by: Meir Elisha --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 38 +++++++++-------------- 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 044483f3d678..efaac84f22b4 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1540,30 +1540,23 @@ void _rtw_join_timeout_handler(struct timer_list *t) spin_lock_bh(&pmlmepriv->lock); - if (rtw_to_roam(adapter) > 0) { /* join timeout caused by roaming */ + if (rtw_to_roam(adapter) == 0) { /* join timeout caused by roaming */ + rtw_indicate_disconnect(adapter); + free_scanqueue(pmlmepriv); + /* indicate disconnect for the case that join_timeout and check_fwstate != FW_LINKED */ + rtw_cfg80211_indicate_disconnect(adapter); + } else { while (1) { rtw_dec_to_roam(adapter); - if (rtw_to_roam(adapter) != 0) { /* try another */ - int do_join_r; - - do_join_r = rtw_do_join(adapter); - if (do_join_r != _SUCCESS) - continue; - - break; - } else { + if (rtw_to_roam(adapter) == 0) { rtw_indicate_disconnect(adapter); break; + } else if (rtw_do_join(adapter) != _SUCCESS) { /* try another */ + continue; } - } - - } else { - rtw_indicate_disconnect(adapter); - free_scanqueue(pmlmepriv);/* */ - - /* indicate disconnect for the case that join_timeout and check_fwstate != FW_LINKED */ - rtw_cfg80211_indicate_disconnect(adapter); + break; + } } spin_unlock_bh(&pmlmepriv->lock); @@ -2102,12 +2095,9 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u } iEntry = SecIsInPMKIDList(adapter, pmlmepriv->assoc_bssid); - if (iEntry < 0) { - return ielength; - } else { - if (authmode == WLAN_EID_RSN) - ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength); - } + if (iEntry > 0 && authmode == WLAN_EID_RSN) + ielength = rtw_append_pmkid(adapter, iEntry, out_ie, ielength); + return ielength; } -- 2.34.1