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

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

mt76: move beacon_mask in mt76_dev 



Move beacon_mask in mt76_dev data structure since it is used by
all drivers

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

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

+1 −0
Original line number Diff line number Diff line
@@ -470,6 +470,7 @@ struct mt76_dev { 
	u16 chainmask;



	int beacon_int;

	u8 beacon_mask;



	struct mt76_sband sband_2g;

	struct mt76_sband sband_5g;

drivers/net/wireless/mediatek/mt76/mt7603/beacon.c

+9 −8
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ mt7603_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif) 
	struct mt7603_vif *mvif = (struct mt7603_vif *)vif->drv_priv;

	struct sk_buff *skb = NULL;



	if (!(dev->beacon_mask & BIT(mvif->idx)))

	if (!(dev->mt76.beacon_mask & BIT(mvif->idx)))

		return;



	skb = ieee80211_beacon_get(mt76_hw(dev), vif);
@@ -48,7 +48,7 @@ mt7603_add_buffered_bc(void *priv, u8 *mac, struct ieee80211_vif *vif) 
	struct ieee80211_tx_info *info;

	struct sk_buff *skb;



	if (!(dev->beacon_mask & BIT(mvif->idx)))

	if (!(dev->mt76.beacon_mask & BIT(mvif->idx)))

		return;



	skb = ieee80211_get_buffered_bc(mt76_hw(dev), vif);
@@ -134,7 +134,7 @@ void mt7603_pre_tbtt_tasklet(unsigned long arg) 
out:

	mt76_queue_tx_cleanup(dev, MT_TXQ_BEACON, false);

	if (dev->mt76.q_tx[MT_TXQ_BEACON].q->queued >

	    hweight8(dev->beacon_mask))

	    hweight8(dev->mt76.beacon_mask))

		dev->beacon_check++;

}
@@ -144,12 +144,12 @@ void mt7603_beacon_set_timer(struct mt7603_dev *dev, int idx, int intval) 


	if (idx >= 0) {

		if (intval)

			dev->beacon_mask |= BIT(idx);

			dev->mt76.beacon_mask |= BIT(idx);

		else

			dev->beacon_mask &= ~BIT(idx);

			dev->mt76.beacon_mask &= ~BIT(idx);

	}



	if (!dev->beacon_mask || (!intval && idx < 0)) {

	if (!dev->mt76.beacon_mask || (!intval && idx < 0)) {

		mt7603_irq_disable(dev, MT_INT_MAC_IRQ3);

		mt76_clear(dev, MT_ARB_SCR, MT_ARB_SCR_BCNQ_OPMODE_MASK);

		mt76_wr(dev, MT_HW_INT_MASK(3), 0);
@@ -174,10 +174,11 @@ void mt7603_beacon_set_timer(struct mt7603_dev *dev, int idx, int intval) 


	mt76_set(dev, MT_WF_ARB_BCN_START,

		 MT_WF_ARB_BCN_START_BSSn(0) |

		 ((dev->beacon_mask >> 1) * MT_WF_ARB_BCN_START_BSS0n(1)));

		 ((dev->mt76.beacon_mask >> 1) *

		  MT_WF_ARB_BCN_START_BSS0n(1)));

	mt7603_irq_enable(dev, MT_INT_MAC_IRQ3);



	if (dev->beacon_mask & ~BIT(0))

	if (dev->mt76.beacon_mask & ~BIT(0))

		mt76_set(dev, MT_LPON_SBTOR(0), MT_LPON_SBTOR_SUB_BSS_EN);

	else

		mt76_clear(dev, MT_LPON_SBTOR(0), MT_LPON_SBTOR_SUB_BSS_EN);

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

+0 −2
Original line number Diff line number Diff line
@@ -125,8 +125,6 @@ struct mt7603_dev { 


	s8 sensitivity;



	u8 beacon_mask;



	u8 beacon_check;

	u8 tx_hang_check;

	u8 tx_dma_check;

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

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ struct mt76x02_dev { 
	u32 aggr_stats[32];



	struct sk_buff *beacons[8];

	u8 beacon_mask;

	u8 beacon_data_mask;



	u8 tbtt_count;

drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c

+8 −8
Original line number Diff line number Diff line
@@ -119,23 +119,23 @@ static void 
__mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev, u8 vif_idx,

				bool val, struct sk_buff *skb)

{

	u8 old_mask = dev->beacon_mask;

	u8 old_mask = dev->mt76.beacon_mask;

	bool en;

	u32 reg;



	if (val) {

		dev->beacon_mask |= BIT(vif_idx);

		dev->mt76.beacon_mask |= BIT(vif_idx);

		if (skb)

			mt76x02_mac_set_beacon(dev, vif_idx, skb);

	} else {

		dev->beacon_mask &= ~BIT(vif_idx);

		dev->mt76.beacon_mask &= ~BIT(vif_idx);

		mt76x02_mac_set_beacon(dev, vif_idx, NULL);

	}



	if (!!old_mask == !!dev->beacon_mask)

	if (!!old_mask == !!dev->mt76.beacon_mask)

		return;



	en = dev->beacon_mask;

	en = dev->mt76.beacon_mask;



	reg = MT_BEACON_TIME_CFG_BEACON_TX |

	      MT_BEACON_TIME_CFG_TBTT_EN |
@@ -156,7 +156,7 @@ void mt76x02_mac_set_beacon_enable(struct mt76x02_dev *dev, 
	if (mt76_is_usb(dev))

		skb = ieee80211_beacon_get(mt76_hw(dev), vif);



	if (!dev->beacon_mask)

	if (!dev->mt76.beacon_mask)

		dev->tbtt_count = 0;



	__mt76x02_mac_set_beacon_enable(dev, vif_idx, val, skb);
@@ -203,7 +203,7 @@ mt76x02_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif) 
	struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv;

	struct sk_buff *skb = NULL;



	if (!(dev->beacon_mask & BIT(mvif->idx)))

	if (!(dev->mt76.beacon_mask & BIT(mvif->idx)))

		return;



	skb = ieee80211_beacon_get(mt76_hw(dev), vif);
@@ -223,7 +223,7 @@ mt76x02_add_buffered_bc(void *priv, u8 *mac, struct ieee80211_vif *vif) 
	struct ieee80211_tx_info *info;

	struct sk_buff *skb;



	if (!(dev->beacon_mask & BIT(mvif->idx)))

	if (!(dev->mt76.beacon_mask & BIT(mvif->idx)))

		return;



	skb = ieee80211_get_buffered_bc(mt76_hw(dev), vif);