From nobody Mon Dec 29 16:37:01 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 F307CC61DF4 for ; Fri, 24 Nov 2023 21:30:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345742AbjKXVaf (ORCPT ); Fri, 24 Nov 2023 16:30:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231635AbjKXVaZ (ORCPT ); Fri, 24 Nov 2023 16:30:25 -0500 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 6383F1BD2 for ; Fri, 24 Nov 2023 13:30:27 -0800 (PST) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-54373788ec4so551602a12.0 for ; Fri, 24 Nov 2023 13:30:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700861425; x=1701466225; 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=yWJ0nXVb1bOTAnFt8TBwH1+zkjpEMLZEr+/8w0q7iWk=; b=jEbUvEBw2KcIcLVtimgIJ8MmTgXSwMQQgvJa38KmjfXqc4kLOyvIP9Y6fWbZcbRrlc +4s7KsRdtCpUMyCciS//MDfYgvZ1J4b2VTN3wlhU9ifoCY55bPCB+qJNeyRjXRujmg/E toHlXxOxf/kTTijwtvyVB1ReXP7YBSl1FsCOeOQ5ZimG5Vmd930ikXJGCSSPLpIIXWyS mRElomaufGjY03boC5gqpW6ySGPpfPvZDUSsqoD2EsLfnnWJSJSuEVev/EPw44PdJGpz xyjLdWJUbfeWI74wIys0in0ah2yPgkMBExOjXv1Cez3vJ8VFu78cJwRUlx98dZ7zLHo4 xlSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700861425; x=1701466225; 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=yWJ0nXVb1bOTAnFt8TBwH1+zkjpEMLZEr+/8w0q7iWk=; b=gvFVw1/5nKK0se2Y7tHsUu2Xwkgz9vchSD39fAr0ODNBDZrKiO9pRveSsMfKkpoVPo Niby+bdOba3oj/vsVXkamPcPwTrIKFu6eaikb2THHp9EyiGVKQMiA3mbGyMAurW2BlzQ 8gm8cKvH2SIOy596KrcpFo+EjD4VaeYtPxRd+FxY4i7gbmE38PWC+4GxS0qAI1xQd+p/ wsTPP3U/eOI6TRKfk5PMTndDM7MTcmnwXHKThmam72Wb0RY5QTzrFcOlARyKmxQHOBrF cR1TVfhsst6SJlrDQhFSlZjhYTxe5fZVs44iaGjE8dCcscNuqamVJyjj1lOzYPGctFwG cTDg== X-Gm-Message-State: AOJu0Yx0ZuQKt1Ek1YmS5U3FgmoZT5F88ffa8przMZFzDu5XEHWu1x1g cz7a8pSrT1osJ75PXio2A14= X-Google-Smtp-Source: AGHT+IHmiEyndG8fPfAOadU1BbBZ66/E8F65iYc+ddfSmrclkAjyvW2GZQV2LvgeDPSu7oEPl9SBAQ== X-Received: by 2002:a05:6402:f18:b0:54b:1f3:344c with SMTP id i24-20020a0564020f1800b0054b01f3344cmr2177455eda.2.1700861425221; Fri, 24 Nov 2023 13:30:25 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id h14-20020aa7c94e000000b00548a57d4f7bsm2215631edt.36.2023.11.24.13.30.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 13:30:25 -0800 (PST) Date: Fri, 24 Nov 2023 22:30:23 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/8] staging: rtl8192e: Remove unused interrupt for IMR_BcnInt Message-ID: <64a1f672dbe2ed2c6a660fa1044bd058fe3ba91a.1700860758.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" Driver does not support AP Mode therefore no beacons need to be send. Remove unused interrupt for IMR_BcnInt. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 37 ------------------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 3 files changed, 1 insertion(+), 39 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 8fe4c03b19c1..73315a236e76 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1802,7 +1802,7 @@ rtl92e_init_variables(struct net_device *dev) IMR_MGNTDOK | IMR_COMDOK | IMR_HIGHDOK | IMR_BDOK | IMR_RXCMDOK | IMR_TIMEOUT0 | IMR_RDU | IMR_RXFOVW | IMR_TXFOVW | - IMR_BcnInt | IMR_TBDOK | IMR_TBDER); + IMR_TBDOK | IMR_TBDER); =20 priv->bfirst_after_down =3D false; } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index c3466291e221..fc6e8ea039a3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -416,38 +416,6 @@ static int _rtl92e_handle_assoc_response(struct net_de= vice *dev, return 0; } =20 -static void _rtl92e_prepare_beacon(struct tasklet_struct *t) -{ - struct r8192_priv *priv =3D from_tasklet(priv, t, - irq_prepare_beacon_tasklet); - struct net_device *dev =3D priv->rtllib->dev; - struct sk_buff *pskb =3D NULL, *pnewskb =3D NULL; - struct cb_desc *tcb_desc =3D NULL; - struct rtl8192_tx_ring *ring =3D NULL; - struct tx_desc *pdesc =3D NULL; - - ring =3D &priv->tx_ring[BEACON_QUEUE]; - pskb =3D __skb_dequeue(&ring->queue); - kfree_skb(pskb); - - pnewskb =3D rtllib_get_beacon(priv->rtllib); - if (!pnewskb) - return; - - tcb_desc =3D (struct cb_desc *)(pnewskb->cb + 8); - tcb_desc->queue_index =3D BEACON_QUEUE; - tcb_desc->data_rate =3D 2; - tcb_desc->ratr_index =3D 7; - tcb_desc->tx_dis_rate_fallback =3D 1; - tcb_desc->tx_use_drv_assinged_rate =3D 1; - skb_push(pnewskb, priv->rtllib->tx_headroom); - - pdesc =3D &ring->desc[0]; - rtl92e_fill_tx_desc(dev, pdesc, tcb_desc, pnewskb); - __skb_queue_tail(&ring->queue, pnewskb); - pdesc->OWN =3D 1; -} - void rtl92e_config_rate(struct net_device *dev, u16 *rate_config) { struct r8192_priv *priv =3D rtllib_priv(dev); @@ -785,8 +753,6 @@ static void _rtl92e_init_priv_task(struct net_device *d= ev) INIT_DELAYED_WORK(&priv->rtllib->hw_sleep_wq, (void *)rtl92e_hw_sleep_wq); tasklet_setup(&priv->irq_rx_tasklet, _rtl92e_irq_rx_tasklet); tasklet_setup(&priv->irq_tx_tasklet, _rtl92e_irq_tx_tasklet); - tasklet_setup(&priv->irq_prepare_beacon_tasklet, - _rtl92e_prepare_beacon); } =20 static short _rtl92e_get_channel_map(struct net_device *dev) @@ -1810,9 +1776,6 @@ static irqreturn_t _rtl92e_irq(int irq, void *netdev) if (inta & IMR_ROK) tasklet_schedule(&priv->irq_rx_tasklet); =20 - if (inta & IMR_BcnInt) - tasklet_schedule(&priv->irq_prepare_beacon_tasklet); - if (inta & IMR_RDU) { rtl92e_writel(dev, INTA_MASK, rtl92e_readl(dev, INTA_MASK) & ~IMR_RDU); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index e7b331c4661c..846f0f7a737b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -219,7 +219,6 @@ struct r8192_priv { =20 struct tasklet_struct irq_rx_tasklet; struct tasklet_struct irq_tx_tasklet; - struct tasklet_struct irq_prepare_beacon_tasklet; =20 struct mutex wx_mutex; struct mutex rf_mutex; --=20 2.42.0 From nobody Mon Dec 29 16:37:01 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 66DC7C61DF4 for ; Fri, 24 Nov 2023 21:31:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230200AbjKXVbA (ORCPT ); Fri, 24 Nov 2023 16:31:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234686AbjKXVao (ORCPT ); Fri, 24 Nov 2023 16:30:44 -0500 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B18EC1BCD for ; Fri, 24 Nov 2023 13:30:42 -0800 (PST) Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-50ba6881282so148891e87.0 for ; Fri, 24 Nov 2023 13:30:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700861441; x=1701466241; 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=7G27DLDSnr98RUfDdYxVys5pn2qiQC28hb1GX/OMO0I=; b=MabYu45wjiDBq4byElOD5vzbuPvynSuopzPPa42V4xYNkyse2nj2y0YRrMH1oiw1TK iqUHvlDKVTzkrvvfuSRrVOsfb1chQMZOUyumG/qu8nE9KSjDTcQwUp14NjNMmMmit2RI Cvgv4f8FMegFf2Ekg01vd2AOmbKwQ5x8iIy5tuWb4pa30mFlv4SiHiv5ebU4+xelVn2j E+caj/0gT9sulh0/zk6Hx5A/TSoFrxflT8tH6iD6DIL+8UgIx6AE4vV0mfnioE3zATlB rdY12p4UaJFhiP7UCugYPg+fsej/xO1ZMQFJIOUpNA2yqXnMOljbBe0lnhExkGgCQcF6 Ikxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700861441; x=1701466241; 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=7G27DLDSnr98RUfDdYxVys5pn2qiQC28hb1GX/OMO0I=; b=S4hs5B9r6juA7w2kGyppnhEOJOE/WkruBUjQYzK6mATFt1uZ6SLWgLw3RDJrZDYzGS VntthGNmbFrIFGeuabyfcdqBfXR3agmgbJcDfge73gBdCgY2UsQZ4ucTBJ/8adQZLnbF o5onzufIWf+izHPf6kkO7Htk03IsZJ5YDB6A35y4kKLPbccI3Q51vR5OwaCQ2jG8iGOt 09BMkkS+ZVCMo2jIXzNGdYAa4QYpjMt7qMDVpJ2x7FMukvVW5J73n4aENR+ntGNV+jrD 476XY3GIXrqZEbGpZ6nNtNq2zNgWCTuJF/QsfjQlEEVH2tt3qRzXkZuBQpifx0Ubyyj+ BIYw== X-Gm-Message-State: AOJu0Yz3257uxFwmzLWURAd5Og359cT/5Db/06Iy94jUrYDJNBt5nvuO KtmLv5QbptJKoRZrDzAN6Nc= X-Google-Smtp-Source: AGHT+IFlYdG7tyeIYbb8Y7pITwOO+/AGFM093dRsUC8/YvjlAYnA3fBVfLMrwtAQKK6QP0i2QzzMKQ== X-Received: by 2002:a05:6512:3b0a:b0:507:b1b8:cf0a with SMTP id f10-20020a0565123b0a00b00507b1b8cf0amr2922142lfv.3.1700861440913; Fri, 24 Nov 2023 13:30:40 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id x22-20020a170906135600b009efe6fdf615sm2519712ejb.150.2023.11.24.13.30.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 13:30:40 -0800 (PST) Date: Fri, 24 Nov 2023 22:30:39 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/8] staging: rtl8192e: Remove unused function rtllib_get_beacon() 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" Remove unused function rtllib_get_beacon(). Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 21 --------------------- 2 files changed, 22 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 5d6563d12480..835b407ab180 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1693,7 +1693,6 @@ void rtllib_softmac_start_protocol(struct rtllib_devi= ce *ieee); void rtllib_reset_queue(struct rtllib_device *ieee); void rtllib_wake_all_queues(struct rtllib_device *ieee); void rtllib_stop_all_queues(struct rtllib_device *ieee); -struct sk_buff *rtllib_get_beacon(struct rtllib_device *ieee); =20 void notify_wx_assoc_event(struct rtllib_device *ieee); void rtllib_ps_tx_ack(struct rtllib_device *ieee, short success); diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 2ce4f64f88f6..0ad08165fd85 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2180,27 +2180,6 @@ static struct sk_buff *rtllib_get_beacon_(struct rtl= lib_device *ieee) return skb; } =20 -struct sk_buff *rtllib_get_beacon(struct rtllib_device *ieee) -{ - struct sk_buff *skb; - struct rtllib_probe_response *b; - - skb =3D rtllib_get_beacon_(ieee); - if (!skb) - return NULL; - - b =3D (struct rtllib_probe_response *)skb->data; - b->header.seq_ctrl =3D cpu_to_le16(ieee->seq_ctrl[0] << 4); - - if (ieee->seq_ctrl[0] =3D=3D 0xFFF) - ieee->seq_ctrl[0] =3D 0; - else - ieee->seq_ctrl[0]++; - - return skb; -} -EXPORT_SYMBOL(rtllib_get_beacon); - void rtllib_softmac_stop_protocol(struct rtllib_device *ieee) { rtllib_stop_scan_syncro(ieee); --=20 2.42.0 From nobody Mon Dec 29 16:37:01 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 3AB0CC61D97 for ; Fri, 24 Nov 2023 21:38:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230027AbjKXViG (ORCPT ); Fri, 24 Nov 2023 16:38:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229694AbjKXViE (ORCPT ); Fri, 24 Nov 2023 16:38:04 -0500 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 377E91FD6 for ; Fri, 24 Nov 2023 13:30:51 -0800 (PST) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-9fd893c2938so56326066b.0 for ; Fri, 24 Nov 2023 13:30:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700861449; x=1701466249; 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=xoZLCfy84gUYPbI3uqvkOab7elap9QZSeyk50KS8zLU=; b=RYFObA12SH+viD2hfgeT2rajpsyLoz71cSJrdfWLky9afIOEP3Cp5XJki8Aoi7fdoj rTk/hQqe1vi4XVAj3A80LNqrMsFj1Ud5UEESYS2kyy8hF9/X2H/gW/k6VRjK5WKlh26O Q7rLzXoe838JoIkNpyL0nKdwS22KBllH0uJfiit0DqFQ6RZO6Gc9/NaJ9QkaGxJz1jb+ keeA+y08UgMMaFlpOdFsAKN7a4/B3ppEzTEjogLsnOl3P/hu4x3hlHzYKK3KfRrtAaqO Bflo+KbWbK96pMTGGVg2BSwXbPvfIXkaIC/iWHzIS+NLj4xuh6NZwLZ7mQ4tY6ucpLSq UpEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700861449; x=1701466249; 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=xoZLCfy84gUYPbI3uqvkOab7elap9QZSeyk50KS8zLU=; b=NmMMyQBZ13pCy1xfl447K8Il+HvOyqPiaOO1cYPCWBVHPmYErdIV26dLmFunbaZw9H B740FnaYtU2BNjA2tRWxmCcqQf6CRLBUk7e9IlAalkPHzhRdRiIy4f/zBhWZ4lLNi7kY gdwTAqXu9nfzkrFlR7haUwaOQ9knEWv4Rz96QnlfbosqwscoYIqdZ3ogE4633fwRmaMi XBtVZPb6eON0eDq/Q4zBhFxqk5s53SqsFoWQf63DAENmkEOr2bU2+H5SVHf+oRfaadcn dKpIOLc23ld6TbUvmTyTF9kBEccl/w2HmoKZuKVUSH9Y5NYO0IFh8EeW7t66iI4D7HXd YjnA== X-Gm-Message-State: AOJu0Yw3FbAfWFjNKSuL4nbjYLJmrRGzlJwmEIP5ZjbUz4S0WBq7LNLo lUZyvUxAxG0C/YhPVxz+Ngs= X-Google-Smtp-Source: AGHT+IExYU05LokiyAqdqqUl1BXlu3JcZIXnjwyodpQNEFEEwHrckfNTeYD3GXE+m1aWcsGb3gIwHA== X-Received: by 2002:a17:907:b00f:b0:9b2:bf2d:6b65 with SMTP id fu15-20020a170907b00f00b009b2bf2d6b65mr2305143ejc.4.1700861449489; Fri, 24 Nov 2023 13:30:49 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id bv8-20020a170906b1c800b009fc927023bcsm2527152ejb.34.2023.11.24.13.30.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 13:30:49 -0800 (PST) Date: Fri, 24 Nov 2023 22:30:47 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/8] staging: rtl8192e: Remove unused timer beacon_timer 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" Driver does not support AP Mode therefore no beacons need to be send. Remove unused timer beacon_timer. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 17 ----------------- 2 files changed, 18 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 835b407ab180..b7f4d7e2ea26 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1418,7 +1418,6 @@ struct rtllib_device { struct timer_list associate_timer; =20 /* used if IEEE_SOFTMAC_BEACONS is set */ - struct timer_list beacon_timer; u8 need_sw_enc; struct work_struct associate_complete_wq; struct work_struct ips_leave_wq; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 0ad08165fd85..430951c88123 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -365,21 +365,6 @@ static void rtllib_send_beacon(struct rtllib_device *i= eee) softmac_mgmt_xmit(skb, ieee); ieee->softmac_stats.tx_beacons++; } - - if (ieee->beacon_txing && ieee->ieee_up) - mod_timer(&ieee->beacon_timer, jiffies + - (msecs_to_jiffies(ieee->current_network.beacon_interval - 5))); -} - -static void rtllib_send_beacon_cb(struct timer_list *t) -{ - struct rtllib_device *ieee =3D - from_timer(ieee, t, beacon_timer); - unsigned long flags; - - spin_lock_irqsave(&ieee->beacon_lock, flags); - rtllib_send_beacon(ieee); - spin_unlock_irqrestore(&ieee->beacon_lock, flags); } =20 /* Enables network monitor mode, all rx packets will be received. */ @@ -2328,8 +2313,6 @@ int rtllib_softmac_init(struct rtllib_device *ieee) =20 timer_setup(&ieee->associate_timer, rtllib_associate_abort_cb, 0); =20 - timer_setup(&ieee->beacon_timer, rtllib_send_beacon_cb, 0); - INIT_DELAYED_WORK(&ieee->link_change_wq, (void *)rtllib_link_change_wq); INIT_WORK(&ieee->associate_complete_wq, (void *)rtllib_associate_complete= _wq); INIT_DELAYED_WORK(&ieee->associate_procedure_wq, (void *)rtllib_associate= _procedure_wq); --=20 2.42.0 From nobody Mon Dec 29 16:37:01 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 CC5D7C61DF4 for ; Fri, 24 Nov 2023 21:31:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229611AbjKXVbR (ORCPT ); Fri, 24 Nov 2023 16:31:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233005AbjKXVa6 (ORCPT ); Fri, 24 Nov 2023 16:30:58 -0500 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 981D519A6 for ; Fri, 24 Nov 2023 13:31:04 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9fdf7baabd9so72457266b.1 for ; Fri, 24 Nov 2023 13:31:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700861463; x=1701466263; 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=Xf+BvI0HCoud7UZk/jd1+lnn/zb5QtR4nqSkftIg4Lc=; b=PXvrEAj3Qz8EmASthMqKBA/YnPfHbLZYh+HGfKdmJCROJUcAhCLZnKhDBwT2DDVI0Z A5N7Np5adrGYFLtSe8q3Ah8q+otz7YmAEM5Kmt7GnnZ8YxKb7gC4uxQpC4vjRJV1ovOW gVXii4mWNxcgUPTE+lmZTcKNrYnxRTselB3Lg7Lp8jXwu3Y7M5f5qGIlPTyomF7oOS/i QERI7tbVg5+C9B21gicw+eVgdsy4FgysXau/8KOmdeqnmdLu9WGxM+dr5MCPxuKwL1XS OjXkLf6+KpvFIBHIZNrQ/jKXv0LQ2iLHcFjXJKiKRvBU0X7dtsNkxAQi54wAisG9enwB sYeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700861463; x=1701466263; 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=Xf+BvI0HCoud7UZk/jd1+lnn/zb5QtR4nqSkftIg4Lc=; b=N/WEALV4Gp3MKIiRO1mnWxux6LcQf71N5edn0lKDyfFf2Apb1xIBXChDAjOV/rqA2i T0DPPTPBEdpVfyPrJcT539BxXNmI33jXZj+DVw4ihbK84JJ3stwolB6QF+1+bcW2CwcS /+Sqs4PdLgLQIOTY6Jv4aufGMmzvozGhdwCNZA47bce8ElUU17J2h03TgSkjStXXHR2G FJJSf04O5CVmVQL6XrM3K5jbPxtGFZq8GOJjqX05PZ/YptOQoYQny2fRvIozrGXuG3lM RUb+l4YYK7U8nF+1kKDc8pMRTd1i9OhuYSTsUW0PTyFDRpwAa8sHk4jUTAETxJuQpzXc yMog== X-Gm-Message-State: AOJu0Yy54eOi04XGtb72uOs9iNkhDtxPAoIxwGAg+F8a/IqyzSyzvcRp 7w9Rj3s/ayDZcwlyZmKPdSk= X-Google-Smtp-Source: AGHT+IHK17C1vO9U+6o18kae1SZLjDwGP/MMYNJWQnBOz67HwUmYH5p5n4LeoSWvCS+SdGOSsC5/KA== X-Received: by 2002:a17:906:5812:b0:a01:97e6:6771 with SMTP id m18-20020a170906581200b00a0197e66771mr3351041ejq.0.1700861463124; Fri, 24 Nov 2023 13:31:03 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id lv20-20020a170906bc9400b0098884f86e41sm2499299ejb.123.2023.11.24.13.31.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 13:31:02 -0800 (PST) Date: Fri, 24 Nov 2023 22:31:01 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/8] staging: rtl8192e: Remove unused function rtllib_send_beacon() 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" Remove unused function rtllib_send_beacon(). Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib_softmac.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 430951c88123..4e33a453f86e 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -351,22 +351,6 @@ static inline struct sk_buff *rtllib_probe_req(struct = rtllib_device *ieee) return skb; } =20 -static struct sk_buff *rtllib_get_beacon_(struct rtllib_device *ieee); - -static void rtllib_send_beacon(struct rtllib_device *ieee) -{ - struct sk_buff *skb; - - if (!ieee->ieee_up) - return; - skb =3D rtllib_get_beacon_(ieee); - - if (skb) { - softmac_mgmt_xmit(skb, ieee); - ieee->softmac_stats.tx_beacons++; - } -} - /* Enables network monitor mode, all rx packets will be received. */ void rtllib_EnableNetMonitorMode(struct net_device *dev, bool bInitState) --=20 2.42.0 From nobody Mon Dec 29 16:37:01 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 26281C61DF4 for ; Fri, 24 Nov 2023 21:31:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232693AbjKXVbY (ORCPT ); Fri, 24 Nov 2023 16:31:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231635AbjKXVbG (ORCPT ); Fri, 24 Nov 2023 16:31:06 -0500 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBC771BE7 for ; Fri, 24 Nov 2023 13:31:11 -0800 (PST) Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2c99593d13aso314961fa.0 for ; Fri, 24 Nov 2023 13:31:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700861470; x=1701466270; 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=lucCRVdFyECgtyRqDncojEzhqXxZuxdPkU1gxZh8Hdk=; b=LOnPrhxf97KA8njuQyb4D3o7Jj3FvjANsXmW/2m5EukFafvtxrAzbNOiv+wD01gUJT O/hBR6zQqe4h2VKow35CtqRx7sRVrHd0aKGUxl+39XJQfSqh9MZtsv9c2MeRanjs+i1M h7SWL2inVvgnUMXLMlkBCXhNKtoBTQjYN5uUtj+TxMMsJWNjqVfGjAEN0eo9AQ4BSr+b 6F/sXqIE3GZGQ7URfwcsLypntKjtyOAk7fqEV6Vfr2WJoNmaOeUMs8oss6wBG2OMDHPd poUCn96ehf31EqbCyhQyNxgUJgpfh9TToNws/Rk0KcBOufH6Clp3A91Aba7Ie9QNGhS/ n1Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700861470; x=1701466270; 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=lucCRVdFyECgtyRqDncojEzhqXxZuxdPkU1gxZh8Hdk=; b=iyQ2ZgYUAdwO38MchEkGUp8QEf6Eodn3nXYduwtXedA9rt8NrTJt/lca4ul+r77HGO j767YS3G3he5e0DXs6iP+MhDzFzoLBI13OWUR0zzMUCoBrJd9OcDccm1T9gTVWmOjQS+ 15fnjlSEfO4FmZJ/EUGK6RVP9h3ygrLo+eAdD6qKvw2KeT85NK2vSBaCpA2eJO3apHeX MxgsKioNShV8PTBIufwWKOIao67GGP+pEjlHOu5ILPr0lJPAedxNWc9MOHZ/B/HMTuqu 6vGYSwGQmSYcN5tXeDGRsoJz4yM6t+Uy+iFZpExuiSriWbybIU8Uf47bs0E3HwWKEYGb lwFw== X-Gm-Message-State: AOJu0YxCk43J9UTrT6SklziMB4hguOe3LN1Qo6lLJlvAtXmRQMEXr4cm u7qi4pzZo1wtd5p2pUz2tQ0= X-Google-Smtp-Source: AGHT+IEGC+FkWool5xrxMKIxPHFJxPbScb7nXCa1f+4jiux3ltzhvrqQmA0uEENYkpc9LpAwkhCweQ== X-Received: by 2002:a2e:150e:0:b0:2c8:3406:6641 with SMTP id s14-20020a2e150e000000b002c834066641mr2393867ljd.1.1700861469951; Fri, 24 Nov 2023 13:31:09 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id si12-20020a170906cecc00b009fca9f39e98sm2538605ejb.26.2023.11.24.13.31.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 13:31:09 -0800 (PST) Date: Fri, 24 Nov 2023 22:31:08 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5/8] staging: rtl8192e: Remove unused function rtllib_get_beacon_() 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" Remove unused function rtllib_get_beacon_(). Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib_softmac.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 4e33a453f86e..8c7ad56d4402 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2130,25 +2130,6 @@ static void rtllib_associate_retry_wq(void *data) mutex_unlock(&ieee->wx_mutex); } =20 -static struct sk_buff *rtllib_get_beacon_(struct rtllib_device *ieee) -{ - static const u8 broadcast_addr[] =3D { - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff - }; - struct sk_buff *skb; - struct rtllib_probe_response *b; - - skb =3D rtllib_probe_resp(ieee, broadcast_addr); - - if (!skb) - return NULL; - - b =3D (struct rtllib_probe_response *)skb->data; - b->header.frame_control =3D cpu_to_le16(IEEE80211_STYPE_BEACON); - - return skb; -} - void rtllib_softmac_stop_protocol(struct rtllib_device *ieee) { rtllib_stop_scan_syncro(ieee); --=20 2.42.0 From nobody Mon Dec 29 16:37:01 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 61D4AC61DF4 for ; Fri, 24 Nov 2023 21:31:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231584AbjKXVba (ORCPT ); Fri, 24 Nov 2023 16:31:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231548AbjKXVbM (ORCPT ); Fri, 24 Nov 2023 16:31:12 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54A9A19A8 for ; Fri, 24 Nov 2023 13:31:18 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-54b0a9fffa4so136783a12.1 for ; Fri, 24 Nov 2023 13:31:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700861477; x=1701466277; 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=DyqSTfLJlN88c/SvS3E14EIDuuTHtFX/UzdV/6o/zM8=; b=fSz+fgv+tnNu0ccBgF/J879ETncvu3OP3h+5TTOOfTsCHER4SJJR2MbLilMAuG/7Lh Ip4NYLbHLVLFzgl/n9QBfXyaOTA1ZlZXjGwtMNO6bqZ1J2WP6U1P3gFEz2a36U7fMLmS AwB3n9zdXMLMMw1XR5sI4b4mKU8uyw6lOIwI1TZLrlO4C12W8CPca4o98uSnidEJB5GK YneT5bMMD6/Yi8g60/jQCNv0XuvjshTZT5bt3eDn28YMf1ZEzPR+aT3eGIWuMGgmmjuf VHYilc1N+hlkYImK6cf9aFQciO2XfmM0QhETOdOYn50p4+wO/iKWU+v8sjoXQjQDzHGq yykg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700861477; x=1701466277; 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=DyqSTfLJlN88c/SvS3E14EIDuuTHtFX/UzdV/6o/zM8=; b=T7UnuNjjUVOplVqG46+panWu+/CHv1FQlEGECjMysUb2Eu8K3kKiFtfTgiX7O+s121 H2iCZv7XuerbkEwRSwQOLazUDBW6wakE/ZQbogY2PELyxEZyeZdB20WaC7IgP+AzJ4j9 lqpZ776ylHVxBWEqJq421wXsxmxdi/S9uzNjT1U9D1BPmILFrpEDCjRdsczboWNBomNx eDG9rLfI8ksZ50xYTZXKvQghx3fY+si2eDCztNCyLlZQJo5uCYxYEZDN3VDNAD8LR75T psKwxFt0UY1gi+EGzWKKkZqCQwsNyM+riKiWNSTlvA7cMZx+8etZ4lVHz2iZgHlarAjb ZrVQ== X-Gm-Message-State: AOJu0YwEUHkOqNXoM5vrTO91oI1LRlpwcbq9tj02vtrPPHHkEP6qgZ2/ hMhevVO067ktrjmi7acabfQ= X-Google-Smtp-Source: AGHT+IHrHPi58qXc5j3ILPT28jROxOczly3sw4sv0zRu2cJGZpENgvHS5Q9O1WF07W3ItU9Ud4N6BA== X-Received: by 2002:a05:6402:17db:b0:542:1ba5:68a4 with SMTP id s27-20020a05640217db00b005421ba568a4mr2990119edy.1.1700861476770; Fri, 24 Nov 2023 13:31:16 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id t24-20020aa7d718000000b0053ff311f388sm2196289edq.23.2023.11.24.13.31.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 13:31:16 -0800 (PST) Date: Fri, 24 Nov 2023 22:31:15 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 6/8] staging: rtl8192e: Remove unused function rtllib_probe_resp() 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" Remove unused function rtllib_probe_resp(). Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib_softmac.c | 146 ---------------------- 1 file changed, 146 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 8c7ad56d4402..d20970652432 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -632,152 +632,6 @@ rtllib_authentication_req(struct rtllib_network *beac= on, return skb; } =20 -static struct sk_buff *rtllib_probe_resp(struct rtllib_device *ieee, - const u8 *dest) -{ - u8 *tag; - int beacon_size; - struct rtllib_probe_response *beacon_buf; - struct sk_buff *skb =3D NULL; - int encrypt; - int atim_len, erp_len; - struct lib80211_crypt_data *crypt; - - char *ssid =3D ieee->current_network.ssid; - int ssid_len =3D ieee->current_network.ssid_len; - int rate_len =3D ieee->current_network.rates_len + 2; - int rate_ex_len =3D ieee->current_network.rates_ex_len; - int wpa_ie_len =3D ieee->wpa_ie_len; - u8 erpinfo_content =3D 0; - - u8 *tmp_ht_cap_buf =3D NULL; - u8 tmp_ht_cap_len =3D 0; - u8 *tmp_ht_info_buf =3D NULL; - u8 tmp_ht_info_len =3D 0; - struct rt_hi_throughput *ht_info =3D ieee->ht_info; - u8 *tmp_generic_ie_buf =3D NULL; - u8 tmp_generic_ie_len =3D 0; - - if (rate_ex_len > 0) - rate_ex_len +=3D 2; - - if (ieee->current_network.capability & WLAN_CAPABILITY_IBSS) - atim_len =3D 4; - else - atim_len =3D 0; - - if ((ieee->current_network.mode =3D=3D WIRELESS_MODE_G) || - (ieee->current_network.mode =3D=3D WIRELESS_MODE_N_24G && - ieee->ht_info->bCurSuppCCK)) { - erp_len =3D 3; - erpinfo_content =3D 0; - if (ieee->current_network.buseprotection) - erpinfo_content |=3D ERP_UseProtection; - } else { - erp_len =3D 0; - } - - crypt =3D ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx]; - encrypt =3D crypt && crypt->ops && - ((strcmp(crypt->ops->name, "R-WEP") =3D=3D 0 || wpa_ie_len)); - if (ieee->ht_info->current_ht_support) { - tmp_ht_cap_buf =3D (u8 *)&(ieee->ht_info->SelfHTCap); - tmp_ht_cap_len =3D sizeof(ieee->ht_info->SelfHTCap); - tmp_ht_info_buf =3D (u8 *)&(ieee->ht_info->SelfHTInfo); - tmp_ht_info_len =3D sizeof(ieee->ht_info->SelfHTInfo); - HTConstructCapabilityElement(ieee, tmp_ht_cap_buf, - &tmp_ht_cap_len, encrypt, false); - HTConstructInfoElement(ieee, tmp_ht_info_buf, &tmp_ht_info_len, - encrypt); - - if (ht_info->reg_rt2rt_aggregation) { - tmp_generic_ie_buf =3D ieee->ht_info->sz_rt2rt_agg_buf; - tmp_generic_ie_len =3D - sizeof(ieee->ht_info->sz_rt2rt_agg_buf); - HTConstructRT2RTAggElement(ieee, tmp_generic_ie_buf, - &tmp_generic_ie_len); - } - } - - beacon_size =3D sizeof(struct rtllib_probe_response) + 2 + - ssid_len + 3 + rate_len + rate_ex_len + atim_len + erp_len - + wpa_ie_len + ieee->tx_headroom; - skb =3D dev_alloc_skb(beacon_size); - if (!skb) - return NULL; - - skb_reserve(skb, ieee->tx_headroom); - - beacon_buf =3D skb_put(skb, (beacon_size - ieee->tx_headroom)); - ether_addr_copy(beacon_buf->header.addr1, dest); - ether_addr_copy(beacon_buf->header.addr2, ieee->dev->dev_addr); - ether_addr_copy(beacon_buf->header.addr3, ieee->current_network.bssid); - - beacon_buf->header.duration_id =3D 0; - beacon_buf->beacon_interval =3D - cpu_to_le16(ieee->current_network.beacon_interval); - beacon_buf->capability =3D - cpu_to_le16(ieee->current_network.capability & - WLAN_CAPABILITY_IBSS); - beacon_buf->capability |=3D - cpu_to_le16(ieee->current_network.capability & - WLAN_CAPABILITY_SHORT_PREAMBLE); - - if (ieee->current_network.capability & WLAN_CAPABILITY_SHORT_SLOT_TIME) - beacon_buf->capability |=3D - cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME); - - crypt =3D ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx]; - if (encrypt) - beacon_buf->capability |=3D cpu_to_le16(WLAN_CAPABILITY_PRIVACY); - - beacon_buf->header.frame_control =3D cpu_to_le16(IEEE80211_STYPE_PROBE_RE= SP); - beacon_buf->info_element[0].id =3D MFIE_TYPE_SSID; - beacon_buf->info_element[0].len =3D ssid_len; - - tag =3D (u8 *)beacon_buf->info_element[0].data; - - memcpy(tag, ssid, ssid_len); - - tag +=3D ssid_len; - - *(tag++) =3D MFIE_TYPE_RATES; - *(tag++) =3D rate_len - 2; - memcpy(tag, ieee->current_network.rates, rate_len - 2); - tag +=3D rate_len - 2; - - *(tag++) =3D MFIE_TYPE_DS_SET; - *(tag++) =3D 1; - *(tag++) =3D ieee->current_network.channel; - - if (atim_len) { - u16 val16; - *(tag++) =3D MFIE_TYPE_IBSS_SET; - *(tag++) =3D 2; - val16 =3D ieee->current_network.atim_window; - memcpy((u8 *)tag, (u8 *)&val16, 2); - tag +=3D 2; - } - - if (erp_len) { - *(tag++) =3D MFIE_TYPE_ERP; - *(tag++) =3D 1; - *(tag++) =3D erpinfo_content; - } - if (rate_ex_len) { - *(tag++) =3D MFIE_TYPE_RATES_EX; - *(tag++) =3D rate_ex_len - 2; - memcpy(tag, ieee->current_network.rates_ex, rate_ex_len - 2); - tag +=3D rate_ex_len - 2; - } - - if (wpa_ie_len) { - memcpy(tag, ieee->wpa_ie, ieee->wpa_ie_len); - tag +=3D ieee->wpa_ie_len; - } - return skb; -} - static struct sk_buff *rtllib_null_func(struct rtllib_device *ieee, short = pwr) { struct sk_buff *skb; --=20 2.42.0 From nobody Mon Dec 29 16:37:01 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 197B1C61D97 for ; Fri, 24 Nov 2023 21:31:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235218AbjKXVbf (ORCPT ); Fri, 24 Nov 2023 16:31:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229557AbjKXVbS (ORCPT ); Fri, 24 Nov 2023 16:31:18 -0500 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2F4819BC for ; Fri, 24 Nov 2023 13:31:24 -0800 (PST) Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-5491de618b2so688475a12.1 for ; Fri, 24 Nov 2023 13:31:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700861483; x=1701466283; 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=dob4ueyHhx+j/dqC0hM3DyfpnYphHI049VubfpO8Pec=; b=LhPUbYMwqqksET4UFhw6IoqcKNIBfEFPPKOPBQ9fkG5JIYKBn96BO2k2+egCXBffOs 4r70s5aK5I+ur1pV/Jg7usjMcblHY5zNRBXWPL1QWaptMeqgFmcHPdNKuyax7eEvRfYS RczymEq6mw3e8EbpbZ4sxIDxuSjUBkVH55YMiqRuqHa5yvx1DfTSPl8t1PwdLv+zF9lS iZFSD6BlOZEbYfIe1s+Avl+JnukQxkPlpwxF394b3pg9lkrMKMyJn0g/BPR2putt1Msk U3PEklq7Jrr5ydIZ39wzB82NH/wHWnQNFFqdUmhF99qg2bhzsMR1WbbR2PsHEnRgBGgo 9tJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700861483; x=1701466283; 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=dob4ueyHhx+j/dqC0hM3DyfpnYphHI049VubfpO8Pec=; b=xMrW41bwieMvjyOu2TmcAfjafGYxRsOS42w9JF+o/oJ9T78N0Hp21PHUHdLur/fVlY 75YUCQIpfrlY09HAlbfPH7v2W3Ou1oQCQ3uhc3qpJQVdWMoUvut5+F1a5AcgrreOhoY4 4ZgZLLk01J6z7WtWPlgiwwwgKWTBNl9FAeQ7+j31g+WQICeVwxS6DJmqYV87A4mFLVhW Lzuu2qE6SzDspql8ixbyYFL0+hQUPOWhinxCnDQ+WIdI72sO66cHyqI+K8NqNig71zUK IdnMg7Jbc453WT+CRdHGO4Ctqa5TPL2BJBbdt71Luq0aY0Nns7moUnm10y/qg5aZqvSA X/aA== X-Gm-Message-State: AOJu0Yz8GapR7Tq8pYOQaKmaKVO0l7xmWxiAcyWQCzKZgoQvGrk56z2H CRbHQjkKWC0663TAmhjwmqk= X-Google-Smtp-Source: AGHT+IE+QY80vtVsrteuoXEgHjoIDKq5TSlxlerFbuFhWGXd4HlAsRT1ffDgjkTb8zvZWldBQgXRiQ== X-Received: by 2002:a17:906:3948:b0:a01:ee03:37ec with SMTP id g8-20020a170906394800b00a01ee0337ecmr2983066eje.3.1700861483322; Fri, 24 Nov 2023 13:31:23 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id lo20-20020a170906fa1400b00a041474d13esm2492176ejb.127.2023.11.24.13.31.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 13:31:23 -0800 (PST) Date: Fri, 24 Nov 2023 22:31:21 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 7/8] staging: rtl8192e: Remove unused function HTConstructInfoElement() 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" Remove unused function HTConstructInfoElement(). Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_HTProc.c | 16 ---------------- drivers/staging/rtl8192e/rtllib.h | 2 -- 2 files changed, 18 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index da4cf6f25794..00273d709f3c 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -328,22 +328,6 @@ void HTConstructCapabilityElement(struct rtllib_device= *ieee, u8 *posHTCap, } } =20 -void HTConstructInfoElement(struct rtllib_device *ieee, u8 *posHTInfo, - u8 *len, u8 IsEncrypt) -{ - struct ht_info_ele *pHTInfoEle =3D (struct ht_info_ele *)posHTInfo; - - if (!posHTInfo || !pHTInfoEle) { - netdev_warn(ieee->dev, - "%s(): posHTInfo and pHTInfoEle are null\n", - __func__); - return; - } - - memset(posHTInfo, 0, *len); - *len =3D 0; -} - void HTConstructRT2RTAggElement(struct rtllib_device *ieee, u8 *posRT2RTAg= g, u8 *len) { diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index b7f4d7e2ea26..04433c79b3a7 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1760,8 +1760,6 @@ void ht_update_default_setting(struct rtllib_device *= ieee); void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap, u8 *len, u8 isEncrypt, bool bAssoc); -void HTConstructInfoElement(struct rtllib_device *ieee, - u8 *posHTInfo, u8 *len, u8 isEncrypt); void HTConstructRT2RTAggElement(struct rtllib_device *ieee, u8 *posRT2RTAgg, u8 *len); void HTOnAssocRsp(struct rtllib_device *ieee); --=20 2.42.0 From nobody Mon Dec 29 16:37:01 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 72A3BC61D97 for ; Fri, 24 Nov 2023 21:31:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235326AbjKXVbk (ORCPT ); Fri, 24 Nov 2023 16:31:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231401AbjKXVbZ (ORCPT ); Fri, 24 Nov 2023 16:31:25 -0500 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 729C81BC2 for ; Fri, 24 Nov 2023 13:31:31 -0800 (PST) Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2c6eac9c053so6350781fa.1 for ; Fri, 24 Nov 2023 13:31:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700861490; x=1701466290; 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=5S0oIQteEFtVA6f+wDuOWRlecjAASZc+RJVV85sdBg0=; b=ImQmAFP6rh2xDcUyAy+O9RqE7xvNfPGkx1dQdy959KPMGrs3nEtOmsgAG5Tx6lGbi9 PbWhe3zfdDZmEkRT2u6VNmLfUw78CUJU100yL6TSADavBVWpHElRNzd0i35jhj38SqdD ZA2XzUpGjBMB71O4Mm+Hdggz9HNGocJtJqKA4EitORE7r683/XWkmcVHCVpkrTot62so l7Sv1ttN/RpKaWnc2pKCg9PtEh/J8bxbGaJ4rbMTXUgUWawxEb8KcQ3GTML8w80CeT3P F/sVcvOwme+UBywcAmZMGIHON4GqgulPUKlsu83/y4kevEBudcxBT19EAFZZlHlC5w0R IGwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700861490; x=1701466290; 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=5S0oIQteEFtVA6f+wDuOWRlecjAASZc+RJVV85sdBg0=; b=GizhyAzzH3jzEaRMNr4/i8OzQOCj/xbw538Vw65O8mhOw8KkCiDa9ITlBYjznE3Lh3 uuCgzTKLSuj3D9akvNbUomAHz65Tm/4MD3Xtp16bFFkJPcHUPTh6IqBnVgC61S/42+Z7 mogsxPaWtOLdWlVSpb3Sdn9FH2UlVHM0LncQQwkBFvC9rpa/v+MVlJes/x9ondlbZmLw LfAGZ+L6Wm0v9280a9fc17i6yZ4dV5ZrD39QFu9C6UslVsxOfngR1SaAAIKD6IN/MNg6 Az2OQf2Ir7/FabDj/fKv3ZRSA5L/hCVErXoiF1opc12VJy/kZRYNrL+vkBNsTosR1Mxh Ly7g== X-Gm-Message-State: AOJu0YzQV/taTe4cOFbp1Mi9myh+4hrslVtixu7DWDCBBuSheDidmXUg ReXSGyYO0M95MdCO7o/A0Hg= X-Google-Smtp-Source: AGHT+IHCMYkJ56jgpiXcuQzCkqn39XC5UUuL6jWvl9alMVa9XQgIMxx3I9bsJ/oaKaBkbt/GItZ3lg== X-Received: by 2002:a2e:5301:0:b0:2c5:2d06:cade with SMTP id h1-20020a2e5301000000b002c52d06cademr2556856ljb.2.1700861489325; Fri, 24 Nov 2023 13:31:29 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id k9-20020a170906578900b009fee12d0dcdsm2564669ejq.15.2023.11.24.13.31.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 13:31:29 -0800 (PST) Date: Fri, 24 Nov 2023 22:31:27 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 8/8] staging: rtl8192e: Remove function rtl92e_update_rx_pkt_timestamp() Message-ID: <89a21fa17b32d66e07514bfad5b604d5d4835e25.1700860759.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" mac_time and last_rx_desc_tsf are only used in rtl92e_update_rx_pkt_timestamp(). Depending on a condition one is equal to the other or vice versa. But since those are not used anywhere else the function rtl92e_update_rx_pkt_timestamp() is just dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 -- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 11 ----------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 ---- drivers/staging/rtl8192e/rtllib.h | 1 - 4 files changed, 18 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 73315a236e76..13e3f26279aa 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1673,8 +1673,6 @@ bool rtl92e_get_rx_stats(struct net_device *dev, stru= ct rtllib_rx_stats *stats, stats->TimeStampLow =3D pDrvInfo->TSFL; stats->TimeStampHigh =3D rtl92e_readl(dev, TSFR + 4); =20 - rtl92e_update_rx_pkt_timestamp(dev, stats); - if ((stats->RxBufShift + stats->RxDrvInfoSize) > 0) stats->bShift =3D 1; =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index fc6e8ea039a3..bad34221d8b7 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1433,17 +1433,6 @@ void rtl92e_reset_desc_ring(struct net_device *dev) spin_unlock_irqrestore(&priv->irq_th_lock, flags); } =20 -void rtl92e_update_rx_pkt_timestamp(struct net_device *dev, - struct rtllib_rx_stats *stats) -{ - struct r8192_priv *priv =3D rtllib_priv(dev); - - if (stats->bIsAMPDU && !stats->bFirstMPDU) - stats->mac_time =3D priv->last_rx_desc_tsf; - else - priv->last_rx_desc_tsf =3D stats->mac_time; -} - long rtl92e_translate_to_dbm(struct r8192_priv *priv, u8 signal_strength_i= ndex) { long signal_power; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 846f0f7a737b..546c8a33dae8 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -234,8 +234,6 @@ struct r8192_priv { int rxringcount; u16 rxbuffersize; =20 - u64 last_rx_desc_tsf; - u32 receive_config; u8 retry_data; u8 retry_rts; @@ -391,8 +389,6 @@ void rtl92e_irq_enable(struct net_device *dev); void rtl92e_config_rate(struct net_device *dev, u16 *rate_config); void rtl92e_irq_disable(struct net_device *dev); =20 -void rtl92e_update_rx_pkt_timestamp(struct net_device *dev, - struct rtllib_rx_stats *stats); long rtl92e_translate_to_dbm(struct r8192_priv *priv, u8 signal_strength_i= ndex); void rtl92e_update_rx_statistics(struct r8192_priv *priv, struct rtllib_rx_stats *pprevious_stats); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 04433c79b3a7..47da9b1a8682 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -471,7 +471,6 @@ enum _REG_PREAMBLE_MODE { * any adverse affects. */ struct rtllib_rx_stats { - u64 mac_time; s8 rssi; u8 signal; u8 noise; --=20 2.42.0