From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) (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 C41F4480DF0 for ; Wed, 15 Jul 2026 12:50:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119837; cv=none; b=EUTmtUPasxsSZVN+XWWtqwz2IXsdwR3GAiZsP2bInr9vRibmjbKXNmX17v7imjXuRNNdnW43moI54dD+YlvYZs3KV84sFgqwC2CFsRt/Tk5Uihx5NcsActR0LI0Iwdbvraj5/yYrCi73oQqHB0e2ppupn9WrB7Ki0oSwvyobsfg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784119837; c=relaxed/simple; bh=im5v7plYnVL19o33g8lyvm2Jq97CV75vKcPw6PmxTKc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ezFvwkjZYmzETrFE3Rs0AtjQDiVozMP9rMIue8omLvsuppAiga7ZDKonfsdhRCxyrJl6LDZFd+P3q19QU1avNvDAUXgrAdbQcZZw76ESqZfrjst/MuAQx1pO8dddqSyUZ4I2tOKYMgDsGeuGrmtn3jE3nfFMnsGcdV4GzxUBIX8= 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=OYxUV06Y; arc=none smtp.client-ip=209.85.167.41 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="OYxUV06Y" Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-5aeba09900bso1548252e87.2 for ; Wed, 15 Jul 2026 05:50:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784119833; x=1784724633; 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=N3xnvEidNAcLGJBtkHvj3DBY0GwTLkUJo2iIVQ5ynqM=; b=OYxUV06YZC6oLGFjLgzHfzDcjE+blhuad1L4C4iAUgKsS33ve8I5LdE+j0clJtbjHQ xKdd33bqlm2SXaQ9kPNQdlxREGefttIcN7i5kWRFTMOGfV/sbEpLSp9RYolDMCXQ/yUW HUKScz0xw8f+HP968DGF3HwQqQId012L+5uRx/bmWcXef2pufNLzfEn7+tR92nSuZNf2 f6LaWlvzTgOonlC+w1ArcvEacJCSqlecxHJqcJjQntlW6gmvQseCPYexLm2NRUX9rFnj nkFgTun4/vjeyqn1u638rJrp+1r04kBqT6quiyvVUP7KKQH30lNHPMOzjOJS6YutABJb x7Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784119833; x=1784724633; 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=N3xnvEidNAcLGJBtkHvj3DBY0GwTLkUJo2iIVQ5ynqM=; b=Spc5ykpOLTV22FtyyXvhVCSELQP1bTMyjxHOfICn05Io6MQ5CLlWYsFhPH+7C+dfZl NlqqkkSr2VTutymOd9F5m7W0X6tcpDXPXMKspM6cTxktKVFd/mWLzvQjYS1Uk0YWGcq1 oc+cl8artRafekt4/y1xZ191wtRsL2b3mvKdBt1/cA80ttw3XE5HNt+oGv2sDYEp0UpI ZKInJY1Rh1J+0lL4LeGiMeKCepBlUiTRob33CDtos/S/Qjch9ddgjUAHy7hiFPmopnhV KoWrtT2w5HW7ofT55WbhHfhKgItdGuPvQoOnOmrtOQ9uVHp0zavlmUqESeG4zL9Z38xN X3Kg== X-Forwarded-Encrypted: i=1; AHgh+RpFgEyHMIJla2jcRh3WF22Dx4IpPHCMz4mvS72UvNWf0YdnmeTjUmY5XOqhKKkpnJJCFxc9bNF+FyxwgL0=@vger.kernel.org X-Gm-Message-State: AOJu0YzC1xBe0JS49e6lu1HnNKOJwV68UQkkHZGk7osUSu0ul63kJatv LXMQeB3EXcvfQeQQZX1geyFGIwJf8364mjaB97tYj2Vi7Y0qI013DPbR X-Gm-Gg: AfdE7cnpxbTm7fiM1j8ixrhLeJV/mS+o8SHH5l2xBXz6fCbSBGTP+6T96cQxm18Axvf x6VOMsTER+nVTC4sfW/3jGM0zz1GVYjHW4uFmicPi3hRkPLoaWmTMYGmPMPSxf6Q4aPQm+fEWIB 9fTDHZ3O31gSLQe2Fv0ob0YvlG9IjxriTkIsiw3i2Rh5Dk5rGski4aXWHzzzp0JkAwYNEoyFHv2 iukflvqTp7js3VjCCtqJkGhDgvZs53Ziu8PydvbQR/HDyF4FuQdXL7PogTlIacQ/B+OSJS7eVjo 0rCZYMspCFnOmXwx5BAFzneOOQa0cNMNhvfCtTCihmhIsBiOv/tgJS2kEbo2zL+VUyIe30tgfW0 RHV9cN+4/Rz8IFHV4OflP+v8VUn6J7ag9cH5DTD6uqr5Fq7SeDdvbdJWztNzVuGL+E0+S6Cdifx tTn1N7pGjxTr3+A34/cvG32ONtQCfnt+NV/sdtmuup08/JngYUtK19he6vp/YE/l2x5LFRardDj L7AluLZU5LZ8w== X-Received: by 2002:a05:6512:3509:b0:5b0:197b:9811 with SMTP id 2adb3069b0e04-5b0236b6f58mr4393191e87.53.1784119832671; Wed, 15 Jul 2026 05:50:32 -0700 (PDT) Received: from archlinux ([94.180.44.28]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b022fac999sm3404042e87.55.2026.07.15.05.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2026 05:50:32 -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 22/61] staging: rtl8723bs: inline single-use init_mlme_default_rate_set Date: Wed, 15 Jul 2026 19:47:50 +0700 Message-ID: <20260715124829.90290-23-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 init_mlme_default_rate_set() helper function since it has only a single call site across the driver. Inline its rate configuration arrays and memcpy operations directly into the initialization routine where it was used. This simplifies the MLME initialization path and reduces code clutter. Clean up the function definition from its source file and remove its prototype from the corresponding header file. Signed-off-by: Arsenii Pashchenko --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 34 +++++++++++-------- .../staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index 064c9923d..54690c2fc 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -184,19 +184,6 @@ void init_hw_mlme_ext(struct adapter *padapter) pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); } -void init_mlme_default_rate_set(struct adapter *padapter) -{ - struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; - - unsigned char mixed_datarate[NumRates] = {_1M_RATE_, _2M_RATE_, _5M_RATE_, _11M_RATE_, _6M_RATE_, _9M_RATE_, _12M_RATE_, _18M_RATE_, _24M_RATE_, _36M_RATE_, _48M_RATE_, _54M_RATE_, 0xff}; - unsigned char mixed_basicrate[NumRates] = {_1M_RATE_, _2M_RATE_, _5M_RATE_, _11M_RATE_, _6M_RATE_, _12M_RATE_, _24M_RATE_, 0xff,}; - unsigned char supported_mcs_set[16] = {0xff, 0xff, 0x00, 0x00, 0x01, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; - - memcpy(pmlmeext->datarate, mixed_datarate, NumRates); - memcpy(pmlmeext->basicrate, mixed_basicrate, NumRates); - - memcpy(pmlmeext->default_supported_mcs_set, supported_mcs_set, sizeof(pmlmeext->default_supported_mcs_set)); -} static void init_mlme_ext_priv_value(struct adapter *padapter) { @@ -216,7 +203,26 @@ static void init_mlme_ext_priv_value(struct adapter *padapter) pmlmeext->cur_wireless_mode = padapter->registrypriv.wireless_mode; - init_mlme_default_rate_set(padapter); + + u8 mixed_datarate[NumRates] = { + _1M_RATE_, _2M_RATE_, _5M_RATE_, _11M_RATE_, _6M_RATE_, + _9M_RATE_, _12M_RATE_, _18M_RATE_, _24M_RATE_, _36M_RATE_, + _48M_RATE_, _54M_RATE_, 0xff + }; + u8 mixed_basicrate[NumRates] = { + _1M_RATE_, _2M_RATE_, _5M_RATE_, _11M_RATE_, _6M_RATE_, + _12M_RATE_, _24M_RATE_, 0xff + }; + u8 supported_mcs_set[16] = { + 0xff, 0xff, 0x00, 0x0, 0x01, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 + }; + + memcpy(pmlmeext->datarate, mixed_datarate, NumRates); + memcpy(pmlmeext->basicrate, mixed_basicrate, NumRates); + + memcpy(pmlmeext->default_supported_mcs_set, supported_mcs_set, + sizeof(pmlmeext->default_supported_mcs_set)); pmlmeext->tx_rate = IEEE80211_CCK_RATE_1MB; pmlmeext->sitesurvey_res.state = SCAN_DISABLE; diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h index e949f5efd..a850675d5 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme_ext.h @@ -418,7 +418,6 @@ struct mlme_ext_priv { u8 active_keep_alive_check; }; -void init_mlme_default_rate_set(struct adapter *padapter); void init_mlme_ext_priv(struct adapter *padapter); void init_hw_mlme_ext(struct adapter *padapter); void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext); -- 2.55.0