Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp2459145pxt; Mon, 9 Aug 2021 00:40:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzU0icfNIpr1nU2qTMqI0f7EA1DXzOnpCR8m7E2CCCpws4BrbjrMB+XB8EMYhnfUZXC5X4m X-Received: by 2002:a17:907:3e0d:: with SMTP id hp13mr20819122ejc.372.1628494831246; Mon, 09 Aug 2021 00:40:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628494831; cv=none; d=google.com; s=arc-20160816; b=A3HDv0EfH1rHUH/kX9UsLd75zu9ImD+RSvKkQwhx3Os784JF+f44O09V1UfaVfgg16 d3fG21ejnPKcFbSm5kUtAGlyfbcU5ieWN0ycP1HqODV5D4IIAw/VDMCKjXwMA6EtKkv8 wAAMmafveJ8a+N45/V+g9vXa9s8YRgY6ehte+SzUFx02n/r/qYb6V9UOTsi3v9yuNPcO AiL35QHntGuBttK2ohEb6n2Z5/rNZMhoqRsRJ52dg02parJ20lHdtfRzY7vmo8ks/Qb6 td8I+hjtto5odCrTIzGnU9iz4WXjYOp5+ER2t0E2bIZHdxs/uSVmC4mQhPBqAbxwt0ty nbRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=9fBdzgkNv8bSAnC73sLeZsNFFUi+q3zmXjYvj7Xlb14=; b=Xp6kmxdU/qXM4uvVd0lDpC/GTgnNTu52/JK7OjD8bm8rX5i6MNXrxXuvrIbR2m/Lsd 9Lwj8S4pI1kQdARv94VJtmGX1Taya6FCUTGz8FjwXTDnm85KInrEPKFCroHB47bffvBf Nejnaf7A/U7iYdoOw7GOP59uTn6SUMxBuj72KM3+m8Ry7Yx7UTT2bWCW4i3tf4H7gF76 5MPemvakK23s60/bbqJ7ZJovMv0l/Yte7wQojwSWtuQR41kflCmovJW4C1dU9/pMwmmo yUw3OjpgOr/3LZMyFrVKM47cgdXKCr+Q/JkVOqY9TRWSnxWduOTFEPeBlqbePWdMhybK SI5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UoEVPDrr; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id aq11si16999757ejc.550.2021.08.09.00.40.00; Mon, 09 Aug 2021 00:40:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UoEVPDrr; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233431AbhHIHio (ORCPT + 99 others); Mon, 9 Aug 2021 03:38:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:37440 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233161AbhHIHio (ORCPT ); Mon, 9 Aug 2021 03:38:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 44F6C61058; Mon, 9 Aug 2021 07:38:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1628494704; bh=rwkrRbH7Ltoi1G+zrvt1GB+D/VqD3gaMLX0LiZ32sfA=; h=From:To:Cc:Subject:Date:From; b=UoEVPDrrQXLJiRQIrCzkHXWvViJl7tZ7Xv5KA80bFmw7d/h8aHKX9FLFkzRQ+VYGL ULDPPqAX8Nt4tVjlPDeWbC1yEcbhSPReswlt4oEf9uxdx9y63g0boQOWML2yttFZ3g C8PsDuzrAjE5GnXIx5eF+vOCup2MwzmAYJYNXsICswHvTUo3TNGYtPALSGtq/f6h5m x0WsOfLjXg7mj4zm6mEDCozCjDbrd1q2cXIifcoqzHoJZsZSRh5ctEZQL4nD/5Lm1P Zqj9V7Dsd+Zt1pyuZwZSRPgUVqO8/vSCwLP7HMc4OgR3h2qS8KpZ9jXFfhGeGd2oC+ bTSO6ROJB6wrQ== From: Lorenzo Bianconi To: nbd@nbd.name Cc: linux-wireless@vger.kernel.org, lorenzo.bianconi@redhat.com Subject: [PATCH] mt76: mt7921: get rid of monitor_vif Date: Mon, 9 Aug 2021 09:38:07 +0200 Message-Id: <803484aa5d3ed16be7432665d77bcc129768a916.1628494557.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Remove monitor_vif pointer from mt7921 since it is just a leftover of initial porting. Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/mt7921/main.c | 7 ------- drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 2 -- 2 files changed, 9 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c index 7c4f97d65aae..b121a0e369c7 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c @@ -243,10 +243,6 @@ static int mt7921_add_interface(struct ieee80211_hw *hw, mt7921_mutex_acquire(dev); - if (vif->type == NL80211_IFTYPE_MONITOR && - is_zero_ether_addr(vif->addr)) - phy->monitor_vif = vif; - mvif->mt76.idx = ffs(~dev->mt76.vif_mask) - 1; if (mvif->mt76.idx >= MT7921_MAX_INTERFACES) { ret = -ENOSPC; @@ -306,9 +302,6 @@ static void mt7921_remove_interface(struct ieee80211_hw *hw, struct mt7921_phy *phy = mt7921_hw_phy(hw); int idx = msta->wcid.idx; - if (vif == phy->monitor_vif) - phy->monitor_vif = NULL; - mt7921_mutex_acquire(dev); mt76_connac_free_pending_tx_skbs(&dev->pm, &msta->wcid); mt76_connac_mcu_uni_add_dev(&dev->mphy, vif, &mvif->sta.wcid, false); diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h index 6e9e4dfb3928..5fcd197936be 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h @@ -123,8 +123,6 @@ struct mt7921_phy { struct ieee80211_sband_iftype_data iftype[2][NUM_NL80211_IFTYPES]; - struct ieee80211_vif *monitor_vif; - u32 rxfilter; u64 omac_mask; -- 2.31.1