From 48a905e237913bdaaab2e91bec6c8a7bd503565b Mon Sep 17 00:00:00 2001 From: Ryder Lee Date: Tue, 16 Mar 2021 12:35:15 +0800 Subject: [PATCH] mt76: mt7615: fix CSA event format Fix format changes among the firmware versions. Fixes: f9390c251868 ("mt76: mt7615: fix CSA notification for DBDC") Signed-off-by: Ryder Lee --- mt7615/mcu.c | 3 ++- mt7615/mcu.h | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mt7615/mcu.c b/mt7615/mcu.c index eb25224d..261dd7f7 100644 --- a/mt7615/mcu.c +++ b/mt7615/mcu.c @@ -375,12 +375,13 @@ mt7615_mcu_csa_finish(void *priv, u8 *mac, struct ieee80211_vif *vif) static void mt7615_mcu_rx_csa_notify(struct mt7615_dev *dev, struct sk_buff *skb) { + struct mt7615_phy *ext_phy = mt7615_ext_phy(dev); struct mt76_phy *mphy = &dev->mt76.phy; struct mt7615_mcu_csa_notify *c; c = (struct mt7615_mcu_csa_notify *)skb->data; - if (c->band_idx && dev->mt76.phy2) + if (ext_phy && ext_phy->omac_mask & BIT_ULL(c->omac_idx)) mphy = dev->mt76.phy2; ieee80211_iterate_active_interfaces_atomic(mphy->hw, diff --git a/mt7615/mcu.h b/mt7615/mcu.h index dbf72b13..98c383e4 100644 --- a/mt7615/mcu.h +++ b/mt7615/mcu.h @@ -181,8 +181,7 @@ struct mt7615_mcu_csa_notify { u8 omac_idx; u8 csa_count; - u8 band_idx; - u8 rsv; + u8 rsv[2]; } __packed; struct mt7615_mcu_rdd_report {