From patchwork Thu Feb 1 14:04:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: meir elisha X-Patchwork-Id: 195353 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2719:b0:106:209c:c626 with SMTP id hl25csp189963dyb; Thu, 1 Feb 2024 06:28:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IEescbA+yRoJaNVHvItgmxsB4z+CKCCQtKyG3Q32VjpCNSrOUmGJ74s5BaLevil1tgtp5Jb X-Received: by 2002:a17:90a:c712:b0:296:2a15:5f27 with SMTP id o18-20020a17090ac71200b002962a155f27mr910707pjt.2.1706797686868; Thu, 01 Feb 2024 06:28:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706797686; cv=pass; d=google.com; s=arc-20160816; b=TzzQKCJaCm1uZ/c/jIGhRRqetAstwJiCdvY8MoDwEhDcveWWr+Wbc3h3eN4ApQ7op4 tQBvLERjj9EYTXrm0jxddg2QjamRKfjM6THBW03eSByYKtTWExJEBaqE2RUC6uGLsx5G TynqyDGYa6v/QPDnss3ajoMkPGJVHRs7Pt3dUOx2s++mH46bgAuLtox1vcj2Q6N6sSZd +K8UESuVOKfZ6HI9XK+xPg0yYAEL3271ELsV4X1YxxAj6ELo7Mr7srt5HyeVTD1Gy6rE wv+HZJdUxJa+ZO2//9xQ6f04aN6yt+IZKwuRCJwghTXi4mVX01uxYAJQDYwXEUeP8yxh o5mg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=2WZVZh+TcA52yG10ogW2Ket+Nh8qPqugIsfHxx9AocE=; fh=lP8KsL7w8NqNPIkpEE8FG1XXOj3ZZLqjHV29qLV9iPI=; b=bw4DDe8UMgwRJMp7r+5rkmVcKF5MXT/dJAhNeNbY2alCG5lnsfuSaS/P+rMyuZFBX2 Rhrl7fbZ7jEQwRWvbo73KbtaTDxiOe68SdyVdma/QmMiC+1En0yv13xfFTC5ceOKFEa2 QqLgL9Ee32MjrIRrzMhplxSBIY7jqI5oR6bMxJS9Ks3LTTB8bjsFOsJOm3f8AVoNV2i4 emMPVbw1tQkajOeOK+xBwjUJi+Hkg9RATvvsfcqXynC4QiRDqLDZPQZYYA2Z0pyF/uVt ZkUF33InoqFnFnbJKoTgZrGRyXxfEKKMFPD6PuTz+hlh/2+jr+YFSiXmMMmd4wXVyfqm eA2A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=h4yClKMK; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-48285-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48285-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com X-Forwarded-Encrypted: i=1; AJvYcCWLso4KdUD0CR0iigRu8byulisQjVS/TJh8aW7RqcjqCoVxqwzHJh1NzIIh2S7x0IJAYD8Jzk85i1qC/TTsJuGKjpdG3w== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id x22-20020a17090aca1600b0028cd4e6e480si3714195pjt.22.2024.02.01.06.28.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 06:28:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-48285-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=h4yClKMK; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-48285-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48285-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 9688EB289E3 for ; Thu, 1 Feb 2024 14:05:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 44FB25F465; Thu, 1 Feb 2024 14:05:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="h4yClKMK" Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (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 D5CC45F487 for ; Thu, 1 Feb 2024 14:05:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706796311; cv=none; b=AD+gYGvvlyw6GJTUxYKF/Y2nr0Kr2IP1a63pygQqL/zjvuqxSLqKFfF8IrTCBaQQgXWtoQULq8lPV1gVorR7UxYxELmHBGSmMFgRm2ntSMMKf50fJkFOHh8ROtHYdnxW87a0FU9jHp0T7Cmw5eZaNaWrTEILRnDHMvun1xo1lno= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706796311; c=relaxed/simple; bh=AmgX4dnIIJccXjS/P1Fa4Yt9LuV8HcB1AwdQ1cxH5cY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TQlUkyVoZW/JYmXZ2skKvCGNOtR0XguZ3lNsY85zuIRbZA2sJ/V06ErkUKegkIlk8HGu4fwjkJ1S3BXVu0k9YXyZbaCO/UE2Jb0MnG+RFHoo1A3vjW3xYz372b82xBZR9pFwt0FALzzdq/tI8tqoXInN7JEAAw1uutbE1WvCmCw= 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=h4yClKMK; arc=none smtp.client-ip=209.85.167.48 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 Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-5113186bd61so599913e87.0 for ; Thu, 01 Feb 2024 06:05:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706796308; x=1707401108; 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=2WZVZh+TcA52yG10ogW2Ket+Nh8qPqugIsfHxx9AocE=; b=h4yClKMKfm4mphNXNUKlxA5U9SNT8ntv5DEBy13XNY6fgzoREM557ZTBQwpXIRv8/M 44pQoNNyETPZyQvt6CPMW/dE8XJjeX1W2yRgVgaq68xqTztMs6K7v63jfDFaiDTG0ECE +uohDaUImzTYVCXIV+7fxR2xphlNlOFcVZGIT0x4h5T8ZybkdVsLYKPDSCOgPIvaOI6Y +sbK2nEz4Stuuzutpuyy8XZ4zJXsz0UIN6sSqwQhMI1u2ba1YmX/eU1B2NSagklGEleH XI9nOdOLTmGXRPSPhR/seF9mrfn1n7+J9mfnFt7s2k+j1q84zXINZbmhbIv+eDp1csY+ RfvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706796308; x=1707401108; 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=2WZVZh+TcA52yG10ogW2Ket+Nh8qPqugIsfHxx9AocE=; b=uYIUMJqeDMuOzHhVzeciqdtuHsrPMWtcW1cXuhnfUa0D1QnHgA+vJlVppTLEE0KDWz LJAjPfMzvHf9m7pOWyd6UpQNwHAuDqSBqJHVxX5q9JJNxcsdGe98XMcp5pVyYYoT83Ik EdRDJCxhn5t/UsF6p6jP+MOxCtgs3wIi7K26Pll0Cpw5EL3LIE9pJvfttf5/fX+kJ4LE qoat6+aVkXtBZNxfjtnw+i+Gx6u2Z0PHuca25rgimBUUb11g8xBOEdKgtVUWOQzNiM5M yA3J92E/afZlwTmweonfBT2E2KSRNmmte4PecYD19gK7tC17ftCWwr/6Y2Jn2UpvN89r 8dHQ== X-Gm-Message-State: AOJu0YwvNr/UzNKAr14SAmztz4wZVC358a1CJ/NITTA1/CDMpEQLPebY a4R6r6pmKfIKgP17PiOooOXzU2+N7iNP6RFUhlMWfPWeUntXd79F X-Received: by 2002:a19:ee18:0:b0:511:f41:dff6 with SMTP id g24-20020a19ee18000000b005110f41dff6mr1631947lfb.37.1706796307693; Thu, 01 Feb 2024 06:05:07 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCWLIuEc/KXyagZpnA/pb3oIaHfKtvfYxL6bfR2s6TawoG6O+ynYoHrGEcGVDhp5UA+XvwrWNyZ7oSFjqM6L9+OK6jzGgWxsoiRMFJoMFIIqvK0fIXDzuIb9nbNcC48o9NqPLRztJ/wnb/e0pZFxqOfH0BLRCR3WkmFECkiqktJi+yYRwC+i2pg50la5cCJ5D5HTvMgIdK8qpx9JGE3gs7Z8V1eyUcOG Received: from Ubuntu22.myguest.virtualbox.org ([46.121.140.152]) by smtp.gmail.com with ESMTPSA id i7-20020a05600c290700b0040ecdd672fasm4451195wmd.13.2024.02.01.06.05.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 06:05:07 -0800 (PST) From: Meir Elisha X-Google-Original-From: Meir Elisha Received: by Ubuntu22.myguest.virtualbox.org (sSMTP sendmail emulation); Thu, 01 Feb 2024 16:05:04 +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 v2 1/4] Staging: rtl8723bs: Remove unnecessary braces Date: Thu, 1 Feb 2024 16:04:56 +0200 Message-Id: <20240201140459.438479-2-meir6264@Gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240201140459.438479-1-meir6264@Gmail.com> References: <20240201140459.438479-1-meir6264@Gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789707091538994488 X-GMAIL-MSGID: 1789707091538994488 braces {} are not necessary for single statement blocks Signed-off-by: Meir Elisha --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index b221913733fb..5568215b35bd 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1548,9 +1548,9 @@ void _rtw_join_timeout_handler(struct timer_list *t) int do_join_r; do_join_r = rtw_do_join(adapter); - if (do_join_r != _SUCCESS) { + if (do_join_r != _SUCCESS) continue; - } + break; } else { rtw_indicate_disconnect(adapter); @@ -2432,9 +2432,8 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe return; /* maybe needs check if ap supports rx ampdu. */ - if (!(phtpriv->ampdu_enable) && pregistrypriv->ampdu_enable == 1) { + if (!(phtpriv->ampdu_enable) && pregistrypriv->ampdu_enable == 1) phtpriv->ampdu_enable = true; - } /* check Max Rx A-MPDU Size */ len = 0; From patchwork Thu Feb 1 14:04:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: meir elisha X-Patchwork-Id: 195343 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2719:b0:106:209c:c626 with SMTP id hl25csp177026dyb; Thu, 1 Feb 2024 06:10:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IGOGJyPUhTRIs2S4Gl184eLeSGOzjyGkObFyJ++lzvEQl/4vpETVZ3hubzLAvy6fFdRkeN0 X-Received: by 2002:a92:cdad:0:b0:363:80ff:6dd0 with SMTP id g13-20020a92cdad000000b0036380ff6dd0mr2738281ild.30.1706796601612; Thu, 01 Feb 2024 06:10:01 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706796601; cv=pass; d=google.com; s=arc-20160816; b=QKHXz1k+EWfu4pycxP76gScif/VOXKYtU/2dYSb6EYcfvagBxeNRnpipffW49xcnVO +aycusYqRpcSTGN/+5uYOs0zPl3CbK1hBZnAgM/EYHhNb0/wTV+El2wOPRjFJDYucEsp T46dQ9DYamo12ROBOvbM+MSUQ+FBkYTfV7qcoFyLbFwAOSmiCXVOEQDAyN7UGykNwkJa svewTv6Fx2z3bfxRO4p+u0tJpr82g9cxxcwXaAN8PzXEvrH1Z1xgiiZpNNPf2mE6O2dC n39dzCInaqFomKO2uVm6FGEfFFscTYdHloR0JyiypI8gxlGbsf8ssA9Y5q58/fst9sKB 6WFA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=XgOtegluLN4loNFZ9r7TiOQHnc8n5M4kjeOTEoBqU5s=; fh=M9EOU5B1m8dwL3bYXgoz4VH/piAQul3RWYkmhNHrHh4=; b=NWS2FEqmEUvZ7cD6hUzr0pwVWigjEgFo98tqJsRRNb/QeJ4UqSU32iXOOnwdwMCyl7 6TYaTfjA0LvFjEjbyHHSwT7dAggH7lDBJEiv+c45eboDjbfGgvE3vZLEn+xwaD7pEOii 8Sp7oMFskennZgbGcXeqYvuSV3bQJ3gfLRVchW3Wb0aREim3IcYSCC4y1jgRMSMK4yhm EvuFwdcbdTdRkIyCjrHxwCfG1WOGFafxYT9FdA0L2QyJqeRK4Rm5FVtY/1ShbpS8F2Bc sqHACeYbb8kTqXbNrO06XDw8BGmUeTsyJW2xhHtGkqNYa+3l3pYd4KVoP1nj0ViFeDIq UYlA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=nd6k5Bo4; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-48286-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48286-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com X-Forwarded-Encrypted: i=1; AJvYcCVOdgjirwr3U5wUTvDldBO6Ry2/szPuHtjOVx/bjnIYmhk5e5dBjweQebeCHQXXQjr0v9NDn06bdkcSmc8NFKK0Rlc84A== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id k190-20020a633dc7000000b0058974d3c296si12290045pga.815.2024.02.01.06.10.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 06:10:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-48286-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=nd6k5Bo4; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-48286-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48286-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 9286C29215D for ; Thu, 1 Feb 2024 14:06:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 40C4A5F462; Thu, 1 Feb 2024 14:05:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nd6k5Bo4" Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (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 A6D1862147 for ; Thu, 1 Feb 2024 14:05:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706796315; cv=none; b=jfBPZthznQsXnZVchEuu0tFkZP8zl/k5+xgVCzlu7E9E0ooX1s/ki5z8xuCt5cNqc+rOA4ljUyvoc7DT7tudz19gZwh7XqjTXkqhawO3XFtJpkFEGjFhtQzdUrfo2XBI4EsBIwlSvnUOVI6r4V+VRb8bDQUcTzcYAD/P021HQF0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706796315; c=relaxed/simple; bh=doqVg32v7vIXscJEiFexLeEzcj2vJg0MBtuXG8tbG6E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qqX4LzJjcf+i8LV+uH0+R5rVzESui2mfsEPLsJH8ORjCq7eSfHLlhuQ8QqVKz35tjoKzvUPHXgK9c0am9XUcPGgLaYuLx3xunmrUL9RGNA3Pndr2LrQy0os4gI020J5I94jf2MxB5UqHvgOrELXkGq/HEvGLxf2Vkh2o/fd8t1E= 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=nd6k5Bo4; arc=none smtp.client-ip=209.85.167.52 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 Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-51109060d6aso1334521e87.2 for ; Thu, 01 Feb 2024 06:05:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706796312; x=1707401112; 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=XgOtegluLN4loNFZ9r7TiOQHnc8n5M4kjeOTEoBqU5s=; b=nd6k5Bo4o8KZKQeDXUj0HBNObRsG3z0SPeCDjT/UXYHeSJ/HO38QF1ZowLIszVm9JS b2+mWuCdI+BJYb7ioju9E/XloIfOlCnfPBV0v7WFksf4X0jb8FpkMZtg7HKMvebRwddw idSHDgN5GD7zGgPj4OkYJ6p9KpaPS1eGMFPGWg+XKZI8kSIzLtBnqdZX9KamSx4WH6ey all42A4MlvKmofEsrG1yOVWoLcKZoi/OLqW2njHbfxGVyH3vLS9QeU1+n19nE/nHOnF3 F/CshCIc3+wCVJKQPGhvNBz1GRdn9PSanmLN4rIXewirt+RFcycsu9AbyGnLjRhkHm3m 7YhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706796312; x=1707401112; 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=XgOtegluLN4loNFZ9r7TiOQHnc8n5M4kjeOTEoBqU5s=; b=sxGKWMhMFcgFOtJ+o8MRGhNwQMV0qw3sBlz9E+IgM45T5u2aOxM9QQQFDOIV4JS5fQ JSSR2s5JYvFzalpEyyXDQ4WKa7uE1Jx6n2LQI2oqPuV8twyXGJcgHCXQPwSTWDeHca0G UdfcyOqslyiPz5GrpsQ13A0zP2DNel2Ei33CYIDqpIf305hUHhVN/G2oEar2floIjh2g bNPZFRUp1mKAyPWUD32GHzZZeTrhE4IakPPrEH6c0J7B23jq3bml+alvMx8UCJggh9Py KmsvetDN/r23zqqoadugEWKh7JYRH1qXbRjd4c9Kx3GNzO/yLIXmrinIZiVMf5581Bag uiNA== X-Gm-Message-State: AOJu0YzYCpHrFm4YBU0B5jrvucqFjguUFA45CK/GJZQEdtX+egHVqxCz nDu+/di3z9vCHC1wAfNo17MerqwdHGmThH2smMQ8bBB4R83LV7ee X-Received: by 2002:a05:6512:3b85:b0:511:3130:de30 with SMTP id g5-20020a0565123b8500b005113130de30mr1353871lfv.16.1706796311474; Thu, 01 Feb 2024 06:05:11 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCWHaEXzNaHUnLxzhM+aUgsLCOJSSJs50h7aZGHZKw2L+U6VEgUkiF86W1ctqtpR1dx9a6tFkBQUG3a5avXaVDgvK5LCBzpCCYYtsZP/7whP3TD5i8e40QigOb2NQlw7NSuE1O1jJqSSkwORaz1S9P/UYvZy7f00BlhKcbVxmzAHyDEHrroV5RF4kNwgMTBcsU9EstNzbws6FeDUyPk8RR73fZdtjioL Received: from Ubuntu22.myguest.virtualbox.org ([46.121.140.152]) by smtp.gmail.com with ESMTPSA id 18-20020a05600c025200b0040d4e1393dcsm4567869wmj.20.2024.02.01.06.05.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 06:05:10 -0800 (PST) From: Meir Elisha X-Google-Original-From: Meir Elisha Received: by Ubuntu22.myguest.virtualbox.org (sSMTP sendmail emulation); Thu, 01 Feb 2024 16:05:07 +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 v2 2/4] Staging: rtl8723bs: Remove extra spaces Date: Thu, 1 Feb 2024 16:04:57 +0200 Message-Id: <20240201140459.438479-3-meir6264@Gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240201140459.438479-1-meir6264@Gmail.com> References: <20240201140459.438479-1-meir6264@Gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789705953270402126 X-GMAIL-MSGID: 1789705953270402126 Fix checkpatch warning: please, no space before tabs Signed-off-by: Meir Elisha --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 63 ++++++++++------------- 1 file changed, 26 insertions(+), 37 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 5568215b35bd..44b77c1ba992 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -169,7 +169,6 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwor { unsigned int delta_time; u32 lifetime = SCANQUEUE_LIFETIME; -/* _irqL irqL; */ struct __queue *free_queue = &(pmlmepriv->free_bss_pool); if (!pnetwork) @@ -389,14 +388,10 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea d_cap = le16_to_cpu(tmpd); return (src->ssid.ssid_length == dst->ssid.ssid_length) && - /* (src->configuration.ds_config == dst->configuration.ds_config) && */ - ((!memcmp(src->mac_address, dst->mac_address, ETH_ALEN))) && - ((!memcmp(src->ssid.ssid, dst->ssid.ssid, src->ssid.ssid_length))) && - ((s_cap & WLAN_CAPABILITY_IBSS) == - (d_cap & WLAN_CAPABILITY_IBSS)) && - ((s_cap & WLAN_CAPABILITY_ESS) == - (d_cap & WLAN_CAPABILITY_ESS)); - + ((!memcmp(src->mac_address, dst->mac_address, ETH_ALEN))) && + ((!memcmp(src->ssid.ssid, dst->ssid.ssid, src->ssid.ssid_length))) && + ((s_cap & WLAN_CAPABILITY_IBSS) == (d_cap & WLAN_CAPABILITY_IBSS)) && + ((s_cap & WLAN_CAPABILITY_ESS) == (d_cap & WLAN_CAPABILITY_ESS)); } struct wlan_network *_rtw_find_same_network(struct __queue *scanned_queue, struct wlan_network *network) @@ -627,11 +622,11 @@ void rtw_add_network(struct adapter *adapter, struct wlan_bssid_ex *pnetwork) } /* select the desired network based on the capability of the (i)bss. */ -/* check items: (1) security */ -/* (2) network_type */ -/* (3) WMM */ -/* (4) HT */ -/* (5) others */ +/* check items: (1) security */ +/* (2) network_type */ +/* (3) WMM */ +/* (4) HT */ +/* (5) others */ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwork); int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwork) { @@ -1054,9 +1049,9 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str memset((u8 *)&psta->dot11rxpn, 0, sizeof(union pn48)); } - /* Commented by Albert 2012/07/21 */ - /* When doing the WPS, the wps_ie_len won't equal to 0 */ - /* And the Wi-Fi driver shouldn't allow the data packet to be transmitted. */ + /* Commented by Albert 2012/07/21 */ + /* When doing the WPS, the wps_ie_len won't equal to 0 */ + /* And the Wi-Fi driver shouldn't allow the data packet to be transmitted. */ if (padapter->securitypriv.wps_ie_len != 0) { psta->ieee8021x_blocked = true; padapter->securitypriv.wps_ie_len = 0; @@ -1916,10 +1911,10 @@ signed int rtw_set_auth(struct adapter *adapter, struct security_priv *psecurity signed int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, signed int keyid, u8 set_tx, bool enqueue) { u8 keylen; - struct cmd_obj *pcmd; - struct setkey_parm *psetkeyparm; - struct cmd_priv *pcmdpriv = &(adapter->cmdpriv); - signed int res = _SUCCESS; + struct cmd_obj *pcmd; + struct setkey_parm *psetkeyparm; + struct cmd_priv *pcmdpriv = &(adapter->cmdpriv); + signed int res = _SUCCESS; psetkeyparm = rtw_zmalloc(sizeof(struct setkey_parm)); if (!psetkeyparm) { @@ -2023,9 +2018,8 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_ /* */ /* Search by BSSID, */ /* Return Value: */ -/* -1 :if there is no pre-auth key in the table */ -/* >= 0 :if there is pre-auth key, and return the entry id */ -/* */ +/* -1 :if there is no pre-auth key in the table */ +/* >= 0 :if there is pre-auth key, and return the entry id */ /* */ static int SecIsInPMKIDList(struct adapter *Adapter, u8 *bssid) @@ -2186,8 +2180,7 @@ void rtw_joinbss_reset(struct adapter *padapter) { u8 threshold; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - - struct ht_priv *phtpriv = &pmlmepriv->htpriv; + struct ht_priv *phtpriv = &pmlmepriv->htpriv; /* todo: if you want to do something io/reg/hw setting before join_bss, please add code here */ @@ -2213,11 +2206,11 @@ void rtw_joinbss_reset(struct adapter *padapter) void rtw_ht_use_default_setting(struct adapter *padapter) { - struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct ht_priv *phtpriv = &pmlmepriv->htpriv; + struct mlme_priv *pmlmepriv = &padapter->mlmepriv; + struct ht_priv *phtpriv = &pmlmepriv->htpriv; struct registry_priv *pregistrypriv = &padapter->registrypriv; - bool bHwLDPCSupport = false, bHwSTBCSupport = false; - bool bHwSupportBeamformer = false, bHwSupportBeamformee = false; + bool bHwLDPCSupport = false, bHwSTBCSupport = false; + bool bHwSupportBeamformer = false, bHwSupportBeamformee = false; if (pregistrypriv->wifi_spec) phtpriv->bss_coexist = 1; @@ -2288,7 +2281,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_ u8 cbw40_enable = 0, stbc_rx_enable = 0, operation_bw = 0; struct registry_priv *pregistrypriv = &padapter->registrypriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct ht_priv *phtpriv = &pmlmepriv->htpriv; + struct ht_priv *phtpriv = &pmlmepriv->htpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; phtpriv->ht_option = false; @@ -2413,14 +2406,10 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe { u8 *p, max_ampdu_sz; int len; - /* struct sta_info *bmc_sta, *psta; */ struct ieee80211_ht_cap *pht_capie; - /* struct recv_reorder_ctrl *preorder_ctrl; */ struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct ht_priv *phtpriv = &pmlmepriv->htpriv; - /* struct recv_priv *precvpriv = &padapter->recvpriv; */ + struct ht_priv *phtpriv = &pmlmepriv->htpriv; struct registry_priv *pregistrypriv = &padapter->registrypriv; - /* struct wlan_network *pcur_network = &(pmlmepriv->cur_network);; */ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); u8 cbw40_enable = 0; @@ -2546,7 +2535,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr void rtw_append_exented_cap(struct adapter *padapter, u8 *out_ie, uint *pout_len) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - struct ht_priv *phtpriv = &pmlmepriv->htpriv; + struct ht_priv *phtpriv = &pmlmepriv->htpriv; u8 cap_content[8] = {0}; if (phtpriv->bss_coexist) From patchwork Thu Feb 1 14:04:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: meir elisha X-Patchwork-Id: 195344 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2719:b0:106:209c:c626 with SMTP id hl25csp177212dyb; Thu, 1 Feb 2024 06:10:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IEAc+jOx2ZNHkpFD9fvRG+F5Ph4MRPQCIxmh4qh+TXr+Z8rQcZoijkgfGEv+PpAhzkiq1Sv X-Received: by 2002:a05:6a20:8892:b0:19c:33c4:f813 with SMTP id d18-20020a056a20889200b0019c33c4f813mr4644868pzf.22.1706796614094; Thu, 01 Feb 2024 06:10:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706796614; cv=pass; d=google.com; s=arc-20160816; b=wsbmGrbyOuFOMMa333RKNY4SYqPQ0RmKa/4YBjlfIaQtQppu2whW0okzRp0QMZbIzM IWPIlt4FOpNuTT3xQtKI8+5GE9NlSBqVvbAlHvRZwJFio4HPWuluukumws6Es9UB2+ux +jr3Gdp5kEudnDuw81orMy6b7P+mXyhzrrKqm+e0IZpAykb/rv6yr933a7IUN6sOWi9y aYeAGqL8/wSwtS/27R7Ebzbzq6rj+TjCaoBLZitvCMFmQav+ApEeLrDPZCMCFJhAiQ7f tnyieUGHVLW0TS5+WvR8RZL3BSCcuUdpJnvZbp7LpHd0h/p7YoGx8jiFi5Tkh/YYeSoN vLEw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=3ctDN3byxe4TbH3N9GmMLJ2KHRNsvXbEW2nKhaJo2sU=; fh=VoEE9483XiD0lW3meirRLW1i6rYgHeZcpfu/U1cNiD0=; b=qSn+mmZ1lhZfnmkMCsUdccFLMPyMuiWMnoUXzU+598iqg+C5fUoKs//mN5m35/78T0 f867D2eDsuRdGBBtZbIpdmBCLs/XDICoGXl25++gD1fNyom2mNj84upg3yknXQTD7H/c +yTuD8GVIADmZysyMaIsDRr/xiBKMp3neoIFtZtHmXPqOP9GkPweL4mXmsE+GrUXqWzt tXrMIV4DqMTqSbd4hGcBtfL45kiuT8oxfvQl97XDln4IJ2QZ6fiAnxWIEozKsZrDAFMR Z680Gpg3P1FMrZm5/GBGb2kNli2Iur2i+TGOK21t0hyNb6+uBtzWya4mQZeDxzZEkrlM vHSA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=NA2NhwM3; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-48287-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48287-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com X-Forwarded-Encrypted: i=1; AJvYcCVh+5olVfnaUrLSLeK+zvOyNZIG9A+OtiVFmtkLNHfv2UlfWqc+7CvqetMx8HhHVC2Qkod+pi447a34DrqgtqmElb2lIQ== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id 15-20020a63000f000000b005d8fdbbd5d7si5655605pga.606.2024.02.01.06.10.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 06:10:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-48287-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=NA2NhwM3; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-48287-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48287-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 9E69C29295C for ; Thu, 1 Feb 2024 14:06:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8B6D562173; Thu, 1 Feb 2024 14:05:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NA2NhwM3" Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 A29D45F468 for ; Thu, 1 Feb 2024 14:05:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706796318; cv=none; b=t7cEa4nEY0A+Dk69CAyKk9F8s9D+pc825XFBse9TnNZPil9gozcq3g8sCF43iE+KwzfhyGhjFPVTjitWMhxoQyh+gWnhAY6wOwmlB2HRf44NRrbswtb8gqeOh22HzviOepyD/kYFH4nEY+toWC/+GPmibtM3rtnhbUmHbWLhcIA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706796318; c=relaxed/simple; bh=S7eCi4dmp4U/oslPvMevXeGz/cIPZTfZBrTIN/zvD8A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QgkCE0YOSohR4+DR3BROmUzrIyIF8DSBl11yDptfi4oRnsFPYNtWokHM1tLDLGefoscjGvlByEXkoLX8zDRtTNRgkriekO1yDRr9IB0PqcKaBqbQHto3Gsnpxmxk/1i360PnVZZlbIxdlJbs/XIrZ6TraWhKw9DW4FRStBf+VII= 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=NA2NhwM3; arc=none smtp.client-ip=209.85.128.50 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 Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-40e76626170so8384595e9.2 for ; Thu, 01 Feb 2024 06:05:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706796315; x=1707401115; 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=3ctDN3byxe4TbH3N9GmMLJ2KHRNsvXbEW2nKhaJo2sU=; b=NA2NhwM3HOaN/W+DQHZcl7gdbANmXgYMPrtpK6WNrrXDPrrn5DztS/w7Ff1hOjpRI0 RryvTsbmxMQgF9BnknuBECYuXnzchWme6LzkK+TL3ZxRKyj2SDHlc/TDGuL0p77WR+q2 pf/u5vGDrDuBfP1tbJEhdsWRvY4uvhgS7G6gIV480i1M3OjLW4nVpfn5aPjVW2VqDs3u WSAsklRxG7C8pUrn3R3F00a3cO3u7+iavZvv53i4u83JKGXv/3xS5S40a69FJ3GqK0Fs wAkjybRsfXCxBEeRuvzgWrVnZHjWiW0b+Z1Xv0OVY/JBg15SzCjiXbvrqgkJQfzdTEEr JvDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706796315; x=1707401115; 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=3ctDN3byxe4TbH3N9GmMLJ2KHRNsvXbEW2nKhaJo2sU=; b=a9DPPzgx/NQFBR//2cpu/lHuUjafH1cU5z75f6RhEx5FWwy9+cBqkRqm/RzJwoz7OY vSJqHQZ89GcxVEzXwrA6yLmTDDHKw7/CmiZzbfJRWOqSJv4noRg74SWBkFJLN/NS2cWA FgL97n9d8FsvUOImeIlNG9BTQulQRTO4VTtHsfpJTR9nnqc8e4inZk1HV58MOKXYHKK9 QMb501PTvwaM1KRX2AtuBY3NnaIsE4Pt0WZYlZTvbEAfIy336vUH8qdOn5qWhddjw2Nu A36oLdqLze4ZQe282dDm3vJwwNyr6SLQaw5to42FwOwAf0egf/I+Br8beX/E/kS9hNX9 K7Mw== X-Gm-Message-State: AOJu0YwX0zdkILTySLv6CIgxfjFCCSka0BMwIjX2Z3iYy6vaeU5Coc9X Py+hyRe6iG7MXPIlv2F94+AtQBniflHqQco4NK6qZ/MvBJnX6mnY X-Received: by 2002:a5d:6112:0:b0:339:feca:9428 with SMTP id v18-20020a5d6112000000b00339feca9428mr3439111wrt.40.1706796314749; Thu, 01 Feb 2024 06:05:14 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXMLL8N2G164AOa72Vj3ESqzjabvtFtZPUSYj/K9q8fFq22DPTxYsvCcZA37k4qOxUmRA4ejMyjygzIpq+3pphdijnBaTthWqtnbUXLLS0AGxAU2IkSl6A+XSsTaDkg4RP2gXKixKxA9HCMJYzuNAmWIp100dG1HLjTrDqfz5tsY+714YyUf93TD01rNQFF44AMNr7Tv0u8j6FnwE4B9eO5af4acnTJ Received: from Ubuntu22.myguest.virtualbox.org ([46.121.140.152]) by smtp.gmail.com with ESMTPSA id bt3-20020a056000080300b0033ae6fa7f20sm13467563wrb.65.2024.02.01.06.05.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 06:05:14 -0800 (PST) From: Meir Elisha X-Google-Original-From: Meir Elisha Received: by Ubuntu22.myguest.virtualbox.org (sSMTP sendmail emulation); Thu, 01 Feb 2024 16:05:11 +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 v2 3/4] Staging: rtl8723bs: Fix block comments warning Date: Thu, 1 Feb 2024 16:04:58 +0200 Message-Id: <20240201140459.438479-4-meir6264@Gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240201140459.438479-1-meir6264@Gmail.com> References: <20240201140459.438479-1-meir6264@Gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789705966464738593 X-GMAIL-MSGID: 1789705966464738593 Fix checkpatch warning: Block comments use * on subsequent lines Signed-off-by: Meir Elisha --- drivers/staging/rtl8723bs/core/rtw_mlme.c | 121 +++++++--------------- 1 file changed, 38 insertions(+), 83 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 44b77c1ba992..13bc0ebca247 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -109,32 +109,6 @@ void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) } } -/* -struct wlan_network *_rtw_dequeue_network(struct __queue *queue) -{ - _irqL irqL; - - struct wlan_network *pnetwork; - - spin_lock_bh(&queue->lock); - - if (list_empty(&queue->queue)) - - pnetwork = NULL; - - else - { - pnetwork = container_of(get_next(&queue->queue), struct wlan_network, list); - - list_del_init(&(pnetwork->list)); - } - - spin_unlock_bh(&queue->lock); - - return pnetwork; -} -*/ - struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv) { struct wlan_network *pnetwork; @@ -217,10 +191,9 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network * } /* - return the wlan_network with the matching addr - - Shall be called under atomic context... to avoid possible racing condition... -*/ + * return the wlan_network with the matching addr * + * Shall be called under atomic context... to avoid possible racing condition... + */ struct wlan_network *_rtw_find_network(struct __queue *scanned_queue, u8 *addr) { struct list_head *phead, *plist; @@ -320,15 +293,6 @@ void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) _rtw_free_mlme_priv(pmlmepriv); } -/* -static struct wlan_network *rtw_dequeue_network(struct __queue *queue) -{ - struct wlan_network *pnetwork; - - pnetwork = _rtw_dequeue_network(queue); - return pnetwork; -} -*/ void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork); void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork) @@ -338,10 +302,9 @@ void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnet } /* - return the wlan_network with the matching addr - - Shall be called under atomic context... to avoid possible racing condition... -*/ + * return the wlan_network with the matching addr + * Shall be called under atomic context... to avoid possible racing condition... + */ struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *addr) { struct wlan_network *pnetwork = _rtw_find_network(scanned_queue, addr); @@ -501,8 +464,8 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex } /* -Caller must hold pmlmepriv->lock first. -*/ + * Caller must hold pmlmepriv->lock first. + */ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *target) { struct list_head *plist, *phead; @@ -536,12 +499,11 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t } /* If we didn't find a match, then get a new network slot to initialize - * with this beacon's information */ - /* if (phead == plist) { */ + * with this beacon's information + */ if (!target_find) { if (list_empty(&pmlmepriv->free_bss_pool.queue)) { /* If there are no more slots, expire the oldest */ - /* list_del_init(&oldest->list); */ pnetwork = oldest; if (!pnetwork) goto exit; @@ -880,8 +842,8 @@ static void find_network(struct adapter *adapter) } /* -*rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock -*/ + * rtw_free_assoc_resources: the caller has to lock pmlmepriv->lock + */ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue) { struct mlme_priv *pmlmepriv = &adapter->mlmepriv; @@ -916,8 +878,8 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue) } /* -*rtw_indicate_connect: the caller has to lock pmlmepriv->lock -*/ + * rtw_indicate_connect: the caller has to lock pmlmepriv->lock + */ void rtw_indicate_connect(struct adapter *padapter) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -937,8 +899,8 @@ void rtw_indicate_connect(struct adapter *padapter) } /* -*rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock -*/ + * rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock + */ void rtw_indicate_disconnect(struct adapter *padapter) { struct mlme_priv *pmlmepriv = &padapter->mlmepriv; @@ -1522,9 +1484,9 @@ void rtw_wmm_event_callback(struct adapter *padapter, u8 *pbuf) } /* -* _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss -* @adapter: pointer to struct adapter structure -*/ + * _rtw_join_timeout_handler - Timeout/failure handler for CMD JoinBss + * @adapter: pointer to struct adapter structure + */ void _rtw_join_timeout_handler(struct timer_list *t) { struct adapter *adapter = from_timer(adapter, t, @@ -1566,9 +1528,9 @@ void _rtw_join_timeout_handler(struct timer_list *t) } /* -* rtw_scan_timeout_handler - Timeout/Failure handler for CMD SiteSurvey -* @adapter: pointer to struct adapter structure -*/ + * rtw_scan_timeout_handler - Timeout/Failure handler for CMD SiteSurvey + * @adapter: pointer to struct adapter structure + */ void rtw_scan_timeout_handler(struct timer_list *t) { struct adapter *adapter = from_timer(adapter, t, @@ -1686,10 +1648,10 @@ void rtw_set_scan_deny(struct adapter *adapter, u32 ms) } /* -* Select a new roaming candidate from the original @param candidate and @param competitor -* @return true: candidate is updated -* @return false: candidate is not updated -*/ + * Select a new roaming candidate from the original @param candidate and @param competitor + * @return true: candidate is updated + * @return false: candidate is not updated + */ static int rtw_check_roaming_candidate(struct mlme_priv *mlme , struct wlan_network **candidate, struct wlan_network *competitor) { @@ -1769,12 +1731,13 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme) } /* -* Select a new join candidate from the original @param candidate and @param competitor -* @return true: candidate is updated -* @return false: candidate is not updated -*/ -static int rtw_check_join_candidate(struct mlme_priv *mlme - , struct wlan_network **candidate, struct wlan_network *competitor) + * Select a new join candidate from the original @param candidate and @param competitor + * @return true: candidate is updated + * @return false: candidate is not updated + */ +static int rtw_check_join_candidate(struct mlme_priv *mlme, + struct wlan_network **candidate, + struct wlan_network *competitor) { int updated = false; struct adapter *adapter = container_of(mlme, struct adapter, mlmepriv); @@ -1813,11 +1776,11 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme } /* -Calling context: -The caller of the sub-routine will be in critical section... -The caller must hold the following spinlock -pmlmepriv->lock -*/ + * Calling context: + * The caller of the sub-routine will be in critical section... + * The caller must hold the following spinlock + * pmlmepriv->lock + */ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) { @@ -2084,14 +2047,6 @@ signed int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, u } else if ((authmode == WLAN_EID_VENDOR_SPECIFIC) || (authmode == WLAN_EID_RSN)) { /* copy RSN or SSN */ memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], psecuritypriv->supplicant_ie[1]+2); - /* debug for CONFIG_IEEE80211W - { - int jj; - printk("supplicant_ie_length =%d &&&&&&&&&&&&&&&&&&&\n", psecuritypriv->supplicant_ie[1]+2); - for (jj = 0; jj < psecuritypriv->supplicant_ie[1]+2; jj++) - printk(" %02x ", psecuritypriv->supplicant_ie[jj]); - printk("\n"); - }*/ ielength += psecuritypriv->supplicant_ie[1]+2; rtw_report_sec_ie(adapter, authmode, psecuritypriv->supplicant_ie); } From patchwork Thu Feb 1 14:04:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: meir elisha X-Patchwork-Id: 195345 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2719:b0:106:209c:c626 with SMTP id hl25csp177380dyb; Thu, 1 Feb 2024 06:10:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IGdg3ztshwue6uxutWdj2GJ4fkId2xBoyHUubH8vgERTxEhKyjGwRMybYyG4OOaXRk4DdUp X-Received: by 2002:a05:6a00:2e93:b0:6dd:8767:2fa1 with SMTP id fd19-20020a056a002e9300b006dd87672fa1mr5761688pfb.0.1706796625627; Thu, 01 Feb 2024 06:10:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706796625; cv=pass; d=google.com; s=arc-20160816; b=Nf0GZTUP2Ukxj66M5hqxqv4dZRMqWkvWXi5S7TyDSmie1i/qR1oMFJPh+ZWN/9asjY osEzSkIWM0EJ3m0Wf0hpnU8uAuIA4wbkIUjSDnsdyvcuuv39nQTGMwztp0WdMZ5Ntwj5 KlzjtigOCDb8tQAeicy+Yzhis+nxXUzflM4WpbTUYaSNvk44v5ZQp4U1wzy1gCBVi/z1 Q1ophYbIHAW+8TNoECMrPQycsSO1sURi6Hjmjc3mDsKFwd0drogen7WIVFxWyy9PZljF 9L/VGXQkWoQV1TRf+GVcNHwp526tv/9mCDD602ucAvrNq8J3CwnMZ1/N98HpUMFPKoY9 PbFg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=JdXU5rj7eakY5p27mKvfYSeW9QV6FkZ4NSs0xJtV3vw=; fh=aV3w5Ydz+IagjGZgVD9HzWGC+Dbwtdprhs0VTg7DenI=; b=RD3E6sEM4U7gzOVu7V2dUOCVxWjJ28uCVcLs1x7uT7imEUS3h7+BZjOsXG0XiUqMFd s5QFlBp0dUz/lv9KgLJEDLfXidgvtZaSHkhxJfS5g690delcaJPhOt0ll2z/Gem79bSu 3rmFa+1qjpTtC6x0qS6C94FIDLJbqCdb23PHIX8Q8dhHgats4ZXyHvk6cJL4fu1Mlx7S eHfmzuY/XaI+aRyB5SDkG+hrOHvFYOEv/g4/RnDJKnuy83sjh0auKpbK+2thUYf1C6d7 39TdMAC/jGP1nTuflyGRYc9/AjSTtudjPtb2sgMR4eScguyjt0Bqveh931rmrpvWHVg7 x6Lw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=cU4kvFll; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-48288-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48288-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com X-Forwarded-Encrypted: i=1; AJvYcCUMFgL97NTlACjOQgihV0sywX8kXKyLDRPCZb0XfdT75Z6bAoQ4Q/Tz6wdR+jUU6a16Mh4E6TkdXIIL01GYla9mrZlimg== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id k190-20020a633dc7000000b0058974d3c296si12290045pga.815.2024.02.01.06.10.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 06:10:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-48288-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=cU4kvFll; arc=pass (i=1 spf=pass spfdomain=gmail.com dkim=pass dkdomain=gmail.com dmarc=pass fromdomain=gmail.com); spf=pass (google.com: domain of linux-kernel+bounces-48288-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-48288-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 88FF3292F5E for ; Thu, 1 Feb 2024 14:06:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 36177626AB; Thu, 1 Feb 2024 14:05:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cU4kvFll" Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 024DF62168 for ; Thu, 1 Feb 2024 14:05:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706796322; cv=none; b=GdpHlpxHie+sUx+0pAjWeC1TqEyvbWuJEIH09NIBmurbJsF6AA15PVIoAUIM47kckppp7XhyKUnZwFF9n/uxlomDBcMnTt32BQDux2sGdJRoIFqf+gvxPBSMLIp3swVpsrbEhE3bt9+UtJDVxQHReYrdABU8bGvhnOxcS291nik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706796322; c=relaxed/simple; bh=dUpEwtl6HrWQwmNRsfssIbEHclysv218wLdB+QE1DWA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jk05YjESouB18sDzLjoUY4SXCyC+UKETDjqHjT2sYZD4wb1AqZk0jum5EnGZ8zz+aKIuq2Jju5eO79/kYqfPEmr/vEDtRLFYWVQ3qW3sIz4979V9NcR7jQ/HlajA443HNn2yJ4iD3FsWmbu4fFmVt+Bg5oqsxewYC0mjj453H+A= 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=cU4kvFll; arc=none smtp.client-ip=209.85.128.48 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 Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-40fc2a6f8b6so1927905e9.2 for ; Thu, 01 Feb 2024 06:05:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706796318; x=1707401118; 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=JdXU5rj7eakY5p27mKvfYSeW9QV6FkZ4NSs0xJtV3vw=; b=cU4kvFllJeNSQHkFTb/uosGoV06aqDnHpdE1rQqEfmGb5AR8apLwsNarzMQhXOoa2g aWK6qLeAQszkf0MlZy0LKOT0wC7tqcrZ35c1bfde1ftJLZmikLuQgqmczI5YX37gmDp6 SSykZidl62EP9zaigmJ/LUzayrntmu9vuCUaiOKPQ2P2AsLdTjzmehLKc3EampI8xKAY qzA5wbr/sDiSZjrLRo54Ch+NSDVphKcwwVGiUkj1PssMN+/EcZ9iTu65Qn4LPHgr688a P2Z010IMc669K1qVJ15869969Opw+2uZUyhbR79/bA5/oGimgkRapWnLaQEfRFlkvyDL xK/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706796318; x=1707401118; 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=JdXU5rj7eakY5p27mKvfYSeW9QV6FkZ4NSs0xJtV3vw=; b=lvH54APqK5OVL72a5BRdXBUInuUKE7rzm5pp+25q+2xil15Zj3HP38lnowEZe4Xg5a Xfx3H88ensNnKR5DbCwRuGstWUqL5VLIWK7cU4dtTPJLHd73dUsMw7HxyKXTOcExx/OV QAPxIkQO7WceAd/FqHnVh0wgfqBneharfluQBlPhY+khG0/2T95MMpxmR9ijfbULPER0 AL3HYzmSS9bYjA7mu7HZGPE8556RxPAfSh0k20L7pGI8twzbSxtxSR7eeR13Ip9P0kvl Qxrbh7QaAXdOURtwyL0FfyPEM5TpG90siLAOTCaCmv8vp7gp6F0PeA0lYdEWFdwUiriW hVqQ== X-Gm-Message-State: AOJu0Yy+vp3hnK2DiQ9NXUsICVWNyuu1Qoim0b8vImrIEQhL454uzzOy E6coP1yk6Si3JSZ+NrlkIUlR+AQM/D46Yh5rsbjyDtBdqP253466 X-Received: by 2002:a5d:548d:0:b0:33b:1bb9:af19 with SMTP id h13-20020a5d548d000000b0033b1bb9af19mr104050wrv.54.1706796318130; Thu, 01 Feb 2024 06:05:18 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCUzk7AUvEJhqoe8POG+VzWLqYmptGvNd08BPjkPQ1kmC8OFA9WF9m1GHxCGXGlIBVWAqGx17N/Fd1KJzwdO2T+vJgu+spml0jKpInVNXFRlL9zpSLqAdiHbP7Yx59I3NMA8kBtzWXxqfrIO+kw53JWVXH5JywfjfCy8x4luRyad1jhX8ynqFvvEoOQV6Xhve7i6kZ/mxhNySsZqiMgrUVxys67LWO0I Received: from Ubuntu22.myguest.virtualbox.org ([46.121.140.152]) by smtp.gmail.com with ESMTPSA id ci10-20020a5d5d8a000000b00339281d98c9sm16522227wrb.72.2024.02.01.06.05.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 06:05:17 -0800 (PST) From: Meir Elisha X-Google-Original-From: Meir Elisha Received: by Ubuntu22.myguest.virtualbox.org (sSMTP sendmail emulation); Thu, 01 Feb 2024 16:05:14 +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 v2 4/4] Staging: rtl8723bs: fix else after break warning Date: Thu, 1 Feb 2024 16:04:59 +0200 Message-Id: <20240201140459.438479-5-meir6264@Gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240201140459.438479-1-meir6264@Gmail.com> References: <20240201140459.438479-1-meir6264@Gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789705978783417690 X-GMAIL-MSGID: 1789705978783417690 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 | 40 +++++++++-------------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 13bc0ebca247..6a9b57fd1a97 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1498,30 +1498,25 @@ 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) { + 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 { /* join timeout caused by roaming */ 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); @@ -2052,12 +2047,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; }