From nobody Fri Jun 19 14:33:41 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4D6AC433EF for ; Sat, 2 Apr 2022 09:23:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354119AbiDBJZf (ORCPT ); Sat, 2 Apr 2022 05:25:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239698AbiDBJZb (ORCPT ); Sat, 2 Apr 2022 05:25:31 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F25CB4090A for ; Sat, 2 Apr 2022 02:23:39 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id z92so5503674ede.13 for ; Sat, 02 Apr 2022 02:23:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hgjJrokkXW7Ziu+fxR7JRBXcinNIm/xAaNlTUHhZFuU=; b=Z2Un54v4t6eamg3GVvDZNvNGPyBCOn2DYh9tZbI07SlbWX8HpWAGtsjMgEFO9b3APT hCp8EcJyTni8mLwNKwYg8sGkodA6XDIJ/qy11swr1JiwkcHMaBXMQzGWfYs0CZTgu+yK zKJlulq72LFuurHa6xJf0zfVvUMTDUu3jvpkDPxQIm2koNZL3GkvbnHKU3E2BrPIcOQK ANzmKU02RVZR3YoH3CwvGKGu8t+1kPDRIqVfPPq8TiomytzCY3kd75LI8dSVsTfeMFDX DoOMO3CQGYHHh9WZ94wVbCwtLODDMFacJKM54JxTgv9aXZF/zqaRmGnm4c2lj5xKv0lF mEOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hgjJrokkXW7Ziu+fxR7JRBXcinNIm/xAaNlTUHhZFuU=; b=Ic4sbajmFsUjeVvLX6/BKEO22XVXihgoBL2naYsmIIiAIojpks4upO5hOslIkdMorN 9hkFkVg49cV+tgdcoQCaXw06R2m7XVx4Bzeh1cAesSwH/rpw6aRJ6hkTKB1gnc2bR8YV oJfbzqvdLm2olKkjN5OvKQCm9ozK+ozRbgd1LrMASlh4Y+TALu/axIw3NO0E1mLtPz0R i2XXxVPCRKjOAoUpzr04SuKduTfJHPWNTwPETKOWnMBkNey8PPAWRhFHcdtktNJH7NkG WU/8QAvBYnAfMPupmii0yqonAgPrzONqd0zIC0H9YVXj+CM6w8ilTHzXUikuXeQ9DIKi 9r4A== X-Gm-Message-State: AOAM532IMJRSYq6VQaLcrdEeQK+9VXGsKhVxYECJ168NKvhCg2y+U3zL r5/oDCYfiVdvqyP7RvKk7rg= X-Google-Smtp-Source: ABdhPJx4/vvkLW28QmKU8BZiJ65P4P8VuYoazr+kH+MkJ69+NCRK6N6hIwkrGojB5JuIyYFYDu1s3g== X-Received: by 2002:aa7:c157:0:b0:418:f8e3:4c87 with SMTP id r23-20020aa7c157000000b00418f8e34c87mr24371555edp.271.1648891418569; Sat, 02 Apr 2022 02:23:38 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id jv19-20020a170907769300b006e095c047d6sm1897679ejc.109.2022.04.02.02.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 02:23:38 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 1/7] staging: r8188eu: remove HW_VAR_BSSID from SetHwReg8188EU() Date: Sat, 2 Apr 2022 11:23:26 +0200 Message-Id: <20220402092332.6627-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220402092332.6627-1-straube.linux@gmail.com> References: <20220402092332.6627-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove the HW_VAR_BSSID case from SetHwReg8188EU() and move its functionality to rtw_mlme_ext.c where it is actually used. This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 18 +++++++++++++----- drivers/staging/r8188eu/hal/usb_halinit.c | 14 -------------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index 6166baa64091..d409e98f8795 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -6096,6 +6096,14 @@ u8 collect_bss_info(struct adapter *padapter, struct= recv_frame *precv_frame, st return _SUCCESS; } =20 +static void rtw_set_bssid(struct adapter *adapter, u8 *bssid) +{ + int i; + + for (i =3D 0; i < ETH_ALEN; i++) + rtw_write8(adapter, REG_BSSID + i, bssid[i]); +} + void start_create_ibss(struct adapter *padapter) { unsigned short caps; @@ -6130,7 +6138,7 @@ void start_create_ibss(struct adapter *padapter) report_join_res(padapter, -1); pmlmeinfo->state =3D WIFI_FW_NULL_STATE; } else { - SetHwReg8188EU(padapter, HW_VAR_BSSID, padapter->registrypriv.dev_netwo= rk.MacAddress); + rtw_set_bssid(padapter, padapter->registrypriv.dev_network.MacAddress); join_type =3D 0; SetHwReg8188EU(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); =20 @@ -6711,7 +6719,7 @@ void mlmeext_joinbss_event_callback(struct adapter *p= adapter, int join_res) if (join_res < 0) { join_type =3D 1; SetHwReg8188EU(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); - SetHwReg8188EU(padapter, HW_VAR_BSSID, null_addr); + rtw_set_bssid(padapter, null_addr); =20 /* restore to initial setting. */ update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode); @@ -6830,7 +6838,7 @@ void mlmeext_sta_del_event_callback(struct adapter *p= adapter) =20 if (is_client_associated_to_ap(padapter) || is_IBSS_empty(padapter)) { mlme_disconnect(padapter); - SetHwReg8188EU(padapter, HW_VAR_BSSID, null_addr); + rtw_set_bssid(padapter, null_addr); =20 /* restore to initial setting. */ update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode); @@ -7266,7 +7274,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) =20 /* config the initial gain under linking, need to write the BB registers = */ =20 - SetHwReg8188EU(padapter, HW_VAR_BSSID, pmlmeinfo->network.MacAddress); + rtw_set_bssid(padapter, pmlmeinfo->network.MacAddress); join_type =3D 0; SetHwReg8188EU(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); =20 @@ -7290,7 +7298,7 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned = char *pbuf) issue_deauth_ex(padapter, pnetwork->MacAddress, WLAN_REASON_DEAUTH_LEAVI= NG, param->deauth_timeout_ms / 100, 100); =20 mlme_disconnect(padapter); - SetHwReg8188EU(padapter, HW_VAR_BSSID, null_addr); + rtw_set_bssid(padapter, null_addr); =20 /* restore to initial setting. */ update_tx_basic_rate(padapter, padapter->registrypriv.wireless_mode); diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 6b4b0b0c4f53..cf34645b3de5 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -942,17 +942,6 @@ static void hw_var_set_opmode(struct adapter *Adapter,= u8 *val) } } =20 -static void hw_var_set_bssid(struct adapter *Adapter, u8 *val) -{ - u8 idx =3D 0; - u32 reg_bssid; - - reg_bssid =3D REG_BSSID; - - for (idx =3D 0; idx < 6; idx++) - rtw_write8(Adapter, (reg_bssid + idx), val[idx]); -} - void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) { struct hal_data_8188e *haldata =3D &Adapter->haldata; @@ -963,9 +952,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variabl= e, u8 *val) case HW_VAR_SET_OPMODE: hw_var_set_opmode(Adapter, val); break; - case HW_VAR_BSSID: - hw_var_set_bssid(Adapter, val); - break; case HW_VAR_BASIC_RATE: { u16 BrateCfg =3D 0; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 9b465001975c..591322c20f7d 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -10,7 +10,6 @@ =20 enum hw_variables { HW_VAR_SET_OPMODE, - HW_VAR_BSSID, HW_VAR_BASIC_RATE, HW_VAR_CORRECT_TSF, HW_VAR_MLME_SITESURVEY, --=20 2.35.1 From nobody Fri Jun 19 14:33:41 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89C29C433F5 for ; Sat, 2 Apr 2022 09:23:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354131AbiDBJZk (ORCPT ); Sat, 2 Apr 2022 05:25:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239740AbiDBJZc (ORCPT ); Sat, 2 Apr 2022 05:25:32 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA07A47572 for ; Sat, 2 Apr 2022 02:23:40 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id o10so10480252ejd.1 for ; Sat, 02 Apr 2022 02:23:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CMIGyrKRIzwf4OHg6GTOimV0qeMIV89zyETvl4jfxmY=; b=qxQXERQUhKHA33AWb96zh4x7gi+dTC4uVeO3P3erxfJ2ccnYvDzhjP5huNYaPBOBRd fQdQabkT0ag+GwT8B0R4Acjj9czvZrHsz8N1mt4C0Jt/NrAlLbn03MfjBKfjk9+EcjWY usTkX1yPbrpibhSJx3ns5XWXpsht6H4ke5Qb0XWiJK1Idj+tchfrrKggfd2Tydyoztj4 G3L5ECeoHdZTTbs0KY5KEzaC3jToPu1Flk1v7ZOIRpB4sktbTx5HxwIhsLq8ajgH9a3X Ex5RXC/2qMV93cxc1ppYPRnXzwDOC9cBTOQsYa9Qfd0rx44/ZfAIRTT2rojXl0YK3w3P APrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CMIGyrKRIzwf4OHg6GTOimV0qeMIV89zyETvl4jfxmY=; b=SeNH+XYboe2QrF5JI9MG25fKpWlXHSAXc5JoaLXMm5q6XZPoiiQN6HRnTyzVd/tGtL cny7QsYGbjCfP7ouQS4Aohx0aua+H6vdfb8vMSbIptUXZ2Bs9agPpiCGwLIoGJ6JFOs+ cFcu6yy0e0p0VkD/mwJR804zCk9QrYwBG1A8sX6D6SjDNvYFNX5J7Efsi4cQeEsCTwEl dHGXUJxyezNEzLEZhrlC61c4ace95kM8S5CYpLXBZioBlNb/RHP4jKZq4RvOi0O9OU4p z90QskPeUCfbfCpgETrsNdaVhgoGdi3v7xlu61nUX8IHiO3nBqnVU5+qFb9HP/+8U+oF Pngw== X-Gm-Message-State: AOAM533GVQN+hluCglN5jbybWumJKNzYML45Z0g+dmhoRltEGoIxHGY1 AfZZtMRkgbWFDTwTV3T6/4Y= X-Google-Smtp-Source: ABdhPJy9n3o43+IUFCWkr8QOG0kXNRC5rP/SV0HLxLjedxpaT50XikzqJIhW3CHWwV2Q+jTScXgZ6Q== X-Received: by 2002:a17:907:2d2a:b0:6df:c027:a3ac with SMTP id gs42-20020a1709072d2a00b006dfc027a3acmr3075835ejc.179.1648891419319; Sat, 02 Apr 2022 02:23:39 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id jv19-20020a170907769300b006e095c047d6sm1897679ejc.109.2022.04.02.02.23.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 02:23:38 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 2/7] staging: r8188eu: remove HW_VAR_ACK_PREAMBLE from SetHwReg8188EU() Date: Sat, 2 Apr 2022 11:23:27 +0200 Message-Id: <20220402092332.6627-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220402092332.6627-1-straube.linux@gmail.com> References: <20220402092332.6627-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove the HW_VAR_ACK_PREAMBLE case from SetHwReg8188EU() and move its functionality to rtw_wlan_util.c where it is actually used. This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 20 +++++++++++++++----- drivers/staging/r8188eu/hal/usb_halinit.c | 12 ------------ drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index f005bd3c9ff2..acc554627adc 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -1304,26 +1304,36 @@ void update_IOT_info(struct adapter *padapter) } } =20 +static void set_ack_preamble(struct adapter *adapter, bool short_preamble) +{ + struct hal_data_8188e *haldata =3D &adapter->haldata; + u8 val8; + + /* Joseph marked out for Netgear 3500 TKIP channel 7 issue.(Temporarily)= */ + val8 =3D haldata->nCur40MhzPrimeSC << 5; + if (short_preamble) + val8 |=3D 0x80; + + rtw_write8(adapter, REG_RRSR + 2, val8); +}; + void update_capinfo(struct adapter *Adapter, u16 updateCap) { struct mlme_ext_priv *pmlmeext =3D &Adapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; - bool ShortPreamble; =20 /* Check preamble mode, 2005.01.06, by rcnjko. */ /* Mark to update preamble value forever, 2008.03.18 by lanhsin */ =20 if (updateCap & cShortPreamble) { /* Short Preamble */ if (pmlmeinfo->preamble_mode !=3D PREAMBLE_SHORT) { /* PREAMBLE_LONG or= PREAMBLE_AUTO */ - ShortPreamble =3D true; pmlmeinfo->preamble_mode =3D PREAMBLE_SHORT; - SetHwReg8188EU(Adapter, HW_VAR_ACK_PREAMBLE, (u8 *)&ShortPreamble); + set_ack_preamble(Adapter, true); } } else { /* Long Preamble */ if (pmlmeinfo->preamble_mode !=3D PREAMBLE_LONG) { /* PREAMBLE_SHORT o= r PREAMBLE_AUTO */ - ShortPreamble =3D false; pmlmeinfo->preamble_mode =3D PREAMBLE_LONG; - SetHwReg8188EU(Adapter, HW_VAR_ACK_PREAMBLE, (u8 *)&ShortPreamble); + set_ack_preamble(Adapter, false); } } =20 diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index cf34645b3de5..9326a6080819 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1094,18 +1094,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) } } break; - case HW_VAR_ACK_PREAMBLE: - { - u8 regTmp; - u8 bShortPreamble =3D *((bool *)val); - /* Joseph marked out for Netgear 3500 TKIP channel 7 issue.(Temporaril= y) */ - regTmp =3D (haldata->nCur40MhzPrimeSC) << 5; - if (bShortPreamble) - regTmp |=3D 0x80; - - rtw_write8(Adapter, REG_RRSR + 2, regTmp); - } - break; case HW_VAR_DM_FLAG: podmpriv->SupportAbility =3D *((u8 *)val); break; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 591322c20f7d..c2b97fa4e372 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -15,7 +15,6 @@ enum hw_variables { HW_VAR_MLME_SITESURVEY, HW_VAR_MLME_JOIN, HW_VAR_SLOT_TIME, - HW_VAR_ACK_PREAMBLE, HW_VAR_DM_FLAG, HW_VAR_DM_FUNC_OP, HW_VAR_DM_FUNC_RESET, --=20 2.35.1 From nobody Fri Jun 19 14:33:41 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1712BC433EF for ; Sat, 2 Apr 2022 09:23:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354145AbiDBJZq (ORCPT ); Sat, 2 Apr 2022 05:25:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243098AbiDBJZd (ORCPT ); Sat, 2 Apr 2022 05:25:33 -0400 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [IPv6:2a00:1450:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFEB049F8D for ; Sat, 2 Apr 2022 02:23:41 -0700 (PDT) Received: by mail-ed1-x535.google.com with SMTP id x34so5540098ede.8 for ; Sat, 02 Apr 2022 02:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X+8dg39ZMxlEKu2qH0LGovBPHbNVLriY80Y0/3wt26s=; b=jlUnGQO7VLQB02aBXnzHHIIQmsem5Y7978FHYZkQ13bzMli1+/HLZRuLxcIJF2DJs1 +92SzMyRr2jGVIYK4S8AcAVtkFyzHqdHAW+7aIZWIy/lH1263RcEqYOAadjdfALFIGv4 7/Orl4U2qSYVqXpF2AalYXFufuAuYZv+rQc+CIHxZhzKL4PugBSzc3Jwvaa5FMJzxJvt +qZlNfs22J2AujLaEGaIQy4tlmw4emRFE5TQc5GcKYvInTtoYMF0HYF0bG38MRdEJIBe q9Zi3EWk4BdbxuXNnRFOcPW5E8Ys1sXeAVZ3bypyZBUKzRvE29UeZiSOlcBY8MbAM6Ou koww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X+8dg39ZMxlEKu2qH0LGovBPHbNVLriY80Y0/3wt26s=; b=2W05vQGdolIBtDIaonZNK+HwIU62a5gbeUtIpt0/FNEEI3obZ4xwNL3/Is6PkTMGZZ ATqBej4d96wDjvVJobzyYt8QUDyuDpJckwT4RB+GJsdTjL7aNmqO4d1RbH2BEiBQ8pvN KyounUMsa4EQlaTb+mQRGsnbUCGexPRunBBorooiwUx1To+WFETy2SMvHUTQCrvX3/eY 5PLyH0cggHaVnbjmnhlMXfOpQ8ltfS1l8hquCQ+6Lsj+R2Dx+8/Lc7xD59sD1xmHhZ78 0cBQ3FUP86yeYucOnn6RmyQDrgSgmEroM8FUSaIECwJGy4of9n5wpgaNSwB45LA/Htm8 FggQ== X-Gm-Message-State: AOAM530eYZKPWXBZvT4lMOnx9XBTtbSWS3kA4jVjb/hvG4CzmlLuPlKW E7riLG9Jq7fLqV2hEVtv+4U= X-Google-Smtp-Source: ABdhPJw7gJEAS/rD6G/8I5GInrNgjVelEj0neKitE2n+7DXDAwmVMyaJi0UH53HFZgBul7DOyMPxrQ== X-Received: by 2002:a05:6402:5245:b0:419:5437:fc6b with SMTP id t5-20020a056402524500b004195437fc6bmr24091277edd.282.1648891420229; Sat, 02 Apr 2022 02:23:40 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id jv19-20020a170907769300b006e095c047d6sm1897679ejc.109.2022.04.02.02.23.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 02:23:39 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 3/7] staging: r8188eu: remove HW_VAR_AMPDU_MIN_SPACE from SetHwReg8188EU() Date: Sat, 2 Apr 2022 11:23:28 +0200 Message-Id: <20220402092332.6627-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220402092332.6627-1-straube.linux@gmail.com> References: <20220402092332.6627-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove the HW_VAR_AMPDU_MIN_SPACE case from SetHwReg8188EU() and move its functionality to rtw_wlan_util.c where it is actually used. This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_wlan_util.c | 31 +++++++++++++++++++- drivers/staging/r8188eu/hal/usb_halinit.c | 28 ------------------ drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging= /r8188eu/core/rtw_wlan_util.c index acc554627adc..b526715a70bc 100644 --- a/drivers/staging/r8188eu/core/rtw_wlan_util.c +++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c @@ -760,6 +760,35 @@ void HT_info_handler(struct adapter *padapter, struct = ndis_802_11_var_ie *pIE) memcpy(&pmlmeinfo->HT_info, pIE->data, pIE->Length); } =20 +static void set_min_ampdu_spacing(struct adapter *adapter, u8 spacing) +{ + u8 sec_spacing; + + if (spacing <=3D 7) { + switch (adapter->securitypriv.dot11PrivacyAlgrthm) { + case _NO_PRIVACY_: + case _AES_: + sec_spacing =3D 0; + break; + case _WEP40_: + case _WEP104_: + case _TKIP_: + case _TKIP_WTMIC_: + sec_spacing =3D 6; + break; + default: + sec_spacing =3D 7; + break; + } + + if (spacing < sec_spacing) + spacing =3D sec_spacing; + + rtw_write8(adapter, REG_AMPDU_MIN_SPACE, + (rtw_read8(adapter, REG_AMPDU_MIN_SPACE) & 0xf8) | spacing); + } +} + void HTOnAssocRsp(struct adapter *padapter) { unsigned char max_AMPDU_len; @@ -784,7 +813,7 @@ void HTOnAssocRsp(struct adapter *padapter) =20 min_MPDU_spacing =3D (pmlmeinfo->HT_caps.u.HT_cap_element.AMPDU_para & 0x= 1c) >> 2; =20 - SetHwReg8188EU(padapter, HW_VAR_AMPDU_MIN_SPACE, (u8 *)(&min_MPDU_spacing= )); + set_min_ampdu_spacing(padapter, min_MPDU_spacing); =20 SetHwReg8188EU(padapter, HW_VAR_AMPDU_FACTOR, (u8 *)(&max_AMPDU_len)); } diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 9326a6080819..7b231e9a2193 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1113,34 +1113,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) haldata->AcParam_BE =3D ((u32 *)(val))[0]; rtw_write32(Adapter, REG_EDCA_BE_PARAM, ((u32 *)(val))[0]); break; - case HW_VAR_AMPDU_MIN_SPACE: - { - u8 MinSpacingToSet; - u8 SecMinSpace; - - MinSpacingToSet =3D *((u8 *)val); - if (MinSpacingToSet <=3D 7) { - switch (Adapter->securitypriv.dot11PrivacyAlgrthm) { - case _NO_PRIVACY_: - case _AES_: - SecMinSpace =3D 0; - break; - case _WEP40_: - case _WEP104_: - case _TKIP_: - case _TKIP_WTMIC_: - SecMinSpace =3D 6; - break; - default: - SecMinSpace =3D 7; - break; - } - if (MinSpacingToSet < SecMinSpace) - MinSpacingToSet =3D SecMinSpace; - rtw_write8(Adapter, REG_AMPDU_MIN_SPACE, (rtw_read8(Adapter, REG_AMPDU= _MIN_SPACE) & 0xf8) | MinSpacingToSet); - } - } - break; case HW_VAR_AMPDU_FACTOR: { u8 RegToSet_Normal[4] =3D {0x41, 0xa8, 0x72, 0xb9}; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index c2b97fa4e372..c18ff1469c2b 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -20,7 +20,6 @@ enum hw_variables { HW_VAR_DM_FUNC_RESET, HW_VAR_DM_FUNC_CLR, HW_VAR_AC_PARAM_BE, - HW_VAR_AMPDU_MIN_SPACE, HW_VAR_AMPDU_FACTOR, HW_VAR_H2C_FW_PWRMODE, HW_VAR_H2C_FW_JOINBSSRPT, --=20 2.35.1 From nobody Fri Jun 19 14:33:41 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66CD1C433F5 for ; Sat, 2 Apr 2022 09:24:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353522AbiDBJ0H (ORCPT ); Sat, 2 Apr 2022 05:26:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352019AbiDBJZe (ORCPT ); Sat, 2 Apr 2022 05:25:34 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FA804A936 for ; Sat, 2 Apr 2022 02:23:42 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id z92so5503742ede.13 for ; Sat, 02 Apr 2022 02:23:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YYft2sVX3IyvMb409T7bGyIltinifxK7HKRWoSehlTM=; b=fYFpSp3Vy5HlvCtf3vpmqt9If72x33fvBQA08FDCU+mwbVJiMNJ+FGlPYntyxsgGsD 84dZYnjVzldZMSO8vDInElRhVXMJmf79O94hQerYtywVDpOBW/Ab4l11kKnYiuaq9MIZ 4xPqav+ja09C3Cp5BzCQcvYPxC4Vtv22GjVjY8M9L1bbQb/8CbMeYWzCPbXsLu2GPsJL CVT3Zl3E2Om/nGadiUclKOe6TwY9PSd4uuQJ9vzGDyBxE/3kyb/l8qCjHFH7/8xEUF2q a1/cFn5j24Ov/19O7eNs/467SQzlZl+c5TAlMxTC2KJO1c1C2PxSpa11PJtRwp5UjKFD sP+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YYft2sVX3IyvMb409T7bGyIltinifxK7HKRWoSehlTM=; b=VjzsAI0HJbu48ZpB4aVIorno/fZjeQg7VRsk3tguRPL/YH4iJHcO5NCTJZXE73TSOx kxepojf5jWb11FWfygKDrHnYtlR2zNSVJiuKbiimjzIVWI0Ig9jhz/06ojEOdRSA5mg6 3eRDGwVNLeQaVhBCj5PY918HTrUG2DYbiY7sKklgyhBo6CbOFVKVtHekhhKnZPzRRWTd H711hp4MRI65/Z6jRBrTU5emXYHhrZOuxk9l8kP9+IXcCncAl80MEVq9zXTyQrtB17c8 2XEvohI/s7e/zpxziXbbvZF9EiSt+NgsNdZ9bVUS3A+TF/o0Yy4tJM83sgvqiKEsDds7 7ITA== X-Gm-Message-State: AOAM531bYzXWS1pjo0JhN0KED7aUG1GjTKiEtE0ZT/h9WR5KOMTym6HW 0r1m5deqU5DOF0M68W+b/Z0= X-Google-Smtp-Source: ABdhPJyomnaPNSKug4pGhCvWr9Ivk7HdNe5zQBeHGSOuQabe7cB6mCLgmitBbafVm1KUz7sB1dmzyg== X-Received: by 2002:a50:d90f:0:b0:418:8a5a:14b2 with SMTP id t15-20020a50d90f000000b004188a5a14b2mr24302277edj.241.1648891421150; Sat, 02 Apr 2022 02:23:41 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id jv19-20020a170907769300b006e095c047d6sm1897679ejc.109.2022.04.02.02.23.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 02:23:40 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 4/7] staging: r8188eu: remove HW_VAR_ANTENNA_DIVERSITY_SELECT from SetHwReg8188EU() Date: Sat, 2 Apr 2022 11:23:29 +0200 Message-Id: <20220402092332.6627-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220402092332.6627-1-straube.linux@gmail.com> References: <20220402092332.6627-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove the HW_VAR_ANTENNA_DIVERSITY_SELECT case from SetHwReg8188EU() and move its functionality to rtw_cmd.c where it is actually used. This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_cmd.c | 8 +++++++- drivers/staging/r8188eu/hal/usb_halinit.c | 13 ------------- drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index 4fda2fe07ecc..a9152db589c7 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -1086,7 +1086,13 @@ u8 rtw_rpt_timer_cfg_cmd(struct adapter *padapter, u= 16 min_time) =20 static void antenna_select_wk_hdl(struct adapter *padapter, u8 antenna) { - SetHwReg8188EU(padapter, HW_VAR_ANTENNA_DIVERSITY_SELECT, (u8 *)(&antenna= )); + struct hal_data_8188e *haldata =3D &padapter->haldata; + + /* switch current antenna to optimum antenna */ + if (haldata->CurAntenna !=3D antenna) { + ODM_UpdateRxIdleAnt_88E(&haldata->odmpriv, antenna =3D=3D 2 ? MAIN_ANT := AUX_ANT); + haldata->CurAntenna =3D antenna; + } } =20 u8 rtw_antenna_select_cmd(struct adapter *padapter, u8 antenna, u8 enqueue) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 7b231e9a2193..39db038d75fd 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1181,19 +1181,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) ODM_RA_Set_TxRPT_Time(podmpriv, min_rpt_time); } break; - case HW_VAR_ANTENNA_DIVERSITY_SELECT: - { - u8 Optimum_antenna =3D (*(u8 *)val); - u8 Ant; - /* switch antenna to Optimum_antenna */ - if (haldata->CurAntenna !=3D Optimum_antenna) { - Ant =3D (Optimum_antenna =3D=3D 2) ? MAIN_ANT : AUX_ANT; - ODM_UpdateRxIdleAnt_88E(&haldata->odmpriv, Ant); - - haldata->CurAntenna =3D Optimum_antenna; - } - } - break; case HW_VAR_FIFO_CLEARN_UP: { struct pwrctrl_priv *pwrpriv =3D &Adapter->pwrctrlpriv; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index c18ff1469c2b..1ba2eb0a46b2 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -25,7 +25,6 @@ enum hw_variables { HW_VAR_H2C_FW_JOINBSSRPT, HW_VAR_H2C_FW_P2P_PS_OFFLOAD, HW_VAR_INITIAL_GAIN, - HW_VAR_ANTENNA_DIVERSITY_SELECT, HW_VAR_FIFO_CLEARN_UP, HW_VAR_RPT_TIMER_SETTING, HW_VAR_H2C_MEDIA_STATUS_RPT, --=20 2.35.1 From nobody Fri Jun 19 14:33:41 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DAD5EC433EF for ; Sat, 2 Apr 2022 09:24:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243098AbiDBJZ5 (ORCPT ); Sat, 2 Apr 2022 05:25:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354116AbiDBJZe (ORCPT ); Sat, 2 Apr 2022 05:25:34 -0400 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DDC54CD5F for ; Sat, 2 Apr 2022 02:23:43 -0700 (PDT) Received: by mail-ej1-x636.google.com with SMTP id pv16so10565513ejb.0 for ; Sat, 02 Apr 2022 02:23:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Kj0NK64/6VOX5kKDITGHXBLvkxZmhHmuskzVJ746a1s=; b=Hv9it68CijLFSwsSmW/b2hNjYUjEItE+yy8rNczB4SS5RU5urdnFL8gJaBqWD2eTVC B5dPp85eANDq7D+3V3XUQqP80sahcSVvsyg5t2FnJ08oYppLvJiglXILTPxmisjWwnBc EuE8Y4kURuqIlsot5yBvPzVVjomFc1upW1eHFuAIpvcUzyU0nW9Sc5N4/Td2DPmUf96A JdggqdCH7skF6h4IAJ/WtW0IPs9Kdit2ewBxY6UlOF4EUK3prreb575i3nNGJjUOB0Ze 96JzHZe1dG9snZkIAL5ej3P27WYHFppuCbFWYKlgyR54aqP3nLr6IwZt1tzUURzWXjfu zvIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Kj0NK64/6VOX5kKDITGHXBLvkxZmhHmuskzVJ746a1s=; b=S/85igmrR3XChlzvt76mrZlQTRGPxJlC7htMo8OqsXRCM4OawQEP7oTbni3fSD0oII nQNXHWKyWdnCMgE+cNX3yT3Jsf50RG2vQubIyROHW6AkwrVp9SA4LqVqmRKpMX8c8HRR b64fgrLcIzGjbILghXipJeX3W42++jlH5yLttWd80JCthXuvLmX4wg4dKth/OMLNHp/K thd1gf0w+bLhHJFAygeD27Qh0hNA8HBc0shZBoNAmV1ijrG5cccv1KMZWzPEVDR0A9J/ arm1UnC6JL2xCDWwktkwSs7yzCY9fuL7VVNZCDgxsFe9fh7+jRXwsiudZowH8V8Pcpfq fFVA== X-Gm-Message-State: AOAM533AW7HRa38f9xSkcF2GaTneYAA0bzX4QYf5GA9w5QzrTQ8HZdOk /Lo4zp/Oit/gxk7idaFY9r0= X-Google-Smtp-Source: ABdhPJz/yRat7Vq2PFwQGRYsW6sE5hNV6cm2sFVOlgWjf7PnjhEo4k5+lvWjAuZd7Mbk3mOJA2grbQ== X-Received: by 2002:a17:907:7d93:b0:6da:8f57:68fa with SMTP id oz19-20020a1709077d9300b006da8f5768famr3335611ejc.42.1648891422095; Sat, 02 Apr 2022 02:23:42 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id jv19-20020a170907769300b006e095c047d6sm1897679ejc.109.2022.04.02.02.23.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 02:23:41 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 5/7] staging: r8188eu: remove HW_VAR_RPT_TIMER_SETTING from SetHwReg8188EU() Date: Sat, 2 Apr 2022 11:23:30 +0200 Message-Id: <20220402092332.6627-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220402092332.6627-1-straube.linux@gmail.com> References: <20220402092332.6627-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove the HW_VAR_RPT_TIMER_SETTING case from SetHwReg8188EU() and move its functionality to rtw_cmd.c where it is actually used. This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_cmd.c | 5 ++++- drivers/staging/r8188eu/hal/usb_halinit.c | 6 ------ drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index a9152db589c7..19a04fcb6762 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -1049,7 +1049,10 @@ u8 rtw_lps_ctrl_wk_cmd(struct adapter *padapter, u8 = lps_ctrl_type, u8 enqueue) =20 static void rpt_timer_setting_wk_hdl(struct adapter *padapter, u16 min_tim= e) { - SetHwReg8188EU(padapter, HW_VAR_RPT_TIMER_SETTING, (u8 *)(&min_time)); + struct hal_data_8188e *haldata =3D &padapter->haldata; + struct odm_dm_struct *odmpriv =3D &haldata->odmpriv; + + ODM_RA_Set_TxRPT_Time(odmpriv, min_time); } =20 u8 rtw_rpt_timer_cfg_cmd(struct adapter *padapter, u16 min_time) diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index 39db038d75fd..d13a8ab598fd 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1175,12 +1175,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) } } break; - case HW_VAR_RPT_TIMER_SETTING: - { - u16 min_rpt_time =3D (*(u16 *)val); - ODM_RA_Set_TxRPT_Time(podmpriv, min_rpt_time); - } - break; case HW_VAR_FIFO_CLEARN_UP: { struct pwrctrl_priv *pwrpriv =3D &Adapter->pwrctrlpriv; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 1ba2eb0a46b2..edc4c6f42bc8 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -26,7 +26,6 @@ enum hw_variables { HW_VAR_H2C_FW_P2P_PS_OFFLOAD, HW_VAR_INITIAL_GAIN, HW_VAR_FIFO_CLEARN_UP, - HW_VAR_RPT_TIMER_SETTING, HW_VAR_H2C_MEDIA_STATUS_RPT, }; =20 --=20 2.35.1 From nobody Fri Jun 19 14:33:41 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C30B4C433EF for ; Sat, 2 Apr 2022 09:24:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354152AbiDBJ0A (ORCPT ); Sat, 2 Apr 2022 05:26:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354120AbiDBJZf (ORCPT ); Sat, 2 Apr 2022 05:25:35 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2B804FC61 for ; Sat, 2 Apr 2022 02:23:44 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id pv16so10565571ejb.0 for ; Sat, 02 Apr 2022 02:23:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Hbv2IFTUt2O0NPVNkUCtxSG4zAl7/ejUdRHICxrAZZk=; b=jcenvO0vKctUXrUDIqaYaOXojqkx0Y5AMRoUgCR51aP3CppK4yzOjnGRCG5RfnWxzq OKG+DG31VTLSRSYffuPe7J2RoFsX29XpH1QS9+kWiD4rKPNru+1bNG8igkVrOl0bGjTW 8fxsfSZTaCQpLipZ5lBpCUZ0IXqipDnoQzZ2LG86k7GgPNjzoHn44FO0l3ivZCzNFSYV Mn0XI0m65TkWoz5cdUv8vRSWxFkXlVTROayBfuNZQKZln9WYWc8o+M02aXIdfQi+plyv wyyemAe/yZ4RBguCP3EVgIaM52+EBx/Vr5DevaD6slNz2PnqZvsCBOylDJ1aOpcSRiSX EJmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Hbv2IFTUt2O0NPVNkUCtxSG4zAl7/ejUdRHICxrAZZk=; b=XNF/jb7ZtKvd8NeOGFydN+uMrb4ILRRakojFcGrq1MbuZgniDyG+1WUrhlCdsF8hj1 iGX6wRUUb86n548ARO4gjDfVvfIxoZGqbXNiSQad4NjSlApyWVwygb9taEcwtTziDyjt 7imwmnEkdqiE9TfGyNgN5rRglpIVELVgcRkqbPxGuzuG5vBWwotcnTkZWnFcflmCX3yi MfwVzlLLobCH4nPgL5UwOzHk1jAl9sEUJ4KCnsVIT2opAIsF0G9k/I+IJ0lZQOTgvg70 kJ4PELfia7j7DKT58H1LYLIEW8tJGI4PWkqSsJDgg7E5q/uDf7SWGQQDpoOY+fM5EnNe 6ahA== X-Gm-Message-State: AOAM533aKElVi736W/5IrhkqKcyWV85+XUQR+OIvVxX8f+7GpZKt9Uq6 E6HiCZXHF096xMypwnYxLjM= X-Google-Smtp-Source: ABdhPJzMURrKj96ef7bpn1gmvX8XmHJZgVTaR2+n0/FIGaMTjQ/Hpxq3o3NXB3iH247WNkKdSor7yg== X-Received: by 2002:a17:907:6092:b0:6db:ab31:96a2 with SMTP id ht18-20020a170907609200b006dbab3196a2mr3078780ejc.361.1648891423436; Sat, 02 Apr 2022 02:23:43 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id jv19-20020a170907769300b006e095c047d6sm1897679ejc.109.2022.04.02.02.23.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 02:23:42 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 6/7] staging: r8188eu: remove HW_VAR_H2C_FW_JOINBSSRPT from SetHwReg8188EU() Date: Sat, 2 Apr 2022 11:23:31 +0200 Message-Id: <20220402092332.6627-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220402092332.6627-1-straube.linux@gmail.com> References: <20220402092332.6627-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The HW_VAR_H2C_FW_JOINBSSRPT case in SetHwReg8188EU() just calls a function. Call the function directly and remove the HW_VAR_H2C_FW_JOINBSSRPT case from SetHwReg8188EU(). This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_cmd.c | 4 ++-- drivers/staging/r8188eu/hal/usb_halinit.c | 6 ------ drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index 19a04fcb6762..439d639a7c36 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -985,12 +985,12 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter,= u8 lps_ctrl_type) mstatus =3D 1;/* connect */ /* Reset LPS Setting */ padapter->pwrctrlpriv.LpsIdleCount =3D 0; - SetHwReg8188EU(padapter, HW_VAR_H2C_FW_JOINBSSRPT, (u8 *)(&mstatus)); + rtl8188e_set_FwJoinBssReport_cmd(padapter, mstatus); break; case LPS_CTRL_DISCONNECT: mstatus =3D 0;/* disconnect */ LPS_Leave(padapter); - SetHwReg8188EU(padapter, HW_VAR_H2C_FW_JOINBSSRPT, (u8 *)(&mstatus)); + rtl8188e_set_FwJoinBssReport_cmd(padapter, mstatus); break; case LPS_CTRL_SPECIAL_PACKET: pwrpriv->DelayLPSLastTimeStamp =3D jiffies; diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index d13a8ab598fd..cbd49183be13 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1150,12 +1150,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) rtl8188e_set_FwPwrMode_cmd(Adapter, psmode); } break; - case HW_VAR_H2C_FW_JOINBSSRPT: - { - u8 mstatus =3D (*(u8 *)val); - rtl8188e_set_FwJoinBssReport_cmd(Adapter, mstatus); - } - break; case HW_VAR_H2C_FW_P2P_PS_OFFLOAD: { u8 p2p_ps_state =3D (*(u8 *)val); diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index edc4c6f42bc8..0f64cb41cca6 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -22,7 +22,6 @@ enum hw_variables { HW_VAR_AC_PARAM_BE, HW_VAR_AMPDU_FACTOR, HW_VAR_H2C_FW_PWRMODE, - HW_VAR_H2C_FW_JOINBSSRPT, HW_VAR_H2C_FW_P2P_PS_OFFLOAD, HW_VAR_INITIAL_GAIN, HW_VAR_FIFO_CLEARN_UP, --=20 2.35.1 From nobody Fri Jun 19 14:33:41 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81818C433EF for ; Sat, 2 Apr 2022 09:24:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354166AbiDBJ0M (ORCPT ); Sat, 2 Apr 2022 05:26:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354130AbiDBJZk (ORCPT ); Sat, 2 Apr 2022 05:25:40 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CCA05418E for ; Sat, 2 Apr 2022 02:23:47 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id bq8so10398171ejb.10 for ; Sat, 02 Apr 2022 02:23:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p1nCazU2RR08u9chSBMxQI9AzP6gAEkfhwUIFi0LIXg=; b=Wg7mpw7XUE4bov9iBjuBYKFcVHyxOb+b9cnznxNDNvkRKByMlQ7DM4l1oY7shpcn7Z Mp3duqVwKMMQS0k8odTmhEn8wBwbhUff89OkcdqppYTImkQ8/2eE2brZQC8XLFBqlUIG WvLby9+1lF2IxSRDIQ0MWXsPzcCasBitTAqHvgLm78AtAkSour981+e+X5gAWiqMifo9 cyhclO/5zGCHK0PsB83VIND20i/wKTfkIEsbKX4vMG519BakSPP+inVty+D44YTYbl7r d4myFPDQ3GKa3SOpY42ShIFERYpO7YhTAXTzNAHtoh7/BD18u96vVjRkGIyBBeFHdpK7 FV+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p1nCazU2RR08u9chSBMxQI9AzP6gAEkfhwUIFi0LIXg=; b=CxwMazAhKo8uLhSApTG8poGCujM6DfKpwC2ogIHt4rwaJPMuhMLFXucaHqH6Wdyuiq YdWX009NZtcbM7wEwYcAqywVD8HItn5YolWzZgTlkppO67JKn0dOKyNjs/XWKzTdAQTh B1LC1QRIjh78DV9oGFWFp+Rl59aoxwt5J5IojOtbKct0KmP18KhJfzrnibfqPmig1qjw zmmp+q6m0fDotn7pgqUqKasaJ2R3Gx3prsEwaXv7Yz0muNeVSpgRnriBK2MpzE6bfEBG ORy3pjls68KidbsnvqAg9GPorLqg+tnOfyOSbDePuO/3utkmD0sS8TZy94CYqw4vJTfH 7NUQ== X-Gm-Message-State: AOAM532+b8kI3a4GNrrN4psGCrse6dm+f9K5eQQWbUNZmTN2YVNwsmLC AxHtQpniNCbqh0ALdXZXUJpz1QRWo/g= X-Google-Smtp-Source: ABdhPJyrGqa254pGglGEIFCVEPeMoDDg7oWpzf0Pv4SVMvPPifEA4K17QwjnhZRW3g/ZSTqFTJ5DRg== X-Received: by 2002:a17:907:7da5:b0:6e4:e40f:60a0 with SMTP id oz37-20020a1709077da500b006e4e40f60a0mr3240474ejc.486.1648891426020; Sat, 02 Apr 2022 02:23:46 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb55.dynamic.kabel-deutschland.de. [95.90.187.85]) by smtp.gmail.com with ESMTPSA id jv19-20020a170907769300b006e095c047d6sm1897679ejc.109.2022.04.02.02.23.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Apr 2022 02:23:45 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH 7/7] staging: r8188eu: remove HW_VAR_H2C_FW_P2P_PS_OFFLOAD from SetHwReg8188EU() Date: Sat, 2 Apr 2022 11:23:32 +0200 Message-Id: <20220402092332.6627-8-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220402092332.6627-1-straube.linux@gmail.com> References: <20220402092332.6627-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The HW_VAR_H2C_FW_P2P_PS_OFFLOAD case in SetHwReg8188EU() just calls a function. Call the function directly and remove the HW_VAR_H2C_FW_P2P_PS_OFFLOAD case from SetHwReg8188EU(). This is part of the ongoing effort to get rid of the unwanted hal layer. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_p2p.c | 6 +++--- drivers/staging/r8188eu/hal/usb_halinit.c | 6 ------ drivers/staging/r8188eu/include/hal_intf.h | 1 - 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_p2p.c b/drivers/staging/r8188= eu/core/rtw_p2p.c index 48500fb82250..1e728a03e0ac 100644 --- a/drivers/staging/r8188eu/core/rtw_p2p.c +++ b/drivers/staging/r8188eu/core/rtw_p2p.c @@ -1602,7 +1602,7 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_p= s_state) case P2P_PS_DISABLE: pwdinfo->p2p_ps_state =3D p2p_ps_state; =20 - SetHwReg8188EU(padapter, HW_VAR_H2C_FW_P2P_PS_OFFLOAD, (u8 *)(&p2p_ps_st= ate)); + rtl8188e_set_p2p_ps_offload_cmd(padapter, p2p_ps_state); =20 pwdinfo->noa_index =3D 0; pwdinfo->ctwindow =3D 0; @@ -1626,7 +1626,7 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_p= s_state) SetHwReg8188EU(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&padapter->pwr= ctrlpriv.pwr_mode)); } } - SetHwReg8188EU(padapter, HW_VAR_H2C_FW_P2P_PS_OFFLOAD, (u8 *)(&p2p_ps_s= tate)); + rtl8188e_set_p2p_ps_offload_cmd(padapter, p2p_ps_state); } break; case P2P_PS_SCAN: @@ -1634,7 +1634,7 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_p= s_state) case P2P_PS_ALLSTASLEEP: if (pwdinfo->p2p_ps_mode > P2P_PS_NONE) { pwdinfo->p2p_ps_state =3D p2p_ps_state; - SetHwReg8188EU(padapter, HW_VAR_H2C_FW_P2P_PS_OFFLOAD, (u8 *)(&p2p_ps_s= tate)); + rtl8188e_set_p2p_ps_offload_cmd(padapter, p2p_ps_state); } break; default: diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8= 188eu/hal/usb_halinit.c index cbd49183be13..4bc6b08fb282 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -1150,12 +1150,6 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 vari= able, u8 *val) rtl8188e_set_FwPwrMode_cmd(Adapter, psmode); } break; - case HW_VAR_H2C_FW_P2P_PS_OFFLOAD: - { - u8 p2p_ps_state =3D (*(u8 *)val); - rtl8188e_set_p2p_ps_offload_cmd(Adapter, p2p_ps_state); - } - break; case HW_VAR_INITIAL_GAIN: { struct rtw_dig *pDigTable =3D &podmpriv->DM_DigTable; diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r= 8188eu/include/hal_intf.h index 0f64cb41cca6..e222ab89bfc5 100644 --- a/drivers/staging/r8188eu/include/hal_intf.h +++ b/drivers/staging/r8188eu/include/hal_intf.h @@ -22,7 +22,6 @@ enum hw_variables { HW_VAR_AC_PARAM_BE, HW_VAR_AMPDU_FACTOR, HW_VAR_H2C_FW_PWRMODE, - HW_VAR_H2C_FW_P2P_PS_OFFLOAD, HW_VAR_INITIAL_GAIN, HW_VAR_FIFO_CLEARN_UP, HW_VAR_H2C_MEDIA_STATUS_RPT, --=20 2.35.1