From nobody Thu Dec 18 20:23:29 2025 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 F39B8EE14A9 for ; Sat, 9 Sep 2023 18:20:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239230AbjIISUr (ORCPT ); Sat, 9 Sep 2023 14:20:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239043AbjIISUq (ORCPT ); Sat, 9 Sep 2023 14:20:46 -0400 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8644E57 for ; Sat, 9 Sep 2023 11:20:07 -0700 (PDT) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-401314e7838so9061125e9.1 for ; Sat, 09 Sep 2023 11:20:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694283604; x=1694888404; darn=vger.kernel.org; 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=t0GJntv/tr8/Gm4ETuKdQjTd3AzrBQjbaRNLIIDonBY=; b=BJjDzbKNb5SIDFItOlBKEvjY6ltrFHAw9pexxkx/cMFeCYlFHX6zxfdUG5nx6nfAqH c3ErARLMSeILcIHdyAZLsKZKpd+Z4skk/zZUXSgwwA8YQ8LjVv9LlRKaWnwF553qw7/O C0pSLW8rdqugrPI7f3te4vRSvFrAl86ve8fakVevqySq2fDaTgPqOCsamLiimtczxanS DMf/nUFiijbSyJKd7xG8JCOd+myq2poeK8ubHr4CnuhBvFoHbed38KoqZFzmHRslnSxP drvbfg3fivtAzjurh1aOYgR3+dhf81d1u+Qi85eiCZnjQ7db8UcK+H5P7tNvES53W6LS AA4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694283604; x=1694888404; 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=t0GJntv/tr8/Gm4ETuKdQjTd3AzrBQjbaRNLIIDonBY=; b=qlwGi+T2FMUohD8I1ZZ5FuFStV+4zLEvo5tluglUUWjpgnK0imAGPqCKwjmBRUEq+4 Z8/SKytpjdK86o4tvtC+zvcjlWNhWqX5ywXGfitEZIcBVY4l7wKrAraFcTyeYir9jXba LBNvyzsWadFkSOKJTCIcp7rpnAFssNfH7bFkT7W5KaXUzOTfZnXriOP9l/1+Rhou/hx5 jSKIJ0++rFw8JMKNchtC+Y4C1sNwBN30vZQ1WHsAXlxo6UKazIrg0OV2feMQJUHH6+dE JUdfZ3xyJZYA7DELnsA3EY/bUhUEZu4ti9fX+oKOzrL6A+ImtpxgvR3z0GsQ7MIejfu/ QTJg== X-Gm-Message-State: AOJu0YzfiJZAHBXbt23ubyF46hU8Rv7aD21iTJwRIqfNDsqeyuSxUFXs VL87/fGmlPiX69sZFNC+2TE= X-Google-Smtp-Source: AGHT+IGVIBnE+056PTRWKmggLco2irpXki5yrAdaFey/hKmlCTT5C6E0jdbEVHOrytZ5i6374DkO0A== X-Received: by 2002:a5d:654d:0:b0:317:3d36:b2c1 with SMTP id z13-20020a5d654d000000b003173d36b2c1mr4165167wrv.7.1694283604090; Sat, 09 Sep 2023 11:20:04 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id i9-20020a5d5589000000b003141e629cb6sm5330113wrv.101.2023.09.09.11.20.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Sep 2023 11:20:03 -0700 (PDT) Date: Sat, 9 Sep 2023 20:20:02 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5/8] staging: rtl8192e: Use standard function in softmac_mgmt_xmit() Message-ID: 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" Use standard function ieee80211_is_beacon() to avoid proprietary code to identify beacon and to increase readability in softmac_mgmt_xmit() and _rtl92e_translate_rx_signal_stats() Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 58e90b7772ef..8adf53174239 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1584,7 +1584,7 @@ static void _rtl92e_translate_rx_signal_stats(struct = net_device *dev, (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV)); bpacket_toself =3D bpacket_match_bssid && /* check this */ ether_addr_equal(praddr, priv->rtllib->dev->dev_addr); - if (WLAN_FC_GET_FRAMETYPE(fc) =3D=3D RTLLIB_STYPE_BEACON) + if (ieee80211_is_beacon(hdr->frame_ctl)) bPacketBeacon =3D true; _rtl92e_process_phyinfo(priv, tmp_buf, &previous_stats, pstats); _rtl92e_query_rxphystatus(priv, pstats, pdesc, pdrvinfo, diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 95c9f6679d71..7dfb93f0590c 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -459,7 +459,6 @@ enum _REG_PREAMBLE_MODE { #define WLAN_FC_GET_STYPE(fc) ((fc) & RTLLIB_FCTL_STYPE) #define WLAN_FC_MORE_DATA(fc) ((fc) & RTLLIB_FCTL_MOREDATA) =20 -#define WLAN_FC_GET_FRAMETYPE(fc) ((fc) & RTLLIB_FCTL_FRAMETYPE) #define WLAN_GET_SEQ_FRAG(seq) ((seq) & RTLLIB_SCTL_FRAG) #define WLAN_GET_SEQ_SEQ(seq) (((seq) & RTLLIB_SCTL_SEQ) >> 4) =20 diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index de1702491191..5de57331c1cf 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -197,7 +197,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, stru= ct rtllib_device *ieee) /* called with 2nd param 0, no mgmt lock required */ rtllib_sta_wakeup(ieee, 0); =20 - if (le16_to_cpu(header->frame_ctl) =3D=3D RTLLIB_STYPE_BEACON) + if (ieee80211_is_beacon(header->frame_ctl)) tcb_desc->queue_index =3D BEACON_QUEUE; else tcb_desc->queue_index =3D MGNT_QUEUE; --=20 2.41.0