| developer | 1d1e456 | 2022-03-17 00:06:34 +0800 | [diff] [blame^] | 1 | From c931d9454ecfce777ac68071d4687f1ebb302917 Mon Sep 17 00:00:00 2001 |
| 2 | From: Evelyn Tsai <evelyn.tsai@mediatek.com> |
| 3 | Date: Mon, 7 Mar 2022 19:32:29 +0800 |
| 4 | Subject: [PATCH 5/6] mt76: mt7915: fix MBSS index condition in DBDC mode |
| 5 | |
| 6 | MT7915_MAX_INTERFACES is per-band declartion. |
| 7 | |
| 8 | Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com> |
| 9 | Signed-off-by: Bo Jiao <bo.jiao@mediatek.com> |
| 10 | --- |
| 11 | mt76.h | 2 +- |
| 12 | mt7915/main.c | 2 +- |
| 13 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 14 | |
| 15 | diff --git a/mt76.h b/mt76.h |
| 16 | index d5f8650f..6e528e42 100644 |
| 17 | --- a/mt76.h |
| 18 | +++ b/mt76.h |
| 19 | @@ -732,7 +732,7 @@ struct mt76_dev { |
| 20 | u32 wcid_mask[DIV_ROUND_UP(MT76_N_WCIDS, 32)]; |
| 21 | u32 wcid_phy_mask[DIV_ROUND_UP(MT76_N_WCIDS, 32)]; |
| 22 | |
| 23 | - u32 vif_mask; |
| 24 | + u64 vif_mask; |
| 25 | |
| 26 | struct mt76_wcid global_wcid; |
| 27 | struct mt76_wcid __rcu *wcid[MT76_N_WCIDS]; |
| 28 | diff --git a/mt7915/main.c b/mt7915/main.c |
| 29 | index c3f44d80..3111217b 100644 |
| 30 | --- a/mt7915/main.c |
| 31 | +++ b/mt7915/main.c |
| 32 | @@ -205,7 +205,7 @@ static int mt7915_add_interface(struct ieee80211_hw *hw, |
| 33 | phy->monitor_vif = vif; |
| 34 | |
| 35 | mvif->mt76.idx = ffs(~dev->mt76.vif_mask) - 1; |
| 36 | - if (mvif->mt76.idx >= MT7915_MAX_INTERFACES) { |
| 37 | + if (mvif->mt76.idx >= MT7915_MAX_INTERFACES * (dev->dbdc_support + 1)) { |
| 38 | ret = -ENOSPC; |
| 39 | goto out; |
| 40 | } |
| 41 | -- |
| 42 | 2.18.0 |
| 43 | |