Skip to content

Commit

Permalink
mt76: move vif_mask back from mt76_phy to mt76_dev
Browse files Browse the repository at this point in the history 
Since it is global for all drivers, it belongs to the main device

Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
Felix Fietkau committed Jan 27, 2021
1 parent 51742a9 commit 2ab33b8
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/mediatek/mt76/mt76.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -582,8 +582,6 @@ struct mt76_phy {

u8 macaddr[ETH_ALEN];

u32 vif_mask;

int txpower_cur;
u8 antenna_mask;
u16 chainmask;
Expand Down Expand Up @@ -641,6 +639,8 @@ struct mt76_dev {
u32 wcid_mask[DIV_ROUND_UP(MT76_N_WCIDS, 32)];
u32 wcid_phy_mask[DIV_ROUND_UP(MT76_N_WCIDS, 32)];

u32 vif_mask;

struct mt76_wcid global_wcid;
struct mt76_wcid __rcu *wcid[MT76_N_WCIDS];

Expand Down
6 changes: 3 additions & 3 deletions drivers/net/wireless/mediatek/mt76/mt7603/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ mt7603_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)

mutex_lock(&dev->mt76.mutex);

mvif->idx = ffs(~dev->mphy.vif_mask) - 1;
mvif->idx = ffs(~dev->mt76.vif_mask) - 1;
if (mvif->idx >= MT7603_MAX_INTERFACES) {
ret = -ENOSPC;
goto out;
Expand All @@ -65,7 +65,7 @@ mt7603_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
}

idx = MT7603_WTBL_RESERVED - 1 - mvif->idx;
dev->mphy.vif_mask |= BIT(mvif->idx);
dev->mt76.vif_mask |= BIT(mvif->idx);
INIT_LIST_HEAD(&mvif->sta.poll_list);
mvif->sta.wcid.idx = idx;
mvif->sta.wcid.hw_key_idx = -1;
Expand Down Expand Up @@ -105,7 +105,7 @@ mt7603_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
spin_unlock_bh(&dev->sta_poll_lock);

mutex_lock(&dev->mt76.mutex);
dev->mphy.vif_mask &= ~BIT(mvif->idx);
dev->mt76.vif_mask &= ~BIT(mvif->idx);
mutex_unlock(&dev->mt76.mutex);
}

Expand Down
6 changes: 3 additions & 3 deletions drivers/net/wireless/mediatek/mt76/mt7615/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ static int mt7615_add_interface(struct ieee80211_hw *hw,
is_zero_ether_addr(vif->addr))
phy->monitor_vif = vif;

mvif->idx = ffs(~dev->mphy.vif_mask) - 1;
mvif->idx = ffs(~dev->mt76.vif_mask) - 1;
if (mvif->idx >= MT7615_MAX_INTERFACES) {
ret = -ENOSPC;
goto out;
Expand All @@ -207,7 +207,7 @@ static int mt7615_add_interface(struct ieee80211_hw *hw,
else
mvif->wmm_idx = mvif->idx % MT7615_MAX_WMM_SETS;

dev->mphy.vif_mask |= BIT(mvif->idx);
dev->mt76.vif_mask |= BIT(mvif->idx);
dev->omac_mask |= BIT_ULL(mvif->omac_idx);
phy->omac_mask |= BIT_ULL(mvif->omac_idx);

Expand Down Expand Up @@ -263,7 +263,7 @@ static void mt7615_remove_interface(struct ieee80211_hw *hw,

rcu_assign_pointer(dev->mt76.wcid[idx], NULL);

dev->mphy.vif_mask &= ~BIT(mvif->idx);
dev->mt76.vif_mask &= ~BIT(mvif->idx);
dev->omac_mask &= ~BIT_ULL(mvif->omac_idx);
phy->omac_mask &= ~BIT_ULL(mvif->omac_idx);

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ static void mt76x02_reset_state(struct mt76x02_dev *dev)
memset(msta, 0, sizeof(*msta));
}

dev->mphy.vif_mask = 0;
dev->mt76.vif_mask = 0;
dev->mt76.beacon_mask = 0;
}

Expand Down
8 changes: 4 additions & 4 deletions drivers/net/wireless/mediatek/mt76/mt76x02_util.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ mt76x02_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
unsigned int idx = 0;

/* Allow to change address in HW if we create first interface. */
if (!dev->mphy.vif_mask &&
if (!dev->mt76.vif_mask &&
(((vif->addr[0] ^ dev->mphy.macaddr[0]) & ~GENMASK(4, 1)) ||
memcmp(vif->addr + 1, dev->mphy.macaddr + 1, ETH_ALEN - 1)))
mt76x02_mac_setaddr(dev, vif->addr);
Expand All @@ -329,11 +329,11 @@ mt76x02_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
idx += 8;

/* vif is already set or idx is 8 for AP/Mesh/... */
if (dev->mphy.vif_mask & BIT(idx) ||
if (dev->mt76.vif_mask & BIT(idx) ||
(vif->type != NL80211_IFTYPE_STATION && idx > 7))
return -EBUSY;

dev->mphy.vif_mask |= BIT(idx);
dev->mt76.vif_mask |= BIT(idx);

mt76x02_vif_init(dev, vif, idx);
return 0;
Expand All @@ -346,7 +346,7 @@ void mt76x02_remove_interface(struct ieee80211_hw *hw,
struct mt76x02_dev *dev = hw->priv;
struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv;

dev->mphy.vif_mask &= ~BIT(mvif->idx);
dev->mt76.vif_mask &= ~BIT(mvif->idx);
}
EXPORT_SYMBOL_GPL(mt76x02_remove_interface);

Expand Down
6 changes: 3 additions & 3 deletions drivers/net/wireless/mediatek/mt76/mt7915/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,
is_zero_ether_addr(vif->addr))
phy->monitor_vif = vif;

mvif->idx = ffs(~dev->mphy.vif_mask) - 1;
mvif->idx = ffs(~dev->mt76.vif_mask) - 1;
if (mvif->idx >= MT7915_MAX_INTERFACES) {
ret = -ENOSPC;
goto out;
Expand All @@ -186,7 +186,7 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,
if (ret)
goto out;

dev->mphy.vif_mask |= BIT(mvif->idx);
dev->mt76.vif_mask |= BIT(mvif->idx);
phy->omac_mask |= BIT_ULL(mvif->omac_idx);

idx = MT7915_WTBL_RESERVED - mvif->idx;
Expand Down Expand Up @@ -241,7 +241,7 @@ static void mt7915_remove_interface(struct ieee80211_hw *hw,
rcu_assign_pointer(dev->mt76.wcid[idx], NULL);

mutex_lock(&dev->mt76.mutex);
dev->mphy.vif_mask &= ~BIT(mvif->idx);
dev->mt76.vif_mask &= ~BIT(mvif->idx);
phy->omac_mask &= ~BIT_ULL(mvif->omac_idx);
mutex_unlock(&dev->mt76.mutex);

Expand Down

0 comments on commit 2ab33b8

Please sign in to comment.