Introduce connac3_mac in mt76_connac library to reuse mac code shared between WiFi7 chipsets. Move the following common mac fields in mt76_struct/mt76_wcid: - sta_poll_list - sta_poll_lock - poll_list - ampdu_state Move the following routines in mt76-connac lib since they are shared between mt7915 and mt7921: - mt76_connac2_tx_check_aggr - mt76_connac2_txwi_free - mt76_connac2_tx_token_put Changes since v1: - rebase on top wireless-next tree - fix connac3_mac library - fix compilation warnings Lorenzo Bianconi (15): wifi: mt76: mt7915: move sta_poll_list and sta_poll_lock in mt76_dev wifi: mt76: mt7603: rely on shared sta_poll_list and sta_poll_lock wifi: mt76: mt7615: rely on shared sta_poll_list and sta_poll_lock wifi: mt76: mt7996: rely on shared sta_poll_list and sta_poll_lock wifi: mt76: mt7921: rely on shared sta_poll_list and sta_poll_lock wifi: mt76: mt7915: move poll_list in mt76_wcid wifi: mt76: mt7603: rely on shared poll_list field wifi: mt76: mt7615: rely on shared poll_list field wifi: mt76: mt7996: rely on shared poll_list field wifi: mt76: mt7921: rely on shared poll_list field wifi: mt76: move ampdu_state in mt76_wcid mt76: connac: move more mt7921/mt7915 mac shared code in connac lib wifi: mt76: move rate info in mt76_vif wifi: mt76: connac: move connac3 definitions in mt76_connac3_mac.h wifi: mt76: connac: add connac3 mac library drivers/net/wireless/mediatek/mt76/Makefile | 2 +- drivers/net/wireless/mediatek/mt76/mac80211.c | 2 + drivers/net/wireless/mediatek/mt76/mt76.h | 9 + .../net/wireless/mediatek/mt76/mt7603/init.c | 2 - .../net/wireless/mediatek/mt76/mt7603/mac.c | 22 +- .../net/wireless/mediatek/mt76/mt7603/main.c | 20 +- .../wireless/mediatek/mt76/mt7603/mt7603.h | 4 - .../net/wireless/mediatek/mt76/mt7615/init.c | 2 - .../net/wireless/mediatek/mt76/mt7615/mac.c | 31 +- .../net/wireless/mediatek/mt76/mt7615/main.c | 20 +- .../wireless/mediatek/mt76/mt7615/mt7615.h | 4 - .../net/wireless/mediatek/mt76/mt76_connac.h | 24 + .../wireless/mediatek/mt76/mt76_connac3_mac.c | 742 ++++++++++++++++ .../wireless/mediatek/mt76/mt76_connac3_mac.h | 343 ++++++++ .../wireless/mediatek/mt76/mt76_connac_mac.c | 82 ++ .../net/wireless/mediatek/mt76/mt7915/init.c | 4 +- .../net/wireless/mediatek/mt76/mt7915/mac.c | 140 +-- .../net/wireless/mediatek/mt76/mt7915/main.c | 30 +- .../wireless/mediatek/mt76/mt7915/mt7915.h | 5 - .../net/wireless/mediatek/mt76/mt7921/init.c | 2 - .../net/wireless/mediatek/mt76/mt7921/mac.c | 104 +-- .../net/wireless/mediatek/mt76/mt7921/main.c | 26 +- .../wireless/mediatek/mt76/mt7921/mt7921.h | 9 - .../net/wireless/mediatek/mt76/mt7921/pci.c | 2 +- .../wireless/mediatek/mt76/mt7921/pci_mac.c | 16 +- .../net/wireless/mediatek/mt76/mt7996/init.c | 6 +- .../net/wireless/mediatek/mt76/mt7996/mac.c | 803 +----------------- .../net/wireless/mediatek/mt76/mt7996/mac.h | 315 +------ .../net/wireless/mediatek/mt76/mt7996/main.c | 42 +- .../net/wireless/mediatek/mt76/mt7996/mcu.c | 11 +- .../wireless/mediatek/mt76/mt7996/mt7996.h | 36 +- 31 files changed, 1403 insertions(+), 1457 deletions(-) create mode 100644 drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.c create mode 100644 drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h -- 2.40.1
