From 72d12c68d3ea36be2276e36b9e1b02d98e8430a5 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 18 Feb 2016 20:38:56 +0100 Subject: [PATCH] mt7603: use a single pid value for No-ACK instead of a bit Signed-off-by: Felix Fietkau --- mt7603_mac.c | 8 ++++---- mt7603_mac.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mt7603_mac.c b/mt7603_mac.c index 62f9bee5..604b3c29 100644 --- a/mt7603_mac.c +++ b/mt7603_mac.c @@ -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)) diff --git a/mt7603_mac.h b/mt7603_mac.h index 757a66c2..3902a5e3 100644 --- a/mt7603_mac.h +++ b/mt7603_mac.h @@ -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