From patchwork Fri Sep 22 13:30:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 143780 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:910f:0:b0:403:3b70:6f57 with SMTP id r15csp31611vqg; Fri, 22 Sep 2023 18:55:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHCQJlNn6NDAlFHwNLV7w5SZdy72JsAhcZwS6LJjhHxkultrqxMzfqh6onPe17b6EhMy9CD X-Received: by 2002:a17:90b:188c:b0:268:5620:cfc7 with SMTP id mn12-20020a17090b188c00b002685620cfc7mr1145824pjb.30.1695434120256; Fri, 22 Sep 2023 18:55:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695434120; cv=none; d=google.com; s=arc-20160816; b=B/XBup8T6X7LvNn0pcXqfvecLJkBKNwxQ0N+BYf/IeqedbopRc9GI1UKNzg44WGdI1 t54frgs/E3bz6q2/a/p5PDkK66MuKVugzYe6P38g+Fob9t64IHTfflPJ8RHUX9zAqWTi QgHGO1KobUnFSJRdywmqGzLT3pv45ij+EdaRD4LU2qj/+KKeHq3a25xlQvroOXq8ZDrn z3OZOqn/9VWhhMm1+++YkKajIX+AEZAMJx5GV+dr+dcs8WH/tUweWYGNzBHlBmKiO4dn Sqvg3oDw/w3qraKvRnZjxn3Tnm0kzoBmGbVs40KozwULWkJN9k/fRKnNDzkqVBExyhAr F9pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=IU0umDeRj0qrz0iB2siEvqGentkzeL4EI2Vh5qfUxFY=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=O1sKwFA2uqaD2IP9QJxhhfJHuGvft/WTbP5KmtAzv0UwGliwZFwTc0eBGm8er5M0EW D9XJVnjF2mbEoIzVcQfeNAlKo0PEigJkisFeZSn2w6r/DuAtN7yWNgH+CKsOoT4mN/lk JqAJnIpM4zL5gI1OMKcEkEXcrrCn7w+4H+7cXeCvRZM7iI0pqe7gzQhOmcF8tdv+wz0+ ggD2pei8HcXeIcA8QAG7q0WPw+0CwKyR+wSf7oc3rJjQsLS70yhiYPArTpHIVOF/j2be XwhF6jNA7NgkI/Eqj0OMw0uojyWFz/vNsNLcOrjqM26hLAcvfttTk3vrHP1NwKZdQnqJ rnWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RD+rKfJv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id nh24-20020a17090b365800b0026b49dac834si4922214pjb.34.2023.09.22.18.55.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 18:55:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RD+rKfJv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 265068022C05; Fri, 22 Sep 2023 06:31:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234142AbjIVNaW (ORCPT + 29 others); Fri, 22 Sep 2023 09:30:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234145AbjIVNaL (ORCPT ); Fri, 22 Sep 2023 09:30:11 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 358F51A7 for ; Fri, 22 Sep 2023 06:30:04 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-405101a02bcso7332665e9.1 for ; Fri, 22 Sep 2023 06:30:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695389402; x=1695994202; 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=IU0umDeRj0qrz0iB2siEvqGentkzeL4EI2Vh5qfUxFY=; b=RD+rKfJvD73e033pOuFeQjlPG4yo+CxGK3XQpyChIdhUmMW5H+FVmCTYqwa2FWnwy/ RfEX1OFB6KPidw5RD2M//D4S8COJDLu224usRoDbswODhtAFQMfA8dKZIzvZXRskCk+4 mE1rxBEQ7bkVHYhkfhqEGHoqOn/xDSiCoyHK9W/LnyYRAorWd0GJMwlaqpPfMKHeKJIL 3AjvMxvQmuVSF/rmxvTdiJ92iOj9HTRzpiYGfileTNiBKTASQAwfn1iAqV/fR4gBqRep iPchyqyE0ZKDmjV+b2iS9Mn5Pio+lmOWsTcPjc/nui5+HfYjcjU3HIttlrJJAjN95Nw1 Yj9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695389402; x=1695994202; 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=IU0umDeRj0qrz0iB2siEvqGentkzeL4EI2Vh5qfUxFY=; b=AJRwcHVlxLW7EW88SyEaMvNknTQQUPYLeXyFlxu9gNZkck8AOlmjiRZ/ck3L386tuX sOX8cmyGtg8lQhCVTO+ky4nNxfakWh0S05IiX7dnED8gqEqucXjRThSB7esr0rKT0jjo F771PVR1mKo+EbpAm9hA2JnorW/YPJZ88ZKXfznx2XU2NFS1XRt7NxNh6avawvOiUOQa 9y9iEJix9YOvXbvfkdqC65v5eyKehiRi54fTXU6/Dq3cBoteC9yv6VFsrrKr3SVOElIr 1vgupJ5naDKcsV+/FvzLL4z/wO2p0RIZps4tiM6ZX+rOKor/hLPEpm79RVtzbPGcnxdA o5EQ== X-Gm-Message-State: AOJu0YxBtS3qN/+BtPh7wvlnW8fwZZvk/ZcCDcgiMAnW8PruMXaJLeeQ Iinez0GpM4iS+pzkx4gEcvY= X-Received: by 2002:a05:600c:511e:b0:405:4721:800 with SMTP id o30-20020a05600c511e00b0040547210800mr273667wms.1.1695389402540; Fri, 22 Sep 2023 06:30:02 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id v11-20020a5d610b000000b0031435731dfasm4454699wrt.35.2023.09.22.06.30.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Sep 2023 06:30:02 -0700 (PDT) Date: Fri, 22 Sep 2023 15:30:00 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 7/7] staging: rtl8192e: Remove rtllib_stop_send_beacons Message-ID: <17c5545102ad8f50ca320af17aafa555f8caec2d.1695387832.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Fri, 22 Sep 2023 06:31:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777791528176742789 X-GMAIL-MSGID: 1777791528176742789 rtllib_start_send_beacons() is removed so no need for rtllib_stop_send_beacons() anymore. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 7 ------- drivers/staging/rtl8192e/rtllib.h | 9 --------- drivers/staging/rtl8192e/rtllib_softmac.c | 21 -------------------- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 1 - 4 files changed, 38 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 208c7bfd9bfe..87f5441fbb10 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -458,10 +458,6 @@ static void _rtl92e_prepare_beacon(struct tasklet_struct *t) pdesc->OWN = 1; } -static void _rtl92e_stop_beacon(struct net_device *dev) -{ -} - void rtl92e_config_rate(struct net_device *dev, u16 *rate_config) { struct r8192_priv *priv = rtllib_priv(dev); @@ -700,8 +696,6 @@ static void _rtl92e_init_priv_handler(struct net_device *dev) priv->rtllib->set_bw_mode_handler = rtl92e_set_bw_mode; priv->rf_set_chan = rtl92e_set_channel; - priv->rtllib->stop_send_beacons = _rtl92e_stop_beacon; - priv->rtllib->sta_wake_up = rtl92e_hw_wakeup; priv->rtllib->enter_sleep_state = rtl92e_enter_sleep; priv->rtllib->ps_is_queue_empty = _rtl92e_is_tx_queue_empty; @@ -1045,7 +1039,6 @@ static void _rtl92e_if_silent_reset(struct net_device *dev) if (ieee->link_state == MAC80211_LINKED) { mutex_lock(&ieee->wx_mutex); netdev_info(dev, "ieee->link_state is MAC80211_LINKED\n"); - rtllib_stop_send_beacons(priv->rtllib); del_timer_sync(&ieee->associate_timer); cancel_delayed_work(&ieee->associate_retry_wq); rtllib_stop_scan(ieee); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 410401869ebb..0597dcb759e0 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1495,14 +1495,6 @@ struct rtllib_device { */ void (*link_change)(struct net_device *dev); - /* these two function indicates to the HW when to start - * and stop to send beacons. This is used when the - * IEEE_SOFTMAC_BEACONS is not set. For now the - * stop_send_bacons is NOT guaranteed to be called only - * after start_send_beacons. - */ - void (*stop_send_beacons)(struct net_device *dev); - /* power save mode related */ void (*sta_wake_up)(struct net_device *dev); void (*enter_sleep_state)(struct net_device *dev, u64 time); @@ -1725,7 +1717,6 @@ 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); -void rtllib_stop_send_beacons(struct rtllib_device *ieee); 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/rtl8192e/rtllib_softmac.c index 4551071e9f1b..982578e1c0af 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -607,26 +607,6 @@ static void rtllib_softmac_scan_wq(void *data) mutex_unlock(&ieee->scan_mutex); } -static void rtllib_beacons_stop(struct rtllib_device *ieee) -{ - unsigned long flags; - - spin_lock_irqsave(&ieee->beacon_lock, flags); - - ieee->beacon_txing = 0; - - spin_unlock_irqrestore(&ieee->beacon_lock, flags); - del_timer_sync(&ieee->beacon_timer); -} - -void rtllib_stop_send_beacons(struct rtllib_device *ieee) -{ - ieee->stop_send_beacons(ieee->dev); - if (ieee->softmac_features & IEEE_SOFTMAC_BEACONS) - rtllib_beacons_stop(ieee); -} -EXPORT_SYMBOL(rtllib_stop_send_beacons); - static void rtllib_softmac_stop_scan(struct rtllib_device *ieee) { mutex_lock(&ieee->scan_mutex); @@ -2326,7 +2306,6 @@ void rtllib_stop_protocol(struct rtllib_device *ieee, u8 shutdown) ieee->rtllib_ips_leave(ieee->dev); } - rtllib_stop_send_beacons(ieee); del_timer_sync(&ieee->associate_timer); cancel_delayed_work_sync(&ieee->associate_retry_wq); cancel_delayed_work_sync(&ieee->link_change_wq); diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging/rtl8192e/rtllib_softmac_wx.c index 2b15251201ec..3c7c0f07ab0b 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -310,7 +310,6 @@ void rtllib_wx_sync_scan_wq(void *data) rtllib_sta_ps_send_null_frame(ieee, 1); rtllib_stop_all_queues(ieee); - rtllib_stop_send_beacons(ieee); ieee->link_state = MAC80211_LINKED_SCANNING; ieee->link_change(ieee->dev); /* wait for ps packet to be kicked out successfully */