diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2018-09-17 17:41:02 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2018-09-17 17:41:02 +0300 |
| commit | 43e2f2904160b9a95aad77df9cbc1622910b8598 (patch) | |
| tree | d2608ffbd2488b0d1e6dbeaad7bc489fe452ad3a | |
| parent | cf5652c962dae3bff1e256be7eba142b067e74ba (diff) | |
| parent | 3341ba9f0f2637a51738ef5de5114e13a1cd3eca (diff) | |
Merge wireless-drivers into wireless-drivers-next
Solve the conflict in main.c early on as there will be a lot more mt76 patches
in the queue.
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt76x0/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c index a969fa9fcd57..3f936a85c171 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c @@ -79,9 +79,8 @@ static void mt76x0_remove_interface(struct ieee80211_hw *hw, { struct mt76x0_dev *dev = hw->priv; struct mt76x02_vif *mvif = (struct mt76x02_vif *) vif->drv_priv; - unsigned int wcid = mvif->group_wcid.idx; - dev->wcid_mask[wcid / BITS_PER_LONG] &= ~BIT(wcid % BITS_PER_LONG); + dev->vif_mask &= ~BIT(mvif->idx); mt76_txq_remove(&dev->mt76, vif->txq); } |