Commit 43e2f290 authored by Kalle Valo's avatar Kalle Valo
Browse files

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.
parents cf5652c9 3341ba9f

drivers/net/wireless/mediatek/mt76/mt76x0/main.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

}