niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

mt76: mt7921: improve code readability for mt7921_update_txs

Browse source 
Introduce mt7921_update_txs routine in order to improve code readability
for tx timestamp parsing/configuration.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Lorenzo Bianconi 2021-06-12 14:43:03 +02:00 • committed by Felix Fietkau
parent aa967eb791
commit e5bca8c5d2
1 changed files with 18 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
drivers/net/wireless/mediatek/mt76/mt7921/mac.c
View file

@ -13,26 +13,6 @@
#define HE_PREP(f, m, v) le16_encode_bits(le32_get_bits(v, MT_CRXV_HE_##m),\ #define HE_PREP(f, m, v) le16_encode_bits(le32_get_bits(v, MT_CRXV_HE_##m),\
IEEE80211_RADIOTAP_HE_##f) IEEE80211_RADIOTAP_HE_##f)
static unsigned long
mt7921_next_txs_set(struct mt7921_dev *dev, struct mt76_wcid *wcid,
u32 timeout)
{
struct mt7921_sta *msta;
msta = container_of(wcid, struct mt7921_sta, wcid);
msta->next_txs_ts = jiffies + msecs_to_jiffies(timeout);
return msta->next_txs_ts;
}
static bool
mt7921_next_txs_timeout(struct mt7921_dev *dev, struct mt76_wcid *wcid)
{
struct mt7921_sta *msta;
msta = container_of(wcid, struct mt7921_sta, wcid);
return time_is_before_jiffies(msta->next_txs_ts);
}
static struct mt76_wcid *mt7921_rx_get_wcid(struct mt7921_dev *dev, static struct mt76_wcid *mt7921_rx_get_wcid(struct mt7921_dev *dev,
u16 idx, bool unicast) u16 idx, bool unicast)
{ {
@ -739,6 +719,23 @@ mt7921_mac_write_txwi_80211(struct mt7921_dev *dev, __le32 *txwi,
txwi[7] |= cpu_to_le32(val); txwi[7] |= cpu_to_le32(val);
} }
static void mt7921_update_txs(struct mt76_wcid *wcid, __le32 *txwi)
{
struct mt7921_sta *msta = container_of(wcid, struct mt7921_sta, wcid);
u32 pid, frame_type = FIELD_GET(MT_TXD2_FRAME_TYPE, txwi[2]);
if (!(frame_type & (IEEE80211_FTYPE_DATA >> 2)))
return;
if (time_is_after_eq_jiffies(msta->next_txs_ts))
return;
msta->next_txs_ts = jiffies + msecs_to_jiffies(250);
pid = mt76_get_next_pkt_id(wcid);
txwi[5] |= cpu_to_le32(MT_TXD5_TX_STATUS_MCU |
FIELD_PREP(MT_TXD5_PID, pid));
}
void mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi, void mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi,
struct sk_buff *skb, struct mt76_wcid *wcid, struct sk_buff *skb, struct mt76_wcid *wcid,
struct ieee80211_key_conf *key, bool beacon) struct ieee80211_key_conf *key, bool beacon)
@ -816,15 +813,7 @@ void mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi,
txwi[3] |= cpu_to_le32(MT_TXD3_BA_DISABLE); txwi[3] |= cpu_to_le32(MT_TXD3_BA_DISABLE);
} }
if ((FIELD_GET(MT_TXD2_FRAME_TYPE, txwi[2]) & mt7921_update_txs(wcid, txwi);
(IEEE80211_FTYPE_DATA >> 2)) &&
mt7921_next_txs_timeout(dev, wcid)) {
u8 pid = mt76_get_next_pkt_id(wcid);
mt7921_next_txs_set(dev, wcid, 250);
val = MT_TXD5_TX_STATUS_MCU | FIELD_PREP(MT_TXD5_PID, pid);
txwi[5] |= cpu_to_le32(val);
}
} }
static void static void