gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 13:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

mt7603: do not hold dev->mutex while flushing dev->mac_work

Browse Source 
Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Felix Fietkau
2018-05-20 07:57:25 +02:00
parent fcbb49e863
commit 792dbe0261
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mt7603_main.c
+8 -4
View File
@@ -131,6 +131,7 @@ mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)
cancel_delayed_work_sync(&dev->mac_work);
mutex_lock(&dev->mutex);
set_bit(MT76_RESET, &dev->mt76.state);
mt7603_mac_stop(dev);
@@ -166,6 +167,8 @@ mt7603_set_channel(struct mt7603_dev *dev, struct cfg80211_chan_def *def)
ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mac_work,
MT7603_WATCHDOG_TIME);
mutex_unlock(&dev->mutex);
return 0;
}
@@ -175,22 +178,23 @@ mt7603_config(struct ieee80211_hw *hw, u32 changed)
struct mt7603_dev *dev = hw->priv;
int ret = 0;
mutex_lock(&dev->mutex);
if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
if (changed & IEEE80211_CONF_CHANGE_CHANNEL)
ret = mt7603_set_channel(dev, &hw->conf.chandef);
}
if (changed & IEEE80211_CONF_CHANGE_MONITOR) {
mutex_lock(&dev->mutex);
if (!(hw->conf.flags & IEEE80211_CONF_MONITOR))
dev->rxfilter |= MT_WF_RFCR_DROP_OTHER_UC;
else
dev->rxfilter &= ~MT_WF_RFCR_DROP_OTHER_UC;
mt76_wr(dev, MT_WF_RFCR, dev->rxfilter);
mutex_unlock(&dev->mutex);
}
mutex_unlock(&dev->mutex);
return ret;
}