From nobody Sun Feb 8 13:32:58 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 7A0ABEB64D9 for ; Sat, 17 Jun 2023 13:58:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237307AbjFQN6V (ORCPT ); Sat, 17 Jun 2023 09:58:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346279AbjFQN6O (ORCPT ); Sat, 17 Jun 2023 09:58:14 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D04630F1 for ; Sat, 17 Jun 2023 06:57:40 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-50d897af77bso402847a12.1 for ; Sat, 17 Jun 2023 06:57:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687010259; x=1689602259; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=4r2Rtc1JlVK6mjrCqEQPoG1o3UJwlNrd+dUsSDnAhaQ=; b=OFCUBOB3tK8YMrZMCEcFDUX4/K/2+8MBIzkNowyo5rwwGwogE00yabvNwhldZXFld7 78d8PJrJZsbgA2s6gHcDaFbpWNKmFtFzONEqrN+NFbeSahi044PZjCsR5wdTo2P/41ob gO7W0Htt9aLTtaQFbf+QnXwxjf+GMoBiGiK8Ra1So3t2/CzWjzAV7Dx5b7EyAQuVGKjS G4vzHl5k0WMCQABZKJAUpMmaaqL6HJvuO0vUVZw8KVMVhIZJJlqVDeq75KFzyV0WHymN 3e3x8lIq/irH2blBobdLpMAlaH/XSTkn4XEgigdsYyO3sFt4jYYM1QnUCg7nqZPIkSD7 Ru/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687010259; x=1689602259; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4r2Rtc1JlVK6mjrCqEQPoG1o3UJwlNrd+dUsSDnAhaQ=; b=SJwNvNTu6wrPlRkXvc0Wnyr52QBFu3BRTjzkHMjtyJr9qIp1qMAMYJB2WlnCVPxIrn TREWozZRQXyiM79AQxNWixl8wNQbH+mtxwJLOiDCwa8jb5OBSBn6or3Ht66j4DB6F0yH dotYI8RqnIarRqz5yVO8EaJrqHJxPXQ5rD+UDnAlfPcMn/d1EoMAQ7EK3c7R0Rc3McdC b+0gvnqY6NN5ipkxImr9zyicAXxBkK7JScrzecnIOiWV8tgOHxyFEEBNKfNK5fhCGku1 gRF/t+T5kXhpJiwbde80baUsuMAMvzEXCRsm9hDfyHrZ+4HBaL1wnx48Gdv4i9FR2Q5z 5Ymw== X-Gm-Message-State: AC+VfDxeuVF4i0zoqA7bBqjtTM6kBS740EotsU1OTrAB9cL2DrVnnyFL Du/nNZx16xUMTk91rxtqT0I= X-Google-Smtp-Source: ACHHUZ50FsWViSO2cGEkWjo137Ny+m44WLwNQqPVWPyikdsi3flHqz/EclpjGYkjnnGXhnY387emtQ== X-Received: by 2002:a17:906:244:b0:982:caf8:7358 with SMTP id 4-20020a170906024400b00982caf87358mr3996330ejl.5.1687010258783; Sat, 17 Jun 2023 06:57:38 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id la4-20020a170906ad8400b00984822540c9sm2411486ejb.96.2023.06.17.06.57.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jun 2023 06:57:38 -0700 (PDT) Date: Sat, 17 Jun 2023 15:57:36 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 9/9] staging: rtl8192e: Rename RTLLIB_LINKED_SCANNING Message-ID: <25b97cd436c636e750c50f0c03386fcc46e56610.1687007788.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename RTLLIB_LINKED_SCANNING to MAC80211_LINKED_SCANNING to align with rtlwifi driver. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c b/drivers/stag= ing/rtl8192e/rtl8192e/rtl_ethtool.c index 1625d1326599..fab8932e67da 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c @@ -28,7 +28,7 @@ static u32 _rtl92e_ethtool_get_link(struct net_device *de= v) struct r8192_priv *priv =3D rtllib_priv(dev); =20 return ((priv->rtllib->link_state =3D=3D MAC80211_LINKED) || - (priv->rtllib->link_state =3D=3D RTLLIB_LINKED_SCANNING)); + (priv->rtllib->link_state =3D=3D MAC80211_LINKED_SCANNING)); } =20 const struct ethtool_ops rtl819x_ethtool_ops =3D { diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 7758bfd90283..cdd167de127f 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1153,7 +1153,7 @@ enum rtl_link_state { * logically linked, but it is doing a syncro site survey * then it will be back to LINKED state. */ - RTLLIB_LINKED_SCANNING, + MAC80211_LINKED_SCANNING, }; =20 #define DEFAULT_MAX_SCAN_AGE (15 * HZ) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index d99b98a39cc7..7494c7e6fff6 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -513,7 +513,7 @@ static void rtllib_softmac_scan_syncro(struct rtllib_de= vice *ieee, u8 is_mesh) * will set the state to MAC80211_LINKED, so we stop * scanning * 2- We are linked and the root uses run iwlist scan. - * So we switch to RTLLIB_LINKED_SCANNING to remember + * So we switch to MAC80211_LINKED_SCANNING to remember * that we are still logically linked (not interested in * new network events, despite for updating the net list, * but we are temporarly 'unlinked' as the driver shall diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index c1d1bf4d720a..be82f0a655e8 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -96,7 +96,7 @@ int rtllib_wx_get_wap(struct rtllib_device *ieee, spin_lock_irqsave(&ieee->lock, flags); =20 if (ieee->link_state !=3D MAC80211_LINKED && - ieee->link_state !=3D RTLLIB_LINKED_SCANNING && + ieee->link_state !=3D MAC80211_LINKED_SCANNING && ieee->wap_set =3D=3D 0) =20 eth_zero_addr(wrqu->ap_addr.sa_data); @@ -185,7 +185,7 @@ int rtllib_wx_get_essid(struct rtllib_device *ieee, str= uct iw_request_info *a, } =20 if (ieee->link_state !=3D MAC80211_LINKED && - ieee->link_state !=3D RTLLIB_LINKED_SCANNING && + ieee->link_state !=3D MAC80211_LINKED_SCANNING && ieee->ssid_set =3D=3D 0) { ret =3D -1; goto out; @@ -323,7 +323,7 @@ void rtllib_wx_sync_scan_wq(void *data) =20 rtllib_stop_all_queues(ieee); rtllib_stop_send_beacons(ieee); - ieee->link_state =3D RTLLIB_LINKED_SCANNING; + ieee->link_state =3D MAC80211_LINKED_SCANNING; ieee->link_change(ieee->dev); /* wait for ps packet to be kicked out successfully */ msleep(50); --=20 2.40.1