From: Kalle Valo <kvalo@codeaurora.org>
Date: Mon, 17 Sep 2018 14:41:02 +0000 (+0300)
Subject: Merge wireless-drivers into wireless-drivers-next
X-Git-Tag: v4.20-rc1~27^2~198^2~29
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=43e2f2904160b9a95aad77df9cbc1622910b8598;p=linux.git

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.
---

43e2f2904160b9a95aad77df9cbc1622910b8598
diff --cc drivers/net/wireless/mediatek/mt76/mt76x0/main.c
index a969fa9fcd57,22bc9d368728..3f936a85c171
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/main.c
@@@ -78,11 -76,9 +78,10 @@@ static void mt76x0_remove_interface(str
  				     struct ieee80211_vif *vif)
  {
  	struct mt76x0_dev *dev = hw->priv;
 -	struct mt76_vif *mvif = (struct mt76_vif *) vif->drv_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);
  }
  
  static int mt76x0_config(struct ieee80211_hw *hw, u32 changed)