diff options
| author | Lorenzo Bianconi <lorenzo@kernel.org> | 2020-04-13 16:28:48 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2020-05-12 19:52:31 +0200 |
| commit | 4fcf6e770b4487db3dbcf48993a36f16f8836680 (patch) | |
| tree | 9cdfb6067ec6a75ff26beae1d5cda5504126a628 /drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | |
| parent | 5da612090d9a7b1481b7587b3b1deede30a11baf (diff) | |
mt76: mt7615: fix possible deadlock in mt7615_stop
make mac_work per phy instead of per device and fix a possible deadlock
in mt7615_stop since mt7615_mac_work runs holding mt76 mutex
Fixes: fdd2e570764c2 ("mt76: mt7615: add dual-phy support for mac80211 ops")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h index 10a98d38f77e..57c9c1ef8ffc 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h @@ -192,6 +192,9 @@ struct mt7615_phy { struct mib_stats mib; + struct delayed_work mac_work; + u8 mac_work_count; + struct sk_buff_head scan_event_list; struct delayed_work scan_work; }; @@ -259,7 +262,6 @@ struct mt7615_dev { } radar_pattern; u32 hw_pattern; - u8 mac_work_count; bool fw_debug; bool flash_eeprom; |