Received: by 2002:a05:7412:b995:b0:f9:9502:5bb8 with SMTP id it21csp273024rdb; Thu, 21 Dec 2023 08:45:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IFA8B4OUX3DMFfESN2SDbLQCJuGtKhwB0/TaplyA1ZlrITWO/52W2EatoTZ9EPSsz8mL0Vf X-Received: by 2002:a17:906:d8dc:b0:a25:a0c6:ebf5 with SMTP id re28-20020a170906d8dc00b00a25a0c6ebf5mr1155452ejb.21.1703177127399; Thu, 21 Dec 2023 08:45:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703177127; cv=none; d=google.com; s=arc-20160816; b=s+koBESSCaLLB8nVs5An2v6pesfOUCylie6bZUBS+FdjeLA6x88B7OL0EK99L/Kdrn 7dhNwiSYVMUAw7+IL8rOVu3ZU+TCZvsvkzqEju3YK8XXMdRCuvykkrbT78krEQFULSYU +qaezRbUKH3p/4jSRCqZBarxJ5bnHsOGeuXawIgTPukfYmb9351UuwuFh6/fQ+HmtVCv nxHaGON8/Qu+5elfoZ1rCqCm8UU36h31GNwVoKIUpTsw3CV26PzDAZ9wm5NJOh1CO3Uz XV+oVPC97i9iIVRZCZNhYr+C+1EBbFLDvn0x6b0d7qT/DO7ySVsON7fW95U9h4zOEKyK eRWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:dkim-signature:dkim-signature:from; bh=4jHTvxVWYVqs7UgIAu5tbDmX7ebM7K8TmtEFb+QkjwQ=; fh=KsoNWtazjfstHns8t6UZ1pulwZL69aEO39vRs0LPvyo=; b=p9LADw170JTN601jgopA0gd5rzwtMZ5xsv+kYR7oxlo4ZUkClOl5SPwHLN+xrdJYEl tAHxEg4LGAlFDWwkBtB+QAKD1SeQhzuRu9kLwvkFO5fugfodGE18S8iKxVIJ5XMJcZBd xKK0+1dmqkoeJ6/rPsejOs8bH1e+poCGP7mbisM4UKNprvZlXGsZ2Dhs468LjQwniFQW 26qkYdsLKZ8VOHuVPbBAmCXsfcXKtBNgqr96MkotmA395Bp/gzZwJvFWju8BXZGAJzN5 S0LwO6wJgryO12nGL1H2KHiZmwCaY4TgATlBKJa483+b8hoLGXsmOGlns+HWk/zGbDMr GH4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=455Vm1n6; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-wireless+bounces-1166-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-wireless+bounces-1166-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id a4-20020a170906684400b00a1d07581a7esi913896ejs.97.2023.12.21.08.45.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 08:45:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless+bounces-1166-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=455Vm1n6; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-wireless+bounces-1166-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-wireless+bounces-1166-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 29EE71F2611E for ; Thu, 21 Dec 2023 16:45:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E3B3B59917; Thu, 21 Dec 2023 16:44:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="455Vm1n6"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="MDMWuEsb" X-Original-To: linux-wireless@vger.kernel.org Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 823C262801 for ; Thu, 21 Dec 2023 16:44:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de From: Martin Kaistra DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1703177046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4jHTvxVWYVqs7UgIAu5tbDmX7ebM7K8TmtEFb+QkjwQ=; b=455Vm1n6jJi5SMq59duUDrfzSeKGhdagp18dHUMXxT8M0/rZvRA5eDxq8id4VK10NsM9zD yJxnKSBt5BjP8XYVnWYuSJImImKymXGgWiowC1C+8usUwvK8txRCj1kw3X4ty6BPYeCt77 q95ldt8tQ/ECufnUK+Tum2DiNoWjSSUe5ZFYQuZrsAVMu5rBu1NE6ldbbq+z5+zuz06t5n GvJ9kx7dYX+DD1FNrAUJT/c1WZTy0X+zN/8RuiUw8jBRlb1X2hX4JzJ2sFOWUQKB24u/77 HWTD/cZJdcroeCVzdmJqpY1Xhi/noq17mv5uKMBdFZWeDF1kj2XizpADOtrfkw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1703177046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4jHTvxVWYVqs7UgIAu5tbDmX7ebM7K8TmtEFb+QkjwQ=; b=MDMWuEsbFI7q22uyoSoJqgBkeazuxvWvrO30XQiO5KhfP6ccULZagEfyBLRCIxHr7L+V8T I7RKHnYyvTEOgKDg== To: linux-wireless@vger.kernel.org Cc: Jes Sorensen , Kalle Valo , Ping-Ke Shih , Bitterblue Smith , Sebastian Andrzej Siewior Subject: [PATCH v2 18/21] wifi: rtl8xxxu: remove obsolete priv->vif Date: Thu, 21 Dec 2023 17:43:50 +0100 Message-Id: <20231221164353.603258-19-martin.kaistra@linutronix.de> In-Reply-To: <20231221164353.603258-1-martin.kaistra@linutronix.de> References: <20231221164353.603258-1-martin.kaistra@linutronix.de> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Now that all uses of priv->vif have been converted to priv->vifs[] remove the old attribute. Signed-off-by: Martin Kaistra Reviewed-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 5 ----- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 -- 2 files changed, 7 deletions(-) diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h index 6a58897446f4c..c5e6d8f7d26bd 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h @@ -1893,11 +1893,6 @@ struct rtl8xxxu_priv { u8 rssi_level; DECLARE_BITMAP(tx_aggr_started, IEEE80211_NUM_TIDS); DECLARE_BITMAP(tid_tx_operational, IEEE80211_NUM_TIDS); - /* - * Only one virtual interface permitted because only STA mode - * is supported and no iface_combinations are provided. - */ - struct ieee80211_vif *vif; struct ieee80211_vif *vifs[2]; struct delayed_work ra_watchdog; diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c index 0b6eac14f60e5..ecf54eb8dba61 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c @@ -6666,7 +6666,6 @@ static int rtl8xxxu_add_interface(struct ieee80211_hw *hw, } priv->vifs[port_num] = vif; - priv->vif = vif; rtlvif->port_num = port_num; rtl8xxxu_set_linktype(priv, vif->type, port_num); @@ -6684,7 +6683,6 @@ static void rtl8xxxu_remove_interface(struct ieee80211_hw *hw, dev_dbg(&priv->udev->dev, "%s\n", __func__); - priv->vif = NULL; priv->vifs[rtlvif->port_num] = NULL; } -- 2.39.2