[0/4] unify txwi parsing between mt76x0 and mt76x2 drivers

Message

Lorenzo Bianconi Oct. 1, 2018, 4:58 p.m. UTC

Move mt76x02_mac_write_txwi routine in mt76x02-lib module in order to
unify txwi parsing between mt76x0 and mt76x2 drivers.
For rxwi unification we need to merge mt76x2_dev and mt76x0_dev in
mt76x02_dev and remove duplicated code

Changes since RFC:
- drop patch 1/5 ("mt76: introduce is_mt76x2 routine")
- use chainmask in mt76x02_mac_write_txwi instead of is_mt76x2
  routine

Lorenzo Bianconi (4):
  mt76: move mt76x02_tx_get_max_txpwr_adj in mt76x02_util.c
  mt76: add get_tx_txpwr_adj function pointer to mt76_driver_ops
  mt76: move mt76x02_mac_write_txwi in mt76x02-lib module
  mt76: usb: use mt76x02u_tx_prepare_skb to fill txwi

 drivers/net/wireless/mediatek/mt76/mt76.h     |  4 +-
 .../wireless/mediatek/mt76/mt76x0/mt76x0.h    |  5 --
 .../net/wireless/mediatek/mt76/mt76x0/tx.c    | 38 ----------
 .../net/wireless/mediatek/mt76/mt76x0/usb.c   | 17 +----
 .../net/wireless/mediatek/mt76/mt76x02_mac.c  | 72 +++++++++++++++++--
 .../net/wireless/mediatek/mt76/mt76x02_mac.h  |  8 +--
 .../net/wireless/mediatek/mt76/mt76x02_usb.h  |  5 +-
 .../wireless/mediatek/mt76/mt76x02_usb_core.c | 38 +++++++++-
 .../net/wireless/mediatek/mt76/mt76x02_util.c | 45 +++++++++++-
 .../net/wireless/mediatek/mt76/mt76x02_util.h |  2 +
 .../wireless/mediatek/mt76/mt76x2/Makefile    |  2 +-
 .../net/wireless/mediatek/mt76/mt76x2/mac.c   | 60 ----------------
 .../net/wireless/mediatek/mt76/mt76x2/mac.h   |  3 -
 .../wireless/mediatek/mt76/mt76x2/mt76x2.h    |  4 +-
 .../wireless/mediatek/mt76/mt76x2/mt76x2u.h   |  4 --
 .../wireless/mediatek/mt76/mt76x2/pci_init.c  |  2 +-
 .../wireless/mediatek/mt76/mt76x2/pci_mac.c   |  2 +-
 .../wireless/mediatek/mt76/mt76x2/pci_tx.c    |  2 +-
 .../net/wireless/mediatek/mt76/mt76x2/tx.c    | 46 +-----------
 .../wireless/mediatek/mt76/mt76x2/usb_core.c  | 53 --------------
 .../wireless/mediatek/mt76/mt76x2/usb_init.c  |  3 +-
 21 files changed, 167 insertions(+), 248 deletions(-)
 delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2/usb_core.c

Comments

Felix Fietkau Oct. 4, 2018, 11:03 a.m. UTC | #1

On 2018-10-01 18:58, Lorenzo Bianconi wrote:
> Move mt76x02_mac_write_txwi routine in mt76x02-lib module in order to
> unify txwi parsing between mt76x0 and mt76x2 drivers.
> For rxwi unification we need to merge mt76x2_dev and mt76x0_dev in
> mt76x02_dev and remove duplicated code
Merged, thanks.

- Felix