Re: linux-next: build failure after merge of the mac80211-next tree
flat view
From: Johannes Berg <johannes@sipsolutions.net>
Date: 2017-12-12 08:47:25
Also in:
linux-next, linux-wireless, lkml
Hi Stephen, Thanks! Felix made me aware of this yesterday evening and said he's going to work out the required changes to mt76. Kalle and I will make sure to submit the trees to Dave one by one so he doesn't have to deal with it :) Unfortunately, this might take a few days to resolve.
quoted hunk ↗ jump to hunk
-void mt76_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq) +void mt76_wake_tx_queue(struct ieee80211_hw *hw) { + struct ieee80211_txq *txq; struct mt76_dev *dev = hw->priv; - struct mt76_txq *mtxq = (struct mt76_txq *) txq->drv_priv; - struct mt76_queue *hwq = mtxq->hwq; + struct mt76_txq *mtxq; + struct mt76_queue *hwq; + txq = ieee80211_next_txq(hw); + mtxq = (struct mt76_txq *) txq->drv_priv; + hwq = mtxq->hwq;
Looks pretty much right to me - perhaps for safety there should be a NULL check on txq, but OTOH when you get here it should be non-NULL. Sorry for the inconvenience, I hadn't realized mt76 went in now. johannes