Commit 0b7da311 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Felix Fietkau
Browse files

mt76: partially unify filling txwi fields 



Merge code filing txwi fields the same way on mt76x0 and mt76x2.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 0e59cba8

drivers/net/wireless/mediatek/mt76/mt76x0/tx.c

+3 −41
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ mt76x0_push_txwi(struct mt76x0_dev *dev, struct sk_buff *skb, 
	struct ieee80211_tx_rate *rate = &info->control.rates[0];

	struct mt76x02_txwi *txwi;

	unsigned long flags;

	u16 txwi_flags = 0;

	u32 pkt_id;

	u16 rate_ctl;

	u8 nss;
@@ -86,47 +84,11 @@ mt76x0_push_txwi(struct mt76x0_dev *dev, struct sk_buff *skb, 
	}

	spin_unlock_irqrestore(&dev->mt76.lock, flags);



	txwi->wcid = wcid->idx;

	txwi->rate = cpu_to_le16(rate_ctl);

	txwi->pktid = (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) ? 1 : 0;



	if (info->flags & IEEE80211_TX_CTL_LDPC)

		txwi->rate |= cpu_to_le16(MT_RXWI_RATE_LDPC);

	if ((info->flags & IEEE80211_TX_CTL_STBC) && nss == 1)

		txwi->rate |= cpu_to_le16(MT_RXWI_RATE_STBC);

	if (nss > 1 && sta && sta->smps_mode == IEEE80211_SMPS_DYNAMIC)

		txwi_flags |= MT_TXWI_FLAGS_MMPS;



	if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) {

		txwi->ack_ctl |= MT_TXWI_ACK_CTL_REQ;

		pkt_id = 1;

	} else {

		pkt_id = 0;

	}



	if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)

		pkt_id |= MT_TXWI_PKTID_PROBE;



	if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)

		txwi->ack_ctl |= MT_TXWI_ACK_CTL_NSEQ;



	if ((info->flags & IEEE80211_TX_CTL_AMPDU) && sta) {

		u8 ba_size = IEEE80211_MIN_AMPDU_BUF;



		ba_size <<= sta->ht_cap.ampdu_factor;

		ba_size = min_t(int, 7, ba_size - 1);

		if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) {

			ba_size = 0;

		} else {

			txwi_flags |= MT_TXWI_FLAGS_AMPDU;

			txwi_flags |= FIELD_PREP(MT_TXWI_FLAGS_MPDU_DENSITY,

						 sta->ht_cap.ampdu_density);

		}

		txwi->ack_ctl |= FIELD_PREP(MT_TXWI_ACK_CTL_BA_WINDOW, ba_size);

	}



	txwi->wcid = wcid->idx;

	txwi->flags |= cpu_to_le16(txwi_flags);

	txwi->len_ctl = cpu_to_le16(pkt_len);

	txwi->pktid = pkt_id;

	mt76x02_mac_fill_txwi(txwi, skb, sta, pkt_len, nss);



	return txwi;

}

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

+42 −0
Original line number Diff line number Diff line
@@ -156,6 +156,48 @@ void mt76x02_txq_init(struct mt76_dev *dev, struct ieee80211_txq *txq) 
}

EXPORT_SYMBOL_GPL(mt76x02_txq_init);



void mt76x02_mac_fill_txwi(struct mt76x02_txwi *txwi, struct sk_buff *skb,

			  struct ieee80211_sta *sta, int len, u8 nss)

{

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;

	u16 txwi_flags = 0;



	if (info->flags & IEEE80211_TX_CTL_LDPC)

		txwi->rate |= cpu_to_le16(MT_RXWI_RATE_LDPC);

	if ((info->flags & IEEE80211_TX_CTL_STBC) && nss == 1)

		txwi->rate |= cpu_to_le16(MT_RXWI_RATE_STBC);

	if (nss > 1 && sta && sta->smps_mode == IEEE80211_SMPS_DYNAMIC)

		txwi_flags |= MT_TXWI_FLAGS_MMPS;

