[PATCH 06/15] wifi: mt76: mt7925: drop deferred NAN local schedule update handling
From: Sean Wang <sean.wang@kernel.org>
Date: 2026-08-24 19:53:14
Also in:
linux-wireless
Subsystem:
mediatek mt76 wireless lan driver, the rest · Maintainers:
Felix Fietkau, Lorenzo Bianconi, Ryder Lee, Linus Torvalds
From: Stella Liu <redacted>
The deferred NAN local schedule update path in
mt7925_nan_local_sched_changed() is removed for now; it will be
implemented separately. Drop the now set-but-unused ret variable
along with it.
Fixes: 0f3605e4f8de ("wifi: mt76: mt7925: wire up NAN operations")
Co-developed-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Stella Liu <redacted>
---
drivers/net/wireless/mediatek/mt76/mt7925/nan.c | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/nan.c b/drivers/net/wireless/mediatek/mt76/mt7925/nan.c
index 5c6598a0f3b6..e6d6af4fc681 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7925/nan.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/nan.c@@ -602,15 +602,12 @@ void mt7925_nan_local_sched_changed(struct mt792x_dev *dev, { struct mt7925_nan_common_hdr *hdr; struct mt76_dev *mdev; - bool deferred; struct sk_buff *skb; - int ret = -ENOMEM; if (!dev || !vif) return; mdev = &dev->mt76; - deferred = vif->cfg.nan_sched.deferred; mt792x_mutex_acquire(dev);
@@ -627,19 +624,9 @@ void mt7925_nan_local_sched_changed(struct mt792x_dev *dev, goto out; } - ret = mt76_mcu_skb_send_msg(mdev, skb, - MCU_UNI_CMD(NAN), true); + mt76_mcu_skb_send_msg(mdev, skb, MCU_UNI_CMD(NAN), true); out: mt792x_mutex_release(dev); - - if (deferred) { - if (ret) - dev_err(mdev->dev, - "NAN: local schedule update failed: %d\n", - ret); - - ieee80211_nan_sched_update_done(vif); - } } static int mt7925_nan_peer_rec_tlv(struct sk_buff *skb,
--
2.43.0