diff options
| author | Ryder Lee <ryder.lee@mediatek.com> | 2021-04-04 15:48:23 +0800 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2021-04-12 00:03:06 +0200 |
| commit | 8a5a5dbfc18c667832e1f73b436dc324659fbbf8 (patch) | |
| tree | 9e7c54e31ce09e756a9e2b09bb9475bc2bef28d2 /drivers/net/wireless/mediatek/mt76/mt7615 | |
| parent | c7cc5ec5730321ea6c86f0f87cb562fc3827b0d3 (diff) | |
| download | linux-stable-8a5a5dbfc18c667832e1f73b436dc324659fbbf8.tar.gz linux-stable-8a5a5dbfc18c667832e1f73b436dc324659fbbf8.tar.bz2 linux-stable-8a5a5dbfc18c667832e1f73b436dc324659fbbf8.zip | |
mt76: mt7615: fix .add_beacon_offload()
ieee80211_beacon_get_template() returns NULL when beacon state is disabled,
so beacon_offload cannot be disabled for some devices.
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mt7615')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c index 600c5366c099..6ca9e9840399 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c @@ -702,6 +702,9 @@ mt7615_mcu_add_beacon_offload(struct mt7615_dev *dev, }; struct sk_buff *skb; + if (!enable) + goto out; + skb = ieee80211_beacon_get_template(hw, vif, &offs); if (!skb) return -EINVAL; @@ -731,6 +734,7 @@ mt7615_mcu_add_beacon_offload(struct mt7615_dev *dev, } dev_kfree_skb(skb); +out: return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_BCN_OFFLOAD, &req, sizeof(req), true); } @@ -1164,8 +1168,8 @@ mt7615_mcu_uni_add_beacon_offload(struct mt7615_dev *dev, __le16 tim_ie_pos; __le16 csa_ie_pos; __le16 bcc_ie_pos; - /* 0: enable beacon offload - * 1: disable beacon offload + /* 0: disable beacon offload + * 1: enable beacon offload * 2: update probe respond offload */ u8 enable; @@ -1188,6 +1192,9 @@ mt7615_mcu_uni_add_beacon_offload(struct mt7615_dev *dev, }; struct sk_buff *skb; + if (!enable) + goto out; + skb = ieee80211_beacon_get_template(mt76_hw(dev), vif, &offs); if (!skb) return -EINVAL; @@ -1212,6 +1219,7 @@ mt7615_mcu_uni_add_beacon_offload(struct mt7615_dev *dev, } dev_kfree_skb(skb); +out: return mt76_mcu_send_msg(&dev->mt76, MCU_UNI_CMD_BSS_INFO_UPDATE, &req, sizeof(req), true); } |