From: Ryder Lee <ryder.lee@mediatek.com>
To: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>,
Felix Fietkau <nbd@nbd.name>
Cc: Roy Luo <royluo@google.com>, Sean Wang <sean.wang@mediatek.com>,
Nelson Chang <nelson.chang@mediatek.com>,
YF Luo <yf.luo@mediatek.com>, Kai Lin <kai.lin@mediatek.com>,
Rorscha Yang <rorscha.yang@mediatek.com>,
Kyle Lee <kyle.lee@mediatek.com>,
Miller Shen <miller.shen@mediatek.com>,
Haipin Liang <haipin.liang@mediatek.com>,
KL Huang <kl.huang@mediatek.com>, YH chen <yh.chen@mediatek.com>,
linux-wireless@vger.kernel.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org,
Ryder Lee <ryder.lee@mediatek.com>
Subject: [PATCH v3 3/4] mt76: use macro for sn and seq_ctrl conversion
Date: Mon, 1 Apr 2019 15:16:43 +0800 [thread overview]
Message-ID: <64e6331f3ddbd0a1f254fb3dfc3bed732ba64bf2.1554102584.git.ryder.lee@mediatek.com> (raw)
In-Reply-To: <cover.1554102584.git.ryder.lee@mediatek.com>
Use macro to convert sn and seq_ctrl for better readability.
Signed-off-by: Roy Luo <royluo@google.com>
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
---
drivers/net/wireless/mediatek/mt76/agg-rx.c | 2 +-
drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 2 +-
drivers/net/wireless/mediatek/mt76/mt7603/main.c | 2 +-
drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/agg-rx.c b/drivers/net/wireless/mediatek/mt76/agg-rx.c
index 73c8b28..27e3ff0 100644
--- a/drivers/net/wireless/mediatek/mt76/agg-rx.c
+++ b/drivers/net/wireless/mediatek/mt76/agg-rx.c
@@ -135,7 +135,7 @@
return;
status->tid = le16_to_cpu(bar->control) >> 12;
- seqno = le16_to_cpu(bar->start_seq_num) >> 4;
+ seqno = IEEE80211_SEQ_TO_SN(le16_to_cpu(bar->start_seq_num));
tid = rcu_dereference(wcid->aggr[status->tid]);
if (!tid)
return;
diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
index e498169..2f2961e 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
@@ -627,7 +627,7 @@ void mt7603_mac_tx_ba_reset(struct mt7603_dev *dev, int wcid, int tid, int ssn,
status->aggr = unicast &&
!ieee80211_is_qos_nullfunc(hdr->frame_control);
status->tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TID_MASK;
- status->seqno = hdr->seq_ctrl >> 4;
+ status->seqno = IEEE80211_SEQ_TO_SN(hdr->seq_ctrl);
return 0;
}
diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/main.c b/drivers/net/wireless/mediatek/mt76/mt7603/main.c
index 5d38392..0c78044 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7603/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/main.c
@@ -594,7 +594,7 @@
mt7603_mac_tx_ba_reset(dev, msta->wcid.idx, tid, *ssn, -1);
break;
case IEEE80211_AMPDU_TX_START:
- mtxq->agg_ssn = *ssn << 4;
+ mtxq->agg_ssn = IEEE80211_SN_TO_SEQ(*ssn);
ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
break;
case IEEE80211_AMPDU_TX_STOP_CONT:
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
index b137ce8..f0e1e12 100644
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
@@ -378,7 +378,7 @@ int mt76x02_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
ieee80211_send_bar(vif, sta->addr, tid, mtxq->agg_ssn);
break;
case IEEE80211_AMPDU_TX_START:
- mtxq->agg_ssn = *ssn << 4;
+ mtxq->agg_ssn = IEEE80211_SN_TO_SEQ(*ssn);
ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid);
break;
case IEEE80211_AMPDU_TX_STOP_CONT:
--
1.9.1
next prev parent reply other threads:[~2019-04-01 7:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-01 7:16 [PATCH v3 0/4] Add support for MediaTek MT7615 wireless chipsets Ryder Lee
2019-04-01 7:16 ` [PATCH v3 1/4] mt76: add mac80211 driver for MT7615 PCIe-based chipsets Ryder Lee
2019-04-13 13:06 ` Felix Fietkau
2019-04-01 7:16 ` [PATCH v3 2/4] mt76: add unlikely() for dma_mapping_error() check Ryder Lee
2019-04-01 7:16 ` Ryder Lee [this message]
2019-04-01 7:16 ` [PATCH v3 4/4] MAINTAINERS : update entry for mt76 wireless driver Ryder Lee
2019-04-25 10:07 ` [PATCH v3 0/4] Add support for MediaTek MT7615 wireless chipsets Felix Fietkau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=64e6331f3ddbd0a1f254fb3dfc3bed732ba64bf2.1554102584.git.ryder.lee@mediatek.com \
--to=ryder.lee@mediatek.com \
--cc=haipin.liang@mediatek.com \
--cc=kai.lin@mediatek.com \
--cc=kl.huang@mediatek.com \
--cc=kyle.lee@mediatek.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=miller.shen@mediatek.com \
--cc=nbd@nbd.name \
--cc=nelson.chang@mediatek.com \
--cc=rorscha.yang@mediatek.com \
--cc=royluo@google.com \
--cc=sean.wang@mediatek.com \
--cc=yf.luo@mediatek.com \
--cc=yh.chen@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox