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

mt76: connac: move mt76_connac_lmac_mapping in mt76-connac module 



mt76_connac_lmac_mapping is shared between mt7921 and mt7915

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

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

+6 −0
Original line number Diff line number Diff line
@@ -159,6 +159,12 @@ static inline u8 mt76_connac_chan_bw(struct cfg80211_chan_def *chandef) 
	return width_to_bw[chandef->width];

}



static inline u8 mt76_connac_lmac_mapping(u8 ac)

{

	/* LMAC uses the reverse order of mac80211 AC indexes */

	return 3 - ac;

}



int mt76_connac_pm_wake(struct mt76_phy *phy, struct mt76_connac_pm *pm);

void mt76_connac_power_save_sched(struct mt76_phy *phy,

				  struct mt76_connac_pm *pm);

drivers/net/wireless/mediatek/mt76/mt7915/mac.c

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static void mt7915_mac_sta_poll(struct mt7915_dev *dev) 
		sta = container_of((void *)msta, struct ieee80211_sta,

				   drv_priv);

		for (i = 0; i < IEEE80211_NUM_ACS; i++) {

			u8 q = mt7915_lmac_mapping(dev, i);

			u8 q = mt76_connac_lmac_mapping(i);

			u32 tx_cur = tx_time[q];

			u32 rx_cur = rx_time[q];

			u8 tid = ac_to_tid[i];
@@ -1206,7 +1206,7 @@ void mt7915_mac_write_txwi(struct mt7915_dev *dev, __le32 *txwi, 
	} else {

		p_fmt = MT_TX_TYPE_CT;

		q_idx = wmm_idx * MT7915_MAX_WMM_SETS +

			mt7915_lmac_mapping(dev, skb_get_queue_mapping(skb));

			mt76_connac_lmac_mapping(skb_get_queue_mapping(skb));

	}



	val = FIELD_PREP(MT_TXD0_TX_BYTES, skb->len + MT_TXD_SIZE) |

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

+1 −2
Original line number Diff line number Diff line
@@ -509,11 +509,10 @@ static int 
mt7915_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,

	       const struct ieee80211_tx_queue_params *params)

{

	struct mt7915_dev *dev = mt7915_hw_dev(hw);

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



	/* no need to update right away, we'll get BSS_CHANGED_QOS */

	queue = mt7915_lmac_mapping(dev, queue);

	queue = mt76_connac_lmac_mapping(queue);

	mvif->queue_params[queue] = *params;



	return 0;

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

+0 −6
Original line number Diff line number Diff line
@@ -378,12 +378,6 @@ mt7915_ext_phy(struct mt7915_dev *dev) 
	return phy->priv;

}



static inline u8 mt7915_lmac_mapping(struct mt7915_dev *dev, u8 ac)

{

	/* LMAC uses the reverse order of mac80211 AC indexes */

	return 3 - ac;

}



extern const struct ieee80211_ops mt7915_ops;

extern const struct mt76_testmode_ops mt7915_testmode_ops;

extern struct pci_driver mt7915_pci_driver;

drivers/net/wireless/mediatek/mt76/mt7915/testmode.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ mt7915_tm_set_ipg_params(struct mt7915_phy *phy, u32 ipg, u8 mode) 
	mt7915_tm_set_slot_time(phy, slot_time, sifs);



	return mt7915_tm_set_wmm_qid(dev,

				     mt7915_lmac_mapping(dev, IEEE80211_AC_BE),

				     mt76_connac_lmac_mapping(IEEE80211_AC_BE),

				     aifsn, cw, cw, 0);

}