Received: by 2002:a05:7412:a9a3:b0:f9:327e:43ab with SMTP id o35csp138841rdh; Mon, 18 Dec 2023 06:38:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IGwnNC6E/xEieL0mrHTVYRpTFm/hTS+U+wa2r84Llv057p5ufnHodrFu42tsYA7Opf2FDzs X-Received: by 2002:a05:6102:2d07:b0:466:9e5b:406 with SMTP id ih7-20020a0561022d0700b004669e5b0406mr1080803vsb.39.1702910300026; Mon, 18 Dec 2023 06:38:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702910300; cv=none; d=google.com; s=arc-20160816; b=oBQ47gK+rejskQV/qShOMqePC6hX3wzwrxNGYbKn02JwK929pGJQD3AfRg7SpdNxx7 pWRe3gSYB6pu5PXjiFypf41A2Qq+bJErM9tcJHW5ReYHGdOXIZXNhLf22gPMgDENxT23 AuOkXFDUxSJ8LUZRlRodTRi3upD0zKQR4MI1D5MU3CHprCcbOdy1AOdJU0fUgF93i3ay LcXUc4b6/tflMiohkFJj2/xiv0deVXq4rVqbUQmzM7toq+wcvbZbHevKfLYMbi1My9or 8+oUc+AJU9Ade6eS/DwZRP0MFPUgHtpc9D8LlA2n/QG/fPtuTFw/jP0l8PiFdZ3YptLb FSsQ== 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=Ptqs0ZJ3rYpPy4Q6TEj8asN+2XXFzbqaYPKnRdE81BI=; fh=KsoNWtazjfstHns8t6UZ1pulwZL69aEO39vRs0LPvyo=; b=Qu4FJevRnLdr41ZKYSSXi+Nso7ZHVfx7IdD3gyFEuXVYbidcKENxB+TUdRYNmQM69d CjJRlN6EvULgrV7TasbYh9TSxiwk+0wg1Ofn7fRMElZ0weyutE5421BgNGdy9JRe9RXS iRNtNV5t+WTDMggosPzm4oin5npFtZvk5MCRdftQKRzjL3iq7ctKxk7e3OJwwkuH95mz FuXZYYaIvO858AETdZorHt5To+P43ZM1NNN2IeNpUMjCFZnE5J167Z0/r23Nlsi+co5W Rc77vZVUvgdi/+MK69nWDwBNAbekaSP5knJGTGujO58PlY2UTEr/E6iB1696APuSJ0EY U45w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=KeRB5YF6; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-wireless+bounces-926-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-wireless+bounces-926-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id w3-20020a67e243000000b00466900bd61csi299352vse.101.2023.12.18.06.38.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 06:38:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless+bounces-926-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=KeRB5YF6; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-wireless+bounces-926-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-wireless+bounces-926-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id AB2F91C23FCE for ; Mon, 18 Dec 2023 14:38:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D32C23A1CB; Mon, 18 Dec 2023 14:37:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="KeRB5YF6"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="cxh5cbeY" 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 C87C442368 for ; Mon, 18 Dec 2023 14:37:15 +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=1702910230; 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=Ptqs0ZJ3rYpPy4Q6TEj8asN+2XXFzbqaYPKnRdE81BI=; b=KeRB5YF6zaCgRCWVwZk9a7jCKJQ3/ebFSbevvX0iBu+wxYVA5S8qFDHqXBv8lnJT9psuqI 1K6b4MsIZVmMSwuUmG13uG/7qBDI5RxLPO3ZGP+p7BPQC6kBzi34IvxnkwWhoepNDM2vqf p8VGk11MhRm2OJz7W+CA+WNGMrLCYtFioDbPy43xfIKhHtnov9J9zO1BHbqedH7FiKt2yx aBffbXMrYVveL5eZSOhFmSWRC7jhidoWxM4zfzKmGyZDDQvGAcYfZVys8KNk6LaAcQUKzy tPZuLa6/x0SCf+HFzXHNIe1YNaSgFyso3fMhWzfWI0VO0DymYM9X3r2gGkY12A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1702910230; 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=Ptqs0ZJ3rYpPy4Q6TEj8asN+2XXFzbqaYPKnRdE81BI=; b=cxh5cbeY1IUmpdz0+B7r6/o2TeugC/Ja+Rcna6yGL/6bwMTZeQZRbc1aGbG7S6A0+jsMa3 3S1QhnDlasNGp2DA== To: linux-wireless@vger.kernel.org Cc: Jes Sorensen , Kalle Valo , Ping-Ke Shih , Bitterblue Smith , Sebastian Andrzej Siewior Subject: [PATCH 17/20] wifi: rtl8xxxu: remove obsolete priv->vif Date: Mon, 18 Dec 2023 15:36:42 +0100 Message-Id: <20231218143645.433356-18-martin.kaistra@linutronix.de> In-Reply-To: <20231218143645.433356-1-martin.kaistra@linutronix.de> References: <20231218143645.433356-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 --- 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 9d272da373a3c..889ef7217f142 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h @@ -1892,11 +1892,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 ad76cddef81b2..c2a577ebd061e 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c @@ -6655,7 +6655,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); @@ -6673,7 +6672,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