mt7603: use a single pid value for No-ACK instead of a bit

Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Felix Fietkau
2016-02-18 20:43:02 +01:00
parent d7f5fea7e6
commit 72d12c68d3
2 changed files with 6 additions and 6 deletions
+4 -4
View File
@@ -412,7 +412,7 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi,
if (info->flags & IEEE80211_TX_CTL_NO_ACK) {
txwi[1] |= cpu_to_le32(MT_TXD1_NO_ACK);
pid |= MT_PID_NOACK;
pid = MT_PID_NOACK;
}
txwi[2] = cpu_to_le32(
@@ -476,8 +476,8 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,
spin_lock_bh(&dev->status_lock);
msta->pid = (msta->pid + 1) & MT_PID_INDEX;
if (!msta->pid)
msta->pid++;
if (!msta->pid || msta->pid == MT_PID_NOACK)
msta->pid = 1;
pid = msta->pid;
cb->wcid = wcid->idx;
@@ -617,7 +617,7 @@ void mt7603_mac_add_txs(struct mt7603_dev *dev, void *data)
txs = le32_to_cpu(txs_data[3]);
wcidx = MT76_GET(MT_TXS3_WCID, txs);
if (pid & BIT(7)) /* No-ACK */
if (pid == MT_PID_NOACK)
return;
if (wcidx >= ARRAY_SIZE(dev->wcid))
+2 -2
View File
@@ -250,7 +250,7 @@ enum mt7603_tx_header_format {
#define MT_TXS4_F0_SEQNO GENMASK(11, 0)
#define MT_TXS4_F1_TSSI GENMASK(11, 0)
#define MT_PID_NOACK BIT(7)
#define MT_PID_INDEX GENMASK(6, 0)
#define MT_PID_NOACK GENMASK(7, 0)
#define MT_PID_INDEX GENMASK(7, 0)
#endif