From 8f48855f5d14e216d99a7bdb239f262de04890d4 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 1 Sep 2020 21:26:33 +0200 Subject: [PATCH] mt76: mt7915: simplify mt7915_lmac_mapping Compared to mac80211 ACs, MT7915 queue numbers are in reverse order There is no need for the defensive WARN_ON_ONCE, so we can simplify the function to avoid the array lookup Signed-off-by: Felix Fietkau --- mt7915/mt7915.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/mt7915/mt7915.h b/mt7915/mt7915.h index c8f85425..b32dcc5f 100644 --- a/mt7915/mt7915.h +++ b/mt7915/mt7915.h @@ -252,17 +252,8 @@ mt7915_ext_phy(struct mt7915_dev *dev) static inline u8 mt7915_lmac_mapping(struct mt7915_dev *dev, u8 ac) { - static const u8 lmac_queue_map[] = { - [IEEE80211_AC_BK] = MT_LMAC_AC00, - [IEEE80211_AC_BE] = MT_LMAC_AC01, - [IEEE80211_AC_VI] = MT_LMAC_AC02, - [IEEE80211_AC_VO] = MT_LMAC_AC03, - }; - - if (WARN_ON_ONCE(ac >= ARRAY_SIZE(lmac_queue_map))) - return MT_LMAC_AC01; /* BE */ - - return lmac_queue_map[ac]; + /* LMAC uses the reverse order of mac80211 AC indexes */ + return 3 - ac; } extern const struct ieee80211_ops mt7915_ops;