	if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))

		txwi->ack_ctl |= MT_TXWI_ACK_CTL_REQ;

	if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)

		txwi->ack_ctl |= MT_TXWI_ACK_CTL_NSEQ;

	if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)

		txwi->pktid |= MT_TXWI_PKTID_PROBE;

	if ((info->flags & IEEE80211_TX_CTL_AMPDU) && sta) {

		u8 ba_size = IEEE80211_MIN_AMPDU_BUF;



		ba_size <<= sta->ht_cap.ampdu_factor;

		ba_size = min_t(int, 63, ba_size - 1);

		if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)

			ba_size = 0;

		txwi->ack_ctl |= FIELD_PREP(MT_TXWI_ACK_CTL_BA_WINDOW, ba_size);



		txwi_flags |= MT_TXWI_FLAGS_AMPDU |

			 FIELD_PREP(MT_TXWI_FLAGS_MPDU_DENSITY,

				    sta->ht_cap.ampdu_density);

	}



	if (ieee80211_is_probe_resp(hdr->frame_control) ||

	    ieee80211_is_beacon(hdr->frame_control))

		txwi_flags |= MT_TXWI_FLAGS_TS;



	txwi->flags |= cpu_to_le16(txwi_flags);

	txwi->len_ctl = cpu_to_le16(len);

}

EXPORT_SYMBOL_GPL(mt76x02_mac_fill_txwi);



__le16

mt76x02_mac_tx_rate_val(struct mt76_dev *dev,

		       const struct ieee80211_tx_rate *rate, u8 *nss_val)

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

+2 −1
Original line number Diff line number Diff line
@@ -180,7 +180,8 @@ static inline bool mt76x02_wait_for_mac(struct mt76_dev *dev) 
}



void mt76x02_txq_init(struct mt76_dev *dev, struct ieee80211_txq *txq);



void mt76x02_mac_fill_txwi(struct mt76x02_txwi *txwi, struct sk_buff *skb,

			  struct ieee80211_sta *sta, int len, u8 nss);

enum mt76x02_cipher_type

mt76x02_mac_get_key_info(struct ieee80211_key_conf *key, u8 *key_data);

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

+1 −34
Original line number Diff line number Diff line
@@ -61,9 +61,7 @@ void mt76x2_mac_write_txwi(struct mt76x2_dev *dev, struct mt76x02_txwi *txwi, 
	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct ieee80211_tx_rate *rate = &info->control.rates[0];

	struct ieee80211_key_conf *key = info->control.hw_key;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;

	u16 rate_ht_mask = FIELD_PREP(MT_RXWI_RATE_PHY, BIT(1) | BIT(2));

	u16 txwi_flags = 0;

	u8 nss;

	s8 txpwr_adj, max_txpwr_adj;

	u8 ccmp_pn[8];
@@ -112,38 +110,7 @@ void mt76x2_mac_write_txwi(struct mt76x2_dev *dev, struct mt76x02_txwi *txwi, 
		 !(txwi->rate & cpu_to_le16(rate_ht_mask)))

		txwi->txstream = 0x93;



	if (info->flags & IEEE80211_TX_CTL_LDPC)

		txwi->rate |= cpu_to_le16(MT_RXWI_RATE_LDPC);

	if ((info->flags & IEEE80211_TX_CTL_STBC) && nss == 1)

		txwi->rate |= cpu_to_le16(MT_RXWI_RATE_STBC);

	if (nss > 1 && sta && sta->smps_mode == IEEE80211_SMPS_DYNAMIC)

		txwi_flags |= MT_TXWI_FLAGS_MMPS;

	if (!(info->flags & IEEE80211_TX_CTL_NO_ACK))

		txwi->ack_ctl |= MT_TXWI_ACK_CTL_REQ;

	if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)

		txwi->ack_ctl |= MT_TXWI_ACK_CTL_NSEQ;

	if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)

		txwi->pktid |= MT_TXWI_PKTID_PROBE;

	if ((info->flags & IEEE80211_TX_CTL_AMPDU) && sta) {

		u8 ba_size = IEEE80211_MIN_AMPDU_BUF;



		ba_size <<= sta->ht_cap.ampdu_factor;

		ba_size = min_t(int, 63, ba_size - 1);

		if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)

			ba_size = 0;

		txwi->ack_ctl |= FIELD_PREP(MT_TXWI_ACK_CTL_BA_WINDOW, ba_size);



		txwi_flags |= MT_TXWI_FLAGS_AMPDU |

			 FIELD_PREP(MT_TXWI_FLAGS_MPDU_DENSITY,

				    sta->ht_cap.ampdu_density);

	}



	if (ieee80211_is_probe_resp(hdr->frame_control) ||

	    ieee80211_is_beacon(hdr->frame_control))

		txwi_flags |= MT_TXWI_FLAGS_TS;



	txwi->flags |= cpu_to_le16(txwi_flags);

	txwi->len_ctl = cpu_to_le16(len);

	mt76x02_mac_fill_txwi(txwi, skb, sta, len, nss);

}

EXPORT_SYMBOL_GPL(mt76x2_mac_write_txwi);

CRA Git | Maintained and supported by SUSTech CRA and CCSE