Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 598a4434 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt7615: mcu: unify mt7615_mcu_add_wtbl_bmc and mt7615_mcu_del_wtbl_bmc 



Remove duplicated code in mt7615_bss_info_changed

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent d7228bcf

drivers/net/wireless/mediatek/mt76/mt7615/main.c

+4 −11
Original line number Diff line number Diff line
@@ -291,17 +291,10 @@ static void mt7615_bss_info_changed(struct ieee80211_hw *hw, 
	 */



	if (changed & BSS_CHANGED_BEACON_ENABLED) {

		if (info->enable_beacon) {

			mt7615_mcu_set_bss_info(dev, vif, 1);

			mt7615_mcu_add_wtbl_bmc(dev, vif);

			mt7615_mcu_set_sta_rec_bmc(dev, vif, 1);

			mt7615_mcu_set_bcn(dev, vif, 1);

		} else {

			mt7615_mcu_set_sta_rec_bmc(dev, vif, 0);

			mt7615_mcu_del_wtbl_bmc(dev, vif);

			mt7615_mcu_set_bss_info(dev, vif, 0);

			mt7615_mcu_set_bcn(dev, vif, 0);

		}

		mt7615_mcu_set_bss_info(dev, vif, info->enable_beacon);

		mt7615_mcu_wtbl_bmc(dev, vif, info->enable_beacon);

		mt7615_mcu_set_sta_rec_bmc(dev, vif, info->enable_beacon);

		mt7615_mcu_set_bcn(dev, vif, info->enable_beacon);

	}



	mutex_unlock(&dev->mt76.mutex);

drivers/net/wireless/mediatek/mt76/mt7615/mcu.c

+8 −4
Original line number Diff line number Diff line
@@ -987,10 +987,10 @@ int mt7615_mcu_set_wtbl_key(struct mt7615_dev *dev, int wcid, 
				     &wtbl_sec_key, buf_len);

}



int mt7615_mcu_add_wtbl_bmc(struct mt7615_dev *dev,

			    struct ieee80211_vif *vif)

static int

mt7615_mcu_add_wtbl_bmc(struct mt7615_dev *dev,

			struct mt7615_vif *mvif)

{

	struct mt7615_vif *mvif = (struct mt7615_vif *)vif->drv_priv;

	struct {

		struct wtbl_generic g_wtbl;

		struct wtbl_rx rx_wtbl;
@@ -1016,10 +1016,14 @@ int mt7615_mcu_add_wtbl_bmc(struct mt7615_dev *dev, 
				     sizeof(struct wtbl_rx));

}



int mt7615_mcu_del_wtbl_bmc(struct mt7615_dev *dev, struct ieee80211_vif *vif)

int mt7615_mcu_wtbl_bmc(struct mt7615_dev *dev,

			struct ieee80211_vif *vif, bool enable)

{

	struct mt7615_vif *mvif = (struct mt7615_vif *)vif->drv_priv;



	if (enable)

		return mt7615_mcu_add_wtbl_bmc(dev, mvif);



	return __mt7615_mcu_set_wtbl(dev, mvif->sta.wcid.idx,

				     WTBL_RESET_AND_SET, 0, NULL, 0);

}

drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h

+2 −2
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ int mt7615_mcu_set_wtbl_key(struct mt7615_dev *dev, int wcid, 
void mt7615_mcu_set_rates(struct mt7615_dev *dev, struct mt7615_sta *sta,

			  struct ieee80211_tx_rate *probe_rate,

			  struct ieee80211_tx_rate *rates);

int mt7615_mcu_add_wtbl_bmc(struct mt7615_dev *dev, struct ieee80211_vif *vif);

int mt7615_mcu_del_wtbl_bmc(struct mt7615_dev *dev, struct ieee80211_vif *vif);

int mt7615_mcu_wtbl_bmc(struct mt7615_dev *dev, struct ieee80211_vif *vif,

			bool enable);

int mt7615_mcu_add_wtbl(struct mt7615_dev *dev, struct ieee80211_vif *vif,

			struct ieee80211_sta *sta);

int mt7615_mcu_del_wtbl(struct mt7615_dev *dev, struct ieee80211_vif *vif,