Hi, Features, cleanups and bugfixes from our internal tree. Thanks, Miri Johannes Berg (4): wifi: iwlwifi: cfg: mark Ty devices as discrete wifi: iwlwifi: cfg: clean up dr/br configs wifi: iwlwifi: cfg: reduce configuration struct size wifi: iwlwifi: fw: api: include required headers in rs/location Miri Korenblit (10): wifi: iwlwifi: stop supporting TX_CMD_API_S_VER_8 wifi: iwlwifi: use normal versioning convention for iwl_tx_cmd wifi: iwlwifi: remove GEN3 from a couple of macros wifi: iwlwifi: use bc entries instead of bc table also for pre-ax210 wifi: iwlwifi: unify iwlagn_scd_bc_tbl_entry and iwl_gen3_bc_tbl_entry wifi: iwlwifi: remove unused macro wifi: iwlwifi: map iwl_context_info to the matching struct wifi: iwlwifi: fix a wrong comment wifi: iwlwifi: rename ctx-info-gen3 to ctx-info-v2 wifi: iwlwifi: mld: allow 2 ROCs on the same vif Pagadala Yesu Anjaneyulu (1): wifi: iwlwifi: Add helper function to extract device ID drivers/net/wireless/intel/iwlwifi/Makefile | 2 +- .../net/wireless/intel/iwlwifi/cfg/ax210.c | 10 +++ drivers/net/wireless/intel/iwlwifi/cfg/dr.c | 23 +---- .../wireless/intel/iwlwifi/fw/api/commands.h | 6 +- .../wireless/intel/iwlwifi/fw/api/location.h | 5 ++ .../net/wireless/intel/iwlwifi/fw/api/rs.h | 4 +- .../net/wireless/intel/iwlwifi/fw/api/tdls.h | 6 +- .../net/wireless/intel/iwlwifi/fw/api/tx.h | 21 +++-- .../net/wireless/intel/iwlwifi/iwl-config.h | 30 +++---- ...text-info-gen3.h => iwl-context-info-v2.h} | 40 ++++----- .../wireless/intel/iwlwifi/iwl-context-info.h | 2 +- drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 26 ++---- .../net/wireless/intel/iwlwifi/iwl-trans.c | 16 ++-- .../net/wireless/intel/iwlwifi/iwl-trans.h | 7 ++ drivers/net/wireless/intel/iwlwifi/mld/mld.h | 2 - drivers/net/wireless/intel/iwlwifi/mld/roc.c | 59 +++++++++---- drivers/net/wireless/intel/iwlwifi/mld/tx.c | 4 +- .../net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 6 +- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 16 ++-- .../pcie/{ctxt-info-gen3.c => ctxt-info-v2.c} | 84 +++++++++---------- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 76 +++++++---------- .../wireless/intel/iwlwifi/pcie/internal.h | 8 +- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 6 +- .../wireless/intel/iwlwifi/pcie/trans-gen2.c | 10 +-- .../net/wireless/intel/iwlwifi/pcie/trans.c | 14 ++-- .../net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 31 ++++--- drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 32 +++---- .../wireless/intel/iwlwifi/tests/devinfo.c | 69 +++++++++++---- 29 files changed, 329 insertions(+), 288 deletions(-) rename drivers/net/wireless/intel/iwlwifi/{iwl-context-info-gen3.h => iwl-context-info-v2.h} (91%) rename drivers/net/wireless/intel/iwlwifi/pcie/{ctxt-info-gen3.c => ctxt-info-v2.c} (89%) -- 2.34.1